@leoustc/ai-runner-codex 0.1.3 → 0.1.5

package/AGENTS.md

@@ -103,6 +103,9 @@ 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.
+While login is in progress, stream cleaned login output to every waiting Hub
+request, and replay recent output plus the latest parsed URL/code/deviceId to
+requests that arrive mid-login.
 
 
 Do not commit real `.env` secrets. If examples are needed, use `.env.example`.

package/README.md

@@ -89,7 +89,10 @@ 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.
+runner watches stdout/stderr for the device login values. While login is in
+progress, cleaned login output is streamed to every waiting Hub request, and a
+new request that arrives mid-login receives the recent output plus the latest
+parsed URL/code/deviceId.
 
 Hub WebSocket behavior:
 

package/package.json

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

package/src/login.js

@@ -10,21 +10,37 @@ export function isCodexAuthError(error) {
 
 export async function ensureCodexLogin(config, log, notify) {
   if (activeLogin) {
+    const session = activeLogin;
+    session.notifiers.add(notify);
     await notify(loginStatusMessage("waiting", "Codex login is already in progress. Waiting for it to complete."));
-    return await activeLogin;
+    await replayLoginState(session, notify);
+    return await session.promise.finally(() => {
+      session.notifiers.delete(notify);
+    });
   }
 
-  activeLogin = runCodexLogin(config, log, notify).finally(() => {
+  const session = {
+    buffer: "",
+    lastInfoKey: "",
+    notifiers: new Set([notify]),
+    outputTail: [],
+    promise: null,
+  };
+
+  session.promise = runCodexLogin(config, log, session).finally(() => {
     activeLogin = null;
   });
+  activeLogin = session;
 
-  return await activeLogin;
+  return await session.promise.finally(() => {
+    session.notifiers.delete(notify);
+  });
 }
 
-async function runCodexLogin(config, log, notify) {
+async function runCodexLogin(config, log, session) {
   const [program, ...args] = splitCommand(config.codexLoginCommand);
 
-  await notify(loginStatusMessage("starting", "Codex login is required. Starting device login process."));
+  await broadcastLogin(session, loginStatusMessage("starting", "Codex login is required. Starting device login process."));
   log.info(`starting codex login: ${config.codexLoginCommand}`);
 
   return await new Promise((resolve, reject) => {
@@ -36,20 +52,30 @@ async function runCodexLogin(config, log, notify) {
       },
       stdio: ["ignore", "pipe", "pipe"],
     });
-    const state = {
-      buffer: "",
-      sentLoginInfo: false,
-    };
     const timer = setTimeout(() => {
       child.kill("SIGTERM");
       reject(new Error(`Codex login timed out after ${config.codexLoginTimeoutMs}ms`));
     }, config.codexLoginTimeoutMs);
 
     const onData = (data) => {
-      const text = String(data);
-      log.debug(`[codex login] ${text.trimEnd()}`);
-      state.buffer = `${state.buffer}\n${text}`.slice(-8000);
-      void sendLoginInfo(state, notify);
+      const text = stripAnsi(String(data));
+      const trimmed = text.trimEnd();
+      log.debug(`[codex login] ${trimmed}`);
+      session.buffer = `${session.buffer}\n${text}`.slice(-8000);
+
+      if (trimmed) {
+        const notice = {
+          codexLogin: true,
+          status: "login_output",
+          output: trimmed,
+          text: trimmed,
+        };
+        session.outputTail.push(notice);
+        session.outputTail = session.outputTail.slice(-8);
+        void broadcastLogin(session, notice);
+      }
+
+      void sendLoginInfo(session);
     };
 
     child.stdout.on("data", onData);
@@ -62,7 +88,7 @@ async function runCodexLogin(config, log, notify) {
       clearTimeout(timer);
 
       if (code === 0) {
-        void notify(loginStatusMessage("complete", "Codex login completed. Retrying the request."));
+        void broadcastLogin(session, loginStatusMessage("complete", "Codex login completed. Retrying the request."));
         resolve();
       } else {
         reject(new Error(`Codex login exited code=${code ?? "null"} signal=${signal ?? "null"}`));
@@ -71,19 +97,20 @@ async function runCodexLogin(config, log, notify) {
   });
 }
 
-async function sendLoginInfo(state, notify) {
-  if (state.sentLoginInfo) {
+async function sendLoginInfo(session) {
+  const info = parseLoginInfo(session.buffer);
+
+  if (!info.url && !info.deviceId) {
     return;
   }
 
-  const info = parseLoginInfo(state.buffer);
-
-  if (!info.url && !info.deviceId) {
+  const infoKey = `${info.url}|${info.deviceId}`;
+  if (infoKey === session.lastInfoKey) {
     return;
   }
 
-  state.sentLoginInfo = true;
-  await notify({
+  session.lastInfoKey = infoKey;
+  await broadcastLogin(session, {
     codexLogin: true,
     status: "login_required",
     ...(info.url ? { url: info.url } : {}),
@@ -97,6 +124,33 @@ async function sendLoginInfo(state, notify) {
   });
 }
 
+async function replayLoginState(session, notify) {
+  for (const notice of session.outputTail) {
+    await notify(notice);
+  }
+
+  const info = parseLoginInfo(session.buffer);
+
+  if (info.url || info.deviceId) {
+    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"),
+    });
+  }
+}
+
+async function broadcastLogin(session, notice) {
+  await Promise.all([...session.notifiers].map((notify) => notify(notice).catch(() => undefined)));
+}
+
 function loginStatusMessage(status, text) {
   return {
     codexLogin: true,
@@ -106,13 +160,21 @@ function loginStatusMessage(status, text) {
 }
 
 function parseLoginInfo(text) {
-  const url = text.match(/https?:\/\/[^\s"'<>]+/)?.[0]?.replace(/[),.;]+$/, "") ?? "";
+  const clean = stripAnsi(text);
+  const url = clean.match(/https?:\/\/[^\s"'<>]+/)?.[0]?.replace(/[),.;]+$/, "") ?? "";
+  const withoutUrls = clean.replace(/https?:\/\/[^\s"'<>]+/g, " ");
   const labelledDeviceId =
-    text.match(/(?:device|user|login|verification)?\s*(?:id|code)(?:\s+is)?\s*[:=]?\s*([A-Z0-9][A-Z0-9-]{4,})/i)?.[1] ?? "";
-  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 deviceId = labelledDeviceId || labelledCode || fallbackCode;
+    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: deviceId,
@@ -121,6 +183,32 @@ function parseLoginInfo(text) {
   };
 }
 
+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) => {