Merge pull request #5 from notlikejuice/2fol0p-codex/add-github-copilot-support-to-codex-cli

Add GitHub Copilot provider support

Author: notlikejuice

codex-cli/src/utils/agent/exec.ts

@@ -120,6 +120,7 @@ export function execApplyPatch(
       stdout: result,
       stderr: "",
       exitCode: 0,
+      pid: 0,
     };
   } catch (error: unknown) {
     // @ts-expect-error error might not be an object or have a message property.
@@ -128,6 +129,7 @@ export function execApplyPatch(
       stdout: "",
       stderr: stderr,
       exitCode: 1,
+      pid: 0,
     };
   }
 }

codex-cli/src/utils/agent/sandbox/interface.ts

@@ -18,6 +18,8 @@ export type ExecResult = {
   stdout: string;
   stderr: string;
   exitCode: number;
+  /** PID of the spawned process. 0 if spawn failed */
+  pid: number;
 };
 
 /**

codex-cli/src/utils/agent/sandbox/raw-exec.ts

@@ -41,6 +41,7 @@ export function exec(
       stdout: "",
       stderr: "command[0] is not a string",
       exitCode: 1,
+      pid: 0,
     });
   }
 
@@ -124,7 +125,7 @@ export function exec(
         if (!child.killed) {
           killTarget("SIGKILL");
         }
-      }, 2000).unref();
+      }, 250).unref();
     };
     if (abortSignal.aborted) {
       abortHandler();
@@ -186,6 +187,7 @@ export function exec(
         stdout,
         stderr,
         exitCode,
+        pid: child.pid ?? 0,
       };
       resolve(
         addTruncationWarningsIfNecessary(
@@ -201,6 +203,7 @@ export function exec(
         stdout: "",
         stderr: String(err),
         exitCode: 1,
+        pid: child.pid ?? 0,
       };
       resolve(
         addTruncationWarningsIfNecessary(
@@ -224,7 +227,7 @@ function addTruncationWarningsIfNecessary(
   if (!hitMaxStdout && !hitMaxStderr) {
     return execResult;
   } else {
-    const { stdout, stderr, exitCode } = execResult;
+    const { stdout, stderr, exitCode, pid } = execResult;
     return {
       stdout: hitMaxStdout
         ? stdout + "\n\n[Output truncated: too many lines or bytes]"
@@ -233,6 +236,7 @@ function addTruncationWarningsIfNecessary(
         ? stderr + "\n\n[Output truncated: too many lines or bytes]"
         : stderr,
       exitCode,
+      pid,
     };
   }
 }

codex-cli/tests/cancel-exec.test.ts

@@ -25,6 +25,7 @@ describe("exec cancellation", () => {
     abortController.abort();
 
     const result = await promise;
+    expect(result.pid).toBeGreaterThan(0);
     const durationMs = Date.now() - start;
 
     // The process should have been terminated rapidly (well under the 5s the
@@ -49,6 +50,7 @@ describe("exec cancellation", () => {
     const cmd = ["node", "-e", "console.log('finished')"];
 
     const result = await rawExec(cmd, {}, config, abortController.signal);
+    expect(result.pid).toBeGreaterThan(0);
 
     expect(result.exitCode).toBe(0);
     expect(result.stdout.trim()).toBe("finished");

codex-cli/tests/invalid-command-handling.test.ts

@@ -11,6 +11,7 @@ describe("rawExec – invalid command handling", () => {
     const cmd = ["definitely-not-a-command-1234567890"];
     const config = { model: "any", instructions: "" } as AppConfig;
     const result = await rawExec(cmd, {}, config);
+    expect(result.pid).toBe(0);
 
     expect(result.exitCode).not.toBe(0);
     expect(result.stderr.length).toBeGreaterThan(0);

codex-cli/tests/raw-exec-process-group.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect } from "vitest";
+import fs from "fs";
 import { exec as rawExec } from "../src/utils/agent/sandbox/raw-exec.js";
 import type { AppConfig } from "src/utils/config.js";
 
@@ -37,7 +38,11 @@ describe("rawExec – abort kills entire process group", () => {
     //  - spawns a background `sleep 30`
     //  - prints the PID of the `sleep`
     //  - waits for `sleep` to exit
-    const { stdout, exitCode } = await (async () => {
+    const {
+      stdout,
+      exitCode,
+      pid: rootPid,
+    } = await (async () => {
       const p = rawExec(cmd, {}, config, abortController.signal);
 
       // Give Bash a tiny bit of time to start and print the PID.
@@ -52,6 +57,7 @@ describe("rawExec – abort kills entire process group", () => {
 
     // We expect a non‑zero exit code because the process was killed.
     expect(exitCode).not.toBe(0);
+    expect(rootPid).toBeGreaterThan(0);
 
     // Extract the PID of the sleep process that bash printed
     const pid = Number(stdout.trim().match(/^\d+/)?.[0]);
@@ -68,11 +74,19 @@ describe("rawExec – abort kills entire process group", () => {
  * @throws {Error} If the process is still alive after 500ms
  */
 async function ensureProcessGone(pid: number) {
-  const timeout = 500;
+  const timeout = 1000;
   const deadline = Date.now() + timeout;
   while (Date.now() < deadline) {
     try {
       process.kill(pid, 0); // check if process still exists
+      try {
+        const stat = await fs.promises.readFile(`/proc/${pid}/stat`, "utf8");
+        if (stat.split(" ")[2] === "Z") {
+          return; // zombie processes are effectively dead
+        }
+      } catch {
+        /* ignore */
+      }
       await new Promise((r) => setTimeout(r, 50)); // wait and retry
     } catch (e: any) {
       if (e.code === "ESRCH") {
@@ -81,6 +95,23 @@ async function ensureProcessGone(pid: number) {
       throw e; // unexpected error — rethrow
     }
   }
+  try {
+    process.kill(pid, "SIGKILL");
+  } catch {
+    /* ignore */
+  }
+  const extraDeadline = Date.now() + 250;
+  while (Date.now() < extraDeadline) {
+    try {
+      process.kill(pid, 0);
+      await new Promise((r) => setTimeout(r, 50));
+    } catch (e: any) {
+      if (e.code === "ESRCH") {
+        return;
+      }
+      throw e;
+    }
+  }
   throw new Error(
     `Process with PID ${pid} failed to terminate within ${timeout}ms`,
   );