auvezy-terminal-remote 0.3.0 → 0.4.0

package/dist/cli.js

@@ -61,9 +61,11 @@ function ensureDefaultUserConfig(input) {
   const userCommands = Array.isArray(src.commands) && src.commands.length > 0 ? src.commands : null;
   const commandsLegacy = userCommands !== null && userCommands.some((c) => typeof c.group !== "string" || c.group.length === 0);
   const commands = userCommands === null || commandsLegacy ? DEFAULT_COMMANDS : userCommands;
-  return { ...src, shortcuts, commands };
+  const useInputBarValue = typeof src.input?.useInputBar === "boolean" ? src.input.useInputBar : DEFAULT_INPUT.useInputBar;
+  const inputPrefs = { useInputBar: useInputBarValue };
+  return { ...src, shortcuts, commands, input: inputPrefs };
 }
-var SHORTCUT_GROUPS, DEFAULT_SHORTCUTS, COMMAND_GROUPS, DEFAULT_COMMANDS;
+var SHORTCUT_GROUPS, DEFAULT_SHORTCUTS, COMMAND_GROUPS, DEFAULT_COMMANDS, DEFAULT_INPUT;
 var init_defaults = __esm({
   "shared/dist/defaults.js"() {
     "use strict";
@@ -253,6 +255,9 @@ var init_defaults = __esm({
       }
     ];
     DEFAULT_COMMANDS = COMMAND_GROUPS.flatMap((g) => g.items.map((c) => ({ ...c, group: g.id })));
+    DEFAULT_INPUT = {
+      useInputBar: true
+    };
   }
 });
 
@@ -818,7 +823,7 @@ var init_config_routes = __esm({
 });
 
 // backend/dist/constants.js
