create-egregore 0.21.0-runtime-mvp.23 → 0.21.0-runtime-mvp.25

package/assets/egregore-launcher.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// egregore-launcher-version: 0.21.0-runtime-mvp.23
+// egregore-launcher-version: 0.21.0-runtime-mvp.25
 //
 // 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.23";
+const VERSION = "0.21.0-runtime-mvp.25";
 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");
@@ -766,9 +766,8 @@ function codexSupportMessage(egregoreDir) {
     "  .codex/hooks.json",
     "  .codex/hooks/",
     "",
-    "Automatic repair did not complete. Retry with:",
-    "  npx -y create-egregore@latest --refresh-launcher",
-    "Then rerun egregore.",
+    "Restore this instance using its installed runtime version, then rerun egregore.",
+    "A global CLI refresh does not repair instance files.",
     "Egregore workflows appear as slash commands. In Codex, invoke them with the matching $skill token or ask in natural language.",
   ].join("\n");
 }
@@ -799,7 +798,7 @@ function piSupportMessage(egregoreDir) {
     "Pi meta-harness support is missing from this Egregore checkout.",
     `  path: ${egregoreDir}`,
     "",
-    "Run npx -y create-egregore@latest to install the packaged Pi runtime, then rerun egregore.",
+    "Restore this instance using its installed runtime version, then rerun egregore.",
   ].join("\n");
 }
 
@@ -818,31 +817,10 @@ function primeSupportMessage(egregoreDir) {
     "Prime Agent runtime support is missing from this Egregore checkout.",
     `  path: ${egregoreDir}`,
     "",
-    "Run npx -y create-egregore@latest to install the packaged Prime Agent runtime, then rerun egregore.",
+    "Restore this instance using its installed runtime version, then rerun egregore.",
   ].join("\n");
 }
 
