sidekick-shared 0.28.3 → 0.29.1

package/dist/esm/ownKey.js

@@ -0,0 +1,26 @@
+/**
+ * Own-property lookups for plain-object tables indexed by external strings.
+ *
+ * `table[key]` also finds inherited members, so a model id, tool name, or
+ * error code such as `constructor`, `toString`, or `__proto__` would return an
+ * `Object.prototype` member instead of `undefined`.
+ *
+ * @module ownKey
+ */
+const hasOwn = Object.prototype.hasOwnProperty;
+/** The value stored under `key` in `table` itself, or `undefined`. */
+export function ownValue(table, key) {
+    return hasOwn.call(table, key) ? table[key] : undefined;
+}
+/**
+ * Store `value` as an own, enumerable property, even for `__proto__`, which a
+ * plain assignment would treat as a prototype change.
+ */
+export function setOwnValue(table, key, value) {
+    Object.defineProperty(table, key, {
+        value,
+        enumerable: true,
+        writable: true,
+        configurable: true,
+    });
+}

package/dist/esm/parsers/codexParser.js

@@ -171,6 +171,65 @@ export function extractPatchFilePaths(input) {
 }
 /** Default cap on each piece of per-call correlation state the parser keeps. */
 export const DEFAULT_MAX_TRACKED_TOOL_CALLS = 4096;
