claude-in-mobile 3.11.4 → 3.12.0

package/dist/adapters/platform-adapter.d.ts

@@ -70,6 +70,14 @@ export declare function hasAppManagement(adapter: CorePlatformAdapter): adapter
 export declare function hasPermissions(adapter: CorePlatformAdapter): adapter is CorePlatformAdapter & PermissionAdapter;
 export declare function hasShell(adapter: CorePlatformAdapter): adapter is CorePlatformAdapter & ShellAdapter;
 export declare function hasSyncScreenshot(adapter: CorePlatformAdapter): adapter is CorePlatformAdapter & SyncScreenshotAdapter;
+export declare class CapabilityNotSupportedError extends Error {
+    readonly platform: Platform;
+    readonly capability: string;
+    constructor(platform: Platform, capability: string);
+}
+export declare function requireAppManagement(adapter: CorePlatformAdapter): CorePlatformAdapter & AppManagementAdapter;
+export declare function requirePermissions(adapter: CorePlatformAdapter): CorePlatformAdapter & PermissionAdapter;
+export declare function requireShell(adapter: CorePlatformAdapter): CorePlatformAdapter & ShellAdapter;
 /**
  * Legacy full interface -- the intersection of ALL capabilities.
  *

package/dist/adapters/platform-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform-adapter.d.ts","sourceRoot":"","sources":["../../src/adapters/platform-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"platform-adapter.d.ts","sourceRoot":"","sources":["../../src/adapters/platform-adapter.ts"],"names":[],"mappings":"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"}

package/dist/adapters/platform-adapter.js

@@ -36,4 +36,33 @@ export function hasShell(adapter) {
 export function hasSyncScreenshot(adapter) {
     return "screenshotRaw" in adapter;
 }
+// ============ Capability requirement helpers ============
+export class CapabilityNotSupportedError extends Error {
+    platform;
+    capability;
+    constructor(platform, capability) {
+        super(`Capability '${capability}' is not supported on platform '${platform}'.`);
+        this.platform = platform;
+        this.capability = capability;
+        this.name = "CapabilityNotSupportedError";
+    }
+}
+export function requireAppManagement(adapter) {
+    if (!hasAppManagement(adapter)) {
+        throw new CapabilityNotSupportedError(adapter.platform, "AppManagement");
+    }
+    return adapter;
+}
+export function requirePermissions(adapter) {
+    if (!hasPermissions(adapter)) {
+        throw new CapabilityNotSupportedError(adapter.platform, "Permissions");
+    }
+    return adapter;
+}
+export function requireShell(adapter) {
+    if (!hasShell(adapter)) {
+        throw new CapabilityNotSupportedError(adapter.platform, "Shell");
+    }
+    return adapter;
+}
 //# sourceMappingURL=platform-adapter.js.map

package/dist/adapters/platform-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform-adapter.js","sourceRoot":"","sources":["../../src/adapters/platform-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AA4EH,wCAAwC;AAExC,MAAM,UAAU,gBAAgB,CAAC,OAA4B;IAC3D,OAAO,CACL,WAAW,IAAI,OAAO;QACtB,SAAS,IAAI,OAAO;QACpB,YAAY,IAAI,OAAO,CACxB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAA4B;IACzD,OAAO,CACL,iBAAiB,IAAI,OAAO;QAC5B,kBAAkB,IAAI,OAAO;QAC7B,kBAAkB,IAAI,OAAO,CAC9B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,OAA4B;IACnD,OAAO,CACL,OAAO,IAAI,OAAO;QAClB,SAAS,IAAI,OAAO;QACpB,WAAW,IAAI,OAAO,CACvB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAA4B;IAC5D,OAAO,eAAe,IAAI,OAAO,CAAC;AACpC,CAAC"}
+{"version":3,"file":"platform-adapter.js","sourceRoot":"","sources":["../../src/adapters/platform-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AA4EH,wCAAwC;AAExC,MAAM,UAAU,gBAAgB,CAAC,OAA4B;IAC3D,OAAO,CACL,WAAW,IAAI,OAAO;QACtB,SAAS,IAAI,OAAO;QACpB,YAAY,IAAI,OAAO,CACxB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAA4B;IACzD,OAAO,CACL,iBAAiB,IAAI,OAAO;QAC5B,kBAAkB,IAAI,OAAO;QAC7B,kBAAkB,IAAI,OAAO,CAC9B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,OAA4B;IACnD,OAAO,CACL,OAAO,IAAI,OAAO;QAClB,SAAS,IAAI,OAAO;QACpB,WAAW,IAAI,OAAO,CACvB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAA4B;IAC5D,OAAO,eAAe,IAAI,OAAO,CAAC;AACpC,CAAC;AAED,2DAA2D;AAE3D,MAAM,OAAO,2BAA4B,SAAQ,KAAK;IACxB;IAAoC;IAAhE,YAA4B,QAAkB,EAAkB,UAAkB;QAChF,KAAK,CAAC,eAAe,UAAU,mCAAmC,QAAQ,IAAI,CAAC,CAAC;QADtD,aAAQ,GAAR,QAAQ,CAAU;QAAkB,eAAU,GAAV,UAAU,CAAQ;QAEhF,IAAI,CAAC,IAAI,GAAG,6BAA6B,CAAC;IAC5C,CAAC;CACF;AAED,MAAM,UAAU,oBAAoB,CAClC,OAA4B;IAE5B,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,2BAA2B,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAA4B;IAE5B,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,2BAA2B,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,OAA4B;IAE5B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,2BAA2B,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/adb/client.d.ts

@@ -1,3 +1,8 @@
+import { type LogcatOptions } from "./logcat.js";
+export { escapeAndroidInputText, splitArgs } from "./text-escape.js";
+export { UiTreeCache } from "./ui-tree-cache.js";
+export { ANDROID_KEYCODES, ANDROID_KEYCODES_FAST, resolveKeyCode } from "./keycodes.js";
+export { EXEC_TIMEOUT_MS, EXEC_RAW_TIMEOUT_MS, execAdb, execAdbAsync, execAdbRaw, execAdbRawAsync, } from "./exec.js";
 export interface Device {
     id: string;
     state: string;
@@ -5,12 +10,9 @@ export interface Device {
 }
 export declare class AdbClient {
     private deviceId?;
-    private uiTreeCache;
-    private uiTreeCacheTTL;
+    private readonly uiTreeCache;
     constructor(deviceId?: string);
     private get deviceFlag();
-    /** Build device-flag argv slice for a specific deviceId override or fall back to instance default. */
-    private deviceArgs;
     /**
      * SECURITY: All adb invocations route through this argv-form path (execFileSync — no /bin/sh -c).
      * Shell metacharacters in `args` are passed as literal argv slots, not parsed by the host shell.
@@ -118,11 +120,6 @@ export declare class AdbClient {
      * so the next getUiHierarchy call fetches fresh data.
      */
     invalidateUiTreeCache(): void;
