pi-bridge 0.3.0 → 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,12 +76,18 @@ 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);
 }
 
+// Expose resolved pi paths so child-process-patch can re-spawn pi correctly
+// when the review skill (or any internal tool) calls `pi` as a subprocess.
+process.env.PI_BRIDGE_CLI  = pi.cli;
+process.env.PI_BRIDGE_NODE = pi.nodeExe;
+
 const result = spawnSync(
   pi.nodeExe,
   ['--require', preload, pi.cli, ...process.argv.slice(2)],

package/package.json

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

package/src/local/child-process-patch.js

@@ -50,6 +50,22 @@ function patchChildProcess(fakeRoot, remote) {
     return name === 'node' || name === 'pi' || name === 'pii';
   }
 
+  /**
+   * When pi spawns 'pi' or 'pii' as a subprocess (e.g. the /review skill),
+   * the bare command name won't be found in PATH on Windows because pi is a
+   * JS file located by pii's findPi(). pii.js sets PI_BRIDGE_CLI / PI_BRIDGE_NODE
+   * in the environment so we can resolve the correct executable here.
+   *
+   * Returns { nodeExe, cli } when applicable, null otherwise.
+   */
+  function resolvePiExe(file) {
+    const name = normalizeCmd(file).toLowerCase();
+    if (name !== 'pi' && name !== 'pii') return null;
+    const cli = process.env.PI_BRIDGE_CLI;
+    if (!cli) return null;
+    return { nodeExe: process.env.PI_BRIDGE_NODE || process.execPath, cli };
+  }
+
   /**
    * Build SSH args for a file + args invocation:
    * cd to remote cwd, then run the command with shell-quoted arguments.
@@ -84,7 +100,11 @@ function patchChildProcess(fakeRoot, remote) {
     opts = opts || {};
 
     const cwd = effectiveCwd(opts);
-    if (!isFakePath(cwd, fakeRoot) || isLocalOnly(file)) return origSpawn(file, args, opts);
+    if (!isFakePath(cwd, fakeRoot) || isLocalOnly(file)) {
+      const piExe = resolvePiExe(file);
+      if (piExe) return origSpawn(piExe.nodeExe, [piExe.cli, ...args], opts);
+      return origSpawn(file, args, opts);
+    }
 
     return origSpawn('ssh', buildSshArgs(file, args, opts), Object.assign({}, opts, { cwd: undefined }));
   };
@@ -96,7 +116,11 @@ function patchChildProcess(fakeRoot, remote) {
     opts = opts || {};
 
     const cwd = effectiveCwd(opts);
-    if (!isFakePath(cwd, fakeRoot) || isLocalOnly(file)) return origSpawnSync(file, args, opts);
+    if (!isFakePath(cwd, fakeRoot) || isLocalOnly(file)) {
+      const piExe = resolvePiExe(file);
+      if (piExe) return origSpawnSync(piExe.nodeExe, [piExe.cli, ...args], opts);
+      return origSpawnSync(file, args, opts);
+    }
 
     return origSpawnSync('ssh', buildSshArgs(file, args, opts), Object.assign({}, opts, { cwd: undefined }));
   };
@@ -119,7 +143,11 @@ function patchChildProcess(fakeRoot, remote) {
     opts = opts || {};
 
     const cwd = effectiveCwd(opts);
-    if (!isFakePath(cwd, fakeRoot) || isLocalOnly(file)) return origExecFileSync(file, args, opts);
+    if (!isFakePath(cwd, fakeRoot) || isLocalOnly(file)) {
+      const piExe = resolvePiExe(file);
+      if (piExe) return origExecFileSync(piExe.nodeExe, [piExe.cli, ...args], opts);
+      return origExecFileSync(file, args, opts);
+    }
 
     return origExecFileSync('ssh', buildSshArgs(file, args, opts), Object.assign({}, opts, { cwd: undefined }));
   };

package/src/local/http-client.js

@@ -93,31 +93,37 @@ req.on('error', (e) => {
  * @throws                 - On HTTP errors or non-2xx status codes
  */
 function httpPost(port, token, urlPath, body) {
+  // Body is passed via stdin (not embedded in the script) to avoid ENAMETOOLONG
+  // on Windows when writing large files such as session exports.
   const script = `
 const http = require('http');
-const body = ${JSON.stringify(body)};
-const bodyBuf = Buffer.from(body, 'utf8');
-let resBody = '';
-let statusCode = 0;
-const req = http.request(
-  { method:'POST', hostname:'127.0.0.1', port:${JSON.stringify(port)}, path:${JSON.stringify(urlPath)},
-    headers:{'x-token':${JSON.stringify(token)},'Content-Type':'text/plain; charset=utf-8','Content-Length':bodyBuf.length} },
-  (res) => {
-    statusCode = res.statusCode;
-    res.setEncoding('utf8');
-    res.on('data', (d) => { resBody += d; });
-    res.on('end', () => {
-      process.stdout.write(JSON.stringify({ ok: statusCode >= 200 && statusCode < 300, status: statusCode, body: resBody }));
-    });
-  }
-);
-req.on('error', (e) => {
-  process.stdout.write(JSON.stringify({ ok: false, status: 0, body: e.message }));
+let raw = '';
+process.stdin.setEncoding('utf8');
+process.stdin.on('data', (d) => { raw += d; });
+process.stdin.on('end', () => {
+  const bodyBuf = Buffer.from(raw, 'utf8');
+  let resBody = '';
+  let statusCode = 0;
+  const req = http.request(
+    { method:'POST', hostname:'127.0.0.1', port:${JSON.stringify(port)}, path:${JSON.stringify(urlPath)},
+      headers:{'x-token':${JSON.stringify(token)},'Content-Type':'text/plain; charset=utf-8','Content-Length':bodyBuf.length} },
+    (res) => {
+      statusCode = res.statusCode;
+      res.setEncoding('utf8');
+      res.on('data', (d) => { resBody += d; });
+      res.on('end', () => {
+        process.stdout.write(JSON.stringify({ ok: statusCode >= 200 && statusCode < 300, status: statusCode, body: resBody }));
+      });
+    }
+  );
+  req.on('error', (e) => {
+    process.stdout.write(JSON.stringify({ ok: false, status: 0, body: e.message }));
+  });
+  req.write(bodyBuf);
+  req.end();
 });
-req.write(bodyBuf);
-req.end();
 `;
-  const raw = withRetry(() => execFileSync(process.execPath, ['-e', script], { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }));
+  const raw = withRetry(() => execFileSync(process.execPath, ['-e', script], { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'], input: body }));
   const result = JSON.parse(raw);
   if (!result.ok) {
     const err = new Error('HTTP ' + result.status + ': ' + result.body);