fix: occur error when return multiple tool in once stream

Author: NaccOll

src/core/assistant-message/AssistantMessageParser.ts

@@ -99,6 +99,9 @@ export class AssistantMessageParser {
 				const currentToolValue = this.accumulator.slice(this.currentToolUseStartIndex)
 				const toolUseClosingTag = `</${this.currentToolUse.name}>`
 				if (currentToolValue.endsWith(toolUseClosingTag)) {
+					if (toolCallParam?.anthropicContent && this.currentToolUse) {
+						this.currentToolUse.toolUseParam = toolCallParam.anthropicContent
+					}
 					// End of a tool use.
 					this.currentToolUse.partial = false
 

src/core/assistant-message/parseAssistantMessage.ts

@@ -48,6 +48,9 @@ export function parseAssistantMessage(
 			const currentToolValue = accumulator.slice(currentToolUseStartIndex)
 			const toolUseClosingTag = `</${currentToolUse.name}>`
 			if (currentToolValue.endsWith(toolUseClosingTag)) {
+				if (toolCallParam?.anthropicContent && currentToolUse) {
+					currentToolUse.toolUseParam = toolCallParam.anthropicContent
+				}
 				// End of a tool use.
 				currentToolUse.partial = false
 				contentBlocks.push(currentToolUse)

src/core/assistant-message/presentAssistantMessage.ts

@@ -5,7 +5,7 @@ import type { ToolName, ClineAsk, ToolProgressStatus } from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
 
 import { defaultModeSlug, getModeBySlug } from "../../shared/modes"
-import type { ToolParamName, ToolResponse } from "../../shared/tools"
+import type { ToolParamName, ToolResponse, ToolUse } from "../../shared/tools"
 
 import { fetchInstructionsTool } from "../tools/fetchInstructionsTool"
 import { listFilesTool } from "../tools/listFilesTool"
@@ -245,11 +245,20 @@ export async function presentAssistantMessage(cline: Task) {
 			}
 
 			if (cline.didAlreadyUseTool) {
-				// Ignore any content after a tool has already been used.
-				cline.userMessageContent.push({
+				const rejectMessage: Anthropic.TextBlockParam = {
 					type: "text",
 					text: `Tool [${block.name}] was not executed because a tool has already been used in this message. Only one tool may be used per message. You must assess the first tool's result before proceeding to use the next tool.`,
-				})
+				}
+				if (!block.toolUseId) {
+					// Ignore any content after a tool has already been used.
+					cline.userMessageContent.push(rejectMessage)
+				} else {
+					cline.userMessageContent.push({
+						type: "tool_result",
+						tool_use_id: block.toolUseId,
+						content: [rejectMessage],
+					})
+				}
 
 				break
 			}
@@ -266,9 +275,11 @@ export async function presentAssistantMessage(cline: Task) {
 
 				let hasSet = false
 				if (toolCallEnabled) {
-					const lastToolUseMessage = cline.assistantMessageContent.find((msg) => msg.type === "tool_use")
-					if (lastToolUseMessage && lastToolUseMessage.toolUseId) {
-						const toolUseId = lastToolUseMessage.toolUseId
+					const lastToolUseMessage = cline.assistantMessageContent.find(
+						(msg) => msg.type === "tool_use" && block.toolUseId && msg.toolUseId === block.toolUseId,
+					) as ToolUse
+					if (lastToolUseMessage) {
+						const toolUseId = block.toolUseId!
 						let toolResultMessage = cline.userMessageContent.find(
 							(msg) => msg.type === "tool_result" && msg.tool_use_id === toolUseId,
 						)

src/core/task/Task.ts

@@ -2125,27 +2125,34 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 							content: [{ type: "text", text: assistantMessage }],
 						})
 					} else {
+						let firstTool = true
+						let addToolIds: Set<string> = new Set()
+						const newAssistantMessageContent: Array<Anthropic.ContentBlockParam> = []
 						for (const block of this.assistantMessageContent) {
 							if (block.type === "text" && block.content) {
-								await this.addToApiConversationHistory({
-									role: "assistant",
-									content: [{ type: "text", text: block.content }],
-								})
+								newAssistantMessageContent.push({ type: "text", text: block.content })
 							}
 							if (block.type === "tool_use" && block.toolUseId && block.toolUseParam) {
-								await this.addToApiConversationHistory({
-									role: "assistant",
-									content: [
-										{
-											type: "tool_use",
-											id: block.toolUseId,
-											name: block.name,
-											input: block.toolUseParam.input,
-										},
-									],
+								// ignore same tool id
+								if (addToolIds.has(block.toolUseId)) {
+									continue
+								}
+								newAssistantMessageContent.push({
+									type: "tool_use",
+									id: block.toolUseId,
+									name: block.name,
+									input: block.toolUseParam.input,
 								})
+								addToolIds.add(block.toolUseId)
+								firstTool = false
 							}
 						}
+						if (newAssistantMessageContent.length > 0) {
+							await this.addToApiConversationHistory({
+								role: "assistant",
+								content: newAssistantMessageContent,
+							})
+						}
 					}
 
 					TelemetryService.instance.captureConversationMessage(this.taskId, "assistant")

src/core/task/tool-call-helper.ts

@@ -103,9 +103,9 @@ export class StreamingToolCallProcessor {
 	 */
 	private processChunkOpenAIFormat(chunk: any): ToolCallParam {
 		let xmlOutput = ""
-
+		let index = 0
 		for (const delta of chunk) {
-			const index = delta.index || 0
+			index = delta.index || 0
 
 			// Initialize state for a new tool call.
 			if (!this.accumulatedToolCalls[index]) {
@@ -152,20 +152,19 @@ export class StreamingToolCallProcessor {
 			}
 		}
 		// the index of GPT-5 tool_call not start by 0
-		const firstIndex = this.accumulatedToolCalls.findIndex((call) => call?.id)
-		const firstToolCall = this.accumulatedToolCalls[firstIndex]
+		const toolCall = this.accumulatedToolCalls[index]
 		const result: ToolCallParam = {
 			providerType: "openai",
-			toolName: firstToolCall?.function?.name,
-			toolUserId: firstToolCall.id || undefined,
+			toolName: toolCall?.function?.name,
+			toolUserId: toolCall.id || undefined,
 			chunkContent: xmlOutput,
 			originContent: this.accumulatedToolCalls,
 		}
 
-		if (this.processingStates.get(firstIndex)?.functionClosed) {
+		if (this.processingStates.get(index)?.functionClosed) {
 			let input
 			try {
-				input = JSON.parse(firstToolCall.function.arguments)
+				input = JSON.parse(toolCall.function.arguments)
 			} catch (e) {
 				input = ""
 			}