pi-bridge 0.1.5 → 0.1.9

package/bin/pii.js

@@ -1,16 +1,6 @@
 #!/usr/bin/env node
 'use strict';
 
-/**
- * pii — pi-bridge entry point installed as a global binary.
- *
- * 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.
- *
- * 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');
 const path = require('path');
 const fs = require('fs');
@@ -18,50 +8,38 @@ const os = require('os');
 
 const preload = path.join(__dirname, '..', 'src', 'local', 'preload.js');
 
-function findPiCli() {
+function findCli() {
+  // 1. Standard npm global: pi-bridge and pi 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. Windows bundled/custom install: pi.js sits next to pi.ps1 (no node_modules structure)
   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 };
+    try {
+      const wrapper = execFileSync(
+        'powershell',
+        ['-NoProfile', '-Command', '(Get-Command pi -ErrorAction Stop).Source'],
+        { encoding: 'utf8' }
+      ).trim();
+      const sibling = wrapper.replace(/\.(ps1|cmd)$/i, '.js');
+      if (fs.existsSync(sibling)) return sibling;
+    } catch (_) {}
   }
 
-  // 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'
-    );
-  }
-  return { cli, nodeExe: process.execPath };
+  return null;
 }
 
-let cli, nodeExe;
-try {
-  ({ cli, nodeExe } = findPiCli());
-} catch (err) {
-  process.stderr.write('pii: ' + err.message + '\n');
+const cli = findCli();
+if (!cli) {
+  process.stderr.write(
+    'pii: Could not find pi.\n' +
+    'Install it with: npm install -g @mariozechner/pi-coding-agent\n'
+  );
   process.exit(1);
 }
 
 const result = spawnSync(
-  nodeExe,
+  process.execPath,
   ['--require', preload, cli, ...process.argv.slice(2)],
   { stdio: 'inherit' }
 );

package/package.json

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