@remcp/remcp 0.2.223 → 0.2.225

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remcp/remcp",
-  "version": "0.2.223",
+  "version": "0.2.225",
   "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-deploy-reconnect.mjs && node --check src/agent-network-probe-client.mjs && node --check src/agent-relay-connection.mjs && node --check src/agent-responder.mjs && node --check src/agent-runtime-capabilities.mjs && node --check src/agent-update-monitor.mjs && node --check src/agent-update.mjs && node --check src/agent-utilities.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/installation-audit.mjs && node --check src/cli/mac-native-temperature.mjs && node --check src/cli/npm-global.mjs && node --check src/cli/pairing-qr.mjs && node --check src/cli/service-inventory.mjs && node --check src/cli/service-macos.mjs && node --check src/cli/service-paths.mjs && node --check src/cli/service.mjs && node --check src/cli/shell.mjs && node --check src/cli/update.mjs && node --check src/cli/windows-owned-job-source.mjs && node --check src/cli/windows-owned-job.mjs && node --check src/cli/windows-supervisor.mjs && node --check src/cli/windows-task-restart.mjs && node --check src/cli/windows-update-lock.mjs && node --check src/cli/windows-user-supervisor.mjs && node --check src/fetch-update-manifest.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-deploy-reconnect.mjs && node --check src/agent-network-probe-client.mjs && node --check src/agent-relay-connection.mjs && node --check src/agent-responder.mjs && node --check src/agent-runtime-capabilities.mjs && node --check src/agent-update-monitor.mjs && node --check src/agent-update.mjs && node --check src/agent-utilities.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/installation-audit.mjs && node --check src/cli/mac-native-temperature.mjs && node --check src/cli/npm-global.mjs && node --check src/cli/pairing-qr.mjs && node --check src/cli/service-inventory.mjs && node --check src/cli/service-macos.mjs && node --check src/cli/service-paths.mjs && node --check src/cli/service.mjs && node --check src/cli/shell.mjs && node --check src/cli/update.mjs && node --check src/cli/windows-owned-job-source.mjs && node --check src/cli/windows-owned-job.mjs && node --check src/cli/windows-supervisor.mjs && node --check src/cli/windows-update-lock.mjs && node --check src/cli/windows-user-supervisor.mjs && node --check src/fetch-update-manifest.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/service.mjs

@@ -15,11 +15,10 @@ export { macLaunchDomain, ensureMacCliCommand, installMacService } from './servi
 import { PACKAGE_NAME, VERSION } from '../version.mjs';
 
 import { saveConfig } from './config.mjs';
-import { configDir, home, linuxServiceFile, linuxServiceLauncherFile, macServiceFile, macServiceLabel, windowsServiceLauncherFile, windowsTaskScriptFile, windowsStartupScriptFile, windowsTaskName } from './env.mjs';
+import { configDir, home, linuxServiceFile, linuxServiceLauncherFile, macServiceFile, macServiceLabel, windowsServiceLauncherFile, windowsStartupScriptFile, windowsTaskName } from './env.mjs';
 import { run } from './shell.mjs';
-import { windowsServiceLauncherText, windowsTaskReliabilityCommand, windowsTaskAbsenceCommand, windowsBatchUnsafeProfile, windowsTaskScriptText, windowsTaskScriptInstalled, windowsStartupScriptText, windowsStartupScriptInstalled } from './windows-supervisor.mjs';
+import { windowsServiceLauncherText, windowsTaskAbsenceCommand, windowsStartupScriptText, windowsStartupScriptInstalled } from './windows-supervisor.mjs';
 import { ensureWindowsSupervisorKey, windowsSupervisorCommand } from './windows-user-supervisor.mjs';
