snowcode 0.9.21 → 0.9.24

package/dist/cli.mjs

@@ -125648,7 +125648,7 @@ var init_metadata = __esm(() => {
       isClaudeAiAuth: isClaudeAISubscriber(),
       version: "99.0.0",
       versionBase: getVersionBase(),
-      buildTime: "2026-04-05T03:49:47.637Z",
+      buildTime: "2026-04-05T13:10:54.983Z",
       deploymentEnvironment: env2.detectDeploymentEnvironment(),
       ...isEnvTruthy(process.env.GITHUB_ACTIONS) && {
         githubEventName: process.env.GITHUB_EVENT_NAME,
@@ -130352,6 +130352,10 @@ function parseChatgptAccountId(token) {
   const fromClaim = asTrimmedString(payload?.["https://api.openai.com/auth.chatgpt_account_id"]);
   if (fromClaim)
     return fromClaim;
+  const nestedAuth = payload?.["https://api.openai.com/auth"] && typeof payload["https://api.openai.com/auth"] === "object" ? payload["https://api.openai.com/auth"] : undefined;
+  const nestedClaim = asTrimmedString(nestedAuth?.chatgpt_account_id);
+  if (nestedClaim)
+    return nestedClaim;
   return asTrimmedString(payload?.chatgpt_account_id);
 }
 function loadCodexAuthJson(authPath) {
@@ -130678,13 +130682,18 @@ function compareVersions(a2, b) {
   return 0;
 }
 function getCurrentVersion() {
-  const displayVersion = (typeof MACRO !== "undefined" ? "0.9.21" : undefined) ?? (() => {
-    try {
-      const pkg = require2("../../package.json");
-      return pkg.version;
-    } catch {
-      return;
+  const displayVersion = (typeof MACRO !== "undefined" ? "0.9.24" : undefined) ?? (() => {
+    for (const candidate of ["../../package.json", "../package.json"]) {
+      try {
+        const pkg = require2(candidate);
+        if (typeof pkg.version === "string") {
+          return pkg.version;
+        }
+      } catch {
+        continue;
+      }
     }
+    return;
   })() ?? "0.0.0";
   return displayVersion.replace(/[^0-9.]/g, "") || "0.0.0";
 }
@@ -130893,10 +130902,11 @@ async function printStartupScreen() {
   const sLen = ` ● ${sL}    Ready — type /help to begin`.length;
   out.push(boxRow(sRow, W2, sLen));
   out.push(`${rgb(...BORDER)}╚${"═".repeat(W2 - 2)}╝${RESET}`);
-  const _ver = "0.9.21";
+  const _ver = "0.9.24";
+  const _currentVersion = getCurrentVersion();
   const _update = await getAvailableUpdateWithRefresh({ timeoutMs: 1200 });
   out.push(`  ${DIM}${rgb(...DIMCOL)}snowcode v${_ver}${RESET}`);
-  if (_update) {
+  if (_update && compareVersions(_update, _currentVersion) > 0) {
     out.push(`  ${rgb(...ACCENT)}★ Update available v${_update}  →  /update${RESET}`);
   }
   out.push("");
@@ -370951,7 +370961,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-04-05T03:49:47.637Z").getTime();
+  const buildTime = new Date("2026-04-05T13:10:54.983Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -411623,8 +411633,13 @@ function OAuthFlow({
         }, undefined, false, undefined, this),
         /* @__PURE__ */ jsx_dev_runtime209.jsxDEV(ThemedText, {
           dimColor: true,
-          children: "R replace existing · K keep existing · Esc cancel"
-        }, undefined, false, undefined, this)
+          children: [
+            duplicateDecision?.replaceHint ?? "R replace existing",
+            " · ",
+            duplicateDecision?.keepHint ?? "K keep existing",
+            " · Esc cancel"
+          ]
+        }, undefined, true, undefined, this)
       ]
     }, undefined, true, undefined, this);
   return /* @__PURE__ */ jsx_dev_runtime209.jsxDEV(ThemedBox_default, {
@@ -412212,9 +412227,64 @@ function AuthCommand({
             code_verifier: verifier
           }, "codex_oauth");
           const email3 = emailFromTokens(tokens);
+          const accountId = parseChatgptAccountId(tokens.access_token) ?? parseChatgptAccountId(tokens.id_token);
           persistCodexOauthSession(tokens);
-          addAccount({ type: "codex_oauth", label: `Codex: ${email3}`, email: email3, refreshToken: tokens.refresh_token, enabled: true });
           process.env.OPENAI_API_KEY = "chatgpt-oauth";
+          const matchingAccounts = loadAccounts().accounts.filter((account) => account.type === "codex_oauth" && account.email?.trim().toLowerCase() === email3.trim().toLowerCase()).sort((left, right) => Date.parse(right.addedAt || "") - Date.parse(left.addedAt || ""));
+          if (matchingAccounts.length > 0) {
+            return {
+              email: email3,
+              refreshToken: tokens.refresh_token ?? "",
+              duplicateDecision: {
+                message: `This Codex account already exists: ${email3}`,
+                replaceHint: "R replace existing",
+                keepHint: "K keep both",
+                onReplace: () => {
+                  const [primary, ...duplicates] = matchingAccounts;
+                  updateAccount(primary.id, {
+                    label: `Codex: ${email3}`,
+                    email: email3,
+                    accountId,
+                    refreshToken: tokens.refresh_token ?? primary.refreshToken,
+                    enabled: true
+                  });
+                  for (const duplicate of duplicates) {
+                    removeAccount(duplicate.id);
+                  }
+                  appendAuthLog("codex_oauth", `account replaced email=${email3} removedDuplicates=${duplicates.length}`);
+                  return {
+                    email: email3,
+                    refreshToken: tokens.refresh_token ?? primary.refreshToken ?? "",
+                    completionMessage: `Codex account updated: ${email3}`
+                  };
+                },
+                onKeep: () => {
+                  addAccount({
+                    type: "codex_oauth",
+                    label: `Codex: ${email3}`,
+                    email: email3,
+                    accountId,
+                    refreshToken: tokens.refresh_token,
+                    enabled: true
+                  });
+                  appendAuthLog("codex_oauth", `duplicate account saved email=${email3}`);
+                  return {
+                    email: email3,
+                    refreshToken: tokens.refresh_token ?? "",
+                    completionMessage: `Codex duplicate account added: ${email3}`
+                  };
+                }
+              }
+            };
+          }
+          addAccount({
+            type: "codex_oauth",
+            label: `Codex: ${email3}`,
+            email: email3,
+            accountId,
+            refreshToken: tokens.refresh_token,
+            enabled: true
+          });
           appendAuthLog("codex_oauth", `account saved email=${email3}`);
           return { email: email3, refreshToken: tokens.refresh_token ?? "" };
         },
@@ -449520,6 +449590,13 @@ function UsageBar({ value, width = 12 }) {
 function err2(e) {
   return e instanceof Error ? e.message : String(e);
 }
+function normalizeEmail(value) {
+  const trimmed = value?.trim().toLowerCase();
+  return trimmed || null;
+}
+function sortNewestFirst(accounts) {
+  return [...accounts].sort((left, right) => Date.parse(right.addedAt || "") - Date.parse(left.addedAt || ""));
+}
 async function withRetry2(fn, retries = 3) {
   let lastError;
   for (let attempt = 1;attempt <= retries; attempt++) {
@@ -449807,15 +449884,73 @@ ${errorBody}`);
     throw new Error("Codex token refresh returned no access token");
   return json2;
 }
+async function refreshCodexTokenWithFallback(account) {
+  const candidates = [];
+  const seen = new Set;
+  const pushCandidate = (refreshToken, candidateAccount, accountId) => {
+    const trimmed = refreshToken?.trim();
+    if (!trimmed || seen.has(trimmed))
+      return;
+    seen.add(trimmed);
+    candidates.push({
+      refreshToken: trimmed,
+      account: candidateAccount,
+      accountId: accountId ?? candidateAccount?.accountId
+    });
+  };
+  pushCandidate(account.refreshToken, account, account.accountId);
+  const accountEmail = normalizeEmail(account.email);
+  if (accountEmail) {
+    const siblingAccounts = sortNewestFirst(loadAccounts().accounts.filter((item) => item.enabled && item.type === "codex_oauth" && item.id !== account.id && normalizeEmail(item.email) === accountEmail));
+    for (const sibling of siblingAccounts) {
+      pushCandidate(sibling.refreshToken, sibling, sibling.accountId);
+    }
+  }
+  const authJsonCredentials = resolveCodexApiCredentials();
+  const enabledCodexAccounts = loadAccounts().accounts.filter((item) => item.enabled && item.type === "codex_oauth" && item.refreshToken);
+  if (authJsonCredentials.refreshToken && (!account.accountId || authJsonCredentials.accountId === account.accountId || enabledCodexAccounts.length === 1)) {
+    pushCandidate(authJsonCredentials.refreshToken, undefined, authJsonCredentials.accountId);
+  }
+  let lastError;
+  for (const candidate of candidates) {
+    try {
+      const tokenResponse = await refreshCodexToken(candidate.refreshToken);
+      const rotatedRefreshToken = tokenResponse.refresh_token ?? candidate.refreshToken;
+      if (candidate.account?.id && rotatedRefreshToken !== candidate.account.refreshToken) {
+        updateAccount(candidate.account.id, {
+          refreshToken: rotatedRefreshToken
+        });
+      }
+      if (account.id !== candidate.account?.id && rotatedRefreshToken !== account.refreshToken) {
+        updateAccount(account.id, {
+          refreshToken: rotatedRefreshToken,
+          ...candidate.accountId ? { accountId: candidate.accountId } : {}
+        });
+      }
+      return {
+        tokenResponse,
+        accountId: candidate.accountId
+      };
+    } catch (error42) {
+      lastError = error42;
+    }
+  }
+  throw lastError ?? new Error("Codex session expired. Re-run /auth for that ChatGPT account.");
+}
 async function fetchCodex(account) {
-  const tokenResponse = await refreshCodexToken(account.refreshToken);
+  const { tokenResponse, accountId } = await refreshCodexTokenWithFallback(account);
   const token = tokenResponse.access_token;
   if (tokenResponse.refresh_token && tokenResponse.refresh_token !== account.refreshToken) {
     updateAccount(account.id, { refreshToken: tokenResponse.refresh_token });
   }
   const headers = { Authorization: `Bearer ${token}`, "User-Agent": "codex-cli" };
-  if (account.email)
-    headers["ChatGPT-Account-Id"] = account.email;
+  const resolvedAccountId = account.accountId ?? accountId;
+  if (resolvedAccountId) {
+    headers["ChatGPT-Account-Id"] = resolvedAccountId;
+    if (resolvedAccountId !== account.accountId) {
+      updateAccount(account.id, { accountId: resolvedAccountId });
+    }
+  }
   const res = await fetch(CODEX_USAGE_URL, { headers });
   if (!res.ok) {
     const errorBody = await res.text().catch(() => "unknown error");
@@ -450420,6 +450555,7 @@ var React94, import_react161, jsx_dev_runtime278, AG_CLOUDCODE_BASE = "https://c
 var init_usage2 = __esm(() => {
   init_ink2();
   init_accountManager();
+  init_providerConfig();
   init_antigravityOAuth();
   init_antigravityLocalSessions();
   init_antigravityLocalUsage();
@@ -464814,7 +464950,7 @@ var init_bridge_kick = __esm(() => {
 var call59 = async () => {
   return {
     type: "text",
-    value: `${"99.0.0"} (built ${"2026-04-05T03:49:47.637Z"})`
+    value: `${"99.0.0"} (built ${"2026-04-05T13:10:54.983Z"})`
   };
 }, version2, version_default;
 var init_version = __esm(() => {
@@ -538276,7 +538412,7 @@ function WelcomeV2() {
             dimColor: true,
             children: [
               "v",
-              "0.9.21",
+              "0.9.24",
               " "
             ]
           }, undefined, true, undefined, this)
@@ -538476,7 +538612,7 @@ function WelcomeV2() {
           dimColor: true,
           children: [
             "v",
-            "0.9.21",
+            "0.9.24",
             " "
           ]
         }, undefined, true, undefined, this)
@@ -538702,7 +538838,7 @@ function AppleTerminalWelcomeV2(t0) {
         dimColor: true,
         children: [
           "v",
-          "0.9.21",
+          "0.9.24",
           " "
         ]
       }, undefined, true, undefined, this);
@@ -538956,7 +539092,7 @@ function AppleTerminalWelcomeV2(t0) {
       dimColor: true,
       children: [
         "v",
-        "0.9.21",
+        "0.9.24",
         " "
       ]
     }, undefined, true, undefined, this);
@@ -559077,7 +559213,7 @@ Usage: claude --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version("0.9.21 (Snowcode)", "-v, --version", "Output the version number");
+  }).version("0.9.24 (Snowcode)", "-v, --version", "Output the version number");
   program.option("-w, --worktree [name]", "Create a new git worktree for this session (optionally specify a name)");
   program.option("--tmux", "Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.");
   if (canUserConfigureAdvisor()) {
@@ -559638,7 +559774,7 @@ function validateProviderEnvOrExit() {
 async function main2() {
   const args = process.argv.slice(2);
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-v" || args[0] === "-V")) {
-    console.log(`${"0.9.21"} (Snowcode)`);
+    console.log(`${"0.9.24"} (Snowcode)`);
     return;
   }
   validateProviderEnvOrExit();
@@ -559727,4 +559863,4 @@ async function main2() {
 }
 main2();
 
-//# debugId=E43E7FACDA558B6964756E2164756E21
+//# debugId=01B34F11D41CE63264756E2164756E21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snowcode",
-  "version": "0.9.21",
+  "version": "0.9.24",
   "description": "It's cold outside, isn't it?",
   "type": "module",
   "bin": {