camstack 1.2.162 → 1.2.164

package/dist/cli.js

@@ -38,7 +38,7 @@ async function runServe(args) {
     ...typeof values.data === "string" ? { data: values.data } : {}
   };
   Object.assign(process.env, buildServeEnv(opts));
-  await import("./launcher-3GIYBFMQ.js");
+  await import("./launcher-BMA4X5ZT.js");
 }
 
 // src/commands/agent.ts
@@ -83,7 +83,7 @@ async function runAgent(args) {
     ...typeof values.port === "string" ? { port: values.port } : {}
   };
   Object.assign(process.env, buildAgentEnv(opts));
-  await import("./launcher-3GIYBFMQ.js");
+  await import("./launcher-BMA4X5ZT.js");
 }
 
 // src/commands/setup.ts

package/dist/{launcher-3GIYBFMQ.js → launcher-BMA4X5ZT.js}

@@ -431585,6 +431585,24 @@ var require_runner_convergence = __commonJS({
   }
 });
 
+// ../../server/backend/dist/core/addon/runner-serialization.js
+var require_runner_serialization = __commonJS({
+  "../../server/backend/dist/core/addon/runner-serialization.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.createRunnerSerializer = createRunnerSerializer;
+    function createRunnerSerializer() {
+      const tails = /* @__PURE__ */ new Map();
+      return (runnerId, converge) => {
+        const previous = tails.get(runnerId) ?? Promise.resolve();
+        const result = previous.then(converge, converge);
+        tails.set(runnerId, result.then(() => void 0, () => void 0));
+        return result;
+      };
+    }
+  }
+});
+
 // ../../server/backend/dist/core/addon/runner-spawn-fanout.js
 var require_runner_spawn_fanout = __commonJS({
   "../../server/backend/dist/core/addon/runner-spawn-fanout.js"(exports) {
@@ -431692,6 +431710,7 @@ var require_addon_registry_service = __commonJS({
     var forked_custom_actions_js_1 = require_forked_custom_actions();
     var prune_misplaced_addons_js_1 = require_prune_misplaced_addons();
     var runner_convergence_1 = require_runner_convergence();
+    var runner_serialization_1 = require_runner_serialization();
     var runner_spawn_fanout_js_1 = require_runner_spawn_fanout();
     function shouldEvictMissingOnDisk(entry, id, onDiskIds) {
       return entry.source === "installed" && entry.packageName !== "@camstack/system" && !onDiskIds.has(id);
@@ -434003,9 +434022,16 @@ var require_addon_registry_service = __commonJS({
           throw new Error(`initializeAddonGroup("${runnerId}") requires at least one addon`);
         }
         try {
-          await this.broker.call("$process.spawnRunner", {
-            runnerId,
-            addons
+          await this.serializeRunner(runnerId, async () => {
+            try {
+              await this.broker.call("$process.spawnRunner", { runnerId, addons });
+            } catch (err) {
+              if (!/already running/i.test((0, types_1.errMsg)(err)))
+                throw err;
+              this.logger.info("initializeAddonGroup: runner already running \u2014 nothing to spawn", {
+                meta: { runnerId, addonIds: addons.map((a) => a.addonId) }
+              });
+            }
           });
         } catch (err) {
           throw new Error(`Failed to spawn runner "${runnerId}" (${addons.length} addons): ${(0, types_1.errMsg)(err)}`, { cause: err });
@@ -434058,6 +434084,12 @@ var require_addon_registry_service = __commonJS({
        * a group respawns the ENTIRE group (they share a process): the operator's
        * "update one → respawn the whole group" invariant.
        */
+      /**
+       * One converge at a time per runner. See `runner-serialization.ts` for the
+       * two live episodes this closes and why the lock inside `process-service`
+       * could not.
+       */
+      serializeRunner = (0, runner_serialization_1.createRunnerSerializer)();
       async ensureForkedRunner(addonId, opts) {
         const entry = this.addonEntries.get(addonId);
         if (!entry?.declaration || !entry.addonDir) {
@@ -434068,33 +434100,35 @@ var require_addon_registry_service = __commonJS({
           { addonId, addonDir: entry.addonDir }
         ];
         const effectiveRestart = opts.restart && roster.length > 1 && Date.now() - (this.recentGroupRespawns.get(runnerId) ?? 0) < GROUP_RESPAWN_COALESCE_MS ? false : opts.restart;
-        const running = await this.listRunnerProcesses();
-        const plan = (0, runner_convergence_1.planRunnerConvergence)(runnerId, roster.map((r) => r.addonId), running, { restart: effectiveRestart });
-        for (const name of plan.stop) {
-          await this.broker.call("$process.stop", { name }).catch((err) => {
-            this.logger.warn("ensureForkedRunner: failed to stop stale runner (continuing)", {
-              meta: { runnerId, stale: name, error: (0, types_1.errMsg)(err) }
+        return this.serializeRunner(runnerId, async () => {
+          const running = await this.listRunnerProcesses();
+          const plan = (0, runner_convergence_1.planRunnerConvergence)(runnerId, roster.map((r) => r.addonId), running, { restart: effectiveRestart });
+          for (const name of plan.stop) {
+            await this.broker.call("$process.stop", { name }).catch((err) => {
+              this.logger.warn("ensureForkedRunner: failed to stop stale runner (continuing)", {
+                meta: { runnerId, stale: name, error: (0, types_1.errMsg)(err) }
+              });
             });
-          });
-        }
-        if (plan.action === "spawn") {
-          await this.broker.call("$process.spawnRunner", { runnerId, addons: roster }).catch((err) => {
-            if (!/already running/i.test((0, types_1.errMsg)(err)))
-              throw err;
-          });
-          this.recentGroupRespawns.set(runnerId, Date.now());
-        } else if (plan.action === "restart") {
-          const res = await this.broker.call("$process.restart", { name: runnerId });
-          if (!res.success) {
-            throw new Error(`Process restart failed: ${res.reason ?? "unknown"}`);
           }
-          this.recentGroupRespawns.set(runnerId, Date.now());
-        }
-        for (const { addonId: memberId } of roster) {
-          const memberEntry = this.addonEntries.get(memberId);
-          if (memberEntry)
-            memberEntry.initialized = true;
-        }
+          if (plan.action === "spawn") {
+            await this.broker.call("$process.spawnRunner", { runnerId, addons: roster }).catch((err) => {
+              if (!/already running/i.test((0, types_1.errMsg)(err)))
+                throw err;
+            });
+            this.recentGroupRespawns.set(runnerId, Date.now());
+          } else if (plan.action === "restart") {
+            const res = await this.broker.call("$process.restart", { name: runnerId });
+            if (!res.success) {
+              throw new Error(`Process restart failed: ${res.reason ?? "unknown"}`);
+            }
+            this.recentGroupRespawns.set(runnerId, Date.now());
+          }
+          for (const { addonId: memberId } of roster) {
+            const memberEntry = this.addonEntries.get(memberId);
+            if (memberEntry)
+              memberEntry.initialized = true;
+          }
+        });
       }
       /**
        * Apply the custom-action catalogs a UDS child DESCRIBED in its register

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camstack",
-  "version": "1.2.162",
+  "version": "1.2.164",
   "description": "CLI tool for managing and running CamStack server",
   "keywords": [
     "camstack",