opencode-diff-viewer 1.0.7 → 1.0.8

package/README.md

@@ -3,44 +3,38 @@
 [![npm version](https://img.shields.io/npm/v/opencode-diff-viewer.svg)](https://www.npmjs.com/package/opencode-diff-viewer)
 [![npm downloads](https://img.shields.io/npm/dm/opencode-diff-viewer.svg)](https://www.npmjs.com/package/opencode-diff-viewer)
 
-一个 OpenCode 插件，使用 [lumen](https://github.com/jnsahaj/lumen) 提供美观的 TUI diff 查看功能。
+一个 OpenCode 插件，使用 [lumen](https://github.com/jnsahaj/lumen) + [tmux](https://github.com/tmux/tmux) 提供美观的 TUI diff 查看功能。
 
 ## 功能特性
 
-- ✨ **自动安装 lumen** - 插件会自动检测并安装 lumen 依赖
+- ✨ **自动安装 tmux 和 lumen** - 插件会自动检测并安装依赖
 - 🚀 **一键查看 diff** - 使用 `/diff` 命令快速查看代码变更
-- 🔧 **智能终端适配** - 自动检测操作系统，打开新终端窗口展示 diff
+- 🔧 **tmux 集成** - 在后台 tmux 会话中运行 lumen
 - 🤖 **LLM 工具集成** - LLM 可自动调用 `view_diff` 工具
 
 ## 前置条件
 
-### 1. 安装 lumen
+### 自动安装
 
-插件会自动尝试安装 lumen，如果自动安装失败，需要手动安装：
+插件会在启动时自动检查并安装以下依赖：
 
-**macOS / Linux (Homebrew)**:
-```bash
-brew install jnsahaj/lumen/lumen
-```
+1. **tmux** - 终端复用器
+2. **lumen** - TUI diff 查看器
 
-**Bun**:
-```bash
-bun install jnsahaj/lumen/lumen
-```
+### 手动安装（如果自动安装失败）
 
-**Cargo (Rust)**:
+**tmux**:
 ```bash
-cargo install lumen
+brew install tmux
+# or
+apt install tmux
 ```
 
-**Windows**:
-下载 [lumen releases](https://github.com/jnsahaj/lumen/releases) 并添加到 PATH
-
-### 2. Git 仓库
-
-确保项目是 git 仓库，并且有修改的文件：
+**lumen**:
 ```bash
-git status  # 查看修改的文件
+brew install jnsahaj/lumen/lumen
+# or
+cargo install lumen
 ```
 
 ## 安装（全局配置）
@@ -68,7 +62,7 @@ cat > ~/.config/opencode/opencode.json << 'EOF'
 {
   "command": {
     "diff": {
-      "template": "View git diff using lumen TUI.",
+      "template": "View git diff using lumen in tmux.",
       "description": "View diff of modified files using lumen TUI"
     }
   },
@@ -96,10 +90,19 @@ EOF
 
 LLM 可以自动调用 `view_diff` 工具来展示代码变更。无需手动操作，LLM 会根据对话上下文智能判断何时需要展示 diff。
 
-## lumen 快捷键
+### 查看 lumen
+
+执行 `/diff` 后，lumen 会在 tmux 会话中运行。要查看 lumen：
+
+```bash
+tmux attach -t opencode-diff-viewer
+```
 
-在 lumen diff 查看器中：
+**tmux 快捷键**:
+- `Ctrl+B` 然后 `D` - 分离会话（回到 OpenCode）
+- `Ctrl+B` 然后 `?` - 查看所有快捷键
 
+**lumen 快捷键**:
 | 快捷键 | 功能 |
 |--------|------|
 | `j` / `k` 或 `↑` / `↓` | 上/下移动 |
@@ -110,15 +113,23 @@ LLM 可以自动调用 `view_diff` 工具来展示代码变更。无需手动操
 
 ## 故障排除
 
-### 1. lumen 未安装
+### 1. tmux 未安装
+
+```
+❌ tmux is not installed
+```
+
+**解决方案**: 手动安装 tmux（见上方手动安装）
+
+### 2. lumen 未安装
 
 ```
 ❌ lumen is not installed
 ```
 
-**解决方案**: 手动安装 lumen（见上方前置条件）
+**解决方案**: 手动安装 lumen（见上方手动安装）
 
-### 2. 没有修改的文件
+### 3. 没有修改的文件
 
 ```
 📝 No modified files
@@ -129,12 +140,6 @@ LLM 可以自动调用 `view_diff` 工具来展示代码变更。无需手动操
 git add .
 ```
 
-### 3. 新终端未打开
-
-检查终端模拟器是否支持：
-- macOS: Terminal.app
-- Linux: gnome-terminal 或 xterm
-
 ### 4. 插件未加载
 
 检查全局配置文件是否正确：
@@ -142,24 +147,12 @@ git add .
 cat ~/.config/opencode/opencode.json
 ```
 
-确保配置正确：
-```json
-{
-  "command": {
-    "diff": {
-      "template": "View git diff using lumen TUI.",
-      "description": "View diff of modified files using lumen TUI"
-    }
-  },
-  "plugin": ["opencode-diff-viewer"]
-}
-```
-
 ## 工作原理
 
-1. **检测修改文件** - 插件使用 `git diff` 获取已暂存和未暂存的修改
-2. **启动 lumen** - 在新终端窗口中运行 `lumen diff --file <files>`
-3. **自动安装** - 插件启动时检查 lumen，未安装则自动安装
+1. **检测依赖** - 插件启动时检查 tmux 和 lumen
+2. **自动安装** - 如果未安装，自动通过 brew 或 cargo 安装
+3. **创建 tmux 会话** - 执行 `/diff` 时创建后台 tmux 会话
+4. **运行 lumen** - 在 tmux 会话中运行 lumen diff
 
 ## 项目结构
 
@@ -184,18 +177,11 @@ cd opencode-diff-viewer
 
 # 安装依赖
 npm install
-# 或
-pnpm install
-# 或
-bun install
 
 # 构建
 npm run build
 
 # 链接本地包
-npm link
-
-# 在全局使用
 npm link -g opencode-diff-viewer
 ```
 
@@ -213,6 +199,7 @@ npm publish
 
 ## 依赖
 
+- [tmux](https://github.com/tmux/tmux) - 终端复用器
 - [lumen](https://github.com/jnsahaj/lumen) - TUI Diff 查看器
 - [@opencode-ai/plugin](https://www.npmjs.com/package/@opencode-ai/plugin) - OpenCode 插件 SDK
 

package/dist/index.js

@@ -9,6 +9,15 @@ export const DiffViewerPlugin = async ({ project, client, $, directory, worktree
             return false;
         }
     };
+    const isTmuxInstalled = async () => {
+        try {
+            await $ `which tmux`;
+            return true;
+        }
+        catch {
+            return false;
+        }
+    };
     const isBrewInstalled = async () => {
         try {
             await $ `which brew`;
@@ -51,6 +60,21 @@ export const DiffViewerPlugin = async ({ project, client, $, directory, worktree
             error: "Neither brew nor cargo available. Please install lumen manually:\n  brew install jnsahaj/lumen/lumen\n  # or\n  cargo install lumen"
         };
     };
+    const installTmux = async () => {
+        if (await isBrewInstalled()) {
+            try {
+                await $ `brew install tmux`;
+                return { success: true, method: "brew" };
+            }
+            catch (e) {
+                console.warn(`brew install tmux failed: ${e}`);
+            }
+        }
+        return {
+            success: false,
+            error: "Please install tmux manually:\n  brew install tmux\n  # or\n  apt install tmux"
+        };
+    };
     const ensureLumenInstalled = async () => {
         if (await isLumenInstalled()) {
             return { installed: true };
@@ -61,7 +85,25 @@ export const DiffViewerPlugin = async ({ project, client, $, directory, worktree
         }
         return { installed: false, message: `❌ ${result.error}` };
     };
-    await ensureLumenInstalled();
+    const ensureTmuxInstalled = async () => {
+        if (await isTmuxInstalled()) {
+            return { installed: true };
+        }
+        const result = await installTmux();
+        if (result.success) {
+            return { installed: true, message: `✅ tmux installed via ${result.method}` };
+        }
+        return { installed: false, message: `❌ ${result.error}` };
+    };
+    // Check and install dependencies on startup
+    const tmuxCheck = await ensureTmuxInstalled();
+    if (!tmuxCheck.installed) {
+        console.warn(tmuxCheck.message);
+    }
+    const lumenCheck = await ensureLumenInstalled();
+    if (!lumenCheck.installed) {
+        console.warn(lumenCheck.message);
+    }
     const getModifiedFiles = async () => {
         try {
             const unstaged = await $ `git diff --name-only`.text();
@@ -77,6 +119,18 @@ export const DiffViewerPlugin = async ({ project, client, $, directory, worktree
         }
     };
     const launchDiffViewer = async (files) => {
+        // Check tmux
+        if (!await isTmuxInstalled()) {
+            return `❌ tmux is not installed.
+
+To install:
+  brew install tmux
+  # or
+  apt install tmux
+
+Then restart OpenCode.`;
+        }
+        // Check lumen
         if (!await isLumenInstalled()) {
             return `❌ lumen is not installed.
 
@@ -93,40 +147,27 @@ Then restart OpenCode.`;
         }
         const fileList = modifiedFiles.map(f => `  • ${f}`).join('\n');
         const fileArgs = modifiedFiles.map(f => `"${f}"`).join(' ');
+        const sessionName = "opencode-diff-viewer";
         const cmd = `cd "${directory}" && lumen diff ${fileArgs}`;
-        const platform = process.platform;
-        // Try to launch in new terminal
-        let launched = false;
-        let errorMsg = "";
         try {
-            if (platform === 'darwin') {
-                await $ `osascript -e 'tell application "Terminal" to do script "${cmd}; exit"'`;
-                launched = true;
-            }
-            else if (platform === 'linux') {
-                try {
-                    await $ `which gnome-terminal && gnome-terminal -- bash -c "${cmd}; read -p 'Press Enter to close...'" `;
-                    launched = true;
-                }
-                catch {
-                    try {
-                        await $ `which xterm && xterm -e "bash -c '${cmd}; read -p Press Enter to close...'" `;
-                        launched = true;
-                    }
-                    catch (e) {
-                        errorMsg = "No terminal emulator found (gnome-terminal/xterm)";
-                    }
-                }
-            }
+            // Kill existing session if it exists
+            await $ `tmux kill-session -t "${sessionName}" 2>/dev/null || true`;
+            // Create new tmux session
+            await $ `tmux new-session -d -s "${sessionName}" "${cmd}"`;
+            return `✅ Opened lumen in tmux session "${sessionName}":\n${fileList}\n\nTo use lumen:
+  1. Run: tmux attach -t "${sessionName}"
+  2. Navigate: j/k or arrows, {/} for hunks
+  3. Detach: Ctrl+B then D
+
+Keybindings:
+  j/k or ↑/↓: Navigate    {/}: Jump hunks
+  tab: Sidebar           e: Edit file
+  q: Quit`;
         }
         catch (e) {
-            errorMsg = e.message || "Unknown error";
-        }
-        if (launched) {
-            return `✅ Opened lumen diff viewer:\n${fileList}\n\nKeybindings:\n  j/k: Navigate  {/}: Jump hunks  tab: Sidebar  e: Edit  q: Quit`;
+            return `❌ Failed to launch tmux session: ${e.message || e}\n\nTry manually:
+  tmux new-session -s "${sessionName}" "${cmd}"`;
         }
-        // If we couldn't launch, show manual instructions
-        return `📺 Could not open terminal automatically.\n\nTo view diffs in lumen:\n1. Open a new terminal\n2. Run:\n   ${cmd}\n\nModified files:\n${fileList}`;
     };
     return {
         "tui.command.execute": async (input, output) => {
@@ -141,7 +182,7 @@ Then restart OpenCode.`;
         },
         tool: {
             view_diff: tool({
-                description: "Open the lumen diff viewer to show git diff for modified files.",
+                description: "Open the lumen diff viewer in a tmux session.",
                 args: {
                     file: tool.schema.string().optional().describe("Optional: specific file path"),
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-diff-viewer",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "OpenCode plugin for viewing git diffs using lumen TUI",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",