@leo000001/opencode-quota-sidebar 2.0.0 → 2.0.2

package/README.md

@@ -12,9 +12,9 @@ OpenCode plugin: show token usage and subscription quota in the session sidebar
 Add the package name to `plugin` in your `opencode.json`. OpenCode uses Bun to install it automatically on startup:
 
 ```json
-{
-  "plugin": ["@leo000001/opencode-quota-sidebar@1.13.2"]
-}
+{
+  "plugin": ["@leo000001/opencode-quota-sidebar@2.0.1"]
+}
 ```
 
 Note for OpenCode `>=1.2.15`: TUI settings (`theme`/`keybinds`/`tui`) moved to `tui.json`, but plugin loading still stays in `opencode.json` (`plugin: []`).
@@ -55,20 +55,22 @@ Want to add support for another provider (Google Antigravity, Zhipu AI, Firmware
 
 - Session title becomes multiline in sidebar:
   - line 1: original session title
-  - line 2: Input/Output tokens
-  - line 3: Cache Read tokens (only if non-zero)
-  - line 4: Cache Write tokens (only if non-zero)
+  - line 2: blank separator
+  - line 3: Input/Output tokens
+  - line 4: Cache Read tokens (only if non-zero)
+  - line 5: Cache Write tokens (only if non-zero)
   - next lines: `Cache Coverage` (read/write cache models) and `Cache Read Coverage` (read-only cache models) when enough cache telemetry is available; mixed sessions can show both
   - next line: `$X.XX as API cost` (equivalent API billing for subscription-auth providers)
   - 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`
+- Toast message can include four sections: `Token Usage`, `Cost as API` (per provider), `Provider Cache` (when provider-level cache coverage is available), and `Quota`
 - `quota_summary` markdown / toast also include `Cache Coverage` and `Cache Read Coverage` summary lines when available
 - Quota snapshots are de-duplicated before rendering to avoid repeated provider lines
 - Custom tools:
   - `quota_summary` — generate usage report for session/day/week/month (markdown + toast)
-  - `quota_show` — toggle sidebar title display on/off (state persists across sessions)
+- `quota_show` — toggle sidebar title display on/off (state persists across sessions)
+- After startup, titles are restored immediately when persisted display mode is OFF; when persisted display mode is ON, touched titles refresh on startup and the rest update on the next relevant session/message event or when `quota_show` is toggled
 - Quota connectors:
   - OpenAI Codex OAuth (`/backend-api/wham/usage`)
   - GitHub Copilot OAuth (`/copilot_internal/user`)
@@ -88,12 +90,17 @@ The plugin stores lightweight global state and date-partitioned session chunks.
   - `titleEnabled`
   - `sessionDateMap` (sessionID -> `YYYY-MM-DD`)
   - `quotaCache`
-- Session chunks: `<opencode-data>/quota-sidebar-sessions/YYYY/MM/DD.json`
-  - per-session title state (`baseTitle`, `lastAppliedTitle`)
-  - `createdAt`
-  - `parentID` (when the session is a subagent child session)
-  - cached usage summary used by `quota_summary`
-  - incremental aggregation cursor
+- Session chunks: `<opencode-data>/quota-sidebar-sessions/YYYY/MM/DD.json`
+  - per-session title state (`baseTitle`, `lastAppliedTitle`)
+  - `createdAt`
+  - `parentID` (when the session is a subagent child session)
+  - cached usage summary used by `quota_summary`, including session-level and provider-level `cacheBuckets` for cache coverage reporting
+  - incremental aggregation cursor
+
+Notes on cache coverage persistence:
+
+- Older cached usage written before `cacheBuckets` existed can only be approximated from top-level `cache_read` / `cache_write` totals.
+- In those legacy cases, mixed read-only + read-write cache traffic may be attributed to a single fallback bucket until the session is recomputed from messages.
 
 Example tree:
 
@@ -296,7 +303,7 @@ Other defaults:
 - When OpenCode exposes a long-context tier like `context_over_200k`, the plugin uses that premium rate for the whole request once `input > 200000`, matching OpenCode's current pricing schema.
 - `quota.providers` is the extensible per-adapter switch map.
 - If API Cost is `$0.00`, it usually means the model/provider has no pricing mapping in OpenCode at the moment, so equivalent API cost cannot be estimated.
-- Usage chunks cache both measured `cost` and computed `apiCost`. `quota_summary` (`/qday`, `/qweek`, `/qmonth`) usually reads those cached aggregates first, but a billing-cache version bump or missing/legacy API-cost data will trigger a rescan and persist refreshed values.
+- Usage chunks cache both measured `cost` and computed `apiCost`. `quota_summary` (`/qday`, `/qweek`, `/qmonth`) recomputes range totals from session messages so period filtering follows message completion time; refreshed full-session usage may then be persisted back into day chunks when billing-cache refresh is needed.
 
 ### Buzz provider example
 
@@ -319,7 +326,7 @@ The adapter also tolerates `https://buzzai.cc/v1`, but `https://buzzai.cc` is th
 With that setup, the sidebar/toast quota line will look like:
 
 ```text
-Buzz Balance CNY 10.17
+Buzz Balance ￥10.17
 ```
 
 ## Rendering examples
@@ -382,7 +389,7 @@ OpenAI
   5h 78% Rst 05:05
 Copilot
   Monthly 78% Rst 04-01
-Buzz Balance CNY 10.2
+Buzz Balance ￥10.2
 ```
 
 Balance-style quota:
@@ -394,7 +401,7 @@ RC Balance $260
 Buzz balance quota:
 
 ```text
-Buzz Balance CNY 10.17
+Buzz Balance ￥10.17
 ```
 
 Multi-detail quota (window + balance):
@@ -424,7 +431,7 @@ Quota is rendered inline as part of a single-line title:
 Mixed with Buzz balance:
 
 ```text
-<base> | Input ... | Output ... | OpenAI 5h 78%+ | Copilot Monthly 78% | Buzz Balance CNY 10.2
+<base> | Input ... | Output ... | OpenAI 5h 78%+ | Copilot Monthly 78% | Buzz Balance ￥10.2
 ```
 
 `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

@@ -88,7 +88,8 @@ export function cacheCoverageModeFromRates(rates) {
     return 'none';
 }
 export function calcEquivalentApiCostForMessage(message, rates) {
-    const effectiveRates = message.tokens.input > 200_000 && rates.contextOver200k
+    const effectiveRates = message.tokens.input + message.tokens.cache.read > 200_000 &&
+        rates.contextOver200k
         ? rates.contextOver200k
         : rates;
     // For providers that expose reasoning tokens separately, they are still

package/dist/format.js

@@ -1,4 +1,4 @@
-import { getCacheCoverageMetrics } from './usage.js';
+import { getCacheCoverageMetrics, getProviderCacheCoverageMetrics, } from './usage.js';
 import { canonicalProviderID, collapseQuotaSnapshots, displayShortLabel, quotaDisplayLabel, } from './quota_render.js';
 import { stripAnsi } from './title.js';
 /** M6 fix: handle negative, NaN, Infinity gracefully. */
@@ -129,10 +129,18 @@ function fitLine(value, width) {
     return `${head}~`;
 }
 function formatCurrency(value, currency) {
-    const safe = Number.isFinite(value) && value > 0 ? value : 0;
+    const safe = Number.isFinite(value) ? value : 0;
     const prefix = typeof currency === 'string' && currency ? currency : '$';
     if (safe === 0)
         return `${prefix}0.00`;
+    if (safe < 0) {
+        const abs = Math.abs(safe);
+        if (abs < 10)
+            return `-${prefix}${abs.toFixed(2)}`;
+        const one = abs.toFixed(1);
+        const trimmed = one.endsWith('.0') ? one.slice(0, -2) : one;
+        return `-${prefix}${trimmed}`;
+    }
     if (safe < 10)
         return `${prefix}${safe.toFixed(2)}`;
     const one = safe.toFixed(1);
@@ -153,6 +161,16 @@ function formatPercent(value, decimals = 1) {
     const pct = (safe * 100).toFixed(decimals);
     return `${pct.replace(/\.0+$/, '').replace(/(\.\d*[1-9])0+$/, '$1')}%`;
 }
+function formatQuotaPercent(value, options) {
+    const missing = options?.missing ?? '-';
+    if (value === undefined)
+        return missing;
+    if (!Number.isFinite(value) || value < 0)
+        return missing;
+    if (options?.rounded)
+        return `${Math.round(value)}%`;
+    return `${value.toFixed(options?.decimals ?? 1)}%`;
+}
 function alignPairs(pairs, indent = '  ') {
     if (pairs.length === 0)
         return [];
@@ -170,15 +188,19 @@ function alignPairs(pairs, indent = '  ') {
 }
 function compactQuotaInline(quota) {
     const label = sanitizeLine(quotaDisplayLabel(quota));
-    if (quota.status !== 'ok')
-        return label;
+    if (quota.status !== 'ok') {
+        if (quota.status === 'error')
+            return `${label} Remaining ?`;
+        return `${label} ${sanitizeLine(quota.status)}`;
+    }
     if (quota.windows && quota.windows.length > 0) {
         const first = quota.windows[0];
         const showPercent = first.showPercent !== false;
         const firstLabel = sanitizeLine(first.label || '');
-        const pct = first.remainingPercent === undefined
-            ? undefined
-            : `${Math.round(first.remainingPercent)}%`;
+        const pct = formatQuotaPercent(first.remainingPercent, {
+            rounded: true,
+            missing: '',
+        });
         const summary = showPercent
             ? [firstLabel, pct].filter(Boolean).join(' ')
             : firstLabel.replace(/^Daily\s+/i, '') || firstLabel;
@@ -189,8 +211,12 @@ function compactQuotaInline(quota) {
     if (quota.balance) {
         return `${label} Balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`;
     }
-    if (quota.remainingPercent !== undefined) {
-        return `${label} ${Math.round(quota.remainingPercent)}%`;
+    const singlePercent = formatQuotaPercent(quota.remainingPercent, {
+        rounded: true,
+        missing: '',
+    });
+    if (singlePercent) {
+        return `${label} ${singlePercent}`;
     }
     return label;
 }
@@ -238,13 +264,16 @@ function renderSingleLineTitle(baseTitle, usage, quotas, config, width) {
  */
 export function renderSidebarTitle(baseTitle, usage, quotas, config) {
     const width = Math.max(8, Math.floor(config.sidebar.width || 36));
-    const safeBaseTitle = stripAnsi(baseTitle || 'Session').split(/\r?\n/, 1)[0] || 'Session';
+    const safeBaseTitle = stripAnsi(baseTitle || 'Session') || 'Session';
     if (config.sidebar.multilineTitle !== true) {
-        return renderSingleLineTitle(safeBaseTitle, usage, quotas, config, width);
+        const singleLineBase = safeBaseTitle.split(/\r?\n/, 1)[0] || 'Session';
+        return renderSingleLineTitle(singleLineBase, usage, quotas, config, width);
     }
     const cacheMetrics = getCacheCoverageMetrics(usage);
     const lines = [];
-    lines.push(fitLine(safeBaseTitle, width));
+    for (const line of safeBaseTitle.split(/\r?\n/)) {
+        lines.push(fitLine(line || 'Session', width));
+    }
     lines.push('');
     // Input / Output line
     const io = `Input ${sidebarNumber(usage.input)}  Output ${sidebarNumber(usage.output)}`;
@@ -337,9 +366,7 @@ function compactQuotaWide(quota, labelWidth = 0, options) {
         : undefined;
     const renderWindow = (win) => {
         const showPercent = win.showPercent !== false;
-        const pct = win.remainingPercent === undefined
-            ? '?'
-            : `${Math.round(win.remainingPercent)}%`;
+        const pct = formatQuotaPercent(win.remainingPercent, { rounded: true });
         const parts = win.label
             ? showPercent
                 ? [sanitizeLine(win.label), pct]
@@ -373,9 +400,7 @@ function compactQuotaWide(quota, labelWidth = 0, options) {
         return maybeBreak(balanceText, [balanceText]);
     }
     // Fallback: single value from top-level remainingPercent
-    const percent = quota.remainingPercent === undefined
-        ? '?'
-        : `${Math.round(quota.remainingPercent)}%`;
+    const percent = formatQuotaPercent(quota.remainingPercent, { rounded: true });
     const reset = compactReset(quota.resetAt, 'Rst');
     const fallbackText = `Remaining ${percent}${reset ? ` Rst ${reset}` : ''}`;
     return maybeBreak(fallbackText, [fallbackText]);
@@ -409,9 +434,6 @@ function compactReset(iso, resetLabel, windowLabel) {
             return hhmm;
         return `${two(value.getMonth() + 1)}-${two(value.getDate())} ${hhmm}`;
     }
-    if (sameDay) {
-        return `${two(value.getHours())}:${two(value.getMinutes())}`;
-    }
     return `${two(value.getMonth() + 1)}-${two(value.getDate())}`;
 }
 function dateLine(iso) {
@@ -450,6 +472,7 @@ export function renderMarkdownReport(period, usage, quotas, options) {
     const measuredCostCell = (providerID, cost) => {
         const canonical = canonicalProviderID(providerID);
         const isSubscription = canonical === 'openai' ||
+            canonical === 'anthropic' ||
             canonical === 'github-copilot' ||
             rightCodeSubscriptionProviderIDs.has(providerID);
         if (isSubscription)
@@ -459,6 +482,7 @@ export function renderMarkdownReport(period, usage, quotas, options) {
     const isSubscriptionMeasuredProvider = (providerID) => {
         const canonical = canonicalProviderID(providerID);
         return (canonical === 'openai' ||
+            canonical === 'anthropic' ||
             canonical === 'github-copilot' ||
             rightCodeSubscriptionProviderIDs.has(providerID));
     };
@@ -486,39 +510,104 @@ export function renderMarkdownReport(period, usage, quotas, options) {
             return '-';
         return formatApiCostValue(usage.apiCost);
     };
-    const providerRows = Object.values(usage.providers)
-        .sort((a, b) => b.total - a.total)
+    const cacheCoverageCell = (provider) => {
+        const metrics = getProviderCacheCoverageMetrics(provider);
+        return metrics.cacheCoverage !== undefined
+            ? formatPercent(metrics.cacheCoverage, 1)
+            : '-';
+    };
+    const cacheReadCoverageCell = (provider) => {
+        const metrics = getProviderCacheCoverageMetrics(provider);
+        return metrics.cacheReadCoverage !== undefined
+            ? formatPercent(metrics.cacheReadCoverage, 1)
+            : '-';
+    };
+    const providerEntries = Object.values(usage.providers).sort((a, b) => b.total - a.total);
+    const highlightLines = () => {
+        const lines = [];
+        const providerLabel = (providerID) => quotaDisplayLabel({
+            providerID,
+            label: providerID,
+            status: 'ok',
+            checkedAt: 0,
+        });
+        const topApiCost = providerEntries
+            .filter((provider) => provider.apiCost > 0)
+            .sort((a, b) => b.apiCost - a.apiCost)[0];
+        if (topApiCost) {
+            lines.push(`- Top API cost: ${quotaDisplayLabel({
+                providerID: topApiCost.providerID,
+                label: topApiCost.providerID,
+                status: 'ok',
+                checkedAt: 0,
+            })} (${formatUsd(topApiCost.apiCost)})`);
+        }
+        const bestCacheCoverage = providerEntries
+            .map((provider) => ({
+            provider,
+            value: getProviderCacheCoverageMetrics(provider).cacheCoverage,
+        }))
+            .filter((entry) => entry.value !== undefined)
+            .sort((a, b) => b.value - a.value)[0];
+        if (bestCacheCoverage) {
+            lines.push(`- Best Cache Coverage: ${providerLabel(bestCacheCoverage.provider.providerID)} (${formatPercent(bestCacheCoverage.value, 1)})`);
+        }
+        const bestCacheReadCoverage = providerEntries
+            .map((provider) => ({
+            provider,
+            value: getProviderCacheCoverageMetrics(provider).cacheReadCoverage,
+        }))
+            .filter((entry) => entry.value !== undefined)
+            .sort((a, b) => b.value - a.value)[0];
+        if (bestCacheReadCoverage) {
+            lines.push(`- Best Cache Read Coverage: ${providerLabel(bestCacheReadCoverage.provider.providerID)} (${formatPercent(bestCacheReadCoverage.value, 1)})`);
+        }
+        const highestMeasured = providerEntries
+            .filter((provider) => measuredCostCell(provider.providerID, provider.cost) !== '-')
+            .sort((a, b) => b.cost - a.cost)[0];
+        if (highestMeasured && highestMeasured.cost > 0) {
+            lines.push(`- Highest measured cost: ${providerLabel(highestMeasured.providerID)} (${formatUsd(highestMeasured.cost)})`);
+        }
+        return lines;
+    };
+    const providerRows = providerEntries
         .map((provider) => {
         const providerID = mdCell(provider.providerID);
         return showCost
-            ? `| ${providerID} | ${shortNumber(provider.input)} | ${shortNumber(provider.output)} | ${shortNumber(provider.cacheRead + provider.cacheWrite)} | ${shortNumber(provider.total)} | ${measuredCostCell(provider.providerID, provider.cost)} | ${apiCostCell(provider.providerID, provider.apiCost)} |`
+            ? `| ${providerID} | ${shortNumber(provider.input)} | ${shortNumber(provider.output)} | ${shortNumber(provider.cacheRead + provider.cacheWrite)} | ${shortNumber(provider.total)} | ${cacheCoverageCell(provider)} | ${cacheReadCoverageCell(provider)} | ${measuredCostCell(provider.providerID, provider.cost)} | ${apiCostCell(provider.providerID, provider.apiCost)} |`
             : `| ${providerID} | ${shortNumber(provider.input)} | ${shortNumber(provider.output)} | ${shortNumber(provider.cacheRead + provider.cacheWrite)} | ${shortNumber(provider.total)} |`;
     });
     const quotaLines = collapseQuotaSnapshots(quotas).flatMap((quota) => {
+        const displayLabel = quotaDisplayLabel(quota);
         // Multi-window detail
         if (quota.windows && quota.windows.length > 0 && quota.status === 'ok') {
-            return quota.windows.map((win) => {
+            const windowLines = quota.windows.map((win) => {
                 if (win.showPercent === false) {
                     const winLabel = win.label ? ` (${win.label})` : '';
-                    return mdCell(`- ${quota.label}${winLabel}: ${quota.status} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}`);
+                    return mdCell(`- ${displayLabel}${winLabel}: ${quota.status} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}`);
                 }
-                const remaining = win.remainingPercent === undefined
-                    ? '-'
-                    : `${win.remainingPercent.toFixed(1)}%`;
+                const remaining = formatQuotaPercent(win.remainingPercent);
                 const winLabel = win.label ? ` (${win.label})` : '';
-                return mdCell(`- ${quota.label}${winLabel}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}`);
+                return mdCell(`- ${displayLabel}${winLabel}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}`);
             });
+            if (quota.balance) {
+                windowLines.push(mdCell(`- ${displayLabel}: ${quota.status} | balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`));
+            }
+            return windowLines;
         }
         if (quota.status === 'ok' && quota.balance) {
             return [
-                mdCell(`- ${quota.label}: ${quota.status} | balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`),
+                mdCell(`- ${displayLabel}: ${quota.status} | balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`),
             ];
         }
-        const remaining = quota.remainingPercent === undefined
-            ? '-'
-            : `${quota.remainingPercent.toFixed(1)}%`;
+        if (quota.status !== 'ok') {
+            return [
+                mdCell(`- ${displayLabel}: ${quota.status}${quota.note ? ` | ${quota.note}` : ''}`),
+            ];
+        }
+        const remaining = formatQuotaPercent(quota.remainingPercent);
         return [
-            mdCell(`- ${quota.label}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(quota.resetAt)}${quota.note ? ` | ${quota.note}` : ''}`),
+            mdCell(`- ${displayLabel}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(quota.resetAt)}${quota.note ? ` | ${quota.note}` : ''}`),
         ];
     });
     return [
@@ -541,17 +630,20 @@ export function renderMarkdownReport(period, usage, quotas, options) {
                 `- API cost: ${apiCostSummaryValue()}`,
             ]
             : []),
+        ...(highlightLines().length > 0
+            ? ['', '### Highlights', ...highlightLines()]
+            : []),
         '',
         '### Usage by Provider',
         showCost
-            ? '| Provider | Input | Output | Cache | Total | Measured Cost | API Cost |'
+            ? '| Provider | Input | Output | Cache | Total | Cache Coverage | Cache Read Coverage | Measured Cost | API Cost |'
             : '| Provider | Input | Output | Cache | Total |',
         showCost
-            ? '|---|---:|---:|---:|---:|---:|---:|'
+            ? '|---|---:|---:|---:|---:|---:|---:|---:|---:|'
             : '|---|---:|---:|---:|---:|',
         ...(providerRows.length
             ? providerRows
-            : [showCost ? '| - | - | - | - | - | - | - |' : '| - | - | - | - | - |']),
+            : [showCost ? '| - | - | - | - | - | - | - | - | - |' : '| - | - | - | - | - |']),
         '',
         '### Subscription Quota',
         ...(quotaLines.length
@@ -595,14 +687,6 @@ export function renderToastMessage(period, usage, quotas, options) {
             value: formatPercent(cacheMetrics.cacheReadCoverage, 1),
         });
     }
-    if (showCost) {
-        if (usage.apiCost > 0) {
-            tokenPairs.push({
-                label: 'API Cost',
-                value: formatApiCostValue(usage.apiCost),
-            });
-        }
-    }
     lines.push(...alignPairs(tokenPairs).map((line) => fitLine(line, width)));
     if (showCost) {
         const costPairs = Object.values(usage.providers)
@@ -623,14 +707,35 @@ export function renderToastMessage(period, usage, quotas, options) {
             lines.push(fitLine(hasAnyUsage ? '  N/A (Copilot)' : '  -', width));
         }
     }
+    const providerCachePairs = Object.values(usage.providers)
+        .map((provider) => {
+        const metrics = getProviderCacheCoverageMetrics(provider);
+        const parts = [];
+        if (metrics.cacheCoverage !== undefined) {
+            parts.push(`Cov ${formatPercent(metrics.cacheCoverage, 1)}`);
+        }
+        if (metrics.cacheReadCoverage !== undefined) {
+            parts.push(`Read ${formatPercent(metrics.cacheReadCoverage, 1)}`);
+        }
+        if (parts.length === 0)
+            return undefined;
+        return {
+            label: displayShortLabel(provider.providerID),
+            value: parts.join('  '),
+        };
+    })
+        .filter((item) => Boolean(item));
+    if (providerCachePairs.length > 0) {
+        lines.push('');
+        lines.push(fitLine('Provider Cache', width));
+        lines.push(...alignPairs(providerCachePairs).map((line) => fitLine(line, width)));
+    }
     const quotaPairs = collapseQuotaSnapshots(quotas).flatMap((item) => {
         if (item.status === 'ok') {
             if (item.windows && item.windows.length > 0) {
                 const pairs = item.windows.map((win, idx) => {
                     const showPercent = win.showPercent !== false;
-                    const pct = win.remainingPercent === undefined
-                        ? '-'
-                        : `${win.remainingPercent.toFixed(1)}%`;
+                    const pct = formatQuotaPercent(win.remainingPercent);
                     const reset = compactReset(win.resetAt, win.resetLabel, win.label);
                     const parts = [win.label];
                     if (showPercent)
@@ -658,9 +763,7 @@ export function renderToastMessage(period, usage, quotas, options) {
                     },
                 ];
             }
-            const percent = item.remainingPercent === undefined
-                ? '-'
-                : `${item.remainingPercent.toFixed(1)}%`;
+            const percent = formatQuotaPercent(item.remainingPercent);
             const reset = compactReset(item.resetAt, 'Rst');
             return [
                 {

package/dist/index.js

@@ -12,6 +12,8 @@ import { createPersistenceScheduler } from './persistence.js';
 import { createQuotaService } from './quota_service.js';
 import { createUsageService } from './usage_service.js';
 import { createTitleApplicator } from './title_apply.js';
+const SHUTDOWN_HOOK_KEY = Symbol.for('opencode-quota-sidebar.shutdown-hook');
+const SHUTDOWN_CALLBACKS_KEY = Symbol.for('opencode-quota-sidebar.shutdown-callbacks');
 export async function QuotaSidebarPlugin(input) {
     const quotaRuntime = createQuotaRuntime();
     const configDir = resolveOpencodeConfigDir();
@@ -29,7 +31,7 @@ export async function QuotaSidebarPlugin(input) {
     const authPath = authFilePath(dataDir);
     const state = await loadState(statePath);
     // M2: evict old sessions on startup
-    evictOldSessions(state, config.retentionDays);
+    const evictedOnStartup = evictOldSessions(state, config.retentionDays);
     const persistence = createPersistenceScheduler({
         statePath,
         state,
@@ -38,6 +40,9 @@ export async function QuotaSidebarPlugin(input) {
     const markDirty = persistence.markDirty;
     const scheduleSave = persistence.scheduleSave;
     const flushSave = persistence.flushSave;
+    if (evictedOnStartup > 0) {
+        scheduleSave();
+    }
     const RESTORE_TITLE_CONCURRENCY = 5;
     const quotaService = createQuotaService({
         quotaRuntime,
@@ -161,11 +166,62 @@ export async function QuotaSidebarPlugin(input) {
         restoreConcurrency: RESTORE_TITLE_CONCURRENCY,
     });
     const titleRefresh = createTitleRefreshScheduler({
-        apply: titleApplicator.applyTitle,
+        apply: async (sessionID) => {
+            await titleApplicator.applyTitle(sessionID);
+        },
         onError: swallow('titleRefresh'),
     });
     scheduleTitleRefresh = titleRefresh.schedule;
     const restoreAllVisibleTitles = titleApplicator.restoreAllVisibleTitles;
+    const refreshAllTouchedTitles = titleApplicator.refreshAllTouchedTitles;
+    const refreshAllVisibleTitles = titleApplicator.refreshAllVisibleTitles;
+    let startupTitleWork = Promise.resolve();
+    const runStartupRestore = async (attempt = 0) => {
+        const result = await restoreAllVisibleTitles({
+            abortIfEnabled: config.sidebar.enabled,
+        });
+        if (result.restored === result.attempted)
+            return;
+        debug(`startup restore incomplete: restored ${result.restored}/${result.attempted} touched titles while display mode remains OFF`);
+        if (state.titleEnabled || config.sidebar.enabled === false)
+            return;
+        if (attempt >= 2)
+            return;
+        await new Promise((resolve) => setTimeout(resolve, 1_000));
+        await runStartupRestore(attempt + 1);
+    };
+    if (!state.titleEnabled || !config.sidebar.enabled) {
+        startupTitleWork = runStartupRestore().catch(swallow('startup:restoreAllVisibleTitles'));
+    }
+    else {
+        startupTitleWork = refreshAllTouchedTitles()
+            .then(() => undefined)
+            .catch(swallow('startup:refreshAllTouchedTitles'));
+    }
+    const shutdown = async () => {
+        await Promise.race([
+            startupTitleWork,
+            new Promise((resolve) => setTimeout(resolve, 5_000)),
+        ]).catch(swallow('shutdown:startupTitleWork'));
+        await titleRefresh.waitForQuiescence().catch(swallow('shutdown:titleQuiescence'));
+        await flushSave().catch(swallow('shutdown:flushSave'));
+    };
+    const processWithHook = process;
+    const shutdownCallbacks = (processWithHook[SHUTDOWN_CALLBACKS_KEY] ||= new Set());
+    shutdownCallbacks.add(shutdown);
+    if (!processWithHook[SHUTDOWN_HOOK_KEY]) {
+        processWithHook[SHUTDOWN_HOOK_KEY] = true;
+        process.once('beforeExit', () => {
+            void Promise.allSettled(Array.from(shutdownCallbacks).map((callback) => callback()));
+        });
+        for (const signal of ['SIGINT', 'SIGTERM']) {
+            process.once(signal, () => {
+                void Promise.allSettled(Array.from(shutdownCallbacks).map((callback) => callback())).finally(() => {
+                    process.kill(process.pid, signal);
+                });
+            });
+        }
+    }
     const showToast = async (period, message) => {
         await input.client.tui
             .showToast({
@@ -217,10 +273,16 @@ export async function QuotaSidebarPlugin(input) {
             titleRefresh.cancel(session.id);
             const dateKey = state.sessionDateMap[session.id] ||
                 dateKeyFromTimestamp(session.time.created);
+            state.deletedSessionDateMap[session.id] = dateKey;
             delete state.sessions[session.id];
             delete state.sessionDateMap[session.id];
+            markDirty(dateKey);
             scheduleSave();
-            await deleteSessionFromDayChunk(statePath, session.id, dateKey).catch(swallow('deleteSessionFromDayChunk'));
+            const deletedFromChunk = await deleteSessionFromDayChunk(statePath, session.id, dateKey).catch(swallow('deleteSessionFromDayChunk'));
+            if (deletedFromChunk) {
+                delete state.deletedSessionDateMap[session.id];
+                scheduleSave();
+            }
             if (config.sidebar.includeChildren && session.parentID) {
                 titleRefresh.schedule(session.parentID, 0);
             }
@@ -250,14 +312,25 @@ export async function QuotaSidebarPlugin(input) {
                 state.titleEnabled = enabled;
             },
             scheduleSave,
+            flushSave,
+            waitForStartupTitleWork: () => startupTitleWork,
             refreshSessionTitle: (sessionID, delay) => titleRefresh.schedule(sessionID, delay ?? 250),
+            cancelAllTitleRefreshes: () => titleRefresh.cancelAll(),
+            flushScheduledTitleRefreshes: () => titleRefresh.flushScheduled(),
+            waitForTitleRefreshIdle: () => titleRefresh.waitForIdle(),
+            waitForTitleRefreshQuiescence: () => titleRefresh.waitForQuiescence(),
             restoreAllVisibleTitles,
+            refreshAllTouchedTitles,
+            refreshAllVisibleTitles,
             showToast,
             summarizeForTool,
             getQuotaSnapshots,
             renderMarkdownReport,
             renderToastMessage,
-            config,
+            config: {
+                sidebar: config.sidebar,
+                sidebarEnabled: config.sidebar.enabled,
+            },
         }),
     };
 }

package/dist/persistence.js

@@ -4,6 +4,17 @@ export function createPersistenceScheduler(deps) {
     let stateDirty = false;
     let saveTimer;
     let saveInFlight = Promise.resolve();
+    const scheduleRetry = (delayMs = 1_000) => {
+        if (saveTimer)
+            return;
+        saveTimer = setTimeout(() => {
+            saveTimer = undefined;
+            void persist().catch((error) => {
+                debug(`persistState retry failed: ${String(error)}`);
+                scheduleRetry(Math.min(delayMs * 2, 10_000));
+            });
+        }, delayMs);
+    };
     /**
      * Capture and delete specific dirty keys instead of clearing the whole set.
      * Keys added between capture and write completion are preserved.
@@ -34,7 +45,10 @@ export function createPersistenceScheduler(deps) {
             clearTimeout(saveTimer);
         saveTimer = setTimeout(() => {
             saveTimer = undefined;
-            void persist().catch(swallow('persistState:save'));
+            void persist().catch((error) => {
+                swallow('persistState:save')(error);
+                scheduleRetry();
+            });
         }, 200);
     };
     const flushSave = async () => {

package/dist/quota.js

@@ -6,14 +6,12 @@ function resolveContext(providerID, providerOptions) {
     return { providerID, providerOptions };
 }
 function authCandidates(providerID, normalizedProviderID, adapterID) {
-    const candidates = new Set([
-        providerID,
-        normalizedProviderID,
-        adapterID,
-    ]);
+    const candidates = new Set([providerID]);
     if (adapterID === 'github-copilot') {
         candidates.add('github-copilot-enterprise');
     }
+    candidates.add(normalizedProviderID);
+    candidates.add(adapterID);
     return [...candidates];
 }
 function pickAuth(providerID, normalizedProviderID, adapterID, authMap) {