Yeah, Makaniis is separated from Jinacsani. At least based on what Oromia have planned. It haven't been fully executed.
Makaniis is an enclave. I think it almost/possibly has a border with Lafa Cisse, don't remember exactly. But even in such a scenario, it has to go through our land to reach Jinacsani and mainland Oromia.
On the other hand, they don't have any border with either Xeerogel or Jaare. For instance, Jaare kebele/santar border Sariir Garaad kebele/santar on our side, which isn't part of Jinacsani/Makaniis.
All of the towns and villages underlined in red are 100% Samaroon. The blue is Jarso and is the capital of the new Makanis/Bekanisa district. Currently it has a border with Heregel fully and immediately west of Lafaciise. As for Jaare, it has a border with Makanis towards the southeast and a border with Tuli Guled southwards.
Also I don't know which Serir Gerad you're talking about, but the one near Jaare is under the Awbare district and south of it is the mountain of Jabsa which is also administered under Awbare district. Both are Samaroon entirely.