Add GitHub Copilot provider support

codex-cli/src/cli.tsx

@@ -39,8 +39,8 @@ import {
 } from "./utils/config";
 import {
   getApiKey as fetchApiKey,
+  getGithubCopilotApiKey as fetchGithubCopilotApiKey,
   maybeRedeemCredits,
-  fetchGithubCopilotApiKey,
 } from "./utils/get-api-key";
 import { createInputItem } from "./utils/input-utils";
 import { initLogger } from "./utils/logger/log";
@@ -323,12 +323,38 @@ try {
     if (data.OPENAI_API_KEY && !expired) {
       apiKey = data.OPENAI_API_KEY;
     }
+    if (
+      data.GITHUBCOPILOT_API_KEY &&
+      provider.toLowerCase() === "githubcopilot"
+    ) {
+      apiKey = data.GITHUBCOPILOT_API_KEY;
+    }
   }
 } catch {
   // ignore errors
 }
 
-if (cli.flags.login) {
+if (provider.toLowerCase() === "githubcopilot" && !apiKey) {
+  apiKey = await fetchGithubCopilotApiKey();
+  try {
+    const home = os.homedir();
+    const authDir = path.join(home, ".codex");
+    const authFile = path.join(authDir, "auth.json");
+    fs.writeFileSync(
+      authFile,
+      JSON.stringify(
+        {
+          GITHUBCOPILOT_API_KEY: apiKey,
+        },
+        null,
+        2,
+      ),
+      "utf-8",
+    );
+  } catch {
+    /* ignore */
+  }
+} else if (cli.flags.login) {
   if (provider.toLowerCase() === "githubcopilot") {
     apiKey = await fetchGithubCopilotApiKey();
   } else {
@@ -353,7 +379,7 @@ if (cli.flags.login) {
   }
 }
 // Ensure the API key is available as an environment variable for legacy code
-process.env["OPENAI_API_KEY"] = apiKey;
+process.env[`${provider.toUpperCase()}_API_KEY`] = apiKey;
 
 if (cli.flags.free) {
   // eslint-disable-next-line no-console

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

@@ -31,6 +31,7 @@ import {
 } from "../session.js";
 import { applyPatchToolInstructions } from "./apply-patch.js";
 import { handleExecCommand } from "./handle-exec-command.js";
+import { GithubCopilotClient } from "../openai-client.js";
 import { HttpsProxyAgent } from "https-proxy-agent";
 import { spawnSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
@@ -350,6 +351,24 @@ export class AgentLoop {
       });
     }
 
+    if (this.provider.toLowerCase() === "githubcopilot") {
+      this.oai = new GithubCopilotClient({
+        ...(apiKey ? { apiKey } : {}),
+        baseURL,
+        defaultHeaders: {
+          originator: ORIGIN,
+          version: CLI_VERSION,
+          session_id: this.sessionId,
+          ...(OPENAI_ORGANIZATION
+            ? { "OpenAI-Organization": OPENAI_ORGANIZATION }
+            : {}),
+          ...(OPENAI_PROJECT ? { "OpenAI-Project": OPENAI_PROJECT } : {}),
+        },
+        httpAgent: PROXY_URL ? new HttpsProxyAgent(PROXY_URL) : undefined,
+        ...(timeoutMs !== undefined ? { timeout: timeoutMs } : {}),
+      });
+    }
+
     setSessionId(this.sessionId);
     setCurrentModel(this.model);
 

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/src/utils/get-api-key.tsx

@@ -2,10 +2,12 @@ import type { Choice } from "./get-api-key-components";
 import type { Request, Response } from "express";
 
 import { ApiKeyPrompt, WaitingForAuth } from "./get-api-key-components";
+import { GithubCopilotClient } from "./openai-client.js";
+import Spinner from "../components/vendor/ink-spinner.js";
 import chalk from "chalk";
 import express from "express";
 import fs from "fs/promises";
-import { render } from "ink";
+import { Box, Text, render } from "ink";
 import crypto from "node:crypto";
 import { URL } from "node:url";
 import open from "open";
@@ -763,26 +765,29 @@ export async function getApiKey(
   }
 }
 
-export { maybeRedeemCredits };
-
-export async function fetchGithubCopilotApiKey(): Promise<string> {
-  if (process.env["GITHUB_COPILOT_TOKEN"]) {
-    return process.env["GITHUB_COPILOT_TOKEN"]!;
-  }
-
-  const choice = await promptUserForChoice();
-  if (choice.type === "apikey") {
-    process.env["GITHUB_COPILOT_TOKEN"] = choice.key;
-    return choice.key;
-  }
-
-  // Sign in via GitHub is not yet supported; instruct the user
-  // eslint-disable-next-line no-console
-  console.error(
-    "\n" +
-      "GitHub OAuth login is not yet implemented for Codex. " +
-      "Please generate a token manually and set it as GITHUB_COPILOT_TOKEN." +
-      "\n"
+export async function getGithubCopilotApiKey(): Promise<string> {
+  const { device_code, user_code, verification_uri } =
+    await GithubCopilotClient.getLoginURL();
+  const spinner = render(
+    <Box flexDirection="row" marginTop={1}>
+      <Spinner type="ball" />
+      <Text>
+        {" "}
+        Please visit {verification_uri} and enter code {user_code}
+      </Text>
+    </Box>,
   );
-  process.exit(1);
+  try {
+    const key = await GithubCopilotClient.pollForAccessToken(device_code);
+    spinner.clear();
+    spinner.unmount();
+    process.env["GITHUBCOPILOT_API_KEY"] = key;
+    return key;
+  } catch (err) {
+    spinner.clear();
+    spinner.unmount();
+    throw err;
+  }
 }
+
+export { maybeRedeemCredits };