@@ -46,10 +46,11 @@ export type AndroidAdbHost = Readonly<{
   /** Narrow filesystem authority used by Android helper, SDK, and artifact mechanics. */
   files: AndroidAdbFileHost;
   /**
-   * Local adb execution for one addressing decision, escaping any active command-executor
-   * override (a tunnel-backed provider shelling out to adb must not route back into itself)
-   * and owning the host-side process-group/teardown semantics. The invocation's command is
-   * appended verbatim; only `target` is lowered into adb global options.
+   * Local adb execution for one addressing decision, visible to an installed command-executor
+   * override so a scoped transport can answer for it. A caller that must not be captured — the
+   * device-scoped executor a provider would otherwise re-enter — wraps this in
+   * `withoutAdbCommandExecutorOverride`. The invocation's command is appended verbatim; only
+   * `target` is lowered into adb global options.
    */
   execAdb(
     invocation: AndroidAdbInvocation,
 
@@ -53,10 +53,15 @@ export function createDeviceAdbExecutor(
 function createSerialAdbExecutor(serial: string, serverPort?: number): AndroidAdbExecutor {
   return withAdbFailureHints(async (args, options) => {
     const port = scopedServerPort(serial, serverPort);
-    return await requireAndroidAdbHost().execAdb(androidDeviceAdbInvocation(serial, args, port), {
-      ...options,
-      detached: true,
-    });
+    // A device-scoped executor is the terminal local route: an installed provider must not
+    // capture it and route the call back into itself.
+    return await requireAndroidAdbHost().withoutAdbCommandExecutorOverride(
+      async () =>
+        await requireAndroidAdbHost().execAdb(androidDeviceAdbInvocation(serial, args, port), {
+          ...options,
+          detached: true,
+        }),
+    );
   });
 }
 
 
@@ -90,9 +90,7 @@ bindAndroidAdbHost({
   },
   execAdb: async (invocation, options) => {
     const lowered = lowerAndroidAdbInvocation(invocation, options);
-    return await withoutCommandExecutorOverride(async () => {
-      return await runCmd('adb', lowered.args, lowered.options);
-    });
+    return await runCmd('adb', lowered.args, lowered.options);
   },
   spawnAdb: (invocation, options) => {
     const lowered = lowerAndroidAdbInvocation(invocation, options);