Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions internal/einomcp/mcp_tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ func ToolsFromDefinitions(
return nil, fmt.Errorf("tool %q: %w", d.Function.Name, err)
}
out = append(out, &mcpBridgeTool{
info: info,
name: d.Function.Name,
agent: ag,
holder: holder,
record: rec,
chunk: toolOutputChunk,
invokeNotify: invokeNotify,
einoAgentName: strings.TrimSpace(einoAgentName),
info: info,
name: d.Function.Name,
agent: ag,
holder: holder,
record: rec,
chunk: toolOutputChunk,
invokeNotify: invokeNotify,
einoAgentName: strings.TrimSpace(einoAgentName),
})
}
return out, nil
Expand All @@ -77,12 +77,29 @@ func toolInfoFromDefinition(d agent.Tool) (*schema.ToolInfo, error) {
// 空参数对象
}
return &schema.ToolInfo{
Name: fn.Name,
Name: sanitizeOpenAIToolName(fn.Name),
Desc: fn.Description,
ParamsOneOf: schema.NewParamsOneOfByJSONSchema(&js),
}, nil
}

// sanitizeOpenAIToolName converts MCP names to OpenAI's ^[a-zA-Z0-9_-]+$ format.
// The original name remains on mcpBridgeTool and is still used for MCP routing.
func sanitizeOpenAIToolName(name string) string {
name = strings.ReplaceAll(name, "::", "__")
var b strings.Builder
b.Grow(len(name))
for _, r := range name {
if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') ||
(r >= '0' && r <= '9') || r == '_' || r == '-' {
b.WriteRune(r)
} else {
b.WriteByte('_')
}
}
return b.String()
}

type mcpBridgeTool struct {
info *schema.ToolInfo
name string
Expand Down
32 changes: 32 additions & 0 deletions internal/einomcp/mcp_tools_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,40 @@ package einomcp
import (
"strings"
"testing"

"cyberstrike-ai/internal/agent"
)

func TestToolInfoFromDefinitionSanitizesOpenAIToolName(t *testing.T) {
tests := []struct {
name string
want string
}{
{name: "fs.read", want: "fs_read"},
{name: "nezha::server.exec", want: "nezha__server_exec"},
{name: "already-valid_1", want: "already-valid_1"},
{name: "space/slash", want: "space_slash"},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
info, err := toolInfoFromDefinition(agent.Tool{
Type: "function",
Function: agent.FunctionDefinition{
Name: tt.name,
Parameters: map[string]interface{}{"type": "object"},
},
})
if err != nil {
t.Fatalf("toolInfoFromDefinition() error = %v", err)
}
if info.Name != tt.want {
t.Fatalf("toolInfoFromDefinition() name = %q, want %q", info.Name, tt.want)
}
})
}
}

func TestUnknownToolReminderText(t *testing.T) {
s := unknownToolReminderText("bad_tool")
if !strings.Contains(s, "bad_tool") {
Expand Down