@remcp/remcp 0.2.158 → 0.2.159

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remcp/remcp",
-  "version": "0.2.158",
+  "version": "0.2.159",
   "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-responder.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/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",
+    "check": "node --check bin/remcp.mjs && node --check src/agent-responder.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/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/cli/windows-supervisor.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,6 +15,7 @@ import { PACKAGE_NAME, VERSION } from '../version.mjs';
 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';
+import { windowsServiceLauncherText, windowsTaskReliabilityCommand } from './windows-supervisor.mjs';
 
 export function quoteSystemd(value) {
   return `"${String(value).replaceAll('\\', '\\\\').replaceAll('"', '\\"')}"`;
@@ -233,22 +234,8 @@ export function installMacService(cliPath = globalCliPath(), { restart = true, n
   return 'bootstrapped';
 }
 
-function windowsBatchValue(value) {
-  return String(value).replaceAll('%', '%%');
-}
-
 export function writeWindowsServiceLauncher(cliPath = globalCliPath(), nodePath = process.execPath) {
-  const prefix = path.dirname(cliPath);
-  const nodeDir = path.dirname(nodePath);
-  const launcher = [
-    '@echo off',
-    'setlocal DisableDelayedExpansion',
-    `set "NPM_CONFIG_PREFIX=${windowsBatchValue(prefix)}"`,
-    `set "PATH=${windowsBatchValue(nodeDir)};%PATH%"`,
-    `call "${windowsBatchValue(cliPath)}" start --service`,
-    'exit /b %ERRORLEVEL%',
-    '',
-  ].join('\r\n');
+  const launcher = windowsServiceLauncherText(cliPath, nodePath);
   fs.mkdirSync(configDir, { recursive:true, mode:0o700 });
   const temporary = `${windowsServiceLauncherFile}.${process.pid}.${Date.now()}.tmp`;
   fs.writeFileSync(temporary, launcher, { mode:0o700 });
@@ -263,6 +250,9 @@ export function installWindowsService(cliPath = globalCliPath(), { nodePath = pr
   // instead of changing it afterwards: schtasks /Change can request the account password even when
   // the task already belongs to the current user, which turns a one-command install into a prompt.
   run('schtasks.exe', ['/Create', '/TN', windowsTaskName, '/TR', command, '/SC', 'ONLOGON', '/RL', 'HIGHEST', '/IT', '/F']);
+  // The default Windows task policy expires long-running tasks and stops them on battery.
+  // Apply guarded failure recovery without changing the interactive-user principal/session.
+  run('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', windowsTaskReliabilityCommand(windowsTaskName)]);
   run('schtasks.exe', ['/Run', '/TN', windowsTaskName]);
 }
 

package/src/cli/windows-supervisor.mjs

@@ -0,0 +1,55 @@
+// Recovery for the signed-in user's interactive ReMCP agent on Windows.
+// The desktop UI cannot run in Session 0: this intentionally retains /IT and ONLOGON.
+import path from 'node:path';
+
+function windowsBatchValue(value) {
+  // cmd.exe expands % even inside quoted strings. Escape user-controlled prefix paths.
+  return String(value).replaceAll('%', '%%');
+}
+
+export function windowsServiceLauncherText(cliPath, nodePath) {
+  // Tests can simulate win32 from a POSIX runner with injected temporary paths.
+  // Native Windows paths always use win32 parsing; POSIX-shaped fixtures keep their roots.
+  const dirname = file => /^[A-Za-z]:[\\/]/.test(file) || file.includes('\\')
+    ? path.win32.dirname(file) : path.dirname(file);
+  const prefix = dirname(cliPath);
+  const nodeDir = dirname(nodePath);
+  return [
+    '@echo off',
+    'setlocal DisableDelayedExpansion',
+    `set "NPM_CONFIG_PREFIX=${windowsBatchValue(prefix)}"`,
+    `set "PATH=${windowsBatchValue(nodeDir)};%PATH%"`,
+    ':remcp_restart',
+    `call "${windowsBatchValue(cliPath)}" start --service`,
+    // Restart even after a clean unexpected exit. A deliberate stop ends the Scheduled Task
+    // process tree, so this supervisor cannot resurrect an intentionally stopped service.
+    'rem Reconnect after an interrupted upgrade or a transient crash without logging in again.',
+    // timeout.exe may fail when Scheduler redirects stdin; loopback ping supplies the delay
+    // without stdin, a helper service, or any public network dependency.
+    'ping.exe -n 6 127.0.0.1 >nul',
+    'goto remcp_restart',
+    '',
+  ].join('\r\n');
+}
+
+export function windowsTaskReliabilityCommand(taskName) {
+  if (typeof taskName !== 'string' || !/^[A-Za-z0-9 _-]{1,80}$/.test(taskName)) {
+    throw new Error('Invalid Windows task name');
+  }
+  const safeName = taskName.replaceAll("'", "''");
+  return [
+    "$ErrorActionPreference = 'Stop'",
+    `$taskName = '${safeName}'`,
+    // Never default to 72h termination. Keep a single interactive instance and
+    // allow running on battery. Scheduler recovers the wrapper if cmd itself fails.
+    '$settings = New-ScheduledTaskSettingsSet -ExecutionTimeLimit ([TimeSpan]::Zero) ' +
+      '-AllowStartIfOnBatteries -DontStopIfGoingOnBatteries ' +
+      '-MultipleInstances IgnoreNew -RestartCount 99 ' +
+      '-RestartInterval (New-TimeSpan -Minutes 1) -StartWhenAvailable',
+    'Set-ScheduledTask -TaskName $taskName -Settings $settings -ErrorAction Stop | Out-Null',
+    // Verify the OS accepted the important properties instead of assuming success.
+    '$configured = (Get-ScheduledTask -TaskName $taskName -ErrorAction Stop).Settings',
+    "if ($configured.ExecutionTimeLimit -ne 'PT0S' -or $configured.RestartCount -lt 1) {" +
+      " throw 'Windows Task Scheduler did not persist the ReMCP recovery policy' }",
+  ].join('; ');
+}