Merge branch 'main' into michal/lsp

Author: jupblb

cmd/src/mcp.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"maps"
 	"strings"
 
 	"github.com/sourcegraph/src-cli/internal/mcp"
@@ -29,6 +30,12 @@ func mcpUsage() {
 	fmt.Println("  src mcp <tool-name> schema      View the input/output schema of a tool")
 	fmt.Println("  src mcp <tool-name> <flags>     Invoke a tool with the given flags")
 	fmt.Println("  src mcp <tool-name> -h          List the available flags of a tool")
+	fmt.Println("\nCOMMON FLAGS:")
+	fmt.Println("  --json '{...}'                  Provide all tool arguments as a JSON object (recommended for agents)")
+	fmt.Println("\nNOTE:")
+	fmt.Println("  When both --json and explicit flags are provided, values from --json take precedence.")
+	fmt.Println("\nEXAMPLE:")
+	fmt.Println("  src mcp <tool-name> --json '{\"arg1\": \"value1\", \"arg2\": \"value2\"}'")
 }
 
 func mcpMain(args []string) error {
@@ -76,6 +83,20 @@ func mcpMain(args []string) error {
 	}
 	mcp.DerefFlagValues(flags, vars)
 
+	// arguments provided via a JSON object take precedence over explicit values provided from flags
+	if val, ok := vars["json"]; ok {
+		if jsonVal, ok := val.(string); ok && len(jsonVal) > 0 {
+			m := make(map[string]any)
+			if err := json.Unmarshal([]byte(jsonVal), &m); err != nil {
+				return err
+			}
+			// copy overrides existing keys
+			maps.Copy(vars, m)
+		}
+		// we delete "json" from vars, otherwise it will be sent as a argument to the tool call
+		delete(vars, "json")
+	}
+
 	if err := validateToolArgs(tool.InputSchema, args, vars); err != nil {
 		return err
 	}
@@ -94,16 +115,20 @@ func mcpMain(args []string) error {
 }
 
 func printSchemas(tool *mcp.ToolDef) error {
-	input, err := json.Marshal(tool.InputSchema)
-	if err != nil {
-		return err
+	var schema = struct {
+		Name   string `json:"tool"`
+		Input  any    `json:"inputSchema"`
+		Output any    `json:"outputSchema"`
+	}{
+		Name:   tool.Name,
+		Input:  tool.InputSchema,
+		Output: tool.OutputSchema,
 	}
-	output, err := json.Marshal(tool.OutputSchema)
+	jsonVal, err := json.Marshal(schema)
 	if err != nil {
 		return err
 	}
-
-	fmt.Printf("Input:\n%v\nOutput:\n%v\n", string(input), string(output))
+	fmt.Println(string(jsonVal))
 	return nil
 }
 

internal/api/api.go

@@ -174,6 +174,10 @@ func (c *client) createHTTPRequest(ctx context.Context, method, p string, body i
 	if *c.opts.Flags.trace {
 		req.Header.Set("X-Sourcegraph-Should-Trace", "true")
 	}
+
+	// Set before additional headers, in case of an override.
+	req.Header.Set("Content-Type", "application/json")
+
 	for k, v := range c.opts.AdditionalHeaders {
 		req.Header.Set(k, v)
 	}
@@ -322,6 +326,10 @@ func (r *request) curlCmd() (string, error) {
 	if r.client.opts.AccessToken != "" {
 		s += fmt.Sprintf("   %s \\\n", shellquote.Join("-H", "Authorization: token "+r.client.opts.AccessToken))
 	}
+	// Preserve overrides if Content-Type is set
+	if r.client.opts.AdditionalHeaders["Content-Type"] == "" {
+		r.client.opts.AdditionalHeaders["Content-Type"] = "application/json"
+	}
 	for k, v := range r.client.opts.AdditionalHeaders {
 		s += fmt.Sprintf("   %s \\\n", shellquote.Join("-H", k+": "+v))
 	}

internal/mcp/mcp_args.go

@@ -93,5 +93,7 @@ func BuildArgFlagSet(tool *ToolDef) (*flag.FlagSet, map[string]any, error) {
 		}
 	}
 
+	flagVars["json"] = fs.String("json", "", "provide all arguments as a JSON object")
+
 	return fs, flagVars, nil
 }