fix: address PR review comments

daniel-lxs · claude · daniel-lxs · commit e37585fa87fc · 2026-02-11T13:03:24.000-05:00
- Remove redundant double cast in bedrock.ts (as ModelMessage[] as ModelMessage[])
- Use isAnyToolCallBlock/getToolCallId in condense orphan filter to handle
  both AI SDK tool-call and legacy tool_use formats
- Fix misleading comment and remove dead conditional in processUserContentMentions

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/src/api/providers/bedrock.ts b/src/api/providers/bedrock.ts
@@ -205,7 +205,7 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 		})
 
 		// Convert messages to AI SDK format
-		const aiSdkMessages = filteredMessages as ModelMessage[] as ModelMessage[]
+		const aiSdkMessages = filteredMessages as ModelMessage[]
 
 		// Convert tools to AI SDK format
 		let openAiTools = this.convertToolsForOpenAI(metadata?.tools)
diff --git a/src/core/condense/index.ts b/src/core/condense/index.ts
@@ -605,8 +605,8 @@ export function getEffectiveApiHistory(messages: RooMessage[]): RooMessage[] {
 		for (const msg of messagesFromSummary) {
 			if (isRooAssistantMessage(msg) && Array.isArray(msg.content)) {
 				for (const part of msg.content) {
-					if (part.type === "tool-call") {
-						toolCallIds.add((part as ToolCallPart).toolCallId)
+					if (isAnyToolCallBlock(part as { type: string })) {
+						toolCallIds.add(getToolCallId(part as AnyToolCallBlock))
 					}
 				}
 			}
diff --git a/src/core/mentions/processUserContentMentions.ts b/src/core/mentions/processUserContentMentions.ts
@@ -101,12 +101,8 @@ export async function processUserContentMentions({
 					return block
 				}
 
-				// Legacy backward compat: filter out any tool_result / tool-result blocks
-				// that may still exist in persisted data from older formats.
-				if ((block as any).type === "tool_result" || (block as any).type === "tool-result") {
-					return block
-				}
-
+				// Legacy backward compat: tool_result / tool-result blocks from older formats
+				// are passed through unchanged (tool results are now in separate RooToolMessages).
 				return block
 			}),
 		)

Original file line number	Diff line number	Diff line change
`@@ -605,8 +605,8 @@ export function getEffectiveApiHistory(messages: RooMessage[]): RooMessage[] {`
`605`	`605`	`for (const msg of messagesFromSummary) {`
`606`	`606`	`if (isRooAssistantMessage(msg) && Array.isArray(msg.content)) {`
`607`	`607`	`for (const part of msg.content) {`
`608`		`- if (part.type === "tool-call") {`
`609`		`- toolCallIds.add((part as ToolCallPart).toolCallId)`
	`608`	`+ if (isAnyToolCallBlock(part as { type: string })) {`
	`609`	`+ toolCallIds.add(getToolCallId(part as AnyToolCallBlock))`
`610`	`610`	`}`
`611`	`611`	`}`
`612`	`612`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,8 @@ export async function processUserContentMentions({`
`101`	`101`	`return block`
`102`	`102`	`}`
`103`	`103`
`104`		`- // Legacy backward compat: filter out any tool_result / tool-result blocks`
`105`		`- // that may still exist in persisted data from older formats.`
`106`		`- if ((block as any).type === "tool_result" \|\| (block as any).type === "tool-result") {`
`107`		`- return block`
`108`		`- }`
`109`		`-`
	`104`	`+ // Legacy backward compat: tool_result / tool-result blocks from older formats`
	`105`	`+ // are passed through unchanged (tool results are now in separate RooToolMessages).`
`110`	`106`	`return block`
`111`	`107`	`}),`
`112`	`108`	`)`