From 905ec134b11b21de73955805ddc575e70117a620 Mon Sep 17 00:00:00 2001 From: Dan Smolsky Date: Mon, 16 Nov 2026 03:36:15 -0500 Subject: [PATCH] fix: pair V2 tool results with their own call when IDs repeat --- lib/v2/messages.ts | 22 +++++++++++++++------- tests/v2-messages.test.ts | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/lib/v2/messages.ts b/lib/v2/messages.ts index 62f0c737..d6b4a683 100644 --- a/lib/v2/messages.ts +++ b/lib/v2/messages.ts @@ -90,15 +90,23 @@ function output(content: ReadonlyArray<{ type: string; text?: string }>): unknow export function project(native: Message[], entries: History, session: Session) { const byID = new Map(entries.map((entry) => [entry.id, entry])) - const results = new Map() - const owners = new Map() + // Providers can reuse tool call IDs across turns, so pair each result with the + // closest preceding call that has the same ID. + const calls = new Map() + const results = new Map() + const owners = new Map() const links = new Map() const originals = new Map() const messages: WithParts[] = [] for (const message of native) for (const part of message.content) { - if (part.type === "tool-result") results.set(part.id, part) - if (part.type === "tool-call" && message.id) owners.set(part.id, message.id) + if (part.type === "tool-call") calls.set(part.id, { part, messageId: message.id }) + if (part.type === "tool-result") { + const call = calls.get(part.id) + if (!call) continue + results.set(call.part, part) + if (call.messageId) owners.set(part, call.messageId) + } } for (const message of native) { if (!message.id || !["user", "assistant"].includes(message.role)) continue @@ -121,7 +129,7 @@ export function project(native: Message[], entries: History, session: Session) { url: typeof part.data === "string" ? part.data : "", } if (part.type === "tool-call") { - const result = results.get(part.id) + const result = results.get(part) const entry = byID.get(message.id) const durable = entry?.type === "assistant" @@ -205,8 +213,8 @@ export function project(native: Message[], entries: History, session: Session) { if (part.type === "tool-call") content.push(...added.splice(0)) if ( part.type === "tool-result" && - originals.has(owners.get(part.id)!) && - !retained.has(owners.get(part.id)!) + originals.has(owners.get(part)!) && + !retained.has(owners.get(part)!) ) continue const edit = links.get(part) diff --git a/tests/v2-messages.test.ts b/tests/v2-messages.test.ts index 072c99f4..f615a10c 100644 --- a/tests/v2-messages.test.ts +++ b/tests/v2-messages.test.ts @@ -169,3 +169,40 @@ test("V2 inserts summaries after native checkpoints without an ordinary user mes assert.deepEqual(restored[0], native[0]) assert.deepEqual(restored[1]?.content, [{ type: "text", text: "CHECKPOINT_SUMMARY" }]) }) + +test("V2 compression keeps results paired when tool call IDs are reused", () => { + const call = (input: string) => ({ + type: "tool-call", + id: "bash:0", + name: "bash", + input: { command: input }, + }) + const result = (value: string) => ({ + role: "tool", + content: [ + { type: "tool-result", id: "bash:0", name: "bash", result: { type: "text", value } }, + ], + }) + const native = [ + { id: "msg_user", role: "user", content: [{ type: "text", text: "Run both" }] }, + { id: "msg_first", role: "assistant", content: [call("echo one")] }, + result("one"), + { id: "msg_second", role: "assistant", content: [call("echo two")] }, + result("two"), + { id: "msg_latest", role: "user", content: [{ type: "text", text: "Continue" }] }, + ] as Message[] + const view = project(native, entries(native), session) + const outputs = view.messages.flatMap((message) => + message.parts.flatMap((part) => (part.type === "tool" ? [part.state.output] : [])), + ) + assert.deepEqual(outputs, ["one", "two"]) + + const state = createSessionState("compact") + state.prune.messages.byMessageId.set("msg_first", { + tokenCount: 100, + allBlockIds: [1], + activeBlockIds: [1], + }) + prune(state, logger, config, view.messages) + assert.deepEqual(view.restore(), [native[0], native[3], native[4], native[5]]) +})