chore: keep release notes in PR context

steipete · web-flow · commit c4b01ba6d8a3 · 2026-07-07T07:23:29.000+01:00
diff --git a/packages/agent-core/src/harness/env/nodejs.test.ts b/packages/agent-core/src/harness/env/nodejs.test.ts
@@ -112,4 +112,27 @@ describe("NodeExecutionEnv exec stream errors", () => {
     const result = await resultPromise;
     expect(result.ok).toBe(true);
   });
+
+  it("contains stdout errors during Windows shell discovery", async () => {
+    const platformDescriptor = Object.getOwnPropertyDescriptor(process, "platform");
+    Object.defineProperty(process, "platform", { value: "win32", configurable: true });
+    try {
+      const child = mockSpawnChild();
+      const resultPromise = new NodeExecutionEnv({ cwd: process.cwd() }).exec("echo hello");
+      await vi.waitFor(() => expect(spawnMock).toHaveBeenCalled(), { timeout: 2000 });
+
+      child.stdout.emit("error", new Error("where stdout failed"));
+
+      const result = await resultPromise;
+      expect(result.ok).toBe(false);
+      if (!result.ok) {
+        expect(result.error.code).toBe("shell_unavailable");
+      }
+      expect(spawnMock.mock.calls[0]?.[0]).toBe("where");
+    } finally {
+      if (platformDescriptor) {
+        Object.defineProperty(process, "platform", platformDescriptor);
+      }
+    }
+  });
 });
diff --git a/packages/agent-core/src/harness/env/nodejs.ts b/packages/agent-core/src/harness/env/nodejs.ts
@@ -131,6 +131,17 @@ function abortResult(
   return signal?.aborted ? err(new FileError("aborted", "aborted", path)) : undefined;
 }
 
+type ChildOutputStreamName = "stdout" | "stderr";
+
+function listenForChildOutputErrors(
+  child: ReturnType<typeof spawn>,
+  onError: (stream: ChildOutputStreamName, error: Error) => void,
+): void {
+  for (const streamName of ["stdout", "stderr"] as const) {
+    child[streamName]?.on("error", (error: Error) => onError(streamName, error));
+  }
+}
+
 async function pathExists(path: string): Promise<boolean> {
   try {
     await access(path, constants.F_OK);
@@ -159,13 +170,20 @@ async function runCommand(
     }
     const timeout = setTimeout(() => {
       if (child.pid) {
-        killProcessTree(child.pid, { force: true });
+        killProcessTree(child.pid, { force: true, detached: false });
       }
     }, timeoutMs);
     child.stdout?.setEncoding("utf8");
     child.stdout?.on("data", (chunk: string) => {
       stdout += chunk;
     });
+    listenForChildOutputErrors(child, () => {
+      if (child.pid) {
+        killProcessTree(child.pid, { force: true, detached: false });
+      }
+      clearTimeout(timeout);
+      resolveLocal({ stdout: "", status: null });
+    });
     child.on("error", () => {
       clearTimeout(timeout);
       resolveLocal({ stdout: "", status: null });
@@ -374,7 +392,7 @@ export class NodeExecutionEnv implements ExecutionEnv {
       // Guard stdout/stderr against stream errors (e.g. EPIPE when the
       // child exits before all pipe data is consumed). Without listeners,
       // Node.js throws an uncaught exception that crashes the process.
-      const onStreamError = (stream: "stdout" | "stderr", error: Error) => {
+      const onStreamError = (stream: ChildOutputStreamName, error: Error) => {
         if (settled) {
           return;
         }
@@ -383,8 +401,7 @@ export class NodeExecutionEnv implements ExecutionEnv {
           err(new ExecutionError("spawn_error", `${stream} read error: ${error.message}`, error)),
         );
       };
-      child.stdout?.on("error", (e) => onStreamError("stdout", e));
-      child.stderr?.on("error", (e) => onStreamError("stderr", e));
+      listenForChildOutputErrors(child, onStreamError);
 
       child.on("error", (error) => {
         settle(err(new ExecutionError("spawn_error", error.message, error)));
