fix(openai-to-claude): unwrap bare {function:{…}} tools without parent type (#2473)

Translator only unwrapped tool.function when both tool.type==="function"
and tool.function were truthy. Loose/legacy OpenAI clients emit the bare
{ function: { name, parameters } } shape (no parent type), which fell
through and forwarded name: undefined upstream, rejected by strict
Anthropic-compatible gateways (MiniMax M3) as (2013) invalid tool type.

Unwrap tool.function whenever present. Built-in tools stay pass-through.
Adds regression coverage for the 4 tool shapes. See #2435.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Samir Abis
2026-07-10 11:09:52 +07:00
committed by decolua
parent 288940960a
commit ddd5509e97
2 changed files with 100 additions and 1 deletions

View File

@@ -153,7 +153,15 @@ Respond ONLY with the JSON object, no other text.`);
continue;
}
const toolData = toolType === OPENAI_BLOCK.FUNCTION && tool.function ? tool.function : tool;
// Function-shaped tools arrive in two flavors from real clients:
// (a) openai-spec: { type: "function", function: { name, ... } }
// (b) legacy/loose: { function: { name, ... } } (no parent `type`)
// Both must yield toolData.name = "echo". Treat the bare-function shape
// as a function tool too — Anthropic-compatible gateways (notably
// MiniMax M3 at api.minimaxi.com) reject payloads where this branch
// falls through with `toolData.name === undefined`, returning their
// upstream code (2013) "invalid tool type". See #2435.
const toolData = tool.function ?? tool;
const originalName = toolData.name;
// Claude OAuth requires prefixed tool names to avoid conflicts

View File

@@ -0,0 +1,91 @@
/**
* Regression: tools WITHOUT an explicit `type:"function"` wrapper were
* forwarded to the upstream Claude-compatible gateway with `name:"undefined"`,
* because openai-to-claude only unwrapped `tool.function` when BOTH
* `tool.type === "function"` AND `tool.function` were truthy.
*
* Repro path (v0.5.20):
* tools: [{ function: { name: "echo", parameters: {...} } }] // no parent type
* → originalName = undefined
* → upstream body: { name: "undefined", description: "", input_schema: {...} }
*
* Pragmatic OpenAI clients and some library generators emit the bare
* `function` wrapper shape; when this lands on a strict Anthropic-compatible
* gateway (e.g. MiniMax's `api.minimaxi.com/anthropic/v1/messages`), the
* payload is rejected with an "invalid tool type" / "(2013)" error, which
* is the same family of failure that PR #2463 was diagnosing from the
* runtimeTransport side. PR #2463 fixes the combo-path transport
* selection; this regression closes the translator-side shape gap so
* single-connection OpenAI clients aren't bit by it once #2463 lands.
*
* See: #2435, follow-up to PR #2463.
*/
import { describe, it, expect } from "vitest";
import { openaiToClaudeRequest } from "../../open-sse/translator/request/openai-to-claude.js";
const baseBody = (extra = {}) => ({
messages: [{ role: "user", content: "hi" }],
...extra,
});
describe("openai→claude: tools shape fidelity", () => {
it("tool WITH explicit type:'function' is rewritten to Anthropic shape", () => {
const out = openaiToClaudeRequest("claude-sonnet-4.5", baseBody({
tools: [
{ type: "function", function: { name: "echo", parameters: { type: "object" } } },
],
}), false);
expect(out.tools).toHaveLength(1);
expect(out.tools[0].name).toBe("echo");
expect(out.tools[0].input_schema).toEqual({ type: "object" });
// Anthropic-shape has no top-level `type` and no nested `function`.
expect(out.tools[0]).not.toHaveProperty("type");
expect(out.tools[0]).not.toHaveProperty("function");
});
it("tool WITHOUT explicit type but WITH function wrapper preserves the original name (was 'undefined' in v0.5.20)", () => {
const out = openaiToClaudeRequest("claude-sonnet-4.5", baseBody({
tools: [
{ function: { name: "echo", parameters: { type: "object" } } },
],
}), false);
expect(out.tools).toHaveLength(1);
expect(out.tools[0].name).toBe("echo");
expect(out.tools[0].input_schema).toEqual({ type: "object" });
// The Anthropic-shape envelope strips the OpenAI `function` wrapper entirely.
expect(out.tools[0]).not.toHaveProperty("function");
expect(out.tools[0]).not.toHaveProperty("type");
});
it("flat Anthropic-shape tool (no function wrapper) is passed through with name preserved", () => {
const out = openaiToClaudeRequest("claude-sonnet-4.5", baseBody({
tools: [
{ name: "echo", description: "echo input", input_schema: { type: "object" } },
],
}), false);
expect(out.tools).toHaveLength(1);
expect(out.tools[0].name).toBe("echo");
expect(out.tools[0].description).toBe("echo input");
expect(out.tools[0].input_schema).toEqual({ type: "object" });
});
it("non-function built-in tool types are passed through (cache_control tag is OK)", () => {
// 9router adds a `cache_control` tag to the last tool for prompt caching;
// the test asserts the original shape is preserved alongside it rather
// than checking strict equality. This is the existing buildHeaders /
// cache_control behavior unchanged by this fix.
const out = openaiToClaudeRequest("claude-sonnet-4.5", baseBody({
tools: [
{ type: "web_search_20250305", name: "web_search" },
],
}), false);
expect(out.tools).toHaveLength(1);
expect(out.tools[0].type).toBe("web_search_20250305");
expect(out.tools[0].name).toBe("web_search");
});
});