use the ask-mai config for ask-mai-mcp cli

Author: rainu

frontend/wailsjs/go/models.ts

@@ -612,7 +612,6 @@ export namespace builtin {
 	    DirectoryDeletion: DirectoryDeletion;
 	    CommandExec: CommandExecution;
 	    Http: Http;
-	    Disable: boolean;
 
 	    static createFrom(source: any = {}) {
 	        return new BuiltIns(source);
@@ -637,7 +636,6 @@ export namespace builtin {
 	        this.DirectoryDeletion = this.convertValues(source["DirectoryDeletion"], DirectoryDeletion);
 	        this.CommandExec = this.convertValues(source["CommandExec"], CommandExecution);
 	        this.Http = this.convertValues(source["Http"], Http);
-	        this.Disable = source["Disable"];
 	    }
 
 		convertValues(a: any, classs: any, asMap: boolean = false): any {
@@ -1110,8 +1108,8 @@ export namespace file {
 	}
 	export class ChangeOwnerArguments {
 	    path: string;
-	    user_id: number;
-	    group_id: number;
+	    user_id?: number;
+	    group_id?: number;
 
 	    static createFrom(source: any = {}) {
 	        return new ChangeOwnerArguments(source);

internal/app/mcp-server/main.go

@@ -3,8 +3,9 @@ package mcp_server
 import (
 	"fmt"
 	"github.com/mark3labs/mcp-go/server"
-	"github.com/rainu/ask-mai/internal/config/model/llm/tools/builtin"
-	mcpServer "github.com/rainu/ask-mai/internal/mcp/server/builtin"
+	"github.com/rainu/ask-mai/internal/config"
+	mcpServer "github.com/rainu/ask-mai/internal/mcp/server"
+	"log/slog"
 	"os"
 )
 
@@ -13,13 +14,27 @@ type Args struct {
 }
 
 func Main(args Args) int {
-	s := mcpServer.NewServer(args.VersionLine, builtin.BuiltIns{})
-	err := server.ServeStdio(s)
+	cfg := config.Parse(os.Args[1:], os.Environ())
+	if cfg.Version {
+		fmt.Fprintln(os.Stderr, args.VersionLine)
+		return 0
+	}
 
-	if err != nil {
+	if err := cfg.Validate(); err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 		return 1
 	}
+	slog.SetLogLoggerLevel(*cfg.DebugConfig.LogLevelParsed)
+
+	ap := cfg.GetActiveProfile()
+
+	ms := mcpServer.NewServer(args.VersionLine, ap.LLM.Tool.BuiltIns, ap.LLM.Tool.Custom)
+	err := server.ServeStdio(ms)
+
+	if err != nil {
+		fmt.Fprintln(os.Stderr, err.Error())
+		return 2
+	}
 
 	return 0
 }

internal/mcp/server/builtin/server.go

@@ -15,7 +15,12 @@ func NewServer(version string, cfg builtin.BuiltIns) *server.MCPServer {
 		version,
 		server.WithToolCapabilities(false),
 	)
+	AddTools(s, cfg)
 
+	return s
+}
+
+func AddTools(s *server.MCPServer, cfg builtin.BuiltIns) {
 	if !cfg.SystemTime.Disable {
 		s.AddTool(system.SystemTimeTool, system.SystemTimeToolHandler)
 	}
@@ -72,6 +77,4 @@ func NewServer(version string, cfg builtin.BuiltIns) *server.MCPServer {
 	if !cfg.Http.Disable {
 		s.AddTool(http.CallTool, http.CallToolHandler)
 	}
-
-	return s
 }

internal/mcp/server/combined.go

@@ -0,0 +1,21 @@
+package server
+
+import (
+	"github.com/mark3labs/mcp-go/server"
+	"github.com/rainu/ask-mai/internal/config/model/llm/tools/builtin"
+	"github.com/rainu/ask-mai/internal/config/model/llm/tools/command"
+	bServer "github.com/rainu/ask-mai/internal/mcp/server/builtin"
+	cServer "github.com/rainu/ask-mai/internal/mcp/server/custom"
+)
+
+func NewServer(version string, bConfig builtin.BuiltIns, cConfig map[string]command.FunctionDefinition) *server.MCPServer {
+	s := server.NewMCPServer(
+		"ask-mai",
+		version,
+		server.WithToolCapabilities(false),
+	)
+	bServer.AddTools(s, bConfig)
+	cServer.AddTools(s, cConfig)
+
+	return s
+}

internal/mcp/server/custom/server.go

@@ -14,15 +14,7 @@ func NewServer(version string, cfg map[string]command.FunctionDefinition) *serve
 		version,
 		server.WithToolCapabilities(false),
 	)
-
-	for name, definition := range cfg {
-		t := mcp.Tool{
-			Name:        name,
-			Description: definition.Description,
-			InputSchema: definition.Parameters,
-		}
-		s.AddTool(t, handlerFor(definition))
-	}
+	AddTools(s, cfg)
 
 	return s
 }
@@ -38,3 +30,14 @@ func handlerFor(definition command.FunctionDefinition) server.ToolHandlerFunc {
 		return mcp.NewToolResultText(string(rawResult)), err
 	}
 }
+
+func AddTools(s *server.MCPServer, cfg map[string]command.FunctionDefinition) {
+	for name, definition := range cfg {
+		t := mcp.Tool{
+			Name:        name,
+			Description: definition.Description,
+			InputSchema: definition.Parameters,
+		}
+		s.AddTool(t, handlerFor(definition))
+	}
+}