run-spaceapp 0.1.26 → 0.1.28

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "run-spaceapp",
-  "version": "0.1.26",
-  "spaceappRuntimeVersion": "0.1.26",
-  "spaceappHostRootRuntimeCompatible": true,
+  "version": "0.1.28",
+  "spaceappRuntimeVersion": "0.1.27",
+  "spaceappHostRootRuntimeCompatible": false,
   "description": "Cross-platform Docker launcher for the SpaceApp self-hosted agent workspace",
   "license": "Apache-2.0",
   "type": "module",
@@ -52,5 +52,5 @@
     "access": "public",
     "provenance": true
   },
-  "gitHead": "828ab44d62e2786effdc03066807f5370603f6ba"
+  "gitHead": "7bd6c6cb1f93e30fe9a38ddf90a103c22536b5d4"
 }

package/src/cli.mjs

@@ -1,6 +1,7 @@
 import { spawn } from "node:child_process";
 import { createHash, randomBytes } from "node:crypto";
 import { createReadStream, createWriteStream } from "node:fs";
+import { createInterface } from "node:readline";
 import {
   copyFile,
   mkdir,
@@ -82,6 +83,17 @@ const trustedEnvironmentNames = new Set([
   "SPACEAPP_RESUME_SCRIPT_PATH"
 ]);
 
+export function writeWindowsCredentialHint(platform, stderr) {
+  if (platform !== "win32") {
+    return;
+  }
+  stderr.write(
+    "If the failure above mentions Docker credentials (\"A specified logon session does not exist\"), " +
+    "Docker Desktop's credential helper requires an interactive Windows session. " +
+    `Run "${UNIVERSAL_COMMAND} install" from your desktop terminal (not SSH/CI), or open Docker Desktop and sign in once, then retry.\n`
+  );
+}
+
 export async function withHeadlessDockerConfig(platform, spec, run) {
   if (platform !== "win32") {
     return run(spec);
@@ -1078,6 +1090,7 @@ async function repairRuntime({ root, config, platform, stdin, stdout, stderr, ex
     (pullSpec) => execute(pullSpec, { stdin, stdout, stderr })
   );
   if (pullCode !== 0) {
+    writeWindowsCredentialHint(platform, stderr);
     return pullCode;
   }
   const upCode = await execute(
@@ -1127,6 +1140,7 @@ async function performUpdate({
       (pullSpec) => execute(pullSpec, { stdin, stdout, stderr })
     );
     if (pullCode !== 0) {
+      writeWindowsCredentialHint(platform, stderr);
       throw new Error(`Image pull failed with Docker exit ${pullCode}.`);
     }
     const upCode = await execute(
@@ -1848,12 +1862,88 @@ async function executeWithDockerDiagnostics(execute, spec, io, { platform, stder
 export async function readSecret(stdin, stdout, prompt, { mask = true } = {}) {
   stdout.write(prompt);
   if (!stdin.isTTY || typeof stdin.setRawMode !== "function") {
-    let value = "";
-    for await (const chunk of stdin) {
-      value += chunk;
-    }
+    // Non-TTY stdin (e.g. piped input on Windows through npx.cmd). Read only
+    // up to the first newline so an interactive console that reports non-TTY
+    // stdin still works: previously this drained the stream to EOF, so typing
+    // "y" + Enter looked frozen and a second keystroke produced "y\ny" and
+    // "Please answer y or n." loops. When the stream ends before a newline
+    // (fully piped answers), everything read is returned as-is so "y\nn\n"
+    // piped input still yields successive valid answers. Event listeners are
+    // used instead of the Readable async iterator because an abandoned
+    // iterator can destroy the stream, breaking the next prompt.
+    const value = await new Promise((resolve) => {
+      let answer = "";
+      const finish = (result) => {
+        cleanup();
+        resolve(result);
+      };
+      // Paused-mode reads: consume exactly one line from the buffer, leaving
+      // the rest (and the stream itself) intact for the next prompt.
+      const onReadable = () => {
+        let chunk;
+        while ((chunk = stdin.read()) !== null) {
+          for (const character of String(chunk)) {
+            if (character === "\r" || character === "\n") {
+              finish(answer);
+              return;
+            }
+            answer += character;
+          }
+        }
+      };
+      const onEnd = () => finish(answer);
+      const onClose = () => finish(answer);
+      const cleanup = () => {
+        stdin.off("readable", onReadable);
+        stdin.off("end", onEnd);
+        stdin.off("close", onClose);
+      };
+      if (typeof stdin.read === "function" && typeof stdin.on === "function") {
+        stdin.on("readable", onReadable);
+        stdin.once("end", onEnd);
+        stdin.once("close", onClose);
+        onReadable();
+      } else {
+        // Fallback for exotic streams without readable-mode support.
+        const iterator = stdin[Symbol.asyncIterator]();
+        (async () => {
+          for (;;) {
+            const step = await iterator.next();
+            if (step.done) {
+              finish(answer);
+              return;
+            }
+            for (const character of String(step.value)) {
+              if (character === "\r" || character === "\n") {
+                finish(answer);
+                return;
+              }
+              answer += character;
+            }
+          }
+        })().catch(() => finish(answer));
+      }
+    });
+    stdout.write("\n");
+    return value;
+  }
+  if (process.platform === "win32") {
+    // Windows consoles (PowerShell 7 / ConPTY) do not reliably forward
+    // raw-mode keystrokes to native children: a "y" + Enter can be frozen,
+    // split across chunks, or doubled ("yy" -> "Please answer y or n.").
+    // Read cooked console lines without setRawMode instead; the console
+    // itself provides line editing and echo.
+    const rl = createInterface({ input: stdin, terminal: false, crlfDelay: Infinity });
+    const cooked = await new Promise((resolve) => {
+      let got = null;
+      rl.on("line", (line) => {
+        got = line;
+        rl.close();
+      });
+      rl.on("close", () => resolve(got ?? ""));
+    });
     stdout.write("\n");
-    return value.replace(/[\r\n]+$/, "");
+    return cooked;
   }
   stdin.setRawMode(true);
   stdin.resume();

package/src/index.mjs

@@ -173,11 +173,22 @@ export function upgradePath(sourceVersion, targetVersion) {
 
 export async function inspectSystemResources(root) {
   validateHome(root);
+  // Stat the nearest existing ancestor: on a clean Linux home the install
+  // root's parent (~/.config) may not exist yet, and statfs on a missing
+  // path throws ENOENT. Walking up guarantees a real mount point for the
+  // free-disk measurement.
   let target = root;
-  try {
-    await stat(target);
-  } catch {
-    target = dirname(root);
+  for (;;) {
+    try {
+      await stat(target);
+      break;
+    } catch {
+      const parent = dirname(target);
+      if (parent === target) {
+        break;
+      }
+      target = parent;
+    }
   }
   const fileSystem = await statfs(target);
   return {

package/templates/compose.yml

@@ -10,6 +10,7 @@ services:
     environment:
       SPACE_PUBLIC_DISTRIBUTION: "true"
       SPACE_DEV_LOGIN: "false"
+      SPACE_APP_VERSION: "${SPACEAPP_IMAGE_TAG}"
       SPACE_TELEMETRY_ENABLED: "${SPACEAPP_TELEMETRY}"
       SPACE_RUNTIME_STORE: postgres
       SPACE_DATABASE_URL_SOURCE_FILE: /run/secrets/database-url