claude-accounts-usage 0.1.1 → 0.1.2

package/README.md

@@ -19,7 +19,7 @@
 
 工作方式:
 
-- **检测**:监听 OpenCode 的 `session.next.retried` / `session.error` 事件,只在 429 且命中 Anthropic 订阅额度签名(`anthropic-ratelimit-unified-*: rejected`,或响应体 `rate_limit_error` + 额度文案)时触发;瞬时限流、529 过载、401 鉴权错误都会被排除,避免误切号。
+- **检测**:主要监听 OpenCode 的 `session.status` 的 retry 事件(同时也注册 `session.next.retried` / `session.error` 作为补充,但 TUI 插件通常只能收到 `session.status`),只在命中 Anthropic 订阅额度签名(`anthropic-ratelimit-unified-*: rejected`,或响应体/消息含 `rate_limit_error` + 额度文案,或 429 状态码)时触发;529 过载等会被排除,避免误切号。
 - **选号**:优先按用量挑剩余额度最多的账号(用 `/usage` 时缓存的数据,TTL 10 分钟),无缓存则轮询下一个;跳过正在冷却(已知额度未恢复)的账号。
 - **重发**:切号后将会话回退到失败的那条用户消息并用新账号重发(`revert` + `promptAsync`)。注意:若该轮中途已产生文件改动,回退会一并撤销并整轮重做。
 - **冷却**:撞限的账号按响应头给出的 reset 时间(缺省 60 分钟)进入冷却,持久化在 `tui.json` 的 KV 中;账号下次成功使用后自动解除冷却。
@@ -41,12 +41,14 @@ TUI 插件只在 `~/.config/opencode/tui.json` 配置,**不要**放进 `opencode
 ```json
 {
   "$schema": "https://opencode.ai/tui.json",
-  "plugin": ["claude-accounts-usage"]
+  "plugin": ["claude-accounts-usage@0.1.2"]
 }
 ```
 
 OpenCode 会自动解析并安装该包,无需手动 `npm install`。
 
+> **建议带上版本号**(如 `@0.1.2`)。OpenCode 按"含版本号的包名"建独立缓存目录:写死版本号后,以后升级只需把后缀改成新版本号;若不带版本号,会被首次安装的版本锁住,发布新版也不会自动更新。
+
 ### 方式二:本地 clone(开发/离线)
 
 ```bash
@@ -85,7 +87,7 @@ cd claude-accounts-usage && bun install
 ## 已知限制
 
 - ex-machina 同一时刻只持有一个账号,所以一个新账号必须先用 ex-machina 登录过一次,插件才能在下次加载/操作时收录它。
-- 自动切号依赖 OpenCode 的 `session.error` / `session.next.retried` 事件,因此只对经由 OpenCode(及 ex-machina)发出的 Anthropic 请求生效;额度恢复后的解除冷却需要该账号成功跑过一次对话。
+- 自动切号依赖 OpenCode 的 `session.status` 事件(辅以 `session.next.retried` / `session.error`),因此只对经由 OpenCode(及 ex-machina)发出的 Anthropic 请求生效;额度恢复后的解除冷却需要该账号成功跑过一次对话。
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-accounts-usage",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "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/constants.ts

@@ -14,3 +14,9 @@ export const OAUTH_BETA = "oauth-2025-04-20"
 // Refresh slightly before real expiry so neither ex-machina nor the usage call
 // receives an already-stale access token.
 export const TOKEN_EXPIRY_BUFFER_MS = 60_000
+
+// When /usage runs, proactively refresh INACTIVE accounts whose access token
+// expires within this window, so an idle account stays fresh between /usage opens
+// (and is ready for auto-switch). Never applied to the active account — ex-machina
+// owns and rotates that one, so racing it would cause invalid_grant.
+export const INACTIVE_REFRESH_THRESHOLD_MS = 30 * 60_000

package/src/usage.ts

@@ -1,6 +1,6 @@
 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 { CLIENT_ID, INACTIVE_REFRESH_THRESHOLD_MS, OAUTH_BETA, TOKEN_EXPIRY_BUFFER_MS, TOKEN_URL, USAGE_ENDPOINT } from "./constants.ts"
 import { debugLog } from "./debug.ts"
 import { fetchProfile } from "./profile.ts"
 
@@ -31,8 +31,8 @@ function errorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error)
 }
 
-function isStale(token: { access?: string; expires?: number }): boolean {
-  return !token.access || !token.expires || token.expires < Date.now() + TOKEN_EXPIRY_BUFFER_MS
+function isStale(token: { access?: string; expires?: number }, bufferMs = TOKEN_EXPIRY_BUFFER_MS): boolean {
+  return !token.access || !token.expires || token.expires < Date.now() + bufferMs
 }
 
 function isRefresh429Cooldown(refresh: string): boolean {
@@ -48,7 +48,11 @@ function isRefresh429Cooldown(refresh: string): boolean {
 function doRefreshToken(refresh: string): Promise<{ access: string; refresh: string; expires: number }> {
   return fetch(TOKEN_URL, {
     method: "POST",
-    headers: { "Content-Type": "application/json" },
+    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: refresh, client_id: CLIENT_ID }),
   }).then(async (res) => {
     if (!res.ok) {
@@ -109,8 +113,8 @@ export async function autoCapture(): Promise<void> {
   })
 }
 
-async function ensureFresh(account: StoredAccount): Promise<{ access?: string; updated?: StoredAccount }> {
-  if (!isStale(account)) return { access: account.access }
+async function ensureFresh(account: StoredAccount, bufferMs?: number): Promise<{ access?: string; updated?: StoredAccount }> {
+  if (!isStale(account, bufferMs)) return { access: account.access }
   if (isRefresh429Cooldown(account.refresh)) {
     debugLog("refresh-skip-429-cooldown", { label: account.label }, true)
     return { access: account.access }
@@ -131,8 +135,9 @@ export async function collectAllUsage(): Promise<{ activeId?: string; results: A
 
   for (const account of file.accounts) {
     const base = { id: account.id, label: account.label, active: account.id === file.activeId }
+    const bufferMs = account.id === file.activeId ? TOKEN_EXPIRY_BUFFER_MS : INACTIVE_REFRESH_THRESHOLD_MS
     try {
-      const { access, updated } = await ensureFresh(account)
+      const { access, updated } = await ensureFresh(account, bufferMs)
       if (updated) needsRefresh = true
       if (!access) {
         settled.push({ result: { ...base, error: "missing access token" }, updated })