opencode-usage 0.5.8 → 0.5.11

package/README.md

@@ -74,11 +74,16 @@ opencode-usage --commander
 opencode-usage --commander --commander-port 5000
 ```
 
+![Commander Dashboard](docs/commander.png)
+
 The Commander provides a single-page web UI with:
 
-- **Quota Status** - Per-provider account usage with progress bars, thresholds, and stale detection (Anthropic, Codex, Antigravity)
-- **Usage Breakdown** - Daily token usage table with cost estimates and provider drill-down
+- **Quota Status** - Per-provider account usage with progress bars, configurable thresholds, and stale detection
+- **Multi-Account** - Full multi-account support for Anthropic and Gemini providers
+- **Usage Breakdown** - Daily/monthly token usage table with cost estimates, provider filter, and date range
 - **Account Management** - Add, switch, remove, and re-authenticate accounts
+- **Plugins** - Extensible plugin system for custom providers and integrations
+- **Configuration** - Customizable thresholds, display preferences, and provider settings
 - **Ping** - Verify account connectivity with live PONG/FAIL indicators
 - **Dark mode** toggle
 - Auto-refresh every 5 minutes

package/dist/commander/services/plugin-adapters.d.ts

@@ -4,9 +4,4 @@
  * Each command is registered via `registerCommand` so the command-runner can
  * execute them as background jobs.
  */
-/**
- * Proactively refresh Codex tokens that haven't been refreshed in 24+ hours.
- * Keeps tokens fresh so they never silently expire.
- * Safe to call frequently — skips accounts refreshed recently.
- */
 export declare function proactiveRefreshCodexTokens(): Promise<void>;

package/dist/index.js

@@ -366,6 +366,56 @@ function getAccountIdFromJwt(claims) {
   const auth = claims?.["https://api.openai.com/auth"];
   return auth?.chatgpt_account_id ?? null;
 }
+async function tryReadCodexCliAuth() {
+  try {
+    const raw = JSON.parse(await Bun.file(CODEX_CLI_AUTH_PATH).text());
+    const tokens = raw.tokens;
+    if (!tokens?.access_token)
+      return null;
+    const accessClaims = decodeJwtPayload(tokens.access_token);
+    const idClaims = tokens.id_token ? decodeJwtPayload(tokens.id_token) : null;
+    const expiresAt = getExpiryFromJwt(accessClaims) ?? getExpiryFromJwt(idClaims) ?? 0;
+    if (expiresAt <= Date.now())
+      return null;
+    return {
+      accessToken: tokens.access_token,
+      refreshToken: tokens.refresh_token ?? "",
+      idToken: tokens.id_token ?? null,
+      accountId: getAccountIdFromJwt(idClaims) ?? getAccountIdFromJwt(accessClaims),
+      expiresAt
+    };
+  } catch {
+    return null;
+  }
+}
+async function tryImportFromCodexCli(alias, account, storePath) {
+  const cli = await tryReadCodexCliAuth();
+  if (!cli || !cli.refreshToken)
+    return false;
+  const pluginAccountId = account.accountId;
+  if (!pluginAccountId || cli.accountId !== pluginAccountId)
+    return false;
+  const pluginExpiry = typeof account.expiresAt === "number" ? account.expiresAt : 0;
+  if (cli.expiresAt <= pluginExpiry)
+    return false;
+  console.log(`[proactiveRefresh] ${alias}: importing fresher token from ~/.codex/auth.json`);
+  const freshStore = JSON.parse(await Bun.file(storePath).text());
+  const freshAccounts = freshStore.accounts ?? {};
+  const freshAcct = freshAccounts[alias];
+  if (!freshAcct)
+    return false;
+  freshAcct.accessToken = cli.accessToken;
+  freshAcct.refreshToken = cli.refreshToken;
+  if (cli.idToken)
+    freshAcct.idToken = cli.idToken;
+  freshAcct.expiresAt = cli.expiresAt;
+  freshAcct.lastRefresh = new Date().toISOString();
+  freshAcct.authInvalid = false;
+  await Bun.write(storePath, JSON.stringify(freshStore, null, 2));
+  const daysLeft = ((cli.expiresAt - Date.now()) / (24 * 60 * 60 * 1000)).toFixed(1);
+  console.log(`[proactiveRefresh] ${alias}: imported from CLI, expiry in ${daysLeft}d`);
+  return true;
+}
 async function refreshSingleCodexToken(alias, account, storePath) {
   const refreshToken = account.refreshToken;
   if (typeof refreshToken !== "string" || !refreshToken) {
@@ -385,7 +435,7 @@ async function refreshSingleCodexToken(alias, account, storePath) {
     });
     if (!res.ok) {
       console.log(`[proactiveRefresh] ${alias}: refresh failed HTTP ${res.status} in ${Date.now() - t0}ms`);
-      return false;
+      return tryImportFromCodexCli(alias, account, storePath);
     }
     const tokens = await res.json();
     const accessClaims = decodeJwtPayload(tokens.access_token);
@@ -415,6 +465,16 @@ async function refreshSingleCodexToken(alias, account, storePath) {
   }
 }
 async function proactiveRefreshCodexTokens() {
+  if (_proactiveRefreshRunning)
+    return;
+  _proactiveRefreshRunning = true;
+  try {
+    await _proactiveRefreshCodexTokensInner();
+  } finally {
+    _proactiveRefreshRunning = false;
+  }
+}
+async function _proactiveRefreshCodexTokensInner() {
   const STORE_PATHS = [
     join8(homedir6(), ".config", "opencode", "codex-multi-account-accounts.json"),
     join8(homedir6(), ".config", "opencode", "codex-multi-accounts.json"),
@@ -437,6 +497,10 @@ async function proactiveRefreshCodexTokens() {
   const now = Date.now();
   let refreshed = 0;
   for (const [alias, account] of Object.entries(accounts)) {
+    if (account.authInvalid === true) {
+      console.log(`[proactiveRefresh] ${alias}: authInvalid, skipping (needs reauth)`);
+      continue;
+    }
     const expiresAt = typeof account.expiresAt === "number" ? account.expiresAt : 0;
     const lastRefresh = typeof account.lastRefresh === "string" ? new Date(account.lastRefresh).getTime() : 0;
     const timeSinceRefresh = now - lastRefresh;
@@ -619,7 +683,7 @@ function reauthCliCommand(provider) {
     throw new Error(`Re-auth not supported for provider: ${provider}`);
   return cmd;
 }
-var isBun4, PROVIDER_SOURCE, CODEX_TOKEN_URL = "https://auth.openai.com/oauth/token", CODEX_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann", REFRESH_COOLDOWN_MS, bunxQueue, REAUTH_PROVIDERS;
+var isBun4, PROVIDER_SOURCE, CODEX_TOKEN_URL = "https://auth.openai.com/oauth/token", CODEX_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann", REFRESH_COOLDOWN_MS, CODEX_CLI_AUTH_PATH, _proactiveRefreshRunning = false, bunxQueue, REAUTH_PROVIDERS;
 var init_plugin_adapters = __esm(() => {
   init_command_runner();
   init_config_service();
@@ -721,6 +785,7 @@ var init_plugin_adapters = __esm(() => {
     }
   });
   REFRESH_COOLDOWN_MS = 24 * 60 * 60 * 1000;
+  CODEX_CLI_AUTH_PATH = join8(homedir6(), ".codex", "auth.json");
   bunxQueue = new Map;
   registerCommand({
     id: "accounts.ping",
@@ -31158,4 +31223,4 @@ async function main2() {
 var WATCH_INTERVAL_MS = 5 * 60 * 1000;
 main2().catch(console.error);
 
-//# debugId=5A3E5FE73F68D7CA64756E2164756E21
+//# debugId=F9964D445D944A6564756E2164756E21