From 57e51ba1cdfa7bb1f405e6ce0478157bc7f77286 Mon Sep 17 00:00:00 2001
From: "Logan.Li" <admin@attacker.club>
Date: Sun, 26 Jul 2026 18:45:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=8Exterm=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=91Escape=E6=8C=89=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在xterm自定义键处理器中发送Vim Escape控制字符
- Radix弹框仅负责阻止Escape关闭窗口
---
 frontend/src/components/server/TerminalDialog.tsx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/server/TerminalDialog.tsx b/frontend/src/components/server/TerminalDialog.tsx
index 87ef4bb..b0b377d 100644
--- a/frontend/src/components/server/TerminalDialog.tsx
+++ b/frontend/src/components/server/TerminalDialog.tsx
@@ -132,8 +132,12 @@ export function TerminalDialog({
     const ws = new WebSocket(wsUrl);
     wsRef.current = ws;
 
-    // Escape 由 Dialog 捕获后直接转发，xterm 跳过同一次事件以免重复发送。 // Logan.Li
-    term.attachCustomKeyEventHandler((event) => event.key !== "Escape");
+    // xterm 在目标元素阶段直接转发 Escape，避免 Radix 捕获层吞掉 Vim 控制字符。 // Logan.Li
+    term.attachCustomKeyEventHandler((event) => {
+      if (event.key !== "Escape") return true;
+      if (event.type === "keydown") sendTerminalInput("\x1b");
+      return false;
+    });
     term.onData(sendTerminalInput);
 
     ws.onmessage = (event) => {
@@ -221,11 +225,8 @@ export function TerminalDialog({
     <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent
         showCloseButton={false}
-        // Radix 在捕获阶段收到 Escape，阻止关窗并把控制字符送给远端 Vim。 // Logan.Li
-        onEscapeKeyDown={(event) => {
-          event.preventDefault();
-          sendTerminalInput("\x1b");
-        }}
+        // Escape 仅阻止弹框关闭，控制字符由 xterm 键处理器发送。 // Logan.Li
+        onEscapeKeyDown={(event) => event.preventDefault()}
         className={cn(
           "min-w-0 overflow-hidden bg-[var(--dg-bg-secondary)] border-[var(--dg-border)] p-0 gap-0",
           // 禁用 CSS 过渡：终端窗口应该即时缩放，不需要动画