switchroom 0.18.10 → 0.18.12

package/dist/host-control/main.js

@@ -9966,7 +9966,7 @@ var require_util = __commonJS((exports) => {
     return path;
   }
   exports.normalize = normalize;
-  function join2(aRoot, aPath) {
+  function join3(aRoot, aPath) {
     if (aRoot === "") {
       aRoot = ".";
     }
@@ -9998,7 +9998,7 @@ var require_util = __commonJS((exports) => {
     }
     return joined;
   }
-  exports.join = join2;
+  exports.join = join3;
   exports.isAbsolute = function(aPath) {
     return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
   };
@@ -10171,7 +10171,7 @@ var require_util = __commonJS((exports) => {
           parsed.path = parsed.path.substring(0, index + 1);
         }
       }
-      sourceURL = join2(urlGenerate(parsed), sourceURL);
+      sourceURL = join3(urlGenerate(parsed), sourceURL);
     }
     return normalize(sourceURL);
   }
@@ -15274,7 +15274,7 @@ var init_secretlint_source = __esm(() => {
 });
 
 // src/util/atomic.ts
-import { closeSync as closeSync2, constants, fsyncSync, openSync as openSync2, renameSync, rmSync, writeSync } from "node:fs";
+import { closeSync as closeSync2, constants, fsyncSync, openSync as openSync2, renameSync as renameSync2, rmSync, writeSync } from "node:fs";
 var TMP_OPEN_FLAGS;
 var init_atomic = __esm(() => {
   TMP_OPEN_FLAGS = constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | (constants.O_NOFOLLOW ?? 0);
@@ -15989,7 +15989,7 @@ var require_command = __commonJS((exports2) => {
   var EventEmitter2 = __require("node:events").EventEmitter;
   var childProcess = __require("node:child_process");
   var path2 = __require("node:path");
-  var fs2 = __require("node:fs");
+  var fs3 = __require("node:fs");
   var process2 = __require("node:process");
   var { Argument, humanReadableArgName } = require_argument();
   var { CommanderError } = require_error();
@@ -16510,7 +16510,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
       this.processedArgs = [];
     }
     _checkForMissingExecutable(executableFile, executableDir, subcommandName) {
-      if (fs2.existsSync(executableFile))
+      if (fs3.existsSync(executableFile))
         return;
       const executableDirMessage = executableDir ? `searched for local subcommand relative to directory '${executableDir}'` : "no directory for search for local subcommand, use .executableDir() to supply a custom directory";
       const executableMissing = `'${executableFile}' does not exist
@@ -16525,11 +16525,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
       const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
       function findFile(baseDir, baseName) {
         const localBin = path2.resolve(baseDir, baseName);
-        if (fs2.existsSync(localBin))
+        if (fs3.existsSync(localBin))
           return localBin;
         if (sourceExt.includes(path2.extname(baseName)))
           return;
-        const foundExt = sourceExt.find((ext) => fs2.existsSync(`${localBin}${ext}`));
+        const foundExt = sourceExt.find((ext) => fs3.existsSync(`${localBin}${ext}`));
         if (foundExt)
           return `${localBin}${foundExt}`;
         return;
@@ -16541,7 +16541,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
       if (this._scriptPath) {
         let resolvedScriptPath;
         try {
-          resolvedScriptPath = fs2.realpathSync(this._scriptPath);
+          resolvedScriptPath = fs3.realpathSync(this._scriptPath);
         } catch {
           resolvedScriptPath = this._scriptPath;
         }
@@ -17316,8 +17316,8 @@ var require_commander = __commonJS((exports2) => {
 
 // src/host-control/main.ts
 import { homedir as homedir6 } from "node:os";
-import { existsSync as existsSync10 } from "node:fs";
-import { join as join10, resolve as resolve9 } from "node:path";
+import { existsSync as existsSync12, readdirSync as readdirSync4 } from "node:fs";
+import { join as join11, resolve as resolve9 } from "node:path";
 
 // src/config/loader.ts
 var import_yaml2 = __toESM(require_dist(), 1);
@@ -21399,7 +21399,12 @@ var ScheduleEntrySchema = exports_external.object({
 var AgentSoulSchema = exports_external.object({
   name: exports_external.string().describe("Agent persona name (e.g., 'Coach', 'Sage')"),
   style: exports_external.string().describe("Communication style description"),
-  boundaries: exports_external.string().optional().describe("Behavioral boundaries and disclaimers")
+  creature: exports_external.string().optional().describe("Persona creature/form (e.g., 'owl', 'octopus')"),
+  vibe: exports_external.string().optional().describe("One-line personality vibe (e.g., 'calm, precise')"),
+  expertise: exports_external.string().optional().describe("Domain expertise summary rendered into the persona"),
+  emoji: exports_external.string().optional().describe("Signature emoji for the persona (e.g., '\uD83E\uDD89')"),
+  boundaries: exports_external.string().optional().describe("Behavioral boundaries and disclaimers"),
+  shape: exports_external.enum(["executive-assistant", "developer", "coach", "generalist"]).default("generalist").describe("Persona-shape discriminator the per-agent CLAUDE.md template can " + "branch on (e.g., 'you are an executive assistant' vs 'a senior " + "engineer'). No runtime behavior yet — template work lands in a " + "later issue. Cascade: override (per-agent wins over default).")
 }).optional();
 var AgentToolsSchema = exports_external.object({
   allow: exports_external.array(exports_external.string()).default([]).describe("Allowed tools (use ['all'] for unrestricted)"),
@@ -21564,6 +21569,11 @@ var TelegramChannelSchema = exports_external.object({
     safe_boundary: exports_external.boolean().optional().describe("When true (the default), a `!`-prefix interrupt that arrives while " + "the agent is mid-tool-call is DEFERRED: the SIGINT and the " + "replacement turn wait until the in-flight tool call finishes (a " + "clean boundary) instead of C-c'ing the agent mid-write/mid-bash. If " + "no tool is in flight the interrupt still fires immediately. Bounded " + "by max_wait_ms so a long tool never strands the user. Set false to " + "fire synchronously the moment `!` is received (historical " + "behaviour). Rapid repeated `!` while one is pending coalesce into a " + "single deferred interrupt carrying the latest body."),
     max_wait_ms: exports_external.number().int().positive().optional().describe("Upper bound (ms) the gateway waits for a safe boundary before firing " + "a deferred `!` interrupt anyway. Only consulted when safe_boundary is " + "true. Default 8000. Keep it short — the user explicitly asked to " + "interrupt, so a long in-flight tool shouldn't ghost them; the cap " + "trades a tiny risk of a mid-tool C-c for a guaranteed response.")
   }).optional().describe("Interrupt timing — how a `!`-prefix interrupt behaves when it lands " + "mid-tool-call. Off by default (fire immediately). Cascades from " + "defaults.channels.telegram.interrupt."),
+  button_choice_confirmation: exports_external.object({
+    enabled: exports_external.boolean().default(false).describe("When true, tapping an agent-emitted inline_keyboard button annotates " + "the source message body with a '✅ You chose: <label> · HH:MM' line so " + "the chat surface is self-documenting. Only applies to single-use " + "keyboards (re-tappable keyboards are never annotated). Requires the " + "agent's parseMode to be the default 'html'. Opt-in (default false). " + "Limitation: the annotated body is rebuilt from the message's plain " + "text, so any formatting entities (bold, links, code, ...) on the " + "original message are lost when the annotation is applied."),
+    format: exports_external.string().default("✅ You chose: {label} · {time}").describe("Template for the annotation line. `{label}` is replaced with the " + "tapped button's text (newlines stripped, HTML-escaped, trimmed to 60 " + "chars) and `{time}` with HH:MM in the chosen timezone. Note: retap " + "dedup (replacing a prior annotation instead of appending another " + "line) only recognizes the DEFAULT format shape — a custom format " + "accumulates one line per retap."),
+    timezone: exports_external.enum(["gateway", "utc"]).default("gateway").describe("Timezone for the {time} placeholder. 'gateway' uses the gateway " + "process's local time; 'utc' uses UTC. Per-user timezones are out of " + "scope for v1.")
+  }).optional().describe("Auto-confirm 'You chose: X' annotation on inline_keyboard taps (#789). " + "Cascades from defaults.channels.telegram.button_choice_confirmation."),
   webhook_sources: exports_external.array(exports_external.enum(["github", "generic", "linear"])).optional().describe("External webhook sources allowed to ingest events into this agent's " + "log. POST /webhook/<agent>/<source> on the switchroom web server. " + "Each source has its own signature verification ('github' = " + "X-Hub-Signature-256 HMAC-SHA256, 'generic' = Bearer token, " + "'linear' = Linear-Signature bare-hex HMAC-SHA256 of the raw body). " + "Per-source secret read from ~/.switchroom/webhook-secrets.json " + "keyed by [agent][source]. Verified events append to " + "<agent>/telegram/webhook-events.jsonl for the agent to read on " + "demand. Off by default — webhook is the only untrusted-inbound " + "surface in the system, so opt-in is mandatory. " + "Cascades from defaults.channels.telegram.webhook_sources. " + "(Migrated from per-agent root in #596 — see #577.)"),
   webhook_dispatch: exports_external.object({
     github: exports_external.array(webhookDispatchRule).optional(),
@@ -21712,7 +21722,12 @@ var profileFields = {
   soul: exports_external.object({
     name: exports_external.string().optional(),
     style: exports_external.string().optional(),
-    boundaries: exports_external.string().optional()
+    creature: exports_external.string().optional(),
+    vibe: exports_external.string().optional(),
+    expertise: exports_external.string().optional(),
+    emoji: exports_external.string().optional(),
+    boundaries: exports_external.string().optional(),
+    shape: exports_external.enum(["executive-assistant", "developer", "coach", "generalist"]).optional()
   }).optional(),
   tools: exports_external.object({
     allow: exports_external.array(exports_external.string()).optional(),
@@ -21909,7 +21924,8 @@ var VaultConfigSchema = exports_external.object({
     autoUnlockCredentialPath: exports_external.string().default("~/.switchroom/vault-auto-unlock").describe("Path to the machine-bound auto-unlock blob (see " + "src/vault/auto-unlock.ts for the format). Default lives under " + "~/.switchroom so it can be bind-mounted into the vault-broker " + "container by docker compose. Tilde-expansion happens " + "at read time."),
     approvalAuth: exports_external.enum(["passphrase", "telegram-id"]).default("passphrase").describe("Posture for tap-to-Approve on vault grant cards. `passphrase` " + "(default) prompts the operator to type the vault passphrase on " + "every Approve — two-factor (Telegram ID + passphrase). " + "`telegram-id` mints immediately on Approve with no passphrase " + "prompt — single-factor (Telegram ID only); REQUIRES " + "`autoUnlock: true` so the broker already holds the passphrase. " + "Trades a factor of security for smoother UX; opt-in only."),
     postureMintAgents: exports_external.array(exports_external.string().min(1)).default([]).describe("Per-agent opt-in for posture-attested broker calls (`mint_grant` / " + "`list_grants` / `put` with `attest_via_posture: true`). Only agents " + "whose names are in this list can use the silent-mint path under " + "`approvalAuth: telegram-id`. Default `[]` — no agent can self-mint " + "until the operator explicitly opts it in. The request's `agent` " + "field must also equal the calling peer's resolved agent name " + "(broker rejects cross-agent posture mints). When `approvalAuth` is " + "`passphrase` this list is ignored — passphrase attestation still " + "works as before. Each entry is an agent slug exactly as it appears " + "under `agents:` in this config."),
-    adminOnlyKeys: exports_external.array(exports_external.string().min(1)).default([]).describe("Vault keys held to a higher approval bar: only the admin operator " + "(`access.allowFrom[0]`) may approve a grant for them, and they can " + "NEVER be minted via posture attestation — granting one requires the " + "operator passphrase (so an agent, even one on `postureMintAgents`, " + "cannot self-grant it). Entries are exact key names or `*` globs, " + "e.g. `stripe/*`, `*/oauth-token`, `microsoft/ken-tokens` (`*` matches " + "any run of characters incl. `/`; case-sensitive). Default `[]` — no " + "key is admin-only. Posture may RETAIN an admin-only key across a " + "union re-mint but never ADD one. Takes effect on broker + gateway " + "restart (broker has no ACL hot-reload).")
+    adminOnlyKeys: exports_external.array(exports_external.string().min(1)).default([]).describe("Vault keys held to a higher approval bar: only the admin operator " + "(`access.allowFrom[0]`) may approve a grant for them, and they can " + "NEVER be minted via posture attestation — granting one requires the " + "operator passphrase (so an agent, even one on `postureMintAgents`, " + "cannot self-grant it). Entries are exact key names or `*` globs, " + "e.g. `stripe/*`, `*/oauth-token`, `microsoft/ken-tokens` (`*` matches " + "any run of characters incl. `/`; case-sensitive). Default `[]` — no " + "key is admin-only. Posture may RETAIN an admin-only key across a " + "union re-mint but never ADD one. Takes effect on broker + gateway " + "restart (broker has no ACL hot-reload)."),
+    auditFailClosed: exports_external.boolean().default(false).describe("sec WS10-F3 (#1420) — fail-CLOSED on an audit-append failure. When " + "`false` (default, backward-compatible) the broker fails OPEN: if a " + "vault-audit.log append fails it logs to stderr, bumps the durable " + "fail-open counter, and STILL releases the secret. When `true`, a " + "failed audit append DENIES the secret release with " + "`AUDIT_UNAVAILABLE` — no secret leaves the broker without a durable " + "audit row. The env var `SWITCHROOM_VAULT_AUDIT_FAIL_CLOSED` " + "(`1`/`true` or `0`/`false`) overrides this at runtime. Either way " + "the fail-open counter is surfaced by `switchroom doctor`. Takes " + "effect on broker restart.")
   }).default({}).superRefine((broker, ctx) => {
     if (broker.approvalAuth === "telegram-id" && broker.autoUnlock !== true) {
       ctx.addIssue({
@@ -21948,7 +21964,9 @@ var FleetHealthConfigSchema = exports_external.object({
 });
 var HostdConfigSchema = exports_external.object({
   config_edit_enabled: exports_external.boolean().default(false).describe("Opt-in toggle for the `config_propose_edit` hostd verb (RFC " + "admin-agent-config-edit §3). Default false — the verb returns " + "`E_CONFIG_EDIT_DISABLED` until the operator explicitly flips " + "this to true. When true, admin agents can propose unified-diff " + "patches against " + "`/state/config/switchroom.yaml`, gated by an operator approval " + "card in the primary chat. Same trust posture as `update_apply` " + "and `agent_restart`: the human-in-the-loop tap is the security " + "boundary, not the agent's judgement."),
-  config_edit_rate_per_hour: exports_external.number().int().min(1).max(20).default(3).describe("Per-requesting-agent rate cap for `config_propose_edit` cards " + "(RFC admin-agent-config-edit §5). Default 3 cards/hour; min 1, " + "max 20. ENFORCED server-side: a caller exceeding this in a sliding " + "1-hour window is rejected with `E_RATE_LIMITED` (carrying a " + "`retry_after` fix) instead of posting another operator approval " + "card — so a looping agent is throttled rather than spamming the chat.")
+  config_edit_rate_per_hour: exports_external.number().int().min(1).max(20).default(3).describe("Per-requesting-agent rate cap for `config_propose_edit` cards " + "(RFC admin-agent-config-edit §5). Default 3 cards/hour; min 1, " + "max 20. ENFORCED server-side: a caller exceeding this in a sliding " + "1-hour window is rejected with `E_RATE_LIMITED` (carrying a " + "`retry_after` fix) instead of posting another operator approval " + "card — so a looping agent is throttled rather than spamming the chat."),
+  operator_attest_enabled: exports_external.boolean().default(false).describe("Opt-in toggle for the operator-passphrase 2nd factor on hostd's " + "mutating verbs (#1841, RFC host-control-daemon.md §5.4). Default " + "false — attestation is ACCEPTED-and-audited whenever present, but " + "no verb REQUIRES it (behaviour is byte-identical to today, so " + "existing fleets and the Telegram approval-card flow are unchanged). " + "When true, the verbs in `operator_attest_required_verbs` demand a " + "valid operator-passphrase attestation IN ADDITION to admin: hostd " + "forwards the passphrase to the vault broker over its own admin-client " + "connection (`/run/switchroom/broker/hostd/sock`) and treats a broker " + "DENIED as a gate failure. hostd never holds the passphrase. Leave " + "this off until BOTH the gateway passphrase-forward and the " + "cross-compose broker socket are deployed, or gated verbs will fail."),
+  operator_attest_required_verbs: exports_external.array(exports_external.string().min(1)).default(["update_apply", "apply", "rollout"]).describe("Which mutating hostd verbs REQUIRE a valid operator-passphrase " + "attestation when `operator_attest_enabled` is true (#1841). Default " + "is the RFC §5.4 fleet-mutation set (`update_apply`, `apply`, " + "`rollout`). Verbs NOT in this list still accept-and-audit an " + "attestation when one is supplied, but never require it. Ignored " + "entirely when `operator_attest_enabled` is false.")
 });
 var CronEgressSchema = exports_external.object({
   allowed_hosts: exports_external.array(exports_external.string().min(1)).default([]).describe("Hosts a poll may reach (exact, https-only). loopback/private/IP-literal are always rejected."),
@@ -22371,6 +22389,11 @@ function mergeAgentConfig(defaultsIn, agentIn) {
       if (v !== undefined)
         combined[k] = v;
     }
+    const baseSoul = base;
+    const overrideSoul = override;
+    if (baseSoul.shape !== undefined && (overrideSoul.shape === undefined || overrideSoul.shape === "generalist")) {
+      combined.shape = baseSoul.shape;
+    }
     merged.soul = combined;
   }
   if (defaults.memory || merged.memory) {
@@ -22797,11 +22820,391 @@ function resolveAgentsDir(config) {
   return resolveDualPath(config.switchroom.agents_dir || "~/.switchroom/agents");
 }
 
+// src/host-control/config-degraded.ts
+import { existsSync as existsSync4, readFileSync as readFileSync3, renameSync, unlinkSync, watchFile, unwatchFile, writeFileSync, mkdirSync } from "node:fs";
+import { connect } from "node:net";
+import { join } from "node:path";
+
+// src/config/release-resolve.ts
+function parseSemverTag(tag) {
+  if (!tag)
+    return null;
+  const m = /^v(\d+)\.(\d+)\.(\d+)$/.exec(tag.trim());
+  return m ? [Number(m[1]), Number(m[2]), Number(m[3])] : null;
+}
+function compareReleaseTags(a, b) {
+  const pa = parseSemverTag(a);
+  const pb = parseSemverTag(b);
+  if (!pa || !pb)
+    return null;
+  for (let i = 0;i < 3; i++) {
+    if (pa[i] !== pb[i])
+      return pa[i] < pb[i] ? -1 : 1;
+  }
+  return 0;
+}
+
+// src/host-control/self-bump.ts
+var SELF_BUMP_MARKER_FILENAME = "pending-rollout.json";
+var SELF_BUMP_HELPER_CONTAINER = "switchroom-hostd-selfbump";
+var SELF_BUMP_LOG_FILENAME = "selfbump.log";
+var SELF_BUMP_MARKER_MAX_AGE_MS = 15 * 60 * 1000;
+var SEMVER_PIN_RE = /^v\d+\.\d+\.\d+$/;
+function needsSelfBump(ownVersion, pin) {
+  if (!ownVersion)
+    return false;
+  const cmp = compareReleaseTags(`v${ownVersion.trim().replace(/^v/, "")}`, `v${pin.trim().replace(/^v/, "")}`);
+  return cmp !== null && cmp < 0;
+}
+function bumpHostdComposeImageTag(yaml, pin) {
+  const re = /^(\s*image:\s*)(\S*switchroom-hostd):(\S+)\s*$/m;
+  const m = yaml.match(re);
+  if (!m)
+    return null;
+  const oldImageRef = `${m[2]}:${m[3]}`;
+  const newImageRef = `${m[2]}:${pin}`;
+  return {
+    yaml: yaml.replace(re, `$1${newImageRef}`),
+    oldImageRef,
+    newImageRef
+  };
+}
+function encodePendingRolloutMarker(m) {
+  return JSON.stringify(m, null, 2) + `
+`;
+}
+function parsePendingRolloutMarker(raw) {
+  let obj;
+  try {
+    obj = JSON.parse(raw);
+  } catch {
+    return null;
+  }
+  if (typeof obj !== "object" || obj === null)
+    return null;
+  const o = obj;
+  if (o.v !== 1)
+    return null;
+  if (typeof o.request_id !== "string" || o.request_id.length === 0)
+    return null;
+  if (typeof o.pin !== "string" || !SEMVER_PIN_RE.test(o.pin))
+    return null;
+  if (typeof o.created_at !== "string" || !Number.isFinite(Date.parse(o.created_at))) {
+    return null;
+  }
+  if (typeof o.prior_hostd_version !== "string")
+    return null;
+  const caller = o.caller;
+  if (typeof caller !== "object" || caller === null)
+    return null;
+  if (caller.kind === "agent") {
+    if (typeof caller.name !== "string" || caller.name.length === 0)
+      return null;
+  } else if (caller.kind !== "operator") {
+    return null;
+  }
+  if (o.agents !== undefined) {
+    if (!Array.isArray(o.agents) || o.agents.length === 0 || !o.agents.every((a) => typeof a === "string" && /^[\w-]+$/.test(a))) {
+      return null;
+    }
+  }
+  if (o.skip_web !== undefined && typeof o.skip_web !== "boolean")
+    return null;
+  if (o.allow_downgrade !== undefined && typeof o.allow_downgrade !== "boolean") {
+    return null;
+  }
+  return {
+    v: 1,
+    request_id: o.request_id,
+    pin: o.pin,
+    ...o.agents !== undefined ? { agents: o.agents } : {},
+    ...o.skip_web !== undefined ? { skip_web: o.skip_web } : {},
+    ...o.allow_downgrade !== undefined ? { allow_downgrade: o.allow_downgrade } : {},
+    caller: caller.kind === "agent" ? { kind: "agent", name: caller.name } : { kind: "operator" },
+    created_at: o.created_at,
+    prior_hostd_version: o.prior_hostd_version
+  };
+}
+function isMarkerFresh(marker, nowMs) {
+  const created = Date.parse(marker.created_at);
+  if (!Number.isFinite(created))
+    return false;
+  return nowMs - created < SELF_BUMP_MARKER_MAX_AGE_MS;
+}
+function selfBumpHelperArgs(opts) {
+  const composePath = `${opts.hostdDirHostPath}/docker-compose.yml`;
+  const logPath = `${opts.hostdDirHostPath}/${SELF_BUMP_LOG_FILENAME}`;
+  const script = `sleep 2; ` + `echo "selfbump $(date -u) -> ${opts.targetImage}" >> "${logPath}" 2>&1; ` + `docker compose -p switchroom-hostd -f "${composePath}" pull >> "${logPath}" 2>&1 && ` + `docker compose -p switchroom-hostd -f "${composePath}" up -d >> "${logPath}" 2>&1; ` + `rc=$?; echo "selfbump done rc=$rc" >> "${logPath}" 2>&1; exit $rc`;
+  return [
+    "run",
+    "-d",
+    "--rm",
+    "--name",
+    SELF_BUMP_HELPER_CONTAINER,
+    "--label",
+    "switchroom.hostd-selfbump=true",
+    "-v",
+    "/var/run/docker.sock:/var/run/docker.sock",
+    "-v",
+    `${opts.hostdDirHostPath}:${opts.hostdDirHostPath}`,
+    "--entrypoint",
+    "/bin/sh",
+    opts.helperImage,
+    "-c",
+    script
+  ];
+}
+
+// src/host-control/config-degraded.ts
+var CONFIG_DEGRADED_MARKER_FILENAME = "config-degraded.json";
+var CONFIG_DEGRADED_RETRY_MS = 15000;
+var MAX_PRESERVED_DEGRADED_MS = 4 * 60 * 60 * 1000;
+function buildDegradedMarker(err, nowMs) {
+  return {
+    v: 1,
+    since: new Date(nowMs).toISOString(),
+    error: err.message,
+    ...err.details && err.details.length > 0 ? { details: err.details } : {}
+  };
+}
+function readDegradedSince(markerPath) {
+  try {
+    if (!existsSync4(markerPath))
+      return null;
+    const parsed = JSON.parse(readFileSync3(markerPath, "utf8"));
+    if (parsed?.v !== 1 || typeof parsed.since !== "string")
+      return null;
+    const since = Date.parse(parsed.since);
+    return Number.isFinite(since) ? since : null;
+  } catch {
+    return null;
+  }
+}
+function formatDegradedNotice(err) {
+  const details = (err.details ?? []).map((d) => d.trim()).filter(Boolean).slice(0, 6).join(`
+`);
+  return `⚠️ hostd: switchroom.yaml failed to load — running DEGRADED.
+` + `${err.message}
+` + (details ? details + `
+` : "") + `Retrying every ${Math.round(CONFIG_DEGRADED_RETRY_MS / 1000)}s and on file change. ` + "hostd's sockets are not bound yet, so fleet operations (rollouts, config " + "edits, restarts) will fail with connection errors until the config parses. " + "Fix the YAML (`switchroom config check` validates it) — no hostd restart " + "needed. A pending self-bump rollout, if any, will resume once the config " + "loads (its 15-min freshness budget is frozen while degraded, up to " + `${Math.round(MAX_PRESERVED_DEGRADED_MS / 3600000)}h).`;
+}
+function humanMins(ms) {
+  const mins = Math.max(1, Math.round(ms / 60000));
+  return mins >= 90 ? `${(mins / 60).toFixed(1)}h` : `${mins}m`;
+}
+function formatRecoveredNotice(degradedMs, pending) {
+  let tail = "";
+  if (pending?.preserved) {
+    tail = ` Pending self-bump rollout to ${pending.pin} was preserved through the ` + `outage (marker now ${humanMins(pending.ageMs)} old) and will resume now.`;
+  } else if (pending) {
+    tail = ` NOTE: pending self-bump rollout to ${pending.pin} was NOT auto-resumed — ` + `degraded for ~${humanMins(degradedMs)}, past the ` + `${Math.round(MAX_PRESERVED_DEGRADED_MS / 3600000)}h preservation cap. Its ` + `marker (${humanMins(pending.ageMs)} old) will be treated as stale; re-run ` + `the rollout if it is still wanted.`;
+  }
+  return `✅ hostd: switchroom.yaml loads again after ~${humanMins(degradedMs)} degraded — ` + `normal service resumed.` + tail;
+}
+function shiftPendingRolloutMarker(raw, degradedMs) {
+  if (degradedMs <= 0)
+    return null;
+  const marker = parsePendingRolloutMarker(raw);
+  if (!marker)
+    return null;
+  const created = Date.parse(marker.created_at);
+  if (!Number.isFinite(created))
+    return null;
+  return encodePendingRolloutMarker({
+    ...marker,
+    created_at: new Date(created + degradedMs).toISOString()
+  });
+}
+function clearStaleDegradedMarker(homeDir, log) {
+  const markerPath = join(homeDir, ".switchroom", "hostd", CONFIG_DEGRADED_MARKER_FILENAME);
+  try {
+    if (!existsSync4(markerPath))
+      return false;
+    unlinkSync(markerPath);
+    log(`config-degraded: clearing stale degraded marker from a prior crash ` + `(${markerPath}) — config loads cleanly on this boot`);
+    return true;
+  } catch (e) {
+    log(`config-degraded: could not clear stale marker ${markerPath}: ${e.message}`);
+    return false;
+  }
+}
+function postOperatorNoticeViaGateways(candidates, text, log, connectTimeoutMs = 5000) {
+  const tryOne = (c) => new Promise((resolve4) => {
+    let done = false;
+    const finish = (ok, why) => {
+      if (done)
+        return;
+      done = true;
+      if (why)
+        log(`config-degraded: gateway ${c.agent} — ${why}`);
+      try {
+        client.destroy();
+      } catch {}
+      resolve4(ok);
+    };
+    let client;
+    try {
+      client = connect({ path: c.sock });
+    } catch (e) {
+      log(`config-degraded: gateway ${c.agent} — connect threw: ${e.message}`);
+      resolve4(false);
+      return;
+    }
+    client.setTimeout(connectTimeoutMs);
+    client.on("connect", () => {
+      try {
+        client.write(JSON.stringify({
+          type: "rollout_status_post",
+          requestId: "config-degraded",
+          agentName: c.agent,
+          text
+        }) + `
+`, () => {
+          client.end();
+          finish(true);
+        });
+      } catch (e) {
+        finish(false, `write failed: ${e.message}`);
+      }
+    });
+    client.on("timeout", () => finish(false, "connect timed out"));
+    client.on("error", (e) => finish(false, `socket error: ${e.message}`));
+  });
+  return (async () => {
+    for (const c of candidates) {
+      if (await tryOne(c))
+        return c.agent;
+    }
+    if (candidates.length > 0) {
+      log("config-degraded: every candidate gateway socket failed; relying on marker file");
+    }
+    return null;
+  })();
+}
+async function waitForConfigRecovery(opts) {
+  const now = opts.nowFn ?? Date.now;
+  const retryMs = opts.retryMs ?? CONFIG_DEGRADED_RETRY_MS;
+  const hostdDir = join(opts.homeDir, ".switchroom", "hostd");
+  const degradedMarkerPath = join(hostdDir, CONFIG_DEGRADED_MARKER_FILENAME);
+  const pendingMarkerPath = join(hostdDir, SELF_BUMP_MARKER_FILENAME);
+  const persistedSince = readDegradedSince(degradedMarkerPath);
+  const enteredAt = Math.min(persistedSince ?? now(), now());
+  if (persistedSince !== null) {
+    opts.log(`config-degraded: resuming an existing degraded window (since ` + `${new Date(enteredAt).toISOString()}, persisted in ${degradedMarkerPath})`);
+  }
+  try {
+    mkdirSync(hostdDir, { recursive: true, mode: 448 });
+    writeFileSync(degradedMarkerPath + ".tmp", JSON.stringify(buildDegradedMarker(opts.initialError, enteredAt), null, 2) + `
+`, { mode: 384 });
+    renameSync(degradedMarkerPath + ".tmp", degradedMarkerPath);
+  } catch (e) {
+    opts.log(`config-degraded: could not write marker ${degradedMarkerPath}: ${e.message}`);
+  }
+  try {
+    opts.notify(formatDegradedNotice(opts.initialError));
+  } catch (e) {
+    opts.log(`config-degraded: notify threw: ${e.message}`);
+  }
+  opts.log(`config-degraded: entering degraded mode — ${opts.initialError.message}. ` + `Retrying every ${Math.round(retryMs / 1000)}s` + (opts.configPath ? ` and on change to ${opts.configPath}` : "") + `. Marker: ${degradedMarkerPath}`);
+  const config = await new Promise((resolve4, reject) => {
+    let timer = null;
+    let settled = false;
+    const cleanup = () => {
+      if (timer)
+        clearInterval(timer);
+      if (opts.configPath) {
+        try {
+          unwatchFile(opts.configPath, onFileChange);
+        } catch {}
+      }
+    };
+    const attempt = (why) => {
+      if (settled)
+        return;
+      try {
+        const cfg = opts.loadFn();
+        settled = true;
+        cleanup();
+        resolve4(cfg);
+      } catch (err) {
+        if (err instanceof ConfigError) {
+          opts.log(`config-degraded: reload attempt (${why}) still failing — ${err.message}`);
+          return;
+        }
+        settled = true;
+        cleanup();
+        reject(err);
+      }
+    };
+    const onFileChange = () => attempt("file change");
+    timer = setInterval(() => attempt("interval"), retryMs);
+    if (opts.configPath) {
+      try {
+        watchFile(opts.configPath, { interval: 5000 }, onFileChange);
+      } catch (e) {
+        opts.log(`config-degraded: could not watch ${opts.configPath}: ${e.message}`);
+      }
+    }
+  });
+  const degradedMs = Math.max(0, now() - enteredAt);
+  let pendingOutcome = null;
+  try {
+    if (existsSync4(pendingMarkerPath)) {
+      const raw = readFileSync3(pendingMarkerPath, "utf8");
+      const marker = parsePendingRolloutMarker(raw);
+      if (marker && degradedMs <= 0) {
+        pendingOutcome = {
+          pin: marker.pin,
+          ageMs: Math.max(0, now() - Date.parse(marker.created_at)),
+          preserved: true
+        };
+      } else if (marker) {
+        const withinCap = degradedMs <= MAX_PRESERVED_DEGRADED_MS;
+        const shifted = withinCap ? shiftPendingRolloutMarker(raw, degradedMs) : null;
+        if (shifted !== null) {
+          writeFileSync(pendingMarkerPath + ".tmp", shifted, { mode: 384 });
+          renameSync(pendingMarkerPath + ".tmp", pendingMarkerPath);
+          pendingOutcome = {
+            pin: marker.pin,
+            ageMs: Math.max(0, now() - (Date.parse(marker.created_at) + degradedMs)),
+            preserved: true
+          };
+          opts.log(`config-degraded: shifted pending-rollout marker (${marker.pin}) ` + `created_at by ${Math.round(degradedMs / 1000)}s so the degraded ` + `window does not count against the resume cutoff`);
+        } else {
+          pendingOutcome = {
+            pin: marker.pin,
+            ageMs: Math.max(0, now() - Date.parse(marker.created_at)),
+            preserved: false
+          };
+          if (!withinCap) {
+            opts.log(`config-degraded: NOT preserving pending-rollout marker ` + `(${marker.pin}) — degraded ${Math.round(degradedMs / 60000)}m, ` + `past the ${Math.round(MAX_PRESERVED_DEGRADED_MS / 3600000)}h ` + `preservation cap; the roll will not auto-resume`);
+          }
+        }
+      }
+    }
+  } catch (e) {
+    opts.log(`config-degraded: could not preserve pending-rollout marker: ${e.message}`);
+  }
+  try {
+    if (existsSync4(degradedMarkerPath))
+      unlinkSync(degradedMarkerPath);
+  } catch (e) {
+    opts.log(`config-degraded: could not remove marker ${degradedMarkerPath}: ${e.message}`);
+  }
+  try {
+    opts.notify(formatRecoveredNotice(degradedMs, pendingOutcome));
+  } catch (e) {
+    opts.log(`config-degraded: recovery notify threw: ${e.message}`);
+  }
+  opts.log(`config-degraded: config loads again after ${Math.round(degradedMs / 1000)}s — resuming normal boot`);
+  return config;
+}
+
 // src/agents/compose.ts
 import { createHash } from "node:crypto";
 
 // src/agents/scaffold.ts
-import { join as join4, resolve as resolve5 } from "node:path";
+import { join as join5, resolve as resolve5 } from "node:path";
 
 // src/config/timezone.ts
 var CONTAINER_DEFAULT_UTC_ZONES = new Set([
@@ -22812,7 +23215,7 @@ var CONTAINER_DEFAULT_UTC_ZONES = new Set([
 ]);
 
 // src/cli/agent-config.ts
-import { join } from "node:path";
+import { join as join2 } from "node:path";
 import { homedir as homedir2 } from "node:os";
 
 // src/vault/broker/acl.ts
@@ -22823,12 +23226,12 @@ var WEBKITE_VAULT_KEYS = new Set([
 ]);
 
 // src/cli/agent-config.ts
-var AUDIT_ROOT = join(homedir2(), ".switchroom", "audit");
+var AUDIT_ROOT = join2(homedir2(), ".switchroom", "audit");
 
 // src/agents/profiles.ts
 var import_handlebars = __toESM(require_lib(), 1);
-import { readFileSync as readFileSync3, writeFileSync, existsSync as existsSync4, readdirSync as readdirSync2, statSync as statSync2, copyFileSync, mkdirSync, realpathSync } from "node:fs";
-import { resolve as resolve4, join as join2, sep as pathSep } from "node:path";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, existsSync as existsSync5, readdirSync as readdirSync2, statSync as statSync2, copyFileSync, mkdirSync as mkdirSync2, realpathSync } from "node:fs";
+import { resolve as resolve4, join as join3, sep as pathSep } from "node:path";
 var PROFILES_ROOT = resolve4(import.meta.dirname, "../../profiles");
 import_handlebars.default.registerHelper("json", (value) => {
   return new import_handlebars.default.SafeString(JSON.stringify(value, null, 2));
@@ -22839,9 +23242,9 @@ import_handlebars.default.registerHelper("isNumber", (value) => {
 var SHARED_FRAGMENTS_DIR = resolve4(PROFILES_ROOT, "_shared");
 var SHARED_FRAGMENTS = ["vault-protocol", "agent-self-service", "execution-discipline", "reply-discipline", "dev-protocol"];
 for (const name of SHARED_FRAGMENTS) {
-  const fragPath = join2(SHARED_FRAGMENTS_DIR, `${name}.md.hbs`);
-  if (existsSync4(fragPath)) {
-    import_handlebars.default.registerPartial(name, readFileSync3(fragPath, "utf-8"));
+  const fragPath = join3(SHARED_FRAGMENTS_DIR, `${name}.md.hbs`);
+  if (existsSync5(fragPath)) {
+    import_handlebars.default.registerPartial(name, readFileSync4(fragPath, "utf-8"));
   }
 }
 
@@ -22850,18 +23253,22 @@ var tails = new Map;
 
 // src/agents/inject.ts
 var INJECT_COMMANDS = new Map([
-  ["/cost", { description: "Show session cost", expectsOutput: true, dialog: true }],
-  ["/status", { description: "Show session status", expectsOutput: true, dialog: true }],
-  ["/usage", { description: "Show plan quota", expectsOutput: true, dialog: true }],
-  ["/hooks", { description: "List configured hooks", expectsOutput: true, dialog: true }],
-  ["/memory", { description: "Open memory picker", expectsOutput: true, dialog: true }],
-  ["/model", { description: "Open model picker", expectsOutput: true }],
+  ["/cost", { description: "Show session cost", expectsOutput: true, dialog: true, argsAllowed: false }],
+  ["/status", { description: "Show session status", expectsOutput: true, dialog: true, argsAllowed: false }],
+  ["/usage", { description: "Show plan quota", expectsOutput: true, dialog: true, argsAllowed: false }],
+  ["/hooks", { description: "List configured hooks", expectsOutput: true, dialog: true, argsAllowed: false }],
+  ["/memory", { description: "Open memory picker", expectsOutput: true, dialog: true, argsAllowed: false }],
+  ["/help", { description: "Show help / command discovery", expectsOutput: true, dialog: true, argsAllowed: false }],
+  ["/context", { description: "Show context window usage", expectsOutput: true, argsAllowed: false }],
+  ["/release-notes", { description: "Show release-notes version list", expectsOutput: true, dialog: true, argsAllowed: false }],
+  ["/model", { description: "Open model picker", expectsOutput: true, argsAllowed: true }],
   [
     "/clear",
     {
       description: "Clear session screen",
       expectsOutput: false,
-      silentNote: "context cleared — fresh slate"
+      silentNote: "context cleared — fresh slate",
+      argsAllowed: false
     }
   ],
   [
@@ -22869,7 +23276,8 @@ var INJECT_COMMANDS = new Map([
     {
       description: "Compact conversation history",
       expectsOutput: false,
-      silentNote: "compaction runs silently"
+      silentNote: "compaction runs silently",
+      argsAllowed: false
     }
   ]
 ]);
@@ -22879,6 +23287,15 @@ var INJECT_BLOCKED = new Map([
   ["/logout", { reason: "would terminate the agent's auth session" }],
   ["/exit", { reason: "would kill the agent process" }],
   ["/quit", { reason: "would kill the agent process" }],
+  ["/upgrade", { reason: "mutates the Claude Code installation" }],
+  ["/init", { reason: "generates/overwrites CLAUDE.md and runs a model turn" }],
+  ["/mcp", { reason: "opens an interactive MCP server management dialog" }],
+  ["/permissions", { reason: "opens an interactive permissions editor that mutates tool policy" }],
+  ["/install-github-app", { reason: "runs a network/OAuth install flow" }],
+  ["/add-dir", { reason: "mutates the session's working-directory set" }],
+  ["/terminal-setup", { reason: "mutates terminal keybinding configuration" }],
+  ["/privacy-settings", { reason: "opens an interactive privacy-settings dialog" }],
+  ["/bug", { reason: "submits a bug report over the network" }],
   [
     "/effort",
     {
@@ -22896,6 +23313,7 @@ var HINDSIGHT_CONSUMER_NAME = "hindsight";
 var HINDSIGHT_IMAGE_REPO = "ghcr.io/switchroom/switchroom-hindsight";
 var HINDSIGHT_IMAGE = `${HINDSIGHT_IMAGE_REPO}:latest`;
 var HINDSIGHT_BROKER_SOCK_VOLUME = `auth-broker-${HINDSIGHT_CONSUMER_NAME}-sock`;
+var HINDSIGHT_CREDS_MIRROR_VOLUME = `consumer-creds-${HINDSIGHT_CONSUMER_NAME}`;
 var HINDSIGHT_HEALTHCHECK_PY = 'import urllib.request,sys; sys.exit(0 if urllib.request.urlopen("http://localhost:8888/health",timeout=4).getcode()==200 else 1)';
 var HINDSIGHT_HEALTHCHECK_CMD = `python3 -c '${HINDSIGHT_HEALTHCHECK_PY}'`;
 
@@ -22928,8 +23346,10 @@ var KNOWN_VAULT_ARTIFACT_NAMES = new Set([
 var SCRYPT_MAXMEM = 128 * 1024 * 1024;
 
 // src/vault/broker/client.ts
+import * as net from "node:net";
+import * as fs from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join3 } from "node:path";
+import { join as join4 } from "node:path";
 
 // src/broker-common/peercred-path.ts
 function matchSocketName(socketPath, patterns, maxNameLen) {
@@ -23140,7 +23560,8 @@ var ErrorCode = exports_external.enum([
   "DENIED",
   "UNKNOWN_KEY",
   "BAD_REQUEST",
-  "INTERNAL"
+  "INTERNAL",
+  "AUDIT_UNAVAILABLE"
 ]);
 var OkEntryResponseSchema = exports_external.object({
   ok: exports_external.literal(true),
@@ -23277,16 +23698,123 @@ var ResponseSchema = exports_external.union([
   OkApprovalConsumeRecordResponseSchema,
   ErrorResponseSchema
 ]);
+function encodeRequest(req) {
+  const json = JSON.stringify(req);
+  if (Buffer.byteLength(json, "utf8") > MAX_FRAME_BYTES) {
+    throw new Error(`Request frame too large (${Buffer.byteLength(json, "utf8")} bytes; max ${MAX_FRAME_BYTES})`);
+  }
+  return json + `
+`;
+}
+function decodeResponse(line) {
+  if (Buffer.byteLength(line, "utf8") > MAX_FRAME_BYTES) {
+    throw new RangeError(`Response frame too large (${Buffer.byteLength(line, "utf8")} bytes; max ${MAX_FRAME_BYTES})`);
+  }
+  const obj = JSON.parse(line);
+  return ResponseSchema.parse(obj);
+}
+
+// src/runtime-mode.ts
+function isDockerRuntime() {
+  return process.env.SWITCHROOM_RUNTIME === "docker";
+}
 
 // src/vault/broker/client.ts
-var LEGACY_SOCKET_PATH = join3(homedir3(), ".switchroom", "vault-broker.sock");
-var OPERATOR_SOCKET_PATH = join3(homedir3(), ".switchroom", "broker-operator", "sock");
+var DEFAULT_TIMEOUT_MS = 2000;
+var LEGACY_SOCKET_PATH = join4(homedir3(), ".switchroom", "vault-broker.sock");
+var OPERATOR_SOCKET_PATH = join4(homedir3(), ".switchroom", "broker-operator", "sock");
+function defaultBrokerSocketPath() {
+  if (fs.existsSync(OPERATOR_SOCKET_PATH))
+    return OPERATOR_SOCKET_PATH;
+  if (isDockerRuntime())
+    return OPERATOR_SOCKET_PATH;
+  return LEGACY_SOCKET_PATH;
+}
+function resolveBrokerSocketPath(opts) {
+  if (opts?.socket)
+    return opts.socket;
+  const env = process.env.SWITCHROOM_VAULT_BROKER_SOCK;
+  if (env)
+    return env;
+  if (opts?.vaultBrokerSocket)
+    return opts.vaultBrokerSocket;
+  return defaultBrokerSocketPath();
+}
+async function rpcRaw(req, opts) {
+  return rpc(req, opts);
+}
+async function rpc(req, opts) {
+  const socketPath = resolveBrokerSocketPath(opts);
+  const timeoutMs = opts?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  return new Promise((resolve5) => {
+    let settled = false;
+    const settle = (val) => {
+      if (settled)
+        return;
+      settled = true;
+      resolve5(val);
+    };
+    const client = new net.Socket;
+    const timer = setTimeout(() => {
+      client.destroy();
+      settle({ kind: "unreachable", msg: `broker did not respond within ${timeoutMs}ms` });
+    }, timeoutMs);
+    client.on("error", (err) => {
+      clearTimeout(timer);
+      const code = err.code ?? "ERR";
+      let msg;
+      if (code === "ENOENT")
+        msg = "broker socket not found (is the daemon running?)";
+      else if (code === "ECONNREFUSED")
+        msg = "broker socket exists but refused connection";
+      else if (code === "EACCES")
+        msg = "broker socket access denied (wrong UID?)";
+      else
+        msg = `broker connection failed: ${err.message}`;
+      settle({ kind: "unreachable", msg });
+    });
+    let buffer = "";
+    client.on("data", (chunk) => {
+      buffer += chunk.toString("utf8");
+      const newlineIdx = buffer.indexOf(`
+`);
+      if (newlineIdx !== -1) {
+        const line = buffer.slice(0, newlineIdx).trimEnd();
+        clearTimeout(timer);
+        client.destroy();
+        try {
+          const resp = decodeResponse(line);
+          settle({ kind: "response", resp });
+        } catch (err) {
+          settle({
+            kind: "unreachable",
+            msg: `unparseable broker response: ${err instanceof Error ? err.message : String(err)}`
+          });
+        }
+      }
+    });
+    client.on("connect", () => {
+      try {
+        client.write(encodeRequest(req));
+      } catch (err) {
+        clearTimeout(timer);
+        client.destroy();
+        settle({
+          kind: "unreachable",
+          msg: `failed to send request: ${err instanceof Error ? err.message : String(err)}`
+        });
+      }
+    });
+    client.connect({ path: socketPath });
+  });
+}
 
 // src/vault/resolver.ts
 var materializedDirs = new Set;
 
 // src/agents/scaffold.ts
 var REPO_ROOT = resolve5(import.meta.dirname, "../..");
+var CLAUDE_MD_YOURS_PLACEHOLDER = "This space is yours. Add per-agent rules, exceptions, or context the " + "Switchroom template doesn't capture. Everything above the marker line is " + "regenerated on every apply; this section is preserved.";
 var SWITCHROOM_OWNED_SETTINGS_KEYS = new Set([
   "permissions",
   "mcpServers",
@@ -23317,20 +23845,20 @@ import { spawn as spawn2, spawnSync as spawnSync3 } from "node:child_process";
 import { mkdir, chmod, chown, unlink, appendFile } from "node:fs/promises";
 import {
   readdirSync as readdirSync3,
-  existsSync as existsSync9,
-  readFileSync as readFileSync7,
-  writeFileSync as writeFileSync4,
-  renameSync as renameSync2,
-  mkdirSync as mkdirSync3,
+  existsSync as existsSync11,
+  readFileSync as readFileSync9,
+  writeFileSync as writeFileSync5,
+  renameSync as renameSync3,
+  mkdirSync as mkdirSync4,
   openSync as openSync3,
   ftruncateSync,
   writeSync as writeSync2,
   fsyncSync as fsyncSync2,
   closeSync as closeSync3,
   copyFileSync as copyFileSync2,
-  unlinkSync
+  unlinkSync as unlinkSync2
 } from "node:fs";
-import { join as join9, dirname as dirname6, resolve as resolve8 } from "node:path";
+import { join as join10, dirname as dirname6, resolve as resolve8 } from "node:path";
 import { createHash as createHash5, randomUUID as randomUUID2, randomBytes } from "node:crypto";
 
 // src/host-control/protocol.ts
@@ -23339,7 +23867,8 @@ var IDEMPOTENCY_WINDOW_MS = 15000;
 var RequestEnvelope = {
   v: exports_external.literal(1),
   request_id: exports_external.string().min(1).max(128),
-  idempotency_key: exports_external.string().min(1).max(128).optional()
+  idempotency_key: exports_external.string().min(1).max(128).optional(),
+  operator_passphrase: exports_external.string().min(1).max(1024).optional()
 };
 var AgentRestartRequestSchema = exports_external.object({
   ...RequestEnvelope,
@@ -28019,10 +28548,10 @@ class PostHog extends PostHogBackendClient {
 
 // src/analytics/posthog.ts
 import {
-  existsSync as existsSync5,
-  mkdirSync as mkdirSync2,
-  readFileSync as readFileSync4,
-  writeFileSync as writeFileSync2
+  existsSync as existsSync7,
+  mkdirSync as mkdirSync3,
+  readFileSync as readFileSync6,
+  writeFileSync as writeFileSync3
 } from "node:fs";
 import { dirname as dirname2 } from "node:path";
 import { randomUUID } from "node:crypto";
@@ -28040,8 +28569,8 @@ function getDistinctId() {
     return cachedDistinctId;
   const path = resolveStatePath("analytics-id");
   try {
-    if (existsSync5(path)) {
-      const existing = readFileSync4(path, "utf-8").trim();
+    if (existsSync7(path)) {
+      const existing = readFileSync6(path, "utf-8").trim();
       if (existing) {
         cachedDistinctId = existing;
         return existing;
@@ -28051,8 +28580,8 @@ function getDistinctId() {
   const id = randomUUID();
   cachedDistinctId = id;
   try {
-    mkdirSync2(dirname2(path), { recursive: true });
-    writeFileSync2(path, id, "utf-8");
+    mkdirSync3(dirname2(path), { recursive: true });
+    writeFileSync3(path, id, "utf-8");
   } catch {}
   return id;
 }
@@ -28660,7 +29189,7 @@ function redactedMarker(ruleId) {
   return `[REDACTED:${trimmed}]`;
 }
 // src/cli/install-detect.ts
-import * as fs from "node:fs";
+import * as fs2 from "node:fs";
 import * as path from "node:path";
 import * as os from "node:os";
 var BIN_PATH = "/usr/local/bin/switchroom";
@@ -28674,12 +29203,12 @@ function detectInstallType() {
   try {
     const repoArtifact = sourceArtifactPath();
     const distPrefix = sourceDistPrefix();
-    const binExists = fs.existsSync(BIN_PATH);
-    const repoExists = fs.existsSync(repoArtifact);
+    const binExists = fs2.existsSync(BIN_PATH);
+    const repoExists = fs2.existsSync(repoArtifact);
     if (binExists) {
-      const lst = fs.lstatSync(BIN_PATH);
+      const lst = fs2.lstatSync(BIN_PATH);
       if (lst.isSymbolicLink()) {
-        const target = fs.readlinkSync(BIN_PATH);
+        const target = fs2.readlinkSync(BIN_PATH);
         const resolved = path.isAbsolute(target) ? target : path.resolve(path.dirname(BIN_PATH), target);
         if (resolved.startsWith(distPrefix)) {
           return {
@@ -28715,40 +29244,21 @@ var import_yaml3 = __toESM(require_dist(), 1);
 // src/cli/rollout.ts
 init_atomic();
 
-// src/config/release-resolve.ts
-function parseSemverTag(tag) {
-  if (!tag)
-    return null;
-  const m = /^v(\d+)\.(\d+)\.(\d+)$/.exec(tag.trim());
-  return m ? [Number(m[1]), Number(m[2]), Number(m[3])] : null;
-}
-function compareReleaseTags(a, b) {
-  const pa = parseSemverTag(a);
-  const pb = parseSemverTag(b);
-  if (!pa || !pb)
-    return null;
-  for (let i = 0;i < 3; i++) {
-    if (pa[i] !== pb[i])
-      return pa[i] < pb[i] ? -1 : 1;
-  }
-  return 0;
-}
-
 // src/cli/resolve-version.ts
-import { existsSync as existsSync7, readFileSync as readFileSync5 } from "node:fs";
-import { dirname as dirname4, join as join6 } from "node:path";
+import { existsSync as existsSync9, readFileSync as readFileSync7 } from "node:fs";
+import { dirname as dirname4, join as join7 } from "node:path";
 
 // src/build-info.ts
-var VERSION = "0.18.10";
+var VERSION = "0.18.12";
 
 // src/cli/resolve-version.ts
 function readPackageVersion() {
   let dir = import.meta.dirname;
   for (let i = 0;i < 12 && dir && dir !== "/"; i++) {
-    const p = join6(dir, "package.json");
-    if (existsSync7(p)) {
+    const p = join7(dir, "package.json");
+    if (existsSync9(p)) {
       try {
-        const pkg = JSON.parse(readFileSync5(p, "utf-8"));
+        const pkg = JSON.parse(readFileSync7(p, "utf-8"));
         if (pkg?.name === "switchroom" && typeof pkg.version === "string") {
           return pkg.version;
         }
@@ -28809,6 +29319,8 @@ function parseAuditLine(line) {
     entry.error = o.error;
   if (typeof o.phase === "string")
     entry.phase = o.phase;
+  if (typeof o.method === "string")
+    entry.method = o.method;
   if (typeof o.stdout_tail === "string")
     entry.stdout_tail = o.stdout_tail;
   if (typeof o.stderr_tail === "string")
@@ -28895,6 +29407,7 @@ function parseRolloutPhaseLine(line) {
     "agent-start",
     "agent-done",
     "persist-pin",
+    "web-refresh",
     "hostd-web-deferred",
     "self-bump",
     "self-bump-done"
@@ -28905,149 +29418,38 @@ function parseRolloutPhaseLine(line) {
     return null;
   const out = {
     phase: o.phase,
-    target: o.target
-  };
-  if (typeof o.agent === "string")
-    out.agent = o.agent;
-  if (typeof o.n === "number")
-    out.n = o.n;
-  if (typeof o.m === "number")
-    out.m = o.m;
-  return out;
-}
-var ROLLOUT_RESULT_SENTINEL = "SWITCHROOM_ROLLOUT_RESULT:";
-function parseRolloutResultLine(stdout) {
-  const lines = stdout.split(`
-`);
-  for (let i = lines.length - 1;i >= 0; i--) {
-    const line = lines[i].trim();
-    if (line.startsWith(ROLLOUT_RESULT_SENTINEL)) {
-      try {
-        return JSON.parse(line.slice(ROLLOUT_RESULT_SENTINEL.length));
-      } catch {
-        return null;
-      }
-    }
-  }
-  return null;
-}
-
-// src/host-control/self-bump.ts
-var SELF_BUMP_MARKER_FILENAME = "pending-rollout.json";
-var SELF_BUMP_HELPER_CONTAINER = "switchroom-hostd-selfbump";
-var SELF_BUMP_LOG_FILENAME = "selfbump.log";
-var SELF_BUMP_MARKER_MAX_AGE_MS = 15 * 60 * 1000;
-var SEMVER_PIN_RE = /^v\d+\.\d+\.\d+$/;
-function needsSelfBump(ownVersion, pin) {
-  if (!ownVersion)
-    return false;
-  const cmp = compareReleaseTags(`v${ownVersion.trim().replace(/^v/, "")}`, `v${pin.trim().replace(/^v/, "")}`);
-  return cmp !== null && cmp < 0;
-}
-function bumpHostdComposeImageTag(yaml, pin) {
-  const re = /^(\s*image:\s*)(\S*switchroom-hostd):(\S+)\s*$/m;
-  const m = yaml.match(re);
-  if (!m)
-    return null;
-  const oldImageRef = `${m[2]}:${m[3]}`;
-  const newImageRef = `${m[2]}:${pin}`;
-  return {
-    yaml: yaml.replace(re, `$1${newImageRef}`),
-    oldImageRef,
-    newImageRef
-  };
-}
-function encodePendingRolloutMarker(m) {
-  return JSON.stringify(m, null, 2) + `
-`;
-}
-function parsePendingRolloutMarker(raw) {
-  let obj;
-  try {
-    obj = JSON.parse(raw);
-  } catch {
-    return null;
-  }
-  if (typeof obj !== "object" || obj === null)
-    return null;
-  const o = obj;
-  if (o.v !== 1)
-    return null;
-  if (typeof o.request_id !== "string" || o.request_id.length === 0)
-    return null;
-  if (typeof o.pin !== "string" || !SEMVER_PIN_RE.test(o.pin))
-    return null;
-  if (typeof o.created_at !== "string" || !Number.isFinite(Date.parse(o.created_at))) {
-    return null;
-  }
-  if (typeof o.prior_hostd_version !== "string")
-    return null;
-  const caller = o.caller;
-  if (typeof caller !== "object" || caller === null)
-    return null;
-  if (caller.kind === "agent") {
-    if (typeof caller.name !== "string" || caller.name.length === 0)
-      return null;
-  } else if (caller.kind !== "operator") {
-    return null;
-  }
-  if (o.agents !== undefined) {
-    if (!Array.isArray(o.agents) || o.agents.length === 0 || !o.agents.every((a) => typeof a === "string" && /^[\w-]+$/.test(a))) {
-      return null;
-    }
-  }
-  if (o.skip_web !== undefined && typeof o.skip_web !== "boolean")
-    return null;
-  if (o.allow_downgrade !== undefined && typeof o.allow_downgrade !== "boolean") {
-    return null;
-  }
-  return {
-    v: 1,
-    request_id: o.request_id,
-    pin: o.pin,
-    ...o.agents !== undefined ? { agents: o.agents } : {},
-    ...o.skip_web !== undefined ? { skip_web: o.skip_web } : {},
-    ...o.allow_downgrade !== undefined ? { allow_downgrade: o.allow_downgrade } : {},
-    caller: caller.kind === "agent" ? { kind: "agent", name: caller.name } : { kind: "operator" },
-    created_at: o.created_at,
-    prior_hostd_version: o.prior_hostd_version
+    target: o.target
   };
+  if (typeof o.agent === "string")
+    out.agent = o.agent;
+  if (typeof o.n === "number")
+    out.n = o.n;
+  if (typeof o.m === "number")
+    out.m = o.m;
+  return out;
 }
-function isMarkerFresh(marker, nowMs) {
-  const created = Date.parse(marker.created_at);
-  if (!Number.isFinite(created))
-    return false;
-  return nowMs - created < SELF_BUMP_MARKER_MAX_AGE_MS;
-}
-function selfBumpHelperArgs(opts) {
-  const composePath = `${opts.hostdDirHostPath}/docker-compose.yml`;
-  const logPath = `${opts.hostdDirHostPath}/${SELF_BUMP_LOG_FILENAME}`;
-  const script = `sleep 2; ` + `echo "selfbump $(date -u) -> ${opts.targetImage}" >> "${logPath}" 2>&1; ` + `docker compose -p switchroom-hostd -f "${composePath}" pull >> "${logPath}" 2>&1 && ` + `docker compose -p switchroom-hostd -f "${composePath}" up -d >> "${logPath}" 2>&1; ` + `rc=$?; echo "selfbump done rc=$rc" >> "${logPath}" 2>&1; exit $rc`;
-  return [
-    "run",
-    "-d",
-    "--rm",
-    "--name",
-    SELF_BUMP_HELPER_CONTAINER,
-    "--label",
-    "switchroom.hostd-selfbump=true",
-    "-v",
-    "/var/run/docker.sock:/var/run/docker.sock",
-    "-v",
-    `${opts.hostdDirHostPath}:${opts.hostdDirHostPath}`,
-    "--entrypoint",
-    "/bin/sh",
-    opts.helperImage,
-    "-c",
-    script
-  ];
+var ROLLOUT_RESULT_SENTINEL = "SWITCHROOM_ROLLOUT_RESULT:";
+function parseRolloutResultLine(stdout) {
+  const lines = stdout.split(`
+`);
+  for (let i = lines.length - 1;i >= 0; i--) {
+    const line = lines[i].trim();
+    if (line.startsWith(ROLLOUT_RESULT_SENTINEL)) {
+      try {
+        return JSON.parse(line.slice(ROLLOUT_RESULT_SENTINEL.length));
+      } catch {
+        return null;
+      }
+    }
+  }
+  return null;
 }
 
 // node_modules/.bun/commander@13.1.0/node_modules/commander/esm.mjs
 var import__3 = __toESM(require_commander(), 1);
 
 // src/cli/update.ts
-import { join as join7, dirname as dirname5, resolve as resolve7 } from "node:path";
+import { join as join8, dirname as dirname5, resolve as resolve7 } from "node:path";
 import { homedir as homedir5 } from "node:os";
 
 // src/agents/lifecycle.ts
@@ -29144,7 +29546,7 @@ function getAllAgentStatuses(config) {
 
 // src/cli/update.ts
 init_atomic();
-var DEFAULT_COMPOSE_PATH = join7(homedir5(), ".switchroom", "compose", "docker-compose.yml");
+var DEFAULT_COMPOSE_PATH = join8(homedir5(), ".switchroom", "compose", "docker-compose.yml");
 var UPDATE_RESULT_SENTINEL = "SWITCHROOM_UPDATE_RESULT:";
 function parseUpdateResultLine(stdout) {
   const idx = stdout.lastIndexOf(UPDATE_RESULT_SENTINEL);
@@ -29167,9 +29569,9 @@ function parseUpdateResultLine(stdout) {
 
 // src/host-control/config-edit-validator.ts
 var import_yaml5 = __toESM(require_dist(), 1);
-import { mkdtempSync, writeFileSync as writeFileSync3, rmSync as rmSync2, existsSync as existsSync8, readFileSync as readFileSync6 } from "node:fs";
+import { mkdtempSync, writeFileSync as writeFileSync4, rmSync as rmSync2, existsSync as existsSync10, readFileSync as readFileSync8 } from "node:fs";
 import { tmpdir } from "node:os";
-import { join as join8, isAbsolute as isAbsolute2, normalize, basename as basename2 } from "node:path";
+import { join as join9, isAbsolute as isAbsolute2, normalize, basename as basename2 } from "node:path";
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { isDeepStrictEqual } from "node:util";
 var MAX_PATCH_BYTES = 1024 * 1024;
@@ -29279,31 +29681,57 @@ function validateShape(unifiedDiff, targetPath) {
       };
     }
   }
+  {
+    let inHunk = false;
+    let hunkHasContext = false;
+    const failZeroContext = {
+      ok: false,
+      code: "E_PATCH_INVALID_SHAPE",
+      detail: "zero-context hunk not allowed; regenerate the diff with context " + "lines (git diff default of 3)"
+    };
+    const scanLines = lines.length > 0 && lines[lines.length - 1] === "" ? lines.slice(0, -1) : lines;
+    for (const ln of scanLines) {
+      if (ln.startsWith("@@")) {
+        if (inHunk && !hunkHasContext)
+          return failZeroContext;
+        inHunk = true;
+        hunkHasContext = false;
+      } else if (ln.startsWith("--- ") || ln.startsWith("+++ ")) {
+        if (inHunk && !hunkHasContext)
+          return failZeroContext;
+        inHunk = false;
+      } else if (inHunk) {
+        if (ln.startsWith(" ") || ln === "")
+          hunkHasContext = true;
+      }
+    }
+    if (inHunk && !hunkHasContext)
+      return failZeroContext;
+  }
   return null;
 }
 function applyPatch(unifiedDiff, configPath, gitBin) {
-  if (!existsSync8(configPath)) {
+  if (!existsSync10(configPath)) {
     return {
       ok: false,
       code: "E_PATCH_APPLY_FAILED",
       detail: `target config not found at ${configPath}`
     };
   }
-  const liveContent = readFileSync6(configPath, "utf8");
-  const scratchDir = mkdtempSync(join8(tmpdir(), "config-propose-edit-"));
+  const liveContent = readFileSync8(configPath, "utf8");
+  const scratchDir = mkdtempSync(join9(tmpdir(), "config-propose-edit-"));
   try {
     const targetBasename = configPath.split("/").pop() ?? "switchroom.yaml";
-    const scratchFile = join8(scratchDir, targetBasename);
-    writeFileSync3(scratchFile, liveContent);
+    const scratchFile = join9(scratchDir, targetBasename);
+    writeFileSync4(scratchFile, liveContent);
     const normalizedDiff = normalizeDiffHeadersToBasename(unifiedDiff, targetBasename);
-    const patchFile = join8(scratchDir, "proposal.patch");
-    writeFileSync3(patchFile, normalizedDiff);
+    const patchFile = join9(scratchDir, "proposal.patch");
+    writeFileSync4(patchFile, normalizedDiff);
     const bin = gitBin ?? "git";
     const baseArgs = [
       "apply",
       "--whitespace=nowarn",
-      "--recount",
-      "--unidiff-zero"
+      "--recount"
     ];
     const checkP1 = spawnSync2(bin, [...baseArgs.slice(0, 1), "--check", ...baseArgs.slice(1), "-p1", patchFile], { cwd: scratchDir, encoding: "utf8", timeout: 1e4 });
     let pStrip = "-p1";
@@ -29327,7 +29755,7 @@ function applyPatch(unifiedDiff, configPath, gitBin) {
         detail: `git apply failed: ${(real.stderr || "").trim().slice(0, 500)}`
       };
     }
-    const after = readFileSync6(scratchFile, "utf8");
+    const after = readFileSync8(scratchFile, "utf8");
     return { ok: true, after };
   } finally {
     rmSync2(scratchDir, { recursive: true, force: true });
@@ -29525,7 +29953,7 @@ function validateConfigEdit(opts) {
     return schemaErr;
   let beforeData = {};
   try {
-    const beforeRaw = existsSync8(opts.configPath) ? readFileSync6(opts.configPath, "utf8") : "";
+    const beforeRaw = existsSync10(opts.configPath) ? readFileSync8(opts.configPath, "utf8") : "";
     const beforeDoc = import_yaml5.parseDocument(beforeRaw, { merge: false, strict: false });
     beforeData = beforeDoc.toJS();
   } catch {
@@ -29771,19 +30199,21 @@ function phaseLine(s) {
     case "apply":
       return "applying — regenerating compose";
     case "canary-start":
-      return `canary — restarting ${s.agent ?? "canary agent"}`;
+      return `canary — restarting ${s.agent ? `\`${s.agent}\`` : "canary agent"}`;
     case "canary-pass":
-      return `canary passed (${s.agent ?? "canary"}) — rolling the rest`;
+      return `canary passed (${s.agent ? `\`${s.agent}\`` : "canary"}) — rolling the rest`;
     case "canary-fail":
-      return `canary failed (${s.agent ?? "canary"})`;
+      return `canary failed (${s.agent ? `\`${s.agent}\`` : "canary"})`;
     case "agent-start":
-      return `agent ${s.n ?? "?"}/${s.m ?? "?"} — restarting ${s.agent ?? ""}`.trim();
+      return `agent ${s.n ?? "?"}/${s.m ?? "?"} — restarting ${s.agent ? `\`${s.agent}\`` : ""}`.trim();
     case "agent-done":
-      return `agent ${s.n ?? "?"}/${s.m ?? "?"} — ${s.agent ?? ""} done`.trim();
+      return `agent ${s.n ?? "?"}/${s.m ?? "?"} — ${s.agent ? `\`${s.agent}\`` : ""} done`.trim();
     case "persist-pin":
       return "persisting pin";
+    case "web-refresh":
+      return "refreshing web dashboard (webd install)";
     case "hostd-web-deferred":
-      return "hostd/web refresh deferred (run host-side)";
+      return "hostd refresh deferred (run host-side)";
     case "self-bump":
       return "hostd refreshing itself to the target (brief control blip)…";
     case "self-bump-done":
@@ -29792,18 +30222,147 @@ function phaseLine(s) {
       return "starting";
   }
 }
-function renderRolloutStatus(s) {
-  const head = `Rollout → ${s.target}`;
-  const rolledCount = s.rolled?.length ?? 0;
+function formatDurationMs(ms) {
+  const totalSec = Math.max(0, Math.round(ms / 1000));
+  if (totalSec < 60)
+    return `${totalSec}s`;
+  const totalMin = Math.floor(totalSec / 60);
+  const sec = totalSec % 60;
+  if (totalMin < 60)
+    return sec > 0 ? `${totalMin}m ${sec}s` : `${totalMin}m`;
+  const hr = Math.floor(totalMin / 60);
+  const min = totalMin % 60;
+  return min > 0 ? `${hr}h ${min}m` : `${hr}h`;
+}
+function shortRequestId(id) {
+  return id.length > 16 ? id.slice(0, 16) + "…" : id;
+}
+function headerLine(s, icon) {
+  const arrow = s.fromVersion ? `\`${s.fromVersion}\` → \`${s.target}\`` : `→ \`${s.target}\``;
+  const req = s.requestId ? ` · req \`${shortRequestId(s.requestId)}\`` : "";
+  return `${icon} **Rollout** ${arrow}${req}`;
+}
+function checklistLines(s, compact) {
+  const agents = s.agents ?? [];
+  const lines = [];
+  let doneCount = 0;
+  let pendingNamed = 0;
+  for (const a of agents) {
+    const canary = a.canary ? " (canary)" : "";
+    const dur = a.durationMs !== undefined ? ` — ${formatDurationMs(a.durationMs)}` : "";
+    switch (a.status) {
+      case "done":
+        if (compact)
+          doneCount += 1;
+        else
+          lines.push(`- ✓ \`${a.name}\`${canary}${dur}`);
+        break;
+      case "running":
+        lines.push(`- ⏳ \`${a.name}\`${canary} — restarting…`);
+        break;
+      case "failed":
+        lines.push(`- ✗ \`${a.name}\`${canary} — failed${dur}`);
+        break;
+      default:
+        if (compact)
+          pendingNamed += 1;
+        else
+          lines.push(`- · \`${a.name}\`${canary}`);
+    }
+  }
+  if (doneCount > 0)
+    lines.unshift(`- ✓ ${doneCount} done`);
+  const unseen = s.m !== undefined ? Math.max(0, s.m - agents.length) : 0;
+  const pendingTotal = unseen + pendingNamed;
+  if (pendingTotal > 0 && agents.length > 0) {
+    lines.push(`- · ${pendingTotal} more pending`);
+  }
+  return lines;
+}
+function etaLine(s) {
+  if (s.m === undefined)
+    return null;
+  const done = (s.agents ?? []).filter((a) => a.status === "done" && a.durationMs !== undefined);
+  if (done.length === 0)
+    return null;
+  const remaining = s.m - done.length;
+  if (remaining <= 0)
+    return null;
+  const meanMs = done.reduce((t, a) => t + (a.durationMs ?? 0), 0) / done.length;
+  return `~${formatDurationMs(meanMs * remaining)} left (rough est.)`;
+}
+function deferredLines(target) {
+  const bare = target.trim().replace(/^v/, "");
+  return [
+    `**Deferred (still on the prior version — run host-side):**`,
+    `- \`switchroom-web\` — \`switchroom webd install --tag ${target}\``,
+    `- host operator CLI — \`sudo npm i -g switchroom@${bare}\``,
+    `- hostd template regen (only if the release changed hostd mounts/env) — \`switchroom hostd install --tag ${target}\``
+  ];
+}
+var MAX_RENDER_CHARS = 3800;
+function rolledList(rolled, compact) {
+  if (rolled.length === 0)
+    return "none";
+  if (compact)
+    return `${rolled.length} agent(s)`;
+  return rolled.map((r) => `\`${r}\``).join(", ");
+}
+function renderWith(s, compact) {
+  const rolled = s.rolled ?? [];
+  const rolledCount = rolled.length;
+  const checklist = checklistLines(s, compact);
+  const elapsedMs = s.elapsedMs ?? (s.startedAtMs !== undefined && s.nowMs !== undefined ? s.nowMs - s.startedAtMs : undefined);
   if (s.terminal === "completed") {
-    return `✅ ${head} — done. Rolled ${rolledCount} agent(s): ${(s.rolled ?? []).join(", ") || "none"}.`;
+    const parts2 = [headerLine(s, "✅")];
+    let summary = `**Done** — rolled ${rolledCount}${s.m !== undefined ? `/${s.m}` : ""} agent(s)`;
+    if (elapsedMs !== undefined)
+      summary += ` in ${formatDurationMs(elapsedMs)}`;
+    summary += compact ? "." : `: ${rolledList(rolled, compact)}.`;
+    parts2.push(summary);
+    if (checklist.length > 0)
+      parts2.push("", ...checklist);
+    if (s.deferred !== false)
+      parts2.push("", ...deferredLines(s.target));
+    return parts2.join(`
+`);
   }
   if (s.terminal === "error") {
-    const where = s.failedStep ? ` at ${s.failedStep}${s.failedAgent ? ` (${s.failedAgent} → ${s.got ?? "unreachable"})` : ""}` : "";
-    return `❌ ${head} — STOPPED${where}. ` + `Rolled before stop: ${(s.rolled ?? []).join(", ") || "none"}.`;
+    const where = s.failedStep ? ` at \`${s.failedStep}\`${s.failedAgent ? ` (\`${s.failedAgent}\` → ${s.got ?? "unreachable"})` : ""}` : "";
+    const parts2 = [headerLine(s, "❌")];
+    let summary = `**STOPPED**${where}`;
+    if (elapsedMs !== undefined)
+      summary += ` after ${formatDurationMs(elapsedMs)}`;
+    summary += `. Rolled before stop: ${rolledList(rolled, compact)}.`;
+    parts2.push(summary);
+    if (checklist.length > 0)
+      parts2.push("", ...checklist);
+    return parts2.join(`
+`);
   }
-  const progress = rolledCount > 0 ? ` · ${rolledCount} rolled` : "";
-  return `⏳ ${head} — ${phaseLine(s)}${progress}`;
+  const parts = [headerLine(s, "⏳"), `**Phase:** ${phaseLine(s)}`];
+  if (checklist.length > 0)
+    parts.push("", ...checklist);
+  const footer = [];
+  if (s.m !== undefined)
+    footer.push(`${rolledCount}/${s.m} rolled`);
+  else if (rolledCount > 0)
+    footer.push(`${rolledCount} rolled`);
+  if (elapsedMs !== undefined)
+    footer.push(`elapsed ${formatDurationMs(elapsedMs)}`);
+  const eta = etaLine(s);
+  if (eta)
+    footer.push(eta);
+  if (footer.length > 0)
+    parts.push("", footer.join(" · "));
+  return parts.join(`
+`);
+}
+function renderRolloutStatus(s) {
+  const full = renderWith(s, false);
+  if (full.length <= MAX_RENDER_CHARS)
+    return full;
+  return renderWith(s, true);
 }
 
 // src/scheduler/dispatch.ts
@@ -29843,12 +30402,12 @@ function collectScheduleEntries(config) {
 // src/agent-scheduler/replay.ts
 var STALE_LOOKBACK_MAX_MIN = 14 * 24 * 60;
 function readRecentFires(jsonlPath) {
-  const fs2 = __require("node:fs");
-  if (!fs2.existsSync(jsonlPath))
+  const fs3 = __require("node:fs");
+  if (!fs3.existsSync(jsonlPath))
     return [];
   let raw;
   try {
-    raw = fs2.readFileSync(jsonlPath, "utf8");
+    raw = fs3.readFileSync(jsonlPath, "utf8");
   } catch {
     return [];
   }
@@ -29866,6 +30425,13 @@ function readRecentFires(jsonlPath) {
 }
 
 // src/host-control/server.ts
+var HOSTD_BROKER_SOCKET_PATH = "/run/switchroom/broker/hostd/sock";
+var DEFAULT_OPERATOR_ATTEST_VERBS = [
+  "update_apply",
+  "apply",
+  "rollout"
+];
+var ATTEST_AUDIT_METHOD = "passphrase-attest";
 function resolveDigests(imageRefs) {
   const out = new Map;
   for (const ref of imageRefs) {
@@ -29888,11 +30454,11 @@ function resolveDigests(imageRefs) {
   return out;
 }
 function readCachedInstallType(bindRoot) {
-  const cacheDir = join9(bindRoot, ".switchroom");
-  const cachePath = join9(cacheDir, "install-type.json");
-  if (existsSync9(cachePath)) {
+  const cacheDir = join10(bindRoot, ".switchroom");
+  const cachePath = join10(cacheDir, "install-type.json");
+  if (existsSync11(cachePath)) {
     try {
-      const raw = readFileSync7(cachePath, "utf-8");
+      const raw = readFileSync9(cachePath, "utf-8");
       const parsed = JSON.parse(raw);
       if (parsed && typeof parsed.install_type === "string" && typeof parsed.detected_at === "string") {
         return parsed;
@@ -29909,10 +30475,10 @@ function readCachedInstallType(bindRoot) {
     source_paths: ctx.source_paths
   };
   try {
-    mkdirSync3(cacheDir, { recursive: true });
+    mkdirSync4(cacheDir, { recursive: true });
     const tmp = `${cachePath}.tmp`;
-    writeFileSync4(tmp, JSON.stringify(payload, null, 2), { mode: 420 });
-    renameSync2(tmp, cachePath);
+    writeFileSync5(tmp, JSON.stringify(payload, null, 2), { mode: 420 });
+    renameSync3(tmp, cachePath);
   } catch {}
   return payload;
 }
@@ -29941,7 +30507,7 @@ function writeFileInPlacePreservingInode(targetPath, content) {
   } finally {
     closeSync3(fd);
   }
-  const readBack = readFileSync7(targetPath);
+  const readBack = readFileSync9(targetPath);
   if (readBack.length !== buf.length) {
     throw new Error(`in-place write short: wrote ${buf.length} bytes but read back ${readBack.length}`);
   }
@@ -29966,7 +30532,7 @@ class HostdServer {
     this.opts = opts;
   }
   async start() {
-    const hostdDir = join9(this.opts.homeDir, ".switchroom", "hostd");
+    const hostdDir = join10(this.opts.homeDir, ".switchroom", "hostd");
     await mkdir(hostdDir, { recursive: true });
     await chmod(hostdDir, 493).catch(() => {
       return;
@@ -29981,13 +30547,13 @@ class HostdServer {
     }
     try {
       for (const name of agentNames) {
-        const dir = join9(hostdDir, name);
-        const sockPath = join9(dir, "sock");
+        const dir = join10(hostdDir, name);
+        const sockPath = join10(dir, "sock");
         await mkdir(dir, { recursive: true });
         await chmod(dir, 493).catch(() => {
           return;
         });
-        if (existsSync9(sockPath))
+        if (existsSync11(sockPath))
           await unlink(sockPath).catch(() => {
             return;
           });
@@ -30018,13 +30584,13 @@ class HostdServer {
           process.stderr.write(`hostd: SWITCHROOM_HOSTD_OPERATOR_UID='${opUidStr}' is not a positive integer; skipping operator listener
 `);
         } else {
-          const dir = join9(hostdDir, "operator");
-          const sockPath = join9(dir, "sock");
+          const dir = join10(hostdDir, "operator");
+          const sockPath = join10(dir, "sock");
           await mkdir(dir, { recursive: true });
           await chmod(dir, 493).catch(() => {
             return;
           });
-          if (existsSync9(sockPath))
+          if (existsSync11(sockPath))
             await unlink(sockPath).catch(() => {
               return;
             });
@@ -30060,11 +30626,11 @@ class HostdServer {
   }
   async reconcileOrphanedFleetMutations() {
     const path2 = this.auditLogPath();
-    if (!existsSync9(path2))
+    if (!existsSync11(path2))
       return;
     let raw;
     try {
-      raw = readFileSync7(path2, "utf-8");
+      raw = readFileSync9(path2, "utf-8");
     } catch {
       return;
     }
@@ -30202,6 +30768,15 @@ class HostdServer {
       socket.end();
       return;
     }
+    const attest = await this.checkOperatorAttest(req, caller);
+    if (attest.denied !== null) {
+      const resp2 = deniedResponse(req.request_id, attest.denied);
+      await this.writeAudit({ caller, req, resp: resp2, method: attest.method });
+      socket.write(encodeResponse(resp2));
+      socket.end();
+      return;
+    }
+    const attestMethod = attest.method;
     const started = Date.now();
     let resp;
     try {
@@ -30260,10 +30835,70 @@ class HostdServer {
       resp = err("E_DISPATCH_FAILED", "hostd dispatch failed").why(msg).op(req.op).caller(caller.kind === "agent" ? "agent" : "operator").agentName(caller.kind === "agent" ? caller.name : undefined).build(req.request_id, Date.now() - started);
       resp = { ...resp, error: `hostd dispatch failed: ${msg}` };
     }
-    await this.writeAudit({ caller, req, resp });
+    await this.writeAudit({ caller, req, resp, method: attestMethod });
     socket.write(encodeResponse(resp));
     socket.end();
   }
+  async checkOperatorAttest(req, caller) {
+    const hostdCfg = this.opts.config.hostd;
+    if (hostdCfg?.operator_attest_enabled !== true) {
+      return { denied: null };
+    }
+    if (caller.kind === "operator")
+      return { denied: null };
+    const requiredVerbs = hostdCfg.operator_attest_required_verbs ?? DEFAULT_OPERATOR_ATTEST_VERBS;
+    const required = requiredVerbs.includes(req.op);
+    const passphrase = req.operator_passphrase;
+    if (!required) {
+      if (passphrase === undefined)
+        return { denied: null };
+      const v2 = await this.attestVerifier().verify(passphrase);
+      return v2.ok ? { denied: null, method: ATTEST_AUDIT_METHOD } : {
+        denied: `${req.op} operator-attest failed: ${v2.reason}`,
+        method: ATTEST_AUDIT_METHOD
+      };
+    }
+    if (passphrase === undefined) {
+      return {
+        denied: `${req.op} requires operator-passphrase attestation ` + `(hostd.operator_attest_enabled is on and ${req.op} is in ` + `operator_attest_required_verbs)`,
+        method: ATTEST_AUDIT_METHOD
+      };
+    }
+    const v = await this.attestVerifier().verify(passphrase);
+    return v.ok ? { denied: null, method: ATTEST_AUDIT_METHOD } : {
+      denied: `${req.op} operator-attest failed: ${v.reason}`,
+      method: ATTEST_AUDIT_METHOD
+    };
+  }
+  attestVerifier() {
+    if (this.opts.attestVerifier)
+      return this.opts.attestVerifier;
+    if (!this._defaultAttestVerifier) {
+      this._defaultAttestVerifier = {
+        verify: (passphrase) => this.brokerAttestVerify(passphrase)
+      };
+    }
+    return this._defaultAttestVerifier;
+  }
+  _defaultAttestVerifier;
+  async brokerAttestVerify(passphrase) {
+    const res = await rpcRaw({
+      v: 1,
+      op: "list_grants",
+      agent: "hostd",
+      passphrase
+    }, { vaultBrokerSocket: HOSTD_BROKER_SOCKET_PATH, timeoutMs: 5000 });
+    if (res.kind === "unreachable") {
+      return { ok: false, reason: `broker unreachable: ${res.msg}` };
+    }
+    const resp = res.resp;
+    if (resp.ok === true)
+      return { ok: true };
+    return {
+      ok: false,
+      reason: `broker denied attestation (${resp.code ?? "DENIED"})`
+    };
+  }
   checkGate(req, caller) {
     if (caller.kind === "operator")
       return null;
@@ -30394,10 +31029,10 @@ class HostdServer {
   missingApplyAssets() {
     const root = this.opts.applyAssetsRoot ?? resolve8(import.meta.dirname, "../..");
     return [
-      join9(root, "profiles"),
-      join9(root, "profiles", "default"),
-      join9(root, "vendor", "hindsight-memory")
-    ].filter((p) => !existsSync9(p));
+      join10(root, "profiles"),
+      join10(root, "profiles", "default"),
+      join10(root, "vendor", "hindsight-memory")
+    ].filter((p) => !existsSync11(p));
   }
   applyAssetPreflight(request_id, started) {
     const missing = this.missingApplyAssets();
@@ -30507,6 +31142,26 @@ class HostdServer {
     const assetDenied = this.applyAssetPreflight(req.request_id, started);
     if (assetDenied)
       return assetDenied;
+    if (req.args.agents !== undefined) {
+      let validAgents = null;
+      try {
+        const cfg = loadConfig(this.opts.configPath);
+        validAgents = Object.keys(cfg.agents ?? {});
+      } catch {
+        validAgents = null;
+      }
+      if (validAgents !== null) {
+        const buildDenied = (human) => err("E_UNKNOWN_AGENT", human).fixBadInput("agents").op("rollout").caller(caller.kind).agentName(caller.kind === "agent" ? caller.name : undefined).asDenied().build(req.request_id, Date.now() - started);
+        const requested = req.args.agents;
+        if (requested.length === 0) {
+          return buildDenied(`empty agents list — pass at least one agent, ` + `or omit "agents" to roll all. Valid agents: ${validAgents.join(", ")}`);
+        }
+        const unknown = requested.filter((a) => !validAgents.includes(a));
+        if (unknown.length > 0) {
+          return buildDenied(`unknown agent(s): ${unknown.join(", ")}. ` + `Valid agents: ${validAgents.join(", ")}`);
+        }
+      }
+    }
     const entry = this.launchRollout(req.args, req.request_id, caller, started);
     return {
       v: 1,
@@ -30561,19 +31216,19 @@ class HostdServer {
     return entry;
   }
   hostdDirPath() {
-    return join9(this.opts.homeDir, ".switchroom", "hostd");
+    return join10(this.opts.homeDir, ".switchroom", "hostd");
   }
   hostdDirHostPath() {
     const hostHome = this.opts.hostHomeDir ?? process.env.SWITCHROOM_HOST_HOME?.trim() ?? this.opts.homeDir;
-    return join9(hostHome, ".switchroom", "hostd");
+    return join10(hostHome, ".switchroom", "hostd");
   }
   async beginSelfBump(req, caller, started) {
     const ownVersion = this.opts.selfVersion ?? SWITCHROOM_VERSION;
-    const composePath = join9(this.hostdDirPath(), "docker-compose.yml");
-    if (!existsSync9(composePath)) {
+    const composePath = join10(this.hostdDirPath(), "docker-compose.yml");
+    if (!existsSync11(composePath)) {
       return deniedResponse(req.request_id, `rollout: hostd's CLI (v${ownVersion}) is older than the target ` + `${req.args.pin} and needs a self-bump first, but its compose file ` + `is missing at ${composePath}. Run \`switchroom hostd install ` + `--tag ${req.args.pin}\` on the host, then re-run the roll. ` + `Nothing was changed.`, Date.now() - started);
     }
-    const before = readFileSync7(composePath, "utf8");
+    const before = readFileSync9(composePath, "utf8");
     const bumped = bumpHostdComposeImageTag(before, req.args.pin);
     if (!bumped) {
       return deniedResponse(req.request_id, `rollout: hostd needs a self-bump to ${req.args.pin} but no ` + `switchroom-hostd image line was found in ${composePath} ` + `(hand-edited compose?). Run \`switchroom hostd install --tag ` + `${req.args.pin}\` on the host, then re-run the roll. Nothing ` + `was changed.`, Date.now() - started);
@@ -30594,10 +31249,10 @@ class HostdServer {
     try {
       const baks = readdirSync3(this.hostdDirPath()).filter((f) => f.startsWith("docker-compose.yml.bak-selfbump-")).sort();
       for (const f of baks.slice(0, Math.max(0, baks.length - 4))) {
-        unlinkSync(join9(this.hostdDirPath(), f));
+        unlinkSync2(join10(this.hostdDirPath(), f));
       }
     } catch {}
-    const markerPath = join9(this.hostdDirPath(), SELF_BUMP_MARKER_FILENAME);
+    const markerPath = join10(this.hostdDirPath(), SELF_BUMP_MARKER_FILENAME);
     const marker = {
       v: 1,
       request_id: req.request_id,
@@ -30610,8 +31265,8 @@ class HostdServer {
       prior_hostd_version: ownVersion
     };
     copyFileSync2(composePath, bakPath);
-    writeFileSync4(composePath, bumped.yaml, "utf8");
-    writeFileSync4(markerPath, encodePendingRolloutMarker(marker), {
+    writeFileSync5(composePath, bumped.yaml, "utf8");
+    writeFileSync5(markerPath, encodePendingRolloutMarker(marker), {
       mode: 384
     });
     const entry = {
@@ -30636,7 +31291,7 @@ class HostdServer {
     const rollbackBump = () => {
       try {
         copyFileSync2(bakPath, composePath);
-        unlinkSync(markerPath);
+        unlinkSync2(markerPath);
       } catch (e) {
         process.stderr.write(`hostd: self-bump rollback failed (compose/marker may need manual ` + `restore from ${bakPath}): ${e.message}
 `);
@@ -30679,7 +31334,7 @@ class HostdServer {
       rollbackBump();
       entry.result = "error";
       entry.finished_at = Date.now();
-      entry.error = `self-bump helper failed (container exit ${Number.isFinite(code) ? code : "unknown"}). ` + `See ${join9(this.hostdDirHostPath(), SELF_BUMP_LOG_FILENAME)} on the host. ` + `Compose bump rolled back. Fallback: \`switchroom hostd install ` + `--tag ${req.args.pin}\` host-side, then re-run the roll.`;
+      entry.error = `self-bump helper failed (container exit ${Number.isFinite(code) ? code : "unknown"}). ` + `See ${join10(this.hostdDirHostPath(), SELF_BUMP_LOG_FILENAME)} on the host. ` + `Compose bump rolled back. Fallback: \`switchroom hostd install ` + `--tag ${req.args.pin}\` host-side, then re-run the roll.`;
       if (this.fleetMutationInFlight && this.fleetMutationInFlight.request_id === entry.request_id) {
         this.fleetMutationInFlight = null;
       }
@@ -30703,15 +31358,15 @@ class HostdServer {
     };
   }
   async resumePendingSelfBumpRollout() {
-    const markerPath = join9(this.hostdDirPath(), SELF_BUMP_MARKER_FILENAME);
-    if (!existsSync9(markerPath))
+    const markerPath = join10(this.hostdDirPath(), SELF_BUMP_MARKER_FILENAME);
+    if (!existsSync11(markerPath))
       return;
     let raw;
     try {
-      raw = readFileSync7(markerPath, "utf8");
+      raw = readFileSync9(markerPath, "utf8");
     } finally {
       try {
-        unlinkSync(markerPath);
+        unlinkSync2(markerPath);
       } catch {}
     }
     const marker = parsePendingRolloutMarker(raw);
@@ -30748,7 +31403,7 @@ class HostdServer {
       return;
     }
     if (needsSelfBump(ownVersion, marker.pin)) {
-      await failResume(`hostd is still on v${ownVersion} after the self-bump to ` + `${marker.pin} (helper failed? see ` + `${join9(this.hostdDirHostPath(), SELF_BUMP_LOG_FILENAME)}). ` + `Fallback: \`switchroom hostd install --tag ${marker.pin}\` ` + `host-side, then re-issue the rollout.`);
+      await failResume(`hostd is still on v${ownVersion} after the self-bump to ` + `${marker.pin} (helper failed? see ` + `${join10(this.hostdDirHostPath(), SELF_BUMP_LOG_FILENAME)}). ` + `Fallback: \`switchroom hostd install --tag ${marker.pin}\` ` + `host-side, then re-issue the rollout.`);
       return;
     }
     process.stderr.write(`hostd: resuming rollout ${marker.request_id} → ${marker.pin} after ` + `self-bump (v${marker.prior_hostd_version} → v${ownVersion})
@@ -30839,18 +31494,19 @@ class HostdServer {
     if (!verdict.ok) {
       return err(verdict.code, verdict.detail).fixBadInput("unified_diff").op("config_propose_edit").caller(caller.kind === "agent" ? "agent" : "operator").agentName(caller.kind === "agent" ? caller.name : undefined).build(req.request_id, Date.now() - started);
     }
+    let beforeContent;
+    try {
+      beforeContent = readFileSync9(configPath, "utf-8");
+    } catch {
+      beforeContent = "";
+    }
     if (caller.kind === "agent" && this.opts.config.agents[caller.name]?.admin !== true) {
-      let beforeContent;
-      try {
-        beforeContent = readFileSync7(configPath, "utf-8");
-      } catch {
-        beforeContent = "";
-      }
       const admission = admitSelfScopedNonAdminEdit(beforeContent, verdict.postApplyContent, caller.name);
       if (!admission.ok) {
         return err("E_NOT_SELF_SCOPED", admission.detail).why("non-admin agents may only add rules to their own " + "agents.<self>.tools.allow OR append their own " + "agents.<self>.memory.mental_models via config_propose_edit " + `(mental-model check: ${admission.mentalModelDetail})`).fixBadInput("unified_diff").op("config_propose_edit").caller("agent").agentName(caller.name).asDenied().build(req.request_id, Date.now() - started);
       }
     }
+    const proposedChangedPaths = classifyBlastRadius(beforeContent, verdict.postApplyContent).changedPaths;
     if (!this.opts.approvalGateway) {
       return err("E_NO_APPROVAL_GATEWAY", "validation passed but hostd was started without an approval-gateway wiring; the operator build is missing the telegram-plugin link").fixOperatorAction("infra", [
         "ensure hostd was launched with --approval-gateway / telegram-plugin link"
@@ -30864,23 +31520,42 @@ class HostdServer {
 `);
       return await pending;
     }
-    const rate = this.checkConfigEditRate(callerName, Date.now());
-    if (!rate.ok) {
-      const retryAtIso = new Date(rate.retryAtMs).toISOString();
-      process.stderr.write(`hostd: config_propose_edit — RATE-LIMITED ${callerName} ` + `(>${rate.limit}/hour); next slot ${retryAtIso}
+    const run = this.runConfigProposeRateThenApply(req, caller, callerName, configPath, started, proposedChangedPaths);
+    this.inflightConfigProposals.set(dedupeKey, run);
+    try {
+      return await run;
+    } finally {
+      this.inflightConfigProposals.delete(dedupeKey);
+    }
+  }
+  async runConfigProposeRateThenApply(req, caller, callerName, configPath, started, proposedChangedPaths) {
+    let preApproved = false;
+    try {
+      if (this.opts.approvalGateway.checkPreApproved) {
+        preApproved = await this.opts.approvalGateway.checkPreApproved(callerName, req.args.unified_diff);
+      }
+    } catch {
+      preApproved = false;
+    }
+    if (!preApproved) {
+      const rate = this.checkConfigEditRate(callerName, Date.now());
+      if (!rate.ok) {
+        const retryAtIso = new Date(rate.retryAtMs).toISOString();
+        process.stderr.write(`hostd: config_propose_edit — RATE-LIMITED ${callerName} ` + `(>${rate.limit}/hour); next slot ${retryAtIso}
 `);
-      this.appendAuditRow({
-        ts: new Date().toISOString(),
-        op: "config_propose_edit",
-        phase: "rate_limited",
-        request_id: req.request_id,
-        caller: caller.kind === "agent" ? { kind: "agent", name: caller.name } : { kind: "operator" },
-        result: "denied",
-        exit_code: null,
-        duration_ms: Date.now() - started,
-        error: `E_RATE_LIMITED: >${rate.limit} config_propose_edit cards/hour`
-      });
-      return err("E_RATE_LIMITED", `config_propose_edit rate limit exceeded (max ${rate.limit}/hour for this agent)`).why(`next slot opens at ${retryAtIso}`).fixRetryAfter(retryAtIso).op("config_propose_edit").caller(caller.kind === "agent" ? "agent" : "operator").agentName(caller.kind === "agent" ? caller.name : undefined).asDenied().build(req.request_id, Date.now() - started);
+        this.appendAuditRow({
+          ts: new Date().toISOString(),
+          op: "config_propose_edit",
+          phase: "rate_limited",
+          request_id: req.request_id,
+          caller: caller.kind === "agent" ? { kind: "agent", name: caller.name } : { kind: "operator" },
+          result: "denied",
+          exit_code: null,
+          duration_ms: Date.now() - started,
+          error: `E_RATE_LIMITED: >${rate.limit} config_propose_edit cards/hour`
+        });
+        return err("E_RATE_LIMITED", `config_propose_edit rate limit exceeded (max ${rate.limit}/hour for this agent)`).why(`next slot opens at ${retryAtIso}`).fixRetryAfter(retryAtIso).op("config_propose_edit").caller(caller.kind === "agent" ? "agent" : "operator").agentName(caller.kind === "agent" ? caller.name : undefined).asDenied().build(req.request_id, Date.now() - started);
+      }
     }
     this.appendAuditRow({
       ts: new Date().toISOString(),
@@ -30890,15 +31565,10 @@ class HostdServer {
       caller: caller.kind === "agent" ? { kind: "agent", name: caller.name } : { kind: "operator" },
       result: "started",
       exit_code: null,
-      duration_ms: Date.now() - started
+      duration_ms: Date.now() - started,
+      ...preApproved ? { pre_approved: true } : {}
     });
-    const run = this.runConfigProposeApprovalAndApply(req, caller, callerName, configPath, verdict.postApplyContent, started);
-    this.inflightConfigProposals.set(dedupeKey, run);
-    try {
-      return await run;
-    } finally {
-      this.inflightConfigProposals.delete(dedupeKey);
-    }
+    return await this.runConfigProposeApprovalAndApply(req, caller, callerName, configPath, started, proposedChangedPaths);
   }
   inflightConfigProposals = new Map;
   configEditPostTimes = new Map;
@@ -30917,7 +31587,7 @@ class HostdServer {
     this.configEditPostTimes.set(callerName, prior);
     return { ok: true };
   }
-  async runConfigProposeApprovalAndApply(req, caller, callerName, configPath, postApply, started) {
+  async runConfigProposeApprovalAndApply(req, caller, callerName, configPath, started, proposedChangedPaths) {
     const approvalId = (this.opts.generateApprovalId ?? defaultApprovalId)();
     const approval = await this.opts.approvalGateway.requestApproval({
       requestId: approvalId,
@@ -30946,7 +31616,7 @@ class HostdServer {
     try {
       let snapshot;
       try {
-        snapshot = readFileSync7(configPath, "utf-8");
+        snapshot = readFileSync9(configPath, "utf-8");
       } catch (e) {
         await approval.finalize({
           outcome: "reconcile_failed_rolled_back",
@@ -30954,8 +31624,43 @@ class HostdServer {
         });
         return this.reconcileFailedRolledBack(`snapshot read failed: ${e.message}`, req, caller, started);
       }
+      const reverdict = validateConfigEdit({
+        configPath,
+        targetPath: req.args.target_path,
+        unifiedDiff: req.args.unified_diff
+      });
+      if (!reverdict.ok) {
+        const why = `stored diff no longer applies against the current config` + `: ${reverdict.detail}`;
+        await approval.finalize({
+          outcome: "aborted_config_changed",
+          detail: `config changed since proposal — re-propose (${why})`
+        });
+        return this.configChangedSinceProposal(why, req, caller, started);
+      }
+      const postApplyFresh = reverdict.postApplyContent;
+      const applyChangedPaths = classifyBlastRadius(snapshot, postApplyFresh).changedPaths;
+      const sameChangeSet = applyChangedPaths.length === proposedChangedPaths.length && applyChangedPaths.every((p, i) => p === proposedChangedPaths[i]);
+      if (!sameChangeSet) {
+        const why = `re-applied diff changes different config paths than approved ` + `(approved: [${proposedChangedPaths.join(", ")}]; ` + `would change: [${applyChangedPaths.join(", ")}])`;
+        await approval.finalize({
+          outcome: "aborted_config_changed",
+          detail: `config changed since proposal — re-propose (${why})`
+        });
+        return this.configChangedSinceProposal(why, req, caller, started);
+      }
+      if (caller.kind === "agent" && this.opts.config.agents[caller.name]?.admin !== true) {
+        const reAdmission = admitSelfScopedNonAdminEdit(snapshot, postApplyFresh, caller.name);
+        if (!reAdmission.ok) {
+          const why = `re-applied diff is no longer self-scoped for non-admin caller ` + `"${caller.name}": ${reAdmission.detail}`;
+          await approval.finalize({
+            outcome: "aborted_config_changed",
+            detail: `config changed since proposal — re-propose (${why})`
+          });
+          return this.configChangedSinceProposal(why, req, caller, started);
+        }
+      }
       try {
-        writeFileInPlacePreservingInode(configPath, postApply);
+        writeFileInPlacePreservingInode(configPath, postApplyFresh);
       } catch (e) {
         try {
           writeFileInPlacePreservingInode(configPath, snapshot);
@@ -30969,7 +31674,7 @@ class HostdServer {
       const runner = this.opts.runReconcile ?? (async () => this.runSwitchroom(caller.kind === "agent" ? ["apply", "--only", callerName, "--non-interactive"] : ["apply", "--non-interactive"]));
       const recRes = await runner({ requestId: approvalId });
       if (recRes.exit_code === 0) {
-        const blast = classifyBlastRadius(snapshot, postApply);
+        const blast = classifyBlastRadius(snapshot, postApplyFresh);
         await approval.finalize({
           outcome: "applied",
           affectedAgents: blast.agents,
@@ -31007,6 +31712,11 @@ class HostdServer {
       release();
     }
   }
+  configChangedSinceProposal(why, req, caller, started) {
+    const legacy = `E_CONFIG_CHANGED: config changed since proposal — re-propose (${why})`;
+    const built = err("E_CONFIG_CHANGED", "config changed since the proposal was validated; re-propose against the current config").why(why).fixBadInput("unified_diff").op("config_propose_edit").caller(caller.kind === "agent" ? "agent" : "operator").agentName(caller.kind === "agent" ? caller.name : undefined).asDenied().build(req.request_id, Date.now() - started);
+    return { ...built, error: legacy };
+  }
   reconcileFailedRolledBack(detail, req, caller, started, output) {
     const legacy = `E_RECONCILE_FAILED_ROLLED_BACK: ${detail}`;
     const built = err("E_RECONCILE_FAILED_ROLLED_BACK", "config write or reconcile failed; live file rolled back to snapshot").why(detail).fixOperatorAction("infra", [
@@ -31198,8 +31908,8 @@ ${output.recovery.stderr}` : "";
     if (this.opts.imageRefsForDigests)
       return this.opts.imageRefsForDigests();
     try {
-      const composePath = join9(this.opts.bindRoot ?? this.opts.homeDir, ".switchroom", "compose", "docker-compose.yml");
-      if (!existsSync9(composePath))
+      const composePath = join10(this.opts.bindRoot ?? this.opts.homeDir, ".switchroom", "compose", "docker-compose.yml");
+      if (!existsSync11(composePath))
         return [];
       const r = spawnSync3("docker", [
         "compose",
@@ -31307,6 +32017,9 @@ ${output.recovery.stderr}` : "";
         target: entry.pin ?? "",
         rolled: entry.rolled,
         terminal: entry.result === "completed" ? "completed" : "error",
+        requestId: entry.request_id,
+        ...entry.prior_pin ? { fromVersion: entry.prior_pin } : {},
+        ...entry.finished_at !== null ? { elapsedMs: entry.finished_at - entry.started_at } : {},
         ...entry.failed_step ? { failedStep: entry.failed_step } : {},
         ...entry.failed_agent ? { failedAgent: entry.failed_agent } : {},
         ...entry.got !== undefined ? { got: entry.got } : {}
@@ -31335,10 +32048,10 @@ ${output.recovery.stderr}` : "";
   }
   rolloutRowExistsInLog(targetRequestId) {
     const path2 = this.auditLogPath();
-    if (!existsSync9(path2))
+    if (!existsSync11(path2))
       return false;
     try {
-      const raw = readFileSync7(path2, "utf-8");
+      const raw = readFileSync9(path2, "utf-8");
       return latestRolloutRowForRequest(raw, targetRequestId) !== null;
     } catch {
       return false;
@@ -31346,11 +32059,11 @@ ${output.recovery.stderr}` : "";
   }
   rolloutStatusFromLog(responseRequestId, targetRequestId, started) {
     const path2 = this.auditLogPath();
-    if (!existsSync9(path2))
+    if (!existsSync11(path2))
       return null;
     let raw;
     try {
-      raw = readFileSync7(path2, "utf-8");
+      raw = readFileSync9(path2, "utf-8");
     } catch {
       return null;
     }
@@ -31429,7 +32142,7 @@ ${output.recovery.stderr}` : "";
     }
   }
   auditLogPath() {
-    return this.opts.auditLogPath ?? join9(this.opts.homeDir, ".switchroom", "host-control-audit.log");
+    return this.opts.auditLogPath ?? join10(this.opts.homeDir, ".switchroom", "host-control-audit.log");
   }
   appendAuditRow(row) {
     const path2 = this.auditLogPath();
@@ -31455,6 +32168,7 @@ ${output.recovery.stderr}` : "";
     await this.appendAuditRow({
       ts: new Date().toISOString(),
       op: args.req.op,
+      ...args.method ? { method: args.method } : {},
       caller: args.caller.kind === "agent" ? { kind: "agent", name: args.caller.name } : { kind: "operator" },
       request_id: args.req.request_id,
       result: args.resp.result,
@@ -31682,13 +32396,84 @@ function isSafeExecArgvElement(s) {
 }
 
 // src/host-control/approval-gateway.ts
-import { connect } from "node:net";
+import { connect as connect2 } from "node:net";
+import { randomBytes as randomBytes2 } from "node:crypto";
+var PRE_APPROVED_QUERY_TIMEOUT_MS = 2000;
 
 class SocketApprovalGateway {
   opts;
   constructor(opts) {
     this.opts = opts;
   }
+  async checkPreApproved(agentName, unifiedDiff) {
+    const sockPath = this.opts.resolveGatewaySocket(agentName);
+    if (sockPath === null)
+      return false;
+    const log = this.opts.log ?? (() => {});
+    const correlationId = `preapp-${randomBytes2(8).toString("hex")}`;
+    return await new Promise((resolve9) => {
+      let settled = false;
+      const client2 = connect2({ path: sockPath });
+      let buffer = "";
+      const done = (result) => {
+        if (settled)
+          return;
+        settled = true;
+        clearTimeout(timer);
+        try {
+          client2.destroy();
+        } catch {}
+        resolve9(result);
+      };
+      const timer = setTimeout(() => {
+        log(`checkPreApproved timed out after ${PRE_APPROVED_QUERY_TIMEOUT_MS}ms (agent=${agentName}) — failing closed`);
+        done(false);
+      }, PRE_APPROVED_QUERY_TIMEOUT_MS);
+      client2.on("connect", () => {
+        try {
+          client2.write(JSON.stringify({
+            type: "check_pre_approved",
+            agentName,
+            correlationId,
+            unifiedDiff
+          }) + `
+`);
+        } catch (err2) {
+          log(`check_pre_approved write failed (agent=${agentName}): ${err2.message} — failing closed`);
+          done(false);
+        }
+      });
+      client2.on("data", (chunk2) => {
+        buffer += chunk2.toString("utf8");
+        const lines = buffer.split(`
+`);
+        buffer = lines.pop() ?? "";
+        for (const line of lines) {
+          if (!line.trim())
+            continue;
+          let parsed;
+          try {
+            parsed = JSON.parse(line);
+          } catch {
+            done(false);
+            return;
+          }
+          const obj = parsed;
+          if (obj.type === "pre_approved_result" && obj.correlationId === correlationId) {
+            done(obj.preApproved === true);
+            return;
+          }
+          done(false);
+          return;
+        }
+      });
+      client2.on("error", (err2) => {
+        log(`checkPreApproved socket error (agent=${agentName}): ${err2.message} — failing closed`);
+        done(false);
+      });
+      client2.on("close", () => done(false));
+    });
+  }
   async requestApproval(req) {
     const sockPath = this.opts.resolveGatewaySocket(req.agentName);
     if (sockPath === null) {
@@ -31700,7 +32485,7 @@ class SocketApprovalGateway {
       };
     }
     return await new Promise((resolve9) => {
-      const client2 = connect({ path: sockPath });
+      const client2 = connect2({ path: sockPath });
       let buffer = "";
       let resolved = false;
       const log = this.opts.log ?? (() => {});
@@ -31804,7 +32589,7 @@ class SocketApprovalGateway {
 }
 
 // src/host-control/rollout-relay.ts
-import { connect as connect2 } from "node:net";
+import { connect as connect3 } from "node:net";
 
 class SocketRolloutRelay {
   opts;
@@ -31825,7 +32610,7 @@ class SocketRolloutRelay {
       return;
     }
     try {
-      const client2 = connect2({ path: sockPath });
+      const client2 = connect3({ path: sockPath });
       client2.setTimeout(5000);
       const done = () => {
         try {
@@ -31863,7 +32648,7 @@ class SocketRolloutRelay {
 }
 
 // src/host-control/rollout-narration-relay.ts
-import { connect as connect3 } from "node:net";
+import { connect as connect4 } from "node:net";
 var DEFAULT_POST_REPLY_TIMEOUT_MS = 5000;
 
 class SocketRolloutNarrationRelay {
@@ -31897,7 +32682,7 @@ class SocketRolloutNarrationRelay {
       };
       let client2;
       try {
-        client2 = connect3({ path: sockPath });
+        client2 = connect4({ path: sockPath });
       } catch (e) {
         log(`narration post connect threw: ${e.message}`);
         resolve9(null);
@@ -31967,7 +32752,7 @@ class SocketRolloutNarrationRelay {
     if (sockPath === null)
       return;
     try {
-      const client2 = connect3({ path: sockPath });
+      const client2 = connect4({ path: sockPath });
       client2.setTimeout(5000);
       const done = () => {
         try {
@@ -32014,6 +32799,47 @@ class LogTailRolloutNarrator {
     this.relay = relay;
     this.opts = opts;
   }
+  now() {
+    return this.opts.now?.() ?? Date.now();
+  }
+  static upsertAgent(st, name, patch) {
+    const existing = st.agents.find((a) => a.name === name);
+    if (existing)
+      Object.assign(existing, patch);
+    else
+      st.agents.push({ name, status: "pending", ...patch });
+  }
+  trackAgentProgress(st, phase) {
+    const now = this.now();
+    switch (phase.phase) {
+      case "canary-start":
+      case "agent-start":
+        if (phase.agent) {
+          LogTailRolloutNarrator.upsertAgent(st, phase.agent, {
+            status: "running",
+            startedAtMs: now,
+            ...phase.phase === "canary-start" ? { canary: true } : {}
+          });
+        }
+        break;
+      case "canary-pass":
+      case "agent-done":
+      case "canary-fail": {
+        if (!phase.agent)
+          break;
+        const a = st.agents.find((x) => x.name === phase.agent);
+        const durationMs = a?.startedAtMs !== undefined ? now - a.startedAtMs : undefined;
+        LogTailRolloutNarrator.upsertAgent(st, phase.agent, {
+          status: phase.phase === "canary-fail" ? "failed" : "done",
+          ...durationMs !== undefined ? { durationMs } : {},
+          ...phase.phase !== "agent-done" ? { canary: true } : {}
+        });
+        break;
+      }
+      default:
+        break;
+    }
+  }
   static seqFor(phase) {
     switch (phase.phase) {
       case "self-bump":
@@ -32032,6 +32858,8 @@ class LogTailRolloutNarrator {
         return 2 * (phase.n ?? 1) + 0;
       case "agent-done":
         return 2 * (phase.n ?? 1) + 1;
+      case "web-refresh":
+        return Number.MAX_SAFE_INTEGER - 2;
       case "hostd-web-deferred":
         return Number.MAX_SAFE_INTEGER - 1;
       default:
@@ -32047,6 +32875,7 @@ class LogTailRolloutNarrator {
       if (seq < st.lastAppliedSeq)
         return;
       st.lastAppliedSeq = seq;
+      this.trackAgentProgress(st, phase);
       st.render = {
         ...st.render,
         target: phase.target,
@@ -32054,7 +32883,11 @@ class LogTailRolloutNarrator {
         ...phase.n !== undefined ? { n: phase.n } : {},
         ...phase.m !== undefined ? { m: phase.m } : {},
         ...phase.agent !== undefined ? { agent: phase.agent } : {},
-        rolled: entry.rolled
+        rolled: entry.rolled,
+        agents: st.agents,
+        requestId: entry.request_id,
+        ...entry.prior_pin ? { fromVersion: entry.prior_pin } : {},
+        startedAtMs: entry.started_at
       };
       this.scheduleRenderOrPost(entry.request_id);
     } catch (e) {
@@ -32064,13 +32897,29 @@ class LogTailRolloutNarrator {
   onTerminal(entry) {
     try {
       const st = this.ensureState(entry);
+      const rolled = new Set(entry.rolled ?? []);
+      for (const a of st.agents) {
+        if (entry.failed_agent && a.name === entry.failed_agent) {
+          a.status = "failed";
+        } else if (rolled.has(a.name)) {
+          a.status = "done";
+        } else if (a.status === "running") {
+          a.status = "pending";
+        }
+      }
       st.render = {
         target: entry.pin ?? st.render.target,
         rolled: entry.rolled ?? st.render.rolled,
         terminal: entry.result === "completed" ? "completed" : "error",
         ...entry.failed_step ? { failedStep: entry.failed_step } : {},
         ...entry.failed_agent ? { failedAgent: entry.failed_agent } : {},
-        ...entry.got !== undefined ? { got: entry.got } : {}
+        ...entry.got !== undefined ? { got: entry.got } : {},
+        ...st.agents.length > 0 ? { agents: st.agents } : {},
+        ...st.render.m !== undefined ? { m: st.render.m } : {},
+        requestId: entry.request_id,
+        ...entry.prior_pin ?? st.render.fromVersion ? { fromVersion: entry.prior_pin ?? st.render.fromVersion } : {},
+        elapsedMs: (entry.finished_at ?? this.now()) - entry.started_at,
+        deferred: false
       };
       st.frozen = true;
       if (st.timer) {
@@ -32095,6 +32944,7 @@ class LogTailRolloutNarrator {
         postAttempts: 0,
         postFailed: false,
         render: { target: entry.pin ?? "" },
+        agents: [],
         frozen: false,
         timer: null,
         pendingEditAfterPost: false
@@ -32133,7 +32983,7 @@ class LogTailRolloutNarrator {
       return false;
     st.posting = true;
     st.postAttempts += 1;
-    const text = renderRolloutStatus(st.render);
+    const text = renderRolloutStatus({ ...st.render, nowMs: this.now() });
     this.relay.post({ requestId, agentName: st.agentName, text }).then((mid) => {
       st.posting = false;
       if (mid === null) {
@@ -32185,7 +33035,7 @@ class LogTailRolloutNarrator {
       this.tryPost(requestId, true);
       return;
     }
-    const text = renderRolloutStatus(st.render);
+    const text = renderRolloutStatus({ ...st.render, nowMs: this.now() });
     this.relay.edit({
       requestId,
       agentName: st.agentName,
@@ -32443,8 +33293,60 @@ function makeRestart(switchroomBin) {
 
 // src/host-control/main.ts
 import { appendFile as appendFile2 } from "node:fs/promises";
+async function loadConfigResilient() {
+  try {
+    const config = loadConfig();
+    clearStaleDegradedMarker(homedir6(), (m) => process.stderr.write(`hostd: ${m}
+`));
+    return config;
+  } catch (err2) {
+    if (!(err2 instanceof ConfigError))
+      throw err2;
+    let configPath;
+    try {
+      configPath = findConfigFile();
+    } catch {
+      configPath = undefined;
+    }
+    const agentsDir = process.env.SWITCHROOM_AGENTS_DIR ?? join11(homedir6(), ".switchroom", "agents");
+    const listGatewayCandidates = () => {
+      const out = [];
+      try {
+        for (const name of readdirSync4(agentsDir).sort()) {
+          const sock = resolve9(agentsDir, name, "telegram", "gateway.sock");
+          if (existsSync12(sock))
+            out.push({ agent: name, sock });
+        }
+      } catch {}
+      return out;
+    };
+    const log = (m) => {
+      process.stderr.write(`hostd: ${m}
+`);
+    };
+    const notify = (text) => {
+      const candidates = listGatewayCandidates();
+      if (candidates.length === 0) {
+        log("config-degraded: no gateway socket paths found; relying on marker file");
+        return;
+      }
+      postOperatorNoticeViaGateways(candidates, text, log).then((agent) => {
+        if (agent !== null)
+          log(`config-degraded: operator DM relayed via ${agent}`);
+      });
+    };
+    return waitForConfigRecovery({
+      initialError: err2,
+      homeDir: homedir6(),
+      loadFn: () => loadConfig(),
+      configPath,
+      notify,
+      log
+    });
+  }
+}
 async function main() {
-  const config = loadConfig();
+  const config = await loadConfigResilient();
   if (config.host_control?.enabled !== true) {
     process.stderr.write(`hostd: refusing to start — host_control.enabled is not true in switchroom.yaml
 `);
@@ -32459,10 +33361,10 @@ async function main() {
 `);
     process.exit(2);
   }
-  const agentsDir = process.env.SWITCHROOM_AGENTS_DIR ?? join10(homedir6(), ".switchroom", "agents");
+  const agentsDir = process.env.SWITCHROOM_AGENTS_DIR ?? join11(homedir6(), ".switchroom", "agents");
   const resolveGatewaySocket = (agentName) => {
     const sock = resolve9(agentsDir, agentName, "telegram", "gateway.sock");
-    return existsSync10(sock) ? sock : null;
+    return existsSync12(sock) ? sock : null;
   };
   const approvalGateway = new SocketApprovalGateway({
     resolveGatewaySocket,
@@ -32490,7 +33392,11 @@ async function main() {
       ])),
       ...config.hostd ? {
         hostd: {
-          ...config.hostd.config_edit_enabled !== undefined ? { config_edit_enabled: config.hostd.config_edit_enabled } : {}
+          ...config.hostd.config_edit_enabled !== undefined ? { config_edit_enabled: config.hostd.config_edit_enabled } : {},
+          ...config.hostd.operator_attest_enabled !== undefined ? { operator_attest_enabled: config.hostd.operator_attest_enabled } : {},
+          ...config.hostd.operator_attest_required_verbs !== undefined ? {
+            operator_attest_required_verbs: config.hostd.operator_attest_required_verbs
+          } : {}
         }
       } : {}
     },
@@ -32505,7 +33411,7 @@ async function main() {
   let releaseWatcher = null;
   const autoRel = config.host_control?.auto_release_check;
   if (autoRel?.enabled === true) {
-    const eventsLog = join10(homedir6(), ".switchroom", "release-watcher-events.jsonl");
+    const eventsLog = join11(homedir6(), ".switchroom", "release-watcher-events.jsonl");
     releaseWatcher = new ReleaseWatcher({
       intervalMs: autoRel.interval_minutes * 60000,
       checkFn: makeReleaseCheck({