gearbox-code 0.1.9 → 0.1.10

package/README.md

@@ -38,6 +38,9 @@ Common setup commands:
 ```bash
 gearbox auth add <api-key>                # auto-detects known key prefixes
 gearbox auth add <provider> <api-key>     # anthropic, openai, google, deepseek, openrouter, groq, xai, mistral...
+gearbox auth add codex                    # ChatGPT subscription through the Codex CLI
+gearbox auth add codex work               # second ChatGPT account, isolated CODEX_HOME
+gearbox auth add claude work              # second Claude account, isolated config
 gearbox auth import                       # import credentials from env/cloud config
 gearbox auth providers                    # list supported providers
 ```

package/dist/cli.mjs

@@ -64452,6 +64452,17 @@ function cleanCliStderr(text2) {
   }
   return cleaned;
 }
+function cliFailureMessage(binary, stderr, opts = {}) {
+  const err = cleanCliStderr(stderr);
+  const isCodex = binary.includes("codex");
+  if (isCodex && /app_session_terminated|Your session has ended|Failed to refresh token|HTTP error: 401 Unauthorized/i.test(err)) {
+    const account = opts.accountLabel ? ` for ${opts.accountLabel}` : "";
+    const relogin = opts.reloginCommand ? ` Run ${opts.reloginCommand} to sign in again, then /retry.` : " Sign in to that Codex account again, then /retry.";
+    return `Codex session expired${account}.${relogin}`;
+  }
+  const hint = isCodex ? "Codex CLI failed before returning an assistant message. Check the line above, then /retry." : `${binary} failed before returning an assistant message. Check the line above, then /retry.`;
+  return err ? `${hint} ${err}` : hint;
+}
 async function runCliTask(opts) {
   const { binary, prompt, messages, onEvent, signal } = opts;
   const args = buildCliArgs(binary, prompt, { sessionId: opts.sessionId, autoApprove: opts.autoApprove, modelId: opts.modelId, effort: opts.effort });
@@ -64513,8 +64524,7 @@ async function runCliTask(opts) {
   if (!signal?.aborted) {
     const err = cleanCliStderr(stderr);
     if ((proc.exitCode ?? 0) !== 0) {
-      const hint = binary.includes("codex") ? "Codex CLI failed before returning an assistant message. Check the line above, then /retry." : `${binary} failed before returning an assistant message. Check the line above, then /retry.`;
-      onEvent({ type: "error", message: err ? `${hint} ${err}` : hint });
+      onEvent({ type: "error", message: cliFailureMessage(binary, stderr, { accountLabel: opts.accountLabel, reloginCommand: opts.reloginCommand }) });
     } else if (!state.text && !sawEvent && err) {
       onEvent({ type: "error", message: `${binary} produced no JSON output: ${err}` });
     } else if (!state.text && !sawEvent) {
@@ -134618,7 +134628,23 @@ function App2({ selector: initialSelector, runner, fullscreen = false, resumeId
       const cliChoices = cliModelChoices(cli.binary);
       const cliChoice = cliChoices.find((m2) => m2.id === activeCliModelRef.current) ?? cliChoices[0];
       const cliEffort = cliChoice ? normalizeEffort(effortRef.current, cliChoice.efforts ?? []) ?? undefined : undefined;
-      const r3 = await runCliTask({ binary: cli.binary, prompt, messages, onEvent, signal, sessionId: cliSessionRef.current, autoApprove: isYolo(), profile: cli.profile, modelId: activeCliModelRef.current, effort: cliEffort });
+      const activeAccount = getAccount(cli.id);
+      const activeName = activeAccount ? accountName(activeAccount).match(/\((.*)\)/)?.[1] : undefined;
+      const reloginCommand = cli.binary.includes("codex") ? `/account add codex${activeName ? ` ${activeName}` : ""}` : `/account add claude${activeName ? ` ${activeName}` : ""}`;
+      const r3 = await runCliTask({
+        binary: cli.binary,
+        prompt,
+        messages,
+        onEvent,
+        signal,
+        sessionId: cliSessionRef.current,
+        autoApprove: isYolo(),
+        profile: cli.profile,
+        modelId: activeCliModelRef.current,
+        effort: cliEffort,
+        accountLabel: activeAccount ? accountLabel(activeAccount) : cli.id,
+        reloginCommand
+      });
       cliSessionRef.current = r3.sessionId ?? cliSessionRef.current;
       cliMetaRef.current = { costUSD: r3.costUSD, rates: r3.rates };
       return { messages: r3.messages, usage: r3.usage };
@@ -136281,7 +136307,7 @@ function App2({ selector: initialSelector, runner, fullscreen = false, resumeId
 var jsx_dev_runtime13 = __toESM(require_jsx_dev_runtime(), 1);
 process.env.LANG = process.env.LANG || "en_US.UTF-8";
 process.env.LC_ALL = process.env.LC_ALL || "en_US.UTF-8";
-var VERSION16 = "0.1.9";
+var VERSION16 = "0.1.10";
 var args = process.argv.slice(2);
 var supportsAnsi = process.env.NO_COLOR !== "1" && process.env.TERM !== "dumb" && (process.stdout.isTTY || process.env.FORCE_COLOR === "1");
 var ansi = (code) => supportsAnsi ? `\x1B[${code}m` : "";
@@ -136539,6 +136565,8 @@ Set up at least one provider first:
   gearbox onboard
   gearbox auth add <api-key>
   gearbox auth add <provider> <api-key>
+  gearbox auth add codex [name]
+  gearbox auth add claude [name]
   gearbox auth import
 
 Models: ${MODELS.map((m2) => m2.label).join(", ")}
@@ -136556,7 +136584,8 @@ if (args[0] === "onboard" || args[0] === "setup") {
 if (args[0] === "auth") {
   const { listAccounts: listAccounts2, loadAccounts: loadAccounts3, removeAccount: removeAccount2 } = await Promise.resolve().then(() => (init_store(), exports_store));
   const { importableEnvCreds: importableEnvCreds2, importEnvCred: importEnvCred2, importableCloudCreds: importableCloudCreds2, importCloudCred: importCloudCred2 } = await Promise.resolve().then(() => (init_detect(), exports_detect));
-  const { addApiKeyAccount: addApiKeyAccount2, addByPastedKey: addByPastedKey2, testAccount: testAccount2, addableProviders: addableProviders2 } = await Promise.resolve().then(() => (init_onboard(), exports_onboard));
+  const { addApiKeyAccount: addApiKeyAccount2, addByPastedKey: addByPastedKey2, testAccount: testAccount2, addableProviders: addableProviders2, addCliAccount: addCliAccount2, cliAuthStatus: cliAuthStatus2, cliLoginArgs: cliLoginArgs2 } = await Promise.resolve().then(() => (init_onboard(), exports_onboard));
+  const { subscriptionEnv: subscriptionEnv2 } = await Promise.resolve().then(() => (init_cli_backend(), exports_cli_backend));
   const { detectProviderByKey: detectProviderByKey2 } = await Promise.resolve().then(() => (init_catalog(), exports_catalog));
   const sub = args[1];
   const rest2 = args.slice(2);
@@ -136580,11 +136609,25 @@ Importable from your env (gearbox auth import): ${imp.map((c) => c.envVar).join(
     const names = [...keys2.map((c) => c.provider), ...cloud.map((c) => c.provider)];
     console.log(names.length ? `Imported ${names.length}: ${names.join(", ")}` : "Nothing to import.");
   } else if (sub === "add") {
-    const res = rest2[0] && !rest2[1] && detectProviderByKey2(rest2[0]) ? await addByPastedKey2(rest2[0]) : rest2[0] && rest2[1] ? await addApiKeyAccount2(rest2[0], rest2[1]) : { ok: false, message: "usage: gearbox auth add <key>   |   gearbox auth add <provider> <key>" };
+    const head2 = (rest2[0] ?? "").toLowerCase();
+    const cliProvider = head2 === "codex" || head2 === "chatgpt" ? "codex-cli" : head2 === "claude" ? "claude-cli" : "";
+    const res = cliProvider ? addCliAccount2(cliProvider, rest2.slice(1).join(" ").trim() || undefined) : rest2[0] && !rest2[1] && detectProviderByKey2(rest2[0]) ? await addByPastedKey2(rest2[0]) : rest2[0] && rest2[1] ? await addApiKeyAccount2(rest2[0], rest2[1]) : { ok: false, message: "usage: gearbox auth add <key>   |   gearbox auth add <provider> <key>   |   gearbox auth add codex [name]" };
     console.log(res.message);
     if (res.ok && res.account) {
-      const t2 = await testAccount2(res.account);
-      console.log(t2.ok ? "  test: ✓ " + t2.message : "  test: ✗ " + t2.message + " (stored anyway)");
+      if (res.account.exec === "cli" && res.account.auth.kind === "cli") {
+        const bin = res.account.auth.binary;
+        const profile = res.account.auth.loginProfile;
+        let st = await cliAuthStatus2(bin, profile);
+        if (!st.loggedIn) {
+          console.log(`  sign-in: starting ${bin} ${cliLoginArgs2(bin).join(" ")}`);
+          spawnSync(bin, cliLoginArgs2(bin), { stdio: "inherit", env: subscriptionEnv2(bin, profile) });
+          st = await cliAuthStatus2(bin, profile);
+        }
+        console.log(st.loggedIn ? `  sign-in: ✓ ${st.detail ?? "ready"}` : `  sign-in: ✗ not signed in${st.detail ? ` (${st.detail})` : ""}`);
+      } else {
+        const t2 = await testAccount2(res.account);
+        console.log(t2.ok ? "  test: ✓ " + t2.message : "  test: ✗ " + t2.message + " (stored anyway)");
+      }
     }
   } else if (sub === "test" && rest2[0]) {
     const a = listAccounts2().find((x2) => x2.id === rest2[0]);
@@ -136596,7 +136639,7 @@ Importable from your env (gearbox auth import): ${imp.map((c) => c.envVar).join(
     for (const p of addableProviders2())
       console.log(`${p.id.padEnd(16)} ${p.label} (${p.group})`);
   } else {
-    console.log("gearbox auth [list|import|add <key>|add <provider> <key>|test <id>|rm <id>|providers]");
+    console.log("gearbox auth [list|import|add <key>|add <provider> <key>|add codex [name]|add claude [name]|test <id>|rm <id>|providers]");
   }
   process.exit(0);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gearbox-code",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "A beautiful multi-provider coding harness for the terminal. (Intelligent model routing lands on top of this soon.)",
   "type": "module",
   "license": "MIT",