openclaw
diff --git a/‎src/infra/ssh-tunnel.test.ts‎
Lines changed: 21 additions & 15 deletions b/‎src/infra/ssh-tunnel.test.ts‎
Lines changed: 21 additions & 15 deletions
diff --git a/‎src/infra/ssh-tunnel.ts‎
Lines changed: 6 additions & 4 deletions b/‎src/infra/ssh-tunnel.ts‎
Lines changed: 6 additions & 4 deletions
@@ -206,22 +206,28 @@ describe("startSshPortForward", () => {
     expect(kill).toHaveBeenCalledWith("SIGTERM");
   });
 
-  it("does not crash when stderr emits a stream error", async () => {
-    vi.useFakeTimers();
-    spawnFakeSshListening();
+  it.each(["active", "teardown"] as const)(
+    "does not crash when stderr errors while the tunnel is %s",
+    async (phase) => {
+      vi.useFakeTimers();
+      spawnFakeSshListening();
 
-    const tunnel = await startSshPortForward({
-      target: "me@example.com:2222",
-      localPortPreferred: 43210,
-      remotePort: 18789,
-      timeoutMs: 1000,
-    });
+      const tunnel = await startSshPortForward({
+        target: "me@example.com:2222",
+        localPortPreferred: 43210,
+        remotePort: 18789,
+        timeoutMs: 1000,
+      });
 
-    const child = mocks.spawn.mock.results[0]?.value as EventEmitter & {
-      stderr: EventEmitter;
-    };
-    child.stderr.emit("error", new Error("stderr EPIPE"));
+      const child = mocks.spawn.mock.results[0]?.value as EventEmitter & {
+        killed: boolean;
+        stderr: EventEmitter;
+      };
+      const stopping = phase === "teardown" ? tunnel.stop() : undefined;
+      expect(child.killed).toBe(phase === "teardown");
+      expect(() => child.stderr.emit("error", new Error("stderr EPIPE"))).not.toThrow();
 
-    await expect(tunnel.stop()).resolves.toBeUndefined();
-  });
+      await expect(stopping ?? tunnel.stop()).resolves.toBeUndefined();
+    },
+  );
 });
@@ -165,13 +165,15 @@ export async function startSshPortForward(opts: {
   const child = spawn("/usr/bin/ssh", args, {
     stdio: ["ignore", "ignore", "pipe"],
   });
-  child.stderr?.setEncoding("utf8");
-  child.stderr?.on("data", (chunk) => {
+  const stderrStream = child.stderr;
+  // Child events own tunnel failure. Keep the diagnostic pipe observed so a
+  // stream error cannot become an uncaught exception during active use or teardown.
+  stderrStream?.on("error", () => {});
+  stderrStream?.setEncoding("utf8");
+  stderrStream?.on("data", (chunk) => {
     const lines = normalizeStringEntries(String(chunk).split("\n"));
     stderr.push(...lines);
   });
-  // The diagnostic pipe can fail independently; child exit remains authoritative.
-  child.stderr?.on("error", () => {});
 
   const stop = async () => {
     if (child.killed || !child.kill("SIGTERM")) {