@leoustc/ai-runner-codex 0.1.2 → 0.1.4

package/AGENTS.md

@@ -97,10 +97,12 @@ Optional variables may also be added for the Codex app-server command,
 socket mode; this runner is intended to keep Codex hot through app-server
 WebSocket.
 
-If Codex app-server returns an auth/login error, start `CODEX_LOGIN_COMMAND`
-(`codex login --device-auth` by default), relay the device login URL/code back
-to the Hub as an agent message, wait for login completion, and retry the Codex
-request once.
+If Codex app-server returns an auth/login error or generic app-server error,
+start `CODEX_LOGIN_COMMAND` (`codex login --device-auth` by default), relay a
+normal agent message with `codexLogin: true`, `status`, and any parsed device
+login `url`, `code`, and `deviceId` back to the Hub, wait for login completion,
+and retry the Codex request once. Spawn the login command as a local child
+process and watch stdout/stderr for device login values.
 
 
 Do not commit real `.env` secrets. If examples are needed, use `.env.example`.

package/README.md

@@ -84,9 +84,12 @@ WebSocket text frame.
 On startup, the runner checks that the `codex` CLI is installed and available
 on `PATH` before starting app-server.
 
-If Codex returns an auth/login error, the runner starts `CODEX_LOGIN_COMMAND`,
-posts the device login URL/code back to the Hub as an agent message, waits for
-login completion, then retries the Codex request once.
+If Codex returns an auth/login error or a generic app-server error, the runner
+starts `CODEX_LOGIN_COMMAND`, posts a normal agent message with
+`codexLogin: true`, `status`, and any parsed device login `url`, `code`, and
+`deviceId` back to the Hub, waits for login completion, then retries the Codex
+request once. The login command is spawned as a local child process and the
+runner watches stdout/stderr for the device login values.
 
 Hub WebSocket behavior:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leoustc/ai-runner-codex",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "private": false,
   "description": "Codex app-server backed Agent Runner Hub CLI connector",
   "license": "MIT",

package/src/codex.js

