@camstack/server 1.1.71 → 1.1.72

package/dist/launcher.js

@@ -44,15 +44,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * 3. Dynamically import main.ts (which has static @camstack/system imports)
  *
  * Load-order invariant: @camstack/system is imported DYNAMICALLY inside
- * launch() AFTER applyPendingFrameworkSwap runs, so the swapped framework
- * code is what gets loaded. NEVER add a top-level static import of
- * @camstack/system here — that would load the OLD framework before the swap.
+ * launch() AFTER the active framework dir is resolved (the single-copy
+ * collapse points CAMSTACK_FRAMEWORK_DIR at CAMSTACK_SERVER_ACTIVE_ROOT in
+ * data-root mode, or the baked seed otherwise). NEVER add a top-level static
+ * import of @camstack/system here — that would pin the resolver before the
+ * framework dir + NODE_PATH are set up. Framework/cap updates ship via the
+ * node-root `applyServerUpdate` flow, not an in-launcher package swap.
  */
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const tar = __importStar(require("tar"));
 const yaml = __importStar(require("js-yaml"));
-const launcher_framework_swap_js_1 = require("./launcher-framework-swap.js");
 const framework_nodepath_js_1 = require("./framework-nodepath.js");
 /** Path of the manifest file embedded inside every archive. */
 const ARCHIVE_MANIFEST_NAME = '.camstack-backup-manifest.json';
@@ -241,19 +243,6 @@ async function launch() {
     // `CAMSTACK_ADDONS_DIR` lets the Docker/Electron images point at their
     // node_modules path (e.g. /data/node_modules); dev keeps `<dataDir>/addons`.
     const addonsDir = process.env['CAMSTACK_ADDONS_DIR'] ?? path.resolve(dataDir, 'addons');
-    // ── Framework swap ────────────────────────────────────────────────────────
-    // MUST run before @camstack/system is loaded so the NEW framework code is
-    // what gets required. Both helpers are zero-dep (no @camstack imports).
-    // Roll back an unconfirmed prior swap (crash-loop guard), then apply any
-    // freshly-staged swap.
-    const frameworkDir = process.env['CAMSTACK_FRAMEWORK_DIR'];
-    const rb = (0, launcher_framework_swap_js_1.rollbackUnconfirmedFrameworkSwap)(dataDir, frameworkDir);
-    if (rb.rolledBack)
-        console.log('[launcher] Rolled back an unconfirmed framework update');
-    const fsw = (0, launcher_framework_swap_js_1.applyPendingFrameworkSwap)(dataDir, frameworkDir);
-    if (fsw.applied)
-        console.log(`[launcher] Applied staged framework update (job ${fsw.jobId ?? '?'})`);
-    // ── End framework swap ────────────────────────────────────────────────────
     // ── Single-copy framework dir (2026-07-18 collapse) ────────────────────────
     // In data-root mode the ACTIVE single copy (set by the starter as
     // CAMSTACK_SERVER_ACTIVE_ROOT) IS the framework — point the forked
@@ -271,8 +260,9 @@ async function launch() {
     // installer + symlink step pick up — otherwise we'd install a stale
     // set and overwrite it a step later.
     await applyPendingRestore(dataDir);
-    // @camstack/system is imported DYNAMICALLY here — AFTER applyPendingFrameworkSwap —
-    // so the swapped framework code is what gets loaded. Never import it at module top.
+    // @camstack/system is imported DYNAMICALLY here — AFTER the active framework
+    // dir + NODE_PATH are resolved above — so the correct framework copy is what
+    // gets loaded. Never import it at module top.
     const { AddonInstaller, bootstrapSchema, detectWorkspacePackagesDir } = await Promise.resolve().then(() => __importStar(require('@camstack/system')));
     // Install source resolution:
     //   1. CAMSTACK_BUNDLED_ADDONS_DIR — set by Electron-packaged builds

package/dist/manual-boot.js

@@ -47,10 +47,8 @@ exports.bootManual = bootManual;
 const path = __importStar(require("node:path"));
 const node_crypto_1 = require("node:crypto");
 const fastify_1 = __importDefault(require("fastify"));
-const system_1 = require("@camstack/system");
 const types_1 = require("@camstack/types");
 const lifecycle_runner_singleton_1 = require("./core/lifecycle/lifecycle-runner.singleton");
-const request_framework_swap_1 = require("./request-framework-swap");
 const config_service_1 = require("./core/config/config.service");
 const logging_service_1 = require("./core/logging/logging.service");
 const event_bus_service_1 = require("./core/events/event-bus.service");
@@ -175,31 +173,6 @@ async function bootManual(opts) {
                 });
             }
         },
