@leo000001/opencode-quota-sidebar 4.0.9 → 4.0.11

package/dist/cli.d.ts

@@ -12,6 +12,37 @@ type CliServerCommand = {
     shell?: boolean;
 };
 type SpawnedCliServerProcess = ReturnType<typeof spawn>;
+export declare function releaseCliServerProcess(proc: {
+    stdin?: {
+        destroy: () => void;
+    } | null;
+    stdout?: {
+        destroy: () => void;
+    } | null;
+    stderr?: {
+        destroy: () => void;
+    } | null;
+    unref: () => void;
+}): void;
+export declare function terminateCliServerProcess(proc: {
+    pid?: number;
+    killed?: boolean;
+    kill: (signal?: NodeJS.Signals) => boolean;
+    stdin?: {
+        destroy: () => void;
+    } | null;
+    stdout?: {
+        destroy: () => void;
+    } | null;
+    stderr?: {
+        destroy: () => void;
+    } | null;
+    unref: () => void;
+}, options?: {
+    platform?: NodeJS.Platform;
+    killProcess?: typeof process.kill;
+}): void;
+export declare function extractCliServerUrl(output: string): string | undefined;
 export declare function parseCliArgs(argv: string[]): CliCommand;
 export declare function cliBaseUrl(): string;
 export declare function cliServerCommandCandidates(platform?: NodeJS.Platform): CliServerCommand[];

package/dist/cli.js

