sidekick-shared 0.24.5 → 0.25.0

package/dist/accountChanges.js

@@ -0,0 +1,151 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onAccountsChanged = onAccountsChanged;
+exports._notifyAccountsChanged = _notifyAccountsChanged;
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
+const path = __importStar(require("path"));
+const accountChangeSignal_1 = require("./accountChangeSignal");
+const accountStatus_1 = require("./accountStatus");
+const accountRegistry_1 = require("./accountRegistry");
+const codexProfiles_1 = require("./codexProfiles");
+const listeners = new Set();
+let watchers = [];
+let pollTimer;
+let stopRawListener;
+let lastFingerprint;
+let debounceTimer;
+let activePollIntervalMs = 30_000;
+/**
+ * Observe login, logout, and active-account switches. Local Sidekick mutations
+ * signal immediately; filesystem watchers cover external CLIs; a low-frequency
+ * catch-up poll protects network mounts and watcher-hostile filesystems.
+ */
+function onAccountsChanged(listener, options = {}) {
+    listeners.add(listener);
+    activePollIntervalMs = Math.max(1_000, options.pollIntervalMs ?? activePollIntervalMs);
+    ensureMonitoring();
+    if (options.emitCurrent)
+        emitIfChanged('poll', true, listener);
+    return {
+        dispose: () => {
+            listeners.delete(listener);
+            if (listeners.size === 0)
+                stopMonitoring();
+        },
+    };
+}
+function ensureMonitoring() {
+    if (stopRawListener)
+        return;
+    lastFingerprint = fingerprint((0, accountStatus_1.getActiveAccountStatus)());
+    stopRawListener = (0, accountChangeSignal_1._onRawAccountsChanged)((reason) => scheduleCheck(reason));
+    for (const target of watchTargets()) {
+        try {
+            const watcher = fs.watch(target, { persistent: false }, () => {
+                scheduleCheck('filesystem');
+            });
+            watcher.on('error', () => {
+                watchers = watchers.filter((candidate) => candidate !== watcher);
+                try {
+                    watcher.close();
+                }
+                catch {
+                    // The catch-up poll remains active.
+                }
+            });
+            watchers.push(watcher);
+        }
+        catch {
+            // Missing/unwatchable directories are covered by the catch-up poll.
+        }
+    }
+    pollTimer = setInterval(() => emitIfChanged('poll'), activePollIntervalMs);
+    pollTimer.unref?.();
+}
+function stopMonitoring() {
+    stopRawListener?.();
+    stopRawListener = undefined;
+    for (const watcher of watchers)
+        watcher.close();
+    watchers = [];
+    if (pollTimer)
+        clearInterval(pollTimer);
+    pollTimer = undefined;
+    if (debounceTimer)
+        clearTimeout(debounceTimer);
+    debounceTimer = undefined;
+    lastFingerprint = undefined;
+}
+function watchTargets() {
+    return Array.from(new Set([(0, accountRegistry_1.getAccountsDir)(), path.join(os.homedir(), '.claude'), (0, codexProfiles_1.getSystemCodexHome)()]));
+}
+function scheduleCheck(reason) {
+    if (debounceTimer)
+        clearTimeout(debounceTimer);
+    debounceTimer = setTimeout(() => {
+        debounceTimer = undefined;
+        // Never force: watch targets include ~/.claude and the Codex home, whose
+        // history files churn on every prompt. Only a real status change may wake
+        // subscribers, or dormant quota pollers would poll on unrelated writes.
+        emitIfChanged(reason);
+    }, 25);
+    debounceTimer.unref?.();
+}
+function emitIfChanged(reason, force = false, singleListener) {
+    const status = (0, accountStatus_1.getActiveAccountStatus)();
+    const nextFingerprint = fingerprint(status);
+    if (!force && nextFingerprint === lastFingerprint)
+        return;
+    lastFingerprint = nextFingerprint;
+    const event = { reason, status };
+    const targets = singleListener ? [singleListener] : [...listeners];
+    for (const listener of targets) {
+        try {
+            listener(event);
+        }
+        catch {
+            // A host callback cannot stop monitoring.
+        }
+    }
+}
+function fingerprint(status) {
+    return JSON.stringify(status);
+}
+/** Internal bridge for account mutations outside the registry module. */
+function _notifyAccountsChanged() {
+    (0, accountChangeSignal_1._emitAccountsChanged)('local');
+}