+/** Entries per table {@link CodexRolloutParser.exportResumeState} keeps by default. */
+const DEFAULT_RESUME_STATE_LIMIT = 256;
+function isPlainObject(value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function cloneJson(value) {
+    return JSON.parse(JSON.stringify(value));
+}
+function isOptionalString(value) {
+    return value === undefined || typeof value === 'string';
+}
+function isStringArray(value) {
+    return Array.isArray(value) && value.every((item) => typeof item === 'string');
+}
+function isTokenCount(value) {
+    return typeof value === 'number' && Number.isFinite(value) && value >= 0;
+}
+/** A valid `CodexTokenUsage` (copied), `null` for `null`, or `undefined` when invalid. Internal. */
+export function codexTokenUsageFrom(value) {
+    if (value === null)
+        return null;
+    if (!isPlainObject(value))
+        return undefined;
+    if (!isTokenCount(value.input_tokens) || !isTokenCount(value.output_tokens))
+        return undefined;
+    const usage = {
+        input_tokens: value.input_tokens,
+        output_tokens: value.output_tokens,
+    };
+    for (const field of ['cached_input_tokens', 'reasoning_output_tokens', 'total_tokens']) {
+        const count = value[field];
+        if (count === undefined)
+            continue;
+        if (!isTokenCount(count))
+            return undefined;
+        usage[field] = count;
+    }
+    return usage;
+}
+/** Last `limit` items of an insertion-ordered collection, oldest first. */
+function newest(items, size, limit) {
+    const count = limit >= 0 ? Math.min(size, Math.floor(limit)) : 0;
+    const kept = [];
+    let skip = size - count;
+    for (const item of items) {
+        if (kept.length >= count)
+            break;
+        if (skip > 0) {
+            skip -= 1;
+            continue;
+        }
+        kept.push(item);
+    }
+    return kept;
+}
+/** Fixed per-entry cost added to each pending call's byte estimate. */
+const PENDING_ENTRY_OVERHEAD_BYTES = 64;
+/** Prefix of the bookkeeping keys the parser stashes inside tool inputs. */
+const SIDEKICK_INPUT_KEY_PREFIX = '_sidekick';
 /** Adds `key`, refreshing its position, and evicts the oldest past `max`. */
 function rememberBounded(set, key, max) {
     set.delete(key);
@@ -178,12 +237,31 @@ function rememberBounded(set, key, max) {
     while (set.size > max)
         set.delete(set.values().next().value);
 }
-/** Sets `key`, refreshing its position, and evicts the oldest past `max`. */
-function setBounded(map, key, value, max) {
-    map.delete(key);
-    map.set(key, value);
-    while (map.size > max)
-        map.delete(map.keys().next().value);
+function stringBytes(...values) {
+    let total = 0;
+    for (const value of values)
+        if (typeof value === 'string')
+            total += value.length;
+    return total;
+}
+function approxJsonBytes(value) {
+    if (value === undefined)
+        return 0;
+    try {
+        return JSON.stringify(value)?.length ?? 0;
+    }
+    catch {
+        return 0;
+    }
+}
+/** Only the `_sidekick*` bookkeeping keys of a tool input. */
+function sidekickKeysOnly(input) {
+    const kept = {};
+    for (const key of Object.keys(input)) {
+        if (key.startsWith(SIDEKICK_INPUT_KEY_PREFIX))
+            kept[key] = input[key];
+    }
+    return kept;
 }
 /**
  * Stateful parser for Codex JSONL rollout lines.
@@ -209,10 +287,35 @@ export class CodexRolloutParser {
     emittedToolUseIds = new Set();
     patchExpandedToolUseIds = new Map();
     maxTrackedToolCalls;
+    /** Byte budget for pending calls; `null` = unlimited (no accounting). */
+    maxPendingBytes;
+    metadataOnly;
+    /** Pending calls in insertion order, for the byte budget. */
+    pendingLedger = new Map();
+    pendingBytes = 0;
+    evictedByCount = 0;
+    evictedByBytes = 0;
     constructor(options = {}) {
         const max = options.maxTrackedToolCalls;
         this.maxTrackedToolCalls =
             typeof max === 'number' && max >= 1 ? Math.floor(max) : DEFAULT_MAX_TRACKED_TOOL_CALLS;
+        const maxBytes = options.maxPendingBytes;
+        this.maxPendingBytes =
+            typeof maxBytes === 'number' && Number.isFinite(maxBytes) && maxBytes >= 1
+                ? Math.floor(maxBytes)
+                : null;
+        this.metadataOnly = options.metadataOnly === true;
+    }
+    /** Counters for the pending tool-call state and what the caps evicted. */
+    getPendingStats() {
+        return {
+            pendingCalls: this.pendingExecCommands.size +
+                this.pendingMcpToolCalls.size +
+                this.patchExpandedToolUseIds.size,
+            pendingBytes: this.maxPendingBytes === null ? null : this.pendingBytes,
+            evictedByCount: this.evictedByCount,
+            evictedByBytes: this.evictedByBytes,
+        };
     }
     /** Get stored session metadata. */
     getSessionMeta() {
@@ -234,6 +337,118 @@ export class CodexRolloutParser {
     getLastRateLimits() {
         return this.lastRateLimits;
     }
+    /**
+     * The state later lines depend on — session metadata, current model,
+     * previous cumulative token total, context window, rate limits, plan mode,
+     * and the tool-call correlation tables (newest `limit` entries each) — as
+     * JSON-serializable data. Eviction counters are not included.
+     */
+    exportResumeState(limit = DEFAULT_RESUME_STATE_LIMIT) {
+        return cloneJson({
+            version: 1,
+            sessionMeta: this.sessionMeta,
+            currentModel: this.currentModel,
+            prevTotalUsage: this.prevTotalUsage,
+            lastTokenUsage: this.lastTokenUsage,
+            modelContextWindow: this.modelContextWindow,
+            lastRateLimits: this.lastRateLimits,
+            hasAggregateRateLimits: this.hasAggregateRateLimits,
+            inPlanMode: this.inPlanMode,
+            emittedToolUseIds: newest(this.emittedToolUseIds, this.emittedToolUseIds.size, limit),
+            patchExpandedToolUseIds: newest(this.patchExpandedToolUseIds, this.patchExpandedToolUseIds.size, limit),
+            pendingExecCommands: newest(this.pendingExecCommands.values(), this.pendingExecCommands.size, limit),
+            pendingMcpToolCalls: newest(this.pendingMcpToolCalls.values(), this.pendingMcpToolCalls.size, limit),
+        });
+    }
+    /**
+     * Replaces this parser's state with one from {@link exportResumeState}, as
+     * if it had parsed the rollout up to where that state was taken. Returns
+     * false, changing nothing, when `state` is not a valid version-1 state.
+     * This parser's own `maxTrackedToolCalls`, `maxPendingBytes`, and
+     * `metadataOnly` options apply to the imported tables.
+     */
+    importResumeState(state) {
+        if (!isPlainObject(state) || state.version !== 1)
+            return false;
+        const s = state;
+        const prevTotalUsage = codexTokenUsageFrom(s.prevTotalUsage);
+        const lastTokenUsage = codexTokenUsageFrom(s.lastTokenUsage);
+        if (prevTotalUsage === undefined || lastTokenUsage === undefined)
+            return false;
+        if (s.sessionMeta !== null && !isPlainObject(s.sessionMeta))
+            return false;
+        if (s.lastRateLimits !== null && !isPlainObject(s.lastRateLimits))
+            return false;
+        if (s.currentModel !== null && typeof s.currentModel !== 'string')
+            return false;
+        const contextWindow = s.modelContextWindow;
+        if (contextWindow !== null &&
+            !(typeof contextWindow === 'number' && Number.isFinite(contextWindow) && contextWindow > 0)) {
+            return false;
+        }
+        if (typeof s.hasAggregateRateLimits !== 'boolean' || typeof s.inPlanMode !== 'boolean') {
+            return false;
+        }
+        if (!isStringArray(s.emittedToolUseIds))
+            return false;
+        const patches = s.patchExpandedToolUseIds;
+        if (!Array.isArray(patches) ||
+            !patches.every((entry) => Array.isArray(entry) &&
+                entry.length === 2 &&
+                typeof entry[0] === 'string' &&
+                isStringArray(entry[1]))) {
+            return false;
+        }
+        const execs = s.pendingExecCommands;
+        if (!Array.isArray(execs) ||
+            !execs.every((entry) => isPlainObject(entry) &&
+                typeof entry.call_id === 'string' &&
+                isStringArray(entry.command) &&
+                isOptionalString(entry.workdir) &&
+                typeof entry.timestamp === 'string')) {
+            return false;
+        }
+        const mcps = s.pendingMcpToolCalls;
+        if (!Array.isArray(mcps) ||
+            !mcps.every((entry) => isPlainObject(entry) &&
+                typeof entry.call_id === 'string' &&
+                typeof entry.tool_name === 'string' &&
+                isOptionalString(entry.server_name) &&
+                (entry.arguments === undefined || isPlainObject(entry.arguments)) &&
+                typeof entry.timestamp === 'string')) {
+            return false;
+        }
+        const copy = cloneJson({
+            sessionMeta: s.sessionMeta,
+            lastRateLimits: s.lastRateLimits,
+            patches: patches,
+            execs: execs,
+            mcps: mcps,
+        });
+        this.reset();
+        this.sessionMeta = copy.sessionMeta;
+        this.currentModel = s.currentModel;
+        this.prevTotalUsage = prevTotalUsage;
+        this.lastTokenUsage = lastTokenUsage;
+        this.modelContextWindow = contextWindow;
+        this.lastRateLimits = copy.lastRateLimits;
+        this.hasAggregateRateLimits = s.hasAggregateRateLimits;
+        this.inPlanMode = s.inPlanMode;
+        for (const id of s.emittedToolUseIds) {
+            rememberBounded(this.emittedToolUseIds, id, this.maxTrackedToolCalls);
+        }
+        for (const [callId, toolUseIds] of copy.patches)
+            this.putPendingPatch(callId, toolUseIds);
+        for (const pending of copy.execs) {
+            this.putPendingExec(this.metadataOnly
+                ? { call_id: pending.call_id, command: [], timestamp: pending.timestamp }
+                : pending);
+        }
+        for (const pending of copy.mcps) {
+            this.putPendingMcp(this.metadataOnly ? { ...pending, arguments: undefined } : pending);
+        }
+        return true;
+    }
     /**
      * Converts a single rollout line to zero or more session events.
      */
@@ -267,6 +482,82 @@ export class CodexRolloutParser {
         this.inPlanMode = false;
         this.emittedToolUseIds.clear();
         this.patchExpandedToolUseIds.clear();
+        this.pendingLedger.clear();
+        this.pendingBytes = 0;
+        this.evictedByCount = 0;
+        this.evictedByBytes = 0;
+    }
+    // --- Pending call state ---
+    /**
+     * Stores a pending call, refreshing its position, then enforces the count
+     * cap on its table and the byte budget across all pending tables, oldest
+     * first.
+     */
+    putPending(table, callId, value, estimateBytes) {
+        this.forgetPendingBytes(table, callId);
+        table.delete(callId);
+        table.set(callId, value);
+        while (table.size > this.maxTrackedToolCalls) {
+            const oldest = table.keys().next().value;
+            table.delete(oldest);
+            this.forgetPendingBytes(table, oldest);
+            this.evictedByCount += 1;
+        }
+        if (this.maxPendingBytes === null)
+            return;
+        const bytes = PENDING_ENTRY_OVERHEAD_BYTES + estimateBytes();
+        this.pendingLedger.set(this.ledgerKey(table, callId), {
+            table: table,
+            callId,
+            bytes,
+        });
+        this.pendingBytes += bytes;
+        while (this.pendingBytes > this.maxPendingBytes && this.pendingLedger.size > 0) {
+            const [key, oldest] = this.pendingLedger.entries().next().value;
+            this.pendingLedger.delete(key);
+            this.pendingBytes -= oldest.bytes;
+            oldest.table.delete(oldest.callId);
+            this.evictedByBytes += 1;
+        }
+    }
+    putPendingExec(pending) {
+        this.putPending(this.pendingExecCommands, pending.call_id, pending, () => stringBytes(pending.call_id, pending.workdir, pending.timestamp, ...(Array.isArray(pending.command) ? pending.command : [])));
+    }
+    putPendingMcp(pending) {
+        this.putPending(this.pendingMcpToolCalls, pending.call_id, pending, () => stringBytes(pending.call_id, pending.server_name, pending.tool_name, pending.timestamp) +
+            approxJsonBytes(pending.arguments));
+    }
+    putPendingPatch(callId, toolUseIds) {
+        this.putPending(this.patchExpandedToolUseIds, callId, toolUseIds, () => stringBytes(callId, ...toolUseIds));
+    }
+    /** Removes and returns a pending call. */
+    takePending(table, callId) {
+        const value = table.get(callId);
+        table.delete(callId);
+        this.forgetPendingBytes(table, callId);
+        return value;
+    }
+    forgetPendingBytes(table, callId) {
+        if (this.maxPendingBytes === null)
+            return;
+        const key = this.ledgerKey(table, callId);
+        const entry = this.pendingLedger.get(key);
+        if (!entry)
+            return;
+        this.pendingLedger.delete(key);
+        this.pendingBytes -= entry.bytes;
+    }
+    ledgerKey(table, callId) {
+        const kind = table === this.pendingExecCommands ? 'e' : table === this.pendingMcpToolCalls ? 'm' : 'p';
+        return `${kind}\u0000${callId}`;
+    }
+    /** The emitted tool input: unchanged, or only its `_sidekick*` keys in metadata-only mode. */
+    toolInput(input) {
+        return this.metadataOnly ? sidekickKeysOnly(input) : input;
+    }
+    /** The emitted tool-result content: unchanged, or empty in metadata-only mode. */
+    toolOutput(content) {
+        return this.metadataOnly ? '' : content;
     }
     // --- Handlers ---
     handleSessionMeta(timestamp, payload) {
@@ -373,7 +664,9 @@ export class CodexRolloutParser {
                     role: 'assistant',
                     id: item.id,
                     model: this.currentModel || undefined,
-                    content: [{ type: 'thinking', thinking: summaryTexts.join('\n') }],
+                    content: [
+                        { type: 'thinking', thinking: this.metadataOnly ? '' : summaryTexts.join('\n') },
+                    ],
                 },
                 timestamp,
             },
@@ -381,11 +674,13 @@ export class CodexRolloutParser {
     }
     handleFunctionCall(timestamp, item) {
         let parsedArgs = {};
-        try {
-            parsedArgs = JSON.parse(item.arguments);
-        }
-        catch {
-            parsedArgs = { raw: item.arguments };
+        if (!this.metadataOnly) {
+            try {
+                parsedArgs = JSON.parse(item.arguments);
+            }
+            catch {
+                parsedArgs = { raw: item.arguments };
+            }
         }
         const canonicalName = normalizeCodexToolName(item.name);
         const normalizedInput = normalizeCodexToolInput(canonicalName, item.name, parsedArgs);
@@ -402,7 +697,7 @@ export class CodexRolloutParser {
                             type: 'tool_use',
                             id: item.call_id,
                             name: canonicalName,
-                            input: normalizedInput,
+                            input: this.toolInput(normalizedInput),
                         },
                     ],
                 },
@@ -422,7 +717,7 @@ export class CodexRolloutParser {
                         {
                             type: 'tool_result',
                             tool_use_id: item.call_id,
-                            content: item.output,
+                            content: this.toolOutput(item.output),
                             is_error: isError,
                         },
                     ],
@@ -446,11 +741,11 @@ export class CodexRolloutParser {
                             type: 'tool_use',
                             id: item.call_id,
                             name: 'Bash',
-                            input: {
+                            input: this.toolInput({
                                 command,
                                 workdir: item.action?.workdir,
                                 _sidekickRawToolName: 'local_shell_call',
-                            },
+                            }),
                         },
                     ],
                 },
@@ -464,7 +759,7 @@ export class CodexRolloutParser {
             if (filePaths.length === 0)
                 return [];
             const toolUseIds = filePaths.map((fp) => `${item.call_id}-${fp}`);
-            setBounded(this.patchExpandedToolUseIds, item.call_id, toolUseIds, this.maxTrackedToolCalls);
+            this.putPendingPatch(item.call_id, toolUseIds);
             for (const id of toolUseIds) {
                 rememberBounded(this.emittedToolUseIds, id, this.maxTrackedToolCalls);
             }
@@ -479,10 +774,10 @@ export class CodexRolloutParser {
                             type: 'tool_use',
                             id: `${item.call_id}-${fp}`,
                             name: 'Edit',
-                            input: {
+                            input: this.toolInput({
                                 file_path: fp,
                                 _sidekickRawToolName: 'apply_patch',
-                            },
+                            }),
                         },
                     ],
                 },
@@ -490,12 +785,14 @@ export class CodexRolloutParser {
             }));
         }
         // Generic custom tool
