feat: 静默过滤不支持的web_search/websearch工具

Author: caidaoli

.env.example

@@ -23,7 +23,18 @@
 # - clientId: IdC认证的客户端ID（IdC认证时必需）
 # - clientSecret: IdC认证的客户端密钥（IdC认证时必需）
 # - disabled: 是否禁用此配置（可选，默认false）
-
+# ============================================================================
+# Token获取方式
+# ============================================================================
+#
+# Social tokens:
+#   通常位于 ~/.aws/sso/cache/ 目录下的JSON文件中
+#   文件名类似：kiro-auth-token.json 或包含 "refreshToken" 字段的缓存文件
+#
+# IdC tokens:
+#   位于 ~/.aws/sso/cache/ 目录下的JSON文件中
+#   需要同时提供 clientId 和 clientSecret
+#
 # 方式1：直接配置JSON字符串
 # 示例1：单个 Social 认证
 KIRO_AUTH_TOKEN='[{"auth":"Social","refreshToken":"your_social_refresh_token_here"}]'
@@ -35,24 +46,31 @@ KIRO_AUTH_TOKEN='[{"auth":"Social","refreshToken":"your_social_refresh_token_her
 # 示例2：单个 IdC 认证
 # KIRO_AUTH_TOKEN='[{"auth":"IdC","refreshToken":"your_idc_refresh_token_here","clientId":"your_idc_client_id","clientSecret":"your_idc_client_secret"}]'
 
-# 示例3：多个认证混合（推荐生产环境，实现负载均衡和容错）
+# 示例3：多个认证混合
 # KIRO_AUTH_TOKEN='[
 #   {
 #     "auth": "Social",
-#     "refreshToken": "arn:aws:sso:us-east-1:999999999999:token/refresh/token1"
-#   },
-#   {
-#     "auth": "Social",
-#     "refreshToken": "arn:aws:sso:us-east-1:999999999999:token/refresh/token2"
+#     "refreshToken": "aorAAAAAGj....."
 #   },
 #   {
 #     "auth": "IdC",
-#     "refreshToken": "arn:aws:identitycenter::us-east-1:999999999999:account/instance/xxx",
-#     "clientId": "https://oidc.us-east-1.amazonaws.com/clients/xxx",
-#     "clientSecret": "xxx-secret-key-xxx"
+#     "refreshToken": "aorAAAAAGj....",
+#     "clientId": "uG-18bI....",
+#     "clientSecret": "eyJraWQiOiJrZXktM....."
 #   }
 # ]'
-
+# ============================================================================
+# Token获取方式
+# ============================================================================
+#
+# Social tokens:
+#   通常位于 ~/.aws/sso/cache/ 目录下的JSON文件中
+#   文件名类似：kiro-auth-token.json 或包含 "refreshToken" 字段的缓存文件
+#
+# IdC tokens:
+#   位于 ~/.aws/sso/cache/ 目录下的JSON文件中
+#   需要同时提供 clientId 和 clientSecret
+#
 # Token选择策略：
 # - 系统使用"顺序选择"策略（sequential）
 # - 按配置顺序依次使用token，当前token耗尽后自动切换到下一个
@@ -88,18 +106,7 @@ LOG_FORMAT=json
 # LOG_CONSOLE=true
 
 
-# ============================================================================
-# Token获取方式
-# ============================================================================
-#
-# Social tokens:
-#   通常位于 ~/.aws/sso/cache/ 目录下的JSON文件中
-#   文件名类似：kiro-auth-token.json 或包含 "refreshToken" 字段的缓存文件
-#
-# IdC tokens:
-#   位于 ~/.aws/sso/cache/ 目录下的JSON文件中
-#   需要同时提供 clientId 和 clientSecret
-#
+
 # ============================================================================
 # 最佳实践
 # ============================================================================

converter/codewhisperer.go

@@ -307,6 +307,11 @@ func BuildCodeWhispererRequest(anthropicReq types.AnthropicRequest, ctx *gin.Con
 				continue
 			}
 
+			// 过滤不支持的工具：web_search (静默过滤，不发送到上游)
+			if tool.Name == "web_search" || tool.Name == "websearch" {
+				continue
+			}
+
 			// logger.Debug("转换工具定义",
 			// 	logger.Int("tool_index", i),
 			// 	logger.String("tool_name", tool.Name),
