fix: shorten snapshot request timeout

Author: thymikee

src/daemon-client.ts

@@ -116,6 +116,7 @@ type EnsuredDaemon = {
 type ResolvedDaemonTransport = 'socket' | 'http';
 
 const REQUEST_TIMEOUT_MS = 90_000;
+const SNAPSHOT_REQUEST_TIMEOUT_MS = 30_000;
 const DAEMON_STARTUP_TIMEOUT_MS = 15_000;
 const DAEMON_STARTUP_ATTEMPTS = 2;
 const DAEMON_TAKEOVER_TERM_TIMEOUT_MS = 3000;
@@ -192,14 +193,17 @@ export async function sendToDaemon(req: Omit<DaemonRequest, 'token'>): Promise<D
   }
 }
 
-function resolveDaemonRequestTimeoutMs(req: Omit<DaemonRequest, 'token'>): number | undefined {
+export function resolveDaemonRequestTimeoutMs(
+  req: Omit<DaemonRequest, 'token'>,
+): number | undefined {
   if (req.command === PUBLIC_COMMANDS.test) return undefined;
   if (
     (req.command === PUBLIC_COMMANDS.replay || req.command === PUBLIC_COMMANDS.prepare) &&
     typeof req.flags?.timeoutMs === 'number'
   ) {
     return req.flags.timeoutMs;
   }
+  if (req.command === PUBLIC_COMMANDS.snapshot) return SNAPSHOT_REQUEST_TIMEOUT_MS;
   return REQUEST_TIMEOUT_MS;
 }
 
@@ -1146,7 +1150,11 @@ function resolveRequestTimeoutHint(params: {
     return 'Retry with --debug and verify the remote daemon URL, auth token, and remote host logs.';
   }
   if (!resetDaemon) {
-    return `Retry with --debug and check daemon diagnostics logs. The timed-out ${command ?? 'request'} request was canceled and iOS runner work was aborted when detected; the daemon was kept alive so the session can still be closed or inspected.`;
+    const iosPrepareHint =
+      command === PUBLIC_COMMANDS.snapshot
+        ? ' If this was the first iOS snapshot on the device, run agent-device prepare ios-runner --platform ios before snapshot/test so runner startup is handled explicitly.'
+        : '';
+    return `Retry with --debug and check daemon diagnostics logs. The timed-out ${command ?? 'request'} request was canceled and iOS runner work was aborted when detected; the daemon was kept alive so the session can still be closed or inspected.${iosPrepareHint}`;
   }
   return 'Retry with --debug and check daemon diagnostics logs. Timed-out iOS runner xcodebuild processes were terminated when detected.';
 }

src/utils/__tests__/daemon-client.test.ts

@@ -18,6 +18,7 @@ import {
   computeDaemonCodeSignature,
   downloadRemoteArtifact,
   openApp,
+  resolveDaemonRequestTimeoutMs,
   resolveDaemonStartupHint,
   sendToDaemon,
   shouldResetDaemonAfterRequestTimeout,
@@ -165,6 +166,28 @@ test('snapshot request timeout preserves daemon metadata for follow-up evidence
   assert.equal(shouldResetDaemonAfterRequestTimeout(undefined), true);
 });
 
+test('snapshot uses a shorter daemon request timeout than runner prepare', () => {
+  const base = {
+    session: 'default',
+    positionals: [],
+    flags: {},
+    meta: {},
+  };
+
+  assert.equal(resolveDaemonRequestTimeoutMs({ ...base, command: 'snapshot' }), 30_000);
+  assert.equal(resolveDaemonRequestTimeoutMs({ ...base, command: 'screenshot' }), 90_000);
+  assert.equal(
+    resolveDaemonRequestTimeoutMs({
+      ...base,
+      command: 'prepare',
+      positionals: ['ios-runner'],
+      flags: { timeoutMs: 240_000 },
+    }),
+    240_000,
+  );
+  assert.equal(resolveDaemonRequestTimeoutMs({ ...base, command: 'test' }), undefined);
+});
+
 test('cleanupFailedDaemonStartupMetadata removes partial startup metadata', async () => {
   const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-daemon-cleanup-'));
   const paths = resolveDaemonPaths(stateDir);