@qduc/term2 0.38.0 → 0.39.0

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

@@ -1 +1 @@
-{"version":3,"file":"conversation-record.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-record.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAY,KAAK,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAErG,OAAO,KAAK,EAAgC,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AAGpG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAItE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,iDAAiD,CAAC;AAC7G,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAE1G,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,EAAE,QAAQ,CAAC;IACnB,kFAAkF;IAClF,WAAW,EAAE,eAAe,GAAG,cAAc,GAAG,cAAc,GAAG,QAAQ,CAAC;CAC3E,CAAC;AAEF;;;;GAIG;AACH,qBAAa,kBAAkB;;IAc7B,YACE,OAAO,GAAE;QACP,MAAM,CAAC,EAAE,eAAe,CAAC;QACzB,eAAe,CAAC,EAAE,kBAAkB,CAAC;QACrC,kBAAkB,CAAC,EAAE,qCAAqC,CAAC;KACvD,EAOP;IAMD,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAK7D;IAED,kFAAkF;IAClF,YAAY,IAAI,IAAI,CAGnB;IAED,yEAAyE;IACzE,uBAAuB,CAAC,MAAM,GAAE,mBAAmB,GAAG,iBAAuC,GAAG,IAAI,CAGnG;IAED,SAAS,IAAI,IAAI,CAIhB;IACD,gBAAgB,IAAI,MAAM,CAEzB;IACD,UAAU,IAAI,iBAAiB,EAAE,CAEhC;IACD,0BAA0B,8DAEzB;IACD,0BAA0B;;;;MAEzB;IACD,kBAAkB,IAAI,MAAM,CAE3B;IACD,aAAa;;;;QAEZ;IACD,iBAAiB,qDAEhB;IAID,mBAAmB,2DAElB;IACD,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAEnC;IACD,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAGxC;IACD,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAK1C;IACD,kBAAkB,IAAI,kBAAkB,EAAE,CAEzC;IACD,2BAA2B,IAAI,MAAM,EAAE,CAEtC;IACD,oCAAoC,IAAI,MAAM,EAAE,CAE/C;IACD,kCAAkC,IAAI,MAAM,EAAE,CAG7C;IACD,gCAAgC,IAAI,yBAAyB,CAS5D;IAED,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,uBAAuB,CAG5D;IACD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,uBAAuB,CAE5D;IACD,qBAAqB,IAAI,IAAI,CAE5B;IACD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAElC;IACD,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEnC;IACD,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAEtC;IACD,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAExC;IACD,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAE1E;IACD,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAEzD;IACD,kBAAkB,2EAEjB;IAED,mFAAmF;IACnF,YAAY,IAAI,IAAI,CAGnB;IAED,+FAA+F;IAC/F,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,uBAAuB,CAiCzD;IAED,kFAAkF;IAClF,aAAa,CACX,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,OAAO,GAAG,cAAc,EACnC,WAAW,EAAE;QAAE,MAAM,EAAE,eAAe,CAAC;QAAC,SAAS,EAAE,eAAe,CAAA;KAAE;;;;;;MAqBrE;IAED,QAAQ,CAAC,QAAQ,EAAE;QAAE,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,iEAE1F;IACD,WAAW,CAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI;;;;MAE5C;IAED,oBAAoB,IAAI,iBAAiB,EAAE,CAE1C;IAQD,0FAA0F;IAC1F,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,iBAAiB,EAAE,GAAG,OAAO,CAEzF;IAED,8FAA8F;IAC9F,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,GAAG,UAAU,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,CAAC,CAsBvG;IAiBD,KAAK,IAAI,IAAI,CASZ;IACD,WAAW,CAAC,KAAK,EAAE;QACjB,OAAO,EAAE,OAAO,EAAE,CAAC;QACnB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAClC,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAC;QAClC,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;MAOA;IACD,kBAAkB;;;;aAIjB;IACD,iBAAiB;;;;;MAShB;IACD,oBAAoB,CAAC,CAAC,EAAE,MAAM;;;;aAI7B;IACD,cAAc,CAAC,MAAM,EAAE,cAAc,0DAIpC;IACD,kBAAkB;;;;;;aAGjB;IACD,yBAAyB;;;;;;aAKxB;CA8BF"}
+{"version":3,"file":"conversation-record.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-record.ts"],"names":[],"mappings":"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"}

