Refactor: Move abort signal handling into streamProcessToLogger

Rather than having callers manually set up abort handlers and cleanup,
streamProcessToLogger now accepts an optional abortSignal and returns
a cleanup function. This centralizes the abort handling logic and makes
call sites cleaner.

Benefits:
- Reduces boilerplate at call sites
- Ensures consistent cleanup (no risk of forgetting removeEventListener)
- Single place to maintain abort handling logic

Addresses code review feedback.

Author: ammar-agent

src/runtime/SSHRuntime.ts

@@ -563,16 +563,10 @@ export class SSHRuntime implements Runtime {
         log.debug(`Creating bundle: ${command}`);
         const proc = spawn("bash", ["-c", command]);
 
-        // Handle abort signal
-        const abortHandler = () => {
-          proc.kill();
-          reject(new Error("Bundle creation aborted"));
-        };
-        abortSignal?.addEventListener("abort", abortHandler);
-
-        streamProcessToLogger(proc, initLogger, {
+        const cleanup = streamProcessToLogger(proc, initLogger, {
           logStdout: false,
           logStderr: true,
+          abortSignal,
         });
 
         let stderr = "";
@@ -581,7 +575,7 @@ export class SSHRuntime implements Runtime {
         });
 
         proc.on("close", (code) => {
-          abortSignal?.removeEventListener("abort", abortHandler);
+          cleanup();
           if (abortSignal?.aborted) {
             reject(new Error("Bundle creation aborted"));
           } else if (code === 0) {
@@ -592,7 +586,7 @@ export class SSHRuntime implements Runtime {
         });
 
         proc.on("error", (err) => {
-          abortSignal?.removeEventListener("abort", abortHandler);
+          cleanup();
           reject(err);
         });
       });

src/runtime/streamProcess.ts

@@ -16,6 +16,7 @@ import type { InitLogger } from "./Runtime";
  * @param process Child process to stream from
  * @param initLogger Logger to stream output to
  * @param options Configuration for which streams to log
+ * @returns Cleanup function to remove abort signal listener (call this in process close/error handlers)
  */
 export function streamProcessToLogger(
   process: ChildProcess,
@@ -27,15 +28,27 @@ export function streamProcessToLogger(
     logStderr?: boolean;
     /** Optional: Command string to log before streaming starts */
     command?: string;
+    /** Optional: Abort signal to kill process on cancellation */
+    abortSignal?: AbortSignal;
   }
-): void {
-  const { logStdout = false, logStderr = true, command } = options ?? {};
+): () => void {
+  const { logStdout = false, logStderr = true, command, abortSignal } = options ?? {};
 
   // Log the command being executed (if provided)
   if (command) {
     initLogger.logStep(`Executing: ${command}`);
   }
 
+  // Set up abort signal handler
+  const abortHandler = abortSignal
+    ? () => {
+        process.kill();
+      }
+    : null;
+  if (abortHandler && abortSignal) {
+    abortSignal.addEventListener("abort", abortHandler);
+  }
+
   // Drain stdout (prevent pipe overflow)
   if (process.stdout) {
     process.stdout.on("data", (data: Buffer) => {
@@ -65,4 +78,11 @@ export function streamProcessToLogger(
       // Otherwise drain silently to prevent buffer overflow
     });
   }
+
+  // Return cleanup function to remove abort listener
+  return () => {
+    if (abortHandler && abortSignal) {
+      abortSignal.removeEventListener("abort", abortHandler);
+    }
+  };
 }