claude-opencode-viewer 2.4.0 → 2.4.2

package/index.html

@@ -493,14 +493,22 @@
   <!-- 参考 cc-viewer 的 App.jsx 行 1315-1607: 完整的移动端布局结构 -->
   <div id="layout">
     <div id="header">
-      <div style="font-size: 12px; color: #aaa;">Claude OpenCode Viewer</div>
-      <button class="history-toggle-btn" id="history-toggle">
-        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-          <circle cx="12" cy="12" r="10"></circle>
-          <polyline points="12 6 12 12 16 14"></polyline>
-        </svg>
-        <span>历史</span>
-      </button>
+      <div style="display: flex; gap: 8px; align-items: center;">
+        <button class="history-toggle-btn" id="new-session-btn">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <line x1="12" y1="5" x2="12" y2="19"></line>
+            <line x1="5" y1="12" x2="19" y2="12"></line>
+          </svg>
+          <span>新会话</span>
+        </button>
+        <button class="history-toggle-btn" id="history-toggle">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <circle cx="12" cy="12" r="10"></circle>
+            <polyline points="12 6 12 12 16 14"></polyline>
+          </svg>
+          <span>历史</span>
+        </button>
+      </div>
       <div id="mode-switcher">
         <span id="mode-label">Mode:</span>
         <select id="mode-select">
@@ -1048,10 +1056,16 @@
         ws.onmessage = function(e) {
           try {
             var msg = JSON.parse(e.data);
-            if (msg.type === 'data') throttledWrite(msg.data);
+            if (msg.type === 'data') {
+              if (!isCreatingNewSession) {
+                throttledWrite(msg.data);
+              }
+            }
             else if (msg.type === 'exit') {
-              throttledWrite('\r\n\x1b[33m[进程已退出: ' + msg.exitCode + ']\x1b[0m\r\n');
-              throttledWrite('\x1b[90m按 Enter 键重新启动 ' + currentMode + '...\x1b[0m\r\n');
+              if (!isCreatingNewSession) {
+                throttledWrite('\r\n\x1b[33m[进程已退出: ' + msg.exitCode + ']\x1b[0m\r\n');
+                throttledWrite('\x1b[90m按 Enter 键重新启动 ' + currentMode + '...\x1b[0m\r\n');
+              }
             }
             else if (msg.type === 'mode') {
               endTransition(msg.mode);
@@ -1080,6 +1094,14 @@
               // 恢复失败
               term.write('\x1b[31m✗ 恢复失败: ' + msg.error + '\x1b[0m\r\n');
             }
+            else if (msg.type === 'new-session-ok') {
+              isCreatingNewSession = false;
+              term.clear();
+            }
+            else if (msg.type === 'new-session-error') {
+              isCreatingNewSession = false;
+              term.write('\x1b[31m✗ 新会话启动失败: ' + msg.error + '\x1b[0m\r\n');
+            }
           } catch(err) {}
         };
 
@@ -1455,12 +1477,27 @@
 
         if (historyBarVisible) {
           historyBar.classList.add('visible');
-          loadSessions();
+          if (currentMode === 'opencode') {
+            loadSessions();
+          } else {
+            // claude 模式暂无历史会话功能
+            var sessionList = document.getElementById('session-list');
+            sessionList.innerHTML = '<div class="session-empty">Claude Code 暂不支持历史会话</div>';
+          }
         } else {
           historyBar.classList.remove('visible');
         }
       }
 
+      // 新会话按钮
+      var isCreatingNewSession = false;
+      document.getElementById('new-session-btn').addEventListener('click', function() {
+        if (!ws || ws.readyState !== 1) return;
+        isCreatingNewSession = true;
+        term.clear();
+        ws.send(JSON.stringify({ type: 'new-session' }));
+      });
+
       // 绑定历史按钮
       document.getElementById('history-toggle').addEventListener('click', function() {
         toggleHistoryBar();

package/package.json

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

package/server.js

@@ -15,8 +15,11 @@ process.title = 'claude-opencode-viewer';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const PORT = 7008;
 
-// OpenCode 数据库路径
-const OPENCODE_DB_PATH = join(homedir(), '.local/share/opencode/opencode.db');
+// OpenCode 数据库路径（支持环境变量覆盖，自动检测 /halo 环境）
+const OPENCODE_DB_PATH = process.env.OPENCODE_DB_PATH || join(
+  existsSync('/halo') ? '/halo/.local/share' : (process.env.XDG_DATA_HOME || join(homedir(), '.local/share')),
+  'opencode/opencode.db'
+);
 
 const MAX_BUFFER = 200000;
 
@@ -119,12 +122,18 @@ async function spawnProcess(mode, sessionId = null) {
     }
   }
 
+  const spawnEnv = { ...process.env };
+  // 如果 /halo 存在，将 opencode 数据持久化到 NAS
+  if (mode === 'opencode' && existsSync('/halo')) {
+    spawnEnv.XDG_DATA_HOME = '/halo/.local/share';
+  }
+
   const proc = pty.spawn(command, args, {
     name: 'xterm-256color',
     cols: lastPtyCols,
     rows: lastPtyRows,
     cwd: process.cwd(),
-    env: { ...process.env },
+    env: spawnEnv,
   });
 
   proc.onData((data) => {
@@ -526,6 +535,32 @@ wss.on('connection', (ws, req) => {
             ws.send(JSON.stringify({ type: 'restore-error', error: e.message }));
           }
         }
+      } else if (msg.type === 'new-session') {
+        // 开启新会话：杀掉当前进程，重新启动不带 session 参数的 opencode
+        const mode = currentMode;
+        console.log(`[new-session] 开启新会话, mode=${mode}`);
+
+        if (mode === 'opencode' && opencodeProcess) {
+          try { opencodeProcess.kill(); } catch {}
+          opencodeProcess = null;
+          currentProcess = null;
+        } else if (mode === 'claude' && claudeProcess) {
+          try { claudeProcess.kill(); } catch {}
+          claudeProcess = null;
+          currentProcess = null;
+        }
+
+        outputBuffer = '';
+        await new Promise(resolve => setTimeout(resolve, 200));
+
+        // 先通知前端准备好，再启动新进程
+        ws.send(JSON.stringify({ type: 'new-session-ok', mode }));
+        try {
+          await spawnProcess(mode);
+        } catch (e) {
+          console.error('[new-session] 启动失败:', e.message);
+          ws.send(JSON.stringify({ type: 'new-session-error', error: e.message }));
+        }
       }
     } catch (err) {
       console.error('[WS] Error:', err.message);