package/dist/services/conversation/conversation-record.js

@@ -1,3 +1,5 @@
+import { toolOccurrenceKey, toolOccurrenceMetadata } from './tool-occurrence.js';
+import { projectPersistedAssistantItemToProviderHistory } from './conversation-turn-items.js';
 import { ConversationStore } from './conversation-store.js';
 import { ToolExecutionLedger, callIdOf } from '../tool-execution-ledger.js';
 import { AssistantTurnJournal } from '../logging/assistant-turn-journal.js';
@@ -104,17 +106,22 @@ export class ConversationRecord {
         return this.#ledger.completedResultCallIdsForCurrentTurn();
     }
     unsettledToolCallIdsForCurrentTurn() {
-        const completed = new Set(this.completedResultCallIdsForCurrentTurn());
-        return this.activeCallIdsForCurrentTurn().filter((id) => !completed.has(id));
+        return this.#ledger
+            .export()
+            .filter((entry) => entry.turnId === this.getCurrentTurnId() &&
+            (entry.status === 'started' || entry.status === 'approval_required'))
+            .map((entry) => entry.callId);
     }
     inspectCommittedToolContinuation() {
         const live = this.#ledger.export().filter((entry) => entry.turnId === this.getCurrentTurnId());
         const completed = live.filter((entry) => entry.status === 'completed');
-        const historyIds = new Set(this.getReconciledHistory().map(callIdOf).filter(Boolean));
+        const historyItems = this.getReconciledHistory().flatMap(normalizeRunItem);
+        const historyCalls = new Set(historyItems.filter((item) => item.type === 'tool_call').map(toolOccurrenceKey));
+        const historyResults = new Set(historyItems.filter((item) => item.type === 'tool_result').map(toolOccurrenceKey));
         return {
             completedToolCount: completed.length,
             allToolsCompleted: live.length > 0 && live.every((entry) => entry.status === 'completed'),
-            completedPairsPresentInHistory: completed.every((entry) => historyIds.has(entry.callId)),
+            completedPairsPresentInHistory: completed.every((entry) => historyCalls.has(toolOccurrenceKey(entry)) && historyResults.has(toolOccurrenceKey(entry))),
         };
     }
     acceptInput(turn) {
@@ -158,19 +165,24 @@ export class ConversationRecord {
         this.#lastPersistence = this.#journalSink ? 'not_requested' : 'unconfigured';
         // Journal deduplication is independent of execution occurrence: a real new
         // invocation may reuse a provider call id within this logical turn.
-        for (const normalized of normalizeRunItem(item)) {
+        const acceptedItems = normalizeRunItem(item);
+        for (const normalized of acceptedItems) {
             if (normalized.type === 'tool_call') {
                 if (this.#pendingReasoningText)
                     this.#ledger.recordReasoningText(this.#pendingReasoningText);
                 this.#pendingReasoningText = '';
-                this.#ledger.recordFunctionCall(item);
+                const entry = this.#ledger.recordFunctionCall(normalized);
+                if (entry)
+                    Object.assign(normalized, toolOccurrenceMetadata(entry));
             }
             else if (normalized.type === 'tool_result') {
-                this.#ledger.recordFunctionResult(item);
+                const entry = this.#ledger.recordFunctionResult(normalized);
+                if (entry)
+                    Object.assign(normalized, toolOccurrenceMetadata(entry));
                 if (this.#segmentSource !== 'startStream' && this.#journalSink) {
-                    const entry = this.#ledger.export().find((candidate) => candidate.callId === normalized.callId);
                     this.#deliverJournalEvent({
                         type: 'tool_result',
+                        ...toolOccurrenceMetadata(normalized),
                         callId: normalized.callId,
                         toolName: entry?.toolName ?? normalized.toolName,
                         status: entry?.status === 'failed' || entry?.status === 'aborted' || entry?.status === 'unknown'
@@ -185,14 +197,20 @@ export class ConversationRecord {
         // The transcript is immediately readable by preparation/recovery. Segment
         // selection later reconciles the provider's terminal representation against
         // the baseline, rather than appending these same observations twice.
-        this.#store.appendOutput([item]);
-        this.#journal.recordRunItem(item);
+        const journalItems = this.#journal.recordRunItem(item, acceptedItems);
+        if (journalItems.length)
+            this.#store.appendOutput(journalItems.some((accepted) => accepted.type === 'tool_call' || accepted.type === 'tool_result')
+                ? journalItems.map(projectPersistedAssistantItemToProviderHistory)
+                : [item]);
+        else if (!acceptedItems.length)
+            this.#store.appendOutput([item]);
         return this.#receipt();
     }
     /** Accept a completed or interrupted execution view, independent of rendering. */
     acceptSegment(stream, inputMode, diagnostics) {
         const selected = selectAcceptedStreamHistory({
             stream,
+            toolLedger: this.#ledger.export(),
             history: this.#segmentBaseline ? [...this.#segmentBaseline.history] : this.#store.getHistory(),
             inputMode,
             source: this.#segmentSource,
@@ -262,15 +280,15 @@ export class ConversationRecord {
     }
     #restoreSettledEntries(snapshot) {
         const merged = [...snapshot];
-        const indices = new Map(merged.map((entry, index) => [entry.callId, index]));
+        const indices = new Map(merged.map((entry, index) => [toolOccurrenceKey(entry), index]));
         for (const entry of this.#ledger.export()) {
             if (!['completed', 'aborted', 'unknown'].includes(entry.status))
                 continue;
-            const index = indices.get(entry.callId);
+            const index = indices.get(toolOccurrenceKey(entry));
             if (index !== undefined)
                 merged[index] = entry;
             else {
-                indices.set(entry.callId, merged.length);
+                indices.set(toolOccurrenceKey(entry), merged.length);
                 merged.push(entry);
             }
         }
@@ -288,9 +306,9 @@ export class ConversationRecord {
     }
     importState(state) {
         const validated = ImportedConversationStateSchema.parse(state);
-        const projected = projectImportedState(validated);
         this.reset();
         this.#ledger.import(validated.toolLedger);
+        const projected = projectImportedState({ ...validated, toolLedger: this.#ledger.export() });
         for (const item of projected.history)
             this.#store.addImportedItem(item);
         return { validated, projected };

package/dist/services/conversation/conversation-record.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"conversation-replay.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-replay.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAUtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EAGb,MAAM,qCAAqC,CAAC;AAqB7C,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAC7B,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,WAAW,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACjC,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,uCAAuC,EAAE,WAAW,CAAC;CACpE;AA4wCD,wBAAgB,YAAY,CAAC,SAAS,EAAE,oBAAoB,EAAE,GAAG,aAAa,CAgK7E"}
+{"version":3,"file":"conversation-replay.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-replay.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAUtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EAGb,MAAM,qCAAqC,CAAC;AAkB7C,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAC7B,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,WAAW,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACjC,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,uCAAuC,EAAE,WAAW,CAAC;CACpE;AAgrCD,wBAAgB,YAAY,CAAC,SAAS,EAAE,oBAAoB,EAAE,GAAG,aAAa,CAkK7E"}

package/dist/services/conversation/conversation-replay.js

@@ -1,14 +1,17 @@
+import { pairToolOccurrences, toolOccurrenceKey, toolOccurrenceMetadata } from './tool-occurrence.js';
+import { buildToolLedgerFromAssistantTurnItems } from './journal-to-ledger.js';
+import { alignHistoryToolOccurrences, normalizeToolLedgerOccurrences } from '../tool-execution-ledger.js';
 import { ModelSelectionSchema } from '../settings/model-selection.js';
 import { createUsageAccumulator } from '../../utils/ai/token-usage.js';
 import { repairConversationHistory } from './conversation-history-repair.js';
 import { isTruncatedLogEvent } from '../logging/conversation-log-events.js';
 import { formatMemoryReceipt } from './conversation-events.js';
-import { projectPersistedAssistantItemToProviderHistory, synthesizeHistoryFromAssistantTurn, } from './conversation-turn-items.js';
+import { normalizeRunItems } from './run-item-normalizer.js';
+import { synthesizeHistoryFromAssistantTurn } from './conversation-turn-items.js';
 import { formatPatchOutputItems, coerceToText } from '../../tools/format-helpers.js';
 import { projectProviderHistory } from './conversation-state-projector.js';
 import { RESTART_UNOBSERVED_TOOL_RESULT, callIdOf, isToolCallHistoryItem, isToolResultHistoryItem, } from '../tool-execution-ledger.js';
 import { deriveLocalCheckpointRequestHistory } from './local-checkpoint-projection.js';
-import { normalizeRunItems } from './run-item-normalizer.js';
 import { legacyModeFromProfileId, profileIdFromLegacyMode, profileIdFromLegacyModeSetting, } from '../profiles/legacy-adapter.js';
 const INTERRUPTED_SYSTEM_MESSAGE = 'Previous turn was interrupted — send a message to continue.';
 const cloneSnapshot = (snap) => {
@@ -49,7 +52,6 @@ const createEmptyTurnJournal = (ts, userTurnIndex, turnId) => ({
     approvalByCall: new Map(),
     startedAt: ts,
 });
-const makeHistoryItemForToolCall = (item) => projectPersistedAssistantItemToProviderHistory(item);
 /**
  * Returns the journal slot for the current user turn, allocating it on
  * first use. Journals are keyed by the number of user messages seen so
@@ -72,81 +74,43 @@ const getOrCreateJournal = (state, ts, key, turnId) => {
     }
     return journal;
 };
-const makeHistoryItemForToolResult = (item) => projectPersistedAssistantItemToProviderHistory(item);
-const makeHistoryItemForReasoning = (item) => projectPersistedAssistantItemToProviderHistory(item);
-const withMissingReasoningPrefix = (historyItems, reasoningItems) => {
-    const existing = historyItems ?? [];
-    if (reasoningItems.length === 0 || normalizeRunItems(existing).some((item) => item.type === 'reasoning')) {
-        return existing;
-    }
-    return [...reasoningItems, ...existing];
-};
-const hasToolResultForCall = (historyItems, callId) => normalizeRunItems(historyItems).some((item) => item.type === 'tool_result' && item.callId === callId);
-const appendToolResultIfMissing = (historyItems, callId, resultItem) => {
-    const existing = historyItems ?? [];
-    return hasToolResultForCall(existing, callId) ? existing : [...existing, resultItem];
-};
+/** Authoritative pairs replace provisional lifecycle views, never settled siblings. */
 function mergeAssistantTurnIntoLedger(state, turn, ts, turnId) {
-    const calls = new Map();
-    let pendingReasoningHistoryItems = [];
-    for (const item of turn.items) {
-        if (item.type === 'reasoning') {
-            pendingReasoningHistoryItems.push(makeHistoryItemForReasoning(item));
-            continue;
-        }
-        if (item.type === 'tool_call') {
-            calls.set(item.callId, item);
-            const callHistoryItem = makeHistoryItemForToolCall(item);
-            const existing = state.toolLedger.find((entry) => entry.callId === item.callId);
-            if (!existing) {
-                state.toolLedger.push({
-                    turnId: turnId ?? `turn-${state.messages.filter((message) => message.sender === 'user').length || 1}`,
-                    callId: item.callId,
-                    toolName: item.toolName,
-                    arguments: item.arguments,
-                    status: 'started',
-                    startedAt: ts,
-                    historyItems: [...pendingReasoningHistoryItems, callHistoryItem],
-                });
-            }
-            else {
-                existing.toolName = item.toolName;
-                existing.arguments = item.arguments;
-                if (!existing.historyItems || existing.historyItems.length === 0) {
-                    existing.historyItems = [...pendingReasoningHistoryItems, callHistoryItem];
-                }
-                else {
-                    existing.historyItems = withMissingReasoningPrefix(existing.historyItems, pendingReasoningHistoryItems);
-                }
-            }
-            pendingReasoningHistoryItems = [];
-            continue;
-        }
-        pendingReasoningHistoryItems = [];
-        if (item.type !== 'tool_result') {
-            continue;
-        }
-        let existing = state.toolLedger.find((entry) => entry.callId === item.callId);
-        if (!existing) {
-            const call = calls.get(item.callId);
-            existing = {
-                turnId: turnId ?? `turn-${state.messages.filter((message) => message.sender === 'user').length || 1}`,
-                callId: item.callId,
-                toolName: item.toolName,
-                arguments: call?.arguments,
-                status: 'started',
-                startedAt: ts,
-                historyItems: call ? [makeHistoryItemForToolCall(call)] : [],
-            };
-            state.toolLedger.push(existing);
+    const id = turnId ?? `turn-${state.messages.filter((message) => message.sender === 'user').length || 1}`;
+    const entries = buildToolLedgerFromAssistantTurnItems(turn.items, id, ts);
+    for (const entry of entries) {
+        state.toolLedger = state.toolLedger.filter((candidate) => !(candidate.occurrence === undefined &&
+            candidate.callId === entry.callId &&
+            (candidate.turnId === id || candidate.turnId === 'turn-interrupted')));
+        const index = state.toolLedger.findIndex((candidate) => toolOccurrenceKey(candidate) === toolOccurrenceKey(entry));
+        if (index === -1)
+            state.toolLedger.push(entry);
+        else {
+            const existing = state.toolLedger[index];
+            // A later-segment direct settlement can precede the journal reconstruction.
+            state.toolLedger[index] =
+                entry.status === 'started' && existing.status !== 'started'
+                    ? {
+                        ...entry,
+                        ...existing,
+                        historyItems: existing.historyItems?.length ? existing.historyItems : entry.historyItems,
+                    }
+                    : {
+                        ...existing,
+                        ...entry,
+                        ...(!normalizeRunItems(entry.historyItems).some((item) => item.type === 'tool_call') &&
+                            normalizeRunItems(existing.historyItems).some((item) => item.type === 'tool_call')
+                            ? { arguments: existing.arguments, historyItems: existing.historyItems }
+                            : {}),
+                    };
         }
-        const callHistoryItem = existing.historyItems?.find((historyItem) => normalizeRunItems([historyItem]).some((normalized) => normalized.type === 'tool_call' && normalized.callId === item.callId));
-        existing.toolName = item.toolName;
-        existing.status = item.status;
-        existing.output = item.output;
-        existing.completedAt = ts;
-        const previousHistoryItems = existing.historyItems ?? (callHistoryItem ? [callHistoryItem] : []);
-        existing.historyItems = appendToolResultIfMissing(previousHistoryItems, item.callId, makeHistoryItemForToolResult(item));
+    }
+    const keys = new Set(entries.map(toolOccurrenceKey));
+    const first = state.toolLedger.findIndex((entry) => keys.has(toolOccurrenceKey(entry)));
+    if (first >= 0) {
+        const ordered = entries.map((entry) => state.toolLedger.find((candidate) => toolOccurrenceKey(candidate) === toolOccurrenceKey(entry)));
+        state.toolLedger = state.toolLedger.filter((entry) => !keys.has(toolOccurrenceKey(entry)));
+        state.toolLedger.splice(first, 0, ...ordered);
     }
 }
 const stateFromAssistantTurn = (event) => {
@@ -412,8 +376,10 @@ function applyEvent(state, event, ts) {
         }
         case 'tool_started': {
             state.inFlightToolCalls.set(event.toolCallId, { callId: event.toolCallId, toolName: event.toolName });
-            const existing = state.toolLedger.find((e) => e.callId === event.toolCallId);
-            if (!existing) {
+            const journal = getOrCreateJournal(state, ts, journalKeyForEvent(event, state), event.turnId);
+            const existing = state.toolLedger.find((e) => e.callId === event.toolCallId && e.turnId === (event.turnId ?? 'turn-interrupted'));
+            const journalCall = journal.items.some((item) => item.type === 'tool_call' && item.callId === event.toolCallId);
+            if (!existing && !journalCall) {
                 state.toolLedger.push({
                     turnId: event.turnId ?? 'turn-interrupted',
                     callId: event.toolCallId,
@@ -423,17 +389,21 @@ function applyEvent(state, event, ts) {
                     startedAt: ts,
                 });
             }
-            const journal = getOrCreateJournal(state, ts, journalKeyForEvent(event, state), event.turnId);
             journal.toolStartedByCall.set(event.toolCallId, event.toolName);
             return;
         }
         case 'tool_result': {
             state.inFlightToolCalls.delete(event.callId);
-            let existing = state.toolLedger.find((e) => e.callId === event.callId);
+            let existing = [...state.toolLedger]
+                .reverse()
+                .find((e) => e.callId === event.callId &&
+                e.turnId === (event.turnId ?? 'turn-interrupted') &&
+                (event.occurrence === undefined || e.occurrence === event.occurrence));
             if (!existing) {
                 existing = {
                     turnId: event.turnId ?? 'turn-interrupted',
                     callId: event.callId,
+                    occurrence: event.occurrence,
                     toolName: event.toolName,
                     status: 'started',
                     startedAt: ts,
@@ -656,12 +626,23 @@ function applyEvent(state, event, ts) {
             return;
         }
         case 'assistant_turn': {
+            const authoritativeTurnId = event.turnId ?? `turn-${state.messages.filter((message) => message.sender === 'user').length || 1}`;
+            if (!event.snapshot) {
+                for (const journal of state.pendingJournals.values()) {
+                    if (journal.turnId === authoritativeTurnId ||
+                        (!event.turnId &&
+                            journal.userTurnIndex === state.messages.filter((message) => message.sender === 'user').length))
+                        mergeAssistantTurnIntoLedger(state, { items: journal.items }, journal.startedAt, authoritativeTurnId);
+                }
+            }
+            const alignedItems = alignHistoryToolOccurrences(event.turn.items, state.toolLedger.filter((entry) => entry.turnId === authoritativeTurnId));
+            const turn = { ...event.turn, items: pairToolOccurrences(alignedItems, authoritativeTurnId) };
             const currentUserTurnIndex = state.messages.filter((message) => message.sender === 'user').length;
             const lastUserIndex = state.messages.map((m) => m.sender).lastIndexOf('user');
             const startIndex = state.trailingUserMessage && lastUserIndex !== -1 ? lastUserIndex + 1 : state.activeTurnStartIndex;
             state.messages = state.messages.slice(0, startIndex);
             const turnId = `bot-turn-${state.messages.length}-${ts}`;
-            const replayedMessages = replayAssistantTurn(event.turn, turnId, event.usage, event.displayUsage);
+            const replayedMessages = replayAssistantTurn(turn, turnId, event.usage, event.displayUsage);
             for (const m of replayedMessages) {
                 state.messages.push(m);
             }
@@ -669,14 +650,15 @@ function applyEvent(state, event, ts) {
             const compactState = stateFromAssistantTurn(event);
             state.history = event.providerHistory
                 ? cloneValue(event.providerHistory)
-                : synthesizeHistoryFromAssistantTurn(state.history, event.turn);
+                : synthesizeHistoryFromAssistantTurn(state.history, turn);
             if (event.snapshot) {
                 const snap = cloneSnapshot(event.snapshot);
                 state.toolLedger = snap.toolLedger;
             }
             else {
-                mergeAssistantTurnIntoLedger(state, event.turn, ts, event.turnId);
+                mergeAssistantTurnIntoLedger(state, turn, ts, authoritativeTurnId);
             }
+            state.history = projectProviderHistory({ history: state.history, toolLedger: state.toolLedger }).history;
             state.previousResponseId = compactState.previousResponseId;
             state.snapshotModel = compactState.model ?? state.snapshotModel;
             state.snapshotProvider = compactState.provider ?? state.snapshotProvider;
@@ -836,72 +818,11 @@ function applyInterruptedTurnJournals(state) {
         // Append corresponding history items (tool call / tool result) so the
         // next resumed request sees them. Also rehydrate the tool ledger so
         // existing recovery semantics keep working.
-        let pendingReasoningHistoryItems = [];
-        for (const item of journal.items) {
-            if (item.type === 'reasoning') {
-                const historyItem = makeHistoryItemForReasoning(item);
-                state.history.push(historyItem);
-                pendingReasoningHistoryItems.push(historyItem);
-                continue;
-            }
-            if (item.type === 'provider_opaque') {
-                state.history.push(projectPersistedAssistantItemToProviderHistory(item));
-                pendingReasoningHistoryItems = [];
-                continue;
-            }
-            if (item.type === 'tool_call') {
-                const historyItem = makeHistoryItemForToolCall(item);
-                if (historyItem != null) {
-                    state.history.push(historyItem);
-                }
-                const existing = state.toolLedger.find((entry) => entry.callId === item.callId);
-                if (!existing) {
-                    state.toolLedger.push({
-                        turnId: journal.turnId ?? `turn-${journal.userTurnIndex}`,
-                        callId: item.callId,
-                        toolName: item.toolName,
-                        arguments: item.arguments,
-                        status: 'started',
-                        startedAt: journal.startedAt,
-                        historyItems: [...pendingReasoningHistoryItems, historyItem].filter(Boolean),
-                    });
-                }
-                else if (existing && (!existing.historyItems || existing.historyItems.length === 0)) {
-                    existing.historyItems = [...pendingReasoningHistoryItems, historyItem].filter(Boolean);
-                }
-                else if (existing) {
-                    existing.historyItems = withMissingReasoningPrefix(existing.historyItems, pendingReasoningHistoryItems);
-                }
-                pendingReasoningHistoryItems = [];
-            }
-            else if (item.type === 'tool_result') {
-                pendingReasoningHistoryItems = [];
-                const historyItem = makeHistoryItemForToolResult(item);
-                if (historyItem != null) {
-                    state.history.push(historyItem);
-                }
-                let existing = state.toolLedger.find((entry) => entry.callId === item.callId);
-                if (!existing) {
-                    existing = {
-                        turnId: journal.turnId ?? `turn-${journal.userTurnIndex}`,
-                        callId: item.callId,
-                        toolName: item.toolName,
-                        status: 'started',
-                        startedAt: journal.startedAt,
-                    };
-                    state.toolLedger.push(existing);
-                }
-                existing.status = item.status;
-                existing.output = item.output;
-                existing.completedAt = journal.startedAt;
-                const callHistoryItem = existing.historyItems?.find((historyItem) => normalizeRunItems([historyItem]).some((normalized) => normalized.type === 'tool_call' && normalized.callId === item.callId));
-                const previousHistoryItems = existing.historyItems ?? (callHistoryItem ? [callHistoryItem] : []);
-                existing.historyItems = appendToolResultIfMissing(previousHistoryItems, item.callId, historyItem).filter(Boolean);
-            }
-            else {
-                pendingReasoningHistoryItems = [];
-            }
-        }
+        const id = journal.turnId ?? `turn-${journal.userTurnIndex}`;
+        const turn = { items: pairToolOccurrences(journal.items, id) };
+        mergeAssistantTurnIntoLedger(state, turn, journal.startedAt, id);
+        // Text deltas are represented below; canonical text items are authoritative.
+        state.history = synthesizeHistoryFromAssistantTurn(state.history, turn);
         if (journal.reasoningFragment) {
             state.history.push({
                 type: 'reasoning',
@@ -961,6 +882,7 @@ const settleInterruptedToolEntries = (state) => {
                 {
                     type: 'function_call',
                     callId: entry.callId,
+                    ...toolOccurrenceMetadata(entry),
                     name: entry.toolName,
                     arguments: typeof entry.arguments === 'string' ? entry.arguments : JSON.stringify(entry.arguments ?? {}),
                 },
@@ -973,6 +895,7 @@ const settleInterruptedToolEntries = (state) => {
                 {
                     type: 'function_call_output',
                     callId: entry.callId,
+                    ...toolOccurrenceMetadata(entry),
                     output: RESTART_UNOBSERVED_TOOL_RESULT,
                 },
             ];
@@ -1214,6 +1137,8 @@ export function replayEvents(envelopes) {
         state.previousResponseId = null;
     }
     // Defensive idempotent final repair pass
+    state.toolLedger = normalizeToolLedgerOccurrences(state.toolLedger);
+    state.history = alignHistoryToolOccurrences(state.history, state.toolLedger);
     const repair = repairConversationHistory(state.history);
     if (repair.repaired && repair.removedItems > 0) {
         state.history = repair.history;