@@ -482,6 +487,11 @@ func extractToolUsesFromMessage(content any) []types.ToolUseEntry {
 							toolUse.Name = name
 						}
 
+						// 过滤不支持的工具：web_search (静默过滤)
+						if toolUse.Name == "web_search" || toolUse.Name == "websearch" {
+							continue
+						}
+
 						// 提取 input
 						if input, ok := block["input"].(map[string]any); ok {
 							toolUse.Input = input
@@ -510,6 +520,11 @@ func extractToolUsesFromMessage(content any) []types.ToolUseEntry {
 					toolUse.Name = *block.Name
 				}
 
+				// 过滤不支持的工具：web_search (静默过滤)
+				if toolUse.Name == "web_search" || toolUse.Name == "websearch" {
+					continue
+				}
+
 				if block.Input != nil {
 					switch inp := (*block.Input).(type) {
 					case map[string]any:

converter/tools.go

@@ -32,6 +32,11 @@ func validateAndProcessTools(tools []types.OpenAITool) ([]types.AnthropicTool, e
 			continue
 		}
 
+		// 过滤不支持的工具：web_search (静默过滤，不发送到上游)
+		if tool.Function.Name == "web_search" || tool.Function.Name == "websearch" {
+			continue
+		}
+
 		// 验证参数schema
 		if tool.Function.Parameters == nil {
 			validationErrors = append(validationErrors, fmt.Sprintf("tool[%d]: 参数schema不能为空", i))
@@ -236,6 +241,10 @@ func convertOpenAIContentToAnthropic(content any) (any, error) {
 					// 如果转换失败，跳过该块但继续处理其他块
 					continue
 				}
+				// 如果convertedBlock为nil，表示该块需要被过滤（如web_search）
+				if convertedBlock == nil {
+					continue
+				}
 				convertedBlocks = append(convertedBlocks, convertedBlock)
 			} else {
 				// 非map类型的项目，直接保留
@@ -299,8 +308,17 @@ func convertContentBlock(block map[string]any) (map[string]any, error) {
 		// 已经是Anthropic格式，无需转换
 		return block, nil
 
-	case "tool_result", "tool_use":
-		// 工具相关块，无需转换
+	case "tool_use":
+		// 过滤不支持的web_search工具调用（静默过滤，返回nil表示跳过）
+		if name, ok := block["name"].(string); ok {
+			if name == "web_search" || name == "websearch" {
+				return nil, nil
+			}
+		}
+		return block, nil
+
+	case "tool_result":
+		// tool_result块无需转换，直接返回
 		return block, nil
 
 	default:

converter/tools_test.go

@@ -169,6 +169,102 @@ func TestValidateAndProcessTools_MixedValidInvalid(t *testing.T) {
 	}
 }
 
+func TestValidateAndProcessTools_FilterWebSearch(t *testing.T) {
+	tools := []types.OpenAITool{
+		{
+			Type: "function",
+			Function: types.OpenAIFunction{
+				Name:        "get_weather",
+				Description: "Get weather information",
+				Parameters: map[string]any{
+					"type": "object",
+					"properties": map[string]any{
+						"location": map[string]any{"type": "string"},
+					},
+				},
+			},
+		},
+		{
+			Type: "function",
+			Function: types.OpenAIFunction{
+				Name:        "web_search",
+				Description: "Search the web",
+				Parameters: map[string]any{
+					"type": "object",
+					"properties": map[string]any{
+						"query": map[string]any{"type": "string"},
+					},
+				},
+			},
+		},
+		{
+			Type: "function",
+			Function: types.OpenAIFunction{
+				Name:        "calculator",
+				Description: "Perform calculations",
+				Parameters: map[string]any{
+					"type": "object",
+					"properties": map[string]any{
+						"expression": map[string]any{"type": "string"},
+					},
+				},
+			},
+		},
+	}
+
+	result, err := validateAndProcessTools(tools)
+
+	// web_search should be filtered out silently, no error
+	assert.NoError(t, err)
+	assert.Len(t, result, 2)
+	assert.Equal(t, "get_weather", result[0].Name)
+	assert.Equal(t, "calculator", result[1].Name)
+
+	// Ensure web_search is not in the result
+	for _, tool := range result {
+		assert.NotEqual(t, "web_search", tool.Name)
+		assert.NotEqual(t, "websearch", tool.Name)
+	}
+}
+
+func TestValidateAndProcessTools_FilterWebSearchVariant(t *testing.T) {
+	tools := []types.OpenAITool{
+		{
+			Type: "function",
+			Function: types.OpenAIFunction{
+				Name:        "websearch",
+				Description: "Search the web (variant name)",
+				Parameters: map[string]any{
+					"type": "object",
+					"properties": map[string]any{
+						"query": map[string]any{"type": "string"},
+					},
+				},
+			},
+		},
+		{
+			Type: "function",
+			Function: types.OpenAIFunction{
+				Name:        "valid_tool",
+				Description: "A valid tool",
+				Parameters: map[string]any{
+					"type": "object",
+					"properties": map[string]any{
+						"param": map[string]any{"type": "string"},
+					},
+				},
+			},
+		},
+	}
+
+	result, err := validateAndProcessTools(tools)
+
+	// websearch variant should also be filtered
+	assert.NoError(t, err)
+	assert.Len(t, result, 1)
+	assert.Equal(t, "valid_tool", result[0].Name)
+}
+
 func TestConvertOpenAIToolChoiceToAnthropic_StringAuto(t *testing.T) {
 	result := convertOpenAIToolChoiceToAnthropic("auto")
 
@@ -317,3 +413,81 @@ func TestConvertOpenAIContentToAnthropic_Default(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, 12345, result)
 }
+
+func TestConvertOpenAIContentToAnthropic_FilterWebSearchInHistory(t *testing.T) {
+	content := []any{
+		map[string]any{
+			"type": "text",
+			"text": "Let me search for that information.",
+		},
+		map[string]any{
+			"type": "tool_use",
+			"id":   "call_123",
+			"name": "web_search",
+			"input": map[string]any{
+				"query": "test query",
+			},
+		},
+		map[string]any{
+			"type": "tool_use",
+			"id":   "call_456",
+			"name": "calculator",
+			"input": map[string]any{
+				"expression": "2+2",
+			},
+		},
+	}
+
+	result, err := convertOpenAIContentToAnthropic(content)
+
+	assert.NoError(t, err)
+	assert.NotNil(t, result)
+
+	// 转换后的内容应该过滤掉web_search，只保留text和calculator
+	resultArray, ok := result.([]any)
+	assert.True(t, ok)
+	assert.Len(t, resultArray, 2, "应该过滤掉web_search，只保留2个块")
+
+	// 验证第一个是text块
+	block1, ok := resultArray[0].(map[string]any)
+	assert.True(t, ok)
+	assert.Equal(t, "text", block1["type"])
+
+	// 验证第二个是calculator的tool_use块
+	block2, ok := resultArray[1].(map[string]any)
+	assert.True(t, ok)
+	assert.Equal(t, "tool_use", block2["type"])
+	assert.Equal(t, "calculator", block2["name"])
+}
+
+func TestConvertOpenAIContentToAnthropic_FilterWebSearchVariantInHistory(t *testing.T) {
+	content := []any{
+		map[string]any{
+			"type": "tool_use",
+			"id":   "call_789",
+			"name": "websearch",
+			"input": map[string]any{
+				"query": "another query",
+			},
+		},
+		map[string]any{
+			"type": "text",
+			"text": "Some text",
+		},
+	}
+
+	result, err := convertOpenAIContentToAnthropic(content)
+
+	assert.NoError(t, err)
+	assert.NotNil(t, result)
+
+	// 转换后的内容应该过滤掉websearch变体，只保留text
+	resultArray, ok := result.([]any)
+	assert.True(t, ok)
+	assert.Len(t, resultArray, 1, "应该过滤掉websearch，只保留1个块")
+
+	// 验证是text块
+	block, ok := resultArray[0].(map[string]any)
+	assert.True(t, ok)
+	assert.Equal(t, "text", block["type"])
+}