claude-accounts-usage 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-accounts-usage",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "OpenCode TUI plugin to view multi-account Claude usage and switch the active account. Coexists with @ex-machina/opencode-anthropic-auth.",
   "type": "module",
   "license": "MIT",

package/src/autoswitch.ts

@@ -1,8 +1,6 @@
-import { appendFile } from "node:fs/promises"
-import { homedir } from "node:os"
-import { join } from "node:path"
 import type { TuiPluginApi } from "@opencode-ai/plugin/tui"
 import { loadAccounts, readActiveId, type AccountsFile, type StoredAccount } from "./accounts.ts"
+import { debugLog } from "./debug.ts"
 import { collectAllUsage, switchToAccount, type AccountUsage, type UsageResponse } from "./usage.ts"
 
 const ENABLED = true
@@ -107,18 +105,6 @@ function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms))
 }
 
-function debugLog(tag: string, payload: unknown): void {
-  if (!process.env.CLAUDE_AUTOSWITCH_DEBUG) return
-  let serialized: string
-  try {
-    serialized = JSON.stringify(payload)
-  } catch {
-    serialized = String(payload)
-  }
-  const line = `${new Date().toISOString()} [${tag}] ${serialized}\n`
-  void appendFile(join(homedir(), ".config", "opencode", "claude-autoswitch.log"), line).catch(() => undefined)
-}
-
 export function installAutoSwitch(api: TuiPluginApi): AutoSwitchController {
   const cooldown = new Map<string, number>()
   const attempted = new Map<string, Set<string>>()

package/src/constants.ts

@@ -3,7 +3,7 @@
 // by that plugin are accepted by the refresh endpoint below.
 export const CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e"
 
-export const TOKEN_URL = "https://console.anthropic.com/v1/oauth/token"
+export const TOKEN_URL = "https://platform.claude.com/v1/oauth/token"
 
 export const USAGE_ENDPOINT = "https://api.anthropic.com/api/oauth/usage"
 

package/src/debug.ts

@@ -0,0 +1,17 @@
+import { appendFile } from "node:fs/promises"
+import { homedir } from "node:os"
+import { join } from "node:path"
+
+const LOG_PATH = join(homedir(), ".config", "opencode", "claude-autoswitch.log")
+
+export function debugLog(tag: string, payload: unknown, force = false): void {
+  if (!force && !process.env.CLAUDE_AUTOSWITCH_DEBUG) return
+  let serialized: string
+  try {
+    serialized = JSON.stringify(payload)
+  } catch {
+    serialized = String(payload)
+  }
+  const line = `${new Date().toISOString()} [${tag}] ${serialized}\n`
+  void appendFile(LOG_PATH, line).catch(() => undefined)
+}

package/src/usage.ts

@@ -1,8 +1,15 @@
 import type { AuthToken, StoredAccount } from "./accounts.ts"
 import { loadAccounts, readAuthAnthropic, saveAccounts, upsertAccount, withAuthLock, writeAuthAnthropic } from "./accounts.ts"
 import { CLIENT_ID, OAUTH_BETA, TOKEN_EXPIRY_BUFFER_MS, TOKEN_URL, USAGE_ENDPOINT } from "./constants.ts"
+import { debugLog } from "./debug.ts"
 import { fetchProfile } from "./profile.ts"
 
+const REFRESH_DELAY_MS = 500
+const REFRESH_429_COOLDOWN_MS = 5 * 60_000
+
+const inflightRefresh = new Map<string, Promise<{ access: string; refresh: string; expires: number }>>()
+const refresh429Cooldown = new Map<string, number>()
+
 export type UsageWindow = { utilization: number; resets_at?: string }
 
 export type UsageResponse = {
@@ -28,19 +35,51 @@ function isStale(token: { access?: string; expires?: number }): boolean {
   return !token.access || !token.expires || token.expires < Date.now() + TOKEN_EXPIRY_BUFFER_MS
 }
 
-export async function refreshToken(refresh: string): Promise<{ access: string; refresh: string; expires: number }> {
-  const res = await fetch(TOKEN_URL, {
+function isRefresh429Cooldown(refresh: string): boolean {
+  const until = refresh429Cooldown.get(refresh)
+  if (!until) return false
+  if (Date.now() >= until) {
+    refresh429Cooldown.delete(refresh)
+    return false
+  }
+  return true
+}
+
+function doRefreshToken(refresh: string): Promise<{ access: string; refresh: string; expires: number }> {
+  return fetch(TOKEN_URL, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ grant_type: "refresh_token", refresh_token: refresh, client_id: CLIENT_ID }),
+  }).then(async (res) => {
+    if (!res.ok) {
+      const body = await res.text().catch(() => "")
+      const headers: Record<string, string> = {}
+      res.headers.forEach((value, key) => {
+        headers[key] = value
+      })
+      debugLog("refresh-failed", { status: res.status, headers, body: body.slice(0, 800) }, true)
+      if (res.status === 429) {
+        refresh429Cooldown.set(refresh, Date.now() + REFRESH_429_COOLDOWN_MS)
+      }
+      throw new Error(`token refresh failed (${res.status})`)
+    }
+    const json = (await res.json()) as { access_token: string; refresh_token: string; expires_in: number }
+    return {
+      access: json.access_token,
+      refresh: json.refresh_token,
+      expires: Date.now() + json.expires_in * 1000,
+    }
   })
-  if (!res.ok) throw new Error(`token refresh failed (${res.status})`)
-  const json = (await res.json()) as { access_token: string; refresh_token: string; expires_in: number }
-  return {
-    access: json.access_token,
-    refresh: json.refresh_token,
-    expires: Date.now() + json.expires_in * 1000,
-  }
+}
+
+export function refreshToken(refresh: string): Promise<{ access: string; refresh: string; expires: number }> {
+  const existing = inflightRefresh.get(refresh)
+  if (existing) return existing
+  const promise = doRefreshToken(refresh).finally(() => {
+    inflightRefresh.delete(refresh)
+  })
+  inflightRefresh.set(refresh, promise)
+  return promise
 }
 
 export async function fetchUsage(access: string): Promise<UsageResponse> {
@@ -72,25 +111,42 @@ export async function autoCapture(): Promise<void> {
 
 async function ensureFresh(account: StoredAccount): Promise<{ access?: string; updated?: StoredAccount }> {
   if (!isStale(account)) return { access: account.access }
+  if (isRefresh429Cooldown(account.refresh)) {
+    debugLog("refresh-skip-429-cooldown", { label: account.label }, true)
+    return { access: account.access }
+  }
   const fresh = await refreshToken(account.refresh)
   return { access: fresh.access, updated: { ...account, ...fresh } }
 }
 
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
 export async function collectAllUsage(): Promise<{ activeId?: string; results: AccountUsage[] }> {
   const file = await loadAccounts()
 
-  const settled = await Promise.all(
-    file.accounts.map(async (account): Promise<{ result: AccountUsage; updated?: StoredAccount }> => {
-      const base = { id: account.id, label: account.label, active: account.id === file.activeId }
-      try {
-        const { access, updated } = await ensureFresh(account)
-        if (!access) return { result: { ...base, error: "missing access token" }, updated }
-        return { result: { ...base, usage: await fetchUsage(access) }, updated }
-      } catch (error) {
-        return { result: { ...base, error: errorMessage(error) } }
+  const settled: { result: AccountUsage; updated?: StoredAccount }[] = []
+  let needsRefresh = false
+
+  for (const account of file.accounts) {
+    const base = { id: account.id, label: account.label, active: account.id === file.activeId }
+    try {
+      const { access, updated } = await ensureFresh(account)
+      if (updated) needsRefresh = true
+      if (!access) {
+        settled.push({ result: { ...base, error: "missing access token" }, updated })
+        continue
       }
-    }),
-  )
+      const usage = await fetchUsage(access)
+      settled.push({ result: { ...base, usage }, updated })
+    } catch (error) {
+      settled.push({ result: { ...base, error: errorMessage(error) } })
+    }
+    if (needsRefresh && file.accounts.indexOf(account) < file.accounts.length - 1) {
+      await sleep(REFRESH_DELAY_MS)
+    }
+  }
 
   const updated = settled.flatMap((entry) => (entry.updated ? [entry.updated] : []))
   if (updated.length > 0) {
@@ -115,9 +171,13 @@ export async function switchToAccount(id: string): Promise<StoredAccount> {
 
     let account = file.accounts[index]
     if (isStale(account)) {
-      const fresh = await refreshToken(account.refresh)
-      account = { ...account, ...fresh }
-      file.accounts[index] = account
+      if (isRefresh429Cooldown(account.refresh)) {
+        debugLog("switch-skip-429-cooldown", { label: account.label }, true)
+      } else {
+        const fresh = await refreshToken(account.refresh)
+        account = { ...account, ...fresh }
+        file.accounts[index] = account
+      }
     }
 
     file.activeId = id