@remcp/remcp 0.2.150 → 0.2.152

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remcp/remcp",
-  "version": "0.2.150",
+  "version": "0.2.152",
   "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",
@@ -18,7 +18,7 @@
     "README.md"
   ],
   "scripts": {
-    "check": "node --check bin/remcp.mjs && node --check src/agent-update.mjs && node --check src/agent.mjs && node --check src/cli.mjs && node --check src/cli/config.mjs && node --check src/cli/connect.mjs && node --check src/cli/doctor.mjs && node --check src/cli/env.mjs && node --check src/cli/service.mjs && node --check src/cli/shell.mjs && node --check src/cli/update.mjs && node --check src/fs-access.mjs && node --check src/npm.mjs && node --check src/runtime.mjs && node --check src/version.mjs",
+    "check": "node --check bin/remcp.mjs && node --check src/agent-update.mjs && node --check src/agent.mjs && node --check src/cli.mjs && node --check src/cli/config.mjs && node --check src/cli/connect.mjs && node --check src/cli/doctor.mjs && node --check src/cli/env.mjs && node --check src/cli/npm-global.mjs && node --check src/cli/service-inventory.mjs && node --check src/cli/service.mjs && node --check src/cli/shell.mjs && node --check src/cli/update.mjs && node --check src/fs-access.mjs && node --check src/npm.mjs && node --check src/runtime.mjs && node --check src/version.mjs",
     "test": "node --test test/*.test.mjs"
   },
   "dependencies": {

package/src/cli/npm-global.mjs

@@ -0,0 +1,212 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import process from 'node:process';
+import { resolveNpm } from '../npm.mjs';
+import { PACKAGE_NAME } from '../version.mjs';
+import { home, npm } from './env.mjs';
+import { output, run } from './shell.mjs';
+
+export function servicePlatform() {
+  return process.env.NODE_ENV === 'test' && process.env.REMCP_TEST_PLATFORM ? process.env.REMCP_TEST_PLATFORM : process.platform;
+}
+
+export function globalPrefix() {
+  return output(npm.command, [...npm.args, 'prefix', '--global']);
+}
+
+export function globalCliPath() {
+  const prefix = globalPrefix();
+  return servicePlatform() === 'win32' ? path.join(prefix, 'remcp.cmd') : path.join(prefix, 'bin', 'remcp');
+}
+
+function npmGlobalInstallArgs(specs, { preferOnline = false } = {}) {
+  return [
+    'install',
+    '--global',
+    ...specs,
+    ...(preferOnline ? ['--prefer-online'] : []),
+    '--no-audit',
+    '--no-fund',
+    '--ignore-scripts',
+    '--loglevel=error',
+  ];
+}
+
+export function npmGlobalInstall(...specs) {
+  run(npm.command, [...npm.args, ...npmGlobalInstallArgs(specs)]);
+}
+
+function pathEntryExists(file) {
+  try {
+    fs.lstatSync(file);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function globalPackagePath(prefix, packageName, platform = servicePlatform()) {
+  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)'}`);
+  const modulesRoot = platform === 'win32'
+    ? path.join(prefix, 'node_modules')
+    : path.join(prefix, 'lib', 'node_modules');
+  return path.join(modulesRoot, ...parts);
+}
+
+function managedWindowsRuntimePrefix() {
+  return path.resolve(
+    process.env.LOCALAPPDATA || path.join(home, 'AppData', 'Local'),
+    'ReMCP',
+    'runtime',
+  );
+}
+
+function isManagedWindowsRuntimePrefix(prefix) {
+  const actual = path.resolve(String(prefix || ''));
+  const expected = managedWindowsRuntimePrefix();
+  return actual.toLowerCase() === expected.toLowerCase();
+}
+
+function transactionalMacGlobalInstall({ resolved, prefix, packageNames, specs, preferOnline = false }) {
+  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, ...npmGlobalInstallArgs(specs, { preferOnline })]);
+  } 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)}`);
+  }
+}
+
+function transactionalWindowsGlobalInstall({ resolved, prefix, packageNames, specs, preferOnline = false }) {
+  prefix = String(prefix || '').trim();
+  if (!path.isAbsolute(prefix)) throw new Error(`npm global prefix must be absolute for a Windows update: ${prefix || '(empty)'}`);
+  if (!isManagedWindowsRuntimePrefix(prefix)) {
+    run(resolved.command, [...resolved.args, ...npmGlobalInstallArgs(specs, { preferOnline })]);
+    return;
+  }
+
+  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 Windows 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, 'win32'), `package-${index}`));
+    if (uniqueNames.includes(PACKAGE_NAME)) {
+      for (const shim of ['remcp', 'remcp.cmd', 'remcp.ps1']) moveAside(path.join(prefix, shim), `bin-${shim}`);
+    }
+    run(resolved.command, [...resolved.args, ...npmGlobalInstallArgs(specs, { preferOnline })]);
+  } catch (error) {
+    restore(error);
+    throw error;
+  }
+
+  try {
+    fs.rmSync(backupRoot, { recursive:true, force:true });
+  } catch (error) {
+    console.error(`ReMCP update: could not remove Windows rollback backup ${backupRoot}: ${error instanceof Error ? error.message : String(error)}`);
+  }
+}
+
+// Release updates use exact versions that may have been published only moments ago. npm can keep a
+// cached pre-publication packument long enough to answer ETARGET after the registry already serves the
+// version, so updates revalidate metadata while retaining npm's cache for package bytes.
+export function npmGlobalUpdate(packageNames, ...specs) {
+  const platform = servicePlatform();
+  const prefix = globalPrefix();
+  if (platform === 'darwin') {
+    transactionalMacGlobalInstall({ resolved:npm, prefix, packageNames, specs, preferOnline:true });
+    return;
+  }
+  if (platform === 'win32') {
+    transactionalWindowsGlobalInstall({ resolved:npm, prefix, packageNames, specs, preferOnline:true });
+    return;
+  }
+  run(npm.command, [...npm.args, ...npmGlobalInstallArgs(specs, { preferOnline:true })]);
+}
+
+export function npmGlobalUpdateForNode(nodePath, packageNames, ...specs) {
+  const platform = servicePlatform();
+  const resolved = resolveNpm({ nodePath, home, platform });
+  const prefix = output(resolved.command, [...resolved.args, 'prefix', '--global']);
+  if (platform === 'darwin') {
+    transactionalMacGlobalInstall({ resolved, prefix, packageNames, specs, preferOnline:true });
+    return;
+  }
+  if (platform === 'win32') {
+    transactionalWindowsGlobalInstall({ resolved, prefix, packageNames, specs, preferOnline:true });
+    return;
+  }
+  run(resolved.command, [...resolved.args, ...npmGlobalInstallArgs(specs, { preferOnline:true })]);
+}

package/src/cli/service-inventory.mjs

@@ -0,0 +1,217 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import process from 'node:process';
+import { spawnSync } from 'node:child_process';
+import { PACKAGE_NAME, VERSION } from '../version.mjs';
+import { saveConfig } from './config.mjs';
+import { linuxServiceFile, linuxServiceLauncherFile, macServiceFile, macServiceLabel, windowsTaskName } from './env.mjs';
+import { servicePlatform, globalCliPath, npmGlobalUpdateForNode } from './npm-global.mjs';
+
+export function persistentServiceExpected(config) {
+  if (config?.serviceInstalled === false) return false;
+  if (config?.serviceInstalled === true) return true;
+  const platform = servicePlatform();
+  if (platform === 'linux') return fs.existsSync(linuxServiceFile);
+  if (platform === 'darwin') return fs.existsSync(macServiceFile);
+  if (platform === 'win32') {
+    return spawnSync('schtasks.exe', ['/Query', '/TN', windowsTaskName], { stdio: 'ignore' }).status === 0;
+  }
+  return false;
+}
+
+export function persistentServiceState(config) {
+  const platform = servicePlatform();
+  const expected = persistentServiceExpected(config);
+  if (platform === 'linux') {
+    const installed = fs.existsSync(linuxServiceFile);
+    const active = installed && spawnSync('systemctl', ['--user', 'is-active', '--quiet', 'remcp-agent.service'], { stdio: 'ignore' }).status === 0;
+    return { expected, installed, active, manager:'systemd-user', name:'remcp-agent.service' };
+  }
+  if (platform === 'darwin') {
+    const installed = fs.existsSync(macServiceFile);
+    const target = typeof process.getuid === 'function' ? 'gui/' + process.getuid() + '/' + macServiceLabel : macServiceLabel;
+    const active = installed && spawnSync('launchctl', ['print', target], { stdio: 'ignore' }).status === 0;
+    return { expected, installed, active, manager:'launchd', name:macServiceLabel };
+  }
+  if (platform === 'win32') {
+    const query = spawnSync('schtasks.exe', ['/Query', '/TN', windowsTaskName, '/FO', 'LIST'], { encoding:'utf8' });
+    const installed = query.status === 0;
+    const outputText = String(query.stdout || '');
+    const active = installed && /(?:Status|Состояние):\s*Running/i.test(outputText);
+    return { expected, installed, active, manager:'schtasks', name:windowsTaskName };
+  }
+  return { expected:false, installed:false, active:false, manager:null, name:null };
+}
+
+function inferServiceIdentity() {
+  const platform = servicePlatform();
+  if (platform === 'linux' && fs.existsSync(linuxServiceLauncherFile)) {
+    try {
+      const body = fs.readFileSync(linuxServiceLauncherFile, 'utf8');
+      const match = body.match(/^exec\s+'([^']+)'\s+'([^']+)'/m);
+      if (match) return { nodePath:match[1], cliPath:match[2] };
+    } catch {}
+  }
+  if (platform === 'darwin' && fs.existsSync(macServiceFile)) {
+    try {
+      const body = fs.readFileSync(macServiceFile, 'utf8');
+      const args = [...body.matchAll(/<string>([^<]+)<\/string>/g)].map(match => match[1]);
+      const startIndex = args.indexOf('start');
+      if (startIndex >= 2) return { nodePath:args[startIndex - 2], cliPath:args[startIndex - 1] };
+    } catch {}
+  }
+  return {};
+}
+
+export function canonicalServiceCliPath(config) {
+  const configured = String(config?.serviceCliPath || '').trim();
+  if (configured && fs.existsSync(configured)) return configured;
+  const inferred = inferServiceIdentity().cliPath;
+  if (inferred && fs.existsSync(inferred)) return inferred;
+  return globalCliPath();
+}
+
+export function canonicalServiceNodePath(config) {
+  const configured = String(config?.serviceNodePath || '').trim();
+  if (configured && fs.existsSync(configured)) return configured;
+  const inferred = inferServiceIdentity().nodePath;
+  if (inferred && fs.existsSync(inferred)) return inferred;
+  return process.execPath;
+}
+
+function versionFromPackageJson(file) {
+  try {
+    const parsed = JSON.parse(fs.readFileSync(file, 'utf8'));
+    return typeof parsed.version === 'string' ? parsed.version : null;
+  } catch {
+    return null;
+  }
+}
+
+function packageVersionBesideCli(cliPath, packageName) {
+  if (!cliPath || !packageName) return null;
+  const marker = path.sep + 'node_modules' + path.sep;
+  const index = cliPath.lastIndexOf(marker);
+  if (index < 0) return null;
+  const nodeModules = cliPath.slice(0, index + (path.sep + 'node_modules').length);
+  return versionFromPackageJson(path.join(nodeModules, ...String(packageName).split('/'), 'package.json'));
+}
+
+function packageVersionForCli(cliPath, packageName) {
+  const beside = packageVersionBesideCli(cliPath, packageName);
+  if (beside || servicePlatform() !== 'win32' || !cliPath || !packageName) return beside;
+  // npm's Windows global executable is a .cmd shim in the prefix root, not a symlink into
+  // node_modules. realpath() therefore cannot reveal the package directory like it does on Unix.
+  // Resolve the package from the same prefix layout npm uses on Windows.
+  if (path.basename(cliPath).toLowerCase() !== 'remcp.cmd') return null;
+  const prefix = path.dirname(cliPath);
+  return versionFromPackageJson(path.join(prefix, 'node_modules', ...String(packageName).split('/'), 'package.json'));
+}
+
+function exactPackageSpecVersion(packageName, packageSpec) {
+  const prefix = `${String(packageName || '')}@`;
+  const spec = String(packageSpec || '');
+  return prefix !== '@' && spec.startsWith(prefix) ? spec.slice(prefix.length) : '';
+}
+
+// A PowerShell bootstrap already installs the exact client/runtime pair before it starts pairing.
+// Reusing that verified pair avoids a second registry mutation during `connect --install` while
+// preserving the normal npm path for partial, stale, custom-runtime and non-bootstrap installs.
+export function releasePairPresentAtCli(cliPath, config) {
+  const runtimePackageName = String(config?.runtime?.packageName || '');
+  const expectedRuntimeVersion = exactPackageSpecVersion(runtimePackageName, config?.runtime?.packageSpec);
+  if (!cliPath || !runtimePackageName || !expectedRuntimeVersion) return false;
+  return packageVersionForCli(cliPath, PACKAGE_NAME) === VERSION
+    && packageVersionForCli(cliPath, runtimePackageName) === expectedRuntimeVersion;
+}
+
+export function installationVersionsAtCliPath(cliPath, runtimePackageName) {
+  if (!cliPath) return { cliVersion:null, runtimeVersion:null, cliPath:null };
+  let resolvedCliPath = cliPath;
+  try { if (fs.existsSync(cliPath)) resolvedCliPath = fs.realpathSync(cliPath); } catch {}
+  return {
+    cliVersion:packageVersionForCli(resolvedCliPath, PACKAGE_NAME),
+    runtimeVersion:packageVersionForCli(resolvedCliPath, runtimePackageName),
+    cliPath:resolvedCliPath,
+  };
+}
+
+export function serviceInstallationInfo(config) {
+  if (!persistentServiceExpected(config)) return { cliVersion:null, runtimeVersion:null, cliPath:null, nodePath:null };
+  const cliPath = canonicalServiceCliPath(config);
+  const nodePath = canonicalServiceNodePath(config);
+  let resolvedCliPath = cliPath;
+  try { if (cliPath && fs.existsSync(cliPath)) resolvedCliPath = fs.realpathSync(cliPath); } catch {}
+  return {
+    cliVersion:packageVersionForCli(resolvedCliPath, PACKAGE_NAME),
+    runtimeVersion:packageVersionForCli(resolvedCliPath, config?.runtime?.packageName),
+    cliPath:resolvedCliPath || cliPath,
+    nodePath,
+  };
+}
+
+export function currentInstallationInfo(config) {
+  let cliPath = process.argv[1] || '';
+  try { if (cliPath && fs.existsSync(cliPath)) cliPath = fs.realpathSync(cliPath); } catch {}
+  return {
+    cliVersion:VERSION,
+    runtimeVersion:config?.runtime?.packageName ? packageVersionForCli(cliPath, config.runtime.packageName) : null,
+    cliPath:cliPath || null,
+    nodePath:process.execPath,
+  };
+}
+
+export function rememberCurrentInstallation(config, { service = false } = {}) {
+  if (!config || typeof config !== 'object') return config;
+  const info = currentInstallationInfo(config);
+  if (!info.cliPath || !info.nodePath) return config;
+  const key = info.nodePath + '\u0000' + info.cliPath;
+  const existing = Array.isArray(config.installations) ? config.installations.filter(item => item && typeof item === 'object') : [];
+  const filtered = existing.filter(item => ((item.nodePath || '') + '\u0000' + (item.cliPath || '')) !== key);
+  const record = {
+    nodePath:info.nodePath,
+    cliPath:info.cliPath,
+    cliVersion:info.cliVersion,
+    runtimeVersion:info.runtimeVersion,
+    service:Boolean(service),
+    lastSeenAt:new Date().toISOString(),
+  };
+  const installations = [...filtered, record].slice(-8);
+  const next = {
+    ...config,
+    installations,
+    ...(service ? { serviceInstalled:true, serviceCliPath:info.cliPath, serviceNodePath:info.nodePath } : {}),
+  };
+  saveConfig(next);
+  return next;
+}
+
+export function syncKnownInstallations(config, ...specs) {
+  const serviceInfo = serviceInstallationInfo(config);
+  const current = currentInstallationInfo(config);
+  const candidates = [
+    ...(Array.isArray(config?.installations) ? config.installations : []),
+    ...(serviceInfo.nodePath ? [{ nodePath:serviceInfo.nodePath, cliPath:serviceInfo.cliPath, service:true }] : []),
+  ];
+  const currentNode = (() => { try { return fs.realpathSync(current.nodePath); } catch { return current.nodePath; } })();
+  const seen = new Set();
+  const results = [];
+  for (const candidate of candidates) {
+    const nodePath = String(candidate?.nodePath || '').trim();
+    if (!nodePath || !fs.existsSync(nodePath)) continue;
+    let resolvedNode = nodePath;
+    try { resolvedNode = fs.realpathSync(nodePath); } catch {}
+    if (resolvedNode === currentNode || seen.has(resolvedNode)) continue;
+    seen.add(resolvedNode);
+    const required = Boolean(candidate?.service) || resolvedNode === serviceInfo.nodePath;
+    try {
+      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);
+      results.push({ nodePath:resolvedNode, ok:false, required, error:message });
+      if (required) throw new Error('Could not update canonical ReMCP service installation at ' + resolvedNode + ': ' + message);
+    }
+  }
+  return results;
+}

package/src/cli/service.mjs

@@ -1,3 +1,7 @@
+import { servicePlatform, globalPrefix, globalCliPath, npmGlobalInstall, npmGlobalUpdate, npmGlobalUpdateForNode } from './npm-global.mjs';
+import { persistentServiceExpected, persistentServiceState, releasePairPresentAtCli, installationVersionsAtCliPath, serviceInstallationInfo, currentInstallationInfo, rememberCurrentInstallation, syncKnownInstallations, canonicalServiceCliPath, canonicalServiceNodePath } from './service-inventory.mjs';
+export { servicePlatform, globalPrefix, globalCliPath, npmGlobalInstall, npmGlobalUpdate, npmGlobalUpdateForNode };
+export { persistentServiceExpected, persistentServiceState, releasePairPresentAtCli, installationVersionsAtCliPath, serviceInstallationInfo, currentInstallationInfo, rememberCurrentInstallation, syncKnownInstallations };
 // Installing, repairing and removing the background agent: one supervisor per platform, plus the
 // write-access tweaks a fresh install needs. Nothing here is reachable from a model or an MCP tool.
 import fs from 'node:fs';
@@ -12,211 +16,6 @@ import { saveConfig } from './config.mjs';
 import { configDir, home, linuxServiceFile, linuxServiceLauncherFile, macLogFile, macServiceFile, macServiceLabel, npm, windowsServiceLauncherFile, windowsTaskName } from './env.mjs';
 import { output, run } from './shell.mjs';
 
-export function servicePlatform() {
-  return process.env.NODE_ENV === 'test' && process.env.REMCP_TEST_PLATFORM ? process.env.REMCP_TEST_PLATFORM : process.platform;
-}
-
-export function globalPrefix() {
-  return output(npm.command, [...npm.args, 'prefix', '--global']);
-}
-
-export function globalCliPath() {
-  const prefix = globalPrefix();
-  return servicePlatform() === 'win32' ? path.join(prefix, 'remcp.cmd') : path.join(prefix, 'bin', 'remcp');
-}
-
-function npmGlobalInstallArgs(specs, { preferOnline = false } = {}) {
-  return [
-    'install',
-    '--global',
-    ...specs,
-    ...(preferOnline ? ['--prefer-online'] : []),
-    '--no-audit',
-    '--no-fund',
-    '--ignore-scripts',
-    '--loglevel=error',
-  ];
-}
-
-export function npmGlobalInstall(...specs) {
-  run(npm.command, [...npm.args, ...npmGlobalInstallArgs(specs)]);
-}
-
-function pathEntryExists(file) {
-  try {
-    fs.lstatSync(file);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function globalPackagePath(prefix, packageName, platform = servicePlatform()) {
-  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)'}`);
-  const modulesRoot = platform === 'win32'
-    ? path.join(prefix, 'node_modules')
-    : path.join(prefix, 'lib', 'node_modules');
-  return path.join(modulesRoot, ...parts);
-}
-
-function managedWindowsRuntimePrefix() {
-  return path.resolve(
-    process.env.LOCALAPPDATA || path.join(home, 'AppData', 'Local'),
-    'ReMCP',
-    'runtime',
-  );
-}
-
-function isManagedWindowsRuntimePrefix(prefix) {
-  const actual = path.resolve(String(prefix || ''));
-  const expected = managedWindowsRuntimePrefix();
-  return actual.toLowerCase() === expected.toLowerCase();
-}
-
-function transactionalMacGlobalInstall({ resolved, prefix, packageNames, specs, preferOnline = false }) {
-  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, ...npmGlobalInstallArgs(specs, { preferOnline })]);
-  } 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)}`);
-  }
-}
-
-function transactionalWindowsGlobalInstall({ resolved, prefix, packageNames, specs, preferOnline = false }) {
-  prefix = String(prefix || '').trim();
-  if (!path.isAbsolute(prefix)) throw new Error(`npm global prefix must be absolute for a Windows update: ${prefix || '(empty)'}`);
-  if (!isManagedWindowsRuntimePrefix(prefix)) {
-    run(resolved.command, [...resolved.args, ...npmGlobalInstallArgs(specs, { preferOnline })]);
-    return;
-  }
-
-  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 Windows 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, 'win32'), `package-${index}`));
-    if (uniqueNames.includes(PACKAGE_NAME)) {
-      for (const shim of ['remcp', 'remcp.cmd', 'remcp.ps1']) moveAside(path.join(prefix, shim), `bin-${shim}`);
-    }
-    run(resolved.command, [...resolved.args, ...npmGlobalInstallArgs(specs, { preferOnline })]);
-  } catch (error) {
-    restore(error);
-    throw error;
-  }
-
-  try {
-    fs.rmSync(backupRoot, { recursive:true, force:true });
-  } catch (error) {
-    console.error(`ReMCP update: could not remove Windows rollback backup ${backupRoot}: ${error instanceof Error ? error.message : String(error)}`);
-  }
-}
-
-// Release updates use exact versions that may have been published only moments ago. npm can keep a
-// cached pre-publication packument long enough to answer ETARGET after the registry already serves the
-// version, so updates revalidate metadata while retaining npm's cache for package bytes.
-export function npmGlobalUpdate(packageNames, ...specs) {
-  const platform = servicePlatform();
-  const prefix = globalPrefix();
-  if (platform === 'darwin') {
-    transactionalMacGlobalInstall({ resolved:npm, prefix, packageNames, specs, preferOnline:true });
-    return;
-  }
-  if (platform === 'win32') {
-    transactionalWindowsGlobalInstall({ resolved:npm, prefix, packageNames, specs, preferOnline:true });
-    return;
-  }
-  run(npm.command, [...npm.args, ...npmGlobalInstallArgs(specs, { preferOnline:true })]);
-}
-
-export function npmGlobalUpdateForNode(nodePath, packageNames, ...specs) {
-  const platform = servicePlatform();
-  const resolved = resolveNpm({ nodePath, home, platform });
-  const prefix = output(resolved.command, [...resolved.args, 'prefix', '--global']);
-  if (platform === 'darwin') {
-    transactionalMacGlobalInstall({ resolved, prefix, packageNames, specs, preferOnline:true });
-    return;
-  }
-  if (platform === 'win32') {
-    transactionalWindowsGlobalInstall({ resolved, prefix, packageNames, specs, preferOnline:true });
-    return;
-  }
-  run(resolved.command, [...resolved.args, ...npmGlobalInstallArgs(specs, { preferOnline:true })]);
-}
-
 export function quoteSystemd(value) {
   return `"${String(value).replaceAll('\\', '\\\\').replaceAll('"', '\\"')}"`;
 }
@@ -471,215 +270,6 @@ export function installWindowsService(cliPath = globalCliPath(), { nodePath = pr
 // explicit false as the user's opt-out, an explicit true as the current marker, and only infer the
 // old intent from an OS service artifact when the marker is absent. This keeps legacy installs
 // repairable without resurrecting a service that a newer client explicitly disabled.
-export function persistentServiceExpected(config) {
-  if (config?.serviceInstalled === false) return false;
-  if (config?.serviceInstalled === true) return true;
-  const platform = servicePlatform();
-  if (platform === 'linux') return fs.existsSync(linuxServiceFile);
-  if (platform === 'darwin') return fs.existsSync(macServiceFile);
-  if (platform === 'win32') {
-    return spawnSync('schtasks.exe', ['/Query', '/TN', windowsTaskName], { stdio: 'ignore' }).status === 0;
-  }
-  return false;
-}
-
-export function persistentServiceState(config) {
-  const platform = servicePlatform();
-  const expected = persistentServiceExpected(config);
-  if (platform === 'linux') {
-    const installed = fs.existsSync(linuxServiceFile);
-    const active = installed && spawnSync('systemctl', ['--user', 'is-active', '--quiet', 'remcp-agent.service'], { stdio: 'ignore' }).status === 0;
-    return { expected, installed, active, manager:'systemd-user', name:'remcp-agent.service' };
-  }
-  if (platform === 'darwin') {
-    const installed = fs.existsSync(macServiceFile);
-    const target = typeof process.getuid === 'function' ? 'gui/' + process.getuid() + '/' + macServiceLabel : macServiceLabel;
-    const active = installed && spawnSync('launchctl', ['print', target], { stdio: 'ignore' }).status === 0;
-    return { expected, installed, active, manager:'launchd', name:macServiceLabel };
-  }
-  if (platform === 'win32') {
-    const query = spawnSync('schtasks.exe', ['/Query', '/TN', windowsTaskName, '/FO', 'LIST'], { encoding:'utf8' });
-    const installed = query.status === 0;
-    const outputText = String(query.stdout || '');
-    const active = installed && /(?:Status|Состояние):\s*Running/i.test(outputText);
-    return { expected, installed, active, manager:'schtasks', name:windowsTaskName };
-  }
-  return { expected:false, installed:false, active:false, manager:null, name:null };
-}
-
-function inferServiceIdentity() {
-  const platform = servicePlatform();
-  if (platform === 'linux' && fs.existsSync(linuxServiceLauncherFile)) {
-    try {
-      const body = fs.readFileSync(linuxServiceLauncherFile, 'utf8');
-      const match = body.match(/^exec\s+'([^']+)'\s+'([^']+)'/m);
-      if (match) return { nodePath:match[1], cliPath:match[2] };
-    } catch {}
-  }
-  if (platform === 'darwin' && fs.existsSync(macServiceFile)) {
-    try {
-      const body = fs.readFileSync(macServiceFile, 'utf8');
-      const args = [...body.matchAll(/<string>([^<]+)<\/string>/g)].map(match => match[1]);
-      const startIndex = args.indexOf('start');
-      if (startIndex >= 2) return { nodePath:args[startIndex - 2], cliPath:args[startIndex - 1] };
-    } catch {}
-  }
-  return {};
-}
-
-function canonicalServiceCliPath(config) {
-  const configured = String(config?.serviceCliPath || '').trim();
-  if (configured && fs.existsSync(configured)) return configured;
-  const inferred = inferServiceIdentity().cliPath;
-  if (inferred && fs.existsSync(inferred)) return inferred;
-  return globalCliPath();
-}
-
-function canonicalServiceNodePath(config) {
-  const configured = String(config?.serviceNodePath || '').trim();
-  if (configured && fs.existsSync(configured)) return configured;
-  const inferred = inferServiceIdentity().nodePath;
-  if (inferred && fs.existsSync(inferred)) return inferred;
-  return process.execPath;
-}
-
-function versionFromPackageJson(file) {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(file, 'utf8'));
-    return typeof parsed.version === 'string' ? parsed.version : null;
-  } catch {
-    return null;
-  }
-}
-
-function packageVersionBesideCli(cliPath, packageName) {
-  if (!cliPath || !packageName) return null;
-  const marker = path.sep + 'node_modules' + path.sep;
-  const index = cliPath.lastIndexOf(marker);
-  if (index < 0) return null;
-  const nodeModules = cliPath.slice(0, index + (path.sep + 'node_modules').length);
-  return versionFromPackageJson(path.join(nodeModules, ...String(packageName).split('/'), 'package.json'));
-}
-
-function packageVersionForCli(cliPath, packageName) {
-  const beside = packageVersionBesideCli(cliPath, packageName);
-  if (beside || servicePlatform() !== 'win32' || !cliPath || !packageName) return beside;
-  // npm's Windows global executable is a .cmd shim in the prefix root, not a symlink into
-  // node_modules. realpath() therefore cannot reveal the package directory like it does on Unix.
-  // Resolve the package from the same prefix layout npm uses on Windows.
-  if (path.basename(cliPath).toLowerCase() !== 'remcp.cmd') return null;
-  const prefix = path.dirname(cliPath);
-  return versionFromPackageJson(path.join(prefix, 'node_modules', ...String(packageName).split('/'), 'package.json'));
-}
-
-function exactPackageSpecVersion(packageName, packageSpec) {
-  const prefix = `${String(packageName || '')}@`;
-  const spec = String(packageSpec || '');
-  return prefix !== '@' && spec.startsWith(prefix) ? spec.slice(prefix.length) : '';
-}
-
-// A PowerShell bootstrap already installs the exact client/runtime pair before it starts pairing.
-// Reusing that verified pair avoids a second registry mutation during `connect --install` while
-// preserving the normal npm path for partial, stale, custom-runtime and non-bootstrap installs.
-export function releasePairPresentAtCli(cliPath, config) {
-  const runtimePackageName = String(config?.runtime?.packageName || '');
-  const expectedRuntimeVersion = exactPackageSpecVersion(runtimePackageName, config?.runtime?.packageSpec);
-  if (!cliPath || !runtimePackageName || !expectedRuntimeVersion) return false;
-  return packageVersionForCli(cliPath, PACKAGE_NAME) === VERSION
-    && packageVersionForCli(cliPath, runtimePackageName) === expectedRuntimeVersion;
-}
-
-export function installationVersionsAtCliPath(cliPath, runtimePackageName) {
-  if (!cliPath) return { cliVersion:null, runtimeVersion:null, cliPath:null };
-  let resolvedCliPath = cliPath;
-  try { if (fs.existsSync(cliPath)) resolvedCliPath = fs.realpathSync(cliPath); } catch {}
-  return {
-    cliVersion:packageVersionForCli(resolvedCliPath, PACKAGE_NAME),
-    runtimeVersion:packageVersionForCli(resolvedCliPath, runtimePackageName),
-    cliPath:resolvedCliPath,
-  };
-}
-
-export function serviceInstallationInfo(config) {
-  if (!persistentServiceExpected(config)) return { cliVersion:null, runtimeVersion:null, cliPath:null, nodePath:null };
-  const cliPath = canonicalServiceCliPath(config);
-  const nodePath = canonicalServiceNodePath(config);
-  let resolvedCliPath = cliPath;
-  try { if (cliPath && fs.existsSync(cliPath)) resolvedCliPath = fs.realpathSync(cliPath); } catch {}
-  return {
-    cliVersion:packageVersionForCli(resolvedCliPath, PACKAGE_NAME),
-    runtimeVersion:packageVersionForCli(resolvedCliPath, config?.runtime?.packageName),
-    cliPath:resolvedCliPath || cliPath,
-    nodePath,
-  };
-}
-
-export function currentInstallationInfo(config) {
-  let cliPath = process.argv[1] || '';
-  try { if (cliPath && fs.existsSync(cliPath)) cliPath = fs.realpathSync(cliPath); } catch {}
-  return {
-    cliVersion:VERSION,
-    runtimeVersion:config?.runtime?.packageName ? packageVersionForCli(cliPath, config.runtime.packageName) : null,
-    cliPath:cliPath || null,
-    nodePath:process.execPath,
-  };
-}
-
-export function rememberCurrentInstallation(config, { service = false } = {}) {
-  if (!config || typeof config !== 'object') return config;
-  const info = currentInstallationInfo(config);
-  if (!info.cliPath || !info.nodePath) return config;
-  const key = info.nodePath + '\u0000' + info.cliPath;
-  const existing = Array.isArray(config.installations) ? config.installations.filter(item => item && typeof item === 'object') : [];
-  const filtered = existing.filter(item => ((item.nodePath || '') + '\u0000' + (item.cliPath || '')) !== key);
-  const record = {
-    nodePath:info.nodePath,
-    cliPath:info.cliPath,
-    cliVersion:info.cliVersion,
-    runtimeVersion:info.runtimeVersion,
-    service:Boolean(service),
-    lastSeenAt:new Date().toISOString(),
-  };
-  const installations = [...filtered, record].slice(-8);
-  const next = {
-    ...config,
-    installations,
-    ...(service ? { serviceInstalled:true, serviceCliPath:info.cliPath, serviceNodePath:info.nodePath } : {}),
-  };
-  saveConfig(next);
-  return next;
-}
-
-export function syncKnownInstallations(config, ...specs) {
-  const serviceInfo = serviceInstallationInfo(config);
-  const current = currentInstallationInfo(config);
-  const candidates = [
-    ...(Array.isArray(config?.installations) ? config.installations : []),
-    ...(serviceInfo.nodePath ? [{ nodePath:serviceInfo.nodePath, cliPath:serviceInfo.cliPath, service:true }] : []),
-  ];
-  const currentNode = (() => { try { return fs.realpathSync(current.nodePath); } catch { return current.nodePath; } })();
-  const seen = new Set();
-  const results = [];
-  for (const candidate of candidates) {
-    const nodePath = String(candidate?.nodePath || '').trim();
-    if (!nodePath || !fs.existsSync(nodePath)) continue;
-    let resolvedNode = nodePath;
-    try { resolvedNode = fs.realpathSync(nodePath); } catch {}
-    if (resolvedNode === currentNode || seen.has(resolvedNode)) continue;
-    seen.add(resolvedNode);
-    const required = Boolean(candidate?.service) || resolvedNode === serviceInfo.nodePath;
-    try {
-      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);
-      results.push({ nodePath:resolvedNode, ok:false, required, error:message });
-      if (required) throw new Error('Could not update canonical ReMCP service installation at ' + resolvedNode + ': ' + message);
-    }
-  }
-  return results;
-}
-
 export function configurePostInstallAccess() {
   const platform = servicePlatform();
   try {