claude-opencode-viewer 2.6.29 → 2.6.31

package/package.json

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

package/server.js

@@ -199,6 +199,20 @@ function killProcessTree(proc) {
   }, 1000);
 }
 
+// 清理孤儿进程（PPID=1 的 opencode/claude）
+function cleanupOrphanProcesses() {
+  try {
+    const orphans = execSync(
+      "ps -eo pid,ppid,comm 2>/dev/null | awk '$2==1 && (/opencode/||/claude/) {print $1}'",
+      { encoding: 'utf-8', timeout: 5000 }
+    ).trim().split(/\s+/).filter(Boolean).map(Number);
+    for (const pid of orphans) {
+      try { process.kill(pid, 'SIGKILL'); } catch {}
+    }
+    if (orphans.length > 0) LOG(`[cleanup] 清理孤儿进程: ${orphans.join(', ')}`);
+  } catch {}
+}
+
 async function spawnProcess(mode, sessionId = null) {
   const pty = await getPty();
   fixSpawnHelperPermissions();
@@ -336,8 +350,14 @@ async function switchMode(newMode) {
   }
   currentProcess = null;
 
-  // 等待一小段时间确保进程完全退出
-  await new Promise(resolve => setTimeout(resolve, 100));
+  // 等待旧进程完全退出（Bun crash dump 可能延迟输出）
+  await new Promise(resolve => setTimeout(resolve, 500));
+
+  // 清理可能的孤儿进程（Bun segfault 导致子进程未被回收）
+  cleanupOrphanProcesses();
+
+  // 清空旧进程残留输出（包括 Bun crash dump）
+  outputBuffer = '';
 
   // 切换到新模式
   currentMode = newMode;
@@ -673,22 +693,32 @@ const requestHandler = async (req, res) => {
     return;
   }
 
-  // API: 获取文档列表
+  // API: 获取文档列表（扫描 /halo 或 cwd 下的 md 文件，最多两层目录）
   if (req.url === '/api/docs') {
     res.writeHead(200, { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' });
     try {
-      const docsCwd = existsSync('/halo/code') ? '/halo/code' : process.cwd();
+      const docsRoot = existsSync('/halo') ? '/halo' : process.cwd();
       const EXCLUDE = new Set(['readme.md', 'changelog.md', 'license.md', 'claude.md', 'agents.md', 'contributing.md', 'security.md', 'context.md']);
-      const files = readdirSync(docsCwd)
-        .filter(f => f.endsWith('.md') && !EXCLUDE.has(f.toLowerCase()))
-        .map(f => {
-          try {
-            const st = statSync(join(docsCwd, f));
-            return { name: f, mtime: st.mtimeMs };
-          } catch { return null; }
-        })
-        .filter(Boolean)
-        .sort((a, b) => b.mtime - a.mtime);
+      const files = [];
+      const SKIP_DIRS = new Set(['node_modules', '.git', '.opencode', '.claude', '.idea', '.vscode']);
+      const scanDir = (dir, prefix, depth) => {
+        if (depth > 5) return; // 最多 5 层，避免过深
+        try {
+          for (const f of readdirSync(dir, { withFileTypes: true })) {
+            if (f.isFile() && f.name.endsWith('.md') && !EXCLUDE.has(f.name.toLowerCase())) {
+              try {
+                const fullPath = join(dir, f.name);
+                const st = statSync(fullPath);
+                files.push({ name: join(dir, f.name), mtime: st.mtimeMs });
+              } catch {}
+            } else if (f.isDirectory() && !f.name.startsWith('.') && !SKIP_DIRS.has(f.name)) {
+              scanDir(join(dir, f.name), prefix ? prefix + '/' + f.name : f.name, depth + 1);
+            }
+          }
+        } catch {}
+      };
+      scanDir(docsRoot, '', 0);
+      files.sort((a, b) => b.mtime - a.mtime);
       res.end(JSON.stringify({ docs: files }));
     } catch (err) {
       res.end(JSON.stringify({ docs: [], error: err.message }));
@@ -701,13 +731,12 @@ const requestHandler = async (req, res) => {
     const url = new URL(req.url, `http://${req.headers.host}`);
     const file = url.searchParams.get('file');
     res.writeHead(200, { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' });
-    if (!file || file.includes('/') || file.includes('..') || !file.endsWith('.md')) {
+    if (!file || file.includes('..') || !file.endsWith('.md')) {
       res.end(JSON.stringify({ error: '无效文件名' }));
       return;
     }
     try {
-      const docsCwd = existsSync('/halo/code') ? '/halo/code' : process.cwd();
-      const filePath = join(docsCwd, file);
+      const filePath = file;
       if (!existsSync(filePath)) {
         res.end(JSON.stringify({ error: '文件不存在' }));
         return;
@@ -933,7 +962,8 @@ wssInst.on('connection', (ws, req) => {
           outputBuffer = '';
 
           // 等待进程完全退出
-          await new Promise(resolve => setTimeout(resolve, 200));
+          await new Promise(resolve => setTimeout(resolve, 500));
+          cleanupOrphanProcesses();
 
           // 启动新的 opencode 进程，传入 session ID
           try {
@@ -978,7 +1008,8 @@ wssInst.on('connection', (ws, req) => {
         }
 
         outputBuffer = '';
-        await new Promise(resolve => setTimeout(resolve, 200));
+        await new Promise(resolve => setTimeout(resolve, 500));
+        cleanupOrphanProcesses();
 
         // 先通知前端准备好，再启动新进程
         ws.send(JSON.stringify({ type: 'new-session-ok', mode }));
@@ -1089,17 +1120,8 @@ function startServer() {
       LOG('\n按 Ctrl+C 停止服务\n');
     }
 
-    // 清理上次 cov 崩溃残留的孤儿进程（PPID=1 的 opencode/claude）
-    try {
-      const orphans = execSync(
-        "ps -eo pid,ppid,comm 2>/dev/null | awk '$2==1 && (/opencode/||/claude/) {print $1}'",
-        { encoding: 'utf-8', timeout: 5000 }
-      ).trim().split(/\s+/).filter(Boolean).map(Number);
-      for (const pid of orphans) {
-        try { process.kill(pid, 'SIGTERM'); } catch {}
-      }
-      if (orphans.length > 0) LOG(`[startup] 清理孤儿进程: ${orphans.join(', ')}`);
-    } catch {}
+    // 清理上次 cov 崩溃残留的孤儿进程
+    cleanupOrphanProcesses();
 
     // 尝试恢复最近的会话，如果没有则新建
     let lastSessionId = null;