fix(bedrock): order tool results first

Keep Bedrock user tool_result blocks ahead of image and text blocks so parallel image tool results satisfy the native tool protocol.

Bump extension package to 4.99.5.

Author: allquixotic

src/api/transform/__tests__/bedrock-converse-format.spec.ts

@@ -345,6 +345,44 @@ describe("convertToBedrockConverseMessages", () => {
 		expect("text" in userContent).toBe(false)
 	})
 
+	it("moves all user tool results before images and text for Bedrock native tool protocol", () => {
+		const messages: Anthropic.Messages.MessageParam[] = [
+			{
+				role: "assistant",
+				content: [
+					{ type: "tool_use", id: "call-1", name: "read_file", input: { path: "a.png" } },
+					{ type: "tool_use", id: "call-2", name: "read_file", input: { path: "b.png" } },
+					{ type: "tool_use", id: "call-3", name: "read_file", input: { path: "c.png" } },
+				],
+			},
+			{
+				role: "user",
+				content: [
+					{ type: "tool_result", tool_use_id: "call-1", content: "Read a.png" } as any,
+					testImageBlock(),
+					{ type: "tool_result", tool_use_id: "call-2", content: "Read b.png" } as any,
+					testImageBlock(),
+					{ type: "tool_result", tool_use_id: "call-3", content: "Read c.png" } as any,
+					testImageBlock(),
+					{ type: "text", text: "Screenshots attached." },
+				],
+			},
+		]
+
+		const result = convertToBedrockConverseMessages(messages)
+		const userContent = result[1]?.content ?? []
+
+		expect(userContent.map(bedrockBlockKind)).toEqual([
+			"toolResult:call-1",
+			"toolResult:call-2",
+			"toolResult:call-3",
+			"image",
+			"image",
+			"image",
+			"text",
+		])
+	})
+
 	it("handles text content correctly", () => {
 		const messages: Anthropic.Messages.MessageParam[] = [
 			{
@@ -585,3 +623,27 @@ describe("convertToBedrockConverseMessages", () => {
 		})
 	})
 })
+
+function testImageBlock(): Anthropic.Messages.ImageBlockParam {
+	return {
+		type: "image",
+		source: {
+			type: "base64",
+			data: "SGVsbG8=",
+			media_type: "image/png",
+		},
+	}
+}
+
+function bedrockBlockKind(block: ContentBlock): string {
+	if ("toolResult" in block && block.toolResult) {
+		return `toolResult:${block.toolResult.toolUseId}`
+	}
+	if ("image" in block && block.image) {
+		return "image"
+	}
+	if ("text" in block) {
+		return "text"
+	}
+	return "unknown"
+}

src/api/transform/bedrock-converse-format.ts

@@ -44,8 +44,11 @@ export function convertToBedrockConverseMessages(anthropicMessages: Anthropic.Me
 			}
 		}
 
+		const anthropicContent =
+			role === "user" ? orderUserContentForBedrock(anthropicMessage.content) : anthropicMessage.content
+
 		// Process complex content types
-		const content = anthropicMessage.content.map((block) => {
+		const content = anthropicContent.map((block) => {
 			const messageBlock = block as BedrockMessageContent & {
 				id?: string
 				tool_use_id?: string
@@ -209,3 +212,17 @@ export function convertToBedrockConverseMessages(anthropicMessages: Anthropic.Me
 		}
 	})
 }
+
+function orderUserContentForBedrock(
+	content: Anthropic.Messages.ContentBlockParam[],
+): Anthropic.Messages.ContentBlockParam[] {
+	const toolResults = content.filter((block) => block.type === "tool_result")
+
+	if (toolResults.length === 0) {
+		return content
+	}
+
+	const remainingBlocks = content.filter((block) => block.type !== "tool_result")
+
+	return [...toolResults, ...remainingBlocks]
+}

src/package.json

@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "allquixotic",
-	"version": "4.99.4",
+	"version": "4.99.5",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",