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

fix: improve tool call handling in OpenAI-compatible streaming mode

Browse source 
- Add validation for tool call structure before emitting chunks
- Ensure tool_calls array is properly validated
- Handle cases where delta might not exist or have expected structure
- Fixes issue where streaming tool calls would get stuck or create malformed file names

Fixes #9666
This commit is contained in:
Roo Code 2025-11-28 08:06:45 +00:00
parent e682c039de
commit 3b45a71f78
2 changed files with 46 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/api/providers/base-openai-compatible-provider.ts
View file

@ -137,15 +137,19 @@ export abstract class BaseOpenAiCompatibleProvider<ModelName extends string>
)
}
// Safely access delta with fallback
const delta = chunk.choices?.[0]?.delta
if (delta?.content) {
for (const processedChunk of matcher.update(delta.content)) {
yield processedChunk
}
}
// Only process if delta exists
if (delta) {
// Process content
if (delta.content) {
for (const processedChunk of matcher.update(delta.content)) {
yield processedChunk
}
}
// Process reasoning content
for (const key of ["reasoning_content", "reasoning"] as const) {
if (key in delta) {
const reasoning_content = ((delta as any)[key] as string | undefined) || ""
@ -155,21 +159,26 @@ export abstract class BaseOpenAiCompatibleProvider<ModelName extends string>
break
}
}
}
// Emit raw tool call chunks - NativeToolCallParser handles state management
if (delta?.tool_calls) {
for (const toolCall of delta.tool_calls) {
yield {
type: "tool_call_partial",
index: toolCall.index,
id: toolCall.id,
name: toolCall.function?.name,
arguments: toolCall.function?.arguments,
// Emit raw tool call chunks - NativeToolCallParser handles state management
// Ensure tool_calls is properly handled even if structure varies
if (delta.tool_calls && Array.isArray(delta.tool_calls)) {
for (const toolCall of delta.tool_calls) {
// Validate toolCall structure before emitting
if (toolCall && typeof toolCall.index === "number") {
yield {
type: "tool_call_partial",
index: toolCall.index,
id: toolCall.id,
name: toolCall.function?.name,
arguments: toolCall.function?.arguments,
}
}
}
}
}
// Process usage information
if (chunk.usage) {
lastUsage = chunk.usage
}

35
src/api/providers/openai.ts
View file

@ -211,14 +211,18 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
}
}
if (delta.tool_calls) {
// Emit raw tool call chunks with validation
if (delta.tool_calls && Array.isArray(delta.tool_calls)) {
for (const toolCall of delta.tool_calls) {
yield {
type: "tool_call_partial",
index: toolCall.index,
id: toolCall.id,
name: toolCall.function?.name,
arguments: toolCall.function?.arguments,
// Validate toolCall structure before emitting
if (toolCall && typeof toolCall.index === "number") {
yield {
type: "tool_call_partial",
index: toolCall.index,
id: toolCall.id,
name: toolCall.function?.name,
arguments: toolCall.function?.arguments,
}
}
}
}
@ -455,14 +459,17 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
}
// Emit raw tool call chunks - NativeToolCallParser handles state management
if (delta.tool_calls) {
if (delta.tool_calls && Array.isArray(delta.tool_calls)) {
for (const toolCall of delta.tool_calls) {
yield {
type: "tool_call_partial",
index: toolCall.index,
id: toolCall.id,
name: toolCall.function?.name,
arguments: toolCall.function?.arguments,
// Validate toolCall structure before emitting
if (toolCall && typeof toolCall.index === "number") {
yield {
type: "tool_call_partial",
index: toolCall.index,
id: toolCall.id,
name: toolCall.function?.name,
arguments: toolCall.function?.arguments,
}
}
}
}