switchroom 0.19.39 → 0.19.41

package/dist/host-control/main.js

@@ -10977,7 +10977,7 @@ var init_zod = __esm(() => {
 });
 
 // src/memory/observation-scopes.ts
-var OBSERVATION_SCOPES;
+var OBSERVATION_SCOPES, OBSERVATION_SCOPE_STRATEGIES;
 var init_observation_scopes = __esm(() => {
   OBSERVATION_SCOPES = [
     "per_tag",
@@ -10985,10 +10985,16 @@ var init_observation_scopes = __esm(() => {
     "all_combinations",
     "shared"
   ];
+  OBSERVATION_SCOPE_STRATEGIES = [
+    "curated",
+    "shared",
+    "combined",
+    "off"
+  ];
 });
 
 // src/config/schema.ts
-var CodeRepoEntrySchema, AgentBindMountSchema, HttpDiffPollSchema, PollSpecSchema, TelegramMessageActionSchema, WebhookActionSchema, ActionSpecSchema, ScheduleEntrySchema, AgentSoulSchema, AgentToolsSchema, ObservationScopesSchema, AgentMemorySchema, HookEntrySchema, AgentHooksSchema, SubagentSchema, SessionSchema, SessionContinuitySchema, webhookDispatchRule, TelegramChannelSchema, ChannelsSchema, TIMEZONE_REGEX, ApproverIdSchema, GoogleWorkspaceTierSchema, GoogleWorkspaceConfigSchema, LiteLLMConfigSchema, HindsightPerOpLlmSchema, HindsightConfigSchema, MicrosoftWorkspaceConfigSchema, NotionWorkspaceConfigSchema, AgentGoogleWorkspaceConfigSchema, MicrosoftAccountEmailSchema, MicrosoftToolTokenSchema, MicrosoftAccountBindingSchema, AgentMicrosoftWorkspaceConfigSchema, AgentNotionWorkspaceConfigSchema, ReactionsSchema, ReactionDispatchSchema, releaseBlockFields, ReleaseBlock, RootReleaseBlock, NetworkIsolationSchema, servesField, knowsField, profileFields, ProfileSchema, _omitExtends, defaultsFields, AgentDefaultsSchema, AgentSchema, TelegramConfigSchema, MemoryBackendConfigSchema, VaultConfigSchema, QuotaConfigSchema, AutoReleaseCheckSchema, HostControlConfigSchema, WebServiceConfigSchema, FleetHealthConfigSchema, HostdConfigSchema, CronEgressSchema, CronConfigSchema, UserSchema, SwitchroomConfigSchema;
+var CodeRepoEntrySchema, AgentBindMountSchema, HttpDiffPollSchema, PollSpecSchema, TelegramMessageActionSchema, WebhookActionSchema, ActionSpecSchema, ScheduleEntrySchema, AgentSoulSchema, AgentToolsSchema, ObservationScopesSchema, ObservationScopeStrategySchema, AgentMemorySchema, HookEntrySchema, AgentHooksSchema, SubagentSchema, SessionSchema, SessionContinuitySchema, webhookDispatchRule, TelegramChannelSchema, ChannelsSchema, TIMEZONE_REGEX, ApproverIdSchema, GoogleWorkspaceTierSchema, GoogleWorkspaceConfigSchema, LiteLLMConfigSchema, HindsightPerOpLlmSchema, HindsightConfigSchema, MicrosoftWorkspaceConfigSchema, NotionWorkspaceConfigSchema, AgentGoogleWorkspaceConfigSchema, MicrosoftAccountEmailSchema, MicrosoftToolTokenSchema, MicrosoftAccountBindingSchema, AgentMicrosoftWorkspaceConfigSchema, AgentNotionWorkspaceConfigSchema, ReactionsSchema, ReactionDispatchSchema, releaseBlockFields, ReleaseBlock, RootReleaseBlock, NetworkIsolationSchema, servesField, knowsField, profileFields, ProfileSchema, _omitExtends, defaultsFields, AgentDefaultsSchema, AgentSchema, TelegramConfigSchema, MemoryBackendConfigSchema, VaultConfigSchema, QuotaConfigSchema, AutoReleaseCheckSchema, HostControlConfigSchema, WebServiceConfigSchema, FleetHealthConfigSchema, HostdConfigSchema, CronEgressSchema, CronConfigSchema, UserSchema, SwitchroomConfigSchema;
 var init_schema = __esm(() => {
   init_zod();
   init_observation_scopes();
@@ -11103,7 +11109,8 @@ var init_schema = __esm(() => {
     allow: exports_external.array(exports_external.string()).default([]).describe("Allowed tools (use ['all'] for unrestricted)"),
     deny: exports_external.array(exports_external.string()).default([]).describe("Denied tools (overrides allow)")
   }).optional();
-  ObservationScopesSchema = exports_external.enum(OBSERVATION_SCOPES).optional().describe("Per-row observation scope stamped on every memory this agent " + `retains. "shared" makes Hindsight's consolidation write the ` + "resulting observations into ONE global untagged scope instead of a " + "scope per tag — what several agents pooling one bank need so their " + "observations actually merge rather than sitting in parallel " + "per-tag silos. OMITTED BY DEFAULT: unset means the field never goes " + "on the wire and the engine's own default stands, which is the " + "shipped behaviour. Applies to every retain path (Stop hook, " + "sidechain, boot reconcile, queue drain, backfill, session-handoff " + "mirror) and is carried on the queued payload, so a retain that fails " + "now and drains later still lands in this scope. Accepted values: " + `${OBSERVATION_SCOPES.join(", ")}. ` + "Cascade: override (per-agent wins over default).");
+  ObservationScopesSchema = exports_external.enum(OBSERVATION_SCOPES).optional().describe("Operator PIN for the per-row observation scope, overriding the " + 'default `curated` strategy (see docs/configuration.md). "shared" ' + "forces Hindsight's consolidation to write EVERY observation into ONE " + "global untagged scope — what several agents pooling one bank want so " + "their observations merge rather than sitting in parallel silos. " + '"combined" is the pin form of opting out (restores the pre-#4035 ' + "engine default). UNSET does NOT mean 'nothing on the wire': the " + "`curated` strategy still computes a scope per retain. Applies to " + "every retain path (Stop hook, " + "sidechain, boot reconcile, queue drain, backfill, session-handoff " + "mirror) and is carried on the queued payload, so a retain that fails " + "now and drains later still lands in this scope. Accepted values: " + `${OBSERVATION_SCOPES.join(", ")}. ` + "Cascade: override (per-agent wins over default).");
+  ObservationScopeStrategySchema = exports_external.enum(OBSERVATION_SCOPE_STRATEGIES).optional().describe("Per-retain strategy that decides how the observation scope is " + 'computed when no `observation_scopes` pin is set. "curated" ' + "(the default since #4035) strips volatile per-session provenance " + "tags from each retain's consolidation scope — keeping the stable " + "semantic ones on the source fact — so an agent's observations dedup " + "and merge across sessions instead of pocketing one-per-session. " + '"shared" sends every retain to the one global untagged scope. ' + '"combined" / "off" opt OUT: no per-row scope goes on the wire, ' + "restoring the pre-feature engine default (byte-identical to an " + "unconfigured client). OMITTED BY DEFAULT: unset leaves the plugin's " + "own default (`curated`) in force. A manual `observation_scopes` pin " + "wins over this strategy. Accepted values: " + `${OBSERVATION_SCOPE_STRATEGIES.join(", ")}. ` + "Cascade: override (per-agent wins over default).");
   AgentMemorySchema = exports_external.object({
     collection: exports_external.string().describe("Hindsight collection name for this agent"),
     auto_recall: exports_external.boolean().default(true).describe("Auto-search memories before each response"),
@@ -11139,6 +11146,7 @@ var init_schema = __esm(() => {
     }).optional().describe("Personality traits (1-5 each) steering how this bank frames recall, " + "reflect, and observation synthesis — a coach leans empathy-high, a " + "lawyer/analyst leans skepticism/literalism-high. Maps to the engine's " + "flat `disposition_skepticism`/`_literalism`/`_empathy` fields. " + "Cascade: per-key merge (an agent overrides individual traits and " + "inherits the rest, matching `recall`)."),
     directive_capture_nudge: exports_external.boolean().optional().describe("Deterministic directive-capture nudge (issue #2848 Stage B). When " + "on (switchroom default true — Stage A measured a ~55% miss rate on " + "durable corrections), the auto-recall hook regex-detects correction " + '/ standing-rule-shaped inbound ("always/never …", "from now on …", ' + `"stop doing …", a stated preference, "that's wrong, it's …") and ` + "appends a terse advisory to the turn's context telling the model to " + "persist the rule with mcp__hindsight__create_directive if it IS " + "durable. Detection is pure regex — the model does the judgment " + "in-session and calls create_directive itself (no model callsite, no " + "silent hook-side write). Set false to disable per-agent. " + "Cascade: override (per-agent wins over default)."),
     observation_scopes: ObservationScopesSchema,
+    observation_scope_strategy: ObservationScopeStrategySchema,
     recall: exports_external.object({
       max_memories: exports_external.number().int().min(0).optional().describe("Cap on the number of memories injected into the prompt by " + "auto-recall, regardless of token budget. Plugin default is 12. " + "0 disables the cap (all memories Hindsight returns are injected)."),
       cache_ttl_secs: exports_external.number().int().min(0).optional().describe("Per-session recall cache TTL in seconds. When > 0, identical " + "(prompt, bank) within the same session reuse the cached recall " + "result instead of round-tripping to Hindsight. 0 disables. " + "Default is 600 (10 min) for switchroom-managed agents."),
@@ -11539,6 +11547,7 @@ var init_schema = __esm(() => {
       isolation: exports_external.enum(["default", "strict"]).optional(),
       directive_capture_nudge: exports_external.boolean().optional(),
       observation_scopes: ObservationScopesSchema,
+      observation_scope_strategy: ObservationScopeStrategySchema,
       recall: exports_external.object({
         max_memories: exports_external.number().int().min(0).optional(),
         cache_ttl_secs: exports_external.number().int().min(0).optional(),
@@ -21001,6 +21010,7 @@ function parsePendingRolloutMarker(raw) {
   if (o.allow_downgrade !== undefined && typeof o.allow_downgrade !== "boolean") {
     return null;
   }
+  const narrationIdValid = typeof o.narration_message_id === "number" && Number.isInteger(o.narration_message_id) && o.narration_message_id > 0;
   return {
     v: 1,
     request_id: o.request_id,
@@ -21008,6 +21018,7 @@ function parsePendingRolloutMarker(raw) {
     ...o.agents !== undefined ? { agents: o.agents } : {},
     ...o.skip_web !== undefined ? { skip_web: o.skip_web } : {},
     ...o.allow_downgrade !== undefined ? { allow_downgrade: o.allow_downgrade } : {},
+    ...narrationIdValid ? { narration_message_id: o.narration_message_id } : {},
     caller: caller.kind === "agent" ? { kind: "agent", name: caller.name } : { kind: "operator" },
     created_at: o.created_at,
     prior_hostd_version: o.prior_hostd_version
@@ -21311,7 +21322,7 @@ function allocateAgentUid(name) {
 }
 
 // src/build-info.ts
-var VERSION = "0.19.39";
+var VERSION = "0.19.41";
 
 // src/setup/hindsight-recall-tunables.ts
 var RECALL_DEADLINE_HEADROOM_SECONDS = 2;
@@ -28405,6 +28416,10 @@ function parseRolloutPhaseLine(line) {
     "agent-done",
     "persist-pin",
     "web-refresh",
+    "web-refresh-done",
+    "hindsight-refresh",
+    "hindsight-refresh-done",
+    "hindsight-skipped",
     "hostd-web-deferred",
     "self-bump",
     "self-bump-done"
@@ -29385,6 +29400,14 @@ function phaseLine(s) {
       return "persisting pin";
     case "web-refresh":
       return "refreshing web dashboard (webd install)";
+    case "web-refresh-done":
+      return "web dashboard refreshed";
+    case "hindsight-refresh":
+      return "refreshing hindsight (memory backend recreate)";
+    case "hindsight-refresh-done":
+      return "hindsight refreshed";
+    case "hindsight-skipped":
+      return "hindsight — no container on this host; skipped";
     case "hostd-web-deferred":
       return "hostd refresh deferred (run host-side)";
     case "self-bump":
@@ -29452,6 +29475,33 @@ function checklistLines(s, compact) {
   }
   return lines;
 }
+function singletonGlyph(status) {
+  switch (status) {
+    case "updated":
+      return "✓";
+    case "updating":
+      return "⏳";
+    case "deferred":
+      return "⧗";
+    case "skipped":
+      return "○";
+    case "failed":
+      return "✗";
+    default:
+      return "·";
+  }
+}
+function singletonLines(s) {
+  const singletons = s.singletons ?? [];
+  if (singletons.length === 0)
+    return [];
+  const lines = ["**Singletons / shared:**"];
+  for (const g of singletons) {
+    const detail = g.detail ? ` — ${g.detail}` : "";
+    lines.push(`- ${singletonGlyph(g.status)} \`${g.name}\`${detail}`);
+  }
+  return lines;
+}
 function etaLine(s) {
   if (s.m === undefined)
     return null;
@@ -29485,6 +29535,7 @@ function renderWith(s, compact) {
   const rolled = s.rolled ?? [];
   const rolledCount = rolled.length;
   const checklist = checklistLines(s, compact);
+  const singletons = singletonLines(s);
   const elapsedMs = s.elapsedMs ?? (s.startedAtMs !== undefined && s.nowMs !== undefined ? s.nowMs - s.startedAtMs : undefined);
   if (s.terminal === "completed") {
     const parts2 = [headerLine(s, "✅")];
@@ -29495,6 +29546,8 @@ function renderWith(s, compact) {
     parts2.push(summary);
     if (checklist.length > 0)
       parts2.push("", ...checklist);
+    if (singletons.length > 0)
+      parts2.push("", ...singletons);
     if (s.deferred !== false)
       parts2.push("", ...deferredLines(s.target));
     return parts2.join(`
@@ -29512,6 +29565,8 @@ function renderWith(s, compact) {
     parts2.push("", `Re-running the roll will NOT fix this — the agents are already on ` + `target. Finish the stale component(s), then \`switchroom update --check\`.`);
     if (checklist.length > 0)
       parts2.push("", ...checklist);
+    if (singletons.length > 0)
+      parts2.push("", ...singletons);
     return parts2.join(`
 `);
   }
@@ -29525,12 +29580,16 @@ function renderWith(s, compact) {
     parts2.push(summary);
     if (checklist.length > 0)
       parts2.push("", ...checklist);
+    if (singletons.length > 0)
+      parts2.push("", ...singletons);
     return parts2.join(`
 `);
   }
   const parts = [headerLine(s, "⏳"), `**Phase:** ${phaseLine(s)}`];
   if (checklist.length > 0)
     parts.push("", ...checklist);
+  if (singletons.length > 0)
+    parts.push("", ...singletons);
   const footer = [];
   if (s.m !== undefined)
     footer.push(`${rolledCount}/${s.m} rolled`);
@@ -30729,6 +30788,27 @@ class HostdServer {
       })
     };
   }
+  persistNarrationMessageId(requestId, messageId) {
+    try {
+      if (!Number.isInteger(messageId) || messageId <= 0)
+        return;
+      const markerPath = join13(this.hostdDirPath(), SELF_BUMP_MARKER_FILENAME);
+      if (!existsSync15(markerPath))
+        return;
+      const marker = parsePendingRolloutMarker(readFileSync11(markerPath, "utf8"));
+      if (!marker)
+        return;
+      if (marker.request_id !== requestId)
+        return;
+      const updated = {
+        ...marker,
+        narration_message_id: messageId
+      };
+      const tmp = `${markerPath}.tmp`;
+      writeFileSync6(tmp, encodePendingRolloutMarker(updated), { mode: 384 });
+      renameSync5(tmp, markerPath);
+    } catch {}
+  }
   async resumePendingSelfBumpRollout() {
     const markerPath = join13(this.hostdDirPath(), SELF_BUMP_MARKER_FILENAME);
     if (!existsSync15(markerPath))
@@ -30797,6 +30877,9 @@ class HostdServer {
       ...marker.skip_web ? { skip_web: true } : {},
       ...marker.allow_downgrade ? { allow_downgrade: true } : {}
     }, marker.request_id, caller, Date.now());
+    if (marker.narration_message_id !== undefined && caller.kind === "agent") {
+      this.rolloutNarrator?.seedPostedMessage?.(marker.request_id, caller.name, marker.narration_message_id);
+    }
     this.onRolloutPhase(entry, { phase: "self-bump-done", target: marker.pin });
   }
   async handleAgentStart(req, started) {
@@ -31446,6 +31529,8 @@ ${pinNote}`.trim();
     const drifted = entry.drifted ?? [];
     const notes = entry.failed_step === "verify-components" ? [
       `Unattended auto-update roll to ${entry.pin ?? "?"} rolled ` + `${(entry.rolled ?? []).length} agent(s) but did NOT converge the ` + `whole host: ${drifted.join(", ") || "one or more components"} ` + `still behind. Re-running the roll will not fix this — run the ` + `per-component install named in the rollout warnings, then ` + `\`switchroom update --check\` to confirm.`
+    ] : entry.failed_step === "ensure-banks" ? [
+      `Unattended auto-update roll to ${entry.pin ?? "?"} rolled ` + `${(entry.rolled ?? []).length} agent(s) but could NOT create the ` + `Hindsight bank for: ${drifted.join(", ") || "one or more agents"}. ` + `Re-running the roll will not fix this — restart the named agent(s) ` + `to re-run bank creation now that Hindsight is back up.`
     ] : [
       `Unattended auto-update roll to ${entry.pin ?? "?"} FAILED at ` + `${entry.failed_step ?? "unknown step"}` + `${entry.failed_agent ? ` (agent ${entry.failed_agent})` : ""}. ` + `Unattended retries of this version are disabled; fix the cause, ` + `then roll manually (\`switchroom rollout --pin ${entry.pin ?? "vX.Y.Z"}\`).`
     ];
@@ -31473,6 +31558,10 @@ ${pinNote}`.trim();
       notes.push(`No automatic rollback: the agent fleet reached ` + `${entry.pin ?? "the target"} and the pin is committed — the gap is ` + `${(entry.drifted ?? []).join(", ") || "a component"}, not the fleet. ` + `Rolling back would move working agents backwards; converge the ` + `named component(s) forward instead.`);
       return notes;
     }
+    if (entry.failed_step === "ensure-banks") {
+      notes.push(`No automatic rollback: the agent fleet reached ` + `${entry.pin ?? "the target"} and the pin is committed — the gap is a ` + `missing Hindsight bank for ${(entry.drifted ?? []).join(", ") || "an agent"}, ` + `not the fleet. Restart the named agent(s) to re-create the bank; do ` + `not roll back.`);
+      return notes;
+    }
     const beforeAnyAgent = entry.failed_step === "apply" || entry.failed_step === "restart-agent" && rolledCount === 0;
     if (!beforeAnyAgent) {
       notes.push(rolledCount > 0 ? `No automatic rollback: ${rolledCount} agent(s) already confirmed on ` + `${entry.pin ?? "the target"} past a green canary ` + `(${(entry.rolled ?? []).join(", ")}). The fleet is mixed — ` + `finish the roll or roll back manually.` : `No automatic rollback: the roll stopped at ` + `${entry.failed_step ?? "an unknown step"} before any change ` + `landed — nothing to revert. Verify host-side if unsure.`);
@@ -32314,6 +32403,26 @@ class SocketRolloutNarrationRelay {
 }
 
 // src/host-control/rollout-narrator.ts
+var SINGLETON_WEB = "switchroom-web";
+var SINGLETON_HINDSIGHT = "hindsight";
+var SINGLETON_HOSTD = "hostd";
+var SINGLETON_SHARED = "shared services (approval-kernel · auth-broker · vault-broker · voice)";
+function initialSingletons() {
+  return [
+    { name: SINGLETON_WEB, status: "pending" },
+    { name: SINGLETON_HINDSIGHT, status: "pending" },
+    {
+      name: SINGLETON_HOSTD,
+      status: "deferred",
+      detail: "host-side (agent-invoked roll cannot recreate its own hostd)"
+    },
+    {
+      name: SINGLETON_SHARED,
+      status: "pending",
+      detail: "self-heal with the first agent restart"
+    }
+  ];
+}
 var DEFAULT_DEBOUNCE_MS = 1500;
 var MAX_POST_ATTEMPTS = 2;
 
@@ -32366,6 +32475,68 @@ class LogTailRolloutNarrator {
         break;
     }
   }
+  static patchSingleton(st, name, patch) {
+    const row = st.singletons.find((g) => g.name === name);
+    if (row)
+      Object.assign(row, patch);
+  }
+  trackSingletonProgress(st, phase) {
+    const patch = LogTailRolloutNarrator.patchSingleton;
+    switch (phase.phase) {
+      case "canary-pass":
+      case "agent-done": {
+        const shared = st.singletons.find((g) => g.name === SINGLETON_SHARED);
+        if (shared && shared.status === "pending") {
+          shared.status = "updating";
+          shared.detail = "recreated with the first agent restart — verified at roll end";
+        }
+        break;
+      }
+      case "web-refresh":
+        patch(st, SINGLETON_WEB, { status: "updating", detail: "webd install…" });
+        break;
+      case "web-refresh-done":
+        patch(st, SINGLETON_WEB, { status: "updated", detail: undefined });
+        break;
+      case "hindsight-refresh":
+        patch(st, SINGLETON_HINDSIGHT, {
+          status: "updating",
+          detail: "memory setup --recreate…"
+        });
+        break;
+      case "hindsight-refresh-done":
+        patch(st, SINGLETON_HINDSIGHT, { status: "updated", detail: undefined });
+        break;
+      case "hindsight-skipped":
+        patch(st, SINGLETON_HINDSIGHT, {
+          status: "skipped",
+          detail: "no hindsight container on this host"
+        });
+        break;
+      case "self-bump":
+        patch(st, SINGLETON_HOSTD, {
+          status: "updating",
+          detail: "self-bump to the target…"
+        });
+        break;
+      case "self-bump-done":
+        patch(st, SINGLETON_HOSTD, {
+          status: "updated",
+          detail: "self-bump; template regen stays host-side"
+        });
+        break;
+      case "hostd-web-deferred": {
+        const hostd = st.singletons.find((g) => g.name === SINGLETON_HOSTD);
+        if (hostd && hostd.status !== "updated") {
+          hostd.status = "deferred";
+          hostd.detail = "host-side";
+        }
+        break;
+      }
+      default:
+        break;
+    }
+  }
   static seqFor(phase) {
     switch (phase.phase) {
       case "self-bump":
@@ -32385,7 +32556,12 @@ class LogTailRolloutNarrator {
       case "agent-done":
         return 2 * (phase.n ?? 1) + 1;
       case "web-refresh":
-        return Number.MAX_SAFE_INTEGER - 2;
+      case "web-refresh-done":
+        return Number.MAX_SAFE_INTEGER - 4;
+      case "hindsight-refresh":
+      case "hindsight-refresh-done":
+      case "hindsight-skipped":
+        return Number.MAX_SAFE_INTEGER - 3;
       case "hostd-web-deferred":
         return Number.MAX_SAFE_INTEGER - 1;
       default:
@@ -32402,6 +32578,7 @@ class LogTailRolloutNarrator {
         return;
       st.lastAppliedSeq = seq;
       this.trackAgentProgress(st, phase);
+      this.trackSingletonProgress(st, phase);
       const doneNames = st.agents.filter((a) => a.status === "done").map((a) => a.name);
       const rolledSoFar = entry.rolled && entry.rolled.length > 0 ? entry.rolled : doneNames;
       st.render = {
@@ -32413,6 +32590,7 @@ class LogTailRolloutNarrator {
         ...phase.agent !== undefined ? { agent: phase.agent } : {},
         rolled: rolledSoFar,
         agents: st.agents,
+        singletons: st.singletons,
         requestId: entry.request_id,
         ...entry.prior_pin ? { fromVersion: entry.prior_pin } : {},
         startedAtMs: entry.started_at
@@ -32435,6 +32613,7 @@ class LogTailRolloutNarrator {
           a.status = "pending";
         }
       }
+      this.reconcileSingletonsAtTerminal(st, entry);
       st.render = {
         target: entry.pin ?? st.render.target,
         rolled: entry.rolled ?? st.render.rolled,
@@ -32444,6 +32623,7 @@ class LogTailRolloutNarrator {
         ...entry.got !== undefined ? { got: entry.got } : {},
         ...entry.drifted && entry.drifted.length > 0 ? { drifted: entry.drifted } : {},
         ...st.agents.length > 0 ? { agents: st.agents } : {},
+        ...st.singletons.length > 0 ? { singletons: st.singletons } : {},
         ...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 } : {},
@@ -32461,27 +32641,106 @@ class LogTailRolloutNarrator {
       this.opts.log?.(`onTerminal threw (non-fatal): ${e.message}`);
     }
   }
+  reconcileSingletonsAtTerminal(st, entry) {
+    const completed = entry.result === "completed";
+    const drifted = new Set(entry.drifted ?? []);
+    const driftedHits = (row) => {
+      switch (row) {
+        case SINGLETON_WEB:
+          return [...drifted].filter((d) => d === "switchroom-web");
+        case SINGLETON_HINDSIGHT:
+          return [...drifted].filter((d) => d === "switchroom-hindsight");
+        case SINGLETON_HOSTD:
+          return [...drifted].filter((d) => d === "switchroom-hostd" || d === "switchroom-hindsight-autoheal");
+        case SINGLETON_SHARED:
+          return [...drifted].filter((d) => d.includes("broker") || d.includes("kernel") || d.includes("voice"));
+        default:
+          return [];
+      }
+    };
+    for (const g of st.singletons) {
+      const hits = driftedHits(g.name);
+      if (hits.length > 0) {
+        g.status = "failed";
+        g.detail = `still behind (${hits.join(", ")}) — see the roll's warnings`;
+        continue;
+      }
+      if (entry.failed_step === "refresh-hindsight" && g.name === SINGLETON_HINDSIGHT) {
+        g.status = "failed";
+        g.detail = "recreate FAILED — memory backend down; run `switchroom memory setup`";
+        continue;
+      }
+      if (!completed) {
+        if (g.status === "updating" && g.name !== SINGLETON_SHARED) {
+          g.detail = "outcome unknown — the roll stopped; see warnings";
+        }
+        continue;
+      }
+      switch (g.name) {
+        case SINGLETON_WEB:
+        case SINGLETON_HINDSIGHT:
+          if (g.status === "updated")
+            break;
+          if (g.status === "updating") {
+            g.status = "updated";
+            g.detail = "verified by the end-of-roll component check";
+          } else if (g.status === "pending") {
+            g.status = "skipped";
+            g.detail = "no refresh observed in this roll — see warnings";
+          }
+          break;
+        case SINGLETON_SHARED:
+          g.status = "updated";
+          g.detail = "self-healed with the first agent restart; end-of-roll check passed";
+          break;
+        default:
+          break;
+      }
+    }
+  }
+  freshState(agentName, target) {
+    return {
+      agentName,
+      lastAppliedSeq: -1,
+      messageId: null,
+      posting: false,
+      postAttempts: 0,
+      postFailed: false,
+      render: { target },
+      agents: [],
+      singletons: initialSingletons(),
+      frozen: false,
+      timer: null,
+      pendingEditAfterPost: false
+    };
+  }
   ensureState(entry) {
     let st = this.states.get(entry.request_id);
     if (!st) {
       const agentName = entry.caller.kind === "agent" ? entry.caller.name : "";
-      st = {
-        agentName,
-        lastAppliedSeq: -1,
-        messageId: null,
-        posting: false,
-        postAttempts: 0,
-        postFailed: false,
-        render: { target: entry.pin ?? "" },
-        agents: [],
-        frozen: false,
-        timer: null,
-        pendingEditAfterPost: false
-      };
+      st = this.freshState(agentName, entry.pin ?? "");
       this.states.set(entry.request_id, st);
     }
     return st;
   }
+  seedPostedMessage(requestId, agentName, messageId) {
+    const existing = this.states.get(requestId);
+    if (existing) {
+      if (existing.messageId === null) {
+        existing.messageId = messageId;
+        existing.posting = false;
+        existing.postFailed = false;
+        if (existing.postAttempts < 1)
+          existing.postAttempts = 1;
+        existing.pendingEditAfterPost = false;
+      }
+      return;
+    }
+    const st = this.freshState(agentName, "");
+    st.messageId = messageId;
+    st.postAttempts = 1;
+    this.states.set(requestId, st);
+  }
   scheduleRenderOrPost(requestId) {
     const st = this.states.get(requestId);
     if (!st)
@@ -32522,6 +32781,11 @@ class LogTailRolloutNarrator {
       }
       st.messageId = mid;
       st.postFailed = false;
+      try {
+        this.opts.onMessageId?.(requestId, mid);
+      } catch (e) {
+        this.opts.log?.(`onMessageId sink threw (non-fatal): ${e.message}`);
+      }
       if (st.pendingEditAfterPost) {
         st.pendingEditAfterPost = false;
         this.flush(requestId, false);
@@ -33166,8 +33430,11 @@ async function main() {
     resolveGatewaySocket,
     log: (m) => process.stderr.write(`hostd: rollout-narration — ${m}
 `)
-  }), { log: (m) => process.stderr.write(`hostd: rollout-narration — ${m}
-`) });
+  }), {
+    log: (m) => process.stderr.write(`hostd: rollout-narration — ${m}
+`),
+    onMessageId: (rid, mid) => server?.persistNarrationMessageId(rid, mid)
+  });
   const server = new HostdServer({
     homeDir: homedir8(),
     agentUids,

package/dist/vault/approvals/kernel-server.js

@@ -4417,7 +4417,7 @@ var init_protocol = __esm(() => {
 });
 
 // src/memory/observation-scopes.ts
-var OBSERVATION_SCOPES;
+var OBSERVATION_SCOPES, OBSERVATION_SCOPE_STRATEGIES;
 var init_observation_scopes = __esm(() => {
   OBSERVATION_SCOPES = [
     "per_tag",
@@ -4425,10 +4425,16 @@ var init_observation_scopes = __esm(() => {
     "all_combinations",
     "shared"
   ];
+  OBSERVATION_SCOPE_STRATEGIES = [
+    "curated",
+    "shared",
+    "combined",
+    "off"
+  ];
 });
 
 // src/config/schema.ts
-var CodeRepoEntrySchema, AgentBindMountSchema, HttpDiffPollSchema, PollSpecSchema, TelegramMessageActionSchema, WebhookActionSchema, ActionSpecSchema, ScheduleEntrySchema, AgentSoulSchema, AgentToolsSchema, ObservationScopesSchema, AgentMemorySchema, HookEntrySchema, AgentHooksSchema, SubagentSchema, SessionSchema, SessionContinuitySchema, webhookDispatchRule, TelegramChannelSchema, ChannelsSchema, TIMEZONE_REGEX, ApproverIdSchema, GoogleWorkspaceTierSchema, GoogleWorkspaceConfigSchema, LiteLLMConfigSchema, HindsightPerOpLlmSchema, HindsightConfigSchema, MicrosoftWorkspaceConfigSchema, NotionWorkspaceConfigSchema, AgentGoogleWorkspaceConfigSchema, MicrosoftAccountEmailSchema, MicrosoftToolTokenSchema, MicrosoftAccountBindingSchema, AgentMicrosoftWorkspaceConfigSchema, AgentNotionWorkspaceConfigSchema, ReactionsSchema, ReactionDispatchSchema, releaseBlockFields, ReleaseBlock, RootReleaseBlock, NetworkIsolationSchema, servesField, knowsField, profileFields, ProfileSchema, _omitExtends, defaultsFields, AgentDefaultsSchema, AgentSchema, TelegramConfigSchema, MemoryBackendConfigSchema, VaultConfigSchema, QuotaConfigSchema, AutoReleaseCheckSchema, HostControlConfigSchema, WebServiceConfigSchema, FleetHealthConfigSchema, HostdConfigSchema, CronEgressSchema, CronConfigSchema, UserSchema, SwitchroomConfigSchema;
+var CodeRepoEntrySchema, AgentBindMountSchema, HttpDiffPollSchema, PollSpecSchema, TelegramMessageActionSchema, WebhookActionSchema, ActionSpecSchema, ScheduleEntrySchema, AgentSoulSchema, AgentToolsSchema, ObservationScopesSchema, ObservationScopeStrategySchema, AgentMemorySchema, HookEntrySchema, AgentHooksSchema, SubagentSchema, SessionSchema, SessionContinuitySchema, webhookDispatchRule, TelegramChannelSchema, ChannelsSchema, TIMEZONE_REGEX, ApproverIdSchema, GoogleWorkspaceTierSchema, GoogleWorkspaceConfigSchema, LiteLLMConfigSchema, HindsightPerOpLlmSchema, HindsightConfigSchema, MicrosoftWorkspaceConfigSchema, NotionWorkspaceConfigSchema, AgentGoogleWorkspaceConfigSchema, MicrosoftAccountEmailSchema, MicrosoftToolTokenSchema, MicrosoftAccountBindingSchema, AgentMicrosoftWorkspaceConfigSchema, AgentNotionWorkspaceConfigSchema, ReactionsSchema, ReactionDispatchSchema, releaseBlockFields, ReleaseBlock, RootReleaseBlock, NetworkIsolationSchema, servesField, knowsField, profileFields, ProfileSchema, _omitExtends, defaultsFields, AgentDefaultsSchema, AgentSchema, TelegramConfigSchema, MemoryBackendConfigSchema, VaultConfigSchema, QuotaConfigSchema, AutoReleaseCheckSchema, HostControlConfigSchema, WebServiceConfigSchema, FleetHealthConfigSchema, HostdConfigSchema, CronEgressSchema, CronConfigSchema, UserSchema, SwitchroomConfigSchema;
 var init_schema = __esm(() => {
   init_zod();
   init_observation_scopes();
@@ -4543,7 +4549,8 @@ var init_schema = __esm(() => {
     allow: exports_external.array(exports_external.string()).default([]).describe("Allowed tools (use ['all'] for unrestricted)"),
     deny: exports_external.array(exports_external.string()).default([]).describe("Denied tools (overrides allow)")
   }).optional();
-  ObservationScopesSchema = exports_external.enum(OBSERVATION_SCOPES).optional().describe("Per-row observation scope stamped on every memory this agent " + `retains. "shared" makes Hindsight's consolidation write the ` + "resulting observations into ONE global untagged scope instead of a " + "scope per tag — what several agents pooling one bank need so their " + "observations actually merge rather than sitting in parallel " + "per-tag silos. OMITTED BY DEFAULT: unset means the field never goes " + "on the wire and the engine's own default stands, which is the " + "shipped behaviour. Applies to every retain path (Stop hook, " + "sidechain, boot reconcile, queue drain, backfill, session-handoff " + "mirror) and is carried on the queued payload, so a retain that fails " + "now and drains later still lands in this scope. Accepted values: " + `${OBSERVATION_SCOPES.join(", ")}. ` + "Cascade: override (per-agent wins over default).");
+  ObservationScopesSchema = exports_external.enum(OBSERVATION_SCOPES).optional().describe("Operator PIN for the per-row observation scope, overriding the " + 'default `curated` strategy (see docs/configuration.md). "shared" ' + "forces Hindsight's consolidation to write EVERY observation into ONE " + "global untagged scope — what several agents pooling one bank want so " + "their observations merge rather than sitting in parallel silos. " + '"combined" is the pin form of opting out (restores the pre-#4035 ' + "engine default). UNSET does NOT mean 'nothing on the wire': the " + "`curated` strategy still computes a scope per retain. Applies to " + "every retain path (Stop hook, " + "sidechain, boot reconcile, queue drain, backfill, session-handoff " + "mirror) and is carried on the queued payload, so a retain that fails " + "now and drains later still lands in this scope. Accepted values: " + `${OBSERVATION_SCOPES.join(", ")}. ` + "Cascade: override (per-agent wins over default).");
+  ObservationScopeStrategySchema = exports_external.enum(OBSERVATION_SCOPE_STRATEGIES).optional().describe("Per-retain strategy that decides how the observation scope is " + 'computed when no `observation_scopes` pin is set. "curated" ' + "(the default since #4035) strips volatile per-session provenance " + "tags from each retain's consolidation scope — keeping the stable " + "semantic ones on the source fact — so an agent's observations dedup " + "and merge across sessions instead of pocketing one-per-session. " + '"shared" sends every retain to the one global untagged scope. ' + '"combined" / "off" opt OUT: no per-row scope goes on the wire, ' + "restoring the pre-feature engine default (byte-identical to an " + "unconfigured client). OMITTED BY DEFAULT: unset leaves the plugin's " + "own default (`curated`) in force. A manual `observation_scopes` pin " + "wins over this strategy. Accepted values: " + `${OBSERVATION_SCOPE_STRATEGIES.join(", ")}. ` + "Cascade: override (per-agent wins over default).");
   AgentMemorySchema = exports_external.object({
     collection: exports_external.string().describe("Hindsight collection name for this agent"),
     auto_recall: exports_external.boolean().default(true).describe("Auto-search memories before each response"),
@@ -4579,6 +4586,7 @@ var init_schema = __esm(() => {
     }).optional().describe("Personality traits (1-5 each) steering how this bank frames recall, " + "reflect, and observation synthesis — a coach leans empathy-high, a " + "lawyer/analyst leans skepticism/literalism-high. Maps to the engine's " + "flat `disposition_skepticism`/`_literalism`/`_empathy` fields. " + "Cascade: per-key merge (an agent overrides individual traits and " + "inherits the rest, matching `recall`)."),
     directive_capture_nudge: exports_external.boolean().optional().describe("Deterministic directive-capture nudge (issue #2848 Stage B). When " + "on (switchroom default true — Stage A measured a ~55% miss rate on " + "durable corrections), the auto-recall hook regex-detects correction " + '/ standing-rule-shaped inbound ("always/never …", "from now on …", ' + `"stop doing …", a stated preference, "that's wrong, it's …") and ` + "appends a terse advisory to the turn's context telling the model to " + "persist the rule with mcp__hindsight__create_directive if it IS " + "durable. Detection is pure regex — the model does the judgment " + "in-session and calls create_directive itself (no model callsite, no " + "silent hook-side write). Set false to disable per-agent. " + "Cascade: override (per-agent wins over default)."),
     observation_scopes: ObservationScopesSchema,
+    observation_scope_strategy: ObservationScopeStrategySchema,
     recall: exports_external.object({
       max_memories: exports_external.number().int().min(0).optional().describe("Cap on the number of memories injected into the prompt by " + "auto-recall, regardless of token budget. Plugin default is 12. " + "0 disables the cap (all memories Hindsight returns are injected)."),
       cache_ttl_secs: exports_external.number().int().min(0).optional().describe("Per-session recall cache TTL in seconds. When > 0, identical " + "(prompt, bank) within the same session reuse the cached recall " + "result instead of round-tripping to Hindsight. 0 disables. " + "Default is 600 (10 min) for switchroom-managed agents."),
@@ -4979,6 +4987,7 @@ var init_schema = __esm(() => {
       isolation: exports_external.enum(["default", "strict"]).optional(),
       directive_capture_nudge: exports_external.boolean().optional(),
       observation_scopes: ObservationScopesSchema,
+      observation_scope_strategy: ObservationScopeStrategySchema,
       recall: exports_external.object({
         max_memories: exports_external.number().int().min(0).optional(),
         cache_ttl_secs: exports_external.number().int().min(0).optional(),