From 3edb75f12dc55e2bd5771994b656940da0b7ac2c Mon Sep 17 00:00:00 2001
From: cpjet64 <curt.petricca@yahoo.com>
Date: Thu, 18 Jun 2026 13:59:14 -0400
Subject: [PATCH 1/2] Fix dev server spawn on Windows

---
 scripts/dev-server.mjs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/dev-server.mjs b/scripts/dev-server.mjs
index 5585bda..993c614 100644
--- a/scripts/dev-server.mjs
+++ b/scripts/dev-server.mjs
@@ -1,9 +1,12 @@
 import { spawn } from "node:child_process";
+import { createRequire } from "node:module";
 import { readdirSync, statSync, watch } from "node:fs";
 import { join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const repoRoot = resolve(fileURLToPath(new URL("..", import.meta.url)));
+const require = createRequire(import.meta.url);
+const tsxCliPath = require.resolve("tsx/cli");
 const watchRoots = ["src"].map((entry) => join(repoRoot, entry));
 const restartDelayMs = 750;
 const crashDelayMs = 1500;
@@ -19,7 +22,7 @@ function log(message) {
 
 function start() {
   stoppingForRestart = false;
-  child = spawn("npx", ["tsx", "src/cli.ts", "serve"], {
+  child = spawn(process.execPath, [tsxCliPath, "src/cli.ts", "serve"], {
     cwd: repoRoot,
     env: process.env,
     stdio: "inherit",

From 6c9c9cfcee071edf7522369a386623ab6792d480 Mon Sep 17 00:00:00 2001
From: cpjet64 <curt.petricca@yahoo.com>
Date: Thu, 18 Jun 2026 14:06:04 -0400
Subject: [PATCH 2/2] Add dev server spawn regression test

---
 package.json                |  2 +-
 scripts/dev-server.mjs      | 33 ++++++++++++++++++++++++---------
 scripts/dev-server.test.mjs | 10 ++++++++++
 3 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 scripts/dev-server.test.mjs

diff --git a/package.json b/package.json
index f8d3903..bc1420b 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "build:app": "vite build",
     "dev": "node scripts/dev-server.mjs",
     "start": "node dist/cli.js serve",
-    "test": "tsx src/config.test.ts && tsx src/roots.test.ts && tsx src/skills.test.ts && tsx src/workspaces.test.ts && tsx src/review-checkpoints.test.ts",
+    "test": "node scripts/dev-server.test.mjs && tsx src/config.test.ts && tsx src/roots.test.ts && tsx src/skills.test.ts && tsx src/workspaces.test.ts && tsx src/review-checkpoints.test.ts",
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "keywords": [],
diff --git a/scripts/dev-server.mjs b/scripts/dev-server.mjs
index 993c614..2575214 100644
--- a/scripts/dev-server.mjs
+++ b/scripts/dev-server.mjs
@@ -4,7 +4,8 @@ import { readdirSync, statSync, watch } from "node:fs";
 import { join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
-const repoRoot = resolve(fileURLToPath(new URL("..", import.meta.url)));
+const scriptPath = fileURLToPath(import.meta.url);
+export const repoRoot = resolve(fileURLToPath(new URL("..", import.meta.url)));
 const require = createRequire(import.meta.url);
 const tsxCliPath = require.resolve("tsx/cli");
 const watchRoots = ["src"].map((entry) => join(repoRoot, entry));
@@ -20,9 +21,17 @@ function log(message) {
   console.error(`[devspace:dev] ${message}`);
 }
 
+export function createServerCommand() {
+  return {
+    command: process.execPath,
+    args: [tsxCliPath, "src/cli.ts", "serve"],
+  };
+}
+
 function start() {
   stoppingForRestart = false;
-  child = spawn(process.execPath, [tsxCliPath, "src/cli.ts", "serve"], {
+  const { command, args } = createServerCommand();
+  child = spawn(command, args, {
     cwd: repoRoot,
     env: process.env,
     stdio: "inherit",
@@ -111,13 +120,19 @@ function shutdown() {
   setTimeout(() => process.exit(1), 3000).unref();
 }
 
-for (const signal of ["SIGINT", "SIGTERM"]) {
-  process.on(signal, shutdown);
-}
+function main() {
+  for (const signal of ["SIGINT", "SIGTERM"]) {
+    process.on(signal, shutdown);
+  }
 
-for (const root of watchRoots) {
-  watchDirectory(root);
+  for (const root of watchRoots) {
+    watchDirectory(root);
+  }
+
+  log("watching src; server restarts on changes and after crashes");
+  start();
 }
 
-log("watching src; server restarts on changes and after crashes");
-start();
+if (resolve(process.argv[1] ?? "") === scriptPath) {
+  main();
+}
diff --git a/scripts/dev-server.test.mjs b/scripts/dev-server.test.mjs
new file mode 100644
index 0000000..8e7ecf5
--- /dev/null
+++ b/scripts/dev-server.test.mjs
@@ -0,0 +1,10 @@
+import assert from "node:assert/strict";
+import { createRequire } from "node:module";
+import { createServerCommand } from "./dev-server.mjs";
+
+const require = createRequire(import.meta.url);
+
+assert.deepEqual(createServerCommand(), {
+  command: process.execPath,
+  args: [require.resolve("tsx/cli"), "src/cli.ts", "serve"],
+});