@remcp/remcp 0.2.45 → 0.2.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remcp/remcp",
-  "version": "0.2.45",
+  "version": "0.2.47",
   "description": "ReMCP device client: pair a computer with ReMCP and run the outbound-only agent that hosts the local MCP runtime.",
   "type": "module",
   "license": "MIT",

package/src/agent.mjs

@@ -286,6 +286,15 @@ export async function runAgent(options) {
         // Service access is a user-controlled pause, not an outage. Poll slowly enough not to hammer
         // the relay, but cap recovery so an enable action becomes effective within seconds.
         scheduleReconnect(jitter(RECONNECT_BASE_MS));
+        return;
+      }
+      const status = Number(response.statusCode || 0);
+      const transientHandshakeFailure = status === 408 || status === 425 || status === 429 || (status >= 500 && status <= 599);
+      if (transientHandshakeFailure && !revoked) {
+        // A reverse proxy or relay deploy can refuse the HTTP upgrade before a WebSocket exists.
+        // With an unexpected-response listener the client does not reliably emit close afterwards,
+        // so this branch must schedule its own retry or a still-running agent can stay offline forever.
+        scheduleBackoffReconnect();
       }
     });
     activeSocket = ws;

package/src/cli/env.mjs

@@ -11,6 +11,7 @@ export const configFile = path.join(configDir, 'config.json');
 export const runtimeConfigFile = path.join(configDir, 'runtime.json');
 export const machineIdFile = path.join(configDir, 'machine-id');
 export const linuxServiceFile = path.join(home, '.config', 'systemd', 'user', 'remcp-agent.service');
+export const linuxServiceLauncherFile = path.join(configDir, 'remcp-agent-launcher');
 export const macServiceLabel = 'com.remcp.agent';
 export const macServiceFile = path.join(home, 'Library', 'LaunchAgents', `${macServiceLabel}.plist`);
 export const macLogFile = path.join(home, 'Library', 'Logs', 'remcp-agent.log');

package/src/cli/service.mjs

@@ -8,7 +8,7 @@ import { spawnSync } from 'node:child_process';
 import { PACKAGE_NAME, VERSION } from '../version.mjs';
 
 import { saveConfig } from './config.mjs';
