@leo000001/opencode-quota-sidebar 4.0.5 → 4.0.11

package/dist/tui_helpers.d.ts

@@ -1,8 +1,9 @@
-import type { QuotaSidebarConfig, QuotaSnapshot, SidebarPanelState } from './types.js';
-export type SidebarQuotaTone = 'success' | 'warning' | 'error' | 'muted';
+import type { QuotaSidebarConfig, QuotaSnapshot, SidebarPanelState } from "./types.js";
+import type { UsageSummary } from "./usage.js";
+export type SidebarQuotaTone = "success" | "warning" | "error" | "muted";
 export type SidebarQuotaGroup = {
     providerID: string;
-    status: QuotaSnapshot['status'];
+    status: QuotaSnapshot["status"];
     tone: SidebarQuotaTone;
     shortLabel: string;
     detail: string;
@@ -10,6 +11,7 @@ export type SidebarQuotaGroup = {
 };
 export declare function renderSidebarQuotaGroups(quotas: QuotaSnapshot[], config: QuotaSidebarConfig): SidebarQuotaGroup[];
 export declare function sidebarPanelQuotaSnapshots(panel?: SidebarPanelState): QuotaSnapshot[];
+export declare function mergeLiveAndPersistedPanelUsage(liveUsage: UsageSummary | undefined, persistedUsage: UsageSummary | undefined): UsageSummary | undefined;
 export declare function fallbackQuotaGroupsFromTitle(title: string, width: number): SidebarQuotaGroup[];
 export declare function quotaGroupsUseBullets(groups: SidebarQuotaGroup[]): boolean;
 export declare function quotaGroupsAreCollapsible(groups: SidebarQuotaGroup[]): boolean;

package/dist/tui_helpers.js

@@ -1,17 +1,17 @@
-import { fitLine, renderSidebarQuotaLineGroups } from './format.js';
-import { collapseQuotaSnapshots } from './quota_render.js';
-import { isSupportedQuotaSnapshot, isSupportedQuotaTitleLabel, } from './supported_quota.js';
+import { fitLine, renderSidebarQuotaLineGroups } from "./format.js";
+import { collapseQuotaSnapshots } from "./quota_render.js";
+import { isSupportedQuotaSnapshot, isSupportedQuotaTitleLabel, } from "./supported_quota.js";
 const VISIBLE_QUOTA_STATUSES = new Set([
-    'ok',
-    'error',
-    'unsupported',
-    'unavailable',
+    "ok",
+    "error",
+    "unsupported",
+    "unavailable",
 ]);
 function parseQuotaLineParts(lines) {
-    const firstLine = lines[0]?.trimStart() || '';
+    const firstLine = lines[0]?.trimStart() || "";
     const match = /^(\S+)(?:\s+(.*))?$/.exec(firstLine);
-    const shortLabel = match?.[1] || firstLine || 'Quota';
-    const detail = match?.[2] || '';
+    const shortLabel = match?.[1] || firstLine || "Quota";
+    const detail = match?.[2] || "";
     const continuationLines = lines
         .slice(1)
         .map((line) => line.trimEnd())
@@ -37,52 +37,52 @@ function quotaPercents(quota) {
     return values;
 }
 function quotaTone(quota) {
-    if (quota.status === 'error')
-        return 'error';
-    if (quota.status === 'unsupported' || quota.status === 'unavailable') {
-        return 'muted';
+    if (quota.status === "error")
+        return "error";
+    if (quota.status === "unsupported" || quota.status === "unavailable") {
+        return "muted";
     }
-    if (quota.status !== 'ok')
-        return 'muted';
+    if (quota.status !== "ok")
+        return "muted";
     const percents = quotaPercents(quota);
     if (percents.length === 0) {
         if (quota.balance && Number.isFinite(quota.balance.amount)) {
             if (quota.balance.amount < 0)
-                return 'error';
-            return 'muted';
+                return "error";
+            return "muted";
         }
-        return 'muted';
+        return "muted";
     }
     const remaining = Math.min(...percents);
     if (remaining <= 5)
-        return 'error';
+        return "error";
     if (remaining <= 20)
-        return 'warning';
-    return 'success';
+        return "warning";
+    return "success";
 }
 function fallbackQuotaTone(detail) {
     const safe = detail.trim();
     if (!safe)
-        return 'muted';
+        return "muted";
     if (/\b(?:unsupported|unavailable)\b/i.test(safe))
-        return 'muted';
+        return "muted";
     if (/\berror\b/i.test(safe) || /^\?$/.test(safe))
-        return 'error';
+        return "error";
     if (/\bB-/.test(safe))
-        return 'error';
+        return "error";
     const percents = [
         ...safe.matchAll(/\b(?:\d+[hdw]|[DWM]|S7d|O7d|OA7d|Co7d|Sk5h|SkW)(\d{1,3})\b/gi),
     ]
         .map((match) => Number(match[1]))
         .filter((value) => Number.isFinite(value));
     if (percents.length === 0)
-        return 'muted';
+        return "muted";
     const remaining = Math.min(...percents);
     if (remaining <= 5)
-        return 'error';
+        return "error";
     if (remaining <= 20)
-        return 'warning';
-    return 'success';
+        return "warning";
+    return "success";
 }
 export function renderSidebarQuotaGroups(quotas, config) {
     const visibleQuotaCount = collapseQuotaSnapshots(quotas).filter((quota) => VISIBLE_QUOTA_STATUSES.has(quota.status)).length;
@@ -110,14 +110,42 @@ export function renderSidebarQuotaGroups(quotas, config) {
 export function sidebarPanelQuotaSnapshots(panel) {
     return (panel?.panelQuotas || panel?.quotas || []).filter((quota) => isSupportedQuotaSnapshot(quota));
 }
+export function mergeLiveAndPersistedPanelUsage(liveUsage, persistedUsage) {
+    if (!liveUsage)
+        return persistedUsage;
+    if (!persistedUsage)
+        return liveUsage;
+    const preferLive = liveUsage.assistantMessages > 0 &&
+        (liveUsage.assistantMessages > persistedUsage.assistantMessages ||
+            (liveUsage.assistantMessages === persistedUsage.assistantMessages &&
+                liveUsage.total >= persistedUsage.total));
+    if (!preferLive)
+        return persistedUsage;
+    const sameAggregateSurface = liveUsage.assistantMessages === persistedUsage.assistantMessages &&
+        liveUsage.input === persistedUsage.input &&
+        liveUsage.output === persistedUsage.output &&
+        liveUsage.cacheRead === persistedUsage.cacheRead &&
+        liveUsage.cacheWrite === persistedUsage.cacheWrite &&
+        liveUsage.total === persistedUsage.total;
+    if (!sameAggregateSurface ||
+        liveUsage.apiCost > 0 ||
+        persistedUsage.apiCost <= 0) {
+        return liveUsage;
+    }
+    return {
+        ...liveUsage,
+        apiCost: persistedUsage.apiCost,
+    };
+}
 export function fallbackQuotaGroupsFromTitle(title, width) {
-    const parts = (title || '')
-        .split(' | ')
+    // Legacy compatibility: old sessions may only have compact title fragments.
+    const parts = (title || "")
+        .split(" | ")
         .map((part) => part.trim())
         .filter(Boolean);
     const quotaParts = parts
         .slice(1)
-        .filter((part) => !/^Cd\d/.test(part) && !/^Est\b/.test(part));
+        .filter((part) => !/^Cd\d/.test(part) && !/^API\b/.test(part) && !/^Est\b/.test(part));
     if (quotaParts.length === 0)
         return [];
     const contentWidth = quotaParts.length > 1 ? Math.max(1, width - 2) : width;
@@ -129,7 +157,7 @@ export function fallbackQuotaGroupsFromTitle(title, width) {
             continue;
         groups.push({
             providerID: `fallback:${index}`,
-            status: 'ok',
+            status: "ok",
             tone: fallbackQuotaTone(parsed.detail),
             shortLabel: parsed.shortLabel,
             detail: parsed.detail,

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-export type QuotaStatus = 'ok' | 'unavailable' | 'unsupported' | 'error';
-export type SidebarTitleMode = 'auto' | 'multiline' | 'compact';
+export type QuotaStatus = "ok" | "unavailable" | "unsupported" | "error";
+export type SidebarTitleMode = "auto" | "multiline" | "compact";
 export type QuotaWindow = {
     label: string;
     /** Set false when this window line should not render a trailing percentage. */
@@ -12,7 +12,7 @@ export type QuotaWindow = {
     usedPercent?: number;
     resetAt?: string;
 };
-export type QuotaStaleReasonKind = 'timeout' | 'network' | 'http_5xx' | 'http_transient' | 'invalid_response' | 'unknown';
+export type QuotaStaleReasonKind = "timeout" | "network" | "http_5xx" | "http_transient" | "invalid_response" | "unknown";
 export type QuotaStaleMeta = {
     staleAt: number;
     staleReason: string;
@@ -52,7 +52,7 @@ export type SessionTitleState = {
     baseTitle: string;
     lastAppliedTitle?: string;
 };
-export type CacheCoverageMode = 'none' | 'read-only' | 'read-write';
+export type CacheCoverageMode = "none" | "read-only" | "read-write";
 export type CacheUsageBucket = {
     input: number;
     cacheRead: number;
@@ -95,6 +95,10 @@ export type CachedProviderUsage = {
 export type CachedSessionUsage = {
     /** Billing aggregation cache version for cost/apiCost refresh migrations. */
     billingVersion?: number;
+    /** Pricing fingerprint for the exact model/rate set used by this session. */
+    pricingFingerprint?: string;
+    /** Unique assistant-message provider/model pairs used to build the fingerprint. */
+    pricingKeys?: string[];
     input: number;
     output: number;
     reasoning: number;
@@ -172,12 +176,6 @@ export type QuotaSidebarConfig = {
          * sidebar plugin render the rich panel layout.
          */
         titleMode?: SidebarTitleMode;
-        /**
-         * Legacy switch retained for compatibility.
-         * TUI keeps a compact multiline sidebar layout; Desktop keeps a compact
-         * single-line layout.
-         */
-        multilineTitle?: boolean;
         showCost: boolean;
         showQuota: boolean;
         /** When true, wrap long quota lines and indent continuations. */

package/dist/usage.d.ts

@@ -1,12 +1,12 @@
-import type { AssistantMessage, Message } from '@opencode-ai/sdk';
-import type { CacheCoverageMetrics, CacheCoverageMode, CacheUsageBuckets, CachedSessionUsage, IncrementalCursor, RecentProviderEvent } from './types.js';
+import type { AssistantMessage, Message } from "@opencode-ai/sdk";
+import type { CacheCoverageMetrics, CacheCoverageMode, CacheUsageBuckets, CachedSessionUsage, IncrementalCursor, RecentProviderEvent } from "./types.js";
 /**
  * Billing cache version — bump this whenever the persisted `CachedSessionUsage`
  * shape changes in a way that requires recomputation (e.g. new aggregate
  * fields).  This is distinct from the plugin *state* version managed by the
  * persistence layer; billing version only governs usage-cache staleness.
  */
-export declare const USAGE_BILLING_CACHE_VERSION = 9;
+export declare const USAGE_BILLING_CACHE_VERSION = 10;
 export type ProviderUsage = {
     providerID: string;
     input: number;
@@ -43,8 +43,8 @@ export type UsageOptions = {
     /** Cache-behavior classifier for the message model/provider. */
     classifyCacheMode?: (message: AssistantMessage) => CacheCoverageMode;
 };
-export declare function getCacheCoverageMetrics(usage: Pick<UsageSummary, 'input' | 'cacheRead' | 'cacheWrite' | 'assistantMessages' | 'cacheBuckets'>): CacheCoverageMetrics;
-export declare function getProviderCacheCoverageMetrics(usage: Pick<ProviderUsage, 'input' | 'cacheRead' | 'cacheWrite' | 'assistantMessages' | 'cacheBuckets'>): CacheCoverageMetrics;
+export declare function getCacheCoverageMetrics(usage: Pick<UsageSummary, "input" | "cacheRead" | "cacheWrite" | "assistantMessages" | "cacheBuckets">): CacheCoverageMetrics;
+export declare function getProviderCacheCoverageMetrics(usage: Pick<ProviderUsage, "input" | "cacheRead" | "cacheWrite" | "assistantMessages" | "cacheBuckets">): CacheCoverageMetrics;
 export declare function emptyUsageSummary(): UsageSummary;
 export declare function accumulateMessagesInCompletedRange(target: UsageSummary, entries: Array<{
     info: Message;
@@ -84,5 +84,8 @@ export declare function summarizeMessagesIncremental(entries: Array<{
 export declare function mergeUsage(target: UsageSummary, source: UsageSummary, options?: {
     includeCost?: boolean;
 }): UsageSummary;
-export declare function toCachedSessionUsage(summary: UsageSummary): CachedSessionUsage;
+export declare function toCachedSessionUsage(summary: UsageSummary, options?: {
+    pricingFingerprint?: string;
+    pricingKeys?: string[];
+}): CachedSessionUsage;
 export declare function fromCachedSessionUsage(cached: CachedSessionUsage, sessionCount?: number): UsageSummary;

package/dist/usage.js

@@ -4,7 +4,7 @@
  * fields).  This is distinct from the plugin *state* version managed by the
  * persistence layer; billing version only governs usage-cache staleness.
  */
-export const USAGE_BILLING_CACHE_VERSION = 9;
+export const USAGE_BILLING_CACHE_VERSION = 10;
 const MAX_RECENT_PROVIDER_EVENTS = 100;
 function emptyCacheUsageBucket() {
     return {
@@ -150,7 +150,7 @@ function emptyProviderUsage(providerID) {
     };
 }
 function isAssistant(message) {
-    return message.role === 'assistant';
+    return message.role === "assistant";
 }
 function tokenTotal(message) {
     return (message.tokens.input +
@@ -166,8 +166,8 @@ function mergedOutput(message) {
 function mergeRecentProviderEvents(target, source) {
     const merged = [...(target || []), ...(source || [])]
         .filter((item) => !!item &&
-        typeof item.providerID === 'string' &&
-        typeof item.completedAt === 'number' &&
+        typeof item.providerID === "string" &&
+        typeof item.completedAt === "number" &&
         Number.isFinite(item.completedAt))
         .sort((left, right) => right.completedAt - left.completedAt);
     return merged.length > MAX_RECENT_PROVIDER_EVENTS
@@ -177,7 +177,7 @@ function mergeRecentProviderEvents(target, source) {
 function addMessageUsage(target, message, options) {
     const total = tokenTotal(message);
     const output = mergedOutput(message);
-    const cost = typeof message.cost === 'number' && Number.isFinite(message.cost)
+    const cost = typeof message.cost === "number" && Number.isFinite(message.cost)
         ? message.cost
         : 0;
     const apiCostRaw = options?.calcApiCost ? options.calcApiCost(message) : 0;
@@ -207,23 +207,25 @@ function addMessageUsage(target, message, options) {
     provider.apiCost += apiCost;
     provider.assistantMessages += 1;
     target.providers[message.providerID] = provider;
-    const cacheMode = options?.classifyCacheMode?.(message) || 'none';
-    if (cacheMode === 'read-only') {
+    const cacheMode = options?.classifyCacheMode?.(message) || "none";
+    if (cacheMode === "read-only") {
         const buckets = (target.cacheBuckets ||= emptyCacheUsageBuckets());
         addMessageCacheUsage(buckets.readOnly, message);
-        const providerBuckets = (provider.cacheBuckets ||= emptyCacheUsageBuckets());
+        const providerBuckets = (provider.cacheBuckets ||=
+            emptyCacheUsageBuckets());
         addMessageCacheUsage(providerBuckets.readOnly, message);
     }
-    else if (cacheMode === 'read-write') {
+    else if (cacheMode === "read-write") {
         const buckets = (target.cacheBuckets ||= emptyCacheUsageBuckets());
         addMessageCacheUsage(buckets.readWrite, message);
-        const providerBuckets = (provider.cacheBuckets ||= emptyCacheUsageBuckets());
+        const providerBuckets = (provider.cacheBuckets ||=
+            emptyCacheUsageBuckets());
         addMessageCacheUsage(providerBuckets.readWrite, message);
     }
 }
 function completedTimeOf(message) {
     const completed = message.time.completed;
-    if (typeof completed !== 'number')
+    if (typeof completed !== "number")
         return undefined;
     if (!Number.isFinite(completed))
         return undefined;
@@ -302,11 +304,11 @@ export function accumulateMessagesAcrossCompletedRanges(summaries, entries, rang
     return touched;
 }
 export function mergeCursorFromEntries(cursor, entries) {
-    let bestTime = typeof cursor?.lastMessageTime === 'number' &&
+    let bestTime = typeof cursor?.lastMessageTime === "number" &&
         Number.isFinite(cursor.lastMessageTime)
         ? cursor.lastMessageTime
         : Number.NEGATIVE_INFINITY;
-    let bestID = cursor?.lastMessageId || '';
+    let bestID = cursor?.lastMessageId || "";
     const idsAtBestTime = new Set(Array.isArray(cursor?.lastMessageIdsAtTime)
         ? cursor.lastMessageIdsAtTime
         : cursor?.lastMessageId && Number.isFinite(bestTime)
@@ -350,7 +352,7 @@ export function summarizeMessagesIncremental(entries, existingUsage, cursor, for
     // If no cursor or force rescan, do full scan
     if (forceRescan ||
         !cursor?.lastMessageId ||
-        typeof cursor.lastMessageTime !== 'number' ||
+        typeof cursor.lastMessageTime !== "number" ||
         !Number.isFinite(cursor.lastMessageTime) ||
         !existingUsage) {
         const usage = summarizeMessages(entries, 0, 1, options);
@@ -382,7 +384,7 @@ export function summarizeMessagesIncremental(entries, existingUsage, cursor, for
             const msg = entry.info;
             if (!isAssistant(msg))
                 continue;
-            if (typeof msg.time.completed !== 'number')
+            if (typeof msg.time.completed !== "number")
                 continue;
             if (!Number.isFinite(msg.time.completed))
                 continue;
@@ -407,7 +409,7 @@ export function summarizeMessagesIncremental(entries, existingUsage, cursor, for
     }
     const isAfterCursor = (message) => {
         const completed = message.time.completed;
-        if (typeof completed !== 'number' || !Number.isFinite(completed))
+        if (typeof completed !== "number" || !Number.isFinite(completed))
             return false;
         if (completed > cursorTime)
             return true;
@@ -430,7 +432,7 @@ export function summarizeMessagesIncremental(entries, existingUsage, cursor, for
         const msg = entry.info;
         if (!isAssistant(msg))
             continue;
-        if (typeof msg.time.completed !== 'number')
+        if (typeof msg.time.completed !== "number")
             continue;
         if (!Number.isFinite(msg.time.completed))
             continue;
@@ -487,7 +489,7 @@ function collectCompletedAssistantIdsAt(entries, completedTime) {
         const msg = entry.info;
         if (!isAssistant(msg))
             continue;
-        if (typeof msg.time.completed !== 'number')
+        if (typeof msg.time.completed !== "number")
             continue;
         if (!Number.isFinite(msg.time.completed))
             continue;
@@ -500,12 +502,12 @@ function collectCompletedAssistantIdsAt(entries, completedTime) {
 function findLastCompletedAssistant(entries) {
     let best;
     let bestTime = -Infinity;
-    let bestID = '';
+    let bestID = "";
     for (const entry of entries) {
         const msg = entry.info;
         if (!isAssistant(msg))
             continue;
-        if (typeof msg.time.completed !== 'number')
+        if (typeof msg.time.completed !== "number")
             continue;
         if (!Number.isFinite(msg.time.completed))
             continue;
@@ -561,7 +563,7 @@ export function mergeUsage(target, source, options) {
     }
     return target;
 }
-export function toCachedSessionUsage(summary) {
+export function toCachedSessionUsage(summary, options) {
     const providers = Object.entries(summary.providers).reduce((acc, [providerID, provider]) => {
         acc[providerID] = {
             input: provider.input,
@@ -580,6 +582,10 @@ export function toCachedSessionUsage(summary) {
     }, {});
     return {
         billingVersion: USAGE_BILLING_CACHE_VERSION,
+        pricingFingerprint: options?.pricingFingerprint,
+        pricingKeys: options?.pricingKeys
+            ? Array.from(new Set(options.pricingKeys)).sort()
+            : undefined,
         input: summary.input,
         output: summary.output,
         // Always 0 after merge into output; kept for serialization shape.

package/dist/usage_service.d.ts

@@ -1,9 +1,9 @@
-import type { PluginInput } from '@opencode-ai/plugin';
-import { type HistoryPeriod } from './period.js';
-import { type UsageSummary } from './usage.js';
-export type { HistoryUsageRow, HistoryUsageResult } from './history_usage.js';
-import type { HistoryUsageResult } from './history_usage.js';
-import type { QuotaSidebarConfig, QuotaSidebarState } from './types.js';
+import type { PluginInput } from "@opencode-ai/plugin";
+import { type HistoryPeriod } from "./period.js";
+import { type UsageSummary } from "./usage.js";
+export type { HistoryUsageRow, HistoryUsageResult } from "./history_usage.js";
+import type { HistoryUsageResult } from "./history_usage.js";
+import type { QuotaSidebarConfig, QuotaSidebarState } from "./types.js";
 type DescendantsResolver = {
     listDescendantSessionIDs: (sessionID: string, opts: {
         maxDepth: number;
@@ -20,8 +20,9 @@ export declare function createUsageService(deps: {
     state: QuotaSidebarState;
     config: QuotaSidebarConfig;
     statePath: string;
-    client: PluginInput['client'];
+    client: PluginInput["client"];
     directory: string;
+    worktree?: string;
     persistence: Persistence;
     descendantsResolver: DescendantsResolver;
 }): {