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
4 changes: 4 additions & 0 deletions internal/service/server/adapter_dispatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ func (s *Server) handleWithAdapters(
writeOpenAIError(w, http.StatusInternalServerError, payload)
return
}
// Filter out tools with empty names — Codex desktop sometimes sends
// tools with empty names that upstream APIs (DeepSeek, Qwen) reject
// with a 400 error.
coreReq.Tools = filterEmptyCoreToolNames(coreReq.Tools)

// ------------------------------------------------------------------
// 3. Pick upstream provider candidate, resolve ProviderAdapter.
Expand Down
21 changes: 21 additions & 0 deletions internal/service/server/filter_empty_tools.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package server

import (
"moonbridge/internal/format"
)

// filterEmptyCoreToolNames removes tools whose name is empty.
// Codex desktop sometimes sends tools with empty names that
// upstream APIs (DeepSeek, Qwen) reject with a 400 error.
func filterEmptyCoreToolNames(tools []format.CoreTool) []format.CoreTool {
if len(tools) == 0 {
return tools
}
filtered := make([]format.CoreTool, 0, len(tools))
for _, t := range tools {
if t.Name != "" {
filtered = append(filtered, t)
}
}
return filtered
}
69 changes: 69 additions & 0 deletions internal/service/server/filter_empty_tools_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package server

import (
"moonbridge/internal/format"
"testing"
)

func TestFilterEmptyCoreToolNames(t *testing.T) {
tests := []struct {
name string
tools []format.CoreTool
expected int
}{
{
name: "empty tools",
tools: []format.CoreTool{},
expected: 0,
},
{
name: "no empty names",
tools: []format.CoreTool{
{Name: "tool1"},
{Name: "tool2"},
},
expected: 2,
},
{
name: "one empty name at end",
tools: []format.CoreTool{
{Name: "tool1"},
{Name: "tool2"},
{Name: ""},
},
expected: 2,
},
{
name: "one empty name in middle",
tools: []format.CoreTool{
{Name: "tool1"},
{Name: ""},
{Name: "tool3"},
},
expected: 2,
},
{
name: "all empty names",
tools: []format.CoreTool{
{Name: ""},
{Name: ""},
},
expected: 0,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := filterEmptyCoreToolNames(tt.tools)
if len(result) != tt.expected {
t.Errorf("filterEmptyCoreToolNames() returned %d tools, want %d", len(result), tt.expected)
}
// Verify no empty names remain
for _, tool := range result {
if tool.Name == "" {
t.Errorf("filtered result still contains tool with empty name")
}
}
})
}
}