@rotriz/pi-web-ui 1.1.0 → 1.2.0

package/extension.mjs

@@ -1,9 +1,5 @@
 // pi-web-ui extension entry point for the Pi coding agent.
 // Registers the /web command and starts the HTTP/SSE gateway.
-//
-// When loaded as a Pi extension (via pi.extensions in package.json),
-// this module receives the Pi ExtensionAPI and bridges the host session
-// into the Web UI server.
 
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
@@ -33,6 +29,58 @@ function openBrowser(url) {
   exec(`${cmd} ${JSON.stringify(url)}`, () => {});
 }
 
+// Resolve the pi-coding-agent module path from within Pi's process context
+function findPiModulePath() {
+  try {
+    // When running inside Pi, the module is already loaded — find it via require.resolve or import.meta
+    const candidates = [];
+    // Check if pi's entry script reveals the path
+    const entry = process.argv[1] || "";
+    if (entry) {
+      const dir = dirname(entry);
+      candidates.push(join(dir, "..", "dist", "index.js"));
+      candidates.push(join(dir, "index.js"));
+      // Go up to find the package
+      let d = dir;
+      for (let i = 0; i < 5; i++) {
+        const candidate = join(d, "dist", "index.js");
+        if (existsSync(candidate)) candidates.push(candidate);
+        const pkgCandidate = join(d, "node_modules", "@earendil-works", "pi-coding-agent", "dist", "index.js");
+        if (existsSync(pkgCandidate)) candidates.push(pkgCandidate);
+        d = dirname(d);
+      }
+    }
+    // Check common global locations
+    const globalDirs = [
+      join(homedir(), ".local", "share", "fnm"),
+      "/usr/local/lib/node_modules",
+      "/usr/lib/node_modules",
+      join(homedir(), ".nvm", "versions", "node"),
+      join(homedir(), ".volta", "tools", "image", "packages"),
+    ];
+    for (const base of globalDirs) {
+      if (!existsSync(base)) continue;
+      // Recursively look for the package
+      const piPkg = "@earendil-works/pi-coding-agent/dist/index.js";
+      // Check direct path
+      const direct = join(base, piPkg);
+      if (existsSync(direct)) { candidates.push(direct); continue; }
+      // For version managers, search one level deep
+    }
+    // Also check NODE_PATH
+    if (process.env.NODE_PATH) {
+      for (const p of process.env.NODE_PATH.split(":")) {
+        const candidate = join(p, "@earendil-works", "pi-coding-agent", "dist", "index.js");
+        if (existsSync(candidate)) candidates.push(candidate);
+      }
+    }
+    for (const c of candidates) {
+      if (existsSync(c)) return c;
+    }
+  } catch {}
+  return null;
+}
+
 export default function (pi) {
   let serverProcess = null;
   let origin = `http://localhost:${PORT}`;
@@ -46,7 +94,6 @@ export default function (pi) {
   })();
 
   function findNode() {
-    // Use the same Node binary that's running pi
     return process.execPath;
   }
 
@@ -54,7 +101,7 @@ export default function (pi) {
     // Check if server is already running (from a previous session or manual start)
     try {
       const res = await httpGet(`${origin}/api/tabs`);
-      if (res.ok) return; // Already running, reuse it
+      if (res.ok) return;
     } catch {}
 
     if (serverProcess && !serverProcess.killed) return;
@@ -62,14 +109,30 @@ export default function (pi) {
     if (!existsSync(serverPath)) {
       throw new Error(`pi-web-ui server not found at ${serverPath}`);
     }
+
+    // Resolve the pi module path and pass it to the server
+    const piModulePath = findPiModulePath();
+    const env = { ...process.env, PORT: String(PORT) };
+    if (piModulePath) env.PI_WEB_PI_MODULE = piModulePath;
+
+    // Also pass NODE_PATH so the subprocess can find global modules
+    const nodePath = [];
+    if (process.env.NODE_PATH) nodePath.push(process.env.NODE_PATH);
+    // Add the global node_modules from the current node binary
+    const nodeDir = dirname(dirname(process.execPath));
+    const globalNM = join(nodeDir, "lib", "node_modules");
+    if (existsSync(globalNM)) nodePath.push(globalNM);
+    if (nodePath.length) env.NODE_PATH = nodePath.join(":");
+
     serverProcess = execFile(findNode(), [serverPath], {
       cwd: process.cwd(),
-      env: { ...process.env, PORT: String(PORT) },
+      env,
       stdio: "ignore",
     });
     serverProcess.unref();
     serverProcess.on("exit", () => { serverProcess = null; });
-    // Wait for the server to be ready (up to 30 seconds for slow machines)
+
+    // Wait for the server to be ready (up to 30 seconds)
     for (let i = 0; i < 60; i++) {
       await new Promise((r) => setTimeout(r, 500));
       try {
@@ -89,7 +152,6 @@ export default function (pi) {
 
   // ── Lifecycle ────────────────────────────────────────────────────────
   pi.on("session_start", async (_event, ctx) => {
-    // Start server in background — don't block Pi's session startup
     ensureServer().catch((err) => {
       ctx.ui?.notify?.(`pi-web-ui: ${err?.message ?? err}`, "warning");
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rotriz/pi-web-ui",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Web UI extension for the Pi coding agent — browser-based session management, git integration, and task tracking",
   "type": "module",
   "license": "MIT",

package/server.mjs

@@ -19,7 +19,7 @@ const PORT = process.env.PORT || 3123;
 const CWD = process.cwd();
 const HERE = dirname(fileURLToPath(import.meta.url));
 
-// Resolve the pi-coding-agent module: env override → bare specifier → relative to pi entry
+// Resolve the pi-coding-agent module: env override → bare specifier → NODE_PATH → common global paths
 async function resolvePiModule() {
   const attempts = [];
   if (process.env.PI_WEB_PI_MODULE) attempts.push(process.env.PI_WEB_PI_MODULE);
@@ -30,13 +30,21 @@ async function resolvePiModule() {
     attempts.push(join(dir, "..", "dist", "index.js"));
     attempts.push(join(dir, "index.js"));
   }
-  // Try global node_modules as last resort
-  const globalPrefix = process.env.NODE_PATH?.split(":")[0];
-  if (globalPrefix) attempts.push(join(globalPrefix, "@earendil-works/pi-coding-agent/dist/index.js"));
+  // Try NODE_PATH entries
+  if (process.env.NODE_PATH) {
+    for (const p of process.env.NODE_PATH.split(":")) {
+      attempts.push(join(p, "@earendil-works", "pi-coding-agent", "dist", "index.js"));
+    }
+  }
+  // Common global install locations
+  const nodeDir = dirname(dirname(process.execPath));
+  attempts.push(join(nodeDir, "lib", "node_modules", "@earendil-works", "pi-coding-agent", "dist", "index.js"));
+  // npm global prefix
+  attempts.push(join(homedir(), ".local", "lib", "node_modules", "@earendil-works", "pi-coding-agent", "dist", "index.js"));
   for (const attempt of attempts) {
     try { return await import(attempt); } catch {}
   }
-  throw new Error("Could not resolve @earendil-works/pi-coding-agent. Install it globally or set PI_WEB_PI_MODULE.");
+  throw new Error("Could not resolve @earendil-works/pi-coding-agent. Install it globally or set PI_WEB_PI_MODULE env var.");
 }
 const pi = await resolvePiModule();