oc-auth-switcher 0.3.0 → 0.4.0

package/dist/cli.js

@@ -171,8 +171,7 @@ function defaultState() {
     authFailures: {}
   };
 }
-function loadState() {
-  const raw = safeReadJSON(STATE_FILE, {});
+function normalizeState(raw) {
   const defaults = defaultState();
   const threshold = raw.config?.threshold;
   const migratedThreshold = typeof threshold === "object" && threshold !== null ? {
@@ -206,6 +205,9 @@ function loadState() {
     authFailures: raw.authFailures ?? defaults.authFailures
   };
 }
+function loadState() {
+  return normalizeState(safeReadJSON(STATE_FILE, {}));
+}
 function saveState(state) {
   safeWriteJSON(STATE_FILE, state);
 }
@@ -649,8 +651,8 @@ ${BOLD}${CYAN}=== Auth Switcher Configuration ===${RESET}
     const arg = args[i];
     if (arg === "--threshold" && args[i + 1]) {
       const val = parseFloat(args[++i]);
-      if (isNaN(val) || val < 0 || val > 1) {
-        console.error(`${RED}Threshold must be between 0 and 1 (e.g., 0.90)${RESET}`);
+      if (isNaN(val) || val <= 0 || val > 1) {
+        console.error(`${RED}Threshold must be greater than 0 and at most 1 (e.g., 0.90)${RESET}`);
         process.exit(1);
       }
       state.config.threshold = val;
@@ -662,6 +664,10 @@ ${BOLD}${CYAN}=== Auth Switcher Configuration ===${RESET}
         process.exit(1);
       }
       const normalized = parts.map((v) => v > 1 ? v / 100 : v);
+      if (normalized.some((v) => v <= 0 || v > 1)) {
+        console.error(`${RED}Thresholds must each be greater than 0 and at most 100%${RESET}`);
+        process.exit(1);
+      }
       const currentFableThreshold = getThresholds(state.config).weekly7dFable;
       state.config.threshold = {
         session5h: normalized[0],

package/dist/index.js

@@ -539,8 +539,7 @@ function defaultState() {
     authFailures: {}
   };
 }
-function loadState() {
-  const raw = safeReadJSON(STATE_FILE, {});
+function normalizeState(raw) {
   const defaults = defaultState();
   const threshold = raw.config?.threshold;
   const migratedThreshold = typeof threshold === "object" && threshold !== null ? {
@@ -574,6 +573,9 @@ function loadState() {
     authFailures: raw.authFailures ?? defaults.authFailures
   };
 }
+function loadState() {
+  return normalizeState(safeReadJSON(STATE_FILE, {}));
+}
 function saveState(state) {
   safeWriteJSON(STATE_FILE, state);
 }
@@ -711,7 +713,8 @@ function updateUsageFromHeaders(state, accountName, headers) {
     usage.rejected = {
       utilization: 1,
       reset: Math.max(usage.rejected.reset, reset),
-      status: "rejected"
+      status: "rejected",
+      prefix
     };
     updated = true;
   }
@@ -736,7 +739,7 @@ function isOverThreshold(usage, state) {
   if (!usage)
     return false;
   const thresholds = getThresholds(state.config);
-  return usage.rejected.status?.toLowerCase() === "rejected" || usage.session5h.utilization > thresholds.session5h || usage.weekly7d.utilization > thresholds.weekly7d || usage.weekly7dSonnet.utilization > thresholds.weekly7dSonnet || usage.weekly7dFable.utilization > thresholds.weekly7dFable;
+  return usage.rejected.status?.toLowerCase() === "rejected" || thresholds.session5h > 0 && usage.session5h.utilization >= thresholds.session5h || thresholds.weekly7d > 0 && usage.weekly7d.utilization >= thresholds.weekly7d || thresholds.weekly7dSonnet > 0 && usage.weekly7dSonnet.utilization >= thresholds.weekly7dSonnet || thresholds.weekly7dFable > 0 && usage.weekly7dFable.utilization >= thresholds.weekly7dFable;
 }
 function getUtilizationScore(usage, state) {
   if (!usage)
@@ -744,14 +747,20 @@ function getUtilizationScore(usage, state) {
   const thresholds = getThresholds(state.config);
   if (usage.rejected.status?.toLowerCase() === "rejected")
     return Infinity;
-  return Math.max(usage.session5h.utilization / thresholds.session5h, usage.weekly7d.utilization / thresholds.weekly7d, usage.weekly7dSonnet.utilization / thresholds.weekly7dSonnet, usage.weekly7dFable.utilization / thresholds.weekly7dFable);
+  const scores = [
+    { util: usage.session5h.utilization, threshold: thresholds.session5h },
+    { util: usage.weekly7d.utilization, threshold: thresholds.weekly7d },
+    { util: usage.weekly7dSonnet.utilization, threshold: thresholds.weekly7dSonnet },
+    { util: usage.weekly7dFable.utilization, threshold: thresholds.weekly7dFable }
+  ].filter((metric) => metric.threshold > 0).map((metric) => metric.util / metric.threshold);
+  return scores.length > 0 ? Math.max(...scores) : 0;
 }
 function getExceededMetric(usage, state) {
   if (!usage)
     return null;
   const thresholds = getThresholds(state.config);
   if (usage.rejected.status?.toLowerCase() === "rejected") {
-    return "rejected rate limit";
+    return usage.rejected.prefix ? `rejected rate limit (${usage.rejected.prefix})` : "rejected rate limit";
   }
   const metrics = [
     { name: "session5h", util: usage.session5h.utilization, thresh: thresholds.session5h },
@@ -759,7 +768,7 @@ function getExceededMetric(usage, state) {
     { name: "weekly7dSonnet", util: usage.weekly7dSonnet.utilization, thresh: thresholds.weekly7dSonnet },
     { name: "weekly7dFable", util: usage.weekly7dFable.utilization, thresh: thresholds.weekly7dFable }
   ];
-  const exceeded = metrics.filter((m) => m.util > m.thresh).sort((a, b) => b.util / b.thresh - a.util / a.thresh);
+  const exceeded = metrics.filter((m) => m.thresh > 0 && m.util >= m.thresh).sort((a, b) => b.util / b.thresh - a.util / a.thresh);
   return exceeded.length > 0 ? exceeded[0].name : null;
 }
 function getEarliestReset(usage) {
@@ -800,7 +809,7 @@ function findBestAvailable(candidates, state, exclude) {
     if (isTemporarilyUnavailable(state, acct.name))
       continue;
     const score = getUtilizationScore(state.usage[acct.name], state);
-    if (score < bestScore) {
+    if (!best || score < bestScore) {
       bestScore = score;
       best = acct;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-auth-switcher",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "OpenCode auth plugin for multi-account Anthropic Claude Max rotation with automatic failover.",
   "type": "module",
   "main": "dist/index.js",
@@ -10,6 +10,7 @@
   "scripts": {
     "build": "bun build src/index.ts --outdir dist --target node --format esm && bun build src/cli.ts --outdir dist --target bun --format esm",
     "dev": "bun run build --watch",
+    "test": "bun test",
     "prepublishOnly": "bun run build"
   },
   "peerDependencies": {