merge fixup

Author: burmudar

cmd/src/mcp.go

@@ -1,10 +1,16 @@
 package main
 
 import (
+	"context"
+	"encoding/json"
 	"flag"
 	"fmt"
+	"strings"
 
+	"github.com/sourcegraph/src-cli/internal/api"
 	"github.com/sourcegraph/src-cli/internal/mcp"
+
+	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
 
 func init() {
@@ -16,7 +22,7 @@ func init() {
 }
 func mcpMain(args []string) error {
 	fmt.Println("NOTE: This command is still experimental")
-	tools, err := mcp.LoadToolDefinitions()
+	tools, err := mcp.LoadDefaultToolDefinitions()
 	if err != nil {
 		return err
 	}

internal/mcp/mcp_parse.go

@@ -72,8 +72,8 @@ func loadToolDefinitions(data []byte) (map[string]*ToolDef, error) {
 		Tools []struct {
 			Name         string    `json:"name"`
 			Description  string    `json:"description"`
-			InputSchema  RawSchema `json:"inputSchema"`
-			OutputSchema RawSchema `json:"outputSchema"`
+			InputSchema  rawSchema `json:"inputSchema"`
+			OutputSchema rawSchema `json:"outputSchema"`
 		} `json:"tools"`
 	}{}
 
@@ -109,22 +109,21 @@ func loadToolDefinitions(data []byte) (map[string]*ToolDef, error) {
 
 func (d *decoder) decodeRootSchema(r rawSchema) SchemaObject {
 	return SchemaObject{
-		Schema:               r.SchemaVersion,
-		Type:                 r.Type,
-		Description:          r.Description,
-		Required:             r.Required,
-		Properties:           d.decodeProperties(r.Properties),
+		Type:        r.Type,
+		Description: r.Description,
+		Required:    r.Required,
+		Properties:  d.decodeProperties(r.Properties),
 	}
 }
 
 func (d *decoder) decodeSchema(r *rawSchema) SchemaValue {
 	switch r.Type {
 	case "object":
 		return &SchemaObject{
-			Type:                 r.Type,
-			Description:          r.Description,
-			Required:             r.Required,
-			Properties:           d.decodeProperties(r.Properties),
+			Type:        r.Type,
+			Description: r.Description,
+			Required:    r.Required,
+			Properties:  d.decodeProperties(r.Properties),
 		}
 	case "array":
 		var items SchemaValue

internal/mcp/mcp_parse_test.go

@@ -37,7 +37,7 @@ func TestLoadToolDefinitions(t *testing.T) {
 	  ]
 	}`)
 
-	tools, err := LoadToolDefinitions(toolJSON)
+	tools, err := loadToolDefinitions(toolJSON)
 	if err != nil {
 		t.Fatalf("Failed to load tool definitions: %v", err)
 	}
@@ -46,13 +46,13 @@ func TestLoadToolDefinitions(t *testing.T) {
 		t.Fatalf("Expected 1 tool, got %d", len(tools))
 	}
 
-	tool := tools["test_tool"]
+	tool := tools["test-tool"]
 	if tool == nil {
 		t.Fatal("Tool 'test_tool' not found")
 	}
 
-	if tool.Name != "test_tool" {
-		t.Errorf("Expected name 'test_tool', got '%s'", tool.Name)
+	if tool.RawName != "test_tool" {
+		t.Errorf("Expected name 'test_tool', got '%s'", tool.RawName)
 	}
 
 	inputSchema := tool.InputSchema