@rotriz/pi-web-ui 1.3.0 → 1.4.0

package/extension.mjs

@@ -20,11 +20,26 @@ export default function (pi) {
     if (startPromise) return startPromise;
     startPromise = (async () => {
       try {
+        // Make @earendil-works/pi-coding-agent resolvable by the server module.
+        // Since we're in Pi's process, the module is already loaded — expose it globally.
+        try {
+          const piMod = await import("@earendil-works/pi-coding-agent");
+          globalThis.__PI_MODULE__ = piMod;
+        } catch {
+          // Fallback: resolve relative to Pi's entry script
+          const entry = process.argv[1] || "";
+          if (entry) {
+            const { dirname, join } = await import("node:path");
+            const dir = dirname(entry);
+            for (const c of [join(dir, "..", "dist", "index.js"), join(dir, "index.js")]) {
+              try { globalThis.__PI_MODULE__ = await import(c); break; } catch {}
+            }
+          }
+        }
         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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rotriz/pi-web-ui",
-  "version": "1.3.0",
+  "version": "1.4.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,8 +19,17 @@ 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 → NODE_PATH → common global paths
+// ─── Pi module resolution ─────────────────────────────────────────────────
+let _piModule = null;
+
+export function initPiModule(mod) {
+  _piModule = mod;
+}
+
 async function resolvePiModule() {
+  if (_piModule) return _piModule;
+  // Check if the extension pre-loaded the module via globalThis
+  if (globalThis.__PI_MODULE__) { _piModule = globalThis.__PI_MODULE__; return _piModule; }
   const attempts = [];
   if (process.env.PI_WEB_PI_MODULE) attempts.push(process.env.PI_WEB_PI_MODULE);
   attempts.push("@earendil-works/pi-coding-agent");
@@ -30,35 +39,51 @@ async function resolvePiModule() {
     attempts.push(join(dir, "..", "dist", "index.js"));
     attempts.push(join(dir, "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 {}
+    try { _piModule = await import(attempt); return _piModule; } catch {}
   }
   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();
 
-const {
-  createAgentSessionRuntime,
-  createAgentSessionFromServices,
-  createAgentSessionServices,
-  DefaultResourceLoader,
-  SessionManager,
-  SettingsManager,
-  getAgentDir,
-} = pi;
+// Only auto-initialize when run directly (node server.mjs)
+const _isDirectRun = process.argv[1] && resolve(process.argv[1]) === resolve(fileURLToPath(import.meta.url));
+if (_isDirectRun) {
+  await resolvePiModule();
+} else if (globalThis.__PI_MODULE__) {
+  _piModule = globalThis.__PI_MODULE__;
+}
+
+let createAgentSessionRuntime, createAgentSessionFromServices, createAgentSessionServices,
+    DefaultResourceLoader, SessionManager, SettingsManager, getAgentDir;
+
+if (_piModule) {
+  ({ createAgentSessionRuntime, createAgentSessionFromServices, createAgentSessionServices,
+     DefaultResourceLoader, SessionManager, SettingsManager, getAgentDir } = _piModule);
+}
+
+let AGENT_DIR = null;
+
+let server = null;
+let _booted = false;
+
+async function boot() {
+  if (_booted) return;
+  if (!_piModule) {
+    if (globalThis.__PI_MODULE__) _piModule = globalThis.__PI_MODULE__;
+    else await resolvePiModule();
+    ({ createAgentSessionRuntime, createAgentSessionFromServices, createAgentSessionServices,
+       DefaultResourceLoader, SessionManager, SettingsManager, getAgentDir } = _piModule);
+  }
+  AGENT_DIR = getAgentDir();
 
-const AGENT_DIR = getAgentDir();
 
 const createRuntime = async ({ cwd, sessionManager, sessionStartEvent }) => {
   const services = await createAgentSessionServices({ cwd });
@@ -868,7 +893,7 @@ function readBody(req) {
   });
 }
 
-const server = createServer(async (req, res) => {
+server = createServer(async (req, res) => {
   const url = new URL(req.url, `http://localhost:${PORT}`);
   const path = url.pathname;
 
@@ -1402,16 +1427,20 @@ 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) {
+  _booted = true;
+}
+
+// When run directly (node server.mjs), boot and listen immediately.
+const _isDirect = process.argv[1] && resolve(process.argv[1]) === resolve(fileURLToPath(import.meta.url));
+if (_isDirect) {
+  await boot();
   server.listen(PORT, () => console.log(`[pi-web-ui] listening on http://localhost:${PORT}`));
 }
 
-export { server, PORT, shared };
-export function startServer(port) {
+export { PORT };
+export async function startServer(port) {
+  await boot();
   return new Promise((res, rej) => {
     server.listen(port || PORT, () => {
       console.log(`[pi-web-ui] listening on http://localhost:${port || PORT}`);
@@ -1420,6 +1449,6 @@ export function startServer(port) {
     server.on("error", rej);
   });
 }
-export function stopServer() {
-  return new Promise((res) => server.close(() => res()));
+export async function stopServer() {
+  if (server) return new Promise((res) => server.close(() => res()));
 }