From 4df4681dc85a117efba5543ea65f3550c2158755 Mon Sep 17 00:00:00 2001
From: LaZzyMan <zeusdream7@gmail.com>
Date: Wed, 25 Feb 2026 11:09:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20ESC=20=E9=94=AE?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=A7=A6=E5=8F=91=20handleNavigateBack=20?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/ui/components/mcp/MCPManagementDialog.tsx  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/ui/components/mcp/MCPManagementDialog.tsx b/packages/cli/src/ui/components/mcp/MCPManagementDialog.tsx
index 6c2124dbd..d96d2d33a 100644
--- a/packages/cli/src/ui/components/mcp/MCPManagementDialog.tsx
+++ b/packages/cli/src/ui/components/mcp/MCPManagementDialog.tsx
@@ -562,16 +562,14 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
     );
   }, [getCurrentStep, servers.length]);
 
-  // ESC键处理
+  // ESC 键处理 - 仅关闭对话框，子组件的返回由各自处理避免重复触发
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
-        const currentStep = getCurrentStep();
-        if (currentStep === MCP_MANAGEMENT_STEPS.SERVER_LIST) {
-          onClose();
-        } else {
-          handleNavigateBack();
-        }
+      if (
+        key.name === 'escape' &&
+        getCurrentStep() === MCP_MANAGEMENT_STEPS.SERVER_LIST
+      ) {
+        onClose();
       }
     },
     { isActive: true },