create-egregore 0.21.0-runtime-mvp.1 → 0.21.0-runtime-mvp.3

package/assets/egregore-launcher.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// egregore-launcher-version: 0.21.0-runtime-mvp.1
+// egregore-launcher-version: 0.21.0-runtime-mvp.3
 //
 // egregore — launch and browse Egregore instances from your terminal.
 // Installed by create-egregore. Reads ~/.egregore/instances.json.
@@ -35,7 +35,7 @@ const crypto = require("node:crypto");
 const { spawnSync, spawn } = require("node:child_process");
 const readline = require("node:readline");
 
-const VERSION = "0.21.0-runtime-mvp.1";
+const VERSION = "0.21.0-runtime-mvp.3";
 const REGISTRY = path.join(os.homedir(), ".egregore", "instances.json");
 const DEFAULT_FILE = path.join(os.homedir(), ".egregore", "default");
 const UPDATE_CACHE_FILE = path.join(os.homedir(), ".egregore", "update-check.json");
@@ -2543,7 +2543,8 @@ const UPGRADE_STATUS_LABEL = {
 };
 
 function upgradeSummary(st) {
-  if (!st || st.status === "none") return "up to date";
+  // "none" means no activation record — a first-time state, not freshness.
+  if (!st || st.status === "none") return "no update staged";
   if (st.status === "active") return `${st.active_version || "?"} active`;
   return UPGRADE_STATUS_LABEL[st.status] || st.status;
 }
@@ -2565,7 +2566,8 @@ function formatUpgradeLines(inst, st, { candidate = "" } = {}) {
   lines.push(`Selected Egregore: ${inst.name || inst.slug} (${inst.slug || "?"})`);
   lines.push(`Location: ${inst.path}`);
   lines.push("");
-  lines.push(`Runtime: ${d.active_version || "unknown"} active`
+  const activeLabel = d.active_version ? `${d.active_version} active` : "not yet activated here";
+  lines.push(`Runtime: ${activeLabel}`
     + (d.candidate_version ? ` → candidate ${d.candidate_version}` : candidate ? ` → candidate ${candidate} available` : ""));
   lines.push(`Status: ${UPGRADE_STATUS_LABEL[d.status] || d.status}`);
   if (d.candidate_digest) lines.push(`Package digest: sha256 ${String(d.candidate_digest).slice(0, 16)}…`);

package/lib/setup.js

@@ -1327,17 +1327,46 @@ function currentTemplatePath() {
 //   # egregore-launcher-version: X.Y.Z   (bash)
 //   // egregore-launcher-version: X.Y.Z  (node)
 function launcherVersion(contents) {
-  const m = contents.match(/egregore-launcher-version:\s*(\d+\.\d+\.\d+)/);
+  // Capture the full stamp including any prerelease suffix. A prerelease-blind
+  // regex made 0.21.0-runtime-mvp.1 and .2 both read as "0.21.0", so the
+  // refresh treated the newer template as a local edit and refused to upgrade.
+  const m = contents.match(/egregore-launcher-version:\s*(\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?)/);
   return m ? m[1] : null;
 }
 
-// Return 1 if a > b, -1 if a < b, 0 if equal. Both are semver strings "x.y.z".
+// Return 1 if a > b, -1 if a < b, 0 if equal. Semver with prerelease rules:
+// a release outranks any prerelease of the same core; prerelease identifiers
+// compare dot-by-dot, numerically when both numeric.
 function compareVersions(a, b) {
-  const pa = a.split(".").map(Number);
-  const pb = b.split(".").map(Number);
+  const splitOnce = (v) => {
+    const i = v.indexOf("-");
+    return i === -1 ? [v, ""] : [v.slice(0, i), v.slice(i + 1)];
+  };
+  const [coreA, preA] = splitOnce(a);
+  const [coreB, preB] = splitOnce(b);
+  const pa = coreA.split(".").map(Number);
+  const pb = coreB.split(".").map(Number);
   for (let i = 0; i < 3; i++) {
     if (pa[i] !== pb[i]) return pa[i] > pb[i] ? 1 : -1;
   }
+  if (!preA && !preB) return 0;
+  if (!preA) return 1;
+  if (!preB) return -1;
+  const ia = preA.split(".");
+  const ib = preB.split(".");
+  for (let i = 0; i < Math.max(ia.length, ib.length); i++) {
+    if (ia[i] === undefined) return -1;
+    if (ib[i] === undefined) return 1;
+    const na = /^\d+$/.test(ia[i]) ? Number(ia[i]) : NaN;
+    const nb = /^\d+$/.test(ib[i]) ? Number(ib[i]) : NaN;
+    if (!Number.isNaN(na) && !Number.isNaN(nb)) {
+      if (na !== nb) return na > nb ? 1 : -1;
+    } else if (Number.isNaN(na) !== Number.isNaN(nb)) {
+      return Number.isNaN(na) ? 1 : -1;
+    } else if (ia[i] !== ib[i]) {
+      return ia[i] > ib[i] ? 1 : -1;
+    }
+  }
   return 0;
 }
 
@@ -1628,6 +1657,8 @@ async function installShellAlias(egregoreDir, ui) {
 
 module.exports = {
   install,
+  launcherVersion,
+  compareVersions,
   ghApi,
   acceptPendingInvitations,
   registerInstance,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.21.0-runtime-mvp.1",
+  "version": "0.21.0-runtime-mvp.3",
   "description": "Set up Egregore for your team in one command — installs the egregore launcher and your choice of Claude Code, Codex, or Pi.",
   "license": "MIT",
   "bin": {