opencode-diff-viewer 1.0.5 → 1.0.6

package/README.md

@@ -3,38 +3,33 @@
 [![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 插件，使用 [delta](https://github.com/dandavison/delta) 提供语法高亮的 git diff 查看功能。
 
 ## 功能特性
 
-- ✨ **自动安装 lumen** - 插件会自动检测并安装 lumen 依赖
+- ✨ **自动安装 delta** - 插件会自动检测并安装 delta 依赖
 - 🚀 **一键查看 diff** - 使用 `/diff` 命令快速查看代码变更
-- 🔧 **智能终端适配** - 自动检测操作系统，打开新终端窗口展示 diff
+- 🎨 **语法高亮** - 支持多种编程语言的语法高亮
 - 🤖 **LLM 工具集成** - LLM 可自动调用 `view_diff` 工具
 
 ## 前置条件
 
-### 1. 安装 lumen
+### 1. 安装 delta
 
-插件会自动尝试安装 lumen，如果自动安装失败，需要手动安装：
+插件会自动尝试安装 delta，如果自动安装失败，需要手动安装：
 
 **macOS / Linux (Homebrew)**:
 ```bash
-brew install jnsahaj/lumen/lumen
-```
-
-**macOS / Linux (Bun)**:
-```bash
-bun install jnsahaj/lumen/lumen
+brew install dandavison/delta/delta
 ```
 
 **Cargo (Rust)**:
 ```bash
-cargo install lumen
+cargo install delta
 ```
 
 **Windows**:
-下载 [lumen releases](https://github.com/jnsahaj/lumen/releases) 并添加到 PATH
+下载 [delta releases](https://github.com/dandavison/delta/releases) 并添加到 PATH
 
 ### 2. Git 仓库
 
@@ -68,8 +63,8 @@ cat > ~/.config/opencode/opencode.json << 'EOF'
 {
   "command": {
     "diff": {
-      "template": "View git diff using lumen TUI.",
-      "description": "View diff of modified files using lumen TUI"
+      "template": "View git diff with syntax highlighting.",
+      "description": "Show git diff with syntax highlighting"
     }
   },
   "plugin": ["opencode-diff-viewer"]
@@ -96,32 +91,30 @@ EOF
 
 LLM 可以自动调用 `view_diff` 工具来展示代码变更。无需手动操作，LLM 会根据对话上下文智能判断何时需要展示 diff。
 
-## lumen 快捷键
+## delta 快捷键
 
-在 lumen diff 查看器中：
+在 diff 输出中：
 
 | 快捷键 | 功能 |
 |--------|------|
-| `j` / `k` 或 `↑` / `↓` | 上/下移动 |
-| `{` / `}` | 跳转到上/下一个变更块 |
-| `Tab` | 切换侧边栏 |
-| `e` | 在编辑器中打开文件 |
-| `q` | 退出 |
+| `n` / `p` | 下/上一个变更 |
+| `N` / `P` | 下/上一个文件 |
+| `q` | 退出（如果启用 pager） |
 
 ## 故障排除
 
-### 1. lumen 未安装
+### 1. delta 未安装
 
 ```
-❌ lumen is not installed
+❌ delta is not installed
 ```
 
-**解决方案**: 手动安装 lumen（见上方前置条件）
+**解决方案**: 手动安装 delta（见上方前置条件）
 
 ### 2. 没有修改的文件
 
 ```
-📝 No modified files to show diff for
+📝 No modified files
 ```
 
 **解决方案**: 确保文件已修改并暂存：
@@ -129,26 +122,20 @@ LLM 可以自动调用 `view_diff` 工具来展示代码变更。无需手动操
 git add .
 ```
 
-### 3. 新终端未打开
-
-检查终端模拟器是否支持：
-- macOS: Terminal.app
-- Linux: gnome-terminal 或 xterm
-
-### 4. 插件未加载
+### 3. 插件未加载
 
 检查全局配置文件是否正确：
 ```bash
 cat ~/.config/opencode/opencode.json
 ```
 
-确保配置正确，包含 `command` 和 `plugin` 两部分：
+确保配置正确：
 ```json
 {
   "command": {
     "diff": {
-      "template": "View git diff using lumen TUI.",
-      "description": "View diff of modified files using lumen TUI"
+      "template": "View git diff with syntax highlighting.",
+      "description": "Show git diff with syntax highlighting"
     }
   },
   "plugin": ["opencode-diff-viewer"]
@@ -158,8 +145,8 @@ cat ~/.config/opencode/opencode.json
 ## 工作原理
 
 1. **检测修改文件** - 插件使用 `git diff` 获取已暂存和未暂存的修改
-2. **启动 lumen** - 在新终端窗口中运行 `lumen diff --file <files>`
-3. **自动安装** - 插件启动时检查 lumen，未安装则自动安装
+2. **格式化输出** - 通过 `delta` 管道输出，带语法高亮
+3. **自动安装** - 插件启动时检查 delta，未安装则自动安装
 
 ## 项目结构
 
@@ -213,7 +200,7 @@ npm publish
 
 ## 依赖
 
-- [lumen](https://github.com/jnsahaj/lumen) - TUI Diff 查看器
+- [delta](https://github.com/dandavison/delta) - 语法高亮的 git diff 查看器
 - [@opencode-ai/plugin](https://www.npmjs.com/package/@opencode-ai/plugin) - OpenCode 插件 SDK
 
 ## License

package/dist/index.d.ts

@@ -1,7 +1,2 @@
 import type { Plugin } from "@opencode-ai/plugin";
-/**
- * OpenCode Diff Viewer Plugin
- * Uses lumen (https://github.com/jnsahaj/lumen) for visual git diffs.
- * Automatically installs lumen if not present.
- */
 export declare const DiffViewerPlugin: Plugin;

package/dist/index.js

@@ -1,13 +1,8 @@
 import { tool } from "@opencode-ai/plugin";
-/**
- * OpenCode Diff Viewer Plugin
- * Uses lumen (https://github.com/jnsahaj/lumen) for visual git diffs.
- * Automatically installs lumen if not present.
- */
 export const DiffViewerPlugin = async ({ project, client, $, directory, worktree }) => {
-    const isLumenInstalled = async () => {
+    const isDeltaInstalled = async () => {
         try {
-            await $ `which lumen`;
+            await $ `which delta`;
             return true;
         }
         catch {
@@ -32,10 +27,10 @@ export const DiffViewerPlugin = async ({ project, client, $, directory, worktree
             return false;
         }
     };
-    const installLumen = async () => {
+    const installDelta = async () => {
         if (await isBrewInstalled()) {
             try {
-                await $ `brew install jnsahaj/lumen/lumen`;
+                await $ `brew install delta`;
                 return { success: true, method: "brew" };
             }
             catch (e) {
@@ -44,7 +39,7 @@ export const DiffViewerPlugin = async ({ project, client, $, directory, worktree
         }
         if (await isCargoInstalled()) {
             try {
-                await $ `cargo install lumen`;
+                await $ `cargo install delta`;
                 return { success: true, method: "cargo" };
             }
             catch (e) {
@@ -53,20 +48,20 @@ export const DiffViewerPlugin = async ({ project, client, $, directory, worktree
         }
         return {
             success: false,
-            error: "Neither brew nor cargo available. Please install lumen manually:\n  brew install jnsahaj/lumen/lumen\n  # or\n  cargo install lumen"
+            error: "Neither brew nor cargo available. Please install delta manually:\n  brew install dandavison/delta/delta\n  # or\n  cargo install delta"
         };
     };
-    const ensureLumenInstalled = async () => {
-        if (await isLumenInstalled()) {
+    const ensureDeltaInstalled = async () => {
+        if (await isDeltaInstalled()) {
             return { installed: true };
         }
-        const result = await installLumen();
+        const result = await installDelta();
         if (result.success) {
-            return { installed: true, message: `✅ lumen installed via ${result.method}` };
+            return { installed: true, message: `✅ delta installed via ${result.method}` };
         }
         return { installed: false, message: `❌ ${result.error}` };
     };
-    await ensureLumenInstalled();
+    await ensureDeltaInstalled();
     const getModifiedFiles = async () => {
         try {
             const unstaged = await $ `git diff --name-only`.text();
@@ -81,47 +76,45 @@ export const DiffViewerPlugin = async ({ project, client, $, directory, worktree
             return [];
         }
     };
-    const launchDiffViewer = async (files) => {
-        if (!await isLumenInstalled()) {
-            return "❌ lumen is not installed.\n\nTo install:\n  brew install jnsahaj/lumen/lumen\n  # or\n  cargo install lumen";
+    const showDiff = async (files) => {
+        if (!await isDeltaInstalled()) {
+            return `❌ delta is not installed.
+
+To install:
+  brew install dandavison/delta/delta
+  # or
+  cargo install delta
+
+Then restart OpenCode.`;
         }
         const modifiedFiles = files && files.length > 0 ? files : await getModifiedFiles();
         if (modifiedFiles.length === 0) {
-            return "📝 No modified files to show diff for.\n\nRun `git add .` to stage changes first.";
+            return "📝 No modified files.\n\nRun \`git add .\` to stage changes first.";
         }
-        const platform = process.platform;
-        const fileArgs = modifiedFiles.map(f => `"${f}"`).join(' ');
-        const cmd = `cd "${directory}" && lumen diff ${fileArgs}`;
         try {
-            if (platform === 'darwin') {
-                await $ `osascript -e 'tell application "Terminal" to do script "${cmd}; exit"'`;
+            // Get diff output with delta
+            let diffOutput = "";
+            // Show staged diff
+            const stagedDiff = await $ `cd "${directory}" && git diff --staged`.text();
+            if (stagedDiff.trim()) {
+                diffOutput += "=== STAGED CHANGES ===\n\n";
+                diffOutput += await $ `cd "${directory}" && git diff --staged | delta --pager=never`.text();
             }
-            else if (platform === 'linux') {
-                try {
-                    await $ `which gnome-terminal && gnome-terminal -- bash -c "${cmd}; read -p 'Press Enter to close...'" `;
-                }
-                catch {
-                    try {
-                        await $ `which xterm && xterm -e "bash -c '${cmd}; read -p Press Enter to close...'" `;
-                    }
-                    catch {
-                        return `❌ No terminal emulator found (gnome-terminal/xterm).\n\nPlease run manually:\n  ${cmd}`;
-                    }
-                }
+            // Show unstaged diff
+            const unstagedDiff = await $ `cd "${directory}" && git diff`.text();
+            if (unstagedDiff.trim()) {
+                if (diffOutput)
+                    diffOutput += "\n=== UNSTAGED CHANGES ===\n\n";
+                diffOutput += await $ `cd "${directory}" && git diff | delta --pager=never`.text();
             }
-            else {
-                await $ `${cmd}`;
+            if (!diffOutput.trim()) {
+                return "📝 No changes to show.";
             }
-            return `✅ Opened lumen diff viewer for ${modifiedFiles.length} file(s):
-${modifiedFiles.map(f => `  • ${f}`).join('\n')}
-
-Keybindings:
-  j/k or ↑/↓: Navigate    {/}: Jump between hunks
-  tab: Toggle sidebar     e: Open in editor
-  q: Quit`;
+            const fileList = modifiedFiles.map(f => `  • ${f}`).join('\n');
+            return `✅ Modified files (${modifiedFiles.length}):\n${fileList}\n\n${diffOutput}`;
         }
-        catch (error) {
-            return `❌ Failed to launch diff viewer: ${error}\n\nTry running manually:\n  ${cmd}`;
+        catch (e) {
+            return `❌ Error showing diff: ${e.message || e}`;
         }
     };
     return {
@@ -129,7 +122,7 @@ Keybindings:
             if (input.command === "diff") {
                 const files = input.args?.trim() ? [input.args.trim()] : undefined;
                 output.handled = true;
-                output.result = await launchDiffViewer(files);
+                output.result = await showDiff(files);
             }
         },
         "file.edited": async ({ event }) => {
@@ -137,12 +130,12 @@ Keybindings:
         },
         tool: {
             view_diff: tool({
-                description: "Open the lumen diff viewer to show git diff for modified files. Use this when the user wants to see visual diffs of their changes.",
+                description: "Show git diff with syntax highlighting using delta.",
                 args: {
-                    file: tool.schema.string().optional().describe("Optional: specific file path to show diff for. If not provided, shows all modified files."),
+                    file: tool.schema.string().optional().describe("Optional: specific file path"),
                 },
                 async execute(args, ctx) {
-                    return await launchDiffViewer(args.file ? [args.file] : undefined);
+                    return await showDiff(args.file ? [args.file] : undefined);
                 },
             }),
         },

package/package.json

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