Merge branch 'main' into wb/tool-registry

Author: burmudar

cmd/src/mcp.go

@@ -32,7 +32,6 @@ func mcpUsage() {
 }
 
 func mcpMain(args []string) error {
-	fmt.Println("NOTE: This command is still experimental")
 	apiClient := cfg.apiClient(nil, mcpFlagSet.Output())
 
 	ctx := context.Background()

internal/mcp/mcp_request.go

@@ -112,6 +112,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"`
@@ -125,6 +126,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) {