Skip to content

Commit 9a1d02c

Browse files
PierrunoYTclaude
andcommitted
fix(task): queue tool_results ahead of images from parallel tool calls
pushToolResult appended each tool's images right after its result, so parallel calls produced [result A, image, result B], which Anthropic rejects. Insert new results after the last existing result instead. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
1 parent baaae9e commit 9a1d02c

2 files changed

Lines changed: 34 additions & 5 deletions

File tree

‎src/core/task/Task.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,8 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
575575
}
576576

577577
/**
578-
* Push a tool_result block to userMessageContent, preventing duplicates.
578+
* Push a tool_result block to userMessageContent after any existing tool_results
579+
* (ahead of images and text), preventing duplicates.
579580
* Duplicate tool_use_ids cause API errors.
580581
*
581582
* @param toolResult - The tool_result block to add
@@ -592,7 +593,10 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
592593
)
593594
return false
594595
}
595-
this.userMessageContent.push(toolResult)
596+
// Keep results contiguous at the front: with parallel tool calls, an earlier tool's
597+
// images or text are already queued, and Anthropic needs every tool_result first.
598+
const lastResultIndex = findLastIndex(this.userMessageContent, (block) => block.type === "tool_result")
599+
this.userMessageContent.splice(lastResultIndex + 1, 0, toolResult)
596600
return true
597601
}
598602

‎src/core/task/__tests__/Task.spec.ts‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8171,6 +8171,30 @@ describe("pushToolResultToUserContent", () => {
81718171
warnSpy.mockRestore()
81728172
})
81738173

8174+
it("keeps tool_results ahead of images queued by earlier parallel tool calls", () => {
8175+
const task = new Task({
8176+
provider: mockProvider,
8177+
apiConfiguration: mockApiConfig,
8178+
task: "test task",
8179+
startTask: false,
8180+
})
8181+
const image: Anthropic.ImageBlockParam = {
8182+
type: "image",
8183+
source: { type: "base64", media_type: "image/png", data: "AAAA" },
8184+
}
8185+
const result = (id: string): Anthropic.ToolResultBlockParam => ({
8186+
type: "tool_result",
8187+
tool_use_id: id,
8188+
content: id,
8189+
})
8190+
8191+
task.pushToolResultToUserContent(result("A"))
8192+
task.userMessageContent.push(image)
8193+
task.pushToolResultToUserContent(result("B"))
8194+
8195+
expect(task.userMessageContent).toEqual([result("A"), result("B"), image])
8196+
})
8197+
81748198
it("should allow different tool_use_ids to be added", () => {
81758199
const task = new Task({
81768200
provider: mockProvider,
@@ -8247,8 +8271,9 @@ describe("pushToolResultToUserContent", () => {
82478271

82488272
expect(added).toBe(true)
82498273
expect(task.userMessageContent).toHaveLength(3)
8250-
expect(task.userMessageContent[0].type).toBe("text")
8251-
expect(task.userMessageContent[1].type).toBe("image")
8252-
expect(task.userMessageContent[2]).toEqual(toolResult)
8274+
// Tool results lead; other content keeps its relative order after them.
8275+
expect(task.userMessageContent[0]).toEqual(toolResult)
8276+
expect(task.userMessageContent[1].type).toBe("text")
8277+
expect(task.userMessageContent[2].type).toBe("image")
82538278
})
82548279
})

0 commit comments

Comments
 (0)