@@ -4,7 +4,6 @@ import { resolveWaitBudgetMs } from '../wait-positionals.ts';
 import {
   DEFAULT_TIMEOUT_POLICY,
   INSTALL_REQUEST_TIMEOUT_MS,
-  LONG_PRESS_REQUEST_TIMEOUT_MS,
   PREPARE_REQUEST_TIMEOUT_MS,
 } from './timeout-policy.ts';
 import { resolvePostActionObservationSupport } from './post-action-observation.ts';
@@ -163,11 +162,6 @@ const SETTLE_FLAG_PRESERVE_DAEMON_TIMEOUT_POLICY: CommandTimeoutPolicy = {
   onTimeout: 'preserve-daemon',
 };
 
-const LONG_PRESS_TIMEOUT_POLICY: CommandTimeoutPolicy = {
-  ...SETTLE_FLAG_PRESERVE_DAEMON_TIMEOUT_POLICY,
-  envelopeMs: LONG_PRESS_REQUEST_TIMEOUT_MS,
-};
-
 const TOUCH_INTERACTION_RESPONSE_DATA_TRANSFORM = {
   fields: {
     count: { defaultValue: 1, omitDefault: true },
@@ -709,7 +703,12 @@ export const RAW_COMMAND_DESCRIPTORS = [
     daemon: { route: 'interaction', replayScopedAction: true, androidBlockingDialogGuard: true },
     dispatch: {},
     capability: { apple: APPLE_SIM_AND_DEVICE, android: ANDROID_ALL, linux: LINUX_DEVICE },
-    timeoutPolicy: LONG_PRESS_TIMEOUT_POLICY,
+    timeoutPolicy: {
+      ...SETTLE_FLAG_PRESERVE_DAEMON_TIMEOUT_POLICY,
+      // A valid hold may last 120 seconds; leave the helper's 15-second
+      // completion overhead inside the outer request envelope too.
+      envelopeMs: 150_000,
+    },
     postActionObservation: postActionObservation('longpress'),
     batchable: true,
   },
 
@@ -7,11 +7,6 @@ import type { CommandTimeoutPolicy } from './types.ts';
 const DAEMON_REQUEST_TIMEOUT_MS = 90_000;
 export const PREPARE_REQUEST_TIMEOUT_MS = 240_000;
 
-// A valid longpress may hold for 120 seconds. Keep the outer request alive
-// beyond both that command budget and the helper's 15-second completion
-// overhead so the platform result, rather than the client envelope, wins.
-export const LONG_PRESS_REQUEST_TIMEOUT_MS = 150_000;
-
 // Keep this above the longest platform install subprocess timeout so the client
 // envelope does not abort a still-progressing device install first.
 export const INSTALL_REQUEST_TIMEOUT_MS = 180_000;
 
@@ -129,10 +129,10 @@ export async function readAndroidMultiTouchHelperViewport(device: DeviceInfo): P
     { allowFailure: true, timeoutMs: HELPER_GESTURE_TIMEOUT_MS },
   );
   const records = parseInstrumentationRecords(`${result.stdout}\n${result.stderr}`);
-  const helperResult = records.results.find(
-    (record) => record.agentDeviceProtocol === HELPER_PROTOCOL,
-  );
-  if (result.exitCode !== 0 && !helperResult) {
+  if (
+    result.exitCode !== 0 &&
+    !records.results.some((record) => record.agentDeviceProtocol === HELPER_PROTOCOL)
+  ) {
     throw new AppError(
       'COMMAND_FAILED',
       'Android gesture viewport is unavailable',
@@ -144,7 +144,7 @@ export async function readAndroidMultiTouchHelperViewport(device: DeviceInfo): P
     throw new AppError(
       'COMMAND_FAILED',
       'Android gesture viewport is unavailable',
-      execFailureDetails(result, { helper: helperResult }),
+      execFailureDetails(result),
     );
   }
   return viewport;