opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: sanitize tool call IDs before sending to Anthropic API

Browse source 
Session history from other providers (e.g. OpenAI/Codex) can contain
tool call IDs with dots and colons (e.g. `functions.web_fetch:0`) that
violate Anthropic's `^[a-zA-Z0-9_-]+$` constraint, causing 400 errors
on every subsequent message.

Add sanitizeToolID() to replace invalid characters with hyphens,
applied consistently to both tool_use and tool_result blocks so IDs
still match each other after transformation.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
bug 2026-02-16 18:05:02 +08:00
parent 214b201bfa
commit d24620f32d
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkg/providers/claude_provider.go
View file

@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"strings"
"github.com/anthropics/anthropic-sdk-go"
"github.com/anthropics/anthropic-sdk-go/option"
@ -56,6 +57,22 @@ func (p *ClaudeProvider) GetDefaultModel() string {
return "claude-sonnet-4-5-20250929"
}
// sanitizeToolID replaces characters not allowed in Anthropic tool use IDs
// (which must match ^[a-zA-Z0-9-]+$) with hyphens. The same transformation is
// applied to both tool_use and tool_result blocks so their IDs still match.
func sanitizeToolID(id string) string {
var b strings.Builder
b.Grow(len(id))
for _, r := range id {
if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') || r == '-' {
b.WriteRune(r)
} else {
b.WriteRune('-')
}
}
return b.String()
}
func buildClaudeParams(messages []Message, tools []ToolDefinition, model string, options map[string]interface{}) (anthropic.MessageNewParams, error) {
var system []anthropic.TextBlockParam
var anthropicMessages []anthropic.MessageParam
@ -67,7 +84,7 @@ func buildClaudeParams(messages []Message, tools []ToolDefinition, model string,
case "user":
if msg.ToolCallID != "" {
anthropicMessages = append(anthropicMessages,
anthropic.NewUserMessage(anthropic.NewToolResultBlock(msg.ToolCallID, msg.Content, false)),
anthropic.NewUserMessage(anthropic.NewToolResultBlock(sanitizeToolID(msg.ToolCallID), msg.Content, false)),
)
} else {
anthropicMessages = append(anthropicMessages,
@ -81,7 +98,7 @@ func buildClaudeParams(messages []Message, tools []ToolDefinition, model string,
blocks = append(blocks, anthropic.NewTextBlock(msg.Content))
}
for _, tc := range msg.ToolCalls {
blocks = append(blocks, anthropic.NewToolUseBlock(tc.ID, tc.Arguments, tc.Name))
blocks = append(blocks, anthropic.NewToolUseBlock(sanitizeToolID(tc.ID), tc.Arguments, tc.Name))
}
anthropicMessages = append(anthropicMessages, anthropic.NewAssistantMessage(blocks...))
} else {
@ -91,7 +108,7 @@ func buildClaudeParams(messages []Message, tools []ToolDefinition, model string,
}
case "tool":
anthropicMessages = append(anthropicMessages,
anthropic.NewUserMessage(anthropic.NewToolResultBlock(msg.ToolCallID, msg.Content, false)),
anthropic.NewUserMessage(anthropic.NewToolResultBlock(sanitizeToolID(msg.ToolCallID), msg.Content, false)),
)
}
}