claude-opencode-viewer 2.6.0 → 2.6.2

package/.claude/settings.local.json

@@ -6,7 +6,8 @@
       "Bash(pkill:*)",
       "Bash(node:*)",
       "Bash(lsof -ti:7008)",
-      "Bash(sqlite3:*)"
+      "Bash(sqlite3:*)",
+      "Bash(ps:*)"
     ]
   }
 }

package/index.html

@@ -373,6 +373,33 @@
       font-size: 12px;
     }
 
+    .session-delete-btn {
+      flex-shrink: 0;
+      width: 28px;
+      height: 28px;
+      border: none;
+      background: none;
+      color: #f85149;
+      font-size: 14px;
+      cursor: pointer;
+      border-radius: 50%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: all 0.15s;
+      -webkit-tap-highlight-color: transparent;
+    }
+
+    .session-delete-btn:hover {
+      background: rgba(248, 81, 73, 0.15);
+      color: #f85149;
+    }
+
+    .session-delete-btn:active {
+      background: rgba(248, 81, 73, 0.3);
+      color: #f85149;
+    }
+
     .session-restore-hint {
       margin-top: 8px;
       padding: 8px 12px;
@@ -949,9 +976,6 @@
           <div class="virtual-key" data-key="tab">Tab</div>
           <div class="virtual-key" data-key="esc">Esc</div>
           <div class="virtual-key" data-key="ctrlc">Ctrl+C</div>
-          <div class="virtual-key scroll-key" data-scroll="-5">⇡ 滚动</div>
-          <div class="virtual-key scroll-key" data-scroll="5">⇣ 滚动</div>
-          <div class="virtual-key" id="btn-copy">复制</div>
         </div>
       </div>
     </div>
@@ -986,6 +1010,32 @@
 
       term.open(document.getElementById('terminal'));
 
+      // OSC 52 剪贴板支持：拦截应用发送的剪贴板设置请求
+      term.parser.registerOscHandler(52, function(data) {
+        var idx = data.indexOf(';');
+        if (idx === -1) return false;
+        var b64 = data.substring(idx + 1);
+        if (!b64 || b64 === '?') return false;
+        try {
+          var text = atob(b64);
+          if (navigator.clipboard && navigator.clipboard.writeText) {
+            navigator.clipboard.writeText(text).then(function() {
+              showCopyToast();
+            });
+          } else {
+            var ta = document.createElement('textarea');
+            ta.value = text;
+            ta.style.cssText = 'position:fixed;left:-9999px;top:-9999px';
+            document.body.appendChild(ta);
+            ta.select();
+            document.execCommand('copy');
+            document.body.removeChild(ta);
+            showCopyToast();
+          }
+        } catch (e) {}
+        return true;
+      });
+
       var modeSelect = document.getElementById('mode-select');
       var terminalEl = document.getElementById('terminal');
       var ws = null;
@@ -1020,25 +1070,15 @@
       }
 
       function loadInputCache() {
-        // 确保只恢复一次
-        if (cacheRestored) {
-          console.log('[cache] already restored, skipping');
-          return;
-        }
+        if (cacheRestored) return;
+        cacheRestored = true;
 
         var cached = localStorage.getItem(CACHE_KEY);
-        if (cached && ws && ws.readyState === 1) {
-          console.log('[cache] restoring:', cached);
-          // 立即清除缓存，防止重复调用
-          localStorage.removeItem(CACHE_KEY);
-          cacheRestored = true;
-
-          // 将缓存的输入发送到终端
-          ws.send(JSON.stringify({ type: 'input', data: cached }));
-          // 重要：恢复后清空 currentInputBuffer，防止再次保存
-          currentInputBuffer = '';
-        } else {
-          console.log('[cache] no cache to restore');
+        if (cached) {
+          console.log('[cache] restoring buffer:', cached);
+          // 只恢复跟踪变量，不重新发送到 pty
+          // 因为 outputBuffer 回放已经包含了之前的回显
+          currentInputBuffer = cached;
         }
       }
 
@@ -1153,14 +1193,55 @@
         pixelAccum = 0;
       }
 
