Merge pull request #88 from smart-mcp-proxy/bugfix/100cpu-consuption

Fix tray reconnect spin and honor upstream backoff

Author: Dumbris

cmd/mcpproxy-tray/main.go

@@ -910,7 +910,10 @@ func (cpl *CoreProcessLauncher) monitorAPIConnection(ctx context.Context) {
 		select {
 		case <-ctx.Done():
 			return
-		case connState := <-connectionStateCh:
+		case connState, ok := <-connectionStateCh:
+			if !ok {
+				return
+			}
 			switch connState {
 			case tray.ConnectionStateConnected:
 				cpl.stateMachine.SendEvent(state.EventAPIConnected)

internal/runtime/lifecycle.go

@@ -11,6 +11,8 @@ import (
 	"mcpproxy-go/internal/runtime/configsvc"
 )
 
+const connectAttemptTimeout = 45 * time.Second
+
 // StartBackgroundInitialization kicks off configuration sync and background loops.
 func (r *Runtime) StartBackgroundInitialization() {
 	// Phase 6: Start Supervisor for state reconciliation and lock-free reads
@@ -94,7 +96,7 @@ func (r *Runtime) connectAllWithRetry(ctx context.Context) {
 	if connectedCount < totalCount {
 		r.UpdatePhaseMessage(fmt.Sprintf("Connected to %d/%d servers, retrying...", connectedCount, totalCount))
 
-		connectCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
+		connectCtx, cancel := context.WithTimeout(ctx, connectAttemptTimeout)
 		defer cancel()
 
 		if err := r.upstreamManager.ConnectAll(connectCtx); err != nil {

internal/upstream/manager.go

@@ -518,6 +518,13 @@ func (m *Manager) ConnectAll(ctx context.Context) error {
 			continue
 		}
 
+		if client.Config.Quarantined {
+			m.logger.Info("Skipping quarantined client",
+				zap.String("id", id),
+				zap.String("name", client.Config.Name))
+			continue
+		}
+
 		// Check connection eligibility with detailed logging
 		if client.IsConnected() {
 			m.logger.Debug("Client already connected, skipping",
@@ -533,6 +540,16 @@ func (m *Manager) ConnectAll(ctx context.Context) error {
 			continue
 		}
 
+		if client.GetState() == types.StateError && !client.ShouldRetry() {
+			info := client.GetConnectionInfo()
+			m.logger.Debug("Client backoff active, skipping connect attempt",
+				zap.String("id", id),
+				zap.String("name", client.Config.Name),
+				zap.Int("retry_count", info.RetryCount),
+				zap.Time("last_retry_time", info.LastRetryTime))
+			continue
+		}
+
 		m.logger.Info("Attempting to connect client",
 			zap.String("id", id),
 			zap.String("name", client.Config.Name),