Skip to content

Change error handling for tool call #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mark19891107 merged 2 commits into from
Jun 20, 2025
Merged

Change error handling for tool call #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d62cc7d
Return tool call errors in content
mark19891107 Jun 20, 2025
0de032f
Fix tool not found test expectations
mark19891107 Jun 20, 2025
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
11 changes: 6 additions & 5 deletions pkg/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,13 +826,14 @@ func handleToolCallJSONRPC(connID string, req *jsonRPCRequest, toolSet *mcp.Tool
log.Printf("Received response body for tool '%s': %s", params.ToolName, string(bodyBytes))
// Check status code for API-level errors
if httpResp.StatusCode < 200 || httpResp.StatusCode >= 300 {
// Put error details into the Content field so MCP clients can access them
errText := fmt.Sprintf("Tool '%s' API call failed with status %s: %s", params.ToolName, httpResp.Status, string(bodyBytes))
resultPayload = ToolResultPayload{
IsError: true,
Error: &MCPError{
Code: httpResp.StatusCode,
Message: fmt.Sprintf("Tool '%s' API call failed with status %s", params.ToolName, httpResp.Status),
Data: string(bodyBytes), // Include response body in error data
},
Content: []ToolResultContent{{
Type: "text",
Text: errText,
}},
ToolCallID: fmt.Sprintf("%v", req.ID),
}
} else {
Expand Down
14 changes: 7 additions & 7 deletions pkg/server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,13 @@ func TestHttpMethodPostHandler(t *testing.T) {
expectedSyncStatus: http.StatusAccepted,
expectedSyncBody: "Request accepted, response will be sent via SSE.\n",
checkAsyncResponse: func(t *testing.T, resp jsonRPCResponse) {
assert.Equal(t, "call-post-err-1", resp.ID)
assert.Nil(t, resp.Error)
resultPayload, ok := resp.Result.(ToolResultPayload)
require.True(t, ok)
assert.True(t, resultPayload.IsError)
require.NotNil(t, resultPayload.Error)
assert.Contains(t, resultPayload.Error.Message, "operation details for tool 'nonexistent_tool' not found")
assert.Equal(t, "call-post-err-1", resp.ID)
assert.Nil(t, resp.Error)
resultPayload, ok := resp.Result.(ToolResultPayload)
require.True(t, ok)
assert.True(t, resultPayload.IsError)
require.NotNil(t, resultPayload.Error)
assert.Contains(t, resultPayload.Error.Message, "operation details for tool 'nonexistent_tool' not found")
},
},
{
Expand Down
Loading