@@ -194,7 +194,7 @@ class CodexWsClient {
       this.pending.delete(String(message.id));
 
       if (message.error) {
-        pending.reject(new Error(message.error.message || JSON.stringify(message.error)));
+        pending.reject(codexError(message.error, "Codex app-server request failed"));
       } else {
         pending.resolve(message.result);
       }
@@ -235,7 +235,7 @@ class CodexWsClient {
       this.turns.delete(threadId);
 
       if (message.params?.turn?.status === "failed") {
-        state.reject?.(new Error(message.params.turn.error?.message || "Codex turn failed"));
+        state.reject?.(codexError(message.params.turn.error, "Codex turn failed"));
       } else {
         state.resolve?.(state.text || textFromTurn(message.params?.turn));
       }
@@ -243,7 +243,7 @@ class CodexWsClient {
     }
 
     if (message.method === "error") {
-      const error = new Error(message.params?.message || "Codex app-server error");
+      const error = codexError(message.params, "Codex app-server error");
 
       for (const state of this.turns.values()) {
         state.reject?.(error);
@@ -379,6 +379,34 @@ function textFromTurn(turn) {
     .trim();
 }
 
+function codexError(value, fallback) {
+  if (!value || typeof value !== "object") {
+    return new Error(fallback);
+  }
+
+  const fields = [];
+
+  for (const key of ["message", "code", "reason", "type", "status"]) {
+    if (typeof value[key] === "string" && value[key]) {
+      fields.push(`${key}: ${value[key]}`);
+    }
+  }
+
+  if (value.error && typeof value.error === "object") {
+    for (const key of ["message", "code", "type"]) {
+      if (typeof value.error[key] === "string" && value.error[key]) {
+        fields.push(`error.${key}: ${value.error[key]}`);
+      }
+    }
+  }
+
+  if (fields.length === 0) {
+    fields.push(JSON.stringify(value));
+  }
+
+  return new Error(`${fallback}: ${fields.join("; ")}`);
+}
+
 function sandboxPolicy(mode, cwd) {
   if (mode === "danger-full-access") {
     return { type: "dangerFullAccess" };

package/src/hub.js

@@ -117,11 +117,8 @@ export class HubClient {
         throw error;
       }
 
-      await ensureCodexLogin(this.config, this.log, async (text) => {
-        this.sendMessages(value, {
-          codexLogin: true,
-          text,
-        });
+      await ensureCodexLogin(this.config, this.log, async (notice) => {
+        this.sendMessages(value, loginNoticeMessage(notice));
       });
 
       return await requestCodex(this.config, request);
@@ -257,3 +254,19 @@ function parseJson(data) {
     return null;
   }
 }
+
+function loginNoticeMessage(notice) {
+  if (notice && typeof notice === "object") {
+    return {
+      ...notice,
+      codexLogin: true,
+      text: typeof notice.text === "string" ? notice.text : JSON.stringify(notice, null, 2),
+    };
+  }
+
+  return {
+    codexLogin: true,
+    status: "notice",
+    text: String(notice),
+  };
+}

package/src/login.js

@@ -5,12 +5,12 @@ let activeLogin = null;
 export function isCodexAuthError(error) {
   const message = error instanceof Error ? error.message : String(error);
 
-  return /auth|login|sign[ -]?in|unauthori[sz]ed|forbidden|invalid_grant|refresh token|access token/i.test(message);
+  return /auth|login|sign[ -]?in|unauthori[sz]ed|forbidden|invalid_grant|refresh token|access token|codex app-server error/i.test(message);
 }
 
 export async function ensureCodexLogin(config, log, notify) {
   if (activeLogin) {
-    await notify("Codex login is already in progress. Waiting for it to complete.");
+    await notify(loginStatusMessage("waiting", "Codex login is already in progress. Waiting for it to complete."));
     return await activeLogin;
   }
 
@@ -24,7 +24,7 @@ export async function ensureCodexLogin(config, log, notify) {
 async function runCodexLogin(config, log, notify) {
   const [program, ...args] = splitCommand(config.codexLoginCommand);
 
-  await notify("Codex login is required. Starting device login.");
+  await notify(loginStatusMessage("starting", "Codex login is required. Starting device login process."));
   log.info(`starting codex login: ${config.codexLoginCommand}`);
 
   return await new Promise((resolve, reject) => {
@@ -62,7 +62,7 @@ async function runCodexLogin(config, log, notify) {
       clearTimeout(timer);
 
       if (code === 0) {
-        void notify("Codex login completed. Retrying the request.");
+        void notify(loginStatusMessage("complete", "Codex login completed. Retrying the request."));
         resolve();
       } else {
         reject(new Error(`Codex login exited code=${code ?? "null"} signal=${signal ?? "null"}`));
@@ -78,31 +78,83 @@ async function sendLoginInfo(state, notify) {
 
   const info = parseLoginInfo(state.buffer);
 
-  if (!info.url && !info.code) {
+  if (!info.url && !info.deviceId) {
     return;
   }
 
   state.sentLoginInfo = true;
-  await notify([
-    "Codex login required.",
-    info.url ? `Open: ${info.url}` : "",
-    info.code ? `Code: ${info.code}` : "",
-    "After login completes, the runner will retry automatically.",
-  ].filter(Boolean).join("\n"));
+  await notify({
+    codexLogin: true,
+    status: "login_required",
+    ...(info.url ? { url: info.url } : {}),
+    ...(info.deviceId ? { code: info.deviceId, deviceId: info.deviceId } : {}),
+    text: [
+      "Codex login required.",
+      info.url ? `Open: ${info.url}` : "",
+      info.deviceId ? `Code: ${info.deviceId}` : "",
+      "After login completes, the runner will retry automatically.",
+    ].filter(Boolean).join("\n"),
+  });
+}
+
+function loginStatusMessage(status, text) {
+  return {
+    codexLogin: true,
+    status,
+    text,
+  };
 }
 
 function parseLoginInfo(text) {
-  const url = text.match(/https?:\/\/[^\s"'<>]+/)?.[0]?.replace(/[),.;]+$/, "") ?? "";
-  const labelledCode =
-    text.match(/(?:user|device|login|verification)?\s*code(?:\s+is)?\s*[:=]?\s*([A-Z0-9][A-Z0-9-]{4,})/i)?.[1] ?? "";
-  const fallbackCode = text.match(/\b[A-Z0-9]{4}-[A-Z0-9]{4}\b/i)?.[0] ?? "";
+  const clean = stripAnsi(text);
+  const url = clean.match(/https?:\/\/[^\s"'<>]+/)?.[0]?.replace(/[),.;]+$/, "") ?? "";
+  const withoutUrls = clean.replace(/https?:\/\/[^\s"'<>]+/g, " ");
+  const labelledDeviceId =
+    firstDeviceCode([
+      ...withoutUrls.matchAll(
+        /(?:device|user|login|verification|authorization)\s*(?:id|code)(?:\s+(?:is|:)|\s*[:=])\s*([A-Z0-9][A-Z0-9-]{4,})/gi,
+      ),
+    ].map((match) => match[1])) ?? "";
+  const fallbackCode =
+    firstDeviceCode([
+      ...withoutUrls.matchAll(/\b[A-Z0-9]{4,}(?:-[A-Z0-9]{4,})+\b/g),
+      ...withoutUrls.matchAll(/\b[A-Z0-9]{8,}\b/g),
+    ].map((match) => match[0])) ?? "";
+  const deviceId = labelledDeviceId || fallbackCode;
 
   return {
-    code: labelledCode || fallbackCode,
+    code: deviceId,
+    deviceId,
     url,
   };
 }
 
+function stripAnsi(text) {
+  return String(text).replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
+}
+
+function firstDeviceCode(candidates) {
+  return candidates
+    .map((candidate) => String(candidate || "").trim().replace(/[),.;]+$/, ""))
+    .find((candidate) => isDeviceCode(candidate));
+}
+
+function isDeviceCode(candidate) {
+  if (!candidate || candidate.length < 6) {
+    return false;
+  }
+
+  if (!/^[A-Z0-9-]+$/.test(candidate)) {
+    return false;
+  }
+
+  if (!/[0-9]/.test(candidate) && !candidate.includes("-")) {
+    return false;
+  }
+
+  return !/^(AUTHORIZATION|VERIFICATION|DEVICE|LOGIN|OPENAI|CODEX)$/i.test(candidate);
+}
+
 function splitCommand(command) {
   const matches = command.match(/"[^"]*"|'[^']*'|\S+/g) ?? [];
   return matches.map((part) => {