Merge pull request #77 from smart-mcp-proxy/bugfix/docker-tray-hangs

Improve tray status syncing and diagnostics

Author: Dumbris

cmd/mcpproxy-tray/internal/api/adapter.go

@@ -79,11 +79,18 @@ func (a *ServerAdapter) StopServer() error {
 
 // GetStatus returns the current server status
 func (a *ServerAdapter) GetStatus() interface{} {
+	listenAddr := a.client.listenAddress()
+	if listenAddr == "" {
+		listenAddr = ":8080"
+	}
+
 	servers, err := a.client.GetServers()
 	if err != nil {
 		return map[string]interface{}{
-			"phase":   "Error",
-			"message": fmt.Sprintf("API error: %v", err),
+			"phase":       "Error",
+			"message":     fmt.Sprintf("API error: %v", err),
+			"running":     false,
+			"listen_addr": listenAddr,
 		}
 	}
 
@@ -97,6 +104,8 @@ func (a *ServerAdapter) GetStatus() interface{} {
 	return map[string]interface{}{
 		"phase":             "Running",
 		"message":           fmt.Sprintf("API connected - %d servers", len(servers)),
+		"running":           true,
+		"listen_addr":       listenAddr,
 		"connected_servers": connectedCount,
 		"total_servers":     len(servers),
 	}

cmd/mcpproxy-tray/internal/api/client.go

@@ -9,7 +9,9 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
+	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -491,10 +493,22 @@ func (c *Client) OpenWebUI() error {
 	if c.apiKey != "" {
 		url += "?apikey=" + c.apiKey
 	}
-	c.logger.Info("Opening web control panel", "url", c.baseURL+"/ui/")
+	displayURL := url
+	if c.apiKey != "" {
+		displayURL = strings.ReplaceAll(url, c.apiKey, maskForLog(c.apiKey))
+	}
+	if c.logger != nil {
+		c.logger.Info("Opening web control panel", "url", displayURL)
+	}
 
 	cmd := exec.Command("open", url)
-	return cmd.Run()
+	if err := cmd.Run(); err != nil {
+		if c.logger != nil {
+			c.logger.Error("Failed to open web control panel", "url", displayURL, "error", err)
+		}
+		return fmt.Errorf("failed to open web control panel: %w", err)
+	}
+	return nil
 }
 
 // makeRequest makes an HTTP request to the API with enhanced error handling and retry logic
@@ -631,6 +645,36 @@ func getFloat64(m map[string]interface{}, key string) float64 {
 	return 0.0
 }
 
+func (c *Client) listenAddress() string {
+	parsed, err := url.Parse(c.baseURL)
+	if err != nil {
+		return ""
+	}
+
+	host := parsed.Hostname()
+	if host == "" {
+		host = "127.0.0.1"
+	}
+
+	port := parsed.Port()
+	if port == "" {
+		if strings.EqualFold(parsed.Scheme, "https") {
+			port = "443"
+		} else {
+			port = "80"
+		}
+	}
+
+	return net.JoinHostPort(host, port)
+}
+
+func maskForLog(key string) string {
+	if len(key) <= 8 {
+		return "****"
+	}
+	return key[:4] + "****" + key[len(key)-4:]
+}
+
 // createTLSConfig creates a TLS config that trusts the local mcpproxy CA
 func createTLSConfig(logger *zap.SugaredLogger) *tls.Config {
 	// Start with system cert pool

internal/tray/managers.go

@@ -629,6 +629,7 @@ func (m *MenuManager) getServerStatusDisplay(server map[string]interface{}) (dis
 	connected, _ := server["connected"].(bool)
 	quarantined, _ := server["quarantined"].(bool)
 	toolCount, _ := server["tool_count"].(int)
+	lastError, _ := server["last_error"].(string)
 
 	var statusIcon string
 	var statusText string
@@ -662,6 +663,9 @@ func (m *MenuManager) getServerStatusDisplay(server map[string]interface{}) (dis
 	}
 
 	tooltip = fmt.Sprintf("%s - %s", serverName, statusText)
+	if lastError != "" {
+		tooltip = fmt.Sprintf("%s\nLast error: %s", tooltip, lastError)
+	}
 
 	return
 }

internal/tray/tray.go

@@ -491,6 +491,8 @@ func (a *App) onReady() {
 	// Mark core menu items as ready - this will release waiting goroutines
 	a.coreMenusReady = true
 	a.logger.Debug("Core menu items initialized successfully - background processes can now start")
+	// Reapply the last known connection state now that UI widgets exist.
+	a.applyConnectionStateToUI(a.getConnectionState())
 	systray.AddSeparator()
 
 	// --- Upstream & Quarantine Menus ---
@@ -691,6 +693,11 @@ func (a *App) updateStatusFromData(statusData interface{}) {
 	message, _ := status["message"].(string)
 	listenAddr, _ := status["listen_addr"].(string)
 	serverRunning := a.server != nil && a.server.IsRunning()
+	if listenAddr == "" && a.server != nil {
+		if addr := a.server.GetListenAddress(); addr != "" {
+			listenAddr = addr
+		}
+	}
 
 	lowerMessage := strings.ToLower(message)
 	portConflict := phase == phaseError && strings.Contains(lowerMessage, "port") && strings.Contains(lowerMessage, "in use")
@@ -702,8 +709,8 @@ func (a *App) updateStatusFromData(statusData interface{}) {
 		zap.Bool("port_conflict", portConflict),
 		zap.Any("status_data", status))
 
-	// Use the actual server running state as the authoritative source
-	actuallyRunning := serverRunning
+	// Treat either SSE running flag or RPC running flag as authoritative.
+	actuallyRunning := running || serverRunning
 
 	if portConflict {
 		a.showPortConflictMenu(listenAddr, message)