sidekick-shared 0.23.0 → 0.24.0

package/dist/aggregation/EventAggregator.js

@@ -9,7 +9,7 @@
  * @module aggregation/EventAggregator
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventAggregator = void 0;
+exports.EventAggregator = exports.SNAPSHOT_SCHEMA_VERSION = void 0;
 exports.parseTodoDependencies = parseTodoDependencies;
 const jsonl_1 = require("../parsers/jsonl");
 const planExtractor_1 = require("../parsers/planExtractor");
@@ -19,16 +19,18 @@ const noiseClassifier_1 = require("../formatters/noiseClassifier");
 const FrequencyTracker_1 = require("./FrequencyTracker");
 const HeatmapTracker_1 = require("./HeatmapTracker");
 const PatternExtractor_1 = require("./PatternExtractor");
-const modelInfo_1 = require("../modelInfo");
 const errorTaxonomy_1 = require("../extractors/errorTaxonomy");
+const tokenEstimation_1 = require("../tokenEstimation");
+const usageNormalization_1 = require("../usageNormalization");
 // ── Defaults ──
 const DEFAULT_TIMELINE_CAP = 200;
 const DEFAULT_LATENCY_CAP = 100;
+const DEFAULT_CONTEXT_TIMELINE_CAP = 2_000;
 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. */
-const SNAPSHOT_SCHEMA_VERSION = 3;
+exports.SNAPSHOT_SCHEMA_VERSION = 4;
 // ── 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 ──
