claude-opencode-viewer 2.6.31 → 2.6.33

package/index-pc.html

@@ -254,6 +254,69 @@
       border-radius: 3px;
     }
 
+    /* Claude 会话详情视图 */
+    #claude-detail-view {
+      display: flex;
+      flex-direction: column;
+      flex: 1;
+      min-height: 0;
+    }
+    #claude-detail-view.hidden { display: none; }
+
+    #claude-detail-header {
+      display: flex;
+      align-items: center;
+      padding: 10px 16px;
+      background: #111;
+      border-bottom: 1px solid #222;
+      flex-shrink: 0;
+      gap: 8px;
+    }
+
+    #claude-messages-container {
+      flex: 1;
+      overflow-y: auto;
+      padding: 12px 16px;
+      display: flex;
+      flex-direction: column;
+      gap: 12px;
+    }
+
+    .claude-msg {
+      padding: 10px 14px;
+      border-radius: 6px;
+      font-size: 13px;
+      line-height: 1.6;
+      white-space: pre-wrap;
+      word-break: break-word;
+      max-width: 100%;
+    }
+    .claude-msg-user {
+      background: #1a2a3a;
+      border-left: 3px solid #4a9eff;
+    }
+    .claude-msg-assistant {
+      background: #1a1a2a;
+      border-left: 3px solid #c586c0;
+    }
+    .claude-msg-role {
+      font-size: 11px;
+      color: #888;
+      margin-bottom: 4px;
+      font-weight: 600;
+    }
+    .claude-msg-user .claude-msg-role { color: #4a9eff; }
+    .claude-msg-assistant .claude-msg-role { color: #c586c0; }
+    .claude-msg-text {
+      color: #d4d4d4;
+    }
+    .claude-msg-time {
+      font-size: 10px;
+      color: #666;
+      margin-top: 4px;
+      text-align: right;
+    }
+
     #mode-switcher {
       display: flex;
       gap: 4px;
@@ -777,6 +840,27 @@
         </div>
       </div>
 
+      <!-- Claude 会话详情视图 -->
+      <div id="claude-detail-view" class="hidden">
+        <div id="claude-detail-header">
+          <button class="history-toggle-btn" id="claude-detail-back">
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+              <polyline points="15 18 9 12 15 6"></polyline>
+            </svg>
+            <span>返回列表</span>
+          </button>
+          <div id="claude-detail-title" style="flex:1; text-align:center; color:#ddd; font-size:13px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;"></div>
+          <button class="history-toggle-btn" id="claude-detail-close">
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+              <line x1="18" y1="6" x2="6" y2="18"></line>
+              <line x1="6" y1="6" x2="18" y2="18"></line>
+            </svg>
+            <span>关闭</span>
+          </button>
+        </div>
+        <div id="claude-messages-container"></div>
+      </div>
+
     </div>
 
     <!-- Git Diff 面板 -->
@@ -877,7 +961,7 @@
       var isIOS = /iPhone|iPad|iPod/i.test(navigator.userAgent);
       var MOBILE_COLS = 60;
       var fontSize = isMobile ? 11 : 13;
-      var currentMode = 'opencode';
+      var currentMode = 'claude';
       var isTransitioning = false;
       var isBufferReplay = true; // 初始缓冲区回放中，不弹 toast
 
@@ -1640,18 +1724,197 @@
 
         if (historyBarVisible) {
           historyBar.classList.add('visible');
+          // 重置视图：显示列表，隐藏详情
+          document.getElementById('session-list-view').classList.remove('hidden');
+          document.getElementById('claude-detail-view').classList.add('hidden');
           if (currentMode === 'opencode') {
+            document.getElementById('session-history-title').textContent = '历史会话';
             loadSessions();
           } else {
-            // claude 模式暂无历史会话功能
-            var sessionList = document.getElementById('session-list');
-            sessionList.innerHTML = '<div class="session-empty">Claude Code 暂不支持历史会话</div>';
+            document.getElementById('session-history-title').textContent = 'Claude 历史会话';
+            loadClaudeSessions();
           }
         } else {
           historyBar.classList.remove('visible');
         }
       }
 
+      // Claude 会话功能
+      function loadClaudeSessions() {
+        var sessionList = document.getElementById('session-list');
+        sessionList.innerHTML = '<div class="session-loading">加载 Claude 历史会话...</div>';
+
+        fetch(basePath + '/api/claude-sessions')
+          .then(function(r) { return r.json(); })
+          .then(function(data) {
+            var sessions = data.sessions || [];
+            if (sessions.length === 0) {
+              sessionList.innerHTML = '<div class="session-empty">暂无 Claude 历史会话</div>';
+              return;
+            }
+            sessionList.innerHTML = '';
+            sessions.forEach(function(s) {
+              var item = document.createElement('div');
+              item.className = 'session-item';
+
+              var icon = document.createElement('div');
+              icon.className = 'session-icon';
+              icon.style.background = '#c586c0';
+
+              var info = document.createElement('div');
+              info.className = 'session-info';
+
+              var title = document.createElement('div');
+              title.className = 'session-title';
+              title.textContent = s.preview || '(空会话)';
+
+              var meta = document.createElement('div');
+              meta.className = 'session-meta';
+              var time = document.createElement('span');
+              time.className = 'session-time';
+              time.textContent = formatTime(s.mtime);
+              meta.appendChild(time);
+              if (s.directory) {
+                var dir = document.createElement('span');
+                dir.className = 'session-dir';
+                dir.textContent = s.directory.replace(/^\/Users\/[^\/]+/, '~');
+                meta.appendChild(dir);
+              }
+
+              info.appendChild(title);
+              info.appendChild(meta);
+              item.appendChild(icon);
+              item.appendChild(info);
+
+              var deleteBtn = document.createElement('button');
+              deleteBtn.className = 'session-delete-btn';
+              deleteBtn.innerHTML = '<svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path></svg>';
+              deleteBtn.title = '删除会话';
+              deleteBtn.addEventListener('click', function(e) {
+                e.stopPropagation();
+                deleteClaudeSession(s.id, s.project, item);
+              });
+              item.appendChild(deleteBtn);
+
+              item.addEventListener('click', function() {
+                restoreClaudeSession(s.id);
+              });
+
+              sessionList.appendChild(item);
+            });
+          })
+          .catch(function(err) {
+            sessionList.innerHTML = '<div class="session-empty">加载失败: ' + err.message + '</div>';
+          });
+      }
+
+      function loadClaudeSessionDetail(sessionId, preview) {
+        // 切换到详情视图
+        document.getElementById('session-list-view').classList.add('hidden');
+        var detailView = document.getElementById('claude-detail-view');
+        detailView.classList.remove('hidden');
+        document.getElementById('claude-detail-title').textContent = preview || sessionId;
+
+        var container = document.getElementById('claude-messages-container');
+        container.innerHTML = '<div class="session-loading">加载对话内容...</div>';
+
+        fetch(basePath + '/api/claude-session-messages?id=' + encodeURIComponent(sessionId))
+          .then(function(r) { return r.json(); })
+          .then(function(data) {
+            if (data.error) {
+              container.innerHTML = '<div class="session-empty">' + escapeHtml(data.error) + '</div>';
+              return;
+            }
+            var messages = data.messages || [];
+            if (messages.length === 0) {
+              container.innerHTML = '<div class="session-empty">无对话内容</div>';
+              return;
+            }
+            container.innerHTML = '';
+            messages.forEach(function(msg) {
+              var div = document.createElement('div');
+              div.className = 'claude-msg ' + (msg.role === 'user' ? 'claude-msg-user' : 'claude-msg-assistant');
+
+              var role = document.createElement('div');
+              role.className = 'claude-msg-role';
+              role.textContent = msg.role === 'user' ? 'User' : 'Assistant';
+
+              var text = document.createElement('div');
+              text.className = 'claude-msg-text';
+              text.textContent = msg.text;
+
+              div.appendChild(role);
+              div.appendChild(text);
+
+              if (msg.timestamp) {
+                var time = document.createElement('div');
+                time.className = 'claude-msg-time';
+                time.textContent = new Date(msg.timestamp).toLocaleString('zh-CN');
+                div.appendChild(time);
+              }
+
+              container.appendChild(div);
+            });
+          })
+          .catch(function(err) {
+            container.innerHTML = '<div class="session-empty">加载失败: ' + err.message + '</div>';
+          });
+      }
+
+      function deleteClaudeSession(sessionId, project, itemEl) {
+        if (!confirm('确定要删除这个会话吗？')) return;
+        itemEl.style.opacity = '0.4';
+        itemEl.style.pointerEvents = 'none';
+        fetch(basePath + '/api/claude-session/' + encodeURIComponent(sessionId) + '?project=' + encodeURIComponent(project), { method: 'DELETE' })
+          .then(function(r) { return r.json(); })
+          .then(function(data) {
+            if (data.ok) {
+              itemEl.style.transition = 'all 0.2s';
+              itemEl.style.maxHeight = '0';
+              itemEl.style.overflow = 'hidden';
+              itemEl.style.padding = '0 12px';
+              itemEl.style.margin = '0';
+              itemEl.style.opacity = '0';
+              setTimeout(function() { itemEl.remove(); }, 200);
+            } else {
+              itemEl.style.opacity = '';
+              itemEl.style.pointerEvents = '';
+              alert('删除失败: ' + (data.error || '未知错误'));
+            }
+          })
+          .catch(function(err) {
+            itemEl.style.opacity = '';
+            itemEl.style.pointerEvents = '';
+            alert('删除失败: ' + err.message);
+          });
+      }
+
+      function restoreClaudeSession(sessionId) {
+        console.log('[restore] 恢复 Claude 会话:', sessionId);
+        toggleHistoryBar();
+        term.reset();
+        if (ws && ws.readyState === 1) {
+          if (currentMode !== 'claude') {
+            term.write('错误: 请先切换到 Claude 模式\r\n');
+            return;
+          }
+          ws.send(JSON.stringify({ type: 'restore', sessionId: sessionId }));
+        } else {
+          term.write('错误: WebSocket 未连接\r\n');
+        }
+      }
+
+      // Claude 详情返回按钮
+      document.getElementById('claude-detail-back').addEventListener('click', function() {
+        document.getElementById('claude-detail-view').classList.add('hidden');
+        document.getElementById('session-list-view').classList.remove('hidden');
+      });
+
+      // Claude 详情关闭按钮
+      document.getElementById('claude-detail-close').addEventListener('click', function() {
+        toggleHistoryBar();
+      });
+
       // 新会话按钮
       var isCreatingNewSession = false;
       document.getElementById('new-session-btn').addEventListener('click', function() {
@@ -1669,7 +1932,11 @@
       // 刷新会话列表
       document.getElementById('refresh-sessions').addEventListener('click', function(e) {
         e.stopPropagation();
-        loadSessions();
+        if (currentMode === 'claude') {
+          loadClaudeSessions();
+        } else {
+          loadSessions();
+        }
       });
 
       // 关闭历史栏

package/index.html

@@ -257,6 +257,67 @@
       border-radius: 3px;
     }
 
+    /* Claude 会话详情视图 */
+    #claude-detail-view {
+      display: flex;
+      flex-direction: column;
+      flex: 1;
+      min-height: 0;
+    }
+    #claude-detail-view.hidden { display: none; }
+
+    #claude-detail-header {
+      display: flex;
+      align-items: center;
+      padding: 10px 12px;
+      background: #111;
+      border-bottom: 1px solid #222;
+      flex-shrink: 0;
+      gap: 8px;
+    }
+
+    #claude-messages-container {
+      flex: 1;
+      overflow-y: auto;
+      padding: 10px 12px;
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+      -webkit-overflow-scrolling: touch;
+    }
+
+    .claude-msg {
+      padding: 8px 12px;
+      border-radius: 6px;
+      font-size: 13px;
+      line-height: 1.6;
+      white-space: pre-wrap;
+      word-break: break-word;
+    }
+    .claude-msg-user {
+      background: #1a2a3a;
+      border-left: 3px solid #4a9eff;
+    }
+    .claude-msg-assistant {
+      background: #1a1a2a;
+      border-left: 3px solid #c586c0;
+    }
+    .claude-msg-role {
+      font-size: 11px;
+      color: #888;
+      margin-bottom: 4px;
+      font-weight: 600;
+    }
+    .claude-msg-user .claude-msg-role { color: #4a9eff; }
+    .claude-msg-assistant .claude-msg-role { color: #c586c0; }
+    .claude-msg-text { color: #d4d4d4; }
+    .claude-msg-time {
+      font-size: 10px;
+      color: #666;
+      margin-top: 4px;
+      text-align: right;
+    }
+
     #mode-switcher {
       display: flex;
       gap: 4px;
@@ -852,6 +913,27 @@
         </div>
       </div>
 
+      <!-- Claude 会话详情视图 -->
+      <div id="claude-detail-view" class="hidden">
+        <div id="claude-detail-header">
+          <button class="history-toggle-btn" id="claude-detail-back">
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+              <polyline points="15 18 9 12 15 6"></polyline>
+            </svg>
+            <span>返回</span>
+          </button>
+          <div id="claude-detail-title" style="flex:1; text-align:center; color:#ddd; font-size:12px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;"></div>
+          <button class="history-toggle-btn" id="claude-detail-close">
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+              <line x1="18" y1="6" x2="6" y2="18"></line>
+              <line x1="6" y1="6" x2="18" y2="18"></line>
+            </svg>
+            <span>关闭</span>
+          </button>
+        </div>
+        <div id="claude-messages-container"></div>
+      </div>
+
     </div>
 
     <!-- Git Diff 面板 -->
@@ -968,7 +1050,7 @@
       var isIOS = /iPhone|iPad|iPod/i.test(navigator.userAgent);
       var MOBILE_COLS = 60;
       var fontSize = isMobile ? 11 : 13;
-      var currentMode = 'opencode';
+      var currentMode = 'claude';
       var isTransitioning = false;
 
       var term = new Terminal({
@@ -1868,18 +1950,193 @@
 
         if (historyBarVisible) {
           historyBar.classList.add('visible');
+          document.getElementById('session-list-view').classList.remove('hidden');
+          document.getElementById('claude-detail-view').classList.add('hidden');
           if (currentMode === 'opencode') {
+            document.getElementById('session-history-title').textContent = '历史会话';
             loadSessions();
           } else {
-            // claude 模式暂无历史会话功能
-            var sessionList = document.getElementById('session-list');
-            sessionList.innerHTML = '<div class="session-empty">Claude Code 暂不支持历史会话</div>';
+            document.getElementById('session-history-title').textContent = 'Claude 历史会话';
+            loadClaudeSessions();
           }
         } else {
           historyBar.classList.remove('visible');
         }
       }
 
+      // Claude 会话功能
+      function loadClaudeSessions() {
+        var sessionList = document.getElementById('session-list');
+        sessionList.innerHTML = '<div class="session-loading">加载 Claude 历史会话...</div>';
+
+        fetch(basePath + '/api/claude-sessions')
+          .then(function(r) { return r.json(); })
+          .then(function(data) {
+            var sessions = data.sessions || [];
+            if (sessions.length === 0) {
+              sessionList.innerHTML = '<div class="session-empty">暂无 Claude 历史会话</div>';
+              return;
+            }
+            sessionList.innerHTML = '';
+            sessions.forEach(function(s) {
+              var item = document.createElement('div');
+              item.className = 'session-item';
+
+              var icon = document.createElement('div');
+              icon.className = 'session-icon';
+              icon.style.background = '#c586c0';
+
+              var info = document.createElement('div');
+              info.className = 'session-info';
+
+              var title = document.createElement('div');
+              title.className = 'session-title';
+              title.textContent = s.preview || '(空会话)';
+
+              var meta = document.createElement('div');
+              meta.className = 'session-meta';
+              var time = document.createElement('span');
+              time.className = 'session-time';
+              time.textContent = formatTime(s.mtime);
+              meta.appendChild(time);
+              if (s.directory) {
+                var dir = document.createElement('span');
+                dir.className = 'session-dir';
+                dir.textContent = s.directory.replace(/^\/Users\/[^\/]+/, '~');
+                meta.appendChild(dir);
+              }
+
+              info.appendChild(title);
+              info.appendChild(meta);
+              item.appendChild(icon);
+              item.appendChild(info);
+
+              var deleteBtn = document.createElement('button');
+              deleteBtn.className = 'session-delete-btn';
+              deleteBtn.innerHTML = '<svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path></svg>';
+              deleteBtn.title = '删除会话';
+              deleteBtn.addEventListener('click', function(e) {
+                e.stopPropagation();
+                deleteClaudeSession(s.id, s.project, item);
+              });
+              item.appendChild(deleteBtn);
+
+              item.addEventListener('click', function() {
+                restoreClaudeSession(s.id);
+              });
+
+              sessionList.appendChild(item);
+            });
+          })
+          .catch(function(err) {
+            sessionList.innerHTML = '<div class="session-empty">加载失败: ' + err.message + '</div>';
+          });
+      }
+
+      function loadClaudeSessionDetail(sessionId, preview) {
+        document.getElementById('session-list-view').classList.add('hidden');
+        var detailView = document.getElementById('claude-detail-view');
+        detailView.classList.remove('hidden');
+        document.getElementById('claude-detail-title').textContent = preview || sessionId;
+
+        var container = document.getElementById('claude-messages-container');
+        container.innerHTML = '<div class="session-loading">加载对话内容...</div>';
+
+        fetch(basePath + '/api/claude-session-messages?id=' + encodeURIComponent(sessionId))
+          .then(function(r) { return r.json(); })
+          .then(function(data) {
+            if (data.error) {
+              container.innerHTML = '<div class="session-empty">' + escapeHtml(data.error) + '</div>';
+              return;
+            }
+            var messages = data.messages || [];
+            if (messages.length === 0) {
+              container.innerHTML = '<div class="session-empty">无对话内容</div>';
+              return;
+            }
+            container.innerHTML = '';
+            messages.forEach(function(msg) {
+              var div = document.createElement('div');
+              div.className = 'claude-msg ' + (msg.role === 'user' ? 'claude-msg-user' : 'claude-msg-assistant');
+
+              var role = document.createElement('div');
+              role.className = 'claude-msg-role';
+              role.textContent = msg.role === 'user' ? 'User' : 'Assistant';
+
+              var text = document.createElement('div');
+              text.className = 'claude-msg-text';
+              text.textContent = msg.text;
+
+              div.appendChild(role);
+              div.appendChild(text);
+
+              if (msg.timestamp) {
+                var time = document.createElement('div');
+                time.className = 'claude-msg-time';
+                time.textContent = new Date(msg.timestamp).toLocaleString('zh-CN');
+                div.appendChild(time);
+              }
+
+              container.appendChild(div);
+            });
+          })
+          .catch(function(err) {
+            container.innerHTML = '<div class="session-empty">加载失败: ' + err.message + '</div>';
+          });
+      }
+
+      function deleteClaudeSession(sessionId, project, itemEl) {
+        if (!confirm('确定要删除这个会话吗？')) return;
+        itemEl.style.opacity = '0.4';
+        itemEl.style.pointerEvents = 'none';
+        fetch(basePath + '/api/claude-session/' + encodeURIComponent(sessionId) + '?project=' + encodeURIComponent(project), { method: 'DELETE' })
+          .then(function(r) { return r.json(); })
+          .then(function(data) {
+            if (data.ok) {
+              itemEl.style.transition = 'all 0.2s';
+              itemEl.style.maxHeight = '0';
+              itemEl.style.overflow = 'hidden';
+              itemEl.style.padding = '0 12px';
+              itemEl.style.margin = '0';
+              itemEl.style.opacity = '0';
+              setTimeout(function() { itemEl.remove(); }, 200);
+            } else {
+              itemEl.style.opacity = '';
+              itemEl.style.pointerEvents = '';
+              alert('删除失败: ' + (data.error || '未知错误'));
+            }
+          })
+          .catch(function(err) {
+            itemEl.style.opacity = '';
+            itemEl.style.pointerEvents = '';
+            alert('删除失败: ' + err.message);
+          });
+      }
+
+      function restoreClaudeSession(sessionId) {
+        console.log('[restore] 恢复 Claude 会话:', sessionId);
+        toggleHistoryBar();
+        term.reset();
+        if (ws && ws.readyState === 1) {
+          if (currentMode !== 'claude') {
+            term.write('错误: 请先切换到 Claude 模式\r\n');
+            return;
+          }
+          ws.send(JSON.stringify({ type: 'restore', sessionId: sessionId }));
+        } else {
+          term.write('错误: WebSocket 未连接\r\n');
+        }
+      }
+
+      document.getElementById('claude-detail-back').addEventListener('click', function() {
+        document.getElementById('claude-detail-view').classList.add('hidden');
+        document.getElementById('session-list-view').classList.remove('hidden');
+      });
+
+      document.getElementById('claude-detail-close').addEventListener('click', function() {
+        toggleHistoryBar();
+      });
+
       // 新会话按钮
       var isCreatingNewSession = false;
       document.getElementById('new-session-btn').addEventListener('click', function() {
@@ -1897,7 +2154,11 @@
       // 刷新会话列表
       document.getElementById('refresh-sessions').addEventListener('click', function(e) {
         e.stopPropagation();
-        loadSessions();
+        if (currentMode === 'claude') {
+          loadClaudeSessions();
+        } else {
+          loadSessions();
+        }
       });
 
       // 关闭历史栏

package/package.json

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

package/server.js

@@ -53,6 +53,9 @@ async function getOrCreateCert() {
   return { key: pems.private, cert: pems.cert };
 }
 
+// Claude Code 数据目录（Sandbox 下优先读 NAS 上的 /halo/.claude，本地回退 ~/.claude）
+const CLAUDE_HOME = existsSync('/halo/.claude') ? '/halo/.claude' : join(homedir(), '.claude');
+
 // OpenCode 数据库路径（优先读 OPENCODE_DB 环境变量，兼容本地盘 DB 方案）
 const OPENCODE_DB_PATH = process.env.OPENCODE_DB || process.env.OPENCODE_DB_PATH || join(
   process.env.XDG_DATA_HOME || join(homedir(), '.local/share'),
@@ -99,7 +102,7 @@ let sessionStartTime = 0; // 新会话启动时间，用于限制查询范围
 let previousSessionId = null; // 用于判断新会话是否已写入 DB
 const clientSizes = new Map();
 const mobileClients = new Set();
-let currentMode = 'opencode';
+let currentMode = 'claude';
 let isSwitching = false; // 模式切换/恢复会话中，忽略旧进程退出事件
 
 function getMobileSize() {
@@ -142,24 +145,21 @@ function getLocalIp() {
 
 function findCommand(cmd) {
   const paths = [
-    cmd,
     '/opt/homebrew/bin/' + cmd,
     '/usr/local/bin/' + cmd,
     '/usr/bin/' + cmd,
     join(process.env.HOME, '.local/bin/' + cmd),
-    join(process.env.HOME, '.npm-global/lib/node_modules/@anthropic-ai/claude-code/cli.js'),
   ];
+  if (cmd === 'claude') {
+    paths.push(join(process.env.HOME, '.npm-global/lib/node_modules/@anthropic-ai/claude-code/cli.js'));
+  }
   for (const p of paths) {
-    if (p === 'opencode' && existsSync(p)) return p;
-    if (p === 'claude' && existsSync(p)) return p;
-    if (p === 'claude' && p.includes('@anthropic-ai')) {
-      try {
-        return execSync(`which claude`, { encoding: 'utf8' }).trim();
-      } catch {}
-    }
+    if (existsSync(p)) return p;
   }
+  // fallback: which (non-interactive shell, no aliases)
   try {
-    return execSync(`which ${cmd}`, { encoding: 'utf8' }).trim();
+    const result = execSync(`command -v ${cmd} 2>/dev/null || which ${cmd} 2>/dev/null`, { encoding: 'utf8', shell: '/bin/sh' }).trim();
+    if (result && !result.includes('alias') && existsSync(result)) return result;
   } catch {}
   return cmd;
 }
@@ -202,10 +202,11 @@ function killProcessTree(proc) {
 // 清理孤儿进程（PPID=1 的 opencode/claude）
 function cleanupOrphanProcesses() {
   try {
+    const myPid = process.pid;
     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);
+    ).trim().split(/\s+/).filter(Boolean).map(Number).filter(pid => pid !== myPid);
     for (const pid of orphans) {
       try { process.kill(pid, 'SIGKILL'); } catch {}
     }
@@ -226,6 +227,11 @@ async function spawnProcess(mode, sessionId = null) {
     } else {
       command = claudePath;
     }
+    // 如果提供了 sessionId，添加 --resume 参数
+    if (sessionId) {
+      args.push('--resume', sessionId);
+      LOG(`[claude] 恢复会话: ${sessionId}`);
+    }
   } else {
     command = findCommand('opencode');
     // 如果提供了 sessionId，添加 --session 参数
@@ -239,7 +245,7 @@ async function spawnProcess(mode, sessionId = null) {
 
   // 恢复会话时，使用会话记录的工作目录
   let spawnCwd = process.cwd();
-  if (sessionId) {
+  if (sessionId && mode === 'opencode') {
     try {
       const db = new Database(OPENCODE_DB_PATH, { readonly: true });
       const session = db.prepare('SELECT directory FROM session WHERE id = ?').get(sessionId);
@@ -251,6 +257,33 @@ async function spawnProcess(mode, sessionId = null) {
     } catch (e) {
       LOG('[opencode] 查询会话目录失败:', e.message);
     }
+  } else if (sessionId && mode === 'claude') {
+    // 从 JSONL 读取 cwd
+    try {
+      const projectsDir = join(CLAUDE_HOME, 'projects');
+      // 在所有项目目录中查找该会话文件
+      for (const projDir of readdirSync(projectsDir, { withFileTypes: true })) {
+        if (!projDir.isDirectory()) continue;
+        const filePath = join(projectsDir, projDir.name, sessionId + '.jsonl');
+        if (existsSync(filePath)) {
+          const lines = readFileSync(filePath, 'utf-8').split('\n').slice(0, 30);
+          for (const line of lines) {
+            if (!line.trim()) continue;
+            try {
+              const d = JSON.parse(line);
+              if (d.cwd && existsSync(d.cwd)) {
+                spawnCwd = d.cwd;
+                LOG(`[claude] 使用会话目录: ${spawnCwd}`);
+                break;
+              }
+            } catch {}
+          }
+          break;
+        }
+      }
+    } catch (e) {
+      LOG('[claude] 查询会话目录失败:', e.message);
+    }
   }
 
   const proc = pty.spawn(command, args, {
@@ -609,7 +642,7 @@ const requestHandler = async (req, res) => {
       'Access-Control-Allow-Origin': '*',
     });
     try {
-      const gitCwd = existsSync('/halo/code') ? '/halo/code' : process.cwd();
+      const gitCwd = process.env.PROJECT_DIR || process.cwd();
       const { stdout } = await execFileAsync('git', ['status', '--porcelain'], {
         cwd: gitCwd, encoding: 'utf-8', timeout: 5000,
       });
@@ -618,8 +651,8 @@ const requestHandler = async (req, res) => {
         file: line.substring(3),
       })).filter(c => !/^core-/.test(c.file));
       res.end(JSON.stringify({ changes }));
-    } catch (err) {
-      res.end(JSON.stringify({ changes: [], error: err.message }));
+    } catch {
+      res.end(JSON.stringify({ changes: [] }));
     }
     return;
   }
@@ -638,7 +671,7 @@ const requestHandler = async (req, res) => {
     }
     const fileList = files.split(',').filter(Boolean);
     const diffs = [];
-    const cwd = existsSync('/halo/code') ? '/halo/code' : process.cwd();
+    const cwd = process.env.PROJECT_DIR || process.cwd();
     for (const file of fileList) {
       if (file.includes('..') || file.startsWith('/')) continue;
       try {
@@ -749,6 +782,117 @@ const requestHandler = async (req, res) => {
     return;
   }
 
+  // API: Claude Code 会话列表（扫描所有项目）
+  if (req.url === '/api/claude-sessions') {
+    res.writeHead(200, { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' });
+    try {
+      const projectsDir = join(CLAUDE_HOME, 'projects');
+      if (!existsSync(projectsDir)) {
+        res.end(JSON.stringify({ sessions: [] }));
+        return;
+      }
+      const allSessions = [];
+      // 遍历所有项目目录
+      for (const projDir of readdirSync(projectsDir, { withFileTypes: true })) {
+        if (!projDir.isDirectory()) continue;
+        const projPath = join(projectsDir, projDir.name);
+        // 解码项目路径: -Users-jason-xxx → /Users/jason/xxx
+        const decodedPath = projDir.name.replace(/^-/, '/').replace(/-/g, '/');
+        for (const f of readdirSync(projPath)) {
+          if (!f.endsWith('.jsonl')) continue;
+          try {
+            const fullPath = join(projPath, f);
+            const st = statSync(fullPath);
+            const id = f.replace('.jsonl', '');
+            let preview = '', cwd = '';
+            // 读取前 30 行提取第一条用户消息和 cwd
+            const content = readFileSync(fullPath, '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.type === 'user' && d.message) {
+                  if (!cwd && d.cwd) cwd = d.cwd;
+                  if (!preview) {
+                    const c = d.message.content;
+                    if (typeof c === 'string') {
+                      preview = c.slice(0, 200);
+                    } else if (Array.isArray(c)) {
+                      for (const item of c) {
+                        if (item.type === 'text' && item.text) {
+                          preview = item.text.slice(0, 200);
+                          break;
+                        }
+                      }
+                    }
+                  }
+                  break;
+                }
+              } catch {}
+            }
+            allSessions.push({ id, preview, mtime: st.mtimeMs, project: projDir.name, directory: cwd || decodedPath });
+          } catch {}
+        }
+      }
+      allSessions.sort((a, b) => b.mtime - a.mtime);
+      res.end(JSON.stringify({ sessions: allSessions.slice(0, 50) }));
+    } catch (err) {
+      res.end(JSON.stringify({ sessions: [], error: err.message }));
+    }
+    return;
+  }
+
+  // API: Claude Code 会话消息详情
+  if (req.url?.startsWith('/api/claude-session-messages')) {
+    const url = new URL(req.url, `http://${req.headers.host}`);
+    const id = url.searchParams.get('id');
+    const project = url.searchParams.get('project');
+    res.writeHead(200, { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' });
+    if (!id || /[\/\\]|\.\./.test(id) || !project || /[\/\\]|\.\./.test(project)) {
+      res.end(JSON.stringify({ error: '无效参数' }));
+      return;
+    }
+    try {
+      const filePath = join(CLAUDE_HOME, 'projects', project, id + '.jsonl');
+      if (!existsSync(filePath)) {
+        res.end(JSON.stringify({ error: '会话不存在' }));
+        return;
+      }
+      const content = readFileSync(filePath, 'utf-8');
+      const messages = [];
+      for (const line of content.split('\n')) {
+        if (!line.trim()) continue;
+        try {
+          const d = JSON.parse(line);
+          if (d.type === 'user' && d.message) {
+            let text = '';
+            const c = d.message.content;
+            if (typeof c === 'string') {
+              text = c;
+            } else if (Array.isArray(c)) {
+              text = c.filter(i => i.type === 'text').map(i => i.text).join('\n');
+            }
+            if (text) messages.push({ role: 'user', text, timestamp: d.timestamp });
+          } else if ((d.type === 'assistant' || d.message?.role === 'assistant') && d.message?.content) {
+            const c = d.message.content;
+            let text = '';
+            if (typeof c === 'string') {
+              text = c;
+            } else if (Array.isArray(c)) {
+              text = c.filter(i => i.type === 'text').map(i => i.text).join('\n');
+            }
+            if (text) messages.push({ role: 'assistant', text, timestamp: d.timestamp });
+          }
+        } catch {}
+      }
+      res.end(JSON.stringify({ messages }));
+    } catch (err) {
+      res.end(JSON.stringify({ error: err.message }));
+    }
+    return;
+  }
+
   // API: 软删除会话（设置 time_archived）
   if (req.method === 'DELETE' && req.url?.startsWith('/api/session/')) {
     const sessionId = req.url.split('/').pop();
@@ -773,6 +917,31 @@ const requestHandler = async (req, res) => {
     return;
   }
 
+  // API: 删除 Claude 会话（删除 JSONL 文件）
+  if (req.method === 'DELETE' && req.url?.startsWith('/api/claude-session/')) {
+    const url = new URL(req.url, `http://${req.headers.host}`);
+    const id = url.pathname.split('/').pop();
+    const project = url.searchParams.get('project');
+    res.writeHead(200, { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' });
+    if (!id || /[\/\\]|\.\./.test(id) || !project || /[\/\\]|\.\./.test(project)) {
+      res.end(JSON.stringify({ ok: false, error: '无效参数' }));
+      return;
+    }
+    try {
+      const { unlinkSync } = await import('node:fs');
+      const filePath = join(CLAUDE_HOME, 'projects', project, id + '.jsonl');
+      if (!existsSync(filePath)) {
+        res.end(JSON.stringify({ ok: false, error: '文件不存在' }));
+        return;
+      }
+      unlinkSync(filePath);
+      res.end(JSON.stringify({ ok: true }));
+    } catch (err) {
+      res.end(JSON.stringify({ ok: false, error: err.message }));
+    }
+    return;
+  }
+
   // API: 获取会话消息
   if (req.url?.startsWith('/api/session/')) {
     const sessionId = req.url.split('/').pop();
@@ -940,21 +1109,26 @@ wssInst.on('connection', (ws, req) => {
           }, 100);
         }
       } else if (msg.type === 'restore') {
-        // 恢复会话
-        if (msg.sessionId && currentMode === 'opencode') {
-          LOG(`[restore] 恢复会话: ${msg.sessionId}`);
+        // 恢复会话（支持 opencode 和 claude）
+        if (msg.sessionId) {
+          LOG(`[restore] 恢复 ${currentMode} 会话: ${msg.sessionId}`);
 
           isSwitching = true;
 
-          // 杀死当前 opencode 进程
-          if (opencodeProcess) {
+          // 杀死当前进程
+          const proc = currentMode === 'opencode' ? opencodeProcess : claudeProcess;
+          if (proc) {
             try {
-              LOG(`[restore] 杀死当前进程 PID: ${opencodeProcess.pid}`);
-              killProcessTree(opencodeProcess);
+              LOG(`[restore] 杀死当前进程 PID: ${proc.pid}`);
+              killProcessTree(proc);
             } catch (e) {
               LOG('[restore] 杀死进程失败:', e.message);
             }
-            opencodeProcess = null;
+            if (currentMode === 'opencode') {
+              opencodeProcess = null;
+            } else {
+              claudeProcess = null;
+            }
             currentProcess = null;
           }
 
@@ -965,9 +1139,9 @@ wssInst.on('connection', (ws, req) => {
           await new Promise(resolve => setTimeout(resolve, 500));
           cleanupOrphanProcesses();
 
-          // 启动新的 opencode 进程，传入 session ID
+          // 启动进程，传入 session ID
           try {
-            await spawnProcess('opencode', msg.sessionId);
+            await spawnProcess(currentMode, msg.sessionId);
             ws.send(JSON.stringify({ type: 'restored', sessionId: msg.sessionId }));
           } catch (e) {
             LOG('[restore] 启动进程失败:', e.message);
@@ -1124,21 +1298,52 @@ function startServer() {
     cleanupOrphanProcesses();
 
     // 尝试恢复最近的会话，如果没有则新建
-    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 (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);
+      if (lastSessionId) {
+        LOG(`[startup] 恢复最近会话: ${lastSessionId}`);
+        await spawnProcess('opencode', lastSessionId);
+      } else {
+        await spawnProcess('opencode');
+      }
     } else {
-      await spawnProcess('opencode');
+      // 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');
+      }
     }
 
     // 启动首次连接超时检测（3分钟无人连接则退出）