package/dist/accountRegistry.d.ts

@@ -1,4 +1,6 @@
-export type AccountProviderId = 'claude-code' | 'codex';
+import type { AccountProviderId } from './providerIds';
+export { ACCOUNT_PROVIDER_IDS } from './providerIds';
+export type { AccountProviderId } from './providerIds';
 export interface AccountIdentityMetadata {
     email?: string;
     workspaceId?: string;

package/dist/accountRegistry.js

@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ACCOUNT_PROVIDER_IDS = void 0;
 exports.getAccountsDir = getAccountsDir;
 exports.readSavedAccountRegistry = readSavedAccountRegistry;
 exports.writeSavedAccountRegistry = writeSavedAccountRegistry;
@@ -46,6 +47,9 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const paths_1 = require("./paths");
 const atomic_1 = require("./writers/atomic");
+const accountChangeSignal_1 = require("./accountChangeSignal");
+var providerIds_1 = require("./providerIds");
+Object.defineProperty(exports, "ACCOUNT_PROVIDER_IDS", { enumerable: true, get: function () { return providerIds_1.ACCOUNT_PROVIDER_IDS; } });
 function getAccountsDir() {
     return path.join((0, paths_1.getConfigDir)(), 'accounts');
 }
@@ -60,6 +64,7 @@ function ensureAccountsDir() {
 }
 function writeRegistryUnlocked(registry) {
     (0, atomic_1.atomicWriteJsonSync)(getRegistryPath(), normalizeRegistry(registry));
+    (0, accountChangeSignal_1._emitAccountsChanged)('local');
 }
 /**
  * Serializes registry read-modify-write cycles across processes. Without the

package/dist/browser.d.ts

@@ -7,7 +7,8 @@
  *
  * For pricing hydration (LiteLLM catalog refresh), use `sidekick-shared/node`.
  */
-export { getModelContextWindowSize, DEFAULT_CONTEXT_WINDOW } from './modelContext';
+export { getModelContextWindowSize, resolveModelContextWindow, DEFAULT_CONTEXT_WINDOW, } from './modelContext';
+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 { estimateTextTokens, estimateSerializedTokens } from './tokenEstimation';
@@ -19,8 +20,12 @@ export type { FormatDurationMsOptions, FormatTokenCountOptions } from './formatt
 export { parseMcpToolName } from './parsers/mcpToolName';
 export type { McpToolNameParts } from './parsers/mcpToolName';
 export { buildSessionContextSnapshot, calculateSessionContextPressure, createSessionContextProjector, } from './context/sessionContext';
+export { ACCOUNT_PROVIDER_IDS, MODEL_PROVIDER_IDS, QUOTA_PROVIDER_IDS, RUNTIME_QUOTA_PROVIDER_IDS, SESSION_PROVIDER_IDS, } from './providerIds';
+export type { AccountProviderId, ModelProviderId, QuotaProviderId, RuntimeQuotaProviderId, SessionProviderId, } from './providerIds';
 export type { BuildSessionContextSnapshotOptions, SessionContextCapabilities, SessionContextLayerBreakdown, SessionContextPressure, SessionContextProjector, SessionContextSnapshot, SessionContextSource, SessionContextSourceType, } from './context/sessionContext';
 export { assistantTurnEventsFromSessionEvents, extractTurnSubagents, isAssistantTurnSubagentTool, reasoningSummary, segmentAssistantTurn, } from './turns/assistantTurn';
 export type { AssistantTurnEvent, AssistantTurnEventType, AssistantTurnProcess, AssistantTurnProcessStep, AssistantTurnProjection, AssistantTurnSubagent, AssistantTurnSubagentStatus, AssistantTurnTimelineItem, AssistantTurnToolRef, ExtractTurnSubagentsOptions, ReasoningSummary, SegmentAssistantTurnOptions, } from './turns/assistantTurn';
-export { parseModelId, getModelPricing, getModelInfo, calculateCost, calculateCostWithPricing, calculateCostWithProvenance, mergeCostSources, shortModelName, getModelDisplayInfo, compareModelIds, sortModelIds, formatCost, } from './modelInfo';
-export type { ModelPricing, CostTokenUsage, CostSource, CostProvenanceInput, CostWithProvenance, ModelProvider, ParsedModelId, ModelInfo, ModelDisplayInfo, } from './modelInfo';
+export { parseModelId, getModelPricing, resolveModelPricing, getModelInfo, calculateCost, calculateCostWithPricing, calculateCostWithProvenance, mergeCostSources, shortModelName, getModelDisplayInfo, compareModelIds, sortModelIds, formatCost, } from './modelInfo';
+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';

package/dist/browser.js

@@ -9,9 +9,10 @@
  * 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.parseMcpToolName = exports.formatTokenCount = exports.formatDurationMs = exports.projectSessionTranscript = exports.estimateSerializedTokens = exports.estimateTextTokens = exports.calculateNormalizedUsageCost = exports.extractNormalizedUsage = exports.normalizeProviderUsage = exports.DEFAULT_CONTEXT_WINDOW = 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.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;
 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; } });
 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; } });
