sidekick-shared 0.21.1 → 0.21.3

package/dist/aggregation/EventAggregator.js

@@ -42,7 +42,10 @@ function parseTodoDependencies(content, allTodos) {
     const match = content.match(depPattern);
     if (!match)
         return [];
-    const refs = match[1].split(/\s+and\s+|,\s*|&\s*/).map(r => r.trim()).filter(Boolean);
+    const refs = match[1]
+        .split(/\s+and\s+|,\s*|&\s*/)
+        .map((r) => r.trim())
+        .filter(Boolean);
     const result = [];
     for (const ref of refs) {
         const refLower = ref.toLowerCase();
@@ -235,7 +238,8 @@ class EventAggregator {
                 contextSize = inputTok + cacheWrite + cacheRead;
             }
             // Compaction detection
-            if (this.previousContextSize > 0 && contextSize < this.previousContextSize * COMPACTION_DROP_THRESHOLD) {
+            if (this.previousContextSize > 0 &&
+                contextSize < this.previousContextSize * COMPACTION_DROP_THRESHOLD) {
                 this.compactionEvents.push({
                     timestamp: new Date(event.timestamp),
                     contextBefore: this.previousContextSize,
@@ -263,8 +267,14 @@ class EventAggregator {
                         : 0;
                 const evPriced = event.cost != null || pricing != null;
                 const acc = this.modelUsage.get(model) ?? {
-                    calls: 0, tokens: 0, inputTokens: 0, outputTokens: 0,
-                    cacheWriteTokens: 0, cacheReadTokens: 0, cost: 0, priced: true,
+                    calls: 0,
+                    tokens: 0,
+                    inputTokens: 0,
+                    outputTokens: 0,
+                    cacheWriteTokens: 0,
+                    cacheReadTokens: 0,
+                    cost: 0,
+                    priced: true,
                 };
                 acc.calls++;
                 acc.tokens += inputTok + outputTok;
@@ -339,8 +349,10 @@ class EventAggregator {
             .sort((a, b) => b.calls - a.calls);
     }
     getToolStats() {
-        return Array.from(this.toolAnalytics.values())
-            .sort((a, b) => (b.successCount + b.failureCount + b.pendingCount) - (a.successCount + a.failureCount + a.pendingCount));
+        return Array.from(this.toolAnalytics.values()).sort((a, b) => b.successCount +
+            b.failureCount +
+            b.pendingCount -
+            (a.successCount + a.failureCount + a.pendingCount));
     }
     getCompactionEvents() {
         return [...this.compactionEvents];
@@ -349,7 +361,7 @@ class EventAggregator {
         return [...this.truncationEvents];
     }
     getBurnRate() {
-        const points = this.burnSamples.map(s => s.tokens);
+        const points = this.burnSamples.map((s) => s.tokens);
         const tokensPerMinute = points.length > 0 ? points[points.length - 1] : 0;
         return {
             tokensPerMinute,
@@ -384,7 +396,7 @@ class EventAggregator {
         const records = this.latencyRecords;
         const totalFirstToken = records.reduce((sum, r) => sum + r.firstTokenLatencyMs, 0);
         const totalResponse = records.reduce((sum, r) => sum + r.totalResponseTimeMs, 0);
-        const maxFirstToken = Math.max(...records.map(r => r.firstTokenLatencyMs));
+        const maxFirstToken = Math.max(...records.map((r) => r.firstTokenLatencyMs));
         const last = records[records.length - 1];
         return {
             recentLatencies: [...records],
@@ -421,8 +433,8 @@ class EventAggregator {
             contextTimeline: [...this.contextTimeline],
             timeline: this.getTimeline(),
             latencyStats: this.getLatencyStats(),
-            toolFrequency: this.toolFrequency.getTopN(20).map(e => ({ name: e.key, count: e.count })),
-            wordFrequency: this.wordFrequency.getTopN(20).map(e => ({ name: e.key, count: e.count })),
+            toolFrequency: this.toolFrequency.getTopN(20).map((e) => ({ name: e.key, count: e.count })),
+            wordFrequency: this.wordFrequency.getTopN(20).map((e) => ({ name: e.key, count: e.count })),
             patterns: this.patternExtractor.getPatterns().slice(0, 20),
             heatmapBuckets: this.heatmapTracker.getBuckets(),
         };
@@ -560,7 +572,9 @@ class EventAggregator {
         this.activeTaskId = state.activeTaskId;
         this.subagents = [...state.subagents];
         this.currentPermissionMode = state.permissionMode ?? null;
-        this.permissionModeHistory = state.permissionModeHistory ? [...state.permissionModeHistory] : [];
+        this.permissionModeHistory = state.permissionModeHistory
+            ? [...state.permissionModeHistory]
+            : [];
         this.contextTimeline = state.contextTimeline ? [...state.contextTimeline] : [];
         this.contextTurnIndex = state.contextTurnIndex ?? 0;
         this.timeline = [...state.timeline];
@@ -639,7 +653,8 @@ class EventAggregator {
             contextSize = inputTok + cacheWrite + cacheRead;
         }
         // Compaction detection
-        if (this.previousContextSize > 0 && contextSize < this.previousContextSize * COMPACTION_DROP_THRESHOLD) {
+        if (this.previousContextSize > 0 &&
+            contextSize < this.previousContextSize * COMPACTION_DROP_THRESHOLD) {
             this.compactionEvents.push({
                 timestamp: new Date(timestamp),
                 contextBefore: this.previousContextSize,
@@ -659,9 +674,15 @@ class EventAggregator {
         // `priced` flag so one unpriced event taints the aggregate (UI renders "—").
         const perModelKey = model ?? this.currentModel ?? 'unknown';
         const acc = this.modelUsage.get(perModelKey) ?? {
-            calls: 0, tokens: 0, inputTokens: 0, outputTokens: 0,
-            cacheWriteTokens: 0, cacheReadTokens: 0, reasoningTokens: 0,
-            cost: 0, priced: true,
+            calls: 0,
+            tokens: 0,
+            inputTokens: 0,
+            outputTokens: 0,
+            cacheWriteTokens: 0,
+            cacheReadTokens: 0,
+            reasoningTokens: 0,
+            cost: 0,
+            priced: true,
         };
         acc.calls++;
         acc.tokens += inputTok + outputTok;
@@ -696,7 +717,7 @@ class EventAggregator {
             this.lastBurnSampleTime = now;
             // Trim to window
             const cutoff = now - this.burnWindowMs;
-            this.burnSamples = this.burnSamples.filter(s => s.time >= cutoff);
+            this.burnSamples = this.burnSamples.filter((s) => s.time >= cutoff);
         }
     }
     // ═══════════════════════════════════════════════════════════════════════
@@ -716,7 +737,8 @@ class EventAggregator {
                 // First assistant response with text
                 this.pendingUserRequest.firstResponseReceived = true;
                 this.pendingUserRequest.firstResponseTimestamp = now;
-                this.pendingUserRequest.firstTokenLatencyMs = now.getTime() - this.pendingUserRequest.timestamp.getTime();
+                this.pendingUserRequest.firstTokenLatencyMs =
+                    now.getTime() - this.pendingUserRequest.timestamp.getTime();
             }
             if (event.message.usage && this.pendingUserRequest.firstResponseReceived) {
                 // Assistant with usage -> complete the cycle
@@ -751,7 +773,12 @@ class EventAggregator {
                     continue;
                 // Record in toolAnalytics
                 const analytics = this.toolAnalytics.get(name) ?? {
-                    name, successCount: 0, failureCount: 0, totalDuration: 0, completedCount: 0, pendingCount: 0,
+                    name,
+                    successCount: 0,
+                    failureCount: 0,
+                    totalDuration: 0,
+                    completedCount: 0,
+                    pendingCount: 0,
                 };
                 analytics.pendingCount++;
                 this.toolAnalytics.set(name, analytics);
@@ -825,7 +852,12 @@ class EventAggregator {
         const name = event.toolName;
         // Update analytics
         const analytics = this.toolAnalytics.get(name) ?? {
-            name, successCount: 0, failureCount: 0, totalDuration: 0, completedCount: 0, pendingCount: 0,
+            name,
+            successCount: 0,
+            failureCount: 0,
+            totalDuration: 0,
+            completedCount: 0,
+            pendingCount: 0,
         };
         analytics.pendingCount++;
         this.toolAnalytics.set(name, analytics);
@@ -1380,11 +1412,11 @@ class EventAggregator {
         }
     }
     convertExtractedPlanToPlanState(extracted) {
-        const completed = extracted.steps.filter(s => s.status === 'completed').length;
+        const completed = extracted.steps.filter((s) => s.status === 'completed').length;
         const total = extracted.steps.length;
         return {
             active: true,
-            steps: extracted.steps.map(s => ({
+            steps: extracted.steps.map((s) => ({
                 id: s.id,
                 description: s.description,
                 status: s.status,
@@ -1406,7 +1438,9 @@ class EventAggregator {
             if (Array.isArray(content)) {
                 for (const block of content) {
                     if (block.type === 'tool_result') {
-                        const text = typeof block.content === 'string' ? block.content : JSON.stringify(block.content || '');
+                        const text = typeof block.content === 'string'
+                            ? block.content
+                            : JSON.stringify(block.content || '');
                         this.contextAttribution.toolOutputs += this.estimateTokens(text);
                     }
                     else if (block.type === 'text') {
@@ -1470,7 +1504,9 @@ class EventAggregator {
             if (Array.isArray(content)) {
                 for (const block of content) {
                     if (block.type === 'tool_result') {
-                        const text = typeof block.content === 'string' ? block.content : JSON.stringify(block.content || '');
+                        const text = typeof block.content === 'string'
+                            ? block.content
+                            : JSON.stringify(block.content || '');
                         this.contextAttribution.toolOutputs += this.estimateTokens(text);
                     }
                     else if (block.type === 'text') {
@@ -1521,8 +1557,10 @@ class EventAggregator {
         }
         else if (event.type === 'tool_result') {
             const rawContent = raw?.content;
-            const text = typeof rawContent === 'string' ? rawContent
-                : rawContent ? JSON.stringify(rawContent)
+            const text = typeof rawContent === 'string'
+                ? rawContent
+                : rawContent
+                    ? JSON.stringify(rawContent)
                     : event.summary || '';
             if (text)
                 this.contextAttribution.toolOutputs += this.estimateTokens(text);
@@ -1573,16 +1611,15 @@ class EventAggregator {
                 if (event.message.model)
                     metadata.model = event.message.model;
                 if (event.message.usage) {
-                    metadata.tokenCount = event.message.usage.input_tokens + event.message.usage.output_tokens;
+                    metadata.tokenCount =
+                        event.message.usage.input_tokens + event.message.usage.output_tokens;
                 }
                 break;
             case 'tool_use': {
                 tlType = 'tool_call';
                 // Use rich tool summary formatter
                 const toolName = event.tool?.name ?? 'unknown';
-                const toolSummary = event.tool?.input
-                    ? (0, toolSummary_1.formatToolSummary)(toolName, event.tool.input)
-                    : '';
+                const toolSummary = event.tool?.input ? (0, toolSummary_1.formatToolSummary)(toolName, event.tool.input) : '';
                 description = toolSummary ? `${toolName}: ${toolSummary}` : toolName;
                 noiseLevel = 'system';
                 if (event.tool)
@@ -1702,7 +1739,7 @@ class EventAggregator {
         if (typeof content === 'string')
             return content.length > 0;
         if (Array.isArray(content)) {
-            return content.some(b => b.type === 'text' && typeof b.text === 'string' && b.text.length > 0);
+            return content.some((b) => b.type === 'text' && typeof b.text === 'string' && b.text.length > 0);
         }
         return false;
     }
@@ -1756,7 +1793,7 @@ class EventAggregator {
         }
         // Word frequency: extract significant words from summary
         if (summary) {
-            const words = summary.split(/\s+/).filter(w => w.length > 2);
+            const words = summary.split(/\s+/).filter((w) => w.length > 2);
             for (const word of words) {
                 this.wordFrequency.increment(word.toLowerCase(), timestamp);
             }

package/dist/aggregation/PatternExtractor.js

@@ -126,7 +126,10 @@ class PatternExtractor {
     }
     // ── Private ──
     tokenize(text) {
-        return text.split(/\s+/).filter(t => t.length > 0).slice(0, this.maxDepth * 4);
+        return text
+            .split(/\s+/)
+            .filter((t) => t.length > 0)
+            .slice(0, this.maxDepth * 4);
     }
     similarity(tokens, cluster) {
         const len = Math.min(tokens.length, this.maxDepth);
@@ -139,9 +142,7 @@ class PatternExtractor {
         return matches / len;
     }
     buildTemplate(cluster) {
-        return cluster.tokens
-            .map((tok, i) => (cluster.mask[i] ? '<*>' : tok))
-            .join(' ');
+        return cluster.tokens.map((tok, i) => (cluster.mask[i] ? '<*>' : tok)).join(' ');
     }
     totalClusters() {
         let total = 0;

package/dist/autoSwitch.js

@@ -38,7 +38,7 @@ function decideAutoSwitch(_provider, active, candidates, config) {
         return null;
     const activeRemaining = quotaRemaining(active.quota);
     const best = candidates
-        .filter(candidate => candidate.accountId !== active.accountId &&
+        .filter((candidate) => candidate.accountId !== active.accountId &&
         candidate.switchable !== false &&
         candidate.quota?.available)
         .sort((a, b) => quotaRemaining(b.quota) - quotaRemaining(a.quota))[0];
@@ -89,7 +89,7 @@ class AutoSwitchController {
     start() {
         if (this.subscription)
             return;
-        this.subscription = this.quotaService.onUpdate(state => this.handleUpdate(state));
+        this.subscription = this.quotaService.onUpdate((state) => this.handleUpdate(state));
     }
     stop() {
         this.subscription?.dispose();
@@ -112,27 +112,21 @@ class AutoSwitchController {
     }
     handleProviderUpdate(runtimeProvider, activeQuota) {
         const providerId = runtimeStateToProvider(runtimeProvider);
-        const activeAccount = providerId === 'claude-code'
-            ? this.getActiveClaudeAccount()
-            : this.getActiveCodexAccount();
+        const activeAccount = providerId === 'claude-code' ? this.getActiveClaudeAccount() : this.getActiveCodexAccount();
         if (!activeAccount)
             return;
         const activeAccountId = accountIdFor(providerId, activeAccount);
         if (quotaUtilization(activeQuota) < this.config.thresholdPct) {
             this.switchedDuringCrossing.delete(providerId);
         }
-        const accounts = providerId === 'claude-code'
-            ? this.getClaudeAccounts()
-            : this.getCodexAccounts();
+        const accounts = providerId === 'claude-code' ? this.getClaudeAccounts() : this.getCodexAccounts();
         if (accounts.length <= 1)
             return;
-        const candidates = accounts.map(account => {
+        const candidates = accounts.map((account) => {
             const accountId = accountIdFor(providerId, account);
             return {
                 accountId,
-                quota: accountId === activeAccountId
-                    ? activeQuota
-                    : this.readSnapshot(providerId, accountId),
+                quota: accountId === activeAccountId ? activeQuota : this.readSnapshot(providerId, accountId),
             };
         });
         const decision = decideAutoSwitch(providerId, { accountId: activeAccountId, quota: activeQuota }, candidates, this.config);

package/dist/claudeProfiles.js

@@ -69,9 +69,7 @@ function readClaudeProfileIdentity(home) {
         const raw = JSON.parse(fs.readFileSync(path.join(home, '.claude.json'), 'utf8'));
         const email = raw?.oauthAccount?.emailAddress;
         const uuid = raw?.oauthAccount?.accountUuid;
-        return typeof email === 'string' && typeof uuid === 'string'
-            ? { email, uuid }
-            : null;
+        return typeof email === 'string' && typeof uuid === 'string' ? { email, uuid } : null;
     }
     catch {
         return null;
@@ -81,6 +79,8 @@ function keychainServiceExists(service) {
     try {
         (0, child_process_1.execFileSync)('security', ['find-generic-password', '-s', service], {
             stdio: ['ignore', 'ignore', 'ignore'],
+            timeout: 4000,
+            killSignal: 'SIGKILL',
         });
         return true;
     }

package/dist/codexProfiles.js

@@ -121,7 +121,9 @@ function atomicWriteJson(filePath, data, mode = 0o600) {
         try {
             fs.unlinkSync(tmp);
         }
-        catch { /* nothing to clean up */ }
+        catch {
+            /* nothing to clean up */
+        }
         throw err;
     }
 }
@@ -139,7 +141,9 @@ function atomicWriteFile(filePath, content, mode = 0o600) {
         try {
             fs.unlinkSync(tmp);
         }
-        catch { /* nothing to clean up */ }
+        catch {
+            /* nothing to clean up */
+        }
         throw err;
     }
 }
@@ -216,12 +220,8 @@ function readAuthIdentityFromRaw(raw) {
     const workspaceId = typeof authClaims?.chatgpt_account_id === 'string'
         ? authClaims.chatgpt_account_id
         : parsed.tokens?.account_id;
-    const planType = typeof authClaims?.chatgpt_plan_type === 'string'
-        ? authClaims.chatgpt_plan_type
-        : undefined;
-    const authMode = parsed.OPENAI_API_KEY || parsed.auth_mode === 'api_key'
-        ? 'api-key'
-        : 'chatgpt';
+    const planType = typeof authClaims?.chatgpt_plan_type === 'string' ? authClaims.chatgpt_plan_type : undefined;
+    const authMode = parsed.OPENAI_API_KEY || parsed.auth_mode === 'api_key' ? 'api-key' : 'chatgpt';
     return { email, workspaceId, planType, authMode };
 }
 function readLastRefresh(raw, fallbackPath) {
@@ -235,7 +235,9 @@ function readLastRefresh(raw, fallbackPath) {
         try {
             return fs.statSync(fallbackPath).mtimeMs;
         }
-        catch { /* fall through */ }
+        catch {
+            /* fall through */
+        }
     }
     return null;
 }
@@ -271,6 +273,8 @@ function getCodexLoginStatus(codexHome) {
         const result = (0, child_process_1.spawnSync)('codex', ['login', 'status'], {
             encoding: 'utf8',
             env,
+            timeout: 4000,
+            killSignal: 'SIGKILL',
         });
         const stdout = String(result.stdout ?? '').trim();
         if (result.status === 0 && /^Logged in/i.test(stdout)) {
@@ -292,7 +296,11 @@ function detectRunningCodexProcess() {
     if (process.platform === 'win32')
         return false;
     try {
-        return (0, child_process_1.spawnSync)('pgrep', ['-x', 'codex'], { encoding: 'utf8' }).status === 0;
+        return ((0, child_process_1.spawnSync)('pgrep', ['-x', 'codex'], {
+            encoding: 'utf8',
+            timeout: 4000,
+            killSignal: 'SIGKILL',
+        }).status === 0);
     }
     catch {
         return false;
@@ -324,8 +332,7 @@ function isCodexProfileAuthenticated(codexHome) {
 }
 function ensureUniqueCodexLabel(label, excludeId) {
     const normalized = label.trim().toLowerCase();
-    const conflict = listCodexAccounts().find(account => account.id !== excludeId &&
-        (account.label ?? '').trim().toLowerCase() === normalized);
+    const conflict = listCodexAccounts().find((account) => account.id !== excludeId && (account.label ?? '').trim().toLowerCase() === normalized);
     return conflict ? `A Codex account named "${label}" already exists.` : null;
 }
 function listCodexAccounts() {
@@ -440,12 +447,12 @@ function stashLiveCodexAuth(liveAuthRaw, liveLegacyRaw) {
 function findProfileForIdentity(identity) {
     const profiles = listCodexAccounts();
     if (identity?.workspaceId) {
-        const byWorkspace = profiles.find(profile => profile.metadata?.workspaceId === identity.workspaceId);
+        const byWorkspace = profiles.find((profile) => profile.metadata?.workspaceId === identity.workspaceId);
         if (byWorkspace)
             return byWorkspace;
     }
     if (identity?.email) {
-        const byEmail = profiles.find(profile => (profile.email ?? profile.metadata?.email) === identity.email);
+        const byEmail = profiles.find((profile) => (profile.email ?? profile.metadata?.email) === identity.email);
         if (byEmail)
             return byEmail;
     }
@@ -488,7 +495,9 @@ function syncBackLiveCodexAuth(liveAuthRaw, liveLegacyRaw) {
                 metadata: { ...profile.metadata, ...metadata },
             });
         }
-        catch { /* metadata refresh is best-effort */ }
+        catch {
+            /* metadata refresh is best-effort */
+        }
         return { syncedProfileId: profile.id };
     }
     catch (err) {
@@ -513,10 +522,16 @@ function performCodexAuthSwap(target) {
     const targetLegacyRaw = readFileOrNull(path.join(profileHome, '.credentials.json'));
     const targetName = target.label ?? target.email ?? target.id;
     if (!targetAuthRaw && !targetLegacyRaw) {
-        return { success: false, error: `No stored credentials for "${targetName}". Remove and re-add this account.` };
+        return {
+            success: false,
+            error: `No stored credentials for "${targetName}". Remove and re-add this account.`,
+        };
     }
     if (targetAuthRaw && !parseAuthJson(targetAuthRaw)) {
-        return { success: false, error: `Stored credentials for "${targetName}" are corrupted. Remove and re-add this account.` };
+        return {
+            success: false,
+            error: `Stored credentials for "${targetName}" are corrupted. Remove and re-add this account.`,
+        };
     }
     const warnings = [];
     if (detectRunningCodexProcess()) {
@@ -530,7 +545,9 @@ function performCodexAuthSwap(target) {
     const targetIdentity = readAuthIdentityFromRaw(targetAuthRaw);
     const targetWorkspaceId = target.metadata?.workspaceId ?? targetIdentity?.workspaceId;
     const targetEmail = target.email ?? target.metadata?.email ?? targetIdentity?.email;
-    const liveMatchesTarget = Boolean((liveIdentity?.workspaceId && targetWorkspaceId && liveIdentity.workspaceId === targetWorkspaceId) ||
+    const liveMatchesTarget = Boolean((liveIdentity?.workspaceId &&
+        targetWorkspaceId &&
+        liveIdentity.workspaceId === targetWorkspaceId) ||
         (liveIdentity?.email && targetEmail && liveIdentity.email === targetEmail) ||
         (liveAuthRaw !== null && liveAuthRaw === targetAuthRaw) ||
         (!liveAuthRaw && !targetAuthRaw && liveLegacyRaw !== null && liveLegacyRaw === targetLegacyRaw));
@@ -547,7 +564,9 @@ function performCodexAuthSwap(target) {
                 metadata: { ...target.metadata, ...metadata },
             });
         }
-        catch { /* backup refresh is best-effort */ }
+        catch {
+            /* backup refresh is best-effort */
+        }
         (0, accountRegistry_1.setActiveSavedAccount)('codex', target.id);
         return { success: true, warning: warnings.length ? warnings.join(' ') : undefined };
     }
@@ -569,7 +588,9 @@ function performCodexAuthSwap(target) {
             else
                 fs.rmSync(liveLegacyPath, { force: true });
         }
-        catch { /* rollback is best-effort */ }
+        catch {
+            /* rollback is best-effort */
+        }
     };
     try {
         if (targetAuthRaw) {
@@ -599,7 +620,7 @@ function performCodexAuthSwap(target) {
     return { success: true, warning: warnings.length ? warnings.join(' ') : undefined };
 }
 function switchToCodexAccount(profileId) {
-    const target = listCodexAccounts().find(account => account.id === profileId);
+    const target = listCodexAccounts().find((account) => account.id === profileId);
     if (!target) {
         return { success: false, error: `Codex account ${profileId} not found.` };
     }
@@ -641,7 +662,9 @@ function reconcileCodexAuthState() {
         }
         const liveIdentity = readAuthIdentityFromRaw(liveAuthRaw);
         const profileIdentity = readAuthIdentityFromRaw(profileAuthRaw);
-        const sameIdentity = Boolean((liveIdentity?.workspaceId && profileIdentity?.workspaceId && liveIdentity.workspaceId === profileIdentity.workspaceId) ||
+        const sameIdentity = Boolean((liveIdentity?.workspaceId &&
+            profileIdentity?.workspaceId &&
+            liveIdentity.workspaceId === profileIdentity.workspaceId) ||
             (liveIdentity?.email && liveIdentity.email === profileIdentity?.email));
         if (sameIdentity) {
             const liveRefresh = readLastRefresh(liveAuthRaw, liveAuthPath);

package/dist/codexQuota.js

@@ -42,6 +42,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const codexProfiles_1 = require("./codexProfiles");
 const quotaSnapshots_1 = require("./quotaSnapshots");
+const quota_1 = require("./quota");
 const codex_1 = require("./providers/codex");
 const DEFAULT_TAIL_BYTES = 2 * 1024 * 1024;
 const DEFAULT_MAX_SESSION_FILES = 50;
@@ -79,6 +80,11 @@ function isPreferredQuotaHit(candidate, current) {
 function normalizePercent(value) {
     return typeof value === 'number' && Number.isFinite(value) ? value : 0;
 }
+function windowMinutesToMs(value, fallbackMs) {
+    return typeof value === 'number' && Number.isFinite(value) && value > 0
+        ? value * 60_000
+        : fallbackMs;
+}
 function timestampToIso(seconds) {
     if (typeof seconds !== 'number' || !Number.isFinite(seconds) || seconds <= 0) {
         return '';
@@ -89,8 +95,9 @@ function accountEmail(account) {
     return account?.email ?? account?.metadata?.email;
 }
 function enrichCodexQuota(state, account) {
+    const withProjections = (0, quota_1.withQuotaProjections)(state);
     return {
-        ...state,
+        ...withProjections,
         runtimeProvider: 'codex',
         providerId: 'codex',
         accountLabel: account?.label,
@@ -183,12 +190,18 @@ function quotaFromCodexRateLimits(rateLimits, source = 'session', capturedAt = n
     const secondary = rateLimits?.secondary;
     if (!primary && !secondary)
         return null;
-    return {
+    return (0, quota_1.withQuotaProjections)({
         fiveHour: primary
-            ? { utilization: normalizePercent(primary.used_percent), resetsAt: timestampToIso(primary.resets_at) }
+            ? {
+                utilization: normalizePercent(primary.used_percent),
+                resetsAt: timestampToIso(primary.resets_at),
+            }
             : { utilization: 0, resetsAt: '' },
         sevenDay: secondary
-            ? { utilization: normalizePercent(secondary.used_percent), resetsAt: timestampToIso(secondary.resets_at) }
+            ? {
+                utilization: normalizePercent(secondary.used_percent),
+                resetsAt: timestampToIso(secondary.resets_at),
+            }
             : { utilization: 0, resetsAt: '' },
         available: true,
         providerId: 'codex',
@@ -202,7 +215,11 @@ function quotaFromCodexRateLimits(rateLimits, source = 'session', capturedAt = n
         credits: rateLimits?.credits,
         planType: rateLimits?.plan_type,
         rateLimitReachedType: rateLimits?.rate_limit_reached_type,
-    };
+    }, {
+        fiveHourWindowMs: windowMinutesToMs(primary?.window_minutes, quota_1.FIVE_HOUR_WINDOW_MS),
+        sevenDayWindowMs: windowMinutesToMs(secondary?.window_minutes, quota_1.SEVEN_DAY_WINDOW_MS),
+        capturedAt,
+    });
 }
 function readLatestCodexQuotaFromRollouts(sessionPaths, options = {}) {
     return readLatestCodexQuotaHitFromRollouts(sessionPaths, options)?.quota ?? null;
@@ -260,23 +277,30 @@ function resolveCodexQuotaFromLocalSources(options = {}) {
     const maxTailBytes = options.maxTailBytes ?? DEFAULT_TAIL_BYTES;
     const maxSessionFiles = options.maxSessionFiles ?? DEFAULT_MAX_SESSION_FILES;
     let ownProvider = false;
-    const provider = options.provider ?? (() => {
-        ownProvider = true;
-        return new codex_1.CodexProvider();
-    })();
+    const provider = options.provider ??
+        (() => {
+            ownProvider = true;
+            return new codex_1.CodexProvider();
+        })();
     try {
         const candidates = [];
         if (options.workspacePath) {
             const workspaceSessions = provider.findAllSessions(options.workspacePath);
-            const workspaceHit = readLatestCodexQuotaHitFromRollouts(workspaceSessions, { maxTailBytes, maxSessionFiles });
+            const workspaceHit = readLatestCodexQuotaHitFromRollouts(workspaceSessions, {
+                maxTailBytes,
+                maxSessionFiles,
+            });
             if (workspaceHit)
                 candidates.push(workspaceHit);
         }
         const accountSessions = findAccountRolloutFiles(options.codexHome);
-        const accountHit = readLatestCodexQuotaHitFromRollouts(accountSessions, { maxTailBytes, maxSessionFiles });
+        const accountHit = readLatestCodexQuotaHitFromRollouts(accountSessions, {
+            maxTailBytes,
+            maxSessionFiles,
+        });
         if (accountHit)
             candidates.push(accountHit);
-        const latestHit = candidates.reduce((latest, candidate) => isPreferredQuotaHit(candidate, latest) ? candidate : latest, null);
+        const latestHit = candidates.reduce((latest, candidate) => (isPreferredQuotaHit(candidate, latest) ? candidate : latest), null);
         if (latestHit) {
             if (account)
                 writeSnapshot('codex', account.id, latestHit.quota);
@@ -368,7 +392,9 @@ async function fetchCodexQuotaFromApi(options = {}) {
                             ? 'server'
                             : 'unknown',
                 httpStatus: response.status,
-                retryAfterMs: response.status === 429 ? parseRetryAfterMs(response.headers.get('retry-after')) : undefined,
+                retryAfterMs: response.status === 429
+                    ? parseRetryAfterMs(response.headers.get('retry-after'))
+                    : undefined,
                 providerId: 'codex',
                 source: 'api',
                 capturedAt,
@@ -376,7 +402,7 @@ async function fetchCodexQuotaFromApi(options = {}) {
                 sevenDayLabel: 'Secondary',
             };
         }
-        const payload = await response.json();
+        const payload = (await response.json());
         const quota = quotaFromCodexRateLimits(rateLimitsFromUsagePayload(payload), 'api', capturedAt);
         if (!quota) {
             return {
@@ -464,7 +490,9 @@ function readLatestQuotaFromRollout(sessionPath, maxTailBytes, source) {
             try {
                 fs.closeSync(fd);
             }
-            catch { /* ignore */ }
+            catch {
+                /* ignore */
+            }
         }
     }
     return null;
@@ -500,5 +528,5 @@ function findRolloutFiles(sessionsDir) {
     }
     visit(sessionsDir);
     results.sort((a, b) => b.mtime - a.mtime);
-    return results.map(item => item.path);
+    return results.map((item) => item.path);
 }