pi-bridge 0.2.0 → 0.2.4

package/bin/pii.js

@@ -14,26 +14,48 @@ if (process.argv.includes('--version') || process.argv.includes('-v') || process
   process.exit(0);
 }
 
-function findCli() {
-  // 1. Standard npm global: pi-bridge and pi share the same node_modules prefix
+function findPi() {
+  // 1. Standard npm global: both packages share the same node_modules prefix
   const shared = path.resolve(__dirname, '..', '..', '@mariozechner', 'pi-coding-agent', 'dist', 'cli.js');
-  if (fs.existsSync(shared)) return shared;
-
-  // 2. GitHub clone / bundled install: pi.js sits next to the pi wrapper in PATH
-  //    Use `where` (Windows built-in) — more reliable than spawning PowerShell
-  const whereCmd = os.platform() === 'win32' ? 'where' : 'which';
-  try {
-    const wrapper = execFileSync(whereCmd, ['pi'], { encoding: 'utf8' })
-      .trim().split('\n')[0].trim();
-    const sibling = wrapper.replace(/\.(ps1|cmd)$/i, '.js');
-    if (fs.existsSync(sibling)) return sibling;
-  } catch (_) {}
+  if (fs.existsSync(shared)) {
+    return { cli: shared, nodeExe: process.execPath };
+  }
+
+  // 2. Unix GitHub clone: which pi returns the JS file directly
+  if (os.platform() !== 'win32') {
+    try {
+      const wrapper = execFileSync('which', ['pi'], { encoding: 'utf8' }).trim();
+      if (fs.existsSync(wrapper)) return { cli: wrapper, nodeExe: process.execPath };
+    } catch (_) {}
+  }
+
+  // 3. Fallback: PowerShell Get-Command — handles custom/bundled Windows installs
+  //    where pi lives outside the standard npm prefix. Also picks up the bundled
+  //    node.exe that shipped alongside pi (required for version-matched execution).
+  if (os.platform() === 'win32') {
+    try {
+      const wrapper = execFileSync(
+        'powershell',
+        ['-NoProfile', '-Command', '(Get-Command pi -ErrorAction Stop).Source'],
+        { encoding: 'utf8' }
+      ).trim();
+      const basedir = path.dirname(wrapper);
+      const cli = wrapper.replace(/\.(ps1|cmd)$/i, '.js');
+      const localNode = path.join(basedir, 'node.exe');
+      const nodeExe = fs.existsSync(localNode) ? localNode : process.execPath;
+      if (fs.existsSync(cli)) return { cli, nodeExe };
+    } catch (_) {}
+  }
 
   return null;
 }
 
-const cli = findCli();
-if (!cli) {
+let pi;
+try {
+  pi = findPi();
+} catch (_) {}
+
+if (!pi) {
   process.stderr.write(
     'pii: Could not find pi.\n' +
     'Install it with: npm install -g @mariozechner/pi-coding-agent\n'
@@ -42,8 +64,8 @@ if (!cli) {
 }
 
 const result = spawnSync(
-  process.execPath,
-  ['--require', preload, cli, ...process.argv.slice(2)],
+  pi.nodeExe,
+  ['--require', preload, pi.cli, ...process.argv.slice(2)],
   { stdio: 'inherit' }
 );
 

package/package.json

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