-import { scheduleWindowsTaskRestart } from './windows-task-restart.mjs';
 
 export function quoteSystemd(value) {
   return `"${String(value).replaceAll('\\', '\\\\').replaceAll('"', '\\"')}"`;
@@ -79,20 +78,6 @@ export function writeWindowsServiceLauncher(cliPath = globalCliPath(), nodePath
   return windowsServiceLauncherFile;
 }
 
-function writeWindowsTaskScript(launcherFile) {
-  if (fs.existsSync(windowsTaskScriptFile) && !windowsTaskScriptInstalled(windowsTaskScriptFile, windowsServiceLauncherFile)) {
-    throw new Error('The ReMCP scheduled task script is not owned by ReMCP; refusing to overwrite it');
-  }
-  const script = windowsTaskScriptText(launcherFile);
-  fs.mkdirSync(configDir, { recursive:true, mode:0o700 });
-  const temporary = `${windowsTaskScriptFile}.${process.pid}.${Date.now()}.tmp`;
-  try {
-    fs.writeFileSync(temporary, '\uFEFF' + script, { flag:'wx', encoding:'utf16le', mode:0o600 });
-    fs.renameSync(temporary, windowsTaskScriptFile);
-  } finally { try { fs.unlinkSync(temporary); } catch {} }
-  return windowsTaskScriptFile;
-}
-
 function installWindowsUserStartup(cliPath, nodePath) {
   const existed = fs.existsSync(windowsStartupScriptFile);
   if (existed && !windowsStartupScriptInstalled(windowsStartupScriptFile)) {
@@ -140,64 +125,39 @@ function installWindowsUserStartup(cliPath, nodePath) {
   console.log('ReMCP uses this Windows account\'s Startup folder (no administrator rights required).');
 }
 
-function requireWindowsScheduledTaskAbsent() {
-  // A failed schtasks /Query is ambiguous across Windows languages and ACLs.
-  // Fail closed if COM cannot prove absence before choosing another startup route.
-  const existing = spawnSync('powershell.exe', ['-NoProfile', '-NonInteractive',
+function windowsScheduledTaskPresence() {
+  // Never interpret schtasks.exe failure as absence: it also reports access-denied.
+  // COM returns locale-independent PRESENT/ABSENT or throws on an uncertain result.
+  const query = spawnSync('powershell.exe', ['-NoProfile', '-NonInteractive',
     '-Command', windowsTaskAbsenceCommand(windowsTaskName)],
-    { encoding:'utf8', windowsHide:true, timeout:10000, maxBuffer:4096, input:'' });
-  if (existing.error || existing.status !== 0 || String(existing.stdout || '').trim() !== 'ABSENT') {
-    throw new Error('Could not prove that the ReMCP scheduled task is absent; refusing to start a competing agent');
+    { encoding:'utf8', windowsHide:true, timeout:30000, maxBuffer:4096, input:'' });
+  const state = String(query.stdout || '').trim();
+  if (query.error || query.status !== 0 || !['ABSENT', 'PRESENT'].includes(state)) {
+    throw new Error('Could not verify the legacy ReMCP Scheduled Task; refusing an unsafe lifecycle change');
   }
+  return state;
 }
 
-export function installWindowsService(cliPath = globalCliPath(), { nodePath = process.execPath } = {}) {
-  if (windowsStartupScriptInstalled(windowsStartupScriptFile)) {
-    installWindowsUserStartup(cliPath, nodePath);
-    return;
-  }
-  if (windowsBatchUnsafeProfile(cliPath, nodePath, windowsServiceLauncherFile)) {
-    requireWindowsScheduledTaskAbsent();
-    console.log('ReMCP: Unicode or shell-sensitive Windows profile; using the per-user Startup supervisor.');
-    installWindowsUserStartup(cliPath, nodePath);
-    return;
-  }
-  const launcherFile = writeWindowsServiceLauncher(cliPath, nodePath);
-  const taskScript = writeWindowsTaskScript(launcherFile);
-  // WScript has no console; its hidden CMD child remains attached until it exits.
-  // /IT keeps desktop/UI automation in the signed-in user's session.
-  const command = `wscript.exe //B //Nologo "${taskScript}"`;
-  // Current-user interactive tasks need /IT. /RL LIMITED avoids requiring elevation.
-  // An organization may still disable creation of all tasks by standard users.
-  const created = spawnSync('schtasks.exe',
-    ['/Create', '/TN', windowsTaskName, '/TR', command, '/SC', 'ONLOGON', '/RL', 'LIMITED', '/IT', '/F'],
-    { encoding:'utf8', timeout:15000, maxBuffer:64 * 1024, windowsHide:true, input:'' });
-  if (created.error || created.status !== 0) {
-    requireWindowsScheduledTaskAbsent();
-    console.warn('Windows Task Scheduler rejected task creation; switching to per-user Startup.');
-    installWindowsUserStartup(cliPath, nodePath);
-    return;
-  }
-  // Recovery tuning is optional; a policy denying Set-ScheduledTask must not invalidate
-  // a successfully created and runnable interactive task.
-  try {
-    run('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', windowsTaskReliabilityCommand(windowsTaskName)]);
-  } catch (error) {
-    console.warn(`ReMCP task recovery settings were not applied: ${error.message}`);
-  }
-  try {
-    run('schtasks.exe', ['/Run', '/TN', windowsTaskName], { timeout:15000 });
-  } catch (error) {
-    // We just created this task. Remove it before registering another launcher, so
-    // a delayed logon cannot start competing agents under two supervisors.
-    const removed = spawnSync('schtasks.exe', ['/Delete', '/TN', windowsTaskName, '/F'],
-      { stdio:'ignore', timeout:10000 });
-    if (removed.status !== 0) throw error;
-    console.warn('Windows Task Scheduler could not start ReMCP; using per-user Startup.');
-    installWindowsUserStartup(cliPath, nodePath);
+function requireWindowsScheduledTaskAbsent() {
+  if (windowsScheduledTaskPresence() !== 'ABSENT') {
+    throw new Error('A legacy ReMCP Scheduled Task exists; its child process tree cannot be safely stopped or migrated automatically');
   }
 }
 
+// Called before any npm install/update so a legacy task cannot be partially
+// replaced while its WScript/CMD/Node descendants are still running.
+export function assertWindowsUpdateLifecycleSafe() {
+  if (servicePlatform() === 'win32') requireWindowsScheduledTaskAbsent();
+}
+
+export function installWindowsService(cliPath = globalCliPath(), { nodePath = process.execPath } = {}) {
+  // The old Task Scheduler launcher (WScript -> CMD -> Node) can orphan its
+  // descendants after /End. Do not create or touch it on new installations.
+  // An existing task must be migrated with verified process ownership first.
+  requireWindowsScheduledTaskAbsent();
+  installWindowsUserStartup(cliPath, nodePath);
+}
+
 // `serviceInstalled` was added after background services already existed in the wild. Treat an
 // 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
@@ -382,20 +342,14 @@ export function restartPersistentServiceIfInstalled(config, { deferLinux = false
     return macServiceLabel;
   }
   if (platform === 'win32') {
+    // /End can leave Node descendants running after a legacy CMD task ends.
+    // Do not report a successful credential restart when ownership is unknown.
+    requireWindowsScheduledTaskAbsent();
     if (windowsStartupScriptInstalled(windowsStartupScriptFile)) {
       const state = windowsSupervisorCommand('restart');
       if (state.restartScheduled !== true) throw new Error('Windows user supervisor did not schedule a restart');
       return 'ReMCP user startup supervisor (restart scheduled)';
     }
-    const result = spawnSync('schtasks.exe', ['/Query', '/TN', windowsTaskName], { stdio: 'ignore' });
-    if (result.status === 0) {
-      if (deferWindows) return scheduleWindowsTaskRestart(canonicalServiceNodePath(config));
-      // /Run does not restart a task that is already running; stop the previous
-      // process first so a rotated credential is loaded by the replacement.
-      spawnSync('schtasks.exe', ['/End', '/TN', windowsTaskName], { stdio: 'ignore' });
-      run('schtasks.exe', ['/Run', '/TN', windowsTaskName]);
-      return windowsTaskName;
-    }
   }
   return null;
 }
@@ -412,6 +366,13 @@ export function uninstallPersistentService() {
     try { fs.unlinkSync(macServiceFile); } catch {}
     removeMacCliCommand();
   } else if (platform === 'win32') {
+    // Refuse before touching any artifact. Scheduler /End and /Delete cannot
+    // prove that its detached CMD/Node descendants exited.
+    requireWindowsScheduledTaskAbsent();
+    if (fs.existsSync(windowsStartupScriptFile) &&
+        !windowsStartupScriptInstalled(windowsStartupScriptFile)) {
+      throw new Error('The ReMCP Startup entry is not owned by ReMCP; refusing to remove it');
+    }
     if (windowsStartupScriptInstalled(windowsStartupScriptFile)) {
       // Removing Startup alone leaves the already spawned agent alive. Stop the
       // exact child owned by the authenticated singleton, then remove registration.
@@ -426,9 +387,7 @@ export function uninstallPersistentService() {
       }
       fs.unlinkSync(windowsStartupScriptFile);
     }
-    spawnSync('schtasks.exe', ['/End', '/TN', windowsTaskName], { stdio: 'ignore' });
-    spawnSync('schtasks.exe', ['/Delete', '/TN', windowsTaskName, '/F'], { stdio: 'ignore' });
-    try { if (windowsTaskScriptInstalled(windowsTaskScriptFile, windowsServiceLauncherFile)) fs.unlinkSync(windowsTaskScriptFile); } catch {}
-    try { fs.unlinkSync(windowsServiceLauncherFile); } catch {}
+    // Retain legacy launch files. Their presence alone is not proof of ownership,
+    // and an absent task provides no safe justification for deleting them.
   }
 }

package/src/cli/update.mjs

@@ -12,7 +12,7 @@ import { loadConfig, saveConfig } from './config.mjs';
 import { assertSecureServerUrl } from './connect.mjs';
 import { installedVersion } from './doctor.mjs';
 import { linuxServiceFile, macServiceFile, officialOrigin } from './env.mjs';
-import { currentInstallationInfo, ensureMacCliCommand, ensureServiceIfRecorded, npmGlobalUpdate, persistentServiceExpected, rememberCurrentInstallation, restartPersistentServiceIfInstalled, servicePlatform, serviceInstallationInfo, syncKnownInstallations } from './service.mjs';
+import { assertWindowsUpdateLifecycleSafe, currentInstallationInfo, ensureMacCliCommand, ensureServiceIfRecorded, npmGlobalUpdate, persistentServiceExpected, rememberCurrentInstallation, restartPersistentServiceIfInstalled, servicePlatform, serviceInstallationInfo, syncKnownInstallations } from './service.mjs';
 
 const UPDATE_DISCOVERY_TIMEOUT_MS = 5000;
 
@@ -264,6 +264,9 @@ export async function updateCommand(flags) {
     return;
   }
 
+  // Legacy Scheduled Task /End can orphan an already running agent. Refuse the
+  // update before touching npm or package state until ownership is verifiable.
+  if (serviceExpected) assertWindowsUpdateLifecycleSafe();
   const before = { cli: VERSION, runtime: installedVersion(cfg.runtime.packageName) };
   console.log(`Updating ReMCP to ${targets.clientSpec} with ${targets.runtimeSpec}…`);
   npmGlobalUpdate([PACKAGE_NAME, cfg.runtime.packageName], targets.clientSpec, targets.runtimeSpec);

package/src/cli/windows-owned-job.mjs

@@ -21,14 +21,21 @@ export function spawnWindowsOwnedJob(application, args, { cwd, log, env = proces
     Buffer.from(windowsOwnedJobScript, 'utf16le').toString('base64')], {
     cwd:path.dirname(powershell), env, windowsHide:true, stdio:['pipe','pipe','pipe'],
   });
-  let output = '', stderr = '', started = false, empty = false, settled = false;
+  let output = '', stderr = '', started = false, empty = false, settled = false, sawReady = false;
   let resolveReady, rejectReady, resolveDone, rejectDone;
   const ready = new Promise((resolve, reject) => { resolveReady=resolve; rejectReady=reject; });
   const done = new Promise((resolve, reject) => { resolveDone=resolve; rejectDone=reject; });
   // Callers may observe readiness and completion separately; suppress unhandled rejection noise.
   ready.catch(() => {}); done.catch(() => {});
   const fail = error => { rejectReady(error); rejectDone(error); };
-  const timer = setTimeout(() => { fail(new Error('Windows job startup timed out')); helper.kill(); }, 15000);
+  // Windows PowerShell 5.1 compiles this P/Invoke helper via Add-Type on every launch.
+  // Resource-constrained ARM64 VMs can need more than 15 seconds. Keep one bounded
+  // deadline for the complete handshake, without weakening job ownership checks.
+  const timer = setTimeout(() => {
+    fail(new Error('Windows job startup timed out during ' +
+      (sawReady ? 'process creation' : 'PowerShell initialization')));
+    helper.kill();
+  }, 45000);
   helper.stdin.on('error', () => {});
   helper.stderr.on('data', chunk => { stderr = (stderr + chunk).slice(-2048); });
   helper.stdout.on('data', chunk => {
@@ -39,6 +46,7 @@ export function spawnWindowsOwnedJob(application, args, { cwd, log, env = proces
       try {
         const message = JSON.parse(line);
         if (message.ready === true && !started) {
+          sawReady = true;
           // ASCII envelope survives Windows PowerShell 5.1's OEM console codepage.
           helper.stdin.write(Buffer.from(JSON.stringify({application,command,cwd,log}),'utf8').toString('base64') + '\n');
         } else if (message.started === true && Number.isSafeInteger(message.pid) && message.pid > 0 && !started) {

package/src/cli/windows-user-supervisor.mjs

@@ -15,6 +15,11 @@ const root = process.env.REMCP_CONFIG_DIR || path.join(os.homedir(), '.config',
 const keyFile = path.join(root, 'windows-startup-control.key');
 const actions = new Set(['status', 'stop', 'restart']);
 
+// Startup readiness must cover the owned Job Object helper's 45-second PowerShell
+// initialization budget plus process startup. The synchronous CLI needs extra
+// time to collect the result from the independent control process.
+export const WINDOWS_SUPERVISOR_READY_BUDGET_MS = 57000;
+
 export function windowsSupervisorPath(configDir = root, platform = process.platform) {
   const id = crypto.createHash('sha256').update(path.resolve(configDir)).digest('hex').slice(0, 32);
   return platform === 'win32' ? '\\\\.\\pipe\\remcp-user-' + id
@@ -74,7 +79,10 @@ export async function windowsSupervisorRequest(action, { timeoutMs = action ===
 
 // Synchronous callers in the installed CLI use a separate Node client.
 // Never pass device tokens or control keys in command-line arguments.
-export function windowsSupervisorCommand(action, { timeoutMs = action === 'stop' ? 20000 : 15000 } = {}) {
+export function windowsSupervisorCommand(action, {
+  timeoutMs = action === 'stop' ? 20000 :
+    action === 'wait' ? WINDOWS_SUPERVISOR_READY_BUDGET_MS + 8000 : 15000,
+} = {}) {
   if (!actions.has(action) && action !== 'wait') throw new Error('Invalid supervisor action');
   const proc = spawnSync(process.execPath, [currentFile, 'control', action], {
     encoding: 'utf8', windowsHide: true, timeout: timeoutMs, maxBuffer: 8192,
@@ -245,7 +253,7 @@ async function control(action) {
     throw new Error('Windows Startup supervisor has not exited after stop');
   }
   if (action !== 'wait') return windowsSupervisorRequest(action);
-  const deadline = Date.now() + 11000;
+  const deadline = Date.now() + WINDOWS_SUPERVISOR_READY_BUDGET_MS;
   while (Date.now() < deadline) {
     try {
       const current = await windowsSupervisorRequest('status', { timeoutMs: 1000 });