claude-opencode-viewer 2.6.37 → 2.6.39

package/server.js

@@ -404,7 +404,7 @@ async function switchMode(newMode) {
   } catch (e) {
     LOG('[switchMode] 启动新进程失败:', e.message);
   }
-  isSwitching = false;
+  // 注意：isSwitching 由调用方在回放 buffer 后设为 false
 }
 
 function writeToPty(data) {
@@ -782,6 +782,87 @@ const requestHandler = async (req, res) => {
     return;
   }
 
+  // API: 获取最近的 OpenCode 和 Claude 会话（用于启动对话框）
+  if (req.url === '/api/last-sessions') {
+    res.writeHead(200, { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' });
+    let opencode = null, claude = null;
+    // OpenCode: 从 SQLite 查最近会话
+    try {
+      const db = new Database(OPENCODE_DB_PATH, { readonly: true });
+      const row = db.prepare(
+        `SELECT id, directory, time_updated FROM session WHERE parent_id IS NULL AND time_archived IS NULL ORDER BY time_updated DESC LIMIT 1`
+      ).get();
+      db.close();
+      if (row) {
+        opencode = { id: row.id, mtime: new Date(row.time_updated).getTime(), directory: row.directory || '', preview: '' };
+        // 尝试读最近用户消息作为预览（文本在 part 表中）
+        try {
+          const db2 = new Database(OPENCODE_DB_PATH, { readonly: true });
+          const partRow = db2.prepare(
+            `SELECT p.data FROM part p JOIN message m ON p.message_id = m.id
+             WHERE m.session_id = ? AND json_extract(m.data, '$.role') = 'user'
+             ORDER BY m.time_created DESC LIMIT 1`
+          ).get(row.id);
+          db2.close();
+          if (partRow) {
+            try {
+              const pd = JSON.parse(partRow.data);
+              if (pd.text) opencode.preview = pd.text.slice(0, 200);
+            } catch {}
+          }
+        } catch {}
+      }
+    } catch {}
+    // Claude: 扫描 JSONL 找最近文件
+    try {
+      const projectsDir = join(CLAUDE_HOME, 'projects');
+      if (existsSync(projectsDir)) {
+        let newest = 0, newestFile = null, newestProj = null;
+        for (const projDir of readdirSync(projectsDir, { withFileTypes: true })) {
+          if (!projDir.isDirectory()) continue;
+          const projPath = join(projectsDir, projDir.name);
+          for (const f of readdirSync(projPath)) {
+            if (!f.endsWith('.jsonl')) continue;
+            try {
+              const st = statSync(join(projPath, f));
+              if (st.mtimeMs > newest) {
+                newest = st.mtimeMs;
+                newestFile = f.replace('.jsonl', '');
+                newestProj = projDir.name;
+              }
+            } catch {}
+          }
+        }
+        if (newestFile && newestProj) {
+          claude = { id: newestFile, mtime: newest, project: newestProj, directory: '', preview: '' };
+          try {
+            const content = readFileSync(join(projectsDir, newestProj, newestFile + '.jsonl'), 'utf-8');
+            const lines = content.split('\n').slice(0, 30);
+            for (const line of lines) {
+              if (!line.trim()) continue;
+              try {
+                const d = JSON.parse(line);
+                if (d.cwd && !claude.directory) claude.directory = d.cwd;
+                if (d.type === 'user' && d.message && !claude.preview) {
+                  const c = d.message.content;
+                  if (typeof c === 'string') claude.preview = c.slice(0, 200);
+                  else if (Array.isArray(c)) {
+                    for (const item of c) {
+                      if (item.type === 'text' && item.text) { claude.preview = item.text.slice(0, 200); break; }
+                    }
+                  }
+                  break;
+                }
+              } catch {}
+            }
+          } catch {}
+        }
+      }
+    } catch {}
+    res.end(JSON.stringify({ opencode, claude }));
+    return;
+  }
+
   // API: Claude Code 会话列表（扫描所有项目）
   if (req.url === '/api/claude-sessions') {
     res.writeHead(200, { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' });
@@ -961,28 +1042,7 @@ const requestHandler = async (req, res) => {
 const httpsOpts = USE_HTTPS ? await getOrCreateCert() : null;
 let server, wss;
 
-// 无客户端连接后自动退出，防止进程堆积
-// 首次启动等 3 分钟（给用户时间打开浏览器），连接过之后断开等 30 秒
-let noClientTimer = null;
 let hasEverConnected = false;
-function startNoClientTimer() {
-  if (noClientTimer) return;
-  if (wss && wss.clients.size > 0) return;
-  const timeout = hasEverConnected ? 10000 : 180000;
-  noClientTimer = setTimeout(() => {
-    if (!wss || wss.clients.size === 0) {
-      LOG(`[auto-exit] ${timeout / 1000}秒无客户端连接，自动退出`);
-      cleanupAndExit();
-    }
-    noClientTimer = null;
-  }, timeout);
-}
-function cancelNoClientTimer() {
-  if (noClientTimer) {
-    clearTimeout(noClientTimer);
-    noClientTimer = null;
-  }
-}
 
 function createServerAndWss() {
   server = USE_HTTPS
@@ -1006,7 +1066,6 @@ function setupWss(wssInst) {
 wssInst.on('connection', (ws, req) => {
   LOG('[WS] 客户端连接 from', req.socket.remoteAddress);
   hasEverConnected = true;
-  cancelNoClientTimer();
   ws.isAlive = true;
   ws.on('pong', () => { ws.isAlive = true; });
 
@@ -1097,16 +1156,14 @@ wssInst.on('connection', (ws, req) => {
         }
       } else if (msg.type === 'switch') {
         if (msg.mode !== currentMode) {
+          isSwitching = true;
           ws.send(JSON.stringify({ type: 'switching', mode: msg.mode }));
           await switchMode(msg.mode);
-          // 切换完成后：先发 reset 清除残留，再发新进程的 buffer
-          ws.send(JSON.stringify({ type: 'data', data: '\x1bc' }));
-          ws.send(JSON.stringify({ type: 'mode', mode: currentMode }));
-          setTimeout(() => {
-            if (outputBuffer) {
-              ws.send(JSON.stringify({ type: 'data', data: outputBuffer }));
-            }
-          }, 100);
+          // 切换完成后统一回放（switchMode 期间 isSwitching=true，listener 不推数据）
+          const buf = outputBuffer;
+          outputBuffer = '';
+          ws.send(JSON.stringify({ type: 'mode', mode: currentMode, buffer: buf || undefined }));
+          isSwitching = false;
         }
       } else if (msg.type === 'restore') {
         // 恢复会话（支持 opencode 和 claude）
@@ -1142,13 +1199,29 @@ wssInst.on('connection', (ws, req) => {
           // 启动进程，传入 session ID
           try {
             await spawnProcess(currentMode, msg.sessionId);
-            ws.send(JSON.stringify({ type: 'restored', sessionId: msg.sessionId }));
+            const buf = outputBuffer;
+            outputBuffer = '';
+            ws.send(JSON.stringify({ type: 'restored', sessionId: msg.sessionId, buffer: buf || undefined }));
           } catch (e) {
             LOG('[restore] 启动进程失败:', e.message);
             ws.send(JSON.stringify({ type: 'restore-error', error: e.message }));
           }
           isSwitching = false;
         }
+      } else if (msg.type === 'init') {
+        // 首次启动：客户端选择模式和会话后发送
+        const mode = msg.mode || 'claude';
+        currentMode = mode;
+        LOG(`[init] 启动 ${mode}, sessionId=${msg.sessionId || '(新会话)'}`);
+        outputBuffer = '';
+        try {
+          await spawnProcess(mode, msg.sessionId || null);
+          ws.send(JSON.stringify({ type: 'mode', mode: currentMode }));
+          ws.send(JSON.stringify({ type: 'started', sessionId: msg.sessionId || null }));
+        } catch (e) {
+          LOG('[init] 启动失败:', e.message);
+          ws.send(JSON.stringify({ type: 'start-error', error: e.message }));
+        }
       } else if (msg.type === 'start') {
         // 前端启动指令：可选带 sessionId 恢复会话
         const mode = currentMode;
@@ -1185,10 +1258,11 @@ wssInst.on('connection', (ws, req) => {
         await new Promise(resolve => setTimeout(resolve, 500));
         cleanupOrphanProcesses();
 
-        // 先通知前端准备好，再启动新进程
-        ws.send(JSON.stringify({ type: 'new-session-ok', mode }));
         try {
           await spawnProcess(mode);
+          const buf = outputBuffer;
+          outputBuffer = '';
+          ws.send(JSON.stringify({ type: 'new-session-ok', mode, buffer: buf || undefined }));
         } catch (e) {
           LOG('[new-session] 启动失败:', e.message);
           ws.send(JSON.stringify({ type: 'new-session-error', error: e.message }));
@@ -1220,6 +1294,17 @@ wssInst.on('connection', (ws, req) => {
           setTimeout(() => checkNewSession(attempt + 1), 2000);
         };
         setTimeout(() => checkNewSession(0), 3000);
+      } else if (msg.type === 'quit') {
+        // PC 端关闭浏览器时发送，延迟 5 秒退出（防止刷新页面误杀）
+        LOG('[quit] 收到退出请求，5秒后检查是否仍无连接...');
+        setTimeout(() => {
+          if (!wss || wss.clients.size === 0) {
+            LOG('[quit] 无活跃连接，退出进程');
+            cleanupAndExit();
+          } else {
+            LOG('[quit] 仍有活跃连接，取消退出');
+          }
+        }, 5000);
       }
     } catch (err) {
       LOG('[WS] Error:', err.message);
@@ -1248,15 +1333,19 @@ wssInst.on('connection', (ws, req) => {
         }
       }
     }
-    // 无客户端连接时，30秒后自动退出
-    startNoClientTimer();
   });
 });
 
   // WebSocket 心跳保活，防止中间网络设备断开空闲连接
+  // 移动端跳过心跳检测：锁屏时 JS 暂停无法回 pong，但不需要断开（进程常驻）
   const HEARTBEAT_INTERVAL = 5000;
   const heartbeat = setInterval(() => {
     wssInst.clients.forEach((ws) => {
+      if (mobileClients.has(ws)) {
+        // 移动端不检测心跳，但清理已断开的僵尸连接
+        if (ws.readyState !== 1) mobileClients.delete(ws);
+        return;
+      }
       if (ws.isAlive === false) return ws.terminate();
       ws.isAlive = false;
       ws.ping();
@@ -1298,57 +1387,10 @@ function startServer() {
     cleanupOrphanProcesses();
 
 
-    // 尝试恢复最近的会话，如果没有则新建
-    if (currentMode === 'opencode') {
-      let lastSessionId = null;
-      try {
-        const db = new Database(OPENCODE_DB_PATH, { readonly: true });
-        const row = db.prepare(
-          `SELECT id FROM session WHERE parent_id IS NULL AND time_archived IS NULL ORDER BY time_updated DESC LIMIT 1`
-        ).get();
-        db.close();
-        if (row) lastSessionId = row.id;
-      } catch (e) {}
-
-      if (lastSessionId) {
-        LOG(`[startup] 恢复最近会话: ${lastSessionId}`);
-        await spawnProcess('opencode', lastSessionId);
-      } else {
-        await spawnProcess('opencode');
-      }
-    } else {
-      // Claude 模式：找最近的会话恢复
-      let lastClaudeSession = null;
-      try {
-        const projectsDir = join(CLAUDE_HOME, 'projects');
-        if (existsSync(projectsDir)) {
-          let newest = 0;
-          for (const projDir of readdirSync(projectsDir, { withFileTypes: true })) {
-            if (!projDir.isDirectory()) continue;
-            const projPath = join(projectsDir, projDir.name);
-            for (const f of readdirSync(projPath)) {
-              if (!f.endsWith('.jsonl')) continue;
-              try {
-                const st = statSync(join(projPath, f));
-                if (st.mtimeMs > newest) {
-                  newest = st.mtimeMs;
-                  lastClaudeSession = f.replace('.jsonl', '');
-                }
-              } catch {}
-            }
-          }
-        }
-      } catch {}
-      if (lastClaudeSession) {
-        LOG(`[startup] 恢复最近Claude会话: ${lastClaudeSession}`);
-        await spawnProcess('claude', lastClaudeSession);
-      } else {
-        await spawnProcess('claude');
-      }
-    }
+    // 延迟启动：等待 PC 客户端发送 init 消息后再 spawn 进程
+    // 移动端客户端连接时自动启动 claude（见 WS 连接处理）
+    LOG('[startup] 等待客户端连接并选择会话...');
 
-    // 启动首次连接超时检测（3分钟无人连接则退出）
-    startNoClientTimer();
   });
 
   server.on('error', (err) => {