gearbox-code 0.1.8 → 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,8 +136307,48 @@ 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.8";
+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` : "";
+var paint = (code, text2) => `${ansi(code)}${text2}${ansi("0")}`;
+var bold = (text2) => paint("1", text2);
+var accent = (text2) => paint("36", text2);
+var dim = (text2) => paint("2", text2);
+var ok = (text2) => paint("32", text2);
+var warn = (text2) => paint("33", text2);
+var errColor = (text2) => paint("31", text2);
+var stripAnsi2 = (text2) => text2.replace(/\x1b\[[0-9;]*m/g, "");
+var visibleLength = (text2) => stripAnsi2(text2).length;
+var padVisible = (text2, width) => text2 + " ".repeat(Math.max(width - visibleLength(text2), 0));
+function onboardingBoo() {
+  return [
+    "        .-''''-.",
+    "      .'  .--.  '.",
+    "     /   (    )   \\",
+    "    |  .-.    .-.  |",
+    "    |  |_|    |_|  |",
+    "    |      __      |",
+    "     \\   .'  '.   /",
+    "      '._\\____/_.'",
+    "        /|    |\\"
+  ].join(`
+`);
+}
+function box(title, lines) {
+  const width = Math.min(78, Math.max(title.length + 4, ...lines.map((l) => visibleLength(l) + 4)));
+  const rule = "─".repeat(width - 2);
+  console.log(accent(`╭${rule}╮`));
+  console.log(accent("│ ") + padVisible(bold(title), width - 3) + accent("│"));
+  console.log(accent(`├${rule}┤`));
+  for (const line of lines) {
+    console.log(accent("│ ") + padVisible(line, width - 3) + accent("│"));
+  }
+  console.log(accent(`╰${rule}╯`));
+}
+function optionLine(key, label, detail) {
+  return `${accent(key.padStart(2))}  ${bold(label)}  ${dim(detail)}`;
+}
 async function runCliOnboarding() {
   const { listAccounts: listAccounts2 } = 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));
@@ -136290,41 +136356,55 @@ async function runCliOnboarding() {
   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 { which: which2 } = await Promise.resolve().then(() => (init_proc(), exports_proc));
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const ask = async (q) => (await rl.question(q)).trim();
-  const providerRows = () => addableProviders2().map((p) => `  ${p.id.padEnd(16)} ${p.label}`).join(`
+  const pipedAnswers = process.stdin.isTTY ? null : (await readStdin()).split(/\r?\n/);
+  const rl = pipedAnswers ? null : createInterface({ input: process.stdin, output: process.stdout });
+  const ask = async (q) => {
+    if (pipedAnswers) {
+      const answer = (pipedAnswers.shift() ?? "").trim();
+      console.log(accent(q) + answer);
+      return answer;
+    }
+    return (await rl.question(accent(q))).trim();
+  };
+  const providerRows = () => addableProviders2().map((p) => `  ${accent(p.id.padEnd(16))} ${p.label}`).join(`
 `);
   const testAndReport = async (account) => {
-    console.log("Testing credential...");
+    console.log(dim("Testing credential with the provider..."));
     const t2 = await testAccount2(account);
-    console.log(t2.ok ? `OK: ${t2.message}` : `Stored, but the test failed: ${t2.message}`);
+    console.log(t2.ok ? ok(`Credential works: ${t2.message}`) : warn(`Stored, but the live test failed: ${t2.message}`));
   };
   const addSubscription = async (provider) => {
     const res = addCliAccount2(provider);
-    console.log(res.message);
+    console.log(res.ok ? ok(res.message) : errColor(res.message));
     if (!res.ok || !res.account || res.account.auth.kind !== "cli")
       return false;
     const bin = res.account.auth.binary;
     const profile = res.account.auth.loginProfile;
     let status = await cliAuthStatus2(bin, profile);
     if (!status.loggedIn) {
-      console.log(`Starting ${bin} sign-in...`);
+      console.log(dim(`Starting ${bin} sign-in in this terminal...`));
       const r2 = spawnSync(bin, cliLoginArgs2(bin), { stdio: "inherit", env: subscriptionEnv2(bin, profile) });
       if ((r2.status ?? 1) !== 0)
         return false;
       status = await cliAuthStatus2(bin, profile);
     }
     if (!status.loggedIn) {
-      console.log(`${bin} did not report a completed sign-in.`);
+      console.log(warn(`${bin} did not report a completed sign-in.`));
       return false;
     }
-    console.log(`OK: ${bin} subscription ready${status.detail ? ` (${status.detail})` : ""}`);
+    console.log(ok(`${bin} subscription ready${status.detail ? ` (${status.detail})` : ""}`));
     return true;
   };
   try {
     console.log("");
-    console.log("Gearbox setup");
-    console.log("One provider account is required before the coding app opens.");
+    if (supportsAnsi)
+      console.log(paint("38;5;117", onboardingBoo()));
+    else
+      console.log(onboardingBoo());
+    console.log("");
+    console.log(bold("Gearbox setup"));
+    console.log("Boo needs one model account before the coding app opens.");
+    console.log(dim("Your credentials stay local. API keys are stored in Gearbox's credential store; subscription sign-ins stay inside the vendor CLI."));
     console.log("");
     while (!anyProviderAvailable()) {
       const env3 = importableEnvCreds2();
@@ -136332,27 +136412,32 @@ async function runCliOnboarding() {
       const existing = listAccounts2();
       if (existing.length)
         break;
-      console.log("Choose a setup path:");
-      if (env3.length || cloud.length)
-        console.log("  1) Import detected credentials");
-      console.log("  2) Paste an API key");
-      console.log("  3) Choose provider + API key");
-      console.log("  4) Azure OpenAI / Azure AI Foundry");
+      const options2 = [];
+      if (env3.length || cloud.length) {
+        const names = [...env3.map((c) => c.envVar), ...cloud.map((c) => `${c.label} (${c.source})`)];
+        options2.push(optionLine("1", "Import detected credentials", names.join(", ")));
+      }
+      options2.push(optionLine("2", "Paste API key", "auto-detects common key prefixes"));
+      options2.push(optionLine("3", "Choose provider + key", "Anthropic, OpenAI, Gemini, OpenRouter, Groq, ..."));
+      options2.push(optionLine("4", "Azure endpoint + key", "Azure OpenAI or Azure AI Foundry"));
       if (which2("claude"))
-        console.log("  5) Claude subscription CLI");
+        options2.push(optionLine("5", "Claude subscription", "uses the official claude CLI; no token extraction"));
       if (which2("codex"))
-        console.log("  6) ChatGPT subscription CLI");
-      console.log("  p) Show providers");
-      console.log("  q) Quit setup");
+        options2.push(optionLine("6", "ChatGPT subscription", "uses the official codex CLI; no token extraction"));
+      options2.push(optionLine("p", "Show provider catalog", "all API-key providers Gearbox knows how to add"));
+      options2.push(optionLine("q", "Quit setup", "Gearbox will not open the coding app yet"));
+      box("Choose how Gearbox should connect", options2);
       console.log("");
       const choice = (await ask("Selection: ")).toLowerCase();
       if (choice === "q" || choice === "quit" || choice === "skip") {
         console.log("");
-        console.log("Setup skipped. Run `gearbox onboard` when you are ready.");
+        console.log(warn("Setup skipped. Run `gearbox onboard` when you are ready."));
         return false;
       }
       if (choice === "p" || choice === "providers") {
         console.log("");
+        console.log(bold("Provider catalog"));
+        console.log(dim("Use these ids with: gearbox auth add <provider> <api-key>"));
         console.log(providerRows());
         console.log("");
         continue;
@@ -136362,20 +136447,21 @@ async function runCliOnboarding() {
           await importEnvCred2(c);
         for (const c of cloud)
           await importCloudCred2(c);
-        console.log(`Imported ${env3.length + cloud.length} credential${env3.length + cloud.length === 1 ? "" : "s"}.`);
+        console.log(ok(`Imported ${env3.length + cloud.length} credential${env3.length + cloud.length === 1 ? "" : "s"}.`));
         break;
       }
       if (choice === "2") {
+        console.log(dim("Paste is visible in most terminals. Use option 3 if you want to be explicit about the provider."));
         const key = await ask("Paste API key: ");
         if (!key)
           continue;
         const detected = detectProviderByKey2(key);
         if (!detected) {
-          console.log("Could not detect the provider from that key. Use option 3.");
+          console.log(warn("Could not detect the provider from that key. Use option 3."));
           continue;
         }
         const res = await addByPastedKey2(key);
-        console.log(res.message);
+        console.log(res.ok ? ok(res.message) : errColor(res.message));
         if (res.ok && res.account) {
           await testAndReport(res.account);
           break;
@@ -136384,12 +136470,14 @@ async function runCliOnboarding() {
       }
       if (choice === "3") {
         console.log("");
+        console.log(bold("Provider catalog"));
         console.log(providerRows());
         console.log("");
         const provider = await ask("Provider id: ");
+        console.log(dim("The key is stored locally and tested before setup finishes."));
         const key = await ask("API key: ");
         const res = await addApiKeyAccount2(provider, key);
-        console.log(res.message);
+        console.log(res.ok ? ok(res.message) : errColor(res.message));
         if (res.ok && res.account) {
           await testAndReport(res.account);
           break;
@@ -136397,11 +136485,12 @@ async function runCliOnboarding() {
         continue;
       }
       if (choice === "4") {
+        console.log(dim("Use a resource name like my-openai-resource, or a full Foundry endpoint URL."));
         const endpoint = await ask("Azure resource name or endpoint: ");
         const key = await ask("API key: ");
         const apiVersion = await ask("API version (optional): ");
         const res = /^https?:\/\//i.test(endpoint) ? await addAzureFoundryAccount2(endpoint, key) : await addAzureAccount2(endpoint, key, { apiVersion: apiVersion || undefined });
-        console.log(res.message);
+        console.log(res.ok ? ok(res.message) : errColor(res.message));
         if (res.ok && res.account) {
           await testAndReport(res.account);
           break;
@@ -136418,16 +136507,22 @@ async function runCliOnboarding() {
           break;
         continue;
       }
-      console.log("Choose one of the listed options.");
+      console.log(warn("Choose one of the listed options."));
     }
     console.log("");
-    console.log("Gearbox is ready.");
-    console.log("Run `gearbox` inside a project.");
+    console.log(ok("Gearbox is ready."));
+    console.log(`Next: ${accent("cd ~/your-project")} and run ${accent("gearbox")}.`);
     return true;
   } finally {
-    rl.close();
+    rl?.close();
   }
 }
+async function readStdin() {
+  let input = "";
+  for await (const chunk2 of process.stdin)
+    input += chunk2;
+  return input;
+}
 if (args[0] === "upgrade" || args[0] === "update") {
   const root2 = resolve11(import.meta.dir, "..");
   if (!existsSync8(resolve11(root2, ".git"))) {
@@ -136470,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(", ")}
@@ -136487,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);
@@ -136511,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]);
@@ -136527,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.8",
+  "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",