@camstack/server 1.2.70 → 1.2.72

package/dist/launcher.js

@@ -52,10 +52,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * node-root `applyServerUpdate` flow, not an in-launcher package swap.
  */
 const fs = __importStar(require("node:fs"));
+const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
 const tar = __importStar(require("tar"));
 const yaml = __importStar(require("js-yaml"));
 const framework_nodepath_js_1 = require("./framework-nodepath.js");
+const addon_root_inventory_js_1 = require("./addon-root-inventory.js");
 const package_inventory_js_1 = require("./package-inventory.js");
 const bootstrap_packages_js_1 = require("./bootstrap-packages.js");
 /** Path of the manifest file embedded inside every archive. */
@@ -340,11 +342,14 @@ async function launch() {
     const bootstrapRequired = readBootstrapRequiredAddons(dataDir, bootstrapSchema) ?? roleDefaultBootstrap;
     console.log(`[launcher] bootstrap (${role}): ${bootstrapRequired.length} required package(s)`);
     await installer.ensureRequiredPackages(bootstrapRequired);
-    // Reconcile the install manifest with what is on disk. Addons baked
-    // into the image are copied straight into addonsDir by the container
-    // entrypoint and never pass through an install codepath, so they are
-    // absent from manifest.json — which makes runtime "Update" reject them
-    // with "not currently tracked in manifest". Idempotent; safe every boot.
+    // Reconcile the install manifest against what is on disk — the directory is
+    // the truth, because it is what the loader runs. Registers image-seeded
+    // addons (copied straight into addonsDir by the container entrypoint, never
+    // through an install codepath, so runtime "Update" rejected them as "not
+    // currently tracked"), corrects a recorded version that disagrees with the
+    // installed package.json, and drops entries naming a directory that does not
+    // exist. Idempotent; safe every boot. Runs BEFORE any update can be in
+    // flight, and never touches an entry holding a rollback pointer.
     //
     // Guarded with a typeof check: the backend and @camstack/system normally
     // ship together in one image, but a system-only framework update can
@@ -354,7 +359,7 @@ async function launch() {
     if (typeof installer.reconcileManifest === 'function') {
         const reconciled = installer.reconcileManifest();
         if (reconciled > 0) {
-            console.log(`[launcher] Manifest reconciled — ${reconciled} seeded addon(s) registered`);
+            console.log(`[launcher] Manifest reconciled — ${reconciled} correction(s)`);
         }
     }
     else {
@@ -494,6 +499,72 @@ async function launch() {
         // to boot when it is the thing that was supposed to explain failures.
         console.warn(`[launcher] package inventory failed: ${err instanceof Error ? err.message : String(err)}`);
     }
+    // A SECOND ADDON ROOT on this machine.
+    //
+    // The inventory above scans roots derived from the ACTIVE data dir, so an
+    // entire rival data root — a retired Electron app id, the pre-Electron
+    // `~/camstack-agent-data` — is structurally invisible to it. Those trees hold
+    // complete `addons/@camstack/` installs with plausible package.json files,
+    // and reading a version out of one answers a question about a node that has
+    // not run since June. Measured on the Mac agent: four addon roots, four
+    // truthful `addon-pipeline` versions, one of them the running node's.
+    //
+    // Reported, never fatal, never deleted here — same policy as D45. Making the
+    // second location LOUD is the whole job; removing it stays an operator
+    // decision. `CAMSTACK_INVENTORY_STRICT=1` makes it fatal, which is how a
+    // machine that HAS been cleaned keeps itself clean.
+    try {
+        const addonRoots = (0, addon_root_inventory_js_1.inventoryAddonRoots)({
+            dataDir: DATA_DIR,
+            activeAddonsDir: addonsDir,
+            homeDir: os.homedir(),
+            platform: process.platform,
+        }, {
+            exists: (dir) => fs.existsSync(dir),
+            listPackages: (scopeDir) => {
+                try {
+                    return fs
+                        .readdirSync(scopeDir, { withFileTypes: true })
+                        .filter((e) => e.isDirectory() || e.isSymbolicLink())
+                        .map((e) => e.name);
+                }
+                catch {
+                    return [];
+                }
+            },
+            readVersion: (packageDir) => {
+                try {
+                    const raw = JSON.parse(fs.readFileSync(path.join(packageDir, 'package.json'), 'utf-8'));
+                    const version = typeof raw === 'object' && raw !== null
+                        ? raw.version
+                        : undefined;
+                    return typeof version === 'string' ? version : null;
+                }
+                catch {
+                    return null;
+                }
+            },
+            realPath: (dir) => {
+                try {
+                    return fs.realpathSync(dir);
+                }
+                catch {
+                    return dir;
+                }
+            },
+        });
+        const addonRootReport = (0, addon_root_inventory_js_1.formatAddonRootReport)(addonRoots);
+        if (addonRootReport !== '') {
+            console.error(`[launcher] ${addonRootReport}`);
+            if (process.env['CAMSTACK_INVENTORY_STRICT'] === '1') {
+                console.error('[launcher] CAMSTACK_INVENTORY_STRICT=1 — refusing to boot on this layout');
+                process.exit(1);
+            }
+        }
+    }
+    catch (err) {
+        console.warn(`[launcher] addon-root inventory failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
     // Now safe to load the role's runtime entry (both have static imports from
     // @camstack/system, resolved only after the framework dir + NODE_PATH setup
     // above). The agent boots from THIS same @camstack/server closure — there is

package/dist/main.js

@@ -276,7 +276,10 @@ async function bootstrap() {
         const uploadAddonRegistry = app.get(addon_registry_service_1.AddonRegistryService);
         const uploadAddonPackage = app.get(addon_package_service_1.AddonPackageService);
         const uploadLogger = app.get(logging_service_1.LoggingService).createLogger('addon-upload');
-        await (0, addon_upload_1.registerAddonUploadRoute)(fastify, uploadAddonBridge, uploadAuthService, uploadMoleculer, uploadAddonRegistry, uploadAddonPackage, uploadLogger);
+        // The delivery ledger marks "the hub is writing addons to this node" for
+        // the whole deploy+reload, so the addon back-fill cannot read the roster
+        // gap a deploy opens and repair the node over the bytes just shipped.
+        await (0, addon_upload_1.registerAddonUploadRoute)(fastify, uploadAddonBridge, uploadAuthService, uploadMoleculer, uploadAddonRegistry, uploadAddonPackage, uploadLogger, app.get(agent_registry_service_1.AgentRegistryService).deliveryLedger);
         console.log('[bootstrap] Addon upload route registered at POST /api/addons/upload');
         // Dev server-deploy channel gateway (`camstack deploy-server`). MUST be
         // registered AFTER registerAddonUploadRoute — it reuses the multipart

package/dist/manual-boot.js

@@ -44,37 +44,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bootManual = bootManual;
-const path = __importStar(require("node:path"));
 const node_crypto_1 = require("node:crypto");
-const fastify_1 = __importDefault(require("fastify"));
+const path = __importStar(require("node:path"));
 const types_1 = require("@camstack/types");
-const lifecycle_runner_singleton_1 = require("./core/lifecycle/lifecycle-runner.singleton");
+const fastify_1 = __importDefault(require("fastify"));
+const addon_upload_1 = require("./api/addon-upload");
+const cap_providers_1 = require("./api/core/cap-providers");
+const post_boot_service_1 = require("./boot/post-boot.service");
+const addon_package_service_1 = require("./core/addon/addon-package.service");
+const addon_registry_service_1 = require("./core/addon/addon-registry.service");
+const addon_search_service_1 = require("./core/addon/addon-search.service");
+const addon_bridge_service_1 = require("./core/addon-bridge/addon-bridge.service");
+const addon_pages_service_1 = require("./core/addon-pages/addon-pages.service");
+const addon_widgets_service_1 = require("./core/addon-widgets/addon-widgets.service");
+const agent_registry_service_1 = require("./core/agent/agent-registry.service");
+const cluster_node_history_store_1 = require("./core/agent/cluster-node-history-store");
+const auth_service_1 = require("./core/auth/auth.service");
+const capability_service_1 = require("./core/capability/capability.service");
 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");
-const storage_service_1 = require("./core/storage/storage.service");
-const capability_service_1 = require("./core/capability/capability.service");
 const feature_service_1 = require("./core/feature/feature.service");
-const auth_service_1 = require("./core/auth/auth.service");
-const stream_probe_service_1 = require("./core/streaming/stream-probe.service");
+const lifecycle_runner_singleton_1 = require("./core/lifecycle/lifecycle-runner.singleton");
+const logging_service_1 = require("./core/logging/logging.service");
+const moleculer_service_1 = require("./core/moleculer/moleculer.service");
 const network_quality_service_1 = require("./core/network/network-quality.service");
-const toast_wrapper_service_1 = require("./core/notification/toast-wrapper.service");
 const notification_wrapper_service_1 = require("./core/notification/notification-wrapper.service");
-const addon_pages_service_1 = require("./core/addon-pages/addon-pages.service");
-const addon_widgets_service_1 = require("./core/addon-widgets/addon-widgets.service");
-const addon_bridge_service_1 = require("./core/addon-bridge/addon-bridge.service");
-const moleculer_service_1 = require("./core/moleculer/moleculer.service");
-const agent_registry_service_1 = require("./core/agent/agent-registry.service");
-const cluster_node_history_store_1 = require("./core/agent/cluster-node-history-store");
-const addon_upload_1 = require("./api/addon-upload");
-const addon_registry_service_1 = require("./core/addon/addon-registry.service");
-const addon_search_service_1 = require("./core/addon/addon-search.service");
-const addon_package_service_1 = require("./core/addon/addon-package.service");
+const toast_wrapper_service_1 = require("./core/notification/toast-wrapper.service");
 const repl_engine_service_1 = require("./core/repl/repl-engine.service");
 const server_update_service_1 = require("./core/server-update/server-update.service");
+const storage_service_1 = require("./core/storage/storage.service");
+const stream_probe_service_1 = require("./core/streaming/stream-probe.service");
 const topology_emitter_service_1 = require("./core/topology/topology-emitter.service");
-const cap_providers_1 = require("./api/core/cap-providers");
-const post_boot_service_1 = require("./boot/post-boot.service");
 // ---------------------------------------------------------------------------
 // Service container — narrowing via `instanceof`, no casts.
 // ---------------------------------------------------------------------------
@@ -147,11 +147,30 @@ async function bootManual(opts) {
     const addonPackageService = new addon_package_service_1.AddonPackageService(loggingService, eventBusService, configService, addonRegistryService, notificationWrapper, toastWrapper);
     // Addon back-fill delivery seam. Wired here (not in the AgentRegistryService
     // constructor) because it needs AddonPackageService, which is a later layer.
-    // Bytes come from the hub's own resolution of the package — the agent needs no
-    // registry reachability of its own, and every node in the cluster lands on the
-    // same version. Delivery is an RPC pair, never an event (D8/D11).
+    // Bytes come from THE HUB'S OWN INSTALLED COPY whenever it has one, and only
+    // from the registry when it does not. This line used to claim that while
+    // calling `packPackage` — `npm pack <name>@<version>` — so the back-fill
+    // repaired a node by installing the REGISTRY's build of a version over the
+    // one an operator had just deployed. Same name, same version, different
+    // bundle: every `camstack deploy … -n little-unraid` on 2026-08-07 was
+    // reverted ~1.5s later and read as a stale dist. See `packInstalledPackage`.
+    // Delivery is an RPC pair, never an event (D8/D11).
+    const backfillLogger = loggingService.createLogger('agent-backfill');
     agentRegistryService.setAddonBackfill({
-        pack: async (name, version) => (await addonPackageService.packPackage(name, version)).buffer,
+        pack: async (name, version) => {
+            const installed = await addonPackageService.packInstalledPackage(name);
+            // Name the SOURCE. This delivery overwrites whatever the node has, so
+            // "which build did we just push" is the first question every time it goes
+            // wrong — and for a whole day it was answered nowhere at all.
+            backfillLogger.info('back-fill packing', {
+                meta: {
+                    packageName: name,
+                    source: installed ? 'hub-installed' : 'npm-registry',
+                    version: installed?.version ?? version,
+                },
+            });
+            return (installed ?? (await addonPackageService.packPackage(name, version))).buffer;
+        },
         deploy: async (nodeId, packageName, bundle) => {
             await moleculerService.broker.call('$agent.deploy', { addonId: packageName, source: (0, addon_upload_1.buildHubHttpSource)(bundle, (0, addon_upload_1.hubBundleBaseUrl)()) }, { nodeID: nodeId, timeout: agent_registry_service_1.AGENT_BACKFILL_RPC_TIMEOUT_MS });
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.2.70",
+  "version": "1.2.72",
   "private": false,
   "files": [
     "dist",
@@ -33,19 +33,19 @@
     ]
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.2.31",
+    "@camstack/addon-admin-ui": "1.2.33",
     "@camstack/addon-agent-ui": "1.2.10",
     "@camstack/addon-auth": "1.2.11",
     "@camstack/addon-decoder-nodeav": "1.2.9",
     "@camstack/addon-notifiers": "1.2.13",
-    "@camstack/addon-pipeline": "1.2.42",
-    "@camstack/addon-pipeline-orchestrator": "1.2.25",
-    "@camstack/addon-post-analysis": "1.2.47",
+    "@camstack/addon-pipeline": "1.2.44",
+    "@camstack/addon-pipeline-orchestrator": "1.2.27",
+    "@camstack/addon-post-analysis": "1.2.49",
     "@camstack/sdk": "1.2.10",
     "@camstack/shm-ring": "1.1.9",
-    "@camstack/system": "1.2.57",
-    "@camstack/types": "1.2.41",
-    "@camstack/ui-library": "1.2.29",
+    "@camstack/system": "1.2.59",
+    "@camstack/types": "1.2.43",
+    "@camstack/ui-library": "1.2.31",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/cors": "^11.2.0",