sidekick-shared 0.21.2 → 0.21.4

package/dist/multiProviderQuotaService.js

@@ -77,11 +77,12 @@ class MultiProviderQuotaService {
     constructor(options = {}) {
         this.activeIntervalMs = options.activeIntervalMs ?? ACTIVE_POLL_INTERVAL_MS;
         this.idleIntervalMs = options.idleIntervalMs ?? IDLE_POLL_INTERVAL_MS;
-        this.transientFailureBackoffMs = options.transientFailureBackoffMs ?? TRANSIENT_FAILURE_BACKOFF_MS;
+        this.transientFailureBackoffMs =
+            options.transientFailureBackoffMs ?? TRANSIENT_FAILURE_BACKOFF_MS;
         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;
@@ -97,9 +98,10 @@ class MultiProviderQuotaService {
             this.codexWatcher = null;
             this.ownsCodexWatcher = false;
         }
-        this.codexSubscription = this.codexWatcher?.onUpdate((state) => {
-            this.updateProviderQuota('codex', state);
-        }) ?? null;
+        this.codexSubscription =
+            this.codexWatcher?.onUpdate((state) => {
+                this.updateProviderQuota('codex', state);
+            }) ?? null;
         if (options.zaiWatcher !== undefined) {
             this.zaiWatcher = options.zaiWatcher;
             this.ownsZaiWatcher = false;
@@ -108,9 +110,10 @@ class MultiProviderQuotaService {
             this.zaiWatcher = null;
             this.ownsZaiWatcher = false;
         }
-        this.zaiSubscription = this.zaiWatcher?.onUpdate((state) => {
-            this.updateProviderQuota('zai', state);
-        }) ?? null;
+        this.zaiSubscription =
+            this.zaiWatcher?.onUpdate((state) => {
+                this.updateProviderQuota('zai', state);
+            }) ?? null;
     }
     startPolling() {
         if (this.polling)
@@ -350,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;
@@ -359,7 +363,7 @@ class MultiProviderQuotaService {
         }
         return {
             ...state,
-            accountLabel: accountEmail,
+            accountLabel: resolved.label ?? accountEmail,
             accountDetail: accountEmail,
         };
     }

package/dist/parsers/codexParser.js

@@ -21,16 +21,20 @@ function normalizeRateLimits(rateLimits) {
     if (!rateLimits?.primary && !rateLimits?.secondary)
         return undefined;
     return {
-        primary: rateLimits.primary ? {
-            usedPercent: rateLimits.primary.used_percent || 0,
-            windowMinutes: rateLimits.primary.window_minutes || 0,
-            resetsAt: rateLimits.primary.resets_at || 0,
-        } : undefined,
-        secondary: rateLimits.secondary ? {
-            usedPercent: rateLimits.secondary.used_percent || 0,
-            windowMinutes: rateLimits.secondary.window_minutes || 0,
-            resetsAt: rateLimits.secondary.resets_at || 0,
-        } : undefined,
+        primary: rateLimits.primary
+            ? {
+                usedPercent: rateLimits.primary.used_percent || 0,
+                windowMinutes: rateLimits.primary.window_minutes || 0,
+                resetsAt: rateLimits.primary.resets_at || 0,
+            }
+            : undefined,
+        secondary: rateLimits.secondary
+            ? {
+                usedPercent: rateLimits.secondary.used_percent || 0,
+                windowMinutes: rateLimits.secondary.window_minutes || 0,
+                resetsAt: rateLimits.secondary.resets_at || 0,
+            }
+            : undefined,
     };
 }
 /**
@@ -62,7 +66,9 @@ function normalizeCodexToolInput(canonicalToolName, rawToolName, input) {
     const normalized = { ...input };
     normalized._sidekickRawToolName = rawToolName;
     // Codex exec_command uses cmd; monitor expects command for Bash context extraction.
-    if (canonicalToolName === 'Bash' && typeof normalized.cmd === 'string' && normalized.command === undefined) {
+    if (canonicalToolName === 'Bash' &&
+        typeof normalized.cmd === 'string' &&
+        normalized.command === undefined) {
         normalized.command = normalized.cmd;
     }
     // request_user_input currently emits questions; keep as-is (compatible with AskUserQuestion extractor).
@@ -181,7 +187,8 @@ class CodexRolloutParser {
         const text = payload.base_instructions?.text?.trim();
         if (!text)
             return [];
-        return [{
+        return [
+            {
                 type: 'system',
                 message: {
                     role: 'system',
@@ -190,7 +197,8 @@ class CodexRolloutParser {
                     content: [{ type: 'text', text }],
                 },
                 timestamp,
-            }];
+            },
+        ];
     }
     handleResponseItem(timestamp, payload) {
         // payload IS the item directly (no .item wrapper)
@@ -220,7 +228,8 @@ class CodexRolloutParser {
         if (!text)
             return [];
         if (item.role === 'user') {
-            return [{
+            return [
+                {
                     type: 'user',
                     message: {
                         role: 'user',
@@ -228,10 +237,12 @@ class CodexRolloutParser {
                         content: [{ type: 'text', text }],
                     },
                     timestamp,
-                }];
+                },
+            ];
         }
         if (item.role === 'assistant') {
-            return [{
+            return [
+                {
                     type: 'assistant',
                     message: {
                         role: 'assistant',
@@ -240,10 +251,12 @@ class CodexRolloutParser {
                         content: [{ type: 'text', text }],
                     },
                     timestamp,
-                }];
+                },
+            ];
         }
         if (item.role === 'developer' || item.role === 'system') {
-            return [{
+            return [
+                {
                     type: 'system',
                     message: {
                         role: item.role,
@@ -252,17 +265,19 @@ class CodexRolloutParser {
                         content: [{ type: 'text', text }],
                     },
                     timestamp,
-                }];
+                },
+            ];
         }
         return [];
     }
     handleReasoning(timestamp, item) {
         const summaryTexts = (item.summary || [])
-            .filter(s => s.type === 'summary_text' && s.text)
-            .map(s => s.text);
+            .filter((s) => s.type === 'summary_text' && s.text)
+            .map((s) => s.text);
         if (summaryTexts.length === 0)
             return [];
-        return [{
+        return [
+            {
                 type: 'assistant',
                 message: {
                     role: 'assistant',
@@ -271,7 +286,8 @@ class CodexRolloutParser {
                     content: [{ type: 'thinking', thinking: summaryTexts.join('\n') }],
                 },
                 timestamp,
-            }];
+            },
+        ];
     }
     handleFunctionCall(timestamp, item) {
         let parsedArgs = {};
@@ -284,49 +300,59 @@ class CodexRolloutParser {
         const canonicalName = normalizeCodexToolName(item.name);
         const normalizedInput = normalizeCodexToolInput(canonicalName, item.name, parsedArgs);
         this.emittedToolUseIds.add(item.call_id);
-        return [{
+        return [
+            {
                 type: 'assistant',
                 message: {
                     role: 'assistant',
                     id: item.id,
                     model: this.currentModel || undefined,
-                    content: [{
+                    content: [
+                        {
                             type: 'tool_use',
                             id: item.call_id,
                             name: canonicalName,
                             input: normalizedInput,
-                        }],
+                        },
+                    ],
                 },
                 timestamp,
-            }];
+            },
+        ];
     }
     handleFunctionCallOutput(timestamp, item) {
         const isError = parsePlainTextFailure(item.output);
-        return [{
+        return [
+            {
                 type: 'user',
                 message: {
                     role: 'user',
                     id: `${item.call_id}:result`,
-                    content: [{
+                    content: [
+                        {
                             type: 'tool_result',
                             tool_use_id: item.call_id,
                             content: item.output,
                             is_error: isError,
-                        }],
+                        },
+                    ],
                 },
                 timestamp,
-            }];
+            },
+        ];
     }
     handleLocalShellCall(timestamp, item) {
         const command = item.action?.command?.join(' ') || '';
         this.emittedToolUseIds.add(item.call_id);
-        return [{
+        return [
+            {
                 type: 'assistant',
                 message: {
                     role: 'assistant',
                     id: item.id,
                     model: this.currentModel || undefined,
-                    content: [{
+                    content: [
+                        {
                             type: 'tool_use',
                             id: item.call_id,
                             name: 'Bash',
@@ -335,28 +361,31 @@ class CodexRolloutParser {
                                 workdir: item.action?.workdir,
                                 _sidekickRawToolName: 'local_shell_call',
                             },
-                        }],
+                        },
+                    ],
                 },
                 timestamp,
-            }];
+            },
+        ];
     }
     handleCustomToolCall(timestamp, item) {
         if (item.name === 'apply_patch') {
             const filePaths = extractPatchFilePaths(item.input);
             if (filePaths.length === 0)
                 return [];
-            const toolUseIds = filePaths.map(fp => `${item.call_id}-${fp}`);
+            const toolUseIds = filePaths.map((fp) => `${item.call_id}-${fp}`);
             this.patchExpandedToolUseIds.set(item.call_id, toolUseIds);
             for (const id of toolUseIds) {
                 this.emittedToolUseIds.add(id);
             }
-            return filePaths.map(fp => ({
+            return filePaths.map((fp) => ({
                 type: 'assistant',
                 message: {
                     role: 'assistant',
                     id: `${item.call_id}-${fp}`,
                     model: this.currentModel || undefined,
-                    content: [{
+                    content: [
+                        {
                             type: 'tool_use',
                             id: `${item.call_id}-${fp}`,
                             name: 'Edit',
@@ -364,7 +393,8 @@ class CodexRolloutParser {
                                 file_path: fp,
                                 _sidekickRawToolName: 'apply_patch',
                             },
-                        }],
+                        },
+                    ],
                 },
                 timestamp,
             }));
@@ -380,21 +410,25 @@ class CodexRolloutParser {
         const canonicalName = normalizeCodexToolName(item.name);
         const normalizedInput = normalizeCodexToolInput(canonicalName, item.name, parsedInput);
         this.emittedToolUseIds.add(item.call_id);
-        return [{
+        return [
+            {
                 type: 'assistant',
                 message: {
                     role: 'assistant',
                     id: item.call_id,
                     model: this.currentModel || undefined,
-                    content: [{
+                    content: [
+                        {
                             type: 'tool_use',
                             id: item.call_id,
                             name: canonicalName,
                             input: normalizedInput,
-                        }],
+                        },
+                    ],
                 },
                 timestamp,
-            }];
+            },
+        ];
     }
     handleCustomToolCallOutput(timestamp, item) {
         let isError = false;
@@ -411,24 +445,27 @@ class CodexRolloutParser {
         }
         const toolUseIds = this.patchExpandedToolUseIds.get(item.call_id) ?? [item.call_id];
         this.patchExpandedToolUseIds.delete(item.call_id);
-        return toolUseIds.map(toolUseId => ({
+        return toolUseIds.map((toolUseId) => ({
             type: 'user',
             message: {
                 role: 'user',
                 id: `${toolUseId}:result`,
-                content: [{
+                content: [
+                    {
                         type: 'tool_result',
                         tool_use_id: toolUseId,
                         content: item.output,
                         is_error: isError,
                         duration,
-                    }],
+                    },
+                ],
             },
             timestamp,
         }));
     }
     handleCompacted(timestamp, payload) {
-        return [{
+        return [
+            {
                 type: 'summary',
                 message: {
                     role: 'assistant',
@@ -436,7 +473,8 @@ class CodexRolloutParser {
                     content: payload.summary || 'Context compacted',
                 },
                 timestamp,
-            }];
+            },
+        ];
     }
     handleTurnContext(payload) {
         if (payload.model) {
@@ -489,7 +527,8 @@ class CodexRolloutParser {
                             role: 'assistant',
                             id: `exec-${e.call_id}`,
                             model: this.currentModel || undefined,
-                            content: [{
+                            content: [
+                                {
                                     type: 'tool_use',
                                     id: e.call_id,
                                     name: 'Bash',
@@ -498,7 +537,8 @@ class CodexRolloutParser {
                                         workdir: pending?.workdir,
                                         _sidekickRawToolName: 'exec_command',
                                     },
-                                }],
+                                },
+                            ],
                         },
                         timestamp: pending?.timestamp || timestamp,
                     });
@@ -509,13 +549,15 @@ class CodexRolloutParser {
                     message: {
                         role: 'user',
                         id: `exec-${e.call_id}:result`,
-                        content: [{
+                        content: [
+                            {
                                 type: 'tool_result',
                                 tool_use_id: e.call_id,
                                 content: output,
                                 is_error: e.exit_code !== 0,
                                 duration: e.duration_ms,
-                            }],
+                            },
+                        ],
                     },
                     timestamp,
                 });
@@ -546,7 +588,8 @@ class CodexRolloutParser {
                             role: 'assistant',
                             id: `mcp-${e.call_id}`,
                             model: this.currentModel || undefined,
-                            content: [{
+                            content: [
+                                {
                                     type: 'tool_use',
                                     id: e.call_id,
                                     name: normalizeCodexToolName(toolName),
@@ -555,7 +598,8 @@ class CodexRolloutParser {
                                         _sidekickRawToolName: toolName,
                                         _sidekickMcpServerName: pendingMcp?.server_name,
                                     },
-                                }],
+                                },
+                            ],
                         },
                         timestamp: pendingMcp?.timestamp || timestamp,
                     });
@@ -565,13 +609,15 @@ class CodexRolloutParser {
                     message: {
                         role: 'user',
                         id: `mcp-${e.call_id}:result`,
-                        content: [{
+                        content: [
+                            {
                                 type: 'tool_result',
                                 tool_use_id: e.call_id,
                                 content: e.result || '',
                                 is_error: e.is_error || false,
                                 duration: e.duration_ms,
-                            }],
+                            },
+                        ],
                     },
                     timestamp,
                 });
@@ -579,20 +625,25 @@ class CodexRolloutParser {
             }
             case 'error': {
                 const e = event;
-                return [{
+                return [
+                    {
                         type: 'assistant',
                         message: {
                             role: 'assistant',
                             id: `error-${timestamp}`,
                             model: this.currentModel || undefined,
-                            content: [{ type: 'text', text: `[Error${e.code ? ` (${e.code})` : ''}] ${e.message}` }],
+                            content: [
+                                { type: 'text', text: `[Error${e.code ? ` (${e.code})` : ''}] ${e.message}` },
+                            ],
                         },
                         timestamp,
-                    }];
+                    },
+                ];
             }
             case 'context_compacted': {
                 const e = event;
-                return [{
+                return [
+                    {
                         type: 'summary',
                         message: {
                             role: 'assistant',
@@ -600,20 +651,23 @@ class CodexRolloutParser {
                             content: e.summary || 'Context compacted',
                         },
                         timestamp,
-                    }];
+                    },
+                ];
             }
             case 'patch_applied': {
                 const e = event;
                 if (!e.file_path)
                     return [];
                 const patchId = `patch-${timestamp}-${e.file_path}`;
-                return [{
+                return [
+                    {
                         type: 'assistant',
                         message: {
                             role: 'assistant',
                             id: patchId,
                             model: this.currentModel || undefined,
-                            content: [{
+                            content: [
+                                {
                                     type: 'tool_use',
                                     id: patchId,
                                     name: 'Edit',
@@ -623,49 +677,56 @@ class CodexRolloutParser {
                                         deletions: e.deletions ?? 0,
                                         _sidekickRawToolName: 'patch_applied',
                                     },
-                                }],
+                                },
+                            ],
                         },
                         timestamp,
-                    }];
+                    },
+                ];
             }
             case 'turn_started':
             case 'turn_complete':
-            case 'task_started':
-                {
-                    const collaborationMode = event.collaboration_mode_kind;
-                    if (collaborationMode !== 'plan' || this.inPlanMode)
-                        return [];
-                    this.inPlanMode = true;
-                    return [{
-                            type: 'assistant',
-                            message: {
-                                role: 'assistant',
-                                id: `plan-enter-${timestamp}`,
-                                model: this.currentModel || undefined,
-                                content: [{
-                                        type: 'tool_use',
-                                        id: `plan-enter-${timestamp}`,
-                                        name: 'EnterPlanMode',
-                                        input: {
-                                            source: 'codex_task_started',
-                                            _sidekickRawToolName: 'task_started',
-                                        },
-                                    }],
-                            },
-                            timestamp,
-                        }];
-                }
+            case 'task_started': {
+                const collaborationMode = event.collaboration_mode_kind;
+                if (collaborationMode !== 'plan' || this.inPlanMode)
+                    return [];
+                this.inPlanMode = true;
+                return [
+                    {
+                        type: 'assistant',
+                        message: {
+                            role: 'assistant',
+                            id: `plan-enter-${timestamp}`,
+                            model: this.currentModel || undefined,
+                            content: [
+                                {
+                                    type: 'tool_use',
+                                    id: `plan-enter-${timestamp}`,
+                                    name: 'EnterPlanMode',
+                                    input: {
+                                        source: 'codex_task_started',
+                                        _sidekickRawToolName: 'task_started',
+                                    },
+                                },
+                            ],
+                        },
+                        timestamp,
+                    },
+                ];
+            }
             case 'task_complete':
                 if (!this.inPlanMode)
                     return [];
                 this.inPlanMode = false;
-                return [{
+                return [
+                    {
                         type: 'assistant',
                         message: {
                             role: 'assistant',
                             id: `plan-exit-${timestamp}`,
                             model: this.currentModel || undefined,
-                            content: [{
+                            content: [
+                                {
                                     type: 'tool_use',
                                     id: `plan-exit-${timestamp}`,
                                     name: 'ExitPlanMode',
@@ -673,10 +734,12 @@ class CodexRolloutParser {
                                         source: 'codex_task_complete',
                                         _sidekickRawToolName: 'task_complete',
                                     },
-                                }],
+                                },
+                            ],
                         },
                         timestamp,
-                    }];
+                    },
+                ];
             case 'turn_aborted':
             case 'agent_reasoning':
             case 'agent_message':
@@ -691,17 +754,20 @@ class CodexRolloutParser {
         const normalizedRateLimits = normalizeRateLimits(rateLimits);
         if (!usage && !normalizedRateLimits)
             return [];
-        const mappedUsage = usage ? {
-            input_tokens: usage.input_tokens || 0,
-            output_tokens: usage.output_tokens || 0,
-            cache_read_input_tokens: usage.cached_input_tokens || 0,
-            cache_creation_input_tokens: 0,
-            reasoning_tokens: usage.reasoning_output_tokens || 0,
-        } : undefined;
+        const mappedUsage = usage
+            ? {
+                input_tokens: usage.input_tokens || 0,
+                output_tokens: usage.output_tokens || 0,
+                cache_read_input_tokens: usage.cached_input_tokens || 0,
+                cache_creation_input_tokens: 0,
+                reasoning_tokens: usage.reasoning_output_tokens || 0,
+            }
+            : undefined;
         if (usage) {
             this.lastTokenUsage = usage;
         }
-        return [{
+        return [
+            {
                 type: 'system',
                 message: {
                     role: 'system',
@@ -713,7 +779,8 @@ class CodexRolloutParser {
                 },
                 timestamp,
                 rateLimits: normalizedRateLimits,
-            }];
+            },
+        ];
     }
 }
 exports.CodexRolloutParser = CodexRolloutParser;

package/dist/parsers/debugLogParser.js

@@ -103,7 +103,7 @@ function parseDebugLog(content) {
  */
 function filterByLevel(entries, minLevel) {
     const minOrder = LEVEL_ORDER[minLevel];
-    return entries.filter(e => LEVEL_ORDER[e.level] >= minOrder);
+    return entries.filter((e) => LEVEL_ORDER[e.level] >= minOrder);
 }
 /**
  * Collapses consecutive identical log messages into single entries with counts.
@@ -138,9 +138,10 @@ function discoverDebugLogs() {
     try {
         if (!fs.existsSync(debugDir))
             return [];
-        return fs.readdirSync(debugDir)
-            .filter(f => f.endsWith('.log') || f.endsWith('.txt'))
-            .map(name => {
+        return fs
+            .readdirSync(debugDir)
+            .filter((f) => f.endsWith('.log') || f.endsWith('.txt'))
+            .map((name) => {
             const fullPath = path.join(debugDir, name);
             try {
                 const stat = fs.statSync(fullPath);