@@ -15,6 +15,42 @@ import { filterHistoryProvidersForDisplay, filterUsageProvidersForDisplay, listC
 import { createUsageService } from './usage_service.js';
 const DEFAULT_OPENCODE_BASE_URL = 'http://localhost:4096';
 const CLI_SERVER_TIMEOUT_MS = 10_000;
+const CLI_FORCE_EXIT_DELAY_MS = 100;
+export function releaseCliServerProcess(proc) {
+    // The CLI only needs the child pipes until the server prints its listen URL.
+    // After that, unref/destroy them so the parent process can exit cleanly.
+    proc.stdin?.destroy();
+    proc.stdout?.destroy();
+    proc.stderr?.destroy();
+    proc.unref();
+}
+export function terminateCliServerProcess(proc, options) {
+    releaseCliServerProcess(proc);
+    if (proc.killed)
+        return;
+    const platform = options?.platform ?? process.platform;
+    const killProcess = options?.killProcess ?? process.kill;
+    if (platform !== 'win32' && typeof proc.pid === 'number' && proc.pid > 0) {
+        try {
+            killProcess(-proc.pid, 'SIGTERM');
+            return;
+        }
+        catch {
+            // Fall back to the direct child pid when group termination is unavailable.
+        }
+    }
+    proc.kill('SIGTERM');
+}
+export function extractCliServerUrl(output) {
+    for (const line of output.split('\n')) {
+        if (!line.startsWith('opencode server listening'))
+            continue;
+        const match = line.match(/on\s+(https?:\/\/[^\s]+)/);
+        if (match)
+            return match[1];
+    }
+    return undefined;
+}
 const HELP_TEXT = `opencode-quota
 
 Usage:
@@ -172,6 +208,7 @@ export async function tryStartCliOpencodeServer(candidate, spawnProcess = spawn,
     try {
         proc = spawnProcess(candidate.command, candidate.args, {
             env: process.env,
+            stdio: ['pipe', 'pipe', 'pipe'],
             shell: candidate.shell ?? false,
             detached: true,
             windowsHide: true,
@@ -189,6 +226,8 @@ export async function tryStartCliOpencodeServer(candidate, spawnProcess = spawn,
         let inspect;
         let onError;
         let onExit;
+        let output = '';
+        let settled = false;
         const id = setTimeout(() => {
             if (settled)
                 return;
@@ -197,54 +236,47 @@ export async function tryStartCliOpencodeServer(candidate, spawnProcess = spawn,
             closeProcess(proc);
             reject(new Error(`Timeout waiting for OpenCode server to start after ${CLI_SERVER_TIMEOUT_MS}ms`));
         }, CLI_SERVER_TIMEOUT_MS);
-        let output = '';
-        let settled = false;
+        id.unref?.();
+        const fail = (failure) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(id);
+            releaseCliServerPipes(proc, inspect, onError, onExit);
+            reject(failure);
+        };
         inspect = (chunk) => {
             output += chunk.toString();
-            const lines = output.split('\n');
-            for (const line of lines) {
-                if (!line.startsWith('opencode server listening'))
-                    continue;
-                const match = line.match(/on\s+(https?:\/\/[^\s]+)/);
-                if (!match)
-                    continue;
+            const url = extractCliServerUrl(output);
+            if (url) {
                 clearTimeout(id);
                 settled = true;
                 releaseCliServerPipes(proc, inspect, onError, onExit);
                 // The CLI only needs the startup line; after that the detached server
                 // must not keep the parent process alive.
+                proc.stdin?.destroy();
                 proc.unref();
-                resolve(match[1]);
+                resolve(url);
                 return;
             }
         };
         proc.stdout?.on('data', inspect);
         proc.stderr?.on('data', inspect);
         onError = (error) => {
-            if (settled)
-                return;
-            settled = true;
-            clearTimeout(id);
-            releaseCliServerPipes(proc, inspect, onError, onExit);
             const code = error.code;
-            reject({
+            fail({
                 error,
                 output,
                 recoverable: code === 'ENOENT' || code === 'EINVAL',
             });
         };
         onExit = (code) => {
-            if (settled)
-                return;
-            settled = true;
-            clearTimeout(id);
-            releaseCliServerPipes(proc, inspect, onError, onExit);
             let message = `OpenCode server exited with code ${code}`;
             if (output.trim())
                 message += `\n${output}`;
             const recoverable = /not recognized as an internal or external command/i.test(output) ||
                 /command not found/i.test(output);
-            reject({ error: new Error(message), output, recoverable });
+            fail({ error: new Error(message), output, recoverable });
         };
         proc.on('error', onError);
         proc.on('exit', onExit);
@@ -305,23 +337,40 @@ async function resolvePathInfo(directory) {
             throw new Error(`Failed to connect to OpenCode API at ${cliBaseUrl()}: ${error instanceof Error ? error.message : String(error)}`);
         }
         const server = await startCliOpencodeServer();
-        const client = createOpencodeClient({
-            directory,
-            baseUrl: server.url,
-        });
-        const response = await client.path.get({
-            query: { directory },
-            throwOnError: true,
-        });
-        const data = response.data;
-        return {
-            client,
-            worktree: data.worktree || directory,
-            directory: data.directory || directory,
-            close: () => server.close(),
-        };
+        try {
+            const client = createOpencodeClient({
+                directory,
+                baseUrl: server.url,
+            });
+            const response = await client.path.get({
+                query: { directory },
+                throwOnError: true,
+            });
+            const data = response.data;
+            return {
+                client,
+                worktree: data.worktree || directory,
+                directory: data.directory || directory,
+                close: () => server.close(),
+            };
+        }
+        catch (innerError) {
+            server.close();
+            throw innerError;
+        }
     }
 }
+function writeCliLine(stream, value) {
+    return new Promise((resolve, reject) => {
+        stream.write(`${value}\n`, (error) => {
+            if (error) {
+                reject(error);
+                return;
+            }
+            resolve();
+        });
+    });
+}
 export async function runCli(argv) {
     const command = parseCliArgs(argv);
     const cwd = process.cwd();
@@ -348,6 +397,7 @@ export async function runCli(argv) {
             statePath,
             client: client,
             directory,
+            worktree,
             persistence: {
                 markDirty: () => { },
                 scheduleSave: () => { },
@@ -406,16 +456,21 @@ export function cliShouldRunMain(argv1 = process.argv[1], modulePath = fileURLTo
     return resolvePath(modulePath) === resolvePath(argv1);
 }
 async function main() {
+    let exitCode = 0;
     try {
         const output = await runCli(process.argv.slice(2));
-        process.stdout.write(`${output}\n`);
+        await writeCliLine(process.stdout, output);
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        const exitCode = cliExitCodeForError(message);
+        exitCode = cliExitCodeForError(message);
         const stream = exitCode === 0 ? process.stdout : process.stderr;
-        stream.write(`${message}\n`);
+        await writeCliLine(stream, message);
+    }
+    finally {
         process.exitCode = exitCode;
+        const forceExit = setTimeout(() => process.exit(exitCode), CLI_FORCE_EXIT_DELAY_MS);
+        forceExit.unref?.();
     }
 }
 if (cliShouldRunMain()) {

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,51 +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, ' ')}%`;
+    return `${"█".repeat(filled)}${"░".repeat(width - filled)} ${`${Math.round(value)}`.padStart(3, " ")}%`;
 }
 function formatDelta(current, previous, format) {
     if (previous === undefined)
@@ -68,11 +68,11 @@ function formatDelta(current, previous, format) {
     if (!Number.isFinite(previous) || previous < 0)
         return `${format(current)} now`;
     if (previous === 0)
-        return `${format(current)} now, ${current === 0 ? 'flat' : 'new'}`;
+        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}%`;
+    const normalized = rounded.replace(/\.0$/, "");
+    return `${format(current)} now, ${delta > 0 ? "+" : ""}${normalized}%`;
 }
 function clip(value, width) {
     return value.length <= width
@@ -85,58 +85,58 @@ 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) {
     const longestLine = lines.reduce((max, line) => Math.max(max, line.length), 0);
     const inner = Math.max(48, width, title.length, longestLine);
     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,48 +147,48 @@ 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 ["no provider activity"];
     return 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'
-            ? '-'
+        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 showCost ? `${base}  ${apiCost.padStart(7, " ")}` : 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 ? [`Cost ${input.cost}`] : []),
+        ...(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('   ');
+    const row1 = [left[0], left[1], ...right].join("   ");
+    const row2 = [metaLeft, metaRight].filter(Boolean).join("   ");
     return [row1, ...(row2 ? [row2] : [])];
 }
 function trendBar(value, maxValue, width = 20) {
     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 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)));
     return [
         `${input.label} ${input.format(currentValue)}`,
@@ -204,20 +204,20 @@ export function renderCliDashboard(input) {
     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({
             requests: shortNumber(input.usage.assistantMessages),
             tokens: shortNumber(input.usage.total),
             ...(showCost ? { cost: cliApiCostSummary(input.usage) } : {}),
-            cache: cache !== undefined ? formatPercent(cache, 1) : '-',
+            cache: cache !== undefined ? formatPercent(cache, 1) : "-",
             periods: `${input.usage.sessionCount}`,
         }),
         `Input ${shortNumber(input.usage.input)}   Output ${shortNumber(input.usage.output)}`,
-        '',
-        'PROVIDERS',
+        "",
+        "PROVIDERS",
         ...providerRows(input.usage, showCost),
     ], width);
 }
@@ -231,23 +231,23 @@ export function renderCliHistoryDashboard(input) {
     const cache = getCacheCoverageMetrics(input.result.total).cachedRatio;
     const trendBlocks = [
         ...trendMetricBlock({
-            label: 'Requests',
+            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: "Cache",
             rows,
             current,
             pick: (row) => getCacheCoverageMetrics(row.usage).cachedRatio ?? 0,
@@ -255,9 +255,9 @@ export function renderCliHistoryDashboard(input) {
         }),
         ...(showCost
             ? [
-                '',
+                "",
                 ...trendMetricBlock({
-                    label: 'Cost',
+                    label: "API Cost",
                     rows,
                     current,
                     pick: (row) => row.usage.apiCost,
@@ -267,23 +267,23 @@ export function renderCliHistoryDashboard(input) {
             : []),
     ];
     return box(`opencode-quota · ${historyLabel(input.result)}`, [
-        'QUOTA',
+        "QUOTA",
         ...quotaRows(input.quotas),
-        '',
-        'TOTALS',
+        "",
+        "TOTALS",
         ...totalsRows({
             requests: shortNumber(input.result.total.assistantMessages),
             tokens: shortNumber(input.result.total.total),
             ...(showCost ? { cost: cliApiCostSummary(input.result.total) } : {}),
-            cache: cache !== undefined ? formatPercent(cache, 1) : '-',
+            cache: cache !== undefined ? formatPercent(cache, 1) : "-",
             periods: `${rows.length}`,
-            current: current?.range.shortLabel || '-',
+            current: current?.range.shortLabel || "-",
         }),
-        '',
-        'PROVIDERS',
+        "",
+        "PROVIDERS",
         ...providerRows(input.result.total, showCost),
-        '',
-        'TREND',
+        "",
+        "TREND",
         ...trendBlocks,
     ], width);
 }

package/dist/cost.d.ts

@@ -1,7 +1,9 @@
-import type { AssistantMessage } from '@opencode-ai/sdk';
-import type { CacheCoverageMode } from './types.js';
+import type { AssistantMessage } from "@opencode-ai/sdk";
+import type { OpenCodePricingModel } from "./opencode_pricing.js";
+import type { CacheCoverageMode } from "./types.js";
 export declare const API_COST_ENABLED_PROVIDERS: Set<string>;
-export type CanonicalPriceSource = 'official-doc' | 'runtime';
+export declare const API_COST_RULES_VERSION = 2;
+export type CanonicalPriceSource = "official-doc" | "runtime";
 export declare function canonicalPricingProviderID(providerID: string): string;
 export declare function canonicalApiCostProviderID(providerID: string): string;
 export type ModelCostRates = {
@@ -26,6 +28,21 @@ export type CanonicalPriceEntry = {
 };
 export declare function modelCostKey(providerID: string, modelID: string): string;
 export declare function modelCostLookupKeys(providerID: string, modelID: string): string[];
+export declare function derivedTierBaseModelID(model: OpenCodePricingModel): string | undefined;
+export declare function explicitModelCostMap(models: OpenCodePricingModel[]): Record<string, ModelCostRates>;
+export declare function applyDerivedTierRatesFromSource(baseMap: Record<string, ModelCostRates>, metadataModels: OpenCodePricingModel[], sourceRates: Record<string, ModelCostRates>, options?: {
+    skipExplicitRates?: Record<string, ModelCostRates>;
+}): {
+    [x: string]: ModelCostRates;
+};
+export declare function applyExplicitRatesFromSource(baseMap: Record<string, ModelCostRates>, metadataModels: OpenCodePricingModel[], sourceRates: Record<string, ModelCostRates>, options?: {
+    skipExplicitRates?: Record<string, ModelCostRates>;
+}): {
+    [x: string]: ModelCostRates;
+};
+export declare function mergeModelCostSource(baseMap: Record<string, ModelCostRates>, models: OpenCodePricingModel[]): {
+    [x: string]: ModelCostRates;
+};
 export declare function getBundledModelCostMap(): {
     [x: string]: ModelCostRates;
 };
@@ -48,7 +65,7 @@ export declare function getBundledCanonicalPriceEntries(): {
     sourceURL?: string;
     updatedAt?: string;
 }[];
+export declare function normalizeModelCostRates(rates: ModelCostRates): ModelCostRates;
 export declare function parseModelCostRates(value: unknown): ModelCostRates | undefined;
-export declare function guessModelCostDivisor(rates: ModelCostRates): 1 | 1000000;
 export declare function cacheCoverageModeFromRates(rates: ModelCostRates | undefined): CacheCoverageMode;
 export declare function calcEquivalentApiCostForMessage(message: AssistantMessage, rates: ModelCostRates): number;