From 6da65000781ebcb323d1aede6468d7f9314c70f8 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
Date: Fri, 1 Aug 2025 22:43:02 -0300
Subject: [PATCH] fix: mcp client must be started (#474)

* fix: mcp client must be started
* refactor: minor improvements
---
 internal/llm/agent/mcp-tools.go | 48 +++++++++++++++++----------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/internal/llm/agent/mcp-tools.go b/internal/llm/agent/mcp-tools.go
index cc43a7fce33371b82fd929f3e3565d8688a34397..97f00c92d156b5d50c2a6a84d1f853a0db1246aa 100644
--- a/internal/llm/agent/mcp-tools.go
+++ b/internal/llm/agent/mcp-tools.go
@@ -132,6 +132,16 @@ func CloseMCPClients() {
 	}
 }
 
+var mcpInitRequest = mcp.InitializeRequest{
+	Params: mcp.InitializeParams{
+		ProtocolVersion: mcp.LATEST_PROTOCOL_VERSION,
+		ClientInfo: mcp.Implementation{
+			Name:    "Crush",
+			Version: version.Version,
+		},
+	},
+}
+
 func doGetMCPTools(ctx context.Context, permissions permission.Service, cfg *config.Config) []tools.BaseTool {
 	var wg sync.WaitGroup
 	result := csync.NewSlice[tools.BaseTool]()
@@ -143,15 +153,25 @@ func doGetMCPTools(ctx context.Context, permissions permission.Service, cfg *con
 		wg.Add(1)
 		go func(name string, m config.MCPConfig) {
 			defer wg.Done()
-			c, err := doGetClient(m)
+			c, err := createMcpClient(m)
 			if err != nil {
-				slog.Error("error creating mcp client", "error", err)
+				slog.Error("error creating mcp client", "error", err, "name", name)
 				return
 			}
-			if err := doInitClient(ctx, name, c); err != nil {
-				slog.Error("error initializing mcp client", "error", err)
+			if err := c.Start(ctx); err != nil {
+				slog.Error("error starting mcp client", "error", err, "name", name)
+				_ = c.Close()
 				return
 			}
+			if _, err := c.Initialize(ctx, mcpInitRequest); err != nil {
+				slog.Error("error initializing mcp client", "error", err, "name", name)
+				_ = c.Close()
+				return
+			}
+
+			slog.Info("Initialized mcp client", "name", name)
+			mcpClients.Set(name, c)
+
 			result.Append(getTools(ctx, name, permissions, c, cfg.WorkingDir())...)
 		}(name, m)
 	}
@@ -159,25 +179,7 @@ func doGetMCPTools(ctx context.Context, permissions permission.Service, cfg *con
 	return slices.Collect(result.Seq())
 }
 
-func doInitClient(ctx context.Context, name string, c *client.Client) error {
-	initRequest := mcp.InitializeRequest{
-		Params: mcp.InitializeParams{
-			ProtocolVersion: mcp.LATEST_PROTOCOL_VERSION,
-			ClientInfo: mcp.Implementation{
-				Name:    "Crush",
-				Version: version.Version,
-			},
-		},
-	}
-	if _, err := c.Initialize(ctx, initRequest); err != nil {
-		c.Close()
-		return err
-	}
-	mcpClients.Set(name, c)
-	return nil
-}
-
-func doGetClient(m config.MCPConfig) (*client.Client, error) {
+func createMcpClient(m config.MCPConfig) (*client.Client, error) {
 	switch m.Type {
 	case config.MCPStdio:
 		return client.NewStdioMCPClient(