open-plan-annotator 0.2.14 → 0.2.16

package/.claude-plugin/marketplace.json

@@ -12,7 +12,7 @@
       "name": "open-plan-annotator",
       "source": "./",
       "description": "Interactive plan annotation UI: review, strikethrough, and comment on Claude's plans before approving. Fully local, no external services.",
-      "version": "0.2.14",
+      "version": "0.2.16",
       "author": {
         "name": "ndom91"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "open-plan-annotator",
   "description": "Interactive plan annotation UI: review, strikethrough, and comment on Claude's plans before approving. Fully local, no external services.",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "author": {
     "name": "ndom91"
   },

package/opencode/bridge.js

@@ -1,10 +1,15 @@
-import { spawn } from "node:child_process";
+import { execFileSync, spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { existsSync, statSync } from "node:fs";
-import { dirname } from "node:path";
+import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
-const WRAPPER_PATH = fileURLToPath(new URL("../bin/open-plan-annotator.cjs", import.meta.url));
+const PKG_ROOT = fileURLToPath(new URL("..", import.meta.url));
+const LOCAL_BINARY_PATH = join(PKG_ROOT, "bin", "open-plan-annotator-binary");
+const INSTALL_SCRIPT = join(PKG_ROOT, "install.cjs");
+
+/** Resolved path to the binary (may differ from LOCAL_BINARY_PATH if found on PATH). */
+let BINARY_PATH = LOCAL_BINARY_PATH;
 
 /**
  * @typedef {{
@@ -97,10 +102,77 @@ function validateHookOutput(value) {
   throw new Error("unsupported decision payload");
 }
 
+/**
+ * Check if `open-plan-annotator` is available on PATH.
+ * The CLI wrapper handles binary discovery/download and stdin/stdout
+ * forwarding, so we can spawn it directly as a fallback when the local
+ * binary isn't available (e.g. OpenCode loads the plugin from its own
+ * node_modules but the binary only exists in a global pnpm install).
+ * @returns {string | undefined}
+ */
+function findWrapperOnPath() {
+  const cmd = process.platform === "win32" ? "where" : "which";
+  try {
+    const result = execFileSync(cmd, ["open-plan-annotator"], {
+      encoding: "utf-8",
+      stdio: ["ignore", "pipe", "ignore"],
+    }).trim().split("\n")[0];
+    return result || undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+/** Ensure the compiled binary exists, downloading if necessary. */
+function ensureBinary() {
+  if (existsSync(LOCAL_BINARY_PATH)) {
+    BINARY_PATH = LOCAL_BINARY_PATH;
+    return;
+  }
+
+  // Try to find node on PATH for running the install script
+  try {
+    execFileSync(process.execPath, [INSTALL_SCRIPT], {
+      cwd: PKG_ROOT,
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+  } catch {
+    // Retry with "node" explicitly in case process.execPath is bun
+    try {
+      execFileSync("node", [INSTALL_SCRIPT], {
+        cwd: PKG_ROOT,
+        stdio: ["ignore", "pipe", "pipe"],
+      });
+    } catch {
+      // ignore — we'll check below
+    }
+  }
+
+  if (existsSync(LOCAL_BINARY_PATH)) {
+    BINARY_PATH = LOCAL_BINARY_PATH;
+    return;
+  }
+
+  // Fallback: use the CLI wrapper from PATH (e.g. global pnpm install).
+  // The wrapper handles binary discovery/download and stdio forwarding.
+  const wrapperPath = findWrapperOnPath();
+  if (wrapperPath) {
+    BINARY_PATH = wrapperPath;
+    return;
+  }
+
+  throw new Error(
+    `open-plan-annotator: binary not found at ${LOCAL_BINARY_PATH}. ` +
+      `Try running: node ${INSTALL_SCRIPT}`,
+  );
+}
+
 /**
  * @param {{ plan: string, sessionId?: string, cwd?: string }} options
  */
 export async function runPlanReview(options) {
+  ensureBinary();
+
   const payload = buildHookPayload(options);
 
   const result = await new Promise((resolve, reject) => {
@@ -112,11 +184,12 @@ export async function runPlanReview(options) {
         cwd = dirname(cwd);
       }
     } catch {
-      // Fall back to wrapper's directory if all else fails
-      cwd = dirname(WRAPPER_PATH);
+      cwd = PKG_ROOT;
     }
 
-    const child = spawn(process.execPath, [WRAPPER_PATH], {
+    // Spawn the compiled binary directly (skip the Node wrapper).
+    // This avoids issues with bun vs node runtime differences.
+    const child = spawn(BINARY_PATH, [], {
       cwd,
       stdio: ["pipe", "pipe", "pipe"],
       env: process.env,
@@ -177,4 +250,4 @@ export async function runPlanReview(options) {
     approved: false,
     feedback: decision.message,
   };
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-plan-annotator",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "type": "module",
   "description": "Fully local plugin for interactive plan annotation from your Agentic assistants",
   "author": "ndom91",