sidekick-shared 0.24.4 → 0.25.0

package/dist/autoSwitch.js

@@ -83,6 +83,7 @@ class AutoSwitchController {
     subscription = null;
     switchedDuringCrossing = new Set();
     lastSwitchAt = {};
+    switchInFlight = new Set();
     constructor(options) {
         this.quotaService = options.quotaService;
         this.config = mergedConfig(options.config);
@@ -91,7 +92,7 @@ class AutoSwitchController {
         this.getCodexAccounts = options.getCodexAccounts ?? codexProfiles_1.listCodexAccounts;
         this.getActiveCodexAccount = options.getActiveCodexAccount ?? codexProfiles_1.getActiveCodexAccount;
         this.readSnapshot = options.readSnapshot ?? quotaSnapshots_1.readQuotaSnapshot;
-        this.switchAccount = options.switchAccount ?? accountManager_1.switchAccount;
+        this.switchAccount = options.switchAccount ?? accountManager_1.switchAccountAsync;
         this.onTransition = options.onTransition;
         this.log = options.log;
         this.cooldownMs = options.cooldownMs ?? 0;
@@ -116,13 +117,22 @@ class AutoSwitchController {
         }
     }
     handleUpdate(state) {
-        if (state.claude)
-            this.handleProviderUpdate('claude', state.claude);
-        if (state.codex)
-            this.handleProviderUpdate('codex', state.codex);
+        // Fire-and-forget, but the registry/snapshot reads and the consumer's
+        // onTransition can all throw — a rejection here would escape the quota
+        // service's per-listener guard as an unhandled promise rejection.
+        if (state.claude) {
+            this.handleProviderUpdate('claude', state.claude).catch((error) => this.log?.('[AutoSwitch] Update failed for claude.', error));
+        }
+        if (state.codex) {
+            this.handleProviderUpdate('codex', state.codex).catch((error) => this.log?.('[AutoSwitch] Update failed for codex.', error));
+        }
     }
-    handleProviderUpdate(runtimeProvider, activeQuota) {
+    async handleProviderUpdate(runtimeProvider, activeQuota) {
         const providerId = runtimeStateToProvider(runtimeProvider);
+        // While a switch is mid-flight the registry's active account is
+        // indeterminate, so skip the whole update until it settles.
+        if (this.switchInFlight.has(providerId))
+            return;
         const activeAccount = providerId === 'claude-code' ? this.getActiveClaudeAccount() : this.getActiveCodexAccount();
         if (!activeAccount)
             return;
@@ -148,13 +158,28 @@ class AutoSwitchController {
         const previousSwitchAt = this.lastSwitchAt[providerId] ?? 0;
         if (this.cooldownMs > 0 && this.now() - previousSwitchAt < this.cooldownMs)
             return;
-        const result = this.switchAccount(providerId, decision.switchTo);
+        this.switchInFlight.add(providerId);
+        let result;
+        try {
+            result = await this.switchAccount(providerId, decision.switchTo);
+        }
+        catch (error) {
+            this.log?.(`[AutoSwitch] Switch threw for ${providerId} to ${decision.switchTo}.`, error);
+            return;
+        }
+        finally {
+            this.switchInFlight.delete(providerId);
+        }
         if (!result.success) {
             this.log?.(`[AutoSwitch] Could not switch ${providerId} to ${decision.switchTo}.`, result.error);
             return;
         }
         this.lastSwitchAt[providerId] = this.now();
         this.switchedDuringCrossing.add(providerId);
+        // A switch that completes after stop()/dispose() still records its
+        // state, but must not fire a transition into a stopped consumer.
+        if (!this.subscription)
+            return;
         this.onTransition?.({
             provider: providerId,
             from: activeAccountId,

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';
@@ -16,9 +17,15 @@ 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 { 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.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; } });
@@ -25,10 +26,18 @@ Object.defineProperty(exports, "projectSessionTranscript", { enumerable: true, g
 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; } });
+var mcpToolName_1 = require("./parsers/mcpToolName");
+Object.defineProperty(exports, "parseMcpToolName", { enumerable: true, get: function () { return mcpToolName_1.parseMcpToolName; } });
 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; } });
@@ -38,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; } });
@@ -48,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/codexProfiles.d.ts

@@ -10,7 +10,11 @@ export declare function getCodexMonitoringHomes(): string[];
 export declare function getCodexProfilesDir(): string;
 export declare function getCodexProfileHome(profileId: string): string;
 export declare function readCodexAccountMetadata(codexHome: string): AccountIdentityMetadata;
+/** {@link readCodexAccountMetadata} without blocking the event loop on the CLI probe. */
+export declare function readCodexAccountMetadataAsync(codexHome: string): Promise<AccountIdentityMetadata>;
 export declare function isCodexProfileAuthenticated(codexHome: string): boolean;
+/** {@link isCodexProfileAuthenticated} without blocking the event loop on the CLI probe. */
+export declare function isCodexProfileAuthenticatedAsync(codexHome: string): Promise<boolean>;
 export declare function listCodexAccounts(): SavedAccountProfile[];
 export declare function getActiveCodexAccount(): SavedAccountProfile | null;
 export declare function resolveSidekickCodexHome(): string;
@@ -30,9 +34,19 @@ export declare function resolveSidekickCodexHome(): string;
 export declare function resolveActiveCodexAccount(): ResolvedActiveAccount;
 export declare function getCodexExecutionEnv(baseEnv?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
 export declare function prepareCodexAccount(label: string): CodexAccountManagerResult;
+/** {@link prepareCodexAccount} without blocking the event loop on CLI probes. */
+export declare function prepareCodexAccountAsync(label: string): Promise<CodexAccountManagerResult>;
 export declare function finalizeCodexAccount(profileId: string, opts?: {
     activate?: boolean;
 }): CodexAccountManagerResult;
+/** {@link finalizeCodexAccount} without blocking the event loop on CLI probes. */
+export declare function finalizeCodexAccountAsync(profileId: string, opts?: {
+    activate?: boolean;
+}): Promise<CodexAccountManagerResult>;
 export declare function switchToCodexAccount(profileId: string): CodexAccountManagerResult;
+/** {@link switchToCodexAccount} without blocking the event loop on CLI probes. */
+export declare function switchToCodexAccountAsync(profileId: string): Promise<CodexAccountManagerResult>;
 export declare function reconcileCodexAuthState(): void;
+/** {@link reconcileCodexAuthState} without blocking the event loop on CLI probes. */
+export declare function reconcileCodexAuthStateAsync(): Promise<void>;
 export declare function removeCodexAccount(profileId: string): AccountManagerResult;