opencode-nvim-diff-review 0.1.0 → 0.2.0

package/README.md

@@ -85,7 +85,7 @@ Add the plugin to your `opencode.json` configuration:
 
 ```json
 {
-  "plugin": ["github:talldan/nvim-diff-review-opencode-plugin"]
+  "plugin": ["opencode-nvim-diff-review"]
 }
 ```
 
@@ -95,15 +95,29 @@ Restart OpenCode to load the plugin. The `diff_review` tool will be available to
 
 ### 3. Neovim RPC socket
 
-The tool communicates with Neovim via its RPC socket. You need to:
+The tool communicates with Neovim via its RPC socket. In most cases, **no configuration is needed** — the tool auto-discovers running Neovim instances.
 
-1. Start Neovim with a listen address:
-   ```bash
-   export NVIM_SOCKET=/tmp/nvim.sock
-   nvim --listen $NVIM_SOCKET
-   ```
+#### Auto-discovery (default)
 
-2. Make sure `NVIM_SOCKET` is set in the environment where OpenCode runs.
+The tool automatically finds Neovim by:
+
+1. Checking the `NVIM_SOCKET` environment variable (if set, always used)
+2. Scanning for Neovim sockets in standard locations (`$TMPDIR` and `/tmp`)
+3. Preferring the Neovim instance whose working directory matches the current project
+4. Falling back to the first live Neovim instance found
+
+This means if you just run `nvim` in your project directory, OpenCode will find it automatically.
+
+#### Explicit configuration (optional)
+
+If auto-discovery doesn't work for your setup (e.g., multiple Neovim instances in the same directory), you can set the socket path explicitly:
+
+```bash
+export NVIM_SOCKET=/tmp/nvim.sock
+nvim --listen $NVIM_SOCKET
+```
+
+Make sure `NVIM_SOCKET` is set in the environment where OpenCode runs.
 
 If you use [CMUX](https://cmux.com), you can set this in your workspace configuration so both Neovim and OpenCode share the socket path automatically.
 
@@ -133,6 +147,7 @@ Key design decisions:
 - **Wrap-around prevention**: diffview.nvim wraps from the last file to the first (and vice versa) when navigating. The tool detects this by comparing indices before and after navigation, and undoes the wrap if detected.
 - **Buffer cleanup on close**: diffview.nvim intentionally keeps local file buffers open after closing (so you can continue editing). The plugin tracks which buffers existed before the review and removes any new ones on close — unless they have unsaved edits.
 - **Small delays after navigation**: 200-500ms sleeps after diffview commands to let the UI update before querying state. Without this, the state query can return stale data.
+- **Socket auto-discovery**: When `NVIM_SOCKET` is not set, the tool scans `$TMPDIR/nvim.$USER/` and `/tmp` for Neovim socket files, verifies each is live, and uses `lsof` to match the Neovim process's working directory against the current project. This allows zero-configuration usage in ad-hoc terminals — just run `nvim` and OpenCode will find it.
 
 ### Review workflow instructions
 

package/opencode-plugin/index.ts

@@ -16,6 +16,77 @@ interface DiffviewState {
   error?: string
 }
 
+/**
+ * Discover a Neovim RPC socket when NVIM_SOCKET is not explicitly set.
+ *
+ * Strategy:
+ * 1. Check NVIM_SOCKET env var (always wins)
+ * 2. Scan for socket files in known locations
+ * 3. Verify each is live by attempting a connection
+ * 4. Prefer the Neovim instance whose cwd matches ours (same project)
+ * 5. Fall back to the first live socket found
+ */
+const discoverNvimSocket = async (): Promise<string | null> => {
+  // 1. Explicit env var — skip discovery entirely
+  if (process.env.NVIM_SOCKET) return process.env.NVIM_SOCKET
+
+  // 2. Scan for socket files
+  const tmpdir = process.env.TMPDIR || "/tmp"
+  const user = process.env.USER || "unknown"
+  let socketPaths: string[] = []
+
+  try {
+    const output =
+      await Bun.$`find -L ${tmpdir}/nvim.${user} /tmp -maxdepth 4 -type s -name "nvim*" 2>/dev/null`.text()
+    socketPaths = output.trim().split("\n").filter(Boolean)
+  } catch {}
+
+  if (socketPaths.length === 0) return null
+
+  // 3 & 4. Check each socket — prefer cwd match, fall back to first live one
+  const ourCwd = process.cwd()
+  let fallback: string | null = null
+
+  for (const socketPath of socketPaths) {
+    try {
+      // Verify socket is live with a simple expression
+      await Bun.$`nvim --headless --server ${socketPath} --remote-expr "1+1"`.text()
+
+      // Try to get the PID from the socket filename (default sockets: nvim.<pid>.0)
+      let pid: string | undefined
+      const pidFromName = socketPath.match(/nvim\.(\d+)\.\d+$/)
+      if (pidFromName) {
+        pid = pidFromName[1]
+      } else {
+        // For --listen sockets (no PID in filename), find the owning process
+        try {
+          const lsof = await Bun.$`lsof ${socketPath} 2>/dev/null`.text()
+          const pidMatch = lsof.match(/nvim\s+(\d+)/)
+          if (pidMatch) pid = pidMatch[1]
+        } catch {}
+      }
+
+      // Get the cwd of the Neovim process and compare with ours
+      if (pid) {
+        try {
+          const lsof = await Bun.$`lsof -p ${pid} -Fn 2>/dev/null`.text()
+          const cwdMatch = lsof.match(/fcwd\nn(.+)/)
+          if (cwdMatch && cwdMatch[1] === ourCwd) {
+            return socketPath // Exact cwd match — this is our Neovim
+          }
+        } catch {}
+      }
+
+      // Remember the first live socket as fallback
+      if (!fallback) fallback = socketPath
+    } catch {
+      // Socket not responsive — stale socket from a crashed Neovim, skip it
+    }
+  }
+
+  return fallback
+}
+
 export const DiffReviewPlugin: Plugin = async (ctx) => {
   return {
     tool: {
@@ -79,14 +150,16 @@ export const DiffReviewPlugin: Plugin = async (ctx) => {
             ),
         },
         async execute(args, context) {
-          const socket = process.env.NVIM_SOCKET
+          const socket = await discoverNvimSocket()
           if (!socket) {
-            return "NVIM_SOCKET environment variable is not set. " +
-              "Make sure Neovim is running with --listen and NVIM_SOCKET is exported.\n\n" +
+            return "Could not find a running Neovim instance.\n\n" +
+              "The tool looks for Neovim in this order:\n" +
+              "1. NVIM_SOCKET environment variable (if set)\n" +
+              "2. Neovim instances whose working directory matches this project\n" +
+              "3. Any running Neovim instance\n\n" +
               "Quick setup:\n" +
               "  export NVIM_SOCKET=/tmp/nvim.sock\n" +
-              "  nvim --listen $NVIM_SOCKET\n\n" +
-              "If using CMUX, the workspace command sets this automatically."
+              "  nvim --listen $NVIM_SOCKET"
           }
 
           const nvimExpr = (expr: string) =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-nvim-diff-review",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Agent-driven guided code review for Neovim + OpenCode",
   "main": "opencode-plugin/index.ts",
   "keywords": [