Support toolcalling without specifying provider

Author: radare

prompts/tool.md

@@ -24,6 +24,8 @@ Before executing any tools:
 > 🔁 **Avoid loops:** If you find yourself proposing the same step again, stop and re-evaluate.  
 > ❌ **No validation:** Once a tool is executed, do not re-check it unless new input justifies it
 
+**IMPORTANT** Create a new plan if we find out new information that is relevant to solve the user request.
+
 ## Execution
 
 When executing the plan:

src/mcps/gemcode/gemcode.go

@@ -719,6 +719,8 @@ func (s *GemCodeService) handleRunShellCommand(args map[string]any) (any, error)
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
 
+	fmt.Fprintln(os.Stderr, "This is the command: " + command)
+
 	err := cmd.Run()
 
 	returnCode := 0

src/repl/tools.go

@@ -79,29 +79,34 @@ func callTool(tool *Tool) (string, error) {
 		}
 	}
 
+	var out bytes.Buffer
+	var stderr bytes.Buffer
 	// Combine the tool name and arguments for the mai-tool command
 	// tool.Name may be in the format "server/tool"
-	cmdArgs := append([]string{"call", toolName}, safeArgs...)
+	/*
 	cmd := exec.Command("mai-tool", cmdArgs...)
 
-	var out bytes.Buffer
-	var stderr bytes.Buffer
 	cmd.Stdout = &out
 	cmd.Stderr = &stderr
+	*/
+	timeout := 60
+	cmdArgs := append([]string{"call", toolName}, safeArgs...)
 
 	// Set a timeout for the command execution
-	timeoutCtx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+	timeoutCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 
 	// Set the command context with timeout
-	cmd = exec.CommandContext(timeoutCtx, "mai-tool", cmdArgs...)
+	cmd := exec.CommandContext(timeoutCtx, "mai-tool", cmdArgs...)
 	cmd.Stdout = &out
 	cmd.Stderr = &stderr
+	fmt.Println("MAITOOLRUN " + toolName)
+	fmt.Println("MAITOOLARG " + strings.Join(cmdArgs, " '"))
 
 	err := cmd.Run()
 	if err != nil {
 		if errors.Is(err, context.DeadlineExceeded) {
-			return "", fmt.Errorf("tool execution timed out after 30 seconds: %s", tool.Name)
+			return "", fmt.Errorf("tool execution timed out after %d seconds: %s", timeout, tool.Name)
 		}
 		return "", fmt.Errorf("error executing tool %s: %v: %s", tool.Name, err, stderr.String())
 	}
