refactor: deduplicate sleepWithAbort into shared abort utility

Extract the identical sleepWithAbort function from SSHRuntime,
sshConnectionPool, SSH2ConnectionPool, and codexOauthService into
src/node/utils/abort.ts (which already hosts AbortSignal helpers).

The four copies had trivial cosmetic differences (error message text,
optional vs required signal param) but identical behavior. The shared
version uses optional AbortSignal and 'Operation aborted' error text,
matching the convention used by the majority of callers.

Author: mux-bot[bot]

src/node/runtime/SSH2ConnectionPool.ts

@@ -15,6 +15,7 @@ import { Duplex } from "stream";
 import type { Client } from "ssh2";
 import { getErrorMessage } from "@/common/utils/errors";
 import { log } from "@/node/services/log";
+import { sleepWithAbort } from "@/node/utils/abort";
 import { attachStreamErrorHandler } from "@/node/utils/streamErrors";
 import type { SSHConnectionConfig, ConnectionHealth } from "./sshConnectionPool";
 import { resolveSSHConfig, type ResolvedSSHConfig } from "./sshConfigParser";
@@ -84,32 +85,6 @@ function withJitter(seconds: number): number {
   return seconds * jitterFactor;
 }
 
-async function sleepWithAbort(ms: number, abortSignal?: AbortSignal): Promise<void> {
-  if (ms <= 0) return;
-  if (abortSignal?.aborted) {
-    throw new Error("Operation aborted");
-  }
-
-  await new Promise<void>((resolve, reject) => {
-    const timer = setTimeout(() => {
-      cleanup();
-      resolve();
-    }, ms);
-
-    const onAbort = () => {
-      cleanup();
-      reject(new Error("Operation aborted"));
-    };
-
-    const cleanup = () => {
-      clearTimeout(timer);
-      abortSignal?.removeEventListener("abort", onAbort);
-    };
-
-    abortSignal?.addEventListener("abort", onAbort);
-  });
-}
-
 function getAgentConfig(): string | undefined {
   if (process.env.SSH_AUTH_SOCK) {
     return process.env.SSH_AUTH_SOCK;

src/node/runtime/SSHRuntime.ts

@@ -35,6 +35,7 @@ import { RemoteRuntime, type SpawnResult } from "./RemoteRuntime";
 import { log } from "@/node/services/log";
 import { runInitHookOnRuntime, runWorkspaceInitHook } from "./initHook";
 import { expandTildeForSSH, cdCommandForSSH } from "./tildeExpansion";
+import { sleepWithAbort } from "@/node/utils/abort";
 import { execBuffered } from "@/node/utils/runtime/helpers";
 import { getErrorMessage } from "@/common/utils/errors";
 import {
@@ -129,34 +130,6 @@ async function enqueueProjectSync(
   }
 }
 
-async function sleepWithAbort(ms: number, abortSignal?: AbortSignal): Promise<void> {
-  if (ms <= 0) {
-    return;
-  }
-  if (abortSignal?.aborted) {
-    throw new Error("Operation aborted");
-  }
-
-  await new Promise<void>((resolve, reject) => {
-    const timer = setTimeout(() => {
-      cleanup();
-      resolve();
-    }, ms);
-
-    const onAbort = () => {
-      cleanup();
-      reject(new Error("Operation aborted"));
-    };
-
-    const cleanup = () => {
-      clearTimeout(timer);
-      abortSignal?.removeEventListener("abort", onAbort);
-    };
-
-    abortSignal?.addEventListener("abort", onAbort, { once: true });
-  });
-}
-
 function isGitConfigLockConflict(message: string): boolean {
   return /could not lock config file/i.test(message);
 }

src/node/runtime/sshConnectionPool.ts

@@ -18,6 +18,7 @@ import * as crypto from "crypto";
 import * as path from "path";
 import * as os from "os";
 import { spawn } from "child_process";
+import { sleepWithAbort } from "@/node/utils/abort";
 import { HOST_KEY_APPROVAL_TIMEOUT_MS } from "@/common/constants/ssh";
 import { formatSshEndpoint } from "@/common/utils/ssh/formatSshEndpoint";
 import { log } from "@/node/services/log";
@@ -152,32 +153,6 @@ export interface AcquireConnectionOptions {
   sleep?: (ms: number, abortSignal?: AbortSignal) => Promise<void>;
 }
 
-async function sleepWithAbort(ms: number, abortSignal?: AbortSignal): Promise<void> {
-  if (ms <= 0) return;
-  if (abortSignal?.aborted) {
-    throw new Error("Operation aborted");
-  }
-
-  await new Promise<void>((resolve, reject) => {
-    const timer = setTimeout(() => {
-      cleanup();
-      resolve();
-    }, ms);
-
-    const onAbort = () => {
-      cleanup();
-      reject(new Error("Operation aborted"));
-    };
-
-    const cleanup = () => {
-      clearTimeout(timer);
-      abortSignal?.removeEventListener("abort", onAbort);
-    };
-
-    abortSignal?.addEventListener("abort", onAbort);
-  });
-}
-
 async function waitForPromiseWithTimeout<T>(
   promise: Promise<T>,
   timeoutMs: number,

src/node/services/codexOauthService.ts

@@ -16,6 +16,7 @@ import type { Config } from "@/node/config";
 import type { ProviderService } from "@/node/services/providerService";
 import type { WindowService } from "@/node/services/windowService";
 import { log } from "@/node/services/log";
+import { sleepWithAbort } from "@/node/utils/abort";
 import { AsyncMutex } from "@/node/utils/concurrency/asyncMutex";
 import {
   extractAccountIdFromTokens,
@@ -729,32 +730,3 @@ export class CodexOauthService {
     return Promise.resolve();
   }
 }
-
-async function sleepWithAbort(ms: number, signal: AbortSignal): Promise<void> {
-  if (ms <= 0) {
-    return;
-  }
-
-  if (signal.aborted) {
-    throw new Error("aborted");
-  }
-
-  await new Promise<void>((resolve, reject) => {
-    const timeout = setTimeout(() => {
-      cleanup();
-      resolve();
-    }, ms);
-
-    const onAbort = () => {
-      cleanup();
-      reject(new Error("aborted"));
-    };
-
-    const cleanup = () => {
-      clearTimeout(timeout);
-      signal.removeEventListener("abort", onAbort);
-    };
-
-    signal.addEventListener("abort", onAbort);
-  });
-}

src/node/utils/abort.ts

@@ -33,3 +33,37 @@ export function linkAbortSignal(
   source.addEventListener("abort", onAbort, { once: true });
   return () => source.removeEventListener("abort", onAbort);
 }
+
+/**
+ * Sleep for `ms` milliseconds, rejecting early if `abortSignal` fires.
+ *
+ * Extracted from four identical copies across SSHRuntime, sshConnectionPool,
+ * SSH2ConnectionPool, and codexOauthService.
+ */
+export async function sleepWithAbort(ms: number, abortSignal?: AbortSignal): Promise<void> {
+  if (ms <= 0) {
+    return;
+  }
+  if (abortSignal?.aborted) {
+    throw new Error("Operation aborted");
+  }
+
+  await new Promise<void>((resolve, reject) => {
+    const timer = setTimeout(() => {
+      cleanup();
+      resolve();
+    }, ms);
+
+    const onAbort = () => {
+      cleanup();
+      reject(new Error("Operation aborted"));
+    };
+
+    const cleanup = () => {
+      clearTimeout(timer);
+      abortSignal?.removeEventListener("abort", onAbort);
+    };
+
+    abortSignal?.addEventListener("abort", onAbort, { once: true });
+  });
+}