xonecas.io
60255
Zn

Zoea-Nova / commit 5c8f43f

fix(mcp): return tool errors as tool results

xonecas2026-02-07 5c8f43fff58e4a14cbb8b67cb34c93d32d2dbcf6 parent 57ced1b

2 files changed

internal/mcp/client.go+4−1
@@ -199,7 +199,10 @@ func (c *Client) CallTool(ctx context.Context, name string, arguments interface{
199199 }
200200
201201 if resp.Error != nil {
202- return nil, fmt.Errorf("mcp error %d: %s", resp.Error.Code, resp.Error.Message)
202+ return &ToolResult{
203+ Content: []ContentBlock{{Type: "text", Text: fmt.Sprintf("Error: %s", resp.Error.Message)}},
204+ IsError: true,
205+ }, nil
203206 }
204207
205208 var result ToolResult
internal/mcp/client_test.go+29−0
@@ -101,3 +101,32 @@ func TestClientParseSSEResponseLargePayload(t *testing.T) {
101101 t.Errorf("expected ID=3, got %v", resp.ID)
102102 }
103103 }
104+
105+func TestClientCallToolErrorReturnsToolResult(t *testing.T) {
106+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
107+ var req Request
108+ json.NewDecoder(r.Body).Decode(&req)
109+
110+ if req.Method != "tools/call" {
111+ resp := NewErrorResponse(req.ID, 0, "unexpected method")
112+ json.NewEncoder(w).Encode(resp)
113+ return
114+ }
115+
116+ resp := NewErrorResponse(req.ID, 42, "insufficient_items: Not enough Iron Ore")
117+ json.NewEncoder(w).Encode(resp)
118+ }))
119+ defer server.Close()
120+
121+ client := NewClient(server.URL)
122+ result, err := client.CallTool(context.Background(), "sell", map[string]string{"item_id": "ore_iron"})
123+ if err != nil {
124+ t.Fatalf("CallTool() error: %v", err)
125+ }
126+ if result == nil || !result.IsError {
127+ t.Fatalf("expected tool error result, got %+v", result)
128+ }
129+ if len(result.Content) == 0 || !strings.Contains(result.Content[0].Text, "insufficient_items") {
130+ t.Fatalf("expected error message in tool result, got %+v", result)
131+ }
132+}