-        // ── Framework swap deps ──────────────────────────────────────────
-        stageFramework: (task, signal) => (0, system_1.stageFrameworkLockstep)({
-            jobId: task.taskId,
-            toVersion: task.toVersion,
-            frameworkDir: process.env['CAMSTACK_FRAMEWORK_DIR'] ?? '',
-            stagingDir: path.join(lifecycleDataDir, 'lifecycle', 'staging'),
-            fetchTarball: (name, version, sig) => addonPackageService.fetchAddonTarball(name, version, sig),
-            extract: (tgz, destDir) => addonPackageService.extractTarball(tgz, destDir),
-            // Called only for the lockstep COMPANIONS (types/sdk/shm-ring) — the
-            // primary (@camstack/system) uses `task.toVersion` directly inside
-            // stageFrameworkLockstep. Companions are versioned independently on npm
-            // (system's package.json declares them as `*`), so resolve each to its
-            // own latest — pinning to `task.toVersion` fetches a non-existent
-            // `@camstack/types@<system-version>` tarball and fails the swap.
-            resolveVersion: (name) => addonPackageService.resolveFrameworkVersion(name, 'latest'),
-            currentVersionOf: (name) => addonPackageService.currentFrameworkVersionOf(name),
-            signal,
-        }),
-        requestFrameworkSwap: ({ jobId, taskId, packages }) => {
-            // Write the pending-swap marker AND schedule the reboot that applies it.
-            // The engine assumes the process exits after this returns; the restart is
-            // owned here (the single seam for every engine path: single update,
-            // "Update all" bulk, and the auto-update scheduler).
-            (0, request_framework_swap_1.requestFrameworkSwapAndRestart)(lifecycleDataDir, { jobId, taskId, packages });
-        },
     });
     const replEngineService = new repl_engine_service_1.ReplEngineService(addonRegistryService, eventBusService, loggingService);
     // Runtime-updatable root package (phase 1: hub only). The service owns the

package/dist/server-root/index.js

