claude-accounts-usage 0.1.1 → 0.1.3

package/README.md

@@ -9,7 +9,7 @@
 | 命令 | 作用 |
 |------|------|
 | `/usage` | 弹框显示所有账号的用量(5h / 7d / 7d-Sonnet 三个窗口,带进度条与重置倒计时) |
-| `/switch` | 弹框选择账号并切换为当前账号(立即生效) |
+| `/switch` | 弹框选择账号并切换(立即生效);列表内联显示每个账号的 5h / 7d / 7d-Sonnet 用量,`↑↓` 选择、`enter` 切换、`esc` 关闭 |
 
 账号会在**插件加载时**以及每次 `/usage`、`/switch` 时**自动收录**当前 ex-machina 登录的账号,无需手动添加。
 
@@ -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.3"]
 }
 ```
 
 OpenCode 会自动解析并安装该包,无需手动 `npm install`。
 
+> **建议带上版本号**(如 `@0.1.3`)。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.3",
   "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/dialogs.tsx

@@ -1,5 +1,6 @@
 /** @jsxImportSource @opentui/solid */
-import { For, Show } from "solid-js"
+import { createMemo, createSignal, For, Show } from "solid-js"
+import { useKeyboard } from "@opentui/solid"
 import type { TuiPluginApi } from "@opencode-ai/plugin/tui"
 import type { StoredAccount } from "./accounts.ts"
 import type { AccountUsage, UsageWindow } from "./usage.ts"
@@ -115,24 +116,135 @@ export function openUsageDialog(api: TuiPluginApi, state: () => UsageState): voi
   api.ui.dialog.replace(() => <UsageDialog api={api} state={state} />)
 }
 
+function SwitchAccountRow(props: {
+  api: TuiPluginApi
+  account: StoredAccount
+  activeId?: string
+  usage?: AccountUsage
+  selected: boolean
+  loading: boolean
+}) {
+  const theme = () => props.api.theme.current
+  const isActive = () => props.account.id === props.activeId
+  return (
+    <box flexDirection="column">
+      <box flexDirection="row" gap={1}>
+        <text fg={props.selected ? theme().primary : theme().textMuted}>{props.selected ? "▶" : " "}</text>
+        <text fg={props.selected ? theme().primary : theme().text}>
+          {isActive() ? "●" : "○"} {props.account.label}
+          {isActive() ? " (当前)" : ""}
+        </text>
+      </box>
+      <box flexDirection="column" paddingLeft={4}>
+        <Show when={props.usage?.error}>
+          <text fg={theme().error}>{props.usage!.error}</text>
+        </Show>
+        <Show when={props.usage?.usage}>
+          {(usage) => (
+            <box flexDirection="column">
+              <WindowRow api={props.api} name="5h" win={usage().five_hour} />
+              <WindowRow api={props.api} name="7d" win={usage().seven_day} />
+              <WindowRow api={props.api} name="Sonnet" win={usage().seven_day_sonnet} />
+            </box>
+          )}
+        </Show>
+        <Show when={props.loading && !props.usage?.usage && !props.usage?.error}>
+          <text fg={theme().textMuted}>加载中…</text>
+        </Show>
+      </box>
+    </box>
+  )
+}
+
+function SwitchDialog(props: {
+  api: TuiPluginApi
+  accounts: StoredAccount[]
+  activeId?: string
+  state: () => UsageState
+  onSwitch: (id: string) => void
+}) {
+  const api = props.api
+  const theme = () => api.theme.current
+  const accounts = props.accounts
+  const start = accounts.findIndex((account) => account.id === props.activeId)
+  const [index, setIndex] = createSignal(start < 0 ? 0 : start)
+
+  const usageById = createMemo(() => {
+    const map = new Map<string, AccountUsage>()
+    for (const result of props.state().results) map.set(result.id, result)
+    return map
+  })
+
+  function move(delta: number): void {
+    setIndex((i) => Math.max(0, Math.min(accounts.length - 1, i + delta)))
+  }
+
+  function confirm(): void {
+    const account = accounts[index()]
+    if (!account) return
+    api.ui.dialog.clear()
+    props.onSwitch(account.id)
+  }
+
+  useKeyboard((evt) => {
+    if (evt.name === "return") {
+      evt.preventDefault()
+      evt.stopPropagation()
+      confirm()
+      return
+    }
+    if (evt.name === "up" || evt.name === "k") {
+      evt.preventDefault()
+      evt.stopPropagation()
+      move(-1)
+      return
+    }
+    if (evt.name === "down" || evt.name === "j") {
+      evt.preventDefault()
+      evt.stopPropagation()
+      move(1)
+    }
+  })
+
+  return (
+    <box paddingTop={1} paddingBottom={1} paddingLeft={2} paddingRight={2} gap={1} flexDirection="column">
+      <box flexDirection="row" justifyContent="space-between">
+        <text fg={theme().text}>
+          <b>切换 Claude 账号</b>
+        </text>
+        <text fg={theme().textMuted}>↑↓ 选择 · enter 切换 · esc 关闭</text>
+      </box>
+      <For each={accounts}>
+        {(account, i) => (
+          <SwitchAccountRow
+            api={api}
+            account={account}
+            activeId={props.activeId}
+            usage={usageById().get(account.id)}
+            selected={i() === index()}
+            loading={props.state().loading}
+          />
+        )}
+      </For>
+      <Show when={props.state().error}>
+        <text fg={theme().error}>{props.state().error}</text>
+      </Show>
+      <Show when={props.state().updatedAt}>
+        <text fg={theme().textMuted}>更新于 {clockTime(props.state().updatedAt!)}</text>
+      </Show>
+    </box>
+  )
+}
+
 export function openSwitchDialog(
   api: TuiPluginApi,
   accounts: StoredAccount[],
   activeId: string | undefined,
+  state: () => UsageState,
   onSwitch: (id: string) => void | Promise<void>,
 ): void {
-  api.ui.dialog.replace(() =>
-    api.ui.DialogSelect<string>({
-      title: "切换 Claude 账号",
-      current: activeId,
-      options: accounts.map((account) => ({
-        title: account.id === activeId ? `${account.label} (当前)` : account.label,
-        value: account.id,
-      })),
-      onSelect: (option) => {
-        api.ui.dialog.clear()
-        void onSwitch(option.value)
-      },
-    }),
-  )
+  api.ui.dialog.setSize("medium")
+  api.ui.dialog.replace(() => (
+    <SwitchDialog api={api} accounts={accounts} activeId={activeId} state={state} onSwitch={(id) => void onSwitch(id)} />
+  ))
 }

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 })

package/tui.tsx

@@ -60,7 +60,8 @@ const tui: TuiPlugin = async (api) => {
           api.ui.toast({ variant: "warning", message: "没有账号。请先用 ex-machina 登录 Claude" })
           return
         }
-        openSwitchDialog(api, file.accounts, file.activeId, async (id) => {
+        setState((prev) => ({ ...prev, loading: true, error: undefined }))
+        openSwitchDialog(api, file.accounts, file.activeId, state, async (id) => {
           try {
             const account = await switchToAccount(id)
             api.ui.toast({ variant: "success", message: `已切换到 ${account.label},下次对话生效` })
@@ -68,6 +69,7 @@ const tui: TuiPlugin = async (api) => {
             api.ui.toast({ variant: "error", message: `切换失败: ${message(error)}` })
           }
         })
+        void refreshUsage()
       },
     },
   ])