-      // OpenCode 模式触摸滚动实现 - 使用 xterm.js scrollLines API
+      // 触摸滚动实现 - 混合模式：alternate buffer 发鼠标滚轮，normal buffer 用 scrollLines
       var touchScreen = null;
       var touchEventsBound = false;
 
+      function isAlternateBuffer() {
+        return term.buffer.active.type === 'alternate';
+      }
+
+      function emitWheelEvent(lines) {
+        var screen = terminalEl.querySelector('.xterm-screen');
+        if (!screen) return;
+        var lh = getLineHeight();
+        var rect = screen.getBoundingClientRect();
+        var cx = rect.left + rect.width / 2;
+        var cy = rect.top + rect.height / 2;
+        var count = Math.abs(lines);
+        var dy = lines < 0 ? -lh : lh;
+        for (var i = 0; i < count; i++) {
+          screen.dispatchEvent(new WheelEvent('wheel', {
+            deltaY: dy,
+            deltaMode: 0,
+            clientX: cx,
+            clientY: cy,
+            bubbles: true,
+            cancelable: true,
+          }));
+        }
+      }
+
+      var altScrollAccum = 0;
+      var ALT_SCROLL_THRESHOLD = 2;
+
+      function doScroll(lines) {
+        if (lines === 0) return;
+        if (isAlternateBuffer()) {
+          altScrollAccum += lines;
+          if (Math.abs(altScrollAccum) >= ALT_SCROLL_THRESHOLD) {
+            var scrollLines = Math.trunc(altScrollAccum);
+            emitWheelEvent(scrollLines);
+            altScrollAccum -= scrollLines;
+          }
+        } else {
+          term.scrollLines(lines);
+        }
+      }
+
       function getLineHeight() {
         var cellDims = getCellDims();
         var height = (cellDims && cellDims.height) || 15;
-        console.log('[scroll] lineHeight:', height);
         return height;
       }
 
@@ -1188,8 +1269,7 @@
         var lines = Math.trunc(pixelAccum / lh);
 
         if (lines !== 0) {
-          console.log('[scroll] scrollLines:', lines, 'pixelAccum:', pixelAccum, 'lineHeight:', lh);
-          term.scrollLines(lines);
+          doScroll(lines);
           pixelAccum -= lines * lh;
         }
       }
@@ -1197,18 +1277,21 @@
       // 长按检测
       var longPressTimer = null;
       var longPressTriggered = false;
