sidekick-shared 0.25.0 → 0.26.0

package/dist/aggregation/EventAggregator.d.ts

@@ -14,7 +14,7 @@ import type { SerializedFrequencyState } from './FrequencyTracker';
 import type { SerializedHeatmapState } from './HeatmapTracker';
 import type { SerializedPatternState } from './PatternExtractor';
 /** Schema version for serialized snapshots. */
-export declare const SNAPSHOT_SCHEMA_VERSION = 4;
+export declare const SNAPSHOT_SCHEMA_VERSION = 5;
 /**
  * JSON-serializable snapshot of EventAggregator state.
  * Used by session snapshot sidecar files for fast resume.
@@ -28,7 +28,14 @@ export interface SerializedAggregatorState {
         cacheRead: number;
         reasoning: number;
         total: number;
+        /** @deprecated Mirrors `costUsd`; kept so older readers of the field keep working. */
         reportedCost: number;
+        costUsd: number;
+        reportedCostUsd: number;
+        estimatedCostUsd: number;
+        reportedCalls: number;
+        estimatedCalls: number;
+        unpricedCalls: number;
     };
     modelUsage: Array<[
         string,
@@ -100,7 +107,13 @@ export declare class EventAggregator {
     private cacheReadTokens;
     private reasoningTokens;
     private totalTokens;
-    private reportedCost;
+    /** Running cost in USD (reported + estimated). */
+    private costUsd;
+    private reportedCostUsd;
+    private estimatedCostUsd;
+    private reportedCalls;
+    private estimatedCalls;
+    private unpricedCalls;
     private modelUsage;
     private currentContextSize;
     private previousContextSize;

package/dist/aggregation/EventAggregator.js

@@ -16,6 +16,7 @@ const planExtractor_1 = require("../parsers/planExtractor");
 const eventBridge_1 = require("../watchers/eventBridge");
 const toolSummary_1 = require("../formatters/toolSummary");
 const noiseClassifier_1 = require("../formatters/noiseClassifier");
+const costProvenance_1 = require("./costProvenance");
 const FrequencyTracker_1 = require("./FrequencyTracker");
 const HeatmapTracker_1 = require("./HeatmapTracker");
 const PatternExtractor_1 = require("./PatternExtractor");
@@ -30,7 +31,7 @@ const DEFAULT_BURN_WINDOW_MS = 5 * 60_000;
 const DEFAULT_BURN_SAMPLE_MS = 10_000;
 const COMPACTION_DROP_THRESHOLD = 0.8; // >20% drop
 /** Schema version for serialized snapshots. */
-exports.SNAPSHOT_SCHEMA_VERSION = 4;
+exports.SNAPSHOT_SCHEMA_VERSION = 5;
 // ── Goal gate detection regex ──
 const GOAL_GATE_REGEX = /\b(CRITICAL|MUST|blocker|required|must.?complete|goal.?gate|essential|do.?not.?skip|blocking)\b/i;
 // ── Todo dependency parsing ──
@@ -78,7 +79,13 @@ class EventAggregator {
     cacheReadTokens = 0;
     reasoningTokens = 0;
     totalTokens = 0;
-    reportedCost = 0;
+    /** Running cost in USD (reported + estimated). */
+    costUsd = 0;
+    reportedCostUsd = 0;
+    estimatedCostUsd = 0;
+    reportedCalls = 0;
+    estimatedCalls = 0;
+    unpricedCalls = 0;
     // Per-model usage
     modelUsage = new Map();
     // Context size tracking
@@ -262,8 +269,10 @@ class EventAggregator {
             this.attributePlanUsage(normalized.totalTokens, cost);
         }
         else if (typeof event.cost === 'number' && Number.isFinite(event.cost) && event.cost >= 0) {
-            // Compatibility for cost-only follow events.
-            this.reportedCost += event.cost;
+            // Compatibility for cost-only follow events (provider-reported by definition).
+            this.costUsd += event.cost;
+            this.reportedCostUsd += event.cost;
+            this.reportedCalls += 1;
         }
         // 4. Tool tracking from FollowEvent
         if (event.type === 'tool_use' && event.toolName) {
@@ -309,7 +318,16 @@ class EventAggregator {
             cacheReadTokens: this.cacheReadTokens,
             reasoningTokens: this.reasoningTokens,
             totalTokens: this.totalTokens,
-            reportedCost: this.reportedCost,
+            costUsd: this.costUsd,
+            reportedCostUsd: this.reportedCostUsd,
+            estimatedCostUsd: this.estimatedCostUsd,
+            unpricedCalls: this.unpricedCalls,
+            costProvenance: (0, costProvenance_1.classifyCostProvenance)({
+                reportedCalls: this.reportedCalls,
+                estimatedCalls: this.estimatedCalls,
+                unpricedCalls: this.unpricedCalls,
+            }),
+            reportedCost: this.costUsd,
         };
     }
     getModelStats() {
@@ -427,7 +445,12 @@ class EventAggregator {
         this.cacheReadTokens = 0;
         this.reasoningTokens = 0;
         this.totalTokens = 0;
-        this.reportedCost = 0;
+        this.costUsd = 0;
+        this.reportedCostUsd = 0;
+        this.estimatedCostUsd = 0;
+        this.reportedCalls = 0;
+        this.estimatedCalls = 0;
+        this.unpricedCalls = 0;
         this.modelUsage.clear();
         this.currentContextSize = 0;
         this.previousContextSize = 0;
@@ -503,7 +526,13 @@ class EventAggregator {
                 cacheRead: this.cacheReadTokens,
                 reasoning: this.reasoningTokens,
                 total: this.totalTokens,
-                reportedCost: this.reportedCost,
+                reportedCost: this.costUsd,
+                costUsd: this.costUsd,
+                reportedCostUsd: this.reportedCostUsd,
+                estimatedCostUsd: this.estimatedCostUsd,
+                reportedCalls: this.reportedCalls,
+                estimatedCalls: this.estimatedCalls,
+                unpricedCalls: this.unpricedCalls,
             },
             modelUsage: Array.from(this.modelUsage.entries()),
             contextSize: this.currentContextSize,
@@ -550,7 +579,12 @@ class EventAggregator {
         this.cacheReadTokens = state.tokens.cacheRead;
         this.reasoningTokens = state.tokens.reasoning;
         this.totalTokens = state.tokens.total;
-        this.reportedCost = state.tokens.reportedCost;
+        this.costUsd = state.tokens.costUsd;
+        this.reportedCostUsd = state.tokens.reportedCostUsd;
+        this.estimatedCostUsd = state.tokens.estimatedCostUsd;
+        this.reportedCalls = state.tokens.reportedCalls;
+        this.estimatedCalls = state.tokens.estimatedCalls;
+        this.unpricedCalls = state.tokens.unpricedCalls;
         this.modelUsage = new Map(state.modelUsage);
         this.currentContextSize = state.contextSize;
         this.previousContextSize = state.previousContextSize;
@@ -619,7 +653,18 @@ class EventAggregator {
         this.cacheReadTokens += cacheRead;
         this.reasoningTokens += reasoningTok;
         this.totalTokens += usage.totalTokens;
-        this.reportedCost += cost;
+        this.costUsd += cost;
+        if (pricedUsage.source === 'provider-reported') {
+            this.reportedCostUsd += cost;
+            this.reportedCalls += 1;
+        }
+        else if (pricedUsage.source === 'unpriced') {
+            this.unpricedCalls += 1;
+        }
+        else {
+            this.estimatedCostUsd += cost;
+            this.estimatedCalls += 1;
+        }
         // Burn rate sample accumulation
         this.tokensSinceLastSample += usage.totalTokens;
         // Context size computation

package/dist/aggregation/costProvenance.d.ts

@@ -0,0 +1,14 @@
+import type { AggregatedCostProvenance, AggregatedTokens } from './types';
+/** The fields `describeCostProvenance` reads; any `AggregatedTokens` qualifies. */
+export type AggregatedCostProvenanceInput = Pick<AggregatedTokens, 'costProvenance' | 'unpricedCalls'>;
+/**
+ * Human-readable qualifier for an aggregate cost, for report footers and
+ * table cells. Empty when there is nothing to qualify.
+ */
+export declare function describeCostProvenance(tokens: AggregatedCostProvenanceInput): string;
+/** Classify a cost breakdown by how many events fell into each bucket. */
+export declare function classifyCostProvenance(counts: {
+    reportedCalls: number;
+    estimatedCalls: number;
+    unpricedCalls: number;
+}): AggregatedCostProvenance;

package/dist/aggregation/costProvenance.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.describeCostProvenance = describeCostProvenance;
+exports.classifyCostProvenance = classifyCostProvenance;
+const PROVENANCE_LABELS = {
+    reported: 'provider-reported',
+    estimated: 'estimated from catalog pricing',
+    mixed: 'partly provider-reported, partly estimated',
+    unpriced: 'unpriced',
+    none: '',
+};
+/**
+ * Human-readable qualifier for an aggregate cost, for report footers and
+ * table cells. Empty when there is nothing to qualify.
+ */
+function describeCostProvenance(tokens) {
+    const base = PROVENANCE_LABELS[tokens.costProvenance] ?? '';
+    const unpriced = tokens.unpricedCalls > 0
+        ? `${tokens.unpricedCalls} unpriced call${tokens.unpricedCalls === 1 ? '' : 's'}`
+        : '';
+    if (base && unpriced)
+        return `${base} · ${unpriced}`;
+    return base || unpriced;
+}
+/** Classify a cost breakdown by how many events fell into each bucket. */
+function classifyCostProvenance(counts) {
+    const { reportedCalls, estimatedCalls, unpricedCalls } = counts;
+    if (reportedCalls > 0 && estimatedCalls > 0)
+        return 'mixed';
+    if (reportedCalls > 0)
+        return 'reported';
+    if (estimatedCalls > 0)
+        return 'estimated';
+    return unpricedCalls > 0 ? 'unpriced' : 'none';
+}

package/dist/aggregation/snapshot.d.ts

@@ -8,6 +8,8 @@
  * @module aggregation/snapshot
  */
 import { type SerializedAggregatorState } from './EventAggregator';
+/** Newest snapshots kept on disk; older ones are pruned opportunistically. */
+export declare const MAX_SNAPSHOT_FILES = 200;
 /** Snapshot sidecar file content. */
 export interface SessionSnapshot {
     /** Schema version for forward-compatibility checks. */
@@ -32,10 +34,19 @@ export declare function getSnapshotPath(sessionId: string): string;
 /**
  * Saves a session snapshot to disk.
  *
- * Creates the snapshots directory if it doesn't exist.
- * Writes atomically via rename to avoid partial reads.
+ * Creates the snapshots directory if it doesn't exist. Uses the shared
+ * fsynced atomic writer with a per-process temp name, so the CLI dashboard and
+ * the extension host snapshotting the same session cannot collide on a shared
+ * `.tmp` file. Every {@link PRUNE_EVERY_N_SAVES} saves the directory is
+ * trimmed to the newest {@link MAX_SNAPSHOT_FILES}; snapshots are caches, so
+ * dropping an old one only costs a replay.
  */
 export declare function saveSnapshot(snapshot: SessionSnapshot): void;
+/**
+ * Deletes all but the newest `keep` snapshot files (by modification time).
+ * Returns how many files were removed. Best-effort; never throws.
+ */
+export declare function pruneSnapshots(keep?: number): number;
 /**
  * Loads a session snapshot from disk if it exists and is valid.
  *

package/dist/aggregation/snapshot.js

@@ -42,17 +42,25 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MAX_SNAPSHOT_FILES = void 0;
 exports.getSnapshotPath = getSnapshotPath;
 exports.saveSnapshot = saveSnapshot;
+exports.pruneSnapshots = pruneSnapshots;
 exports.loadSnapshot = loadSnapshot;
 exports.deleteSnapshot = deleteSnapshot;
 exports.isSnapshotValid = isSnapshotValid;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const paths_1 = require("../paths");
+const atomic_1 = require("../writers/atomic");
 const EventAggregator_1 = require("./EventAggregator");
 /** Current schema version — bump when format changes. */
 const SNAPSHOT_VERSION = EventAggregator_1.SNAPSHOT_SCHEMA_VERSION;
+/** Newest snapshots kept on disk; older ones are pruned opportunistically. */
+exports.MAX_SNAPSHOT_FILES = 200;
+/** Prune runs once per this many saves, so steady-state writes stay one file each. */
+const PRUNE_EVERY_N_SAVES = 25;
+let savesSincePrune = 0;
 /** Returns the directory for snapshot files. */
 function getSnapshotsDir() {
     return path.join((0, paths_1.getConfigDir)(), 'snapshots');
@@ -66,8 +74,12 @@ function getSnapshotPath(sessionId) {
 /**
  * Saves a session snapshot to disk.
  *
- * Creates the snapshots directory if it doesn't exist.
- * Writes atomically via rename to avoid partial reads.
+ * Creates the snapshots directory if it doesn't exist. Uses the shared
+ * fsynced atomic writer with a per-process temp name, so the CLI dashboard and
+ * the extension host snapshotting the same session cannot collide on a shared
+ * `.tmp` file. Every {@link PRUNE_EVERY_N_SAVES} saves the directory is
+ * trimmed to the newest {@link MAX_SNAPSHOT_FILES}; snapshots are caches, so
+ * dropping an old one only costs a replay.
  */
 function saveSnapshot(snapshot) {
     try {
@@ -75,15 +87,54 @@ function saveSnapshot(snapshot) {
         if (!fs.existsSync(dir)) {
             fs.mkdirSync(dir, { recursive: true });
         }
-        const filePath = getSnapshotPath(snapshot.sessionId);
-        const tmpPath = filePath + '.tmp';
-        fs.writeFileSync(tmpPath, JSON.stringify(snapshot), 'utf-8');
-        fs.renameSync(tmpPath, filePath);
+        (0, atomic_1.atomicWriteJsonSync)(getSnapshotPath(snapshot.sessionId), snapshot);
+        savesSincePrune += 1;
+        if (savesSincePrune >= PRUNE_EVERY_N_SAVES) {
+            savesSincePrune = 0;
+            pruneSnapshots(exports.MAX_SNAPSHOT_FILES);
+        }
     }
     catch {
         // Non-critical — snapshot failure should never break session monitoring
     }
 }
+/**
+ * Deletes all but the newest `keep` snapshot files (by modification time).
+ * Returns how many files were removed. Best-effort; never throws.
+ */
+function pruneSnapshots(keep = exports.MAX_SNAPSHOT_FILES) {
+    try {
+        const dir = getSnapshotsDir();
+        const entries = fs
+            .readdirSync(dir)
+            .filter((name) => name.endsWith('.json'))
+            .map((name) => {
+            const filePath = path.join(dir, name);
+            try {
+                return { filePath, mtimeMs: fs.statSync(filePath).mtimeMs };
+            }
+            catch {
+                return null;
+            }
+        })
+            .filter((entry) => entry !== null)
+            .sort((a, b) => b.mtimeMs - a.mtimeMs);
+        let removed = 0;
+        for (const entry of entries.slice(Math.max(0, keep))) {
+            try {
+                fs.unlinkSync(entry.filePath);
+                removed += 1;
+            }
+            catch {
+                // Already gone or locked; skip.
+            }
+        }
+        return removed;
+    }
+    catch {
+        return 0;
+    }
+}
 /**
  * Loads a session snapshot from disk if it exists and is valid.
  *

package/dist/aggregation/types.d.ts

@@ -50,7 +50,17 @@ export interface EventAggregatorOptions {
     /** Read a plan file from disk (fallback when Edit tool is used instead of Write). */
     readPlanFile?: (path: string) => string | null;
 }
-/** Token accumulation totals (aggregation-specific, includes reportedCost). */
+/**
+ * How an aggregate cost figure was produced.
+ *
+ * - `reported`  — every priced event carried a provider-reported cost.
+ * - `estimated` — every priced event was priced from the model catalog.
+ * - `mixed`     — some events reported, some estimated.
+ * - `unpriced`  — no event could be priced at all.
+ * - `none`      — no usage events yet.
+ */
+export type AggregatedCostProvenance = 'reported' | 'estimated' | 'mixed' | 'unpriced' | 'none';
+/** Token accumulation totals (aggregation-specific, includes cost). */
 export interface AggregatedTokens {
     inputTokens: number;
     outputTokens: number;
@@ -59,6 +69,25 @@ export interface AggregatedTokens {
     reasoningTokens: number;
     /** Overall total after applying provider reasoning-in-output semantics. */
     totalTokens: number;
+    /**
+     * Cost in USD for the priced portion of the session. Read `costProvenance`
+     * before labelling it: only `'reported'` came from the provider; anything
+     * else includes Sidekick's own catalog estimate.
+     */
+    costUsd: number;
+    /** Portion of `costUsd` the provider reported itself. */
+    reportedCostUsd: number;
+    /** Portion of `costUsd` Sidekick estimated from catalog pricing. */
+    estimatedCostUsd: number;
+    /** Usage events that had neither a reported cost nor a catalog price. */
+    unpricedCalls: number;
+    /** Classification of `costUsd`. */
+    costProvenance: AggregatedCostProvenance;
+    /**
+     * @deprecated Same value as `costUsd`. Despite the name it has always mixed
+     * catalog estimates with provider-reported figures; use `costUsd` together
+     * with `costProvenance`.
+     */
     reportedCost: number;
 }
 /** Per-model usage breakdown. */

package/dist/analytics/compactionLedger.js

@@ -2,18 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateCompactionLedger = calculateCompactionLedger;
 exports.formatCompactionLedger = formatCompactionLedger;
-const modelInfo_1 = require("../modelInfo");
+const usageNormalization_1 = require("../usageNormalization");
 function calculateCompactionLedger(events, model) {
     const tokensEvicted = events.reduce((sum, event) => sum + Math.max(0, event.tokensReclaimed), 0);
     const reportedCount = events.filter((event) => event.source === 'reported').length;
     const heuristicCount = events.length - reportedCount;
-    const pricing = model ? (0, modelInfo_1.getModelPricing)(model) : null;
+    // Re-establishing evicted context means sending it again as uncached input.
+    // Price it through the same normalized path every other cost figure uses so
+    // the ledger can never disagree with the session total on the same tokens.
+    const reestablishment = model
+        ? (0, usageNormalization_1.calculateNormalizedUsageCost)({
+            usage: (0, usageNormalization_1.normalizeProviderUsage)({
+                semantics: 'sidekick',
+                inputTokens: tokensEvicted,
+                reasoningIncludedInOutput: true,
+            }),
+            modelId: model,
+        })
+        : null;
     return {
         count: events.length,
         tokensEvicted,
-        reestablishmentCostUsd: pricing
-            ? (0, modelInfo_1.calculateCostWithPricing)({ inputTokens: tokensEvicted, outputTokens: 0, cacheWriteTokens: 0, cacheReadTokens: 0 }, pricing)
-            : null,
+        reestablishmentCostUsd: reestablishment?.costUsd ?? null,
         source: reportedCount > 0 && heuristicCount > 0
             ? 'mixed'
             : reportedCount > 0

package/dist/analytics/qualityScore.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scoreSessionQuality = scoreSessionQuality;
 exports.calculateQualityTrend = calculateQualityTrend;
+const tokenSummary_1 = require("../tokenSummary");
 function awarded(maximum, ratio) {
     return Math.round(maximum * Math.max(0, Math.min(1, ratio)) * 10) / 10;
 }
@@ -10,7 +11,7 @@ function scoreSessionQuality(metrics) {
     const latencyRatio = latencyMs > 0 ? 1 - Math.min(1, latencyMs / 15_000) : 1;
     const completedCalls = metrics.toolStats.reduce((sum, tool) => sum + tool.completedCount, 0);
     const errorRate = completedCalls > 0 ? metrics.errorRollup.totalFailures / completedCalls : 0;
-    const contextTokens = Math.max(1, metrics.tokens.inputTokens + metrics.tokens.cacheReadTokens + metrics.tokens.cacheWriteTokens);
+    const contextTokens = Math.max(1, (0, tokenSummary_1.summarizeTokens)(metrics.tokens).context);
     const evicted = metrics.compactionEvents.reduce((sum, event) => sum + event.tokensReclaimed, 0);
     const contextRatio = 1 - Math.min(1, evicted / contextTokens);
     const start = metrics.sessionStartTime ? Date.parse(metrics.sessionStartTime) : NaN;

package/dist/browser.d.ts

@@ -11,11 +11,13 @@ export { getModelContextWindowSize, resolveModelContextWindow, DEFAULT_CONTEXT_W
 export type { ModelCatalogMatch, ModelContextWindowProvenance, ModelContextWindowSource, ResolvedModelContextWindow, } from './modelContext';
 export { normalizeProviderUsage, extractNormalizedUsage, calculateNormalizedUsageCost, } from './usageNormalization';
 export type { UsageProvider, UsageSemantics, UsageNormalizationProvenance, ProviderUsageInput, AnthropicUsageInput, OpenAIUsageInput, SidekickUsageInput, NormalizedUsage, PricingProvenance, NormalizedUsageCostInput, NormalizedUsageCost, } from './usageNormalization';
+export { summarizeTokens, sumTokenTotals, TOKEN_CONTEXT_LABEL, TOKEN_TOTAL_LABEL, } from './tokenSummary';
+export type { TokenSummary, TokenTotalsLike } from './tokenSummary';
 export { estimateTextTokens, estimateSerializedTokens } from './tokenEstimation';
 export type { ExactTokenCounterContext, ExactTokenCounter, TokenEstimationMethod, TokenEstimationConfidence, TokenEstimationOptions, TokenEstimate, } from './tokenEstimation';
 export { projectSessionTranscript } from './transcript';
 export type { TranscriptFidelity, TranscriptSourceProvenance, CanonicalTranscriptBlock, CanonicalTranscriptMessage, CanonicalToolCall, CanonicalTranscriptUsageTotals, CanonicalSessionTranscript, ProjectSessionTranscriptOptions, } from './transcript';
-export { formatDurationMs, formatTokenCount } from './formatting';
+export { addLocalDays, formatDurationMs, formatLocalDateKey, formatTokenCount, parseLocalDateKey, } from './formatting';
 export type { FormatDurationMsOptions, FormatTokenCountOptions } from './formatting';
 export { parseMcpToolName } from './parsers/mcpToolName';
 export type { McpToolNameParts } from './parsers/mcpToolName';
@@ -29,3 +31,11 @@ export { parseModelId, getModelPricing, resolveModelPricing, getModelInfo, calcu
 export type { ModelPricing, CostTokenUsage, CostSource, CostProvenanceInput, CostWithProvenance, ModelProvider, ParsedModelId, ModelInfo, ModelDisplayInfo, ModelPricingMatch, ModelPricingProvenance, ModelPricingSource, ResolvedModelPricing, } from './modelInfo';
 export { exportResolvedModelCatalog, importResolvedModelCatalog, registerModelAlias, resolveModelAlias, RESOLVED_MODEL_CATALOG_SCHEMA_VERSION, } from './modelCatalog';
 export type { ImportResolvedModelCatalogResult, ResolvedModelCatalogEntry, ResolvedModelCatalogSnapshot, } from './modelCatalog';
+export { BILLING_BLOCK_DURATION_MS, computeBillingBlocks, findActiveBillingBlock, } from './usage/billingBlocks';
+export type { BillingBlock, BillingBlockInput, BillingBlockModelUsage, BillingBlockTokens, ComputeBillingBlocksOptions, } from './usage/billingBlocks';
+export { bucketUsage, summarizeUsageRows, usageBucketKey, weekKey } from './usage/usageReports';
+export type { BucketUsageOptions, UsageBucketRow, UsageGranularity, UsageGroupDimension, UsageTotals, } from './usage/usageReports';
+export { applySessionSummary, isFileImported, markFileImported, removeSessionSummary, sessionSummaryFromStats, } from './historicalStore';
+export type { ApplySessionSummaryOptions, SessionSummaryFromStatsOptions } from './historicalStore';
+export { FAILING_TOOL_TREND_ARROWS, failingToolTrend, mergeFailingToolWindows, } from './failingTools';
+export type { FailingToolTrend, FailingToolTrendRow, FailingToolWindow } from './failingTools';

package/dist/browser.js

@@ -9,7 +9,8 @@
  * For pricing hydration (LiteLLM catalog refresh), use `sidekick-shared/node`.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RESOLVED_MODEL_CATALOG_SCHEMA_VERSION = exports.resolveModelAlias = exports.registerModelAlias = exports.importResolvedModelCatalog = exports.exportResolvedModelCatalog = exports.formatCost = exports.sortModelIds = exports.compareModelIds = exports.getModelDisplayInfo = exports.shortModelName = exports.mergeCostSources = exports.calculateCostWithProvenance = exports.calculateCostWithPricing = exports.calculateCost = exports.getModelInfo = exports.resolveModelPricing = exports.getModelPricing = exports.parseModelId = exports.segmentAssistantTurn = exports.reasoningSummary = exports.isAssistantTurnSubagentTool = exports.extractTurnSubagents = exports.assistantTurnEventsFromSessionEvents = exports.SESSION_PROVIDER_IDS = exports.RUNTIME_QUOTA_PROVIDER_IDS = exports.QUOTA_PROVIDER_IDS = exports.MODEL_PROVIDER_IDS = exports.ACCOUNT_PROVIDER_IDS = exports.createSessionContextProjector = exports.calculateSessionContextPressure = exports.buildSessionContextSnapshot = exports.parseMcpToolName = exports.formatTokenCount = exports.formatDurationMs = exports.projectSessionTranscript = exports.estimateSerializedTokens = exports.estimateTextTokens = exports.calculateNormalizedUsageCost = exports.extractNormalizedUsage = exports.normalizeProviderUsage = exports.DEFAULT_CONTEXT_WINDOW = exports.resolveModelContextWindow = exports.getModelContextWindowSize = void 0;
+exports.RESOLVED_MODEL_CATALOG_SCHEMA_VERSION = exports.resolveModelAlias = exports.registerModelAlias = exports.importResolvedModelCatalog = exports.exportResolvedModelCatalog = exports.formatCost = exports.sortModelIds = exports.compareModelIds = exports.getModelDisplayInfo = exports.shortModelName = exports.mergeCostSources = exports.calculateCostWithProvenance = exports.calculateCostWithPricing = exports.calculateCost = exports.getModelInfo = exports.resolveModelPricing = exports.getModelPricing = exports.parseModelId = exports.segmentAssistantTurn = exports.reasoningSummary = exports.isAssistantTurnSubagentTool = exports.extractTurnSubagents = exports.assistantTurnEventsFromSessionEvents = exports.SESSION_PROVIDER_IDS = exports.RUNTIME_QUOTA_PROVIDER_IDS = exports.QUOTA_PROVIDER_IDS = exports.MODEL_PROVIDER_IDS = exports.ACCOUNT_PROVIDER_IDS = exports.createSessionContextProjector = exports.calculateSessionContextPressure = exports.buildSessionContextSnapshot = exports.parseMcpToolName = exports.parseLocalDateKey = exports.formatTokenCount = exports.formatLocalDateKey = exports.formatDurationMs = exports.addLocalDays = exports.projectSessionTranscript = exports.estimateSerializedTokens = exports.estimateTextTokens = exports.TOKEN_TOTAL_LABEL = exports.TOKEN_CONTEXT_LABEL = exports.sumTokenTotals = exports.summarizeTokens = exports.calculateNormalizedUsageCost = exports.extractNormalizedUsage = exports.normalizeProviderUsage = exports.DEFAULT_CONTEXT_WINDOW = exports.resolveModelContextWindow = exports.getModelContextWindowSize = void 0;
+exports.mergeFailingToolWindows = exports.failingToolTrend = exports.FAILING_TOOL_TREND_ARROWS = exports.sessionSummaryFromStats = exports.removeSessionSummary = exports.markFileImported = exports.isFileImported = exports.applySessionSummary = exports.weekKey = exports.usageBucketKey = exports.summarizeUsageRows = exports.bucketUsage = exports.findActiveBillingBlock = exports.computeBillingBlocks = exports.BILLING_BLOCK_DURATION_MS = void 0;
 var modelContext_1 = require("./modelContext");
 Object.defineProperty(exports, "getModelContextWindowSize", { enumerable: true, get: function () { return modelContext_1.getModelContextWindowSize; } });
 Object.defineProperty(exports, "resolveModelContextWindow", { enumerable: true, get: function () { return modelContext_1.resolveModelContextWindow; } });
@@ -18,14 +19,22 @@ var usageNormalization_1 = require("./usageNormalization");
 Object.defineProperty(exports, "normalizeProviderUsage", { enumerable: true, get: function () { return usageNormalization_1.normalizeProviderUsage; } });
 Object.defineProperty(exports, "extractNormalizedUsage", { enumerable: true, get: function () { return usageNormalization_1.extractNormalizedUsage; } });
 Object.defineProperty(exports, "calculateNormalizedUsageCost", { enumerable: true, get: function () { return usageNormalization_1.calculateNormalizedUsageCost; } });
+var tokenSummary_1 = require("./tokenSummary");
+Object.defineProperty(exports, "summarizeTokens", { enumerable: true, get: function () { return tokenSummary_1.summarizeTokens; } });
+Object.defineProperty(exports, "sumTokenTotals", { enumerable: true, get: function () { return tokenSummary_1.sumTokenTotals; } });
+Object.defineProperty(exports, "TOKEN_CONTEXT_LABEL", { enumerable: true, get: function () { return tokenSummary_1.TOKEN_CONTEXT_LABEL; } });
+Object.defineProperty(exports, "TOKEN_TOTAL_LABEL", { enumerable: true, get: function () { return tokenSummary_1.TOKEN_TOTAL_LABEL; } });
 var tokenEstimation_1 = require("./tokenEstimation");
 Object.defineProperty(exports, "estimateTextTokens", { enumerable: true, get: function () { return tokenEstimation_1.estimateTextTokens; } });
 Object.defineProperty(exports, "estimateSerializedTokens", { enumerable: true, get: function () { return tokenEstimation_1.estimateSerializedTokens; } });
 var transcript_1 = require("./transcript");
 Object.defineProperty(exports, "projectSessionTranscript", { enumerable: true, get: function () { return transcript_1.projectSessionTranscript; } });
 var formatting_1 = require("./formatting");
+Object.defineProperty(exports, "addLocalDays", { enumerable: true, get: function () { return formatting_1.addLocalDays; } });
 Object.defineProperty(exports, "formatDurationMs", { enumerable: true, get: function () { return formatting_1.formatDurationMs; } });
+Object.defineProperty(exports, "formatLocalDateKey", { enumerable: true, get: function () { return formatting_1.formatLocalDateKey; } });
 Object.defineProperty(exports, "formatTokenCount", { enumerable: true, get: function () { return formatting_1.formatTokenCount; } });
+Object.defineProperty(exports, "parseLocalDateKey", { enumerable: true, get: function () { return formatting_1.parseLocalDateKey; } });
 var mcpToolName_1 = require("./parsers/mcpToolName");
 Object.defineProperty(exports, "parseMcpToolName", { enumerable: true, get: function () { return mcpToolName_1.parseMcpToolName; } });
 var sessionContext_1 = require("./context/sessionContext");
@@ -64,3 +73,22 @@ Object.defineProperty(exports, "importResolvedModelCatalog", { enumerable: true,
 Object.defineProperty(exports, "registerModelAlias", { enumerable: true, get: function () { return modelCatalog_1.registerModelAlias; } });
 Object.defineProperty(exports, "resolveModelAlias", { enumerable: true, get: function () { return modelCatalog_1.resolveModelAlias; } });
 Object.defineProperty(exports, "RESOLVED_MODEL_CATALOG_SCHEMA_VERSION", { enumerable: true, get: function () { return modelCatalog_1.RESOLVED_MODEL_CATALOG_SCHEMA_VERSION; } });
+var billingBlocks_1 = require("./usage/billingBlocks");
+Object.defineProperty(exports, "BILLING_BLOCK_DURATION_MS", { enumerable: true, get: function () { return billingBlocks_1.BILLING_BLOCK_DURATION_MS; } });
+Object.defineProperty(exports, "computeBillingBlocks", { enumerable: true, get: function () { return billingBlocks_1.computeBillingBlocks; } });
+Object.defineProperty(exports, "findActiveBillingBlock", { enumerable: true, get: function () { return billingBlocks_1.findActiveBillingBlock; } });
+var usageReports_1 = require("./usage/usageReports");
+Object.defineProperty(exports, "bucketUsage", { enumerable: true, get: function () { return usageReports_1.bucketUsage; } });
+Object.defineProperty(exports, "summarizeUsageRows", { enumerable: true, get: function () { return usageReports_1.summarizeUsageRows; } });
+Object.defineProperty(exports, "usageBucketKey", { enumerable: true, get: function () { return usageReports_1.usageBucketKey; } });
+Object.defineProperty(exports, "weekKey", { enumerable: true, get: function () { return usageReports_1.weekKey; } });
+var historicalStore_1 = require("./historicalStore");
+Object.defineProperty(exports, "applySessionSummary", { enumerable: true, get: function () { return historicalStore_1.applySessionSummary; } });
+Object.defineProperty(exports, "isFileImported", { enumerable: true, get: function () { return historicalStore_1.isFileImported; } });
+Object.defineProperty(exports, "markFileImported", { enumerable: true, get: function () { return historicalStore_1.markFileImported; } });
+Object.defineProperty(exports, "removeSessionSummary", { enumerable: true, get: function () { return historicalStore_1.removeSessionSummary; } });
+Object.defineProperty(exports, "sessionSummaryFromStats", { enumerable: true, get: function () { return historicalStore_1.sessionSummaryFromStats; } });
+var failingTools_1 = require("./failingTools");
+Object.defineProperty(exports, "FAILING_TOOL_TREND_ARROWS", { enumerable: true, get: function () { return failingTools_1.FAILING_TOOL_TREND_ARROWS; } });
+Object.defineProperty(exports, "failingToolTrend", { enumerable: true, get: function () { return failingTools_1.failingToolTrend; } });
+Object.defineProperty(exports, "mergeFailingToolWindows", { enumerable: true, get: function () { return failingTools_1.mergeFailingToolWindows; } });

package/dist/codexProfiles.d.ts

@@ -31,7 +31,9 @@ export declare function resolveSidekickCodexHome(): string;
  * isn't the current active pointer, the pointer is re-pointed so registry-keyed data
  * (quota history, auto-switch) tracks reality too. Never creates or deletes profiles.
  */
-export declare function resolveActiveCodexAccount(): ResolvedActiveAccount;
+export declare function resolveActiveCodexAccount(options?: {
+    selfHeal?: boolean;
+}): ResolvedActiveAccount;
 export declare function getCodexExecutionEnv(baseEnv?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
 export declare function prepareCodexAccount(label: string): CodexAccountManagerResult;
 /** {@link prepareCodexAccount} without blocking the event loop on CLI probes. */

package/dist/codexProfiles.js

@@ -380,13 +380,15 @@ function resolveSidekickCodexHome() {
  * isn't the current active pointer, the pointer is re-pointed so registry-keyed data
  * (quota history, auto-switch) tracks reality too. Never creates or deletes profiles.
  */
-function resolveActiveCodexAccount() {
+function resolveActiveCodexAccount(options = {}) {
+    const selfHeal = options.selfHeal ?? true;
     const identity = readAuthIdentityFromRaw(readFileOrNull(path.join(resolveSidekickCodexHome(), 'auth.json')));
     if (identity && (identity.email || identity.workspaceId)) {
         const match = findProfileForIdentity(identity);
         if (match) {
             const active = (0, accountRegistry_1.getActiveSavedAccount)('codex');
-            if (!active || active.id !== match.id) {
+            // See resolveActiveClaudeAccount: hot paths opt out of the repair write.
+            if (selfHeal && (!active || active.id !== match.id)) {
                 // Self-heal is best-effort: a registry write failure (read-only/full
                 // disk) must never break display, extension activation, or the quota
                 // watcher's hot path. We still return the correct live identity below.

package/dist/codexQuota.d.ts

@@ -35,6 +35,8 @@ export interface CodexQuotaApiOptions {
     signal?: AbortSignal;
     timeoutMs?: number;
 }
+/** Stamp a Codex quota sample with its runtime provider, projections, and account identity. */
+export declare function enrichCodexQuota(state: QuotaState, account: SavedAccountProfile | null): ProviderQuotaState<'codex'>;
 export declare function quotaFromCodexRateLimits(rateLimits: CodexRateLimits | null | undefined, source?: 'api' | 'session' | 'cache', capturedAt?: string): QuotaState | null;
 export declare function readLatestCodexQuotaFromRollouts(sessionPaths: string[], options?: {
     source?: 'session' | 'cache';