print structuredContent from JSON RPC response

Author: burmudar

cmd/src/mcp.go

@@ -106,11 +106,15 @@ func handleMcpTool(ctx context.Context, client api.Client, tool *mcp.ToolDef, va
 		return err
 	}
 
-	data, err := mcp.ParseToolResponse(ctx, resp)
+	result, err := mcp.ParseToolResponse(resp)
 	if err != nil {
 		return err
 	}
 
-	fmt.Printf(string(data))
+	output, err := json.MarshalIndent(result, "", "  ")
+	if err != nil {
+		return err
+	}
+	fmt.Println(string(output))
 	return nil
 }

internal/mcp/mcp_request.go

@@ -7,8 +7,9 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/sourcegraph/sourcegraph/lib/errors"
 	"github.com/sourcegraph/src-cli/internal/api"
+
+	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
 
 const McpURLPath = ".api/mcp/v1"
@@ -49,7 +50,32 @@ func DoToolRequest(ctx context.Context, client api.Client, tool *ToolDef, vars m
 	return client.Do(req)
 }
 
-func ParseToolResponse(ctx context.Context, resp *http.Response) ([]byte, error) {
+func ParseToolResponse(resp *http.Response) (map[string]json.RawMessage, error) {
+	data, err := readSSEResponseData(resp)
+	if err != nil {
+		return nil, err
+	}
+
+	if data == nil {
+		return map[string]json.RawMessage{}, nil
+	}
+
+	jsonRPCResp := struct {
+		Version string `json:"jsonrpc"`
+		ID      int    `json:"id"`
+		Result  struct {
+			Content           []json.RawMessage          `json:"content"`
+			StructuredContent map[string]json.RawMessage `json:"structuredContent"`
+		} `json:"result"`
+	}{}
+	if err := json.Unmarshal(data, &jsonRPCResp); err != nil {
+		return nil, errors.Wrapf(err, "failed to unmarshal MCP JSON-RPC response")
+	}
+
+	return jsonRPCResp.Result.StructuredContent, nil
+}
+func readSSEResponseData(resp *http.Response) ([]byte, error) {
+	defer resp.Body.Close()
 	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err