@camstack/agent 1.1.49 → 1.1.51

package/dist/cli.js

@@ -84,6 +84,7 @@ var require_dist = __commonJS({
       planBoot: () => planBoot,
       readDevUploadManifest: () => readDevUploadManifest,
       readRestartIntentMarker: () => readRestartIntentMarker,
+      readSeedVersion: () => readSeedVersion,
       readServerRootState: () => readServerRootState,
       registerActiveRootResolver: () => registerActiveRootResolver,
       restartIntentMarkerPath: () => restartIntentMarkerPath,
@@ -295,7 +296,34 @@ var require_dist = __commonJS({
       }
       return null;
     }
-    function planBoot(state, isValidVersion, now) {
+    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 };
+    }
+    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;
+    }
+    function planBoot(state, isValidVersion, now, seedVersion = null) {
       if (state === null) {
         return { kind: "baked", reason: "no server-root state", stateToWrite: null };
       }
@@ -341,6 +369,19 @@ var require_dist = __commonJS({
       }
       if (next.currentVersion !== null) {
         if (isValidVersion(next.currentVersion)) {
+          if (!changed && seedVersion !== null && compareSemver(seedVersion, next.currentVersion) > 0) {
+            return {
+              kind: "baked",
+              reason: `baked seed ${seedVersion} is newer than active data-root ${next.currentVersion} \u2014 adopting the image seed`,
+              stateToWrite: {
+                ...next,
+                currentVersion: null,
+                previousVersion: null,
+                pendingBoot: null,
+                rolledBack: null
+              }
+            };
+          }
           return {
             kind: "data-root",
             version: next.currentVersion,
@@ -389,33 +430,6 @@ var require_dist = __commonJS({
         stateToWrite: changed ? next : null
       };
     }
-    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 };
-    }
-    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;
-    }
     var fs32 = __toESM2(require("fs"));
     var path32 = __toESM2(require("path"));
     function detectWorkspaceRoot(fromDir) {
@@ -434,6 +448,7 @@ var require_dist = __commonJS({
         dir = parent;
       }
     }
+    var fs42 = __toESM2(require("fs"));
     var path42 = __toESM2(require("path"));
     var import_node_url = require("url");
     var HOST_EXTERNAL_SPECIFIERS = [
@@ -477,6 +492,19 @@ var require_dist = __commonJS({
       };
       registerHooks(hooks);
     }
+    function readSeedVersion(seedEntry) {
+      try {
+        const pkgJsonPath = path42.join(path42.dirname(seedEntry), "..", "package.json");
+        const raw = JSON.parse(fs42.readFileSync(pkgJsonPath, "utf-8"));
+        if (typeof raw === "object" && raw !== null) {
+          const version = raw["version"];
+          if (typeof version === "string") return version;
+        }
+        return null;
+      } catch {
+        return null;
+      }
+    }
     function runNodeStarter(options) {
       const env = options.env ?? process.env;
       const now = options.now ?? Date.now;
@@ -505,7 +533,8 @@ var require_dist = __commonJS({
         if (reason !== null) console.warn(`[starter] version ${version} invalid: ${reason}`);
         return reason === null;
       };
-      const plan = planBoot(state, isValidVersion, now);
+      const seedVersion = readSeedVersion(options.seedEntry);
+      const plan = planBoot(state, isValidVersion, now, seedVersion);
       if (plan.stateToWrite !== null) {
         try {
           writeServerRootState(rootDir, plan.stateToWrite);
@@ -540,7 +569,7 @@ var require_dist = __commonJS({
       options.loadEntry(options.seedEntry);
     }
     var import_node_child_process = require("child_process");
-    var fs42 = __toESM2(require("fs"));
+    var fs52 = __toESM2(require("fs"));
     var path52 = __toESM2(require("path"));
     var import_node_util = require("util");
     var execFileAsync = (0, import_node_util.promisify)(import_node_child_process.execFile);
@@ -553,7 +582,7 @@ var require_dist = __commonJS({
     var RESTART_REASON_PREFIX = "server-update";
     function readPackageVersion(pkgJsonPath) {
       try {
-        const raw = JSON.parse(fs42.readFileSync(pkgJsonPath, "utf-8"));
+        const raw = JSON.parse(fs52.readFileSync(pkgJsonPath, "utf-8"));
         if (typeof raw === "object" && raw !== null) {
           const version = raw["version"];
           if (typeof version === "string") return version;
@@ -627,7 +656,7 @@ var require_dist = __commonJS({
         const rootDir = this.rootDir();
         const raw = readServerRootState(rootDir);
         if (raw !== null) return { state: raw, corrupt: false };
-        return { state: emptyServerRootState(), corrupt: fs42.existsSync(stateFilePath(rootDir)) };
+        return { state: emptyServerRootState(), corrupt: fs52.existsSync(stateFilePath(rootDir)) };
       }
       updateState(state) {
         if (this.inFlight === "checking") return "checking";
@@ -769,7 +798,7 @@ var require_dist = __commonJS({
         }
         if (isDevChannelVersion(target)) {
           const uploadsDir = devUploadVersionDir(this.rootDir(), target);
-          if (!fs42.existsSync(uploadsDir)) {
+          if (!fs52.existsSync(uploadsDir)) {
             return {
               accepted: false,
               targetVersion: target,
@@ -824,15 +853,15 @@ var require_dist = __commonJS({
       async stageAndActivate(target) {
         const rootDir = this.rootDir();
         const vDir = versionsDir(rootDir);
-        fs42.mkdirSync(vDir, { recursive: true });
+        fs52.mkdirSync(vDir, { recursive: true });
         const stagingDir = path52.join(vDir, `.staging-${target}-${process.pid}-${this.now()}`);
-        fs42.mkdirSync(stagingDir, { recursive: true });
+        fs52.mkdirSync(stagingDir, { recursive: true });
         try {
           const devDir = devUploadVersionDir(rootDir, target);
           const registry = this.env["CAMSTACK_NPM_REGISTRY"];
           const installArgs = ["install", "--omit=dev", "--no-audit", "--no-fund", "--loglevel=error"];
-          if (fs42.existsSync(devDir)) {
-            fs42.writeFileSync(
+          if (fs52.existsSync(devDir)) {
+            fs52.writeFileSync(
               path52.join(stagingDir, "package.json"),
               JSON.stringify(this.buildDevUploadsPackageJson(devDir, target), null, 2),
               "utf-8"
@@ -842,7 +871,7 @@ var require_dist = __commonJS({
               timeoutMs: NPM_INSTALL_TIMEOUT_MS
             });
           } else {
-            fs42.writeFileSync(
+            fs52.writeFileSync(
               path52.join(stagingDir, "package.json"),
               JSON.stringify({ name: "camstack-node-root", private: true }, null, 2),
               "utf-8"
@@ -853,7 +882,7 @@ var require_dist = __commonJS({
             );
           }
           const entry = rootEntryPath(stagingDir, this.spec);
-          if (!fs42.existsSync(entry)) {
+          if (!fs52.existsSync(entry)) {
             throw new Error(`staged closure is missing the root entry (${entry})`);
           }
           const stagedVersion = readPackageVersion(
@@ -865,14 +894,14 @@ var require_dist = __commonJS({
             );
           }
           const dest = versionDir(rootDir, target);
-          if (fs42.existsSync(dest)) {
+          if (fs52.existsSync(dest)) {
             const aside = `${dest}.evicted-${this.now()}`;
-            await fs42.promises.rename(dest, aside);
-            await fs42.promises.rm(aside, { recursive: true, force: true }).catch(() => void 0);
+            await fs52.promises.rename(dest, aside);
+            await fs52.promises.rm(aside, { recursive: true, force: true }).catch(() => void 0);
           }
-          await fs42.promises.rename(stagingDir, dest);
+          await fs52.promises.rename(stagingDir, dest);
         } catch (err) {
-          await fs42.promises.rm(stagingDir, { recursive: true, force: true }).catch(() => void 0);
+          await fs52.promises.rm(stagingDir, { recursive: true, force: true }).catch(() => void 0);
           throw err;
         }
       }
@@ -903,7 +932,7 @@ var require_dist = __commonJS({
         }
         const fileRef = (filename) => {
           const abs = path52.join(devDir, filename);
-          if (!fs42.existsSync(abs)) {
+          if (!fs52.existsSync(abs)) {
             throw new Error(`dev-uploads tarball listed in the manifest is missing: ${abs}`);
           }
           return `file:${abs}`;
@@ -1073,7 +1102,7 @@ var require_dist = __commonJS({
         const vDir = versionsDir(this.rootDir());
         let entries;
         try {
-          entries = fs42.readdirSync(vDir);
+          entries = fs52.readdirSync(vDir);
         } catch {
           return;
         }
@@ -1082,14 +1111,14 @@ var require_dist = __commonJS({
           const full = path52.join(vDir, entry);
           if (entry.startsWith(".")) {
             try {
-              const ageMs = this.now() - fs42.statSync(full).mtimeMs;
+              const ageMs = this.now() - fs52.statSync(full).mtimeMs;
               if (ageMs < _RootUpdateService.STALE_TRANSIENT_MS) continue;
             } catch {
               continue;
             }
           }
           try {
-            fs42.rmSync(full, { recursive: true, force: true });
+            fs52.rmSync(full, { recursive: true, force: true });
             this.logger.debug("pruned server-root version dir", { meta: { entry } });
           } catch (err) {
             this.logger.warn("failed to prune server-root version dir", {
@@ -1110,15 +1139,15 @@ var require_dist = __commonJS({
         const dir = devUploadsDir(this.rootDir());
         let entries;
         try {
-          entries = fs42.readdirSync(dir);
+          entries = fs52.readdirSync(dir);
         } catch {
           return;
         }
         const graveyard = path52.join(dir, ".sweeping");
         try {
-          for (const residue of fs42.readdirSync(graveyard)) {
+          for (const residue of fs52.readdirSync(graveyard)) {
             try {
-              fs42.rmSync(path52.join(graveyard, residue), { recursive: true, force: true });
+              fs52.rmSync(path52.join(graveyard, residue), { recursive: true, force: true });
             } catch {
             }
           }
@@ -1130,11 +1159,11 @@ var require_dist = __commonJS({
         );
         const doomed = byNewestFirst.slice(keepCount);
         if (doomed.length === 0) return;
-        fs42.mkdirSync(graveyard, { recursive: true });
+        fs52.mkdirSync(graveyard, { recursive: true });
         for (const entry of doomed) {
           const aside = path52.join(graveyard, `${entry}-${this.now()}`);
           try {
-            fs42.renameSync(path52.join(dir, entry), aside);
+            fs52.renameSync(path52.join(dir, entry), aside);
           } catch (err) {
             this.logger.warn("failed to move dev-uploads entry aside for sweep", {
               meta: { entry, error: err instanceof Error ? err.message : String(err) }
@@ -1142,7 +1171,7 @@ var require_dist = __commonJS({
             continue;
           }
           try {
-            fs42.rmSync(aside, { recursive: true, force: true });
+            fs52.rmSync(aside, { recursive: true, force: true });
             this.logger.debug("swept dev-uploads entry", { meta: { entry } });
           } catch {
           }
@@ -1812,8 +1841,8 @@ function getLocalIps() {
 }
 async function withTimeout(p, ms, fallback) {
   let timer;
-  const timeout = new Promise((resolve7) => {
-    timer = setTimeout(() => resolve7(fallback), ms);
+  const timeout = new Promise((resolve6) => {
+    timer = setTimeout(() => resolve6(fallback), ms);
   });
   try {
     return await Promise.race([p, timeout]);
@@ -3301,23 +3330,35 @@ if (args.statusPort && !process.env["CAMSTACK_STATUS_PORT"]) {
   process.env["CAMSTACK_STATUS_PORT"] = args.statusPort;
 }
 if (!process.env["CAMSTACK_FRAMEWORK_DIR"]) {
-  const scriptPath = process.argv[1];
-  if (scriptPath) {
-    const frameworkDir = path8.resolve(path8.dirname(scriptPath), "..", "..");
+  const isFrameworkDir = (dir) => (0, import_node_fs.existsSync)(path8.join(dir, "node_modules", "@camstack", "shm-ring")) && (0, import_node_fs.existsSync)(path8.join(dir, "node_modules", "@camstack", "system"));
+  const discoverFrameworkDir = () => {
+    const activeRoot = process.env["CAMSTACK_AGENT_ACTIVE_ROOT"];
+    if (activeRoot && isFrameworkDir(activeRoot)) return activeRoot;
+    const scriptPath = process.argv[1];
+    if (!scriptPath) return null;
+    let dir = path8.dirname(scriptPath);
+    for (let depth = 0; depth < 8; depth++) {
+      if (isFrameworkDir(dir)) return dir;
+      const parent = path8.dirname(dir);
+      if (parent === dir) break;
+      dir = parent;
+    }
+    return null;
+  };
+  const frameworkDir = discoverFrameworkDir();
+  if (frameworkDir) {
     const frameworkModules = path8.join(frameworkDir, "node_modules");
-    if ((0, import_node_fs.existsSync)(path8.join(frameworkModules, "@camstack", "shm-ring"))) {
-      process.env["CAMSTACK_FRAMEWORK_DIR"] = frameworkDir;
-      const existingNodePath = process.env["NODE_PATH"];
-      process.env["NODE_PATH"] = existingNodePath ? `${frameworkModules}${path8.delimiter}${existingNodePath}` : frameworkModules;
-      import_node_module.Module._initPaths();
-      console.log(
-        `[Agent] Self-contained framework detected \u2014 CAMSTACK_FRAMEWORK_DIR=${frameworkDir}`
-      );
-      if (!process.env["CAMSTACK_BUNDLED_ADDONS_DIR"]) {
-        const bundledAddons = path8.join(frameworkDir, "addons");
-        if ((0, import_node_fs.existsSync)(bundledAddons)) {
-          process.env["CAMSTACK_BUNDLED_ADDONS_DIR"] = bundledAddons;
-        }
+    process.env["CAMSTACK_FRAMEWORK_DIR"] = frameworkDir;
+    const existingNodePath = process.env["NODE_PATH"];
+    process.env["NODE_PATH"] = existingNodePath ? `${frameworkModules}${path8.delimiter}${existingNodePath}` : frameworkModules;
+    import_node_module.Module._initPaths();
+    console.log(
+      `[Agent] Self-contained framework detected \u2014 CAMSTACK_FRAMEWORK_DIR=${frameworkDir}`
+    );
+    if (!process.env["CAMSTACK_BUNDLED_ADDONS_DIR"]) {
+      const bundledAddons = path8.join(frameworkDir, "addons");
+      if ((0, import_node_fs.existsSync)(bundledAddons)) {
+        process.env["CAMSTACK_BUNDLED_ADDONS_DIR"] = bundledAddons;
       }
     }
   }