move mcp args to internal/mcp

Author: burmudar

cmd/src/mcp.go

@@ -39,7 +39,7 @@ func mcpMain(args []string) error {
 }
 
 func handleMcpTool(tool *mcp.ToolDef, args []string) error {
-	fs, vars, err := buildArgFlagSet(tool)
+	fs, vars, err := mcp.BuildArgFlagSet(tool)
 	if err != nil {
 		return err
 	}
@@ -60,7 +60,7 @@ func handleMcpTool(tool *mcp.ToolDef, args []string) error {
 		return fmt.Errorf("not enough arguments provided - the following flags are required:\n%s", strings.Join(inputSchema.Required, "\n"))
 	}
 
-	derefFlagValues(vars)
+	mcp.DerefFlagValues(vars)
 
 	fmt.Println("Flags")
 	for name, val := range vars {

cmd/src/mcp_args.go renamed to internal/mcp/mcp_args.go

@@ -1,12 +1,10 @@
-package main
+package mcp
 
 import (
 	"flag"
 	"fmt"
 	"reflect"
 	"strings"
-
-	"github.com/sourcegraph/src-cli/internal/mcp"
 )
 
 var _ flag.Value = (*strSliceFlag)(nil)
@@ -24,7 +22,7 @@ func (s *strSliceFlag) String() string {
 	return strings.Join(s.vals, ",")
 }
 
-func derefFlagValues(vars map[string]any) {
+func DerefFlagValues(vars map[string]any) {
 	for k, v := range vars {
 		rfl := reflect.ValueOf(v)
 		if rfl.Kind() == reflect.Pointer {
@@ -37,13 +35,13 @@ func derefFlagValues(vars map[string]any) {
 	}
 }
 
-func buildArgFlagSet(tool *mcp.ToolDef) (*flag.FlagSet, map[string]any, error) {
+func BuildArgFlagSet(tool *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 *mcp.SchemaPrimitive:
+		case *SchemaPrimitive:
 			switch pv.Kind {
 			case "integer":
 				dst := fs.Int(name, 0, pv.Description)
@@ -59,11 +57,11 @@ func buildArgFlagSet(tool *mcp.ToolDef) (*flag.FlagSet, map[string]any, error) {
 				return nil, nil, fmt.Errorf("unknown schema primitive kind %q", pv.Kind)
 
 			}
-		case *mcp.SchemaArray:
+		case *SchemaArray:
 			strSlice := new(strSliceFlag)
 			fs.Var(strSlice, name, pv.Description)
 			flagVars[name] = strSlice
-		case *mcp.SchemaObject:
+		case *SchemaObject:
 			// not supported yet
 		}
 	}

cmd/src/mcp_args_test.go renamed to internal/mcp/mcp_args_test.go

@@ -1,9 +1,7 @@
-package main
+package mcp
 
 import (
 	"testing"
-
-	"github.com/sourcegraph/src-cli/internal/mcp"
 )
 
 func TestFlagSetParse(t *testing.T) {
@@ -46,12 +44,12 @@ func TestFlagSetParse(t *testing.T) {
 	  ]
 	}`)
 
-	defs, err := mcp.LoadToolDefinitions(toolJSON)
+	defs, err := loadToolDefinitions(toolJSON)
 	if err != nil {
 		t.Fatalf("failed to load tool json: %v", err)
 	}
 
-	flagSet, vars, err := buildArgFlagSet(defs["sg_test_tool"])
+	flagSet, vars, err := BuildArgFlagSet(defs["sg_test_tool"])
 	if err != nil {
 		t.Fatalf("failed to build flagset from mcp tool definition: %v", err)
 	}
@@ -65,7 +63,7 @@ func TestFlagSetParse(t *testing.T) {
 	if err := flagSet.Parse(args); err != nil {
 		t.Fatalf("flagset parsing failed: %v", err)
 	}
-	derefFlagValues(vars)
+	DerefFlagValues(vars)
 
 	if v, ok := vars["repos"].([]string); ok {
 		if len(v) != 2 {

internal/mcp/mcp_parse.go

@@ -69,10 +69,10 @@ type parser struct {
 }
 
 func LoadDefaultToolDefinitions() (map[string]*ToolDef, error) {
-	return LoadToolDefinitions(mcpToolListJSON)
+	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"`