@paleo/workspace 0.14.1 → 0.14.2

package/dist/dev-server.js

@@ -82,17 +82,7 @@ async function start(config, mainWorktree, options) {
     if (await runStartChecks(config, mainWorktree, ctx, options))
         return;
     const state = { spawnPids: {}, startedCallbacks: [] };
-    try {
-        await spawnAndAwait(config, ctx, state);
-    }
-    catch (err) {
-        await rollbackStart(state.spawnPids, state.startedCallbacks, ctx);
-        if (err instanceof StartupError) {
-            handleStartupFailure(err);
-            process.exit(1);
-        }
-        throw err;
-    }
+    await spawnWithRollback(config, ctx, state);
     const slot = registerStartedServer(config, mainWorktree, state.spawnPids);
     printStartSummary(config, slot, state.spawnPids);
 }
@@ -121,16 +111,10 @@ async function runForeground(config, mainWorktree, options) {
     process.on("SIGTERM", onSignal);
     if (await runStartChecks(config, mainWorktree, ctx, options))
         process.exit(0);
-    try {
-        await spawnAndAwait(config, ctx, state);
-    }
-    catch (err) {
-        await rollbackStart(state.spawnPids, state.startedCallbacks, ctx);
-        if (err instanceof StartupError) {
-            handleStartupFailure(err);
-            process.exit(1);
-        }
-        throw err;
+    // A signal during startup hands teardown to onSignal (rollback + exit 130); block so we
+    // neither roll back twice nor register a server that is being torn down.
+    if (!(await spawnWithRollback(config, ctx, state, () => shuttingDown))) {
+        await new Promise(() => { });
     }
     const slot = registerStartedServer(config, mainWorktree, state.spawnPids);
     started = true;
@@ -160,6 +144,26 @@ async function runStartChecks(config, mainWorktree, ctx, { evict, restart }) {
     await checkPortsFree(config.servers, ctx.cwd);
     return false;
 }
+/**
+ * Spawn and await readiness, rolling back on failure. Returns `false` when `isAborted` reports a
+ * concurrent shutdown — the caller must then yield teardown to whoever set it, not proceed.
+ */
+async function spawnWithRollback(config, ctx, state, isAborted = () => false) {
+    try {
+        await spawnAndAwait(config, ctx, state);
+    }
+    catch (err) {
+        if (isAborted())
+            return false;
+        await rollbackStart(state.spawnPids, state.startedCallbacks, ctx);
+        if (err instanceof StartupError) {
+            handleStartupFailure(err);
+            process.exit(1);
+        }
+        throw err;
+    }
+    return !isAborted();
+}
 async function spawnAndAwait(config, ctx, state) {
     for (const server of config.servers) {
         console.log(`Starting ${server.name} dev server...`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paleo/workspace",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "description": "Run multiple git-worktree dev environments side by side.",
   "keywords": [
     "workspace",