oc-auth-switcher 0.1.1 → 0.2.0

package/README.md

@@ -8,7 +8,7 @@ This plugin registers as the Anthropic auth provider for OpenCode. It uses [`@ex
 
 1. **Multi-account rotation** — maintains a pool of OAuth accounts and selects the best one on each request
 2. **Real-time metric capture** — reads Anthropic's rate-limit response headers on every API call (no manual pinging needed)
-3. **Automatic failover** — when any utilization metric exceeds the threshold (default 90%), the next request automatically uses a different account
+3. **Automatic failover** — when any utilization metric exceeds the threshold (default 95%), the next request automatically uses a different account
 
 ## Setup
 
@@ -58,8 +58,8 @@ oc-auth-switcher <command> [options]
 ## Configuration
 
 ```bash
-# Set uniform threshold (default: 90%)
-oc-auth-switcher config --threshold 0.90
+# Set uniform threshold (default: 95%)
+oc-auth-switcher config --threshold 0.95
 
 # Set per-metric thresholds (5h, 7d, 7d-sonnet)
 oc-auth-switcher config --thresholds 90,80,70
@@ -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

@@ -11,9 +11,26 @@ import os from "os";
 var configDir = path.join(process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config"), "opencode");
 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_THRESHOLD = 0.95;
 var DEFAULT_CHECK_INTERVAL = 60 * 60 * 1000;
-var AUTH_FAILURE_COOLDOWN = 60 * 60 * 1000;
+var AUTH_FAILURE_COOLDOWN = 10 * 60 * 1000;
+
+// node_modules/@ex-machina/opencode-anthropic-auth/dist/constants.js
+var CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
+var AUTHORIZE_URLS = {
+  console: "https://platform.claude.com/oauth/authorize",
+  max: "https://claude.ai/oauth/authorize"
+};
+var CODE_CALLBACK_URL = "https://platform.claude.com/oauth/code/callback";
+var TOKEN_URL = "https://platform.claude.com/v1/oauth/token";
+var OAUTH_SCOPES = [
+  "org:create_api_key",
+  "user:profile",
+  "user:inference",
+  "user:sessions:claude_code",
+  "user:mcp_servers",
+  "user:file_upload"
+];
 
 // src/accounts.ts
 function normalizeAccount(raw) {
@@ -86,6 +103,49 @@ function removeAccount(name) {
   saveAccounts(data);
   return data;
 }
+function updateAccountTokens(name, access, refresh, expires) {
+  const data = loadAccounts();
+  const account = data.accounts.find((a) => a.name === name);
+  if (account) {
+    account.access = access;
+    account.refresh = refresh;
+    account.expires = expires;
+    saveAccounts(data);
+  }
+}
+async function refreshAccountToken(refreshTokenValue) {
+  try {
+    const response = await fetch(TOKEN_URL, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json, text/plain, */*",
+        "User-Agent": "axios/1.13.6"
+      },
+      body: JSON.stringify({
+        grant_type: "refresh_token",
+        refresh_token: refreshTokenValue,
+        client_id: CLIENT_ID
+      })
+    });
+    if (!response.ok) {
+      const body = await response.text().catch(() => "");
+      return { ok: false, error: `HTTP ${response.status}: ${body}` };
+    }
+    const json = await response.json();
+    return {
+      ok: true,
+      access: json.access_token,
+      refresh: json.refresh_token,
+      expires: Date.now() + json.expires_in * 1000
+    };
+  } catch (err) {
+    return {
+      ok: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
 
 // src/state.ts
 var EMPTY_METRIC = { utilization: 0, reset: 0, status: "" };
@@ -167,23 +227,6 @@ function clearAuthFailure(state, accountName) {
   delete state.authFailures[accountName];
 }
 
-// node_modules/@ex-machina/opencode-anthropic-auth/dist/constants.js
-var CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
-var AUTHORIZE_URLS = {
-  console: "https://platform.claude.com/oauth/authorize",
-  max: "https://claude.ai/oauth/authorize"
-};
-var CODE_CALLBACK_URL = "https://platform.claude.com/oauth/code/callback";
-var TOKEN_URL = "https://platform.claude.com/v1/oauth/token";
-var OAUTH_SCOPES = [
-  "org:create_api_key",
-  "user:profile",
-  "user:inference",
-  "user:sessions:claude_code",
-  "user:mcp_servers",
-  "user:file_upload"
-];
-
 // node_modules/@ex-machina/opencode-anthropic-auth/dist/pkce.js
 function base64UrlEncode(bytes) {
   let bin = "";
@@ -294,6 +337,7 @@ async function exchange(input, verifier, redirectUri, expectedState) {
 }
 
 // src/cli.ts
+import { spawn } from "child_process";
 var RESET = "\x1B[0m";
 var BOLD = "\x1B[1m";
 var DIM = "\x1B[2m";
@@ -315,6 +359,36 @@ function progressBar(value, threshold, width = 30) {
   const label = `${(value * 100).toFixed(1)}%`;
   return `${bar} ${color}${label}${RESET}`;
 }
+function tryCopy(cmd, args, text) {
+  return new Promise((resolve) => {
+    try {
+      const child = spawn(cmd, args);
+      child.on("error", () => resolve(false));
+      child.on("close", (code) => resolve(code === 0));
+      child.stdin.on("error", () => resolve(false));
+      child.stdin.end(text);
+    } catch {
+      resolve(false);
+    }
+  });
+}
+async function copyToClipboard(text) {
+  switch (process.platform) {
+    case "darwin":
+      return tryCopy("pbcopy", [], text);
+    case "win32":
+      return tryCopy("clip", [], text);
+    default: {
+      if (await tryCopy("wl-copy", [], text))
+        return true;
+      if (await tryCopy("xclip", ["-selection", "clipboard"], text))
+        return true;
+      if (await tryCopy("xsel", ["--clipboard", "--input"], text))
+        return true;
+      return false;
+    }
+  }
+}
 async function prompt(question) {
   process.stdout.write(question);
   const buf = [];
@@ -349,6 +423,10 @@ ${BOLD}Starting OAuth flow for account: ${CYAN}${name}${RESET}
   console.log(`${BOLD}Open this URL in your browser:${RESET}
 `);
   console.log(`  ${BLUE}${authResult.url}${RESET}
+`);
+  const copied = await copyToClipboard(authResult.url);
+  if (copied)
+    console.log(`${DIM}(URL copied to clipboard)${RESET}
 `);
   console.log(`${DIM}After authorizing, paste the callback URL or code below:${RESET}
 `);
@@ -406,6 +484,10 @@ ${BOLD}Re-authenticating account: ${CYAN}${name}${RESET}
   console.log(`${BOLD}Open this URL in your browser:${RESET}
 `);
   console.log(`  ${BLUE}${authResult.url}${RESET}
+`);
+  const copied = await copyToClipboard(authResult.url);
+  if (copied)
+    console.log(`${DIM}(URL copied to clipboard)${RESET}
 `);
   const callbackInput = await prompt(`${CYAN}Callback: ${RESET}`);
   const exchangeResult = await exchange(callbackInput, authResult.verifier, authResult.redirectUri, authResult.state);
@@ -424,11 +506,27 @@ ${RED}Re-authentication failed${RESET}`);
   console.log(`
 ${GREEN}Account "${name}" re-authenticated successfully.${RESET}`);
 }
-function cmdUsage(args) {
+async function refreshExpiredAccounts(data, state) {
+  for (const account of data.accounts) {
+    if (account.access && account.expires > Date.now())
+      continue;
+    const result = await refreshAccountToken(account.refresh);
+    if (result.ok && result.access && result.refresh && result.expires) {
+      account.access = result.access;
+      account.refresh = result.refresh;
+      account.expires = result.expires;
+      updateAccountTokens(account.name, result.access, result.refresh, result.expires);
+      clearAuthFailure(state, account.name);
+    }
+  }
+}
+async function cmdUsage(args) {
   const watch = args.includes("--watch") || args.includes("-w");
-  const showUsage = () => {
+  const showUsage = async () => {
     const data = loadAccounts();
     const state = loadState();
+    await refreshExpiredAccounts(data, state);
+    saveState(state);
     resolveStaleMetrics(state);
     ensureAccountsInState(state, data.accounts.map((a) => a.name));
     const thresholds = getThresholds(state.config);
@@ -470,11 +568,19 @@ ${BOLD}${CYAN}=== Auth Switcher Usage Dashboard ===${RESET}
       console.log();
     }
   };
-  showUsage();
+  await showUsage();
   if (watch) {
     console.log(`${DIM}Refreshing every 5 seconds. Press Ctrl+C to stop.${RESET}
 `);
-    setInterval(showUsage, 5000);
+    let running = false;
+    setInterval(() => {
+      if (running)
+        return;
+      running = true;
+      showUsage().catch((err) => console.error(`${RED}Refresh error:${RESET}`, err)).finally(() => {
+        running = false;
+      });
+    }, 5000);
     new Promise(() => {});
   }
 }
@@ -654,7 +760,7 @@ async function main() {
       break;
     case "usage":
     case "u":
-      cmdUsage(commandArgs);
+      await cmdUsage(commandArgs);
       break;
     case "config":
     case "c":

package/dist/index.js

@@ -413,9 +413,9 @@ import os from "node:os";
 var configDir = path.join(process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config"), "opencode");
 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_THRESHOLD = 0.95;
 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) {
@@ -481,6 +481,39 @@ function updateAccountTokens(name, access, refresh, expires) {
     saveAccounts(data);
   }
 }
+async function refreshAccountToken(refreshTokenValue) {
+  try {
+    const response = await fetch(TOKEN_URL, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json, text/plain, */*",
+        "User-Agent": "axios/1.13.6"
+      },
+      body: JSON.stringify({
+        grant_type: "refresh_token",
+        refresh_token: refreshTokenValue,
+        client_id: CLIENT_ID
+      })
+    });
+    if (!response.ok) {
+      const body = await response.text().catch(() => "");
+      return { ok: false, error: `HTTP ${response.status}: ${body}` };
+    }
+    const json = await response.json();
+    return {
+      ok: true,
+      access: json.access_token,
+      refresh: json.refresh_token,
+      expires: Date.now() + json.expires_in * 1000
+    };
+  } catch (err) {
+    return {
+      ok: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
 
 // src/state.ts
 var EMPTY_METRIC = { utilization: 0, reset: 0, status: "" };
@@ -659,10 +692,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 +757,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 +805,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) {
@@ -773,39 +815,6 @@ function clearAuthFailure(state, accountName) {
 }
 
 // src/index.ts
-async function refreshAccountToken(refreshTokenValue) {
-  try {
-    const response = await fetch(TOKEN_URL, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json, text/plain, */*",
-        "User-Agent": "axios/1.13.6"
-      },
-      body: JSON.stringify({
-        grant_type: "refresh_token",
-        refresh_token: refreshTokenValue,
-        client_id: CLIENT_ID
-      })
-    });
-    if (!response.ok) {
-      const body = await response.text().catch(() => "");
-      return { ok: false, error: `HTTP ${response.status}: ${body}` };
-    }
-    const json = await response.json();
-    return {
-      ok: true,
-      access: json.access_token,
-      refresh: json.refresh_token,
-      expires: Date.now() + json.expires_in * 1000
-    };
-  } catch (err) {
-    return {
-      ok: false,
-      error: err instanceof Error ? err.message : String(err)
-    };
-  }
-}
 var AuthSwitcherPlugin = async ({ client }) => {
   return {
     auth: {

package/package.json

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