@rotriz/pi-web-ui 1.1.0 → 1.3.0

package/extension.mjs

@@ -1,95 +1,53 @@
 // 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.
+// Runs the HTTP/SSE gateway in-process (no subprocess needed).
 
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-import { exec, execFile } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import { existsSync } from "node:fs";
-import { request } from "node:http";
+import { exec } from "node:child_process";
 
 const PORT = Number(process.env.PI_WEB_PORT || process.env.PORT || 3123);
 
-// HTTP GET helper — works on Node 14+ without global fetch
-function httpGet(url) {
-  return new Promise((resolve) => {
-    const req = request(url, (res) => {
-      let data = "";
-      res.on("data", (chunk) => (data += chunk));
-      res.on("end", () => resolve({ ok: res.statusCode >= 200 && res.statusCode < 300, status: res.statusCode, data }));
-    });
-    req.on("error", () => resolve({ ok: false, status: 0, data: "" }));
-    req.setTimeout(3000, () => { req.destroy(); resolve({ ok: false, status: 0, data: "" }); });
-    req.end();
-  });
-}
-
 function openBrowser(url) {
   const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
   exec(`${cmd} ${JSON.stringify(url)}`, () => {});
 }
 
 export default function (pi) {
-  let serverProcess = null;
-  let origin = `http://localhost:${PORT}`;
-
-  const extDir = (() => {
-    try {
-      return dirname(fileURLToPath(import.meta.url));
-    } catch {
-      return join(homedir(), ".pi", "agent", "extensions", "pi-web-ui");
-    }
-  })();
-
-  function findNode() {
-    // Use the same Node binary that's running pi
-    return process.execPath;
-  }
+  let serverStarted = false;
+  let startPromise = null;
+  const origin = `http://localhost:${PORT}`;
 
   async function ensureServer() {
-    // 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
-    } catch {}
-
-    if (serverProcess && !serverProcess.killed) return;
-    const serverPath = join(extDir, "server.mjs");
-    if (!existsSync(serverPath)) {
-      throw new Error(`pi-web-ui server not found at ${serverPath}`);
-    }
-    serverProcess = execFile(findNode(), [serverPath], {
-      cwd: process.cwd(),
-      env: { ...process.env, PORT: String(PORT) },
-      stdio: "ignore",
-    });
-    serverProcess.unref();
-    serverProcess.on("exit", () => { serverProcess = null; });
-    // Wait for the server to be ready (up to 30 seconds for slow machines)
-    for (let i = 0; i < 60; i++) {
-      await new Promise((r) => setTimeout(r, 500));
+    if (serverStarted) return;
+    if (startPromise) return startPromise;
+    startPromise = (async () => {
       try {
-        const res = await httpGet(`${origin}/api/tabs`);
-        if (res.ok) return;
-      } catch {}
-    }
-    throw new Error("pi-web-ui server did not start in time");
+        const { startServer } = await import("./server.mjs");
+        await startServer(PORT);
+        serverStarted = true;
+      } catch (err) {
+        // Server may already be listening (port in use = already running)
+        if (err?.code === "EADDRINUSE") {
+          serverStarted = true;
+          return;
+        }
+        throw err;
+      } finally {
+        startPromise = null;
+      }
+    })();
+    return startPromise;
   }
 
-  async function stopServer() {
-    if (serverProcess && !serverProcess.killed) {
-      serverProcess.kill();
-      serverProcess = null;
-    }
+  async function stopServerFn() {
+    if (!serverStarted) return;
+    try {
+      const { stopServer } = await import("./server.mjs");
+      await stopServer();
+      serverStarted = false;
+    } catch {}
   }
 
   // ── 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");
     });
@@ -97,7 +55,7 @@ export default function (pi) {
 
   pi.on("session_shutdown", async (event) => {
     if (event.reason === "reload" || event.reason === "quit") {
-      await stopServer();
+      await stopServerFn();
     }
   });
 
@@ -111,7 +69,7 @@ export default function (pi) {
     handler: async (args, ctx) => {
       const arg = String(args ?? "").trim().toLowerCase();
       if (arg === "stop") {
-        await stopServer();
+        await stopServerFn();
         ctx.ui?.notify?.("pi-web-ui stopped", "info");
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rotriz/pi-web-ui",
-  "version": "1.1.0",
+  "version": "1.3.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();
 
@@ -1394,5 +1402,24 @@ const server = createServer(async (req, res) => {
     json(res, 500, { error: String(err?.stack ?? err) });
   }
 });
+// When run directly (node server.mjs), start listening immediately.
+// When imported as a module (by extension.mjs), export control functions.
+const isDirectRun = process.argv[1] && resolve(process.argv[1]) === resolve(fileURLToPath(import.meta.url));
+
+if (isDirectRun) {
+  server.listen(PORT, () => console.log(`[pi-web-ui] listening on http://localhost:${PORT}`));
+}
 
-server.listen(PORT, () => console.log(`[pi-web-ui] listening on http://localhost:${PORT}`));
+export { server, PORT, shared };
+export function startServer(port) {
+  return new Promise((res, rej) => {
+    server.listen(port || PORT, () => {
+      console.log(`[pi-web-ui] listening on http://localhost:${port || PORT}`);
+      res();
+    });
+    server.on("error", rej);
+  });
+}
+export function stopServer() {
+  return new Promise((res) => server.close(() => res()));
+}