castle-web-cli 0.4.9 → 0.4.11

package/dist/init.js

@@ -70,7 +70,6 @@ function makePackageJson(projectDir) {
         private: true,
         type: 'module',
         scripts: {
-            serve: `node ${cliEntry} serve . --open`,
             restart: `node ${cliEntry} restart .`,
             screenshot: `node ${cliEntry} screenshot .`,
             'save-deck': `node ${cliEntry} save-deck .`,

package/dist/serve.js

@@ -74,6 +74,38 @@ function readDeckContext(projectDir) {
 }
 const DEFAULT_PORT = 5757;
 const SCREENSHOT_REQUEST_TTL_MS = 15_000;
+function readServeJson(projectDir) {
+    try {
+        const raw = fs.readFileSync(path.join(projectDir, '.castle', 'serve.json'), 'utf8');
+        const info = JSON.parse(raw);
+        if (typeof info.port !== 'number' || typeof info.wsPort !== 'number' || typeof info.pid !== 'number')
+            return null;
+        return { port: info.port, wsPort: info.wsPort, pid: info.pid };
+    }
+    catch {
+        return null;
+    }
+}
+function isPidAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+// Return the live serve already owning this deck, if any. Lets repeated
+// `castle-web serve`/`npm run serve` calls become idempotent instead of
+// piling up independent vite instances on adjacent ports.
+function existingServe(projectDir) {
+    const info = readServeJson(projectDir);
+    if (!info)
+        return null;
+    if (!isPidAlive(info.pid))
+        return null;
+    return info;
+}
 export async function serve(dir, options = {}) {
     const projectDir = path.resolve(dir);
     if (!fs.existsSync(projectDir)) {
@@ -84,6 +116,18 @@ export async function serve(dir, options = {}) {
         console.error(`No index.html found in ${projectDir}`);
         process.exit(1);
     }
+    // If a live serve is already running for this deck, reuse it. Skip the
+    // dedup when --port / --host are passed (caller wants those specifics, so
+    // start a fresh serve even if another is up).
+    if (!options.port && !options.host) {
+        const existing = existingServe(projectDir);
+        if (existing) {
+            console.log(`Serve already running for ${projectDir}`);
+            console.log(`URL: http://localhost:${existing.port}`);
+            console.log(`PID: ${existing.pid}`);
+            return;
+        }
+    }
     // --detach is kept for back-compat. Agent evals (and any harness running
     // castle-web in a context that can't manage a foreground process) should
     // prefer the CASTLE_WEB_CLI_DETACH=1 env var instead.
@@ -210,12 +254,17 @@ async function serveDetached(projectDir, options) {
         args.push('--host', options.host);
     if (options.open)
         args.push('--open');
-    // We stay in the parent's process group (no detached: true) so that when
+    // CASTLE_WEB_CLI_DETACH=1 → spawn as a new session leader (fully
+    // independent; survives caller). This is the eval-harness mode where the
+    // harness manages cleanup itself.
+    // Default → child stays in the caller's process group / session, so when
     // the agent / shell that invoked `castle-web init` exits, SIGHUP reaches
-    // this serve and it dies with the session. The `.unref()` is what lets
-    // the calling node process exit while the serve keeps running until then.
+    // this serve and it dies with the session.
+    // `.unref()` is what lets the calling node process exit either way.
+    const fullDetach = process.env.CASTLE_WEB_CLI_DETACH === '1';
     const child = spawn(process.execPath, [entry, ...args], {
         cwd: projectDir,
+        detached: fullDetach,
         stdio: ['ignore', logFd, logFd],
         env: process.env,
     });

package/kits/basic-2d/package.json

@@ -3,7 +3,6 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "serve": "node ../../cli/dist/index.js serve . --open",
     "restart": "node ../../cli/dist/index.js restart .",
     "screenshot": "node ../../cli/dist/index.js screenshot .",
     "check": "eslint . && jscpd && node --input-type=module -e \"const { bundleProject } = await import('../../cli/dist/bundle.js'); await bundleProject('.');\""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "castle-web-cli",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "type": "module",
   "bin": {
     "castle-web": "./dist/index.js"