npm - claude-opencode-viewer - Versions diffs - 2.6.36 → 2.6.38 - Mend

claude-opencode-viewer 2.6.36 → 2.6.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/index-pc.html CHANGED Viewed

@@ -761,6 +761,58 @@
       padding: 1px 6px;
       border-radius: 8px;
     }
+    /* 启动对话框 */
+    #startup-overlay {
+      display: none;
+      position: fixed; top: 0; left: 0; right: 0; bottom: 0;
+      background: rgba(0, 0, 0, 0.75);
+      z-index: 99999;
+      align-items: center; justify-content: center;
+    }
+    #startup-overlay.visible { display: flex; }
+    #startup-card {
+      background: #1e1e2e; border-radius: 12px; padding: 28px;
+      max-width: 500px; width: 90%; color: #ccc;
+      box-shadow: 0 8px 32px rgba(0,0,0,0.5);
+    }
+    #startup-card h3 {
+      margin: 0 0 16px 0; color: #e0e0e0; font-size: 16px; font-weight: 600;
+    }
+    .startup-session-info {
+      background: #252535; border-radius: 8px; padding: 14px; margin-bottom: 16px;
+      border-left: 3px solid #4a9eff;
+    }
+    .startup-session-info.claude-session { border-left-color: #4a9eff; }
+    .startup-session-mode {
+      font-size: 12px; font-weight: 600; margin-bottom: 6px; color: #aaa;
+    }
+    .startup-session-mode .mode-tag {
+      display: inline-block; padding: 2px 8px; border-radius: 4px; font-size: 11px;
+    }
+    .startup-session-mode .mode-tag.opencode { background: #1a3a2a; color: #4ec9b0; }
+    .startup-session-mode .mode-tag.claude { background: #1a2a3a; color: #4a9eff; }
+    .startup-session-preview {
+      font-size: 13px; color: #ddd; margin-bottom: 6px;
+      overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+    }
+    .startup-session-meta {
+      font-size: 11px; color: #888;
+    }
+    .startup-buttons {
+      display: flex; gap: 10px; margin-top: 8px;
+    }
+    .startup-buttons button {
+      flex: 1; padding: 10px 16px; border: none; border-radius: 8px;
+      font-size: 14px; cursor: pointer; font-weight: 500; transition: background 0.2s;
+    }
+    .startup-btn-restore {
+      background: #4a9eff; color: #fff;
+    }
+    .startup-btn-restore:hover { background: #3a8eef; }
+    .startup-btn-new {
+      background: #333; color: #ccc;
+    }
+    .startup-btn-new:hover { background: #444; }
   </style>
 </head>
 <body>
@@ -964,6 +1016,7 @@
       var currentMode = 'claude';
       var isTransitioning = false;
       var isBufferReplay = true; // 初始缓冲区回放中，不弹 toast
+      var startupDialogShown = false;
       var term = new Terminal({
         cursorBlink: !isMobile,
@@ -1432,6 +1485,92 @@
         }, 50);
       });
+      // === 启动对话框 ===
+      function showStartupDialog() {
+        fetch(basePath + '/api/last-sessions')
+          .then(function(r) { return r.json(); })
+          .then(function(data) {
+            var oc = data.opencode;
+            var cl = data.claude;
+            // 无任何历史 → 直接新建 claude
+            if (!oc && !cl) {
+              sendInit('claude', null);
+              return;
+            }
+            // 确定最近的会话
+            var latest = null, latestMode = 'claude';
+            if (oc && cl) {
+              if (oc.mtime >= cl.mtime) { latest = oc; latestMode = 'opencode'; }
+              else { latest = cl; latestMode = 'claude'; }
+            } else if (oc) { latest = oc; latestMode = 'opencode'; }
+            else { latest = cl; latestMode = 'claude'; }
+            // 渲染会话信息
+            var infoDiv = document.getElementById('startup-session-info');
+            var modeLabel = latestMode === 'claude' ? 'Claude Code' : 'OpenCode';
+            var modeClass = latestMode === 'claude' ? 'claude' : 'opencode';
+            var timeAgo = getTimeAgo(latest.mtime);
+            var dir = latest.directory || '';
+            if (dir.startsWith('/Users/')) dir = '~' + dir.substring(dir.indexOf('/', 1));
+            var preview = latest.preview || '(无预览)';
+            if (preview.length > 100) preview = preview.substring(0, 100) + '...';
+            infoDiv.innerHTML =
+              '<div class="startup-session-info ' + (latestMode === 'claude' ? 'claude-session' : '') + '">' +
+              '<div class="startup-session-mode"><span class="mode-tag ' + modeClass + '">' + modeLabel + '</span> · ' + timeAgo + '</div>' +
+              '<div class="startup-session-preview">' + escapeHtml(preview) + '</div>' +
+              (dir ? '<div class="startup-session-meta">' + escapeHtml(dir) + '</div>' : '') +
+              '</div>';
+            // 恢复按钮样式
+            var restoreBtn = document.getElementById('startup-btn-restore');
+            restoreBtn.className = 'startup-btn-restore';
+            restoreBtn.textContent = '恢复会话';
+            // 绑定事件
+            restoreBtn.onclick = function() {
+              hideStartupDialog();
+              sendInit(latestMode, latest.id);
+            };
+            document.getElementById('startup-btn-new').onclick = function() {
+              hideStartupDialog();
+              sendInit('claude', null);
+            };
+            // 显示对话框
+            document.getElementById('startup-overlay').classList.add('visible');
+          })
+          .catch(function() {
+            // API 失败，直接新建
+            sendInit('claude', null);
+          });
+      }
+      function hideStartupDialog() {
+        document.getElementById('startup-overlay').classList.remove('visible');
+      }
+      function sendInit(mode, sessionId) {
+        if (!ws || ws.readyState !== 1) return;
+        currentMode = mode;
+        modeSelect.value = mode;
+        document.getElementById('mode-label').textContent = '';
+        var msg = { type: 'init', mode: mode };
+        if (sessionId) msg.sessionId = sessionId;
+        ws.send(JSON.stringify(msg));
+      }
+      function getTimeAgo(ts) {
+        var diff = Date.now() - ts;
+        var min = Math.floor(diff / 60000);
+        if (min < 1) return '刚刚';
+        if (min < 60) return min + ' 分钟前';
+        var hr = Math.floor(min / 60);
+        if (hr < 24) return hr + ' 小时前';
+        var day = Math.floor(hr / 24);
+        return day + ' 天前';
+      }
       function connect() {
         var proto = location.protocol === 'https:' ? 'wss:' : 'ws:';
         ws = new WebSocket(proto + '//' + location.host + basePath + '/ws');
@@ -1441,6 +1580,7 @@
           resize();
           rebindTouchScroll();
           setTimeout(function() { isBufferReplay = false; }, 500);
+          // 不在这里初始化，等 state 消息判断是否需要弹对话框
         };
         ws.onclose = function() {
@@ -1477,7 +1617,12 @@
               if (msg.mode) {
                 currentMode = msg.mode;
                 modeSelect.value = msg.mode;
-                modeIndicator.textContent = msg.mode === 'claude' ? 'Claude' : 'OpenCode';
+                document.getElementById('mode-label').textContent = '';
+              }
+              // 服务端无运行进程，显示启动对话框
+              if (!msg.running && !startupDialogShown) {
+                startupDialogShown = true;
+                showStartupDialog();
               }
             }
             else if (msg.type === 'restored') {
@@ -2241,7 +2386,7 @@
               fileList.innerHTML = '<div class="docs-loading" style="color:#666;">无文档</div>';
               return;
             }
-            var html = '';
+            var html = '<div style="padding:4px 12px;font-size:11px;color:#666;border-bottom:1px solid #2a2a2a;">📁 ' + escapeHtml(data.cwd || 'PROJECT_DIR') + '</div>';
             docs.forEach(function(doc) {
               var activeClass = docsSelectedFile === doc.name ? ' active' : '';
               var time = new Date(doc.mtime).toLocaleString('zh-CN', { month:'2-digit', day:'2-digit', hour:'2-digit', minute:'2-digit' });
@@ -2301,5 +2446,16 @@
       setTimeout(resize, 100);
     })();
   </script>
+    <!-- 启动对话框 -->
+    <div id="startup-overlay">
+      <div id="startup-card">
+        <h3>选择会话</h3>
+        <div id="startup-session-info"></div>
+        <div class="startup-buttons">
+          <button class="startup-btn-restore" id="startup-btn-restore">恢复会话</button>
+          <button class="startup-btn-new" id="startup-btn-new">新建会话</button>
+        </div>
+      </div>
+    </div>
 </body>
 </html>

package/index.html CHANGED Viewed

@@ -2505,7 +2505,7 @@
               fileList.innerHTML = '<div class="docs-loading" style="color:#666;">无文档</div>';
               return;
             }
-            var html = '';
+            var html = '<div style="padding:4px 12px;font-size:11px;color:#666;border-bottom:1px solid #2a2a2a;">📁 ' + escapeHtml(data.cwd || 'PROJECT_DIR') + '</div>';
             docs.forEach(function(doc) {
               var activeClass = docsSelectedFile === doc.name ? ' active' : '';
               var time = new Date(doc.mtime).toLocaleString('zh-CN', { month:'2-digit', day:'2-digit', hour:'2-digit', minute:'2-digit' });

package/package.json CHANGED Viewed

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

package/server.js CHANGED Viewed

@@ -644,15 +644,15 @@ const requestHandler = async (req, res) => {
     try {
       const gitCwd = process.env.PROJECT_DIR || process.cwd();
       const { stdout } = await execFileAsync('git', ['-c', 'safe.directory=*', 'status', '--porcelain'], {
-        cwd: gitCwd, encoding: 'utf-8', timeout: 5000,
+        cwd: gitCwd, encoding: 'utf-8', timeout: 60000,
       });
       const changes = stdout.split('\n').filter(Boolean).map(line => ({
         status: line.substring(0, 2).trim(),
         file: line.substring(3),
       })).filter(c => !/^core-/.test(c.file));
       res.end(JSON.stringify({ changes, cwd: gitCwd }));
-    } catch {
-      res.end(JSON.stringify({ changes: [], cwd: process.env.PROJECT_DIR || process.cwd() }));
+    } catch (err) {
+      res.end(JSON.stringify({ changes: [], cwd: process.env.PROJECT_DIR || process.cwd(), error: err.message }));
     }
     return;
   }
@@ -675,7 +675,7 @@ const requestHandler = async (req, res) => {
     for (const file of fileList) {
       if (file.includes('..') || file.startsWith('/')) continue;
       try {
-        const { stdout: statusOut } = await execFileAsync('git', ['-c', 'safe.directory=*', 'status', '--porcelain', '--', file], { cwd, encoding: 'utf-8', timeout: 3000 });
+        const { stdout: statusOut } = await execFileAsync('git', ['-c', 'safe.directory=*', 'status', '--porcelain', '--', file], { cwd, encoding: 'utf-8', timeout: 30000 });
         if (!statusOut.trim()) continue;
         const status = statusOut.substring(0, 2).trim();
         const is_new = status === 'A' || status === '??';
@@ -683,7 +683,7 @@ const requestHandler = async (req, res) => {
         let is_binary = false;
         if (!is_deleted) {
           try {
-            const { stdout: dc } = await execFileAsync('git', ['-c', 'safe.directory=*', 'diff', '--numstat', 'HEAD', '--', file], { cwd, encoding: 'utf-8', timeout: 3000 });
+            const { stdout: dc } = await execFileAsync('git', ['-c', 'safe.directory=*', 'diff', '--numstat', 'HEAD', '--', file], { cwd, encoding: 'utf-8', timeout: 30000 });
             if (dc.includes('-\t-\t')) is_binary = true;
           } catch {}
         }
@@ -691,7 +691,7 @@ const requestHandler = async (req, res) => {
         if (!is_binary) {
           if (!is_new) {
             try {
-              const { stdout } = await execFileAsync('git', ['-c', 'safe.directory=*', 'show', `HEAD:${file}`], { cwd, encoding: 'utf-8', timeout: 5000, maxBuffer: 5 * 1024 * 1024 });
+              const { stdout } = await execFileAsync('git', ['-c', 'safe.directory=*', 'show', `HEAD:${file}`], { cwd, encoding: 'utf-8', timeout: 60000, maxBuffer: 5 * 1024 * 1024 });
               old_content = stdout;
             } catch {}
           }
@@ -713,7 +713,7 @@ const requestHandler = async (req, res) => {
             const diffArgs = is_new
               ? ['-c', 'safe.directory=*', 'diff', '--no-color', '-U3', '--no-index', '/dev/null', file]
               : ['-c', 'safe.directory=*', 'diff', '--no-color', '-U3', 'HEAD', '--', file];
-            const { stdout } = await execFileAsync('git', diffArgs, { cwd, encoding: 'utf-8', timeout: 5000, maxBuffer: 5 * 1024 * 1024 });
+            const { stdout } = await execFileAsync('git', diffArgs, { cwd, encoding: 'utf-8', timeout: 60000, maxBuffer: 5 * 1024 * 1024 });
             unified_diff = stdout;
           } catch (e) {
             if (e.stdout) unified_diff = e.stdout;
@@ -752,7 +752,7 @@ const requestHandler = async (req, res) => {
       };
       scanDir(docsRoot, '', 0);
       files.sort((a, b) => b.mtime - a.mtime);
-      res.end(JSON.stringify({ docs: files }));
+      res.end(JSON.stringify({ docs: files, cwd: docsRoot }));
     } catch (err) {
       res.end(JSON.stringify({ docs: [], error: err.message }));
     }
@@ -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': '*' });
@@ -1149,6 +1230,20 @@ wssInst.on('connection', (ws, req) => {
           }
           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;
@@ -1297,54 +1392,10 @@ function startServer() {
     // 清理上次 cov 崩溃残留的孤儿进程
     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();