@@ -371,6 +371,38 @@ var require_dist = __commonJS({
     __name(validateVersionDir, "validateVersionDir");
     var fs3 = __toESM2(require("fs"));
     var path3 = __toESM2(require("path"));
+    function parse(version) {
+      const dashIdx = version.indexOf("-");
+      const base = dashIdx === -1 ? version : version.slice(0, dashIdx);
+      const prerelease = dashIdx === -1 ? null : version.slice(dashIdx + 1);
+      const nums = base.split(".").map((seg) => {
+        const n = Number.parseInt(seg, 10);
+        return Number.isNaN(n) ? 0 : n;
+      });
+      return {
+        nums,
+        prerelease
+      };
+    }
+    __name(parse, "parse");
+    function compareSemver(a, b) {
+      const pa = parse(a);
+      const pb = parse(b);
+      const len = Math.max(pa.nums.length, pb.nums.length);
+      for (let i = 0; i < len; i++) {
+        const na = pa.nums[i] ?? 0;
+        const nb = pb.nums[i] ?? 0;
+        if (na < nb) return -1;
+        if (na > nb) return 1;
+      }
+      if (pa.prerelease === null && pb.prerelease === null) return 0;
+      if (pa.prerelease === null) return 1;
+      if (pb.prerelease === null) return -1;
+      if (pa.prerelease < pb.prerelease) return -1;
+      if (pa.prerelease > pb.prerelease) return 1;
+      return 0;
+    }
+    __name(compareSemver, "compareSemver");
     var CURRENT_DIRNAME = "current";
     var PENDING_ROOT_SWAP_FILE = ".pending-root-swap.json";
     var LEGACY_FRAMEWORK_MARKERS = [
@@ -566,17 +598,43 @@ var require_dist = __commonJS({
       };
     }
     __name(applyPendingRootSwap, "applyPendingRootSwap");
+    function readClosureVersion(closureDir, spec) {
+      try {
+        const raw = JSON.parse(fs3.readFileSync(path3.join(rootPackageDir2(closureDir, spec), "package.json"), "utf-8"));
+        if (typeof raw === "object" && raw !== null) {
+          const version = raw["version"];
+          if (typeof version === "string") return version;
+        }
+      } catch {
+      }
+      return null;
+    }
+    __name(readClosureVersion, "readClosureVersion");
+    function isAdoptablePendingClosure(rootDir, version, nodeMajor, spec) {
+      const dir = versionDir(rootDir, version);
+      return validateClosureDir(dir, nodeMajor, spec, version) === null && findMissingNativePrebuilds(dir).length === 0;
+    }
+    __name(isAdoptablePendingClosure, "isAdoptablePendingClosure");
     function migrateToSingleCopy(rootDir, spec, nodeMajor, now, log) {
       const dest = currentDir(rootDir);
-      if (fs3.existsSync(dest) && validateClosureDir(dest, nodeMajor, spec) === null) {
-        return {
-          migrated: false,
-          version: null,
-          reason: "current already present"
-        };
+      const legacyState = readServerRootState(rootDir);
+      const pendingVersion = legacyState?.pendingBoot?.version ?? null;
+      const pendingAdoptable = pendingVersion !== null && isAdoptablePendingClosure(rootDir, pendingVersion, nodeMajor, spec);
+      const currentValid = fs3.existsSync(dest) && validateClosureDir(dest, nodeMajor, spec) === null;
+      if (currentValid) {
+        const currentVersion = readClosureVersion(dest, spec);
+        const pendingSupersedes = pendingAdoptable && pendingVersion !== null && (currentVersion === null || compareSemver(pendingVersion, currentVersion) > 0);
+        if (!pendingSupersedes) {
+          return {
+            migrated: false,
+            version: null,
+            reason: "current already present"
+          };
+        }
+        log(`[single-copy] in-flight pending ${pendingVersion} supersedes older current ${currentVersion ?? "?"}`);
       }
       const candidates = [];
-      const legacyState = readServerRootState(rootDir);
+      if (pendingAdoptable && pendingVersion !== null) candidates.push(pendingVersion);
       if (legacyState !== null) {
         for (const v of [
           legacyState.currentVersion,
@@ -662,38 +720,6 @@ var require_dist = __commonJS({
       };
     }
     __name(planBoot, "planBoot");
-    function parse(version) {
-      const dashIdx = version.indexOf("-");
-      const base = dashIdx === -1 ? version : version.slice(0, dashIdx);
-      const prerelease = dashIdx === -1 ? null : version.slice(dashIdx + 1);
-      const nums = base.split(".").map((seg) => {
-        const n = Number.parseInt(seg, 10);
-        return Number.isNaN(n) ? 0 : n;
-      });
-      return {
-        nums,
-        prerelease
-      };
-    }
-    __name(parse, "parse");
-    function compareSemver(a, b) {
-      const pa = parse(a);
-      const pb = parse(b);
-      const len = Math.max(pa.nums.length, pb.nums.length);
-      for (let i = 0; i < len; i++) {
-        const na = pa.nums[i] ?? 0;
-        const nb = pb.nums[i] ?? 0;
-        if (na < nb) return -1;
-        if (na > nb) return 1;
-      }
-      if (pa.prerelease === null && pb.prerelease === null) return 0;
-      if (pa.prerelease === null) return 1;
-      if (pb.prerelease === null) return -1;
-      if (pa.prerelease < pb.prerelease) return -1;
-      if (pa.prerelease > pb.prerelease) return 1;
-      return 0;
-    }
-    __name(compareSemver, "compareSemver");
     var fs4 = __toESM2(require("fs"));
     var path4 = __toESM2(require("path"));
     function detectWorkspaceRoot(fromDir) {
@@ -756,7 +782,7 @@ var require_dist = __commonJS({
       registerHooks(hooks);
     }
     __name(registerActiveRootResolver, "registerActiveRootResolver");
-    function readClosureVersion(closureDir, spec) {
+    function readClosureVersion2(closureDir, spec) {
       try {
         const raw = JSON.parse(fs5.readFileSync(path5.join(rootPackageDir2(closureDir, spec), "package.json"), "utf-8"));
         if (typeof raw === "object" && raw !== null) {
@@ -767,7 +793,7 @@ var require_dist = __commonJS({
       }
       return null;
     }
-    __name(readClosureVersion, "readClosureVersion");
+    __name(readClosureVersion2, "readClosureVersion2");
     function runNodeStarter(options) {
       const env = options.env ?? process.env;
       const now = options.now ?? Date.now;
@@ -800,7 +826,7 @@ var require_dist = __commonJS({
       }
       const plan = planBoot(invalid === null);
       if (plan.kind === "current") {
-        const version = readClosureVersion(activeRootDir, options.spec);
+        const version = readClosureVersion2(activeRootDir, options.spec);
         const entry = currentEntryPath(rootDir, options.spec);
         console.log(`[starter] booting ${options.spec.packageName}@${version ?? "?"} from ${activeRootDir}`);
         env[options.envNames.bootMode] = "data-root";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.1.71",
+  "version": "1.1.72",
   "private": false,
   "files": [
     "dist",
@@ -23,19 +23,19 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.1.58",
+    "@camstack/addon-admin-ui": "1.1.59",
     "@camstack/addon-advanced-notifier": "1.1.30",
     "@camstack/addon-auth": "1.1.15",
     "@camstack/addon-decoder-nodeav": "1.1.18",
     "@camstack/addon-notifiers": "1.1.30",
-    "@camstack/addon-pipeline": "1.1.64",
-    "@camstack/addon-pipeline-orchestrator": "1.1.53",
-    "@camstack/addon-post-analysis": "1.1.36",
+    "@camstack/addon-pipeline": "1.1.65",
+    "@camstack/addon-pipeline-orchestrator": "1.1.54",
+    "@camstack/addon-post-analysis": "1.1.37",
     "@camstack/sdk": "1.1.30",
     "@camstack/shm-ring": "1.0.29",
-    "@camstack/system": "1.1.57",
-    "@camstack/types": "1.1.51",
-    "@camstack/ui-library": "1.1.42",
+    "@camstack/system": "1.1.58",
+    "@camstack/types": "1.1.52",
+    "@camstack/ui-library": "1.1.43",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/multipart": "^10.0.0",

package/dist/boot/resume-framework-swap.js

@@ -1,119 +0,0 @@
-"use strict";
-/**
- * Boot-time framework-swap job resume + health confirm.
- *
- * After a framework swap reboot, `post-boot.service.ts` calls this once the
- * hub is healthy.  It:
- *   1. Reads `.framework-swap-confirm.json` (written by the launcher on apply).
- *   2. Marks the journal task `applied` → `done`, then finalises the job →
- *      `completed`.
- *   3. Calls `confirmFrameworkSwapHealthy` to delete the confirm marker +
- *      backup dirs (disarms the crash-loop rollback).
- *
- * Best-effort: a missing/corrupt journal is tolerated — `confirmFrameworkSwapHealthy`
- * is still called so the rollback is always disarmed when the hub boots healthy.
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resumeFrameworkSwapJob = resumeFrameworkSwapJob;
-const fs = __importStar(require("node:fs"));
-const path = __importStar(require("node:path"));
-const types_1 = require("@camstack/types");
-const system_1 = require("@camstack/system");
-const launcher_framework_swap_js_1 = require("../launcher-framework-swap.js");
-const lifecycle_journal_path_js_1 = require("../lifecycle-journal-path.js");
-const SWAP_CONFIRM_FILE = '.framework-swap-confirm.json';
-/**
- * Resume a framework-swap journal job to `done`/`completed` and confirm the
- * hub is healthy (deletes the confirm marker + backups).
- *
- * @returns `{ resumed: false }` when no confirm marker exists.
- *          `{ resumed: true, jobId }` when the marker was found and processed.
- *          Never throws — errors are swallowed to avoid crashing the post-boot path.
- */
-async function resumeFrameworkSwapJob(dataDir) {
-    try {
-        const confirmMarker = readConfirmMarker(dataDir);
-        if (confirmMarker === null) {
-            return { resumed: false };
-        }
-        const { jobId, taskId } = confirmMarker;
-        let journalPatched = false;
-        try {
-            const journal = new system_1.JobJournal((0, lifecycle_journal_path_js_1.lifecycleJobsDir)(dataDir));
-            const job = journal.getJob(jobId);
-            if (job !== null) {
-                const task = job.tasks.find((t) => t.taskId === taskId);
-                if (task !== undefined && task.phase === 'applied') {
-                    journal.patchTask(jobId, taskId, { phase: 'done', finishedAtMs: Date.now() });
-                    // Single-task framework job: if all tasks are now terminal and none
-                    // failed, mark the job completed (mirrors the engine's finalize logic).
-                    const updatedJob = journal.getJob(jobId);
-                    if (updatedJob !== null) {
-                        const allTerminal = updatedJob.tasks.every((t) => t.phase === 'done' || t.phase === 'failed' || t.phase === 'skipped');
-                        const anyFailed = updatedJob.tasks.some((t) => t.phase === 'failed');
-                        if (allTerminal && !anyFailed) {
-                            journal.setJobState(jobId, 'completed');
-                        }
-                    }
-                    journalPatched = true;
-                }
-            }
-        }
-        catch {
-            // Journal is missing or corrupt — still clean up the confirm marker so
-            // the rollback is disarmed on a healthy hub boot.
-        }
-        (0, launcher_framework_swap_js_1.confirmFrameworkSwapHealthy)(dataDir);
-        return journalPatched ? { resumed: true, jobId } : { resumed: false };
-    }
-    catch {
-        // Never crash the caller (post-boot service).
-        return { resumed: false };
-    }
-}
-/** Read and shape-check the confirm marker.  Returns null on any error. */
-function readConfirmMarker(dataDir) {
-    try {
-        const raw = JSON.parse(fs.readFileSync(path.join(dataDir, SWAP_CONFIRM_FILE), 'utf-8'));
-        const parsed = types_1.frameworkSwapConfirmSchema.safeParse(raw);
-        if (!parsed.success)
-            return null;
-        return { jobId: parsed.data.jobId, taskId: parsed.data.taskId };
-    }
-    catch {
-        return null;
-    }
-}