-function repairPortableRuntime(egregoreDir, runtime) {
-  const label = runtimeLabel(runtime);
-  process.stdout.write(`\n  ${CYAN}↻${RESET} ${BOLD}Repairing ${label} support${RESET}${DIM} — updating this checkout${RESET}\n`);
-  const result = spawnSync(
-    "npx",
-    ["-y", `${PUBLIC_NPX_PACKAGE}@latest`, "--refresh-launcher"],
-    {
-      cwd: egregoreDir,
-      stdio: "inherit",
-      env: { ...process.env, EGREGORE_RUNTIME_REPAIR: runtime },
-      timeout: 3 * 60 * 1000,
-    },
-  );
-  if (result.error || result.status !== 0) {
-    process.stderr.write(`  ${YELLOW}!${RESET} Automatic ${label} repair failed; the checkout was left in place.\n`);
-    return false;
-  }
-  process.stdout.write(`  ${GREEN}✓${RESET} ${label} support repaired\n\n`);
-  return true;
-}
-
 // Minimal y/N line prompt for pre-launch decisions (the TUI select machinery
 // is torn down by the time launch() runs).
 function confirmLine(question) {
@@ -988,19 +966,15 @@ async function launch(inst, runtimeOverride) {
     }
   }
   if (runtime === "codex") {
-    if (!hasCodexCoreSupport(inst.path)) {
-      if (!repairPortableRuntime(inst.path, runtime) || !hasCodexCoreSupport(inst.path)) {
-        die(codexSupportMessage(inst.path));
-      }
-    }
+    // Launching never changes an instance's runtime or release channel.
+    if (!hasCodexCoreSupport(inst.path)) die(codexSupportMessage(inst.path));
     const skillsInstalled = installCodexSkills(inst.path);
     const cardRendered = await renderCodexStartupCard(inst.path);
     if (!skillsInstalled || !cardRendered) {
       die(codexSupportMessage(inst.path));
     }
   } else if (runtime === "pi") {
-    if (!hasPiCoreSupport(inst.path) &&
-        (!repairPortableRuntime(inst.path, runtime) || !hasPiCoreSupport(inst.path))) {
+    if (!hasPiCoreSupport(inst.path)) {
       die(piSupportMessage(inst.path));
     }
   }
@@ -1011,10 +985,7 @@ async function launch(inst, runtimeOverride) {
     // check + the trust-flag probe, which shells out to the binary), then a
     // single handoff line explains the remaining in-harness startup.
     const stopLoader = startSpinner("Starting Prime Agent");
-    let coreOk = hasPrimeCoreSupport(inst.path);
-    if (!coreOk && repairPortableRuntime(inst.path, runtime)) {
-      coreOk = hasPrimeCoreSupport(inst.path);
-    }
+    const coreOk = hasPrimeCoreSupport(inst.path);
     launchArgs = coreOk ? runtimeLaunchArgs(runtime, inst.path) : null;
     stopLoader();
     if (!coreOk) die(primeSupportMessage(inst.path));
@@ -1317,7 +1288,19 @@ function compareReleaseVersions(a, b) {
   if (left.prerelease === right.prerelease) return 0;
   if (!left.prerelease) return 1;
   if (!right.prerelease) return -1;
-  return left.prerelease.localeCompare(right.prerelease);
+  const leftIds = left.prerelease.split(".");
+  const rightIds = right.prerelease.split(".");
+  for (let i = 0; i < Math.max(leftIds.length, rightIds.length); i++) {
+    if (leftIds[i] === undefined) return -1;
+    if (rightIds[i] === undefined) return 1;
+    if (leftIds[i] === rightIds[i]) continue;
+    const leftNumeric = /^\d+$/.test(leftIds[i]);
+    const rightNumeric = /^\d+$/.test(rightIds[i]);
+    if (leftNumeric && rightNumeric) return BigInt(leftIds[i]) > BigInt(rightIds[i]) ? 1 : -1;
+    if (leftNumeric !== rightNumeric) return leftNumeric ? -1 : 1;
+    return leftIds[i] > rightIds[i] ? 1 : -1;
+  }
+  return 0;
 }
 
 function cliUpdateState(latest) {
@@ -1883,9 +1866,10 @@ async function cmdConnect(args) {
       console.log(`        ${DIM}${line}${RESET}`);
     }
   }
+  // Connect is an instance-scoped overlay; never refresh other runtimes here.
   const runtimeRefresh = spawnSync(
     "npx",
-    ["-y", `${PUBLIC_NPX_PACKAGE}@latest`, "--refresh-launcher"],
+    ["-y", `${PUBLIC_NPX_PACKAGE}@${VERSION}`, "--refresh-connect"],
     {
       cwd: inst.path,
       encoding: "utf-8",
@@ -1897,7 +1881,7 @@ async function cmdConnect(args) {
     console.log(`        ${GREEN}✓${RESET} Connect features installed`);
   } else {
     console.log(`        ${YELLOW}!${RESET} Connect features will retry on the next update`);
-    console.log(`          ${DIM}npx -y ${PUBLIC_NPX_PACKAGE}@latest --refresh-launcher${RESET}`);
+    console.log(`          ${DIM}npx -y ${PUBLIC_NPX_PACKAGE}@${VERSION} --refresh-connect${RESET}`);
   }
   console.log("");
   console.log(`  ${GREEN}✓${RESET} ${BOLD}${inst.slug}${RESET} is connected. Local files remain the source of truth.`);
@@ -2381,13 +2365,20 @@ function resolveUpgradeBridge(inst) {
   return null;
 }
 
+// Snapshot the bridge before starting Bash: older instances still have a
+// non-exec bridge that activation overwrites while its shell is running.
+// Keep $0 and all arguments intact for root resolution and exact forwarding.
+function upgradeBridgeArgs(bridge, args) {
+  return ["-c", fs.readFileSync(bridge.script, "utf-8"), bridge.script, ...args];
+}
+
 function runUpgrade(inst, args, timeout = 60000) {
   const bridge = resolveUpgradeBridge(inst);
   if (!bridge) {
     return { status: 127, stdout: "", stderr: "Runtime update is unavailable — no upgrade engine in this egregore or the installed launcher package.\n", missing: true };
   }
   try {
-    return spawnSync("bash", [bridge.script, ...args], { cwd: inst.path, stdio: "pipe", encoding: "utf-8", timeout, env: { ...process.env, ...bridge.env } });
+    return spawnSync("bash", upgradeBridgeArgs(bridge, args), { cwd: inst.path, stdio: "pipe", encoding: "utf-8", timeout, env: { ...process.env, ...bridge.env } });
   } catch (err) {
     return { status: 1, stdout: "", stderr: String(err) };
   }
@@ -2530,7 +2521,7 @@ function upgradeStatusAsync(inst, cb) {
   if (!bridge) return cb({ status: "unavailable", failure: { message: "No Runtime update engine is installed" } });
   let buf = ""; let err = "";
   try {
-    const child = spawn("bash", [bridge.script, "status"], { cwd: inst.path, stdio: ["ignore", "pipe", "pipe"], env: { ...process.env, ...bridge.env } });
+    const child = spawn("bash", upgradeBridgeArgs(bridge, ["status"]), { cwd: inst.path, stdio: ["ignore", "pipe", "pipe"], env: { ...process.env, ...bridge.env } });
     child.stdout.on("data", (d) => { buf += d; });
     child.stderr.on("data", (d) => { err += d; });
     child.on("close", (code) => {
@@ -2667,12 +2658,18 @@ const UPGRADE_STATUS_LABEL = {
 // Settings-row truth for the Runtime update line. The row must say outright
 // whether this egregore runs the new Runtime — "no update staged" is
 // transaction state, not the condition the user needs to see.
+function runtimeUpdateAvailable(st, candidate) {
+  return st?.status === "active"
+    && RUNTIME_MVP_VERSION_RE.test(candidate || "")
+    && compareReleaseVersions(candidate, st.active_version) > 0;
+}
+
 function runtimeUpdateRowValue(st, candidate) {
   if (st === undefined) return `${DIM}checking…${RESET}`;
   if (st === null) return `${DIM}unavailable${RESET}`;
   if (st.status === "active") {
     const v = st.active_version || "?";
-    if (candidate && candidate !== v) return `${v} active ${YELLOW}· update available ${candidate}${RESET}`;
+    if (runtimeUpdateAvailable(st, candidate)) return `${v} active ${YELLOW}· update available ${candidate}${RESET}`;
     return `${GREEN}${v} active${RESET}${candidate ? `${DIM} · up to date${RESET}` : ""}`;
   }
   if (st.status === "unavailable") return `${YELLOW}update unavailable${RESET}`;
@@ -2710,8 +2707,10 @@ function formatUpgradeLines(inst, st, { candidate = "", retrieval = null } = {})
   lines.push(`Location: ${inst.path}`);
   lines.push("");
   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` : ""));
+  const candidateLabel = d.status === "active"
+    ? (runtimeUpdateAvailable(d, candidate) ? ` → candidate ${candidate} available` : "")
+    : (d.candidate_version ? ` → candidate ${d.candidate_version}` : candidate ? ` → candidate ${candidate} available` : "");
+  lines.push(`Runtime: ${activeLabel}${candidateLabel}`);
   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)}…`);
   // A recorded failure only needs attention while the transaction is stuck
@@ -3189,7 +3188,7 @@ function renderUpgradePanel({ inst, data, candidate, retrieval, mode, notice, wi
     if (notice) lines.push(boxLine(notice, innerWidth, margin));
     const keys = [];
     if (!status || status === "none" || ["pending", "failed", "interrupted", "cancelled", "rolled-back"].includes(status)) keys.push(`${BOLD}p${RESET}${DIM} prepare${RESET}`);
-    if (status === "active" && candidate && candidate !== (data && data.active_version)) keys.push(`${BOLD}p${RESET}${DIM} prepare update${RESET}`);
+    if (runtimeUpdateAvailable(data, candidate)) keys.push(`${BOLD}p${RESET}${DIM} prepare update${RESET}`);
     if (status === "ready-to-activate") keys.push(`${BOLD}a${RESET}${DIM} activate${RESET}`);
     if (status === "preparing") keys.push(`${BOLD}c${RESET}${DIM} cancel${RESET}`);
     if (status === "active") keys.push(`${BOLD}r${RESET}${DIM} roll back${RESET}`);
@@ -3952,9 +3951,7 @@ async function browser(args = {}) {
           render(); return;
         }
         const status = state.upgradeData && state.upgradeData.status;
-        const activeUpdatable = status === "active"
-          && state.upgradeCandidate
-          && state.upgradeCandidate !== (state.upgradeData && state.upgradeData.active_version);
+        const activeUpdatable = runtimeUpdateAvailable(state.upgradeData, state.upgradeCandidate);
         if (chunk === "p" && (!status || activeUpdatable || ["none", "pending", "failed", "interrupted", "cancelled", "rolled-back"].includes(status))) {
           const staged = state.upgradeData
             && !["none", "cancelled", "rolled-back", "active"].includes(status)

package/lib/setup.js

@@ -1132,7 +1132,7 @@ function codexSupportMessage(egregoreDir) {
     "  .codex/hooks.json",
     "  .codex/hooks/",
     "",
-    "Run npx -y create-egregore@latest to install the packaged Codex runtime, then rerun egregore.",
+    "Restore this instance using its installed runtime version, then rerun egregore.",
     "Egregore workflows appear as slash commands. In Codex, invoke them with the matching $skill token or ask in natural language.",
   ].join("\n");
 }
@@ -1146,7 +1146,7 @@ function piSupportMessage(egregoreDir) {
     "Pi meta-harness support is missing from this Egregore checkout.",
     `  path: ${egregoreDir}`,
     "",
-    "Run npx -y create-egregore@latest to install the packaged Pi runtime, then rerun egregore.",
+    "Restore this instance using its installed runtime version, then rerun egregore.",
     "Pi loads Egregore through project-local .pi resources and the shared portable skill corpus.",
   ].join("\n");
 }
@@ -1156,7 +1156,7 @@ function primeSupportMessage(egregoreDir) {
     "Prime Agent runtime support is missing from this Egregore checkout.",
     `  path: ${egregoreDir}`,
     "",
-    "Run npx -y create-egregore@latest to install the packaged Prime Agent runtime, then rerun egregore.",
+    "Restore this instance using its installed runtime version, then rerun egregore.",
     "Prime Agent loads Egregore through project-local .prime/agent resources and the shared portable skill corpus.",
   ].join("\n");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.21.0-runtime-mvp.23",
+  "version": "0.21.0-runtime-mvp.25",
   "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": {

package/runtime/claude/.claude/skills/save/SKILL.md

@@ -36,17 +36,10 @@ BASE=$(bash -c 'SCRIPT_DIR="$PWD"; CONFIG="$PWD/egregore.json"; . "$PWD/bin/lib/
 
 Stop before mutation if it cannot be resolved.
 
-3. Run the product-distribution checkpoint when its registry exists — the
-   guard is real: installed instances do not ship the distribution engine,
-   and its absence there is correct, not an error to chase:
-
-```bash
-if [ -f bin/capability-distribution.mjs ] && [ -f capability-distribution.json ]; then
-  bash bin/node-run.sh bin/capability-distribution.mjs validate --root .
-  bash bin/node-run.sh bin/capability-distribution.mjs changes --root . --base "origin/$BASE" --json
-  bash bin/node-run.sh bin/capability-distribution.mjs runtime-skill-audit --root . --strict-contract
-fi
-```
+3. The shared `bin/agent.sh save` preflight runs distribution validation,
+   the change report, and the strict Runtime-skill audit before any memory or
+   project mutation. Both engine and registry must exist; installed public
+   instances intentionally omit the development engine.
 
 Ask one placement question only for a genuinely new/unclassified component or
 an explicit placement change. Ordinary edits to an existing component do not

package/runtime/claude/bin/agent.sh

@@ -397,6 +397,14 @@ cmd_save() {
   [ -n "$message" ] || message="chore(save): $topic"
   base="$(resolve_base_branch)" || die "save stopped before Git changes"
 
+  # Shared invariant across harnesses, before memory or project mutations.
+  # Installed public instances intentionally omit the development engine.
+  if [ -f "$SCRIPT_DIR/bin/capability-distribution.mjs" ] && [ -f "$SCRIPT_DIR/capability-distribution.json" ]; then
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" validate --root "$SCRIPT_DIR" || die "distribution validation failed"
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" changes --root "$SCRIPT_DIR" --base "origin/$base" --json || die "distribution change check failed"
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" runtime-skill-audit --root "$SCRIPT_DIR" --strict-contract || die "runtime skill contract failed"
+  fi
+
   if [ -d "$MEMORY_DIR" ]; then
     save_memory "$message" "."
     echo "memory: synced"

package/runtime/claude/bin/runtime-upgrade.sh

@@ -22,10 +22,12 @@ SCRIPT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 # tree, while the target instance is set explicitly — never inferred.
 INSTANCE_ROOT="${EGREGORE_INSTANCE_ROOT:-$SCRIPT_DIR}"
 
+# Activation and rollback can replace this script. Hand off the process so
+# Bash never resumes reading changed bytes after the Runtime returns.
 _runtime() {
   EGREGORE_ROOT="$INSTANCE_ROOT" \
     PYTHONPATH="$SCRIPT_DIR${PYTHONPATH:+:$PYTHONPATH}" \
-    python3 -m egregore_runtime.harness_cli "$@"
+    exec python3 -m egregore_runtime.harness_cli "$@"
 }
 
 _ensure_identity() {

package/runtime/claude/egregore_runtime/runtime.py

@@ -230,15 +230,12 @@ class EgregoreRuntime:
                 "this document is admin-marked; Egregore serves it to organization admins only"
             )
         stable_artifact_id = canonical_artifact_id(content, path)
-        if stable_artifact_id != artifact_id:
-            stable_decision = self.authorize(
-                actor, Permission.READ, (stable_artifact_id,)
+        stable_decision = self.authorize(actor, Permission.READ, (stable_artifact_id,))
+        if not stable_decision.allowed:
+            raise AuthorizationDenied(
+                "canonical artifact identity is outside the actor read scope"
             )
-            if not stable_decision.allowed:
-                raise AuthorizationDenied(
-                    "canonical artifact identity is outside the actor read scope"
-                )
-            artifact_id = stable_artifact_id
+        artifact_id = stable_artifact_id
         try:
             self.telemetry.emit(
                 TelemetryEvent(

package/runtime/codex/.codex/skills/save/SKILL.md

@@ -42,13 +42,10 @@ esac
    - Stop with "everything is already saved" only when there are no repo or
      memory changes and either the branch has no commits to integrate
      (`AHEAD=0`) or an open integration PR already exists.
-4. Run the product distribution checkpoint before any commit or push when
-   `capability-distribution.json` exists:
-
-```bash
-bash bin/node-run.sh bin/capability-distribution.mjs validate --root .
-bash bin/node-run.sh bin/capability-distribution.mjs changes --root . --base "origin/$BASE" --json
-```
+4. The shared `bin/agent.sh save` preflight runs distribution validation,
+   the change report, and the strict Runtime-skill audit before any memory or
+   project mutation. It runs only when both the registry and development
+   engine exist; public installed instances intentionally omit that engine.
 
    Inspect the diff as well as the receipt. Ask when this work introduces a new
    or unclassified Egregore component, or changes a component's placement

package/runtime/codex/bin/agent.sh

@@ -397,6 +397,14 @@ cmd_save() {
   [ -n "$message" ] || message="chore(save): $topic"
   base="$(resolve_base_branch)" || die "save stopped before Git changes"
 
+  # Shared invariant across harnesses, before memory or project mutations.
+  # Installed public instances intentionally omit the development engine.
+  if [ -f "$SCRIPT_DIR/bin/capability-distribution.mjs" ] && [ -f "$SCRIPT_DIR/capability-distribution.json" ]; then
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" validate --root "$SCRIPT_DIR" || die "distribution validation failed"
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" changes --root "$SCRIPT_DIR" --base "origin/$base" --json || die "distribution change check failed"
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" runtime-skill-audit --root "$SCRIPT_DIR" --strict-contract || die "runtime skill contract failed"
+  fi
+
   if [ -d "$MEMORY_DIR" ]; then
     save_memory "$message" "."
     echo "memory: synced"

package/runtime/codex/bin/runtime-upgrade.sh

@@ -22,10 +22,12 @@ SCRIPT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 # tree, while the target instance is set explicitly — never inferred.
 INSTANCE_ROOT="${EGREGORE_INSTANCE_ROOT:-$SCRIPT_DIR}"
 
+# Activation and rollback can replace this script. Hand off the process so
+# Bash never resumes reading changed bytes after the Runtime returns.
 _runtime() {
   EGREGORE_ROOT="$INSTANCE_ROOT" \
     PYTHONPATH="$SCRIPT_DIR${PYTHONPATH:+:$PYTHONPATH}" \
-    python3 -m egregore_runtime.harness_cli "$@"
+    exec python3 -m egregore_runtime.harness_cli "$@"
 }
 
 _ensure_identity() {

package/runtime/codex/egregore_runtime/runtime.py

@@ -230,15 +230,12 @@ class EgregoreRuntime:
                 "this document is admin-marked; Egregore serves it to organization admins only"
             )
         stable_artifact_id = canonical_artifact_id(content, path)
-        if stable_artifact_id != artifact_id:
-            stable_decision = self.authorize(
-                actor, Permission.READ, (stable_artifact_id,)
+        stable_decision = self.authorize(actor, Permission.READ, (stable_artifact_id,))
+        if not stable_decision.allowed:
+            raise AuthorizationDenied(
+                "canonical artifact identity is outside the actor read scope"
             )
-            if not stable_decision.allowed:
-                raise AuthorizationDenied(
-                    "canonical artifact identity is outside the actor read scope"
-                )
-            artifact_id = stable_artifact_id
+        artifact_id = stable_artifact_id
         try:
             self.telemetry.emit(
                 TelemetryEvent(

package/runtime/pi/.codex/skills/save/SKILL.md

@@ -42,13 +42,10 @@ esac
    - Stop with "everything is already saved" only when there are no repo or
      memory changes and either the branch has no commits to integrate
      (`AHEAD=0`) or an open integration PR already exists.
-4. Run the product distribution checkpoint before any commit or push when
-   `capability-distribution.json` exists:
-
-```bash
-bash bin/node-run.sh bin/capability-distribution.mjs validate --root .
-bash bin/node-run.sh bin/capability-distribution.mjs changes --root . --base "origin/$BASE" --json
-```
+4. The shared `bin/agent.sh save` preflight runs distribution validation,
+   the change report, and the strict Runtime-skill audit before any memory or
+   project mutation. It runs only when both the registry and development
+   engine exist; public installed instances intentionally omit that engine.
 
    Inspect the diff as well as the receipt. Ask when this work introduces a new
    or unclassified Egregore component, or changes a component's placement

package/runtime/pi/bin/agent.sh

@@ -397,6 +397,14 @@ cmd_save() {
   [ -n "$message" ] || message="chore(save): $topic"
   base="$(resolve_base_branch)" || die "save stopped before Git changes"
 
+  # Shared invariant across harnesses, before memory or project mutations.
+  # Installed public instances intentionally omit the development engine.
+  if [ -f "$SCRIPT_DIR/bin/capability-distribution.mjs" ] && [ -f "$SCRIPT_DIR/capability-distribution.json" ]; then
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" validate --root "$SCRIPT_DIR" || die "distribution validation failed"
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" changes --root "$SCRIPT_DIR" --base "origin/$base" --json || die "distribution change check failed"
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" runtime-skill-audit --root "$SCRIPT_DIR" --strict-contract || die "runtime skill contract failed"
+  fi
+
   if [ -d "$MEMORY_DIR" ]; then
     save_memory "$message" "."
     echo "memory: synced"

package/runtime/pi/bin/runtime-upgrade.sh

@@ -22,10 +22,12 @@ SCRIPT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 # tree, while the target instance is set explicitly — never inferred.
 INSTANCE_ROOT="${EGREGORE_INSTANCE_ROOT:-$SCRIPT_DIR}"
 
+# Activation and rollback can replace this script. Hand off the process so
+# Bash never resumes reading changed bytes after the Runtime returns.
 _runtime() {
   EGREGORE_ROOT="$INSTANCE_ROOT" \
     PYTHONPATH="$SCRIPT_DIR${PYTHONPATH:+:$PYTHONPATH}" \
-    python3 -m egregore_runtime.harness_cli "$@"
+    exec python3 -m egregore_runtime.harness_cli "$@"
 }
 
 _ensure_identity() {

package/runtime/pi/egregore_runtime/runtime.py

@@ -230,15 +230,12 @@ class EgregoreRuntime:
                 "this document is admin-marked; Egregore serves it to organization admins only"
             )
         stable_artifact_id = canonical_artifact_id(content, path)
-        if stable_artifact_id != artifact_id:
-            stable_decision = self.authorize(
-                actor, Permission.READ, (stable_artifact_id,)
+        stable_decision = self.authorize(actor, Permission.READ, (stable_artifact_id,))
+        if not stable_decision.allowed:
+            raise AuthorizationDenied(
+                "canonical artifact identity is outside the actor read scope"
             )
-            if not stable_decision.allowed:
-                raise AuthorizationDenied(
-                    "canonical artifact identity is outside the actor read scope"
-                )
-            artifact_id = stable_artifact_id
+        artifact_id = stable_artifact_id
         try:
             self.telemetry.emit(
                 TelemetryEvent(

package/runtime/prime/.codex/skills/save/SKILL.md

@@ -42,13 +42,10 @@ esac
    - Stop with "everything is already saved" only when there are no repo or
      memory changes and either the branch has no commits to integrate
      (`AHEAD=0`) or an open integration PR already exists.
-4. Run the product distribution checkpoint before any commit or push when
-   `capability-distribution.json` exists:
-
-```bash
-bash bin/node-run.sh bin/capability-distribution.mjs validate --root .
-bash bin/node-run.sh bin/capability-distribution.mjs changes --root . --base "origin/$BASE" --json
-```
+4. The shared `bin/agent.sh save` preflight runs distribution validation,
+   the change report, and the strict Runtime-skill audit before any memory or
+   project mutation. It runs only when both the registry and development
+   engine exist; public installed instances intentionally omit that engine.
 
    Inspect the diff as well as the receipt. Ask when this work introduces a new
    or unclassified Egregore component, or changes a component's placement

package/runtime/prime/bin/agent.sh

@@ -397,6 +397,14 @@ cmd_save() {
   [ -n "$message" ] || message="chore(save): $topic"
   base="$(resolve_base_branch)" || die "save stopped before Git changes"
 
+  # Shared invariant across harnesses, before memory or project mutations.
+  # Installed public instances intentionally omit the development engine.
+  if [ -f "$SCRIPT_DIR/bin/capability-distribution.mjs" ] && [ -f "$SCRIPT_DIR/capability-distribution.json" ]; then
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" validate --root "$SCRIPT_DIR" || die "distribution validation failed"
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" changes --root "$SCRIPT_DIR" --base "origin/$base" --json || die "distribution change check failed"
+    bash "$SCRIPT_DIR/bin/node-run.sh" "$SCRIPT_DIR/bin/capability-distribution.mjs" runtime-skill-audit --root "$SCRIPT_DIR" --strict-contract || die "runtime skill contract failed"
+  fi
+
   if [ -d "$MEMORY_DIR" ]; then
     save_memory "$message" "."
     echo "memory: synced"

package/runtime/prime/bin/runtime-upgrade.sh

@@ -22,10 +22,12 @@ SCRIPT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 # tree, while the target instance is set explicitly — never inferred.
 INSTANCE_ROOT="${EGREGORE_INSTANCE_ROOT:-$SCRIPT_DIR}"
 
+# Activation and rollback can replace this script. Hand off the process so
+# Bash never resumes reading changed bytes after the Runtime returns.
 _runtime() {
   EGREGORE_ROOT="$INSTANCE_ROOT" \
     PYTHONPATH="$SCRIPT_DIR${PYTHONPATH:+:$PYTHONPATH}" \
-    python3 -m egregore_runtime.harness_cli "$@"
+    exec python3 -m egregore_runtime.harness_cli "$@"
 }
 
 _ensure_identity() {

package/runtime/prime/egregore_runtime/runtime.py

@@ -230,15 +230,12 @@ class EgregoreRuntime:
                 "this document is admin-marked; Egregore serves it to organization admins only"
             )
         stable_artifact_id = canonical_artifact_id(content, path)
-        if stable_artifact_id != artifact_id:
-            stable_decision = self.authorize(
-                actor, Permission.READ, (stable_artifact_id,)
+        stable_decision = self.authorize(actor, Permission.READ, (stable_artifact_id,))
+        if not stable_decision.allowed:
+            raise AuthorizationDenied(
+                "canonical artifact identity is outside the actor read scope"
             )
-            if not stable_decision.allowed:
-                raise AuthorizationDenied(
-                    "canonical artifact identity is outside the actor read scope"
-                )
-            artifact_id = stable_artifact_id
+        artifact_id = stable_artifact_id
         try:
             self.telemetry.emit(
                 TelemetryEvent(