@remcp/remcp 0.2.53 → 0.2.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remcp/remcp",
-  "version": "0.2.53",
+  "version": "0.2.55",
   "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/cli/service.mjs

@@ -29,9 +29,92 @@ export function npmGlobalInstall(...specs) {
   run(npm.command, [...npm.args, 'install', '--global', ...specs, '--no-audit', '--no-fund', '--loglevel=error']);
 }
 
-export function npmGlobalInstallForNode(nodePath, ...specs) {
+function pathEntryExists(file) {
+  try {
+    fs.lstatSync(file);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function globalPackagePath(prefix, packageName) {
+  const name = String(packageName || '').trim();
+  const parts = name.split('/');
+  const validUnscoped = parts.length === 1 && parts[0] && !parts[0].startsWith('@') && parts[0] !== '.' && parts[0] !== '..';
+  const validScoped = parts.length === 2 && /^@[^/]+$/.test(parts[0]) && parts[1] && parts[1] !== '.' && parts[1] !== '..';
+  if (!validUnscoped && !validScoped) throw new Error(`Invalid npm package name for update: ${name || '(empty)'}`);
+  return path.join(prefix, 'lib', 'node_modules', ...parts);
+}
+
+function transactionalMacGlobalInstall({ resolved, prefix, packageNames, specs }) {
+  prefix = String(prefix || '').trim();
+  if (!path.isAbsolute(prefix)) throw new Error(`npm global prefix must be absolute for a macOS update: ${prefix || '(empty)'}`);
+  const backupRoot = path.join(prefix, `.remcp-update-backup-${process.pid}-${Date.now()}`);
+  const moved = [];
+  const moveAside = (source, label) => {
+    if (!pathEntryExists(source)) return;
+    const backup = path.join(backupRoot, label);
+    fs.renameSync(source, backup);
+    moved.push({ source, backup });
+  };
+  const restore = originalError => {
+    let rollbackError = null;
+    for (const item of [...moved].reverse()) {
+      try {
+        if (pathEntryExists(item.source)) fs.rmSync(item.source, { recursive:true, force:true });
+        fs.mkdirSync(path.dirname(item.source), { recursive:true });
+        fs.renameSync(item.backup, item.source);
+      } catch (error) {
+        rollbackError ??= error;
+      }
+    }
+    try { fs.rmSync(backupRoot, { recursive:true, force:true }); } catch (error) { rollbackError ??= error; }
+    if (rollbackError) {
+      throw new Error(
+        `ReMCP update failed and the previous macOS installation could not be fully restored: ${rollbackError instanceof Error ? rollbackError.message : String(rollbackError)}`,
+        { cause:originalError },
+      );
+    }
+  };
+
+  fs.mkdirSync(prefix, { recursive:true });
+  fs.mkdirSync(backupRoot, { recursive:false, mode:0o700 });
+  try {
+    const uniqueNames = [...new Set(packageNames.map(name => String(name || '').trim()).filter(Boolean))];
+    uniqueNames.forEach((name, index) => moveAside(globalPackagePath(prefix, name), `package-${index}`));
+    if (uniqueNames.includes(PACKAGE_NAME)) moveAside(path.join(prefix, 'bin', 'remcp'), 'bin-remcp');
+
+    run(resolved.command, [...resolved.args, 'install', '--global', ...specs, '--no-audit', '--no-fund', '--loglevel=error']);
+  } catch (error) {
+    restore(error);
+    throw error;
+  }
+
+  try {
+    fs.rmSync(backupRoot, { recursive:true, force:true });
+  } catch (error) {
+    console.error(`ReMCP update: could not remove macOS rollback backup ${backupRoot}: ${error instanceof Error ? error.message : String(error)}`);
+  }
+}
+
+export function npmGlobalUpdate(packageNames, ...specs) {
+  if (servicePlatform() !== 'darwin') {
+    npmGlobalInstall(...specs);
+    return;
+  }
+  const prefix = globalPrefix();
+  transactionalMacGlobalInstall({ resolved:npm, prefix, packageNames, specs });
+}
+
+export function npmGlobalUpdateForNode(nodePath, packageNames, ...specs) {
   const resolved = resolveNpm({ nodePath, home, platform:servicePlatform() });
-  run(resolved.command, [...resolved.args, 'install', '--global', ...specs, '--no-audit', '--no-fund', '--loglevel=error']);
+  if (servicePlatform() !== 'darwin') {
+    run(resolved.command, [...resolved.args, 'install', '--global', ...specs, '--no-audit', '--no-fund', '--loglevel=error']);
+    return;
+  }
+  const prefix = output(resolved.command, [...resolved.args, 'prefix', '--global']);
+  transactionalMacGlobalInstall({ resolved, prefix, packageNames, specs });
 }
 
 export function quoteSystemd(value) {
@@ -337,7 +420,7 @@ export function syncKnownInstallations(config, ...specs) {
     seen.add(resolvedNode);
     const required = Boolean(candidate?.service) || resolvedNode === serviceInfo.nodePath;
     try {
-      npmGlobalInstallForNode(resolvedNode, ...specs);
+      npmGlobalUpdateForNode(resolvedNode, [PACKAGE_NAME, config.runtime.packageName], ...specs);
       results.push({ nodePath:resolvedNode, ok:true, required });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -414,11 +497,12 @@ export function installPersistentAgent(config) {
 // (a failed install, a cleaned LaunchAgents directory, a re-imaged user), the next update recreates
 // it instead of leaving a hand-over to a process nobody supervises.
 export function ensureServiceIfRecorded(config) {
-  if (!persistentServiceExpected(config)) return false;
+  if (!persistentServiceExpected(config)) return null;
   try {
     const cliPath = canonicalServiceCliPath(config);
     const nodePath = canonicalServiceNodePath(config);
     const platform = servicePlatform();
+    let restartScheduled = null;
     if (platform === 'linux') {
       if (!fs.existsSync(linuxServiceFile)) {
         installLinuxService(cliPath, nodePath);
@@ -445,7 +529,8 @@ export function ensureServiceIfRecorded(config) {
       // boot out a loaded agent inline: this updater may itself be a descendant of that LaunchAgent.
       // installMacService either leaves an unchanged loaded job alone, bootstraps an unloaded job, or
       // hands a changed launcher to an independent transient launchd helper.
-      installMacService(cliPath, { restart: false, nodePath });
+      const state = installMacService(cliPath, { restart: false, nodePath });
+      if (state === 'reload-scheduled') restartScheduled = macServiceLabel;
     } else if (platform === 'win32') installWindowsService(cliPath);
     // Upgrade the legacy inferred state only after the supervisor repair succeeded. A failed repair
     // must not turn a stale artifact into a permanent "managed service" declaration.
@@ -453,10 +538,10 @@ export function ensureServiceIfRecorded(config) {
     if (config?.serviceInstalled !== true || config?.serviceCliPath !== cliScript || config?.serviceNodePath !== nodePath) {
       saveConfig({ ...config, serviceInstalled: true, serviceCliPath: cliScript, serviceNodePath: nodePath });
     }
-    return true;
+    return restartScheduled;
   } catch (error) {
     console.error(`Could not ensure the background service: ${error instanceof Error ? error.message : String(error)}`);
-    return false;
+    return null;
   }
 }
 

package/src/cli/update.mjs

@@ -11,7 +11,7 @@ import { PACKAGE_NAME, VERSION } from '../version.mjs';
 import { loadConfig, saveConfig } from './config.mjs';
 import { installedVersion } from './doctor.mjs';
 import { linuxServiceFile, macServiceFile, officialOrigin } from './env.mjs';
-import { currentInstallationInfo, ensureServiceIfRecorded, installationVersionsAtCliPath, npmGlobalInstall, persistentServiceExpected, rememberCurrentInstallation, restartPersistentServiceIfInstalled, serviceInstallationInfo, syncKnownInstallations } from './service.mjs';
+import { currentInstallationInfo, ensureServiceIfRecorded, installationVersionsAtCliPath, npmGlobalUpdate, persistentServiceExpected, rememberCurrentInstallation, restartPersistentServiceIfInstalled, serviceInstallationInfo, syncKnownInstallations } from './service.mjs';
 
 const UPDATE_DISCOVERY_TIMEOUT_MS = 5000;
 
@@ -242,7 +242,7 @@ export async function updateCommand(flags) {
 
   const before = { cli: VERSION, runtime: installedVersion(cfg.runtime.packageName) };
   console.log(`Updating ReMCP to ${targets.clientSpec} with ${targets.runtimeSpec}…`);
-  npmGlobalInstall(targets.clientSpec, targets.runtimeSpec);
+  npmGlobalUpdate([PACKAGE_NAME, cfg.runtime.packageName], targets.clientSpec, targets.runtimeSpec);
 
   // Converge every ReMCP installation this account has actually used on this machine. The canonical
   // service installation is mandatory; secondary nvm/Hermes/Homebrew copies are best-effort and
@@ -258,10 +258,13 @@ export async function updateCommand(flags) {
     saveConfig({ ...cfg, runtime:{ ...cfg.runtime, packageSpec:targets.runtimeSpec } });
     cfg = loadConfig();
   }
-  ensureServiceIfRecorded(cfg);
+  const restartAlreadyScheduled = ensureServiceIfRecorded(cfg);
   cfg = loadConfig();
   const after = { cli: installedVersion(PACKAGE_NAME), runtime: installedVersion(cfg.runtime.packageName) };
-  const restarted = restartPersistentServiceIfInstalled(cfg);
+  // A changed macOS plist is reloaded by an independent launchd helper. Do not schedule a second
+  // helper against the same job: two one-second handoffs can race bootout/bootstrap with kickstart
+  // and leave the device offline even though npm installed the new release successfully.
+  const restarted = restartAlreadyScheduled || restartPersistentServiceIfInstalled(cfg);
   if (restarted) {
     console.log(`ReMCP updated and ${restarted} restarted (client ${before.cli} → ${after.cli ?? '?'}, runtime ${before.runtime ?? '?'} → ${after.runtime ?? '?'}).`);
     return;