@8bitbish/screenshot-service 1.3.15 → 1.5.0

package/bin/setup.js

@@ -104,33 +104,29 @@ async function runSetupIos() {
     ok('Installed: ' + python);
   }
 
-  // Sudoers (opt-in)
-  step(3, 'Passwordless tunnel (optional)');
-  console.log('  The iPhone screenshot tunnel runs under sudo. You can either:');
-  console.log('  • ' + C.bold + 'Grant passwordless sudo' + C.reset + ' for this specific command (recommended for convenience)');
-  console.log('  • Skip — you will be prompted for your password once per terminal session');
-  console.log('');
-  const ans = await prompt('Grant passwordless sudo for the tunnel daemon only? [y/N]');
-  if (/^[yY]/.test(ans)) {
-    const username = execSync('whoami').toString().trim();
-    const rule = `${username} ALL=(ALL) NOPASSWD: ${python} -m pymobiledevice3 remote tunneld`;
-    const sudoersFile = '/etc/sudoers.d/screenshot-service';
-    const scriptPath = path.join(tmpdir(), 'screenshot-service-setup.sh');
-    writeFileSync(scriptPath, [
-      '#!/bin/bash',
-      `printf '%s\\n' '${rule}' > '${sudoersFile}'`,
-      `chmod 440 '${sudoersFile}'`,
-    ].join('\n'), { mode: 0o755 });
+  // Background tunnel service. Not optional any more: checkIosSetup() keys
+  // `ok` off the daemon, and the old on-demand path needed a password that a
+  // non-interactive host app can never supply.
+  step(3, 'Background tunnel service');
+  const { tunnelDaemonStatus, tunnelDaemonInstallScript } = require('../dist/setup');
+  if (tunnelDaemonStatus().ok) {
+    ok('Background tunnel service already installed');
+  } else {
+    console.log('  The device tunnel needs root. Installing it as a launchd service means it');
+    console.log('  starts at boot, restarts itself if it wedges, and captures never wait on');
+    console.log('  a password. macOS will ask for your password once.');
+    console.log('');
+    const scriptPath = path.join(tmpdir(), 'screenshot-service-tunneld-setup.sh');
+    writeFileSync(scriptPath, '#!/bin/bash\nset -e\n' + tunnelDaemonInstallScript() + '\n', { mode: 0o755 });
     try {
       execSync(`osascript -e 'do shell script "${scriptPath}" with administrator privileges'`, { stdio: 'pipe' });
-      ok('Passwordless tunnel configured');
+      ok('Background tunnel service installed');
     } catch {
-      warn('Sudoers setup cancelled — you will be prompted for your password each session.');
+      warn('Tunnel service setup was cancelled — iPhone capture will not work until it is installed.');
+      warn('Re-run this command, or use Device management → iOS in the app.');
     } finally {
       try { unlinkSync(scriptPath); } catch {}
     }
-  } else {
-    log(C.dim + '  Skipped. You will be prompted for your Mac password the first time per session.' + C.reset);
   }
 
   // Device instructions

package/dist/dvtHelper.d.ts

@@ -0,0 +1,33 @@
+declare class DvtHelper {
+    private proc;
+    private ready;
+    private pending;
+    private nextId;
+    private buf;
+    /** Sticky: once the worker has proven unusable, stop paying to retry it. */
+    private disabled;
+    private reset;
+    private start;
+    private onData;
+    private send;
+    /** True when the worker is usable. Never throws — callers fall back. */
+    available(): Promise<boolean>;
+    /** Connect up front so the first capture doesn't pay the handshake. */
+    warm(udid?: string | null): Promise<void>;
+    screenshot(path: string, udid?: string | null): Promise<Record<string, unknown>>;
+    foregroundApp(udid?: string | null): Promise<Record<string, unknown>>;
+    /**
+     * Screenshot and foreground-app together. Issued CONCURRENTLY on purpose:
+     * one DVT connection multiplexes channels, so proclist overlaps the image
+     * transfer and is close to free. Doing this with two CLI processes instead
+     * silently yields no image — the sessions collide.
+     */
+    capture(path: string, udid?: string | null, wantForegroundApp?: boolean): Promise<{
+        bundleId: string;
+        name: string;
+    } | null>;
+    stop(): void;
+}
+export declare const dvtHelper: DvtHelper;
+export {};
+//# sourceMappingURL=dvtHelper.d.ts.map

package/dist/dvtHelper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dvtHelper.d.ts","sourceRoot":"","sources":["../dvtHelper.ts"],"names":[],"mappings":"AAqCA,cAAM,SAAS;IACb,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,GAAG,CAAM;IACjB,4EAA4E;IAC5E,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,KAAK;YAcC,KAAK;IAyCnB,OAAO,CAAC,MAAM;IAyBd,OAAO,CAAC,IAAI;IAiBZ,wEAAwE;IAClE,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAenC,uEAAuE;IACjE,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKzC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAK7C,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAKxC;;;;;OAKG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,iBAAiB,UAAO;kBAQ9C,MAAM;cAAQ,MAAM;;IAGhD,IAAI;CAKL;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}

