mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-21 06:12:17 +03:00
* fix(translator): Normalize tool call names from lowercase to PascalCase (#1) * Fix: Map lowercase tool names from Antigravity (Gemini format) to Claude Code expected PascalCase * Fix: toolNameMap in fun restoreClaudePassthroughToolUseName * fix(translator): Normalize tool call names from lowercase to PascalCase when translating upstream responses (OpenAI, Gemini, Antigravity) to Claude Messages API format This resolves `Error: No such tool available: read`/`bash`/`write` errors when using Claude Code CLI with third-party providers that emit lowercase tool names. The fix adds case-insensitive tool name lookups in `openai-to-claude.ts`, `gemini-to-claude.ts`, and related translators, ensuring tool names like `read`/`bash` are mapped to `Read`/`Bash` before being sent to Claude Code. Includes unit tests and comprehensive changelog notes ([#10250](https://github.com/diegosouzapw/OmniRoute/pull/10250)) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com> * fix(translator): Parse <tool_call> JSON and TOOL_CALL text formats fr… (#2) * fix(translator): Parse <tool_call> JSON and TOOL_CALL text formats from model output Some models (DeepSeek, Qwen) emit tool calls as text instead of proper tool_calls JSON: either <tool_call>{...}</tool_call> or TOOL_CALL Name: {...}. Extend extractXmlInvokeBlocks to handle all 3 formats in a single scan pass, picking whichever pattern appears first. Includes unit tests for all formats. * fix(translator): Parse text-format tool calls in gemini-to-claude translator Extend the Gemini->Claude translator to detect <invoke>, <tool_call> JSON, and TOOL_CALL text formats emitted inline in text parts (Antigravity/Gemini models), converting them to proper tool_use content blocks instead of leaking raw text to Claude Code. * docs(changelog): Add changelog entry for text tool call parsing fix * fix(translator): consolidate tool name casing normalization and restore thought-signature persistence (#3) * fix(translator): sanitize tool_use.id and tool_result.tool_use_id to match Anthropic schema (#4) Ensure tool IDs from OpenAI-compatible upstreams (which may contain dots, colons, or special characters) are sanitized to ^[a-zA-Z0-9_-]+$ in response translators and passthrough requests before reaching Claude endpoints. * fix(responses): preserve native tools for openai-compatible Responses targets (#5) A Responses-shaped request to a custom openai-compatible connection whose outbound protocol is Responses took a Responses -> Chat -> Responses round trip, so Codex custom tools lost their grammar (`exec`), namespace groups were flattened (`collaboration`), and tool invocations failed upstream. Gate a native Responses passthrough on the connection's configured protocol (`apiType: "responses"` / `_omnirouteForceResponsesUpstream`) so the original tool definitions reach a Responses-capable upstream unchanged. Chat-only connections keep the existing downgrade. Closes #10374 * fix(translator): add support for 'applypatch' tool name in tool call checks * test(translator): add unit test for apply_patch and applypatch tool name remapping * fix(translator): remove no-explicit-any lint errors in tool-use-id-sanitization test Type the openaiToClaudeResponse/translateNonStreamingResponse return values with narrow local shapes instead of `any`, satisfying the repo's no-explicit-any = error rule for tests/. No behavior change — the same 3 assertions still pass. Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com> * test: update 9568 casing regression to match #10392's consolidated fix restoreClaudeToolName's static casing map now normalizes known lowercase tool names to canonical PascalCase unconditionally on the gemini-to-claude and openai-to-claude Claude Messages API paths (not gated behind toolNameMap), superseding the earlier per-map-only fix that the original #9568 regression test locked in as "expected" (it was previously labeled a known bug case). The gemini-to-openai passthrough path is unaffected by #10392 and keeps its original pass-through assertion. Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
744 lines
30 KiB
TypeScript
744 lines
30 KiB
TypeScript
// Claude helper functions for translator
|
|
import { DEFAULT_THINKING_CLAUDE_SIGNATURE } from "../../config/defaultThinkingSignature.ts";
|
|
import { lookupReasoning, recordReplay } from "../../services/reasoningCache.ts";
|
|
import { getModelTargetFormat } from "../../config/providerModels.ts";
|
|
import { NON_ANTHROPIC_THINKING_PLACEHOLDER } from "../../utils/reasoningPlaceholder.ts";
|
|
import { sanitizeToolId } from "./schemaCoercion.ts";
|
|
|
|
export { NON_ANTHROPIC_THINKING_PLACEHOLDER } from "../../utils/reasoningPlaceholder.ts";
|
|
|
|
// MiniMax exposes a Claude-compatible endpoint but rejects Anthropic's extended
|
|
// `output_config` parameter (used to steer reasoning effort and structured output)
|
|
// with a generic 400 "invalid params" response. Strip the entire field before
|
|
// dispatching Claude-shape requests to these providers. Anthropic Claude and
|
|
// other Claude-compatible upstreams that do accept it are unaffected.
|
|
// Ported from upstream decolua/9router#820 by @hiepau1231.
|
|
const CLAUDE_FORMAT_PROVIDERS_WITHOUT_OUTPUT_CONFIG = new Set<string>(["minimax", "minimax-cn"]);
|
|
|
|
// Placeholder thinking text used as last-resort fallback when:
|
|
// - Target upstream is a non-Anthropic Claude-shape provider
|
|
// (kimi-coding, glmt, zai, …) that rejects redacted_thinking blobs
|
|
// - Client (e.g. Capy) sent only redacted_thinking on replay
|
|
// - reasoningCache has no entry for the corresponding tool_use.id
|
|
// Must be non-empty: kimi-coding treats empty `thinking.thinking` as
|
|
// `reasoning_content missing` and 400s.
|
|
type ClaudeContentBlock = {
|
|
type?: string;
|
|
text?: string;
|
|
name?: string;
|
|
tool_use_id?: string;
|
|
cache_control?: unknown;
|
|
signature?: string;
|
|
thinking?: string;
|
|
[key: string]: unknown;
|
|
};
|
|
|
|
type ClaudeMessage = {
|
|
role?: string;
|
|
content?: string | ClaudeContentBlock[];
|
|
[key: string]: unknown;
|
|
};
|
|
|
|
type ClaudeTool = {
|
|
name?: string;
|
|
defer_loading?: boolean;
|
|
cache_control?: unknown;
|
|
[key: string]: unknown;
|
|
};
|
|
|
|
type ClaudeRequestBody = {
|
|
system?: Array<Record<string, unknown> & { cache_control?: unknown }>;
|
|
messages?: ClaudeMessage[];
|
|
tools?: ClaudeTool[];
|
|
thinking?: Record<string, unknown> | null;
|
|
[key: string]: unknown;
|
|
};
|
|
|
|
type KimiThinkingInput = {
|
|
reasoning_effort?: unknown;
|
|
thinking?: { effort?: unknown; type?: unknown } | null;
|
|
};
|
|
|
|
export function applyKimiCodingThinking(
|
|
result: Record<string, unknown>,
|
|
body: KimiThinkingInput
|
|
): void {
|
|
if (!body.thinking && !body.reasoning_effort) return;
|
|
const requestedEffort = String(
|
|
body.reasoning_effort ?? body.thinking?.effort ?? "on"
|
|
).toLowerCase();
|
|
const disabled = body.thinking?.type === "disabled" || ["off", "none"].includes(requestedEffort);
|
|
result.thinking = { type: disabled ? "disabled" : "enabled" };
|
|
if (!disabled && !["on", "auto"].includes(requestedEffort)) {
|
|
const outputConfig =
|
|
result.output_config && typeof result.output_config === "object"
|
|
? (result.output_config as Record<string, unknown>)
|
|
: {};
|
|
result.output_config = { ...outputConfig, effort: requestedEffort };
|
|
}
|
|
}
|
|
|
|
// Check if message has valid non-empty content
|
|
export function hasValidContent(msg: ClaudeMessage): boolean {
|
|
if (typeof msg.content === "string" && msg.content.trim()) return true;
|
|
if (Array.isArray(msg.content)) {
|
|
return msg.content.some(
|
|
(block) =>
|
|
(block.type === "text" && block.text?.trim()) ||
|
|
(block.type === "thinking" && block.thinking?.trim()) ||
|
|
(block.type === "redacted_thinking" &&
|
|
typeof block.data === "string" &&
|
|
block.data.trim()) ||
|
|
block.type === "tool_use" ||
|
|
block.type === "tool_result" ||
|
|
// #7777: media-only user turns are real content — dropping them
|
|
// silently deletes vision input on the CC bridge / Claude paths.
|
|
block.type === "image" ||
|
|
block.type === "document"
|
|
);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// Move tool_result blocks out of assistant messages into the preceding user
|
|
// turn. Anthropic 400s on tool_result inside assistant. Drop tool_results
|
|
// whose tool_use_id has not been emitted by an earlier assistant turn —
|
|
// keeping them just shifts the 400 to "unexpected tool_use_id". See #2815.
|
|
export function splitMisplacedToolResults(messages: ClaudeMessage[]): ClaudeMessage[] {
|
|
if (!Array.isArray(messages) || messages.length === 0) return messages;
|
|
|
|
const out: ClaudeMessage[] = [];
|
|
const seenToolUseIds = new Set<string>();
|
|
|
|
const recordToolUseIds = (blocks: ClaudeContentBlock[]) => {
|
|
for (const b of blocks) {
|
|
if (b?.type === "tool_use" && typeof b.id === "string") {
|
|
seenToolUseIds.add(b.id);
|
|
}
|
|
}
|
|
};
|
|
|
|
for (const msg of messages) {
|
|
if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
|
|
out.push(msg);
|
|
continue;
|
|
}
|
|
|
|
const toolResults = msg.content.filter((b) => b?.type === "tool_result");
|
|
if (toolResults.length === 0) {
|
|
out.push(msg);
|
|
recordToolUseIds(msg.content);
|
|
continue;
|
|
}
|
|
|
|
const validToolResults = toolResults.filter(
|
|
(b) => typeof b?.tool_use_id === "string" && seenToolUseIds.has(b.tool_use_id)
|
|
);
|
|
const remaining = msg.content.filter((b) => b?.type !== "tool_result");
|
|
|
|
if (validToolResults.length > 0) {
|
|
const prev = out[out.length - 1];
|
|
if (prev && prev.role === "user" && Array.isArray(prev.content)) {
|
|
out[out.length - 1] = { ...prev, content: [...prev.content, ...validToolResults] };
|
|
} else {
|
|
out.push({ role: "user", content: validToolResults });
|
|
}
|
|
}
|
|
|
|
// Drop the assistant message entirely if only tool_result blocks remained.
|
|
if (remaining.length > 0) {
|
|
out.push({ ...msg, content: remaining });
|
|
recordToolUseIds(remaining);
|
|
}
|
|
}
|
|
|
|
return out;
|
|
}
|
|
|
|
// Fix tool_use/tool_result ordering for Claude API
|
|
// 1. Assistant message with tool_use: remove text AFTER tool_use (Claude doesn't allow)
|
|
// 2. Merge consecutive same-role messages
|
|
// 3. Reconcile tool_result blocks against the immediately previous tool_use message
|
|
export function fixToolUseOrdering(messages: ClaudeMessage[]): ClaudeMessage[] {
|
|
if (messages.length === 0) return messages;
|
|
if (
|
|
messages.length === 1 &&
|
|
!(
|
|
Array.isArray(messages[0]?.content) &&
|
|
messages[0].content.some((block) => block.type === "tool_result")
|
|
)
|
|
) {
|
|
return messages;
|
|
}
|
|
|
|
// Pass 1: Fix assistant messages with tool_use - remove text after tool_use
|
|
for (const msg of messages) {
|
|
if (msg.role === "assistant" && Array.isArray(msg.content)) {
|
|
const hasToolUse = msg.content.some((b) => b.type === "tool_use");
|
|
if (hasToolUse) {
|
|
// Keep only: thinking blocks + tool_use blocks (remove text blocks after tool_use)
|
|
const newContent: ClaudeContentBlock[] = [];
|
|
let foundToolUse = false;
|
|
|
|
for (const block of msg.content) {
|
|
if (block.type === "tool_use") {
|
|
foundToolUse = true;
|
|
newContent.push(block);
|
|
} else if (block.type === "thinking" || block.type === "redacted_thinking") {
|
|
newContent.push(block);
|
|
} else if (!foundToolUse) {
|
|
// Keep text blocks BEFORE tool_use
|
|
newContent.push(block);
|
|
}
|
|
// Skip text blocks AFTER tool_use
|
|
}
|
|
|
|
msg.content = newContent;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Pass 2: Merge consecutive same-role messages
|
|
const merged: ClaudeMessage[] = [];
|
|
|
|
for (const msg of messages) {
|
|
const last = merged[merged.length - 1];
|
|
|
|
if (last && last.role === msg.role) {
|
|
// Merge content arrays
|
|
const lastContent = Array.isArray(last.content)
|
|
? last.content
|
|
: [{ type: "text", text: last.content }];
|
|
const msgContent = Array.isArray(msg.content)
|
|
? msg.content
|
|
: [{ type: "text", text: msg.content }];
|
|
|
|
// Put tool_result first, then other content
|
|
const toolResults = [
|
|
...lastContent.filter((b) => b.type === "tool_result"),
|
|
...msgContent.filter((b) => b.type === "tool_result"),
|
|
];
|
|
const otherContent = [
|
|
...lastContent.filter((b) => b.type !== "tool_result"),
|
|
...msgContent.filter((b) => b.type !== "tool_result"),
|
|
];
|
|
|
|
last.content = [...toolResults, ...otherContent];
|
|
} else {
|
|
// Ensure content is array
|
|
const content = Array.isArray(msg.content)
|
|
? msg.content
|
|
: [{ type: "text", text: msg.content }];
|
|
merged.push({ role: msg.role, content: [...content] });
|
|
}
|
|
}
|
|
|
|
// Claude accepts tool_result only for a tool_use in the immediately previous
|
|
// assistant message. Compacted cross-model history can retain an output after
|
|
// dropping its call; keep that output as user text instead of sending an
|
|
// invalid structured reference or discarding useful context.
|
|
for (let i = 0; i < merged.length; i++) {
|
|
const msg = merged[i];
|
|
if (msg.role !== "user" || !Array.isArray(msg.content)) continue;
|
|
|
|
const previous = merged[i - 1];
|
|
const validIds = new Set<string>(
|
|
previous?.role === "assistant" && Array.isArray(previous.content)
|
|
? previous.content.flatMap((block) =>
|
|
block.type === "tool_use" && typeof block.id === "string" && block.id ? [block.id] : []
|
|
)
|
|
: []
|
|
);
|
|
const pairedById = new Map<string, ClaudeContentBlock>();
|
|
const otherContent: ClaudeContentBlock[] = [];
|
|
|
|
for (const block of msg.content) {
|
|
if (block.type !== "tool_result") {
|
|
otherContent.push(block);
|
|
continue;
|
|
}
|
|
|
|
const toolUseId = typeof block.tool_use_id === "string" ? block.tool_use_id : "";
|
|
if (validIds.has(toolUseId) && !pairedById.has(toolUseId)) {
|
|
pairedById.set(toolUseId, block);
|
|
continue;
|
|
}
|
|
|
|
const serialized =
|
|
typeof block.content === "string"
|
|
? block.content
|
|
: (JSON.stringify(block.content ?? "") ?? "");
|
|
otherContent.push({
|
|
type: "text",
|
|
text: `[Unpaired tool result ${toolUseId || "unknown"}]\n${serialized}`,
|
|
});
|
|
}
|
|
|
|
const pairedResults = [...validIds].map(
|
|
(id) => pairedById.get(id) ?? { type: "tool_result", tool_use_id: id, content: "" }
|
|
);
|
|
msg.content = [...pairedResults, ...otherContent];
|
|
}
|
|
|
|
return merged;
|
|
}
|
|
|
|
function ensureMessageContentArray(msg: ClaudeMessage): ClaudeContentBlock[] {
|
|
if (Array.isArray(msg?.content)) return msg.content;
|
|
if (typeof msg?.content === "string" && msg.content.trim()) {
|
|
msg.content = [{ type: "text", text: msg.content }];
|
|
return msg.content;
|
|
}
|
|
return [];
|
|
}
|
|
|
|
function markMessageCacheControl(msg: ClaudeMessage, ttl?: string): boolean {
|
|
const content = ensureMessageContentArray(msg);
|
|
if (content.length === 0) return false;
|
|
const lastIndex = content.length - 1;
|
|
content[lastIndex].cache_control =
|
|
ttl !== undefined ? { type: "ephemeral", ttl } : { type: "ephemeral" };
|
|
return true;
|
|
}
|
|
|
|
/** True when the body carries at least one cache_control marker anywhere
|
|
* (system blocks, message content blocks, or tools). Used to decide whether
|
|
* preserve-mode has anything to preserve. */
|
|
function bodyHasAnyCacheControl(body: ClaudeRequestBody): boolean {
|
|
if (Array.isArray(body.system)) {
|
|
for (const block of body.system) {
|
|
if (block && typeof block === "object" && block.cache_control) return true;
|
|
}
|
|
}
|
|
if (Array.isArray(body.messages)) {
|
|
for (const msg of body.messages) {
|
|
if (!Array.isArray(msg?.content)) continue;
|
|
for (const block of msg.content) {
|
|
if (block && typeof block === "object" && block.cache_control) return true;
|
|
}
|
|
}
|
|
}
|
|
if (Array.isArray(body.tools)) {
|
|
for (const tool of body.tools) {
|
|
if (tool && typeof tool === "object" && (tool as { cache_control?: unknown }).cache_control)
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// Prepare request for Claude format endpoints
|
|
// - Cleanup cache_control (unless preserveCacheControl=true for passthrough)
|
|
// - Filter empty messages
|
|
// - Add thinking block for Anthropic endpoint (provider === "claude")
|
|
// - Fix tool_use/tool_result ordering
|
|
export function prepareClaudeRequest(
|
|
body: ClaudeRequestBody,
|
|
provider: string | null = null,
|
|
preserveCacheControl = false,
|
|
model: string | null = null,
|
|
opts: { fallbackToHeuristicWhenNoMarkers?: boolean } = {}
|
|
): ClaudeRequestBody {
|
|
// 0. Strip Anthropic `output_config` for providers that reject it on their
|
|
// Claude-compatible endpoints (MiniMax). Must run before any downstream
|
|
// processing so the field never reaches translateRequest/the executor.
|
|
if (provider && CLAUDE_FORMAT_PROVIDERS_WITHOUT_OUTPUT_CONFIG.has(provider)) {
|
|
delete body.output_config;
|
|
}
|
|
|
|
// preserveCacheControl means "the client manages its own cache markers".
|
|
// A body with NO cache_control anywhere has nothing to preserve — shipping
|
|
// it untouched would mean zero prompt-cache breakpoints (every token billed
|
|
// uncached on every turn). The translator path opts into falling back to the
|
|
// standard heuristic in that case; the claude-code-compatible relay path
|
|
// keeps its long-standing "never supplement missing markers" contract
|
|
// (cc-compatible-provider.test.ts) and does not pass the flag.
|
|
if (
|
|
preserveCacheControl &&
|
|
opts.fallbackToHeuristicWhenNoMarkers === true &&
|
|
!bodyHasAnyCacheControl(body)
|
|
) {
|
|
preserveCacheControl = false;
|
|
}
|
|
|
|
// 1. System: remove all cache_control, add only to last block with ttl 1h
|
|
// In passthrough mode, preserve existing cache_control markers
|
|
const supportsPromptCaching =
|
|
provider === "claude" || provider?.startsWith?.("anthropic-compatible-");
|
|
const isKimiCoding = provider === "kimi-coding" || provider === "kimi-coding-apikey";
|
|
|
|
// Non-Anthropic Claude-shape providers (kimi-coding, glmt, zai, …) cannot
|
|
// validate the synthetic redacted_thinking.data blob — they're not Anthropic
|
|
// and don't speak its signature scheme. They expect plain `thinking { text }`
|
|
// blocks with the original reasoning text, or fail with:
|
|
// "thinking is enabled but reasoning_content is missing in assistant
|
|
// tool call message at index N"
|
|
// We use the same allowlist as prompt-caching: only Anthropic-native
|
|
// upstreams get redacted_thinking. Everything else gets plain thinking blocks
|
|
// backed by reasoningCache (real text) or a placeholder (cache miss).
|
|
// Mixed-format providers (e.g. opencode-go) may have some models targeting
|
|
// Anthropic's Messages API (targetFormat=claude) and others targeting OpenAI.
|
|
// When the specific model targets Claude format, it's hitting a real Anthropic
|
|
// endpoint that validates signatures — so it needs redacted_thinking too.
|
|
const modelTargetsClaude =
|
|
!!provider && !!model && getModelTargetFormat(provider, model) === "claude";
|
|
const supportsRedactedThinking = !isKimiCoding && (supportsPromptCaching || modelTargetsClaude);
|
|
|
|
const systemBlocks = body.system;
|
|
if (systemBlocks && Array.isArray(systemBlocks) && !preserveCacheControl) {
|
|
body.system = systemBlocks.map((block, i) => {
|
|
const { cache_control, ...rest } = block;
|
|
if (i === systemBlocks.length - 1 && supportsPromptCaching) {
|
|
return { ...rest, cache_control: { type: "ephemeral", ttl: "1h" } };
|
|
}
|
|
return rest;
|
|
});
|
|
}
|
|
|
|
// 2. Messages: process in optimized passes
|
|
if (body.messages && Array.isArray(body.messages)) {
|
|
const len = body.messages.length;
|
|
let filtered: ClaudeMessage[] = [];
|
|
|
|
// Pass 1: remove cache_control + filter empty messages
|
|
// In passthrough mode, preserve existing cache_control markers
|
|
for (let i = 0; i < len; i++) {
|
|
const msg = body.messages[i];
|
|
|
|
// Remove cache_control from content blocks (skip in passthrough mode)
|
|
if (Array.isArray(msg.content) && !preserveCacheControl) {
|
|
for (const block of msg.content) {
|
|
delete block.cache_control;
|
|
}
|
|
}
|
|
|
|
// Keep final assistant even if empty, otherwise check valid content
|
|
const isFinalAssistant = i === len - 1 && msg.role === "assistant";
|
|
if (isFinalAssistant || hasValidContent(msg)) {
|
|
filtered.push(msg);
|
|
}
|
|
}
|
|
|
|
// Pass 1.4: Filter out tool_use blocks with empty names (causes Claude 400 error)
|
|
// Apply to ALL roles (assistant tool_use + any user messages that may carry tool_use)
|
|
// Also filter tool_result blocks with missing tool_use_id
|
|
for (const msg of filtered) {
|
|
if (Array.isArray(msg.content)) {
|
|
msg.content = msg.content.filter(
|
|
(block) => block.type !== "tool_use" || (block.name && block.name?.trim())
|
|
);
|
|
msg.content = msg.content.filter(
|
|
(block) => block.type !== "tool_result" || block.tool_use_id
|
|
);
|
|
// Anthropic-shape upstreams enforce `^[a-zA-Z0-9_-]+$` on tool ids. Client
|
|
// histories can carry ids with `.`/`:`/`#` (e.g. replayed from another
|
|
// provider), which 400s as TOOL_SCHEMA_INVALID. Rewrite both sides with the
|
|
// same function so tool_use/tool_result pairing survives — the later
|
|
// ordering passes match on these ids.
|
|
for (const block of msg.content) {
|
|
if (block.type === "tool_use" && typeof block.id === "string" && block.id) {
|
|
block.id = sanitizeToolId(block.id);
|
|
} else if (
|
|
block.type === "tool_result" &&
|
|
typeof block.tool_use_id === "string" &&
|
|
block.tool_use_id
|
|
) {
|
|
block.tool_use_id = sanitizeToolId(block.tool_use_id);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Tools: for non-Anthropic providers (MiniMax and other Anthropic-compatible
|
|
// Claude-shape endpoints) strip Anthropic-only built-in tools (e.g.
|
|
// web_search_20250305) and normalize OpenAI-wire-shape tools to the
|
|
// Anthropic-native shape — fold `function.{name,description,parameters}`
|
|
// into top-level `{name, description, input_schema}` and drop the stray
|
|
// `type` field. Without this MiniMax rejects with code 2013 ("invalid
|
|
// tool type"). Port of upstream decolua/9router@45240c19.
|
|
if (body.tools && Array.isArray(body.tools) && provider !== "claude") {
|
|
body.tools = body.tools
|
|
.filter((tool) => !tool.type || tool.type === "function")
|
|
.map((tool) => {
|
|
const t = tool as ClaudeTool & {
|
|
function?: { name?: string; description?: string; parameters?: unknown };
|
|
type?: string;
|
|
};
|
|
if (t.function) {
|
|
return {
|
|
name: t.function.name,
|
|
description: t.function.description,
|
|
input_schema: t.function.parameters,
|
|
} as ClaudeTool;
|
|
}
|
|
const { type: _type, ...rest } = t;
|
|
return rest as ClaudeTool;
|
|
});
|
|
}
|
|
|
|
// Also filter top-level tool declarations with empty names
|
|
if (body.tools && Array.isArray(body.tools)) {
|
|
body.tools = body.tools.filter((tool) => tool.name && tool.name?.trim());
|
|
}
|
|
|
|
// Pass 1.45: Move stray tool_result blocks out of assistant messages
|
|
// before any ordering fix runs (#2815).
|
|
filtered = splitMisplacedToolResults(filtered);
|
|
|
|
// Pass 1.5: Fix tool_use/tool_result ordering
|
|
// Each tool_use must have tool_result in the NEXT message (not same message with other content)
|
|
filtered = fixToolUseOrdering(filtered);
|
|
|
|
body.messages = filtered;
|
|
|
|
// Check if thinking is enabled AND last message is from user
|
|
const lastMessage = filtered[filtered.length - 1];
|
|
const lastMessageIsUser = lastMessage?.role === "user";
|
|
const thinkingEnabled = body.thinking?.type === "enabled" && lastMessageIsUser;
|
|
|
|
// Claude Code-style prompt caching:
|
|
// - cache the second-to-last user turn for conversation reuse
|
|
// - cache the last assistant turn so the next user turn can reuse it
|
|
// Skip in passthrough mode to preserve client's cache_control markers
|
|
if (!preserveCacheControl && supportsPromptCaching) {
|
|
const userMessageIndexes = filtered.reduce<number[]>((indexes, msg, index) => {
|
|
if (msg?.role === "user") indexes.push(index);
|
|
return indexes;
|
|
}, []);
|
|
const secondToLastUserIndex =
|
|
userMessageIndexes.length >= 2 ? userMessageIndexes[userMessageIndexes.length - 2] : -1;
|
|
if (secondToLastUserIndex >= 0) {
|
|
markMessageCacheControl(filtered[secondToLastUserIndex]);
|
|
}
|
|
}
|
|
|
|
// Pass 2 (reverse): add cache_control to last assistant + handle thinking for Anthropic
|
|
|
|
// Index of the LAST assistant message in the filtered array. Anthropic
|
|
// enforces the latest assistant message's thinking blocks cannot be
|
|
// modified — preserve them verbatim. Older assistant messages can be
|
|
// rewritten to redacted_thinking { data } as before.
|
|
let latestAssistantIndex = -1;
|
|
for (let k = filtered.length - 1; k >= 0; k--) {
|
|
if (filtered[k]?.role === "assistant") {
|
|
latestAssistantIndex = k;
|
|
break;
|
|
}
|
|
}
|
|
|
|
let lastAssistantProcessed = false;
|
|
for (let i = filtered.length - 1; i >= 0; i--) {
|
|
const msg = filtered[i];
|
|
const content = ensureMessageContentArray(msg);
|
|
|
|
if (msg.role === "assistant" && content.length > 0) {
|
|
// Add cache_control to last block of first (from end) assistant with content
|
|
// Skip in passthrough mode to preserve client's cache_control markers
|
|
if (
|
|
!preserveCacheControl &&
|
|
supportsPromptCaching &&
|
|
!lastAssistantProcessed &&
|
|
markMessageCacheControl(msg)
|
|
) {
|
|
lastAssistantProcessed = true;
|
|
}
|
|
|
|
// Handle thinking blocks for Anthropic-shape endpoints.
|
|
// prepareClaudeRequest is only invoked when targetFormat === claude
|
|
// (translator/index.ts:165-168), so any provider that lands here has
|
|
// a Claude-format upstream: claude native, anthropic-compatible-*,
|
|
// kimi-coding (api.kimi.com/coding/v1/messages), glmt, zai, etc.
|
|
// All of these enforce the same body-shape contract for thinking mode:
|
|
// when body.thinking.type === "enabled" and an assistant turn contains
|
|
// a tool_use, the same content[] must include a thinking (or
|
|
// redacted_thinking) block emitted before the tool_use. Without it,
|
|
// the upstream rejects with errors like:
|
|
// "thinking is enabled but reasoning_content is missing in
|
|
// assistant tool call message at index N" (kimi-coding)
|
|
// "Invalid signature in thinking block" (claude native, on
|
|
// cross-provider replay)
|
|
// Guard: never modify EXISTING thinking blocks in the latest assistant
|
|
// message when sending to an Anthropic-native upstream. Anthropic returns
|
|
// 400 "blocks in the latest assistant message cannot be modified" if any
|
|
// field changes. Injecting a NEW thinking block (when none exists) is fine.
|
|
// Older assistant messages can still be rewritten.
|
|
// For non-Anthropic providers: only the text replacement is skipped
|
|
// for the latest assistant (if it already has non-empty thinking text);
|
|
// field cleanup (signature strip, type normalization) still runs.
|
|
const isLatestAssistant = i === latestAssistantIndex;
|
|
const latestThinkingBlocks: ClaudeContentBlock[] = isLatestAssistant
|
|
? content.filter(
|
|
(b: ClaudeContentBlock) => b.type === "thinking" || b.type === "redacted_thinking"
|
|
)
|
|
: [];
|
|
const latestHasExistingThinking = latestThinkingBlocks.length > 0;
|
|
// #6953: a synthetic thinking block with an EMPTY signature/data (fabricated by a
|
|
// non-Anthropic provider leg, e.g. codex reasoning_content) is NOT a genuine Claude
|
|
// replay signature. Forwarding it verbatim to a real Anthropic-native upstream always
|
|
// 400s ("Invalid signature in thinking block"), permanently poisoning the combo onto
|
|
// the non-Anthropic leg. Only skip the verbatim-preserve path when every thinking-ish
|
|
// block on the latest assistant message carries a non-empty signature/data — older
|
|
// turns are already sanitized below (redacted_thinking + DEFAULT_THINKING_CLAUDE_SIGNATURE);
|
|
// the latest turn must go through the same sanitization when its signature is empty.
|
|
const latestHasGenuineThinkingSignature = latestThinkingBlocks.every(
|
|
(b: ClaudeContentBlock) =>
|
|
b.type === "redacted_thinking"
|
|
? typeof b.data === "string" && (b.data as string).length > 0
|
|
: typeof b.signature === "string" && b.signature.length > 0
|
|
);
|
|
if (
|
|
latestHasExistingThinking &&
|
|
supportsRedactedThinking &&
|
|
latestHasGenuineThinkingSignature
|
|
) {
|
|
// Anthropic: skip all thinking-block rewrites entirely — the
|
|
// blocks must remain verbatim (type, thinking, signature, data).
|
|
continue;
|
|
}
|
|
|
|
let hasToolUse = false;
|
|
let hasThinking = false;
|
|
|
|
// Pre-collect tool_use ids in this content[] for reasoningCache
|
|
// lookups when the upstream is a non-Anthropic Claude-shape provider.
|
|
// The cache is keyed by tool_call_id which equals tool_use.id for
|
|
// Anthropic-shape (the same value is reused across formats — see
|
|
// claude-to-openai.ts:63 where openai tool_call.id = claude tool_use.id).
|
|
const toolUseIds: string[] = [];
|
|
if (!supportsRedactedThinking) {
|
|
for (const block of content) {
|
|
if (block.type === "tool_use" && typeof block.id === "string") {
|
|
toolUseIds.push(block.id);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Convert thinking blocks per provider type:
|
|
//
|
|
// Anthropic-native (claude, anthropic-compatible-*):
|
|
// Emit redacted_thinking { data } with synthetic blob. Anthropic
|
|
// accepts this as a valid placeholder for replay context without
|
|
// re-validating the original signature. Previous behavior — keep.
|
|
//
|
|
// When requests cross provider boundaries (e.g., combo fallback) or
|
|
// when client-stored signatures (Capy) replay back to Anthropic, the
|
|
// original `thinking.signature` no longer validates: "Invalid
|
|
// signature in thinking block" 400. redacted_thinking accepts without
|
|
// signature validation — but Anthropic REQUIRES a `data` field.
|
|
// Field rules: redacted_thinking={type,data} ; thinking={type,thinking,signature}.
|
|
//
|
|
// Non-Anthropic Claude-shape (kimi-coding, glmt, zai, …):
|
|
// Emit plain thinking { thinking: <text> } using the real reasoning
|
|
// text from reasoningCache (captured on the prior assistant
|
|
// response). Falls back to NON_ANTHROPIC_THINKING_PLACEHOLDER if the
|
|
// cache misses (rare but possible after a process restart or TTL
|
|
// eviction). Empty text is treated as "missing" by kimi-coding so
|
|
// never emit an empty thinking field.
|
|
let thinkingBlockIdx = 0;
|
|
for (const block of content) {
|
|
if (block.type === "thinking" || block.type === "redacted_thinking") {
|
|
if (isKimiCoding) {
|
|
if (block.type === "redacted_thinking") {
|
|
block.type = "thinking";
|
|
block.thinking = typeof block.thinking === "string" ? block.thinking : "";
|
|
}
|
|
delete block.data;
|
|
delete block.signature;
|
|
} else if (supportsRedactedThinking) {
|
|
block.type = "redacted_thinking";
|
|
block.data = DEFAULT_THINKING_CLAUDE_SIGNATURE;
|
|
delete block.thinking;
|
|
delete block.signature;
|
|
} else {
|
|
const existing =
|
|
typeof block.thinking === "string" && block.thinking.length > 0
|
|
? block.thinking
|
|
: "";
|
|
let text = existing;
|
|
// For the latest assistant message on non-Anthropic upstreams,
|
|
// preserve the thinking text verbatim when it is already present.
|
|
// Cache lookups and the placeholder fallback only apply to older
|
|
// messages (or to the latest if the client sent empty text).
|
|
if (!text || !latestHasExistingThinking) {
|
|
if (!text) {
|
|
const pairedToolUseId = toolUseIds[thinkingBlockIdx];
|
|
if (pairedToolUseId) {
|
|
const cached = lookupReasoning(pairedToolUseId);
|
|
if (cached) {
|
|
text = cached;
|
|
recordReplay();
|
|
}
|
|
}
|
|
}
|
|
block.type = "thinking";
|
|
block.thinking = text || NON_ANTHROPIC_THINKING_PLACEHOLDER;
|
|
} else {
|
|
// latestHasExistingThinking + non-empty text: preserve text, still clean up fields
|
|
block.type = "thinking";
|
|
}
|
|
delete block.data;
|
|
delete block.signature;
|
|
}
|
|
hasThinking = true;
|
|
thinkingBlockIdx++;
|
|
}
|
|
if (block.type === "tool_use") hasToolUse = true;
|
|
}
|
|
|
|
// Add precursor thinking block if thinking enabled + has tool_use but
|
|
// no existing thinking-ish block. Required for Anthropic-shape
|
|
// thinking-mode upstreams (claude, kimi-coding, glm, …) when the
|
|
// assistant turn's content[] needs a thinking block in front of any
|
|
// tool_use. Use the same provider-aware shape selection as above.
|
|
if (thinkingEnabled && !hasThinking && hasToolUse) {
|
|
if (supportsRedactedThinking) {
|
|
content.unshift({
|
|
type: "redacted_thinking",
|
|
data: DEFAULT_THINKING_CLAUDE_SIGNATURE,
|
|
});
|
|
} else if (isKimiCoding) {
|
|
content.unshift({
|
|
type: "thinking",
|
|
thinking: "",
|
|
});
|
|
} else {
|
|
let text = "";
|
|
const firstToolUseId = toolUseIds[0];
|
|
if (firstToolUseId) {
|
|
const cached = lookupReasoning(firstToolUseId);
|
|
if (cached) {
|
|
text = cached;
|
|
recordReplay();
|
|
}
|
|
}
|
|
content.unshift({
|
|
type: "thinking",
|
|
thinking: text || NON_ANTHROPIC_THINKING_PLACEHOLDER,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// 3. Tools: remove all cache_control, add only to last non-deferred tool with ttl 1h
|
|
// Tools with defer_loading=true cannot have cache_control (API rejects it)
|
|
// In passthrough mode, preserve existing cache_control markers
|
|
if (body.tools && Array.isArray(body.tools) && !preserveCacheControl) {
|
|
body.tools = body.tools.map((tool) => {
|
|
const { cache_control, ...rest } = tool;
|
|
return rest;
|
|
});
|
|
if (supportsPromptCaching) {
|
|
for (let i = body.tools.length - 1; i >= 0; i--) {
|
|
if (!body.tools[i].defer_loading) {
|
|
body.tools[i].cache_control = { type: "ephemeral", ttl: "1h" };
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return body;
|
|
}
|