fix: cancel scrollintoview on client disconnect

Author: thymikee

src/core/dispatch.ts

@@ -77,6 +77,7 @@ export async function dispatchCommand(
   positionals: string[],
   outPath?: string,
   context?: {
+    requestId?: string;
     appBundleId?: string;
     activity?: string;
     verbose?: boolean;
@@ -97,6 +98,7 @@ export async function dispatchCommand(
   },
 ): Promise<Record<string, unknown> | void> {
   const runnerCtx: RunnerContext = {
+    requestId: context?.requestId,
     appBundleId: context?.appBundleId,
     verbose: context?.verbose,
     logPath: context?.logPath,

src/daemon.ts

@@ -18,6 +18,7 @@ import { handleRecordTraceCommands } from './daemon/handlers/record-trace.ts';
 import { handleInteractionCommands } from './daemon/handlers/interaction.ts';
 import { assertSessionSelectorMatches } from './daemon/session-selector.ts';
 import { resolveEffectiveSessionName } from './daemon/session-routing.ts';
+import { clearRequestCanceled, isRequestCanceled, markRequestCanceled } from './daemon/request-cancel.ts';
 import {
   isAgentDeviceDaemonProcess,
   readProcessStartTime,
@@ -50,7 +51,11 @@ function contextFromFlags(
   appBundleId?: string,
   traceLogPath?: string,
 ): DaemonCommandContext {
-  return contextFromFlagsWithLog(logPath, flags, appBundleId, traceLogPath);
+  const requestId = getDiagnosticsMeta().requestId;
+  return {
+    ...contextFromFlagsWithLog(logPath, flags, appBundleId, traceLogPath, requestId),
+    requestId,
+  };
 }
 
 async function handleRequest(req: DaemonRequest): Promise<DaemonResponse> {
@@ -295,10 +300,14 @@ function start(): void {
   const server = net.createServer((socket) => {
     let buffer = '';
     let inFlightRequests = 0;
+    const activeRequestIds = new Set<string>();
     let canceledInFlight = false;
     const cancelInFlightRunnerSessions = () => {
       if (canceledInFlight || inFlightRequests === 0) return;
       canceledInFlight = true;
+      for (const requestId of activeRequestIds) {
+        markRequestCanceled(requestId);
+      }
       emitDiagnostic({
         level: 'warn',
         phase: 'request_client_disconnected',
@@ -332,13 +341,25 @@ function start(): void {
         }
         let response: DaemonResponse;
         inFlightRequests += 1;
+        let requestIdForCleanup: string | undefined;
         try {
           const req = JSON.parse(line) as DaemonRequest;
+          requestIdForCleanup = req.meta?.requestId;
+          if (requestIdForCleanup) {
+            activeRequestIds.add(requestIdForCleanup);
+            if (isRequestCanceled(requestIdForCleanup)) {
+              throw new AppError('COMMAND_FAILED', 'request canceled');
+            }
+          }
           response = await handleRequest(req);
         } catch (err) {
           response = { ok: false, error: normalizeError(err) };
         } finally {
           inFlightRequests -= 1;
+          if (requestIdForCleanup) {
+            activeRequestIds.delete(requestIdForCleanup);
+            clearRequestCanceled(requestIdForCleanup);
+          }
         }
         if (!socket.destroyed) {
           socket.write(`${JSON.stringify(response)}\n`);

src/daemon/context.ts

@@ -1,6 +1,7 @@
 import type { CommandFlags } from '../core/dispatch.ts';
 
 export type DaemonCommandContext = {
+  requestId?: string;
   appBundleId?: string;
   activity?: string;
   verbose?: boolean;
@@ -25,8 +26,10 @@ export function contextFromFlags(
   flags: CommandFlags | undefined,
   appBundleId?: string,
   traceLogPath?: string,
+  requestId?: string,
 ): DaemonCommandContext {
   return {
+    requestId,
     appBundleId,
     activity: flags?.activity,
     verbose: flags?.verbose,

src/daemon/request-cancel.ts

@@ -0,0 +1,16 @@
+const canceledRequestIds = new Set<string>();
+
+export function markRequestCanceled(requestId: string | undefined): void {
+  if (!requestId) return;
+  canceledRequestIds.add(requestId);
+}
+
+export function clearRequestCanceled(requestId: string | undefined): void {
+  if (!requestId) return;
+  canceledRequestIds.delete(requestId);
+}
+
+export function isRequestCanceled(requestId: string | undefined): boolean {
+  if (!requestId) return false;
+  return canceledRequestIds.has(requestId);
+}

src/utils/interactors.ts

@@ -21,8 +21,10 @@ import {
   screenshotIos,
 } from '../platforms/ios/index.ts';
 import { runIosRunnerCommand } from '../platforms/ios/runner-client.ts';
+import { isRequestCanceled } from '../daemon/request-cancel.ts';
 
 export type RunnerContext = {
+  requestId?: string;
   appBundleId?: string;
   verbose?: boolean;
   logPath?: string;
@@ -86,6 +88,10 @@ type IoRunnerOverrides = Pick<
 
 function iosRunnerOverrides(device: DeviceInfo, ctx: RunnerContext): IoRunnerOverrides {
   const runnerOpts = { verbose: ctx.verbose, logPath: ctx.logPath, traceLogPath: ctx.traceLogPath };
+  const throwIfCanceled = () => {
+    if (!isRequestCanceled(ctx.requestId)) return;
+    throw new AppError('COMMAND_FAILED', 'request canceled');
+  };
 
   return {
     tap: async (x, y) => {
@@ -156,17 +162,24 @@ function iosRunnerOverrides(device: DeviceInfo, ctx: RunnerContext): IoRunnerOve
     scrollIntoView: async (text) => {
       const maxAttempts = 8;
       for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
+        throwIfCanceled();
         const found = (await runIosRunnerCommand(
           device,
           { command: 'findText', text, appBundleId: ctx.appBundleId },
           runnerOpts,
         )) as { found?: boolean };
         if (found?.found) return { attempts: attempt + 1 };
-        await runIosRunnerCommand(
-          device,
-          { command: 'swipe', direction: 'up', appBundleId: ctx.appBundleId },
-          runnerOpts,
-        );
+        // Increase traversal speed on long lists while still checking visibility between chunks.
+        const swipesPerAttempt = Math.min(4, 1 + Math.floor(attempt / 2));
+        for (let i = 0; i < swipesPerAttempt; i += 1) {
+          throwIfCanceled();
+          await runIosRunnerCommand(
+            device,
+            { command: 'swipe', direction: 'up', appBundleId: ctx.appBundleId },
+            runnerOpts,
+          );
+        }
+        throwIfCanceled();
         await new Promise((resolve) => setTimeout(resolve, 300));
       }
       throw new AppError('COMMAND_FAILED', `scrollintoview could not find text: ${text}`);