@firstpick/pi-package-webui 0.4.4 → 0.4.5

package/bin/pi-webui.mjs

@@ -4369,6 +4369,22 @@ function isNodeScriptCommand(command) {
   return [".cjs", ".js", ".mjs"].includes(path.extname(String(command || "")).toLowerCase());
 }
 
+async function resolvedPiCliScript() {
+  const packagePathParts = PI_CODING_AGENT_PACKAGE.split("/").filter(Boolean);
+  const searchRoots = require.resolve.paths(PI_CODING_AGENT_PACKAGE) || [];
+  for (const nodeModulesRoot of searchRoots) {
+    const cliPath = path.join(nodeModulesRoot, ...packagePathParts, "dist", "cli.js");
+    try {
+      await access(cliPath);
+      return cliPath;
+    } catch {
+      // Continue through Node's resolution roots; global npm installs can hoist
+      // pi-coding-agent beside pi-package-webui instead of nesting it.
+    }
+  }
+  return "";
+}
+
 async function resolvePiCommand(piArgs) {
   if (options.piBinExplicit) {
     if (isNodeScriptCommand(options.piBin)) {
@@ -4381,17 +4397,16 @@ async function resolvePiCommand(piArgs) {
     return { command: options.piBin, args: piArgs, displayCommand: `${options.piBin} ${piArgs.join(" ")}` };
   }
 
-  const bundledCli = path.join(packageRoot, "node_modules", "@earendil-works", "pi-coding-agent", "dist", "cli.js");
-  try {
-    await access(bundledCli);
+  const bundledCli = await resolvedPiCliScript();
+  if (bundledCli) {
     return {
       command: process.execPath,
       args: [bundledCli, ...piArgs],
       displayCommand: `${process.execPath} ${bundledCli} ${piArgs.join(" ")}`,
     };
-  } catch {
-    return { command: options.piBin, args: piArgs, displayCommand: `${options.piBin} ${piArgs.join(" ")}` };
   }
+
+  return { command: options.piBin, args: piArgs, displayCommand: `${options.piBin} ${piArgs.join(" ")}` };
 }
 
 const tabs = new Map();
@@ -5079,7 +5094,8 @@ async function getUpdateStatus({ force = false } = {}) {
 
 async function resolvePiUpdateCommand() {
   if (options.piBinExplicit) {
-    return { label: "Pi CLI and configured packages", command: options.piBin, args: ["update"], displayCommand: formatCommandForDisplay(options.piBin, ["update"]) };
+    const command = await resolvePiCommand(["update"]);
+    return { ...command, label: "Pi CLI and configured packages" };
   }
 
   const pathPi = await runCommand(options.piBin, ["--version"], { timeoutMs: 3000, maxOutputLength: 4000 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firstpick/pi-package-webui",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Pi Web UI companion package with a local browser UI CLI plus /webui-start and /webui-status commands.",
   "license": "MIT",
   "homepage": "https://github.com/Firstp1ck/npm-packages/tree/main/pi-package-webui#readme",
@@ -60,12 +60,12 @@
     "@firstpick/pi-extension-git-footer-status": "^0.3.3",
     "@firstpick/pi-extension-release-aur": "^0.1.6",
     "@firstpick/pi-extension-release-npm": "^0.4.0",
-    "@firstpick/pi-extension-workflows": "^0.1.0",
     "@firstpick/pi-extension-safety-guard": "^0.2.3",
     "@firstpick/pi-extension-setup-skills": "^0.1.8",
     "@firstpick/pi-extension-stats": "^0.2.6",
     "@firstpick/pi-extension-todo-progress": "^0.2.4",
     "@firstpick/pi-extension-tools": "^0.1.6",
+    "@firstpick/pi-extension-workflows": "^0.1.0",
     "@firstpick/pi-package-remote-webui": "^0.1.0",
     "@firstpick/pi-prompts-git-pr": "^0.1.2",
     "@firstpick/pi-themes-bundle": "^0.1.4"

package/tests/mobile-static.test.mjs

@@ -450,6 +450,9 @@ assert.match(server, /--cwd does not exist:/, "server should report nonexistent
 assert.match(server, /options\.cwd = await validateStartupCwd\(options\.cwd\)/, "server should fail fast for invalid startup cwd paths");
 assert.match(server, /cwdExplicit: false/, "server should track whether startup cwd was explicitly requested");
 assert.match(server, /return options\.cwdExplicit \? \[await createTab\(\)\] : \[\]/, "server should wait for UI cwd selection when no --cwd is supplied");
+assert.match(server, /async function resolvedPiCliScript\(\)[\s\S]*require\.resolve\.paths\(PI_CODING_AGENT_PACKAGE\)[\s\S]*nodeModulesRoot[\s\S]*dist[\s\S]*cli\.js/, "server should resolve the bundled Pi CLI through Node resolution roots so hoisted global installs can spawn RPC tabs");
+assert.match(server, /const bundledCli = await resolvedPiCliScript\(\)/, "standalone server should prefer the resolved Pi CLI script before falling back to PATH pi");
+assert.match(server, /if \(options\.piBinExplicit\) \{\n\s+const command = await resolvePiCommand\(\["update"\]\)/, "explicit --pi JavaScript launchers should also work for update commands");
 assert.match(app, /serverActionSelect\.addEventListener\("change", updateServerActionButton\)/, "Server action dropdown should control the guarded run button");
 assert.match(app, /runServerActionButton\.addEventListener\("click"[\s\S]*runSelectedServerAction/, "Server action run button should execute the selected action");
 assert.match(app, /api\("\/api\/restart", \{ method: "POST", scoped: false \}\)/, "Restart Server action should call the unscoped restart endpoint");