@cydm/happy-elves 0.1.0-beta.271 → 0.1.0-beta.272

package/apps/cli/dist/commands/remote.js

@@ -255,7 +255,10 @@ async function waitForDaemonLifecycle(client, machineId, requestId, action, opti
         catch (error) {
             lastError = error;
             const code = errorCode(error);
-            if (code !== "MACHINE_OFFLINE" && code !== "COMMAND_TIMEOUT" && code !== "RELAY_CONNECT_TIMEOUT")
+            if (code !== "MACHINE_OFFLINE" &&
+                code !== "COMMAND_TIMEOUT" &&
+                code !== "RELAY_CONNECT_TIMEOUT" &&
+                code !== "RELAY_WEBSOCKET_ERROR")
                 throw error;
         }
         await sleep(1000);

package/apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves-cli",
-  "version": "0.1.0-beta.271",
+  "version": "0.1.0-beta.272",
   "private": true,
   "type": "module"
 }

package/apps/daemon/dist/relay/lifecycle.js

@@ -238,6 +238,8 @@ import fs from "node:fs/promises";
 import path from "node:path";
 
 const input = ${inputJson};
+let daemonStopAttempted = false;
+let daemonStopped = false;
 
 main().catch(async (error) => {
   await fail(error);
@@ -263,6 +265,11 @@ async function main() {
 async function fail(error) {
   const message = error instanceof Error ? error.stack || error.message : String(error);
   await log("runner failed: " + message).catch(() => {});
+  if (daemonStopAttempted) {
+    await restartDaemonAfterFailure().catch(async (restartError) => {
+      await log("failure recovery restart failed: " + String(restartError instanceof Error ? restartError.message : restartError)).catch(() => {});
+    });
+  }
   await updateState({ status: "failed", finishedAt: new Date().toISOString(), error: String(error instanceof Error ? error.message : error) }).catch(() => {});
 }
 
@@ -280,11 +287,13 @@ async function log(line) {
 }
 
 async function stopDaemon() {
+  daemonStopAttempted = true;
   await updateState({ status: "stopping" });
   const pid = await readPid();
   if (!pid || pid === process.pid) {
     await fs.rm(input.pidPath, { force: true }).catch(() => {});
     await log("no managed daemon pid to stop");
+    daemonStopped = true;
     return;
   }
   await log("stopping daemon pid " + pid);
@@ -298,6 +307,7 @@ async function stopDaemon() {
     if (!isPidAlive(pid)) {
       await fs.rm(input.pidPath, { force: true }).catch(() => {});
       await log("daemon stopped");
+      daemonStopped = true;
       return;
     }
     await delay(200);
@@ -333,6 +343,22 @@ async function startDaemon() {
   await spawnDetached(commandName("happy-elves"), ["daemon", "start", "--json"]);
 }
 
+async function restartDaemonAfterFailure() {
+  const currentlyRunning = await captureStatus().catch(() => undefined);
+  if (currentlyRunning?.ok === true && (currentlyRunning.data?.local?.running === true || currentlyRunning.data?.running === true)) {
+    await log("failure recovery skipped: daemon already running");
+    return;
+  }
+  if (!daemonStopped) {
+    await log("failure recovery skipped: daemon stop did not complete");
+    return;
+  }
+  await log("failure recovery attempting daemon restart");
+  await startDaemon();
+  await waitForDaemonRunning();
+  await log("failure recovery daemon running");
+}
+
 async function waitForDaemonRunning() {
   const deadline = Date.now() + 45_000;
   while (Date.now() < deadline) {
@@ -369,7 +395,8 @@ function statusCommand() {
 }
 
 async function spawnDetached(command, args) {
-  const child = spawn(command, args, {
+  const spec = spawnSpec(command, args);
+  const child = spawn(spec.command, spec.args, {
     cwd: input.configDir,
     detached: true,
     env: { ...process.env, HAPPY_ELVES_HOME: input.homeEnv },
@@ -377,13 +404,14 @@ async function spawnDetached(command, args) {
     windowsHide: true,
   });
   child.unref();
-  await log("spawned " + command + " pid " + (child.pid || "unknown"));
+  await log("spawned " + spec.command + " " + spec.args.join(" ") + " pid " + (child.pid || "unknown"));
 }
 
 async function run(command, args, options = {}) {
-  await log("run " + command + " " + args.join(" "));
+  const spec = spawnSpec(command, args);
+  await log("run " + spec.command + " " + spec.args.join(" "));
   return await new Promise((resolve, reject) => {
-    const child = spawn(command, args, {
+    const child = spawn(spec.command, spec.args, {
       cwd: input.configDir,
       env: { ...process.env, HAPPY_ELVES_HOME: input.homeEnv },
       windowsHide: true,
@@ -450,7 +478,48 @@ function isPidAlive(pid) {
 }
 
 function commandName(name) {
-  return process.platform === "win32" ? name + ".cmd" : name;
+  return runnerPlatform() === "win32" ? name + ".cmd" : name;
+}
+
+function runnerPlatform() {
+  return process.env.HAPPY_ELVES_TEST_RUNNER_PLATFORM || process.platform;
+}
+
+function spawnSpec(command, args) {
+  if (runnerPlatform() !== "win32" || !/\\.cmd$/i.test(command)) {
+    return { command, args };
+  }
+  return {
+    command: process.env.ComSpec || process.env.COMSPEC || "cmd.exe",
+    args: ["/d", "/s", "/c", windowsCommandLine([command, ...args])],
+  };
+}
+
+function windowsCommandLine(parts) {
+  return parts.map(quoteWindowsArg).join(" ");
+}
+
+function quoteWindowsArg(value) {
+  const text = String(value);
+  if (text.length === 0) return '""';
+  if (!/[\\s"]/u.test(text)) return text;
+  let result = '"';
+  let backslashes = 0;
+  for (const char of text) {
+    if (char === "\\\\") {
+      backslashes += 1;
+      continue;
+    }
+    if (char === '"') {
+      result += "\\\\".repeat(backslashes * 2 + 1) + '"';
+      backslashes = 0;
+      continue;
+    }
+    result += "\\\\".repeat(backslashes) + char;
+    backslashes = 0;
+  }
+  result += "\\\\".repeat(backslashes * 2) + '"';
+  return result;
 }
 
 function compact(text) {

package/apps/daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves-daemon",
-  "version": "0.1.0-beta.271",
+  "version": "0.1.0-beta.272",
   "private": true,
   "type": "module"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves",
-  "version": "0.1.0-beta.271",
+  "version": "0.1.0-beta.272",
   "description": "Remote controller for local coding agents with hosted or self-hosted relay support.",
   "type": "module",
   "bin": {