sidekick-shared 0.21.3 → 0.21.4

package/README.md

@@ -47,7 +47,7 @@ npm install sidekick-shared
 | **Model Info & Pricing**        | Model family parsing (Anthropic / OpenAI / Google, including legacy `claude-3-opus-…` and `claude-3-5-sonnet-…` IDs), context-window lookup (including Fable 5 / Opus 4.8 / Opus 4.7 / Sonnet 4.7 1M and GPT-5.x variants), pricing tables with optional LiteLLM hydration, null-aware cost (`calculateCost()`), provenance-preserving cost (`calculateCostWithProvenance()`, `mergeCostSources()`), and display helpers (`shortModelName()`, `getModelDisplayInfo()`, `compareModelIds()`, `sortModelIds()`, `formatCost()`) |
 | **Quota Polling**               | `QuotaPoller` class with exponential backoff, active/idle intervals, and cached fallback                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | **Multi-Provider Quota**        | `MultiProviderQuotaService` orchestrates Claude polling + peak-hours + account labels + Codex/z.ai quota updates behind one typed event stream. `CodexQuotaWatcher` watches the active Codex rollout for live rate limits with snapshot fallback; z.ai quota uses the API resolver with snapshot fallback                                                                                                                                                                                                                     |
-| **Accounts**                    | Multi-provider account registry (v2) with per-provider active account, save/switch/remove, v1 migration, `ensureDefaultAccounts()` for first-run bootstrap of the active system Claude/Codex credentials as a "Default" saved account, and `getActiveAccountStatus()` for a single-pass active-account read across providers                                                                                                                                                                                                  |
+| **Accounts**                    | Multi-provider account registry (v2) with per-provider active account, save/switch/remove, v1 migration, `ensureDefaultAccounts()` for first-run bootstrap of the active system Claude/Codex credentials as a "Default" saved account, `getActiveAccountStatus()` for a single-pass active-account read across providers, and live-first `resolveActiveClaudeAccount()` / `resolveActiveCodexAccount()` that report the currently logged-in account (self-healing the saved pointer) for display                              |
 | **Account Management 2.0**      | Provider-neutral acquisition + switching: `beginAccountLogin()` / `getAccountLoginStatus()` / `finalizeAccountLogin()` / `spawnAccountLogin()` drive a TTY-less, profile-isolated login that doesn't disturb the active account until finalization; `listAllAccounts()` and `switchAccount()` expose a shared switcher across Claude and Codex. Claude accounts get canonical profile homes with account-scoped macOS keychain suffixes and startup migration from legacy flat backups                                        |
 | **Terminal sync & auto-switch** | Opt-in terminal profile pointers, shell-hook/launcher helpers, and a default-off `AutoSwitchController` (`decideAutoSwitch()`) that moves to a healthier saved account when quota crosses a configured threshold                                                                                                                                                                                                                                                                                                              |
 | **Codex Profiles**              | Codex account lifecycle — prepare, finalize, switch, remove — switching atomically swaps the profile's backed-up credentials into the system `~/.codex/auth.json`, with rotated-token staleness protection, one-time dual-home migration, and legacy multi-home session monitoring                                                                                                                                                                                                                                            |
@@ -359,6 +359,21 @@ console.log(status.claude.present, status.claude.email);
 console.log(status.codex.present, status.codex.label);
 ```
 
+For display surfaces that must reflect the **currently logged-in** account — even after a native `claude /login` or `codex login` outside Sidekick — use the live-first resolvers. They prefer the live provider auth (`~/.claude/.claude.json` oauthAccount; the `~/.codex/auth.json` id_token JWT) over the saved `activeByProvider` pointer, fall back to the registry, and self-heal the saved pointer on an unambiguous match (best-effort, never creating or deleting profiles):
+
+```typescript
+import { resolveActiveClaudeAccount, resolveActiveCodexAccount } from 'sidekick-shared';
+import type { ResolvedActiveAccount } from 'sidekick-shared';
+
+const claude: ResolvedActiveAccount = resolveActiveClaudeAccount();
+// source: 'live'  → identity came from the live provider auth (label filled when it matches a saved profile)
+// source: 'registry' → no usable live identity; fell back to the saved active pointer
+// source: 'none'  → neither a live identity nor a saved active account
+console.log(claude.email, claude.label, claude.source);
+
+const codex = resolveActiveCodexAccount();
+```
+
 ### Track cost provenance for honest UI rollups
 
 ```typescript

