pi-bridge 0.1.4 → 0.1.5

package/bin/pii.js

@@ -19,33 +19,36 @@ const os = require('os');
 const preload = path.join(__dirname, '..', 'src', 'local', 'preload.js');
 
 function findPiCli() {
-  // npm root -g gives the exact global node_modules dir on all platforms.
-  // Use shell:true so Windows can resolve npm.cmd without ENOENT.
-  const npmRoot = execFileSync('npm', ['root', '-g'], { encoding: 'utf8', shell: true }).trim();
-  const cli = path.join(npmRoot, '@mariozechner', 'pi-coding-agent', 'dist', 'cli.js');
+  if (os.platform() === 'win32') {
+    // On Windows: resolve from the pi.ps1 wrapper's basedir.
+    // npm puts binaries and node_modules in the same directory on Windows.
+    const wrapper = execFileSync(
+      'powershell',
+      ['-NoProfile', '-Command', '(Get-Command pi -ErrorAction Stop).Source'],
+      { encoding: 'utf8' }
+    ).trim();
+    const basedir = path.dirname(wrapper);
+    const cli = path.join(basedir, 'node_modules', '@mariozechner', 'pi-coding-agent', 'dist', 'cli.js');
+    if (!fs.existsSync(cli)) {
+      throw new Error(
+        'Could not find pi CLI at ' + cli + '\n' +
+        'Make sure pi is installed: npm install -g @mariozechner/pi-coding-agent'
+      );
+    }
+    // Prefer the Node binary bundled alongside pi if present
+    const localNode = path.join(basedir, 'node.exe');
+    return { cli, nodeExe: fs.existsSync(localNode) ? localNode : process.execPath };
+  }
 
+  // Unix/macOS: npm puts packages in lib/node_modules, use npm root -g
+  const npmRoot = execFileSync('npm', ['root', '-g'], { encoding: 'utf8' }).trim();
+  const cli = path.join(npmRoot, '@mariozechner', 'pi-coding-agent', 'dist', 'cli.js');
   if (!fs.existsSync(cli)) {
     throw new Error(
       'Could not find pi CLI at ' + cli + '\n' +
       'Make sure pi is installed: npm install -g @mariozechner/pi-coding-agent'
     );
   }
-
-  // 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: process.execPath };
 }
 

package/package.json

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