oc-auth-switcher 0.9.0 → 0.9.2

package/dist/cli.js

@@ -206,11 +206,12 @@ async function refreshAccountToken(refreshTokenValue) {
 
 // src/state.ts
 var EMPTY_METRIC = { utilization: 0, reset: 0, status: "" };
+var EMPTY_MODEL_METRIC = { utilization: null, reset: 0, status: "" };
 var EMPTY_USAGE = {
   session5h: { ...EMPTY_METRIC },
   weekly7d: { ...EMPTY_METRIC },
-  weekly7dSonnet: { ...EMPTY_METRIC },
-  weekly7dFable: { ...EMPTY_METRIC },
+  weekly7dSonnet: { ...EMPTY_MODEL_METRIC },
+  weekly7dFable: { ...EMPTY_MODEL_METRIC },
   rejected: { ...EMPTY_METRIC }
 };
 function defaultState() {
@@ -422,6 +423,85 @@ function updateUsageFromHeaders(state, accountName, headers) {
   }
   return updated;
 }
+async function fetchOAuthUsage(accessToken) {
+  try {
+    const response = await fetch("https://api.anthropic.com/api/oauth/usage", {
+      method: "GET",
+      headers: {
+        authorization: `Bearer ${accessToken}`,
+        "anthropic-version": "2023-06-01",
+        "user-agent": "claude-cli/2.1.87 (external, cli)"
+      }
+    });
+    if (!response.ok) {
+      const body = await response.text().catch(() => "");
+      return { ok: false, error: `HTTP ${response.status}: ${body.slice(0, 100)}` };
+    }
+    const data = await response.json();
+    return { ok: true, data };
+  } catch (err) {
+    return {
+      ok: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+function mapModelDisplayNameToField(displayName) {
+  const normalized = displayName.toLowerCase();
+  if (normalized === "fable")
+    return "weekly7dFable";
+  if (normalized === "sonnet")
+    return "weekly7dSonnet";
+  return;
+}
+function isoToEpochSeconds(iso) {
+  if (!iso)
+    return 0;
+  const parsed = Date.parse(iso);
+  return isNaN(parsed) ? 0 : parsed / 1000;
+}
+function percentToFraction(percent) {
+  return percent / 100;
+}
+function updateUsageFromOAuthEndpoint(state, accountName, response) {
+  if (!state.usage[accountName]) {
+    state.usage[accountName] = {
+      session5h: { ...EMPTY_METRIC },
+      weekly7d: { ...EMPTY_METRIC },
+      weekly7dSonnet: { ...EMPTY_MODEL_METRIC },
+      weekly7dFable: { ...EMPTY_MODEL_METRIC },
+      rejected: { ...EMPTY_METRIC }
+    };
+  }
+  const usage = state.usage[accountName];
+  let updated = false;
+  const warnings = [];
+  const limits = response.limits ?? [];
+  for (const limit of limits) {
+    if (limit.kind !== "weekly_scoped")
+      continue;
+    if (!limit.scope?.model?.display_name)
+      continue;
+    const displayName = limit.scope.model.display_name;
+    const field = mapModelDisplayNameToField(displayName);
+    if (!field) {
+      warnings.push(`unknown model "${displayName}" in weekly_scoped limit`);
+      continue;
+    }
+    const utilization = percentToFraction(limit.percent);
+    const reset = isoToEpochSeconds(limit.resets_at);
+    usage[field] = {
+      utilization,
+      reset,
+      status: limit.severity || ""
+    };
+    updated = true;
+  }
+  if (updated) {
+    usage.timestamp = new Date().toISOString();
+  }
+  return { updated, warnings };
+}
 
 // src/rotation.ts
 function isTemporarilyUnavailable(state, accountName) {
@@ -474,7 +554,7 @@ function isRejectionRelevant(prefix, modelFamily) {
 function metricEntries(usage, thresholds, modelFamily) {
   return Object.keys(METRIC_MODEL_FAMILY).filter((key) => isMetricRelevant(key, modelFamily)).map((key) => ({
     name: key,
-    util: usage[key].utilization,
+    util: usage[key].utilization ?? 0,
     threshold: thresholds[key]
   }));
 }
@@ -606,7 +686,7 @@ function tokenExpiryDescription(account, nowMs) {
 function deriveAccountHealth(account, usage, thresholds, cooldownUntil, nowMs = Date.now()) {
   const availability = Object.fromEntries(MODEL_FAMILIES.map((family) => [family, true]));
   const reasons = [];
-  const metrics = usage ? Object.keys(METRIC_MODEL_FAMILY).filter((metric) => thresholds[metric] > 0).map((metric) => ({
+  const metrics = usage ? Object.keys(METRIC_MODEL_FAMILY).filter((metric) => thresholds[metric] > 0).filter((metric) => usage[metric].utilization !== null).map((metric) => ({
     metric,
     utilization: usage[metric].utilization,
     threshold: thresholds[metric],
@@ -801,6 +881,13 @@ function progressBar(value, threshold, width = 30) {
   const label = `${(value * 100).toFixed(1)}%`;
   return `${bar} ${color}${label}${RESET}`;
 }
+function formatMetric(value, threshold) {
+  if (value === null) {
+    const emptyBar = DIM + "\u2591".repeat(30) + RESET;
+    return `${emptyBar} ${DIM}n/a${RESET}`;
+  }
+  return progressBar(value, threshold);
+}
 function resetSuffix(metric, now) {
   if (!metric.reset || metric.reset * 1000 <= now)
     return "";
@@ -992,6 +1079,17 @@ function buildBillingHeader(messageText) {
   const cch = computeCCH(messageText);
   return "x-anthropic-billing-header: " + `cc_version=${CLAUDE_CODE_VERSION}.${suffix}; ` + `cc_entrypoint=sdk-cli; ` + `cch=${cch};`;
 }
+async function fetchAndApplyOAuthUsage(account, state, result) {
+  const oauthResult = await fetchOAuthUsage(account.access);
+  if (!oauthResult.ok) {
+    result.oauthUsageWarnings = [`oauth usage: ${oauthResult.error}`];
+    return;
+  }
+  const { warnings } = updateUsageFromOAuthEndpoint(state, account.name, oauthResult.data);
+  if (warnings.length > 0) {
+    result.oauthUsageWarnings = warnings;
+  }
+}
 async function probeAccount(account, state) {
   const result = { name: account.name, success: false };
   if (!account.access || account.expires <= Date.now()) {
@@ -1047,12 +1145,14 @@ async function probeAccount(account, state) {
         result.success = true;
         result.model = model;
         clearAuthFailure(state, account.name);
+        await fetchAndApplyOAuthUsage(account, state, result);
         return result;
       }
       if (response.ok || updated) {
         result.success = true;
         result.model = model;
         clearAuthFailure(state, account.name);
+        await fetchAndApplyOAuthUsage(account, state, result);
         return result;
       }
       lastBody = await response.text().catch(() => "");
@@ -1126,10 +1226,10 @@ ${BOLD}${CYAN}=== Auth Switcher Usage Dashboard ===${RESET}
       const tag = isActive ? `${GREEN} [ACTIVE]${RESET}` : isCooling ? `${RED} [COOLDOWN]${RESET}` : "";
       console.log(`  ${BOLD}${account.name}${RESET}${tag}`);
       if (usage) {
-        console.log(`    5h session:  ${progressBar(usage.session5h.utilization, thresholds.session5h)}${resetSuffix(usage.session5h, now)}`);
-        console.log(`    7d weekly:   ${progressBar(usage.weekly7d.utilization, thresholds.weekly7d)}${resetSuffix(usage.weekly7d, now)}`);
-        console.log(`    7d sonnet:   ${progressBar(usage.weekly7dSonnet.utilization, thresholds.weekly7dSonnet)}${resetSuffix(usage.weekly7dSonnet, now)}`);
-        console.log(`    7d fable:    ${progressBar(usage.weekly7dFable.utilization, thresholds.weekly7dFable)}${resetSuffix(usage.weekly7dFable, now)}`);
+        console.log(`    5h session:  ${formatMetric(usage.session5h.utilization, thresholds.session5h)}${resetSuffix(usage.session5h, now)}`);
+        console.log(`    7d weekly:   ${formatMetric(usage.weekly7d.utilization, thresholds.weekly7d)}${resetSuffix(usage.weekly7d, now)}`);
+        console.log(`    7d sonnet:   ${formatMetric(usage.weekly7dSonnet.utilization, thresholds.weekly7dSonnet)}${resetSuffix(usage.weekly7dSonnet, now)}`);
+        console.log(`    7d fable:    ${formatMetric(usage.weekly7dFable.utilization, thresholds.weekly7dFable)}${resetSuffix(usage.weekly7dFable, now)}`);
         const rejection = deriveAccountHealth(account, usage, thresholds, state.authFailures[account.name], now).reasons.find((reason) => reason.kind === "rejection");
         if (rejection) {
           const reset = rejection.reset ? ` \u2014 resets ${formatResetTime(rejection.reset, now)}` : "";

package/dist/index.js

@@ -571,11 +571,12 @@ async function refreshAccountToken(refreshTokenValue) {
 
 // src/state.ts
 var EMPTY_METRIC = { utilization: 0, reset: 0, status: "" };
+var EMPTY_MODEL_METRIC = { utilization: null, reset: 0, status: "" };
 var EMPTY_USAGE = {
   session5h: { ...EMPTY_METRIC },
   weekly7d: { ...EMPTY_METRIC },
-  weekly7dSonnet: { ...EMPTY_METRIC },
-  weekly7dFable: { ...EMPTY_METRIC },
+  weekly7dSonnet: { ...EMPTY_MODEL_METRIC },
+  weekly7dFable: { ...EMPTY_MODEL_METRIC },
   rejected: { ...EMPTY_METRIC }
 };
 function defaultState() {
@@ -825,7 +826,7 @@ function isRejectionRelevant(prefix, modelFamily) {
 function metricEntries(usage, thresholds, modelFamily) {
   return Object.keys(METRIC_MODEL_FAMILY).filter((key) => isMetricRelevant(key, modelFamily)).map((key) => ({
     name: key,
-    util: usage[key].utilization,
+    util: usage[key].utilization ?? 0,
     threshold: thresholds[key]
   }));
 }
@@ -1228,6 +1229,6 @@ var AuthSwitcherPlugin = async ({ client }) => {
 };
 var src_default = AuthSwitcherPlugin;
 export {
-  src_default as default,
-  AuthSwitcherPlugin
+  AuthSwitcherPlugin,
+  src_default as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-auth-switcher",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "OpenCode auth plugin for multi-account Anthropic Claude Max rotation with automatic failover.",
   "type": "module",
   "main": "dist/index.js",
@@ -17,7 +17,7 @@
     "@opencode-ai/plugin": "*"
   },
   "dependencies": {
-    "@ex-machina/opencode-anthropic-auth": "1.8.1"
+    "@ex-machina/opencode-anthropic-auth": "1.8.3"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "latest",