fix: improve Android text entry stability (#540)

* fix: improve android text entry stability

* fix: stabilize android daemon diagnostics

* chore: refresh fallow baselines

* refactor: tighten android text fallback

* fix: tighten android input ownership diagnostics

* fix: require settled android fill verification

* test: cover android fill prefix verification

Author: thymikee

fallow-baselines/dupes.json

@@ -51,6 +51,11 @@
         "count": 1
       }
     },
+    "src/cli/commands/client-command.ts": {
+      "crap_moderate": {
+        "count": 1
+      }
+    },
     "src/cli/commands/connection-runtime.ts": {
       "complexity_high": {
         "count": 1
@@ -73,20 +78,6 @@
         "count": 1
       }
     },
-    "src/cli/commands/generic.ts": {
-      "complexity_critical": {
-        "count": 1
-      },
-      "crap_critical": {
-        "count": 1
-      },
-      "crap_high": {
-        "count": 1
-      },
-      "crap_moderate": {
-        "count": 1
-      }
-    },
     "src/cli/commands/output.ts": {
       "complexity_moderate": {
         "count": 1
@@ -100,11 +91,6 @@
         "count": 1
       }
     },
-    "src/client-commands.ts": {
-      "crap_moderate": {
-        "count": 1
-      }
-    },
     "src/client-companion-tunnel-worker.ts": {
       "complexity_high": {
         "count": 1
@@ -143,11 +129,6 @@
         "count": 1
       }
     },
-    "src/client.ts": {
-      "crap_moderate": {
-        "count": 1
-      }
-    },
     "src/commands/admin.ts": {
       "crap_high": {
         "count": 1
@@ -212,16 +193,13 @@
     },
     "src/core/dispatch.ts": {
       "complexity_critical": {
-        "count": 2
+        "count": 1
       },
       "crap_critical": {
-        "count": 2
-      },
-      "crap_high": {
-        "count": 4
+        "count": 1
       },
       "crap_moderate": {
-        "count": 5
+        "count": 3
       }
     },
     "src/daemon-client.ts": {
@@ -459,15 +437,12 @@
     },
     "src/daemon/handlers/session-replay-script.ts": {
       "complexity_critical": {
-        "count": 2
+        "count": 1
       },
       "complexity_high": {
-        "count": 2
+        "count": 1
       },
       "crap_critical": {
-        "count": 2
-      },
-      "crap_high": {
         "count": 1
       }
     },
@@ -558,14 +533,6 @@
         "count": 1
       }
     },
-    "src/daemon/request-router.ts": {
-      "crap_high": {
-        "count": 2
-      },
-      "crap_moderate": {
-        "count": 3
-      }
-    },
     "src/daemon/runtime-hints.ts": {
       "complexity_moderate": {
         "count": 1
@@ -623,14 +590,6 @@
         "count": 1
       }
     },
