scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-05 08:10:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: address PR review feedback (Grok-4 reasoning skip, TS issues)

Browse source
This commit is contained in:
Hannes Rudolph 2025-11-19 18:25:05 -07:00
parent b150cd4f44
commit 575d71c23b
2 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/api/providers/openrouter.ts
View file

@ -124,6 +124,11 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
}
}
private shouldSkipReasoningForModel(modelId: string): boolean {
// Grok-4 models shouldn't use reasoning by default
return modelId.includes("grok-4")
}
override async *createMessage(
systemPrompt: string,
messages: Anthropic.Messages.MessageParam[],
@ -145,6 +150,11 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
reasoning = { exclude: true }
}
// Skip reasoning for Grok-4 as mentioned in the PR description
if (this.shouldSkipReasoningForModel(modelId) && typeof reasoning === "undefined") {
reasoning = { exclude: true }
}
// Convert Anthropic messages to OpenAI format.
let openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
{ role: "system", content: systemPrompt },

33
src/api/transform/openai-format.ts
View file

@ -110,21 +110,16 @@ export function convertToOpenAiMessages(
// Process non-tool messages
let content: string | undefined
const reasoningDetails: any[] = []
const reasoningDetails: ReasoningDetail[] = []
if (nonToolMessages.length > 0) {
nonToolMessages.forEach((part) => {
// @ts-ignore-next-line
if (part.type === "text" && part.reasoning_details) {
// @ts-ignore-next-line
if (Array.isArray(part.reasoning_details)) {
// @ts-ignore-next-line
reasoningDetails.push(...part.reasoning_details)
if (part.type === "text" && "reasoning_details" in part) {
const details = (part as any).reasoning_details
if (Array.isArray(details)) {
reasoningDetails.push(...details)
} else {
// @ts-ignore-next-line
reasoningDetails.push(part.reasoning_details)
reasoningDetails.push(details)
}
// @ts-ignore-next-line
// delete part.reasoning_details
}
})
content = nonToolMessages
@ -148,19 +143,23 @@ export function convertToOpenAiMessages(
},
}))
// @ts-ignore-next-line
const consolidatedReasoning =
reasoningDetails.length > 0 ? consolidateReasoningDetails(reasoningDetails) : undefined
openAiMessages.push({
const assistantMessage: OpenAI.Chat.ChatCompletionAssistantMessageParam & {
reasoning_details?: ReasoningDetail[]
} = {
role: "assistant",
content,
// Cannot be an empty array. API expects an array with minimum length 1, and will respond with an error if it's empty
tool_calls: tool_calls.length > 0 ? tool_calls : undefined,
// @ts-ignore-next-line
reasoning_details:
consolidatedReasoning && consolidatedReasoning.length > 0 ? consolidatedReasoning : undefined,
})
}
if (consolidatedReasoning && consolidatedReasoning.length > 0) {
assistantMessage.reasoning_details = consolidatedReasoning
}
openAiMessages.push(assistantMessage)
}
}
}