run-spaceapp 0.1.9 → 0.1.11

package/README.md

@@ -2,22 +2,17 @@
 
 Cross-platform Docker launcher for SpaceApp.
 
-Linux:
+Run the same command in Linux, macOS, or Windows 11 Command Prompt:
 
 ```bash
-sudo npm install -g run-spaceapp && spaceapp install
+npx --yes run-spaceapp install
 ```
 
-macOS:
+To keep a global `spaceapp` command for later operations, install it
+separately:
 
 ```bash
-npm install -g run-spaceapp && spaceapp install
-```
-
-Windows 11 PowerShell:
-
-```powershell
-npm install -g run-spaceapp; if ($LASTEXITCODE -eq 0) { spaceapp install }
+npm install -g run-spaceapp
 ```
 
 The launcher requires Node.js 20.11 or newer, 4 CPUs, 8 GB RAM, and 15 GiB free
@@ -28,15 +23,19 @@ images. Windows prefers Windows Package Manager's hash-pinned Docker Desktop
 manifest and retains a signed direct-download fallback. Docker Desktop license
 acceptance and Linux `docker` group membership require confirmation inside the
 same command. On Windows, approve any UAC prompt required by WSL2 or Docker
-Desktop. On Docker Desktop's first launch, select **Skip** in the top-right of
-the **Welcome to Docker** window (or sign in), accept any remaining Docker
-prompt, and keep the terminal open. SpaceApp waits for up to ten minutes and
-continues automatically when Docker is ready. If Windows requests one restart,
-rerun `spaceapp install` afterward and installation continues safely.
-
-The launcher selects the `light` profile below 12 GiB RAM and the `standard`
-profile otherwise; override this with `--profile light` or
-`--profile standard`.
+Desktop. Use the **Command Prompt** profile because a restricted PowerShell
+policy can block npm's `npx.ps1` before SpaceApp starts. On Docker Desktop's
+first launch, select **Skip** in the top-right of the **Welcome to Docker**
+window (or sign in), accept any remaining Docker prompt, and keep the terminal
+open. SpaceApp waits for up to ten minutes and continues automatically when
+Docker is ready. If WSL2 requires one restart, SpaceApp registers a one-time
+resume and asks before scheduling it. Sign back in after Windows restarts; the
+same install continues automatically in Command Prompt without entering a
+second command.
+
+The launcher defaults to the `light` profile on every system. Select
+`--profile standard` explicitly when managed Chromium is required and the host
+has the recommended resources.
 
 Light mode retains every bundled CLI and the core data/workflow services while
 omitting managed Chromium. Resource limits are maximums, not immediate RAM or

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "run-spaceapp",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Cross-platform Docker launcher for the SpaceApp self-hosted agent workspace",
   "license": "Apache-2.0",
   "type": "module",
   "bin": {
-    "spaceapp": "bin/spaceapp.mjs"
+    "spaceapp": "bin/spaceapp.mjs",
+    "run-spaceapp": "bin/spaceapp.mjs"
   },
   "exports": {
     ".": "./src/index.mjs"
@@ -45,5 +46,5 @@
     "access": "public",
     "provenance": true
   },
-  "gitHead": "bca19d7f71db3bfb097c4c00146b4f51957494d9"
+  "gitHead": "c53e6dd08441f3a517f21f7b0ca6f82ec36a1761"
 }

package/src/cli.mjs

