From a4265b3f163ef18cd664cffcdd5e18333fddc530 Mon Sep 17 00:00:00 2001
From: yuchou87 <yuchou87@gmail.com>
Date: Mon, 16 Feb 2026 19:38:27 +0800
Subject: [PATCH] fix(mcp): resolve relative envFile paths against workspace
 directory

- Resolve relative envFile paths relative to workspace instead of CWD
- Add filepath import for path operations
- Pass workspace path to goroutines for path resolution
- Improves portability in Docker environments where CWD may vary
- Absolute envFile paths continue to work as before
---
 pkg/mcp/manager.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkg/mcp/manager.go b/pkg/mcp/manager.go
index be941ec23..8449486f5 100644
--- a/pkg/mcp/manager.go
+++ b/pkg/mcp/manager.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"sync"
 
@@ -128,6 +129,9 @@ func (m *Manager) LoadFromConfig(ctx context.Context, cfg *config.Config) error
 			"count": len(cfg.Tools.MCP.Servers),
 		})
 
+	// Get workspace path for resolving relative envFile paths
+	workspacePath := cfg.WorkspacePath()
+
 	var wg sync.WaitGroup
 	errs := make(chan error, len(cfg.Tools.MCP.Servers))
 	enabledCount := 0
@@ -143,9 +147,14 @@ func (m *Manager) LoadFromConfig(ctx context.Context, cfg *config.Config) error
 
 		enabledCount++
 		wg.Add(1)
-		go func(name string, serverCfg config.MCPServerConfig) {
+		go func(name string, serverCfg config.MCPServerConfig, workspace string) {
 			defer wg.Done()
 
+			// Resolve relative envFile paths relative to workspace
+			if serverCfg.EnvFile != "" && !filepath.IsAbs(serverCfg.EnvFile) {
+				serverCfg.EnvFile = filepath.Join(workspace, serverCfg.EnvFile)
+			}
+
 			if err := m.ConnectServer(ctx, name, serverCfg); err != nil {
 				logger.ErrorCF("mcp", "Failed to connect to MCP server",
 					map[string]interface{}{
@@ -154,7 +163,7 @@ func (m *Manager) LoadFromConfig(ctx context.Context, cfg *config.Config) error
 					})
 				errs <- fmt.Errorf("failed to connect to server %s: %w", name, err)
 			}
-		}(name, serverCfg)
+		}(name, serverCfg, workspacePath)
 	}
 
 	wg.Wait()