Merge pull request #246 from dgageot/rewrite-mcp-clients

Rewrite the MCP clients connect/disconnect code

Author: trungutt

src/extension/host-binary/cmd/main.go

@@ -9,14 +9,22 @@ import (
 	"slices"
 	"syscall"
 
-	"github.com/docker/labs-ai-tools-for-devs/cmd/commands"
 	"github.com/docker/labs-ai-tools-for-devs/pkg/client"
+	"github.com/docker/labs-ai-tools-for-devs/pkg/clients"
+	"github.com/docker/labs-ai-tools-for-devs/pkg/commands"
 	secretsapi "github.com/docker/labs-ai-tools-for-devs/pkg/generated/go/client/secrets"
 	"github.com/docker/labs-ai-tools-for-devs/pkg/paths"
 	"github.com/spf13/cobra"
 )
 
 func main() {
+	// We need to preserve CWD as paths.Init will change it.
+	originalCwd, err := os.Getwd()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
 	ctx, closeFunc := newSigContext()
 	defer closeFunc()
 	paths.Init(paths.OnHost)
@@ -30,6 +38,7 @@ func main() {
 	cmd.AddCommand(commands.CurrentUser(ctx))
 	cmd.AddCommand(commands.ReadFromVolume(ctx))
 	cmd.AddCommand(commands.WriteToVolume(ctx))
+	cmd.AddCommand(clients.NewClientCmd(ctx, originalCwd))
 	if err := cmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)

src/extension/host-binary/go.mod

@@ -9,7 +9,27 @@ require (
 )
 
 require (
+	github.com/a8m/envsubst v1.4.2 // indirect
+	github.com/alecthomas/participle/v2 v2.1.1 // indirect
+	github.com/dimchansky/utfbom v1.1.1 // indirect
+	github.com/elliotchance/orderedmap v1.7.1 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/goccy/go-json v0.10.4 // indirect
+	github.com/goccy/go-yaml v1.13.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jinzhu/copier v0.4.0 // indirect
+	github.com/magiconair/properties v1.8.9 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mikefarah/yq/v4 v4.45.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
-	golang.org/x/sys v0.10.0 // indirect
+	github.com/yuin/gopher-lua v1.1.1 // indirect
+	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

src/extension/host-binary/go.sum

@@ -1,18 +1,67 @@
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/a8m/envsubst v1.4.2 h1:4yWIHXOLEJHQEFd4UjrWDrYeYlV7ncFWJOCBRLOZHQg=
+github.com/a8m/envsubst v1.4.2/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY=
+github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6icjJvbsmV8=
+github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
+github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
+github.com/elliotchance/orderedmap v1.7.1 h1:8SR2DB391dw0HVI9572ElrY+KU0Q89OCXYwWZx7aAZc=
+github.com/elliotchance/orderedmap v1.7.1/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
+github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-yaml v1.13.3 h1:IXRULR8mAa0MXQobzzp0VOfMUJ8EnaQ4x3jhf7S0/nI=
+github.com/goccy/go-yaml v1.13.3/go.mod h1:IjYwxUiJDoqpx2RmbdjMUceGHZwYLon3sfOGl5Hi9lc=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
+github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
+github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
+github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mikefarah/yq/v4 v4.45.1 h1:EW+HjKEVa55pUYFJseEHEHdQ0+ulunY+q42zF3M7ZaQ=
+github.com/mikefarah/yq/v4 v4.45.1/go.mod h1:djgN2vD749hpjVNGYTShr5Kmv5LYljhCG3lUTuEe3LM=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
+github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
+golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
+golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
 golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 h1:6D+BvnJ/j6e222UW8s2qTSe3wGBtvo0MbVQG/c5k8RE=
+gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

src/extension/host-binary/pkg/clients/config.go

@@ -0,0 +1,160 @@
+package clients
+
+import (
+	"context"
+	_ "embed"
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+	"sort"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+	"golang.org/x/exp/maps"
+	"gopkg.in/yaml.v3"
+)
+
+//go:embed config.yml
+var configYaml string
+
+var (
+	getProjectRoot  = findGitProjectRoot
+	errNotInGitRepo = errors.New("not in a git repo")
+)
+
+func NewClientCmd(ctx context.Context, cwd string) *cobra.Command {
+	cfg := readConfig()
+	cmd := &cobra.Command{
+		Use:   "client",
+		Short: "Connect/disconnect MCP clients.",
+	}
+	cmd.AddCommand(ListCommand(ctx, cwd, *cfg))
+	cmd.AddCommand(ConnectCommand(ctx, cwd, *cfg))
+	cmd.AddCommand(DisconnectCommand(ctx, cwd, *cfg))
+	return cmd
+}
+
+type Config struct {
+	System  map[string]globalCfg `yaml:"system"`
+	Project map[string]localCfg  `yaml:"project"`
+}
+
+func readConfig() *Config {
+	var result Config
+	_ = yaml.Unmarshal([]byte(configYaml), &result)
+	return &result
+}
+
+func addGlobalFlag(flags *pflag.FlagSet, p *bool) {
+	flags.BoolVarP(p, "global", "g", false, "Change the system wide configuration or the clients setup in your current git repo.")
+}
+
+func addQuietFlag(flags *pflag.FlagSet, p *bool) {
+	flags.BoolVarP(p, "quiet", "q", false, "Only display errors.")
+}
+
+func findGitProjectRoot(dir string) string {
+	for {
+		gitPath := filepath.Join(dir, ".git")
+		if _, err := os.Stat(gitPath); err == nil {
+			return dir
+		}
+		parent := filepath.Dir(dir)
+		if parent == dir {
+			break
+		}
+		dir = parent
+	}
+	return ""
+}
+
+func getSupportedMCPClients(cfg Config) []string {
+	tmp := map[string]struct{}{
+		vendorGordon: {},
+	}
+	for k := range cfg.System {
+		tmp[k] = struct{}{}
+	}
+	for k := range cfg.Project {
+		tmp[k] = struct{}{}
+	}
+	result := maps.Keys(tmp)
+	sort.Strings(result)
+	return result
+}
+
+type ErrVendorNotFound struct {
+	global bool
+	vendor string
+	config Config
+}
+
+func (e *ErrVendorNotFound) Error() string {
+	var alternative string
+	if e.global {
+		if _, ok := e.config.Project[e.vendor]; ok {
+			alternative = " Did you mean to not use the --global flag?"
+		}
+	} else {
+		if _, ok := e.config.System[e.vendor]; ok {
+			alternative = " Did you mean to use the --global flag?"
+		}
+	}
+	return "Vendor not found: " + e.vendor + "." + alternative
+}
+
+type Updater func(key string, server *MCPServerSTDIO) error
+
+func newMCPGatewayServer(client string) *MCPServerSTDIO {
+	return &MCPServerSTDIO{
+		Command: "docker",
+		Args:    []string{"run", "-l", fmt.Sprintf("mcp.client=%s", client), "--rm", "-i", "alpine/socat", "STDIO", "TCP:host.docker.internal:8811"},
+	}
+}
+
+func GetUpdater(vendor string, global bool, cwd string, config Config) (Updater, error) {
+	if global {
+		cfg, ok := config.System[vendor]
+		if !ok {
+			return nil, &ErrVendorNotFound{vendor: vendor, global: global, config: config}
+		}
+		processor, err := NewGlobalCfgProcessor(cfg)
+		if err != nil {
+			return nil, err
+		}
+		return processor.Update, nil
+	}
+	projectRoot := getProjectRoot(cwd)
+	if projectRoot == "" {
+		return nil, errNotInGitRepo
+	}
+	cfg, ok := config.Project[vendor]
+	if !ok {
+		return nil, &ErrVendorNotFound{vendor: vendor, global: global, config: config}
+	}
+	processor, err := NewLocalCfgProcessor(cfg, projectRoot)
+	if err != nil {
+		return nil, err
+	}
+	return processor.Update, nil
+}
+
+type MCPClientCfgBase struct {
+	DisplayName           string    `json:"displayName"`
+	ConfigName            string    `json:"configName"`
+	IsMCPCatalogConnected bool      `json:"dockerMCPCatalogConnected"`
+	Err                   *CfgError `json:"error"`
+
+	cfg *MCPJSONLists
+}
+
+func (c *MCPClientCfgBase) setParseResult(lists *MCPJSONLists, err error) {
+	c.Err = classifyError(err)
+	if lists != nil {
+		if containsMCPDocker(lists.STDIOServers) {
+			c.IsMCPCatalogConnected = true
+		}
+	}
+	c.cfg = lists
+}

src/extension/host-binary/pkg/clients/config.yml

@@ -0,0 +1,55 @@
+system:
+  claude-desktop:
+    displayName: Claude Desktop
+    installCheckPaths:
+    - /Applications/Claude.app
+    - $AppData/Claude/
+    paths:
+      linux: $HOME/.config/claude/claude_desktop_config.json
+      darwin: $HOME/Library/Application Support/Claude/claude_desktop_config.json
+      windows: $APPDATA/Claude/claude_desktop_config.json
+    yq:
+      list: '.mcpServers | to_entries | map(.value + {"name": .key})'
+      set: .mcpServers[$NAME] = $JSON
+      del: del(.mcpServers[$NAME])
+  continue:
+    displayName: Continue.dev
+    installCheckPaths:
+    - $HOME/.continue
+    - $USERPROFILE/.continue
+    paths:
+      linux: $HOME/.continue/config.yaml
+      darwin: $HOME/.continue/config.yaml
+      windows: $USERPROFILE/.continue/config.yaml
+    yq:
+      list: .mcpServers
+      set: .mcpServers = (.mcpServers // []) | .mcpServers += [{"name":$NAME}+$JSON]
+      del: del(.mcpServers[] | select(.name == $NAME))
+  cursor:
+    displayName: Cursor
+    installCheckPaths:
+    - /Applications/Cursor.app
+    - $AppData/Cursor/
+    paths:
+      linux: $HOME/.cursor/mcp.json
+      darwin: $HOME/.cursor/mcp.json
+      windows: $USERPROFILE/.cursor/mcp.json
+    yq:
+      list: '.mcpServers | to_entries | map(.value + {"name": .key})'
+      set: .mcpServers[$NAME] = $JSON
+      del: del(.mcpServers[$NAME])
+project:
+  cursor:
+    displayname: Cursor
+    projectfile: .cursor/mcp.json
+    yq:
+      list: '.mcpServers | to_entries | map(.value + {"name": .key})'
+      set: .mcpServers[$NAME] = $JSON
+      del: del(.mcpServers[$NAME])
+  vscode:
+    displayname: VSCode
+    projectfile: .vscode/mcp.json
+    yq:
+      list: '.servers | to_entries | map(.value + {"name": .key})'
+      set: .servers[$NAME] = $JSON+{"type":"stdio"}
+      del: del(.servers[$NAME])