package/dist/accountRegistry.d.ts

@@ -19,6 +19,23 @@ export interface SavedAccountRegistry {
     activeByProvider: Record<AccountProviderId, string | null>;
     accounts: SavedAccountProfile[];
 }
+/**
+ * The currently active account resolved from the *live* provider auth, with the
+ * saved registry used only to enrich the display label.
+ *
+ * - `source: 'live'`   — identity came from the provider's live auth file. This
+ *   is the source of truth; `label` is filled in only when the live identity
+ *   matches a saved profile.
+ * - `source: 'registry'` — no usable live identity (logged out, api-key auth,
+ *   unparseable token); fell back to the saved active pointer.
+ * - `source: 'none'`   — neither a live identity nor a saved active account.
+ */
+export interface ResolvedActiveAccount {
+    email?: string;
+    label?: string;
+    providerAccountId?: string;
+    source: 'live' | 'registry' | 'none';
+}
 export declare function getAccountsDir(): string;
 export declare function readSavedAccountRegistry(): SavedAccountRegistry | null;
 export declare function writeSavedAccountRegistry(registry: SavedAccountRegistry): void;

package/dist/accountStatus.js

@@ -14,23 +14,20 @@ function errorMessage(error) {
  */
 function getActiveAccountStatus(error) {
     try {
-        const claudeAccount = (0, accounts_1.readActiveClaudeAccount)();
-        const codexAccount = (0, codexProfiles_1.getActiveCodexAccount)();
-        const claude = claudeAccount
+        const claudeAccount = (0, accounts_1.resolveActiveClaudeAccount)();
+        const codexAccount = (0, codexProfiles_1.resolveActiveCodexAccount)();
+        const claude = claudeAccount.source !== 'none'
             ? {
                 present: true,
                 email: claudeAccount.email,
-                label: claudeAccount.email,
+                label: claudeAccount.label ?? claudeAccount.email,
             }
             : { present: false };
-        const codex = codexAccount
+        const codex = codexAccount.source !== 'none'
             ? {
                 present: true,
-                email: codexAccount.email ?? codexAccount.metadata?.email,
-                label: codexAccount.label ??
-                    codexAccount.email ??
-                    codexAccount.metadata?.email ??
-                    codexAccount.id,
+                email: codexAccount.email,
+                label: codexAccount.label ?? codexAccount.email ?? codexAccount.providerAccountId,
             }
             : { present: false };
         return {

package/dist/accounts.d.ts

@@ -4,6 +4,7 @@
  * Handles saving, listing, switching, and removing Claude accounts.
  * Both the VS Code extension and CLI consume this module.
  */
+import { type ResolvedActiveAccount } from './accountRegistry';
 export interface AccountEntry {
     uuid: string;
     email: string;
@@ -38,4 +39,16 @@ export declare function reconcileClaudeAuthState(): void;
 export declare function removeAccount(uuid: string): AccountManagerResult;
 export declare function listAccounts(): AccountEntry[];
 export declare function getActiveAccount(): AccountEntry | null;
+/**
+ * Resolves the *currently logged-in* Claude account for display, preferring the
+ * live `~/.claude/.claude.json` identity over the saved registry pointer (which
+ * only sidekick's own switch flow updates and therefore goes stale after a native
+ * `claude /login`).
+ *
+ * Safe self-heal: when the live account matches a saved profile (by account UUID,
+ * email as fallback) that isn't the current active pointer, the pointer is
+ * re-pointed so registry-keyed data tracks reality too. Never creates or deletes
+ * profiles; an unknown live account is shown as-is with no label and no write.
+ */
+export declare function resolveActiveClaudeAccount(): ResolvedActiveAccount;
 export declare function isMultiAccountEnabled(): boolean;

package/dist/accounts.js

@@ -50,6 +50,7 @@ exports.reconcileClaudeAuthState = reconcileClaudeAuthState;
 exports.removeAccount = removeAccount;
 exports.listAccounts = listAccounts;
 exports.getActiveAccount = getActiveAccount;
+exports.resolveActiveClaudeAccount = resolveActiveClaudeAccount;
 exports.isMultiAccountEnabled = isMultiAccountEnabled;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -513,6 +514,55 @@ function getActiveAccount() {
         addedAt: active.addedAt,
     };
 }
+/**
+ * Resolves the *currently logged-in* Claude account for display, preferring the
+ * live `~/.claude/.claude.json` identity over the saved registry pointer (which
+ * only sidekick's own switch flow updates and therefore goes stale after a native
+ * `claude /login`).
+ *
+ * Safe self-heal: when the live account matches a saved profile (by account UUID,
+ * email as fallback) that isn't the current active pointer, the pointer is
+ * re-pointed so registry-keyed data tracks reality too. Never creates or deletes
+ * profiles; an unknown live account is shown as-is with no label and no write.
+ */
+function resolveActiveClaudeAccount() {
+    const live = readActiveClaudeAccount();
+    if (live) {
+        const profiles = (0, accountRegistry_1.listSavedAccountProfiles)('claude-code');
+        const match = profiles.find((p) => (p.providerAccountId ?? p.id) === live.uuid) ??
+            profiles.find((p) => (p.email ?? p.metadata?.email) === live.email);
+        if (match) {
+            const active = (0, accountRegistry_1.getActiveSavedAccount)('claude-code');
+            if (!active || active.id !== match.id) {
+                // Self-heal is best-effort: a registry write failure (read-only/full
+                // disk) must never break display or extension activation. We still
+                // return the correct live identity below.
+                try {
+                    (0, accountRegistry_1.setActiveSavedAccount)('claude-code', match.id);
+                }
+                catch {
+                    /* keep going with the live identity */
+                }
+            }
+        }
+        return {
+            email: live.email,
+            label: match?.label,
+            providerAccountId: live.uuid,
+            source: 'live',
+        };
+    }
+    const active = getActiveAccount();
+    if (active) {
+        return {
+            email: active.email,
+            label: active.label,
+            providerAccountId: active.uuid,
+            source: 'registry',
+        };
+    }
+    return { source: 'none' };
+}
 function isMultiAccountEnabled() {
     return (0, accountRegistry_1.listSavedAccountProfiles)('claude-code').length >= 1;
 }

package/dist/codexProfiles.d.ts

@@ -1,4 +1,4 @@
-import type { AccountIdentityMetadata, SavedAccountProfile } from './accountRegistry';
+import type { AccountIdentityMetadata, ResolvedActiveAccount, SavedAccountProfile } from './accountRegistry';
 import type { AccountManagerResult } from './accounts';
 export interface CodexAccountManagerResult extends AccountManagerResult {
     needsLogin?: boolean;
@@ -14,6 +14,20 @@ export declare function isCodexProfileAuthenticated(codexHome: string): boolean;
 export declare function listCodexAccounts(): SavedAccountProfile[];
 export declare function getActiveCodexAccount(): SavedAccountProfile | null;
 export declare function resolveSidekickCodexHome(): string;
+/**
+ * Resolves the *currently logged-in* Codex account for display, preferring the
+ * live `auth.json` identity over the saved registry pointer (which only sidekick's
+ * own switch flow updates and therefore goes stale after a native `codex login`).
+ *
+ * Uses the cheap JWT decode from `auth.json` directly — NOT `readCodexAccountMetadata`,
+ * whose fallback spawns `codex login status` (a multi-second subprocess) unsuitable
+ * for a render path.
+ *
+ * Safe self-heal: when the live identity unambiguously matches a saved profile that
+ * isn't the current active pointer, the pointer is re-pointed so registry-keyed data
+ * (quota history, auto-switch) tracks reality too. Never creates or deletes profiles.
+ */
+export declare function resolveActiveCodexAccount(): ResolvedActiveAccount;
 export declare function getCodexExecutionEnv(baseEnv?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
 export declare function prepareCodexAccount(label: string): CodexAccountManagerResult;
 export declare function finalizeCodexAccount(profileId: string, opts?: {

package/dist/codexProfiles.js

@@ -42,6 +42,7 @@ exports.isCodexProfileAuthenticated = isCodexProfileAuthenticated;
 exports.listCodexAccounts = listCodexAccounts;
 exports.getActiveCodexAccount = getActiveCodexAccount;
 exports.resolveSidekickCodexHome = resolveSidekickCodexHome;
+exports.resolveActiveCodexAccount = resolveActiveCodexAccount;
 exports.getCodexExecutionEnv = getCodexExecutionEnv;
 exports.prepareCodexAccount = prepareCodexAccount;
 exports.finalizeCodexAccount = finalizeCodexAccount;
@@ -346,6 +347,56 @@ function resolveSidekickCodexHome() {
     // home (or an explicit CODEX_HOME) is always the single live home.
     return getSystemCodexHome();
 }
+/**
+ * Resolves the *currently logged-in* Codex account for display, preferring the
+ * live `auth.json` identity over the saved registry pointer (which only sidekick's
+ * own switch flow updates and therefore goes stale after a native `codex login`).
+ *
+ * Uses the cheap JWT decode from `auth.json` directly — NOT `readCodexAccountMetadata`,
+ * whose fallback spawns `codex login status` (a multi-second subprocess) unsuitable
+ * for a render path.
+ *
+ * Safe self-heal: when the live identity unambiguously matches a saved profile that
+ * isn't the current active pointer, the pointer is re-pointed so registry-keyed data
+ * (quota history, auto-switch) tracks reality too. Never creates or deletes profiles.
+ */
+function resolveActiveCodexAccount() {
+    const identity = readAuthIdentityFromRaw(readFileOrNull(path.join(resolveSidekickCodexHome(), 'auth.json')));
+    if (identity && (identity.email || identity.workspaceId)) {
+        const match = findProfileForIdentity(identity);
+        if (match) {
+            const active = (0, accountRegistry_1.getActiveSavedAccount)('codex');
+            if (!active || active.id !== match.id) {
+                // Self-heal is best-effort: a registry write failure (read-only/full
+                // disk) must never break display, extension activation, or the quota
+                // watcher's hot path. We still return the correct live identity below.
+                try {
+                    (0, accountRegistry_1.setActiveSavedAccount)('codex', match.id);
+                }
+                catch {
+                    /* keep going with the live identity */
+                }
+            }
+        }
+        return {
+            email: identity.email ?? match?.email ?? match?.metadata?.email,
+            label: match?.label,
+            providerAccountId: match?.providerAccountId ?? identity.workspaceId,
+            source: 'live',
+        };
+    }
+    // api-key auth, unparseable token, or logged out → fall back to the registry.
+    const active = getActiveCodexAccount();
+    if (active) {
+        return {
+            email: active.email ?? active.metadata?.email,
+            label: active.label,
+            providerAccountId: active.providerAccountId,
+            source: 'registry',
+        };
+    }
+    return { source: 'none' };
+}
 function getCodexExecutionEnv(baseEnv = process.env) {
     return {
         ...baseEnv,

package/dist/codexQuotaWatcher.js

@@ -96,7 +96,15 @@ class CodexQuotaWatcher {
         this.discoveryPollIntervalMs =
             options.discoveryPollIntervalMs ?? DEFAULT_DISCOVERY_POLL_INTERVAL_MS;
         this.providerFactory = options.providerFactory ?? (() => new codex_1.CodexProvider());
-        this.getActiveAccount = options.getActiveAccount ?? codexProfiles_1.getActiveCodexAccount;
+        // Self-heal the registry pointer to the live login before reading it, so the
+        // history key (account.id) and the display label track the currently
+        // logged-in account even after a native `codex login`. Overridable for tests.
+        this.getActiveAccount =
+            options.getActiveAccount ??
+                (() => {
+                    (0, codexProfiles_1.resolveActiveCodexAccount)();
+                    return (0, codexProfiles_1.getActiveCodexAccount)();
+                });
         this.readSnapshot = options.readSnapshot ?? quotaSnapshots_1.readQuotaSnapshot;
         this.writeSnapshot = options.writeSnapshot ?? quotaSnapshots_1.writeQuotaSnapshot;
         this.watchFile = options.watchFile ?? fs.watch;

package/dist/index.d.ts

@@ -93,17 +93,17 @@ export { readClaudeMaxCredentials, readClaudeMaxAccessTokenSync } from './creden
 export type { ClaudeMaxCredentials } from './credentials';
 export { ensureDefaultAccounts } from './ensureDefaultAccounts';
 export type { EnsureDefaultAccountStatus, EnsureDefaultAccountsOptions, EnsureDefaultAccountsResult, } from './ensureDefaultAccounts';
-export { readAccountRegistry, writeAccountRegistry, readActiveClaudeAccount, addCurrentAccount, switchToAccount, resolveActiveClaudeHome, applyActiveClaudeToLiveHome, reconcileClaudeAuthState, removeAccount, listAccounts, getActiveAccount, isMultiAccountEnabled, } from './accounts';
+export { readAccountRegistry, writeAccountRegistry, readActiveClaudeAccount, addCurrentAccount, switchToAccount, resolveActiveClaudeHome, applyActiveClaudeToLiveHome, reconcileClaudeAuthState, removeAccount, listAccounts, getActiveAccount, resolveActiveClaudeAccount, isMultiAccountEnabled, } from './accounts';
 export type { AccountEntry, AccountRegistry, ActiveAccountInfo, AccountManagerResult, } from './accounts';
 export { beginAccountLogin, getAccountLoginStatus, finalizeAccountLogin, spawnAccountLogin, switchAccount, listAllAccounts, resolveClaudeLoginCommand, } from './accountManager';
 export type { AccountLoginCommand, AccountLoginState, AccountLoginStatus, BeginAccountLoginResult, FinalizeAccountLoginOptions, ListAllAccountsResult, SpawnAccountLoginOptions, } from './accountManager';
 export { getAccountsDir, readSavedAccountRegistry, writeSavedAccountRegistry, listSavedAccountProfiles, getActiveSavedAccount, upsertSavedAccountProfile, setActiveSavedAccount, replaceSavedAccountProfiles, removeSavedAccountProfile, } from './accountRegistry';
-export type { AccountProviderId, AccountIdentityMetadata, SavedAccountProfile, SavedAccountRegistry, } from './accountRegistry';
+export type { AccountProviderId, AccountIdentityMetadata, ResolvedActiveAccount, SavedAccountProfile, SavedAccountRegistry, } from './accountRegistry';
 export { getActiveAccountStatus } from './accountStatus';
 export type { ActiveAccountStatus, ActiveProviderAccountStatus } from './accountStatus';
 export { getClaudeProfilesDir, getClaudeProfileHome, claudeKeychainSuffix, claudeKeychainService, isClaudeProfileAuthenticated, readClaudeProfileIdentity, } from './claudeProfiles';
 export type { ClaudeProfileIdentity } from './claudeProfiles';
-export { getCodexProfilesDir, getCodexProfileHome, getCodexMonitoringHomes, getSystemCodexHome, listCodexAccounts, getActiveCodexAccount, resolveSidekickCodexHome, getCodexExecutionEnv, prepareCodexAccount, finalizeCodexAccount, switchToCodexAccount, removeCodexAccount, } from './codexProfiles';
+export { getCodexProfilesDir, getCodexProfileHome, getCodexMonitoringHomes, getSystemCodexHome, listCodexAccounts, getActiveCodexAccount, resolveActiveCodexAccount, resolveSidekickCodexHome, getCodexExecutionEnv, prepareCodexAccount, finalizeCodexAccount, switchToCodexAccount, removeCodexAccount, } from './codexProfiles';
 export type { CodexAccountManagerResult } from './codexProfiles';
 export { setTerminalActiveProfile, installShellHook, uninstallShellHook, isShellHookInstalled, writeLauncher, removeLauncher, } from './terminalSync';
 export { DEFAULT_AUTO_SWITCH_CONFIG, decideAutoSwitch, AutoSwitchController } from './autoSwitch';

package/dist/index.js

@@ -5,10 +5,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 = exports.TRUNCATION_PATTERNS = exports.JsonlParser = exports.CodexProvider = exports.getOpenCodeDataDir = exports.OpenCodeProvider = exports.ClaudeCodeProvider = exports.getAllDetectedProviders = exports.detectProvider = exports.readClaudeCodePlanFiles = exports.getPlanAnalytics = exports.writePlans = exports.getLatestPlan = exports.readPlans = exports.readLatestHandoff = exports.readHistory = exports.readNotes = exports.readDecisions = exports.readTasks = 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_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 = void 0;
 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 = 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 = void 0;
-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.getActiveAccount = exports.listAccounts = exports.removeAccount = exports.reconcileClaudeAuthState = exports.applyActiveClaudeToLiveHome = exports.resolveActiveClaudeHome = exports.switchToAccount = exports.addCurrentAccount = exports.readActiveClaudeAccount = exports.writeAccountRegistry = exports.readAccountRegistry = exports.ensureDefaultAccounts = exports.readClaudeMaxAccessTokenSync = exports.readClaudeMaxCredentials = exports.writeActiveCredentials = exports.readActiveCredentials = exports.openInBrowser = exports.parseTranscriptFromEvents = exports.parseTranscript = exports.generateHtmlReport = exports.PatternExtractor = exports.HeatmapTracker = exports.FrequencyTracker = exports.getSnapshotPath = exports.isSnapshotValid = exports.deleteSnapshot = exports.loadSnapshot = exports.saveSnapshot = exports.parseTodoDependencies = exports.EventAggregator = exports.getRandomPhrase = exports.PHRASE_CATEGORIES = exports.ALL_PHRASES = exports.HIGHLIGHT_CSS = exports.clearHighlightCache = void 0;
-exports.CodexQuotaWatcher = exports.resolveCodexQuotaFromLocalSources = exports.resolveCodexQuota = exports.readLatestCodexQuotaFromRollouts = exports.quotaFromCodexRateLimits = exports.fetchCodexQuotaFromApi = 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 = exports.removeCodexAccount = exports.switchToCodexAccount = exports.finalizeCodexAccount = exports.prepareCodexAccount = exports.getCodexExecutionEnv = exports.resolveSidekickCodexHome = 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 = void 0;
-exports.permissionModeSchema = exports.sessionEventSchema = exports.sessionMessageSchema = exports.messageUsageSchema = exports.gatherAssetsForCwd = exports.codexSessions = exports.readCodexAssets = exports.claudeSessions = exports.readClaudeAssets = exports.extractCommands = exports.extractFilePaths = exports.extractUrls = exports.extractToolCalls = exports.extractToolCall = exports.extractTokenUsage = exports.LITELLM_CATALOG_URL = exports.normalizeLiteLlmCatalog = exports.hydratePricingCatalog = 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.DEFAULT_CONTEXT_WINDOW = exports.getModelContextWindowSize = exports.MultiProviderQuotaService = exports.resolveZaiQuota = exports.readZaiCredentials = exports.quotaStateFromZaiQuotaLimitPayload = exports.fetchZaiQuotaFromApi = exports.ZaiQuotaWatcher = exports.ZAI_TIER_BUDGETS = exports.ZAI_PROVIDER_IDS = exports.ZAI_PROMPT_INVOCATIONS = exports.turnTokenWeight = exports.rowsToZaiTurnsAndErrors = exports.resolveZaiTier = exports.parseZaiQuotaError = exports.makeUnavailableZaiQuotaState = exports.isZaiProviderId = exports.inferZaiQuotaState = exports.extractNextFlushTime = exports.accumulateZaiUsage = void 0;
-exports.scopePeakHoursToSessionProvider = exports.isClaudeCodeSessionProvider = exports.fetchPeakHoursStatus = exports.createPeakHoursNotApplicableState = 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 = 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.quotaSourceSchema = exports.quotaProviderIdSchema = exports.quotaFailureKindSchema = exports.quotaStateSchema = exports.quotaWindowSchema = exports.extractSessionEvents = void 0;
+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 = exports.readClaudeMaxAccessTokenSync = exports.readClaudeMaxCredentials = exports.writeActiveCredentials = exports.readActiveCredentials = exports.openInBrowser = exports.parseTranscriptFromEvents = exports.parseTranscript = exports.generateHtmlReport = exports.PatternExtractor = exports.HeatmapTracker = exports.FrequencyTracker = exports.getSnapshotPath = exports.isSnapshotValid = exports.deleteSnapshot = exports.loadSnapshot = exports.saveSnapshot = exports.parseTodoDependencies = exports.EventAggregator = exports.getRandomPhrase = exports.PHRASE_CATEGORIES = exports.ALL_PHRASES = exports.HIGHLIGHT_CSS = exports.clearHighlightCache = void 0;
+exports.resolveCodexQuota = exports.readLatestCodexQuotaFromRollouts = exports.quotaFromCodexRateLimits = exports.fetchCodexQuotaFromApi = 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 = 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 = void 0;
+exports.sessionMessageSchema = exports.messageUsageSchema = exports.gatherAssetsForCwd = exports.codexSessions = exports.readCodexAssets = exports.claudeSessions = exports.readClaudeAssets = exports.extractCommands = exports.extractFilePaths = exports.extractUrls = exports.extractToolCalls = exports.extractToolCall = exports.extractTokenUsage = exports.LITELLM_CATALOG_URL = exports.normalizeLiteLlmCatalog = exports.hydratePricingCatalog = 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.DEFAULT_CONTEXT_WINDOW = exports.getModelContextWindowSize = exports.MultiProviderQuotaService = exports.resolveZaiQuota = exports.readZaiCredentials = exports.quotaStateFromZaiQuotaLimitPayload = exports.fetchZaiQuotaFromApi = exports.ZaiQuotaWatcher = exports.ZAI_TIER_BUDGETS = exports.ZAI_PROVIDER_IDS = exports.ZAI_PROMPT_INVOCATIONS = exports.turnTokenWeight = exports.rowsToZaiTurnsAndErrors = exports.resolveZaiTier = exports.parseZaiQuotaError = exports.makeUnavailableZaiQuotaState = exports.isZaiProviderId = exports.inferZaiQuotaState = exports.extractNextFlushTime = exports.accumulateZaiUsage = exports.CodexQuotaWatcher = exports.resolveCodexQuotaFromLocalSources = void 0;
+exports.scopePeakHoursToSessionProvider = exports.isClaudeCodeSessionProvider = exports.fetchPeakHoursStatus = exports.createPeakHoursNotApplicableState = 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 = 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.quotaSourceSchema = exports.quotaProviderIdSchema = exports.quotaFailureKindSchema = exports.quotaStateSchema = exports.quotaWindowSchema = exports.extractSessionEvents = exports.permissionModeSchema = exports.sessionEventSchema = void 0;
 var taskPersistence_1 = require("./types/taskPersistence");
 Object.defineProperty(exports, "TASK_PERSISTENCE_SCHEMA_VERSION", { enumerable: true, get: function () { return taskPersistence_1.TASK_PERSISTENCE_SCHEMA_VERSION; } });
 Object.defineProperty(exports, "normalizeTaskStatus", { enumerable: true, get: function () { return taskPersistence_1.normalizeTaskStatus; } });
@@ -220,6 +220,7 @@ Object.defineProperty(exports, "reconcileClaudeAuthState", { enumerable: true, g
 Object.defineProperty(exports, "removeAccount", { enumerable: true, get: function () { return accounts_1.removeAccount; } });
 Object.defineProperty(exports, "listAccounts", { enumerable: true, get: function () { return accounts_1.listAccounts; } });
 Object.defineProperty(exports, "getActiveAccount", { enumerable: true, get: function () { return accounts_1.getActiveAccount; } });
+Object.defineProperty(exports, "resolveActiveClaudeAccount", { enumerable: true, get: function () { return accounts_1.resolveActiveClaudeAccount; } });
 Object.defineProperty(exports, "isMultiAccountEnabled", { enumerable: true, get: function () { return accounts_1.isMultiAccountEnabled; } });
 var accountManager_1 = require("./accountManager");
 Object.defineProperty(exports, "beginAccountLogin", { enumerable: true, get: function () { return accountManager_1.beginAccountLogin; } });
@@ -255,6 +256,7 @@ Object.defineProperty(exports, "getCodexMonitoringHomes", { enumerable: true, ge
 Object.defineProperty(exports, "getSystemCodexHome", { enumerable: true, get: function () { return codexProfiles_1.getSystemCodexHome; } });
 Object.defineProperty(exports, "listCodexAccounts", { enumerable: true, get: function () { return codexProfiles_1.listCodexAccounts; } });
 Object.defineProperty(exports, "getActiveCodexAccount", { enumerable: true, get: function () { return codexProfiles_1.getActiveCodexAccount; } });
+Object.defineProperty(exports, "resolveActiveCodexAccount", { enumerable: true, get: function () { return codexProfiles_1.resolveActiveCodexAccount; } });
 Object.defineProperty(exports, "resolveSidekickCodexHome", { enumerable: true, get: function () { return codexProfiles_1.resolveSidekickCodexHome; } });
 Object.defineProperty(exports, "getCodexExecutionEnv", { enumerable: true, get: function () { return codexProfiles_1.getCodexExecutionEnv; } });
 Object.defineProperty(exports, "prepareCodexAccount", { enumerable: true, get: function () { return codexProfiles_1.prepareCodexAccount; } });

package/dist/multiProviderQuotaService.d.ts

@@ -1,4 +1,4 @@
-import { readActiveClaudeAccount } from './accounts';
+import { resolveActiveClaudeAccount } from './accounts';
 import type { ClaudeMaxCredentials } from './credentials';
 import type { PeakHoursState } from './peakHours';
 import type { QuotaState } from './quota';
@@ -25,7 +25,7 @@ export interface MultiProviderQuotaServiceOptions {
     codexWatcher?: CodexWatcherLike | null;
     zaiWatcher?: ZaiWatcherLike | null;
     readClaudeCredentials?: () => Promise<ClaudeMaxCredentials | null>;
-    readClaudeAccount?: typeof readActiveClaudeAccount;
+    readClaudeAccount?: typeof resolveActiveClaudeAccount;
     fetchClaudeQuota?: (accessToken: string) => Promise<QuotaState>;
     fetchPeakHours?: () => Promise<PeakHoursState>;
     log?: Logger;

package/dist/multiProviderQuotaService.js

@@ -82,7 +82,7 @@ class MultiProviderQuotaService {
         this.peakHoursCacheMaxAgeMs = options.peakHoursCacheMaxAgeMs ?? PEAK_HOURS_CACHE_MAX_AGE_MS;
         this.includePeakHours = options.includePeakHours ?? true;
         this.readClaudeCredentials = options.readClaudeCredentials ?? credentials_1.readClaudeMaxCredentials;
-        this.readClaudeAccount = options.readClaudeAccount ?? accounts_1.readActiveClaudeAccount;
+        this.readClaudeAccount = options.readClaudeAccount ?? accounts_1.resolveActiveClaudeAccount;
         this.fetchClaudeQuota = options.fetchClaudeQuota ?? quota_1.fetchQuota;
         this.fetchPeakHours = options.fetchPeakHours ?? peakHours_1.fetchPeakHoursStatus;
         this.log = options.log;
@@ -353,7 +353,8 @@ class MultiProviderQuotaService {
         this.timer = setTimeout(() => void this.poll(), delay);
     }
     withClaudeAccountDetails(state) {
-        const accountEmail = this.readClaudeAccount()?.email;
+        const resolved = this.readClaudeAccount();
+        const accountEmail = resolved.email;
         if (!accountEmail) {
             const nextState = { ...state };
             delete nextState.accountLabel;
@@ -362,7 +363,7 @@ class MultiProviderQuotaService {
         }
         return {
             ...state,
-            accountLabel: accountEmail,
+            accountLabel: resolved.label ?? accountEmail,
             accountDetail: accountEmail,
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidekick-shared",
-  "version": "0.21.3",
+  "version": "0.21.4",
   "description": "Shared data access layer for Sidekick — readers, types, providers, credentials, quota",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",