package/dist/dvtHelper.js

@@ -0,0 +1,204 @@
+"use strict";
+// ── Persistent pymobiledevice3 worker ────────────────────────────────────────
+//
+// Client for python/pmd3_helper.py. See that file for why it exists; briefly:
+// every pmd3 CLI call pays ~1.8s of import + handshake before doing ~1s of
+// work, and a capture needs two. Holding one session takes a screenshot plus
+// foreground-app lookup from ~6.8s to ~2.5s.
+//
+// This is an OPTIMISATION, never a requirement. Every failure path falls back
+// to the CLI, so a machine where the worker can't start is slow, not broken.
+// Set SCREENSHOT_SERVICE_NO_HELPER=1 to force the CLI path.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dvtHelper = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const logger_1 = require("./logger");
+const python_1 = require("./setup/python");
+/** Worker startup: interpreter boot + pymobiledevice3 import. */
+const READY_TIMEOUT_MS = 15000;
+/** Per-request ceiling. Screenshots measured ~2.5s; this is generous. */
+const REQUEST_TIMEOUT_MS = 30000;
+function helperScriptPath() {
+    // dist/dvtHelper.js -> dist/python/pmd3_helper.py (copied by copy-assets.js).
+    const candidates = [
+        (0, path_1.join)(__dirname, "python", "pmd3_helper.py"),
+        (0, path_1.join)(__dirname, "..", "python", "pmd3_helper.py"),
+    ];
+    return candidates.find(fs_1.existsSync) ?? null;
+}
+class DvtHelper {
+    constructor() {
+        this.proc = null;
+        this.ready = null;
+        this.pending = new Map();
+        this.nextId = 1;
+        this.buf = "";
+        /** Sticky: once the worker has proven unusable, stop paying to retry it. */
+        this.disabled = false;
+    }
+    reset(reason) {
+        const proc = this.proc;
+        this.proc = null;
+        this.ready = null;
+        for (const [id, p] of this.pending) {
+            clearTimeout(p.timer);
+            p.reject(new Error(`dvt helper ${reason}`));
+            this.pending.delete(id);
+        }
+        if (proc) {
+            try {
+                proc.kill();
+            }
+            catch { /* already gone */ }
+        }
+    }
+    async start() {
+        if (this.ready)
+            return this.ready;
+        this.ready = (async () => {
+            const script = helperScriptPath();
+            if (!script)
+                throw new Error("pmd3_helper.py not found in package");
+            const python = await (0, python_1.findPythonAsync)();
+            if (!python)
+                throw new Error("no python with pymobiledevice3");
+            const proc = (0, child_process_1.spawn)(python, [script], { stdio: ["pipe", "pipe", "pipe"] });
+            this.proc = proc;
+            // pymobiledevice3 logs to stderr; drain it so the pipe can't fill and
+            // block the child, but don't treat it as failure.
+            proc.stderr?.on("data", () => { });
+            proc.on("exit", (code) => {
+                if (this.proc === proc)
+                    this.reset(`exited (code ${code})`);
+            });
+            proc.on("error", (err) => {
+                if (this.proc === proc)
+                    this.reset(`spawn error: ${err.message}`);
+            });
+            await new Promise((resolve, reject) => {
+                const timer = setTimeout(() => reject(new Error("helper did not report ready in time")), READY_TIMEOUT_MS);
+                const onReady = () => { clearTimeout(timer); resolve(); };
+                proc.stdout?.on("data", (chunk) => this.onData(chunk, onReady));
+            });
+        })();
+        try {
+            await this.ready;
+        }
+        catch (e) {
+            this.reset("failed to start");
+            throw e;
+        }
+        return this.ready;
+    }
+    onData(chunk, onReady) {
+        this.buf += chunk.toString();
+        let nl;
+        while ((nl = this.buf.indexOf("\n")) >= 0) {
+            const line = this.buf.slice(0, nl);
+            this.buf = this.buf.slice(nl + 1);
+            if (!line.trim())
+                continue;
+            let msg;
+            try {
+                msg = JSON.parse(line);
+            }
+            catch {
+                continue; // stray output — not ours
+            }
+            if (msg.ready === true) {
+                onReady?.();
+                continue;
+            }
+            const id = msg.id;
+            if (id === undefined)
+                continue;
+            const p = this.pending.get(id);
+            if (!p)
+                continue;
+            this.pending.delete(id);
+            clearTimeout(p.timer);
+            if (msg.ok === true)
+                p.resolve(msg);
+            else
+                p.reject(new Error(String(msg.error ?? "helper error")));
+        }
+    }
+    send(action, extra = {}) {
+        const proc = this.proc;
+        if (!proc?.stdin)
+            return Promise.reject(new Error("dvt helper not running"));
+        const id = this.nextId++;
+        return new Promise((resolve, reject) => {
+            const timer = setTimeout(() => {
+                this.pending.delete(id);
+                // A timed-out worker is presumed wedged; drop it so the next call
+                // starts clean rather than queueing behind a dead session.
+                this.reset("request timed out");
+                reject(new Error(`dvt helper timed out after ${REQUEST_TIMEOUT_MS}ms`));
+            }, REQUEST_TIMEOUT_MS);
+            this.pending.set(id, { resolve, reject, timer });
+            proc.stdin.write(JSON.stringify({ id, action, ...extra }) + "\n");
+        });
+    }
+    /** True when the worker is usable. Never throws — callers fall back. */
+    async available() {
+        if (this.disabled)
+            return false;
+        if (process.env.SCREENSHOT_SERVICE_NO_HELPER)
+            return false;
+        try {
+            await this.start();
+            return true;
+        }
+        catch (e) {
+            this.disabled = true;
+            logger_1.log.warn("dvt helper unavailable; using the CLI path", {
+                reason: e instanceof Error ? e.message : String(e),
+            });
+            return false;
+        }
+    }
+    /** Connect up front so the first capture doesn't pay the handshake. */
+    async warm(udid) {
+        if (!(await this.available()))
+            return;
+        await this.send("ping", udid ? { udid } : {}).catch(() => { });
+    }
+    async screenshot(path, udid) {
+        await this.start();
+        return this.send("screenshot", { path, ...(udid ? { udid } : {}) });
+    }
+    async foregroundApp(udid) {
+        await this.start();
+        return this.send("foregroundApp", udid ? { udid } : {});
+    }
+    /**
+     * Screenshot and foreground-app together. Issued CONCURRENTLY on purpose:
+     * one DVT connection multiplexes channels, so proclist overlaps the image
+     * transfer and is close to free. Doing this with two CLI processes instead
+     * silently yields no image — the sessions collide.
+     */
+    async capture(path, udid, wantForegroundApp = true) {
+        await this.start();
+        const shot = this.send("screenshot", { path, ...(udid ? { udid } : {}) });
+        const fg = wantForegroundApp
+            ? this.send("foregroundApp", udid ? { udid } : {}).catch(() => null)
+            : Promise.resolve(null);
+        const [, fgRes] = await Promise.all([shot, fg]);
+        const app = fgRes?.app ?? null;
+        return app;
+    }
+    stop() {
+        if (!this.proc)
+            return;
+        try {
+            this.proc.stdin?.write(JSON.stringify({ action: "quit" }) + "\n");
+        }
+        catch { }
+        this.reset("stopped");
+    }
+}
+exports.dvtHelper = new DvtHelper();
+//# sourceMappingURL=dvtHelper.js.map

