camstack 1.2.163 → 1.2.165

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-JVXE2AOJ.js");
+  await import("./launcher-FGWCDMKJ.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-JVXE2AOJ.js");
+  await import("./launcher-FGWCDMKJ.js");
 }
 
 // src/commands/setup.ts

package/dist/{launcher-JVXE2AOJ.js → launcher-FGWCDMKJ.js}

@@ -6445,6 +6445,62 @@ var require_first_boot_addon_plan = __commonJS({
   }
 });
 
+// ../../server/backend/dist/core/addon/addon-realign-plan.js
+var require_addon_realign_plan = __commonJS({
+  "../../server/backend/dist/core/addon/addon-realign-plan.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.planAddonRealignment = planAddonRealignment;
+    function isStrictlyNewer(a, b) {
+      const pa = a.split(".").map((p) => Number.parseInt(p, 10));
+      const pb = b.split(".").map((p) => Number.parseInt(p, 10));
+      const len = Math.max(pa.length, pb.length);
+      for (let i = 0; i < len; i += 1) {
+        const x = pa[i] ?? 0;
+        const y = pb[i] ?? 0;
+        if (!Number.isFinite(x) || !Number.isFinite(y))
+          return false;
+        if (x !== y)
+          return x > y;
+      }
+      return false;
+    }
+    function planAddonRealignment(candidates) {
+      return candidates.map((c) => {
+        if (c.closureVersion === null) {
+          return { pkg: c.pkg, action: "keep", reason: "not carried by this closure" };
+        }
+        if (!isStrictlyNewer(c.closureVersion, c.installedVersion)) {
+          return {
+            pkg: c.pkg,
+            action: "keep",
+            reason: `installed ${c.installedVersion}, closure ${c.closureVersion} \u2014 not strictly newer`
+          };
+        }
+        if (c.installedUpdatedAtMs === null || c.closureLandedAtMs === null) {
+          return {
+            pkg: c.pkg,
+            action: "keep",
+            reason: "cannot date the install or the closure \u2014 an unknown is not evidence of being stale"
+          };
+        }
+        if (c.installedUpdatedAtMs >= c.closureLandedAtMs) {
+          return {
+            pkg: c.pkg,
+            action: "keep",
+            reason: `installed ${c.installedVersion} was deployed AFTER this closure landed \u2014 better informed than ${c.closureVersion}`
+          };
+        }
+        return {
+          pkg: c.pkg,
+          action: "realign",
+          reason: `installed ${c.installedVersion} predates this closure, which carries ${c.closureVersion}`
+        };
+      });
+    }
+  }
+});
+
 // ../../server/backend/dist/framework-nodepath.js
 var require_framework_nodepath = __commonJS({
   "../../server/backend/dist/framework-nodepath.js"(exports) {
@@ -140227,6 +140283,32 @@ var require_dist3 = __commonJS({
       *     into `addonsDir/<pkg>/`. The Electron bundled-addons path
       *     uses this so the runtime owns its on-disk copy.
       */
+      /**
+      * Re-install one addon from the running server closure.
+      *
+      * The closure carries a copy of every addon it declares as a dependency, and
+      * NOTHING loads an addon from there — `AddonLoader` reads the addon root and
+      * only the addon root, on every role. So those copies are transport, and
+      * this is the only thing that moves them into the place that runs code.
+      *
+      * Without it a server update advances the closure and changes nothing: six
+      * addons on the hub were behind by up to nineteen versions on 2026-09-17,
+      * each frozen at whenever somebody last ran `camstack deploy`.
+      *
+      * WHICH addons deserve this is not decided here — see `planAddonRealignment`,
+      * which needs two gates because a version comparison alone would overwrite a
+      * deliberate deploy. This only carries out a decision already made.
+      */
+      async realignFromClosure(packageName, closureDir) {
+        const targetDir = node_path.join(this.addonsDir, packageName);
+        const result = await this.installLocal(packageName, closureDir);
+        await node_fs.promises.writeFile(node_path.join(targetDir, ".install-source"), "closure");
+        this.manifest.upsert(result.name, {
+          version: result.version,
+          source: "closure"
+        });
+        return result;
+      }
       async installLocal(packageName, sourceDir) {
         const pkgView = readPackageJson(node_path.join(sourceDir, "package.json"));
         if (!pkgView) throw new Error(`Invalid package.json at ${sourceDir}`);
@@ -306439,9 +306521,7 @@ var require_agent_http = __commonJS({
       }
       return installed?.dir ?? bundled?.dir ?? null;
     }
-    function resolveUiDistDir(dataDir, bundledAddonsDir, siblingDistDir = path.resolve(__dirname, "../../addon-agent-ui/dist")) {
-      if (fs.existsSync(path.join(siblingDistDir, "index.html")))
-        return siblingDistDir;
+    function resolveUiDistDir(dataDir, bundledAddonsDir) {
       const installed = readUiDistCandidate(path.join(dataDir, "addons", "@camstack", "addon-agent-ui"));
       const bundled = bundledAddonsDir ? readUiDistCandidate(path.join(bundledAddonsDir, "addon-agent-ui")) : null;
       const picked = pickUiDist(installed, bundled);
@@ -434022,9 +434102,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 });
@@ -439890,6 +439977,7 @@ var require_launcher = __commonJS({
     var addon_root_inventory_js_1 = require_addon_root_inventory();
     var bootstrap_packages_js_1 = require_bootstrap_packages();
     var first_boot_addon_plan_js_1 = require_first_boot_addon_plan();
+    var addon_realign_plan_js_1 = require_addon_realign_plan();
     var framework_nodepath_js_1 = require_framework_nodepath();
     var package_inventory_js_1 = require_package_inventory();
     var ARCHIVE_MANIFEST_NAME = ".camstack-backup-manifest.json";
@@ -439989,6 +440077,13 @@ var require_launcher = __commonJS({
         return null;
       }
     }
+    function readDirTimeMs(dir) {
+      try {
+        return fs.statSync(dir).mtimeMs;
+      } catch {
+        return null;
+      }
+    }
     function readInstalledAddonVersions(addonRoot, packages) {
       const out = {};
       for (const name of packages) {
@@ -440087,6 +440182,37 @@ var require_launcher = __commonJS({
         console.warn(`[launcher] first-boot addon plan failed: ${err instanceof Error ? err.message : String(err)}`);
       }
       await installer.ensureRequiredPackages(bootstrapRequired);
+      try {
+        const closureNodeModules = path.resolve(__dirname, "..", "node_modules");
+        const decisions = (0, addon_realign_plan_js_1.planAddonRealignment)(bootstrapRequired.flatMap((pkg) => {
+          const installedVersion = readInstalledAddonVersions(addonsDir, [pkg])[pkg];
+          if (typeof installedVersion !== "string")
+            return [];
+          return [
+            {
+              pkg,
+              installedVersion,
+              installedUpdatedAtMs: readDirTimeMs(path.join(addonsDir, pkg)),
+              closureVersion: readInstalledAddonVersions(closureNodeModules, [pkg])[pkg] ?? null,
+              closureLandedAtMs: readDirTimeMs(path.join(closureNodeModules, pkg))
+            }
+          ];
+        }));
+        for (const d of decisions) {
+          if (d.action !== "realign")
+            continue;
+          try {
+            const done = await installer.realignFromClosure(d.pkg, path.join(closureNodeModules, d.pkg));
+            console.log(`[launcher] re-aligned ${d.pkg} \u2192 ${done.version} \u2014 ${d.reason}`);
+          } catch (err) {
+            console.warn(`[launcher] re-align FAILED for ${d.pkg}: ${err instanceof Error ? err.message : String(err)}`);
+          }
+        }
+        const kept = decisions.filter((d) => d.action === "keep").length;
+        console.log(`[launcher] addon re-alignment: ${decisions.length - kept} re-aligned, ${kept} kept as they are`);
+      } catch (err) {
+        console.warn(`[launcher] addon re-alignment failed: ${err instanceof Error ? err.message : String(err)}`);
+      }
       if (typeof installer.ensureAddonRuntimeDeps === "function") {
         try {
           const depsResult = await installer.ensureAddonRuntimeDeps();

package/package.json

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