@camstack/agent 1.1.58 → 1.1.59

package/dist/cli.mjs

@@ -2,8 +2,8 @@
 import { createRequire as __cr } from 'node:module'; const require = globalThis.require ?? __cr(import.meta.url);
 import {
   startAgent
-} from "./chunk-2P5A5KTL.mjs";
-import "./chunk-DIBZT6GT.mjs";
+} from "./chunk-54PFYHKN.mjs";
+import "./chunk-ADZNLSIO.mjs";
 
 // src/cli.ts
 import { existsSync } from "fs";

package/dist/index.js

@@ -318,6 +318,33 @@ var require_dist = __commonJS({
     }
     var fs32 = __toESM2(require("fs"));
     var path32 = __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 };
+    }
+    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 CURRENT_DIRNAME = "current";
     var PENDING_ROOT_SWAP_FILE = ".pending-root-swap.json";
     var LEGACY_FRAMEWORK_MARKERS = [
@@ -459,13 +486,41 @@ var require_dist = __commonJS({
       log(`[single-copy] applied staged root swap \u2192 ${marker.version}`);
       return { applied: true, version: marker.version, reason: "applied" };
     }
+    function readClosureVersion(closureDir, spec) {
+      try {
+        const raw = JSON.parse(
+          fs32.readFileSync(path32.join(rootPackageDir(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;
+    }
+    function isAdoptablePendingClosure(rootDir, version, nodeMajor, spec) {
+      const dir = versionDir(rootDir, version);
+      return validateClosureDir(dir, nodeMajor, spec, version) === null && findMissingNativePrebuilds(dir).length === 0;
+    }
     function migrateToSingleCopy(rootDir, spec, nodeMajor, now, log) {
       const dest = currentDir(rootDir);
-      if (fs32.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 = fs32.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,
@@ -532,33 +587,6 @@ var require_dist = __commonJS({
       }
       return { kind: "baked", reason: "no valid single-copy closure \u2014 booting the baked seed" };
     }
-    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 fs42 = __toESM2(require("fs"));
     var path42 = __toESM2(require("path"));
     function detectWorkspaceRoot(fromDir) {
@@ -621,7 +649,7 @@ var require_dist = __commonJS({
       };
       registerHooks(hooks);
     }
-    function readClosureVersion(closureDir, spec) {
+    function readClosureVersion2(closureDir, spec) {
       try {
         const raw = JSON.parse(
           fs52.readFileSync(path52.join(rootPackageDir(closureDir, spec), "package.json"), "utf-8")
@@ -676,7 +704,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}`