package/dist/dvtHelper.js.map

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

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -26,6 +26,12 @@ const path_1 = require("path");
 const os_1 = require("os");
 const device_1 = require("./device");
 const logger_1 = require("./logger");
+// Shared resolver — index.ts used to keep its own copy with a SHORTER candidate
+// list, so a Mac with an unlinked (keg-only) brew python passed detection and
+// then failed every capture. One list, one cache, one behaviour.
+const python_1 = require("./setup/python");
+const dvtHelper_1 = require("./dvtHelper");
+const tunneld_1 = require("./setup/tunneld");
 var logger_2 = require("./logger");
 Object.defineProperty(exports, "setLogger", { enumerable: true, get: function () { return logger_2.setLogger; } });
 const android_device_1 = require("./android-device");
@@ -44,30 +50,6 @@ var wizard_1 = require("./wizard");
 Object.defineProperty(exports, "createSetupWindow", { enumerable: true, get: function () { return wizard_1.createSetupWindow; } });
 const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
 const PMD3 = ["-m", "pymobiledevice3"];
-// ── Python detection ──────────────────────────────────────────────────────────
-function findPython() {
-    // pymobiledevice3 requires Python 3.11+. Prefer newer versions, then fall back to PATH `python3`.
-    const candidates = [
-        "/opt/homebrew/bin/python3.14",
-        "/opt/homebrew/bin/python3.13",
-        "/opt/homebrew/bin/python3.12",
-        "/opt/homebrew/bin/python3.11",
-        "/usr/local/bin/python3.14",
-        "/usr/local/bin/python3.13",
-        "/usr/local/bin/python3.12",
-        "/usr/local/bin/python3.11",
-        "python3",
-    ];
-    const probe = "import sys, pymobiledevice3; sys.exit(0 if sys.version_info >= (3, 11) else 1)";
-    for (const p of candidates) {
-        try {
-            (0, child_process_1.execFileSync)(p, ["-c", probe], { stdio: "ignore" });
-            return p;
-        }
-        catch { }
-    }
-    throw new Error("Python 3.11+ with pymobiledevice3 not found. Run: npx @8bitbish/screenshot-service setup-ios");
-}
 // ── Tunnel management ─────────────────────────────────────────────────────────
 /**
  * Process-liveness check only — does NOT confirm tunneld's HTTP server is
@@ -114,35 +96,79 @@ function killTunneldProcess() {
     // -n means "non-interactive" — sudo fails immediately if a password is needed.
     return !isTunnelRunning();
 }
+/** Poll the health endpoint until it answers, or the budget runs out. */
+async function waitForHealthy(budgetMs) {
+    const deadline = Date.now() + budgetMs;
+    while (Date.now() < deadline) {
+        if (await isTunnelHealthy())
+            return true;
+        await new Promise((r) => setTimeout(r, 300));
+    }
+    return false;
+}
+/**
+ * Ask launchd to kill and respawn the tunnel daemon. `kickstart -k` handles
+ * the zombie case (alive process, dead HTTP server) in one step, and the
+ * setup wizard installs a sudoers rule permitting exactly this one command
+ * without a password — so unlike the old `sudo pkill`, it works from a
+ * non-interactive host app.
+ *
+ * A failed kickstart is not fatal: KeepAlive may already be respawning the
+ * job, so we poll regardless and let the health check decide.
+ */
+async function kickstartTunnelDaemon() {
+    try {
+        (0, child_process_1.execFileSync)("sudo", ["-n", "/bin/launchctl", "kickstart", "-k", `system/${tunneld_1.TUNNELD_LABEL}`], {
+            stdio: "ignore",
+            timeout: 5000,
+        });
+    }
+    catch {
+        logger_1.log.warn("launchctl kickstart failed (no sudoers grant, or launchd refused); relying on KeepAlive", {
+            label: tunneld_1.TUNNELD_LABEL,
+        });
+    }
+    // Must exceed ThrottleInterval: launchd may hold a respawn for the full
+    // throttle window, and a shorter budget would report failure a moment
+    // before the daemon returns. Throttle + 5s covers the tunnel's own startup.
+    return waitForHealthy((tunneld_1.TUNNELD_THROTTLE_SECONDS + 5) * 1000);
+}
 async function startTunnel() {
-    // Fast path: an existing tunneld that's actually healthy — no work to do.
+    // Fast path: a healthy tunnel — no work to do. On a machine with the
+    // LaunchDaemon this is the ONLY branch that ever runs, because launchd
+    // brought the tunnel up at boot.
     if (isTunnelRunning() && await isTunnelHealthy())
         return;
-    // Zombie case: a tunneld process exists but its HTTP server is dead. This
-    // happens after long uptimes / network changes / sleep — pgrep says "alive"
-    // but every pmd3 call fails with "Unable to connect to Tunneld", producing
-    // downstream errors like "Screenshot failed — is the iPhone unlocked and
-    // connected?" that point at the wrong root cause.
-    //
-    // tunneld runs as root (started with sudo). Killing it needs root too, and
-    // Electron's non-interactive context can't prompt for a password. So we try
-    // a best-effort passwordless kill; if that fails, throw a targeted error
-    // that tells the user exactly what to do rather than futilely retrying.
+    // ── Managed daemon ────────────────────────────────────────────────────────
+    // launchd owns the tunnel's lifecycle. We never spawn it ourselves and never
+    // invoke sudo on the capture path; the worst case is asking launchd to
+    // recycle a wedged job.
+    const daemon = (0, tunneld_1.tunnelDaemonStatus)();
+    if (daemon.present) {
+        logger_1.log.warn("tunnel unhealthy; asking launchd to recycle the daemon", { label: tunneld_1.TUNNELD_LABEL });
+        if (await kickstartTunnelDaemon())
+            return;
+        throw new Error("The device tunnel isn't responding and launchd couldn't restart it. " +
+            `See ${tunneld_1.TUNNELD_LOG_PATH}, or re-run iOS setup from the app to reinstall the tunnel service.`);
+    }
+    // ── Legacy on-demand path ─────────────────────────────────────────────────
+    // Machines set up before the daemon existed. Kept working, but every branch
+    // here needs root and cannot prompt for a password, which is precisely why
+    // the daemon replaced it — so the errors point at setup, not at a log file.
     if (isTunnelRunning()) {
         logger_1.log.warn("tunneld process is alive but HTTP endpoint unreachable; attempting restart", { port: 49151 });
         const killed = killTunneldProcess();
         if (!killed) {
-            const err = new Error("The Wi-Fi tunnel daemon (tunneld) is unresponsive but running as root, so this app can't restart it silently. " +
-                "Open Terminal and run:\n" +
-                "    sudo pkill -f 'pymobiledevice3 remote tunneld'\n" +
-                "Then try the action again — the app will start a fresh tunneld automatically.");
+            const err = new Error("The device tunnel is unresponsive and running as root, so this app can't restart it. " +
+                "Re-run iOS setup from the app (Device management → iOS) to install the background tunnel " +
+                "service, which recovers from this automatically. To unblock right now, run:\n" +
+                "    sudo pkill -f 'pymobiledevice3 remote tunneld'");
             logger_1.log.error("tunneld zombie detected; passwordless kill failed", err);
             throw err;
         }
-        // Give the OS a moment to reap the process before spawning a replacement.
         await new Promise((r) => setTimeout(r, 500));
     }
-    const python = findPython();
+    const python = await (0, python_1.findPythonAsyncOrThrow)();
     // Open the log file synchronously so spawn gets a real fd. Using
     // createWriteStream here is racy — the stream's fd is null until the async
     // 'open' fires, and spawn rejects WriteStreams with fd: null as invalid stdio.
@@ -151,20 +177,15 @@ async function startTunnel() {
         detached: true,
         stdio: ["ignore", logFd, logFd],
     });