-        let parsedInput;
-        try {
-            parsedInput = JSON.parse(item.input);
-        }
-        catch {
-            parsedInput = { raw: item.input };
+        let parsedInput = {};
+        if (!this.metadataOnly) {
+            try {
+                parsedInput = JSON.parse(item.input);
+            }
+            catch {
+                parsedInput = { raw: item.input };
+            }
         }
         const canonicalName = normalizeCodexToolName(item.name);
         const normalizedInput = normalizeCodexToolInput(canonicalName, item.name, parsedInput);
@@ -512,7 +809,7 @@ export class CodexRolloutParser {
                             type: 'tool_use',
                             id: item.call_id,
                             name: canonicalName,
-                            input: normalizedInput,
+                            input: this.toolInput(normalizedInput),
                         },
                     ],
                 },
@@ -533,8 +830,9 @@ export class CodexRolloutParser {
         catch {
             isError = parsePlainTextFailure(item.output);
         }
-        const toolUseIds = this.patchExpandedToolUseIds.get(item.call_id) ?? [item.call_id];
-        this.patchExpandedToolUseIds.delete(item.call_id);
+        const toolUseIds = this.takePending(this.patchExpandedToolUseIds, item.call_id) ?? [
+            item.call_id,
+        ];
         return toolUseIds.map((toolUseId) => ({
             type: 'user',
             message: {
@@ -544,7 +842,7 @@ export class CodexRolloutParser {
                     {
                         type: 'tool_result',
                         tool_use_id: toolUseId,
-                        content: item.output,
+                        content: this.toolOutput(item.output),
                         is_error: isError,
                         duration,
                     },
@@ -608,18 +906,15 @@ export class CodexRolloutParser {
             // response_item/message events which carry richer metadata (id, content parts, role).
             case 'exec_command_begin': {
                 const e = event;
-                setBounded(this.pendingExecCommands, e.call_id, {
-                    call_id: e.call_id,
-                    command: e.command,
-                    workdir: e.workdir,
-                    timestamp,
-                }, this.maxTrackedToolCalls);
+                const pending = this.metadataOnly
+                    ? { call_id: e.call_id, command: [], timestamp }
+                    : { call_id: e.call_id, command: e.command, workdir: e.workdir, timestamp };
+                this.putPendingExec(pending);
                 return [];
             }
             case 'exec_command_end': {
                 const e = event;
-                const pending = this.pendingExecCommands.get(e.call_id);
-                this.pendingExecCommands.delete(e.call_id);
+                const pending = this.takePending(this.pendingExecCommands, e.call_id);
                 const command = pending?.command?.join(' ') || '';
                 const events = [];
                 if (!this.emittedToolUseIds.has(e.call_id)) {
@@ -635,18 +930,20 @@ export class CodexRolloutParser {
                                     type: 'tool_use',
                                     id: e.call_id,
                                     name: 'Bash',
-                                    input: {
+                                    input: this.toolInput({
                                         command,
                                         workdir: pending?.workdir,
                                         _sidekickRawToolName: 'exec_command',
-                                    },
+                                    }),
                                 },
                             ],
                         },
                         timestamp: pending?.timestamp || timestamp,
                     });
                 }
-                const output = [e.stdout, e.stderr].filter(Boolean).join('\n') || '';
+                const output = this.metadataOnly
+                    ? ''
+                    : [e.stdout, e.stderr].filter(Boolean).join('\n') || '';
                 events.push({
                     type: 'user',
                     message: {
@@ -668,19 +965,19 @@ export class CodexRolloutParser {
             }
             case 'mcp_tool_call_begin': {
                 const e = event;
-                setBounded(this.pendingMcpToolCalls, e.call_id, {
+                const pending = {
                     call_id: e.call_id,
                     server_name: e.server_name,
                     tool_name: e.tool_name,
-                    arguments: e.arguments,
+                    arguments: this.metadataOnly ? undefined : e.arguments,
                     timestamp,
-                }, this.maxTrackedToolCalls);
+                };
+                this.putPendingMcp(pending);
                 return [];
             }
             case 'mcp_tool_call_end': {
                 const e = event;
-                const pendingMcp = this.pendingMcpToolCalls.get(e.call_id);
-                this.pendingMcpToolCalls.delete(e.call_id);
+                const pendingMcp = this.takePending(this.pendingMcpToolCalls, e.call_id);
                 const toolName = pendingMcp?.tool_name || 'McpTool';
                 const events = [];
                 if (!this.emittedToolUseIds.has(e.call_id)) {
@@ -696,11 +993,11 @@ export class CodexRolloutParser {
                                     type: 'tool_use',
                                     id: e.call_id,
                                     name: normalizeCodexToolName(toolName),
-                                    input: {
+                                    input: this.toolInput({
                                         ...(pendingMcp?.arguments || {}),
                                         _sidekickRawToolName: toolName,
                                         _sidekickMcpServerName: pendingMcp?.server_name,
-                                    },
+                                    }),
                                 },
                             ],
                         },
@@ -716,7 +1013,7 @@ export class CodexRolloutParser {
                             {
                                 type: 'tool_result',
                                 tool_use_id: e.call_id,
-                                content: e.result || '',
+                                content: this.toolOutput(e.result || ''),
                                 is_error: e.is_error || false,
                                 duration: e.duration_ms,
                             },
@@ -775,12 +1072,12 @@ export class CodexRolloutParser {
                                     type: 'tool_use',
                                     id: patchId,
                                     name: 'Edit',
-                                    input: {
+                                    input: this.toolInput({
                                         file_path: e.file_path,
                                         additions: e.additions ?? 0,
                                         deletions: e.deletions ?? 0,
                                         _sidekickRawToolName: 'patch_applied',
-                                    },
+                                    }),
                                 },
                             ],
                         },
@@ -807,10 +1104,10 @@ export class CodexRolloutParser {
                                     type: 'tool_use',
                                     id: `plan-enter-${timestamp}`,
                                     name: 'EnterPlanMode',
-                                    input: {
+                                    input: this.toolInput({
                                         source: 'codex_task_started',
                                         _sidekickRawToolName: 'task_started',
-                                    },
+                                    }),
                                 },
                             ],
                         },
@@ -834,10 +1131,10 @@ export class CodexRolloutParser {
                                     type: 'tool_use',
                                     id: `plan-exit-${timestamp}`,
                                     name: 'ExitPlanMode',
-                                    input: {
+                                    input: this.toolInput({
                                         source: 'codex_task_complete',
                                         _sidekickRawToolName: 'task_complete',
-                                    },
+                                    }),
                                 },
                             ],
                         },