pi-bridge 0.1.1 → 0.1.3

package/bin/pii.js

@@ -4,15 +4,11 @@
 /**
  * pii — pi-bridge entry point installed as a global binary.
  *
- * Locates the `pi` CLI JS file and its bundled Node binary (if any), then
- * respawns with --require preload.js so the bridge is active before pi loads.
+ * Locates the pi CLI via `npm root -g` (cross-platform), then respawns
+ * Node with --require preload.js so the bridge is active before pi loads.
  *
- * Resolution strategy (same on all platforms):
- *   1. Get the wrapper script path from the system (which pi / Get-Command pi)
- *   2. Derive basedir from the wrapper path
- *   3. Find the actual CLI JS at basedir/node_modules/@mariozechner/pi-coding-agent/dist/cli.js
- *   4. Use basedir/node.exe if present (pi ships its own Node on some installs),
- *      otherwise fall back to the current Node binary
+ * On Windows, also checks for a node.exe bundled alongside the pi wrapper
+ * (some installs ship their own Node binary) and prefers it if present.
  */
 
 const { spawnSync, execFileSync } = require('child_process');
@@ -22,24 +18,13 @@ const os = require('os');
 
 const preload = path.join(__dirname, '..', 'src', 'local', 'preload.js');
 
-const PI_CLI_REL = path.join('node_modules', '@mariozechner', 'pi-coding-agent', 'dist', 'cli.js');
-
-function getWrapperPath() {
-  if (os.platform() === 'win32') {
-    return execFileSync(
-      'powershell',
-      ['-NoProfile', '-Command', '(Get-Command pi -ErrorAction Stop).Source'],
-      { encoding: 'utf8' }
-    ).trim();
-  }
-  return execFileSync('which', ['pi'], { encoding: 'utf8' }).trim();
-}
-
 function findPiCli() {
-  const wrapper = getWrapperPath();
-  const basedir = path.dirname(wrapper);
+  // npm root -g gives the exact global node_modules dir on all platforms.
+  // On Windows the npm executable is npm.cmd — use that explicitly.
+  const npmBin = os.platform() === 'win32' ? 'npm.cmd' : 'npm';
+  const npmRoot = execFileSync(npmBin, ['root', '-g'], { encoding: 'utf8' }).trim();
+  const cli = path.join(npmRoot, '@mariozechner', 'pi-coding-agent', 'dist', 'cli.js');
 
-  const cli = path.join(basedir, PI_CLI_REL);
   if (!fs.existsSync(cli)) {
     throw new Error(
       'Could not find pi CLI at ' + cli + '\n' +
@@ -47,11 +32,22 @@ function findPiCli() {
     );
   }
 
-  // Prefer the Node binary bundled alongside pi (some installs ship node.exe)
-  const localNode = path.join(basedir, 'node.exe');
-  const nodeExe = fs.existsSync(localNode) ? localNode : process.execPath;
+  // On Windows, prefer the node.exe bundled alongside the pi wrapper if present
+  if (os.platform() === 'win32') {
+    try {
+      const wrapper = execFileSync(
+        'powershell',
+        ['-NoProfile', '-Command', '(Get-Command pi -ErrorAction Stop).Source'],
+        { encoding: 'utf8' }
+      ).trim();
+      const localNode = path.join(path.dirname(wrapper), 'node.exe');
+      if (fs.existsSync(localNode)) {
+        return { cli, nodeExe: localNode };
+      }
+    } catch (_) {}
+  }
 
-  return { cli, nodeExe };
+  return { cli, nodeExe: process.execPath };
 }
 
 let cli, nodeExe;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-bridge",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Transparent filesystem bridge that makes pi run natively on a remote machine over SSH",
   "type": "commonjs",
   "bin": {