-      var LONG_PRESS_DELAY = 500; // ms
+      var LONG_PRESS_DELAY = 550; // ms
 
       function clearLongPress() {
         if (longPressTimer) {
           clearTimeout(longPressTimer);
           longPressTimer = null;
         }
+        // 始终恢复 xterm textarea，防止 disabled 残留
+        var xtermTa = terminalEl.querySelector('.xterm-helper-textarea');
+        if (xtermTa) xtermTa.removeAttribute('disabled');
       }
 
       function handleTouchStart(e) {
-        console.log('[scroll] touchstart');
         stopMomentum();
+        altScrollAccum = 0;
         longPressTriggered = false;
         clearLongPress();
         if (e.touches.length !== 1) return;
@@ -1217,6 +1300,12 @@
         velocitySamples = [];
 
         // 启动长按计时器
+        // 在长按检测期间阻止 xterm textarea 获取焦点，防止弹出键盘
+        var xtermTa = terminalEl.querySelector('.xterm-helper-textarea');
+        if (xtermTa) {
+          xtermTa.setAttribute('disabled', 'true');
+        }
+
         longPressTimer = setTimeout(function() {
           longPressTriggered = true;
           longPressTimer = null;
@@ -1273,8 +1362,7 @@
           var lh = getLineHeight();
           var lines = Math.trunc(pixelAccum / lh);
           if (lines !== 0) {
-            console.log('[scroll] final scrollLines:', lines);
-            term.scrollLines(lines);
+            doScroll(lines);
           }
           pixelAccum = 0;
         }
@@ -1304,8 +1392,7 @@
             var lh = getLineHeight();
             var rest = Math.round(mAccum / lh);
             if (rest !== 0) {
-              console.log('[scroll] momentum final:', rest);
-              term.scrollLines(rest);
+              doScroll(rest);
             }
             momentumRaf = null;
             return;
@@ -1314,7 +1401,7 @@
           var lh = getLineHeight();
           var lines = Math.trunc(mAccum / lh);
           if (lines !== 0) {
-            term.scrollLines(lines);
+            doScroll(lines);
             mAccum -= lines * lh;
           }
           velocity *= friction;
@@ -1338,12 +1425,6 @@
         // 先解绑旧的
         unbindTouchScroll();
 
-        // 只在 opencode 模式下绑定
-        if (currentMode !== 'opencode') {
-          console.log('[scroll] Not opencode mode, skip binding');
-          return;
-        }
-
         var screen = terminalEl.querySelector('.xterm-screen');
         if (!screen) {
           console.log('[scroll] .xterm-screen not found, retrying...');
@@ -1356,7 +1437,7 @@
         screen.addEventListener('touchmove', handleTouchMove, { passive: true });
         screen.addEventListener('touchend', handleTouchEnd, { passive: true });
         touchEventsBound = true;
-        console.log('[scroll] Touch events bound to .xterm-screen (opencode mode)');
+        console.log('[scroll] Touch events bound to .xterm-screen');
       }
 
       function rebindTouchScroll() {
@@ -1416,8 +1497,8 @@
             } else if (d === '\x15') {
               // Ctrl+U：清空整行
               clearInputCache();
-            } else if (d.length === 1 && d.charCodeAt(0) >= 32 && d.charCodeAt(0) < 127) {
-              // 可打印 ASCII 字符：添加到缓冲区
+            } else if (d.charCodeAt(0) >= 32 && d.charCodeAt(0) !== 127) {
+              // 可打印字符（含中文等多字节）：添加到缓冲区
               currentInputBuffer += d;
               saveInputCache();
             }
@@ -1436,6 +1517,7 @@
 
         ws.onopen = function() {
           resize();
+          rebindTouchScroll();
         };
 
         ws.onclose = function() {
@@ -1484,6 +1566,9 @@
               // 恢复失败
               term.write('\x1b[31m✗ 恢复失败: ' + msg.error + '\x1b[0m\r\n');
             }
+            else if (msg.type === 'started') {
+              rebindTouchScroll();
+            }
             else if (msg.type === 'new-session-ok') {
               isCreatingNewSession = false;
               term.clear();
@@ -1500,7 +1585,6 @@
           if (currentMode === 'opencode') {
             loadInputCache();
           } else {
-            // 非 opencode 模式，标记为已恢复，避免后续缓存逻辑干扰
             cacheRestored = true;
           }
         }, 800);
@@ -1547,10 +1631,8 @@
       }
 
       function scrollTerminal(lines) {
-        if (term) {
-          term.scrollLines(lines);
-          console.log('[scroll] scrolled by:', lines);
-        }
+        if (!term) return;
+        doScroll(lines);
       }
 
       // 参考 cc-viewer 的 TerminalPanel.jsx 行 519-546: 虚拟按键触摸处理
@@ -1738,8 +1820,18 @@
           info.appendChild(title);
           info.appendChild(meta);
 
+          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();
+            deleteSession(session.id, item);
+          });
+
           item.appendChild(icon);
           item.appendChild(info);
+          item.appendChild(deleteBtn);
 
           item.addEventListener('click', function() {
             loadSession(session);
@@ -1749,6 +1841,39 @@
         });
       }
 
