export LoadToolDefinitions and add LoadDefaultToolDefinitions

Author: burmudar

cmd/src/mcp.go

@@ -17,7 +17,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
 	}

cmd/src/mcp_args.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"reflect"
 	"strings"
+
+	"github.com/sourcegraph/src-cli/internal/mcp"
 )
 
 var _ flag.Value = (*strSliceFlag)(nil)
@@ -35,13 +37,13 @@ func derefFlagValues(vars map[string]any) {
 	}
 }
 
-func buildArgFlagSet(tool *MCPToolDef) (*flag.FlagSet, map[string]any, error) {
-	fs := flag.NewFlagSet(tool.Name(), flag.ContinueOnError)
+func buildArgFlagSet(tool *mcp.ToolDef) (*flag.FlagSet, map[string]any, error) {
+	fs := flag.NewFlagSet(tool.Name, flag.ContinueOnError)
 	flagVars := map[string]any{}
 
 	for name, pVal := range tool.InputSchema.Properties {
 		switch pv := pVal.(type) {
-		case *SchemaPrimitive:
+		case *mcp.SchemaPrimitive:
 			switch pv.Kind {
 			case "integer":
 				dst := fs.Int(name, 0, pv.Description)
@@ -57,11 +59,11 @@ func buildArgFlagSet(tool *MCPToolDef) (*flag.FlagSet, map[string]any, error) {
 				return nil, nil, fmt.Errorf("unknown schema primitive kind %q", pv.Kind)
 
 			}
-		case *SchemaArray:
+		case *mcp.SchemaArray:
 			strSlice := new(strSliceFlag)
 			fs.Var(strSlice, name, pv.Description)
 			flagVars[name] = strSlice
-		case *SchemaObject:
+		case *mcp.SchemaObject:
 			// not supported yet
 		}
 	}

cmd/src/mcp_args_test.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"testing"
+
+	"github.com/sourcegraph/src-cli/internal/mcp"
 )
 
 func TestFlagSetParse(t *testing.T) {
@@ -44,7 +46,7 @@ func TestFlagSetParse(t *testing.T) {
 	  ]
 	}`)
 
-	defs, err := LoadMCPToolDefinitions(toolJSON)
+	defs, err := mcp.LoadToolDefinitions(toolJSON)
 	if err != nil {
 		t.Fatalf("failed to load tool json: %v", err)
 	}

internal/mcp/mcp_parse.go

@@ -63,11 +63,11 @@ type decoder struct {
 	errors []error
 }
 
-func LoadToolDefinitions() (map[string]*ToolDef, error) {
-	return loadToolDefinitions(mcpToolListJSON)
+func LoadDefaultToolDefinitions() (map[string]*ToolDef, error) {
+	return LoadToolDefinitions(mcpToolListJSON)
 }
 
-func loadToolDefinitions(data []byte) (map[string]*ToolDef, error) {
+func LoadToolDefinitions(data []byte) (map[string]*ToolDef, error) {
 	defs := struct {
 		Tools []struct {
 			Name         string    `json:"name"`