oc-auth-switcher 0.2.1 → 0.4.0

package/dist/cli.js

@@ -152,11 +152,15 @@ var EMPTY_METRIC = { utilization: 0, reset: 0, status: "" };
 var EMPTY_USAGE = {
   session5h: { ...EMPTY_METRIC },
   weekly7d: { ...EMPTY_METRIC },
-  weekly7dSonnet: { ...EMPTY_METRIC }
+  weekly7dSonnet: { ...EMPTY_METRIC },
+  weekly7dFable: { ...EMPTY_METRIC },
+  rejected: { ...EMPTY_METRIC }
 };
 function defaultState() {
   return {
     currentAccount: null,
+    selectionMode: "auto",
+    manualAccount: null,
     lastRotationCheck: 0,
     requestCount: 0,
     config: {
@@ -167,21 +171,43 @@ 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 ? {
+    session5h: threshold.session5h ?? DEFAULT_THRESHOLD,
+    weekly7d: threshold.weekly7d ?? DEFAULT_THRESHOLD,
+    weekly7dSonnet: threshold.weekly7dSonnet ?? DEFAULT_THRESHOLD,
+    weekly7dFable: threshold.weekly7dFable ?? DEFAULT_THRESHOLD
+  } : threshold ?? defaults.config.threshold;
+  const usage = Object.fromEntries(Object.entries(raw.usage ?? {}).map(([name, accountUsage]) => [
+    name,
+    {
+      session5h: { ...EMPTY_METRIC, ...accountUsage?.session5h },
+      weekly7d: { ...EMPTY_METRIC, ...accountUsage?.weekly7d },
+      weekly7dSonnet: { ...EMPTY_METRIC, ...accountUsage?.weekly7dSonnet },
+      weekly7dFable: { ...EMPTY_METRIC, ...accountUsage?.weekly7dFable },
+      rejected: { ...EMPTY_METRIC, ...accountUsage?.rejected },
+      timestamp: accountUsage?.timestamp
+    }
+  ]));
   return {
     currentAccount: raw.currentAccount ?? defaults.currentAccount,
+    selectionMode: raw.selectionMode === "manual" && raw.manualAccount ? "manual" : "auto",
+    manualAccount: raw.manualAccount ?? defaults.manualAccount,
     lastRotationCheck: raw.lastRotationCheck ?? defaults.lastRotationCheck,
     requestCount: raw.requestCount ?? defaults.requestCount,
     config: {
-      threshold: raw.config?.threshold ?? defaults.config.threshold,
+      threshold: migratedThreshold,
       checkInterval: raw.config?.checkInterval ?? defaults.config.checkInterval
     },
-    usage: raw.usage ?? defaults.usage,
+    usage,
     authFailures: raw.authFailures ?? defaults.authFailures
   };
 }
+function loadState() {
+  return normalizeState(safeReadJSON(STATE_FILE, {}));
+}
 function saveState(state) {
   safeWriteJSON(STATE_FILE, state);
 }
@@ -190,16 +216,27 @@ function getThresholds(config) {
     return {
       session5h: config.threshold,
       weekly7d: config.threshold,
-      weekly7dSonnet: config.threshold
+      weekly7dSonnet: config.threshold,
+      weekly7dFable: config.threshold
     };
   }
-  return config.threshold;
+  return {
+    session5h: config.threshold.session5h ?? DEFAULT_THRESHOLD,
+    weekly7d: config.threshold.weekly7d ?? DEFAULT_THRESHOLD,
+    weekly7dSonnet: config.threshold.weekly7dSonnet ?? DEFAULT_THRESHOLD,
+    weekly7dFable: config.threshold.weekly7dFable ?? DEFAULT_THRESHOLD
+  };
 }
 function resolveStaleMetrics(state) {
   const now = Date.now() / 1000;
   for (const accountName of Object.keys(state.usage)) {
     const usage = state.usage[accountName];
-    const metrics = ["session5h", "weekly7d", "weekly7dSonnet"];
+    const metrics = [
+      "session5h",
+      "weekly7d",
+      "weekly7dSonnet",
+      "weekly7dFable"
+    ];
     for (const key of metrics) {
       const metric = usage[key];
       if (metric.reset > 0 && metric.reset <= now) {
@@ -208,6 +245,9 @@ function resolveStaleMetrics(state) {
         metric.status = "";
       }
     }
+    if (usage.rejected.reset > 0 && usage.rejected.reset <= now) {
+      usage.rejected = { ...EMPTY_METRIC };
+    }
   }
 }
 function ensureAccountsInState(state, accountNames) {
@@ -216,7 +256,9 @@ function ensureAccountsInState(state, accountNames) {
       state.usage[name] = {
         session5h: { ...EMPTY_METRIC },
         weekly7d: { ...EMPTY_METRIC },
-        weekly7dSonnet: { ...EMPTY_METRIC }
+        weekly7dSonnet: { ...EMPTY_METRIC },
+        weekly7dFable: { ...EMPTY_METRIC },
+        rejected: { ...EMPTY_METRIC }
       };
     }
   }
@@ -538,7 +580,7 @@ ${BOLD}${CYAN}=== Auth Switcher Usage Dashboard ===${RESET}
 `);
     console.log(`  Active account: ${BOLD}${state.currentAccount || "(none)"}${RESET}`);
     console.log(`  Total accounts: ${data.accounts.length}`);
-    console.log(`  Thresholds:     5h=${(thresholds.session5h * 100).toFixed(0)}%  7d=${(thresholds.weekly7d * 100).toFixed(0)}%  7d-sonnet=${(thresholds.weekly7dSonnet * 100).toFixed(0)}%`);
+    console.log(`  Thresholds:     5h=${(thresholds.session5h * 100).toFixed(0)}%  7d=${(thresholds.weekly7d * 100).toFixed(0)}%  7d-sonnet=${(thresholds.weekly7dSonnet * 100).toFixed(0)}%  7d-fable=${(thresholds.weekly7dFable * 100).toFixed(0)}%`);
     console.log();
     if (data.accounts.length === 0) {
       console.log(`  ${DIM}No accounts configured. Run 'oc-auth-switcher add' to add one.${RESET}
@@ -555,6 +597,10 @@ ${BOLD}${CYAN}=== Auth Switcher Usage Dashboard ===${RESET}
         console.log(`    5h session:  ${progressBar(usage.session5h.utilization, thresholds.session5h)}`);
         console.log(`    7d weekly:   ${progressBar(usage.weekly7d.utilization, thresholds.weekly7d)}`);
         console.log(`    7d sonnet:   ${progressBar(usage.weekly7dSonnet.utilization, thresholds.weekly7dSonnet)}`);
+        console.log(`    7d fable:    ${progressBar(usage.weekly7dFable.utilization, thresholds.weekly7dFable)}`);
+        if (usage.rejected.status === "rejected") {
+          console.log(`    ${RED}Rate limit status: REJECTED${RESET}`);
+        }
         if (usage.timestamp) {
           console.log(`    ${DIM}Last updated: ${usage.timestamp}${RESET}`);
         }
@@ -594,6 +640,7 @@ ${BOLD}${CYAN}=== Auth Switcher Configuration ===${RESET}
     console.log(`  Threshold (5h):        ${(thresholds.session5h * 100).toFixed(0)}%`);
     console.log(`  Threshold (7d):        ${(thresholds.weekly7d * 100).toFixed(0)}%`);
     console.log(`  Threshold (7d sonnet): ${(thresholds.weekly7dSonnet * 100).toFixed(0)}%`);
+    console.log(`  Threshold (7d fable):  ${(thresholds.weekly7dFable * 100).toFixed(0)}%`);
     console.log(`  Check interval:        ${state.config.checkInterval / 60000} min`);
     console.log();
     console.log(`${DIM}  Config file: ${STATE_FILE}${RESET}`);
@@ -604,25 +651,31 @@ ${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;
       console.log(`${GREEN}Set uniform threshold to ${(val * 100).toFixed(0)}%${RESET}`);
     } else if (arg === "--thresholds" && args[i + 1]) {
       const parts = args[++i].split(",").map((s) => parseFloat(s.trim()));
-      if (parts.length !== 3 || parts.some(isNaN)) {
-        console.error(`${RED}--thresholds requires 3 comma-separated values (e.g., 90,80,70)${RESET}`);
+      if (parts.length !== 3 && parts.length !== 4 || parts.some(isNaN)) {
+        console.error(`${RED}--thresholds requires 3 or 4 comma-separated values (e.g., 90,80,70,70)${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],
         weekly7d: normalized[1],
-        weekly7dSonnet: normalized[2]
+        weekly7dSonnet: normalized[2],
+        weekly7dFable: normalized[3] ?? currentFableThreshold
       };
-      console.log(`${GREEN}Set per-metric thresholds: 5h=${(normalized[0] * 100).toFixed(0)}% 7d=${(normalized[1] * 100).toFixed(0)}% 7d-sonnet=${(normalized[2] * 100).toFixed(0)}%${RESET}`);
+      console.log(`${GREEN}Set per-metric thresholds: 5h=${(normalized[0] * 100).toFixed(0)}% 7d=${(normalized[1] * 100).toFixed(0)}% 7d-sonnet=${(normalized[2] * 100).toFixed(0)}% 7d-fable=${((normalized[3] ?? currentFableThreshold) * 100).toFixed(0)}%${RESET}`);
     } else if (arg === "--interval" && args[i + 1]) {
       const minutes = parseInt(args[++i], 10);
       if (isNaN(minutes) || minutes < 1) {
@@ -654,10 +707,20 @@ ${BOLD}Available accounts:${RESET}`);
       const tag = a.name === state2.currentAccount ? ` ${GREEN}[ACTIVE]${RESET}` : "";
       console.log(`  - ${a.name}${tag}`);
     }
+    console.log(`  - auto ${DIM}(resume automatic selection)${RESET}`);
     console.error(`
-${RED}Usage: oc-auth-switcher switch <account-name>${RESET}`);
+${RED}Usage: oc-auth-switcher switch <account-name|auto>${RESET}`);
     process.exit(1);
   }
+  if (name === "auto") {
+    const state2 = loadState();
+    state2.selectionMode = "auto";
+    state2.manualAccount = null;
+    state2.lastRotationCheck = Date.now();
+    saveState(state2);
+    console.log(`${GREEN}Automatic account selection resumed.${RESET}`);
+    return;
+  }
   const account = data.accounts.find((a) => a.name === name);
   if (!account) {
     console.error(`${RED}Account "${name}" not found${RESET}`);
@@ -666,6 +729,8 @@ ${RED}Usage: oc-auth-switcher switch <account-name>${RESET}`);
   console.log(`${CYAN}Switching to account: ${name}...${RESET}`);
   const state = loadState();
   state.currentAccount = name;
+  state.selectionMode = "manual";
+  state.manualAccount = name;
   state.lastRotationCheck = Date.now();
   saveState(state);
   console.log(`${GREEN}Switched to "${name}". Will take effect on the next API request.${RESET}`);
@@ -678,6 +743,7 @@ function cmdStatus() {
 ${BOLD}${CYAN}=== Auth Switcher Status ===${RESET}
 `);
   console.log(`  Active account:    ${BOLD}${state.currentAccount || "(none)"}${RESET}`);
+  console.log(`  Selection mode:    ${state.selectionMode}${state.manualAccount ? ` (${state.manualAccount})` : ""}`);
   console.log(`  Total accounts:    ${data.accounts.length}`);
   console.log(`  Request count:     ${state.requestCount}`);
   console.log(`  Last rotation:     ${state.lastRotationCheck ? new Date(state.lastRotationCheck).toLocaleString() : "never"}`);
@@ -712,6 +778,10 @@ function cmdRemove(args) {
   const state = loadState();
   if (state.currentAccount === name) {
     state.currentAccount = null;
+    if (state.manualAccount === name) {
+      state.selectionMode = "auto";
+      state.manualAccount = null;
+    }
     saveState(state);
     console.log(`${YELLOW}This was the active account. Rotation will pick a new one automatically.${RESET}`);
   }
@@ -728,13 +798,13 @@ ${BOLD}COMMANDS:${RESET}
   ${CYAN}reauth${RESET} <name>       Re-authenticate an existing account
   ${CYAN}usage${RESET} [--watch]     Show usage dashboard with utilization metrics
   ${CYAN}config${RESET} [options]    View or modify threshold/interval configuration
-  ${CYAN}switch${RESET} <name>       Manually switch to a specific account
+  ${CYAN}switch${RESET} <name|auto>  Pin a specific account or resume automatic selection
   ${CYAN}status${RESET}              Show current active account and rotation state
   ${CYAN}remove${RESET} <name>       Remove an account from the pool
 
 ${BOLD}CONFIG OPTIONS:${RESET}
   --threshold <0-1>          Set uniform threshold (e.g., 0.90)
-  --thresholds <a,b,c>       Set per-metric thresholds (5h,7d,7d-sonnet)
+  --thresholds <a,b,c[,d]>   Set per-metric thresholds (5h,7d,7d-sonnet,7d-fable)
   --interval <minutes>       Set primary recovery check interval
   --reset                    Reset to defaults
 
@@ -744,6 +814,7 @@ ${BOLD}EXAMPLES:${RESET}
   oc-auth-switcher usage --watch
   oc-auth-switcher config --threshold 0.90
   oc-auth-switcher switch fallback-1
+  oc-auth-switcher switch auto
 `);
 }
 async function main() {

package/dist/index.js

@@ -520,11 +520,15 @@ var EMPTY_METRIC = { utilization: 0, reset: 0, status: "" };
 var EMPTY_USAGE = {
   session5h: { ...EMPTY_METRIC },
   weekly7d: { ...EMPTY_METRIC },
-  weekly7dSonnet: { ...EMPTY_METRIC }
+  weekly7dSonnet: { ...EMPTY_METRIC },
+  weekly7dFable: { ...EMPTY_METRIC },
+  rejected: { ...EMPTY_METRIC }
 };
 function defaultState() {
   return {
     currentAccount: null,
+    selectionMode: "auto",
+    manualAccount: null,
     lastRotationCheck: 0,
     requestCount: 0,
     config: {
@@ -535,21 +539,43 @@ 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 ? {
+    session5h: threshold.session5h ?? DEFAULT_THRESHOLD,
+    weekly7d: threshold.weekly7d ?? DEFAULT_THRESHOLD,
+    weekly7dSonnet: threshold.weekly7dSonnet ?? DEFAULT_THRESHOLD,
+    weekly7dFable: threshold.weekly7dFable ?? DEFAULT_THRESHOLD
+  } : threshold ?? defaults.config.threshold;
+  const usage = Object.fromEntries(Object.entries(raw.usage ?? {}).map(([name, accountUsage]) => [
+    name,
+    {
+      session5h: { ...EMPTY_METRIC, ...accountUsage?.session5h },
+      weekly7d: { ...EMPTY_METRIC, ...accountUsage?.weekly7d },
+      weekly7dSonnet: { ...EMPTY_METRIC, ...accountUsage?.weekly7dSonnet },
+      weekly7dFable: { ...EMPTY_METRIC, ...accountUsage?.weekly7dFable },
+      rejected: { ...EMPTY_METRIC, ...accountUsage?.rejected },
+      timestamp: accountUsage?.timestamp
+    }
+  ]));
   return {
     currentAccount: raw.currentAccount ?? defaults.currentAccount,
+    selectionMode: raw.selectionMode === "manual" && raw.manualAccount ? "manual" : "auto",
+    manualAccount: raw.manualAccount ?? defaults.manualAccount,
     lastRotationCheck: raw.lastRotationCheck ?? defaults.lastRotationCheck,
     requestCount: raw.requestCount ?? defaults.requestCount,
     config: {
-      threshold: raw.config?.threshold ?? defaults.config.threshold,
+      threshold: migratedThreshold,
       checkInterval: raw.config?.checkInterval ?? defaults.config.checkInterval
     },
-    usage: raw.usage ?? defaults.usage,
+    usage,
     authFailures: raw.authFailures ?? defaults.authFailures
   };
 }
+function loadState() {
+  return normalizeState(safeReadJSON(STATE_FILE, {}));
+}
 function saveState(state) {
   safeWriteJSON(STATE_FILE, state);
 }
@@ -558,16 +584,27 @@ function getThresholds(config) {
     return {
       session5h: config.threshold,
       weekly7d: config.threshold,
-      weekly7dSonnet: config.threshold
+      weekly7dSonnet: config.threshold,
+      weekly7dFable: config.threshold
     };
   }
-  return config.threshold;
+  return {
+    session5h: config.threshold.session5h ?? DEFAULT_THRESHOLD,
+    weekly7d: config.threshold.weekly7d ?? DEFAULT_THRESHOLD,
+    weekly7dSonnet: config.threshold.weekly7dSonnet ?? DEFAULT_THRESHOLD,
+    weekly7dFable: config.threshold.weekly7dFable ?? DEFAULT_THRESHOLD
+  };
 }
 function resolveStaleMetrics(state) {
   const now = Date.now() / 1000;
   for (const accountName of Object.keys(state.usage)) {
     const usage = state.usage[accountName];
-    const metrics = ["session5h", "weekly7d", "weekly7dSonnet"];
+    const metrics = [
+      "session5h",
+      "weekly7d",
+      "weekly7dSonnet",
+      "weekly7dFable"
+    ];
     for (const key of metrics) {
       const metric = usage[key];
       if (metric.reset > 0 && metric.reset <= now) {
@@ -576,6 +613,9 @@ function resolveStaleMetrics(state) {
         metric.status = "";
       }
     }
+    if (usage.rejected.reset > 0 && usage.rejected.reset <= now) {
+      usage.rejected = { ...EMPTY_METRIC };
+    }
   }
 }
 function ensureAccountsInState(state, accountNames) {
@@ -584,7 +624,9 @@ function ensureAccountsInState(state, accountNames) {
       state.usage[name] = {
         session5h: { ...EMPTY_METRIC },
         weekly7d: { ...EMPTY_METRIC },
-        weekly7dSonnet: { ...EMPTY_METRIC }
+        weekly7dSonnet: { ...EMPTY_METRIC },
+        weekly7dFable: { ...EMPTY_METRIC },
+        rejected: { ...EMPTY_METRIC }
       };
     }
   }
@@ -594,7 +636,9 @@ function updateUsageFromHeaders(state, accountName, headers) {
     state.usage[accountName] = {
       session5h: { ...EMPTY_METRIC },
       weekly7d: { ...EMPTY_METRIC },
-      weekly7dSonnet: { ...EMPTY_METRIC }
+      weekly7dSonnet: { ...EMPTY_METRIC },
+      weekly7dFable: { ...EMPTY_METRIC },
+      rejected: { ...EMPTY_METRIC }
     };
   }
   const usage = state.usage[accountName];
@@ -611,6 +655,10 @@ function updateUsageFromHeaders(state, accountName, headers) {
     {
       key: "weekly7dSonnet",
       prefix: "anthropic-ratelimit-unified-7d_sonnet"
+    },
+    {
+      key: "weekly7dFable",
+      prefix: "anthropic-ratelimit-unified-7d_fable"
     }
   ];
   for (const { key, prefix } of metricFamilies) {
@@ -629,18 +677,47 @@ function updateUsageFromHeaders(state, accountName, headers) {
         const val = Number(resetHeader);
         if (!isNaN(val)) {
           usage[key].reset = val;
+          updated = true;
         } else {
           const parsed = Date.parse(resetHeader);
           if (!isNaN(parsed)) {
             usage[key].reset = parsed / 1000;
+            updated = true;
           }
         }
       }
       if (statusHeader !== null) {
         usage[key].status = statusHeader;
+        updated = true;
       }
     }
   }
+  for (const [headerName, headerValue] of headers.entries()) {
+    const normalizedName = headerName.toLowerCase();
+    if (!/^anthropic-ratelimit-unified-(?:.*-)?status$/.test(normalizedName) || headerValue.toLowerCase() !== "rejected") {
+      continue;
+    }
+    const prefix = normalizedName.slice(0, -"-status".length);
+    const resetHeader = headers.get(`${prefix}-reset`) ?? headers.get("anthropic-ratelimit-unified-reset");
+    let reset = resetHeader ? Number(resetHeader) : NaN;
+    if (isNaN(reset) && resetHeader) {
+      const parsed = Date.parse(resetHeader);
+      if (!isNaN(parsed))
+        reset = parsed / 1000;
+    }
+    if (!Number.isFinite(reset) || reset <= 0) {
+      const retryAfterHeader = headers.get("retry-after");
+      const retryAfter = retryAfterHeader === null ? NaN : Number(retryAfterHeader);
+      reset = Date.now() / 1000 + (Number.isFinite(retryAfter) && retryAfter > 0 ? retryAfter : state.config.checkInterval / 1000);
+    }
+    usage.rejected = {
+      utilization: 1,
+      reset: Math.max(usage.rejected.reset, reset),
+      status: "rejected",
+      prefix
+    };
+    updated = true;
+  }
   if (updated) {
     usage.timestamp = new Date().toISOString();
   }
@@ -662,24 +739,36 @@ function isOverThreshold(usage, state) {
   if (!usage)
     return false;
   const thresholds = getThresholds(state.config);
-  return usage.session5h.utilization > thresholds.session5h || usage.weekly7d.utilization > thresholds.weekly7d || usage.weekly7dSonnet.utilization > thresholds.weekly7dSonnet;
+  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)
     return 0;
   const thresholds = getThresholds(state.config);
-  return Math.max(usage.session5h.utilization / thresholds.session5h, usage.weekly7d.utilization / thresholds.weekly7d, usage.weekly7dSonnet.utilization / thresholds.weekly7dSonnet);
+  if (usage.rejected.status?.toLowerCase() === "rejected")
+    return Infinity;
+  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 usage.rejected.prefix ? `rejected rate limit (${usage.rejected.prefix})` : "rejected rate limit";
+  }
   const metrics = [
     { name: "session5h", util: usage.session5h.utilization, thresh: thresholds.session5h },
     { name: "weekly7d", util: usage.weekly7d.utilization, thresh: thresholds.weekly7d },
-    { name: "weekly7dSonnet", util: usage.weekly7dSonnet.utilization, thresh: thresholds.weekly7dSonnet }
+    { 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) {
@@ -688,7 +777,9 @@ function getEarliestReset(usage) {
   const resets = [
     usage.session5h.reset,
     usage.weekly7d.reset,
-    usage.weekly7dSonnet.reset
+    usage.weekly7dSonnet.reset,
+    usage.weekly7dFable.reset,
+    usage.rejected.reset
   ].filter((r) => r > 0);
   return resets.length > 0 ? Math.min(...resets) * 1000 : 0;
 }
@@ -718,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;
     }
@@ -730,6 +821,23 @@ function selectAccount(accounts, state) {
     throw new Error("No accounts available");
   }
   purgeExpiredCooldowns(state);
+  if (state.selectionMode === "manual" && state.manualAccount) {
+    const manual = accounts.find((account) => account.name === state.manualAccount);
+    if (manual) {
+      const unavailable = isTemporarilyUnavailable(state, manual.name);
+      const exhausted = isOverThreshold(state.usage[manual.name], state);
+      if (!unavailable && !exhausted) {
+        return {
+          account: manual,
+          switched: state.currentAccount !== manual.name,
+          reason: state.currentAccount !== manual.name ? `Manual selection — switching to ${manual.name}` : undefined
+        };
+      }
+      state.currentAccount = manual.name;
+    }
+    state.selectionMode = "auto";
+    state.manualAccount = null;
+  }
   if (accounts.length === 1) {
     return { account: accounts[0], switched: false };
   }
@@ -809,12 +917,35 @@ function selectAccount(accounts, state) {
 }
 function markAuthFailure(state, accountName) {
   state.authFailures[accountName] = Date.now() + AUTH_FAILURE_COOLDOWN;
+  if (state.selectionMode === "manual" && state.manualAccount === accountName) {
+    state.selectionMode = "auto";
+    state.manualAccount = null;
+  }
 }
 function clearAuthFailure(state, accountName) {
   delete state.authFailures[accountName];
 }
 
 // src/index.ts
+function selectionSnapshot(state) {
+  return {
+    selectionMode: state.selectionMode,
+    manualAccount: state.manualAccount,
+    currentAccount: state.currentAccount,
+    lastRotationCheck: state.lastRotationCheck
+  };
+}
+function saveRequestState(state, initiallyLoaded) {
+  const onDisk = loadState();
+  const selectionChangedSinceLoad = onDisk.selectionMode !== initiallyLoaded.selectionMode || onDisk.manualAccount !== initiallyLoaded.manualAccount || onDisk.currentAccount !== initiallyLoaded.currentAccount || onDisk.lastRotationCheck !== initiallyLoaded.lastRotationCheck;
+  if (selectionChangedSinceLoad) {
+    state.selectionMode = onDisk.selectionMode;
+    state.manualAccount = onDisk.manualAccount;
+    state.currentAccount = onDisk.currentAccount;
+    state.lastRotationCheck = onDisk.lastRotationCheck;
+  }
+  saveState(state);
+}
 var AuthSwitcherPlugin = async ({ client }) => {
   return {
     auth: {
@@ -836,6 +967,7 @@ var AuthSwitcherPlugin = async ({ client }) => {
           async fetch(input, init) {
             const { accounts } = loadAccounts();
             const state = loadState();
+            const initiallyLoadedSelection = selectionSnapshot(state);
             if (accounts.length === 0) {
               const auth2 = await getAuth();
               if (auth2.type !== "oauth")
@@ -908,6 +1040,7 @@ var AuthSwitcherPlugin = async ({ client }) => {
                   markAuthFailure(state, account.name);
                   const next = accounts.find((a) => !attemptedAccounts.has(a.name) && !state.authFailures[a.name]);
                   if (!next) {
+                    saveRequestState(state, initiallyLoadedSelection);
                     throw new Error(`[oc-auth-switcher] All accounts failed token refresh`);
                   }
                   account = next;
@@ -963,7 +1096,7 @@ var AuthSwitcherPlugin = async ({ client }) => {
                   });
                   updateUsageFromHeaders(state, next.name, retryResponse.headers);
                   clearAuthFailure(state, next.name);
-                  saveState(state);
+                  saveRequestState(state, initiallyLoadedSelection);
                   return createStrippedStream(retryResponse);
                 }
               }
@@ -971,7 +1104,7 @@ var AuthSwitcherPlugin = async ({ client }) => {
             updateUsageFromHeaders(state, account.name, response.headers);
             clearAuthFailure(state, account.name);
             state.requestCount = (state.requestCount || 0) + 1;
-            saveState(state);
+            saveRequestState(state, initiallyLoadedSelection);
             return createStrippedStream(response);
           }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-auth-switcher",
-  "version": "0.2.1",
+  "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": {