oc-auth-switcher 0.1.1 → 0.1.2

package/README.md

@@ -89,6 +89,20 @@ Both files use atomic writes with `.bak` fallback for crash safety.
 - Auth failures trigger a 1-hour cooldown per account
 - Token refresh is handled automatically with retry and fallback to other accounts
 
+## Running the CLI
+
+When installed via npm (as part of the OpenCode plugin):
+
+```bash
+npx oc-auth-switcher <command>
+```
+
+From the project directory (development):
+
+```bash
+bun dist/cli.js <command>
+```
+
 ## Building from Source
 
 ```bash

package/dist/cli.js

@@ -13,7 +13,7 @@ var ACCOUNTS_FILE = path.join(configDir, "auth-switcher-accounts.json");
 var STATE_FILE = path.join(configDir, "auth-switcher-state.json");
 var DEFAULT_THRESHOLD = 0.9;
 var DEFAULT_CHECK_INTERVAL = 60 * 60 * 1000;
-var AUTH_FAILURE_COOLDOWN = 60 * 60 * 1000;
+var AUTH_FAILURE_COOLDOWN = 10 * 60 * 1000;
 
 // src/accounts.ts
 function normalizeAccount(raw) {

package/dist/index.js

@@ -415,7 +415,7 @@ var ACCOUNTS_FILE = path.join(configDir, "auth-switcher-accounts.json");
 var STATE_FILE = path.join(configDir, "auth-switcher-state.json");
 var DEFAULT_THRESHOLD = 0.9;
 var DEFAULT_CHECK_INTERVAL = 60 * 60 * 1000;
-var AUTH_FAILURE_COOLDOWN = 60 * 60 * 1000;
+var AUTH_FAILURE_COOLDOWN = 10 * 60 * 1000;
 
 // src/accounts.ts
 function normalizeAccount(raw) {
@@ -659,10 +659,44 @@ function getEarliestReset(usage) {
   ].filter((r) => r > 0);
   return resets.length > 0 ? Math.min(...resets) * 1000 : 0;
 }
+function purgeExpiredCooldowns(state) {
+  const now = Date.now();
+  for (const name of Object.keys(state.authFailures)) {
+    if (state.authFailures[name] <= now) {
+      delete state.authFailures[name];
+    }
+  }
+}
+function findBestAvailable(candidates, state, exclude) {
+  for (const acct of candidates) {
+    if (exclude.has(acct.name))
+      continue;
+    if (isTemporarilyUnavailable(state, acct.name))
+      continue;
+    if (!isOverThreshold(state.usage[acct.name], state)) {
+      return acct;
+    }
+  }
+  let best = null;
+  let bestScore = Infinity;
+  for (const acct of candidates) {
+    if (exclude.has(acct.name))
+      continue;
+    if (isTemporarilyUnavailable(state, acct.name))
+      continue;
+    const score = getUtilizationScore(state.usage[acct.name], state);
+    if (score < bestScore) {
+      bestScore = score;
+      best = acct;
+    }
+  }
+  return best;
+}
 function selectAccount(accounts, state) {
   if (accounts.length === 0) {
     throw new Error("No accounts available");
   }
+  purgeExpiredCooldowns(state);
   if (accounts.length === 1) {
     return { account: accounts[0], switched: false };
   }
@@ -690,40 +724,39 @@ function selectAccount(accounts, state) {
   if (isPrimary) {
     if (isOverThreshold(primaryUsage, state)) {
       const exceededMetric = getExceededMetric(primaryUsage, state);
-      for (const fb of fallbacks) {
-        if (isTemporarilyUnavailable(state, fb.name))
-          continue;
-        const fbUsage = state.usage[fb.name];
-        if (!isOverThreshold(fbUsage, state)) {
-          return {
-            account: fb,
-            switched: true,
-            reason: `Primary exceeded ${exceededMetric} threshold — switching to ${fb.name}`
-          };
-        }
-      }
-      let bestFb = null;
-      let bestScore = Infinity;
-      for (const fb of fallbacks) {
-        if (isTemporarilyUnavailable(state, fb.name))
-          continue;
-        const score = getUtilizationScore(state.usage[fb.name], state);
-        if (score < bestScore) {
-          bestScore = score;
-          bestFb = fb;
-        }
-      }
-      if (bestFb) {
+      const best = findBestAvailable(fallbacks, state, new Set);
+      if (best) {
         return {
-          account: bestFb,
+          account: best,
           switched: true,
-          reason: `Primary exceeded threshold, all fallbacks busy — using least loaded: ${bestFb.name}`
+          reason: `Primary exceeded ${exceededMetric} threshold — switching to ${best.name}`
         };
       }
       return { account: primary, switched: false };
     }
     return { account: primary, switched: false };
   }
+  const currentOverThreshold = isOverThreshold(currentUsage, state);
+  const currentInCooldown = isTemporarilyUnavailable(state, current.name);
+  if (currentOverThreshold || currentInCooldown) {
+    const reason = currentInCooldown ? `${current.name} in auth-failure cooldown` : `${current.name} exceeded threshold`;
+    if (!isOverThreshold(primaryUsage, state) && !isTemporarilyUnavailable(state, primary.name)) {
+      return {
+        account: primary,
+        switched: true,
+        reason: `${reason} — switching back to primary`
+      };
+    }
+    const best = findBestAvailable(accounts, state, new Set([current.name]));
+    if (best && best.name !== current.name) {
+      return {
+        account: best,
+        switched: true,
+        reason: `${reason} — switching to ${best.name}`
+      };
+    }
+    return { account: current, switched: false };
+  }
   const now = Date.now();
   const checkInterval = state.config.checkInterval;
   const earliestReset = getEarliestReset(primaryUsage);
@@ -739,30 +772,6 @@ function selectAccount(accounts, state) {
       };
     }
   }
-  if (!isTemporarilyUnavailable(state, current.name)) {
-    return { account: current, switched: false };
-  }
-  for (const fb of fallbacks) {
-    if (fb.name === current.name)
-      continue;
-    if (isTemporarilyUnavailable(state, fb.name))
-      continue;
-    const fbUsage = state.usage[fb.name];
-    if (!isOverThreshold(fbUsage, state)) {
-      return {
-        account: fb,
-        switched: true,
-        reason: `Current account ${current.name} in cooldown — switching to ${fb.name}`
-      };
-    }
-  }
-  if (!isTemporarilyUnavailable(state, primary.name)) {
-    return {
-      account: primary,
-      switched: true,
-      reason: "All fallbacks unavailable — falling back to primary"
-    };
-  }
   return { account: current, switched: false };
 }
 function markAuthFailure(state, accountName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-auth-switcher",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "OpenCode auth plugin for multi-account Anthropic Claude Max rotation with automatic failover.",
   "type": "module",
   "main": "dist/index.js",