-    "src/daemon/session-store.ts": {
-      "complexity_critical": {
-        "count": 2
-      },
-      "crap_critical": {
-        "count": 2
-      }
-    },
     "src/platforms/android/app-lifecycle.ts": {
       "complexity_moderate": {
         "count": 1
@@ -647,9 +606,6 @@
       }
     },
     "src/platforms/android/input-actions.ts": {
-      "complexity_high": {
-        "count": 1
-      },
       "complexity_moderate": {
         "count": 1
       }
@@ -771,14 +727,11 @@
       }
     },
     "src/platforms/ios/runner-xctestrun.ts": {
-      "complexity_high": {
-        "count": 1
-      },
       "complexity_moderate": {
-        "count": 4
+        "count": 2
       },
       "crap_moderate": {
-        "count": 4
+        "count": 2
       }
     },
     "src/platforms/ios/screenshot-status-bar.ts": {
@@ -1002,44 +955,42 @@
   "runtime_coverage_findings": [],
   "target_keys": [
     "src/daemon/handlers/snapshot-capture.ts:high impact",
-    "src/daemon/handlers/session.ts:complexity",
     "src/daemon/handlers/session-device-utils.ts:high impact",
+    "src/utils/process-identity.ts:high impact",
+    "src/daemon/handlers/session.ts:complexity",
     "src/client-shared.ts:high impact",
+    "src/daemon/context.ts:high impact",
+    "src/daemon/handlers/session-replay-heal.ts:complexity",
+    "src/cli/commands/connection-runtime.ts:complexity",
     "src/daemon/handlers/session-replay-script.ts:complexity",
     "src/commands/selector-read-utils.ts:high impact",
-    "src/daemon/config.ts:high impact",
-    "src/daemon/handlers/session-replay-heal.ts:complexity",
     "src/daemon/android-snapshot-freshness.ts:high impact",
-    "src/cli/commands/connection-runtime.ts:complexity",
-    "src/platforms/boot-diagnostics.ts:complexity",
-    "src/utils/args.ts:high impact",
-    "src/daemon/session-store.ts:complexity",
+    "src/daemon/config.ts:high impact",
     "src/daemon/handlers/session-open-target.ts:high impact",
     "src/daemon/handlers/snapshot-alert.ts:complexity",
-    "src/utils/success-text.ts:high impact",
+    "src/daemon/script-utils.ts:high impact",
+    "src/platforms/boot-diagnostics.ts:complexity",
     "src/daemon/handlers/session-inventory.ts:complexity",
+    "src/utils/success-text.ts:high impact",
+    "src/cli/commands/output.ts:untested risk",
     "src/daemon/handlers/install-source.ts:complexity",
     "src/utils/snapshot-processing.ts:high impact",
-    "src/cli/commands/output.ts:untested risk",
-    "src/daemon/script-utils.ts:high impact",
-    "src/utils/process-identity.ts:high impact",
-    "src/utils/output.ts:high impact",
-    "src/cli.ts:complexity",
-    "src/platforms/ios/xml.ts:high impact",
     "src/daemon/handlers/session-state.ts:complexity",
     "src/daemon/handlers/session-open.ts:complexity",
+    "src/utils/snapshot-lines.ts:high impact",
+    "src/utils/output.ts:high impact",
+    "src/platforms/ios/xml.ts:high impact",
     "src/daemon/request-cancel.ts:high impact",
+    "src/utils/args.ts:high impact",
+    "src/cli.ts:complexity",
+    "src/client-metro.ts:complexity",
     "src/utils/device.ts:high impact",
-    "src/utils/snapshot-lines.ts:high impact",
     "src/daemon/app-log-process.ts:high impact",
     "src/utils/selector-build.ts:high impact",
-    "src/client-metro.ts:complexity",
-    "src/platforms/android/input-actions.ts:complexity",
     "src/utils/text-surface.ts:high impact",
     "src/cli-test.ts:untested risk",
     "src/utils/keyed-lock.ts:high impact",
     "src/core/batch.ts:complexity",
-    "src/platforms/ios/runner-xctestrun.ts:complexity",
     "src/daemon/app-log-stream.ts:high impact",
     "src/platforms/android/sdk.ts:high impact",
     "src/utils/source-value.ts:high impact",

fallow-baselines/health.json

@@ -637,6 +637,48 @@ test('clipboard read keeps human text output through the typed client command AP
   assert.equal(stdout, 'hello\n');
 });
 
+test('keyboard status prints Android input ownership in human output', async () => {
+  const client = createStubClient({
+    installFromSource: async () => {
+      throw new Error('unexpected install call');
+    },
+  });
+  client.command.keyboard = async () => ({
+    platform: 'android',
+    action: 'status',
+    visible: true,
+    type: 'text',
+    inputMethodPackage: 'com.google.android.inputmethod.latin',
+    focusedPackage: 'com.google.android.inputmethod.latin',
+    focusedResourceId: 'com.google.android.inputmethod.latin:id/handwriting',
+    inputOwner: 'ime',
+  });
+
+  const stdout = await captureStdout(async () => {
+    const handled = await tryRunClientBackedCommand({
+      command: 'keyboard',
+      positionals: ['status'],
+      flags: {
+        json: false,
+        help: false,
+        version: false,
+      },
+      client,
+    });
+    assert.equal(handled, true);
+  });
+
+  assert.match(stdout, /Keyboard visible: yes/);
+  assert.match(stdout, /Input type: text/);
+  assert.match(stdout, /Input owner: ime/);
+  assert.match(stdout, /Input method: com\.google\.android\.inputmethod\.latin/);
+  assert.match(
+    stdout,
+    /Focused resource: com\.google\.android\.inputmethod\.latin:id\/handwriting/,
+  );
+  assert.match(stdout, /Next action: Focused input appears to be owned by the keyboard\/IME/);
+});
+
 test('metro prepare wraps output in the standard success envelope for --json', async () => {
   const client = createStubClient({
     installFromSource: async () => {

src/__tests__/cli-client-commands.test.ts

@@ -75,6 +75,38 @@ test('cli does not tail local daemon log when remote daemon base URL is set', as
   }
 });
 
+test('cli debug log tail starts at the current daemon log end', async () => {
+  const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-cli-tail-'));
+  const daemonPaths = resolveDaemonPaths(stateDir);
+  fs.mkdirSync(path.dirname(daemonPaths.logPath), { recursive: true });
+  fs.writeFileSync(daemonPaths.logPath, 'OLD_TAIL_SENTINEL\n', 'utf8');
+
+  try {
+    const result = await captureCli(
+      ['clipboard', 'write', 'hello', '--debug', '--state-dir', stateDir],
+      async () => {
+        await new Promise((resolve) => setTimeout(resolve, 250));
+        fs.appendFileSync(daemonPaths.logPath, 'NEW_TAIL_SENTINEL\n', 'utf8');
+        await new Promise((resolve) => setTimeout(resolve, 250));
+        return {
+          ok: true,
+          data: { action: 'write', message: 'Clipboard updated' },
+        };
+      },
+      {
+        stateDirPrefix: 'agent-device-cli-diagnostics-',
+      },
+    );
+
+    assert.equal(result.code, null);
+    assert.equal(result.stdout.includes('OLD_TAIL_SENTINEL'), false);
+    assert.equal(result.stdout.includes('NEW_TAIL_SENTINEL'), true);
+    assert.match(result.stdout, /Clipboard updated/);
+  } finally {
+    fs.rmSync(stateDir, { recursive: true, force: true });
+  }
+});
+
 test('cli returns normalized JSON failures with diagnostics fields', async () => {
   const result = await runCliCapture(['open', 'settings', '--json'], async () => ({
     ok: false,

src/__tests__/cli-diagnostics.test.ts

@@ -83,7 +83,8 @@ test('help workflow preserves known device workaround guidance', async () => {
   assert.match(result.stdout, /do not write network log headers/);
   assert.match(result.stdout, /iOS Allow Paste prompt cannot be exercised under XCUITest/);
   assert.match(result.stdout, /agent-device clipboard write "some text"/);
-  assert.match(result.stdout, /trusted ADB keyboard IME/);
+  assert.match(result.stdout, /provider-native text injection when available/);
+  assert.match(result.stdout, /Do not switch to raw adb, clipboard, or paste as an agent fallback/);
 });
 
 test('help unknown command prints error plus global usage and skips daemon dispatch', async () => {

src/__tests__/cli-help.test.ts

@@ -236,15 +236,22 @@ async function listenNotFoundServer(): Promise<number> {
 }
 
 async function stopChild(child: ReturnType<typeof spawn>): Promise<void> {
-  if (child.exitCode !== null || child.killed) return;
+  if (child.exitCode !== null || child.signalCode !== null) return;
+  const waitForClose = () =>
+    new Promise<boolean>((resolve) => {
+      if (child.exitCode !== null || child.signalCode !== null) {
+        resolve(true);
+        return;
+      }
+      child.once('close', () => resolve(true));
+    });
+  const closePromise = waitForClose();
   child.kill('SIGTERM');
-  const exited = await Promise.race([
-    new Promise<boolean>((resolve) => child.once('close', () => resolve(true))),
-    delay(2_000).then(() => false),
-  ]);
+  const exited = await Promise.race([closePromise, delay(2_000).then(() => false)]);
   if (exited) return;
+  const killClosePromise = waitForClose();
   child.kill('SIGKILL');
-  await new Promise<void>((resolve) => child.once('close', () => resolve()));
+  await killClosePromise;
 }
 
 function spawnMetroCompanionWorker(options: {

src/__tests__/client-companion-tunnel-worker.test.ts

@@ -103,7 +103,7 @@ test('runtime snapshot emits filtered Android guidance from backend analysis', a
   });
 
   assert.deepEqual(result.warnings, [
-    'Interactive snapshot is empty after filtering 42 raw Android nodes. Likely causes: depth too low, transient route change, or collector filtering.',
+    'Interactive snapshot is empty after filtering 42 raw Android nodes. Likely causes: the app content is not accessibility-visible yet, a transient route change, or depth/filter options hid the target.',
     'Interactive output is empty at depth 3; retry without -d.',
   ]);
 });

src/__tests__/runtime-snapshot.test.ts

@@ -11,6 +11,8 @@ export {
   type AndroidAdbPuller,
   type AndroidAdbSpawner,
   type AndroidAdbTransferOptions,
+  type AndroidTextInjectionRequest,
+  type AndroidTextInjector,
   type AndroidPortReverseEndpoint,
   type AndroidPortReverseMapping,
   type AndroidPortReverseOptions,

src/android-adb.ts

@@ -506,7 +506,7 @@ if (isDirectRun) {
 
 function startDaemonLogTail(logPath: string): (() => void) | null {
   try {
-    let offset = 0;
+    let offset = fs.existsSync(logPath) ? fs.statSync(logPath).size : 0;
     let stopped = false;
     const interval = setInterval(() => {
       if (stopped) return;