+      function deleteSession(sessionId, itemEl) {
+        if (!confirm('确定要删除这个会话吗？')) return;
+
+        itemEl.style.opacity = '0.4';
+        itemEl.style.pointerEvents = 'none';
+
+        fetch('/api/session/' + sessionId, { 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() {
+                sessions = sessions.filter(function(s) { return s.id !== sessionId; });
+                renderSessions();
+              }, 200);
+            } else {
+              itemEl.style.opacity = '';
+              itemEl.style.pointerEvents = '';
+              alert('删除失败: ' + (data.error || '未知错误'));
+            }
+          })
+          .catch(function(err) {
+            itemEl.style.opacity = '';
+            itemEl.style.pointerEvents = '';
+            alert('删除失败: ' + err.message);
+          });
+      }
+
       function showSessionDetail() {
         document.getElementById('session-list-view').classList.add('hidden');
         document.getElementById('session-detail-view').classList.add('visible');
@@ -1996,17 +2121,6 @@
         setTimeout(function() { toast.classList.remove('show'); }, 1200);
       }
 
-      // "复制" 按钮
-      document.getElementById('btn-copy').addEventListener('touchend', function(e) {
-        e.preventDefault();
-        var text = getTerminalText();
-        if (text) copyToClipboard(text);
-      });
-      document.getElementById('btn-copy').addEventListener('click', function(e) {
-        e.preventDefault();
-        var text = getTerminalText();
-        if (text) copyToClipboard(text);
-      });
 
       // 方案2: 长按进入选择模式 — 原位显示可选纯文本
       var selectTextLayer = document.getElementById('select-text-layer');

package/package.json

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

package/server.js

@@ -501,6 +501,30 @@ const server = createServer(async (req, res) => {
     return;
   }
 
+  // API: 软删除会话（设置 time_archived）
+  if (req.method === 'DELETE' && req.url?.startsWith('/api/session/')) {
+    const sessionId = req.url.split('/').pop();
+    res.writeHead(200, {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    });
+    try {
+      if (!existsSync(OPENCODE_DB_PATH)) {
+        res.end(JSON.stringify({ ok: false, error: '数据库不存在' }));
+        return;
+      }
+      const db = new Database(OPENCODE_DB_PATH);
+      const now = Date.now();
+      const result = db.prepare('UPDATE session SET time_archived = ? WHERE id = ? AND time_archived IS NULL').run(now, sessionId);
+      db.close();
+      res.end(JSON.stringify({ ok: true, changes: result.changes }));
+    } catch (err) {
+      console.error('[DB] 软删除会话失败:', err.message);
+      res.end(JSON.stringify({ ok: false, error: err.message }));
+    }
+    return;
+  }
+
   // API: 获取会话消息
   if (req.url?.startsWith('/api/session/')) {
     const sessionId = req.url.split('/').pop();
@@ -627,6 +651,18 @@ wss.on('connection', (ws, req) => {
             ws.send(JSON.stringify({ type: 'restore-error', error: e.message }));
           }
         }
+      } else if (msg.type === 'start') {
+        // 前端启动指令：可选带 sessionId 恢复会话
+        const mode = currentMode;
+        console.log(`[start] 启动 ${mode}, sessionId=${msg.sessionId || '(新会话)'}`);
+        outputBuffer = '';
+        try {
+          await spawnProcess(mode, msg.sessionId || null);
+          ws.send(JSON.stringify({ type: 'started', sessionId: msg.sessionId || null }));
+        } catch (e) {
+          console.error('[start] 启动失败:', e.message);
+          ws.send(JSON.stringify({ type: 'start-error', error: e.message }));
+        }
       } else if (msg.type === 'new-session') {
         // 开启新会话：杀掉当前进程，重新启动不带 session 参数的 opencode
         const mode = currentMode;