clawt 3.8.6 → 3.8.7

package/dist/index.js

@@ -4002,14 +4002,7 @@ var InteractivePanel = class {
     this.clearTimers();
     this.keyboardController.stop();
     this.restoreTerminal();
-    if (this.resizeHandler) {
-      process.stdout.removeListener("resize", this.resizeHandler);
-      this.resizeHandler = null;
-    }
-    if (this.exitHandler) {
-      process.removeListener("exit", this.exitHandler);
-      this.exitHandler = null;
-    }
+    this.removeTerminalListeners();
     if (this.resolveStart) {
       this.resolveStart();
       this.resolveStart = null;
@@ -4019,6 +4012,7 @@ var InteractivePanel = class {
    * 初始化终端：进入备选屏幕、隐藏光标、禁用行换行
    */
   initTerminal() {
+    this.removeTerminalListeners();
     process.stdout.write(ALT_SCREEN_ENTER);
     process.stdout.write(CURSOR_HIDE);
     process.stdout.write(LINE_WRAP_DISABLE);
@@ -4029,13 +4023,22 @@ var InteractivePanel = class {
       }
     };
     process.stdout.on("resize", this.resizeHandler);
-    this.exitHandler = () => {
-      process.stdout.write(LINE_WRAP_ENABLE);
-      process.stdout.write(CURSOR_SHOW);
-      process.stdout.write(ALT_SCREEN_LEAVE);
-    };
+    this.exitHandler = () => this.restoreTerminal();
     process.on("exit", this.exitHandler);
   }
+  /**
+   * 移除终端事件监听器（resize 和 exit）
+   */
+  removeTerminalListeners() {
+    if (this.resizeHandler) {
+      process.stdout.removeListener("resize", this.resizeHandler);
+      this.resizeHandler = null;
+    }
+    if (this.exitHandler) {
+      process.removeListener("exit", this.exitHandler);
+      this.exitHandler = null;
+    }
+  }
   /**
    * 恢复终端：启用行换行、显示光标、退出备选屏幕
    */
@@ -4178,6 +4181,7 @@ var InteractivePanel = class {
     this.isOperating = true;
     this.clearTimers();
     this.restoreTerminal();
+    this.removeTerminalListeners();
     this.keyboardController.stop();
     action();
     console.log(PANEL_PRESS_ENTER_TO_RETURN);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawt",
-  "version": "3.8.6",
+  "version": "3.8.7",
   "description": "本地并行执行多个Claude Code Agent任务，融合 Git Worktree 与 Claude Code CLI 的命令行工具",
   "type": "module",
   "main": "dist/index.js",

package/src/utils/interactive-panel.ts

@@ -125,17 +125,7 @@ export class InteractivePanel {
     // 恢复终端
     this.restoreTerminal();
 
-    // 移除 resize 监听
-    if (this.resizeHandler) {
-      process.stdout.removeListener('resize', this.resizeHandler);
-      this.resizeHandler = null;
-    }
-
-    // 移除 exit 兜底
-    if (this.exitHandler) {
-      process.removeListener('exit', this.exitHandler);
-      this.exitHandler = null;
-    }
+    this.removeTerminalListeners();
 
     // 完成 Promise
     if (this.resolveStart) {
@@ -148,6 +138,9 @@ export class InteractivePanel {
    * 初始化终端：进入备选屏幕、隐藏光标、禁用行换行
    */
   private initTerminal(): void {
+    // 确保不会重复注册监听器
+    this.removeTerminalListeners();
+
     process.stdout.write(ALT_SCREEN_ENTER);
     process.stdout.write(CURSOR_HIDE);
     process.stdout.write(LINE_WRAP_DISABLE);
@@ -163,14 +156,24 @@ export class InteractivePanel {
     process.stdout.on('resize', this.resizeHandler);
 
     // 注册 exit 兜底，确保异常退出时终端状态被恢复
-    this.exitHandler = () => {
-      process.stdout.write(LINE_WRAP_ENABLE);
-      process.stdout.write(CURSOR_SHOW);
-      process.stdout.write(ALT_SCREEN_LEAVE);
-    };
+    this.exitHandler = () => this.restoreTerminal();
     process.on('exit', this.exitHandler);
   }
 
+  /**
+   * 移除终端事件监听器（resize 和 exit）
+   */
+  private removeTerminalListeners(): void {
+    if (this.resizeHandler) {
+      process.stdout.removeListener('resize', this.resizeHandler);
+      this.resizeHandler = null;
+    }
+    if (this.exitHandler) {
+      process.removeListener('exit', this.exitHandler);
+      this.exitHandler = null;
+    }
+  }
+
   /**
    * 恢复终端：启用行换行、显示光标、退出备选屏幕
    */
@@ -365,6 +368,8 @@ export class InteractivePanel {
 
     // 恢复终端以便子命令输出
     this.restoreTerminal();
+    // 移除旧的终端事件监听器，避免 initTerminal() 重复注册导致泄漏
+    this.removeTerminalListeners();
 
     // 恢复 stdin 以便子命令交互
     this.keyboardController.stop();