@leo000001/opencode-quota-sidebar 1.12.0 → 1.13.1

package/README.md

@@ -18,6 +18,7 @@ Add the package name to `plugin` in your `opencode.json`. OpenCode uses Bun to i
 ```
 
 Note for OpenCode `>=1.2.15`: TUI settings (`theme`/`keybinds`/`tui`) moved to `tui.json`, but plugin loading still stays in `opencode.json` (`plugin: []`).
+This plugin also accepts both `config.providers` and older `provider.list` runtime shapes when discovering provider options.
 
 ## Development (build from source)
 
@@ -38,12 +39,12 @@ On Windows, use forward slashes: `"file:///D:/Lab/opencode-quota-sidebar/dist/in
 
 ## Supported quota providers
 
-| Provider       | Endpoint                               | Auth            | Status                                 |
-| -------------- | -------------------------------------- | --------------- | -------------------------------------- |
-| OpenAI Codex   | `chatgpt.com/backend-api/wham/usage`   | OAuth (ChatGPT) | Multi-window (short-term + weekly)     |
-| GitHub Copilot | `api.github.com/copilot_internal/user` | OAuth           | Monthly quota                          |
-| RightCode      | `www.right.codes/account/summary`      | API key         | Subscription or balance (by prefix)    |
-| Anthropic      | —                                      | —               | Unsupported (no public quota endpoint) |
+| Provider       | Endpoint                               | Auth            | Status                                  |
+| -------------- | -------------------------------------- | --------------- | --------------------------------------- |
+| OpenAI Codex   | `chatgpt.com/backend-api/wham/usage`   | OAuth (ChatGPT) | Multi-window (short-term + weekly)      |
+| GitHub Copilot | `api.github.com/copilot_internal/user` | OAuth           | Monthly quota                           |
+| RightCode      | `www.right.codes/account/summary`      | API key         | Subscription or balance (by prefix)     |
+| Anthropic      | `api.anthropic.com/api/oauth/usage`    | OAuth           | Multi-window (5h + weekly / plan-based) |
 
 Want to add support for another provider (Google Antigravity, Zhipu AI, Firmware AI, etc.)? See [CONTRIBUTING.md](CONTRIBUTING.md).
 
