@qduc/term2 0.6.1 → 0.7.1

package/dist/services/command-message-streaming.js

@@ -4,14 +4,14 @@ export const captureToolCallArguments = (item, toolCallArgumentsById) => {
     if (!rawItem) {
         return;
     }
-    if (rawItem?.type !== 'function_call') {
+    if (rawItem?.type !== 'function_call' && rawItem?.type !== 'apply_patch_call') {
         return;
     }
     const callId = rawItem.callId ?? rawItem.call_id ?? rawItem.tool_call_id ?? rawItem.toolCallId ?? rawItem.id;
     if (!callId) {
         return;
     }
-    const args = rawItem.arguments ?? rawItem.args ?? item?.arguments ?? item?.args;
+    const args = rawItem.arguments ?? rawItem.args ?? rawItem.operation ?? item?.arguments ?? item?.args ?? item?.operation;
     if (!args) {
         return;
     }
@@ -25,7 +25,12 @@ export const attachCachedArguments = (items = [], toolCallArgumentsById) => {
         if (!item) {
             continue;
         }
-        if (item.arguments || item.args || item?.rawItem?.arguments || item?.rawItem?.args) {
+        if (item.arguments ||
+            item.args ||
+            item.operation ||
+            item?.rawItem?.arguments ||
+            item?.rawItem?.args ||
+            item?.rawItem?.operation) {
             continue;
         }
         const rawItem = item?.rawItem ?? item;
@@ -57,9 +62,6 @@ export const emitCommandMessagesFromItems = (items, { toolCallArgumentsById, emi
         if (emittedCommandIds.has(cmdMsg.id)) {
             continue;
         }
-        if (cmdMsg.isApprovalRejection) {
-            continue;
-        }
         emittedCommandIds.add(cmdMsg.id);
         out.push({ type: 'command_message', message: cmdMsg });
     }

package/dist/services/command-message-streaming.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-message-streaming.js","sourceRoot":"","sources":["../../source/services/command-message-streaming.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-message-streaming.js","sourceRoot":"","sources":["../../source/services/command-message-streaming.ts"],"names":[],"mappings":"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"}

package/dist/services/command-message-streaming.test.js

@@ -69,10 +69,12 @@ test('emitCommandMessagesFromItems: attaches args and filters duplicates/rejecti
         emittedCommandIds,
         extractCommandMessages,
     });
-    t.is(events.length, 1);
+    t.is(events.length, 2);
     t.is(events[0].type, 'command_message');
     t.is(events[0].message.id, 'keep');
+    t.is(events[1].type, 'command_message');
+    t.is(events[1].message.id, 'reject');
     t.true(emittedCommandIds.has('keep'));
-    t.false(emittedCommandIds.has('reject'));
+    t.true(emittedCommandIds.has('reject'));
 });
 //# sourceMappingURL=command-message-streaming.test.js.map

package/dist/services/command-message-streaming.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-message-streaming.test.js","sourceRoot":"","sources":["../../source/services/command-message-streaming.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,gCAAgC,CAAC;AAExC,IAAI,CAAC,iEAAiE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC5E,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAmB,CAAC;IACzD,MAAM,IAAI,GAAG;QACX,OAAO,EAAE;YACP,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;SAC7B;KACF,CAAC;IAEF,wBAAwB,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAEtD,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8DAA8D,EAAE,CAAC,CAAC,EAAE,EAAE;IACzE,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAkB,CAAC,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IACzF,MAAM,KAAK,GAAU;QACnB;YACE,OAAO,EAAE;gBACP,MAAM,EAAE,QAAQ;aACjB;SACF;KACF,CAAC;IAEF,qBAAqB,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAC;IAEpD,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+EAA+E,EAAE,CAAC,CAAC,EAAE,EAAE;IAC1F,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAkB,CAAC,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5F,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,MAAM,KAAK,GAAU;QACnB;YACE,OAAO,EAAE;gBACP,MAAM,EAAE,QAAQ;aACjB;SACF;KACF,CAAC;IAEF,MAAM,sBAAsB,GAAG,CAAC,WAAkB,EAAE,EAAE;QACpD,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7D,OAAO;YACL;gBACE,EAAE,EAAE,MAAM;gBACV,MAAM,EAAE,SAAkB;gBAC1B,MAAM,EAAE,WAAoB;gBAC5B,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,IAAI;aACd;YACD;gBACE,EAAE,EAAE,MAAM;gBACV,MAAM,EAAE,SAAkB;gBAC1B,MAAM,EAAE,WAAoB;gBAC5B,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,IAAI;aACd;YACD;gBACE,EAAE,EAAE,QAAQ;gBACZ,MAAM,EAAE,SAAkB;gBAC1B,MAAM,EAAE,WAAoB;gBAC5B,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,IAAI;gBACb,mBAAmB,EAAE,IAAI;aAC1B;SACF,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,4BAA4B,CAAC,KAAK,EAAE;QACjD,qBAAqB;QACrB,iBAAiB;QACjB,sBAAsB;KACvB,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACxC,CAAC,CAAC,EAAE,CAAE,MAAM,CAAC,CAAC,CAAS,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC"}
+{"version":3,"file":"command-message-streaming.test.js","sourceRoot":"","sources":["../../source/services/command-message-streaming.test.ts"],"names":[],"mappings":"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"}

package/dist/services/conversation-clear-save.test.js

@@ -3,7 +3,15 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import * as persistenceModule from './conversation-persistence.js';
-import { hasConversationContent } from '../app.js';
+import { createConversationLogWriter } from './conversation-log-writer.js';
+const stubLogger = {
+    error: () => { },
+    warn: () => { },
+    info: () => { },
+    debug: () => { },
+    trace: () => { },
+    getCorrelationId: () => undefined,
+};
 let testDir = '';
 test.beforeEach(() => {
     testDir = fs.mkdtempSync(path.join(os.tmpdir(), 'term2-cli-clear-test-'));
@@ -16,70 +24,33 @@ test.afterEach.always(() => {
     persistenceModule.setConversationsDirForTest(null);
     testDir = '';
 });
-test.serial('CLI clear behavior: saves old conversation, starts new in-memory, avoids empty save on exit', async (t) => {
-    // 1. Initial State
-    let effectiveSessionId = 'session-old';
-    let effectiveCreatedAt = new Date().toISOString();
-    let pendingMessages = [{ id: '1', sender: 'user', text: 'hello in old session' }];
-    const savedSessionIds = new Set();
-    const saveAndPrintResume = async (messages, overrideSessionId, overrideCreatedAt) => {
-        const sessionIdToSave = overrideSessionId || effectiveSessionId;
-        const createdAtToSave = overrideCreatedAt || effectiveCreatedAt;
-        if (savedSessionIds.has(sessionIdToSave)) {
-            return;
-        }
-        if (!hasConversationContent(messages)) {
-            return;
-        }
-        savedSessionIds.add(sessionIdToSave);
-        persistenceModule.saveConversation({
-            id: sessionIdToSave,
-            createdAt: createdAtToSave,
-            updatedAt: new Date().toISOString(),
-            projectPath: '/test/project',
-            model: 'gpt-4o',
-            provider: 'openai',
-            previousResponseId: null,
-            history: [],
-            messages: messages,
-        });
-    };
-    // 2. Perform Clear Action
-    // Simulating: onClear / handleClearConversation
-    if (hasConversationContent(pendingMessages)) {
-        await saveAndPrintResume(pendingMessages, effectiveSessionId, effectiveCreatedAt);
-    }
-    // Verify old session is saved to disk
-    const oldSessionFile = path.join(testDir, 'session-old.json');
-    t.true(fs.existsSync(oldSessionFile));
-    t.true(savedSessionIds.has('session-old'));
-    // Simulate parent onSessionIdChange callback
-    const onSessionIdChange = (newId, createdAt) => {
-        effectiveSessionId = newId;
-        effectiveCreatedAt = createdAt;
-        pendingMessages = []; // Reset pending messages immediately!
-    };
-    const newId = 'session-new';
-    const newCreatedAt = new Date().toISOString();
-    onSessionIdChange(newId, newCreatedAt);
-    // 3. Verify new session is only in-memory (not written to disk yet)
-    const newSessionFile = path.join(testDir, 'session-new.json');
-    t.false(fs.existsSync(newSessionFile));
-    t.is(effectiveSessionId, 'session-new');
-    t.deepEqual(pendingMessages, []);
-    // 4. Simulate exit without sending messages in new session
-    await saveAndPrintResume(pendingMessages);
-    // Verify new session file STILL does not exist (not saved because empty)
-    t.false(fs.existsSync(newSessionFile));
-    t.false(savedSessionIds.has('session-new'));
-    // 5. Send message in new session
-    pendingMessages = [{ id: '2', sender: 'user', text: 'first message in new session' }];
-    // Simulate exit now that new session has content
-    await saveAndPrintResume(pendingMessages);
-    // Verify new session is saved to disk
-    t.true(fs.existsSync(newSessionFile));
-    t.true(savedSessionIds.has('session-new'));
-    const savedData = JSON.parse(fs.readFileSync(newSessionFile, 'utf-8'));
-    t.is(savedData.messages[0].text, 'first message in new session');
+test.serial('clear rotates writer: old session file remains, new file begins fresh', async (t) => {
+    const oldId = persistenceModule.generateId();
+    const writer = createConversationLogWriter({ sessionId: oldId, dir: testDir, logger: stubLogger });
+    writer.init({ id: oldId, createdAt: '2026-05-26T00:00:00.000Z', projectPath: '/test/project' });
+    writer.append({ type: 'user_message', message: { id: 'u1', sender: 'user', text: 'hello in old session' } });
+    writer.append({
+        type: 'assistant_turn',
+        turn: { items: [{ type: 'assistant_text', text: 'reply' }] },
+        state: { previousResponseId: 'r1' },
+    });
+    const oldPath = path.join(testDir, `${oldId}.jsonl`);
+    t.true(fs.existsSync(oldPath));
+    // Rotate (simulates /clear)
+    const newId = persistenceModule.generateId();
+    writer.append({ type: 'session_cleared' });
+    writer.rotate(newId, { id: newId, createdAt: '2026-05-26T00:01:00.000Z' });
+    const newPath = path.join(testDir, `${newId}.jsonl`);
+    t.true(fs.existsSync(newPath));
+    t.true(fs.existsSync(oldPath));
+    // Old session is resumable
+    const restored = persistenceModule.loadConversation(oldId);
+    t.truthy(restored);
+    t.is(restored.previousResponseId, 'r1');
+    // New file has no assistant turn yet → empty restored state
+    const newRestored = persistenceModule.loadConversation(newId);
+    t.is(newRestored.previousResponseId, null);
+    t.is(newRestored.messages.length, 0);
+    await writer.close();
 });
 //# sourceMappingURL=conversation-clear-save.test.js.map

package/dist/services/conversation-clear-save.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-clear-save.test.js","sourceRoot":"","sources":["../../source/services/conversation-clear-save.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation-clear-save.test.js","sourceRoot":"","sources":["../../source/services/conversation-clear-save.test.ts"],"names":[],"mappings":"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"}

package/dist/services/conversation-events.d.ts

@@ -2,7 +2,8 @@ import type { CommandMessage } from '../tools/types.js';
 import type { NormalizedUsage } from '../utils/token-usage.js';
 import type { ApprovalDescriptor, LLMAdvisory } from '../contracts/conversation.js';
 import type { SubagentResult } from './subagents/types.js';
-export type ConversationEvent = TextDeltaEvent | ReasoningDeltaEvent | ToolStartedEvent | CommandMessageEvent | ApprovalRequiredEvent | UsageUpdateEvent | FinalResponseEvent | ErrorEvent | RetryEvent | SubagentStartedEvent | SubagentToolStartedEvent | SubagentCommandMessageEvent | SubagentCompletedEvent;
+import type { PersistedAssistantTurnItem } from './conversation-persistence-types.js';
+export type ConversationEvent = TextDeltaEvent | ReasoningDeltaEvent | ToolStartedEvent | CommandMessageEvent | ApprovalRequiredEvent | UsageUpdateEvent | FinalResponseEvent | ErrorEvent | RetryEvent | ToolRecoveryEvent | SubagentStartedEvent | SubagentToolStartedEvent | SubagentCommandMessageEvent | SubagentCompletedEvent | CodexRateLimitEvent | UserMessageConsumedForAbortEvent;
 export interface RetryEvent {
     type: 'retry';
     toolName: string;
@@ -11,6 +12,12 @@ export interface RetryEvent {
     errorMessage: string;
     retryType?: 'hallucination' | 'parsing_error' | 'behavior' | 'flex_service_tier' | 'upstream';
 }
+export interface ToolRecoveryEvent {
+    type: 'tool_recovery';
+    recoveredCallIds: string[];
+    droppedCallIds: string[];
+    message: string;
+}
 /**
  * Transport-friendly text streaming event.
  *
@@ -68,17 +75,37 @@ export interface FinalResponseEvent {
     commandMessages?: CommandMessageEvent['message'][];
     /** Token usage for this turn. */
     usage?: NormalizedUsage;
+    turnItems?: PersistedAssistantTurnItem[];
 }
 export interface ErrorEvent {
     type: 'error';
     message: string;
     kind?: string;
+    stack?: string;
+    /**
+     * Set when the session removed the just-added user turn from its store as part of
+     * handling this error. UIs should drop the corresponding trailing user message and
+     * restore the text to the input box so the user can edit and retry.
+     */
+    droppedUserMessage?: {
+        text: string;
+        imageCount: number;
+    };
+}
+/**
+ * Emitted when the user's input was consumed as resolution for a previously aborted
+ * tool approval rather than added to the conversation as a new user turn. UIs should
+ * mark the corresponding user message so /undo and the undo menu skip it.
+ */
+export interface UserMessageConsumedForAbortEvent {
+    type: 'user_message_consumed_for_abort';
 }
 export interface SubagentStartedEvent {
     type: 'subagent_started';
     agentId: string;
     role: string;
     task: string;
+    parentTool?: string;
 }
 export interface SubagentToolStartedEvent {
     type: 'subagent_tool_started';
@@ -97,4 +124,24 @@ export interface SubagentCompletedEvent {
     type: 'subagent_completed';
     result: SubagentResult;
 }
+/**
+ * Rate limit information from the Codex provider.
+ * Emitted as a raw `codex.rate_limits` frame from the Codex backend.
+ */
+export interface CodexRateLimitWindow {
+    used_percent: number;
+    window_minutes: number;
+    reset_after_seconds: number;
+    reset_at: number;
+}
+export interface CodexRateLimitInfo {
+    allowed: boolean;
+    limit_reached: boolean;
+    primary?: CodexRateLimitWindow;
+    secondary?: CodexRateLimitWindow;
+}
+export interface CodexRateLimitEvent {
+    type: 'codex_rate_limits';
+    rateLimits: CodexRateLimitInfo;
+}
 //# sourceMappingURL=conversation-events.d.ts.map

package/dist/services/conversation-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-events.d.ts","sourceRoot":"","sources":["../../source/services/conversation-events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation-events.d.ts","sourceRoot":"","sources":["../../source/services/conversation-events.ts"],"names":[],"mappings":"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"}

package/dist/services/conversation-history-repair.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-history-repair.d.ts","sourceRoot":"","sources":["../../source/services/conversation-history-repair.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,8BAA8B;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,8BAA8B,GAAG,kCAAkC,CAAC;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,yBAAyB,EAAE,CAAC;IACrC,WAAW,EAAE,8BAA8B,CAAC;IAC5C,UAAU,EAAE,8BAA8B,CAAC;CAC5C;AAED,MAAM,WAAW,+BAAgC,SAAQ,gCAAgC;IACvF,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB;AA0PD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,+BAA+B,CAsB7F"}
+{"version":3,"file":"conversation-history-repair.d.ts","sourceRoot":"","sources":["../../source/services/conversation-history-repair.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,8BAA8B;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,8BAA8B,GAAG,kCAAkC,CAAC;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,yBAAyB,EAAE,CAAC;IACrC,WAAW,EAAE,8BAA8B,CAAC;IAC5C,UAAU,EAAE,8BAA8B,CAAC;CAC5C;AAED,MAAM,WAAW,+BAAgC,SAAQ,gCAAgC;IACvF,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB;AAmTD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,+BAA+B,CAsB7F"}

package/dist/services/conversation-history-repair.js

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto';
 const asRecord = (value) => value && typeof value === 'object' && !Array.isArray(value) ? value : null;
 const rawItem = (item) => {
     const record = asRecord(item);
@@ -19,9 +20,17 @@ const cloneHistory = (history) => {
         return structuredClone(history);
     }
     catch {
-        return history.slice();
+        try {
+            return JSON.parse(JSON.stringify(history));
+        }
+        catch {
+            return history.slice();
+        }
     }
 };
+const hashString = (str) => {
+    return createHash('sha256').update(str).digest('hex');
+};
 const itemSignature = (item) => {
     const raw = rawItem(item);
     const callId = callIdOf(raw);
@@ -33,20 +42,47 @@ const itemSignature = (item) => {
     if (typeof id === 'string' && id) {
         return `id:${id}`;
     }
+    // Message-like items: role + type + content parts + tool_calls.
     const role = raw?.role;
-    let text = '';
-    const content = raw?.content;
-    if (typeof content === 'string') {
-        text = content;
-    }
-    else if (Array.isArray(content)) {
-        text = content
-            .filter((part) => typeof part?.text === 'string')
-            .map((part) => part.text)
-            .join('');
-    }
     if (typeof role === 'string' && role) {
-        return `msg:${role}:${type}:${text}`;
+        const parts = [];
+        const content = raw?.content;
+        if (typeof content === 'string') {
+            if (content) {
+                parts.push(`text:${content}`);
+            }
+        }
+        else if (Array.isArray(content)) {
+            for (const c of content) {
+                if (c && typeof c === 'object') {
+                    if (typeof c.type === 'string') {
+                        parts.push(`part:${c.type}`);
+                    }
+                    if (typeof c.text === 'string' && c.text) {
+                        parts.push(`text:${c.text}`);
+                    }
+                    // Image URLs / base64 image data
+                    if (typeof c.image === 'string' && c.image) {
+                        parts.push(`image:${hashString(c.image)}`);
+                    }
+                    if (c.image_url && typeof c.image_url.url === 'string' && c.image_url.url) {
+                        parts.push(`image_url:${hashString(c.image_url.url)}`);
+                    }
+                }
+            }
+        }
+        // Embed tool calls inside the signature if present
+        const toolCalls = item?.tool_calls ?? raw?.tool_calls;
+        if (Array.isArray(toolCalls)) {
+            for (const tc of toolCalls) {
+                if (tc && typeof tc === 'object') {
+                    const tcId = tc.id ?? tc.callId ?? tc.call_id ?? '';
+                    const tcName = tc.function?.name ?? tc.name ?? '';
+                    parts.push(`tool:${tcId}:${tcName}`);
+                }
+            }
+        }
+        return `msg:${role}:${type}:${parts.join('|')}`;
     }
     const name = raw?.name;
     return `item:${type}:${typeof name === 'string' ? name : ''}`;
@@ -105,6 +141,17 @@ const repairMetadata = (kind, before, after) => {
         maxCopiesBefore: beforeStats.maxCopies,
     };
 };
+const isPrefixMatch = (prefix, full) => {
+    if (prefix.length > full.length) {
+        return false;
+    }
+    for (let i = 0; i < prefix.length; i++) {
+        if (itemSignature(prefix[i]) !== itemSignature(full[i])) {
+            return false;
+        }
+    }
+    return true;
+};
 const collapseReplayedHistoryPrefixes = (input) => {
     let collapsed = input;
     const repairs = [];
@@ -115,21 +162,29 @@ const collapseReplayedHistoryPrefixes = (input) => {
             if (itemSignature(collapsed[i]) !== firstSignature) {
                 continue;
             }
-            const prefixCallSignatures = collectCallSignatures(collapsed.slice(0, i));
-            if (prefixCallSignatures.size === 0) {
-                continue;
-            }
-            const suffixCallSignatures = collectCallSignatures(collapsed.slice(i));
-            let allPrefixCallsReplayed = true;
-            for (const signature of prefixCallSignatures) {
-                if (!suffixCallSignatures.has(signature)) {
-                    allPrefixCallsReplayed = false;
+            const prefix = collapsed.slice(0, i);
+            const suffix = collapsed.slice(i);
+            // Require tool calls in the prefix before collapsing.
+            const prefixCallSignatures = collectCallSignatures(prefix);
+            if (prefixCallSignatures.size > 0) {
+                // Heuristic 1: prefix is an exact/ordered prefix match of the suffix.
+                if (isPrefixMatch(prefix, suffix)) {
+                    replayStart = i;
+                    break;
+                }
+                // Heuristic 2: the prefix contains tool calls, and all those tool calls are present in the suffix.
+                const suffixCallSignatures = collectCallSignatures(suffix);
+                let allPrefixCallsReplayed = true;
+                for (const signature of prefixCallSignatures) {
+                    if (!suffixCallSignatures.has(signature)) {
+                        allPrefixCallsReplayed = false;
+                        break;
+                    }
+                }
+                if (allPrefixCallsReplayed) {
+                    replayStart = i;
                     break;
                 }
-            }
-            if (allPrefixCallsReplayed) {
-                replayStart = i;
-                break;
             }
         }
         if (replayStart === -1) {

package/dist/services/conversation-history-repair.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-history-repair.js","sourceRoot":"","sources":["../../source/services/conversation-history-repair.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation-history-repair.js","sourceRoot":"","sources":["../../source/services/conversation-history-repair.ts"],"names":[],"mappings":"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"}