@@ -74,6 +76,8 @@ class EventAggregator {
     outputTokens = 0;
     cacheWriteTokens = 0;
     cacheReadTokens = 0;
+    reasoningTokens = 0;
+    totalTokens = 0;
     reportedCost = 0;
     // Per-model usage
     modelUsage = new Map();
@@ -127,6 +131,7 @@ class EventAggregator {
     permissionModeHistory = [];
     // Context timeline
     contextTimeline = [];
+    contextTimelineCap;
     contextTurnIndex = 0;
     // Timeline
     timeline = [];
@@ -150,6 +155,7 @@ class EventAggregator {
         this.latencyCap = options?.latencyCap ?? DEFAULT_LATENCY_CAP;
         this.burnWindowMs = options?.burnWindowMs ?? DEFAULT_BURN_WINDOW_MS;
         this.burnSampleMs = options?.burnSampleMs ?? DEFAULT_BURN_SAMPLE_MS;
+        this.contextTimelineCap = options?.contextTimelineCap ?? DEFAULT_CONTEXT_TIMELINE_CAP;
         this.computeContextSize = options?.computeContextSize ?? null;
         this.providerId = options?.providerId ?? null;
         this._providerId = this.providerId;
@@ -165,18 +171,25 @@ class EventAggregator {
             this.sessionStartTime = event.timestamp;
         }
         this.lastEventTime = event.timestamp;
-        // Guard: some event types (e.g. 'summary') have no message field in the raw JSONL
+        this.recordProviderMetadata(event);
+        // Bookkeeping rows can be useful without a message payload.
         if (!event.message) {
+            if (event.type === 'summary') {
+                this.recordExplicitCompaction(event.timestamp, event.compaction);
+            }
+            this.trackPermissionMode(event);
+            this.addTimelineFromSessionEvent(event);
+            this.feedAnalytics(event.timestamp, event.type === 'summary' ? (event.summary ?? '') : '', this.extractToolNameFromEvent(event));
             return;
         }
         // 2. Track model
         if (event.message.model) {
             this.currentModel = event.message.model;
         }
-        this.recordProviderMetadata(event);
         // 3. Skip system/audit events and synthetic token-count events for messageCount
         const msgId = event.message.id ?? '';
-        if (event.type !== 'system' && !msgId.startsWith('token-count-')) {
+        if ((event.type === 'user' || event.type === 'assistant') &&
+            !msgId.startsWith('token-count-')) {
             this.messageCount++;
         }
         // 4. Latency tracking
@@ -184,9 +197,10 @@ class EventAggregator {
             this.processLatency(event);
         }
         // 5. Token accumulation
-        if (event.message.usage) {
-            const usageCost = this.accumulateUsage(event.message.usage, event.timestamp, event.message.model);
-            this.attributePlanUsage(event.message.usage.input_tokens + event.message.usage.output_tokens, usageCost);
+        const normalizedUsage = (0, usageNormalization_1.extractNormalizedUsage)(event);
+        if (normalizedUsage) {
+            const usageCost = this.accumulateUsage(normalizedUsage, event.timestamp, event.message.model);
+            this.attributePlanUsage(normalizedUsage.totalTokens, usageCost);
         }
         if (event.type !== 'system') {
             // 6. Tool extraction from content blocks
@@ -232,91 +246,25 @@ class EventAggregator {
         }
         // 3. Token accumulation from FollowEvent fields
         if (event.tokens) {
-            const inputTok = event.tokens.input;
-            const outputTok = event.tokens.output;
-            const cacheRead = event.cacheTokens?.read ?? 0;
-            const cacheWrite = event.cacheTokens?.write ?? 0;
-            this.inputTokens += inputTok;
-            this.outputTokens += outputTok;
-            this.cacheReadTokens += cacheRead;
-            this.cacheWriteTokens += cacheWrite;
-            this.attributePlanUsage(inputTok + outputTok, event.cost ?? 0);
-            // Tokens since last burn sample
-            this.tokensSinceLastSample += inputTok + outputTok;
-            // Context size
-            let contextSize;
-            if (this.computeContextSize) {
-                contextSize = this.computeContextSize({
-                    inputTokens: inputTok,
-                    outputTokens: outputTok,
-                    cacheWriteTokens: cacheWrite,
-                    cacheReadTokens: cacheRead,
-                });
-            }
-            else {
-                contextSize = inputTok + cacheWrite + cacheRead;
-            }
-            // Compaction detection
-            if (this.resolvePendingHeuristicCompaction(contextSize)) {
-                // The drop belongs to the explicit compaction marker just recorded.
-            }
-            else if (this.previousContextSize > 0 &&
-                contextSize < this.previousContextSize * COMPACTION_DROP_THRESHOLD) {
-                this.compactionEvents.push({
-                    timestamp: new Date(event.timestamp),
-                    contextBefore: this.previousContextSize,
-                    contextAfter: contextSize,
-                    tokensReclaimed: this.previousContextSize - contextSize,
-                    source: 'heuristic',
-                });
-            }
-            this.previousContextSize = contextSize;
-            this.currentContextSize = contextSize;
-            // Per-model usage. If the provider reported a cost, use it; otherwise
-            // resolve pricing from the catalog (null = unpriced → priced: false,
-            // UI renders "—").
-            if (event.model) {
-                const model = event.model;
-                const pricing = event.cost ? null : (0, modelInfo_1.getModelPricing)(model);
-                const computed = event.cost
-                    ? event.cost
-                    : pricing
-                        ? (0, modelInfo_1.calculateCostWithPricing)({
-                            inputTokens: inputTok,
-                            outputTokens: outputTok,
-                            cacheWriteTokens: cacheWrite,
-                            cacheReadTokens: cacheRead,
-                        }, pricing)
-                        : 0;
-                const evPriced = event.cost != null || pricing != null;
-                const acc = this.modelUsage.get(model) ?? {
-                    calls: 0,
-                    tokens: 0,
-                    inputTokens: 0,
-                    outputTokens: 0,
-                    cacheWriteTokens: 0,
-                    cacheReadTokens: 0,
-                    cost: 0,
-                    priced: true,
-                };
-                acc.calls++;
-                acc.tokens += inputTok + outputTok;
-                acc.inputTokens += inputTok;
-                acc.outputTokens += outputTok;
-                acc.cacheWriteTokens += cacheWrite;
-                acc.cacheReadTokens += cacheRead;
-                acc.cost += computed;
-                if (!evPriced)
-                    acc.priced = false;
-                this.modelUsage.set(model, acc);
-            }
+            const normalized = (0, usageNormalization_1.normalizeProviderUsage)({
+                semantics: 'sidekick',
+                provider: event.providerId,
+                source: 'follow-event',
+                model: event.model,
+                inputTokens: event.tokens.input,
+                outputTokens: event.tokens.output,
+                cacheReadTokens: event.cacheTokens?.read,
+                cacheWriteTokens: event.cacheTokens?.write,
+                reasoningIncludedInOutput: false,
+                reportedCostUsd: event.cost,
+            });
+            const cost = this.accumulateUsage(normalized, event.timestamp, event.model);
+            this.attributePlanUsage(normalized.totalTokens, cost);
         }
-        // Cost accumulation
-        if (event.cost) {
+        else if (typeof event.cost === 'number' && Number.isFinite(event.cost) && event.cost >= 0) {
+            // Compatibility for cost-only follow events.
             this.reportedCost += event.cost;
         }
-        // Burn rate sampling
-        this.updateBurnRate(event.timestamp);
         // 4. Tool tracking from FollowEvent
         if (event.type === 'tool_use' && event.toolName) {
             this.recordFollowToolUse(event);
@@ -346,7 +294,7 @@ class EventAggregator {
         // 12. Gonzo/Lazyjournal analytics
         this.feedAnalytics(event.timestamp, event.summary, event.toolName);
         // Message count (skip system events)
-        if (event.type !== 'system') {
+        if (event.type === 'user' || event.type === 'assistant') {
             this.messageCount++;
         }
     }
@@ -359,6 +307,8 @@ class EventAggregator {
             outputTokens: this.outputTokens,
             cacheWriteTokens: this.cacheWriteTokens,
             cacheReadTokens: this.cacheReadTokens,
+            reasoningTokens: this.reasoningTokens,
+            totalTokens: this.totalTokens,
             reportedCost: this.reportedCost,
         };
     }
@@ -475,6 +425,8 @@ class EventAggregator {
         this.outputTokens = 0;
         this.cacheWriteTokens = 0;
         this.cacheReadTokens = 0;
+        this.reasoningTokens = 0;
+        this.totalTokens = 0;
         this.reportedCost = 0;
         this.modelUsage.clear();
         this.currentContextSize = 0;
@@ -543,12 +495,14 @@ class EventAggregator {
     /** Serializes all mutable state to a JSON-safe object for snapshot persistence. */
     serialize() {
         return {
-            version: SNAPSHOT_SCHEMA_VERSION,
+            version: exports.SNAPSHOT_SCHEMA_VERSION,
             tokens: {
                 input: this.inputTokens,
                 output: this.outputTokens,
                 cacheWrite: this.cacheWriteTokens,
                 cacheRead: this.cacheReadTokens,
+                reasoning: this.reasoningTokens,
+                total: this.totalTokens,
                 reportedCost: this.reportedCost,
             },
             modelUsage: Array.from(this.modelUsage.entries()),
@@ -587,13 +541,15 @@ class EventAggregator {
     }
     /** Restores mutable state from a serialized snapshot. Clears transient state (pending calls). */
     restore(state) {
-        if (state.version !== SNAPSHOT_SCHEMA_VERSION) {
-            return; // Incompatible snapshot — caller should fall back to full replay
+        if (state.version !== exports.SNAPSHOT_SCHEMA_VERSION) {
+            return false;
         }
         this.inputTokens = state.tokens.input;
         this.outputTokens = state.tokens.output;
         this.cacheWriteTokens = state.tokens.cacheWrite;
         this.cacheReadTokens = state.tokens.cacheRead;
+        this.reasoningTokens = state.tokens.reasoning;
+        this.totalTokens = state.tokens.total;
         this.reportedCost = state.tokens.reportedCost;
         this.modelUsage = new Map(state.modelUsage);
         this.currentContextSize = state.contextSize;
@@ -617,7 +573,9 @@ class EventAggregator {
         this.permissionModeHistory = state.permissionModeHistory
             ? [...state.permissionModeHistory]
             : [];
-        this.contextTimeline = state.contextTimeline ? [...state.contextTimeline] : [];
+        this.contextTimeline = state.contextTimeline
+            ? state.contextTimeline.slice(-this.contextTimelineCap)
+            : [];
         this.contextTurnIndex = state.contextTurnIndex ?? 0;
         this.timeline = [...state.timeline];
         this.messageCount = state.messageCount;
@@ -640,46 +598,30 @@ class EventAggregator {
         this.pendingSubagents.clear();
         this.pendingUserRequest = null;
         this.planExtractor.reset();
+        return true;
     }
     // ═══════════════════════════════════════════════════════════════════════
     // Private: Token & Context
     // ═══════════════════════════════════════════════════════════════════════
     accumulateUsage(usage, timestamp, model) {
-        const inputTok = usage.input_tokens;
-        const outputTok = usage.output_tokens;
-        const cacheWrite = usage.cache_creation_input_tokens ?? 0;
-        const cacheRead = usage.cache_read_input_tokens ?? 0;
-        const reasoningTok = usage.reasoning_tokens ?? 0;
-        const reported = usage.reported_cost ?? 0;
-        // Resolve provider pricing when we have a model ID. Lets sessions with no
-        // reported_cost (Claude Code, Codex) still show real dollar figures.
+        const inputTok = usage.uncachedInputTokens;
+        const outputTok = usage.outputTokens;
+        const cacheWrite = usage.cacheWriteTokens;
+        const cacheRead = usage.cacheReadTokens;
+        const reasoningTok = usage.reasoningTokens;
         const modelKey = model ?? this.currentModel;
-        const pricing = modelKey ? (0, modelInfo_1.getModelPricing)(modelKey) : null;
-        let priced = reported > 0 || pricing !== null;
-        let cost;
-        if (reported > 0) {
-            cost = reported;
-        }
-        else if (pricing) {
-            cost = (0, modelInfo_1.calculateCostWithPricing)({
-                inputTokens: inputTok,
-                outputTokens: outputTok,
-                cacheWriteTokens: cacheWrite,
-                cacheReadTokens: cacheRead,
-                reasoningTokens: reasoningTok,
-            }, pricing);
-        }
-        else {
-            cost = 0;
-            priced = false;
-        }
+        const pricedUsage = (0, usageNormalization_1.calculateNormalizedUsageCost)({ usage, modelId: modelKey ?? undefined });
+        const priced = pricedUsage.source !== 'unpriced';
+        const cost = pricedUsage.costUsd ?? 0;
         this.inputTokens += inputTok;
         this.outputTokens += outputTok;
         this.cacheWriteTokens += cacheWrite;
         this.cacheReadTokens += cacheRead;
+        this.reasoningTokens += reasoningTok;
+        this.totalTokens += usage.totalTokens;
         this.reportedCost += cost;
         // Burn rate sample accumulation
-        this.tokensSinceLastSample += inputTok + outputTok;
+        this.tokensSinceLastSample += usage.totalTokens;
         // Context size computation
         let contextSize;
         if (this.computeContextSize) {
@@ -688,7 +630,7 @@ class EventAggregator {
                 outputTokens: outputTok,
                 cacheWriteTokens: cacheWrite,
                 cacheReadTokens: cacheRead,
-                reasoningTokens: usage.reasoning_tokens,
+                reasoningTokens: reasoningTok,
             });
         }
         else {
@@ -716,6 +658,9 @@ class EventAggregator {
             inputTokens: contextSize,
             turnIndex: this.contextTurnIndex++,
         });
+        if (this.contextTimeline.length > this.contextTimelineCap) {
+            this.contextTimeline.splice(0, this.contextTimeline.length - this.contextTimelineCap);
+        }
         // Per-model usage. Accumulate reasoning tokens and an inverted-sticky
         // `priced` flag so one unpriced event taints the aggregate (UI renders "—").
         const perModelKey = model ?? this.currentModel ?? 'unknown';
@@ -731,7 +676,7 @@ class EventAggregator {
             priced: true,
         };
         acc.calls++;
-        acc.tokens += inputTok + outputTok;
+        acc.tokens += usage.totalTokens;
         acc.inputTokens += inputTok;
         acc.outputTokens += outputTok;
         acc.cacheWriteTokens += cacheWrite;
@@ -808,7 +753,7 @@ class EventAggregator {
     // Private: Tool Extraction from SessionEvent content blocks
     // ═══════════════════════════════════════════════════════════════════════
     extractToolsFromContent(event) {
-        const content = event.message.content;
+        const content = event.message?.content;
         if (!Array.isArray(content))
             return;
         for (const block of content) {
@@ -961,7 +906,7 @@ class EventAggregator {
             this.finishReasons.set(reason, (this.finishReasons.get(reason) ?? 0) + 1);
         }
         if (metadata.providerError) {
-            this.recordError('ProviderAPI', (0, errorTaxonomy_1.categorizeError)(metadata.providerError, metadata.providerError.type), event.timestamp, event.message.model ?? this.currentModel ?? 'unknown');
+            this.recordError('ProviderAPI', (0, errorTaxonomy_1.categorizeError)(metadata.providerError, metadata.providerError.type), event.timestamp, event.message?.model ?? this.currentModel ?? 'unknown');
         }
     }
     recordError(tool, category, timestamp, model) {
@@ -1065,7 +1010,7 @@ class EventAggregator {
     // Private: Task State from SessionEvent
     // ═══════════════════════════════════════════════════════════════════════
     extractTaskStateFromEvent(event) {
-        const content = event.message.content;
+        const content = event.message?.content;
         if (!Array.isArray(content))
             return;
         for (const block of content) {
@@ -1480,7 +1425,7 @@ class EventAggregator {
     // Private: Subagent Tracking from SessionEvent
     // ═══════════════════════════════════════════════════════════════════════
     extractSubagentFromEvent(event) {
-        const content = event.message.content;
+        const content = event.message?.content;
         if (!Array.isArray(content))
             return;
         for (const block of content) {
@@ -1646,7 +1591,7 @@ class EventAggregator {
     // Private: Context Attribution from SessionEvent
     // ═══════════════════════════════════════════════════════════════════════
     attributeContextFromEvent(event) {
-        const content = event.message.content;
+        const content = event.message?.content;
         if (event.type === 'user') {
             if (Array.isArray(content)) {
                 for (const block of content) {
@@ -1853,7 +1798,8 @@ class EventAggregator {
                 break;
             case 'system':
                 tlType = 'session_start';
-                description = this.extractTextContent(event) ?? event.message.sourceLabel ?? 'System event';
+                description =
+                    this.extractTextContent(event) ?? event.message?.sourceLabel ?? 'System event';
                 noiseLevel = 'system';
                 break;
             default:
@@ -1945,10 +1891,10 @@ class EventAggregator {
     // Private: Helper methods
     // ═══════════════════════════════════════════════════════════════════════
     estimateTokens(text) {
-        return Math.ceil(text.length / 4);
+        return (0, tokenEstimation_1.estimateTextTokens)(text).count;
     }
     hasTextContent(event) {
-        const content = event.message.content;
+        const content = event.message?.content;
         if (typeof content === 'string')
             return content.length > 0;
         if (Array.isArray(content)) {
@@ -1957,7 +1903,7 @@ class EventAggregator {
         return false;
     }
     extractTextContent(event) {
-        const content = event.message.content;
+        const content = event.message?.content;
         if (typeof content === 'string')
             return content;
         if (Array.isArray(content)) {
@@ -1986,7 +1932,7 @@ class EventAggregator {
     // Private: Gonzo/Lazyjournal analytics
     // ═══════════════════════════════════════════════════════════════════════
     extractToolNameFromEvent(event) {
-        const content = event.message.content;
+        const content = event.message?.content;
         if (!Array.isArray(content))
             return undefined;
         for (const block of content) {

package/dist/aggregation/snapshot.d.ts

@@ -7,7 +7,7 @@
  *
  * @module aggregation/snapshot
  */
-import type { SerializedAggregatorState } from './EventAggregator';
+import { type SerializedAggregatorState } from './EventAggregator';
 /** Snapshot sidecar file content. */
 export interface SessionSnapshot {
     /** Schema version for forward-compatibility checks. */

package/dist/aggregation/snapshot.js

@@ -50,8 +50,9 @@ exports.isSnapshotValid = isSnapshotValid;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const paths_1 = require("../paths");
+const EventAggregator_1 = require("./EventAggregator");
 /** Current schema version — bump when format changes. */
-const SNAPSHOT_VERSION = 3;
+const SNAPSHOT_VERSION = EventAggregator_1.SNAPSHOT_SCHEMA_VERSION;
 /** Returns the directory for snapshot files. */
 function getSnapshotsDir() {
     return path.join((0, paths_1.getConfigDir)(), 'snapshots');

package/dist/aggregation/types.d.ts

@@ -31,6 +31,8 @@ export interface EventAggregatorOptions {
     timelineCap?: number;
     /** Maximum latency records to retain (default 100). */
     latencyCap?: number;
+    /** Maximum context-size points to retain (default 2000). */
+    contextTimelineCap?: number;
     /** Burn rate sliding window in ms (default 5 * 60_000). */
     burnWindowMs?: number;
     /** Burn rate sample interval in ms (default 10_000). */
@@ -54,6 +56,9 @@ export interface AggregatedTokens {
     outputTokens: number;
     cacheWriteTokens: number;
     cacheReadTokens: number;
+    reasoningTokens: number;
+    /** Overall total after applying provider reasoning-in-output semantics. */
+    totalTokens: number;
     reportedCost: number;
 }
 /** Per-model usage breakdown. */

package/dist/autoSwitch.d.ts

@@ -42,7 +42,7 @@ export interface AutoSwitchControllerOptions {
     cooldownMs?: number;
     now?: () => number;
 }
-export declare function decideAutoSwitch(_provider: AccountProviderId, active: AutoSwitchActiveAccount, candidates: AutoSwitchCandidate[], config?: AutoSwitchConfig): AutoSwitchDecision | null;
+export declare function decideAutoSwitch(_provider: AccountProviderId, active: AutoSwitchActiveAccount, candidates: AutoSwitchCandidate[], config?: AutoSwitchConfig, nowMs?: number): AutoSwitchDecision | null;
 export declare class AutoSwitchController implements Disposable {
     private readonly quotaService;
     private readonly getClaudeAccounts;

package/dist/autoSwitch.js

@@ -11,6 +11,7 @@ exports.DEFAULT_AUTO_SWITCH_CONFIG = {
     thresholdPct: 90,
 };
 const MATERIAL_REMAINING_IMPROVEMENT_PCT = 5;
+const MAX_STALE_SNAPSHOT_AGE_MS = 5 * 60 * 60 * 1000;
 function mergedConfig(config) {
     return {
         ...exports.DEFAULT_AUTO_SWITCH_CONFIG,
@@ -27,7 +28,17 @@ function quotaRemaining(quota) {
         return 0;
     return Math.max(0, 100 - quotaUtilization(quota));
 }
-function decideAutoSwitch(_provider, active, candidates, config) {
+function isUsableCandidateQuota(quota, nowMs) {
+    if (!quota?.available)
+        return false;
+    if (quota.stale !== true)
+        return true;
+    const capturedAt = Date.parse(quota.capturedAt ?? '');
+    if (!Number.isFinite(capturedAt) || capturedAt > nowMs)
+        return false;
+    return nowMs - capturedAt <= MAX_STALE_SNAPSHOT_AGE_MS;
+}
+function decideAutoSwitch(_provider, active, candidates, config, nowMs = Date.now()) {
     const cfg = mergedConfig(config);
     if (!cfg.enabled)
         return null;
@@ -40,7 +51,7 @@ function decideAutoSwitch(_provider, active, candidates, config) {
     const best = candidates
         .filter((candidate) => candidate.accountId !== active.accountId &&
         candidate.switchable !== false &&
-        candidate.quota?.available)
+        isUsableCandidateQuota(candidate.quota, nowMs))
         .sort((a, b) => quotaRemaining(b.quota) - quotaRemaining(a.quota))[0];
     if (!best)
         return null;
@@ -129,7 +140,7 @@ class AutoSwitchController {
                 quota: accountId === activeAccountId ? activeQuota : this.readSnapshot(providerId, accountId),
             };
         });
-        const decision = decideAutoSwitch(providerId, { accountId: activeAccountId, quota: activeQuota }, candidates, this.config);
+        const decision = decideAutoSwitch(providerId, { accountId: activeAccountId, quota: activeQuota }, candidates, this.config, this.now());
         if (!decision)
             return;
         if (this.switchedDuringCrossing.has(providerId))

package/dist/browser.d.ts

@@ -8,6 +8,12 @@
  * For pricing hydration (LiteLLM catalog refresh), use `sidekick-shared/node`.
  */
 export { getModelContextWindowSize, DEFAULT_CONTEXT_WINDOW } from './modelContext';
+export { normalizeProviderUsage, extractNormalizedUsage, calculateNormalizedUsageCost, } from './usageNormalization';
+export type { UsageProvider, UsageSemantics, UsageNormalizationProvenance, ProviderUsageInput, AnthropicUsageInput, OpenAIUsageInput, SidekickUsageInput, NormalizedUsage, PricingProvenance, NormalizedUsageCostInput, NormalizedUsageCost, } from './usageNormalization';
+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 type { FormatDurationMsOptions, FormatTokenCountOptions } from './formatting';
 export { buildSessionContextSnapshot, calculateSessionContextPressure, createSessionContextProjector, } from './context/sessionContext';

package/dist/browser.js

@@ -9,10 +9,19 @@
  * For pricing hydration (LiteLLM catalog refresh), use `sidekick-shared/node`.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatCost = exports.sortModelIds = exports.compareModelIds = exports.getModelDisplayInfo = exports.shortModelName = exports.mergeCostSources = exports.calculateCostWithProvenance = exports.calculateCostWithPricing = exports.calculateCost = exports.getModelInfo = exports.getModelPricing = exports.parseModelId = exports.segmentAssistantTurn = exports.reasoningSummary = exports.isAssistantTurnSubagentTool = exports.extractTurnSubagents = exports.assistantTurnEventsFromSessionEvents = exports.createSessionContextProjector = exports.calculateSessionContextPressure = exports.buildSessionContextSnapshot = exports.formatTokenCount = exports.formatDurationMs = exports.DEFAULT_CONTEXT_WINDOW = exports.getModelContextWindowSize = void 0;
+exports.formatCost = exports.sortModelIds = exports.compareModelIds = exports.getModelDisplayInfo = exports.shortModelName = exports.mergeCostSources = exports.calculateCostWithProvenance = exports.calculateCostWithPricing = exports.calculateCost = exports.getModelInfo = exports.getModelPricing = exports.parseModelId = exports.segmentAssistantTurn = exports.reasoningSummary = exports.isAssistantTurnSubagentTool = exports.extractTurnSubagents = exports.assistantTurnEventsFromSessionEvents = exports.createSessionContextProjector = exports.calculateSessionContextPressure = exports.buildSessionContextSnapshot = exports.formatTokenCount = exports.formatDurationMs = exports.projectSessionTranscript = exports.estimateSerializedTokens = exports.estimateTextTokens = exports.calculateNormalizedUsageCost = exports.extractNormalizedUsage = exports.normalizeProviderUsage = exports.DEFAULT_CONTEXT_WINDOW = exports.getModelContextWindowSize = void 0;
 var modelContext_1 = require("./modelContext");
 Object.defineProperty(exports, "getModelContextWindowSize", { enumerable: true, get: function () { return modelContext_1.getModelContextWindowSize; } });
 Object.defineProperty(exports, "DEFAULT_CONTEXT_WINDOW", { enumerable: true, get: function () { return modelContext_1.DEFAULT_CONTEXT_WINDOW; } });
+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 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, "formatDurationMs", { enumerable: true, get: function () { return formatting_1.formatDurationMs; } });
 Object.defineProperty(exports, "formatTokenCount", { enumerable: true, get: function () { return formatting_1.formatTokenCount; } });

package/dist/codexQuota.d.ts

@@ -32,6 +32,8 @@ export interface CodexQuotaApiOptions {
     usageUrl?: string;
     resetCreditsUrl?: string;
     capturedAt?: string;
+    signal?: AbortSignal;
+    timeoutMs?: number;
 }
 export declare function quotaFromCodexRateLimits(rateLimits: CodexRateLimits | null | undefined, source?: 'api' | 'session' | 'cache', capturedAt?: string): QuotaState | null;
 export declare function readLatestCodexQuotaFromRollouts(sessionPaths: string[], options?: {

package/dist/codexQuota.js

@@ -414,10 +414,19 @@ async function fetchCodexQuotaFromApi(options = {}) {
             sevenDayLabel: 'Secondary',
         };
     }
+    const controller = new AbortController();
+    const onAbort = () => controller.abort();
+    if (options.signal?.aborted)
+        controller.abort();
+    else
+        options.signal?.addEventListener('abort', onAbort, { once: true });
+    const timeout = setTimeout(() => controller.abort(), options.timeoutMs ?? 10_000);
+    timeout.unref();
     try {
         const fetchImpl = options.fetchImpl ?? fetch;
         const response = await fetchImpl(options.usageUrl ?? CHATGPT_USAGE_URL, {
             method: 'GET',
+            signal: controller.signal,
             headers: {
                 Authorization: `Bearer ${accessToken}`,
                 Accept: 'application/json',
@@ -468,6 +477,7 @@ async function fetchCodexQuotaFromApi(options = {}) {
             accessToken,
             accountId: auth?.accountId,
             capturedAt,
+            signal: controller.signal,
         });
         if (resetCredits) {
             quota.resetCredits = resetCredits;
@@ -488,6 +498,10 @@ async function fetchCodexQuotaFromApi(options = {}) {
             sevenDayLabel: 'Secondary',
         };
     }
+    finally {
+        clearTimeout(timeout);
+        options.signal?.removeEventListener('abort', onAbort);
+    }
 }
 async function fetchCodexResetCreditsFromApi(options = {}) {
     const capturedAt = options.capturedAt ?? new Date().toISOString();
@@ -497,6 +511,14 @@ async function fetchCodexResetCreditsFromApi(options = {}) {
     const accessToken = auth?.accessToken;
     if (!accessToken)
         return undefined;
+    const controller = new AbortController();
+    const onAbort = () => controller.abort();
+    if (options.signal?.aborted)
+        controller.abort();
+    else
+        options.signal?.addEventListener('abort', onAbort, { once: true });
+    const timeout = setTimeout(() => controller.abort(), options.timeoutMs ?? 10_000);
+    timeout.unref();
     try {
         const fetchImpl = options.fetchImpl ?? fetch;
         const headers = {
@@ -511,6 +533,7 @@ async function fetchCodexResetCreditsFromApi(options = {}) {
         const response = await fetchImpl(options.resetCreditsUrl ?? CHATGPT_RESET_CREDITS_URL, {
             method: 'GET',
             headers,
+            signal: controller.signal,
         });
         if (!response.ok)
             return undefined;
@@ -519,6 +542,10 @@ async function fetchCodexResetCreditsFromApi(options = {}) {
     catch {
         return undefined;
     }
+    finally {
+        clearTimeout(timeout);
+        options.signal?.removeEventListener('abort', onAbort);
+    }
 }
 function readCodexAuth(codexHome) {
     try {