luulam/9router
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(claude): forced tool_choice 400 on cc/ OAuth route

Browse Source 
convertOpenAIToolChoice mapped {type:"function"} verbatim and cloakClaudeTools
left tool_choice.name unsuffixed, both rejected by Claude on the cc/ path.
Map forced-function to {type:"tool",name}, allowlist Claude-valid types, and
suffix tool_choice.name when it targets a renamed client tool.

Fixes #1592

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Claude Code
2026-06-06 12:54:01 +07:00
committed by decolua
parent 64f58420db
commit c785051360
4 changed files with 167 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
open-sse/translator/request/openai-to-claude.js
View File

@@ -291,15 +291,35 @@ function getContentBlocksFromMessage(msg, toolNameMap = new Map()) {
return blocks;
}
// Convert OpenAI tool choice to Claude format
// Convert OpenAI tool choice to Claude format.
// Claude only accepts tool_choice.type of "auto" | "any" | "tool" | "none";
// anything else (e.g. OpenAI's "function") triggers a 400, so we never pass an
// unrecognized type through.
const CLAUDE_TOOL_CHOICE_TYPES = new Set(["auto", "any", "tool", "none"]);
function convertOpenAIToolChoice(choice) {
if (!choice) return { type: "auto" };
if (typeof choice === "object" && choice.type) return choice;
if (choice === "auto" || choice === "none") return { type: "auto" };
if (choice === "required") return { type: "any" };
if (typeof choice === "object" && choice.function) {
return { type: "tool", name: choice.function.name };
// OpenAI string forms: "auto" | "none" | "required"
if (typeof choice === "string") {
if (choice === "required") return { type: "any" };
return { type: "auto" }; // "auto", "none", or anything unexpected
}
if (typeof choice === "object") {
// OpenAI forced tool: { type: "function", function: { name } }.
// Checked before the native pass-through below, because the OpenAI shape
// also carries a `.type` ("function") that Claude rejects.
if (choice.function?.name) {
return { type: "tool", name: choice.function.name };
}
// Already Claude-native — only pass through types Claude actually accepts,
// so a malformed or unknown type can never leak into the upstream request.
if (CLAUDE_TOOL_CHOICE_TYPES.has(choice.type)) {
return choice;
}
}
return { type: "auto" };
}