@carjms/codexswitch 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carjms/codexswitch",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Multi-account manager for OpenAI Codex CLI with quota-based rotation (inspired by KarpelesLab/teamclaude)",
   "license": "MIT",
   "repository": {

package/src/cli.js

@@ -80,6 +80,9 @@ function storeAccount(name, auth) {
   store.writeAccountAuth(name, auth);
   const meta = store.loadMeta();
   if (!meta.accounts[name]) meta.accounts[name] = { priority: 0, addedAt: Date.now() };
+  // fresh credentials fix whatever got the account disabled or limited
+  delete meta.accounts[name].disabled;
+  delete meta.accounts[name].limitedUntil;
   store.saveMeta(meta);
   out(`${existed ? 'updated' : 'added'} account "${name}"${info.email ? ` (${info.email}, ${info.plan || 'unknown plan'})` : ''}`);
   return name;
@@ -184,7 +187,10 @@ function cmdCurrent() {
     return;
   }
   const info = authInfo(live);
-  const match = store.listAccounts().find((a) => a.accountId === info.accountId);
+  const accounts = store.listAccounts();
+  const match =
+    (info.email && accounts.find((a) => a.email === info.email)) ||
+    accounts.find((a) => a.accountId === info.accountId);
   const name = match ? match.name : '(not stored — run "codexswitch import")';
   const note = meta.active && match && meta.active !== match.name ? ` (meta says "${meta.active}" — out of sync)` : '';
   out(`active: ${name}${note}`);
@@ -442,6 +448,7 @@ function buildExecArgs(rest, meta) {
 }
 
 async function cmdRun(args) {
+  store.syncBack(); // pick up tokens refreshed by plain codex before overlaying
   let name = null;
   let rest = args;
   if (args[0] && store.accountExists(args[0])) {
@@ -486,6 +493,7 @@ async function cmdExec(args) {
   if (explicit && !store.accountExists(explicit)) throw new Error(`no such account: ${explicit}`);
   if (rest[0] === 'resume') allowResume = false; // user drives resume themselves
 
+  store.syncBack(); // pick up tokens refreshed by plain codex before overlaying
   const meta = store.loadMeta();
   const total = store.listAccounts().length;
   if (total === 0) throw new Error('no accounts — add one with "codexswitch login"');
@@ -529,6 +537,15 @@ async function cmdExec(args) {
       );
       continue;
     }
+    if (runner.looksAuthFailed(res.output)) {
+      // A revoked token won't heal by itself — take the account out of
+      // rotation and keep the task going on the next one.
+      setFlag(name, { disabled: true });
+      console.error(
+        `[codexswitch] "${name}" has a revoked/invalid login — disabled. Fix it with: codexswitch login ${name}`
+      );
+      continue;
+    }
     return res.code; // real failure, don't burn other accounts on it
   }
   console.error('[codexswitch] all accounts are rate-limited, over threshold, or disabled');

package/src/runner.js

@@ -286,6 +286,15 @@ function sessionTouchedSince(profile, sinceMs) {
 const LIMIT_RE =
   /usage[ _]limit|rate[ _]limit|too many requests|quota (?:exceeded|reached)|\b429\b|hit your (?:usage|weekly|5h) limit/i;
 
+// Credential failures (revoked/invalidated tokens) — re-login required, so
+// rotation should skip this account and tell the user how to fix it.
+const AUTH_RE =
+  /refresh[ _]token[ _](?:was )?(?:revoked|invalidated)|token_invalidated|please log ?out and sign in again|please try signing in again|401 unauthorized/i;
+
+function looksAuthFailed(output) {
+  return AUTH_RE.test(output || '');
+}
+
 function looksRateLimited(output, extraPatterns = []) {
   if (LIMIT_RE.test(output || '')) return true;
   for (const p of extraPatterns) {
@@ -313,6 +322,7 @@ module.exports = {
   buildProfile,
   runCodex,
   looksRateLimited,
+  looksAuthFailed,
   limitCooldownMs,
   scanUsage,
   recordUsage,

package/src/store.js

@@ -95,14 +95,19 @@ function listAccounts() {
 
 // Copy refreshed tokens from a live auth.json back into the store, so a
 // token refresh done by codex itself is never lost when we switch accounts.
-// Matches by account_id; prefers the account we believe deployed the file.
+// Matches by email first: team-plan accounts share one chatgpt_account_id
+// per workspace, so matching by account_id alone would let two teammates'
+// tokens overwrite each other. Falls back to account_id for tokens without
+// an email claim. Prefers the account we believe deployed the file.
 function syncBackFrom(authFile) {
   const cur = readJSONSafe(authFile);
   if (!cur) return null;
   const curInfo = authInfo(cur);
   if (!curInfo.accountId) return null;
   const meta = loadMeta();
-  const candidates = listAccounts().filter((a) => a.accountId === curInfo.accountId);
+  const all = listAccounts();
+  const byEmail = curInfo.email ? all.filter((a) => a.email === curInfo.email) : [];
+  const candidates = byEmail.length > 0 ? byEmail : all.filter((a) => a.accountId === curInfo.accountId);
   if (candidates.length === 0) return null;
   const target = candidates.find((a) => a.name === meta.active) || candidates[0];
   const stored = readAccountAuth(target.name);