Refactor server configuration loading and enhance tray UI management

- Updated server configuration loading to synchronize with storage and upstream manager.
- Improved handling of server states, including enabling/disabling and quarantine management.
- Added config file watching to automatically reload settings and refresh UI.
- Enhanced server action handling in the tray UI for better user experience.

Author: Dumbris

internal/config/loader.go

@@ -159,14 +159,11 @@ func loadConfigFile(path string, cfg *Config) error {
 		return fmt.Errorf("failed to parse config file: %w", err)
 	}
 
-	// Enable all servers by default if not specified
+	// Set created time if not specified
 	for _, server := range cfg.Servers {
 		if server.Created.IsZero() {
-			server.Created = now()
-		}
-		// Default to enabled if not explicitly set
-		if !server.Enabled && server.URL != "" || server.Command != "" {
-			server.Enabled = true
+			// Use a consistent time function if `now()` is not defined in this package
+			server.Created = time.Now()
 		}
 	}
 

internal/server/e2e_test.go

@@ -137,7 +137,7 @@ func (env *TestEnvironment) waitForServerReady() {
 		case <-ticker.C:
 			if env.proxyServer.IsRunning() {
 				// Give it a bit more time to fully initialize
-				time.Sleep(500 * time.Millisecond)
+				time.Sleep(2 * time.Second)
 				return
 			}
 		}

internal/server/mcp.go

@@ -118,6 +118,7 @@ func (p *MCPProxyServer) registerTools(debugSearch bool) {
 		),
 		mcp.WithObject("args",
 			mcp.Description("Arguments to pass to the tool. Refer to the tool's inputSchema from retrieve_tools for required parameters."),
+			mcp.AdditionalProperties(true),
 		),
 	)
 	p.server.AddTool(callToolTool, p.handleCallTool)
@@ -158,6 +159,7 @@ func (p *MCPProxyServer) registerTools(debugSearch bool) {
 			),
 			mcp.WithObject("env",
 				mcp.Description("Environment variables for stdio servers"),
+				mcp.AdditionalProperties(true),
 			),
 			mcp.WithString("url",
 				mcp.Description("Server URL for HTTP/SSE servers (e.g., 'http://localhost:3001')"),
@@ -168,6 +170,7 @@ func (p *MCPProxyServer) registerTools(debugSearch bool) {
 			),
 			mcp.WithObject("headers",
 				mcp.Description("HTTP headers for authentication (e.g., {'Authorization': 'Bearer token'})"),
+				mcp.AdditionalProperties(true),
 			),
 			mcp.WithBoolean("enabled",
 				mcp.Description("Whether server should be enabled (default: true)"),
@@ -177,9 +180,11 @@ func (p *MCPProxyServer) registerTools(debugSearch bool) {
 			),
 			mcp.WithObject("cursor_config",
 				mcp.Description("Cursor IDE mcpServers configuration object for direct import"),
+				mcp.AdditionalProperties(true),
 			),
 			mcp.WithObject("patch",
 				mcp.Description("Fields to update for patch operations"),
+				mcp.AdditionalProperties(true),
 			),
 		)
 		p.server.AddTool(upstreamServersTool, p.handleUpstreamServers)

internal/server/mcp_test.go

@@ -1,8 +1,11 @@
 package server
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
+	"net/http"
+	"net/http/httptest"
 	"strings"
 	"testing"
 	"time"
@@ -812,3 +815,63 @@ func TestE2E_QuarantineFunctionality(t *testing.T) {
 }
 
 // Test: Error handling and recovery
+func TestHandleV1ToolProxy(t *testing.T) {
+	tests := []struct {
+		name     string
+		toolName string
+		serverID string
+		wantErr  string
+		result   *mcp.CallToolResult
+		client   *mockToolClient
+	}{
+		{
+			name:     "disabled client",
+			toolName: "disabled-tool",
+			serverID: "disabled-server",
+			wantErr:  "client for server disabled-server is disabled",
+			result: &mcp.CallToolResult{
+				ToolName: "disabled-tool",
+			},
+			client: &mockToolClient{},
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			s := &MCPProxyServer{
+				upstreamManager: upstream.NewManager(zap.NewNop()),
+				logger:          zap.NewNop(),
+			}
+
+			s.upstreamManager.AddServer(&config.ServerConfig{
+				ID:      tc.serverID,
+				Enabled: tc.name != "disabled client",
+			})
+
+			if tc.client != nil {
+				s.upstreamManager.AddClient(tc.serverID, tc.client)
+			}
+
+			rec := httptest.NewRecorder()
+			req := httptest.NewRequest(http.MethodPost, "/v1/tools", bytes.NewBufferString(`{"name": "`+tc.toolName+`"}`))
+			req.Header.Set("Content-Type", "application/json")
+
+			s.handleV1ToolProxy(rec, req)
+
+			require.NoError(t, err)
+			assert.Equal(t, http.StatusOK, rec.Code)
+
+			var result mcp.CallToolResult
+			require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &result))
+
+			if tc.wantErr != "" {
+				require.Len(t, result.Outputs, 1)
+				var content map[string]string
+				require.NoError(t, json.Unmarshal([]byte(result.Outputs[0].Content), &content))
+				assert.Equal(t, tc.wantErr, content["error"])
+			} else {
+				assert.Equal(t, "test-output", result.Outputs[0].Content)
+			}
+		})
+	}
+}