@hexclave/cli 1.0.70 → 1.0.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hexclave/cli",
-  "version": "1.0.70",
+  "version": "1.0.71",
   "repository": "https://github.com/hexclave/hexclave",
   "description": "The CLI for Hexclave. https://hexclave.com",
   "main": "dist/index.js",
@@ -23,14 +23,16 @@
     "@inquirer/prompts": "^7.0.0",
     "@sentry/node": "^10.42.0",
     "commander": "^13.1.0",
+    "cross-spawn": "^7.0.6",
     "extract-zip": "^2.0.1",
     "jiti": "^2.4.2",
     "tar": "^7.4.3",
-    "@hexclave/shared-backend": "1.0.70",
-    "@hexclave/js": "1.0.70",
-    "@hexclave/shared": "1.0.70"
+    "@hexclave/shared-backend": "1.0.71",
+    "@hexclave/js": "1.0.71",
+    "@hexclave/shared": "1.0.71"
   },
   "devDependencies": {
+    "@types/cross-spawn": "^6.0.6",
     "@types/node": "22.15.21",
     "rimraf": "^6.0.1",
     "tsdown": "^0.22.3",

package/src/commands/dev.test.ts

@@ -1,9 +1,9 @@
-import { mkdtempSync, rmSync } from "fs";
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { recordLocalDashboardProcess } from "../lib/dev-env-state.js";
-import { configErrorLogPrefix, devDashboardCommandFromEnv, isHeartbeatResponse, isVersionNewer, killLocalDashboard, logConfigSyncEvents, processExists, shouldRestartDashboard } from "./dev.js";
+import { configErrorLogPrefix, dashboardEnvWithStatePath, devDashboardCommandFromEnv, isHeartbeatResponse, isVersionNewer, killLocalDashboard, logConfigSyncEvents, processExists, runChildProcess, shouldRestartDashboard } from "./dev.js";
 
 describe("isVersionNewer", () => {
   it("compares core versions numerically", () => {
@@ -88,6 +88,91 @@ describe("devDashboardCommandFromEnv", () => {
   });
 });
 
+describe("dashboardEnvWithStatePath", () => {
+  it("passes the resolved state path to the dashboard child", () => {
+    expect(dashboardEnvWithStatePath({ NODE_ENV: "production" }, "C:\\Users\\Test\\AppData\\Local\\Hexclave\\dev-envs.json")).toEqual({
+      NODE_ENV: "production",
+      STACK_DEV_ENVS_PATH: "C:\\Users\\Test\\AppData\\Local\\Hexclave\\dev-envs.json",
+    });
+  });
+
+  it("preserves an explicit state path override", () => {
+    expect(dashboardEnvWithStatePath({
+      STACK_DEV_ENVS_PATH: "C:\\custom\\dev-envs.json",
+    }, "C:\\Users\\Test\\AppData\\Local\\Hexclave\\dev-envs.json").STACK_DEV_ENVS_PATH).toBe("C:\\custom\\dev-envs.json");
+  });
+});
+
+describe("runChildProcess", () => {
+  const args = [
+    "plain",
+    "space containing argument",
+    "a&b",
+    "%PATH%",
+    "!PATH!",
+    "^caret",
+    'a"quoted"b',
+    '{"json":"value"}',
+    "trailing\\",
+    'back\\slash"quote',
+    "",
+  ];
+
+  function createArgvShim() {
+    const tempDir = mkdtempSync(join(tmpdir(), "hexclave-windows-argv-"));
+    const outputPath = join(tempDir, "argv.json");
+    const scriptPath = join(tempDir, "print-argv.cjs");
+    const shimPath = join(tempDir, "print-argv.cmd");
+
+    writeFileSync(scriptPath, [
+      'const fs = require("node:fs");',
+      "const args = process.argv.slice(2);",
+      'fs.writeFileSync(process.env.HEXCLAVE_TEST_ARGV_OUTPUT, JSON.stringify(args));',
+    ].join("\n"));
+    writeFileSync(shimPath, [
+      "@echo off",
+      `node "%~dp0print-argv.cjs" %*`,
+    ].join("\r\n"));
+
+    return { outputPath, shimPath, tempDir };
+  }
+
+  it.skipIf(process.platform !== "win32")("preserves argv through a Windows command shim", async () => {
+    const { outputPath, shimPath, tempDir } = createArgvShim();
+
+    try {
+      await expect(runChildProcess({
+        command: shimPath,
+        args,
+      }, {
+        ...process.env,
+        HEXCLAVE_TEST_ARGV_OUTPUT: outputPath,
+      })).resolves.toBe(0);
+      expect(JSON.parse(readFileSync(outputPath, "utf8"))).toEqual(args);
+    } finally {
+      rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  it.skipIf(process.platform !== "win32")("resolves a bare command name to its Windows shim", async () => {
+    const { outputPath, tempDir } = createArgvShim();
+
+    try {
+      await expect(runChildProcess({
+        command: "print-argv",
+        args,
+      }, {
+        ...process.env,
+        PATH: `;${tempDir};${process.env.PATH ?? ""}`,
+        HEXCLAVE_TEST_ARGV_OUTPUT: outputPath,
+      })).resolves.toBe(0);
+      expect(JSON.parse(readFileSync(outputPath, "utf8"))).toEqual(args);
+    } finally {
+      rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
+});
+
 describe("configErrorLogPrefix", () => {
   it("highlights the config error badge when color is supported", () => {
     expect(configErrorLogPrefix(true)).toBe("[Hexclave] \x1b[41;37;1m[CONFIG ERROR]\x1b[0m ");

package/src/commands/dev.ts

@@ -1,5 +1,6 @@
 import { execFileSync, spawn, type ChildProcess } from "child_process";
 import { Command } from "commander";
+import crossSpawn from "cross-spawn";
 import { chmodSync, closeSync, cpSync, existsSync, mkdirSync, openSync, readdirSync, readFileSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "fs";
 import { dirname, join, resolve } from "path";
 import { DEFAULT_API_URL, DEFAULT_PUBLISHABLE_CLIENT_KEY, resolveLoginConfig } from "../lib/auth.js";
@@ -70,6 +71,13 @@ const REQUIRED_DASHBOARD_RUNTIME_ENV_VARS = new Set([
   DASHBOARD_PORT_ENV_VAR,
 ]);
 
+export function dashboardEnvWithStatePath(env: NodeJS.ProcessEnv, statePath: string): NodeJS.ProcessEnv {
+  return {
+    ...env,
+    STACK_DEV_ENVS_PATH: env.STACK_DEV_ENVS_PATH ?? statePath,
+  };
+}
+
 type DashboardSessionState = {
   session: DashboardSessionResponse,
   dashboardReachableSinceMs: number,
@@ -436,7 +444,7 @@ async function startDashboardIfNeeded(options: { apiBaseUrl: string, secret: str
 
   const progress = startProgress(`Hexclave dashboard not found on port ${options.port}. Starting now`, { prefix: LOG_PREFIX });
   const dashboardEnv = {
-    ...process.env,
+    ...dashboardEnvWithStatePath(process.env, devEnvStatePath()),
     NODE_ENV: devDashboardCommand == null ? "production" : "development",
     PORT: String(options.port),
     HOSTNAME: "0.0.0.0",
@@ -718,10 +726,11 @@ child.on("error", (error) => {
 });
 `;
 
-function runChildProcess(command: ChildCommand, env: NodeJS.ProcessEnv): Promise<number> {
+export function runChildProcess(command: ChildCommand, env: NodeJS.ProcessEnv): Promise<number> {
   return new Promise((resolvePromise, reject) => {
     const child = process.platform === "win32"
-      ? spawn(command.command, command.args, { stdio: "inherit", env })
+      // cross-spawn handles Windows command shims that Node cannot spawn directly.
+      ? crossSpawn(command.command, command.args, { stdio: "inherit", env })
       : spawn(process.execPath, ["-e", APP_COMMAND_WRAPPER_SCRIPT], {
         detached: true,
         stdio: "inherit",