claude-opencode-viewer 2.1.6 → 2.1.8

package/index.html

@@ -504,11 +504,12 @@
       var ARROW_KEYS = ['up', 'down', 'left', 'right'];
 
       function sendKey(keyName) {
-        var isArrowKey = ARROW_KEYS.indexOf(keyName) !== -1;
+        // 重新获取焦点状态（确保使用最新状态）
+        var isInputFocused = (inputField && document.activeElement === inputField);
 
         // 方向键特殊处理：根据焦点位置决定行为
-        if (isArrowKey) {
-          if (inputFocused && inputField) {
+        if (ARROW_KEYS.indexOf(keyName) !== -1) {
+          if (isInputFocused) {
             // 焦点在输入框：模拟方向键操作输入框光标
             var cursorPos = inputField.selectionStart;
             var textLen = inputField.value.length;
@@ -522,28 +523,27 @@
             return;
           } else {
             // 焦点在终端：发送方向键到终端，并收起键盘
-            if (inputField && isMobile) {
+            if (isMobile) {
               inputField.blur();
             }
           }
         } else {
           // 非方向键：点击时收起键盘
-          if (inputField && isMobile) {
+          if (isMobile) {
             inputField.blur();
           }
         }
 
         // Enter 键特殊处理：根据焦点位置决定行为
         if (keyName === 'enter') {
-          if (inputFocused && inputField && inputField.value) {
+          if (isInputFocused && inputField && inputField.value) {
             // 焦点在输入框且有内容：只发送输入框内容，不额外发送 \r
             var value = inputField.value;
             console.log('[enter] from input:', value);
             ws.send(JSON.stringify({ type: 'input', data: value + '\r' }));
             inputField.value = '';
-            // 让输入框失去焦点，防止终端 textarea 同时收到输入
             inputField.blur();
-          } else if (inputFocused && inputField) {
+          } else if (isInputFocused && inputField) {
             // 焦点在输入框但内容为空：不发送任何内容，避免误触
             console.log('[enter] input focused but empty, ignored');
           } else {
@@ -554,6 +554,13 @@
           return;
         }
 
+        // Esc 键：中断终端进程（发送 ESC 字符）
+        if (keyName === 'esc') {
+          console.log('[esc] sending escape to terminal');
+          ws.send(JSON.stringify({ type: 'input', data: '\x1b' }));
+          return;
+        }
+
         // 其他按键直接发送到终端
         var key = KEY_MAP[keyName];
         if (key && ws && ws.readyState === 1 && !isTransitioning) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-opencode-viewer",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "A unified terminal viewer for Claude Code and OpenCode with seamless switching",
   "type": "module",
   "main": "server.js",

package/server.js

@@ -133,18 +133,25 @@ async function spawnProcess(mode) {
     }
   });
 
+  // 只在初始化时杀死旧进程，switchMode 已经处理了切换时的进程清理
   if (mode === 'claude') {
-    if (claudeProcess?.pid) {
-      try { claudeProcess.kill(); } catch {}
+    if (claudeProcess && claudeProcess !== proc && claudeProcess.pid) {
+      try {
+        console.log(`[spawnProcess] 清理旧 claude 进程 PID: ${claudeProcess.pid}`);
+        claudeProcess.kill();
+      } catch {}
     }
     claudeProcess = proc;
   } else {
-    if (opencodeProcess?.pid) {
-      try { opencodeProcess.kill(); } catch {}
+    if (opencodeProcess && opencodeProcess !== proc && opencodeProcess.pid) {
+      try {
+        console.log(`[spawnProcess] 清理旧 opencode 进程 PID: ${opencodeProcess.pid}`);
+        opencodeProcess.kill();
+      } catch {}
     }
     opencodeProcess = proc;
   }
-  
+
   currentProcess = proc;
   console.log(`[claude-opencode-viewer] ${mode === 'claude' ? 'Claude Code' : 'OpenCode'} 已启动 (PID: ${proc.pid})`);
   return proc;
@@ -152,24 +159,43 @@ async function spawnProcess(mode) {
 
 async function switchMode(newMode) {
   if (newMode === currentMode) return;
-  
+
+  console.log(`[switchMode] 从 ${currentMode} 切换到 ${newMode}`);
+
   // 清空所有历史输出
   outputBuffer = '';
-  
+
   // 杀死旧进程
   if (currentMode === 'claude' && claudeProcess) {
-    try { claudeProcess.kill(); } catch {}
+    try {
+      console.log(`[switchMode] 杀死 claude 进程 PID: ${claudeProcess.pid}`);
+      claudeProcess.kill();
+    } catch (e) {
+      console.log('[switchMode] 杀死 claude 进程失败:', e.message);
+    }
     claudeProcess = null;
   } else if (currentMode === 'opencode' && opencodeProcess) {
-    try { opencodeProcess.kill(); } catch {}
+    try {
+      console.log(`[switchMode] 杀死 opencode 进程 PID: ${opencodeProcess.pid}`);
+      opencodeProcess.kill();
+    } catch (e) {
+      console.log('[switchMode] 杀死 opencode 进程失败:', e.message);
+    }
     opencodeProcess = null;
   }
   currentProcess = null;
-  
+
+  // 等待一小段时间确保进程完全退出
+  await new Promise(resolve => setTimeout(resolve, 100));
+
   // 切换到新模式
   currentMode = newMode;
-  await spawnProcess(newMode);
-  console.log(`[CombinedV2] 切换到 ${newMode}`);
+  try {
+    await spawnProcess(newMode);
+    console.log(`[switchMode] 切换到 ${newMode} 成功`);
+  } catch (e) {
+    console.error('[switchMode] 启动新进程失败:', e.message);
+  }
 }
 
 function writeToPty(data) {