@leo000001/opencode-quota-sidebar 4.0.13 → 4.0.16

package/dist/cli_render.d.ts

@@ -1,6 +1,6 @@
-import type { QuotaSnapshot } from "./types.js";
-import { type UsageSummary } from "./usage.js";
-import type { HistoryUsageResult } from "./usage_service.js";
+import type { QuotaSnapshot } from './types.js';
+import { type UsageSummary } from './usage.js';
+import type { HistoryUsageResult } from './usage_service.js';
 export declare function renderCliDashboard(input: {
     label: string;
     usage: UsageSummary;
@@ -14,4 +14,4 @@ export declare function renderCliHistoryDashboard(input: {
     width?: number;
     showCost?: boolean;
 }): string;
-export declare function cliCurrentLabel(period: "day" | "week" | "month"): "Today" | "This Week" | "This Month";
+export declare function cliCurrentLabel(period: 'day' | 'week' | 'month'): "Today" | "This Week" | "This Month";

package/dist/cli_render.js

@@ -1,8 +1,8 @@
-import { canonicalProviderID, collapseQuotaSnapshots, quotaDisplayLabel, } from "./quota_render.js";
-import { getCacheCoverageMetrics, getProviderCacheCoverageMetrics, } from "./usage.js";
+import { canonicalProviderID, collapseQuotaSnapshots, quotaDisplayLabel, } from './quota_render.js';
+import { getCacheCoverageMetrics, getProviderCacheCoverageMetrics, } from './usage.js';
 function shortNumber(value, decimals = 1) {
     if (!Number.isFinite(value) || value < 0)
-        return "0";
+        return '0';
     if (value >= 1_000_000)
         return `${(value / 1_000_000).toFixed(decimals)}m`;
     if (value >= 1000) {
@@ -16,63 +16,51 @@ function shortNumber(value, decimals = 1) {
 }
 function formatCurrency(value, currency) {
     const safe = Number.isFinite(value) ? value : 0;
-    const prefix = typeof currency === "string" && currency ? currency : "$";
+    const prefix = typeof currency === 'string' && currency ? currency : '$';
     if (safe === 0)
         return `${prefix}0.00`;
     if (safe < 10 && safe > -10)
-        return `${safe < 0 ? "-" : ""}${prefix}${Math.abs(safe).toFixed(2)}`;
-    const rounded = Math.abs(safe).toFixed(1).replace(/\.0$/, "");
-    return `${safe < 0 ? "-" : ""}${prefix}${rounded}`;
+        return `${safe < 0 ? '-' : ''}${prefix}${Math.abs(safe).toFixed(2)}`;
+    const rounded = Math.abs(safe).toFixed(1).replace(/\.0$/, '');
+    return `${safe < 0 ? '-' : ''}${prefix}${rounded}`;
 }
 function formatApiCost(value) {
-    return formatCurrency(value, "$");
+    return formatCurrency(value, '$');
 }
 function formatPercent(value, decimals = 1) {
     const safe = Number.isFinite(value) && value >= 0 ? value : 0;
     const pct = (safe * 100).toFixed(decimals);
-    return `${pct.replace(/\.0+$/, "").replace(/(\.\d*[1-9])0+$/, "$1")}%`;
+    return `${pct.replace(/\.0+$/, '').replace(/(\.\d*[1-9])0+$/, '$1')}%`;
 }
 function compactCountdown(iso) {
     if (!iso)
-        return "n/a";
+        return 'n/a';
     const timestamp = Date.parse(iso);
     if (Number.isNaN(timestamp))
-        return "n/a";
+        return 'n/a';
     const remainingMs = timestamp - Date.now();
     if (!Number.isFinite(remainingMs))
-        return "n/a";
+        return 'n/a';
     if (remainingMs <= 0)
-        return "0m";
+        return '0m';
     const totalMinutes = Math.max(1, Math.floor(remainingMs / 60_000));
     if (totalMinutes < 60)
         return `${totalMinutes}m`;
     if (totalMinutes < 24 * 60) {
         const hours = Math.floor(totalMinutes / 60);
         const minutes = totalMinutes % 60;
-        return `${hours}h${`${minutes}`.padStart(2, "0")}m`;
+        return `${hours}h${`${minutes}`.padStart(2, '0')}m`;
     }
     const days = Math.floor(totalMinutes / (24 * 60));
     const hours = Math.floor((totalMinutes % (24 * 60)) / 60);
-    return `${days}D${`${hours}`.padStart(2, "0")}h`;
+    return `${days}D${`${hours}`.padStart(2, '0')}h`;
 }
 function gauge(value, width = 10) {
     if (value === undefined || !Number.isFinite(value))
-        return `${"░".repeat(width)}  n/a`;
+        return `${'░'.repeat(width)}  n/a`;
     const ratio = Math.max(0, Math.min(1, value / 100));
     const filled = Math.max(value > 0 ? 1 : 0, Math.round(ratio * width));
-    return `${"█".repeat(filled)}${"░".repeat(width - filled)} ${`${Math.round(value)}`.padStart(3, " ")}%`;
-}
-function formatDelta(current, previous, format) {
-    if (previous === undefined)
-        return `${format(current)} now`;
-    if (!Number.isFinite(previous) || previous < 0)
-        return `${format(current)} now`;
-    if (previous === 0)
-        return `${format(current)} now, ${current === 0 ? "flat" : "new"}`;
-    const delta = ((current - previous) / previous) * 100;
-    const rounded = Math.abs(delta) >= 10 ? delta.toFixed(0) : delta.toFixed(1);
-    const normalized = rounded.replace(/\.0$/, "");
-    return `${format(current)} now, ${delta > 0 ? "+" : ""}${normalized}%`;
+    return `${'█'.repeat(filled)}${'░'.repeat(width - filled)} ${`${Math.round(value)}`.padStart(3, ' ')}%`;
 }
 function clip(value, width) {
     return value.length <= width
@@ -85,58 +73,61 @@ function centerLine(value, width) {
         return clipped;
     const left = Math.floor((width - clipped.length) / 2);
     const right = width - clipped.length - left;
-    return `${" ".repeat(left)}${clipped}${" ".repeat(right)}`;
+    return `${' '.repeat(left)}${clipped}${' '.repeat(right)}`;
 }
 function padRight(value, width) {
-    return clip(value, width).padEnd(width, " ");
+    return clip(value, width).padEnd(width, ' ');
 }
-function box(title, lines, width = 78) {
+function box(title, lines, maxWidth = 78) {
     const longestLine = lines.reduce((max, line) => Math.max(max, line.length), 0);
-    const inner = Math.max(48, width, title.length, longestLine);
+    // `maxWidth` is a hard ceiling. We intentionally avoid a fixed minimum so
+    // the CLI rules shrink to the rendered content instead of protruding past it.
+    const contentWidth = Math.max(title.length, longestLine);
+    const inner = Math.max(1, Math.min(maxWidth, contentWidth));
     const top = centerLine(title, inner);
-    const rule = "─".repeat(inner);
+    const rule = '─'.repeat(inner);
     const body = lines.map((line) => clip(line, inner));
-    return [top, rule, ...body, rule].join("\n");
+    return [top, rule, ...body, rule].join('\n');
 }
 function currentLabel(period) {
-    if (period === "day")
-        return "Today";
-    if (period === "week")
-        return "This Week";
-    return "This Month";
+    if (period === 'day')
+        return 'Today';
+    if (period === 'week')
+        return 'This Week';
+    return 'This Month';
 }
 function historyLabel(result) {
-    if (result.period === "day")
+    if (result.period === 'day')
         return `Daily since ${result.since.raw}`;
-    if (result.period === "week")
+    if (result.period === 'week')
         return `Weekly since ${result.since.raw}`;
     return `Monthly since ${result.since.raw}`;
 }
 function quotaRows(quotas) {
-    const visible = collapseQuotaSnapshots(quotas).filter((item) => item.status === "ok" || item.status === "error");
+    const visible = collapseQuotaSnapshots(quotas).filter((item) => item.status === 'ok' || item.status === 'error');
     if (visible.length === 0)
-        return ["no provider quota data available"];
+        return ['no provider quota data available'];
     return visible.flatMap((quota) => {
-        const label = quotaDisplayLabel(quota).padEnd(11, " ");
-        if (quota.status === "error") {
-            return [`${label} error${quota.note ? ` · ${quota.note}` : ""}`];
+        const label = quotaDisplayLabel(quota).padEnd(11, ' ');
+        if (quota.status === 'error') {
+            return [`${label} error${quota.note ? ` · ${quota.note}` : ''}`];
         }
         if (quota.windows && quota.windows.length > 0) {
             const lines = quota.windows.map((win) => {
-                const detail = padRight(win.label || "quota", 18);
+                const detail = padRight(win.label || 'quota', 18);
                 if (win.showPercent === false) {
                     return `${label}${detail} ${compactCountdown(win.resetAt)}`;
                 }
                 return `${label}${detail} [${gauge(win.remainingPercent)}] ${compactCountdown(win.resetAt)}`;
             });
             if (quota.balance) {
-                lines.push(`${label}${padRight("balance", 18)} ${formatCurrency(quota.balance.amount, quota.balance.currency)}`);
+                lines.push(`${label}${padRight('balance', 18)} ${formatCurrency(quota.balance.amount, quota.balance.currency)}`);
             }
             return lines;
         }
         if (quota.balance) {
             return [
-                `${label}${padRight("balance", 18)} ${formatCurrency(quota.balance.amount, quota.balance.currency)}`,
+                `${label}${padRight('balance', 18)} ${formatCurrency(quota.balance.amount, quota.balance.currency)}`,
             ];
         }
         return [
@@ -147,51 +138,85 @@ function quotaRows(quotas) {
 function providerRows(usage, showCost) {
     const providers = Object.values(usage.providers).sort((a, b) => b.total - a.total);
     if (providers.length === 0)
-        return ["no provider activity"];
-    return providers.map((provider) => {
+        return ['no provider activity'];
+    const prepared = providers.map((provider) => {
         const cache = getProviderCacheCoverageMetrics(provider).cachedRatio;
-        const base = `${quotaDisplayLabel({ providerID: provider.providerID, label: provider.providerID, status: "ok", checkedAt: 0 }).padEnd(10, " ")} ${shortNumber(provider.assistantMessages).padStart(4, " ")} req  ${shortNumber(provider.total).padStart(7, " ")} tok  ${(cache !== undefined ? formatPercent(cache, 0) : "-").padStart(4, " ")} cache`;
-        const apiCost = canonicalProviderID(provider.providerID) === "github-copilot"
-            ? "-"
-            : formatApiCost(provider.apiCost);
-        return showCost ? `${base}  ${apiCost.padStart(7, " ")}` : base;
+        return {
+            label: quotaDisplayLabel({
+                providerID: provider.providerID,
+                label: provider.providerID,
+                status: 'ok',
+                checkedAt: 0,
+            }),
+            requests: shortNumber(provider.assistantMessages),
+            tokens: shortNumber(provider.total),
+            cached: cache !== undefined ? formatPercent(cache, 0) : '-',
+            cost: canonicalProviderID(provider.providerID) === 'github-copilot'
+                ? '-'
+                : formatApiCost(provider.apiCost),
+        };
+    });
+    const labelWidth = Math.max(...prepared.map((row) => row.label.length));
+    const requestWidth = Math.max(...prepared.map((row) => row.requests.length));
+    const tokenWidth = Math.max(...prepared.map((row) => row.tokens.length));
+    const cachedWidth = Math.max(...prepared.map((row) => row.cached.length));
+    const costWidth = Math.max(...prepared.map((row) => row.cost.length));
+    return prepared.map((row) => {
+        const base = [
+            padRight(row.label, labelWidth),
+            `${row.requests.padStart(requestWidth)} req`,
+            `${row.tokens.padStart(tokenWidth)} tok`,
+            `${row.cached.padStart(cachedWidth)} cached`,
+        ].join(' ');
+        return showCost ? `${base} ${row.cost.padStart(costWidth)}` : base;
     });
 }
 function cliApiCostSummary(usage) {
     const providers = Object.values(usage.providers);
     if (providers.length === 0)
         return formatApiCost(usage.apiCost);
-    const hasNonCopilot = providers.some((provider) => canonicalProviderID(provider.providerID) !== "github-copilot");
-    return hasNonCopilot ? formatApiCost(usage.apiCost) : "-";
+    const hasNonCopilot = providers.some((provider) => canonicalProviderID(provider.providerID) !== 'github-copilot');
+    return hasNonCopilot ? formatApiCost(usage.apiCost) : '-';
 }
 function totalsRows(input) {
-    const left = [`Requests ${input.requests}`, `Tokens ${input.tokens}`];
-    const right = [
-        ...(input.cost ? [`API Cost ${input.cost}`] : []),
-        ...(input.cache ? [`Cache ${input.cache}`] : []),
-    ];
-    const metaLeft = input.periods ? `Periods ${input.periods}` : undefined;
-    const metaRight = input.current ? `Current ${input.current}` : undefined;
-    const row1 = [left[0], left[1], ...right].join("   ");
-    const row2 = [metaLeft, metaRight].filter(Boolean).join("   ");
-    return [row1, ...(row2 ? [row2] : [])];
+    const leftLabelWidth = Math.max('Sessions'.length, 'API Cost'.length);
+    const leftValueWidth = Math.max(input.sessions.length, input.tokens.length, input.cost?.length ?? 0);
+    const rightLabelWidth = 'Requests'.length;
+    const rightValueWidth = Math.max(input.requests.length, input.cached?.length ?? 0);
+    const leftCell = (label, value) => `${padRight(label, leftLabelWidth)} ${value.padEnd(leftValueWidth, ' ')}`;
+    const rightCell = (label, value) => `${padRight(label, rightLabelWidth)} ${value.padEnd(rightValueWidth, ' ')}`;
+    const row1 = [
+        leftCell('Sessions', input.sessions),
+        rightCell('Requests', input.requests),
+    ]
+        .join('  ')
+        .trimEnd();
+    const row2 = [
+        leftCell('Tokens', input.tokens),
+        ...(input.cached ? [rightCell('Cached', input.cached)] : []),
+    ]
+        .join('  ')
+        .trimEnd();
+    const row3 = input.cost
+        ? leftCell('API Cost', input.cost).trimEnd()
+        : undefined;
+    return [row1, row2, ...(row3 ? [row3] : [])];
 }
-function trendBar(value, maxValue, width = 20) {
+function trendBar(value, maxValue, width = 16) {
     if (!Number.isFinite(value) || value <= 0 || maxValue <= 0) {
-        return "░".repeat(width);
+        return '░'.repeat(width);
     }
     const filled = Math.max(1, Math.round((value / maxValue) * width));
-    return `${"█".repeat(filled)}${"░".repeat(width - filled)}`;
+    return `${'█'.repeat(filled)}${'░'.repeat(width - filled)}`;
 }
 function trendMetricBlock(input) {
     const visibleRows = input.rows.slice(-Math.min(8, input.rows.length));
     const values = visibleRows.map(input.pick);
     const maxValue = Math.max(...values, 0);
-    const currentValue = input.current ? input.pick(input.current) : 0;
-    const displayLabels = visibleRows.map((row) => `${row.range.shortLabel}${row.range.isCurrent ? "*" : ""}`);
-    const labelWidth = Math.max(8, Math.min(28, Math.max(...displayLabels.map((label) => label.length), 8)));
+    const displayLabels = visibleRows.map((row) => `${row.range.shortLabel}${row.range.isCurrent ? '*' : ''}`);
+    const labelWidth = Math.max(6, Math.min(20, Math.max(...displayLabels.map((label) => label.length), 6)));
     return [
-        `${input.label} ${input.format(currentValue)}`,
+        input.label,
         ...visibleRows.map((row, index) => {
             const value = input.pick(row);
             const tag = padRight(displayLabels[index], labelWidth);
@@ -200,54 +225,59 @@ function trendMetricBlock(input) {
     ];
 }
 export function renderCliDashboard(input) {
-    const width = input.width ?? 78;
+    const maxWidth = input.width ?? 78;
     const showCost = input.showCost !== false;
     const cache = getCacheCoverageMetrics(input.usage).cachedRatio;
     return box(`opencode-quota · ${input.label}`, [
-        "QUOTA",
+        'QUOTA',
         ...quotaRows(input.quotas),
-        "",
-        "TOTALS",
+        '',
+        'TOTALS',
         ...totalsRows({
+            sessions: `${input.usage.sessionCount}`,
             requests: shortNumber(input.usage.assistantMessages),
             tokens: shortNumber(input.usage.total),
             ...(showCost ? { cost: cliApiCostSummary(input.usage) } : {}),
-            cache: cache !== undefined ? formatPercent(cache, 1) : "-",
-            periods: `${input.usage.sessionCount}`,
+            cached: cache !== undefined ? formatPercent(cache, 1) : '-',
         }),
-        `Input ${shortNumber(input.usage.input)}   Output ${shortNumber(input.usage.output)}`,
-        "",
-        "PROVIDERS",
+        '',
+        'PROVIDERS',
         ...providerRows(input.usage, showCost),
-    ], width);
+    ], maxWidth);
 }
 export function renderCliHistoryDashboard(input) {
-    const width = input.width ?? 78;
+    const maxWidth = input.width ?? 78;
     const showCost = input.showCost !== false;
     const rows = input.result.rows;
     const current = [...rows].reverse().find((row) => row.range.isCurrent) || rows.at(-1);
-    const currentIndex = current ? rows.indexOf(current) : -1;
-    const previous = currentIndex > 0 ? rows[currentIndex - 1] : undefined;
     const cache = getCacheCoverageMetrics(input.result.total).cachedRatio;
     const trendBlocks = [
         ...trendMetricBlock({
-            label: "Requests",
+            label: 'Sessions',
+            rows,
+            current,
+            pick: (row) => row.usage.sessionCount,
+            format: (value) => shortNumber(value),
+        }),
+        '',
+        ...trendMetricBlock({
+            label: 'Requests',
             rows,
             current,
             pick: (row) => row.usage.assistantMessages,
             format: (value) => shortNumber(value),
         }),
-        "",
+        '',
         ...trendMetricBlock({
-            label: "Tokens",
+            label: 'Tokens',
             rows,
             current,
             pick: (row) => row.usage.total,
             format: (value) => shortNumber(value),
         }),
-        "",
+        '',
         ...trendMetricBlock({
-            label: "Cache",
+            label: 'Cached',
             rows,
             current,
             pick: (row) => getCacheCoverageMetrics(row.usage).cachedRatio ?? 0,
@@ -255,9 +285,9 @@ export function renderCliHistoryDashboard(input) {
         }),
         ...(showCost
             ? [
-                "",
+                '',
                 ...trendMetricBlock({
-                    label: "API Cost",
+                    label: 'API Cost',
                     rows,
                     current,
                     pick: (row) => row.usage.apiCost,
@@ -267,25 +297,24 @@ export function renderCliHistoryDashboard(input) {
             : []),
     ];
     return box(`opencode-quota · ${historyLabel(input.result)}`, [
-        "QUOTA",
+        'QUOTA',
         ...quotaRows(input.quotas),
-        "",
-        "TOTALS",
+        '',
+        'TOTALS',
         ...totalsRows({
+            sessions: `${input.result.total.sessionCount}`,
             requests: shortNumber(input.result.total.assistantMessages),
             tokens: shortNumber(input.result.total.total),
             ...(showCost ? { cost: cliApiCostSummary(input.result.total) } : {}),
-            cache: cache !== undefined ? formatPercent(cache, 1) : "-",
-            periods: `${rows.length}`,
-            current: current?.range.shortLabel || "-",
+            cached: cache !== undefined ? formatPercent(cache, 1) : '-',
         }),
-        "",
-        "PROVIDERS",
+        '',
+        'PROVIDERS',
         ...providerRows(input.result.total, showCost),
-        "",
-        "TREND",
+        '',
+        'TREND',
         ...trendBlocks,
-    ], width);
+    ], maxWidth);
 }
 export function cliCurrentLabel(period) {
     return currentLabel(period);

package/package.json

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