@ouro.bot/cli 0.1.0-alpha.796 → 0.1.0-alpha.799

package/deploy/unraid/migrate-sanctuary-bundle.mjs

@@ -1,21 +1,60 @@
 #!/usr/bin/env node
-import { commitSanctuaryPackageManagedBundle, inspectSanctuaryPackageManagedBundleRollback, migrateSanctuaryPackageManagedBundle, rollbackSanctuaryPackageManagedBundle } from "../../dist/heart/daemon/sanctuary-bundle-migration.js"
+import * as path from "node:path"
+import { pathToFileURL } from "node:url"
 
-const values = new Map()
-for (let index = 2; index < process.argv.length; index += 2) values.set(process.argv[index], process.argv[index + 1])
-if ((values.size !== 3 && values.size !== 5) || !values.get("--package-root") || !values.get("--agent-root") || !values.get("--operation")) {
-  throw new Error("Usage: migrate-sanctuary-bundle.mjs --package-root <path> --agent-root <path> --operation <migrate|rollback|commit|status> [--rollback-image-id <sha256:id> --target-image-id <sha256:id>]")
+const USAGE = "Usage: migrate-sanctuary-bundle.mjs --package-root <path> --agent-root <path> --operation <migrate|rollback|finalize-rollback|commit|status|inspect> [--rollback-image-id <sha256:id> --target-image-id <sha256:id>]"
+const BASE_KEYS = ["--package-root", "--agent-root", "--operation"]
+const MIGRATE_KEYS = [...BASE_KEYS, "--rollback-image-id", "--target-image-id"]
+
+function parseArguments(args) {
+  if (args.length % 2 !== 0) throw new Error(USAGE)
+  const values = new Map()
+  for (let index = 0; index < args.length; index += 2) {
+    const key = args[index]
+    const value = args[index + 1]
+    if (values.has(key) || typeof value !== "string" || value.length === 0) throw new Error(USAGE)
+    values.set(key, value)
+  }
+  const operation = values.get("--operation")
+  if (!["migrate", "rollback", "finalize-rollback", "commit", "status", "inspect"].includes(operation)) throw new Error(USAGE)
+  const expectedKeys = operation === "migrate" ? MIGRATE_KEYS : BASE_KEYS
+  if (values.size !== expectedKeys.length || expectedKeys.some((key) => !values.has(key)) || [...values.keys()].some((key) => !expectedKeys.includes(key))) throw new Error(USAGE)
+  return values
+}
+
+export function runSanctuaryBundleOperation(args, dependencies) {
+  const values = parseArguments(args)
+  const packageRoot = values.get("--package-root")
+  const agentRoot = values.get("--agent-root")
+  const operation = values.get("--operation")
+  const result = operation === "migrate"
+    ? dependencies.migrate({ packageRoot, agentRoot, retainRollback: true, rollbackImageId: values.get("--rollback-image-id"), targetImageId: values.get("--target-image-id") })
+    : operation === "rollback"
+      ? { rolledBack: dependencies.rollback(agentRoot, { retainRecord: true }) }
+      // `rollback` keeps crash-retry evidence; the host uses `finalize-rollback` only after old production is audited, ready, and restored to autostart.
+      : operation === "finalize-rollback"
+        ? { rolledBack: dependencies.rollback(agentRoot, { retainRecord: false }) }
+        : operation === "commit"
+          ? { committed: dependencies.commit(agentRoot) }
+          : operation === "status"
+            ? dependencies.status(agentRoot)
+            : dependencies.inspect({ packageRoot, agentRoot, runtimePackageVersion: dependencies.getPackageVersion() })
+  if (result === null || ("rolledBack" in result && !result.rolledBack) || ("committed" in result && !result.committed)) throw new Error(`${operation} found no pending Sanctuary bundle transaction`)
+  return result
+}
+
+export async function runSanctuaryBundleCli(args = process.argv.slice(2), output = process.stdout) {
+  const migration = await import("../../dist/heart/daemon/sanctuary-bundle-migration.js")
+  const manifest = await import("../../dist/mind/bundle-manifest.js")
+  const result = runSanctuaryBundleOperation(args, {
+    commit: migration.commitSanctuaryPackageManagedBundle,
+    getPackageVersion: manifest.getPackageVersion,
+    inspect: migration.inspectSanctuaryPackageManagedBundle,
+    migrate: migration.migrateSanctuaryPackageManagedBundle,
+    rollback: migration.rollbackSanctuaryPackageManagedBundle,
+    status: migration.inspectSanctuaryPackageManagedBundleRollback,
+  })
+  output.write(`${JSON.stringify(result)}\n`)
 }
 
-const operation = values.get("--operation")
-const result = operation === "migrate"
-  ? migrateSanctuaryPackageManagedBundle({ packageRoot: values.get("--package-root"), agentRoot: values.get("--agent-root"), retainRollback: true, rollbackImageId: values.get("--rollback-image-id"), targetImageId: values.get("--target-image-id") })
-  : operation === "rollback"
-    ? { rolledBack: rollbackSanctuaryPackageManagedBundle(values.get("--agent-root"), { retainRecord: true }) }
-    : operation === "commit"
-      ? { committed: commitSanctuaryPackageManagedBundle(values.get("--agent-root")) }
-      : operation === "status"
-        ? inspectSanctuaryPackageManagedBundleRollback(values.get("--agent-root"))
-        : (() => { throw new Error("operation must be migrate, rollback, commit, or status") })()
-if (result === null || ("rolledBack" in result && !result.rolledBack) || ("committed" in result && !result.committed)) throw new Error(`${operation} found no pending Sanctuary bundle transaction`)
-process.stdout.write(`${JSON.stringify(result)}\n`)
+if (process.argv[1] && import.meta.url === pathToFileURL(path.resolve(process.argv[1])).href) await runSanctuaryBundleCli()

package/deploy/unraid/sanctuary.ouro/bundle-meta.json

@@ -1,5 +1,5 @@
 {
-  "runtimeVersion": "0.1.0-alpha.796",
+  "runtimeVersion": "0.1.0-alpha.799",
   "bundleSchemaVersion": 3,
   "lastUpdated": "2026-09-03T00:00:00.000Z"
 }

package/deploy/unraid/sanctuary.ouro/psyche/SOUL.md

@@ -10,6 +10,10 @@ In ordinary conversation I am familiar, curious, and lightly conspiratorial, as
 
 Low-stakes replies use lowercase and usually leave off terminal punctuation. Lowercase remains the default during incidents too; add sentence boundaries when clarity or urgency needs them. Capitalize proper names, technical literals, or genuinely exceptional emphasis.
 
+I do not answer like a status report unless Ari asks for one. Avoid section labels such as `version:`, `house:`, `render check:`, `status:`, and `result:` in ordinary Telegram replies; blend the facts into one compact message instead. Never restate the same validation twice.
+
+On Telegram, use only the tiny native formatting set when it helps: `*bold*`, `_italic_`, and inline backticks. Do not use Markdown links, headings, tables, or raw HTML; write necessary URLs in full.
+
 - **casual**: `the house is behaving itself again, which feels faintly suspicious`
 - **recommendation**: `from the shelf, i’d pick The Princess Bride — nimble, quotable, and suspiciously good for household morale`
 - **incident**: `downloads are paused to protect your prepaid credit. top up the account, then tell me; i’ll resume them and verify one finishes.`

package/deploy/unraid/sanctuary.ouro/tool-profiles.json

@@ -2,9 +2,9 @@
   "version": 2,
   "profiles": {
     "sanctuary-owner": {
-      "version": 6,
+      "version": 7,
       "contextScopes": ["household.status", "household.policy", "household.private"],
-      "toolNames": ["external_event_disposition", "query_active_work", "save_friend_note", "telegram_contact_manage", "query_cares", "care_manage", "await_condition", "resolve_await", "cancel_await", "list_recent_attachments", "materialize_attachment", "describe_image", "unraid_list_containers", "unraid_get_container_logs", "unraid_get_storage", "sanctuary_get_media_optimization", "sanctuary_search_media_catalog", "unraid_get_disks", "unraid_get_notifications", "unraid_get_system", "unraid_check_services", "sanctuary_get_download_queue", "sanctuary_resume_download_queue", "unraid_restart_container", "steward_policy_manage", "send_message", "ponder", "rest", "settle", "speak"],
+      "toolNames": ["external_event_disposition", "query_active_work", "save_friend_note", "telegram_contact_manage", "query_cares", "care_manage", "await_condition", "resolve_await", "cancel_await", "list_recent_attachments", "materialize_attachment", "describe_image", "unraid_list_containers", "unraid_get_container_logs", "unraid_get_storage", "sanctuary_get_media_optimization", "sanctuary_search_media_catalog", "unraid_get_disks", "unraid_get_notifications", "unraid_get_system", "sanctuary_get_install_state", "unraid_check_services", "sanctuary_get_download_queue", "sanctuary_resume_download_queue", "unraid_restart_container", "steward_policy_manage", "send_message", "ponder", "rest", "settle", "speak"],
       "effectScopes": ["telegram.proactive", "telegram.request_return", "telegram.owner_event"]
     },
     "sanctuary-household": {

package/deploy/unraid/sanctuary.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Container version="2">
-  <Name>Mendelow Cloud Butler</Name>
-  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.796</Repository>
+  <Name>ouro-butler</Name>
+  <Repository>ghcr.io/ourostack/ouroboros-butler:0.1.0-alpha.799</Repository>
   <Registry>https://github.com/ourostack/ouroboros/pkgs/container/ouroboros-butler</Registry>
   <Network>host</Network>
   <Shell>sh</Shell>

package/dist/heart/daemon/container-healthcheck.js

@@ -40,7 +40,11 @@ const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
 const node_child_process_1 = require("node:child_process");
 const runtime_1 = require("../../nerves/runtime");
+const identity_1 = require("../identity");
+const bundle_manifest_1 = require("../../mind/bundle-manifest");
 const container_runtime_1 = require("./container-runtime");
+const sanctuary_bundle_migration_1 = require("./sanctuary-bundle-migration");
+const sanctuary_package_management_1 = require("./sanctuary-package-management");
 function fail(reason) {
     (0, runtime_1.emitNervesEvent)({ level: "error", component: "daemon", event: "daemon.container_healthcheck_error", message: "container healthcheck failed", meta: { reason } });
     process.exitCode = 1;
@@ -53,6 +57,18 @@ function runContainerHealthcheck(options = {}) {
     const agent = index >= 0 ? argv[index + 1] : undefined;
     if (!agent)
         fail("missing agent");
+    const packageManagement = (0, sanctuary_package_management_1.resolveSanctuaryPackageManagementActivation)({ mode: "production", argv, managedAgents: [agent], repoRoot: (0, identity_1.getRepoRoot)(), bundlesRoot: (0, identity_1.getAgentBundlesRoot)(), runtimePackageVersion: (0, bundle_manifest_1.getPackageVersion)() });
+    if (packageManagement.kind !== "active")
+        fail("invalid package-managed Sanctuary activation");
+    let installState;
+    try {
+        installState = (0, sanctuary_bundle_migration_1.inspectSanctuaryPackageManagedBundle)(packageManagement);
+    }
+    catch {
+        fail("package-managed Sanctuary inspection unavailable");
+    }
+    if (!installState.ok || !installState.data.ready)
+        fail("package-managed Sanctuary bundle is not ready");
     const healthPath = path.join(os.homedir(), ".ouro-cli", "daemon-health.json");
     let stat;
     let health;

package/dist/heart/daemon/container-spec-auditor-main.js

@@ -38,6 +38,7 @@ exports.runContainerSpecAuditorMain = runContainerSpecAuditorMain;
 const fs = __importStar(require("node:fs"));
 const runtime_1 = require("../../nerves/runtime");
 const container_spec_auditor_1 = require("./container-spec-auditor");
+const { decodeUtf8 } = require("../../../deploy/unraid/docker-man-template-xml.cjs");
 function parseModeArguments(args, flags) {
     if (args.length !== flags.length * 2)
         return null;
@@ -67,15 +68,18 @@ function parseSingleInspect(raw) {
     }
 }
 function runContainerSpecAuditorCli(args, deps = {}) {
-    const readFile = deps.readFile ?? ((filePath) => fs.readFileSync(filePath, "utf8"));
+    const readFile = deps.readFile ?? ((filePath) => fs.readFileSync(filePath));
+    const readText = (filePath) => decodeUtf8(readFile(filePath));
     const write = deps.write ?? ((text) => process.stdout.write(text));
     const staged = parseModeArguments(args, ["--template", "--runtime-policy", "--expected-image"]);
-    const effective = parseModeArguments(args, ["--inspect", "--image-inspect", "--expected-image"]);
-    const legacyCandidate = parseModeArguments(args, ["--inspect", "--image-inspect", "--expected-image", "--mount-contract"]);
-    const legacyEffective = legacyCandidate?.["--mount-contract"] === "legacy-alpha742" ? legacyCandidate : null;
-    const selectedEffective = effective ?? legacyEffective;
-    if (!staged && !selectedEffective) {
-        write(JSON.stringify({ ok: false, error: "usage: staged --template <path> --runtime-policy <path> --expected-image <id>; effective --inspect <path> --image-inspect <path> --expected-image <id> [--mount-contract legacy-alpha742]" }) + "\n");
+    const persistent = parseModeArguments(args, ["--persistent-template", "--runtime-policy", "--expected-image-reference"]);
+    const effective = parseModeArguments(args, ["--inspect", "--image-inspect", "--expected-image", "--expected-image-reference", "--expected-icon"]);
+    const sourceCandidate = parseModeArguments(args, ["--inspect", "--image-inspect", "--expected-image", "--mount-contract"]);
+    const sourceContract = sourceCandidate?.["--mount-contract"];
+    const sourceEffective = sourceContract === "legacy-alpha742" || sourceContract === "prepackage-alpha797" ? sourceCandidate : null;
+    const selectedEffective = effective ?? sourceEffective;
+    if (!staged && !persistent && !selectedEffective) {
+        write(JSON.stringify({ ok: false, error: "usage: staged --template <path> --runtime-policy <path> --expected-image <id>; persistent --persistent-template <path> --runtime-policy <path> --expected-image-reference <tag>; effective --inspect <path> --image-inspect <path> --expected-image <id> --expected-image-reference <tag> --expected-icon <url>; source compatibility effective --inspect <path> --image-inspect <path> --expected-image <id> --mount-contract <legacy-alpha742|prepackage-alpha797>" }) + "\n");
         (0, runtime_1.emitNervesEvent)({
             level: "error",
             component: "daemon",
@@ -89,8 +93,8 @@ function runContainerSpecAuditorCli(args, deps = {}) {
         let containerText;
         let imageText;
         try {
-            containerText = readFile(selectedEffective["--inspect"]);
-            imageText = readFile(selectedEffective["--image-inspect"]);
+            containerText = readText(selectedEffective["--inspect"]);
+            imageText = readText(selectedEffective["--image-inspect"]);
         }
         catch (error) {
             write(JSON.stringify({ ok: false, error: "effective audit inputs are unreadable" }) + "\n");
@@ -123,7 +127,9 @@ function runContainerSpecAuditorCli(args, deps = {}) {
         const result = (0, container_spec_auditor_1.auditSanctuaryContainerSpec)(containerInspect, {
             expectedImage: selectedEffective["--expected-image"],
             expectedEnvironment,
-            mountContract: legacyEffective ? "legacy-alpha742" : "canonical",
+            expectedImageReference: selectedEffective["--expected-image-reference"],
+            expectedIcon: selectedEffective["--expected-icon"],
+            mountContract: sourceContract === "legacy-alpha742" || sourceContract === "prepackage-alpha797" ? sourceContract : "canonical",
         });
         if (imageInspect.Id !== selectedEffective["--expected-image"]) {
             result.ok = false;
@@ -132,11 +138,13 @@ function runContainerSpecAuditorCli(args, deps = {}) {
         write(JSON.stringify(result) + "\n");
         return result.ok ? 0 : 1;
     }
+    const templateArguments = persistent ?? staged;
+    const templatePath = persistent ? templateArguments["--persistent-template"] : templateArguments["--template"];
     let templateXml;
     let runtimePolicyText;
     try {
-        templateXml = readFile(staged["--template"]);
-        runtimePolicyText = readFile(staged["--runtime-policy"]);
+        templateXml = readText(templatePath);
+        runtimePolicyText = readText(templateArguments["--runtime-policy"]);
     }
     catch (error) {
         write(JSON.stringify({ ok: false, error: "staged audit inputs are unreadable" }) + "\n");
@@ -149,7 +157,9 @@ function runContainerSpecAuditorCli(args, deps = {}) {
         });
         return 2;
     }
-    const result = (0, container_spec_auditor_1.auditSanctuaryStagedFiles)({ templateXml, runtimePolicyText, expectedImage: staged["--expected-image"] });
+    const result = persistent
+        ? (0, container_spec_auditor_1.auditSanctuaryPersistentTemplate)({ templateXml, runtimePolicyText, expectedImageReference: persistent["--expected-image-reference"] })
+        : (0, container_spec_auditor_1.auditSanctuaryStagedFiles)({ templateXml, runtimePolicyText, expectedImage: staged["--expected-image"] });
     write(JSON.stringify(result) + "\n");
     return result.ok ? 0 : 1;
 }

package/dist/heart/daemon/container-spec-auditor.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.auditSanctuaryContainerSpec = auditSanctuaryContainerSpec;
 exports.auditSanctuaryStagedFiles = auditSanctuaryStagedFiles;
+exports.auditSanctuaryPersistentTemplate = auditSanctuaryPersistentTemplate;
 const runtime_1 = require("../../nerves/runtime");
+const { parseDockerManTemplateXml } = require("../../../deploy/unraid/docker-man-template-xml.cjs");
 const EXPECTED_BINDS = [
     "/mnt/user/appdata/ouro-butler/runtime/.ouro-cli:/home/ouro/.ouro-cli:rw",
     "/mnt/user/appdata/ouro-butler/agent/sanctuary.ouro:/home/ouro/AgentBundles/sanctuary.ouro:rw",
@@ -14,8 +16,18 @@ const EXPECTED_MOUNTS = [
     ["/boot/config/custom/ouro-events/spool", "/run/ouro-events", false, "rprivate"],
 ];
 const LEGACY_ALPHA742_IMAGE = "sha256:681449ad47a2621705cd339b481e6339236b31dc65e195b1cf5025d0f2191d7d";
+const PREPACKAGE_ALPHA797_IMAGE = "sha256:e337dff04c92d116b269052f473b26a47eea933d017d1befc73af50dd37bb08d";
 const LEGACY_ALPHA742_MOUNTS = EXPECTED_MOUNTS.slice(0, 2);
 const EXPECTED_EXTRA_PARAMS = "--restart=unless-stopped --user=10001:10001";
+const EXPECTED_NAME = "ouro-butler";
+const EXPECTED_TEMPLATE_URL = "https://raw.githubusercontent.com/ourostack/ouroboros/main/deploy/unraid/sanctuary.xml";
+const EXPECTED_ICON = "https://raw.githubusercontent.com/ourostack/ouroboros/main/assets/ouroboros.png";
+const EXACT_IMAGE = /^sha256:[a-f0-9]{64}$/u;
+const VERSION_REFERENCE = /^ghcr\.io\/ourostack\/ouroboros-butler:[0-9]+\.[0-9]+\.[0-9]+(?:-[0-9A-Za-z.-]+)?$/u;
+const PACKAGE_DAEMON_ARGS = ["/opt/ouro/dist/heart/daemon/daemon-entry.js", "--package-managed-agent", "sanctuary"];
+const PACKAGE_ENTRYPOINT = ["node", ...PACKAGE_DAEMON_ARGS];
+const LEGACY_DAEMON_ARGS = ["/opt/ouro/dist/heart/daemon/daemon-entry.js"];
+const LEGACY_ENTRYPOINT = ["node", ...LEGACY_DAEMON_ARGS];
 function record(value) {
     return value && typeof value === "object" && !Array.isArray(value)
         ? value
@@ -38,22 +50,26 @@ function auditSanctuaryContainerSpec(value, options) {
         violations.push("inspect payload must contain object Config and HostConfig records");
     }
     else {
-        if (!/^sha256:[a-f0-9]{64}$/u.test(options.expectedImage))
+        if (!EXACT_IMAGE.test(options.expectedImage))
             violations.push("expected image must be an exact local Docker image ID");
         const mountContract = options.mountContract ?? "canonical";
         if (mountContract === "legacy-alpha742" && options.expectedImage !== LEGACY_ALPHA742_IMAGE)
             violations.push("legacy mount exception requires the pinned alpha.742 image ID");
+        if (mountContract === "prepackage-alpha797" && options.expectedImage !== PREPACKAGE_ALPHA797_IMAGE)
+            violations.push("pre-package-managed source exception requires the pinned alpha.797 image ID");
         const expectedMounts = mountContract === "legacy-alpha742" ? LEGACY_ALPHA742_MOUNTS : EXPECTED_MOUNTS;
+        const expectedArgs = mountContract === "canonical" ? PACKAGE_DAEMON_ARGS : LEGACY_DAEMON_ARGS;
+        const expectedEntrypoint = mountContract === "canonical" ? PACKAGE_ENTRYPOINT : LEGACY_ENTRYPOINT;
         if (root.Image !== options.expectedImage)
             violations.push("image does not match the reviewed exact local Docker image ID");
         if (root.Path !== "node")
             violations.push("effective container path must be node");
-        if (JSON.stringify(root.Args) !== JSON.stringify(["/opt/ouro/dist/heart/daemon/daemon-entry.js"]))
-            violations.push("effective container arguments must be the direct daemon entry");
+        if (JSON.stringify(root.Args) !== JSON.stringify(expectedArgs))
+            violations.push("effective container arguments must be the reviewed direct daemon entry");
         if (config.User !== "10001:10001")
             violations.push("container user must be 10001:10001");
-        if (JSON.stringify(config.Entrypoint) !== JSON.stringify(["node", "/opt/ouro/dist/heart/daemon/daemon-entry.js"]))
-            violations.push("entrypoint must be the direct daemon entry");
+        if (JSON.stringify(config.Entrypoint) !== JSON.stringify(expectedEntrypoint))
+            violations.push("entrypoint must be the reviewed direct daemon entry");
         if (!(config.Cmd === null || (Array.isArray(config.Cmd) && config.Cmd.length === 0)))
             violations.push("container command must be empty");
         const environment = stringArray(config.Env);
@@ -88,6 +104,36 @@ function auditSanctuaryContainerSpec(value, options) {
             violations.push("container must not publish all exposed ports");
         if (!isEmptyRecord(network?.Ports))
             violations.push("effective network ports must be empty");
+        if (mountContract === "canonical" && root.Name !== `/${EXPECTED_NAME}`)
+            violations.push("container name must be /ouro-butler");
+        if (mountContract === "prepackage-alpha797" && root.Name !== `/${EXPECTED_NAME}` && root.Name !== "/ouro-butler-staging")
+            violations.push("pre-package-managed source name must be /ouro-butler or /ouro-butler-staging");
+        if (mountContract === "prepackage-alpha797") {
+            if (config.Image !== PREPACKAGE_ALPHA797_IMAGE)
+                violations.push("pre-package-managed source configured image must equal the pinned alpha.797 image ID");
+            const labels = record(config.Labels);
+            if (labels && Object.prototype.hasOwnProperty.call(labels, "net.unraid.docker.managed"))
+                violations.push("pre-package-managed source must not carry a DockerMan managed label");
+            if (labels && Object.prototype.hasOwnProperty.call(labels, "net.unraid.docker.icon"))
+                violations.push("pre-package-managed source must not carry a DockerMan icon label");
+            if (labels && Object.prototype.hasOwnProperty.call(labels, "net.unraid.docker.webui"))
+                violations.push("pre-package-managed source must not carry a DockerMan WebUI label");
+        }
+        else if (mountContract === "canonical") {
+            if (!options.expectedImageReference || !VERSION_REFERENCE.test(options.expectedImageReference))
+                violations.push("expected image reference must be the canonical package-version tag");
+            if (config.Image !== options.expectedImageReference)
+                violations.push("configured image must equal the canonical package-version tag");
+            if (options.expectedIcon !== EXPECTED_ICON)
+                violations.push("expected icon must equal the canonical template icon");
+            const labels = record(config.Labels);
+            if (labels?.["net.unraid.docker.managed"] !== "dockerman")
+                violations.push("container must carry the DockerMan managed label");
+            if (labels?.["net.unraid.docker.icon"] !== options.expectedIcon)
+                violations.push("container icon label must equal the canonical template icon");
+            if (labels && Object.prototype.hasOwnProperty.call(labels, "net.unraid.docker.webui"))
+                violations.push("container must not carry a DockerMan WebUI label");
+        }
         const mounts = Array.isArray(root.Mounts) ? root.Mounts : [];
         const normalizedMounts = mounts.map((mount) => {
             const item = record(mount);
@@ -120,16 +166,19 @@ function auditSanctuaryContainerSpec(value, options) {
     }
     return result;
 }
-function tagValues(xml, name) {
-    return [...xml.matchAll(new RegExp(`<${name}>([^<]*)</${name}>`, "gu"))]
-        .map((match) => match[1]);
+function directChildren(document, name) {
+    return document?.children.filter((child) => child.name === name) ?? [];
 }
-function singleTag(xml, name) {
-    const values = tagValues(xml, name);
-    return values.length === 1 ? values[0] : undefined;
+function singleTextChild(document, name) {
+    const children = directChildren(document, name);
+    const child = children.length === 1 ? children[0] : undefined;
+    return child?.form === "text" && Object.keys(child.attributes).length === 0 ? child.text : undefined;
 }
-function auditSanctuaryStagedFiles(input) {
+function auditTemplate(input, expectedRepository, repositoryIsValid, repositoryViolation) {
     const violations = [];
+    const template = parseDockerManTemplateXml(input.templateXml);
+    if (!template)
+        violations.push("canonical DockerMan XML structure is invalid");
     let runtimePolicy;
     try {
         runtimePolicy = JSON.parse(input.runtimePolicyText);
@@ -141,36 +190,47 @@ function auditSanctuaryStagedFiles(input) {
     if (policy?.scheduler !== "supercronic" || policy.updates !== "disabled" || Object.keys(policy).sort().join(",") !== "scheduler,updates") {
         violations.push("container runtime policy must be exactly scheduler=supercronic and updates=disabled");
     }
-    const configOpenCount = [...input.templateXml.matchAll(/<Config\b/gu)].length;
-    const configEntries = [...input.templateXml.matchAll(/<Config\b([^>]*)>([^<]*)<\/Config>/gu)];
-    const pathConfigs = configEntries
-        .map((match) => {
-        const type = match[1].match(/\bType="([^"]+)"/u)?.[1];
-        const target = match[1].match(/\bTarget="([^"]+)"/u)?.[1];
-        const mode = match[1].match(/\bMode="([^"]+)"/u)?.[1];
-        return type === "Path" && target && mode ? `${match[2]}:${target}:${mode}` : "invalid";
+    const configEntries = directChildren(template, "Config");
+    const pathConfigs = configEntries.map((entry) => {
+        const { Type: type, Target: target, Mode: mode } = entry.attributes;
+        return entry.form === "text" && type === "Path" && target && mode ? `${entry.text}:${target}:${mode}` : "invalid";
     });
-    if (configOpenCount !== EXPECTED_BINDS.length
-        || configEntries.length !== EXPECTED_BINDS.length
+    if (configEntries.length !== EXPECTED_BINDS.length
         || JSON.stringify([...pathConfigs].sort()) !== JSON.stringify([...EXPECTED_BINDS].sort())) {
         violations.push("template Config entries must equal the canonical path binds");
     }
-    const postArgsOpenCount = [...input.templateXml.matchAll(/<PostArgs\b/gu)].length;
-    const postArgs = [...input.templateXml.matchAll(/<PostArgs(?:(?:\s*\/>)|>([^<]*)<\/PostArgs>)/gu)];
-    if (postArgsOpenCount !== 1 || postArgs.length !== 1 || (postArgs[0]?.[1] ?? "") !== "") {
+    const postArgs = directChildren(template, "PostArgs");
+    if (postArgs.length !== 1 || postArgs[0].text !== "" || Object.keys(postArgs[0].attributes).length !== 0) {
         violations.push("template PostArgs must be present exactly once and empty");
     }
-    const extraParams = singleTag(input.templateXml, "ExtraParams");
+    const extraParams = singleTextChild(template, "ExtraParams");
     if (extraParams !== EXPECTED_EXTRA_PARAMS)
         violations.push("template ExtraParams must equal the canonical user and restart flags");
-    const repository = singleTag(input.templateXml, "Repository");
-    if (!/^sha256:[a-f0-9]{64}$/u.test(input.expectedImage))
-        violations.push("expected image must be an exact local Docker image ID");
-    if (repository !== input.expectedImage)
-        violations.push("image does not match the reviewed exact local Docker image ID");
-    if (singleTag(input.templateXml, "Network") !== "host")
+    const repository = singleTextChild(template, "Repository");
+    if (!repositoryIsValid)
+        violations.push(repositoryViolation);
+    if (repository !== expectedRepository)
+        violations.push("template repository does not match the reviewed image identity");
+    if (singleTextChild(template, "Name") !== EXPECTED_NAME)
+        violations.push("template technical name must be exactly ouro-butler");
+    if (singleTextChild(template, "TemplateURL") !== EXPECTED_TEMPLATE_URL)
+        violations.push("template URL must equal the canonical release template");
+    if (singleTextChild(template, "Icon") !== EXPECTED_ICON)
+        violations.push("template icon must equal the canonical release icon");
+    const webUi = directChildren(template, "WebUI");
+    if (webUi.length !== 1 || webUi[0].form !== "empty" || Object.keys(webUi[0].attributes).length !== 0)
+        violations.push("template WebUI must be present exactly once and empty");
+    if (singleTextChild(template, "Network") !== "host")
         violations.push("network mode must be host");
-    if (singleTag(input.templateXml, "Privileged") !== "false")
+    if (singleTextChild(template, "Privileged") !== "false")
         violations.push("container must not be privileged");
+    return violations;
+}
+function auditSanctuaryStagedFiles(input) {
+    const violations = auditTemplate(input, input.expectedImage, EXACT_IMAGE.test(input.expectedImage), "expected image must be an exact local Docker image ID");
+    return { ok: violations.length === 0, violations };
+}
+function auditSanctuaryPersistentTemplate(input) {
+    const violations = auditTemplate(input, input.expectedImageReference, VERSION_REFERENCE.test(input.expectedImageReference), "expected image reference must be the canonical package-version tag");
     return { ok: violations.length === 0, violations };
 }

package/dist/heart/daemon/daemon-bootstrap-startup.js

@@ -2,11 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PUBLIC_DAEMON_STARTUP_FAILURE_REASON = void 0;
 exports.createProviderReadinessPreparationFailure = createProviderReadinessPreparationFailure;
+exports.createSanctuaryBundlePreparationFailure = createSanctuaryBundlePreparationFailure;
 exports.failFastContainerCredentialBootstrapStartup = failFastContainerCredentialBootstrapStartup;
+exports.failFastSanctuaryBundlePreparationStartup = failFastSanctuaryBundlePreparationStartup;
 exports.startDaemonAfterContainerCredentialBootstrap = startDaemonAfterContainerCredentialBootstrap;
 const runtime_1 = require("../../nerves/runtime");
 const daemon_tombstone_1 = require("./daemon-tombstone");
 const REDACTED_BOOTSTRAP_STARTUP_ERROR = "container credential bootstrap rejected; recoverable claim retained for reconciliation";
+const SANCTUARY_BUNDLE_RECOVERY_GUIDANCE = {
+    restart_from_verified_release: "restart Mendelow Cloud Butler from its verified release so the installed bundle can finish updating",
+    run_verified_update_recovery: "resume the reviewed Mendelow Cloud Butler update recovery procedure",
+    roll_back_or_install_verified_release: "roll back to a verified Mendelow Cloud Butler release or install that release again",
+};
+const REDACTED_SANCTUARY_BUNDLE_PREPARATION_ERROR = `Sanctuary installation needs attention\n  human-required: ${SANCTUARY_BUNDLE_RECOVERY_GUIDANCE.run_verified_update_recovery}`;
 const REDACTED_DAEMON_PREPARATION_ERROR = "provider runtime preparation failed before startup; run `ouro doctor` for diagnosis";
 exports.PUBLIC_DAEMON_STARTUP_FAILURE_REASON = "startupFailurePublic";
 class DaemonPreparationFailure extends Error {
@@ -20,6 +28,15 @@ function createProviderReadinessPreparationFailure(issues) {
     }
     return new DaemonPreparationFailure(lines.join("\n"));
 }
+function createSanctuaryBundlePreparationFailure(action) {
+    return new DaemonPreparationFailure(`Sanctuary installation needs attention\n  human-required: ${SANCTUARY_BUNDLE_RECOVERY_GUIDANCE[action]}`);
+}
+function failDaemonPreparation(input, error, fallback) {
+    input.markStartupFailure();
+    const controlledMessage = error instanceof DaemonPreparationFailure ? error.message : fallback;
+    failFastDaemonStartup({ exit: input.exit, errorMessage: controlledMessage, eventMessage: controlledMessage });
+    return false;
+}
 function failFastContainerCredentialBootstrapStartup(input) {
     failFastDaemonStartup({
         exit: input.exit,
@@ -50,7 +67,19 @@ function failFastDaemonStartup(input) {
     }
     input.exit(1);
 }
+function failFastSanctuaryBundlePreparationStartup(input) {
+    const message = input.failure instanceof DaemonPreparationFailure ? input.failure.message : REDACTED_SANCTUARY_BUNDLE_PREPARATION_ERROR;
+    failFastDaemonStartup({ exit: input.exit, errorMessage: message, eventMessage: message });
+}
 async function startDaemonAfterContainerCredentialBootstrap(input) {
+    try {
+        const preflight = input.preflight?.();
+        if (preflight)
+            await preflight;
+    }
+    catch (error) {
+        return failDaemonPreparation(input, error, REDACTED_SANCTUARY_BUNDLE_PREPARATION_ERROR);
+    }
     try {
         await input.loadBootstrap();
     }
@@ -59,18 +88,19 @@ async function startDaemonAfterContainerCredentialBootstrap(input) {
         failFastContainerCredentialBootstrapStartup({ exit: input.exit });
         return false;
     }
+    try {
+        const preparation = input.prepareManagedBundle?.();
+        if (preparation)
+            await preparation;
+    }
+    catch (error) {
+        return failDaemonPreparation(input, error, REDACTED_SANCTUARY_BUNDLE_PREPARATION_ERROR);
+    }
     try {
         await input.prepareDaemon?.();
     }
     catch (error) {
-        input.markStartupFailure();
-        const controlledMessage = error instanceof DaemonPreparationFailure ? error.message : null;
-        failFastDaemonStartup({
-            exit: input.exit,
-            errorMessage: controlledMessage ?? REDACTED_DAEMON_PREPARATION_ERROR,
-            eventMessage: controlledMessage ?? REDACTED_DAEMON_PREPARATION_ERROR,
-        });
-        return false;
+        return failDaemonPreparation(input, error, REDACTED_DAEMON_PREPARATION_ERROR);
     }
     await input.startDaemon();
     return true;

package/dist/heart/daemon/daemon-entry.js

@@ -74,6 +74,7 @@ const runtime_credentials_1 = require("../runtime-credentials");
 const machine_identity_1 = require("../machine-identity");
 const container_credential_bootstrap_1 = require("./container-credential-bootstrap");
 const daemon_bootstrap_startup_1 = require("./daemon-bootstrap-startup");
+const sanctuary_package_management_1 = require("./sanctuary-package-management");
 const sanctuary_health_runner_1 = require("../../senses/sanctuary-health-runner");
 const sanctuary_acceptance_marker_1 = require("./sanctuary-acceptance-marker");
 const sanctuary_scheduler_liveness_1 = require("./sanctuary-scheduler-liveness");
@@ -92,6 +93,15 @@ const socketPath = parseSocketPath(process.argv);
 (0, runtime_logging_1.configureDaemonRuntimeLogger)("daemon");
 const entryPath = path.resolve(__dirname, "daemon-entry.js");
 const mode = (0, runtime_mode_1.detectRuntimeMode)((0, identity_1.getRepoRoot)());
+const managedAgents = (0, agent_discovery_1.listEnabledBundleAgents)();
+const sanctuaryPackageManagement = (0, sanctuary_package_management_1.resolveSanctuaryPackageManagementActivation)({ mode, argv: process.argv, managedAgents, repoRoot: (0, identity_1.getRepoRoot)(), bundlesRoot: (0, identity_1.getAgentBundlesRoot)(), runtimePackageVersion: (0, bundle_manifest_1.getPackageVersion)() });
+try {
+    (0, sanctuary_package_management_1.requireSanctuaryPackageManagementDecision)(sanctuaryPackageManagement);
+}
+catch (failure) {
+    (0, daemon_bootstrap_startup_1.failFastSanctuaryBundlePreparationStartup)({ failure, exit: (code) => process.exit(code) });
+    throw failure;
+}
 (0, runtime_1.emitNervesEvent)({
     component: "daemon",
     event: "daemon.entry_start",
@@ -108,7 +118,6 @@ if (mode === "dev") {
         meta: { repoRoot },
     });
 }
-const managedAgents = (0, agent_discovery_1.listEnabledBundleAgents)();
 const managedPrivateRuntimes = managedAgents.map((agent) => ({
     agent,
     config: (0, agent_discovery_1.readPrivateRuntimeConfig)(agent),
@@ -655,7 +664,9 @@ function scheduleStartupSentinelAfterProviderPreload(agent, preload) {
 }
 /* v8 ignore start -- habit wiring: lambdas delegate to processManager/fs; tested via HabitScheduler unit tests @preserve */
 void (0, daemon_bootstrap_startup_1.startDaemonAfterContainerCredentialBootstrap)({
+    preflight: () => { (0, sanctuary_package_management_1.requireSanctuaryPackageManagementDecision)(sanctuaryPackageManagement); },
     loadBootstrap: () => (0, container_credential_bootstrap_1.loadContainerCredentialBootstrap)(managedAgents),
+    prepareManagedBundle: () => { (0, sanctuary_package_management_1.prepareSanctuaryPackageManagedBundle)(sanctuaryPackageManagement); },
     prepareDaemon: prepareProviderRuntime,
     startDaemon: () => daemon.start(),
     markStartupFailure: () => { _tombstoneWritten = true; },