Skip to content

chore(mcp): handle MCP isError response #1236

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
burmudar merged 2 commits into from
Dec 10, 2025
Merged

chore(mcp): handle MCP isError response #1236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66b09dd
Handle MCP isError response flag
burmudar Dec 10, 2025
68582cf
Merge branch 'main' into wb/mcp-iserror
burmudar Dec 10, 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
14 changes: 14 additions & 0 deletions internal/mcp/mcp_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ func DecodeToolResponse(resp *http.Response) (map[string]json.RawMessage, error)
Result struct {
Content []json.RawMessage `json:"content"`
StructuredContent map[string]json.RawMessage `json:"structuredContent"`
IsError bool `json:"isError"`
} `json:"result"`
Error *struct {
Code int `json:"code"`
Expand All @@ -124,6 +125,19 @@ func DecodeToolResponse(resp *http.Response) (map[string]json.RawMessage, error)
return nil, errors.Newf("MCP tools/call failed: %d %s", jsonRPCResp.Error.Code, jsonRPCResp.Error.Message)
}

if jsonRPCResp.Result.IsError {
if len(jsonRPCResp.Result.Content) > 0 {
var textContent struct {
Text string `json:"text"`
}
if err := json.Unmarshal(jsonRPCResp.Result.Content[0], &textContent); err == nil && textContent.Text != "" {
return nil, errors.Newf("MCP tool error: %s", textContent.Text)
}
return nil, errors.Newf("MCP tool error: %s", string(jsonRPCResp.Result.Content[0]))
}
return nil, errors.New("MCP tool returned an error")
}

return jsonRPCResp.Result.StructuredContent, nil
}
func readSSEResponseData(resp *http.Response) ([]byte, error) {
Expand Down
Loading