@@ -31,6 +32,12 @@ var sessionContext_1 = require("./context/sessionContext");
 Object.defineProperty(exports, "buildSessionContextSnapshot", { enumerable: true, get: function () { return sessionContext_1.buildSessionContextSnapshot; } });
 Object.defineProperty(exports, "calculateSessionContextPressure", { enumerable: true, get: function () { return sessionContext_1.calculateSessionContextPressure; } });
 Object.defineProperty(exports, "createSessionContextProjector", { enumerable: true, get: function () { return sessionContext_1.createSessionContextProjector; } });
+var providerIds_1 = require("./providerIds");
+Object.defineProperty(exports, "ACCOUNT_PROVIDER_IDS", { enumerable: true, get: function () { return providerIds_1.ACCOUNT_PROVIDER_IDS; } });
+Object.defineProperty(exports, "MODEL_PROVIDER_IDS", { enumerable: true, get: function () { return providerIds_1.MODEL_PROVIDER_IDS; } });
+Object.defineProperty(exports, "QUOTA_PROVIDER_IDS", { enumerable: true, get: function () { return providerIds_1.QUOTA_PROVIDER_IDS; } });
+Object.defineProperty(exports, "RUNTIME_QUOTA_PROVIDER_IDS", { enumerable: true, get: function () { return providerIds_1.RUNTIME_QUOTA_PROVIDER_IDS; } });
+Object.defineProperty(exports, "SESSION_PROVIDER_IDS", { enumerable: true, get: function () { return providerIds_1.SESSION_PROVIDER_IDS; } });
 var assistantTurn_1 = require("./turns/assistantTurn");
 Object.defineProperty(exports, "assistantTurnEventsFromSessionEvents", { enumerable: true, get: function () { return assistantTurn_1.assistantTurnEventsFromSessionEvents; } });
 Object.defineProperty(exports, "extractTurnSubagents", { enumerable: true, get: function () { return assistantTurn_1.extractTurnSubagents; } });
