Fix CI app-server hardening races

Preserve malformed app-server startup output until the active turn is installed.

Signal both child process groups and direct children, and allow SIGKILL after an ignored SIGTERM.

Co-Authored-By: OpenAI Codex <noreply@openai.com>

Author: xuio

dist/index.js

@@ -21536,11 +21536,10 @@ var trackedChildren = /* @__PURE__ */ new Map();
 var cleanupHandlers = /* @__PURE__ */ new Set();
 var cleanupPromise;
 function killChildProcess(child, signal) {
-  if (child.exitCode !== null || child.killed) return;
+  if (child.exitCode !== null) return;
   try {
     if (process.platform !== "win32" && child.pid) {
       process.kill(-child.pid, signal);
-      return;
     }
   } catch {
   }
@@ -23996,13 +23995,14 @@ var CodexAppServerSession = class _CodexAppServerSession {
       message = JSON.parse(line);
     } catch {
       const error2 = `Unparseable Codex app-server line: ${line.slice(0, 500)}`;
-      this.lastError = error2;
-      this.activeTurn?.summary.errors.push(error2);
-      this.activeTurn?.stdout.append(`${line}
-`);
-      this.activeTurn?.artifactWriter.appendStdout(`${line}
-`);
-      this.activeTurn?.publishSnapshot(true);
+      if (!this.activeTurn && this.acceptingStartNotifications) {
+        this.queuePendingStartNotification({
+          method: "internal/unparseableLine",
+          params: { error: error2, line }
+        });
+        return;
+      }
+      this.recordUnparseableLine(error2, line);
       return;
     }
     const id = typeof message.id === "string" || typeof message.id === "number" ? String(message.id) : void 0;
@@ -24063,6 +24063,10 @@ var CodexAppServerSession = class _CodexAppServerSession {
       if (this.acceptingStartNotifications) this.queuePendingStartNotification(message);
       return;
     }
+    if (method === "internal/unparseableLine" && typeof params?.error === "string") {
+      this.recordUnparseableLine(params.error, typeof params.line === "string" ? params.line : "");
+      return;
+    }
     for (const handler of this.notificationHandlers) handler(message);
     active.stdout.append(`${JSON.stringify(message)}
 `);
@@ -24177,6 +24181,15 @@ var CodexAppServerSession = class _CodexAppServerSession {
       this.activeTurn = void 0;
     }
   }
+  recordUnparseableLine(error2, line) {
+    this.lastError = error2;
+    this.activeTurn?.summary.errors.push(error2);
+    this.activeTurn?.stdout.append(`${line}
+`);
+    this.activeTurn?.artifactWriter.appendStdout(`${line}
+`);
+    this.activeTurn?.publishSnapshot(true);
+  }
   async probeThreadRead(timeoutMs) {
     try {
       await this.request("thread/read", {

src/app-server.ts

@@ -724,11 +724,14 @@ export class CodexAppServerSession {
       message = JSON.parse(line) as JsonObject;
     } catch {
       const error = `Unparseable Codex app-server line: ${line.slice(0, 500)}`;
-      this.lastError = error;
-      this.activeTurn?.summary.errors.push(error);
-      this.activeTurn?.stdout.append(`${line}\n`);
-      this.activeTurn?.artifactWriter.appendStdout(`${line}\n`);
-      this.activeTurn?.publishSnapshot(true);
+      if (!this.activeTurn && this.acceptingStartNotifications) {
+        this.queuePendingStartNotification({
+          method: "internal/unparseableLine",
+          params: { error, line },
+        });
+        return;
+      }
+      this.recordUnparseableLine(error, line);
       return;
     }
 
@@ -802,6 +805,10 @@ export class CodexAppServerSession {
       if (this.acceptingStartNotifications) this.queuePendingStartNotification(message);
       return;
     }
+    if (method === "internal/unparseableLine" && typeof params?.error === "string") {
+      this.recordUnparseableLine(params.error, typeof params.line === "string" ? params.line : "");
+      return;
+    }
     for (const handler of this.notificationHandlers) handler(message);
     active.stdout.append(`${JSON.stringify(message)}\n`);
     active.artifactWriter.appendStdout(`${JSON.stringify(message)}\n`);
@@ -928,6 +935,14 @@ export class CodexAppServerSession {
     }
   }
 
+  private recordUnparseableLine(error: string, line: string): void {
+    this.lastError = error;
+    this.activeTurn?.summary.errors.push(error);
+    this.activeTurn?.stdout.append(`${line}\n`);
+    this.activeTurn?.artifactWriter.appendStdout(`${line}\n`);
+    this.activeTurn?.publishSnapshot(true);
+  }
+
   private async probeThreadRead(timeoutMs: number): Promise<void> {
     try {
       await this.request("thread/read", {

src/lifecycle.ts

@@ -8,15 +8,14 @@ const cleanupHandlers = new Set<CleanupHandler>();
 let cleanupPromise: Promise<void> | undefined;
 
 export function killChildProcess(child: ChildProcess, signal: NodeJS.Signals): void {
-  if (child.exitCode !== null || child.killed) return;
+  if (child.exitCode !== null) return;
 
   try {
     if (process.platform !== "win32" && child.pid) {
       process.kill(-child.pid, signal);
-      return;
     }
   } catch {
-    // Fall back to killing the direct child below.
+    // Direct-child signaling below is still attempted.
   }
 
   try {