@@ -168,6 +173,9 @@ func mapToArray(m map[string]interface{}) []string {
 // extractJSONBlock locates the first balanced JSON object in text (or fenced JSON)
 // and returns it plus any remaining tail text.
 func extractJSONBlock(text string) (string, string) {
+	if !strings.Contains(text, "\"plan\"") {
+		return "", text
+	}
 	// Attempt fenced JSON block: ```json ... ```
 	re := regexp.MustCompile("(?s)```json\\s*(.*?)\\s*```")
 	matches := re.FindStringSubmatch(text)

src/tool/main.go

@@ -146,14 +146,19 @@ func main() {
 			toolName = slicedText[1]
 			params = parseParams(flag.Args()[2:])
 		} else {
-			if nargs < 3 {
-				fmt.Println("Error: 'call' requires server and tool name")
-				fmt.Println("Usage: mcpcli call <server> <tool> [param1=value1] [param2=value2] ...")
-				os.Exit(1)
-			}
-			serverName = flag.Args()[1]
-			toolName = flag.Args()[2]
-			params = parseParams(flag.Args()[3:])
+			serverName = ""
+			toolName = arg1
+			params = parseParams(flag.Args()[1:])
+			/*
+				if nargs < 3 {
+					fmt.Println("Error: 'call' requires server and tool name")
+					fmt.Println("Usage: mcpcli call <server> <tool> [param1=value1] [param2=value2] ...")
+					os.Exit(1)
+				}
+				serverName = flag.Args()[1]
+				toolName = flag.Args()[2]
+				params = parseParams(flag.Args()[3:])
+			*/
 		}
 		callTool(config, serverName, toolName, params)
 	case "servers":
@@ -440,6 +445,8 @@ func listTools(config Config) {
 func callTool(config Config, serverName, toolName string, params map[string]string) {
 	var resp *http.Response
 	var requestErr error
+	// fmt.Println("server: "+serverName)
+	// fmt.Println("tool: "+toolName)
 
 	// If serverName contains a slash, it's in the format "server/tool"
 	if strings.Contains(serverName, "/") {
@@ -453,8 +460,12 @@ func callTool(config Config, serverName, toolName string, params map[string]stri
 
 	// Standard tool call for other tools
 	var endpoint string
-	// Always use /call endpoint for tool calls
-	endpoint = fmt.Sprintf("/call/%s/%s", serverName, toolName)
+	if serverName == "" {
+		endpoint = fmt.Sprintf("/call/%s", toolName)
+	} else {
+		// Always use /call endpoint for tool calls
+		endpoint = fmt.Sprintf("/call/%s/%s", serverName, toolName)
+	}
 
 	// Build the tool URL
 	toolUrl := buildApiUrl(config, endpoint)

src/wmcp/README.md

@@ -27,9 +27,11 @@ Shows the status of all running MCP servers.
 ### Call a Tool
 ```bash
 GET /call/{server}/{tool}?param=value
+GET /call/{tool}?param=value
 POST /call/{server}/{tool}
+POST /call/{tool}
 ```
-Calls a specific tool on a specific server.
+Calls a specific tool on a specific server, or uses auto-discovery when only the tool is specified.
 
 ## Examples
 
@@ -156,4 +158,3 @@ curl -X POST "http://localhost:8080/tools/server1/openFile" \
   -d '{"invalid": "parameter"}'
 # HTTP 400: Tool call failed: missing required parameter 'filePath'
 ```
-

src/wmcp/main.go

@@ -879,6 +879,21 @@ func (s *MCPService) callToolHandler(w http.ResponseWriter, r *http.Request) {
 	s.mutex.RLock()
 	server, exists := s.servers[serverName]
 	s.mutex.RUnlock()
+	if !exists {
+		for name, _server := range s.servers {
+			for _, tool := range _server.Tools {
+				if toolName == tool.Name {
+					serverName = name
+					server = _server
+					exists = true
+					break
+				}
+			}
+			if exists {
+				break
+			}
+		}
+	}
 
 	if !exists {
 		http.Error(w, fmt.Sprintf("Server '%s' not found", serverName), http.StatusNotFound)
@@ -1190,6 +1205,7 @@ func main() {
 	// Call a specific tool (old endpoint for backward compatibility)
 	router.HandleFunc("/tools/{server}/{tool}", service.callToolHandler).Methods("GET", "POST")
 	// Call a specific tool (new endpoint)
+	router.HandleFunc("/call/{tool}", service.callToolHandler).Methods("GET", "POST")
 	router.HandleFunc("/call/{server}/{tool}", service.callToolHandler).Methods("GET", "POST")
 
 	// Root endpoint with usage info
@@ -1206,8 +1222,10 @@ Available endpoints:
 - GET /tools/markdown - List all tools in markdown format
 - GET /tools/{server}/{tool}?param=value - Call tool with query parameters (legacy)
 - GET /call/{server}/{tool}?param=value - Call tool with query parameters
+- GET /call/{tool}?param=value - Call tool on auto-discovered server
 - POST /tools/{server}/{tool} - Call tool with JSON body or form data (legacy)
 - POST /call/{server}/{tool} - Call tool with JSON body or form data
+- POST /call/{tool} - Call tool with JSON body or form data (auto-discovered server)
 
 Examples:
 - curl http://localhost:8080/tools