pi-bridge 0.2.2 → 0.2.6

package/bin/pii.js

@@ -14,20 +14,24 @@ 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;
+  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 wrapper;
+      if (fs.existsSync(wrapper)) return { cli: wrapper, nodeExe: process.execPath };
     } catch (_) {}
   }
 
-  // 3. Windows fallback: PowerShell Get-Command finds pi even in custom/non-PATH locations
+  // 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(
@@ -35,16 +39,23 @@ function findCli() {
         ['-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;
+      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'
@@ -53,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.2",
+  "version": "0.2.6",
   "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

@@ -29,11 +29,33 @@ function patchChildProcess(fakeRoot, remote) {
     return typeof c === 'string' ? path.resolve(c) : c.toString();
   }
 
+  /**
+   * On Windows, pi may call spawn with a full exe path like
+   * C:\Program Files\Git\bin\bash.exe. Strip it to the bare command name
+   * ('bash') so the remote Linux shell can find it.
+   */
+  function normalizeCmd(file) {
+    if (process.platform !== 'win32') return file;
+    return path.basename(String(file)).replace(/\.exe$/i, '');
+  }
+
+  /**
+   * Returns true for commands that must always run locally, never over SSH.
+   * - node / node.exe: pi's internal tooling (session export, compaction, …)
+   *   spawns Node with large payloads as args; redirecting those over SSH would
+   *   produce an ENAMETOOLONG error on Windows and is never correct anyway.
+   */
+  function isLocalOnly(file) {
+    const name = normalizeCmd(file).toLowerCase();
+    return name === 'node';
+  }
+
   /**
    * Build the SSH-redirected command: cd to remote cwd, then run the
    * original command with its arguments, all shell-quoted.
    */
   function buildSshArgs(file, args, opts) {
+    file = normalizeCmd(file);
     const fakeCwd    = effectiveCwd(opts);
     const remoteCwd  = toRemotePath(fakeCwd, fakeRoot);
 
@@ -54,7 +76,7 @@ function patchChildProcess(fakeRoot, remote) {
     opts = opts || {};
 
     const cwd = effectiveCwd(opts);
-    if (!isFakePath(cwd, fakeRoot)) return origSpawn(file, args, opts);
+    if (!isFakePath(cwd, fakeRoot) || isLocalOnly(file)) return origSpawn(file, args, opts);
 
     return origSpawn('ssh', buildSshArgs(file, args, opts), Object.assign({}, opts, { cwd: undefined }));
   };
@@ -66,7 +88,7 @@ function patchChildProcess(fakeRoot, remote) {
     opts = opts || {};
 
     const cwd = effectiveCwd(opts);
-    if (!isFakePath(cwd, fakeRoot)) return origSpawnSync(file, args, opts);
+    if (!isFakePath(cwd, fakeRoot) || isLocalOnly(file)) return origSpawnSync(file, args, opts);
 
     return origSpawnSync('ssh', buildSshArgs(file, args, opts), Object.assign({}, opts, { cwd: undefined }));
   };

package/src/local/fs-patch.js

@@ -38,6 +38,15 @@ function makeEisdir(p) {
   );
 }
 
+/**
+ * Returns true if the path looks like a bash executable.
+ * Used on Windows to fake bash presence so pi's shell-detection passes.
+ */
+function isBashPath(p) {
+  const n = String(p).replace(/\\/g, '/').toLowerCase();
+  return n.endsWith('/bash.exe') || n.endsWith('/bash') || n === '/bin/bash';
+}
+
 function rethrowRemote(e, p) {
   if (!e || !e.message) throw e;
   if (e.message.includes('403')) throw makeEnoent(p);
@@ -176,6 +185,11 @@ function patchFs(fakeRoot, port, token) {
 
   fs.existsSync = function patchedExistsSync(p) {
     const s = abs(p);
+    // On Windows, pi checks for bash locally before using the shell tool.
+    // The check never reaches our SSH bridge (it's just an existsSync call).
+    // Fake it so pi believes bash is available; the actual spawn is intercepted
+    // and the Windows exe path is normalised to 'bash' before going over SSH.
+    if (process.platform === 'win32' && isBashPath(s)) return true;
     if (!s || !isFakePath(s, fakeRoot)) return orig.existsSync(p);
     try {
       return httpGet(port, token, '/exists?path=' + encodeURIComponent(rpath(s))).trim() === '1';