-    // Spawn dup'd the fd for the child; close our parent-side copy to avoid leaking.
     (0, fs_1.closeSync)(logFd);
     child.unref();
-    // Poll the HTTP endpoint until healthy — process being up isn't enough
-    // (see zombie case above).
-    const deadline = Date.now() + 10000;
-    while (Date.now() < deadline) {
-        if (await isTunnelHealthy()) {
-            registerExitHandler();
-            return;
-        }
-        await new Promise((r) => setTimeout(r, 300));
+    if (await waitForHealthy(10000)) {
+        registerExitHandler();
+        return;
     }
-    throw new Error("Tunnel did not start within 10s. Check ~/.tunneld.log");
+    throw new Error("The device tunnel didn't start. This Mac still uses the old on-demand tunnel, which needs a " +
+        "password this app can't ask for. Re-run iOS setup from the app (Device management → iOS) to " +
+        `install the background tunnel service. Details: ${(0, path_1.join)((0, os_1.homedir)(), ".tunneld.log")}`);
 }
 /** Manually stop the tunnel. */
 function stopTunnel() {
@@ -353,12 +374,30 @@ async function getDeviceInfoCached(python, udid) {
     deviceInfoCache.set(key, { info, ts: Date.now() });
     return info;
 }
+/** Fill in CFBundleShortVersionString for an app the worker already identified. */
+async function appVersionFor(python, udid, app) {
+    try {
+        const { stdout } = await execFileAsync(python, await (0, device_1.pmd3Args)(udid, "apps", "query", app.bundleId), { timeout: 8000 });
+        const meta = JSON.parse(stdout)?.[app.bundleId] ?? {};
+        const short = meta["CFBundleShortVersionString"] ?? null;
+        const build = meta["CFBundleVersion"] ?? null;
+        return {
+            bundleId: app.bundleId,
+            name: app.name,
+            version: short && build ? `${short} (${build})` : short ?? build ?? null,
+        };
+    }
+    catch {
+        // Version is a nice-to-have; identity is the useful part.
+        return { bundleId: app.bundleId, name: app.name, version: null };
+    }
+}
 async function triggerPhoneScreenshot(options) {
     const timeout = options?.timeout ?? 30000;
     const includeLocation = options?.includeLocation ?? false;
     const includeForegroundApp = options?.includeForegroundApp ?? true;
     let udid = options?.deviceId ?? null;
-    const python = findPython();
+    const python = await (0, python_1.findPythonAsyncOrThrow)();
     // Start tunnel on first call — stays alive for the session
     await startTunnel();
     // If the caller didn't specify a device and the only iPhone we can reach is
@@ -381,8 +420,28 @@ async function triggerPhoneScreenshot(options) {
     const outPath = (0, path_1.join)((0, os_1.tmpdir)(), `iphone-screenshot-${Date.now()}.png`);
     const maxAttempts = 12;
     try {
+        // ── Fast path: the persistent worker ────────────────────────────────────
+        // One held DVT session instead of two fresh CLI processes. Screenshot and
+        // proclist are issued together and multiplex over the single connection,
+        // so the metadata is nearly free. ~2.5s here vs ~6.8s below.
+        //
+        // Purely an optimisation: anything unexpected drops through to the CLI
+        // path, so a machine where the worker won't run is slower, not broken.
+        let helperApp = null;
+        let helperCaptured = false;
+        if (await dvtHelper_1.dvtHelper.available()) {
+            try {
+                helperApp = await dvtHelper_1.dvtHelper.capture(outPath, udid, includeForegroundApp);
+                helperCaptured = (0, fs_1.existsSync)(outPath);
+            }
+            catch (e) {
+                logger_1.log.warn("dvt helper capture failed; falling back to the CLI path", {
+                    error: e instanceof Error ? e.message : String(e),
+                });
+            }
+        }
         let lastErr = null;
-        for (let i = 0; i < maxAttempts; i++) {
+        for (let i = 0; !helperCaptured && i < maxAttempts; i++) {
             try {
                 await execFileAsync(python, await (0, device_1.pmd3Args)(udid, "developer", "dvt", "screenshot", outPath), { timeout });
                 if ((0, fs_1.existsSync)(outPath)) {
@@ -406,11 +465,17 @@ async function triggerPhoneScreenshot(options) {
             }
             await new Promise((r) => setTimeout(r, 800));
         }
-        // getForegroundApp uses dvt proclist + apps query (~3.7s combined). Make it
-        // opt-out so consumers who don't care about app context can get a faster capture.
-        const foregroundPromise = includeForegroundApp
-            ? (0, device_1.getForegroundApp)(python, udid)
-            : Promise.resolve(null);
+        // The worker returns the foreground app's identity but not its version:
+        // that comes from `apps query`, which is installation-proxy rather than
+        // DVT. Fetch it via the CLI only when an app is actually foregrounded —
+        // on the Home Screen (SpringBoard, isApplication false) there is nothing
+        // to query and the call is skipped entirely.
+        // TODO: move `apps query` into the worker too and drop this last spawn.
+        const foregroundPromise = helperCaptured
+            ? (helperApp ? appVersionFor(python, udid, helperApp) : Promise.resolve(null))
+            : includeForegroundApp
+                ? (0, device_1.getForegroundApp)(python, udid)
+                : Promise.resolve(null);
         const [image, device, foregroundApp, location] = await Promise.all([
             (0, promises_1.readFile)(outPath),
             deviceInfoPromise,
@@ -524,7 +589,7 @@ async function fetchLatestPhoneRecording(options) {
     const timeout = options?.timeout ?? 60000;
     const includeLocation = options?.includeLocation ?? false;
     let udid = options?.deviceId ?? null;
-    const python = findPython();
+    const python = await (0, python_1.findPythonAsyncOrThrow)();
     await startTunnel();
     // Same auto-resolve as triggerPhoneScreenshot — host apps that don't know
     // about deviceId still need to reach iOS 17+ Wi-Fi-only iPhones.
@@ -693,7 +758,7 @@ const DEV_MODE_STICKY_TTL_MS = 30000;
 async function listIosDevices() {
     let python;
     try {
-        python = findPython();
+        python = await (0, python_1.findPythonAsyncOrThrow)();
     }
     catch {
         return [];
@@ -890,7 +955,7 @@ async function unlinkIosDevice(options) {
     const udid = options.deviceId;
     if (!/^[0-9A-Fa-f-]{8,}$/.test(udid))
         throw new Error(`Invalid UDID: ${udid}`);
-    const python = findPython();
+    const python = await (0, python_1.findPythonAsyncOrThrow)();
     try {
         await execFileAsync(python, await (0, device_1.pmd3Args)(udid, "lockdown", "unpair"), { timeout: 8000 });
         return;
@@ -1033,7 +1098,7 @@ async function getIosWirelessEnabled(options) {
     const udid = options?.deviceId ?? null;
     let python;
     try {
-        python = findPython();
+        python = await (0, python_1.findPythonAsyncOrThrow)();
     }
     catch {
         return false;
@@ -1054,7 +1119,7 @@ async function getIosWirelessEnabled(options) {
  */
 async function enableIosDeveloperMode(options) {
     const udid = options?.deviceId ?? null;
-    const python = findPython();
+    const python = await (0, python_1.findPythonAsyncOrThrow)();
     await startTunnel().catch(() => { }); // best-effort; amfi works over USB without tunnel
     await (0, device_1.enableDeveloperMode)(python, udid);
 }