claude-opencode-viewer 2.1.7 → 2.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-opencode-viewer",
-  "version": "2.1.7",
+  "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) {