@leo000001/opencode-quota-sidebar 3.0.10 → 4.0.2

package/dist/format.d.ts

@@ -1,4 +1,5 @@
 import type { QuotaSidebarConfig, QuotaSnapshot } from './types.js';
+import type { HistoryUsageResult } from './usage_service.js';
 import { type UsageSummary } from './usage.js';
 export type TitleView = 'multiline' | 'compact';
 /**
@@ -31,6 +32,9 @@ export declare function renderSidebarQuotaLineGroups(quotas: QuotaSnapshot[], co
     quota: QuotaSnapshot;
     lines: string[];
 }[];
+export declare function renderHistoryMarkdownReport(result: HistoryUsageResult, quotas: QuotaSnapshot[], options?: {
+    showCost?: boolean;
+}): string;
 export declare function renderMarkdownReport(period: string, usage: UsageSummary, quotas: QuotaSnapshot[], options?: {
     showCost?: boolean;
 }): string;

package/dist/format.js

@@ -223,8 +223,6 @@ function compactProviderLabel(quota) {
         return 'MiniMax';
     if (canonical === 'rightcode')
         return 'RC';
-    if (canonical === 'xyai')
-        return 'XYAI';
     return sanitizeLine(quotaDisplayLabel(quota));
 }
 function compactWindowToken(label) {
@@ -267,6 +265,10 @@ function compactQuotaPercentToken(label, percent) {
     }
     if (/^cowork\s+7d$/i.test(safe))
         return rounded ? `Co7d${rounded}` : 'Co7d';
+    if (/^spark\s+5h$/i.test(safe))
+        return rounded ? `Sk5h${rounded}` : 'Sk5h';
+    if (/^spark\s+weekly$/i.test(safe))
+        return rounded ? `SkW${rounded}` : 'SkW';
     const token = compactWindowToken(safe).replace(/\s+/g, '');
     if (!rounded)
         return token;
@@ -328,6 +330,12 @@ function compactDesktopCurrencyValue(value, currency) {
         return rendered.replace(/^\$/, '');
     return rendered;
 }
+function compactQuotaStaleToken(quota) {
+    return quota.stale ? 'St' : undefined;
+}
+function verboseQuotaStaleText(quota) {
+    return quota.stale ? 'stale' : undefined;
+}
 function compactDesktopQuotaSegment(quota) {
     const label = compactProviderLabel(quota);
     if (quota.status !== 'ok') {
@@ -354,10 +362,15 @@ function compactDesktopQuotaSegment(quota) {
         const balanceToken = `B${compactDesktopCurrencyValue(quota.balance.amount, quota.balance.currency)}`;
         parts.push(balanceToken);
     }
+    const staleToken = compactQuotaStaleToken(quota);
+    if (staleToken)
+        parts.push(staleToken);
     return [label, ...parts].filter(Boolean).join(' ');
 }
 function renderDesktopCompactTitle(baseTitle, usage, quotas, config, _width) {
-    const visibleQuotas = collapseQuotaSnapshots(quotas).filter((q) => ['ok', 'error', 'unsupported', 'unavailable'].includes(q.status));
+    const visibleQuotas = config.sidebar.showQuota
+        ? collapseQuotaSnapshots(quotas).filter((q) => ['ok', 'error', 'unsupported', 'unavailable'].includes(q.status))
+        : [];
     const selectedProviderIDs = new Set(selectDesktopCompactProviderIDs(usage, config));
     const quotaSegments = visibleQuotas
         .filter((quota) => selectedProviderIDs.has(quota.providerID))
@@ -396,15 +409,22 @@ function usageDetailLines(usage, cacheMetrics, options) {
         `I${numberToken(usage.input)}`,
         `O${numberToken(usage.output)}`,
     ]);
-    const secondary = [];
+    const secondaryGroups = [];
+    const coverageTokens = [];
+    if (cacheMetrics.cachedRatio !== undefined) {
+        coverageTokens.push(`Cd ${formatPercent(cacheMetrics.cachedRatio, 0)}`);
+    }
+    if (coverageTokens.length > 0)
+        secondaryGroups.push(coverageTokens);
+    const cacheTokens = [];
     const pushCacheRead = () => {
         if (usage.cacheRead > 0) {
-            secondary.push(`CR${numberToken(usage.cacheRead)}`);
+            cacheTokens.push(`R${numberToken(usage.cacheRead)}`);
         }
     };
     const pushCacheWrite = () => {
         if (usage.cacheWrite > 0) {
-            secondary.push(`CW${numberToken(usage.cacheWrite)}`);
+            cacheTokens.push(`W${numberToken(usage.cacheWrite)}`);
         }
     };
     if (options.cacheReadFirst) {
@@ -415,11 +435,22 @@ function usageDetailLines(usage, cacheMetrics, options) {
         pushCacheWrite();
         pushCacheRead();
     }
-    if (cacheMetrics.cachedRatio !== undefined) {
-        secondary.push(`Cd${formatPercent(cacheMetrics.cachedRatio, 0)}`);
+    if (cacheTokens.length > 0) {
+        if (coverageTokens.length > 0) {
+            const combined = [...coverageTokens, ...cacheTokens].join(' ');
+            if (fitsLine(combined, width)) {
+                secondaryGroups.length = 0;
+                secondaryGroups.push([...coverageTokens, ...cacheTokens]);
+            }
+            else {
+                secondaryGroups.push(cacheTokens);
+            }
+        }
+        else {
+            secondaryGroups.push(cacheTokens);
+        }
     }
-    if (secondary.length > 0)
-        groups.push(secondary);
+    groups.push(...secondaryGroups);
     if (options.showCost && usage.apiCost > 0) {
         groups.push([costToken(usage.apiCost)]);
     }
@@ -440,6 +471,65 @@ function usageDetailLines(usage, cacheMetrics, options) {
     }
     return packed;
 }
+function packUsageGroups(groups, width) {
+    const packed = [];
+    for (const group of groups) {
+        let current = '';
+        for (const token of group) {
+            const candidate = current ? `${current} ${token}` : token;
+            if (!current || fitsLine(candidate, width)) {
+                current = candidate;
+                continue;
+            }
+            packed.push(current);
+            current = token;
+        }
+        if (current)
+            packed.push(current);
+    }
+    return packed;
+}
+function readableSidebarUsageLines(usage, cacheMetrics, width, showCost) {
+    const groups = [
+        [
+            `Req ${shortNumber(usage.assistantMessages, 1)}`,
+            `In ${panelNumber(usage.input)}`,
+            `Out ${panelNumber(usage.output)}`,
+        ],
+    ];
+    if (cacheMetrics.cachedRatio !== undefined) {
+        const cacheTokens = [
+            `Cached ${formatPercent(cacheMetrics.cachedRatio, 0)}`,
+        ];
+        if (usage.cacheRead > 0)
+            cacheTokens.push(`Read ${panelNumber(usage.cacheRead)}`);
+        if (usage.cacheWrite > 0)
+            cacheTokens.push(`Write ${panelNumber(usage.cacheWrite)}`);
+        groups.push(cacheTokens);
+    }
+    else {
+        const cacheTokens = [];
+        if (usage.cacheRead > 0)
+            cacheTokens.push(`Cache Read ${panelNumber(usage.cacheRead)}`);
+        if (usage.cacheWrite > 0)
+            cacheTokens.push(`Write ${panelNumber(usage.cacheWrite)}`);
+        if (cacheTokens.length > 0)
+            groups.push(cacheTokens);
+    }
+    const summaryTokens = [];
+    if (showCost && usage.apiCost > 0) {
+        summaryTokens.push(`Est ${formatApiCostValue(usage.apiCost)}`);
+    }
+    if (summaryTokens.length > 0)
+        groups.push(summaryTokens);
+    const allTokens = groups.flat();
+    if (allTokens.some((token) => !fitsLine(token, width)))
+        return undefined;
+    const packed = packUsageGroups(groups, width);
+    if (packed.length > 4)
+        return undefined;
+    return packed;
+}
 function formatQuotaPercent(value, options) {
     const missing = options?.missing ?? '-';
     if (value === undefined)
@@ -467,6 +557,7 @@ function alignPairs(pairs, indent = '  ') {
 }
 function compactQuotaInline(quota) {
     const label = sanitizeLine(quotaDisplayLabel(quota));
+    const staleToken = compactQuotaStaleToken(quota);
     if (quota.status !== 'ok') {
         if (quota.status === 'error')
             return `${label} Remaining ?`;
@@ -485,19 +576,19 @@ function compactQuotaInline(quota) {
             : firstLabel.replace(/^Daily\s+/i, '') || firstLabel;
         const hasMore = quota.windows.length > 1 ||
             (quota.balance !== undefined && !summary.includes('Balance '));
-        return `${label}${summary ? ` ${summary}` : ''}${hasMore ? '+' : ''}`;
+        return `${label}${summary ? ` ${summary}` : ''}${hasMore ? '+' : ''}${staleToken ? ` ${staleToken}` : ''}`;
     }
     if (quota.balance) {
-        return `${label} Balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`;
+        return `${label} Balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}${staleToken ? ` ${staleToken}` : ''}`;
     }
     const singlePercent = formatQuotaPercent(quota.remainingPercent, {
         rounded: true,
         missing: '',
     });
     if (singlePercent) {
-        return `${label} ${singlePercent}`;
+        return `${label} ${singlePercent}${staleToken ? ` ${staleToken}` : ''}`;
     }
-    return label;
+    return `${label}${staleToken ? ` ${staleToken}` : ''}`;
 }
 function renderSingleLineTitle(baseTitle, usage, quotas, config, width) {
     const baseBudget = Math.min(16, Math.max(8, Math.floor(width * 0.35)));
@@ -597,9 +688,13 @@ export function renderSidebarContextLine(tokens, percent, width) {
 export function renderSidebarUsageLines(usage, config, options) {
     const width = Math.max(8, Math.floor(config.sidebar.width || 36));
     const cacheMetrics = getCacheCoverageMetrics(usage);
+    const showCost = options?.showCost ?? config.sidebar.showCost;
+    const readable = readableSidebarUsageLines(usage, cacheMetrics, width, showCost);
+    if (readable)
+        return readable.map((line) => fitLine(line, width));
     return usageDetailLines(usage, cacheMetrics, {
         width,
-        showCost: options?.showCost ?? config.sidebar.showCost,
+        showCost,
         numberToken: panelNumber,
         costToken: (value) => `Est ${formatApiCostValue(value)}`,
         cacheReadFirst: true,
@@ -711,6 +806,9 @@ function compactQuotaWide(quota, labelWidth = 0, options) {
             const tokens = [...compactTokens];
             if (balanceText)
                 tokens.push(balanceText);
+            const staleToken = compactQuotaStaleToken(quota);
+            if (staleToken)
+                tokens.push(staleToken);
             return packInlineTokens(label, tokens, width, ' '.repeat(stringCellWidth(label) + 1));
         }
         // Keep a unified wrapped layout for providers that have multiple detail
@@ -724,16 +822,22 @@ function compactQuotaWide(quota, labelWidth = 0, options) {
         return maybeBreak(single, [single]);
     }
     if (balanceText) {
-        return maybeBreak(balanceText, [balanceText]);
+        const staleText = verboseQuotaStaleText(quota);
+        const detail = staleText ? `${balanceText} ${staleText}` : balanceText;
+        return maybeBreak(detail, [detail]);
     }
     // Fallback: single value from top-level remainingPercent
     const percent = formatQuotaPercent(quota.remainingPercent, { rounded: true });
     const reset = compactReset(quota.resetAt, 'Rst');
     const fallbackText = compactDetails
-        ? [`R${percent.replace(/%$/, '')}`, reset ? `R${reset}` : undefined]
+        ? [
+            `R${percent.replace(/%$/, '')}`,
+            reset ? `R${reset}` : undefined,
+            compactQuotaStaleToken(quota),
+        ]
             .filter(Boolean)
             .join(' ')
-        : `Remaining ${percent}${reset ? ` Rst ${reset}` : ''}`;
+        : `Remaining ${percent}${reset ? ` Rst ${reset}` : ''}${verboseQuotaStaleText(quota) ? ` ${verboseQuotaStaleText(quota)}` : ''}`;
     return maybeBreak(fallbackText, [fallbackText]);
 }
 function compactCountdown(remainingMs) {
@@ -817,6 +921,238 @@ function periodLabel(period) {
         return 'This Month';
     return 'Current Session';
 }
+function historyPeriodLabel(period) {
+    if (period === 'day')
+        return 'Daily';
+    if (period === 'week')
+        return 'Weekly';
+    if (period === 'month')
+        return 'Monthly';
+    return 'Session';
+}
+function historyProviderLabel(providerID) {
+    return quotaDisplayLabel({
+        providerID,
+        label: providerID,
+        status: 'ok',
+        checkedAt: 0,
+    });
+}
+function historyMdCell(value) {
+    return sanitizeLine(value).replace(/\|/g, '\\|');
+}
+function formatDelta(current, previous) {
+    if (previous === undefined)
+        return 'n/a';
+    if (!Number.isFinite(previous) || previous < 0)
+        return 'n/a';
+    if (previous === 0)
+        return current === 0 ? 'flat' : 'new';
+    const delta = ((current - previous) / previous) * 100;
+    if (!Number.isFinite(delta))
+        return 'n/a';
+    const abs = Math.abs(delta);
+    const rounded = (abs >= 10 ? delta.toFixed(0) : delta.toFixed(1)).replace(/\.0$/, '');
+    return `${delta > 0 ? '+' : ''}${rounded}%`;
+}
+function currentHistoryRow(result) {
+    return ([...result.rows].reverse().find((row) => row.range.isCurrent) ||
+        result.rows.at(-1));
+}
+function previousHistoryRow(result) {
+    const current = currentHistoryRow(result);
+    if (!current)
+        return undefined;
+    const index = result.rows.indexOf(current);
+    if (index <= 0)
+        return undefined;
+    return result.rows[index - 1];
+}
+function historyPeakRow(result, pick) {
+    let peak;
+    let peakValue = Number.NEGATIVE_INFINITY;
+    for (const row of result.rows) {
+        const value = pick(row);
+        if (value > peakValue) {
+            peak = row;
+            peakValue = value;
+        }
+    }
+    return peak;
+}
+function renderHistoryTotalsTable(result, options) {
+    const rows = result.rows;
+    const cacheTotal = getCacheCoverageMetrics(result.total).cachedRatio;
+    const cacheValues = rows
+        .map((row) => getCacheCoverageMetrics(row.usage).cachedRatio)
+        .filter((value) => value !== undefined);
+    const cacheAverage = cacheValues.length > 0
+        ? cacheValues.reduce((sum, value) => sum + value, 0) / cacheValues.length
+        : undefined;
+    const metricRows = [
+        {
+            label: 'Requests',
+            total: shortNumber(result.total.assistantMessages),
+            average: rows.length
+                ? shortNumber(result.total.assistantMessages / rows.length)
+                : '-',
+        },
+        {
+            label: 'Total Tokens',
+            total: shortNumber(result.total.total),
+            average: rows.length
+                ? shortNumber(result.total.total / rows.length)
+                : '-',
+        },
+        {
+            label: 'Cache Hit',
+            total: cacheTotal !== undefined ? formatPercent(cacheTotal, 1) : '-',
+            average: cacheAverage !== undefined ? formatPercent(cacheAverage, 1) : '-',
+        },
+        ...(options?.showCost !== false
+            ? [
+                {
+                    label: 'API Cost',
+                    total: formatApiCostValue(result.total.apiCost),
+                    average: rows.length
+                        ? formatApiCostValue(result.total.apiCost / rows.length)
+                        : '-',
+                },
+            ]
+            : []),
+    ];
+    return [
+        '| Metric | Total | Avg/Period |',
+        '| --- | ---: | ---: |',
+        ...metricRows.map((metric) => `| ${metric.label} | ${metric.total} | ${metric.average} |`),
+    ];
+}
+function renderHistoryProviderBreakdown(result, options) {
+    const providers = Object.values(result.total.providers);
+    if (providers.length === 0)
+        return ['- no provider activity in selected range'];
+    const sorted = [...providers].sort((a, b) => {
+        if (b.total !== a.total)
+            return b.total - a.total;
+        return b.assistantMessages - a.assistantMessages;
+    });
+    return [
+        options?.showCost !== false
+            ? '| Provider | Req | Input | Output | Total | Share | Cache Hit | API Cost |'
+            : '| Provider | Req | Input | Output | Total | Share | Cache Hit |',
+        options?.showCost !== false
+            ? '| --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: |'
+            : '| --- | ---: | ---: | ---: | ---: | ---: | ---: |',
+        ...sorted.map((provider) => {
+            const cache = getProviderCacheCoverageMetrics(provider).cachedRatio;
+            const share = result.total.total > 0
+                ? formatPercent(provider.total / result.total.total, 1)
+                : '-';
+            const cells = [
+                historyMdCell(historyProviderLabel(provider.providerID)),
+                shortNumber(provider.assistantMessages),
+                shortNumber(provider.input),
+                shortNumber(provider.output),
+                shortNumber(provider.total),
+                share,
+                cache !== undefined ? formatPercent(cache, 1) : '-',
+            ];
+            if (options?.showCost !== false) {
+                cells.push(provider.apiCost > 0 ? formatApiCostValue(provider.apiCost) : '-');
+            }
+            return `| ${cells.join(' | ')} |`;
+        }),
+    ];
+}
+function renderHistoryQuotaSnapshot(quotas) {
+    const visible = toolVisibleQuotaSnapshots(quotas).slice(0, 5);
+    if (visible.length === 0)
+        return ['- no provider quota data available'];
+    return visible.map((quota) => {
+        const label = quotaDisplayLabel(quota);
+        if (quota.status === 'error') {
+            return `- ${label}: error${quota.note ? ` | ${quota.note}` : ''}`;
+        }
+        if (quota.windows && quota.windows.length > 0) {
+            const summary = quota.windows
+                .slice(0, 2)
+                .map((window) => {
+                const remaining = window.showPercent === false
+                    ? undefined
+                    : formatQuotaPercent(window.remainingPercent);
+                const reset = reportResetLine(window.resetAt, window.resetLabel, window.label);
+                return [window.label || 'Quota', remaining, `reset ${reset}`]
+                    .filter(Boolean)
+                    .join(' | ');
+            })
+                .join('; ');
+            return `- ${label}: ${summary}`;
+        }
+        if (quota.balance) {
+            return `- ${label}: balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`;
+        }
+        return `- ${label}: ${formatQuotaPercent(quota.remainingPercent)} | reset ${reportResetLine(quota.resetAt)}`;
+    });
+}
+function renderHistoryPeriodDetailRows(result, options) {
+    const showCost = options?.showCost !== false;
+    return result.rows.length
+        ? result.rows.map((row) => {
+            const cache = getCacheCoverageMetrics(row.usage).cachedRatio;
+            const cells = [
+                `${row.range.label}${row.range.isCurrent ? '*' : ''}`,
+                shortNumber(row.usage.assistantMessages),
+                shortNumber(row.usage.input),
+                shortNumber(row.usage.output),
+                shortNumber(row.usage.cacheRead + row.usage.cacheWrite),
+                cache !== undefined ? formatPercent(cache, 1) : '-',
+                shortNumber(row.usage.total),
+            ];
+            if (showCost)
+                cells.push(formatApiCostValue(row.usage.apiCost));
+            return `| ${cells.join(' | ')} |`;
+        })
+        : [
+            showCost
+                ? '| - | - | - | - | - | - | - | - |'
+                : '| - | - | - | - | - | - | - |',
+        ];
+}
+export function renderHistoryMarkdownReport(result, quotas, options) {
+    const showCost = options?.showCost !== false;
+    const detailRows = renderHistoryPeriodDetailRows(result, { showCost });
+    return [
+        `## Quota History - ${historyPeriodLabel(result.period)} since ${result.since.raw}`,
+        ...(result.warning
+            ? ['', `> Warning: ${sanitizeLine(result.warning)}`]
+            : []),
+        '',
+        '### Quota Status',
+        '',
+        ...renderHistoryQuotaSnapshot(quotas),
+        '',
+        '### Totals',
+        '',
+        ...renderHistoryTotalsTable(result, { showCost }),
+        '',
+        '### Provider Breakdown',
+        '',
+        ...renderHistoryProviderBreakdown(result, { showCost }),
+        '',
+        '### Period Detail',
+        '',
+        showCost
+            ? '| Period | Requests | Input | Output | Cache | Cache Hit | Total | API Cost |'
+            : '| Period | Requests | Input | Output | Cache | Cache Hit | Total |',
+        showCost
+            ? '| --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: |'
+            : '| --- | ---: | ---: | ---: | ---: | ---: | ---: |',
+        ...detailRows,
+        ...(result.rows.some((row) => row.range.isCurrent)
+            ? ['', '* `*` marks the current partial period.']
+            : []),
+    ].join('\n');
+}
 export function renderMarkdownReport(period, usage, quotas, options) {
     const showCost = options?.showCost !== false;
     const cacheMetrics = getCacheCoverageMetrics(usage);
@@ -926,19 +1262,21 @@ export function renderMarkdownReport(period, usage, quotas, options) {
         : '| --- | ---: | ---: | ---: | ---: | ---: |';
     const quotaLines = toolVisibleQuotaSnapshots(quotas).flatMap((quota) => {
         const displayLabel = quotaDisplayLabel(quota);
+        const staleSuffix = quota.stale ? ' | stale' : '';
         // Multi-window detail
         if (quota.windows && quota.windows.length > 0 && quota.status === 'ok') {
             const windowLines = quota.windows.map((win) => {
                 const extraNote = win.note || (win === quota.windows?.[0] && quota.note)
                     ? ` | ${win.note || quota.note}`
                     : '';
+                const staleNote = quota.stale && win === quota.windows?.[0] ? staleSuffix : '';
                 if (win.showPercent === false) {
                     const winLabel = win.label ? ` (${win.label})` : '';
-                    return mdCell(`- ${displayLabel}${winLabel}: ${quota.status} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}${extraNote}`);
+                    return mdCell(`- ${displayLabel}${winLabel}: ${quota.status} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}${extraNote}${staleNote}`);
                 }
                 const remaining = formatQuotaPercent(win.remainingPercent);
                 const winLabel = win.label ? ` (${win.label})` : '';
-                return mdCell(`- ${displayLabel}${winLabel}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}${extraNote}`);
+                return mdCell(`- ${displayLabel}${winLabel}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}${extraNote}${staleNote}`);
             });
             if (quota.balance) {
                 windowLines.push(mdCell(`- ${displayLabel}: ${quota.status} | balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`));
@@ -947,7 +1285,7 @@ export function renderMarkdownReport(period, usage, quotas, options) {
         }
         if (quota.status === 'ok' && quota.balance) {
             return [
-                mdCell(`- ${displayLabel}: ${quota.status} | balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`),
+                mdCell(`- ${displayLabel}: ${quota.status} | balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}${staleSuffix}`),
             ];
         }
         if (quota.status === 'error') {
@@ -957,12 +1295,20 @@ export function renderMarkdownReport(period, usage, quotas, options) {
         }
         const remaining = formatQuotaPercent(quota.remainingPercent);
         return [
-            mdCell(`- ${displayLabel}: ${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}` : ''}${staleSuffix}`),
         ];
     });
     return [
         `## Quota Report - ${periodLabel(period)}`,
         '',
+        '### Quota Status',
+        '',
+        ...(quotaLines.length
+            ? quotaLines
+            : ['- no provider quota data available']),
+        '',
+        '### Usage Summary',
+        '',
         `- Sessions: ${usage.sessionCount}`,
         `- Requests: ${usage.assistantMessages}`,
         `- Tokens: input ${usage.input}, output ${usage.output}, cache_read ${usage.cacheRead}, cache_write ${usage.cacheWrite}, total ${usage.total}`,
@@ -975,9 +1321,6 @@ export function renderMarkdownReport(period, usage, quotas, options) {
                 `- API cost: ${apiCostSummaryValue()}`,
             ]
             : []),
-        ...(highlightLines().length > 0
-            ? ['', '### Highlights', ...highlightLines()]
-            : []),
         '',
         '### Usage by Provider',
         '',
@@ -990,12 +1333,9 @@ export function renderMarkdownReport(period, usage, quotas, options) {
                     ? '| - | - | - | - | - | - | - | - | - |'
                     : '| - | - | - | - | - | - |',
             ]),
-        '',
-        '### Subscription Quota',
-        '',
-        ...(quotaLines.length
-            ? quotaLines
-            : ['- no provider quota data available']),
+        ...(highlightLines().length > 0
+            ? ['', '### Highlights', ...highlightLines()]
+            : []),
     ].join('\n');
 }
 export function renderToastMessage(period, usage, quotas, options) {
@@ -1030,6 +1370,22 @@ export function renderToastMessage(period, usage, quotas, options) {
         });
     }
     lines.push(...alignPairs(tokenPairs).map((line) => fitLine(line, width)));
+    const providerCachePairs = Object.values(usage.providers)
+        .map((provider) => {
+        const metrics = getProviderCacheCoverageMetrics(provider);
+        if (metrics.cachedRatio === undefined)
+            return undefined;
+        return {
+            label: displayShortLabel(provider.providerID),
+            value: `Cached ${formatPercent(metrics.cachedRatio, 1)}`,
+        };
+    })
+        .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)));
+    }
     if (showCost) {
         const costPairs = Object.values(usage.providers)
             .filter((provider) => canonicalProviderID(provider.providerID) !== 'github-copilot')
@@ -1055,22 +1411,6 @@ export function renderToastMessage(period, usage, quotas, options) {
                     : '  -', width));
         }
     }
-    const providerCachePairs = Object.values(usage.providers)
-        .map((provider) => {
-        const metrics = getProviderCacheCoverageMetrics(provider);
-        if (metrics.cachedRatio === undefined)
-            return undefined;
-        return {
-            label: displayShortLabel(provider.providerID),
-            value: `Cached ${formatPercent(metrics.cachedRatio, 1)}`,
-        };
-    })
-        .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 = toolVisibleQuotaSnapshots(quotas).flatMap((item) => {
         if (item.status === 'ok') {
             if (item.windows && item.windows.length > 0) {
@@ -1085,6 +1425,8 @@ export function renderToastMessage(period, usage, quotas, options) {
                         parts.push(`${win.resetLabel || 'Rst'} ${reset}`);
                     if (win.note)
                         parts.push(win.note);
+                    if (item.stale && idx === 0)
+                        parts.push('stale');
                     return {
                         label: idx === 0 ? quotaDisplayLabel(item) : '',
                         value: parts.filter(Boolean).join(' '),
@@ -1102,7 +1444,7 @@ export function renderToastMessage(period, usage, quotas, options) {
                 return [
                     {
                         label: quotaDisplayLabel(item),
-                        value: `Balance ${formatCurrency(item.balance.amount, item.balance.currency)}`,
+                        value: `Balance ${formatCurrency(item.balance.amount, item.balance.currency)}${item.stale ? ' stale' : ''}`,
                     },
                 ];
             }
@@ -1111,7 +1453,7 @@ export function renderToastMessage(period, usage, quotas, options) {
             return [
                 {
                     label: quotaDisplayLabel(item),
-                    value: `Remaining ${percent}${reset ? ` Rst ${reset}` : ''}`,
+                    value: `Remaining ${percent}${reset ? ` Rst ${reset}` : ''}${item.stale ? ' stale' : ''}`,
                 },
             ];
         }

package/dist/history_messages.d.ts

@@ -0,0 +1,8 @@
+import type { Message } from '@opencode-ai/sdk';
+export type MessageEntry = {
+    info: Message;
+};
+export declare function decodeMessageInfo(value: unknown): Message | undefined;
+export declare function decodeMessageEntries(value: unknown): MessageEntry[] | undefined;
+export declare function nextCursorFromResponse(value: unknown): string | undefined;
+export declare function isMissingSessionError(error: unknown): boolean;