@remcp/remcp 0.2.238 → 0.2.240

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remcp/remcp",
-  "version": "0.2.238",
+  "version": "0.2.240",
   "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-inventory.mjs

@@ -29,7 +29,7 @@ export function persistentServiceState(config) {
     const system = linuxSystemAgentOwned();
     const installed = system || fs.existsSync(linuxServiceFile);
     const active = installed && spawnSync('systemctl', [...(system ? [] : ['--user']), 'is-active', '--quiet', 'remcp-agent.service'], { stdio: 'ignore' }).status === 0;
-    return { expected, installed, active, manager:system ? 'systemd-system' : 'systemd-user', name:'remcp-agent.service' };
+    return { expected, installed, active, manager:installed ? (system ? 'systemd-system' : 'systemd-user') : 'none', name:'remcp-agent.service' };
   }
   if (platform === 'darwin') {
     const installed = fs.existsSync(macServiceFile);

package/src/cli/service-linux.mjs

@@ -19,6 +19,76 @@ export function isManagedLinuxSystemUnit(text, launcher = linuxServiceLauncherFi
   return text.split(/\r?\n/).some(line => expected.has(line.trim()));
 }
 
+// Discover BOTH supervisors before uninstalling either. A PID-1 migration may
+// leave a disabled historical user unit behind; removing only the active scope
+// makes status incorrectly report an installed service after uninstall.
+export function discoverOwnedLinuxUnits({
+  systemFile = linuxSystemServiceFile,
+  userFile = linuxServiceFile,
+  launcher = linuxServiceLauncherFile,
+  includeSystem = process.getuid?.() === 0,
+} = {}) {
+  const candidates = [
+    ...(includeSystem ? [{ scope:'system', file:systemFile }] : []),
+    { scope:'user', file:userFile },
+  ];
+  const found = [];
+  for (const unit of candidates) {
+    let stat;
+    try { stat = fs.lstatSync(unit.file); }
+    catch (error) {
+      if (error?.code === 'ENOENT') continue;
+      throw error;
+    }
+    if (!stat.isFile() || stat.isSymbolicLink() ||
+        !isManagedLinuxSystemUnit(fs.readFileSync(unit.file, 'utf8'), launcher)) {
+      throw new Error('Refusing to uninstall an unrecognized ReMCP systemd unit: ' + unit.file);
+    }
+    found.push(unit);
+  }
+  return found;
+}
+
+// Stop and remove all owned scopes, not just the newest one. Require the
+// stop and daemon-reload to succeed; never claim success after a failed stop.
+export function uninstallOwnedLinuxUnits({
+  systemFile = linuxSystemServiceFile,
+  userFile = linuxServiceFile,
+  launcher = linuxServiceLauncherFile,
+  includeSystem = process.getuid?.() === 0,
+  runner = spawnSync,
+} = {}) {
+  const units = discoverOwnedLinuxUnits({ systemFile, userFile, launcher, includeSystem });
+  for (const { scope, file } of units) {
+    const option = scope === 'user' ? ['--user'] : [];
+    const stop = runner('systemctl', [...option, 'disable', '--now', 'remcp-agent.service'],
+      { encoding:'utf8', timeout:20000 });
+    if (stop.status !== 0) {
+      throw new Error('Failed to stop ReMCP ' + scope +
+        ' systemd service; refusing to report a successful uninstall');
+    }
+    const active = runner('systemctl', [...option, 'is-active', '--quiet', 'remcp-agent.service'],
+      { stdio:'ignore', timeout:10000 });
+    if (active.status === 0) {
+      throw new Error('ReMCP ' + scope + ' systemd service remains active after stop');
+    }
+    // Another actor must not replace an owned unit with a symlink or foreign
+    // content between discovery and removal.
+    const stat = fs.lstatSync(file);
+    if (!stat.isFile() || stat.isSymbolicLink() ||
+        !isManagedLinuxSystemUnit(fs.readFileSync(file, 'utf8'), launcher)) {
+      throw new Error('ReMCP systemd unit changed during uninstall: ' + file);
+    }
+    fs.unlinkSync(file);
+    const reload = runner('systemctl', [...option, 'daemon-reload'],
+      { encoding:'utf8', timeout:20000 });
+    if (reload.status !== 0) {
+      throw new Error('Failed to reload ' + scope + ' systemd after removing ReMCP service');
+    }
+  }
+  return units.map(unit => unit.scope);
+}
+
 export function linuxSystemAgentOwned() {
   if (process.platform !== 'linux' || process.getuid?.() !== 0) return false;
   try {
@@ -40,13 +110,16 @@ export function linuxActiveServiceFile() {
 // even if systemctl --user enable --now reported success.
 export function ensureLinuxLinger() {
   if (process.platform !== 'linux') return;
-  // Tests isolate HOME in a temporary fixture. Never mutate the real host's loginctl
-  // configuration on behalf of that synthetic service installation.
-  if (path.resolve(home) !== path.resolve(os.userInfo().homedir)) {
-    if (process.env.NODE_ENV === 'test') return;
+  // Test-only synthetic HOME has no logind account and must never mutate the host.
+  // Guard before os.userInfo(): an isolated CI UID may not have a passwd entry.
+  if (process.env.NODE_ENV === 'test' && process.env.REMCP_TEST_PLATFORM === 'linux') return;
+  let account;
+  try { account = os.userInfo(); }
+  catch { throw new Error('ReMCP cannot resolve the current Linux account for persistent systemd supervision.'); }
+  if (path.resolve(home) !== path.resolve(account.homedir)) {
     throw new Error('Refusing a persistent Linux service with HOME different from the account home directory.');
   }
-  const username = os.userInfo().username;
+  const username = account.username;
   const query = () => spawnSync('loginctl', ['show-user', username, '-p', 'Linger', '--value'],
     { encoding:'utf8', timeout:10000 });
   let state = query();

package/src/cli/service.mjs

@@ -18,7 +18,7 @@ import { PACKAGE_NAME, VERSION } from '../version.mjs';
 import { saveConfig } from './config.mjs';
 import { configDir, home, linuxServiceFile, linuxServiceLauncherFile, macServiceFile, macServiceLabel, windowsServiceLauncherFile, windowsStartupScriptFile, windowsTaskName } from './env.mjs';
 import { run } from './shell.mjs';
-import { linuxActiveServiceFile, linuxServiceScope, linuxSystemAgentOwned, linuxSystemServiceFile, ensureLinuxLinger, ensureLinuxCliCommand } from './service-linux.mjs';
+import { linuxActiveServiceFile, linuxServiceScope, linuxSystemAgentOwned, linuxSystemServiceFile, ensureLinuxLinger, ensureLinuxCliCommand, uninstallOwnedLinuxUnits } from './service-linux.mjs';
 import { windowsServiceLauncherText, windowsTaskAbsenceCommand, windowsStartupScriptText, windowsStartupScriptInstalled } from './windows-supervisor.mjs';
 import { ensureWindowsSupervisorKey, windowsSupervisorCommand } from './windows-user-supervisor.mjs';
 
@@ -66,7 +66,9 @@ export function installLinuxService(cliPath = globalCliPath(), nodePath = proces
   const launcherFile = writeLinuxServiceLauncher(cliPath, nodePath);
   // Fresh root installs are boot services owned by PID 1. Legacy per-user units are
   // left under their existing supervisor, but must have linger enabled.
-  const privileged = process.getuid?.() === 0 && path.resolve(home) === path.resolve(os.userInfo().homedir);
+  const syntheticLinuxFixture = process.env.NODE_ENV === 'test' && process.env.REMCP_TEST_PLATFORM === 'linux';
+  const privileged = !syntheticLinuxFixture && process.getuid?.() === 0
+    && path.resolve(home) === path.resolve(os.userInfo().homedir);
   if (privileged && fs.existsSync(linuxSystemServiceFile) && !linuxSystemAgentOwned()) {
     throw new Error('Refusing to replace an unmanaged systemd remcp-agent.service');
   }
@@ -384,11 +386,7 @@ export function restartPersistentServiceIfInstalled(config, { deferLinux = false
 export function uninstallPersistentService() {
   const platform = servicePlatform();
   if (platform === 'linux') {
-    const scope = linuxServiceScope();
-    const option = scope === 'user' ? ['--user'] : [];
-    spawnSync('systemctl', [...option, 'disable', '--now', 'remcp-agent.service'], { stdio:'inherit' });
-    try { fs.unlinkSync(linuxActiveServiceFile()); } catch {}
-    spawnSync('systemctl', [...option, 'daemon-reload'], { stdio:'inherit' });
+    uninstallOwnedLinuxUnits();
   } else if (platform === 'darwin') {
     const domain = macLaunchDomain();
     spawnSync('launchctl', ['bootout', domain, macServiceFile], { stdio: 'ignore' });

package/src/cli.mjs

@@ -360,6 +360,7 @@ export async function main(argv = process.argv.slice(2)) {
       },
       agent:{
         mode:service.installed ? 'service' : 'manual',
+        installed:service.installed,
         running:service.active,
         manager:service.manager,
         serviceCliVersion:serviceInstall.cliVersion,
@@ -419,6 +420,9 @@ export async function main(argv = process.argv.slice(2)) {
     if (flags.purge) {
       const specs = [PACKAGE_NAME, ...(cfg?.runtime?.packageName ? [cfg.runtime.packageName] : [])];
       run(npm.command, [...npm.args, 'uninstall', '--global', ...specs, '--no-audit', '--no-fund', '--loglevel=error']);
+      console.log('ReMCP background service removed and global npm packages uninstalled. Device pairing was retained.');
+    } else {
+      console.log('ReMCP background service removed. The CLI, runtime packages and device pairing were retained. Use remcp uninstall --purge to also uninstall global npm packages.');
     }
     return;
   }