@@ -55,8 +56,8 @@ Want to add support for another provider (Google Antigravity, Zhipu AI, Firmware
   - line 3: Cache Read tokens (only if non-zero)
   - line 4: Cache Write tokens (only if non-zero)
   - line 5: `$X.XX as API cost` (equivalent API billing for subscription-auth providers)
-  - quota lines: quota text like `OpenAI 5h 80% Rst 16:20`, with multi-window continuation lines indented (e.g. `       Weekly 70% Rst 03-01`)
-  - RightCode daily quota shows `$remaining/$dailyTotal` + expiry (e.g. `RC Daily $105/$60 Exp 02-27`, without trailing percent) and also shows balance on the next indented line when available
+  - quota lines: quota text like `OpenAI 5h 80% Rst 16:20`; short windows (`5h`, `1d`, `Daily`) show `HH:MM` on same-day resets and `MM-DD HH:MM` when crossing days, while longer windows continue to show `MM-DD`
+  - RightCode daily quota shows `$remaining/$dailyTotal` + expiry (e.g. `RC Daily $105/$60 Exp 02-27`, without trailing percent) and also shows balance on the next indented line when available; `Exp` remains date-only
 - Session-scoped usage/quota can include descendant subagent sessions (enabled by default via `sidebar.includeChildren=true`). Traversal is bounded by `childrenMaxDepth` (default 6), `childrenMaxSessions` (default 128), and `childrenConcurrency` (default 5); truncation is logged when `OPENCODE_QUOTA_DEBUG=1`. Day/week/month ranges never merge children — only session scope does.
 - Toast message includes three sections: `Token Usage`, `Cost as API` (per provider), and `Quota`
 - Quota snapshots are de-duplicated before rendering to avoid repeated provider lines
@@ -67,7 +68,7 @@ Want to add support for another provider (Google Antigravity, Zhipu AI, Firmware
   - OpenAI Codex OAuth (`/backend-api/wham/usage`)
   - GitHub Copilot OAuth (`/copilot_internal/user`)
   - RightCode API key (`/account/summary`)
-  - Anthropic: currently marked unsupported (no public quota endpoint)
+  - Anthropic Claude OAuth (`/api/oauth/usage`, with beta header)
 - OpenAI OAuth quota checks auto-refresh expired access token (using refresh token)
 - API key providers still show usage aggregation (quota only applies to subscription providers)
 - Incremental usage aggregation — only processes new messages since last cursor
@@ -145,7 +146,9 @@ Recommended global config:
 Optional project overrides:
 
 - `<worktree>/quota-sidebar.config.json`
+- `<directory>/quota-sidebar.config.json` (when different from `worktree`)
 - `<worktree>/.opencode/quota-sidebar.config.json`
+- `<directory>/.opencode/quota-sidebar.config.json` (when different from `worktree`)
 
 Optional explicit override:
 
@@ -158,9 +161,11 @@ Optional config-home override:
 Resolution order (low -> high):
 
 1. Global config (`~/.config/opencode/...`)
-2. Project root config
-3. `.opencode` project config
-4. `OPENCODE_QUOTA_CONFIG`
+2. `<worktree>/quota-sidebar.config.json`
+3. `<directory>/quota-sidebar.config.json`
+4. `<worktree>/.opencode/quota-sidebar.config.json`
+5. `<directory>/.opencode/quota-sidebar.config.json`
+6. `OPENCODE_QUOTA_CONFIG`
 
 Values are layered; later sources override earlier ones.
 
@@ -235,6 +240,7 @@ Example config:
 Notes:
 
 - `sidebar.showCost` controls API-cost visibility in sidebar title, `quota_summary` markdown report, and toast message.
+- `quota_summary` follows the same reset compaction rules for short windows in its subscription section (`5h` / `1d` / `Daily` show time, long windows show date, RightCode `Exp` stays date-only).
 - `sidebar.width` is measured in terminal cells. CJK/emoji truncation is best-effort to avoid sidebar overflow.
 - `sidebar.multilineTitle` controls multi-line sidebar layout (default: `true`). Set `false` for compact single-line title.
 - `sidebar.wrapQuotaLines` controls quota line wrapping and continuation indentation (default: `true`).
@@ -273,6 +279,14 @@ OpenAI
   Weekly 73% Rst 03-12
 ```
 
+1 provider, short window crossing into the next day:
+
+```text
+Anthropic
+  5h 0% Rst 03-10 01:00
+  Weekly 46% Rst 03-15
+```
+
 2+ providers (even if each provider is single-window):
 
 ```text
@@ -306,10 +320,10 @@ RC
   Balance $260
 ```
 
-Provider status (examples):
+Provider status / quota (examples):
 
 ```text
-Anthropic unsupported
+Anthropic 5h 80%+
 Copilot unavailable
 OpenAI Remaining ?
 ```

package/dist/events.d.ts

@@ -3,6 +3,9 @@ export declare function createEventDispatcher(handlers: {
     onSessionCreated: (session: Session) => Promise<void>;
     onSessionUpdated: (session: Session) => Promise<void>;
     onSessionDeleted: (session: Session) => Promise<void>;
-    onMessageRemoved: (sessionID: string) => Promise<void>;
+    onMessageRemoved: (info: {
+        sessionID: string;
+        messageID?: string;
+    }) => Promise<void>;
     onAssistantMessageCompleted: (message: AssistantMessage) => Promise<void>;
 }): (event: Event) => Promise<void>;

package/dist/events.js

@@ -16,7 +16,11 @@ export function createEventDispatcher(handlers) {
             return;
         }
         if (event.type === 'message.removed') {
-            await handlers.onMessageRemoved(event.properties.sessionID);
+            const props = event.properties;
+            await handlers.onMessageRemoved({
+                sessionID: props.sessionID,
+                messageID: typeof props.messageID === 'string' ? props.messageID : undefined,
+            });
             return;
         }
         if (event.type !== 'message.updated')

package/dist/format.js

@@ -325,7 +325,7 @@ function compactQuotaWide(quota, labelWidth = 0, options) {
                 ? [sanitizeLine(win.label), pct]
                 : [sanitizeLine(win.label)]
             : [pct];
-        const reset = compactReset(win.resetAt, win.resetLabel);
+        const reset = compactReset(win.resetAt, win.resetLabel, win.label);
         if (reset) {
             parts.push(`${sanitizeLine(win.resetLabel || 'Rst')} ${reset}`);
         }
@@ -360,7 +360,12 @@ function compactQuotaWide(quota, labelWidth = 0, options) {
     const fallbackText = `Remaining ${percent}${reset ? ` Rst ${reset}` : ''}`;
     return maybeBreak(fallbackText, [fallbackText]);
 }
-function compactReset(iso, resetLabel) {
+function isShortResetWindow(label) {
+    if (typeof label !== 'string')
+        return false;
+    return /^\s*(?:\d+\s*[hd]|daily)\b/i.test(label);
+}
+function compactReset(iso, resetLabel, windowLabel) {
     if (!iso)
         return undefined;
     const timestamp = Date.parse(iso);
@@ -378,6 +383,12 @@ function compactReset(iso, resetLabel) {
         value.getMonth() === now.getMonth() &&
         value.getDate() === now.getDate();
     const two = (num) => `${num}`.padStart(2, '0');
+    if (isShortResetWindow(windowLabel)) {
+        const hhmm = `${two(value.getHours())}:${two(value.getMinutes())}`;
+        if (sameDay)
+            return hhmm;
+        return `${two(value.getMonth() + 1)}-${two(value.getDate())} ${hhmm}`;
+    }
     if (sameDay) {
         return `${two(value.getHours())}:${two(value.getMinutes())}`;
     }
@@ -391,6 +402,12 @@ function dateLine(iso) {
         return iso;
     return new Date(time).toLocaleString();
 }
+function reportResetLine(iso, resetLabel, windowLabel) {
+    const compact = compactReset(iso, resetLabel, windowLabel);
+    if (compact)
+        return compact;
+    return dateLine(iso);
+}
 function periodLabel(period) {
     if (period === 'day')
         return 'Today';
@@ -462,13 +479,13 @@ export function renderMarkdownReport(period, usage, quotas, options) {
             return quota.windows.map((win) => {
                 if (win.showPercent === false) {
                     const winLabel = win.label ? ` (${win.label})` : '';
-                    return mdCell(`- ${quota.label}${winLabel}: ${quota.status} | reset ${dateLine(win.resetAt)}`);
+                    return mdCell(`- ${quota.label}${winLabel}: ${quota.status} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}`);
                 }
                 const remaining = win.remainingPercent === undefined
                     ? '-'
                     : `${win.remainingPercent.toFixed(1)}%`;
                 const winLabel = win.label ? ` (${win.label})` : '';
-                return mdCell(`- ${quota.label}${winLabel}: ${quota.status} | remaining ${remaining} | reset ${dateLine(win.resetAt)}`);
+                return mdCell(`- ${quota.label}${winLabel}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}`);
             });
         }
         if (quota.status === 'ok' && quota.balance) {
@@ -480,7 +497,7 @@ export function renderMarkdownReport(period, usage, quotas, options) {
             ? '-'
             : `${quota.remainingPercent.toFixed(1)}%`;
         return [
-            mdCell(`- ${quota.label}: ${quota.status} | remaining ${remaining} | reset ${dateLine(quota.resetAt)}${quota.note ? ` | ${quota.note}` : ''}`),
+            mdCell(`- ${quota.label}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(quota.resetAt)}${quota.note ? ` | ${quota.note}` : ''}`),
         ];
     });
     return [
@@ -572,7 +589,7 @@ export function renderToastMessage(period, usage, quotas, options) {
                     const pct = win.remainingPercent === undefined
                         ? '-'
                         : `${win.remainingPercent.toFixed(1)}%`;
-                    const reset = compactReset(win.resetAt, win.resetLabel);
+                    const reset = compactReset(win.resetAt, win.resetLabel, win.label);
                     const parts = [win.label];
                     if (showPercent)
                         parts.push(pct);

package/dist/index.js

@@ -225,9 +225,10 @@ export async function QuotaSidebarPlugin(input) {
                 titleRefresh.schedule(session.parentID, 0);
             }
         },
-        onMessageRemoved: async (sessionID) => {
-            usageService.markForceRescan(sessionID);
-            titleRefresh.schedule(sessionID);
+        onMessageRemoved: async (info) => {
+            usageService.markForceRescan(info.sessionID);
+            titleRefresh.schedule(info.sessionID, 0);
+            scheduleParentRefreshIfSafe(info.sessionID, state.sessions[info.sessionID]?.parentID);
         },
         onAssistantMessageCompleted: async (message) => {
             usageService.markSessionDirty(message.sessionID);

package/dist/providers/core/anthropic.js

@@ -1,4 +1,109 @@
-import { configuredProviderEnabled } from '../common.js';
+import { swallow } from '../../helpers.js';
+import { asRecord, configuredProviderEnabled, fetchWithTimeout, normalizePercent, toIso, } from '../common.js';
+const ANTHROPIC_OAUTH_USAGE_BETA = 'oauth-2025-04-20';
+function parseAnthropicWindow(value, label) {
+    const win = asRecord(value);
+    if (!win)
+        return undefined;
+    const usedPercent = normalizePercent(win.utilization);
+    if (usedPercent === undefined)
+        return undefined;
+    const parsed = {
+        label,
+        usedPercent,
+        remainingPercent: Math.max(0, 100 - usedPercent),
+        resetAt: toIso(win.resets_at),
+    };
+    return parsed;
+}
+async function fetchAnthropicQuota({ providerID, auth, config, }) {
+    const checkedAt = Date.now();
+    const base = {
+        providerID,
+        adapterID: 'anthropic',
+        label: 'Anthropic',
+        shortLabel: 'Anthropic',
+        sortOrder: 30,
+    };
+    if (!auth) {
+        return {
+            ...base,
+            status: 'unavailable',
+            checkedAt,
+            note: 'auth not found',
+        };
+    }
+    if (auth.type !== 'oauth') {
+        return {
+            ...base,
+            status: 'unsupported',
+            checkedAt,
+            note: 'api key auth has no quota endpoint',
+        };
+    }
+    if (typeof auth.access !== 'string' || !auth.access) {
+        return {
+            ...base,
+            status: 'unavailable',
+            checkedAt,
+            note: 'missing oauth access token',
+        };
+    }
+    const response = await fetchWithTimeout('https://api.anthropic.com/api/oauth/usage', {
+        method: 'GET',
+        headers: {
+            Accept: 'application/json',
+            Authorization: `Bearer ${auth.access}`,
+            'Content-Type': 'application/json',
+            'User-Agent': 'opencode-quota-sidebar',
+            'anthropic-beta': ANTHROPIC_OAUTH_USAGE_BETA,
+        },
+    }, config.quota.requestTimeoutMs).catch(swallow('fetchAnthropicQuota:usage'));
+    if (!response) {
+        return {
+            ...base,
+            status: 'error',
+            checkedAt,
+            note: 'network request failed',
+        };
+    }
+    if (!response.ok) {
+        return {
+            ...base,
+            status: 'error',
+            checkedAt,
+            note: `http ${response.status}`,
+        };
+    }
+    const payload = await response
+        .json()
+        .catch(swallow('fetchAnthropicQuota:json'));
+    const usage = asRecord(payload);
+    if (!usage) {
+        return {
+            ...base,
+            status: 'error',
+            checkedAt,
+            note: 'invalid response',
+        };
+    }
+    const windows = [
+        parseAnthropicWindow(usage.five_hour, '5h'),
+        parseAnthropicWindow(usage.seven_day, 'Weekly'),
+        parseAnthropicWindow(usage.seven_day_sonnet, 'Sonnet 7d'),
+    ].filter((window) => Boolean(window));
+    const primary = windows[0];
+    return {
+        ...base,
+        status: primary ? 'ok' : 'error',
+        checkedAt,
+        usedPercent: primary?.usedPercent,
+        remainingPercent: primary?.remainingPercent,
+        resetAt: primary?.resetAt,
+        note: primary ? undefined : 'missing quota fields',
+        windows: windows.length > 0 ? windows : undefined,
+    };
+}
 export const anthropicAdapter = {
     id: 'anthropic',
     label: 'Anthropic',
@@ -6,41 +111,5 @@ export const anthropicAdapter = {
     sortOrder: 30,
     matchScore: ({ providerID }) => (providerID === 'anthropic' ? 80 : 0),
     isEnabled: (config) => configuredProviderEnabled(config.quota, 'anthropic', config.quota.includeAnthropic),
-    fetch: async ({ providerID, auth }) => {
-        const checkedAt = Date.now();
-        if (!auth) {
-            return {
-                providerID,
-                adapterID: 'anthropic',
-                label: 'Anthropic',
-                shortLabel: 'Anthropic',
-                sortOrder: 30,
-                status: 'unavailable',
-                checkedAt,
-                note: 'auth not found',
-            };
-        }
-        if (auth.type === 'api') {
-            return {
-                providerID,
-                adapterID: 'anthropic',
-                label: 'Anthropic',
-                shortLabel: 'Anthropic',
-                sortOrder: 30,
-                status: 'unsupported',
-                checkedAt,
-                note: 'api key has no public quota endpoint',
-            };
-        }
-        return {
-            providerID,
-            adapterID: 'anthropic',
-            label: 'Anthropic',
-            shortLabel: 'Anthropic',
-            sortOrder: 30,
-            status: 'unsupported',
-            checkedAt,
-            note: 'oauth quota endpoint is not publicly documented',
-        };
-    },
+    fetch: fetchAnthropicQuota,
 };

package/dist/quota_service.js

@@ -1,5 +1,5 @@
 import { TtlValueCache } from './cache.js';
-import { swallow } from './helpers.js';
+import { isRecord, swallow } from './helpers.js';
 import { listDefaultQuotaProviderIDs, loadAuthMap, quotaSort } from './quota.js';
 export function createQuotaService(deps) {
     const authCache = new TtlValueCache();
@@ -16,26 +16,31 @@ export function createQuotaService(deps) {
         const cached = providerOptionsCache.get();
         if (cached)
             return cached;
-        const configClient = deps.client;
-        if (!configClient.config?.providers) {
+        const client = deps.client;
+        if (!client.config?.providers && !client.provider?.list) {
             return providerOptionsCache.set({}, 30_000);
         }
-        const response = await configClient.config
-            .providers({
-            query: { directory: deps.directory },
-            throwOnError: true,
-        })
-            .catch(swallow('getProviderOptionsMap'));
-        const data = response &&
-            typeof response === 'object' &&
-            'data' in response &&
-            response.data &&
-            typeof response.data === 'object' &&
-            'providers' in response.data
-            ? response.data.providers
-            : undefined;
-        const map = Array.isArray(data)
-            ? data.reduce((acc, item) => {
+        // Newer runtimes expose config.providers; older clients may only expose
+        // provider.list with a slightly different response shape.
+        const response = await (client.config?.providers
+            ? client.config.providers({
+                query: { directory: deps.directory },
+                throwOnError: true,
+            })
+            : client.provider.list({
+                query: { directory: deps.directory },
+                throwOnError: true,
+            })).catch(swallow('getProviderOptionsMap'));
+        const data = isRecord(response) && isRecord(response.data) ? response.data : undefined;
+        const list = Array.isArray(data?.providers)
+            ? data.providers
+            : Array.isArray(data?.all)
+                ? data.all
+                : Array.isArray(data)
+                    ? data
+                    : undefined;
+        const map = Array.isArray(list)
+            ? list.reduce((acc, item) => {
                 if (!item || typeof item !== 'object')
                     return acc;
                 const record = item;
@@ -58,7 +63,9 @@ export function createQuotaService(deps) {
     const isValidQuotaCache = (snapshot) => {
         // Guard against stale RightCode cache entries from pre-daily format.
         if (snapshot.adapterID !== 'rightcode' || snapshot.status !== 'ok')
-            return true;
+            return !(snapshot.adapterID === 'anthropic' &&
+                snapshot.status === 'unsupported' &&
+                snapshot.note === 'oauth quota endpoint is not publicly documented');
         if (!snapshot.windows || snapshot.windows.length === 0)
             return true;
         const primary = snapshot.windows[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leo000001/opencode-quota-sidebar",
-  "version": "1.12.0",
+  "version": "1.13.1",
   "description": "OpenCode plugin that shows quota and token usage in session titles",
   "type": "module",
   "main": "dist/index.js",