@camstack/server 1.1.70 → 1.1.71

package/dist/core/addon/addon-registry.service.js

@@ -39,7 +39,6 @@ exports.shouldEmitProviderRegisteredReady = shouldEmitProviderRegisteredReady;
 const os = __importStar(require("node:os"));
 const addon_row_manifest_1 = require("./addon-row-manifest");
 const runner_convergence_1 = require("./runner-convergence");
-const system_addons_sync_1 = require("./system-addons-sync");
 const package_dir_utils_1 = require("./package-dir-utils");
 const types_1 = require("@camstack/types");
 const system_1 = require("@camstack/system");
@@ -435,25 +434,30 @@ class AddonRegistryService {
         // launcher). Defaults to `<dataDir>/addons` for dev.
         const dataDir = path.resolve(process.env.CAMSTACK_DATA ?? 'camstack-data');
         const addonsDir = process.env.CAMSTACK_ADDONS_DIR ?? path.resolve(dataDir, 'addons');
-        // Builtins load from the ADDONS-DIR copy of `@camstack/system`, which no
-        // update channel refreshes on an image hub (seed excludes it, apply-update
-        // swaps only server-root, deploy of system is rejected) — a stale copy
-        // silently pins builtin code forever (2026-07-17: snapshot builtin ran
-        // 1.1.49 while the closure carried 1.1.51). Reconcile it from the hub's
-        // own closure when the closure is NEWER; a newer addons copy (dev
-        // live-update flow) is left alone. Never throws.
+        // Single-copy model (2026-07-18 collapse): the framework BUILTINS
+        // (`@camstack/system`: device-manager, snapshot, storage, settings, …) load
+        // from the ACTIVE CLOSURE the hub itself runs from — resolved via the same
+        // walk-up hub-main uses — NOT from a physical `/data/addons/@camstack/system`
+        // copy. That copy drifted because no update channel refreshed it (the
+        // recurring "+1 restart" / stale-builtin pain); there is now ONE copy and no
+        // `syncSystemAddonsCopy` race. Non-framework addons still load from the
+        // addons dir unchanged. The addons-dir `@camstack/system` copy (if present,
+        // seeded by the image entrypoint) is SKIPPED to avoid a double-load.
         const closureSystemDir = (0, package_dir_utils_1.resolveHubClosurePackageDir)('@camstack/system');
         if (closureSystemDir) {
-            const outcome = (0, system_addons_sync_1.syncSystemAddonsCopy)({
-                addonsDir,
-                closureSystemDir,
-                log: (msg, meta) => this.logger.info(msg, { meta: meta ?? {} }),
-            });
-            if (outcome === 'failed') {
-                this.logger.warn('system addons-copy sync failed — builtins may run stale code');
+            try {
+                await this.addonLoader.loadFromAddonDir(closureSystemDir);
             }
+            catch (err) {
+                this.logger.error('Failed to load @camstack/system builtins from the active closure', {
+                    meta: { closureSystemDir, error: err instanceof Error ? err.message : String(err) },
+                });
+            }
+        }
+        else {
+            this.logger.warn('@camstack/system not resolvable from the hub closure — builtins may be missing');
         }
-        await this.addonLoader.loadFromDirectory(addonsDir);
+        await this.addonLoader.loadFromDirectory(addonsDir, ['@camstack/system']);
         // Hand pre-init load failures (broken package.json, missing
         // dist, import-time errors) to the health monitor so its retry
         // loop and post-grace alerting cover them. Failures during the
@@ -494,7 +498,12 @@ class AddonRegistryService {
                     packageDisplayName: registered.packageDisplayName,
                     ...(registered.bundle !== undefined ? { bundle: registered.bundle } : {}),
                     declaredCapabilities: declCaps,
-                    addonDir: path.join(addonsDir, registered.packageName),
+                    // @camstack/system builtins load from the active closure (single-copy
+                    // model), not the inert addons-dir copy — point their dir there so
+                    // any dir-derived path (data dir, markers) resolves to the real copy.
+                    addonDir: registered.packageName === '@camstack/system' && closureSystemDir
+                        ? closureSystemDir
+                        : path.join(addonsDir, registered.packageName),
                     declaration: registered.declaration,
                 });
             }

package/dist/core/server-update/server-update.service.js

@@ -38,18 +38,18 @@ exports.ServerUpdateService = void 0;
  * ServerUpdateService — hub-side adapter over the SHARED `RootUpdateService`
  * (`@camstack/node-root`, bundled into `dist/server-root/index.js`).
  *
- * The stage/apply/rollback/probation engine — including the security-review
- * fixes (rollback reentrancy guards, fresh-transient prune protection,
- * `stateFileCorrupt` visibility) — lives in the shared core so the hub and
- * the agent can never drift. This class only binds the hub's parameters:
- * the `@camstack/server` root spec, the `CAMSTACK_SERVER_*` env markers,
- * the `CAMSTACK_DATA` data-dir default and the running package.json path.
+ * The single-copy stage/apply engine — stage a closure into `.staging-*`,
+ * arm the pending-root-swap marker, restart — lives in the shared core so the
+ * hub and the agent can never drift. This class only binds the hub's
+ * parameters: the `@camstack/server` root spec, the `CAMSTACK_SERVER_*` env
+ * markers, the `CAMSTACK_DATA` data-dir default and the running package.json.
  *
- * The starter (server/backend/src/starter.ts → shared `runNodeStarter`)
- * owns the OTHER half: choosing the closure at boot, bumping the probation
- * counter, auto-rolling-back a version whose probation boot never confirmed.
+ * The starter (server/backend/src/starter.ts → shared `runNodeStarter`) owns
+ * the OTHER half: applying the staged swap of the single `current/` copy at
+ * boot + the one-time migration off the legacy multi-copy layout. There is no
+ * probation boot / N-1 / auto-rollback (2026-07-18 collapse).
  *
- * Spec: docs/superpowers/specs/2026-07-12-runtime-updatable-node-packages-design.md
+ * Spec: docs/superpowers/specs/2026-07-18-single-framework-copy-collapse-design.md
  */
 const path = __importStar(require("node:path"));
 const index_js_1 = require("../../server-root/index.js");

package/dist/launcher.js

@@ -254,6 +254,19 @@ async function launch() {
     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
+    // addon-runners' resolver + NODE_PATH at it instead of the (now-inert)
+    // static /data/framework copy. Forked children inherit this via process.env,
+    // and the NODE_PATH extension below reads CAMSTACK_FRAMEWORK_DIR. No-op in
+    // baked mode (activeRoot unset → keep the image's /data/framework).
+    const activeRoot = process.env['CAMSTACK_SERVER_ACTIVE_ROOT'];
+    if (activeRoot && fs.existsSync(path.join(activeRoot, 'node_modules', '@camstack', 'system'))) {
+        process.env['CAMSTACK_FRAMEWORK_DIR'] = activeRoot;
+        console.log(`[launcher] Single-copy framework dir → ${activeRoot}`);
+    }
+    // ──────────────────────────────────────────────────────────────────────────
     // Restore must happen first so the snapshot's `addons/` is what the
     // installer + symlink step pick up — otherwise we'd install a stale
     // set and overwrite it a step later.