@@ -1087,7 +1087,9 @@ export const make = Effect.gen(function* () {
             configured.delete(id);
             removed.push({ id, scope: previous.scope });
           }
-          yield* service.refreshHosts;
+          if (removed.length > 0) {
+            yield* service.refreshHosts;
+          }
           return removed;
         }),
       );
@@ -1103,6 +1105,7 @@ export const make = Effect.gen(function* () {
       );
       yield* service.withLifecycleLock(
         Effect.gen(function* () {
+          let added = false;
           for (const host of next) {
             if (configured.has(host.id)) continue;
             const hostScope = yield* Scope.fork(scope);
@@ -1127,8 +1130,11 @@ export const make = Effect.gen(function* () {
             ).pipe(Effect.provideService(Scope.Scope, hostScope), Effect.provide(hostContext));
             hosts.set(host.id, instance);
             configured.set(host.id, { config: host, scope: hostScope });
+            added = true;
+          }
+          if (added) {
+            yield* service.refreshHosts;
           }
-          yield* service.refreshHosts;
         }),
       );
     });
 
@@ -132,7 +132,7 @@ const androidSdk = Effect.gen(function* () {
   const platform = yield* HostProcess.Platform;
   const home = environment.HOME ?? environment.USERPROFILE ?? "";
   const explicit = environment.ANDROID_HOME?.trim() || environment.ANDROID_SDK_ROOT?.trim();
-  const candidates = explicit
+  const initialCandidates = explicit
     ? [explicit]
     : [
         path.join(home, "Library", "Android", "sdk"),
@@ -143,24 +143,18 @@ const androidSdk = Effect.gen(function* () {
           "Sdk",
         ),
       ];
-  if (!explicit) {
-    for (const directory of (environment.PATH ?? "").split(platform === "win32" ? ";" : ":")) {
-      if (!directory) continue;
-      const resolved = yield* fs
-        .realPath(path.join(directory, platform === "win32" ? "adb.exe" : "adb"))
-        .pipe(Effect.option);
-      if (resolved._tag === "Some") candidates.push(path.dirname(path.dirname(resolved.value)));
-    }
-  }
   const exists = (file: string) => fs.exists(file).pipe(Effect.orElseSucceed(() => false));
-  for (const root of candidates) {
-    const adb = yield* exists(
-      path.join(root, "platform-tools", platform === "win32" ? "adb.exe" : "adb"),
-    );
-    const emulator = yield* exists(
-      path.join(root, "emulator", platform === "win32" ? "emulator.exe" : "emulator"),
-    );
-    if (explicit || adb || emulator) {
+  const inspectCandidate = (root: string) =>
+    Effect.gen(function* () {
+      const adb = yield* exists(
+        path.join(root, "platform-tools", platform === "win32" ? "adb.exe" : "adb"),
+      );
+      const emulator = yield* exists(
+        path.join(root, "emulator", platform === "win32" ? "emulator.exe" : "emulator"),
+      );
+      if (!explicit && !adb && !emulator) {
+        return null;
+      }
       const avdmanager = yield* exists(
         path.join(
           root,
@@ -176,6 +170,29 @@ const androidSdk = Effect.gen(function* () {
           path.join(root, "tools", "bin", platform === "win32" ? "avdmanager.bat" : "avdmanager"),
         ));
       return { root, adb, emulator, avdmanager, legacyAvdmanager };
+    });
+
+  for (const root of initialCandidates) {
+    const found = yield* inspectCandidate(root);
+    if (found) return found;
+  }
+
+  if (!explicit) {
+    const pathValue = environment.PATH ?? environment.Path ?? "";
+    const seenDirectories = new Set<string>();
+    const adbBinary = platform === "win32" ? "adb.exe" : "adb";
+    for (const rawDirectory of pathValue.split(platform === "win32" ? ";" : ":")) {
+      const directory = rawDirectory.trim();
+      if (!directory) continue;
+      const dirKey = platform === "win32" ? directory.toLowerCase() : directory;
+      if (seenDirectories.has(dirKey)) continue;
+      seenDirectories.add(dirKey);
+      const adbCandidate = path.join(directory, adbBinary);
+      if (!(yield* exists(adbCandidate))) continue;
+      const resolved = yield* fs.realPath(adbCandidate).pipe(Effect.option);
+      const root = path.dirname(path.dirname(Option.getOrElse(resolved, () => adbCandidate)));
+      const found = yield* inspectCandidate(root);
+      if (found) return found;
     }
   }
   return { root: null, adb: false, emulator: false, avdmanager: false, legacyAvdmanager: false };