-var WS_FLUSH_INTERVAL_MS, WS_MAX_CHUNK_BYTES, WS_HIGH_WATERMARK_BYTES, FILE_LOCK_RETRIES, FILE_LOCK_RETRY_INTERVAL_MS, FILE_LOCK_STALE_MS, IP_MONITOR_INTERVAL_MS, IP_MONITOR_STABILITY_THRESHOLD, PTY_DEFAULT_COLS, PTY_DEFAULT_ROWS, PTY_TERM_NAME, SHUTDOWN_WS_FLUSH_DELAY_MS, SHUTDOWN_FORCE_EXIT_MS, DOUBLE_CTRL_C_WINDOW_MS, PORT_FINDER_MAX_ATTEMPTS, STOP_INSTANCE_GRACE_MS, STOP_INSTANCE_POLL_INTERVAL_MS, ATTACH_RECONNECT_DELAYS_MS;
+var WS_FLUSH_INTERVAL_MS, WS_MAX_CHUNK_BYTES, WS_HIGH_WATERMARK_BYTES, FILE_LOCK_RETRIES, FILE_LOCK_RETRY_INTERVAL_MS, FILE_LOCK_STALE_MS, IP_MONITOR_INTERVAL_MS, IP_MONITOR_STABILITY_THRESHOLD, PTY_DEFAULT_COLS, PTY_DEFAULT_ROWS, PTY_TERM_NAME, DOUBLE_PULSE_DELAY_MS, SHUTDOWN_WS_FLUSH_DELAY_MS, SHUTDOWN_FORCE_EXIT_MS, DOUBLE_CTRL_C_WINDOW_MS, PORT_FINDER_MAX_ATTEMPTS, STOP_INSTANCE_GRACE_MS, STOP_INSTANCE_POLL_INTERVAL_MS, ATTACH_RECONNECT_DELAYS_MS;
 var init_constants2 = __esm({
   "backend/dist/constants.js"() {
     "use strict";
@@ -833,6 +838,7 @@ var init_constants2 = __esm({
     PTY_DEFAULT_COLS = 80;
     PTY_DEFAULT_ROWS = 24;
     PTY_TERM_NAME = "xterm-256color";
+    DOUBLE_PULSE_DELAY_MS = 50;
     SHUTDOWN_WS_FLUSH_DELAY_MS = 500;
     SHUTDOWN_FORCE_EXIT_MS = 2e3;
     DOUBLE_CTRL_C_WINDOW_MS = 500;
@@ -1627,6 +1633,16 @@ var init_pty_manager = __esm({
       _exited = false;
       _cols = PTY_DEFAULT_COLS;
       _rows = PTY_DEFAULT_ROWS;
+      /**
+       * 当前是否处于 alt-screen（DECSET 1049 / 1047 / 47）。
+       * 通过扫描 PTY 输出序列实时维护：
+       *  - vim/htop/tmux/less 等全屏 TUI 进入时切 true（它们自己整屏重画，对
+       *    resize 反应正常，不需要 double-pulse hack）
+       *  - claude/zsh prompt 等增量重画 TUI 始终为 false → 需要 double-pulse
+       */
+      _inAltScreen = false;
+      /** double-pulse resize 的中间帧定时器 */
+      _doublePulseTimer = null;
       get cols() {
         return this._cols;
       }
@@ -1662,6 +1678,7 @@ var init_pty_manager = __esm({
             env: { ...process.env, ...opts.env }
           });
           this.process.onData((data) => {
+            this.scanAltScreenToggle(data);
             this.emit("data", data);
           });
           this.process.onExit(({ exitCode, signal }) => {
@@ -1699,6 +1716,18 @@ var init_pty_manager = __esm({
        *   webapp resize → ws → PTY.resize → emit 'resize' → broadcast →
        *   webapp 收到 terminal_resize → 触发 fit → 又算出同尺寸 → 再发 resize → ...
        * 同尺寸跳过让链路在第二步就断掉
+       *
+       * Double-pulse hack（仅 normal-screen / 增量重画 TUI）：
+       *   Claude Code (Ink) / blessed / prompt-toolkit / readline REPL 等用相对
+       *   坐标增量重画的程序，收到 SIGWINCH 后只对"宽度变窄"分支才会清屏 +
+       *   重新 layout（Ink 源码：`if (currentWidth < lastTerminalWidth) clear()`）。
+       *   宽度变宽时既不清前帧也不重排已渲染历史 → 视觉上"没响应"。
+       *
+       *   workaround：先 resize(cols-1) 让 Ink 走 width-shrink 分支强制清屏，
+       *   50ms 后再 resize(cols) 回到目标尺寸。代价是程序会多一帧重画。
+       *
+       *   alt-screen 程序（vim/tmux/htop/less）自己会在 SIGWINCH 时整屏重画，
+       *   不需要也不应该 double-pulse（多余 SIGWINCH 让它们闪一下）→ 短路。
        */
       resize(cols, rows) {
         if (!this.process || this._exited)
@@ -1707,8 +1736,30 @@ var init_pty_manager = __esm({
           logger.debug({ cols, rows }, "PTY resize \u8DF3\u8FC7\uFF08\u540C\u5C3A\u5BF8\uFF09");
           return;
         }
-        logger.info({ cols, rows, prevCols: this._cols, prevRows: this._rows }, "PTY resize \u6267\u884C");
+        logger.info({ cols, rows, prevCols: this._cols, prevRows: this._rows, alt: this._inAltScreen }, "PTY resize \u6267\u884C");
         try {
+          if (this._doublePulseTimer) {
+            clearTimeout(this._doublePulseTimer);
+            this._doublePulseTimer = null;
+          }
+          const shouldDoublePulse = !this._inAltScreen && cols > this._cols && cols > 2;
+          if (shouldDoublePulse) {
+            this.process.resize(cols - 1, rows);
+            this._doublePulseTimer = setTimeout(() => {
+              this._doublePulseTimer = null;
+              if (!this.process || this._exited)
+                return;
+              try {
+                this.process.resize(cols, rows);
+                this._cols = cols;
+                this._rows = rows;
+                this.emit("resize", cols, rows);
+              } catch (err) {
+                logger.error({ err, cols, rows }, "PTY resize \u7B2C\u4E8C\u8109\u51B2\u5931\u8D25");
+              }
+            }, DOUBLE_PULSE_DELAY_MS);
+            return;
+          }
           this.process.resize(cols, rows);
           this._cols = cols;
           this._rows = rows;
@@ -1723,6 +1774,10 @@ var init_pty_manager = __esm({
        * 幂等：多次调用安全
        */
       destroy() {
+        if (this._doublePulseTimer) {
+          clearTimeout(this._doublePulseTimer);
+          this._doublePulseTimer = null;
+        }
         if (!this.process)
           return;
         try {
@@ -1733,6 +1788,32 @@ var init_pty_manager = __esm({
         }
         this.process = null;
       }
+      /**
+       * 当前是否处于 alt-screen（仅供 resize 决策用，不暴露给上层）
+       */
+      get inAltScreen() {
+        return this._inAltScreen;
+      }
+      /**
+       * 扫描 PTY 输出，识别 alt-screen 切换序列：
+       *  - DECSET 1049（最常用，xterm 标准 + 保存光标位置）：进入 / 退出
+       *  - DECSET 1047（仅 alt buffer 切换）：进入 / 退出
+       *  - DECSET 47（最老的 alt-buffer，无光标保存）：进入 / 退出
+       *
+       * 不需要完整 ANSI 解析器——这三个序列形态固定，正则简单匹配即可。
+       * 同一 chunk 内可能既有 enter 又有 exit（罕见，但可能），按顺序处理。
+       */
+      scanAltScreenToggle(data) {
+        const re = /\x1b\[\?(1049|1047|47)([hl])/g;
+        let m;
+        while ((m = re.exec(data)) !== null) {
+          const isEnter = m[2] === "h";
+          if (this._inAltScreen !== isEnter) {
+            this._inAltScreen = isEnter;
+            logger.debug({ inAltScreen: isEnter }, "PTY alt-screen \u72B6\u6001\u5207\u6362");
+          }
+        }
+      }
     };
   }
 });
@@ -2008,7 +2089,7 @@ function handleWsMessage(ws, raw, cb) {
       break;
     case "resize":
       if (typeof msg.cols === "number" && typeof msg.rows === "number") {
-        cb.onResize(msg.cols, msg.rows);
+        cb.onResize(msg.cols, msg.rows, ws, msg.master === true);
       } else {
         logger.warn({ msg }, "resize \u7F3A cols/rows \u5B57\u6BB5\u6216\u7C7B\u578B\u9519\u8BEF");
       }
@@ -2018,6 +2099,13 @@ function handleWsMessage(ws, raw, cb) {
         ws.send(JSON.stringify({ type: "heartbeat", timestamp: Date.now() }));
       }
       break;
+    case "client_log":
+      if (typeof msg.message === "string" && typeof msg.level === "string") {
+        const ts = typeof msg.ts === "number" ? new Date(msg.ts).toISOString().slice(11, 23) : "?";
+        process.stderr.write(`[client ${ts} ${msg.level}] ${msg.message}
+`);
+      }
+      break;
     default: {
       const t = msg.type;
       logger.warn({ type: t }, "\u672A\u77E5 WS \u6D88\u606F\u7C7B\u578B\uFF0C\u5DF2\u5FFD\u7565");
@@ -2124,6 +2212,7 @@ var init_ansi_filter = __esm({
 });
 
 // backend/dist/session/session-controller.js
+import { WebSocket as WebSocket3 } from "ws";
 var SessionController;
 var init_session_controller = __esm({
   "backend/dist/session/session-controller.js"() {
@@ -2157,6 +2246,12 @@ var init_session_controller = __esm({
       wsBackpressureEvents = 0;
       /** 可选的 hook 接收器（阶段 3 启用） */
       hookReceiver = null;
+      /**
+       * PTY 尺寸主控连接：声明 master=true 的客户端 WebSocket 引用。
+       * 仅它能改 PTY cols/rows；其他客户端的 resize 被忽略。断开时自动释放
+       * （onDisconnect 处理）。null = 无主控，先到先得
+       */
+      masterClient = null;
       /** ANSI 过滤器（阶段 8 启用；null = 关闭过滤直接透传） */
       ansiFilter;
       /** 可选的 PushService（阶段 9 启用；用于 hook 触发时推送通知） */
@@ -2340,8 +2435,18 @@ var init_session_controller = __esm({
             onUserInput: (data) => {
               this.pty.write(data);
             },
-            onResize: (cols, rows) => {
+            onResize: (cols, rows, source, master) => {
               const counts = this.ws.getClientCounts();
+              if (master) {
+                this.masterClient = source;
+                logger.info({ cols, rows, type }, "PTY \u4E3B\u63A7\u5207\u6362\uFF1A\u5BA2\u6237\u7AEF\u58F0\u660E master");
+                this.pty.resize(cols, rows);
+                return;
+              }
+              if (this.masterClient && this.masterClient !== source) {
+                logger.debug({ cols, rows }, "\u4E3B\u63A7\u88AB\u5176\u4ED6\u5BA2\u6237\u7AEF\u6301\u6709\uFF0C\u5FFD\u7565\u6B64 resize");
+                return;
+              }
               if (counts.webapp > 0 && type === "attach") {
                 logger.debug({ type, cols, rows, counts }, "webapp \u5728\u7EBF\uFF0Cattach \u7684 resize \u88AB\u5FFD\u7565");
                 return;
@@ -2363,6 +2468,10 @@ var init_session_controller = __esm({
         });
         this.ws.onDisconnect((counts) => {
           logger.debug(counts, "\u5BA2\u6237\u7AEF\u65AD\u5F00\u540E\u5269\u4F59\u7EDF\u8BA1");
+          if (this.masterClient && this.masterClient.readyState !== WebSocket3.OPEN) {
+            logger.info("PTY \u4E3B\u63A7\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u91CA\u653E\u4E3B\u63A7\u9501");
+            this.masterClient = null;
+          }
           if (counts.webapp === 0 && counts.attach > 0) {
             this.ws.broadcast({
               type: "terminal_resize",
@@ -4215,18 +4324,30 @@ ${hint}
     if (isHeadless) {
       startPty("immediate");
     } else if (mustWaitEnter) {
-      void waitForUserConfirm().then(() => startPty("enter")).catch((err) => {
+      const wait = waitForUserConfirm();
+      void wait.promise.then((r) => {
+        if (r.done === "enter")
+          startPty("enter");
+      }).catch((err) => {
         logger.error({ err }, "\u7B49\u5F85 Enter \u5931\u8D25");
         shutdown(1);
       });
     } else {
+      const wait = waitForUserConfirm({ silent: true });
+      const triggerSpawn = (reason) => {
+        wait.cancel();
+        startPty(reason);
+      };
       ws.onConnect((_ws, type) => {
         if (type === "webapp")
-          startPty("webapp");
+          triggerSpawn("webapp");
+      });
+      void wait.promise.then((r) => {
+        if (r.done === "enter")
+          triggerSpawn("enter");
       });
-      void waitForUserConfirm({ silent: true }).then(() => startPty("enter"));
       if (cfg.spawnTimeoutSec > 0) {
-        setTimeout(() => startPty("timeout"), cfg.spawnTimeoutSec * 1e3).unref();
+        setTimeout(() => triggerSpawn("timeout"), cfg.spawnTimeoutSec * 1e3).unref();
       }
     }
     void registry.register({
@@ -4308,28 +4429,52 @@ function collectLocalHostnames() {
   return set;
 }
 function waitForUserConfirm(opts = {}) {
-  if (!process.stdin.isTTY)
-    return Promise.resolve();
+  if (!process.stdin.isTTY) {
+    return {
+      promise: Promise.resolve({ done: "enter" }),
+      cancel: () => {
+      }
+    };
+  }
   if (!opts.silent) {
     process.stderr.write("  \u6309 Enter \u542F\u52A8\u5B50\u8FDB\u7A0B\uFF08\u6216 Ctrl+C \u9000\u51FA backend\uFF09...");
   }
-  return new Promise((resolve9) => {
-    const onData = (chunk) => {
+  let cancelled = false;
+  let onData = null;
+  let resolveFn = null;
+  const detach = () => {
+    if (onData) {
+      process.stdin.removeListener("data", onData);
+      onData = null;
+    }
+  };
+  const promise = new Promise((resolve9) => {
+    resolveFn = resolve9;
+    onData = (chunk) => {
+      if (cancelled)
+        return;
       if (chunk.length === 0)
         return;
-      cleanup();
-      if (!opts.silent) {
+      detach();
+      if (!opts.silent)
         process.stderr.write("\r\x1B[K");
-      }
-      resolve9();
-    };
-    const cleanup = () => {
-      process.stdin.removeListener("data", onData);
-      process.stdin.pause();
+      resolve9({ done: "enter" });
     };
     process.stdin.resume();
     process.stdin.on("data", onData);
   });
+  return {
+    promise,
+    cancel: () => {
+      if (cancelled)
+        return;
+      cancelled = true;
+      detach();
+      if (!opts.silent)
+        process.stderr.write("\r\x1B[K");
+      resolveFn?.({ done: "cancelled" });
+    }
+  };
 }
 var BUILTIN_FULL_ALT_TUIS;
 var init_index = __esm({
@@ -4454,7 +4599,7 @@ var init_cli_stop = __esm({
 });
 
 // backend/dist/attach/attach-client.js
-import WebSocket3 from "ws";
+import WebSocket4 from "ws";
 import { EventEmitter as EventEmitter4 } from "node:events";
 function normalizeAttachUrl(input) {
   let url;
@@ -4509,7 +4654,7 @@ var init_attach_client = __esm({
         if (this.destroyed)
           return;
         this.setStatus("connecting");
-        const ws = new WebSocket3(this.url);
+        const ws = new WebSocket4(this.url);
         this.ws = ws;
         ws.on("open", () => {
           this.reconnectAttempt = 0;
@@ -4574,7 +4719,7 @@ var init_attach_client = __esm({
       }
       // ────────────────── 内部 ──────────────────
       send(msg) {
-        if (!this.ws || this.ws.readyState !== WebSocket3.OPEN)
+        if (!this.ws || this.ws.readyState !== WebSocket4.OPEN)
           return;
         try {
           this.ws.send(JSON.stringify(msg));