sidekick-shared 0.23.0 → 0.23.1

package/dist/errorHistory.d.ts

@@ -1,5 +1,6 @@
 import type { ErrorRollup, ErrorRollupEntry } from './aggregation/types';
 export declare const ERROR_HISTORY_SCHEMA_VERSION: 1;
+export declare const MAX_ERROR_HISTORY_SESSIONS = 500;
 export interface ErrorHistorySessionRecord {
     sessionId: string;
     providerId: string;

package/dist/errorHistory.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ERROR_HISTORY_SCHEMA_VERSION = void 0;
+exports.MAX_ERROR_HISTORY_SESSIONS = exports.ERROR_HISTORY_SCHEMA_VERSION = void 0;
 exports.appendErrorHistory = appendErrorHistory;
 exports.readErrorHistory = readErrorHistory;
 exports.getTopFailingTools = getTopFailingTools;
@@ -41,6 +41,7 @@ const fs = __importStar(require("fs"));
 const paths_1 = require("./paths");
 const atomic_1 = require("./writers/atomic");
 exports.ERROR_HISTORY_SCHEMA_VERSION = 1;
+exports.MAX_ERROR_HISTORY_SESSIONS = 500;
 function emptyStore() {
     return {
         schemaVersion: exports.ERROR_HISTORY_SCHEMA_VERSION,
@@ -59,7 +60,7 @@ async function appendErrorHistory(identity, rollup, filePath = (0, paths_1.getGl
     await (0, atomic_1.updateJsonStoreAtomic)(filePath, emptyStore, (store) => ({
         ...store,
         schemaVersion: exports.ERROR_HISTORY_SCHEMA_VERSION,
-        sessions: [...store.sessions, record],
+        sessions: [...(Array.isArray(store.sessions) ? store.sessions : []), record].slice(-exports.MAX_ERROR_HISTORY_SESSIONS),
         lastSaved: record.endedAt,
     }));
     return record;

package/dist/extractors/toolCall.js

@@ -85,7 +85,7 @@ class ToolCallTracker {
         }
         const topLevel = extractToolCall(event);
         if (topLevel) {
-            const id = event.message.id;
+            const id = event.message?.id;
             if (id) {
                 topLevel.toolUseId = id;
                 this.pending.set(id, topLevel);
@@ -94,7 +94,7 @@ class ToolCallTracker {
                 completed.push(topLevel);
             }
         }
-        const content = event.message.content;
+        const content = event.message?.content;
         if (!Array.isArray(content))
             return completed;
         for (const block of content) {

package/dist/index.d.ts

@@ -11,8 +11,8 @@ export type { DecisionEntry, DecisionLogStore, DecisionSource } from './types/de
 export { DECISION_LOG_SCHEMA_VERSION } from './types/decisionLog';
 export type { KnowledgeNote, KnowledgeNoteStore, KnowledgeNoteType, KnowledgeNoteSource, KnowledgeNoteStatus, KnowledgeNoteImportance, } from './types/knowledgeNote';
 export { KNOWLEDGE_NOTE_SCHEMA_VERSION, IMPORTANCE_DECAY_FACTORS, STALENESS_THRESHOLDS, } from './types/knowledgeNote';
-export type { HistoricalDataStore, DailyData, MonthlyData, AllTimeStats, TokenTotals, ModelUsageRecord, ToolUsageRecord, SessionSummary, SessionHistoryRecord, } from './types/historicalData';
-export { HISTORICAL_DATA_SCHEMA_VERSION, HISTORICAL_SESSION_RETENTION_LIMIT, createEmptyTokenTotals, } from './types/historicalData';
+export type { HistoricalDataStore, DailyData, HourlyData, MonthlyData, AllTimeStats, TokenTotals, ModelUsageRecord, ToolUsageRecord, SessionSummary, SessionHistoryRecord, } from './types/historicalData';
+export { HISTORICAL_DATA_SCHEMA_VERSION, HISTORICAL_SESSION_RETENTION_LIMIT, createEmptyTokenTotals, createEmptyDataStore, } from './types/historicalData';
 export type { PersistedPlan, PersistedPlanStep, PlanHistoryStore, PlanStepStatus, PlanStatus, PlanSource, PlanStepComplexity, } from './types/plan';
 export { PLAN_SCHEMA_VERSION, MAX_PLANS_PER_PROJECT } from './types/plan';
 export { getConfigDir, getProjectDataPath, getGlobalDataPath, encodeWorkspacePath, getProjectSlug, getProjectSlugRaw, resolveProjectIdentity, } from './paths';
@@ -93,7 +93,7 @@ export type { SerializedAggregatorState } from './aggregation/EventAggregator';
 export { saveSnapshot, loadSnapshot, deleteSnapshot, isSnapshotValid, getSnapshotPath, } from './aggregation/snapshot';
 export type { SessionSnapshot } from './aggregation/snapshot';
 export type { EventAggregatorOptions, AggregatedTokens, ModelUsageStats, BurnRateInfo, SubagentLifecycle, AggregatedMetrics, FrequencyMetric, PatternMetric, HeatmapBucketMetric, ErrorRollup, ErrorRollupEntry, ErrorBucketMetric, } from './aggregation/types';
-export { ERROR_HISTORY_SCHEMA_VERSION, appendErrorHistory, getTopFailingTools, readErrorHistory, } from './errorHistory';
+export { ERROR_HISTORY_SCHEMA_VERSION, MAX_ERROR_HISTORY_SESSIONS, appendErrorHistory, getTopFailingTools, readErrorHistory, } from './errorHistory';
 export type { ErrorHistorySessionRecord, ErrorHistoryStore, TopFailingTool } from './errorHistory';
 export { FrequencyTracker } from './aggregation/FrequencyTracker';
 export type { FrequencyEntry, SerializedFrequencyState } from './aggregation/FrequencyTracker';

package/dist/index.js

@@ -3,13 +3,13 @@
  * Public API for sidekick-shared.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeToolName = exports.TRUNCATION_PATTERNS = exports.JsonlParser = exports.CodexProvider = exports.getOpenCodeDataDir = exports.OpenCodeProvider = exports.ClaudeCodeProvider = exports.getAllDetectedProviders = exports.detectProvider = exports.derivePendingUserRequestV1 = exports.createProviderSessionAdapterV1 = exports.renderHandoffUrlTemplate = exports.addNote = exports.decisionFingerprint = exports.addDecision = exports.completeTask = exports.addTask = exports.updateJsonStoreAtomic = exports.atomicWriteJsonSync = exports.atomicWriteJson = exports.readClaudeCodePlanFiles = exports.getPlanAnalytics = exports.writePlans = exports.getLatestPlan = exports.readPlans = exports.readLatestHandoff = exports.readHistory = exports.readNotes = exports.readDecisions = exports.readTasks = exports.migrateLegacyProjectStores = exports.resolveProjectIdentity = exports.getProjectSlugRaw = exports.getProjectSlug = exports.encodeWorkspacePath = exports.getGlobalDataPath = exports.getProjectDataPath = exports.getConfigDir = exports.MAX_PLANS_PER_PROJECT = exports.PLAN_SCHEMA_VERSION = exports.createEmptyTokenTotals = exports.HISTORICAL_SESSION_RETENTION_LIMIT = exports.HISTORICAL_DATA_SCHEMA_VERSION = exports.STALENESS_THRESHOLDS = exports.IMPORTANCE_DECAY_FACTORS = exports.KNOWLEDGE_NOTE_SCHEMA_VERSION = exports.DECISION_LOG_SCHEMA_VERSION = exports.normalizeTaskStatus = exports.TASK_PERSISTENCE_SCHEMA_VERSION = exports.isAggregateCodexLimit = void 0;
-exports.toFollowEvents = exports.createWatcher = exports.parseChangelog = exports.extractProposedPlanShared = exports.parsePlanMarkdownShared = exports.PlanExtractor = exports.segmentAssistantTurn = exports.reasoningSummary = exports.isAssistantTurnSubagentTool = exports.extractTurnSubagents = exports.assistantTurnEventsFromSessionEvents = exports.readSessionContextSnapshot = exports.createSessionContextProjector = exports.calculateSessionContextPressure = exports.buildSessionContextSnapshot = exports.composeContext = exports.FilterEngine = exports.searchSessions = exports.CodexDatabase = exports.OpenCodeDatabase = exports.discoverDebugLogs = exports.collapseDuplicates = exports.filterByLevel = exports.parseDebugLog = exports.scanSubagentTraces = exports.findAllSessionsWithWorktrees = exports.discoverWorktreeSiblings = exports.resolveWorktreeMainRepo = exports.getAllClaudeProjectFolders = exports.decodeEncodedPath = exports.getMostRecentlyActiveSessionDir = exports.findSubdirectorySessionDirs = exports.findSessionsInDirectory = exports.findAllClaudeSessions = exports.findActiveClaudeSession = exports.discoverSessionDirectory = exports.getClaudeSessionDirectory = exports.encodeClaudeWorkspacePath = exports.detectSessionActivity = exports.extractTaskInfo = exports.scanSubagentDir = exports.normalizeCodexToolInput = exports.normalizeCodexToolName = exports.extractPatchFilePaths = exports.CodexRolloutParser = exports.parseDbPartData = exports.parseDbMessageData = exports.convertOpenCodeMessage = exports.detectPlanModeFromText = exports.normalizeToolInput = void 0;
-exports.readAccountRegistry = exports.ensureDefaultAccounts = exports.readClaudeMaxAccessTokenSync = exports.readClaudeMaxCredentials = exports.writeActiveCredentials = exports.readActiveCredentials = exports.openInBrowser = exports.parseTranscriptFromEvents = exports.parseTranscript = exports.generateHtmlReport = exports.formatCompactionLedger = exports.calculateCompactionLedger = exports.calculateCodeImpact = exports.scoreSessionQuality = exports.calculateQualityTrend = exports.PatternExtractor = exports.HeatmapTracker = exports.FrequencyTracker = exports.readErrorHistory = exports.getTopFailingTools = exports.appendErrorHistory = exports.ERROR_HISTORY_SCHEMA_VERSION = exports.getSnapshotPath = exports.isSnapshotValid = exports.deleteSnapshot = exports.loadSnapshot = exports.saveSnapshot = exports.SessionMonitor = exports.parseTodoDependencies = exports.EventAggregator = exports.getRandomPhrase = exports.PHRASE_CATEGORIES = exports.ALL_PHRASES = exports.HIGHLIGHT_CSS = exports.clearHighlightCache = exports.highlightEvent = exports.formatSessionJson = exports.formatSessionMarkdown = exports.formatSessionText = exports.classifyNoise = exports.shouldMergeWithPrevious = exports.classifyFollowEvent = exports.classifyMessage = exports.getSoftNoiseReason = exports.isHardNoiseFollowEvent = exports.isHardNoise = exports.formatToolSummary = exports.formatTokenCount = exports.formatDurationMs = exports.createJsonlTail = void 0;
-exports.installShellHook = exports.setTerminalActiveProfile = exports.removeCodexAccount = exports.switchToCodexAccount = exports.finalizeCodexAccount = exports.prepareCodexAccount = exports.getCodexExecutionEnv = exports.resolveSidekickCodexHome = exports.resolveActiveCodexAccount = exports.getActiveCodexAccount = exports.listCodexAccounts = exports.getSystemCodexHome = exports.getCodexMonitoringHomes = exports.getCodexProfileHome = exports.getCodexProfilesDir = exports.readClaudeProfileIdentity = exports.isClaudeProfileAuthenticated = exports.claudeKeychainService = exports.claudeKeychainSuffix = exports.getClaudeProfileHome = exports.getClaudeProfilesDir = exports.getActiveAccountStatus = exports.removeSavedAccountProfile = exports.replaceSavedAccountProfiles = exports.setActiveSavedAccount = exports.upsertSavedAccountProfile = exports.getActiveSavedAccount = exports.listSavedAccountProfiles = exports.writeSavedAccountRegistry = exports.readSavedAccountRegistry = exports.getAccountsDir = exports.resolveClaudeLoginCommand = exports.listAllAccounts = exports.switchAccount = exports.spawnAccountLogin = exports.finalizeAccountLogin = exports.getAccountLoginStatus = exports.beginAccountLogin = exports.isMultiAccountEnabled = exports.resolveActiveClaudeAccount = exports.getActiveAccount = exports.listAccounts = exports.removeAccount = exports.reconcileClaudeAuthState = exports.applyActiveClaudeToLiveHome = exports.resolveActiveClaudeHome = exports.switchToAccount = exports.addCurrentAccount = exports.readActiveClaudeAccount = exports.writeAccountRegistry = void 0;
-exports.sortModelIds = exports.compareModelIds = exports.getModelDisplayInfo = exports.shortModelName = exports.mergeCostSources = exports.calculateCostWithProvenance = exports.calculateCostWithPricing = exports.calculateCost = exports.getModelInfo = exports.getModelPricing = exports.parseModelId = exports.DEFAULT_CONTEXT_WINDOW = exports.getModelContextWindowSize = exports.selectStatuslineAccount = exports.formatStatusline = exports.estimateTimeToQuota = exports.BurnRateCalculator = exports.MultiProviderQuotaService = exports.resolveZaiQuota = exports.readZaiCredentials = exports.quotaStateFromZaiQuotaLimitPayload = exports.fetchZaiQuotaFromApi = exports.CodexQuotaWatcher = exports.resolveCodexQuotaFromLocalSources = exports.resolveCodexQuota = exports.readLatestCodexQuotaFromRollouts = exports.quotaFromCodexRateLimits = exports.fetchCodexQuotaFromApi = exports.fetchCodexResetCreditsFromApi = exports.getWorkspaceIdFromPath = exports.pruneQuotaHistory = exports.readQuotaHistoryDailyBuckets = exports.readQuotaHistoryRange = exports.appendQuotaHistorySample = exports.writeQuotaSnapshot = exports.readQuotaSnapshot = exports.QuotaPoller = exports.describeQuotaFailure = exports.withQuotaProjections = exports.projectQuotaWindow = exports.fetchQuota = exports.SEVEN_DAY_WINDOW_MS = exports.FIVE_HOUR_WINDOW_MS = exports.AutoSwitchController = exports.decideAutoSwitch = exports.DEFAULT_AUTO_SWITCH_CONFIG = exports.removeLauncher = exports.writeLauncher = exports.isShellHookInstalled = exports.uninstallShellHook = void 0;
-exports.listAllAccountsResultSchema = exports.savedAccountProfileSchema = exports.accountEntrySchema = exports.accountLoginStatusSchema = exports.beginAccountLoginResultSchema = exports.accountManagerResultSchema = exports.accountProviderIdSchema = exports.activeAccountStatusSchema = exports.activeProviderAccountStatusSchema = exports.quotaHistoryDailyBucketSchema = exports.quotaHistorySampleSchema = exports.quotaHistoryRuntimeProviderSchema = exports.providerQuotaMapSchema = exports.zaiProviderQuotaStateSchema = exports.codexProviderQuotaStateSchema = exports.claudeProviderQuotaStateSchema = exports.providerQuotaStateSchema = exports.runtimeQuotaProviderSchema = exports.quotaFailureDescriptorSchema = exports.peakHoursStateSchema = exports.codexResetCreditsSnapshotSchema = exports.codexResetCreditSchema = exports.quotaSourceSchema = exports.quotaProviderIdSchema = exports.quotaFailureKindSchema = exports.quotaStateSchema = exports.quotaWindowSchema = exports.extractSessionEvents = exports.permissionModeSchema = exports.sessionEventSchema = exports.sessionMessageSchema = exports.messageUsageSchema = exports.ToolCallTracker = exports.extractToolCalls = exports.extractToolCall = exports.extractErrorMessage = exports.categorizeError = exports.gatherAssetsForCwd = exports.codexSessions = exports.readCodexAssets = exports.claudeSessions = exports.readClaudeAssets = exports.extractCommands = exports.extractFilePaths = exports.extractUrls = exports.extractTokenUsage = exports.LITELLM_CATALOG_URL = exports.normalizeLiteLlmCatalog = exports.hydratePricingCatalog = exports.formatCost = void 0;
-exports.scopePeakHoursToSessionProvider = exports.isClaudeCodeSessionProvider = exports.fetchPeakHoursStatus = exports.createPeakHoursNotApplicableState = exports.runDoctor = exports.getSessionDiagnostics = exports.formatHealthReport = exports.fetchOpenAIStatus = exports.fetchProviderStatus = exports.assistantTurnToolRefSchema = exports.assistantTurnToolGroupStepSchema = exports.assistantTurnTimelineItemSchema = exports.assistantTurnSubagentStatusSchema = exports.assistantTurnSubagentSchema = exports.assistantTurnReasoningTimelineItemSchema = exports.assistantTurnProjectionSchema = exports.assistantTurnProcessStepSchema = exports.assistantTurnProcessSchema = exports.assistantTurnNarrationStepSchema = exports.assistantTurnEventTypeSchema = exports.assistantTurnEventSchema = void 0;
+exports.TRUNCATION_PATTERNS = exports.JsonlParser = exports.CodexProvider = exports.getOpenCodeDataDir = exports.OpenCodeProvider = exports.ClaudeCodeProvider = exports.getAllDetectedProviders = exports.detectProvider = exports.derivePendingUserRequestV1 = exports.createProviderSessionAdapterV1 = exports.renderHandoffUrlTemplate = exports.addNote = exports.decisionFingerprint = exports.addDecision = exports.completeTask = exports.addTask = exports.updateJsonStoreAtomic = exports.atomicWriteJsonSync = exports.atomicWriteJson = exports.readClaudeCodePlanFiles = exports.getPlanAnalytics = exports.writePlans = exports.getLatestPlan = exports.readPlans = exports.readLatestHandoff = exports.readHistory = exports.readNotes = exports.readDecisions = exports.readTasks = exports.migrateLegacyProjectStores = exports.resolveProjectIdentity = exports.getProjectSlugRaw = exports.getProjectSlug = exports.encodeWorkspacePath = exports.getGlobalDataPath = exports.getProjectDataPath = exports.getConfigDir = exports.MAX_PLANS_PER_PROJECT = exports.PLAN_SCHEMA_VERSION = exports.createEmptyDataStore = exports.createEmptyTokenTotals = exports.HISTORICAL_SESSION_RETENTION_LIMIT = exports.HISTORICAL_DATA_SCHEMA_VERSION = exports.STALENESS_THRESHOLDS = exports.IMPORTANCE_DECAY_FACTORS = exports.KNOWLEDGE_NOTE_SCHEMA_VERSION = exports.DECISION_LOG_SCHEMA_VERSION = exports.normalizeTaskStatus = exports.TASK_PERSISTENCE_SCHEMA_VERSION = exports.isAggregateCodexLimit = void 0;
+exports.createWatcher = exports.parseChangelog = exports.extractProposedPlanShared = exports.parsePlanMarkdownShared = exports.PlanExtractor = exports.segmentAssistantTurn = exports.reasoningSummary = exports.isAssistantTurnSubagentTool = exports.extractTurnSubagents = exports.assistantTurnEventsFromSessionEvents = exports.readSessionContextSnapshot = exports.createSessionContextProjector = exports.calculateSessionContextPressure = exports.buildSessionContextSnapshot = exports.composeContext = exports.FilterEngine = exports.searchSessions = exports.CodexDatabase = exports.OpenCodeDatabase = exports.discoverDebugLogs = exports.collapseDuplicates = exports.filterByLevel = exports.parseDebugLog = exports.scanSubagentTraces = exports.findAllSessionsWithWorktrees = exports.discoverWorktreeSiblings = exports.resolveWorktreeMainRepo = exports.getAllClaudeProjectFolders = exports.decodeEncodedPath = exports.getMostRecentlyActiveSessionDir = exports.findSubdirectorySessionDirs = exports.findSessionsInDirectory = exports.findAllClaudeSessions = exports.findActiveClaudeSession = exports.discoverSessionDirectory = exports.getClaudeSessionDirectory = exports.encodeClaudeWorkspacePath = exports.detectSessionActivity = exports.extractTaskInfo = exports.scanSubagentDir = exports.normalizeCodexToolInput = exports.normalizeCodexToolName = exports.extractPatchFilePaths = exports.CodexRolloutParser = exports.parseDbPartData = exports.parseDbMessageData = exports.convertOpenCodeMessage = exports.detectPlanModeFromText = exports.normalizeToolInput = exports.normalizeToolName = void 0;
+exports.readClaudeMaxAccessTokenSync = exports.readClaudeMaxCredentials = exports.writeActiveCredentials = exports.readActiveCredentials = exports.openInBrowser = exports.parseTranscriptFromEvents = exports.parseTranscript = exports.generateHtmlReport = exports.formatCompactionLedger = exports.calculateCompactionLedger = exports.calculateCodeImpact = exports.scoreSessionQuality = exports.calculateQualityTrend = exports.PatternExtractor = exports.HeatmapTracker = exports.FrequencyTracker = exports.readErrorHistory = exports.getTopFailingTools = exports.appendErrorHistory = exports.MAX_ERROR_HISTORY_SESSIONS = exports.ERROR_HISTORY_SCHEMA_VERSION = exports.getSnapshotPath = exports.isSnapshotValid = exports.deleteSnapshot = exports.loadSnapshot = exports.saveSnapshot = exports.SessionMonitor = exports.parseTodoDependencies = exports.EventAggregator = exports.getRandomPhrase = exports.PHRASE_CATEGORIES = exports.ALL_PHRASES = exports.HIGHLIGHT_CSS = exports.clearHighlightCache = exports.highlightEvent = exports.formatSessionJson = exports.formatSessionMarkdown = exports.formatSessionText = exports.classifyNoise = exports.shouldMergeWithPrevious = exports.classifyFollowEvent = exports.classifyMessage = exports.getSoftNoiseReason = exports.isHardNoiseFollowEvent = exports.isHardNoise = exports.formatToolSummary = exports.formatTokenCount = exports.formatDurationMs = exports.createJsonlTail = exports.toFollowEvents = void 0;
+exports.removeCodexAccount = exports.switchToCodexAccount = exports.finalizeCodexAccount = exports.prepareCodexAccount = exports.getCodexExecutionEnv = exports.resolveSidekickCodexHome = exports.resolveActiveCodexAccount = exports.getActiveCodexAccount = exports.listCodexAccounts = exports.getSystemCodexHome = exports.getCodexMonitoringHomes = exports.getCodexProfileHome = exports.getCodexProfilesDir = exports.readClaudeProfileIdentity = exports.isClaudeProfileAuthenticated = exports.claudeKeychainService = exports.claudeKeychainSuffix = exports.getClaudeProfileHome = exports.getClaudeProfilesDir = exports.getActiveAccountStatus = exports.removeSavedAccountProfile = exports.replaceSavedAccountProfiles = exports.setActiveSavedAccount = exports.upsertSavedAccountProfile = exports.getActiveSavedAccount = exports.listSavedAccountProfiles = exports.writeSavedAccountRegistry = exports.readSavedAccountRegistry = exports.getAccountsDir = exports.resolveClaudeLoginCommand = exports.listAllAccounts = exports.switchAccount = exports.spawnAccountLogin = exports.finalizeAccountLogin = exports.getAccountLoginStatus = exports.beginAccountLogin = exports.isMultiAccountEnabled = exports.resolveActiveClaudeAccount = exports.getActiveAccount = exports.listAccounts = exports.removeAccount = exports.reconcileClaudeAuthState = exports.applyActiveClaudeToLiveHome = exports.resolveActiveClaudeHome = exports.switchToAccount = exports.addCurrentAccount = exports.readActiveClaudeAccount = exports.writeAccountRegistry = exports.readAccountRegistry = exports.ensureDefaultAccounts = void 0;
+exports.getModelDisplayInfo = exports.shortModelName = exports.mergeCostSources = exports.calculateCostWithProvenance = exports.calculateCostWithPricing = exports.calculateCost = exports.getModelInfo = exports.getModelPricing = exports.parseModelId = exports.DEFAULT_CONTEXT_WINDOW = exports.getModelContextWindowSize = exports.selectStatuslineAccount = exports.formatStatusline = exports.estimateTimeToQuota = exports.BurnRateCalculator = exports.MultiProviderQuotaService = exports.resolveZaiQuota = exports.readZaiCredentials = exports.quotaStateFromZaiQuotaLimitPayload = exports.fetchZaiQuotaFromApi = exports.CodexQuotaWatcher = exports.resolveCodexQuotaFromLocalSources = exports.resolveCodexQuota = exports.readLatestCodexQuotaFromRollouts = exports.quotaFromCodexRateLimits = exports.fetchCodexQuotaFromApi = exports.fetchCodexResetCreditsFromApi = exports.getWorkspaceIdFromPath = exports.pruneQuotaHistory = exports.readQuotaHistoryDailyBuckets = exports.readQuotaHistoryRange = exports.appendQuotaHistorySample = exports.writeQuotaSnapshot = exports.readQuotaSnapshot = exports.QuotaPoller = exports.describeQuotaFailure = exports.withQuotaProjections = exports.projectQuotaWindow = exports.fetchQuota = exports.SEVEN_DAY_WINDOW_MS = exports.FIVE_HOUR_WINDOW_MS = exports.AutoSwitchController = exports.decideAutoSwitch = exports.DEFAULT_AUTO_SWITCH_CONFIG = exports.removeLauncher = exports.writeLauncher = exports.isShellHookInstalled = exports.uninstallShellHook = exports.installShellHook = exports.setTerminalActiveProfile = void 0;
+exports.accountEntrySchema = exports.accountLoginStatusSchema = exports.beginAccountLoginResultSchema = exports.accountManagerResultSchema = exports.accountProviderIdSchema = exports.activeAccountStatusSchema = exports.activeProviderAccountStatusSchema = exports.quotaHistoryDailyBucketSchema = exports.quotaHistorySampleSchema = exports.quotaHistoryRuntimeProviderSchema = exports.providerQuotaMapSchema = exports.zaiProviderQuotaStateSchema = exports.codexProviderQuotaStateSchema = exports.claudeProviderQuotaStateSchema = exports.providerQuotaStateSchema = exports.runtimeQuotaProviderSchema = exports.quotaFailureDescriptorSchema = exports.peakHoursStateSchema = exports.codexResetCreditsSnapshotSchema = exports.codexResetCreditSchema = exports.quotaSourceSchema = exports.quotaProviderIdSchema = exports.quotaFailureKindSchema = exports.quotaStateSchema = exports.quotaWindowSchema = exports.extractSessionEvents = exports.permissionModeSchema = exports.sessionEventSchema = exports.sessionMessageSchema = exports.messageUsageSchema = exports.ToolCallTracker = exports.extractToolCalls = exports.extractToolCall = exports.extractErrorMessage = exports.categorizeError = exports.gatherAssetsForCwd = exports.codexSessions = exports.readCodexAssets = exports.claudeSessions = exports.readClaudeAssets = exports.extractCommands = exports.extractFilePaths = exports.extractUrls = exports.extractTokenUsage = exports.LITELLM_CATALOG_URL = exports.normalizeLiteLlmCatalog = exports.hydratePricingCatalog = exports.formatCost = exports.sortModelIds = exports.compareModelIds = void 0;
+exports.scopePeakHoursToSessionProvider = exports.isClaudeCodeSessionProvider = exports.fetchPeakHoursStatus = exports.createPeakHoursNotApplicableState = exports.runDoctor = exports.getSessionDiagnostics = exports.formatHealthReport = exports.fetchOpenAIStatus = exports.fetchProviderStatus = exports.assistantTurnToolRefSchema = exports.assistantTurnToolGroupStepSchema = exports.assistantTurnTimelineItemSchema = exports.assistantTurnSubagentStatusSchema = exports.assistantTurnSubagentSchema = exports.assistantTurnReasoningTimelineItemSchema = exports.assistantTurnProjectionSchema = exports.assistantTurnProcessStepSchema = exports.assistantTurnProcessSchema = exports.assistantTurnNarrationStepSchema = exports.assistantTurnEventTypeSchema = exports.assistantTurnEventSchema = exports.listAllAccountsResultSchema = exports.savedAccountProfileSchema = void 0;
 var codex_1 = require("./types/codex");
 Object.defineProperty(exports, "isAggregateCodexLimit", { enumerable: true, get: function () { return codex_1.isAggregateCodexLimit; } });
 var taskPersistence_1 = require("./types/taskPersistence");
@@ -25,6 +25,7 @@ var historicalData_1 = require("./types/historicalData");
 Object.defineProperty(exports, "HISTORICAL_DATA_SCHEMA_VERSION", { enumerable: true, get: function () { return historicalData_1.HISTORICAL_DATA_SCHEMA_VERSION; } });
 Object.defineProperty(exports, "HISTORICAL_SESSION_RETENTION_LIMIT", { enumerable: true, get: function () { return historicalData_1.HISTORICAL_SESSION_RETENTION_LIMIT; } });
 Object.defineProperty(exports, "createEmptyTokenTotals", { enumerable: true, get: function () { return historicalData_1.createEmptyTokenTotals; } });
+Object.defineProperty(exports, "createEmptyDataStore", { enumerable: true, get: function () { return historicalData_1.createEmptyDataStore; } });
 var plan_1 = require("./types/plan");
 Object.defineProperty(exports, "PLAN_SCHEMA_VERSION", { enumerable: true, get: function () { return plan_1.PLAN_SCHEMA_VERSION; } });
 Object.defineProperty(exports, "MAX_PLANS_PER_PROJECT", { enumerable: true, get: function () { return plan_1.MAX_PLANS_PER_PROJECT; } });
@@ -213,6 +214,7 @@ Object.defineProperty(exports, "isSnapshotValid", { enumerable: true, get: funct
 Object.defineProperty(exports, "getSnapshotPath", { enumerable: true, get: function () { return snapshot_1.getSnapshotPath; } });
 var errorHistory_1 = require("./errorHistory");
 Object.defineProperty(exports, "ERROR_HISTORY_SCHEMA_VERSION", { enumerable: true, get: function () { return errorHistory_1.ERROR_HISTORY_SCHEMA_VERSION; } });
+Object.defineProperty(exports, "MAX_ERROR_HISTORY_SESSIONS", { enumerable: true, get: function () { return errorHistory_1.MAX_ERROR_HISTORY_SESSIONS; } });
 Object.defineProperty(exports, "appendErrorHistory", { enumerable: true, get: function () { return errorHistory_1.appendErrorHistory; } });
 Object.defineProperty(exports, "getTopFailingTools", { enumerable: true, get: function () { return errorHistory_1.getTopFailingTools; } });
 Object.defineProperty(exports, "readErrorHistory", { enumerable: true, get: function () { return errorHistory_1.readErrorHistory; } });

package/dist/modelInfo.js

@@ -142,6 +142,12 @@ const PRICING_TABLE = {
         cacheWriteCostPerMillion: 6.25,
         cacheReadCostPerMillion: 0.5,
     },
+    'claude-opus-4-5': {
+        inputCostPerMillion: 5.0,
+        outputCostPerMillion: 25.0,
+        cacheWriteCostPerMillion: 6.25,
+        cacheReadCostPerMillion: 0.5,
+    },
     'claude-opus-4.5': {
         inputCostPerMillion: 5.0,
         outputCostPerMillion: 25.0,

package/dist/multiProviderQuotaService.js

@@ -174,7 +174,7 @@ class MultiProviderQuotaService {
                 providerId: 'claude-code',
             });
             this.lastEmittedClaudeState = nextState;
-            if (nextState.available) {
+            if (nextState.available && nextState.stale !== true) {
                 this.lastSuccessfulClaudeState = nextState;
             }
             this.quotaByProvider = {
@@ -323,7 +323,18 @@ class MultiProviderQuotaService {
             }
         }
         this.cachedFallbackActive = hasVisibleCachedSuccess;
-        if (!hasVisibleCachedSuccess) {
+        if (hasVisibleCachedSuccess) {
+            this.emitClaudeState({
+                ...this.lastSuccessfulClaudeState,
+                error: state.error,
+                failureKind: state.failureKind,
+                httpStatus: state.httpStatus,
+                retryAfterMs: state.retryAfterMs,
+                source: 'cache',
+                stale: true,
+            });
+        }
+        else {
             this.emitClaudeState(state);
         }
     }

package/dist/parsers/codexParser.js

@@ -782,7 +782,10 @@ class CodexRolloutParser {
             return [];
         const mappedUsage = usage
             ? {
-                input_tokens: usage.input_tokens || 0,
+                // Codex reports cached_input_tokens as a subset of input_tokens,
+                // while MessageUsage categories are disjoint. Normalize once here
+                // so aggregation and pricing do not count cached input twice.
+                input_tokens: Math.max(0, (usage.input_tokens || 0) - (usage.cached_input_tokens || 0)),
                 output_tokens: usage.output_tokens || 0,
                 cache_read_input_tokens: usage.cached_input_tokens || 0,
                 cache_creation_input_tokens: 0,

package/dist/parsers/sessionActivityDetector.js

@@ -126,6 +126,8 @@ function detectSessionActivity(sessionPath) {
         }
         if (!hasTerminal) {
             for (const pattern of ENDING_PATTERNS) {
+                if (pattern === '"type":"user"' && line.includes('"type":"tool_result"'))
+                    continue;
                 if (line.includes(pattern)) {
                     lastEndingIndex = i;
                     break;

package/dist/parsers/sessionPathResolver.js

@@ -81,10 +81,9 @@ const os = __importStar(require("os"));
 function encodeWorkspacePath(workspacePath) {
     // Normalize path separators to forward slash
     const normalized = workspacePath.replace(/\\/g, '/');
-    // Replace colons, slashes, and underscores with hyphens
-    // Windows: C:\Users\foo_bar -> C:/Users/foo_bar -> C--Users-foo-bar
-    // Unix: /home/user/foo_bar -> -home-user-foo-bar
-    return normalized.replace(/[:/_]/g, '-');
+    // Claude Code replaces every non-alphanumeric path character, including
+    // dots and spaces, with a hyphen.
+    return normalized.replace(/[^a-zA-Z0-9]/g, '-');
 }
 /**
  * Gets the session directory path for a workspace.
@@ -249,12 +248,7 @@ function discoverSessionDirectory(workspacePath) {
             });
             // Try to match by workspace path components
             // Normalize workspace path for comparison
-            const normalizedWorkspace = workspacePath
-                .replace(/\\/g, '/')
-                .replace(/:/g, '-')
-                .replace(/_/g, '-')
-                .replace(/\//g, '-')
-                .toLowerCase();
+            const normalizedWorkspace = encodeWorkspacePath(workspacePath).toLowerCase();
             for (const dir of existingDirs) {
                 // Check if the directory name matches (case-insensitive)
                 if (dir.toLowerCase() === normalizedWorkspace) {
@@ -262,7 +256,10 @@ function discoverSessionDirectory(workspacePath) {
                 }
             }
             // Fallback: match by final path component (project name)
-            const workspaceBasename = path.basename(workspacePath).replace(/_/g, '-').toLowerCase();
+            const workspaceBasename = path
+                .basename(workspacePath)
+                .replace(/[^a-zA-Z0-9]/g, '-')
+                .toLowerCase();
             for (const dir of existingDirs) {
                 const dirLower = dir.toLowerCase();
                 // Check if dir ends with the project name
@@ -406,12 +403,18 @@ function findAllSessions(workspacePath) {
             .filter((file) => file.endsWith('.jsonl'))
             .map((file) => {
             const fullPath = path.join(sessionDir, file);
-            const stats = fs.statSync(fullPath);
-            return {
-                path: fullPath,
-                mtime: stats.mtime.getTime(),
-            };
+            try {
+                const stats = fs.statSync(fullPath);
+                return {
+                    path: fullPath,
+                    mtime: stats.mtime.getTime(),
+                };
+            }
+            catch {
+                return null;
+            }
         })
+            .filter((file) => file !== null)
             .sort((a, b) => b.mtime - a.mtime)
             .map((file) => file.path);
         return files;

package/dist/parsers/subagentScanner.d.ts

@@ -26,7 +26,7 @@ import type { SubagentStats, TaskState } from '../types/sessionEvent';
  * }
  * ```
  */
-export declare function scanSubagentDir(sessionDir: string, sessionId: string, logger?: (msg: string) => void): SubagentStats[];
+export declare function scanSubagentDir(sessionDir: string, sessionId: string, logger?: (msg: string) => void, skipFiles?: ReadonlySet<string>): SubagentStats[];
 /**
  * Handles TaskUpdate tool input and updates task state.
  */

package/dist/parsers/subagentScanner.js

@@ -93,7 +93,7 @@ const reportedMissing = new Set();
  * }
  * ```
  */
-function scanSubagentDir(sessionDir, sessionId, logger) {
+function scanSubagentDir(sessionDir, sessionId, logger, skipFiles = new Set()) {
     const log = logger || (() => { });
     const subagentsDir = path.join(sessionDir, sessionId, 'subagents');
     const results = [];
@@ -110,6 +110,8 @@ function scanSubagentDir(sessionDir, sessionId, logger) {
         const files = fs.readdirSync(subagentsDir);
         log(`[SubagentScanner] Found ${files.length} files: ${files.join(', ')}`);
         for (const file of files) {
+            if (skipFiles.has(file))
+                continue;
             const match = file.match(AGENT_FILE_PATTERN);
             if (!match) {
                 continue;
@@ -169,10 +171,7 @@ function parseAgentFile(filePath, agentId, log) {
                 // Extract token usage from assistant messages
                 if (event.type === 'assistant' && event.message?.usage) {
                     const usage = event.message.usage;
-                    inputTokens +=
-                        (usage.input_tokens || 0) +
-                            (usage.cache_creation_input_tokens || 0) +
-                            (usage.cache_read_input_tokens || 0);
+                    inputTokens += usage.input_tokens || 0;
                     outputTokens += usage.output_tokens || 0;
                 }
                 // Extract agent type and description from Task tool invocation

package/dist/parsers/subagentTraceParser.js

@@ -141,7 +141,7 @@ function parseAgentTrace(filePath, agentId) {
                 }
                 // Format tool summary
                 let toolSummary;
-                if (sessionEvent.type === 'tool_use' && sessionEvent.tool) {
+                if (sessionEvent.tool) {
                     toolSummary = (0, toolSummary_1.formatToolSummary)(sessionEvent.tool.name, sessionEvent.tool.input);
                 }
                 events.push({
@@ -155,10 +155,7 @@ function parseAgentTrace(filePath, agentId) {
                 // Extract token usage
                 if (raw.type === 'assistant' && raw.message?.usage) {
                     const usage = raw.message.usage;
-                    inputTokens +=
-                        (usage.input_tokens || 0) +
-                            (usage.cache_creation_input_tokens || 0) +
-                            (usage.cache_read_input_tokens || 0);
+                    inputTokens += usage.input_tokens || 0;
                     outputTokens += usage.output_tokens || 0;
                 }
                 // Extract tool calls
@@ -251,7 +248,7 @@ function linkTraces(traces) {
                 for (const match of matches) {
                     const childId = match[1];
                     const child = traceById.get(childId);
-                    if (child && child !== trace) {
+                    if (child && child !== trace && !child.parentToolUseId) {
                         child.parentToolUseId = trace.agentId;
                         trace.children.push(child);
                     }
@@ -274,7 +271,7 @@ function linkTraces(traces) {
                 continue; // Already linked
             for (const traceEvent of potential.events) {
                 const evt = traceEvent.event;
-                if (evt.type === 'tool_use' && evt.tool?.name === 'Task') {
+                if (evt.type === 'assistant' && evt.tool?.name === 'Task') {
                     const taskTime = new Date(evt.timestamp).getTime();
                     // Within 2 seconds before child start
                     if (taskTime <= childStart && childStart - taskTime < 2000) {

package/dist/providerStatus.js

@@ -24,7 +24,7 @@ function fallbackState() {
  */
 async function fetchStatusPage(baseUrl) {
     try {
-        const statusRes = await fetch(`${baseUrl}/api/v2/status.json`);
+        const statusRes = await fetchWithTimeout(`${baseUrl}/api/v2/status.json`);
         if (!statusRes.ok)
             return fallbackState();
         const statusData = await statusRes.json();
@@ -36,7 +36,7 @@ async function fetchStatusPage(baseUrl) {
             return { indicator, description, affectedComponents: [], activeIncident: null, updatedAt };
         }
         // Degraded — fetch summary for components + incidents
-        const summaryRes = await fetch(`${baseUrl}/api/v2/summary.json`);
+        const summaryRes = await fetchWithTimeout(`${baseUrl}/api/v2/summary.json`);
         if (!summaryRes.ok) {
             return { indicator, description, affectedComponents: [], activeIncident: null, updatedAt };
         }
@@ -61,6 +61,17 @@ async function fetchStatusPage(baseUrl) {
         return fallbackState();
     }
 }
+async function fetchWithTimeout(url) {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 10_000);
+    timeout.unref();
+    try {
+        return await fetch(url, { signal: controller.signal });
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
 /**
  * Fetch current Claude API status from status.claude.com.
  *

package/dist/providers/claudeCode.js

@@ -46,6 +46,7 @@ exports.ClaudeCodeProvider = void 0;
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
+const string_decoder_1 = require("string_decoder");
 const sessionContext_1 = require("../context/sessionContext");
 const jsonl_1 = require("../parsers/jsonl");
 const sessionPathResolver_1 = require("../parsers/sessionPathResolver");
@@ -97,6 +98,7 @@ class ClaudeCodeReader {
     filePosition = 0;
     events = [];
     _wasTruncated = false;
+    decoder = new string_decoder_1.StringDecoder('utf8');
     constructor(sessionPath) {
         this.sessionPath = sessionPath;
         this.parser = new jsonl_1.JsonlParser({
@@ -120,6 +122,7 @@ class ClaudeCodeReader {
                 this._wasTruncated = true;
                 this.filePosition = 0;
                 this.parser.reset();
+                this.decoder = new string_decoder_1.StringDecoder('utf8');
             }
             // No new content
             if (currentSize <= this.filePosition) {
@@ -129,11 +132,16 @@ class ClaudeCodeReader {
             const fd = fs.openSync(this.sessionPath, 'r');
             const bufferSize = currentSize - this.filePosition;
             const buffer = Buffer.alloc(bufferSize);
-            fs.readSync(fd, buffer, 0, bufferSize, this.filePosition);
-            fs.closeSync(fd);
-            const chunk = buffer.toString('utf-8');
+            let bytesRead = 0;
+            try {
+                bytesRead = fs.readSync(fd, buffer, 0, bufferSize, this.filePosition);
+            }
+            finally {
+                fs.closeSync(fd);
+            }
+            const chunk = this.decoder.write(buffer.subarray(0, bytesRead));
             this.parser.processChunk(chunk);
-            this.filePosition = currentSize;
+            this.filePosition += bytesRead;
         }
         catch (error) {
             console.error(`ClaudeCodeReader: error reading ${this.sessionPath}: ${error}`);
@@ -147,13 +155,18 @@ class ClaudeCodeReader {
     reset() {
         this.filePosition = 0;
         this.parser.reset();
+        this.decoder = new string_decoder_1.StringDecoder('utf8');
         this._wasTruncated = false;
     }
     exists() {
         return fs.existsSync(this.sessionPath);
     }
     flush() {
+        const finalChunk = this.decoder.end();
+        if (finalChunk)
+            this.parser.processChunk(finalChunk);
         this.parser.flush();
+        this.decoder = new string_decoder_1.StringDecoder('utf8');
     }
     getPosition() {
         return this.filePosition;
@@ -161,6 +174,7 @@ class ClaudeCodeReader {
     seekTo(position) {
         this.filePosition = position;
         this.parser.reset();
+        this.decoder = new string_decoder_1.StringDecoder('utf8');
     }
     wasTruncated() {
         return this._wasTruncated;

package/dist/providers/codex.js

@@ -46,6 +46,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodexProvider = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const string_decoder_1 = require("string_decoder");
 const EventAggregator_1 = require("../aggregation/EventAggregator");
 const sessionContext_1 = require("../context/sessionContext");
 const codexParser_1 = require("../parsers/codexParser");
@@ -131,6 +132,23 @@ function findRolloutFiles(dir) {
     }
     return results;
 }
+function hasRolloutFile(dir) {
+    try {
+        if (!fs.existsSync(dir))
+            return false;
+        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+            const fullPath = path.join(dir, entry.name);
+            if (entry.isDirectory() && hasRolloutFile(fullPath))
+                return true;
+            if (entry.isFile() && isRolloutFile(entry.name))
+                return true;
+        }
+    }
+    catch {
+        return false;
+    }
+    return false;
+}
 function findRolloutFilesInConfiguredHomes() {
     const results = [];
     const seen = new Set();
@@ -148,7 +166,7 @@ function findRolloutFilesInConfiguredHomes() {
 function getSessionsDir() {
     const dirs = getSessionsDirs();
     for (const dir of dirs) {
-        if (findRolloutFiles(dir).length > 0) {
+        if (hasRolloutFile(dir)) {
             return dir;
         }
     }
@@ -430,6 +448,7 @@ class CodexReader {
     filePosition = 0;
     lineBuffer = '';
     _wasTruncated = false;
+    decoder = new string_decoder_1.StringDecoder('utf8');
     constructor(rolloutPath, onContextWindowLimit, onRateLimits, onTokenUsage) {
         this.rolloutPath = rolloutPath;
         this.onContextWindowLimit = onContextWindowLimit;
@@ -455,6 +474,7 @@ class CodexReader {
                 this.filePosition = 0;
                 this.lineBuffer = '';
                 this.parser.reset();
+                this.decoder = new string_decoder_1.StringDecoder('utf8');
             }
             // No new content
             if (currentSize <= this.filePosition)
@@ -463,10 +483,15 @@ class CodexReader {
             const fd = fs.openSync(this.rolloutPath, 'r');
             const bufferSize = currentSize - this.filePosition;
             const buffer = Buffer.alloc(bufferSize);
-            fs.readSync(fd, buffer, 0, bufferSize, this.filePosition);
-            fs.closeSync(fd);
-            const chunk = buffer.toString('utf-8');
-            this.filePosition = currentSize;
+            let bytesRead = 0;
+            try {
+                bytesRead = fs.readSync(fd, buffer, 0, bufferSize, this.filePosition);
+            }
+            finally {
+                fs.closeSync(fd);
+            }
+            const chunk = this.decoder.write(buffer.subarray(0, bytesRead));
+            this.filePosition += bytesRead;
             // Process lines
             const text = this.lineBuffer + chunk;
             const lines = text.split('\n');
@@ -497,11 +522,12 @@ class CodexReader {
             // Propagate last token usage snapshot to the provider
             const lastUsage = this.parser.getLastTokenUsage();
             if (lastUsage && this.onTokenUsage) {
+                const cacheReadTokens = lastUsage.cached_input_tokens || 0;
                 this.onTokenUsage({
-                    inputTokens: lastUsage.input_tokens || 0,
+                    inputTokens: Math.max(0, (lastUsage.input_tokens || 0) - cacheReadTokens),
                     outputTokens: lastUsage.output_tokens || 0,
                     cacheWriteTokens: 0,
-                    cacheReadTokens: lastUsage.cached_input_tokens || 0,
+                    cacheReadTokens,
                     reasoningTokens: lastUsage.reasoning_output_tokens || 0,
                     model: this.parser.getCurrentModel() || 'unknown',
                     timestamp: new Date(),
@@ -521,12 +547,14 @@ class CodexReader {
         this.filePosition = 0;
         this.lineBuffer = '';
         this.parser.reset();
+        this.decoder = new string_decoder_1.StringDecoder('utf8');
         this._wasTruncated = false;
     }
     exists() {
         return fs.existsSync(this.rolloutPath);
     }
     flush() {
+        this.lineBuffer += this.decoder.end();
         // Process any remaining data in the line buffer
         if (this.lineBuffer.trim()) {
             try {
@@ -537,6 +565,7 @@ class CodexReader {
                 // Not a complete line yet
             }
         }
+        this.decoder = new string_decoder_1.StringDecoder('utf8');
     }
     getPosition() {
         return this.filePosition;
@@ -544,6 +573,7 @@ class CodexReader {
     seekTo(position) {
         this.filePosition = position;
         this.lineBuffer = '';
+        this.decoder = new string_decoder_1.StringDecoder('utf8');
     }
     wasTruncated() {
         return this._wasTruncated;
@@ -675,9 +705,10 @@ class CodexProvider {
         const db = this.ensureDb();
         if (db) {
             const cwdStats = db.getAllDistinctCwds();
+            const sessionsDir = getSessionsDir();
             for (const stat of cwdStats) {
                 seenCwds.set(stat.cwd, {
-                    dir: getSessionsDir(),
+                    dir: sessionsDir,
                     name: stat.cwd,
                     encodedName: stat.cwd,
                     sessionCount: stat.count,
@@ -971,11 +1002,9 @@ class CodexProvider {
         return this.lastTokenUsageData;
     }
     computeContextSize(usage) {
-        // OpenAI's input_tokens already includes cached_input_tokens (it's a subset,
-        // not additive like Anthropic's model). So inputTokens alone represents the
-        // full context window usage. This differs from OpenCode's formula which adds
-        // cacheWrite + cacheRead because Anthropic reports them separately.
-        return usage.inputTokens;
+        // Codex usage is normalized to the disjoint TokenUsage shape at the reader
+        // boundary, so reconstruct the full prompt/context from uncached + cached.
+        return usage.inputTokens + usage.cacheReadTokens;
     }
     // --- Rate limits (for vscode wrapper to build QuotaState) ---
     /** Get the last rate limits data received from token_count events. */