vibelet 1.0.9 → 1.0.11

package/bin/vibelet.mjs

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
 import { spawn, spawnSync } from 'node:child_process';
-import { cpSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync, openSync, writeSync } from 'node:fs';
+import { cpSync, existsSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, statSync, writeFileSync, openSync, writeSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { basename, delimiter, dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import QRCode from 'qrcode';
 import { extractQuickTunnelUrl } from './cloudflared-quick-tunnel.mjs';
@@ -218,6 +218,75 @@ function isProcessAlive(pid) {
   }
 }
 
+// ─── Service PATH helpers ──────────────────────────────────────────────────────
+
+// Transient shims like fnm_multishells/<pid>/bin disappear or get GC'd after the
+// shell that created them exits. Long-lived services (launchd, systemd) that
+// inherit these paths end up spawning wrapper scripts whose `exec node` fails
+// with "node: not found". Stabilize to the underlying stable dir/file.
+function isTransientNodePath(p) {
+  return typeof p === 'string' && p.includes('fnm_multishells');
+}
+
+function stabilizeServiceFile(p) {
+  if (!p || !isTransientNodePath(p)) return p;
+  try {
+    const stable = join(realpathSync(dirname(p)), basename(p));
+    if (existsSync(stable) && !isTransientNodePath(stable)) return stable;
+  } catch { /* broken symlink */ }
+  return p;
+}
+
+function stabilizeServiceDir(dir) {
+  if (!dir || !isTransientNodePath(dir)) return dir;
+  try {
+    const real = realpathSync(dir);
+    if (real && !isTransientNodePath(real)) return real;
+  } catch { /* broken symlink */ }
+  return dir;
+}
+
+// Build a PATH the daemon can rely on under launchd/systemd, where no login
+// shell ran and no rc files loaded. Puts the node bin dir first so wrapper
+// scripts spawned by the daemon (codex, claude) can resolve `node` via PATH,
+// then falls back to common system and user-tool locations.
+function buildServicePath(nodeBinDir) {
+  const home = homedir();
+  const pnpmHome = process.env.PNPM_HOME
+    || (process.platform === 'win32' ? join(home, 'pnpm') : join(home, 'Library', 'pnpm'));
+  const baseline = process.platform === 'win32'
+    ? [
+        nodeBinDir,
+        join(home, '.npm-global', 'bin'),
+        join(home, '.local', 'bin'),
+        join(home, '.claude', 'bin'),
+        pnpmHome,
+      ]
+    : [
+        nodeBinDir,
+        '/usr/local/bin',
+        '/opt/homebrew/bin',
+        '/usr/bin',
+        '/bin',
+        '/usr/sbin',
+        '/sbin',
+        join(home, '.npm-global', 'bin'),
+        join(home, '.local', 'bin'),
+        join(home, '.claude', 'bin'),
+        pnpmHome,
+      ];
+  const current = (process.env.PATH || '')
+    .split(delimiter)
+    .filter(Boolean)
+    .map(stabilizeServiceDir);
+  const out = [];
+  const seen = new Set();
+  for (const p of [...baseline, ...current]) {
+    if (p && !seen.has(p)) { out.push(p); seen.add(p); }
+  }
+  return out.join(delimiter);
+}
+
 // ─── Platform service backends ──────────────────────────────────────────────────
 
 function createDarwinBackend() {
@@ -232,15 +301,25 @@ function createDarwinBackend() {
   }
 
   function plistContents() {
+    // Prefer a stable node path — fnm_multishells shims disappear when the
+    // installing shell exits, leaving launchd unable to respawn the daemon.
+    const nodeBin = stabilizeServiceFile(process.execPath);
     const programArgs = [
-      process.execPath,
+      nodeBin,
       runtimeDaemonEntryPath,
     ].map((value) => `      <string>${value}</string>`).join('\n');
 
-    const envVars = { VIBE_PORT: String(port) };
+    // launchd starts the daemon with a bare PATH; inject a rich one so child
+    // CLIs like codex (a sh wrapper that does `exec node`) can find node.
+    const envVars = {
+      PATH: buildServicePath(dirname(nodeBin)),
+      VIBE_PORT: String(port),
+    };
     if (process.env.VIBELET_RELAY_URL) envVars.VIBELET_RELAY_URL = process.env.VIBELET_RELAY_URL;
     if (process.env.VIBELET_CANONICAL_HOST) envVars.VIBELET_CANONICAL_HOST = process.env.VIBELET_CANONICAL_HOST;
     if (process.env.VIBELET_FALLBACK_HOSTS) envVars.VIBELET_FALLBACK_HOSTS = process.env.VIBELET_FALLBACK_HOSTS;
+    if (process.env.CODEX_PATH) envVars.CODEX_PATH = process.env.CODEX_PATH;
+    if (process.env.CLAUDE_PATH) envVars.CLAUDE_PATH = process.env.CLAUDE_PATH;
     const envSection = Object.keys(envVars).length > 0
       ? `    <key>EnvironmentVariables</key>
     <dict>
@@ -313,8 +392,15 @@ ${envSection}
     },
 
     stop() {
-      if (this.isServiceInstalled()) {
-        launchctl(['bootout', `${launchDomain}/${label}`]);
+      if (!this.isServiceInstalled()) return;
+      launchctl(['bootout', `${launchDomain}/${label}`]);
+      // bootout returns before launchd actually finishes unloading. Poll
+      // until the service is gone so a follow-up install() doesn't see a
+      // stale registration, skip bootstrap, and leave the daemon down.
+      const deadline = Date.now() + 5000;
+      const wait = new Int32Array(new SharedArrayBuffer(4));
+      while (Date.now() < deadline && this.isServiceInstalled()) {
+        Atomics.wait(wait, 0, 0, 100);
       }
     },
 
@@ -338,17 +424,20 @@ function createLinuxBackend() {
   }
 
   function unitContents() {
+    const nodeBin = stabilizeServiceFile(process.execPath);
+    const servicePath = buildServicePath(dirname(nodeBin));
     return `[Unit]
 Description=Vibelet Daemon
 After=network.target
 
 [Service]
-ExecStart=${process.execPath} ${runtimeDaemonEntryPath}
+ExecStart=${nodeBin} ${runtimeDaemonEntryPath}
 WorkingDirectory=${runtimeCurrentDir}
 Restart=always
 RestartSec=3
 StandardOutput=append:${stdoutLogPath}
 StandardError=append:${stderrLogPath}
+Environment=PATH=${servicePath}
 Environment=VIBE_PORT=${port}${process.env.VIBELET_RELAY_URL ? `\nEnvironment=VIBELET_RELAY_URL=${process.env.VIBELET_RELAY_URL}` : ''}${process.env.VIBELET_CANONICAL_HOST ? `\nEnvironment=VIBELET_CANONICAL_HOST=${process.env.VIBELET_CANONICAL_HOST}` : ''}${process.env.VIBELET_FALLBACK_HOSTS ? `\nEnvironment=VIBELET_FALLBACK_HOSTS=${process.env.VIBELET_FALLBACK_HOSTS}` : ''}
 
 [Install]
@@ -547,7 +636,7 @@ async function waitForDaemonExit(timeoutMs) {
   return false;
 }
 
-async function waitForHealth(timeoutMs = 10_000) {
+async function waitForHealth(timeoutMs = 30_000) {
   const health = await probeHealth(timeoutMs);
   if (health) {
     return health;