@@ -38,6 +38,7 @@ const trustedCommands = new Set([
   "open",
   "powershell.exe",
   "sg",
+  "shutdown.exe",
   "spctl",
   "sudo",
   "winget.exe",
@@ -45,7 +46,8 @@ const trustedCommands = new Set([
   "xdg-open"
 ]);
 const trustedEnvironmentNames = new Set([
-  "SPACEAPP_DOCKER_INSTALLER_PATH"
+  "SPACEAPP_DOCKER_INSTALLER_PATH",
+  "SPACEAPP_RESUME_SCRIPT_PATH"
 ]);
 
 export async function run(argv, {
@@ -295,7 +297,7 @@ async function installCommand(args, {
     stdout,
     stderr,
     execute,
-    installArgs: { requestedProfile, noOpen }
+    installArgs: { root, requestedProfile, noOpen }
   });
   if (prerequisiteResult.reexecuted || prerequisiteResult.code !== 0) {
     if (prerequisiteResult.code !== 0) {
@@ -816,6 +818,7 @@ function spawnTrustedCommand(spec, options) {
     case "powershell.exe":
       return spawn("powershell.exe", windowsPowerShellArgs(spec.operation), options);
     case "sg": return spawn("sg", args, options);
+    case "shutdown.exe": return spawn("shutdown.exe", args, options);
     case "spctl": return spawn("spctl", args, options);
     case "sudo": return spawn("sudo", args, options);
     case "winget.exe": return spawn("winget.exe", args, options);

package/src/index.mjs

@@ -20,7 +20,6 @@ import {
 } from "./string-utils.mjs";
 
 const CONFIG_SCHEMA_VERSION = 2;
-const AUTO_LIGHT_MEMORY_THRESHOLD_BYTES = 12 * 1024 ** 3;
 const MIN_INSTALL_CPU_COUNT = 4;
 const MIN_INSTALL_MEMORY_BYTES = 8_000_000_000;
 const MIN_INSTALL_MEMORY_LABEL = "8 GB";
@@ -100,7 +99,7 @@ export function resolveInstallProfile(requestedProfile, totalMemoryBytes) {
   if (!Number.isFinite(totalMemoryBytes) || totalMemoryBytes <= 0) {
     throw new Error("Total system memory must be available for automatic profile selection.");
   }
-  return totalMemoryBytes < AUTO_LIGHT_MEMORY_THRESHOLD_BYTES ? "light" : "standard";
+  return "light";
 }
 
 export async function inspectSystemResources(root) {
@@ -140,7 +139,7 @@ export function installResourceChecks(resources) {
   ];
 }
 
-export function createDefaultConfig({ version, profile = "standard" }) {
+export function createDefaultConfig({ version, profile = "light" }) {
   assertVersion(version);
   if (profile !== "light" && profile !== "standard") {
     throw new Error("Default config requires a resolved light or standard profile.");
@@ -484,6 +483,9 @@ export async function initializeInstallation(root, {
     mkdir(join(root, "backups"), { recursive: true, mode: 0o700 }),
     mkdir(join(root, "secrets", "providers"), { recursive: true, mode: 0o700 })
   ]);
+  const resolvedProfile = profile === undefined
+    ? undefined
+    : resolveInstallProfile(profile, totalmem());
   let config;
   try {
     config = await loadConfig(root);
@@ -491,10 +493,16 @@ export async function initializeInstallation(root, {
     if (error?.code !== "ENOENT") {
       throw error;
     }
-    config = createDefaultConfig({ version, profile: profile ?? "standard" });
+    config = createDefaultConfig({ version, profile: resolvedProfile ?? "light" });
   }
-  if (profile !== undefined) {
-    const resolvedProfile = resolveInstallProfile(profile, AUTO_LIGHT_MEMORY_THRESHOLD_BYTES);
+  if (config.version !== version) {
+    config = {
+      ...config,
+      version,
+      previousVersion: config.version
+    };
+  }
+  if (resolvedProfile !== undefined) {
     config = { ...config, profile: resolvedProfile };
   }
   await saveConfig(root, config);

package/src/prerequisites.mjs

@@ -1,5 +1,5 @@
 import { createWriteStream } from "node:fs";
-import { access, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { access, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join, posix, win32 } from "node:path";
 import process from "node:process";
@@ -43,6 +43,20 @@ export function windowsPowerShellArgs(operation) {
       "; exit $process.ExitCode",
       "} catch { exit 1 }"
     ].join(" "),
+    "windows-restart-pending": [
+      "$pending = (Test-Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Component Based Servicing\\RebootPending') -or (Test-Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\WindowsUpdate\\Auto Update\\RebootRequired')",
+      "if ($pending) { exit 0 }",
+      "exit 1"
+    ].join("; "),
+    "register-spaceapp-resume": [
+      "$ErrorActionPreference = 'Stop'",
+      "$path = $env:SPACEAPP_RESUME_SCRIPT_PATH",
+      "if ([string]::IsNullOrWhiteSpace($path) -or -not (Test-Path -LiteralPath $path -PathType Leaf)) { exit 1 }",
+      "$runOnce = 'HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce'",
+      "New-Item -Path $runOnce -Force | Out-Null",
+      "$command = 'cmd.exe /d /k call \"' + $path + '\"'",
+      "New-ItemProperty -Path $runOnce -Name 'SpaceAppResumeInstall' -Value $command -PropertyType String -Force | Out-Null"
+    ].join("; "),
     "verify-docker-installer": [
       "$path = $env:SPACEAPP_DOCKER_INSTALLER_PATH",
       "if ([string]::IsNullOrWhiteSpace($path)) { exit 1 }",
@@ -101,7 +115,9 @@ export async function ensureDockerAvailable({
   pathExists = fileExists,
   sleep = wait,
   osRelease,
-  installArgs
+  installArgs,
+  scheduleResume = scheduleWindowsInstallResume,
+  confirmRestart = confirmWindowsRestart
 }) {
   if (await dockerIsReady(execute)) {
     return { code: 0, reexecuted: false };
@@ -117,7 +133,10 @@ export async function ensureDockerAvailable({
       launch,
       download,
       pathExists,
-      sleep
+      sleep,
+      installArgs,
+      scheduleResume,
+      confirmRestart
     });
   }
   if (platform === "darwin") {
@@ -158,7 +177,10 @@ async function ensureWindowsDocker({
   launch,
   download,
   pathExists,
-  sleep
+  sleep,
+  installArgs,
+  scheduleResume,
+  confirmRestart
 }) {
   const paths = windowsDockerPaths(env);
   let application = await firstExisting(paths.applications, pathExists);
@@ -172,6 +194,7 @@ async function ensureWindowsDocker({
     }
   }
 
+  let wslInstalledNow = false;
   const wslCode = await execute(
     { command: "wsl.exe", args: ["--version"] },
     { stdin, stdout: null, stderr: null }
@@ -191,16 +214,64 @@ async function ensureWindowsDocker({
       );
       return { code: installWslCode, reexecuted: false };
     }
-    const installedWslCode = await execute(
-      { command: "wsl.exe", args: ["--version"] },
-      { stdin, stdout: null, stderr: null }
+    wslInstalledNow = true;
+  }
+
+  const restartPendingCode = await execute(
+    { command: "powershell.exe", operation: "windows-restart-pending" },
+    { stdin, stdout: null, stderr: null }
+  );
+  if (wslInstalledNow || restartPendingCode === 0) {
+    const scheduleCode = await scheduleResume({
+      ...installArgs,
+      execute,
+      stdin,
+      stdout,
+      stderr
+    });
+    if (scheduleCode !== 0) {
+      stderr.write(
+        "Windows must restart to finish WSL2, but SpaceApp could not schedule automatic continuation.\n" +
+        "Restart Windows, then run the same SpaceApp command again.\n"
+      );
+      return { code: scheduleCode, reexecuted: false };
+    }
+    stdout.write(
+      "Windows must restart to finish enabling WSL2.\n" +
+      "SpaceApp is scheduled to resume automatically after you sign in.\n"
     );
-    if (installedWslCode !== 0) {
+    const restartNow = await confirmRestart({
+      stdin,
+      stdout,
+      question: "Restart Windows in 15 seconds and continue SpaceApp after sign-in? [y/N] "
+    });
+    if (!restartNow) {
+      stdout.write(
+        "Restart Windows when ready. SpaceApp will resume automatically the next time you sign in.\n"
+      );
+      return { code: 0, reexecuted: true };
+    }
+    const restartCode = await execute(
+      {
+        command: "shutdown.exe",
+        args: [
+          "/r",
+          "/t", "15",
+          "/c", "SpaceApp will continue automatically after you sign in."
+        ]
+      },
+      { stdin, stdout, stderr }
+    );
+    if (restartCode !== 0) {
       stderr.write(
-        "Windows must restart to finish enabling WSL2. Restart Windows, then run the same SpaceApp command again.\n"
+        "Windows restart could not be scheduled. Restart Windows manually; SpaceApp will resume after sign-in.\n"
       );
-      return { code: 1, reexecuted: false };
+      return { code: restartCode, reexecuted: false };
     }
+    stdout.write(
+      "Windows will restart in 15 seconds. Save your work; run \"shutdown /a\" to cancel the countdown.\n"
+    );
+    return { code: 0, reexecuted: true };
   }
 
   if (!application) {
@@ -510,6 +581,10 @@ async function confirmDesktopInstall({ platformName, stdin, stdout }) {
   });
 }
 
+async function confirmWindowsRestart({ stdin, stdout, question }) {
+  return confirmQuestion({ stdin, stdout, question });
+}
+
 async function confirmQuestion({ stdin, stdout, question }) {
   const readline = createInterface({ input: stdin, output: stdout, terminal: Boolean(stdin.isTTY) });
   try {
@@ -716,10 +791,93 @@ function linuxReentryCommand({ requestedProfile = "auto", noOpen = false } = {})
   ].map(shellQuote).join(" ");
 }
 
+export function windowsResumeScript({
+  executable = process.execPath,
+  entrypoint = fileURLToPath(new URL("../bin/spaceapp.mjs", import.meta.url)),
+  requestedProfile = "auto",
+  noOpen = false
+} = {}) {
+  if (!["auto", "light", "standard"].includes(requestedProfile)) {
+    throw new Error("Invalid SpaceApp profile for Windows resume.");
+  }
+  if (typeof noOpen !== "boolean") {
+    throw new Error("Invalid SpaceApp browser option for Windows resume.");
+  }
+  for (const [name, value] of [["executable", executable], ["entrypoint", entrypoint]]) {
+    if (
+      typeof value !== "string" ||
+      !win32.isAbsolute(value) ||
+      /["\r\n%]/.test(value)
+    ) {
+      throw new Error(`Invalid SpaceApp Windows resume ${name}.`);
+    }
+  }
+  const command = [
+    windowsBatchQuote(executable),
+    windowsBatchQuote(entrypoint),
+    "install",
+    "--profile",
+    requestedProfile,
+    ...(noOpen ? ["--no-open"] : [])
+  ].join(" ");
+  return [
+    "@echo off",
+    "setlocal",
+    command,
+    'set "SPACEAPP_RESUME_EXIT=%ERRORLEVEL%"',
+    'if "%SPACEAPP_RESUME_EXIT%"=="0" del /f /q "%~f0"',
+    'if not "%SPACEAPP_RESUME_EXIT%"=="0" echo SpaceApp setup needs attention. Review the error above, then run this file again.',
+    "exit /b %SPACEAPP_RESUME_EXIT%",
+    ""
+  ].join("\r\n");
+}
+
+async function scheduleWindowsInstallResume({
+  root,
+  requestedProfile = "auto",
+  noOpen = false,
+  execute,
+  stdin,
+  stdout,
+  stderr
+} = {}) {
+  if (
+    typeof root !== "string" ||
+    !win32.isAbsolute(root) ||
+    /["\r\n%]/.test(root)
+  ) {
+    stderr?.write("SpaceApp could not determine a safe Windows resume path.\n");
+    return 1;
+  }
+  const resumePath = win32.join(root, "resume-install.cmd");
+  await mkdir(root, { recursive: true, mode: 0o700 });
+  await writeFile(
+    resumePath,
+    windowsResumeScript({ requestedProfile, noOpen }),
+    { encoding: "utf8", mode: 0o600 }
+  );
+  const code = await execute(
+    {
+      command: "powershell.exe",
+      operation: "register-spaceapp-resume",
+      env: { SPACEAPP_RESUME_SCRIPT_PATH: resumePath }
+    },
+    { stdin, stdout: null, stderr }
+  );
+  if (code !== 0) {
+    await rm(resumePath, { force: true });
+  }
+  return code;
+}
+
 function shellQuote(value) {
   return `'${String(value).replaceAll("'", "'\\''")}'`;
 }
 
+function windowsBatchQuote(value) {
+  return `"${String(value)}"`;
+}
+
 async function waitForDocker({ execute, sleep, attempts = 90 }) {
   for (let attempt = 0; attempt <= attempts; attempt += 1) {
     if (await dockerIsReady(execute)) {