-    /**
-     * Strip the "UI hierachy dumped to: /dev/tty" prefix that some devices
-     * prepend when dumping to stdout via /dev/tty.
-     */
-    private stripDumpPrefix;
     /**
      * Get UI hierarchy XML (sync — blocks event loop)
      */
@@ -215,13 +212,7 @@ export declare class AdbClient {
      * Get device logs (logcat)
      * @param options - filter options
      */
-    getLogs(options?: {
-        tag?: string;
-        level?: "V" | "D" | "I" | "W" | "E" | "F";
-        lines?: number;
-        since?: string;
-        package?: string;
-    }): string;
+    getLogs(options?: LogcatOptions): string;
     /**
      * Clear logcat buffer
      */

package/dist/adb/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/adb/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/adb/client.ts"],"names":[],"mappings":"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"}

package/dist/adb/client.js

@@ -1,47 +1,21 @@
-import { execFile, execFileSync } from "child_process";
-import { promisify } from "util";
-import { classifyAdbError } from "../errors.js";
+import { execFileSync } from "child_process";
 import { resolveAdbPath } from "./resolver.js";
-import { validatePackageName, validatePermission, validateDeviceId, validateLogTag, validateLogTimestamp } from "../utils/sanitize.js";
-const execFileAsync = promisify(execFile);
-const EXEC_TIMEOUT_MS = 15_000; // 15s for text commands
-const EXEC_RAW_TIMEOUT_MS = 30_000; // 30s for binary (screenshots)
-/**
- * Split a whitespace-separated command into argv tokens.
- * Safe for commands that do not contain shell-quoted strings.
- * For commands with spaces inside arguments (e.g. text input), use execArgs() directly.
- */
-function splitArgs(command) {
-    return command.split(/\s+/).filter(Boolean);
-}
-/**
- * Escape user text for safe embedding inside a double-quoted `input text "..."` on the
- * device shell. The OUTER context (host shell) never parses this string — it travels as a
- * single argv slot to adb (see inputText/inputTextAsync). Escaping covers only device-side
- * shell metacharacters within double quotes plus Android `input`'s `%s`-for-space quirk.
- */
-function escapeAndroidInputText(text) {
-    return text
-        .replace(/[\n\r]/g, "")
-        .replace(/\\/g, "\\\\")
-        .replace(/"/g, '\\"')
-        .replace(/'/g, "\\'")
-        .replace(/`/g, "\\`")
-        .replace(/\$/g, "\\$")
-        .replace(/ /g, "%s")
-        .replace(/&/g, "\\&")
-        .replace(/\(/g, "\\(")
-        .replace(/\)/g, "\\)")
-        .replace(/</g, "\\<")
-        .replace(/>/g, "\\>")
-        .replace(/\|/g, "\\|")
-        .replace(/;/g, "\\;");
-}
+import { validatePackageName, validatePermission, validateDeviceId } from "../utils/sanitize.js";
+import { EXEC_TIMEOUT_MS, execAdb, execAdbAsync, execAdbRaw, execAdbRawAsync, } from "./exec.js";
+import { escapeAndroidInputText, splitArgs } from "./text-escape.js";
+import { UiTreeCache } from "./ui-tree-cache.js";
+import { ANDROID_KEYCODES, ANDROID_KEYCODES_FAST, resolveKeyCode } from "./keycodes.js";
+import { parseDevicesOutput, parseScreenSize, parseCurrentActivityFromActivities, parseCurrentFocusFromWindows, parseFocusFromDumpsysWindow, parseClipboardBroadcast, parseLaunchActivity, stripDumpPrefix, splitActionAndUiXml, } from "./parsers.js";
+import { buildLogcatArgs, filterLogsByPackage } from "./logcat.js";
+// Re-export helpers so existing imports of `src/adb/client.js` keep working.
+export { escapeAndroidInputText, splitArgs } from "./text-escape.js";
+export { UiTreeCache } from "./ui-tree-cache.js";
+export { ANDROID_KEYCODES, ANDROID_KEYCODES_FAST, resolveKeyCode } from "./keycodes.js";
+export { EXEC_TIMEOUT_MS, EXEC_RAW_TIMEOUT_MS, execAdb, execAdbAsync, execAdbRaw, execAdbRawAsync, } from "./exec.js";
 export class AdbClient {
     deviceId;
     // Turbo: UI tree TTL cache (active only when turbo=true is passed)
-    uiTreeCache = null;
-    uiTreeCacheTTL = 500; // ms
+    uiTreeCache = new UiTreeCache(500);
     constructor(deviceId) {
         if (deviceId) {
             validateDeviceId(deviceId);
@@ -51,72 +25,19 @@ export class AdbClient {
     get deviceFlag() {
         return this.deviceId ? `-s ${this.deviceId}` : "";
     }
-    /** Build device-flag argv slice for a specific deviceId override or fall back to instance default. */
-    deviceArgs(deviceIdOverride) {
-        const id = deviceIdOverride ?? this.deviceId;
-        return id ? ["-s", id] : [];
-    }
     /**
      * SECURITY: All adb invocations route through this argv-form path (execFileSync — no /bin/sh -c).
      * Shell metacharacters in `args` are passed as literal argv slots, not parsed by the host shell.
      * This structurally prevents host-side OS Command Injection (CWE-78) — see issue #40.
      */
     execArgs(args, deviceIdOverride) {
-        const adbBin = resolveAdbPath();
-        const fullArgs = [...this.deviceArgs(deviceIdOverride), ...args];
-        try {
-            return execFileSync(adbBin, fullArgs, {
-                encoding: "utf-8",
-                timeout: EXEC_TIMEOUT_MS,
-                maxBuffer: 50 * 1024 * 1024,
-            }).trim();
-        }
-        catch (error) {
-            const e = error;
-            const display = `adb ${fullArgs.join(" ")}`;
-            if (e.killed === true || e.signal === "SIGTERM") {
-                throw new Error(`ADB command timed out after ${EXEC_TIMEOUT_MS}ms: ${display}. Device may be disconnected or screen locked.`);
-            }
-            throw classifyAdbError(e.stderr?.toString() ?? e.message ?? String(error), display);
-        }
+        return execAdb(args, deviceIdOverride ?? this.deviceId);
     }
     execArgsRaw(args, deviceIdOverride) {
-        const adbBin = resolveAdbPath();
-        const fullArgs = [...this.deviceArgs(deviceIdOverride), ...args];
-        try {
-            return execFileSync(adbBin, fullArgs, {
-                timeout: EXEC_RAW_TIMEOUT_MS,
-                maxBuffer: 50 * 1024 * 1024,
-            });
-        }
-        catch (error) {
-            const e = error;
-            const display = `adb ${fullArgs.join(" ")}`;
-            if (e.killed === true || e.signal === "SIGTERM") {
-                throw new Error(`ADB command timed out after ${EXEC_RAW_TIMEOUT_MS}ms: ${display}. Device may be disconnected or screen locked.`);
-            }
-            throw classifyAdbError(e.stderr?.toString() ?? e.message ?? String(error), display);
-        }
+        return execAdbRaw(args, deviceIdOverride ?? this.deviceId);
     }
     async execArgsAsync(args, deviceIdOverride) {
-        const adbBin = resolveAdbPath();
-        const fullArgs = [...this.deviceArgs(deviceIdOverride), ...args];
-        try {
-            const { stdout } = await execFileAsync(adbBin, fullArgs, {
-                timeout: EXEC_TIMEOUT_MS,
-                maxBuffer: 50 * 1024 * 1024,
-                encoding: "utf-8",
-            });
-            return stdout.trim();
-        }
-        catch (error) {
-            const e = error;
-            const display = `adb ${fullArgs.join(" ")}`;
-            if (e.killed === true || e.signal === "SIGTERM") {
-                throw new Error(`ADB command timed out after ${EXEC_TIMEOUT_MS}ms: ${display}. Device may be disconnected or screen locked.`);
-            }
-            throw classifyAdbError(e.stderr?.toString() ?? e.message ?? String(error), display);
-        }
+        return execAdbAsync(args, deviceIdOverride ?? this.deviceId);
     }
     /**
      * Execute ADB command and return stdout as string.
@@ -143,24 +64,7 @@ export class AdbClient {
      * Execute ADB command async and return raw bytes (for screenshots)
      */
     async execRawAsync(command, deviceIdOverride) {
-        const adbBin = resolveAdbPath();
-        const fullArgs = [...this.deviceArgs(deviceIdOverride), ...splitArgs(command)];
-        try {
-            const { stdout } = await execFileAsync(adbBin, fullArgs, {
-                timeout: EXEC_RAW_TIMEOUT_MS,
-                maxBuffer: 50 * 1024 * 1024,
-                encoding: "buffer",
-            });
-            return stdout;
-        }
-        catch (error) {
-            const e = error;
-            const display = `adb ${fullArgs.join(" ")}`;
-            if (e.killed === true || e.signal === "SIGTERM") {
-                throw new Error(`ADB command timed out after ${EXEC_RAW_TIMEOUT_MS}ms: ${display}. Device may be disconnected or screen locked.`);
-            }
-            throw classifyAdbError(e.stderr?.toString() ?? e.message ?? String(error), display);
-        }
+        return execAdbRawAsync(splitArgs(command), deviceIdOverride ?? this.deviceId);
     }
     /**
      * Get list of connected devices
@@ -168,20 +72,7 @@ export class AdbClient {
     getDevices() {
         const adbBin = resolveAdbPath();
         const output = execFileSync(adbBin, ["devices", "-l"], { encoding: "utf-8", timeout: EXEC_TIMEOUT_MS });
-        const lines = output.split("\n").slice(1); // Skip header
-        return lines
-            .filter(line => line.trim())
-            .map(line => {
-            const parts = line.split(/\s+/);
-            const id = parts[0];
-            const state = parts[1];
-            const modelMatch = line.match(/model:(\S+)/);
-            return {
-                id,
-                state,
-                model: modelMatch?.[1]
-            };
-        });
+        return parseDevicesOutput(output);
     }
     /**
      * Set active device
@@ -261,8 +152,7 @@ export class AdbClient {
         catch {
             try {
                 const result = this.exec("shell am broadcast -a clipper.get");
-                const match = result.match(/data="([^"]*)"/);
-                return match?.[1] ?? "(clipboard not available)";
+                return parseClipboardBroadcast(result) ?? "(clipboard not available)";
             }
             catch {
                 return "(clipboard access not available — requires API 29+ or clipper app)";
@@ -286,10 +176,7 @@ export class AdbClient {
      */
     swipeDirection(direction, distance = 800) {
         // Get screen size
-        const sizeOutput = this.exec("shell wm size");
-        const match = sizeOutput.match(/(\d+)x(\d+)/);
-        const width = match ? parseInt(match[1]) : 1080;
-        const height = match ? parseInt(match[2]) : 1920;
+        const { width, height } = parseScreenSize(this.exec("shell wm size"));
         const centerX = Math.floor(width / 2);
         const centerY = Math.floor(height / 2);
         const coords = {
@@ -316,47 +203,7 @@ export class AdbClient {
      * Press key by name or keycode
      */
     pressKey(key) {
-        const keyCodes = {
-            "BACK": 4,
-            "HOME": 3,
-            "MENU": 82,
-            "ENTER": 66,
-            "TAB": 61,
-            "DELETE": 67,
-            "BACKSPACE": 67,
-            "POWER": 26,
-            "VOLUME_UP": 24,
-            "VOLUME_DOWN": 25,
-            "VOLUME_MUTE": 164,
-            "CAMERA": 27,
-            "APP_SWITCH": 187,
-            "DPAD_UP": 19,
-            "DPAD_DOWN": 20,
-            "DPAD_LEFT": 21,
-            "DPAD_RIGHT": 22,
-            "DPAD_CENTER": 23,
-            "SEARCH": 84,
-            "ESCAPE": 111,
-            "SPACE": 62,
-            "WAKEUP": 224,
-            "SLEEP": 223,
-            "BRIGHTNESS_UP": 221,
-            "BRIGHTNESS_DOWN": 220,
-            "MEDIA_PLAY_PAUSE": 85,
-            "MEDIA_NEXT": 87,
-            "MEDIA_PREVIOUS": 88,
-            "MEDIA_STOP": 86,
-            "MUTE": 91,
-            "NOTIFICATION": 83,
-            "SETTINGS": 176,
-            "COPY": 278,
-            "PASTE": 279,
-            "CUT": 277,
-        };
-        const keyCode = keyCodes[key.toUpperCase()] ?? parseInt(key);
-        if (isNaN(keyCode)) {
-            throw new Error(`Unknown key: ${key}`);
-        }
+        const keyCode = resolveKeyCode(key, ANDROID_KEYCODES);
         this.exec(`shell input keyevent ${keyCode}`);
     }
     /**
@@ -365,54 +212,48 @@ export class AdbClient {
      * so the next getUiHierarchy call fetches fresh data.
      */
     invalidateUiTreeCache() {
-        this.uiTreeCache = null;
-    }
-    /**
-     * Strip the "UI hierachy dumped to: /dev/tty" prefix that some devices
-     * prepend when dumping to stdout via /dev/tty.
-     */
-    stripDumpPrefix(raw) {
-        const idx = raw.indexOf("<?xml");
-        if (idx > 0)
-            return raw.slice(idx);
-        return raw;
+        this.uiTreeCache.invalidate();
     }
     /**
      * Get UI hierarchy XML (sync — blocks event loop)
      */
     getUiHierarchy(turbo) {
-        if (turbo && this.uiTreeCache && Date.now() - this.uiTreeCache.timestamp < this.uiTreeCacheTTL) {
-            return this.uiTreeCache.xml;
+        if (turbo) {
+            const cached = this.uiTreeCache.get();
+            if (cached !== null)
+                return cached;
         }
         let xml;
         if (turbo) {
             // Single ADB call: pipe XML directly to stdout
-            xml = this.stripDumpPrefix(this.exec("exec-out uiautomator dump /dev/tty"));
+            xml = stripDumpPrefix(this.exec("exec-out uiautomator dump /dev/tty"));
         }
         else {
             this.exec("shell uiautomator dump /sdcard/ui.xml");
             xml = this.exec("shell cat /sdcard/ui.xml");
         }
-        this.uiTreeCache = { xml, timestamp: Date.now() };
+        this.uiTreeCache.set(xml);
         return xml;
     }
     /**
      * Get UI hierarchy XML async (non-blocking)
      */
     async getUiHierarchyAsync(turbo) {
-        if (turbo && this.uiTreeCache && Date.now() - this.uiTreeCache.timestamp < this.uiTreeCacheTTL) {
-            return this.uiTreeCache.xml;
+        if (turbo) {
+            const cached = this.uiTreeCache.get();
+            if (cached !== null)
+                return cached;
         }
         let xml;
         if (turbo) {
             // Single ADB call: pipe XML directly to stdout
-            xml = this.stripDumpPrefix(await this.execAsync("exec-out uiautomator dump /dev/tty"));
+            xml = stripDumpPrefix(await this.execAsync("exec-out uiautomator dump /dev/tty"));
         }
         else {
             await this.execAsync("shell uiautomator dump /sdcard/ui.xml");
             xml = await this.execAsync("shell cat /sdcard/ui.xml");
         }
-        this.uiTreeCache = { xml, timestamp: Date.now() };
+        this.uiTreeCache.set(xml);
         return xml;
     }
     /**
@@ -427,17 +268,7 @@ export class AdbClient {
     async execWithUiDump(actionCommand, deviceIdOverride) {
         const combined = `${actionCommand} && uiautomator dump /dev/tty`;
         const raw = await this.execArgsAsync(["shell", "sh", "-c", combined], deviceIdOverride);
-        // Split output: everything before XML is action output, XML starts with <?xml or <hierarchy
-        const xmlStart = raw.indexOf("<?xml");
-        const xmlStartAlt = raw.indexOf("<hierarchy");
-        const splitIdx = xmlStart >= 0 ? xmlStart : xmlStartAlt;
-        if (splitIdx < 0) {
-            // No XML found — dump may have failed, return action output only
-            return { actionOutput: raw.trim(), uiXml: "" };
-        }
-        const actionOutput = raw.substring(0, splitIdx).trim();
-        const uiXml = this.stripDumpPrefix(raw.substring(splitIdx));
-        return { actionOutput, uiXml };
+        return splitActionAndUiXml(raw);
     }
     /**
      * Tap at coordinates (async, non-blocking — for turbo mode).
@@ -455,16 +286,7 @@ export class AdbClient {
      * Press key (async, non-blocking — for turbo mode).
      */
     async pressKeyAsync(key, deviceIdOverride) {
-        const keyCodes = {
-            "BACK": 4, "HOME": 3, "MENU": 82, "ENTER": 66, "TAB": 61,
-            "DELETE": 67, "BACKSPACE": 67, "POWER": 26, "VOLUME_UP": 24,
-            "VOLUME_DOWN": 25, "ESCAPE": 111, "SPACE": 62, "DPAD_UP": 19,
-            "DPAD_DOWN": 20, "DPAD_LEFT": 21, "DPAD_RIGHT": 22,
-        };
-        const keyCode = keyCodes[key.toUpperCase()] ?? parseInt(key);
-        if (isNaN(keyCode)) {
-            throw new Error(`Unknown key: ${key}`);
-        }
+        const keyCode = resolveKeyCode(key, ANDROID_KEYCODES_FAST);
         await this.execAsync(`shell input keyevent ${keyCode}`, deviceIdOverride);
     }
     /**
@@ -482,10 +304,10 @@ export class AdbClient {
         // Try to get launch activity
         try {
             const output = this.exec(`shell cmd package resolve-activity --brief ${packageName}`);
-            const activity = output.split("\n").find(line => line.includes("/"));
+            const activity = parseLaunchActivity(output);
             if (activity) {
-                this.exec(`shell am start -n ${activity.trim()}`);
-                return `Launched ${activity.trim()}`;
+                this.exec(`shell am start -n ${activity}`);
+                return `Launched ${activity}`;
             }
         }
         catch {
@@ -549,41 +371,22 @@ export class AdbClient {
      */
     getCurrentActivity() {
         try {
-            // Get focused activity (works on most Android versions)
             const output = this.exec("shell dumpsys activity activities");
-            // Try different patterns for different Android versions
-            const patterns = [
-                /mResumedActivity[^}]*?(\S+\/\.\S+)/, // Android 10+
-                /mResumedActivity[^}]*?(\S+\/\S+)/, // Generic
-                /resumedActivity[^}]*?(\S+\/\S+)/, // Some versions
-                /topResumedActivity[^}]*?(\S+\/\S+)/, // Android 12+
-                /mFocusedActivity[^}]*?(\S+\/\S+)/, // Older Android
-                /ResumedActivity[^}]*?(\S+\/\S+)/i, // Case-insensitive fallback
-            ];
-            for (const pattern of patterns) {
-                const match = output.match(pattern);
-                if (match?.[1]) {
-                    return match[1];
-                }
-            }
+            const resumed = parseCurrentActivityFromActivities(output);
+            if (resumed)
+                return resumed;
             // Fallback: try getting current focus from window manager
             const wmOutput = this.exec("shell dumpsys window windows");
-            const focusMatch = wmOutput.match(/mCurrentFocus[^}]*?(\S+\/\S+)/);
-            if (focusMatch?.[1]) {
-                return focusMatch[1];
-            }
+            const focused = parseCurrentFocusFromWindows(wmOutput);
+            if (focused)
+                return focused;
             return "unknown";
         }
         catch {
             // Try alternative method — Node-side filter replaces device-side `| grep`.
             try {
                 const output = this.execArgs(["shell", "dumpsys", "window"]);
-                const filtered = output
-                    .split("\n")
-                    .filter(line => /mCurrentFocus|mFocusedApp/.test(line))
-                    .join("\n");
-                const match = filtered.match(/(\S+\/\S+)/);
-                return match?.[1] ?? "unknown";
+                return parseFocusFromDumpsysWindow(output) ?? "unknown";
             }
             catch {
                 return "unknown (could not determine)";
@@ -594,12 +397,7 @@ export class AdbClient {
      * Get screen size
      */
     getScreenSize() {
-        const output = this.exec("shell wm size");
-        const match = output.match(/(\d+)x(\d+)/);
-        return {
-            width: match ? parseInt(match[1]) : 1080,
-            height: match ? parseInt(match[2]) : 1920
-        };
+        return parseScreenSize(this.exec("shell wm size"));
     }
     /**
      * Wait for device
@@ -618,31 +416,9 @@ export class AdbClient {
      * @param options - filter options
      */
     getLogs(options = {}) {
-        const args = ["shell", "logcat", "-d"];
-        if (options.level) {
-            args.push(`*:${options.level}`);
-        }
-        if (options.tag) {
-            validateLogTag(options.tag);
-            args.push("-s", options.tag);
-        }
-        if (options.lines) {
-            args.push("-t", String(Math.trunc(options.lines)));
-        }
-        if (options.since) {
-            validateLogTimestamp(options.since);
-            args.push("-t", options.since);
-        }
+        const args = buildLogcatArgs(options);
         const output = this.execArgs(args);
-        // Filter by package if specified
-        if (options.package) {
-            const lines = output.split("\n");
-            const filtered = lines.filter(line => line.includes(options.package) ||
-                line.match(/^\d+-\d+\s+\d+:\d+/) // Keep timestamp lines
-            );
-            return filtered.join("\n");
-        }
-        return output;
+        return options.package ? filterLogsByPackage(output, options.package) : output;
     }
     /**
      * Clear logcat buffer