@@ -21,12 +21,12 @@ type globalCfg struct {
2121}
2222
2323type Paths struct {
24- Linux string `yaml:"linux"`
25- Darwin string `yaml:"darwin"`
26- Windows string `yaml:"windows"`
24+ Linux [] string `yaml:"linux"`
25+ Darwin [] string `yaml:"darwin"`
26+ Windows [] string `yaml:"windows"`
2727}
2828
29- func (c * globalCfg ) GetPathsForCurrentOS () string {
29+ func (c * globalCfg ) GetPathsForCurrentOS () [] string {
3030 switch runtime .GOOS {
3131 case "darwin" :
3232 return c .Darwin
@@ -35,7 +35,7 @@ func (c *globalCfg) GetPathsForCurrentOS() string {
3535 case "windows" :
3636 return c .Windows
3737 }
38- return ""
38+ return [] string {}
3939}
4040
4141func (c * globalCfg ) isInstalled () (bool , error ) {
@@ -58,7 +58,13 @@ type GlobalCfgProcessor struct {
5858}
5959
6060func NewGlobalCfgProcessor (g globalCfg ) (* GlobalCfgProcessor , error ) {
61- p , err := newYQProcessor (g .YQ , g .GetPathsForCurrentOS ())
61+ paths := g .GetPathsForCurrentOS ()
62+ if len (paths ) == 0 {
63+ return nil , fmt .Errorf ("no paths configured for OS %s" , runtime .GOOS )
64+ }
65+ // All paths for a client must use same file format (json/yaml) since YQ processor
66+ // determines encoding from first path but may operate on any path
67+ p , err := newYQProcessor (g .YQ , paths [0 ])
6268 if err != nil {
6369 return nil , err
6470 }
@@ -71,52 +77,68 @@ func NewGlobalCfgProcessor(g globalCfg) (*GlobalCfgProcessor, error) {
7177func (c * GlobalCfgProcessor ) ParseConfig () MCPClientCfg {
7278 result := MCPClientCfg {MCPClientCfgBase : MCPClientCfgBase {DisplayName : c .DisplayName , Source : c .Source , Icon : c .Icon }}
7379
74- path := c .GetPathsForCurrentOS ()
75- if path == "" {
80+ paths := c .GetPathsForCurrentOS ()
81+ if len ( paths ) == 0 {
7682 return result
7783 }
78- fullPath := os .ExpandEnv (path )
7984 result .IsOsSupported = true
8085
81- data , err := os .ReadFile (fullPath )
82- if os .IsNotExist (err ) {
83- // it's not an error for us, it just means nothing is configured/connected
84- installed , installCheckErr := c .isInstalled ()
85- result .IsInstalled = installed
86- result .Err = classifyError (installCheckErr )
87- return result
88- }
89-
90- // The file was found but can't be read. Because of an old bug, it could be a directory.
91- // In which case, we want to delete it.
92- stat , err := os .Stat (fullPath )
93- if err == nil && stat .IsDir () {
94- if err := os .RemoveAll (fullPath ); err != nil {
95- result .Err = classifyError (err )
86+ for _ , path := range paths {
87+ fullPath := os .ExpandEnv (path )
88+ data , err := os .ReadFile (fullPath )
89+ if err == nil {
90+ result .IsInstalled = true
91+ result .setParseResult (c .p .Parse (data ))
9692 return result
9793 }
98- installed , installCheckErr := c .isInstalled ()
99- result .IsInstalled = installed
100- result .Err = classifyError (installCheckErr )
101- return result
102- }
10394
104- // config exists for us means it's installed (we then don't care if it's actually installed or not)
105- result .IsInstalled = true
106- if err != nil {
95+ if os .IsNotExist (err ) {
96+ continue
97+ }
98+
99+ // File exists but can't be read. Because of an old bug, it could be a directory.
100+ // In which case, we want to delete it.
101+ stat , statErr := os .Stat (fullPath )
102+ if statErr == nil && stat .IsDir () {
103+ if rmErr := os .RemoveAll (fullPath ); rmErr != nil {
104+ result .Err = classifyError (rmErr )
105+ return result
106+ }
107+ continue
108+ }
109+
110+ result .IsInstalled = true
107111 result .Err = classifyError (err )
108112 return result
109113 }
110- result .setParseResult (c .p .Parse (data ))
114+
115+ // No files found - check if the application is installed
116+ installed , installCheckErr := c .isInstalled ()
117+ result .IsInstalled = installed
118+ result .Err = classifyError (installCheckErr )
111119 return result
112120}
113121
114122func (c * GlobalCfgProcessor ) Update (key string , server * MCPServerSTDIO ) error {
115- file := c .GetPathsForCurrentOS ()
116- if file == "" {
123+ paths := c .GetPathsForCurrentOS ()
124+ if len ( paths ) == 0 {
117125 return fmt .Errorf ("unknown config path for OS %s" , runtime .GOOS )
118126 }
119- return updateConfig (os .ExpandEnv (file ), c .p .Add , c .p .Del , key , server )
127+
128+ // Use first existing path, or first path if none exist
129+ var targetPath string
130+ for _ , path := range paths {
131+ fullPath := os .ExpandEnv (path )
132+ if _ , err := os .Stat (fullPath ); err == nil {
133+ targetPath = fullPath
134+ break
135+ }
136+ }
137+ if targetPath == "" {
138+ targetPath = os .ExpandEnv (paths [0 ])
139+ }
140+
141+ return updateConfig (targetPath , c .p .Add , c .p .Del , key , server )
120142}
121143
122144func containsMCPDocker (in []MCPServerSTDIO ) bool {
0 commit comments