pi-bridge 0.3.1 → 0.3.2

package/bin/pii.js

@@ -14,37 +14,56 @@ if (process.argv.includes('--version') || process.argv.includes('-v') || process
   process.exit(0);
 }
 
-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 { cli: shared, nodeExe: process.execPath };
+// List every `pi` on the PATH that pii inherited from its launching shell.
+// We resolve against that PATH (not a fresh `-NoProfile` shell) so that bundled
+// installs added to PATH via the user's profile are actually visible.
+function locateOnPath(cmd) {
+  const finder = os.platform() === 'win32' ? 'where.exe' : 'which';
+  try {
+    const out = execFileSync(finder, [cmd], { encoding: 'utf8' });
+    return out.split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
+  } catch (_) {
+    return [];
   }
+}
 
-  // 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 (_) {}
+function findPi() {
+  // 1. Standard npm global: pii and pi share the same node_modules prefix.
+  //    Prefer the current @earendil-works scope; keep @mariozechner as a legacy
+  //    fallback for machines that installed pi before it moved off that scope.
+  const sharedCandidates = [
+    path.resolve(__dirname, '..', '..', '@earendil-works', 'pi-coding-agent', 'dist', 'cli.js'),
+    path.resolve(__dirname, '..', '..', '@mariozechner', 'pi-coding-agent', 'dist', 'cli.js'),
+  ];
+  for (const cli of sharedCandidates) {
+    if (fs.existsSync(cli)) return { cli, nodeExe: process.execPath };
   }
 
-  // 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 (_) {}
+  // 2. Resolve `pi` from PATH and follow it to its real JS entrypoint. The
+  //    pi.dev installer (curl https://pi.dev/install.sh | sh) drops a bundled
+  //    Node plus a bare `bin/pi` symlink that points straight at the package's
+  //    cli.js — often outside any npm prefix — so we realpath the symlink rather
+  //    than guessing filenames. Also covers npm shims and dev clones (which
+  //    expose pi as a symlink to cli.js too), and a bundled node next to pi is
+  //    preferred for version-matched execution.
+  const exe = os.platform() === 'win32' ? '.exe' : '';
+  for (const cmd of locateOnPath('pi')) {
+    let real;
+    try { real = fs.realpathSync(cmd); } catch (_) { real = cmd; }
+
+    let cli = null;
+    if (/\.[cm]?js$/i.test(real) && fs.existsSync(real)) {
+      cli = real;                                   // symlink/shim -> cli.js
+    } else if (fs.existsSync(path.join(path.dirname(cmd), 'pi.js'))) {
+      cli = path.join(path.dirname(cmd), 'pi.js');  // bundled wrapper + sibling
+    } else if (!/\.(cmd|ps1|bat|exe)$/i.test(real)) {
+      cli = real;                                   // shebang JS with no extension
+    }
+    if (!cli) continue;
+
+    const localNode = path.join(path.dirname(cmd), 'node' + exe);
+    const nodeExe = fs.existsSync(localNode) ? localNode : process.execPath;
+    return { cli, nodeExe };
   }
 
   return null;
@@ -57,8 +76,9 @@ try {
 
 if (!pi) {
   process.stderr.write(
-    'pii: Could not find pi.\n' +
-    'Install it with: npm install -g @mariozechner/pi-coding-agent\n'
+    'pii: Could not find pi on your PATH.\n' +
+    'If pi is already installed, re-open your shell so the install is on PATH, then retry.\n' +
+    'Otherwise install pi: curl -fsSL https://pi.dev/install.sh | sh\n'
   );
   process.exit(1);
 }

package/package.json

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