-import { configDir, home, linuxServiceFile, macLogFile, macServiceFile, macServiceLabel, npm, windowsTaskName } from './env.mjs';
+import { configDir, home, linuxServiceFile, linuxServiceLauncherFile, macLogFile, macServiceFile, macServiceLabel, npm, windowsTaskName } from './env.mjs';
 import { output, run } from './shell.mjs';
 
 export function servicePlatform() {
@@ -32,12 +32,28 @@ export function quoteSystemd(value) {
   return `"${String(value).replaceAll('\\', '\\\\').replaceAll('"', '\\"')}"`;
 }
 
+function resolvedCliScript(cliPath) {
+  return fs.existsSync(cliPath) ? fs.realpathSync(cliPath) : path.resolve(cliPath);
+}
+
+function writeLinuxServiceLauncher(cliPath = globalCliPath()) {
+  const cliScript = resolvedCliScript(cliPath);
+  const launcher = `#!/bin/sh\nexec ${shellQuote(process.execPath)} ${shellQuote(cliScript)} \"$@\"\n`;
+  fs.mkdirSync(path.dirname(linuxServiceLauncherFile), { recursive: true, mode: 0o700 });
+  const temporary = `${linuxServiceLauncherFile}.${process.pid}.${Date.now()}.tmp`;
+  fs.writeFileSync(temporary, launcher, { mode: 0o700 });
+  fs.chmodSync(temporary, 0o700);
+  fs.renameSync(temporary, linuxServiceLauncherFile);
+  return linuxServiceLauncherFile;
+}
+
 export function xmlEscape(value) {
   return String(value).replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;').replaceAll('"', '&quot;').replaceAll("'", '&apos;');
 }
 
 export function installLinuxService(cliPath = globalCliPath()) {
-  const unit = `[Unit]\nDescription=ReMCP device agent\nAfter=network-online.target\nWants=network-online.target\n\n[Service]\nType=simple\nExecStart=${quoteSystemd(cliPath)} start\nRestart=always\nRestartSec=3\nNoNewPrivileges=true\n\n[Install]\nWantedBy=default.target\n`;
+  const launcherFile = writeLinuxServiceLauncher(cliPath);
+  const unit = `[Unit]\nDescription=ReMCP device agent\nAfter=network-online.target\nWants=network-online.target\n\n[Service]\nType=simple\nExecStart=${quoteSystemd(launcherFile)} start\nRestart=always\nRestartSec=3\nNoNewPrivileges=true\n\n[Install]\nWantedBy=default.target\n`;
   fs.mkdirSync(path.dirname(linuxServiceFile), { recursive: true });
   fs.writeFileSync(linuxServiceFile, unit);
   run('systemctl', ['--user', 'daemon-reload']);
@@ -65,23 +81,41 @@ function macJobLoaded(target) {
   return spawnSync('launchctl', ['print', target], { stdio: 'ignore' }).status === 0;
 }
 
-function scheduleMacServiceReload(domain, target) {
+function submitMacHelper(kind, lines) {
   fs.mkdirSync(configDir, { recursive: true, mode: 0o700 });
-  const helperFile = path.join(configDir, `launchd-reload-${process.pid}.sh`);
-  const helperLabel = `${macServiceLabel}.reload.${process.pid}`;
+  const nonce = `${process.pid}.${Date.now()}`;
+  const helperFile = path.join(configDir, `launchd-${kind}-${nonce}.sh`);
+  const helperLabel = `${macServiceLabel}.${kind}.${nonce}`;
   const script = [
     '#!/bin/sh',
     'sleep 1',
-    `launchctl bootout ${shellQuote(target)} >/dev/null 2>&1 || true`,
-    `launchctl bootstrap ${shellQuote(domain)} ${shellQuote(macServiceFile)}`,
-    `launchctl enable ${shellQuote(target)}`,
-    `launchctl kickstart -k ${shellQuote(target)}`,
+    'status=0',
+    ...lines.map(line => `${line} || status=$?`),
+    `if [ "$status" -ne 0 ]; then echo "ReMCP launchd ${kind} helper failed with status $status" >> ${shellQuote(macLogFile)}; fi`,
     `rm -f ${shellQuote(helperFile)}`,
+    `launchctl remove ${shellQuote(helperLabel)} >/dev/null 2>&1 || true`,
+    'exit 0',
     '',
   ].join('\n');
   fs.writeFileSync(helperFile, script, { mode: 0o700 });
   fs.chmodSync(helperFile, 0o700);
   run('launchctl', ['submit', '-l', helperLabel, '--', '/bin/sh', helperFile]);
+  return helperLabel;
+}
+
+function scheduleMacServiceReload(domain, target) {
+  return submitMacHelper('reload', [
+    `launchctl bootout ${shellQuote(target)} >/dev/null 2>&1 || true`,
+    `launchctl bootstrap ${shellQuote(domain)} ${shellQuote(macServiceFile)}`,
+    `launchctl enable ${shellQuote(target)}`,
+    `launchctl kickstart -k ${shellQuote(target)}`,
+  ]);
+}
+
+function scheduleMacServiceRestart(target) {
+  return submitMacHelper('restart', [
+    `launchctl kickstart -k ${shellQuote(target)}`,
+  ]);
 }
 
 export function installMacService(cliPath = globalCliPath(), { restart = true } = {}) {
@@ -211,17 +245,16 @@ export function ensureServiceIfRecorded(config) {
       if (!fs.existsSync(linuxServiceFile)) {
         installLinuxService(cliPath);
       } else {
-        // Node managers can move the global npm prefix between updates (nvm -> Hermes was observed in
-        // production). An existing systemd unit then keeps launching the old CLI forever even though
-        // npm successfully installed the new one. Repair the launcher in place before restarting it.
+        // Keep the systemd unit independent of nvm/Hermes/Homebrew prefixes. Only this small launcher
+        // changes when npm or Node moves, so every install converges on one supervisor entrypoint.
+        const launcherFile = writeLinuxServiceLauncher(cliPath);
         const unit = fs.readFileSync(linuxServiceFile, 'utf8');
-        const expected = `ExecStart=${quoteSystemd(cliPath)} start`;
+        const expected = `ExecStart=${quoteSystemd(launcherFile)} start`;
         if (!unit.includes(expected)) {
           const repaired = /^ExecStart=/m.test(unit) ? unit.replace(/^ExecStart=.*$/m, expected) : '';
           if (!repaired) {
-            // A unit that lost its ExecStart line (edited by hand, or written as `ExecStart = …`) cannot
-            // be patched by substitution. Rewriting the whole unit is what keeps the machine out of the
-            // "old CLI forever" loop, so fall back to a fresh install instead of giving up.
+            // A hand-edited unit with no launcher line is replaced wholesale; the stable launcher is
+            // still refreshed first so the replacement never points back at a retired Node manager.
             installLinuxService(cliPath);
           } else {
             fs.writeFileSync(linuxServiceFile, repaired);
@@ -255,12 +288,14 @@ export function restartPersistentServiceIfInstalled(config) {
     return 'remcp-agent.service';
   }
   if (platform === 'darwin' && fs.existsSync(macServiceFile)) {
-    try {
-      run('launchctl', ['kickstart', '-k', `${macLaunchDomain()}/${macServiceLabel}`]);
-    } catch {
+    const target = `${macLaunchDomain()}/${macServiceLabel}`;
+    if (macJobLoaded(target)) {
+      // Never kill a loaded LaunchAgent inline: the caller may itself be a child of that job.
+      // A transient helper survives the handoff and performs the restart after this CLI returns.
+      scheduleMacServiceRestart(target);
+    } else {
       // A plist can survive while launchd has no loaded job (older installs, logout/login cleanup,
-      // manual bootout, or a failed previous update). Re-register the job instead of surfacing the
-      // opaque launchctl 113 error. installMacService is idempotent and rewrites stale Node paths too.
+      // manual bootout, or a failed previous update). Re-register it directly.
       installMacService(globalCliPath());
     }
     return macServiceLabel;