From ffa01986ce1513846f42d55bd8aab9d0bc3cd8fd Mon Sep 17 00:00:00 2001
From: yuchou87 <yuchou87@gmail.com>
Date: Thu, 19 Feb 2026 19:26:02 +0800
Subject: [PATCH] fix(agent): scope MCP manager cleanup to successful
 initialization

Move defer cleanup inside else block to only clean up when MCP servers
are successfully initialized. This prevents unnecessary cleanup attempts
when LoadFromMCPConfig fails.

Addresses Copilot code review feedback.
---
 pkg/agent/loop.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go
index d2d49e5b7..e5a1465eb 100644
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@@ -150,6 +150,16 @@ func (al *AgentLoop) Run(ctx context.Context) error {
 					"error": err.Error(),
 				})
 		} else {
+			// Ensure MCP connections are cleaned up on exit, only if initialization succeeded
+			defer func() {
+				if err := mcpManager.Close(); err != nil {
+					logger.ErrorCF("agent", "Failed to close MCP manager",
+						map[string]interface{}{
+							"error": err.Error(),
+						})
+				}
+			}()
+
 			// Register MCP tools for all agents
 			servers := mcpManager.GetServers()
 			toolCount := 0
@@ -179,16 +189,6 @@ func (al *AgentLoop) Run(ctx context.Context) error {
 					"tool_count":   toolCount,
 				})
 		}
-
-		// Ensure MCP connections are cleaned up on exit
-		defer func() {
-			if err := mcpManager.Close(); err != nil {
-				logger.ErrorCF("agent", "Failed to close MCP manager",
-					map[string]interface{}{
-						"error": err.Error(),
-					})
-			}
-		}()
 	}
 
 	for al.running.Load() {