Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions src/api/providers/openai-codex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -925,22 +925,12 @@ export class OpenAiCodexHandler extends BaseProvider implements SingleCompletion
}
}

// Only handle tool/function calls from done events (to ensure arguments are complete)
if (
(item.type === "function_call" || item.type === "tool_call") &&
event.type === "response.output_item.done"
) {
const callId = item.call_id || item.tool_call_id || item.id
if (callId) {
const args = item.arguments || item.function?.arguments || item.function_arguments
yield {
type: "tool_call",
id: callId,
name: item.name || item.function?.name || item.function_name || "",
arguments: typeof args === "string" ? args : "{}",
}
}
}
// Note: We intentionally do NOT emit tool_call from response.output_item.done
// for function_call/tool_call items. The streaming path handles tool calls via:
// 1. tool_call_partial events during argument deltas
// 2. NativeToolCallParser.finalizeRawChunks() at stream end emitting tool_call_end
// 3. NativeToolCallParser.finalizeStreamingToolCall() creating the final ToolUse
// Emitting tool_call here would cause duplicate tool rendering.
}
return
}
Expand Down
24 changes: 6 additions & 18 deletions src/api/providers/openai-native.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1241,24 +1241,12 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio
}
}

// Only handle tool/function calls from done events (to ensure arguments are complete)
if (
(item.type === "function_call" || item.type === "tool_call") &&
event.type === "response.output_item.done"
) {
// Handle complete tool/function call item
// Emit as tool_call for backward compatibility with non-streaming tool handling
const callId = item.call_id || item.tool_call_id || item.id
if (callId) {
const args = item.arguments || item.function?.arguments || item.function_arguments
yield {
type: "tool_call",
id: callId,
name: item.name || item.function?.name || item.function_name || "",
arguments: typeof args === "string" ? args : "{}",
}
}
}
// Note: We intentionally do NOT emit tool_call from response.output_item.done
// for function_call/tool_call items. The streaming path handles tool calls via:
// 1. tool_call_partial events during argument deltas
// 2. NativeToolCallParser.finalizeRawChunks() at stream end emitting tool_call_end
// 3. NativeToolCallParser.finalizeStreamingToolCall() creating the final ToolUse
// Emitting tool_call here would cause duplicate tool rendering.
}
return
}
Expand Down
Loading