f97b853460
The Claude Code mimic path rewrites tool names in tools[] (and
tool_choice) but left tool_use blocks in messages[] with their
original names. Anthropic validates that every tool referenced by
a tool_use block is declared in tools[], so the mismatch produces:
messages.N.content.M: Input tag 'original_name' not found in tools
(surfaced as HTTP 400 directly, or wrapped as 424 by upstream proxies
such as Bedrock gateways.)
The previous code comment asserted 'this matches Parrot; response-side
bytes.Replace will restore the names'. Parrot's behavior is fine for
Claude Code's own tool set, but breaks once the upstream client sends
additional tools (e.g. web_search) that are not part of Claude Code
and therefore get renamed here.
Fix: apply the same ToolNameRewrite to messages[].content[] blocks
where type == 'tool_use', keeping tools[], tool_choice and messages
self-consistent before the request reaches Anthropic. tool_result
blocks reference tools via tool_use_id, not name, so no change is
needed there.
A new unit test covers the full rewrite flow and guards against
server tools (type != '') being affected.
210 lines
9.6 KiB
Go
210 lines
9.6 KiB
Go
package service
|
||
|
||
import (
|
||
"strings"
|
||
"testing"
|
||
|
||
"github.com/stretchr/testify/require"
|
||
"github.com/tidwall/gjson"
|
||
)
|
||
|
||
func TestBuildDynamicToolMap_BelowThreshold(t *testing.T) {
|
||
// Parrot 行为：tools 数量 ≤ 5 时不做动态映射。
|
||
names := []string{"bash", "edit", "read", "write", "search"}
|
||
require.Nil(t, buildDynamicToolMap(names))
|
||
}
|
||
|
||
func TestBuildDynamicToolMap_AboveThresholdIsStable(t *testing.T) {
|
||
// Parrot 不变量：同一组 tool_names 在同进程内映射稳定（保证 cache 命中）。
|
||
names := []string{"alpha", "beta", "gamma", "delta", "epsilon", "zeta"}
|
||
a := buildDynamicToolMap(names)
|
||
b := buildDynamicToolMap(names)
|
||
require.NotNil(t, a)
|
||
require.Equal(t, a, b, "same input tool_names must yield identical mapping")
|
||
require.Len(t, a, 6)
|
||
for _, name := range names {
|
||
require.Contains(t, a, name)
|
||
require.NotEqual(t, name, a[name])
|
||
}
|
||
}
|
||
|
||
func TestSanitizeToolName_StaticPrefix(t *testing.T) {
|
||
require.Equal(t, "cc_sess_list", sanitizeToolName("sessions_list", nil))
|
||
require.Equal(t, "cc_ses_get", sanitizeToolName("session_get", nil))
|
||
require.Equal(t, "bash", sanitizeToolName("bash", nil))
|
||
}
|
||
|
||
func TestSanitizeToolName_DynamicTakesPrecedence(t *testing.T) {
|
||
dyn := map[string]string{"sessions_list": "analyze_ses00"}
|
||
got := sanitizeToolName("sessions_list", dyn)
|
||
require.Equal(t, "analyze_ses00", got, "dynamic mapping wins over static prefix")
|
||
}
|
||
|
||
func TestRestoreToolNamesInBytes_LongestFirst(t *testing.T) {
|
||
// 当假名 "abc_12" 是另一个更长假名的子串（真实场景极少但算法必须防御）时，
|
||
// 长的必须先替换。本测试用显式构造的映射来验证排序不变量。
|
||
rw := &ToolNameRewrite{
|
||
Forward: map[string]string{"foo": "abc_12", "bar": "abc_12_ext"},
|
||
Reverse: map[string]string{"abc_12": "foo", "abc_12_ext": "bar"},
|
||
}
|
||
// 手工构造 ReverseOrdered：长的在前
|
||
rw.ReverseOrdered = [][2]string{
|
||
{"abc_12_ext", "bar"},
|
||
{"abc_12", "foo"},
|
||
}
|
||
data := []byte(`{"tool":"abc_12_ext","other":"abc_12"}`)
|
||
restored := string(restoreToolNamesInBytes(data, rw))
|
||
require.Equal(t, `{"tool":"bar","other":"foo"}`, restored)
|
||
}
|
||
|
||
func TestRestoreToolNamesInBytes_StaticPrefixRollback(t *testing.T) {
|
||
data := []byte(`{"name":"sessions_list","id":"cc_ses_xyz"}`)
|
||
got := string(restoreToolNamesInBytes(data, nil))
|
||
require.Equal(t, `{"name":"sessions_list","id":"session_xyz"}`, got)
|
||
}
|
||
|
||
func TestApplyToolNameRewriteToBody_RenamesToolsAndToolChoice(t *testing.T) {
|
||
body := []byte(`{"tools":[{"name":"sessions_list","input_schema":{}},{"name":"session_get","input_schema":{}},{"name":"web_search","type":"web_search_20250305"}],"tool_choice":{"type":"tool","name":"sessions_list"}}`)
|
||
rw := buildToolNameRewriteFromBody(body)
|
||
require.NotNil(t, rw)
|
||
require.Contains(t, rw.Forward, "sessions_list")
|
||
require.Contains(t, rw.Forward, "session_get")
|
||
// web_search is a server tool, not rewritten
|
||
require.NotContains(t, rw.Forward, "web_search")
|
||
|
||
out := applyToolNameRewriteToBody(body, rw)
|
||
|
||
// tools[0].name and tools[1].name rewritten; tools[2].name untouched
|
||
require.Equal(t, "cc_sess_list", gjson.GetBytes(out, "tools.0.name").String())
|
||
require.Equal(t, "cc_ses_get", gjson.GetBytes(out, "tools.1.name").String())
|
||
require.Equal(t, "web_search", gjson.GetBytes(out, "tools.2.name").String())
|
||
|
||
// tool_choice.name rewritten
|
||
require.Equal(t, "cc_sess_list", gjson.GetBytes(out, "tool_choice.name").String())
|
||
require.Equal(t, "tool", gjson.GetBytes(out, "tool_choice.type").String())
|
||
}
|
||
|
||
|
||
func TestApplyToolNameRewriteToBody_RenamesToolUseInMessages(t *testing.T) {
|
||
// sessions_list -> cc_sess_list (static prefix: sessions_ -> sessions_)
|
||
// web_search is a server tool (type != ""), not rewritten
|
||
// messages tool_use names must be rewritten to match tools[]
|
||
body := []byte(`{"tools":[{"name":"sessions_list","input_schema":{}},{"name":"web_search","type":"web_search_20250305"}],"messages":[{"role":"user","content":[{"type":"text","text":"hi"}]},{"role":"assistant","content":[{"type":"tool_use","id":"tu_01","name":"sessions_list","input":{}},{"type":"text","text":"thinking"}]},{"role":"user","content":[{"type":"tool_result","tool_use_id":"tu_01","content":"ok"}]}]}`)
|
||
rw := buildToolNameRewriteFromBody(body)
|
||
require.NotNil(t, rw)
|
||
require.Equal(t, "cc_sess_list", rw.Forward["sessions_list"])
|
||
|
||
out := applyToolNameRewriteToBody(body, rw)
|
||
|
||
// tools[0].name rewritten
|
||
require.Equal(t, "cc_sess_list", gjson.GetBytes(out, "tools.0.name").String())
|
||
// tools[1].name untouched (server tool)
|
||
require.Equal(t, "web_search", gjson.GetBytes(out, "tools.1.name").String())
|
||
// messages[1].content[0].name (tool_use) also rewritten to match tools
|
||
require.Equal(t, "cc_sess_list", gjson.GetBytes(out, "messages.1.content.0.name").String())
|
||
// messages[1].content[1] (text) untouched
|
||
require.Equal(t, "thinking", gjson.GetBytes(out, "messages.1.content.1.text").String())
|
||
// messages[2].content[0] (tool_result) untouched — no name field in tool_result
|
||
require.Equal(t, "ok", gjson.GetBytes(out, "messages.2.content.0.content").String())
|
||
}
|
||
|
||
func TestApplyToolsLastCacheBreakpoint_InjectsDefault(t *testing.T) {
|
||
body := []byte(`{"tools":[{"name":"a","input_schema":{}},{"name":"b","input_schema":{}}]}`)
|
||
out := applyToolsLastCacheBreakpoint(body)
|
||
require.Equal(t, "ephemeral", gjson.GetBytes(out, "tools.1.cache_control.type").String())
|
||
require.Equal(t, "5m", gjson.GetBytes(out, "tools.1.cache_control.ttl").String())
|
||
// First tool untouched
|
||
require.False(t, gjson.GetBytes(out, "tools.0.cache_control").Exists())
|
||
}
|
||
|
||
func TestApplyToolsLastCacheBreakpoint_PassesThroughClientTTL(t *testing.T) {
|
||
body := []byte(`{"tools":[{"name":"a","input_schema":{},"cache_control":{"type":"ephemeral","ttl":"1h"}}]}`)
|
||
out := applyToolsLastCacheBreakpoint(body)
|
||
// User-provided ttl must be preserved.
|
||
require.Equal(t, "1h", gjson.GetBytes(out, "tools.0.cache_control.ttl").String())
|
||
}
|
||
|
||
func TestStripMessageCacheControl(t *testing.T) {
|
||
body := []byte(`{"messages":[{"role":"user","content":[{"type":"text","text":"hi","cache_control":{"type":"ephemeral"}}]}]}`)
|
||
out := stripMessageCacheControl(body)
|
||
require.False(t, gjson.GetBytes(out, "messages.0.content.0.cache_control").Exists())
|
||
}
|
||
|
||
func TestAddMessageCacheBreakpoints_LastMessageOnly(t *testing.T) {
|
||
body := []byte(`{"messages":[{"role":"user","content":[{"type":"text","text":"hello"}]}]}`)
|
||
out := addMessageCacheBreakpoints(body)
|
||
require.Equal(t, "ephemeral", gjson.GetBytes(out, "messages.0.content.0.cache_control.type").String())
|
||
require.Equal(t, "5m", gjson.GetBytes(out, "messages.0.content.0.cache_control.ttl").String())
|
||
}
|
||
|
||
func TestAddMessageCacheBreakpoints_SecondToLastUserTurn(t *testing.T) {
|
||
// Parrot 不变量：messages ≥ 4 时才打第二个断点，且位置是"倒数第二个 user turn"。
|
||
body := []byte(`{"messages":[
|
||
{"role":"user","content":[{"type":"text","text":"q1"}]},
|
||
{"role":"assistant","content":[{"type":"text","text":"a1"}]},
|
||
{"role":"user","content":[{"type":"text","text":"q2"}]},
|
||
{"role":"assistant","content":[{"type":"text","text":"a2"}]}
|
||
]}`)
|
||
out := addMessageCacheBreakpoints(body)
|
||
// 最后一条 assistant 被打断点
|
||
require.Equal(t, "ephemeral", gjson.GetBytes(out, "messages.3.content.0.cache_control.type").String())
|
||
// 倒数第二个 user turn = index 0（唯一另一个 user）
|
||
require.Equal(t, "ephemeral", gjson.GetBytes(out, "messages.0.content.0.cache_control.type").String())
|
||
// 其他不打断点
|
||
require.False(t, gjson.GetBytes(out, "messages.1.content.0.cache_control").Exists())
|
||
require.False(t, gjson.GetBytes(out, "messages.2.content.0.cache_control").Exists())
|
||
}
|
||
|
||
func TestAddMessageCacheBreakpoints_StringContentPromoted(t *testing.T) {
|
||
body := []byte(`{"messages":[{"role":"user","content":"hi"}]}`)
|
||
out := addMessageCacheBreakpoints(body)
|
||
// content 升级成数组
|
||
require.True(t, gjson.GetBytes(out, "messages.0.content").IsArray())
|
||
require.Equal(t, "text", gjson.GetBytes(out, "messages.0.content.0.type").String())
|
||
require.Equal(t, "hi", gjson.GetBytes(out, "messages.0.content.0.text").String())
|
||
require.Equal(t, "5m", gjson.GetBytes(out, "messages.0.content.0.cache_control.ttl").String())
|
||
}
|
||
|
||
func TestBuildToolNameRewriteFromBody_ReverseOrderedByLengthDesc(t *testing.T) {
|
||
// 超过阈值触发动态映射，验证 ReverseOrdered 按假名长度倒序排列
|
||
body := []byte(`{"tools":[
|
||
{"name":"t1","input_schema":{}},
|
||
{"name":"t2","input_schema":{}},
|
||
{"name":"t3","input_schema":{}},
|
||
{"name":"t4","input_schema":{}},
|
||
{"name":"t5","input_schema":{}},
|
||
{"name":"t6","input_schema":{}}
|
||
]}`)
|
||
rw := buildToolNameRewriteFromBody(body)
|
||
require.NotNil(t, rw)
|
||
require.NotEmpty(t, rw.ReverseOrdered)
|
||
for i := 1; i < len(rw.ReverseOrdered); i++ {
|
||
require.GreaterOrEqual(t, len(rw.ReverseOrdered[i-1][0]), len(rw.ReverseOrdered[i][0]),
|
||
"ReverseOrdered must be sorted by fake-name length descending")
|
||
}
|
||
}
|
||
|
||
func TestRestoreToolNamesInBytes_NoMapping_NoStaticMatch_IsNoop(t *testing.T) {
|
||
data := []byte("plain text without any tool names")
|
||
require.Equal(t, string(data), string(restoreToolNamesInBytes(data, nil)))
|
||
}
|
||
|
||
// Ensure the fake name format follows Parrot's "{prefix}{name[:3]}{i:02d}".
|
||
func TestBuildDynamicToolMap_FakeNameShape(t *testing.T) {
|
||
names := []string{"alphabet", "bravo", "charlie", "delta", "echo", "foxtrot"}
|
||
m := buildDynamicToolMap(names)
|
||
require.NotNil(t, m)
|
||
for _, name := range names {
|
||
fake, ok := m[name]
|
||
require.True(t, ok)
|
||
// fake = prefix + head3 + "%02d"
|
||
// ends with two decimal digits
|
||
require.Regexp(t, `^[a-z]+_[a-z0-9]{1,3}\d{2}$`, fake)
|
||
head := name
|
||
if len(head) > 3 {
|
||
head = head[:3]
|
||
}
|
||
require.True(t, strings.Contains(fake, head), "fake %q should contain head3 %q of %q", fake, head, name)
|
||
}
|
||
}
|