@leo000001/opencode-quota-sidebar 2.0.10 → 2.0.12

package/README.md

@@ -67,8 +67,9 @@ Want to add support for another provider (Google Antigravity, Zhipu AI, Firmware
   - 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` without trailing percent, and shows balance on the next indented line when available
   - XYAI daily quota follows the same balance-style layout and prefers the real reset time (for example `XYAI Daily $70.2/$90 Rst 22:18`)
-- Desktop automatically switches to a compact single-line title. It keeps `Requests/Input/Output` plus recently used providers from the last `50` requests or last `60` minutes, and expands all windows/balance for those selected providers in short form such as `OAI 5h80 W70` or `RC D88.9/60 B260`
-- Web UI currently does not have reliable client detection, so it does not auto-switch to desktop compact mode. If you want GUI-friendly single-line titles there, set `sidebar.multilineTitle=false` manually or use `quota_summary` for details
+- Desktop automatically switches to a compact single-line title. It keeps recently used providers from the last `50` requests or last `60` minutes ahead of `Requests/Input/Output`, and expands all windows/balance for those selected providers in short form such as `OAI 5h80 W70` or `RC D88.9/60 B260`
+- TUI is always rendered as multiline; Desktop is always rendered as compact single-line. This behavior no longer depends on `sidebar.multilineTitle`
+- Web UI currently cannot be reliably detected by the plugin, so it follows the non-desktop multiline path
 - 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 can include four sections: `Token Usage`, `Cost as API` (per provider), `Provider Cache` (when provider-level cache coverage is available), and `Quota`
 - Expiry reminders are shown in a separate `Expiry Soon` toast section only for providers with real subscription expiry timestamps, and each session shows that auto-reminder at most once
@@ -249,7 +250,7 @@ Sidebar defaults:
 
 - `sidebar.enabled`: `true`
 - `sidebar.width`: `36` (clamped to `20`-`60`)
-- `sidebar.multilineTitle`: `true`
+- `sidebar.multilineTitle`: `true` (legacy compatibility field; TUI/Desktop display mode is now chosen automatically)
 - `sidebar.showCost`: `true`
 - `sidebar.showQuota`: `true`
 - `sidebar.wrapQuotaLines`: `true`
@@ -323,8 +324,7 @@ Other defaults:
 - `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.
-- Desktop ignores that visual preference and always uses the plugin's compact single-line title mode. TUI still follows `sidebar.multilineTitle`.
+- `sidebar.multilineTitle` is kept for backward compatibility, but current rendering is fixed by client type: TUI uses multiline titles and Desktop uses compact single-line titles.
 - `sidebar.wrapQuotaLines` controls quota line wrapping and continuation indentation (default: `true`).
 - `sidebar.includeChildren` controls whether session-scoped usage/quota includes descendant subagent sessions (default: `true`).
 - `sidebar.childrenMaxDepth` limits how many levels of nested subagents are traversed (default: `6`, clamped 1–32).
@@ -367,9 +367,9 @@ Buzz Balance ￥10.17
 
 These examples show the quota block portion of the sidebar title.
 
-### `sidebar.multilineTitle=true`
+### TUI layout
 
-This section describes the TUI layout. Desktop uses its own compact single-line format regardless of this setting.
+This section describes the TUI layout. Desktop uses its own compact single-line format and Web UI currently follows the multiline path.
 
 0 providers (no quota data):
 
@@ -456,9 +456,9 @@ Copilot unavailable
 OpenAI Remaining ?
 ```
 
-### `sidebar.multilineTitle=false`
+### Legacy compact single-line layout
 
-Quota is rendered inline as part of a single-line title:
+For historical reference, the old non-desktop compact layout looked like this:
 
 ```text
 <base> | Req ... | Input ... | Output ... | OpenAI 5h 78%+ | Copilot Monthly 78% | ...
@@ -472,10 +472,10 @@ Mixed with Buzz balance:
 
 ### Desktop compact mode
 
-Desktop always uses a compact single-line title. Recently used providers are selected from the last `50` assistant requests or last `60` minutes, and each selected provider expands all of its windows and balances in shorthand:
+Desktop always uses a compact single-line title. Recently used providers are selected from the last `50` assistant requests or last `60` minutes, and each selected provider expands all of its windows and balances in shorthand. To survive upstream Desktop truncation better, quota segments are emitted before usage stats:
 
 ```text
-<base> | R12 I18.9k O53 | OAI 5h80 W70 | Cop M78 | RC D88.9/60 B260 | Buzz B￥10.2
+<base> | OAI 5h80 W70 | Cop M78 | RC D88.9/60 B260 | Buzz B￥10.2 | R12 I18.9k O53
 ```
 
 Shorthand rules:
@@ -486,6 +486,7 @@ Shorthand rules:
 - `W70` / `M78` / `D46` = weekly / monthly / daily window remaining percent
 - `D88.9/60` = daily remaining / daily total
 - `B260` / `B￥10.2` = balance
+- Order is `base | quota... | usage`, while TUI keeps its multiline usage-first layout.
 
 `quota_summary` also supports an optional `includeChildren` flag (only effective for `period=session`) to override the config per call. For `day`/`week`/`month` periods, children are never merged — each session is counted independently.
 

package/dist/cost.js

@@ -8,6 +8,38 @@ const MODEL_COST_RATE_ALIASES = {
     'kimi-for-coding:k2p5': ['moonshotai-cn:kimi-k2.5'],
     'kimi-for-coding:kimi-k2-thinking': ['moonshotai-cn:kimi-k2-thinking'],
 };
+function anthropicModelAliases(modelID) {
+    const aliases = [];
+    const push = (value) => {
+        if (!value)
+            return;
+        if (!aliases.includes(value))
+            aliases.push(value);
+    };
+    push(modelID);
+    const stems = [modelID];
+    for (const stem of stems) {
+        const withoutVendorPrefix = stem.replace(/^anthropic[/.]/, '');
+        push(withoutVendorPrefix);
+        push(`anthropic/${withoutVendorPrefix}`);
+        const withoutThinkingSuffix = withoutVendorPrefix.replace(/-thinking$/, '');
+        push(withoutThinkingSuffix);
+        push(`anthropic/${withoutThinkingSuffix}`);
+        const withoutLatestSuffix = withoutThinkingSuffix.replace(/-latest$/, '');
+        push(withoutLatestSuffix);
+        push(`anthropic/${withoutLatestSuffix}`);
+        const withoutDateSuffix = withoutLatestSuffix.replace(/-\d{8}$/, '');
+        push(withoutDateSuffix);
+        push(`anthropic/${withoutDateSuffix}`);
+        const dotted = withoutDateSuffix.replace(/(\d)-(\d)(?=-|$)/g, '$1.$2');
+        push(dotted);
+        push(`anthropic/${dotted}`);
+        const hyphenated = withoutDateSuffix.replace(/(\d)\.(\d)(?=-|$)/g, '$1-$2');
+        push(hyphenated);
+        push(`anthropic/${hyphenated}`);
+    }
+    return aliases;
+}
 function normalizeKnownProviderID(providerID) {
     if (providerID.startsWith('github-copilot'))
         return 'github-copilot';
@@ -37,9 +69,14 @@ export function modelCostLookupKeys(providerID, modelID) {
         if (!keys.includes(key))
             keys.push(key);
     };
-    push(modelCostKey(providerID, modelID));
-    if (canonicalProviderID !== providerID) {
-        push(modelCostKey(canonicalProviderID, modelID));
+    const modelIDs = canonicalProviderID === 'anthropic'
+        ? anthropicModelAliases(modelID)
+        : [modelID];
+    for (const candidateModelID of modelIDs) {
+        push(modelCostKey(providerID, candidateModelID));
+        if (canonicalProviderID !== providerID) {
+            push(modelCostKey(canonicalProviderID, candidateModelID));
+        }
     }
     for (const key of [...keys]) {
         for (const alias of MODEL_COST_RATE_ALIASES[key] || []) {

package/dist/format.js

@@ -276,7 +276,7 @@ function compactDesktopQuotaSegment(quota) {
     }
     return [label, ...parts].filter(Boolean).join(' ');
 }
-function renderDesktopCompactTitle(baseTitle, usage, quotas, config, width) {
+function renderDesktopCompactTitle(baseTitle, usage, quotas, config, _width) {
     const visibleQuotas = collapseQuotaSnapshots(quotas).filter((q) => ['ok', 'error', 'unsupported', 'unavailable'].includes(q.status));
     const selectedProviderIDs = new Set(selectDesktopCompactProviderIDs(usage, config));
     const quotaSegments = visibleQuotas
@@ -284,14 +284,14 @@ function renderDesktopCompactTitle(baseTitle, usage, quotas, config, width) {
         .map(compactDesktopQuotaSegment)
         .filter(Boolean);
     const segments = [
-        `R${shortNumber(usage.assistantMessages, 1)} I${sidebarNumber(usage.input)} O${sidebarNumber(usage.output)}`,
         ...quotaSegments,
+        `R${shortNumber(usage.assistantMessages, 1)} I${sidebarNumber(usage.input)} O${sidebarNumber(usage.output)}`,
     ];
     const detail = segments.join(' | ');
+    const safeBase = sanitizeLine(baseTitle) || 'Session';
     if (!detail)
-        return fitLine(baseTitle, width);
-    const safeBase = fitLine(baseTitle, Math.max(8, Math.floor(width * 0.35)));
-    return fitLine(`${safeBase} | ${detail}`, width);
+        return safeBase;
+    return `${safeBase} | ${detail}`;
 }
 function formatPercent(value, decimals = 1) {
     const safe = Number.isFinite(value) && value >= 0 ? value : 0;
@@ -407,10 +407,6 @@ export function renderSidebarTitle(baseTitle, usage, quotas, config) {
         const singleLineBase = safeBaseTitle.split(/\r?\n/, 1)[0] || 'Session';
         return renderDesktopCompactTitle(singleLineBase, usage, quotas, config, width);
     }
-    if (config.sidebar.multilineTitle !== true) {
-        const singleLineBase = safeBaseTitle.split(/\r?\n/, 1)[0] || 'Session';
-        return renderSingleLineTitle(singleLineBase, usage, quotas, config, width);
-    }
     const cacheMetrics = getCacheCoverageMetrics(usage);
     const lines = [];
     for (const line of safeBaseTitle.split(/\r?\n/)) {

package/dist/usage_service.js

@@ -70,15 +70,16 @@ export function createUsageService(deps) {
                 if (!rates)
                     continue;
                 const modelID = typeof modelValue.id === 'string' ? modelValue.id : modelKey;
-                acc[modelCostKey(rawProviderID, modelID)] = rates;
-                if (modelKey !== modelID) {
-                    acc[modelCostKey(rawProviderID, modelKey)] = rates;
-                }
+                const lookupKeys = new Set([
+                    ...modelCostLookupKeys(rawProviderID, modelID),
+                    ...modelCostLookupKeys(rawProviderID, modelKey),
+                ]);
                 if (canonicalProviderID !== rawProviderID) {
-                    acc[modelCostKey(canonicalProviderID, modelID)] = rates;
-                    if (modelKey !== modelID) {
-                        acc[modelCostKey(canonicalProviderID, modelKey)] = rates;
-                    }
+                    lookupKeys.add(modelCostKey(canonicalProviderID, modelID));
+                    lookupKeys.add(modelCostKey(canonicalProviderID, modelKey));
+                }
+                for (const key of lookupKeys) {
+                    acc[key] = rates;
                 }
             }
             return acc;
@@ -332,7 +333,8 @@ export function createUsageService(deps) {
             return { usage: empty, persist: false };
         }
         const modelCostMap = await getModelCostMap();
-        const staleBillingCache = Boolean(sessionState?.usage) && !isUsageBillingCurrent(sessionState?.usage);
+        const staleBillingCache = Boolean(sessionState?.usage) &&
+            !isUsageBillingCurrent(sessionState?.usage);
         const forceRescan = forceRescanSessions.has(sessionID) || staleBillingCache;
         if (forceRescan)
             forceRescanSessions.delete(sessionID);

package/package.json

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