@@ -40,6 +47,7 @@ Object.defineProperty(exports, "segmentAssistantTurn", { enumerable: true, get:
 var modelInfo_1 = require("./modelInfo");
 Object.defineProperty(exports, "parseModelId", { enumerable: true, get: function () { return modelInfo_1.parseModelId; } });
 Object.defineProperty(exports, "getModelPricing", { enumerable: true, get: function () { return modelInfo_1.getModelPricing; } });
+Object.defineProperty(exports, "resolveModelPricing", { enumerable: true, get: function () { return modelInfo_1.resolveModelPricing; } });
 Object.defineProperty(exports, "getModelInfo", { enumerable: true, get: function () { return modelInfo_1.getModelInfo; } });
 Object.defineProperty(exports, "calculateCost", { enumerable: true, get: function () { return modelInfo_1.calculateCost; } });
 Object.defineProperty(exports, "calculateCostWithPricing", { enumerable: true, get: function () { return modelInfo_1.calculateCostWithPricing; } });
@@ -50,3 +58,9 @@ Object.defineProperty(exports, "getModelDisplayInfo", { enumerable: true, get: f
 Object.defineProperty(exports, "compareModelIds", { enumerable: true, get: function () { return modelInfo_1.compareModelIds; } });
 Object.defineProperty(exports, "sortModelIds", { enumerable: true, get: function () { return modelInfo_1.sortModelIds; } });
 Object.defineProperty(exports, "formatCost", { enumerable: true, get: function () { return modelInfo_1.formatCost; } });
+var modelCatalog_1 = require("./modelCatalog");
+Object.defineProperty(exports, "exportResolvedModelCatalog", { enumerable: true, get: function () { return modelCatalog_1.exportResolvedModelCatalog; } });
+Object.defineProperty(exports, "importResolvedModelCatalog", { enumerable: true, get: function () { return modelCatalog_1.importResolvedModelCatalog; } });
+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; } });

package/dist/codexQuotaWatcher.d.ts

@@ -6,6 +6,7 @@ import type { SavedAccountProfile } from './accountRegistry';
 import type { Disposable } from './quotaPoller';
 import type { QuotaState } from './quota';
 import type { ProviderQuotaState } from './providerQuota';
+import { type AccountsChangedEvent } from './accountChanges';
 type CodexAccountReader = () => SavedAccountProfile | null;
 type SnapshotReader = (providerId: 'codex', accountId: string) => QuotaState | null;
 type SnapshotWriter = (providerId: 'codex', accountId: string, quota: QuotaState) => void;
@@ -27,6 +28,7 @@ export interface CodexQuotaWatcherOptions {
     workspaceId?: string;
     /** Override the history append function (used by tests). Default: `appendQuotaHistorySample`. */
     appendHistorySample?: HistoryAppender;
+    subscribeAccountsChanged?: (listener: (event: AccountsChangedEvent) => void) => Disposable;
 }
 /**
  * Watches the active Codex rollout for quota snapshots and falls back to the
@@ -46,6 +48,7 @@ export declare class CodexQuotaWatcher implements Disposable {
     private readonly now;
     private readonly workspaceId;
     private readonly appendHistorySample;
+    private readonly subscribeAccountsChanged;
     private readonly listeners;
     private discoveryTimer;
     private provider;
@@ -56,6 +59,7 @@ export declare class CodexQuotaWatcher implements Disposable {
     private lastLocalScanAt;
     private lastLocalScanState;
     private running;
+    private accountSubscription;
     constructor(workspacePath: string, options?: CodexQuotaWatcherOptions);
     start(): void;
     stop(): void;
@@ -63,12 +67,14 @@ export declare class CodexQuotaWatcher implements Disposable {
     onUpdate(cb: (state: ProviderQuotaState<'codex'>) => void): Disposable;
     onQuotaUpdate(cb: (state: ProviderQuotaState<'codex'>) => void): Disposable;
     refresh(): void;
+    private handleAccountsChanged;
     private refreshActiveSession;
     private attachToSession;
     private ingestSessionUpdate;
     private emitCachedOrUnavailable;
     private emitState;
     private getProvider;
+    private safeGetActiveAccount;
     private teardownActiveSession;
 }
 export {};

package/dist/codexQuotaWatcher.js

@@ -40,6 +40,7 @@ const codexQuota_1 = require("./codexQuota");
 const quotaSnapshots_1 = require("./quotaSnapshots");
 const quotaHistory_1 = require("./quotaHistory");
 const codex_1 = require("./providers/codex");
+const accountChanges_1 = require("./accountChanges");
 const DEFAULT_DISCOVERY_POLL_INTERVAL_MS = 30_000;
 const DEFAULT_LOCAL_SCAN_CACHE_MS = 5 * 60_000;
 function accountEmail(account) {
@@ -86,6 +87,7 @@ class CodexQuotaWatcher {
     now;
     workspaceId;
     appendHistorySample;
+    subscribeAccountsChanged;
     listeners = [];
     discoveryTimer;
     provider = null;
@@ -96,6 +98,7 @@ class CodexQuotaWatcher {
     lastLocalScanAt = Number.NEGATIVE_INFINITY;
     lastLocalScanState = null;
     running = false;
+    accountSubscription = null;
     constructor(workspacePath, options = {}) {
         this.workspacePath = workspacePath;
         this.discoveryPollIntervalMs =
@@ -119,15 +122,14 @@ class CodexQuotaWatcher {
         this.now = options.now ?? Date.now;
         this.workspaceId = options.workspaceId;
         this.appendHistorySample = options.appendHistorySample ?? quotaHistory_1.appendQuotaHistorySample;
+        this.subscribeAccountsChanged = options.subscribeAccountsChanged ?? accountChanges_1.onAccountsChanged;
     }
     start() {
         if (this.running)
             return;
         this.running = true;
-        this.refreshActiveSession();
-        this.discoveryTimer = setInterval(() => {
-            this.refreshActiveSession();
-        }, this.discoveryPollIntervalMs);
+        this.accountSubscription ??= this.subscribeAccountsChanged(() => this.handleAccountsChanged());
+        this.handleAccountsChanged();
     }
     stop() {
         if (!this.running)
@@ -137,6 +139,8 @@ class CodexQuotaWatcher {
             clearInterval(this.discoveryTimer);
             this.discoveryTimer = undefined;
         }
+        this.accountSubscription?.dispose();
+        this.accountSubscription = null;
         this.teardownActiveSession();
     }
     dispose() {
@@ -157,21 +161,46 @@ class CodexQuotaWatcher {
         return this.onUpdate(cb);
     }
     refresh() {
-        this.refreshActiveSession();
+        this.handleAccountsChanged();
     }
-    refreshActiveSession() {
+    handleAccountsChanged() {
+        if (!this.running)
+            return;
+        const account = this.safeGetActiveAccount();
+        if (!account) {
+            if (this.discoveryTimer) {
+                clearInterval(this.discoveryTimer);
+                this.discoveryTimer = undefined;
+            }
+            this.teardownActiveSession();
+            this.emitState(makeUnavailableState(null, 'No Codex account configured'));
+            return;
+        }
+        if (!this.discoveryTimer) {
+            this.discoveryTimer = setInterval(() => {
+                this.refreshActiveSession();
+            }, this.discoveryPollIntervalMs);
+            this.discoveryTimer.unref?.();
+        }
+        this.refreshActiveSession(account);
+    }
+    refreshActiveSession(account = this.safeGetActiveAccount()) {
+        if (!account) {
+            this.handleAccountsChanged();
+            return;
+        }
         const provider = this.getProvider();
         const nextSessionPath = provider.findActiveSession(this.workspacePath);
         if (!nextSessionPath) {
             this.teardownActiveSession();
-            this.emitCachedOrUnavailable();
+            this.emitCachedOrUnavailable(account);
             return;
         }
         if (nextSessionPath !== this.sessionPath || this.reader == null) {
             this.attachToSession(nextSessionPath);
             return;
         }
-        this.ingestSessionUpdate('readNew');
+        this.ingestSessionUpdate('readNew', account);
     }
     attachToSession(nextSessionPath) {
         this.teardownActiveSession();
@@ -189,14 +218,30 @@ class CodexQuotaWatcher {
                 }
                 this.refreshActiveSession();
             });
+            if (typeof this.fileWatcher.on === 'function') {
+                this.fileWatcher.on('error', () => {
+                    try {
+                        this.fileWatcher?.close();
+                    }
+                    catch {
+                        // Discovery polling remains active.
+                    }
+                    this.fileWatcher = null;
+                });
+            }
         }
         catch {
             this.emitCachedOrUnavailable();
         }
     }
-    ingestSessionUpdate(mode) {
+    ingestSessionUpdate(mode, knownAccount) {
+        const account = knownAccount ?? this.safeGetActiveAccount();
+        if (!account) {
+            this.handleAccountsChanged();
+            return;
+        }
         if (!this.provider || !this.reader) {
-            this.emitCachedOrUnavailable();
+            this.emitCachedOrUnavailable(account);
             return;
         }
         if (!this.reader.exists()) {
@@ -211,48 +256,45 @@ class CodexQuotaWatcher {
         }
         const liveQuota = (0, codexQuota_1.quotaFromCodexRateLimits)(this.provider.getLastRateLimits(), 'session');
         if (!liveQuota) {
-            this.emitCachedOrUnavailable();
+            this.emitCachedOrUnavailable(account);
             return;
         }
-        const account = this.getActiveAccount();
-        const cached = account ? this.readSnapshot('codex', account.id) : null;
+        const cached = this.readSnapshot('codex', account.id);
         const liveQuotaWithResetCredits = {
             ...liveQuota,
             resetCredits: liveQuota.resetCredits ?? cached?.resetCredits,
         };
-        if (account) {
-            this.writeSnapshot('codex', account.id, liveQuotaWithResetCredits);
-            if (this.workspaceId) {
-                const sample = {
-                    timestamp: liveQuotaWithResetCredits.capturedAt ?? new Date().toISOString(),
-                    runtimeProvider: 'codex',
-                    providerId: account.id,
-                    workspaceId: this.workspaceId,
-                    fiveHour: {
-                        utilization: liveQuotaWithResetCredits.fiveHour.utilization,
-                        resetsAt: liveQuotaWithResetCredits.fiveHour.resetsAt,
-                    },
-                    sevenDay: {
-                        utilization: liveQuotaWithResetCredits.sevenDay.utilization,
-                        resetsAt: liveQuotaWithResetCredits.sevenDay.resetsAt,
-                    },
-                    available: liveQuotaWithResetCredits.available,
-                    error: liveQuotaWithResetCredits.error,
-                    source: liveQuotaWithResetCredits.source,
-                    stale: liveQuotaWithResetCredits.stale,
-                };
-                try {
-                    const result = this.appendHistorySample(sample);
-                    if (result && typeof result.catch === 'function') {
-                        result.catch(() => {
-                            // History append must never break the live emission path.
-                        });
-                    }
-                }
-                catch {
-                    // Synchronous errors swallowed for the same reason.
+        this.writeSnapshot('codex', account.id, liveQuotaWithResetCredits);
+        if (this.workspaceId) {
+            const sample = {
+                timestamp: liveQuotaWithResetCredits.capturedAt ?? new Date().toISOString(),
+                runtimeProvider: 'codex',
+                providerId: account.id,
+                workspaceId: this.workspaceId,
+                fiveHour: {
+                    utilization: liveQuotaWithResetCredits.fiveHour.utilization,
+                    resetsAt: liveQuotaWithResetCredits.fiveHour.resetsAt,
+                },
+                sevenDay: {
+                    utilization: liveQuotaWithResetCredits.sevenDay.utilization,
+                    resetsAt: liveQuotaWithResetCredits.sevenDay.resetsAt,
+                },
+                available: liveQuotaWithResetCredits.available,
+                error: liveQuotaWithResetCredits.error,
+                source: liveQuotaWithResetCredits.source,
+                stale: liveQuotaWithResetCredits.stale,
+            };
+            try {
+                const result = this.appendHistorySample(sample);
+                if (result && typeof result.catch === 'function') {
+                    result.catch(() => {
+                        // History append must never break the live emission path.
+                    });
                 }
             }
+            catch {
+                // Synchronous errors swallowed for the same reason.
+            }
         }
         this.emitState(enrichQuotaState({
             ...liveQuotaWithResetCredits,
@@ -260,8 +302,12 @@ class CodexQuotaWatcher {
             providerId: 'codex',
         }, account));
     }
-    emitCachedOrUnavailable() {
-        const account = this.getActiveAccount();
+    emitCachedOrUnavailable(knownAccount) {
+        const account = knownAccount ?? this.safeGetActiveAccount();
+        if (!account) {
+            this.emitState(makeUnavailableState(null, 'No Codex account configured'));
+            return;
+        }
         const scanNow = this.now();
         if (scanNow - this.lastLocalScanAt < this.localScanCacheMs) {
             if (this.lastLocalScanState) {
@@ -296,7 +342,7 @@ class CodexQuotaWatcher {
                 localProvider?.dispose();
             }
         }
-        const cached = account ? this.readSnapshot('codex', account.id) : null;
+        const cached = this.readSnapshot('codex', account.id);
         if (cached) {
             this.emitState(enrichQuotaState({
                 ...cached,
@@ -331,6 +377,14 @@ class CodexQuotaWatcher {
         }
         return this.provider;
     }
+    safeGetActiveAccount() {
+        try {
+            return this.getActiveAccount();
+        }
+        catch {
+            return null;
+        }
+    }
     teardownActiveSession() {
         if (this.fileWatcher) {
             this.fileWatcher.close();