pi-bridge 0.2.7 → 0.2.8

package/README.md

@@ -52,7 +52,7 @@ pii (bin/pii.js)
        │    → prints PORT:TOKEN:PID to stdout
        ├─ SSH port forward localhost:PORT
        ├─ create fake local dir:
-       │    /tmp/pi-bridge/root/projects/my-app
+       │    <home>/.pi-bridge/myserver/root/projects/my-app
        ├─ process.chdir(fakeLocalCwd)
        ├─ strip --ssh from process.argv
        ├─ patch fs.*  (sync + promises)     remote/index.js
@@ -67,6 +67,8 @@ pi loads — unaware of bridge               restricts to remoteCwd
   → git branch in footer ✓
 ```
 
+The fake local directory lives under `<home>/.pi-bridge/<remote>/` (not the OS temp directory) so it survives reboots and pi can always resume sessions correctly. On Windows this is `%USERPROFILE%\.pi-bridge\`; on macOS/Linux it is `~/.pi-bridge/`.
+
 ## What Gets Patched
 
 | API | Covered |
@@ -77,6 +79,8 @@ pi loads — unaware of bridge               restricts to remoteCwd
 | `child_process.spawn` / `spawnSync` — runs in remote cwd via SSH | ✓ |
 | `fs.watch` / `fs.watchFile` — polls remote via HTTP (git branch updates) | ✓ |
 
+`node`, `pi`, and `pii` spawns are always kept local — they need internet access and must never be redirected over SSH.
+
 ## Security
 
 | Layer | Protection |
@@ -117,7 +121,7 @@ Host myserver
 ```
 
 **Files show as empty / ENOENT**
-The fake local directory (`/tmp/pi-bridge/…`) is intentionally empty — all reads go to the remote. If you see ENOENT, the bridge may not have started correctly. Check that Node.js is available on the remote (`node --version`).
+The fake local directory (`<home>/.pi-bridge/<remote>/…`) is intentionally empty — all reads go to the remote. If you see ENOENT, the bridge may not have started correctly. Check that Node.js is available on the remote (`node --version`).
 
 **Branch name not updating**
 The footer polls `.git` every second. Switching branches from outside a pi session is reflected within ~1s. If the branch is stuck, restart `pii`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-bridge",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "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

@@ -47,7 +47,7 @@ function patchChildProcess(fakeRoot, remote) {
    */
   function isLocalOnly(file) {
     const name = normalizeCmd(file).toLowerCase();
-    return name === 'node';
+    return name === 'node' || name === 'pi' || name === 'pii';
   }
 
   /**

package/src/local/fake-dir.js

@@ -4,21 +4,37 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
+// Capture rmSync before any monkey-patching so cleanup always hits the local
+// filesystem rather than being redirected through the SSH bridge.
+const origRmSync = fs.rmSync.bind(fs);
+
+/**
+ * Sanitise an SSH target string (user@host or alias) into a safe dir name.
+ */
+function sanitizeRemote(remote) {
+  return remote.replace(/[^a-zA-Z0-9._-]/g, '_');
+}
+
 /**
  * Create the fake local directory skeleton for the given remote path.
- * The structure mirrors the remote path so that path-mapper can convert
- * between fake local paths and remote paths deterministically.
+ *
+ * The directory lives under ~/.pi-bridge/<remote>/ rather than the OS temp
+ * directory so it survives reboots — this prevents pi's session-cwd check
+ * from failing when it tries to resume a previous session whose cwd points
+ * at a directory that was cleaned up between runs.
  *
  * Example:
+ *   remote    = 'myserver'
  *   remoteCwd = '/root/project-x'
- *   fakeRoot  = '/tmp/pi-bridge'
- *   fakeLocalCwd = '/tmp/pi-bridge/root/project-x'
+ *   fakeRoot  = '~/.pi-bridge/myserver'
+ *   fakeLocalCwd = '~/.pi-bridge/myserver/root/project-x'
  *
+ * @param {string} remote    - SSH target, e.g. 'user@host' or alias
  * @param {string} remoteCwd - Absolute remote path, e.g. '/root/project-x'
  * @returns {{ fakeRoot: string, fakeLocalCwd: string }}
  */
-function createFakeDir(remoteCwd) {
-  const fakeRootRaw = path.join(os.tmpdir(), 'pi-bridge');
+function createFakeDir(remote, remoteCwd) {
+  const fakeRootRaw = path.join(os.homedir(), '.pi-bridge', sanitizeRemote(remote));
 
   // Build the local mirror path from the remote path segments
   const segments = remoteCwd.split('/').filter(Boolean);
@@ -36,13 +52,14 @@ function createFakeDir(remoteCwd) {
 
 /**
  * Remove the fake root directory and all its contents.
- * Safe to call even if the directory does not exist.
+ * Uses the captured original rmSync to ensure the local directory is removed
+ * even when this is called after fs has been monkey-patched by the bridge.
  *
  * @param {string} fakeRoot - Path returned by createFakeDir
  */
 function removeFakeDir(fakeRoot) {
   try {
-    fs.rmSync(fakeRoot, { recursive: true, force: true });
+    origRmSync(fakeRoot, { recursive: true, force: true });
   } catch (_) {
     // Best-effort removal — do not throw during cleanup
   }

package/src/local/preload.js

@@ -57,7 +57,7 @@ try {
 const { port, token, sessionId, remotePid } = config;
 
 // --- Step 3: Create fake local directory ---
-const { fakeRoot, fakeLocalCwd } = createFakeDir(remoteCwd);
+const { fakeRoot, fakeLocalCwd } = createFakeDir(remote, remoteCwd);
 
 // --- Step 4: Change working directory to fake local cwd ---
 process.chdir(fakeLocalCwd);