From 06e8be9098f099ff9036cfbe637390d5ac982809 Mon Sep 17 00:00:00 2001
From: Wes <wesbillman@users.noreply.github.com>
Date: Thu, 20 Aug 2026 17:13:47 -0600
Subject: [PATCH 01/38] fix(desktop): make reconnect repair lossless (#6415)

## Summary

- repair exact-channel reconnect gaps from a source-coupled 1,865-second
floor (`900` seconds of relay future tolerance + `960` seconds of DB
created-at floor + `5` seconds of fence margin)
- page the existing authenticated `POST /query` bridge losslessly with
`(until, before_id)`, including dense timestamp boundaries and an
unbounded first page that does not trust the renderer clock
- keep the restored live REQ unchanged while deduplicating live/repair
overlap until both live EOSE and repair completion for the active
connection generation

## Scope and behavior

The wider repair applies only to live subscriptions containing the exact
channel-event kind set and one `#h`. Profile, read-state, global,
channel-less, and other subscription behavior is unchanged. Failed or
stale repairs retain their pinned lower bound for the next reconnect.

This intersects the replay path described in #3215, but does not claim
to fix that issue. Desktop already has a bounded notification-side
event-ID guard; this PR adds transport dispatch dedupe for the
restored-live/repair overlap. Notification behavior should remain a
focused regression check while this wider repair window rolls out.

## Testing

- `cd desktop && pnpm typecheck`
- `cd desktop && pnpm biome check
src/shared/api/channelReconnectRepair.ts
src/shared/api/relayClientSession.ts src/shared/api/relayClientShared.ts
src/shared/api/relayClosedRecovery.ts
src/shared/api/relayReconnectReplay.ts
src/shared/api/relayReconnectReplay.test.mjs src/testing/e2eBridge.ts`
- `cd desktop && node --test
src/shared/api/relayReconnectReplay.test.mjs` (26 passed)
- `cargo test --manifest-path desktop/src-tauri/Cargo.toml
channel_reconnect_repair` (2 passed)
- pre-push hooks passed at `743283439eb6be7969e19951cbb6720c5e493a04`

---------

Signed-off-by: Wes <wesbillman@users.noreply.github.com>
Co-authored-by: Carl <32a2e2c9d428ee08902cab75d956da2c1d235a22d4766b0dd4138bf6e2e5db1d@buzz.block.builderlab.xyz>
---
 .../src/commands/channel_reconnect_repair.rs  | 119 ++++
 desktop/src-tauri/src/commands/mod.rs         |   2 +
 desktop/src-tauri/src/lib.rs                  |   1 +
 .../src/shared/api/channelReconnectRepair.ts  |  27 +
 desktop/src/shared/api/relayClientSession.ts  |  27 +-
 desktop/src/shared/api/relayClientShared.ts   |  13 +
 desktop/src/shared/api/relayClosedRecovery.ts |  52 ++
 .../shared/api/relayReconnectReplay.test.mjs  | 593 ++++++++++++++++--
 .../src/shared/api/relayReconnectReplay.ts    | 175 ++++--
 desktop/src/testing/e2eBridge.ts              |  46 ++
 10 files changed, 951 insertions(+), 104 deletions(-)
 create mode 100644 desktop/src-tauri/src/commands/channel_reconnect_repair.rs
 create mode 100644 desktop/src/shared/api/channelReconnectRepair.ts

diff --git a/desktop/src-tauri/src/commands/channel_reconnect_repair.rs b/desktop/src-tauri/src/commands/channel_reconnect_repair.rs
new file mode 100644
index 0000000000..f47258902b
--- /dev/null
+++ b/desktop/src-tauri/src/commands/channel_reconnect_repair.rs
@@ -0,0 +1,119 @@
+use tauri::State;
+
+use crate::{app_state::AppState, relay::query_relay};
+
+const MAX_REPAIR_PAGE_LIMIT: u32 = 500;
+const CHANNEL_REPAIR_KINDS: [u32; 15] = [
+    5, 7, 9, 9005, 40001, 40002, 40003, 40008, 40099, 45001, 45003, 48100, 48101, 48102, 48103,
+];
+
+fn build_channel_reconnect_repair_filter(
+    channel_id: &str,
+    since: u64,
+    limit: u32,
+    until: Option<u64>,
+    before_id: Option<&str>,
+) -> Result<serde_json::Value, String> {
+    uuid::Uuid::parse_str(channel_id).map_err(|_| "invalid channel id".to_string())?;
+    if limit == 0 || limit > MAX_REPAIR_PAGE_LIMIT {
+        return Err(format!(
+            "limit must be between 1 and {MAX_REPAIR_PAGE_LIMIT}"
+        ));
+    }
+    if before_id.is_some() && until.is_none() {
+        return Err("before_id requires until".to_string());
+    }
+    if let Some(event_id) = before_id {
+        if event_id.len() != 64 || !event_id.bytes().all(|byte| byte.is_ascii_hexdigit()) {
+            return Err("before_id must be a 64-character hex event id".to_string());
+        }
+    }
+
+    let mut filter = serde_json::Map::new();
+    filter.insert("#h".to_string(), serde_json::json!([channel_id]));
+    filter.insert("kinds".to_string(), serde_json::json!(CHANNEL_REPAIR_KINDS));
+    filter.insert("since".to_string(), serde_json::json!(since));
+    filter.insert("limit".to_string(), serde_json::json!(limit));
+    if let Some(value) = until {
+        filter.insert("until".to_string(), serde_json::json!(value));
+    }
+    if let Some(value) = before_id {
+        filter.insert("before_id".to_string(), serde_json::json!(value));
+    }
+    Ok(serde_json::Value::Object(filter))
+}
+
+/// Fetch one lossless keyset page for reconnect repair using a fixed channel-event filter.
+#[tauri::command]
+pub async fn get_channel_reconnect_repair(
+    channel_id: String,
+    since: u64,
+    limit: u32,
+    until: Option<u64>,
+    before_id: Option<String>,
+    state: State<'_, AppState>,
+) -> Result<Vec<serde_json::Value>, String> {
+    let filter = build_channel_reconnect_repair_filter(
+        &channel_id,
+        since,
+        limit,
+        until,
+        before_id.as_deref(),
+    )?;
+    Ok(query_relay(&state, &[filter])
+        .await?
+        .iter()
+        .filter_map(|event| serde_json::to_value(event).ok())
+        .collect())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn repair_filter_is_fixed_and_keyset_scoped() {
+        let id = "ab".repeat(32);
+        let filter = build_channel_reconnect_repair_filter(
+            "270f6caf-0feb-4055-93f3-cdbeb567ff28",
+            100,
+            500,
+            Some(200),
+            Some(&id),
+        )
+        .expect("valid filter");
+        assert_eq!(
+            filter["#h"],
+            serde_json::json!(["270f6caf-0feb-4055-93f3-cdbeb567ff28"])
+        );
+        assert_eq!(filter["kinds"], serde_json::json!(CHANNEL_REPAIR_KINDS));
+        assert_eq!(filter["since"], 100);
+        assert_eq!(filter["limit"], 500);
+        assert_eq!(filter["until"], 200);
+        assert_eq!(filter["before_id"], id);
+        assert!(filter.get("top_level").is_none());
+        assert!(filter.get("include_summaries").is_none());
+        assert!(filter.get("include_aux").is_none());
+    }
+
+    #[test]
+    fn repair_filter_rejects_renderer_escape_hatches() {
+        assert!(build_channel_reconnect_repair_filter("not-a-channel", 0, 1, None, None).is_err());
+        assert!(build_channel_reconnect_repair_filter(
+            "270f6caf-0feb-4055-93f3-cdbeb567ff28",
+            0,
+            0,
+            None,
+            None
+        )
+        .is_err());
+        assert!(build_channel_reconnect_repair_filter(
+            "270f6caf-0feb-4055-93f3-cdbeb567ff28",
+            0,
+            1,
+            None,
+            Some("bad")
+        )
+        .is_err());
+    }
+}
diff --git a/desktop/src-tauri/src/commands/mod.rs b/desktop/src-tauri/src/commands/mod.rs
index 85e9df0b10..7cb2d8e3b8 100644
--- a/desktop/src-tauri/src/commands/mod.rs
+++ b/desktop/src-tauri/src/commands/mod.rs
@@ -12,6 +12,7 @@ mod agent_settings;
 mod agent_update_rollback;
 mod agents;
 mod canvas;
+mod channel_reconnect_repair;
 mod channel_templates;
 mod channel_window;
 mod channels;
@@ -81,6 +82,7 @@ pub use agent_providers::*;
 pub use agent_settings::*;
 pub use agents::*;
 pub use canvas::*;
+pub use channel_reconnect_repair::*;
 pub use channel_templates::*;
 pub use channel_window::*;
 pub use channels::*;
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index f8601b66d0..c120ac1267 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -646,6 +646,7 @@ pub fn run() {
             get_forum_posts,
             get_forum_thread,
             get_thread_replies,
+            get_channel_reconnect_repair,
             get_channel_window,
             get_channel_messages_before,
             edit_message,
diff --git a/desktop/src/shared/api/channelReconnectRepair.ts b/desktop/src/shared/api/channelReconnectRepair.ts
new file mode 100644
index 0000000000..16ee65642f
--- /dev/null
+++ b/desktop/src/shared/api/channelReconnectRepair.ts
@@ -0,0 +1,27 @@
+import { invokeTauri } from "@/shared/api/tauri";
+import type { RelayEvent } from "@/shared/api/types";
+
+export type ChannelReconnectRepairRequest = {
+  channelId: string;
+  since: number;
+  limit: number;
+  until?: number;
+  beforeId?: string;
+};
+
+/** Fetch one fixed-kind, channel-scoped reconnect repair page. */
+export async function getChannelReconnectRepairEvents({
+  channelId,
+  since,
+  limit,
+  until,
+  beforeId,
+}: ChannelReconnectRepairRequest): Promise<RelayEvent[]> {
+  return invokeTauri<RelayEvent[]>("get_channel_reconnect_repair", {
+    channelId,
+    since,
+    limit,
+    until: until ?? null,
+    beforeId: beforeId ?? null,
+  });
+}
diff --git a/desktop/src/shared/api/relayClientSession.ts b/desktop/src/shared/api/relayClientSession.ts
index a18ec1448b..988013bfbc 100644
--- a/desktop/src/shared/api/relayClientSession.ts
+++ b/desktop/src/shared/api/relayClientSession.ts
@@ -20,6 +20,7 @@ import {
   type PendingEvent,
   type RelaySubscription,
   type RelaySubscriptionFilter,
+  type SubscriptionEventBufferItem,
 } from "@/shared/api/relayClientShared";
 import {
   buildChannelAuxDeletionFilter,
@@ -30,10 +31,12 @@ import {
 } from "@/shared/api/relayChannelFilters";
 import {
   clearClosedRetry,
+  flushEvents,
   handleRelayClosed,
   handleSubscriptionEose,
   prepareSubscriptionEvent,
 } from "@/shared/api/relayClosedRecovery";
+import { getChannelReconnectRepairEvents } from "@/shared/api/channelReconnectRepair";
 import { replayLiveSubscriptions } from "@/shared/api/relayReconnectReplay";
 import {
   activateRateLimit,
@@ -87,7 +90,7 @@ export class RelayClient {
   private authRequest: RelayAuthRequest | null = null;
   private subscriptions = new Map<string, RelaySubscription>();
   private pendingEvents = new Map<string, PendingEvent>();
-  private eventBuffer: Array<{ subId: string; event: RelayEvent }> = [];
+  private eventBuffer: SubscriptionEventBufferItem[] = [];
   private flushTimeout: number | null = null;
   private reconnectListeners = new Set<() => void>();
   private hasConnectedOnce = false;
@@ -789,7 +792,7 @@ export class RelayClient {
       return;
     }
     if (type === "EVENT" && typeof rest[0] === "string" && rest[1]) {
-      this.handleEvent(rest[0], rest[1] as RelayEvent);
+      this.handleEvent(rest[0], rest[1] as RelayEvent, generation);
       return;
     }
 
@@ -807,7 +810,7 @@ export class RelayClient {
     }
 
     if (type === "EOSE" && typeof rest[0] === "string") {
-      this.handleEose(rest[0]);
+      this.handleEose(rest[0], generation);
       return;
     }
 
@@ -852,7 +855,7 @@ export class RelayClient {
     await this.sendRaw(["AUTH", event]);
   }
 
-  private handleEvent(subId: string, event: RelayEvent) {
+  private handleEvent(subId: string, event: RelayEvent, generation: number) {
     const subscription = this.subscriptions.get(subId);
     if (!subscription) {
       return;
@@ -864,7 +867,7 @@ export class RelayClient {
     }
 
     if (!prepareSubscriptionEvent(subscription, event)) return;
-    this.eventBuffer.push({ subId, event });
+    this.eventBuffer.push({ subId, event, generation });
     this.flushTimeout ??= window.setTimeout(
       () => this.flushEventBuffer(),
       EVENT_BATCH_MS,
@@ -876,21 +879,16 @@ export class RelayClient {
     const buffer = this.eventBuffer;
     this.eventBuffer = [];
 
-    // Re-lookup: subscriptions removed during batch window are intentionally skipped.
-    for (const { subId, event } of buffer) {
-      const subscription = this.subscriptions.get(subId);
-      if (subscription?.mode === "live") {
-        subscription.onEvent(event);
-      }
-    }
+    flushEvents(buffer, this.subscriptions, this.connectionGeneration);
   }
 
-  private handleEose(subId: string) {
+  private handleEose(subId: string, generation: number) {
     this.flushEventBuffer(); // Deliver preceding EVENT frames before EOSE.
     handleSubscriptionEose({
       subscriptions: this.subscriptions,
       subId,
       closeSubscription: (id) => this.closeSubscription(id),
+      generation,
     });
   }
 
@@ -938,7 +936,8 @@ export class RelayClient {
       await replayLiveSubscriptions({
         subscriptions: this.subscriptions,
         sendRaw: (payload) => this.sendRaw(payload),
-        requestHistory: (filter) => this.requestHistory(filter),
+        requestRepair: getChannelReconnectRepairEvents,
+        generation,
         visibleChannelId: this.visibleChannelId,
         isActive: () => this.connectionGeneration === generation,
       });
diff --git a/desktop/src/shared/api/relayClientShared.ts b/desktop/src/shared/api/relayClientShared.ts
index 49b3fa9d85..5c602cc6de 100644
--- a/desktop/src/shared/api/relayClientShared.ts
+++ b/desktop/src/shared/api/relayClientShared.ts
@@ -73,6 +73,13 @@ type LiveSubscription = {
    * `min(pendingReplaySince, cursor window)`.
    */
   pendingReplaySince?: number;
+  /** Dispatch-level duplicate suppression shared by restored-live and repair. */
+  reconnectReplay?: {
+    generation: number;
+    seenEventIds: Set<string>;
+    liveEose: boolean;
+    repairDone: boolean;
+  };
   closedRetryAttempt?: number;
   closedRetryTimeout?: number;
 };
@@ -89,6 +96,12 @@ export type RelaySubscription =
   | FirstEventSubscription
   | LiveSubscription;
 
+export type SubscriptionEventBufferItem = {
+  subId: string;
+  event: RelayEvent;
+  generation: number;
+};
+
 export function sortEvents(events: RelayEvent[]) {
   return [...events].sort((left, right) => {
     if (left.created_at !== right.created_at) {
diff --git a/desktop/src/shared/api/relayClosedRecovery.ts b/desktop/src/shared/api/relayClosedRecovery.ts
index e1ff86e08d..a8532d9fde 100644
--- a/desktop/src/shared/api/relayClosedRecovery.ts
+++ b/desktop/src/shared/api/relayClosedRecovery.ts
@@ -8,6 +8,7 @@ import {
   sortEvents,
   type RelaySubscription,
   type RelaySubscriptionFilter,
+  type SubscriptionEventBufferItem,
 } from "@/shared/api/relayClientShared";
 import type { RelayEvent } from "@/shared/api/types";
 
@@ -145,18 +146,69 @@ export function prepareSubscriptionEvent(
   return true;
 }
 
+export function shouldDispatchSubscriptionEvent(
+  subscription: Extract<RelaySubscription, { mode: "live" }>,
+  event: RelayEvent,
+) {
+  const replay = subscription.reconnectReplay;
+  if (replay?.seenEventIds.has(event.id)) return false;
+  replay?.seenEventIds.add(event.id);
+  return true;
+}
+
+export function flushEvents(
+  buffer: SubscriptionEventBufferItem[],
+  subscriptions: Map<string, RelaySubscription>,
+  generation: number,
+) {
+  for (const item of buffer) {
+    const subscription = subscriptions.get(item.subId);
+    if (
+      subscription?.mode === "live" &&
+      item.generation === generation &&
+      shouldDispatchSubscriptionEvent(subscription, item.event)
+    ) {
+      subscription.onEvent(item.event);
+    }
+  }
+}
+
+export function markReconnectLiveEose(
+  subscription: Extract<RelaySubscription, { mode: "live" }>,
+  generation: number,
+) {
+  const replay = subscription.reconnectReplay;
+  if (!replay || replay.generation !== generation) return;
+  replay.liveEose = true;
+  if (replay.repairDone) subscription.reconnectReplay = undefined;
+}
+
+export function markReconnectRepairDone(
+  subscription: Extract<RelaySubscription, { mode: "live" }>,
+  generation: number,
+) {
+  const replay = subscription.reconnectReplay;
+  if (!replay || replay.generation !== generation) return;
+  replay.repairDone = true;
+  if (replay.liveEose) subscription.reconnectReplay = undefined;
+}
+
 export function handleSubscriptionEose({
   subscriptions,
   subId,
   closeSubscription,
+  generation,
 }: {
   subscriptions: Map<string, RelaySubscription>;
   subId: string;
   closeSubscription: (subId: string) => Promise<void>;
+  generation?: number;
 }) {
   const subscription = subscriptions.get(subId);
   if (!subscription) return;
   if (subscription.mode === "live") {
+    if (generation !== undefined)
+      markReconnectLiveEose(subscription, generation);
     subscription.resolveReady?.("eose");
     subscription.resolveReady = undefined;
     subscription.closedRetryAttempt = 0;
diff --git a/desktop/src/shared/api/relayReconnectReplay.test.mjs b/desktop/src/shared/api/relayReconnectReplay.test.mjs
index c175272885..8ecffdf04d 100644
--- a/desktop/src/shared/api/relayReconnectReplay.test.mjs
+++ b/desktop/src/shared/api/relayReconnectReplay.test.mjs
@@ -1,15 +1,27 @@
 import assert from "node:assert/strict";
+import { readFile } from "node:fs/promises";
 import test from "node:test";
 
 import {
   buildReconnectReplayFilter,
+  DB_CREATED_AT_FLOOR_SECS,
+  FENCE_CLOCK_MARGIN_SECS,
+  RELAY_INGEST_FUTURE_TOLERANCE_SECS,
+  RECONNECT_REPLAY_CHANNEL_LOOKBACK_SECS,
+  replayReconnectHistoryPages,
   PAGE_REPLAY_MAX_ATTEMPTS,
   replayLiveSubscriptions,
   REPLAY_BATCH_SIZE,
   shouldPageReconnectReplay,
 } from "./relayReconnectReplay.ts";
 import { buildChannelFilter } from "./relayChannelFilters.ts";
-import { prepareSubscriptionEvent } from "./relayClosedRecovery.ts";
+import {
+  flushEvents,
+  markReconnectLiveEose,
+  markReconnectRepairDone,
+  prepareSubscriptionEvent,
+  shouldDispatchSubscriptionEvent,
+} from "./relayClosedRecovery.ts";
 
 // ── Fake-timer + Date.now setup for gate tests ────────────────────────────────
 
@@ -77,13 +89,67 @@ function event(id, createdAt) {
 function eventRange(prefix, start, count) {
   return Array.from({ length: count }, (_, index) =>
     event(`${prefix}-${index}`, start + index),
-  );
+  ).reverse();
 }
 
 function replayFilter(filter, since, until) {
   return buildReconnectReplayFilter(filter, since, until);
 }
 
+function numericList(source, pattern) {
+  const match = source.match(pattern);
+  assert.ok(match, `expected source list to match ${pattern}`);
+  return [...match[1].matchAll(/\b\d[\d_]*\b/g)].map((value) =>
+    Number(value[0].replaceAll("_", "")),
+  );
+}
+
+test("channel replay lookback stays coupled to relay and DB source constants", async () => {
+  const [ingest, fence] = await Promise.all([
+    readFile("../crates/buzz-relay/src/handlers/ingest.rs", "utf8"),
+    readFile("../crates/buzz-db/src/replica_fence.rs", "utf8"),
+  ]);
+  assert.match(
+    ingest,
+    new RegExp(
+      `MAX_TIMESTAMP_DRIFT_SECS: i64 = ${RELAY_INGEST_FUTURE_TOLERANCE_SECS}`,
+    ),
+  );
+  assert.match(
+    fence,
+    new RegExp(`CREATED_AT_FLOOR_SECS: i64 = ${DB_CREATED_AT_FLOOR_SECS}`),
+  );
+  assert.match(
+    fence,
+    new RegExp(`FENCE_CLOCK_MARGIN_SECS: i64 = ${FENCE_CLOCK_MARGIN_SECS}`),
+  );
+  assert.equal(RECONNECT_REPLAY_CHANNEL_LOOKBACK_SECS, 1_865);
+});
+
+test("native and E2E repair kinds stay coupled to the live channel filter", async () => {
+  const [rustCommand, e2eBridge] = await Promise.all([
+    readFile("src-tauri/src/commands/channel_reconnect_repair.rs", "utf8"),
+    readFile("src/testing/e2eBridge.ts", "utf8"),
+  ]);
+  const expectedKinds = [...buildChannelFilter("channel-1", 50).kinds].sort(
+    (left, right) => left - right,
+  );
+  assert.deepEqual(
+    numericList(
+      rustCommand,
+      /const CHANNEL_REPAIR_KINDS: \[u32; \d+\] = \[([\s\S]*?)\];/,
+    ).sort((left, right) => left - right),
+    expectedKinds,
+  );
+  assert.deepEqual(
+    numericList(
+      e2eBridge,
+      /function handleGetChannelReconnectRepair[\s\S]*?const kinds = new Set\(\[([\s\S]*?)\]\);/,
+    ).sort((left, right) => left - right),
+    expectedKinds,
+  );
+});
+
 // ── buildReconnectReplayFilter ────────────────────────────────────────────────
 
 test("reconnect replay preserves small steady-state limits when adding since", () => {
@@ -208,7 +274,7 @@ test("replay sends all subs in one batch when count equals REPLAY_BATCH_SIZE", a
     sendRaw: async (payload) => {
       sentIds.push(payload[1]);
     },
-    requestHistory: async () => [],
+    requestRepair: async () => [],
     setTimeoutFn: (fn, _ms) => {
       delayCount++;
       fn();
@@ -244,7 +310,7 @@ test("replay splits subscriptions into batches of REPLAY_BATCH_SIZE", async () =
     sendRaw: async (payload) => {
       sentIds.push(payload[1]);
     },
-    requestHistory: async () => [],
+    requestRepair: async () => [],
     setTimeoutFn: (fn, _ms) => {
       delayCount++;
       batchBreakpoints.push(sentIds.length);
@@ -259,6 +325,133 @@ test("replay splits subscriptions into batches of REPLAY_BATCH_SIZE", async () =
   assert.equal(batchBreakpoints[0], REPLAY_BATCH_SIZE);
 });
 
+test("inter-batch disposal cannot resurrect a closed subscription", async () => {
+  resetGate();
+  const frames = [];
+  const secondSubscription = {
+    mode: "live",
+    filter: { kinds: [9], "#h": ["ch-2"], limit: 50 },
+    onEvent: () => {},
+    lastSeenCreatedAt: undefined,
+  };
+  const subscriptions = new Map([
+    [
+      "sub-1",
+      {
+        mode: "live",
+        filter: { kinds: [9], "#h": ["ch-1"], limit: 50 },
+        onEvent: () => {},
+        lastSeenCreatedAt: undefined,
+      },
+    ],
+    ["sub-2", secondSubscription],
+  ]);
+
+  await replayLiveSubscriptions({
+    subscriptions,
+    replayBatchSize: 1,
+    sendRaw: async (payload) => {
+      frames.push(`${payload[0]}:${payload[1]}`);
+    },
+    requestRepair: async () => [],
+    setTimeoutFn: (fn, _ms) => {
+      assert.equal(subscriptions.delete("sub-2"), true);
+      frames.push("CLOSE:sub-2");
+      fn();
+      return 0;
+    },
+  });
+
+  assert.deepEqual(frames, ["REQ:sub-1", "CLOSE:sub-2"]);
+});
+
+test("in-flight disposal is closed again after the stale REQ settles", async () => {
+  resetGate();
+  const frames = [];
+  let markReqStarted;
+  const reqStarted = new Promise((resolve) => {
+    markReqStarted = resolve;
+  });
+  let releaseReq;
+  const heldReq = new Promise((resolve) => {
+    releaseReq = resolve;
+  });
+  const subscription = {
+    mode: "live",
+    filter: { kinds: [9], "#h": ["ch-1"], limit: 50 },
+    onEvent: () => {},
+    lastSeenCreatedAt: undefined,
+  };
+  const subscriptions = new Map([["sub-1", subscription]]);
+
+  const replayPromise = replayLiveSubscriptions({
+    subscriptions,
+    sendRaw: async (payload) => {
+      frames.push(`${payload[0]}:${payload[1]}`);
+      if (payload[0] === "REQ") {
+        markReqStarted();
+        await heldReq;
+      }
+    },
+    requestRepair: async () => [],
+  });
+
+  await reqStarted;
+  assert.equal(subscriptions.delete("sub-1"), true);
+  // The ordinary disposer emits CLOSE while the websocket REQ invoke is held.
+  frames.push("CLOSE:sub-1");
+  releaseReq();
+  await replayPromise;
+
+  assert.deepEqual(frames, ["REQ:sub-1", "CLOSE:sub-1", "CLOSE:sub-1"]);
+});
+
+test("inter-batch replacement cannot be overwritten by a stale REQ", async () => {
+  resetGate();
+  const sentFilters = [];
+  const subscriptions = new Map([
+    [
+      "sub-1",
+      {
+        mode: "live",
+        filter: { kinds: [9], "#h": ["ch-1"], limit: 50 },
+        onEvent: () => {},
+        lastSeenCreatedAt: undefined,
+      },
+    ],
+    [
+      "sub-2",
+      {
+        mode: "live",
+        filter: { kinds: [9], "#h": ["ch-old"], limit: 50 },
+        onEvent: () => {},
+        lastSeenCreatedAt: undefined,
+      },
+    ],
+  ]);
+
+  await replayLiveSubscriptions({
+    subscriptions,
+    replayBatchSize: 1,
+    sendRaw: async (payload) => {
+      sentFilters.push(payload[2]);
+    },
+    requestRepair: async () => [],
+    setTimeoutFn: (fn, _ms) => {
+      subscriptions.set("sub-2", {
+        mode: "live",
+        filter: { kinds: [9], "#h": ["ch-new"], limit: 50 },
+        onEvent: () => {},
+        lastSeenCreatedAt: undefined,
+      });
+      fn();
+      return 0;
+    },
+  });
+
+  assert.deepEqual(sentFilters, [{ kinds: [9], "#h": ["ch-1"], limit: 50 }]);
+});
+
 // ── Visible-channel priority ──────────────────────────────────────────────────
 
 test("visible channel subscription is sent first", async () => {
@@ -300,7 +493,7 @@ test("visible channel subscription is sent first", async () => {
     sendRaw: async (payload) => {
       sentOrder.push(payload[1]);
     },
-    requestHistory: async () => [],
+    requestRepair: async () => [],
     visibleChannelId: "ch-visible",
   });
 
@@ -331,7 +524,7 @@ test("replay waits for rate-limit gate before sending REQs", async () => {
     sendRaw: async (payload) => {
       sentIds.push(payload[1]);
     },
-    requestHistory: async () => [],
+    requestRepair: async () => [],
     setTimeoutFn: (fn, _ms) => {
       fn();
       return 0;
@@ -370,7 +563,7 @@ test("stale replay sends no REQs when generation advances while gate was active"
     sendRaw: async (payload) => {
       sentIds.push(payload[1]);
     },
-    requestHistory: async () => [],
+    requestRepair: async () => [],
     isActive: () => generationActive,
   });
 
@@ -412,12 +605,11 @@ test("channel reconnect replay pages the missed window until a short page", asyn
 
   await replayLiveSubscriptions({
     subscriptions,
-    now: 2000,
     sendRaw: async (payload) => {
       sentPayloads.push(payload);
     },
-    requestHistory: async (filter) => {
-      historyFilters.push(filter);
+    requestRepair: async (request) => {
+      historyFilters.push(request);
       return pages.shift() ?? [];
     },
   });
@@ -435,30 +627,71 @@ test("channel reconnect replay pages the missed window until a short page", asyn
   ]);
   assert.deepEqual(historyFilters, [
     {
-      kinds: filter.kinds,
-      "#h": ["channel-1"],
+      channelId: "channel-1",
       limit: 500,
-      since: 995,
-      until: 2000,
+      since: 0,
+      until: undefined,
+      beforeId: undefined,
     },
     {
-      kinds: filter.kinds,
-      "#h": ["channel-1"],
+      channelId: "channel-1",
       limit: 500,
-      since: 995,
+      since: 0,
       until: 1501,
+      beforeId: "newest-0",
     },
     {
-      kinds: filter.kinds,
-      "#h": ["channel-1"],
+      channelId: "channel-1",
       limit: 500,
-      since: 995,
+      since: 0,
       until: 1002,
+      beforeId: "middle-0",
     },
   ]);
   assert.equal(delivered.length, 1008);
 });
 
+test("native repair preserves an explicit subscription since boundary", async () => {
+  resetGate();
+  const repairRequests = [];
+  const filter = {
+    ...buildChannelFilter("channel-1", 1000),
+    since: 10_000,
+  };
+  const subscriptions = new Map([
+    [
+      "live-1",
+      {
+        mode: "live",
+        filter,
+        onEvent: () => {},
+        // The repair lookback would otherwise cross the from-now boundary.
+        lastSeenCreatedAt: 11_000,
+      },
+    ],
+  ]);
+
+  await replayLiveSubscriptions({
+    subscriptions,
+    sendRaw: async () => {},
+    requestRepair: async (request) => {
+      repairRequests.push(request);
+      return [];
+    },
+  });
+
+  assert.equal(11_000 - RECONNECT_REPLAY_CHANNEL_LOOKBACK_SECS, 9_135);
+  assert.deepEqual(repairRequests, [
+    {
+      channelId: "channel-1",
+      limit: 500,
+      since: 10_000,
+      until: undefined,
+      beforeId: undefined,
+    },
+  ]);
+});
+
 test("reconnect replay starts live REQs in parallel and preserves per-sub page order", async () => {
   resetGate();
   const sentPayloads = [];
@@ -500,7 +733,6 @@ test("reconnect replay starts live REQs in parallel and preserves per-sub page o
 
   const replayPromise = replayLiveSubscriptions({
     subscriptions,
-    now: 2000,
     pageReplayConcurrency: 2,
     sendRaw: (payload) => {
       sentPayloads.push(payload);
@@ -508,9 +740,9 @@ test("reconnect replay starts live REQs in parallel and preserves per-sub page o
         sendResolvers.push(resolve);
       });
     },
-    requestHistory: async (filter) => {
-      const channelId = filter["#h"]?.[0];
-      historyFiltersByChannel[channelId].push(filter.until);
+    requestRepair: async (request) => {
+      const channelId = request.channelId;
+      historyFiltersByChannel[channelId].push(request.until);
       return pagesByChannel[channelId].shift() ?? [];
     },
   });
@@ -533,8 +765,8 @@ test("reconnect replay starts live REQs in parallel and preserves per-sub page o
   await replayPromise;
 
   assert.deepEqual(historyFiltersByChannel, {
-    "channel-1": [2000, 1501],
-    "channel-2": [2000, 1701],
+    "channel-1": [undefined, 1501],
+    "channel-2": [undefined, 1701],
   });
 });
 
@@ -574,7 +806,7 @@ test("batch-1 arms gate mid-replay: batch-2 is withheld until gate expires", asy
         activateRateLimit(5);
       }
     },
-    requestHistory: async () => [],
+    requestRepair: async () => [],
     setTimeoutFn: (fn, _ms) => {
       fn();
       return 0;
@@ -602,6 +834,132 @@ test("batch-1 arms gate mid-replay: batch-2 is withheld until gate expires", asy
   );
 });
 
+test("per-batch gate re-arm skips a subscription disposed while waiting", async () => {
+  resetGate(0);
+  const sentIds = [];
+  let gateArmed;
+  const gateArmedPromise = new Promise((resolve) => {
+    gateArmed = resolve;
+  });
+  const subscriptions = new Map([
+    [
+      "sub-1",
+      {
+        mode: "live",
+        filter: { kinds: [9], "#h": ["ch-1"], limit: 50 },
+        onEvent: () => {},
+        lastSeenCreatedAt: undefined,
+      },
+    ],
+    [
+      "sub-2",
+      {
+        mode: "live",
+        filter: { kinds: [9], "#h": ["ch-2"], limit: 50 },
+        onEvent: () => {},
+        lastSeenCreatedAt: undefined,
+      },
+    ],
+  ]);
+
+  const replayPromise = replayLiveSubscriptions({
+    subscriptions,
+    replayBatchSize: 1,
+    sendRaw: async (payload) => {
+      sentIds.push(payload[1]);
+      if (payload[1] === "sub-1") {
+        activateRateLimit(5);
+        gateArmed();
+      }
+    },
+    requestRepair: async () => [],
+    setTimeoutFn: (fn, _ms) => {
+      fn();
+      return 0;
+    },
+  });
+
+  await gateArmedPromise;
+  assert.equal(subscriptions.delete("sub-2"), true);
+  tickTo(5_001);
+  await replayPromise;
+
+  assert.deepEqual(sentIds, ["sub-1"]);
+});
+
+test("disposed subscription receives no repair events after an in-flight page", async () => {
+  resetGate();
+  const delivered = [];
+  const subscription = {
+    mode: "live",
+    filter: buildChannelFilter("channel-1", 50),
+    onEvent: (value) => delivered.push(value.id),
+    lastSeenCreatedAt: 1000,
+  };
+  const subscriptions = new Map([["live-1", subscription]]);
+
+  await replayLiveSubscriptions({
+    subscriptions,
+    sendRaw: async () => {},
+    requestRepair: async () => {
+      assert.equal(subscriptions.delete("live-1"), true);
+      return [event("disposed", 1001)];
+    },
+  });
+
+  assert.deepEqual(delivered, []);
+});
+
+test("stale repair cannot clear the successor generation dedupe state", async () => {
+  resetGate();
+  const duplicate = event("successor-seen", 1001);
+  const subscription = {
+    mode: "live",
+    filter: buildChannelFilter("channel-1", 50),
+    onEvent: () => {},
+    lastSeenCreatedAt: 1000,
+  };
+  const subscriptions = new Map([["live-1", subscription]]);
+  let generationActive = true;
+  let startRepair;
+  const repairStarted = new Promise((resolve) => {
+    startRepair = resolve;
+  });
+  let finishRepair;
+  const repairPage = new Promise((resolve) => {
+    finishRepair = resolve;
+  });
+
+  const replayPromise = replayLiveSubscriptions({
+    subscriptions,
+    generation: 10,
+    isActive: () => generationActive,
+    sendRaw: async () => {},
+    requestRepair: async () => {
+      startRepair();
+      return repairPage;
+    },
+  });
+
+  await repairStarted;
+  generationActive = false;
+  subscription.reconnectReplay = {
+    generation: 11,
+    seenEventIds: new Set([duplicate.id]),
+    liveEose: false,
+    repairDone: false,
+  };
+  finishRepair([duplicate]);
+  await replayPromise;
+
+  assert.equal(subscription.reconnectReplay.generation, 11);
+  assert.deepEqual(
+    [...subscription.reconnectReplay.seenEventIds],
+    [duplicate.id],
+  );
+  assert.equal(shouldDispatchSubscriptionEvent(subscription, duplicate), false);
+});
+
 // ── Backfill failure containment ─────────────────────────────────────────────
 
 test("history backfill rejection never escapes replayLiveSubscriptions", async () => {
@@ -623,9 +981,8 @@ test("history backfill rejection never escapes replayLiveSubscriptions", async (
   // Must resolve — a rejection here is the socket-killing flap regression.
   await replayLiveSubscriptions({
     subscriptions,
-    now: 2000,
     sendRaw: async () => {},
-    requestHistory: async () => {
+    requestRepair: async () => {
       historyCalls++;
       throw new Error("rate-limited: quota exceeded; retry in 4s");
     },
@@ -661,9 +1018,8 @@ test("backfill retry waits out the armed gate, then succeeds", async () => {
   });
   const replayPromise = replayLiveSubscriptions({
     subscriptions,
-    now: 2000,
     sendRaw: async () => {},
-    requestHistory: async () => {
+    requestRepair: async () => {
       attemptAtMs.push(fakeNow);
       if (attemptAtMs.length === 1) {
         // Mirror relayClosedRecovery: the CLOSED handler arms the gate
@@ -708,9 +1064,8 @@ test("backfill retry aborts when the subscription was replaced", async () => {
   let historyCalls = 0;
   await replayLiveSubscriptions({
     subscriptions,
-    now: 2000,
     sendRaw: async () => {},
-    requestHistory: async () => {
+    requestRepair: async () => {
       historyCalls++;
       // Simulate the subscription being torn down while the REQ is in flight.
       subscriptions.delete("live-1");
@@ -743,15 +1098,14 @@ test("exhausted backfill pins the floor: next replay still requests the original
   // Reconnect 1: every backfill attempt is rate-limited.
   await replayLiveSubscriptions({
     subscriptions,
-    now: 2000,
     sendRaw: async () => {},
-    requestHistory: async () => {
+    requestRepair: async () => {
       throw new Error("rate-limited: quota exceeded; retry in 4s");
     },
   });
   assert.equal(
     subscription.pendingReplaySince,
-    995,
+    0,
     "exhausted backfill must pin the unresolved window's lower bound",
   );
 
@@ -763,10 +1117,9 @@ test("exhausted backfill pins the floor: next replay still requests the original
   const historyFilters = [];
   await replayLiveSubscriptions({
     subscriptions,
-    now: 2200,
     sendRaw: async () => {},
-    requestHistory: async (filter) => {
-      historyFilters.push(filter);
+    requestRepair: async (request) => {
+      historyFilters.push(request);
       return [];
     },
   });
@@ -774,7 +1127,7 @@ test("exhausted backfill pins the floor: next replay still requests the original
   assert.equal(historyFilters.length, 1);
   assert.equal(
     historyFilters[0].since,
-    995,
+    0,
     "replay must start from the pinned floor, not the advanced cursor",
   );
   assert.equal(
@@ -787,16 +1140,15 @@ test("exhausted backfill pins the floor: next replay still requests the original
   const laterFilters = [];
   await replayLiveSubscriptions({
     subscriptions,
-    now: 2300,
     sendRaw: async () => {},
-    requestHistory: async (filter) => {
-      laterFilters.push(filter);
+    requestRepair: async (request) => {
+      laterFilters.push(request);
       return [];
     },
   });
   assert.equal(
     laterFilters[0].since,
-    2095,
+    235,
     "after recovery the cursor governs again",
   );
 });
@@ -822,10 +1174,9 @@ test("in-flight stale abort keeps the pinned floor for the superseding connectio
   let historyCalls = 0;
   await replayLiveSubscriptions({
     subscriptions,
-    now: 2000,
     sendRaw: async () => {},
     isActive: () => generationActive,
-    requestHistory: async () => {
+    requestRepair: async () => {
       historyCalls++;
       // Connection A is superseded while the REQ is in flight: the generation
       // advances, but the subscription keeps its key AND object identity —
@@ -845,11 +1196,159 @@ test("in-flight stale abort keeps the pinned floor for the superseding connectio
   );
   assert.equal(
     subscription.pendingReplaySince,
-    995,
+    0,
     "a stale-generation abort must not clear the floor the new connection needs",
   );
 });
 
+test("future-dated cursor repairs backdated edits and deletions", async () => {
+  resetGate();
+  const delivered = [];
+  const recovered = [
+    { ...event("5".repeat(64), 10_010), kind: 5 },
+    { ...event("6".repeat(64), 10_011), kind: 9005 },
+    { ...event("7".repeat(64), 10_012), kind: 40003 },
+  ];
+  const subscription = {
+    mode: "live",
+    filter: buildChannelFilter("channel-1", 50),
+    onEvent: (value) => delivered.push(value),
+    // Relay accepted this event 900s in the future before disconnect.
+    lastSeenCreatedAt: 10_900,
+  };
+  const requests = [];
+  await replayLiveSubscriptions({
+    subscriptions: new Map([["live-1", subscription]]),
+    generation: 11,
+    sendRaw: async () => {},
+    requestRepair: async (request) => {
+      requests.push(request);
+      return recovered;
+    },
+  });
+  assert.equal(requests[0].since, 9_035);
+  assert.equal(requests[0].until, undefined);
+  assert.deepEqual(
+    delivered.map((value) => value.kind),
+    [5, 9005, 40003],
+  );
+});
+
+test("dense-second repair advances by event id without gaps", async () => {
+  resetGate();
+  const delivered = [];
+  const requests = [];
+  const subscription = {
+    mode: "live",
+    filter: buildChannelFilter("channel-1", 50),
+    onEvent: (value) => delivered.push(value.id),
+    lastSeenCreatedAt: 2000,
+  };
+  const dense = Array.from({ length: 1_205 }, (_, index) =>
+    event(index.toString().padStart(64, "0"), 2000),
+  );
+  await replayLiveSubscriptions({
+    subscriptions: new Map([["live-1", subscription]]),
+    generation: 7,
+    sendRaw: async () => {},
+    requestRepair: async (request) => {
+      requests.push(request);
+      const start = request.beforeId
+        ? dense.findIndex((value) => value.id === request.beforeId) + 1
+        : 0;
+      return dense.slice(start, start + request.limit);
+    },
+  });
+  assert.equal(delivered.length, dense.length);
+  assert.equal(new Set(delivered).size, dense.length);
+  assert.deepEqual(
+    requests.map((request) => request.beforeId),
+    [undefined, dense[499].id, dense[999].id],
+  );
+});
+
+test("replay dedupe clears only after both completions and never from stale generation", () => {
+  for (const repairFirst of [true, false]) {
+    const subscription = {
+      mode: "live",
+      filter: buildChannelFilter("channel-1", 50),
+      onEvent: () => {},
+      reconnectReplay: {
+        generation: 12,
+        seenEventIds: new Set(["seen"]),
+        liveEose: false,
+        repairDone: false,
+      },
+    };
+    markReconnectRepairDone(subscription, 11);
+    markReconnectLiveEose(subscription, 11);
+    assert.equal(subscription.reconnectReplay.generation, 12);
+    if (repairFirst) {
+      markReconnectRepairDone(subscription, 12);
+      assert.ok(subscription.reconnectReplay);
+      markReconnectLiveEose(subscription, 12);
+    } else {
+      markReconnectLiveEose(subscription, 12);
+      assert.ok(subscription.reconnectReplay);
+      markReconnectRepairDone(subscription, 12);
+    }
+    assert.equal(subscription.reconnectReplay, undefined);
+  }
+});
+
+test("buffer flush drops stale generations and removed subscriptions", () => {
+  const delivered = [];
+  const subscription = {
+    mode: "live",
+    filter: buildChannelFilter("channel-1", 50),
+    onEvent: (value) => delivered.push(value.id),
+  };
+  flushEvents(
+    [
+      { subId: "live-1", event: event("stale", 100), generation: 6 },
+      { subId: "removed", event: event("removed", 101), generation: 7 },
+      { subId: "live-1", event: event("current", 102), generation: 7 },
+    ],
+    new Map([["live-1", subscription]]),
+    7,
+  );
+  assert.deepEqual(delivered, ["current"]);
+});
+
+test("live-before-repair and repair-before-live dispatch once", async () => {
+  const shared = event("a".repeat(64), 1000);
+  for (const liveFirst of [true, false]) {
+    const delivered = [];
+    const subscription = {
+      mode: "live",
+      filter: buildChannelFilter("channel-1", 50),
+      onEvent: (value) => delivered.push(value.id),
+      reconnectReplay: {
+        generation: 4,
+        seenEventIds: new Set(),
+        liveEose: false,
+        repairDone: false,
+      },
+    };
+    if (liveFirst) {
+      assert.equal(shouldDispatchSubscriptionEvent(subscription, shared), true);
+      subscription.onEvent(shared);
+    }
+    await replayReconnectHistoryPages({
+      subscription,
+      channelId: "channel-1",
+      since: 0,
+      until: 1000,
+      isActive: () => true,
+      requestRepair: async () => [shared],
+    });
+    if (!liveFirst && shouldDispatchSubscriptionEvent(subscription, shared)) {
+      subscription.onEvent(shared);
+    }
+    assert.deepEqual(delivered, [shared.id]);
+  }
+});
+
 // ── Teardown ──────────────────────────────────────────────────────────────────
 
 test("teardown — restore Date.now", () => {
diff --git a/desktop/src/shared/api/relayReconnectReplay.ts b/desktop/src/shared/api/relayReconnectReplay.ts
index cb962ce846..60a57f1a0b 100644
--- a/desktop/src/shared/api/relayReconnectReplay.ts
+++ b/desktop/src/shared/api/relayReconnectReplay.ts
@@ -4,12 +4,28 @@ import type {
   RelaySubscriptionFilter,
 } from "@/shared/api/relayClientShared";
 import type { RelayEvent } from "@/shared/api/types";
+import {
+  markReconnectRepairDone,
+  shouldDispatchSubscriptionEvent,
+} from "@/shared/api/relayClosedRecovery";
+import type { ChannelReconnectRepairRequest } from "@/shared/api/channelReconnectRepair";
 import {
   isRateLimited,
   waitForRateLimit,
 } from "@/shared/api/relayRateLimitGate";
 
 const RECONNECT_REPLAY_SKEW_SECS = 5;
+/**
+ * Legacy cursors are event-time maxima, so cover relay future tolerance (900s)
+ * plus the channel-row storage fence and margin (960s + 5s).
+ */
+export const RELAY_INGEST_FUTURE_TOLERANCE_SECS = 900;
+export const DB_CREATED_AT_FLOOR_SECS = 960;
+export const FENCE_CLOCK_MARGIN_SECS = 5;
+export const RECONNECT_REPLAY_CHANNEL_LOOKBACK_SECS =
+  RELAY_INGEST_FUTURE_TOLERANCE_SECS +
+  DB_CREATED_AT_FLOOR_SECS +
+  FENCE_CLOCK_MARGIN_SECS;
 export const RECONNECT_REPLAY_PAGE_LIMIT = 500;
 export const RECONNECT_REPLAY_PAGE_CONCURRENCY = 4;
 
@@ -106,41 +122,58 @@ export function shouldPageReconnectReplay(filter: RelaySubscriptionFilter) {
  */
 export async function replayReconnectHistoryPages({
   subscription,
+  channelId,
   since,
   until,
   isActive,
-  requestHistory,
+  requestRepair,
 }: {
   subscription: Extract<RelaySubscription, { mode: "live" }>;
+  channelId: string;
   since: number;
-  until: number;
+  until?: number;
   isActive: () => boolean;
-  requestHistory: (filter: RelaySubscriptionFilter) => Promise<RelayEvent[]>;
+  requestRepair: (
+    request: ChannelReconnectRepairRequest,
+  ) => Promise<RelayEvent[]>;
 }): Promise<boolean> {
-  let pageUntil = until;
+  let pageUntil: number | undefined = until;
+  let beforeId: string | undefined;
 
-  while (pageUntil >= since) {
+  while (pageUntil === undefined || pageUntil >= since) {
     if (!isActive()) return false;
 
-    const events = await requestHistory(
-      buildReconnectReplayFilter(
-        subscription.filter,
-        since,
-        pageUntil,
-        RECONNECT_REPLAY_PAGE_LIMIT,
-      ),
-    );
+    const events = await requestRepair({
+      channelId,
+      since,
+      limit: RECONNECT_REPLAY_PAGE_LIMIT,
+      until: pageUntil,
+      beforeId,
+    });
 
     if (!isActive()) return false;
 
-    for (const event of events) subscription.onEvent(event);
+    for (const event of events) {
+      if (shouldDispatchSubscriptionEvent(subscription, event)) {
+        subscription.onEvent(event);
+      }
+    }
     if (events.length < RECONNECT_REPLAY_PAGE_LIMIT) return true;
 
-    const oldestCreatedAt = events[0]?.created_at;
-    if (oldestCreatedAt === undefined || oldestCreatedAt <= since) return true;
-
-    pageUntil =
-      oldestCreatedAt < pageUntil ? oldestCreatedAt : oldestCreatedAt - 1;
+    const terminal = events.at(-1);
+    if (!terminal || terminal.created_at < since) return true;
+    if (terminal.created_at === pageUntil && terminal.id === beforeId) {
+      throw new Error("Reconnect repair cursor did not advance");
+    }
+    if (terminal.created_at === since) {
+      // Continue across an arbitrarily dense boundary second until the relay
+      // returns a short page; the composite cursor, not timestamp subtraction,
+      // guarantees progress.
+      pageUntil = since;
+    } else {
+      pageUntil = terminal.created_at;
+    }
+    beforeId = terminal.id;
   }
   return true;
 }
@@ -148,8 +181,8 @@ export async function replayReconnectHistoryPages({
 export async function replayLiveSubscriptions({
   subscriptions,
   sendRaw,
-  requestHistory,
-  now = Math.floor(Date.now() / 1_000),
+  requestRepair,
+  generation = 0,
   pageReplayConcurrency = RECONNECT_REPLAY_PAGE_CONCURRENCY,
   visibleChannelId = null,
   replayBatchSize = REPLAY_BATCH_SIZE,
@@ -160,8 +193,10 @@ export async function replayLiveSubscriptions({
 }: {
   subscriptions: Map<string, RelaySubscription>;
   sendRaw: (payload: unknown[]) => Promise<void>;
-  requestHistory: (filter: RelaySubscriptionFilter) => Promise<RelayEvent[]>;
-  now?: number;
+  requestRepair: (
+    request: ChannelReconnectRepairRequest,
+  ) => Promise<RelayEvent[]>;
+  generation?: number;
   pageReplayConcurrency?: number;
   /** Channel currently visible in the UI — its subscriptions go in the first batch. */
   visibleChannelId?: string | null;
@@ -194,26 +229,53 @@ export async function replayLiveSubscriptions({
         entry[1].mode === "live",
     )
     .map(([subId, subscription]) => {
+      const channelId = subscription.filter["#h"]?.[0];
+      const shouldPageReplay =
+        channelId !== undefined &&
+        shouldPageReconnectReplay(subscription.filter);
       const cursorSince =
         subscription.lastSeenCreatedAt === undefined
           ? undefined
           : Math.max(
               0,
-              subscription.lastSeenCreatedAt - RECONNECT_REPLAY_SKEW_SECS,
+              subscription.lastSeenCreatedAt -
+                (shouldPageReplay
+                  ? RECONNECT_REPLAY_CHANNEL_LOOKBACK_SECS
+                  : RECONNECT_REPLAY_SKEW_SECS),
             );
       // A pinned floor from a previously failed backfill takes precedence
       // over the cursor: live events kept advancing `lastSeenCreatedAt`
       // while the older window stayed unresolved, and starting from the
       // cursor would skip it permanently.
-      const replaySince =
+      const replayFloor =
         cursorSince === undefined
           ? subscription.pendingReplaySince
           : Math.min(cursorSince, subscription.pendingReplaySince ?? Infinity);
-      const shouldPageReplay =
-        replaySince !== undefined &&
-        shouldPageReconnectReplay(subscription.filter);
+      // Native repair bypasses the original WS filter, so preserve its lower
+      // bound explicitly. Otherwise a from-now subscription can replay older
+      // rows and surface stale unread or notification activity on reconnect.
+      const replaySince =
+        replayFloor === undefined
+          ? undefined
+          : Math.max(replayFloor, subscription.filter.since ?? 0);
+      const willRepair = shouldPageReplay && replaySince !== undefined;
+      if (willRepair) {
+        // Install before the restored live REQ: a live frame may beat page one.
+        subscription.reconnectReplay = {
+          generation,
+          seenEventIds: new Set(),
+          liveEose: false,
+          repairDone: false,
+        };
+      }
 
-      return { subId, subscription, replaySince, shouldPageReplay };
+      return {
+        subId,
+        subscription,
+        channelId,
+        replaySince,
+        shouldPageReplay: willRepair,
+      };
     });
 
   // Sort the visible channel's subscriptions first so the user sees their
@@ -244,14 +306,28 @@ export async function replayLiveSubscriptions({
     if (!isActive()) return;
     const batch = replayRequests.slice(i, i + replayBatchSize);
     await Promise.all(
-      batch.map(({ subId, subscription, replaySince, shouldPageReplay }) =>
-        sendRaw([
-          "REQ",
-          subId,
-          shouldPageReplay
-            ? subscription.filter
-            : buildReconnectReplayFilter(subscription.filter, replaySince),
-        ]),
+      batch.map(
+        async ({ subId, subscription, replaySince, shouldPageReplay }) => {
+          // The subscription map may change while replay is paused behind the
+          // gate or an inter-batch delay. Never resurrect a disposed entry (or
+          // overwrite its replacement) with a REQ from this stale snapshot.
+          if (!isActive() || subscriptions.get(subId) !== subscription) return;
+          await sendRaw([
+            "REQ",
+            subId,
+            shouldPageReplay
+              ? subscription.filter
+              : buildReconnectReplayFilter(subscription.filter, replaySince),
+          ]);
+          // Disposal can race the asynchronous websocket invoke after the
+          // identity check. If this exact entry was deleted while REQ was in
+          // flight, CLOSE again after REQ settles so wire order converges to
+          // closed. A different object under the same ID is a replacement and
+          // must not be torn down by this stale replay.
+          if (isActive() && !subscriptions.has(subId)) {
+            await sendRaw(["CLOSE", subId]);
+          }
+        },
       ),
     );
     if (i + replayBatchSize < replayRequests.length) {
@@ -266,12 +342,16 @@ export async function replayLiveSubscriptions({
       (
         request,
       ): request is typeof request & {
+        channelId: string;
         replaySince: number;
         shouldPageReplay: true;
-      } => request.shouldPageReplay && request.replaySince !== undefined,
+      } =>
+        request.shouldPageReplay &&
+        request.channelId !== undefined &&
+        request.replaySince !== undefined,
     ),
     pageReplayConcurrency,
-    async ({ subId, subscription, replaySince }) => {
+    async ({ subId, subscription, channelId, replaySince }) => {
       // Backfill is best-effort: a failure here (typically a `rate-limited:`
       // CLOSED on a history REQ) must never escape to the session and tear
       // down the healthy, authenticated socket carrying the live REQs — that
@@ -288,8 +368,11 @@ export async function replayLiveSubscriptions({
         try {
           const completed = await replayReconnectHistoryPages({
             subscription,
+            channelId,
             since: replaySince,
-            until: now,
+            // Do not trust the renderer clock as the upper bound. The relay's
+            // newest matching row starts the keyset walk.
+            until: undefined,
             // Both guards are required. The identity check catches the sub
             // being torn down/replaced; the outer isActive() catches
             // connection supersession, which bumps the generation while the
@@ -298,20 +381,26 @@ export async function replayLiveSubscriptions({
             // floor the superseding connection needs.
             isActive: () =>
               isActive() && subscriptions.get(subId) === subscription,
-            requestHistory,
+            requestRepair,
           });
           // A stale-connection abort is NOT completion: the superseding
           // connection shares this subscription object and still needs the
           // pinned floor for its own replay. Only a genuinely completed
           // window may release it.
-          if (completed) subscription.pendingReplaySince = undefined;
+          if (completed) {
+            subscription.pendingReplaySince = undefined;
+            markReconnectRepairDone(subscription, generation);
+          }
           return;
         } catch (error) {
           console.warn(
             `[reconnect replay] history backfill attempt ${attempt}/${PAGE_REPLAY_MAX_ATTEMPTS} failed for ${subId}:`,
             error,
           );
-          if (attempt === PAGE_REPLAY_MAX_ATTEMPTS) return;
+          if (attempt === PAGE_REPLAY_MAX_ATTEMPTS) {
+            markReconnectRepairDone(subscription, generation);
+            return;
+          }
           // The failed REQ's CLOSED handler arms the rate-limit gate before
           // rejecting; wait for it (no-op when the failure wasn't back-pressure)
           // and re-check that this replay's connection is still current.
diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts
index 6a246572b4..f04959306d 100644
--- a/desktop/src/testing/e2eBridge.ts
+++ b/desktop/src/testing/e2eBridge.ts
@@ -5419,6 +5419,47 @@ function buildMockChannelWindowBounds(
  * This is the window read-model surface the overhaul introduced; without it the
  * relay-mode bridge has no handler and the timeline renders empty.
  */
+async function handleGetChannelReconnectRepair(
+  args: {
+    channelId: string;
+    since: number;
+    limit: number;
+    until?: number | null;
+    beforeId?: string | null;
+  },
+  config: E2eConfig | undefined,
+): Promise<RelayEvent[]> {
+  const kinds = new Set([
+    5, 7, 9, 9005, 40001, 40002, 40003, 40008, 40099, 45001, 45003, 48100,
+    48101, 48102, 48103,
+  ]);
+  const filter: Record<string, unknown> = {
+    "#h": [args.channelId],
+    kinds: [...kinds],
+    since: args.since,
+    limit: args.limit,
+  };
+  if (args.until != null) filter.until = args.until;
+  if (args.beforeId != null) filter.before_id = args.beforeId;
+
+  if (getIdentity(config)) return relayQuery(config, [filter]);
+  return getMockMessageStore(args.channelId)
+    .filter(
+      (event) =>
+        kinds.has(event.kind) &&
+        event.created_at >= args.since &&
+        (args.until == null ||
+          event.created_at < args.until ||
+          (event.created_at === args.until &&
+            (args.beforeId == null || event.id > args.beforeId))),
+    )
+    .sort(
+      (left, right) =>
+        right.created_at - left.created_at || left.id.localeCompare(right.id),
+    )
+    .slice(0, args.limit);
+}
+
 async function handleGetChannelWindow(
   args: {
     channelId: string;
@@ -13367,6 +13408,11 @@ export function maybeInstallE2eTauriMocks() {
           payload as Parameters<typeof handleGetChannelMessagesBefore>[0],
           activeConfig,
         );
+      case "get_channel_reconnect_repair":
+        return handleGetChannelReconnectRepair(
+          payload as Parameters<typeof handleGetChannelReconnectRepair>[0],
+          activeConfig,
+        );
       case "get_channel_window":
         return handleGetChannelWindow(
           payload as Parameters<typeof handleGetChannelWindow>[0],

From b298a175c4b9da1638f84c1f287e42d16a690a61 Mon Sep 17 00:00:00 2001
From: Matt Krueger <krueger.matt@ymail.com>
Date: Thu, 20 Aug 2026 19:28:06 -0400
Subject: [PATCH 02/38] fix(desktop): isolate main timeline stacking context
 from focus drawer (#6398)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "Jump to latest" pill (`z-50`) in the main timeline renders on top
of the focus thread drawer (`z-41`) because both share the same stacking
context. This wraps the timeline contents in an `isolate` div so the
pill's z-index can't escape above the drawer.

The diff is large but the actual change is two lines — one wrapper
`<div>`. The rest is biome re-indenting the children. The
`DropZoneOverlay` also moves inside the wrapper, so its top edge no
longer extends behind the header during drag-over.

### Repro

1. Open a channel with enough history to scroll up past the bottom
2. Scroll up so the "Jump to latest" pill appears
3. Open a thread in focus mode — the pill renders on top of the drawer

### Related issue
None found.

Before:
<img width="824" height="730" alt="Before"
src="https://github.com/user-attachments/assets/eae0eb88-bcef-4c2a-bb05-08d0af6f7f38"
/>

After:
<img width="1280" height="720" alt="after-drawer-hides-pill"
src="https://github.com/user-attachments/assets/0370ba71-efc5-478a-a8e0-aac902a66082"
/>

Signed-off-by: Matt Krueger <krueger.matt@ymail.com>
Co-authored-by: Claude Code <noreply@anthropic.com>
---
 .../src/features/channels/ui/ChannelPane.tsx  | 360 +++++++++---------
 .../channels/ui/FocusThreadDrawer.tsx         |  10 +-
 2 files changed, 187 insertions(+), 183 deletions(-)

diff --git a/desktop/src/features/channels/ui/ChannelPane.tsx b/desktop/src/features/channels/ui/ChannelPane.tsx
index 1ec6cee95e..82da2e4214 100644
--- a/desktop/src/features/channels/ui/ChannelPane.tsx
+++ b/desktop/src/features/channels/ui/ChannelPane.tsx
@@ -567,192 +567,194 @@ export const ChannelPane = React.memo(function ChannelPane({
           }
         >
           {isHuddleTranscript ? null : header}
-          <MessageTimeline
-            ref={messageTimelineRef}
-            channelId={activeChannel?.id}
-            channelIntro={channelIntro}
-            directMessageIntro={directMessageIntro}
-            scrollContainerRef={timelineScrollRef}
-            currentPubkey={currentPubkey}
-            fetchOlder={fetchOlder}
-            followThreadById={followThreadById}
-            hasComposerOverlay={hasMainComposerOverlay}
-            hasOlderMessages={hasOlderMessages}
-            historyExhausted={historyExhausted}
-            hideDayDividers={isHuddleTranscript}
-            alwaysShowMessageIdentity={isHuddleTranscript}
-            hideAgentAccessBadges={isHuddleTranscript}
-            pinnedIntro={
-              isHuddleTranscript ? <HuddleTranscriptIntro /> : undefined
-            }
-            huddleMemberPubkeys={huddleMemberPubkeys}
-            huddleMemberPubkeysPending={huddleMemberPubkeysPending}
-            isFetchingOlder={isFetchingOlder}
-            isFollowingThreadById={isFollowingThreadById}
-            isMessageUnreadById={isMessageUnreadById}
-            personaLookup={personaLookup}
-            profiles={profiles}
-            ownerProfiles={ownerProfiles}
-            unfollowThreadById={unfollowThreadById}
-            emptyDescription={
-              activeChannel?.channelType === "forum"
-                ? "Select a stream or DM to load real message history in this first integration pass."
-                : "Messages and sub-replies will appear here once the relay has history for this channel."
-            }
-            emptyTitle={
-              activeChannel
-                ? activeChannel.channelType === "forum"
-                  ? "Forum channels are next"
-                  : "No messages yet"
-                : "No channel selected"
-            }
-            isLoading={isHuddleTranscript ? false : isTimelineLoading}
-            entranceMessageId={entranceMessageId}
-            onEntranceMessageComplete={onEntranceMessageComplete}
-            mainEntries={mainTimelineEntries}
-            threadSummaries={threadSummaries}
-            messages={visibleMessages}
-            firstUnreadMessageId={firstUnreadMessageId}
-            unreadCount={unreadCount}
-            onDelete={onDelete}
-            onEdit={onEdit}
-            onMarkUnread={onMarkUnread}
-            onMarkRead={onMarkRead}
-            onReply={timelineReplyHandler}
-            onOpenThread={isHuddleTranscript ? undefined : onOpenThread}
-            channelName={activeChannel?.name}
-            channelType={activeChannel?.channelType ?? null}
-            isSendingVideoReviewComment={isSending}
-            onSendVideoReviewComment={
-              activeChannel?.archivedAt ? undefined : onSendVideoReviewComment
-            }
-            onTargetReached={onTargetReached}
-            onToggleReaction={onToggleReaction}
-            targetMessageId={targetMessageId}
-            splitThreadPanelOpen={
-              useSplitAuxiliaryPane &&
-              !useFocusThreadDrawer &&
-              Boolean(openThreadHeadId)
-            }
-            threadUnreadCounts={threadUnreadCounts}
-          />
-          {isNonMemberView ? (
-            <div
-              data-testid="join-banner"
-              className="flex items-center gap-3 border-t border-border/80 bg-card/50 px-5 py-3"
-            >
-              <div className="flex min-w-0 flex-1 items-center gap-2 text-sm text-muted-foreground">
-                <Hash className="h-4 w-4 shrink-0" />
-                <span className="truncate">
-                  Viewing{" "}
-                  <span className="font-medium text-foreground">
-                    #{activeChannel?.name}
-                  </span>
-                </span>
-              </div>
-              <Button
-                disabled={isJoining}
-                onClick={() => {
-                  void onJoinChannel?.();
-                }}
-                size="sm"
-                variant="default"
-              >
-                <LogIn className="mr-1.5 h-4 w-4" />
-                {isJoining ? "Joining..." : "Join to participate"}
-              </Button>
-            </div>
-          ) : (
-            <div
-              className="pointer-events-none absolute inset-x-0 bottom-0 z-40 isolate before:absolute before:inset-x-0 before:bottom-0 before:-z-10 before:h-24 before:bg-gradient-to-b before:from-transparent before:to-background before:content-[''] after:absolute after:inset-x-0 after:bottom-0 after:-z-10 after:h-12 after:bg-background after:content-['']"
-              data-testid="channel-composer-overlay"
-              ref={composerWrapperRef}
-            >
-              <ComposerUploadProgressOverlay />
+          <div className="relative isolate flex min-h-0 min-w-0 flex-1 flex-col">
+            <MessageTimeline
+              ref={messageTimelineRef}
+              channelId={activeChannel?.id}
+              channelIntro={channelIntro}
+              directMessageIntro={directMessageIntro}
+              scrollContainerRef={timelineScrollRef}
+              currentPubkey={currentPubkey}
+              fetchOlder={fetchOlder}
+              followThreadById={followThreadById}
+              hasComposerOverlay={hasMainComposerOverlay}
+              hasOlderMessages={hasOlderMessages}
+              historyExhausted={historyExhausted}
+              hideDayDividers={isHuddleTranscript}
+              alwaysShowMessageIdentity={isHuddleTranscript}
+              hideAgentAccessBadges={isHuddleTranscript}
+              pinnedIntro={
+                isHuddleTranscript ? <HuddleTranscriptIntro /> : undefined
+              }
+              huddleMemberPubkeys={huddleMemberPubkeys}
+              huddleMemberPubkeysPending={huddleMemberPubkeysPending}
+              isFetchingOlder={isFetchingOlder}
+              isFollowingThreadById={isFollowingThreadById}
+              isMessageUnreadById={isMessageUnreadById}
+              personaLookup={personaLookup}
+              profiles={profiles}
+              ownerProfiles={ownerProfiles}
+              unfollowThreadById={unfollowThreadById}
+              emptyDescription={
+                activeChannel?.channelType === "forum"
+                  ? "Select a stream or DM to load real message history in this first integration pass."
+                  : "Messages and sub-replies will appear here once the relay has history for this channel."
+              }
+              emptyTitle={
+                activeChannel
+                  ? activeChannel.channelType === "forum"
+                    ? "Forum channels are next"
+                    : "No messages yet"
+                  : "No channel selected"
+              }
+              isLoading={isHuddleTranscript ? false : isTimelineLoading}
+              entranceMessageId={entranceMessageId}
+              onEntranceMessageComplete={onEntranceMessageComplete}
+              mainEntries={mainTimelineEntries}
+              threadSummaries={threadSummaries}
+              messages={visibleMessages}
+              firstUnreadMessageId={firstUnreadMessageId}
+              unreadCount={unreadCount}
+              onDelete={onDelete}
+              onEdit={onEdit}
+              onMarkUnread={onMarkUnread}
+              onMarkRead={onMarkRead}
+              onReply={timelineReplyHandler}
+              onOpenThread={isHuddleTranscript ? undefined : onOpenThread}
+              channelName={activeChannel?.name}
+              channelType={activeChannel?.channelType ?? null}
+              isSendingVideoReviewComment={isSending}
+              onSendVideoReviewComment={
+                activeChannel?.archivedAt ? undefined : onSendVideoReviewComment
+              }
+              onTargetReached={onTargetReached}
+              onToggleReaction={onToggleReaction}
+              targetMessageId={targetMessageId}
+              splitThreadPanelOpen={
+                useSplitAuxiliaryPane &&
+                !useFocusThreadDrawer &&
+                Boolean(openThreadHeadId)
+              }
+              threadUnreadCounts={threadUnreadCounts}
+            />
+            {isNonMemberView ? (
               <div
-                className={cn(
-                  "composer-dock composer-overlay-corner-masks relative pointer-events-auto",
-                  hasComposerBottomActivity && "composer-dock--with-activity",
-                )}
+                data-testid="join-banner"
+                className="flex items-center gap-3 border-t border-border/80 bg-card/50 px-5 py-3"
               >
-                {isActiveWelcomeChannel && !timeoutState.active ? (
-                  <WelcomeComposerGuidanceLayer
-                    onDismiss={handleDismissWelcomeBanner}
-                    settingUp={welcomeKickoffSettingUp}
-                    state={welcomeComposerBannerState}
-                  >
-                    {welcomeKickoffStage}
-                  </WelcomeComposerGuidanceLayer>
-                ) : null}
-                {timeoutState.active ? (
-                  <ComposerTimeoutBanner
-                    expiresAtMs={timeoutState.expiresAtMs}
+                <div className="flex min-w-0 flex-1 items-center gap-2 text-sm text-muted-foreground">
+                  <Hash className="h-4 w-4 shrink-0" />
+                  <span className="truncate">
+                    Viewing{" "}
+                    <span className="font-medium text-foreground">
+                      #{activeChannel?.name}
+                    </span>
+                  </span>
+                </div>
+                <Button
+                  disabled={isJoining}
+                  onClick={() => {
+                    void onJoinChannel?.();
+                  }}
+                  size="sm"
+                  variant="default"
+                >
+                  <LogIn className="mr-1.5 h-4 w-4" />
+                  {isJoining ? "Joining..." : "Join to participate"}
+                </Button>
+              </div>
+            ) : (
+              <div
+                className="pointer-events-none absolute inset-x-0 bottom-0 z-40 isolate before:absolute before:inset-x-0 before:bottom-0 before:-z-10 before:h-24 before:bg-gradient-to-b before:from-transparent before:to-background before:content-[''] after:absolute after:inset-x-0 after:bottom-0 after:-z-10 after:h-12 after:bg-background after:content-['']"
+                data-testid="channel-composer-overlay"
+                ref={composerWrapperRef}
+              >
+                <ComposerUploadProgressOverlay />
+                <div
+                  className={cn(
+                    "composer-dock composer-overlay-corner-masks relative pointer-events-auto",
+                    hasComposerBottomActivity && "composer-dock--with-activity",
+                  )}
+                >
+                  {isActiveWelcomeChannel && !timeoutState.active ? (
+                    <WelcomeComposerGuidanceLayer
+                      onDismiss={handleDismissWelcomeBanner}
+                      settingUp={welcomeKickoffSettingUp}
+                      state={welcomeComposerBannerState}
+                    >
+                      {welcomeKickoffStage}
+                    </WelcomeComposerGuidanceLayer>
+                  ) : null}
+                  {timeoutState.active ? (
+                    <ComposerTimeoutBanner
+                      expiresAtMs={timeoutState.expiresAtMs}
+                    />
+                  ) : null}
+                  <ComposerDockBackdrop gutterClassName="inset-x-5" />
+                  <MessageComposer
+                    channelId={activeChannel?.id ?? null}
+                    channelName={activeChannel?.name ?? "channel"}
+                    channelType={activeChannel?.channelType ?? null}
+                    containerClassName="px-5 pb-0"
+                    layoutMode="dock"
+                    disabled={isComposerDisabled}
+                    editTarget={mainEditTarget}
+                    autoSubmitDraftKey={autoSendDraftKey}
+                    onAutoSubmitComplete={handleAutoSubmitComplete}
+                    isSending={isSending}
+                    mediaController={mainComposerMedia}
+                    onDeferredEditPendingChange={setMainDeferredEditPending}
+                    onCancelEdit={onCancelEdit}
+                    onEditLastOwnMessage={handleEditLastOwnMainMessage}
+                    onEditSave={onEditSave}
+                    onPrepareSendChannel={
+                      activeChannel?.channelType === "dm"
+                        ? prepareDmSendChannel
+                        : undefined
+                    }
+                    onSend={handleSendMessage}
+                    profiles={profiles}
+                    showBackgroundUploadProgress={false}
+                    placeholder={
+                      timeoutState.active
+                        ? "You're timed out by community moderators."
+                        : isModerationDmChannel
+                          ? "This channel is read-only."
+                          : activeChannel?.archivedAt
+                            ? "Archived channels are read-only."
+                            : activeChannel?.channelType === "forum"
+                              ? "Forum posting is not wired in this pass."
+                              : activeChannel
+                                ? activeChannel.channelType === "dm" &&
+                                  directMessageIntro
+                                  ? `Message ${directMessageIntro.displayName}`
+                                  : `Message #${activeChannel.name}`
+                                : "Select a channel"
+                    }
+                    showTopBorder={false}
                   />
-                ) : null}
-                <ComposerDockBackdrop gutterClassName="inset-x-5" />
-                <MessageComposer
-                  channelId={activeChannel?.id ?? null}
-                  channelName={activeChannel?.name ?? "channel"}
-                  channelType={activeChannel?.channelType ?? null}
-                  containerClassName="px-5 pb-0"
-                  layoutMode="dock"
-                  disabled={isComposerDisabled}
-                  editTarget={mainEditTarget}
-                  autoSubmitDraftKey={autoSendDraftKey}
-                  onAutoSubmitComplete={handleAutoSubmitComplete}
-                  isSending={isSending}
-                  mediaController={mainComposerMedia}
-                  onDeferredEditPendingChange={setMainDeferredEditPending}
-                  onCancelEdit={onCancelEdit}
-                  onEditLastOwnMessage={handleEditLastOwnMainMessage}
-                  onEditSave={onEditSave}
-                  onPrepareSendChannel={
-                    activeChannel?.channelType === "dm"
-                      ? prepareDmSendChannel
-                      : undefined
-                  }
-                  onSend={handleSendMessage}
-                  profiles={profiles}
-                  showBackgroundUploadProgress={false}
-                  placeholder={
-                    timeoutState.active
-                      ? "You're timed out by community moderators."
-                      : isModerationDmChannel
-                        ? "This channel is read-only."
-                        : activeChannel?.archivedAt
-                          ? "Archived channels are read-only."
-                          : activeChannel?.channelType === "forum"
-                            ? "Forum posting is not wired in this pass."
-                            : activeChannel
-                              ? activeChannel.channelType === "dm" &&
-                                directMessageIntro
-                                ? `Message ${directMessageIntro.displayName}`
-                                : `Message #${activeChannel.name}`
-                              : "Select a channel"
-                  }
-                  showTopBorder={false}
-                />
-                {/* The activity accessory is anchored in the dock's reserved
+                  {/* The activity accessory is anchored in the dock's reserved
                     bottom rail, so fading it cannot change the observed
                     overlay height or move the conversation. Its natural
                     content height remains responsive. */}
-                <ChannelComposerActivityAccessory
-                  agents={activityAgents}
-                  channel={activeChannel}
-                  currentPubkey={currentPubkey}
-                  onOpenAgentSession={onOpenAgentSession}
-                  openAgentSessionPubkey={openAgentSessionPubkey}
-                  profiles={profiles}
-                  typingPubkeys={typingPubkeys}
-                  visible={hasComposerBottomActivity}
-                  workingBotPubkeys={composerWorkingBotPubkeys}
-                />
+                  <ChannelComposerActivityAccessory
+                    agents={activityAgents}
+                    channel={activeChannel}
+                    currentPubkey={currentPubkey}
+                    onOpenAgentSession={onOpenAgentSession}
+                    openAgentSessionPubkey={openAgentSessionPubkey}
+                    profiles={profiles}
+                    typingPubkeys={typingPubkeys}
+                    visible={hasComposerBottomActivity}
+                    workingBotPubkeys={composerWorkingBotPubkeys}
+                  />
+                </div>
               </div>
-            </div>
-          )}
-          {canDropInMainColumn && mainComposerMedia.isDragOver ? (
-            <DropZoneOverlay className="z-50 rounded-2xl bg-primary/20 backdrop-blur-sm" />
-          ) : null}
+            )}
+            {canDropInMainColumn && mainComposerMedia.isDragOver ? (
+              <DropZoneOverlay className="z-50 rounded-2xl bg-primary/20 backdrop-blur-sm" />
+            ) : null}
+          </div>
         </section>
       ) : null}
 
diff --git a/desktop/src/features/channels/ui/FocusThreadDrawer.tsx b/desktop/src/features/channels/ui/FocusThreadDrawer.tsx
index d5e287c20a..1aaad0e609 100644
--- a/desktop/src/features/channels/ui/FocusThreadDrawer.tsx
+++ b/desktop/src/features/channels/ui/FocusThreadDrawer.tsx
@@ -129,10 +129,12 @@ const REDUCED_MOTION_TRANSITION = { duration: 0.12, ease: "linear" } as const;
  * header's breadcrumb, where the eye already is — the sliver carries no label of
  * its own.
  *
- * `z-41` puts the overlay above the channel timeline, its `z-40` composer
- * overlay and the `z-30` shared header backdrop, while staying below the global
- * `z-45` top chrome. Setting z-index on the positioned container also gives the
- * drawer its own stacking context, so the panel chrome inside it is isolated.
+ * `z-41` places the drawer above the channel section (whose inner `isolate`
+ * wrapper traps the timeline's z-50 pill, z-40 composer overlay, and z-50 drop
+ * overlay) and the `z-30` shared header backdrop, while staying below the
+ * global `z-45` top chrome. Setting z-index on the positioned container also
+ * gives the drawer its own stacking context, so the panel chrome inside is
+ * isolated.
  */
 export function FocusThreadDrawer({
   channelName,

From 569308c23c9c2bf620dd3a9a5e4baecbcfa22e16 Mon Sep 17 00:00:00 2001
From: Wes <wesbillman@users.noreply.github.com>
Date: Thu, 20 Aug 2026 17:31:39 -0600
Subject: [PATCH 03/38] fix(desktop): restore recent channel sorting (#6402)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

- batch desktop last-message queries into groups of 128 so workspaces
with larger channel counts stay within the relay's explicit-channel
limit
- propagate timestamp query failures instead of replacing the sidebar's
cached recency with all-null data
- advance channel recency from live message events so Recent ordering
updates without waiting for the next refresh

## Root cause

The desktop sent one explicit `#h` filter per channel in a single
`/query`. The relay rejects a request with more than 128 aggregate
explicit channel values. The desktop swallowed that rejection and
returned no timestamps, so Recent correctly fell back to A–Z for every
channel.

## Testing

- `cargo test --manifest-path desktop/src-tauri/Cargo.toml
last_message_filters_stay_within_relay_channel_cap --lib`
- `cd desktop && pnpm test` (5,132 passed)
- `cd desktop && pnpm exec biome check
src/features/channels/useLiveChannelUpdates.ts
src/features/channels/lib/channelRecency.ts
src/features/channels/lib/channelRecency.test.mjs
tests/e2e/channel-sort.spec.ts`
- `cd desktop && pnpm check:file-sizes`
- `cargo fmt --all -- --check`
- `cd desktop && pnpm build:e2e` followed by `pnpm exec playwright test
tests/e2e/channel-sort.spec.ts --project=smoke --workers=1` against a
dedicated static server (4 passed)

## Manual test

In a workspace with more than 128 channels, choose **Channels → Sort →
Recent**. Channels should order by latest message instead of A–Z. While
Recent is selected, a new message in a visible channel should move that
channel to the top immediately.

---------

Signed-off-by: Wes <wesbillman@users.noreply.github.com>
Co-authored-by: Carl <32a2e2c9d428ee08902cab75d956da2c1d235a22d4766b0dd4138bf6e2e5db1d@buzz.block.builderlab.xyz>
---
 .../src-tauri/src/commands/channels/fetch.rs  |  62 ++++--
 .../src-tauri/src/commands/channels_tests.rs  |  29 +++
 desktop/src/features/channels/hooks.test.mjs  | 155 +++++++++++++-
 desktop/src/features/channels/hooks.ts        | 196 +++++++++++-------
 .../channels/lib/channelRecency.test.mjs      |  97 +++++++++
 .../features/channels/lib/channelRecency.ts   |  63 ++++++
 .../channels/lib/channelRecencyMerge.ts       |  39 ++++
 .../channels/useLiveChannelUpdates.ts         |   8 +
 desktop/src/testing/e2eBridge.ts              |   6 +-
 desktop/tests/e2e/channel-sort.spec.ts        | 110 ++++++++--
 10 files changed, 659 insertions(+), 106 deletions(-)
 create mode 100644 desktop/src/features/channels/lib/channelRecency.test.mjs
 create mode 100644 desktop/src/features/channels/lib/channelRecency.ts
 create mode 100644 desktop/src/features/channels/lib/channelRecencyMerge.ts

diff --git a/desktop/src-tauri/src/commands/channels/fetch.rs b/desktop/src-tauri/src/commands/channels/fetch.rs
index c41a707341..36c24a35b7 100644
--- a/desktop/src-tauri/src/commands/channels/fetch.rs
+++ b/desktop/src-tauri/src/commands/channels/fetch.rs
@@ -9,6 +9,12 @@
 use crate::{app_state::AppState, models::ChannelInfo, nostr_convert, relay::query_relay};
 
 pub(super) const DIRECTORY_PAGE_SIZE: usize = 500;
+// Keep this aligned with the relay's aggregate explicit-`#h` request bound.
+// Each filter carries one channel so the relay can use its channel_id index.
+const LAST_MESSAGE_QUERY_CHANNEL_BATCH_SIZE: usize = 128;
+// Human-visible channel activity that drives sidebar Recent ordering. Keep this
+// aligned with desktop/src/shared/constants/kinds.ts::CHANNEL_MESSAGE_EVENT_KINDS.
+const CHANNEL_RECENCY_EVENT_KINDS: [u16; 4] = [9, 40002, 45001, 45003];
 
 pub(super) fn advance_directory_cursor(filter: &mut serde_json::Value, page: &[nostr::Event]) {
     let last = page
@@ -129,6 +135,33 @@ pub(super) fn compute_channels_hash(channels: &[ChannelInfo]) -> String {
 
 // ── Core fetch implementation ─────────────────────────────────────────────────
 
+pub(super) fn last_message_filter(channel_id: &str) -> serde_json::Value {
+    serde_json::json!({
+        "kinds": CHANNEL_RECENCY_EVENT_KINDS,
+        "#h": [channel_id],
+        "limit": 1
+    })
+}
+
+pub(super) fn last_message_filter_batches(
+    filters: &[serde_json::Value],
+) -> Vec<&[serde_json::Value]> {
+    filters
+        .chunks(LAST_MESSAGE_QUERY_CHANNEL_BATCH_SIZE)
+        .collect()
+}
+
+async fn query_last_messages(
+    state: &AppState,
+    filters: &[serde_json::Value],
+) -> Result<Vec<nostr::Event>, String> {
+    let mut messages = Vec::with_capacity(filters.len());
+    for batch in last_message_filter_batches(filters) {
+        messages.extend(query_relay(state, batch).await?);
+    }
+    Ok(messages)
+}
+
 /// Whether `fetch_channels` includes the unbounded all-open directory scan.
 ///
 /// The 60s channel poll uses [`DirectoryScope::MemberOnly`]: it resolves only
@@ -154,7 +187,10 @@ pub(super) enum DirectoryScope {
 ///   metadata source (pending-owned ids when member-only, else the all-open
 ///   kind:39000 scan), and the hidden-DM snapshot (kind:30622).
 /// - Phase 2 (parallel): member counts (kind:39002 batch) and last-message
-///   timestamps (per-channel kind:9/40002), fanned out over the merged set.
+///   timestamps (bounded per-channel human-visible activity batches), fanned
+///   out over the merged set. Member-count failures degrade to zero; timestamp
+///   failures abort so cached recency is never replaced by a false
+///   authoritative empty result.
 pub(super) async fn fetch_channels(
     state: &AppState,
     scope: DirectoryScope,
@@ -336,19 +372,13 @@ pub(super) async fn fetch_channels(
     }
 
     // Phase 2 — concurrent: member counts (step 4) and last-message timestamps
-    // (step 5). Both tolerate failures — empty defaults leave counts at 0 and
-    // timestamps at None rather than aborting.
+    // (step 5). Member-count failures degrade to zero. Timestamp failures
+    // abort this refresh so the frontend keeps its previous Recent ordering.
     let all_channel_ids: Vec<String> = channels.iter().map(|c| c.id.clone()).collect();
     if !all_channel_ids.is_empty() {
         let last_msg_filters: Vec<serde_json::Value> = all_channel_ids
             .iter()
-            .map(|id| {
-                serde_json::json!({
-                    "kinds": [9, 40002],
-                    "#h": [id],
-                    "limit": 1
-                })
-            })
+            .map(|id| last_message_filter(id))
             .collect();
 
         // Bind both filter arrays before the join so their lifetimes cover
@@ -361,10 +391,14 @@ pub(super) async fn fetch_channels(
         let (members_result, message_result) = tokio::join!(
             // Step 4: batch-fetch kind:39002 for member counts.
             query_relay(state, &member_count_filters),
-            // Step 5: per-channel last-message filter. Uses per-channel `#h`
-            // so the relay can push each query to its indexed channel_id column.
-            query_relay(state, &last_msg_filters),
+            // Step 5: preserve one indexed filter per channel while keeping
+            // every relay request within its aggregate explicit-channel cap.
+            query_last_messages(state, &last_msg_filters),
         );
+        // Message timestamps drive the user-selected Recent ordering. Unlike
+        // member counts, a failed query must not masquerade as an authoritative
+        // empty result and clear every cached timestamp in the frontend.
+        let messages = message_result?;
 
         let membership = collect_members_by_channel(&members_result.unwrap_or_default());
         for channel in &mut channels {
@@ -376,7 +410,7 @@ pub(super) async fn fetch_channels(
 
         let mut last_message_by_channel: std::collections::HashMap<String, u64> =
             std::collections::HashMap::new();
-        for ev in &message_result.unwrap_or_default() {
+        for ev in &messages {
             if let Some(ch_id) = ev.tags.iter().find_map(|t| {
                 let s = t.as_slice();
                 (s.len() >= 2 && s[0] == "h").then(|| s[1].clone())
diff --git a/desktop/src-tauri/src/commands/channels_tests.rs b/desktop/src-tauri/src/commands/channels_tests.rs
index e78d4498c8..fb43bb7a70 100644
--- a/desktop/src-tauri/src/commands/channels_tests.rs
+++ b/desktop/src-tauri/src/commands/channels_tests.rs
@@ -461,3 +461,32 @@ fn starter_match_requires_open_unarchived_stream_by_normalized_name() {
     channel.archived_at = Some("2026-07-16T00:00:00Z".to_string());
     assert!(!is_matching_starter_channel(&channel, spec));
 }
+
+#[test]
+fn last_message_filter_covers_all_human_visible_activity_kinds() {
+    let filter = last_message_filter("forum-1");
+
+    assert_eq!(
+        filter,
+        serde_json::json!({
+            "kinds": [9, 40002, 45001, 45003],
+            "#h": ["forum-1"],
+            "limit": 1
+        })
+    );
+}
+
+#[test]
+fn last_message_filters_stay_within_relay_channel_cap() {
+    let filters: Vec<serde_json::Value> = (0..257)
+        .map(|index| serde_json::json!({"#h": [format!("channel-{index}")]}))
+        .collect();
+
+    let batches = last_message_filter_batches(&filters);
+
+    assert_eq!(
+        batches.iter().map(|batch| batch.len()).collect::<Vec<_>>(),
+        [128, 128, 1]
+    );
+    assert_eq!(batches.concat(), filters);
+}
diff --git a/desktop/src/features/channels/hooks.test.mjs b/desktop/src/features/channels/hooks.test.mjs
index 7dee24392f..8efeed8536 100644
--- a/desktop/src/features/channels/hooks.test.mjs
+++ b/desktop/src/features/channels/hooks.test.mjs
@@ -1,10 +1,14 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
+import { QueryClient } from "@tanstack/react-query";
+
 import {
   applyLastMessages,
   canFetchChannelsForIdentity,
+  channelsQueryKey,
   reconcileRefreshedCachedChannel,
+  refreshChannelsQuery,
   requireFullChannelList,
   upsertCachedChannel,
   upsertCachedChannelMember,
@@ -14,7 +18,7 @@ function makeChannel(
   id,
   name,
   channelType = "stream",
-  { participantPubkeys = [], participants = [] } = {},
+  { participantPubkeys = [], participants = [], lastMessageAt = null } = {},
 ) {
   return {
     id,
@@ -26,7 +30,7 @@ function makeChannel(
     purpose: null,
     memberCount: participantPubkeys.length,
     memberPubkeys: [...participantPubkeys],
-    lastMessageAt: null,
+    lastMessageAt,
     archivedAt: null,
     participants,
     participantPubkeys,
@@ -36,6 +40,153 @@ function makeChannel(
   };
 }
 
+function deferred() {
+  let resolve;
+  const promise = new Promise((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+function makeRefreshHarness({ cachedHash = "hash-1" } = {}) {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false } },
+  });
+  const start = makeChannel("general", "General", "stream", {
+    lastMessageAt: "2026-01-01T00:00:00.000Z",
+  });
+  queryClient.setQueryData(channelsQueryKey, [start]);
+  const request = deferred();
+  const calls = [];
+  const fetchChannels = (knownHash) => {
+    calls.push(knownHash);
+    return request.promise;
+  };
+  const initialSnapshotPair = cachedHash
+    ? { channels: [start], hash: cachedHash }
+    : null;
+
+  return {
+    calls,
+    fetchChannels,
+    initialSnapshotPair,
+    queryClient,
+    request,
+    start,
+  };
+}
+
+function setDisplayedRecency(queryClient, lastMessageAt) {
+  queryClient.setQueryData(channelsQueryKey, (channels) =>
+    channels.map((channel) =>
+      channel.id === "general" ? { ...channel, lastMessageAt } : channel,
+    ),
+  );
+}
+
+function refreshWithHarness(harness, fetchChannels = harness.fetchChannels) {
+  return harness.queryClient.fetchQuery({
+    queryKey: channelsQueryKey,
+    queryFn: () =>
+      refreshChannelsQuery({
+        queryClient: harness.queryClient,
+        initialSnapshotPair: harness.initialSnapshotPair,
+        relayUrl: null,
+        ownerPubkey: null,
+        fetchChannels,
+      }),
+  });
+}
+
+const T1 = "2026-01-01T00:01:00.000Z";
+const T2 = "2026-01-01T00:02:00.000Z";
+
+test("refreshChannelsQuery preserves a live update through matching not-modified settlement", async () => {
+  const harness = makeRefreshHarness();
+  const refresh = refreshWithHarness(harness);
+
+  assert.deepEqual(harness.calls, ["hash-1"]);
+  setDisplayedRecency(harness.queryClient, T2);
+  harness.request.resolve({
+    hash: "hash-1",
+    channels: null,
+    lastMessages: { general: T1 },
+  });
+
+  const result = await refresh;
+  assert.equal(result[0].lastMessageAt, T2);
+  assert.equal(
+    harness.queryClient.getQueryData(channelsQueryKey)[0].lastMessageAt,
+    T2,
+  );
+});
+
+test("refreshChannelsQuery preserves a live update through authoritative full-list settlement", async () => {
+  const harness = makeRefreshHarness({ cachedHash: null });
+  const refresh = refreshWithHarness(harness);
+
+  assert.deepEqual(harness.calls, [null]);
+  setDisplayedRecency(harness.queryClient, T2);
+  harness.request.resolve({
+    hash: "hash-2",
+    channels: [makeChannel("general", "General")],
+    lastMessages: { general: T1 },
+  });
+
+  const result = await refresh;
+  assert.equal(result[0].lastMessageAt, T2);
+  assert.equal(
+    harness.queryClient.getQueryData(channelsQueryKey)[0].lastMessageAt,
+    T2,
+  );
+});
+
+test("refreshChannelsQuery preserves a live update through mismatched not-modified retry", async () => {
+  const harness = makeRefreshHarness();
+  const retry = deferred();
+  const fetchChannels = (knownHash) => {
+    harness.calls.push(knownHash);
+    return harness.calls.length === 1
+      ? Promise.resolve({
+          hash: "mismatched-hash",
+          channels: null,
+          lastMessages: {},
+        })
+      : retry.promise;
+  };
+  const refresh = refreshWithHarness(harness, fetchChannels);
+
+  await Promise.resolve();
+  assert.deepEqual(harness.calls, ["hash-1", null]);
+  setDisplayedRecency(harness.queryClient, T2);
+  retry.resolve({
+    hash: "hash-2",
+    channels: [makeChannel("general", "General")],
+    lastMessages: { general: T1 },
+  });
+
+  const result = await refresh;
+  assert.equal(result[0].lastMessageAt, T2);
+  assert.equal(
+    harness.queryClient.getQueryData(channelsQueryKey)[0].lastMessageAt,
+    T2,
+  );
+});
+
+test("refreshChannelsQuery clears unchanged recency on authoritative absence", async () => {
+  const harness = makeRefreshHarness();
+  const refresh = refreshWithHarness(harness);
+
+  harness.request.resolve({
+    hash: "hash-1",
+    channels: null,
+    lastMessages: {},
+  });
+
+  const result = await refresh;
+  assert.equal(result[0].lastMessageAt, null);
+});
+
 test("upsertCachedChannel_reseedsOpenedDmAfterStaleRefetch", () => {
   const staleChannels = [makeChannel("general", "General")];
   const openedDm = makeChannel("new-dm", "Alice", "dm");
diff --git a/desktop/src/features/channels/hooks.ts b/desktop/src/features/channels/hooks.ts
index 007ffeef44..9f612031f3 100644
--- a/desktop/src/features/channels/hooks.ts
+++ b/desktop/src/features/channels/hooks.ts
@@ -1,5 +1,10 @@
 import * as React from "react";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+  useMutation,
+  useQuery,
+  useQueryClient,
+  type QueryClient,
+} from "@tanstack/react-query";
 
 import {
   addChannelMembers,
@@ -31,7 +36,11 @@ import type {
   SetChannelTopicInput,
   UpdateChannelInput,
 } from "@/shared/api/types";
-import type { OpenDmInput } from "@/shared/api/tauriChannels";
+import type {
+  GetChannelsPayload,
+  OpenDmInput,
+} from "@/shared/api/tauriChannels";
+import { mergeConcurrentChannelRecency } from "@/features/channels/lib/channelRecencyMerge";
 import { useIdentityQuery } from "@/shared/api/hooks";
 import { useFocusedRefetchInterval } from "@/shared/lib/useDocumentVisible";
 import { useCommunities } from "@/features/communities/useCommunities";
@@ -312,6 +321,113 @@ export function requireFullChannelList(channels: Channel[] | null): Channel[] {
   return channels;
 }
 
+export type RefreshChannelsQueryOptions = {
+  queryClient: QueryClient;
+  initialSnapshotPair: ChannelSnapshot | null;
+  relayUrl: string | null;
+  ownerPubkey: string | null;
+  fetchChannels?: (knownHash: string | null) => Promise<GetChannelsPayload>;
+  persistSnapshot?: typeof writeChannelSnapshot;
+};
+
+/**
+ * Revalidates the channel query while preserving live recency updates that land
+ * during the request. Exported so the production query/cache interleaving can
+ * be regression-tested without replacing it with a helper-only simulation.
+ */
+export async function refreshChannelsQuery({
+  queryClient,
+  initialSnapshotPair,
+  relayUrl,
+  ownerPubkey,
+  fetchChannels = getChannels,
+  persistSnapshot = writeChannelSnapshot,
+}: RefreshChannelsQueryOptions): Promise<Channel[]> {
+  // Revalidation uses only an authoritative list/hash pair. The displayed
+  // channels cache is intentionally ignored because successful mutations
+  // patch it before the relay's list/hash has necessarily caught up.
+  const cachedPair =
+    queryClient.getQueryData<ChannelSnapshot>(channelsSnapshotPairKey) ??
+    initialSnapshotPair;
+  const knownHash = cachedPair?.hash ?? null;
+
+  const channelsAtRequestStart =
+    queryClient.getQueryData<Channel[]>(channelsQueryKey);
+  const payload = await fetchChannels(knownHash);
+
+  // A not-modified response is usable only when it echoes the exact hash
+  // that described the available list. Any other hash/list pairing fails
+  // slow-never-wrong by retrying without a hash.
+  const hasMatchingNotModifiedResponse =
+    payload.channels === null &&
+    knownHash !== null &&
+    payload.hash === knownHash;
+  const pairChannels =
+    payload.channels ??
+    (hasMatchingNotModifiedResponse ? cachedPair?.channels : undefined);
+
+  if (!pairChannels) {
+    // Missing cache or a mismatched not-modified response: discard the hash
+    // and fetch a complete authoritative list before updating persistence.
+    const full = await fetchChannels(null);
+    const authoritativeChannels = sortChannels(
+      applyLastMessages(
+        requireFullChannelList(full.channels),
+        full.lastMessages,
+      ),
+    );
+    const displayedAtSettlement =
+      queryClient.getQueryData<Channel[]>(channelsQueryKey);
+    const sorted = sortChannels(
+      mergeConcurrentChannelRecency(
+        authoritativeChannels,
+        displayedAtSettlement,
+        channelsAtRequestStart,
+      ),
+    );
+    const pair = { channels: authoritativeChannels, hash: full.hash };
+    queryClient.setQueryData(channelsSnapshotPairKey, pair);
+    if (relayUrl && ownerPubkey) {
+      persistSnapshot(relayUrl, ownerPubkey, pair.channels, pair.hash);
+    }
+    return sorted;
+  }
+
+  const authoritativeChannels = sortChannels(
+    applyLastMessages(pairChannels, payload.lastMessages),
+  );
+  const pair = {
+    channels: authoritativeChannels,
+    hash: payload.hash,
+  };
+  queryClient.setQueryData(channelsSnapshotPairKey, pair);
+  // Merge against the displayed cache at settlement so a newer live
+  // timestamp cannot be rolled back by an older request result. This is
+  // required for both full-list and matching not-modified responses.
+  const displayedAtSettlement =
+    queryClient.getQueryData<Channel[]>(channelsQueryKey);
+  const refreshedForDisplay =
+    payload.channels === null
+      ? sortChannels(
+          applyLastMessages(
+            displayedAtSettlement ?? authoritativeChannels,
+            payload.lastMessages,
+          ),
+        )
+      : authoritativeChannels;
+  const sorted = sortChannels(
+    mergeConcurrentChannelRecency(
+      refreshedForDisplay,
+      displayedAtSettlement,
+      channelsAtRequestStart,
+    ),
+  );
+  if (relayUrl && ownerPubkey) {
+    persistSnapshot(relayUrl, ownerPubkey, pair.channels, pair.hash);
+  }
+  return sorted;
+}
+
 export function useChannelsQuery(options?: { enabled?: boolean }) {
   const { activeCommunity } = useCommunities();
   const relayUrl = activeCommunity?.relayUrl ?? null;
@@ -351,75 +467,13 @@ export function useChannelsQuery(options?: { enabled?: boolean }) {
       relayUrl !== null &&
       canFetchChannelsForIdentity(ownerPubkey, identityQuery.isError),
     queryKey: channelsQueryKey,
-    queryFn: async () => {
-      // Revalidation uses only an authoritative list/hash pair. The displayed
-      // channels cache is intentionally ignored because successful mutations
-      // patch it before the relay's list/hash has necessarily caught up.
-      const cachedPair =
-        queryClient.getQueryData<ChannelSnapshot>(channelsSnapshotPairKey) ??
-        initialSnapshotPair;
-      const knownHash = cachedPair?.hash ?? null;
-
-      const payload = await getChannels(knownHash);
-
-      // A not-modified response is usable only when it echoes the exact hash
-      // that described the available list. Any other hash/list pairing fails
-      // slow-never-wrong by retrying without a hash.
-      const hasMatchingNotModifiedResponse =
-        payload.channels === null &&
-        knownHash !== null &&
-        payload.hash === knownHash;
-      const pairChannels =
-        payload.channels ??
-        (hasMatchingNotModifiedResponse ? cachedPair?.channels : undefined);
-
-      if (!pairChannels) {
-        // Missing cache or a mismatched not-modified response: discard the hash
-        // and fetch a complete authoritative list before updating persistence.
-        const full = await getChannels(null);
-        const sorted = sortChannels(
-          applyLastMessages(
-            requireFullChannelList(full.channels),
-            full.lastMessages,
-          ),
-        );
-        const pair = { channels: sorted, hash: full.hash };
-        queryClient.setQueryData(channelsSnapshotPairKey, pair);
-        if (relayUrl && ownerPubkey) {
-          writeChannelSnapshot(relayUrl, ownerPubkey, pair.channels, pair.hash);
-        }
-        return sorted;
-      }
-
-      const authoritativeChannels = sortChannels(
-        applyLastMessages(pairChannels, payload.lastMessages),
-      );
-      const pair = {
-        channels: authoritativeChannels,
-        hash: payload.hash,
-      };
-      queryClient.setQueryData(channelsSnapshotPairKey, pair);
-      // A matching not-modified result must merge timestamps into whatever is
-      // displayed at completion time. Reading through setQueryData avoids
-      // clobbering an optimistic mutation that landed while the request ran.
-      const sorted =
-        payload.channels === null
-          ? (queryClient.setQueryData<Channel[]>(
-              channelsQueryKey,
-              (displayedChannels) =>
-                sortChannels(
-                  applyLastMessages(
-                    displayedChannels ?? authoritativeChannels,
-                    payload.lastMessages,
-                  ),
-                ),
-            ) ?? authoritativeChannels)
-          : authoritativeChannels;
-      if (relayUrl && ownerPubkey) {
-        writeChannelSnapshot(relayUrl, ownerPubkey, pair.channels, pair.hash);
-      }
-      return sorted;
-    },
+    queryFn: () =>
+      refreshChannelsQuery({
+        queryClient,
+        initialSnapshotPair,
+        relayUrl,
+        ownerPubkey,
+      }),
     // Paint the complete persisted list immediately. `initialDataUpdatedAt: 0`
     // deliberately keeps it stale so every boot still validates against the
     // relay; queryFn reads the matching hash from the same atomic document.
diff --git a/desktop/src/features/channels/lib/channelRecency.test.mjs b/desktop/src/features/channels/lib/channelRecency.test.mjs
new file mode 100644
index 0000000000..30e57714c1
--- /dev/null
+++ b/desktop/src/features/channels/lib/channelRecency.test.mjs
@@ -0,0 +1,97 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { applyChannelLastMessageAt } from "./channelRecency.ts";
+import { mergeConcurrentChannelRecency } from "./channelRecencyMerge.ts";
+
+function makeChannel(id, lastMessageAt = null) {
+  return { id, lastMessageAt };
+}
+
+test("applyChannelLastMessageAt advances only the matching channel", () => {
+  const general = makeChannel("general", "2026-01-01T00:00:00.000Z");
+  const design = makeChannel("design", "2026-01-01T00:00:00.000Z");
+
+  const result = applyChannelLastMessageAt(
+    [general, design],
+    "design",
+    1_767_225_660,
+  );
+
+  assert.notStrictEqual(result, undefined);
+  assert.strictEqual(result[0], general);
+  assert.notStrictEqual(result[1], design);
+  assert.equal(result[1].lastMessageAt, "2026-01-01T00:01:00.000Z");
+});
+
+test("applyChannelLastMessageAt ignores stale or equal timestamps", () => {
+  const design = makeChannel("design", "2026-01-01T00:01:00.000Z");
+  const channels = [design];
+
+  assert.strictEqual(
+    applyChannelLastMessageAt(channels, "design", 1_767_225_600),
+    channels,
+  );
+  assert.strictEqual(
+    applyChannelLastMessageAt(channels, "design", "2026-01-01T00:01:00.000Z"),
+    channels,
+  );
+});
+
+test("applyChannelLastMessageAt preserves the list for invalid or unknown updates", () => {
+  const channels = [makeChannel("design")];
+
+  assert.strictEqual(
+    applyChannelLastMessageAt(channels, "design", "not-a-date"),
+    channels,
+  );
+  assert.strictEqual(
+    applyChannelLastMessageAt(channels, "unknown", 1_767_225_660),
+    channels,
+  );
+  assert.strictEqual(
+    applyChannelLastMessageAt(undefined, "design", 1_767_225_660),
+    undefined,
+  );
+});
+
+function mergeRecency(start, displayed, refreshed) {
+  return mergeConcurrentChannelRecency(
+    [makeChannel("general", refreshed)],
+    [makeChannel("general", displayed)],
+    [makeChannel("general", start)],
+  )[0];
+}
+
+test("mergeConcurrentChannelRecency preserves a newer live timestamp", () => {
+  const result = mergeRecency(
+    "2026-01-01T00:00:00Z",
+    "2026-01-01T00:02:00Z",
+    "2026-01-01T00:01:00Z",
+  );
+  assert.equal(result.lastMessageAt, "2026-01-01T00:02:00Z");
+});
+
+test("mergeConcurrentChannelRecency preserves monotonic and absence semantics", () => {
+  assert.equal(
+    mergeRecency(
+      "2026-01-01T00:02:00Z",
+      "2026-01-01T00:02:00Z",
+      "2026-01-01T00:01:00Z",
+    ).lastMessageAt,
+    "2026-01-01T00:02:00Z",
+  );
+  assert.equal(
+    mergeRecency("2026-01-01T00:01:00Z", "2026-01-01T00:01:00Z", null)
+      .lastMessageAt,
+    null,
+  );
+  assert.equal(
+    mergeRecency(
+      "2026-01-01T00:00:00Z",
+      "2026-01-01T00:01:00Z",
+      "2026-01-01T00:02:00Z",
+    ).lastMessageAt,
+    "2026-01-01T00:02:00Z",
+  );
+});
diff --git a/desktop/src/features/channels/lib/channelRecency.ts b/desktop/src/features/channels/lib/channelRecency.ts
new file mode 100644
index 0000000000..30cc162504
--- /dev/null
+++ b/desktop/src/features/channels/lib/channelRecency.ts
@@ -0,0 +1,63 @@
+import type { QueryClient } from "@tanstack/react-query";
+
+import { channelsQueryKey } from "@/features/channels/hooks";
+import type { Channel } from "@/shared/api/types";
+
+function parseTimestamp(value: number | string | null | undefined) {
+  if (typeof value === "number") {
+    return Number.isFinite(value) ? value * 1_000 : null;
+  }
+
+  if (!value) {
+    return null;
+  }
+
+  const timestamp = Date.parse(value);
+  return Number.isNaN(timestamp) ? null : timestamp;
+}
+
+export function applyChannelLastMessageAt(
+  current: Channel[] | undefined,
+  channelId: string,
+  lastMessageAt: number | string | null | undefined,
+): Channel[] | undefined {
+  if (!current) {
+    return current;
+  }
+
+  const candidateTimestamp = parseTimestamp(lastMessageAt);
+  if (candidateTimestamp === null) {
+    return current;
+  }
+
+  let didUpdate = false;
+  const normalizedLastMessageAt = new Date(candidateTimestamp).toISOString();
+  const nextChannels = current.map((channel) => {
+    if (channel.id !== channelId) {
+      return channel;
+    }
+
+    const currentTimestamp = parseTimestamp(channel.lastMessageAt);
+    if (currentTimestamp !== null && candidateTimestamp <= currentTimestamp) {
+      return channel;
+    }
+
+    didUpdate = true;
+    return {
+      ...channel,
+      lastMessageAt: normalizedLastMessageAt,
+    };
+  });
+
+  return didUpdate ? nextChannels : current;
+}
+
+export function updateChannelLastMessageAt(
+  queryClient: QueryClient,
+  channelId: string,
+  lastMessageAt: number | string | null | undefined,
+) {
+  queryClient.setQueryData<Channel[]>(channelsQueryKey, (current) =>
+    applyChannelLastMessageAt(current, channelId, lastMessageAt),
+  );
+}
diff --git a/desktop/src/features/channels/lib/channelRecencyMerge.ts b/desktop/src/features/channels/lib/channelRecencyMerge.ts
new file mode 100644
index 0000000000..50cfd0ea45
--- /dev/null
+++ b/desktop/src/features/channels/lib/channelRecencyMerge.ts
@@ -0,0 +1,39 @@
+export type RecencyChannel = {
+  id: string;
+  lastMessageAt: string | null;
+};
+
+function timestamp(value: string | null | undefined): number | null {
+  if (!value) return null;
+  const parsed = Date.parse(value);
+  return Number.isNaN(parsed) ? null : parsed;
+}
+
+/**
+ * Keeps recency monotonic when a refresh settles. An authoritative absence may
+ * clear an unchanged value, but never a live value added during the request.
+ */
+export function mergeConcurrentChannelRecency<T extends RecencyChannel>(
+  refreshed: T[],
+  displayed: T[] | undefined,
+  atRequestStart: T[] | undefined,
+): T[] {
+  if (!displayed) return refreshed;
+  const displayedById = new Map(displayed.map((c) => [c.id, c.lastMessageAt]));
+  const startById = new Map(
+    atRequestStart?.map((c) => [c.id, c.lastMessageAt]) ?? [],
+  );
+
+  return refreshed.map((channel) => {
+    const displayedValue = displayedById.get(channel.id);
+    const displayedAt = timestamp(displayedValue);
+    const refreshedAt = timestamp(channel.lastMessageAt);
+    const changed = displayedValue !== startById.get(channel.id);
+    const keepDisplayed =
+      displayedAt !== null &&
+      (refreshedAt !== null ? displayedAt > refreshedAt : changed);
+    return keepDisplayed
+      ? { ...channel, lastMessageAt: displayedValue ?? null }
+      : channel;
+  });
+}
diff --git a/desktop/src/features/channels/useLiveChannelUpdates.ts b/desktop/src/features/channels/useLiveChannelUpdates.ts
index 800467b6ea..7598e8db3e 100644
--- a/desktop/src/features/channels/useLiveChannelUpdates.ts
+++ b/desktop/src/features/channels/useLiveChannelUpdates.ts
@@ -2,6 +2,7 @@ import * as React from "react";
 import { useQueryClient } from "@tanstack/react-query";
 
 import { channelsQueryKey } from "@/features/channels/hooks";
+import { updateChannelLastMessageAt } from "@/features/channels/lib/channelRecency";
 import { mergeTimelineCacheMessages } from "@/features/messages/hooks";
 import { channelMessagesKey } from "@/features/messages/lib/messageQueryKeys";
 import {
@@ -247,6 +248,13 @@ export function useLiveChannelUpdates(
       isDmChannel,
     );
 
+    // Recency is presentation state, not notification state. Every recognized
+    // message advances Recent ordering, including self-authored and muted
+    // messages that the notification policy deliberately filters below.
+    if (isUnreadTriggerKind) {
+      updateChannelLastMessageAt(queryClient, channelId, event.created_at);
+    }
+
     // Let the caller observe self-authored trigger events (e.g. to track
     // thread participation) before the author-exclusion guard filters them.
     if (
diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts
index f04959306d..a23d996a6e 100644
--- a/desktop/src/testing/e2eBridge.ts
+++ b/desktop/src/testing/e2eBridge.ts
@@ -2862,7 +2862,9 @@ const mockChannels: MockChannel[] = [
     description: "Casual forum for async discussions",
     topic: null,
     purpose: null,
-    last_message_at: null,
+    // Authoritative forum-post recency returned by get_channels. This must come
+    // from the native 45001/45003 query, not the stream-only 9/40002 query.
+    last_message_at: isoMinutesAgo(10),
     archived_at: null,
     created_by: ALICE_PUBKEY,
     topic_set_by: null,
@@ -2873,7 +2875,7 @@ const mockChannels: MockChannel[] = [
     max_members: null,
     nip29_group_id: null,
     created_minutes_ago: 900,
-    updated_minutes_ago: 900,
+    updated_minutes_ago: 10,
     members: [
       createMockMember(ALICE_PUBKEY, "owner", 900),
       createMockMember(MOCK_IDENTITY_PUBKEY, "member", 750),
diff --git a/desktop/tests/e2e/channel-sort.spec.ts b/desktop/tests/e2e/channel-sort.spec.ts
index c267a03b32..da70147032 100644
--- a/desktop/tests/e2e/channel-sort.spec.ts
+++ b/desktop/tests/e2e/channel-sort.spec.ts
@@ -2,7 +2,7 @@ import { expect, test } from "@playwright/test";
 import type { Page } from "@playwright/test";
 
 import { waitForAnimations } from "../helpers/animations";
-import { installMockBridge } from "../helpers/bridge";
+import { TEST_IDENTITIES, installMockBridge } from "../helpers/bridge";
 
 const SHOTS = "test-results/channel-sort";
 
@@ -28,6 +28,58 @@ async function openApp(page: Page) {
   await expect(page.getByTestId("chat-title")).toHaveText("general");
 }
 
+async function waitForMockLiveSubscription(page: Page, channelName: string) {
+  await expect
+    .poll(() =>
+      page.evaluate(
+        (name) =>
+          window.__BUZZ_E2E_HAS_MOCK_LIVE_SUBSCRIPTION__?.({
+            channelName: name,
+          }) ?? false,
+        channelName,
+      ),
+    )
+    .toBe(true);
+}
+
+async function emitMockMessage(
+  page: Page,
+  channelName: string,
+  createdAt: number,
+) {
+  await page.evaluate(
+    ({ channelName, createdAt, pubkey }) => {
+      const emit = window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__;
+      if (!emit) {
+        throw new Error("Mock message emitter is not installed");
+      }
+      emit({
+        channelName,
+        content: "Fresh activity for Recent ordering",
+        createdAt,
+        pubkey,
+      });
+    },
+    { channelName, createdAt, pubkey: TEST_IDENTITIES.alice.pubkey },
+  );
+}
+
+function forumNames(page: Page) {
+  return page
+    .getByTestId("forum-list")
+    .locator("[data-testid^='channel-']")
+    .evaluateAll((nodes) =>
+      nodes
+        .map((n) => n.getAttribute("data-testid") ?? "")
+        .filter(
+          (id) =>
+            !id.startsWith("channel-unread") &&
+            !id.startsWith("channel-working"),
+        )
+        .map((id) => id.replace(/^channel-/, "")),
+    );
+}
+
 function streamNames(page: Page) {
   return page
     .getByTestId("stream-list")
@@ -61,6 +113,14 @@ test.describe("per-group channel sort", () => {
     await installMockBridge(page);
     await openApp(page);
 
+    // Prime a live subscription while A–Z keeps engineering rendered, then move
+    // away so the later message exercises sidebar recency rather than routing.
+    await page.getByTestId("channel-engineering").click();
+    await expect(page.getByTestId("chat-title")).toHaveText("engineering");
+    await waitForMockLiveSubscription(page, "engineering");
+    await page.getByTestId("channel-general").click();
+    await expect(page.getByTestId("chat-title")).toHaveText("general");
+
     // Hover the Channels header to reveal the action cluster, then open the
     // sort dropdown and choose Recent.
     const streamList = page.getByTestId("stream-list");
@@ -102,6 +162,18 @@ test.describe("per-group channel sort", () => {
     await waitForAnimations(page);
     await page.screenshot({ path: `${SHOTS}/03-channels-recent.png` });
 
+    // A fresh message must advance the matching channel immediately. The mock
+    // fixture intentionally pins all-replies in 2999, so use 3000 to prove the
+    // live cache update outranks even that deterministic sentinel.
+    await emitMockMessage(
+      page,
+      "engineering",
+      Math.floor(Date.parse("3000-01-01T00:00:00.000Z") / 1_000),
+    );
+    await expect
+      .poll(async () => (await streamNames(page)).slice(0, 3))
+      .toEqual(["engineering", "all-replies", "deep-history"]);
+
     // Persisted for this identity.
     const stored = await page.evaluate((key) => {
       return JSON.parse(window.localStorage.getItem(key) ?? "null");
@@ -129,26 +201,30 @@ test.describe("per-group channel sort", () => {
       .toEqual(["all-replies", "deep-history"]);
 
     // …while Forums (unset) stays alphabetical.
-    const forumNames = await page
-      .getByTestId("forum-list")
-      .locator("[data-testid^='channel-']")
-      .evaluateAll((nodes) =>
-        nodes
-          .map((n) => n.getAttribute("data-testid") ?? "")
-          .filter(
-            (id) =>
-              !id.startsWith("channel-unread") &&
-              !id.startsWith("channel-working"),
-          )
-          .map((id) => id.replace(/^channel-/, "")),
-      );
-    const sortedForums = [...forumNames].sort((a, b) => a.localeCompare(b));
-    expect(forumNames).toEqual(sortedForums);
+    const forumOrder = await forumNames(page);
+    const sortedForums = [...forumOrder].sort((a, b) => a.localeCompare(b));
+    expect(forumOrder).toEqual(sortedForums);
     await waitForAnimations(page);
     await page.screenshot({ path: `${SHOTS}/04-independent-groups.png` });
   });
 
-  test("04 — DM group has its own sort trigger", async ({ page }) => {
+  test("04 — Forum Recent survives authoritative reload", async ({ page }) => {
+    await seedSortState(page, { forums: "recent" });
+    await installMockBridge(page);
+    await openApp(page);
+
+    await expect
+      .poll(async () => (await forumNames(page)).slice(0, 2))
+      .toEqual(["watercooler", "announcements"]);
+
+    await page.reload();
+    await expect(page.getByTestId("forum-list")).toBeVisible();
+    await expect
+      .poll(async () => (await forumNames(page)).slice(0, 2))
+      .toEqual(["watercooler", "announcements"]);
+  });
+
+  test("05 — DM group has its own sort trigger", async ({ page }) => {
     await installMockBridge(page);
     await openApp(page);
 

From c63ac746cd4622e043574c305ff54021b07b847b Mon Sep 17 00:00:00 2001
From: Will Pfleger <pfleger.will@gmail.com>
Date: Thu, 20 Aug 2026 19:44:05 -0400
Subject: [PATCH 04/38] perf(desktop): split discover_acp_providers into cheap
 and forced paths (#6330)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Splits the `discover_acp_providers` Tauri command into a cheap cached
path and an explicit forced re-discovery path.

The profiling flight-recorder identified `discover_acp_providers` as the
acute UI-freeze correlate: a 20–65s probe pipeline (PATH re-fetch, CLI
auth probes, process spawns) was running on routine renders like channel
switches, because hot surfaces remounted the wrapping query and
automatic staleness refetches re-ran the full pipeline. This is
complementary to the idle auto-reload (#5588) and bounded-accumulator
(#5596) work.

## Backend
- Added a `force` parameter to `discover_acp_providers` /
`discover_acp_runtimes_from`. The default (cheap) path serves cached
availability and auth statuses with zero process spawns; `force: true`
runs the full pipeline (cache clear, PATH re-fetch, CLI auth probes).
- Added a single-flight coalescer (`forced_single_flight`) so concurrent
forced runs share one probe instead of stacking.
- Extracted the auth-status cache and `resolve_auth_statuses` into
`discovery/auth_status_cache.rs`.

## Renderer
- Raised `staleTime` to 30 min; forced refresh flows only through an
explicit `fetchQuery` path (`refreshAcpRuntimes`), so automatic
staleness refetches can never re-run probes.
- Added `useAcpRuntimesQueryForced` for Settings and onboarding
surfaces; connect/install/save/delete mutations force-refresh in
`onSettled`.
- Switched `SetupStep`, `HarnessCatalogDialog`, and
`HarnessesSettingsPanel` to the forced hook.

## Structure
The touched files were at or over the grandfathered 1000-line file-size
ceiling, so the change is delivered as cohesive extractions rather than
in-place growth: `forced_single_flight.rs`, `auth_status_cache.rs`,
`discovery/tests/forced_discovery.rs`, `acpRuntimesQuery.ts`, and
`tauriAcpDiscovery.ts`. Dependencies are one-directional (`hooks.ts`
imports from `acpRuntimesQuery.ts` and re-exports the forced hook, so
consumer imports are unchanged; no import cycle).

## Tests
Added Rust tests pinning the cheap-vs-forced split: a probe is spawned
only when forced, the cheap path reuses the cache, and auth status is
`Unknown` before any probe runs.

---------

Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
Co-authored-by: Duncan <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz>
---
 .../src-tauri/src/commands/agent_discovery.rs |  19 +-
 .../agent_discovery/forced_single_flight.rs   |  80 +++
 .../src-tauri/src/managed_agents/discovery.rs | 350 +++-------
 .../discovery/auth_status_cache.rs            | 105 +++
 .../managed_agents/discovery/login_shell.rs   | 236 +++++++
 .../discovery/login_shell_spawn_probe.rs      |  21 +
 .../src/managed_agents/discovery/presets.rs   |   2 +-
 .../src/managed_agents/discovery/tests.rs     |  37 +-
 .../discovery/tests/forced_discovery.rs       | 163 +++++
 .../tests/managed_path_resolution.rs          |  99 +++
 .../src/managed_agents/runtime/cli_tests.rs   |  38 ++
 .../src/managed_agents/runtime/tests.rs       |  33 +-
 .../features/agents/acpRuntimesQuery.test.mjs | 491 +++++++++++++
 .../src/features/agents/acpRuntimesQuery.ts   | 135 ++++
 desktop/src/features/agents/hooks.ts          |  34 +-
 .../ui/SetupStep.acpForcedGate.test.mjs       | 433 ++++++++++++
 .../src/features/onboarding/ui/SetupStep.tsx  |  65 +-
 .../src/features/onboarding/welcomeGuide.ts   |   2 +-
 ...arnessCatalogDialog.acpForcedGate.test.mjs | 646 ++++++++++++++++++
 .../settings/ui/HarnessCatalogDialog.tsx      |  63 +-
 .../settings/ui/HarnessesSettingsPanel.tsx    |   6 +-
 desktop/src/shared/api/tauri.ts               |   6 -
 desktop/src/shared/api/tauriAcpDiscovery.ts   |  24 +
 23 files changed, 2716 insertions(+), 372 deletions(-)
 create mode 100644 desktop/src-tauri/src/commands/agent_discovery/forced_single_flight.rs
 create mode 100644 desktop/src-tauri/src/managed_agents/discovery/auth_status_cache.rs
 create mode 100644 desktop/src-tauri/src/managed_agents/discovery/login_shell.rs
 create mode 100644 desktop/src-tauri/src/managed_agents/discovery/login_shell_spawn_probe.rs
 create mode 100644 desktop/src-tauri/src/managed_agents/discovery/tests/forced_discovery.rs
 create mode 100644 desktop/src-tauri/src/managed_agents/runtime/cli_tests.rs
 create mode 100644 desktop/src/features/agents/acpRuntimesQuery.test.mjs
 create mode 100644 desktop/src/features/agents/acpRuntimesQuery.ts
 create mode 100644 desktop/src/features/onboarding/ui/SetupStep.acpForcedGate.test.mjs
 create mode 100644 desktop/src/features/settings/ui/HarnessCatalogDialog.acpForcedGate.test.mjs
 create mode 100644 desktop/src/shared/api/tauriAcpDiscovery.ts

diff --git a/desktop/src-tauri/src/commands/agent_discovery.rs b/desktop/src-tauri/src/commands/agent_discovery.rs
index 95534854a0..95e9759f10 100644
--- a/desktop/src-tauri/src/commands/agent_discovery.rs
+++ b/desktop/src-tauri/src/commands/agent_discovery.rs
@@ -4,6 +4,7 @@ use crate::managed_agents::{
     DEFAULT_ACP_COMMAND,
 };
 
+mod forced_single_flight;
 mod post_install_verification;
 
 fn active_installs() -> &'static std::sync::Mutex<std::collections::HashSet<String>> {
@@ -49,23 +50,15 @@ pub(crate) fn plan_adapter_install<'c>(
     }
 }
 
+/// Discover the ACP runtime catalog. `force: false` (the default) serves the
+/// cheap cached path; `force: true` runs the expensive re-discovery. See
+/// [`forced_single_flight`] for the split and single-flight coalescing.
 #[tauri::command]
 pub async fn discover_acp_providers(
     app: tauri::AppHandle,
+    force: Option<bool>,
 ) -> Result<Vec<AcpRuntimeCatalogEntry>, String> {
-    tokio::task::spawn_blocking(move || {
-        use tauri::Manager;
-        crate::managed_agents::clear_resolve_cache();
-        crate::managed_agents::refresh_login_shell_path();
-        let custom_dir = app
-            .path()
-            .app_data_dir()
-            .ok()
-            .map(|d| d.join("custom_harnesses"));
-        crate::managed_agents::discover_acp_runtimes_from(custom_dir.as_deref())
-    })
-    .await
-    .map_err(|e| format!("spawn_blocking failed: {e}"))
+    forced_single_flight::discover(app, force.unwrap_or(false)).await
 }
 
 /// Write a user-defined harness definition to `<app-data>/custom_harnesses/<id>.json`.
diff --git a/desktop/src-tauri/src/commands/agent_discovery/forced_single_flight.rs b/desktop/src-tauri/src/commands/agent_discovery/forced_single_flight.rs
new file mode 100644
index 0000000000..3667d3b237
--- /dev/null
+++ b/desktop/src-tauri/src/commands/agent_discovery/forced_single_flight.rs
@@ -0,0 +1,80 @@
+//! Discovery execution + single-flight coalescing for the ACP runtime catalog.
+//!
+//! `force: false` serves from the process caches (no clear, no PATH re-fetch, no
+//! CLI auth probes) — the low-millisecond path hot surfaces render from.
+//!
+//! `force: true` runs the expensive probe pipeline. React Query already dedups
+//! the hook consumers; the single-flight here is the seatbelt for non-hook
+//! invoke paths, so a burst of forced triggers coalesces onto one in-flight run
+//! instead of stacking the pipeline.
+
+use super::AcpRuntimeCatalogEntry;
+
+type BoxedDiscovery = std::pin::Pin<
+    Box<dyn std::future::Future<Output = Result<Vec<AcpRuntimeCatalogEntry>, String>> + Send>,
+>;
+type SharedDiscovery = futures_util::future::Shared<BoxedDiscovery>;
+
+fn inflight() -> &'static std::sync::Mutex<Option<SharedDiscovery>> {
+    use std::sync::{Mutex, OnceLock};
+    static INFLIGHT: OnceLock<Mutex<Option<SharedDiscovery>>> = OnceLock::new();
+    INFLIGHT.get_or_init(|| Mutex::new(None))
+}
+
+/// Discover the ACP runtime catalog. Cheap calls run directly; forced calls
+/// coalesce onto a single shared run (see module docs).
+pub(super) async fn discover(
+    app: tauri::AppHandle,
+    force: bool,
+) -> Result<Vec<AcpRuntimeCatalogEntry>, String> {
+    if !force {
+        return run(app, false).await;
+    }
+
+    let shared = {
+        let mut guard = inflight().lock().unwrap_or_else(|e| e.into_inner());
+        match guard.as_ref() {
+            Some(existing) => existing.clone(),
+            None => {
+                let fut: BoxedDiscovery = Box::pin(run(app, true));
+                let shared = futures_util::FutureExt::shared(fut);
+                *guard = Some(shared.clone());
+                shared
+            }
+        }
+    };
+
+    let result = shared.clone().await;
+
+    // Clear the slot so the next forced call re-runs — but only if it still
+    // points at the future we just awaited (a newer run may have replaced it).
+    {
+        let mut guard = inflight().lock().unwrap_or_else(|e| e.into_inner());
+        if guard
+            .as_ref()
+            .is_some_and(|current| current.ptr_eq(&shared))
+        {
+            *guard = None;
+        }
+    }
+
+    result
+}
+
+async fn run(app: tauri::AppHandle, force: bool) -> Result<Vec<AcpRuntimeCatalogEntry>, String> {
+    tokio::task::spawn_blocking(move || {
+        use tauri::Manager;
+        if force {
+            crate::managed_agents::clear_resolve_cache();
+            crate::managed_agents::refresh_login_shell_path();
+        }
+        let custom_dir = app
+            .path()
+            .app_data_dir()
+            .ok()
+            .map(|d| d.join("custom_harnesses"));
+        crate::managed_agents::discover_acp_runtimes_from(custom_dir.as_deref(), force)
+    })
+    .await
+    .map_err(|e| format!("spawn_blocking failed: {e}"))
+}
diff --git a/desktop/src-tauri/src/managed_agents/discovery.rs b/desktop/src-tauri/src/managed_agents/discovery.rs
index bc0e3a6cda..78592357c9 100644
--- a/desktop/src-tauri/src/managed_agents/discovery.rs
+++ b/desktop/src-tauri/src/managed_agents/discovery.rs
@@ -9,10 +9,18 @@ use crate::managed_agents::{
     AcpAvailabilityStatus, AcpRuntimeCatalogEntry, AuthStatus, CommandAvailabilityInfo,
     HarnessSource,
 };
+mod auth_status_cache;
+mod login_shell;
 mod presets;
 mod runtime_metadata;
 #[macro_use]
 mod windows_install;
+pub use login_shell::{find_nvm_default_bin, login_shell_path};
+pub(crate) use login_shell::{find_via_login_shell, refresh_login_shell_path};
+#[cfg(test)]
+pub(crate) use login_shell::{
+    is_login_shell_path_uninit, is_safe_nvm_tag, login_shell_candidates, parse_semver_tag,
+};
 pub(crate) use presets::{
     canonical_harness_command, command_for_runtime_id, preset_harness_definitions,
     preset_harness_ids,
@@ -558,18 +566,40 @@ pub fn resolve_command(command: &str) -> Option<PathBuf> {
         }
     }
 
-    // Slow path: resolve and cache.
+    // Slow path: resolve and cache. Negative results are cached too: an absent
+    // command must not re-run `resolve_command_uncached` (which spawns a login
+    // shell via `find_via_login_shell`) on every cheap discovery — that spawn
+    // on the channel-switch/composer hot path is exactly what this cache exists
+    // to prevent. `clear_resolve_cache` (run by every forced discovery) is the
+    // invalidation seam, so a newly-installed binary is still found on refresh.
     let result = resolve_command_uncached(command);
 
-    if result.is_some() {
-        if let Ok(mut guard) = cache.lock() {
-            guard.insert(command.to_string(), result.clone());
-        }
+    if let Ok(mut guard) = cache.lock() {
+        guard.insert(command.to_string(), result.clone());
     }
 
     result
 }
 
+/// Cache-only command resolution for the cheap discovery path.
+///
+/// Consults the Buzz-managed shim dir (a filesystem stat, never a spawn) and
+/// the resolve cache; on a miss it reports the command absent rather than
+/// resolving live via `resolve_command_uncached` → `find_via_login_shell`,
+/// which spawns a login shell on the channel-switch / composer hot path — the
+/// freeze the cheap path exists to avoid. `resolve_command` (the forced path)
+/// is the sole prober and cache populator.
+pub fn resolve_command_cached(command: &str) -> Option<PathBuf> {
+    if let Some(managed) = resolve_buzz_managed_command(command) {
+        return Some(managed);
+    }
+    resolve_cache()
+        .lock()
+        .ok()
+        .and_then(|guard| guard.get(command).cloned())
+        .flatten()
+}
+
 /// Clear the resolve_command cache so that newly-installed binaries are detected.
 pub fn clear_resolve_cache() {
     let mut guard = resolve_cache().lock().unwrap_or_else(|e| e.into_inner());
@@ -577,6 +607,9 @@ pub fn clear_resolve_cache() {
     // Also invalidate the adapter-availability cache so a freshly-installed
     // adapter is reflected the next time the summary builder checks the badge.
     clear_adapter_availability_cache();
+    // And the auth-status cache so a forced re-discovery re-probes rather than
+    // reusing stale login state.
+    auth_status_cache::clear();
 }
 
 // ── Adapter availability cache (Phase-2 badge fallback) ─────────────────────
@@ -757,222 +790,10 @@ fn path_candidates_from_env_raw(basename: &str) -> Vec<PathBuf> {
         .unwrap_or_default()
 }
 
-/// Collect login shell candidates for the current platform.
-///
-/// On Unix: `/bin/zsh`, `/bin/bash` (the historical defaults).
-/// On Windows: Git Bash via `resolve_bash_path` — skips `BUZZ_SHELL` because
-/// login-shell callers use bash-only `-l -c` syntax.
-fn login_shell_candidates() -> Vec<PathBuf> {
-    #[cfg(not(windows))]
-    {
-        vec![PathBuf::from("/bin/zsh"), PathBuf::from("/bin/bash")]
-    }
-    #[cfg(windows)]
-    {
-        super::git_bash::resolve_bash_path().into_iter().collect()
-    }
-}
-
-/// Run a command in a login shell (tries zsh then bash on Unix, Git Bash on Windows).
-/// Returns trimmed stdout if the command succeeds with non-empty output.
-fn run_in_login_shell(args: &[&str]) -> Option<String> {
-    for shell in login_shell_candidates() {
-        let mut cmd = Command::new(&shell);
-        cmd.args(args);
-        crate::util::configure_no_window(&mut cmd);
-        let Ok(output) = cmd.output() else {
-            continue;
-        };
-        if !output.status.success() {
-            continue;
-        }
-        let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
-        if !stdout.is_empty() {
-            return Some(stdout);
-        }
-    }
-    None
-}
-
-fn find_via_login_shell(command: &str) -> Option<PathBuf> {
-    let stdout = run_in_login_shell(&["-l", "-c", r#"command -v -- "$1""#, "_", command])?;
-    let resolved = stdout.lines().rfind(|line| !line.trim().is_empty())?;
-    let path = PathBuf::from(resolved.trim());
-    (path.is_absolute() && is_executable_file(&path)).then_some(path)
-}
-
-/// Three-state backing store for the login-shell PATH cache.
-#[derive(Clone)]
-enum LoginShellPath {
-    /// Cache has never been populated; the next call will spawn a login shell.
-    Uninit,
-    /// A login shell was invoked; the inner value is the PATH it returned
-    /// (`None` when the shell produced no output).
-    Probed(Option<String>),
-}
-
-fn path_cache() -> &'static std::sync::Mutex<LoginShellPath> {
-    use std::sync::{Mutex, OnceLock};
-    static CACHE: OnceLock<Mutex<LoginShellPath>> = OnceLock::new();
-    CACHE.get_or_init(|| Mutex::new(LoginShellPath::Uninit))
-}
-
-fn fetch_login_shell_path_inner() -> Option<String> {
-    // On Windows, Git Bash's `echo $PATH` returns POSIX colon-delimited paths
-    // (`/mingw64/bin:/c/Users/...`) which poison native Windows children that
-    // split on `;`. login_shell_path() feeds agent_models, runtime, and
-    // cli_probe — all native processes. Return None so they inherit the real
-    // Windows PATH instead.
-    #[cfg(windows)]
-    {
-        return None;
-    }
-
-    #[cfg(not(windows))]
-    {
-        let stdout = run_in_login_shell(&["-l", "-c", "echo $PATH"])?;
-        let last_line = stdout.lines().rfind(|l| !l.trim().is_empty())?;
-        Some(last_line.trim().to_string())
-    }
-}
-
-/// Return the user's full PATH from a login shell.
-///
-/// The result is cached after the first call. Call [`refresh_login_shell_path`]
-/// to invalidate the cache so the next call re-fetches — e.g. after the user
-/// installs Node.js mid-session and clicks Retry.
-///
-/// The lock is never held while the login shell spawns: we check for a cached
-/// value, release the lock, run the shell, then re-lock to write. Two concurrent
-/// callers may both run the shell (last-writer-wins is fine — both produce the
-/// same result), but neither blocks a concurrent agent spawn on the Mutex.
-pub fn login_shell_path() -> Option<String> {
-    // Fast path: return cached result without spawning a shell.
-    {
-        let guard = path_cache().lock().unwrap_or_else(|e| e.into_inner());
-        if let LoginShellPath::Probed(ref result) = *guard {
-            return result.clone();
-        }
-    }
-
-    // Slow path: spawn shell outside any lock.
-    let result = fetch_login_shell_path_inner();
-
-    // Write back; last-writer-wins is safe here.
-    {
-        let mut guard = path_cache().lock().unwrap_or_else(|e| e.into_inner());
-        *guard = LoginShellPath::Probed(result.clone());
-    }
-
-    result
-}
-
-/// Invalidate the login-shell PATH cache so the next [`login_shell_path`] call
-/// re-fetches from a fresh login shell.
-///
-/// Called before every install/retry operation and on Doctor Re-run so a
-/// newly-installed tool becomes visible without restarting the app.
-pub(crate) fn refresh_login_shell_path() {
-    let mut guard = path_cache().lock().unwrap_or_else(|e| e.into_inner());
-    *guard = LoginShellPath::Uninit;
-}
-
+/// Test-only counter for login-shell spawn attempts (see submodule).
 #[cfg(test)]
-fn is_login_shell_path_uninit() -> bool {
-    matches!(
-        *path_cache().lock().unwrap_or_else(|e| e.into_inner()),
-        LoginShellPath::Uninit
-    )
-}
-
-/// Return `true` when `tag` is a safe nvm alias/version tag that can be joined
-/// onto a `PathBuf` without escaping the nvm root.
-///
-/// nvm uses tags like `v22.1.0` or `lts/hydrogen`. We allow ASCII alphanumeric
-/// plus `. - / _` and require that no path component is `..` and that the tag
-/// does not start with `/` (which would replace the base in `PathBuf::join`).
-fn is_safe_nvm_tag(tag: &str) -> bool {
-    if tag.is_empty() {
-        return false;
-    }
-    // An absolute path in the alias file would let PathBuf::join silently
-    // replace the nvm root with an attacker-controlled path.
-    if tag.starts_with('/') {
-        return false;
-    }
-    // Reject any .. component to prevent upward traversal.
-    for component in tag.split('/') {
-        if component == ".." {
-            return false;
-        }
-    }
-    // Allow only the characters nvm uses in real tag names.
-    tag.chars()
-        .all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '-' | '/' | '_'))
-}
-
-/// Locate the `bin` directory for nvm's default Node.js version.
-///
-/// Reads `~/.nvm/alias/default`; resolves at most one alias hop to handle
-/// nvm alias chains; falls back to the highest-semver directory under
-/// `~/.nvm/versions/node/`. Returns the `bin` subdirectory only when it exists.
-///
-/// Cheap: at most two file reads or one `read_dir`. Never cached — computed
-/// fresh per call so a mid-session `nvm install` is visible at the next spawn.
-pub fn find_nvm_default_bin(home: &Path) -> Option<PathBuf> {
-    let nvm_root = home.join(".nvm");
-    let versions_root = nvm_root.join("versions").join("node");
-
-    // 1. Try alias/default, with at most one hop.
-    let default_alias = nvm_root.join("alias").join("default");
-    if let Ok(content) = std::fs::read_to_string(&default_alias) {
-        let tag = content.trim().to_string();
-        if is_safe_nvm_tag(&tag) {
-            let candidate = versions_root.join(&tag).join("bin");
-            if candidate.is_dir() {
-                return Some(candidate);
-            }
-            // One alias hop: ~/.nvm/alias/<tag>
-            let hop_file = nvm_root.join("alias").join(&tag);
-            if let Ok(hop_content) = std::fs::read_to_string(&hop_file) {
-                let hop_tag = hop_content.trim().to_string();
-                if is_safe_nvm_tag(&hop_tag) {
-                    let hop_candidate = versions_root.join(&hop_tag).join("bin");
-                    if hop_candidate.is_dir() {
-                        return Some(hop_candidate);
-                    }
-                }
-            }
-        }
-    }
-
-    // 2. Fall back to highest-semver directory under ~/.nvm/versions/node/.
-    let entries = std::fs::read_dir(&versions_root).ok()?;
-    let best = entries
-        .filter_map(|e| e.ok())
-        .filter_map(|e| {
-            let name = e.file_name();
-            let s = name.to_string_lossy().into_owned();
-            parse_semver_tag(&s).map(|v| (v, s))
-        })
-        .max_by(|(a, _), (b, _)| a.cmp(b));
-
-    let (_, tag) = best?;
-    let bin = versions_root.join(&tag).join("bin");
-    bin.is_dir().then_some(bin)
-}
-
-/// Parse a `vMAJ.MIN.PATCH` (or `vMAJ.MIN.PATCH-extra`) tag into a numeric
-/// triple for semver comparison.
-fn parse_semver_tag(s: &str) -> Option<(u64, u64, u64)> {
-    let s = s.strip_prefix('v')?;
-    let mut parts = s.splitn(3, '.');
-    let major = parts.next()?.parse::<u64>().ok()?;
-    let minor = parts.next()?.parse::<u64>().ok()?;
-    let patch_str = parts.next()?;
-    let patch = patch_str.split('-').next()?.parse::<u64>().ok()?;
-    Some((major, minor, patch))
-}
+#[path = "discovery/login_shell_spawn_probe.rs"]
+pub(crate) mod login_shell_spawn_probe;
 
 pub(crate) fn find_command(command: &str) -> Option<PathBuf> {
     resolve_command(command)
@@ -1295,27 +1116,39 @@ struct PartialEntry {
     entry: AcpRuntimeCatalogEntry,
 }
 
-fn discover_acp_runtime_phase1(runtime: &'static KnownAcpRuntime) -> PartialEntry {
+fn discover_acp_runtime_phase1(runtime: &'static KnownAcpRuntime, force: bool) -> PartialEntry {
+    // Cheap path is cache-only (no login-shell spawn); forced path resolves live.
+    let resolve = if force {
+        resolve_command
+    } else {
+        resolve_command_cached
+    };
     let adapter_result = runtime
         .commands
         .iter()
-        .find_map(|command| find_command(command).map(|path| (*command, path)));
+        .find_map(|command| resolve(command).map(|path| (*command, path)));
 
     let underlying_cli_found = runtime
         .underlying_cli
-        .map(|cli| find_command(cli).is_some())
+        .map(|cli| resolve(cli).is_some())
         .unwrap_or(false);
     let (mut availability, command, binary_path) =
         classify_runtime(adapter_result, runtime.underlying_cli, underlying_cli_found);
 
-    // For codex-acp: when the adapter resolves as Available, probe its full
-    // version. An adapter below MIN_CODEX_ACP_VERSION is treated as outdated.
+    // For codex-acp: when the adapter resolves as Available, determine its full
+    // version. A forced discovery probes the binary (spawns a subprocess); the
+    // cheap default path reuses the last cached availability so it stays
+    // process-free. An adapter below MIN_CODEX_ACP_VERSION is treated as outdated.
     if runtime.id == "codex"
         && availability == AcpAvailabilityStatus::Available
         && command.as_deref() == Some("codex-acp")
     {
-        if let Some(path_str) = &binary_path {
-            availability = codex_adapter_availability(&PathBuf::from(path_str));
+        if force {
+            if let Some(path_str) = &binary_path {
+                availability = codex_adapter_availability(&PathBuf::from(path_str));
+            }
+        } else if let Some(cached) = adapter_availability_cached() {
+            availability = cached;
         }
     }
 
@@ -1328,7 +1161,7 @@ fn discover_acp_runtime_phase1(runtime: &'static KnownAcpRuntime) -> PartialEntr
 
     let underlying_cli_path = runtime
         .underlying_cli
-        .and_then(find_command)
+        .and_then(resolve)
         .map(|p| p.display().to_string());
 
     let default_args = command
@@ -1373,8 +1206,8 @@ fn discover_acp_runtime_phase1(runtime: &'static KnownAcpRuntime) -> PartialEntr
         AcpAvailabilityStatus::AdapterMissing | AcpAvailabilityStatus::NotInstalled
     ) && runtime_needs_npm(runtime)
         && buzz_managed_node_bin_dir().is_none()
-        && resolve_command("npm").is_none()
-        && resolve_command("node").is_none();
+        && resolve("npm").is_none()
+        && resolve("node").is_none();
 
     PartialEntry {
         runtime,
@@ -1415,7 +1248,9 @@ fn discover_acp_runtime_phase1(runtime: &'static KnownAcpRuntime) -> PartialEntr
 /// resolves, so it should not pay the cost of authenticating every catalog entry.
 pub(crate) fn discover_acp_runtime_availability(runtime_id: &str) -> Option<AcpAvailabilityStatus> {
     known_acp_runtime_exact(runtime_id)
-        .map(discover_acp_runtime_phase1)
+        // Post-install verification wants fresh filesystem/version state, so
+        // probe rather than trust the cheap-path cache.
+        .map(|runtime| discover_acp_runtime_phase1(runtime, true))
         .map(|partial| partial.entry.availability)
 }
 
@@ -1438,47 +1273,24 @@ pub(crate) fn discover_acp_runtime_availability(runtime_id: &str) -> Option<AcpA
 /// re-running discovery.
 pub fn discover_acp_runtimes_from(
     custom_harnesses_dir: Option<&Path>,
+    force: bool,
 ) -> Vec<AcpRuntimeCatalogEntry> {
+    // Cheap path is cache-only (no login-shell spawn); forced path resolves live.
+    let resolve = if force {
+        resolve_command
+    } else {
+        resolve_command_cached
+    };
+
     // Phase 1: build all builtin entries (fast — no probes yet).
     let mut partials: Vec<PartialEntry> = KNOWN_ACP_RUNTIMES
         .iter()
-        .map(discover_acp_runtime_phase1)
+        .map(|runtime| discover_acp_runtime_phase1(runtime, force))
         .collect();
 
-    // Phase 2: run auth probes in parallel for entries that need them.
-    // Spawn one thread per probeable entry; total cost = max(probe latency).
-    let probe_handles: Vec<(usize, std::thread::JoinHandle<AuthStatus>)> = partials
-        .iter()
-        .enumerate()
-        .filter_map(|(idx, partial)| {
-            if partial.entry.availability != AcpAvailabilityStatus::Available {
-                return None;
-            }
-            let probe_args = partial.runtime.auth_probe_args?;
-            // Need the resolved binary path for the CLI (e.g. the actual `claude` binary).
-            let binary_path = resolve_command(probe_args[0])?;
-            let probe_args_owned: Vec<String> = probe_args.iter().map(|s| s.to_string()).collect();
-
-            let handle = std::thread::spawn(move || {
-                let refs: Vec<&str> = probe_args_owned.iter().map(String::as_str).collect();
-                probe_auth_status(&binary_path, &refs)
-            });
-            Some((idx, handle))
-        })
-        .collect();
-
-    // Collect probe results and patch entries.
-    for (idx, handle) in probe_handles {
-        let status = handle.join().unwrap_or(AuthStatus::Unknown);
-        let partial = &mut partials[idx];
-        partial.entry.login_hint =
-            if matches!(status, AuthStatus::LoggedIn | AuthStatus::NotApplicable) {
-                None
-            } else {
-                partial.runtime.login_hint.map(str::to_string)
-            };
-        partial.entry.auth_status = status;
-    }
+    // Phase 2: resolve each available runtime's auth status (forced discovery
+    // spawns parallel CLI probes and warms the cache; the cheap path reuses it).
+    auth_status_cache::resolve_auth_statuses(&mut partials, force);
 
     // Fill NotApplicable / Unknown for non-probed entries.
     for partial in &mut partials {
@@ -1508,7 +1320,7 @@ pub fn discover_acp_runtimes_from(
         }
         seen_ids.insert(def.id.to_string());
 
-        entries.push(preset_catalog_entry(def, find_command));
+        entries.push(preset_catalog_entry(def, resolve));
     }
 
     // Phase 3: load and append custom harness definitions.
@@ -1523,8 +1335,8 @@ pub fn discover_acp_runtimes_from(
                 continue;
             }
 
-            // Availability: command on PATH → Available, else NotInstalled.
-            let (availability, command, binary_path) = match find_command(&def.command) {
+            // Availability: command resolves → Available, else NotInstalled.
+            let (availability, command, binary_path) = match resolve(&def.command) {
                 Some(path) => (
                     AcpAvailabilityStatus::Available,
                     Some(def.command.clone()),
diff --git a/desktop/src-tauri/src/managed_agents/discovery/auth_status_cache.rs b/desktop/src-tauri/src/managed_agents/discovery/auth_status_cache.rs
new file mode 100644
index 0000000000..cae0d7e2c9
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/discovery/auth_status_cache.rs
@@ -0,0 +1,105 @@
+//! Auth-status cache for cheap ACP runtime discovery.
+//!
+//! A forced discovery (`discover_acp_providers(force: true)`) spawns one CLI
+//! auth probe per available runtime — the expensive pipeline. The cheap default
+//! discovery must not pay that cost, so it reuses the last known auth statuses
+//! from this cache instead of probing. The cache is keyed by runtime id, warmed
+//! by the forced probe phase, and cleared by `clear_resolve_cache` (which a
+//! forced discovery calls before re-probing).
+
+use std::collections::HashMap;
+use std::sync::{Mutex, OnceLock};
+
+use crate::managed_agents::AuthStatus;
+
+fn cache() -> &'static Mutex<HashMap<String, AuthStatus>> {
+    static CACHE: OnceLock<Mutex<HashMap<String, AuthStatus>>> = OnceLock::new();
+    CACHE.get_or_init(|| Mutex::new(HashMap::new()))
+}
+
+pub(super) fn clear() {
+    if let Ok(mut guard) = cache().lock() {
+        guard.clear();
+    }
+}
+
+pub(super) fn store(runtime_id: &str, status: &AuthStatus) {
+    if let Ok(mut guard) = cache().lock() {
+        guard.insert(runtime_id.to_string(), status.clone());
+    }
+}
+
+/// Last known auth status for `runtime_id`, or `AuthStatus::Unknown` when no
+/// forced discovery has probed it yet. Never spawns a process.
+pub(super) fn get(runtime_id: &str) -> AuthStatus {
+    cache()
+        .lock()
+        .ok()
+        .and_then(|g| g.get(runtime_id).cloned())
+        .unwrap_or(AuthStatus::Unknown)
+}
+
+#[cfg(test)]
+pub(crate) fn len() -> usize {
+    cache().lock().map(|g| g.len()).unwrap_or(0)
+}
+
+/// Resolve the auth status of every available, probeable runtime in `partials`,
+/// patching each entry's `auth_status` + `login_hint` in place.
+///
+/// Forced discovery spawns one CLI auth probe per available runtime (in
+/// parallel; total cost = max(probe latency)) and warms this cache. The cheap
+/// default path spawns nothing — it reuses the last cached status, falling back
+/// to `Unknown` for a runtime never probed this session.
+pub(super) fn resolve_auth_statuses(partials: &mut [super::PartialEntry], force: bool) {
+    use crate::managed_agents::AcpAvailabilityStatus;
+
+    if force {
+        let probe_handles: Vec<(usize, std::thread::JoinHandle<AuthStatus>)> = partials
+            .iter()
+            .enumerate()
+            .filter_map(|(idx, partial)| {
+                if partial.entry.availability != AcpAvailabilityStatus::Available {
+                    return None;
+                }
+                let probe_args = partial.runtime.auth_probe_args?;
+                // Need the resolved binary path for the CLI (e.g. the actual `claude` binary).
+                let binary_path = super::resolve_command(probe_args[0])?;
+                let probe_args_owned: Vec<String> =
+                    probe_args.iter().map(|s| s.to_string()).collect();
+
+                let handle = std::thread::spawn(move || {
+                    let refs: Vec<&str> = probe_args_owned.iter().map(String::as_str).collect();
+                    super::probe_auth_status(&binary_path, &refs)
+                });
+                Some((idx, handle))
+            })
+            .collect();
+
+        for (idx, handle) in probe_handles {
+            let status = handle.join().unwrap_or(AuthStatus::Unknown);
+            store(&partials[idx].entry.id, &status);
+            patch_entry(&mut partials[idx], status);
+        }
+    } else {
+        for partial in partials.iter_mut() {
+            if partial.entry.availability != AcpAvailabilityStatus::Available
+                || partial.runtime.auth_probe_args.is_none()
+            {
+                continue;
+            }
+            let status = get(&partial.entry.id);
+            patch_entry(partial, status);
+        }
+    }
+}
+
+fn patch_entry(partial: &mut super::PartialEntry, status: AuthStatus) {
+    partial.entry.login_hint = if matches!(status, AuthStatus::LoggedIn | AuthStatus::NotApplicable)
+    {
+        None
+    } else {
+        partial.runtime.login_hint.map(str::to_string)
+    };
+    partial.entry.auth_status = status;
+}
diff --git a/desktop/src-tauri/src/managed_agents/discovery/login_shell.rs b/desktop/src-tauri/src/managed_agents/discovery/login_shell.rs
new file mode 100644
index 0000000000..d8f8e60354
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/discovery/login_shell.rs
@@ -0,0 +1,236 @@
+//! Login-shell PATH discovery and nvm fallback.
+//!
+//! Extracted verbatim from `discovery.rs` to keep that file under the
+//! file-size ratchet. Covers login-shell candidate selection, the cached
+//! login-shell PATH probe, and nvm default-bin resolution.
+
+use std::path::{Path, PathBuf};
+use std::process::Command;
+
+use super::is_executable_file;
+
+/// Test-only spawn counter lives beside `discovery.rs`; import it here so the
+/// spawn-record call site stays byte-identical to the pre-extraction source.
+#[cfg(test)]
+use super::login_shell_spawn_probe;
+
+/// Collect login shell candidates for the current platform.
+///
+/// On Unix: `/bin/zsh`, `/bin/bash` (the historical defaults).
+/// On Windows: Git Bash via `resolve_bash_path` — skips `BUZZ_SHELL` because
+/// login-shell callers use bash-only `-l -c` syntax.
+pub(crate) fn login_shell_candidates() -> Vec<PathBuf> {
+    #[cfg(not(windows))]
+    {
+        vec![PathBuf::from("/bin/zsh"), PathBuf::from("/bin/bash")]
+    }
+    #[cfg(windows)]
+    {
+        super::super::git_bash::resolve_bash_path()
+            .into_iter()
+            .collect()
+    }
+}
+
+/// Run a command in a login shell (tries zsh then bash on Unix, Git Bash on Windows).
+/// Returns trimmed stdout if the command succeeds with non-empty output.
+fn run_in_login_shell(args: &[&str]) -> Option<String> {
+    #[cfg(test)]
+    login_shell_spawn_probe::record();
+    for shell in login_shell_candidates() {
+        let mut cmd = Command::new(&shell);
+        cmd.args(args);
+        crate::util::configure_no_window(&mut cmd);
+        let Ok(output) = cmd.output() else {
+            continue;
+        };
+        if !output.status.success() {
+            continue;
+        }
+        let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
+        if !stdout.is_empty() {
+            return Some(stdout);
+        }
+    }
+    None
+}
+
+pub(crate) fn find_via_login_shell(command: &str) -> Option<PathBuf> {
+    let stdout = run_in_login_shell(&["-l", "-c", r#"command -v -- "$1""#, "_", command])?;
+    let resolved = stdout.lines().rfind(|line| !line.trim().is_empty())?;
+    let path = PathBuf::from(resolved.trim());
+    (path.is_absolute() && is_executable_file(&path)).then_some(path)
+}
+
+/// Three-state backing store for the login-shell PATH cache.
+#[derive(Clone)]
+enum LoginShellPath {
+    /// Cache has never been populated; the next call will spawn a login shell.
+    Uninit,
+    /// A login shell was invoked; the inner value is the PATH it returned
+    /// (`None` when the shell produced no output).
+    Probed(Option<String>),
+}
+
+fn path_cache() -> &'static std::sync::Mutex<LoginShellPath> {
+    use std::sync::{Mutex, OnceLock};
+    static CACHE: OnceLock<Mutex<LoginShellPath>> = OnceLock::new();
+    CACHE.get_or_init(|| Mutex::new(LoginShellPath::Uninit))
+}
+
+fn fetch_login_shell_path_inner() -> Option<String> {
+    // On Windows, Git Bash's `echo $PATH` returns POSIX colon-delimited paths
+    // (`/mingw64/bin:/c/Users/...`) which poison native Windows children that
+    // split on `;`. login_shell_path() feeds agent_models, runtime, and
+    // cli_probe — all native processes. Return None so they inherit the real
+    // Windows PATH instead.
+    #[cfg(windows)]
+    {
+        return None;
+    }
+
+    #[cfg(not(windows))]
+    {
+        let stdout = run_in_login_shell(&["-l", "-c", "echo $PATH"])?;
+        let last_line = stdout.lines().rfind(|l| !l.trim().is_empty())?;
+        Some(last_line.trim().to_string())
+    }
+}
+
+/// Return the user's full PATH from a login shell.
+///
+/// The result is cached after the first call. Call [`refresh_login_shell_path`]
+/// to invalidate the cache so the next call re-fetches — e.g. after the user
+/// installs Node.js mid-session and clicks Retry.
+///
+/// The lock is never held while the login shell spawns: we check for a cached
+/// value, release the lock, run the shell, then re-lock to write. Two concurrent
+/// callers may both run the shell (last-writer-wins is fine — both produce the
+/// same result), but neither blocks a concurrent agent spawn on the Mutex.
+pub fn login_shell_path() -> Option<String> {
+    // Fast path: return cached result without spawning a shell.
+    {
+        let guard = path_cache().lock().unwrap_or_else(|e| e.into_inner());
+        if let LoginShellPath::Probed(ref result) = *guard {
+            return result.clone();
+        }
+    }
+
+    // Slow path: spawn shell outside any lock.
+    let result = fetch_login_shell_path_inner();
+
+    // Write back; last-writer-wins is safe here.
+    {
+        let mut guard = path_cache().lock().unwrap_or_else(|e| e.into_inner());
+        *guard = LoginShellPath::Probed(result.clone());
+    }
+
+    result
+}
+
+/// Invalidate the login-shell PATH cache so the next [`login_shell_path`] call
+/// re-fetches from a fresh login shell.
+///
+/// Called before every install/retry operation and on Doctor Re-run so a
+/// newly-installed tool becomes visible without restarting the app.
+pub(crate) fn refresh_login_shell_path() {
+    let mut guard = path_cache().lock().unwrap_or_else(|e| e.into_inner());
+    *guard = LoginShellPath::Uninit;
+}
+
+#[cfg(test)]
+pub(crate) fn is_login_shell_path_uninit() -> bool {
+    matches!(
+        *path_cache().lock().unwrap_or_else(|e| e.into_inner()),
+        LoginShellPath::Uninit
+    )
+}
+
+/// Return `true` when `tag` is a safe nvm alias/version tag that can be joined
+/// onto a `PathBuf` without escaping the nvm root.
+///
+/// nvm uses tags like `v22.1.0` or `lts/hydrogen`. We allow ASCII alphanumeric
+/// plus `. - / _` and require that no path component is `..` and that the tag
+/// does not start with `/` (which would replace the base in `PathBuf::join`).
+pub(crate) fn is_safe_nvm_tag(tag: &str) -> bool {
+    if tag.is_empty() {
+        return false;
+    }
+    // An absolute path in the alias file would let PathBuf::join silently
+    // replace the nvm root with an attacker-controlled path.
+    if tag.starts_with('/') {
+        return false;
+    }
+    // Reject any .. component to prevent upward traversal.
+    for component in tag.split('/') {
+        if component == ".." {
+            return false;
+        }
+    }
+    // Allow only the characters nvm uses in real tag names.
+    tag.chars()
+        .all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '-' | '/' | '_'))
+}
+
+/// Locate the `bin` directory for nvm's default Node.js version.
+///
+/// Reads `~/.nvm/alias/default`; resolves at most one alias hop to handle
+/// nvm alias chains; falls back to the highest-semver directory under
+/// `~/.nvm/versions/node/`. Returns the `bin` subdirectory only when it exists.
+///
+/// Cheap: at most two file reads or one `read_dir`. Never cached — computed
+/// fresh per call so a mid-session `nvm install` is visible at the next spawn.
+pub fn find_nvm_default_bin(home: &Path) -> Option<PathBuf> {
+    let nvm_root = home.join(".nvm");
+    let versions_root = nvm_root.join("versions").join("node");
+
+    // 1. Try alias/default, with at most one hop.
+    let default_alias = nvm_root.join("alias").join("default");
+    if let Ok(content) = std::fs::read_to_string(&default_alias) {
+        let tag = content.trim().to_string();
+        if is_safe_nvm_tag(&tag) {
+            let candidate = versions_root.join(&tag).join("bin");
+            if candidate.is_dir() {
+                return Some(candidate);
+            }
+            // One alias hop: ~/.nvm/alias/<tag>
+            let hop_file = nvm_root.join("alias").join(&tag);
+            if let Ok(hop_content) = std::fs::read_to_string(&hop_file) {
+                let hop_tag = hop_content.trim().to_string();
+                if is_safe_nvm_tag(&hop_tag) {
+                    let hop_candidate = versions_root.join(&hop_tag).join("bin");
+                    if hop_candidate.is_dir() {
+                        return Some(hop_candidate);
+                    }
+                }
+            }
+        }
+    }
+
+    // 2. Fall back to highest-semver directory under ~/.nvm/versions/node/.
+    let entries = std::fs::read_dir(&versions_root).ok()?;
+    let best = entries
+        .filter_map(|e| e.ok())
+        .filter_map(|e| {
+            let name = e.file_name();
+            let s = name.to_string_lossy().into_owned();
+            parse_semver_tag(&s).map(|v| (v, s))
+        })
+        .max_by(|(a, _), (b, _)| a.cmp(b));
+
+    let (_, tag) = best?;
+    let bin = versions_root.join(&tag).join("bin");
+    bin.is_dir().then_some(bin)
+}
+
+/// Parse a `vMAJ.MIN.PATCH` (or `vMAJ.MIN.PATCH-extra`) tag into a numeric
+/// triple for semver comparison.
+pub(crate) fn parse_semver_tag(s: &str) -> Option<(u64, u64, u64)> {
+    let s = s.strip_prefix('v')?;
+    let mut parts = s.splitn(3, '.');
+    let major = parts.next()?.parse::<u64>().ok()?;
+    let minor = parts.next()?.parse::<u64>().ok()?;
+    let patch_str = parts.next()?;
+    let patch = patch_str.split('-').next()?.parse::<u64>().ok()?;
+    Some((major, minor, patch))
+}
diff --git a/desktop/src-tauri/src/managed_agents/discovery/login_shell_spawn_probe.rs b/desktop/src-tauri/src/managed_agents/discovery/login_shell_spawn_probe.rs
new file mode 100644
index 0000000000..a716dee9f5
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/discovery/login_shell_spawn_probe.rs
@@ -0,0 +1,21 @@
+//! Test-only counter for login-shell spawn attempts.
+//!
+//! `run_in_login_shell` is the single subprocess-spawning step on the
+//! absent-command resolution path, so counting its calls proves whether a
+//! cheap discovery re-spawns after a negative resolution was cached.
+
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+static COUNT: AtomicUsize = AtomicUsize::new(0);
+
+pub(crate) fn record() {
+    COUNT.fetch_add(1, Ordering::SeqCst);
+}
+
+pub(crate) fn reset() {
+    COUNT.store(0, Ordering::SeqCst);
+}
+
+pub(crate) fn count() -> usize {
+    COUNT.load(Ordering::SeqCst)
+}
diff --git a/desktop/src-tauri/src/managed_agents/discovery/presets.rs b/desktop/src-tauri/src/managed_agents/discovery/presets.rs
index d86e5f33f0..fd85309451 100644
--- a/desktop/src-tauri/src/managed_agents/discovery/presets.rs
+++ b/desktop/src-tauri/src/managed_agents/discovery/presets.rs
@@ -336,7 +336,7 @@ mod tests {
         let _path_guard = crate::managed_agents::lock_path_mutex();
         let _registry_guard = registry_test_lock();
 
-        let entry = super::super::discover_acp_runtimes_from(None)
+        let entry = super::super::discover_acp_runtimes_from(None, true)
             .into_iter()
             .find(|entry| entry.id == "devin")
             .expect("Devin preset should appear in the runtime catalog");
diff --git a/desktop/src-tauri/src/managed_agents/discovery/tests.rs b/desktop/src-tauri/src/managed_agents/discovery/tests.rs
index f7e233fbe9..2d1db69293 100644
--- a/desktop/src-tauri/src/managed_agents/discovery/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/discovery/tests.rs
@@ -4,11 +4,10 @@ use super::overrides::{divergent_agent_command_override, update_time_agent_comma
 use super::{
     apply_agent_command_update, classify_runtime, codex_adapter_availability,
     codex_adapter_is_outdated, create_time_agent_command_override, default_agent_command,
-    effective_agent_command, find_nvm_default_bin, find_via_login_shell,
-    is_login_shell_path_uninit, is_safe_nvm_tag, managed_agent_avatar_url, normalize_agent_args,
-    parse_semver_tag, probe_codex_acp_version, record_agent_command, refresh_login_shell_path,
-    try_record_agent_command, BUZZ_AGENT_AVATAR_URL, CLAUDE_CODE_AVATAR_URL, CODEX_AVATAR_URL,
-    GOOSE_AVATAR_URL,
+    effective_agent_command, find_nvm_default_bin, is_login_shell_path_uninit, is_safe_nvm_tag,
+    managed_agent_avatar_url, normalize_agent_args, parse_semver_tag, probe_codex_acp_version,
+    record_agent_command, refresh_login_shell_path, try_record_agent_command,
+    BUZZ_AGENT_AVATAR_URL, CLAUDE_CODE_AVATAR_URL, CODEX_AVATAR_URL, GOOSE_AVATAR_URL,
 };
 use crate::managed_agents::AcpAvailabilityStatus;
 
@@ -94,24 +93,6 @@ fn normalizes_buzz_agent_args_to_empty() {
     );
 }
 
-#[test]
-fn login_shell_lookup_treats_command_as_data() {
-    let marker =
-        std::env::temp_dir().join(format!("buzz-discovery-marker-{}", uuid::Uuid::new_v4()));
-    let payload = format!("doesnotexist; touch {} #", marker.display());
-
-    let resolved = find_via_login_shell(&payload);
-
-    assert!(
-        resolved.is_none(),
-        "payload should not resolve to a command"
-    );
-    assert!(
-        !marker.exists(),
-        "shell lookup must not execute injected commands"
-    );
-}
-
 #[cfg(unix)]
 #[test]
 fn explicit_path_resolution_ignores_non_executable_files() {
@@ -668,8 +649,8 @@ fn apply_agent_command_update_concrete_pin_keeps_materialized_runtime() {
 
 // ── probe_codex_acp_version ───────────────────────────────────────────────────
 
+mod forced_discovery;
 mod managed_path_resolution;
-
 #[cfg(unix)]
 #[test]
 fn probe_codex_acp_version_parses_full_semver_output() {
@@ -1685,7 +1666,7 @@ fn custom_catalog_entry_carries_definition_env_for_edit_roundtrip() {
     )
     .unwrap();
 
-    let entries = discover_acp_runtimes_from(Some(dir.path()));
+    let entries = discover_acp_runtimes_from(Some(dir.path()), true);
     let entry = entries
         .iter()
         .find(|e| e.id == "env-harness")
@@ -1715,7 +1696,7 @@ fn builtin_catalog_entry_has_empty_definition_env() {
     // publishes to the global registry.
     let _path_guard = crate::managed_agents::lock_path_mutex();
     let _lock = registry_test_lock();
-    let entries = discover_acp_runtimes_from(None);
+    let entries = discover_acp_runtimes_from(None, true);
     // Find any builtin entry (e.g. "goose" or "claude").
     let builtin = entries
         .iter()
@@ -1796,7 +1777,7 @@ fn discovery_publish_path_survives_mid_flight_save() {
         assert!(lookup_loaded_harness_by_id("mid-flight-save").is_some());
     }));
 
-    let _entries = discover_acp_runtimes_from(Some(dir.path()));
+    let _entries = discover_acp_runtimes_from(Some(dir.path()), true);
 
     assert!(
         lookup_loaded_harness_by_id("mid-flight-save").is_some(),
@@ -1829,7 +1810,7 @@ fn discovery_publish_path_drops_mid_flight_delete() {
         assert!(lookup_loaded_harness_by_id("mid-flight-delete").is_none());
     }));
 
-    let _entries = discover_acp_runtimes_from(Some(dir.path()));
+    let _entries = discover_acp_runtimes_from(Some(dir.path()), true);
 
     assert!(
         lookup_loaded_harness_by_id("mid-flight-delete").is_none(),
diff --git a/desktop/src-tauri/src/managed_agents/discovery/tests/forced_discovery.rs b/desktop/src-tauri/src/managed_agents/discovery/tests/forced_discovery.rs
new file mode 100644
index 0000000000..cfbad365e3
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/discovery/tests/forced_discovery.rs
@@ -0,0 +1,163 @@
+// ── Cheap vs. forced discovery: the auth-probe split ────────────────────────
+//
+// `discover_acp_providers(force: true)` spawns one CLI auth probe per available
+// runtime; the cheap default path must reuse the last cached status and spawn
+// nothing. These tests pin that split through the real `discover_acp_runtimes_from`
+// pipeline with a fake `claude` CLI that records every invocation to a sentinel.
+
+/// Build a fake `claude` runtime on a fresh PATH: the adapter (`claude-agent-acp`)
+/// and the CLI (`claude`). The CLI appends a line to `probe_log` each time it
+/// runs and exits 0 (→ `LoggedIn`), so the log's existence proves whether the
+/// auth probe was spawned.
+#[cfg(unix)]
+#[test]
+fn forced_discovery_probes_auth_but_cheap_discovery_reuses_cached_status() {
+    use crate::managed_agents::custom_harnesses::registry_test_lock;
+    use crate::managed_agents::discovery::{clear_resolve_cache, discover_acp_runtimes_from};
+    use crate::managed_agents::{AcpAvailabilityStatus, AuthStatus};
+    use std::os::unix::fs::PermissionsExt;
+
+    let _path_guard = crate::managed_agents::lock_path_mutex();
+    let _registry_guard = registry_test_lock();
+
+    let dir = tempfile::tempdir().expect("tempdir");
+    let probe_log = dir.path().join("claude-probe.log");
+
+    for name in ["claude-agent-acp", "claude"] {
+        let bin = dir.path().join(name);
+        // The adapter is never executed; only `claude` logs + exits 0.
+        let script = format!(
+            "#!/bin/sh\necho ran >> \"{}\"\nexit 0\n",
+            probe_log.display()
+        );
+        std::fs::write(&bin, script).expect("write fake bin");
+        std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755)).expect("chmod");
+    }
+
+    // Start from a clean resolve + auth cache, and a PATH that only sees our fakes.
+    clear_resolve_cache();
+    let old_path = std::env::var_os("PATH").unwrap_or_default();
+    let mut new_path = vec![dir.path().to_path_buf()];
+    new_path.extend(std::env::split_paths(&old_path));
+    std::env::set_var("PATH", std::env::join_paths(&new_path).expect("join PATH"));
+
+    let result = std::panic::catch_unwind(|| {
+        // ── Forced: probes run, status is LoggedIn, cache is warmed. ──────────
+        let forced = discover_acp_runtimes_from(None, true);
+        let claude = forced
+            .iter()
+            .find(|e| e.id == "claude")
+            .expect("claude entry present");
+        assert_eq!(claude.availability, AcpAvailabilityStatus::Available);
+        assert_eq!(claude.auth_status, AuthStatus::LoggedIn);
+        assert!(
+            probe_log.exists(),
+            "forced discovery must spawn the auth probe"
+        );
+        assert!(
+            super::super::auth_status_cache::len() > 0,
+            "forced discovery must warm the auth-status cache"
+        );
+
+        // ── Cheap: no probe spawned, status reused from cache. ────────────────
+        std::fs::remove_file(&probe_log).expect("clear probe log");
+        let cheap = discover_acp_runtimes_from(None, false);
+        let claude = cheap
+            .iter()
+            .find(|e| e.id == "claude")
+            .expect("claude entry present");
+        assert_eq!(
+            claude.availability,
+            AcpAvailabilityStatus::Available,
+            "cheap path keeps availability (resolved from cache)"
+        );
+        assert_eq!(
+            claude.auth_status,
+            AuthStatus::LoggedIn,
+            "cheap path must reuse the cached auth status"
+        );
+        assert!(
+            !probe_log.exists(),
+            "cheap discovery must not spawn any auth probe"
+        );
+    });
+
+    // Restore global state before propagating any panic.
+    std::env::set_var("PATH", &old_path);
+    clear_resolve_cache();
+    if let Err(e) = result {
+        std::panic::resume_unwind(e);
+    }
+}
+
+/// Before any forced probe warms the resolve cache, the cheap path resolves
+/// nothing live — it must not resolve a present-but-uncached binary by spawning
+/// a login shell to discover it. This is the flip side of the zero-spawn
+/// contract: cache-only resolution cannot see a binary the forced path has not
+/// yet cached. The forced path (exercised on every surface mount) resolves it
+/// and warms the cache; a subsequent cheap call then sees it Available (covered
+/// by `forced_discovery_probes_auth_but_cheap_discovery_reuses_cached_status`).
+///
+/// The assertion is scoped to what holds on any machine: the fake PATH-only
+/// `claude` CLI must not be resolved by the cheap path (availability is never
+/// `Available`, auth stays `Unknown`) and no login shell is spawned. It does
+/// not pin the exact `NotInstalled` vs `CliMissing` variant, because a real
+/// Buzz-managed `claude-agent-acp` shim on the host resolves via a filesystem
+/// stat (production-correct, never a spawn) and yields `CliMissing` — a genuine
+/// environment difference, not a regression.
+#[cfg(unix)]
+#[test]
+fn cheap_discovery_reports_absent_before_any_forced_probe() {
+    use crate::managed_agents::custom_harnesses::registry_test_lock;
+    use crate::managed_agents::discovery::{
+        clear_resolve_cache, discover_acp_runtimes_from, login_shell_spawn_probe,
+    };
+    use crate::managed_agents::{AcpAvailabilityStatus, AuthStatus};
+    use std::os::unix::fs::PermissionsExt;
+
+    let _path_guard = crate::managed_agents::lock_path_mutex();
+    let _registry_guard = registry_test_lock();
+
+    let dir = tempfile::tempdir().expect("tempdir");
+    for name in ["claude-agent-acp", "claude"] {
+        let bin = dir.path().join(name);
+        std::fs::write(&bin, "#!/bin/sh\nexit 0\n").expect("write fake bin");
+        std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755)).expect("chmod");
+    }
+
+    clear_resolve_cache(); // also clears the auth-status cache
+    login_shell_spawn_probe::reset();
+    let old_path = std::env::var_os("PATH").unwrap_or_default();
+    let mut new_path = vec![dir.path().to_path_buf()];
+    new_path.extend(std::env::split_paths(&old_path));
+    std::env::set_var("PATH", std::env::join_paths(&new_path).expect("join PATH"));
+
+    let result = std::panic::catch_unwind(|| {
+        let cheap = discover_acp_runtimes_from(None, false);
+        let claude = cheap
+            .iter()
+            .find(|e| e.id == "claude")
+            .expect("claude entry present");
+        assert_ne!(
+            claude.availability,
+            AcpAvailabilityStatus::Available,
+            "cache-only cheap discovery must not resolve the PATH-only claude CLI live"
+        );
+        assert_eq!(
+            claude.auth_status,
+            AuthStatus::Unknown,
+            "an unresolved runtime with no cached status stays Unknown"
+        );
+        assert_eq!(
+            login_shell_spawn_probe::count(),
+            0,
+            "cheap discovery must not spawn a login shell to resolve the PATH-only CLI"
+        );
+    });
+
+    std::env::set_var("PATH", &old_path);
+    clear_resolve_cache();
+    if let Err(e) = result {
+        std::panic::resume_unwind(e);
+    }
+}
diff --git a/desktop/src-tauri/src/managed_agents/discovery/tests/managed_path_resolution.rs b/desktop/src-tauri/src/managed_agents/discovery/tests/managed_path_resolution.rs
index 0795bb2345..5369b6321b 100644
--- a/desktop/src-tauri/src/managed_agents/discovery/tests/managed_path_resolution.rs
+++ b/desktop/src-tauri/src/managed_agents/discovery/tests/managed_path_resolution.rs
@@ -1,5 +1,28 @@
 use crate::managed_agents::discovery::{clear_resolve_cache, resolve_command};
 
+/// A login-shell command lookup must treat its argument as pure data — a
+/// payload containing shell metacharacters must never execute.
+#[test]
+fn login_shell_lookup_treats_command_as_data() {
+    use super::super::find_via_login_shell;
+
+    let _guard = crate::managed_agents::lock_path_mutex();
+    let marker =
+        std::env::temp_dir().join(format!("buzz-discovery-marker-{}", uuid::Uuid::new_v4()));
+    let payload = format!("doesnotexist; touch {} #", marker.display());
+
+    let resolved = find_via_login_shell(&payload);
+
+    assert!(
+        resolved.is_none(),
+        "payload should not resolve to a command"
+    );
+    assert!(
+        !marker.exists(),
+        "shell lookup must not execute injected commands"
+    );
+}
+
 /// The legacy Goose Windows installer wrote `%USERPROFILE%\goose\goose.exe`,
 /// a directory on no standard PATH. `resolve_command_uncached` finds binaries
 /// outside PATH only by scanning `common_binary_paths()`, so that directory
@@ -88,3 +111,79 @@ fn resolve_command_prefers_buzz_managed_npm_shim_over_path() {
         "Buzz-managed npm shim must win over PATH/global shims"
     );
 }
+
+/// The cheap discovery path must never spawn a login shell — not even on a
+/// cold cache.
+///
+/// `force: false` resolves commands from cache only (`resolve_command_cached`):
+/// on a resolve-cache miss it reports the command absent instead of falling
+/// through to `resolve_command_uncached` → `find_via_login_shell`, which spawns
+/// zsh/bash. That spawn on the channel-switch/composer hot path is the exact
+/// freeze source the cheap path exists to avoid, so a cold cheap call must
+/// spawn zero login shells. The forced path remains the sole prober: the same
+/// absent-command fixture spawns at least once under `force: true`, proving the
+/// cheap-path zero is real and not a fixture that never reaches the probe.
+#[cfg(unix)]
+#[test]
+fn cheap_discovery_never_spawns_login_shell_even_when_cold() {
+    use crate::managed_agents::custom_harnesses::registry_test_lock;
+    use crate::managed_agents::discovery::{
+        clear_resolve_cache, discover_acp_runtimes_from, login_shell_spawn_probe,
+    };
+    use std::fs;
+    use tempfile::tempdir;
+
+    // Serialize with every other test that spawns a login shell: the spawn
+    // counter and the PATH/login-shell caches are process-global.
+    let _path_guard = crate::managed_agents::lock_path_mutex();
+    let _registry = registry_test_lock();
+
+    // A custom harness whose command cannot resolve anywhere, so the resolver
+    // reaches `find_via_login_shell` under the forced (live) path.
+    let dir = tempdir().unwrap();
+    fs::write(
+        dir.path().join("absent-harness.json"),
+        r#"{
+            "id": "absent-harness",
+            "label": "Absent Harness",
+            "command": "buzz-absent-command-xyzzy",
+            "args": []
+        }"#,
+    )
+    .unwrap();
+
+    // Cold cache, cheap path: must spawn ZERO login shells (cache-only resolve
+    // reports the absent command missing without probing).
+    clear_resolve_cache();
+    login_shell_spawn_probe::reset();
+    let _ = discover_acp_runtimes_from(Some(dir.path()), false);
+    let cold_cheap = login_shell_spawn_probe::count();
+    assert_eq!(
+        cold_cheap, 0,
+        "a cold cheap discovery must not spawn any login shell, got {cold_cheap}"
+    );
+
+    // Second cheap discovery, still cold (no forced probe populated the cache):
+    // still zero — cache-only resolution never probes.
+    login_shell_spawn_probe::reset();
+    let _ = discover_acp_runtimes_from(Some(dir.path()), false);
+    let second_cheap = login_shell_spawn_probe::count();
+    assert_eq!(
+        second_cheap, 0,
+        "a repeated cheap discovery must not spawn any login shell, got {second_cheap}"
+    );
+
+    // Forced path over the SAME absent fixture: resolves live and reaches
+    // `find_via_login_shell` at least once. Proves the cheap-path zero above is
+    // genuine — the fixture does drive the probe when live resolution runs —
+    // not a vacuous zero from a fixture that never reaches it.
+    clear_resolve_cache();
+    login_shell_spawn_probe::reset();
+    let _ = discover_acp_runtimes_from(Some(dir.path()), true);
+    let forced = login_shell_spawn_probe::count();
+    clear_resolve_cache();
+    assert!(
+        forced >= 1,
+        "the forced path must probe the absent command via login shell at least once, got {forced}"
+    );
+}
diff --git a/desktop/src-tauri/src/managed_agents/runtime/cli_tests.rs b/desktop/src-tauri/src/managed_agents/runtime/cli_tests.rs
new file mode 100644
index 0000000000..2d4fee340a
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/runtime/cli_tests.rs
@@ -0,0 +1,38 @@
+//! Runtime CLI configuration regression tests kept beside the configured seam.
+
+use super::super::configure_runtime_cli;
+use crate::managed_agents::known_acp_runtime;
+
+#[test]
+fn claude_spawn_uses_the_probed_cli_executable() {
+    let _guard = crate::managed_agents::lock_path_mutex();
+    let temp = tempfile::tempdir().expect("temp dir");
+    let cli = temp
+        .path()
+        .join(format!("claude{}", std::env::consts::EXE_SUFFIX));
+    std::fs::write(&cli, "").expect("write fake cli");
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        std::fs::set_permissions(&cli, std::fs::Permissions::from_mode(0o755))
+            .expect("make fake cli executable");
+    }
+    let original_path = std::env::var_os("PATH");
+    std::env::set_var("PATH", temp.path());
+    // The resolver retains negative results across tests, so the fake CLI must
+    // invalidate both before configuration and after restoring PATH.
+    crate::managed_agents::clear_resolve_cache();
+
+    let mut command = std::process::Command::new("buzz-acp");
+    configure_runtime_cli(&mut command, known_acp_runtime("claude-agent-acp"));
+
+    if let Some(path) = original_path {
+        std::env::set_var("PATH", path);
+    } else {
+        std::env::remove_var("PATH");
+    }
+    crate::managed_agents::clear_resolve_cache();
+    assert!(command
+        .get_envs()
+        .any(|(key, value)| { key == "CLAUDE_CODE_EXECUTABLE" && value == Some(cli.as_os_str()) }));
+}
diff --git a/desktop/src-tauri/src/managed_agents/runtime/tests.rs b/desktop/src-tauri/src/managed_agents/runtime/tests.rs
index b54c0e7a05..8bedfe5320 100644
--- a/desktop/src-tauri/src/managed_agents/runtime/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/runtime/tests.rs
@@ -1,5 +1,8 @@
 use crate::managed_agents::known_acp_runtime;
 
+#[path = "cli_tests.rs"]
+mod cli_tests;
+
 // ── desktop binary name tests ───────────────────────────────────────────
 
 #[test]
@@ -582,36 +585,6 @@ fn name_matches_interpreter_rejects_node_prefix() {
     assert!(!super::name_matches_interpreter("node-gyp"));
 }
 
-#[test]
-fn claude_spawn_uses_the_probed_cli_executable() {
-    let _guard = crate::managed_agents::lock_path_mutex();
-    let temp = tempfile::tempdir().expect("temp dir");
-    let cli = temp
-        .path()
-        .join(format!("claude{}", std::env::consts::EXE_SUFFIX));
-    std::fs::write(&cli, "").expect("write fake cli");
-    #[cfg(unix)]
-    {
-        use std::os::unix::fs::PermissionsExt;
-        std::fs::set_permissions(&cli, std::fs::Permissions::from_mode(0o755))
-            .expect("make fake cli executable");
-    }
-    let original_path = std::env::var_os("PATH");
-    std::env::set_var("PATH", temp.path());
-
-    let mut command = std::process::Command::new("buzz-acp");
-    super::configure_runtime_cli(&mut command, super::known_acp_runtime("claude-agent-acp"));
-
-    if let Some(path) = original_path {
-        std::env::set_var("PATH", path);
-    } else {
-        std::env::remove_var("PATH");
-    }
-    assert!(command
-        .get_envs()
-        .any(|(key, value)| { key == "CLAUDE_CODE_EXECUTABLE" && value == Some(cli.as_os_str()) }));
-}
-
 #[test]
 fn codex_spawn_does_not_set_a_claude_executable() {
     let mut command = std::process::Command::new("buzz-acp");
diff --git a/desktop/src/features/agents/acpRuntimesQuery.test.mjs b/desktop/src/features/agents/acpRuntimesQuery.test.mjs
new file mode 100644
index 0000000000..c51dea05b8
--- /dev/null
+++ b/desktop/src/features/agents/acpRuntimesQuery.test.mjs
@@ -0,0 +1,491 @@
+/**
+ * Regression tests for the cheap/forced ACP runtime discovery split.
+ *
+ * Two IMPORTANT correctness contracts from the review of the split:
+ *
+ *  (1) refreshAcpRuntimes() must never coalesce onto an in-flight *cheap*
+ *      request. React Query's fetchQuery deduplicates on the shared query key,
+ *      so a cheap fetch already running would otherwise satisfy the forced
+ *      refresh with cached data and the forced { force: true } probe would
+ *      never run. The fix runs the forced probe on a separate key, writes its
+ *      result into the shared cache, then cancels the in-flight cheap query.
+ *      This test holds a cheap request pending, fires refreshAcpRuntimes(),
+ *      resolves the cheap request, and asserts a distinct { force: true } native
+ *      call happened and the shared cache holds the forced result.
+ *
+ *  (2) useAcpRuntimesQueryForced({ forceOnMount: false }) must consume shared
+ *      state without mounting its own force effect. Onboarding mounts the hook
+ *      once as the surface owner (forceOnMount default true) and once per row
+ *      (forceOnMount false); entering the surface must cause exactly one forced
+ *      native call before any user action.
+ *
+ * The Tauri IPC bridge is stubbed at globalThis.__TAURI_INTERNALS__.invoke so
+ * discoverAcpRuntimes() calls are intercepted by command name and the { force }
+ * payload is observed directly (same pattern as
+ * useLoadArchivedObserverEvents.test.mjs).
+ */
+
+import assert from "node:assert/strict";
+import { afterEach, describe, it } from "node:test";
+
+// ── Minimal DOM shim (subset used by other mounted-hook tests) ────────────────
+
+function installDOMShim() {
+  if (globalThis.document) return;
+
+  class MinimalEventTarget {
+    constructor() {
+      this._listeners = {};
+    }
+    addEventListener(type, fn) {
+      this._listeners[type] ??= [];
+      this._listeners[type].push(fn);
+    }
+    removeEventListener(type, fn) {
+      this._listeners[type] = (this._listeners[type] ?? []).filter(
+        (f) => f !== fn,
+      );
+    }
+    dispatchEvent(e) {
+      for (const fn of this._listeners[e.type] ?? []) fn(e);
+      return true;
+    }
+  }
+
+  class MinimalNode extends MinimalEventTarget {
+    constructor(tagName) {
+      super();
+      this.tagName = tagName;
+      this.children = [];
+      this.childNodes = [];
+      this.style = {};
+      this.nodeType = 1;
+      this.parentNode = null;
+    }
+    get ownerDocument() {
+      return globalThis.document;
+    }
+    get firstChild() {
+      return this.children[0] ?? null;
+    }
+    get nextSibling() {
+      return null;
+    }
+    appendChild(child) {
+      this.children.push(child);
+      this.childNodes.push(child);
+      child.parentNode = this;
+      return child;
+    }
+    removeChild(child) {
+      this.children = this.children.filter((c) => c !== child);
+      this.childNodes = this.childNodes.filter((c) => c !== child);
+      return child;
+    }
+    insertBefore(newNode, refNode) {
+      if (!refNode) return this.appendChild(newNode);
+      const i = this.children.indexOf(refNode);
+      if (i < 0) return this.appendChild(newNode);
+      this.children.splice(i, 0, newNode);
+      this.childNodes.splice(i, 0, newNode);
+      newNode.parentNode = this;
+      return newNode;
+    }
+    contains(node) {
+      if (!node) return false;
+      return this === node || this.children.some((c) => c?.contains?.(node));
+    }
+  }
+
+  class MinimalDocument extends MinimalEventTarget {
+    constructor() {
+      super();
+      this.nodeType = 9;
+    }
+    createElement(tagName) {
+      return new MinimalNode(tagName);
+    }
+    createTextNode(value) {
+      const n = new MinimalNode("#text");
+      n.nodeValue = value;
+      n.nodeType = 3;
+      return n;
+    }
+    createComment(value) {
+      const n = new MinimalNode("#comment");
+      n.nodeValue = value;
+      n.nodeType = 8;
+      return n;
+    }
+    get body() {
+      if (!this._body) this._body = this.createElement("body");
+      return this._body;
+    }
+    get activeElement() {
+      return null;
+    }
+    contains(node) {
+      return node != null;
+    }
+  }
+
+  globalThis.document = new MinimalDocument();
+  globalThis.HTMLElement = MinimalNode;
+  globalThis.HTMLIFrameElement = MinimalNode;
+  globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+  process.env.IS_REACT_ACT_ENVIRONMENT = "true";
+  if (typeof globalThis.window === "undefined") {
+    Object.defineProperty(globalThis, "window", {
+      value: globalThis,
+      configurable: true,
+    });
+  }
+  if (!Object.getOwnPropertyDescriptor(globalThis, "navigator")?.value) {
+    Object.defineProperty(globalThis, "navigator", {
+      value: { userAgent: "node" },
+      configurable: true,
+    });
+  }
+  globalThis.MutationObserver = class {
+    observe() {}
+    disconnect() {}
+    takeRecords() {
+      return [];
+    }
+  };
+  globalThis.requestAnimationFrame = (fn) => setTimeout(fn, 0);
+}
+
+installDOMShim();
+
+// ── Tauri IPC interceptor ─────────────────────────────────────────────────────
+
+/** @type {Array<{ command: string, args: unknown }>} */
+const calls = [];
+/** @type {(args: unknown) => Promise<unknown>} */
+let discoverHandler = () => Promise.resolve([]);
+
+globalThis.__TAURI_INTERNALS__ = {
+  invoke: (command, args) => {
+    calls.push({ command, args });
+    if (command === "discover_acp_providers") return discoverHandler(args);
+    return Promise.reject(new Error(`unmocked Tauri command: ${command}`));
+  },
+  transformCallback: () => Math.random(),
+};
+
+// ── Production imports (after shim + IPC stub) ────────────────────────────────
+
+import React from "react";
+import { createRoot } from "react-dom/client";
+import { act } from "react";
+import { QueryClient } from "@tanstack/react-query";
+import { QueryClientProvider } from "@tanstack/react-query";
+
+import {
+  acpRuntimesQueryKey,
+  refreshAcpRuntimes,
+  useAcpRuntimesQueryForced,
+} from "./acpRuntimesQuery.ts";
+import { discoverAcpRuntimes } from "@/shared/api/tauriAcpDiscovery.ts";
+
+// ── Wire-shape helper ─────────────────────────────────────────────────────────
+
+/** A raw discover_acp_providers row (snake_case wire shape). */
+function rawEntry(id, authStatusValue) {
+  return {
+    id,
+    label: id,
+    avatar_url: "",
+    availability: "available",
+    command: id,
+    binary_path: `/usr/bin/${id}`,
+    default_args: [],
+    mcp_command: null,
+    install_hint: "",
+    install_instructions_url: "",
+    can_auto_install: false,
+    underlying_cli_path: null,
+    node_required: false,
+    auth_status: { status: authStatusValue },
+    source: "builtin",
+  };
+}
+
+function makeQueryClient() {
+  return new QueryClient({ defaultOptions: { queries: { retry: false } } });
+}
+
+/** A promise plus its resolver, for holding a request pending. */
+function deferred() {
+  let resolve;
+  const promise = new Promise((r) => {
+    resolve = r;
+  });
+  return { promise, resolve };
+}
+
+afterEach(() => {
+  calls.length = 0;
+  discoverHandler = () => Promise.resolve([]);
+});
+
+describe("refreshAcpRuntimes cannot dedup onto an in-flight cheap request", () => {
+  it("runs a distinct force:true probe and writes it into the shared cache", async () => {
+    const queryClient = makeQueryClient();
+    queryClient.mount();
+
+    // 1. A cheap request (force:false) is in flight and held pending.
+    const cheap = deferred();
+    discoverHandler = (args) => {
+      if (args?.force === false) return cheap.promise;
+      // 2. The forced request resolves immediately with distinct data.
+      return Promise.resolve([rawEntry("codex", "logged_in")]);
+    };
+
+    // Start the cheap fetch through the real cheap query path and leave pending.
+    const cheapFetch = queryClient.fetchQuery({
+      queryKey: acpRuntimesQueryKey,
+      queryFn: () => discoverAcpRuntimes(),
+      staleTime: 30 * 60_000,
+    });
+    await new Promise((r) => setImmediate(r));
+
+    // 3. Forced refresh fires while the cheap fetch is still pending.
+    const forced = await refreshAcpRuntimes(queryClient);
+
+    // 4. Resolve the cheap request afterward; it must not be what the caller got.
+    cheap.resolve([rawEntry("codex", "unknown")]);
+    await cheapFetch.catch(() => {});
+
+    const forceCalls = calls.filter(
+      (c) => c.command === "discover_acp_providers" && c.args?.force === true,
+    );
+    assert.equal(
+      forceCalls.length,
+      1,
+      "exactly one forced native probe must have run",
+    );
+    assert.equal(forced[0]?.authStatus.status, "logged_in");
+    assert.equal(
+      queryClient.getQueryData(acpRuntimesQueryKey)?.[0]?.authStatus.status,
+      "logged_in",
+      "shared cache must hold the forced result, not the later cheap one",
+    );
+
+    queryClient.unmount();
+  });
+});
+
+describe("useAcpRuntimesQueryForced surfaces forced-probe failures", () => {
+  it("projects a mount-time forced rejection into error with no unhandled rejection", async () => {
+    const unhandled = [];
+    const onUnhandled = (err) => unhandled.push(err);
+    process.on("unhandledRejection", onUnhandled);
+
+    const queryClient = makeQueryClient();
+    discoverHandler = (args) =>
+      args?.force === true
+        ? Promise.reject(new Error("forced probe failed"))
+        : Promise.resolve([]);
+
+    let latest = null;
+    function Consumer() {
+      latest = useAcpRuntimesQueryForced();
+      return null;
+    }
+
+    const container = document.createElement("div");
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        React.createElement(
+          QueryClientProvider,
+          { client: queryClient },
+          React.createElement(Consumer),
+        ),
+      );
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+
+    assert.equal(
+      latest?.error instanceof Error && latest.error.message,
+      "forced probe failed",
+      "mount-time forced rejection must surface as the hook's error",
+    );
+    assert.equal(
+      latest?.isError,
+      true,
+      "isError must reflect the forced failure",
+    );
+
+    // Drain the microtask queue so any stray rejection would have fired.
+    await new Promise((r) => setTimeout(r, 10));
+    process.off("unhandledRejection", onUnhandled);
+    assert.deepEqual(
+      unhandled,
+      [],
+      "no unhandled rejection may escape the fire-and-forget mount force",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
+  it("surfaces an explicit-refresh rejection and clears it on the next success", async () => {
+    const unhandled = [];
+    const onUnhandled = (err) => unhandled.push(err);
+    process.on("unhandledRejection", onUnhandled);
+
+    const queryClient = makeQueryClient();
+    let failForced = true;
+    discoverHandler = (args) => {
+      if (args?.force !== true) return Promise.resolve([]);
+      return failForced
+        ? Promise.reject(new Error("refresh failed"))
+        : Promise.resolve([rawEntry("codex", "logged_in")]);
+    };
+
+    let latest = null;
+    function Consumer() {
+      // forceOnMount:false so the only forced probe is the explicit refresh.
+      latest = useAcpRuntimesQueryForced({ forceOnMount: false });
+      return null;
+    }
+
+    const container = document.createElement("div");
+    const root = createRoot(container);
+    await act(async () => {
+      root.render(
+        React.createElement(
+          QueryClientProvider,
+          { client: queryClient },
+          React.createElement(Consumer),
+        ),
+      );
+    });
+
+    // Explicit refresh (button/polling shape): void-called, must not reject.
+    await act(async () => {
+      void latest.forceRefresh();
+      await new Promise((r) => setTimeout(r, 50));
+    });
+    assert.equal(
+      latest?.error instanceof Error && latest.error.message,
+      "refresh failed",
+      "explicit-refresh rejection must surface as the hook's error",
+    );
+
+    // A subsequent successful refresh clears the error and delivers data.
+    failForced = false;
+    await act(async () => {
+      void latest.forceRefresh();
+      await new Promise((r) => setTimeout(r, 50));
+    });
+    assert.equal(
+      latest?.error,
+      null,
+      "a later successful refresh clears the error",
+    );
+    assert.equal(
+      queryClient.getQueryData(acpRuntimesQueryKey)?.[0]?.authStatus.status,
+      "logged_in",
+      "successful refresh writes the fresh catalog into the shared cache",
+    );
+
+    await new Promise((r) => setTimeout(r, 10));
+    process.off("unhandledRejection", onUnhandled);
+    assert.deepEqual(
+      unhandled,
+      [],
+      "no unhandled rejection may escape a void forceRefresh() call",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+});
+
+describe("useAcpRuntimesQueryForced force-on-mount ownership", () => {
+  it("a later-mounted row does not fire a second forced probe", async () => {
+    const queryClient = makeQueryClient();
+    discoverHandler = () => Promise.resolve([rawEntry("codex", "logged_in")]);
+
+    // Onboarding's real sequence: the surface owner mounts and forces discovery;
+    // once its result renders, per-runtime rows mount. A row that shared the
+    // owner's default force-on-mount would fire a *second*, sequential forced
+    // probe (forced-key dedup cannot collapse it — the owner's fetch is already
+    // idle). Rows pass forceOnMount:false to consume shared state only.
+    function Owner() {
+      useAcpRuntimesQueryForced();
+      return null;
+    }
+    function Row() {
+      useAcpRuntimesQueryForced({ forceOnMount: false });
+      return null;
+    }
+
+    const container = document.createElement("div");
+    const root = createRoot(container);
+
+    // 1. Owner mounts and forces once; let the probe settle.
+    await act(async () => {
+      root.render(
+        React.createElement(
+          QueryClientProvider,
+          { client: queryClient },
+          React.createElement(Owner),
+        ),
+      );
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+    const afterOwner = calls.filter(
+      (c) => c.command === "discover_acp_providers" && c.args?.force === true,
+    ).length;
+    assert.equal(afterOwner, 1, "owner mount must force exactly once");
+
+    // 2. Rows mount after the owner's result settled; they must not re-probe.
+    await act(async () => {
+      root.render(
+        React.createElement(
+          QueryClientProvider,
+          { client: queryClient },
+          React.createElement(Owner),
+          React.createElement(Row),
+          React.createElement(Row),
+          React.createElement(Row),
+        ),
+      );
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+
+    const forceCalls = calls.filter(
+      (c) => c.command === "discover_acp_providers" && c.args?.force === true,
+    );
+    assert.equal(
+      forceCalls.length,
+      1,
+      "later-mounted rows must not trigger a second forced probe",
+    );
+    const cheapCalls = calls.filter(
+      (c) => c.command === "discover_acp_providers" && c.args?.force === false,
+    );
+    assert.equal(
+      cheapCalls.length,
+      0,
+      "the forced hook must never fire a cheap fetch (enabled: false observer)",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+});
diff --git a/desktop/src/features/agents/acpRuntimesQuery.ts b/desktop/src/features/agents/acpRuntimesQuery.ts
new file mode 100644
index 0000000000..0e76e25ee7
--- /dev/null
+++ b/desktop/src/features/agents/acpRuntimesQuery.ts
@@ -0,0 +1,135 @@
+import * as React from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+
+import { discoverAcpRuntimes } from "@/shared/api/tauriAcpDiscovery";
+
+/**
+ * Shared React Query key for the ACP runtime catalog. Every consumer (cheap or
+ * forced) reads and writes this one entry, so a forced refresh updates the same
+ * cache the hot-path `useAcpRuntimesQuery` renders from.
+ */
+export const acpRuntimesQueryKey = ["acp-runtimes"] as const;
+
+/**
+ * Separate key for the forced (full re-discovery) fetch. Forced refresh runs on
+ * *this* key, never the shared cheap key, so React Query's `fetchQuery` can
+ * never deduplicate a forced probe onto an in-flight cheap request for the
+ * shared key. The forced result is then written into the shared cache
+ * deliberately (see `refreshAcpRuntimes`).
+ */
+export const acpRuntimesForcedQueryKey = ["acp-runtimes", "forced"] as const;
+
+/**
+ * Run a forced (full re-discovery) refresh and write the result into the shared
+ * runtime-catalog cache.
+ *
+ * This is the only path that pays the expensive discovery pipeline (cache
+ * clear, PATH re-fetch, CLI auth probes). Surfaces that need fresh state call
+ * it deliberately: Settings/onboarding on open and on their refresh buttons,
+ * and the connect/install/save/delete mutations in `onSettled`. A bare
+ * `invalidateQueries` would only re-run the cheap query path and never
+ * re-probe, so the freshly-changed auth/catalog state would not be reflected.
+ *
+ * The forced fetch runs on its own key so it can never coalesce onto an
+ * in-flight *cheap* request for the shared key (which would satisfy the caller
+ * with cached availability and never run the `{ force: true }` probe). Its
+ * result is then written into the shared cache with `setQueryData` so hot
+ * surfaces rendering `useAcpRuntimesQuery` re-render with the fresh catalog.
+ * Concurrent forced callers still dedup on the forced key; the backend
+ * coalesces overlapping forced runs as a second layer.
+ */
+export async function refreshAcpRuntimes(
+  queryClient: ReturnType<typeof useQueryClient>,
+) {
+  try {
+    const result = await queryClient.fetchQuery({
+      queryKey: acpRuntimesForcedQueryKey,
+      queryFn: () => discoverAcpRuntimes({ force: true }),
+      staleTime: 0,
+      gcTime: 0,
+    });
+    queryClient.setQueryData(acpRuntimesQueryKey, result);
+    // A hot-surface cheap fetch may already be in flight on the shared key; cancel
+    // it so its (older, cached) result cannot land after and clobber the fresh
+    // forced catalog we just wrote.
+    await queryClient.cancelQueries({ queryKey: acpRuntimesQueryKey });
+    return result;
+  } catch {
+    // The forced probe rejected. `fetchQuery` has already recorded the error in
+    // the forced key's query state, where `useAcpRuntimesQueryForced` projects
+    // it into the hook's returned `error`/`isError`. Swallow the rejection here
+    // — at the single source — so the many fire-and-forget callers (mount,
+    // sign-in polling, refresh buttons, and the four mutation `onSettled`
+    // paths) can keep `void refreshAcpRuntimes(...)` without ever leaking an
+    // unhandled rejection, and a new call site can never reintroduce one. The
+    // shared cache is left untouched so consumers keep the last good catalog
+    // alongside the surfaced error.
+    return undefined;
+  }
+}
+
+/**
+ * ACP runtimes query for surfaces that need fresh auth/version state: Settings
+ * harness panels and onboarding.
+ *
+ * It reads the shared runtime catalog (`enabled: false`, so it never fires its
+ * own cheap fetch — the forced probe below is the only fetcher) and re-renders
+ * whenever `refreshAcpRuntimes` writes a fresh catalog into that cache. Loading
+ * *and error* state are taken from a disabled observer on the forced key, so
+ * refresh buttons and the onboarding spinner reflect the forced probe and a
+ * failed probe surfaces as `error`/`isError` rather than a silent empty
+ * catalog. `forceRefresh` drives explicit refresh buttons and sign-in
+ * polling.
+ *
+ * `forceOnMount` (default `true`) is the surface owner's one force-on-mount.
+ * Child rows that share the same surface must pass `forceOnMount: false`: they
+ * consume the shared query state and the `forceRefresh` callback, but must not
+ * mount a *second* force effect. Each mounted force effect is a distinct forced
+ * probe, so an owner + N rows would otherwise re-run the 20–65s pipeline N+1
+ * times on entry (and race the catalog to a later state before the owner's
+ * first result renders).
+ */
+export function useAcpRuntimesQueryForced(options?: {
+  enabled?: boolean;
+  forceOnMount?: boolean;
+}) {
+  const enabled = options?.enabled ?? true;
+  const forceOnMount = options?.forceOnMount ?? true;
+  const queryClient = useQueryClient();
+  const query = useQuery({
+    queryKey: acpRuntimesQueryKey,
+    queryFn: () => discoverAcpRuntimes(),
+    staleTime: 30 * 60_000,
+    // Read-only observer: the forced refresh is the fetcher for these surfaces,
+    // so this must never fire a cheap fetch (which would race and could
+    // overwrite the fresh forced result with cached data).
+    enabled: false,
+  });
+  // Read-only observer on the forced key so the hook surfaces the forced
+  // probe's fetching *and error* state. `refreshAcpRuntimes` runs the fetch
+  // imperatively via `fetchQuery`; this disabled observer never fetches itself
+  // but reflects that query's state, so a rejected forced probe becomes a
+  // visible `error`/`isError` instead of an unhandled rejection with a silent
+  // empty/stale catalog.
+  const forcedQuery = useQuery({
+    queryKey: acpRuntimesForcedQueryKey,
+    queryFn: () => discoverAcpRuntimes({ force: true }),
+    enabled: false,
+  });
+  const forceRefresh = React.useCallback(
+    () => refreshAcpRuntimes(queryClient),
+    [queryClient],
+  );
+  React.useEffect(() => {
+    if (enabled && forceOnMount) void forceRefresh();
+  }, [enabled, forceOnMount, forceRefresh]);
+  const isFetching = query.isFetching || forcedQuery.isFetching;
+  return {
+    ...query,
+    error: forcedQuery.error ?? query.error,
+    isError: forcedQuery.isError || query.isError,
+    isFetching,
+    isLoading: isFetching && query.data === undefined,
+    forceRefresh,
+  };
+}
diff --git a/desktop/src/features/agents/hooks.ts b/desktop/src/features/agents/hooks.ts
index 6d8ab4f6ea..5d0be06109 100644
--- a/desktop/src/features/agents/hooks.ts
+++ b/desktop/src/features/agents/hooks.ts
@@ -25,7 +25,6 @@ import {
   createManagedAgent,
   deleteManagedAgent,
   deleteCustomHarness,
-  discoverAcpRuntimes,
   discoverBackendProviders,
   discoverGitBashPrerequisite,
   discoverManagedAgentPrereqs,
@@ -43,6 +42,7 @@ import {
   updateManagedAgent,
 } from "@/shared/api/tauri";
 import type { HarnessDefinitionInput } from "@/shared/api/tauri";
+import { discoverAcpRuntimes } from "@/shared/api/tauriAcpDiscovery";
 import {
   setManagedAgentAutoRestart,
   setManagedAgentStartOnAppLaunch,
@@ -50,6 +50,11 @@ import {
   stopManagedAgent,
 } from "@/shared/api/tauriManagedAgents";
 import { bootstrapManagedAgentRuntimePairs } from "@/features/agents/managedAgentRuntimeHooks";
+import {
+  acpRuntimesQueryKey,
+  refreshAcpRuntimes,
+} from "@/features/agents/acpRuntimesQuery";
+export { useAcpRuntimesQueryForced } from "@/features/agents/acpRuntimesQuery";
 import {
   createPersona,
   deletePersona,
@@ -123,7 +128,6 @@ export const managedAgentLogFocusRefetchPolicy = {
 export const relayAgentsQueryKey = ["relay-agents"] as const;
 export const managedAgentsQueryKey = ["managed-agents"] as const;
 export const personasQueryKey = ["personas"] as const;
-export const acpRuntimesQueryKey = ["acp-runtimes"] as const;
 export const acpAuthMethodsQueryKey = ["acp-auth-methods"] as const;
 export const managedAgentPrereqsQueryKey = ["managed-agent-prereqs"] as const;
 export const backendProvidersQueryKey = ["backend-providers"] as const;
@@ -199,12 +203,26 @@ function invalidateManagedAgentQueriesInBackground(
   );
 }
 
+/**
+ * Discover the ACP runtime catalog.
+ *
+ * This always serves the **cheap** backend path: the last cached runtime
+ * availability + auth statuses, no process spawns, low-millisecond. Hot
+ * surfaces (channel switch, composer, member bar) render from cache — a
+ * 30-minute `staleTime` keeps channel switches from re-triggering discovery.
+ *
+ * Fresh auth/version state (Settings, onboarding sign-in, post-mutation) comes
+ * from `refreshAcpRuntimes`, which runs the expensive forced path explicitly
+ * and writes the result into this same cache. Keeping the query's own
+ * `queryFn` cheap guarantees an automatic staleness refetch never re-runs the
+ * probe pipeline.
+ */
 export function useAcpRuntimesQuery(options?: { enabled?: boolean }) {
   return useQuery({
     enabled: options?.enabled ?? true,
     queryKey: acpRuntimesQueryKey,
-    queryFn: discoverAcpRuntimes,
-    staleTime: 60_000,
+    queryFn: () => discoverAcpRuntimes(),
+    staleTime: 30 * 60_000,
   });
 }
 
@@ -238,7 +256,7 @@ export function useConnectAcpRuntimeMutation() {
     mutationFn: (input: { runtimeId: string; methodId: string }) =>
       connectAcpRuntime(input.runtimeId, input.methodId),
     onSettled: () => {
-      void queryClient.invalidateQueries({ queryKey: acpRuntimesQueryKey });
+      void refreshAcpRuntimes(queryClient);
       void queryClient.invalidateQueries({ queryKey: acpAuthMethodsQueryKey });
       void queryClient.invalidateQueries({ queryKey: managedAgentsQueryKey });
     },
@@ -250,7 +268,7 @@ export function useInstallAcpRuntimeMutation() {
   return useMutation({
     mutationFn: (runtimeId: string) => installAcpRuntime(runtimeId),
     onSettled: () => {
-      void queryClient.invalidateQueries({ queryKey: acpRuntimesQueryKey });
+      void refreshAcpRuntimes(queryClient);
       void queryClient.invalidateQueries({ queryKey: managedAgentsQueryKey });
     },
   });
@@ -267,7 +285,7 @@ export function useSaveCustomHarnessMutation() {
       originalId?: string;
     }) => saveCustomHarness(definition, originalId),
     onSettled: () => {
-      void queryClient.invalidateQueries({ queryKey: acpRuntimesQueryKey });
+      void refreshAcpRuntimes(queryClient);
     },
   });
 }
@@ -277,7 +295,7 @@ export function useDeleteCustomHarnessMutation() {
   return useMutation({
     mutationFn: (id: string) => deleteCustomHarness(id),
     onSettled: () => {
-      void queryClient.invalidateQueries({ queryKey: acpRuntimesQueryKey });
+      void refreshAcpRuntimes(queryClient);
     },
   });
 }
diff --git a/desktop/src/features/onboarding/ui/SetupStep.acpForcedGate.test.mjs b/desktop/src/features/onboarding/ui/SetupStep.acpForcedGate.test.mjs
new file mode 100644
index 0000000000..c360256438
--- /dev/null
+++ b/desktop/src/features/onboarding/ui/SetupStep.acpForcedGate.test.mjs
@@ -0,0 +1,433 @@
+/**
+ * Mounted consumer regressions for the SetupStep forced-probe readiness gate.
+ *
+ * P1: isChecking = isFetching (not isLoading) ensures the Next button stays
+ * disabled while the forced probe is in flight or has rejected, even when
+ * cached data exists. With the old isLoading mapping, isLoading is false when
+ * data is present, so the button was incorrectly enabled.
+ *
+ * Mutation proof: revert only the SetupStep.tsx hunk and both tests go RED
+ * (button enabled in states it must block).
+ */
+
+import assert from "node:assert/strict";
+import { after, afterEach, before, describe, it } from "node:test";
+import { JSDOM } from "jsdom";
+
+const dom = new JSDOM("<!doctype html><html><body></body></html>", {
+  url: "http://localhost",
+});
+
+Object.assign(globalThis, {
+  HTMLElement: dom.window.HTMLElement,
+  HTMLIFrameElement: dom.window.HTMLIFrameElement,
+  IS_REACT_ACT_ENVIRONMENT: true,
+  MutationObserver: dom.window.MutationObserver,
+  ResizeObserver: class {
+    observe() {}
+    unobserve() {}
+    disconnect() {}
+  },
+  document: dom.window.document,
+  localStorage: dom.window.localStorage,
+  self: dom.window,
+  window: dom.window,
+});
+Object.defineProperty(globalThis, "navigator", {
+  configurable: true,
+  value: dom.window.navigator,
+});
+dom.window.requestAnimationFrame = (callback) => setTimeout(callback, 0);
+globalThis.requestAnimationFrame = dom.window.requestAnimationFrame;
+dom.window.ResizeObserver = globalThis.ResizeObserver;
+dom.window.matchMedia ??= (query) => ({
+  matches: false,
+  media: query,
+  onchange: null,
+  addListener: () => {},
+  removeListener: () => {},
+  addEventListener: () => {},
+  removeEventListener: () => {},
+  dispatchEvent: () => false,
+});
+globalThis.matchMedia = dom.window.matchMedia;
+
+// ── Tauri IPC stub ────────────────────────────────────────────────────────────
+
+let discoverHandler = () => Promise.resolve([]);
+
+globalThis.__TAURI_INTERNALS__ = {
+  invoke: (command, args) => {
+    if (command === "discover_acp_providers") return discoverHandler(args);
+    // All other commands (e.g. plugin:event|listen from useInstallOutputLine)
+    // reject; useInstallOutputLine catches gracefully ("event system unavailable").
+    return Promise.reject(new Error(`unmocked: ${command}`));
+  },
+  transformCallback: () => 1,
+};
+dom.window.__TAURI_INTERNALS__ = globalThis.__TAURI_INTERNALS__;
+
+// ── Deferred imports (must run after globalThis is configured) ────────────────
+
+let React,
+  act,
+  createRoot,
+  QueryClient,
+  QueryClientProvider,
+  SetupStep,
+  acpRuntimesQueryKey,
+  TooltipProvider;
+
+before(async () => {
+  ({ default: React, act } = await import("react"));
+  ({ createRoot } = await import("react-dom/client"));
+  ({ QueryClient, QueryClientProvider } = await import(
+    "@tanstack/react-query"
+  ));
+  ({ SetupStep } = await import("./SetupStep.tsx"));
+  ({ acpRuntimesQueryKey } = await import(
+    "@/features/agents/acpRuntimesQuery.ts"
+  ));
+  ({ TooltipProvider } = await import("@/shared/ui/tooltip.tsx"));
+});
+
+afterEach(() => {
+  discoverHandler = () => Promise.resolve([]);
+});
+
+after(() => dom.window.close());
+
+// ── Helpers ───────────────────────────────────────────────────────────────────
+
+/** Camelcase AcpRuntimeCatalogEntry as stored in acpRuntimesQueryKey cache. */
+function catalogEntry(id, authStatusValue) {
+  return {
+    id,
+    label: id,
+    avatarUrl: "",
+    availability: "available",
+    command: id,
+    binaryPath: `/usr/bin/${id}`,
+    defaultArgs: [],
+    mcpCommand: null,
+    modelEnvVar: null,
+    providerEnvVar: null,
+    thinkingEnvVar: null,
+    maxTokensEnvVar: null,
+    contextLimitEnvVar: null,
+    maxRoundsEnvVar: null,
+    installHint: "",
+    installInstructionsUrl: "",
+    canAutoInstall: false,
+    requiresExternalCli: false,
+    underlyingCliPath: null,
+    nodeRequired: false,
+    authStatus: { status: authStatusValue },
+    loginHint: null,
+    source: "builtin",
+    definitionEnv: {},
+  };
+}
+
+/** Raw snake_case backend entry as `discoverAcpRuntimes` receives it before
+ * `fromRawAcpRuntimeCatalogEntry`. Use for values a forced probe resolves at
+ * the IPC boundary (vs. `catalogEntry` for values seeded directly into cache). */
+function rawReadyEntry(id) {
+  return {
+    id,
+    label: id,
+    avatar_url: "",
+    availability: "available",
+    command: id,
+    binary_path: `/usr/bin/${id}`,
+    default_args: [],
+    mcp_command: null,
+    install_hint: "",
+    install_instructions_url: "",
+    can_auto_install: false,
+    requires_external_cli: false,
+    underlying_cli_path: null,
+    node_required: false,
+    auth_status: { status: "logged_in" },
+    source: "builtin",
+  };
+}
+
+function makeQueryClient() {
+  return new QueryClient({ defaultOptions: { queries: { retry: false } } });
+}
+
+function deferred() {
+  let resolve;
+  const promise = new Promise((r) => {
+    resolve = r;
+  });
+  return { promise, resolve };
+}
+
+const NOOP = () => {};
+const ACTIONS = { back: NOOP, next: NOOP, navigateToAgentSettings: NOOP };
+
+/** Mount SetupStep under the query client + tooltip provider it requires. */
+function renderSetupStep() {
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  const root = createRoot(container);
+  return { container, root };
+}
+
+function setupStepTree(queryClient) {
+  return React.createElement(
+    QueryClientProvider,
+    { client: queryClient },
+    React.createElement(
+      TooltipProvider,
+      null,
+      React.createElement(SetupStep, {
+        actions: ACTIONS,
+        direction: "forward",
+        onReadyRuntimeIdsChange: NOOP,
+      }),
+    ),
+  );
+}
+
+// ── Tests ─────────────────────────────────────────────────────────────────────
+
+describe("SetupStep Next button readiness gate — P1 regression (mounted consumer)", () => {
+  it("onboarding-setup-next is disabled while forced probe is pending over cached data", async () => {
+    const queryClient = makeQueryClient();
+    // Pre-seed cache with a ready runtime. getReadyOnboardingRuntimes
+    // will return it, so readyRuntimeIds.length > 0 — proving the button
+    // is blocked by isChecking, not by an empty ready set.
+    queryClient.setQueryData(acpRuntimesQueryKey, [
+      catalogEntry("codex", "logged_in"),
+    ]);
+
+    const pending = deferred();
+    discoverHandler = (args) =>
+      args?.force === true ? pending.promise : Promise.resolve([]);
+
+    const container = document.createElement("div");
+    document.body.appendChild(container);
+    const root = createRoot(container);
+
+    await act(async () => {
+      root.render(
+        React.createElement(
+          QueryClientProvider,
+          { client: queryClient },
+          React.createElement(
+            TooltipProvider,
+            null,
+            React.createElement(SetupStep, {
+              actions: ACTIONS,
+              direction: "forward",
+              onReadyRuntimeIdsChange: NOOP,
+            }),
+          ),
+        ),
+      );
+    });
+    // Let the mount-time forceRefresh dispatch (but not resolve).
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+
+    const button = container.querySelector(
+      '[data-testid="onboarding-setup-next"]',
+    );
+    assert.ok(button, "onboarding-setup-next button must be present");
+    assert.ok(
+      button.disabled,
+      "Next button must be disabled while forced probe is in flight over cached data",
+    );
+
+    // Resolve the pending probe inside act so React Query drains its state
+    // update before unmount — prevents "Promise resolution still pending"
+    // from the dangling deferred.
+    await act(async () => {
+      pending.resolve([]);
+      await new Promise((r) => setTimeout(r, 0));
+    });
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+
+  it("onboarding-setup-next is disabled after forced probe rejects over cached data", async () => {
+    const queryClient = makeQueryClient();
+    queryClient.setQueryData(acpRuntimesQueryKey, [
+      catalogEntry("codex", "logged_in"),
+    ]);
+
+    discoverHandler = (args) =>
+      args?.force === true
+        ? Promise.reject(new Error("forced probe rejected"))
+        : Promise.resolve([]);
+
+    const container = document.createElement("div");
+    document.body.appendChild(container);
+    const root = createRoot(container);
+
+    await act(async () => {
+      root.render(
+        React.createElement(
+          QueryClientProvider,
+          { client: queryClient },
+          React.createElement(
+            TooltipProvider,
+            null,
+            React.createElement(SetupStep, {
+              actions: ACTIONS,
+              direction: "forward",
+              onReadyRuntimeIdsChange: NOOP,
+            }),
+          ),
+        ),
+      );
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+
+    const button = container.querySelector(
+      '[data-testid="onboarding-setup-next"]',
+    );
+    assert.ok(button, "onboarding-setup-next button must be present");
+    assert.ok(
+      button.disabled,
+      "Next button must be disabled after forced probe rejects, even with cached data",
+    );
+
+    const errorEl = container.querySelector(
+      '[data-testid="onboarding-setup-error"]',
+    );
+    assert.ok(
+      errorEl,
+      "the forced rejection error must be rendered after the probe rejects",
+    );
+    assert.match(
+      errorEl.textContent ?? "",
+      /forced probe rejected/,
+      "rendered error must surface the forced rejection message",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+});
+
+describe("SetupStep cached-ready revalidation — P4 regression (mounted consumer)", () => {
+  it("cached READY is replaced by a CHECKING indicator while a warm forced probe is pending", async () => {
+    const queryClient = makeQueryClient();
+    queryClient.setQueryData(acpRuntimesQueryKey, [
+      catalogEntry("codex", "logged_in"),
+    ]);
+
+    const pending = deferred();
+    discoverHandler = (args) =>
+      args?.force === true ? pending.promise : Promise.resolve([]);
+
+    const { container, root } = renderSetupStep();
+    await act(async () => {
+      root.render(setupStepTree(queryClient));
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+
+    assert.ok(
+      container.querySelector(
+        '[data-testid="onboarding-runtime-rechecking-codex"]',
+      ),
+      "a pending warm recheck over a cached-ready runtime must show CHECKING…",
+    );
+    assert.equal(
+      container.querySelector('[data-testid="onboarding-runtime-ready-codex"]'),
+      null,
+      "cached READY must not be presented as current while the recheck is in flight",
+    );
+
+    // Success restores READY.
+    await act(async () => {
+      pending.resolve([rawReadyEntry("codex")]);
+      await new Promise((r) => setTimeout(r, 50));
+    });
+    assert.ok(
+      container.querySelector('[data-testid="onboarding-runtime-ready-codex"]'),
+      "READY returns once the warm recheck succeeds",
+    );
+    assert.equal(
+      container.querySelector(
+        '[data-testid="onboarding-runtime-rechecking-codex"]',
+      ),
+      null,
+      "the CHECKING indicator clears on success",
+    );
+    const button = container.querySelector(
+      '[data-testid="onboarding-setup-next"]',
+    );
+    assert.ok(button && !button.disabled, "Next is enabled after success");
+
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+
+  it("cached READY is replaced by a recheck affordance after a warm forced probe rejects", async () => {
+    const queryClient = makeQueryClient();
+    queryClient.setQueryData(acpRuntimesQueryKey, [
+      catalogEntry("codex", "logged_in"),
+    ]);
+
+    discoverHandler = (args) =>
+      args?.force === true
+        ? Promise.reject(new Error("warm recheck failed"))
+        : Promise.resolve([]);
+
+    const { container, root } = renderSetupStep();
+    await act(async () => {
+      root.render(setupStepTree(queryClient));
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+
+    assert.ok(
+      container.querySelector(
+        '[data-testid="onboarding-runtime-recheck-codex"]',
+      ),
+      "a warm rejection over a cached-ready runtime must offer a recheck, not claim READY",
+    );
+    assert.equal(
+      container.querySelector('[data-testid="onboarding-runtime-ready-codex"]'),
+      null,
+      "cached READY must not be presented as current after the recheck rejects",
+    );
+    assert.ok(
+      container.querySelector('[data-testid="onboarding-setup-error"]'),
+      "the warm rejection error stays visible alongside the retained card",
+    );
+    const button = container.querySelector(
+      '[data-testid="onboarding-setup-next"]',
+    );
+    assert.ok(
+      button && button.disabled,
+      "Next stays gated while readiness is unconfirmed",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+});
diff --git a/desktop/src/features/onboarding/ui/SetupStep.tsx b/desktop/src/features/onboarding/ui/SetupStep.tsx
index 2a3476b2ea..aac9b53846 100644
--- a/desktop/src/features/onboarding/ui/SetupStep.tsx
+++ b/desktop/src/features/onboarding/ui/SetupStep.tsx
@@ -4,7 +4,7 @@ import { Check, Info } from "lucide-react";
 
 import {
   useAcpAuthMethodsQuery,
-  useAcpRuntimesQuery,
+  useAcpRuntimesQueryForced,
   useConnectAcpRuntimeMutation,
   useInstallAcpRuntimeMutation,
 } from "@/features/agents/hooks";
@@ -51,9 +51,9 @@ type InstallResultState = {
 type InstallResultsState = Record<string, InstallResultState>;
 
 function useSetupStepState(): SetupStepState {
-  const runtimesQuery = useAcpRuntimesQuery();
+  const runtimesQuery = useAcpRuntimesQueryForced();
   const items = runtimesQuery.data ?? [];
-  const isChecking = runtimesQuery.isLoading;
+  const isChecking = runtimesQuery.isFetching;
   const errorMessage =
     runtimesQuery.error instanceof Error ? runtimesQuery.error.message : null;
 
@@ -109,7 +109,11 @@ function RuntimeStatus({
       runtime.authStatus.status === "logged_out",
   });
   const connectMutation = useConnectAcpRuntimeMutation();
-  const runtimesQuery = useAcpRuntimesQuery();
+  // Child rows share the surface owner's forced query state + refresh callback
+  // (`useSetupStepState` owns the single force-on-mount). Each row must not
+  // mount its own force effect, or onboarding entry re-runs discovery once per
+  // row instead of once for the surface.
+  const runtimesQuery = useAcpRuntimesQueryForced({ forceOnMount: false });
   const [isWaitingForSignIn, setIsWaitingForSignIn] = React.useState(false);
   const [didSignInCheckTimeOut, setDidSignInCheckTimeOut] =
     React.useState(false);
@@ -125,7 +129,7 @@ function RuntimeStatus({
     if (!isWaitingForSignIn) return;
 
     const interval = window.setInterval(() => {
-      void runtimesQuery.refetch();
+      void runtimesQuery.forceRefresh();
     }, 2_000);
     const timeout = window.setTimeout(() => {
       setIsWaitingForSignIn(false);
@@ -136,7 +140,7 @@ function RuntimeStatus({
       window.clearInterval(interval);
       window.clearTimeout(timeout);
     };
-  }, [isWaitingForSignIn, runtimesQuery.refetch]);
+  }, [isWaitingForSignIn, runtimesQuery.forceRefresh]);
   const authMethods = getOnboardingAuthMethods(
     runtime,
     methodsQuery.data?.methods ?? [],
@@ -157,7 +161,7 @@ function RuntimeStatus({
             if (didSignInCheckTimeOut) {
               setDidSignInCheckTimeOut(false);
               setIsWaitingForSignIn(true);
-              void runtimesQuery.refetch();
+              void runtimesQuery.forceRefresh();
               return;
             }
             if (!authMethod) {
@@ -215,6 +219,40 @@ function RuntimeStatus({
   }
 
   if (runtimeIsReadyForOnboarding(runtime)) {
+    // Cached readiness must not read as freshly confirmed while a warm forced
+    // probe is revalidating (or has rejected) over it. `runtimesQuery` shares
+    // the surface owner's forced-query state, so its fetching/error flags track
+    // the in-flight recheck. Pending → a visible CHECKING… state; a warm
+    // rejection → a recheck affordance (never an unqualified READY). On success
+    // both clear and READY returns. Next stays gated by isChecking/errorMessage
+    // in SetupStepContent, so this only governs the per-card claim.
+    if (runtimesQuery.isFetching) {
+      return (
+        <div
+          aria-label={`Rechecking ${runtime.label}`}
+          className="flex h-5 items-center gap-2 rounded-full bg-[#EBEFEF] px-2.5 font-mono text-badge font-normal uppercase text-foreground"
+          data-testid={`onboarding-runtime-rechecking-${runtime.id}`}
+          role="status"
+        >
+          <Spinner className="h-3 w-3 border-2 text-foreground" />
+          CHECKING…
+        </div>
+      );
+    }
+    if (runtimesQuery.isError) {
+      return (
+        <Button
+          aria-label={`Check ${runtime.label} again`}
+          className="buzz-onboarding-runtime-setup h-5 rounded-full bg-[var(--buzz-welcome-chartreuse)]/30 px-2.5 font-mono !text-badge font-normal uppercase text-foreground hover:bg-[var(--buzz-welcome-chartreuse)]/40"
+          data-testid={`onboarding-runtime-recheck-${runtime.id}`}
+          onClick={() => void runtimesQuery.forceRefresh()}
+          type="button"
+          variant="ghost"
+        >
+          CHECK AGAIN
+        </Button>
+      );
+    }
     return (
       <Tooltip>
         <TooltipTrigger asChild>
@@ -244,7 +282,7 @@ function RuntimeStatus({
         aria-label={`Check ${runtime.label} again`}
         className="buzz-onboarding-runtime-setup h-5 rounded-full bg-[var(--buzz-welcome-chartreuse)]/30 px-2.5 font-mono !text-badge font-normal uppercase text-foreground hover:bg-[var(--buzz-welcome-chartreuse)]/40"
         disabled={runtimesQuery.isFetching}
-        onClick={() => void runtimesQuery.refetch()}
+        onClick={() => void runtimesQuery.forceRefresh()}
         type="button"
         variant="ghost"
       >
@@ -653,7 +691,10 @@ function RuntimeProvidersSection({
         )}
 
         {errorMessage ? (
-          <p className="max-w-[560px] rounded-2xl bg-destructive/10 px-6 py-3 text-sm text-destructive">
+          <p
+            className="max-w-[560px] rounded-2xl bg-destructive/10 px-6 py-3 text-sm text-destructive"
+            data-testid="onboarding-setup-error"
+          >
             {errorMessage}
           </p>
         ) : null}
@@ -724,7 +765,11 @@ function SetupStepContent({
         <Button
           className={`${ONBOARDING_PRIMARY_CTA_CLASS} text-sm`}
           data-testid="onboarding-setup-next"
-          disabled={readyRuntimeIds.length === 0}
+          disabled={
+            readyRuntimeIds.length === 0 ||
+            runtimeProviders.isChecking ||
+            !!runtimeProviders.errorMessage
+          }
           onClick={() => actions.next(readyRuntimeIds)}
           type="button"
         >
diff --git a/desktop/src/features/onboarding/welcomeGuide.ts b/desktop/src/features/onboarding/welcomeGuide.ts
index 29d966fa94..a6057025f2 100644
--- a/desktop/src/features/onboarding/welcomeGuide.ts
+++ b/desktop/src/features/onboarding/welcomeGuide.ts
@@ -5,11 +5,11 @@ import {
 import {
   addChannelMembers,
   createManagedAgent,
-  discoverAcpRuntimes,
   getChannelMembers,
   listManagedAgents,
   updateManagedAgent,
 } from "@/shared/api/tauri";
+import { discoverAcpRuntimes } from "@/shared/api/tauriAcpDiscovery";
 import { getAgentAccessOwnerOnly } from "@/shared/api/tauriAgentAccess";
 import { getGlobalAgentConfig } from "@/shared/api/tauriGlobalAgentConfig";
 import { listPersonas, setPersonaActive } from "@/shared/api/tauriPersonas";
diff --git a/desktop/src/features/settings/ui/HarnessCatalogDialog.acpForcedGate.test.mjs b/desktop/src/features/settings/ui/HarnessCatalogDialog.acpForcedGate.test.mjs
new file mode 100644
index 0000000000..fdbddaa628
--- /dev/null
+++ b/desktop/src/features/settings/ui/HarnessCatalogDialog.acpForcedGate.test.mjs
@@ -0,0 +1,646 @@
+/**
+ * Mounted consumer regressions for HarnessCatalogDialog forced-probe states.
+ *
+ * P2: isColdError (isError && data===undefined) drives the error branch;
+ * isRefreshing (isFetching && !isLoading) drives the refresh-indicator branch.
+ * Both elements carry data-testid selectors that distinguish them from the
+ * generic "No runtimes match" fallback.
+ *
+ * Mutation proof: revert only the HarnessCatalogDialog.tsx hunk and both
+ * tests go RED — cold rejection shows "No runtimes match" instead of the
+ * error element; cached + pending shows no refresh indicator.
+ */
+
+import assert from "node:assert/strict";
+import { after, afterEach, before, describe, it } from "node:test";
+import { JSDOM } from "jsdom";
+
+const dom = new JSDOM("<!doctype html><html><body></body></html>", {
+  url: "http://localhost",
+});
+
+Object.assign(globalThis, {
+  HTMLElement: dom.window.HTMLElement,
+  HTMLIFrameElement: dom.window.HTMLIFrameElement,
+  IS_REACT_ACT_ENVIRONMENT: true,
+  MutationObserver: dom.window.MutationObserver,
+  ResizeObserver: class {
+    observe() {}
+    unobserve() {}
+    disconnect() {}
+  },
+  document: dom.window.document,
+  localStorage: dom.window.localStorage,
+  self: dom.window,
+  window: dom.window,
+});
+Object.defineProperty(globalThis, "navigator", {
+  configurable: true,
+  value: dom.window.navigator,
+});
+dom.window.requestAnimationFrame = (callback) => setTimeout(callback, 0);
+globalThis.requestAnimationFrame = dom.window.requestAnimationFrame;
+dom.window.ResizeObserver = globalThis.ResizeObserver;
+dom.window.matchMedia ??= (query) => ({
+  matches: false,
+  media: query,
+  onchange: null,
+  addListener: () => {},
+  removeListener: () => {},
+  addEventListener: () => {},
+  removeEventListener: () => {},
+  dispatchEvent: () => false,
+});
+globalThis.matchMedia = dom.window.matchMedia;
+// Copy all DOM-level globals from JSDOM that Radix Dialog's focus/dismiss
+// machinery references without a window. prefix (HTMLInputElement, NodeFilter,
+// getComputedStyle, etc.). Doing this in bulk avoids whack-a-mole per missing
+// global as new Radix internals are encountered.
+for (const key of Object.getOwnPropertyNames(dom.window)) {
+  if (
+    !(key in globalThis) &&
+    (key.startsWith("HTML") ||
+      key.startsWith("SVG") ||
+      key.startsWith("CSS") ||
+      [
+        "Node",
+        "NodeFilter",
+        "NodeList",
+        "NamedNodeMap",
+        "Event",
+        "CustomEvent",
+        "MouseEvent",
+        "KeyboardEvent",
+        "FocusEvent",
+        "InputEvent",
+        "PointerEvent",
+        "TouchEvent",
+        "WheelEvent",
+        "EventTarget",
+        "Text",
+        "Comment",
+        "DocumentFragment",
+        "Range",
+        "Selection",
+        "getComputedStyle",
+        "IntersectionObserver",
+        "ResizeObserver",
+      ].includes(key))
+  ) {
+    const val = dom.window[key];
+    if (val !== undefined) globalThis[key] = val;
+  }
+}
+// getComputedStyle must be bound to dom.window or it throws "Illegal invocation".
+globalThis.getComputedStyle = dom.window.getComputedStyle.bind(dom.window);
+
+// Radix DismissableLayer and FocusScope dispatch plain objects via dispatchEvent
+// for layer-coordination events. JSDOM's strict Event type validation throws on
+// these; silently drop non-Event objects so the Dialog renders its content
+// without throwing from effects. This does not affect real Event delivery.
+const _origDispatch = dom.window.EventTarget.prototype.dispatchEvent;
+dom.window.EventTarget.prototype.dispatchEvent = function (event) {
+  if (!(event instanceof dom.window.Event)) return false;
+  return _origDispatch.call(this, event);
+};
+globalThis.EventTarget = dom.window.EventTarget;
+
+// ── Tauri IPC stub ────────────────────────────────────────────────────────────
+
+let discoverHandler = () => Promise.resolve([]);
+
+globalThis.__TAURI_INTERNALS__ = {
+  invoke: (command, args) => {
+    if (command === "discover_acp_providers") return discoverHandler(args);
+    return Promise.reject(new Error(`unmocked: ${command}`));
+  },
+  transformCallback: () => 1,
+};
+dom.window.__TAURI_INTERNALS__ = globalThis.__TAURI_INTERNALS__;
+
+// ── Deferred imports ──────────────────────────────────────────────────────────
+
+let React,
+  act,
+  createRoot,
+  QueryClient,
+  QueryClientProvider,
+  HarnessCatalogDialog,
+  useAcpRuntimesQueryForced,
+  acpRuntimesQueryKey,
+  ThemeProvider,
+  TooltipProvider;
+
+before(async () => {
+  ({ default: React, act } = await import("react"));
+  ({ createRoot } = await import("react-dom/client"));
+  ({ QueryClient, QueryClientProvider } = await import(
+    "@tanstack/react-query"
+  ));
+  ({ HarnessCatalogDialog } = await import("./HarnessCatalogDialog.tsx"));
+  ({ useAcpRuntimesQueryForced, acpRuntimesQueryKey } = await import(
+    "@/features/agents/acpRuntimesQuery.ts"
+  ));
+  ({ ThemeProvider } = await import("@/shared/theme/ThemeProvider.tsx"));
+  ({ TooltipProvider } = await import("@/shared/ui/tooltip.tsx"));
+});
+
+afterEach(() => {
+  discoverHandler = () => Promise.resolve([]);
+});
+
+after(() => dom.window.close());
+
+// ── Helpers ───────────────────────────────────────────────────────────────────
+
+/** Camelcase AcpRuntimeCatalogEntry as stored in acpRuntimesQueryKey cache. */
+function catalogEntry(id, authStatusValue) {
+  return {
+    id,
+    label: id,
+    avatarUrl: "",
+    availability: "available",
+    command: id,
+    binaryPath: `/usr/bin/${id}`,
+    defaultArgs: [],
+    mcpCommand: null,
+    modelEnvVar: null,
+    providerEnvVar: null,
+    thinkingEnvVar: null,
+    maxTokensEnvVar: null,
+    contextLimitEnvVar: null,
+    maxRoundsEnvVar: null,
+    installHint: "",
+    installInstructionsUrl: "",
+    canAutoInstall: false,
+    requiresExternalCli: false,
+    underlyingCliPath: null,
+    nodeRequired: false,
+    authStatus: { status: authStatusValue },
+    loginHint: null,
+    source: "builtin",
+    definitionEnv: {},
+  };
+}
+
+/** Raw snake_case backend entry as `discoverAcpRuntimes` receives before
+ * `fromRawAcpRuntimeCatalogEntry`. Use for values returned from discoverHandler
+ * (the IPC boundary), vs. `catalogEntry` for values seeded directly into cache. */
+function rawEntry(id) {
+  return {
+    id,
+    label: id,
+    avatar_url: "",
+    availability: "available",
+    command: id,
+    binary_path: `/usr/bin/${id}`,
+    default_args: [],
+    mcp_command: null,
+    install_hint: "",
+    install_instructions_url: "",
+    can_auto_install: false,
+    requires_external_cli: false,
+    underlying_cli_path: null,
+    node_required: false,
+    auth_status: { status: "logged_in" },
+    source: "builtin",
+  };
+}
+
+function makeQueryClient() {
+  return new QueryClient({ defaultOptions: { queries: { retry: false } } });
+}
+
+function deferred() {
+  let resolve;
+  const promise = new Promise((r) => {
+    resolve = r;
+  });
+  return { promise, resolve };
+}
+
+/**
+ * Mirrors the real surface: HarnessesSettingsPanel owns the single
+ * force-on-mount (`useAcpRuntimesQueryForced()` with `forceOnMount` defaulted
+ * to true) and renders the always-mounted dialog, which consumes shared state
+ * with `forceOnMount: false`. Tests render this so the dialog reflects a real
+ * owner-driven probe rather than firing its own.
+ */
+function HarnessSurface({ open }) {
+  useAcpRuntimesQueryForced();
+  return React.createElement(HarnessCatalogDialog, {
+    open,
+    onOpenChange: () => {},
+  });
+}
+
+function renderSurface() {
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  const root = createRoot(container);
+  return { container, root };
+}
+
+/**
+ * Drive the search input the way a user would: set its value and dispatch a
+ * React-observed input event, so `filterCatalogEntries` runs against a live
+ * query. A query that matches no cached entry filters the list to zero.
+ */
+async function typeSearch(query) {
+  const input = document.body.querySelector(
+    '[data-testid="harness-catalog-search"]',
+  );
+  assert.ok(input, "search input must be present");
+  const setter = Object.getOwnPropertyDescriptor(
+    dom.window.HTMLInputElement.prototype,
+    "value",
+  ).set;
+  await act(async () => {
+    setter.call(input, query);
+    input.dispatchEvent(new dom.window.Event("input", { bubbles: true }));
+    await new Promise((r) => setTimeout(r, 0));
+  });
+}
+
+function surfaceTree(open) {
+  return React.createElement(
+    QueryClientProvider,
+    { client: queryClient },
+    React.createElement(
+      ThemeProvider,
+      null,
+      React.createElement(
+        TooltipProvider,
+        null,
+        React.createElement(HarnessSurface, { open }),
+      ),
+    ),
+  );
+}
+
+let queryClient;
+
+// ── Tests ─────────────────────────────────────────────────────────────────────
+
+describe("HarnessCatalogDialog forced-probe rendering — P2 regression (mounted consumer)", () => {
+  it("harness-catalog-load-error is rendered on cold forced probe rejection", async () => {
+    queryClient = makeQueryClient();
+    // No cache seeded — isColdError = isError && data === undefined.
+    discoverHandler = (args) =>
+      args?.force === true
+        ? Promise.reject(new Error("cold load failure"))
+        : Promise.resolve([]);
+
+    const { container, root } = renderSurface();
+
+    await act(async () => {
+      root.render(surfaceTree(true));
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+
+    // Dialog renders via Radix portal into document.body.
+    const errorEl = document.body.querySelector(
+      '[data-testid="harness-catalog-load-error"]',
+    );
+    assert.ok(
+      errorEl,
+      "harness-catalog-load-error must be rendered on cold forced probe rejection",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+
+  it("harness-catalog-refreshing is rendered while forced probe is pending over cached entries", async () => {
+    queryClient = makeQueryClient();
+    // Seed cache with a visible runtime so filtered.length > 0 and the
+    // isRefreshing branch renders (it is inside the non-empty entries block).
+    queryClient.setQueryData(acpRuntimesQueryKey, [
+      catalogEntry("codex", "logged_in"),
+    ]);
+
+    const pending = deferred();
+    discoverHandler = (args) =>
+      args?.force === true ? pending.promise : Promise.resolve([]);
+
+    const { container, root } = renderSurface();
+
+    await act(async () => {
+      root.render(surfaceTree(true));
+    });
+    // Allow the owner's mount-time forceRefresh to dispatch (but not resolve).
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+
+    const refreshingEl = document.body.querySelector(
+      '[data-testid="harness-catalog-refreshing"]',
+    );
+    assert.ok(
+      refreshingEl,
+      "harness-catalog-refreshing must be rendered while forced probe is pending over cached entries",
+    );
+
+    // Resolve inside act so React Query drains before unmount.
+    await act(async () => {
+      pending.resolve([]);
+      await new Promise((r) => setTimeout(r, 0));
+    });
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+
+  it("harness-catalog-refresh-error is rendered when a forced refresh rejects over cached entries", async () => {
+    queryClient = makeQueryClient();
+    // Cached entries present, so a rejected forced refresh is a WARM error
+    // (isError && data !== undefined): stale entries must stay listed and the
+    // failure must be visible inside the dialog.
+    queryClient.setQueryData(acpRuntimesQueryKey, [
+      catalogEntry("codex", "logged_in"),
+    ]);
+
+    discoverHandler = (args) =>
+      args?.force === true
+        ? Promise.reject(new Error("warm refresh failure"))
+        : Promise.resolve([]);
+
+    const { container, root } = renderSurface();
+
+    await act(async () => {
+      root.render(surfaceTree(true));
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+
+    const refreshErrorEl = document.body.querySelector(
+      '[data-testid="harness-catalog-refresh-error"]',
+    );
+    assert.ok(
+      refreshErrorEl,
+      "harness-catalog-refresh-error must be rendered when a forced refresh rejects over cached entries",
+    );
+    // Cached entries remain listed alongside the failure indication.
+    const cachedRow = document.body.querySelector(
+      '[data-testid="harness-catalog-list-item-codex"]',
+    );
+    assert.ok(
+      cachedRow,
+      "cached entries must stay listed when a warm refresh fails",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+
+  it("reopening the dialog after the owner's probe settles triggers zero additional forced probes", async () => {
+    queryClient = makeQueryClient();
+    let forcedProbeCount = 0;
+    discoverHandler = (args) => {
+      if (args?.force === true) forcedProbeCount += 1;
+      // Probe COUNT is the assertion here, not rendered entries. Return an
+      // empty catalog so no detail pane renders (handler results flow through
+      // fromRawAcpRuntimeCatalogEntry, which expects the raw backend shape).
+      return Promise.resolve([]);
+    };
+
+    const { container, root } = renderSurface();
+
+    // Mount the surface (owner fires its single force-on-mount) and let it
+    // settle.
+    await act(async () => {
+      root.render(surfaceTree(false));
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+    assert.equal(
+      forcedProbeCount,
+      1,
+      "owner's force-on-mount must run exactly one forced probe",
+    );
+
+    // Open, close, reopen the dialog. With forceOnMount:false the dialog must
+    // not fire its own probe on any of these transitions.
+    for (const open of [true, false, true]) {
+      await act(async () => {
+        root.render(surfaceTree(open));
+      });
+      await act(async () => {
+        await new Promise((r) => setTimeout(r, 20));
+      });
+    }
+    assert.equal(
+      forcedProbeCount,
+      1,
+      "opening/closing/reopening the dialog must trigger zero additional forced probes",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+
+  it("harness-catalog-refresh-error is rendered when a forced refresh rejects over a cached EMPTY catalog", async () => {
+    queryClient = makeQueryClient();
+    // Cached successful empty catalog (data !== undefined but zero entries), so
+    // filtered.length === 0. A rejected forced refresh is still a WARM error;
+    // the status row must render independently of whether the filter has rows,
+    // not be swallowed by the "No runtimes match" branch.
+    queryClient.setQueryData(acpRuntimesQueryKey, []);
+
+    discoverHandler = (args) =>
+      args?.force === true
+        ? Promise.reject(new Error("warm empty refresh failure"))
+        : Promise.resolve([]);
+
+    const { container, root } = renderSurface();
+
+    await act(async () => {
+      root.render(surfaceTree(true));
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+
+    assert.ok(
+      document.body.querySelector(
+        '[data-testid="harness-catalog-refresh-error"]',
+      ),
+      "warm-error status must render over a cached empty catalog, not be hidden by 'No runtimes match'",
+    );
+
+    const emptyCatalogText = document.body.querySelector(
+      '[data-testid="harness-catalog-list"]',
+    )?.textContent;
+    assert.ok(
+      emptyCatalogText?.includes("No runtimes found."),
+      "an empty catalog with no active search must show the truthful empty-catalog copy",
+    );
+    assert.ok(
+      !emptyCatalogText?.includes("No runtimes match."),
+      "the search-specific copy must not appear when no search is active",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+
+  it("harness-catalog-refresh-error stays visible when an active search filters cached rows to zero", async () => {
+    queryClient = makeQueryClient();
+    // A cached row exists, but a search query matches nothing, so
+    // filtered.length === 0 while data !== undefined. The warm-error status
+    // must still show; only the entry list is filtered away.
+    queryClient.setQueryData(acpRuntimesQueryKey, [
+      catalogEntry("codex", "logged_in"),
+    ]);
+
+    discoverHandler = (args) =>
+      args?.force === true
+        ? Promise.reject(new Error("warm filtered refresh failure"))
+        : Promise.resolve([]);
+
+    const { container, root } = renderSurface();
+
+    await act(async () => {
+      root.render(surfaceTree(true));
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+
+    await typeSearch("zzz-no-such-runtime");
+
+    assert.ok(
+      document.body.querySelector(
+        '[data-testid="harness-catalog-refresh-error"]',
+      ),
+      "warm-error status must stay visible while a search filters every cached row away",
+    );
+    assert.ok(
+      document.body
+        .querySelector('[data-testid="harness-catalog-list"]')
+        ?.textContent?.includes("No runtimes match"),
+      "the filtered-empty message and the status row coexist",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+
+  it("harness-catalog-refreshing stays visible when an active search filters cached rows to zero", async () => {
+    queryClient = makeQueryClient();
+    queryClient.setQueryData(acpRuntimesQueryKey, [
+      catalogEntry("codex", "logged_in"),
+    ]);
+
+    const pending = deferred();
+    discoverHandler = (args) =>
+      args?.force === true ? pending.promise : Promise.resolve([]);
+
+    const { container, root } = renderSurface();
+
+    await act(async () => {
+      root.render(surfaceTree(true));
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+
+    await typeSearch("zzz-no-such-runtime");
+
+    assert.ok(
+      document.body.querySelector('[data-testid="harness-catalog-refreshing"]'),
+      "refreshing spinner must stay visible while a search filters every cached row away",
+    );
+
+    await act(async () => {
+      pending.resolve([]);
+      await new Promise((r) => setTimeout(r, 0));
+    });
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+
+  it("cold-error Retry issues exactly one forced probe and renders entries on success", async () => {
+    queryClient = makeQueryClient();
+    // No cache seeded → cold error on the first forced probe. The owner's
+    // mount-time probe rejects; the dialog's cold-error Retry must run a fresh
+    // forced probe (not rely on close/reopen, which fires nothing) and, on
+    // success, render the catalog.
+    let forcedProbeCount = 0;
+    discoverHandler = (args) => {
+      if (args?.force !== true) return Promise.resolve([]);
+      forcedProbeCount += 1;
+      return forcedProbeCount === 1
+        ? Promise.reject(new Error("cold load failure"))
+        : Promise.resolve([rawEntry("codex")]);
+    };
+
+    const { container, root } = renderSurface();
+
+    await act(async () => {
+      root.render(surfaceTree(true));
+    });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 50));
+    });
+
+    const retry = document.body.querySelector(
+      '[data-testid="harness-catalog-load-retry"]',
+    );
+    assert.ok(retry, "cold-error state must render a Retry control");
+    assert.equal(
+      forcedProbeCount,
+      1,
+      "only the owner's mount probe has run before Retry",
+    );
+
+    await act(async () => {
+      retry.dispatchEvent(
+        new dom.window.MouseEvent("click", { bubbles: true }),
+      );
+      await new Promise((r) => setTimeout(r, 50));
+    });
+
+    assert.equal(
+      forcedProbeCount,
+      2,
+      "Retry must issue exactly one additional forced probe",
+    );
+    assert.ok(
+      document.body.querySelector(
+        '[data-testid="harness-catalog-list-item-codex"]',
+      ),
+      "entries must render after the Retry probe succeeds",
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+    container.remove();
+    queryClient.clear();
+  });
+});
diff --git a/desktop/src/features/settings/ui/HarnessCatalogDialog.tsx b/desktop/src/features/settings/ui/HarnessCatalogDialog.tsx
index 8511d26d57..229941ec50 100644
--- a/desktop/src/features/settings/ui/HarnessCatalogDialog.tsx
+++ b/desktop/src/features/settings/ui/HarnessCatalogDialog.tsx
@@ -3,7 +3,7 @@ import { ChevronRight, ExternalLink, Plus, Search } from "lucide-react";
 import { openUrl } from "@tauri-apps/plugin-opener";
 
 import {
-  useAcpRuntimesQuery,
+  useAcpRuntimesQueryForced,
   useInstallAcpRuntimeMutation,
 } from "@/features/agents/hooks";
 import { useInstallOutputLine } from "@/features/agents/lib/useInstallOutputLine";
@@ -62,8 +62,19 @@ export function HarnessCatalogDialog({
   open: boolean;
 }) {
   const contentRef = React.useRef<HTMLDivElement | null>(null);
-  const runtimesQuery = useAcpRuntimesQuery();
+  // The Settings panel owns this surface's force-on-mount (it renders this
+  // dialog always-mounted). Passing `forceOnMount: false` here consumes the
+  // shared catalog + `forceRefresh` without firing a second 20–65s forced
+  // probe on every open/reopen — see useAcpRuntimesQueryForced's owner/child
+  // contract.
+  const runtimesQuery = useAcpRuntimesQueryForced({
+    enabled: open,
+    forceOnMount: false,
+  });
   const isLoading = runtimesQuery.isLoading;
+  const isColdError = runtimesQuery.isError && runtimesQuery.data === undefined;
+  const isWarmError = runtimesQuery.isError && runtimesQuery.data !== undefined;
+  const isRefreshing = runtimesQuery.isFetching && !isLoading;
   const entries = React.useMemo(
     () => catalogDialogEntries(runtimesQuery.data ?? []),
     [runtimesQuery.data],
@@ -150,11 +161,57 @@ export function HarnessCatalogDialog({
               data-testid="harness-catalog-list"
             >
               <div className="space-y-1">
+                {/* Forced-refresh status over a warm cache. Hoisted above the
+                    cold/empty/filter chain so it stays visible in every
+                    non-cold state — including a cached-empty catalog and a
+                    search that filters every row away, where the branches
+                    below render only the empty-state copy. `isRefreshing` and
+                    `isWarmError` are false during cold load/error (data is
+                    undefined), so this renders nothing there. */}
+                {isRefreshing ? (
+                  <div
+                    className="flex items-center gap-1.5 px-4 py-1 text-xs text-sidebar-foreground/50"
+                    data-testid="harness-catalog-refreshing"
+                  >
+                    <Spinner className="h-2.5 w-2.5" />
+                    Refreshing…
+                  </div>
+                ) : isWarmError ? (
+                  <div
+                    className="flex items-center justify-between gap-2 px-4 py-1 text-xs text-destructive"
+                    data-testid="harness-catalog-refresh-error"
+                  >
+                    <span>Couldn't refresh runtimes.</span>
+                    <button
+                      className="shrink-0 underline underline-offset-2 hover:text-foreground"
+                      data-testid="harness-catalog-refresh-retry"
+                      onClick={() => void runtimesQuery.forceRefresh()}
+                      type="button"
+                    >
+                      Retry
+                    </button>
+                  </div>
+                ) : null}
                 {isLoading ? (
                   <CatalogListSkeleton />
+                ) : isColdError ? (
+                  <div
+                    className="flex items-center justify-between gap-2 px-4 py-2 text-sm text-sidebar-foreground/60"
+                    data-testid="harness-catalog-load-error"
+                  >
+                    <span>Couldn't load runtimes.</span>
+                    <button
+                      className="shrink-0 text-destructive underline underline-offset-2 hover:text-foreground"
+                      data-testid="harness-catalog-load-retry"
+                      onClick={() => void runtimesQuery.forceRefresh()}
+                      type="button"
+                    >
+                      Retry
+                    </button>
+                  </div>
                 ) : filtered.length === 0 ? (
                   <p className="px-4 py-2 text-sm text-sidebar-foreground/60">
-                    No runtimes match.
+                    {isSearching ? "No runtimes match." : "No runtimes found."}
                   </p>
                 ) : (
                   <>
diff --git a/desktop/src/features/settings/ui/HarnessesSettingsPanel.tsx b/desktop/src/features/settings/ui/HarnessesSettingsPanel.tsx
index e7254c5e05..2ce769e646 100644
--- a/desktop/src/features/settings/ui/HarnessesSettingsPanel.tsx
+++ b/desktop/src/features/settings/ui/HarnessesSettingsPanel.tsx
@@ -3,7 +3,7 @@ import { ExternalLink, Plus, RefreshCw } from "lucide-react";
 import { openUrl } from "@tauri-apps/plugin-opener";
 
 import {
-  useAcpRuntimesQuery,
+  useAcpRuntimesQueryForced,
   useGitBashPrerequisiteQuery,
 } from "@/features/agents/hooks";
 import type { AcpRuntimeCatalogEntry } from "@/shared/api/types";
@@ -85,7 +85,7 @@ function GitBashCard({
  *   needs multi-step setup, plus the custom-harness form.
  */
 export function HarnessesSettingsPanel() {
-  const runtimesQuery = useAcpRuntimesQuery();
+  const runtimesQuery = useAcpRuntimesQueryForced();
   const gitBashQuery = useGitBashPrerequisiteQuery();
   const [catalogOpen, setCatalogOpen] = React.useState(false);
   // Incremented each time the user clicks "Check again" so HarnessRow
@@ -119,7 +119,7 @@ export function HarnessesSettingsPanel() {
           disabled={isRefreshing}
           onClick={() => {
             setResetEpoch((e) => e + 1);
-            void runtimesQuery.refetch();
+            void runtimesQuery.forceRefresh();
             void gitBashQuery.refetch();
           }}
           size="sm"
diff --git a/desktop/src/shared/api/tauri.ts b/desktop/src/shared/api/tauri.ts
index b31b8fe977..b4f0df6fc0 100644
--- a/desktop/src/shared/api/tauri.ts
+++ b/desktop/src/shared/api/tauri.ts
@@ -863,12 +863,6 @@ export async function discoverGitBashPrerequisite(): Promise<GitBashPrerequisite
   );
 }
 
-export async function discoverAcpRuntimes(): Promise<AcpRuntimeCatalogEntry[]> {
-  return (
-    await invokeTauri<RawAcpRuntimeCatalogEntry[]>("discover_acp_providers")
-  ).map(fromRawAcpRuntimeCatalogEntry);
-}
-
 /** Input shape for creating or updating a custom harness. */
 export type HarnessDefinitionInput = {
   id: string;
diff --git a/desktop/src/shared/api/tauriAcpDiscovery.ts b/desktop/src/shared/api/tauriAcpDiscovery.ts
new file mode 100644
index 0000000000..6dd4a53dbb
--- /dev/null
+++ b/desktop/src/shared/api/tauriAcpDiscovery.ts
@@ -0,0 +1,24 @@
+import type { AcpRuntimeCatalogEntry } from "@/shared/api/types";
+import {
+  fromRawAcpRuntimeCatalogEntry,
+  invokeTauri,
+  type RawAcpRuntimeCatalogEntry,
+} from "@/shared/api/tauri";
+
+/**
+ * Discover the ACP runtime catalog.
+ *
+ * `force` defaults to `false` — the cheap backend path that serves cached
+ * availability + auth statuses with no process spawns. Pass `{ force: true }`
+ * only from surfaces that need fresh auth/version state (Settings, onboarding,
+ * post-mutation refresh); that path runs the expensive probe pipeline.
+ */
+export async function discoverAcpRuntimes(options?: {
+  force?: boolean;
+}): Promise<AcpRuntimeCatalogEntry[]> {
+  const raw = await invokeTauri<RawAcpRuntimeCatalogEntry[]>(
+    "discover_acp_providers",
+    { force: options?.force ?? false },
+  );
+  return raw.map(fromRawAcpRuntimeCatalogEntry);
+}

From c6e3fe7dfa751096d8c4083aaf15d6f6af296572 Mon Sep 17 00:00:00 2001
From: Will Pfleger <pfleger.will@gmail.com>
Date: Thu, 20 Aug 2026 19:44:21 -0400
Subject: [PATCH 05/38] feat(workflows): reply in-thread from send_message
 action (#6178)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `send_message` workflow action could only post new top-level channel
messages. This adds a `reply_in_thread` option so a `message_posted`
workflow can reply in the triggering message's thread, plus a
`trigger_is_reply` filter variable so a workflow can fire only on
top-level messages.

Every NIP-10 thread-marker reader in the tree now routes through one
shared parser and one collapse rule in `buzz-core`, deleting four
hand-rolled copies that had drifted on id-validity and marker semantics.

## What changed

- **Schema** (`crates/buzz-workflow/src/schema.rs`): new
`reply_in_thread: bool` (serde default `false`) on
`ActionDef::SendMessage`. `validate()` rejects `reply_in_thread: true`
on `schedule`/`webhook` triggers — they carry no message to reply to.
- **Executor** (`crates/buzz-workflow/src/executor.rs`): threads
`reply_to: Option<&str>` (the trigger `message_id`) through
`ActionSink::send_message` when `reply_in_thread` is set; errors clearly
if the trigger has no `message_id`. `resolve_step_templates` carries the
new field. Adds `trigger_is_reply` (boolean) to the eval context.
- **Relay sink** (`crates/buzz-relay/src/workflow_sink.rs`): when
`reply_to` is set, resolves parent/root/depth from the known trigger
event, persists real thread metadata instead of the hardcoded top-level
`depth: 0`, and pushes the live kind:39005 thread-summary overlay after
insert so subscribed desktops update the root's reply badge without
refetching — matching the human ingest path. Emits the same NIP-10
`e`-tag shape as `buzz_sdk::builders::thread_tags`: a single `["e", id,
"", "reply"]` tag for a direct reply (parent == root), and the `root` +
`reply` pair only when nested — so every writer produces one wire shape
per reply kind.
- **Ingest resolver** (`crates/buzz-relay/src/handlers/ingest.rs`): new
`resolve_relay_reply_thread_meta` + `ReplyAncestry`. Unlike the
client-facing `resolve_nip10_thread_meta` (which validates
client-supplied tags), this computes root/depth from the known parent
and enforces the same same-channel and depth-limit invariants. When the
parent has no `thread_metadata` row, both resolvers share
`derive_ancestry_from_parent_tags`, which applies
`ThreadMarkers::resolve()`: a marked nested parent remains depth 2,
while a root-only, malformed, or unmarked parent is top-level and starts
its reply thread at itself. Both the client resolver and the
parent-ancestor fallback now read markers via the shared parser instead
of hand-scanning `e`-tags.
- **Shared NIP-10 parser** (`crates/buzz-core/src/nip10.rs`):
`parse_thread_markers` reads an event's `root`/`reply` markers, honoring
a marker only when its event id is exactly 64 ASCII-hex characters.
`ThreadMarkers::resolve()` is the single definition of the (root, reply)
→ (root_id, parent_id) collapse: `root`+`reply` as-is, `reply`-only →
`(reply, reply)`, a lone `root` or neither → top-level. A slice-based
`parse_thread_markers_from_parts` entry point serves consumers holding
raw JSON tag arrays. Relay ingest, the workflow `trigger_is_reply`
predicate, ACP anchoring, and the CLI reply resolver all call these, so
they cannot drift on marker, id-validity, or collapse semantics.
- **ACP** (`crates/buzz-acp/src/queue.rs`): `parse_thread_tags`
delegates marker parsing and collapse to `buzz_core::nip10`, keeping
only its local `p`-tag mention collection. This fixes a parity gap with
ingest: a malformed non-64-hex marker id is no longer counted as a
thread link, and a lone `root` marker is now top-level rather than being
treated as root == parent.
- **CLI** (`crates/buzz-cli/src/commands/messages.rs`):
`find_root_from_tags` routes its JSON tags through the shared slice
parser and collapse rule. CLI replies to root-only, malformed, or
unmarked parents now correctly start at that immediate parent;
reply-only and root+reply parent ancestry remain intact.
- **Trigger context** (`crates/buzz-workflow/src/lib.rs`):
`build_trigger_context` derives `is_reply` solely from a valid NIP-10
`reply` marker (no DB hit). A lone `root` marker is top-level to ingest,
so it does not count; neither does a `reply` marker whose event id is
malformed, nor a bare/unmarked `e`-tag (mentions, quotes).
- **Desktop** (`workflowFormTypes.ts`, `WorkflowStepCard.tsx`):
`replyInThread` form field with YAML round-trip, and a "Reply to
triggering message in thread" checkbox shown only for message-based
triggers. Switching to `schedule` or `webhook` clears the option on
every step before serialization, so a value hidden behind an action
change cannot resurrect when the action is switched back. The form
parser also requires `reply_in_thread` to be a boolean and refuses
`reply_in_thread: true` under an ineligible trigger, falling back to
YAML mode rather than silently normalizing a backend-invalid definition.

## Usage

```yaml
trigger:
  on: message_posted
  filter: trigger_is_reply == false
steps:
  - id: auto_reply
    action: send_message
    text: "pre-written reply text"
    reply_in_thread: true
```

---------

Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
Co-authored-by: Duncan <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz>
---
 crates/buzz-acp/src/queue.rs                  | 127 ++---
 crates/buzz-cli/src/commands/messages.rs      | 104 +++--
 crates/buzz-core/src/lib.rs                   |   2 +
 crates/buzz-core/src/nip10.rs                 | 197 ++++++++
 crates/buzz-relay/src/handlers/ingest.rs      | 249 +++++++---
 crates/buzz-relay/src/workflow_sink.rs        | 439 +++++++++++++++++-
 crates/buzz-test-client/tests/e2e_relay.rs    | 106 +++++
 crates/buzz-workflow/src/action_sink.rs       |   4 +
 crates/buzz-workflow/src/executor.rs          | 101 +++-
 crates/buzz-workflow/src/lib.rs               | 152 ++++++
 crates/buzz-workflow/src/schema.rs            | 105 +++++
 .../workflows/ui/WorkflowFormBuilder.tsx      |  19 +-
 .../workflows/ui/WorkflowStepCard.tsx         |  17 +
 .../workflows/ui/workflowFormTypes.test.mjs   | 119 +++++
 .../workflows/ui/workflowFormTypes.ts         |  47 +-
 15 files changed, 1606 insertions(+), 182 deletions(-)
 create mode 100644 crates/buzz-core/src/nip10.rs

diff --git a/crates/buzz-acp/src/queue.rs b/crates/buzz-acp/src/queue.rs
index b0f0fa248e..b50f926d8b 100644
--- a/crates/buzz-acp/src/queue.rs
+++ b/crates/buzz-acp/src/queue.rs
@@ -875,48 +875,31 @@ pub struct ThreadTags {
 
 /// Parse NIP-10 thread tags from a Nostr event.
 ///
-/// Detection logic (per research doc §4c):
-/// - Find an `e` tag with `root` marker → its value is `root_event_id`
-/// - Find an `e` tag with `reply` marker → its value is `parent_event_id`
-/// - If only `reply` marker found (direct reply to root), root == parent
-/// - `p` tags → mentioned pubkeys
+/// Marker parsing and the (root, reply) → (root, parent) collapse are delegated
+/// to [`buzz_core::nip10`] so ACP anchoring reads ancestry exactly as relay
+/// ingest does. Only `p`-tag mention collection is local to ACP.
 ///
-/// NOTE: Only handles NIP-10 marker-based format (preferred). The deprecated
-/// positional format (no markers, `["e", id, relay_url]`) is not supported —
-/// Buzz always generates marker-based tags (see relay messages.rs:762-783).
+/// Consequences of sharing the resolver:
+/// - A malformed (non-64-hex) marker id is ignored, never a thread link —
+///   restoring parity with ingest (ACP previously counted it).
+/// - A lone `root` marker (no `reply`) is top-level, not a reply — again
+///   matching ingest.
 pub fn parse_thread_tags(event: &Event) -> ThreadTags {
-    let mut root = None;
-    let mut reply = None;
-    let mut mentions = Vec::new();
-
-    for tag in event.tags.iter() {
-        let parts = tag.as_slice();
-        match parts.first().map(|s| s.as_str()) {
-            Some("e") if parts.len() >= 4 => {
-                let id = &parts[1];
-                let marker = &parts[3];
-                match marker.as_str() {
-                    "root" => root = Some(id.clone()),
-                    "reply" => reply = Some(id.clone()),
-                    _ => {}
-                }
-            }
-            Some("p") if parts.len() >= 2 => {
-                mentions.push(parts[1].clone());
-            }
-            _ => {}
-        }
-    }
-
-    // For direct replies to root: single "reply" tag, no "root" tag.
-    // In that case, root == parent.
-    let (root_event_id, parent_event_id) = match (root, reply) {
-        (Some(r), Some(p)) => (Some(r), Some(p)),
-        (Some(r), None) => (Some(r.clone()), Some(r)),
-        (None, Some(p)) => (Some(p.clone()), Some(p)),
-        (None, None) => (None, None),
+    let markers = buzz_core::nip10::parse_thread_markers(&event.tags);
+    let (root_event_id, parent_event_id) = match markers.resolve() {
+        Some((root, parent)) => (Some(root), Some(parent)),
+        None => (None, None),
     };
 
+    let mentions = event
+        .tags
+        .iter()
+        .filter_map(|tag| {
+            let parts = tag.as_slice();
+            (parts.len() >= 2 && parts[0] == "p").then(|| parts[1].clone())
+        })
+        .collect();
+
     ThreadTags {
         root_event_id,
         parent_event_id,
@@ -3192,28 +3175,31 @@ mod tests {
     #[test]
     fn test_parse_thread_tags_direct_reply() {
         // Direct reply to root: single "reply" tag.
+        let root = "a".repeat(64);
         let event = make_event_with_tags(
             "reply to root",
-            vec![vec!["e".into(), "abc123".into(), "".into(), "reply".into()]],
+            vec![vec!["e".into(), root.clone(), "".into(), "reply".into()]],
         );
         let tags = parse_thread_tags(&event);
-        assert_eq!(tags.root_event_id.as_deref(), Some("abc123"));
-        assert_eq!(tags.parent_event_id.as_deref(), Some("abc123"));
+        assert_eq!(tags.root_event_id.as_deref(), Some(root.as_str()));
+        assert_eq!(tags.parent_event_id.as_deref(), Some(root.as_str()));
     }
 
     #[test]
     fn test_parse_thread_tags_nested_reply() {
         // Nested reply: root + reply tags.
+        let root = "a".repeat(64);
+        let parent = "b".repeat(64);
         let event = make_event_with_tags(
             "nested reply",
             vec![
-                vec!["e".into(), "root123".into(), "".into(), "root".into()],
-                vec!["e".into(), "parent456".into(), "".into(), "reply".into()],
+                vec!["e".into(), root.clone(), "".into(), "root".into()],
+                vec!["e".into(), parent.clone(), "".into(), "reply".into()],
             ],
         );
         let tags = parse_thread_tags(&event);
-        assert_eq!(tags.root_event_id.as_deref(), Some("root123"));
-        assert_eq!(tags.parent_event_id.as_deref(), Some("parent456"));
+        assert_eq!(tags.root_event_id.as_deref(), Some(root.as_str()));
+        assert_eq!(tags.parent_event_id.as_deref(), Some(parent.as_str()));
     }
 
     #[test]
@@ -3231,15 +3217,36 @@ mod tests {
     }
 
     #[test]
-    fn test_parse_thread_tags_root_only() {
-        // Only root marker, no reply marker — root == parent.
+    fn test_parse_thread_tags_root_only_is_top_level() {
+        // Only a `root` marker, no `reply` — top-level, matching ingest. A lone
+        // `root` tag does not anchor a reply (behavior change from the old
+        // hand-rolled parser, which treated root == parent here).
+        let root = "a".repeat(64);
         let event = make_event_with_tags(
-            "reply",
-            vec![vec!["e".into(), "root123".into(), "".into(), "root".into()]],
+            "root only",
+            vec![vec!["e".into(), root, "".into(), "root".into()]],
         );
         let tags = parse_thread_tags(&event);
-        assert_eq!(tags.root_event_id.as_deref(), Some("root123"));
-        assert_eq!(tags.parent_event_id.as_deref(), Some("root123"));
+        assert!(tags.root_event_id.is_none());
+        assert!(tags.parent_event_id.is_none());
+    }
+
+    #[test]
+    fn test_parse_thread_tags_malformed_id_is_not_a_thread_link() {
+        // A non-64-hex marker id is ignored — parity with relay ingest, which
+        // never treats a malformed id as a thread link.
+        let event = make_event_with_tags(
+            "malformed marker",
+            vec![vec![
+                "e".into(),
+                "garbage".into(),
+                "".into(),
+                "reply".into(),
+            ]],
+        );
+        let tags = parse_thread_tags(&event);
+        assert!(tags.root_event_id.is_none());
+        assert!(tags.parent_event_id.is_none());
     }
 
     #[test]
@@ -3312,7 +3319,7 @@ mod tests {
             "yes go ahead",
             vec![vec![
                 "e".into(),
-                "root123".into(),
+                "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".into(),
                 "".into(),
                 "reply".into(),
             ]],
@@ -3330,7 +3337,9 @@ mod tests {
 
         let prompt = format_prompt(&batch, &FormatPromptArgs::default()).join("\n\n");
         assert!(prompt.contains("Scope: thread"));
-        assert!(prompt.contains("Thread root: root123"));
+        assert!(prompt.contains(
+            "Thread root: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        ));
     }
 
     #[test]
@@ -3340,7 +3349,7 @@ mod tests {
             "yes go ahead",
             vec![vec![
                 "e".into(),
-                "root123".into(),
+                "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".into(),
                 "".into(),
                 "reply".into(),
             ]],
@@ -3645,7 +3654,7 @@ mod tests {
             "sounds good, do it",
             vec![vec![
                 "e".into(),
-                "root123".into(),
+                "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".into(),
                 "".into(),
                 "reply".into(),
             ]],
@@ -3698,7 +3707,9 @@ mod tests {
         );
         // Thread structural info should be present.
         assert!(
-            prompt.contains("Thread root: root123"),
+            prompt.contains(
+                "Thread root: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+            ),
             "DM reply should include thread root"
         );
         // Thread context should be included.
@@ -3712,7 +3723,7 @@ mod tests {
             "follow up",
             vec![vec![
                 "e".into(),
-                "root123".into(),
+                "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".into(),
                 "".into(),
                 "reply".into(),
             ]],
@@ -5310,7 +5321,7 @@ mod tests {
             "reply in thread",
             vec![vec![
                 "e".into(),
-                "root123".into(),
+                "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".into(),
                 "".into(),
                 "reply".into(),
             ]],
diff --git a/crates/buzz-cli/src/commands/messages.rs b/crates/buzz-cli/src/commands/messages.rs
index 5651c0b4c7..ea273336e3 100644
--- a/crates/buzz-cli/src/commands/messages.rs
+++ b/crates/buzz-cli/src/commands/messages.rs
@@ -14,36 +14,45 @@ use buzz_sdk::mentions::{
 
 /// Extract the thread root event ID from a Nostr tag array.
 ///
-/// Parses `"e"` tags with NIP-10 markers:
-/// - If a `"root"` marker exists, returns that event ID.
-/// - Otherwise, if only a `"reply"` marker exists, returns the reply target
-///   (a direct reply's parent IS the root, and nested replies need that root
-///   to thread correctly).
-/// - If no thread markers exist, returns `None` (parent is a top-level message,
-///   so it is itself the root).
+/// Delegates marker parsing and collapse to [`buzz_core::nip10`] (shared with
+/// relay ingest and ACP) so id-validity, marker selection, and top-level
+/// classification cannot drift:
+/// - A `root`+`reply` parent returns its root event ID.
+/// - A `reply`-only parent returns the reply target (a direct reply's parent IS
+///   the root).
+/// - A root-only or marker-less parent returns `None` (it is top-level and its
+///   own root).
 fn find_root_from_tags(tags: &serde_json::Value) -> Option<String> {
-    fn valid_event_id(s: &str) -> bool {
-        s.len() == 64 && s.chars().all(|c| c.is_ascii_hexdigit())
-    }
-    let arr = tags.as_array()?;
-    let mut root = None;
-    let mut reply = None;
-    for tag in arr {
-        let Some(parts) = tag.as_array() else {
-            continue;
-        };
-        if parts.len() >= 4 && parts[0].as_str() == Some("e") {
-            // Defensively ignore malformed marker values so a bad tag on the
-            // parent event can't block the reply — fall back to root == parent.
-            let id = parts[1].as_str().filter(|s| valid_event_id(s));
-            match (parts[3].as_str(), id) {
-                (Some("root"), Some(id)) => root = Some(id.to_string()),
-                (Some("reply"), Some(id)) => reply = Some(id.to_string()),
-                _ => {}
-            }
-        }
-    }
-    root.or(reply)
+    let parts: Vec<Vec<String>> = tags
+        .as_array()?
+        .iter()
+        .filter_map(|tag| {
+            tag.as_array().map(|a| {
+                a.iter()
+                    .map(|v| v.as_str().unwrap_or("").to_string())
+                    .collect()
+            })
+        })
+        .collect();
+    buzz_core::nip10::parse_thread_markers_from_parts(parts.iter().map(Vec::as_slice))
+        .resolve()
+        .map(|(root, _)| root)
+}
+
+fn thread_ref_from_parent_tags(
+    parent_eid: nostr::EventId,
+    parent_event_id: &str,
+    tags: &serde_json::Value,
+) -> Result<ThreadRef, CliError> {
+    let root_eid = match find_root_from_tags(tags) {
+        Some(root_hex) if root_hex != parent_event_id => parse_event_id(&root_hex)?,
+        _ => parent_eid,
+    };
+
+    Ok(ThreadRef {
+        root_event_id: root_eid,
+        parent_event_id: parent_eid,
+    })
 }
 
 /// Build a `ThreadRef` for a reply, given the immediate parent's event ID.
@@ -80,14 +89,7 @@ fn thread_ref_from_event(event_id: &str, event: &serde_json::Value) -> Result<Th
         .get("tags")
         .cloned()
         .unwrap_or(serde_json::Value::Null);
-    let root_event_id = match find_root_from_tags(&tags) {
-        Some(root_hex) if root_hex != event_id => parse_event_id(&root_hex)?,
-        _ => parent_eid,
-    };
-    Ok(ThreadRef {
-        root_event_id,
-        parent_event_id: parent_eid,
-    })
+    thread_ref_from_parent_tags(parent_eid, event_id, &tags)
 }
 
 /// Resolve the channel UUID for an event by querying for it via POST /query.
@@ -1057,7 +1059,8 @@ mod tests {
         channel_id_from_event, cmd_get_thread, event_mention_pubkeys, find_root_from_tags,
         match_profiles_by_name, merge_message_mentions, missing_members,
         normalize_explicit_mentions, parse_member_pubkeys, resolve_names_to_pubkeys,
-        resolve_thread_target, thread_ref_from_event, BuzzClient, CliError, Uuid,
+        resolve_thread_target, thread_ref_from_event, thread_ref_from_parent_tags, BuzzClient,
+        CliError, Uuid,
     };
     use buzz_sdk::mentions::{
         extract_at_mentions_with_known, extract_at_names, match_names_to_profiles, MentionProfile,
@@ -1132,7 +1135,7 @@ mod tests {
         let channel = "123e4567-e89b-12d3-a456-426614174000";
         let other_channel = "123e4567-e89b-12d3-a456-426614174001";
         let selected = json!({
-            "tags": [["h", channel], ["e", ID_A, "", "root"]]
+            "tags": [["h", channel], ["e", ID_A, "", "root"], ["e", ID_B, "", "reply"]]
         });
 
         assert!(resolve_thread_target(
@@ -1171,6 +1174,23 @@ mod tests {
         assert_eq!(find_root_from_tags(&tags).as_deref(), Some(ID_A));
     }
 
+    #[test]
+    fn root_marker_without_reply_is_top_level() {
+        let tags = json!([["e", ID_A, "", "root"], ["p", PUBKEY],]);
+        assert!(find_root_from_tags(&tags).is_none());
+    }
+
+    #[test]
+    fn root_only_parent_starts_cli_reply_thread_at_parent() {
+        let tags = json!([["e", ID_A, "", "root"]]);
+        let parent = nostr::EventId::from_hex(ID_B).expect("valid parent id");
+
+        let thread_ref = thread_ref_from_parent_tags(parent, ID_B, &tags).expect("thread ref");
+
+        assert_eq!(thread_ref.parent_event_id, parent);
+        assert_eq!(thread_ref.root_event_id, parent);
+    }
+
     #[test]
     fn reply_only_falls_back_to_reply_target() {
         // Direct reply to a top-level message — the parent's only e-tag is a
@@ -1194,14 +1214,16 @@ mod tests {
     }
 
     #[test]
-    fn malformed_tags_are_skipped() {
+    fn malformed_tags_are_skipped_and_root_only_is_top_level() {
+        // Invalid entries are ignored, leaving a valid root-only marker; the
+        // shared collapse rule still classifies that parent as top-level.
         let tags = json!([
             "not-an-array",
             ["e"],
             ["e", "short"],
             ["e", ID_A, "", "root"],
         ]);
-        assert_eq!(find_root_from_tags(&tags).as_deref(), Some(ID_A));
+        assert!(find_root_from_tags(&tags).is_none());
     }
 
     #[test]
diff --git a/crates/buzz-core/src/lib.rs b/crates/buzz-core/src/lib.rs
index 7424915c83..36dc772da3 100644
--- a/crates/buzz-core/src/lib.rs
+++ b/crates/buzz-core/src/lib.rs
@@ -26,6 +26,8 @@ pub mod invite;
 pub mod kind;
 /// Network utilities — SSRF-safe IP classification.
 pub mod network;
+/// NIP-10 thread-marker parsing — shared `root`/`reply` marker resolver.
+pub mod nip10;
 /// Agent observer frame helpers.
 pub mod observer;
 /// NIP-AB device pairing — crypto primitives, message types, and errors.
diff --git a/crates/buzz-core/src/nip10.rs b/crates/buzz-core/src/nip10.rs
new file mode 100644
index 0000000000..993515f442
--- /dev/null
+++ b/crates/buzz-core/src/nip10.rs
@@ -0,0 +1,197 @@
+//! Shared NIP-10 thread-marker parsing.
+//!
+//! One parser for the `root`/`reply` markers on an event's `e` tags, so every
+//! consumer reads ancestry the same way. The relay ingest resolver
+//! (`resolve_nip10_thread_meta`) and the workflow `trigger_is_reply` predicate
+//! both call this — a second hand-rolled copy is exactly how the two drifted on
+//! marker semantics and on id-validity.
+//!
+//! Validity mirrors ingest: a marker counts only when its event id is exactly
+//! 64 ASCII-hex characters. A malformed id (e.g. `["e","bad","","reply"]`) is
+//! ignored, never treated as a thread link.
+
+/// The `root` and `reply` event ids parsed from an event's NIP-10 `e` tags.
+///
+/// Each is `Some(id_hex)` only when a marker of that kind carried a valid
+/// 64-hex event id. The last valid occurrence of each marker wins, matching
+/// the relay resolver's single-pass overwrite.
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct ThreadMarkers {
+    /// Event id from a valid `["e", <64-hex>, <relay>, "root"]` tag.
+    pub root: Option<String>,
+    /// Event id from a valid `["e", <64-hex>, <relay>, "reply"]` tag.
+    pub reply: Option<String>,
+}
+
+impl ThreadMarkers {
+    /// Collapse the `root`/`reply` markers into a reply's `(root_id, parent_id)`.
+    ///
+    /// This is the single definition of the NIP-10 resolution rule shared by
+    /// consumers that classify a reply's own root/parent or recover a parent's
+    /// ancestry (relay ingest, ACP anchoring, and the CLI).
+    ///
+    /// - `root` + `reply` → `(root, reply)` — a nested reply names both.
+    /// - `reply` only → `(reply, reply)` — a direct reply to the root; the
+    ///   reply target is itself the thread root.
+    /// - `root` only or neither → `None` — no `reply` marker means the event is
+    ///   top-level, matching ingest (a lone `root` tag never anchors a reply).
+    pub fn resolve(&self) -> Option<(String, String)> {
+        match (&self.root, &self.reply) {
+            (Some(root), Some(reply)) => Some((root.clone(), reply.clone())),
+            (None, Some(reply)) => Some((reply.clone(), reply.clone())),
+            (Some(_), None) | (None, None) => None,
+        }
+    }
+}
+
+/// Return true when `id` is exactly 64 ASCII-hex characters — the shape a
+/// Nostr event id must have to be a real thread link.
+fn is_event_id_hex(id: &str) -> bool {
+    id.len() == 64 && id.chars().all(|c| c.is_ascii_hexdigit())
+}
+
+/// Parse the NIP-10 `root`/`reply` markers from an event's tags.
+///
+/// Only `e` tags with a marker (`parts.len() >= 4`) and a valid 64-hex event id
+/// are considered; everything else is ignored.
+pub fn parse_thread_markers(tags: &nostr::Tags) -> ThreadMarkers {
+    parse_thread_markers_from_parts(tags.iter().map(nostr::Tag::as_slice))
+}
+
+/// Same parser as [`parse_thread_markers`], for consumers that hold raw tag
+/// arrays (e.g. decoded JSON `tags`) rather than a [`nostr::Tags`].
+///
+/// Each tag is a slice of string-like parts (`["e", <id>, <relay>, <marker>]`).
+pub fn parse_thread_markers_from_parts<'a, S, I>(tags: I) -> ThreadMarkers
+where
+    S: AsRef<str> + 'a,
+    I: IntoIterator<Item = &'a [S]>,
+{
+    let mut markers = ThreadMarkers::default();
+    for parts in tags {
+        if parts.len() >= 4 && parts[0].as_ref() == "e" && is_event_id_hex(parts[1].as_ref()) {
+            match parts[3].as_ref() {
+                "root" => markers.root = Some(parts[1].as_ref().to_string()),
+                "reply" => markers.reply = Some(parts[1].as_ref().to_string()),
+                _ => {}
+            }
+        }
+    }
+    markers
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use nostr::{EventBuilder, Keys, Kind, Tag};
+
+    fn markers_for(tags: Vec<Tag>) -> ThreadMarkers {
+        let event = EventBuilder::new(Kind::Custom(9), "")
+            .tags(tags)
+            .sign_with_keys(&Keys::generate())
+            .expect("sign");
+        parse_thread_markers(&event.tags)
+    }
+
+    fn id() -> String {
+        "a".repeat(64)
+    }
+
+    #[test]
+    fn no_e_tags_yields_no_markers() {
+        assert_eq!(markers_for(vec![]), ThreadMarkers::default());
+    }
+
+    #[test]
+    fn root_and_reply_both_parsed() {
+        let m = markers_for(vec![
+            Tag::parse(["e", &id(), "", "root"]).unwrap(),
+            Tag::parse(["e", &"b".repeat(64), "", "reply"]).unwrap(),
+        ]);
+        assert_eq!(m.root.as_deref(), Some(id().as_str()));
+        assert_eq!(m.reply.as_deref(), Some("b".repeat(64).as_str()));
+    }
+
+    #[test]
+    fn reply_only_marker_parsed() {
+        let m = markers_for(vec![Tag::parse(["e", &id(), "", "reply"]).unwrap()]);
+        assert_eq!(m.reply.as_deref(), Some(id().as_str()));
+        assert!(m.root.is_none());
+    }
+
+    #[test]
+    fn bare_e_tag_without_marker_is_ignored() {
+        let m = markers_for(vec![Tag::parse(["e", &id()]).unwrap()]);
+        assert_eq!(m, ThreadMarkers::default());
+    }
+
+    #[test]
+    fn malformed_id_is_ignored_for_both_markers() {
+        // Ingest gates the marker on a valid 64-hex id; a malformed id is not a
+        // thread link, so neither marker is set.
+        let m = markers_for(vec![
+            Tag::parse(["e", "bad", "", "reply"]).unwrap(),
+            Tag::parse(["e", "also-bad", "", "root"]).unwrap(),
+        ]);
+        assert_eq!(m, ThreadMarkers::default());
+    }
+
+    #[test]
+    fn valid_root_with_malformed_reply_is_top_level() {
+        // A valid root but a malformed reply id: reply is ignored, so this is
+        // top-level to ingest (root-only) and must be so here too.
+        let m = markers_for(vec![
+            Tag::parse(["e", &id(), "", "root"]).unwrap(),
+            Tag::parse(["e", "bad", "", "reply"]).unwrap(),
+        ]);
+        assert_eq!(m.root.as_deref(), Some(id().as_str()));
+        assert!(m.reply.is_none());
+    }
+
+    #[test]
+    fn resolve_root_and_reply_keeps_both() {
+        let m = ThreadMarkers {
+            root: Some("r".repeat(64)),
+            reply: Some("p".repeat(64)),
+        };
+        assert_eq!(m.resolve(), Some(("r".repeat(64), "p".repeat(64))));
+    }
+
+    #[test]
+    fn resolve_reply_only_is_direct_reply_to_root() {
+        let m = ThreadMarkers {
+            root: None,
+            reply: Some(id()),
+        };
+        assert_eq!(m.resolve(), Some((id(), id())));
+    }
+
+    #[test]
+    fn resolve_root_only_is_top_level() {
+        let m = ThreadMarkers {
+            root: Some(id()),
+            reply: None,
+        };
+        assert_eq!(m.resolve(), None);
+    }
+
+    #[test]
+    fn resolve_no_markers_is_top_level() {
+        assert_eq!(ThreadMarkers::default().resolve(), None);
+    }
+
+    #[test]
+    fn parse_from_parts_matches_tags_path() {
+        // The slice-based entry point must gate id validity and select markers
+        // identically to the `nostr::Tags` path.
+        let tags: Vec<Vec<String>> = vec![
+            vec!["e".into(), id(), "".into(), "root".into()],
+            vec!["e".into(), "b".repeat(64), "".into(), "reply".into()],
+            vec!["e".into(), "bad".into(), "".into(), "reply".into()],
+            vec!["p".into(), "abc".into()],
+        ];
+        let m = parse_thread_markers_from_parts(tags.iter().map(Vec::as_slice));
+        assert_eq!(m.root.as_deref(), Some(id().as_str()));
+        assert_eq!(m.reply.as_deref(), Some("b".repeat(64).as_str()));
+    }
+}
diff --git a/crates/buzz-relay/src/handlers/ingest.rs b/crates/buzz-relay/src/handlers/ingest.rs
index 5ba9650e91..9629ffb0fd 100644
--- a/crates/buzz-relay/src/handlers/ingest.rs
+++ b/crates/buzz-relay/src/handlers/ingest.rs
@@ -724,32 +724,11 @@ pub(crate) async fn resolve_nip10_thread_meta(
     channel_id: Uuid,
     state: &AppState,
 ) -> Result<Option<ThreadMetadataOwned>, String> {
-    let mut root_hex: Option<String> = None;
-    let mut reply_hex: Option<String> = None;
+    let markers = buzz_core::nip10::parse_thread_markers(&event.tags);
 
-    for tag in event.tags.iter() {
-        let parts = tag.as_slice();
-        if parts.len() >= 4 && parts[0] == "e" {
-            let hex_val = &parts[1];
-            let marker = &parts[3];
-            if hex_val.len() == 64 && hex_val.chars().all(|c| c.is_ascii_hexdigit()) {
-                match marker.as_str() {
-                    "root" => root_hex = Some(hex_val.to_string()),
-                    "reply" => reply_hex = Some(hex_val.to_string()),
-                    _ => {}
-                }
-            }
-        }
-    }
-
-    if root_hex.is_none() && reply_hex.is_none() {
-        return Ok(None);
-    }
-
-    let (root_hex, parent_hex) = match (root_hex, reply_hex) {
-        (Some(r), Some(p)) => (r, p),
-        (None, Some(p)) => (p.clone(), p),
-        (Some(_), None) | (None, None) => return Ok(None),
+    let (root_hex, parent_hex) = match markers.resolve() {
+        Some(pair) => pair,
+        None => return Ok(None),
     };
 
     let parent_bytes =
@@ -807,46 +786,18 @@ pub(crate) async fn resolve_nip10_thread_meta(
             (effective_root, root_ts, depth)
         }
         None => {
-            let parent_root = parent_event
-                .event
-                .tags
-                .iter()
-                .find_map(|t| {
-                    let parts = t.as_slice();
-                    if parts.len() >= 4 && parts[0] == "e" && parts[3] == "root" {
-                        hex::decode(&parts[1]).ok().filter(|b| b.len() == 32)
-                    } else {
-                        None
-                    }
-                })
-                .or_else(|| {
-                    parent_event.event.tags.iter().find_map(|t| {
-                        let parts = t.as_slice();
-                        if parts.len() >= 4 && parts[0] == "e" && parts[3] == "reply" {
-                            hex::decode(&parts[1]).ok().filter(|b| b.len() == 32)
-                        } else {
-                            None
-                        }
-                    })
-                })
-                .unwrap_or_else(|| parent_bytes.clone());
+            let (parent_root, root_created, depth) = derive_ancestry_from_parent_tags(
+                community_id,
+                &parent_event.event,
+                &parent_bytes,
+                parent_created,
+                state,
+            )
+            .await;
 
             if client_root_bytes != parent_root {
                 return Err("root tag does not match thread ancestry".to_string());
             }
-            let depth = if parent_root == parent_bytes { 1 } else { 2 };
-            let root_created = if parent_root != parent_bytes {
-                if let Ok(Some(root_ev)) =
-                    state.db.get_event_by_id(community_id, &parent_root).await
-                {
-                    chrono::DateTime::from_timestamp(root_ev.event.created_at.as_secs() as i64, 0)
-                        .unwrap_or(parent_created)
-                } else {
-                    parent_created
-                }
-            } else {
-                parent_created
-            };
             (parent_root, root_created, depth)
         }
     };
@@ -872,6 +823,182 @@ pub(crate) async fn resolve_nip10_thread_meta(
     }))
 }
 
+/// Recover a reply's thread ancestry from its *parent's* NIP-10 tags when the
+/// parent has **no** `thread_metadata` row (legacy or not-yet-indexed events).
+///
+/// The parent's markers are first collapsed through `ThreadMarkers::resolve()`:
+/// a `root`+`reply` parent carries its marked root, a `reply`-only parent carries
+/// its reply target as root, and a root-only/malformed/unmarked parent is itself
+/// top-level and its own root. Depth is 1 when the parent is the root and 2
+/// otherwise — a reply to a nested-but-unindexed parent must not be mistaken for
+/// a top-level reply.
+///
+/// Shared by [`resolve_nip10_thread_meta`] (client path) and
+/// [`resolve_relay_reply_thread_meta`] (workflow path) so the two cannot
+/// diverge. Returns `(root_event_id, root_event_created_at, depth)`.
+async fn derive_ancestry_from_parent_tags(
+    community_id: CommunityId,
+    parent_event: &Event,
+    parent_bytes: &[u8],
+    parent_created: chrono::DateTime<Utc>,
+    state: &AppState,
+) -> (Vec<u8>, chrono::DateTime<Utc>, i32) {
+    let marked_ancestor = |id_hex: &str| hex::decode(id_hex).ok().filter(|b| b.len() == 32);
+    let markers = buzz_core::nip10::parse_thread_markers(&parent_event.tags);
+    let parent_root = markers
+        .resolve()
+        .map(|(root, _)| root)
+        .as_deref()
+        .and_then(marked_ancestor)
+        .unwrap_or_else(|| parent_bytes.to_vec());
+
+    if parent_root.as_slice() == parent_bytes {
+        (parent_root, parent_created, 1)
+    } else {
+        let root_created =
+            if let Ok(Some(root_ev)) = state.db.get_event_by_id(community_id, &parent_root).await {
+                chrono::DateTime::from_timestamp(root_ev.event.created_at.as_secs() as i64, 0)
+                    .unwrap_or(parent_created)
+            } else {
+                parent_created
+            };
+        (parent_root, root_created, 2)
+    }
+}
+
+/// Resolved thread ancestry for a relay-built reply (workflow path).
+///
+/// Carries the parent and root identifiers plus the reply's depth, so the
+/// caller can both emit matching NIP-10 `root`/`reply` tags and persist thread
+/// metadata for the signed reply event.
+pub(crate) struct ReplyAncestry {
+    pub parent_event_id: Vec<u8>,
+    pub parent_event_created_at: chrono::DateTime<Utc>,
+    pub root_event_id: Vec<u8>,
+    pub root_event_created_at: chrono::DateTime<Utc>,
+    pub depth: i32,
+}
+
+impl ReplyAncestry {
+    /// Root event ID as lowercase hex, for the NIP-10 `root` tag.
+    pub fn root_hex(&self) -> String {
+        hex::encode(&self.root_event_id)
+    }
+
+    /// Parent event ID as lowercase hex, for the NIP-10 `reply` tag.
+    pub fn parent_hex(&self) -> String {
+        hex::encode(&self.parent_event_id)
+    }
+
+    /// Build the DB thread-metadata params for the signed reply event.
+    pub fn into_thread_meta(
+        self,
+        reply_event_id: Vec<u8>,
+        reply_created_at: chrono::DateTime<Utc>,
+        channel_id: Uuid,
+    ) -> ThreadMetadataOwned {
+        ThreadMetadataOwned {
+            event_id: reply_event_id,
+            event_created_at: reply_created_at,
+            channel_id,
+            parent_event_id: self.parent_event_id,
+            parent_event_created_at: self.parent_event_created_at,
+            root_event_id: self.root_event_id,
+            root_event_created_at: self.root_event_created_at,
+            depth: self.depth,
+            broadcast: false,
+        }
+    }
+}
+
+/// Resolve thread ancestry for a reply built by the relay (workflow path).
+///
+/// Unlike [`resolve_nip10_thread_meta`], which validates client-supplied NIP-10
+/// `e` tags, this derives ancestry from a known `parent_hex` (the triggering
+/// event) and *computes* the correct root and depth. Enforces the same-channel
+/// invariant and the depth limit that the ingest path applies.
+pub(crate) async fn resolve_relay_reply_thread_meta(
+    community_id: CommunityId,
+    parent_hex: &str,
+    channel_id: Uuid,
+    state: &AppState,
+) -> Result<ReplyAncestry, String> {
+    let parent_bytes =
+        hex::decode(parent_hex).map_err(|_| "invalid parent event ID hex".to_string())?;
+
+    let (parent_event_result, parent_meta_result) = tokio::join!(
+        state.db.get_event_by_id(community_id, &parent_bytes),
+        state
+            .db
+            .get_thread_metadata_by_event(community_id, &parent_bytes),
+    );
+
+    let parent_event = parent_event_result
+        .map_err(|e| format!("db error looking up parent: {e}"))?
+        .ok_or_else(|| "reply parent not found".to_string())?;
+
+    match parent_event.channel_id {
+        Some(parent_ch) if parent_ch != channel_id => {
+            return Err("parent event belongs to a different channel".to_string());
+        }
+        None => return Err("parent event has no channel association".to_string()),
+        _ => {}
+    }
+
+    let parent_created =
+        chrono::DateTime::from_timestamp(parent_event.event.created_at.as_secs() as i64, 0)
+            .unwrap_or_else(Utc::now);
+
+    let parent_meta =
+        parent_meta_result.map_err(|e| format!("db error looking up thread metadata: {e}"))?;
+
+    // Root = parent's root if the parent is itself a reply, else the parent.
+    // Depth = parent depth + 1 (a direct reply to a top-level message is depth 1).
+    let (root_bytes, root_created, depth) = match parent_meta {
+        Some(meta) => {
+            let effective_root = meta.root_event_id.unwrap_or_else(|| parent_bytes.clone());
+            let root_ts = if effective_root == parent_bytes {
+                parent_created
+            } else if let Ok(Some(root_ev)) = state
+                .db
+                .get_event_by_id(community_id, &effective_root)
+                .await
+            {
+                chrono::DateTime::from_timestamp(root_ev.event.created_at.as_secs() as i64, 0)
+                    .unwrap_or(parent_created)
+            } else {
+                parent_created
+            };
+            (effective_root, root_ts, meta.depth + 1)
+        }
+        // No metadata row ⇒ recover the parent's ancestry from its own NIP-10
+        // tags. A marked (but not-yet-indexed) nested parent yields depth 2, not
+        // a false top-level depth 1.
+        None => {
+            derive_ancestry_from_parent_tags(
+                community_id,
+                &parent_event.event,
+                &parent_bytes,
+                parent_created,
+                state,
+            )
+            .await
+        }
+    };
+
+    if depth > 100 {
+        return Err("thread depth limit exceeded".to_string());
+    }
+
+    Ok(ReplyAncestry {
+        parent_event_id: parent_bytes,
+        parent_event_created_at: parent_created,
+        root_event_id: root_bytes,
+        root_event_created_at: root_created,
+        depth,
+    })
+}
+
 /// Count all `e` tags regardless of content validity.
 fn count_e_tags(event: &Event) -> usize {
     event
diff --git a/crates/buzz-relay/src/workflow_sink.rs b/crates/buzz-relay/src/workflow_sink.rs
index 97c31c2561..8ce23a2e8e 100644
--- a/crates/buzz-relay/src/workflow_sink.rs
+++ b/crates/buzz-relay/src/workflow_sink.rs
@@ -176,10 +176,12 @@ impl ActionSink for RelayActionSink {
         channel_id: &str,
         text: &str,
         author_pubkey: &str,
+        reply_to: Option<&str>,
     ) -> Pin<Box<dyn Future<Output = Result<String, ActionSinkError>> + Send + '_>> {
         let channel_id = channel_id.to_owned();
         let text = text.to_owned();
         let author_pubkey = author_pubkey.to_owned();
+        let reply_to = reply_to.map(str::to_owned);
 
         Box::pin(async move {
             // 0. Upgrade weak reference — fails only during shutdown.
@@ -266,6 +268,50 @@ impl ActionSink for RelayActionSink {
                     .map_err(|e| ActionSinkError::EventBuild(format!("workflow tag: {e}")))?,
             ];
 
+            // Resolve thread ancestry when this is a threaded reply, so the
+            // built event carries NIP-10 `root`/`reply` e-tags and persists real
+            // thread metadata (matching the ingest path) instead of top-level.
+            let reply_ancestry = match reply_to.as_deref() {
+                Some(parent_hex) => Some(
+                    crate::handlers::ingest::resolve_relay_reply_thread_meta(
+                        tenant.community(),
+                        parent_hex,
+                        channel_uuid,
+                        &state,
+                    )
+                    .await
+                    .map_err(ActionSinkError::InvalidInput)?,
+                ),
+                None => None,
+            };
+
+            // NIP-10 e-tags for the thread. Marked `root`/`reply` so clients and
+            // the ingest resolver read the ancestry the same way. A direct reply
+            // (parent == root) emits a single `reply` tag; a nested reply emits
+            // the `root` + `reply` pair — matching `buzz_sdk::builders::thread_tags`
+            // so every writer produces one wire shape per reply kind.
+            if let Some(ancestry) = &reply_ancestry {
+                let root_hex = ancestry.root_hex();
+                let parent_hex = ancestry.parent_hex();
+                if root_hex == parent_hex {
+                    tags.push(
+                        Tag::parse(["e", &root_hex, "", "reply"]).map_err(|e| {
+                            ActionSinkError::EventBuild(format!("reply e tag: {e}"))
+                        })?,
+                    );
+                } else {
+                    tags.push(
+                        Tag::parse(["e", &root_hex, "", "root"])
+                            .map_err(|e| ActionSinkError::EventBuild(format!("root e tag: {e}")))?,
+                    );
+                    tags.push(
+                        Tag::parse(["e", &parent_hex, "", "reply"]).map_err(|e| {
+                            ActionSinkError::EventBuild(format!("reply e tag: {e}"))
+                        })?,
+                    );
+                }
+            }
+
             // Resolve `@Name` mentions to channel-member pubkeys and append a
             // `p` tag for each (skipping the author, already tagged above). A
             // resolution failure must not drop the message, so log and proceed
@@ -321,17 +367,24 @@ impl ActionSink for RelayActionSink {
             );
 
             // 4. Persist event with thread metadata (matches REST handler path).
-            //    Workflow messages are always top-level: depth=0, no parent/root.
-            let thread_meta = Some(buzz_db::event::ThreadMetadataParams {
-                event_id: &event_id_bytes,
-                event_created_at,
-                channel_id: channel_uuid,
-                parent_event_id: None,
-                parent_event_created_at: None,
-                root_event_id: None,
-                root_event_created_at: None,
-                depth: 0,
-                broadcast: false,
+            //    Threaded replies persist the resolved parent/root/depth; a
+            //    non-reply workflow message stays top-level (depth=0, no parent).
+            let thread_meta_owned = reply_ancestry.map(|ancestry| {
+                ancestry.into_thread_meta(event_id_bytes.clone(), event_created_at, channel_uuid)
+            });
+            let thread_meta = Some(match &thread_meta_owned {
+                Some(owned) => owned.as_params(),
+                None => buzz_db::event::ThreadMetadataParams {
+                    event_id: &event_id_bytes,
+                    event_created_at,
+                    channel_id: channel_uuid,
+                    parent_event_id: None,
+                    parent_event_created_at: None,
+                    root_event_id: None,
+                    root_event_created_at: None,
+                    depth: 0,
+                    broadcast: false,
+                },
             });
 
             let (stored_event, was_inserted) = state
@@ -357,6 +410,20 @@ impl ActionSink for RelayActionSink {
                     None,
                 )
                 .await;
+
+                // A threaded reply changed its thread's counters — push a fresh
+                // relay-signed kind:39005 so subscribed clients update badge
+                // counts without refetching the head window, exactly as the
+                // ingest path does after a reply insert. Fan-out-only and
+                // best-effort; skipped for top-level (non-reply) messages.
+                if let Some(owned) = &thread_meta_owned {
+                    crate::handlers::side_effects::emit_live_thread_summary(
+                        &tenant,
+                        &state,
+                        channel_uuid,
+                        owned.root_event_id.clone(),
+                    );
+                }
             }
 
             Ok(event_id_hex)
@@ -676,6 +743,7 @@ mod integration_tests {
                 &channel.id.to_string(),
                 "heads up @Robby — please take a look",
                 &author_hex,
+                None,
             )
             .await
             .expect("send_message");
@@ -708,4 +776,353 @@ mod integration_tests {
             "mentioned member {agent_hex} must be p-tagged so it wakes; got {p_tag_targets:?}"
         );
     }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn workflow_reply_in_thread_threads_onto_parent() {
+        let state = test_state().await;
+
+        let author = nostr::Keys::generate();
+        let author_hex = author.public_key().to_hex();
+
+        let host = format!("wf-thread-{}.example", uuid::Uuid::new_v4().simple());
+        let community = match state
+            .db
+            .create_community_with_owner(&host, &author_hex)
+            .await
+            .expect("create community")
+        {
+            CreateCommunityWithOwnerResult::Created(rec) => rec.id,
+            other => panic!("expected fresh community, got {other:?}"),
+        };
+
+        let channel = state
+            .db
+            .create_channel(
+                community,
+                "wf-thread",
+                ChannelType::Stream,
+                ChannelVisibility::Open,
+                None,
+                &author.public_key().to_bytes(),
+                None,
+            )
+            .await
+            .expect("create channel");
+
+        let sink = RelayActionSink::new(&state);
+
+        // 1. A top-level workflow message becomes the thread root.
+        let root_hex = sink
+            .send_message(
+                community,
+                &channel.id.to_string(),
+                "root message",
+                &author_hex,
+                None,
+            )
+            .await
+            .expect("send root");
+
+        // 2. A reply_in_thread message threads onto it.
+        let reply_hex = sink
+            .send_message(
+                community,
+                &channel.id.to_string(),
+                "threaded reply",
+                &author_hex,
+                Some(&root_hex),
+            )
+            .await
+            .expect("send reply");
+
+        // A direct reply carries a single NIP-10 reply e-tag at the root (no
+        // root marker), matching SDK `thread_tags`.
+        let reply_id_bytes = nostr::EventId::from_hex(&reply_hex)
+            .expect("reply id")
+            .as_bytes()
+            .to_vec();
+        let stored = state
+            .db
+            .get_event_by_id(community, &reply_id_bytes)
+            .await
+            .expect("query reply")
+            .expect("reply persisted");
+        let marker = |m: &str| -> Option<String> {
+            stored.event.tags.iter().find_map(|t| {
+                let p = t.as_slice();
+                if p.len() >= 4 && p[0] == "e" && p[3] == m {
+                    Some(p[1].clone())
+                } else {
+                    None
+                }
+            })
+        };
+        assert_eq!(
+            marker("reply").as_deref(),
+            Some(root_hex.as_str()),
+            "direct reply emits a single reply marker at the root"
+        );
+        assert_eq!(
+            marker("root"),
+            None,
+            "direct reply omits the root marker (matches SDK thread_tags)"
+        );
+
+        // Thread metadata reflects a depth-1 reply parented on the root.
+        let meta = state
+            .db
+            .get_thread_metadata_by_event(community, &reply_id_bytes)
+            .await
+            .expect("query meta")
+            .expect("reply has thread metadata");
+        assert_eq!(
+            meta.depth, 1,
+            "direct reply to a top-level message is depth 1"
+        );
+        let root_bytes = nostr::EventId::from_hex(&root_hex)
+            .expect("root id")
+            .as_bytes()
+            .to_vec();
+        assert_eq!(meta.parent_event_id.as_deref(), Some(root_bytes.as_slice()));
+        assert_eq!(meta.root_event_id.as_deref(), Some(root_bytes.as_slice()));
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn workflow_replies_recover_metadata_less_parent_ancestry() {
+        // A parent that carries NIP-10 root/reply markers but has NO
+        // thread_metadata row (legacy or not-yet-indexed) must be recognized as
+        // nested: the workflow reply threads at depth 2 onto the parent's own
+        // root, not a false top-level depth 1.
+        let state = test_state().await;
+
+        let author = nostr::Keys::generate();
+        let author_hex = author.public_key().to_hex();
+
+        let host = format!("wf-legacy-{}.example", uuid::Uuid::new_v4().simple());
+        let community = match state
+            .db
+            .create_community_with_owner(&host, &author_hex)
+            .await
+            .expect("create community")
+        {
+            CreateCommunityWithOwnerResult::Created(rec) => rec.id,
+            other => panic!("expected fresh community, got {other:?}"),
+        };
+
+        let channel = state
+            .db
+            .create_channel(
+                community,
+                "wf-legacy",
+                ChannelType::Stream,
+                ChannelVisibility::Open,
+                None,
+                &author.public_key().to_bytes(),
+                None,
+            )
+            .await
+            .expect("create channel");
+
+        let channel_hex = channel.id.to_string();
+
+        // A top-level root message, inserted WITHOUT any thread metadata row.
+        let root_event = EventBuilder::new(Kind::from(KIND_STREAM_MESSAGE as u16), "root")
+            .tags([Tag::parse(["h", &channel_hex]).expect("h tag")])
+            .sign_with_keys(&author)
+            .expect("sign root");
+        let root_hex = root_event.id.to_hex();
+        state
+            .db
+            .insert_event(community, &root_event, Some(channel.id))
+            .await
+            .expect("insert root");
+
+        // A nested parent that marks its root/reply — but, crucially, is stored
+        // with NO thread_metadata row (the legacy/unindexed case F1 addresses).
+        let parent_event =
+            EventBuilder::new(Kind::from(KIND_STREAM_MESSAGE as u16), "nested parent")
+                .tags([
+                    Tag::parse(["h", &channel_hex]).expect("h tag"),
+                    Tag::parse(["e", &root_hex, "", "root"]).expect("root tag"),
+                    Tag::parse(["e", &root_hex, "", "reply"]).expect("reply tag"),
+                ])
+                .sign_with_keys(&author)
+                .expect("sign parent");
+        let parent_hex = parent_event.id.to_hex();
+        state
+            .db
+            .insert_event(community, &parent_event, Some(channel.id))
+            .await
+            .expect("insert parent");
+        assert!(
+            state
+                .db
+                .get_thread_metadata_by_event(community, parent_event.id.as_bytes())
+                .await
+                .expect("query parent meta")
+                .is_none(),
+            "test premise: the nested parent must have no thread_metadata row"
+        );
+
+        // A workflow reply onto the metadata-less nested parent.
+        let reply_hex = RelayActionSink::new(&state)
+            .send_message(
+                community,
+                &channel_hex,
+                "workflow reply",
+                &author_hex,
+                Some(&parent_hex),
+            )
+            .await
+            .expect("send reply");
+
+        let reply_id_bytes = nostr::EventId::from_hex(&reply_hex)
+            .expect("reply id")
+            .as_bytes()
+            .to_vec();
+        let meta = state
+            .db
+            .get_thread_metadata_by_event(community, &reply_id_bytes)
+            .await
+            .expect("query meta")
+            .expect("reply has thread metadata");
+
+        assert_eq!(
+            meta.depth, 2,
+            "reply to a marked-but-unindexed nested parent is depth 2, not top-level"
+        );
+        let root_bytes = nostr::EventId::from_hex(&root_hex)
+            .expect("root id")
+            .as_bytes()
+            .to_vec();
+        let parent_bytes = parent_event.id.as_bytes().to_vec();
+        assert_eq!(
+            meta.root_event_id.as_deref(),
+            Some(root_bytes.as_slice()),
+            "root recovered from the parent's own NIP-10 markers"
+        );
+        assert_eq!(
+            meta.parent_event_id.as_deref(),
+            Some(parent_bytes.as_slice())
+        );
+
+        // The reply's own NIP-10 e-tags point root→the recovered root,
+        // reply→the immediate parent (matching the ingest resolver).
+        let stored = state
+            .db
+            .get_event_by_id(community, &reply_id_bytes)
+            .await
+            .expect("query reply")
+            .expect("reply persisted");
+        let marker = |m: &str| -> Option<String> {
+            stored.event.tags.iter().find_map(|t| {
+                let p = t.as_slice();
+                if p.len() >= 4 && p[0] == "e" && p[3] == m {
+                    Some(p[1].clone())
+                } else {
+                    None
+                }
+            })
+        };
+        assert_eq!(marker("root").as_deref(), Some(root_hex.as_str()));
+        assert_eq!(marker("reply").as_deref(), Some(parent_hex.as_str()));
+
+        // A root-only parent is top-level under the shared collapse rule, even
+        // without metadata. A workflow reply therefore starts a thread at P,
+        // rather than incorrectly inheriting the marker's unrelated root R.
+        let root_only_parent =
+            EventBuilder::new(Kind::from(KIND_STREAM_MESSAGE as u16), "root-only parent")
+                .tags([
+                    Tag::parse(["h", &channel_hex]).expect("h tag"),
+                    Tag::parse(["e", &root_hex, "", "root"]).expect("root tag"),
+                ])
+                .sign_with_keys(&author)
+                .expect("sign root-only parent");
+        let root_only_parent_hex = root_only_parent.id.to_hex();
+        let root_only_parent_bytes = root_only_parent.id.as_bytes().to_vec();
+        state
+            .db
+            .insert_event(community, &root_only_parent, Some(channel.id))
+            .await
+            .expect("insert root-only parent");
+
+        let root_only_reply_hex = RelayActionSink::new(&state)
+            .send_message(
+                community,
+                &channel_hex,
+                "workflow reply to root-only parent",
+                &author_hex,
+                Some(&root_only_parent_hex),
+            )
+            .await
+            .expect("send root-only reply");
+        let root_only_reply_bytes = nostr::EventId::from_hex(&root_only_reply_hex)
+            .expect("reply id")
+            .as_bytes()
+            .to_vec();
+        let root_only_meta = state
+            .db
+            .get_thread_metadata_by_event(community, &root_only_reply_bytes)
+            .await
+            .expect("query root-only reply meta")
+            .expect("root-only reply has thread metadata");
+        assert_eq!(root_only_meta.depth, 1);
+        assert_eq!(
+            root_only_meta.parent_event_id.as_deref(),
+            Some(root_only_parent_bytes.as_slice())
+        );
+        assert_eq!(
+            root_only_meta.root_event_id.as_deref(),
+            Some(root_only_parent_bytes.as_slice())
+        );
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn workflow_reply_to_missing_parent_errors() {
+        let state = test_state().await;
+        let author = nostr::Keys::generate();
+        let author_hex = author.public_key().to_hex();
+        let host = format!("wf-missing-{}.example", uuid::Uuid::new_v4().simple());
+        let community = match state
+            .db
+            .create_community_with_owner(&host, &author_hex)
+            .await
+            .expect("create community")
+        {
+            CreateCommunityWithOwnerResult::Created(rec) => rec.id,
+            other => panic!("expected fresh community, got {other:?}"),
+        };
+        let channel = state
+            .db
+            .create_channel(
+                community,
+                "wf-missing",
+                ChannelType::Stream,
+                ChannelVisibility::Open,
+                None,
+                &author.public_key().to_bytes(),
+                None,
+            )
+            .await
+            .expect("create channel");
+
+        let unknown = nostr::Keys::generate().public_key().to_hex();
+        let err = RelayActionSink::new(&state)
+            .send_message(
+                community,
+                &channel.id.to_string(),
+                "orphan reply",
+                &author_hex,
+                Some(&unknown),
+            )
+            .await
+            .expect_err("reply to a non-existent parent must fail");
+        assert!(
+            matches!(err, ActionSinkError::InvalidInput(_)),
+            "expected InvalidInput, got {err:?}"
+        );
+    }
 }
diff --git a/crates/buzz-test-client/tests/e2e_relay.rs b/crates/buzz-test-client/tests/e2e_relay.rs
index 882cbabfe2..b119d26774 100644
--- a/crates/buzz-test-client/tests/e2e_relay.rs
+++ b/crates/buzz-test-client/tests/e2e_relay.rs
@@ -2661,6 +2661,112 @@ async fn test_reply_ingest_pushes_live_thread_summary() {
     client.disconnect().await.expect("disconnect");
 }
 
+/// F3 (workflow path): a `message_posted` workflow whose `send_message` action
+/// has `reply_in_thread: true` posts a threaded reply to the triggering
+/// top-level message — and that relay-built reply must push the same live
+/// kind:39005 thread-summary overlay the human ingest path does, so desktops
+/// update the root's badge without refetching. Also exercises F2's semantics:
+/// the `trigger_is_reply == false` filter must fire on the top-level message.
+#[tokio::test]
+#[ignore]
+async fn test_workflow_reply_in_thread_pushes_live_thread_summary() {
+    let url = relay_url();
+    let http = relay_http_url();
+    let keys = Keys::generate();
+    let pubkey_hex = keys.public_key().to_hex();
+    let channel = create_test_channel(&keys).await;
+
+    // A message_posted workflow that replies in-thread, but only to NEW
+    // top-level messages (`trigger_is_reply == false`) — so it cannot recurse
+    // on the reply it just posted.
+    let yaml = "name: reply-bot\n\
+         description: F3 live probe\n\
+         trigger:\n\
+         \x20 on: message_posted\n\
+         \x20 filter: \"trigger_is_reply == false\"\n\
+         steps:\n\
+         \x20 - id: step1\n\
+         \x20   name: Reply\n\
+         \x20   action: send_message\n\
+         \x20   text: \"auto-reply\"\n\
+         \x20   reply_in_thread: true\n"
+        .to_string();
+    let def = EventBuilder::new(Kind::Custom(30620), yaml)
+        .tags([
+            Tag::parse(["d", &Uuid::new_v4().to_string()]).unwrap(),
+            Tag::parse(["h", channel.as_str()]).unwrap(),
+            Tag::parse(["name", "reply-bot"]).unwrap(),
+        ])
+        .sign_with_keys(&keys)
+        .expect("sign workflow def");
+    let client = reqwest::Client::new();
+    let resp = client
+        .post(format!("{http}/events"))
+        .header("X-Pubkey", &pubkey_hex)
+        .header("Content-Type", "application/json")
+        .body(serde_json::to_string(&def).unwrap())
+        .send()
+        .await
+        .expect("submit workflow def");
+    let body: serde_json::Value = resp.json().await.expect("parse def response");
+    assert!(
+        body["accepted"].as_bool().unwrap_or(false),
+        "workflow def not accepted: {body}"
+    );
+
+    // Live 39005 subscription for the channel, shaped like the desktop window
+    // store's.
+    let mut ws = BuzzTestClient::connect(&url, &keys).await.expect("connect");
+    let sid = sub_id("wf-live-summary");
+    let filter = Filter::new()
+        .kind(Kind::Custom(39005))
+        .custom_tags(SingleLetterTag::lowercase(Alphabet::H), [channel.as_str()]);
+    ws.subscribe(&sid, vec![filter]).await.expect("subscribe");
+    ws.collect_until_eose(&sid, Duration::from_secs(5))
+        .await
+        .expect("EOSE");
+
+    // Post a top-level message — the workflow fires and posts a threaded reply.
+    let root = EventBuilder::new(Kind::Custom(9), "trigger me")
+        .tags([Tag::parse(["h", channel.as_str()]).unwrap()])
+        .sign_with_keys(&keys)
+        .expect("sign root");
+    let root_id = root.id;
+    let ok = ws.send_event(root).await.expect("send root");
+    assert!(ok.accepted, "root rejected: {}", ok.message);
+
+    // The workflow reply's 39005 overlay must arrive and target the root with a
+    // reply_count of 1 — proving the relay-built reply pushed the live summary.
+    let summary = loop {
+        match ws
+            .recv_event(Duration::from_secs(10))
+            .await
+            .expect("recv 39005 for workflow reply")
+        {
+            RelayMessage::Event { event, .. } if event.kind == Kind::Custom(39005) => break *event,
+            _ => continue,
+        }
+    };
+    let root_tag_val = summary
+        .tags
+        .iter()
+        .find(|t| t.as_slice().first().map(String::as_str) == Some("e"))
+        .and_then(|t| t.content().map(str::to_string))
+        .expect("summary carries root e-tag");
+    assert_eq!(
+        root_tag_val,
+        root_id.to_hex(),
+        "workflow-reply summary targets the triggering top-level message as root"
+    );
+    let content: serde_json::Value = serde_json::from_str(&summary.content).expect("JSON");
+    assert_eq!(
+        content["reply_count"], 1,
+        "workflow threaded reply counted up: {content}"
+    );
+
+    ws.disconnect().await.expect("disconnect");
+}
+
 /// Read a member's authoritative role from the relay-signed kind:39002 member
 /// list. The relay's own view of membership, not the client's — a kind:9000 can
 /// be `accepted` (stored) while its membership side effect fails, so asserting
diff --git a/crates/buzz-workflow/src/action_sink.rs b/crates/buzz-workflow/src/action_sink.rs
index 0c6002e74e..079c27a913 100644
--- a/crates/buzz-workflow/src/action_sink.rs
+++ b/crates/buzz-workflow/src/action_sink.rs
@@ -57,6 +57,9 @@ pub trait ActionSink: Send + Sync {
     /// - `text`: message body (must not be empty/whitespace-only)
     /// - `author_pubkey`: hex-encoded pubkey of the workflow owner (used for
     ///   the `p` attribution tag; the relay keypair signs the event)
+    /// - `reply_to`: when `Some(event_id_hex)`, the message is posted as a
+    ///   threaded reply to that event (NIP-10 root/reply tags + real thread
+    ///   metadata); when `None`, it is a top-level channel message.
     ///
     /// Returns the event ID hex string on success.
     fn send_message(
@@ -65,5 +68,6 @@ pub trait ActionSink: Send + Sync {
         channel_id: &str,
         text: &str,
         author_pubkey: &str,
+        reply_to: Option<&str>,
     ) -> Pin<Box<dyn Future<Output = Result<String, ActionSinkError>> + Send + '_>>;
 }
diff --git a/crates/buzz-workflow/src/executor.rs b/crates/buzz-workflow/src/executor.rs
index dffa492716..5c712dcff7 100644
--- a/crates/buzz-workflow/src/executor.rs
+++ b/crates/buzz-workflow/src/executor.rs
@@ -37,6 +37,10 @@ pub struct TriggerContext {
     pub emoji: String,
     /// Event ID of the triggering message (hex string).
     pub message_id: String,
+    /// True when the triggering event is itself a threaded reply (carries a
+    /// NIP-10 `reply`/`root` marker e-tag). Lets a `message_posted` filter
+    /// select only top-level messages via `trigger_is_reply == false`.
+    pub is_reply: bool,
     /// Arbitrary webhook body fields (webhook trigger).
     pub webhook_fields: HashMap<String, String>,
 }
@@ -213,6 +217,7 @@ fn apply_filter(value: String, filter: &str) -> Result<String, WorkflowError> {
 /// | `trigger.timestamp`               | `trigger_timestamp`       |
 /// | `trigger.emoji`                   | `trigger_emoji`           |
 /// | `trigger.message_id`              | `trigger_message_id`      |
+/// | `trigger.is_reply`                | `trigger_is_reply` (bool) |
 /// | `steps.STEP_ID.output.FIELD`      | `steps_STEP_ID_output_FIELD` |
 ///
 /// Also registers string helper functions that the `cron` crate's `evalexpr` v11
@@ -300,6 +305,14 @@ pub fn build_eval_context(
             .map_err(|e| WorkflowError::ConditionError(e.to_string()))?;
     }
 
+    // `trigger_is_reply` is boolean (not a string field), so a filter can read
+    // `trigger_is_reply == false` to fire only on top-level messages.
+    ctx.set_value(
+        "trigger_is_reply".into(),
+        Value::Boolean(trigger_ctx.is_reply),
+    )
+    .map_err(|e| WorkflowError::ConditionError(e.to_string()))?;
+
     for (step_id, output) in step_outputs {
         if let JsonValue::Object(map) = output {
             for (field, val) in map {
@@ -403,9 +416,14 @@ pub fn resolve_step_templates(
     };
 
     match &step.action {
-        SendMessage { text, channel } => Ok(SendMessage {
+        SendMessage {
+            text,
+            channel,
+            reply_in_thread,
+        } => Ok(SendMessage {
             text: t(text)?,
             channel: t_opt(channel)?,
+            reply_in_thread: *reply_in_thread,
         }),
         SendDm { to, text } => Ok(SendDm {
             to: t(to)?,
@@ -546,7 +564,11 @@ pub async fn dispatch_action(
     let result = serving_write
         .protect(async {
             match action {
-                SendMessage { text, channel } => {
+                SendMessage {
+                    text,
+                    channel,
+                    reply_in_thread,
+                } => {
                     // Look up workflow metadata for destination validation and
                     // attribution, scoped to the run's community — the same run/workflow
                     // UUID may exist in another community, so a bare-id lookup could
@@ -577,16 +599,38 @@ pub async fn dispatch_action(
                     )?;
                     let owner_pubkey_hex = hex::encode(&workflow.owner_pubkey);
 
+                    // Thread the reply onto the triggering message when requested.
+                    // The trigger must carry the event to reply to; schema
+                    // validation already forbids `reply_in_thread` on triggers
+                    // that have no message, so an empty id here is a real fault.
+                    let reply_to = if *reply_in_thread {
+                        if trigger_ctx.message_id.is_empty() {
+                            return Err(WorkflowError::InvalidDefinition(
+                                "SendMessage: reply_in_thread is set but the trigger has no message_id to reply to".into(),
+                            ));
+                        }
+                        Some(trigger_ctx.message_id.as_str())
+                    } else {
+                        None
+                    };
+
                     info!(
                         run_id = %run_id,
                         step = step_id,
                         channel = %channel_id,
+                        reply_in_thread = *reply_in_thread,
                         "SendMessage → {channel_id}: {text}"
                     );
 
                     let event_id = engine
                         .action_sink()?
-                        .send_message(community_id, &channel_id, text, &owner_pubkey_hex)
+                        .send_message(
+                            community_id,
+                            &channel_id,
+                            text,
+                            &owner_pubkey_hex,
+                            reply_to,
+                        )
                         .await
                         .map_err(WorkflowError::from)?;
 
@@ -1266,6 +1310,7 @@ mod tests {
             timestamp: "1700000000".to_owned(),
             emoji: "fire".to_owned(),
             message_id: "event-id-hex".to_owned(),
+            is_reply: false,
             webhook_fields: HashMap::new(),
         }
     }
@@ -1385,6 +1430,56 @@ mod tests {
         assert!(!result);
     }
 
+    #[tokio::test]
+    async fn condition_trigger_is_reply_selects_top_level_only() {
+        // The top-level-only filter from the feature's use case.
+        let mut ctx = make_trigger();
+
+        ctx.is_reply = false;
+        assert!(
+            evaluate_condition("trigger_is_reply == false", &ctx, &HashMap::new())
+                .await
+                .unwrap(),
+            "top-level message should pass the filter"
+        );
+
+        ctx.is_reply = true;
+        assert!(
+            !evaluate_condition("trigger_is_reply == false", &ctx, &HashMap::new())
+                .await
+                .unwrap(),
+            "threaded reply should be filtered out"
+        );
+    }
+
+    #[test]
+    fn resolve_step_templates_carries_reply_in_thread() {
+        let ctx = make_trigger();
+        let step = Step {
+            id: "reply".to_owned(),
+            name: None,
+            if_expr: None,
+            timeout_secs: None,
+            action: ActionDef::SendMessage {
+                text: "hi {{trigger.author}}".to_owned(),
+                channel: None,
+                reply_in_thread: true,
+            },
+        };
+        let resolved = resolve_step_templates(&step, &ctx, &HashMap::new()).unwrap();
+        match resolved {
+            ActionDef::SendMessage {
+                text,
+                reply_in_thread,
+                ..
+            } => {
+                assert_eq!(text, "hi abc123def456");
+                assert!(reply_in_thread, "reply_in_thread must survive resolution");
+            }
+            other => panic!("unexpected action: {other:?}"),
+        }
+    }
+
     #[tokio::test]
     async fn condition_or_expression() {
         let ctx = make_trigger(); // text contains "P1"
diff --git a/crates/buzz-workflow/src/lib.rs b/crates/buzz-workflow/src/lib.rs
index 5c17b34e10..bceb6d8bd8 100644
--- a/crates/buzz-workflow/src/lib.rs
+++ b/crates/buzz-workflow/src/lib.rs
@@ -997,10 +997,24 @@ pub fn build_trigger_context(event: &buzz_core::StoredEvent) -> executor::Trigge
         timestamp: event.event.created_at.as_secs().to_string(),
         emoji,
         message_id,
+        is_reply: event_is_reply(&event.event),
         webhook_fields: HashMap::new(),
     }
 }
 
+/// True when an event is a threaded reply — it carries a valid NIP-10 `reply`
+/// marker. Delegates to the shared [`buzz_core::nip10`] parser so this stays in
+/// lockstep with ingest's `resolve_nip10_thread_meta`: a `root` marker alone is
+/// top-level, and a marker with a malformed (non-64-hex) event id is ignored by
+/// ingest, so it must not flip `trigger_is_reply` either — else a
+/// `trigger_is_reply == false` workflow would skip a message ingest stored as a
+/// new top-level post.
+fn event_is_reply(event: &nostr::Event) -> bool {
+    buzz_core::nip10::parse_thread_markers(&event.tags)
+        .reply
+        .is_some()
+}
+
 /// Pure authority decision for [`WorkflowEngine::check_owner_authority`].
 ///
 /// `role` is the owner's *current* active role in the workflow's channel
@@ -1588,6 +1602,144 @@ steps:
         // Non-reaction events have empty emoji.
         assert_eq!(ctx.emoji, "");
         assert!(ctx.webhook_fields.is_empty());
+        // A top-level message (no e-tags) is not a reply.
+        assert!(!ctx.is_reply);
+    }
+
+    #[test]
+    fn build_trigger_context_is_reply_true_for_threaded_message() {
+        use nostr::{EventBuilder, Keys, Kind, Tag};
+        use uuid::Uuid;
+        let root = Keys::generate();
+        let root_event = EventBuilder::new(Kind::Custom(9), "root")
+            .tags([])
+            .sign_with_keys(&root)
+            .expect("sign root");
+        let root_hex = root_event.id.to_hex();
+
+        let keys = Keys::generate();
+        let event = EventBuilder::new(Kind::Custom(9), "a threaded reply")
+            .tags([
+                Tag::parse(["e", &root_hex, "", "root"]).expect("root tag"),
+                Tag::parse(["e", &root_hex, "", "reply"]).expect("reply tag"),
+            ])
+            .sign_with_keys(&keys)
+            .expect("sign");
+        let stored = buzz_core::StoredEvent::new(event, Some(Uuid::new_v4()));
+        let ctx = build_trigger_context(&stored);
+        assert!(ctx.is_reply, "message with reply/root e-tags is a reply");
+    }
+
+    #[test]
+    fn build_trigger_context_is_reply_true_for_reply_only_marker() {
+        // A NIP-10 `reply` marker without a `root` marker (the fallback ingest
+        // treats as `root == reply`) is still a threaded reply.
+        use nostr::{EventBuilder, Keys, Kind, Tag};
+        use uuid::Uuid;
+        let parent = Keys::generate();
+        let parent_event = EventBuilder::new(Kind::Custom(9), "parent")
+            .sign_with_keys(&parent)
+            .expect("sign parent");
+        let keys = Keys::generate();
+        let event = EventBuilder::new(Kind::Custom(9), "reply only")
+            .tags([Tag::parse(["e", &parent_event.id.to_hex(), "", "reply"]).expect("reply tag")])
+            .sign_with_keys(&keys)
+            .expect("sign");
+        let stored = buzz_core::StoredEvent::new(event, Some(Uuid::new_v4()));
+        let ctx = build_trigger_context(&stored);
+        assert!(ctx.is_reply, "a lone `reply` marker is a reply");
+    }
+
+    #[test]
+    fn build_trigger_context_is_reply_false_for_root_only_marker() {
+        // Ingest treats `(root=Some, reply=None)` as top-level, so
+        // `event_is_reply` must too — otherwise `trigger_is_reply == false`
+        // would skip a message the relay stored as a new top-level post.
+        use nostr::{EventBuilder, Keys, Kind, Tag};
+        use uuid::Uuid;
+        let root = Keys::generate();
+        let root_event = EventBuilder::new(Kind::Custom(9), "root")
+            .sign_with_keys(&root)
+            .expect("sign root");
+        let keys = Keys::generate();
+        let event = EventBuilder::new(Kind::Custom(9), "root marker only")
+            .tags([Tag::parse(["e", &root_event.id.to_hex(), "", "root"]).expect("root tag")])
+            .sign_with_keys(&keys)
+            .expect("sign");
+        let stored = buzz_core::StoredEvent::new(event, Some(Uuid::new_v4()));
+        let ctx = build_trigger_context(&stored);
+        assert!(
+            !ctx.is_reply,
+            "a lone `root` marker is top-level to ingest, not a reply"
+        );
+    }
+
+    #[test]
+    fn build_trigger_context_is_reply_false_for_unmarked_e_tag() {
+        // A bare `e` tag with no NIP-10 marker (e.g. a plain mention/quote) is
+        // not treated as a thread reply — only `reply`/`root` markers count.
+        use nostr::{EventBuilder, Keys, Kind, Tag};
+        use uuid::Uuid;
+        let other = Keys::generate();
+        let other_event = EventBuilder::new(Kind::Custom(9), "other")
+            .tags([])
+            .sign_with_keys(&other)
+            .expect("sign");
+        let keys = Keys::generate();
+        let event = EventBuilder::new(Kind::Custom(9), "quotes another")
+            .tags([Tag::parse(["e", &other_event.id.to_hex()]).expect("bare e tag")])
+            .sign_with_keys(&keys)
+            .expect("sign");
+        let stored = buzz_core::StoredEvent::new(event, Some(Uuid::new_v4()));
+        let ctx = build_trigger_context(&stored);
+        assert!(!ctx.is_reply, "unmarked e-tag must not count as a reply");
+    }
+
+    #[test]
+    fn build_trigger_context_is_reply_false_for_malformed_reply_id() {
+        // Ingest gates a marker on a valid 64-hex event id; a malformed reply
+        // id is not a thread link, so ingest stores the event top-level. The
+        // predicate must agree, or `trigger_is_reply == false` would skip it.
+        use nostr::{EventBuilder, Keys, Kind, Tag};
+        use uuid::Uuid;
+        let keys = Keys::generate();
+        let event = EventBuilder::new(Kind::Custom(9), "malformed reply marker")
+            .tags([Tag::parse(["e", "bad", "", "reply"]).expect("reply tag")])
+            .sign_with_keys(&keys)
+            .expect("sign");
+        let stored = buzz_core::StoredEvent::new(event, Some(Uuid::new_v4()));
+        let ctx = build_trigger_context(&stored);
+        assert!(
+            !ctx.is_reply,
+            "a malformed reply id is ignored by ingest, so it is top-level"
+        );
+    }
+
+    #[test]
+    fn build_trigger_context_is_reply_false_for_valid_root_malformed_reply() {
+        // A valid `root` marker but a malformed `reply` id: ingest ignores the
+        // reply and stores the event as root-only, i.e. top-level. The predicate
+        // must not flip to reply on the malformed marker.
+        use nostr::{EventBuilder, Keys, Kind, Tag};
+        use uuid::Uuid;
+        let root = Keys::generate();
+        let root_event = EventBuilder::new(Kind::Custom(9), "root")
+            .sign_with_keys(&root)
+            .expect("sign root");
+        let keys = Keys::generate();
+        let event = EventBuilder::new(Kind::Custom(9), "valid root, malformed reply")
+            .tags([
+                Tag::parse(["e", &root_event.id.to_hex(), "", "root"]).expect("root tag"),
+                Tag::parse(["e", "bad", "", "reply"]).expect("reply tag"),
+            ])
+            .sign_with_keys(&keys)
+            .expect("sign");
+        let stored = buzz_core::StoredEvent::new(event, Some(Uuid::new_v4()));
+        let ctx = build_trigger_context(&stored);
+        assert!(
+            !ctx.is_reply,
+            "a valid root with a malformed reply id is top-level to ingest"
+        );
     }
 
     #[test]
diff --git a/crates/buzz-workflow/src/schema.rs b/crates/buzz-workflow/src/schema.rs
index afee730d60..0e8dfdb52e 100644
--- a/crates/buzz-workflow/src/schema.rs
+++ b/crates/buzz-workflow/src/schema.rs
@@ -100,6 +100,11 @@ pub enum ActionDef {
         /// Optional channel UUID override. Must be a valid UUID string.
         #[serde(default)]
         channel: Option<String>,
+        /// Reply to the triggering message in its thread instead of posting a
+        /// new top-level message. Only valid for message-based triggers, which
+        /// carry a triggering event to reply to.
+        #[serde(default)]
+        reply_in_thread: bool,
     },
     /// Send a direct message to a user.
     SendDm {
@@ -208,6 +213,34 @@ impl WorkflowDef {
             }
         }
 
+        // `reply_in_thread` requires a triggering message to reply to. Schedule
+        // and webhook triggers have none, so reject the combination at
+        // definition time rather than failing silently at run time.
+        let trigger_has_message = matches!(
+            self.trigger,
+            TriggerDef::MessagePosted { .. }
+                | TriggerDef::ReactionAdded { .. }
+                | TriggerDef::DiffPosted { .. }
+        );
+        if !trigger_has_message {
+            for step in &self.steps {
+                if matches!(
+                    step.action,
+                    ActionDef::SendMessage {
+                        reply_in_thread: true,
+                        ..
+                    }
+                ) {
+                    return Err(WorkflowError::InvalidDefinition(format!(
+                        "step '{}': reply_in_thread requires a message-based trigger \
+                         (message_posted, reaction_added, or diff_posted); \
+                         schedule and webhook triggers have no message to reply to",
+                        step.id
+                    )));
+                }
+            }
+        }
+
         if let TriggerDef::Schedule { cron, interval } = &self.trigger {
             if cron.is_none() && interval.is_none() {
                 return Err(WorkflowError::InvalidDefinition(
@@ -458,6 +491,78 @@ mod tests {
         assert!(matches!(err, WorkflowError::InvalidDefinition(_)));
     }
 
+    #[test]
+    fn reply_in_thread_defaults_false_and_round_trips() {
+        // Absent field defaults to false.
+        let yaml = "name: Auto Reply\ntrigger:\n  on: message_posted\nsteps:\n  - id: s1\n    action: send_message\n    text: hi\n";
+        let (def, _) = parse_yaml(yaml).expect("parse failed");
+        match &def.steps[0].action {
+            ActionDef::SendMessage {
+                reply_in_thread, ..
+            } => assert!(!reply_in_thread, "should default to false"),
+            other => panic!("unexpected action: {other:?}"),
+        }
+
+        // Explicit true parses, and survives a JSON round-trip.
+        let yaml = "name: Auto Reply\ntrigger:\n  on: message_posted\nsteps:\n  - id: s1\n    action: send_message\n    text: hi\n    reply_in_thread: true\n";
+        let (def, _) = parse_yaml(yaml).expect("parse failed");
+        match &def.steps[0].action {
+            ActionDef::SendMessage {
+                reply_in_thread, ..
+            } => assert!(reply_in_thread),
+            other => panic!("unexpected action: {other:?}"),
+        }
+        let json = serde_json::to_string(&def).expect("serialize");
+        let reparsed: WorkflowDef = serde_json::from_str(&json).expect("json round-trip");
+        assert!(matches!(
+            &reparsed.steps[0].action,
+            ActionDef::SendMessage {
+                reply_in_thread: true,
+                ..
+            }
+        ));
+    }
+
+    #[test]
+    fn validate_accepts_reply_in_thread_on_message_triggers() {
+        for on in ["message_posted", "reaction_added", "diff_posted"] {
+            let yaml = format!(
+                "name: Auto Reply\ntrigger:\n  on: {on}\nsteps:\n  - id: s1\n    action: send_message\n    text: hi\n    reply_in_thread: true\n"
+            );
+            parse_yaml(&yaml)
+                .unwrap_or_else(|e| panic!("reply_in_thread should be valid on {on}: {e}"));
+        }
+    }
+
+    #[test]
+    fn validate_rejects_reply_in_thread_on_schedule_trigger() {
+        let yaml = "name: Bad\ntrigger:\n  on: schedule\n  cron: '0 9 * * 1-5'\nsteps:\n  - id: s1\n    action: send_message\n    text: hi\n    reply_in_thread: true\n";
+        let err = parse_yaml(yaml).unwrap_err();
+        match &err {
+            WorkflowError::InvalidDefinition(msg) => {
+                assert!(
+                    msg.contains("reply_in_thread"),
+                    "expected reply_in_thread in: {msg}"
+                );
+            }
+            other => panic!("expected InvalidDefinition, got: {other}"),
+        }
+    }
+
+    #[test]
+    fn validate_rejects_reply_in_thread_on_webhook_trigger() {
+        let yaml = "name: Bad\ntrigger:\n  on: webhook\nsteps:\n  - id: s1\n    action: send_message\n    text: hi\n    channel: 00000000-0000-0000-0000-000000000000\n    reply_in_thread: true\n";
+        let err = parse_yaml(yaml).unwrap_err();
+        assert!(matches!(err, WorkflowError::InvalidDefinition(_)));
+    }
+
+    #[test]
+    fn validate_allows_reply_in_thread_false_on_schedule() {
+        // Explicit `false` on a schedule trigger is fine — no message needed.
+        let yaml = "name: OK\ntrigger:\n  on: schedule\n  cron: '0 9 * * 1-5'\nsteps:\n  - id: s1\n    action: send_message\n    text: hi\n    reply_in_thread: false\n";
+        parse_yaml(yaml).expect("reply_in_thread: false on schedule should be valid");
+    }
+
     #[test]
     fn enabled_defaults_to_true() {
         let yaml = "name: Test\ntrigger:\n  on: webhook\nsteps:\n  - id: s1\n    action: delay\n    duration: 1m\n";
diff --git a/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx b/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx
index bf96ddfd74..9a525591eb 100644
--- a/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx
+++ b/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx
@@ -39,6 +39,7 @@ import {
   formStateToYaml,
   nextStepId,
   supportsMessageTextCondition,
+  withTriggerType,
   yamlToFormState,
 } from "./workflowFormTypes";
 import { defaultScheduleTrigger } from "./workflowSchedule";
@@ -744,23 +745,27 @@ export const WorkflowFormBuilder = React.forwardRef<
                                 ariaLabel="Trigger event"
                                 disabled={disabled}
                                 labels={TRIGGER_LABELS}
-                                onChange={(triggerType) =>
+                                onChange={(triggerType) => {
+                                  const next = withTriggerType(
+                                    formState,
+                                    triggerType,
+                                  );
                                   updateFormState({
-                                    ...formState,
+                                    ...next,
                                     steps: supportsMessageTextCondition(
                                       triggerType,
                                     )
-                                      ? formState.steps
-                                      : formState.steps.map((step) => ({
+                                      ? next.steps
+                                      : next.steps.map((step) => ({
                                           ...step,
                                           condition: undefined,
                                         })),
                                     trigger:
                                       triggerType === "schedule"
                                         ? defaultScheduleTrigger()
-                                        : { on: triggerType },
-                                  })
-                                }
+                                        : next.trigger,
+                                  });
+                                }}
                                 options={SELECTABLE_TRIGGER_TYPES}
                                 value={formState.trigger.on}
                               />
diff --git a/desktop/src/features/workflows/ui/WorkflowStepCard.tsx b/desktop/src/features/workflows/ui/WorkflowStepCard.tsx
index d6b55b210f..20c6d4dad3 100644
--- a/desktop/src/features/workflows/ui/WorkflowStepCard.tsx
+++ b/desktop/src/features/workflows/ui/WorkflowStepCard.tsx
@@ -3,6 +3,7 @@ import { type ReactNode, useState } from "react";
 
 import { cn } from "@/shared/lib/cn";
 import { Button } from "@/shared/ui/button";
+import { Checkbox } from "@/shared/ui/checkbox";
 import { Input } from "@/shared/ui/input";
 import { Textarea } from "@/shared/ui/textarea";
 import { WorkflowDurationField } from "./WorkflowDurationField";
@@ -10,6 +11,7 @@ import { WorkflowMessageTextCondition } from "./WorkflowMessageTextConditionEdit
 import { FieldLabel, FormSelect } from "./workflowFormPrimitives";
 import { WorkflowWebhookHeadersEditor } from "./WorkflowWebhookHeadersEditor";
 import {
+  isThreadReplyEligibleTrigger,
   supportsMessageTextCondition,
   type StepFormState,
   type TriggerType,
@@ -183,6 +185,21 @@ function StepConfigFields({
               ) : null}
             </div>
           )}
+          {isThreadReplyEligibleTrigger(triggerType) ? (
+            <div className="flex items-center gap-2">
+              <Checkbox
+                checked={step.replyInThread === true}
+                disabled={disabled}
+                id={`${prefix}-reply-in-thread`}
+                onCheckedChange={(checked) =>
+                  onUpdate({ ...step, replyInThread: checked === true })
+                }
+              />
+              <label className="text-xs" htmlFor={`${prefix}-reply-in-thread`}>
+                Reply to triggering message in thread
+              </label>
+            </div>
+          ) : null}
         </div>
       );
     case "send_dm":
diff --git a/desktop/src/features/workflows/ui/workflowFormTypes.test.mjs b/desktop/src/features/workflows/ui/workflowFormTypes.test.mjs
index 2615d09681..958b276420 100644
--- a/desktop/src/features/workflows/ui/workflowFormTypes.test.mjs
+++ b/desktop/src/features/workflows/ui/workflowFormTypes.test.mjs
@@ -4,8 +4,11 @@ import { parse as parseYaml } from "yaml";
 
 import {
   formStateToYaml,
+  isThreadReplyEligibleTrigger,
   supportsMessageTextCondition,
+  withTriggerType,
   yamlToFormState,
+  DEFAULT_FORM_STATE,
 } from "./workflowFormTypes.ts";
 
 function accepted(yaml) {
@@ -25,6 +28,22 @@ function normalizeBackendDefaults(value) {
   return copy;
 }
 
+function sendMessageState(overrides) {
+  return {
+    ...DEFAULT_FORM_STATE,
+    name: "Auto Reply",
+    trigger: { on: "message_posted", filter: "trigger_is_reply == false" },
+    steps: [
+      {
+        id: "step_1",
+        action: "send_message",
+        text: "pre-written reply",
+        ...overrides,
+      },
+    ],
+  };
+}
+
 test("message-text conditions are limited to message-bearing triggers", () => {
   assert.equal(supportsMessageTextCondition("message_posted"), true);
   assert.equal(supportsMessageTextCondition("diff_posted"), true);
@@ -196,3 +215,103 @@ test("values the Form serializer would normalize are refused", () => {
 
   for (const yaml of fixtures) assert.equal(yamlToFormState(yaml).ok, false);
 });
+
+test("reply_in_thread is emitted only when the checkbox is on", () => {
+  const withReply = formStateToYaml(sendMessageState({ replyInThread: true }));
+  assert.match(withReply, /reply_in_thread: true/);
+
+  const withoutReply = formStateToYaml(
+    sendMessageState({ replyInThread: false }),
+  );
+  assert.doesNotMatch(withoutReply, /reply_in_thread/);
+
+  const unset = formStateToYaml(sendMessageState({}));
+  assert.doesNotMatch(unset, /reply_in_thread/);
+});
+
+test("switching from Message Posted clears reply_in_thread before save", () => {
+  const messagePosted = sendMessageState({ replyInThread: true });
+
+  for (const triggerType of ["schedule", "webhook"]) {
+    const switched = withTriggerType(messagePosted, triggerType);
+    assert.equal(switched.trigger.on, triggerType);
+    assert.equal(switched.steps[0].replyInThread, false);
+    assert.doesNotMatch(formStateToYaml(switched), /reply_in_thread/);
+  }
+});
+
+test("an ineligible trigger cannot resurrect reply_in_thread through an action change", () => {
+  // Full repro: Message Posted → Send Message → enable Reply → switch action to
+  // Delay → switch trigger to an ineligible one → switch action back to Send
+  // Message. The action picker changes only `action` (a plain spread, mirrored
+  // here), so `withTriggerType` must clear the hidden flag on every step, not
+  // just the ones whose current action is send_message.
+  for (const triggerType of ["schedule", "webhook"]) {
+    const enabled = sendMessageState({ replyInThread: true });
+    const asDelay = {
+      ...enabled,
+      steps: [{ ...enabled.steps[0], action: "delay", duration: "5m" }],
+    };
+    const switched = withTriggerType(asDelay, triggerType);
+    const backToSend = {
+      ...switched,
+      steps: [{ ...switched.steps[0], action: "send_message" }],
+    };
+
+    assert.equal(backToSend.steps[0].replyInThread, false, triggerType);
+    assert.doesNotMatch(formStateToYaml(backToSend), /reply_in_thread/);
+  }
+});
+
+test("invalid reply_in_thread values are refused rather than normalized", () => {
+  const original = (yaml) => {
+    const result = yamlToFormState(yaml);
+    assert.equal(result.ok, false);
+    assert.match(result.error, /YAML editor/);
+    return result;
+  };
+
+  // Non-boolean would be silently deleted on serialization.
+  const nonBoolean = `name: Coerced\ntrigger: { on: message_posted }\nsteps: [{ id: s1, action: send_message, text: hi, reply_in_thread: "yes" }]\n`;
+  assert.match(original(nonBoolean).error, /reply_in_thread must be a boolean/);
+
+  // true under an ineligible trigger would round-trip a backend-invalid definition.
+  for (const trigger of ["schedule, cron: '0 9 * * *'", "webhook"]) {
+    const yaml = `name: Ineligible\ntrigger: { on: ${trigger} }\nsteps: [{ id: s1, action: send_message, text: hi, reply_in_thread: true }]\n`;
+    assert.match(
+      original(yaml).error,
+      /reply_in_thread is not supported for (schedule|webhook) triggers/,
+    );
+  }
+});
+
+test("reply_in_thread eligibility follows trigger capability", () => {
+  assert.equal(isThreadReplyEligibleTrigger("message_posted"), true);
+  assert.equal(isThreadReplyEligibleTrigger("schedule"), false);
+  assert.equal(isThreadReplyEligibleTrigger("webhook"), false);
+});
+test("reply_in_thread round-trips YAML -> form -> YAML", () => {
+  const yaml = formStateToYaml(sendMessageState({ replyInThread: true }));
+  const parsed = yamlToFormState(yaml);
+  assert.equal(parsed.ok, true);
+  assert.equal(parsed.state.steps[0].replyInThread, true);
+
+  const reserialized = formStateToYaml(parsed.state);
+  assert.match(reserialized, /reply_in_thread: true/);
+});
+
+test("absent reply_in_thread parses as false", () => {
+  const yaml = [
+    "name: No Reply",
+    "trigger:",
+    "  on: message_posted",
+    "steps:",
+    "  - id: step_1",
+    "    action: send_message",
+    "    text: hi",
+    "",
+  ].join("\n");
+  const parsed = yamlToFormState(yaml);
+  assert.equal(parsed.ok, true);
+  assert.equal(parsed.state.steps[0].replyInThread, false);
+});
diff --git a/desktop/src/features/workflows/ui/workflowFormTypes.ts b/desktop/src/features/workflows/ui/workflowFormTypes.ts
index 2feae37ac8..345f7c7134 100644
--- a/desktop/src/features/workflows/ui/workflowFormTypes.ts
+++ b/desktop/src/features/workflows/ui/workflowFormTypes.ts
@@ -69,6 +69,7 @@ export type StepFormState = {
   duration?: string;
   text?: string;
   channel?: string;
+  replyInThread?: boolean;
   to?: string;
   url?: string;
   method?: string;
@@ -165,6 +166,7 @@ function actionFieldsForStep(step: StepFormState): Record<string, unknown> {
     case "send_message":
       if (step.text) fields.text = step.text;
       if (step.channel) fields.channel = step.channel;
+      if (step.replyInThread) fields.reply_in_thread = true;
       break;
     case "send_dm":
       if (step.to) fields.to = step.to;
@@ -194,6 +196,28 @@ function actionFieldsForStep(step: StepFormState): Record<string, unknown> {
   return fields;
 }
 
+export function isThreadReplyEligibleTrigger(trigger: TriggerType): boolean {
+  return trigger !== "webhook" && trigger !== "schedule";
+}
+
+export function withTriggerType(
+  state: WorkflowFormState,
+  triggerType: TriggerType,
+): WorkflowFormState {
+  return {
+    ...state,
+    trigger: { on: triggerType },
+    // Clear threaded-reply state on every step, not just send_message ones:
+    // a hidden `replyInThread` on a step whose action was changed away from
+    // send_message would otherwise resurrect when the action is switched back.
+    steps: isThreadReplyEligibleTrigger(triggerType)
+      ? state.steps
+      : state.steps.map((step) =>
+          step.replyInThread ? { ...step, replyInThread: false } : step,
+        ),
+  };
+}
+
 export function formStateToYaml(state: WorkflowFormState): string {
   const trigger: Record<string, unknown> = { on: state.trigger.on };
   if (
@@ -268,7 +292,12 @@ const TRIGGER_KEYS: Record<TriggerType, ReadonlySet<string>> = {
 const COMMON_STEP_KEYS = ["id", "name", "action", "if", "timeout_secs"];
 const ACTION_STEP_KEYS: Record<ActionType, ReadonlySet<string>> = {
   delay: new Set([...COMMON_STEP_KEYS, "duration"]),
-  send_message: new Set([...COMMON_STEP_KEYS, "text", "channel"]),
+  send_message: new Set([
+    ...COMMON_STEP_KEYS,
+    "text",
+    "channel",
+    "reply_in_thread",
+  ]),
   send_dm: new Set([...COMMON_STEP_KEYS, "to", "text"]),
   call_webhook: new Set([
     ...COMMON_STEP_KEYS,
@@ -568,6 +597,21 @@ export function yamlToFormState(
         }
       }
 
+      if (step.reply_in_thread !== undefined) {
+        if (typeof step.reply_in_thread !== "boolean") {
+          return {
+            ok: false,
+            error: `Step ${number} reply_in_thread must be a boolean — use the YAML editor`,
+          };
+        }
+        if (step.reply_in_thread && !isThreadReplyEligibleTrigger(triggerOn)) {
+          return {
+            ok: false,
+            error: `reply_in_thread is not supported for ${triggerOn} triggers — use the YAML editor`,
+          };
+        }
+      }
+
       steps.push({
         id: step.id,
         name: step.name as string | undefined,
@@ -579,6 +623,7 @@ export function yamlToFormState(
         duration: step.duration as string | undefined,
         text: step.text as string | undefined,
         channel: step.channel as string | undefined,
+        replyInThread: step.reply_in_thread === true,
         to: step.to as string | undefined,
         url: step.url as string | undefined,
         method: step.method as string | undefined,

From de8a2741c7598c27e0d27cd4562d76b947934e2f Mon Sep 17 00:00:00 2001
From: Taylor Ho <taylorkmho@gmail.com>
Date: Thu, 20 Aug 2026 19:01:18 -0700
Subject: [PATCH 06/38] feat(desktop-messages): show compact Buzz link metadata
 (#6252)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Category:** improvement
**User Impact:** Buzz links in messages now resolve into compact,
descriptive chips with predictable navigation, while tooltips use the
neutral secondary surface consistently across light and dark themes.

**Problem:** Raw Buzz-native links and opaque identifiers make message
context difficult to scan, while oversized previews disrupt the
conversation. Missing, delayed, or deleted metadata also needs a stable
presentation that does not mislead users or break navigation.

**Solution:** Keep message and issue chips metadata-independent: message
chips render only the channel name, while issue chips render only the
repository name—never fetched content/title or an event hash. Fetched
context remains available in each hover tooltip. Other native links
continue to resolve into concise inline labels, with muted secondary
fallbacks, distinct deleted states, and existing navigation paths
preserved. This also makes two explicit shared-tooltip behavior changes:

1. **Color:** shared and rich tooltips move from the primary color pair
to the neutral secondary semantic pair, including dedicated huddle-token
handling and matching rich-descendant foregrounds.
2. **Hover behavior:** tooltip roots set Radix
`disableHoverableContent`, and tooltip content is pointer-transparent,
so moving off the trigger dismisses the tooltip instead of letting the
pointer enter and keep the popover open.

Together these preserve readable contrast, authoritative project
context, and predictable hover dismissal.

<details>
<summary>File changes</summary>

**desktop/src/features/communities/useCommunityInit.ts**
Primes channel metadata needed to resolve native links promptly.

**desktop/src/features/messages/lib/messageLinkMetadata.test.mjs**
Covers message preview extraction, fallbacks, and deleted-message
semantics.

**desktop/src/features/messages/lib/messageLinkMetadata.ts**
Normalizes fetched message metadata into compact labels and status-aware
presentation.

**desktop/src/features/messages/ui/SentFromThreadLine.tsx**
Provides thread context to linked-message metadata resolution.

**desktop/src/shared/lib/useResolvedLinkPreviews.ts**
Exposes resolved preview state for native entity chips.

**desktop/src/shared/styles/globals/markdown.css**
Adds compact chip layout and semantic disabled-state styling.

**desktop/src/shared/styles/globals/theme.css**
Defines the semantic colors used by unavailable and deleted chips.

**desktop/src/shared/ui/markdown.test.mjs**
Exercises native-link rendering and provider-backed entity metadata
behavior.

**desktop/src/shared/ui/markdown.tsx**
Routes native markdown links through metadata-aware chip components
without changing navigation contracts.

**desktop/src/shared/ui/markdown/ChannelDeepLink.test.mjs**
Covers resolved, unresolved, private, archived, and forum channel
presentations.

**desktop/src/shared/ui/markdown/ChannelDeepLink.tsx**
Renders channel names and concise channel metadata inline with stable
fallbacks.

**desktop/src/shared/ui/markdown/MessageLinkPill.tsx**
Renders loading, ready, unavailable, DM, forum, and deleted message
states compactly.

**desktop/src/shared/ui/markdown/entityLinks.tsx**
Enriches repository, issue, and pull-request chips and uses
containing-project context in tooltips.

**desktop/src/shared/ui/markdown/types.ts**
Extends markdown runtime metadata required by native chip rendering.

**desktop/src/shared/ui/markdown/useMessageLinkMetadata.ts**
Fetches and classifies linked-message metadata while preserving
navigable fallbacks.

**desktop/src/testing/e2eBridge.ts**
Adds deterministic metadata controls for runtime visual and navigation
tests.

**desktop/tailwind.config.js**
Makes semantic disabled colors available to chip styles.

**desktop/tests/e2e/entity-link-recipient-cards.spec.ts**
Verifies entity labels, project-aware tooltips, delayed metadata, and
navigation behavior.

**desktop/tests/e2e/navigation.spec.ts**
Verifies channel and message chip states, metadata resolution, deletion
handling, and navigation.

**desktop/src/shared/ui/tooltip.tsx**
Migrates the shared tooltip surface from the primary color pair to the
semantic secondary pair. It also sets Radix `disableHoverableContent`
and makes tooltip content pointer-transparent so leaving the trigger
dismisses the tooltip predictably.

**desktop/src/features/agents/ui/RestartDiffBadge.tsx**
Aligns restart-diff tooltip values and supporting copy with the
secondary tooltip foreground.

**desktop/src/features/channels/ui/AddChannelBotTeamsSection.tsx**
Aligns rich team tooltip descriptions, persona chips, avatars, and names
with secondary tooltip semantics.

**desktop/src/features/projects/ui/ProjectAuthorIdentity.tsx**
Uses the matching secondary tooltip foreground for project author
metadata.

**desktop/src/features/projects/ui/ProjectCards.tsx**
Aligns repository-unavailable tooltip descriptions with the secondary
tooltip foreground.

**desktop/src/shared/styles/globals/utilities.css**
Makes huddle tooltips consume their dedicated palette directly without
misleading primary or secondary aliases.

**desktop/src/shared/styles/globals/tooltipSemantics.test.mjs**
Pins direct huddle-token consumption and rejects semantic alias drift.

**desktop/tests/e2e/tooltip-semantics.spec.ts**
Verifies simple and rich tooltip surfaces and descendant tokens in Buzz
light and Catppuccin Mocha dark themes.

**desktop/playwright.config.ts**
Registers tooltip semantic coverage in the desktop smoke suite.

</details>

## Reproduction steps

1. Run the desktop app and open a message containing Buzz links for a
channel, message, repository, issue, and pull request.
2. Confirm message links show only the channel name and issue links show
only the repository name inline, with no fetched content/title or event
hash; confirm other native links remain compact rather than rendering
raw identifiers or expanded previews.
3. Hover the chips and confirm the neutral secondary tooltip adds
concise context without duplicating the visible label.
4. Open each chip and confirm it follows the same channel, message,
repository, issue, or pull-request navigation as before.
5. Inspect links while metadata is loading, unavailable, or definitively
deleted and confirm the fallback remains compact, legible, and navigable
where appropriate.
6. In Buzz light and Catppuccin Mocha dark themes, compare a simple
channel-members tooltip and the rich Add agents team tooltip; both
should use secondary semantics with readable nested content.
7. Move the pointer from a trigger toward its tooltip; confirm the
tooltip dismisses rather than remaining open as hoverable content.

## Screenshots

The matrix below covers both the default light theme and Catppuccin
Mocha with an orange accent. Message/issue-chip rows affected by the
stable-label pivot are temporarily omitted until they can be recaptured
from the real built UI; the prior images showed the obsolete expanding
inline label.

| State | Default light | Dark · orange accent |
|---|---|---|
| Public stream channel tooltip | ![Public stream channel tooltip —
default
light](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/light-default/01-public-stream-channel-tooltip.png)
| ![Public stream channel tooltip — dark orange
accent](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/dark-orange/01-public-stream-channel-tooltip.png)
|
| Private forum channel tooltip | ![Private forum channel tooltip —
default
light](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/light-default/02-private-forum-channel-tooltip.png)
| ![Private forum channel tooltip — dark orange
accent](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/dark-orange/02-private-forum-channel-tooltip.png)
|
| Public forum channel tooltip | ![Public forum channel tooltip —
default
light](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/light-default/03-forum-channel-tooltip.png)
| ![Public forum channel tooltip — dark orange
accent](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/dark-orange/03-forum-channel-tooltip.png)
|
| Channel references, including unresolved | ![Channel references,
including unresolved — default
light](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/light-default/04-unresolved-channel-reference.png)
| ![Channel references, including unresolved — dark orange
accent](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/dark-orange/04-unresolved-channel-reference.png)
|
| Unknown channel permalink | ![Unknown channel permalink — default
light](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/light-default/05-unknown-channel-permalink.png)
| ![Unknown channel permalink — dark orange
accent](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/dark-orange/05-unknown-channel-permalink.png)
|
| Archived channel tooltip | ![Archived channel tooltip — default
light](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/light-default/06-archived-channel-tooltip.png)
| ![Archived channel tooltip — dark orange
accent](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/dark-orange/06-archived-channel-tooltip.png)
|
| Repository entity | ![Repository entity — default
light](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/light-default/13-repository-entity.png)
| ![Repository entity — dark orange
accent](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/dark-orange/13-repository-entity.png)
|
| Pull request entity | ![Pull request entity — default
light](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/light-default/14-pull-request-entity.png)
| ![Pull request entity — dark orange
accent](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/chip-metadata/dark-orange/14-pull-request-entity.png)
|
| Entity metadata fallback | ![Corrected entity metadata fallback
tooltip — default
light](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/17-entity-metadata-fallback-corrected-light.png)
| ![Corrected entity metadata fallback tooltip — dark orange
accent](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6252/17-entity-metadata-fallback-corrected-dark-orange.png)
|



### Tooltip semantic surface spot check

| Buzz light | Catppuccin Mocha dark |
|---|---|
| ![Rich team tooltip on the secondary surface in Buzz
light](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6290/buzz-team-tooltip.png)
| ![Rich team tooltip on the secondary surface in Catppuccin Mocha
dark](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6290/catppuccin-mocha-team-tooltip.png)
|

---------

Signed-off-by: Taylor Ho <taylorkmho@gmail.com>
Co-authored-by: Carl <acda9e433d19dcd0e6b6840f7f4b98f3a56f1fab98049d444c087019e6d36560@buzz.block.builderlab.xyz>
---
 desktop/playwright.config.ts                  |   1 +
 .../features/agents/ui/RestartDiffBadge.tsx   |  10 +-
 .../channels/ui/AddChannelBotTeamsSection.tsx |  10 +-
 .../features/communities/useCommunityInit.ts  |   2 +
 .../lib/composerMessageLinkNode.test.mjs      |  15 +-
 .../messages/lib/composerMessageLinkNode.ts   |  12 +-
 .../messages/lib/messageLinkMetadata.test.mjs |  24 ++
 .../messages/lib/messageLinkMetadata.ts       |  29 ++
 .../messages/lib/remarkEntityLinks.test.mjs   |   1 +
 .../messages/lib/remarkEntityLinks.ts         |   4 +-
 .../messages/lib/useDraftRootStatus.ts        |  13 +-
 .../messages/ui/SentFromThreadLine.tsx        |   3 +
 .../onboarding/ui/RuntimeErrorTooltip.tsx     |   4 +-
 .../projects/ui/ProjectAuthorIdentity.tsx     |   2 +-
 .../src/features/projects/ui/ProjectCards.tsx |   2 +-
 desktop/src/shared/lib/eventLookupError.ts    |  11 +
 .../lib/useResolvedLinkPreviews.test.mjs      |   2 +-
 .../src/shared/lib/useResolvedLinkPreviews.ts |  55 +--
 .../src/shared/styles/globals/markdown.css    |  50 +++
 .../styles/globals/tooltipSemantics.test.mjs  |  27 ++
 .../src/shared/styles/globals/utilities.css   |  18 +-
 desktop/src/shared/ui/markdown.test.mjs       | 170 ++++++++-
 desktop/src/shared/ui/markdown.tsx            |  41 +-
 .../src/shared/ui/markdown/BuzzLinkChip.tsx   |  77 +++-
 .../ui/markdown/ChannelDeepLink.test.mjs      |  34 ++
 .../shared/ui/markdown/ChannelDeepLink.tsx    | 144 +++++--
 .../shared/ui/markdown/MessageLinkPill.tsx    | 165 +++++++-
 .../src/shared/ui/markdown/entityLinks.tsx    | 201 +++++++++-
 desktop/src/shared/ui/markdown/types.ts       |   1 +
 .../ui/markdown/useInlineTooltipPosition.ts   | 101 +++++
 .../ui/markdown/useMessageLinkMetadata.ts     | 125 ++++++
 desktop/src/shared/ui/mentionChip.ts          |  14 +
 desktop/src/shared/ui/tooltip.tsx             |  12 +-
 desktop/src/testing/e2eBridge.ts              |   8 +-
 .../e2e/entity-link-recipient-cards.spec.ts   | 361 +++++++++++++++++-
 desktop/tests/e2e/navigation.spec.ts          | 246 +++++++++++-
 .../e2e/onboarding-agent-defaults.spec.ts     |   8 +
 .../tests/e2e/project-issue-comments.spec.ts  |  14 +-
 desktop/tests/e2e/tooltip-semantics.spec.ts   | 160 ++++++++
 39 files changed, 1967 insertions(+), 210 deletions(-)
 create mode 100644 desktop/src/features/messages/lib/messageLinkMetadata.test.mjs
 create mode 100644 desktop/src/features/messages/lib/messageLinkMetadata.ts
 create mode 100644 desktop/src/shared/lib/eventLookupError.ts
 create mode 100644 desktop/src/shared/styles/globals/tooltipSemantics.test.mjs
 create mode 100644 desktop/src/shared/ui/markdown/ChannelDeepLink.test.mjs
 create mode 100644 desktop/src/shared/ui/markdown/useInlineTooltipPosition.ts
 create mode 100644 desktop/src/shared/ui/markdown/useMessageLinkMetadata.ts
 create mode 100644 desktop/tests/e2e/tooltip-semantics.spec.ts

diff --git a/desktop/playwright.config.ts b/desktop/playwright.config.ts
index b1a2d5623b..ff8a0e7703 100644
--- a/desktop/playwright.config.ts
+++ b/desktop/playwright.config.ts
@@ -21,6 +21,7 @@ export default defineConfig({
       testMatch: [
         "**/smoke.spec.ts",
         "**/sidebar-offcanvas-rail.spec.ts",
+        "**/tooltip-semantics.spec.ts",
         "**/search-scope-screenshots.spec.ts",
         "**/onboarding-docked-cta-screenshots.spec.ts",
         "**/identity-key-help.spec.ts",
diff --git a/desktop/src/features/agents/ui/RestartDiffBadge.tsx b/desktop/src/features/agents/ui/RestartDiffBadge.tsx
index 1bdb781226..e15a57fde4 100644
--- a/desktop/src/features/agents/ui/RestartDiffBadge.tsx
+++ b/desktop/src/features/agents/ui/RestartDiffBadge.tsx
@@ -88,8 +88,8 @@ function ChangeDescription({ change }: { change: RestartChange }) {
 const TOOLTIP_CAP = 6;
 
 /**
- * `tooltip` — renders inside the dark `bg-primary` tooltip; uses
- *   `text-primary-foreground` variants for contrast there.
+ * `tooltip` — renders inside the semantic secondary tooltip surface; uses
+ *   `text-secondary-foreground` variants for contrast there.
  * `inline`  — renders inside the amber Runtime banner or other light
  *   surfaces; inherits foreground from the container instead.
  */
@@ -107,10 +107,10 @@ function DiffList({
     cap !== undefined && entries.length > cap ? entries.length - cap : 0;
 
   const valueClass =
-    variant === "tooltip" ? "text-primary-foreground/80" : "text-foreground";
+    variant === "tooltip" ? "text-secondary-foreground/80" : "text-foreground";
   const overflowClass =
     variant === "tooltip"
-      ? "text-primary-foreground/60"
+      ? "text-secondary-foreground/60"
       : "text-muted-foreground";
 
   return (
@@ -180,7 +180,7 @@ export function RestartDiffBadge({
       <TooltipContent className="max-w-72 text-xs" side="bottom">
         <p className="mb-1.5 font-semibold">Config changed since last start:</p>
         <DiffList cap={TOOLTIP_CAP} entries={restartDiff} />
-        <p className="mt-1.5 text-primary-foreground/70">
+        <p className="mt-1.5 text-secondary-foreground/70">
           {autoRestartEnabled ? AUTO_RESTART_ON_BLURB : AUTO_RESTART_OFF_BLURB}
         </p>
       </TooltipContent>
diff --git a/desktop/src/features/channels/ui/AddChannelBotTeamsSection.tsx b/desktop/src/features/channels/ui/AddChannelBotTeamsSection.tsx
index 512ee6899f..326866cf63 100644
--- a/desktop/src/features/channels/ui/AddChannelBotTeamsSection.tsx
+++ b/desktop/src/features/channels/ui/AddChannelBotTeamsSection.tsx
@@ -143,7 +143,7 @@ export function AddChannelBotTeamsSection({
                   <div className="space-y-1.5">
                     <p className="font-medium">{team.name}</p>
                     {team.description ? (
-                      <p className="text-2xs text-primary-foreground/80">
+                      <p className="text-2xs text-secondary-foreground/80">
                         {team.description}
                       </p>
                     ) : null}
@@ -153,15 +153,17 @@ export function AddChannelBotTeamsSection({
                           inChannelPersonaIds?.has(persona.id) ?? false;
                         return (
                           <div
-                            className="flex items-center gap-1 rounded-full bg-primary-foreground/10 px-1.5 py-0.5"
+                            className="flex items-center gap-1 rounded-full bg-secondary-foreground/10 px-1.5 py-0.5"
+                            data-testid="team-tooltip-persona-chip"
                             key={persona.id}
                           >
                             <ProfileAvatar
                               avatarUrl={persona.avatarUrl}
-                              className="h-4 w-4 text-3xs bg-primary-foreground/20 text-primary-foreground"
+                              className="h-4 w-4 text-3xs bg-secondary-foreground/20 text-secondary-foreground"
                               label={persona.displayName}
+                              testId="team-tooltip-persona-avatar"
                             />
-                            <span className="text-2xs text-primary-foreground">
+                            <span className="text-2xs text-secondary-foreground">
                               {persona.displayName}
                             </span>
                             {personaInChannel ? (
diff --git a/desktop/src/features/communities/useCommunityInit.ts b/desktop/src/features/communities/useCommunityInit.ts
index e1cdee41a7..e792358713 100644
--- a/desktop/src/features/communities/useCommunityInit.ts
+++ b/desktop/src/features/communities/useCommunityInit.ts
@@ -34,6 +34,7 @@ import { resetAvatarPresentations } from "@/features/profile/avatarPresentationS
 import { resetAvatarProfileSync } from "@/features/profile/avatarProfileSync";
 import { resetSidebarRelayConnectionCardState } from "@/features/sidebar/ui/useSidebarRelayConnectionCard";
 import { clearMarkdownNodeCache } from "@/shared/ui/markdown/nodeCache";
+import { resetMessageLinkMetadataCache } from "@/shared/ui/markdown/useMessageLinkMetadata";
 import { resetVideoPlayerState } from "@/shared/ui/videoPlayerState";
 
 import {
@@ -77,6 +78,7 @@ async function resetCommunityState({
   resetLinkPreviewPreparations();
   clearSearchHitEventCache();
   clearMarkdownNodeCache();
+  resetMessageLinkMetadataCache();
 }
 
 type CommunityInitResult =
diff --git a/desktop/src/features/messages/lib/composerMessageLinkNode.test.mjs b/desktop/src/features/messages/lib/composerMessageLinkNode.test.mjs
index 5aee675592..3695275762 100644
--- a/desktop/src/features/messages/lib/composerMessageLinkNode.test.mjs
+++ b/desktop/src/features/messages/lib/composerMessageLinkNode.test.mjs
@@ -21,6 +21,8 @@ const OWNER = "a".repeat(64);
 const REPO_HREF = `buzz://repo?owner=${OWNER}&d=buzz-world`;
 const ISSUE_ID = "b".repeat(64);
 const ISSUE_HREF = `buzz://issue?id=${ISSUE_ID}&owner=${OWNER}&d=buzz-world`;
+const PR_ID = "c".repeat(64);
+const PR_HREF = `buzz://pr?id=${PR_ID}&owner=${OWNER}&d=buzz-world`;
 
 test("resolves a composer preview and canonicalizes the underlying href", () => {
   assert.deepEqual(
@@ -205,7 +207,9 @@ test("composer node uses the sent-message chip presentation", () => {
   assert.match(rendered[1].class, /inline-chip-with-icon/);
   assert.match(rendered[1].class, /inline-chip-icon-message/);
   assert.equal(rendered[1]["data-buzz-link"], "");
-  assert.equal(rendered[2], "general · root-eve");
+  // Channel label only — no event hash, so the chip does not change width when
+  // the draft is sent and the rendered chip resolves its metadata.
+  assert.equal(rendered[2], "general");
 });
 
 test("composer node renders channel and entity chip presentations", () => {
@@ -233,7 +237,14 @@ test("composer node renders channel and entity chip presentations", () => {
   const issue = render(ISSUE_HREF);
   assert.equal(issue[1]["data-buzz-link-kind"], "issue");
   assert.match(issue[1].class, /inline-chip-icon-issue/);
-  assert.equal(issue[2], "buzz-world · bbbbbbbb");
+  // Repository name only — the rendered chip never widens into the issue
+  // title, so the composer must not widen into the event hash either.
+  assert.equal(issue[2], "buzz-world");
+
+  const pullRequest = render(PR_HREF);
+  assert.equal(pullRequest[1]["data-buzz-link-kind"], "pr");
+  assert.match(pullRequest[1].class, /inline-chip-icon-pr/);
+  assert.equal(pullRequest[2], "buzz-world");
 });
 
 test("markdown rendering stores identity in attributes, not visible id text", () => {
diff --git a/desktop/src/features/messages/lib/composerMessageLinkNode.ts b/desktop/src/features/messages/lib/composerMessageLinkNode.ts
index a01109e010..9587c312ca 100644
--- a/desktop/src/features/messages/lib/composerMessageLinkNode.ts
+++ b/desktop/src/features/messages/lib/composerMessageLinkNode.ts
@@ -232,7 +232,9 @@ function composerLinkPresentation(
         "data-message-link": "",
       },
       icon: "message",
-      label: `${resolvedChannelName} · ${message.value.messageId.slice(0, 8)}`,
+      // Matches the rendered inline message chip, which never shows the event
+      // hash — the label must not change when the draft is sent.
+      label: resolvedChannelName,
     };
   }
 
@@ -276,10 +278,10 @@ function composerLinkPresentation(
     channelName: "",
     dataAttributes: { "data-buzz-link-kind": entity.value.type },
     icon: entity.value.type,
-    label:
-      entity.value.type === "repo" || entity.value.type === "project"
-        ? entity.value.dtag
-        : `${entity.value.dtag} · ${shortId}`,
+    // Entity chips use only stable link-derived identity. Fetched metadata is
+    // reserved for sent-message tooltips/cards, so every composer chip keeps the
+    // same label after send and throughout metadata resolution.
+    label: entity.value.dtag,
   };
 }
 
diff --git a/desktop/src/features/messages/lib/messageLinkMetadata.test.mjs b/desktop/src/features/messages/lib/messageLinkMetadata.test.mjs
new file mode 100644
index 0000000000..5b44c799c8
--- /dev/null
+++ b/desktop/src/features/messages/lib/messageLinkMetadata.test.mjs
@@ -0,0 +1,24 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { summarizeMessageLinkContent } from "./messageLinkMetadata.ts";
+
+test("summarizeMessageLinkContent projects markdown to bounded plain text", () => {
+  assert.equal(
+    summarizeMessageLinkContent(
+      "**Hello** [team](https://example.com)\n\n![secret](https://example.com/a.png) ||hidden||",
+    ),
+    "Hello team",
+  );
+  assert.equal(
+    summarizeMessageLinkContent("https://example.com"),
+    "No message text",
+  );
+});
+
+test("summarizeMessageLinkContent truncates on grapheme-safe character boundaries", () => {
+  const result = summarizeMessageLinkContent(`Lead ${"🦄".repeat(200)}`);
+  assert.ok(Array.from(result).length <= 160);
+  assert.ok(result.endsWith("…"));
+  assert.ok(!result.includes("\ud83e") || result.includes("🦄"));
+});
diff --git a/desktop/src/features/messages/lib/messageLinkMetadata.ts b/desktop/src/features/messages/lib/messageLinkMetadata.ts
new file mode 100644
index 0000000000..848b207d69
--- /dev/null
+++ b/desktop/src/features/messages/lib/messageLinkMetadata.ts
@@ -0,0 +1,29 @@
+const MESSAGE_LINK_SNIPPET_MAX_LENGTH = 160;
+
+/** Build a compact, non-recursive plain-text preview for a linked message. */
+export function summarizeMessageLinkContent(content: string): string {
+  const normalized = Array.from(content, (character) => {
+    const codePoint = character.codePointAt(0) ?? 0;
+    return codePoint <= 0x1f || (codePoint >= 0x7f && codePoint <= 0x9f)
+      ? " "
+      : character;
+  })
+    .join("")
+    .replace(/\|\|[^|]*(?:\|(?!\|)[^|]*)*\|\|/g, " ")
+    .replace(/!\[[^\]]*\]\([^)]*\)/g, " ")
+    .replace(/\[([^\]]+)\]\([^)]*\)/g, "$1")
+    .replace(/<?(?:https?|buzz):\/\/\S+>?/g, " ")
+    .replace(/[`*_~>#|]/g, " ")
+    .replace(/\s+/g, " ")
+    .trim();
+  if (!normalized) return "No message text";
+
+  const characters = Array.from(normalized);
+  if (characters.length <= MESSAGE_LINK_SNIPPET_MAX_LENGTH) return normalized;
+  const clipped = characters
+    .slice(0, MESSAGE_LINK_SNIPPET_MAX_LENGTH - 1)
+    .join("");
+  const lastSpace = clipped.lastIndexOf(" ");
+  const snippet = lastSpace > 96 ? clipped.slice(0, lastSpace) : clipped;
+  return `${snippet.trimEnd()}…`;
+}
diff --git a/desktop/src/features/messages/lib/remarkEntityLinks.test.mjs b/desktop/src/features/messages/lib/remarkEntityLinks.test.mjs
index 1d7fdeacb3..99fa0ed510 100644
--- a/desktop/src/features/messages/lib/remarkEntityLinks.test.mjs
+++ b/desktop/src/features/messages/lib/remarkEntityLinks.test.mjs
@@ -17,6 +17,7 @@ test("turns every bare Buzz entity permalink family into a chip node", () => {
   const id = "cd".repeat(32);
   const links = [
     `buzz://repo?owner=${owner}&d=buzz`,
+    `buzz://project?owner=${owner}&d=onboarding`,
     `buzz://pr?id=${id}&owner=${owner}&d=buzz`,
     `buzz://issue?id=${id}&owner=${owner}&d=buzz`,
   ];
diff --git a/desktop/src/features/messages/lib/remarkEntityLinks.ts b/desktop/src/features/messages/lib/remarkEntityLinks.ts
index 41cf4af20b..85ba43f774 100644
--- a/desktop/src/features/messages/lib/remarkEntityLinks.ts
+++ b/desktop/src/features/messages/lib/remarkEntityLinks.ts
@@ -1,7 +1,7 @@
-/** Detect bare `buzz://pr|issue|repo?…` URLs in markdown text nodes. */
+/** Detect bare `buzz://pr|issue|repo|project?…` URLs in markdown text nodes. */
 import { createRemarkPrefixPlugin } from "../../../shared/lib/createRemarkPrefixPlugin.ts";
 
-const ENTITY_URL_PATTERN = /buzz:\/\/(?:pr|issue|repo)\?[^\s<>"')\]]+/g;
+const ENTITY_URL_PATTERN = /buzz:\/\/(?:pr|issue|repo|project)\?[^\s<>"')\]]+/g;
 const TRAILING_PUNCTUATION_PATTERN = /[.,;:!?]+$/;
 
 export default function remarkEntityLinks() {
diff --git a/desktop/src/features/messages/lib/useDraftRootStatus.ts b/desktop/src/features/messages/lib/useDraftRootStatus.ts
index baa1f0926d..4ea219c251 100644
--- a/desktop/src/features/messages/lib/useDraftRootStatus.ts
+++ b/desktop/src/features/messages/lib/useDraftRootStatus.ts
@@ -1,6 +1,7 @@
 import { useQueries } from "@tanstack/react-query";
 
 import { getEventById } from "@/shared/api/tauri";
+import { isDefinitiveEventNotFound } from "@/shared/lib/eventLookupError";
 
 /**
  * Root-existence status for a thread-draft's parent event.
@@ -18,18 +19,8 @@ import { getEventById } from "@/shared/api/tauri";
  */
 export type RootStatus = "checking" | "available" | "deleted" | "error";
 
-const EVENT_NOT_FOUND_MESSAGE = "event not found";
-
 export function classifyError(err: unknown): RootStatus {
-  // Only the definitive relay-returned string maps to `deleted`.
-  // Every other failure (transport, auth, serialization) is `error`.
-  if (typeof err === "string" && err.includes(EVENT_NOT_FOUND_MESSAGE)) {
-    return "deleted";
-  }
-  if (err instanceof Error && err.message.includes(EVENT_NOT_FOUND_MESSAGE)) {
-    return "deleted";
-  }
-  return "error";
+  return isDefinitiveEventNotFound(err) ? "deleted" : "error";
 }
 
 /**
diff --git a/desktop/src/features/messages/ui/SentFromThreadLine.tsx b/desktop/src/features/messages/ui/SentFromThreadLine.tsx
index 9740fe31e4..84e3ef5d68 100644
--- a/desktop/src/features/messages/ui/SentFromThreadLine.tsx
+++ b/desktop/src/features/messages/ui/SentFromThreadLine.tsx
@@ -44,6 +44,9 @@ export function SentFromThreadLine({
         channels={channels}
         interactive
         link={link}
+        onOpenChannel={(targetChannelId) => {
+          void goChannel(targetChannelId);
+        }}
         onOpenMessageLink={onOpenMessageLink}
         resolveChannelReference
         threadExcerpt={reference.rootExcerpt}
diff --git a/desktop/src/features/onboarding/ui/RuntimeErrorTooltip.tsx b/desktop/src/features/onboarding/ui/RuntimeErrorTooltip.tsx
index 6a3d8ef319..26b778ff6d 100644
--- a/desktop/src/features/onboarding/ui/RuntimeErrorTooltip.tsx
+++ b/desktop/src/features/onboarding/ui/RuntimeErrorTooltip.tsx
@@ -18,7 +18,7 @@ export function RuntimeErrorTooltip({
   testId,
 }: RuntimeErrorTooltipProps) {
   return (
-    <Tooltip>
+    <Tooltip disableHoverableContent={false}>
       <TooltipTrigger asChild>
         <span
           aria-label={`${label}. ${detail}`}
@@ -38,7 +38,7 @@ export function RuntimeErrorTooltip({
         </span>
       </TooltipTrigger>
       <TooltipContent
-        className="max-w-80 text-left"
+        className="pointer-events-auto max-w-80 text-left"
         side="bottom"
         sideOffset={12}
       >
diff --git a/desktop/src/features/projects/ui/ProjectAuthorIdentity.tsx b/desktop/src/features/projects/ui/ProjectAuthorIdentity.tsx
index be7ac53d2e..c145f5f9d7 100644
--- a/desktop/src/features/projects/ui/ProjectAuthorIdentity.tsx
+++ b/desktop/src/features/projects/ui/ProjectAuthorIdentity.tsx
@@ -66,7 +66,7 @@ export function ProjectAuthorIdentity({
             />
             <span className="min-w-0">
               <span className="block truncate font-medium">{label}</span>
-              <span className="block text-primary-foreground/70">
+              <span className="block text-secondary-foreground/70">
                 {roleLabel}
               </span>
             </span>
diff --git a/desktop/src/features/projects/ui/ProjectCards.tsx b/desktop/src/features/projects/ui/ProjectCards.tsx
index 45168744c9..b8c3ffd273 100644
--- a/desktop/src/features/projects/ui/ProjectCards.tsx
+++ b/desktop/src/features/projects/ui/ProjectCards.tsx
@@ -333,7 +333,7 @@ function RepositoryUnavailableIndicator({
       </TooltipTrigger>
       <TooltipContent className="max-w-64">
         <p className="font-medium">{label}</p>
-        <p className="text-muted-foreground">{description}</p>
+        <p className="text-secondary-foreground">{description}</p>
       </TooltipContent>
     </Tooltip>
   );
diff --git a/desktop/src/shared/lib/eventLookupError.ts b/desktop/src/shared/lib/eventLookupError.ts
new file mode 100644
index 0000000000..ad401868fb
--- /dev/null
+++ b/desktop/src/shared/lib/eventLookupError.ts
@@ -0,0 +1,11 @@
+const EVENT_NOT_FOUND_MESSAGE = "event not found";
+
+/** Only the relay's definitive zero-row signal proves that an event was deleted. */
+export function isDefinitiveEventNotFound(error: unknown): boolean {
+  if (typeof error === "string") {
+    return error.includes(EVENT_NOT_FOUND_MESSAGE);
+  }
+  return (
+    error instanceof Error && error.message.includes(EVENT_NOT_FOUND_MESSAGE)
+  );
+}
diff --git a/desktop/src/shared/lib/useResolvedLinkPreviews.test.mjs b/desktop/src/shared/lib/useResolvedLinkPreviews.test.mjs
index 6080e32c8f..e413f9c7c2 100644
--- a/desktop/src/shared/lib/useResolvedLinkPreviews.test.mjs
+++ b/desktop/src/shared/lib/useResolvedLinkPreviews.test.mjs
@@ -359,7 +359,7 @@ test("Buzz PR metadata includes repository identity and trusted root context", a
   );
   assert.equal(result?.siteName, "Buzz Desktop");
   assert.equal(result?.title, "Restore entity cards");
-  assert.equal(result?.description, "Open · fix/cards → release · 1234567");
+  assert.equal(result?.description, null);
   assert.equal(result?.faviconDataUrl, null);
   assert.equal(result?.imageDataUrl, null);
 });
diff --git a/desktop/src/shared/lib/useResolvedLinkPreviews.ts b/desktop/src/shared/lib/useResolvedLinkPreviews.ts
index 8b210f6ab3..4591d54e7d 100644
--- a/desktop/src/shared/lib/useResolvedLinkPreviews.ts
+++ b/desktop/src/shared/lib/useResolvedLinkPreviews.ts
@@ -12,10 +12,6 @@ import { eventToProjectPullRequest } from "@/features/projects/projectPullReques
 import {
   KIND_GIT_ISSUE,
   KIND_GIT_PULL_REQUEST,
-  KIND_GIT_STATUS_CLOSED,
-  KIND_GIT_STATUS_DRAFT,
-  KIND_GIT_STATUS_MERGED,
-  KIND_GIT_STATUS_OPEN,
   KIND_PROJECT_ANNOUNCEMENT,
   KIND_REPO_ANNOUNCEMENT,
 } from "@/shared/constants/kinds";
@@ -244,13 +240,6 @@ export async function loadLinkPreviewMetadata(
 ): Promise<LinkPreviewMetadata | null> {
   return (await metadataLoader.load(href)).metadata;
 }
-const ENTITY_STATUS_KINDS = [
-  KIND_GIT_STATUS_OPEN,
-  KIND_GIT_STATUS_MERGED,
-  KIND_GIT_STATUS_CLOSED,
-  KIND_GIT_STATUS_DRAFT,
-];
-
 type EntityEventFetcher = (
   filter: Parameters<typeof relayClient.fetchEvents>[0],
 ) => Promise<RelayEvent[]>;
@@ -279,9 +268,6 @@ export async function fetchBuzzEntityMetadata(
       "#d": [dtag],
       limit: 1,
     });
-    // Repository maps are only needed to resolve a project's repository read
-    // models, which the card does not show — empty maps still validate the
-    // announcement envelope and resolve name/description.
     const project = projectEvents
       .map((event) => eventToExplicitProject(event, new Map(), new Map()))
       .find((candidate) => candidate?.projectAddress === projectAddress);
@@ -347,33 +333,17 @@ export async function fetchBuzzEntityMetadata(
   });
   if (!root) return null;
 
-  const trustedAuthors = [...new Set([root.pubkey.toLowerCase(), owner])];
-  const statusEvents = await fetchEvents({
-    kinds: ENTITY_STATUS_KINDS,
-    authors: trustedAuthors,
-    "#e": [id],
-    limit: 20,
-  });
-  if (type === "issue") {
-    const issue = eventToProjectIssue(root, statusEvents);
-    return {
-      ...base,
-      title: issue.title,
-      description: compactMetadata([issue.status, ...issue.labels.slice(0, 2)]),
-    };
-  }
-
-  const pullRequest = eventToProjectPullRequest(root, [], [], statusEvents);
-  const source = pullRequest.branchName;
-  const target = pullRequest.targetBranch ?? repository.defaultBranch;
+  const title =
+    type === "issue"
+      ? eventToProjectIssue(root).title
+      : eventToProjectPullRequest(root).title;
   return {
     ...base,
-    title: pullRequest.title,
-    description: compactMetadata([
-      pullRequest.status,
-      source ? `${source} → ${target}` : null,
-      pullRequest.commit?.slice(0, 7),
-    ]),
+    title,
+    // Issue and PR bodies are markdown and often begin with headings. Keep
+    // their fetched subject as tooltip/card context without fetching or
+    // flattening body/status metadata into an unrendered description string.
+    description: null,
   };
 }
 
@@ -381,6 +351,13 @@ const entityMetadataLoader = createMetadataLoader({
   fetcher: fetchBuzzEntityMetadata,
 });
 
+/** Share deduplicated relay-native entity metadata across cards and inline tooltips. */
+export async function loadBuzzEntityMetadata(
+  href: string,
+): Promise<LinkPreviewMetadata | null> {
+  return (await entityMetadataLoader.load(href)).metadata;
+}
+
 /** Clear ephemeral metadata when the active relay/community changes. */
 export function resetLinkPreviewMetadataCache(): void {
   metadataLoader.reset();
diff --git a/desktop/src/shared/styles/globals/markdown.css b/desktop/src/shared/styles/globals/markdown.css
index 7d0a238c17..9be4548249 100644
--- a/desktop/src/shared/styles/globals/markdown.css
+++ b/desktop/src/shared/styles/globals/markdown.css
@@ -87,6 +87,31 @@
   color: hsl(var(--primary));
 }
 
+.message-markdown .mention-chip.wrapping-inline-chip {
+  display: inline;
+  line-height: calc(
+    1em +
+    var(--inline-chip-padding-block-start) +
+    var(--inline-chip-padding-block-end) +
+    0.25rem
+  );
+  overflow-wrap: anywhere;
+  text-align: left;
+  white-space: normal;
+}
+
+.message-markdown .mention-chip.buzz-link-unavailable,
+.message-markdown .mention-chip.buzz-link-unavailable:hover {
+  background: hsl(var(--secondary));
+  color: hsl(var(--secondary-foreground) / 0.7);
+}
+
+.message-markdown .mention-chip.buzz-link-deleted,
+.message-markdown .mention-chip.buzz-link-deleted:hover {
+  background: hsl(var(--destructive) / 0.12);
+  color: hsl(var(--destructive));
+}
+
 .message-markdown .mention-chip.inbox-channel-chip {
   background: hsl(var(--muted));
   color: hsl(var(--muted-foreground) / 0.82);
@@ -137,6 +162,7 @@
 .message-markdown.inbox-preview-markdown .inline-code-chip,
 .message-markdown.inbox-preview-markdown :not(pre) > code {
   display: inline;
+  line-height: 1;
   overflow: visible;
   overflow-wrap: normal;
   text-overflow: clip;
@@ -166,6 +192,30 @@
   transform: translateY(-50%);
 }
 
+.message-markdown .wrapping-inline-chip.inline-chip-with-icon {
+  padding-left: var(--inline-chip-padding-inline);
+}
+
+.message-markdown .wrapping-inline-chip.inline-chip-with-icon::before {
+  display: none;
+}
+
+.message-markdown .inline-chip-leading-fragment.inline-chip-with-icon {
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  padding-left: calc(
+    var(--inline-chip-icon-size) +
+    var(--inline-chip-icon-gap)
+  );
+  white-space: nowrap;
+}
+
+.message-markdown .inline-chip-leading-fragment.inline-chip-with-icon::before {
+  display: block;
+  left: 0;
+}
+
 .message-markdown .inline-chip-icon-message::before {
   mask:
     url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M21 15a4 4 0 0 1-4 4H8l-5 3V7a4 4 0 0 1 4-4h10a4 4 0 0 1 4 4z' fill='none' stroke='%23000' stroke-linecap='round' stroke-linejoin='round' stroke-width='2'/%3E%3C/svg%3E")
diff --git a/desktop/src/shared/styles/globals/tooltipSemantics.test.mjs b/desktop/src/shared/styles/globals/tooltipSemantics.test.mjs
new file mode 100644
index 0000000000..7fdc1d6097
--- /dev/null
+++ b/desktop/src/shared/styles/globals/tooltipSemantics.test.mjs
@@ -0,0 +1,27 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import test from "node:test";
+
+const utilitiesCss = readFileSync(
+  new URL("./utilities.css", import.meta.url),
+  "utf8",
+);
+const huddleTooltipRule = utilitiesCss.match(
+  /\.buzz-huddle-tooltip\s*\{([\s\S]*?)\n\s*\}/,
+)?.[1];
+
+test("huddle tooltips consume their dedicated semantic tokens", () => {
+  assert.ok(huddleTooltipRule, "missing .buzz-huddle-tooltip rule");
+  assert.match(
+    huddleTooltipRule,
+    /background:\s*hsl\(\s*var\(--huddle-tooltip-surface,/,
+  );
+  assert.match(
+    huddleTooltipRule,
+    /color:\s*hsl\(\s*var\(\s*--huddle-tooltip-foreground,/,
+  );
+  assert.doesNotMatch(
+    huddleTooltipRule,
+    /--(?:primary|secondary)(?:-foreground)?/,
+  );
+});
diff --git a/desktop/src/shared/styles/globals/utilities.css b/desktop/src/shared/styles/globals/utilities.css
index a9da737bce..0d5e0f453f 100644
--- a/desktop/src/shared/styles/globals/utilities.css
+++ b/desktop/src/shared/styles/globals/utilities.css
@@ -38,16 +38,9 @@
   }
 
   .buzz-huddle-tooltip {
-    --primary: var(
-      --huddle-tooltip-surface,
-      var(--huddle-control-surface, 0 0% 20%)
+    background: hsl(
+      var(--huddle-tooltip-surface, var(--huddle-control-surface, 0 0% 20%))
     );
-    --primary-foreground: var(
-      --huddle-tooltip-foreground,
-      var(--huddle-control-foreground, 0 0% 98%)
-    );
-
-    background: hsl(var(--primary));
     border: 1px solid
       hsl(
         var(
@@ -57,7 +50,12 @@
         0.72
       );
     box-shadow: 0 10px 22px rgb(0 0 0 / 35%);
-    color: hsl(var(--primary-foreground));
+    color: hsl(
+      var(
+        --huddle-tooltip-foreground,
+        var(--huddle-control-foreground, 0 0% 98%)
+      )
+    );
   }
 
   .buzz-huddle-drawer .buzz-huddle-control-button,
diff --git a/desktop/src/shared/ui/markdown.test.mjs b/desktop/src/shared/ui/markdown.test.mjs
index 5e829f6243..f84babddd2 100644
--- a/desktop/src/shared/ui/markdown.test.mjs
+++ b/desktop/src/shared/ui/markdown.test.mjs
@@ -1,5 +1,6 @@
 import assert from "node:assert/strict";
 import test from "node:test";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
 // These are copied here to avoid importing from .ts files that depend on
 // React (which isn't resolvable outside the bundler). Same pattern as
@@ -656,6 +657,13 @@ test("buzzDeepLinkUrlTransform: preserves buzz://repo entity link href", () => {
   assert.doesNotMatch(html, /href=""/);
 });
 
+test("buzzDeepLinkUrlTransform: preserves buzz://project autolink href", () => {
+  const projectLink = `buzz://project?owner=${OWNER_HEX}&d=onboarding`;
+  const html = renderMarkdown(`<${projectLink}>`);
+  assert.match(html, /href="buzz:\/\/project\?/);
+  assert.doesNotMatch(html, /href=""/);
+});
+
 test("buzzDeepLinkUrlTransform: strips malformed buzz://pr (unknown param)", () => {
   // Strict parser rejects unknown params — transform falls back to default sanitizer.
   const html = renderMarkdown(
@@ -1080,32 +1088,144 @@ test("bare Buzz permalinks render cohesive icon-prefixed chips", () => {
   });
   const html = renderToStaticMarkup(
     React.createElement(
-      MarkdownRuntimeContext.Provider,
-      {
-        value: {
-          channels: [{ id: channelId, name: "engineering" }],
-          onOpenChannel: () => {},
-          onOpenEntityLink: () => {},
-          onOpenMessageLink: () => {},
-          relayOrigin: null,
+      QueryClientProvider,
+      { client: new QueryClient() },
+      React.createElement(
+        MarkdownRuntimeContext.Provider,
+        {
+          value: {
+            channels: [{ id: channelId, name: "engineering" }],
+            onOpenChannel: () => {},
+            onOpenEntityLink: () => {},
+            onOpenMessageLink: () => {},
+            relayOrigin: null,
+          },
         },
-      },
-      markdown,
+        markdown,
+      ),
     ),
   );
 
+  const visibleText = html.replace(/<[^>]+>/g, "");
   assert.equal((html.match(/data-buzz-link=""/g) ?? []).length, 6);
-  assert.equal((html.match(/inline-chip-icon-message/g) ?? []).length, 2);
-  assert.equal((html.match(/>engineering · c3b589fa</g) ?? []).length, 2);
+  assert.equal(
+    (
+      html.match(
+        /inline-chip-leading-fragment[^"]*inline-chip-icon-message/g,
+      ) ?? []
+    ).length,
+    2,
+  );
+  assert.equal((visibleText.match(/engineering/g) ?? []).length, 3);
   assert.equal((html.match(/data-message-link=""/g) ?? []).length, 2);
   assert.equal((html.match(/data-channel-deep-link=""/g) ?? []).length, 1);
   assert.match(html, /inline-chip-icon-channel/);
-  assert.match(html, />engineering</);
+  assert.match(html, /wrapping-inline-chip/);
+  assert.match(html, /inline-chip-leading-fragment[^>]*>e</);
   assert.match(html, /inline-chip-icon-pr/);
   assert.match(html, /inline-chip-icon-issue/);
   assert.match(html, /inline-chip-icon-repo/);
-  assert.equal((html.match(/>buzz-world · c3b589fa</g) ?? []).length, 2);
-  assert.match(html, />buzz-world</);
+  // PR, issue, and repository chips all use the stable repository identity;
+  // fetched subjects and event hashes never alter their inline width.
+  assert.equal((visibleText.match(/buzz-world/g) ?? []).length, 3);
+  assert.doesNotMatch(visibleText, /c3b589fa/);
+});
+
+test("inline issue and pull-request chips show the repository name without the event hash", () => {
+  const renderEntityChip = (href) =>
+    renderToStaticMarkup(
+      renderEntityLinkAnchor({
+        children: null,
+        href,
+        onOpenEntityLink: () => {},
+        relayOrigin: null,
+      }),
+    );
+
+  const issueHtml = renderEntityChip(
+    `buzz://issue?id=${EVENT_HEX}&owner=${OWNER_HEX}&d=buzz-world`,
+  );
+  const issueText = issueHtml.replace(/<[^>]+>/g, "");
+  assert.equal(issueText, "buzz-world");
+  assert.doesNotMatch(issueText, /c3b589fa/);
+  assert.doesNotMatch(issueText, /·/);
+  // Identity, icon, and navigation affordances survive the shorter label.
+  assert.match(issueHtml, /data-buzz-link-kind="issue"/);
+  assert.match(issueHtml, /inline-chip-icon-issue/);
+  assert.match(
+    issueHtml,
+    /aria-label="Open issue c3b589fa in repository buzz-world"/,
+  );
+
+  // Pull-request chips follow the same stable inline identity policy.
+  const pullRequestText = renderEntityChip(
+    `buzz://pr?id=${EVENT_HEX}&owner=${OWNER_HEX}&d=buzz-world`,
+  ).replace(/<[^>]+>/g, "");
+  assert.equal(pullRequestText, "buzz-world");
+  assert.doesNotMatch(pullRequestText, /c3b589fa/);
+  assert.doesNotMatch(pullRequestText, /·/);
+});
+
+test("inline entity chip labels are bounded without truncating their accessible names", () => {
+  const longRepository = `repo-${"x".repeat(50)}`;
+  const html = renderToStaticMarkup(
+    renderEntityLinkAnchor({
+      children: null,
+      href: `buzz://repo?owner=${OWNER_HEX}&d=${longRepository}`,
+      onOpenEntityLink: () => {},
+      relayOrigin: null,
+    }),
+  );
+  const visibleText = html.replace(/<[^>]+>/g, "");
+  assert.equal(Array.from(visibleText).length, 48);
+  assert.match(visibleText, /…$/);
+  assert.match(
+    html,
+    new RegExp(`aria-label="Open repository ${longRepository}"`),
+  );
+});
+
+test("inline message chips omit fetched metadata and the event hash", () => {
+  const channelId = "580ca78b-9dae-46f3-8854-bd671853ba32";
+  const markdown = renderCachedMarkdown({
+    components: createMarkdownComponents(true, false),
+    content: `buzz://message?channel=${channelId}&id=${EVENT_HEX}`,
+    variant: "inline-message-chip-metadata-test",
+  });
+  // A readable channel is the case that used to swap the chip label from the
+  // truncated event hash to the fetched snippet once metadata resolved.
+  const html = renderToStaticMarkup(
+    React.createElement(
+      QueryClientProvider,
+      { client: new QueryClient() },
+      React.createElement(
+        MarkdownRuntimeContext.Provider,
+        {
+          value: {
+            channels: [
+              {
+                id: channelId,
+                isMember: true,
+                name: "engineering",
+                visibility: "open",
+              },
+            ],
+            onOpenChannel: () => {},
+            onOpenEntityLink: () => {},
+            onOpenMessageLink: () => {},
+            relayOrigin: null,
+          },
+        },
+        markdown,
+      ),
+    ),
+  );
+
+  const visibleText = html.replace(/<[^>]+>/g, "");
+  assert.equal((html.match(/data-message-link=""/g) ?? []).length, 1);
+  assert.equal(visibleText.trim(), "engineering");
+  assert.doesNotMatch(visibleText, /c3b589fa/);
+  assert.doesNotMatch(visibleText, /·/);
 });
 
 test("authored Buzz permalink labels remain ordinary links", () => {
@@ -1174,8 +1294,11 @@ test("bare Buzz permalinks shorten unavailable channel identifiers", () => {
     ),
   );
 
-  assert.match(html, />580ca78b · c3b589fa</);
-  assert.match(html, />580ca78b</);
+  assert.equal(
+    (html.match(/inline-chip-leading-fragment[^>]*>5<\/span>80ca78b/g) ?? [])
+      .length,
+    2,
+  );
   assert.doesNotMatch(html, /#channel/);
 });
 
@@ -1204,7 +1327,9 @@ test("channel references replace the authored hash with the channel icon", () =>
   );
 
   assert.match(html, /inline-chip-icon-channel/);
-  assert.match(html, />engineering</);
+  assert.match(html, /wrapping-inline-chip/);
+  assert.match(html, /inline-chip-leading-fragment[^>]*>e</);
+  assert.match(html.replace(/<[^>]+>/g, ""), /engineering/);
   assert.doesNotMatch(html, />#engineering</);
 });
 
@@ -1281,8 +1406,15 @@ test("renderEntityLinkAnchor renders Buzz entity links as chips", () => {
   });
   const html = renderToStaticMarkup(el);
   assert.match(html, /data-buzz-link=""/);
-  assert.match(html, /<button/);
+  assert.match(html, /<span/);
+  assert.match(html, /role="button"/);
+  assert.match(html, /tabindex="0"/);
+  assert.match(html, /data-buzz-link-kind="pr"/);
+  assert.match(html, /wrapping-inline-chip/);
+  assert.match(html, /inline-chip-leading-fragment[^>]*>buzz-</);
+  assert.doesNotMatch(html, /\btruncate\b/);
   assert.doesNotMatch(html, /<a/);
+  assert.doesNotMatch(html, /<button/);
 });
 
 test("renderEntityLinkAnchor keeps chip styling when interaction is disabled", () => {
diff --git a/desktop/src/shared/ui/markdown.tsx b/desktop/src/shared/ui/markdown.tsx
index 0cfe6aff8d..3810e2cc62 100644
--- a/desktop/src/shared/ui/markdown.tsx
+++ b/desktop/src/shared/ui/markdown.tsx
@@ -55,6 +55,7 @@ import {
   SyntaxHighlightedCode,
 } from "./markdown/CodeBlock";
 import {
+  EntityLinkAnchor,
   renderEntityLinkAnchor,
   useEntityCardOpenHandlers,
   useOpenEntityLink,
@@ -1271,6 +1272,7 @@ export function createMarkdownComponents(
     const {
       channels,
       imetaByUrl,
+      onOpenChannel,
       onOpenEntityLink,
       onOpenMessageLink,
       onImportSnapshotFromUrl,
@@ -1281,17 +1283,13 @@ export function createMarkdownComponents(
     if (!interactive) {
       return <span className="font-medium text-current">{children}</span>;
     }
-
-    // Markdown image-link syntax (`[![alt](src)](href)`) otherwise nests the image lightbox button inside an anchor.
-    // Keep the image as the lightbox trigger and suppress the parent link activation for block media.
     if (hasBlockMedia(React.Children.toArray(children))) {
       return <>{children}</>;
     }
 
     const label = getReactNodeText(children);
 
-    // Snapshot attachment (agent or team): classify before generic FileCard.
-    // resolveSnapshotCard checks the filename suffix + SHA-256 field.
+    // Classify verified agent/team snapshots before generic files.
     const snapshotCard = resolveSnapshotCard(
       href ? imetaByUrl?.get(href) : undefined,
       href,
@@ -1319,9 +1317,7 @@ export function createMarkdownComponents(
       );
     }
 
-    // Generic file attachment: a `[filename](url)` link whose href matches an
-    // imeta entry with a non-image, non-video MIME. Render a download card
-    // instead of a plain link. (Media uses the `img` renderer, not this path.)
+    // Render non-media imeta links as download cards; media uses `img`.
     const card = resolveFileCard(
       href ? imetaByUrl?.get(href) : undefined,
       href,
@@ -1333,7 +1329,7 @@ export function createMarkdownComponents(
       );
     }
 
-    // Intercept `buzz://channel/<uuid>` and `buzz://message?...` links so clicks navigate in-app instead of opening the URL in the OS browser.
+    // Keep Buzz channel/message navigation in-app.
     if (href) {
       if (parseChannelLink(href).ok) {
         return (
@@ -1357,6 +1353,7 @@ export function createMarkdownComponents(
               channels={channels}
               interactive={interactive}
               link={messageLinkTarget.link}
+              onOpenChannel={onOpenChannel}
               onOpenMessageLink={onOpenMessageLink}
               resolveChannelReference={resolveChannelReferences}
             />
@@ -1374,7 +1371,7 @@ export function createMarkdownComponents(
           </AuthoredDeepLinkAnchor>
         );
       }
-      // Malformed message deep link — fall through to the default anchor.
+      // Malformed message deep links fall through to external handling.
     }
 
     // `buzz://pr|issue|repo?…` entity links navigate in-app; malformed ones
@@ -1668,21 +1665,19 @@ export function createMarkdownComponents(
       const href = String(children ?? "");
       if (!parseEntityLink(href).ok)
         return <span data-entity-link="">{href}</span>;
-      return renderEntityLinkAnchor({
-        children: href,
+      return React.createElement(
+        EntityLinkAnchor,
+        { href, interactive, onOpenEntityLink, relayOrigin },
         href,
-        interactive,
-        onOpenEntityLink,
-        relayOrigin,
-      });
+      );
     },
     "message-link": function MarkdownMessageLink({
       children,
     }: {
       children?: React.ReactNode;
     }) {
-      const { channels, onOpenMessageLink, resolveChannelReferences } =
-        useMarkdownRuntime();
+      const runtime = useMarkdownRuntime();
+      const { channels, onOpenChannel, onOpenMessageLink } = runtime;
       const href = String(children ?? "");
       const parsed = parseMessageLink(href);
       if (!parsed.ok) {
@@ -1694,8 +1689,9 @@ export function createMarkdownComponents(
           channels={channels}
           interactive={interactive}
           link={parsed.value}
+          onOpenChannel={onOpenChannel}
           onOpenMessageLink={onOpenMessageLink}
-          resolveChannelReference={resolveChannelReferences}
+          resolveChannelReference={runtime.resolveChannelReferences}
         />
       );
     },
@@ -1713,8 +1709,11 @@ const markdownComponentsByVariant = new Map<string, MarkdownComponentSet>();
 type MarkdownComponentSet = { components: Components; variant: string };
 
 /**
- * Returns the component map and its cache-key `variant` token. The token fully
- * identifies the map, so a new render flag partitions both together.
+ * Returns the component map together with the `variant` token that fully
+ * identifies it. The token doubles as the variant segment of the parse-cache
+ * key (see nodeCache.ts), so the map partitioning and the key partitioning
+ * come from one place and cannot drift apart: a new render flag added here
+ * automatically partitions the cache too.
  */
 function getMarkdownComponents(
   interactive: boolean,
diff --git a/desktop/src/shared/ui/markdown/BuzzLinkChip.tsx b/desktop/src/shared/ui/markdown/BuzzLinkChip.tsx
index 451bd9c303..c31aa9b519 100644
--- a/desktop/src/shared/ui/markdown/BuzzLinkChip.tsx
+++ b/desktop/src/shared/ui/markdown/BuzzLinkChip.tsx
@@ -1,8 +1,14 @@
 import * as React from "react";
 
 import { copyTextToClipboard } from "@/shared/lib/clipboard";
+import { cn } from "@/shared/lib/cn";
 import { InlineChip } from "@/shared/ui/InlineChip";
-import type { InlineChipIconKind } from "@/shared/ui/mentionChip";
+import {
+  inlineChipIconClasses,
+  type InlineChipIconKind,
+  truncateInlineChipLabel,
+  WRAPPING_INLINE_CHIP_CLASSES,
+} from "@/shared/ui/mentionChip";
 
 import {
   MediaContextMenu,
@@ -60,6 +66,35 @@ function useBuzzLinkContextMenu({
   return { contextMenu, onContextMenuCapture };
 }
 
+function wrappingChipContent(
+  children: React.ReactNode,
+  icon: InlineChipIconKind,
+): React.ReactNode {
+  if (typeof children !== "string" || children.length === 0) return children;
+
+  const separatorIndex = children.search(/[-\s]/u);
+  const leadingEnd =
+    separatorIndex < 0
+      ? Array.from(children)[0]?.length
+      : separatorIndex + (children[separatorIndex] === "-" ? 1 : 0);
+  if (!leadingEnd) return children;
+
+  return (
+    <>
+      <span
+        aria-hidden="true"
+        className={cn(
+          "inline-chip-leading-fragment",
+          inlineChipIconClasses(icon),
+        )}
+      >
+        {children.slice(0, leadingEnd)}
+      </span>
+      {children.slice(leadingEnd)}
+    </>
+  );
+}
+
 export function BuzzLinkChip({
   children,
   className,
@@ -67,28 +102,52 @@ export function BuzzLinkChip({
   icon: Icon,
   interactive,
   onOpenLink,
+  wrapping = false,
   ...props
-}: Omit<React.ComponentPropsWithoutRef<"button">, "onClick"> & {
+}: Omit<React.ComponentPropsWithoutRef<"span">, "onClick"> & {
   href?: string;
   icon: InlineChipIconKind;
   interactive: boolean;
   onOpenLink: () => void;
+  wrapping?: boolean;
 }) {
   const { contextMenu, onContextMenuCapture } = useBuzzLinkContextMenu({
     href,
     interactive,
     onOpenLink,
   });
+  const visibleChildren =
+    wrapping && typeof children === "string"
+      ? truncateInlineChipLabel(children)
+      : children;
+  const content = wrapping
+    ? wrappingChipContent(visibleChildren, Icon)
+    : visibleChildren;
+  const chipClassName = cn(className, wrapping && WRAPPING_INLINE_CHIP_CLASSES);
+  const onKeyDown = React.useCallback(
+    (event: React.KeyboardEvent<HTMLSpanElement>) => {
+      props.onKeyDown?.(event);
+      if (
+        event.defaultPrevented ||
+        (event.key !== "Enter" && event.key !== " ")
+      ) {
+        return;
+      }
+      event.preventDefault();
+      onOpenLink();
+    },
+    [onOpenLink, props.onKeyDown],
+  );
 
   if (!interactive) {
     return (
       <InlineChip
-        {...(props as React.HTMLAttributes<HTMLSpanElement>)}
+        {...props}
         data-buzz-link=""
-        className={className}
+        className={chipClassName}
         icon={Icon}
       >
-        {children}
+        {content}
       </InlineChip>
     );
   }
@@ -97,15 +156,17 @@ export function BuzzLinkChip({
     <>
       <InlineChip
         {...props}
-        as="button"
         data-buzz-link=""
-        className={className}
+        className={chipClassName}
         icon={Icon}
         interactive
+        role="button"
+        tabIndex={0}
         onClick={onOpenLink}
         onContextMenuCapture={onContextMenuCapture}
+        onKeyDown={onKeyDown}
       >
-        {children}
+        {content}
       </InlineChip>
       {contextMenu}
     </>
diff --git a/desktop/src/shared/ui/markdown/ChannelDeepLink.test.mjs b/desktop/src/shared/ui/markdown/ChannelDeepLink.test.mjs
new file mode 100644
index 0000000000..75858a10fe
--- /dev/null
+++ b/desktop/src/shared/ui/markdown/ChannelDeepLink.test.mjs
@@ -0,0 +1,34 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { channelTooltipFooter } from "./ChannelDeepLink.tsx";
+
+const channel = {
+  id: "channel-id",
+  name: "history",
+  channelType: "forum",
+  visibility: "private",
+  description: "",
+  topic: null,
+  purpose: null,
+  memberCount: 0,
+  memberPubkeys: [],
+  lastMessageAt: null,
+  archivedAt: "2026-08-17T00:00:00Z",
+  participants: [],
+  participantPubkeys: [],
+  isMember: true,
+  ttlSeconds: null,
+  ttlDeadline: null,
+};
+
+test("channelTooltipFooter adds archived status without changing existing metadata", () => {
+  assert.equal(
+    channelTooltipFooter(channel),
+    "Private channel · Forum · Archived",
+  );
+  assert.equal(
+    channelTooltipFooter({ ...channel, archivedAt: null }),
+    "Private channel · Forum",
+  );
+});
diff --git a/desktop/src/shared/ui/markdown/ChannelDeepLink.tsx b/desktop/src/shared/ui/markdown/ChannelDeepLink.tsx
index 08f61c9524..ec52adc914 100644
--- a/desktop/src/shared/ui/markdown/ChannelDeepLink.tsx
+++ b/desktop/src/shared/ui/markdown/ChannelDeepLink.tsx
@@ -11,12 +11,90 @@ import {
 } from "@/features/messages/lib/channelLink";
 import type { ParsedMessageLink } from "@/features/messages/lib/messageLink";
 import type { Channel } from "@/shared/api/types";
+import { cn } from "@/shared/lib/cn";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/shared/ui/tooltip";
 
 import { BuzzInlineLink, BuzzLinkChip } from "./BuzzLinkChip";
 import { MessageLinkPill } from "./MessageLinkPill";
 import { useMarkdownRuntime } from "./runtimeContext";
+import { useInlineTooltipPosition } from "./useInlineTooltipPosition";
 import { getReactNodeText } from "./utils";
 
+function formatChannelActivity(timestamp: string): string | null {
+  const activityAt = Date.parse(timestamp);
+  if (!Number.isFinite(activityAt)) return null;
+  const elapsedMinutes = Math.max(
+    0,
+    Math.floor((Date.now() - activityAt) / 60_000),
+  );
+  if (elapsedMinutes < 1) return "Active just now";
+  if (elapsedMinutes < 60) return `Active ${elapsedMinutes}m ago`;
+  const elapsedHours = Math.floor(elapsedMinutes / 60);
+  if (elapsedHours < 24) return `Active ${elapsedHours}h ago`;
+  const elapsedDays = Math.floor(elapsedHours / 24);
+  if (elapsedDays < 7) return `Active ${elapsedDays}d ago`;
+  return `Active ${Math.floor(elapsedDays / 7)}w ago`;
+}
+
+export function channelTooltipFooter(channel: Channel) {
+  const details = [
+    channel.visibility === "private" ? "Private channel" : "Public channel",
+    channel.channelType === "forum" ? "Forum" : null,
+    channel.archivedAt ? "Archived" : null,
+    channel.lastMessageAt ? formatChannelActivity(channel.lastMessageAt) : null,
+  ];
+  return details.filter(Boolean).join(" · ");
+}
+
+function ChannelMetadataTooltip({
+  channel,
+  children,
+}: {
+  channel: Channel | undefined;
+  children: React.ReactElement;
+}) {
+  const { contentRef, onPointerMove } = useInlineTooltipPosition();
+  const description = channel?.description?.trim();
+  if (!channel) return children;
+  return (
+    <TooltipProvider delayDuration={500} skipDelayDuration={0}>
+      <Tooltip>
+        <TooltipTrigger asChild onPointerMove={onPointerMove}>
+          {children}
+        </TooltipTrigger>
+        <TooltipContent
+          ref={contentRef}
+          className="max-w-72 p-2 text-left"
+          side="top"
+        >
+          {description ? (
+            <span
+              className="line-clamp-2 [overflow-wrap:anywhere] whitespace-normal"
+              data-buzz-tooltip-metadata-content=""
+            >
+              {description}
+            </span>
+          ) : null}
+          <span
+            className={cn(
+              "line-clamp-2 max-w-full [overflow-wrap:anywhere] whitespace-normal text-2xs text-secondary-foreground/80",
+              description && "mt-1",
+            )}
+            data-buzz-tooltip-metadata-type=""
+          >
+            {channelTooltipFooter(channel)}
+          </span>
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+}
+
 type ChannelPermalinkChipProps = {
   channelId: string;
   channels?: Channel[];
@@ -31,28 +109,33 @@ function ChannelPermalinkChipContents({
   channelId,
   dataChannelDeepLink,
   href,
+  channel,
   interactive,
   label,
   onOpenChannel,
   openable = true,
 }: Omit<ChannelPermalinkChipProps, "channels" | "resolveChannelReference"> & {
+  channel?: Channel;
   label: string;
   openable?: boolean;
 }) {
   return (
-    <BuzzLinkChip
-      data-channel-deep-link={dataChannelDeepLink}
-      href={href}
-      icon="channel"
-      title={href}
-      aria-label={openable ? `Open channel ${label}` : `Channel ${label}`}
-      interactive={openable && interactive}
-      onOpenLink={() => {
-        if (openable) onOpenChannel(channelId);
-      }}
-    >
-      {label}
-    </BuzzLinkChip>
+    <ChannelMetadataTooltip channel={channel}>
+      <BuzzLinkChip
+        data-channel-deep-link={dataChannelDeepLink}
+        href={href}
+        icon="channel"
+        title={href}
+        aria-label={openable ? `Open channel ${label}` : `Channel ${label}`}
+        interactive={openable && interactive}
+        onOpenLink={() => {
+          if (openable) onOpenChannel(channelId);
+        }}
+        wrapping
+      >
+        {label}
+      </BuzzLinkChip>
+    </ChannelMetadataTooltip>
   );
 }
 
@@ -63,6 +146,7 @@ function ResolvedChannelPermalinkChip(props: ChannelPermalinkChipProps) {
   return (
     <ChannelPermalinkChipContents
       {...props}
+      channel={openable ? channel : undefined}
       label={label}
       openable={openable}
     />
@@ -193,6 +277,7 @@ function ChannelPermalinkChip(props: ChannelPermalinkChipProps) {
     return (
       <ChannelPermalinkChipContents
         {...props}
+        channel={known}
         label={known?.name ?? props.channelId.slice(0, 8)}
       />
     );
@@ -241,6 +326,7 @@ export function ChannelDeepLinkAnchor({
         href={href}
         interactive={interactive}
         link={messageLink}
+        onOpenChannel={onOpenChannel}
         onOpenMessageLink={onOpenMessageLink}
         resolveChannelReference={resolveChannelReferences}
       />
@@ -288,6 +374,7 @@ export function MarkdownChannelDeepLink({
         href={href}
         interactive={interactive}
         link={messageLink}
+        onOpenChannel={onOpenChannel}
         onOpenMessageLink={onOpenMessageLink}
         resolveChannelReference={resolveChannelReferences}
       />
@@ -320,20 +407,23 @@ function ChannelReferenceChip({
   onOpenChannel,
 }: ChannelReferenceChipProps) {
   return (
-    <BuzzLinkChip
-      data-channel-link=""
-      href={channel ? buildChannelLink(channel.id) : undefined}
-      icon="channel"
-      aria-label={
-        channel ? `Open channel ${channelName}` : `Channel ${channelName}`
-      }
-      interactive={Boolean(channel) && interactive}
-      onOpenLink={() => {
-        if (channel) onOpenChannel(channel.id);
-      }}
-    >
-      {channelName}
-    </BuzzLinkChip>
+    <ChannelMetadataTooltip channel={channel}>
+      <BuzzLinkChip
+        data-channel-link=""
+        href={channel ? buildChannelLink(channel.id) : undefined}
+        icon="channel"
+        aria-label={
+          channel ? `Open channel ${channelName}` : `Channel ${channelName}`
+        }
+        interactive={Boolean(channel) && interactive}
+        onOpenLink={() => {
+          if (channel) onOpenChannel(channel.id);
+        }}
+        wrapping
+      >
+        {channelName}
+      </BuzzLinkChip>
+    </ChannelMetadataTooltip>
   );
 }
 
diff --git a/desktop/src/shared/ui/markdown/MessageLinkPill.tsx b/desktop/src/shared/ui/markdown/MessageLinkPill.tsx
index c7052bacc9..2fd488977a 100644
--- a/desktop/src/shared/ui/markdown/MessageLinkPill.tsx
+++ b/desktop/src/shared/ui/markdown/MessageLinkPill.tsx
@@ -7,8 +7,17 @@ import {
 import { buildMessageLink } from "@/features/messages/lib/messageLink";
 import { getMessageLinkLabel } from "@/features/messages/lib/messageLinkLabel";
 import { cn } from "@/shared/lib/cn";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/shared/ui/tooltip";
+import { truncateInlineChipLabel } from "@/shared/ui/mentionChip";
 
 import { BuzzLinkChip } from "./BuzzLinkChip";
+import { useInlineTooltipPosition } from "./useInlineTooltipPosition";
+import { useMessageLinkMetadata } from "./useMessageLinkMetadata";
 import type { MessageLinkPillProps } from "./types";
 
 const graphemeSegmenter =
@@ -42,12 +51,95 @@ function segmentLinkLabel(label: string): Array<{
   return segments;
 }
 
+function formatMessageAge(createdAt: number): string {
+  const elapsedMinutes = Math.max(
+    0,
+    Math.floor((Date.now() - createdAt * 1_000) / 60_000),
+  );
+  if (elapsedMinutes < 1) return "just now";
+  if (elapsedMinutes < 60) return `${elapsedMinutes}m ago`;
+  const elapsedHours = Math.floor(elapsedMinutes / 60);
+  if (elapsedHours < 24) return `${elapsedHours}h ago`;
+  const elapsedDays = Math.floor(elapsedHours / 24);
+  if (elapsedDays < 7) return `${elapsedDays}d ago`;
+  return `${Math.floor(elapsedDays / 7)}w ago`;
+}
+
+function MessageLinkMetadataTooltip({
+  children,
+  footer,
+  metadata,
+}: {
+  children: React.ReactElement;
+  footer: string;
+  metadata: ReturnType<typeof useMessageLinkMetadata>;
+}) {
+  const { contentRef, onPointerMove } = useInlineTooltipPosition();
+  if (
+    metadata.state.kind === "deleted" ||
+    metadata.state.kind === "unavailable"
+  ) {
+    const message =
+      metadata.state.kind === "deleted"
+        ? "Message deleted"
+        : "Message unavailable";
+    return (
+      <TooltipProvider delayDuration={500} skipDelayDuration={0}>
+        <Tooltip>
+          <TooltipTrigger asChild onPointerMove={onPointerMove}>
+            {children}
+          </TooltipTrigger>
+          <TooltipContent ref={contentRef} side="top">
+            {message}
+          </TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
+    );
+  }
+  if (metadata.state.kind !== "ready" || !metadata.state.snippet.trim()) {
+    return children;
+  }
+  const content = metadata.state.snippet;
+  const sender = metadata.state.author;
+  const age = formatMessageAge(metadata.state.createdAt);
+  return (
+    <TooltipProvider delayDuration={500} skipDelayDuration={0}>
+      <Tooltip>
+        <TooltipTrigger asChild onPointerMove={onPointerMove}>
+          {children}
+        </TooltipTrigger>
+        <TooltipContent
+          ref={contentRef}
+          className="w-72 max-w-[min(18rem,calc(100vw-2rem))] px-3 py-2 text-left"
+          side="top"
+        >
+          <span
+            className="line-clamp-3 [overflow-wrap:anywhere] whitespace-normal"
+            data-buzz-tooltip-metadata-content=""
+          >
+            {content}
+          </span>
+          <span
+            className="mt-1 block max-w-full truncate whitespace-nowrap text-2xs text-secondary-foreground/80"
+            data-buzz-tooltip-metadata-type=""
+          >
+            {footer}
+            {sender ? ` · ${sender}` : null}
+            {` · ${age}`}
+          </span>
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+}
+
 function ResolvedMessageLinkPill(props: MessageLinkPillProps) {
   const channel = useChannelReference(props.link.channelId);
   const openable = isChannelReferenceOpenable(channel);
   return (
     <MessageLinkPillContents
       {...props}
+      channel={openable ? channel : undefined}
       channelLabel={openable ? channel.name : undefined}
       openable={openable}
     />
@@ -55,20 +147,36 @@ function ResolvedMessageLinkPill(props: MessageLinkPillProps) {
 }
 
 function MessageLinkPillContents({
+  channel,
   href,
   interactive,
   link,
+  onOpenChannel,
   onOpenMessageLink,
   threadExcerpt,
   variant = "default",
   channelLabel: resolvedChannelLabel,
   openable = true,
-}: MessageLinkPillProps & { channelLabel?: string; openable?: boolean }) {
+}: MessageLinkPillProps & {
+  channel?: NonNullable<MessageLinkPillProps["channels"]>[number];
+  channelLabel?: string;
+  openable?: boolean;
+}) {
   const [isHovered, setIsHovered] = React.useState(false);
   const channelLabel = resolvedChannelLabel ?? link.channelId.slice(0, 8);
-  const shortId = link.messageId.slice(0, 8);
   const isSentFromThread = variant === "sent-from-thread";
   const permalink = href ?? buildMessageLink(link);
+  const shouldLoadMetadata = openable && interactive && variant === "default";
+  const metadata = useMessageLinkMetadata(link, shouldLoadMetadata);
+  const destination =
+    channel?.channelType === "dm" ? channelLabel : `#${channelLabel}`;
+  const tooltipFooter = link.threadRootId
+    ? `Thread in ${destination}`
+    : channel?.channelType === "dm"
+      ? `Direct message with ${destination}`
+      : channel?.channelType === "forum"
+        ? `Forum post in ${destination}`
+        : destination;
   const label = getMessageLinkLabel({
     channelName: channelLabel,
     threadExcerpt,
@@ -76,25 +184,58 @@ function MessageLinkPillContents({
   });
 
   if (!isSentFromThread) {
-    return (
+    // Keep fetched metadata and identity out of the visible label so resolution
+    // never changes the chip width.
+    const chipLabel = truncateInlineChipLabel(channelLabel);
+    const isDeleted = metadata.state.kind === "deleted";
+    const chip = (
       <BuzzLinkChip
         data-message-link=""
+        data-message-link-state={isDeleted ? "deleted" : undefined}
         href={permalink}
         icon="message"
         aria-label={
-          openable
-            ? `Open message ${shortId} in channel ${channelLabel}`
-            : `Message ${shortId} in channel ${channelLabel}`
+          !openable
+            ? `Message in channel ${channelLabel}`
+            : isDeleted
+              ? link.threadRootId
+                ? `Open thread in channel ${channelLabel}; linked message was deleted`
+                : `Open channel ${channelLabel}; linked message was deleted`
+              : `Open message in channel ${channelLabel}`
         }
-        title={label}
+        className={cn(
+          metadata.state.kind === "unavailable" && "buzz-link-unavailable",
+          isDeleted && "buzz-link-deleted",
+        )}
         interactive={openable && interactive}
         onOpenLink={() => {
-          if (openable) onOpenMessageLink(link);
+          if (!openable) return;
+          if (!isDeleted) {
+            onOpenMessageLink(link);
+            return;
+          }
+          if (link.threadRootId) {
+            onOpenMessageLink({
+              ...link,
+              messageId: link.threadRootId,
+              threadRootId: link.threadRootId,
+            });
+            return;
+          }
+          onOpenChannel(link.channelId);
         }}
+        wrapping
       >
-        {channelLabel} · {shortId}
+        {chipLabel}
       </BuzzLinkChip>
     );
+    return interactive ? (
+      <MessageLinkMetadataTooltip footer={tooltipFooter} metadata={metadata}>
+        {chip}
+      </MessageLinkMetadataTooltip>
+    ) : (
+      chip
+    );
   }
 
   if (!interactive || !openable) {
@@ -149,7 +290,11 @@ export function MessageLinkPill(props: MessageLinkPillProps) {
 
   if (knownChannel || !props.resolveChannelReference) {
     return (
-      <MessageLinkPillContents {...props} channelLabel={knownChannel?.name} />
+      <MessageLinkPillContents
+        {...props}
+        channel={knownChannel}
+        channelLabel={knownChannel?.name}
+      />
     );
   }
 
diff --git a/desktop/src/shared/ui/markdown/entityLinks.tsx b/desktop/src/shared/ui/markdown/entityLinks.tsx
index 7eb5ea53c5..29f4ef69a3 100644
--- a/desktop/src/shared/ui/markdown/entityLinks.tsx
+++ b/desktop/src/shared/ui/markdown/entityLinks.tsx
@@ -1,6 +1,8 @@
 import * as React from "react";
 
 import { useAppNavigation } from "@/app/navigation/useAppNavigation";
+import { useProjectsQuery } from "@/features/projects/hooks";
+import type { Project } from "@/features/projects/projectModels";
 import {
   entityLinkProjectRouteId,
   isEntityLink,
@@ -12,7 +14,114 @@ import {
   type SupportedLinkPreview,
 } from "@/shared/lib/linkPreview";
 
+import {
+  loadBuzzEntityMetadata,
+  type LinkPreviewMetadata,
+} from "@/shared/lib/useResolvedLinkPreviews";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/shared/ui/tooltip";
+
 import { BuzzInlineLink, BuzzLinkChip } from "./BuzzLinkChip";
+import { useInlineTooltipPosition } from "./useInlineTooltipPosition";
+
+function EntityMetadataTooltip({
+  children,
+  fallback,
+  footer,
+  href,
+  link,
+  projects,
+}: {
+  children: (
+    metadata: LinkPreviewMetadata | null | undefined,
+  ) => React.ReactElement;
+  fallback: string;
+  footer: string;
+  href: string;
+  link: ParsedEntityLink;
+  projects: Project[] | undefined;
+}) {
+  const { contentRef, onPointerMove } = useInlineTooltipPosition();
+  const [resolved, setResolved] = React.useState<{
+    href: string;
+    metadata: LinkPreviewMetadata | null;
+  } | null>(null);
+  React.useEffect(() => {
+    let cancelled = false;
+    void loadBuzzEntityMetadata(href).then((value) => {
+      if (!cancelled) setResolved({ href, metadata: value });
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [href]);
+  const metadata = resolved?.href === href ? resolved.metadata : undefined;
+  const repositoryAddress =
+    link.type === "issue" || link.type === "pr"
+      ? `30617:${link.owner}:${link.dtag}`
+      : null;
+  const containingProject = repositoryAddress
+    ? projects?.find((project) =>
+        project.repositoryAddresses.includes(repositoryAddress),
+      )
+    : null;
+  const resolvedTitle = metadata?.title.trim();
+  const chipRepeatsTitle =
+    Boolean(resolvedTitle) && (link.type === "issue" || link.type === "pr");
+  const projectName = containingProject?.name.trim();
+  const projectDescription = containingProject?.description.trim();
+  const projectContext = projectName
+    ? projectDescription && projectDescription !== projectName
+      ? `${projectName} · ${projectDescription}`
+      : projectName
+    : null;
+  const context =
+    metadata === null
+      ? null
+      : (link.type === "issue" || link.type === "pr") && resolvedTitle
+        ? resolvedTitle
+        : projectContext
+          ? projectContext
+          : chipRepeatsTitle
+            ? metadata?.description
+            : [resolvedTitle || fallback, metadata?.description]
+                .filter((value): value is string => Boolean(value))
+                .join(" · ");
+  const chip = children(metadata);
+  return (
+    <TooltipProvider delayDuration={500} skipDelayDuration={0}>
+      <Tooltip>
+        <TooltipTrigger asChild onPointerMove={onPointerMove}>
+          {chip}
+        </TooltipTrigger>
+        <TooltipContent
+          ref={contentRef}
+          className="max-w-72 p-2 text-left"
+          side="top"
+        >
+          {context ? (
+            <span
+              className="line-clamp-3 [overflow-wrap:anywhere] whitespace-normal"
+              data-buzz-tooltip-metadata-content=""
+            >
+              {context}
+            </span>
+          ) : null}
+          <span
+            className={`${context ? "mt-1 " : ""}line-clamp-2 max-w-full [overflow-wrap:anywhere] whitespace-normal text-2xs text-secondary-foreground/80`}
+            data-buzz-tooltip-metadata-type=""
+          >
+            {footer}
+          </span>
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+}
 
 function entityLinkPresentation(link: ParsedEntityLink) {
   switch (link.type) {
@@ -25,24 +134,30 @@ function entityLinkPresentation(link: ParsedEntityLink) {
         label: link.commitHash
           ? `${link.dtag} · ${link.commitHash.slice(0, 8)}`
           : link.dtag,
+        tooltipFooter: "Repository",
       };
     case "pr":
       return {
         ariaLabel: `Open pull request ${link.id.slice(0, 8)} in repository ${link.dtag}`,
         icon: "pr" as const,
         label: `${link.dtag} · ${link.id.slice(0, 8)}`,
+        tooltipFooter: `Pull request · ${link.dtag}`,
       };
     case "issue":
       return {
         ariaLabel: `Open issue ${link.id.slice(0, 8)} in repository ${link.dtag}`,
         icon: "issue" as const,
+        // Tooltip fallback only — the inline chip renders the repository name
+        // alone (see `chip` below).
         label: `${link.dtag} · ${link.id.slice(0, 8)}`,
+        tooltipFooter: `Issue · ${link.dtag}`,
       };
     case "project":
       return {
         ariaLabel: `Open project ${link.dtag}`,
         icon: "project" as const,
         label: link.dtag,
+        tooltipFooter: "Project",
       };
   }
 }
@@ -123,13 +238,46 @@ function resolveEntityHref(
  * the href is not a valid entity link so the caller can fall through to its
  * default anchor.
  */
-export function renderEntityLinkAnchor({
+export function EntityLinkAnchor({
   children,
   href,
   onOpenEntityLink,
   relayOrigin,
   interactive = true,
   asChip = true,
+}: {
+  children?: React.ReactNode;
+  href: string;
+  onOpenEntityLink: (link: ParsedEntityLink) => void;
+  relayOrigin: string | null;
+  interactive?: boolean;
+  asChip?: boolean;
+}): React.ReactElement | null {
+  const { data: projects } = useProjectsQuery();
+  return renderEntityLinkAnchor({
+    children,
+    href,
+    onOpenEntityLink,
+    relayOrigin,
+    interactive,
+    asChip,
+    projects,
+  });
+}
+
+/**
+ * Pure rendering boundary retained for static-markup tests and non-provider
+ * callers. The normal Markdown path uses `EntityLinkAnchor` above so the
+ * authoritative Projects read model can enrich issue/PR tooltips.
+ */
+export function renderEntityLinkAnchor({
+  children,
+  href,
+  onOpenEntityLink,
+  relayOrigin,
+  interactive = true,
+  asChip = true,
+  projects,
 }: {
   children: React.ReactNode;
   href: string | undefined;
@@ -137,6 +285,7 @@ export function renderEntityLinkAnchor({
   relayOrigin: string | null;
   interactive?: boolean;
   asChip?: boolean;
+  projects?: Project[];
 }): React.ReactElement | null {
   if (!href) return null;
 
@@ -161,17 +310,45 @@ export function renderEntityLinkAnchor({
     );
   }
 
-  return (
-    <BuzzLinkChip
-      data-buzz-link-kind={parsed.value.type}
-      href={href}
-      icon={presentation.icon}
-      title={href}
-      aria-label={presentation.ariaLabel}
-      interactive={interactive}
-      onOpenLink={() => onOpenEntityLink(parsed.value)}
+  const chip = (metadata?: LinkPreviewMetadata | null) => {
+    const resolvedContext = metadata?.title.trim();
+    // Fetched metadata belongs in the tooltip and accessible name, never the
+    // visible chip. PR and issue chips share the repository-name label so their
+    // inline width stays stable before, during, and after resolution.
+    const chipLabel =
+      parsed.value.type === "pr" || parsed.value.type === "issue"
+        ? parsed.value.dtag
+        : presentation.label;
+    const ariaLabel =
+      resolvedContext &&
+      (parsed.value.type === "pr" || parsed.value.type === "issue")
+        ? `${presentation.ariaLabel}: ${parsed.value.dtag} · ${resolvedContext}`
+        : presentation.ariaLabel;
+    return (
+      <BuzzLinkChip
+        data-buzz-link-kind={parsed.value.type}
+        href={href}
+        icon={presentation.icon}
+        aria-label={ariaLabel}
+        interactive={interactive}
+        onOpenLink={() => onOpenEntityLink(parsed.value)}
+        wrapping
+      >
+        {chipLabel}
+      </BuzzLinkChip>
+    );
+  };
+  return interactive ? (
+    <EntityMetadataTooltip
+      fallback={presentation.label}
+      footer={presentation.tooltipFooter}
+      href={canonicalHref}
+      link={parsed.value}
+      projects={projects}
     >
-      {presentation.label}
-    </BuzzLinkChip>
+      {chip}
+    </EntityMetadataTooltip>
+  ) : (
+    chip()
   );
 }
diff --git a/desktop/src/shared/ui/markdown/types.ts b/desktop/src/shared/ui/markdown/types.ts
index 47834be609..9a684de764 100644
--- a/desktop/src/shared/ui/markdown/types.ts
+++ b/desktop/src/shared/ui/markdown/types.ts
@@ -29,6 +29,7 @@ export type MessageLinkPillProps = {
   href?: string;
   interactive: boolean;
   link: ParsedMessageLink;
+  onOpenChannel: (channelId: string) => void;
   onOpenMessageLink: (link: ParsedMessageLink) => void;
   threadExcerpt?: string | null;
   variant?: "default" | "sent-from-thread";
diff --git a/desktop/src/shared/ui/markdown/useInlineTooltipPosition.ts b/desktop/src/shared/ui/markdown/useInlineTooltipPosition.ts
new file mode 100644
index 0000000000..afa0f23d9c
--- /dev/null
+++ b/desktop/src/shared/ui/markdown/useInlineTooltipPosition.ts
@@ -0,0 +1,101 @@
+import * as React from "react";
+
+const VIEWPORT_INSET = 8;
+
+function distanceToRect(rect: DOMRect, x: number, y: number): number {
+  const dx = Math.max(rect.left - x, 0, x - rect.right);
+  const dy = Math.max(rect.top - y, 0, y - rect.bottom);
+  return dx * dx + dy * dy;
+}
+
+/** Keeps a tooltip centered over the inline fragment currently under the pointer. */
+export function useInlineTooltipPosition() {
+  const contentRef = React.useRef<HTMLDivElement | null>(null);
+  const fragmentCenterXRef = React.useRef<number | null>(null);
+  const placementObserverRef = React.useRef<MutationObserver | null>(null);
+  const placedRef = React.useRef(false);
+
+  const positionContent = React.useCallback(() => {
+    const content = contentRef.current;
+    const fragmentCenterX = fragmentCenterXRef.current;
+    if (!content || fragmentCenterX === null || !placedRef.current) return;
+    const wrapper = content.parentElement;
+    if (!wrapper) return;
+    const rect = content.getBoundingClientRect();
+    const maxLeft = Math.max(
+      VIEWPORT_INSET,
+      window.innerWidth - VIEWPORT_INSET - rect.width,
+    );
+    const desiredLeft = Math.min(
+      Math.max(fragmentCenterX - rect.width / 2, VIEWPORT_INSET),
+      maxLeft,
+    );
+    const correction = desiredLeft - rect.left;
+    if (Math.abs(correction) < 0.5) return;
+    const currentOffset = Number.parseFloat(wrapper.style.marginLeft) || 0;
+    wrapper.style.marginLeft = `${currentOffset + correction}px`;
+  }, []);
+
+  const setContentRef = React.useCallback(
+    (content: HTMLDivElement | null) => {
+      placementObserverRef.current?.disconnect();
+      placementObserverRef.current = null;
+      contentRef.current = content;
+      placedRef.current = false;
+      const wrapper = content?.parentElement;
+      if (!content || !wrapper) return;
+
+      let transform = wrapper.style.transform;
+      const handlePlacement = () => {
+        const nextTransform = wrapper.style.transform;
+        if (nextTransform === transform) return;
+        transform = nextTransform;
+        placedRef.current = true;
+        positionContent();
+      };
+      const observer = new MutationObserver(handlePlacement);
+      observer.observe(wrapper, {
+        attributeFilter: ["style"],
+        attributes: true,
+      });
+      placementObserverRef.current = observer;
+      requestAnimationFrame(() => {
+        if (contentRef.current !== content) return;
+        placedRef.current = true;
+        positionContent();
+      });
+    },
+    [positionContent],
+  );
+
+  React.useEffect(() => () => placementObserverRef.current?.disconnect(), []);
+
+  const onPointerMove = React.useCallback(
+    (event: React.PointerEvent<HTMLElement>) => {
+      const rects = Array.from(event.currentTarget.getClientRects()).filter(
+        (rect) => rect.width > 0 && rect.height > 0,
+      );
+      if (rects.length <= 1) {
+        fragmentCenterXRef.current = null;
+        contentRef.current?.parentElement?.style.removeProperty("margin-left");
+        return;
+      }
+      const fragment = rects.reduce<DOMRect | null>((nearest, rect) => {
+        if (!nearest) return rect;
+        return distanceToRect(rect, event.clientX, event.clientY) <
+          distanceToRect(nearest, event.clientX, event.clientY)
+          ? rect
+          : nearest;
+      }, null);
+      if (!fragment) return;
+      fragmentCenterXRef.current = fragment.left + fragment.width / 2;
+      positionContent();
+    },
+    [positionContent],
+  );
+
+  return {
+    contentRef: setContentRef,
+    onPointerMove,
+  };
+}
diff --git a/desktop/src/shared/ui/markdown/useMessageLinkMetadata.ts b/desktop/src/shared/ui/markdown/useMessageLinkMetadata.ts
new file mode 100644
index 0000000000..7a05174334
--- /dev/null
+++ b/desktop/src/shared/ui/markdown/useMessageLinkMetadata.ts
@@ -0,0 +1,125 @@
+import * as React from "react";
+
+import type { ParsedMessageLink } from "@/features/messages/lib/messageLink";
+import { summarizeMessageLinkContent } from "@/features/messages/lib/messageLinkMetadata";
+import { getEventById } from "@/shared/api/tauri";
+import { getUserProfile } from "@/shared/api/tauriProfiles";
+import { truncatePubkey } from "@/shared/lib/pubkey";
+import { isDefinitiveEventNotFound } from "@/shared/lib/eventLookupError";
+
+const MESSAGE_METADATA_RETRY_DELAY_MS = 750;
+const PREVIEWABLE_MESSAGE_KINDS = new Set([9, 40002, 45001, 45003]);
+
+function waitForMessageMetadataRetry(): Promise<void> {
+  return new Promise((resolve) => {
+    window.setTimeout(resolve, MESSAGE_METADATA_RETRY_DELAY_MS);
+  });
+}
+
+async function getMessageLinkEvent(messageId: string) {
+  try {
+    return await getEventById(messageId);
+  } catch (error) {
+    if (isDefinitiveEventNotFound(error)) throw error;
+    await waitForMessageMetadataRetry();
+    return getEventById(messageId);
+  }
+}
+
+type MessageLinkMetadata = {
+  author: string;
+  createdAt: number;
+  snippet: string;
+};
+type MessageLinkMetadataState =
+  | { kind: "idle" }
+  | { kind: "loading" }
+  | ({ kind: "ready" } & MessageLinkMetadata)
+  | { kind: "deleted" }
+  | { kind: "unavailable" };
+
+type CachedMessageLinkMetadata =
+  | ({ kind: "ready" } & MessageLinkMetadata)
+  | { kind: "deleted" }
+  | { kind: "unavailable" };
+
+const metadataCache = new Map<string, Promise<CachedMessageLinkMetadata>>();
+
+export function resetMessageLinkMetadataCache() {
+  metadataCache.clear();
+}
+
+function fetchMetadata(
+  link: Pick<ParsedMessageLink, "channelId" | "messageId">,
+): Promise<CachedMessageLinkMetadata> {
+  const key = `${link.channelId}:${link.messageId}`;
+  let request = metadataCache.get(key);
+  if (!request) {
+    request = getMessageLinkEvent(link.messageId)
+      .then(async (event) => {
+        const eventChannelId = event.tags.find((tag) => tag[0] === "h")?.[1];
+        if (
+          eventChannelId !== link.channelId ||
+          !PREVIEWABLE_MESSAGE_KINDS.has(event.kind)
+        ) {
+          return { kind: "unavailable" } as const;
+        }
+        const profile = await getUserProfile(event.pubkey).catch(() => null);
+        return {
+          kind: "ready" as const,
+          author:
+            profile?.displayName?.trim() ||
+            profile?.nip05Handle?.trim() ||
+            truncatePubkey(event.pubkey),
+          createdAt: event.created_at,
+          snippet: summarizeMessageLinkContent(event.content),
+        };
+      })
+      .catch((error) =>
+        isDefinitiveEventNotFound(error)
+          ? ({ kind: "deleted" } as const)
+          : ({ kind: "unavailable" } as const),
+      );
+    metadataCache.set(key, request);
+    void request.then((result) => {
+      if (result.kind === "unavailable" && metadataCache.get(key) === request) {
+        metadataCache.delete(key);
+      }
+    });
+  }
+  return request;
+}
+
+export function useMessageLinkMetadata(
+  link: ParsedMessageLink,
+  channelReadable: boolean,
+): { state: MessageLinkMetadataState } {
+  const [resolved, setResolved] = React.useState<{
+    key: string;
+    state: CachedMessageLinkMetadata;
+  } | null>(null);
+  const requestId = React.useRef(0);
+  const key = `${link.channelId}:${link.messageId}`;
+  React.useEffect(() => {
+    requestId.current += 1;
+    if (!channelReadable) return;
+
+    const currentRequest = requestId.current;
+    const currentLink = {
+      channelId: link.channelId,
+      messageId: link.messageId,
+    };
+    void fetchMetadata(currentLink).then((metadata) => {
+      if (requestId.current === currentRequest) {
+        setResolved({ key, state: metadata });
+      }
+    });
+    return () => {
+      requestId.current += 1;
+    };
+  }, [channelReadable, key, link.channelId, link.messageId]);
+  if (!channelReadable) return { state: { kind: "idle" } };
+  return {
+    state: resolved?.key === key ? resolved.state : { kind: "loading" },
+  };
+}
diff --git a/desktop/src/shared/ui/mentionChip.ts b/desktop/src/shared/ui/mentionChip.ts
index b294576597..5c92272858 100644
--- a/desktop/src/shared/ui/mentionChip.ts
+++ b/desktop/src/shared/ui/mentionChip.ts
@@ -2,6 +2,20 @@ export const MENTION_CHIP_BASE_CLASSES = "mention-chip";
 
 export const MENTION_CHIP_HOVER_CLASSES = "mention-chip-hover";
 
+const INLINE_CHIP_LABEL_MAX_CHARACTERS = 48;
+
+/** Caps a fragmentable chip label without changing its underlying metadata. */
+export function truncateInlineChipLabel(label: string): string {
+  const characters = Array.from(label);
+  if (characters.length <= INLINE_CHIP_LABEL_MAX_CHARACTERS) return label;
+  return `${characters
+    .slice(0, INLINE_CHIP_LABEL_MAX_CHARACTERS - 1)
+    .join("")}…`;
+}
+
+/** Allows a long chip to fragment into separately decorated line boxes. */
+export const WRAPPING_INLINE_CHIP_CLASSES = "wrapping-inline-chip";
+
 export type InlineChipIconKind =
   | "agent"
   | "human"
diff --git a/desktop/src/shared/ui/tooltip.tsx b/desktop/src/shared/ui/tooltip.tsx
index 6af9e48188..847772fd85 100644
--- a/desktop/src/shared/ui/tooltip.tsx
+++ b/desktop/src/shared/ui/tooltip.tsx
@@ -21,7 +21,15 @@ const TooltipProvider = ({
   />
 );
 
-const Tooltip = TooltipPrimitive.Root;
+const Tooltip = ({
+  disableHoverableContent = true,
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Root>) => (
+  <TooltipPrimitive.Root
+    disableHoverableContent={disableHoverableContent}
+    {...props}
+  />
+);
 
 const TooltipTrigger = TooltipPrimitive.Trigger;
 
@@ -34,7 +42,7 @@ const TooltipContent = React.forwardRef<
       ref={ref}
       sideOffset={sideOffset}
       className={cn(
-        "z-50 overflow-hidden rounded-md bg-primary px-3 py-1.5 text-xs text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-(--radix-tooltip-content-transform-origin)",
+        "pointer-events-none z-50 overflow-hidden rounded-md bg-secondary px-3 py-1.5 text-xs text-secondary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-(--radix-tooltip-content-transform-origin)",
         className,
       )}
       {...props}
diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts
index a23d996a6e..e4028f0171 100644
--- a/desktop/src/testing/e2eBridge.ts
+++ b/desktop/src/testing/e2eBridge.ts
@@ -10066,12 +10066,12 @@ async function resolveGetEvent(
   },
   config: E2eConfig | undefined,
 ) {
+  // Allow test specs to mark specific event IDs as definitively deleted.
+  if (config?.mock?.deletedEventIds?.includes(args.eventId)) {
+    throw new Error("event not found");
+  }
   const identity = getIdentity(config);
   if (!identity) {
-    // Allow test specs to mark specific event IDs as definitively deleted.
-    if (config?.mock?.deletedEventIds?.includes(args.eventId)) {
-      throw new Error("event not found");
-    }
     const knownEvents: RelayEvent[] = [
       ...Array.from(mockMessages.values()).flat(),
       {
diff --git a/desktop/tests/e2e/entity-link-recipient-cards.spec.ts b/desktop/tests/e2e/entity-link-recipient-cards.spec.ts
index a120e436da..5f8eb5793d 100644
--- a/desktop/tests/e2e/entity-link-recipient-cards.spec.ts
+++ b/desktop/tests/e2e/entity-link-recipient-cards.spec.ts
@@ -18,35 +18,50 @@ const REPO_ADDRESS = `30617:${ALICE_PUBKEY}:relay-tools`;
 const PR_ID = `e0${"ca4d".repeat(15)}ff`; // 64-hex event id
 const PR_SUBJECT = "Restore recipient-side entity cards";
 const ISSUE_ID = `f0${"1a2b".repeat(15)}ee`; // 64-hex event id
-const ISSUE_SUBJECT = "Reopen identical issue links";
+const ISSUE_SUBJECT =
+  "Smoke test: issue tracking on relay-tools with a deliberately long title";
 
-test("agent-style message with bare buzz:// links renders entity cards without snapshot tags", async ({
+test("agent-style message with angle-bracket buzz:// links renders entity cards without snapshot tags", async ({
   page,
 }) => {
   await page.addInitScript(
-    ({ repoAddress, prId, alicePubkey, subject }) => {
+    ({ repoAddress, prId, issueId, alicePubkey, prSubject, issueSubject }) => {
+      const createdAt = Math.floor(Date.now() / 1000) - 60;
       window.__BUZZ_E2E_EXTRA_PROJECT_EVENTS__ = [
         {
           id: prId,
           kind: 1618, // KIND_GIT_PULL_REQUEST
           pubkey: alicePubkey,
-          created_at: Math.floor(Date.now() / 1000) - 60,
+          created_at: createdAt,
           content: "PR body",
           tags: [
             ["a", repoAddress],
-            ["subject", subject],
+            ["subject", prSubject],
             ["c", "abc123".padEnd(40, "0")],
             ["branch-name", "fix/entity-cards"],
             ["clone", "https://github.com/block/relay-tools.git"],
           ],
         },
+        {
+          id: issueId,
+          kind: 1621, // KIND_GIT_ISSUE
+          pubkey: alicePubkey,
+          created_at: createdAt,
+          content: "Issue body",
+          tags: [
+            ["a", repoAddress],
+            ["subject", issueSubject],
+          ],
+        },
       ];
     },
     {
       repoAddress: REPO_ADDRESS,
       prId: PR_ID,
+      issueId: ISSUE_ID,
       alicePubkey: ALICE_PUBKEY,
-      subject: PR_SUBJECT,
+      prSubject: PR_SUBJECT,
+      issueSubject: ISSUE_SUBJECT,
     },
   );
   await installMockBridge(page);
@@ -57,21 +72,24 @@ test("agent-style message with bare buzz:// links renders entity cards without s
     () => typeof window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__ === "function",
   );
 
-  // Simulate an agent/CLI sender: plain kind-9 message with bare buzz://
-  // URLs in the content and NO link-preview snapshot tags.
+  // Simulate an agent/CLI sender: plain kind-9 message with angle-bracket
+  // buzz:// URLs in a Markdown list and NO link-preview snapshot tags.
   await page.evaluate(
-    ({ prId, alicePubkey }) => {
+    ({ prId, issueId, alicePubkey }) => {
       window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({
         channelName: "general",
         pubkey: alicePubkey,
         content: [
           "PR is up — review when you can:",
-          `buzz://pr?id=${prId}&owner=${alicePubkey}&d=relay-tools`,
-          `Repo: buzz://repo?owner=${alicePubkey}&d=relay-tools`,
+          "",
+          `- Pull request with enough leading context to wrap: <buzz://pr?id=${prId}&owner=${alicePubkey}&d=relay-tools>`,
+          `- Issue: <buzz://issue?id=${issueId}&owner=${alicePubkey}&d=relay-tools>`,
+          `- Repository: <buzz://repo?owner=${alicePubkey}&d=relay-tools>`,
+          `- Missing repo: <buzz://repo?owner=${alicePubkey}&d=missing-repo>`,
         ].join("\n"),
       });
     },
-    { prId: PR_ID, alicePubkey: ALICE_PUBKEY },
+    { prId: PR_ID, issueId: ISSUE_ID, alicePubkey: ALICE_PUBKEY },
   );
 
   const row = page
@@ -85,7 +103,7 @@ test("agent-style message with bare buzz:// links renders entity cards without s
   await expect(prCard).toBeVisible();
   await expect(prCard).toContainText("relay-tools");
   await expect(prCard).toContainText(PR_SUBJECT);
-  await expect(prCard).toContainText(
+  await expect(prCard).not.toContainText(
     "Open · fix/entity-cards → main · abc1230",
   );
   await expect(prCard).toHaveAttribute("data-image-state", "none");
@@ -96,10 +114,90 @@ test("agent-style message with bare buzz:// links renders entity cards without s
   await expect(
     prCard.locator("[data-link-preview-hostname-favicon]"),
   ).toHaveCount(0);
+  const prChip = row.getByRole("button", {
+    name: /Open pull request .* in repository relay-tools/,
+  });
+  await expect(prChip).toHaveAccessibleName(
+    `Open pull request ${PR_ID.slice(0, 8)} in repository relay-tools: relay-tools · ${PR_SUBJECT}`,
+  );
+  await expect(prChip).not.toHaveAttribute("title");
+  await expect(prChip).toHaveClass(/wrapping-inline-chip/);
+  await expect(prChip).toHaveCSS("display", "inline");
+  await expect(prChip.locator(".truncate")).toHaveCount(0);
+  await expect(prChip).toHaveText("relay-tools");
+  await expect(prChip).not.toContainText(PR_SUBJECT);
+  await expect(prChip).not.toContainText(PR_ID.slice(0, 8));
+  // Fetched subjects stay out of the inline chip, so metadata resolution cannot
+  // resize the surrounding message.
+  await prChip.hover();
+  const prTooltip = page.getByRole("tooltip");
+  const prContext = prTooltip.locator(
+    '[data-buzz-tooltip-metadata-content=""]',
+  );
+  await expect(prContext).toHaveText(PR_SUBJECT);
+  await expect(prContext).toHaveClass(/line-clamp-3/);
+  await expect(prContext).toHaveCSS("overflow-wrap", "anywhere");
+  const prFooter = prTooltip.locator('[data-buzz-tooltip-metadata-type=""]');
+  await expect(prFooter).toHaveText("Pull request · relay-tools");
+  await expect(prFooter).toHaveCSS("overflow-wrap", "anywhere");
+  await expect(prFooter).toHaveCSS("white-space", "normal");
+  const tooltipSemanticColors = await prTooltip.evaluate((element) => {
+    const styles = getComputedStyle(element);
+    const probe = document.createElement("span");
+    probe.style.backgroundColor = "hsl(var(--secondary))";
+    probe.style.color = "hsl(var(--secondary-foreground))";
+    document.body.append(probe);
+    const semanticStyles = getComputedStyle(probe);
+    const result = {
+      actual: [styles.backgroundColor, styles.color],
+      expected: [semanticStyles.backgroundColor, semanticStyles.color],
+    };
+    probe.remove();
+    return result;
+  });
+  expect(tooltipSemanticColors.actual).toEqual(tooltipSemanticColors.expected);
+  await expect(prChip).toHaveText("relay-tools");
+
+  const issueChip = row.getByRole("button", {
+    name: /Open issue .* in repository relay-tools/,
+  });
+  // The issue chip is the repository name alone — resolved metadata never
+  // reaches the inline label, so it neither absorbs the title nor falls back
+  // to the event hash.
+  await expect(issueChip).toHaveText("relay-tools");
+  await expect(issueChip).toHaveAccessibleName(
+    `Open issue ${ISSUE_ID.slice(0, 8)} in repository relay-tools: relay-tools · ${ISSUE_SUBJECT}`,
+  );
+  await expect(issueChip).not.toContainText(ISSUE_SUBJECT);
+  await expect(issueChip).not.toContainText(ISSUE_ID.slice(0, 8));
+  await expect(issueChip).toHaveClass(/wrapping-inline-chip/);
+  await expect(issueChip).toHaveCSS("display", "inline");
+  await expect(issueChip.locator(".truncate")).toHaveCount(0);
+  await issueChip.hover();
+  const issueTooltip = page.getByRole("tooltip");
+  const issueContext = issueTooltip.locator(
+    '[data-buzz-tooltip-metadata-content=""]',
+  );
+  await expect(issueContext).toHaveText(ISSUE_SUBJECT);
+  await expect(issueContext).toHaveClass(/line-clamp-3/);
+  await expect(issueContext).toHaveCSS("overflow-wrap", "anywhere");
+  await expect(issueContext).toHaveCSS("white-space", "normal");
+  await expect
+    .poll(() =>
+      issueContext.evaluate(
+        (element) => element.scrollHeight <= element.clientHeight,
+      ),
+    )
+    .toBe(true);
+  await expect(
+    issueTooltip.locator('[data-buzz-tooltip-metadata-type=""]'),
+  ).toHaveText("Issue · relay-tools");
 
   // The repository card uses its signed announcement metadata and remains
   // image-less.
-  const repoCard = row.locator('[data-link-preview="buzz-repository"]');
+  const repoCard = row
+    .locator('[data-link-preview="buzz-repository"]')
+    .filter({ hasText: "relay-tools" });
   await expect(repoCard).toBeVisible();
   await expect(repoCard).toContainText("relay-tools");
   await expect(repoCard).toContainText(
@@ -116,6 +214,49 @@ test("agent-style message with bare buzz:// links renders entity cards without s
   await expect(
     repoCard.locator("[data-link-preview-hostname-favicon]"),
   ).toHaveCount(0);
+  const repoChip = row.getByRole("button", {
+    name: "Open repository relay-tools",
+  });
+  await repoChip.hover();
+  const repoTooltip = page.getByRole("tooltip");
+  await expect(
+    repoTooltip.locator('[data-buzz-tooltip-metadata-content=""]'),
+  ).toContainText("Operator tooling and admin CLI for relay deployments.");
+  await expect(
+    repoTooltip.locator('[data-buzz-tooltip-metadata-type=""]'),
+  ).toHaveText("Repository");
+  const missingRepoChip = row.getByRole("button", {
+    name: "Open repository missing-repo",
+  });
+  await expect(missingRepoChip).not.toHaveClass(/buzz-link-unavailable/);
+  const missingRepoColors = await missingRepoChip.evaluate((element) => {
+    const styles = getComputedStyle(element);
+    const probe = document.createElement("span");
+    probe.style.backgroundColor = "hsl(var(--primary) / 0.15)";
+    probe.style.color = "hsl(var(--primary))";
+    document.body.append(probe);
+    const semanticStyles = getComputedStyle(probe);
+    const result = {
+      actual: [styles.backgroundColor, styles.color],
+      expected: [semanticStyles.backgroundColor, semanticStyles.color],
+    };
+    probe.remove();
+    return result;
+  });
+  expect(missingRepoColors.actual).toEqual(missingRepoColors.expected);
+  // Definitive metadata misses keep the tooltip's byline without repeating
+  // the chip's stable identity.
+  await missingRepoChip.hover();
+  const missingRepoTooltip = page.getByRole("tooltip");
+  await expect(
+    missingRepoTooltip.locator('[data-buzz-tooltip-metadata-content=""]'),
+  ).toHaveCount(0);
+  const missingRepoFooter = missingRepoTooltip.locator(
+    '[data-buzz-tooltip-metadata-type=""]',
+  );
+  await expect(missingRepoFooter).toHaveText("Repository");
+  await expect(missingRepoFooter).toHaveClass(/text-secondary-foreground\/80/);
+  await expect(missingRepoFooter).not.toHaveClass(/text-primary-foreground/);
   // Default typography is 14px; keep the image-less card compact while
   // allowing fractional line-height rounding across rendering platforms.
   expect(
@@ -129,6 +270,120 @@ test("agent-style message with bare buzz:// links renders entity cards without s
   });
 });
 
+test("issue chip width is metadata-independent while the title loads", async ({
+  page,
+}) => {
+  await page.addInitScript(
+    ({ repoAddress, issueId, alicePubkey, issueSubject }) => {
+      window.__BUZZ_E2E_EXTRA_PROJECT_EVENTS__ = [
+        {
+          id: issueId,
+          kind: 1621, // KIND_GIT_ISSUE
+          pubkey: alicePubkey,
+          created_at: Math.floor(Date.now() / 1000) - 60,
+          content: "Issue body",
+          tags: [
+            ["a", repoAddress],
+            ["subject", issueSubject],
+          ],
+        },
+      ];
+    },
+    {
+      repoAddress: REPO_ADDRESS,
+      issueId: ISSUE_ID,
+      alicePubkey: ALICE_PUBKEY,
+      issueSubject: ISSUE_SUBJECT,
+    },
+  );
+  await installMockBridge(page);
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.getByTestId("channel-general").click();
+  // No relay rate limit here: a rate-limited entity fetch caches a negative
+  // result and never recovers, which would hide the resolved-title half of
+  // this invariant. Natural relay latency supplies the pending window.
+  await page.waitForFunction(
+    () => typeof window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__ === "function",
+  );
+  await page.evaluate(
+    ({ issueId, alicePubkey }) => {
+      window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({
+        channelName: "general",
+        pubkey: alicePubkey,
+        content: `Issue link: buzz://issue?id=${issueId}&owner=${alicePubkey}&d=relay-tools`,
+      });
+    },
+    { issueId: ISSUE_ID, alicePubkey: ALICE_PUBKEY },
+  );
+
+  const issueChip = page.getByRole("button", {
+    name: /Open issue .* in repository relay-tools/,
+  });
+  await expect(issueChip).toHaveText("relay-tools");
+  await issueChip.hover();
+
+  const tooltipContent = page
+    .getByRole("tooltip")
+    .locator('[data-buzz-tooltip-metadata-content=""]');
+  const widths = new Set<number>();
+  const tooltipSamples: string[] = [];
+  await expect
+    .poll(
+      async () => {
+        const box = await issueChip.boundingBox();
+        if (box) widths.add(Math.round(box.width));
+        const text = (await tooltipContent.count())
+          ? ((await tooltipContent.textContent()) ?? "")
+          : "";
+        tooltipSamples.push(text);
+        return text;
+      },
+      { timeout: 15_000 },
+    )
+    .toBe(ISSUE_SUBJECT);
+
+  // At least one sample predates the resolved title, so the widths below span
+  // the load transition rather than only its settled end.
+  expect(tooltipSamples.length).toBeGreaterThan(1);
+  expect(tooltipSamples[0]).not.toBe(ISSUE_SUBJECT);
+  // One width the whole way, and the label never left the repository name.
+  expect(Array.from(widths)).toHaveLength(1);
+  await expect(issueChip).toHaveText("relay-tools");
+});
+
+test("entity tooltip uses project context while relay metadata is delayed", async ({
+  page,
+}) => {
+  await installMockBridge(page);
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.getByTestId("channel-general").click();
+  await page.evaluate(() =>
+    window.__BUZZ_E2E_ACTIVATE_RELAY_RATE_LIMIT__?.(300),
+  );
+  await page.waitForFunction(
+    () => typeof window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__ === "function",
+  );
+  await page.evaluate(
+    ({ issueId, owner }) => {
+      window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({
+        channelName: "general",
+        content: `Delayed issue: buzz://issue?id=${issueId}&owner=${owner}&d=buzz`,
+      });
+    },
+    { issueId: ISSUE_ID, owner: DEFAULT_MOCK_PUBKEY },
+  );
+
+  const issueChip = page.getByRole("button", {
+    name: /Open issue .* in repository buzz/,
+  });
+  await issueChip.hover();
+  await expect(
+    page
+      .getByRole("tooltip")
+      .locator('[data-buzz-tooltip-metadata-content=""]'),
+  ).toHaveText("buzz · The complete Buzz community platform.");
+});
+
 test("desktop composer shows entity card and send is not blocked by missing snapshot", async ({
   page,
 }) => {
@@ -281,6 +536,84 @@ test("reopening the same entity link reapplies its workspace state", async ({
   await expect(issueHeading).toBeVisible();
 });
 
+test("deleted reply links identify deletion and fall back to their thread root", async ({
+  page,
+}) => {
+  const deletedReplyId = "c".repeat(64);
+  const threadRootId = "b".repeat(64);
+  const channelId = "9dae0116-799b-5071-a0a8-fdd30a91a35d";
+  const link = `buzz://message?channel=${channelId}&id=${deletedReplyId}&thread=${threadRootId}`;
+  await installMockBridge(page, { deletedEventIds: [deletedReplyId] });
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.waitForFunction(
+    () => typeof window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__ === "function",
+  );
+  await page.evaluate(
+    ({ id }) => {
+      window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({
+        channelName: "random",
+        content: "Surviving thread root",
+        id,
+      });
+    },
+    { id: threadRootId },
+  );
+  await page.getByTestId("channel-general").click();
+  await page.getByTestId("message-input").fill(`Deleted reply ${link}`);
+  await page.getByTestId("send-message").click();
+
+  const deletedLink = page
+    .getByTestId("message-row")
+    .filter({ hasText: "Deleted reply" })
+    .last()
+    .getByRole("button", {
+      name: "Open thread in channel random; linked message was deleted",
+    });
+  await expect(deletedLink).toHaveAttribute(
+    "data-message-link-state",
+    "deleted",
+  );
+  await deletedLink.click();
+
+  await expect(page.getByTestId("chat-title")).toHaveText("random");
+  await expect(page).toHaveURL(new RegExp(`thread=${threadRootId}`));
+  await expect(page.getByRole("heading", { name: "Thread" })).toBeVisible();
+});
+
+test("deleted top-level message links identify deletion and fall back to channel navigation", async ({
+  page,
+}) => {
+  const missingMessageId = "d".repeat(64);
+  const channelId = "9dae0116-799b-5071-a0a8-fdd30a91a35d";
+  const link = `buzz://message?channel=${channelId}&id=${missingMessageId}`;
+  await installMockBridge(page, { deletedEventIds: [missingMessageId] });
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.getByTestId("channel-general").click();
+  await page.getByTestId("message-input").fill(`Missing link ${link}`);
+  await page.getByTestId("send-message").click();
+
+  const linkMessage = page
+    .getByTestId("message-row")
+    .filter({ hasText: "Missing link" })
+    .last();
+  const deletedLink = linkMessage.getByRole("button", {
+    name: "Open channel random; linked message was deleted",
+  });
+  await expect(deletedLink).toHaveText("random");
+  await expect(deletedLink).toHaveAttribute(
+    "data-message-link-state",
+    "deleted",
+  );
+  await expect(deletedLink).toHaveClass(/buzz-link-deleted/);
+  await expect(deletedLink).not.toHaveClass(/buzz-link-unavailable/);
+  await deletedLink.hover();
+  await expect(page.getByRole("tooltip")).toHaveText("Message deleted");
+
+  await deletedLink.click();
+  await expect(page.getByTestId("chat-title")).toHaveText("random");
+  await expect(page).toHaveURL(new RegExp(`#/channels/${channelId}$`));
+});
+
 test("cold-start entity links drain after the React listener mounts", async ({
   page,
 }) => {
diff --git a/desktop/tests/e2e/navigation.spec.ts b/desktop/tests/e2e/navigation.spec.ts
index 4de2bb12d5..ed5a261a98 100644
--- a/desktop/tests/e2e/navigation.spec.ts
+++ b/desktop/tests/e2e/navigation.spec.ts
@@ -12,6 +12,27 @@ test.beforeEach(async ({ page }) => {
   await installMockBridge(page);
 });
 
+/**
+ * Inline message chips no longer change their label when metadata resolves, so
+ * a single hover can land while the chip is still the plain (untriggered) span.
+ * Re-arm the pointer until the metadata tooltip is mounted.
+ */
+async function hoverUntilMetadataTooltip(
+  page: import("@playwright/test").Page,
+  chip: import("@playwright/test").Locator,
+) {
+  await expect
+    .poll(async () => {
+      await page.getByTestId("chat-title").hover();
+      await chip.hover();
+      return page
+        .getByRole("tooltip")
+        .locator('[data-buzz-tooltip-metadata-content=""]')
+        .count();
+    })
+    .toBeGreaterThan(0);
+}
+
 async function navigateToWorkflows(page: import("@playwright/test").Page) {
   await page.goto("/");
   await page.getByTestId("open-workflows-view").click();
@@ -389,11 +410,12 @@ test("mixed Buzz permalinks render as chips in the composer", async ({
 
   const chips = composerInput.locator('[data-composer-buzz-link=""]');
   await expect(chips).toHaveCount(5);
-  await expect(chips.nth(0)).toHaveText("general · mock-gen");
+  await expect(chips.nth(0)).toHaveText("general");
   await expect(chips.nth(1)).toHaveText("general");
   await expect(chips.nth(2)).toHaveText("buzz-world");
-  await expect(chips.nth(3)).toHaveText("buzz-world · cccccccc");
-  await expect(chips.nth(4)).toHaveText("buzz-world · bbbbbbbb");
+  // PR and issue chips both use repository identity only, matching rendered chips.
+  await expect(chips.nth(3)).toHaveText("buzz-world");
+  await expect(chips.nth(4)).toHaveText("buzz-world");
   await expect(chips.nth(1)).toHaveClass(/inline-chip-icon-channel/);
   await expect(chips.nth(2)).toHaveClass(/inline-chip-icon-repo/);
   await expect(chips.nth(3)).toHaveClass(/inline-chip-icon-pr/);
@@ -420,6 +442,11 @@ test("message links to visible root messages open the thread panel", async ({
   await expect(page.getByTestId("message-timeline")).toContainText(
     "Welcome to general",
   );
+  await page.evaluate(() => {
+    (
+      window as Window & { __BUZZ_E2E_DEFER_GET_EVENT__?: string | null }
+    ).__BUZZ_E2E_DEFER_GET_EVENT__ = "mock-general-welcome";
+  });
 
   const link =
     "buzz://message?channel=9a1657ac-f7aa-5db0-b632-d8bbeb6dfb50&id=mock-general-welcome";
@@ -438,7 +465,7 @@ test("message links to visible root messages open the thread panel", async ({
     );
   }, link);
   const composerLink = composerInput.locator('[data-composer-message-link=""]');
-  await expect(composerLink).toHaveText("general · mock-gen");
+  await expect(composerLink).toHaveText(/general(?: · mock-gen)?/);
   await expect(composerLink).toHaveClass(/mention-chip/);
   await expect(composerLink).toHaveClass(/inline-chip-icon-message/);
   await expect(composerLink).toHaveAttribute("data-buzz-link", "");
@@ -452,14 +479,122 @@ test("message links to visible root messages open the thread panel", async ({
     .last();
   await expect(linkMessage).toBeVisible();
   const rootThreadLink = linkMessage.getByRole("button", {
-    name: "Open message mock-gen in channel general",
+    name: "Open message in channel general",
   });
-  await expect(rootThreadLink).toHaveText("general · mock-gen");
+  await expect(rootThreadLink).toHaveText("general");
+  const pendingChipBox = await rootThreadLink.boundingBox();
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (window as Window & { __BUZZ_E2E_GET_EVENT_CALL_COUNT__?: number })
+            .__BUZZ_E2E_GET_EVENT_CALL_COUNT__ ?? 0,
+      ),
+    )
+    .toBe(1);
+  await page.evaluate(() => {
+    (
+      window as Window & { __BUZZ_E2E_RELEASE_GET_EVENT__?: () => number }
+    ).__BUZZ_E2E_RELEASE_GET_EVENT__?.();
+  });
+  await expect(rootThreadLink).toHaveText("general");
   await expect(rootThreadLink).toHaveClass(/mention-chip/);
+  await expect(rootThreadLink).toHaveClass(/wrapping-inline-chip/);
+  await expect(rootThreadLink).toHaveCSS("display", "inline");
+  await expect(rootThreadLink).not.toHaveAttribute("title");
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (
+            window as Window & {
+              __BUZZ_E2E_COMMAND_LOG__?: Array<{ command: string }>;
+            }
+          ).__BUZZ_E2E_COMMAND_LOG__?.filter(
+            ({ command }) => command === "get_event",
+          ).length ?? 0,
+      ),
+    )
+    .toBe(1);
+  await hoverUntilMetadataTooltip(page, rootThreadLink);
+  const messageTooltip = page.getByRole("tooltip");
+  await expect(
+    messageTooltip.locator('[data-buzz-tooltip-metadata-content=""]'),
+  ).toHaveText("Welcome to general");
+  // The tooltip proves metadata resolved; the inline chip must still carry the
+  // channel label at the exact width it had while the fetch was in flight, and
+  // never the fetched snippet or the truncated event hash.
+  await expect(rootThreadLink).toHaveText("general");
+  expect((await rootThreadLink.boundingBox())?.width).toBe(
+    pendingChipBox?.width,
+  );
+  await expect(
+    messageTooltip.locator('[data-buzz-tooltip-metadata-content=""]'),
+  ).toHaveClass(/line-clamp-3/);
+  const messageFooter = messageTooltip.locator(
+    '[data-buzz-tooltip-metadata-type=""]',
+  );
+  await expect(messageFooter).toHaveText(
+    /#general · .+ · (just now|\d+[mhdw] ago)/,
+  );
+  await expect(messageFooter).toHaveCSS("white-space", "nowrap");
+  await expect(messageFooter).toHaveCSS("overflow", "hidden");
+  await expect(messageFooter).toHaveCSS("text-overflow", "ellipsis");
+  const messageChipBox = await rootThreadLink.boundingBox();
+  const messageTooltipBox = await messageTooltip.boundingBox();
+  if (!messageChipBox || !messageTooltipBox) {
+    throw new Error("Expected visible message chip and tooltip");
+  }
+  expect(
+    Math.abs(
+      messageTooltipBox.x +
+        messageTooltipBox.width / 2 -
+        (messageChipBox.x + messageChipBox.width / 2),
+    ),
+  ).toBeLessThanOrEqual(1);
+  await page.getByTestId("chat-title").hover();
+  await rootThreadLink.hover();
+  await expect(
+    page
+      .getByRole("tooltip")
+      .locator('[data-buzz-tooltip-metadata-content=""]'),
+  ).toHaveText("Welcome to general");
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (
+            window as Window & {
+              __BUZZ_E2E_COMMAND_LOG__?: Array<{ command: string }>;
+            }
+          ).__BUZZ_E2E_COMMAND_LOG__?.filter(
+            ({ command }) => command === "get_event",
+          ).length ?? 0,
+      ),
+    )
+    .toBe(1);
   const randomChannelLink = linkMessage.getByRole("button", {
     name: "Open channel random",
   });
   await expect(randomChannelLink).toBeVisible();
+  await expect(randomChannelLink).toHaveClass(/wrapping-inline-chip/);
+  await expect(randomChannelLink).toHaveCSS("display", "inline");
+  await expect(
+    randomChannelLink.locator(".inline-chip-leading-fragment"),
+  ).toHaveText("r");
+  await expect(randomChannelLink).not.toHaveAttribute("title");
+  await randomChannelLink.hover();
+  const channelTooltip = page.getByRole("tooltip");
+  await expect(
+    channelTooltip.locator('[data-buzz-tooltip-metadata-content=""]'),
+  ).toHaveText("Off-topic, fun stuff");
+  const channelFooter = channelTooltip.locator(
+    '[data-buzz-tooltip-metadata-type=""]',
+  );
+  await expect(channelFooter).toHaveText("Public channel");
+  await expect(channelFooter).toHaveCSS("white-space", "normal");
+  await expect(channelFooter).toHaveCSS("overflow-wrap", "anywhere");
+  await rootThreadLink.hover();
   await rootThreadLink.click({ button: "right" });
 
   const linkMenu = page.locator("[data-buzz-link-context-menu]");
@@ -500,6 +635,101 @@ test("message links to visible root messages open the thread panel", async ({
   );
 });
 
+test("direct-message tooltip metadata stays on one physical line", async ({
+  page,
+}) => {
+  const dmChannelId = "f48efb06-0c93-5025-aac9-2e646bb6bfa8";
+  const dmMessageId = "mock-dm-link-one-line";
+
+  await page.goto("/");
+  await page.getByTestId("channel-alice-tyler").click();
+  await expect(page.getByTestId("chat-title")).toHaveText("alice-tyler");
+  await page.evaluate((id) => {
+    window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({
+      channelName: "alice-tyler",
+      content: "DM source message",
+      id,
+    });
+  }, dmMessageId);
+
+  await page.getByTestId("channel-general").click();
+  await page
+    .getByTestId("message-input")
+    .fill(`DM link buzz://message?channel=${dmChannelId}&id=${dmMessageId}`);
+  await page.getByTestId("send-message").click();
+
+  const dmLink = page
+    .getByTestId("message-row")
+    .filter({ hasText: "DM link" })
+    .last()
+    .getByRole("button", { name: "Open message in channel alice-tyler" });
+  await expect(dmLink).toHaveText("alice-tyler");
+  await hoverUntilMetadataTooltip(page, dmLink);
+
+  const footer = page
+    .getByRole("tooltip")
+    .locator('[data-buzz-tooltip-metadata-type=""]');
+  await expect(footer).toContainText("Direct message with alice-tyler");
+  await expect(footer).toHaveCSS("white-space", "nowrap");
+  await expect(footer).toHaveCSS("overflow", "hidden");
+  await expect(footer).toHaveCSS("text-overflow", "ellipsis");
+  await expect
+    .poll(() =>
+      footer.evaluate((element) => {
+        const lineHeight = Number.parseFloat(
+          getComputedStyle(element).lineHeight,
+        );
+        return {
+          fitsOneLine: element.scrollHeight <= Math.ceil(lineHeight),
+          heightIsClipped: element.clientHeight === element.scrollHeight,
+        };
+      }),
+    )
+    .toEqual({ fitsOneLine: true, heightIsClipped: true });
+});
+
+test("message links explain when preview metadata is unavailable", async ({
+  page,
+}) => {
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+
+  const missingMessageId = "f".repeat(64);
+  await page
+    .getByTestId("message-input")
+    .fill(
+      `Missing preview buzz://message?channel=9a1657ac-f7aa-5db0-b632-d8bbeb6dfb50&id=${missingMessageId}`,
+    );
+  await page.getByTestId("send-message").click();
+
+  const linkMessage = page
+    .getByTestId("message-row")
+    .filter({ hasText: "Missing preview" })
+    .last();
+  const missingMessageLink = linkMessage.getByRole("button", {
+    name: "Open message in channel general",
+  });
+  await expect(missingMessageLink).toHaveAccessibleName(
+    "Open message in channel general",
+  );
+  await expect(missingMessageLink).toHaveText("general");
+  // The label is metadata-independent now, so gate the hover on the state the
+  // failed lookup does change: the unavailable styling.
+  await expect(missingMessageLink).toHaveClass(/buzz-link-unavailable/);
+  await missingMessageLink.hover();
+  const unavailableTooltip = page.getByRole("tooltip");
+  await expect(unavailableTooltip).toHaveText("Message unavailable");
+  await expect(unavailableTooltip).toHaveCSS("pointer-events", "none");
+
+  const tooltipBox = await unavailableTooltip.boundingBox();
+  if (!tooltipBox) throw new Error("Unavailable tooltip bounds missing");
+  await page.mouse.move(
+    tooltipBox.x + tooltipBox.width / 2,
+    tooltipBox.y + tooltipBox.height / 2,
+  );
+  await expect(unavailableTooltip).toHaveCount(0);
+});
+
 test("message links reopen a closed thread when the same messageId is already in the URL", async ({
   page,
 }) => {
@@ -530,9 +760,9 @@ test("message links reopen a closed thread when the same messageId is already in
     .last();
   await expect(linkMessage).toBeVisible();
   const rootThreadLink = linkMessage.getByRole("button", {
-    name: "Open message mock-gen in channel general",
+    name: "Open message in channel general",
   });
-  await expect(rootThreadLink).toHaveText("general · mock-gen");
+  await expect(rootThreadLink).toHaveText("general");
   await rootThreadLink.click();
 
   await expect(threadPanel).toBeVisible();
diff --git a/desktop/tests/e2e/onboarding-agent-defaults.spec.ts b/desktop/tests/e2e/onboarding-agent-defaults.spec.ts
index 3a15d21767..2364b52955 100644
--- a/desktop/tests/e2e/onboarding-agent-defaults.spec.ts
+++ b/desktop/tests/e2e/onboarding-agent-defaults.spec.ts
@@ -1036,6 +1036,14 @@ test("concurrent installs each keep their own state — one fails, one succeeds"
   await expect(tooltip).toContainText("npm ERR! code EACCES");
   await expect(tooltip).toContainText("Hint: Run as Administrator");
 
+  // Moving from the trigger into the portalled tooltip must keep it open so
+  // pointer users can operate the scrollable error detail.
+  const tooltipBox = await tooltip.boundingBox();
+  if (!tooltipBox) throw new Error("Expected runtime error tooltip bounds");
+  await page.mouse.move(tooltipBox.x + 8, tooltipBox.y + 8);
+  await expect(tooltip).toBeVisible();
+  await expect(tooltip).toHaveCSS("pointer-events", "auto");
+
   // Locate the scroll container using page-level locator since Radix portals
   // can place content outside the tooltip role element's subtree in the DOM.
   // Use .first() because Radix keeps a hidden duplicate in the light DOM.
diff --git a/desktop/tests/e2e/project-issue-comments.spec.ts b/desktop/tests/e2e/project-issue-comments.spec.ts
index d7eef9551f..4cf0f0940c 100644
--- a/desktop/tests/e2e/project-issue-comments.spec.ts
+++ b/desktop/tests/e2e/project-issue-comments.spec.ts
@@ -103,9 +103,19 @@ test("issue discussion ignores an author-claimed origin channel", async ({
   await relatedChannel.click();
 
   await expect(page.getByTestId("chat-title")).toHaveText("general");
-  await expect(page.getByTestId("message-input")).toContainText("ffffffff");
+  const issueDraftChip = page
+    .getByTestId("message-input")
+    .locator('[data-composer-buzz-link=""]', {
+      hasText: "buzz",
+    });
+  await expect(issueDraftChip).toHaveAttribute(
+    "data-href",
+    new RegExp(`id=${forgedIssueId}`),
+  );
   await page.getByTestId("channel-random").click();
-  await expect(page.getByTestId("message-input")).not.toContainText("ffffffff");
+  await expect(
+    page.getByTestId("message-input").locator('[data-composer-buzz-link=""]'),
+  ).toHaveCount(0);
 });
 
 test("issue comments use the project activity timeline", async ({ page }) => {
diff --git a/desktop/tests/e2e/tooltip-semantics.spec.ts b/desktop/tests/e2e/tooltip-semantics.spec.ts
new file mode 100644
index 0000000000..73306f025c
--- /dev/null
+++ b/desktop/tests/e2e/tooltip-semantics.spec.ts
@@ -0,0 +1,160 @@
+import { expect, test, type Locator, type Page } from "@playwright/test";
+
+import { installMockBridge } from "../helpers/bridge";
+import { waitForAnimations } from "../helpers/animations";
+
+const THEMES = ["buzz", "catppuccin-mocha"] as const;
+
+async function seedTheme(page: Page, theme: (typeof THEMES)[number]) {
+  await page.addInitScript((value) => {
+    window.localStorage.setItem("buzz-theme", value);
+  }, theme);
+}
+
+async function expectSecondarySurface(tooltip: Locator) {
+  const colors = await tooltip.evaluate((element) => {
+    const sample = document.createElement("div");
+    sample.style.cssText =
+      "position:fixed;visibility:hidden;background:hsl(var(--secondary));color:hsl(var(--secondary-foreground))";
+    document.body.append(sample);
+    const tooltipStyle = getComputedStyle(element);
+    const sampleStyle = getComputedStyle(sample);
+    const result = {
+      background: tooltipStyle.backgroundColor,
+      color: tooltipStyle.color,
+      expectedBackground: sampleStyle.backgroundColor,
+      expectedColor: sampleStyle.color,
+    };
+    sample.remove();
+    return result;
+  });
+
+  expect(colors.background).toBe(colors.expectedBackground);
+  expect(colors.color).toBe(colors.expectedColor);
+}
+
+async function expectMutedSupportingText(
+  trigger: Locator,
+  expectedText: string | RegExp,
+) {
+  await trigger.hover();
+  const footer = trigger
+    .page()
+    .getByRole("tooltip")
+    .locator('[data-buzz-tooltip-metadata-type=""]');
+  await expect(footer).toHaveText(expectedText);
+  await expect(footer).toHaveClass(/text-secondary-foreground\/80/);
+  await expect(footer).not.toHaveClass(/text-primary-foreground/);
+}
+
+for (const theme of THEMES) {
+  test(`simple and rich tooltips use the secondary surface — ${theme}`, async ({
+    page,
+  }) => {
+    await seedTheme(page, theme);
+    await installMockBridge(page, {
+      personas: [
+        {
+          id: "tooltip-reviewer",
+          displayName: "Tooltip Reviewer",
+          systemPrompt: "Review tooltip contrast.",
+        },
+      ],
+      teams: [
+        {
+          id: "tooltip-team",
+          name: "Contrast Crew",
+          description: "Checks semantic surface contrast",
+          personaIds: ["tooltip-reviewer"],
+        },
+      ],
+    });
+    await page.goto("/");
+
+    await page.getByTestId("channel-random").click();
+    await page.getByTestId("channel-members-trigger").hover();
+    const simpleTooltip = page.getByRole("tooltip");
+    await expect(simpleTooltip).toHaveText("Channel members");
+    await expectSecondarySurface(simpleTooltip);
+
+    await page.mouse.move(0, 0);
+    await page.getByTestId("channel-intro-action-create-agent").click();
+    const dialog = page.getByTestId("add-channel-bot-dialog");
+    await expect(dialog).toBeVisible();
+    await dialog.getByRole("button", { name: "Contrast Crew" }).hover();
+
+    const richTooltip = page.getByRole("tooltip");
+    await expect(richTooltip).toContainText("Checks semantic surface contrast");
+    await expect(richTooltip).toContainText("Tooltip Reviewer");
+    await expectSecondarySurface(richTooltip);
+    await expect(
+      richTooltip.getByText("Checks semantic surface contrast"),
+    ).toHaveClass(/text-secondary-foreground\/80/);
+    await expect(richTooltip.getByText("Tooltip Reviewer")).toHaveClass(
+      /text-secondary-foreground/,
+    );
+    await expect(
+      richTooltip.getByTestId("team-tooltip-persona-chip"),
+    ).toHaveClass(/bg-secondary-foreground\/10/);
+    await expect(
+      richTooltip.getByTestId("team-tooltip-persona-avatar"),
+    ).toHaveClass(/bg-secondary-foreground\/20.*text-secondary-foreground/);
+
+    await waitForAnimations(page);
+    await dialog.screenshot({
+      path: `test-results/tooltip-semantics/${theme}-team-tooltip.png`,
+    });
+  });
+
+  test(`link tooltip supporting text uses the muted secondary foreground — ${theme}`, async ({
+    page,
+  }) => {
+    await seedTheme(page, theme);
+    await installMockBridge(page);
+    await page.goto("/");
+    await page.getByTestId("channel-general").click();
+    const channelId = "9a1657ac-f7aa-5db0-b632-d8bbeb6dfb50";
+    const owner = "a".repeat(64);
+    const issueId = "b".repeat(64);
+    const links = [
+      `buzz://channel/${channelId}`,
+      `buzz://message?channel=${channelId}&id=mock-general-welcome`,
+      `buzz://issue?id=${issueId}&owner=${owner}&d=buzz-world`,
+    ].join(" ");
+    const composer = page.getByTestId("message-input");
+    await composer.evaluate((element, text) => {
+      const clipboardData = new DataTransfer();
+      clipboardData.setData("text/plain", text);
+      element.dispatchEvent(
+        new ClipboardEvent("paste", {
+          bubbles: true,
+          cancelable: true,
+          clipboardData,
+        }),
+      );
+    }, links);
+
+    const composerChips = composer.locator('[data-composer-buzz-link=""]');
+    await expect(composerChips).toHaveCount(3);
+    await page.getByTestId("send-message").click();
+
+    const row = page.getByTestId("message-row").last();
+    await expect(row).toBeVisible();
+    await expectMutedSupportingText(
+      row.getByRole("button", { name: "Open channel general" }),
+      /Public channel · Active \d+[mhdw] ago/,
+    );
+    await page.mouse.move(0, 0);
+    await expectMutedSupportingText(
+      row.getByRole("button", { name: "Open message in channel general" }),
+      /#general · .+ · (just now|\d+[mhdw] ago)/,
+    );
+    await page.mouse.move(0, 0);
+    await expectMutedSupportingText(
+      row.getByRole("button", {
+        name: /Open issue .* in repository buzz-world/,
+      }),
+      "Issue · buzz-world",
+    );
+  });
+}

From 24ec6a468ec9d0d425ee58fbfc4d416412c446ad Mon Sep 17 00:00:00 2001
From: Wes <wesbillman@users.noreply.github.com>
Date: Thu, 20 Aug 2026 21:22:41 -0600
Subject: [PATCH 07/38] Repair stale large channel roster snapshots (#6251)

## Summary

- detect relay-authored NIP-29 kind 39002 roster snapshots truncated by
the former 1,000-member query cap and repair stale large rosters during
relay startup
- serialize canonical roster capture and replacement with membership
writes, preserving tenant, channel, signer, pubkey, and role boundaries
through mixed-version deployments
- install migration 0032's fail-closed roster fence on the partitioned
events table and verify its catalog shape plus behavior before opening
relay listeners

## Rollout

Migration 0032 is a hard schema-before-code compatibility boundary.
Apply migrations before rolling this relay version. Startup refuses to
open listeners when the parent/partition triggers are missing, disabled,
mis-shaped, or behaviorally inert. For large installations, prefer
`buzz-admin migrate` and monitor lock acquisition as documented in the
chart README.

## Validation

Exact head: `bcbba271f54bc0046a6683007e5a2b70403a11d5`

- rebased onto `569308c23c9c2bf620dd3a9a5e4baecbcfa22e16`; the nine-file
feature patch is byte-identical to pre-rebase head
`be8ea0084f4d4c78c7c2550baad4399e4df8ce73`
- pre-push hook passed at exact head: branch-skew, file-size, full Rust
unit suite, Desktop Tauri clippy, and Desktop Tauri tests
- `cargo fmt --all -- --check`
- `cargo test -p buzz-relay
group_members_snapshot_keeps_members_past_one_thousand -- --nocapture`
- focused CI-mode Playwright regression: `selected relay agents revoked
after the invite prompt cause no side effects` passed at exact head
- prior exact-patch validation:
`large_roster_reconciliation_candidates_respect_snapshot_count_and_signer`,
mixed-writer locking/rollback, migration admission, partition trigger
coverage, and desired-schema parity regressions

## Review

Independent DB/relay review found no blocking issues in the exact
feature patch. The concurrency fence holds the established replacement
and membership locks on one transaction/connection through replacement;
failures roll back both soft-delete and insert. Reconciliation remains
tenant/channel/signer scoped and validates exact normalized
pubkey-plus-role membership.

The prior red Desktop shard was unrelated to this backend-only diff: its
mocked mention test exercises no relay, database, or migration path. It
reproduced as a timing flake on the old head, passed on retry/base, and
now passes locally after rebasing onto current main.

---------

Signed-off-by: Wes <wesbillman@users.noreply.github.com>
Co-authored-by: Carl <32a2e2c9d428ee08902cab75d956da2c1d235a22d4766b0dd4138bf6e2e5db1d@buzz.block.builderlab.xyz>
---
 crates/buzz-db/src/channel.rs                 | 644 ++++++++++++++++++
 crates/buzz-db/src/lib.rs                     | 410 ++++++++++-
 crates/buzz-db/src/migration.rs               |  75 +-
 .../buzz-relay/src/handlers/side_effects.rs   | 133 +++-
 crates/buzz-relay/src/main.rs                 |  25 +
 deploy/charts/buzz/README.md                  |   2 +
 .../0032_channel_roster_snapshot_fence.sql    |  76 +++
 schema/schema.sql                             |  79 +++
 scripts/attach-schema-partitions.sql          |  11 +-
 9 files changed, 1423 insertions(+), 32 deletions(-)
 create mode 100644 migrations/0032_channel_roster_snapshot_fence.sql

diff --git a/crates/buzz-db/src/channel.rs b/crates/buzz-db/src/channel.rs
index 8035ab58ad..109a9367d7 100644
--- a/crates/buzz-db/src/channel.rs
+++ b/crates/buzz-db/src/channel.rs
@@ -347,6 +347,129 @@ pub async fn set_canvas(
 /// `buzz_channel_ttl:`.
 const CHANNEL_MEMBERSHIP_LOCK_NAMESPACE: &str = "buzz_channel_membership:";
 
+/// Verify that migration 0032's roster fence is active on the partitioned
+/// `events` parent and every attached partition.
+///
+/// New roster publishers depend on this database-side guard to serialize with
+/// legacy publishers during a rolling deployment. If the migration has not
+/// been applied, publishing with the new lock protocol would falsely appear
+/// safe while an old pod could still overwrite it with stale membership.
+pub async fn verify_channel_roster_fence_catalog<'e>(
+    executor: impl sqlx::PgExecutor<'e>,
+) -> Result<()> {
+    // tgtype bits: 1 = ROW, 2 = BEFORE, 4 = INSERT, 16 = UPDATE, 64 = INSTEAD.
+    // Required: ROW + BEFORE + INSERT set; UPDATE + INSTEAD clear.
+    let missing: Vec<String> = sqlx::query_scalar(
+        r#"
+        SELECT n.nspname || '.' || c.relname
+        FROM (
+            SELECT 'public.events'::regclass AS oid
+            UNION ALL
+            SELECT inhrelid FROM pg_inherits WHERE inhparent = 'public.events'::regclass
+        ) rels
+        JOIN pg_class c ON c.oid = rels.oid
+        JOIN pg_namespace n ON n.oid = c.relnamespace
+        WHERE NOT EXISTS (
+            SELECT 1 FROM pg_trigger t
+            WHERE t.tgrelid = rels.oid
+              AND t.tgname = 'trg_events_guard_channel_roster_snapshot'
+              AND t.tgfoid = to_regprocedure('public.guard_channel_roster_snapshot()')
+              AND t.tgenabled IN ('O', 'A')
+              AND t.tgtype & 1 = 1      -- row-level
+              AND t.tgtype & 2 = 2      -- BEFORE
+              AND t.tgtype & 4 = 4      -- fires on INSERT
+              AND t.tgtype & 16 = 0     -- not UPDATE
+              AND t.tgtype & 64 = 0     -- not INSTEAD OF
+        )
+        "#,
+    )
+    .fetch_all(executor)
+    .await?;
+    if !missing.is_empty() {
+        return Err(DbError::InvalidData(format!(
+            "channel roster fence trigger missing, disabled, or mis-shaped on: {}",
+            missing.join(", ")
+        )));
+    }
+    Ok(())
+}
+
+/// Prove migration 0032's roster fence semantics through the live writer pool.
+///
+/// The catalog check cannot detect a no-op or otherwise corrupted trigger
+/// function. This rolled-back probe verifies that a canonical empty roster is
+/// accepted while a stale roster member is rejected with `check_violation`.
+pub async fn verify_channel_roster_fence_behavior(pool: &sqlx::PgPool) -> Result<()> {
+    let mut tx = pool.begin().await?;
+    let community_id = Uuid::new_v4();
+    let channel_id = Uuid::new_v4();
+    sqlx::query("INSERT INTO communities (id, host) VALUES ($1, $2)")
+        .bind(community_id)
+        .bind(format!(
+            "roster-fence-verify-{}.invalid",
+            community_id.simple()
+        ))
+        .execute(&mut *tx)
+        .await?;
+
+    let insert = |id: Vec<u8>, tags: serde_json::Value| {
+        sqlx::query(
+            "INSERT INTO events (community_id, id, pubkey, created_at, kind, tags, content, sig, received_at, channel_id, d_tag) \
+             VALUES ($1, $2, $3, NOW(), 39002, $4, '', $5, NOW(), $6, $7)",
+        )
+        .bind(community_id)
+        .bind(id)
+        .bind(vec![0u8; 32])
+        .bind(tags)
+        .bind(vec![0u8; 64])
+        .bind(channel_id)
+        .bind(channel_id.to_string())
+    };
+
+    insert(
+        vec![0u8; 32],
+        serde_json::json!([["d", channel_id.to_string()]]),
+    )
+    .execute(&mut *tx)
+    .await
+    .map_err(|error| {
+        DbError::InvalidData(format!(
+            "channel roster fence rejected a canonical probe roster: {error}"
+        ))
+    })?;
+
+    sqlx::query("SAVEPOINT roster_fence_probe")
+        .execute(&mut *tx)
+        .await?;
+    let stale = insert(
+        vec![1u8; 32],
+        serde_json::json!([
+            ["d", channel_id.to_string()],
+            ["p", hex::encode([2u8; 32]), "", "member"]
+        ]),
+    )
+    .execute(&mut *tx)
+    .await;
+    match stale {
+        Err(sqlx::Error::Database(error)) if error.code().as_deref() == Some("23514") => {}
+        Ok(_) => {
+            return Err(DbError::InvalidData(
+                "channel roster fence is inert: a stale probe roster was accepted".into(),
+            ));
+        }
+        Err(error) => {
+            return Err(DbError::InvalidData(format!(
+                "channel roster fence probe failed unexpectedly: {error}"
+            )));
+        }
+    }
+    sqlx::query("ROLLBACK TO SAVEPOINT roster_fence_probe")
+        .execute(&mut *tx)
+        .await?;
+    tx.rollback().await?;
+    Ok(())
+}
+
 /// Take the per-channel membership lock. MUST be the first statement in the
 /// transaction that then reads roles/owner counts and writes membership, so the
 /// whole check-then-write sequence is atomic against a concurrent one.
@@ -366,6 +489,179 @@ async fn acquire_channel_membership_lock(
     Ok(())
 }
 
+/// An active member roster captured while holding the channel's membership
+/// serialization lock on one writer connection.
+pub struct LockedMemberSnapshot {
+    /// Canonical active members captured behind the lock.
+    pub members: Vec<MemberRecord>,
+    community_id: CommunityId,
+    channel_id: Uuid,
+    relay_pubkey: Vec<u8>,
+    tx: Transaction<'static, Postgres>,
+}
+
+impl LockedMemberSnapshot {
+    /// Return the newest relay-authored member snapshot timestamp using this
+    /// guard's existing connection.
+    pub async fn latest_member_event_timestamp(
+        &mut self,
+        community_id: CommunityId,
+        channel_id: Uuid,
+        relay_pubkey: &[u8],
+    ) -> Result<Option<u64>> {
+        let value: Option<chrono::DateTime<Utc>> = sqlx::query_scalar(
+            "SELECT created_at FROM events WHERE community_id = $1 AND kind = 39002 AND pubkey = $2 AND channel_id = $3 AND deleted_at IS NULL ORDER BY created_at DESC, id ASC LIMIT 1",
+        )
+        .bind(community_id.as_uuid())
+        .bind(relay_pubkey)
+        .bind(channel_id)
+        .fetch_optional(&mut *self.tx)
+        .await?;
+        Ok(value.map(|timestamp| timestamp.timestamp() as u64))
+    }
+
+    /// Replace the relay-authored member snapshot on this guard's existing
+    /// connection. The membership lock therefore spans capture and replacement
+    /// without a nested pool checkout.
+    pub async fn replace_member_event(
+        &mut self,
+        community_id: CommunityId,
+        channel_id: Uuid,
+        event: &nostr::Event,
+    ) -> Result<(buzz_core::StoredEvent, bool)> {
+        if community_id != self.community_id
+            || channel_id != self.channel_id
+            || event.pubkey.to_bytes().as_slice() != self.relay_pubkey.as_slice()
+        {
+            return Err(DbError::InvalidData(
+                "member snapshot replacement does not match its locked coordinate".into(),
+            ));
+        }
+        let kind = buzz_core::kind::event_kind_i32(event);
+        if kind != 39002 {
+            return Err(DbError::InvalidData(
+                "member snapshot replacement requires kind 39002".into(),
+            ));
+        }
+        let pubkey = event.pubkey.to_bytes();
+        let created_at_secs = event.created_at.as_secs() as i64;
+        let created_at = chrono::DateTime::from_timestamp(created_at_secs, 0)
+            .ok_or(DbError::InvalidTimestamp(created_at_secs))?;
+        let existing: Option<(chrono::DateTime<Utc>, Vec<u8>)> = sqlx::query_as(
+            "SELECT created_at, id FROM events WHERE community_id = $1 AND kind = $2 AND pubkey = $3 AND channel_id = $4 AND deleted_at IS NULL ORDER BY created_at DESC, id ASC LIMIT 1",
+        )
+        .bind(community_id.as_uuid())
+        .bind(kind)
+        .bind(pubkey.as_slice())
+        .bind(channel_id)
+        .fetch_optional(&mut *self.tx)
+        .await?;
+        let incoming_id = event.id.as_bytes().as_slice();
+        if let Some((existing_ts, existing_id)) = existing {
+            if created_at < existing_ts
+                || (created_at == existing_ts && incoming_id >= existing_id.as_slice())
+            {
+                return Ok((
+                    buzz_core::StoredEvent::with_received_at(
+                        event.clone(),
+                        Utc::now(),
+                        Some(channel_id),
+                        false,
+                    ),
+                    false,
+                ));
+            }
+        }
+        sqlx::query("UPDATE events SET deleted_at = NOW() WHERE community_id = $1 AND kind = $2 AND pubkey = $3 AND channel_id = $4 AND deleted_at IS NULL")
+            .bind(community_id.as_uuid()).bind(kind).bind(pubkey.as_slice()).bind(channel_id)
+            .execute(&mut *self.tx).await?;
+        let received_at = Utc::now();
+        let tags = serde_json::to_value(&event.tags)?;
+        let sig = event.sig.serialize();
+        let inserted = sqlx::query("INSERT INTO events (community_id, id, pubkey, created_at, kind, tags, content, sig, received_at, channel_id, d_tag) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11) ON CONFLICT DO NOTHING")
+            .bind(community_id.as_uuid()).bind(event.id.as_bytes().as_slice())
+            .bind(pubkey.as_slice()).bind(created_at).bind(kind).bind(tags)
+            .bind(&event.content).bind(sig.as_slice()).bind(received_at).bind(channel_id)
+            .bind(crate::event::extract_d_tag(event)).execute(&mut *self.tx).await?;
+        if inserted.rows_affected() == 0 {
+            return Err(DbError::InvalidData(
+                "member snapshot event id already exists".into(),
+            ));
+        }
+        crate::insert_mentions_in_transaction(&mut self.tx, community_id, event, Some(channel_id))
+            .await?;
+        Ok((
+            buzz_core::StoredEvent::with_received_at(
+                event.clone(),
+                received_at,
+                Some(channel_id),
+                true,
+            ),
+            true,
+        ))
+    }
+
+    /// Commit the replacement and release the membership lock.
+    pub async fn release(self) -> Result<()> {
+        self.tx.commit().await?;
+        Ok(())
+    }
+}
+
+/// Capture all active members while holding the same per-channel lock used by
+/// membership writers.
+///
+/// The returned guard must remain alive through publication. This prevents a
+/// rolling relay from publishing an older roster after a concurrent add or
+/// remove has committed and published newer membership state.
+pub async fn lock_member_snapshot(
+    pool: &PgPool,
+    community_id: CommunityId,
+    channel_id: Uuid,
+    relay_pubkey: &[u8],
+) -> Result<LockedMemberSnapshot> {
+    let mut tx = pool.begin().await?;
+    // Match the canonical replacement writer's lock order. Old binaries take
+    // this key before INSERT; migration 0032 then takes the membership key in
+    // the INSERT trigger. Taking both in that order avoids mixed-version
+    // duplicate heads without introducing a lock-order inversion.
+    let replacement_lock = crate::event_replacement_lock_key(
+        community_id,
+        39002,
+        relay_pubkey,
+        Some(channel_id.as_bytes()),
+    );
+    sqlx::query("SELECT pg_advisory_xact_lock($1)")
+        .bind(replacement_lock)
+        .execute(&mut *tx)
+        .await?;
+    acquire_channel_membership_lock(&mut tx, community_id, channel_id).await?;
+    let rows = sqlx::query(
+        r#"
+        SELECT cm.channel_id, cm.pubkey, cm.role::text AS role, cm.joined_at, cm.invited_by, cm.removed_at
+        FROM channel_members cm
+        JOIN channels c ON cm.community_id = c.community_id AND cm.channel_id = c.id AND c.deleted_at IS NULL
+        WHERE cm.community_id = $1 AND cm.channel_id = $2 AND cm.removed_at IS NULL
+        ORDER BY cm.joined_at ASC
+        "#,
+    )
+    .bind(community_id.as_uuid())
+    .bind(channel_id)
+    .fetch_all(&mut *tx)
+    .await?;
+    let members = rows
+        .into_iter()
+        .map(row_to_member_record)
+        .collect::<Result<Vec<_>>>()?;
+    Ok(LockedMemberSnapshot {
+        members,
+        community_id,
+        channel_id,
+        relay_pubkey: relay_pubkey.to_vec(),
+        tx,
+    })
+}
+
 /// Add a member to a channel.
 ///
 /// Role enforcement:
@@ -781,6 +1077,81 @@ pub async fn get_accessible_channel_ids(
         .collect()
 }
 
+/// A large channel whose canonical active-member count may need its legacy
+/// discovery snapshot repaired.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct LargeChannelRoster {
+    /// Community that owns the channel.
+    pub community_id: CommunityId,
+    /// Canonical host for the owning community.
+    pub host: String,
+    /// Channel whose roster snapshot differs from canonical membership.
+    pub channel_id: Uuid,
+    /// Canonical active-member count.
+    pub member_count: i64,
+}
+
+/// Returns active channels whose canonical roster exceeds `minimum_members`.
+///
+/// This is an internal cross-community maintenance read. Callers must preserve
+/// the returned community id when reading or rewriting discovery state.
+pub async fn list_large_channel_rosters_needing_reconciliation(
+    pool: &PgPool,
+    minimum_members: i64,
+    relay_pubkey: &[u8],
+) -> Result<Vec<LargeChannelRoster>> {
+    let rows = sqlx::query(
+        r#"
+        WITH large_rosters AS (
+            SELECT cm.community_id, cm.channel_id, COUNT(*) AS member_count
+            FROM channel_members cm
+            JOIN channels ch
+              ON ch.community_id = cm.community_id
+             AND ch.id = cm.channel_id
+             AND ch.deleted_at IS NULL
+            WHERE cm.removed_at IS NULL
+            GROUP BY cm.community_id, cm.channel_id
+            HAVING COUNT(*) > $1
+        )
+        SELECT lr.community_id, community.host, lr.channel_id, lr.member_count
+        FROM large_rosters lr
+        JOIN communities community ON community.id = lr.community_id
+        JOIN LATERAL (
+            SELECT roster.tags
+            FROM events roster
+            WHERE roster.community_id = lr.community_id
+              AND roster.channel_id = lr.channel_id
+              AND roster.kind = 39002
+              AND roster.pubkey = $2
+              AND roster.deleted_at IS NULL
+            ORDER BY roster.created_at DESC, roster.id ASC
+            LIMIT 1
+        ) live_roster ON true
+        WHERE lr.member_count <> (
+            SELECT COUNT(*)
+            FROM jsonb_array_elements(live_roster.tags) tag
+            WHERE tag->>0 = 'p'
+        )
+        ORDER BY lr.community_id, lr.channel_id
+        "#,
+    )
+    .bind(minimum_members)
+    .bind(relay_pubkey)
+    .fetch_all(pool)
+    .await?;
+
+    rows.into_iter()
+        .map(|row| {
+            Ok(LargeChannelRoster {
+                community_id: CommunityId::from_uuid(row.try_get("community_id")?),
+                host: row.try_get("host")?,
+                channel_id: row.try_get("channel_id")?,
+                member_count: row.try_get("member_count")?,
+            })
+        })
+        .collect()
+}
+
 /// Lists channels in a community, optionally filtered by visibility string.
 pub async fn list_channels(
     pool: &PgPool,
@@ -1535,6 +1906,7 @@ mod tests {
     use super::*;
     use crate::user::{ensure_user, set_agent_owner};
     use nostr::Keys;
+    use sqlx::postgres::PgPoolOptions;
 
     const TEST_DB_URL: &str = "postgres://buzz:buzz_dev@localhost:5432/buzz"; // sadscan:disable np.postgres.1 -- local test-only credentials
 
@@ -2016,6 +2388,188 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn large_roster_reconciliation_candidates_respect_snapshot_count_and_signer() {
+        let pool = setup_pool().await;
+        let community_id = make_test_community(&pool).await;
+        let community = CommunityId::from_uuid(community_id);
+        let creator = random_pubkey();
+        let relay_pubkey = random_pubkey();
+        let other_relay_pubkey = random_pubkey();
+        let channel = create_test_channel(
+            &pool,
+            community_id,
+            "stale-large-roster",
+            ChannelType::Stream,
+            ChannelVisibility::Open,
+            None,
+            &creator,
+            None,
+        )
+        .await
+        .expect("create test channel");
+
+        let extra_members = 1_500;
+        sqlx::query(
+            r#"
+            INSERT INTO channel_members (community_id, channel_id, pubkey, role, joined_at)
+            SELECT $1, $2, decode(lpad(to_hex(n), 64, '0'), 'hex'), 'member',
+                   NOW() + (n || ' seconds')::interval
+            FROM generate_series(1, $3) n
+            "#,
+        )
+        .bind(community_id)
+        .bind(channel.id)
+        .bind(extra_members)
+        .execute(&pool)
+        .await
+        .expect("insert large roster");
+
+        let stale_tags: Vec<serde_json::Value> =
+            std::iter::once(serde_json::json!(["d", channel.id.to_string()]))
+                .chain((0..1_000).map(|n| serde_json::json!(["p", format!("{n:064x}")])))
+                .collect();
+        let complete_tags: Vec<serde_json::Value> =
+            std::iter::once(serde_json::json!(["d", channel.id.to_string()]))
+                .chain((0..1_501).map(|n| serde_json::json!(["p", format!("{n:064x}")])))
+                .collect();
+
+        // Insert canonical-looking history first, then corrupt the newest row
+        // with UPDATE to model a stale snapshot that predates migration 0032's
+        // INSERT fence. New stale snapshots cannot be inserted once that fence
+        // is deployed.
+        sqlx::query(
+            r#"
+            INSERT INTO events
+                (community_id, id, pubkey, created_at, kind, tags, content, sig, channel_id, d_tag)
+            VALUES
+                ($1, $2, $3, NOW() - INTERVAL '1 minute', 39002, $4, '', $5, $6, $7),
+                ($1, $8, $3, NOW(), 39002, $4, '', $5, $6, $7)
+            "#,
+        )
+        .bind(community_id)
+        .bind(random_pubkey())
+        .bind(&relay_pubkey)
+        .bind(serde_json::Value::Array(complete_tags.clone()))
+        .bind(vec![0u8; 64])
+        .bind(channel.id)
+        .bind(channel.id.to_string())
+        .bind(random_pubkey())
+        .execute(&pool)
+        .await
+        .expect("insert historical duplicate snapshots");
+        sqlx::query(
+            "UPDATE events SET tags = $1 WHERE community_id = $2 AND channel_id = $3 \
+             AND kind = 39002 AND pubkey = $4 AND created_at = (SELECT MAX(created_at) \
+             FROM events WHERE community_id = $2 AND channel_id = $3 AND kind = 39002 AND pubkey = $4)",
+        )
+        .bind(serde_json::Value::Array(stale_tags))
+        .bind(community_id)
+        .bind(channel.id)
+        .bind(&relay_pubkey)
+        .execute(&pool)
+        .await
+        .expect("simulate pre-fence stale live snapshot");
+
+        // The same channel UUID in another tenant is deliberately valid. A
+        // complete snapshot there must not mask this tenant's stale head.
+        let other_community_id = make_test_community(&pool).await;
+        sqlx::query(
+            r#"
+            INSERT INTO channels
+                (id, community_id, name, channel_type, visibility, created_by)
+            VALUES ($1, $2, 'same-id-complete-roster', 'stream', 'open', $3)
+            "#,
+        )
+        .bind(channel.id)
+        .bind(other_community_id)
+        .bind(&creator)
+        .execute(&pool)
+        .await
+        .expect("insert same channel id in other tenant");
+        sqlx::query(
+            r#"
+            INSERT INTO channel_members (community_id, channel_id, pubkey, role, joined_at)
+            SELECT $1, $2, decode(lpad(to_hex(n), 64, '0'), 'hex'), 'member',
+                   NOW() + (n || ' seconds')::interval
+            FROM generate_series(0, 1500) n
+            "#,
+        )
+        .bind(other_community_id)
+        .bind(channel.id)
+        .execute(&pool)
+        .await
+        .expect("insert complete other-tenant roster");
+        sqlx::query(
+            r#"
+            INSERT INTO events
+                (community_id, id, pubkey, created_at, kind, tags, content, sig, channel_id, d_tag)
+            VALUES ($1, $2, $3, NOW(), 39002, $4, '', $5, $6, $7)
+            "#,
+        )
+        .bind(other_community_id)
+        .bind(random_pubkey())
+        .bind(&relay_pubkey)
+        .bind(serde_json::Value::Array(complete_tags.clone()))
+        .bind(vec![0u8; 64])
+        .bind(channel.id)
+        .bind(channel.id.to_string())
+        .execute(&pool)
+        .await
+        .expect("insert complete other-tenant snapshot");
+
+        // Put the stale channel behind the 1,000 newest channels that the old
+        // list_channels-based sweep could see. This set-based scan has no such
+        // pagination ceiling.
+        sqlx::query(
+            r#"
+            INSERT INTO channels
+                (id, community_id, name, channel_type, visibility, created_by, created_at)
+            SELECT gen_random_uuid(), $1, 'newer-decoy-' || n, 'stream', 'open', $2,
+                   NOW() + (n || ' seconds')::interval
+            FROM generate_series(1, 1000) n
+            "#,
+        )
+        .bind(community_id)
+        .bind(&creator)
+        .execute(&pool)
+        .await
+        .expect("insert channels beyond old list ceiling");
+
+        let candidates =
+            list_large_channel_rosters_needing_reconciliation(&pool, 1_000, &relay_pubkey)
+                .await
+                .expect("find stale snapshot");
+        assert_eq!(candidates.len(), 1);
+        assert_eq!(candidates[0].community_id, community);
+        assert_eq!(candidates[0].channel_id, channel.id);
+        assert_eq!(candidates[0].member_count, 1_501);
+
+        let other_signer_candidates =
+            list_large_channel_rosters_needing_reconciliation(&pool, 1_000, &other_relay_pubkey)
+                .await
+                .expect("other signer is isolated from relay-authored snapshot");
+        assert!(other_signer_candidates.is_empty());
+
+        sqlx::query(
+            "UPDATE events SET tags = $1, created_at = NOW() + INTERVAL '1 minute' WHERE community_id = $2 AND channel_id = $3 AND kind = 39002 AND pubkey = $4 AND created_at = (SELECT MAX(created_at) FROM events WHERE community_id = $2 AND channel_id = $3 AND kind = 39002 AND pubkey = $4 AND deleted_at IS NULL)",
+        )
+        .bind(serde_json::Value::Array(complete_tags))
+        .bind(community_id)
+        .bind(channel.id)
+        .bind(&relay_pubkey)
+        .execute(&pool)
+        .await
+        .expect("complete snapshot");
+
+        let converged =
+            list_large_channel_rosters_needing_reconciliation(&pool, 1_000, &relay_pubkey)
+                .await
+                .expect("check converged snapshot");
+        assert!(converged.is_empty());
+    }
+
     /// A random non-admin, non-owner user cannot remove someone else's bot.
     #[tokio::test]
     #[ignore = "requires Postgres"]
@@ -2499,6 +3053,96 @@ mod tests {
         (community, channel.id, owner_a, owner_b)
     }
 
+    /// A captured roster holds the same lock as membership writers until the
+    /// publisher explicitly releases it. This is the freshness fence used by
+    /// rolling-deploy reconciliation.
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn locked_member_snapshot_blocks_post_capture_membership_mutation() {
+        let pool = setup_pool().await;
+        let community_id = make_test_community(&pool).await;
+        let community = CommunityId::from_uuid(community_id);
+        let owner = random_pubkey();
+        let newcomer = random_pubkey();
+        let channel = create_test_channel(
+            &pool,
+            community_id,
+            "snapshot-freshness-fence",
+            ChannelType::Stream,
+            ChannelVisibility::Open,
+            None,
+            &owner,
+            None,
+        )
+        .await
+        .expect("create channel");
+
+        let snapshot_pool = PgPoolOptions::new()
+            .max_connections(1)
+            .acquire_timeout(std::time::Duration::from_secs(1))
+            .connect(TEST_DB_URL)
+            .await
+            .expect("connect one-connection pool");
+        let relay_keys = Keys::generate();
+        let mut snapshot = lock_member_snapshot(
+            &snapshot_pool,
+            community,
+            channel.id,
+            &relay_keys.public_key().to_bytes(),
+        )
+        .await
+        .expect("capture locked roster");
+        assert_eq!(snapshot.members.len(), 1);
+        let event = nostr::EventBuilder::new(nostr::Kind::Custom(39002), "")
+            .tags(vec![
+                nostr::Tag::parse(["d", &channel.id.to_string()]).expect("d tag"),
+                nostr::Tag::parse(["p", &hex::encode(&owner)]).expect("p tag"),
+            ])
+            .sign_with_keys(&relay_keys)
+            .expect("sign roster");
+        let (_, inserted) = snapshot
+            .replace_member_event(community, channel.id, &event)
+            .await
+            .expect("replace roster on held connection");
+        assert!(inserted);
+
+        let mut contender = pool.begin().await.expect("begin membership writer");
+        let acquired: bool =
+            sqlx::query_scalar("SELECT pg_try_advisory_xact_lock(hashtextextended($1, 0))")
+                .bind(format!(
+                    "{CHANNEL_MEMBERSHIP_LOCK_NAMESPACE}{}:{}",
+                    community.as_uuid(),
+                    channel.id
+                ))
+                .fetch_one(&mut *contender)
+                .await
+                .expect("try membership writer lock");
+        assert!(
+            !acquired,
+            "membership mutation must wait until the captured roster is published"
+        );
+        contender.rollback().await.expect("rollback contender");
+
+        snapshot.release().await.expect("release snapshot fence");
+        add_member(
+            &pool,
+            community,
+            channel.id,
+            &newcomer,
+            MemberRole::Member,
+            None,
+        )
+        .await
+        .expect("membership mutation after publication");
+        assert_eq!(
+            get_members(&pool, community, channel.id)
+                .await
+                .expect("fresh roster")
+                .len(),
+            2
+        );
+    }
+
     /// The lock must be shared with `remove_member`: a demotion racing an owner
     /// removal goes through a separate count/update path, so both must serialize
     /// on the same key or they can jointly empty the owner set.
diff --git a/crates/buzz-db/src/lib.rs b/crates/buzz-db/src/lib.rs
index 330525d310..3ff230f950 100644
--- a/crates/buzz-db/src/lib.rs
+++ b/crates/buzz-db/src/lib.rs
@@ -68,7 +68,7 @@ use uuid::Uuid;
 
 use buzz_core::{CommunityId, StoredEvent};
 
-fn event_replacement_lock_key(
+pub(crate) fn event_replacement_lock_key(
     community_id: CommunityId,
     kind: i32,
     pubkey: &[u8],
@@ -2390,6 +2390,24 @@ impl Db {
         channel::set_canvas(&self.pool, community_id, channel_id, canvas).await
     }
 
+    /// Verify the mixed-version channel-roster database fence end to end.
+    #[datastore_span(name = "verify_channel_roster_fence", system = "postgresql")]
+    pub async fn verify_channel_roster_fence(&self) -> Result<()> {
+        channel::verify_channel_roster_fence_catalog(&self.pool).await?;
+        channel::verify_channel_roster_fence_behavior(&self.pool).await
+    }
+
+    /// Capture the active roster while holding the membership-writer lock.
+    #[datastore_span(name = "lock_member_snapshot", system = "postgresql")]
+    pub async fn lock_member_snapshot(
+        &self,
+        community_id: CommunityId,
+        channel_id: Uuid,
+        relay_pubkey: &[u8],
+    ) -> Result<channel::LockedMemberSnapshot> {
+        channel::lock_member_snapshot(&self.pool, community_id, channel_id, relay_pubkey).await
+    }
+
     /// Adds a member to a channel.
     #[datastore_span(name = "add_member", system = "postgresql")]
     pub async fn add_member(
@@ -2476,6 +2494,24 @@ impl Db {
         channel::get_accessible_channel_ids(&self.pool, community_id, pubkey).await
     }
 
+    /// Returns large active-channel rosters whose relay-authored snapshots differ.
+    #[datastore_span(
+        name = "list_large_channel_rosters_needing_reconciliation",
+        system = "postgresql"
+    )]
+    pub async fn list_large_channel_rosters_needing_reconciliation(
+        &self,
+        minimum_members: i64,
+        relay_pubkey: &[u8],
+    ) -> Result<Vec<channel::LargeChannelRoster>> {
+        channel::list_large_channel_rosters_needing_reconciliation(
+            &self.pool,
+            minimum_members,
+            relay_pubkey,
+        )
+        .await
+    }
+
     /// Lists channels, optionally filtered by visibility.
     #[datastore_span(name = "list_channels", system = "postgresql")]
     pub async fn list_channels(
@@ -5480,6 +5516,113 @@ mod tests {
         id
     }
 
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn unmigrated_roster_fence_blocks_startup_until_0032_is_applied() {
+        let admin = PgPool::connect(&admin_url().await)
+            .await
+            .expect("connect admin");
+        let (pool, scratch_name) =
+            create_scratch_db_through(&admin, "roster_fence_unmigrated", Some(31)).await;
+        let db = Db::from_pool(pool.clone());
+
+        let error = db
+            .verify_channel_roster_fence()
+            .await
+            .expect_err("pre-0032 schema must block roster publishers");
+        assert!(
+            error.to_string().contains("channel roster fence trigger"),
+            "startup gate must report the missing schema fence: {error}"
+        );
+        let rows_before: i64 = sqlx::query_scalar("SELECT count(*) FROM events WHERE kind = 39002")
+            .fetch_one(&pool)
+            .await
+            .expect("count pre-migration rosters");
+        assert_eq!(
+            rows_before, 0,
+            "failed startup gate must not publish a roster"
+        );
+
+        migration::run_migrations(&pool)
+            .await
+            .expect("apply migration 0032");
+        db.verify_channel_roster_fence()
+            .await
+            .expect("0032 must open the startup gate");
+
+        drop_scratch_db(&admin, pool, &scratch_name).await;
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn channel_roster_fence_behavior_verification_detects_inert_function() {
+        let admin = PgPool::connect(&admin_url().await)
+            .await
+            .expect("connect admin");
+        let (pool, scratch_name) = create_scratch_db(&admin, "roster_fence_inert").await;
+        let db = Db::from_pool(pool.clone());
+
+        sqlx::raw_sql(
+            "CREATE OR REPLACE FUNCTION guard_channel_roster_snapshot() \
+             RETURNS TRIGGER AS $$ BEGIN RETURN NEW; END; $$ LANGUAGE plpgsql;",
+        )
+        .execute(&pool)
+        .await
+        .expect("replace roster fence with inert body");
+        let error = db
+            .verify_channel_roster_fence()
+            .await
+            .expect_err("inert roster fence must fail closed");
+        assert!(
+            error
+                .to_string()
+                .contains("stale probe roster was accepted"),
+            "behavior probe must identify inert semantics: {error}"
+        );
+
+        drop_scratch_db(&admin, pool, &scratch_name).await;
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn channel_roster_fence_catalog_verification_fails_closed() {
+        let admin = PgPool::connect(&admin_url().await)
+            .await
+            .expect("connect admin");
+        let (pool, scratch_name) = create_scratch_db(&admin, "roster_fence_catalog").await;
+        let db = Db::from_pool(pool.clone());
+
+        db.verify_channel_roster_fence()
+            .await
+            .expect("migrated roster fence must verify");
+
+        let child: String = sqlx::query_scalar(
+            "SELECT n.nspname || '.' || c.relname \
+             FROM pg_inherits i JOIN pg_class c ON c.oid = i.inhrelid \
+             JOIN pg_namespace n ON n.oid = c.relnamespace \
+             WHERE i.inhparent = 'public.events'::regclass ORDER BY i.inhrelid LIMIT 1",
+        )
+        .fetch_one(&pool)
+        .await
+        .expect("load event partition");
+        sqlx::query(sqlx::AssertSqlSafe(format!(
+            "ALTER TABLE {child} DISABLE TRIGGER trg_events_guard_channel_roster_snapshot"
+        )))
+        .execute(&pool)
+        .await
+        .expect("disable partition roster trigger");
+        let error = db
+            .verify_channel_roster_fence()
+            .await
+            .expect_err("disabled partition roster fence must fail closed");
+        assert!(
+            error.to_string().contains(&child),
+            "verification must identify the unfenced partition: {error}"
+        );
+
+        drop_scratch_db(&admin, pool, &scratch_name).await;
+    }
+
     #[tokio::test]
     #[ignore = "requires Postgres"]
     async fn addressable_replacement_rolls_back_when_mention_indexing_fails() {
@@ -5493,13 +5636,14 @@ mod tests {
         let community_uuid = Uuid::new_v4();
         let channel = Uuid::new_v4();
         let keys = Keys::generate();
-        seed_community_channel(&pool, community_uuid, channel, &keys).await;
+        let owner_keys = Keys::generate();
+        seed_community_channel(&pool, community_uuid, channel, &owner_keys).await;
         let community = CommunityId::from_uuid(community_uuid);
-        let member = Keys::generate().public_key().to_hex();
+        let member = owner_keys.public_key().to_hex();
         let tags = || {
             vec![
                 Tag::parse(["d", channel.to_string().as_str()]).expect("d tag"),
-                Tag::parse(["p", member.as_str(), "", "member"]).expect("p tag"),
+                Tag::parse(["p", member.as_str(), "", "owner"]).expect("p tag"),
             ]
         };
         let base = Timestamp::now().as_secs();
@@ -5561,6 +5705,238 @@ mod tests {
         drop_scratch_db(&admin, pool, &scratch_name).await;
     }
 
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn stale_legacy_roster_cannot_replace_new_locked_snapshot() {
+        use nostr::{EventBuilder, Keys, Kind, Tag, Timestamp};
+
+        let admin = PgPool::connect(&admin_url().await)
+            .await
+            .expect("connect admin");
+        let (setup_pool, scratch_name) = create_scratch_db(&admin, "mixed_roster_writer").await;
+        let base_url = admin_url().await;
+        let slash = base_url.rfind('/').expect("database URL has path segment");
+        let scratch_url = format!("{}/{}", &base_url[..slash], scratch_name);
+        let pool = PgPoolOptions::new()
+            .max_connections(1)
+            .acquire_timeout(Duration::from_secs(1))
+            .connect(&scratch_url)
+            .await
+            .expect("connect one-connection scratch pool");
+        setup_pool.close().await;
+        let db = Db::from_pool(pool.clone());
+        let community_uuid = Uuid::new_v4();
+        let community = CommunityId::from_uuid(community_uuid);
+        let channel = Uuid::new_v4();
+        let relay_keys = Keys::generate();
+        let owner_keys = Keys::generate();
+        let owner = owner_keys.public_key().to_bytes();
+        seed_community_channel(&pool, community_uuid, channel, &owner_keys).await;
+
+        // This is the old pod's unlocked capture A. It remains in process memory
+        // while a role-only canonical mutation advances and the new pod publishes B.
+        let base = Timestamp::now().as_secs();
+        let roster = |members: &[(&[u8], &str)], timestamp| {
+            let tags =
+                std::iter::once(Tag::parse(["d", channel.to_string().as_str()]).expect("d tag"))
+                    .chain(members.iter().map(|(member, role)| {
+                        Tag::parse(["p", hex::encode(member).as_str(), "", *role]).expect("p tag")
+                    }))
+                    .collect::<Vec<_>>();
+            EventBuilder::new(Kind::Custom(39002), "")
+                .tags(tags)
+                .custom_created_at(Timestamp::from(timestamp))
+                .sign_with_keys(&relay_keys)
+                .expect("sign roster")
+        };
+
+        let newcomer = Keys::generate().public_key().to_bytes();
+        sqlx::query(
+            "INSERT INTO channel_members (community_id, channel_id, pubkey, role, invited_by) \
+             VALUES ($1, $2, $3, 'member', $4)",
+        )
+        .bind(community_uuid)
+        .bind(channel)
+        .bind(newcomer.as_slice())
+        .bind(owner.as_slice())
+        .execute(&pool)
+        .await
+        .expect("seed member before legacy capture");
+        let stale_a = roster(
+            &[(owner.as_slice(), "owner"), (newcomer.as_slice(), "member")],
+            base + 2,
+        );
+
+        sqlx::query(
+            "UPDATE channel_members SET role = 'admin' \
+             WHERE community_id = $1 AND channel_id = $2 AND pubkey = $3",
+        )
+        .bind(community_uuid)
+        .bind(channel)
+        .bind(newcomer.as_slice())
+        .execute(&pool)
+        .await
+        .expect("commit newer canonical role");
+
+        let relay_pubkey = relay_keys.public_key().to_bytes();
+        let mut snapshot = db
+            .lock_member_snapshot(community, channel, &relay_pubkey)
+            .await
+            .expect("new writer captures locked roster B");
+        let fresh_b = roster(
+            &[(owner.as_slice(), "owner"), (newcomer.as_slice(), "admin")],
+            base + 1,
+        );
+        assert!(
+            snapshot
+                .replace_member_event(community, channel, &fresh_b)
+                .await
+                .expect("new writer publishes B")
+                .1
+        );
+        snapshot
+            .release()
+            .await
+            .expect("commit B and release locks");
+
+        // The legacy canonical path takes the replacement key, soft-deletes B,
+        // then attempts its newer-timestamp stale A. Migration 0032 rejects the
+        // INSERT; transaction rollback must restore B. A one-connection pool
+        // proves the lock order does not turn this compatibility path into a
+        // self-deadlock.
+        let error = tokio::time::timeout(
+            Duration::from_secs(3),
+            db.replace_addressable_event(community, &stale_a, Some(channel)),
+        )
+        .await
+        .expect("legacy replacement must not deadlock")
+        .expect_err("stale captured roster A must be rejected");
+        assert!(
+            matches!(
+                error,
+                DbError::Sqlx(sqlx::Error::Database(ref db_error))
+                    if db_error.code().as_deref() == Some("23514")
+            ),
+            "expected roster fence check violation, got {error:?}"
+        );
+
+        let live_ids: Vec<Vec<u8>> = sqlx::query_scalar(
+            "SELECT id FROM events WHERE community_id=$1 AND channel_id=$2 \
+             AND kind=39002 AND pubkey=$3 AND deleted_at IS NULL",
+        )
+        .bind(community_uuid)
+        .bind(channel)
+        .bind(relay_pubkey.as_slice())
+        .fetch_all(&pool)
+        .await
+        .expect("load live roster heads");
+        assert_eq!(live_ids, vec![fresh_b.id.as_bytes().to_vec()]);
+        let stale_rows: i64 =
+            sqlx::query_scalar("SELECT count(*) FROM events WHERE community_id=$1 AND id=$2")
+                .bind(community_uuid)
+                .bind(stale_a.id.as_bytes().as_slice())
+                .fetch_one(&pool)
+                .await
+                .expect("count rejected stale roster");
+        assert_eq!(stale_rows, 0, "stale roster insert must roll back");
+
+        drop_scratch_db(&admin, pool, &scratch_name).await;
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn desired_schema_rejects_stale_legacy_roster_role() {
+        use nostr::{EventBuilder, Keys, Kind, Tag, Timestamp};
+
+        let admin = PgPool::connect(&admin_url().await)
+            .await
+            .expect("connect admin");
+        let scratch_name = format!("schema_roster_role_{}", Uuid::new_v4().simple());
+        sqlx::query(sqlx::AssertSqlSafe(format!(
+            "CREATE DATABASE {scratch_name}"
+        )))
+        .execute(&admin)
+        .await
+        .expect("create desired-schema scratch db");
+        let base_url = admin_url().await;
+        let slash = base_url.rfind('/').expect("database URL has path segment");
+        let scratch_url = format!("{}/{}", &base_url[..slash], scratch_name);
+        let pool = PgPoolOptions::new()
+            .max_connections(1)
+            .connect(&scratch_url)
+            .await
+            .expect("connect desired-schema scratch db");
+        sqlx::raw_sql(include_str!("../../../schema/schema.sql"))
+            .execute(&pool)
+            .await
+            .expect("apply desired-state schema");
+
+        let db = Db::from_pool(pool.clone());
+        let community_uuid = Uuid::new_v4();
+        let community = CommunityId::from_uuid(community_uuid);
+        let channel = Uuid::new_v4();
+        let relay_keys = Keys::generate();
+        let owner_keys = Keys::generate();
+        let owner = owner_keys.public_key().to_bytes();
+        seed_community_channel(&pool, community_uuid, channel, &owner_keys).await;
+        let member = Keys::generate().public_key().to_bytes();
+        sqlx::query(
+            "INSERT INTO channel_members (community_id, channel_id, pubkey, role, invited_by) \
+             VALUES ($1, $2, $3, 'admin', $4)",
+        )
+        .bind(community_uuid)
+        .bind(channel)
+        .bind(member.as_slice())
+        .bind(owner.as_slice())
+        .execute(&pool)
+        .await
+        .expect("seed canonical admin");
+
+        let roster = |role: &str, timestamp| {
+            EventBuilder::new(Kind::Custom(39002), "")
+                .tags(vec![
+                    Tag::parse(["d", channel.to_string().as_str()]).expect("d tag"),
+                    Tag::parse(["p", hex::encode(owner).as_str(), "", "owner"])
+                        .expect("owner p tag"),
+                    Tag::parse(["p", hex::encode(member).as_str(), "", role])
+                        .expect("member p tag"),
+                ])
+                .custom_created_at(Timestamp::from(timestamp))
+                .sign_with_keys(&relay_keys)
+                .expect("sign roster")
+        };
+        let base = Timestamp::now().as_secs();
+        let fresh = roster("admin", base);
+        assert!(
+            db.replace_addressable_event(community, &fresh, Some(channel))
+                .await
+                .expect("publish canonical role")
+                .1
+        );
+        let stale = roster("member", base + 1);
+        let error = db
+            .replace_addressable_event(community, &stale, Some(channel))
+            .await
+            .expect_err("desired-state fence must reject stale role");
+        assert!(matches!(
+            error,
+            DbError::Sqlx(sqlx::Error::Database(ref db_error))
+                if db_error.code().as_deref() == Some("23514")
+        ));
+        let live_id: Vec<u8> = sqlx::query_scalar(
+            "SELECT id FROM events WHERE community_id=$1 AND channel_id=$2 \
+             AND kind=39002 AND deleted_at IS NULL",
+        )
+        .bind(community_uuid)
+        .bind(channel)
+        .fetch_one(&pool)
+        .await
+        .expect("load desired-state live roster");
+        assert_eq!(live_id, fresh.id.as_bytes().to_vec());
+
+        drop_scratch_db(&admin, pool, &scratch_name).await;
+    }
+
     #[tokio::test]
     #[ignore = "requires Postgres"]
     async fn nip_rs_replacement_hard_deletes_payload_and_watermark_rejects_replay() {
@@ -6917,9 +7293,12 @@ mod tests {
         std::env::var("TEST_DATABASE_URL").unwrap_or_else(|_| TEST_DB_URL.into())
     }
 
-    /// Create a fresh scratch database on the same server and run migrations.
-    /// Returns (pool, db_name); callers should `drop_scratch_db` when done.
-    async fn create_scratch_db(admin: &PgPool, prefix: &str) -> (PgPool, String) {
+    /// Create a fresh scratch database on the same server and optionally run migrations.
+    async fn create_scratch_db_through(
+        admin: &PgPool,
+        prefix: &str,
+        target: Option<i64>,
+    ) -> (PgPool, String) {
         let name = format!("{}_{}", prefix, Uuid::new_v4().simple());
         sqlx::query(sqlx::AssertSqlSafe(format!("CREATE DATABASE {name}")))
             .execute(admin)
@@ -6934,12 +7313,23 @@ mod tests {
         let pool = PgPool::connect(&scratch_url)
             .await
             .expect("connect scratch db");
-        migration::run_migrations(&pool)
-            .await
-            .expect("migrate scratch db");
+        match target {
+            Some(target) => migration::run_migrations_through(&pool, target)
+                .await
+                .expect("migrate scratch db through target"),
+            None => migration::run_migrations(&pool)
+                .await
+                .expect("migrate scratch db"),
+        }
         (pool, name)
     }
 
+    /// Create a fresh scratch database on the same server and run all migrations.
+    /// Returns (pool, db_name); callers should `drop_scratch_db` when done.
+    async fn create_scratch_db(admin: &PgPool, prefix: &str) -> (PgPool, String) {
+        create_scratch_db_through(admin, prefix, None).await
+    }
+
     async fn drop_scratch_db(admin: &PgPool, pool: PgPool, name: &str) {
         pool.close().await;
         let _ = sqlx::query(sqlx::AssertSqlSafe(format!(
diff --git a/crates/buzz-db/src/migration.rs b/crates/buzz-db/src/migration.rs
index be87faa1ac..94c7aea2fa 100644
--- a/crates/buzz-db/src/migration.rs
+++ b/crates/buzz-db/src/migration.rs
@@ -32,6 +32,20 @@ pub async fn run_migrations(pool: &PgPool) -> Result<()> {
     .await
 }
 
+#[cfg(test)]
+pub(crate) async fn run_migrations_through(pool: &PgPool, target: i64) -> Result<()> {
+    with_exclusive_schema_destruction_lock(pool, |mut conn| async move {
+        let outcome = async {
+            reject_legacy_nip_rs_cardinality_ambiguity(&mut conn).await?;
+            MIGRATOR.run_to(target, &mut conn).await?;
+            Ok(())
+        }
+        .await;
+        (conn, outcome)
+    })
+    .await
+}
+
 async fn run_migrations_locked(conn: &mut PgConnection) -> Result<()> {
     reject_legacy_nip_rs_cardinality_ambiguity(conn).await?;
     MIGRATOR.run(&mut *conn).await?;
@@ -43,6 +57,7 @@ async fn run_migrations_locked(conn: &mut PgConnection) -> Result<()> {
     // guard, so migration fails closed if any is missing. (The fence probe
     // re-runs this same check at startup on non-migrating relays.)
     crate::replica_fence::verify_floor_guard_catalog(&mut *conn).await?;
+    crate::channel::verify_channel_roster_fence_catalog(&mut *conn).await?;
     Ok(())
 }
 
@@ -625,7 +640,7 @@ mod tests {
         let mut migrations: Vec<_> = MIGRATOR.iter().collect();
         migrations.sort_by_key(|migration| migration.version);
 
-        assert_eq!(migrations.len(), 31);
+        assert_eq!(migrations.len(), 32);
         assert_eq!(migrations[0].version, 1);
         assert_eq!(&*migrations[0].description, "initial schema");
         assert!(migrations[0]
@@ -1036,6 +1051,36 @@ mod tests {
         assert_eq!(migrations[29].version, 30);
         let deletion_recovery = migrations[29].sql.as_str();
         assert!(deletion_recovery.contains("SET LOCAL lock_timeout = '5s'"));
+
+        // Mixed-version channel-roster fence: old canonical replacement writers
+        // acquire their replacement key before INSERT; this trigger then takes
+        // the membership key and validates the exact active pubkey/role p-tag set.
+        assert_eq!(migrations[31].version, 32);
+        let roster_fence = migrations[31].sql.as_str();
+        assert!(roster_fence.contains("CREATE TRIGGER trg_events_guard_channel_roster_snapshot"));
+        assert!(roster_fence.contains("NEW.kind <> 39002"));
+        assert!(roster_fence.contains("'buzz_channel_membership:'"));
+        assert!(roster_fence.contains("cm.removed_at IS NULL"));
+        assert!(roster_fence.contains("cm.role::text"));
+        assert!(roster_fence.contains("jsonb_array_length(roster_tag.tag_json) <> 4"));
+        assert!(roster_fence.contains("roster_tag.tag_json->>3"));
+        assert!(roster_fence.contains("snapshot_members IS DISTINCT FROM canonical_members"));
+        assert!(roster_fence.contains("ERRCODE = '23514'"));
+
+        // Fresh desired-state bootstrap must install the identical executable
+        // fence as migration 0032. CI and isolated relay startup use schema.sql
+        // without running migrations, so drift reopens rolling-deploy races.
+        fn extract_roster_fence(sql: &str) -> &str {
+            let fence_start = "CREATE OR REPLACE FUNCTION guard_channel_roster_snapshot()";
+            let fence_end = "    FOR EACH ROW EXECUTE FUNCTION guard_channel_roster_snapshot();";
+            let start = sql.find(fence_start).expect("roster fence function");
+            let relative_end = sql[start..].find(fence_end).expect("roster fence trigger");
+            &sql[start..start + relative_end + fence_end.len()]
+        }
+        assert_eq!(
+            extract_roster_fence(roster_fence),
+            extract_roster_fence(desired_schema)
+        );
     }
 
     #[test]
@@ -1224,6 +1269,7 @@ mod tests {
         // Build the needles so this test's own source never matches them.
         let migrate_macro = ["sqlx", "::migrate!"].concat();
         let migrator_run = ["MIGRATOR", ".run("].concat();
+        let migrator_run_to = ["MIGRATOR", ".run_to("].concat();
 
         let manifest_dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR"));
         let this_file = manifest_dir.join("src/migration.rs");
@@ -1250,23 +1296,24 @@ mod tests {
         rust_sources(crates_dir, &mut files);
         for path in &files {
             let source = std::fs::read_to_string(path).expect("read rust source");
-            let (macro_hits, run_hits) = (
+            let (macro_hits, run_hits, run_to_hits) = (
                 count(&source, &migrate_macro),
                 count(&source, &migrator_run),
+                count(&source, &migrator_run_to),
             );
             if *path == this_file {
                 assert_eq!(
-                    (macro_hits, run_hits),
-                    (1, 1),
-                    "migration.rs must embed the migrator once and run it exactly once, \
-                     inside the locked wrapper"
+                    (macro_hits, run_hits, run_to_hits),
+                    (1, 1, 1),
+                    "migration.rs must embed the migrator once, run it once in production, \
+                     and expose exactly one test-only bounded run"
                 );
             } else if *path == push_gateway_exception {
                 continue;
             } else {
                 assert_eq!(
-                    (macro_hits, run_hits),
-                    (0, 0),
+                    (macro_hits, run_hits, run_to_hits),
+                    (0, 0, 0),
                     "{} embeds or runs a SQLx migrator outside the schema/destruction \
                      lock contract; route migration execution through \
                      buzz_db migration::run_migrations",
@@ -1289,13 +1336,23 @@ mod tests {
             .find("async fn with_exclusive_schema_destruction_lock")
             .expect("exclusive lock wrapper");
         let run_site = source.find(&migrator_run).expect("migrator run site");
+        let run_to_site = source
+            .find(&migrator_run_to)
+            .expect("bounded test migrator run site");
         assert!(
             source[entry..locked].contains("with_exclusive_schema_destruction_lock("),
             "run_migrations must delegate through the exclusive schema/destruction lock"
         );
         assert!(
             run_site > locked && run_site < wrapper,
-            "the migrator run site must live inside run_migrations_locked"
+            "the production migrator run site must live inside run_migrations_locked"
+        );
+        assert!(
+            run_to_site > entry
+                && run_to_site < locked
+                && source[entry..run_to_site].contains("#[cfg(test)]")
+                && source[entry..run_to_site].contains("with_exclusive_schema_destruction_lock("),
+            "the bounded migrator run must remain test-only and use the exclusive lock wrapper"
         );
         assert!(
             source[wrapper..].contains("pg_advisory_lock($1)")
diff --git a/crates/buzz-relay/src/handlers/side_effects.rs b/crates/buzz-relay/src/handlers/side_effects.rs
index f2b58937ab..89595fbee1 100644
--- a/crates/buzz-relay/src/handlers/side_effects.rs
+++ b/crates/buzz-relay/src/handlers/side_effects.rs
@@ -1049,6 +1049,55 @@ fn group_members_tags(group_id: &str, members: &[MemberRecord]) -> anyhow::Resul
     Ok(tags)
 }
 
+async fn store_group_members_event(
+    tenant: &TenantContext,
+    state: &Arc<AppState>,
+    channel_id: Uuid,
+    member_snapshot: &mut buzz_db::channel::LockedMemberSnapshot,
+) -> anyhow::Result<Option<buzz_core::StoredEvent>> {
+    let group_id = channel_id.to_string();
+    let tags = group_members_tags(&group_id, &member_snapshot.members)?;
+    let relay_pubkey = state.relay_keypair.public_key().to_bytes();
+    let now = std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_secs();
+    let ts = member_snapshot
+        .latest_member_event_timestamp(tenant.community(), channel_id, &relay_pubkey)
+        .await?
+        .map(|timestamp| timestamp + 1)
+        .unwrap_or(now)
+        .max(now);
+    let event = EventBuilder::new(Kind::Custom(KIND_NIP29_GROUP_MEMBERS as u16), "")
+        .tags(tags)
+        .custom_created_at(nostr::Timestamp::from(ts))
+        .sign_with_keys(&state.relay_keypair)
+        .map_err(|error| anyhow::anyhow!("failed to sign member snapshot: {error}"))?;
+    let (stored, inserted) = member_snapshot
+        .replace_member_event(tenant.community(), channel_id, &event)
+        .await?;
+    Ok(inserted.then_some(stored))
+}
+
+async fn dispatch_group_members_event(
+    tenant: &TenantContext,
+    state: &Arc<AppState>,
+    stored: Option<buzz_core::StoredEvent>,
+    relay_pubkey_hex: &str,
+) {
+    if let Some(stored) = stored {
+        dispatch_persistent_event(
+            tenant,
+            state,
+            &stored,
+            KIND_NIP29_GROUP_MEMBERS,
+            relay_pubkey_hex,
+            None,
+        )
+        .await;
+    }
+}
+
 /// Emit NIP-29 group discovery events (39000, 39001, 39002) signed by the relay keypair.
 /// Called after group creation, metadata changes, or membership changes.
 /// Events are stored channel-scoped (`channel_id = Some(...)`) so that existing
@@ -1151,18 +1200,18 @@ pub async fn emit_group_discovery_events(
         .await?;
     }
 
-    {
-        let tags = group_members_tags(&group_id, &members)?;
-        emit_addressable_discovery_event(
-            tenant,
-            state,
-            channel_id,
-            KIND_NIP29_GROUP_MEMBERS,
-            tags,
-            &relay_pubkey_hex,
-        )
+    // Re-capture membership behind the writer lock immediately before the
+    // authoritative 39002 replacement. Metadata/admin snapshots retain their
+    // existing behavior; only membership publication needs this freshness fence.
+    let relay_pubkey = state.relay_keypair.public_key().to_bytes();
+    let mut member_snapshot = state
+        .db
+        .lock_member_snapshot(tenant.community(), channel_id, &relay_pubkey)
         .await?;
-    }
+    let stored_members =
+        store_group_members_event(tenant, state, channel_id, &mut member_snapshot).await?;
+    member_snapshot.release().await?;
+    dispatch_group_members_event(tenant, state, stored_members, &relay_pubkey_hex).await;
 
     Ok(())
 }
@@ -3052,6 +3101,68 @@ pub async fn publish_nip43_member_removed(
     publish_nip43_delta(tenant, state, 8001, target_pubkey_hex, "member-removed").await
 }
 
+/// Repair legacy kind:39002 snapshots truncated by the former 1,000-member
+/// database cap.
+///
+/// The scan is deliberately limited to canonical rosters above that boundary,
+/// so normal-sized channels and already-correct large snapshots incur no
+/// rewrites. Community identity travels with every candidate; a shared relay
+/// never resolves a channel against a neighboring tenant.
+pub async fn reconcile_large_channel_member_snapshots(
+    state: &Arc<AppState>,
+) -> anyhow::Result<usize> {
+    const LEGACY_ROSTER_LIMIT: i64 = 1_000;
+
+    let relay_pubkey = state.relay_keypair.public_key();
+    let candidates = state
+        .db
+        .list_large_channel_rosters_needing_reconciliation(
+            LEGACY_ROSTER_LIMIT,
+            &relay_pubkey.to_bytes(),
+        )
+        .await?;
+    let relay_pubkey_hex = relay_pubkey.to_hex();
+    let mut reconciled = 0usize;
+
+    for candidate in candidates {
+        let result = async {
+            let channel_id = candidate.channel_id;
+            // Hold the membership-writer lock from roster capture through
+            // replacement. Otherwise a rolling deployment can publish stale
+            // roster A after another relay commits and publishes roster B.
+            let mut member_snapshot = state
+                .db
+                .lock_member_snapshot(candidate.community_id, channel_id, &relay_pubkey.to_bytes())
+                .await?;
+            let tenant = TenantContext::resolved(candidate.community_id, candidate.host.clone());
+            let stored_members =
+                store_group_members_event(&tenant, state, channel_id, &mut member_snapshot).await?;
+            member_snapshot.release().await?;
+            dispatch_group_members_event(&tenant, state, stored_members, &relay_pubkey_hex).await;
+            Ok::<bool, anyhow::Error>(true)
+        }
+        .await;
+
+        match result {
+            Ok(true) => reconciled += 1,
+            Ok(false) => {}
+            Err(error) => {
+                metrics::counter!("buzz_channel_roster_reconciliation_failures_total").increment(1);
+                warn!(
+                    community_id = %candidate.community_id,
+                    host = %candidate.host,
+                    channel_id = %candidate.channel_id,
+                    %error,
+                    "large channel roster reconciliation failed"
+                );
+            }
+        }
+    }
+
+    metrics::counter!("buzz_channel_roster_reconciliations_total").increment(reconciled as u64);
+    Ok(reconciled)
+}
+
 /// Reconcile channels that exist in the DB but don't have kind:39000 events.
 ///
 /// This handles the case where channels were created via direct SQL inserts
diff --git a/crates/buzz-relay/src/main.rs b/crates/buzz-relay/src/main.rs
index 3584e1849d..566b684f83 100644
--- a/crates/buzz-relay/src/main.rs
+++ b/crates/buzz-relay/src/main.rs
@@ -534,6 +534,31 @@ async fn main() -> anyhow::Result<()> {
         );
     }
 
+    match state.db.verify_channel_roster_fence().await {
+        Ok(()) => {
+            info!("Channel roster fence verified");
+        }
+        Err(error) => {
+            error!(%error, "Channel roster fence validation failed");
+            return Err(anyhow::anyhow!(
+                "Channel roster fence is unsafe; apply or repair migration 0032 before starting this relay: {error}"
+            ));
+        }
+    }
+
+    // Repair legacy NIP-29 channel rosters that were persisted while the
+    // canonical member query still truncated at 1,000 rows. Validation above
+    // makes migration 0032 a code/schema compatibility gate before the new
+    // replacement protocol or listener can serve traffic.
+    match buzz_relay::handlers::side_effects::reconcile_large_channel_member_snapshots(&state).await
+    {
+        Ok(count) if count > 0 => info!(count, "large channel member snapshots repaired"),
+        Ok(_) => {}
+        Err(error) => {
+            tracing::warn!(%error, "large channel member snapshot startup reconciliation failed")
+        }
+    }
+
     // NIP-43: reconcile the event-backed roster for every provisioned
     // community before opening the listener. `relay_members` is canonical;
     // this repairs pre-snapshot communities and any publication that failed
diff --git a/deploy/charts/buzz/README.md b/deploy/charts/buzz/README.md
index 8698967660..30cee4f406 100644
--- a/deploy/charts/buzz/README.md
+++ b/deploy/charts/buzz/README.md
@@ -205,6 +205,8 @@ default so long-lived WebSocket connections have time to drain.
 
 Schema migrations are embedded in the relay binary via `sqlx::migrate!` and run at startup, gated by `BUZZ_AUTO_MIGRATE` (default `true`). Multiple replicas race-safely behind a Postgres advisory lock. `helm upgrade` is the entire upgrade procedure.
 
+Migration 0032 is a hard compatibility boundary for relay versions that publish repaired channel rosters. The relay verifies the roster-fence trigger catalog and behavior before opening listeners and refuses to start if 0032 is missing or inert. Apply migrations before rolling the relay; for large installations, prefer a controlled `buzz-admin migrate` job with PostgreSQL lock monitoring before the code rollout.
+
 If you prefer decoupling migrations from serving, set `migrate.autoMigrate=false`. **In that mode the chart does not run migrations for you** — you own running `buzz-admin migrate` (separate Pod / one-shot Job) against the database before every `helm install` / `helm upgrade`. Readiness probes only verify DB connectivity, not schema freshness, so a pod will appear healthy against an unmigrated schema and fail under load. A pre-upgrade Helm Job for this is on the chart roadmap; the values knob `migrate.preUpgradeJob.enabled` is reserved.
 
 ## Backups
diff --git a/migrations/0032_channel_roster_snapshot_fence.sql b/migrations/0032_channel_roster_snapshot_fence.sql
new file mode 100644
index 0000000000..cdc7bc4b93
--- /dev/null
+++ b/migrations/0032_channel_roster_snapshot_fence.sql
@@ -0,0 +1,76 @@
+-- Prevent mixed-version relay pods from publishing a stale NIP-29 member
+-- snapshot after a newer canonical roster has been committed.
+--
+-- Old binaries already serialize kind 39002 replacement on the replacement
+-- advisory key. This trigger adds the channel-membership key at INSERT time,
+-- after that canonical key, and validates every p tag against the current
+-- active membership set and roles. New binaries take both keys in the same
+-- order before capture and replacement. Thus old and new writers remain
+-- compatible during a rolling deploy.
+CREATE OR REPLACE FUNCTION guard_channel_roster_snapshot()
+RETURNS TRIGGER AS $$
+DECLARE
+    canonical_members TEXT[];
+    snapshot_members TEXT[];
+BEGIN
+    IF NEW.kind <> 39002 OR NEW.channel_id IS NULL THEN
+        RETURN NEW;
+    END IF;
+
+    PERFORM pg_advisory_xact_lock(hashtextextended(
+        'buzz_channel_membership:' || NEW.community_id::text || ':' || NEW.channel_id::text,
+        0
+    ));
+
+    SELECT COALESCE(
+               array_agg(encode(cm.pubkey, 'hex') || ':' || cm.role::text ORDER BY cm.pubkey),
+               ARRAY[]::TEXT[]
+           )
+      INTO canonical_members
+      FROM channel_members cm
+     WHERE cm.community_id = NEW.community_id
+       AND cm.channel_id = NEW.channel_id
+       AND cm.removed_at IS NULL;
+
+    -- A roster is canonical only when every p tag uses the emitted four-field
+    -- shape, contains a 32-byte hex pubkey and valid authoritative role, has no
+    -- duplicate members, and exactly matches the active membership rows.
+    IF EXISTS (
+        SELECT 1
+          FROM jsonb_array_elements(NEW.tags) AS roster_tag(tag_json)
+         WHERE roster_tag.tag_json->>0 = 'p'
+           AND (
+               jsonb_array_length(roster_tag.tag_json) <> 4
+               OR COALESCE(roster_tag.tag_json->>1, '') !~ '^[0-9a-fA-F]{64}$'
+               OR roster_tag.tag_json->>2 <> ''
+               OR COALESCE(roster_tag.tag_json->>3, '') NOT IN ('owner', 'admin', 'bot', 'member', 'guest')
+           )
+    ) THEN
+        RAISE EXCEPTION 'kind 39002 roster contains an invalid p tag'
+            USING ERRCODE = '23514';
+    END IF;
+
+    SELECT COALESCE(
+               array_agg(
+                   lower((roster_tag.tag_json->>1)) || ':' || (roster_tag.tag_json->>3)
+                   ORDER BY decode((roster_tag.tag_json->>1), 'hex')
+               ),
+               ARRAY[]::TEXT[]
+           )
+      INTO snapshot_members
+      FROM jsonb_array_elements(NEW.tags) AS roster_tag(tag_json)
+     WHERE roster_tag.tag_json->>0 = 'p';
+
+    IF snapshot_members IS DISTINCT FROM canonical_members THEN
+        RAISE EXCEPTION 'kind 39002 roster does not match canonical channel membership'
+            USING ERRCODE = '23514';
+    END IF;
+
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS trg_events_guard_channel_roster_snapshot ON events;
+CREATE TRIGGER trg_events_guard_channel_roster_snapshot
+    BEFORE INSERT ON events
+    FOR EACH ROW EXECUTE FUNCTION guard_channel_roster_snapshot();
diff --git a/schema/schema.sql b/schema/schema.sql
index 9ef7bc0a4b..6e14e6be1b 100644
--- a/schema/schema.sql
+++ b/schema/schema.sql
@@ -990,6 +990,85 @@ AFTER INSERT ON events
 DEFERRABLE INITIALLY DEFERRED
 FOR EACH ROW EXECUTE FUNCTION refresh_channel_ttl_after_event_insert();
 
+-- Channel roster snapshot fence (keep in sync with migrations/0032).
+-- Prevent mixed-version relay pods from publishing a stale NIP-29 member
+-- snapshot after a newer canonical roster has been committed.
+--
+-- Old binaries already serialize kind 39002 replacement on the replacement
+-- advisory key. This trigger adds the channel-membership key at INSERT time,
+-- after that canonical key, and validates every p tag against the current
+-- active membership set and roles. New binaries take both keys in the same
+-- order before capture and replacement. Thus old and new writers remain
+-- compatible during a rolling deploy.
+CREATE OR REPLACE FUNCTION guard_channel_roster_snapshot()
+RETURNS TRIGGER AS $$
+DECLARE
+    canonical_members TEXT[];
+    snapshot_members TEXT[];
+BEGIN
+    IF NEW.kind <> 39002 OR NEW.channel_id IS NULL THEN
+        RETURN NEW;
+    END IF;
+
+    PERFORM pg_advisory_xact_lock(hashtextextended(
+        'buzz_channel_membership:' || NEW.community_id::text || ':' || NEW.channel_id::text,
+        0
+    ));
+
+    SELECT COALESCE(
+               array_agg(encode(cm.pubkey, 'hex') || ':' || cm.role::text ORDER BY cm.pubkey),
+               ARRAY[]::TEXT[]
+           )
+      INTO canonical_members
+      FROM channel_members cm
+     WHERE cm.community_id = NEW.community_id
+       AND cm.channel_id = NEW.channel_id
+       AND cm.removed_at IS NULL;
+
+    -- A roster is canonical only when every p tag uses the emitted four-field
+    -- shape, contains a 32-byte hex pubkey and valid authoritative role, has no
+    -- duplicate members, and exactly matches the active membership rows.
+    IF EXISTS (
+        SELECT 1
+          FROM jsonb_array_elements(NEW.tags) AS roster_tag(tag_json)
+         WHERE roster_tag.tag_json->>0 = 'p'
+           AND (
+               jsonb_array_length(roster_tag.tag_json) <> 4
+               OR COALESCE(roster_tag.tag_json->>1, '') !~ '^[0-9a-fA-F]{64}$'
+               OR roster_tag.tag_json->>2 <> ''
+               OR COALESCE(roster_tag.tag_json->>3, '') NOT IN ('owner', 'admin', 'bot', 'member', 'guest')
+           )
+    ) THEN
+        RAISE EXCEPTION 'kind 39002 roster contains an invalid p tag'
+            USING ERRCODE = '23514';
+    END IF;
+
+    SELECT COALESCE(
+               array_agg(
+                   lower((roster_tag.tag_json->>1)) || ':' || (roster_tag.tag_json->>3)
+                   ORDER BY decode((roster_tag.tag_json->>1), 'hex')
+               ),
+               ARRAY[]::TEXT[]
+           )
+      INTO snapshot_members
+      FROM jsonb_array_elements(NEW.tags) AS roster_tag(tag_json)
+     WHERE roster_tag.tag_json->>0 = 'p';
+
+    IF snapshot_members IS DISTINCT FROM canonical_members THEN
+        RAISE EXCEPTION 'kind 39002 roster does not match canonical channel membership'
+            USING ERRCODE = '23514';
+    END IF;
+
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS trg_events_guard_channel_roster_snapshot ON events;
+CREATE TRIGGER trg_events_guard_channel_roster_snapshot
+    BEFORE INSERT ON events
+    FOR EACH ROW EXECUTE FUNCTION guard_channel_roster_snapshot();
+
+
 -- Replica-fence floor guard (keep in sync with migrations/0021). A deferred
 -- constraint trigger re-checks, inside COMMIT processing, that channel-bearing
 -- event rows are no older than `buzz.created_at_floor` seconds before commit
diff --git a/scripts/attach-schema-partitions.sql b/scripts/attach-schema-partitions.sql
index 5837676f84..a67bb706b1 100644
--- a/scripts/attach-schema-partitions.sql
+++ b/scripts/attach-schema-partitions.sql
@@ -16,12 +16,12 @@ BEGIN
     ) THEN
         -- pgschema may copy parent triggers onto standalone children. Drop
         -- those copies before ATTACH; PostgreSQL recreates inherited parent
-        -- triggers while attaching and rejects same-named child triggers
-        -- (both the push-match trigger and the replica-fence floor guard).
+        -- triggers while attaching and rejects same-named child triggers.
         DROP TRIGGER IF EXISTS events_enqueue_push_match ON events_p_past;
         DROP TRIGGER IF EXISTS events_refresh_channel_ttl ON events_p_past;
         DROP TRIGGER IF EXISTS events_created_at_floor ON events_p_past;
         DROP TRIGGER IF EXISTS community_write_fence_events ON events_p_past;
+        DROP TRIGGER IF EXISTS trg_events_guard_channel_roster_snapshot ON events_p_past;
         ALTER TABLE events ATTACH PARTITION events_p_past
             FOR VALUES FROM (MINVALUE) TO ('2026-01-01');
     END IF;
@@ -35,6 +35,7 @@ BEGIN
         DROP TRIGGER IF EXISTS events_refresh_channel_ttl ON events_p2026_01;
         DROP TRIGGER IF EXISTS events_created_at_floor ON events_p2026_01;
         DROP TRIGGER IF EXISTS community_write_fence_events ON events_p2026_01;
+        DROP TRIGGER IF EXISTS trg_events_guard_channel_roster_snapshot ON events_p2026_01;
         ALTER TABLE events ATTACH PARTITION events_p2026_01
             FOR VALUES FROM ('2026-01-01') TO ('2026-02-01');
     END IF;
@@ -48,6 +49,7 @@ BEGIN
         DROP TRIGGER IF EXISTS events_refresh_channel_ttl ON events_p2026_02;
         DROP TRIGGER IF EXISTS events_created_at_floor ON events_p2026_02;
         DROP TRIGGER IF EXISTS community_write_fence_events ON events_p2026_02;
+        DROP TRIGGER IF EXISTS trg_events_guard_channel_roster_snapshot ON events_p2026_02;
         ALTER TABLE events ATTACH PARTITION events_p2026_02
             FOR VALUES FROM ('2026-02-01') TO ('2026-03-01');
     END IF;
@@ -61,6 +63,7 @@ BEGIN
         DROP TRIGGER IF EXISTS events_refresh_channel_ttl ON events_p2026_03;
         DROP TRIGGER IF EXISTS events_created_at_floor ON events_p2026_03;
         DROP TRIGGER IF EXISTS community_write_fence_events ON events_p2026_03;
+        DROP TRIGGER IF EXISTS trg_events_guard_channel_roster_snapshot ON events_p2026_03;
         ALTER TABLE events ATTACH PARTITION events_p2026_03
             FOR VALUES FROM ('2026-03-01') TO ('2026-04-01');
     END IF;
@@ -74,6 +77,7 @@ BEGIN
         DROP TRIGGER IF EXISTS events_refresh_channel_ttl ON events_p2026_04;
         DROP TRIGGER IF EXISTS events_created_at_floor ON events_p2026_04;
         DROP TRIGGER IF EXISTS community_write_fence_events ON events_p2026_04;
+        DROP TRIGGER IF EXISTS trg_events_guard_channel_roster_snapshot ON events_p2026_04;
         ALTER TABLE events ATTACH PARTITION events_p2026_04
             FOR VALUES FROM ('2026-04-01') TO ('2026-05-01');
     END IF;
@@ -87,6 +91,7 @@ BEGIN
         DROP TRIGGER IF EXISTS events_refresh_channel_ttl ON events_p2026_05;
         DROP TRIGGER IF EXISTS events_created_at_floor ON events_p2026_05;
         DROP TRIGGER IF EXISTS community_write_fence_events ON events_p2026_05;
+        DROP TRIGGER IF EXISTS trg_events_guard_channel_roster_snapshot ON events_p2026_05;
         ALTER TABLE events ATTACH PARTITION events_p2026_05
             FOR VALUES FROM ('2026-05-01') TO ('2026-06-01');
     END IF;
@@ -100,6 +105,7 @@ BEGIN
         DROP TRIGGER IF EXISTS events_refresh_channel_ttl ON events_p2026_06;
         DROP TRIGGER IF EXISTS events_created_at_floor ON events_p2026_06;
         DROP TRIGGER IF EXISTS community_write_fence_events ON events_p2026_06;
+        DROP TRIGGER IF EXISTS trg_events_guard_channel_roster_snapshot ON events_p2026_06;
         ALTER TABLE events ATTACH PARTITION events_p2026_06
             FOR VALUES FROM ('2026-06-01') TO ('2026-07-01');
     END IF;
@@ -113,6 +119,7 @@ BEGIN
         DROP TRIGGER IF EXISTS events_refresh_channel_ttl ON events_p_future;
         DROP TRIGGER IF EXISTS events_created_at_floor ON events_p_future;
         DROP TRIGGER IF EXISTS community_write_fence_events ON events_p_future;
+        DROP TRIGGER IF EXISTS trg_events_guard_channel_roster_snapshot ON events_p_future;
         ALTER TABLE events ATTACH PARTITION events_p_future
             FOR VALUES FROM ('2026-07-01') TO (MAXVALUE);
     END IF;

From 9891e64f6b8358d78aa85f2ba248310d58b51ec0 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Fri, 21 Aug 2026 21:07:36 +1000
Subject: [PATCH 08/38] fix(desktop): clarify add agents channel action (#6374)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"Create agent" button takes you to a UI to **invite** your existing
agents to a channel. Rewording the button to make this clear.

Before
<img width="481" height="251" alt="Screenshot 2026-08-21 at 1 58 40 pm"
src="https://github.com/user-attachments/assets/1b64f722-62b8-46fa-a6c4-dafcf2bdfaa7"
/>


After
(Sorry about different elements being in hover state in the screenshots)
<img width="481" height="313" alt="Screenshot 2026-08-21 at 1 58 16 pm"
src="https://github.com/user-attachments/assets/f68a9c9b-2276-4ef5-ace8-c4017977b1e8"
/>
## Summary

- Clarify that the empty-channel intro action adds existing agents to
the channel.
- Assert the exact action title and description in the existing E2E
coverage while preserving the separate Welcome create-agent flow.

### Related issue

None found.

### Testing

- `../node_modules/.bin/biome check
src/features/channels/ui/useChannelIntro.tsx tests/e2e/channels.spec.ts`
passed.
- `./node_modules/.bin/tsc && ./node_modules/.bin/vite build --mode e2e`
passed.
- The isolated Playwright smoke case `empty channel shows intro actions`
passed (1/1) after installing the repo-pinned Chromium.
- `env -u BUZZ_AGENT_PROVIDER just ci` passed.
- Screenshots not captured; this is a copy-only UI change.

---------

Signed-off-by: Matt Toohey <contact@matttoohey.com>
---
 desktop/src/features/channels/ui/useChannelIntro.tsx |  4 ++--
 desktop/tests/e2e/channels.spec.ts                   | 11 +++++++++--
 desktop/tests/e2e/tooltip-semantics.spec.ts          |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/desktop/src/features/channels/ui/useChannelIntro.tsx b/desktop/src/features/channels/ui/useChannelIntro.tsx
index c22bbff2c2..19f2da0edb 100644
--- a/desktop/src/features/channels/ui/useChannelIntro.tsx
+++ b/desktop/src/features/channels/ui/useChannelIntro.tsx
@@ -91,9 +91,9 @@ export function useChannelIntro({
     if (!activeChannel.archivedAt && activeChannel.isMember) {
       if (onAddAgent) {
         actions.push({
-          description: "Add an agent here.",
+          description: "Bring them in.",
           icon: <Bot aria-hidden className="h-6 w-6" />,
-          label: "Create agent",
+          label: "Add agents",
           onClick: onAddAgent,
           testId: "channel-intro-action-create-agent",
         });
diff --git a/desktop/tests/e2e/channels.spec.ts b/desktop/tests/e2e/channels.spec.ts
index 8a32a436c3..52d91dea3e 100644
--- a/desktop/tests/e2e/channels.spec.ts
+++ b/desktop/tests/e2e/channels.spec.ts
@@ -1746,8 +1746,15 @@ test("empty channel shows intro actions", async ({ page }) => {
   await expect(
     page.getByTestId("channel-intro-action-create-channel"),
   ).toHaveCount(0);
+  const addAgentsAction = page.getByTestId("channel-intro-action-create-agent");
+  await expect(addAgentsAction).toBeVisible();
   await expect(
-    page.getByTestId("channel-intro-action-create-agent"),
+    addAgentsAction.getByText("Add agents", { exact: true }),
+  ).toBeVisible();
+  await expect(
+    addAgentsAction.getByText("Bring them in.", {
+      exact: true,
+    }),
   ).toBeVisible();
   await expect(
     page.getByTestId("channel-intro-action-add-people"),
@@ -1767,7 +1774,7 @@ test("empty channel shows intro actions", async ({ page }) => {
   await page.keyboard.press("Escape");
   await expect(page.getByTestId("members-sidebar")).not.toBeVisible();
 
-  await page.getByTestId("channel-intro-action-create-agent").click();
+  await addAgentsAction.click();
   await expect(page.getByRole("heading", { name: "Add agents" })).toBeVisible();
 
   await page.keyboard.press("Escape");
diff --git a/desktop/tests/e2e/tooltip-semantics.spec.ts b/desktop/tests/e2e/tooltip-semantics.spec.ts
index 73306f025c..90ccd061bf 100644
--- a/desktop/tests/e2e/tooltip-semantics.spec.ts
+++ b/desktop/tests/e2e/tooltip-semantics.spec.ts
@@ -142,7 +142,7 @@ for (const theme of THEMES) {
     await expect(row).toBeVisible();
     await expectMutedSupportingText(
       row.getByRole("button", { name: "Open channel general" }),
-      /Public channel · Active \d+[mhdw] ago/,
+      /Public channel · Active (just now|\d+[mhdw] ago)/,
     );
     await page.mouse.move(0, 0);
     await expectMutedSupportingText(

From 9b32e055fed45864e1982f3d99c5402ba35cd8a6 Mon Sep 17 00:00:00 2001
From: thomaspblock <thomasp@squareup.com>
Date: Fri, 21 Aug 2026 08:45:55 -0400
Subject: [PATCH 09/38] polish(desktop): finish Projects navigation and context
 chrome (#6429)

## Summary

After #6396, Projects still split chrome across the workspace header, a
copy-link control, and a labeled Actions group that mixed people,
create, and metadata. This PR finishes that surface: the right-hand
context box is unlabeled actions plus a Details group, people stacks and
contribution heatmaps are gone from that box, Create review sits with
Create task, and the top chrome is terminal / chat / info with no
copy-link. Sent project context collapses to a pill, and review file
diffs keep the last good git view instead of flashing empty while
queries refetch.

This also lands the remaining navigation polish that followed Part 3:
overview and list presentation, readme and commit layout, and opening
the latest matching conversation from the Channels tab without leaving
the project.

### Related issue
N/A. Related: #6396

## Testing
- Walked Files, Tasks, Reviews, task/review detail, overview tabs, and
chrome chat vs info in the running desktop app
- Pre-push: desktop typecheck, unit tests, Tauri checks, and file-size
gate passed
- Updated Projects smoke specs for the new context groups, Create
review, chrome order, and removed copy-link control
- Merged current `origin/main`; one conflict in discussion-channel rows
kept conversation-panel navigation and took main's bounded channel-name
lookup

## Post-Deploy Monitoring & Validation
- validate Projects workspace chrome, context box, and review file diffs
in the first staging Desktop session
- healthy signals: context box shows unlabeled actions then Details,
chat toggle sits between terminal and info, review diffs stay populated
across selection changes
- failure signals: missing Create review, restored heatmap/people in the
context box, or empty Files Changed while the review is still selected;
mitigate by reverting this PR

---------

Signed-off-by: Thomas Petersen <thomasp@squareup.com>
---
 desktop/src-tauri/src/lib.rs                  |   1 -
 .../lib/mentionHighlightExtension.test.mjs    | 148 +++++
 .../messages/lib/mentionHighlightExtension.ts | 434 ++++++++++++-
 .../messages/lib/useRichTextEditor.ts         |  29 +-
 .../messages/ui/MessageThreadTranscript.tsx   |  24 +-
 .../lib/projectDetailAgentContext.test.mjs    |  41 +-
 .../projects/lib/projectDetailAgentContext.ts |  30 +-
 .../lib/projectReviewDisplay.test.mjs         | 181 ++++++
 .../projects/lib/projectReviewDisplay.ts      | 101 +++
 .../ui/AgentContextPayloadPreview.test.mjs    |  23 +-
 .../ui/AgentContextPayloadPreview.tsx         |  15 +-
 .../projects/ui/DiscussionChannels.tsx        | 125 ++--
 .../projects/ui/IssueAssigneesRow.tsx         |   4 +-
 .../projects/ui/ProjectAgentChatPanel.tsx     |   3 +-
 .../ProjectAgentSubmittedContextPill.test.mjs |  61 ++
 .../ui/ProjectAgentSubmittedContextPill.tsx   |  39 ++
 .../src/features/projects/ui/ProjectCards.tsx |  43 +-
 .../projects/ui/ProjectCommitCopyButton.tsx   |  17 +-
 .../projects/ui/ProjectCommitDetailPanel.tsx  | 162 +++--
 .../projects/ui/ProjectDetailChrome.tsx       |  11 -
 .../projects/ui/ProjectDetailFeedPanels.tsx   |   6 +-
 .../projects/ui/ProjectDetailScreen.tsx       | 166 ++---
 .../projects/ui/ProjectDetailSection.tsx      |  19 +-
 .../projects/ui/ProjectEntityListRow.tsx      |  11 +-
 .../ProjectPullRequestFilesChangedPanel.tsx   |  18 +-
 .../projects/ui/ProjectPullRequestsPanel.tsx  | 138 ++--
 .../projects/ui/ProjectReadmePanel.tsx        |   6 +-
 .../ui/ProjectRepositoryActionsPanel.tsx      | 599 ++++++++----------
 .../ui/ProjectRepositoryLatestCommitRow.tsx   |  41 ++
 .../projects/ui/ProjectRepositoryPanel.tsx    |  46 +-
 .../projects/ui/ProjectRightPanelControls.tsx |   9 +-
 .../projects/ui/ProjectSectionHeader.tsx      |  15 +-
 .../projects/ui/ProjectSelectableGroup.tsx    |  49 +-
 .../ProjectWorkItemCommunicationActions.tsx   |   9 +-
 .../ui/ProjectWorkItemContextActions.tsx      |  14 +-
 .../ui/ProjectWorkItemContextDetails.tsx      |  21 +
 .../projects/ui/ProjectWorkItemGroup.tsx      |   4 +-
 .../projects/ui/ProjectWorkItemRow.tsx        |  88 +--
 .../projects/ui/ProjectWorkspaceTabs.tsx      |  88 ++-
 .../projects/ui/ProjectsAgentPromptPage.tsx   |  69 +-
 .../projects/ui/ProjectsChannelsList.tsx      |   1 +
 .../projects/ui/ProjectsContributionGraph.tsx | 170 -----
 .../projects/ui/ProjectsIssuesList.tsx        |   1 +
 .../projects/ui/ProjectsListHeaderBar.tsx     |  56 +-
 .../ui/ProjectsOverviewChromeActions.tsx      |  62 ++
 .../projects/ui/ProjectsOverviewPanel.tsx     |  41 +-
 .../projects/ui/ProjectsOverviewRail.tsx      |   9 -
 .../projects/ui/ProjectsPullRequestsList.tsx  |   1 +
 .../src/features/projects/ui/ProjectsView.tsx |  88 +--
 .../projects/ui/PullRequestMetaRail.tsx       |  24 +-
 .../projects/ui/PullRequestReviewersRow.tsx   | 116 ++--
 .../projects/ui/PullRequestsPanelSurface.tsx  |  62 ++
 .../features/projects/ui/RepositoryCards.tsx  |  28 +-
 .../ui/projectsOverviewContext.test.mjs       |  15 +-
 .../projects/ui/projectsOverviewContext.ts    |  36 +-
 .../ui/useRetainedProjectGitViews.test.mjs    | 492 ++++++++++++++
 .../projects/ui/useRetainedProjectGitViews.ts | 218 +++++++
 .../src/shared/styles/globals/composer.css    |  12 +-
 .../styles/globals/composerCaret.test.mjs     |  18 +
 desktop/src/shared/ui/markdown.tsx            |  41 +-
 .../ui/markdown/ChannelDeepLink.test.mjs      |  11 +
 .../src/shared/ui/markdown/ImageMosaic.tsx    |  28 +
 desktop/src/shared/ui/markdown/types.ts       |   7 +
 desktop/src/shared/ui/markdownUtils.ts        |   1 +
 desktop/tests/e2e/mentions.spec.ts            |  83 ++-
 .../tests/e2e/project-commit-detail.spec.ts   |  51 +-
 .../tests/e2e/project-issue-comments.spec.ts  |  16 +
 desktop/tests/e2e/project-pr-review.spec.ts   | 490 ++++++++++++--
 .../tests/e2e/projects-v3-screenshots.spec.ts | 285 ++++++---
 desktop/tests/e2e/sidebar.spec.ts             |  41 ++
 70 files changed, 3935 insertions(+), 1477 deletions(-)
 create mode 100644 desktop/src/features/projects/lib/projectReviewDisplay.test.mjs
 create mode 100644 desktop/src/features/projects/lib/projectReviewDisplay.ts
 create mode 100644 desktop/src/features/projects/ui/ProjectAgentSubmittedContextPill.test.mjs
 create mode 100644 desktop/src/features/projects/ui/ProjectAgentSubmittedContextPill.tsx
 create mode 100644 desktop/src/features/projects/ui/ProjectRepositoryLatestCommitRow.tsx
 delete mode 100644 desktop/src/features/projects/ui/ProjectsContributionGraph.tsx
 create mode 100644 desktop/src/features/projects/ui/ProjectsOverviewChromeActions.tsx
 create mode 100644 desktop/src/features/projects/ui/PullRequestsPanelSurface.tsx
 create mode 100644 desktop/src/features/projects/ui/useRetainedProjectGitViews.test.mjs
 create mode 100644 desktop/src/features/projects/ui/useRetainedProjectGitViews.ts
 create mode 100644 desktop/src/shared/styles/globals/composerCaret.test.mjs
 create mode 100644 desktop/src/shared/ui/markdown/ImageMosaic.tsx

diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index c120ac1267..e1b8a9551b 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -914,7 +914,6 @@ pub fn run() {
         RunEvent::Exit => {
             shut_down_app(app_handle, &run_shutdown_done);
             app_handle.state::<ClipboardState>().release();
-
             #[cfg(all(feature = "mesh-llm", target_os = "macos"))]
             if restart_requested.load(Ordering::SeqCst) {
                 relaunch_after_mesh_shutdown(app_handle);
diff --git a/desktop/src/features/messages/lib/mentionHighlightExtension.test.mjs b/desktop/src/features/messages/lib/mentionHighlightExtension.test.mjs
index 164225fd80..2747bdb186 100644
--- a/desktop/src/features/messages/lib/mentionHighlightExtension.test.mjs
+++ b/desktop/src/features/messages/lib/mentionHighlightExtension.test.mjs
@@ -1,9 +1,19 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
+import { getSchema } from "@tiptap/core";
+import StarterKit from "@tiptap/starter-kit";
+
 import {
+  assignMentionHighlightNames,
   buildHighlightPatterns,
+  createMentionCaretSettlement,
   findHighlightMatches,
+  insertPosForMentionTextInput,
+  mentionTextInputInsertPos,
+  positionAfterArrowLeftThroughMentionSpace,
+  selectionAfterMentionTrailingSpace,
+  shouldAdvanceMentionCaret,
 } from "./mentionHighlightExtension.ts";
 
 // ── buildHighlightPatterns ────────────────────────────────────────────
@@ -164,3 +174,141 @@ test("#general should NOT match inside #generally (trailing word boundary)", ()
   const matches = findHighlightMatches("#generally", patterns);
   assert.equal(matches.length, 0);
 });
+
+const schema = getSchema([
+  StarterKit.configure({
+    heading: false,
+    trailingNode: false,
+    link: false,
+  }),
+]);
+const paragraph = (...content) => schema.nodes.paragraph.create(null, content);
+const text = (value) => schema.text(value);
+const document = (...content) => schema.nodes.doc.create(null, content);
+
+test("selectionAfterMentionTrailingSpace steps past the space after @Name", () => {
+  const doc = document(paragraph(text("@quinn ")));
+  const spacePos = 1 + "@quinn".length;
+  assert.equal(selectionAfterMentionTrailingSpace(doc, spacePos), spacePos + 1);
+  assert.equal(
+    selectionAfterMentionTrailingSpace(doc, spacePos + 1),
+    spacePos + 1,
+  );
+});
+
+test("selectionAfterMentionTrailingSpace leaves a caret inside the mention name", () => {
+  const doc = document(paragraph(text("@quinn ")));
+  assert.equal(selectionAfterMentionTrailingSpace(doc, 4), 4);
+});
+
+test("selectionAfterMentionTrailingSpace does not move without a trailing space", () => {
+  const doc = document(paragraph(text("@quinn")));
+  const end = 1 + "@quinn".length;
+  assert.equal(selectionAfterMentionTrailingSpace(doc, end), end);
+});
+
+test("shouldAdvanceMentionCaret restores a remap while this editor is settling", () => {
+  assert.equal(
+    shouldAdvanceMentionCaret({
+      from: 7,
+      next: 8,
+      settling: true,
+      docChanged: false,
+    }),
+    true,
+  );
+});
+
+test("shouldAdvanceMentionCaret does not steal ArrowLeft after settlement is cancelled", () => {
+  assert.equal(
+    shouldAdvanceMentionCaret({
+      from: 7,
+      next: 8,
+      settling: false,
+      docChanged: false,
+    }),
+    false,
+  );
+});
+
+test("shouldAdvanceMentionCaret still advances after a document change", () => {
+  assert.equal(
+    shouldAdvanceMentionCaret({
+      from: 7,
+      next: 8,
+      settling: false,
+      docChanged: true,
+    }),
+    true,
+  );
+});
+
+test("createMentionCaretSettlement keeps two editors independent", () => {
+  const composerA = createMentionCaretSettlement();
+  const composerB = createMentionCaretSettlement();
+  composerA.arm(8);
+  assert.equal(composerB.peek(), null);
+  composerB.arm(12);
+  composerA.cancel();
+  assert.equal(composerA.peek(), null);
+  assert.equal(composerB.peek(), 12);
+});
+
+test("insertPosForMentionTextInput redirects a caret at the chip edge", () => {
+  const doc = document(paragraph(text("@quinn ")));
+  const spacePos = 1 + "@quinn".length;
+  assert.equal(
+    insertPosForMentionTextInput(doc, spacePos, spacePos),
+    spacePos + 1,
+  );
+  assert.equal(
+    insertPosForMentionTextInput(doc, spacePos + 1, spacePos + 1),
+    null,
+  );
+});
+
+test("insertPosForMentionTextInput keeps a selected trailing space", () => {
+  const doc = document(paragraph(text("@quinn ")));
+  const spacePos = 1 + "@quinn".length;
+  assert.equal(
+    insertPosForMentionTextInput(doc, spacePos, spacePos + 1),
+    spacePos + 1,
+  );
+});
+
+test("mentionTextInputInsertPos honors a deliberate caret after settlement", () => {
+  const doc = document(paragraph(text("@bob ")));
+  const spacePos = 1 + "@bob".length;
+  assert.equal(mentionTextInputInsertPos(doc, spacePos, spacePos, false), null);
+  assert.equal(
+    mentionTextInputInsertPos(doc, spacePos, spacePos, true),
+    spacePos + 1,
+  );
+});
+
+test("positionAfterArrowLeftThroughMentionSpace steps onto the token end", () => {
+  const doc = document(paragraph(text("@bob ")));
+  const afterSpace = 1 + "@bob".length + 1;
+  assert.equal(
+    positionAfterArrowLeftThroughMentionSpace(doc, afterSpace),
+    afterSpace - 1,
+  );
+  assert.equal(
+    positionAfterArrowLeftThroughMentionSpace(doc, afterSpace - 1),
+    null,
+  );
+});
+
+test("assignMentionHighlightNames skips an unchanged list", () => {
+  const storage = { names: ["bob"], agentNames: [], channelNames: [] };
+  assert.equal(assignMentionHighlightNames(storage, ["bob"], [], []), false);
+});
+
+test("assignMentionHighlightNames updates when a new mention is added", () => {
+  const storage = { names: ["bob"], agentNames: [], channelNames: [] };
+  assert.equal(
+    assignMentionHighlightNames(storage, ["bob", "quinn"], [], []),
+    true,
+  );
+  assert.deepEqual(storage.names, ["bob", "quinn"]);
+});
diff --git a/desktop/src/features/messages/lib/mentionHighlightExtension.ts b/desktop/src/features/messages/lib/mentionHighlightExtension.ts
index a8d3ef8ff0..f20feef26d 100644
--- a/desktop/src/features/messages/lib/mentionHighlightExtension.ts
+++ b/desktop/src/features/messages/lib/mentionHighlightExtension.ts
@@ -1,5 +1,11 @@
 import { Extension } from "@tiptap/core";
-import { Plugin, PluginKey, type Transaction } from "@tiptap/pm/state";
+import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
+import {
+  Plugin,
+  PluginKey,
+  TextSelection,
+  type Transaction,
+} from "@tiptap/pm/state";
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
 
 import {
@@ -9,6 +15,238 @@ import {
 
 export const mentionHighlightKey = new PluginKey("mentionHighlight");
 
+export type MentionCaretSettlement = {
+  arm: (pos: number) => void;
+  peek: () => number | null;
+  cancel: () => void;
+};
+
+export function createMentionCaretSettlement(): MentionCaretSettlement {
+  let pos: number | null = null;
+  return {
+    arm(nextPos: number) {
+      pos = nextPos;
+    },
+    peek() {
+      return pos;
+    },
+    cancel() {
+      pos = null;
+    },
+  };
+}
+
+/**
+ * Whether to move an empty caret from `from` to `next` after a mention
+ * trailing space. Settlement is per editor: autocomplete arms it, and
+ * ArrowLeft/click cancel it so we do not steal an intentional caret.
+ */
+export function shouldAdvanceMentionCaret({
+  from,
+  next,
+  settling,
+  docChanged,
+}: {
+  from: number;
+  next: number;
+  settling: boolean;
+  docChanged: boolean;
+}): boolean {
+  return next !== from && (settling || docChanged);
+}
+
+/**
+ * Where to insert typed text when the caret (or a one-character selection)
+ * sits on the trailing space after an `@name` / `#channel` token.
+ * A selected trailing space would otherwise be replaced, producing
+ * `@bobhello`.
+ */
+export function insertPosForMentionTextInput(
+  doc: ProseMirrorNode,
+  from: number,
+  to: number,
+): number | null {
+  const next = selectionAfterMentionTrailingSpace(doc, from);
+  if (from === to) {
+    return next === from ? null : next;
+  }
+  if (to === next && next === from + 1) {
+    return next;
+  }
+  return null;
+}
+
+/**
+ * Redirect chip-edge typing only while autocomplete is settling. After a
+ * deliberate ArrowLeft or chip click, honor the caret so `x` lands in the
+ * token (`@bobx`) instead of after the space (`@bob x`).
+ */
+export function mentionTextInputInsertPos(
+  doc: ProseMirrorNode,
+  from: number,
+  to: number,
+  settling: boolean,
+): number | null {
+  if (!settling) return null;
+  return insertPosForMentionTextInput(doc, from, to);
+}
+
+/** Caret just after a mention trailing space: ArrowLeft lands on the token end. */
+export function positionAfterArrowLeftThroughMentionSpace(
+  doc: ProseMirrorNode,
+  from: number,
+): number | null {
+  if (from <= 0) return null;
+  const chipEnd = from - 1;
+  if (selectionAfterMentionTrailingSpace(doc, chipEnd) === from) {
+    return chipEnd;
+  }
+  return null;
+}
+
+export function setDomCaretAtPos(
+  view: {
+    domAtPos: (pos: number) => { node: Node; offset: number };
+    root: Document | ShadowRoot;
+  },
+  pos: number,
+): void {
+  if (typeof document === "undefined") return;
+  let mapped: { node: Node; offset: number };
+  try {
+    mapped = view.domAtPos(pos);
+  } catch {
+    return;
+  }
+  const range = document.createRange();
+  try {
+    range.setStart(mapped.node, mapped.offset);
+  } catch {
+    return;
+  }
+  range.collapse(true);
+  const root = view.root;
+  const selection =
+    "getSelection" in root && typeof root.getSelection === "function"
+      ? root.getSelection()
+      : window.getSelection();
+  if (!selection) return;
+  selection.removeAllRanges();
+  selection.addRange(range);
+}
+
+export function reassertMentionCaretAfterFocus(view: {
+  state: {
+    doc: ProseMirrorNode;
+    selection: { empty: boolean; from: number };
+    tr: Transaction;
+  };
+  dispatch: (tr: Transaction) => void;
+  domAtPos: (pos: number) => { node: Node; offset: number };
+  root: Document | ShadowRoot;
+}): void {
+  if (!view.state.selection.empty) return;
+  const from = view.state.selection.from;
+  const next = selectionAfterMentionTrailingSpace(view.state.doc, from);
+  if (next !== from) {
+    view.dispatch(
+      view.state.tr.setSelection(TextSelection.create(view.state.doc, next)),
+    );
+  }
+  setDomCaretAtPos(view, view.state.selection.from);
+}
+
+export type MentionHighlightStorage = {
+  names: string[];
+  agentNames: string[];
+  channelNames: string[];
+};
+
+function sameNameList(current: string[], next: string[]): boolean {
+  return (
+    current.length === next.length &&
+    current.every((name, index) => name === next[index])
+  );
+}
+
+export function assignMentionHighlightNames(
+  storage: MentionHighlightStorage,
+  names: string[],
+  agentNames: string[],
+  channelNames: string[],
+): boolean {
+  if (
+    sameNameList(storage.names, names) &&
+    sameNameList(storage.agentNames, agentNames) &&
+    sameNameList(storage.channelNames, channelNames)
+  ) {
+    return false;
+  }
+  storage.names = names;
+  storage.agentNames = agentNames;
+  storage.channelNames = channelNames;
+  return true;
+}
+
+export function mentionHighlightStorage(editor: {
+  storage: object;
+}): MentionHighlightStorage | undefined {
+  if (!("mentionHighlight" in editor.storage)) return undefined;
+  return editor.storage.mentionHighlight as MentionHighlightStorage;
+}
+
+export function settleAutocompleteMentionInsert(
+  editor: { storage: object },
+  tr: Transaction,
+  text: string,
+): void {
+  const storage = mentionHighlightStorage(editor);
+  const mentionInsert = /(?:^|[\s(])([@#])([^\s]+) $/.exec(text);
+  if (!mentionInsert) return;
+  const prefix = mentionInsert[1];
+  const label = mentionInsert[2];
+  if (storage) {
+    const known = [
+      ...storage.names,
+      ...storage.agentNames,
+      ...storage.channelNames,
+    ];
+    if (!known.some((name) => name.toLowerCase() === label.toLowerCase())) {
+      if (prefix === "#") {
+        storage.channelNames = [...storage.channelNames, label];
+      } else {
+        storage.names = [...storage.names, label];
+      }
+    }
+  }
+  tr.setMeta(mentionHighlightKey, true);
+}
+
+export function syncMentionHighlightFromProps(
+  editor: {
+    storage: object;
+    state: { tr: Transaction };
+    view: { dispatch: (tr: Transaction) => void };
+  },
+  names: string[] | undefined,
+  agentNames: string[] | undefined,
+  channelNames: string[] | undefined,
+): void {
+  const storage = mentionHighlightStorage(editor);
+  if (
+    !storage ||
+    !assignMentionHighlightNames(
+      storage,
+      names ?? [],
+      agentNames ?? [],
+      channelNames ?? [],
+    )
+  ) {
+    return;
+  }
+  editor.view.dispatch(editor.state.tr.setMeta(mentionHighlightKey, true));
+}
+
 /**
  * TipTap extension that applies inline `mention-chip` decorations
  * to `@Name` and `#channel-name` patterns in the document.
@@ -29,6 +267,7 @@ export const MentionHighlightExtension = Extension.create({
 
   addProseMirrorPlugins() {
     const extension = this;
+    const settlement = createMentionCaretSettlement();
 
     return [
       new Plugin({
@@ -43,6 +282,16 @@ export const MentionHighlightExtension = Extension.create({
             );
           },
           apply(tr, oldDecorations) {
+            if (
+              tr.getMeta(mentionHighlightKey) &&
+              tr.selection.empty &&
+              (tr.docChanged || settlement.peek() !== null)
+            ) {
+              settlement.arm(
+                selectionAfterMentionTrailingSpace(tr.doc, tr.selection.from),
+              );
+            }
+
             // Names/channels changed — full rebuild required.
             if (tr.getMeta(mentionHighlightKey)) {
               return buildDecorations(
@@ -85,10 +334,131 @@ export const MentionHighlightExtension = Extension.create({
             return oldDecorations.map(tr.mapping, tr.doc);
           },
         },
+        appendTransaction(transactions, _oldState, newState) {
+          if (!newState.selection.empty) {
+            settlement.cancel();
+            return null;
+          }
+          const from = newState.selection.from;
+          const next = selectionAfterMentionTrailingSpace(newState.doc, from);
+          if (
+            !shouldAdvanceMentionCaret({
+              from,
+              next,
+              settling: settlement.peek() !== null,
+              docChanged: transactions.some((tr) => tr.docChanged),
+            })
+          ) {
+            return null;
+          }
+          return newState.tr.setSelection(
+            TextSelection.create(newState.doc, next),
+          );
+        },
+        view() {
+          let applying = false;
+          return {
+            update(view) {
+              if (applying || settlement.peek() === null) return;
+              if (!view.state.selection.empty) {
+                settlement.cancel();
+                return;
+              }
+              const from = view.state.selection.from;
+              const next = selectionAfterMentionTrailingSpace(
+                view.state.doc,
+                from,
+              );
+              if (next !== from) {
+                applying = true;
+                try {
+                  view.dispatch(
+                    view.state.tr.setSelection(
+                      TextSelection.create(view.state.doc, next),
+                    ),
+                  );
+                } finally {
+                  applying = false;
+                }
+              }
+              setDomCaretAtPos(view, view.state.selection.from);
+            },
+            destroy() {
+              settlement.cancel();
+            },
+          };
+        },
         props: {
           decorations(state) {
             return this.getState(state) ?? DecorationSet.empty;
           },
+          handleTextInput(view, from, to, text) {
+            const insertAt = mentionTextInputInsertPos(
+              view.state.doc,
+              from,
+              to,
+              settlement.peek() !== null,
+            );
+            if (insertAt == null) {
+              settlement.cancel();
+              return false;
+            }
+            const tr = view.state.tr.insertText(text, insertAt);
+            const caret = tr.mapping.map(insertAt, 1);
+            tr.setSelection(TextSelection.create(tr.doc, caret));
+            view.dispatch(tr);
+            settlement.cancel();
+            setDomCaretAtPos(view, caret);
+            return true;
+          },
+          handleKeyDown(view, event) {
+            if (
+              event.key === "ArrowRight" ||
+              event.key === "ArrowUp" ||
+              event.key === "ArrowDown" ||
+              event.key === "Home" ||
+              event.key === "End"
+            ) {
+              settlement.cancel();
+              return false;
+            }
+            if (event.key !== "ArrowLeft" || !view.state.selection.empty) {
+              return false;
+            }
+            settlement.cancel();
+            const chipEnd = positionAfterArrowLeftThroughMentionSpace(
+              view.state.doc,
+              view.state.selection.from,
+            );
+            if (chipEnd == null) return false;
+            view.dispatch(
+              view.state.tr.setSelection(
+                TextSelection.create(view.state.doc, chipEnd),
+              ),
+            );
+            setDomCaretAtPos(view, chipEnd);
+            return true;
+          },
+          handleClick(view, pos, event) {
+            const target = event.target;
+            const onChip =
+              target instanceof Element &&
+              Boolean(target.closest(".mention-chip"));
+            settlement.cancel();
+            if (!onChip) return false;
+            const chipEnd = positionAfterArrowLeftThroughMentionSpace(
+              view.state.doc,
+              pos,
+            );
+            if (chipEnd == null) return false;
+            view.dispatch(
+              view.state.tr.setSelection(
+                TextSelection.create(view.state.doc, chipEnd),
+              ),
+            );
+            setDomCaretAtPos(view, chipEnd);
+            return true;
+          },
         },
       }),
     ];
@@ -136,6 +506,28 @@ export function buildHighlightPatterns(
   return patterns;
 }
 
+/**
+ * If `pos` sits at the end of an `@name` / `#channel` token and the next
+ * character is a space, return the position after that space.
+ *
+ * Autocomplete inserts `@Name ` then chip decorations wrap the token. The
+ * browser can map the caret back to the chip edge, so the next keystroke
+ * lands before the space (`@quinnhello`). Callers use this to keep typing
+ * after the token.
+ */
+export function selectionAfterMentionTrailingSpace(
+  doc: ProseMirrorNode,
+  pos: number,
+): number {
+  if (pos < 0 || pos >= doc.content.size) return pos;
+  const nextChar = doc.textBetween(pos, pos + 1, "\n", "\0");
+  if (nextChar !== " ") return pos;
+  const lookbehind = Math.min(pos, 80);
+  const before = doc.textBetween(pos - lookbehind, pos, "\n", "\0");
+  if (!/(?:^|[\s(])[@#][^\s]+$/.test(before)) return pos;
+  return pos + 1;
+}
+
 /**
  * Find all highlight matches in a text string given a set of patterns.
  * Returns an array of { from, to } offsets relative to the text start.
@@ -310,25 +702,41 @@ function addMatchesForPatterns(
     while (match !== null) {
       const from = position + match.index;
       const to = from + match[0].length;
+      const outsideEnd = { inclusiveEnd: false };
       if (options?.hidePrefix && /^[@#]/.test(match[0])) {
         decorations.push(
-          Decoration.inline(from, from + 1, {
-            class: "mention-prefix-hidden",
-            spellcheck: "false",
-          }),
+          Decoration.inline(
+            from,
+            from + 1,
+            {
+              class: "mention-prefix-hidden",
+              spellcheck: "false",
+            },
+            outsideEnd,
+          ),
         );
         decorations.push(
-          Decoration.inline(from + 1, to, {
-            class: className,
-            spellcheck: "false",
-          }),
+          Decoration.inline(
+            from + 1,
+            to,
+            {
+              class: className,
+              spellcheck: "false",
+            },
+            outsideEnd,
+          ),
         );
       } else {
         decorations.push(
-          Decoration.inline(from, to, {
-            class: className,
-            spellcheck: "false",
-          }),
+          Decoration.inline(
+            from,
+            to,
+            {
+              class: className,
+              spellcheck: "false",
+            },
+            outsideEnd,
+          ),
         );
       }
       match = pattern.exec(text);
diff --git a/desktop/src/features/messages/lib/useRichTextEditor.ts b/desktop/src/features/messages/lib/useRichTextEditor.ts
index f812eb9115..36a75f32e5 100644
--- a/desktop/src/features/messages/lib/useRichTextEditor.ts
+++ b/desktop/src/features/messages/lib/useRichTextEditor.ts
@@ -24,7 +24,9 @@ import { MESSAGE_MARKDOWN_CLASS } from "@/shared/ui/mentionChip";
 
 import {
   MentionHighlightExtension,
-  mentionHighlightKey,
+  reassertMentionCaretAfterFocus,
+  settleAutocompleteMentionInsert,
+  syncMentionHighlightFromProps,
 } from "./mentionHighlightExtension";
 import { CUSTOM_EMOJI_NODE_NAME } from "./customEmojiNode";
 import { useComposerCustomEmoji } from "./useComposerCustomEmoji";
@@ -688,24 +690,15 @@ export function useRichTextEditor({
   }, [editor, placeholder]);
 
   // Keep mention/channel-highlight decorations in sync with known names.
-  // NOTE: We use `editor.storage.mentionHighlight` (the mutable storage object
-  // shared with the ProseMirror plugin closure) rather than finding the
-  // extension instance via extensionManager — the instance's `.storage` getter
-  // returns a fresh spread-copy on every access, so mutations are silently lost.
+  // Mutate `editor.storage.mentionHighlight`; the extension getter copies storage.
   React.useEffect(() => {
     if (!editor) return;
-    // biome-ignore lint/suspicious/noExplicitAny: TipTap's Storage type doesn't include dynamic extension keys
-    const storage = (editor.storage as any).mentionHighlight as
-      | { names: string[]; agentNames: string[]; channelNames: string[] }
-      | undefined;
-    if (storage) {
-      storage.names = mentionNames ?? [];
-      storage.agentNames = agentMentionNames ?? [];
-      storage.channelNames = channelNames ?? [];
-      // Force the plugin to re-decorate by dispatching a metadata transaction.
-      const { tr } = editor.state;
-      editor.view.dispatch(tr.setMeta(mentionHighlightKey, true));
-    }
+    syncMentionHighlightFromProps(
+      editor,
+      mentionNames,
+      agentMentionNames,
+      channelNames,
+    );
   }, [editor, mentionNames, agentMentionNames, channelNames]);
 
   // Custom-emoji set changes: re-resolve the `src` attr on any existing
@@ -872,8 +865,10 @@ export function useRichTextEditor({
       // "Position N out of range".)
       const cursorPM = tr.mapping.map(toPM);
       tr.setSelection(TextSelection.create(tr.doc, cursorPM));
+      settleAutocompleteMentionInsert(editor, tr, text);
       editor.view.dispatch(tr);
       editor.view.focus();
+      reassertMentionCaretAfterFocus(editor.view);
     },
     [editor, customEmojiWiring.resolveUrl],
   );
diff --git a/desktop/src/features/messages/ui/MessageThreadTranscript.tsx b/desktop/src/features/messages/ui/MessageThreadTranscript.tsx
index fceda28657..7460f9aad3 100644
--- a/desktop/src/features/messages/ui/MessageThreadTranscript.tsx
+++ b/desktop/src/features/messages/ui/MessageThreadTranscript.tsx
@@ -21,6 +21,7 @@ type MessageThreadTranscriptProps = {
     remove: boolean,
   ) => Promise<void>;
   profiles?: UserProfileLookup;
+  renderAfterMessage?: (message: TimelineMessage) => React.ReactNode;
   testId?: string;
 };
 
@@ -36,6 +37,7 @@ export function MessageThreadTranscript({
   messages,
   onToggleReaction,
   profiles,
+  renderAfterMessage,
   testId = "message-thread-transcript",
 }: MessageThreadTranscriptProps) {
   const renderItems = React.useMemo(() => {
@@ -59,16 +61,18 @@ export function MessageThreadTranscript({
       data-testid={testId}
     >
       {renderItems.map(({ isContinuation, message }) => (
-        <MessageThreadRow
-          channelId={channelId}
-          currentPubkey={currentPubkey}
-          isContinuation={isContinuation}
-          key={message.renderKey ?? message.id}
-          message={message}
-          onToggleReaction={onToggleReaction}
-          profiles={profiles}
-          showDepthGuides={false}
-        />
+        <React.Fragment key={message.renderKey ?? message.id}>
+          <MessageThreadRow
+            channelId={channelId}
+            currentPubkey={currentPubkey}
+            isContinuation={isContinuation}
+            message={message}
+            onToggleReaction={onToggleReaction}
+            profiles={profiles}
+            showDepthGuides={false}
+          />
+          {renderAfterMessage?.(message)}
+        </React.Fragment>
       ))}
     </div>
   );
diff --git a/desktop/src/features/projects/lib/projectDetailAgentContext.test.mjs b/desktop/src/features/projects/lib/projectDetailAgentContext.test.mjs
index 7febdf8b67..36066132c4 100644
--- a/desktop/src/features/projects/lib/projectDetailAgentContext.test.mjs
+++ b/desktop/src/features/projects/lib/projectDetailAgentContext.test.mjs
@@ -6,6 +6,7 @@ import {
   buildProjectSelectionAgentContext,
   buildProjectsOverviewAgentContext,
   projectDetailAgentContextBlock,
+  splitProjectDetailAgentContext,
   stripProjectDetailAgentContext,
   untrustedPromptValue,
   withProjectSelectionAgentContext,
@@ -215,8 +216,44 @@ test("selected project context enforces a final serialization budget", () => {
 });
 
 test("strips hidden page context from the displayed user message", () => {
-  const content = `Explain this file${projectDetailAgentContextBlock(
+  const payload = projectDetailAgentContextBlock(
     buildProjectDetailAgentContext(base),
-  )}`;
+  );
+  const content = `Explain this file${payload}`;
   assert.equal(stripProjectDetailAgentContext(content), "Explain this file");
+  assert.deepEqual(splitProjectDetailAgentContext(content), {
+    context: payload.trim(),
+    message: "Explain this file",
+  });
+});
+
+test("leaves ordinary messages unchanged without inventing context", () => {
+  assert.deepEqual(splitProjectDetailAgentContext("A normal message"), {
+    context: null,
+    message: "A normal message",
+  });
+});
+
+test("splits only the final appended context marker", () => {
+  const userMessage =
+    "Discuss this literal example:\n---\nCurrent Buzz project page:\nnot appended";
+  const payload = projectDetailAgentContextBlock(
+    buildProjectDetailAgentContext(base),
+  );
+  assert.deepEqual(splitProjectDetailAgentContext(`${userMessage}${payload}`), {
+    context: payload.trim(),
+    message: userMessage,
+  });
+});
+
+test("splits workspace repository context for the shared conversation view", () => {
+  const payload =
+    '\n---\nWorkspace repositories:\n- "Buzz" (address: "owner:buzz")';
+  assert.deepEqual(
+    splitProjectDetailAgentContext(`Compare the repos${payload}`),
+    {
+      context: payload.trim(),
+      message: "Compare the repos",
+    },
+  );
 });
diff --git a/desktop/src/features/projects/lib/projectDetailAgentContext.ts b/desktop/src/features/projects/lib/projectDetailAgentContext.ts
index 0194bad3e1..9714215700 100644
--- a/desktop/src/features/projects/lib/projectDetailAgentContext.ts
+++ b/desktop/src/features/projects/lib/projectDetailAgentContext.ts
@@ -5,6 +5,12 @@ import {
 } from "./projectSelection.ts";
 
 const PROJECT_PAGE_CONTEXT_MARKER = "Current Buzz project page:";
+/** Marker for the repository set appended by the full Projects agent page. */
+export const PROJECT_WORKSPACE_CONTEXT_MARKER = "Workspace repositories:";
+const PROJECT_AGENT_CONTEXT_MARKERS = [
+  PROJECT_PAGE_CONTEXT_MARKER,
+  PROJECT_WORKSPACE_CONTEXT_MARKER,
+];
 const MAX_OVERVIEW_CONTEXT_ITEMS = 200;
 const MAX_OVERVIEW_CONTEXT_FIELD_LENGTH = 180;
 const MAX_SELECTION_CONTEXT_ITEMS = 100;
@@ -323,8 +329,24 @@ function overviewContextField(value: string | null | undefined) {
   return normalizedPromptValue(value, MAX_OVERVIEW_CONTEXT_FIELD_LENGTH);
 }
 
-export function stripProjectDetailAgentContext(content: string) {
-  const markerIndex = content.indexOf(`---\n${PROJECT_PAGE_CONTEXT_MARKER}`);
-  if (markerIndex === -1) return content;
-  return content.slice(0, markerIndex).replace(/\n+$/, "");
+export function splitProjectDetailAgentContext(content: string): {
+  context: string | null;
+  message: string;
+} {
+  const markerIndex = Math.max(
+    ...PROJECT_AGENT_CONTEXT_MARKERS.map((marker) =>
+      content.lastIndexOf(`---\n${marker}`),
+    ),
+  );
+  if (markerIndex === -1) {
+    return { context: null, message: content };
+  }
+  return {
+    context: content.slice(markerIndex).trim(),
+    message: content.slice(0, markerIndex).replace(/\n+$/, ""),
+  };
+}
+
+export function stripProjectDetailAgentContext(content: string) {
+  return splitProjectDetailAgentContext(content).message;
 }
diff --git a/desktop/src/features/projects/lib/projectReviewDisplay.test.mjs b/desktop/src/features/projects/lib/projectReviewDisplay.test.mjs
new file mode 100644
index 0000000000..2f89decab4
--- /dev/null
+++ b/desktop/src/features/projects/lib/projectReviewDisplay.test.mjs
@@ -0,0 +1,181 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  currentPullRequestForSelection,
+  projectReviewFilesChangedBody,
+  retainLatestByKey,
+  reviewDiffWorkspaceBranch,
+  shouldReplaceRetainedPullRequest,
+} from "./projectReviewDisplay.ts";
+
+test("retainLatestByKey keeps the previous value when shouldReplace is false", () => {
+  const cache = { current: { key: "pr-1", value: { files: [1] } } };
+
+  const retained = retainLatestByKey(
+    cache,
+    "pr-1",
+    { files: [] },
+    (next, previous) =>
+      next.files.length > 0 ? true : previous.files.length === 0,
+  );
+
+  assert.deepEqual(retained, { files: [1] });
+  assert.deepEqual(cache.current.value, { files: [1] });
+});
+
+test("retainLatestByKey takes a new key immediately", () => {
+  const cache = { current: { key: "pr-1", value: { files: [1] } } };
+
+  const retained = retainLatestByKey(
+    cache,
+    "pr-2",
+    { files: [] },
+    (next) => next.files.length > 0,
+  );
+
+  assert.deepEqual(retained, { files: [] });
+});
+
+test("an explicit selected review does not fall back to another identity", () => {
+  const selected = { id: "pr-a" };
+  const branchReview = { id: "pr-branch" };
+
+  assert.equal(
+    currentPullRequestForSelection({
+      fallback: branchReview,
+      pullRequests: [selected, branchReview],
+      selectedPullRequestId: "pr-a",
+    }),
+    selected,
+  );
+  assert.equal(
+    currentPullRequestForSelection({
+      fallback: branchReview,
+      pullRequests: [branchReview],
+      selectedPullRequestId: "pr-a",
+    }),
+    null,
+  );
+  assert.equal(
+    currentPullRequestForSelection({
+      fallback: branchReview,
+      pullRequests: [branchReview],
+      selectedPullRequestId: null,
+    }),
+    branchReview,
+  );
+});
+
+test("retained review identity stays aligned with the diff-query identity across fetch phases", () => {
+  const reviewA = { id: "pr-a" };
+  const renderedCache = { current: { key: "repo:pr-a", value: reviewA } };
+  const diffQueryCache = { current: { key: "repo:pr-a", value: reviewA } };
+
+  const renderedDuringFetch = retainLatestByKey(
+    renderedCache,
+    "repo:pr-a",
+    currentPullRequestForSelection({
+      fallback: { id: "pr-branch" },
+      pullRequests: [],
+      selectedPullRequestId: "pr-a",
+    }),
+    (next) => shouldReplaceRetainedPullRequest(next, true),
+  );
+  const diffDuringFetch = retainLatestByKey(
+    diffQueryCache,
+    "repo:pr-a",
+    currentPullRequestForSelection({
+      fallback: { id: "pr-branch" },
+      pullRequests: [],
+      selectedPullRequestId: "pr-a",
+    }),
+    (next) => shouldReplaceRetainedPullRequest(next, true),
+  );
+  assert.equal(renderedDuringFetch, reviewA);
+  assert.equal(diffDuringFetch, reviewA);
+  assert.equal(renderedDuringFetch.id, diffDuringFetch.id);
+
+  const renderedAfterComplete = retainLatestByKey(
+    renderedCache,
+    "repo:pr-a",
+    currentPullRequestForSelection({
+      fallback: { id: "pr-branch" },
+      pullRequests: [],
+      selectedPullRequestId: "pr-a",
+    }),
+    (next) => shouldReplaceRetainedPullRequest(next, false),
+  );
+  const diffAfterComplete = retainLatestByKey(
+    diffQueryCache,
+    "repo:pr-a",
+    currentPullRequestForSelection({
+      fallback: { id: "pr-branch" },
+      pullRequests: [],
+      selectedPullRequestId: "pr-a",
+    }),
+    (next) => shouldReplaceRetainedPullRequest(next, false),
+  );
+  assert.equal(renderedAfterComplete, null);
+  assert.equal(diffAfterComplete, null);
+});
+
+test("review files stay mounted when a populated diff races an unavailable snapshot", () => {
+  assert.equal(
+    projectReviewFilesChangedBody({
+      hasPopulatedDiff: true,
+      hasSelectedPullRequest: true,
+      repositoryUnavailable: true,
+    }),
+    "files",
+  );
+});
+
+test("review files can show unavailable before a diff exists", () => {
+  assert.equal(
+    projectReviewFilesChangedBody({
+      hasPopulatedDiff: false,
+      hasSelectedPullRequest: true,
+      repositoryUnavailable: true,
+    }),
+    "unavailable",
+  );
+});
+
+test("review files render the panel for a selected review when the repo is available", () => {
+  assert.equal(
+    projectReviewFilesChangedBody({
+      hasPopulatedDiff: false,
+      hasSelectedPullRequest: true,
+      repositoryUnavailable: false,
+    }),
+    "files",
+  );
+});
+
+test("review diffs stay on the target branch, not the head or picker branch", () => {
+  assert.equal(
+    reviewDiffWorkspaceBranch({
+      activeBranch: "variation/bees",
+      defaultBranch: "main",
+      pullRequest: { targetBranch: "main" },
+    }),
+    "main",
+  );
+  assert.equal(
+    reviewDiffWorkspaceBranch({
+      activeBranch: "variation/bees",
+      defaultBranch: "main",
+      pullRequest: { targetBranch: null },
+    }),
+    "main",
+  );
+  assert.equal(
+    reviewDiffWorkspaceBranch({
+      activeBranch: "variation/bees",
+      defaultBranch: "main",
+      pullRequest: null,
+    }),
+    "variation/bees",
+  );
+});
diff --git a/desktop/src/features/projects/lib/projectReviewDisplay.ts b/desktop/src/features/projects/lib/projectReviewDisplay.ts
new file mode 100644
index 0000000000..d7ba721238
--- /dev/null
+++ b/desktop/src/features/projects/lib/projectReviewDisplay.ts
@@ -0,0 +1,101 @@
+type RetainLatestByKeyCache<T> = {
+  current: {
+    key: string;
+    value: T;
+  };
+};
+
+/**
+ * Keep the latest accepted value for a stable key across transient empties.
+ * A new key always takes `value` immediately (real navigation).
+ */
+export function retainLatestByKey<T>(
+  cache: RetainLatestByKeyCache<T>,
+  key: string,
+  value: T,
+  shouldReplace: (next: T, previous: T) => boolean,
+): T {
+  if (cache.current.key !== key) {
+    cache.current = { key, value };
+    return value;
+  }
+  if (shouldReplace(value, cache.current.value)) {
+    cache.current.value = value;
+  }
+  return cache.current.value;
+}
+
+/**
+ * Keep a selected review through transient empty refetches. Once the fetch
+ * is idle, accept the completed result — including null — so the rendered
+ * identity can match the diff-query identity.
+ */
+export function shouldReplaceRetainedPullRequest(
+  next: unknown,
+  isFetching: boolean,
+): boolean {
+  return Boolean(next) || !isFetching;
+}
+
+/**
+ * Resolve the current review for a selection. An explicit ID that is missing
+ * from the list is `null` so a completed refetch can clear it; pass
+ * `fallback` only when no ID is selected (branch auto-select).
+ */
+export function currentPullRequestForSelection<T extends { id: string }>({
+  fallback = null,
+  pullRequests,
+  selectedPullRequestId,
+}: {
+  fallback?: T | null;
+  pullRequests: readonly T[] | undefined;
+  selectedPullRequestId: string | null;
+}): T | null {
+  if (selectedPullRequestId) {
+    return (
+      pullRequests?.find((item) => item.id === selectedPullRequestId) ?? null
+    );
+  }
+  return fallback;
+}
+
+/**
+ * Which body to render under a review's Files changed section.
+ * A populated diff must keep the files panel mounted even when the repository
+ * snapshot briefly looks unavailable — swapping in the unavailable placeholder
+ * is the files-section flicker.
+ */
+export function projectReviewFilesChangedBody({
+  hasPopulatedDiff,
+  hasSelectedPullRequest,
+  repositoryUnavailable,
+}: {
+  hasPopulatedDiff: boolean;
+  hasSelectedPullRequest: boolean;
+  repositoryUnavailable: boolean;
+}): "files" | "unavailable" | null {
+  if (hasSelectedPullRequest && (hasPopulatedDiff || !repositoryUnavailable)) {
+    return "files";
+  }
+  if (repositoryUnavailable) return "unavailable";
+  return null;
+}
+
+/**
+ * Workspace branch used to fetch a review diff.
+ * A selected review is `target...head`; do not key that query on the head
+ * branch or the workspace picker, or Files changed will swap with the
+ * default-branch snapshot.
+ */
+export function reviewDiffWorkspaceBranch({
+  activeBranch,
+  defaultBranch,
+  pullRequest,
+}: {
+  activeBranch: string | null | undefined;
+  defaultBranch: string | null | undefined;
+  pullRequest: { targetBranch: string | null } | null | undefined;
+}): string | null | undefined {
+  if (!pullRequest) return activeBranch;
+  return pullRequest.targetBranch || defaultBranch || activeBranch;
+}
diff --git a/desktop/src/features/projects/ui/AgentContextPayloadPreview.test.mjs b/desktop/src/features/projects/ui/AgentContextPayloadPreview.test.mjs
index 749d5eb501..6229c77538 100644
--- a/desktop/src/features/projects/ui/AgentContextPayloadPreview.test.mjs
+++ b/desktop/src/features/projects/ui/AgentContextPayloadPreview.test.mjs
@@ -33,7 +33,7 @@ afterEach(async () => {
 
 after(() => dom.window.close());
 
-async function renderPreview(payload) {
+async function renderPreview(payload, options = {}) {
   const { createElement } = await import("react");
   const { render } = await import("@testing-library/react");
   const { AgentContextPayloadPreview } = await import(
@@ -41,8 +41,9 @@ async function renderPreview(payload) {
   );
   return render(
     createElement(AgentContextPayloadPreview, {
+      iconOnly: options.iconOnly,
       payload,
-      triggerLabel: "Context",
+      triggerLabel: options.triggerLabel ?? "Context",
     }),
   );
 }
@@ -83,6 +84,24 @@ test("discloses the exact appended payload before send, adversarial metadata inc
   assert.equal(screen.queryByTestId("agent-context-preview"), null);
 });
 
+test("supports a subtle icon-only disclosure without losing its accessible name", async () => {
+  const { fireEvent, screen } = await import("@testing-library/react");
+  await renderPreview("Exact context", {
+    iconOnly: true,
+    triggerLabel: "Preview message context",
+  });
+
+  const trigger = screen.getByRole("button", {
+    name: "Preview message context",
+  });
+  assert.equal(trigger.textContent?.trim(), "");
+  fireEvent.click(trigger);
+  assert.equal(
+    screen.getByTestId("agent-context-preview-payload").textContent,
+    "Exact context",
+  );
+});
+
 test("renders nothing when there is no payload to append", async () => {
   const { screen } = await import("@testing-library/react");
   await renderPreview("");
diff --git a/desktop/src/features/projects/ui/AgentContextPayloadPreview.tsx b/desktop/src/features/projects/ui/AgentContextPayloadPreview.tsx
index d6db47b868..550cadd86a 100644
--- a/desktop/src/features/projects/ui/AgentContextPayloadPreview.tsx
+++ b/desktop/src/features/projects/ui/AgentContextPayloadPreview.tsx
@@ -1,6 +1,7 @@
 import { Info } from "lucide-react";
 import * as React from "react";
 
+import { cn } from "@/shared/lib/cn";
 import { Button } from "@/shared/ui/button";
 
 /**
@@ -13,9 +14,11 @@ import { Button } from "@/shared/ui/button";
  * inspects here is byte-identical to what gets signed under their key.
  */
 export function AgentContextPayloadPreview({
+  iconOnly = false,
   payload,
   triggerLabel,
 }: {
+  iconOnly?: boolean;
   payload: string;
   triggerLabel: string;
 }) {
@@ -25,8 +28,14 @@ export function AgentContextPayloadPreview({
   return (
     <div className="relative shrink-0">
       <Button
+        aria-label={iconOnly ? triggerLabel : undefined}
         aria-expanded={open}
-        className="h-7 gap-1 rounded-full px-2 text-xs text-muted-foreground"
+        className={cn(
+          "h-7 rounded-full text-muted-foreground",
+          iconOnly
+            ? "w-7 p-0 text-muted-foreground/75 hover:text-muted-foreground focus-visible:text-muted-foreground"
+            : "gap-1 px-2 text-xs",
+        )}
         data-testid="agent-context-preview-trigger"
         onClick={() => setOpen((value) => !value)}
         size="sm"
@@ -34,8 +43,8 @@ export function AgentContextPayloadPreview({
         type="button"
         variant="ghost"
       >
-        <Info className="h-3.5 w-3.5" />
-        {triggerLabel}
+        <Info className={iconOnly ? "h-3 w-3" : "h-3.5 w-3.5"} />
+        {iconOnly ? null : triggerLabel}
       </Button>
       {open ? (
         <div
diff --git a/desktop/src/features/projects/ui/DiscussionChannels.tsx b/desktop/src/features/projects/ui/DiscussionChannels.tsx
index 9b78fbcf08..665f77b6f2 100644
--- a/desktop/src/features/projects/ui/DiscussionChannels.tsx
+++ b/desktop/src/features/projects/ui/DiscussionChannels.tsx
@@ -64,6 +64,53 @@ export function useDiscussionChannels(query: string): {
   };
 }
 
+/** Hits are sorted newest first, so the first hit per channel is the one a
+ * click should land on (and the one worth quoting). */
+function useLatestHitByChannel(hits: SearchHit[]) {
+  return React.useMemo(() => {
+    const byChannel = new Map<string, SearchHit>();
+    for (const hit of hits) {
+      if (hit.channelId && !byChannel.has(hit.channelId)) {
+        byChannel.set(hit.channelId, hit);
+      }
+    }
+    return byChannel;
+  }, [hits]);
+}
+
+/**
+ * Shared row-click behavior: land on the latest matching message — in the
+ * side conversation panel when one is mounted — instead of jumping straight
+ * to the channel. Forum content opens in place (the panel renders chat
+ * threads only), and channels with no quotable hit fall back to plain
+ * channel navigation.
+ */
+function openDiscussionHit({
+  channelId,
+  goChannel,
+  latestHit,
+  openSearchHit,
+  panel,
+}: {
+  channelId: string;
+  goChannel: (channelId: string) => unknown;
+  latestHit: SearchHit | undefined;
+  openSearchHit: (hit: SearchHit) => unknown;
+  panel: { openConversation: (hit: SearchHit) => void } | null;
+}) {
+  if (!latestHit) {
+    void goChannel(channelId);
+    return;
+  }
+  const opensForum =
+    latestHit.kind === KIND_FORUM_POST || latestHit.kind === KIND_FORUM_COMMENT;
+  if (!panel || opensForum) {
+    void openSearchHit(latestHit);
+    return;
+  }
+  panel.openConversation(latestHit);
+}
+
 /** Channel display name, preferring the hit's name, then bounded metadata,
  * then a short id so inaccessible/renamed channels still render something. */
 function useChannelNameLookup(channelIds: readonly string[]) {
@@ -141,19 +188,10 @@ export function DiscussedInChannels({
     { enabled: visible.length > 0 },
   );
   const profiles = profilesQuery.data?.profiles;
-  // Hits are sorted newest first, so the first hit per channel is the one a
-  // click should land on (and the one worth quoting). The origin channel has
-  // no such hit: the `h` tag proves only the channel, so its row navigates
-  // to the channel without claiming any particular message.
-  const latestHitByChannel = React.useMemo(() => {
-    const byChannel = new Map<string, SearchHit>();
-    for (const hit of hits) {
-      if (hit.channelId && !byChannel.has(hit.channelId)) {
-        byChannel.set(hit.channelId, hit);
-      }
-    }
-    return byChannel;
-  }, [hits]);
+  // The origin channel has no quotable hit: the `h` tag proves only the
+  // channel, so its row navigates to the channel without claiming any
+  // particular message.
+  const latestHitByChannel = useLatestHitByChannel(hits);
   if (channels.length === 0) return null;
 
   const hiddenCount = channels.length - visible.length;
@@ -173,21 +211,14 @@ export function DiscussedInChannels({
         {visible.map((channel) => {
           const latestHit = latestHitByChannel.get(channel.id);
           const name = channelName(channel.id, channel.name);
-          const opensForum =
-            latestHit != null &&
-            (latestHit.kind === KIND_FORUM_POST ||
-              latestHit.kind === KIND_FORUM_COMMENT);
-          const openConversation = () => {
-            if (!latestHit) {
-              void goChannel(channel.id);
-              return;
-            }
-            if (!projectConversationPanel || opensForum) {
-              void openSearchHit(latestHit);
-              return;
-            }
-            projectConversationPanel.openConversation(latestHit);
-          };
+          const openConversation = () =>
+            openDiscussionHit({
+              channelId: channel.id,
+              goChannel,
+              latestHit,
+              openSearchHit,
+              panel: projectConversationPanel,
+            });
           return (
             <div
               className="group relative flex w-full min-w-0 items-start gap-2.5 px-3 py-2 transition-colors hover:bg-muted/30"
@@ -277,7 +308,7 @@ const NAME_LIST_MAX = 3;
 function DiscussionMessagePreview({ content }: { content: string }) {
   return (
     <Markdown
-      className="inbox-preview-markdown mt-0.5 text-inherit leading-4"
+      className="inbox-preview-markdown mt-0.5 text-inherit leading-6"
       content={discussionSnippet(content)}
       interactive={false}
     />
@@ -336,7 +367,9 @@ function DiscussionNameList({
 /**
  * Full-width channel list for the workspace "Channels" tab: every channel
  * where the repository (or its PRs/issues) is linked in chat, with the
- * people who discussed it there.
+ * people who discussed it there. Clicking a row opens the latest matching
+ * conversation in the side panel (whose header still jumps to the channel)
+ * rather than leaving the project view.
  */
 export function DiscussionChannelsPanel({
   query,
@@ -345,13 +378,17 @@ export function DiscussionChannelsPanel({
   query: string;
   repositoryName: string;
 }) {
-  const { channels, isLoading, isTruncated } = useDiscussionChannels(query);
-  const { goChannel } = useAppNavigation();
+  const { channels, hits, isLoading, isTruncated } =
+    useDiscussionChannels(query);
+  const { goChannel, openSearchHit } = useAppNavigation();
+  const projectConversationPanel = useProjectConversationPanel();
+  const latestHitByChannel = useLatestHitByChannel(hits);
   const channelIds = React.useMemo(
     () => channels.map((channel) => channel.id),
     [channels],
   );
   const channelName = useChannelNameLookup(channelIds);
+
   const profilesQuery = useUsersBatchQuery(
     channels.flatMap((channel) => channel.participants),
     { enabled: channels.length > 0 },
@@ -363,7 +400,10 @@ export function DiscussionChannelsPanel({
   }
   if (channels.length === 0) {
     return (
-      <p className="px-4 py-6 text-sm text-muted-foreground">
+      <p
+        className="px-4 py-6 text-sm text-muted-foreground"
+        data-testid="project-discussion-channels-panel"
+      >
         No channels reference this repository yet. Paste its link (or a review
         or task link) in a channel and it will show up here.
       </p>
@@ -379,10 +419,11 @@ export function DiscussionChannelsPanel({
   );
 
   return (
-    <div>
+    <div className="px-4" data-testid="project-discussion-channels-panel">
       <ul data-testid="discussion-channels">
         {channels.map((channel) => {
           const name = channelName(channel.id, channel.name);
+          const latestHit = latestHitByChannel.get(channel.id);
           return (
             <li className="relative" key={channel.id}>
               <ProjectEntityListRow
@@ -397,7 +438,15 @@ export function DiscussionChannelsPanel({
                 dateSeconds={channel.lastActivityAt}
                 dateTestId="project-channel-row-date"
                 icon={<Hash className="h-3.5 w-3.5 text-muted-foreground/70" />}
-                onClick={() => void goChannel(channel.id)}
+                onClick={() =>
+                  openDiscussionHit({
+                    channelId: channel.id,
+                    goChannel,
+                    latestHit,
+                    openSearchHit,
+                    panel: projectConversationPanel,
+                  })
+                }
                 people={channel.participants}
                 peopleTestId="project-channel-participants"
                 profiles={profiles}
@@ -411,7 +460,11 @@ export function DiscussionChannelsPanel({
                 }}
                 testId="project-channel-row"
                 title={`#${name}`}
-                titleAttr={`Open #${name}`}
+                titleAttr={
+                  latestHit
+                    ? `Open the latest conversation in #${name}`
+                    : `Open #${name}`
+                }
               />
             </li>
           );
diff --git a/desktop/src/features/projects/ui/IssueAssigneesRow.tsx b/desktop/src/features/projects/ui/IssueAssigneesRow.tsx
index 4da5123814..7413044727 100644
--- a/desktop/src/features/projects/ui/IssueAssigneesRow.tsx
+++ b/desktop/src/features/projects/ui/IssueAssigneesRow.tsx
@@ -267,7 +267,9 @@ export function IssueAssigneesRow({
       {canSelfAssign && viewer ? (
         <Button
           className={cn(
-            "h-5 px-1 text-xs text-muted-foreground hover:text-foreground",
+            contextActions
+              ? "h-5 px-1 text-xs text-muted-foreground hover:text-foreground"
+              : "h-5 px-0 text-xs text-primary hover:bg-transparent hover:text-primary hover:underline",
             contextActions && PROJECT_CONTEXT_ACTION_BUTTON_CLASS,
           )}
           data-testid={`${testIdPrefix}-self-assign`}
diff --git a/desktop/src/features/projects/ui/ProjectAgentChatPanel.tsx b/desktop/src/features/projects/ui/ProjectAgentChatPanel.tsx
index 7aef6d0212..14013a6157 100644
--- a/desktop/src/features/projects/ui/ProjectAgentChatPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectAgentChatPanel.tsx
@@ -295,8 +295,9 @@ export function ProjectAgentChatPanel({
             toolbarExtraActions={
               <>
                 <AgentContextPayloadPreview
+                  iconOnly
                   payload={contextPayload}
-                  triggerLabel="Context"
+                  triggerLabel="Preview message context"
                 />
                 {conversation ? (
                   <Button
diff --git a/desktop/src/features/projects/ui/ProjectAgentSubmittedContextPill.test.mjs b/desktop/src/features/projects/ui/ProjectAgentSubmittedContextPill.test.mjs
new file mode 100644
index 0000000000..82b49eb036
--- /dev/null
+++ b/desktop/src/features/projects/ui/ProjectAgentSubmittedContextPill.test.mjs
@@ -0,0 +1,61 @@
+import assert from "node:assert/strict";
+import { after, afterEach, before, test } from "node:test";
+
+import { JSDOM } from "jsdom";
+
+const dom = new JSDOM("<!doctype html><html><body></body></html>", {
+  url: "http://localhost",
+});
+
+before(() => {
+  Object.assign(globalThis, {
+    document: dom.window.document,
+    HTMLElement: dom.window.HTMLElement,
+    IS_REACT_ACT_ENVIRONMENT: true,
+    window: dom.window,
+  });
+  dom.window.matchMedia = () => ({
+    matches: false,
+    addEventListener() {},
+    removeEventListener() {},
+  });
+});
+
+afterEach(async () => {
+  const { cleanup } = await import("@testing-library/react");
+  cleanup();
+});
+
+after(() => dom.window.close());
+
+test("keeps submitted context collapsed until explicitly expanded", async () => {
+  const { createElement } = await import("react");
+  const { fireEvent, render, screen } = await import("@testing-library/react");
+  const { ProjectAgentSubmittedContextPill } = await import(
+    "./ProjectAgentSubmittedContextPill.tsx"
+  );
+  const payload =
+    '---\nCurrent Buzz project page:\n- Project: "Projects"\n- View: Activity';
+
+  render(createElement(ProjectAgentSubmittedContextPill, { payload }));
+
+  const trigger = screen.getByRole("button", { name: "Show sent context" });
+  assert.equal(trigger.getAttribute("aria-expanded"), "false");
+  assert.equal(
+    screen.queryByTestId("project-agent-sent-context-payload"),
+    null,
+  );
+
+  fireEvent.click(trigger);
+  assert.equal(trigger.getAttribute("aria-expanded"), "true");
+  const disclosed = screen.getByTestId("project-agent-sent-context-payload");
+  assert.equal(disclosed.getAttribute("aria-label"), "Sent project context");
+  assert.equal(disclosed.getAttribute("tabindex"), "0");
+  assert.equal(disclosed.textContent, payload);
+
+  fireEvent.click(trigger);
+  assert.equal(
+    screen.queryByTestId("project-agent-sent-context-payload"),
+    null,
+  );
+});
diff --git a/desktop/src/features/projects/ui/ProjectAgentSubmittedContextPill.tsx b/desktop/src/features/projects/ui/ProjectAgentSubmittedContextPill.tsx
new file mode 100644
index 0000000000..c9c9824468
--- /dev/null
+++ b/desktop/src/features/projects/ui/ProjectAgentSubmittedContextPill.tsx
@@ -0,0 +1,39 @@
+import { ChevronDown, Info } from "lucide-react";
+import * as React from "react";
+
+import { cn } from "@/shared/lib/cn";
+
+export const ProjectAgentSubmittedContextPill = React.memo(
+  function ProjectAgentSubmittedContextPill({ payload }: { payload: string }) {
+    const [open, setOpen] = React.useState(false);
+
+    return (
+      <div className="pb-1 pl-11 pr-2" data-testid="project-agent-sent-context">
+        <button
+          aria-expanded={open}
+          aria-label={open ? "Hide sent context" : "Show sent context"}
+          className="inline-flex h-6 items-center gap-1 rounded-full border border-border/45 bg-muted/20 px-2 text-2xs text-muted-foreground transition-colors hover:border-border/70 hover:bg-muted/35 hover:text-foreground"
+          onClick={() => setOpen((current) => !current)}
+          type="button"
+        >
+          <Info className="h-3 w-3" />
+          <span>Sent context</span>
+          <ChevronDown
+            className={cn("h-3 w-3 transition-transform", open && "rotate-180")}
+          />
+        </button>
+        {open ? (
+          <section
+            aria-label="Sent project context"
+            className="mt-1 max-h-48 overflow-auto whitespace-pre-wrap break-words rounded-lg bg-muted/25 p-2 font-mono text-xs text-muted-foreground outline-hidden focus-visible:ring-1 focus-visible:ring-ring"
+            data-testid="project-agent-sent-context-payload"
+            // biome-ignore lint/a11y/noNoninteractiveTabindex: the scrollable disclosure must receive keyboard focus
+            tabIndex={0}
+          >
+            {payload}
+          </section>
+        ) : null}
+      </div>
+    );
+  },
+);
diff --git a/desktop/src/features/projects/ui/ProjectCards.tsx b/desktop/src/features/projects/ui/ProjectCards.tsx
index b8c3ffd273..68e067e0d1 100644
--- a/desktop/src/features/projects/ui/ProjectCards.tsx
+++ b/desktop/src/features/projects/ui/ProjectCards.tsx
@@ -20,10 +20,8 @@ import type {
   ProjectActivitySummary,
 } from "@/features/projects/hooks";
 import {
-  formatExactTimestamp,
   getProjectUpdatedAt,
   listRowDescription,
-  relativeTime,
 } from "@/features/projects/lib/projectsViewHelpers";
 import type { ProjectRepoUnavailableReason } from "@/features/projects/lib/projectRepoAvailability";
 import { projectShareLink } from "@/features/projects/lib/projectShareLinks";
@@ -55,39 +53,6 @@ import { ProjectEntityListRow } from "./ProjectEntityListRow";
 import { PROJECT_GRID_CARD_BODY_CLASS } from "./projectGridCardStyles";
 import { ProjectListRowMenu } from "./ProjectListRowMenu";
 
-function ProjectUpdatedLabel({
-  profiles,
-  project,
-  summary,
-}: {
-  profiles?: UserProfileLookup;
-  project: Project;
-  summary: ProjectActivitySummary | undefined;
-}) {
-  const updatedAt = getProjectUpdatedAt(project, summary);
-  const latestCommit = summary?.latestCommit;
-  const authorLabel = latestCommit?.author
-    ? resolveUserLabel({ profiles, pubkey: latestCommit.author })
-    : null;
-
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <span className="whitespace-nowrap text-xs leading-4 text-muted-foreground/70">
-          {relativeTime(updatedAt)}
-        </span>
-      </TooltipTrigger>
-      <TooltipContent className="max-w-96 break-words">
-        {latestCommit
-          ? `${latestCommit.title || latestCommit.commit.slice(0, 7)}${
-              authorLabel ? ` · ${authorLabel}` : ""
-            } · ${formatExactTimestamp(latestCommit.createdAt)}`
-          : `Created ${formatExactTimestamp(project.createdAt)}`}
-      </TooltipContent>
-    </Tooltip>
-  );
-}
-
 export function ProjectPeopleStack({
   pubkeys,
   profiles,
@@ -540,12 +505,7 @@ export function ProjectGridCard({
               </div>
             </div>
           </div>
-          <div className="pointer-events-auto relative z-10 flex shrink-0 items-center gap-1">
-            <ProjectUpdatedLabel
-              profiles={profiles}
-              project={project}
-              summary={summary}
-            />
+          <div className="pointer-events-auto relative z-10 shrink-0">
             <ProjectActionsMenu
               canDelete={canDelete}
               disabled={deleteDisabled}
@@ -613,6 +573,7 @@ export function ProjectListRow({
           <span>{repositoryCount}</span>
         </span>
       }
+      affiliationClassName="w-auto"
       affiliationTestId="projects-row-context"
       affiliationTitle={`${repositoryCount} ${
         repositoryCount === 1 ? "repository" : "repositories"
diff --git a/desktop/src/features/projects/ui/ProjectCommitCopyButton.tsx b/desktop/src/features/projects/ui/ProjectCommitCopyButton.tsx
index 0930146e2d..faadaf5d2c 100644
--- a/desktop/src/features/projects/ui/ProjectCommitCopyButton.tsx
+++ b/desktop/src/features/projects/ui/ProjectCommitCopyButton.tsx
@@ -15,12 +15,16 @@ export function CopyTextButton({
   text: string;
 }) {
   const [copied, setCopied] = React.useState(false);
-  const handleCopy = React.useCallback(() => {
-    void writeTextToClipboard(text).then(() => {
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2_000);
-    });
-  }, [text]);
+  const handleCopy = React.useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      event.stopPropagation();
+      void writeTextToClipboard(text).then(() => {
+        setCopied(true);
+        setTimeout(() => setCopied(false), 2_000);
+      });
+    },
+    [text],
+  );
 
   return (
     <button
@@ -30,6 +34,7 @@ export function CopyTextButton({
         className,
       )}
       onClick={handleCopy}
+      onKeyDown={(event) => event.stopPropagation()}
       type="button"
     >
       {copied ? (
diff --git a/desktop/src/features/projects/ui/ProjectCommitDetailPanel.tsx b/desktop/src/features/projects/ui/ProjectCommitDetailPanel.tsx
index f36e332650..96773a0820 100644
--- a/desktop/src/features/projects/ui/ProjectCommitDetailPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectCommitDetailPanel.tsx
@@ -1,4 +1,4 @@
-import { Calendar, GitCommitHorizontal, Hash } from "lucide-react";
+import { Calendar, GitCommitHorizontal, Hash, UserRound } from "lucide-react";
 
 import type { Repository } from "@/features/projects/hooks";
 import { commitDiscussionQuery } from "@/features/projects/lib/discussionChannels";
@@ -48,86 +48,108 @@ export function ProjectCommitDetailPanel({
   project: Repository;
 }) {
   const shortHash = commit?.shortHash ?? commitHash.slice(0, 7);
-  const fileCount = diff?.files.length;
 
   return (
     <div
-      className={PROJECT_DETAIL_READING_COLUMN_CLASS}
+      className="flex w-full flex-1 flex-col overflow-hidden"
       data-project-detail-panel
       data-testid="project-commit-detail"
     >
-      <header className="space-y-2 px-6 pb-3 pt-5">
-        <h3 className="line-clamp-2 text-lg font-semibold leading-6 text-foreground">
-          {commit?.subject ?? shortHash}{" "}
-          <ShareLinkButton
-            className="ml-1 inline-flex h-7 w-7 align-text-bottom"
-            label="Copy commit link"
-            link={commitShareLink(project, commit?.hash ?? commitHash)}
-            testId="project-commit-copy-link"
-          />
-        </h3>
-        <p className="flex flex-wrap items-center gap-x-1.5 gap-y-1 text-xs text-muted-foreground">
-          <span>Committed</span>
-          {commit ? (
-            <span
-              className="shrink-0 whitespace-nowrap"
-              title={commitDateLabel(commit.timestamp)}
-            >
-              {commitDateLabel(commit.timestamp)}
-            </span>
-          ) : null}
-          <ProjectOriginReference
-            agentName={originAgentName}
-            channelId={originChannelId}
-          />
-        </p>
-      </header>
-      <ProjectDetailMetaList>
-        <ProjectDetailMetaRow icon={Hash} label="Commit">
-          <span className="inline-flex min-w-0 items-center gap-1 font-mono text-xs">
-            {shortHash}
-            <CopyCommitHashButton
-              className="h-6 w-6"
-              hash={commit?.hash ?? commitHash}
+      <div className={PROJECT_DETAIL_READING_COLUMN_CLASS}>
+        <header className="space-y-1 px-6 pb-3 pt-5">
+          <h3 className="line-clamp-2 text-lg font-semibold leading-6 text-foreground">
+            {commit?.subject ?? shortHash}{" "}
+            <ShareLinkButton
+              className="ml-0.5 inline-flex h-auto w-auto align-middle hover:bg-transparent"
+              label="Copy commit link"
+              link={commitShareLink(project, commit?.hash ?? commitHash)}
+              testId="project-commit-copy-link"
             />
-          </span>
-        </ProjectDetailMetaRow>
-        {commit ? (
-          <ProjectDetailMetaRow icon={Calendar} label="Date">
-            <span className="text-muted-foreground">
-              {commitDateLabel(commit.timestamp)}
+          </h3>
+          <p className="flex flex-wrap items-center gap-x-1.5 gap-y-1 text-xs text-muted-foreground">
+            <span>Committed</span>
+            {commit ? (
+              <span
+                className="shrink-0 whitespace-nowrap"
+                title={commitDateLabel(commit.timestamp)}
+              >
+                {commitDateLabel(commit.timestamp)}
+              </span>
+            ) : null}
+            <ProjectOriginReference
+              agentName={originAgentName}
+              channelId={originChannelId}
+            />
+          </p>
+        </header>
+        <ProjectDetailMetaList>
+          <ProjectDetailMetaRow icon={Hash} label="Commit">
+            <span className="inline-flex min-w-0 items-center gap-1 font-mono text-xs">
+              {shortHash}
+              <CopyCommitHashButton
+                className="h-6 w-6"
+                hash={commit?.hash ?? commitHash}
+              />
             </span>
           </ProjectDetailMetaRow>
+          {commit?.authorName ? (
+            <ProjectDetailMetaRow icon={UserRound} label="Author">
+              <span
+                className="min-w-0 truncate text-muted-foreground"
+                title={commit.authorEmail}
+              >
+                {commit.authorName}
+              </span>
+            </ProjectDetailMetaRow>
+          ) : null}
+          {commit ? (
+            <ProjectDetailMetaRow icon={Calendar} label="Date">
+              <span className="text-muted-foreground">
+                {commitDateLabel(commit.timestamp)}
+              </span>
+            </ProjectDetailMetaRow>
+          ) : null}
+          {diff ? (
+            <ProjectDetailMetaRow icon={GitCommitHorizontal} label="Changes">
+              <span className="flex items-center gap-1.5">
+                <span className="text-green-500">+{diff.additions}</span>
+                <span className="text-destructive">-{diff.deletions}</span>
+              </span>
+            </ProjectDetailMetaRow>
+          ) : null}
+        </ProjectDetailMetaList>
+        {diff?.commitBody ? (
+          <ProjectDetailSection defaultOpen title="Description">
+            <ProjectRichContent
+              content={diff.commitBody}
+              hardLineBreaks={false}
+            />
+          </ProjectDetailSection>
         ) : null}
-        {diff ? (
-          <ProjectDetailMetaRow icon={GitCommitHorizontal} label="Changes">
-            <span className="flex items-center gap-1.5">
-              <span className="text-green-500">+{diff.additions}</span>
-              <span className="text-destructive">-{diff.deletions}</span>
-            </span>
-          </ProjectDetailMetaRow>
-        ) : null}
-      </ProjectDetailMetaList>
-      {diff?.commitBody ? (
-        <ProjectDetailSection defaultOpen title="Description">
-          <ProjectRichContent
-            content={diff.commitBody}
-            hardLineBreaks={false}
-          />
-        </ProjectDetailSection>
-      ) : null}
-      <DiscussedInChannels
-        className="mx-6 mb-4"
-        entityLabel="this commit"
-        query={commitDiscussionQuery({
-          hash: commit?.hash ?? commitHash,
-          shortHash: commit?.shortHash,
-        })}
-        testId="commit-discussed-in"
-      />
-      <ProjectDetailSection count={fileCount} defaultOpen title="Files changed">
-        <div className="-mx-6">
+        <DiscussedInChannels
+          className="mx-6 mb-4"
+          entityLabel="this commit"
+          query={commitDiscussionQuery({
+            hash: commit?.hash ?? commitHash,
+            shortHash: commit?.shortHash,
+          })}
+          testId="commit-discussed-in"
+        />
+      </div>
+      <ProjectDetailSection
+        className="flex min-h-0 flex-1 flex-col"
+        contentClassName="flex min-h-0 flex-1 flex-col"
+        defaultOpen
+        headerClassName="mx-auto max-w-3xl"
+        title="Files changed"
+      >
+        {/* Full-bleed: cancel the section's inner padding so the file
+            tree + diff grid spans the whole content column, and let it
+            grow to the bottom of the scrollport when the page is short. */}
+        <div className="-mx-6 -mb-6 flex min-h-0 flex-1 flex-col">
           <ProjectDiffFilesPanel
+            className="min-h-0 flex-1"
+            fileTreeClassName="max-h-none"
             diff={diff}
             embedded
             error={diffError}
diff --git a/desktop/src/features/projects/ui/ProjectDetailChrome.tsx b/desktop/src/features/projects/ui/ProjectDetailChrome.tsx
index 64810363f2..f9740b8aa3 100644
--- a/desktop/src/features/projects/ui/ProjectDetailChrome.tsx
+++ b/desktop/src/features/projects/ui/ProjectDetailChrome.tsx
@@ -3,9 +3,6 @@ import type * as React from "react";
 
 import { AppTopChromePortal } from "@/app/AppTopChromePortal";
 import type { Project, Repository } from "@/features/projects/hooks";
-import { projectShareLink } from "@/features/projects/lib/projectShareLinks";
-import type { EntityLinkTab } from "@/shared/lib/entityLink";
-import { ShareLinkButton } from "./ShareLinkButton";
 
 export type ProjectDetailWorkItemCrumb = {
   category: string;
@@ -21,7 +18,6 @@ export function ProjectDetailChrome({
   onGoProjects,
   project,
   repository,
-  shareTab,
 }: {
   /** Repository-scoped controls, rendered left of the project-wide ones. */
   actions?: React.ReactNode;
@@ -31,7 +27,6 @@ export function ProjectDetailChrome({
   onGoProjects: () => void;
   project: Project;
   repository: Repository;
-  shareTab?: EntityLinkTab;
 }) {
   return (
     <AppTopChromePortal>
@@ -120,12 +115,6 @@ export function ProjectDetailChrome({
           )}
         </nav>
         <div className="ml-auto flex shrink-0 items-center gap-0.5">
-          <ShareLinkButton
-            className="text-sidebar-foreground/65 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-            label="Copy project link"
-            link={projectShareLink(project, shareTab)}
-            testId="project-detail-copy-link"
-          />
           {actions}
         </div>
       </div>
diff --git a/desktop/src/features/projects/ui/ProjectDetailFeedPanels.tsx b/desktop/src/features/projects/ui/ProjectDetailFeedPanels.tsx
index 793b1de02c..3623868985 100644
--- a/desktop/src/features/projects/ui/ProjectDetailFeedPanels.tsx
+++ b/desktop/src/features/projects/ui/ProjectDetailFeedPanels.tsx
@@ -162,7 +162,10 @@ export function ContributorsPanel({
   }
 
   return (
-    <div className={PROJECT_DETAIL_PANEL_CLASS} data-project-detail-panel>
+    <div
+      className={`${PROJECT_DETAIL_PANEL_CLASS} mx-4`}
+      data-project-detail-panel
+    >
       {rows.map((row) => (
         <div
           className="flex min-h-9 min-w-0 items-center gap-2 px-4 py-1.5 transition-colors hover:bg-muted/35"
@@ -181,6 +184,7 @@ export function ContributorsPanel({
           />
           <span
             className="min-w-0 flex-1 truncate text-sm font-medium text-foreground"
+            data-projects-text-priority="primary"
             title={row.label}
           >
             {row.label}
diff --git a/desktop/src/features/projects/ui/ProjectDetailScreen.tsx b/desktop/src/features/projects/ui/ProjectDetailScreen.tsx
index 8d15116710..b7f39a8cf3 100644
--- a/desktop/src/features/projects/ui/ProjectDetailScreen.tsx
+++ b/desktop/src/features/projects/ui/ProjectDetailScreen.tsx
@@ -8,11 +8,7 @@ import {
   type Repository,
   useProjectQuery,
   useProjectIssuesQuery,
-  useProjectLocalRepoDiffQuery,
-  useProjectLocalRepoSnapshotQuery,
-  useProjectRepoDiffQuery,
   useProjectPullRequestsQuery,
-  useProjectRepoSnapshotQuery,
   useProjectsQuery,
   useRepoStateQuery,
 } from "@/features/projects/hooks";
@@ -32,18 +28,13 @@ import { ProfilePanelProvider } from "@/shared/context/ProfilePanelContext";
 import { useHistorySearchState } from "@/shared/hooks/useHistorySearchState";
 import { ViewLoadingFallback } from "@/shared/ui/ViewLoadingFallback";
 import { useCommunities } from "@/features/communities/useCommunities";
-import { useProjectCommitDiffQuery } from "@/features/projects/useProjectCommitDiff";
 import {
   projectBranchCreationReason,
   projectBranchManagementState,
   projectBranchOptionsFromSync,
   resolveProjectDefaultBranch,
 } from "@/features/projects/lib/projectBranches";
-import { normalizeRepositoryUrl } from "@/features/projects/lib/projectsViewHelpers";
-import {
-  shareTabForWorkspaceTab,
-  workspaceTabForShareTab,
-} from "@/features/projects/lib/projectShareLinks";
+import { workspaceTabForShareTab } from "@/features/projects/lib/projectShareLinks";
 import {
   buildProjectDetailAgentContext,
   type ProjectDetailAgentContext,
@@ -70,10 +61,7 @@ import { ProjectDetailChrome } from "./ProjectDetailChrome";
 import { ProjectConversationPanelController } from "./ProjectConversationPanelContext";
 import { ProjectDetailRightPanel } from "./ProjectDetailRightPanel";
 import { ProjectDetailUnavailableState } from "./ProjectDetailUnavailableState";
-import {
-  ProjectChatPanelControl,
-  ProjectRightPanelControls,
-} from "./ProjectRightPanelControls";
+import { ProjectRightPanelControls } from "./ProjectRightPanelControls";
 import { buildProjectDetailCrumbs } from "./useProjectDetailCrumbs";
 import { useProjectDetailPeople } from "./useProjectDetailPeople";
 import { useProjectProfilePanel } from "./useProjectProfilePanel";
@@ -81,6 +69,10 @@ import { useProjectRepositoryPanel } from "./useProjectRepositoryPanel";
 import { useRepositoryFileContentSource } from "./useRepositoryFileContentSource";
 import { useProjectPanelWidths } from "./useProjectPanelWidths";
 import { useProjectRepositoryOpenActions } from "./useProjectRepositoryOpenActions";
+import {
+  useProjectDetailGitViews,
+  useRetainedPullRequestSelection,
+} from "./useRetainedProjectGitViews";
 import {
   PROJECT_REPOSITORY_SEARCH_KEYS,
   type ProjectDetailScreenProps,
@@ -192,76 +184,55 @@ export function ProjectDetailScreen(props: ProjectDetailScreenProps) {
     [],
   );
   const issuesQuery = useProjectIssuesQuery(repository);
-  const selectedBranchPullRequest = React.useMemo(() => {
-    const projectRepositories = new Set(
-      (repository?.cloneUrls ?? []).map(normalizeRepositoryUrl),
-    );
-    const matches =
-      pullRequestsQuery.data?.filter(
-        (pullRequest) =>
-          pullRequest.branchName === activeBranch &&
-          pullRequest.cloneUrls.some((cloneUrl) =>
-            projectRepositories.has(normalizeRepositoryUrl(cloneUrl)),
-          ),
-      ) ?? [];
-    return matches.length === 1 ? matches[0] : null;
-  }, [activeBranch, pullRequestsQuery.data, repository?.cloneUrls]);
-  const openBranchPullRequest =
-    selectedBranchPullRequest?.status === "Open" ||
-    selectedBranchPullRequest?.status === "Draft"
-      ? selectedBranchPullRequest
-      : null;
-  const activeRepoPullRequest =
-    pullRequestsQuery.data?.find((item) => item.id === selectedPullRequestId) ??
-    selectedBranchPullRequest;
+  const {
+    activeRepoPullRequest,
+    openBranchPullRequest,
+    selectedBranchPullRequest,
+    selectedPullRequest,
+  } = useRetainedPullRequestSelection({
+    activeBranch,
+    isFetching: pullRequestsQuery.isFetching,
+    pullRequests: pullRequestsQuery.data,
+    repository,
+    selectedPullRequestId,
+  });
   const [repoSource, setRepoSource] = React.useState<"remote" | "local">(
     "remote",
   );
   const repositoryPanel = useProjectRepositoryPanel(
     `${repository?.id ?? ""}:${activeTab}:${selectedPullRequestId ?? ""}:${selectedIssueId ?? ""}:${selectedCommitHash ?? ""}`,
   );
-  const repoSnapshotQuery = useProjectRepoSnapshotQuery(
-    repository,
+  const {
+    commitDiffQuery,
+    displayedRepoDiff,
+    displayedRepoDiffError,
+    displayedRepoDiffLoading,
+    displayedRepoSnapshot,
+    localRepoSnapshotQuery,
+    repoSnapshotQuery,
+  } = useProjectDetailGitViews({
     activeBranch,
-    selectedTag ? null : selectedBranchPullRequest,
+    activeRepoPullRequest,
     activeTag,
-    repoRemote.host.kind === "buzz",
-  );
+    isBuzzHost: repoRemote.host.kind === "buzz",
+    repository,
+    reposDir: activeCommunity?.reposDir,
+    repoSource,
+    selectedBranchPullRequest,
+    selectedCommitHash,
+    selectedTag,
+  });
   const memberChannelIds = useMemberChannelIds();
   const remoteUnavailableReason =
     repoRemote.host.kind === "buzz" &&
     !repoSnapshotQuery.isLoading &&
-    (!repoSnapshotQuery.data || repoSnapshotQuery.error)
+    !displayedRepoSnapshot
       ? refineRepoUnavailableReason({
           reason: projectRepoUnavailableReason(repoSnapshotQuery.error),
           repositoryChannelId: repository?.channelId,
           memberChannelIds,
         })
       : undefined;
-  const repoDiffQuery = useProjectRepoDiffQuery(
-    repository,
-    activeBranch,
-    activeRepoPullRequest,
-    repoSource === "remote",
-  );
-  const localRepoDiffQuery = useProjectLocalRepoDiffQuery(
-    repository,
-    activeCommunity?.reposDir,
-    activeBranch,
-    activeRepoPullRequest,
-    repoSource === "local" && Boolean(activeRepoPullRequest),
-  );
-  const commitDiffQuery = useProjectCommitDiffQuery(
-    repository,
-    selectedCommitHash,
-    repoSource,
-    activeCommunity?.reposDir,
-  );
-  const localRepoSnapshotQuery = useProjectLocalRepoSnapshotQuery(
-    repository,
-    activeCommunity?.reposDir,
-    activeBranch,
-  );
   const repoSyncStatusQuery = useProjectRepoSyncStatusQuery(
     repository,
     activeCommunity?.reposDir,
@@ -290,15 +261,6 @@ export function ProjectDetailScreen(props: ProjectDetailScreenProps) {
   const hasLocalCheckout = Boolean(
     localRepoSnapshotQuery.data || repoSyncStatusQuery.data?.localPath,
   );
-  const hasRemoteSnapshot = snapshotHasContent(repoSnapshotQuery.data);
-  const displayedRepoDiff =
-    repoSource === "local" ? localRepoDiffQuery.data : repoDiffQuery.data;
-  const displayedRepoDiffError =
-    repoSource === "local" ? localRepoDiffQuery.error : repoDiffQuery.error;
-  const displayedRepoDiffLoading =
-    repoSource === "local"
-      ? localRepoDiffQuery.isLoading
-      : repoDiffQuery.isLoading;
   const branchOptionsWithLocal = projectBranchOptionsFromSync(
     branchOptions,
     repoSyncStatusQuery.data,
@@ -315,7 +277,7 @@ export function ProjectDetailScreen(props: ProjectDetailScreenProps) {
       ),
       remoteBranch: repoSyncStatusQuery.data?.remoteBranch,
       remoteHead: repoSyncStatusQuery.data?.remoteHead,
-      snapshotCommit: repoSnapshotQuery.data?.latestCommit?.hash,
+      snapshotCommit: displayedRepoSnapshot?.latestCommit?.hash,
     });
   const handleBranchChange = React.useCallback(
     (branch: string | null) => {
@@ -492,10 +454,21 @@ export function ProjectDetailScreen(props: ProjectDetailScreenProps) {
       setRepoSource("remote");
       return;
     }
-    if (repoSource === "remote" && !hasRemoteSnapshot && hasLocalCheckout) {
+    if (
+      !selectedPullRequestId &&
+      repoSource === "remote" &&
+      !snapshotHasContent(displayedRepoSnapshot) &&
+      hasLocalCheckout
+    ) {
       setRepoSource("local");
     }
-  }, [hasLocalCheckout, hasRemoteSnapshot, repoSource, selectedTag]);
+  }, [
+    displayedRepoSnapshot,
+    hasLocalCheckout,
+    repoSource,
+    selectedPullRequestId,
+    selectedTag,
+  ]);
   const {
     contributorActivityCounts,
     contributorPubkeys,
@@ -708,23 +681,20 @@ export function ProjectDetailScreen(props: ProjectDetailScreenProps) {
       />
     );
   }
-  const repoContributors = repoSnapshotQuery.data?.contributors ?? [];
+  const repoContributors = displayedRepoSnapshot?.contributors ?? [];
   const displayedRepositorySnapshot =
     repoSource === "local"
       ? (localRepoSnapshotQuery.data?.snapshot ?? null)
-      : repoSnapshotQuery.data;
+      : displayedRepoSnapshot;
   const displayedRepositoryContributors =
     displayedRepositorySnapshot?.contributors ?? repoContributors;
   const displayedRepositoryFiles = displayedRepositorySnapshot?.files ?? [];
-  const selectedPullRequest =
-    pullRequestsQuery.data?.find((item) => item.id === selectedPullRequestId) ??
-    null;
   const selectedIssue =
     issuesQuery.data?.find((item) => item.id === selectedIssueId) ?? null;
   const displayedSnapshotCommits =
     repoSource === "local"
       ? (localRepoSnapshotQuery.data?.snapshot.commits ?? [])
-      : (repoSnapshotQuery.data?.commits ?? []);
+      : (displayedRepoSnapshot?.commits ?? []);
   const selectedCommit = selectedCommitHash
     ? (displayedSnapshotCommits.find(
         (commit) => commit.hash === selectedCommitHash,
@@ -770,15 +740,6 @@ export function ProjectDetailScreen(props: ProjectDetailScreenProps) {
       terminalAvailable={projectTerminalContext !== null}
     />
   );
-  const chatPanelAction = (
-    <ProjectChatPanelControl
-      collapsed={repositoryPanel.collapsed}
-      mode={repositoryPanel.mode}
-      onCollapse={repositoryPanel.collapse}
-      onExpand={repositoryPanel.expand}
-      onModeChange={repositoryPanel.setMode}
-    />
-  );
   const detachedRepositoryPanel =
     !profilePanelPubkey && repositoryPanel.mode === "repository";
   const sharedHeaderBackdrop =
@@ -879,17 +840,15 @@ export function ProjectDetailScreen(props: ProjectDetailScreenProps) {
                 }}
                 project={project}
                 repository={repository}
-                shareTab={
-                  activeWorkItemCrumb
-                    ? undefined
-                    : shareTabForWorkspaceTab(activeTab)
-                }
               />
               <div
                 className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden overflow-y-auto overscroll-y-none px-4 pb-4"
                 data-testid="project-detail-scroll"
               >
-                <div className="w-full space-y-3">
+                {/* min-h-full + flex chain lets the commit detail's diff pane
+                    grow to the bottom of the scrollport without forcing a
+                    taller page when content already overflows. */}
+                <div className="flex min-h-full w-full flex-col space-y-3">
                   <WorkspaceTabs
                     key={`${project.id}:${repository.id}:${tabsResetKey}`}
                     initialTab={
@@ -915,7 +874,6 @@ export function ProjectDetailScreen(props: ProjectDetailScreenProps) {
                       reposDir: activeCommunity?.reposDir,
                     }}
                     createPullRequestRequestKey={createPullRequestRequestKey}
-                    headerAction={chatPanelAction}
                     updatePullRequestAction={
                       openBranchPullRequest &&
                       repoSyncStatusQuery.data?.remoteHead &&
@@ -932,7 +890,6 @@ export function ProjectDetailScreen(props: ProjectDetailScreenProps) {
                     localSnapshot={localRepoSnapshotQuery.data}
                     localSnapshotError={localRepoSnapshotQuery.error}
                     localSnapshotLoading={localRepoSnapshotQuery.isLoading}
-                    onBranchChange={handleBranchChange}
                     onFilesContextChange={setFilesContext}
                     onOpenMergeRecoveryTerminal={
                       handleOpenMergeRecoveryTerminal
@@ -957,11 +914,14 @@ export function ProjectDetailScreen(props: ProjectDetailScreenProps) {
                     repoSource={repoSource}
                     selectedCommitHash={selectedCommitHash}
                     selectedIssueId={selectedIssueId}
+                    selectedPullRequest={selectedPullRequest}
                     selectedPullRequestId={selectedPullRequestId}
                     sharedHeaderBackdrop={sharedHeaderBackdrop}
-                    snapshot={repoSnapshotQuery.data}
+                    snapshot={displayedRepoSnapshot}
                     snapshotError={repoSnapshotQuery.error}
-                    snapshotLoading={repoSnapshotQuery.isLoading}
+                    snapshotLoading={
+                      repoSnapshotQuery.isLoading && !displayedRepoSnapshot
+                    }
                     sourceControls={filesSourceControls}
                     viewerGitIdentity={viewerGitIdentity}
                   />
diff --git a/desktop/src/features/projects/ui/ProjectDetailSection.tsx b/desktop/src/features/projects/ui/ProjectDetailSection.tsx
index 20271e035d..56dc0aec34 100644
--- a/desktop/src/features/projects/ui/ProjectDetailSection.tsx
+++ b/desktop/src/features/projects/ui/ProjectDetailSection.tsx
@@ -10,16 +10,25 @@ import { cn } from "@/shared/lib/cn";
  */
 export function ProjectDetailSection({
   children,
+  className,
+  contentClassName,
   count,
   defaultOpen = true,
+  headerClassName,
   onOpenChange,
   open: openProp,
   testId,
   title,
 }: {
   children: React.ReactNode;
+  /** Extra classes for the outer section, e.g. flex growth in fill layouts. */
+  className?: string;
+  /** Extra classes for the expanded content wrapper. */
+  contentClassName?: string;
   count?: number;
   defaultOpen?: boolean;
+  /** Extra classes for the header row, e.g. to align it with a reading column while the content is full-bleed. */
+  headerClassName?: string;
   onOpenChange?: (open: boolean) => void;
   open?: boolean;
   testId?: string;
@@ -35,12 +44,16 @@ export function ProjectDetailSection({
 
   return (
     <section
+      className={className}
       data-open={open ? "true" : "false"}
       data-testid={testId ?? "project-detail-section"}
     >
       <button
         aria-expanded={open}
-        className="flex min-h-10 w-full min-w-0 items-center gap-2 px-6 py-2 text-left text-sm font-medium leading-5 text-foreground transition-colors hover:bg-muted/20"
+        className={cn(
+          "flex min-h-10 w-full min-w-0 items-center gap-2 px-6 py-2 text-left text-sm font-medium leading-5 text-foreground transition-colors hover:bg-muted/20",
+          headerClassName,
+        )}
         onClick={() => setOpen(!open)}
         type="button"
       >
@@ -59,7 +72,9 @@ export function ProjectDetailSection({
           ) : null}
         </span>
       </button>
-      {open ? <div className="px-6 pb-6 pt-1">{children}</div> : null}
+      {open ? (
+        <div className={cn("px-6 pb-6 pt-1", contentClassName)}>{children}</div>
+      ) : null}
     </section>
   );
 }
diff --git a/desktop/src/features/projects/ui/ProjectEntityListRow.tsx b/desktop/src/features/projects/ui/ProjectEntityListRow.tsx
index 10cd1f87a4..d0769e31e5 100644
--- a/desktop/src/features/projects/ui/ProjectEntityListRow.tsx
+++ b/desktop/src/features/projects/ui/ProjectEntityListRow.tsx
@@ -131,6 +131,7 @@ export function ProjectEntitySelectControl({
 
 export function ProjectEntityListRow({
   affiliation,
+  affiliationClassName,
   affiliationTestId,
   affiliationTitle,
   beforeDate,
@@ -158,6 +159,7 @@ export function ProjectEntityListRow({
   trailing,
 }: {
   affiliation?: React.ReactNode;
+  affiliationClassName?: string;
   affiliationTestId?: string;
   affiliationTitle?: string;
   beforeDate?: React.ReactNode;
@@ -292,7 +294,10 @@ export function ProjectEntityListRow({
       ) : null}
       {affiliation ? (
         <span
-          className="hidden w-36 shrink-0 truncate text-right text-xs text-muted-foreground/65 md:block"
+          className={cn(
+            "hidden w-36 shrink-0 truncate text-right text-xs text-muted-foreground/65 md:block",
+            affiliationClassName,
+          )}
           data-projects-text-priority="secondary"
           data-testid={affiliationTestId}
           title={
@@ -311,13 +316,13 @@ export function ProjectEntityListRow({
       </span>
       {count != null ? (
         <span
-          className="grid w-12 shrink-0 grid-cols-[0.875rem_1fr] items-center gap-1 text-xs text-muted-foreground/65"
+          className="flex w-12 shrink-0 items-center gap-1 text-xs text-muted-foreground/65"
           data-projects-text-priority="secondary"
           data-testid={countTestId}
           title={countTitle}
         >
           <MessageSquare className="h-3.5 w-3.5" />
-          <span className="text-right tabular-nums">
+          <span className="tabular-nums">
             {count}
             {countSuffix}
           </span>
diff --git a/desktop/src/features/projects/ui/ProjectPullRequestFilesChangedPanel.tsx b/desktop/src/features/projects/ui/ProjectPullRequestFilesChangedPanel.tsx
index 105d20f10e..72884a33ed 100644
--- a/desktop/src/features/projects/ui/ProjectPullRequestFilesChangedPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectPullRequestFilesChangedPanel.tsx
@@ -755,8 +755,10 @@ export function ProjectPullRequestFilesChangedPanel({
 }
 
 export function ProjectDiffFilesPanel({
+  className,
   error,
   diff,
+  fileTreeClassName,
   isLoading,
   embedded = false,
   focusedAnchor,
@@ -764,6 +766,10 @@ export function ProjectDiffFilesPanel({
   inlineComments,
   subjectLabel,
 }: {
+  /** Extra classes for the file-tree/diff grid container. */
+  className?: string;
+  /** Overrides the file tree's default `max-h-96` cap, e.g. for full-height layouts. */
+  fileTreeClassName?: string;
   error: unknown;
   diff: ProjectRepoDiff | null | undefined;
   isLoading: boolean;
@@ -814,11 +820,11 @@ export function ProjectDiffFilesPanel({
     }
   }, [filteredFiles, selectedPath]);
 
-  if (isLoading) {
+  if (isLoading && !diff) {
     return <BuzzLoadingState label="Loading changed files" />;
   }
 
-  if (error) {
+  if (error && !diff) {
     const message = errorMessage(error);
     return (
       <div
@@ -857,6 +863,7 @@ export function ProjectDiffFilesPanel({
       className={cn(
         "grid min-h-0 overflow-hidden lg:grid-cols-[17rem_minmax(0,1fr)]",
         outerBorderClass,
+        className,
       )}
       data-project-detail-panel={embedded ? undefined : true}
     >
@@ -876,7 +883,12 @@ export function ProjectDiffFilesPanel({
             />
           </label>
         </div>
-        <nav className="max-h-96 overflow-auto border-border/50 border-t py-1">
+        <nav
+          className={cn(
+            "max-h-96 overflow-auto border-border/50 border-t py-1",
+            fileTreeClassName,
+          )}
+        >
           <FileTreeItems
             node={fileTree}
             onSelect={setSelectedPath}
diff --git a/desktop/src/features/projects/ui/ProjectPullRequestsPanel.tsx b/desktop/src/features/projects/ui/ProjectPullRequestsPanel.tsx
index 9ea2310e78..b130bf552c 100644
--- a/desktop/src/features/projects/ui/ProjectPullRequestsPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectPullRequestsPanel.tsx
@@ -34,7 +34,6 @@ import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import { useIdentityQuery } from "@/shared/api/hooks";
 import type { ChannelMember } from "@/shared/api/types";
 import { normalizePubkey, truncatePubkey } from "@/shared/lib/pubkey";
-import { BuzzLoadingState } from "@/shared/ui/BuzzLoadingState";
 import {
   ProjectFeedRow,
   ProjectFeedRowCluster,
@@ -58,6 +57,7 @@ import {
 } from "./ProjectStatusProgressIcon";
 import { ProjectWorkItemGroup } from "./ProjectWorkItemGroup";
 import { ProjectWorkItemRow } from "./ProjectWorkItemRow";
+import { PullRequestsPanelSurface } from "./PullRequestsPanelSurface";
 
 export { PullRequestMetaHeader } from "./PullRequestMetaRail";
 
@@ -537,13 +537,14 @@ export function ProjectPullRequestDetail({
           ) : null}
           {pullRequest.updates.length > 0 ? (
             <div
-              className={pullRequest.content ? "mt-4 space-y-3" : "space-y-3"}
+              className={pullRequest.content ? "mt-4 space-y-4" : "space-y-4"}
             >
               <h4 className="text-sm font-semibold text-foreground">Updates</h4>
               {pullRequest.updates.map((update) => (
                 <article className="space-y-1" key={update.id}>
                   <div className="flex min-w-0 items-center justify-between gap-3">
                     <AuthorIdentity
+                      avatarSize="sm"
                       profiles={profiles}
                       pubkey={update.author}
                       role={
@@ -855,7 +856,7 @@ export function PullRequestsPanel({
   profiles,
   project,
   pullRequests,
-  selectedPullRequestId,
+  selectedPullRequest,
 }: {
   diffStats?: { additions: number; deletions: number } | null;
   error: unknown;
@@ -870,51 +871,8 @@ export function PullRequestsPanel({
   profiles?: UserProfileLookup;
   project: Project;
   pullRequests: ProjectPullRequest[];
-  selectedPullRequestId: string | null;
+  selectedPullRequest: ProjectPullRequest | null;
 }) {
-  const selectedPullRequest =
-    pullRequests.find((item) => item.id === selectedPullRequestId) ?? null;
-
-  React.useEffect(() => {
-    if (
-      selectedPullRequestId &&
-      !pullRequests.some((item) => item.id === selectedPullRequestId)
-    ) {
-      onSelectedPullRequestIdChange(null);
-    }
-  }, [onSelectedPullRequestIdChange, pullRequests, selectedPullRequestId]);
-
-  if (isLoading) {
-    return <BuzzLoadingState label="Loading reviews" />;
-  }
-
-  if (pullRequests.length === 0) {
-    return (
-      <p className="p-4 text-sm text-muted-foreground">
-        {error
-          ? "Could not load reviews for this repository."
-          : "No reviews yet."}
-      </p>
-    );
-  }
-
-  if (selectedPullRequest) {
-    return (
-      <ProjectPullRequestDetail
-        diffStats={diffStats}
-        filesChanged={filesChanged}
-        filesCount={filesCount}
-        forceOpenFiles={forceOpenFiles}
-        onOpenInlineComment={onOpenInlineComment}
-        onOpenCommit={onOpenCommit}
-        onOpenTerminal={onOpenTerminal}
-        profiles={profiles}
-        project={project}
-        pullRequest={selectedPullRequest}
-      />
-    );
-  }
-
   const groups = PULL_REQUEST_STATUS_ORDER.map((status) => ({
     items: pullRequests.filter((pullRequest) => pullRequest.status === status),
     status,
@@ -924,36 +882,60 @@ export function PullRequestsPanel({
   );
 
   return (
-    <div>
-      {groups.map(({ items, status }) => {
-        return (
-          <ProjectWorkItemGroup
-            count={items.length}
-            icon={
-              <ProjectStatusProgressIcon
-                className={`h-4 w-4 ${pullRequestStatusClassName(status)}`}
-                state={pullRequestProgressState(status)}
-              />
-            }
-            items={items.map((pullRequest) =>
-              reviewSelectionItem(project, pullRequest),
-            )}
-            key={status}
-            label={status}
-          >
-            {items.map((pullRequest) => (
-              <PullRequestRow
-                key={pullRequest.id}
-                onOpen={() => onSelectedPullRequestIdChange(pullRequest.id)}
-                profiles={profiles}
-                project={project}
-                pullRequest={pullRequest}
-                rangeItems={rangeItems}
-              />
-            ))}
-          </ProjectWorkItemGroup>
-        );
-      })}
-    </div>
+    <PullRequestsPanelSurface
+      detail={
+        selectedPullRequest ? (
+          <ProjectPullRequestDetail
+            diffStats={diffStats}
+            filesChanged={filesChanged}
+            filesCount={filesCount}
+            forceOpenFiles={forceOpenFiles}
+            onOpenInlineComment={onOpenInlineComment}
+            onOpenCommit={onOpenCommit}
+            onOpenTerminal={onOpenTerminal}
+            profiles={profiles}
+            project={project}
+            pullRequest={selectedPullRequest}
+          />
+        ) : null
+      }
+      error={error}
+      isLoading={isLoading}
+      list={
+        <div>
+          {groups.map(({ items, status }) => {
+            return (
+              <ProjectWorkItemGroup
+                count={items.length}
+                icon={
+                  <ProjectStatusProgressIcon
+                    className={`h-4 w-4 ${pullRequestStatusClassName(status)}`}
+                    state={pullRequestProgressState(status)}
+                  />
+                }
+                items={items.map((pullRequest) =>
+                  reviewSelectionItem(project, pullRequest),
+                )}
+                key={status}
+                label={status}
+              >
+                {items.map((pullRequest) => (
+                  <PullRequestRow
+                    key={pullRequest.id}
+                    onOpen={() => onSelectedPullRequestIdChange(pullRequest.id)}
+                    profiles={profiles}
+                    project={project}
+                    pullRequest={pullRequest}
+                    rangeItems={rangeItems}
+                  />
+                ))}
+              </ProjectWorkItemGroup>
+            );
+          })}
+        </div>
+      }
+      pullRequests={pullRequests}
+      selectedPullRequest={selectedPullRequest}
+    />
   );
 }
diff --git a/desktop/src/features/projects/ui/ProjectReadmePanel.tsx b/desktop/src/features/projects/ui/ProjectReadmePanel.tsx
index 68bf61a8d4..9bc89e5213 100644
--- a/desktop/src/features/projects/ui/ProjectReadmePanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectReadmePanel.tsx
@@ -263,7 +263,7 @@ export function ReadmePanel({
     return (
       <section className="overflow-hidden">
         {header}
-        <div className="p-6 text-sm text-muted-foreground">
+        <div className="px-8 py-6 text-sm text-muted-foreground">
           {fileContent.error
             ? "Could not load this README. Try again after refreshing the repository."
             : gitDataState === "empty"
@@ -283,11 +283,13 @@ export function ReadmePanel({
   return (
     <section className="overflow-hidden">
       {header}
-      <div className="p-4">
+      <div className="min-w-0 px-8 py-6">
         {isMarkdown ? (
           <Markdown
+            blockCode
             className="text-sm"
             content={readmeContent}
+            hardLineBreaks={false}
             interactive={false}
           />
         ) : language ? (
diff --git a/desktop/src/features/projects/ui/ProjectRepositoryActionsPanel.tsx b/desktop/src/features/projects/ui/ProjectRepositoryActionsPanel.tsx
index 78c59de03e..90d2e2011f 100644
--- a/desktop/src/features/projects/ui/ProjectRepositoryActionsPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectRepositoryActionsPanel.tsx
@@ -35,10 +35,7 @@ import {
 import { useProjectSelection } from "@/features/projects/lib/useProjectSelection";
 import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import { RightAuxiliaryPane } from "@/features/channels/ui/RightAuxiliaryPane";
-import { normalizePubkey } from "@/shared/lib/pubkey";
 import { Button } from "@/shared/ui/button";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/shared/ui/tooltip";
-import { UserAvatar } from "@/shared/ui/UserAvatar";
 import {
   RepoSourceDropdown,
   type RepoSourceHeaderControls,
@@ -90,14 +87,19 @@ type ProjectRepositoryActionsPanelProps = {
 function RepositoryPanelSection({
   children,
   divided = false,
+  testId,
   title,
 }: {
   children: React.ReactNode;
   divided?: boolean;
+  testId?: string;
   title?: string;
 }) {
   return (
-    <section className={divided ? "!mt-2 space-y-0.5 pt-2" : "space-y-0.5"}>
+    <section
+      className={divided ? "!mt-2 space-y-0.5 pt-2" : "space-y-0.5"}
+      data-testid={testId}
+    >
       {title ? (
         <h3 className="flex h-7 min-w-0 items-center truncate text-sm font-normal text-muted-foreground/70">
           {title}
@@ -108,49 +110,6 @@ function RepositoryPanelSection({
   );
 }
 
-function RepositoryPeople({
-  people,
-  profiles,
-}: {
-  people: string[];
-  profiles?: UserProfileLookup;
-}) {
-  return (
-    <div
-      className="flex -space-x-1.5 pb-1 pt-0"
-      data-testid="project-repository-people"
-    >
-      {people.slice(0, 18).map((person) => {
-        const profile = profiles?.[person];
-        const label =
-          profile?.displayName?.trim() ||
-          profile?.nip05Handle?.trim() ||
-          person;
-        return (
-          <Tooltip key={person}>
-            <TooltipTrigger asChild>
-              <span
-                className="relative inline-flex rounded-full ring-2 ring-background"
-                data-testid="project-repository-person"
-              >
-                <UserAvatar
-                  accent={profile?.isAgent === true}
-                  avatarUrl={profile?.avatarUrl ?? null}
-                  displayName={label}
-                  size="sm"
-                />
-              </span>
-            </TooltipTrigger>
-            <TooltipContent data-testid="project-repository-person-tooltip">
-              {label}
-            </TooltipContent>
-          </Tooltip>
-        );
-      })}
-    </div>
-  );
-}
-
 function RepositoryActionButton({
   children,
   disabled,
@@ -207,19 +166,6 @@ export function ProjectRepositoryActionsPanel({
   terminalTitle,
   widthPx,
 }: ProjectRepositoryActionsPanelProps) {
-  const contextPeople = selectedIssue
-    ? [selectedIssue.author, ...selectedIssue.assignees]
-    : selectedPullRequest
-      ? [
-          selectedPullRequest.author,
-          ...selectedPullRequest.reviewers,
-          ...selectedPullRequest.approvals.map(({ author }) => author),
-          ...selectedPullRequest.changeRequests.map(({ author }) => author),
-        ]
-      : [repository.owner, ...repository.contributors];
-  const people = [
-    ...new Set(contextPeople.filter(Boolean).map(normalizePubkey)),
-  ];
   const selection = useProjectSelection();
   const selectionPresentation = projectSelectionPresentation(
     selection?.items ?? [],
@@ -246,6 +192,16 @@ export function ProjectRepositoryActionsPanel({
     sourceControls.externalUrl,
     branchScoped ? (sourceControls.selectedTag ?? sourceControls.branch) : null,
   );
+  const showCreateTask = activeTab === "issues" && !selectionPresentation;
+  const showCreateReview =
+    activeTab === "prs" &&
+    !selectionPresentation &&
+    Boolean(onCreatePullRequest);
+  const showActions =
+    Boolean(selectedIssue || selectedPullRequest || contextItem) ||
+    branchScoped ||
+    showCreateTask ||
+    showCreateReview;
 
   return (
     <RightAuxiliaryPane
@@ -310,163 +266,183 @@ export function ProjectRepositoryActionsPanel({
               selectionPresentation ? "hidden" : ""
             }`}
           >
-            <ProjectWorkItemContextActions
-              issue={selectedIssue}
-              profiles={profiles}
-              pullRequest={selectedPullRequest}
-              repository={repository}
-            />
-            {contextItem ? (
-              <ProjectWorkItemCommunicationActions
-                item={contextItem}
-                onChatWithAgent={onChatWithAgent}
-              />
-            ) : null}
-            {branchScoped ? (
-              <RepositoryPanelSection>
-                <div className="grid gap-0.5 [&_button]:-mx-2 [&_button]:h-7 [&_button]:w-[calc(100%+1rem)] [&_button]:max-w-none [&_button]:justify-start [&_button]:gap-3 [&_button]:rounded-md [&_button]:border-0 [&_button]:bg-transparent [&_button]:px-2 [&_button]:text-left [&_button]:text-sm [&_button]:font-normal [&_button]:shadow-none [&_button]:hover:bg-muted/70 [&_button>svg:last-child]:ml-auto">
-                  <RepoSourceDropdown controls={sourceControls} />
-                  <RepositoryBranchDropdown
-                    branch={sourceControls.branch}
-                    branchOptions={sourceControls.branchOptions}
-                    createBranchDisabled={sourceControls.createBranchDisabled}
-                    createBranchTitle={sourceControls.createBranchTitle}
-                    deleteBranchDisabled={sourceControls.deleteBranchDisabled}
-                    deleteBranchTitle={sourceControls.deleteBranchTitle}
-                    onBranchChange={sourceControls.onBranchChange}
-                    onCreateBranch={sourceControls.onCreateBranch}
-                    onDeleteBranch={sourceControls.onDeleteBranch}
-                    onTagChange={sourceControls.onTagChange}
-                    selectedTag={sourceControls.selectedTag}
-                    tagOptions={sourceControls.tagOptions}
+            {showActions ? (
+              <RepositoryPanelSection testId="project-context-actions">
+                <ProjectWorkItemContextActions
+                  issue={selectedIssue}
+                  profiles={profiles}
+                  pullRequest={selectedPullRequest}
+                  repository={repository}
+                />
+                {contextItem ? (
+                  <ProjectWorkItemCommunicationActions
+                    item={contextItem}
+                    onChatWithAgent={onChatWithAgent}
                   />
-                </div>
-              </RepositoryPanelSection>
-            ) : activeTab === "issues" && !selectionPresentation ? (
-              <RepositoryPanelSection>
-                <RepositoryActionButton
-                  disabled={createIssuePending}
-                  onClick={onCreateTask}
-                >
-                  <Plus className="h-3.5 w-3.5" />
-                  Create task
-                </RepositoryActionButton>
-              </RepositoryPanelSection>
-            ) : null}
-
-            {branchScoped ? (
-              <RepositoryPanelSection>
-                <div className="grid gap-0.5">
-                  {cloneAction ? (
-                    <RepositoryActionButton
-                      disabled={sourceControls.clonePending}
-                      onClick={cloneAction}
+                ) : null}
+                {branchScoped ? (
+                  <>
+                    <div
+                      className="grid gap-0.5 [&_button]:-mx-2 [&_button]:h-7 [&_button]:w-[calc(100%+1rem)] [&_button]:max-w-none [&_button]:justify-start [&_button]:gap-3 [&_button]:rounded-md [&_button]:border-0 [&_button]:bg-transparent [&_button]:px-2 [&_button]:text-left [&_button]:text-sm [&_button]:font-normal [&_button]:shadow-none [&_button]:hover:bg-muted/70 [&_button>svg:last-child]:ml-auto"
+                      data-testid="project-context-source-controls"
                     >
-                      {sourceControls.clonePending ? (
-                        <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                      ) : (
-                        <DownloadCloud className="h-3.5 w-3.5" />
-                      )}
-                      {sourceControls.clonePending ? "Cloning…" : "Clone"}
-                    </RepositoryActionButton>
-                  ) : null}
-                  {sourceControls.remoteUnavailableReason === "access" &&
-                  sourceControls.onAskForAccess ? (
-                    <RepositoryActionButton
-                      onClick={sourceControls.onAskForAccess}
-                      title="Open project chat to ask for repository access"
+                      <RepoSourceDropdown controls={sourceControls} />
+                      <RepositoryBranchDropdown
+                        branch={sourceControls.branch}
+                        branchOptions={sourceControls.branchOptions}
+                        createBranchDisabled={
+                          sourceControls.createBranchDisabled
+                        }
+                        createBranchTitle={sourceControls.createBranchTitle}
+                        deleteBranchDisabled={
+                          sourceControls.deleteBranchDisabled
+                        }
+                        deleteBranchTitle={sourceControls.deleteBranchTitle}
+                        onBranchChange={sourceControls.onBranchChange}
+                        onCreateBranch={sourceControls.onCreateBranch}
+                        onDeleteBranch={sourceControls.onDeleteBranch}
+                        onTagChange={sourceControls.onTagChange}
+                        selectedTag={sourceControls.selectedTag}
+                        tagOptions={sourceControls.tagOptions}
+                      />
+                    </div>
+                    <div
+                      className="grid gap-0.5"
+                      data-testid="project-context-repository-actions"
                     >
-                      <MessageCircle className="h-3.5 w-3.5" />
-                      Ask for access
-                    </RepositoryActionButton>
-                  ) : null}
-                  {fetchAction ? (
-                    <RepositoryActionButton
-                      disabled={sourceControls.fetchPending}
-                      onClick={fetchAction}
-                      title={sourceControls.fetchTitle}
-                    >
-                      {sourceControls.fetchPending ? (
-                        <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                      ) : (
-                        <RefreshCw className="h-3.5 w-3.5" />
-                      )}
-                      Fetch
-                    </RepositoryActionButton>
-                  ) : null}
-                  {pullAction ? (
-                    <RepositoryActionButton
-                      disabled={sourceControls.pullDisabled}
-                      onClick={pullAction}
-                      title={sourceControls.pullTitle}
-                    >
-                      {sourceControls.pullPending ? (
-                        <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                      ) : (
-                        <DownloadCloud className="h-3.5 w-3.5" />
-                      )}
-                      Pull
-                      {sourceControls.behindCount
-                        ? ` ${sourceControls.behindCount}`
-                        : ""}
-                    </RepositoryActionButton>
-                  ) : null}
-                  {pushAction ? (
-                    <RepositoryActionButton
-                      disabled={sourceControls.pushDisabled}
-                      onClick={pushAction}
-                      title={sourceControls.pushTitle}
-                    >
-                      {sourceControls.pushPending ? (
-                        <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                      ) : (
-                        <UploadCloud className="h-3.5 w-3.5" />
-                      )}
-                      Push
-                      {sourceControls.aheadCount
-                        ? ` ${sourceControls.aheadCount}`
-                        : ""}
-                    </RepositoryActionButton>
-                  ) : null}
-                  <RepositoryActionButton
-                    onClick={onOpenTerminal}
-                    title={terminalTitle ?? "Open terminal"}
-                  >
-                    <SquareTerminal className="h-3.5 w-3.5" />
-                    Terminal
-                  </RepositoryActionButton>
-                  {sourceControls.source === "local" ? (
-                    <RepositoryActionButton
-                      onClick={onOpenLocalRepository}
-                      title="Open local repository folder"
-                    >
-                      <FolderOpen className="h-3.5 w-3.5" />
-                      Open
-                    </RepositoryActionButton>
-                  ) : externalOpenUrl ? (
-                    <Button
-                      asChild
-                      className="-mx-2 h-7 w-[calc(100%+1rem)] justify-start gap-3 rounded-md px-2 text-left text-sm font-normal hover:bg-muted/70 [&_svg]:h-4 [&_svg]:w-4 [&_svg]:shrink-0 [&_svg]:text-muted-foreground"
-                      size="sm"
-                      variant="ghost"
-                    >
-                      <a
-                        href={externalOpenUrl}
-                        rel="noreferrer"
-                        target="_blank"
+                      {cloneAction ? (
+                        <RepositoryActionButton
+                          disabled={sourceControls.clonePending}
+                          onClick={cloneAction}
+                        >
+                          {sourceControls.clonePending ? (
+                            <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                          ) : (
+                            <DownloadCloud className="h-3.5 w-3.5" />
+                          )}
+                          {sourceControls.clonePending ? "Cloning…" : "Clone"}
+                        </RepositoryActionButton>
+                      ) : null}
+                      {sourceControls.remoteUnavailableReason === "access" &&
+                      sourceControls.onAskForAccess ? (
+                        <RepositoryActionButton
+                          onClick={sourceControls.onAskForAccess}
+                          title="Open project chat to ask for repository access"
+                        >
+                          <MessageCircle className="h-3.5 w-3.5" />
+                          Ask for access
+                        </RepositoryActionButton>
+                      ) : null}
+                      {fetchAction ? (
+                        <RepositoryActionButton
+                          disabled={sourceControls.fetchPending}
+                          onClick={fetchAction}
+                          title={sourceControls.fetchTitle}
+                        >
+                          {sourceControls.fetchPending ? (
+                            <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                          ) : (
+                            <RefreshCw className="h-3.5 w-3.5" />
+                          )}
+                          Fetch
+                        </RepositoryActionButton>
+                      ) : null}
+                      {pullAction ? (
+                        <RepositoryActionButton
+                          disabled={sourceControls.pullDisabled}
+                          onClick={pullAction}
+                          title={sourceControls.pullTitle}
+                        >
+                          {sourceControls.pullPending ? (
+                            <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                          ) : (
+                            <DownloadCloud className="h-3.5 w-3.5" />
+                          )}
+                          Pull
+                          {sourceControls.behindCount
+                            ? ` ${sourceControls.behindCount}`
+                            : ""}
+                        </RepositoryActionButton>
+                      ) : null}
+                      {pushAction ? (
+                        <RepositoryActionButton
+                          disabled={sourceControls.pushDisabled}
+                          onClick={pushAction}
+                          title={sourceControls.pushTitle}
+                        >
+                          {sourceControls.pushPending ? (
+                            <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                          ) : (
+                            <UploadCloud className="h-3.5 w-3.5" />
+                          )}
+                          Push
+                          {sourceControls.aheadCount
+                            ? ` ${sourceControls.aheadCount}`
+                            : ""}
+                        </RepositoryActionButton>
+                      ) : null}
+                      <RepositoryActionButton
+                        onClick={onOpenTerminal}
+                        title={terminalTitle ?? "Open terminal"}
                       >
-                        <ExternalLink className="h-3.5 w-3.5" />
-                        Open
-                      </a>
-                    </Button>
-                  ) : null}
-                </div>
+                        <SquareTerminal className="h-3.5 w-3.5" />
+                        Terminal
+                      </RepositoryActionButton>
+                      {sourceControls.source === "local" ? (
+                        <RepositoryActionButton
+                          onClick={onOpenLocalRepository}
+                          title="Open local repository folder"
+                        >
+                          <FolderOpen className="h-3.5 w-3.5" />
+                          Open
+                        </RepositoryActionButton>
+                      ) : externalOpenUrl ? (
+                        <Button
+                          asChild
+                          className="-mx-2 h-7 w-[calc(100%+1rem)] justify-start gap-3 rounded-md px-2 text-left text-sm font-normal hover:bg-muted/70 [&_svg]:h-4 [&_svg]:w-4 [&_svg]:shrink-0 [&_svg]:text-muted-foreground"
+                          size="sm"
+                          variant="ghost"
+                        >
+                          <a
+                            href={externalOpenUrl}
+                            rel="noreferrer"
+                            target="_blank"
+                          >
+                            <ExternalLink className="h-3.5 w-3.5" />
+                            Open
+                          </a>
+                        </Button>
+                      ) : null}
+                    </div>
+                  </>
+                ) : null}
+                {showCreateTask ? (
+                  <RepositoryActionButton
+                    disabled={createIssuePending}
+                    onClick={onCreateTask}
+                  >
+                    <Plus className="h-3.5 w-3.5" />
+                    Create task
+                  </RepositoryActionButton>
+                ) : null}
+                {showCreateReview && onCreatePullRequest ? (
+                  <RepositoryActionButton
+                    onClick={onCreatePullRequest}
+                    title="Create review — choose a repository and branches to compare"
+                  >
+                    <Plus className="h-3.5 w-3.5" />
+                    Create review
+                  </RepositoryActionButton>
+                ) : null}
               </RepositoryPanelSection>
             ) : null}
 
-            {branchScoped ? (
-              <RepositoryPanelSection divided title="Details">
-                <RepositoryPeople people={people} profiles={profiles} />
+            <RepositoryPanelSection
+              divided={showActions}
+              testId="project-context-details"
+              title="Details"
+            >
+              {branchScoped ? (
                 <dl className="text-sm [&>div]:h-7 [&_dd]:ml-auto [&_dd]:tabular-nums [&_dt]:gap-3 [&_dt]:text-foreground [&_dt_svg]:h-4 [&_dt_svg]:w-4 [&_dt_svg]:shrink-0 [&_dt_svg]:text-muted-foreground">
                   <div className="flex items-center justify-between gap-3">
                     <dt className="flex items-center gap-3 text-muted-foreground">
@@ -499,121 +475,94 @@ export function ProjectRepositoryActionsPanel({
                     </dd>
                   </div>
                 </dl>
-              </RepositoryPanelSection>
-            ) : (
-              <>
-                <RepositoryPanelSection
-                  divided={activeTab === "issues"}
-                  title={
-                    selectedIssue || selectedPullRequest
-                      ? "People"
-                      : activeTab === "issues"
-                        ? "Details"
-                        : undefined
-                  }
-                >
-                  <RepositoryPeople people={people} profiles={profiles} />
-                </RepositoryPanelSection>
-                <RepositoryPanelSection
-                  title={
-                    selectedIssue
-                      ? "Task details"
-                      : selectedPullRequest
-                        ? "Review details"
-                        : activeTab === "issues"
-                          ? undefined
-                          : activeTab === "prs"
-                            ? "Review activity"
-                            : "Repository activity"
-                  }
-                >
-                  <dl className="text-sm [&>div]:h-7 [&_dd]:ml-auto [&_dd]:tabular-nums [&_dt]:gap-3 [&_dt]:text-foreground [&_dt_svg]:h-4 [&_dt_svg]:w-4 [&_dt_svg]:shrink-0 [&_dt_svg]:text-muted-foreground">
-                    <ProjectWorkItemContextDetails
-                      issue={selectedIssue}
-                      pullRequest={selectedPullRequest}
-                    />
-                    {!selectedIssue &&
-                    !selectedPullRequest &&
-                    activeTab !== "prs" ? (
-                      <>
-                        <div className="flex items-center justify-between gap-3">
-                          <dt className="flex items-center gap-3 text-muted-foreground">
-                            <CircleDot className="h-3.5 w-3.5" />
-                            {activeTab === "issues" ? "Tasks" : "Active tasks"}
-                          </dt>
-                          <dd className="font-medium text-foreground">
-                            {activeTab === "issues"
-                              ? taskActivity.total
-                              : taskActivity.active}
-                          </dd>
-                        </div>
-                        {activeTab === "issues" ? (
-                          <>
-                            <div className="flex items-center justify-between gap-3">
-                              <dt className="flex items-center gap-3 text-muted-foreground">
-                                <CircleDot className="h-3.5 w-3.5" />
-                                Active
-                              </dt>
-                              <dd className="font-medium text-foreground">
-                                {taskActivity.active}
-                              </dd>
-                            </div>
-                            <div className="flex items-center justify-between gap-3">
-                              <dt className="flex items-center gap-3 text-muted-foreground">
-                                <CheckCircle2 className="h-3.5 w-3.5" />
-                                Completed
-                              </dt>
-                              <dd className="font-medium text-foreground">
-                                {taskActivity.completed}
-                              </dd>
-                            </div>
-                          </>
-                        ) : null}
-                      </>
-                    ) : null}
-                    {!selectedIssue &&
-                    !selectedPullRequest &&
-                    activeTab !== "issues" ? (
-                      <>
-                        <div className="flex items-center justify-between gap-3">
-                          <dt className="flex items-center gap-3 text-muted-foreground">
-                            <GitPullRequest className="h-3.5 w-3.5" />
-                            {activeTab === "prs" ? "Reviews" : "Open reviews"}
-                          </dt>
-                          <dd className="font-medium text-foreground">
-                            {activeTab === "prs"
-                              ? reviewActivity.total
-                              : reviewActivity.open}
-                          </dd>
-                        </div>
-                        {activeTab === "prs" ? (
-                          <>
-                            <div className="flex items-center justify-between gap-3">
-                              <dt className="flex items-center gap-3 text-muted-foreground">
-                                <GitPullRequest className="h-3.5 w-3.5" />
-                                Open
-                              </dt>
-                              <dd className="font-medium text-foreground">
-                                {reviewActivity.open}
-                              </dd>
-                            </div>
-                            <div className="flex items-center justify-between gap-3">
-                              <dt className="flex items-center gap-3 text-muted-foreground">
-                                <GitMerge className="h-3.5 w-3.5" />
-                                Merged
-                              </dt>
-                              <dd className="font-medium text-foreground">
-                                {reviewActivity.merged}
-                              </dd>
-                            </div>
-                          </>
-                        ) : null}
-                      </>
-                    ) : null}
-                  </dl>
-                </RepositoryPanelSection>
-              </>
-            )}
+              ) : (
+                <dl className="text-sm [&>div]:h-7 [&_dd]:ml-auto [&_dd]:tabular-nums [&_dt]:gap-3 [&_dt]:text-foreground [&_dt_svg]:h-4 [&_dt_svg]:w-4 [&_dt_svg]:shrink-0 [&_dt_svg]:text-muted-foreground">
+                  <ProjectWorkItemContextDetails
+                    issue={selectedIssue}
+                    pullRequest={selectedPullRequest}
+                    repository={repository}
+                  />
+                  {!selectedIssue &&
+                  !selectedPullRequest &&
+                  activeTab !== "prs" ? (
+                    <>
+                      <div className="flex items-center justify-between gap-3">
+                        <dt className="flex items-center gap-3 text-muted-foreground">
+                          <CircleDot className="h-3.5 w-3.5" />
+                          {activeTab === "issues" ? "Tasks" : "Active tasks"}
+                        </dt>
+                        <dd className="font-medium text-foreground">
+                          {activeTab === "issues"
+                            ? taskActivity.total
+                            : taskActivity.active}
+                        </dd>
+                      </div>
+                      {activeTab === "issues" ? (
+                        <>
+                          <div className="flex items-center justify-between gap-3">
+                            <dt className="flex items-center gap-3 text-muted-foreground">
+                              <CircleDot className="h-3.5 w-3.5" />
+                              Active
+                            </dt>
+                            <dd className="font-medium text-foreground">
+                              {taskActivity.active}
+                            </dd>
+                          </div>
+                          <div className="flex items-center justify-between gap-3">
+                            <dt className="flex items-center gap-3 text-muted-foreground">
+                              <CheckCircle2 className="h-3.5 w-3.5" />
+                              Completed
+                            </dt>
+                            <dd className="font-medium text-foreground">
+                              {taskActivity.completed}
+                            </dd>
+                          </div>
+                        </>
+                      ) : null}
+                    </>
+                  ) : null}
+                  {!selectedIssue &&
+                  !selectedPullRequest &&
+                  activeTab !== "issues" ? (
+                    <>
+                      <div className="flex items-center justify-between gap-3">
+                        <dt className="flex items-center gap-3 text-muted-foreground">
+                          <GitPullRequest className="h-3.5 w-3.5" />
+                          {activeTab === "prs" ? "Reviews" : "Open reviews"}
+                        </dt>
+                        <dd className="font-medium text-foreground">
+                          {activeTab === "prs"
+                            ? reviewActivity.total
+                            : reviewActivity.open}
+                        </dd>
+                      </div>
+                      {activeTab === "prs" ? (
+                        <>
+                          <div className="flex items-center justify-between gap-3">
+                            <dt className="flex items-center gap-3 text-muted-foreground">
+                              <GitPullRequest className="h-3.5 w-3.5" />
+                              Open
+                            </dt>
+                            <dd className="font-medium text-foreground">
+                              {reviewActivity.open}
+                            </dd>
+                          </div>
+                          <div className="flex items-center justify-between gap-3">
+                            <dt className="flex items-center gap-3 text-muted-foreground">
+                              <GitMerge className="h-3.5 w-3.5" />
+                              Merged
+                            </dt>
+                            <dd className="font-medium text-foreground">
+                              {reviewActivity.merged}
+                            </dd>
+                          </div>
+                        </>
+                      ) : null}
+                    </>
+                  ) : null}
+                </dl>
+              )}
+            </RepositoryPanelSection>
           </div>
         </div>
       </div>
diff --git a/desktop/src/features/projects/ui/ProjectRepositoryLatestCommitRow.tsx b/desktop/src/features/projects/ui/ProjectRepositoryLatestCommitRow.tsx
new file mode 100644
index 0000000000..36e379058e
--- /dev/null
+++ b/desktop/src/features/projects/ui/ProjectRepositoryLatestCommitRow.tsx
@@ -0,0 +1,41 @@
+import type * as React from "react";
+
+import { cn } from "@/shared/lib/cn";
+
+/** Interactive table-header row that opens the repository's latest commit. */
+export function ProjectRepositoryLatestCommitRow({
+  children,
+  commitShortHash,
+  onOpen,
+}: {
+  children: React.ReactNode;
+  commitShortHash?: string;
+  onOpen?: () => void;
+}) {
+  return (
+    <tr
+      aria-label={
+        commitShortHash ? `Open commit ${commitShortHash}` : undefined
+      }
+      className={cn(
+        "bg-muted/20",
+        onOpen &&
+          "cursor-pointer transition-colors hover:bg-muted/35 focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring",
+      )}
+      data-testid="project-repository-latest-commit"
+      onClick={onOpen}
+      onKeyDown={
+        onOpen
+          ? (event) => {
+              if (event.key !== "Enter" && event.key !== " ") return;
+              event.preventDefault();
+              onOpen();
+            }
+          : undefined
+      }
+      tabIndex={onOpen ? 0 : undefined}
+    >
+      {children}
+    </tr>
+  );
+}
diff --git a/desktop/src/features/projects/ui/ProjectRepositoryPanel.tsx b/desktop/src/features/projects/ui/ProjectRepositoryPanel.tsx
index d784dc04cd..09ac04dd7a 100644
--- a/desktop/src/features/projects/ui/ProjectRepositoryPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectRepositoryPanel.tsx
@@ -46,6 +46,7 @@ import {
   PROJECT_DETAIL_PANEL_CLASS,
   PROJECT_DETAIL_PANEL_MESSAGE_CLASS,
 } from "./projectPanelStyles";
+import { ProjectRepositoryLatestCommitRow } from "./ProjectRepositoryLatestCommitRow";
 import {
   type RepoSourceHeaderControls,
   RepoSourceDropdown,
@@ -617,6 +618,7 @@ export function RepositoryFilesPanel({
   profiles,
   fallbackAuthorPubkey,
   onContextChange,
+  onOpenCommit,
   sourceControls,
   unavailableMessage,
 }: {
@@ -631,6 +633,7 @@ export function RepositoryFilesPanel({
     kind: "file" | "folder";
     path: string;
   }) => void;
+  onOpenCommit?: (commitHash: string) => void;
   /** Branch picker + remote/local toggle rendered in the panel header. */
   sourceControls?: RepoSourceHeaderControls;
   unavailableMessage?: string;
@@ -850,12 +853,22 @@ export function RepositoryFilesPanel({
       ) : null}
 
       <div className="overflow-x-auto px-2 pb-2">
-        <table className="w-full border-separate border-spacing-y-0.5 caption-bottom text-sm">
+        <table className="w-full border-collapse caption-bottom text-sm">
           <thead>
-            <tr className="border-border/50 border-b bg-muted/20">
+            <ProjectRepositoryLatestCommitRow
+              commitShortHash={latestCommit?.shortHash}
+              onOpen={
+                latestCommit && onOpenCommit
+                  ? () => onOpenCommit(latestCommit.hash)
+                  : undefined
+              }
+            >
               <th className="px-4 py-3 text-left font-normal" colSpan={3}>
                 {latestCommit ? (
-                  <div className="flex min-w-0 items-center justify-between gap-3 text-sm">
+                  <div
+                    className="flex min-w-0 items-center justify-between gap-3 text-xs"
+                    data-testid="project-repository-latest-commit-summary"
+                  >
                     <div className="flex min-w-0 items-center gap-2">
                       <UserAvatar
                         accent={latestCommitProfile?.isAgent === true}
@@ -901,12 +914,11 @@ export function RepositoryFilesPanel({
                   </p>
                 )}
               </th>
-            </tr>
+            </ProjectRepositoryLatestCommitRow>
           </thead>
           <tbody>
-            {visibleEntries.map((entry, index) => {
+            {visibleEntries.map((entry) => {
               const latestCommit = entry.latestCommit;
-              const rowIsLast = index === visibleEntries.length - 1;
               const openEntry = () =>
                 openRepositoryEntry(entry, openPath, setSelectedFile);
 
@@ -914,6 +926,7 @@ export function RepositoryFilesPanel({
                 <tr
                   aria-label={`Open ${entry.type} ${entry.name}`}
                   className="group/repository-entry cursor-pointer text-xs focus-visible:outline-hidden"
+                  data-testid="project-repository-entry-row"
                   key={`${entry.type}:${entry.path}`}
                   onClick={openEntry}
                   onKeyDown={(event) =>
@@ -921,12 +934,7 @@ export function RepositoryFilesPanel({
                   }
                   tabIndex={0}
                 >
-                  <td
-                    className={cn(
-                      "min-w-52 rounded-l-md px-3 py-2 align-middle transition-colors group-hover/repository-entry:bg-muted/35 group-focus-visible/repository-entry:bg-muted/35",
-                      !rowIsLast && "border-border/50 border-b",
-                    )}
-                  >
+                  <td className="min-w-52 px-3 py-2 align-middle transition-colors group-hover/repository-entry:rounded-l-md group-hover/repository-entry:bg-muted/35 group-focus-visible/repository-entry:rounded-l-md group-focus-visible/repository-entry:bg-muted/35">
                     <div className="flex min-w-0 items-center gap-2">
                       <RepositoryEntryIcon entry={entry} />
                       <span className="truncate font-medium text-foreground">
@@ -934,23 +942,13 @@ export function RepositoryFilesPanel({
                       </span>
                     </div>
                   </td>
-                  <td
-                    className={cn(
-                      "max-w-96 p-2 align-middle transition-colors group-hover/repository-entry:bg-muted/35 group-focus-visible/repository-entry:bg-muted/35",
-                      !rowIsLast && "border-border/50 border-b",
-                    )}
-                  >
+                  <td className="max-w-96 p-2 align-middle transition-colors group-hover/repository-entry:bg-muted/35 group-focus-visible/repository-entry:bg-muted/35">
                     <RepositoryCommitCell
                       commit={latestCommit}
                       profiles={profiles}
                     />
                   </td>
-                  <td
-                    className={cn(
-                      "w-36 whitespace-nowrap rounded-r-md p-2 text-right align-middle text-muted-foreground transition-colors group-hover/repository-entry:bg-muted/35 group-focus-visible/repository-entry:bg-muted/35",
-                      !rowIsLast && "border-border/50 border-b",
-                    )}
-                  >
+                  <td className="w-36 whitespace-nowrap p-2 text-right align-middle text-muted-foreground transition-colors group-hover/repository-entry:rounded-r-md group-hover/repository-entry:bg-muted/35 group-focus-visible/repository-entry:rounded-r-md group-focus-visible/repository-entry:bg-muted/35">
                     {latestCommit ? (
                       <time
                         dateTime={new Date(
diff --git a/desktop/src/features/projects/ui/ProjectRightPanelControls.tsx b/desktop/src/features/projects/ui/ProjectRightPanelControls.tsx
index 1f509794dc..1e382326e2 100644
--- a/desktop/src/features/projects/ui/ProjectRightPanelControls.tsx
+++ b/desktop/src/features/projects/ui/ProjectRightPanelControls.tsx
@@ -28,7 +28,7 @@ export function ProjectChatPanelControl({
     <Button
       aria-label={chatOpen ? "Hide project chat" : "Show project chat"}
       aria-pressed={chatOpen}
-      className="h-7 w-7 text-muted-foreground hover:bg-muted/70 hover:text-foreground"
+      className="h-7 w-7 text-sidebar-foreground hover:bg-sidebar-accent"
       data-testid="project-right-panel-chat-tab"
       onClick={() => {
         if (chatOpen) {
@@ -95,6 +95,13 @@ export function ProjectRightPanelControls({
           open={terminalOpen}
         />
       </Button>
+      <ProjectChatPanelControl
+        collapsed={collapsed}
+        mode={mode}
+        onCollapse={onCollapse}
+        onExpand={onExpand}
+        onModeChange={onModeChange}
+      />
       <Button
         aria-label={
           repositoryOpen ? "Hide project context" : "Show project context"
diff --git a/desktop/src/features/projects/ui/ProjectSectionHeader.tsx b/desktop/src/features/projects/ui/ProjectSectionHeader.tsx
index b79d7ae7db..f949f1aa5b 100644
--- a/desktop/src/features/projects/ui/ProjectSectionHeader.tsx
+++ b/desktop/src/features/projects/ui/ProjectSectionHeader.tsx
@@ -1,4 +1,5 @@
 import { type LucideIcon, Plus } from "lucide-react";
+import type { ReactNode } from "react";
 
 import { cn } from "@/shared/lib/cn";
 import { Button } from "@/shared/ui/button";
@@ -9,6 +10,7 @@ export function ProjectSectionHeader({
   icon: Icon,
   testId = "project-section-header",
   title,
+  trailing,
 }: {
   action?: {
     disabled?: boolean;
@@ -20,20 +22,24 @@ export function ProjectSectionHeader({
   icon: LucideIcon;
   testId?: string;
   title: string;
+  trailing?: ReactNode;
 }) {
   return (
     <header
-      className={cn("flex min-h-12 items-center gap-3 px-4 py-2", className)}
+      className={cn(
+        "flex min-h-12 flex-wrap items-center gap-2 px-4 py-2",
+        className,
+      )}
       data-testid={testId}
     >
       <div className="flex min-w-0 flex-1 items-center gap-3">
-        <h2 className="min-w-0 truncate text-sm font-semibold text-foreground">
-          {title}
-        </h2>
         <Icon
           className="h-4 w-4 shrink-0 text-muted-foreground"
           data-testid="project-section-header-icon"
         />
+        <h2 className="min-w-0 truncate text-sm font-semibold text-foreground">
+          {title}
+        </h2>
       </div>
       {action ? (
         <Button
@@ -48,6 +54,7 @@ export function ProjectSectionHeader({
           <Plus className="h-4 w-4" />
         </Button>
       ) : null}
+      {trailing}
     </header>
   );
 }
diff --git a/desktop/src/features/projects/ui/ProjectSelectableGroup.tsx b/desktop/src/features/projects/ui/ProjectSelectableGroup.tsx
index 3536ea20b0..e49f80af62 100644
--- a/desktop/src/features/projects/ui/ProjectSelectableGroup.tsx
+++ b/desktop/src/features/projects/ui/ProjectSelectableGroup.tsx
@@ -10,6 +10,7 @@ export function ProjectSelectableGroup({
   contentClassName,
   count,
   groupKey,
+  headerClassName,
   headerTestId,
   icon,
   items,
@@ -21,6 +22,7 @@ export function ProjectSelectableGroup({
   contentClassName?: string;
   count: number;
   groupKey: string;
+  headerClassName?: string;
   headerTestId: string;
   icon: React.ReactNode;
   items: ProjectSelectionItem[];
@@ -36,6 +38,7 @@ export function ProjectSelectableGroup({
     ).length ?? 0;
   const allSelected = items.length > 0 && selectedCount === items.length;
   const partiallySelected = selectedCount > 0 && !allSelected;
+  const showSelectControl = allSelected || partiallySelected;
 
   return (
     <section
@@ -44,34 +47,50 @@ export function ProjectSelectableGroup({
       data-testid={testId}
     >
       <div
-        className="group/header mx-2 flex h-9 items-center gap-1.5 rounded-md bg-muted/40 px-2 text-xs text-muted-foreground"
+        className={cn(
+          "group/header mx-2 flex h-9 items-center gap-1.5 rounded-md bg-muted/40 px-2 text-xs text-muted-foreground",
+          headerClassName,
+        )}
         data-testid={headerTestId}
       >
-        {selection && items.length > 0 ? (
+        <span
+          className="relative flex h-4 w-4 shrink-0 items-center justify-center"
+          data-testid="project-group-leading-icon"
+        >
           <span
             className={cn(
-              "flex shrink-0 opacity-0 transition-opacity group-focus-within/header:opacity-100 group-hover/header:opacity-100",
-              (allSelected || partiallySelected) && "opacity-100",
+              "flex items-center justify-center transition-opacity",
+              selection &&
+                "group-focus-within/header:opacity-0 group-hover/header:opacity-0",
+              showSelectControl && "opacity-0",
             )}
+            data-testid="project-group-icon"
           >
-            <ProjectEntitySelectControl
-              checked={allSelected}
-              indeterminate={partiallySelected}
-              label={`${allSelected ? "Clear" : "Select"} all ${label}`}
-              onToggle={() => selection.toggleGroup(items)}
-              testId="projects-group-select"
-            />
+            {icon}
           </span>
-        ) : null}
+          {selection && items.length > 0 ? (
+            <span
+              className={cn(
+                "absolute inset-0 flex items-center justify-center opacity-0 transition-opacity group-focus-within/header:opacity-100 group-hover/header:opacity-100",
+                showSelectControl && "opacity-100",
+              )}
+            >
+              <ProjectEntitySelectControl
+                checked={allSelected}
+                indeterminate={partiallySelected}
+                label={`${allSelected ? "Clear" : "Select"} all ${label}`}
+                onToggle={() => selection.toggleGroup(items)}
+                testId="projects-group-select"
+              />
+            </span>
+          ) : null}
+        </span>
         <button
           aria-expanded={expanded}
           className="flex min-w-0 flex-1 cursor-pointer items-center gap-1.5 text-left"
           onClick={() => setExpanded((current) => !current)}
           type="button"
         >
-          <span className="flex h-4 w-4 shrink-0 items-center justify-center opacity-80">
-            {icon}
-          </span>
           <span
             className="min-w-0 truncate font-medium text-foreground/80"
             data-testid={labelTestId}
diff --git a/desktop/src/features/projects/ui/ProjectWorkItemCommunicationActions.tsx b/desktop/src/features/projects/ui/ProjectWorkItemCommunicationActions.tsx
index ab2c44b025..b5d2d22bd3 100644
--- a/desktop/src/features/projects/ui/ProjectWorkItemCommunicationActions.tsx
+++ b/desktop/src/features/projects/ui/ProjectWorkItemCommunicationActions.tsx
@@ -18,13 +18,10 @@ export function ProjectWorkItemCommunicationActions({
   const discussInChannel = useProjectDiscussInChannel(items);
 
   return (
-    <section
-      className="space-y-0.5 pt-2"
+    <div
+      className="space-y-0.5"
       data-testid="project-context-communication-actions"
     >
-      <h3 className="text-xs font-normal text-muted-foreground/70">
-        Discussion
-      </h3>
       <Button
         className={PROJECT_CONTEXT_ACTION_BUTTON_CLASS}
         data-testid="project-context-chat-agent"
@@ -41,6 +38,6 @@ export function ProjectWorkItemCommunicationActions({
         onSelectChannel={discussInChannel}
         testIdPrefix="project-context"
       />
-    </section>
+    </div>
   );
 }
diff --git a/desktop/src/features/projects/ui/ProjectWorkItemContextActions.tsx b/desktop/src/features/projects/ui/ProjectWorkItemContextActions.tsx
index 523e9ce7a1..9182754c62 100644
--- a/desktop/src/features/projects/ui/ProjectWorkItemContextActions.tsx
+++ b/desktop/src/features/projects/ui/ProjectWorkItemContextActions.tsx
@@ -33,13 +33,7 @@ export function ProjectWorkItemContextActions({
     const canAssignOthers =
       viewer !== null && (isAuthor || isOwner || isManagedAgentOwner);
     return (
-      <section
-        className="space-y-1 pt-2"
-        data-testid="project-context-task-assignment"
-      >
-        <h3 className="text-xs font-normal text-muted-foreground/70">
-          Assignment
-        </h3>
+      <div data-testid="project-context-task-assignment">
         <IssueAssigneesRow
           canAssignOthers={canAssignOthers}
           contextActions
@@ -52,7 +46,7 @@ export function ProjectWorkItemContextActions({
           testIdPrefix="project-context-issue"
           viewerPubkey={viewer}
         />
-      </section>
+      </div>
     );
   }
 
@@ -64,7 +58,7 @@ export function ProjectWorkItemContextActions({
       (isAuthor || isOwner || isManagedAgentOwner);
     if (!canRequestReview) return null;
     return (
-      <section className="pt-2" data-testid="project-context-reviewers">
+      <div data-testid="project-context-reviewers">
         <PullRequestReviewersRow
           actionLabel="Add Reviewer"
           canRequest={canRequestReview}
@@ -77,7 +71,7 @@ export function ProjectWorkItemContextActions({
           showSummary={false}
           summaryTestId="project-context-review-summary"
         />
-      </section>
+      </div>
     );
   }
 
diff --git a/desktop/src/features/projects/ui/ProjectWorkItemContextDetails.tsx b/desktop/src/features/projects/ui/ProjectWorkItemContextDetails.tsx
index cdaf3ebf8b..fd39006060 100644
--- a/desktop/src/features/projects/ui/ProjectWorkItemContextDetails.tsx
+++ b/desktop/src/features/projects/ui/ProjectWorkItemContextDetails.tsx
@@ -1,6 +1,7 @@
 import {
   CheckCircle2,
   CircleDot,
+  GitBranch,
   GitPullRequest,
   type LucideIcon,
   MessageCircle,
@@ -11,6 +12,7 @@ import type * as React from "react";
 import type {
   ProjectIssue,
   ProjectPullRequest,
+  Repository,
 } from "@/features/projects/hooks";
 
 function ContextDetailRow({
@@ -36,9 +38,11 @@ function ContextDetailRow({
 export function ProjectWorkItemContextDetails({
   issue,
   pullRequest,
+  repository,
 }: {
   issue?: ProjectIssue | null;
   pullRequest?: ProjectPullRequest | null;
+  repository: Repository;
 }) {
   if (issue) {
     return (
@@ -63,8 +67,25 @@ export function ProjectWorkItemContextDetails({
   }
 
   if (pullRequest) {
+    const sourceBranch = pullRequest.branchName || "Unknown branch";
+    const targetBranch =
+      pullRequest.targetBranch || repository.defaultBranch || "Default branch";
+    const branchLabel = `${sourceBranch} → ${targetBranch}`;
     return (
       <>
+        <ContextDetailRow
+          icon={GitBranch}
+          label="Branch"
+          value={
+            <span
+              className="block max-w-40 truncate"
+              data-testid="project-context-branch"
+              title={branchLabel}
+            >
+              {branchLabel}
+            </span>
+          }
+        />
         <ContextDetailRow
           icon={GitPullRequest}
           label="Status"
diff --git a/desktop/src/features/projects/ui/ProjectWorkItemGroup.tsx b/desktop/src/features/projects/ui/ProjectWorkItemGroup.tsx
index 90bfc5f813..e77e19ed00 100644
--- a/desktop/src/features/projects/ui/ProjectWorkItemGroup.tsx
+++ b/desktop/src/features/projects/ui/ProjectWorkItemGroup.tsx
@@ -19,13 +19,15 @@ export function ProjectWorkItemGroup({
 }) {
   return (
     <ProjectSelectableGroup
-      contentClassName="px-2"
+      contentClassName="px-4"
       count={count}
       groupKey={label}
+      headerClassName="mx-4 gap-3 px-4"
       headerTestId="project-work-item-group-header"
       icon={icon}
       items={items}
       label={label}
+      labelTestId="project-work-item-group-label"
       testId="project-work-item-group"
     >
       {children}
diff --git a/desktop/src/features/projects/ui/ProjectWorkItemRow.tsx b/desktop/src/features/projects/ui/ProjectWorkItemRow.tsx
index 7d2c5245e8..acf5412149 100644
--- a/desktop/src/features/projects/ui/ProjectWorkItemRow.tsx
+++ b/desktop/src/features/projects/ui/ProjectWorkItemRow.tsx
@@ -42,32 +42,66 @@ export function ProjectWorkItemRow({
   return (
     <article
       className={cn(
-        "group/work-item flex min-h-10 min-w-0 items-center gap-2 rounded-md px-2 py-2 transition-colors hover:bg-muted/30",
+        "group/work-item mx-2 flex min-h-10 min-w-0 items-center gap-3 rounded-md px-2 py-2 transition-colors hover:bg-muted/30",
         selected && "bg-muted/40",
       )}
       data-project-event-id={eventId}
       data-selected={selected ? "true" : undefined}
       data-testid={testId}
     >
-      {selection && projectSelection ? (
+      <span
+        className="relative flex h-4 w-4 shrink-0 items-center justify-center"
+        data-testid="project-work-item-leading-icon"
+      >
         <span
           className={cn(
-            "flex h-4 w-4 shrink-0 items-center justify-center opacity-0 group-hover/work-item:opacity-100 group-focus-within/work-item:opacity-100",
-            showSelectControl && "opacity-100",
+            "flex items-center justify-center opacity-80 transition-opacity",
+            selection &&
+              "group-hover/work-item:opacity-0 group-focus-within/work-item:opacity-0",
+            showSelectControl && "opacity-0",
           )}
+          data-testid="project-work-item-status-icon"
         >
-          <ProjectEntitySelectControl
-            checked={selected}
-            label={`Select ${selection.item.title}`}
-            onToggle={({ shiftKey }) =>
-              projectSelection.toggle(selection.item, {
-                rangeItems: selection.rangeItems,
-                shiftKey,
-              })
-            }
-          />
+          {statusIcon}
         </span>
-      ) : null}
+        {selection && projectSelection ? (
+          <span
+            className={cn(
+              "absolute inset-0 flex items-center justify-center opacity-0 transition-opacity group-hover/work-item:opacity-100 group-focus-within/work-item:opacity-100",
+              showSelectControl && "opacity-100",
+            )}
+          >
+            <ProjectEntitySelectControl
+              checked={selected}
+              label={`Select ${selection.item.title}`}
+              onToggle={({ shiftKey }) =>
+                projectSelection.toggle(selection.item, {
+                  rangeItems: selection.rangeItems,
+                  shiftKey,
+                })
+              }
+            />
+          </span>
+        ) : null}
+      </span>
+      {onOpen ? (
+        <button
+          className="min-w-0 flex-1 truncate rounded-sm text-left text-sm font-normal text-foreground transition-colors hover:text-primary focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring"
+          data-projects-text-priority="primary"
+          onClick={onOpen}
+          title={title}
+          type="button"
+        >
+          {title}
+        </button>
+      ) : (
+        <span
+          className="min-w-0 flex-1 truncate text-sm font-normal text-foreground"
+          data-projects-text-priority="primary"
+        >
+          {title}
+        </span>
+      )}
       {onOpen ? (
         <button
           className={cn(
@@ -94,30 +128,6 @@ export function ProjectWorkItemRow({
           {identifier}
         </span>
       )}
-      <span
-        className="flex h-4 w-4 shrink-0 items-center justify-center opacity-80"
-        data-testid="project-work-item-status-icon"
-      >
-        {statusIcon}
-      </span>
-      {onOpen ? (
-        <button
-          className="min-w-0 truncate rounded-sm text-left text-sm font-normal text-foreground transition-colors hover:text-primary focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring"
-          data-projects-text-priority="primary"
-          onClick={onOpen}
-          title={title}
-          type="button"
-        >
-          {title}
-        </button>
-      ) : (
-        <span
-          className="min-w-0 truncate text-sm font-normal text-foreground"
-          data-projects-text-priority="primary"
-        >
-          {title}
-        </span>
-      )}
       {metadata ? (
         <div
           className="hidden min-w-0 shrink items-center gap-1.5 overflow-hidden text-xs text-muted-foreground/60 lg:flex"
diff --git a/desktop/src/features/projects/ui/ProjectWorkspaceTabs.tsx b/desktop/src/features/projects/ui/ProjectWorkspaceTabs.tsx
index 4ef9ae3973..2c526900d3 100644
--- a/desktop/src/features/projects/ui/ProjectWorkspaceTabs.tsx
+++ b/desktop/src/features/projects/ui/ProjectWorkspaceTabs.tsx
@@ -1,5 +1,4 @@
 import {
-  BookOpen,
   CircleDot,
   Files as FilesIcon,
   GitCommitHorizontal,
@@ -27,6 +26,7 @@ import {
 } from "@/features/projects/lib/projectContributorMatching";
 import { repositoryDiscussionQuery } from "@/features/projects/lib/discussionChannels";
 import type { ProjectRepoHost } from "@/features/projects/lib/projectRepoHost";
+import { projectReviewFilesChangedBody } from "@/features/projects/lib/projectReviewDisplay";
 import { projectRepoUnavailableReason } from "@/features/projects/lib/projectRepoAvailability";
 import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import { normalizePubkey } from "@/shared/lib/pubkey";
@@ -62,6 +62,8 @@ import {
   type CreateIssueDialogInput,
 } from "./CreateIssueDialog";
 
+const SECTION_HEADER_CLASS = "mx-4 mb-2 rounded-xl bg-muted/40";
+
 type CreatePullRequestAction = {
   projects: Project[];
   reposDir?: string | null;
@@ -92,7 +94,6 @@ export function WorkspaceTabs({
   createIssueRequestKey,
   createPullRequestAction,
   createPullRequestRequestKey,
-  headerAction,
   updatePullRequestAction,
   initialTab,
   initialTabRequestKey,
@@ -107,6 +108,7 @@ export function WorkspaceTabs({
   repoDiffLoading,
   selectedCommitHash,
   selectedIssueId,
+  selectedPullRequest,
   selectedPullRequestId,
   sharedHeaderBackdrop,
   pullRequests,
@@ -117,7 +119,6 @@ export function WorkspaceTabs({
   onSelectedIssueIdChange,
   onSelectedPullRequestIdChange,
   onSelectedTabChange,
-  onBranchChange,
   onOpenMergeRecoveryTerminal,
   snapshot,
   snapshotError,
@@ -138,7 +139,6 @@ export function WorkspaceTabs({
   createIssueRequestKey?: number;
   createPullRequestAction?: CreatePullRequestAction;
   createPullRequestRequestKey?: number;
-  headerAction?: React.ReactNode;
   updatePullRequestAction?: UpdatePullRequestAction;
   /** Tab to open on mount (workspace vocabulary), e.g. from a share link. */
   initialTab?: string;
@@ -155,6 +155,7 @@ export function WorkspaceTabs({
   repoDiffLoading: boolean;
   selectedCommitHash: string | null;
   selectedIssueId: string | null;
+  selectedPullRequest: ProjectPullRequest | null;
   selectedPullRequestId: string | null;
   sharedHeaderBackdrop?: boolean;
   pullRequests: ProjectPullRequest[];
@@ -169,7 +170,6 @@ export function WorkspaceTabs({
   onSelectedPullRequestIdChange: (id: string | null) => void;
   /** Reports the active tab so the screen breadcrumb can mirror it. */
   onSelectedTabChange?: (tab: string) => void;
-  onBranchChange: (branch: string | null) => void;
   onOpenMergeRecoveryTerminal?: OpenMergeRecoveryTerminal;
   snapshot: ProjectRepoSnapshot | null | undefined;
   snapshotError: unknown;
@@ -210,13 +210,13 @@ export function WorkspaceTabs({
     repoSource === "remote" && repoHost.kind === "external"
       ? repoHost.host
       : undefined;
-  const gitDataState: GitDataState = displayedSnapshotLoading
-    ? "checking"
-    : externalHost || displayedSnapshotError || !displayedSnapshot
-      ? "unavailable"
-      : files.length === 0
-        ? "empty"
-        : "available";
+  const gitDataState: GitDataState = displayedSnapshot
+    ? files.length === 0
+      ? "empty"
+      : "available"
+    : displayedSnapshotLoading
+      ? "checking"
+      : "unavailable";
   const unavailableReason =
     gitDataState === "unavailable" && !externalHost
       ? repoSource === "remote"
@@ -239,10 +239,11 @@ export function WorkspaceTabs({
         retryPending={sourceControls?.fetchPending}
       />
     ) : null;
-  const selectedPullRequest =
-    pullRequests.find(
-      (pullRequest) => pullRequest.id === selectedPullRequestId,
-    ) ?? null;
+  const filesChangedBody = projectReviewFilesChangedBody({
+    hasPopulatedDiff: (repoDiff?.files.length ?? 0) > 0,
+    hasSelectedPullRequest: Boolean(selectedPullRequest),
+    repositoryUnavailable: Boolean(repositoryUnavailableState),
+  });
   const selectedCommitPullRequest = React.useMemo(
     () =>
       pullRequests.find(
@@ -302,11 +303,8 @@ export function WorkspaceTabs({
   React.useEffect(() => {
     if (isPullRequestSelected) {
       setSelectedTab("prs");
-      if (selectedPullRequest?.branchName) {
-        onBranchChange(selectedPullRequest.branchName);
-      }
     }
-  }, [isPullRequestSelected, onBranchChange, selectedPullRequest?.branchName]);
+  }, [isPullRequestSelected]);
 
   React.useEffect(() => {
     if (selectedIssueId) {
@@ -350,12 +348,18 @@ export function WorkspaceTabs({
     [selectedPullRequestId],
   );
   const sectionHeader =
-    selectedTab === "overview" && readmeFile ? (
-      <ProjectSectionHeader icon={BookOpen} title="README" />
-    ) : selectedTab === "files" && files.length > 0 ? (
-      <ProjectSectionHeader icon={FilesIcon} title="Files" />
+    selectedTab === "files" && files.length > 0 ? (
+      <ProjectSectionHeader
+        className={SECTION_HEADER_CLASS}
+        icon={FilesIcon}
+        title="Files"
+      />
     ) : selectedTab === "activity" && !selectedCommitHash ? (
-      <ProjectSectionHeader icon={GitCommitHorizontal} title="Commits" />
+      <ProjectSectionHeader
+        className={SECTION_HEADER_CLASS}
+        icon={GitCommitHorizontal}
+        title="Commits"
+      />
     ) : selectedTab === "issues" && !selectedIssueId ? (
       <ProjectSectionHeader
         action={{
@@ -363,6 +367,7 @@ export function WorkspaceTabs({
           label: "Create task",
           onClick: () => setCreateIssueOpen(true),
         }}
+        className={SECTION_HEADER_CLASS}
         icon={CircleDot}
         title="Tasks"
       />
@@ -376,18 +381,27 @@ export function WorkspaceTabs({
           onClick: () => setCreatePullRequestOpen(true),
           title: "Create review — choose a repository and branches to compare",
         }}
+        className={SECTION_HEADER_CLASS}
         icon={GitPullRequest}
         title="Reviews"
       />
     ) : selectedTab === "channels" ? (
-      <ProjectSectionHeader icon={Hash} title="Channels" />
+      <ProjectSectionHeader
+        className={SECTION_HEADER_CLASS}
+        icon={Hash}
+        title="Channels"
+      />
     ) : selectedTab === "contributors" ? (
-      <ProjectSectionHeader icon={Users} title="Contributors" />
+      <ProjectSectionHeader
+        className={SECTION_HEADER_CLASS}
+        icon={Users}
+        title="Contributors"
+      />
     ) : null;
 
   return (
     <Tabs
-      className="min-w-0 space-y-3"
+      className="flex min-w-0 flex-1 flex-col space-y-3"
       onValueChange={handleTabChange}
       value={selectedTab}
     >
@@ -415,14 +429,13 @@ export function WorkspaceTabs({
                   : "Update review"}
               </Button>
             ) : null}
-            {headerAction}
           </div>
         </div>
       ) : null}
       {/* Project content follows the same borderless flow as work-item details.
           Inner panels retain standalone chrome, neutralized here. */}
       <div
-        className="-mx-4 [&_[data-project-detail-panel]]:rounded-none [&_[data-project-detail-panel]]:border-0"
+        className="-mx-4 flex flex-1 flex-col [&_[data-project-detail-panel]]:rounded-none [&_[data-project-detail-panel]]:border-0"
         data-testid="project-workspace-panel"
       >
         {sectionHeader}
@@ -444,7 +457,10 @@ export function WorkspaceTabs({
           />
         </TabsContent>
 
-        <TabsContent className="m-0" value="activity">
+        <TabsContent
+          className="m-0 min-h-0 flex-1 flex-col data-[state=active]:flex"
+          value="activity"
+        >
           {repositoryUnavailableState ??
             (selectedCommitHash ? (
               <ProjectCommitDetailPanel
@@ -498,8 +514,7 @@ export function WorkspaceTabs({
             }
             error={pullRequestsError}
             filesChanged={
-              repositoryUnavailableState ??
-              (selectedPullRequest ? (
+              filesChangedBody === "files" && selectedPullRequest ? (
                 <ProjectPullRequestFilesChangedPanel
                   diff={repoDiff}
                   error={repoDiffError}
@@ -514,7 +529,9 @@ export function WorkspaceTabs({
                   project={project}
                   pullRequest={selectedPullRequest}
                 />
-              ) : undefined)
+              ) : filesChangedBody === "unavailable" ? (
+                repositoryUnavailableState
+              ) : undefined
             }
             filesCount={repoDiff?.files.length}
             forceOpenFiles={
@@ -528,7 +545,7 @@ export function WorkspaceTabs({
             profiles={profiles}
             project={project}
             pullRequests={pullRequests}
-            selectedPullRequestId={selectedPullRequestId}
+            selectedPullRequest={selectedPullRequest}
           />
         </TabsContent>
 
@@ -566,6 +583,7 @@ export function WorkspaceTabs({
                 files={files}
                 isLoading={displayedSnapshotLoading}
                 onContextChange={onFilesContextChange}
+                onOpenCommit={onSelectedCommitHashChange}
                 profiles={profiles}
                 snapshot={displayedSnapshot}
                 unavailableMessage={
diff --git a/desktop/src/features/projects/ui/ProjectsAgentPromptPage.tsx b/desktop/src/features/projects/ui/ProjectsAgentPromptPage.tsx
index 81c1459f97..9a465d3da0 100644
--- a/desktop/src/features/projects/ui/ProjectsAgentPromptPage.tsx
+++ b/desktop/src/features/projects/ui/ProjectsAgentPromptPage.tsx
@@ -43,6 +43,8 @@ import { useProfileQuery, useUsersBatchQuery } from "@/features/profile/hooks";
 import type { Project } from "@/features/projects/hooks";
 import { AgentContextPayloadPreview } from "./AgentContextPayloadPreview";
 import {
+  PROJECT_WORKSPACE_CONTEXT_MARKER,
+  splitProjectDetailAgentContext,
   UNTRUSTED_CONTEXT_NOTICE,
   untrustedPromptValue,
 } from "@/features/projects/lib/projectDetailAgentContext";
@@ -70,6 +72,7 @@ import {
 import { cn } from "@/shared/lib/cn";
 import { normalizePubkey } from "@/shared/lib/pubkey";
 import { Button } from "@/shared/ui/button";
+import { ProjectAgentSubmittedContextPill } from "./ProjectAgentSubmittedContextPill";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -94,7 +97,6 @@ type ProjectAgentConversation = {
 };
 
 const MAX_CONTEXT_REPOS = 8;
-const REPO_CONTEXT_MARKER = "Workspace repositories:";
 
 /** Compact machine-readable footer so the agent can scope git queries
  * (repo announcements are addressable by these coordinates). Only sent
@@ -119,7 +121,7 @@ function repoContextBlock(projects: readonly Project[]) {
         `- ${untrustedPromptValue(repository.label)} (address: ${untrustedPromptValue(repository.repoAddress, 400)})`,
     );
   const remaining = repositories.length - listed.length;
-  return ["", "---", REPO_CONTEXT_MARKER, ...listed]
+  return ["", "---", PROJECT_WORKSPACE_CONTEXT_MARKER, ...listed]
     .concat(remaining > 0 ? [`…and ${remaining} more`] : [])
     .concat([UNTRUSTED_CONTEXT_NOTICE])
     .join("\n");
@@ -203,11 +205,9 @@ export function useAgentCandidates() {
 }
 
 /** Live message feed for the conversation's backing DM channel, reduced to
- * plain chat rows (kind 9 / 40002 only). The user's own messages render
- * verbatim — including any machine-appended context footer — so the exact
- * payload signed under the user's identity is always visible. Hiding it
- * while sending it would let relay-controlled metadata ride invisibly on
- * the user's signature. */
+ * plain chat rows (kind 9 / 40002 only). Machine-appended context stays
+ * inspectable beside the user's message, but defaults to a compact disclosure
+ * so the transcript foregrounds what the user actually typed. */
 export function ConversationThread({
   channel,
   agent,
@@ -276,26 +276,47 @@ export function ConversationThread({
       selfAvatarUrl,
     ],
   );
-  const messages = React.useMemo(() => {
+  const conversationMessages = React.useMemo(() => {
     const events = mergeProjectAgentConversationEvents(
       messagesQuery.data ?? [],
       threadReplies.events,
     );
-    return formatTimelineMessages(
+    const contexts = new Map<string, string>();
+    const messages = formatTimelineMessages(
       events,
       channel,
       currentPubkey ?? undefined,
       selfAvatarUrl,
       profiles,
-    ).filter(
-      (message) =>
-        (message.kind === KIND_STREAM_MESSAGE ||
-          message.kind === KIND_STREAM_MESSAGE_V2) &&
-        isAtOrAfterConversationOpener(
-          { created_at: message.createdAt, id: message.id, tags: message.tags },
-          opener,
-        ),
-    );
+    )
+      .filter(
+        (message) =>
+          (message.kind === KIND_STREAM_MESSAGE ||
+            message.kind === KIND_STREAM_MESSAGE_V2) &&
+          isAtOrAfterConversationOpener(
+            {
+              created_at: message.createdAt,
+              id: message.id,
+              tags: message.tags,
+            },
+            opener,
+          ),
+      )
+      .map((message) => {
+        const authorPubkey = message.signerPubkey ?? message.pubkey;
+        if (
+          !normalizedCurrent ||
+          !authorPubkey ||
+          normalizePubkey(authorPubkey) !== normalizedCurrent
+        ) {
+          return message;
+        }
+        const split = splitProjectDetailAgentContext(message.body);
+        if (!split.context) return message;
+        contexts.set(message.id, split.context);
+        return { ...message, body: split.message };
+      });
+    return { contexts, messages };
   }, [
     channel,
     currentPubkey,
@@ -304,7 +325,18 @@ export function ConversationThread({
     selfAvatarUrl,
     threadReplies.events,
     opener,
+    normalizedCurrent,
   ]);
+  const messages = conversationMessages.messages;
+  const renderSubmittedContext = React.useCallback(
+    (message: TimelineMessage) => {
+      const payload = conversationMessages.contexts.get(message.id);
+      return payload ? (
+        <ProjectAgentSubmittedContextPill payload={payload} />
+      ) : null;
+    },
+    [conversationMessages.contexts],
+  );
   const lastMessageId = messages[messages.length - 1]?.id ?? null;
   const handleToggleReaction = React.useCallback(
     async (message: TimelineMessage, emoji: string, remove: boolean) => {
@@ -329,6 +361,7 @@ export function ConversationThread({
         messages={messages}
         onToggleReaction={handleToggleReaction}
         profiles={profiles}
+        renderAfterMessage={renderSubmittedContext}
       />
       {agentWorking.working ? (
         <div className="flex items-center gap-2 pl-11 text-sm text-muted-foreground">
diff --git a/desktop/src/features/projects/ui/ProjectsChannelsList.tsx b/desktop/src/features/projects/ui/ProjectsChannelsList.tsx
index ce1c723dc1..b2904afc4e 100644
--- a/desktop/src/features/projects/ui/ProjectsChannelsList.tsx
+++ b/desktop/src/features/projects/ui/ProjectsChannelsList.tsx
@@ -124,6 +124,7 @@ export function ProjectsChannelsList({ projects }: { projects: Project[] }) {
         <ProjectSelectableGroup
           count={group.rows.length}
           groupKey={group.projectId}
+          headerClassName="mx-0 gap-3 px-4"
           headerTestId="projects-channel-project-group-header"
           icon={<FolderKanban className="h-4 w-4" />}
           items={group.rows.flatMap((row) => {
diff --git a/desktop/src/features/projects/ui/ProjectsContributionGraph.tsx b/desktop/src/features/projects/ui/ProjectsContributionGraph.tsx
deleted file mode 100644
index 64d3430fe6..0000000000
--- a/desktop/src/features/projects/ui/ProjectsContributionGraph.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import { cn } from "@/shared/lib/cn";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/shared/ui/tooltip";
-
-const WEEK_COUNT = 26;
-const DAYS_PER_WEEK = 7;
-
-// Intensity ramp shared by the cells and the legend dots.
-// Tints of the theme's primary token: the most active cells are fully
-// saturated primary, quieter days fade toward the muted background.
-const LEVEL_CLASSES = [
-  "bg-muted/40 dark:bg-muted/30",
-  "bg-primary/25",
-  "bg-primary/50",
-  "bg-primary/75",
-  "bg-primary",
-];
-
-// Descriptors matching the thresholds in `levelFor`.
-const LEVEL_LABELS = [
-  "No activity",
-  "1–2 events",
-  "3–5 events",
-  "6–9 events",
-  "10+ events",
-];
-
-/** Activity intensity legend shared with the contribution graph header. */
-export function ProjectsContributionLegend() {
-  return (
-    <div className="flex items-center gap-1.5">
-      {LEVEL_CLASSES.map((levelClass, level) => (
-        <Tooltip key={levelClass}>
-          <TooltipTrigger asChild>
-            <span className={cn("h-2.5 w-2.5 rounded", levelClass)} />
-          </TooltipTrigger>
-          <TooltipContent>{LEVEL_LABELS[level]}</TooltipContent>
-        </Tooltip>
-      ))}
-    </div>
-  );
-}
-
-function dayKeyOf(date: Date) {
-  const month = `${date.getMonth() + 1}`.padStart(2, "0");
-  const day = `${date.getDate()}`.padStart(2, "0");
-  return `${date.getFullYear()}-${month}-${day}`;
-}
-
-function levelFor(count: number) {
-  if (count <= 0) return 0;
-  if (count <= 2) return 1;
-  if (count <= 5) return 2;
-  if (count <= 9) return 3;
-  return 4;
-}
-
-/** Week columns (each 7 days, Sunday first) ending with the current week. */
-function buildWeeks(today: Date, weekCount: number) {
-  const start = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() - today.getDay() - (weekCount - 1) * DAYS_PER_WEEK,
-  );
-
-  return Array.from({ length: weekCount }, (_, weekIndex) =>
-    Array.from({ length: DAYS_PER_WEEK }, (_, dayIndex) => {
-      const date = new Date(start);
-      date.setDate(start.getDate() + weekIndex * DAYS_PER_WEEK + dayIndex);
-      return date;
-    }),
-  );
-}
-
-// Minimum columns between labels so adjacent months never overlap.
-const MIN_LABEL_GAP = 3;
-
-function monthLabels(weeks: Date[][]) {
-  let lastLabeledIndex = -MIN_LABEL_GAP;
-  return weeks.map((week, index) => {
-    const isNewMonth =
-      index === 0 || week[0].getMonth() !== weeks[index - 1][0].getMonth();
-    if (!isNewMonth || index - lastLabeledIndex < MIN_LABEL_GAP) return "";
-    lastLabeledIndex = index;
-    return week[0].toLocaleDateString(undefined, { month: "short" });
-  });
-}
-
-/**
- * GitHub-style activity heatmap for the last 26 weeks, fed by per-day
- * activity counts (see `ProjectActivitySummary.activityByDay`).
- */
-export function ProjectsContributionGraph({
-  activityByDay,
-  className,
-  compact = false,
-}: {
-  activityByDay: Record<string, number>;
-  className?: string;
-  compact?: boolean;
-}) {
-  const today = new Date();
-  const weeks = buildWeeks(today, compact ? 18 : WEEK_COUNT);
-  const labels = monthLabels(weeks);
-  const gridTemplateColumns = `repeat(${weeks.length}, minmax(0, 1fr))`;
-  const todayKey = dayKeyOf(today);
-
-  return (
-    <div className={cn("space-y-2", className)}>
-      <div
-        className={cn("grid", compact ? "gap-1" : "gap-2")}
-        style={{ gridTemplateColumns }}
-      >
-        {labels.map((label, index) => (
-          <span
-            className="overflow-visible whitespace-nowrap text-2xs font-medium text-muted-foreground"
-            // Columns are positional; labels have no stable content key.
-            // biome-ignore lint/suspicious/noArrayIndexKey: fixed-size grid
-            key={index}
-          >
-            {label}
-          </span>
-        ))}
-      </div>
-      <div
-        className={cn(
-          "grid grid-flow-col grid-rows-7",
-          compact ? "gap-1" : "gap-2",
-        )}
-        style={{ gridTemplateColumns }}
-      >
-        {weeks.map((week) =>
-          week.map((day) => {
-            const key = dayKeyOf(day);
-            if (key > todayKey) {
-              return (
-                <span
-                  aria-hidden
-                  className="aspect-square rounded-[22%] border border-border/40 dark:border-border/30"
-                  key={key}
-                />
-              );
-            }
-            const count = activityByDay[key] ?? 0;
-            const dateLabel = day.toLocaleDateString(undefined, {
-              month: "short",
-              day: "numeric",
-            });
-            return (
-              <Tooltip key={key}>
-                <TooltipTrigger asChild>
-                  <span
-                    className={cn(
-                      "aspect-square w-full rounded-[22%]",
-                      LEVEL_CLASSES[levelFor(count)],
-                    )}
-                  />
-                </TooltipTrigger>
-                <TooltipContent>
-                  {count > 0
-                    ? `${count} ${count === 1 ? "event" : "events"} · ${dateLabel}`
-                    : `No activity · ${dateLabel}`}
-                </TooltipContent>
-              </Tooltip>
-            );
-          }),
-        )}
-      </div>
-    </div>
-  );
-}
diff --git a/desktop/src/features/projects/ui/ProjectsIssuesList.tsx b/desktop/src/features/projects/ui/ProjectsIssuesList.tsx
index 542678b415..9778d5b2b3 100644
--- a/desktop/src/features/projects/ui/ProjectsIssuesList.tsx
+++ b/desktop/src/features/projects/ui/ProjectsIssuesList.tsx
@@ -253,6 +253,7 @@ export function ProjectsIssuesList({
             <ProjectSelectableGroup
               count={group.rows.length}
               groupKey={group.project.id}
+              headerClassName="mx-0 gap-3 px-4"
               headerTestId="projects-issue-project-group-header"
               icon={<FolderKanban className="h-4 w-4" />}
               items={groupSelectionItems}
diff --git a/desktop/src/features/projects/ui/ProjectsListHeaderBar.tsx b/desktop/src/features/projects/ui/ProjectsListHeaderBar.tsx
index 92eb2c150e..9958713397 100644
--- a/desktop/src/features/projects/ui/ProjectsListHeaderBar.tsx
+++ b/desktop/src/features/projects/ui/ProjectsListHeaderBar.tsx
@@ -7,7 +7,6 @@ import type {
 } from "@/features/projects/lib/projectsViewHelpers";
 import { ProjectsListScopeDropdown } from "@/features/projects/ui/ProjectsListScopeDropdown";
 import { ProjectsViewModeToggle } from "@/features/projects/ui/ProjectsToolbar";
-import { cn } from "@/shared/lib/cn";
 
 const PROJECT_SCOPE_OPTIONS: Array<{
   label: string;
@@ -56,18 +55,11 @@ type ProjectsListHeaderBarProps = {
   pullRequestScope: ProjectsWorkItemScope;
   repositoryScope: ProjectsRepositoryScope;
   sort: ProjectsSort;
-  /**
-   * "row" renders as the first row of the list table (no chrome of its own —
-   * the surrounding container provides border and rounding); "bar" renders as
-   * a standalone rounded bar with identical proportions for the card grid.
-   */
-  variant: "bar" | "row";
   viewMode: ProjectsViewMode;
 };
 
 /**
- * Header for the Projects lists: scope selector on the left, sort + view
- * toggle on the right.
+ * Compact controls rendered in the Projects section header.
  */
 export function ProjectsListHeaderBar({
   filter,
@@ -80,7 +72,6 @@ export function ProjectsListHeaderBar({
   pullRequestScope,
   repositoryScope,
   sort,
-  variant,
   viewMode,
 }: ProjectsListHeaderBarProps) {
   const scopeDropdown =
@@ -116,35 +107,26 @@ export function ProjectsListHeaderBar({
 
   return (
     <div
-      className={cn(
-        "flex flex-wrap items-center justify-between gap-2 bg-muted/20 px-3 py-1.5",
-        variant === "bar"
-          ? "rounded-xl border border-border/60"
-          : "border-b border-border/60",
-      )}
+      className="ml-auto flex flex-wrap items-center justify-end gap-2"
       data-testid="projects-list-header"
     >
-      <div className="flex flex-wrap items-center gap-2">{scopeDropdown}</div>
-      <div className="flex flex-wrap items-center gap-2">
-        <label className="flex items-center gap-2 text-xs text-muted-foreground">
-          <span className="sr-only">Sort projects</span>
-          <select
-            className="h-8 rounded-md bg-transparent px-2 text-xs text-foreground outline-hidden hover:bg-muted/50 focus:ring-1 focus:ring-ring"
-            onChange={(event) =>
-              onSortChange(event.target.value as ProjectsSort)
-            }
-            value={sort}
-          >
-            <option value="updated">Recent activity</option>
-            <option value="created">Created date</option>
-            <option value="name">Name</option>
-          </select>
-        </label>
-        <ProjectsViewModeToggle
-          onViewModeChange={onViewModeChange}
-          viewMode={viewMode}
-        />
-      </div>
+      {scopeDropdown}
+      <label className="flex items-center gap-2 text-xs text-muted-foreground">
+        <span className="sr-only">Sort projects</span>
+        <select
+          className="h-8 rounded-md bg-transparent px-2 text-xs text-foreground outline-hidden hover:bg-muted/50 focus:ring-1 focus:ring-ring"
+          onChange={(event) => onSortChange(event.target.value as ProjectsSort)}
+          value={sort}
+        >
+          <option value="updated">Recent activity</option>
+          <option value="created">Created date</option>
+          <option value="name">Name</option>
+        </select>
+      </label>
+      <ProjectsViewModeToggle
+        onViewModeChange={onViewModeChange}
+        viewMode={viewMode}
+      />
     </div>
   );
 }
diff --git a/desktop/src/features/projects/ui/ProjectsOverviewChromeActions.tsx b/desktop/src/features/projects/ui/ProjectsOverviewChromeActions.tsx
new file mode 100644
index 0000000000..ba7cce9a81
--- /dev/null
+++ b/desktop/src/features/projects/ui/ProjectsOverviewChromeActions.tsx
@@ -0,0 +1,62 @@
+import { Info, MessageCircle } from "lucide-react";
+
+import { cn } from "@/shared/lib/cn";
+import { Button } from "@/shared/ui/button";
+
+export function ProjectsOverviewChromeActions({
+  chatOpen,
+  contextOpen,
+  onToggleChat,
+  onToggleContext,
+  sectionTitle,
+}: {
+  chatOpen: boolean;
+  contextOpen: boolean;
+  onToggleChat: () => void;
+  onToggleContext: () => void;
+  sectionTitle: string;
+}) {
+  return (
+    <>
+      <Button
+        aria-label={`Chat with an agent about ${sectionTitle}`}
+        aria-pressed={chatOpen}
+        className="h-7 w-7 text-sidebar-foreground hover:bg-sidebar-accent"
+        data-testid="projects-overview-chat-toggle"
+        onClick={onToggleChat}
+        size="icon"
+        title={`Chat with an agent about ${sectionTitle}`}
+        type="button"
+        variant="ghost"
+      >
+        <MessageCircle
+          className={cn(
+            "h-4 w-4 transition-opacity duration-200 ease-linear",
+            chatOpen ? "opacity-100" : "opacity-60",
+          )}
+        />
+      </Button>
+      <Button
+        aria-label={
+          contextOpen ? "Hide project context" : "Show project context"
+        }
+        aria-pressed={contextOpen}
+        className="h-7 w-7 text-sidebar-foreground hover:bg-sidebar-accent"
+        data-testid="projects-overview-context-toggle"
+        onClick={onToggleContext}
+        size="icon"
+        title={contextOpen ? "Hide project context" : "Show project context"}
+        type="button"
+        variant="ghost"
+      >
+        <Info
+          className={cn(
+            "h-4 w-4 transition-opacity duration-200 ease-linear",
+            contextOpen ? "opacity-100" : "opacity-60",
+          )}
+          data-testid="projects-overview-context-icon"
+        />
+      </Button>
+    </>
+  );
+}
diff --git a/desktop/src/features/projects/ui/ProjectsOverviewPanel.tsx b/desktop/src/features/projects/ui/ProjectsOverviewPanel.tsx
index 81d1e954a8..f15532cf9f 100644
--- a/desktop/src/features/projects/ui/ProjectsOverviewPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectsOverviewPanel.tsx
@@ -26,15 +26,14 @@ import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import { Button } from "@/shared/ui/button";
 import { ProjectsCreateMenu } from "./ProjectsCreateMenu";
 import { ProjectsSelectionCountMenu } from "./ProjectsSelectionCountMenu";
+import { useCommunities } from "@/features/communities/useCommunities";
+import { useActiveCommunityIcon } from "@/features/communities/useCommunityIcons";
 import {
   type OverviewContextStatIcon,
   type ProjectsOverviewSection,
   projectsOverviewContext,
 } from "./projectsOverviewContext";
-import {
-  ProjectsOverviewActivityGraph,
-  ProjectsOverviewPeople,
-} from "./ProjectsOverviewRail";
+import { ProjectsOverviewPeople } from "./ProjectsOverviewRail";
 
 export type { ProjectsOverviewSection };
 
@@ -130,11 +129,34 @@ export function ProjectsOverviewPanel({
 }
 
 export function ProjectsActivityIntro() {
+  const { activeCommunity } = useCommunities();
+  const communityIconQuery = useActiveCommunityIcon(activeCommunity?.relayUrl);
+  const communityIcon = communityIconQuery.data ?? null;
+
   return (
     <section
-      className="pb-8 pt-5 text-center"
+      className="pb-8 pt-16 text-center"
       data-testid="projects-activity-intro"
     >
+      <div
+        aria-label={`${activeCommunity?.name ?? "Current"} relay`}
+        className="mx-auto mb-3 flex h-10 w-10 items-center justify-center overflow-hidden rounded-xl text-4xl"
+        data-testid="projects-activity-relay-icon"
+        role="img"
+      >
+        {communityIcon ? (
+          <img
+            alt=""
+            className="h-full w-full object-cover"
+            draggable={false}
+            src={communityIcon}
+          />
+        ) : (
+          <span aria-hidden="true" className="-translate-y-px leading-none">
+            🐝
+          </span>
+        )}
+      </div>
       <h2
         className="text-xl font-semibold tracking-tight text-foreground"
         data-testid="projects-page-header"
@@ -235,19 +257,12 @@ export function ProjectsOverviewContextPanel({
                 ))}
               </section>
             </div>
-            {context.people.length > 0 || context.activityByDay ? (
+            {context.people.length > 0 ? (
               <div className="mt-3 space-y-3 py-3">
                 <ProjectsOverviewPeople
                   people={context.people}
                   profiles={profiles}
                 />
-                {context.activityByDay ? (
-                  <div data-testid="projects-overview-activity">
-                    <ProjectsOverviewActivityGraph
-                      activityByDay={context.activityByDay}
-                    />
-                  </div>
-                ) : null}
               </div>
             ) : null}
           </>
diff --git a/desktop/src/features/projects/ui/ProjectsOverviewRail.tsx b/desktop/src/features/projects/ui/ProjectsOverviewRail.tsx
index c4380f684d..edc7077c5b 100644
--- a/desktop/src/features/projects/ui/ProjectsOverviewRail.tsx
+++ b/desktop/src/features/projects/ui/ProjectsOverviewRail.tsx
@@ -8,7 +8,6 @@ import { cn } from "@/shared/lib/cn";
 import { normalizePubkey } from "@/shared/lib/pubkey";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/shared/ui/tooltip";
 import { UserAvatar } from "@/shared/ui/UserAvatar";
-import { ProjectsContributionGraph } from "./ProjectsContributionGraph";
 
 /** Matches Tailwind `-space-x-1.5` so stacked rows stay zoom-safe. */
 const STACK_OVERLAP_REM = 0.375;
@@ -180,11 +179,3 @@ export function ProjectsOverviewPeople({
     </div>
   );
 }
-
-export function ProjectsOverviewActivityGraph({
-  activityByDay,
-}: {
-  activityByDay: Record<string, number>;
-}) {
-  return <ProjectsContributionGraph activityByDay={activityByDay} compact />;
-}
diff --git a/desktop/src/features/projects/ui/ProjectsPullRequestsList.tsx b/desktop/src/features/projects/ui/ProjectsPullRequestsList.tsx
index 04f6c41d65..02f9d1059e 100644
--- a/desktop/src/features/projects/ui/ProjectsPullRequestsList.tsx
+++ b/desktop/src/features/projects/ui/ProjectsPullRequestsList.tsx
@@ -256,6 +256,7 @@ export function ProjectsPullRequestsList({
             <ProjectSelectableGroup
               count={group.rows.length}
               groupKey={group.project.id}
+              headerClassName="mx-0 gap-3 px-4"
               headerTestId="projects-review-project-group-header"
               icon={<FolderKanban className="h-4 w-4" />}
               items={groupSelectionItems}
diff --git a/desktop/src/features/projects/ui/ProjectsView.tsx b/desktop/src/features/projects/ui/ProjectsView.tsx
index ac4a8dde23..a452ce4035 100644
--- a/desktop/src/features/projects/ui/ProjectsView.tsx
+++ b/desktop/src/features/projects/ui/ProjectsView.tsx
@@ -31,7 +31,6 @@ import {
 } from "@/features/projects/lib/projectRepoHost";
 import { ProjectsActivityFeed } from "@/features/projects/ui/ProjectsActivityFeed";
 import { ProjectsChannelsList } from "@/features/projects/ui/ProjectsChannelsList";
-import { ProjectsOverviewChatToggle } from "@/features/projects/ui/ProjectsOverviewChatToggle";
 import {
   ProjectsOverviewContextSheet,
   ProjectsOverviewNarrowContextToggle,
@@ -41,6 +40,7 @@ import {
   ProjectsOverviewContextPanel,
   ProjectsOverviewPanel,
 } from "@/features/projects/ui/ProjectsOverviewPanel";
+import { ProjectsOverviewChromeActions } from "@/features/projects/ui/ProjectsOverviewChromeActions";
 import { ProjectContextRail } from "@/features/projects/ui/ProjectContextRail";
 import {
   openAppSearch,
@@ -136,8 +136,6 @@ export function ProjectsView() {
       : storedFilter;
   });
   const [overviewPanelOpen, setOverviewPanelOpen] = React.useState(true);
-  // Narrow layouts present the same context as a dismissible sheet instead of
-  // the docked rail; the sheet starts closed so resizing never pops a modal.
   const [narrowContextOpen, setNarrowContextOpen] = React.useState(false);
   const contextToggleRef = React.useRef<HTMLButtonElement | null>(null);
   const isNarrowProjectsLayout = useMediaBreakpoint(
@@ -640,7 +638,6 @@ export function ProjectsView() {
   const listHeaderBar = (
     <ProjectsListHeaderBar
       filter={filter}
-      variant="bar"
       issueScope={issueScope}
       onIssueScopeChange={handleIssueScopeChange}
       onPullRequestScopeChange={handlePullRequestScopeChange}
@@ -705,22 +702,31 @@ export function ProjectsView() {
       ) ?? [],
     summaries: activitySummariesQuery.data,
   };
-  const overviewDetached = overviewPanelOpen && !isNarrowProjectsLayout;
   const contextOpen = isNarrowProjectsLayout
     ? narrowContextOpen
     : overviewPanelOpen;
-  const chromeActions = (
-    <>
-      <ProjectsOverviewNarrowContextToggle
-        onToggle={() =>
-          isNarrowProjectsLayout
-            ? setNarrowContextOpen((open) => !open)
-            : setOverviewPanelOpen((open) => !open)
-        }
-        open={contextOpen}
-        ref={contextToggleRef}
-      />
-    </>
+  const overviewChatOpen =
+    selectionAgentContext !== null && !isNarrowProjectsLayout;
+  const overviewContextOpen = overviewPanelOpen && !isNarrowProjectsLayout;
+  const overviewDetached = overviewContextOpen || overviewChatOpen;
+  const chromeActions = isNarrowProjectsLayout ? (
+    <ProjectsOverviewNarrowContextToggle
+      onToggle={() => setNarrowContextOpen((open) => !open)}
+      open={contextOpen}
+      ref={contextToggleRef}
+    />
+  ) : (
+    <ProjectsOverviewChromeActions
+      chatOpen={overviewChatOpen}
+      contextOpen={overviewPanelOpen}
+      onToggleChat={() =>
+        setSelectionAgentContext((context) =>
+          context ? null : overviewAgentContext,
+        )
+      }
+      onToggleContext={() => setOverviewPanelOpen((open) => !open)}
+      sectionTitle={projectsSectionTitle(filter)}
+    />
   );
 
   return (
@@ -842,19 +848,10 @@ export function ProjectsView() {
                           onFilterChange={handleFilterChange}
                         />
                       </div>
-                      <ProjectsOverviewChatToggle
-                        active={selectionAgentContext !== null}
-                        onToggle={() =>
-                          setSelectionAgentContext((context) =>
-                            context ? null : overviewAgentContext,
-                          )
-                        }
-                        sectionTitle={projectsSectionTitle(filter)}
-                      />
                     </div>
                     <div
                       className={
-                        filter === "all" ? "mx-auto w-full max-w-xl" : "w-full"
+                        filter === "all" ? "mx-auto w-full max-w-2xl" : "w-full"
                       }
                     >
                       {filter === "all" ? (
@@ -867,14 +864,16 @@ export function ProjectsView() {
                       ) : (
                         <>
                           <ProjectSectionHeader
-                            className="-mx-4"
+                            className="mb-2 rounded-xl bg-muted/40"
                             icon={projectsSectionIcon(filter)}
                             testId="projects-page-header"
                             title={projectsSectionTitle(filter)}
+                            trailing={
+                              filter === "channels" ? undefined : listHeaderBar
+                            }
                           />
                           <section>
                             <div className="space-y-3">
-                              {filter === "channels" ? null : listHeaderBar}
                               {filter === "prs" ? (
                                 <ProjectsPullRequestsList
                                   embedded={viewMode === "list"}
@@ -933,20 +932,29 @@ export function ProjectsView() {
                 </div>
               </div>
             </div>
-            {selectionAgentContext && !isNarrowProjectsLayout ? (
-              <ProjectAgentChatPanel
-                canResetWidth={overviewAgentPanelWidth.canReset}
-                context={selectionAgentContext}
-                onClose={() => setSelectionAgentContext(null)}
-                onResetWidth={overviewAgentPanelWidth.onResetWidth}
-                onResizeStart={overviewAgentPanelWidth.onResizeStart}
-                widthPx={overviewAgentPanelWidth.widthPx}
-              />
-            ) : null}
           </div>
         </div>
         <ProjectContextRail
-          open={overviewDetached}
+          open={overviewChatOpen}
+          panelWidthPx={overviewAgentPanelWidth.widthPx}
+          resizing={overviewAgentPanelWidth.isResizing}
+          testId="projects-overview-agent-rail"
+        >
+          {selectionAgentContext ? (
+            <ProjectAgentChatPanel
+              canResetWidth={overviewAgentPanelWidth.canReset}
+              constrainToAvailableSpace={false}
+              context={selectionAgentContext}
+              detached
+              onClose={() => setSelectionAgentContext(null)}
+              onResetWidth={overviewAgentPanelWidth.onResetWidth}
+              onResizeStart={overviewAgentPanelWidth.onResizeStart}
+              widthPx={overviewAgentPanelWidth.widthPx}
+            />
+          ) : null}
+        </ProjectContextRail>
+        <ProjectContextRail
+          open={overviewContextOpen}
           panelWidthPx={PROJECT_CONTEXT_PANEL_DEFAULT_WIDTH_PX}
           testId="projects-overview-context-rail"
         >
diff --git a/desktop/src/features/projects/ui/PullRequestMetaRail.tsx b/desktop/src/features/projects/ui/PullRequestMetaRail.tsx
index d0f3702772..449fe2ab39 100644
--- a/desktop/src/features/projects/ui/PullRequestMetaRail.tsx
+++ b/desktop/src/features/projects/ui/PullRequestMetaRail.tsx
@@ -81,16 +81,22 @@ export function PullRequestMetaHeader({
             <span className="truncate text-foreground">{targetBranch}</span>
           </p>
           <div className="ml-auto flex shrink-0 items-center gap-1.5">
-            {displayedDiffStats ? (
-              <>
-                <span className="text-green-500">
-                  +{displayedDiffStats.additions}
+            <span className="inline-flex min-w-20 justify-end gap-1.5 tabular-nums">
+              {displayedDiffStats ? (
+                <>
+                  <span className="text-green-500">
+                    +{displayedDiffStats.additions}
+                  </span>
+                  <span className="text-destructive">
+                    -{displayedDiffStats.deletions}
+                  </span>
+                </>
+              ) : (
+                <span aria-hidden className="invisible">
+                  +0 -0
                 </span>
-                <span className="text-destructive">
-                  -{displayedDiffStats.deletions}
-                </span>
-              </>
-            ) : null}
+              )}
+            </span>
             {pullRequest.commit ? (
               <span className="inline-flex min-w-0 items-center gap-0.5 text-muted-foreground">
                 <code
diff --git a/desktop/src/features/projects/ui/PullRequestReviewersRow.tsx b/desktop/src/features/projects/ui/PullRequestReviewersRow.tsx
index 83e2b4c1f7..a79a705a5b 100644
--- a/desktop/src/features/projects/ui/PullRequestReviewersRow.tsx
+++ b/desktop/src/features/projects/ui/PullRequestReviewersRow.tsx
@@ -289,63 +289,83 @@ export function PullRequestReviewersRow({
 
   return (
     <ProjectDetailMetaRow icon={Users} label="Reviewers">
-      <div className="grid min-w-0 gap-1">
-        <div className="flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1">
-          {showSummary ? (
-            <span className="font-medium" data-testid={summaryTestId}>
+      <div
+        className="flex min-w-0 items-center gap-2"
+        data-testid="project-reviewers-content"
+      >
+        <div className="flex min-w-0 flex-1 items-center gap-2 overflow-hidden whitespace-nowrap">
+          {showSummary && displayedDecisionActors.length === 0 ? (
+            <span className="truncate font-medium" data-testid={summaryTestId}>
               {reviewSummary}
             </span>
           ) : null}
+          {displayedDecisionActors.map((pubkey, index) => {
+            const label = labelForPubkey(pubkey, profiles);
+            const hasApproved = approvedBy.has(pubkey);
+            const hasRequestedChanges = changesRequestedBy.has(pubkey);
+            const needsRereview = staleDecisionActors.has(pubkey);
+            const DecisionIcon = hasApproved
+              ? Check
+              : hasRequestedChanges
+                ? TriangleAlert
+                : needsRereview
+                  ? History
+                  : null;
+            const decisionLabel = hasApproved
+              ? `Approved by ${label}`
+              : hasRequestedChanges
+                ? `Changes requested by ${label}`
+                : needsRereview
+                  ? `Re-review needed from ${label}`
+                  : `Awaiting review from ${label}`;
+            return (
+              <React.Fragment key={pubkey}>
+                {index > 0 ? (
+                  <span
+                    aria-hidden="true"
+                    className="shrink-0 text-muted-foreground/50"
+                  >
+                    ·
+                  </span>
+                ) : null}
+                <span
+                  className={cn(
+                    "flex min-w-0 shrink items-center gap-1 text-sm",
+                    hasApproved && "text-green-600 dark:text-green-400",
+                    hasRequestedChanges && "text-amber-600 dark:text-amber-400",
+                    !hasApproved &&
+                      !hasRequestedChanges &&
+                      "text-muted-foreground",
+                  )}
+                  data-testid="project-reviewer-decision"
+                  title={decisionLabel}
+                >
+                  <span className="sr-only">{decisionLabel}</span>
+                  {DecisionIcon ? (
+                    <DecisionIcon
+                      aria-hidden="true"
+                      className="h-3.5 w-3.5 shrink-0"
+                    />
+                  ) : null}
+                  <span
+                    aria-hidden="true"
+                    className="truncate"
+                    data-testid="project-reviewer-name"
+                  >
+                    {label}
+                  </span>
+                </span>
+              </React.Fragment>
+            );
+          })}
           {hasHistoricalDecision ? (
-            <span className="flex items-center gap-1 text-xs text-amber-600 dark:text-amber-400">
+            <span className="flex min-w-0 items-center gap-1 truncate text-xs text-amber-600 dark:text-amber-400">
               <History className="h-3.5 w-3.5 shrink-0" />
               Earlier decision applies to another commit
             </span>
           ) : null}
-          {requestAction}
         </div>
-        {displayedDecisionActors.map((pubkey) => {
-          const label = labelForPubkey(pubkey, profiles);
-          const hasApproved = approvedBy.has(pubkey);
-          const hasRequestedChanges = changesRequestedBy.has(pubkey);
-          const needsRereview = staleDecisionActors.has(pubkey);
-          const DecisionIcon = hasApproved
-            ? Check
-            : hasRequestedChanges
-              ? TriangleAlert
-              : needsRereview
-                ? History
-                : null;
-          const decisionLabel = hasApproved
-            ? "Approved"
-            : hasRequestedChanges
-              ? "Changes requested"
-              : needsRereview
-                ? "Re-review needed"
-                : "Pending";
-          return (
-            <span
-              className="flex min-w-0 items-center gap-2"
-              data-testid="project-reviewer-decision"
-              key={pubkey}
-            >
-              <span className="truncate text-sm text-foreground">{label}</span>
-              <span
-                className={cn(
-                  "inline-flex shrink-0 items-center gap-0.5 text-sm",
-                  hasApproved && "text-green-600 dark:text-green-400",
-                  hasRequestedChanges && "text-amber-600 dark:text-amber-400",
-                  !hasApproved &&
-                    !hasRequestedChanges &&
-                    "text-muted-foreground",
-                )}
-              >
-                {DecisionIcon ? <DecisionIcon className="h-3.5 w-3.5" /> : null}
-                {decisionLabel}
-              </span>
-            </span>
-          );
-        })}
+        {requestAction}
       </div>
     </ProjectDetailMetaRow>
   );
diff --git a/desktop/src/features/projects/ui/PullRequestsPanelSurface.tsx b/desktop/src/features/projects/ui/PullRequestsPanelSurface.tsx
new file mode 100644
index 0000000000..de53285844
--- /dev/null
+++ b/desktop/src/features/projects/ui/PullRequestsPanelSurface.tsx
@@ -0,0 +1,62 @@
+import type * as React from "react";
+
+import { BuzzLoadingState } from "@/shared/ui/BuzzLoadingState";
+
+/** Which center pane `PullRequestsPanel` should show. A retained selected
+ * review wins over an empty list so refetching does not flash "No reviews yet." */
+export function pullRequestsPanelKind({
+  isLoading,
+  pullRequests,
+  selectedPullRequest,
+}: {
+  isLoading: boolean;
+  pullRequests: { length: number };
+  selectedPullRequest: unknown;
+}): "loading" | "detail" | "empty" | "list" {
+  if (isLoading && !selectedPullRequest) return "loading";
+  if (selectedPullRequest) return "detail";
+  if (pullRequests.length === 0) return "empty";
+  return "list";
+}
+
+/** Loading / empty / detail / list switch used by `PullRequestsPanel`. */
+export function PullRequestsPanelSurface({
+  detail,
+  error,
+  isLoading,
+  list,
+  pullRequests,
+  selectedPullRequest,
+}: {
+  detail: React.ReactNode;
+  error: unknown;
+  isLoading: boolean;
+  list: React.ReactNode;
+  pullRequests: { length: number };
+  selectedPullRequest: unknown;
+}) {
+  const kind = pullRequestsPanelKind({
+    isLoading,
+    pullRequests,
+    selectedPullRequest,
+  });
+  if (kind === "loading") {
+    return <BuzzLoadingState label="Loading reviews" />;
+  }
+  if (kind === "detail") {
+    return detail;
+  }
+  if (kind === "empty") {
+    return (
+      <p
+        className="p-4 text-sm text-muted-foreground"
+        data-testid="project-pull-requests-empty"
+      >
+        {error
+          ? "Could not load reviews for this repository."
+          : "No reviews yet."}
+      </p>
+    );
+  }
+  return list;
+}
diff --git a/desktop/src/features/projects/ui/RepositoryCards.tsx b/desktop/src/features/projects/ui/RepositoryCards.tsx
index 75d8784312..fcb41bd0f8 100644
--- a/desktop/src/features/projects/ui/RepositoryCards.tsx
+++ b/desktop/src/features/projects/ui/RepositoryCards.tsx
@@ -18,10 +18,6 @@ import {
   selectionItemFromRepository,
   type ProjectSelectionItem,
 } from "@/features/projects/lib/projectSelection";
-import {
-  formatExactTimestamp,
-  relativeTime,
-} from "@/features/projects/lib/projectsViewHelpers";
 import { cn } from "@/shared/lib/cn";
 import { normalizePubkey } from "@/shared/lib/pubkey";
 import { useRelayOrigin } from "@/shared/lib/useRelayOrigin";
@@ -155,27 +151,6 @@ function RepositoryIdentity({
   );
 }
 
-function RepositoryUpdatedLabel({
-  repository,
-  summary,
-}: Pick<RepositoryItemProps, "repository" | "summary">) {
-  const updatedAt = summary?.updatedAt || repository.createdAt;
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <span className="whitespace-nowrap text-xs leading-4 text-muted-foreground/70">
-          {relativeTime(updatedAt)}
-        </span>
-      </TooltipTrigger>
-      <TooltipContent>
-        {summary?.latestCommit
-          ? `${summary.latestCommit.title || summary.latestCommit.commit.slice(0, 7)} · ${formatExactTimestamp(summary.latestCommit.createdAt)}`
-          : `Created ${formatExactTimestamp(repository.createdAt)}`}
-      </TooltipContent>
-    </Tooltip>
-  );
-}
-
 function repositoryPeople(
   repository: Repository,
   summary: ProjectActivitySummary | undefined,
@@ -261,13 +236,12 @@ export function RepositoryGridCard(props: RepositoryItemProps) {
         >
           {repository.description || "A repository in this project."}
         </p>
-        <div className="pointer-events-auto mt-auto flex items-center justify-between gap-3">
+        <div className="pointer-events-auto mt-auto">
           <ProjectPeopleStack
             profiles={profiles}
             pubkeys={repositoryPeople(repository, summary)}
             workOwnerPubkey={repository.owner}
           />
-          <RepositoryUpdatedLabel repository={repository} summary={summary} />
         </div>
         <div className="mt-2">
           <ProjectStatsRow summary={summary} />
diff --git a/desktop/src/features/projects/ui/projectsOverviewContext.test.mjs b/desktop/src/features/projects/ui/projectsOverviewContext.test.mjs
index 975d376152..c7332c03ff 100644
--- a/desktop/src/features/projects/ui/projectsOverviewContext.test.mjs
+++ b/desktop/src/features/projects/ui/projectsOverviewContext.test.mjs
@@ -195,7 +195,6 @@ function peopleContext(filter, overrides = {}) {
     pullRequests: [makePullRequest("Open")],
     summaries: {
       "project-buzz": {
-        activityByDay: { "2026-08-01": 4 },
         latestCommit: { author: REVIEW_AUTHOR },
       },
     },
@@ -226,22 +225,10 @@ test("listed repository contributors without commits stay off the repositories p
   assert.deepEqual(context.people, []);
 });
 
-test("projects pod shows owners and keeps the activity graph; channels hides both", () => {
+test("projects pod shows owners; channels hides people", () => {
   const projects = peopleContext("projects");
   const channels = peopleContext("channels");
 
   assert.deepEqual(projects.people, [OWNER]);
-  assert.deepEqual(projects.activityByDay, { "2026-08-01": 4 });
   assert.deepEqual(channels.people, []);
-  assert.equal(channels.activityByDay, null);
-});
-
-test("activity, projects, and repositories pods show the contribution graph", () => {
-  const expected = { "2026-08-01": 4 };
-  assert.deepEqual(peopleContext("all").activityByDay, expected);
-  assert.deepEqual(peopleContext("projects").activityByDay, expected);
-  assert.deepEqual(peopleContext("repositories").activityByDay, expected);
-  assert.equal(peopleContext("issues").activityByDay, null);
-  assert.equal(peopleContext("prs").activityByDay, null);
-  assert.equal(peopleContext("channels").activityByDay, null);
 });
diff --git a/desktop/src/features/projects/ui/projectsOverviewContext.ts b/desktop/src/features/projects/ui/projectsOverviewContext.ts
index 8b2e6b897e..7871c425dc 100644
--- a/desktop/src/features/projects/ui/projectsOverviewContext.ts
+++ b/desktop/src/features/projects/ui/projectsOverviewContext.ts
@@ -46,7 +46,6 @@ export type OverviewContextStat = {
 
 export type OverviewContextPresentation = {
   action: OverviewContextAction;
-  activityByDay: Record<string, number> | null;
   detailsTitle: string;
   people: string[];
   stats: OverviewContextStat[];
@@ -129,21 +128,6 @@ function uniquePubkeys(pubkeys: Array<string | null | undefined>) {
   ];
 }
 
-function summaryActivityByDay(
-  projects: Project[],
-  summaries: Record<string, ProjectActivitySummary> | undefined,
-) {
-  const merged: Record<string, number> = {};
-  for (const project of projects) {
-    const byDay = summaries?.[project.id]?.activityByDay;
-    if (!byDay) continue;
-    for (const [day, count] of Object.entries(byDay)) {
-      merged[day] = (merged[day] ?? 0) + count;
-    }
-  }
-  return merged;
-}
-
 function latestCommitAuthors(
   summaries: Record<string, ProjectActivitySummary> | undefined,
 ) {
@@ -227,18 +211,7 @@ function overviewContextPeople({
   return projectOwners(projects);
 }
 
-function overviewContextActivityByDay({
-  filter,
-  projects,
-  summaries,
-}: OverviewContextInput): Record<string, number> | null {
-  if (filter === "all" || filter === "projects" || filter === "repositories") {
-    return summaryActivityByDay(projects, summaries);
-  }
-  return null;
-}
-
-/** Title, people, activity, and stats for the Projects overview context pod. */
+/** Title, people, and stats for the Projects overview context pod. */
 export function projectsOverviewContext(
   input: OverviewContextInput,
 ): OverviewContextPresentation {
@@ -249,12 +222,10 @@ export function projectsOverviewContext(
   const channelCount = uniqueProjectRelatedChannelCount(projects);
   const repositories = repositoryCount(projects);
   const people = overviewContextPeople(input);
-  const activityByDay = overviewContextActivityByDay(input);
 
   if (filter === "repositories") {
     return {
       action: null,
-      activityByDay,
       detailsTitle: "Repository activity",
       people,
       stats: [
@@ -284,7 +255,6 @@ export function projectsOverviewContext(
   if (filter === "channels") {
     return {
       action: null,
-      activityByDay,
       detailsTitle: "Details",
       people,
       stats: [
@@ -318,7 +288,6 @@ export function projectsOverviewContext(
         label: "Create task",
         testId: "projects-overview-create-issue",
       },
-      activityByDay,
       detailsTitle: "Details",
       people,
       stats: [
@@ -352,7 +321,6 @@ export function projectsOverviewContext(
         label: "Create review",
         testId: "projects-overview-create-pull-request",
       },
-      activityByDay,
       detailsTitle: "Review activity",
       people,
       stats: [
@@ -382,7 +350,6 @@ export function projectsOverviewContext(
   if (filter === "all") {
     return {
       action: createProjectAction(),
-      activityByDay,
       detailsTitle: "Details",
       people,
       stats: [
@@ -423,7 +390,6 @@ export function projectsOverviewContext(
 
   return {
     action: createProjectAction(),
-    activityByDay,
     detailsTitle: "Details",
     people,
     stats: [
diff --git a/desktop/src/features/projects/ui/useRetainedProjectGitViews.test.mjs b/desktop/src/features/projects/ui/useRetainedProjectGitViews.test.mjs
new file mode 100644
index 0000000000..72906a50ee
--- /dev/null
+++ b/desktop/src/features/projects/ui/useRetainedProjectGitViews.test.mjs
@@ -0,0 +1,492 @@
+import assert from "node:assert/strict";
+import { registerHooks } from "node:module";
+import { after, before, test } from "node:test";
+
+import { JSDOM } from "jsdom";
+
+import { buildProjectDetailAgentContext } from "../lib/projectDetailAgentContext.ts";
+import { projectDetailSelectionItem } from "../lib/projectDetailSelectionItem.ts";
+import { reviewDiffWorkspaceBranch } from "../lib/projectReviewDisplay.ts";
+import { pullRequestsPanelKind } from "./PullRequestsPanelSurface.tsx";
+import { buildProjectDetailCrumbs } from "./useProjectDetailCrumbs.ts";
+
+// The real composer mounts TipTap and never releases jsdom handles. Stub it so
+// the production panel can prove selectedPullRequest wiring without hanging
+// the node:test process.
+registerHooks({
+  resolve(specifier, context, nextResolve) {
+    if (specifier === "@/features/forum/ui/ForumComposer") {
+      return { shortCircuit: true, url: "buzz-pr-panel-stub:ForumComposer" };
+    }
+    return nextResolve(specifier, context);
+  },
+  load(url, context, nextLoad) {
+    if (url === "buzz-pr-panel-stub:ForumComposer") {
+      return {
+        format: "module",
+        shortCircuit: true,
+        source:
+          "globalThis.__FORUM_COMPOSER_STUBBED__ = true;\nexport function ForumComposer() { return null; }\n",
+      };
+    }
+    return nextLoad(url, context);
+  },
+});
+
+const OWNER = "a".repeat(64);
+const REVIEW_A_ID = "b".repeat(64);
+
+const repository = {
+  id: `${OWNER}:buzz`,
+  dtag: "buzz",
+  name: "buzz",
+  description: "",
+  cloneUrls: ["https://example.com/buzz.git"],
+  webUrl: null,
+  owner: OWNER,
+  contributors: [],
+  createdAt: 0,
+  status: "open",
+  defaultBranch: "main",
+  repoAddress: `30617:${OWNER}:buzz`,
+  channelId: "trusted-repository-channel",
+};
+
+const reviewA = {
+  id: REVIEW_A_ID,
+  title: "Ship the retained review",
+  content: "Keep this description visible while the list refetches.",
+  tags: [],
+  author: OWNER,
+  createdAt: 1_700_000_000,
+  repoAddress: repository.repoAddress,
+  channelId: null,
+  originAgentName: null,
+  labels: [],
+  recipients: [],
+  reviewers: [],
+  approvals: [],
+  changeRequests: [],
+  status: "Open",
+  statusEventId: null,
+  statusCreatedAt: null,
+  branchName: "feature-a",
+  targetBranch: "main",
+  initialCommit: null,
+  commit: null,
+  cloneUrls: repository.cloneUrls,
+  updateCount: 0,
+  updatedAt: 1_700_000_000,
+  updates: [],
+  comments: [],
+};
+
+const noop = () => {};
+
+function assertRetainedReviewDetail(screen) {
+  const detail = screen.getByTestId("project-pull-request-detail");
+  const title = detail.querySelector("h3");
+  assert.ok(title, "real PullRequestsPanel detail should render an h3 title");
+  assert.match(title.textContent, /Ship the retained review/);
+  assert.match(
+    detail.textContent,
+    /Keep this description visible while the list refetches/,
+  );
+  assert.equal(screen.queryByTestId("project-pull-requests-empty"), null);
+  assert.equal(screen.queryByText("No reviews yet."), null);
+}
+
+function productionConsumers({ activeRepoPullRequest, selectedPullRequest }) {
+  const crumbs = buildProjectDetailCrumbs({
+    activeTab: "prs",
+    commit: null,
+    issue: null,
+    pullRequest: selectedPullRequest,
+    setRequestedTab: noop,
+    setSelectedCommitHash: noop,
+    setSelectedIssueId: noop,
+    setSelectedPullRequestId: noop,
+    setTabsResetKey: noop,
+  });
+  const contextItem = projectDetailSelectionItem({
+    projectChannelId: "trusted-project-channel",
+    projectId: "project-id",
+    pullRequest: selectedPullRequest,
+    repository,
+  });
+  const agent = buildProjectDetailAgentContext({
+    activeTab: "prs",
+    branch: "feature-a",
+    project: { name: "buzz" },
+    repository: {
+      name: repository.name,
+      repoAddress: repository.repoAddress,
+    },
+    source: "remote",
+    workItems: [null, null, selectedPullRequest],
+  });
+  return {
+    agentReviewId: agent.workItem?.id ?? null,
+    crumbTitle: crumbs.activeWorkItemCrumb?.title ?? null,
+    contextId: contextItem?.id ?? null,
+    diffQueryId: activeRepoPullRequest?.id ?? null,
+    diffWorkspaceBranch: reviewDiffWorkspaceBranch({
+      activeBranch: "feature-a",
+      defaultBranch: repository.defaultBranch,
+      pullRequest: activeRepoPullRequest,
+    }),
+  };
+}
+
+function panelConsumers({ isLoading, pullRequests, selectedPullRequest }) {
+  return {
+    kind: pullRequestsPanelKind({
+      isLoading,
+      pullRequests,
+      selectedPullRequest,
+    }),
+    ...productionConsumers({
+      activeRepoPullRequest: selectedPullRequest,
+      selectedPullRequest,
+    }),
+  };
+}
+
+const dom = new JSDOM("<!doctype html><html><body></body></html>", {
+  url: "http://localhost",
+});
+
+class NoopObserver {
+  disconnect() {}
+  observe() {}
+  unobserve() {}
+}
+
+Object.assign(globalThis, {
+  HTMLElement: dom.window.HTMLElement,
+  IS_REACT_ACT_ENVIRONMENT: true,
+  IntersectionObserver: NoopObserver,
+  MutationObserver: dom.window.MutationObserver,
+  ResizeObserver: NoopObserver,
+  document: dom.window.document,
+  getComputedStyle: (...args) => dom.window.getComputedStyle(...args),
+  localStorage: dom.window.localStorage,
+  self: dom.window,
+  window: dom.window,
+});
+Object.defineProperty(globalThis, "navigator", {
+  configurable: true,
+  value: dom.window.navigator,
+  writable: true,
+});
+Object.defineProperty(dom.window.navigator, "mediaDevices", {
+  configurable: true,
+  value: {
+    addEventListener: () => {},
+    enumerateDevices: async () => [],
+    removeEventListener: () => {},
+  },
+});
+dom.window.matchMedia = () => ({
+  matches: false,
+  addEventListener() {},
+  removeEventListener() {},
+});
+dom.window.requestAnimationFrame = (callback) => setTimeout(callback, 0);
+dom.window.cancelAnimationFrame = (id) => clearTimeout(id);
+globalThis.requestAnimationFrame = dom.window.requestAnimationFrame;
+globalThis.cancelAnimationFrame = dom.window.cancelAnimationFrame;
+const tauriInternals = {
+  invoke: async (cmd) => {
+    if (cmd === "get_identity") return { pubkey: OWNER };
+    if (cmd === "search_messages") return { found: 0, hits: [] };
+    if (cmd === "get_open_channel_directory") return [];
+    if (cmd === "get_channel_details") return null;
+    if (cmd === "list_channels") return [];
+    if (cmd === "get_users_batch") return { missing: [], profiles: {} };
+    if (cmd.startsWith("plugin:event|")) return 0;
+    throw new Error(`unmocked Tauri command: ${cmd}`);
+  },
+  transformCallback: () => 1,
+};
+globalThis.__TAURI_INTERNALS__ = tauriInternals;
+dom.window.__TAURI_INTERNALS__ = tauriInternals;
+globalThis.__TAURI_EVENT_PLUGIN_INTERNALS__ = { unregisterListener: () => {} };
+dom.window.__TAURI_EVENT_PLUGIN_INTERNALS__ =
+  globalThis.__TAURI_EVENT_PLUGIN_INTERNALS__;
+
+after(() => dom.window.close());
+
+const workspaceTabsStub = {
+  commitDiff: null,
+  commitDiffError: null,
+  commitDiffLoading: false,
+  contributorActivityCounts: {},
+  contributorPubkeys: [],
+  createIssueAction: { onCreate: async () => {}, pending: false },
+  localSnapshot: null,
+  localSnapshotError: null,
+  localSnapshotLoading: false,
+  onSelectedCommitHashChange: noop,
+  onSelectedIssueIdChange: noop,
+  onSelectedPullRequestIdChange: noop,
+  projectId: "project-id",
+  repoContributors: [],
+  repoDiff: null,
+  repoDiffError: null,
+  repoDiffLoading: false,
+  repoHost: { kind: "unresolved" },
+  repoSource: "remote",
+  selectedCommitHash: null,
+  selectedIssueId: null,
+  snapshot: null,
+  snapshotError: null,
+  snapshotLoading: false,
+};
+
+let React;
+let act;
+let createRoot;
+let hookModule;
+let workspaceTabsModule;
+let QueryClient;
+let QueryClientProvider;
+let CommunitiesProvider;
+let HuddleProvider;
+let TooltipProvider;
+let createMemoryHistory;
+let createRootRoute;
+let createRoute;
+let createRouter;
+let RouterProvider;
+let channelsQueryKey;
+before(async () => {
+  ({ default: React, act } = await import("react"));
+  ({ createRoot } = await import("react-dom/client"));
+  hookModule = await import("./useRetainedProjectGitViews.ts");
+  workspaceTabsModule = await import("./ProjectWorkspaceTabs.tsx");
+  ({ QueryClient, QueryClientProvider } = await import(
+    "@tanstack/react-query"
+  ));
+  ({ CommunitiesProvider } = await import(
+    "@/features/communities/useCommunities.tsx"
+  ));
+  ({ HuddleProvider } = await import("@/features/huddle"));
+  ({ TooltipProvider } = await import("@/shared/ui/tooltip"));
+  ({
+    createMemoryHistory,
+    createRootRoute,
+    createRoute,
+    createRouter,
+    RouterProvider,
+  } = await import("@tanstack/react-router"));
+  ({ channelsQueryKey } = await import("@/features/channels/hooks.ts"));
+});
+
+async function renderSelection(initialProps) {
+  let props = initialProps;
+  const result = { current: null };
+  function Probe() {
+    result.current = hookModule.useRetainedPullRequestSelection(props);
+    return null;
+  }
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  const root = createRoot(container);
+  await act(async () => {
+    root.render(React.createElement(Probe));
+  });
+  return {
+    result,
+    async rerender(nextProps) {
+      props = nextProps;
+      await act(async () => {
+        root.render(React.createElement(Probe));
+      });
+    },
+    async unmount() {
+      await act(async () => {
+        root.unmount();
+      });
+      container.remove();
+    },
+  };
+}
+
+async function renderWorkspaceReviews(initialProps) {
+  let setPanelProps = noop;
+  const { WorkspaceTabs } = workspaceTabsModule;
+  const client = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime: 0 } },
+  });
+  client.setQueryData(["identity"], { pubkey: OWNER });
+  client.setQueryData(channelsQueryKey, []);
+  function Panel() {
+    const [props, setProps] = React.useState(initialProps);
+    setPanelProps = setProps;
+    return React.createElement(WorkspaceTabs, {
+      ...workspaceTabsStub,
+      initialTab: "prs",
+      project: repository,
+      pullRequests: props.pullRequests,
+      pullRequestsError: null,
+      pullRequestsLoading: props.isLoading,
+      selectedPullRequest: props.selectedPullRequest,
+      selectedPullRequestId: props.selectedPullRequestId,
+    });
+  }
+  const rootRoute = createRootRoute({ component: Panel });
+  const channelRoute = createRoute({
+    getParentRoute: () => rootRoute,
+    path: "/channels/$channelId",
+    component: () => null,
+  });
+  const router = createRouter({
+    history: createMemoryHistory({ initialEntries: ["/"] }),
+    routeTree: rootRoute.addChildren([channelRoute]),
+  });
+  await router.load();
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  const root = createRoot(container);
+  const tree = () =>
+    React.createElement(
+      QueryClientProvider,
+      { client },
+      React.createElement(
+        TooltipProvider,
+        null,
+        React.createElement(
+          CommunitiesProvider,
+          null,
+          React.createElement(
+            HuddleProvider,
+            null,
+            React.createElement(RouterProvider, { router }),
+          ),
+        ),
+      ),
+    );
+  await act(async () => {
+    root.render(tree());
+  });
+  return {
+    async rerender(nextProps) {
+      await act(async () => {
+        setPanelProps(nextProps);
+      });
+    },
+    async unmount() {
+      await act(async () => {
+        root.unmount();
+      });
+      client.clear();
+      client.unmount();
+      container.remove();
+    },
+  };
+}
+
+test("selected review chrome and diff query stay aligned across fetch phases", async () => {
+  const { screen } = await import("@testing-library/react");
+  const populated = {
+    activeBranch: "feature-a",
+    isFetching: false,
+    pullRequests: [reviewA],
+    repository,
+    selectedPullRequestId: REVIEW_A_ID,
+  };
+  const {
+    rerender,
+    result,
+    unmount: unmountSelection,
+  } = await renderSelection(populated);
+
+  const populatedConsumers = panelConsumers({
+    isLoading: false,
+    pullRequests: populated.pullRequests,
+    selectedPullRequest: result.current.selectedPullRequest,
+  });
+  assert.equal(result.current.selectedPullRequest, reviewA);
+  assert.equal(result.current.activeRepoPullRequest, reviewA);
+  assert.deepEqual(populatedConsumers, {
+    agentReviewId: REVIEW_A_ID,
+    crumbTitle: "Ship the retained review",
+    contextId: `review:${REVIEW_A_ID}`,
+    diffQueryId: REVIEW_A_ID,
+    diffWorkspaceBranch: "main",
+    kind: "detail",
+  });
+  // Drive the production WorkspaceTabs → PullRequestsPanel handoff
+  // (ProjectWorkspaceTabs.tsx selectedPullRequest={selectedPullRequest}).
+  // Hardcoding that prop to null makes the fetching-empty assertions fail.
+  const panel = await renderWorkspaceReviews({
+    isLoading: false,
+    pullRequests: populated.pullRequests,
+    selectedPullRequest: result.current.selectedPullRequest,
+    selectedPullRequestId: REVIEW_A_ID,
+  });
+  try {
+    assert.equal(globalThis.__FORUM_COMPOSER_STUBBED__, true);
+    assertRetainedReviewDetail(screen);
+
+    await rerender({
+      ...populated,
+      isFetching: true,
+      pullRequests: [],
+    });
+    const fetchingConsumers = panelConsumers({
+      isLoading: false,
+      pullRequests: [],
+      selectedPullRequest: result.current.selectedPullRequest,
+    });
+    assert.equal(result.current.selectedPullRequest, reviewA);
+    assert.equal(
+      result.current.selectedPullRequest,
+      result.current.activeRepoPullRequest,
+    );
+    assert.deepEqual(fetchingConsumers, populatedConsumers);
+    await panel.rerender({
+      isLoading: false,
+      pullRequests: [],
+      selectedPullRequest: result.current.selectedPullRequest,
+      selectedPullRequestId: REVIEW_A_ID,
+    });
+    assertRetainedReviewDetail(screen);
+
+    await rerender({
+      ...populated,
+      isFetching: false,
+      pullRequests: [],
+    });
+    const completedConsumers = panelConsumers({
+      isLoading: false,
+      pullRequests: [],
+      selectedPullRequest: result.current.selectedPullRequest,
+    });
+    assert.equal(result.current.selectedPullRequest, null);
+    assert.equal(result.current.activeRepoPullRequest, null);
+    assert.deepEqual(completedConsumers, {
+      agentReviewId: null,
+      crumbTitle: null,
+      contextId: null,
+      diffQueryId: null,
+      diffWorkspaceBranch: "feature-a",
+      kind: "empty",
+    });
+    await panel.rerender({
+      isLoading: false,
+      pullRequests: [],
+      selectedPullRequest: result.current.selectedPullRequest,
+      selectedPullRequestId: REVIEW_A_ID,
+    });
+    assert.equal(
+      screen.getByTestId("project-pull-requests-empty").textContent,
+      "No reviews yet.",
+    );
+    assert.equal(screen.queryByTestId("project-pull-request-detail"), null);
+  } finally {
+    await panel.unmount();
+    await unmountSelection();
+  }
+});
diff --git a/desktop/src/features/projects/ui/useRetainedProjectGitViews.ts b/desktop/src/features/projects/ui/useRetainedProjectGitViews.ts
new file mode 100644
index 0000000000..d0583383c3
--- /dev/null
+++ b/desktop/src/features/projects/ui/useRetainedProjectGitViews.ts
@@ -0,0 +1,218 @@
+import * as React from "react";
+
+import {
+  type ProjectPullRequest,
+  type ProjectRepoDiff,
+  type ProjectRepoSnapshot,
+  type Repository,
+  useProjectLocalRepoDiffQuery,
+  useProjectLocalRepoSnapshotQuery,
+  useProjectRepoDiffQuery,
+  useProjectRepoSnapshotQuery,
+} from "@/features/projects/hooks";
+import {
+  currentPullRequestForSelection,
+  retainLatestByKey,
+  reviewDiffWorkspaceBranch,
+  shouldReplaceRetainedPullRequest,
+} from "@/features/projects/lib/projectReviewDisplay";
+import { normalizeRepositoryUrl } from "@/features/projects/lib/projectsViewHelpers";
+import { useProjectCommitDiffQuery } from "@/features/projects/useProjectCommitDiff";
+import { snapshotHasContent } from "./projectDetailHelpers";
+
+/** Keep the active review identity stable while the pull-request list refetches. */
+export function useRetainedPullRequestSelection({
+  activeBranch,
+  isFetching,
+  pullRequests,
+  repository,
+  selectedPullRequestId,
+}: {
+  activeBranch: string | null | undefined;
+  isFetching: boolean;
+  pullRequests: ProjectPullRequest[] | undefined;
+  repository: Repository | null | undefined;
+  selectedPullRequestId: string | null;
+}) {
+  const currentBranchPullRequest = React.useMemo(() => {
+    const projectRepositories = new Set(
+      (repository?.cloneUrls ?? []).map(normalizeRepositoryUrl),
+    );
+    const matches =
+      pullRequests?.filter(
+        (pullRequest) =>
+          pullRequest.branchName === activeBranch &&
+          pullRequest.cloneUrls.some((cloneUrl) =>
+            projectRepositories.has(normalizeRepositoryUrl(cloneUrl)),
+          ),
+      ) ?? [];
+    return matches.length === 1 ? matches[0] : null;
+  }, [activeBranch, pullRequests, repository?.cloneUrls]);
+  const selectedBranchPullRequestKey = `${repository?.id ?? "none"}:${activeBranch}`;
+  const selectedBranchPullRequestCache = React.useRef({
+    key: selectedBranchPullRequestKey,
+    value: currentBranchPullRequest,
+  });
+  const selectedBranchPullRequest = retainLatestByKey(
+    selectedBranchPullRequestCache,
+    selectedBranchPullRequestKey,
+    currentBranchPullRequest,
+    (next) => shouldReplaceRetainedPullRequest(next, isFetching),
+  );
+  const openBranchPullRequest =
+    selectedBranchPullRequest?.status === "Open" ||
+    selectedBranchPullRequest?.status === "Draft"
+      ? selectedBranchPullRequest
+      : null;
+  const currentSelectedPullRequest = currentPullRequestForSelection({
+    pullRequests,
+    selectedPullRequestId,
+  });
+  const selectedPullRequestKey = [
+    repository?.id ?? "none",
+    selectedPullRequestId ?? "none",
+  ].join(":");
+  const selectedPullRequestCache = React.useRef({
+    key: selectedPullRequestKey,
+    value: currentSelectedPullRequest,
+  });
+  const selectedPullRequest = retainLatestByKey(
+    selectedPullRequestCache,
+    selectedPullRequestKey,
+    currentSelectedPullRequest,
+    (next) => shouldReplaceRetainedPullRequest(next, isFetching),
+  );
+  const activeRepoPullRequest = selectedPullRequestId
+    ? selectedPullRequest
+    : selectedBranchPullRequest;
+  return {
+    activeRepoPullRequest,
+    openBranchPullRequest,
+    selectedBranchPullRequest,
+    selectedPullRequest,
+  };
+}
+
+/** Keep a populated repository snapshot on screen across transient refetches. */
+export function useRetainedRepoSnapshot(
+  cacheKey: string,
+  data: ProjectRepoSnapshot | null | undefined,
+  isFetching: boolean,
+) {
+  const cache = React.useRef({
+    key: cacheKey,
+    value: data,
+  });
+  return retainLatestByKey(
+    cache,
+    cacheKey,
+    data,
+    (next, previous) =>
+      snapshotHasContent(next) || !snapshotHasContent(previous) || !isFetching,
+  );
+}
+
+/** Keep a populated review diff on screen across empty refetch results. */
+export function useRetainedRepoDiff(
+  cacheKey: string,
+  data: ProjectRepoDiff | null | undefined,
+  isFetching: boolean,
+) {
+  const cache = React.useRef({
+    key: cacheKey,
+    value: data,
+  });
+  return retainLatestByKey(cache, cacheKey, data, (next, previous) => {
+    const nextFiles = next?.files.length ?? 0;
+    const previousFiles = previous?.files.length ?? 0;
+    if (previousFiles > 0 && nextFiles === 0) return !isFetching;
+    return next !== undefined || !isFetching;
+  });
+}
+
+/** Load and retain repository snapshot/diff queries for the project detail view. */
+export function useProjectDetailGitViews({
+  activeBranch,
+  activeRepoPullRequest,
+  activeTag,
+  isBuzzHost,
+  repository,
+  reposDir,
+  repoSource,
+  selectedBranchPullRequest,
+  selectedCommitHash,
+  selectedTag,
+}: {
+  activeBranch: string | null | undefined;
+  activeRepoPullRequest: ProjectPullRequest | null | undefined;
+  activeTag: { commit: string; name: string } | null;
+  isBuzzHost: boolean;
+  repository: Repository | null | undefined;
+  reposDir?: string | null;
+  repoSource: "local" | "remote";
+  selectedBranchPullRequest: ProjectPullRequest | null;
+  selectedCommitHash: string | null;
+  selectedTag: string | null;
+}) {
+  const repoSnapshotQuery = useProjectRepoSnapshotQuery(
+    repository,
+    activeBranch,
+    selectedTag ? null : selectedBranchPullRequest,
+    activeTag,
+    isBuzzHost,
+  );
+  const displayedRepoSnapshot = useRetainedRepoSnapshot(
+    `${repository?.id}:${activeBranch}:${selectedTag ? activeTag?.name : selectedBranchPullRequest?.id}:${selectedTag ? activeTag?.commit : selectedBranchPullRequest?.commit}`,
+    repoSnapshotQuery.data,
+    repoSnapshotQuery.isFetching,
+  );
+  const reviewDiffBranch = reviewDiffWorkspaceBranch({
+    activeBranch,
+    defaultBranch: repository?.defaultBranch,
+    pullRequest: activeRepoPullRequest,
+  });
+  const repoDiffQuery = useProjectRepoDiffQuery(
+    repository,
+    reviewDiffBranch,
+    activeRepoPullRequest,
+    repoSource === "remote",
+  );
+  const localRepoDiffQuery = useProjectLocalRepoDiffQuery(
+    repository,
+    reposDir,
+    reviewDiffBranch,
+    activeRepoPullRequest,
+    repoSource === "local" && Boolean(activeRepoPullRequest),
+  );
+  const commitDiffQuery = useProjectCommitDiffQuery(
+    repository,
+    selectedCommitHash,
+    repoSource,
+    reposDir,
+  );
+  const localRepoSnapshotQuery = useProjectLocalRepoSnapshotQuery(
+    repository,
+    reposDir,
+    activeBranch,
+  );
+  const displayedRepoDiff = useRetainedRepoDiff(
+    `${repository?.id ?? "none"}:${repoSource}:${reviewDiffBranch}:${activeRepoPullRequest?.id}:${activeRepoPullRequest?.commit}`,
+    repoSource === "local" ? localRepoDiffQuery.data : repoDiffQuery.data,
+    repoSource === "local"
+      ? localRepoDiffQuery.isFetching
+      : repoDiffQuery.isFetching,
+  );
+  return {
+    commitDiffQuery,
+    displayedRepoDiff,
+    displayedRepoDiffError:
+      repoSource === "local" ? localRepoDiffQuery.error : repoDiffQuery.error,
+    displayedRepoDiffLoading: (repoSource === "local"
+      ? localRepoDiffQuery
+      : repoDiffQuery
+    ).isLoading,
+    displayedRepoSnapshot,
+    localRepoSnapshotQuery,
+    repoSnapshotQuery,
+  };
+}
diff --git a/desktop/src/shared/styles/globals/composer.css b/desktop/src/shared/styles/globals/composer.css
index 2ee690e41d..fbbcdf026c 100644
--- a/desktop/src/shared/styles/globals/composer.css
+++ b/desktop/src/shared/styles/globals/composer.css
@@ -254,4 +254,14 @@
 
 /* Inline chips — timeline markdown + composer share `.message-markdown` scope.
    Body copy is text-sm; inline code labels sit one step down (text-xs).
-   All chip variants share one box height so mono labels stay balanced. */
+   All chip variants share one box height so mono labels stay balanced.
+
+   Rendered-message chips use inline-flex. The same decoration in the
+   composer pulls the caret into the chip and swallows the trailing
+   space after an @mention, so typing "hello" after @quinn becomes
+   "@quinnhello". Keep composer chips inline; leave ::before icons in
+   place. */
+.rich-text-composer .tiptap .mention-chip {
+  display: inline;
+  min-height: 0;
+}
diff --git a/desktop/src/shared/styles/globals/composerCaret.test.mjs b/desktop/src/shared/styles/globals/composerCaret.test.mjs
new file mode 100644
index 0000000000..1ebb3b96ea
--- /dev/null
+++ b/desktop/src/shared/styles/globals/composerCaret.test.mjs
@@ -0,0 +1,18 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import test from "node:test";
+
+const composerCss = readFileSync(
+  new URL("./composer.css", import.meta.url),
+  "utf8",
+);
+
+const mentionChipRule = composerCss.match(
+  /\.rich-text-composer \.tiptap \.mention-chip\s*\{([\s\S]*?)\n\}/,
+)?.[1];
+
+test("composer mention chips stay inline so the caret can sit after the trailing space", () => {
+  assert.ok(mentionChipRule, "missing composer mention-chip override");
+  assert.match(mentionChipRule, /display:\s*inline;/);
+  assert.doesNotMatch(mentionChipRule, /display:\s*inline-flex/);
+});
diff --git a/desktop/src/shared/ui/markdown.tsx b/desktop/src/shared/ui/markdown.tsx
index 3810e2cc62..9b948f18c0 100644
--- a/desktop/src/shared/ui/markdown.tsx
+++ b/desktop/src/shared/ui/markdown.tsx
@@ -48,6 +48,7 @@ import {
   isImageOnlyParagraph,
   markdownPropsAreEqual,
 } from "./markdownUtils";
+import { ImageMosaic } from "./markdown/ImageMosaic";
 import {
   CODE_BLOCK_CLASS,
   extractLanguage,
@@ -1233,33 +1234,10 @@ function ImageBlock({ alt, dim, resolvedSrc, src, thumbSrc }: ImageBlockProps) {
   );
 }
 
-function ImageMosaic({ children }: { children: React.ReactNode[] }) {
-  const mosaicRef = React.useRef<HTMLDivElement | null>(null);
-  const isTriptych = children.length === 3;
-  const hasOddTail = children.length > 3 && children.length % 2 === 1;
-  useSmoothCorners(mosaicRef);
-
-  return (
-    <div
-      className={cn(
-        "mt-1 grid w-full min-w-0 max-w-lg grid-cols-2 gap-1.5 overflow-hidden rounded-2xl [&_br]:hidden [&_[data-block-media]]:min-h-0 [&_[data-block-media]]:max-w-none [&_[data-block-media]]:overflow-hidden [&_[data-block-media]>button]:m-0 [&_[data-block-media]>button]:h-full [&_[data-block-media]>button]:w-full [&_[data-block-media]>button]:max-w-none [&_[data-block-media]>button]:rounded-none [&_[data-block-media]_[data-progressive-image-frame]]:!h-full [&_[data-block-media]_[data-progressive-image-frame]]:!w-full [&_[data-block-media]_img]:!h-full [&_[data-block-media]_img]:!max-h-none [&_[data-block-media]_img]:!w-full [&_[data-block-media]_img]:!max-w-none [&_[data-block-media]_img]:rounded-none [&_[data-block-media]_img]:object-cover",
-        isTriptych
-          ? "h-80 grid-rows-2 [&_[data-block-media]]:h-auto [&_[data-block-media]:first-child]:row-span-2"
-          : "[&_[data-block-media]]:h-48",
-        hasOddTail && "[&_[data-block-media]:last-child]:col-span-2",
-      )}
-      data-image-mosaic=""
-      data-image-mosaic-count={children.length}
-      ref={mosaicRef}
-    >
-      {children}
-    </div>
-  );
-}
-
 export function createMarkdownComponents(
   interactive = true,
   mediaInset = false,
+  blockCode = false,
 ): Components {
   const listItemClassName = "[&_p]:inline";
   const listClassName = "space-y-1 pl-6 marker:text-muted-foreground/80";
@@ -1563,7 +1541,7 @@ export function createMarkdownComponents(
       return <p>{children}</p>;
     },
     pre: ({ children }) => {
-      if (!interactive) return <span>{children}</span>;
+      if (!interactive && !blockCode) return <span>{children}</span>;
       let language = "";
       React.Children.forEach(children, (child) => {
         if (
@@ -1699,9 +1677,9 @@ export function createMarkdownComponents(
 }
 
 /**
- * The component map only varies by the three boolean render flags, so at most
- * eight instances ever exist. Module-stable maps mean cached markdown element
- * trees (see ./markdown/nodeCache.ts) never embed per-mount closures.
+ * The component map only varies by the four boolean render flags, so at most
+ * sixteen instances ever exist. Module-stable maps mean cached markdown
+ * element trees (see ./markdown/nodeCache.ts) never embed per-mount closures.
  */
 const MARKDOWN_COMPONENT_SCHEMA_VERSION = "8";
 const markdownComponentsByVariant = new Map<string, MarkdownComponentSet>();
@@ -1719,12 +1697,13 @@ function getMarkdownComponents(
   interactive: boolean,
   leadingInlineContent: boolean,
   mediaInset: boolean,
+  blockCode: boolean,
 ): MarkdownComponentSet {
-  const variant = `${MARKDOWN_COMPONENT_SCHEMA_VERSION}:${interactive ? "i" : ""}${leadingInlineContent ? "l" : ""}${mediaInset ? "m" : ""}`;
+  const variant = `${MARKDOWN_COMPONENT_SCHEMA_VERSION}:${interactive ? "i" : ""}${leadingInlineContent ? "l" : ""}${mediaInset ? "m" : ""}${blockCode ? "c" : ""}`;
   let entry = markdownComponentsByVariant.get(variant);
   if (!entry) {
     entry = {
-      components: createMarkdownComponents(interactive, mediaInset),
+      components: createMarkdownComponents(interactive, mediaInset, blockCode),
       variant,
     };
     markdownComponentsByVariant.set(variant, entry);
@@ -1741,6 +1720,7 @@ function MarkdownInner({
   hardLineBreaks = true,
   imetaByUrl,
   interactive = true,
+  blockCode = false,
   agentMentionPubkeysByName,
   leadingInlineContent,
   mediaInset = false,
@@ -1856,6 +1836,7 @@ function MarkdownInner({
     interactive,
     hasLeadingInlineContent,
     mediaInset,
+    blockCode,
   );
   const markdownNode =
     configNudge === null
diff --git a/desktop/src/shared/ui/markdown/ChannelDeepLink.test.mjs b/desktop/src/shared/ui/markdown/ChannelDeepLink.test.mjs
index 75858a10fe..5491c93d81 100644
--- a/desktop/src/shared/ui/markdown/ChannelDeepLink.test.mjs
+++ b/desktop/src/shared/ui/markdown/ChannelDeepLink.test.mjs
@@ -32,3 +32,14 @@ test("channelTooltipFooter adds archived status without changing existing metada
     "Private channel · Forum",
   );
 });
+
+test("channelTooltipFooter uses just now for activity within a minute", () => {
+  assert.equal(
+    channelTooltipFooter({
+      ...channel,
+      archivedAt: null,
+      lastMessageAt: new Date().toISOString(),
+    }),
+    "Private channel · Forum · Active just now",
+  );
+});
diff --git a/desktop/src/shared/ui/markdown/ImageMosaic.tsx b/desktop/src/shared/ui/markdown/ImageMosaic.tsx
new file mode 100644
index 0000000000..d45fdf9744
--- /dev/null
+++ b/desktop/src/shared/ui/markdown/ImageMosaic.tsx
@@ -0,0 +1,28 @@
+import React from "react";
+import { cn } from "@/shared/lib/cn";
+import { useSmoothCorners } from "@/shared/ui/smoothCorners";
+
+/** Grid layout for messages that contain multiple standalone images. */
+export function ImageMosaic({ children }: { children: React.ReactNode[] }) {
+  const mosaicRef = React.useRef<HTMLDivElement | null>(null);
+  const isTriptych = children.length === 3;
+  const hasOddTail = children.length > 3 && children.length % 2 === 1;
+  useSmoothCorners(mosaicRef);
+
+  return (
+    <div
+      className={cn(
+        "mt-1 grid w-full min-w-0 max-w-lg grid-cols-2 gap-1.5 overflow-hidden rounded-2xl [&_br]:hidden [&_[data-block-media]]:min-h-0 [&_[data-block-media]]:max-w-none [&_[data-block-media]]:overflow-hidden [&_[data-block-media]>button]:m-0 [&_[data-block-media]>button]:h-full [&_[data-block-media]>button]:w-full [&_[data-block-media]>button]:max-w-none [&_[data-block-media]>button]:rounded-none [&_[data-block-media]_[data-progressive-image-frame]]:!h-full [&_[data-block-media]_[data-progressive-image-frame]]:!w-full [&_[data-block-media]_img]:!h-full [&_[data-block-media]_img]:!max-h-none [&_[data-block-media]_img]:!w-full [&_[data-block-media]_img]:!max-w-none [&_[data-block-media]_img]:rounded-none [&_[data-block-media]_img]:object-cover",
+        isTriptych
+          ? "h-80 grid-rows-2 [&_[data-block-media]]:h-auto [&_[data-block-media]:first-child]:row-span-2"
+          : "[&_[data-block-media]]:h-48",
+        hasOddTail && "[&_[data-block-media]:last-child]:col-span-2",
+      )}
+      data-image-mosaic=""
+      data-image-mosaic-count={children.length}
+      ref={mosaicRef}
+    >
+      {children}
+    </div>
+  );
+}
diff --git a/desktop/src/shared/ui/markdown/types.ts b/desktop/src/shared/ui/markdown/types.ts
index 9a684de764..3404c2ab17 100644
--- a/desktop/src/shared/ui/markdown/types.ts
+++ b/desktop/src/shared/ui/markdown/types.ts
@@ -82,6 +82,13 @@ export type MarkdownProps = {
   hardLineBreaks?: boolean;
   imetaByUrl?: ImetaLookup;
   interactive?: boolean;
+  /**
+   * Render fenced code as scrollable code blocks even when `interactive` is
+   * false. Non-interactive surfaces default to inlining code (compact
+   * previews); document surfaces like repository READMEs pass true so long
+   * lines scroll inside the block instead of stretching the layout.
+   */
+  blockCode?: boolean;
   agentMentionPubkeysByName?: Record<string, string>;
   mentionNames?: string[];
   mentionPubkeysByName?: Record<string, string>;
diff --git a/desktop/src/shared/ui/markdownUtils.ts b/desktop/src/shared/ui/markdownUtils.ts
index f0ce894c66..992341bacc 100644
--- a/desktop/src/shared/ui/markdownUtils.ts
+++ b/desktop/src/shared/ui/markdownUtils.ts
@@ -111,6 +111,7 @@ export function markdownPropsAreEqual(
     prev.customEmoji === next.customEmoji &&
     prev.hardLineBreaks === next.hardLineBreaks &&
     prev.interactive === next.interactive &&
+    prev.blockCode === next.blockCode &&
     prev.mediaInset === next.mediaInset &&
     shallowRecordEqual(
       prev.agentMentionPubkeysByName,
diff --git a/desktop/tests/e2e/mentions.spec.ts b/desktop/tests/e2e/mentions.spec.ts
index 820b1f2ab1..e2b6db3930 100644
--- a/desktop/tests/e2e/mentions.spec.ts
+++ b/desktop/tests/e2e/mentions.spec.ts
@@ -734,19 +734,20 @@ test("selecting a person mention inserts @Name into input", async ({
   await expect(page.getByTestId("chat-title")).toHaveText("general");
 
   const input = page.getByTestId("message-input");
-  await input.fill("Hey @bo");
-
   const dropdown = autocomplete(page);
-  await dropdown.getByText("bob").click();
-
-  await expect(input).toHaveText("Hey @bob ");
+  for (let attempt = 0; attempt < 5; attempt++) {
+    await input.fill("Hey @bo");
+    await dropdown.getByText("bob").click();
+    await page.keyboard.type("hello");
+    await expect(input).toHaveText("Hey @bob hello");
+  }
   const mentionChip = input.locator(".human-mention-highlight", {
     hasText: "bob",
   });
   await expect(mentionChip).toBeVisible();
   await expect(mentionChip).toHaveText("bob");
   await expect(mentionChip).not.toHaveClass(/agent-mention-highlight/);
-  await expect(mentionChip).toHaveCSS("display", "inline-flex");
+  await expect(mentionChip).toHaveCSS("display", "inline");
   await expect(
     input.locator(".mention-prefix-hidden", { hasText: "@" }),
   ).toHaveCount(1);
@@ -758,6 +759,49 @@ test("selecting a person mention inserts @Name into input", async ({
   expect(iconMask).toContain("data:image/svg+xml");
 });
 
+test("immediate ArrowLeft after a person mention is not bounced past the trailing space", async ({
+  page,
+}) => {
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await expect(page.getByTestId("chat-title")).toHaveText("general");
+
+  const input = page.getByTestId("message-input");
+  await input.fill("Hey @bo");
+  await autocomplete(page).getByText("bob").click();
+  await page.keyboard.press("ArrowLeft");
+  await page.keyboard.type("x");
+  const text = (await input.innerText()).replace(/\s+$/, "");
+  expect(text).toBe("Hey @bobx");
+  expect(text).not.toMatch(/@bob x/);
+});
+
+test("clicking a person mention chip edge is not treated as after the trailing space", async ({
+  page,
+}) => {
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await expect(page.getByTestId("chat-title")).toHaveText("general");
+
+  const input = page.getByTestId("message-input");
+  await input.fill("Hey @bo");
+  await autocomplete(page).getByText("bob").click();
+  const chip = input.locator(".human-mention-highlight", { hasText: "bob" });
+  await expect(chip).toBeVisible();
+  const box = await chip.boundingBox();
+  expect(box).toBeTruthy();
+  await chip.click({
+    position: {
+      x: Math.max((box?.width ?? 1) - 2, 0),
+      y: (box?.height ?? 2) / 2,
+    },
+  });
+  await page.keyboard.type("x");
+  const text = (await input.innerText()).replace(/\s+$/, "");
+  expect(text).toBe("Hey @bobx");
+  expect(text).not.toMatch(/@bob x/);
+});
+
 test("channel references keep caret movement through the channel name", async ({
   page,
 }) => {
@@ -809,18 +853,19 @@ test("selecting a managed agent mention inserts @Name into input", async ({
   await expect(page.getByTestId("chat-title")).toHaveText("general");
 
   const input = page.getByTestId("message-input");
-  await input.fill("Hey @ali");
-
   const dropdown = autocomplete(page);
-  await dropdown.getByText("alice").click();
-
-  await expect(input).toHaveText("Hey @alice ");
+  for (let attempt = 0; attempt < 5; attempt++) {
+    await input.fill("Hey @ali");
+    await dropdown.getByText("alice").click();
+    await page.keyboard.type("hello");
+    await expect(input).toHaveText("Hey @alice hello");
+  }
   const agentMentionChip = input.locator(".agent-mention-highlight", {
     hasText: "alice",
   });
   await expect(agentMentionChip).toBeVisible();
   await expect(agentMentionChip).toHaveText("alice");
-  await expect(agentMentionChip).toHaveCSS("display", "inline-flex");
+  await expect(agentMentionChip).toHaveCSS("display", "inline");
   await expect(agentMentionChip).toHaveCSS("border-top-width", "0px");
 });
 
@@ -1324,12 +1369,14 @@ test("relay-only allowlisted agents emit a p tag when sent", async ({
   );
 
   const input = page.getByTestId("message-input");
-  await input.fill("@quinn");
-  const quinnRow = autocomplete(page).locator("button", { hasText: "quinn" });
-  await expect(quinnRow).toBeVisible();
-  await quinnRow.click();
-  await page.keyboard.type("hello");
-  await expect(input).toHaveText("@quinn hello");
+  for (let attempt = 0; attempt < 5; attempt++) {
+    await input.fill("@quinn");
+    const quinnRow = autocomplete(page).locator("button", { hasText: "quinn" });
+    await expect(quinnRow).toBeVisible();
+    await quinnRow.click();
+    await page.keyboard.type("hello");
+    await expect(input).toHaveText("@quinn hello");
+  }
   const baselineCommands = await readCommandLog(page);
   await page.getByTestId("send-message").click();
 
diff --git a/desktop/tests/e2e/project-commit-detail.spec.ts b/desktop/tests/e2e/project-commit-detail.spec.ts
index 0a663653ab..53804bf85a 100644
--- a/desktop/tests/e2e/project-commit-detail.spec.ts
+++ b/desktop/tests/e2e/project-commit-detail.spec.ts
@@ -585,6 +585,50 @@ test("multi-repository projects switch the active repository", async ({
     .toBe(true);
 });
 
+test("latest files commit opens its detail without a divider", async ({
+  page,
+}) => {
+  await enableProjectsFeature(page);
+  await installMockBridge(page);
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.getByTestId("open-projects-view").click();
+  await page.getByTestId("projects-section-projects").click();
+  const projectEntry = page
+    .locator(
+      '[data-testid="project-card-buzz"], [data-testid="project-row-buzz"]',
+    )
+    .first();
+  await expect(projectEntry).toBeVisible({ timeout: 10_000 });
+  await projectEntry.click();
+  await page.getByRole("tab", { name: "Files" }).click();
+
+  const latestCommit = page.getByTestId("project-repository-latest-commit");
+  await expect(latestCommit).toBeVisible();
+  await expect(latestCommit).toHaveCSS("border-bottom-width", "0px");
+  await expect(
+    page.getByTestId("project-repository-latest-commit-summary"),
+  ).toHaveCSS("font-size", "12px");
+  await expect(
+    page.getByTestId("project-repository-entry-row").first(),
+  ).toHaveCSS("font-size", "12px");
+  const repositoryEntryRow = page
+    .getByTestId("project-repository-entry-row")
+    .first();
+  const repositoryEntryCells = repositoryEntryRow.locator("td");
+  await expect(repositoryEntryCells.first()).toHaveCSS("border-radius", "0px");
+  await repositoryEntryRow.hover();
+  await expect(repositoryEntryCells.first()).toHaveCSS(
+    "border-top-left-radius",
+    "8px",
+  );
+  await expect(repositoryEntryCells.last()).toHaveCSS(
+    "border-top-right-radius",
+    "8px",
+  );
+  await latestCommit.click();
+  await expect(page.getByTestId("project-commit-detail")).toBeVisible();
+});
+
 test("commit detail opens from the commits feed with a diff", async ({
   page,
 }) => {
@@ -649,7 +693,10 @@ test("commit detail opens from the commits feed with a diff", async ({
   await expect(commitHeader).toContainText("Committed");
   await expect(commitHeader).not.toContainText("Brain");
   await expect(commitHeader.locator("img")).toHaveCount(0);
-  await expect(commitDetail).toHaveCSS("max-width", "768px");
+  await expect(commitDetail.locator(":scope > div").first()).toHaveCSS(
+    "max-width",
+    "768px",
+  );
   await expect(
     commitDetail.getByRole("heading", {
       name: "Add Trello board workflow details",
@@ -823,7 +870,7 @@ test("pull request and issue feeds use compact work item rows", async ({
     page.getByTestId("project-work-item-group-header").first(),
   ).toBeVisible();
   await expect(
-    prRows.first().locator("button").filter({ hasText: /.+/ }).nth(1),
+    prRows.first().locator("[data-projects-text-priority='primary']"),
   ).toHaveCSS("font-weight", "400");
   await waitForAnimations(page);
   await page.screenshot({ fullPage: false, path: `${SHOTS}/03-prs-feed.png` });
diff --git a/desktop/tests/e2e/project-issue-comments.spec.ts b/desktop/tests/e2e/project-issue-comments.spec.ts
index 4cf0f0940c..6cfd6f0271 100644
--- a/desktop/tests/e2e/project-issue-comments.spec.ts
+++ b/desktop/tests/e2e/project-issue-comments.spec.ts
@@ -38,6 +38,22 @@ test("issue detail can open agent chat or seed a channel question", async ({
     "project-context-communication-actions",
   );
   await expect(communication).toBeVisible();
+  const contextPanel = page.getByTestId("project-repository-actions-panel");
+  await expect(
+    contextPanel.getByRole("heading", { name: "Actions", exact: true }),
+  ).toHaveCount(0);
+  await expect(
+    contextPanel.getByRole("heading", { name: "Details", exact: true }),
+  ).toBeVisible();
+  await expect(
+    contextPanel.getByRole("heading", { name: "Assignment", exact: true }),
+  ).toHaveCount(0);
+  await expect(
+    contextPanel.getByRole("heading", { name: "Discussion", exact: true }),
+  ).toHaveCount(0);
+  await expect(
+    contextPanel.getByTestId("project-repository-people"),
+  ).toHaveCount(0);
   await page.getByTestId("project-context-chat-agent").click();
   await expect(page.getByTestId("project-agent-chat-panel")).toBeVisible();
   await expect(page.getByTestId("projects-agent-selection-item")).toHaveCount(
diff --git a/desktop/tests/e2e/project-pr-review.spec.ts b/desktop/tests/e2e/project-pr-review.spec.ts
index fc9448ceba..47a49709e2 100644
--- a/desktop/tests/e2e/project-pr-review.spec.ts
+++ b/desktop/tests/e2e/project-pr-review.spec.ts
@@ -33,6 +33,23 @@ async function enableProjectsFeature(page: import("@playwright/test").Page) {
   });
 }
 
+async function waitForMockLiveSubscription(
+  page: import("@playwright/test").Page,
+  channelName: string,
+) {
+  await expect
+    .poll(() =>
+      page.evaluate(
+        (name) =>
+          window.__BUZZ_E2E_HAS_MOCK_LIVE_SUBSCRIPTION__?.({
+            channelName: name,
+          }) ?? false,
+        channelName,
+      ),
+    )
+    .toBe(true);
+}
+
 async function openBuzzProject(page: import("@playwright/test").Page) {
   await page.goto("/", { waitUntil: "domcontentloaded" });
   await page.getByTestId("open-projects-view").click();
@@ -199,11 +216,28 @@ test("PR creator/owner can toggle draft, request reviews, and approve", async ({
   const contextReviewers = page.getByTestId("project-context-reviewers");
   await expect(contextReviewers).toBeVisible();
   await expect(contextReviewers.locator("img")).toHaveCount(0);
+  const contextPanel = page.getByTestId("project-repository-actions-panel");
+  await expect(
+    contextPanel.getByRole("heading", { name: "Actions", exact: true }),
+  ).toHaveCount(0);
+  await expect(
+    contextPanel.getByRole("heading", { name: "Details", exact: true }),
+  ).toBeVisible();
+  await expect(
+    contextPanel.getByRole("heading", { name: "Discussion", exact: true }),
+  ).toHaveCount(0);
+  await expect(
+    contextPanel.getByRole("heading", { name: "People", exact: true }),
+  ).toHaveCount(0);
+  await expect(
+    contextPanel.getByRole("heading", { name: "Review details", exact: true }),
+  ).toHaveCount(0);
   await expect(
     page.getByTestId("project-context-communication-actions"),
   ).toBeVisible();
   await expect(page.getByTestId("project-context-chat-agent")).toBeVisible();
   await expect(page.getByTestId("project-context-discuss")).toBeVisible();
+  await expect(page.getByTestId("project-context-branch")).toContainText("→");
   await expect(page.getByTestId("project-context-review-summary")).toHaveCount(
     0,
   );
@@ -264,6 +298,21 @@ test("PR creator/owner can toggle draft, request reviews, and approve", async ({
   await expect(page.getByText("Requested a review from bob")).toBeVisible({
     timeout: 10_000,
   });
+  await expect(page.getByTestId("project-review-summary")).toHaveCount(0);
+  const reviewerDecision = page
+    .getByTestId("project-reviewer-decision")
+    .filter({ hasText: "bob" });
+  await expect(
+    reviewerDecision.getByTestId("project-reviewer-name"),
+  ).toHaveText("bob");
+  await expect(reviewerDecision).toHaveAttribute(
+    "title",
+    "Awaiting review from bob",
+  );
+  await expect(page.getByTestId("project-reviewers-content")).toHaveCSS(
+    "flex-wrap",
+    "nowrap",
+  );
 
   await waitForAnimations(page);
   await page.screenshot({
@@ -287,9 +336,12 @@ test("PR creator/owner can toggle draft, request reviews, and approve", async ({
       .getByTestId("project-pull-request-timeline-row")
       .filter({ hasText: "requested changes" }),
   ).toBeVisible({ timeout: 10_000 });
-  await expect(page.getByTestId("project-review-summary")).toHaveText(
-    "Changes requested",
-  );
+  await expect(page.getByTestId("project-review-summary")).toHaveCount(0);
+  await expect(
+    page.locator(
+      '[data-testid="project-reviewer-decision"][title^="Changes requested by "]',
+    ),
+  ).toHaveCount(1);
   const changeRequestEvent = await page.evaluate(() =>
     window.__BUZZ_E2E_SIGNED_EVENTS__
       ?.filter(
@@ -368,10 +420,12 @@ test("PR creator/owner can toggle draft, request reviews, and approve", async ({
   await expect(
     page.getByRole("button", { name: "Approve", exact: true }),
   ).toHaveCount(0);
-  await expect(page.getByTestId("project-review-summary")).toHaveText(
-    "Awaiting review",
-  );
-  await expect(page.getByText("Approved", { exact: true })).toBeVisible();
+  await expect(page.getByTestId("project-review-summary")).toHaveCount(0);
+  await expect(
+    page.locator(
+      '[data-testid="project-reviewer-decision"][title^="Approved by "]',
+    ),
+  ).toHaveCount(1);
   const approvalEvent = await page.evaluate(() =>
     window.__BUZZ_E2E_SIGNED_EVENTS__
       ?.filter(
@@ -1096,6 +1150,14 @@ test("sidebar distinguishes the Projects overview from an open project", async (
   await projectsOverview.click();
   await expect(projectsOverview).toHaveAttribute("data-active", "true");
   await expect(sidebarProject).toHaveAttribute("data-active", "false");
+  await expect(sidebarProject.locator("svg").first()).toHaveCSS(
+    "opacity",
+    "0.8",
+  );
+  await expect(sidebarProject.locator('[data-sidebar="menu-label"]')).toHaveCSS(
+    "opacity",
+    "0.8",
+  );
 
   await sidebarProject.click();
   await expect(projectsOverview).toHaveAttribute("data-active", "true");
@@ -1295,8 +1357,8 @@ test("overview tasks and reviews are grouped and selectable by project", async (
   }
 });
 
-test("project section icons follow their titles", async ({ page }) => {
-  const expectIconAfterTitle = async (headerTestId: string) => {
+test("project section icons lead their titles", async ({ page }) => {
+  const expectIconBeforeTitle = async (headerTestId: string) => {
     const header = page.getByTestId(headerTestId);
     const [titleBox, iconBox] = await Promise.all([
       header.getByRole("heading").boundingBox(),
@@ -1304,8 +1366,8 @@ test("project section icons follow their titles", async ({ page }) => {
     ]);
     expect(titleBox).not.toBeNull();
     expect(iconBox).not.toBeNull();
-    expect(iconBox?.x ?? 0).toBeGreaterThan(
-      (titleBox?.x ?? 0) + (titleBox?.width ?? 0),
+    expect((iconBox?.x ?? 0) + (iconBox?.width ?? 0)).toBeLessThan(
+      titleBox?.x ?? 0,
     );
   };
 
@@ -1314,11 +1376,282 @@ test("project section icons follow their titles", async ({ page }) => {
   await page.goto("/", { waitUntil: "domcontentloaded" });
   await page.getByTestId("open-projects-view").click();
   await page.getByTestId("projects-section-issues").click();
-  await expectIconAfterTitle("projects-page-header");
+  await expectIconBeforeTitle("projects-page-header");
 
   await openBuzzProject(page);
   await page.getByRole("tab", { name: "Tasks", exact: true }).click();
-  await expectIconAfterTitle("project-section-header");
+  await expectIconBeforeTitle("project-section-header");
+});
+
+test("project detail lists follow overview header geometry", async ({
+  page,
+}) => {
+  await enableProjectsFeature(page);
+  await installMockBridge(page);
+  await openBuzzProject(page);
+
+  for (const [tab, title] of [
+    ["Tasks", "Tasks"],
+    ["Review", "Reviews"],
+  ] as const) {
+    await page.getByRole("tab", { name: tab, exact: true }).click();
+    const header = page.getByTestId("project-section-header");
+    const group = page.getByTestId("project-work-item-group-header").first();
+    const firstRow = page
+      .getByTestId(
+        tab === "Tasks" ? "project-issue-row" : "project-pull-request-row",
+      )
+      .first();
+    const [headerBox, titleBox, groupBox, groupLabelBox, rowTitleBox] =
+      await Promise.all([
+        header.boundingBox(),
+        header.getByRole("heading", { name: title, exact: true }).boundingBox(),
+        group.boundingBox(),
+        group.getByTestId("project-work-item-group-label").boundingBox(),
+        firstRow
+          .locator('[data-projects-text-priority="primary"]')
+          .boundingBox(),
+      ]);
+    expect(headerBox).not.toBeNull();
+    expect(titleBox).not.toBeNull();
+    expect(groupBox).not.toBeNull();
+    expect(groupLabelBox).not.toBeNull();
+    expect(rowTitleBox).not.toBeNull();
+    expect(
+      Math.abs((headerBox?.x ?? 0) - (groupBox?.x ?? 0)),
+    ).toBeLessThanOrEqual(1);
+    const headerRight = (headerBox?.x ?? 0) + (headerBox?.width ?? 0);
+    const groupRight = (groupBox?.x ?? 0) + (groupBox?.width ?? 0);
+    expect(Math.abs(headerRight - groupRight)).toBeLessThanOrEqual(2);
+    expect(
+      Math.abs((titleBox?.x ?? 0) - (groupLabelBox?.x ?? 0)),
+    ).toBeLessThanOrEqual(2);
+    expect(
+      Math.abs((groupLabelBox?.x ?? 0) - (rowTitleBox?.x ?? 0)),
+    ).toBeLessThanOrEqual(2);
+    expect(
+      (groupBox?.y ?? 0) - ((headerBox?.y ?? 0) + (headerBox?.height ?? 0)),
+    ).toBeGreaterThanOrEqual(8);
+  }
+
+  for (const [tab, title, rowTestId, rowInset] of [
+    ["Contributors", "Contributors", "project-contributor-row", 0],
+  ] as const) {
+    await page.getByRole("tab", { name: tab, exact: true }).click();
+    const header = page.getByTestId("project-section-header");
+    const row = page.getByTestId(rowTestId).first();
+    const [headerBox, titleBox, rowBox, rowTitleBox] = await Promise.all([
+      header.boundingBox(),
+      header.getByRole("heading", { name: title, exact: true }).boundingBox(),
+      row.boundingBox(),
+      row.locator('[data-projects-text-priority="primary"]').boundingBox(),
+    ]);
+    expect(headerBox).not.toBeNull();
+    expect(titleBox).not.toBeNull();
+    expect(rowBox).not.toBeNull();
+    expect(rowTitleBox).not.toBeNull();
+    expect(
+      Math.abs((rowBox?.x ?? 0) - (headerBox?.x ?? 0) - rowInset),
+    ).toBeLessThanOrEqual(2);
+    const headerRight = (headerBox?.x ?? 0) + (headerBox?.width ?? 0);
+    const rowRight = (rowBox?.x ?? 0) + (rowBox?.width ?? 0);
+    expect(Math.abs(headerRight - rowRight - rowInset)).toBeLessThanOrEqual(2);
+    expect(
+      Math.abs((titleBox?.x ?? 0) - (rowTitleBox?.x ?? 0)),
+    ).toBeLessThanOrEqual(2);
+  }
+
+  await page.getByRole("tab", { name: "Channels", exact: true }).click();
+  await expect(page.getByTestId("project-discussion-channels-panel")).toHaveCSS(
+    "padding-left",
+    "16px",
+  );
+  await expect(page.getByTestId("project-discussion-channels-panel")).toHaveCSS(
+    "padding-right",
+    "16px",
+  );
+});
+
+test("channels tab opens the latest matching conversation without leaving the project", async ({
+  page,
+}) => {
+  await enableProjectsFeature(page);
+  await installMockBridge(page);
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.getByTestId("channel-general").click();
+  await waitForMockLiveSubscription(page, "general");
+
+  const olderContent = "Older matching conversation for channels tab";
+  const latestContent = "Latest matching conversation for channels tab";
+  await page.evaluate(
+    ({ author, latestContent, olderContent, repoToken }) => {
+      const now = Math.floor(Date.now() / 1_000);
+      window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({
+        channelName: "general",
+        content: `${olderContent} ${repoToken}`,
+        createdAt: now - 1,
+        kind: 9,
+        pubkey: author,
+      });
+      window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({
+        channelName: "general",
+        content: `${latestContent} ${repoToken}`,
+        createdAt: now,
+        kind: 9,
+        pubkey: author,
+      });
+    },
+    {
+      author: TEST_IDENTITIES.alice.pubkey,
+      latestContent,
+      olderContent,
+      repoToken: `${DEFAULT_MOCK_PUBKEY} buzz`,
+    },
+  );
+
+  await page.getByTestId("open-projects-view").click();
+  await page.getByTestId("projects-section-projects").click();
+  const projectEntry = page
+    .locator(
+      '[data-testid="project-card-buzz"], [data-testid="project-row-buzz"]',
+    )
+    .first();
+  await expect(projectEntry).toBeVisible({ timeout: 10_000 });
+  await projectEntry.click();
+  await page.getByRole("tab", { name: "Channels", exact: true }).click();
+  const channelRow = page.getByTestId("project-channel-row").first();
+  await expect(channelRow).toBeVisible({ timeout: 10_000 });
+  await channelRow.click();
+
+  const panel = page.getByTestId("project-conversation-panel");
+  await expect(panel).toBeVisible();
+  await expect(panel).toContainText(latestContent);
+  await expect(panel).not.toContainText(olderContent);
+  await expect(page.getByTestId("project-detail-scroll")).toBeVisible();
+  await expect(
+    page.getByRole("tab", { name: "Channels", exact: true }),
+  ).toHaveAttribute("aria-selected", "true");
+});
+
+test("overview list titles share a row with controls and task groups align", async ({
+  page,
+}) => {
+  await enableProjectsFeature(page);
+  await installMockBridge(page);
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.getByTestId("open-projects-view").click();
+
+  const rowSelectors = {
+    issues: '[data-testid^="projects-issue-row-"]',
+    projects: '[data-testid^="project-row-"]',
+    prs: '[data-testid^="projects-pr-row-"]',
+    repositories: '[data-testid^="repository-row-"]',
+  };
+  for (const section of [
+    "projects",
+    "repositories",
+    "issues",
+    "prs",
+  ] as const) {
+    await page.getByTestId(`projects-section-${section}`).click();
+    const header = page.getByTestId("projects-page-header");
+    const [headingBox, controlsBox] = await Promise.all([
+      header.getByRole("heading").boundingBox(),
+      header.getByTestId("projects-list-header").boundingBox(),
+    ]);
+    expect(headingBox).not.toBeNull();
+    expect(controlsBox).not.toBeNull();
+    const headingCenter = (headingBox?.y ?? 0) + (headingBox?.height ?? 0) / 2;
+    const controlsCenter =
+      (controlsBox?.y ?? 0) + (controlsBox?.height ?? 0) / 2;
+    expect(Math.abs(headingCenter - controlsCenter)).toBeLessThanOrEqual(2);
+
+    await header.getByRole("button", { name: "List layout" }).click();
+    const row = page.locator(rowSelectors[section]).first();
+    await expect(row).toBeVisible();
+    const [layoutButtonBox, rowMenuBox] = await Promise.all([
+      header.getByRole("button", { name: "List layout" }).boundingBox(),
+      row.getByRole("button", { name: /More options for/ }).boundingBox(),
+    ]);
+    expect(layoutButtonBox).not.toBeNull();
+    expect(rowMenuBox).not.toBeNull();
+    const layoutRight =
+      (layoutButtonBox?.x ?? 0) + (layoutButtonBox?.width ?? 0);
+    const rowMenuRight = (rowMenuBox?.x ?? 0) + (rowMenuBox?.width ?? 0);
+    expect(Math.abs(layoutRight - rowMenuRight)).toBeLessThanOrEqual(2);
+  }
+
+  for (const [section, groupTestId, groupLabelTestId, hasListLayout] of [
+    [
+      "issues",
+      "projects-issue-project-group-header",
+      "project-issue-project",
+      true,
+    ],
+    [
+      "prs",
+      "projects-review-project-group-header",
+      "project-review-project",
+      true,
+    ],
+    [
+      "channels",
+      "projects-channel-project-group-header",
+      "project-channel-project",
+      false,
+    ],
+  ] as const) {
+    await page.getByTestId(`projects-section-${section}`).click();
+    if (hasListLayout) {
+      await page.getByRole("button", { name: "List layout" }).click();
+    }
+    const [headerBox, headerTitleBox, groupBox, groupLabelBox] =
+      await Promise.all([
+        page.getByTestId("projects-page-header").boundingBox(),
+        page
+          .getByTestId("projects-page-header")
+          .getByRole("heading")
+          .boundingBox(),
+        page.getByTestId(groupTestId).first().boundingBox(),
+        page.getByTestId(groupLabelTestId).first().boundingBox(),
+      ]);
+    expect(headerBox).not.toBeNull();
+    expect(headerTitleBox).not.toBeNull();
+    expect(groupBox).not.toBeNull();
+    expect(groupLabelBox).not.toBeNull();
+    expect(
+      Math.abs((headerBox?.x ?? 0) - (groupBox?.x ?? 0)),
+    ).toBeLessThanOrEqual(1);
+    const headerRight = (headerBox?.x ?? 0) + (headerBox?.width ?? 0);
+    const groupRight = (groupBox?.x ?? 0) + (groupBox?.width ?? 0);
+    expect(Math.abs(headerRight - groupRight)).toBeLessThanOrEqual(2);
+    expect(
+      Math.abs((headerTitleBox?.x ?? 0) - (groupLabelBox?.x ?? 0)),
+    ).toBeLessThanOrEqual(2);
+
+    if (section === "issues") {
+      const groupHeader = page.getByTestId(groupTestId).first();
+      const groupIcon = groupHeader.getByTestId("project-group-icon");
+      const groupCheckbox = groupHeader.getByTestId("projects-group-select");
+      await expect(groupIcon).toHaveCSS("opacity", "1");
+      await groupHeader.hover();
+      await expect(groupIcon).toHaveCSS("opacity", "0");
+      await expect(groupCheckbox.locator("..").locator("..")).toHaveCSS(
+        "opacity",
+        "1",
+      );
+      const [iconSlotBox, checkboxBox] = await Promise.all([
+        groupHeader.getByTestId("project-group-leading-icon").boundingBox(),
+        groupCheckbox.boundingBox(),
+      ]);
+      expect(iconSlotBox).not.toBeNull();
+      expect(checkboxBox).not.toBeNull();
+      const iconCenter = (iconSlotBox?.x ?? 0) + (iconSlotBox?.width ?? 0) / 2;
+      const checkboxCenter =
+        (checkboxBox?.x ?? 0) + (checkboxBox?.width ?? 0) / 2;
+      expect(Math.abs(iconCenter - checkboxCenter)).toBeLessThanOrEqual(1);
+    }
+  }
 });
 
 test("project overview presents collapsible context beside grouped activity", async ({
@@ -1413,7 +1746,7 @@ test("project overview presents collapsible context beside grouped activity", as
     page
       .getByTestId("projects-overview-context-panel")
       .getByTestId("projects-overview-activity"),
-  ).toBeVisible();
+  ).toHaveCount(0);
   await expect(
     page.getByTestId("projects-activity-group").first(),
   ).toContainText(/This week|Last week|Earlier/);
@@ -1442,7 +1775,8 @@ test("project overview presents collapsible context beside grouped activity", as
   expect(Math.abs((searchBox?.y ?? 0) - (firstTabBox?.y ?? 0))).toBeLessThan(8);
   expect(tabMenuBox?.y ?? 0).toBeLessThan(introBox?.y ?? 0);
   expect(introBox?.y ?? 0).toBeLessThan(feedBox?.y ?? 0);
-  expect(feedBox?.width ?? 0).toBeLessThan((contentPodBox?.width ?? 0) - 48);
+  expect(feedBox?.width ?? 0).toBeGreaterThan(600);
+  expect(feedBox?.width ?? 0).toBeLessThan((contentPodBox?.width ?? 0) - 32);
   const feedCenter = (feedBox?.x ?? 0) + (feedBox?.width ?? 0) / 2;
   const contentCenter =
     (contentPodBox?.x ?? 0) + (contentPodBox?.width ?? 0) / 2;
@@ -1531,7 +1865,7 @@ test("project overview presents collapsible context beside grouped activity", as
     page.getByTestId("projects-overview-create-project"),
   ).toBeVisible();
   await expect(page.getByTestId("projects-overview-people")).toBeVisible();
-  await expect(page.getByTestId("projects-overview-activity")).toBeVisible();
+  await expect(page.getByTestId("projects-overview-activity")).toHaveCount(0);
   await page.getByTestId("projects-section-repositories").click();
   await expect(page.getByTestId("projects-overview-context-title")).toHaveText(
     "Repositories",
@@ -1540,7 +1874,7 @@ test("project overview presents collapsible context beside grouped activity", as
     page.getByTestId("projects-overview-create-project"),
   ).toHaveCount(0);
   await expect(stats.nth(1)).toContainText("Active tasks");
-  await expect(page.getByTestId("projects-overview-activity")).toBeVisible();
+  await expect(page.getByTestId("projects-overview-activity")).toHaveCount(0);
   await page.getByTestId("projects-section-issues").click();
   await expect(page.getByTestId("projects-overview-context-title")).toHaveText(
     "Tasks",
@@ -1565,7 +1899,7 @@ test("project overview presents collapsible context beside grouped activity", as
   await expect(page.getByTestId("projects-overview-context-title")).toHaveText(
     "Projects",
   );
-  await expect(page.getByTestId("projects-overview-activity")).toBeVisible();
+  await expect(page.getByTestId("projects-overview-activity")).toHaveCount(0);
 
   await page.getByTestId("projects-overview-create-project").click();
   await expect(page.getByTestId("create-project-dialog")).toBeVisible();
@@ -1593,7 +1927,9 @@ test("project overview presents collapsible context beside grouped activity", as
   ).toHaveCount(0);
 });
 
-test("project overview content header toggles agent chat", async ({ page }) => {
+test("project overview chrome toggles a detached resizable agent chat", async ({
+  page,
+}) => {
   await enableProjectsFeature(page);
   await installMockBridge(page);
   await page.goto("/", { waitUntil: "domcontentloaded" });
@@ -1610,25 +1946,36 @@ test("project overview content header toggles agent chat", async ({ page }) => {
     "Chat with an agent about Reviews",
   );
   await expect(overviewChat).toHaveAttribute("aria-pressed", "false");
-  const [contentBox, chatBox] = await Promise.all([
-    page.getByTestId("projects-overview-content-pod").boundingBox(),
+  const overviewInfo = page.getByTestId("projects-overview-context-toggle");
+  const [chatBox, infoBox] = await Promise.all([
     overviewChat.boundingBox(),
+    overviewInfo.boundingBox(),
   ]);
-  expect(contentBox).not.toBeNull();
   expect(chatBox).not.toBeNull();
+  expect(infoBox).not.toBeNull();
   expect(
-    (contentBox?.x ?? 0) +
-      (contentBox?.width ?? 0) -
-      ((chatBox?.x ?? 0) + (chatBox?.width ?? 0)),
-  ).toBeLessThanOrEqual(20);
+    (infoBox?.x ?? 0) - ((chatBox?.x ?? 0) + (chatBox?.width ?? 0)),
+  ).toBeLessThanOrEqual(4);
+  const contextRail = page.getByTestId("projects-overview-context-rail");
+  await expect(overviewInfo).toHaveAttribute("aria-pressed", "true");
+  await overviewInfo.click();
+  await expect(overviewInfo).toHaveAttribute("aria-pressed", "false");
+  await expect(contextRail).toHaveCSS("width", "0px");
   await overviewChat.click();
   await expect(overviewChat).toHaveAttribute("aria-pressed", "true");
+  await expect(overviewInfo).toHaveAttribute("aria-pressed", "false");
+  await expect(contextRail).toHaveCSS("width", "0px");
   await expect(overviewChat).toBeVisible();
+  const chatRail = page.getByTestId("projects-overview-agent-rail");
+  await expect(chatRail.getByTestId("project-agent-chat-panel")).toBeVisible();
   await expect(
     page
       .getByTestId("projects-overview-content-pod")
       .getByTestId("project-agent-chat-panel"),
-  ).toBeVisible();
+  ).toHaveCount(0);
+  await expect(
+    chatRail.getByTestId("projects-overview-agent-rail-panel"),
+  ).toHaveCSS("border-radius", "16px");
   const agentHeader = page.getByTestId("project-agent-context");
   await expect
     .poll(() =>
@@ -1637,11 +1984,46 @@ test("project overview content header toggles agent chat", async ({ page }) => {
       ),
     )
     .not.toBe("none");
-  await expect(page.getByTestId("projects-overview-agent-rail")).toHaveCount(0);
+  await expect(contextRail).toHaveAttribute("aria-hidden", "true");
+  await overviewInfo.click();
+  await expect(overviewInfo).toHaveAttribute("aria-pressed", "true");
+  await expect(contextRail).toHaveAttribute("aria-hidden", "false");
   await expect(
     page.getByTestId("projects-overview-context-panel"),
   ).toBeVisible();
   const chatPanel = page.getByTestId("project-agent-chat-panel");
+  const resizeHandle = chatPanel.getByTestId(
+    "right-auxiliary-pane-resize-handle",
+  );
+  const [initialPanelBox, resizeHandleBox] = await Promise.all([
+    chatPanel.boundingBox(),
+    resizeHandle.boundingBox(),
+  ]);
+  expect(initialPanelBox).not.toBeNull();
+  expect(resizeHandleBox).not.toBeNull();
+  const resizeStartX =
+    (resizeHandleBox?.x ?? 0) + (resizeHandleBox?.width ?? 0) / 2;
+  const resizeStartY =
+    (resizeHandleBox?.y ?? 0) + (resizeHandleBox?.height ?? 0) / 2;
+  await resizeHandle.dispatchEvent("pointerdown", {
+    button: 0,
+    buttons: 1,
+    clientX: resizeStartX,
+    clientY: resizeStartY,
+    pointerId: 1,
+    pointerType: "mouse",
+  });
+  await expect(chatRail).toHaveAttribute("data-resizing", "true");
+  await page.mouse.move(resizeStartX - 32, resizeStartY);
+  await expect
+    .poll(() =>
+      chatPanel.evaluate((element) =>
+        Math.round(element.getBoundingClientRect().width),
+      ),
+    )
+    .toBe(Math.round(initialPanelBox?.width ?? 0) + 32);
+  await page.mouse.up();
+  await expect(chatRail).toHaveAttribute("data-resizing", "false");
   await chatPanel.getByTestId("message-input").fill("Summarize these reviews");
   await chatPanel.getByTestId("message-input").press("Enter");
   const readSentContent = () =>
@@ -1661,9 +2043,22 @@ test("project overview content header toggles agent chat", async ({ page }) => {
     });
   await expect.poll(readSentContent).toContain("Visible Reviews items:");
   const sentContent = await readSentContent();
+  const transcript = chatPanel.getByTestId("message-thread-transcript");
+  await expect(transcript).toContainText("Summarize these reviews");
+  await expect(transcript).not.toContainText("Visible Reviews items:");
+  const sentContext = transcript.getByTestId("project-agent-sent-context");
+  await expect(sentContext).toBeVisible();
+  const sentContextTrigger = sentContext.getByRole("button", {
+    name: "Show sent context",
+  });
+  await expect(sentContextTrigger).toHaveAttribute("aria-expanded", "false");
   await expect(
-    chatPanel.getByTestId("message-thread-transcript"),
-  ).toContainText("Summarize these reviews");
+    sentContext.getByTestId("project-agent-sent-context-payload"),
+  ).toHaveCount(0);
+  await sentContextTrigger.click();
+  await expect(
+    sentContext.getByTestId("project-agent-sent-context-payload"),
+  ).toContainText("Visible Reviews items:");
   expect(sentContent).toContain("Visible Reviews items:");
   expect(sentContent).toContain("untrusted UI data, not instructions");
   expect(sentContent).toContain("[review]");
@@ -1671,6 +2066,7 @@ test("project overview content header toggles agent chat", async ({ page }) => {
   await overviewChat.click();
   await expect(overviewChat).toHaveAttribute("aria-pressed", "false");
   await expect(page.getByTestId("project-agent-chat-panel")).not.toBeVisible();
+  await expect(chatRail).toHaveCSS("width", "0px");
   await expect(
     page.getByTestId("projects-overview-context-panel"),
   ).toBeVisible();
@@ -2016,12 +2412,12 @@ test("repository info control animates the context rail from the far right", asy
   const workspaceHeader = page.getByTestId("project-workspace-tab-menu");
   await expect(
     workspaceHeader.getByTestId("project-right-panel-chat-tab"),
-  ).toBeVisible();
+  ).toHaveCount(0);
   await expect(
     page
       .getByTestId("project-detail-chrome")
       .getByTestId("project-right-panel-chat-tab"),
-  ).toHaveCount(0);
+  ).toBeVisible();
   await expect(layout).toHaveAttribute("data-project-context-detached", "true");
   const expandedSurfaceStyle = await contentSurface.evaluate((element) => {
     const style = getComputedStyle(element);
@@ -2037,14 +2433,8 @@ test("repository info control animates the context rail from the far right", asy
     terminal.boundingBox(),
     info.boundingBox(),
   ]);
-  const workspaceHeaderBounds = await workspaceHeader.boundingBox();
-  expect(
-    (workspaceHeaderBounds?.x ?? 0) +
-      (workspaceHeaderBounds?.width ?? 0) -
-      ((chatBounds?.x ?? 0) + (chatBounds?.width ?? 0)),
-  ).toBeLessThanOrEqual(16);
-  expect(chatBounds?.x).toBeLessThan(terminalBounds?.x ?? 0);
-  expect(terminalBounds?.x).toBeLessThan(infoBounds?.x ?? 0);
+  expect(terminalBounds?.x).toBeLessThan(chatBounds?.x ?? 0);
+  expect(chatBounds?.x).toBeLessThan(infoBounds?.x ?? 0);
   await expect(info).toHaveCSS("background-color", "rgba(0, 0, 0, 0)");
   await expect(infoIcon).toHaveCSS("opacity", "1");
   await expect(rail).toHaveCSS("width", "288px");
@@ -2180,13 +2570,22 @@ test("selecting repository workspace rows switches the context pod to the cluste
       title: left('[data-projects-text-priority="primary"]'),
     };
   });
-  expect(reviewRowOrder.checkbox).toBeLessThan(reviewRowOrder.identifier);
-  expect(reviewRowOrder.identifier).toBeLessThan(reviewRowOrder.status);
+  expect(
+    Math.abs(reviewRowOrder.checkbox - reviewRowOrder.status),
+  ).toBeLessThanOrEqual(1);
   expect(reviewRowOrder.status).toBeLessThan(reviewRowOrder.title);
+  expect(reviewRowOrder.title).toBeLessThan(reviewRowOrder.identifier);
   await reviewRows.first().getByTestId("projects-row-select").click();
   await expect(
     reviewRows.first().getByTestId("project-work-item-status-icon"),
-  ).toBeVisible();
+  ).toHaveCSS("opacity", "0");
+  await expect(
+    reviewRows
+      .first()
+      .getByTestId("projects-row-select")
+      .locator("..")
+      .locator(".."),
+  ).toHaveCSS("opacity", "1");
   await expect(page.getByTestId("projects-overview-context-title")).toHaveText(
     "1 review",
   );
@@ -2819,7 +3218,10 @@ test("pushed local branch can open a pull request", async ({ page }) => {
     .getByRole("menuitemradio", { name: "feature/projects-workflow" })
     .click();
   await page.getByRole("tab", { name: "Review", exact: true }).click();
-  await page.getByRole("button", { name: "Create review" }).click();
+  await page
+    .getByTestId("project-section-header")
+    .getByRole("button", { name: "Create review" })
+    .click();
   await expect(page.getByTestId("create-pull-request-repository")).toHaveValue(
     /:buzz$/,
   );
diff --git a/desktop/tests/e2e/projects-v3-screenshots.spec.ts b/desktop/tests/e2e/projects-v3-screenshots.spec.ts
index 93578ef552..7548769e53 100644
--- a/desktop/tests/e2e/projects-v3-screenshots.spec.ts
+++ b/desktop/tests/e2e/projects-v3-screenshots.spec.ts
@@ -19,6 +19,37 @@ async function expectSinglePrimaryTextColumn(row: Locator) {
   expect(secondaryColors.every((color) => color !== primaryColor)).toBe(true);
 }
 
+async function expectProjectContextGroups(
+  panel: Locator,
+  { hasActions }: { hasActions: boolean },
+) {
+  const detailsHeading = panel.getByRole("heading", {
+    name: "Details",
+    exact: true,
+  });
+  await expect(detailsHeading).toBeVisible();
+  if (hasActions) {
+    await expect(panel.getByTestId("project-context-actions")).toBeVisible();
+  } else {
+    await expect(panel.getByTestId("project-context-actions")).toHaveCount(0);
+  }
+  for (const name of [
+    "Actions",
+    "Assignment",
+    "Discussion",
+    "People",
+    "Task details",
+    "Review details",
+    "Review activity",
+    "Repository activity",
+  ]) {
+    await expect(panel.getByRole("heading", { name, exact: true })).toHaveCount(
+      0,
+    );
+  }
+  await expect(panel.getByTestId("project-repository-people")).toHaveCount(0);
+}
+
 async function openBuzzProject(page: import("@playwright/test").Page) {
   await page.goto("/", { waitUntil: "domcontentloaded" });
   await page.getByTestId("open-projects-view").click();
@@ -40,7 +71,19 @@ test("projects activity overview screenshot", async ({ page }) => {
   await page.goto("/", { waitUntil: "domcontentloaded" });
   await page.getByTestId("open-projects-view").click();
   await expect(page.getByTestId("projects-page-tabs")).toBeVisible();
-  await expect(page.getByTestId("projects-page-header")).toBeVisible();
+  const activityHeader = page.getByTestId("projects-page-header");
+  const relayIcon = page.getByTestId("projects-activity-relay-icon");
+  await expect(activityHeader).toBeVisible();
+  await expect(relayIcon).toBeVisible();
+  const [activityHeaderBox, relayIconBox] = await Promise.all([
+    activityHeader.boundingBox(),
+    relayIcon.boundingBox(),
+  ]);
+  expect(activityHeaderBox).not.toBeNull();
+  expect(relayIconBox).not.toBeNull();
+  expect((relayIconBox?.y ?? 0) + (relayIconBox?.height ?? 0)).toBeLessThan(
+    activityHeaderBox?.y ?? 0,
+  );
   await expect(page.getByTestId("projects-activity-search")).toBeVisible();
   await expect(page.getByTestId("projects-activity-intro")).toContainText(
     "Projects Activity",
@@ -58,6 +101,40 @@ test("projects activity overview screenshot", async ({ page }) => {
   await page.screenshot({ path: `${SHOTS}/00-projects-pulse.png` });
 });
 
+test("submitted project context stays compact and expandable", async ({
+  page,
+}) => {
+  await installMockBridge(page);
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.getByTestId("open-projects-view").click();
+  await page.getByTestId("projects-section-prs").click();
+  await page.getByRole("button", { name: "List layout" }).click();
+  await page.getByTestId("projects-overview-chat-toggle").click();
+
+  const panel = page.getByTestId("project-agent-chat-panel");
+  await panel.getByTestId("message-input").fill("Summarize these reviews");
+  await panel.getByTestId("message-input").press("Enter");
+  const context = panel.getByTestId("project-agent-sent-context");
+  await expect(context).toBeVisible();
+  await expect(
+    panel.getByRole("button", { name: "Preview message context" }),
+  ).toBeVisible();
+
+  await waitForAnimations(page);
+  await panel.screenshot({
+    path: `${SHOTS}/08-agent-context-collapsed.png`,
+  });
+
+  await context.getByRole("button", { name: "Show sent context" }).click();
+  await expect(
+    context.getByTestId("project-agent-sent-context-payload"),
+  ).toBeVisible();
+  await waitForAnimations(page);
+  await panel.screenshot({
+    path: `${SHOTS}/09-agent-context-expanded.png`,
+  });
+});
+
 test("sidebar project add flow browses before creating", async ({ page }) => {
   await installMockBridge(page);
   await page.goto("/", { waitUntil: "domcontentloaded" });
@@ -205,7 +282,7 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   const repositoryActionsPanel = page.getByTestId(
     "project-repository-actions-panel",
   );
-  const expectFullWidthSection = async () => {
+  const expectInsetSection = async () => {
     const sectionHeader = workspacePanel.getByTestId("project-section-header");
     const [workspaceBox, headerBox, menuBox] = await Promise.all([
       workspacePanel.boundingBox(),
@@ -215,8 +292,14 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
     expect(workspaceBox).not.toBeNull();
     expect(headerBox).not.toBeNull();
     expect(menuBox).not.toBeNull();
-    expect(headerBox?.x).toBe(workspaceBox?.x);
-    expect(headerBox?.width).toBe(workspaceBox?.width);
+    expect(Math.round((headerBox?.x ?? 0) - (workspaceBox?.x ?? 0))).toBe(16);
+    expect(
+      Math.round(
+        (workspaceBox?.x ?? 0) +
+          (workspaceBox?.width ?? 0) -
+          ((headerBox?.x ?? 0) + (headerBox?.width ?? 0)),
+      ),
+    ).toBe(16);
     expect(workspaceBox?.x).toBe(menuBox?.x);
     expect((workspaceBox?.x ?? 0) + (workspaceBox?.width ?? 0)).toBe(
       (menuBox?.x ?? 0) + (menuBox?.width ?? 0),
@@ -249,37 +332,23 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   });
   await expect(repositoryHeading).toBeVisible();
   await expect(repositoryHeading).toHaveCSS("font-size", "14px");
-  await expect(
-    repositoryActionsPanel.getByRole("heading", {
-      name: "Actions",
-      exact: true,
-    }),
-  ).toHaveCount(0);
+  await expectProjectContextGroups(repositoryActionsPanel, {
+    hasActions: true,
+  });
   await expect(
     repositoryActionsPanel.getByRole("heading", {
       name: "Languages",
       exact: true,
     }),
   ).toHaveCount(0);
-  await expect(
-    repositoryActionsPanel.getByRole("heading", {
-      name: "People",
-      exact: true,
-    }),
-  ).toHaveCount(0);
   const detailsHeading = repositoryActionsPanel.getByRole("heading", {
     name: "Details",
     exact: true,
   });
-  const peopleContent = repositoryActionsPanel.getByTestId(
-    "project-repository-people",
-  );
-  const peopleSection = peopleContent.locator("..");
   const fetchButton = repositoryActionsPanel.getByRole("button", {
     name: "Fetch",
     exact: true,
   });
-  await expect(peopleSection).toHaveCSS("border-top-width", "0px");
   await expect(detailsHeading.locator("..")).toHaveCSS(
     "border-top-width",
     "0px",
@@ -291,37 +360,25 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   ).toBe(
     await detailsHeading.evaluate((element) => getComputedStyle(element).color),
   );
-  const actionsSection = repositoryActionsPanel
-    .getByRole("button", { name: "Terminal", exact: true })
-    .locator("..")
-    .locator("..");
-  const [actionsSectionBounds, peopleSectionBounds, detailsHeadingBounds] =
+  const actionsSection = repositoryActionsPanel.getByTestId(
+    "project-context-actions",
+  );
+  const detailsSection = repositoryActionsPanel.getByTestId(
+    "project-context-details",
+  );
+  const [actionsSectionBounds, detailsSectionBounds, detailsHeadingBounds] =
     await Promise.all([
       actionsSection.boundingBox(),
-      peopleSection.boundingBox(),
+      detailsSection.boundingBox(),
       detailsHeading.boundingBox(),
     ]);
   expect(
-    (peopleSectionBounds?.y ?? 0) -
+    (detailsSectionBounds?.y ?? 0) -
       ((actionsSectionBounds?.y ?? 0) + (actionsSectionBounds?.height ?? 0)),
   ).toBe(8);
-  expect((detailsHeadingBounds?.y ?? 0) - (peopleSectionBounds?.y ?? 0)).toBe(
+  expect((detailsHeadingBounds?.y ?? 0) - (detailsSectionBounds?.y ?? 0)).toBe(
     8,
   );
-  const people = repositoryActionsPanel.getByTestId(
-    "project-repository-person",
-  );
-  const [firstPersonBounds, secondPersonBounds] = await Promise.all([
-    people.nth(0).boundingBox(),
-    people.nth(1).boundingBox(),
-  ]);
-  expect(secondPersonBounds?.x ?? 0).toBeLessThan(
-    (firstPersonBounds?.x ?? 0) + (firstPersonBounds?.width ?? 0),
-  );
-  await people.first().hover();
-  await expect(
-    page.getByTestId("project-repository-person-tooltip").first(),
-  ).toBeVisible();
   await expect(fetchButton).toHaveCSS("text-align", "left");
   const sourceButton = repositoryActionsPanel.getByRole("button", {
     name: "Remote",
@@ -334,6 +391,7 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
     alignedDetailsHeadingBounds,
     sourceButtonBounds,
     sourceSectionBounds,
+    repositoryActionListBounds,
     sourceTrailingIconBounds,
     fetchButtonBounds,
     fetchIconBounds,
@@ -344,7 +402,12 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   ] = await Promise.all([
     detailsHeading.boundingBox(),
     sourceButton.boundingBox(),
-    sourceButton.locator("..").locator("..").boundingBox(),
+    repositoryActionsPanel
+      .getByTestId("project-context-source-controls")
+      .boundingBox(),
+    repositoryActionsPanel
+      .getByTestId("project-context-repository-actions")
+      .boundingBox(),
     sourceButton.locator("svg").last().boundingBox(),
     fetchButton.boundingBox(),
     fetchButton.locator("svg").first().boundingBox(),
@@ -364,7 +427,7 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   expect(fetchButtonBounds?.height).toBe(28);
   expect(latestDetailRowBounds?.height).toBe(28);
   expect(
-    (actionsSectionBounds?.y ?? 0) -
+    (repositoryActionListBounds?.y ?? 0) -
       ((sourceSectionBounds?.y ?? 0) + (sourceSectionBounds?.height ?? 0)),
   ).toBe(2);
   expect(fetchButtonBounds?.x ?? 0).toBeLessThan(
@@ -559,8 +622,8 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
       terminalButton.boundingBox(),
     ]);
   expect(repositoryTabBounds?.width).toBe(chatTabBounds?.width);
-  expect(chatTabBounds?.x).toBeLessThan(terminalTabBounds?.x ?? 0);
-  expect(terminalTabBounds?.x).toBeLessThan(repositoryTabBounds?.x ?? 0);
+  expect(terminalTabBounds?.x).toBeLessThan(chatTabBounds?.x ?? 0);
+  expect(chatTabBounds?.x).toBeLessThan(repositoryTabBounds?.x ?? 0);
   await chatPanelTab.click();
   const agentChatPanel = page.getByTestId("project-agent-chat-panel");
   await expect(agentChatPanel).toBeVisible();
@@ -718,10 +781,7 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
     "aria-label",
     "Hide project context",
   );
-  await expect(page.getByTestId("project-detail-copy-link")).toBeVisible();
-  await expect(
-    repositoryActionsPanel.getByTestId("project-detail-copy-link"),
-  ).toHaveCount(0);
+  await expect(page.getByTestId("project-detail-copy-link")).toHaveCount(0);
   await expect(
     workspacePanel.getByTestId("project-workspace-tab-menu"),
   ).toHaveCount(0);
@@ -785,6 +845,13 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   await expect(
     workspacePanel.getByTestId("project-repository-entry-icon").first(),
   ).toHaveCSS("border-radius", "8px");
+  const repositoryEntryCell = workspacePanel
+    .getByTestId("project-repository-entry-row")
+    .first()
+    .locator("td")
+    .first();
+  await expect(repositoryEntryCell).toHaveCSS("border-radius", "0px");
+  await expect(repositoryEntryCell).toHaveCSS("border-bottom-width", "0px");
   await chatPanelTab.click();
   await expect(agentContext).toContainText("Files");
   await expect(
@@ -792,13 +859,13 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   ).toBeVisible();
   await repositoryPanelTab.click();
   await expect(repositoryActionsPanel).toBeVisible();
-  await expectFullWidthSection();
+  await expectInsetSection();
   await page.getByRole("tab", { name: "Commits" }).click();
   await expect(repositoryActionsPanel).toBeVisible();
   await expect(
     workspacePanel.getByRole("heading", { name: "Commits", exact: true }),
   ).toBeVisible();
-  await expectFullWidthSection();
+  await expectInsetSection();
   const commitRow = page.getByTestId("project-activity-feed-item").first();
   const commitDate = commitRow.getByTestId("project-commit-row-date");
   const commitHash = commitRow.getByTitle(/^View commit /);
@@ -809,7 +876,7 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   expect(commitHashBounds).not.toBeNull();
   expect(commitDateBounds?.x).toBeGreaterThan(commitHashBounds?.x ?? 0);
   await contributorsTab.click();
-  await expectFullWidthSection();
+  await expectInsetSection();
   const contributorRow = page.getByTestId("project-contributor-row").first();
   await expect(
     contributorRow.getByTestId("project-contributor-commit-count"),
@@ -855,12 +922,9 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   await expect(
     repositoryActionsPanel.getByText("Working copy", { exact: true }),
   ).toHaveCount(0);
-  await expect(
-    repositoryActionsPanel.getByRole("heading", {
-      name: "Actions",
-      exact: true,
-    }),
-  ).toHaveCount(0);
+  await expectProjectContextGroups(repositoryActionsPanel, {
+    hasActions: false,
+  });
   for (const action of ["Clone", "Fetch", "Terminal"]) {
     await expect(
       repositoryActionsPanel.getByRole("button", {
@@ -869,35 +933,34 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
       }),
     ).toHaveCount(0);
   }
-  await expectFullWidthSection();
+  await expectInsetSection();
 
   // Issues tab: the create action lives in the section header.
   await page.getByRole("tab", { name: "Tasks", exact: true }).click();
   await expect(repositoryActionsPanel).toBeVisible();
-  await expect(
-    repositoryActionsPanel
-      .getByTestId("project-repository-people")
-      .locator(".."),
-  ).toHaveCSS("border-top-width", "0px");
+  await expectProjectContextGroups(repositoryActionsPanel, {
+    hasActions: true,
+  });
   await expect(
     repositoryActionsPanel.getByRole("heading", {
       name: "Task activity",
       exact: true,
     }),
   ).toHaveCount(0);
-  const taskDetailsHeading = repositoryActionsPanel.getByRole("heading", {
-    name: "Details",
-    exact: true,
-  });
-  await expect(taskDetailsHeading).toBeVisible();
-  const [taskDetailsBounds, taskPeopleBounds] = await Promise.all([
-    taskDetailsHeading.boundingBox(),
-    repositoryActionsPanel
-      .getByTestId("project-repository-people")
-      .boundingBox(),
+  const taskActionsSection = repositoryActionsPanel.getByTestId(
+    "project-context-actions",
+  );
+  const taskDetailsSection = repositoryActionsPanel.getByTestId(
+    "project-context-details",
+  );
+  const [taskActionsBounds, taskDetailsBounds] = await Promise.all([
+    taskActionsSection.boundingBox(),
+    taskDetailsSection.boundingBox(),
   ]);
-  expect(taskDetailsBounds?.y ?? 0).toBeLessThan(taskPeopleBounds?.y ?? 0);
-  await expectFullWidthSection();
+  expect(taskDetailsBounds?.y ?? 0).toBeGreaterThan(
+    (taskActionsBounds?.y ?? 0) + (taskActionsBounds?.height ?? 0),
+  );
+  await expectInsetSection();
   const newIssueButton = workspacePanel.getByRole("button", {
     name: "Create task",
   });
@@ -935,8 +998,14 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
     (firstIssueBounds?.y ?? 0) -
       ((issueHeaderBounds?.y ?? 0) + (issueHeaderBounds?.height ?? 0)),
   ).toBe(4);
-  expect(firstIssueBounds?.x).toBe(issueHeaderBounds?.x);
-  expect(firstIssueBounds?.width).toBe(issueHeaderBounds?.width);
+  expect(
+    Math.round((firstIssueBounds?.x ?? 0) - (issueHeaderBounds?.x ?? 0)),
+  ).toBe(8);
+  expect(
+    Math.round(
+      (issueHeaderBounds?.width ?? 0) - (firstIssueBounds?.width ?? 0),
+    ),
+  ).toBe(16);
   expect(
     (secondIssueBounds?.y ?? 0) -
       ((firstIssueBounds?.y ?? 0) + (firstIssueBounds?.height ?? 0)),
@@ -972,6 +1041,9 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
     });
   }
   await expect(page.getByTestId("project-issue-copy-link")).toBeVisible();
+  await expectProjectContextGroups(repositoryActionsPanel, {
+    hasActions: true,
+  });
   const issueDetail = page.getByTestId("project-issue-detail");
   await expect(issueDetail).toHaveCSS("max-width", "768px");
   await expect(
@@ -997,7 +1069,7 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   await waitForAnimations(page);
   await page.screenshot({ path: `${SHOTS}/03-issue-detail.png` });
 
-  // PR list: section header owns creation; detail keeps its entity header.
+  // PR list: the create action lives in both the section header and context.
   await page
     .getByRole("navigation", { name: "Project breadcrumb" })
     .getByRole("button", { name: "Tasks", exact: true })
@@ -1007,12 +1079,9 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   await expect(
     repositoryActionsPanel.getByTestId("project-right-panel-scope"),
   ).toHaveCount(0);
-  await expect(
-    repositoryActionsPanel.getByRole("heading", {
-      name: "Review activity",
-      exact: true,
-    }),
-  ).toBeVisible();
+  await expectProjectContextGroups(repositoryActionsPanel, {
+    hasActions: true,
+  });
   await expect(
     workspacePanel.getByRole("heading", {
       name: "Reviews",
@@ -1022,7 +1091,15 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   await expect(
     workspacePanel.getByRole("button", { name: "Create review" }),
   ).toBeVisible();
-  await expectFullWidthSection();
+  const contextCreateReviewButton = repositoryActionsPanel.getByRole("button", {
+    name: "Create review",
+    exact: true,
+  });
+  await expect(contextCreateReviewButton).toBeVisible();
+  await contextCreateReviewButton.click();
+  await expect(page.getByTestId("create-pull-request-dialog")).toBeVisible();
+  await page.keyboard.press("Escape");
+  await expectInsetSection();
   await expect(
     tabMenu.getByRole("button", { name: "Create review" }),
   ).toHaveCount(0);
@@ -1038,8 +1115,14 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
     (firstReviewBounds?.y ?? 0) -
       ((reviewHeaderBounds?.y ?? 0) + (reviewHeaderBounds?.height ?? 0)),
   ).toBe(4);
-  expect(firstReviewBounds?.x).toBe(reviewHeaderBounds?.x);
-  expect(firstReviewBounds?.width).toBe(reviewHeaderBounds?.width);
+  expect(
+    Math.round((firstReviewBounds?.x ?? 0) - (reviewHeaderBounds?.x ?? 0)),
+  ).toBe(8);
+  expect(
+    Math.round(
+      (reviewHeaderBounds?.width ?? 0) - (firstReviewBounds?.width ?? 0),
+    ),
+  ).toBe(16);
   expect(
     (secondReviewBounds?.y ?? 0) -
       ((firstReviewBounds?.y ?? 0) + (firstReviewBounds?.height ?? 0)),
@@ -1056,6 +1139,9 @@ test("projects v3 workspace screenshot states", async ({ page }) => {
   await expect(
     page.getByTestId("project-pull-request-copy-link"),
   ).toBeVisible();
+  await expectProjectContextGroups(repositoryActionsPanel, {
+    hasActions: true,
+  });
   const pullRequestDetail = page.getByTestId("project-pull-request-detail");
   await expect(pullRequestDetail).toHaveCSS("max-width", "768px");
   await expect(
@@ -1103,9 +1189,24 @@ test("projects v3 work-item list metadata", async ({ page }) => {
   );
 
   await page.getByTestId("projects-section-projects").click();
-  await expectSinglePrimaryTextColumn(
-    page.getByTestId(/^project-row-/).first(),
+  await expect(page.getByTestId("projects-list-header")).toHaveCSS(
+    "border-left-width",
+    "0px",
   );
+  const projectRow = page.getByTestId(/^project-row-/).first();
+  await expectSinglePrimaryTextColumn(projectRow);
+  const [projectTitleBox, repositoryCountBox] = await Promise.all([
+    projectRow.locator('[data-projects-text-priority="primary"]').boundingBox(),
+    projectRow.getByTestId("projects-row-context").boundingBox(),
+  ]);
+  expect(projectTitleBox).not.toBeNull();
+  expect(repositoryCountBox).not.toBeNull();
+  expect(
+    Math.round(
+      (repositoryCountBox?.x ?? 0) -
+        ((projectTitleBox?.x ?? 0) + (projectTitleBox?.width ?? 0)),
+    ),
+  ).toBe(12);
 
   await page.getByTestId("projects-section-repositories").click();
   await expectSinglePrimaryTextColumn(
diff --git a/desktop/tests/e2e/sidebar.spec.ts b/desktop/tests/e2e/sidebar.spec.ts
index 01d9d64d67..f2b3105812 100644
--- a/desktop/tests/e2e/sidebar.spec.ts
+++ b/desktop/tests/e2e/sidebar.spec.ts
@@ -531,6 +531,47 @@ test("aligns the sidebar search with the channel title outside the Buzz theme",
   expect(Math.abs(searchCenter - channelTitleCenter)).toBeLessThanOrEqual(2);
 });
 
+test("keeps only search pinned while primary navigation scrolls", async ({
+  page,
+}) => {
+  await loadTheme(page, "github-light");
+
+  const search = page.getByTestId("open-search");
+  const primaryMenu = page.getByTestId("sidebar-primary-menu");
+  const sidebarScroller = page.locator(".buzz-sidebar-scrollbar");
+  const [initialSearchBox, initialMenuBox] = await Promise.all([
+    search.boundingBox(),
+    primaryMenu.boundingBox(),
+  ]);
+  expect(initialSearchBox).not.toBeNull();
+  expect(initialMenuBox).not.toBeNull();
+
+  const scrollTop = await sidebarScroller.evaluate((element) => {
+    element.scrollTop = Math.min(
+      120,
+      Math.max(0, element.scrollHeight - element.clientHeight),
+    );
+    return element.scrollTop;
+  });
+  expect(scrollTop).toBeGreaterThan(0);
+  await expect
+    .poll(() =>
+      sidebarScroller.evaluate((element) => Math.round(element.scrollTop)),
+    )
+    .toBe(Math.round(scrollTop));
+
+  const [scrolledSearchBox, scrolledMenuBox] = await Promise.all([
+    search.boundingBox(),
+    primaryMenu.boundingBox(),
+  ]);
+  expect(scrolledSearchBox).not.toBeNull();
+  expect(scrolledMenuBox).not.toBeNull();
+  expect(
+    Math.abs((scrolledSearchBox?.y ?? 0) - (initialSearchBox?.y ?? 0)),
+  ).toBeLessThanOrEqual(1);
+  expect(scrolledMenuBox?.y ?? 0).toBeLessThan(initialMenuBox?.y ?? 0);
+});
+
 test("scales the sidebar backward while its chrome closes", async ({
   page,
 }) => {

From 2edacde4d4c01490834725774aa878dbc373c41d Mon Sep 17 00:00:00 2001
From: Tyler <109685178+tlongwell-block@users.noreply.github.com>
Date: Fri, 21 Aug 2026 09:02:21 -0400
Subject: [PATCH 10/38] chore(deps): pin earshot below 1.2.0 pending a VAD
 threshold re-pick (#6392)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Problem

`earshot` is our huddle VAD. `desktop/src-tauri/Cargo.toml:143` declares
`earshot = "1.0"` — a caret range — so **only the lockfile** holds us at
1.1.0. `renovate.json` has `automerge: true` with `postUpdateOptions:
["cargo:updateLockfile"]`, and exempts only *major* bumps from
automerge. 1.2.2 published 2026-08-19 and satisfies the range, so it is
eligible on Renovate's next run.

That bump is not safe to take on its own. It is a **quantized
re-implementation, not a tuning release**: `weights.bin` goes 77,124 →
39,940 bytes, the RNN weights move `f32` → `i16`, the mel filterbank
offsets are rebuilt, and `sqrtf` is replaced with a fast `rsqrtf`. Same
crate name, different network — and the probability scale moves with it
(1.1.0 never exceeds 0.935 and puts 1.0% of frames above 0.9; 1.2.2
reaches 0.9909 with 35.4% above 0.9).

Measured on a matched 121-clip corpus (11 Pocket TTS voices × 11
conditions, 38,254 scored frames), at our shipped threshold:

| metric | 1.1.0 | 1.2.2 |
|---|---|---|
| TPR | 89.57% | **88.46%** |
| FPR | 1.54% | **2.79%** |
| CPU / frame | 6,550–6,777 ns | **3,841–3,978 ns** |

AUC does improve (+0.0045 all-conditions) and CPU is a genuine 1.70x
win, so the bump is worth taking — but the AUC gain is in an ROC region
we do not operate in, and the FPR-matched threshold for 1.2.2 is ~0.574,
not 0.5. It needs a threshold re-pick, not a lockfile bump.

The risk is the shape of the diff. The last earshot bump — #654, "update
rust crate earshot to v1.1.0" — was lockfile-only (+23/−26, one file)
and went from opened to merged in **15 minutes**. That is the correct
instinct for a lockfile bump and exactly wrong here: two lines in
`Cargo.lock` would silently re-tune the VAD.

## Fix

One `packageRules` entry pinning earshot below 1.2.0, following the
existing `evalexpr` and `@tiptap/*` pin pattern in the same file. The
rationale lives in the `description` field so the next person to hit the
pin sees why.

A source comment cannot prevent this, because Renovate does not read
comments. This is the mechanical guard.

## Verification

- `renovate.json` parses; the new entry's key set matches the two
existing `allowedVersions` pins.
- Range semantics checked: 1.0.0 / 1.1.0 / 1.1.9 allowed; 1.2.0 / 1.2.1
/ 1.2.2 / 2.0.0 blocked.
- All eight pre-push gates green (branch-skew, file-size, desktop
check/typecheck/test, mobile, rust-tests, desktop-tauri-checks).
- I could **not** run `renovate-config-validator` — the npm registry is
unreachable from this host (`ECONNRESET` via the Artifactory mirror).
The checks above are a structural and semantic substitute, not a
substitute for the official validator.

## Scope

Config-only. No behavior change, no code touched. Unblocking is a
deliberate follow-up: take 1.2.2 together with a threshold re-pick
against the same corpus, which is already parked in the Silero bake-off
arc.

Measurement details and the harness are in my workspace at
`RESEARCH/EARSHOT_1_1_0_TO_1_2_2_MEASUREMENT_2026_08_20.md` (not in this
repo).

Signed-off-by: Dawn <c6237ef84fa537c78dcee78efd2d4e59f728859c7f194da42ac51ededfa0be05@buzz.block.builderlab.xyz>
Signed-off-by: Tyler <tlongwell@block.xyz>
Co-authored-by: Dawn <c6237ef84fa537c78dcee78efd2d4e59f728859c7f194da42ac51ededfa0be05@buzz.block.builderlab.xyz>
Co-authored-by: Tyler <tlongwell@block.xyz>
---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/renovate.json b/renovate.json
index e827ca8a5a..ee07aae898 100644
--- a/renovate.json
+++ b/renovate.json
@@ -34,6 +34,12 @@
       "matchManagers": ["cargo"],
       "groupName": "redis"
     },
+    {
+      "description": "earshot 1.2.x is a quantized re-implementation, not a tuning release: RNN weights move f32 -> i16 and the probability scale shifts, so the huddle VAD's calibrated threshold regresses at the shipped operating point (TPR 89.57% -> 88.46%, FPR 1.54% -> 2.79% on a matched 121-clip corpus). Unpin only together with a threshold re-pick against that corpus — see the VAD threshold constants in desktop/src-tauri/src/huddle/stt.rs.",
+      "matchPackageNames": ["earshot"],
+      "matchManagers": ["cargo"],
+      "allowedVersions": "<1.2.0"
+    },
     {
       "description": "tiptap 3.23.x breaks editor lifecycle under real relay latency — pin until upstream stabilizes.",
       "matchPackageNames": ["@tiptap/{/,}**"],

From ffb12d3b05fe1ebd62006dbcd2f079be4e210b70 Mon Sep 17 00:00:00 2001
From: klopez4212 <klopez4212@gmail.com>
Date: Fri, 21 Aug 2026 15:27:30 +0100
Subject: [PATCH 11/38] Fix mobile thread tail and iOS channel header (#6399)

## Summary

- Hide the thread Latest control once the lazy tail is fully reached.
- Polish the mobile channel header and use native iOS liquid glass for
Back.
- Keep the two-line header aligned and safe at larger text sizes.

## Validation

- `just mobile-check`
- `flutter test` (1,553 tests)
- Signed iPhone build installed and launched

---------

Signed-off-by: kenny lopez <klopez4212@gmail.com>
Co-authored-by: Carl <3c4caeafb646d23867f1c4832e68211d77e2561946171625f75c3ce1a3f2670f@buzz.block.builderlab.xyz>
---
 mobile/ios/Runner/AppDelegate.swift           |   9 +
 .../ios/Runner/JumpToLatestGlassButton.swift  | 216 ++++++++++++
 mobile/ios/RunnerTests/RunnerTests.swift      |  98 ++++++
 .../channels/channel_detail_page.dart         |  69 ++--
 .../channels/channel_detail_page/app_bar.dart |  87 +++--
 mobile/lib/features/channels/compose_bar.dart |   1 +
 .../channels/compose_bar/camera_preview.dart  |  10 +
 .../compose_bar/ios_photo_picker.dart         |  27 +-
 .../compose_bar/photo_gallery_picker.dart     |  30 +-
 .../features/channels/media_viewer_page.dart  |   4 +-
 .../media_viewer_page/image_controls.dart     |  28 ++
 .../media_viewer_page/video_viewer.dart       |   3 +-
 .../channels/thread_detail_helpers.dart       |  13 +
 .../features/channels/thread_detail_page.dart |  48 ++-
 mobile/lib/features/pairing/pairing_page.dart |  19 +-
 .../lib/features/settings/settings_page.dart  |  38 +-
 .../lib/shared/widgets/buzz_sheet_header.dart |  22 +-
 .../lib/shared/widgets/frosted_app_bar.dart   |  28 +-
 .../widgets/ios_glass_navigation_button.dart  | 164 +++++++++
 mobile/pubspec.lock                           |   8 +
 mobile/pubspec.yaml                           |   1 +
 .../channels/channel_detail_page_test.dart    | 331 +++++++++++++++++-
 .../features/pairing/pairing_page_test.dart   |  15 +
 .../features/settings/settings_page_test.dart |  29 ++
 .../shared/widgets/frosted_app_bar_test.dart  | 112 ++++++
 .../widgets/modal_presentation_test.dart      |  15 +-
 26 files changed, 1298 insertions(+), 127 deletions(-)
 create mode 100644 mobile/lib/shared/widgets/ios_glass_navigation_button.dart

diff --git a/mobile/ios/Runner/AppDelegate.swift b/mobile/ios/Runner/AppDelegate.swift
index e4ee6dbd91..b42f86326c 100644
--- a/mobile/ios/Runner/AppDelegate.swift
+++ b/mobile/ios/Runner/AppDelegate.swift
@@ -99,6 +99,15 @@ import UserNotifications
       )
     }
 
+    if let navigationGlassRegistrar = engineBridge.pluginRegistry.registrar(
+      forPlugin: "BuzzNavigationGlassButton"
+    ) {
+      navigationGlassRegistrar.register(
+        NavigationGlassButtonFactory(messenger: messenger),
+        withId: "buzz/navigation_glass"
+      )
+    }
+
     if let stickyDateGlassRegistrar = engineBridge.pluginRegistry.registrar(
       forPlugin: "BuzzStickyDateGlassHeader"
     ) {
diff --git a/mobile/ios/Runner/JumpToLatestGlassButton.swift b/mobile/ios/Runner/JumpToLatestGlassButton.swift
index 0e96a78ec0..f613dea711 100644
--- a/mobile/ios/Runner/JumpToLatestGlassButton.swift
+++ b/mobile/ios/Runner/JumpToLatestGlassButton.swift
@@ -40,6 +40,24 @@ private final class JumpToLatestGlassButton: UIButton {
   }
 }
 
+final class NavigationGlassButton: UIButton {
+  var hitTargetInsets = UIEdgeInsets.zero
+
+  override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+    guard isEnabled, isUserInteractionEnabled, !isHidden, alpha > 0.01 else {
+      return false
+    }
+    return bounds
+      .inset(by: UIEdgeInsets(
+        top: -hitTargetInsets.top,
+        left: -hitTargetInsets.left,
+        bottom: -hitTargetInsets.bottom,
+        right: -hitTargetInsets.right
+      ))
+      .contains(point)
+  }
+}
+
 final class JumpToLatestGlassButtonPlatformView: NSObject, FlutterPlatformView {
   private let containerView: UIView
   private let channel: FlutterMethodChannel
@@ -123,3 +141,201 @@ final class JumpToLatestGlassButtonPlatformView: NSObject, FlutterPlatformView {
     channel.setMethodCallHandler(nil)
   }
 }
+
+final class NavigationGlassButtonFactory: NSObject, FlutterPlatformViewFactory {
+  private let messenger: FlutterBinaryMessenger
+
+  init(messenger: FlutterBinaryMessenger) {
+    self.messenger = messenger
+    super.init()
+  }
+
+  func createArgsCodec() -> FlutterMessageCodec & NSObjectProtocol {
+    FlutterStandardMessageCodec.sharedInstance()
+  }
+
+  func create(
+    withFrame frame: CGRect,
+    viewIdentifier viewId: Int64,
+    arguments args: Any?
+  ) -> FlutterPlatformView {
+    NavigationGlassButtonPlatformView(
+      frame: frame,
+      viewIdentifier: viewId,
+      arguments: args,
+      messenger: messenger
+    )
+  }
+}
+
+final class NavigationGlassButtonPlatformView: NSObject, FlutterPlatformView {
+  private let containerView: UIView
+  private let channel: FlutterMethodChannel
+  private let button = NavigationGlassButton(type: .system)
+
+  init(
+    frame: CGRect,
+    viewIdentifier viewId: Int64,
+    arguments args: Any?,
+    messenger: FlutterBinaryMessenger
+  ) {
+    containerView = UIView(frame: frame)
+    channel = FlutterMethodChannel(
+      name: "buzz/navigation_glass/\(viewId)",
+      binaryMessenger: messenger
+    )
+    super.init()
+
+    containerView.backgroundColor = .clear
+    containerView.isOpaque = false
+    let arguments = args as? [String: Any]
+    let buttonCenterX =
+      (arguments?["buttonCenterX"] as? NSNumber)?.doubleValue ?? 24
+    let hitTargetWidth =
+      (arguments?["hitTargetWidth"] as? NSNumber)?.doubleValue ?? 48
+    let hitTargetHeight =
+      (arguments?["hitTargetHeight"] as? NSNumber)?.doubleValue ?? 48
+    let icon = arguments?["icon"] as? String
+    let symbolName = icon == "close" ? "xmark" : "chevron.backward"
+
+    var configuration: UIButton.Configuration
+    if #available(iOS 26.0, *) {
+      configuration = .glass()
+    } else {
+      configuration = .gray()
+      configuration.baseBackgroundColor = UIColor.secondarySystemBackground
+    }
+    configuration.cornerStyle = .capsule
+    configuration.image = UIImage(
+      systemName: symbolName,
+      withConfiguration: UIImage.SymbolConfiguration(
+        pointSize: 17,
+        weight: .semibold
+      )
+    )
+    button.configuration = configuration
+    button.hitTargetInsets = UIEdgeInsets(
+      top: max(0, (hitTargetHeight - 40) / 2),
+      left: max(0, buttonCenterX - 20),
+      bottom: max(0, (hitTargetHeight - 40) / 2),
+      right: max(0, hitTargetWidth - buttonCenterX - 20)
+    )
+    button.accessibilityLabel = arguments?["accessibilityLabel"] as? String ?? "Back"
+    button.translatesAutoresizingMaskIntoConstraints = false
+    button.addAction(
+      UIAction { [weak self] _ in
+        self?.channel.invokeMethod("pressed", arguments: nil)
+      },
+      for: .touchUpInside
+    )
+
+    applyAppearance(from: args)
+    channel.setMethodCallHandler { [weak self] call, result in
+      guard call.method == "setAppearance" else {
+        result(FlutterMethodNotImplemented)
+        return
+      }
+      self?.applyAppearance(from: call.arguments)
+      result(nil)
+    }
+
+    containerView.addSubview(button)
+    NSLayoutConstraint.activate([
+      button.centerXAnchor.constraint(
+        equalTo: containerView.leadingAnchor,
+        constant: buttonCenterX
+      ),
+      button.centerYAnchor.constraint(equalTo: containerView.centerYAnchor),
+      button.widthAnchor.constraint(equalToConstant: 40),
+      button.heightAnchor.constraint(equalToConstant: 40),
+    ])
+  }
+
+  func view() -> UIView {
+    containerView
+  }
+
+  /// Returns the pre-iOS-26 surface that maximizes contrast with the requested
+  /// foreground while preserving the system surface when it already passes.
+  static func fallbackBackgroundColor(
+    foregroundColor: UIColor?,
+    interfaceStyle: UIUserInterfaceStyle
+  ) -> UIColor {
+    let traits = UITraitCollection(userInterfaceStyle: interfaceStyle)
+    let backgroundColor = UIColor.secondarySystemBackground.resolvedColor(with: traits)
+    guard interfaceStyle != .dark, let foregroundColor else { return backgroundColor }
+    let resolvedForeground = foregroundColor.resolvedColor(with: traits)
+    if contrastRatio(foregroundColor: resolvedForeground, backgroundColor: backgroundColor) >= 3 {
+      return backgroundColor
+    }
+    return .black
+  }
+
+  static func contrastRatio(
+    foregroundColor: UIColor,
+    backgroundColor: UIColor
+  ) -> CGFloat {
+    guard
+      let foregroundLuminance = relativeLuminance(of: foregroundColor),
+      let backgroundLuminance = relativeLuminance(of: backgroundColor)
+    else { return 1 }
+    let lighter = max(foregroundLuminance, backgroundLuminance)
+    let darker = min(foregroundLuminance, backgroundLuminance)
+    return (lighter + 0.05) / (darker + 0.05)
+  }
+
+  private static func relativeLuminance(of color: UIColor) -> CGFloat? {
+    var red: CGFloat = 0
+    var green: CGFloat = 0
+    var blue: CGFloat = 0
+    var alpha: CGFloat = 0
+    guard color.getRed(&red, green: &green, blue: &blue, alpha: &alpha) else {
+      return nil
+    }
+
+    func linearize(_ component: CGFloat) -> CGFloat {
+      component <= 0.04045
+        ? component / 12.92
+        : pow((component + 0.055) / 1.055, 2.4)
+    }
+
+    return 0.2126 * linearize(red) +
+      0.7152 * linearize(green) +
+      0.0722 * linearize(blue)
+  }
+
+  private func applyAppearance(from value: Any?) {
+    let arguments = value as? [String: Any]
+    let brightness = arguments?["brightness"] as? String
+    let interfaceStyle: UIUserInterfaceStyle = brightness == "dark" ? .dark : .light
+    let colorValue = (arguments?["foregroundColor"] as? NSNumber)?.uint32Value
+    let foregroundColor = colorValue.map(Self.color(from:))
+    let enabled = arguments?["enabled"] as? Bool ?? true
+
+    containerView.overrideUserInterfaceStyle = interfaceStyle
+    button.overrideUserInterfaceStyle = interfaceStyle
+    button.isEnabled = enabled
+    if let foregroundColor {
+      button.configuration?.baseForegroundColor = foregroundColor
+    }
+    if #unavailable(iOS 26.0) {
+      button.configuration?.baseBackgroundColor = Self.fallbackBackgroundColor(
+        foregroundColor: foregroundColor,
+        interfaceStyle: interfaceStyle
+      )
+    }
+    button.setNeedsUpdateConfiguration()
+  }
+
+  private static func color(from value: UInt32) -> UIColor {
+    let alpha = CGFloat((value >> 24) & 0xFF) / 255
+    let red = CGFloat((value >> 16) & 0xFF) / 255
+    let green = CGFloat((value >> 8) & 0xFF) / 255
+    let blue = CGFloat(value & 0xFF) / 255
+    return UIColor(red: red, green: green, blue: blue, alpha: alpha)
+  }
+
+  deinit {
+    channel.setMethodCallHandler(nil)
+  }
+}
diff --git a/mobile/ios/RunnerTests/RunnerTests.swift b/mobile/ios/RunnerTests/RunnerTests.swift
index 01f4c89b2c..fa272fb964 100644
--- a/mobile/ios/RunnerTests/RunnerTests.swift
+++ b/mobile/ios/RunnerTests/RunnerTests.swift
@@ -5,8 +5,106 @@ import XCTest
 
 @testable import Buzz
 
+private extension UIColor {
+  convenience init(hex: UInt32) {
+    self.init(
+      red: CGFloat((hex >> 16) & 0xFF) / 255,
+      green: CGFloat((hex >> 8) & 0xFF) / 255,
+      blue: CGFloat(hex & 0xFF) / 255,
+      alpha: 1
+    )
+  }
+}
+
 class RunnerTests: XCTestCase {
 
+  func testNavigationGlassButtonExpandsToConfiguredHitTarget() {
+    let button = NavigationGlassButton(frame: CGRect(x: 0, y: 0, width: 40, height: 40))
+    button.hitTargetInsets = UIEdgeInsets(top: 2, left: 18, bottom: 2, right: 0)
+
+    XCTAssertTrue(button.point(inside: CGPoint(x: -17, y: 20), with: nil))
+    XCTAssertTrue(button.point(inside: CGPoint(x: 20, y: -1), with: nil))
+    XCTAssertFalse(button.point(inside: CGPoint(x: -19, y: 20), with: nil))
+    XCTAssertFalse(button.point(inside: CGPoint(x: 20, y: -3), with: nil))
+  }
+
+  func testNavigationGlassButtonRejectsExpandedHitsWhenDisabled() {
+    let button = NavigationGlassButton(frame: CGRect(x: 0, y: 0, width: 40, height: 40))
+    button.hitTargetInsets = UIEdgeInsets(top: 4, left: 4, bottom: 4, right: 4)
+    button.isEnabled = false
+
+    XCTAssertFalse(button.point(inside: CGPoint(x: -1, y: 20), with: nil))
+  }
+
+  func testNavigationGlassFallbackContrastsSupportedAccentsInLightMode() {
+    let accents: [(name: String, color: UIColor)] = [
+      ("Neutral", UIColor(hex: 0x000000)),
+      ("Blue", UIColor(hex: 0x3B82F6)),
+      ("Cyan", UIColor(hex: 0x06B6D4)),
+      ("Green", UIColor(hex: 0x22C55E)),
+      ("Orange", UIColor(hex: 0xF97316)),
+      ("Red", UIColor(hex: 0xEF4444)),
+      ("Pink", UIColor(hex: 0xEC4899)),
+      ("Lilac", UIColor(hex: 0xC0A2F1)),
+      ("Purple", UIColor(hex: 0xA855F7)),
+      ("Indigo", UIColor(hex: 0x6366F1)),
+      ("White", .white),
+    ]
+
+    for accent in accents {
+      let background = NavigationGlassButtonPlatformView.fallbackBackgroundColor(
+        foregroundColor: accent.color,
+        interfaceStyle: .light
+      )
+      var red: CGFloat = 0
+      var green: CGFloat = 0
+      var blue: CGFloat = 0
+      var alpha: CGFloat = 0
+      XCTAssertTrue(
+        background.getRed(&red, green: &green, blue: &blue, alpha: &alpha),
+        accent.name
+      )
+      XCTAssertEqual(alpha, 1, accuracy: 0.001, accent.name)
+      XCTAssertGreaterThanOrEqual(
+        NavigationGlassButtonPlatformView.contrastRatio(
+          foregroundColor: accent.color,
+          backgroundColor: background
+        ),
+        3,
+        accent.name
+      )
+    }
+  }
+
+  func testNavigationGlassFallbackKeepsSystemSurfaceInDarkMode() {
+    let darkAccents = [
+      UIColor(hex: 0xE1E4E8),
+      UIColor(hex: 0x60A5FA),
+      UIColor(hex: 0x22D3EE),
+      UIColor(hex: 0x4ADE80),
+      UIColor(hex: 0xFB923C),
+      UIColor(hex: 0xF87171),
+      UIColor(hex: 0xF472B6),
+      UIColor(hex: 0xC0A2F1),
+      UIColor(hex: 0xC084FC),
+      UIColor(hex: 0x818CF8),
+    ]
+
+    for accent in darkAccents {
+      let background = NavigationGlassButtonPlatformView.fallbackBackgroundColor(
+        foregroundColor: accent,
+        interfaceStyle: .dark
+      )
+      XCTAssertGreaterThanOrEqual(
+        NavigationGlassButtonPlatformView.contrastRatio(
+          foregroundColor: accent,
+          backgroundColor: background
+        ),
+        3
+      )
+    }
+  }
+
   func testRelativeTrackInsertionTimesPreserveAudioDelay() {
     let times = AppDelegate.relativeTrackInsertionTimes(
       videoStart: CMTime(seconds: 1, preferredTimescale: 600),
diff --git a/mobile/lib/features/channels/channel_detail_page.dart b/mobile/lib/features/channels/channel_detail_page.dart
index 224094df14..05d353002a 100644
--- a/mobile/lib/features/channels/channel_detail_page.dart
+++ b/mobile/lib/features/channels/channel_detail_page.dart
@@ -17,6 +17,7 @@ import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
 import '../../shared/widgets/keyboard_dismiss_on_drag.dart';
+import '../../shared/widgets/ios_glass_navigation_button.dart';
 import '../../shared/widgets/masked_avatar_badge.dart';
 import '../../shared/widgets/message_author_meta.dart';
 import '../../shared/widgets/modal_presentation.dart';
@@ -49,6 +50,7 @@ import 'jump_to_latest_button.dart';
 import 'jump_to_latest_switcher.dart';
 import 'members_sheet.dart';
 import 'message_actions.dart';
+import 'message_action_backdrop_state.dart';
 import 'message_long_press_region.dart';
 import 'message_content.dart';
 import '../../shared/read_state/deferred_read_state_update.dart';
@@ -264,6 +266,9 @@ class ChannelDetailPage extends HookConsumerWidget {
       context,
       isDm: resolvedChannel.isDm,
     );
+    final usesNativeIosGlassBackButton =
+        Navigator.canPop(context) &&
+        Theme.of(context).platform == TargetPlatform.iOS;
     final readTimestamp = _channelReadTimestamp(
       channel: resolvedChannel,
       messagesState: messagesState,
@@ -321,32 +326,50 @@ class ChannelDetailPage extends HookConsumerWidget {
       resizeToAvoidBottomInset:
           !usesFixedAndroidImeViewport || resolvedChannel.isForum,
       appBar: FrostedAppBar(
+        leading: usesNativeIosGlassBackButton
+            ? IosGlassNavigationButton(
+                key: const ValueKey('channel-ios-glass-back'),
+                icon: IosGlassNavigationIcon.back,
+                semanticLabel: 'Back',
+                onPressed: () => Navigator.of(context).maybePop(),
+                width: iosGlassChannelHeaderLeadingWidth,
+                buttonCenterX: iosGlassChannelHeaderButtonCenterX,
+                nativeViewSuppressed: messageActionBackdropActive,
+              )
+            : null,
         iconColor: context.colors.primary,
         titleContentHeight: appBarTitleContentHeight,
         titleStyle: channelTitleTextStyle,
-        title: resolvedChannel.isDm
-            ? _DmAppBarTitle(
-                channel: resolvedChannel,
-                currentPubkey: currentPubkey,
-              )
-            : _ChannelAppBarTitle(
-                channel: resolvedChannel,
-                onTap: () async {
-                  final shouldClose = await showChannelDetailsPage(
-                    context: context,
-                    channel: resolvedChannel,
-                    currentPubkey: currentPubkey,
-                    onMemberTap: showUserProfileSheet,
-                    sectionId: ref
-                        .read(channelSectionsProvider)
-                        .store
-                        .assignments[resolvedChannel.id],
-                  );
-                  if (shouldClose == true && context.mounted) {
-                    Navigator.of(context).pop();
-                  }
-                },
-              ),
+        title: Padding(
+          padding: EdgeInsets.only(
+            left: usesNativeIosGlassBackButton
+                ? iosGlassChannelHeaderTitleSpacing
+                : 0,
+          ),
+          child: resolvedChannel.isDm
+              ? _DmAppBarTitle(
+                  channel: resolvedChannel,
+                  currentPubkey: currentPubkey,
+                )
+              : _ChannelAppBarTitle(
+                  channel: resolvedChannel,
+                  onTap: () async {
+                    final shouldClose = await showChannelDetailsPage(
+                      context: context,
+                      channel: resolvedChannel,
+                      currentPubkey: currentPubkey,
+                      onMemberTap: showUserProfileSheet,
+                      sectionId: ref
+                          .read(channelSectionsProvider)
+                          .store
+                          .assignments[resolvedChannel.id],
+                    );
+                    if (shouldClose == true && context.mounted) {
+                      Navigator.of(context).pop();
+                    }
+                  },
+                ),
+        ),
         actions: resolvedChannel.isDm
             ? [
                 if (_showsMembersAction(resolvedChannel))
diff --git a/mobile/lib/features/channels/channel_detail_page/app_bar.dart b/mobile/lib/features/channels/channel_detail_page/app_bar.dart
index bccf8679a7..4bfea3f279 100644
--- a/mobile/lib/features/channels/channel_detail_page/app_bar.dart
+++ b/mobile/lib/features/channels/channel_detail_page/app_bar.dart
@@ -23,9 +23,7 @@ double _twoLineAppBarTitleContentHeight(
   BuildContext context, {
   required bool isDm,
 }) {
-  final titleStyle = isDm
-      ? context.textTheme.titleSmall
-      : context.textTheme.titleMedium;
+  final titleStyle = context.textTheme.titleSmall;
   final subtitleStyle = isDm
       ? context.textTheme.bodyMedium
       : context.textTheme.bodySmall;
@@ -68,49 +66,68 @@ class _ChannelAppBarTitle extends ConsumerWidget {
                 width: _channelHeaderAvatarSize,
                 height: _channelHeaderAvatarSize,
                 decoration: BoxDecoration(
-                  color: context.colors.primaryContainer,
+                  color: context.colors.surface,
                   shape: BoxShape.circle,
+                  border: Border.fromBorderSide(
+                    BorderSide(
+                      color: context.colors.inverseSurface.withValues(
+                        alpha: 0.07,
+                      ),
+                      strokeAlign: BorderSide.strokeAlignOutside,
+                    ),
+                  ),
                 ),
                 child: Icon(
                   channelIcon(channel),
                   size: 20,
-                  color: context.colors.onPrimaryContainer,
+                  color: context.colors.primary,
                 ),
               ),
-              const SizedBox(width: Grid.xxs),
+              const SizedBox(width: Grid.twelve),
               Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Row(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Flexible(
-                          child: Text(
-                            channel.name,
-                            key: const ValueKey('channel-header-name'),
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                            style: context.textTheme.titleMedium,
+                child: ConstrainedBox(
+                  key: const ValueKey('channel-header-text-stack'),
+                  constraints: const BoxConstraints(
+                    minHeight: _channelHeaderAvatarSize,
+                  ),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Flexible(
+                            child: Text(
+                              channel.name,
+                              key: const ValueKey('channel-header-name'),
+                              maxLines: 1,
+                              overflow: TextOverflow.ellipsis,
+                              style: context.textTheme.titleSmall?.copyWith(
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                          ),
+                          if (channel.isEphemeral) ...[
+                            const SizedBox(width: Grid.quarter),
+                            _HeaderEphemeralBadge(channel: channel),
+                          ],
+                        ],
+                      ),
+                      Text(
+                        memberLabel,
+                        key: const ValueKey('channel-header-member-count'),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: context.textTheme.bodySmall?.copyWith(
+                          color: context.colors.onSurface.withValues(
+                            alpha: 0.65,
                           ),
                         ),
-                        if (channel.isEphemeral) ...[
-                          const SizedBox(width: Grid.quarter),
-                          _HeaderEphemeralBadge(channel: channel),
-                        ],
-                      ],
-                    ),
-                    Text(
-                      memberLabel,
-                      key: const ValueKey('channel-header-member-count'),
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                      style: context.textTheme.bodySmall?.copyWith(
-                        color: context.colors.onSurfaceVariant,
                       ),
-                    ),
-                  ],
+                    ],
+                  ),
                 ),
               ),
             ],
diff --git a/mobile/lib/features/channels/compose_bar.dart b/mobile/lib/features/channels/compose_bar.dart
index ee2ba7a7aa..b36c2d3f1c 100644
--- a/mobile/lib/features/channels/compose_bar.dart
+++ b/mobile/lib/features/channels/compose_bar.dart
@@ -24,6 +24,7 @@ import '../../shared/widgets/avatar_image.dart';
 import '../../shared/widgets/anchored_popover_menu.dart';
 import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/keyboard_dismiss_on_drag.dart';
+import '../../shared/widgets/ios_glass_navigation_button.dart';
 import '../../shared/widgets/mobile_tab_footer_backdrop.dart';
 import '../../shared/widgets/modal_presentation.dart';
 import '../../shared/profile/user_cache_provider.dart';
diff --git a/mobile/lib/features/channels/compose_bar/camera_preview.dart b/mobile/lib/features/channels/compose_bar/camera_preview.dart
index 1a06534d6e..32cc992a56 100644
--- a/mobile/lib/features/channels/compose_bar/camera_preview.dart
+++ b/mobile/lib/features/channels/compose_bar/camera_preview.dart
@@ -287,6 +287,16 @@ class _CameraCloseButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    if (Theme.of(context).platform == TargetPlatform.iOS) {
+      return IosGlassNavigationButton(
+        icon: IosGlassNavigationIcon.back,
+        semanticLabel: 'Back to attachment options',
+        onPressed: () => _runComposerAction(onTap),
+        width: emphasized ? _cameraBackSize : 40,
+        height: emphasized ? _cameraBackSize : 40,
+        foregroundColor: Colors.white,
+      );
+    }
     return SizedBox.square(
       dimension: emphasized ? _cameraBackSize : 36,
       child: IconButton(
diff --git a/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart b/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart
index 0548d73fd2..0b94aad550 100644
--- a/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart
+++ b/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart
@@ -138,25 +138,14 @@ class _IOSInlinePhotoPicker extends HookWidget {
             bottom: Grid.twelve,
             child: SafeArea(
               top: false,
-              child: DecoratedBox(
-                decoration: BoxDecoration(
-                  color: Colors.black.withValues(alpha: 0.62),
-                  shape: BoxShape.circle,
-                  border: Border.all(
-                    color: Colors.white.withValues(alpha: 0.28),
-                  ),
-                ),
-                child: IconButton(
-                  key: const ValueKey('ios-inline-photo-picker-back'),
-                  onPressed: isProcessing.value
-                      ? null
-                      : () => _runComposerAction(onBack),
-                  tooltip: 'Back to attachment options',
-                  icon: const Icon(
-                    LucideIcons.chevronLeft,
-                    color: Colors.white,
-                  ),
-                ),
+              child: IosGlassNavigationButton(
+                key: const ValueKey('ios-inline-photo-picker-back'),
+                icon: IosGlassNavigationIcon.back,
+                semanticLabel: 'Back to attachment options',
+                onPressed: isProcessing.value
+                    ? null
+                    : () => _runComposerAction(onBack),
+                foregroundColor: Colors.white,
               ),
             ),
           ),
diff --git a/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart b/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart
index d40fd93a22..349aa3237a 100644
--- a/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart
+++ b/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart
@@ -160,15 +160,27 @@ class _RecentPhotoGalleryPicker extends HookConsumerWidget {
             height: 40,
             child: Row(
               children: [
-                IconButton(
-                  key: const ValueKey('photo-gallery-back'),
-                  onPressed: isResolving.value
-                      ? null
-                      : () => _runComposerAction(onBack),
-                  tooltip: 'Back to attachment options',
-                  visualDensity: VisualDensity.compact,
-                  icon: const Icon(LucideIcons.arrowLeft, size: 20),
-                ),
+                if (Theme.of(context).platform == TargetPlatform.iOS)
+                  IosGlassNavigationButton(
+                    key: const ValueKey('photo-gallery-back'),
+                    icon: IosGlassNavigationIcon.back,
+                    semanticLabel: 'Back to attachment options',
+                    onPressed: isResolving.value
+                        ? null
+                        : () => _runComposerAction(onBack),
+                    width: 40,
+                    height: 40,
+                  )
+                else
+                  IconButton(
+                    key: const ValueKey('photo-gallery-back'),
+                    onPressed: isResolving.value
+                        ? null
+                        : () => _runComposerAction(onBack),
+                    tooltip: 'Back to attachment options',
+                    visualDensity: VisualDensity.compact,
+                    icon: const Icon(LucideIcons.arrowLeft, size: 20),
+                  ),
                 const SizedBox(width: Grid.quarter),
                 Expanded(
                   child: Text(
diff --git a/mobile/lib/features/channels/media_viewer_page.dart b/mobile/lib/features/channels/media_viewer_page.dart
index b5eb308c63..1c3b50c44b 100644
--- a/mobile/lib/features/channels/media_viewer_page.dart
+++ b/mobile/lib/features/channels/media_viewer_page.dart
@@ -14,6 +14,7 @@ import 'package:video_player/video_player.dart';
 import '../../shared/relay/relay.dart';
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/buzz_loading_indicator.dart';
+import '../../shared/widgets/ios_glass_navigation_button.dart';
 import 'media_viewer_hero.dart';
 
 export 'media_viewer_hero.dart';
@@ -648,9 +649,8 @@ class MediaImageViewerPage extends HookConsumerWidget {
               child: Opacity(
                 opacity: chromeOpacity,
                 child: SafeArea(
-                  child: _MediaViewerCircleButton(
+                  child: _MediaViewerCloseButton(
                     key: const ValueKey('message-media-image-viewer-close'),
-                    icon: LucideIcons.x,
                     tooltip: 'Close image viewer',
                     onPressed: () => unawaited(dismiss()),
                   ),
diff --git a/mobile/lib/features/channels/media_viewer_page/image_controls.dart b/mobile/lib/features/channels/media_viewer_page/image_controls.dart
index 7736167611..e3c623704e 100644
--- a/mobile/lib/features/channels/media_viewer_page/image_controls.dart
+++ b/mobile/lib/features/channels/media_viewer_page/image_controls.dart
@@ -259,6 +259,34 @@ class _MediaViewerCircleButton extends StatelessWidget {
   }
 }
 
+class _MediaViewerCloseButton extends StatelessWidget {
+  const _MediaViewerCloseButton({
+    super.key,
+    required this.tooltip,
+    required this.onPressed,
+  });
+
+  final String tooltip;
+  final VoidCallback onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    if (Theme.of(context).platform == TargetPlatform.iOS) {
+      return IosGlassNavigationButton(
+        icon: IosGlassNavigationIcon.close,
+        semanticLabel: tooltip,
+        onPressed: onPressed,
+        foregroundColor: Colors.white,
+      );
+    }
+    return _MediaViewerCircleButton(
+      icon: LucideIcons.x,
+      tooltip: tooltip,
+      onPressed: onPressed,
+    );
+  }
+}
+
 Size _imageViewerSize(Size viewport, double? aspectRatio) {
   if (aspectRatio == null || aspectRatio <= 0) {
     return viewport;
diff --git a/mobile/lib/features/channels/media_viewer_page/video_viewer.dart b/mobile/lib/features/channels/media_viewer_page/video_viewer.dart
index dc4a82b506..7267795734 100644
--- a/mobile/lib/features/channels/media_viewer_page/video_viewer.dart
+++ b/mobile/lib/features/channels/media_viewer_page/video_viewer.dart
@@ -294,9 +294,8 @@ class MediaVideoViewerPage extends HookConsumerWidget {
             child: Opacity(
               opacity: chromeOpacity,
               child: SafeArea(
-                child: _MediaViewerCircleButton(
+                child: _MediaViewerCloseButton(
                   key: const ValueKey('message-media-video-viewer-close'),
-                  icon: LucideIcons.x,
                   tooltip: 'Close video viewer',
                   onPressed: () => Navigator.of(context).maybePop(),
                 ),
diff --git a/mobile/lib/features/channels/thread_detail_helpers.dart b/mobile/lib/features/channels/thread_detail_helpers.dart
index 4e13e1f392..9b53539765 100644
--- a/mobile/lib/features/channels/thread_detail_helpers.dart
+++ b/mobile/lib/features/channels/thread_detail_helpers.dart
@@ -1,5 +1,18 @@
 part of 'thread_detail_page.dart';
 
+/// Returns whether a bounded tail correction reached the effective end.
+///
+/// Item positions can lag the active scroll position by a frame, so an exact
+/// end-of-scroll measurement is sufficient even while the tail item still
+/// reports outside the visible boundary.
+@visibleForTesting
+bool threadTailCorrectionReachedEnd({
+  required bool tailIsVisible,
+  required double? extentAfter,
+}) =>
+    tailIsVisible ||
+    (extentAfter != null && extentAfter <= _threadTailScrollTolerance);
+
 int _threadTailIndex(int replyCount) => replyCount;
 
 void _resumeThreadTailFollow({
diff --git a/mobile/lib/features/channels/thread_detail_page.dart b/mobile/lib/features/channels/thread_detail_page.dart
index 407cb3cd56..1d009b3c1e 100644
--- a/mobile/lib/features/channels/thread_detail_page.dart
+++ b/mobile/lib/features/channels/thread_detail_page.dart
@@ -12,6 +12,7 @@ import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
+import '../../shared/widgets/ios_glass_navigation_button.dart';
 import '../../shared/widgets/keyboard_dismiss_on_drag.dart';
 import '../../shared/widgets/message_author_meta.dart';
 import '../../shared/profile/user_cache_provider.dart';
@@ -34,6 +35,7 @@ import 'jump_to_latest_button.dart';
 import 'jump_to_latest_switcher.dart';
 import '../profile/user_profile_sheet.dart';
 import 'message_actions.dart';
+import 'message_action_backdrop_state.dart';
 import 'message_long_press_region.dart';
 import 'message_content.dart';
 import 'reaction_row.dart';
@@ -56,6 +58,7 @@ const _landingHighlightDuration = Duration(seconds: 3);
 const _landingHighlightDelay = Duration(milliseconds: 50);
 const _landingHighlightTransitionDuration = Duration(milliseconds: 300);
 const _landingHighlightOpacity = 0.12;
+const _threadTailScrollTolerance = 0.5;
 
 // Keep the direct-position correction finite in case the viewport cannot
 // expose its tail (for example, continuously changing media dimensions).
@@ -243,6 +246,7 @@ class ThreadDetailPage extends HookConsumerWidget {
     final tailIntent = useMemoized(_ThreadTailIntent.new);
     final initialTailSettle = useMemoized(InitialThreadTailSettle.new);
     final isAtThreadTail = useState(true);
+    final isNavigatingToThreadTail = useState(false);
     final tailCorrectionInProgress = useRef(false);
     final tailCorrectionGeneration = useRef(0);
     final activeThreadScrollPosition = useRef<ScrollPosition?>(null);
@@ -371,6 +375,7 @@ class ThreadDetailPage extends HookConsumerWidget {
           tailIntent.isDragging ||
           userOptedOutOfTailFollow.value) {
         tailCorrectionInProgress.value = false;
+        isNavigatingToThreadTail.value = false;
         isAtThreadTail.value = threadTailIsVisible();
         return;
       }
@@ -391,8 +396,19 @@ class ThreadDetailPage extends HookConsumerWidget {
         return;
       }
       tailCorrectionInProgress.value = false;
+      isNavigatingToThreadTail.value = false;
       if (revealViewport) initialViewportReady.value = true;
-      isAtThreadTail.value = reachedTail;
+      // Item positions can trail the ScrollPosition by a frame after an
+      // animated jump. Once the bounded lazy-layout correction is exhausted,
+      // trust an exact end-of-scroll position too: there is nowhere further
+      // for Latest to navigate, so leaving the control visible is misleading.
+      final position = activeThreadScrollPosition.value;
+      isAtThreadTail.value = threadTailCorrectionReachedEnd(
+        tailIsVisible: reachedTail,
+        extentAfter: position != null && position.hasContentDimensions
+            ? position.extentAfter
+            : null,
+      );
     }
 
     void correctThreadTailInstantly() {
@@ -470,6 +486,7 @@ class ThreadDetailPage extends HookConsumerWidget {
       userOptedOutOfTailFollow.value = false;
       userDragDetachedTailFollow.value = false;
       followsThreadTail.value = true;
+      isNavigatingToThreadTail.value = true;
       tailCorrectionInProgress.value = true;
       final generation = ++tailCorrectionGeneration.value;
 
@@ -477,6 +494,7 @@ class ThreadDetailPage extends HookConsumerWidget {
         if (!await animateActiveScrollPositionToTail()) {
           if (generation == tailCorrectionGeneration.value) {
             tailCorrectionInProgress.value = false;
+            isNavigatingToThreadTail.value = false;
           }
           return;
         }
@@ -802,11 +820,33 @@ class ThreadDetailPage extends HookConsumerWidget {
         channelNamesMap[ch.name.toLowerCase()] = ch.id;
       }
     });
+    final usesNativeIosGlassBackButton =
+        Navigator.canPop(context) &&
+        Theme.of(context).platform == TargetPlatform.iOS;
 
     return FrostedScaffold(
       resizeToAvoidBottomInset: !usesFixedAndroidImeViewport,
-      appBar: const FrostedAppBar(
-        title: Text('Thread'),
+      appBar: FrostedAppBar(
+        leading: usesNativeIosGlassBackButton
+            ? IosGlassNavigationButton(
+                key: const ValueKey('thread-ios-glass-back'),
+                icon: IosGlassNavigationIcon.back,
+                semanticLabel: 'Back',
+                onPressed: () => Navigator.of(context).maybePop(),
+                width: iosGlassChannelHeaderLeadingWidth,
+                buttonCenterX: iosGlassChannelHeaderButtonCenterX,
+                nativeViewSuppressed: messageActionBackdropActive,
+              )
+            : null,
+        iconColor: context.colors.primary,
+        title: Padding(
+          padding: EdgeInsets.only(
+            left: usesNativeIosGlassBackButton
+                ? iosGlassChannelHeaderTitleSpacing
+                : 0,
+          ),
+          child: const Text('Thread', key: ValueKey('thread-app-bar-title')),
+        ),
         titleStyle: channelTitleTextStyle,
       ),
       body: Stack(
@@ -821,6 +861,7 @@ class ThreadDetailPage extends HookConsumerWidget {
                     initialTailSettle.abandon();
                     initialViewportReady.value = true;
                     tailCorrectionInProgress.value = false;
+                    isNavigatingToThreadTail.value = false;
                     tailIntent.beginDrag();
                     userOptedOutOfTailFollow.value = true;
                     userDragDetachedTailFollow.value = true;
@@ -933,6 +974,7 @@ class ThreadDetailPage extends HookConsumerWidget {
                 visible:
                     threadViewportVisible &&
                     hasFetchedReplies &&
+                    !isNavigatingToThreadTail.value &&
                     !isAtThreadTail.value,
                 onPressed: scrollToThreadLatest,
               ),
diff --git a/mobile/lib/features/pairing/pairing_page.dart b/mobile/lib/features/pairing/pairing_page.dart
index 97687c4ed6..9906ed421c 100644
--- a/mobile/lib/features/pairing/pairing_page.dart
+++ b/mobile/lib/features/pairing/pairing_page.dart
@@ -10,6 +10,7 @@ import 'package:lucide_icons_flutter/lucide_icons.dart';
 import '../../shared/security/sensitive_action_authorizer.dart';
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/buzz_loading_indicator.dart';
+import '../../shared/widgets/ios_glass_navigation_button.dart';
 import '../../shared/widgets/tappable_flapping_bee.dart';
 import 'pairing_provider.dart';
 import 'pairing_qr_scanner.dart';
@@ -94,10 +95,20 @@ class PairingPage extends HookConsumerWidget {
         ? AppBar(
             foregroundColor: _onboardingInk,
             systemOverlayStyle: onboardingSystemOverlayStyle,
-            leading: IconButton(
-              icon: const Icon(LucideIcons.arrowLeft),
-              onPressed: () => Navigator.of(context).pop(),
-            ),
+            leading: Theme.of(context).platform == TargetPlatform.iOS
+                ? IosGlassNavigationButton(
+                    key: const ValueKey('pairing-ios-glass-back'),
+                    icon: IosGlassNavigationIcon.back,
+                    semanticLabel: 'Back',
+                    onPressed: () => Navigator.of(context).maybePop(),
+                    width: 56,
+                    foregroundColor: _onboardingInk,
+                  )
+                : IconButton(
+                    icon: const Icon(LucideIcons.arrowLeft),
+                    tooltip: 'Back',
+                    onPressed: () => Navigator.of(context).pop(),
+                  ),
             title: Text(
               identityRecoveryOnly ? 'Send to Desktop' : 'Add Community',
               style: context.textTheme.titleMedium?.copyWith(
diff --git a/mobile/lib/features/settings/settings_page.dart b/mobile/lib/features/settings/settings_page.dart
index e888060614..eb4194eb15 100644
--- a/mobile/lib/features/settings/settings_page.dart
+++ b/mobile/lib/features/settings/settings_page.dart
@@ -18,6 +18,7 @@ import '../../shared/widgets/app_list.dart';
 import '../../shared/widgets/app_list_card.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
+import '../../shared/widgets/ios_glass_navigation_button.dart';
 import '../../shared/widgets/modal_presentation.dart';
 import 'accent_picker_page.dart';
 import 'theme_picker_page.dart';
@@ -59,19 +60,30 @@ class SettingsPage extends HookConsumerWidget {
         automaticallyImplyLeading: false,
         horizontalInset: Grid.gutter,
         showBottomDivider: false,
-        leading: SizedBox(
-          width: Grid.xl,
-          height: Grid.xl,
-          child: IconButton(
-            tooltip: 'Close settings',
-            onPressed: () {
-              unawaited(HapticFeedback.lightImpact());
-              Navigator.of(context).pop();
-            },
-            color: navigationPrimaryForeground(context),
-            icon: const Icon(LucideIcons.x),
-          ),
-        ),
+        leading: Theme.of(context).platform == TargetPlatform.iOS
+            ? IosGlassNavigationButton(
+                key: const ValueKey('settings-ios-glass-close'),
+                icon: IosGlassNavigationIcon.close,
+                semanticLabel: 'Close settings',
+                onPressed: () {
+                  unawaited(HapticFeedback.lightImpact());
+                  Navigator.of(context).pop();
+                },
+                foregroundColor: navigationPrimaryForeground(context),
+              )
+            : SizedBox(
+                width: Grid.xl,
+                height: Grid.xl,
+                child: IconButton(
+                  tooltip: 'Close settings',
+                  onPressed: () {
+                    unawaited(HapticFeedback.lightImpact());
+                    Navigator.of(context).pop();
+                  },
+                  color: navigationPrimaryForeground(context),
+                  icon: const Icon(LucideIcons.x),
+                ),
+              ),
         bottomHeight: Grid.xxs,
         bottom: const SizedBox.expand(),
       ),
diff --git a/mobile/lib/shared/widgets/buzz_sheet_header.dart b/mobile/lib/shared/widgets/buzz_sheet_header.dart
index 3168ad1d53..fed46a8d60 100644
--- a/mobile/lib/shared/widgets/buzz_sheet_header.dart
+++ b/mobile/lib/shared/widgets/buzz_sheet_header.dart
@@ -5,6 +5,7 @@ import 'package:flutter/services.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../theme/theme.dart';
+import 'ios_glass_navigation_button.dart';
 
 /// A titled sheet header with balanced actions and an exactly centered title.
 class BuzzSheetHeader extends StatelessWidget {
@@ -75,14 +76,27 @@ class _SheetCloseButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    void closeSheet() {
+      unawaited(HapticFeedback.lightImpact());
+      Navigator.of(context).pop();
+    }
+
+    if (Theme.of(context).platform == TargetPlatform.iOS) {
+      return IosGlassNavigationButton(
+        key: const ValueKey('buzz-sheet-ios-glass-close'),
+        icon: IosGlassNavigationIcon.close,
+        semanticLabel: 'Close sheet',
+        onPressed: closeSheet,
+        width: 44,
+        height: 44,
+      );
+    }
+
     return SizedBox.square(
       dimension: 44,
       child: IconButton(
         tooltip: 'Close sheet',
-        onPressed: () {
-          unawaited(HapticFeedback.lightImpact());
-          Navigator.of(context).pop();
-        },
+        onPressed: closeSheet,
         style: IconButton.styleFrom(
           padding: EdgeInsets.zero,
           backgroundColor: context.colors.surfaceContainerHighest,
diff --git a/mobile/lib/shared/widgets/frosted_app_bar.dart b/mobile/lib/shared/widgets/frosted_app_bar.dart
index 2a2993f330..b990faf897 100644
--- a/mobile/lib/shared/widgets/frosted_app_bar.dart
+++ b/mobile/lib/shared/widgets/frosted_app_bar.dart
@@ -5,6 +5,7 @@ import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../theme/theme.dart';
 import 'directional_transition_scope.dart';
+import 'ios_glass_navigation_button.dart';
 
 /// Minimum height of the frosted app bar content area below the safe area.
 const _kBarContentMinHeight = Grid.xxs + 32 + Grid.xxs; // 48
@@ -174,16 +175,23 @@ class FrostedAppBar extends StatelessWidget {
     final effectiveLeading =
         leading ??
         (automaticallyImplyLeading && canPop
-            ? SizedBox(
-                width: 48,
-                height: 48,
-                child: IconButton(
-                  onPressed: () => Navigator.of(context).pop(),
-                  color: iconColor,
-                  icon: const Icon(LucideIcons.chevronLeft),
-                  tooltip: 'Back',
-                ),
-              )
+            ? Theme.of(context).platform == TargetPlatform.iOS
+                  ? IosGlassNavigationButton(
+                      icon: IosGlassNavigationIcon.back,
+                      semanticLabel: 'Back',
+                      onPressed: () => Navigator.of(context).maybePop(),
+                      foregroundColor: iconColor,
+                    )
+                  : SizedBox(
+                      width: 48,
+                      height: 48,
+                      child: IconButton(
+                        onPressed: () => Navigator.of(context).pop(),
+                        color: iconColor,
+                        icon: const Icon(LucideIcons.chevronLeft),
+                        tooltip: 'Back',
+                      ),
+                    )
             : null);
 
     final titleRow = SizedBox(
diff --git a/mobile/lib/shared/widgets/ios_glass_navigation_button.dart b/mobile/lib/shared/widgets/ios_glass_navigation_button.dart
new file mode 100644
index 0000000000..f54c898d7c
--- /dev/null
+++ b/mobile/lib/shared/widgets/ios_glass_navigation_button.dart
@@ -0,0 +1,164 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart' show PlatformViewHitTestBehavior;
+import 'package:flutter/services.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+
+import '../theme/theme.dart';
+
+/// The navigation glyph displayed by [IosGlassNavigationButton].
+enum IosGlassNavigationIcon { back, close }
+
+/// Leading width used by iOS channel-style headers.
+const iosGlassChannelHeaderLeadingWidth = 58.0;
+
+/// Horizontal center of the native button inside a channel-style leading.
+const iosGlassChannelHeaderButtonCenterX = 38.0;
+
+/// Space between the leading region and a channel-style title.
+const iosGlassChannelHeaderTitleSpacing = Grid.xs;
+
+/// A native iOS navigation control using the system glass button treatment.
+///
+/// Callers should only insert this widget on iOS and retain their existing
+/// Flutter control on other platforms.
+class IosGlassNavigationButton extends HookWidget {
+  const IosGlassNavigationButton({
+    super.key,
+    required this.icon,
+    required this.semanticLabel,
+    required this.onPressed,
+    this.width = 48,
+    this.height = 48,
+    this.buttonCenterX,
+    this.foregroundColor,
+    this.nativeViewSuppressed,
+  });
+
+  static const viewType = 'buzz/navigation_glass';
+
+  final IosGlassNavigationIcon icon;
+  final String semanticLabel;
+  final VoidCallback? onPressed;
+  final double width;
+  final double height;
+  final double? buttonCenterX;
+  final Color? foregroundColor;
+  final ValueListenable<bool>? nativeViewSuppressed;
+
+  @override
+  Widget build(BuildContext context) {
+    assert(defaultTargetPlatform == TargetPlatform.iOS);
+    final nativeChannel = useState<MethodChannel?>(null);
+    final onPressedRef = useRef(onPressed)..value = onPressed;
+    final brightness = context.theme.brightness.name;
+    final effectiveForeground = foregroundColor ?? context.colors.primary;
+    final foregroundValue = effectiveForeground.toARGB32();
+    final enabled = onPressed != null;
+
+    useEffect(() {
+      final channel = nativeChannel.value;
+      if (channel == null) return null;
+      channel.setMethodCallHandler((call) async {
+        if (call.method == 'pressed') {
+          onPressedRef.value?.call();
+        }
+      });
+      return () => channel.setMethodCallHandler(null);
+    }, [nativeChannel.value]);
+
+    useEffect(() {
+      final channel = nativeChannel.value;
+      if (channel != null) {
+        unawaited(
+          channel.invokeMethod<void>('setAppearance', <String, Object>{
+            'brightness': brightness,
+            'foregroundColor': foregroundValue,
+            'enabled': enabled,
+          }),
+        );
+      }
+      return null;
+    }, [nativeChannel.value, brightness, foregroundValue, enabled]);
+
+    Widget buildControl({required bool suppressNativeView}) {
+      if (suppressNativeView) {
+        final resolvedButtonCenterX = buttonCenterX ?? width / 2;
+        return Semantics(
+          container: true,
+          button: true,
+          enabled: enabled,
+          label: semanticLabel,
+          onTap: onPressed,
+          child: ExcludeSemantics(
+            child: Stack(
+              key: const ValueKey('ios-glass-navigation-flutter-fallback'),
+              children: [
+                Positioned(
+                  left: resolvedButtonCenterX - 20,
+                  top: (height - 40) / 2,
+                  width: 40,
+                  height: 40,
+                  child: DecoratedBox(
+                    decoration: BoxDecoration(
+                      color: context.colors.surface.withValues(alpha: 0.72),
+                      shape: BoxShape.circle,
+                      border: Border.all(
+                        color: context.colors.inverseSurface.withValues(
+                          alpha: 0.07,
+                        ),
+                      ),
+                    ),
+                    child: Icon(
+                      icon == IosGlassNavigationIcon.back
+                          ? Icons.arrow_back_ios_new_rounded
+                          : Icons.close_rounded,
+                      size: 20,
+                      color: effectiveForeground,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      }
+      return UiKitView(
+        viewType: viewType,
+        hitTestBehavior: PlatformViewHitTestBehavior.opaque,
+        creationParams: <String, Object>{
+          'icon': icon.name,
+          'accessibilityLabel': semanticLabel,
+          'brightness': brightness,
+          'foregroundColor': foregroundValue,
+          'enabled': enabled,
+          'buttonCenterX': buttonCenterX ?? width / 2,
+          'hitTargetWidth': width,
+          'hitTargetHeight': height,
+        },
+        creationParamsCodec: const StandardMessageCodec(),
+        onPlatformViewCreated: (viewId) {
+          nativeChannel.value = MethodChannel('$viewType/$viewId');
+        },
+      );
+    }
+
+    return Tooltip(
+      message: semanticLabel,
+      excludeFromSemantics: true,
+      child: SizedBox(
+        width: width,
+        height: height,
+        child: nativeViewSuppressed == null
+            ? buildControl(suppressNativeView: false)
+            : ValueListenableBuilder<bool>(
+                valueListenable: nativeViewSuppressed!,
+                builder: (context, suppressNativeView, _) =>
+                    buildControl(suppressNativeView: suppressNativeView),
+              ),
+      ),
+    );
+  }
+}
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index cb9bc0268c..d83c73b98d 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -289,6 +289,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.9"
   custom_lint:
     dependency: "direct dev"
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 2cc049c5fe..cd1eac39ac 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -9,6 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  cupertino_icons: ^1.0.8
   # Grapheme-cluster segmentation, for deciding whether a message body is
   # nothing but emoji. Already present transitively via the Flutter SDK;
   # declared here because we import it directly.
diff --git a/mobile/test/features/channels/channel_detail_page_test.dart b/mobile/test/features/channels/channel_detail_page_test.dart
index facf466daa..17075ebe17 100644
--- a/mobile/test/features/channels/channel_detail_page_test.dart
+++ b/mobile/test/features/channels/channel_detail_page_test.dart
@@ -3,7 +3,8 @@ import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart' show ScrollDirection, SemanticsAction;
+import 'package:flutter/rendering.dart'
+    show RenderParagraph, ScrollDirection, SemanticsAction;
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -44,6 +45,7 @@ import 'package:buzz/shared/widgets/avatar_image.dart';
 import 'package:buzz/shared/widgets/frosted_app_bar.dart';
 import 'package:buzz/shared/widgets/frosted_scaffold.dart';
 import 'package:buzz/shared/widgets/keyboard_dismiss_on_drag.dart';
+import 'package:buzz/shared/widgets/ios_glass_navigation_button.dart';
 import 'package:buzz/shared/widgets/masked_avatar_badge.dart';
 import 'package:buzz/shared/widgets/skeleton.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -5195,6 +5197,246 @@ void main() {
   });
 
   group('App bar', () {
+    testWidgets('matches the channel header placement on iOS', (tester) async {
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      addTearDown(() => debugDefaultTargetPlatformOverride = null);
+      const nativeChannel = MethodChannel('buzz/navigation_glass/43');
+      tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
+        nativeChannel,
+        (_) async => null,
+      );
+      addTearDown(
+        () => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
+          nativeChannel,
+          null,
+        ),
+      );
+
+      final root = _textMsg(
+        id: 'thread-header-root',
+        pubkey: 'alice',
+        content: 'Thread root',
+      );
+      final timelineMessages = formatTimeline([root]);
+
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: [root],
+          textScaler: const TextScaler.linear(2),
+          home: Builder(
+            builder: (context) => Scaffold(
+              body: TextButton(
+                onPressed: () => Navigator.of(context).push(
+                  MaterialPageRoute<void>(
+                    builder: (_) => ThreadDetailPage(
+                      threadHead: timelineMessages.single,
+                      allMessages: timelineMessages,
+                      channelId: _testChannel.id,
+                      currentPubkey: null,
+                      isMember: true,
+                      isArchived: false,
+                    ),
+                  ),
+                ),
+                child: const Text('Open thread'),
+              ),
+            ),
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.text('Open thread'));
+      await tester.pumpAndSettle();
+
+      final backFinder = find.byKey(const ValueKey('thread-ios-glass-back'));
+      final nativeView = tester.widget<UiKitView>(
+        find.descendant(of: backFinder, matching: find.byType(UiKitView)),
+      );
+      expect(nativeView.viewType, IosGlassNavigationButton.viewType);
+      expect(
+        (nativeView.creationParams as Map<String, Object>)['buttonCenterX'],
+        iosGlassChannelHeaderButtonCenterX,
+      );
+      expect(
+        (nativeView.creationParams as Map<String, Object>)['hitTargetWidth'],
+        iosGlassChannelHeaderLeadingWidth,
+      );
+      expect(
+        (nativeView.creationParams as Map<String, Object>)['hitTargetHeight'],
+        48.0,
+      );
+
+      final backRect = tester.getRect(backFinder);
+      final titleRect = tester.getRect(
+        find.byKey(const ValueKey('thread-app-bar-title')),
+      );
+      expect(backRect.width, iosGlassChannelHeaderLeadingWidth);
+      expect(
+        titleRect.left - backRect.right,
+        moreOrLessEquals(iosGlassChannelHeaderTitleSpacing),
+      );
+      expect(tester.takeException(), isNull);
+
+      nativeView.onPlatformViewCreated!(43);
+      await tester.pump();
+      await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
+        nativeChannel.name,
+        nativeChannel.codec.encodeMethodCall(const MethodCall('pressed')),
+        (_) {},
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.byType(ThreadDetailPage), findsNothing);
+      expect(find.text('Open thread'), findsOneWidget);
+      debugDefaultTargetPlatformOverride = null;
+    });
+
+    testWidgets(
+      'keeps the native iOS glass header aligned at large text sizes',
+      (tester) async {
+        debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+        addTearDown(() => debugDefaultTargetPlatformOverride = null);
+
+        final message = _textMsg(
+          id: 'avatar-alignment',
+          pubkey: 'alice',
+          content: 'Hello',
+          createdAt: 1000,
+        );
+
+        await tester.pumpWidget(
+          _buildTestable(
+            messages: [message],
+            textScaler: const TextScaler.linear(2),
+            users: const {
+              'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+            },
+            home: Builder(
+              builder: (context) => Scaffold(
+                body: TextButton(
+                  onPressed: () => Navigator.of(context).push(
+                    MaterialPageRoute<void>(
+                      builder: (_) => ChannelDetailPage(channel: _testChannel),
+                    ),
+                  ),
+                  child: const Text('Open channel'),
+                ),
+              ),
+            ),
+          ),
+        );
+        await tester.pumpAndSettle();
+
+        await tester.tap(find.text('Open channel'));
+        await tester.pumpAndSettle();
+
+        final nativeViewFinder = find.descendant(
+          of: find.byKey(const ValueKey('channel-ios-glass-back')),
+          matching: find.byType(UiKitView),
+        );
+        final nativeView = tester.widget<UiKitView>(nativeViewFinder);
+        expect(nativeView.viewType, 'buzz/navigation_glass');
+        expect(
+          (nativeView.creationParams as Map<String, Object>)['icon'],
+          'back',
+        );
+        expect(
+          (nativeView.creationParams as Map<String, Object>)['brightness'],
+          'light',
+        );
+        expect(
+          (nativeView.creationParams as Map<String, Object>)['buttonCenterX'],
+          38.0,
+        );
+        final backButtonRect = tester.getRect(
+          find.byKey(const ValueKey('channel-ios-glass-back')),
+        );
+        expect(backButtonRect.width, 58);
+        final channelIconRect = tester.getRect(
+          find.byKey(const ValueKey('channel-header-avatar')),
+        );
+        expect(
+          channelIconRect.left - backButtonRect.right,
+          moreOrLessEquals(Grid.xs),
+        );
+        expect(
+          backButtonRect.center.dy,
+          moreOrLessEquals(channelIconRect.center.dy),
+        );
+        expect(tester.takeException(), isNull);
+        debugDefaultTargetPlatformOverride = null;
+      },
+    );
+
+    for (final platform in [TargetPlatform.android, TargetPlatform.iOS]) {
+      testWidgets(
+        'keeps a narrow long channel title aligned on ${platform.name}',
+        (tester) async {
+          final previousPlatform = debugDefaultTargetPlatformOverride;
+          debugDefaultTargetPlatformOverride = platform;
+          addTearDown(
+            () => debugDefaultTargetPlatformOverride = previousPlatform,
+          );
+          tester.view.physicalSize = const Size(320, 700);
+          tester.view.devicePixelRatio = 1;
+          addTearDown(tester.view.reset);
+          final channel = _testChannel.copyWith(
+            name: 'a-very-long-channel-name-that-must-truncate',
+          );
+
+          await tester.pumpWidget(
+            _buildTestable(
+              messages: const [],
+              channel: channel,
+              home: Builder(
+                builder: (context) => Scaffold(
+                  body: TextButton(
+                    onPressed: () => Navigator.of(context).push(
+                      MaterialPageRoute<void>(
+                        builder: (_) => ChannelDetailPage(channel: channel),
+                      ),
+                    ),
+                    child: const Text('Open channel'),
+                  ),
+                ),
+              ),
+            ),
+          );
+          await tester.pumpAndSettle();
+
+          await tester.tap(find.text('Open channel'));
+          await tester.pumpAndSettle();
+
+          final backRect = platform == TargetPlatform.iOS
+              ? tester.getRect(
+                  find.byKey(const ValueKey('channel-ios-glass-back')),
+                )
+              : tester.getRect(find.byTooltip('Back'));
+          final avatarRect = tester.getRect(
+            find.byKey(const ValueKey('channel-header-avatar')),
+          );
+          final titleSpacing = avatarRect.left - backRect.right;
+          final title = tester.renderObject<RenderParagraph>(
+            find.byKey(const ValueKey('channel-header-name')),
+          );
+          final titleDidExceedMaxLines = title.didExceedMaxLines;
+          debugDefaultTargetPlatformOverride = previousPlatform;
+
+          expect(
+            titleSpacing,
+            moreOrLessEquals(
+              platform == TargetPlatform.iOS
+                  ? iosGlassChannelHeaderTitleSpacing
+                  : 0,
+            ),
+          );
+          expect(titleDidExceedMaxLines, isTrue);
+          expect(tester.takeException(), isNull);
+        },
+      );
+    }
+
     testWidgets('shows a tappable channel name and collective member count', (
       tester,
     ) async {
@@ -5221,12 +5463,66 @@ void main() {
         tester.getSize(find.byKey(const ValueKey('channel-header-avatar'))),
         const Size.square(40),
       );
+      final channelHeaderAvatarRect = tester.getRect(
+        find.byKey(const ValueKey('channel-header-avatar')),
+      );
+      final channelHeaderTextStackRect = tester.getRect(
+        find.byKey(const ValueKey('channel-header-text-stack')),
+      );
+      expect(channelHeaderTextStackRect.height, 40);
+      expect(
+        channelHeaderTextStackRect.center.dy,
+        moreOrLessEquals(channelHeaderAvatarRect.center.dy),
+      );
       expect(
         tester
             .widget<Text>(find.byKey(const ValueKey('channel-header-name')))
             .style
             ?.fontSize,
-        AppTheme.light().textTheme.titleMedium?.fontSize,
+        AppTheme.light().textTheme.titleSmall?.fontSize,
+      );
+      expect(
+        tester
+            .widget<Text>(find.byKey(const ValueKey('channel-header-name')))
+            .style
+            ?.fontWeight,
+        FontWeight.w600,
+      );
+      final channelHeaderAvatar = tester.widget<Container>(
+        find.byKey(const ValueKey('channel-header-avatar')),
+      );
+      expect(
+        (channelHeaderAvatar.decoration as BoxDecoration).color,
+        AppTheme.light().colorScheme.surface,
+      );
+      final channelHeaderAvatarBorder =
+          (channelHeaderAvatar.decoration as BoxDecoration).border! as Border;
+      expect(
+        channelHeaderAvatarBorder.top.color,
+        AppTheme.light().colorScheme.inverseSurface.withValues(alpha: 0.07),
+      );
+      expect(channelHeaderAvatarBorder.top.width, 1);
+      expect(
+        channelHeaderAvatarBorder.top.strokeAlign,
+        BorderSide.strokeAlignOutside,
+      );
+      expect(
+        tester
+            .widget<Icon>(
+              find.descendant(
+                of: find.byKey(const ValueKey('channel-header-avatar')),
+                matching: find.byIcon(LucideIcons.hash),
+              ),
+            )
+            .color,
+        AppTheme.light().colorScheme.primary,
+      );
+      expect(
+        tester.getRect(find.byKey(const ValueKey('channel-header-name'))).left -
+            tester
+                .getRect(find.byKey(const ValueKey('channel-header-avatar')))
+                .right,
+        moreOrLessEquals(Grid.twelve),
       );
       expect(
         tester
@@ -5237,6 +5533,15 @@ void main() {
             ?.fontSize,
         AppTheme.light().textTheme.bodySmall?.fontSize,
       );
+      expect(
+        tester
+            .widget<Text>(
+              find.byKey(const ValueKey('channel-header-member-count')),
+            )
+            .style
+            ?.color,
+        AppTheme.light().colorScheme.onSurface.withValues(alpha: 0.65),
+      );
       expect(find.byTooltip('View members'), findsNothing);
       expect(find.byTooltip('Channel actions'), findsNothing);
 
@@ -8690,6 +8995,20 @@ void main() {
       expect(find.byKey(const ValueKey('thread-jump-to-latest')), findsNothing);
     });
 
+    test(
+      'thread tail accepts exact scroll extent while item positions lag',
+      () {
+        expect(
+          threadTailCorrectionReachedEnd(tailIsVisible: false, extentAfter: 0),
+          isTrue,
+        );
+        expect(
+          threadTailCorrectionReachedEnd(tailIsVisible: false, extentAfter: 1),
+          isFalse,
+        );
+      },
+    );
+
     testWidgets('thread Latest settles across expanding lazy scroll extents', (
       tester,
     ) async {
@@ -8892,6 +9211,14 @@ void main() {
         await tester.tap(find.byKey(const ValueKey('thread-jump-to-latest')));
         await tester.pump();
 
+        expect(
+          find.byKey(const ValueKey('thread-jump-to-latest-hidden')),
+          findsOneWidget,
+          reason:
+              'Latest should leave immediately once its navigation starts, '
+              'rather than lingering over the thread at the tail.',
+        );
+
         expect(
           find.descendant(of: list, matching: find.byType(Scrollable)),
           findsOneWidget,
diff --git a/mobile/test/features/pairing/pairing_page_test.dart b/mobile/test/features/pairing/pairing_page_test.dart
index e66e9bb3da..54d7ac52c8 100644
--- a/mobile/test/features/pairing/pairing_page_test.dart
+++ b/mobile/test/features/pairing/pairing_page_test.dart
@@ -139,6 +139,21 @@ void main() {
       expect(find.byIcon(LucideIcons.arrowLeft), findsOneWidget);
     });
 
+    testWidgets('uses the native glass back control on iOS', (tester) async {
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      addTearDown(() => debugDefaultTargetPlatformOverride = null);
+
+      await tester.pumpWidget(
+        WidgetHelpers.testable(child: const PairingPage(addingCommunity: true)),
+      );
+
+      final nativeBack = tester.widget<UiKitView>(find.byType(UiKitView));
+      expect(nativeBack.viewType, 'buzz/navigation_glass');
+      expect(nativeBack.creationParams, containsPair('icon', 'back'));
+      expect(find.byTooltip('Back'), findsOneWidget);
+      debugDefaultTargetPlatformOverride = null;
+    });
+
     testWidgets('reveals pairing code field and connect action', (
       tester,
     ) async {
diff --git a/mobile/test/features/settings/settings_page_test.dart b/mobile/test/features/settings/settings_page_test.dart
index 15e79b0f77..9242c5b4bc 100644
--- a/mobile/test/features/settings/settings_page_test.dart
+++ b/mobile/test/features/settings/settings_page_test.dart
@@ -3,11 +3,40 @@ import 'package:buzz/shared/community/community_membership_provider.dart';
 import 'package:buzz/shared/theme/theme.dart';
 import 'package:buzz/shared/widgets/app_list_card.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 void main() {
+  testWidgets('uses the native glass close control on iOS', (tester) async {
+    debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+    addTearDown(() => debugDefaultTargetPlatformOverride = null);
+    SharedPreferences.setMockInitialValues({});
+    final prefs = await SharedPreferences.getInstance();
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [savedPrefsProvider.overrideWithValue(prefs)],
+        child: MaterialApp(
+          theme: AppTheme.light(),
+          home: SettingsPage(
+            profileHeader: const SizedBox.shrink(),
+            invitePageBuilder: (_) => const SizedBox.shrink(),
+            identityRecoveryPageBuilder: (_) => const SizedBox.shrink(),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final nativeClose = tester.widget<UiKitView>(find.byType(UiKitView));
+    expect(nativeClose.viewType, 'buzz/navigation_glass');
+    expect(nativeClose.creationParams, containsPair('icon', 'close'));
+    expect(find.byTooltip('Close settings'), findsOneWidget);
+    debugDefaultTargetPlatformOverride = null;
+  });
+
   testWidgets('shows community invite navigation to owners and admins', (
     tester,
   ) async {
diff --git a/mobile/test/shared/widgets/frosted_app_bar_test.dart b/mobile/test/shared/widgets/frosted_app_bar_test.dart
index bc17f66ee3..37040ce9fb 100644
--- a/mobile/test/shared/widgets/frosted_app_bar_test.dart
+++ b/mobile/test/shared/widgets/frosted_app_bar_test.dart
@@ -1,6 +1,9 @@
 import 'package:buzz/shared/theme/theme.dart';
 import 'package:buzz/shared/widgets/frosted_app_bar.dart';
+import 'package:buzz/shared/widgets/ios_glass_navigation_button.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
@@ -83,4 +86,113 @@ void main() {
     expect(reportedHeight, closeTo(titleContentHeight + Grid.xs + 1, 0.01));
     expect(tester.takeException(), isNull);
   });
+
+  testWidgets('uses the native glass back control on iOS', (tester) async {
+    debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+    addTearDown(() => debugDefaultTargetPlatformOverride = null);
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: Builder(
+          builder: (context) => TextButton(
+            onPressed: () => Navigator.of(context).push(
+              MaterialPageRoute<void>(
+                builder: (_) => const Stack(
+                  children: [FrostedAppBar(title: Text('Destination'))],
+                ),
+              ),
+            ),
+            child: const Text('Open'),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.text('Open'));
+    await tester.pumpAndSettle();
+
+    final nativeBack = tester.widget<UiKitView>(find.byType(UiKitView));
+    expect(nativeBack.viewType, 'buzz/navigation_glass');
+    expect(nativeBack.creationParams, containsPair('icon', 'back'));
+    expect(
+      nativeBack.creationParams,
+      containsPair('accessibilityLabel', 'Back'),
+    );
+    expect(nativeBack.creationParams, containsPair('hitTargetWidth', 48.0));
+    expect(nativeBack.creationParams, containsPair('hitTargetHeight', 48.0));
+    expect(find.byTooltip('Back'), findsOneWidget);
+    expect(
+      tester.widget<Tooltip>(find.byTooltip('Back')).excludeFromSemantics,
+      isTrue,
+    );
+    debugDefaultTargetPlatformOverride = null;
+  });
+
+  testWidgets('replaces native glass while a Flutter backdrop is active', (
+    tester,
+  ) async {
+    debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+    addTearDown(() => debugDefaultTargetPlatformOverride = null);
+    final suppressNativeView = ValueNotifier(false);
+    addTearDown(suppressNativeView.dispose);
+    var pressCount = 0;
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: Scaffold(
+          body: IosGlassNavigationButton(
+            icon: IosGlassNavigationIcon.back,
+            semanticLabel: 'Back',
+            onPressed: () => pressCount++,
+            nativeViewSuppressed: suppressNativeView,
+          ),
+        ),
+      ),
+    );
+
+    expect(find.byType(UiKitView), findsOneWidget);
+    expect(
+      find.byKey(const ValueKey('ios-glass-navigation-flutter-fallback')),
+      findsNothing,
+    );
+    expect(find.bySemanticsLabel('Back'), findsNothing);
+
+    suppressNativeView.value = true;
+    await tester.pump();
+
+    expect(find.byType(UiKitView), findsNothing);
+    expect(
+      find.byKey(const ValueKey('ios-glass-navigation-flutter-fallback')),
+      findsOneWidget,
+    );
+    final fallbackFinder = find.bySemanticsLabel('Back');
+    expect(fallbackFinder, findsOneWidget);
+    final fallbackSemantics = tester.getSemantics(fallbackFinder);
+    expect(fallbackSemantics.flagsCollection.isButton, isTrue);
+    expect(
+      fallbackSemantics.flagsCollection.isEnabled.toString(),
+      'Tristate.isTrue',
+    );
+    expect(
+      fallbackSemantics.getSemanticsData().hasAction(SemanticsAction.tap),
+      isTrue,
+    );
+    tester.binding.performSemanticsAction(
+      SemanticsActionEvent(
+        type: SemanticsAction.tap,
+        viewId: tester.view.viewId,
+        nodeId: fallbackSemantics.id,
+      ),
+    );
+    await tester.pump();
+    expect(pressCount, 1);
+
+    suppressNativeView.value = false;
+    await tester.pump();
+
+    expect(find.byType(UiKitView), findsOneWidget);
+    debugDefaultTargetPlatformOverride = null;
+  });
 }
diff --git a/mobile/test/shared/widgets/modal_presentation_test.dart b/mobile/test/shared/widgets/modal_presentation_test.dart
index 85767e3f89..66960b4925 100644
--- a/mobile/test/shared/widgets/modal_presentation_test.dart
+++ b/mobile/test/shared/widgets/modal_presentation_test.dart
@@ -111,7 +111,13 @@ void main() {
       await tester.tap(find.text('Open sheet'));
       await tester.pumpAndSettle();
 
-      final nativeSurface = tester.widget<UiKitView>(find.byType(UiKitView));
+      final nativeSurface = tester.widget<UiKitView>(
+        find.byWidgetPredicate(
+          (widget) =>
+              widget is UiKitView &&
+              widget.viewType == 'buzz/concentric_sheet_surface',
+        ),
+      );
       expect(
         nativeSurface.creationParams,
         containsPair('color', lightColorScheme.surface.toARGB32()),
@@ -131,6 +137,13 @@ void main() {
       expect(contentClip.borderRadius, BorderRadius.circular(Radii.dialog * 2));
       expect(contentClip.clipBehavior, Clip.antiAlias);
       expect(find.text('Members'), findsOneWidget);
+      final nativeClose = tester.widget<UiKitView>(
+        find.byWidgetPredicate(
+          (widget) =>
+              widget is UiKitView && widget.viewType == 'buzz/navigation_glass',
+        ),
+      );
+      expect(nativeClose.creationParams, containsPair('icon', 'close'));
     } finally {
       tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
         surfaceChannel,

From 8740a1fa94dd14a3eb5cd2a570b0be2c4a68cbfe Mon Sep 17 00:00:00 2001
From: Will Pfleger <pfleger.will@gmail.com>
Date: Fri, 21 Aug 2026 10:38:09 -0400
Subject: [PATCH 12/38] docs: clarify two-layer moderation ownership (#6481)

Clarify how the two moderation layers map to hosted and self-hosted
relay deployments.

- State that platform safety belongs to whoever operates the relay, with
hosted and self-hosted accountability spelled out.
- Distinguish the relay/platform operator-and-moderator roster from
community owner and admin roles.

Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
Co-authored-by: Alia <d32955ad69077062930cc46cfe2df30ca9aaf6f8e76422681265e9e9af704d78@buzz.block.builderlab.xyz>
---
 VISION_MODERATION.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VISION_MODERATION.md b/VISION_MODERATION.md
index 45d3ab86fd..0b2e12cb59 100644
--- a/VISION_MODERATION.md
+++ b/VISION_MODERATION.md
@@ -14,7 +14,7 @@ Moderation splits the way it does on every serious platform:
 
 **Community moderation** — subjective, per-community rule enforcement. Your owners and admins decide what's spam in *your* community, what crosses *your* line, who gets a second chance. This layer belongs to the community and never reaches past it: an admin's authority ends at the community boundary, structurally, because every moderation decision is scoped to the tenant it was made in.
 
-**Platform safety** — the severe class: illegal content, network-level abuse, legal reporting obligations. That is never delegated to community admins. A community owner or admin can **escalate** a report upward, and the escalation is recorded durably for the platform operator's safety process. The community layer is the front line; the platform layer is the backstop.
+**Platform safety** — the severe class: illegal content, network-level abuse, legal reporting obligations. That is never delegated to community admins. A community owner or admin can **escalate** a report upward, and the escalation is recorded durably for the platform operator's safety process. The platform-safety layer belongs to whoever operates the relay. In a hosted multi-community deployment, that means the hosting platform's safety process; in a self-hosted deployment, it means the operator themselves, because the party hosting the content carries the legal accountability. The community layer is the front line; the platform layer is the backstop.
 
 This document is about the first layer. The second has its own lane.
 
@@ -54,7 +54,7 @@ This document is about the first layer. The second has its own lane.
 
 **Escalation is a hook today, not a pipeline.** Escalating writes a durable, queryable record for the platform operator — but the platform-side inbox that consumes it is a separate build. The substrate is there; the tooling above it comes next.
 
-**Two roles, not three.** Owners and admins moderate. There is no volunteer-moderator tier yet — deliberately. Authority is structured as capabilities, so adding a moderator tier later is a policy change, not a rewrite. We'd rather ship a loop that works and grow the org chart when communities ask for it.
+**Two roles, not three.** Owners and admins moderate. There is no volunteer-moderator tier yet — deliberately. Authority is structured as capabilities, so adding a moderator tier later is a policy change, not a rewrite. The relay/platform layer has its own operator-and-moderator roster, distinct from community owner and admin roles. We'd rather ship a loop that works and grow the org chart when communities ask for it.
 
 **Notices are best-effort.** The DMs that close the loop never block enforcement — a ban lands even if the notice fails. Enforcement is the promise; notification is the courtesy. A later platform-escalation pass should also make escalated reports say exactly that, instead of reusing the generic handled message.
 

From 4e3c9e619c93dd26677b392ad1f8cf0d12c8f855 Mon Sep 17 00:00:00 2001
From: Wes <wesbillman@users.noreply.github.com>
Date: Fri, 21 Aug 2026 09:17:04 -0600
Subject: [PATCH 13/38] fix(desktop): sender names in notifications + macOS
 click-through routing (#6427)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> Opened by the agents Brain and Pinky on behalf of @wesbillman.

Fixes two desktop notification issues (requested in Buzz channel
`desktop-notification-improvements`):

## 1. Notifications now show who sent the message

Live DM and thread-reply notifications showed only "Direct message" /
"Reply in #channel", while home-feed mention toasts already carried the
sender's name. All message-notification copy is now centralized:

- **`formatMessageNotification`**
(`notifications/lib/notificationFormat.ts`) — canonical title/body for
all five sources (mention, approval, needs-action, DM, thread reply).
Sender-first titles with neutral fallbacks, never a raw pubkey:
  - DM: `Taylor` instead of `Direct message`
- Thread reply: `Taylor replied in #ship-room` instead of `Reply in
#ship-room`
- **`useNotificationSenderName`** — synchronous cache-only lookup
(react-query users-batch entry cache → persisted label cache); a cold
miss ships the fallback title immediately and warms the cache in the
background. No toast delay, no new network machinery.
- **`buildEventNotificationTarget` / `buildFeedItemNotificationTarget`**
(`notifications/lib/target.ts`) — the click-through target payload is
built in one place instead of three hand-rolled copies.

## 2. macOS notification clicks route to the target message (#3509)

On packaged builds, clicking a notification focused the app but never
navigated. Three independent gaps lined up behind one symptom:

- **Reveal hang**: notification navigation now starts before the
best-effort `unminimize → show → setFocus` chain, so a hung native
invoke cannot gate click-through; the existing 1.5s reveal timeout
remains as a secondary guard.
- **Lost emit**: the Rust delegate queues the activation target *before*
emitting `native-notification-activated`; a lost emit stranded the
target with nothing re-draining the queue. The macOS listener now also
drains on window `focus` / `visibilitychange` — delivered by WebKit
independently of the Tauri event channel, and always produced by the
click's own foregrounding.
- **Silent no-op**: `commitNavigation` skips same-href destinations;
`goChannel` / `goForumPost` / `openSearchHit` now accept `force`, and
the notification activation handler passes it so a click always routes.
Multiple queued activations are serialized FIFO with rejection
containment so an older click cannot finish after and overwrite a newer
one. Queue teardown now aborts already-running activations as well as
pending ones; async forum-comment destination resolution rechecks
ownership before community-scoped cache writes or routing.

Diagnostic evidence from the macOS unified log (packaged v0.5.17):
delegate confirmed live in release builds (`willPresent` honored —
`(["list"])` presentations); a real click response at 09:25:06 reached
`usernoted`, the app was fronted by LaunchServices, and no navigation
followed.

## Verification

- Fixed the stale relay-backed DM dedupe expectation: exactly one toast
remains required, with sender-first title `alice` instead of channel
title `alice-tyler`
- Rebased onto `origin/main` and verified 15 focused activation/click
tests, desktop typecheck/check, file-size gate, Biome on changed files,
and `git diff --check` at `21a7e0cf5`
- Notification + navigation + AppShell.helpers unit tests: 89/89 pass
(includes new `notificationFormat.test.mjs`, `target.test.mjs`,
`desktopActivations.test.mjs`)
- Full desktop JS suite run by Pinky at f03979ea: 5133/5133 pass;
pre-push hooks (desktop-test, desktop-typecheck, desktop-tauri-checks,
rust-tests, file-size ratchet) all green on this branch
- `tsc --noEmit` and changed-file Biome checks clean; re-verified after
rebasing current `origin/main`
- Click-through on a packaged build still needs human verification —
@wesbillman, next release build is the real test.

---------

Signed-off-by: Brain <1a02c72794dcd0f07058a353bc3a81f4028b8c77c92c87fce6d5c8b85970a20b@buzz.block.builderlab.xyz>
Signed-off-by: Pinky <5f5ab050ec58ae208332edd544ebf705221e24c1b86d82a6ca07038a7a8f6ac9@buzz.block.builderlab.xyz>
Signed-off-by: Wes <wesbillman@users.noreply.github.com>
Co-authored-by: Brain <1a02c72794dcd0f07058a353bc3a81f4028b8c77c92c87fce6d5c8b85970a20b@buzz.block.builderlab.xyz>
Co-authored-by: Pinky <5f5ab050ec58ae208332edd544ebf705221e24c1b86d82a6ca07038a7a8f6ac9@buzz.block.builderlab.xyz>
Co-authored-by: Carl <32a2e2c9d428ee08902cab75d956da2c1d235a22d4766b0dd4138bf6e2e5db1d@buzz.block.builderlab.xyz>
---
 desktop/src/app/AppShell.helpers.test.mjs     | 173 ++++++++++++++++++
 desktop/src/app/AppShell.helpers.ts           |  73 ++++++++
 .../navigation/searchHitNavigation.test.mjs   | 141 ++++++++++++++
 .../src/app/navigation/searchHitNavigation.ts |  60 ++++++
 .../src/app/navigation/useAppNavigation.ts    |  47 ++---
 .../app/useAppShellDesktopNotifications.ts    | 104 +++++------
 .../src/features/notifications/lib/desktop.ts |  68 ++++++-
 .../lib/desktopActivations.test.mjs           | 141 ++++++++++++++
 .../src/features/notifications/lib/feed.ts    |  55 ++----
 .../lib/notificationFormat.test.mjs           | 163 +++++++++++++++++
 .../notifications/lib/notificationFormat.ts   |  63 +++++++
 .../features/notifications/lib/senderName.ts  |  24 +++
 .../notifications/lib/target.test.mjs         |  81 ++++++++
 .../src/features/notifications/lib/target.ts  |  44 +++++
 .../use-feed-desktop-notifications.ts         |  22 +--
 .../useNotificationSenderName.ts              |  76 ++++++++
 desktop/src/features/profile/hooks.ts         |   7 +-
 .../tests/e2e/dm-double-notification.spec.ts  |   6 +-
 18 files changed, 1215 insertions(+), 133 deletions(-)
 create mode 100644 desktop/src/app/navigation/searchHitNavigation.test.mjs
 create mode 100644 desktop/src/app/navigation/searchHitNavigation.ts
 create mode 100644 desktop/src/features/notifications/lib/desktopActivations.test.mjs
 create mode 100644 desktop/src/features/notifications/lib/notificationFormat.test.mjs
 create mode 100644 desktop/src/features/notifications/lib/senderName.ts
 create mode 100644 desktop/src/features/notifications/lib/target.test.mjs
 create mode 100644 desktop/src/features/notifications/lib/target.ts
 create mode 100644 desktop/src/features/notifications/useNotificationSenderName.ts

diff --git a/desktop/src/app/AppShell.helpers.test.mjs b/desktop/src/app/AppShell.helpers.test.mjs
index fa06232923..fc4a14f2cd 100644
--- a/desktop/src/app/AppShell.helpers.test.mjs
+++ b/desktop/src/app/AppShell.helpers.test.mjs
@@ -3,6 +3,8 @@ import test from "node:test";
 
 import {
   markAllReadSources,
+  activateDesktopNotificationTarget,
+  createDesktopNotificationActivationQueue,
   shouldBounceForChannelNotification,
 } from "./AppShell.helpers.ts";
 
@@ -31,6 +33,177 @@ test("shouldBounceForChannelNotification_allowsBroadcastReplies", () => {
   );
 });
 
+test("notification activation queue preserves click order", async () => {
+  const calls = [];
+  const resolvers = new Map();
+  const queue = createDesktopNotificationActivationQueue((target) => {
+    calls.push(`start:${target.channelId}`);
+    return new Promise((resolve) => {
+      resolvers.set(target.channelId, () => {
+        calls.push(`finish:${target.channelId}`);
+        resolve();
+      });
+    });
+  });
+
+  queue.enqueue({ channelId: "first", eventId: null, kind: null });
+  queue.enqueue({ channelId: "second", eventId: null, kind: null });
+  await new Promise((resolve) => setImmediate(resolve));
+  assert.deepEqual(calls, ["start:first"]);
+
+  resolvers.get("first")();
+  await new Promise((resolve) => setImmediate(resolve));
+  assert.deepEqual(calls, ["start:first", "finish:first", "start:second"]);
+
+  resolvers.get("second")();
+});
+
+test("notification activation queue drops pending targets after cancellation", async () => {
+  const calls = [];
+  let resolveFirst;
+  const queue = createDesktopNotificationActivationQueue((target) => {
+    calls.push(target.channelId);
+    if (target.channelId === "first") {
+      return new Promise((resolve) => {
+        resolveFirst = resolve;
+      });
+    }
+    return Promise.resolve();
+  });
+
+  queue.enqueue({ channelId: "first", eventId: null, kind: null });
+  queue.enqueue({ channelId: "second", eventId: null, kind: null });
+  await new Promise((resolve) => setImmediate(resolve));
+  assert.deepEqual(calls, ["first"]);
+
+  queue.cancel();
+  resolveFirst();
+  await new Promise((resolve) => setImmediate(resolve));
+  assert.deepEqual(calls, ["first"]);
+});
+
+test("notification activation queue aborts an in-flight activation", async () => {
+  let observedSignal;
+  let resolveActivation;
+  const queue = createDesktopNotificationActivationQueue((_target, signal) => {
+    observedSignal = signal;
+    return new Promise((resolve) => {
+      resolveActivation = resolve;
+    });
+  });
+
+  queue.enqueue({ channelId: "first", eventId: null, kind: null });
+  await new Promise((resolve) => setImmediate(resolve));
+  assert.equal(observedSignal.aborted, false);
+
+  queue.cancel();
+  assert.equal(observedSignal.aborted, true);
+  resolveActivation();
+});
+
+test("notification activation queue reports failures and continues", async () => {
+  const calls = [];
+  const errors = [];
+  const queue = createDesktopNotificationActivationQueue(
+    async (target) => {
+      calls.push(target.channelId);
+      if (target.channelId === "first") {
+        throw new Error("navigation failed");
+      }
+    },
+    (error) => errors.push(error),
+  );
+
+  queue.enqueue({ channelId: "first", eventId: null, kind: null });
+  queue.enqueue({ channelId: "second", eventId: null, kind: null });
+  await new Promise((resolve) => setImmediate(resolve));
+
+  assert.deepEqual(calls, ["first", "second"]);
+  assert.equal(errors.length, 1);
+  assert.match(errors[0].message, /navigation failed/);
+});
+
+test("notification activation starts routing before a hung reveal", async () => {
+  const calls = [];
+  let resolveNavigation;
+  let navigationSettled = false;
+  const activation = activateDesktopNotificationTarget(
+    {
+      channelId: "channel",
+      eventId: "event",
+      kind: 9,
+    },
+    {
+      goChannel: async () => calls.push("channel"),
+      goHome: async () => calls.push("home"),
+      revealWindow: () => new Promise(() => {}),
+      openSearchHit: (_hit, behavior) => {
+        calls.push(`message:${String(behavior?.force)}`);
+        return new Promise((resolve) => {
+          resolveNavigation = () => {
+            navigationSettled = true;
+            resolve();
+          };
+        });
+      },
+    },
+  );
+
+  assert.deepEqual(calls, ["message:true"]);
+  resolveNavigation();
+  await activation;
+  assert.equal(navigationSettled, true);
+});
+
+test("notification activation falls back to forced channel navigation", async () => {
+  const calls = [];
+  await activateDesktopNotificationTarget(
+    { channelId: "channel", eventId: null, kind: null },
+    {
+      goChannel: async (channelId, behavior) =>
+        calls.push(`${channelId}:${String(behavior?.force)}`),
+      goHome: async () => calls.push("home"),
+      openSearchHit: async () => calls.push("message"),
+      revealWindow: async () => calls.push("reveal"),
+    },
+  );
+
+  assert.deepEqual(calls, ["channel:true", "reveal"]);
+});
+
+test("notification activation ignores reveal rejection after routing starts", async () => {
+  const calls = [];
+  await activateDesktopNotificationTarget(
+    { channelId: "channel", eventId: null, kind: null },
+    {
+      goChannel: async () => calls.push("channel"),
+      goHome: async () => calls.push("home"),
+      openSearchHit: async () => calls.push("message"),
+      revealWindow: async () => {
+        calls.push("reveal");
+        throw new Error("reveal failed");
+      },
+    },
+  );
+
+  assert.deepEqual(calls, ["channel", "reveal"]);
+});
+
+test("notification activation without a channel opens home", async () => {
+  const calls = [];
+  await activateDesktopNotificationTarget(
+    { channelId: null, eventId: "event", kind: 9 },
+    {
+      goChannel: async () => calls.push("channel"),
+      goHome: async () => calls.push("home"),
+      openSearchHit: async () => calls.push("message"),
+      revealWindow: async () => calls.push("reveal"),
+    },
+  );
+
+  assert.deepEqual(calls, ["home", "reveal"]);
+});
+
 test("markAllReadSources clears Inbox overrides and active thread activity", () => {
   const calls = [];
 
diff --git a/desktop/src/app/AppShell.helpers.ts b/desktop/src/app/AppShell.helpers.ts
index dd6b9195e8..9fc14736c7 100644
--- a/desktop/src/app/AppShell.helpers.ts
+++ b/desktop/src/app/AppShell.helpers.ts
@@ -141,6 +141,79 @@ export function toSearchHit(
   };
 }
 
+export function createDesktopNotificationActivationQueue(
+  activate: (
+    target: DesktopNotificationTarget,
+    signal: AbortSignal,
+  ) => Promise<void>,
+  onError?: (error: unknown) => void,
+): {
+  cancel: () => void;
+  enqueue: (target: DesktopNotificationTarget) => void;
+} {
+  const controller = new AbortController();
+  let pending = Promise.resolve();
+
+  return {
+    cancel: () => {
+      controller.abort();
+    },
+    enqueue: (target) => {
+      // Preserve native click order when macOS drains multiple queued targets.
+      // Contain failures so one rejected navigation cannot poison later clicks.
+      pending = pending
+        .then(() => {
+          if (!controller.signal.aborted) {
+            return activate(target, controller.signal);
+          }
+        })
+        .catch((error) => {
+          try {
+            onError?.(error);
+          } catch {
+            // Reporting must not poison the activation queue either.
+          }
+        });
+    },
+  };
+}
+
+export async function activateDesktopNotificationTarget(
+  target: DesktopNotificationTarget,
+  actions: {
+    goChannel: (
+      channelId: string,
+      options?: { force?: boolean },
+    ) => Promise<unknown>;
+    goHome: () => Promise<unknown>;
+    openSearchHit: (
+      hit: SearchHit,
+      behavior?: { force?: boolean; signal?: AbortSignal },
+    ) => Promise<unknown>;
+    revealWindow: () => Promise<void>;
+  },
+  signal?: AbortSignal,
+): Promise<void> {
+  if (signal?.aborted) {
+    return;
+  }
+
+  let navigation: Promise<unknown>;
+  if (!target.channelId) {
+    navigation = actions.goHome();
+  } else {
+    const anchor = toSearchHit(target);
+    navigation = anchor
+      ? actions.openSearchHit(anchor, { force: true, signal })
+      : actions.goChannel(target.channelId, { force: true });
+  }
+
+  // Native activation already foregrounds the app on macOS. Other platforms
+  // still get a best-effort reveal, but it must never gate click-through.
+  void actions.revealWindow().catch(() => undefined);
+  await navigation;
+}
+
 export function deriveShellRoute(pathname: string): {
   selectedChannelId: string | null;
   selectedView: AppView;
diff --git a/desktop/src/app/navigation/searchHitNavigation.test.mjs b/desktop/src/app/navigation/searchHitNavigation.test.mjs
new file mode 100644
index 0000000000..74e5f108af
--- /dev/null
+++ b/desktop/src/app/navigation/searchHitNavigation.test.mjs
@@ -0,0 +1,141 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  activateDesktopNotificationTarget,
+  createDesktopNotificationActivationQueue,
+} from "../AppShell.helpers.ts";
+
+const { clearSearchHitEventCache, getCachedSearchHitEvent } = await import(
+  "./searchHitEventCache.ts"
+);
+const { openSearchHitWithNavigation } = await import(
+  "./searchHitNavigation.ts"
+);
+
+const forumComment = {
+  eventId: "comment",
+  content: "reply",
+  kind: 45003,
+  pubkey: "author",
+  channelId: "old-community-channel",
+  channelName: "forum",
+  createdAt: 1,
+  score: 0,
+  threadRootId: null,
+};
+
+const plainMessage = {
+  ...forumComment,
+  eventId: "message",
+  kind: 9,
+  threadRootId: "thread-root",
+};
+
+test("search-hit navigation preserves forced message routing while active", async () => {
+  clearSearchHitEventCache();
+  const calls = [];
+  const result = await openSearchHitWithNavigation(plainMessage, {
+    force: true,
+    goChannel: async (channelId, options) => {
+      calls.push({ channelId, options });
+      return true;
+    },
+    goForumPost: async () => false,
+  });
+
+  assert.equal(result, true);
+  assert.deepEqual(calls, [
+    {
+      channelId: "old-community-channel",
+      options: {
+        force: true,
+        messageId: "message",
+        threadRootId: "thread-root",
+      },
+    },
+  ]);
+  assert.equal(getCachedSearchHitEvent("message")?.id, "message");
+});
+
+test("cancelled search-hit navigation cannot repopulate cache or route", async () => {
+  clearSearchHitEventCache();
+  let resolveLookup;
+  const destination = new Promise((resolve) => {
+    resolveLookup = resolve;
+  });
+  const calls = [];
+  const controller = new AbortController();
+  const navigation = openSearchHitWithNavigation(
+    forumComment,
+    {
+      goChannel: async () => calls.push("channel"),
+      goForumPost: async () => calls.push("forum"),
+      signal: controller.signal,
+    },
+    () => destination,
+  );
+
+  controller.abort();
+  clearSearchHitEventCache();
+  resolveLookup({
+    kind: "forum-post",
+    channelId: "old-community-channel",
+    postId: "old-community-post",
+    replyId: "comment",
+  });
+  await navigation;
+
+  assert.deepEqual(calls, []);
+  assert.equal(getCachedSearchHitEvent("comment"), null);
+});
+
+test("queue cancellation fences an in-flight forum-comment activation", async () => {
+  clearSearchHitEventCache();
+  let resolveLookup;
+  const destination = new Promise((resolve) => {
+    resolveLookup = resolve;
+  });
+  const calls = [];
+  const queue = createDesktopNotificationActivationQueue((target, signal) =>
+    activateDesktopNotificationTarget(
+      target,
+      {
+        goChannel: async () => calls.push("channel"),
+        goHome: async () => calls.push("home"),
+        openSearchHit: (hit, behavior) =>
+          openSearchHitWithNavigation(
+            hit,
+            {
+              force: behavior?.force,
+              goChannel: async () => calls.push("channel"),
+              goForumPost: async () => calls.push("forum"),
+              signal: behavior?.signal,
+            },
+            () => destination,
+          ),
+        revealWindow: async () => {},
+      },
+      signal,
+    ),
+  );
+
+  queue.enqueue({
+    channelId: "old-community-channel",
+    eventId: "comment",
+    kind: 45003,
+  });
+  await new Promise((resolve) => setImmediate(resolve));
+  queue.cancel();
+  clearSearchHitEventCache();
+  resolveLookup({
+    kind: "forum-post",
+    channelId: "old-community-channel",
+    postId: "old-community-post",
+    replyId: "comment",
+  });
+  await new Promise((resolve) => setImmediate(resolve));
+
+  assert.deepEqual(calls, []);
+  assert.equal(getCachedSearchHitEvent("comment"), null);
+});
diff --git a/desktop/src/app/navigation/searchHitNavigation.ts b/desktop/src/app/navigation/searchHitNavigation.ts
new file mode 100644
index 0000000000..8523340d48
--- /dev/null
+++ b/desktop/src/app/navigation/searchHitNavigation.ts
@@ -0,0 +1,60 @@
+import { resolveSearchHitDestination } from "@/app/navigation/resolveSearchHitDestination";
+import { cacheSearchHitEvent } from "@/app/navigation/searchHitEventCache";
+import type { SearchHit } from "@/shared/api/types";
+
+type SearchHitNavigationActions = {
+  force?: boolean;
+  goChannel: (
+    channelId: string,
+    options?: {
+      force?: boolean;
+      messageId?: string;
+      threadRootId?: string | null;
+    },
+  ) => Promise<unknown>;
+  goForumPost: (
+    channelId: string,
+    postId: string,
+    options?: { force?: boolean; replyId?: string },
+  ) => Promise<unknown>;
+  signal?: AbortSignal;
+};
+
+export async function openSearchHitWithNavigation(
+  hit: SearchHit,
+  actions: SearchHitNavigationActions,
+  resolveDestination = resolveSearchHitDestination,
+): Promise<unknown> {
+  if (actions.signal?.aborted) {
+    return false;
+  }
+
+  const isLifecycleBound = Boolean(actions.signal);
+  if (!isLifecycleBound) {
+    cacheSearchHitEvent(hit);
+  }
+
+  const destination = await resolveDestination(hit);
+  if (!destination || actions.signal?.aborted) {
+    return false;
+  }
+
+  if (isLifecycleBound) {
+    // Delay community-scoped writes for notification routing until async
+    // destination resolution completes and its owner is still current.
+    cacheSearchHitEvent(hit);
+  }
+
+  if (destination.kind === "forum-post") {
+    return actions.goForumPost(destination.channelId, destination.postId, {
+      force: actions.force,
+      replyId: destination.replyId,
+    });
+  }
+
+  return actions.goChannel(destination.channelId, {
+    force: actions.force,
+    messageId: destination.messageId,
+    threadRootId: destination.threadRootId,
+  });
+}
diff --git a/desktop/src/app/navigation/useAppNavigation.ts b/desktop/src/app/navigation/useAppNavigation.ts
index 53db19d378..c4776564e3 100644
--- a/desktop/src/app/navigation/useAppNavigation.ts
+++ b/desktop/src/app/navigation/useAppNavigation.ts
@@ -6,8 +6,7 @@ import {
   useRouter,
 } from "@tanstack/react-router";
 
-import { cacheSearchHitEvent } from "@/app/navigation/searchHitEventCache";
-import { resolveSearchHitDestination } from "@/app/navigation/resolveSearchHitDestination";
+import { openSearchHitWithNavigation } from "@/app/navigation/searchHitNavigation";
 import type { SearchHit } from "@/shared/api/types";
 
 type NavigationBehavior = {
@@ -247,6 +246,10 @@ export function useAppNavigation() {
          * firing. Used by the Drafts panel "Send message" confirm flow.
          */
         autoSend?: string;
+        /** Navigate even when the destination matches the current href.
+         * Used by desktop-notification activation so a click is never
+         * silently swallowed (block/buzz#3509). */
+        force?: boolean;
         messageId?: string;
         replace?: boolean;
         /** Open this thread panel directly without waiting for a timeline row. */
@@ -275,6 +278,7 @@ export function useAppNavigation() {
           },
         },
         {
+          force: options?.force,
           replace: options?.replace,
           resetScroll: options?.messageId ? true : undefined,
         },
@@ -298,6 +302,8 @@ export function useAppNavigation() {
       channelId: string,
       postId: string,
       options?: {
+        /** Navigate even when the destination matches the current href. */
+        force?: boolean;
         replace?: boolean;
         replyId?: string;
       },
@@ -312,6 +318,7 @@ export function useAppNavigation() {
           search: options?.replyId ? { replyId: options.replyId } : {},
         },
         {
+          force: options?.force,
           replace: options?.replace,
           resetScroll: false,
         },
@@ -362,25 +369,23 @@ export function useAppNavigation() {
   );
 
   const openSearchHit = React.useCallback(
-    async (hit: SearchHit) => {
-      cacheSearchHitEvent(hit);
-
-      const destination = await resolveSearchHitDestination(hit);
-      if (!destination) {
-        return false;
-      }
-
-      if (destination.kind === "forum-post") {
-        return goForumPost(destination.channelId, destination.postId, {
-          replyId: destination.replyId,
-        });
-      }
-
-      return goChannel(destination.channelId, {
-        messageId: destination.messageId,
-        threadRootId: destination.threadRootId,
-      });
-    },
+    async (
+      hit: SearchHit,
+      behavior?: {
+        /** Navigate even when the destination matches the current href.
+         * Used by desktop-notification activation so a click is never
+         * silently swallowed (block/buzz#3509). */
+        force?: boolean;
+        /** Stop notification-driven routing when its owning lifecycle ends. */
+        signal?: AbortSignal;
+      },
+    ) =>
+      openSearchHitWithNavigation(hit, {
+        force: behavior?.force,
+        goChannel,
+        goForumPost,
+        signal: behavior?.signal,
+      }),
     [goChannel, goForumPost],
   );
 
diff --git a/desktop/src/app/useAppShellDesktopNotifications.ts b/desktop/src/app/useAppShellDesktopNotifications.ts
index 6792faf21a..b86b95363c 100644
--- a/desktop/src/app/useAppShellDesktopNotifications.ts
+++ b/desktop/src/app/useAppShellDesktopNotifications.ts
@@ -1,10 +1,10 @@
 import * as React from "react";
 
 import {
+  activateDesktopNotificationTarget,
+  createDesktopNotificationActivationQueue,
   shouldBounceForChannelNotification,
-  toSearchHit,
 } from "@/app/AppShell.helpers";
-import { getThreadReference } from "@/features/messages/lib/threading";
 import { useCommunityJoinAlerts } from "@/features/community-members/useCommunityJoinAlerts";
 import { hasMentionForEvent } from "@/features/notifications/lib/shouldNotify";
 import type { NotificationSettings } from "@/features/notifications/hooks";
@@ -14,15 +14,14 @@ import {
   revealDesktopAppWindow,
   sendDesktopNotification,
 } from "@/features/notifications/lib/desktop";
-import {
-  formatNotificationTitle,
-  truncateNotificationBody,
-} from "@/features/notifications/lib/notificationFormat";
+import { formatMessageNotification } from "@/features/notifications/lib/notificationFormat";
+import { buildEventNotificationTarget } from "@/features/notifications/lib/target";
 import {
   playNotificationSound,
   resolveSlotSound,
   shouldPlayNotificationSound,
 } from "@/features/notifications/lib/sound";
+import { useNotificationSenderName } from "@/features/notifications/useNotificationSenderName";
 import type { Channel, RelayEvent } from "@/shared/api/types";
 
 export function useAppShellDesktopNotifications({
@@ -37,11 +36,15 @@ export function useAppShellDesktopNotifications({
 }: {
   channels: Channel[];
   enabled: boolean;
-  goChannel: (channelId: string) => Promise<unknown>;
+  goChannel: (
+    channelId: string,
+    options?: { force?: boolean },
+  ) => Promise<unknown>;
   goHome: () => Promise<unknown>;
   notificationSettings: NotificationSettings;
   openSearchHit: (
     hit: import("@/shared/api/types").SearchHit,
+    behavior?: { force?: boolean },
   ) => Promise<unknown>;
   pubkey?: string;
   silentChannelIds?: ReadonlySet<string>;
@@ -53,6 +56,8 @@ export function useAppShellDesktopNotifications({
     enabled: enabled && notificationSettings.desktopEnabled,
   });
 
+  const resolveSenderName = useNotificationSenderName();
+
   const handleChannelNotification = React.useEffectEvent(
     (_channelId: string, event: RelayEvent) => {
       if (!enabled) return;
@@ -73,22 +78,20 @@ export function useAppShellDesktopNotifications({
       }
 
       const channelName = channel.name?.trim() || "Direct message";
-      const body = truncateNotificationBody(event.content, "New message");
-      const threadRootId = getThreadReference(event.tags).rootId ?? null;
+      const { title, body } = formatMessageNotification({
+        source: "dm",
+        senderName: resolveSenderName(event.pubkey),
+        channelName,
+        content: event.content,
+      });
 
       void sendDesktopNotification({
-        title: channelName,
+        title,
         body,
-        target: {
-          channelId: channel.id,
-          channelName,
-          content: event.content,
-          createdAt: event.created_at,
-          eventId: event.id,
-          kind: event.kind,
-          pubkey: event.pubkey,
-          threadRootId,
-        },
+        target: buildEventNotificationTarget(event, {
+          id: channel.id,
+          name: channelName,
+        }),
       }).then((didSend) => {
         if (!didSend) return;
         if (shouldPlayNotificationSound(channel.id, silentChannelIds)) {
@@ -118,25 +121,20 @@ export function useAppShellDesktopNotifications({
 
       const resolvedChannel = channels.find((c) => c.id === channelId);
       const channelName = resolvedChannel?.name?.trim() ?? null;
-      // channelLabel is "#name" for the toast title; channelName is the raw
-      // name stored in the navigation target for click-through routing.
-      const channelLabel = channelName ? `#${channelName}` : null;
-      const body = truncateNotificationBody(event.content, "New reply");
-      const threadRootId = getThreadReference(event.tags).rootId ?? null;
+      const { title, body } = formatMessageNotification({
+        source: "thread_reply",
+        senderName: resolveSenderName(event.pubkey),
+        channelName,
+        content: event.content,
+      });
 
       void sendDesktopNotification({
-        title: formatNotificationTitle({ prefix: "Reply", channelLabel }),
+        title,
         body,
-        target: {
-          channelId,
-          channelName,
-          content: event.content,
-          createdAt: event.created_at,
-          eventId: event.id,
-          kind: event.kind,
-          pubkey: event.pubkey,
-          threadRootId,
-        },
+        target: buildEventNotificationTarget(event, {
+          id: channelId,
+          name: channelName,
+        }),
       }).then((didSend) => {
         if (!didSend) return;
         if (shouldPlayNotificationSound(channelId, silentChannelIds)) {
@@ -152,21 +150,18 @@ export function useAppShellDesktopNotifications({
   const handleDesktopNotificationAction = React.useEffectEvent(
     async (
       target: import("@/features/notifications/lib/desktop").DesktopNotificationTarget,
+      signal: AbortSignal,
     ) => {
-      await revealDesktopAppWindow();
-
-      if (!target.channelId) {
-        void goHome();
-        return;
-      }
-
-      const anchor = toSearchHit(target);
-      if (!anchor) {
-        await goChannel(target.channelId);
-        return;
-      }
-
-      await openSearchHit(anchor);
+      await activateDesktopNotificationTarget(
+        target,
+        {
+          goChannel,
+          goHome,
+          openSearchHit,
+          revealWindow: revealDesktopAppWindow,
+        },
+        signal,
+      );
     },
   );
 
@@ -174,13 +169,19 @@ export function useAppShellDesktopNotifications({
     if (!enabled) return;
     let isCancelled = false;
     let cleanup = () => {};
+    const activationQueue = createDesktopNotificationActivationQueue(
+      (target, signal) => handleDesktopNotificationAction(target, signal),
+      (error) => {
+        console.error("Failed to activate desktop notification", error);
+      },
+    );
 
     void listenForDesktopNotificationActions((target) => {
       if (isCancelled) {
         return;
       }
 
-      void handleDesktopNotificationAction(target);
+      activationQueue.enqueue(target);
     }).then((dispose) => {
       if (isCancelled) {
         dispose();
@@ -192,6 +193,7 @@ export function useAppShellDesktopNotifications({
 
     return () => {
       isCancelled = true;
+      activationQueue.cancel();
       cleanup();
     };
   }, [enabled]);
diff --git a/desktop/src/features/notifications/lib/desktop.ts b/desktop/src/features/notifications/lib/desktop.ts
index 45716de2d9..0844c24de5 100644
--- a/desktop/src/features/notifications/lib/desktop.ts
+++ b/desktop/src/features/notifications/lib/desktop.ts
@@ -210,6 +210,7 @@ export async function listenForDesktopNotificationActions(
 
   let pluginListener: { unregister: () => Promise<void> } | null = null;
   let nativeUnlisten: (() => void) | null = null;
+  let redrainUnlisten: (() => void) | null = null;
 
   if (isTauri()) {
     const usesMacActivationQueue = isMacPlatform();
@@ -279,6 +280,29 @@ export async function listenForDesktopNotificationActions(
         );
       }
     }
+
+    if (usesMacActivationQueue) {
+      // Belt and suspenders for block/buzz#3509: the Rust delegate queues the
+      // target before emitting, so a lost emit strands the activation with
+      // nothing re-draining it. macOS always foregrounds the app on a
+      // notification click, and WebKit delivers the resulting focus and
+      // visibility transitions independently of the Tauri event channel — use
+      // them to re-drain so a queued target is never stranded.
+      const redrain = () => {
+        void dispatchNativeActivations().catch((error) => {
+          console.error(
+            "Failed to drain macOS notification activations on focus",
+            error,
+          );
+        });
+      };
+      window.addEventListener("focus", redrain);
+      document.addEventListener("visibilitychange", redrain);
+      redrainUnlisten = () => {
+        window.removeEventListener("focus", redrain);
+        document.removeEventListener("visibilitychange", redrain);
+      };
+    }
   }
 
   return () => {
@@ -288,6 +312,7 @@ export async function listenForDesktopNotificationActions(
     );
     void pluginListener?.unregister();
     nativeUnlisten?.();
+    redrainUnlisten?.();
   };
 }
 
@@ -335,6 +360,33 @@ export async function requestDockBounce(): Promise<void> {
   }
 }
 
+/**
+ * How long the window-reveal invoke chain may run before callers proceed
+ * without it. macOS already foregrounds the app when a notification is
+ * clicked, so a reveal that never settles must not gate click-through
+ * routing (block/buzz#3509).
+ */
+const REVEAL_WINDOW_TIMEOUT_MS = 1_500;
+
+function resolveWithinTimeout(
+  operation: Promise<void>,
+  timeoutMs: number,
+): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(resolve, timeoutMs);
+    operation.then(
+      () => {
+        clearTimeout(timer);
+        resolve();
+      },
+      (error) => {
+        clearTimeout(timer);
+        reject(error);
+      },
+    );
+  });
+}
+
 export async function revealDesktopAppWindow(): Promise<void> {
   if (!isTauri()) {
     if (typeof window !== "undefined") {
@@ -345,9 +397,19 @@ export async function revealDesktopAppWindow(): Promise<void> {
 
   try {
     const currentWindow = getCurrentWindow();
-    await currentWindow.unminimize();
-    await currentWindow.show();
-    await currentWindow.setFocus();
+    // The reveal crosses the IPC boundary three times, and the try/catch
+    // only covers rejections — an invoke that never settles (seen while
+    // macOS is simultaneously foregrounding the app from a notification
+    // click) would strand callers that await this helper before navigating.
+    // Resolve after a timeout so navigation always proceeds.
+    await resolveWithinTimeout(
+      (async () => {
+        await currentWindow.unminimize();
+        await currentWindow.show();
+        await currentWindow.setFocus();
+      })(),
+      REVEAL_WINDOW_TIMEOUT_MS,
+    );
   } catch {
     // Best effort only.
   }
diff --git a/desktop/src/features/notifications/lib/desktopActivations.test.mjs b/desktop/src/features/notifications/lib/desktopActivations.test.mjs
new file mode 100644
index 0000000000..880018c415
--- /dev/null
+++ b/desktop/src/features/notifications/lib/desktopActivations.test.mjs
@@ -0,0 +1,141 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+// revealDesktopAppWindow and listenForDesktopNotificationActions cross the
+// Tauri IPC boundary through window.__TAURI_INTERNALS__ — stub it before the
+// module (and @tauri-apps/api) load. block/buzz#3509: a macOS notification
+// click must always route, even when a window invoke hangs or the Tauri
+// activation emit is lost.
+
+let pendingActivations = [];
+let hangWindowInvokes = false;
+
+const tauriInternals = {
+  invoke(command) {
+    if (command === "take_pending_activations") {
+      const drained = pendingActivations;
+      pendingActivations = [];
+      return Promise.resolve(drained);
+    }
+    if (hangWindowInvokes && command.startsWith("plugin:window|")) {
+      return new Promise(() => {});
+    }
+    if (command === "plugin:event|listen") {
+      return Promise.resolve(1);
+    }
+    return Promise.resolve(undefined);
+  },
+  transformCallback() {
+    return 0;
+  },
+  metadata: { currentWindow: { label: "main" } },
+};
+
+const testWindow = new EventTarget();
+testWindow.__TAURI_INTERNALS__ = tauriInternals;
+testWindow.__TAURI_EVENT_PLUGIN_INTERNALS__ = {
+  unregisterListener() {},
+};
+// The module under test only checks that a Notification API exists and reads
+// its static permission; a plain function stub keeps biome happy.
+function StubNotification() {}
+StubNotification.permission = "granted";
+testWindow.Notification = StubNotification;
+globalThis.window = testWindow;
+globalThis.document = new EventTarget();
+globalThis.isTauri = true;
+Object.defineProperty(globalThis, "navigator", {
+  configurable: true,
+  value: { platform: "MacIntel", userAgent: "buzz-test" },
+});
+
+const { listenForDesktopNotificationActions, revealDesktopAppWindow } =
+  await import("./desktop.ts");
+
+function flushPendingWork() {
+  return new Promise((resolve) => setImmediate(resolve));
+}
+
+test("reveal resolves via timeout when a window invoke hangs", async (t) => {
+  t.mock.timers.enable({ apis: ["setTimeout"] });
+  hangWindowInvokes = true;
+  t.after(() => {
+    hangWindowInvokes = false;
+  });
+
+  let settled = false;
+  const reveal = revealDesktopAppWindow().then(() => {
+    settled = true;
+  });
+
+  await Promise.resolve();
+  await Promise.resolve();
+  assert.equal(settled, false);
+
+  t.mock.timers.tick(1_500);
+  await reveal;
+  assert.equal(settled, true);
+});
+
+test("reveal resolves without the timer when the invoke chain settles", async (t) => {
+  // Mocked timers never fire on their own here, so this await only returns
+  // if the helper resolves through the settled invoke chain.
+  t.mock.timers.enable({ apis: ["setTimeout"] });
+
+  await revealDesktopAppWindow();
+});
+
+test("window focus re-drains activations stranded by a lost emit", async () => {
+  const received = [];
+  const dispose = await listenForDesktopNotificationActions((target) => {
+    received.push(target);
+  });
+
+  // The Tauri emit was lost, but the Rust queue still holds the clicked
+  // target. macOS foregrounds the app anyway; WebKit fires window focus.
+  pendingActivations = [
+    { channelId: "channel-1", eventId: "event-1", kind: 9 },
+  ];
+  window.dispatchEvent(new Event("focus"));
+  await flushPendingWork();
+
+  assert.deepEqual(received, [
+    {
+      channelId: "channel-1",
+      channelName: null,
+      content: undefined,
+      createdAt: null,
+      eventId: "event-1",
+      kind: 9,
+      pubkey: undefined,
+      threadRootId: null,
+    },
+  ]);
+
+  dispose();
+  pendingActivations = [
+    { channelId: "channel-2", eventId: "event-2", kind: 9 },
+  ];
+  window.dispatchEvent(new Event("focus"));
+  await flushPendingWork();
+  assert.equal(received.length, 1, "disposed listener must not re-drain");
+  // Leave the queue empty so the next test's mount-time drain starts clean.
+  pendingActivations = [];
+});
+
+test("visibilitychange re-drains activations stranded by a lost emit", async () => {
+  const received = [];
+  const dispose = await listenForDesktopNotificationActions((target) => {
+    received.push(target);
+  });
+
+  pendingActivations = [
+    { channelId: "channel-3", eventId: "event-3", kind: 9 },
+  ];
+  document.dispatchEvent(new Event("visibilitychange"));
+  await flushPendingWork();
+
+  assert.equal(received.length, 1);
+  assert.equal(received[0].channelId, "channel-3");
+  dispose();
+});
diff --git a/desktop/src/features/notifications/lib/feed.ts b/desktop/src/features/notifications/lib/feed.ts
index f8413c4313..4c87cb99d4 100644
--- a/desktop/src/features/notifications/lib/feed.ts
+++ b/desktop/src/features/notifications/lib/feed.ts
@@ -1,8 +1,5 @@
 import type { Channel, FeedItem, HomeFeedResponse } from "@/shared/api/types";
-import {
-  formatNotificationTitle,
-  truncateNotificationBody,
-} from "@/features/notifications/lib/notificationFormat";
+import { formatMessageNotification } from "@/features/notifications/lib/notificationFormat";
 
 export type NotificationChannel = Pick<Channel, "id" | "name" | "channelType">;
 
@@ -31,44 +28,28 @@ export function enrichFeedItemChannel(
   };
 }
 
-export function notificationTitle(item: FeedItem, senderName?: string) {
-  const channelLabel =
-    item.channelType !== "dm" && item.channelName.trim()
-      ? `#${item.channelName.trim()}`
-      : null;
+function feedNotificationSource(item: FeedItem) {
+  if (item.channelType === "dm") return "dm" as const;
+  if (item.category === "mention") return "mention" as const;
+  if (item.kind === 46010) return "approval" as const;
+  return "needs_action" as const;
+}
 
-  if (item.channelType === "dm") {
-    return senderName || "Direct message";
-  }
-
-  if (item.category === "mention") {
-    return formatNotificationTitle({
-      prefix: senderName ? `${senderName} mentioned you` : "@Mention",
-      channelLabel,
-    });
-  }
-
-  if (item.kind === 46010) {
-    return formatNotificationTitle({
-      prefix: senderName
-        ? `${senderName} requested approval`
-        : "Approval Requested",
-      channelLabel,
-    });
-  }
-
-  return formatNotificationTitle({
-    prefix: senderName ? senderName : "Needs Action",
-    channelLabel,
+export function formatFeedNotification(item: FeedItem, senderName?: string) {
+  return formatMessageNotification({
+    source: feedNotificationSource(item),
+    senderName,
+    channelName: item.channelType !== "dm" ? item.channelName : null,
+    content: item.content,
   });
 }
 
+export function notificationTitle(item: FeedItem, senderName?: string) {
+  return formatFeedNotification(item, senderName).title;
+}
+
 export function notificationBody(item: FeedItem) {
-  const fallback =
-    item.kind === 46010
-      ? "A workflow is waiting for your approval."
-      : "Something in Buzz needs your attention.";
-  return truncateNotificationBody(item.content, fallback);
+  return formatFeedNotification(item).body;
 }
 
 export function collectHomeAlertItems(feed: HomeFeedResponse) {
diff --git a/desktop/src/features/notifications/lib/notificationFormat.test.mjs b/desktop/src/features/notifications/lib/notificationFormat.test.mjs
new file mode 100644
index 0000000000..162cb6a439
--- /dev/null
+++ b/desktop/src/features/notifications/lib/notificationFormat.test.mjs
@@ -0,0 +1,163 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { formatMessageNotification } from "./notificationFormat.ts";
+import { senderNameFromSummary } from "./senderName.ts";
+
+test("DM title is the sender name when resolved", () => {
+  const { title, body } = formatMessageNotification({
+    source: "dm",
+    senderName: "Taylor",
+    channelName: "taylor-wes",
+    content: "hey there",
+  });
+
+  assert.equal(title, "Taylor");
+  assert.equal(body, "hey there");
+});
+
+test("DM title falls back to the channel name, then generic copy", () => {
+  assert.equal(
+    formatMessageNotification({
+      source: "dm",
+      senderName: null,
+      channelName: "taylor-wes",
+      content: "hi",
+    }).title,
+    "taylor-wes",
+  );
+  assert.equal(
+    formatMessageNotification({
+      source: "dm",
+      senderName: "  ",
+      channelName: "",
+      content: "hi",
+    }).title,
+    "Direct message",
+  );
+});
+
+test("DM body falls back when the message is blank", () => {
+  assert.equal(
+    formatMessageNotification({
+      source: "dm",
+      senderName: "Taylor",
+      channelName: null,
+      content: "   ",
+    }).body,
+    "New message",
+  );
+});
+
+test("thread reply leads with the sender when resolved", () => {
+  assert.equal(
+    formatMessageNotification({
+      source: "thread_reply",
+      senderName: "Taylor",
+      channelName: "ship-room",
+      content: "done!",
+    }).title,
+    "Taylor replied in #ship-room",
+  );
+});
+
+test("thread reply preserves legacy copy when the sender is unknown", () => {
+  assert.equal(
+    formatMessageNotification({
+      source: "thread_reply",
+      senderName: null,
+      channelName: "ship-room",
+      content: "done!",
+    }).title,
+    "Reply in #ship-room",
+  );
+  assert.deepEqual(
+    formatMessageNotification({
+      source: "thread_reply",
+      senderName: null,
+      channelName: null,
+      content: "",
+    }),
+    { title: "Reply", body: "New reply" },
+  );
+});
+
+test("mention titles match the home-feed conventions", () => {
+  assert.equal(
+    formatMessageNotification({
+      source: "mention",
+      senderName: "Taylor",
+      channelName: "ship-room",
+      content: "@wes look",
+    }).title,
+    "Taylor mentioned you in #ship-room",
+  );
+  assert.equal(
+    formatMessageNotification({
+      source: "mention",
+      senderName: null,
+      channelName: "ship-room",
+      content: "@wes look",
+    }).title,
+    "@Mention in #ship-room",
+  );
+});
+
+test("approval and needs-action titles match the home-feed conventions", () => {
+  assert.deepEqual(
+    formatMessageNotification({
+      source: "approval",
+      senderName: "Taylor",
+      channelName: "ops",
+      content: "",
+    }),
+    {
+      title: "Taylor requested approval in #ops",
+      body: "A workflow is waiting for your approval.",
+    },
+  );
+  assert.deepEqual(
+    formatMessageNotification({
+      source: "needs_action",
+      senderName: null,
+      channelName: null,
+      content: "",
+    }),
+    {
+      title: "Needs Action",
+      body: "Something in Buzz needs your attention.",
+    },
+  );
+});
+
+test("senderNameFromSummary prefers displayName, then NIP-05, never a pubkey", () => {
+  assert.equal(
+    senderNameFromSummary({
+      displayName: "Taylor",
+      avatarUrl: null,
+      nip05Handle: "taylor@buzz.example",
+      ownerPubkey: null,
+    }),
+    "Taylor",
+  );
+  assert.equal(
+    senderNameFromSummary({
+      displayName: "  ",
+      avatarUrl: null,
+      nip05Handle: "taylor@buzz.example",
+      ownerPubkey: null,
+    }),
+    "taylor@buzz.example",
+  );
+  assert.equal(
+    senderNameFromSummary({
+      displayName: null,
+      avatarUrl: null,
+      nip05Handle: null,
+      ownerPubkey: null,
+    }),
+    null,
+  );
+  assert.equal(senderNameFromSummary(null), null);
+  assert.equal(senderNameFromSummary(undefined), null);
+});
diff --git a/desktop/src/features/notifications/lib/notificationFormat.ts b/desktop/src/features/notifications/lib/notificationFormat.ts
index c25270123a..04c951c33f 100644
--- a/desktop/src/features/notifications/lib/notificationFormat.ts
+++ b/desktop/src/features/notifications/lib/notificationFormat.ts
@@ -47,3 +47,66 @@ export function formatNotificationTitle(opts: {
     ? `${opts.prefix} in ${opts.channelLabel}`
     : opts.prefix;
 }
+
+export type MessageNotificationSource =
+  | "mention"
+  | "approval"
+  | "needs_action"
+  | "dm"
+  | "thread_reply";
+
+const MESSAGE_BODY_FALLBACKS: Record<MessageNotificationSource, string> = {
+  mention: "Something in Buzz needs your attention.",
+  approval: "A workflow is waiting for your approval.",
+  needs_action: "Something in Buzz needs your attention.",
+  dm: "New message",
+  thread_reply: "New reply",
+};
+
+/**
+ * Canonical copy for every message-shaped desktop notification (home-feed
+ * mentions and needs-action items, live DMs, live thread replies). All paths
+ * format through here so sender attribution and fallbacks stay consistent:
+ * the sender leads the title whenever their profile has resolved, and each
+ * source degrades to neutral copy — never a raw pubkey — when it has not.
+ *
+ * `senderName` must already be a real human label (see
+ * `senderNameFromSummary`); `channelName` is the raw channel name without
+ * a `#` prefix.
+ */
+export function formatMessageNotification(opts: {
+  source: MessageNotificationSource;
+  senderName?: string | null;
+  channelName?: string | null;
+  content: string;
+}): { title: string; body: string } {
+  const { source, content } = opts;
+  const senderName = opts.senderName?.trim() || null;
+  const channelName = opts.channelName?.trim() || null;
+  const body = truncateNotificationBody(
+    content,
+    MESSAGE_BODY_FALLBACKS[source],
+  );
+
+  if (source === "dm") {
+    return { title: senderName ?? channelName ?? "Direct message", body };
+  }
+
+  const channelLabel = channelName ? `#${channelName}` : null;
+  const prefix =
+    source === "mention"
+      ? senderName
+        ? `${senderName} mentioned you`
+        : "@Mention"
+      : source === "approval"
+        ? senderName
+          ? `${senderName} requested approval`
+          : "Approval Requested"
+        : source === "thread_reply"
+          ? senderName
+            ? `${senderName} replied`
+            : "Reply"
+          : (senderName ?? "Needs Action");
+
+  return { title: formatNotificationTitle({ prefix, channelLabel }), body };
+}
diff --git a/desktop/src/features/notifications/lib/senderName.ts b/desktop/src/features/notifications/lib/senderName.ts
new file mode 100644
index 0000000000..1872cf540b
--- /dev/null
+++ b/desktop/src/features/notifications/lib/senderName.ts
@@ -0,0 +1,24 @@
+import type { UserProfileSummary } from "@/shared/api/types";
+
+/**
+ * Resolve a sender's human display label from a profile summary, mirroring
+ * the sidebar's precedence (`resolveUserLabel`: displayName, then NIP-05
+ * handle) — but returning `null` instead of a truncated pubkey when no real
+ * name is known. Notification titles fall back to neutral copy ("Reply in
+ * #channel", "Direct message"), never a hex fragment.
+ */
+export function senderNameFromSummary(
+  summary: UserProfileSummary | null | undefined,
+): string | null {
+  const displayName = summary?.displayName?.trim();
+  if (displayName) {
+    return displayName;
+  }
+
+  const nip05Handle = summary?.nip05Handle?.trim();
+  if (nip05Handle) {
+    return nip05Handle;
+  }
+
+  return null;
+}
diff --git a/desktop/src/features/notifications/lib/target.test.mjs b/desktop/src/features/notifications/lib/target.test.mjs
new file mode 100644
index 0000000000..b9966381bd
--- /dev/null
+++ b/desktop/src/features/notifications/lib/target.test.mjs
@@ -0,0 +1,81 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  buildEventNotificationTarget,
+  buildFeedItemNotificationTarget,
+} from "./target.ts";
+
+test("builds a complete click-through target from a live relay event", () => {
+  const target = buildEventNotificationTarget(
+    {
+      content: "hello",
+      created_at: 123,
+      id: "event-id",
+      kind: 9,
+      pubkey: "sender",
+      tags: [
+        ["h", "channel-id"],
+        ["e", "root-id", "", "root"],
+        ["e", "parent-id", "", "reply"],
+      ],
+    },
+    { id: "channel-id", name: "ship-room" },
+  );
+
+  assert.deepEqual(target, {
+    channelId: "channel-id",
+    channelName: "ship-room",
+    content: "hello",
+    createdAt: 123,
+    eventId: "event-id",
+    kind: 9,
+    pubkey: "sender",
+    threadRootId: "root-id",
+  });
+});
+
+test("null channel name and top-level events produce null fields", () => {
+  const target = buildEventNotificationTarget(
+    {
+      content: "hello",
+      created_at: 123,
+      id: "event-id",
+      kind: 9,
+      pubkey: "sender",
+      tags: [["h", "channel-id"]],
+    },
+    { id: "channel-id", name: "  " },
+  );
+
+  assert.equal(target.channelName, null);
+  assert.equal(target.threadRootId, null);
+});
+
+test("builds a complete click-through target from a feed item", () => {
+  const target = buildFeedItemNotificationTarget({
+    id: "feed-event",
+    kind: 9,
+    pubkey: "sender",
+    content: "ping",
+    createdAt: 456,
+    channelId: "channel-id",
+    channelName: "ship-room",
+    tags: [
+      ["e", "root-id", "", "root"],
+      ["e", "parent-id", "", "reply"],
+    ],
+    category: "mention",
+  });
+
+  assert.deepEqual(target, {
+    channelId: "channel-id",
+    channelName: "ship-room",
+    content: "ping",
+    createdAt: 456,
+    eventId: "feed-event",
+    kind: 9,
+    pubkey: "sender",
+    threadRootId: "root-id",
+  });
+});
diff --git a/desktop/src/features/notifications/lib/target.ts b/desktop/src/features/notifications/lib/target.ts
new file mode 100644
index 0000000000..be4459b9c1
--- /dev/null
+++ b/desktop/src/features/notifications/lib/target.ts
@@ -0,0 +1,44 @@
+import { getThreadReference } from "@/features/messages/lib/threading";
+import type { FeedItem, RelayEvent } from "@/shared/api/types";
+import type { DesktopNotificationTarget } from "./desktop";
+
+/**
+ * Build the click-through navigation target for a live relay event (DM or
+ * thread-reply). Every notification path constructs its target here so the
+ * payload the OS hands back on activation always carries the full routing
+ * anchor (eventId + threadRootId), not a hand-rolled subset.
+ */
+export function buildEventNotificationTarget(
+  event: Pick<
+    RelayEvent,
+    "content" | "created_at" | "id" | "kind" | "pubkey" | "tags"
+  >,
+  channel: { id: string; name?: string | null },
+): DesktopNotificationTarget {
+  return {
+    channelId: channel.id,
+    channelName: channel.name?.trim() || null,
+    content: event.content,
+    createdAt: event.created_at,
+    eventId: event.id,
+    kind: event.kind,
+    pubkey: event.pubkey,
+    threadRootId: getThreadReference(event.tags).rootId ?? null,
+  };
+}
+
+/** Build the click-through navigation target for a home-feed item. */
+export function buildFeedItemNotificationTarget(
+  item: FeedItem,
+): DesktopNotificationTarget {
+  return {
+    channelId: item.channelId,
+    channelName: item.channelName,
+    content: item.content,
+    createdAt: item.createdAt,
+    eventId: item.id,
+    kind: item.kind,
+    pubkey: item.pubkey,
+    threadRootId: getThreadReference(item.tags).rootId ?? null,
+  };
+}
diff --git a/desktop/src/features/notifications/use-feed-desktop-notifications.ts b/desktop/src/features/notifications/use-feed-desktop-notifications.ts
index b58e260ec2..4a0865437e 100644
--- a/desktop/src/features/notifications/use-feed-desktop-notifications.ts
+++ b/desktop/src/features/notifications/use-feed-desktop-notifications.ts
@@ -5,15 +5,14 @@ import {
   resolveUserLabel,
   type UserProfileLookup,
 } from "@/features/profile/lib/identity";
-import { getThreadReference } from "@/features/messages/lib/threading";
 import type { FeedItem, HomeFeedResponse } from "@/shared/api/types";
 import {
   collectHomeAlertItems,
   eligibleFeedNotificationItems,
+  formatFeedNotification,
   type NotificationChannel,
-  notificationBody,
-  notificationTitle,
 } from "./lib/feed";
+import { buildFeedItemNotificationTarget } from "./lib/target";
 import {
   getDesktopNotificationPermissionState,
   requestDesktopNotificationAccess,
@@ -112,20 +111,11 @@ export function useFeedDesktopNotifications(
 
   const deliverFeedNotification = React.useEffectEvent(
     async (item: FeedItem, senderName?: string) => {
-      const threadRootId = getThreadReference(item.tags).rootId ?? null;
+      const { title, body } = formatFeedNotification(item, senderName);
       const didSend = await sendDesktopNotification({
-        body: notificationBody(item),
-        target: {
-          channelId: item.channelId,
-          channelName: item.channelName,
-          content: item.content,
-          createdAt: item.createdAt,
-          eventId: item.id,
-          kind: item.kind,
-          pubkey: item.pubkey,
-          threadRootId,
-        },
-        title: notificationTitle(item, senderName),
+        body,
+        target: buildFeedItemNotificationTarget(item),
+        title,
       });
 
       if (
diff --git a/desktop/src/features/notifications/useNotificationSenderName.ts b/desktop/src/features/notifications/useNotificationSenderName.ts
new file mode 100644
index 0000000000..9f51e44b49
--- /dev/null
+++ b/desktop/src/features/notifications/useNotificationSenderName.ts
@@ -0,0 +1,76 @@
+import * as React from "react";
+import { useQueryClient } from "@tanstack/react-query";
+
+import { useCommunities } from "@/features/communities/useCommunities";
+import {
+  usersBatchEntryKey,
+  type UsersBatchEntry,
+} from "@/features/profile/hooks";
+import {
+  readCachedUserLabels,
+  writeCachedUserLabels,
+} from "@/features/profile/lib/userLabelStorage";
+import { getUsersBatch } from "@/shared/api/tauriProfiles";
+import { senderNameFromSummary } from "./lib/senderName";
+
+/**
+ * Synchronous sender-name lookup for live desktop notifications (DMs and
+ * thread replies). Toasts must never wait on the network, so resolution is
+ * cache-only: the per-pubkey `users-batch-entry` React Query cache first
+ * (kept warm by the sidebar and home feed), then the persisted label cache
+ * (survives restart). A cold miss returns `null` — the caller falls back to
+ * neutral copy — and kicks off a background fetch so the sender's next
+ * message resolves.
+ */
+export function useNotificationSenderName(): (
+  pubkey: string | undefined,
+) => string | null {
+  const queryClient = useQueryClient();
+  const { activeCommunity } = useCommunities();
+  const relayUrl = activeCommunity?.relayUrl ?? "";
+
+  return React.useCallback(
+    (pubkey) => {
+      const normalized = pubkey?.trim().toLowerCase() ?? "";
+      if (!normalized) {
+        return null;
+      }
+
+      const entry = queryClient.getQueryData<UsersBatchEntry>(
+        usersBatchEntryKey(normalized),
+      );
+      if (entry) {
+        // A stale name still beats no name for a toast; relay-confirmed
+        // misses (summary: null) correctly resolve to the fallback copy.
+        return senderNameFromSummary(entry.summary);
+      }
+
+      const cached = relayUrl
+        ? readCachedUserLabels(relayUrl, [normalized])
+        : undefined;
+      const cachedSummary = cached?.profiles[normalized];
+      if (cachedSummary) {
+        return senderNameFromSummary(cachedSummary);
+      }
+
+      void getUsersBatch([normalized])
+        .then((fresh) => {
+          queryClient.setQueryData<UsersBatchEntry>(
+            usersBatchEntryKey(normalized),
+            {
+              summary: fresh.profiles[normalized] ?? null,
+              fetchedAt: Date.now(),
+            },
+          );
+          if (relayUrl) {
+            writeCachedUserLabels(relayUrl, fresh.profiles, fresh.missing);
+          }
+        })
+        .catch(() => {
+          // Warm-up is best effort; the toast already shipped with fallback copy.
+        });
+      return null;
+    },
+    [queryClient, relayUrl],
+  );
+}
diff --git a/desktop/src/features/profile/hooks.ts b/desktop/src/features/profile/hooks.ts
index 7a456fb259..f174d50408 100644
--- a/desktop/src/features/profile/hooks.ts
+++ b/desktop/src/features/profile/hooks.ts
@@ -286,12 +286,15 @@ export function useUserProfileQuery(pubkey?: string) {
 // `summary: null` records a relay-confirmed miss so unknown pubkeys aren't
 // re-requested every page. Entries older than the hook's 60s staleTime are
 // treated as unresolved and refetched.
-type UsersBatchEntry = {
+export type UsersBatchEntry = {
   summary: UserProfileSummary | null;
   fetchedAt: number;
 };
 
-const usersBatchEntryKey = (pubkey: string) => ["users-batch-entry", pubkey];
+export const usersBatchEntryKey = (pubkey: string) => [
+  "users-batch-entry",
+  pubkey,
+];
 
 /**
  * Drop the per-pubkey delta-fetch entries so the next `useUsersBatchQuery`
diff --git a/desktop/tests/e2e/dm-double-notification.spec.ts b/desktop/tests/e2e/dm-double-notification.spec.ts
index 0678fff913..3bab0fbd63 100644
--- a/desktop/tests/e2e/dm-double-notification.spec.ts
+++ b/desktop/tests/e2e/dm-double-notification.spec.ts
@@ -111,7 +111,7 @@ test("an incoming DM produces exactly one desktop notification", async ({
     `expected exactly one notification for a single DM, got: ${JSON.stringify(notifications)}`,
   ).toHaveLength(1);
 
-  // The survivor must be the live WebSocket DM toast (titled with the DM
-  // channel name), not the home-feed mention duplicate ("… mentioned you in …").
-  expect(notifications[0].title).toBe("alice-tyler");
+  // The survivor must be the live WebSocket DM toast (titled with the
+  // sender name), not the home-feed mention duplicate ("… mentioned you in …").
+  expect(notifications[0].title).toBe("alice");
 });

From b56a52ca11296b86ee41c41278a1169f92f245b6 Mon Sep 17 00:00:00 2001
From: Salman Mohammed <smohammed@squareup.com>
Date: Fri, 21 Aug 2026 12:00:04 -0400
Subject: [PATCH 14/38] test(benchmarks): expand Buzz-native dataset (#6448)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Why
Terminal task correctness alone does not guard Buzz-native collaboration
behavior such as exact reply routing, non-waking narrative names,
batched agent synthesis, thread isolation, and ambiguous identity
targeting.

## What
- Add five medium/hard Harbor tasks for multiline delivery, narrative
agent names, interleaved agent reports, cross-thread requests, and
ambiguous user mentions
- Add signed scripted-event fixtures, duplicate-display-name profiles,
and public-only evidence export support
- Add positive and adversarial verifier fixtures covering dropped
inputs, extra posts, incorrect routing, and unintended mentions

## Risk Assessment
Low — changes are limited to benchmark tooling and datasets; production
behavior is exercised but not modified.

## References
- Grounded in behavior reported in `buzz-community` and public issues
#5787, #5176, #5839, #4942, #4072, #4303, and #6257
- Live Claude Sonnet 4.6 smoke run: 2/5 passed; the three failures
exposed top-level instead of threaded delivery, empty narrative output,
and silent ambiguous-identity completion
- Live GPT-5.6 Luna run (`buzz-native-solo-luna.yaml`): 3/5 passed.
Passed `ambiguous-user-mention`, `cross-thread-requests`, and
`interleaved-agent-reports`. Failed `multiline-message` and
`narrative-agent-names` because both omitted the event-level user
mention despite otherwise-correct content and threading.



<img width="1176" height="805" alt="Screenshot 2026-08-21 at 11 11
17 AM"
src="https://github.com/user-attachments/assets/fc259ec9-892c-4436-b022-1bf85415617d"
/>

Signed-off-by: Salman Mohammed <smohammed@squareup.com>
---
 benchmarks/buzz-dataset/README.md             |   5 +
 .../ambiguous-user-mention/README.md          |   8 +
 .../environment/Dockerfile                    |   3 +
 .../ambiguous-user-mention/instruction.md     |   5 +
 .../ambiguous-user-mention/task.toml          |  24 ++
 .../ambiguous-user-mention/tests/test.sh      |   5 +
 .../ambiguous-user-mention/tests/verify.py    | 148 +++++++++++
 .../cross-thread-requests/README.md           |   9 +
 .../environment/Dockerfile                    |   3 +
 .../cross-thread-requests/instruction.md      |   3 +
 .../cross-thread-requests/task.toml           |  24 ++
 .../cross-thread-requests/tests/test.sh       |   5 +
 .../cross-thread-requests/tests/verify.py     | 138 ++++++++++
 .../interleaved-agent-reports/README.md       |   8 +
 .../environment/Dockerfile                    |   3 +
 .../interleaved-agent-reports/instruction.md  |   6 +
 .../interleaved-agent-reports/task.toml       |  24 ++
 .../interleaved-agent-reports/tests/test.sh   |   5 +
 .../interleaved-agent-reports/tests/verify.py | 163 ++++++++++++
 .../buzz-dataset/multiline-message/README.md  |  10 +
 .../multiline-message/environment/Dockerfile  |   3 +
 .../multiline-message/instruction.md          |  11 +
 .../buzz-dataset/multiline-message/task.toml  |  24 ++
 .../multiline-message/tests/test.sh           |   8 +
 .../multiline-message/tests/verify.py         | 121 +++++++++
 .../narrative-agent-names/README.md           |   7 +
 .../environment/Dockerfile                    |   3 +
 .../narrative-agent-names/instruction.md      |   6 +
 .../narrative-agent-names/task.toml           |  24 ++
 .../narrative-agent-names/tests/test.sh       |   5 +
 .../narrative-agent-names/tests/verify.py     | 129 ++++++++++
 benchmarks/harbor-buzz-orchestra/README.md    |  15 +-
 .../container_runtime.py                      | 103 +++++++-
 .../src/harbor_buzz_orchestra/evidence.py     |  16 +-
 .../src/harbor_buzz_orchestra/provisioning.py |  11 +
 .../harbor_buzz_orchestra/task_fixtures.py    | 115 +++++++++
 .../src/harbor_buzz_testbed/buzz_cli.py       |  11 +-
 .../src/harbor_buzz_testbed/provisioner.py    |  51 +++-
 .../testbed/tests/test_provisioner_unit.py    |  30 ++-
 .../tests/test_container_runtime.py           |  91 ++++++-
 .../tests/test_evidence.py                    |   8 +-
 .../test_expanded_buzz_native_verifiers.py    | 238 ++++++++++++++++++
 42 files changed, 1598 insertions(+), 31 deletions(-)
 create mode 100644 benchmarks/buzz-dataset/ambiguous-user-mention/README.md
 create mode 100644 benchmarks/buzz-dataset/ambiguous-user-mention/environment/Dockerfile
 create mode 100644 benchmarks/buzz-dataset/ambiguous-user-mention/instruction.md
 create mode 100644 benchmarks/buzz-dataset/ambiguous-user-mention/task.toml
 create mode 100755 benchmarks/buzz-dataset/ambiguous-user-mention/tests/test.sh
 create mode 100755 benchmarks/buzz-dataset/ambiguous-user-mention/tests/verify.py
 create mode 100644 benchmarks/buzz-dataset/cross-thread-requests/README.md
 create mode 100644 benchmarks/buzz-dataset/cross-thread-requests/environment/Dockerfile
 create mode 100644 benchmarks/buzz-dataset/cross-thread-requests/instruction.md
 create mode 100644 benchmarks/buzz-dataset/cross-thread-requests/task.toml
 create mode 100755 benchmarks/buzz-dataset/cross-thread-requests/tests/test.sh
 create mode 100755 benchmarks/buzz-dataset/cross-thread-requests/tests/verify.py
 create mode 100644 benchmarks/buzz-dataset/interleaved-agent-reports/README.md
 create mode 100644 benchmarks/buzz-dataset/interleaved-agent-reports/environment/Dockerfile
 create mode 100644 benchmarks/buzz-dataset/interleaved-agent-reports/instruction.md
 create mode 100644 benchmarks/buzz-dataset/interleaved-agent-reports/task.toml
 create mode 100755 benchmarks/buzz-dataset/interleaved-agent-reports/tests/test.sh
 create mode 100755 benchmarks/buzz-dataset/interleaved-agent-reports/tests/verify.py
 create mode 100644 benchmarks/buzz-dataset/multiline-message/README.md
 create mode 100644 benchmarks/buzz-dataset/multiline-message/environment/Dockerfile
 create mode 100644 benchmarks/buzz-dataset/multiline-message/instruction.md
 create mode 100644 benchmarks/buzz-dataset/multiline-message/task.toml
 create mode 100755 benchmarks/buzz-dataset/multiline-message/tests/test.sh
 create mode 100755 benchmarks/buzz-dataset/multiline-message/tests/verify.py
 create mode 100644 benchmarks/buzz-dataset/narrative-agent-names/README.md
 create mode 100644 benchmarks/buzz-dataset/narrative-agent-names/environment/Dockerfile
 create mode 100644 benchmarks/buzz-dataset/narrative-agent-names/instruction.md
 create mode 100644 benchmarks/buzz-dataset/narrative-agent-names/task.toml
 create mode 100755 benchmarks/buzz-dataset/narrative-agent-names/tests/test.sh
 create mode 100755 benchmarks/buzz-dataset/narrative-agent-names/tests/verify.py
 create mode 100644 benchmarks/harbor-buzz-orchestra/tests/test_expanded_buzz_native_verifiers.py

diff --git a/benchmarks/buzz-dataset/README.md b/benchmarks/buzz-dataset/README.md
index 2909d0cd87..f5c8c8bb24 100644
--- a/benchmarks/buzz-dataset/README.md
+++ b/benchmarks/buzz-dataset/README.md
@@ -11,6 +11,11 @@ willing to read.
 | [`user-mention`](user-mention) | Hands the turn back with an event-level `p`-tag mention of the requesting human |
 | [`read-named-path-outside-workspace`](read-named-path-outside-workspace) | Reads a path the user named explicitly instead of refusing it as out of bounds |
 | [`create-channel-invite-users`](create-channel-invite-users) | Creates a channel with the exact shape, TTL, and membership asked for |
+| [`multiline-message`](multiline-message) | Preserves real newlines and blank-line structure through the CLI publish path |
+| [`narrative-agent-names`](narrative-agent-names) | Names agents in narrative without waking them through `p` tags |
+| [`interleaved-agent-reports`](interleaved-agent-reports) | Retains and synthesizes every report in a batch of agent messages |
+| [`cross-thread-requests`](cross-thread-requests) | Keeps simultaneous top-level requests isolated and replies to both exact threads |
+| [`ambiguous-user-mention`](ambiguous-user-mention) | Resolves duplicate display names and notifies only the intended pubkey |
 
 For `reply-to-thread` and `user-mention` the graded behavior is **deliberately
 absent from `instruction.md`** — it has to come from `buzz-acp`'s production
diff --git a/benchmarks/buzz-dataset/ambiguous-user-mention/README.md b/benchmarks/buzz-dataset/ambiguous-user-mention/README.md
new file mode 100644
index 0000000000..5f814cda98
--- /dev/null
+++ b/benchmarks/buzz-dataset/ambiguous-user-mention/README.md
@@ -0,0 +1,8 @@
+# ambiguous-user-mention
+
+The channel contains two real identities with the exact same three-word display
+name. Their profile `about` fields carry different routing codes. The agent must
+discover the intended pubkey, notify it exactly once, never notify the twin,
+and separately callback the requester. This guards the silent ambiguity family
+reported in [block/buzz#4303](https://github.com/block/buzz/issues/4303) and
+[block/buzz#6257](https://github.com/block/buzz/issues/6257).
diff --git a/benchmarks/buzz-dataset/ambiguous-user-mention/environment/Dockerfile b/benchmarks/buzz-dataset/ambiguous-user-mention/environment/Dockerfile
new file mode 100644
index 0000000000..29f16f3c41
--- /dev/null
+++ b/benchmarks/buzz-dataset/ambiguous-user-mention/environment/Dockerfile
@@ -0,0 +1,3 @@
+FROM python:3.12-slim-bookworm
+
+WORKDIR /app
diff --git a/benchmarks/buzz-dataset/ambiguous-user-mention/instruction.md b/benchmarks/buzz-dataset/ambiguous-user-mention/instruction.md
new file mode 100644
index 0000000000..761fd9caa5
--- /dev/null
+++ b/benchmarks/buzz-dataset/ambiguous-user-mention/instruction.md
@@ -0,0 +1,5 @@
+Two channel members are both displayed as `Taylor Morgan Lee`.
+
+Find the one whose profile says `Routing code ORCHID-72` and send that person
+the message `ORCHID-72 approved`. Do not notify the other Taylor Morgan Lee.
+Then tell me briefly that it was sent.
diff --git a/benchmarks/buzz-dataset/ambiguous-user-mention/task.toml b/benchmarks/buzz-dataset/ambiguous-user-mention/task.toml
new file mode 100644
index 0000000000..079507e0b4
--- /dev/null
+++ b/benchmarks/buzz-dataset/ambiguous-user-mention/task.toml
@@ -0,0 +1,24 @@
+schema_version = "1.3"
+
+[task]
+name = "buzz-native/ambiguous-user-mention"
+description = "Resolve two identical display names by profile evidence and notify only the intended pubkey."
+authors = [{ name = "Buzz" }]
+keywords = ["buzz-native", "mentions", "identity", "ambiguity"]
+
+[metadata]
+difficulty = "hard"
+category = "collaboration"
+tags = ["mentions", "identity", "ambiguity", "cli"]
+
+[agent]
+timeout_sec = 300.0
+
+[verifier]
+timeout_sec = 30.0
+
+[environment]
+network_mode = "public"
+cpus = 1
+memory_mb = 1024
+storage_mb = 1024
diff --git a/benchmarks/buzz-dataset/ambiguous-user-mention/tests/test.sh b/benchmarks/buzz-dataset/ambiguous-user-mention/tests/test.sh
new file mode 100755
index 0000000000..79434035e3
--- /dev/null
+++ b/benchmarks/buzz-dataset/ambiguous-user-mention/tests/test.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -eu
+
+mkdir -p /logs/verifier
+python3 /tests/verify.py --evidence /logs/artifacts/buzz-evidence.json --reward /logs/verifier/reward.json --details /logs/verifier/details.json
diff --git a/benchmarks/buzz-dataset/ambiguous-user-mention/tests/verify.py b/benchmarks/buzz-dataset/ambiguous-user-mention/tests/verify.py
new file mode 100755
index 0000000000..0efcb0dba6
--- /dev/null
+++ b/benchmarks/buzz-dataset/ambiguous-user-mention/tests/verify.py
@@ -0,0 +1,148 @@
+#!/usr/bin/env python3
+"""Deterministic verifier for a duplicate-display-name notification."""
+
+from __future__ import annotations
+
+import argparse
+import json
+from pathlib import Path
+from typing import Any
+
+TARGET_ID = "taylor-release-captain"
+OTHER_ID = "taylor-observer"
+
+
+def _zero() -> dict[str, float]:
+    return {
+        "reward": 0.0,
+        "target_notified_once": 0.0,
+        "other_not_notified": 0.0,
+        "message_correct": 0.0,
+        "user_callback": 0.0,
+        "reply_to_thread": 0.0,
+        "evidence_complete": 0.0,
+    }
+
+
+def score_evidence(evidence: object) -> tuple[dict[str, float], dict[str, Any]]:
+    if not isinstance(evidence, dict):
+        return _zero(), {"error": "evidence root is not an object"}
+    root = evidence.get("task_event_id")
+    directory = {
+        row.get("identity_id"): row
+        for row in evidence.get("directory", [])
+        if isinstance(row, dict)
+    }
+    target = directory.get(TARGET_ID, {})
+    other = directory.get(OTHER_ID, {})
+    identities = (
+        evidence.get("identities")
+        if isinstance(evidence.get("identities"), dict)
+        else {}
+    )
+    user = identities.get("Olivia Grace Park", {})
+    agents = [
+        row
+        for row in identities.values()
+        if isinstance(row, dict) and row.get("role") == "orchestrator"
+    ]
+    agent_pubkey = agents[0].get("pubkey") if len(agents) == 1 else None
+    messages = [row for row in evidence.get("messages", []) if isinstance(row, dict)]
+    authored = [
+        row for row in messages if agent_pubkey and row.get("pubkey") == agent_pubkey
+    ]
+    target_messages = [
+        row
+        for row in authored
+        if target.get("pubkey") in row.get("mentioned_pubkeys", [])
+    ]
+    other_messages = [
+        row
+        for row in authored
+        if other.get("pubkey") in row.get("mentioned_pubkeys", [])
+    ]
+    delivery = target_messages[0] if len(target_messages) == 1 else None
+    callbacks = [
+        row
+        for row in authored
+        if user.get("pubkey") in row.get("mentioned_pubkeys", [])
+        and row not in target_messages
+    ]
+    callback = callbacks[-1] if callbacks else None
+    target_notified_once = float(len(target_messages) == 1)
+    other_not_notified = float(len(other_messages) == 0)
+    message_correct = float(
+        delivery is not None
+        and "ORCHID-72 approved" in str(delivery.get("content", ""))
+    )
+    user_callback = float(
+        callback is not None
+        and any(
+            word in str(callback.get("content", "")).casefold()
+            for word in ("sent", "notified", "delivered")
+        )
+    )
+    reply_to_thread = float(
+        delivery is not None
+        and callback is not None
+        and delivery.get("reply_to_event_id") == root
+        and callback.get("reply_to_event_id") == root
+    )
+    evidence_complete = float(
+        evidence.get("schema_version") == 1
+        and evidence.get("task_name") == "ambiguous-user-mention"
+        and evidence.get("truncated") is False
+        and len(directory) == 2
+        and isinstance(target.get("pubkey"), str)
+        and isinstance(other.get("pubkey"), str)
+        and target.get("pubkey") != other.get("pubkey")
+        and len(agents) == 1
+    )
+    values = (
+        target_notified_once,
+        other_not_notified,
+        message_correct,
+        user_callback,
+        reply_to_thread,
+        evidence_complete,
+    )
+    metrics = {
+        "reward": float(all(value == 1.0 for value in values)),
+        "target_notified_once": target_notified_once,
+        "other_not_notified": other_not_notified,
+        "message_correct": message_correct,
+        "user_callback": user_callback,
+        "reply_to_thread": reply_to_thread,
+        "evidence_complete": evidence_complete,
+    }
+    return metrics, {
+        "target_pubkey": target.get("pubkey"),
+        "other_pubkey": other.get("pubkey"),
+        "delivery_message_id": delivery.get("id") if delivery else None,
+        "callback_message_id": callback.get("id") if callback else None,
+        "target_notification_count": len(target_messages),
+        "other_notification_count": len(other_messages),
+    }
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--evidence", type=Path, required=True)
+    parser.add_argument("--reward", type=Path, required=True)
+    parser.add_argument("--details", type=Path, required=True)
+    args = parser.parse_args()
+    try:
+        metrics, details = score_evidence(
+            json.loads(args.evidence.read_text(encoding="utf-8"))
+        )
+    except (OSError, json.JSONDecodeError) as error:
+        metrics, details = _zero(), {"error": str(error)}
+    args.reward.write_text(json.dumps(metrics, sort_keys=True) + "\n", encoding="utf-8")
+    args.details.write_text(
+        json.dumps(details, indent=2, sort_keys=True) + "\n", encoding="utf-8"
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/benchmarks/buzz-dataset/cross-thread-requests/README.md b/benchmarks/buzz-dataset/cross-thread-requests/README.md
new file mode 100644
index 0000000000..d7ed981c5f
--- /dev/null
+++ b/benchmarks/buzz-dataset/cross-thread-requests/README.md
@@ -0,0 +1,9 @@
+# cross-thread-requests
+
+The harness posts ALPHA and BETA as separate top-level human mentions in the
+same channel before the queue flushes. Passing requires two different replies,
+each anchored to its own triggering event with only its own answer. This is a
+deliberately hard guard for the cross-thread contamination reported in
+[block/buzz#5839](https://github.com/block/buzz/issues/5839) and the exact
+reply-target contract in
+[block/buzz#4072](https://github.com/block/buzz/issues/4072).
diff --git a/benchmarks/buzz-dataset/cross-thread-requests/environment/Dockerfile b/benchmarks/buzz-dataset/cross-thread-requests/environment/Dockerfile
new file mode 100644
index 0000000000..29f16f3c41
--- /dev/null
+++ b/benchmarks/buzz-dataset/cross-thread-requests/environment/Dockerfile
@@ -0,0 +1,3 @@
+FROM python:3.12-slim-bookworm
+
+WORKDIR /app
diff --git a/benchmarks/buzz-dataset/cross-thread-requests/instruction.md b/benchmarks/buzz-dataset/cross-thread-requests/instruction.md
new file mode 100644
index 0000000000..160fad7d16
--- /dev/null
+++ b/benchmarks/buzz-dataset/cross-thread-requests/instruction.md
@@ -0,0 +1,3 @@
+ALPHA request: calculate `(17 * 19) + 23`.
+
+Reply with the ALPHA result, labelled ALPHA.
diff --git a/benchmarks/buzz-dataset/cross-thread-requests/task.toml b/benchmarks/buzz-dataset/cross-thread-requests/task.toml
new file mode 100644
index 0000000000..14634fa2d5
--- /dev/null
+++ b/benchmarks/buzz-dataset/cross-thread-requests/task.toml
@@ -0,0 +1,24 @@
+schema_version = "1.3"
+
+[task]
+name = "buzz-native/cross-thread-requests"
+description = "Keep two concurrent top-level requests in one channel isolated and reply to each exact thread."
+authors = [{ name = "Buzz" }]
+keywords = ["buzz-native", "threading", "batching", "concurrency"]
+
+[metadata]
+difficulty = "hard"
+category = "collaboration"
+tags = ["threading", "batching", "concurrency", "routing"]
+
+[agent]
+timeout_sec = 300.0
+
+[verifier]
+timeout_sec = 30.0
+
+[environment]
+network_mode = "public"
+cpus = 1
+memory_mb = 1024
+storage_mb = 1024
diff --git a/benchmarks/buzz-dataset/cross-thread-requests/tests/test.sh b/benchmarks/buzz-dataset/cross-thread-requests/tests/test.sh
new file mode 100755
index 0000000000..79434035e3
--- /dev/null
+++ b/benchmarks/buzz-dataset/cross-thread-requests/tests/test.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -eu
+
+mkdir -p /logs/verifier
+python3 /tests/verify.py --evidence /logs/artifacts/buzz-evidence.json --reward /logs/verifier/reward.json --details /logs/verifier/details.json
diff --git a/benchmarks/buzz-dataset/cross-thread-requests/tests/verify.py b/benchmarks/buzz-dataset/cross-thread-requests/tests/verify.py
new file mode 100755
index 0000000000..7ba49e48f3
--- /dev/null
+++ b/benchmarks/buzz-dataset/cross-thread-requests/tests/verify.py
@@ -0,0 +1,138 @@
+#!/usr/bin/env python3
+"""Deterministic verifier for isolation of two top-level requests."""
+
+from __future__ import annotations
+
+import argparse
+import json
+import re
+from pathlib import Path
+from typing import Any
+
+
+def _zero() -> dict[str, float]:
+    return {
+        "reward": 0.0,
+        "alpha_correct": 0.0,
+        "beta_correct": 0.0,
+        "thread_isolation": 0.0,
+        "user_mentioned_twice": 0.0,
+        "evidence_complete": 0.0,
+    }
+
+
+def _matches(message: dict[str, Any], label: str, value: int) -> bool:
+    content = str(message.get("content", ""))
+    return bool(re.search(rf"{label}\D+{value}(?:\D|$)", content, re.IGNORECASE))
+
+
+def score_evidence(evidence: object) -> tuple[dict[str, float], dict[str, Any]]:
+    if not isinstance(evidence, dict):
+        return _zero(), {"error": "evidence root is not an object"}
+    alpha_root = evidence.get("task_event_id")
+    scripts = [
+        row
+        for row in evidence.get("scripted_events", [])
+        if isinstance(row, dict) and row.get("label") == "beta-request"
+    ]
+    beta_root = scripts[0].get("event_id") if len(scripts) == 1 else None
+    identities = (
+        evidence.get("identities")
+        if isinstance(evidence.get("identities"), dict)
+        else {}
+    )
+    user = identities.get("Priya Simone Patel", {})
+    agents = [
+        row
+        for row in identities.values()
+        if isinstance(row, dict) and row.get("role") == "orchestrator"
+    ]
+    agent_pubkey = agents[0].get("pubkey") if len(agents) == 1 else None
+    messages = [row for row in evidence.get("messages", []) if isinstance(row, dict)]
+    candidates = [
+        row for row in messages if agent_pubkey and row.get("pubkey") == agent_pubkey
+    ]
+    alpha_replies = [
+        row
+        for row in candidates
+        if row.get("reply_to_event_id") == alpha_root and _matches(row, "ALPHA", 346)
+    ]
+    beta_replies = [
+        row
+        for row in candidates
+        if row.get("reply_to_event_id") == beta_root and _matches(row, "BETA", 41)
+    ]
+    alpha = alpha_replies[-1] if alpha_replies else None
+    beta = beta_replies[-1] if beta_replies else None
+    alpha_content = str(alpha.get("content", "")) if alpha else ""
+    beta_content = str(beta.get("content", "")) if beta else ""
+    alpha_correct = float(alpha is not None)
+    beta_correct = float(beta is not None)
+    thread_isolation = float(
+        alpha is not None
+        and beta is not None
+        and len(candidates) == 2
+        and alpha.get("id") != beta.get("id")
+        and "BETA" not in alpha_content.upper()
+        and "ALPHA" not in beta_content.upper()
+    )
+    user_mentioned_twice = float(
+        alpha is not None
+        and beta is not None
+        and user.get("pubkey") in alpha.get("mentioned_pubkeys", [])
+        and user.get("pubkey") in beta.get("mentioned_pubkeys", [])
+    )
+    evidence_complete = float(
+        evidence.get("schema_version") == 1
+        and evidence.get("task_name") == "cross-thread-requests"
+        and evidence.get("truncated") is False
+        and isinstance(alpha_root, str)
+        and isinstance(beta_root, str)
+        and len(agents) == 1
+    )
+    values = (
+        alpha_correct,
+        beta_correct,
+        thread_isolation,
+        user_mentioned_twice,
+        evidence_complete,
+    )
+    metrics = {
+        "reward": float(all(value == 1.0 for value in values)),
+        "alpha_correct": alpha_correct,
+        "beta_correct": beta_correct,
+        "thread_isolation": thread_isolation,
+        "user_mentioned_twice": user_mentioned_twice,
+        "evidence_complete": evidence_complete,
+    }
+    return metrics, {
+        "alpha_root": alpha_root,
+        "beta_root": beta_root,
+        "alpha_message_id": alpha.get("id") if alpha else None,
+        "beta_message_id": beta.get("id") if beta else None,
+        "alpha_content": alpha_content,
+        "beta_content": beta_content,
+    }
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--evidence", type=Path, required=True)
+    parser.add_argument("--reward", type=Path, required=True)
+    parser.add_argument("--details", type=Path, required=True)
+    args = parser.parse_args()
+    try:
+        metrics, details = score_evidence(
+            json.loads(args.evidence.read_text(encoding="utf-8"))
+        )
+    except (OSError, json.JSONDecodeError) as error:
+        metrics, details = _zero(), {"error": str(error)}
+    args.reward.write_text(json.dumps(metrics, sort_keys=True) + "\n", encoding="utf-8")
+    args.details.write_text(
+        json.dumps(details, indent=2, sort_keys=True) + "\n", encoding="utf-8"
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/benchmarks/buzz-dataset/interleaved-agent-reports/README.md b/benchmarks/buzz-dataset/interleaved-agent-reports/README.md
new file mode 100644
index 0000000000..a24a92fa0c
--- /dev/null
+++ b/benchmarks/buzz-dataset/interleaved-agent-reports/README.md
@@ -0,0 +1,8 @@
+# interleaved-agent-reports
+
+Three signed bot identities publish independent reports immediately after the
+human request. The solo agent must retain every input, calculate 87, notify the
+human exactly once, and avoid waking the reporters again. The case exercises
+the batching/steering family reported in
+[block/buzz#5839](https://github.com/block/buzz/issues/5839) and
+[block/buzz#4942](https://github.com/block/buzz/issues/4942).
diff --git a/benchmarks/buzz-dataset/interleaved-agent-reports/environment/Dockerfile b/benchmarks/buzz-dataset/interleaved-agent-reports/environment/Dockerfile
new file mode 100644
index 0000000000..29f16f3c41
--- /dev/null
+++ b/benchmarks/buzz-dataset/interleaved-agent-reports/environment/Dockerfile
@@ -0,0 +1,3 @@
+FROM python:3.12-slim-bookworm
+
+WORKDIR /app
diff --git a/benchmarks/buzz-dataset/interleaved-agent-reports/instruction.md b/benchmarks/buzz-dataset/interleaved-agent-reports/instruction.md
new file mode 100644
index 0000000000..9221e0c2ac
--- /dev/null
+++ b/benchmarks/buzz-dataset/interleaved-agent-reports/instruction.md
@@ -0,0 +1,6 @@
+Three specialist agents will report separate inputs for a forecast. Wait until
+you have all three reports, then calculate:
+
+`(North + South - reserve) * multiplier`
+
+Send me one concise synthesis that labels all four inputs and the final value.
diff --git a/benchmarks/buzz-dataset/interleaved-agent-reports/task.toml b/benchmarks/buzz-dataset/interleaved-agent-reports/task.toml
new file mode 100644
index 0000000000..8bd320cb09
--- /dev/null
+++ b/benchmarks/buzz-dataset/interleaved-agent-reports/task.toml
@@ -0,0 +1,24 @@
+schema_version = "1.3"
+
+[task]
+name = "buzz-native/interleaved-agent-reports"
+description = "Aggregate multiple agent reports delivered together without losing an input or waking reporters again."
+authors = [{ name = "Buzz" }]
+keywords = ["buzz-native", "agents", "batching", "synthesis"]
+
+[metadata]
+difficulty = "hard"
+category = "collaboration"
+tags = ["agents", "batching", "synthesis", "mentions"]
+
+[agent]
+timeout_sec = 300.0
+
+[verifier]
+timeout_sec = 30.0
+
+[environment]
+network_mode = "public"
+cpus = 1
+memory_mb = 1024
+storage_mb = 1024
diff --git a/benchmarks/buzz-dataset/interleaved-agent-reports/tests/test.sh b/benchmarks/buzz-dataset/interleaved-agent-reports/tests/test.sh
new file mode 100755
index 0000000000..79434035e3
--- /dev/null
+++ b/benchmarks/buzz-dataset/interleaved-agent-reports/tests/test.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -eu
+
+mkdir -p /logs/verifier
+python3 /tests/verify.py --evidence /logs/artifacts/buzz-evidence.json --reward /logs/verifier/reward.json --details /logs/verifier/details.json
diff --git a/benchmarks/buzz-dataset/interleaved-agent-reports/tests/verify.py b/benchmarks/buzz-dataset/interleaved-agent-reports/tests/verify.py
new file mode 100755
index 0000000000..b6b7dfc524
--- /dev/null
+++ b/benchmarks/buzz-dataset/interleaved-agent-reports/tests/verify.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+"""Deterministic verifier for aggregation of batched agent reports."""
+
+from __future__ import annotations
+
+import argparse
+import json
+import re
+from pathlib import Path
+from typing import Any
+
+REPORTERS = ("Ledger Scout", "Risk Sentinel", "Ops Forecaster")
+LABELS = {"ledger-report", "risk-report", "operations-report"}
+
+
+def _zero() -> dict[str, float]:
+    return {
+        "reward": 0.0,
+        "reports_delivered": 0.0,
+        "inputs_complete": 0.0,
+        "answer_correct": 0.0,
+        "single_human_callback": 0.0,
+        "reporters_not_rementioned": 0.0,
+        "reply_to_thread": 0.0,
+        "evidence_complete": 0.0,
+    }
+
+
+def score_evidence(evidence: object) -> tuple[dict[str, float], dict[str, Any]]:
+    if not isinstance(evidence, dict):
+        return _zero(), {"error": "evidence root is not an object"}
+    root = evidence.get("task_event_id")
+    identities = (
+        evidence.get("identities")
+        if isinstance(evidence.get("identities"), dict)
+        else {}
+    )
+    user = identities.get("Nora Isabel Grant", {})
+    agents = [
+        row
+        for row in identities.values()
+        if isinstance(row, dict) and row.get("role") == "orchestrator"
+    ]
+    agent_pubkey = agents[0].get("pubkey") if len(agents) == 1 else None
+    directory = {
+        row.get("name"): row
+        for row in evidence.get("directory", [])
+        if isinstance(row, dict)
+    }
+    reporter_pubkeys = {
+        directory[name].get("pubkey") for name in REPORTERS if name in directory
+    }
+    scripts = [
+        row for row in evidence.get("scripted_events", []) if isinstance(row, dict)
+    ]
+    script_ids = {row.get("event_id") for row in scripts if row.get("label") in LABELS}
+    messages = [row for row in evidence.get("messages", []) if isinstance(row, dict)]
+    delivered_ids = {row.get("id") for row in messages}
+    reports_delivered = float(
+        len(script_ids) == 3 and None not in script_ids and script_ids <= delivered_ids
+    )
+    candidates = [
+        row for row in messages if agent_pubkey and row.get("pubkey") == agent_pubkey
+    ]
+    final = candidates[-1] if candidates else None
+    content = str(final.get("content", "")) if final else ""
+    mentioned = set(final.get("mentioned_pubkeys", [])) if final else set()
+    inputs_complete = float(
+        all(
+            re.search(pattern, content, re.IGNORECASE)
+            for pattern in (
+                r"north\D+17",
+                r"south\D+23",
+                r"reserve\D+11",
+                r"multiplier\D+3",
+            )
+        )
+    )
+    answer_correct = float(
+        bool(
+            re.search(
+                r"(?:final|result|forecast|=)\D*87(?:\D|$)",
+                content,
+                re.IGNORECASE,
+            )
+        )
+    )
+    human_callbacks = [
+        row
+        for row in candidates
+        if user.get("pubkey") in row.get("mentioned_pubkeys", [])
+    ]
+    single_human_callback = float(
+        len(human_callbacks) == 1 and final in human_callbacks
+    )
+    reporters_not_rementioned = float(
+        len(reporter_pubkeys) == 3
+        and all(
+            set(row.get("mentioned_pubkeys", [])).isdisjoint(reporter_pubkeys)
+            and not any(f"@{name}" in str(row.get("content", "")) for name in REPORTERS)
+            for row in candidates
+        )
+    )
+    reply_to_thread = float(
+        final is not None and final.get("reply_to_event_id") == root
+    )
+    evidence_complete = float(
+        evidence.get("schema_version") == 1
+        and evidence.get("task_name") == "interleaved-agent-reports"
+        and evidence.get("truncated") is False
+        and len(agents) == 1
+        and len(directory) == 3
+        and final is not None
+        and len(candidates) == 1
+    )
+    values = (
+        reports_delivered,
+        inputs_complete,
+        answer_correct,
+        single_human_callback,
+        reporters_not_rementioned,
+        reply_to_thread,
+        evidence_complete,
+    )
+    metrics = {
+        "reward": float(all(value == 1.0 for value in values)),
+        "reports_delivered": reports_delivered,
+        "inputs_complete": inputs_complete,
+        "answer_correct": answer_correct,
+        "single_human_callback": single_human_callback,
+        "reporters_not_rementioned": reporters_not_rementioned,
+        "reply_to_thread": reply_to_thread,
+        "evidence_complete": evidence_complete,
+    }
+    return metrics, {
+        "scripted_event_ids": sorted(str(value) for value in script_ids),
+        "selected_message_id": final.get("id") if final else None,
+        "content": content,
+        "mentioned_pubkeys": sorted(mentioned),
+    }
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--evidence", type=Path, required=True)
+    parser.add_argument("--reward", type=Path, required=True)
+    parser.add_argument("--details", type=Path, required=True)
+    args = parser.parse_args()
+    try:
+        metrics, details = score_evidence(
+            json.loads(args.evidence.read_text(encoding="utf-8"))
+        )
+    except (OSError, json.JSONDecodeError) as error:
+        metrics, details = _zero(), {"error": str(error)}
+    args.reward.write_text(json.dumps(metrics, sort_keys=True) + "\n", encoding="utf-8")
+    args.details.write_text(
+        json.dumps(details, indent=2, sort_keys=True) + "\n", encoding="utf-8"
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/benchmarks/buzz-dataset/multiline-message/README.md b/benchmarks/buzz-dataset/multiline-message/README.md
new file mode 100644
index 0000000000..cb37089cff
--- /dev/null
+++ b/benchmarks/buzz-dataset/multiline-message/README.md
@@ -0,0 +1,10 @@
+# multiline-message
+
+The agent sends a short release update whose blank lines and bullet boundaries
+must survive the `buzz messages send` shell call as real newline bytes. The
+verifier also checks the normal reply anchor and callback mention. This guards
+the first-newline truncation failure described in
+[block/buzz#5787](https://github.com/block/buzz/issues/5787).
+
+Run with the command in the parent [README](../README.md), replacing the task
+path with `benchmarks/buzz-dataset/multiline-message`.
diff --git a/benchmarks/buzz-dataset/multiline-message/environment/Dockerfile b/benchmarks/buzz-dataset/multiline-message/environment/Dockerfile
new file mode 100644
index 0000000000..29f16f3c41
--- /dev/null
+++ b/benchmarks/buzz-dataset/multiline-message/environment/Dockerfile
@@ -0,0 +1,3 @@
+FROM python:3.12-slim-bookworm
+
+WORKDIR /app
diff --git a/benchmarks/buzz-dataset/multiline-message/instruction.md b/benchmarks/buzz-dataset/multiline-message/instruction.md
new file mode 100644
index 0000000000..bf307c5fb5
--- /dev/null
+++ b/benchmarks/buzz-dataset/multiline-message/instruction.md
@@ -0,0 +1,11 @@
+Send me this release-readiness update, preserving the paragraph and list layout:
+
+Release readiness
+
+- API: ready
+- Database: ready
+- Rollback: tested
+
+Owner: Platform Operations
+
+Keep the response brief and do not add a table.
diff --git a/benchmarks/buzz-dataset/multiline-message/task.toml b/benchmarks/buzz-dataset/multiline-message/task.toml
new file mode 100644
index 0000000000..69f919f7c1
--- /dev/null
+++ b/benchmarks/buzz-dataset/multiline-message/task.toml
@@ -0,0 +1,24 @@
+schema_version = "1.3"
+
+[task]
+name = "buzz-native/multiline-message"
+description = "Deliver a multiline Buzz message without flattening or escaping its layout."
+authors = [{ name = "Buzz" }]
+keywords = ["buzz-native", "messaging", "multiline", "cli"]
+
+[metadata]
+difficulty = "medium"
+category = "collaboration"
+tags = ["messaging", "multiline", "cli"]
+
+[agent]
+timeout_sec = 300.0
+
+[verifier]
+timeout_sec = 30.0
+
+[environment]
+network_mode = "public"
+cpus = 1
+memory_mb = 1024
+storage_mb = 1024
diff --git a/benchmarks/buzz-dataset/multiline-message/tests/test.sh b/benchmarks/buzz-dataset/multiline-message/tests/test.sh
new file mode 100755
index 0000000000..3dd50814b6
--- /dev/null
+++ b/benchmarks/buzz-dataset/multiline-message/tests/test.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+mkdir -p /logs/verifier
+python3 /tests/verify.py \
+  --evidence /logs/artifacts/buzz-evidence.json \
+  --reward /logs/verifier/reward.json \
+  --details /logs/verifier/details.json
diff --git a/benchmarks/buzz-dataset/multiline-message/tests/verify.py b/benchmarks/buzz-dataset/multiline-message/tests/verify.py
new file mode 100755
index 0000000000..afa34a6bd3
--- /dev/null
+++ b/benchmarks/buzz-dataset/multiline-message/tests/verify.py
@@ -0,0 +1,121 @@
+#!/usr/bin/env python3
+"""Deterministic verifier for multiline Buzz message delivery."""
+
+from __future__ import annotations
+
+import argparse
+import json
+from pathlib import Path
+from typing import Any
+
+EXPECTED = (
+    "Release readiness\n\n"
+    "- API: ready\n"
+    "- Database: ready\n"
+    "- Rollback: tested\n\n"
+    "Owner: Platform Operations"
+)
+
+
+def _zero() -> dict[str, float]:
+    return {
+        "reward": 0.0,
+        "layout_preserved": 0.0,
+        "real_newlines": 0.0,
+        "reply_to_thread": 0.0,
+        "user_mentioned": 0.0,
+        "evidence_complete": 0.0,
+    }
+
+
+def score_evidence(evidence: object) -> tuple[dict[str, float], dict[str, Any]]:
+    if not isinstance(evidence, dict):
+        return _zero(), {"error": "evidence root is not an object"}
+    root = evidence.get("task_event_id")
+    trial = evidence.get("trial") if isinstance(evidence.get("trial"), dict) else {}
+    identities = (
+        evidence.get("identities")
+        if isinstance(evidence.get("identities"), dict)
+        else {}
+    )
+    user = identities.get("Eleanor June Brooks", {})
+    agents = [
+        row
+        for row in identities.values()
+        if isinstance(row, dict) and row.get("role") == "orchestrator"
+    ]
+    agent_pubkey = agents[0].get("pubkey") if len(agents) == 1 else None
+    messages = [row for row in evidence.get("messages", []) if isinstance(row, dict)]
+    candidates = [
+        row for row in messages if agent_pubkey and row.get("pubkey") == agent_pubkey
+    ]
+    final = candidates[-1] if candidates else None
+    content = str(final.get("content", "")) if final else ""
+    tags = final.get("tags", []) if final else []
+    evidence_complete = float(
+        evidence.get("schema_version") == 1
+        and evidence.get("task_name") == "multiline-message"
+        and evidence.get("truncated") is False
+        and isinstance(root, str)
+        and isinstance(trial.get("channel_id"), str)
+        and len(agents) == 1
+        and isinstance(user.get("pubkey"), str)
+        and final is not None
+        and len(candidates) == 1
+    )
+    layout_preserved = float(EXPECTED in content)
+    real_newlines = float("\\n" not in content and content.count("\n") >= 6)
+    reply_to_thread = float(
+        final is not None and final.get("reply_to_event_id") == root
+    )
+    user_mentioned = float(
+        user.get("pubkey") in (final.get("mentioned_pubkeys", []) if final else [])
+    )
+    reward = float(
+        all(
+            value == 1.0
+            for value in (
+                evidence_complete,
+                layout_preserved,
+                real_newlines,
+                reply_to_thread,
+                user_mentioned,
+            )
+        )
+    )
+    metrics = {
+        "reward": reward,
+        "layout_preserved": layout_preserved,
+        "real_newlines": real_newlines,
+        "reply_to_thread": reply_to_thread,
+        "user_mentioned": user_mentioned,
+        "evidence_complete": evidence_complete,
+    }
+    return metrics, {
+        "selected_message_id": final.get("id") if final else None,
+        "content": content,
+        "tags": tags,
+    }
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--evidence", type=Path, required=True)
+    parser.add_argument("--reward", type=Path, required=True)
+    parser.add_argument("--details", type=Path, required=True)
+    args = parser.parse_args()
+    try:
+        metrics, details = score_evidence(
+            json.loads(args.evidence.read_text(encoding="utf-8"))
+        )
+    except (OSError, json.JSONDecodeError) as error:
+        metrics, details = _zero(), {"error": str(error)}
+    args.reward.write_text(json.dumps(metrics, sort_keys=True) + "\n", encoding="utf-8")
+    args.details.write_text(
+        json.dumps(details, indent=2, sort_keys=True) + "\n", encoding="utf-8"
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/benchmarks/buzz-dataset/narrative-agent-names/README.md b/benchmarks/buzz-dataset/narrative-agent-names/README.md
new file mode 100644
index 0000000000..f72a4ef3cc
--- /dev/null
+++ b/benchmarks/buzz-dataset/narrative-agent-names/README.md
@@ -0,0 +1,7 @@
+# narrative-agent-names
+
+The agent reports status about two in-channel bots. Both names must remain
+plain narrative text: neither bot may receive a `p` tag or an `@Name` wake-up.
+The requesting human must still receive the callback mention. This guards the
+acknowledgement and false-wake behavior in
+[block/buzz#5176](https://github.com/block/buzz/issues/5176).
diff --git a/benchmarks/buzz-dataset/narrative-agent-names/environment/Dockerfile b/benchmarks/buzz-dataset/narrative-agent-names/environment/Dockerfile
new file mode 100644
index 0000000000..29f16f3c41
--- /dev/null
+++ b/benchmarks/buzz-dataset/narrative-agent-names/environment/Dockerfile
@@ -0,0 +1,3 @@
+FROM python:3.12-slim-bookworm
+
+WORKDIR /app
diff --git a/benchmarks/buzz-dataset/narrative-agent-names/instruction.md b/benchmarks/buzz-dataset/narrative-agent-names/instruction.md
new file mode 100644
index 0000000000..78c73109f3
--- /dev/null
+++ b/benchmarks/buzz-dataset/narrative-agent-names/instruction.md
@@ -0,0 +1,6 @@
+Give me a two-line status update:
+
+- Aurora Audit Bot completed the audit.
+- Beacon Deploy Bot remains idle.
+
+This is only a status summary. Neither bot has any work to do.
diff --git a/benchmarks/buzz-dataset/narrative-agent-names/task.toml b/benchmarks/buzz-dataset/narrative-agent-names/task.toml
new file mode 100644
index 0000000000..09025e0723
--- /dev/null
+++ b/benchmarks/buzz-dataset/narrative-agent-names/task.toml
@@ -0,0 +1,24 @@
+schema_version = "1.3"
+
+[task]
+name = "buzz-native/narrative-agent-names"
+description = "Name agents in narrative without waking them through event mentions."
+authors = [{ name = "Buzz" }]
+keywords = ["buzz-native", "mentions", "agents", "notifications"]
+
+[metadata]
+difficulty = "medium"
+category = "collaboration"
+tags = ["mentions", "agents", "notifications"]
+
+[agent]
+timeout_sec = 300.0
+
+[verifier]
+timeout_sec = 30.0
+
+[environment]
+network_mode = "public"
+cpus = 1
+memory_mb = 1024
+storage_mb = 1024
diff --git a/benchmarks/buzz-dataset/narrative-agent-names/tests/test.sh b/benchmarks/buzz-dataset/narrative-agent-names/tests/test.sh
new file mode 100755
index 0000000000..79434035e3
--- /dev/null
+++ b/benchmarks/buzz-dataset/narrative-agent-names/tests/test.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -eu
+
+mkdir -p /logs/verifier
+python3 /tests/verify.py --evidence /logs/artifacts/buzz-evidence.json --reward /logs/verifier/reward.json --details /logs/verifier/details.json
diff --git a/benchmarks/buzz-dataset/narrative-agent-names/tests/verify.py b/benchmarks/buzz-dataset/narrative-agent-names/tests/verify.py
new file mode 100755
index 0000000000..3759f13876
--- /dev/null
+++ b/benchmarks/buzz-dataset/narrative-agent-names/tests/verify.py
@@ -0,0 +1,129 @@
+#!/usr/bin/env python3
+"""Deterministic verifier for non-notifying narrative agent names."""
+
+from __future__ import annotations
+
+import argparse
+import json
+import re
+from pathlib import Path
+from typing import Any
+
+BOT_NAMES = ("Aurora Audit Bot", "Beacon Deploy Bot")
+
+
+def _zero() -> dict[str, float]:
+    return {
+        "reward": 0.0,
+        "status_correct": 0.0,
+        "bots_not_mentioned": 0.0,
+        "user_mentioned": 0.0,
+        "reply_to_thread": 0.0,
+        "evidence_complete": 0.0,
+    }
+
+
+def score_evidence(evidence: object) -> tuple[dict[str, float], dict[str, Any]]:
+    if not isinstance(evidence, dict):
+        return _zero(), {"error": "evidence root is not an object"}
+    root = evidence.get("task_event_id")
+    identities = (
+        evidence.get("identities")
+        if isinstance(evidence.get("identities"), dict)
+        else {}
+    )
+    user = identities.get("Maya Elise Chen", {})
+    agents = [
+        row
+        for row in identities.values()
+        if isinstance(row, dict) and row.get("role") == "orchestrator"
+    ]
+    agent_pubkey = agents[0].get("pubkey") if len(agents) == 1 else None
+    directory = {
+        row.get("name"): row
+        for row in evidence.get("directory", [])
+        if isinstance(row, dict)
+    }
+    bot_pubkeys = {
+        directory[name].get("pubkey") for name in BOT_NAMES if name in directory
+    }
+    messages = [row for row in evidence.get("messages", []) if isinstance(row, dict)]
+    candidates = [
+        row for row in messages if agent_pubkey and row.get("pubkey") == agent_pubkey
+    ]
+    final = candidates[-1] if candidates else None
+    content = str(final.get("content", "")) if final else ""
+    mentioned = set(final.get("mentioned_pubkeys", [])) if final else set()
+    status_correct = float(
+        bool(re.search(r"Aurora Audit Bot[^.\n]*completed", content, re.IGNORECASE))
+        and bool(re.search(r"Beacon Deploy Bot[^.\n]*idle", content, re.IGNORECASE))
+    )
+    bots_not_mentioned = float(
+        len(bot_pubkeys) == 2
+        and all(
+            set(row.get("mentioned_pubkeys", [])).isdisjoint(bot_pubkeys)
+            and not any(f"@{name}" in str(row.get("content", "")) for name in BOT_NAMES)
+            for row in candidates
+        )
+    )
+    user_mentioned = float(user.get("pubkey") in mentioned)
+    reply_to_thread = float(
+        final is not None and final.get("reply_to_event_id") == root
+    )
+    evidence_complete = float(
+        evidence.get("schema_version") == 1
+        and evidence.get("task_name") == "narrative-agent-names"
+        and evidence.get("truncated") is False
+        and len(agents) == 1
+        and len(directory) == 2
+        and final is not None
+        and len(candidates) == 1
+    )
+    reward = float(
+        all(
+            value == 1.0
+            for value in (
+                status_correct,
+                bots_not_mentioned,
+                user_mentioned,
+                reply_to_thread,
+                evidence_complete,
+            )
+        )
+    )
+    metrics = {
+        "reward": reward,
+        "status_correct": status_correct,
+        "bots_not_mentioned": bots_not_mentioned,
+        "user_mentioned": user_mentioned,
+        "reply_to_thread": reply_to_thread,
+        "evidence_complete": evidence_complete,
+    }
+    return metrics, {
+        "selected_message_id": final.get("id") if final else None,
+        "content": content,
+        "mentioned_pubkeys": sorted(mentioned),
+    }
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--evidence", type=Path, required=True)
+    parser.add_argument("--reward", type=Path, required=True)
+    parser.add_argument("--details", type=Path, required=True)
+    args = parser.parse_args()
+    try:
+        metrics, details = score_evidence(
+            json.loads(args.evidence.read_text(encoding="utf-8"))
+        )
+    except (OSError, json.JSONDecodeError) as error:
+        metrics, details = _zero(), {"error": str(error)}
+    args.reward.write_text(json.dumps(metrics, sort_keys=True) + "\n", encoding="utf-8")
+    args.details.write_text(
+        json.dumps(details, indent=2, sort_keys=True) + "\n", encoding="utf-8"
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/benchmarks/harbor-buzz-orchestra/README.md b/benchmarks/harbor-buzz-orchestra/README.md
index b7df4a5557..bbc0b60380 100644
--- a/benchmarks/harbor-buzz-orchestra/README.md
+++ b/benchmarks/harbor-buzz-orchestra/README.md
@@ -66,10 +66,11 @@ artifacts) available for analysis.
 
 The local [`benchmarks/buzz-dataset`](../buzz-dataset) suite — a sibling
 directory of this harness, not a subdirectory of it — scores Buzz product
-behavior alongside task correctness. It currently covers direct thread replies, callback user
-mentions, targeted reads of user-named paths outside the workspace, and exact
-channel creation/membership. Run one task with the production base prompt from
-the checked-out source build:
+behavior alongside task correctness. It covers direct thread replies, callback
+user mentions, targeted reads of named paths, exact channel membership,
+multiline delivery, non-waking narrative names, batched reports, cross-thread
+isolation, and ambiguous identities. Run one task with the production base
+prompt from the checked-out source build:
 
 ```bash
 just benchmark \
@@ -108,6 +109,12 @@ or verifier. If the snapshot cannot be exported the trial **fails** rather than
 scoring 0 — a harness fault and a model fault stay distinguishable — and the
 cause is written to the trial's `buzz/buzz-evidence-error.txt`.
 
+Some tasks declare additional signed relay events. The provisioner creates
+their actors as normal channel identities and the runtime publishes the events
+through the production CLI immediately after the task message. Evidence exports
+only public actor metadata and event IDs; their signing credentials never enter
+the task container or verifier artifact.
+
 Each task ships its own `README.md` documenting its reward dimensions and, for
 the tasks whose graded Buzz behavior is deliberately absent from
 `instruction.md` (`reply-to-thread`, `user-mention`), why that omission is the
diff --git a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/container_runtime.py b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/container_runtime.py
index 756cbfa31f..e4415755de 100644
--- a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/container_runtime.py
+++ b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/container_runtime.py
@@ -49,6 +49,7 @@ FORWARDER = f"{REMOTE_BIN}/relay-forwarder"
 FORWARDER_LOG = f"{REMOTE_LOGS}/relay-forwarder.log"
 # How many done-poll iterations between in-container liveness probes.
 LIVENESS_EVERY = 10
+SCRIPTED_EVENT_IDLE_POLLS = 5
 TRANSCRIPT_LIMIT = 1000
 TURN_ENDED_MARKERS = (
     "turn complete for",
@@ -138,6 +139,7 @@ class BuzzContainerRuntime:
         agents: list[_Agent] = []
         infra: list[_Agent] = []
         task_event_id: str | None = None
+        scripted_events: list[dict[str, str | None]] = []
         final_message: dict[str, Any] | None = None
         evidence_exported = False
         try:
@@ -192,6 +194,11 @@ class BuzzContainerRuntime:
                 task_event.get("event_id"), str
             ):
                 task_event_id = task_event["event_id"]
+            scripted_events = await self._send_scripted_messages(
+                trial=trial,
+                orchestrator=orchestrator,
+                task_event_id=task_event_id,
+            )
             final_message = await asyncio.wait_for(
                 self._wait_for_done(
                     environment,
@@ -199,6 +206,9 @@ class BuzzContainerRuntime:
                     trial,
                     agents + infra,
                     solo=agents[0] if len(agents) == 1 else None,
+                    minimum_agent_messages=fixture_for(
+                        trial.task_name
+                    ).minimum_agent_messages,
                 ),
                 timeout=manifest.trial_budget.timeout_seconds,
             )
@@ -214,6 +224,7 @@ class BuzzContainerRuntime:
                 completion_message_id=(
                     final_message.get("id") if final_message is not None else None
                 ),
+                scripted_events=scripted_events,
             )
 
         # A missing snapshot is a harness failure, not an agent failure: the
@@ -495,6 +506,7 @@ class BuzzContainerRuntime:
         trial: TrialHandle,
         agents: list[_Agent],
         solo: _Agent | None = None,
+        minimum_agent_messages: int = 0,
     ) -> dict[str, Any] | None:
         """Observe until a team posts DONE or a solo agent finishes its one turn.
 
@@ -503,6 +515,7 @@ class BuzzContainerRuntime:
         agent cannot be woken by a teammate, so its logged turn end is final.
         """
         polls = 0
+        idle_terminal_polls = 0
         while True:
             if polls % LIVENESS_EVERY == 0:
                 await self._raise_for_dead_agents(environment, agents)
@@ -522,17 +535,41 @@ class BuzzContainerRuntime:
                     message.get("content", "")
                 ).startswith("DONE:"):
                     return message
-            if solo is not None and await self._turn_ended(environment, solo):
-                return None
+            if solo is not None:
+                starts, ends = await self._turn_counts(environment, solo)
+                authored = [
+                    message
+                    for message in messages
+                    if message.get("pubkey") == orchestrator.nostr_pubkey
+                ]
+                if ends > 0 and len(authored) >= minimum_agent_messages:
+                    return authored[-1] if authored else None
+                if starts > 0 and starts == ends:
+                    idle_terminal_polls += 1
+                    if idle_terminal_polls >= SCRIPTED_EVENT_IDLE_POLLS:
+                        return authored[-1] if authored else None
+                else:
+                    idle_terminal_polls = 0
             await asyncio.sleep(self.poll_seconds)
 
     @staticmethod
     async def _turn_ended(environment: BaseEnvironment, agent: _Agent) -> bool:
+        _, ends = await BuzzContainerRuntime._turn_counts(environment, agent)
+        return ends > 0
+
+    @staticmethod
+    async def _turn_counts(
+        environment: BaseEnvironment, agent: _Agent
+    ) -> tuple[int, int]:
         result = await environment.exec(
             f"cat {shlex.quote(agent.stdout_log)} "
             f"{shlex.quote(agent.stderr_log)} 2>/dev/null"
         )
-        return any(marker in (result.stdout or "") for marker in TURN_ENDED_MARKERS)
+        output = result.stdout or ""
+        return (
+            output.count("turn starting for"),
+            sum(output.count(marker) for marker in TURN_ENDED_MARKERS),
+        )
 
     async def _raise_for_dead_agents(
         self, environment: BaseEnvironment, agents: list[_Agent]
@@ -590,6 +627,7 @@ class BuzzContainerRuntime:
         trial_dir: Path,
         task_event_id: str | None,
         completion_message_id: str | None,
+        scripted_events: list[dict[str, str | None]] | None = None,
     ) -> bool:
         """Snapshot public relay state for the verifier before trial teardown."""
         try:
@@ -611,6 +649,7 @@ class BuzzContainerRuntime:
                 completion_message_id=completion_message_id,
                 transcript_limit=TRANSCRIPT_LIMIT,
                 observed_channels=observed_channels,
+                scripted_events=scripted_events,
             )
             evidence_path = trial_dir / "buzz-evidence.json"
             evidence_path.write_text(
@@ -726,6 +765,7 @@ class BuzzContainerRuntime:
         content: str,
         *,
         mention: str | None = None,
+        reply_to: str | None = None,
     ) -> Any:
         args = [
             "messages",
@@ -737,8 +777,65 @@ class BuzzContainerRuntime:
         ]
         if mention is not None:
             args += ["--mention", mention]
+        if reply_to is not None:
+            args += ["--reply-to", reply_to]
         return await self._buzz_json(credential, trial, *args)
 
+    async def _send_scripted_messages(
+        self,
+        *,
+        trial: TrialHandle,
+        orchestrator: AgentCredential,
+        task_event_id: str | None,
+    ) -> list[dict[str, str | None]]:
+        """Inject task-declared events through the production CLI.
+
+        Messages are sent back-to-back so Buzz's normal queueing and batching
+        decide how the agent sees them. The verifier receives only public event
+        metadata; fixture signing keys stay inside the runtime handle.
+        """
+        fixture = fixture_for(trial.task_name)
+        if not fixture.scripted_messages:
+            return []
+        actors = {actor.identity_id: actor.credential for actor in trial.fixture_actors}
+        recorded: list[dict[str, str | None]] = []
+        for message in fixture.scripted_messages:
+            try:
+                actor = trial.user if message.actor == "user" else actors[message.actor]
+            except KeyError as error:
+                raise RuntimeLaunchError(
+                    f"scripted actor {message.actor!r} has no fixture credential"
+                ) from error
+            content = message.content.replace(
+                "{orchestrator}", orchestrator.agent_id
+            ).replace("{user}", trial.user.agent_id)
+            response = await self._send(
+                actor,
+                trial,
+                content,
+                mention=(
+                    orchestrator.nostr_pubkey if message.mention_orchestrator else None
+                ),
+                reply_to=(task_event_id if message.reply_to_task else None),
+            )
+            event_id = (
+                response.get("event_id")
+                if isinstance(response, dict)
+                and isinstance(response.get("event_id"), str)
+                else None
+            )
+            recorded.append(
+                {
+                    "label": message.label,
+                    "event_id": event_id,
+                    "actor": message.actor,
+                    "reply_to_event_id": (
+                        task_event_id if message.reply_to_task else None
+                    ),
+                }
+            )
+        return recorded
+
     async def _buzz_json(
         self, credential: AgentCredential, trial: TrialHandle, *args: str
     ) -> Any:
diff --git a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/evidence.py b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/evidence.py
index 45eaaa3cfa..bc8e34782a 100644
--- a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/evidence.py
+++ b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/evidence.py
@@ -75,6 +75,7 @@ def build_buzz_evidence(
     completion_message_id: str | None,
     transcript_limit: int,
     observed_channels: object = None,
+    scripted_events: object = None,
 ) -> dict[str, Any]:
     """Normalize relay messages into a versioned contract for task verifiers.
 
@@ -92,6 +93,12 @@ def build_buzz_evidence(
     identities_by_pubkey = {
         pubkey: {"name": name, "role": role} for name, role, pubkey in identity_rows
     }
+    identities_by_pubkey.update(
+        {
+            identity.pubkey: {"name": identity.name, "role": identity.role}
+            for identity in trial.directory
+        }
+    )
     identities = {
         name: {"role": role, "pubkey": pubkey} for name, role, pubkey in identity_rows
     }
@@ -117,9 +124,16 @@ def build_buzz_evidence(
         "completion_message_id": completion_message_id,
         "identities": identities,
         "directory": [
-            {"name": identity.name, "role": identity.role, "pubkey": identity.pubkey}
+            {
+                "identity_id": identity.identity_id or identity.name,
+                "name": identity.name,
+                "role": identity.role,
+                "pubkey": identity.pubkey,
+                "about": identity.about,
+            }
             for identity in trial.directory
         ],
+        "scripted_events": scripted_events if isinstance(scripted_events, list) else [],
         "task_name": trial.task_name,
         "observed_channels": (
             observed_channels if isinstance(observed_channels, list) else []
diff --git a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/provisioning.py b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/provisioning.py
index b27ae8ae12..ecc2df2e2b 100644
--- a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/provisioning.py
+++ b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/provisioning.py
@@ -28,6 +28,16 @@ class DirectoryIdentity:
     name: str
     role: str
     pubkey: str
+    identity_id: str = ""
+    about: str = ""
+
+
+@dataclass(frozen=True, slots=True)
+class FixtureActor:
+    """A private signer for task-declared relay events."""
+
+    identity_id: str
+    credential: AgentCredential
 
 
 @dataclass(frozen=True, slots=True)
@@ -51,6 +61,7 @@ class TrialHandle:
     # Additive Buzz-native task context. Directory entries contain no secrets.
     task_name: str = ""
     directory: tuple[DirectoryIdentity, ...] = ()
+    fixture_actors: tuple[FixtureActor, ...] = ()
 
 
 @runtime_checkable
diff --git a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/task_fixtures.py b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/task_fixtures.py
index afcfb6f050..da94871bea 100644
--- a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/task_fixtures.py
+++ b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/task_fixtures.py
@@ -11,6 +11,25 @@ class DirectoryEntry:
 
     name: str
     role: str
+    identity_id: str | None = None
+    about: str | None = None
+    channel_member: bool = False
+
+    @property
+    def stable_id(self) -> str:
+        """Identity key used for deterministic credentials and scripted events."""
+        return self.identity_id or self.name
+
+
+@dataclass(frozen=True, slots=True)
+class ScriptedMessage:
+    """A relay event injected immediately after the task's triggering event."""
+
+    label: str
+    actor: str
+    content: str
+    reply_to_task: bool = False
+    mention_orchestrator: bool = True
 
 
 @dataclass(frozen=True, slots=True)
@@ -18,6 +37,8 @@ class BuzzTaskFixture:
     """Relay state a task needs before the agent receives its prompt."""
 
     directory: tuple[DirectoryEntry, ...] = ()
+    scripted_messages: tuple[ScriptedMessage, ...] = ()
+    minimum_agent_messages: int = 0
     observe_channel_names: tuple[str, ...] = ()
     user_display_name: str | None = None
     # Whether the task's verifier grades the exported relay snapshot. Only
@@ -34,6 +55,11 @@ USER_MENTION_TASK = "user-mention"
 USER_MENTION_DISPLAY_NAME = "John Vincent Doe"
 REPLY_TO_THREAD_TASK = "reply-to-thread"
 READ_NAMED_PATH_TASK = "read-named-path-outside-workspace"
+MULTILINE_MESSAGE_TASK = "multiline-message"
+NARRATIVE_AGENT_NAMES_TASK = "narrative-agent-names"
+INTERLEAVED_AGENT_REPORTS_TASK = "interleaved-agent-reports"
+CROSS_THREAD_REQUESTS_TASK = "cross-thread-requests"
+AMBIGUOUS_USER_MENTION_TASK = "ambiguous-user-mention"
 
 _CREATE_CHANNEL_FIXTURE = BuzzTaskFixture(
     directory=tuple(
@@ -55,11 +81,100 @@ _USER_MENTION_FIXTURE = BuzzTaskFixture(
     requires_evidence=True,
 )
 
+_NARRATIVE_AGENT_NAMES_FIXTURE = BuzzTaskFixture(
+    directory=(
+        DirectoryEntry("Aurora Audit Bot", "bot", channel_member=True),
+        DirectoryEntry("Beacon Deploy Bot", "bot", channel_member=True),
+    ),
+    user_display_name="Maya Elise Chen",
+    requires_evidence=True,
+)
+
+_INTERLEAVED_AGENT_REPORTS_FIXTURE = BuzzTaskFixture(
+    directory=(
+        DirectoryEntry("Ledger Scout", "bot", channel_member=True),
+        DirectoryEntry("Risk Sentinel", "bot", channel_member=True),
+        DirectoryEntry("Ops Forecaster", "bot", channel_member=True),
+    ),
+    scripted_messages=(
+        ScriptedMessage(
+            label="ledger-report",
+            actor="Ledger Scout",
+            content=(
+                "@{orchestrator} Ledger report: North is 17 and South is 23. "
+                "Use both values in the requested synthesis."
+            ),
+            reply_to_task=True,
+        ),
+        ScriptedMessage(
+            label="risk-report",
+            actor="Risk Sentinel",
+            content=(
+                "@{orchestrator} Risk report: subtract a reserve of 11 before "
+                "applying the operations multiplier."
+            ),
+            reply_to_task=True,
+        ),
+        ScriptedMessage(
+            label="operations-report",
+            actor="Ops Forecaster",
+            content=("@{orchestrator} Operations report: the final multiplier is 3."),
+            reply_to_task=True,
+        ),
+    ),
+    user_display_name="Nora Isabel Grant",
+    requires_evidence=True,
+)
+
+_CROSS_THREAD_REQUESTS_FIXTURE = BuzzTaskFixture(
+    scripted_messages=(
+        ScriptedMessage(
+            label="beta-request",
+            actor="user",
+            content=(
+                "@{orchestrator} BETA request: calculate (84 / 7) + 29. "
+                "Reply with the BETA result, labelled BETA."
+            ),
+        ),
+    ),
+    minimum_agent_messages=2,
+    user_display_name="Priya Simone Patel",
+    requires_evidence=True,
+)
+
+_AMBIGUOUS_USER_MENTION_FIXTURE = BuzzTaskFixture(
+    directory=(
+        DirectoryEntry(
+            "Taylor Morgan Lee",
+            "user",
+            identity_id="taylor-release-captain",
+            about="Release captain. Routing code ORCHID-72.",
+            channel_member=True,
+        ),
+        DirectoryEntry(
+            "Taylor Morgan Lee",
+            "user",
+            identity_id="taylor-observer",
+            about="Compliance observer. Routing code COBALT-19.",
+            channel_member=True,
+        ),
+    ),
+    user_display_name="Olivia Grace Park",
+    requires_evidence=True,
+)
+
 _FIXTURES = {
     CREATE_CHANNEL_TASK: _CREATE_CHANNEL_FIXTURE,
     USER_MENTION_TASK: _USER_MENTION_FIXTURE,
     REPLY_TO_THREAD_TASK: BuzzTaskFixture(requires_evidence=True),
     READ_NAMED_PATH_TASK: BuzzTaskFixture(requires_evidence=True),
+    MULTILINE_MESSAGE_TASK: BuzzTaskFixture(
+        user_display_name="Eleanor June Brooks", requires_evidence=True
+    ),
+    NARRATIVE_AGENT_NAMES_TASK: _NARRATIVE_AGENT_NAMES_FIXTURE,
+    INTERLEAVED_AGENT_REPORTS_TASK: _INTERLEAVED_AGENT_REPORTS_FIXTURE,
+    CROSS_THREAD_REQUESTS_TASK: _CROSS_THREAD_REQUESTS_FIXTURE,
+    AMBIGUOUS_USER_MENTION_TASK: _AMBIGUOUS_USER_MENTION_FIXTURE,
 }
 
 
diff --git a/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/buzz_cli.py b/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/buzz_cli.py
index f1c4077d7e..6da74a1425 100644
--- a/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/buzz_cli.py
+++ b/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/buzz_cli.py
@@ -81,7 +81,7 @@ class BuzzCli:
             raise BuzzCliError(f"channel create returned no channel_id: {response}")
         return channel_id
 
-    def add_member(self, channel_id: str, pubkey: str) -> None:
+    def add_member(self, channel_id: str, pubkey: str, role: str = "member") -> None:
         self.run(
             "channels",
             "add-member",
@@ -90,7 +90,7 @@ class BuzzCli:
             "--pubkey",
             pubkey,
             "--role",
-            "member",
+            role,
         )
 
     def profiles(self, pubkeys: list[str]) -> list[dict[str, Any]]:
@@ -101,8 +101,11 @@ class BuzzCli:
         response = self.run(*args)
         return response if isinstance(response, list) else []
 
-    def set_profile(self, name: str) -> None:
-        self.run("users", "set-profile", "--name", name)
+    def set_profile(self, name: str, about: str | None = None) -> None:
+        args = ["users", "set-profile", "--name", name]
+        if about is not None:
+            args.extend(("--about", about))
+        self.run(*args)
 
     def archive_channel(self, channel_id: str) -> None:
         self.run("channels", "archive", "--channel", channel_id)
diff --git a/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/provisioner.py b/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/provisioner.py
index 11d0c88619..3b4f0d19d5 100644
--- a/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/provisioner.py
+++ b/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/provisioner.py
@@ -14,9 +14,10 @@ from harbor_buzz_orchestra.manifest import ExperimentManifest
 from harbor_buzz_orchestra.provisioning import (
     AgentCredential,
     DirectoryIdentity,
+    FixtureActor,
     TrialHandle,
 )
-from harbor_buzz_orchestra.task_fixtures import fixture_for
+from harbor_buzz_orchestra.task_fixtures import DirectoryEntry, fixture_for
 
 from .buzz_cli import BuzzCli
 from .keys import compute_auth_tag, generate_keypair, keypair_from_secret
@@ -170,6 +171,27 @@ class BuzzTrialProvisioner:
         for credential in credentials:
             cli.add_member(channel_id, credential.nostr_pubkey)
         directory = self._seed_directory(task_name, cli)
+        fixture = fixture_for(task_name)
+        directory_credentials = {
+            entry.stable_id: self._directory_credential(entry)
+            for entry in fixture.directory
+        }
+        for entry in fixture.directory:
+            if entry.channel_member:
+                cli.add_member(
+                    channel_id,
+                    directory_credentials[entry.stable_id].nostr_pubkey,
+                    "bot" if entry.role == "bot" else "member",
+                )
+        scripted_actor_ids = {
+            message.actor
+            for message in fixture.scripted_messages
+            if message.actor != "user"
+        }
+        fixture_actors = tuple(
+            FixtureActor(identity_id, directory_credentials[identity_id])
+            for identity_id in sorted(scripted_actor_ids)
+        )
         return TrialHandle(
             run_id=run_id,
             trial_id=trial_id,
@@ -181,6 +203,7 @@ class BuzzTrialProvisioner:
             user_relay_url=self._config.relay_http_url,
             task_name=task_name or "",
             directory=directory,
+            fixture_actors=fixture_actors,
         )
 
     def _seed_directory(
@@ -188,9 +211,7 @@ class BuzzTrialProvisioner:
     ) -> tuple[DirectoryIdentity, ...]:
         """Publish stable task-directory profiles, skipping those already seeded."""
         entries = fixture_for(task_name).directory
-        credentials = [
-            self._directory_credential(entry.name, entry.role) for entry in entries
-        ]
+        credentials = [self._directory_credential(entry) for entry in entries]
         if not credentials:
             return ()
         existing = {
@@ -200,21 +221,23 @@ class BuzzTrialProvisioner:
             )
             if isinstance(profile, dict)
         }
-        for credential in credentials:
-            if credential.nostr_pubkey not in existing:
-                self._cli_for(credential).set_profile(credential.agent_id)
+        for entry, credential in zip(entries, credentials, strict=True):
+            if credential.nostr_pubkey not in existing or entry.about is not None:
+                self._cli_for(credential).set_profile(entry.name, entry.about)
         return tuple(
             DirectoryIdentity(
-                name=credential.agent_id,
+                name=entry.name,
                 role=credential.role,
                 pubkey=credential.nostr_pubkey,
+                identity_id=entry.stable_id,
+                about=entry.about or "",
             )
-            for credential in credentials
+            for entry, credential in zip(entries, credentials, strict=True)
         )
 
-    def _directory_credential(self, name: str, role: str) -> AgentCredential:
+    def _directory_credential(self, entry: DirectoryEntry) -> AgentCredential:
         """Derive one community-stable benchmark identity without storing its key."""
-        return self._stable_credential(name, name, role)
+        return self._stable_credential(entry.stable_id, entry.name, entry.role)
 
     def _stable_credential(
         self, identity_id: str, display_name: str, role: str
@@ -342,6 +365,12 @@ class BuzzTrialProvisioner:
                 DirectoryIdentity(**identity)
                 for identity in stored.get("directory", [])
             ),
+            fixture_actors=tuple(
+                FixtureActor(
+                    actor["identity_id"], AgentCredential(**actor["credential"])
+                )
+                for actor in stored.get("fixture_actors", [])
+            ),
         )
 
     @staticmethod
diff --git a/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_unit.py b/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_unit.py
index 1f55526cf3..44edcf27e0 100644
--- a/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_unit.py
+++ b/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_unit.py
@@ -7,6 +7,7 @@ import json
 
 import coincurve
 import pytest
+from harbor_buzz_orchestra.task_fixtures import DirectoryEntry
 
 from harbor_buzz_testbed.provisioner import (
     BuzzTrialProvisioner,
@@ -112,9 +113,13 @@ def test_mint_credentials_missing_api_key_is_explicit(manifest):
 def test_directory_credentials_are_stable_distinct_and_attested():
     provisioner = BuzzTrialProvisioner(config())
 
-    first = provisioner._directory_credential("benchmark-user-01", "user")
-    again = provisioner._directory_credential("benchmark-user-01", "user")
-    other = provisioner._directory_credential("benchmark-bot-01", "bot")
+    first = provisioner._directory_credential(
+        DirectoryEntry("benchmark-user-01", "user")
+    )
+    again = provisioner._directory_credential(
+        DirectoryEntry("benchmark-user-01", "user")
+    )
+    other = provisioner._directory_credential(DirectoryEntry("benchmark-bot-01", "bot"))
 
     assert first.nostr_secret_key == again.nostr_secret_key
     assert first.nostr_pubkey == again.nostr_pubkey
@@ -133,8 +138,8 @@ def test_seed_directory_has_50_users_10_bots_and_skips_existing(monkeypatch):
     published = []
 
     class Publisher:
-        def set_profile(self, name):
-            published.append(name)
+        def set_profile(self, name, about=None):
+            published.append((name, about))
 
     monkeypatch.setattr(provisioner, "_cli_for", lambda _credential: Publisher())
 
@@ -144,7 +149,20 @@ def test_seed_directory_has_50_users_10_bots_and_skips_existing(monkeypatch):
     assert sum(identity.role == "user" for identity in directory) == 50
     assert sum(identity.role == "bot" for identity in directory) == 10
     assert len(published) == 59
-    assert directory[0].name not in published
+    assert (directory[0].name, None) not in published
+
+
+def test_duplicate_display_names_keep_distinct_stable_identities():
+    provisioner = BuzzTrialProvisioner(config())
+    first = provisioner._directory_credential(
+        DirectoryEntry("Taylor Morgan Lee", "user", identity_id="release")
+    )
+    second = provisioner._directory_credential(
+        DirectoryEntry("Taylor Morgan Lee", "user", identity_id="observer")
+    )
+
+    assert first.agent_id == second.agent_id == "Taylor Morgan Lee"
+    assert first.nostr_pubkey != second.nostr_pubkey
 
 
 def test_lock_key_is_deterministic_and_distinct():
diff --git a/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py b/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
index 4f91c974af..53bf268499 100644
--- a/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
+++ b/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
@@ -19,7 +19,11 @@ from harbor_buzz_orchestra.container_runtime import (
     RuntimeLaunchError,
 )
 from harbor_buzz_orchestra.manifest import ExperimentManifest
-from harbor_buzz_orchestra.provisioning import AgentCredential, TrialHandle
+from harbor_buzz_orchestra.provisioning import (
+    AgentCredential,
+    FixtureActor,
+    TrialHandle,
+)
 from harbor_buzz_orchestra.task_fixtures import fixture_for
 
 
@@ -453,6 +457,51 @@ async def test_send_mentions_by_pubkey_so_task_text_stays_inert(tmp_path, monkey
     assert calls[-1][-2:] == ("--content", "plain content")
 
 
+async def test_sends_task_declared_actor_messages_and_records_event_ids(
+    tmp_path, monkeypatch
+):
+    rt = runtime(tmp_path)
+    orch = credential("solo-1", "orchestrator", "orch-model")
+    reporters = tuple(
+        FixtureActor(name, credential(name, "bot", ""))
+        for name in ("Ledger Scout", "Risk Sentinel", "Ops Forecaster")
+    )
+    trial = replace(
+        trial_handle((orch,)),
+        task_name="interleaved-agent-reports",
+        fixture_actors=reporters,
+    )
+    calls = []
+
+    async def send(actor, trial_arg, content, **kwargs):
+        calls.append((actor.agent_id, trial_arg, content, kwargs))
+        return {"event_id": f"event-{len(calls)}"}
+
+    monkeypatch.setattr(rt, "_send", send)
+
+    events = await rt._send_scripted_messages(
+        trial=trial, orchestrator=orch, task_event_id="task-root"
+    )
+
+    assert [event["label"] for event in events] == [
+        "ledger-report",
+        "risk-report",
+        "operations-report",
+    ]
+    assert [event["event_id"] for event in events] == [
+        "event-1",
+        "event-2",
+        "event-3",
+    ]
+    assert {call[0] for call in calls} == {
+        "Ledger Scout",
+        "Risk Sentinel",
+        "Ops Forecaster",
+    }
+    assert all(call[3]["mention"] == orch.nostr_pubkey for call in calls)
+    assert all(call[3]["reply_to"] == "task-root" for call in calls)
+
+
 async def test_wait_for_done_requires_orchestrator_authorship(tmp_path, monkeypatch):
     rt = runtime(tmp_path, poll_seconds=0)
     orch = credential("orch-1", "orchestrator", "orch-model")
@@ -500,6 +549,46 @@ async def test_solo_turn_end_completes_without_done_message(tmp_path, monkeypatc
     assert await rt._wait_for_done(environment, orch, trial, [], solo=solo) is None
 
 
+async def test_scripted_events_wait_for_second_agent_message(tmp_path, monkeypatch):
+    from harbor_buzz_orchestra.container_runtime import _Agent
+
+    rt = runtime(tmp_path, poll_seconds=0)
+    orch = credential("orch-1", "orchestrator", "orch-model")
+    trial = trial_handle((orch,))
+    solo = _Agent(orch, 7, "stdout.log", "stderr.log")
+    message_rounds = iter(
+        [
+            [{"id": "alpha", "pubkey": orch.nostr_pubkey, "content": "ALPHA"}],
+            [{"id": "alpha", "pubkey": orch.nostr_pubkey, "content": "ALPHA"}],
+            [
+                {"id": "alpha", "pubkey": orch.nostr_pubkey, "content": "ALPHA"},
+                {"id": "beta", "pubkey": orch.nostr_pubkey, "content": "BETA"},
+            ],
+        ]
+    )
+    turn_rounds = iter([(1, 1), (2, 1), (2, 2)])
+
+    async def buzz_json(*args, **kwargs):
+        return next(message_rounds)
+
+    async def turn_counts(*args, **kwargs):
+        return next(turn_rounds)
+
+    monkeypatch.setattr(rt, "_buzz_json", buzz_json)
+    monkeypatch.setattr(rt, "_turn_counts", turn_counts)
+
+    result = await rt._wait_for_done(
+        Environment(),
+        orch,
+        trial,
+        [],
+        solo=solo,
+        minimum_agent_messages=2,
+    )
+
+    assert result["id"] == "beta"
+
+
 async def test_collect_evidence_uploads_verifier_artifact(tmp_path, monkeypatch):
     rt = runtime(tmp_path)
     orch = credential("orch-1", "orchestrator", "orch-model")
diff --git a/benchmarks/harbor-buzz-orchestra/tests/test_evidence.py b/benchmarks/harbor-buzz-orchestra/tests/test_evidence.py
index 3e67f43a3b..4cf436183a 100644
--- a/benchmarks/harbor-buzz-orchestra/tests/test_evidence.py
+++ b/benchmarks/harbor-buzz-orchestra/tests/test_evidence.py
@@ -124,6 +124,12 @@ def test_exports_only_public_directory_and_observed_channel_state():
 
     assert evidence["task_name"] == "create-channel-invite-users"
     assert evidence["directory"] == [
-        {"name": "benchmark-user-01", "role": "user", "pubkey": "d" * 64}
+        {
+            "identity_id": "benchmark-user-01",
+            "name": "benchmark-user-01",
+            "role": "user",
+            "pubkey": "d" * 64,
+            "about": "",
+        }
     ]
     assert evidence["observed_channels"] == channels
diff --git a/benchmarks/harbor-buzz-orchestra/tests/test_expanded_buzz_native_verifiers.py b/benchmarks/harbor-buzz-orchestra/tests/test_expanded_buzz_native_verifiers.py
new file mode 100644
index 0000000000..225cb1d1fa
--- /dev/null
+++ b/benchmarks/harbor-buzz-orchestra/tests/test_expanded_buzz_native_verifiers.py
@@ -0,0 +1,238 @@
+"""Positive and adversarial fixtures for the expanded Buzz-native tasks."""
+
+from __future__ import annotations
+
+import importlib.util
+from pathlib import Path
+from types import ModuleType
+
+DATASET_ROOT = Path(__file__).resolve().parents[2] / "buzz-dataset"
+AGENT = "a" * 64
+USER = "u" * 64
+CHANNEL = "channel"
+ROOT = "root"
+
+
+def _verifier(task: str) -> ModuleType:
+    path = DATASET_ROOT / task / "tests" / "verify.py"
+    spec = importlib.util.spec_from_file_location(f"{task}_verifier", path)
+    module = importlib.util.module_from_spec(spec)
+    assert spec.loader is not None
+    spec.loader.exec_module(module)
+    return module
+
+
+def _message(
+    message_id: str,
+    content: str,
+    *,
+    reply_to: str | None = ROOT,
+    mentions: list[str] | None = None,
+    pubkey: str = AGENT,
+) -> dict:
+    tags = [["h", CHANNEL]]
+    if reply_to is not None:
+        tags.append(["e", reply_to, "", "reply"])
+    tags.extend(["p", value] for value in (mentions or []))
+    return {
+        "id": message_id,
+        "pubkey": pubkey,
+        "content": content,
+        "tags": tags,
+        "channel_id": CHANNEL,
+        "reply_to_event_id": reply_to,
+        "mentioned_pubkeys": mentions or [],
+    }
+
+
+def _base(task: str, user_name: str) -> dict:
+    return {
+        "schema_version": 1,
+        "task_name": task,
+        "task_event_id": ROOT,
+        "truncated": False,
+        "trial": {"channel_id": CHANNEL},
+        "identities": {
+            "solo-1": {"role": "orchestrator", "pubkey": AGENT},
+            user_name: {"role": "user", "pubkey": USER},
+        },
+        "directory": [],
+        "scripted_events": [],
+        "messages": [],
+    }
+
+
+def test_multiline_message_preserves_layout_and_rejects_literal_escapes():
+    verifier = _verifier("multiline-message")
+    evidence = _base("multiline-message", "Eleanor June Brooks")
+    evidence["messages"] = [_message("answer", verifier.EXPECTED, mentions=[USER])]
+
+    metrics, _ = verifier.score_evidence(evidence)
+    assert all(value == 1.0 for value in metrics.values())
+
+    evidence["messages"][0]["content"] = verifier.EXPECTED.replace("\n", "\\n")
+    metrics, _ = verifier.score_evidence(evidence)
+    assert metrics["real_newlines"] == 0.0
+    assert metrics["reward"] == 0.0
+
+
+def test_narrative_agent_names_do_not_wake_bots():
+    verifier = _verifier("narrative-agent-names")
+    evidence = _base("narrative-agent-names", "Maya Elise Chen")
+    bot_a, bot_b = "b" * 64, "c" * 64
+    evidence["directory"] = [
+        {"name": "Aurora Audit Bot", "role": "bot", "pubkey": bot_a},
+        {"name": "Beacon Deploy Bot", "role": "bot", "pubkey": bot_b},
+    ]
+    content = "Aurora Audit Bot completed the audit.\nBeacon Deploy Bot remains idle."
+    evidence["messages"] = [_message("answer", content, mentions=[USER])]
+
+    metrics, _ = verifier.score_evidence(evidence)
+    assert all(value == 1.0 for value in metrics.values())
+
+    evidence["messages"][0]["mentioned_pubkeys"].append(bot_a)
+    metrics, _ = verifier.score_evidence(evidence)
+    assert metrics["bots_not_mentioned"] == 0.0
+
+    evidence["messages"] = [
+        _message("bad-wake", "@Aurora Audit Bot please check", mentions=[bot_a]),
+        _message("answer", content, mentions=[USER]),
+    ]
+    metrics, _ = verifier.score_evidence(evidence)
+    assert metrics["bots_not_mentioned"] == 0.0
+    assert metrics["reward"] == 0.0
+
+    evidence["messages"] = [
+        _message(
+            "answer",
+            "Aurora Audit Bot remains idle.\nBeacon Deploy Bot completed the audit.",
+            mentions=[USER],
+        )
+    ]
+    metrics, _ = verifier.score_evidence(evidence)
+    assert metrics["status_correct"] == 0.0
+
+
+def test_interleaved_reports_require_all_inputs_and_one_callback():
+    verifier = _verifier("interleaved-agent-reports")
+    evidence = _base("interleaved-agent-reports", "Nora Isabel Grant")
+    reporters = [
+        ("Ledger Scout", "b" * 64),
+        ("Risk Sentinel", "c" * 64),
+        ("Ops Forecaster", "d" * 64),
+    ]
+    evidence["directory"] = [
+        {"name": name, "role": "bot", "pubkey": pubkey} for name, pubkey in reporters
+    ]
+    labels = ("ledger-report", "risk-report", "operations-report")
+    evidence["scripted_events"] = [
+        {"label": label, "event_id": f"report-{index}"}
+        for index, label in enumerate(labels, start=1)
+    ]
+    evidence["messages"] = [
+        _message(f"report-{index}", label, pubkey=reporters[index - 1][1])
+        for index, label in enumerate(labels, start=1)
+    ] + [
+        _message(
+            "answer",
+            (
+                "- **North:** 17\n- **South:** 23\n- **reserve:** 11\n"
+                "- **multiplier:** 3\n\n(17 + 23 − 11) × 3 = **87**"
+            ),
+            mentions=[USER],
+        )
+    ]
+
+    metrics, _ = verifier.score_evidence(evidence)
+    assert all(value == 1.0 for value in metrics.values())
+
+    evidence["messages"][-1]["content"] = "North 17; final forecast 87."
+    metrics, _ = verifier.score_evidence(evidence)
+    assert metrics["inputs_complete"] == 0.0
+
+    evidence["messages"][-1]["content"] = (
+        "North 17; South 23; reserve 11; multiplier 3; final forecast 87."
+    )
+    evidence["messages"].insert(
+        -1,
+        _message("bad-wake", "@Ledger Scout thanks", mentions=[reporters[0][1]]),
+    )
+    metrics, _ = verifier.score_evidence(evidence)
+    assert metrics["reporters_not_rementioned"] == 0.0
+    assert metrics["reward"] == 0.0
+
+
+def test_cross_thread_requests_require_two_isolated_replies():
+    verifier = _verifier("cross-thread-requests")
+    evidence = _base("cross-thread-requests", "Priya Simone Patel")
+    evidence["scripted_events"] = [{"label": "beta-request", "event_id": "beta-root"}]
+    evidence["messages"] = [
+        _message("alpha-answer", "ALPHA result: 346", mentions=[USER]),
+        _message(
+            "beta-answer",
+            "BETA result: 41",
+            reply_to="beta-root",
+            mentions=[USER],
+        ),
+    ]
+
+    metrics, _ = verifier.score_evidence(evidence)
+    assert all(value == 1.0 for value in metrics.values())
+
+    evidence["messages"] = [
+        _message(
+            "combined", "ALPHA 346; BETA 41", reply_to="beta-root", mentions=[USER]
+        )
+    ]
+    metrics, _ = verifier.score_evidence(evidence)
+    assert metrics["thread_isolation"] == 0.0
+    assert metrics["reward"] == 0.0
+
+    evidence["messages"] = [
+        _message("alpha-answer", "ALPHA result: 346", mentions=[USER]),
+        _message("extra", "Both requests handled", mentions=[USER]),
+        _message(
+            "beta-answer",
+            "BETA result: 41",
+            reply_to="beta-root",
+            mentions=[USER],
+        ),
+    ]
+    metrics, _ = verifier.score_evidence(evidence)
+    assert metrics["thread_isolation"] == 0.0
+
+
+def test_ambiguous_user_mention_targets_only_profile_match():
+    verifier = _verifier("ambiguous-user-mention")
+    evidence = _base("ambiguous-user-mention", "Olivia Grace Park")
+    target, other = "b" * 64, "c" * 64
+    evidence["directory"] = [
+        {
+            "identity_id": "taylor-release-captain",
+            "name": "Taylor Morgan Lee",
+            "role": "user",
+            "pubkey": target,
+        },
+        {
+            "identity_id": "taylor-observer",
+            "name": "Taylor Morgan Lee",
+            "role": "user",
+            "pubkey": other,
+        },
+    ]
+    evidence["messages"] = [
+        _message(
+            "delivery", "@Taylor Morgan Lee ORCHID-72 approved", mentions=[target]
+        ),
+        _message(
+            "callback", "Sent to the matching Taylor Morgan Lee.", mentions=[USER]
+        ),
+    ]
+
+    metrics, _ = verifier.score_evidence(evidence)
+    assert all(value == 1.0 for value in metrics.values())
+
+    evidence["messages"][0]["mentioned_pubkeys"].append(other)
+    metrics, _ = verifier.score_evidence(evidence)
+    assert metrics["other_not_notified"] == 0.0
+    assert metrics["reward"] == 0.0

From aea0ef8df9fc24d9aa8bf5c761ab2910026a601b Mon Sep 17 00:00:00 2001
From: Wes <wesbillman@users.noreply.github.com>
Date: Fri, 21 Aug 2026 10:05:45 -0600
Subject: [PATCH 15/38] fix(desktop): simplify duplicate agent provenance
 (#6401)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

- leave the local same-name agent row unlabelled because locality is
implied
- mark only the remote identity with a compact cloud badge reading
`Other setup` in mention autocomplete and Channel members
- suppress the redundant `managed by you` text for duplicate owned
agents while retaining distinct short npubs and exact-pubkey routing

## Testing

- Desktop E2E build/typecheck: `pnpm build:e2e`
- focused Playwright smoke test: `duplicate owned agents preserve
provenance and exact pubkey selection` (1 passed)
  - visible provenance in autocomplete and Channel members
  - local identity remains unmarked
  - keyboard selection routes each exact pubkey
  - narrow 760×640 viewport containment
- focused Biome check on the changed marker and E2E files
- `pnpm check:px-text`
- `pnpm check:pubkey-truncation`
- `just file-size-check`
- `git diff --check`

---------

Signed-off-by: Wes <wesbillman@users.noreply.github.com>
Co-authored-by: Carl <32a2e2c9d428ee08902cab75d956da2c1d235a22d4766b0dd4138bf6e2e5db1d@buzz.block.builderlab.xyz>
---
 .../agents/lib/otherSetupAgent.test.mjs       |  35 ++++++
 .../features/agents/lib/otherSetupAgent.ts    |  39 ++++++
 .../agents/ui/OtherSetupAgentMarker.tsx       |  30 +++++
 .../channels/ui/AddMemberSearchResultRow.tsx  |  92 ++++++++++++++
 .../features/channels/ui/MembersSidebar.tsx   | 113 ++++--------------
 .../channels/ui/MembersSidebarMemberCard.tsx  |  36 ++++--
 .../lib/flushMentionDebounce.test.mjs         |   4 +
 .../messages/lib/flushMentionDebounce.ts      |   2 +
 .../lib/mentionSuggestionMapping.test.mjs     |  11 +-
 .../messages/lib/mentionSuggestionMapping.ts  |   4 +-
 .../src/features/messages/lib/useMentions.ts  |   4 +
 .../messages/ui/MentionAutocomplete.test.mjs  |  26 ++--
 .../messages/ui/MentionAutocomplete.tsx       |  44 ++++---
 desktop/tests/e2e/mentions.spec.ts            |  97 +++++++++++++--
 14 files changed, 398 insertions(+), 139 deletions(-)
 create mode 100644 desktop/src/features/agents/lib/otherSetupAgent.test.mjs
 create mode 100644 desktop/src/features/agents/lib/otherSetupAgent.ts
 create mode 100644 desktop/src/features/agents/ui/OtherSetupAgentMarker.tsx
 create mode 100644 desktop/src/features/channels/ui/AddMemberSearchResultRow.tsx

diff --git a/desktop/src/features/agents/lib/otherSetupAgent.test.mjs b/desktop/src/features/agents/lib/otherSetupAgent.test.mjs
new file mode 100644
index 0000000000..f57c7f8154
--- /dev/null
+++ b/desktop/src/features/agents/lib/otherSetupAgent.test.mjs
@@ -0,0 +1,35 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { isOtherSetupAgent } from "./otherSetupAgent.ts";
+
+const OWNER = "a".repeat(64);
+const AGENT = "b".repeat(64);
+
+test("fails closed while the local managed directory is unresolved", () => {
+  assert.equal(
+    isOtherSetupAgent({
+      agentDirectoriesReady: false,
+      currentPubkey: OWNER,
+      managedAgents: [],
+      profileOwnerPubkey: OWNER,
+      pubkey: AGENT,
+      relayAgents: [],
+    }),
+    false,
+  );
+});
+
+test("labels a viewer-owned non-local identity as another setup", () => {
+  assert.equal(
+    isOtherSetupAgent({
+      agentDirectoriesReady: true,
+      currentPubkey: OWNER,
+      managedAgents: [],
+      profileOwnerPubkey: OWNER,
+      pubkey: AGENT,
+      relayAgents: [],
+    }),
+    true,
+  );
+});
diff --git a/desktop/src/features/agents/lib/otherSetupAgent.ts b/desktop/src/features/agents/lib/otherSetupAgent.ts
new file mode 100644
index 0000000000..63438a983f
--- /dev/null
+++ b/desktop/src/features/agents/lib/otherSetupAgent.ts
@@ -0,0 +1,39 @@
+import type { ManagedAgent, RelayAgent } from "@/shared/api/types";
+import { normalizePubkey } from "@/shared/lib/pubkey";
+
+export function isOtherSetupAgent({
+  agentDirectoriesReady,
+  currentPubkey,
+  managedAgents,
+  profileOwnerPubkey,
+  pubkey,
+  relayAgents,
+}: {
+  agentDirectoriesReady: boolean;
+  currentPubkey?: string;
+  managedAgents: readonly ManagedAgent[];
+  profileOwnerPubkey?: string | null;
+  pubkey: string;
+  relayAgents: readonly RelayAgent[];
+}): boolean {
+  if (!agentDirectoriesReady || !currentPubkey) return false;
+
+  const normalizedPubkey = normalizePubkey(pubkey);
+  if (
+    managedAgents.some(
+      (agent) => normalizePubkey(agent.pubkey) === normalizedPubkey,
+    )
+  ) {
+    return false;
+  }
+
+  const relayOwnerPubkey = relayAgents.find(
+    (agent) => normalizePubkey(agent.pubkey) === normalizedPubkey,
+  )?.ownerPubkey;
+  const ownerPubkey = profileOwnerPubkey ?? relayOwnerPubkey;
+
+  return Boolean(
+    ownerPubkey &&
+      normalizePubkey(ownerPubkey) === normalizePubkey(currentPubkey),
+  );
+}
diff --git a/desktop/src/features/agents/ui/OtherSetupAgentMarker.tsx b/desktop/src/features/agents/ui/OtherSetupAgentMarker.tsx
new file mode 100644
index 0000000000..e653943469
--- /dev/null
+++ b/desktop/src/features/agents/ui/OtherSetupAgentMarker.tsx
@@ -0,0 +1,30 @@
+import { Cloud } from "lucide-react";
+
+import { cn } from "@/shared/lib/cn";
+import { Badge } from "@/shared/ui/badge";
+
+const OTHER_SETUP_LABEL = "From another Buzz setup";
+
+export function OtherSetupAgentMarker({
+  className,
+  testId,
+}: {
+  className?: string;
+  testId?: string;
+}) {
+  return (
+    <Badge
+      aria-label={OTHER_SETUP_LABEL}
+      className={cn(
+        "gap-1 px-1.5 py-0.5 font-medium normal-case tracking-normal",
+        className,
+      )}
+      data-testid={testId}
+      title={OTHER_SETUP_LABEL}
+      variant="secondary"
+    >
+      <Cloud aria-hidden="true" className="h-3 w-3" />
+      Other setup
+    </Badge>
+  );
+}
diff --git a/desktop/src/features/channels/ui/AddMemberSearchResultRow.tsx b/desktop/src/features/channels/ui/AddMemberSearchResultRow.tsx
new file mode 100644
index 0000000000..4990168b2f
--- /dev/null
+++ b/desktop/src/features/channels/ui/AddMemberSearchResultRow.tsx
@@ -0,0 +1,92 @@
+import { Bot } from "lucide-react";
+import type { UserSearchResult } from "@/shared/api/types";
+import { Button } from "@/shared/ui/button";
+import { cn } from "@/shared/lib/cn";
+import { truncatePubkey } from "@/shared/lib/pubkey";
+import { UserAvatar } from "@/shared/ui/UserAvatar";
+
+const MEMBER_ROW_INSET_DIVIDER_CLASS =
+  "after:pointer-events-none after:absolute after:bottom-0 after:left-[3.75rem] after:right-0 after:h-px after:bg-border/60 after:content-[''] last:after:hidden";
+
+export function formatAddCandidateName(user: UserSearchResult) {
+  return (
+    user.displayName?.trim() ||
+    user.nip05Handle?.trim() ||
+    truncatePubkey(user.pubkey)
+  );
+}
+
+export function AddMemberSearchResultRow({
+  disabled,
+  onSelect,
+  ownerLabel,
+  user,
+}: {
+  disabled: boolean;
+  onSelect: (user: UserSearchResult) => void;
+  ownerLabel?: string | null;
+  user: UserSearchResult;
+}) {
+  return (
+    <div
+      className={cn(
+        "group/add-result relative isolate flex min-h-14 w-full items-center gap-3 px-4 py-3.5 text-left transition-colors duration-150 ease-out hover:bg-muted/40 focus-within:bg-muted/40",
+        MEMBER_ROW_INSET_DIVIDER_CLASS,
+      )}
+      data-testid={`channel-user-search-result-${user.pubkey}`}
+    >
+      <button
+        aria-label={`Select ${formatAddCandidateName(user)}`}
+        className="absolute inset-0 z-0 cursor-pointer focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring"
+        disabled={disabled}
+        onClick={() => onSelect(user)}
+        type="button"
+      />
+      <UserAvatar
+        avatarUrl={user.avatarUrl}
+        className="pointer-events-none relative z-10 h-8 w-8 text-xs shadow-none"
+        displayName={formatAddCandidateName(user)}
+        size="sm"
+      />
+      <div className="pointer-events-none relative z-10 min-w-0 flex-1">
+        {user.isAgent ? (
+          <div className="min-w-0">
+            <div className="flex min-w-0 items-center gap-2">
+              <span className="truncate text-sm font-medium tracking-tight">
+                {formatAddCandidateName(user)}
+              </span>
+              <span className="inline-flex shrink-0 items-center gap-1 text-xs text-muted-foreground">
+                <Bot aria-hidden="true" className="h-4 w-4" />
+                agent
+              </span>
+            </div>
+            <span className="block truncate font-mono text-2xs text-muted-foreground">
+              {truncatePubkey(user.pubkey)}
+            </span>
+            {ownerLabel ? (
+              <span className="block truncate text-xs text-muted-foreground">
+                managed by {ownerLabel}
+              </span>
+            ) : null}
+          </div>
+        ) : (
+          <span className="block truncate text-sm font-medium tracking-tight">
+            {formatAddCandidateName(user)}
+          </span>
+        )}
+      </div>
+      <Button
+        className="relative z-20 shrink-0"
+        disabled={disabled}
+        onClick={(event) => {
+          event.stopPropagation();
+          onSelect(user);
+        }}
+        size="sm"
+        type="button"
+      >
+        Add
+      </Button>
+    </div>
+  );
+}
diff --git a/desktop/src/features/channels/ui/MembersSidebar.tsx b/desktop/src/features/channels/ui/MembersSidebar.tsx
index 9ec3151bb0..70c7bf10a8 100644
--- a/desktop/src/features/channels/ui/MembersSidebar.tsx
+++ b/desktop/src/features/channels/ui/MembersSidebar.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { Bot, UserRoundPlus, X } from "lucide-react";
+import { UserRoundPlus, X } from "lucide-react";
 import {
   invalidateChannelState,
   useAddChannelMembersMutation,
@@ -14,6 +14,7 @@ import {
   getSharedChannelIds,
   isAgentIdentityInAllowedList,
 } from "@/features/agents/lib/agentAutocompleteEligibility";
+import { isOtherSetupAgent } from "@/features/agents/lib/otherSetupAgent";
 import { useIsArchivedPredicate } from "@/features/identity-archive/hooks";
 import { useClassifiedMembers } from "@/features/channels/lib/useClassifiedMembers";
 import { formatMemberName } from "@/features/channels/lib/memberUtils";
@@ -40,7 +41,6 @@ import type {
   ManagedAgent,
   UserSearchResult,
 } from "@/shared/api/types";
-import { Button } from "@/shared/ui/button";
 import {
   Dialog,
   DialogClose,
@@ -50,13 +50,15 @@ import {
 } from "@/shared/ui/dialog";
 import { useProfilePanel } from "@/shared/context/ProfilePanelContext";
 import { useFeedbackToasts } from "@/shared/hooks/useToastEffect";
-import { cn } from "@/shared/lib/cn";
 import { normalizePubkey, truncatePubkey } from "@/shared/lib/pubkey";
-import { UserAvatar } from "@/shared/ui/UserAvatar";
 import {
   MODAL_SEARCH_INPUT_CLASS,
   MODAL_SEARCH_SHELL_CLASS,
 } from "@/shared/ui/modalSearchStyles";
+import {
+  AddMemberSearchResultRow,
+  formatAddCandidateName,
+} from "./AddMemberSearchResultRow";
 import { MembersSidebarMemberCard } from "./MembersSidebarMemberCard";
 import { useManagedAgentRuntimesQuery } from "@/features/agents/managedAgentRuntimeHooks";
 import {
@@ -68,16 +70,6 @@ import { useMembersSidebarActions } from "./useMembersSidebarActions";
 import { useMembersSidebarModeration } from "./useMembersSidebarModeration";
 const MEMBER_ADD_RESULT_LIMIT = 50;
 const MEMBER_SEARCH_MIN_QUERY_LENGTH = 2;
-const MEMBER_ROW_INSET_DIVIDER_CLASS =
-  "after:pointer-events-none after:absolute after:bottom-0 after:left-[3.75rem] after:right-0 after:h-px after:bg-border/60 after:content-[''] last:after:hidden";
-
-function formatAddCandidateName(user: UserSearchResult) {
-  return (
-    user.displayName?.trim() ||
-    user.nip05Handle?.trim() ||
-    truncatePubkey(user.pubkey)
-  );
-}
 type AddMemberSearchCandidate = UserSearchResult & {
   isManagedAgent?: boolean;
   isMember?: boolean;
@@ -193,6 +185,13 @@ export function MembersSidebar({
     managedAgentsQuery,
     relayAgentsQuery,
   } = useClassifiedMembers(rawMembers, currentPubkey);
+  const agentDirectoriesReady =
+    managedAgentsQuery.data !== undefined &&
+    managedAgentsQuery.error === null &&
+    !managedAgentsQuery.isFetching &&
+    relayAgentsQuery.data !== undefined &&
+    relayAgentsQuery.error === null &&
+    !relayAgentsQuery.isFetching;
   const activeMembers = React.useMemo(
     () =>
       [...people, ...bots].sort((left, right) =>
@@ -611,6 +610,16 @@ export function MembersSidebar({
     const managedAgent = memberIsBot
       ? managedAgentByPubkey.get(normalizePubkey(member.pubkey))
       : undefined;
+    const showOtherSetupMarker =
+      memberIsBot &&
+      isOtherSetupAgent({
+        agentDirectoriesReady,
+        currentPubkey,
+        managedAgents: managedAgentsQuery.data ?? [],
+        profileOwnerPubkey: memberProfile?.ownerPubkey,
+        pubkey: member.pubkey,
+        relayAgents: relayAgentsQuery.data ?? [],
+      });
     const managedAgentRuntime =
       memberIsBot && relayUrl
         ? findManagedAgentRuntime(
@@ -675,6 +684,7 @@ export function MembersSidebar({
             memberPresenceQuery.data?.[member.pubkey.toLowerCase()] ?? null
           }
           profileAvatarUrl={memberProfile?.avatarUrl ?? null}
+          showOtherSetupMarker={showOtherSetupMarker}
           viewerIsOwner={viewerIsOwner}
         />
       </div>
@@ -913,78 +923,3 @@ function SearchResultSectionTitle({
     </div>
   );
 }
-
-function AddMemberSearchResultRow({
-  disabled,
-  onSelect,
-  ownerLabel,
-  user,
-}: {
-  disabled: boolean;
-  onSelect: (user: UserSearchResult) => void;
-  ownerLabel?: string | null;
-  user: UserSearchResult;
-}) {
-  return (
-    <div
-      className={cn(
-        "group/add-result relative isolate flex min-h-14 w-full items-center gap-3 px-4 py-3.5 text-left transition-colors duration-150 ease-out hover:bg-muted/40 focus-within:bg-muted/40",
-        MEMBER_ROW_INSET_DIVIDER_CLASS,
-      )}
-      data-testid={`channel-user-search-result-${user.pubkey}`}
-    >
-      <button
-        aria-label={`Select ${formatAddCandidateName(user)}`}
-        className="absolute inset-0 z-0 cursor-pointer focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring"
-        disabled={disabled}
-        onClick={() => onSelect(user)}
-        type="button"
-      />
-      <UserAvatar
-        avatarUrl={user.avatarUrl}
-        className="pointer-events-none relative z-10 h-8 w-8 text-xs shadow-none"
-        displayName={formatAddCandidateName(user)}
-        size="sm"
-      />
-      <div className="pointer-events-none relative z-10 min-w-0 flex-1">
-        {user.isAgent ? (
-          <div className="min-w-0">
-            <div className="flex min-w-0 items-center gap-2">
-              <span className="truncate text-sm font-medium tracking-tight">
-                {formatAddCandidateName(user)}
-              </span>
-              <span className="inline-flex shrink-0 items-center gap-1 text-xs text-muted-foreground">
-                <Bot aria-hidden="true" className="h-4 w-4" />
-                agent
-              </span>
-            </div>
-            <span className="block truncate font-mono text-2xs text-muted-foreground">
-              {truncatePubkey(user.pubkey)}
-            </span>
-            {ownerLabel ? (
-              <span className="block truncate text-xs text-muted-foreground">
-                managed by {ownerLabel}
-              </span>
-            ) : null}
-          </div>
-        ) : (
-          <span className="block truncate text-sm font-medium tracking-tight">
-            {formatAddCandidateName(user)}
-          </span>
-        )}
-      </div>
-      <Button
-        className="relative z-20 shrink-0"
-        disabled={disabled}
-        onClick={(event) => {
-          event.stopPropagation();
-          onSelect(user);
-        }}
-        size="sm"
-        type="button"
-      >
-        Add
-      </Button>
-    </div>
-  );
-}
diff --git a/desktop/src/features/channels/ui/MembersSidebarMemberCard.tsx b/desktop/src/features/channels/ui/MembersSidebarMemberCard.tsx
index 0257e52ebf..76750490cd 100644
--- a/desktop/src/features/channels/ui/MembersSidebarMemberCard.tsx
+++ b/desktop/src/features/channels/ui/MembersSidebarMemberCard.tsx
@@ -18,6 +18,7 @@ import {
   getManagedAgentPrimaryActionLabel,
   isManagedAgentActive,
 } from "@/features/agents/lib/managedAgentControlActions";
+import { OtherSetupAgentMarker } from "@/features/agents/ui/OtherSetupAgentMarker";
 import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
 import { PresenceDot } from "@/features/presence/ui/PresenceBadge";
 import {
@@ -73,6 +74,7 @@ type MembersSidebarMemberCardProps = {
   onViewActivity?: (pubkey: string) => void;
   presenceStatus?: PresenceStatus | null;
   profileAvatarUrl?: string | null;
+  showOtherSetupMarker?: boolean;
   viewerIsOwner: boolean;
 };
 
@@ -141,6 +143,7 @@ export function MembersSidebarMemberCard({
   onViewActivity,
   presenceStatus,
   profileAvatarUrl,
+  showOtherSetupMarker = false,
   viewerIsOwner,
 }: MembersSidebarMemberCardProps) {
   const roleLabel = formatRoleLabel(member, memberIsBot);
@@ -177,21 +180,28 @@ export function MembersSidebarMemberCard({
       </div>
       <div className="min-w-0 flex-1">
         {memberIsBot ? (
-          <div className="relative min-w-0">
-            <div className="flex min-w-0 items-center gap-2 transition-opacity duration-150 ease-out group-hover/member:opacity-0 group-focus-within/member:opacity-0">
-              <span className="truncate text-sm font-medium tracking-tight">
-                {memberLabel}
-              </span>
-              <span className="inline-flex shrink-0 items-center gap-1 text-xs text-muted-foreground">
-                <Bot aria-hidden="true" className="h-4 w-4" />
-                {roleLabel}
+          <div className="flex min-w-0 items-center gap-2">
+            <div className="relative min-w-0 flex-1">
+              <div className="flex min-w-0 items-center gap-2 transition-opacity duration-150 ease-out group-hover/member:opacity-0 group-focus-within/member:opacity-0">
+                <span className="truncate text-sm font-medium tracking-tight">
+                  {memberLabel}
+                </span>
+                <span className="inline-flex shrink-0 items-center gap-1 text-xs text-muted-foreground">
+                  <Bot aria-hidden="true" className="h-4 w-4" />
+                  {roleLabel}
+                </span>
+              </div>
+              <span className="absolute inset-0 flex items-center opacity-0 transition-opacity duration-150 ease-out group-hover/member:opacity-100 group-focus-within/member:opacity-100">
+                <span className="truncate font-mono text-sm text-muted-foreground">
+                  {truncatePubkey(member.pubkey)}
+                </span>
               </span>
             </div>
-            <span className="absolute inset-0 flex items-center opacity-0 transition-opacity duration-150 ease-out group-hover/member:opacity-100 group-focus-within/member:opacity-100">
-              <span className="truncate font-mono text-sm text-muted-foreground">
-                {truncatePubkey(member.pubkey)}
-              </span>
-            </span>
+            {showOtherSetupMarker ? (
+              <OtherSetupAgentMarker
+                testId={`sidebar-member-agent-provenance-${member.pubkey}`}
+              />
+            ) : null}
           </div>
         ) : (
           <div className="flex min-w-0 items-center gap-2">
diff --git a/desktop/src/features/messages/lib/flushMentionDebounce.test.mjs b/desktop/src/features/messages/lib/flushMentionDebounce.test.mjs
index 4dfd9d9927..0e5ef81d05 100644
--- a/desktop/src/features/messages/lib/flushMentionDebounce.test.mjs
+++ b/desktop/src/features/messages/lib/flushMentionDebounce.test.mjs
@@ -31,6 +31,7 @@ test("flushMentionDebounce returns the fresh suggestion with its fresh start ind
       candidate({ displayName: "Beta", pubkey: "b".repeat(64) }),
     ],
     activePersonaIds: new Set(),
+    agentProvenanceReady: true,
     channelType: "group",
   });
 
@@ -48,6 +49,7 @@ test("flushMentionDebounce returns no-match for a fresh query with no matches",
     searchableNamesLowerRef: ref(["alpha", "beta"]),
     candidates: [candidate()],
     activePersonaIds: new Set(),
+    agentProvenanceReady: true,
     channelType: "group",
   });
 
@@ -62,6 +64,7 @@ test("flushMentionDebounce returns null for an empty fresh query", () => {
     searchableNamesLowerRef: ref(["alpha", "beta"]),
     candidates: [candidate()],
     activePersonaIds: new Set(),
+    agentProvenanceReady: true,
     channelType: "group",
   });
 
@@ -99,6 +102,7 @@ test("flushMentionDebounce preserves a team expansion selected with Enter", () =
       }),
     ],
     activePersonaIds: new Set(),
+    agentProvenanceReady: true,
     channelType: "group",
   });
 
diff --git a/desktop/src/features/messages/lib/flushMentionDebounce.ts b/desktop/src/features/messages/lib/flushMentionDebounce.ts
index fc343e4d8f..c7f3bd520b 100644
--- a/desktop/src/features/messages/lib/flushMentionDebounce.ts
+++ b/desktop/src/features/messages/lib/flushMentionDebounce.ts
@@ -37,6 +37,7 @@ export function flushMentionDebounce<T extends MentionCandidateWithUI>(opts: {
   searchableNamesLowerRef: React.RefObject<string[]>;
   candidates: readonly T[];
   activePersonaIds: ReadonlySet<string>;
+  agentProvenanceReady: boolean;
   channelType?: ChannelType | null;
   currentPubkey?: string | null;
   ownerProfiles?: UserProfileLookup;
@@ -72,6 +73,7 @@ export function flushMentionDebounce<T extends MentionCandidateWithUI>(opts: {
   return {
     type: "match",
     suggestion: mapMentionCandidateToSuggestion({
+      agentProvenanceReady: opts.agentProvenanceReady,
       candidate,
       label,
       channelType: opts.channelType,
diff --git a/desktop/src/features/messages/lib/mentionSuggestionMapping.test.mjs b/desktop/src/features/messages/lib/mentionSuggestionMapping.test.mjs
index 624ae0c622..599b59a811 100644
--- a/desktop/src/features/messages/lib/mentionSuggestionMapping.test.mjs
+++ b/desktop/src/features/messages/lib/mentionSuggestionMapping.test.mjs
@@ -16,8 +16,9 @@ function candidate(overrides = {}) {
   };
 }
 
-function suggestion(overrides = {}) {
+function suggestion(overrides = {}, agentProvenanceReady = true) {
   return mapMentionCandidateToSuggestion({
+    agentProvenanceReady,
     candidate: candidate(overrides),
     currentPubkey: OWNER,
     label: "Carl",
@@ -35,6 +36,14 @@ test("labels same-owner relay agent identities as managed elsewhere", () => {
   assert.equal(suggestion().agentProvenance, "managed-elsewhere");
 });
 
+test("fails closed while the managed-agent directory is unresolved", () => {
+  assert.equal(
+    suggestion({ isManagedAgent: true }, false).agentProvenance,
+    undefined,
+  );
+  assert.equal(suggestion({}, false).agentProvenance, undefined);
+});
+
 test("does not attribute another owner's agent to a device", () => {
   assert.equal(
     suggestion({ ownerPubkey: "c".repeat(64) }).agentProvenance,
diff --git a/desktop/src/features/messages/lib/mentionSuggestionMapping.ts b/desktop/src/features/messages/lib/mentionSuggestionMapping.ts
index 08ee77ea23..9be4f2c4a5 100644
--- a/desktop/src/features/messages/lib/mentionSuggestionMapping.ts
+++ b/desktop/src/features/messages/lib/mentionSuggestionMapping.ts
@@ -24,10 +24,12 @@ export function mapMentionCandidateToSuggestion(opts: {
   label: string;
   channelType?: ChannelType | null;
   currentPubkey?: string | null;
+  agentProvenanceReady: boolean;
   ownerProfiles?: UserProfileLookup;
   profiles?: UserProfileLookup;
 }): MentionSuggestion {
   const {
+    agentProvenanceReady,
     candidate,
     channelType,
     currentPubkey,
@@ -54,7 +56,7 @@ export function mapMentionCandidateToSuggestion(opts: {
       null,
     isAgent: candidate.isAgent,
     agentProvenance:
-      candidate.kind === "identity" && candidate.isAgent
+      agentProvenanceReady && candidate.kind === "identity" && candidate.isAgent
         ? candidate.isManagedAgent
           ? "managed-here"
           : candidate.ownerPubkey &&
diff --git a/desktop/src/features/messages/lib/useMentions.ts b/desktop/src/features/messages/lib/useMentions.ts
index bf145713d5..af60534606 100644
--- a/desktop/src/features/messages/lib/useMentions.ts
+++ b/desktop/src/features/messages/lib/useMentions.ts
@@ -526,6 +526,7 @@ export function useMentions(
       .slice(0, MENTION_SUGGESTION_LIMIT)
       .map(({ candidate, label }) =>
         mapMentionCandidateToSuggestion({
+          agentProvenanceReady: agentDirectoriesReady,
           candidate,
           label,
           channelType: options?.channelType,
@@ -536,6 +537,7 @@ export function useMentions(
       );
   }, [
     activePersonaIds,
+    agentDirectoriesReady,
     currentPubkey,
     mentionCandidatesWithTeams,
     mentionQuery,
@@ -913,6 +915,7 @@ export function useMentions(
             searchableNamesLowerRef,
             candidates: mentionCandidatesWithTeams,
             activePersonaIds,
+            agentProvenanceReady: agentDirectoriesReady,
             channelType: options?.channelType,
             currentPubkey,
             ownerProfiles: ownerProfilesQuery.data?.profiles,
@@ -942,6 +945,7 @@ export function useMentions(
     },
     [
       activePersonaIds,
+      agentDirectoriesReady,
       cancelMentionAutocomplete,
       currentPubkey,
       isMentionOpen,
diff --git a/desktop/src/features/messages/ui/MentionAutocomplete.test.mjs b/desktop/src/features/messages/ui/MentionAutocomplete.test.mjs
index 5f156b3324..682b7dbfba 100644
--- a/desktop/src/features/messages/ui/MentionAutocomplete.test.mjs
+++ b/desktop/src/features/messages/ui/MentionAutocomplete.test.mjs
@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { mentionAgentLabel } from "./MentionAutocomplete.tsx";
+import { showMentionAgentProvenanceMarker } from "./MentionAutocomplete.tsx";
 
 function suggestion(agentProvenance) {
   return {
@@ -12,21 +12,27 @@ function suggestion(agentProvenance) {
   };
 }
 
-test("duplicate owned agents show their management provenance", () => {
+test("duplicate owned agents mark only the other setup", () => {
   assert.equal(
-    mentionAgentLabel(suggestion("managed-here"), true),
-    "agent · managed here",
+    showMentionAgentProvenanceMarker(suggestion("managed-here"), true),
+    false,
   );
   assert.equal(
-    mentionAgentLabel(suggestion("managed-elsewhere"), true),
-    "agent · managed elsewhere",
+    showMentionAgentProvenanceMarker(suggestion("managed-elsewhere"), true),
+    true,
   );
 });
 
-test("unique agents keep the compact generic label", () => {
-  assert.equal(mentionAgentLabel(suggestion("managed-here"), false), "agent");
+test("unique agents omit management provenance", () => {
+  assert.equal(
+    showMentionAgentProvenanceMarker(suggestion("managed-here"), false),
+    false,
+  );
 });
 
-test("agents without trustworthy provenance keep the generic label", () => {
-  assert.equal(mentionAgentLabel(suggestion(undefined), true), "agent");
+test("agents without trustworthy provenance omit management provenance", () => {
+  assert.equal(
+    showMentionAgentProvenanceMarker(suggestion(undefined), true),
+    false,
+  );
 });
diff --git a/desktop/src/features/messages/ui/MentionAutocomplete.tsx b/desktop/src/features/messages/ui/MentionAutocomplete.tsx
index 8e71528525..ac84df439c 100644
--- a/desktop/src/features/messages/ui/MentionAutocomplete.tsx
+++ b/desktop/src/features/messages/ui/MentionAutocomplete.tsx
@@ -1,6 +1,7 @@
 import * as React from "react";
 import { Bot, Users } from "lucide-react";
 import type { TeamMentionMember } from "@/features/messages/lib/mentionCandidates";
+import { OtherSetupAgentMarker } from "@/features/agents/ui/OtherSetupAgentMarker";
 
 import { Badge } from "@/shared/ui/badge";
 import { cn } from "@/shared/lib/cn";
@@ -36,14 +37,11 @@ type MentionAutocompleteProps = {
   position?: "above" | "below";
 };
 
-export function mentionAgentLabel(
+export function showMentionAgentProvenanceMarker(
   suggestion: MentionSuggestion,
   hasNameCollision: boolean,
-) {
-  if (!hasNameCollision || !suggestion.agentProvenance) return "agent";
-  return suggestion.agentProvenance === "managed-here"
-    ? "agent · managed here"
-    : "agent · managed elsewhere";
+): boolean {
+  return hasNameCollision && suggestion.agentProvenance === "managed-elsewhere";
 }
 
 export const MentionAutocomplete = React.memo(function MentionAutocomplete({
@@ -113,7 +111,14 @@ export const MentionAutocomplete = React.memo(function MentionAutocomplete({
             suggestion.displayName;
           const hasNameCollision =
             (nameCounts.get(suggestion.displayName.toLowerCase()) ?? 0) > 1;
-          const agentLabel = mentionAgentLabel(suggestion, hasNameCollision);
+          const showAgentProvenanceMarker = showMentionAgentProvenanceMarker(
+            suggestion,
+            hasNameCollision,
+          );
+          const ownerLabel =
+            hasNameCollision && suggestion.agentProvenance
+              ? null
+              : suggestion.ownerLabel;
           const collisionNpub =
             hasNameCollision && suggestion.pubkey
               ? safeNpub(suggestion.pubkey)
@@ -158,7 +163,7 @@ export const MentionAutocomplete = React.memo(function MentionAutocomplete({
                 {suggestion.kind === "team" ||
                 suggestion.isAgent ||
                 suggestion.role ||
-                suggestion.ownerLabel ||
+                ownerLabel ||
                 suggestion.notInChannel ? (
                   <span
                     className={cn(
@@ -180,7 +185,10 @@ export const MentionAutocomplete = React.memo(function MentionAutocomplete({
                           className="h-3.5 w-3.5"
                           data-testid="mention-agent-icon"
                         />
-                        {agentLabel}
+                        agent
+                        {showAgentProvenanceMarker ? (
+                          <OtherSetupAgentMarker testId="mention-agent-provenance" />
+                        ) : null}
                       </span>
                     ) : suggestion.role ? (
                       <Badge
@@ -190,21 +198,21 @@ export const MentionAutocomplete = React.memo(function MentionAutocomplete({
                         {suggestion.role}
                       </Badge>
                     ) : null}
-                    {suggestion.ownerLabel || suggestion.notInChannel ? (
+                    {ownerLabel || suggestion.notInChannel ? (
                       <span
                         className="min-w-0 truncate"
                         title={
-                          suggestion.ownerLabel && suggestion.notInChannel
-                            ? `managed by ${suggestion.ownerLabel} · not in channel`
-                            : suggestion.ownerLabel
-                              ? `managed by ${suggestion.ownerLabel}`
+                          ownerLabel && suggestion.notInChannel
+                            ? `managed by ${ownerLabel} · not in channel`
+                            : ownerLabel
+                              ? `managed by ${ownerLabel}`
                               : "not in channel"
                         }
                       >
-                        {suggestion.ownerLabel && suggestion.notInChannel
-                          ? `managed by ${suggestion.ownerLabel} · not in channel`
-                          : suggestion.ownerLabel
-                            ? `managed by ${suggestion.ownerLabel}`
+                        {ownerLabel && suggestion.notInChannel
+                          ? `managed by ${ownerLabel} · not in channel`
+                          : ownerLabel
+                            ? `managed by ${ownerLabel}`
                             : "not in channel"}
                       </span>
                     ) : null}
diff --git a/desktop/tests/e2e/mentions.spec.ts b/desktop/tests/e2e/mentions.spec.ts
index e2b6db3930..351f4c71f0 100644
--- a/desktop/tests/e2e/mentions.spec.ts
+++ b/desktop/tests/e2e/mentions.spec.ts
@@ -374,8 +374,31 @@ test("duplicate owned agents preserve provenance and exact pubkey selection", as
     `mention-suggestion-${managedPubkey}`,
   );
   const relayRow = dropdown.getByTestId(`mention-suggestion-${relayPubkey}`);
-  await expect(managedRow).toContainText("agent · managed here");
-  await expect(relayRow).toContainText("agent · managed elsewhere");
+  await expect(managedRow).toContainText("agent");
+  await expect(managedRow.getByTestId("mention-agent-provenance")).toHaveCount(
+    0,
+  );
+  await expect(relayRow).toContainText("agent");
+  await expect(
+    relayRow.getByTestId("mention-agent-provenance"),
+  ).toHaveAttribute("aria-label", "From another Buzz setup");
+  await expect(
+    relayRow.getByText("Other setup", { exact: true }),
+  ).toBeVisible();
+  await expect(managedRow).not.toContainText("managed by you");
+  await expect(relayRow).not.toContainText("managed by you");
+
+  await page.setViewportSize({ width: 760, height: 640 });
+  await expect(
+    relayRow.getByText("Other setup", { exact: true }),
+  ).toBeVisible();
+  const rowBox = await relayRow.boundingBox();
+  const dropdownBox = await dropdown.boundingBox();
+  expect(rowBox).not.toBeNull();
+  expect(dropdownBox).not.toBeNull();
+  expect((rowBox?.x ?? 0) + (rowBox?.width ?? 0)).toBeLessThanOrEqual(
+    (dropdownBox?.x ?? 0) + (dropdownBox?.width ?? 0) + 1,
+  );
 
   const collisionKeys = dropdown.getByTestId("mention-collision-npub");
   await expect(collisionKeys).toHaveCount(2);
@@ -399,7 +422,7 @@ test("duplicate owned agents preserve provenance and exact pubkey selection", as
     await input.press("ArrowDown");
   }
   await input.press("Enter");
-  await page.keyboard.type("local");
+  await input.fill("@carl local");
   await page.getByTestId("send-message").click();
   await expect
     .poll(() => readOutgoingMentionPubkeys(page, "@carl local"))
@@ -409,10 +432,21 @@ test("duplicate owned agents preserve provenance and exact pubkey selection", as
   await input.fill("@carl");
   const reopenedDropdown = autocomplete(page);
   await expect(reopenedDropdown).toBeVisible();
-  await reopenedDropdown
-    .getByTestId(`mention-suggestion-${relayPubkey}`)
-    .click();
-  await page.keyboard.type("remote");
+  const reopenedRows = reopenedDropdown.locator("button");
+  const relayIndex = await reopenedRows.evaluateAll(
+    (buttons, pubkey) =>
+      buttons.findIndex(
+        (button) =>
+          button.getAttribute("data-testid") === `mention-suggestion-${pubkey}`,
+      ),
+    relayPubkey,
+  );
+  expect(relayIndex).toBeGreaterThanOrEqual(0);
+  for (let index = 0; index < relayIndex; index += 1) {
+    await input.press("ArrowDown");
+  }
+  await input.press("Enter");
+  await input.fill("@carl remote");
   await page.getByTestId("send-message").click();
   const sendWithoutInviting = page.getByRole("button", { name: "Do nothing" });
   try {
@@ -424,6 +458,55 @@ test("duplicate owned agents preserve provenance and exact pubkey selection", as
   await expect
     .poll(() => readOutgoingMentionPubkeys(page, "@carl remote"))
     .toEqual([relayPubkey]);
+
+  await page.getByTestId("channel-members-trigger").click();
+  const remoteSidebarMarker = page.getByTestId(
+    `sidebar-member-agent-provenance-${relayPubkey}`,
+  );
+  await expect(
+    page.getByTestId(`sidebar-member-agent-provenance-${managedPubkey}`),
+  ).toHaveCount(0);
+  await expect(remoteSidebarMarker).toHaveAttribute(
+    "aria-label",
+    "From another Buzz setup",
+  );
+  await expect(remoteSidebarMarker).toHaveText("Other setup");
+  const remoteSidebarRow = page.getByTestId(`sidebar-member-${relayPubkey}`);
+  const localSidebarMarker = page.getByTestId(
+    `sidebar-member-agent-provenance-${managedPubkey}`,
+  );
+  const markerRemainsVisible = () =>
+    remoteSidebarMarker.evaluate((marker) => {
+      let element: Element | null = marker;
+      while (element) {
+        const style = window.getComputedStyle(element);
+        if (style.display === "none" || style.visibility === "hidden") {
+          return false;
+        }
+        if (Number(style.opacity) === 0) return false;
+        element = element.parentElement;
+      }
+      return true;
+    });
+  await expect.poll(markerRemainsVisible).toBe(true);
+  await expect(localSidebarMarker).toHaveCount(0);
+  const sidebarMarkerBox = await remoteSidebarMarker.boundingBox();
+  const sidebarBox = await page.getByTestId("members-sidebar").boundingBox();
+  expect(sidebarMarkerBox).not.toBeNull();
+  expect(sidebarBox).not.toBeNull();
+  expect(
+    (sidebarMarkerBox?.x ?? 0) + (sidebarMarkerBox?.width ?? 0),
+  ).toBeLessThanOrEqual((sidebarBox?.x ?? 0) + (sidebarBox?.width ?? 0) + 1);
+
+  await remoteSidebarRow.hover();
+  await page.waitForTimeout(200);
+  await expect.poll(markerRemainsVisible).toBe(true);
+  await expect(localSidebarMarker).toHaveCount(0);
+
+  await page.getByTestId(`sidebar-member-open-profile-${relayPubkey}`).focus();
+  await page.waitForTimeout(200);
+  await expect.poll(markerRemainsVisible).toBe(true);
+  await expect(localSidebarMarker).toHaveCount(0);
 });
 
 test("relay-only shared agents emit an outbound mention tag when selected", async ({

From 1e6f1a2584d1620fcc16baf8df962bda8d7c7ae9 Mon Sep 17 00:00:00 2001
From: Wes <wesbillman@users.noreply.github.com>
Date: Fri, 21 Aug 2026 10:37:05 -0600
Subject: [PATCH 16/38] chore(release): release Buzz Desktop version 0.5.18
 (#6489)

## Buzz Desktop release v0.5.18

- **Frozen main:** `aea0ef8df9fc24d9aa8bf5c761ab2910026a601b`
- **Reviewed candidate:** `39f8b46935736334cdd7045a4e4b5d7eb1a33888`
- **Previous desktop release:** `desktop-v0.5.17`
- **Proposed immutable tag:** `desktop-v0.5.18`

This PR may be **squash merged** after the Desktop Release Candidate
check and all protected-branch checks pass. Merging authorizes
publication of the exact reviewed candidate; later or unrelated changes
on `main` cannot alter it.

The checked-in changelog accounts for every non-merge commit in the
release range. The Desktop tag points to the reviewed candidate commit,
not the later squash commit. Publication remains bound to that immutable
candidate tag.

Signed-off-by: Wes <wesbillman@users.noreply.github.com>
Co-authored-by: Release Automation <release-automation@users.noreply.github.com>
---
 .release/desktop-candidate.json   | 14 +++---
 CHANGELOG.md                      | 76 +++++++++++++++++++++++++++++++
 desktop/package.json              |  2 +-
 desktop/src-tauri/Cargo.lock      |  2 +-
 desktop/src-tauri/Cargo.toml      |  2 +-
 desktop/src-tauri/tauri.conf.json |  2 +-
 6 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/.release/desktop-candidate.json b/.release/desktop-candidate.json
index 3920dfeb44..784725b2e6 100644
--- a/.release/desktop-candidate.json
+++ b/.release/desktop-candidate.json
@@ -1,10 +1,10 @@
 {
   "schema": 2,
-  "version": "0.5.17",
-  "base_sha": "3fdf289b78c40f80abce86575c25b5ed6361d82c",
-  "previous_tag": "desktop-v0.5.16",
-  "previous_base_sha": "ee992ff0822f44d1c308822f116cb9d26f9a3386",
-  "previous_merge_sha": "978e585e8df893fe55aded854de07996b9412678",
-  "tag": "desktop-v0.5.17",
-  "commit_count": 5
+  "version": "0.5.18",
+  "base_sha": "aea0ef8df9fc24d9aa8bf5c761ab2910026a601b",
+  "previous_tag": "desktop-v0.5.17",
+  "previous_base_sha": "3fdf289b78c40f80abce86575c25b5ed6361d82c",
+  "previous_merge_sha": "8232299cbe6d90692fac3de46cde0ec123edd6c1",
+  "tag": "desktop-v0.5.18",
+  "commit_count": 66
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bec9b9324e..42fc482515 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,81 @@
 # Changelog
 
+## v0.5.18
+
+### Desktop and shared changes
+
+- fix(desktop): simplify duplicate agent provenance ([#6401](https://github.com/block/buzz/pull/6401)) ([`aea0ef8df9fc24d9aa8bf5c761ab2910026a601b`](https://github.com/block/buzz/commit/aea0ef8df9fc24d9aa8bf5c761ab2910026a601b))
+- fix(desktop): sender names in notifications + macOS click-through routing ([#6427](https://github.com/block/buzz/pull/6427)) ([`4e3c9e619c93dd26677b392ad1f8cf0d12c8f855`](https://github.com/block/buzz/commit/4e3c9e619c93dd26677b392ad1f8cf0d12c8f855))
+- polish(desktop): finish Projects navigation and context chrome ([#6429](https://github.com/block/buzz/pull/6429)) ([`9b32e055fed45864e1982f3d99c5402ba35cd8a6`](https://github.com/block/buzz/commit/9b32e055fed45864e1982f3d99c5402ba35cd8a6))
+- fix(desktop): clarify add agents channel action ([#6374](https://github.com/block/buzz/pull/6374)) ([`9891e64f6b8358d78aa85f2ba248310d58b51ec0`](https://github.com/block/buzz/commit/9891e64f6b8358d78aa85f2ba248310d58b51ec0))
+- feat(desktop-messages): show compact Buzz link metadata ([#6252](https://github.com/block/buzz/pull/6252)) ([`de8a2741c7598c27e0d27cd4562d76b947934e2f`](https://github.com/block/buzz/commit/de8a2741c7598c27e0d27cd4562d76b947934e2f))
+- feat(workflows): reply in-thread from send_message action ([#6178](https://github.com/block/buzz/pull/6178)) ([`c6e3fe7dfa751096d8c4083aaf15d6f6af296572`](https://github.com/block/buzz/commit/c6e3fe7dfa751096d8c4083aaf15d6f6af296572))
+- perf(desktop): split discover_acp_providers into cheap and forced paths ([#6330](https://github.com/block/buzz/pull/6330)) ([`c63ac746cd4622e043574c305ff54021b07b847b`](https://github.com/block/buzz/commit/c63ac746cd4622e043574c305ff54021b07b847b))
+- fix(desktop): restore recent channel sorting ([#6402](https://github.com/block/buzz/pull/6402)) ([`569308c23c9c2bf620dd3a9a5e4baecbcfa22e16`](https://github.com/block/buzz/commit/569308c23c9c2bf620dd3a9a5e4baecbcfa22e16))
+- fix(desktop): isolate main timeline stacking context from focus drawer ([#6398](https://github.com/block/buzz/pull/6398)) ([`b298a175c4b9da1638f84c1f287e42d16a690a61`](https://github.com/block/buzz/commit/b298a175c4b9da1638f84c1f287e42d16a690a61))
+- fix(desktop): make reconnect repair lossless ([#6415](https://github.com/block/buzz/pull/6415)) ([`06e8be9098f099ff9036cfbe637390d5ac982809`](https://github.com/block/buzz/commit/06e8be9098f099ff9036cfbe637390d5ac982809))
+- perf(desktop): resolve references without directory scans ([#6328](https://github.com/block/buzz/pull/6328)) ([`54bbe7305b9ec82a6ac03f84ff5887f77858c0b6`](https://github.com/block/buzz/commit/54bbe7305b9ec82a6ac03f84ff5887f77858c0b6))
+- feat(llm): stamp thinking effort on call-completed log line ([#6424](https://github.com/block/buzz/pull/6424)) ([`b728a2af3197db52e2d847b095f27209f99dc977`](https://github.com/block/buzz/commit/b728a2af3197db52e2d847b095f27209f99dc977))
+- Fix cross-owner relay agent mentions in owner-only builds ([#6338](https://github.com/block/buzz/pull/6338)) ([`ee0c7076af83fe9e2aafdc1baf4113ad988f53bd`](https://github.com/block/buzz/commit/ee0c7076af83fe9e2aafdc1baf4113ad988f53bd))
+- feat(workflows): add workflow editor ([#6248](https://github.com/block/buzz/pull/6248)) ([`1934e83bf5a5d8cd00f0cf28b558547b8d0dffb0`](https://github.com/block/buzz/commit/1934e83bf5a5d8cd00f0cf28b558547b8d0dffb0))
+- fix(desktop): preserve huddle speech boundaries ([#6397](https://github.com/block/buzz/pull/6397)) ([`7ebe3ea699a24b2f95573b88db8f8fe5f1187eb4`](https://github.com/block/buzz/commit/7ebe3ea699a24b2f95573b88db8f8fe5f1187eb4))
+- test(desktop): use a wordlist-safe separator in passphrase word-count test ([#6356](https://github.com/block/buzz/pull/6356)) ([`886cef7f723a539c4026d12e6a0605062bf2208b`](https://github.com/block/buzz/commit/886cef7f723a539c4026d12e6a0605062bf2208b))
+- fix(models): curate Databricks alias-aware labels for 5 missing endpoints ([#6360](https://github.com/block/buzz/pull/6360)) ([`2ce8df8533d8c8598ab3d7a2faa797f8b5ee2eea`](https://github.com/block/buzz/commit/2ce8df8533d8c8598ab3d7a2faa797f8b5ee2eea))
+- feat(desktop): refine context-aware Projects collaboration ([#6396](https://github.com/block/buzz/pull/6396)) ([`3c228b1082a93aca302c7b6a67ec274c51ed5eaf`](https://github.com/block/buzz/commit/3c228b1082a93aca302c7b6a67ec274c51ed5eaf))
+- fix(desktop): distinguish duplicate agent devices ([#6337](https://github.com/block/buzz/pull/6337)) ([`2e7583bf5ad5926ca32367af9954bc79d108e42d`](https://github.com/block/buzz/commit/2e7583bf5ad5926ca32367af9954bc79d108e42d))
+- feat(desktop): close Buzz window with Cmd+W ([#6314](https://github.com/block/buzz/pull/6314)) ([`e5d1dfef7bf24ad527c9c8c1785b613abad574f7`](https://github.com/block/buzz/commit/e5d1dfef7bf24ad527c9c8c1785b613abad574f7))
+- feat(desktop): make Projects workspaces selectable ([#6368](https://github.com/block/buzz/pull/6368)) ([`2b7be9340dd0785bd04795d55e004a6dfedd4998`](https://github.com/block/buzz/commit/2b7be9340dd0785bd04795d55e004a6dfedd4998))
+- feat(desktop): make the Projects overview follow the selected section ([#6335](https://github.com/block/buzz/pull/6335)) ([`f88cda9eb886500ec7d205e1d265ac6f654aa433`](https://github.com/block/buzz/commit/f88cda9eb886500ec7d205e1d265ac6f654aa433))
+- refactor(desktop): coordinate TTS playback ([#6341](https://github.com/block/buzz/pull/6341)) ([`09718fbb60c1acd5a4c1aff1bd91248008977129`](https://github.com/block/buzz/commit/09718fbb60c1acd5a4c1aff1bd91248008977129))
+- fix(desktop): show complete repository trees ([#5102](https://github.com/block/buzz/pull/5102)) ([`9c2f05346fdf3f058e4c579f6eea03dbe65fcca4`](https://github.com/block/buzz/commit/9c2f05346fdf3f058e4c579f6eea03dbe65fcca4))
+- Add appearance preference previews ([#6193](https://github.com/block/buzz/pull/6193)) ([`9a1e861ab8507ee28e5f03010b7f36d1b74ec919`](https://github.com/block/buzz/commit/9a1e861ab8507ee28e5f03010b7f36d1b74ec919))
+- fix(desktop): restore emoji recents ([#6263](https://github.com/block/buzz/pull/6263)) ([`f96f1883c5ad94825d43a856e5d25e307a0540cb`](https://github.com/block/buzz/commit/f96f1883c5ad94825d43a856e5d25e307a0540cb))
+- perf(desktop): move five hot renderer paths from JS into Rust ([#6024](https://github.com/block/buzz/pull/6024)) ([`bbd20fae75ecc3bd7a83cc12a65379fac22a2b79`](https://github.com/block/buzz/commit/bbd20fae75ecc3bd7a83cc12a65379fac22a2b79))
+- fix(media): accept portrait video resolutions ([#6058](https://github.com/block/buzz/pull/6058)) ([`196d62f97c21d053ddf8715d75ef57e92bd0051f`](https://github.com/block/buzz/commit/196d62f97c21d053ddf8715d75ef57e92bd0051f))
+- fix(desktop): hide archived channels from #/Tab autocomplete ([#6156](https://github.com/block/buzz/pull/6156)) ([`fe7c6808e7430d185498178e07e58e378d2e4c7d`](https://github.com/block/buzz/commit/fe7c6808e7430d185498178e07e58e378d2e4c7d))
+- fix(desktop): morph the drawer panel icon instead of sliding it ([#6306](https://github.com/block/buzz/pull/6306)) ([`e5a6e2022fb59c3928b054bc8d51874465fbe3df`](https://github.com/block/buzz/commit/e5a6e2022fb59c3928b054bc8d51874465fbe3df))
+- feat(desktop): refine repository-aware project workspaces ([#6003](https://github.com/block/buzz/pull/6003)) ([`87f8ff82ae5d3fdd99831c62a869b39138e65a57`](https://github.com/block/buzz/commit/87f8ff82ae5d3fdd99831c62a869b39138e65a57))
+- perf(desktop): parallelize relay agent directory rebuild ([#6258](https://github.com/block/buzz/pull/6258)) ([`a362fecc2389955f942c9581bdfeba379ab115b3`](https://github.com/block/buzz/commit/a362fecc2389955f942c9581bdfeba379ab115b3))
+- fix(desktop): exclude archived agents from nest, order regeneration ([#5905](https://github.com/block/buzz/pull/5905)) ([`121e4b3ce7acab6ac310257f444997f58a97cb2e`](https://github.com/block/buzz/commit/121e4b3ce7acab6ac310257f444997f58a97cb2e))
+- Add font size and conversation density preferences ([#5644](https://github.com/block/buzz/pull/5644)) ([`7e2651791d598a3938ef4560a41801223fb9b2c9`](https://github.com/block/buzz/commit/7e2651791d598a3938ef4560a41801223fb9b2c9))
+- fix(desktop): emit camelCase config-write payload fields ([#6062](https://github.com/block/buzz/pull/6062)) ([`6e8d078ffe1ab27b8dde6bb697551b7d2d1a85b5`](https://github.com/block/buzz/commit/6e8d078ffe1ab27b8dde6bb697551b7d2d1a85b5))
+- fix(desktop): downscale large avatars for agent-share PNG body ([#6260](https://github.com/block/buzz/pull/6260)) ([`e2ade93f02f6d1b4db23e0c442a2c65608e54d36`](https://github.com/block/buzz/commit/e2ade93f02f6d1b4db23e0c442a2c65608e54d36))
+- fix(desktop): preserve early relay auth challenges ([#3320](https://github.com/block/buzz/pull/3320)) ([`6ea7a2b2211438359b227a9991cf8ccad2927fe2`](https://github.com/block/buzz/commit/6ea7a2b2211438359b227a9991cf8ccad2927fe2))
+- feat(managed-agents): close five Claude Code agent-config gaps ([#4557](https://github.com/block/buzz/pull/4557)) ([`50a71137e6f1c56f66e2f7348a917b2d2a1798f0`](https://github.com/block/buzz/commit/50a71137e6f1c56f66e2f7348a917b2d2a1798f0))
+- fix(shared-ui): delay hover disclosures by default ([#5821](https://github.com/block/buzz/pull/5821)) ([`d7e8fdb10ca5e055b7af6d22f67d9a8f42cec8ed`](https://github.com/block/buzz/commit/d7e8fdb10ca5e055b7af6d22f67d9a8f42cec8ed))
+- fix(desktop-chrome): preserve balanced layout when sidebar collapses ([#6000](https://github.com/block/buzz/pull/6000)) ([`c442a90a176845e3989436f2bb24eb6d0ca79d47`](https://github.com/block/buzz/commit/c442a90a176845e3989436f2bb24eb6d0ca79d47))
+
+### Other repository changes
+
+- test(benchmarks): expand Buzz-native dataset ([#6448](https://github.com/block/buzz/pull/6448)) ([`b56a52ca11296b86ee41c41278a1169f92f245b6`](https://github.com/block/buzz/commit/b56a52ca11296b86ee41c41278a1169f92f245b6))
+- docs: clarify two-layer moderation ownership ([#6481](https://github.com/block/buzz/pull/6481)) ([`8740a1fa94dd14a3eb5cd2a570b0be2c4a68cbfe`](https://github.com/block/buzz/commit/8740a1fa94dd14a3eb5cd2a570b0be2c4a68cbfe))
+- Fix mobile thread tail and iOS channel header ([#6399](https://github.com/block/buzz/pull/6399)) ([`ffb12d3b05fe1ebd62006dbcd2f079be4e210b70`](https://github.com/block/buzz/commit/ffb12d3b05fe1ebd62006dbcd2f079be4e210b70))
+- chore(deps): pin earshot below 1.2.0 pending a VAD threshold re-pick ([#6392](https://github.com/block/buzz/pull/6392)) ([`2edacde4d4c01490834725774aa878dbc373c41d`](https://github.com/block/buzz/commit/2edacde4d4c01490834725774aa878dbc373c41d))
+- Repair stale large channel roster snapshots ([#6251](https://github.com/block/buzz/pull/6251)) ([`24ec6a468ec9d0d425ee58fbfc4d416412c446ad`](https://github.com/block/buzz/commit/24ec6a468ec9d0d425ee58fbfc4d416412c446ad))
+- fix(hooks): scope pre-push lanes to branch merge-base diff ([#6423](https://github.com/block/buzz/pull/6423)) ([`cd0d33f08507d07c8e8b8511bba92290c046ef03`](https://github.com/block/buzz/commit/cd0d33f08507d07c8e8b8511bba92290c046ef03))
+- Enforce a three-day dependency cooldown ([#6426](https://github.com/block/buzz/pull/6426)) ([`3ee465e12b815a191d902856440e2f3348bda506`](https://github.com/block/buzz/commit/3ee465e12b815a191d902856440e2f3348bda506))
+- feat(cli): accept Buzz message links for thread reads ([#6359](https://github.com/block/buzz/pull/6359)) ([`84c095f8bea14b55373e2d867100abe37aa6061e`](https://github.com/block/buzz/commit/84c095f8bea14b55373e2d867100abe37aa6061e))
+- fix(acp): guard against unrequested public relay skills ([#6394](https://github.com/block/buzz/pull/6394)) ([`d274a6e94928d64e27648f75320ab8af961396da`](https://github.com/block/buzz/commit/d274a6e94928d64e27648f75320ab8af961396da))
+- refactor(prompt): simplify Buzz agent guidance ([#6340](https://github.com/block/buzz/pull/6340)) ([`2a236e413723f207c2f6c1e8921fab4f071d0445`](https://github.com/block/buzz/commit/2a236e413723f207c2f6c1e8921fab4f071d0445))
+- Add Buzz-native collaboration benchmarks ([#6264](https://github.com/block/buzz/pull/6264)) ([`a9640c7cc4d55b0a0ac987aab4af02a204009d19`](https://github.com/block/buzz/commit/a9640c7cc4d55b0a0ac987aab4af02a204009d19))
+- Polish mobile timeline and emoji interactions ([#6297](https://github.com/block/buzz/pull/6297)) ([`da818eddc2f470c006a1073c8c5452f8a989f272`](https://github.com/block/buzz/commit/da818eddc2f470c006a1073c8c5452f8a989f272))
+- chore: serialize mobile pre-push checks ([#6322](https://github.com/block/buzz/pull/6322)) ([`81567b76a5d164b052c4e8526f453cf7a6ef43dc`](https://github.com/block/buzz/commit/81567b76a5d164b052c4e8526f453cf7a6ef43dc))
+- fix(buzz-acp): loosen workspace-scan guardrail to allow named paths ([#6261](https://github.com/block/buzz/pull/6261)) ([`934f3325c3fdaa3a6f23134b74518139aac8ca3f`](https://github.com/block/buzz/commit/934f3325c3fdaa3a6f23134b74518139aac8ca3f))
+- fix(buzz-dev-mcp): expand leading ~ in read_file/str_replace paths ([#6271](https://github.com/block/buzz/pull/6271)) ([`7f69b13b4586acedf6d898edf1be2a6babea3626`](https://github.com/block/buzz/commit/7f69b13b4586acedf6d898edf1be2a6babea3626))
+- Unify mobile channel details ([#6113](https://github.com/block/buzz/pull/6113)) ([`a567dfc2df870878dcf079550502a09a89cc8091`](https://github.com/block/buzz/commit/a567dfc2df870878dcf079550502a09a89cc8091))
+- Revert "fix(acp): gate relay-signed workflow messages on their attributed author" ([#6311](https://github.com/block/buzz/pull/6311)) ([`08eb46ef3c0894baa7e48d9229f45349751a4a57`](https://github.com/block/buzz/commit/08eb46ef3c0894baa7e48d9229f45349751a4a57))
+- Fix mobile Activity thread navigation ([#5850](https://github.com/block/buzz/pull/5850)) ([`93114c9c65138397de39729fde0a816eb9f314ab`](https://github.com/block/buzz/commit/93114c9c65138397de39729fde0a816eb9f314ab))
+- Refine the mobile emoji picker ([#5853](https://github.com/block/buzz/pull/5853)) ([`359fe646758d253ee94bf054a87904efd1dce7d1`](https://github.com/block/buzz/commit/359fe646758d253ee94bf054a87904efd1dce7d1))
+- Polish mobile message actions ([#5873](https://github.com/block/buzz/pull/5873)) ([`78267b0c3a75840d035ff0cc9ad1984def773886`](https://github.com/block/buzz/commit/78267b0c3a75840d035ff0cc9ad1984def773886))
+- Refine mobile pairing confirmation ([#6018](https://github.com/block/buzz/pull/6018)) ([`40f1dac6913d04c87d72610a69ed53bd12377b84`](https://github.com/block/buzz/commit/40f1dac6913d04c87d72610a69ed53bd12377b84))
+- chore(scripts): add buzz-adopt-prod-agents.sh ([#6250](https://github.com/block/buzz/pull/6250)) ([`4f9727a4b3d76389f862faa15241e16e2dd36108`](https://github.com/block/buzz/commit/4f9727a4b3d76389f862faa15241e16e2dd36108))
+- chore(hooks): keep mobile analysis out of pre-commit ([#6236](https://github.com/block/buzz/pull/6236)) ([`b74700daafa823e56c60b4e6470740ab28330888`](https://github.com/block/buzz/commit/b74700daafa823e56c60b4e6470740ab28330888))
+- Polish mobile timeline navigation ([#5874](https://github.com/block/buzz/pull/5874)) ([`417eea2230c1864e8c77f6440dbcfa109bfb63f6`](https://github.com/block/buzz/commit/417eea2230c1864e8c77f6440dbcfa109bfb63f6))
+- fix(prompt): simplify pickup follow-through ([#6186](https://github.com/block/buzz/pull/6186)) ([`d2cfd377e27dab8fdef0236dd8e92c89efbae829`](https://github.com/block/buzz/commit/d2cfd377e27dab8fdef0236dd8e92c89efbae829))
+- fix(mcp): scope todo usage ([#6216](https://github.com/block/buzz/pull/6216)) ([`5694e78def8b6ea674e101c1c988a5f17c9baf9d`](https://github.com/block/buzz/commit/5694e78def8b6ea674e101c1c988a5f17c9baf9d))
+
+[Compare desktop-v0.5.17...desktop-v0.5.18](https://github.com/block/buzz/compare/desktop-v0.5.17...desktop-v0.5.18)
+
 ## v0.5.17
 
 ### Desktop and shared changes
diff --git a/desktop/package.json b/desktop/package.json
index 683c1529d2..4a6bdcd7f5 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "buzz",
   "private": true,
-  "version": "0.5.17",
+  "version": "0.5.18",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock
index 5bd19ef2b6..ac982df6f2 100644
--- a/desktop/src-tauri/Cargo.lock
+++ b/desktop/src-tauri/Cargo.lock
@@ -1081,7 +1081,7 @@ dependencies = [
 
 [[package]]
 name = "buzz-desktop"
-version = "0.5.17"
+version = "0.5.18"
 dependencies = [
  "anyhow",
  "arboard",
diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml
index db089fc13f..3f7189deea 100644
--- a/desktop/src-tauri/Cargo.toml
+++ b/desktop/src-tauri/Cargo.toml
@@ -7,7 +7,7 @@ members = ["crates/buzz-terminal"]
 
 [package]
 name = "buzz-desktop"
-version = "0.5.17"
+version = "0.5.18"
 description = "Buzz desktop app"
 authors = ["you"]
 edition = "2021"
diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json
index b6cbaab514..4a73c78064 100644
--- a/desktop/src-tauri/tauri.conf.json
+++ b/desktop/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Buzz",
-  "version": "0.5.17",
+  "version": "0.5.18",
   "identifier": "xyz.block.buzz.app",
   "build": {
     "beforeDevCommand": {

From 6039fed565fd73a07cdddc3143c86733cad91709 Mon Sep 17 00:00:00 2001
From: Tyler <109685178+tlongwell-block@users.noreply.github.com>
Date: Fri, 21 Aug 2026 12:51:55 -0400
Subject: [PATCH 17/38] fix(desktop): restore human barge-in over agent TTS in
 huddles (#6431)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Problem

Humans cannot interrupt agents in huddles: agent TTS keeps playing over
a talking human (reported by @tlongwell-block, 2026-08-20). The full
requirement: **any human talking — local or remote, any input mode, any
audio rig — must interrupt any agent on the huddle.**

## This is a restoration, not a new feature

- **`b29c8cdaa` (#4281, 2026-08-04) deleted working local VAD
barge-in.** The pre-image shipped `BARGE_IN_DEBOUNCE_FRAMES = 20` (320
ms sustained speech cancels TTS), live at the production call site
(`pipeline.rs` passed `Some(tts_cancel)` unconditionally). The same day,
`ce3cf3cd2` (#4694) flipped the default input mode from VAD to
push-to-talk, which masked the loss.
- **`068a83b09` (#5671, 2026-08-13) removed the remaining TTS-awareness
plumbing from STT** (deliberately, to keep transcribing over agent audio
— a good change). Consequence: this PR is a re-plumb through the
`PlaybackCoordinator` from #6341, not a revert.
- A gap that **never** worked is also closed: PTT-mode users who open
the mic via the mute button (`manual_mic_unmuted` postdates the
deletion) transcribed fine but could not barge in.

## Design

All floor state lives under the single `PlaybackCoordinator` lock —
onset acceptance, epoch bump, synthesis invalidation, player
replacement, and output lease are one committed transition. No cancel
flag can be observed out of order with the playback state it describes.

- **Human floor**: local + per-peer remote ownership with epoch
invalidation. Onset cancels playback by queue replacement; late
synthesis for a stale epoch cannot append or restart.
- **Local onset (VAD)**: on an **isolated output route** (all CoreAudio
output-stream terminals report headphones), a confirmed short onset
interrupts immediately — no echo path exists. On a **coupled route**
(speakers, unknown, virtual, mixed), the restored **20-frame / 320 ms
sustained-speech debounce** discriminates a real human from speaker
bleed; the deleted code's comment records that 80 ms was tried and
false-triggered on laptop speakers. Route classification is queried
fresh at each onset (never cached — default-device re-routing mid-huddle
would strand a stale verdict).
- **Mic-open gate is per-frame**: barge-in observes on any frame where
the mic is actually open — pure VAD mode, or PTT with the mic manually
unmuted (key-held frames defer to the shortcut's own cancel).
- **Remote onset**: sustained non-DTX frames from a peer enter the same
persistent floor (independent of whether playback is live — a human
speaking while TTS is idle blocks late-arriving synthesis from starting
over them). Release on sustained DTX/absence, peer departure, and
recv-loop exit, with guards so a vanished peer cannot wedge the floor.
- **Output lease**: accepted appends renew an `Active` lease;
drain/cancel/onset start a 100 ms tail hangover (conservative against
measured ~12 ms/~1 ms CoreAudio tails), so speaker-tail bleed in the
just-drained window cannot self-trigger the coupled path.

## Known limitations (phase 2 pointers)

- Coupled-route mid-output barge-in pays the 320 ms debounce; a
playback-reference echo discriminator would shorten it.
- A speakers-rig participant's bleed can enter their mic and hold the
floor for other machines (bounded by release debounce).
- Non-macOS routes classify as coupled (fail-safe).

## Verification

- Full `buzz-desktop --lib` suite at head `b0459ae4a`: **2707 passed, 0
failed, 18 ignored** (pinned cargo 1.95.0).
- Exact CI recipe `just desktop-tauri-clippy`: PASS at head; base arm at
merge-base `b728a2af3` confirms the two
`#[allow(clippy::too_many_arguments)]`s cover branch-caused threshold
crossings (human_floor threading), not inherited noise.
- Regression tests pin: 20-frame threshold + reset-on-gap, short-coupled
rejection, sustained-coupled acceptance, coupled-idle acceptance,
remote-idle delayed-TTS rejection, output-tail hangover boundary (during
= rejected, after = accepted), isolated onset, per-frame mic-open gate
truth table, PTT+manual-unmute sustained coupled acquisition.
- `LocalBargeIn::observe` is covered as two joined halves (gate truth
table in `local_barge_in.rs`, floor transition in `tts_playback.rs`);
its body is a straight-line wrapper around a live CoreAudio query, left
uninjected deliberately.
- Coverage precision (mutation-verified):
`manual_open_ptt_sustained_speech_acquires_coupled_floor` pins the gate
→ 20-frame debounce → acquire → floor-blocked chain on the
coupled-**idle** cell. The live-output override leg is carried by
`sustained_coupled_speech_overrides_live_output_suppression`
(tts_playback.rs); the joiner's `sustained_coupled` argument is not
load-bearing there (flipping it to `false` leaves the test green, while
shortening the debounce by one frame turns it red).
- Live arms in progress: pre-regression build `b29c8cdaa^` staged to
confirm the deleted mechanism worked; two-endpoint remote-leg test
pending a second human.

## Commits

1. `fb681a5a9` — restore human barge-in (coordinator floor, lease, route
isolation, remote floor, 320 ms coupled debounce)
2. `b4265418e` — enable barge-in for manually opened mics (per-frame
gate; closes the PTT-open-mic gap)
3. `886489f2b` — extract local barge-in policy module (file-size
ratchet; also hoists the CoreAudio route query from per-frame to
per-onset, named in the commit message)
4. `b0459ae4a` — two targeted clippy allows for the widened worker
signatures

## Credits

Built by **Wren**. Regression archaeology and the PTT-open-mic gap by
**Dawn** (who also killed her own first fix as vacuous and caught a
clippy blocker before it hit CI). Review blockers (coordinator
serialization, idle-onset floors, output lease) by **Mari**. Live rig
verification by **Max**. Coordination and verification by **Eva**.
Opened by Eva with Tyler's explicit direction; commits carry agent
trailers.

---------

Signed-off-by: Wren <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@buzz.block.builderlab.xyz>
Co-authored-by: Wren <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@buzz.block.builderlab.xyz>
---
 desktop/src-tauri/src/huddle/audio_output.rs  |  67 +++
 desktop/src-tauri/src/huddle/human_floor.rs   |  73 +++
 desktop/src-tauri/src/huddle/latency_bench.rs |  10 +-
 .../src-tauri/src/huddle/local_barge_in.rs    | 151 +++++++
 desktop/src-tauri/src/huddle/mod.rs           |   4 +
 desktop/src-tauri/src/huddle/pipeline.rs      |  21 +-
 desktop/src-tauri/src/huddle/playout.rs       | 140 +++++-
 desktop/src-tauri/src/huddle/relay_api.rs     |  12 +-
 desktop/src-tauri/src/huddle/state.rs         |  11 +-
 desktop/src-tauri/src/huddle/stt.rs           | 417 ++++++-----------
 desktop/src-tauri/src/huddle/stt_tests.rs     | 255 +++++++++++
 desktop/src-tauri/src/huddle/tts.rs           | 248 +++++++---
 .../src/huddle/tts_pipeline_controls.rs       |   3 +
 desktop/src-tauri/src/huddle/tts_playback.rs  | 427 +++++++++++++++++-
 desktop/src-tauri/src/huddle/tts_settings.rs  |   1 +
 desktop/src-tauri/src/huddle/tts_tests.rs     | 109 +++++
 .../src/huddle/tts_voice_selection_tests.rs   |   8 +
 .../src/huddle/tts_voice_transition.rs        |   7 +-
 18 files changed, 1583 insertions(+), 381 deletions(-)
 create mode 100644 desktop/src-tauri/src/huddle/human_floor.rs
 create mode 100644 desktop/src-tauri/src/huddle/local_barge_in.rs
 create mode 100644 desktop/src-tauri/src/huddle/stt_tests.rs

diff --git a/desktop/src-tauri/src/huddle/audio_output.rs b/desktop/src-tauri/src/huddle/audio_output.rs
index 34dec53094..383a7e8210 100644
--- a/desktop/src-tauri/src/huddle/audio_output.rs
+++ b/desktop/src-tauri/src/huddle/audio_output.rs
@@ -97,3 +97,70 @@ pub(crate) fn open_output_sink_by_name(
 
     rodio::DeviceSinkBuilder::open_default_sink().map_err(|e| format!("audio output: {e}"))
 }
+
+fn device_type_is_isolated(device_type: rodio::cpal::DeviceType) -> bool {
+    use rodio::cpal::DeviceType;
+    matches!(
+        device_type,
+        DeviceType::Headphones
+            | DeviceType::Headset
+            | DeviceType::Earpiece
+            | DeviceType::HearingAid
+    )
+}
+
+/// Conservative route-isolation query using cpal's safe structured device
+/// description. This is intentionally re-evaluated at confirmed local onset,
+/// so a route change cannot leave a stale isolated capability behind.
+pub(crate) fn output_route_is_isolated(preferred: Option<&str>) -> bool {
+    use rodio::cpal::traits::HostTrait;
+    use rodio::DeviceTrait;
+
+    let host = rodio::cpal::default_host();
+    let device = match preferred.filter(|name| !name.is_empty()) {
+        Some(name) => {
+            let Ok(devices) = host.output_devices() else {
+                return false;
+            };
+            let mut matches = devices.filter(|device| {
+                device
+                    .description()
+                    .ok()
+                    .map(|description| description.name().to_owned())
+                    == Some(name.to_owned())
+            });
+            let Some(device) = matches.next() else {
+                return false;
+            };
+            if matches.next().is_some() {
+                return false;
+            }
+            device
+        }
+        None => match host.default_output_device() {
+            Some(device) => device,
+            None => return false,
+        },
+    };
+
+    device
+        .description()
+        .is_ok_and(|description| device_type_is_isolated(description.device_type()))
+}
+
+#[cfg(test)]
+mod route_isolation_tests {
+    use super::device_type_is_isolated;
+    use rodio::cpal::DeviceType;
+
+    #[test]
+    fn only_positive_isolated_terminal_types_are_accepted() {
+        assert!(device_type_is_isolated(DeviceType::Headphones));
+        assert!(device_type_is_isolated(DeviceType::Headset));
+        assert!(device_type_is_isolated(DeviceType::Earpiece));
+        assert!(device_type_is_isolated(DeviceType::HearingAid));
+        assert!(!device_type_is_isolated(DeviceType::Speaker));
+        assert!(!device_type_is_isolated(DeviceType::Virtual));
+        assert!(!device_type_is_isolated(DeviceType::Unknown));
+    }
+}
diff --git a/desktop/src-tauri/src/huddle/human_floor.rs b/desktop/src-tauri/src/huddle/human_floor.rs
new file mode 100644
index 0000000000..1643880c42
--- /dev/null
+++ b/desktop/src-tauri/src/huddle/human_floor.rs
@@ -0,0 +1,73 @@
+//! Shared human-floor handle backed by the TTS playback coordinator.
+
+use std::sync::Arc;
+
+use super::tts_playback::{HumanFloorAuthorization, PlaybackCoordinator};
+
+#[derive(Clone)]
+pub(crate) struct HumanFloor {
+    playback: Arc<PlaybackCoordinator>,
+}
+
+impl std::fmt::Debug for HumanFloor {
+    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        formatter.debug_struct("HumanFloor").finish_non_exhaustive()
+    }
+}
+
+impl Default for HumanFloor {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl HumanFloor {
+    pub(crate) fn new() -> Self {
+        Self {
+            playback: Arc::new(PlaybackCoordinator::unbound()),
+        }
+    }
+
+    pub(super) fn playback(&self) -> Arc<PlaybackCoordinator> {
+        Arc::clone(&self.playback)
+    }
+
+    #[cfg(test)]
+    pub(crate) fn is_blocked(&self) -> bool {
+        self.playback.human_floor_blocked()
+    }
+
+    pub(crate) fn epoch(&self) -> u64 {
+        self.playback.human_floor_epoch()
+    }
+
+    pub(super) fn authorization(&self, epoch: u64) -> HumanFloorAuthorization {
+        self.playback.human_floor_authorization(epoch)
+    }
+
+    #[cfg(test)]
+    pub(crate) fn permits(&self, epoch: u64) -> bool {
+        self.authorization(epoch) == HumanFloorAuthorization::Permitted
+    }
+
+    pub(crate) fn enter_local(&self, route_isolated: bool, sustained_coupled_speech: bool) -> bool {
+        self.playback
+            .enter_local_human_floor(route_isolated, sustained_coupled_speech)
+    }
+
+    pub(crate) fn leave_local(&self) {
+        self.playback.leave_local_human_floor();
+    }
+
+    pub(crate) fn enter_remote(&self, peer: u8) {
+        self.playback.enter_remote_human_floor(peer);
+    }
+
+    pub(crate) fn leave_remote(&self, peer: u8) {
+        self.playback.leave_remote_human_floor(peer);
+    }
+
+    pub(crate) fn clear_remote(&self) {
+        self.playback.clear_remote_human_floor();
+    }
+}
diff --git a/desktop/src-tauri/src/huddle/latency_bench.rs b/desktop/src-tauri/src/huddle/latency_bench.rs
index 710854b533..f928ddbce0 100644
--- a/desktop/src-tauri/src/huddle/latency_bench.rs
+++ b/desktop/src-tauri/src/huddle/latency_bench.rs
@@ -141,6 +141,7 @@ fn baseline_stt_fake_llm_tts_first_audio() {
         tts_dir,
         Arc::clone(&tts_active),
         Arc::clone(&tts_cancel),
+        super::human_floor::HumanFloor::new(),
         "eve",
         None, // default output device
         None, // no Tauri app handle
@@ -152,7 +153,14 @@ fn baseline_stt_fake_llm_tts_first_audio() {
     );
 
     let t = Instant::now();
-    let (stt, mut text_rx) = SttPipeline::new(stt_dir, None, None).expect("stt pipeline");
+    let (stt, mut text_rx) = SttPipeline::new(
+        stt_dir,
+        None,
+        None,
+        super::human_floor::HumanFloor::new(),
+        None,
+    )
+    .expect("stt pipeline");
     // Recognizer loads inside the worker thread; give it time, then verify
     // liveness via a first throwaway feed below.
     std::thread::sleep(Duration::from_secs(2));
diff --git a/desktop/src-tauri/src/huddle/local_barge_in.rs b/desktop/src-tauri/src/huddle/local_barge_in.rs
new file mode 100644
index 0000000000..ac57c685ad
--- /dev/null
+++ b/desktop/src-tauri/src/huddle/local_barge_in.rs
@@ -0,0 +1,151 @@
+//! Local VAD barge-in policy and coupled-output debounce.
+
+use super::human_floor::HumanFloor;
+
+/// Whether local audio should use VAD barge-in for this frame.
+///
+/// This currently matches STT's `vad_flush_allowed`, but the two decisions are
+/// kept separate deliberately: one assigns cancellation ownership and the
+/// other controls utterance endpointing.
+pub(super) fn enabled(ptt_mode: bool, manually_open: bool, ptt_held: bool) -> bool {
+    !ptt_mode || (manually_open && !ptt_held)
+}
+
+/// Consecutive 16 ms VAD-positive frames required to restore local barge-in
+/// on acoustically coupled output. The prior implementation shipped 20 frames
+/// after 5 frames caused speaker-bleed self-cancellation (`b29c8cdaa^`).
+const COUPLED_BARGE_IN_FRAMES: usize = 20;
+
+#[derive(Debug, Default)]
+pub(super) struct LocalBargeIn {
+    acquired_floor: bool,
+    coupled_positive_frames: usize,
+}
+
+impl LocalBargeIn {
+    pub(super) fn observe(
+        &mut self,
+        probability: f32,
+        confirmed_onset: bool,
+        human_floor: &HumanFloor,
+        output_device: Option<&str>,
+        onset_threshold: f32,
+    ) {
+        if self.acquired_floor {
+            return;
+        }
+        let sustained_coupled = self.track_sustained_coupled(probability, onset_threshold);
+        if !confirmed_onset && !sustained_coupled {
+            return;
+        }
+        let route_isolated = super::audio_output::output_route_is_isolated(output_device);
+        self.acquire(human_floor, route_isolated, sustained_coupled);
+    }
+
+    pub(super) fn acquire(
+        &mut self,
+        human_floor: &HumanFloor,
+        route_isolated: bool,
+        sustained_coupled: bool,
+    ) {
+        self.acquired_floor = human_floor.enter_local(route_isolated, sustained_coupled);
+    }
+
+    fn track_sustained_coupled(&mut self, probability: f32, onset_threshold: f32) -> bool {
+        if probability > onset_threshold {
+            self.coupled_positive_frames = self.coupled_positive_frames.saturating_add(1);
+        } else {
+            self.coupled_positive_frames = 0;
+        }
+        self.coupled_positive_frames >= COUPLED_BARGE_IN_FRAMES
+    }
+
+    pub(super) fn release(&mut self, human_floor: &HumanFloor) {
+        if self.acquired_floor {
+            human_floor.leave_local();
+        }
+        *self = Self::default();
+    }
+}
+
+#[derive(Debug)]
+pub(super) struct WorkerLocalBargeIn {
+    state: LocalBargeIn,
+    human_floor: HumanFloor,
+}
+
+impl WorkerLocalBargeIn {
+    pub(super) fn new(human_floor: HumanFloor) -> Self {
+        Self {
+            state: LocalBargeIn::default(),
+            human_floor,
+        }
+    }
+}
+
+impl std::ops::Deref for WorkerLocalBargeIn {
+    type Target = LocalBargeIn;
+
+    fn deref(&self) -> &Self::Target {
+        &self.state
+    }
+}
+
+impl std::ops::DerefMut for WorkerLocalBargeIn {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.state
+    }
+}
+
+impl Drop for WorkerLocalBargeIn {
+    fn drop(&mut self) {
+        self.state.release(&self.human_floor);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn manual_open_mic_enables_vad_barge_in_in_ptt_mode() {
+        assert!(enabled(true, true, false));
+        assert!(!enabled(true, false, false));
+        assert!(!enabled(true, true, true));
+        assert!(enabled(false, false, false));
+    }
+
+    #[test]
+    fn manual_open_ptt_sustained_speech_acquires_coupled_floor() {
+        assert!(enabled(true, true, false));
+        let human_floor = HumanFloor::new();
+        let mut barge_in = LocalBargeIn::default();
+        for _ in 0..COUPLED_BARGE_IN_FRAMES {
+            let sustained = barge_in.track_sustained_coupled(0.9, 0.5);
+            if sustained {
+                barge_in.acquire(&human_floor, false, true);
+            }
+        }
+        assert!(barge_in.acquired_floor);
+        assert!(human_floor.is_blocked());
+    }
+
+    #[test]
+    fn coupled_barge_in_requires_twenty_consecutive_positive_frames() {
+        let mut barge_in = LocalBargeIn::default();
+        for _ in 0..COUPLED_BARGE_IN_FRAMES - 1 {
+            assert!(!barge_in.track_sustained_coupled(0.9, 0.5));
+        }
+        assert!(barge_in.track_sustained_coupled(0.9, 0.5));
+    }
+
+    #[test]
+    fn coupled_barge_in_debounce_resets_on_a_non_speech_frame() {
+        let mut barge_in = LocalBargeIn::default();
+        for _ in 0..COUPLED_BARGE_IN_FRAMES - 1 {
+            assert!(!barge_in.track_sustained_coupled(0.9, 0.5));
+        }
+        assert!(!barge_in.track_sustained_coupled(0.1, 0.5));
+        assert!(!barge_in.track_sustained_coupled(0.9, 0.5));
+    }
+}
diff --git a/desktop/src-tauri/src/huddle/mod.rs b/desktop/src-tauri/src/huddle/mod.rs
index 1feb2073b0..e4124de15a 100644
--- a/desktop/src-tauri/src/huddle/mod.rs
+++ b/desktop/src-tauri/src/huddle/mod.rs
@@ -28,9 +28,11 @@ pub mod agent_voice;
 pub mod agents;
 pub mod audio_output;
 mod commands;
+mod human_floor;
 pub mod jitter;
 #[cfg(test)]
 mod latency_bench;
+mod local_barge_in;
 pub mod models;
 pub mod pipeline;
 pub mod playout;
@@ -42,6 +44,8 @@ pub mod state;
 pub mod stt;
 pub mod transcription;
 pub mod tts;
+#[path = "tts_playback.rs"]
+mod tts_playback;
 pub mod tts_settings;
 mod tts_voice_import;
 mod tts_voice_registry;
diff --git a/desktop/src-tauri/src/huddle/pipeline.rs b/desktop/src-tauri/src/huddle/pipeline.rs
index afa7aed8e0..f814f77599 100644
--- a/desktop/src-tauri/src/huddle/pipeline.rs
+++ b/desktop/src-tauri/src/huddle/pipeline.rs
@@ -311,6 +311,8 @@ pub(crate) async fn maybe_start_stt_pipeline(
         stt_starting,
         ptt_active_for_stt,
         manual_mic_unmuted_for_stt,
+        human_floor,
+        output_device,
         old_stt,
     ) = {
         let mut hs = state.huddle()?;
@@ -346,6 +348,13 @@ pub(crate) async fn maybe_start_stt_pipeline(
             stt_starting,
             ptt,
             manual_mic_unmuted,
+            hs.human_floor.clone(),
+            state
+                .huddle_audio
+                .output_device
+                .lock()
+                .unwrap_or_else(|e| e.into_inner())
+                .clone(),
             old,
         )
     };
@@ -353,7 +362,13 @@ pub(crate) async fn maybe_start_stt_pipeline(
     drop(old_stt);
 
     let constructed = tokio::task::spawn_blocking(move || {
-        stt::SttPipeline::new(model_dir, ptt_active_for_stt, manual_mic_unmuted_for_stt)
+        stt::SttPipeline::new(
+            model_dir,
+            ptt_active_for_stt,
+            manual_mic_unmuted_for_stt,
+            human_floor,
+            output_device,
+        )
     })
     .await;
     let (pipeline, text_rx) = match constructed {
@@ -457,7 +472,7 @@ pub(crate) async fn maybe_start_tts_pipeline(state: &AppState) -> Result<bool, S
     // Atomically check preconditions and claim the construction slot.
     // The sentinel prevents a second caller from starting construction
     // while we're building outside the lock.
-    let (tts_active, tts_cancel, tts_starting) = {
+    let (tts_active, tts_cancel, human_floor, tts_starting) = {
         let hs = state.huddle()?;
         if hs.tts_pipeline.is_some() {
             return Ok(false);
@@ -471,6 +486,7 @@ pub(crate) async fn maybe_start_tts_pipeline(state: &AppState) -> Result<bool, S
         (
             Arc::clone(&hs.tts_active),
             Arc::clone(&hs.tts_cancel),
+            hs.human_floor.clone(),
             Arc::clone(&hs.tts_starting),
         )
     };
@@ -484,6 +500,7 @@ pub(crate) async fn maybe_start_tts_pipeline(state: &AppState) -> Result<bool, S
             model_dir,
             tts_active,
             tts_cancel,
+            human_floor,
             &initial_voice,
             output_device,
             app,
diff --git a/desktop/src-tauri/src/huddle/playout.rs b/desktop/src-tauri/src/huddle/playout.rs
index 346b425aec..0f8de6da7f 100644
--- a/desktop/src-tauri/src/huddle/playout.rs
+++ b/desktop/src-tauri/src/huddle/playout.rs
@@ -30,6 +30,7 @@ use futures_util::{SinkExt, StreamExt};
 use tokio_tungstenite::tungstenite::Message as WsMsg;
 use tokio_util::sync::CancellationToken;
 
+use super::human_floor::HumanFloor;
 use super::jitter::{PeerJitterBuffer, SAMPLE_RATE_HZ};
 use super::relay_api::{WsStream, REMOTE_SPEECH_THRESHOLD};
 use super::wire::{FrameHeader, FLAG_DTX, V2_HEADER_LEN};
@@ -42,6 +43,7 @@ const SPEAKER_TICK_MS: u64 = 500;
 const SPEAKER_LEVEL_TICK_MS: u64 = 50;
 /// Per-peer arrival window for the TTS interrupt frame counter.
 const FRAME_WINDOW: std::time::Duration = std::time::Duration::from_millis(500);
+const REMOTE_RELEASE_DEBOUNCE: std::time::Duration = std::time::Duration::from_millis(500);
 /// Playout clock: NetEq emits 10 ms frames, so we tick at 10 ms.
 const PLAYOUT_TICK_MS: u64 = 10;
 
@@ -84,6 +86,39 @@ fn normalized_speaker_level(level_dbov: i8) -> f32 {
     ((f32::from(level_dbov) + 60.0) / 48.0).clamp(0.0, 1.0)
 }
 
+fn update_remote_release_deadline(
+    peer: u8,
+    is_dtx: bool,
+    remote_floor_owners: &std::collections::HashSet<u8>,
+    deadlines: &mut std::collections::HashMap<u8, tokio::time::Instant>,
+    now: tokio::time::Instant,
+) {
+    if !is_dtx {
+        deadlines.remove(&peer);
+    } else if remote_floor_owners.contains(&peer) {
+        deadlines
+            .entry(peer)
+            .or_insert(now + REMOTE_RELEASE_DEBOUNCE);
+    }
+}
+
+fn release_expired_remote_floors(
+    now: tokio::time::Instant,
+    owners: &mut std::collections::HashSet<u8>,
+    deadlines: &mut std::collections::HashMap<u8, tokio::time::Instant>,
+    human_floor: &HumanFloor,
+) {
+    let released: Vec<u8> = deadlines
+        .iter()
+        .filter_map(|(peer, deadline)| (*deadline <= now).then_some(*peer))
+        .collect();
+    for peer in released {
+        deadlines.remove(&peer);
+        owners.remove(&peer);
+        human_floor.leave_remote(peer);
+    }
+}
+
 fn should_recover_playout(depth: usize, currently_recovering: bool) -> bool {
     if currently_recovering {
         depth > PLAYOUT_QUEUE_RECOVERY_END
@@ -171,6 +206,7 @@ pub(crate) async fn run_playout_recv_loop(
     initial_peers: Vec<(u8, String)>,
     tts_active: Arc<AtomicBool>,
     tts_cancel: Arc<AtomicBool>,
+    human_floor: HumanFloor,
 ) {
     use rodio::buffer::SamplesBuffer;
     use std::num::NonZero;
@@ -183,9 +219,11 @@ pub(crate) async fn run_playout_recv_loop(
         initial_peers.into_iter().collect();
     let mut active_indices: std::collections::HashSet<u8> = std::collections::HashSet::new();
     let mut speaker_levels: std::collections::HashMap<u8, f32> = std::collections::HashMap::new();
+    let mut remote_release_deadlines: std::collections::HashMap<u8, tokio::time::Instant> =
+        std::collections::HashMap::new();
+    let mut remote_floor_owners: std::collections::HashSet<u8> = std::collections::HashSet::new();
     let mut frame_counts: std::collections::HashMap<u8, u16> = std::collections::HashMap::new();
     let mut last_frame_reset = tokio::time::Instant::now();
-    let mut tts_was_active = false;
 
     let mut speaker_tick = tokio::time::interval(std::time::Duration::from_millis(SPEAKER_TICK_MS));
     speaker_tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
@@ -247,6 +285,12 @@ pub(crate) async fn run_playout_recv_loop(
                 }
             }
             _ = speaker_tick.tick() => {
+                release_expired_remote_floors(
+                    tokio::time::Instant::now(),
+                    &mut remote_floor_owners,
+                    &mut remote_release_deadlines,
+                    &human_floor,
+                );
                 if let Some(ref app) = app_handle {
                     use tauri::Emitter;
                     let pubkeys: Vec<String> = active_indices
@@ -303,6 +347,13 @@ pub(crate) async fn run_playout_recv_loop(
                         // by an idle peer to keep the codec alive — they
                         // don't mean the peer is speaking, and shouldn't
                         // make their tile flash for the 500 ms speaker tick.
+                        update_remote_release_deadline(
+                            peer_idx,
+                            is_dtx,
+                            &remote_floor_owners,
+                            &mut remote_release_deadlines,
+                            tokio::time::Instant::now(),
+                        );
                         if !is_dtx {
                             active_indices.insert(peer_idx);
                             let level = normalized_speaker_level(header.level_dbov);
@@ -312,14 +363,9 @@ pub(crate) async fn run_playout_recv_loop(
                                 .or_insert(level);
                         }
 
-                        // TTS interrupt frame counter — reset on TTS rising edge.
-                        let tts_now = tts_active.load(Ordering::Acquire);
-                        if tts_now && !tts_was_active {
-                            frame_counts.clear();
-                            last_frame_reset = tokio::time::Instant::now();
-                        }
-                        tts_was_active = tts_now;
-
+                        // Track remote speech independently of TTS liveness so a
+                        // human who starts while output is idle still owns the
+                        // floor and rejects delayed synthesis.
                         let slot = match peers.entry(peer_idx) {
                             std::collections::hash_map::Entry::Occupied(e) => e.into_mut(),
                             std::collections::hash_map::Entry::Vacant(e) => {
@@ -347,11 +393,10 @@ pub(crate) async fn run_playout_recv_loop(
                             slot.last_packet_at = tokio::time::Instant::now();
                         }
 
-                        // Count remote-speech frame arrivals for the TTS
-                        // interrupt. DTX/comfort frames don't count — they
-                        // mean the peer is silent, just keeping the codec
-                        // state alive.
-                        if tts_now && !is_dtx {
+                        // Count remote-speech frame arrivals for floor onset.
+                        // DTX/comfort frames don't count — they mean the peer
+                        // is silent, just keeping the codec state alive.
+                        if !is_dtx {
                             if last_frame_reset.elapsed() >= FRAME_WINDOW {
                                 frame_counts.clear();
                                 last_frame_reset = tokio::time::Instant::now();
@@ -359,7 +404,11 @@ pub(crate) async fn run_playout_recv_loop(
                             let count = frame_counts.entry(peer_idx).or_insert(0);
                             *count = count.saturating_add(1);
                             if *count >= REMOTE_SPEECH_THRESHOLD {
-                                tts_cancel.store(true, Ordering::Release);
+                                human_floor.enter_remote(peer_idx);
+                                remote_floor_owners.insert(peer_idx);
+                                if tts_active.load(Ordering::Acquire) {
+                                    tts_cancel.store(true, Ordering::Release);
+                                }
                             }
                         }
                     }
@@ -384,6 +433,9 @@ pub(crate) async fn run_playout_recv_loop(
                                                 {
                                                     peers.remove(&key);
                                                     frame_counts.remove(&key);
+                                                    remote_release_deadlines.remove(&key);
+                                                    remote_floor_owners.remove(&key);
+                                                    human_floor.leave_remote(key);
                                                     active_indices.remove(&key);
                                                     speaker_levels.remove(&key);
                                                 }
@@ -407,6 +459,16 @@ pub(crate) async fn run_playout_recv_loop(
                                             replacement.get(idx) == index_to_pubkey.get(idx)
                                         };
                                         peers.retain(|idx, _| identity_unchanged(idx));
+                                        for idx in index_to_pubkey
+                                            .keys()
+                                            .filter(|idx| !identity_unchanged(idx))
+                                            .copied()
+                                            .collect::<Vec<_>>()
+                                        {
+                                            human_floor.leave_remote(idx);
+                                            remote_release_deadlines.remove(&idx);
+                                            remote_floor_owners.remove(&idx);
+                                        }
                                         frame_counts.retain(|idx, _| identity_unchanged(idx));
                                         active_indices.retain(identity_unchanged);
                                         speaker_levels.retain(|idx, _| identity_unchanged(idx));
@@ -418,6 +480,9 @@ pub(crate) async fn run_playout_recv_loop(
                                         let key = idx as u8;
                                         index_to_pubkey.remove(&key);
                                         frame_counts.remove(&key);
+                                        remote_release_deadlines.remove(&key);
+                                        remote_floor_owners.remove(&key);
+                                        human_floor.leave_remote(key);
                                         active_indices.remove(&key);
                                         speaker_levels.remove(&key);
                                         // Dropping Player detaches its queue from the
@@ -441,6 +506,7 @@ pub(crate) async fn run_playout_recv_loop(
         }
     }
 
+    human_floor.clear_remote();
     if let Some(ref app) = app_handle {
         use tauri::Emitter;
         let _ = app.emit(
@@ -454,6 +520,50 @@ pub(crate) async fn run_playout_recv_loop(
 mod tests {
     use super::*;
 
+    #[test]
+    fn continuous_dtx_does_not_extend_remote_floor_deadline() {
+        let peer = 7;
+        let started = tokio::time::Instant::now();
+        let owners = std::collections::HashSet::from([peer]);
+        let mut deadlines = std::collections::HashMap::new();
+
+        update_remote_release_deadline(peer, true, &owners, &mut deadlines, started);
+        let armed = deadlines[&peer];
+        for elapsed_ms in [100, 200, 300, 400] {
+            update_remote_release_deadline(
+                peer,
+                true,
+                &owners,
+                &mut deadlines,
+                started + std::time::Duration::from_millis(elapsed_ms),
+            );
+        }
+
+        assert_eq!(deadlines[&peer], armed);
+        assert!(armed <= started + REMOTE_RELEASE_DEBOUNCE);
+
+        let human_floor = HumanFloor::new();
+        human_floor.enter_remote(peer);
+        let mut owners = owners;
+        release_expired_remote_floors(armed, &mut owners, &mut deadlines, &human_floor);
+        assert!(!human_floor.is_blocked());
+        assert!(owners.is_empty());
+        assert!(deadlines.is_empty());
+    }
+
+    #[test]
+    fn dtx_from_non_owner_does_not_arm_remote_floor_deadline() {
+        let mut deadlines = std::collections::HashMap::new();
+        update_remote_release_deadline(
+            7,
+            true,
+            &std::collections::HashSet::new(),
+            &mut deadlines,
+            tokio::time::Instant::now(),
+        );
+        assert!(deadlines.is_empty());
+    }
+
     #[test]
     fn speaker_level_maps_conversational_range() {
         assert_eq!(normalized_speaker_level(-127), 0.0);
diff --git a/desktop/src-tauri/src/huddle/relay_api.rs b/desktop/src-tauri/src/huddle/relay_api.rs
index 3f2aa76a56..37e5cf5e63 100644
--- a/desktop/src-tauri/src/huddle/relay_api.rs
+++ b/desktop/src-tauri/src/huddle/relay_api.rs
@@ -58,9 +58,13 @@ pub(crate) async fn connect_audio_relay(
     let keys = state.keys.lock().map_err(|e| e.to_string())?.clone();
 
     // TTS interrupt flags — recv task cancels TTS when remote humans speak.
-    let (tts_cancel, tts_active) = {
+    let (tts_cancel, tts_active, human_floor) = {
         let hs = state.huddle()?;
-        (Arc::clone(&hs.tts_cancel), Arc::clone(&hs.tts_active))
+        (
+            Arc::clone(&hs.tts_cancel),
+            Arc::clone(&hs.tts_active),
+            hs.human_floor.clone(),
+        )
     };
 
     let app_handle = state.app_handle.lock().ok().and_then(|g| g.clone());
@@ -180,6 +184,7 @@ pub(crate) async fn connect_audio_relay(
             initial_peers,
             tts_cancel,
             tts_active,
+            human_floor,
             output_device_name,
         })
         .await
@@ -214,6 +219,7 @@ struct AudioRelayPipelineArgs {
     initial_peers: Vec<(u8, String)>,
     tts_cancel: Arc<AtomicBool>,
     tts_active: Arc<AtomicBool>,
+    human_floor: super::human_floor::HumanFloor,
     output_device_name: Option<String>,
 }
 
@@ -227,6 +233,7 @@ async fn audio_relay_pipeline(args: AudioRelayPipelineArgs) -> Result<(), String
         initial_peers,
         tts_cancel,
         tts_active,
+        human_floor,
         output_device_name,
     } = args;
 
@@ -336,6 +343,7 @@ async fn audio_relay_pipeline(args: AudioRelayPipelineArgs) -> Result<(), String
         initial_peers,
         tts_active,
         tts_cancel,
+        human_floor,
     ));
 
     // Wait for either task to finish, then abort the survivor.
diff --git a/desktop/src-tauri/src/huddle/state.rs b/desktop/src-tauri/src/huddle/state.rs
index c615ff19c2..9a7ba89d1b 100644
--- a/desktop/src-tauri/src/huddle/state.rs
+++ b/desktop/src-tauri/src/huddle/state.rs
@@ -11,6 +11,7 @@ use std::sync::{
 };
 
 use super::agent_voice::AgentVoiceSettings;
+use super::human_floor::HumanFloor;
 use super::{stt, tts};
 
 /// Voice input mode: push-to-talk (PTT) or voice-activity detection (VAD).
@@ -106,6 +107,10 @@ pub struct HuddleState {
     /// restarts — both STT and TTS reference the same flag for the entire huddle.
     #[serde(skip)]
     pub tts_cancel: Arc<AtomicBool>,
+    /// Shared human-floor state. Confirmed local or remote human speech hard
+    /// cancels TTS and blocks stale/new playback until every source releases.
+    #[serde(skip)]
+    pub human_floor: HumanFloor,
     /// Sentinel: true while a TTS pipeline is being constructed (outside the lock).
     /// Prevents TOCTOU races where two concurrent callers both pass the `is_some()`
     /// check and both spawn TTS worker threads — the loser's thread would leak.
@@ -189,6 +194,7 @@ impl Clone for HuddleState {
             transcription_user_controlled: self.transcription_user_controlled,
             tts_active: Arc::clone(&self.tts_active),
             tts_cancel: Arc::clone(&self.tts_cancel),
+            human_floor: self.human_floor.clone(),
             tts_starting: Arc::clone(&self.tts_starting),
             stt_starting: Arc::clone(&self.stt_starting),
             last_agent_refresh: self.last_agent_refresh,
@@ -203,6 +209,8 @@ impl Clone for HuddleState {
 
 impl Default for HuddleState {
     fn default() -> Self {
+        let tts_cancel = Arc::new(AtomicBool::new(false));
+        let human_floor = HumanFloor::new();
         Self {
             phase: HuddlePhase::Idle,
             parent_channel_id: None,
@@ -220,7 +228,8 @@ impl Default for HuddleState {
             transcription_enabled: false,
             transcription_user_controlled: false,
             tts_active: Arc::new(AtomicBool::new(false)),
-            tts_cancel: Arc::new(AtomicBool::new(false)),
+            tts_cancel,
+            human_floor,
             tts_starting: Arc::new(AtomicBool::new(false)),
             stt_starting: Arc::new(AtomicBool::new(false)),
             last_agent_refresh: None,
diff --git a/desktop/src-tauri/src/huddle/stt.rs b/desktop/src-tauri/src/huddle/stt.rs
index 8185944834..3721c2fa6e 100644
--- a/desktop/src-tauri/src/huddle/stt.rs
+++ b/desktop/src-tauri/src/huddle/stt.rs
@@ -32,6 +32,8 @@ use std::{
 
 use tokio::sync::mpsc as tokio_mpsc;
 
+use super::{human_floor::HumanFloor, local_barge_in};
+
 // ── Public pipeline handle ────────────────────────────────────────────────────
 
 /// Bounded audio queue capacity.
@@ -62,11 +64,11 @@ pub struct SttPipeline {
 impl SttPipeline {
     /// Spawn the pipeline thread.
     ///
-    /// Mic input is transcribed even while agent TTS is playing: the huddle UI
-    /// already tells users to wear headphones, so speaker bleed is accepted in
-    /// exchange for never dropping human speech that overlaps agent audio.
-    /// Local mic frames still never cancel TTS — push-to-talk and remote
-    /// participant speech remain the explicit barge-in paths.
+    /// Mic input is transcribed even while agent TTS is playing. In open-mic
+    /// VAD mode, confirmed speech acquires the shared human floor: immediately
+    /// on an isolated output route, or after the restored 320 ms sustained-
+    /// speech debounce on an acoustically coupled route. Push-to-talk retains
+    /// its explicit shortcut cancellation path.
     ///
     /// `ptt_active` and `manual_mic_unmuted` are present when the PTT shortcut
     /// is enabled. The pipeline accepts speech while either input path is open;
@@ -85,6 +87,8 @@ impl SttPipeline {
         model_dir: PathBuf,
         ptt_active: Option<Arc<AtomicBool>>,
         manual_mic_unmuted: Option<Arc<AtomicBool>>,
+        human_floor: HumanFloor,
+        output_device: Option<String>,
     ) -> Result<(Self, tokio_mpsc::Receiver<String>), String> {
         let (audio_tx, audio_rx) = mpsc::sync_channel::<Vec<u8>>(AUDIO_QUEUE_DEPTH);
         let (text_tx, text_rx) = tokio_mpsc::channel::<String>(64);
@@ -103,6 +107,8 @@ impl SttPipeline {
                     shutdown_worker,
                     ptt_active_worker,
                     manual_mic_unmuted_worker,
+                    human_floor,
+                    output_device,
                 )
             })
             .map_err(|e| format!("failed to spawn stt-worker thread: {e}"))?;
@@ -205,6 +211,7 @@ const MIN_VOICED_FRAMES: usize = 12;
 #[derive(Debug, PartialEq, Eq)]
 enum VadFrameAction {
     None,
+    ConfirmedOnset,
     Speech,
     FirstSilence,
     Flush,
@@ -268,7 +275,7 @@ impl VadEndpoint {
             for buffered in self.pre_roll.drain(..) {
                 self.speech_buf.extend_from_slice(&buffered);
             }
-            return VadFrameAction::Speech;
+            return VadFrameAction::ConfirmedOnset;
         }
 
         if probability > VAD_OFFSET_THRESHOLD {
@@ -342,6 +349,45 @@ fn stt_speculative_decode() -> bool {
     std::env::var("BUZZ_STT_SPECULATIVE").is_ok_and(|v| v == "1")
 }
 
+#[derive(Debug)]
+enum SttLoopInput {
+    Tick,
+    Batch(Vec<Vec<u8>>),
+}
+
+fn run_stt_receive_loop(
+    audio_rx: Receiver<Vec<u8>>,
+    shutdown: &AtomicBool,
+    human_floor: HumanFloor,
+    mut process: impl FnMut(SttLoopInput, &mut local_barge_in::LocalBargeIn),
+) {
+    let mut local_barge_in_state = local_barge_in::WorkerLocalBargeIn::new(human_floor);
+
+    loop {
+        // Check shutdown flag before blocking.
+        if shutdown.load(Ordering::Acquire) {
+            break;
+        }
+
+        process(SttLoopInput::Tick, &mut local_barge_in_state);
+
+        // Use recv_timeout so we can periodically check the shutdown flag.
+        let bytes = match audio_rx.recv_timeout(RECV_TIMEOUT) {
+            Ok(b) => b,
+            Err(mpsc::RecvTimeoutError::Timeout) => continue,
+            Err(mpsc::RecvTimeoutError::Disconnected) => break, // Sender dropped.
+        };
+
+        // Drain any additional pending messages to batch-process.
+        let mut batch = vec![bytes];
+        while let Ok(b) = audio_rx.try_recv() {
+            batch.push(b);
+        }
+        process(SttLoopInput::Batch(batch), &mut local_barge_in_state);
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
 fn stt_worker(
     model_dir: PathBuf,
     audio_rx: Receiver<Vec<u8>>,
@@ -349,6 +395,8 @@ fn stt_worker(
     shutdown: Arc<AtomicBool>,
     ptt_active: Option<Arc<AtomicBool>>,
     manual_mic_unmuted: Option<Arc<AtomicBool>>,
+    human_floor: HumanFloor,
+    output_device: Option<String>,
 ) {
     // ── 1. Initialise rubato resampler (48 kHz → 16 kHz, mono) ───────────────
     use rubato::{Fft, FixedSync, Resampler};
@@ -416,7 +464,6 @@ fn stt_worker(
     // computed at. Valid only while no new voiced frame has arrived since.
     let speculative_enabled = stt_speculative_decode();
     let mut speculative: Option<(String, usize)> = None;
-
     // ── 5. Main loop ──────────────────────────────────────────────────────────
     let mut transmit_was_active = ptt_active
         .as_ref()
@@ -424,73 +471,69 @@ fn stt_worker(
         || manual_mic_unmuted
             .as_ref()
             .is_some_and(|manual| manual.load(Ordering::Acquire));
-    loop {
-        // Check shutdown flag before blocking.
-        if shutdown.load(Ordering::Acquire) {
-            break;
-        }
+    run_stt_receive_loop(
+        audio_rx,
+        &shutdown,
+        human_floor.clone(),
+        |input, local_barge_in_state| {
+            match input {
+                SttLoopInput::Tick => {
+                    // Track the combined manual/PTT transmission edge. When both paths
+                    // close, the worklet stops sending frames, so flush here rather than
+                    // waiting for silence that will never arrive.
+                    if let Some(ref ptt) = ptt_active {
+                        let transmit_now = ptt.load(Ordering::Acquire)
+                            || manual_mic_unmuted
+                                .as_ref()
+                                .is_some_and(|manual| manual.load(Ordering::Acquire));
+                        if transmit_was_active
+                            && !transmit_now
+                            && endpoint.in_speech
+                            && !endpoint.speech_buf.is_empty()
+                        {
+                            flush_to_stt(
+                                &endpoint.speech_buf,
+                                endpoint.voiced_frames,
+                                &recognizer,
+                                &text_tx,
+                            );
+                            endpoint.reset_segment();
+                            local_barge_in_state.release(&human_floor);
+                        }
+                        transmit_was_active = transmit_now;
+                    }
+                }
+                SttLoopInput::Batch(batch) => {
+                    for bytes in batch {
+                        // Convert raw bytes to f32 samples (little-endian).
+                        let samples_48k = bytes_to_f32(&bytes);
+                        input_buf_48k.extend_from_slice(&samples_48k);
 
-        // Track the combined manual/PTT transmission edge. When both paths
-        // close, the worklet stops sending frames, so flush here rather than
-        // waiting for silence that will never arrive.
-        if let Some(ref ptt) = ptt_active {
-            let transmit_now = ptt.load(Ordering::Acquire)
-                || manual_mic_unmuted
-                    .as_ref()
-                    .is_some_and(|manual| manual.load(Ordering::Acquire));
-            if transmit_was_active
-                && !transmit_now
-                && endpoint.in_speech
-                && !endpoint.speech_buf.is_empty()
-            {
-                flush_to_stt(
-                    &endpoint.speech_buf,
-                    endpoint.voiced_frames,
-                    &recognizer,
-                    &text_tx,
-                );
-                endpoint.reset_segment();
+                        // Resample in chunk_in-sized blocks.
+                        while input_buf_48k.len() >= chunk_in {
+                            let chunk: Vec<f32> = input_buf_48k.drain(..chunk_in).collect();
+                            let resampled = resample_chunk(&mut resampler, &chunk);
+                            process_16k_samples(
+                                &resampled,
+                                &mut leftover_16k,
+                                &mut vad,
+                                &mut endpoint,
+                                flush_frames,
+                                (speculative_enabled, &mut speculative),
+                                &recognizer,
+                                &text_tx,
+                                ptt_active.as_ref(),
+                                manual_mic_unmuted.as_ref(),
+                                &human_floor,
+                                local_barge_in_state,
+                                output_device.as_deref(),
+                            );
+                        }
+                    }
+                }
             }
-            transmit_was_active = transmit_now;
-        }
-
-        // Use recv_timeout so we can periodically check the shutdown flag.
-        let bytes = match audio_rx.recv_timeout(RECV_TIMEOUT) {
-            Ok(b) => b,
-            Err(mpsc::RecvTimeoutError::Timeout) => continue,
-            Err(mpsc::RecvTimeoutError::Disconnected) => break, // Sender dropped.
-        };
-
-        // Drain any additional pending messages to batch-process.
-        let mut batch = vec![bytes];
-        while let Ok(b) = audio_rx.try_recv() {
-            batch.push(b);
-        }
-
-        for bytes in batch {
-            // Convert raw bytes to f32 samples (little-endian).
-            let samples_48k = bytes_to_f32(&bytes);
-            input_buf_48k.extend_from_slice(&samples_48k);
-
-            // Resample in chunk_in-sized blocks.
-            while input_buf_48k.len() >= chunk_in {
-                let chunk: Vec<f32> = input_buf_48k.drain(..chunk_in).collect();
-                let resampled = resample_chunk(&mut resampler, &chunk);
-                process_16k_samples(
-                    &resampled,
-                    &mut leftover_16k,
-                    &mut vad,
-                    &mut endpoint,
-                    flush_frames,
-                    (speculative_enabled, &mut speculative),
-                    &recognizer,
-                    &text_tx,
-                    ptt_active.as_ref(),
-                    manual_mic_unmuted.as_ref(),
-                );
-            }
-        }
-    }
+        },
+    );
 
     // No final flush — leave_huddle/end_huddle emit lifecycle events before
     // the STT worker exits, so a final flush would post a kind:9 message AFTER
@@ -546,6 +589,9 @@ fn process_16k_samples(
     text_tx: &tokio_mpsc::Sender<String>,
     ptt_active: Option<&Arc<AtomicBool>>,
     manual_mic_unmuted: Option<&Arc<AtomicBool>>,
+    human_floor: &HumanFloor,
+    local_barge_in_state: &mut local_barge_in::LocalBargeIn,
+    output_device: Option<&str>,
 ) {
     let (speculative_enabled, speculative) = speculative;
     leftover.extend_from_slice(samples);
@@ -562,7 +608,27 @@ fn process_16k_samples(
         // VAD mode, or with a manually open mic once the shortcut is up.
         let flush_allowed = vad_flush_allowed(ptt_active.is_some(), manually_open, ptt_held);
 
-        match endpoint.process_frame(frame, prob, accepts_audio, flush_allowed, flush_frames) {
+        let action =
+            endpoint.process_frame(frame, prob, accepts_audio, flush_allowed, flush_frames);
+        // Open-mic VAD semantics also apply when a PTT-mode user manually
+        // opens the mic. A held shortcut keeps its explicit key-down cancel.
+        let local_barge_in = local_barge_in::enabled(ptt_active.is_some(), manually_open, ptt_held);
+        if local_barge_in {
+            local_barge_in_state.observe(
+                prob,
+                action == VadFrameAction::ConfirmedOnset,
+                human_floor,
+                output_device,
+                VAD_ONSET_THRESHOLD,
+            );
+        } else {
+            local_barge_in_state.release(human_floor);
+        }
+
+        match action {
+            VadFrameAction::ConfirmedOnset => {
+                speculative.take();
+            }
             VadFrameAction::Speech => {
                 // New voiced audio invalidates any speculative decode.
                 speculative.take();
@@ -594,6 +660,9 @@ fn process_16k_samples(
                     ),
                 }
                 endpoint.reset_segment();
+                if local_barge_in {
+                    local_barge_in_state.release(human_floor);
+                }
             }
             VadFrameAction::None => {}
         }
@@ -607,6 +676,9 @@ fn process_16k_samples(
                 text_tx,
             );
             endpoint.reset_segment();
+            if local_barge_in {
+                local_barge_in_state.release(human_floor);
+            }
             speculative.take();
         }
     }
@@ -686,200 +758,5 @@ fn bytes_to_f32(bytes: &[u8]) -> Vec<f32> {
 use super::drain_until_shutdown;
 
 #[cfg(test)]
-mod tests {
-    use super::{
-        has_enough_voiced_audio, vad_flush_allowed, VadEndpoint, VadFrameAction, MIN_VOICED_FRAMES,
-        SILENCE_FLUSH_FRAMES, VAD_FRAME_SAMPLES, VAD_ONSET_FRAMES, VAD_PRE_ROLL_FRAMES,
-    };
-
-    fn frame(value: f32) -> Vec<f32> {
-        vec![value; VAD_FRAME_SAMPLES]
-    }
-
-    #[test]
-    fn short_vad_blips_do_not_reach_the_recognizer() {
-        assert!(!has_enough_voiced_audio(1));
-        assert!(!has_enough_voiced_audio(MIN_VOICED_FRAMES - 1));
-        assert!(has_enough_voiced_audio(MIN_VOICED_FRAMES));
-    }
-
-    #[test]
-    fn confirmed_onset_prepends_pre_roll_once() {
-        let mut endpoint = VadEndpoint::new();
-        for value in 0..VAD_PRE_ROLL_FRAMES - VAD_ONSET_FRAMES {
-            assert_eq!(
-                endpoint.process_frame(frame(value as f32), 0.0, true, true, SILENCE_FLUSH_FRAMES),
-                VadFrameAction::None
-            );
-        }
-        for value in 0..VAD_ONSET_FRAMES {
-            let action = endpoint.process_frame(
-                frame(100.0 + value as f32),
-                0.9,
-                true,
-                true,
-                SILENCE_FLUSH_FRAMES,
-            );
-            if value + 1 == VAD_ONSET_FRAMES {
-                assert_eq!(action, VadFrameAction::Speech);
-            } else {
-                assert_eq!(action, VadFrameAction::None);
-            }
-        }
-
-        assert_eq!(
-            endpoint.speech_buf.len(),
-            VAD_PRE_ROLL_FRAMES * VAD_FRAME_SAMPLES
-        );
-        assert_eq!(endpoint.speech_buf[0], 0.0);
-        assert_eq!(endpoint.speech_buf[VAD_FRAME_SAMPLES], 1.0);
-        assert_eq!(endpoint.pre_roll.len(), 0);
-        endpoint.process_frame(frame(200.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
-        assert_eq!(
-            endpoint.speech_buf.len(),
-            (VAD_PRE_ROLL_FRAMES + 1) * VAD_FRAME_SAMPLES
-        );
-    }
-
-    #[test]
-    fn onset_requires_consecutive_high_frames() {
-        let mut endpoint = VadEndpoint::new();
-        for probability in [0.9, 0.9, 0.2, 0.9, 0.9] {
-            assert_eq!(
-                endpoint.process_frame(frame(1.0), probability, true, true, SILENCE_FLUSH_FRAMES),
-                VadFrameAction::None
-            );
-        }
-        assert_eq!(
-            endpoint.process_frame(frame(1.0), 0.9, true, true, SILENCE_FLUSH_FRAMES),
-            VadFrameAction::Speech
-        );
-    }
-
-    #[test]
-    fn offset_hysteresis_preserves_borderline_speech() {
-        let mut endpoint = VadEndpoint::new();
-        for _ in 0..VAD_ONSET_FRAMES {
-            endpoint.process_frame(frame(1.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
-        }
-        assert_eq!(
-            endpoint.process_frame(frame(2.0), 0.4, true, true, SILENCE_FLUSH_FRAMES),
-            VadFrameAction::Speech
-        );
-        assert_eq!(endpoint.silence_frames, 0);
-    }
-
-    #[test]
-    fn below_offset_threshold_starts_silence() {
-        let mut endpoint = VadEndpoint::new();
-        for _ in 0..VAD_ONSET_FRAMES {
-            endpoint.process_frame(frame(1.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
-        }
-        assert_eq!(
-            endpoint.process_frame(frame(0.0), 0.3, true, true, SILENCE_FLUSH_FRAMES),
-            VadFrameAction::FirstSilence
-        );
-        assert_eq!(endpoint.silence_frames, 1);
-    }
-
-    #[test]
-    fn short_segment_reaches_the_visible_drop_path() {
-        let mut endpoint = VadEndpoint::new();
-        for _ in 0..VAD_ONSET_FRAMES {
-            endpoint.process_frame(frame(1.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
-        }
-        let mut action = VadFrameAction::None;
-        for _ in 0..SILENCE_FLUSH_FRAMES {
-            action = endpoint.process_frame(frame(0.0), 0.0, true, true, SILENCE_FLUSH_FRAMES);
-        }
-        assert_eq!(action, VadFrameAction::Flush);
-        assert!(!has_enough_voiced_audio(endpoint.voiced_frames));
-        assert!(!endpoint.speech_buf.is_empty());
-    }
-
-    #[test]
-    fn silence_flush_retains_only_hangover_audio() {
-        let mut endpoint = VadEndpoint::new();
-        for _ in 0..VAD_ONSET_FRAMES {
-            endpoint.process_frame(frame(1.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
-        }
-        let speech_len = endpoint.speech_buf.len();
-        for index in 1..=SILENCE_FLUSH_FRAMES {
-            let action = endpoint.process_frame(frame(0.0), 0.0, true, true, SILENCE_FLUSH_FRAMES);
-            if index == SILENCE_FLUSH_FRAMES {
-                assert_eq!(action, VadFrameAction::Flush);
-            }
-        }
-        assert_eq!(
-            endpoint.speech_buf.len(),
-            speech_len + 6 * VAD_FRAME_SAMPLES
-        );
-    }
-
-    #[test]
-    fn flush_boundary_never_double_includes_audio() {
-        const SEGMENT_N_MARKER: f32 = 777.0;
-        let mut endpoint = VadEndpoint::new();
-        for _ in 0..VAD_ONSET_FRAMES {
-            endpoint.process_frame(
-                frame(SEGMENT_N_MARKER),
-                0.9,
-                true,
-                true,
-                SILENCE_FLUSH_FRAMES,
-            );
-        }
-        for _ in 0..SILENCE_FLUSH_FRAMES {
-            endpoint.process_frame(
-                frame(SEGMENT_N_MARKER),
-                0.0,
-                true,
-                true,
-                SILENCE_FLUSH_FRAMES,
-            );
-        }
-        endpoint.reset_segment();
-
-        for _ in 0..VAD_ONSET_FRAMES {
-            endpoint.process_frame(frame(2.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
-        }
-        let leaked = endpoint
-            .speech_buf
-            .iter()
-            .filter(|sample| **sample == SEGMENT_N_MARKER)
-            .count();
-        assert_eq!(leaked, 0, "segment N audio leaked into segment N+1");
-    }
-
-    #[test]
-    fn reset_prevents_pre_roll_from_leaking_between_segments() {
-        const SEGMENT_N_MARKER: f32 = 777.0;
-        let mut endpoint = VadEndpoint::new();
-        endpoint.pre_roll.push_back(frame(SEGMENT_N_MARKER));
-        endpoint.reset_segment();
-        for _ in 0..VAD_ONSET_FRAMES {
-            endpoint.process_frame(frame(2.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
-        }
-        let leaked = endpoint
-            .speech_buf
-            .iter()
-            .filter(|sample| **sample == SEGMENT_N_MARKER)
-            .count();
-        assert_eq!(leaked, 0, "segment N pre-roll leaked into segment N+1");
-    }
-
-    #[test]
-    fn held_push_to_talk_never_silence_flushes() {
-        // Pure VAD mode: silence always ends the utterance.
-        assert!(vad_flush_allowed(false, false, false));
-        // Shortcut configured, nothing transmitting: nothing to flush anyway,
-        // but the pause path stays closed.
-        assert!(!vad_flush_allowed(true, false, false));
-        // Shortcut held: "I am not done talking" — never flush on silence,
-        // regardless of the manual mic state.
-        assert!(!vad_flush_allowed(true, false, true));
-        assert!(!vad_flush_allowed(true, true, true));
-        // Manually open mic with the shortcut up: normal VAD behavior.
-        assert!(vad_flush_allowed(true, true, false));
-    }
-}
+#[path = "stt_tests.rs"]
+mod tests;
diff --git a/desktop/src-tauri/src/huddle/stt_tests.rs b/desktop/src-tauri/src/huddle/stt_tests.rs
new file mode 100644
index 0000000000..3fba9adafa
--- /dev/null
+++ b/desktop/src-tauri/src/huddle/stt_tests.rs
@@ -0,0 +1,255 @@
+use std::sync::{atomic::AtomicBool, mpsc, Arc, Barrier};
+
+use super::{
+    has_enough_voiced_audio, run_stt_receive_loop, vad_flush_allowed, HumanFloor, SttLoopInput,
+    VadEndpoint, VadFrameAction, MIN_VOICED_FRAMES, SILENCE_FLUSH_FRAMES, VAD_FRAME_SAMPLES,
+    VAD_ONSET_FRAMES, VAD_PRE_ROLL_FRAMES,
+};
+
+#[derive(Clone, Copy)]
+enum WorkerExit {
+    Shutdown,
+    SenderDisconnect,
+}
+
+fn assert_worker_exit_releases_floor(exit: WorkerExit) {
+    let human_floor = HumanFloor::new();
+    let shutdown = Arc::new(AtomicBool::new(false));
+    let (audio_tx, audio_rx) = mpsc::channel();
+    let acquired = Arc::new(Barrier::new(2));
+    let worker_floor = human_floor.clone();
+    let worker_shutdown = Arc::clone(&shutdown);
+    let worker_acquired = Arc::clone(&acquired);
+    let worker = std::thread::spawn(move || {
+        run_stt_receive_loop(
+            audio_rx,
+            &worker_shutdown,
+            worker_floor.clone(),
+            |input, local_barge_in_state| {
+                if matches!(input, SttLoopInput::Batch(_)) && !worker_floor.is_blocked() {
+                    local_barge_in_state.acquire(&worker_floor, true, false);
+                    worker_acquired.wait();
+                }
+            },
+        );
+    });
+
+    audio_tx.send(Vec::new()).expect("worker receiver is open");
+    acquired.wait();
+    assert!(human_floor.is_blocked());
+    match exit {
+        WorkerExit::Shutdown => {
+            shutdown.store(true, std::sync::atomic::Ordering::Release);
+        }
+        WorkerExit::SenderDisconnect => drop(audio_tx),
+    }
+    worker.join().expect("worker exits cleanly");
+
+    let replacement_epoch = human_floor.epoch();
+    assert!(
+        human_floor.permits(replacement_epoch),
+        "fresh TTS authorization must proceed after worker exit"
+    );
+    assert!(human_floor.enter_local(true, false));
+}
+
+#[test]
+fn worker_shutdown_releases_local_floor_for_replacement() {
+    assert_worker_exit_releases_floor(WorkerExit::Shutdown);
+}
+
+#[test]
+fn worker_channel_disconnect_releases_local_floor_for_replacement() {
+    assert_worker_exit_releases_floor(WorkerExit::SenderDisconnect);
+}
+
+fn frame(value: f32) -> Vec<f32> {
+    vec![value; VAD_FRAME_SAMPLES]
+}
+
+#[test]
+fn short_vad_blips_do_not_reach_the_recognizer() {
+    assert!(!has_enough_voiced_audio(1));
+    assert!(!has_enough_voiced_audio(MIN_VOICED_FRAMES - 1));
+    assert!(has_enough_voiced_audio(MIN_VOICED_FRAMES));
+}
+
+#[test]
+fn confirmed_onset_prepends_pre_roll_once() {
+    let mut endpoint = VadEndpoint::new();
+    for value in 0..VAD_PRE_ROLL_FRAMES - VAD_ONSET_FRAMES {
+        assert_eq!(
+            endpoint.process_frame(frame(value as f32), 0.0, true, true, SILENCE_FLUSH_FRAMES),
+            VadFrameAction::None
+        );
+    }
+    for value in 0..VAD_ONSET_FRAMES {
+        let action = endpoint.process_frame(
+            frame(100.0 + value as f32),
+            0.9,
+            true,
+            true,
+            SILENCE_FLUSH_FRAMES,
+        );
+        if value + 1 == VAD_ONSET_FRAMES {
+            assert_eq!(action, VadFrameAction::ConfirmedOnset);
+        } else {
+            assert_eq!(action, VadFrameAction::None);
+        }
+    }
+
+    assert_eq!(
+        endpoint.speech_buf.len(),
+        VAD_PRE_ROLL_FRAMES * VAD_FRAME_SAMPLES
+    );
+    assert_eq!(endpoint.speech_buf[0], 0.0);
+    assert_eq!(endpoint.speech_buf[VAD_FRAME_SAMPLES], 1.0);
+    assert_eq!(endpoint.pre_roll.len(), 0);
+    endpoint.process_frame(frame(200.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
+    assert_eq!(
+        endpoint.speech_buf.len(),
+        (VAD_PRE_ROLL_FRAMES + 1) * VAD_FRAME_SAMPLES
+    );
+}
+
+#[test]
+fn onset_requires_consecutive_high_frames() {
+    let mut endpoint = VadEndpoint::new();
+    for probability in [0.9, 0.9, 0.2, 0.9, 0.9] {
+        assert_eq!(
+            endpoint.process_frame(frame(1.0), probability, true, true, SILENCE_FLUSH_FRAMES),
+            VadFrameAction::None
+        );
+    }
+    assert_eq!(
+        endpoint.process_frame(frame(1.0), 0.9, true, true, SILENCE_FLUSH_FRAMES),
+        VadFrameAction::ConfirmedOnset
+    );
+}
+
+#[test]
+fn offset_hysteresis_preserves_borderline_speech() {
+    let mut endpoint = VadEndpoint::new();
+    for _ in 0..VAD_ONSET_FRAMES {
+        endpoint.process_frame(frame(1.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
+    }
+    assert_eq!(
+        endpoint.process_frame(frame(2.0), 0.4, true, true, SILENCE_FLUSH_FRAMES),
+        VadFrameAction::Speech
+    );
+    assert_eq!(endpoint.silence_frames, 0);
+}
+
+#[test]
+fn below_offset_threshold_starts_silence() {
+    let mut endpoint = VadEndpoint::new();
+    for _ in 0..VAD_ONSET_FRAMES {
+        endpoint.process_frame(frame(1.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
+    }
+    assert_eq!(
+        endpoint.process_frame(frame(0.0), 0.3, true, true, SILENCE_FLUSH_FRAMES),
+        VadFrameAction::FirstSilence
+    );
+    assert_eq!(endpoint.silence_frames, 1);
+}
+
+#[test]
+fn short_segment_reaches_the_visible_drop_path() {
+    let mut endpoint = VadEndpoint::new();
+    for _ in 0..VAD_ONSET_FRAMES {
+        endpoint.process_frame(frame(1.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
+    }
+    let mut action = VadFrameAction::None;
+    for _ in 0..SILENCE_FLUSH_FRAMES {
+        action = endpoint.process_frame(frame(0.0), 0.0, true, true, SILENCE_FLUSH_FRAMES);
+    }
+    assert_eq!(action, VadFrameAction::Flush);
+    assert!(!has_enough_voiced_audio(endpoint.voiced_frames));
+    assert!(!endpoint.speech_buf.is_empty());
+}
+
+#[test]
+fn silence_flush_retains_only_hangover_audio() {
+    let mut endpoint = VadEndpoint::new();
+    for _ in 0..VAD_ONSET_FRAMES {
+        endpoint.process_frame(frame(1.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
+    }
+    let speech_len = endpoint.speech_buf.len();
+    for index in 1..=SILENCE_FLUSH_FRAMES {
+        let action = endpoint.process_frame(frame(0.0), 0.0, true, true, SILENCE_FLUSH_FRAMES);
+        if index == SILENCE_FLUSH_FRAMES {
+            assert_eq!(action, VadFrameAction::Flush);
+        }
+    }
+    assert_eq!(
+        endpoint.speech_buf.len(),
+        speech_len + 6 * VAD_FRAME_SAMPLES
+    );
+}
+
+#[test]
+fn flush_boundary_never_double_includes_audio() {
+    const SEGMENT_N_MARKER: f32 = 777.0;
+    let mut endpoint = VadEndpoint::new();
+    for _ in 0..VAD_ONSET_FRAMES {
+        endpoint.process_frame(
+            frame(SEGMENT_N_MARKER),
+            0.9,
+            true,
+            true,
+            SILENCE_FLUSH_FRAMES,
+        );
+    }
+    for _ in 0..SILENCE_FLUSH_FRAMES {
+        endpoint.process_frame(
+            frame(SEGMENT_N_MARKER),
+            0.0,
+            true,
+            true,
+            SILENCE_FLUSH_FRAMES,
+        );
+    }
+    endpoint.reset_segment();
+
+    for _ in 0..VAD_ONSET_FRAMES {
+        endpoint.process_frame(frame(2.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
+    }
+    let leaked = endpoint
+        .speech_buf
+        .iter()
+        .filter(|sample| **sample == SEGMENT_N_MARKER)
+        .count();
+    assert_eq!(leaked, 0, "segment N audio leaked into segment N+1");
+}
+
+#[test]
+fn reset_prevents_pre_roll_from_leaking_between_segments() {
+    const SEGMENT_N_MARKER: f32 = 777.0;
+    let mut endpoint = VadEndpoint::new();
+    endpoint.pre_roll.push_back(frame(SEGMENT_N_MARKER));
+    endpoint.reset_segment();
+    for _ in 0..VAD_ONSET_FRAMES {
+        endpoint.process_frame(frame(2.0), 0.9, true, true, SILENCE_FLUSH_FRAMES);
+    }
+    let leaked = endpoint
+        .speech_buf
+        .iter()
+        .filter(|sample| **sample == SEGMENT_N_MARKER)
+        .count();
+    assert_eq!(leaked, 0, "segment N pre-roll leaked into segment N+1");
+}
+
+#[test]
+fn held_push_to_talk_never_silence_flushes() {
+    // Pure VAD mode: silence always ends the utterance.
+    assert!(vad_flush_allowed(false, false, false));
+    // Shortcut configured, nothing transmitting: nothing to flush anyway,
+    // but the pause path stays closed.
+    assert!(!vad_flush_allowed(true, false, false));
+    // Shortcut held: "I am not done talking" — never flush on silence,
+    // regardless of the manual mic state.
+    assert!(!vad_flush_allowed(true, false, true));
+    assert!(!vad_flush_allowed(true, true, true));
+    // Manually open mic with the shortcut up: normal VAD behavior.
+    assert!(vad_flush_allowed(true, true, false));
+}
diff --git a/desktop/src-tauri/src/huddle/tts.rs b/desktop/src-tauri/src/huddle/tts.rs
index 5c6bbc4c77..920143e93a 100644
--- a/desktop/src-tauri/src/huddle/tts.rs
+++ b/desktop/src-tauri/src/huddle/tts.rs
@@ -46,6 +46,7 @@ use std::{
     time::{Duration, Instant},
 };
 
+use super::human_floor::HumanFloor;
 use super::pocket::{
     load_text_to_speech, load_voice_style, DEFAULT_VOICE, SAMPLE_RATE, VOICE_FILE_EXT,
 };
@@ -53,10 +54,8 @@ use super::preprocessing::preprocess_for_tts;
 
 #[path = "tts_voice_transition.rs"]
 mod voice_transition;
+use super::tts_playback::*;
 use voice_transition::*;
-#[path = "tts_playback.rs"]
-mod playback;
-use playback::*;
 #[path = "tts_startup.rs"]
 mod startup;
 use startup::await_worker_startup;
@@ -153,6 +152,7 @@ pub struct TtsPipeline {
     /// Kept alive here so the Arc isn't dropped — the worker holds a clone.
     #[allow(dead_code)]
     cancel: Arc<AtomicBool>,
+    human_floor: HumanFloor,
     /// Internal cancellation used only for voice changes. Kept separate so a
     /// concurrent human barge-in always clears every queued message.
     voice_cancel: Arc<AtomicBool>,
@@ -185,6 +185,7 @@ impl TtsPipeline {
         model_dir: PathBuf,
         tts_active: Arc<AtomicBool>,
         cancel: Arc<AtomicBool>,
+        human_floor: HumanFloor,
         voice: &str,
         output_device: Option<String>,
         activity_app: Option<tauri::AppHandle>,
@@ -196,6 +197,7 @@ impl TtsPipeline {
 
         let shutdown_worker = Arc::clone(&shutdown);
         let cancel_worker = Arc::clone(&cancel);
+        let worker_human_floor = human_floor.clone();
         let voice_cancel = Arc::new(AtomicBool::new(false));
         let worker_voice_cancel = Arc::clone(&voice_cancel);
         let tts_active_worker = Arc::clone(&tts_active);
@@ -227,6 +229,7 @@ impl TtsPipeline {
                         worker_voice_change_ack,
                     ),
                     text_rx,
+                    worker_human_floor,
                     (
                         tts_active_worker,
                         shutdown_worker,
@@ -249,6 +252,7 @@ impl TtsPipeline {
             tts_active,
             shutdown,
             cancel,
+            human_floor,
             voice_cancel,
             voice,
             voice_generation,
@@ -275,10 +279,130 @@ impl Drop for TtsPipeline {
 
 // ── Worker thread ─────────────────────────────────────────────────────────────
 
+fn authorize_or_defer_queued_text(
+    human_floor: &HumanFloor,
+    deferred_text: &mut VecDeque<QueuedText>,
+    queued_text: QueuedText,
+) -> Result<QueuedText, HumanFloorAuthorization> {
+    match human_floor.authorization(queued_text.floor_epoch) {
+        HumanFloorAuthorization::Blocked => {
+            deferred_text.push_front(queued_text);
+            Err(HumanFloorAuthorization::Blocked)
+        }
+        HumanFloorAuthorization::Stale => {
+            eprintln!(
+                "buzz-desktop: tts stage=queue status=dropped reason=barge_in route_id={}",
+                queued_text.route_id
+            );
+            Err(HumanFloorAuthorization::Stale)
+        }
+        HumanFloorAuthorization::Permitted => Ok(queued_text),
+    }
+}
+
+struct TtsAppendContext<'a> {
+    playback: &'a PlaybackCoordinator,
+    #[cfg(test)]
+    human_floor: &'a HumanFloor,
+    cancel: &'a AtomicBool,
+    voice_cancel: &'a AtomicBool,
+    shutdown: &'a AtomicBool,
+    tts_active: &'a AtomicBool,
+    speaker_generations: &'a SpeakerGenerations,
+    active_speaker: &'a ActiveSpeaker,
+    activity_frames: &'a Mutex<VecDeque<TtsSpeakerActivityFrame>>,
+    channels: NonZero<u16>,
+    rate: NonZero<u32>,
+}
+
+fn append_worker_audio(
+    context: &TtsAppendContext<'_>,
+    prepared: PreparedModelAudio,
+    route_id: u64,
+    speaker_pubkey: Option<&str>,
+    speaker_generation: u64,
+    floor_epoch: u64,
+) -> bool {
+    // Keep the shared floor in this context so the regression can mutation-check
+    // that authorization never moves back inside the coordinator callback.
+    #[cfg(test)]
+    let _ = context.human_floor;
+    let sample_count = prepared.sample_count;
+    let chunk_index = prepared.chunk_index;
+    let activity = speaker_pubkey.map(|pubkey| {
+        build_tts_speaker_activity_frames(&prepared.buffer, pubkey, SAMPLE_RATE as usize)
+    });
+    let floor_authorization = context.playback.append_if_human_floor_permits(
+        rodio::buffer::SamplesBuffer::new(context.channels, context.rate, prepared.buffer),
+        floor_epoch,
+        |player_empty| {
+            if context.cancel.load(Ordering::Acquire)
+                || context.voice_cancel.load(Ordering::Acquire)
+                || context.shutdown.load(Ordering::Acquire)
+            {
+                let reason = if context.shutdown.load(Ordering::Acquire) {
+                    "shutdown"
+                } else if context.cancel.load(Ordering::Acquire) {
+                    "barge_in"
+                } else {
+                    "voice_switch"
+                };
+                eprintln!(
+                    "buzz-desktop: tts stage=synthesis status=cancelled reason={reason} route_id={route_id}"
+                );
+                return false;
+            }
+            if speaker_pubkey.is_some_and(|pubkey| {
+                current_speaker_generation(context.speaker_generations, pubkey)
+                    != speaker_generation
+            }) {
+                eprintln!(
+                    "buzz-desktop: tts stage=synthesis status=cancelled reason=speaker_removed route_id={route_id}"
+                );
+                return false;
+            }
+            if let Some(pubkey) = speaker_pubkey {
+                let mut active = context
+                    .active_speaker
+                    .lock()
+                    .unwrap_or_else(|error| error.into_inner());
+                if player_empty {
+                    active.take();
+                }
+                if active
+                    .as_deref()
+                    .is_some_and(|current| !current.eq_ignore_ascii_case(pubkey))
+                {
+                    return false;
+                }
+                active.get_or_insert_with(|| pubkey.to_ascii_lowercase());
+                context
+                    .activity_frames
+                    .lock()
+                    .unwrap_or_else(|error| error.into_inner())
+                    .extend(activity.unwrap_or_default());
+            }
+            true
+        },
+        // Publish activity under the coordinator: an append and the mic gate it
+        // implies are one transition, so cancellation cannot overwrite it.
+        || context.tts_active.store(true, Ordering::Release),
+    );
+    if floor_authorization != HumanFloorAuthorization::Permitted {
+        return false;
+    }
+    eprintln!(
+        "buzz-desktop: tts stage=player status=append_accepted route_id={route_id} chunk_index={chunk_index} sample_count={sample_count}"
+    );
+    true
+}
+
+#[allow(clippy::too_many_arguments)]
 fn tts_worker(
     model_dir: PathBuf,
     voice_state: WorkerVoiceState,
     text_rx: mpsc::Receiver<QueuedText>,
+    human_floor: HumanFloor,
     control_state: WorkerControlState,
     output_device: Option<String>,
     activity_app: Option<tauri::AppHandle>,
@@ -377,10 +501,11 @@ fn tts_worker(
         }
     };
 
-    // One coordinator owns the current Player and every operation on it.
-    // Cancellation replaces its queue while the output stream and mixer stay
-    // alive, preserving cross-item pipelining without exposing Player handles.
-    let playback = Arc::new(PlaybackCoordinator::new(sink_handle.mixer()));
+    // One coordinator owns the current Player, floor state, and every operation.
+    // It was allocated with the huddle state so onset and playback share the
+    // same serialization boundary even before the TTS worker starts.
+    let playback = human_floor.playback();
+    playback.bind_mixer(sink_handle.mixer());
     playback_probe.install(Arc::clone(&playback));
 
     // Prime the audio output stream with a short silent buffer.
@@ -442,76 +567,33 @@ fn tts_worker(
     let tts_streaming = streaming_emit_frames();
     let mut last_route_id = 0;
     let mut deferred_text = VecDeque::new();
+    let append_context = TtsAppendContext {
+        playback: &playback,
+        #[cfg(test)]
+        human_floor: &human_floor,
+        cancel: &cancel,
+        voice_cancel: &voice_cancel,
+        shutdown: &shutdown,
+        tts_active: &tts_active,
+        speaker_generations: &speaker_generations,
+        active_speaker: &active_speaker,
+        activity_frames: &activity_frames,
+        channels,
+        rate,
+    };
     let append_audio = |prepared: PreparedModelAudio,
                         route_id: u64,
                         speaker_pubkey: Option<&str>,
-                        speaker_generation: u64| {
-        let sample_count = prepared.sample_count;
-        let chunk_index = prepared.chunk_index;
-        let activity = speaker_pubkey.map(|pubkey| {
-            build_tts_speaker_activity_frames(&prepared.buffer, pubkey, SAMPLE_RATE as usize)
-        });
-        let accepted = playback.append_if(
-            SamplesBuffer::new(channels, rate, prepared.buffer),
-            |player_empty| {
-                if cancel.load(Ordering::Acquire)
-                    || voice_cancel.load(Ordering::Acquire)
-                    || shutdown.load(Ordering::Acquire)
-                {
-                    let reason = if shutdown.load(Ordering::Acquire) {
-                        "shutdown"
-                    } else if cancel.load(Ordering::Acquire) {
-                        "barge_in"
-                    } else {
-                        "voice_switch"
-                    };
-                    eprintln!(
-                        "buzz-desktop: tts stage=synthesis status=cancelled reason={reason} route_id={route_id}"
-                    );
-                    return false;
-                }
-                if speaker_pubkey.is_some_and(|pubkey| {
-                    current_speaker_generation(&speaker_generations, pubkey) != speaker_generation
-                }) {
-                    eprintln!(
-                        "buzz-desktop: tts stage=synthesis status=cancelled reason=speaker_removed route_id={route_id}"
-                    );
-                    return false;
-                }
-                if let Some(pubkey) = speaker_pubkey {
-                    let mut active = active_speaker
-                        .lock()
-                        .unwrap_or_else(|error| error.into_inner());
-                    if player_empty {
-                        active.take();
-                    }
-                    if active
-                        .as_deref()
-                        .is_some_and(|current| !current.eq_ignore_ascii_case(pubkey))
-                    {
-                        return false;
-                    }
-                    active.get_or_insert_with(|| pubkey.to_ascii_lowercase());
-                    activity_frames
-                        .lock()
-                        .unwrap_or_else(|error| error.into_inner())
-                        .extend(activity.unwrap_or_default());
-                }
-                true
-            },
-            // Publish activity under the coordinator: an append and the mic
-            // gate it implies are one transition, so a cancellation that
-            // replaces this player cannot have its release overwritten by a
-            // `true` landing after the fact.
-            || tts_active.store(true, Ordering::Release),
-        );
-        if !accepted {
-            return false;
-        }
-        eprintln!(
-            "buzz-desktop: tts stage=player status=append_accepted route_id={route_id} chunk_index={chunk_index} sample_count={sample_count}"
-        );
-        true
+                        speaker_generation: u64,
+                        floor_epoch: u64| {
+        append_worker_audio(
+            &append_context,
+            prepared,
+            route_id,
+            speaker_pubkey,
+            speaker_generation,
+            floor_epoch,
+        )
     };
 
     loop {
@@ -632,7 +714,19 @@ fn tts_worker(
             thread::sleep(RECV_TIMEOUT);
             continue;
         }
-        let requested_voice = queued_text.voice_reference.unwrap_or_else(|| {
+        let mut queued_text =
+            match authorize_or_defer_queued_text(&human_floor, &mut deferred_text, queued_text) {
+                Ok(queued_text) => queued_text,
+                Err(HumanFloorAuthorization::Blocked) => {
+                    thread::sleep(RECV_TIMEOUT);
+                    continue;
+                }
+                Err(HumanFloorAuthorization::Stale) => continue,
+                Err(HumanFloorAuthorization::Permitted) => {
+                    unreachable!("permitted text is returned")
+                }
+            };
+        let requested_voice = queued_text.voice_reference.take().unwrap_or_else(|| {
             selected_voice
                 .lock()
                 .unwrap_or_else(|error| error.into_inner())
@@ -641,6 +735,7 @@ fn tts_worker(
         let raw_text = queued_text.text;
         let speaker_pubkey = queued_text.speaker_pubkey;
         let speaker_generation = queued_text.speaker_generation;
+        let floor_epoch = queued_text.floor_epoch;
         let route_id = queued_text.route_id;
         eprintln!("buzz-desktop: tts stage=synthesis status=started route_id={route_id}");
 
@@ -751,6 +846,7 @@ fn tts_worker(
                             route_id,
                             speaker_pubkey.as_deref(),
                             speaker_generation,
+                            floor_epoch,
                         ) {
                             return false;
                         }
@@ -832,6 +928,7 @@ fn tts_worker(
                                 route_id,
                                 speaker_pubkey.as_deref(),
                                 speaker_generation,
+                                floor_epoch,
                             ) {
                                 synthesis_outcome = "cancelled";
                                 break 'playback_chunks;
@@ -860,6 +957,7 @@ fn tts_worker(
                     route_id,
                     speaker_pubkey.as_deref(),
                     speaker_generation,
+                    floor_epoch,
                 ) {
                     synthesis_outcome = "cancelled";
                     break 'playback_chunks;
diff --git a/desktop/src-tauri/src/huddle/tts_pipeline_controls.rs b/desktop/src-tauri/src/huddle/tts_pipeline_controls.rs
index 0ee472f0fd..5464fe0872 100644
--- a/desktop/src-tauri/src/huddle/tts_pipeline_controls.rs
+++ b/desktop/src-tauri/src/huddle/tts_pipeline_controls.rs
@@ -6,9 +6,11 @@ impl TtsPipeline {
     /// Non-blocking. Returns `Err` if the queue is full (bounded at
     /// `TEXT_QUEUE_DEPTH`) — caller may log and discard.
     pub fn speak(&self, text: String) -> Result<(), String> {
+        let floor_epoch = self.human_floor.epoch();
         self.text_tx
             .try_send(QueuedText {
                 generation: self.voice_generation.load(Ordering::Acquire),
+                floor_epoch,
                 route_id: 0,
                 speaker_pubkey: None,
                 speaker_generation: 0,
@@ -28,6 +30,7 @@ impl TtsPipeline {
         TtsTextSender {
             text_tx: self.text_tx.clone(),
             generation: self.voice_generation.load(Ordering::Acquire),
+            human_floor: self.human_floor.clone(),
             speaker_generations: Arc::clone(&self.speaker_generations),
         }
     }
diff --git a/desktop/src-tauri/src/huddle/tts_playback.rs b/desktop/src-tauri/src/huddle/tts_playback.rs
index 93a5b16b8c..8a90c01899 100644
--- a/desktop/src-tauri/src/huddle/tts_playback.rs
+++ b/desktop/src-tauri/src/huddle/tts_playback.rs
@@ -1,7 +1,17 @@
-use std::sync::{Arc, Mutex, MutexGuard, PoisonError};
+use std::{
+    collections::HashSet,
+    sync::{Arc, Mutex, MutexGuard, PoisonError},
+    time::{Duration, Instant},
+};
 
 use rodio::{mixer::Mixer, Player, Source};
 
+/// Conservative guard after rodio reports drained. Max measured about 12 ms
+/// of cancellation tail on current-main CoreAudio and about 1 ms after player
+/// replacement; 100 ms safely bounds those observed paths while the phase-1
+/// route matrix determines whether this can be narrowed.
+const OUTPUT_TAIL_HANGOVER: Duration = Duration::from_millis(100);
+
 /// Serializes every operation on the TTS player and owns the utterance-boundary
 /// bookkeeping that must change atomically when playback is replaced.
 ///
@@ -10,18 +20,62 @@ use rodio::{mixer::Mixer, Player, Source};
 /// independently valid at either value, and no mutable reference to the state
 /// leaves the locked operation that created it.
 pub(super) struct PlaybackCoordinator {
-    mixer: Mixer,
+    mixer: Mutex<Option<Mixer>>,
     state: Mutex<PlaybackState>,
 }
 
 struct PlaybackState {
-    player: Player,
+    player: Option<Player>,
     /// `true` while no append has been committed since the last utterance
     /// boundary. Only `append_if` clears it, so it records appends that were
     /// actually queued — never one the authorization refused.
     first_append: bool,
     synthesis_in_flight: bool,
     synthesis_generation: u64,
+    output_lease: OutputLease,
+    human_floor: HumanFloorState,
+}
+
+#[derive(Default)]
+enum OutputLease {
+    #[default]
+    Inactive,
+    Active,
+    HangoverUntil(Instant),
+}
+
+impl OutputLease {
+    fn is_live_at(&mut self, now: Instant) -> bool {
+        match self {
+            Self::Inactive => false,
+            Self::Active => true,
+            Self::HangoverUntil(deadline) if now < *deadline => true,
+            Self::HangoverUntil(_) => {
+                *self = Self::Inactive;
+                false
+            }
+        }
+    }
+
+    fn begin_hangover(&mut self, now: Instant) {
+        if !matches!(self, Self::Inactive) {
+            *self = Self::HangoverUntil(now + OUTPUT_TAIL_HANGOVER);
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(super) enum HumanFloorAuthorization {
+    Permitted,
+    Blocked,
+    Stale,
+}
+
+#[derive(Default)]
+struct HumanFloorState {
+    epoch: u64,
+    local: bool,
+    remote: HashSet<u8>,
 }
 
 pub(super) struct SynthesisFlightGuard {
@@ -39,18 +93,35 @@ impl Drop for SynthesisFlightGuard {
 }
 
 impl PlaybackCoordinator {
+    #[cfg(test)]
     pub(super) fn new(mixer: &Mixer) -> Self {
+        let coordinator = Self::unbound();
+        coordinator.bind_mixer(mixer);
+        coordinator
+    }
+
+    pub(super) fn unbound() -> Self {
         Self {
-            mixer: mixer.clone(),
+            mixer: Mutex::new(None),
             state: Mutex::new(PlaybackState {
-                player: Player::connect_new(mixer),
+                player: None,
                 first_append: true,
                 synthesis_in_flight: false,
                 synthesis_generation: 0,
+                output_lease: OutputLease::Inactive,
+                human_floor: HumanFloorState::default(),
             }),
         }
     }
 
+    pub(super) fn bind_mixer(&self, mixer: &Mixer) {
+        *self.mixer.lock().unwrap_or_else(PoisonError::into_inner) = Some(mixer.clone());
+        let mut state = self.lock();
+        if state.player.is_none() {
+            state.player = Some(Player::connect_new(mixer));
+        }
+    }
+
     fn lock(&self) -> MutexGuard<'_, PlaybackState> {
         self.state.lock().unwrap_or_else(PoisonError::into_inner)
     }
@@ -61,6 +132,7 @@ impl PlaybackCoordinator {
     /// concurrent cancellation either replaces the queue before this append is
     /// authorized, or observes the committed state after it — never lands its
     /// own release between the two and gets overwritten.
+    #[cfg(test)]
     pub(super) fn append_if<S>(
         &self,
         source: S,
@@ -71,11 +143,15 @@ impl PlaybackCoordinator {
         S: Source<Item = f32> + Send + 'static,
     {
         let mut state = self.lock();
-        if !authorize(state.player.empty()) {
+        if !authorize(state.player.as_ref().is_none_or(Player::empty)) {
             return false;
         }
-        state.player.append(source);
+        let Some(player) = state.player.as_ref() else {
+            return false;
+        };
+        player.append(source);
         state.first_append = false;
+        state.output_lease = OutputLease::Active;
         commit();
         true
     }
@@ -84,28 +160,31 @@ impl PlaybackCoordinator {
     where
         S: Source<Item = f32> + Send + 'static,
     {
-        self.lock().player.append(source);
+        if let Some(player) = self.lock().player.as_ref() {
+            player.append(source);
+        }
     }
 
     pub(super) fn empty(&self) -> bool {
-        self.lock().player.empty()
+        self.lock().player.as_ref().is_none_or(Player::empty)
     }
 
     /// Observe playback emptiness under the coordinator so the onset decision
     /// for the audio being built is serialized with append and cancellation.
     pub(super) fn prepare_audio<R>(&self, prepare: impl FnOnce(bool) -> R) -> R {
         let state = self.lock();
-        let empty = state.player.empty();
+        let empty = state.player.as_ref().is_none_or(Player::empty);
         prepare(empty)
     }
 
     pub(super) fn release_if_drained(&self, release: impl FnOnce()) -> bool {
         let mut state = self.lock();
-        if !state.player.empty() || state.first_append {
+        if !state.player.as_ref().is_none_or(Player::empty) || state.first_append {
             return false;
         }
         release();
         state.first_append = true;
+        state.output_lease.begin_hangover(Instant::now());
         true
     }
 
@@ -124,7 +203,7 @@ impl PlaybackCoordinator {
 
     pub(super) fn with_playback_live<R>(&self, observe: impl FnOnce(bool) -> R) -> R {
         let state = self.lock();
-        observe(!state.player.empty() || state.synthesis_in_flight)
+        observe(!state.player.as_ref().is_none_or(Player::empty) || state.synthesis_in_flight)
     }
 
     /// Replace live playback with a fresh queue, publishing the replacement
@@ -142,21 +221,162 @@ impl PlaybackCoordinator {
         authorize: impl FnOnce() -> bool,
         commit: impl FnOnce(),
     ) -> bool {
+        let replacement = self
+            .mixer
+            .lock()
+            .unwrap_or_else(PoisonError::into_inner)
+            .as_ref()
+            .map(Player::connect_new);
         let old_player = {
             let mut state = self.lock();
-            if (state.player.empty() && !state.synthesis_in_flight) || !authorize() {
+            if (state.player.as_ref().is_none_or(Player::empty) && !state.synthesis_in_flight)
+                || !authorize()
+            {
                 return false;
             }
             state.first_append = true;
             state.synthesis_in_flight = false;
             state.synthesis_generation = state.synthesis_generation.wrapping_add(1);
-            let old_player = std::mem::replace(&mut state.player, Player::connect_new(&self.mixer));
+            state.output_lease.begin_hangover(Instant::now());
+            let old_player = std::mem::replace(&mut state.player, replacement);
             commit();
             old_player
         };
         drop(old_player);
         true
     }
+
+    #[cfg(test)]
+    pub(super) fn human_floor_blocked(&self) -> bool {
+        let state = self.lock();
+        state.human_floor.local || !state.human_floor.remote.is_empty()
+    }
+
+    pub(super) fn human_floor_epoch(&self) -> u64 {
+        self.lock().human_floor.epoch
+    }
+
+    pub(super) fn human_floor_authorization(&self, epoch: u64) -> HumanFloorAuthorization {
+        Self::human_floor_authorization_locked(&self.lock(), epoch)
+    }
+
+    fn human_floor_authorization_locked(
+        state: &PlaybackState,
+        epoch: u64,
+    ) -> HumanFloorAuthorization {
+        if state.human_floor.local || !state.human_floor.remote.is_empty() {
+            HumanFloorAuthorization::Blocked
+        } else if state.human_floor.epoch != epoch {
+            HumanFloorAuthorization::Stale
+        } else {
+            HumanFloorAuthorization::Permitted
+        }
+    }
+
+    #[cfg(test)]
+    pub(super) fn human_floor_permits(&self, epoch: u64) -> bool {
+        self.human_floor_authorization(epoch) == HumanFloorAuthorization::Permitted
+    }
+
+    pub(super) fn append_if_human_floor_permits<S>(
+        &self,
+        source: S,
+        epoch: u64,
+        authorize: impl FnOnce(bool) -> bool,
+        commit: impl FnOnce(),
+    ) -> HumanFloorAuthorization
+    where
+        S: Source<Item = f32> + Send + 'static,
+    {
+        let mut state = self.lock();
+        let floor_authorization = Self::human_floor_authorization_locked(&state, epoch);
+        if floor_authorization != HumanFloorAuthorization::Permitted {
+            return floor_authorization;
+        }
+        if !authorize(state.player.as_ref().is_none_or(Player::empty)) {
+            return HumanFloorAuthorization::Stale;
+        }
+        let Some(player) = state.player.as_ref() else {
+            return HumanFloorAuthorization::Stale;
+        };
+        player.append(source);
+        state.first_append = false;
+        state.output_lease = OutputLease::Active;
+        commit();
+        HumanFloorAuthorization::Permitted
+    }
+
+    pub(super) fn enter_local_human_floor(
+        &self,
+        route_isolated: bool,
+        sustained_coupled_speech: bool,
+    ) -> bool {
+        let replacement = self
+            .mixer
+            .lock()
+            .unwrap_or_else(PoisonError::into_inner)
+            .as_ref()
+            .map(Player::connect_new);
+        let old_player = {
+            let mut state = self.lock();
+            let output_live =
+                state.synthesis_in_flight || state.output_lease.is_live_at(Instant::now());
+            if state.human_floor.local
+                || (output_live && !route_isolated && !sustained_coupled_speech)
+            {
+                return false;
+            }
+            state.human_floor.local = true;
+            Self::commit_human_floor_onset(&mut state, replacement)
+        };
+        drop(old_player);
+        true
+    }
+
+    pub(super) fn leave_local_human_floor(&self) {
+        self.lock().human_floor.local = false;
+    }
+
+    pub(super) fn enter_remote_human_floor(&self, peer: u8) {
+        self.enter_human_floor(|floor| floor.remote.insert(peer));
+    }
+
+    pub(super) fn leave_remote_human_floor(&self, peer: u8) {
+        self.lock().human_floor.remote.remove(&peer);
+    }
+
+    pub(super) fn clear_remote_human_floor(&self) {
+        self.lock().human_floor.remote.clear();
+    }
+
+    fn enter_human_floor(&self, enter: impl FnOnce(&mut HumanFloorState) -> bool) {
+        let replacement = self
+            .mixer
+            .lock()
+            .unwrap_or_else(PoisonError::into_inner)
+            .as_ref()
+            .map(Player::connect_new);
+        let old_player = {
+            let mut state = self.lock();
+            if !enter(&mut state.human_floor) {
+                return;
+            }
+            Self::commit_human_floor_onset(&mut state, replacement)
+        };
+        drop(old_player);
+    }
+
+    fn commit_human_floor_onset(
+        state: &mut PlaybackState,
+        replacement: Option<Player>,
+    ) -> Option<Player> {
+        state.human_floor.epoch = state.human_floor.epoch.wrapping_add(1);
+        state.first_append = true;
+        state.synthesis_in_flight = false;
+        state.synthesis_generation = state.synthesis_generation.wrapping_add(1);
+        state.output_lease.begin_hangover(Instant::now());
+        std::mem::replace(&mut state.player, replacement)
+    }
 }
 
 #[cfg(test)]
@@ -194,6 +414,185 @@ mod tests {
         );
     }
 
+    fn one_second_source() -> SamplesBuffer {
+        SamplesBuffer::new(
+            NonZero::new(1).expect("nonzero channels"),
+            NonZero::new(24_000).expect("nonzero rate"),
+            vec![0.25; 24_000],
+        )
+    }
+
+    #[test]
+    fn floor_authorized_append_does_not_reenter_the_coordinator_lock() {
+        let (playback, _unpulled_source) = coordinator();
+        let epoch = playback.human_floor_epoch();
+        let (completed_tx, completed_rx) = std::sync::mpsc::sync_channel(1);
+        let worker = thread::spawn(move || {
+            let authorization =
+                playback.append_if_human_floor_permits(one_second_source(), epoch, |_| true, || {});
+            completed_tx
+                .send(authorization)
+                .expect("completion receiver");
+        });
+
+        assert_eq!(
+            completed_rx
+                .recv_timeout(Duration::from_secs(1))
+                .expect("floor-authorized append must not deadlock"),
+            HumanFloorAuthorization::Permitted
+        );
+        worker.join().expect("append worker");
+    }
+
+    #[test]
+    fn text_queued_during_a_held_floor_is_permitted_after_release() {
+        let (playback, _unpulled_source) = coordinator();
+        assert!(playback.enter_local_human_floor(true, false));
+        let queued_epoch = playback.human_floor_epoch();
+
+        assert_eq!(
+            playback.human_floor_authorization(queued_epoch),
+            HumanFloorAuthorization::Blocked
+        );
+        playback.leave_local_human_floor();
+        assert_eq!(
+            playback.human_floor_authorization(queued_epoch),
+            HumanFloorAuthorization::Permitted
+        );
+        assert_eq!(
+            playback.append_if_human_floor_permits(
+                one_second_source(),
+                queued_epoch,
+                |_| true,
+                || {},
+            ),
+            HumanFloorAuthorization::Permitted
+        );
+    }
+
+    #[test]
+    fn human_onset_replaces_playback_and_invalidates_late_append() {
+        let (playback, _unpulled_source) = coordinator();
+        append_second(&playback);
+        let stale_epoch = playback.human_floor_epoch();
+
+        assert!(playback.enter_local_human_floor(true, false));
+
+        assert!(playback.empty());
+        assert!(playback.human_floor_blocked());
+        assert!(!playback.human_floor_permits(stale_epoch));
+        playback.leave_local_human_floor();
+        assert!(!playback.human_floor_blocked());
+        assert!(!playback.human_floor_permits(stale_epoch));
+    }
+
+    #[test]
+    fn coupled_local_onset_while_idle_blocks_delayed_tts() {
+        let (playback, _unpulled_source) = coordinator();
+        let delayed_tts_epoch = playback.human_floor_epoch();
+
+        assert!(playback.enter_local_human_floor(false, false));
+
+        assert!(playback.human_floor_blocked());
+        assert!(!playback.human_floor_permits(delayed_tts_epoch));
+    }
+
+    #[test]
+    fn coupled_local_onset_during_output_is_rejected_as_ambiguous_echo() {
+        let (playback, _unpulled_source) = coordinator();
+        append_second(&playback);
+        let epoch = playback.human_floor_epoch();
+
+        assert!(!playback.enter_local_human_floor(false, false));
+
+        assert!(!playback.human_floor_blocked());
+        assert!(playback.human_floor_permits(epoch));
+        assert!(!playback.empty());
+    }
+
+    #[test]
+    fn sustained_coupled_speech_overrides_live_output_suppression() {
+        let (playback, _unpulled_source) = coordinator();
+        append_second(&playback);
+        let stale_epoch = playback.human_floor_epoch();
+
+        assert!(playback.enter_local_human_floor(false, true));
+
+        assert!(playback.empty());
+        assert!(playback.human_floor_blocked());
+        assert!(!playback.human_floor_permits(stale_epoch));
+    }
+
+    #[test]
+    fn coupled_local_onset_during_output_tail_hangover_is_rejected() {
+        let (playback, mut source) = coordinator();
+        append_second(&playback);
+        while !playback.empty() {
+            assert!(
+                source.next().is_some(),
+                "the mixer source outlives the queue"
+            );
+        }
+        assert!(playback.release_if_drained(|| {}));
+
+        assert!(!playback.enter_local_human_floor(false, false));
+        assert!(!playback.human_floor_blocked());
+    }
+
+    #[test]
+    fn coupled_local_onset_after_output_tail_hangover_is_accepted() {
+        let (playback, mut source) = coordinator();
+        append_second(&playback);
+        while !playback.empty() {
+            assert!(
+                source.next().is_some(),
+                "the mixer source outlives the queue"
+            );
+        }
+        assert!(playback.release_if_drained(|| {}));
+        playback.lock().output_lease =
+            OutputLease::HangoverUntil(Instant::now() - Duration::from_millis(1));
+
+        assert!(playback.enter_local_human_floor(false, false));
+        assert!(playback.human_floor_blocked());
+    }
+
+    #[test]
+    fn accepted_append_renews_an_expiring_output_lease() {
+        let (playback, _unpulled_source) = coordinator();
+        playback.lock().output_lease =
+            OutputLease::HangoverUntil(Instant::now() + Duration::from_millis(1));
+
+        append_second(&playback);
+
+        assert!(matches!(playback.lock().output_lease, OutputLease::Active));
+    }
+
+    #[test]
+    fn remote_onset_while_idle_blocks_delayed_tts() {
+        let (playback, _unpulled_source) = coordinator();
+        let delayed_tts_epoch = playback.human_floor_epoch();
+
+        playback.enter_remote_human_floor(7);
+
+        assert!(playback.human_floor_blocked());
+        assert!(!playback.human_floor_permits(delayed_tts_epoch));
+    }
+
+    #[test]
+    fn local_and_remote_sources_hold_the_same_floor_until_each_releases() {
+        let (playback, _unpulled_source) = coordinator();
+        assert!(playback.enter_local_human_floor(true, false));
+        let local_epoch = playback.human_floor_epoch();
+        playback.enter_remote_human_floor(7);
+        assert_ne!(playback.human_floor_epoch(), local_epoch);
+
+        playback.leave_local_human_floor();
+        assert!(playback.human_floor_blocked());
+        playback.leave_remote_human_floor(7);
+        assert!(!playback.human_floor_blocked());
+    }
+
     #[test]
     fn cancel_replaces_playback_without_waiting_for_the_mixer() {
         let (playback, _unpulled_source) = coordinator();
diff --git a/desktop/src-tauri/src/huddle/tts_settings.rs b/desktop/src-tauri/src/huddle/tts_settings.rs
index 64fd6d8a94..75cfef26e5 100644
--- a/desktop/src-tauri/src/huddle/tts_settings.rs
+++ b/desktop/src-tauri/src/huddle/tts_settings.rs
@@ -622,6 +622,7 @@ pub async fn preview_pocket_voice(
             model_dir,
             active.clone(),
             cancel,
+            super::human_floor::HumanFloor::new(),
             &voice_name,
             output_device,
             None,
diff --git a/desktop/src-tauri/src/huddle/tts_tests.rs b/desktop/src-tauri/src/huddle/tts_tests.rs
index 3358d52644..05c8320cd6 100644
--- a/desktop/src-tauri/src/huddle/tts_tests.rs
+++ b/desktop/src-tauri/src/huddle/tts_tests.rs
@@ -12,6 +12,115 @@ use std::sync::{Arc, Mutex};
 #[path = "tts_tests/token_split.rs"]
 mod token_split;
 
+// ── Human-floor queue authorization ───────────────────────────────────────
+
+fn queued_text(route_id: u64, floor_epoch: u64) -> QueuedText {
+    QueuedText {
+        generation: 1,
+        floor_epoch,
+        route_id,
+        speaker_pubkey: None,
+        speaker_generation: 0,
+        voice_reference: None,
+        text: "queued while a human is speaking".to_string(),
+    }
+}
+
+#[test]
+fn production_worker_append_authorization_completes() {
+    let (completed_tx, completed_rx) = mpsc::sync_channel(1);
+    let worker = std::thread::spawn(move || {
+        let human_floor = HumanFloor::new();
+        let playback = human_floor.playback();
+        let channels = NonZero::new(1).expect("nonzero channels");
+        let rate = NonZero::new(SAMPLE_RATE).expect("nonzero rate");
+        let (mixer, _unpulled_source) = rodio::mixer::mixer(channels, rate);
+        playback.bind_mixer(&mixer);
+        let floor_epoch = human_floor.epoch();
+        let cancel = AtomicBool::new(false);
+        let voice_cancel = AtomicBool::new(false);
+        let shutdown = AtomicBool::new(false);
+        let tts_active = AtomicBool::new(false);
+        let speaker_generations = Arc::new(Mutex::new(HashMap::new()));
+        let active_speaker = Arc::new(Mutex::new(None));
+        let activity_frames = Mutex::new(VecDeque::new());
+        let context = TtsAppendContext {
+            playback: &playback,
+            human_floor: &human_floor,
+            cancel: &cancel,
+            voice_cancel: &voice_cancel,
+            shutdown: &shutdown,
+            tts_active: &tts_active,
+            speaker_generations: &speaker_generations,
+            active_speaker: &active_speaker,
+            activity_frames: &activity_frames,
+            channels,
+            rate,
+        };
+
+        let accepted = append_worker_audio(
+            &context,
+            PreparedModelAudio {
+                buffer: vec![0.25; SAMPLE_RATE as usize],
+                sample_count: SAMPLE_RATE as usize,
+                chunk_index: 0,
+            },
+            40,
+            None,
+            0,
+            floor_epoch,
+        );
+        completed_tx
+            .send((accepted, tts_active.load(Ordering::Acquire)))
+            .expect("completion receiver");
+    });
+
+    assert_eq!(
+        completed_rx
+            .recv_timeout(std::time::Duration::from_secs(1))
+            .expect("production worker append authorization must not deadlock"),
+        (true, true)
+    );
+    worker.join().expect("append worker");
+}
+
+#[test]
+fn worker_queue_defers_text_while_floor_is_held_then_releases_it() {
+    let human_floor = HumanFloor::new();
+    assert!(human_floor.enter_local(true, false));
+    let floor_epoch = human_floor.epoch();
+    let mut deferred = VecDeque::new();
+
+    assert!(matches!(
+        authorize_or_defer_queued_text(&human_floor, &mut deferred, queued_text(41, floor_epoch),),
+        Err(HumanFloorAuthorization::Blocked)
+    ));
+    assert_eq!(deferred.len(), 1, "held-floor text must stay queued");
+
+    human_floor.leave_local();
+    let queued = deferred.pop_front().expect("deferred text");
+    let released = authorize_or_defer_queued_text(&human_floor, &mut deferred, queued)
+        .expect("the same queue item is eligible after floor release");
+
+    assert_eq!(released.route_id, 41);
+    assert!(deferred.is_empty());
+}
+
+#[test]
+fn worker_queue_drops_text_from_before_human_onset() {
+    let human_floor = HumanFloor::new();
+    let stale_epoch = human_floor.epoch();
+    assert!(human_floor.enter_local(true, false));
+    human_floor.leave_local();
+    let mut deferred = VecDeque::new();
+
+    assert!(matches!(
+        authorize_or_defer_queued_text(&human_floor, &mut deferred, queued_text(42, stale_epoch),),
+        Err(HumanFloorAuthorization::Stale)
+    ));
+    assert!(deferred.is_empty(), "pre-barge-in text must not replay");
+}
+
 // ── Remote interrupt tracker ──────────────────────────────────────────────
 //
 // Models the per-peer frame counting logic in the recv task of
diff --git a/desktop/src-tauri/src/huddle/tts_voice_selection_tests.rs b/desktop/src-tauri/src/huddle/tts_voice_selection_tests.rs
index bff5ab4f76..533127c1ae 100644
--- a/desktop/src-tauri/src/huddle/tts_voice_selection_tests.rs
+++ b/desktop/src-tauri/src/huddle/tts_voice_selection_tests.rs
@@ -16,6 +16,7 @@ fn inert_pipeline(cancel: Arc<AtomicBool>) -> TtsPipeline {
         tts_active: Arc::new(AtomicBool::new(false)),
         shutdown,
         cancel,
+        human_floor: HumanFloor::new(),
         voice_cancel: Arc::new(AtomicBool::new(false)),
         voice: Arc::new(std::sync::Mutex::new("reference_sample".to_string())),
         voice_generation: Arc::new(AtomicU64::new(1)),
@@ -169,6 +170,7 @@ fn an_in_hand_post_change_message_survives_cancellation() {
     ));
     text_tx
         .send(QueuedText {
+            floor_epoch: 0,
             generation: voice_generation.load(Ordering::Acquire),
             route_id: 1,
             speaker_pubkey: None,
@@ -183,6 +185,7 @@ fn an_in_hand_post_change_message_survives_cancellation() {
     let active = AtomicBool::new(true);
     let mut deferred_text = VecDeque::from([
         QueuedText {
+            floor_epoch: 0,
             generation: 1,
             route_id: 2,
             speaker_pubkey: None,
@@ -191,6 +194,7 @@ fn an_in_hand_post_change_message_survives_cancellation() {
             text: "old message".to_string(),
         },
         QueuedText {
+            floor_epoch: 0,
             generation: voice_generation.load(Ordering::Acquire),
             route_id: 3,
             speaker_pubkey: None,
@@ -250,6 +254,7 @@ fn superseding_voice_change_removes_earlier_deferred_messages() {
     )
     .expect("first voice change");
     deferred_text.push_back(QueuedText {
+        floor_epoch: 0,
         generation: voice_generation.load(Ordering::Acquire),
         route_id: 4,
         speaker_pubkey: None,
@@ -299,6 +304,7 @@ fn barge_in_clears_deferred_voice_change_messages() {
     let voice_change_ack = Arc::new(std::sync::Mutex::new(None));
     let (_text_tx, text_rx) = std::sync::mpsc::channel();
     let mut deferred_text = VecDeque::from([QueuedText {
+        floor_epoch: 0,
         generation: 2,
         route_id: 5,
         speaker_pubkey: None,
@@ -343,6 +349,7 @@ fn barge_in_during_a_voice_change_clears_post_change_messages() {
     )
     .expect("voice change");
     deferred_text.push_back(QueuedText {
+        floor_epoch: 0,
         generation: voice_generation.load(Ordering::Acquire),
         route_id: 6,
         speaker_pubkey: None,
@@ -375,6 +382,7 @@ fn a_sender_captured_before_voice_change_is_stale_even_if_it_sends_after_drain()
     let old_sender = TtsTextSender {
         text_tx,
         generation: voice_generation.load(Ordering::Acquire),
+        human_floor: HumanFloor::new(),
         speaker_generations: Arc::new(std::sync::Mutex::new(HashMap::new())),
     };
     let shutdown = AtomicBool::new(false);
diff --git a/desktop/src-tauri/src/huddle/tts_voice_transition.rs b/desktop/src-tauri/src/huddle/tts_voice_transition.rs
index 78c9c3cc4d..11f3acd2e4 100644
--- a/desktop/src-tauri/src/huddle/tts_voice_transition.rs
+++ b/desktop/src-tauri/src/huddle/tts_voice_transition.rs
@@ -9,7 +9,7 @@ use std::{
     },
 };
 
-use super::{PlaybackCoordinator, SynthesisFlightGuard};
+use super::{HumanFloor, PlaybackCoordinator, SynthesisFlightGuard};
 
 use crate::huddle::pocket::{load_voice_style, VoiceStyle, DEFAULT_VOICE, VOICE_FILE_EXT};
 
@@ -74,6 +74,7 @@ impl fmt::Debug for PlaybackProbe {
 #[derive(Debug)]
 pub(super) struct QueuedText {
     pub(super) generation: u64,
+    pub(super) floor_epoch: u64,
     pub(super) route_id: u64,
     pub(super) speaker_pubkey: Option<String>,
     pub(super) speaker_generation: u64,
@@ -85,6 +86,7 @@ pub(super) struct QueuedText {
 pub(crate) struct TtsTextSender {
     pub(super) text_tx: SyncSender<QueuedText>,
     pub(super) generation: u64,
+    pub(super) human_floor: HumanFloor,
     pub(super) speaker_generations: SpeakerGenerations,
 }
 
@@ -97,9 +99,11 @@ impl TtsTextSender {
         voice_reference: String,
         text: String,
     ) -> Result<(), String> {
+        let floor_epoch = self.human_floor.epoch();
         self.text_tx
             .send(QueuedText {
                 generation: self.generation,
+                floor_epoch,
                 route_id,
                 speaker_pubkey: Some(speaker_pubkey),
                 speaker_generation,
@@ -544,6 +548,7 @@ mod speaker_generation_tests {
 
     fn queued_speech(speaker_pubkey: &str, speaker_generation: u64) -> QueuedText {
         QueuedText {
+            floor_epoch: 0,
             generation: 1,
             route_id: 1,
             speaker_pubkey: Some(speaker_pubkey.to_string()),

From fc2ce6728b3b4805040c0a2f2cc5c15f1c1806ce Mon Sep 17 00:00:00 2001
From: Will Pfleger <pfleger.will@gmail.com>
Date: Fri, 21 Aug 2026 13:35:33 -0400
Subject: [PATCH 18/38] feat(archive): add observer-frame retention schema and
 gated DB adapter (#5719)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The local-save archive (`~/.buzz/archive/archive.db`) grows without
bound — observer frames (kind 24200) are 99.95% of it by bytes (~1.3M
rows, 75–375 MB/day). This lays the schema and process-wide foundations
for bounding that growth: a single global retention window for observer
frames, kept in `archive_meta`, plus the gated DB adapter every later
phase builds on. The prune worker that actually deletes lands in a
follow-up; nothing here removes data.

## What this adds

- **Migration M4** (`add_archive_meta`, crash-safe): creates the
`archive_meta` k/v table and the `archived_at`-covering scope-age index
used by the future prune scan, and seeds `observer_retention_days=30`.
Runs under one `BEGIN IMMEDIATE` with an in-lock marker recheck and the
marker written last, so a crash before COMMIT rolls back every object
and the next open re-runs from scratch. Fails closed on an
externally-created `archive_meta` present without the marker.
- **Process init barrier + gated `ArchiveDb` adapter** owning every
production open. All subscription-mutation commands and the archive sync
task route their DB work through `ArchiveDb::with_conn`, which awaits
the init barrier once. This also fixes a pre-existing bug where
`create_save_subscription` ran blocking DB work on the async runtime.
- **Commands**: `get_observer_retention_days` /
`set_observer_retention_days` (fail-closed — rejects days `< 1` or `>
36500` before writing) and `archive_size_stats` (physical file bytes for
the main DB + `-wal` sidecar, plus `page_size` / `page_count` /
`freelist_count` — PRAGMAs and file metadata only, no payload scans).

## Scope

Observer frames (24200) are the only kind with a retention setting.
NIP-AM metrics (44200) and every other archived kind are kept
indefinitely with no retention state — no policy table, no per-kind or
per-subscription configurability. This is the simplified design ruled in
over the earlier per-subscription × per-kind approach: bounding observer
frames alone captures essentially all the value.

---------

Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
Signed-off-by: Duncan <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz>
Co-authored-by: Duncan <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz>
---
 desktop/src-tauri/src/app_state.rs            |   6 +-
 desktop/src-tauri/src/archive/archive_db.rs   | 199 ++++++++
 .../src-tauri/src/archive/archive_db_tests.rs | 246 ++++++++++
 desktop/src-tauri/src/archive/mod.rs          | 295 +++++++-----
 desktop/src-tauri/src/archive/retention.rs    | 216 +++++++++
 .../src-tauri/src/archive/retention_tests.rs  | 440 ++++++++++++++++++
 .../src-tauri/src/archive/store_migrations.rs | 138 +++++-
 desktop/src-tauri/src/archive/store_tests.rs  |   3 +
 desktop/src-tauri/src/archive/sync.rs         |  10 +-
 desktop/src-tauri/src/lib.rs                  |  27 +-
 10 files changed, 1440 insertions(+), 140 deletions(-)
 create mode 100644 desktop/src-tauri/src/archive/archive_db.rs
 create mode 100644 desktop/src-tauri/src/archive/archive_db_tests.rs
 create mode 100644 desktop/src-tauri/src/archive/retention.rs
 create mode 100644 desktop/src-tauri/src/archive/retention_tests.rs

diff --git a/desktop/src-tauri/src/app_state.rs b/desktop/src-tauri/src/app_state.rs
index 5f5019cd20..7c41f6bfe2 100644
--- a/desktop/src-tauri/src/app_state.rs
+++ b/desktop/src-tauri/src/app_state.rs
@@ -129,6 +129,7 @@ pub struct AppState {
     /// bounded and letting a later leave correctly flip the channel back to
     /// `is_member=false`.
     pub pending_owned_channels: Mutex<std::collections::HashSet<(String, String)>>,
+    pub archive_db: crate::archive::ArchiveDb,
 }
 
 /// Parse the `BUZZ_PRIVATE_KEY` env var into identity keys. `Some` means the
@@ -219,9 +220,7 @@ pub fn build_app_state() -> AppState {
         huddle_audio: Default::default(),
         app_handle: Mutex::new(None),
         media_proxy_port: AtomicU16::new(0),
-        prevent_sleep: Arc::new(Mutex::new(
-            crate::prevent_sleep::PreventSleepState::default(),
-        )),
+        prevent_sleep: Default::default(),
         keyring_locked: AtomicBool::new(false),
         identity_lost: AtomicBool::new(false),
         reset_failed: AtomicBool::new(false),
@@ -232,6 +231,7 @@ pub fn build_app_state() -> AppState {
         #[cfg(feature = "mesh-llm")]
         mesh_coordinator: AsyncMutex::new(None),
         pending_owned_channels: Mutex::new(std::collections::HashSet::new()),
+        archive_db: crate::archive::ArchiveDb::default(),
     }
 }
 
diff --git a/desktop/src-tauri/src/archive/archive_db.rs b/desktop/src-tauri/src/archive/archive_db.rs
new file mode 100644
index 0000000000..7c69591b0f
--- /dev/null
+++ b/desktop/src-tauri/src/archive/archive_db.rs
@@ -0,0 +1,199 @@
+//! Process-wide gated adapter for the local archive SQLite database.
+//!
+//! Two coupled guarantees, both required by plan v3 (decisions 1–2):
+//!
+//! 1. **Init barrier.** Exactly one blocking task opens the DB the first time
+//!    and completes every schema migration (including M4, whose index build
+//!    over Will's 1.3M-row archive is not free). Every production open — every
+//!    Tauri archive command and all future startup/prune work — `await`s that
+//!    result before touching its own connection. The barrier is independent of
+//!    identity/relay resolution: the archive DB is a single per-nest file
+//!    (identity is a row column, not part of the path), and the path resolves
+//!    from `nest_dir()`, which is fixed early in `setup()` before the async
+//!    workspace relay override settles. This satisfies Thufir's binding
+//!    condition that the barrier cover workspace/identity timing and the
+//!    globally-mounted observer archive producer.
+//!
+//! 2. **Maintenance lock.** A shared `RwLock` whose read guard is held for the
+//!    full lifetime of every ordinary connection (acquired before the blocking
+//!    dispatch, released only after the closure returns and its connection is
+//!    dropped). The Phase-4 "reclaim space" conversion will take the *write*
+//!    guard for its sole-connection `VACUUM` sequence; nothing else may hold a
+//!    live connection while that runs. Phase 1 only ever takes the read guard,
+//!    but the lock lives here so the write path has a home.
+//!
+//! M4 additionally keeps its own `BEGIN IMMEDIATE` + in-lock recheck for crash
+//! and cross-process safety — the in-process barrier serializes this process's
+//! opens, but a second OS process (or a direct `open_archive_db` in tests) can
+//! still race the first open. The two mechanisms are complementary, not
+//! redundant: the barrier is startup orchestration, the immediate-lock is
+//! durability.
+
+use std::path::PathBuf;
+
+use rusqlite::Connection;
+use tokio::sync::{OnceCell, RwLock};
+
+use super::store;
+use crate::managed_agents::nest_dir;
+
+/// A hook run once on the blocking pool at the start of the single init task.
+/// Test-only: lets a test count initializations and hold the winner long
+/// enough to prove concurrent callers await it. Never set in production.
+#[cfg(test)]
+type InitHook = std::sync::Arc<dyn Fn() + Send + Sync>;
+
+/// Test-only overrides so the barrier and guard-lifetime contracts can be
+/// exercised without a real nest: a fixed DB path in place of `nest_dir()` and
+/// an optional init hook. `Default` leaves this `None`, so production always
+/// resolves the path from the nest and runs no hook.
+#[cfg(test)]
+struct TestSeam {
+    path: PathBuf,
+    on_init: Option<InitHook>,
+}
+
+/// Gated owner of every production archive DB connection. Lives in
+/// [`crate::app_state::AppState`]; commands call [`ArchiveDb::with_conn`].
+#[derive(Default)]
+pub struct ArchiveDb {
+    /// Set to `()` once the first open (which runs all migrations incl. M4)
+    /// succeeds. A failed init is NOT cached — the next caller retries — so a
+    /// transient error (e.g. a briefly unavailable external volume) does not
+    /// wedge the archive for the process lifetime.
+    init: OnceCell<()>,
+    /// Maintenance lock. Ordinary connections hold the read guard for their
+    /// whole lifetime; the Phase-4 conversion holds the write guard.
+    maintenance: RwLock<()>,
+    /// Test-only path/hook overrides; always `None` in production.
+    #[cfg(test)]
+    test_seam: Option<TestSeam>,
+}
+
+impl ArchiveDb {
+    /// Resolve the archive DB path. Production resolves from the nest
+    /// directory; a test seam (when present) supplies a fixed path so the
+    /// barrier can be exercised without a real nest. Errors only when the nest
+    /// cannot be resolved (fatal for archive access, same as the former
+    /// `open_db`).
+    fn db_path(&self) -> Result<PathBuf, String> {
+        #[cfg(test)]
+        if let Some(seam) = &self.test_seam {
+            return Ok(seam.path.clone());
+        }
+        let nest = nest_dir().ok_or("cannot resolve nest directory for archive")?;
+        Ok(nest.join("archive").join("archive.db"))
+    }
+
+    /// The init hook, if a test installed one; always `None` in production.
+    #[cfg(test)]
+    fn init_hook(&self) -> Option<InitHook> {
+        self.test_seam.as_ref().and_then(|s| s.on_init.clone())
+    }
+
+    /// Complete the one-time init: open the DB once on the blocking pool,
+    /// running `SCHEMA` + all migrations (incl. M4), then drop the connection.
+    /// Concurrent callers await the same single execution. Idempotent and
+    /// cheap after the first success (the cached `()` short-circuits).
+    async fn ensure_initialized(&self) -> Result<(), String> {
+        let path = self.db_path()?;
+        #[cfg(test)]
+        let hook = self.init_hook();
+        self.init
+            .get_or_try_init(|| async {
+                tokio::task::spawn_blocking(move || {
+                    // Test hook runs at the very start of the single init task,
+                    // before the migration opens the DB — this is where a test
+                    // holds the winner past the busy timeout to prove ordinary
+                    // callers await it. No-op in production.
+                    #[cfg(test)]
+                    if let Some(hook) = hook {
+                        hook();
+                    }
+                    // Opening runs every migration; the connection exists only
+                    // to complete them behind the barrier, so drop it here.
+                    let conn = store::open_archive_db(&path)?;
+                    drop(conn);
+                    Ok::<(), String>(())
+                })
+                .await
+                .map_err(|e| format!("archive init task failed: {e}"))?
+            })
+            .await
+            .map(|_| ())
+    }
+
+    /// Warm the init barrier without running a query. Called once from
+    /// `setup()` so the first-open migration cost (M4's index build over a
+    /// large archive) is paid at startup rather than blocking a user's first
+    /// archive command. A failure here is non-fatal — the first real
+    /// [`with_conn`](Self::with_conn) caller retries and surfaces the error.
+    pub async fn warm_init(&self) -> Result<(), String> {
+        self.ensure_initialized().await
+    }
+
+    /// Run `task` against a fresh archive connection on the blocking pool.
+    ///
+    /// Ordering: await the init barrier → acquire the maintenance read guard →
+    /// dispatch the blocking closure with its own connection. The read guard is
+    /// held across the `.await` on the blocking join, so it is released only
+    /// after `task` returns and the connection it borrowed has dropped — the
+    /// guard-lifetime contract the Phase-4 write path depends on.
+    pub async fn with_conn<T, F>(&self, task: F) -> Result<T, String>
+    where
+        T: Send + 'static,
+        F: FnOnce(&Connection) -> Result<T, String> + Send + 'static,
+    {
+        self.ensure_initialized().await?;
+        let path = self.db_path()?;
+        let _guard = self.maintenance.read().await;
+        tokio::task::spawn_blocking(move || {
+            let conn = store::open_archive_db(&path)?;
+            task(&conn)
+        })
+        .await
+        .map_err(|e| format!("archive db task failed: {e}"))?
+    }
+}
+
+#[cfg(test)]
+impl ArchiveDb {
+    /// Build an adapter bound to a fixed DB path (no nest required), so the
+    /// barrier and guard-lifetime contracts can be exercised in isolation.
+    fn with_test_path(path: PathBuf) -> Self {
+        Self {
+            init: OnceCell::new(),
+            maintenance: RwLock::new(()),
+            test_seam: Some(TestSeam {
+                path,
+                on_init: None,
+            }),
+        }
+    }
+
+    /// Build an adapter bound to a fixed path whose single initialization runs
+    /// `hook` first — used to count initializations and to hold the init task
+    /// open across the concurrent-caller window.
+    fn with_test_hook(path: PathBuf, hook: InitHook) -> Self {
+        Self {
+            init: OnceCell::new(),
+            maintenance: RwLock::new(()),
+            test_seam: Some(TestSeam {
+                path,
+                on_init: Some(hook),
+            }),
+        }
+    }
+
+    /// Whether the maintenance WRITE guard can be taken right now. A live
+    /// `with_conn` connection holds the read guard, so this returns `false`
+    /// while any ordinary connection is open and `true` once all have dropped —
+    /// exactly the signal the Phase-4 sole-connection VACUUM will gate on.
+    fn maintenance_write_available(&self) -> bool {
+        self.maintenance.try_write().is_ok()
+    }
+}
+
+#[cfg(test)]
+#[path = "archive_db_tests.rs"]
+mod archive_db_tests;
diff --git a/desktop/src-tauri/src/archive/archive_db_tests.rs b/desktop/src-tauri/src/archive/archive_db_tests.rs
new file mode 100644
index 0000000000..f8182f829c
--- /dev/null
+++ b/desktop/src-tauri/src/archive/archive_db_tests.rs
@@ -0,0 +1,246 @@
+//! Behavior tests for the [`ArchiveDb`] init barrier and maintenance-lock
+//! guard lifetime — the two contracts Phase 1 introduced and Thufir's pass-1
+//! review required to be pinned directly (not via raw SQLite contention).
+//!
+//! These race PRODUCTION-shaped `with_conn` callers through the real
+//! `OnceCell`/`RwLock` orchestration, using the `#[cfg(test)]` path/hook seam
+//! on `ArchiveDb` to make timing deterministic instead of relying on a large
+//! on-disk fixture or wall-clock sleeps to approach the 5s busy timeout.
+
+use super::*;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::{Arc, Condvar, Mutex};
+use std::time::{Duration, Instant};
+use tempfile::TempDir;
+
+/// A one-shot latch that blocks a blocking-pool thread until the test releases
+/// it. Deterministic stand-in for "the M4 winner holds init open past the busy
+/// timeout": the init/closure thread parks here, the test observes the frozen
+/// state, then releases. `Mutex` + `Condvar` are `Sync`, so an `Arc<Latch>`
+/// captured by the `Send + Sync` init hook type-checks.
+struct Latch {
+    open: Mutex<bool>,
+    cv: Condvar,
+}
+
+impl Latch {
+    fn new() -> Arc<Self> {
+        Arc::new(Self {
+            open: Mutex::new(false),
+            cv: Condvar::new(),
+        })
+    }
+
+    /// Block until [`release`](Self::release) is called (returns immediately if
+    /// already released).
+    fn wait(&self) {
+        let mut open = self.open.lock().unwrap();
+        while !*open {
+            open = self.cv.wait(open).unwrap();
+        }
+    }
+
+    fn release(&self) {
+        *self.open.lock().unwrap() = true;
+        self.cv.notify_all();
+    }
+}
+
+/// Poll `cond` on the async runtime until it holds or `timeout` elapses.
+/// Panics on timeout so a broken barrier surfaces as a failure, never a hang.
+async fn await_until(what: &str, timeout: Duration, cond: impl Fn() -> bool) {
+    let deadline = Instant::now() + timeout;
+    while !cond() {
+        assert!(Instant::now() < deadline, "timed out waiting for {what}");
+        tokio::time::sleep(Duration::from_millis(5)).await;
+    }
+}
+
+/// An archive DB path inside a fresh temp dir. The dir is returned so the
+/// caller keeps it alive for the whole test (dropping it deletes the file).
+fn temp_db() -> (TempDir, std::path::PathBuf) {
+    let dir = tempfile::tempdir().unwrap();
+    let path = dir.path().join("archive").join("archive.db");
+    (dir, path)
+}
+
+/// The barrier serializes first-open: exactly one initialization runs while
+/// every concurrent `with_conn` caller awaits it, and no ordinary connection
+/// opens until that initialization has completed.
+///
+/// The init hook holds the single init task open on a latch. While it is held
+/// we prove no `with_conn` caller has opened its connection (`open_count == 0`)
+/// — impossible if callers bypassed the `OnceCell` and opened independently.
+/// Releasing the latch lets init finish; all callers then complete, exactly
+/// one initialization ran, and every open happened after init.
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+async fn test_first_open_barrier_serializes_init_and_defers_opens() {
+    let (_dir, path) = temp_db();
+    let init_count = Arc::new(AtomicUsize::new(0));
+    let open_count = Arc::new(AtomicUsize::new(0));
+    let release = Latch::new();
+
+    let hook = {
+        let init_count = Arc::clone(&init_count);
+        let release = Arc::clone(&release);
+        Arc::new(move || {
+            // Runs once, at the head of the single init task. Record the
+            // initialization, then park so the test can inspect the frozen
+            // pre-open state.
+            init_count.fetch_add(1, Ordering::SeqCst);
+            release.wait();
+        }) as InitHook
+    };
+    let db = Arc::new(ArchiveDb::with_test_hook(path, hook));
+
+    // Trigger the single init and wait until it is provably in flight (hook
+    // ran) and parked on the latch.
+    let warm = {
+        let db = Arc::clone(&db);
+        tokio::spawn(async move { db.warm_init().await })
+    };
+    await_until("init to start", Duration::from_secs(10), || {
+        init_count.load(Ordering::SeqCst) == 1
+    })
+    .await;
+
+    // Fan out production-shaped callers while init is held. Each records that
+    // its task was scheduled (`entered`) and that its closure actually opened a
+    // connection (`open_count`).
+    let entered = Arc::new(AtomicUsize::new(0));
+    let callers: Vec<_> = (0..4)
+        .map(|_| {
+            let db = Arc::clone(&db);
+            let open_count = Arc::clone(&open_count);
+            let entered = Arc::clone(&entered);
+            tokio::spawn(async move {
+                entered.fetch_add(1, Ordering::SeqCst);
+                db.with_conn(move |conn| {
+                    open_count.fetch_add(1, Ordering::SeqCst);
+                    // Touch the migrated schema to prove a usable connection.
+                    conn.query_row("SELECT COUNT(*) FROM archive_meta", [], |r| {
+                        r.get::<_, i64>(0)
+                    })
+                    .map_err(|e| e.to_string())
+                })
+                .await
+            })
+        })
+        .collect();
+
+    // All four caller tasks are scheduled and running before we judge the
+    // barrier: they have entered `with_conn` and can only be parked on the
+    // init `OnceCell`. Without the barrier they would instead open independent
+    // connections here and bump `open_count` while init is still held.
+    await_until("callers to be scheduled", Duration::from_secs(10), || {
+        entered.load(Ordering::SeqCst) == 4
+    })
+    .await;
+    tokio::time::sleep(Duration::from_millis(100)).await;
+    assert_eq!(
+        open_count.load(Ordering::SeqCst),
+        0,
+        "no ordinary connection may open until initialization completes"
+    );
+
+    // Let init finish; every caller now completes against the migrated DB.
+    release.release();
+    assert!(warm.await.unwrap().is_ok(), "warm init must succeed");
+    for caller in callers {
+        assert!(
+            caller.await.unwrap().is_ok(),
+            "every with_conn must succeed"
+        );
+    }
+
+    assert_eq!(
+        init_count.load(Ordering::SeqCst),
+        1,
+        "exactly one initialization ran behind the barrier"
+    );
+    assert_eq!(
+        open_count.load(Ordering::SeqCst),
+        4,
+        "all callers opened, and only after init"
+    );
+}
+
+/// The maintenance read guard lives for the FULL lifetime of a `with_conn`
+/// connection: a write-lock contender cannot enter until the closure returns
+/// and its connection has dropped. This is the invariant the Phase-4
+/// sole-connection VACUUM depends on.
+///
+/// A `with_conn` closure parks on a latch while holding its connection; a
+/// separate task contends for the maintenance write guard. While the closure
+/// is parked the writer must be blocked. Releasing the closure — which returns
+/// and drops the connection — lets the writer finally acquire the guard.
+#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
+async fn test_with_conn_read_guard_blocks_writer_until_connection_drops() {
+    let (_dir, path) = temp_db();
+    let db = Arc::new(ArchiveDb::with_test_path(path));
+    db.warm_init().await.expect("init must succeed");
+
+    let in_closure = Arc::new(AtomicUsize::new(0));
+    let hold = Latch::new();
+
+    // A live connection: the closure parks holding it (and thus the read
+    // guard) until released.
+    let work = {
+        let db = Arc::clone(&db);
+        let in_closure = Arc::clone(&in_closure);
+        let hold = Arc::clone(&hold);
+        tokio::spawn(async move {
+            db.with_conn(move |_conn| {
+                in_closure.fetch_add(1, Ordering::SeqCst);
+                hold.wait();
+                Ok(())
+            })
+            .await
+        })
+    };
+    await_until(
+        "closure to hold the connection",
+        Duration::from_secs(10),
+        || in_closure.load(Ordering::SeqCst) == 1,
+    )
+    .await;
+
+    // A genuine write-lock contender.
+    let write_entered = Arc::new(AtomicUsize::new(0));
+    let writer = {
+        let db = Arc::clone(&db);
+        let write_entered = Arc::clone(&write_entered);
+        tokio::spawn(async move {
+            let _w = db.maintenance.write().await;
+            write_entered.fetch_add(1, Ordering::SeqCst);
+        })
+    };
+
+    // While the connection is held, the writer must not have entered, and the
+    // write guard must be unavailable.
+    tokio::time::sleep(Duration::from_millis(200)).await;
+    assert_eq!(
+        write_entered.load(Ordering::SeqCst),
+        0,
+        "writer must block while a with_conn connection is live"
+    );
+    assert!(
+        !db.maintenance_write_available(),
+        "write guard is unavailable while the read guard is held"
+    );
+
+    // Release the closure: it returns and its connection drops, releasing the
+    // read guard so the writer can proceed.
+    hold.release();
+    assert!(work.await.unwrap().is_ok(), "held with_conn must succeed");
+    writer.await.unwrap();
+    assert_eq!(
+        write_entered.load(Ordering::SeqCst),
+        1,
+        "writer enters once the connection has dropped"
+    );
+    assert!(
+        db.maintenance_write_available(),
+        "write guard is free again after the connection drops"
+    );
+}
diff --git a/desktop/src-tauri/src/archive/mod.rs b/desktop/src-tauri/src/archive/mod.rs
index 81bc213352..1b246b3fa2 100644
--- a/desktop/src-tauri/src/archive/mod.rs
+++ b/desktop/src-tauri/src/archive/mod.rs
@@ -18,12 +18,16 @@
 //! == agent) is applied fail-closed.
 
 mod agent_usage;
+mod archive_db;
 mod metric_store;
 mod pipeline;
+pub mod retention;
 pub mod store;
 mod store_migrations;
 pub mod sync;
 
+pub use archive_db::ArchiveDb;
+
 use pipeline::{commit_archive, plan_archive, query_buckets};
 
 use nostr::Event;
@@ -32,7 +36,6 @@ use serde::{Deserialize, Serialize};
 use tauri::State;
 
 use crate::app_state::AppState;
-use crate::managed_agents::nest_dir;
 use crate::relay::{query_relay, relay_ws_url_with_override};
 
 // ── Constants ───────────────────────────────────────────────────────────────
@@ -43,10 +46,20 @@ const OBSERVER_FRAME_TELEMETRY: &str = "telemetry";
 
 // ── DB helpers ───────────────────────────────────────────────────────────────
 
-fn open_db() -> Result<Connection, String> {
-    let nest = nest_dir().ok_or("cannot resolve nest directory for archive")?;
-    let db_path = nest.join("archive").join("archive.db");
-    store::open_archive_db(&db_path)
+/// Warm the archive DB init barrier on a background task, now that the nest
+/// exists, so the first-open schema migration cost (M4's index build over a
+/// large archive) is paid at startup rather than blocking a user's first
+/// archive command. The globally-mounted observer archive producer also
+/// `await`s this barrier before its first write, so warming it early avoids a
+/// stall on the first observer frame. Non-fatal: the first real archive command
+/// retries and surfaces any error.
+pub fn spawn_warm_init(app: tauri::AppHandle) {
+    tauri::async_runtime::spawn(async move {
+        use tauri::Manager;
+        if let Err(error) = app.state::<AppState>().archive_db.warm_init().await {
+            eprintln!("buzz-desktop: archive DB init deferred: {error}");
+        }
+    });
 }
 
 fn identity_pubkey(state: &AppState) -> Result<String, String> {
@@ -61,19 +74,6 @@ fn now_secs() -> i64 {
         .as_secs() as i64
 }
 
-async fn run_archive_db_task<T, F>(task: F) -> Result<T, String>
-where
-    T: Send + 'static,
-    F: FnOnce(&Connection) -> Result<T, String> + Send + 'static,
-{
-    tokio::task::spawn_blocking(move || {
-        let conn = open_db()?;
-        task(&conn)
-    })
-    .await
-    .map_err(|e| format!("spawn_blocking failed: {e}"))?
-}
-
 // ── Scope type ───────────────────────────────────────────────────────────────
 
 /// The three supported archive scope discriminants.
@@ -170,10 +170,10 @@ pub(crate) async fn archive_candidates(
     // ── Phase 1: plan (blocking SQLite) ─────────────────────────────────────
     let plan_identity_pk = identity_pk.clone();
     let plan_relay_url = relay_url.clone();
-    let plan = run_archive_db_task(move |conn| {
-        plan_archive(candidates, &plan_identity_pk, &plan_relay_url, conn)
-    })
-    .await?;
+    let plan = state
+        .archive_db
+        .with_conn(move |conn| plan_archive(candidates, &plan_identity_pk, &plan_relay_url, conn))
+        .await?;
 
     // ── Phase 2: relay queries (async) ───────────────────────────────────────
     let bucket_results = query_buckets(plan.buckets, state).await;
@@ -186,19 +186,21 @@ pub(crate) async fn archive_candidates(
     };
     let commit_identity_pk = identity_pk.clone();
     let commit_relay_url = relay_url.clone();
-    run_archive_db_task(move |conn| {
-        commit_archive(
-            bucket_results,
-            plan.ephemeral,
-            plan.pre_dropped,
-            &commit_identity_pk,
-            &commit_relay_url,
-            &owner_keys,
-            now,
-            conn,
-        )
-    })
-    .await
+    state
+        .archive_db
+        .with_conn(move |conn| {
+            commit_archive(
+                bucket_results,
+                plan.ephemeral,
+                plan.pre_dropped,
+                &commit_identity_pk,
+                &commit_relay_url,
+                &owner_keys,
+                now,
+                conn,
+            )
+        })
+        .await
 }
 
 /// Validate an ephemeral observer frame (kind 24200) against ALL local rules.
@@ -337,16 +339,21 @@ pub async fn create_save_subscription(
     let kinds_json =
         serde_json::to_string(&kinds).map_err(|e| format!("failed to serialize kinds: {e}"))?;
 
-    let conn = open_db()?;
-    store::upsert_save_subscription(
-        &conn,
-        &identity_pk,
-        &relay_url,
-        scope_type.as_str(),
-        &scope_value,
-        &kinds_json,
-        now,
-    )?;
+    let scope_type_str = scope_type.as_str().to_string();
+    state
+        .archive_db
+        .with_conn(move |conn| {
+            store::upsert_save_subscription(
+                conn,
+                &identity_pk,
+                &relay_url,
+                &scope_type_str,
+                &scope_value,
+                &kinds_json,
+                now,
+            )
+        })
+        .await?;
     sync_state.notify_subscriptions_changed().await;
     Ok(())
 }
@@ -452,10 +459,12 @@ pub async fn merge_save_subscription_kinds(
     let relay_url = relay_ws_url_with_override(&state);
     let now = now_secs();
     let owner_pk = identity_pk.clone();
-    run_archive_db_task(move |conn| {
-        store::merge_owner_p_kinds(conn, &identity_pk, &relay_url, &owner_pk, kind, now)
-    })
-    .await?;
+    state
+        .archive_db
+        .with_conn(move |conn| {
+            store::merge_owner_p_kinds(conn, &identity_pk, &relay_url, &owner_pk, kind, now)
+        })
+        .await?;
     sync_state.notify_subscriptions_changed().await;
     Ok(())
 }
@@ -487,10 +496,12 @@ pub async fn remove_save_subscription_kind(
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
     let owner_pk = identity_pk.clone();
-    run_archive_db_task(move |conn| {
-        store::remove_owner_p_kind(conn, &identity_pk, &relay_url, &owner_pk, kind)
-    })
-    .await?;
+    state
+        .archive_db
+        .with_conn(move |conn| {
+            store::remove_owner_p_kind(conn, &identity_pk, &relay_url, &owner_pk, kind)
+        })
+        .await?;
     sync_state.notify_subscriptions_changed().await;
     Ok(())
 }
@@ -504,7 +515,9 @@ pub async fn list_save_subscriptions(
 ) -> Result<Vec<store::SaveSubscription>, String> {
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
-    run_archive_db_task(move |conn| store::list_save_subscriptions(conn, &identity_pk, &relay_url))
+    state
+        .archive_db
+        .with_conn(move |conn| store::list_save_subscriptions(conn, &identity_pk, &relay_url))
         .await
 }
 
@@ -523,16 +536,18 @@ pub async fn delete_save_subscription(
 ) -> Result<bool, String> {
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
-    let removed = run_archive_db_task(move |conn| {
-        store::delete_save_subscription(
-            conn,
-            &identity_pk,
-            &relay_url,
-            scope_type.as_str(),
-            &scope_value,
-        )
-    })
-    .await?;
+    let removed = state
+        .archive_db
+        .with_conn(move |conn| {
+            store::delete_save_subscription(
+                conn,
+                &identity_pk,
+                &relay_url,
+                scope_type.as_str(),
+                &scope_value,
+            )
+        })
+        .await?;
     if removed {
         sync_state.notify_subscriptions_changed().await;
     }
@@ -564,18 +579,20 @@ pub async fn read_archived_observer_events_for_channel(
 ) -> Result<Vec<String>, String> {
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
-    run_archive_db_task(move |conn| {
-        store::read_archived_observer_events_for_channel(
-            conn,
-            &identity_pk,
-            &relay_url,
-            &channel_id,
-            before_created_at,
-            before_id.as_deref(),
-            limit.unwrap_or(DEFAULT_READ_LIMIT),
-        )
-    })
-    .await
+    state
+        .archive_db
+        .with_conn(move |conn| {
+            store::read_archived_observer_events_for_channel(
+                conn,
+                &identity_pk,
+                &relay_url,
+                &channel_id,
+                before_created_at,
+                before_id.as_deref(),
+                limit.unwrap_or(DEFAULT_READ_LIMIT),
+            )
+        })
+        .await
 }
 
 // ── index_observer_channel_id ─────────────────────────────────────────────────
@@ -595,20 +612,22 @@ pub async fn index_observer_channel_id(
 ) -> Result<(), String> {
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
-    run_archive_db_task(move |conn| {
-        for entry in &entries {
-            store::upsert_observer_channel_index(
-                conn,
-                &identity_pk,
-                &relay_url,
-                &entry.event_id,
-                entry.channel_id.as_deref(),
-                entry.created_at,
-            )?;
-        }
-        Ok(())
-    })
-    .await
+    state
+        .archive_db
+        .with_conn(move |conn| {
+            for entry in &entries {
+                store::upsert_observer_channel_index(
+                    conn,
+                    &identity_pk,
+                    &relay_url,
+                    &entry.event_id,
+                    entry.channel_id.as_deref(),
+                    entry.created_at,
+                )?;
+            }
+            Ok(())
+        })
+        .await
 }
 
 /// A single (event_id, channel_id?, created_at) record used by
@@ -639,18 +658,20 @@ pub async fn read_unindexed_observer_rows(
 ) -> Result<Vec<RawObserverRow>, String> {
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
-    run_archive_db_task(move |conn| {
-        let rows = store::read_unindexed_observer_rows(conn, &identity_pk, &relay_url)?;
-        Ok(rows
-            .into_iter()
-            .map(|(id, raw_json, created_at)| RawObserverRow {
-                id,
-                raw_json,
-                created_at,
-            })
-            .collect())
-    })
-    .await
+    state
+        .archive_db
+        .with_conn(move |conn| {
+            let rows = store::read_unindexed_observer_rows(conn, &identity_pk, &relay_url)?;
+            Ok(rows
+                .into_iter()
+                .map(|(id, raw_json, created_at)| RawObserverRow {
+                    id,
+                    raw_json,
+                    created_at,
+                })
+                .collect())
+        })
+        .await
 }
 
 /// Wire type returned by `read_unindexed_observer_rows`.
@@ -695,20 +716,22 @@ pub async fn read_archived_events(
     let relay_url = relay_ws_url_with_override(&state);
     let scope_type_str = scope_type.as_str().to_string();
     let read_limit = limit.unwrap_or(DEFAULT_READ_LIMIT);
-    run_archive_db_task(move |conn| {
-        store::read_archived_events(
-            conn,
-            &identity_pk,
-            &relay_url,
-            &scope_type_str,
-            &scope_value,
-            kinds.as_deref(),
-            before_created_at,
-            before_id.as_deref(),
-            read_limit,
-        )
-    })
-    .await
+    state
+        .archive_db
+        .with_conn(move |conn| {
+            store::read_archived_events(
+                conn,
+                &identity_pk,
+                &relay_url,
+                &scope_type_str,
+                &scope_value,
+                kinds.as_deref(),
+                before_created_at,
+                before_id.as_deref(),
+                read_limit,
+            )
+        })
+        .await
 }
 
 // ── get_agent_usage_series ───────────────────────────────────────────────────
@@ -797,10 +820,48 @@ pub async fn get_agent_usage_series(
 ) -> Result<agent_usage::AgentUsageSeries, String> {
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
-    run_archive_db_task(move |conn| agent_usage_series(conn, &identity_pk, &relay_url, &request))
+    state
+        .archive_db
+        .with_conn(move |conn| agent_usage_series(conn, &identity_pk, &relay_url, &request))
         .await
 }
 
+// ── Retention configuration commands ──────────────────────────────────────────
+
+/// Read the global observer-frame (kind 24200) retention window, in days. Every
+/// other archived kind — NIP-AM metrics and any custom subscription — is kept
+/// indefinitely and has no setting.
+#[tauri::command]
+pub async fn get_observer_retention_days(state: State<'_, AppState>) -> Result<i64, String> {
+    state
+        .archive_db
+        .with_conn(retention::get_observer_retention_days)
+        .await
+}
+
+/// Set the global observer-frame retention window, in days. Fail-closed: the
+/// store layer rejects zero, negative, or out-of-range values (see
+/// [`retention::validate_days`]).
+#[tauri::command]
+pub async fn set_observer_retention_days(
+    state: State<'_, AppState>,
+    days: i64,
+) -> Result<(), String> {
+    state
+        .archive_db
+        .with_conn(move |conn| retention::set_observer_retention_days(conn, days))
+        .await
+}
+
+/// Physical (file) and logical (page) size accounting for the archive DB, for
+/// the Settings size readout. PRAGMAs + file metadata only — no payload scans.
+#[tauri::command]
+pub async fn archive_size_stats(
+    state: State<'_, AppState>,
+) -> Result<retention::ArchiveSizeStats, String> {
+    state.archive_db.with_conn(retention::size_stats).await
+}
+
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 #[cfg(test)]
diff --git a/desktop/src-tauri/src/archive/retention.rs b/desktop/src-tauri/src/archive/retention.rs
new file mode 100644
index 0000000000..5ee9acff20
--- /dev/null
+++ b/desktop/src-tauri/src/archive/retention.rs
@@ -0,0 +1,216 @@
+//! Local archive retention configuration + size accounting.
+//!
+//! v4 (Will's ruling, 2026-08-19): retention is a single global setting — how
+//! many days observer frames (kind 24200) are kept locally. NIP-AM metrics
+//! (44200) and every other archived kind are kept indefinitely with no
+//! retention machinery. The setting lives as one row in the `archive_meta` k/v
+//! table (`observer_retention_days`), seeded by migration M4.
+//!
+//! This module owns the `archive_meta` schema, the scope-age index used by the
+//! Phase-2 prune scan, the get/set accessors for the observer window, and the
+//! PRAGMA-based size readout. The prune worker itself lands in Phase 2.
+//!
+//! Kept in a sibling file (not `store.rs`) to respect the 1000-line gate, per
+//! the existing `metric_store.rs` / `pipeline.rs` / `store_migrations.rs`
+//! precedent.
+
+use rusqlite::{params, Connection, OptionalExtension};
+
+// ── Constants ────────────────────────────────────────────────────────────────
+
+/// `archive_meta` key holding the observer-frame retention window, in days,
+/// stored as its decimal text.
+pub const OBSERVER_RETENTION_DAYS_KEY: &str = "observer_retention_days";
+
+/// Default rolling window for observer frames (Will's ruling: "~14–30"; 30 is
+/// the shipped default, trivially changeable). Seeded into `archive_meta` by M4.
+pub const DEFAULT_OBSERVER_RETENTION_DAYS: i64 = 30;
+
+/// Upper bound on the retention window (~100 years). Guards against a day count
+/// large enough to overflow `archived_at` cutoff arithmetic while still
+/// admitting any realistic user choice.
+pub const MAX_RETENTION_DAYS: i64 = 36_500;
+
+// ── Schema (created by migration M4, not the base SCHEMA) ─────────────────────
+
+/// `archive_meta`. Created inside M4 under `BEGIN IMMEDIATE` (see
+/// `store_migrations::migrate_add_archive_meta`). Plain `CREATE TABLE`
+/// (no `IF NOT EXISTS`): M4 creates it once on a DB that provably lacks it (the
+/// fail-closed guard rejects a pre-existing one), so the clause would be dead
+/// weight. Holds the observer-retention window and the Phase-2 prune timestamp.
+pub(super) const ARCHIVE_META_SCHEMA: &str = "
+CREATE TABLE archive_meta (
+    key   TEXT PRIMARY KEY,
+    value TEXT NOT NULL
+);
+";
+
+/// Covering index for the Phase-2 retention prune candidate scan. V4 prunes
+/// one global observer window, so the scan filters `(identity_pubkey,
+/// relay_url, archived_at < cutoff)` and joins `archived_events` for
+/// `kind = 24200` — it does NOT constrain `scope_type`/`scope_value`. Age
+/// therefore has to lead the non-equality keys: putting `archived_at`
+/// immediately after the two identity/relay equality keys lets SQLite
+/// range-seek `archived_at < ?` directly (`SEARCH ... USING COVERING INDEX
+/// ... (identity_pubkey=? AND relay_url=? AND archived_at<?)`). The v3 order
+/// buried `archived_at` behind the two now-unconstrained scope keys, so the
+/// planner fell back to a bare identity/relay seek plus a temp b-tree.
+///
+/// The trailing `id, scope_type, scope_value` complete the scope-row primary
+/// key, so the index both covers the scan (no table lookup) and hands Phase 2
+/// the exact keys its bounded `DELETE` needs to materialize candidates.
+///
+/// Built in M4 so the one-time cost over the existing 1.3M-row archive is paid
+/// behind the init barrier rather than on the prune hot path. M4
+/// `DROP INDEX IF EXISTS`es under this name and recreates it unconditionally,
+/// so a fresh build is always correct — plain `CREATE INDEX`, no `IF NOT
+/// EXISTS`.
+pub(super) const SCOPE_AGE_INDEX_DDL: &str = "
+CREATE INDEX idx_archived_event_scopes_age
+    ON archived_event_scopes
+       (identity_pubkey, relay_url, archived_at, id, scope_type, scope_value);
+";
+
+/// Name of the scope-age index, shared by the DDL and M4's unconditional
+/// drop-and-rebuild.
+pub(super) const SCOPE_AGE_INDEX_NAME: &str = "idx_archived_event_scopes_age";
+
+// ── Types ─────────────────────────────────────────────────────────────────────
+
+/// Physical and logical size accounting for the archive DB file, returned by
+/// `archive_size_stats`. All figures come from cheap PRAGMAs and file metadata
+/// — no payload scans.
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ArchiveSizeStats {
+    /// On-disk size of the main DB file, in bytes (from filesystem metadata).
+    pub main_file_bytes: i64,
+    /// On-disk size of the `-wal` sidecar file, in bytes; `0` when absent.
+    pub wal_file_bytes: i64,
+    /// SQLite page size, in bytes (`PRAGMA page_size`).
+    pub page_size: i64,
+    /// Total pages in the main DB (`PRAGMA page_count`).
+    pub page_count: i64,
+    /// Free (reclaimable) pages on the freelist (`PRAGMA freelist_count`).
+    pub freelist_count: i64,
+}
+
+// ── Validation ─────────────────────────────────────────────────────────────────
+
+/// Fail-closed validation for the observer retention window: a day count in
+/// `1..=MAX_RETENTION_DAYS`. Zero, negatives, and out-of-range values are
+/// rejected so the setting can never encode a non-expiring "0 days" or an
+/// overflowing cutoff.
+pub fn validate_days(days: i64) -> Result<(), String> {
+    if !(1..=MAX_RETENTION_DAYS).contains(&days) {
+        return Err(format!(
+            "retention days must be between 1 and {MAX_RETENTION_DAYS}; got {days}"
+        ));
+    }
+    Ok(())
+}
+
+// ── Observer retention window (archive_meta accessor) ───────────────────────────
+
+/// Read the observer-frame retention window (days). Returns the seeded default
+/// when the row is somehow absent (older DB opened before M4 seeded it, or an
+/// externally cleared row) so the setting always resolves to a bounded window
+/// rather than silently becoming Forever.
+pub fn get_observer_retention_days(conn: &Connection) -> Result<i64, String> {
+    let raw: Option<String> = conn
+        .query_row(
+            "SELECT value FROM archive_meta WHERE key = ?1",
+            params![OBSERVER_RETENTION_DAYS_KEY],
+            |row| row.get(0),
+        )
+        .optional()
+        .map_err(|e| format!("read observer retention days: {e}"))?;
+
+    match raw {
+        Some(s) => s
+            .parse::<i64>()
+            .map_err(|e| format!("observer retention days not an integer ({s:?}): {e}")),
+        None => Ok(DEFAULT_OBSERVER_RETENTION_DAYS),
+    }
+}
+
+/// Set the observer-frame retention window (days). Fail-closed: rejects an
+/// out-of-range value before writing (see [`validate_days`]). A single
+/// idempotent upsert, atomic under autocommit.
+pub fn set_observer_retention_days(conn: &Connection, days: i64) -> Result<(), String> {
+    validate_days(days)?;
+    conn.execute(
+        "INSERT INTO archive_meta (key, value) VALUES (?1, ?2)
+         ON CONFLICT (key) DO UPDATE SET value = excluded.value",
+        params![OBSERVER_RETENTION_DAYS_KEY, days.to_string()],
+    )
+    .map_err(|e| format!("set observer retention days: {e}"))?;
+    Ok(())
+}
+
+// ── Size accounting ─────────────────────────────────────────────────────────────
+
+/// Collect physical (file) and logical (page) size figures for the archive DB.
+/// PRAGMAs only — no row or payload scans. The main DB file path is read from
+/// the connection itself (`PRAGMA database_list`), and the `-wal` sidecar is
+/// measured by appending `-wal` to it.
+pub fn size_stats(conn: &Connection) -> Result<ArchiveSizeStats, String> {
+    let page_size: i64 = conn
+        .pragma_query_value(None, "page_size", |row| row.get(0))
+        .map_err(|e| format!("read page_size: {e}"))?;
+    let page_count: i64 = conn
+        .pragma_query_value(None, "page_count", |row| row.get(0))
+        .map_err(|e| format!("read page_count: {e}"))?;
+    let freelist_count: i64 = conn
+        .pragma_query_value(None, "freelist_count", |row| row.get(0))
+        .map_err(|e| format!("read freelist_count: {e}"))?;
+
+    // `PRAGMA database_list` yields (seq, name, file) rows; the `main` schema's
+    // `file` is the on-disk DB path (empty for a `:memory:` DB). File sizes are
+    // read from filesystem metadata rather than page arithmetic so WAL frames
+    // not yet checkpointed into the main file are accounted for separately.
+    let main_path: Option<String> = conn
+        .query_row(
+            "SELECT file FROM pragma_database_list WHERE name = 'main'",
+            [],
+            |row| row.get::<_, String>(0),
+        )
+        .optional()
+        .map_err(|e| format!("read database_list: {e}"))?
+        .filter(|p| !p.is_empty());
+
+    let (main_file_bytes, wal_file_bytes) = match main_path {
+        Some(p) => {
+            let main = std::path::PathBuf::from(&p);
+            (file_len(&main), file_len(&wal_path(&main)))
+        }
+        None => (0, 0),
+    };
+
+    Ok(ArchiveSizeStats {
+        main_file_bytes,
+        wal_file_bytes,
+        page_size,
+        page_count,
+        freelist_count,
+    })
+}
+
+/// Size of a file in bytes, or `0` when it does not exist / cannot be stat'd.
+/// A missing `-wal` (fully checkpointed DB) is the normal case, not an error.
+fn file_len(path: &std::path::Path) -> i64 {
+    std::fs::metadata(path).map(|m| m.len() as i64).unwrap_or(0)
+}
+
+/// The `-wal` sidecar path for a main DB file (`archive.db` → `archive.db-wal`).
+fn wal_path(db_path: &std::path::Path) -> std::path::PathBuf {
+    let mut name = db_path.as_os_str().to_os_string();
+    name.push("-wal");
+    std::path::PathBuf::from(name)
+}
+
+// ── Tests ───────────────────────────────────────────────────────────────────
+
+#[cfg(test)]
+#[path = "retention_tests.rs"]
+mod retention_tests;
diff --git a/desktop/src-tauri/src/archive/retention_tests.rs b/desktop/src-tauri/src/archive/retention_tests.rs
new file mode 100644
index 0000000000..26e6a25fda
--- /dev/null
+++ b/desktop/src-tauri/src/archive/retention_tests.rs
@@ -0,0 +1,440 @@
+//! Behavior tests for the observer-retention setting, the size readout, and the
+//! M4 migration.
+//!
+//! Kept in a sibling file so `retention.rs` stays under the 1000-line gate;
+//! `#[path]`-included from there. `super::*` brings the retention API (and its
+//! `rusqlite::{params, Connection}` imports) into scope; `super::super::store`
+//! reaches the neighbouring subscription mutators and the base `SCHEMA`.
+
+use super::super::store;
+use super::*;
+use std::path::Path;
+use std::sync::{Arc, Barrier};
+use tempfile::NamedTempFile;
+
+const ID: &str = "idpk";
+const RELAY: &str = "wss://r";
+const OWNER: &str = "owner_p";
+
+/// Open a fresh archive DB (runs the full schema + every migration incl. M4).
+fn fresh(db: &NamedTempFile) -> Connection {
+    store::open_archive_db(db.path()).expect("open_archive_db must succeed")
+}
+
+/// Build a legacy DB that has the base schema and M1–M3 markers but NOT M4,
+/// so the next `open_archive_db` pends only the retention migration. This
+/// isolates the M4 first-open race from the separately-tested M1–M3 chain.
+fn build_pre_m4_db(path: &Path) {
+    let conn = Connection::open(path).unwrap();
+    conn.pragma_update(None, "busy_timeout", 5000).unwrap();
+    conn.pragma_update(None, "journal_mode", "WAL").unwrap();
+    conn.execute_batch(store::SCHEMA).unwrap();
+    for name in [
+        "add_harness_to_metric_index",
+        "add_cache_read_tokens",
+        "add_cache_write_and_pricing",
+    ] {
+        conn.execute(
+            "INSERT OR IGNORE INTO archive_migrations (name, applied_at) VALUES (?1, 0)",
+            params![name],
+        )
+        .unwrap();
+    }
+}
+
+fn m4_marker_count(conn: &Connection) -> i64 {
+    conn.query_row(
+        "SELECT COUNT(*) FROM archive_migrations WHERE name = 'add_archive_meta'",
+        [],
+        |r| r.get(0),
+    )
+    .unwrap()
+}
+
+// ── Validation (pure) ──────────────────────────────────────────────────────────
+
+#[test]
+fn test_validate_days_accepts_one_and_max() {
+    assert!(validate_days(1).is_ok());
+    assert!(validate_days(DEFAULT_OBSERVER_RETENTION_DAYS).is_ok());
+    assert!(validate_days(MAX_RETENTION_DAYS).is_ok());
+}
+
+#[test]
+fn test_validate_days_rejects_zero_negative_and_over_max() {
+    assert!(validate_days(0).is_err());
+    assert!(validate_days(-1).is_err());
+    assert!(validate_days(MAX_RETENTION_DAYS + 1).is_err());
+}
+
+// ── Observer retention get / set ────────────────────────────────────────────────
+
+#[test]
+fn test_get_observer_days_returns_seeded_default_on_fresh_db() {
+    let db = NamedTempFile::new().unwrap();
+    let conn = fresh(&db);
+    assert_eq!(
+        get_observer_retention_days(&conn).unwrap(),
+        DEFAULT_OBSERVER_RETENTION_DAYS
+    );
+}
+
+#[test]
+fn test_set_observer_days_upserts_and_overwrites() {
+    let db = NamedTempFile::new().unwrap();
+    let conn = fresh(&db);
+    set_observer_retention_days(&conn, 14).unwrap();
+    assert_eq!(get_observer_retention_days(&conn).unwrap(), 14);
+    set_observer_retention_days(&conn, 60).unwrap();
+    assert_eq!(get_observer_retention_days(&conn).unwrap(), 60);
+}
+
+#[test]
+fn test_set_observer_days_rejects_out_of_range_without_writing() {
+    let db = NamedTempFile::new().unwrap();
+    let conn = fresh(&db);
+    // Establish a known good value, then prove a rejected write leaves it.
+    set_observer_retention_days(&conn, 45).unwrap();
+    assert!(set_observer_retention_days(&conn, 0).is_err());
+    assert!(set_observer_retention_days(&conn, -5).is_err());
+    assert!(set_observer_retention_days(&conn, MAX_RETENTION_DAYS + 1).is_err());
+    assert_eq!(
+        get_observer_retention_days(&conn).unwrap(),
+        45,
+        "a rejected set must not overwrite the stored value"
+    );
+}
+
+#[test]
+fn test_observer_days_survive_reopen() {
+    let db = NamedTempFile::new().unwrap();
+    {
+        let first = fresh(&db);
+        set_observer_retention_days(&first, 7).unwrap();
+    }
+    let second = fresh(&db);
+    assert_eq!(
+        get_observer_retention_days(&second).unwrap(),
+        7,
+        "the setting persists across opens and M4 re-run does not reset it"
+    );
+}
+
+// ── Size accounting ─────────────────────────────────────────────────────────────
+
+#[test]
+fn test_size_stats_reports_pages_and_main_file_bytes() {
+    let db = NamedTempFile::new().unwrap();
+    let conn = fresh(&db);
+    // Write enough rows that the DB grows past a single page.
+    for i in 0..200 {
+        conn.execute(
+            "INSERT INTO archived_events
+                 (identity_pubkey, relay_url, id, kind, pubkey, created_at, raw_json, archived_at)
+             VALUES (?1, ?2, ?3, 24200, 'author', ?4, ?5, ?4)",
+            params![ID, RELAY, format!("e{i}"), 1000 + i, "x".repeat(256)],
+        )
+        .unwrap();
+    }
+    let stats = size_stats(&conn).unwrap();
+    assert!(stats.page_size > 0, "page_size is a positive PRAGMA value");
+    assert!(stats.page_count > 1, "multi-page DB after 200 inserts");
+    assert!(stats.freelist_count >= 0);
+    // In WAL mode the just-written pages live in the `-wal` sidecar until a
+    // checkpoint folds them into the main file, so the logical page total
+    // (page_size * page_count) is covered by the two files combined, not by
+    // the main file alone.
+    assert!(
+        stats.main_file_bytes + stats.wal_file_bytes >= stats.page_size * stats.page_count,
+        "main + wal bytes cover at least the counted pages ({} + {} >= {}*{})",
+        stats.main_file_bytes,
+        stats.wal_file_bytes,
+        stats.page_size,
+        stats.page_count
+    );
+    assert!(stats.main_file_bytes > 0, "the main DB file is on disk");
+    // WAL mode: the sidecar exists and carries the just-written frames.
+    assert!(
+        stats.wal_file_bytes > 0,
+        "the -wal sidecar is measured in WAL mode"
+    );
+}
+
+#[test]
+fn test_size_stats_freelist_grows_after_delete() {
+    let db = NamedTempFile::new().unwrap();
+    let conn = fresh(&db);
+    for i in 0..200 {
+        conn.execute(
+            "INSERT INTO archived_events
+                 (identity_pubkey, relay_url, id, kind, pubkey, created_at, raw_json, archived_at)
+             VALUES (?1, ?2, ?3, 24200, 'author', ?4, ?5, ?4)",
+            params![ID, RELAY, format!("e{i}"), 1000 + i, "x".repeat(256)],
+        )
+        .unwrap();
+    }
+    let before = size_stats(&conn).unwrap();
+    conn.execute("DELETE FROM archived_events", []).unwrap();
+    let after = size_stats(&conn).unwrap();
+    assert!(
+        after.freelist_count > before.freelist_count,
+        "deleted pages land on the freelist ({} > {})",
+        after.freelist_count,
+        before.freelist_count
+    );
+}
+
+// ── Migration M4 ──────────────────────────────────────────────────────────────
+
+#[test]
+fn test_m4_fresh_open_creates_schema_marker_and_seed() {
+    let db = NamedTempFile::new().unwrap();
+    let conn = fresh(&db);
+    let objects: i64 = conn
+        .query_row(
+            "SELECT COUNT(*) FROM sqlite_master
+             WHERE (type = 'table' AND name = 'archive_meta')
+                OR (type = 'index' AND name = 'idx_archived_event_scopes_age')",
+            [],
+            |r| r.get(0),
+        )
+        .unwrap();
+    assert_eq!(objects, 2, "one table + one index");
+    assert_eq!(m4_marker_count(&conn), 1, "M4 marker recorded");
+    assert_eq!(
+        get_observer_retention_days(&conn).unwrap(),
+        DEFAULT_OBSERVER_RETENTION_DAYS,
+        "the observer window is seeded to the default"
+    );
+}
+
+#[test]
+fn test_m4_reopen_is_idempotent_and_preserves_setting() {
+    let db = NamedTempFile::new().unwrap();
+    let first = fresh(&db);
+    set_observer_retention_days(&first, 90).unwrap();
+    drop(first);
+    let second = fresh(&db);
+    assert_eq!(
+        m4_marker_count(&second),
+        1,
+        "exactly one marker after reopen"
+    );
+    assert_eq!(
+        get_observer_retention_days(&second).unwrap(),
+        90,
+        "the re-run must not re-seed over an existing value"
+    );
+}
+
+#[test]
+fn test_m4_applies_over_a_populated_pre_m4_db() {
+    let db = NamedTempFile::new().unwrap();
+    build_pre_m4_db(db.path());
+    // Pre-M4 subscriptions and archived rows must survive the migration
+    // untouched — M4 no longer reads or seeds from subscriptions.
+    {
+        let conn = Connection::open(db.path()).unwrap();
+        store::upsert_save_subscription(&conn, ID, RELAY, OWNER, ID, "[24200,44200,1]", 100)
+            .unwrap();
+    }
+    let conn = fresh(&db);
+    assert_eq!(m4_marker_count(&conn), 1);
+    assert_eq!(
+        get_observer_retention_days(&conn).unwrap(),
+        DEFAULT_OBSERVER_RETENTION_DAYS
+    );
+    assert_eq!(
+        store::list_save_subscriptions(&conn, ID, RELAY)
+            .unwrap()
+            .len(),
+        1,
+        "the pre-existing subscription is untouched by M4"
+    );
+}
+
+#[test]
+fn test_m4_preexisting_archive_meta_without_marker_fails_closed() {
+    let db = NamedTempFile::new().unwrap();
+    build_pre_m4_db(db.path());
+    // An `archive_meta` table present without the M4 marker is unreachable via
+    // shipped code — M4 runs the whole body (create table, build index, seed,
+    // marker) in one transactional `BEGIN IMMEDIATE`, so a crash rolls back the
+    // table too. The only way to reach this state is an externally-created
+    // table. M4 refuses to certify it: it fails closed and rolls back with no
+    // marker rather than adopting a table it did not build. The table's shape
+    // is irrelevant — its mere presence without the marker is the trigger.
+    {
+        let conn = Connection::open(db.path()).unwrap();
+        conn.execute_batch("CREATE TABLE archive_meta (key TEXT PRIMARY KEY);")
+            .unwrap();
+    }
+    assert!(
+        store::open_archive_db(db.path()).is_err(),
+        "M4 must fail closed on a pre-existing archive_meta"
+    );
+    let verify = Connection::open(db.path()).unwrap();
+    assert_eq!(
+        m4_marker_count(&verify),
+        0,
+        "no marker may certify an externally-created table"
+    );
+}
+
+#[test]
+fn test_m4_preexisting_index_under_name_is_silently_rebuilt() {
+    let db = NamedTempFile::new().unwrap();
+    build_pre_m4_db(db.path());
+    // Unlike a table (which carries data and is fail-closed), an index carries
+    // no data, so M4 drops any index sharing the name and recreates it
+    // unconditionally — no shape inspection. A bogus pre-existing index under
+    // the name is silently replaced with the correct one and the marker lands.
+    {
+        let conn = Connection::open(db.path()).unwrap();
+        conn.execute_batch(&format!(
+            "CREATE INDEX {SCOPE_AGE_INDEX_NAME} ON archived_event_scopes (id);"
+        ))
+        .unwrap();
+    }
+    let conn = fresh(&db);
+    assert_eq!(m4_marker_count(&conn), 1, "M4 completes after the rebuild");
+    // The rebuilt index has the six expected key columns in the covering order.
+    let mut stmt = conn
+        .prepare(&format!(
+            "SELECT name FROM pragma_index_xinfo('{SCOPE_AGE_INDEX_NAME}') \
+             WHERE key = 1 ORDER BY seqno"
+        ))
+        .unwrap();
+    let keys: Vec<String> = stmt
+        .query_map([], |r| r.get::<_, String>(0))
+        .unwrap()
+        .collect::<Result<Vec<_>, _>>()
+        .unwrap();
+    assert_eq!(
+        keys,
+        [
+            "identity_pubkey",
+            "relay_url",
+            "archived_at",
+            "id",
+            "scope_type",
+            "scope_value"
+        ],
+        "the index was rebuilt with the age-first covering key order"
+    );
+}
+
+// ── Concurrency ───────────────────────────────────────────────────────────────
+
+#[test]
+fn test_m4_two_conn_first_open_race_neither_times_out_and_marks_once() {
+    use std::thread;
+    let db = NamedTempFile::new().unwrap();
+    let path = db.path().to_path_buf();
+    build_pre_m4_db(&path);
+    // A realistically-populated legacy DB: a multi-kind subscription plus
+    // archived scope rows so M4's index build touches real data.
+    {
+        let conn = Connection::open(&path).unwrap();
+        store::upsert_save_subscription(&conn, ID, RELAY, OWNER, ID, "[24200,44200,1]", 100)
+            .unwrap();
+        for i in 0..8 {
+            conn.execute(
+                "INSERT INTO archived_event_scopes
+                     (identity_pubkey, relay_url, id, scope_type, scope_value, archived_at)
+                 VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
+                params![ID, RELAY, format!("e{i}"), OWNER, ID, 1000 + i],
+            )
+            .unwrap();
+        }
+    }
+
+    let barrier = Arc::new(Barrier::new(2));
+    let handles: Vec<_> = (0..2)
+        .map(|_| {
+            let p = path.clone();
+            let b = Arc::clone(&barrier);
+            thread::spawn(move || {
+                b.wait(); // maximise the first-open race window
+                store::open_archive_db(&p).map(|_| ())
+            })
+        })
+        .collect();
+    for h in handles {
+        assert!(
+            h.join().unwrap().is_ok(),
+            "both racing opens must complete within busy_timeout"
+        );
+    }
+
+    let verify = store::open_archive_db(&path).unwrap();
+    assert_eq!(m4_marker_count(&verify), 1, "M4 applied exactly once");
+    // The seed ran once inside the winner's transaction — one meta row, default.
+    let meta_rows: i64 = verify
+        .query_row(
+            "SELECT COUNT(*) FROM archive_meta WHERE key = ?1",
+            params![OBSERVER_RETENTION_DAYS_KEY],
+            |r| r.get(0),
+        )
+        .unwrap();
+    assert_eq!(meta_rows, 1, "the observer window was seeded exactly once");
+    assert_eq!(
+        get_observer_retention_days(&verify).unwrap(),
+        DEFAULT_OBSERVER_RETENTION_DAYS
+    );
+}
+
+// ── Prune-candidate access path (index shape) ──────────────────────────────────
+
+/// The Phase-2 prune-candidate scan (per `PLANS/ARCHIVE_RETENTION_PLAN.md`
+/// line 40): the single global observer window filters `identity + relay +
+/// archived_at < cutoff`, joins `archived_events` for `kind = 24200`, and
+/// selects the scope-row PK so the bounded `DELETE` can materialize candidates.
+/// The scope side constrains neither `scope_type` nor `scope_value`.
+const PRUNE_CANDIDATE_SQL: &str = "
+SELECT s.id, s.scope_type, s.scope_value
+FROM archived_event_scopes s
+JOIN archived_events e
+  ON e.identity_pubkey = s.identity_pubkey
+ AND e.relay_url = s.relay_url
+ AND e.id = s.id
+WHERE s.identity_pubkey = ?1
+  AND s.relay_url = ?2
+  AND s.archived_at < ?3
+  AND e.kind = 24200
+LIMIT 1000
+";
+
+/// The scope-age index must let the real Phase-2 prune query range-seek
+/// `archived_at` directly rather than fall back to a bare identity/relay seek
+/// plus a temp b-tree. The index is this PR's deliverable, so its access path
+/// is pinned here even though the prune worker lands in Phase 2.
+#[test]
+fn test_prune_candidate_scan_seeks_archived_at_through_the_index() {
+    let db = NamedTempFile::new().unwrap();
+    let conn = fresh(&db); // runs M4, creating the scope-age index
+
+    let plan: Vec<String> = conn
+        .prepare(&format!("EXPLAIN QUERY PLAN {PRUNE_CANDIDATE_SQL}"))
+        .unwrap()
+        .query_map(params![ID, RELAY, 0_i64], |r| r.get::<_, String>(3))
+        .unwrap()
+        .collect::<Result<Vec<_>, _>>()
+        .unwrap();
+
+    let scope_step = plan
+        .iter()
+        .find(|d| d.contains(SCOPE_AGE_INDEX_NAME))
+        .unwrap_or_else(|| panic!("prune scan must use {SCOPE_AGE_INDEX_NAME}; plan was {plan:?}"));
+    // The planner range-seeks archived_at through the index (equality on the
+    // two leading identity/relay keys, then the age bound) — not a bare
+    // identity/relay seek that would leave age to a scan / temp b-tree.
+    assert!(
+        scope_step.contains("archived_at<?"),
+        "scope step must range-seek archived_at, got: {scope_step}"
+    );
+    assert!(
+        !plan.iter().any(|d| d.contains("USE TEMP B-TREE")),
+        "age-first index must remove the ORDER-BY temp b-tree; plan was {plan:?}"
+    );
+}
diff --git a/desktop/src-tauri/src/archive/store_migrations.rs b/desktop/src-tauri/src/archive/store_migrations.rs
index 4e9391693e..35a21e25d4 100644
--- a/desktop/src-tauri/src/archive/store_migrations.rs
+++ b/desktop/src-tauri/src/archive/store_migrations.rs
@@ -17,11 +17,13 @@ use rusqlite::{params, Connection};
 ///
 /// Ordering: M2 (column additions) runs before M1 (index rebuild) so that
 /// the M1 rebuild, which calls `insert_metric_index_row`, always operates
-/// against a schema that includes the cache-read columns.
+/// against a schema that includes the cache-read columns. M4 (`archive_meta`
+/// + scope-age index) runs last; it is independent of M1–M3.
 pub(super) fn apply_schema_migrations(conn: &Connection) -> Result<(), String> {
     migrate_add_cache_read_tokens(conn)?;
     migrate_add_cache_write_and_pricing(conn)?;
-    migrate_add_harness_to_metric_index(conn)
+    migrate_add_harness_to_metric_index(conn)?;
+    migrate_add_archive_meta(conn)
 }
 
 /// M1: add `harness TEXT` column to `agent_metric_index` and rebuild index
@@ -323,3 +325,135 @@ fn migrate_add_cache_write_and_pricing(conn: &Connection) -> Result<(), String>
 
     Ok(())
 }
+
+/// M4: create the retention config storage — `archive_meta` (k/v state holding
+/// the observer-frame retention window and the Phase-2 prune timestamp) and the
+/// `archived_at`-covering scope-age index — then seed the default observer
+/// retention window (`observer_retention_days = 30`).
+///
+/// Unlike M1–M3, M4 CANNOT use the "check marker → `BEGIN DEFERRED`" pattern.
+/// On a fresh DB two connections can open concurrently (the observer- and
+/// metric-archive seed hooks each `open_archive_db`), both read no marker, and
+/// a `DEFERRED` transaction lets both proceed on the same snapshot — the loser
+/// hits `SQLITE_BUSY_SNAPSHOT` or double-seeds. Instead M4 takes the write lock
+/// up front with `BEGIN IMMEDIATE` and **rechecks the marker inside the lock**:
+/// the race loser blocks on `busy_timeout`, then observes the winner's
+/// committed marker and no-ops. The cheap pre-lock guard keeps steady-state
+/// opens off the write lock entirely (M4 only takes it until the marker lands).
+///
+/// The table uses plain `CREATE TABLE` behind a fail-closed guard (a
+/// pre-existing `archive_meta` with no marker is an externally-created object
+/// M4 refuses to certify) and the index is dropped and recreated
+/// unconditionally; the seed is `ON CONFLICT DO NOTHING`. The marker is written
+/// last inside the same transaction, so a crash before COMMIT rolls back every
+/// object and the next open re-runs from scratch.
+fn migrate_add_archive_meta(conn: &Connection) -> Result<(), String> {
+    // Cheap pre-lock guard: steady-state opens (marker already present) never
+    // take the write lock. The marker is written last in M4's transaction, so
+    // its presence implies the full schema + seed committed.
+    if archive_meta_migration_applied(conn)? {
+        return Ok(());
+    }
+
+    conn.execute_batch("BEGIN IMMEDIATE")
+        .map_err(|e| format!("migration M4: begin immediate: {e}"))?;
+
+    let result = migrate_add_archive_meta_locked(conn);
+
+    if result.is_ok() {
+        conn.execute_batch("COMMIT")
+            .map_err(|e| format!("migration M4: commit: {e}"))?;
+    } else {
+        // Best-effort rollback; surface the original error to the caller.
+        let _ = conn.execute_batch("ROLLBACK");
+    }
+    result
+}
+
+/// M4 body, run under the `BEGIN IMMEDIATE` write lock held by
+/// `migrate_add_archive_meta`.
+fn migrate_add_archive_meta_locked(conn: &Connection) -> Result<(), String> {
+    // In-lock recheck: a concurrent first-opener may have committed the marker
+    // while we were blocked on the write lock. If so, this connection has
+    // nothing to do — the winner already created the schema and seeded.
+    if archive_meta_migration_applied(conn)? {
+        return Ok(());
+    }
+
+    // Fail closed on an externally-created table. M4's whole body runs inside
+    // one `BEGIN IMMEDIATE` transaction with the marker written last, and
+    // SQLite DDL is transactional — a crash anywhere rolls the whole thing
+    // back. So no shipped code path can leave the table present without the
+    // marker; the only way to reach here with it already existing is a
+    // hand-edited DB or a foreign tool. Rather than certify a table we did not
+    // create, refuse: roll back with no marker and let a corrected DB re-run.
+    let exists: bool = conn
+        .query_row(
+            "SELECT COUNT(*) FROM sqlite_master WHERE type = 'table' AND name = 'archive_meta'",
+            [],
+            |r| r.get::<_, i64>(0),
+        )
+        .map_err(|e| format!("migration M4: probe archive_meta: {e}"))?
+        > 0;
+    if exists {
+        return Err(
+            "migration M4: archive_meta already exists without the M4 marker — \
+             refusing to certify an externally-created table"
+                .to_string(),
+        );
+    }
+
+    conn.execute_batch(super::retention::ARCHIVE_META_SCHEMA)
+        .map_err(|e| format!("migration M4: create archive_meta: {e}"))?;
+
+    // Unconditionally rebuild the scope-age index. It carries no data, so a
+    // fresh `CREATE` is always correct; dropping any index that happens to
+    // share the name costs one rebuild and needs no shape inspection.
+    conn.execute_batch(&format!(
+        "DROP INDEX IF EXISTS {}",
+        super::retention::SCOPE_AGE_INDEX_NAME
+    ))
+    .map_err(|e| format!("migration M4: drop any pre-existing scope-age index: {e}"))?;
+    conn.execute_batch(super::retention::SCOPE_AGE_INDEX_DDL)
+        .map_err(|e| format!("migration M4: create scope-age index: {e}"))?;
+
+    let now = std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_secs() as i64;
+
+    // Seed the default observer-frame retention window. `ON CONFLICT DO NOTHING`
+    // in the underlying insert makes this a no-op if a value is somehow already
+    // present — an existing choice always wins.
+    conn.execute(
+        "INSERT INTO archive_meta (key, value) VALUES (?1, ?2)
+         ON CONFLICT (key) DO NOTHING",
+        params![
+            super::retention::OBSERVER_RETENTION_DAYS_KEY,
+            super::retention::DEFAULT_OBSERVER_RETENTION_DAYS.to_string()
+        ],
+    )
+    .map_err(|e| format!("migration M4: seed observer retention days: {e}"))?;
+
+    conn.execute(
+        "INSERT OR IGNORE INTO archive_migrations (name, applied_at) \
+         VALUES ('add_archive_meta', ?1)",
+        params![now],
+    )
+    .map_err(|e| format!("migration M4: record marker: {e}"))?;
+
+    Ok(())
+}
+
+/// Whether the M4 marker is present. Its presence implies the retention schema
+/// and default seed committed (the marker is written last in M4's transaction).
+fn archive_meta_migration_applied(conn: &Connection) -> Result<bool, String> {
+    let count: i64 = conn
+        .query_row(
+            "SELECT COUNT(*) FROM archive_migrations WHERE name = 'add_archive_meta'",
+            [],
+            |r| r.get(0),
+        )
+        .map_err(|e| format!("migration M4: guard check: {e}"))?;
+    Ok(count > 0)
+}
diff --git a/desktop/src-tauri/src/archive/store_tests.rs b/desktop/src-tauri/src/archive/store_tests.rs
index bbd15391e7..c0f85430d4 100644
--- a/desktop/src-tauri/src/archive/store_tests.rs
+++ b/desktop/src-tauri/src/archive/store_tests.rs
@@ -10,6 +10,9 @@ fn in_memory() -> Connection {
     conn.pragma_update(None, "journal_mode", "WAL").unwrap();
     conn.pragma_update(None, "busy_timeout", 5000).unwrap();
     conn.execute_batch(SCHEMA).unwrap();
+    // Match production `open_archive_db`: apply every schema migration (incl.
+    // M4) so tests run against the same shape production connections see.
+    apply_schema_migrations(&conn).unwrap();
     conn
 }
 
diff --git a/desktop/src-tauri/src/archive/sync.rs b/desktop/src-tauri/src/archive/sync.rs
index 4fe4452c81..3730774e95 100644
--- a/desktop/src-tauri/src/archive/sync.rs
+++ b/desktop/src-tauri/src/archive/sync.rs
@@ -280,10 +280,12 @@ impl ArchiveSyncIo for AppIo {
             let state: State<'_, AppState> = self.app.state();
             let identity_pk = super::identity_pubkey(&state)?;
             let relay_url = crate::relay::relay_ws_url_with_override(&state);
-            super::run_archive_db_task(move |conn| {
-                super::store::list_save_subscriptions(conn, &identity_pk, &relay_url)
-            })
-            .await
+            state
+                .archive_db
+                .with_conn(move |conn| {
+                    super::store::list_save_subscriptions(conn, &identity_pk, &relay_url)
+                })
+                .await
         })
     }
 
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index e1b8a9551b..71a5eb3806 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -314,16 +314,14 @@ pub fn run() {
             // agent spawns can resolve custom/preset runtime ids without
             // waiting for the frontend's discover_acp_providers call.  This is
             // a pure directory scan — no PATH probing, no async work.
-            {
-                let custom_dir = app_handle
-                    .path()
-                    .app_data_dir()
-                    .ok()
-                    .map(|d| d.join("custom_harnesses"));
-                managed_agents::custom_harnesses::warm_harness_registry_from_dir(
-                    custom_dir.as_deref(),
-                );
-            }
+            let custom_harness_dir = app_handle
+                .path()
+                .app_data_dir()
+                .ok()
+                .map(|d| d.join("custom_harnesses"));
+            managed_agents::custom_harnesses::warm_harness_registry_from_dir(
+                custom_harness_dir.as_deref(),
+            );
 
             // Store the AppHandle so huddle commands can emit `huddle-state-changed`
             // events via `huddle::emit_huddle_state` without threading the handle
@@ -353,10 +351,7 @@ pub fn run() {
                 // Route mesh-llm's download progress (model weights, runtime)
                 // onto Tauri events so the UI can render real progress.
                 crate::mesh_llm::install_progress_sink(&app_handle);
-                let mesh_app = app_handle.clone();
-                tauri::async_runtime::spawn(async move {
-                    crate::mesh_llm::start_coordinator(mesh_app).await;
-                });
+                tauri::async_runtime::spawn(crate::mesh_llm::start_coordinator(app_handle.clone()));
             }
 
             // Start the localhost media streaming proxy. Uses the shared HTTP
@@ -379,6 +374,7 @@ pub fn run() {
             if let Err(error) = ensure_nest() {
                 eprintln!("buzz-desktop: failed to create nest: {error}");
             }
+            archive::spawn_warm_init(app_handle.clone());
 
             // Resolve the REPOS symlink from the persisted repos_dir BEFORE
             // agents are restored below, and decide whether restore is safe.
@@ -842,6 +838,9 @@ pub fn run() {
             archive::index_observer_channel_id,
             archive::read_unindexed_observer_rows,
             archive::get_agent_usage_series,
+            archive::get_observer_retention_days,
+            archive::set_observer_retention_days,
+            archive::archive_size_stats,
             archive::sync::announce_archive_sync_epoch,
             archive::sync::start_archive_sync,
             archive::sync::stop_archive_sync,

From 7da8f9abf3245d7ab31ba6e4ad72598b03471f2b Mon Sep 17 00:00:00 2001
From: Tyler <109685178+tlongwell-block@users.noreply.github.com>
Date: Fri, 21 Aug 2026 13:52:40 -0400
Subject: [PATCH 19/38] Clarify huddle message destination (#6496)

## Summary
- identify the injected channel ID as the attached main channel, not the
live huddle channel
- direct spoken replies to the channel UUID in the current Context block
- pin the distinction with regression assertions

## Testing
- `just desktop-tauri-test`
- pre-push desktop Tauri checks

Signed-off-by: Wren <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@buzz.block.builderlab.xyz>
Co-authored-by: Wren <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@buzz.block.builderlab.xyz>
---
 desktop/src-tauri/src/huddle/agents.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/desktop/src-tauri/src/huddle/agents.rs b/desktop/src-tauri/src/huddle/agents.rs
index 2b5b601de4..2bdf054426 100644
--- a/desktop/src-tauri/src/huddle/agents.rs
+++ b/desktop/src-tauri/src/huddle/agents.rs
@@ -37,11 +37,11 @@ use super::{pipeline::start_auto_enabled_transcription, HuddlePhase};
 pub fn voice_mode_guidelines(parent_channel_id: &str) -> String {
     format!(
         "\
-You are in a live voice huddle attached to channel {parent_channel_id}.
-Only messages sent with `buzz messages send` to this huddle channel are spoken aloud, in the order sent; everything else you produce is silent.
-When a user addresses you, your FIRST tool call must send a brief spoken reply to this channel, before any file read, search, or other tool call. The usual rule against bare acknowledgments does not apply here; the pickup is the feedback that you heard them.
+You are in a live voice huddle. Its attached main channel is {parent_channel_id}; that is not the live huddle channel.
+The channel UUID in the current `[Context]` block is the live huddle channel. Only messages sent with `buzz messages send` to that current Context channel are spoken aloud, in the order sent; everything else you produce is silent.
+When a user addresses you, your FIRST tool call must send a brief spoken reply to the current Context channel, before any file read, search, or other tool call. The usual rule against bare acknowledgments does not apply here; the pickup is the feedback that you heard them.
 Then work, sending each useful sentence as its own message the moment it is ready—a few sentences per answer, not a monologue.
-Speak plainly without markdown; post code or long detail to the attached channel instead.
+Speak plainly without markdown; post code or long detail to the attached main channel instead.
 If you are not addressed, stay silent."
     )
 }
@@ -303,11 +303,13 @@ mod tests {
     fn voice_mode_guidelines_pin_spoken_reply_as_first_tool_call() {
         let guidelines = voice_mode_guidelines("parent-channel");
         assert_eq!(guidelines.lines().count(), 6);
-        assert!(guidelines.contains("Only messages sent with `buzz messages send`"));
+        assert!(guidelines.contains("Its attached main channel is parent-channel"));
+        assert!(guidelines.contains("that is not the live huddle channel"));
+        assert!(guidelines.contains("current `[Context]` block is the live huddle channel"));
+        assert!(guidelines.contains("buzz messages send` to that current Context channel"));
         assert!(guidelines.contains("your FIRST tool call must send a brief spoken reply"));
         assert!(guidelines.contains("before any file read, search, or other tool call"));
         assert!(guidelines.contains("rule against bare acknowledgments does not apply here"));
-        assert!(guidelines.contains("parent-channel"));
     }
 
     #[test]

From aeb741fd31044ec560d953b0986dec2e7e93e2c6 Mon Sep 17 00:00:00 2001
From: klopez4212 <klopez4212@gmail.com>
Date: Fri, 21 Aug 2026 19:13:16 +0100
Subject: [PATCH 20/38] Polish mobile channel navigation and message sends
 (#6488)

## Summary
- align iOS back controls and affected titles across channel details,
settings, and pairing
- make channel star and mute actions reflect their state immediately
- animate locally sent channel, thread, and DM messages from behind the
composer with a 300ms ease-out

## Testing
- `just mobile-check`
- full mobile test suite (1,573 tests)

---------

Signed-off-by: kenny lopez <klopez4212@gmail.com>
Signed-off-by: Kenny Lopez <klopez4212@gmail.com>
Co-authored-by: Princess Donut <b238ea756dee4d98afa5883fc7f1de61eeabe65bf700e3a5a5a80db5e42e2c2b@buzz.block.builderlab.xyz>
---
 .../channels/channel_actions_sheet.dart       |   2 +
 .../channels/channel_detail_page.dart         |   2 +
 .../channel_detail_page/message_list.dart     | 140 ++++++----
 .../channels/channel_details_page.dart        |  35 ++-
 .../channel_mutes/channel_mutes_manager.dart  |   2 +
 .../channel_stars/channel_stars_manager.dart  |   2 +
 .../compose_bar/compose_bar_widget.dart       |  37 ++-
 .../channels/compose_bar/draft_lifecycle.dart |  62 +++++
 ...local_message_send_animation_provider.dart |  51 ++++
 .../local_message_send_transition.dart        |  72 +++++
 .../channels/send_message_provider.dart       |  11 +
 .../features/channels/thread_detail_page.dart |   6 +
 .../thread_detail_page/message_list.dart      |  80 +++---
 mobile/lib/features/pairing/pairing_page.dart |  21 +-
 .../lib/shared/widgets/buzz_action_tile.dart  |  15 +-
 .../lib/shared/widgets/frosted_app_bar.dart   |  13 +-
 .../lib/shared/widgets/lucide_star_icon.dart  |  67 +++++
 .../channels/channel_detail_page_test.dart    | 255 +++++++++++++++++-
 .../channel_preferences_manager_test.dart     |  57 ++++
 .../features/channels/compose_bar_test.dart   | 209 +++++++++++++-
 .../local_message_send_transition_test.dart   | 107 ++++++++
 .../channels/send_message_provider_test.dart  |   3 +
 .../features/pairing/pairing_page_test.dart   |  16 ++
 .../shared/widgets/frosted_app_bar_test.dart  |  23 +-
 24 files changed, 1158 insertions(+), 130 deletions(-)
 create mode 100644 mobile/lib/features/channels/local_message_send_animation_provider.dart
 create mode 100644 mobile/lib/features/channels/local_message_send_transition.dart
 create mode 100644 mobile/lib/shared/widgets/lucide_star_icon.dart
 create mode 100644 mobile/test/features/channels/channel_preferences_manager_test.dart
 create mode 100644 mobile/test/features/channels/local_message_send_transition_test.dart

diff --git a/mobile/lib/features/channels/channel_actions_sheet.dart b/mobile/lib/features/channels/channel_actions_sheet.dart
index 14ef456de2..0df6a03863 100644
--- a/mobile/lib/features/channels/channel_actions_sheet.dart
+++ b/mobile/lib/features/channels/channel_actions_sheet.dart
@@ -16,6 +16,8 @@ import '../../shared/widgets/buzz_action_tile.dart';
 import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
+import '../../shared/widgets/ios_glass_navigation_button.dart';
+import '../../shared/widgets/lucide_star_icon.dart';
 import '../../shared/widgets/modal_presentation.dart';
 import '../../shared/widgets/sheet_divider.dart';
 import 'channel.dart';
diff --git a/mobile/lib/features/channels/channel_detail_page.dart b/mobile/lib/features/channels/channel_detail_page.dart
index 05d353002a..fcf017903a 100644
--- a/mobile/lib/features/channels/channel_detail_page.dart
+++ b/mobile/lib/features/channels/channel_detail_page.dart
@@ -48,6 +48,8 @@ import 'ephemeral_channel_display.dart';
 import 'ime_metrics_settle_observer.dart';
 import 'jump_to_latest_button.dart';
 import 'jump_to_latest_switcher.dart';
+import 'local_message_send_animation_provider.dart';
+import 'local_message_send_transition.dart';
 import 'members_sheet.dart';
 import 'message_actions.dart';
 import 'message_action_backdrop_state.dart';
diff --git a/mobile/lib/features/channels/channel_detail_page/message_list.dart b/mobile/lib/features/channels/channel_detail_page/message_list.dart
index 781b96c33a..0b6a76bc66 100644
--- a/mobile/lib/features/channels/channel_detail_page/message_list.dart
+++ b/mobile/lib/features/channels/channel_detail_page/message_list.dart
@@ -42,6 +42,9 @@ class _MessageList extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final appView = View.of(context);
+    final localSendAnimations = ref.watch(
+      localMessageSendAnimationProvider(channelId),
+    );
     final displayEntries = groupMembershipTimelineEntries(entries);
     final itemScrollController = useMemoized(ItemScrollController.new);
     final itemPositionsListener = useMemoized(ItemPositionsListener.create);
@@ -66,9 +69,11 @@ class _MessageList extends HookConsumerWidget {
     );
     final isAutoScrolling = useRef(false);
     final latestNavigationRequest = useState(0);
+    final latestNavigationTargetId = useRef<String?>(null);
     final latestRealignmentQueued = useRef(false);
     final latestEntryId = entries.isEmpty ? null : entries.last.message.id;
     final previousLatestEntryId = useRef<String?>(null);
+    final observedLocalSendIds = useRef(localSendAnimations.keys.toSet());
     final didOpenInitialThread = useRef(false);
     final didJumpToInitialMessage = useRef(false);
     final isUnreadNavigationDismissed = useState(false);
@@ -338,14 +343,16 @@ class _MessageList extends HookConsumerWidget {
         return;
       }
       try {
+        final targetIndex =
+            reversedIndexOf(latestNavigationTargetId.value) ?? 0;
         await itemScrollController.scrollTo(
-          index: 0,
+          index: targetIndex,
           alignment: latestAlignment(),
           duration: jumpToLatestScrollDuration,
           curve: jumpToLatestScrollCurve,
         );
         if (context.mounted && !hasUserScrolled.value) {
-          isAtLatest.value = true;
+          isAtLatest.value = targetIndex == 0;
           isJumpToLatestVisible.value = false;
         }
       } finally {
@@ -353,12 +360,13 @@ class _MessageList extends HookConsumerWidget {
       }
     }
 
-    void scrollToLatest() {
+    void scrollToLatest({String? targetMessageId}) {
       if (!itemScrollController.isAttached || isAutoScrolling.value) return;
       isAutoScrolling.value = true;
       followsLatest.value = true;
       hasUserScrolled.value = false;
       hasUnseenLatestEntry.value = false;
+      latestNavigationTargetId.value = targetMessageId;
       latestNavigationRequest.value += 1;
     }
 
@@ -617,18 +625,36 @@ class _MessageList extends HookConsumerWidget {
     useEffect(() {
       final previous = previousLatestEntryId.value;
       previousLatestEntryId.value = latestEntryId;
-      if (previous == null ||
-          latestEntryId == null ||
-          previous == latestEntryId) {
+      final entryIds = entries.map((entry) => entry.message.id).toSet();
+      final newlyInsertedLocalSendIds = localSendAnimations.keys
+          .where(
+            (eventId) =>
+                !observedLocalSendIds.value.contains(eventId) &&
+                entryIds.contains(eventId),
+          )
+          .toList();
+      observedLocalSendIds.value
+        ..removeWhere((eventId) => !localSendAnimations.containsKey(eventId))
+        ..addAll(newlyInsertedLocalSendIds);
+      final localSendId = newlyInsertedLocalSendIds.firstOrNull;
+      final latestEntryChanged =
+          previous != null &&
+          latestEntryId != null &&
+          previous != latestEntryId;
+      if (!latestEntryChanged && localSendId == null) {
         return null;
       }
+      if (localSendId != null) {
+        followsLatest.value = true;
+        hasUserScrolled.value = false;
+      }
       if (!followsLatest.value || hasUserScrolled.value) {
         hasUnseenLatestEntry.value = true;
       }
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (!context.mounted) return;
         if (followsLatest.value && !hasUserScrolled.value) {
-          scrollToLatest();
+          scrollToLatest(targetMessageId: localSendId);
           return;
         }
         final positions = itemPositionsListener.itemPositions.value;
@@ -640,7 +666,7 @@ class _MessageList extends HookConsumerWidget {
         }
       });
       return null;
-    }, [latestEntryId]);
+    }, [latestEntryId, localSendAnimations]);
 
     if (entries.isEmpty) {
       return Center(
@@ -781,57 +807,67 @@ class _MessageList extends HookConsumerWidget {
                             message.pubkey.toLowerCase() ||
                         (message.createdAt - prevMessage.createdAt) > 300);
 
-                return Padding(
-                  key: ValueKey('channel-message-group-${message.id}'),
-                  padding: EdgeInsets.only(bottom: index == 0 ? Grid.xs : 0),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      if (showDayDivider)
-                        DayDivider(
-                          label: formatDayHeading(message.createdAt),
-                          dayTimestamp: message.createdAt,
-                          stickyDayTimestamp: stickyDayTimestamp,
-                        ),
-                      if (message.isSystem)
-                        _SystemMessageRow(
-                          message: message,
-                          groupedMessages: entryGroup.length > 1
-                              ? entryGroup
-                                    .map((entry) => entry.message)
-                                    .toList()
-                              : null,
-                          channelId: channelId,
-                          currentPubkey: currentPubkey,
-                          allMessages: null,
-                          isMember: isMember,
-                          isArchived: isArchived,
-                        )
-                      else ...[
-                        _MessageBubble(
-                          message: message,
-                          showAuthor: showAuthor,
-                          channelNames: channelNamesMap,
-                          currentChannelId: channelId,
-                          currentPubkey: currentPubkey,
-                          allMessages: allMessages,
-                          isMember: isMember,
-                          isArchived: isArchived,
-                          composerFocusNode: composerFocusNode,
-                          restoreComposerFocus: restoreComposerFocus,
-                        ),
-                        if (entry.summary != null)
-                          _ThreadSummaryRow(
-                            summary: entry.summary!,
+                return LocalMessageSendTransition(
+                  key: ValueKey('channel-message-send-${message.id}'),
+                  animate: isRecentLocalMessageSendAnimation(
+                    localSendAnimations,
+                    message.id,
+                  ),
+                  startOffsetFactor: showAuthor
+                      ? localMessageSendTransitionAvatarStartOffset
+                      : localMessageSendTransitionStartOffset,
+                  child: Padding(
+                    key: ValueKey('channel-message-group-${message.id}'),
+                    padding: EdgeInsets.only(bottom: index == 0 ? Grid.xs : 0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        if (showDayDivider)
+                          DayDivider(
+                            label: formatDayHeading(message.createdAt),
+                            dayTimestamp: message.createdAt,
+                            stickyDayTimestamp: stickyDayTimestamp,
+                          ),
+                        if (message.isSystem)
+                          _SystemMessageRow(
                             message: message,
-                            allMessages: allMessages,
+                            groupedMessages: entryGroup.length > 1
+                                ? entryGroup
+                                      .map((entry) => entry.message)
+                                      .toList()
+                                : null,
                             channelId: channelId,
                             currentPubkey: currentPubkey,
+                            allMessages: null,
                             isMember: isMember,
                             isArchived: isArchived,
+                          )
+                        else ...[
+                          _MessageBubble(
+                            message: message,
+                            showAuthor: showAuthor,
+                            channelNames: channelNamesMap,
+                            currentChannelId: channelId,
+                            currentPubkey: currentPubkey,
+                            allMessages: allMessages,
+                            isMember: isMember,
+                            isArchived: isArchived,
+                            composerFocusNode: composerFocusNode,
+                            restoreComposerFocus: restoreComposerFocus,
                           ),
+                          if (entry.summary != null)
+                            _ThreadSummaryRow(
+                              summary: entry.summary!,
+                              message: message,
+                              allMessages: allMessages,
+                              channelId: channelId,
+                              currentPubkey: currentPubkey,
+                              isMember: isMember,
+                              isArchived: isArchived,
+                            ),
+                        ],
                       ],
-                    ],
+                    ),
                   ),
                 );
               },
diff --git a/mobile/lib/features/channels/channel_details_page.dart b/mobile/lib/features/channels/channel_details_page.dart
index cbe9be7a93..0fc68f7f3a 100644
--- a/mobile/lib/features/channels/channel_details_page.dart
+++ b/mobile/lib/features/channels/channel_details_page.dart
@@ -249,11 +249,31 @@ class ChannelDetailsPage extends HookConsumerWidget {
     }
 
     final reducedMotion = MediaQuery.disableAnimationsOf(context);
+    final usesNativeIosGlassBackButton =
+        Navigator.canPop(context) &&
+        Theme.of(context).platform == TargetPlatform.iOS;
     return FrostedScaffold(
       backgroundColor: context.colors.surface,
       appBar: FrostedAppBar(
+        leading: usesNativeIosGlassBackButton
+            ? IosGlassNavigationButton(
+                key: const ValueKey('channel-details-ios-glass-back'),
+                icon: IosGlassNavigationIcon.back,
+                semanticLabel: 'Back',
+                onPressed: () => Navigator.of(context).maybePop(),
+                width: iosGlassChannelHeaderLeadingWidth,
+                buttonCenterX: iosGlassChannelHeaderButtonCenterX,
+              )
+            : null,
         iconColor: context.colors.primary,
-        actions: const [SizedBox.square(dimension: 48)],
+        actions: [
+          SizedBox(
+            width: usesNativeIosGlassBackButton
+                ? iosGlassChannelHeaderLeadingWidth
+                : 48,
+            height: 48,
+          ),
+        ],
         frosted: headerFrostProgress.value > 0,
         frostedSurfaceOpacity: 0.5 * headerFrostProgress.value,
         frostedBlurSigma:
@@ -302,8 +322,14 @@ class ChannelDetailsPage extends HookConsumerWidget {
                   Expanded(
                     child: BuzzActionTile(
                       key: const ValueKey('channel-details-star-action'),
-                      icon: isStarred ? LucideIcons.starOff : LucideIcons.star,
-                      label: isStarred ? 'Unstar' : 'Star channel',
+                      icon: null,
+                      iconWidget: LucideStarIcon(
+                        filled: isStarred,
+                        color: isStarred
+                            ? context.colors.primary
+                            : context.colors.onSurface,
+                      ),
+                      label: isStarred ? 'Unstar' : 'Star',
                       onTap: toggleStar,
                     ),
                   ),
@@ -312,7 +338,8 @@ class ChannelDetailsPage extends HookConsumerWidget {
                     child: BuzzActionTile(
                       key: const ValueKey('channel-details-mute-action'),
                       icon: isMuted ? LucideIcons.bell : LucideIcons.bellOff,
-                      label: isMuted ? 'Unmute' : 'Mute channel',
+                      iconColor: isMuted ? context.colors.primary : null,
+                      label: isMuted ? 'Unmute' : 'Mute',
                       onTap: toggleMute,
                     ),
                   ),
diff --git a/mobile/lib/features/channels/channel_mutes/channel_mutes_manager.dart b/mobile/lib/features/channels/channel_mutes/channel_mutes_manager.dart
index eb768dd8fa..32c163a1bb 100644
--- a/mobile/lib/features/channels/channel_mutes/channel_mutes_manager.dart
+++ b/mobile/lib/features/channels/channel_mutes/channel_mutes_manager.dart
@@ -100,6 +100,7 @@ class ChannelMutesManager {
     );
     _store = ChannelMuteStore(channels: {..._store.channels, channelId: entry});
     _persist();
+    _onChanged();
     markDirty();
   }
 
@@ -111,6 +112,7 @@ class ChannelMutesManager {
     );
     _store = ChannelMuteStore(channels: {..._store.channels, channelId: entry});
     _persist();
+    _onChanged();
     markDirty();
   }
 
diff --git a/mobile/lib/features/channels/channel_stars/channel_stars_manager.dart b/mobile/lib/features/channels/channel_stars/channel_stars_manager.dart
index c4f4da862f..94fba0acb9 100644
--- a/mobile/lib/features/channels/channel_stars/channel_stars_manager.dart
+++ b/mobile/lib/features/channels/channel_stars/channel_stars_manager.dart
@@ -100,6 +100,7 @@ class ChannelStarsManager {
     );
     _store = ChannelStarStore(channels: {..._store.channels, channelId: entry});
     _persist();
+    _onChanged();
     markDirty();
   }
 
@@ -111,6 +112,7 @@ class ChannelStarsManager {
     );
     _store = ChannelStarStore(channels: {..._store.channels, channelId: entry});
     _persist();
+    _onChanged();
     markDirty();
   }
 
diff --git a/mobile/lib/features/channels/compose_bar/compose_bar_widget.dart b/mobile/lib/features/channels/compose_bar/compose_bar_widget.dart
index 344972f10e..b63731662c 100644
--- a/mobile/lib/features/channels/compose_bar/compose_bar_widget.dart
+++ b/mobile/lib/features/channels/compose_bar/compose_bar_widget.dart
@@ -456,6 +456,7 @@ class ComposeBar extends HookConsumerWidget {
           uploadingCount.value > 0) {
         return;
       }
+      final submittedDraftRevision = draftRevision.value;
       // Resolved before any await: see
       // `_reportSendCancelledByCommunitySwitch`.
       final messenger = ScaffoldMessenger.maybeOf(context);
@@ -501,29 +502,25 @@ class ComposeBar extends HookConsumerWidget {
       isSending.value = true;
       try {
         if (queuedAttachments.isEmpty) {
-          try {
-            await addMentionedNonMembers();
-            final payload = _ComposeDraftPayload.fromDraft(
+          if (!context.mounted) return;
+          await _sendTextOnlyDraft(
+            context: context,
+            controller: controller,
+            mentionMap: mentionMap,
+            draftRevision: draftRevision,
+            submittedDraftRevision: submittedDraftRevision,
+            focusNode: focusNode,
+            clearComposer: clearComposer,
+            addMentionedNonMembers: addMentionedNonMembers,
+            payload: _ComposeDraftPayload.fromDraft(
               text: text,
               attachments: const [],
               customEmoji: customEmoji,
-            );
-            await onSend(
-              payload.content,
-              outgoing.pubkeys,
-              mediaTags: [...payload.mediaTags, ...outgoing.referenceTags],
-            );
-            if (context.mounted) clearComposer();
-          } on StateError {
-            _reportSendCancelledByCommunitySwitch(messenger);
-          } catch (error) {
-            // send() runs unawaited, so a relay rejection or publish timeout
-            // would otherwise vanish with the composer looking idle. The draft
-            // is kept (clearComposer never ran) so the user can retry.
-            messenger?.showSnackBar(
-              SnackBar(content: Text(_composeSendErrorMessage(error))),
-            );
-          }
+            ),
+            outgoing: outgoing,
+            onSend: onSend,
+            messenger: messenger,
+          );
           return;
         }
 
diff --git a/mobile/lib/features/channels/compose_bar/draft_lifecycle.dart b/mobile/lib/features/channels/compose_bar/draft_lifecycle.dart
index dd58be9da4..288fad4bf1 100644
--- a/mobile/lib/features/channels/compose_bar/draft_lifecycle.dart
+++ b/mobile/lib/features/channels/compose_bar/draft_lifecycle.dart
@@ -1,5 +1,67 @@
 part of '../compose_bar.dart';
 
+Future<void> _sendTextOnlyDraft({
+  required BuildContext context,
+  required _MarkdownEditingController controller,
+  required ObjectRef<Map<String, MentionCandidate>> mentionMap,
+  required ObjectRef<int> draftRevision,
+  required int submittedDraftRevision,
+  required FocusNode focusNode,
+  required VoidCallback clearComposer,
+  required Future<void> Function() addMentionedNonMembers,
+  required _ComposeDraftPayload payload,
+  required _OutgoingMentions outgoing,
+  required ComposeBarOnSend onSend,
+  required ScaffoldMessengerState? messenger,
+}) async {
+  TextEditingValue? clearedDraftText;
+  Map<String, MentionCandidate>? clearedDraftMentions;
+  int? clearedDraftRevision;
+
+  void restoreClearedDraft() {
+    if (!context.mounted ||
+        clearedDraftText == null ||
+        clearedDraftMentions == null ||
+        clearedDraftRevision == null ||
+        draftRevision.value != clearedDraftRevision) {
+      return;
+    }
+    controller.value = clearedDraftText;
+    mentionMap.value
+      ..clear()
+      ..addAll(clearedDraftMentions);
+    focusNode.requestFocus();
+  }
+
+  try {
+    await addMentionedNonMembers();
+    // Clear before optimistic insertion so the outgoing row and draft never
+    // appear simultaneously during the send transition. If the user edited
+    // while membership changes were pending, preserve that newer draft.
+    if (context.mounted && draftRevision.value == submittedDraftRevision) {
+      clearedDraftText = controller.value;
+      clearedDraftMentions = Map<String, MentionCandidate>.of(mentionMap.value);
+      clearComposer();
+      clearedDraftRevision = draftRevision.value;
+    }
+    await onSend(
+      payload.content,
+      outgoing.pubkeys,
+      mediaTags: [...payload.mediaTags, ...outgoing.referenceTags],
+    );
+  } on StateError {
+    restoreClearedDraft();
+    _reportSendCancelledByCommunitySwitch(messenger);
+  } catch (error) {
+    // The caller runs unawaited, so surface publish failures and restore the
+    // sent draft unless the user has already started a new one.
+    restoreClearedDraft();
+    messenger?.showSnackBar(
+      SnackBar(content: Text(_composeSendErrorMessage(error))),
+    );
+  }
+}
+
 void _useComposeDraftLifecycle({
   required WidgetRef ref,
   required _MarkdownEditingController controller,
diff --git a/mobile/lib/features/channels/local_message_send_animation_provider.dart b/mobile/lib/features/channels/local_message_send_animation_provider.dart
new file mode 100644
index 0000000000..1b3fa0f036
--- /dev/null
+++ b/mobile/lib/features/channels/local_message_send_animation_provider.dart
@@ -0,0 +1,51 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+const _localMessageSendAnimationClaimWindow = Duration(seconds: 1);
+
+/// Recently signed local messages that may play the send entrance animation.
+///
+/// The short claim window prevents a message first rendered much later (for
+/// example after opening its channel) from looking newly sent.
+class LocalMessageSendAnimationNotifier
+    extends Notifier<Map<String, DateTime>> {
+  /// The channel whose outgoing messages are tracked by this notifier.
+  final String channelId;
+
+  /// Creates animation state scoped to [channelId].
+  LocalMessageSendAnimationNotifier(this.channelId);
+
+  @override
+  Map<String, DateTime> build() => const {};
+
+  /// Marks [eventId] as a newly signed local message eligible for animation.
+  void mark(String eventId) {
+    final now = DateTime.now();
+    state = {
+      for (final entry in state.entries)
+        if (now.difference(entry.value) <=
+            _localMessageSendAnimationClaimWindow)
+          entry.key: entry.value,
+      eventId: now,
+    };
+  }
+}
+
+/// Whether [eventId] was marked recently enough to animate as a local send.
+bool isRecentLocalMessageSendAnimation(
+  Map<String, DateTime> animations,
+  String eventId, {
+  DateTime? now,
+}) {
+  final markedAt = animations[eventId];
+  if (markedAt == null) return false;
+  return (now ?? DateTime.now()).difference(markedAt) <=
+      _localMessageSendAnimationClaimWindow;
+}
+
+/// Recent local-send animation claims keyed by channel and event ID.
+final localMessageSendAnimationProvider =
+    NotifierProvider.family<
+      LocalMessageSendAnimationNotifier,
+      Map<String, DateTime>,
+      String
+    >(LocalMessageSendAnimationNotifier.new);
diff --git a/mobile/lib/features/channels/local_message_send_transition.dart b/mobile/lib/features/channels/local_message_send_transition.dart
new file mode 100644
index 0000000000..dcf8df4f9a
--- /dev/null
+++ b/mobile/lib/features/channels/local_message_send_transition.dart
@@ -0,0 +1,72 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+
+/// Duration of a local message's entrance transition.
+const localMessageSendTransitionDuration = Duration(milliseconds: 300);
+
+/// Default vertical offset, in child heights, for a message entrance.
+const localMessageSendTransitionStartOffset = 1.5;
+
+/// Vertical offset, in child heights, used for an avatar entrance.
+const localMessageSendTransitionAvatarStartOffset = 2.5;
+
+/// Slides a newly sent local message upward from beneath the composer.
+class LocalMessageSendTransition extends HookWidget {
+  /// Creates a local send transition around [child].
+  const LocalMessageSendTransition({
+    super.key,
+    required this.animate,
+    this.startOffsetFactor = localMessageSendTransitionStartOffset,
+    required this.child,
+  });
+
+  /// Whether to play the entrance transition.
+  final bool animate;
+
+  /// Initial vertical offset expressed as a multiple of the child's height.
+  final double startOffsetFactor;
+
+  /// Message content translated by the transition.
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    final reduceMotion = MediaQuery.disableAnimationsOf(context);
+    final controller = useAnimationController(
+      duration: localMessageSendTransitionDuration,
+      initialValue: animate && !reduceMotion ? 0 : 1,
+    );
+    final easedAnimation = useMemoized(
+      () => CurvedAnimation(parent: controller, curve: Curves.easeOutCubic),
+      [controller],
+    );
+    useEffect(() => easedAnimation.dispose, [easedAnimation]);
+
+    useEffect(() {
+      if (animate && !reduceMotion) {
+        unawaited(
+          controller.animateTo(
+            1,
+            duration: localMessageSendTransitionDuration,
+            curve: Curves.linear,
+          ),
+        );
+      } else {
+        controller.value = 1;
+      }
+      return null;
+    }, [animate, controller, reduceMotion]);
+
+    return AnimatedBuilder(
+      animation: easedAnimation,
+      child: child,
+      builder: (context, child) => FractionalTranslation(
+        translation: Offset(0, startOffsetFactor * (1 - easedAnimation.value)),
+        transformHitTests: false,
+        child: child,
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/channels/send_message_provider.dart b/mobile/lib/features/channels/send_message_provider.dart
index 607be269b1..757275c60a 100644
--- a/mobile/lib/features/channels/send_message_provider.dart
+++ b/mobile/lib/features/channels/send_message_provider.dart
@@ -7,6 +7,7 @@ import '../../shared/profile/user_profile.dart';
 import 'channel.dart';
 import 'channel_messages_provider.dart';
 import 'message_mention_pubkeys.dart';
+import 'local_message_send_animation_provider.dart';
 
 /// Sends messages by signing an event with the user's nsec and publishing it
 /// over the relay's NIP-42-authenticated WebSocket session.
@@ -15,6 +16,8 @@ class SendMessage {
   final Future<List<ChannelMember>> Function(String channelId) _fetchMembers;
   final Map<String, UserProfile> Function() _readUserCache;
   final void Function(String channelId, NostrEvent event) _addLocalMessage;
+  final void Function(String channelId, String eventId)
+  _markLocalMessageForAnimation;
   final void Function(String channelId, String eventId) _completeLocalMessage;
   final void Function(String channelId, String eventId) _removeLocalMessage;
   final bool Function()? _isDeliveryValid;
@@ -25,6 +28,8 @@ class SendMessage {
     fetchMembers,
     required Map<String, UserProfile> Function() readUserCache,
     required void Function(String channelId, NostrEvent event) addLocalMessage,
+    void Function(String channelId, String eventId)?
+    markLocalMessageForAnimation,
     required void Function(String channelId, String eventId)
     completeLocalMessage,
     required void Function(String channelId, String eventId) removeLocalMessage,
@@ -33,6 +38,8 @@ class SendMessage {
        _fetchMembers = fetchMembers,
        _readUserCache = readUserCache,
        _addLocalMessage = addLocalMessage,
+       _markLocalMessageForAnimation =
+           markLocalMessageForAnimation ?? ((_, _) {}),
        _completeLocalMessage = completeLocalMessage,
        _removeLocalMessage = removeLocalMessage,
        _isDeliveryValid = isDeliveryValid;
@@ -96,6 +103,7 @@ class SendMessage {
         tags: tags,
         onSigned: (event) {
           localMessage = event;
+          _markLocalMessageForAnimation(channelId, event.id);
           _addLocalMessage(channelId, event);
         },
       );
@@ -230,6 +238,9 @@ final sendMessageProvider = Provider<SendMessage>((ref) {
     addLocalMessage: (channelId, event) => ref
         .read(channelMessagesProvider(channelId).notifier)
         .addLocalMessage(event),
+    markLocalMessageForAnimation: (channelId, eventId) => ref
+        .read(localMessageSendAnimationProvider(channelId).notifier)
+        .mark(eventId),
     completeLocalMessage: (channelId, eventId) => ref
         .read(channelMessagesProvider(channelId).notifier)
         .completeLocalMessage(eventId),
diff --git a/mobile/lib/features/channels/thread_detail_page.dart b/mobile/lib/features/channels/thread_detail_page.dart
index 1d009b3c1e..cbac3cff84 100644
--- a/mobile/lib/features/channels/thread_detail_page.dart
+++ b/mobile/lib/features/channels/thread_detail_page.dart
@@ -33,6 +33,8 @@ import 'initial_thread_tail_settle.dart';
 import 'laid_out_viewport.dart';
 import 'jump_to_latest_button.dart';
 import 'jump_to_latest_switcher.dart';
+import 'local_message_send_animation_provider.dart';
+import 'local_message_send_transition.dart';
 import '../profile/user_profile_sheet.dart';
 import 'message_actions.dart';
 import 'message_action_backdrop_state.dart';
@@ -104,6 +106,9 @@ class ThreadDetailPage extends HookConsumerWidget {
       return session.registerVisibleChannel(channelId);
     }, [channelId]);
     final sendMessage = ref.read(sendMessageProvider);
+    final localSendAnimations = ref.watch(
+      localMessageSendAnimationProvider(channelId),
+    );
     // Relay thread queries are keyed by the outermost root, even when this
     // page displays a nested branch. Query that root, then select this head's
     // direct children from the returned subtree below.
@@ -893,6 +898,7 @@ class ThreadDetailPage extends HookConsumerWidget {
                   itemPositionsListener: itemPositionsListener,
                   bottomInset: timelineBottomInset,
                   replies: replies,
+                  localSendAnimations: localSendAnimations,
                   trackActiveScrollPosition: trackActiveScrollPosition,
                   headIsDeleted: liveDeletionHidesHead,
                   head: liveHead,
diff --git a/mobile/lib/features/channels/thread_detail_page/message_list.dart b/mobile/lib/features/channels/thread_detail_page/message_list.dart
index 0010cd7f8d..90e227ab7d 100644
--- a/mobile/lib/features/channels/thread_detail_page/message_list.dart
+++ b/mobile/lib/features/channels/thread_detail_page/message_list.dart
@@ -9,6 +9,7 @@ class _ThreadMessageList extends StatelessWidget {
   final ItemPositionsListener itemPositionsListener;
   final double bottomInset;
   final List<TimelineMessage> replies;
+  final Map<String, DateTime> localSendAnimations;
   final Widget Function(Widget child) trackActiveScrollPosition;
   final bool headIsDeleted;
   final TimelineMessage head;
@@ -33,6 +34,7 @@ class _ThreadMessageList extends StatelessWidget {
     required this.itemPositionsListener,
     required this.bottomInset,
     required this.replies,
+    required this.localSendAnimations,
     required this.trackActiveScrollPosition,
     required this.headIsDeleted,
     required this.head,
@@ -183,45 +185,55 @@ class _ThreadMessageList extends StatelessWidget {
                     : null;
 
                 return trackActiveScrollPosition(
-                  Padding(
-                    key: ValueKey('thread-message-group-${reply.id}'),
-                    // Tail spacing comes from the list's own bottom padding now
-                    // that the list runs top-down; the reversed list used to
-                    // need it here because item 0 sat against the composer.
-                    padding: EdgeInsets.zero,
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        if (showDayDivider)
-                          DayDivider(
-                            label: formatDayHeading(reply.createdAt),
-                            dayTimestamp: reply.createdAt,
-                            stickyDayTimestamp: stickyDayTimestamp,
-                          ),
-                        _ThreadMessage(
-                          message: reply,
-                          channelNames: channelNames,
-                          channelId: channelId,
-                          currentPubkey: currentPubkey,
-                          showAuthor: showAuthor,
-                          isHighlighted: reply.id == highlightedMessageId,
-                          allMessages: allMessages,
-                          isMember: isMember,
-                          isArchived: isArchived,
-                          composerFocusNode: composerFocusNode,
-                          restoreComposerFocus: restoreComposerFocus,
-                        ),
-                        if (nestedSummary != null)
-                          _NestedThreadSummaryRow(
-                            summary: nestedSummary,
-                            replyMessage: reply,
-                            allMessages: allMessages,
+                  LocalMessageSendTransition(
+                    key: ValueKey('thread-message-send-${reply.id}'),
+                    animate: isRecentLocalMessageSendAnimation(
+                      localSendAnimations,
+                      reply.id,
+                    ),
+                    startOffsetFactor: showAuthor
+                        ? localMessageSendTransitionAvatarStartOffset
+                        : localMessageSendTransitionStartOffset,
+                    child: Padding(
+                      key: ValueKey('thread-message-group-${reply.id}'),
+                      // Tail spacing comes from the list's own bottom padding now
+                      // that the list runs top-down; the reversed list used to
+                      // need it here because item 0 sat against the composer.
+                      padding: EdgeInsets.zero,
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          if (showDayDivider)
+                            DayDivider(
+                              label: formatDayHeading(reply.createdAt),
+                              dayTimestamp: reply.createdAt,
+                              stickyDayTimestamp: stickyDayTimestamp,
+                            ),
+                          _ThreadMessage(
+                            message: reply,
+                            channelNames: channelNames,
                             channelId: channelId,
                             currentPubkey: currentPubkey,
+                            showAuthor: showAuthor,
+                            isHighlighted: reply.id == highlightedMessageId,
+                            allMessages: allMessages,
                             isMember: isMember,
                             isArchived: isArchived,
+                            composerFocusNode: composerFocusNode,
+                            restoreComposerFocus: restoreComposerFocus,
                           ),
-                      ],
+                          if (nestedSummary != null)
+                            _NestedThreadSummaryRow(
+                              summary: nestedSummary,
+                              replyMessage: reply,
+                              allMessages: allMessages,
+                              channelId: channelId,
+                              currentPubkey: currentPubkey,
+                              isMember: isMember,
+                              isArchived: isArchived,
+                            ),
+                        ],
+                      ),
                     ),
                   ),
                 );
diff --git a/mobile/lib/features/pairing/pairing_page.dart b/mobile/lib/features/pairing/pairing_page.dart
index 9906ed421c..4f70ca184e 100644
--- a/mobile/lib/features/pairing/pairing_page.dart
+++ b/mobile/lib/features/pairing/pairing_page.dart
@@ -95,14 +95,21 @@ class PairingPage extends HookConsumerWidget {
         ? AppBar(
             foregroundColor: _onboardingInk,
             systemOverlayStyle: onboardingSystemOverlayStyle,
+            leadingWidth: Theme.of(context).platform == TargetPlatform.iOS
+                ? Grid.quarter + iosGlassChannelHeaderLeadingWidth
+                : null,
             leading: Theme.of(context).platform == TargetPlatform.iOS
-                ? IosGlassNavigationButton(
-                    key: const ValueKey('pairing-ios-glass-back'),
-                    icon: IosGlassNavigationIcon.back,
-                    semanticLabel: 'Back',
-                    onPressed: () => Navigator.of(context).maybePop(),
-                    width: 56,
-                    foregroundColor: _onboardingInk,
+                ? Padding(
+                    padding: const EdgeInsets.only(left: Grid.quarter),
+                    child: IosGlassNavigationButton(
+                      key: const ValueKey('pairing-ios-glass-back'),
+                      icon: IosGlassNavigationIcon.back,
+                      semanticLabel: 'Back',
+                      onPressed: () => Navigator.of(context).maybePop(),
+                      width: iosGlassChannelHeaderLeadingWidth,
+                      buttonCenterX: iosGlassChannelHeaderButtonCenterX,
+                      foregroundColor: _onboardingInk,
+                    ),
                   )
                 : IconButton(
                     icon: const Icon(LucideIcons.arrowLeft),
diff --git a/mobile/lib/shared/widgets/buzz_action_tile.dart b/mobile/lib/shared/widgets/buzz_action_tile.dart
index 9aae8ad996..24a0946b8c 100644
--- a/mobile/lib/shared/widgets/buzz_action_tile.dart
+++ b/mobile/lib/shared/widgets/buzz_action_tile.dart
@@ -14,14 +14,19 @@ class BuzzActionTile extends StatelessWidget {
     required this.icon,
     required this.label,
     required this.onTap,
+    this.iconWidget,
     this.isEnabled = true,
     this.isLoading = false,
     this.loadingSemanticLabel,
+    this.iconColor,
   });
 
   /// Icon shown when the tile is not loading.
   final IconData? icon;
 
+  /// Optional custom icon widget shown instead of [icon].
+  final Widget? iconWidget;
+
   /// Label shown below the icon.
   final String label;
 
@@ -37,6 +42,9 @@ class BuzzActionTile extends StatelessWidget {
   /// Accessibility label for the loading indicator.
   final String? loadingSemanticLabel;
 
+  /// Optional icon tint used to communicate a selected action state.
+  final Color? iconColor;
+
   @override
   Widget build(BuildContext context) {
     final canTap = isEnabled && !isLoading;
@@ -75,7 +83,12 @@ class BuzzActionTile extends StatelessWidget {
                     semanticLabel: loadingSemanticLabel ?? label,
                   )
                 else
-                  Icon(icon, size: 22, color: context.colors.onSurface),
+                  iconWidget ??
+                      Icon(
+                        icon,
+                        size: 22,
+                        color: iconColor ?? context.colors.onSurface,
+                      ),
                 const SizedBox(height: Grid.xxs),
                 Text(
                   label,
diff --git a/mobile/lib/shared/widgets/frosted_app_bar.dart b/mobile/lib/shared/widgets/frosted_app_bar.dart
index b990faf897..d20b4dcf99 100644
--- a/mobile/lib/shared/widgets/frosted_app_bar.dart
+++ b/mobile/lib/shared/widgets/frosted_app_bar.dart
@@ -171,15 +171,22 @@ class FrostedAppBar extends StatelessWidget {
       titleStyle,
       titleContentHeight,
     );
+    final usesAutomaticIosGlassBackButton =
+        leading == null &&
+        automaticallyImplyLeading &&
+        canPop &&
+        Theme.of(context).platform == TargetPlatform.iOS;
 
     final effectiveLeading =
         leading ??
         (automaticallyImplyLeading && canPop
-            ? Theme.of(context).platform == TargetPlatform.iOS
+            ? usesAutomaticIosGlassBackButton
                   ? IosGlassNavigationButton(
                       icon: IosGlassNavigationIcon.back,
                       semanticLabel: 'Back',
                       onPressed: () => Navigator.of(context).maybePop(),
+                      width: iosGlassChannelHeaderLeadingWidth,
+                      buttonCenterX: iosGlassChannelHeaderButtonCenterX,
                       foregroundColor: iconColor,
                     )
                   : SizedBox(
@@ -208,7 +215,9 @@ class FrostedAppBar extends StatelessWidget {
                   child: Padding(
                     padding: EdgeInsets.only(
                       left: effectiveLeading != null
-                          ? 0
+                          ? usesAutomaticIosGlassBackButton
+                                ? iosGlassChannelHeaderTitleSpacing
+                                : 0
                           : horizontalInset < Grid.gutter
                           ? Grid.gutter - horizontalInset
                           : 0,
diff --git a/mobile/lib/shared/widgets/lucide_star_icon.dart b/mobile/lib/shared/widgets/lucide_star_icon.dart
new file mode 100644
index 0000000000..5d6bf3b20d
--- /dev/null
+++ b/mobile/lib/shared/widgets/lucide_star_icon.dart
@@ -0,0 +1,67 @@
+import 'dart:math' as math;
+
+import 'package:flutter/material.dart';
+
+/// A Lucide-shaped star that can fill without changing its geometry.
+class LucideStarIcon extends StatelessWidget {
+  /// Creates a Lucide star using [color], optionally filled.
+  const LucideStarIcon({
+    super.key,
+    required this.color,
+    this.filled = false,
+    this.size = 22,
+  });
+
+  /// Color of the star's stroke or fill.
+  final Color color;
+
+  /// Whether to paint the star filled instead of outlined.
+  final bool filled;
+
+  /// Width and height of the square icon canvas.
+  final double size;
+
+  @override
+  Widget build(BuildContext context) => CustomPaint(
+    size: Size.square(size),
+    painter: _LucideStarPainter(color: color, filled: filled),
+  );
+}
+
+class _LucideStarPainter extends CustomPainter {
+  const _LucideStarPainter({required this.color, required this.filled});
+
+  final Color color;
+  final bool filled;
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final scale = math.min(size.width, size.height) / 24;
+    final path = Path()
+      ..moveTo(12 * scale, 2 * scale)
+      ..lineTo(15.09 * scale, 8.26 * scale)
+      ..lineTo(22 * scale, 9.27 * scale)
+      ..lineTo(17 * scale, 14.14 * scale)
+      ..lineTo(18.18 * scale, 21.02 * scale)
+      ..lineTo(12 * scale, 17.77 * scale)
+      ..lineTo(5.82 * scale, 21.02 * scale)
+      ..lineTo(7 * scale, 14.14 * scale)
+      ..lineTo(2 * scale, 9.27 * scale)
+      ..lineTo(8.91 * scale, 8.26 * scale)
+      ..close();
+
+    canvas.drawPath(
+      path,
+      Paint()
+        ..color = color
+        ..style = filled ? PaintingStyle.fill : PaintingStyle.stroke
+        ..strokeWidth = 2 * scale
+        ..strokeCap = StrokeCap.round
+        ..strokeJoin = StrokeJoin.round,
+    );
+  }
+
+  @override
+  bool shouldRepaint(_LucideStarPainter oldDelegate) =>
+      color != oldDelegate.color || filled != oldDelegate.filled;
+}
diff --git a/mobile/test/features/channels/channel_detail_page_test.dart b/mobile/test/features/channels/channel_detail_page_test.dart
index 17075ebe17..1c4622772e 100644
--- a/mobile/test/features/channels/channel_detail_page_test.dart
+++ b/mobile/test/features/channels/channel_detail_page_test.dart
@@ -16,6 +16,10 @@ import 'package:buzz/features/channels/channel.dart';
 import 'package:buzz/features/channels/channel_detail_page.dart';
 import 'package:buzz/features/channels/channel_management_provider.dart';
 import 'package:buzz/features/channels/channel_messages_provider.dart';
+import 'package:buzz/features/channels/channel_mutes/channel_mutes_provider.dart';
+import 'package:buzz/features/channels/channel_mutes/channel_mutes_storage.dart';
+import 'package:buzz/features/channels/channel_stars/channel_stars_provider.dart';
+import 'package:buzz/features/channels/channel_stars/channel_stars_storage.dart';
 import 'package:buzz/features/channels/channel_typing_provider.dart';
 import 'package:buzz/features/channels/members_sheet.dart';
 import 'package:buzz/features/channels/composer_dock_size_reporter.dart';
@@ -23,6 +27,7 @@ import 'package:buzz/features/channels/date_formatters.dart';
 import 'package:buzz/features/channels/day_divider.dart';
 import 'package:buzz/features/channels/emoji_picker.dart';
 import 'package:buzz/features/channels/ime_metrics_settle_observer.dart';
+import 'package:buzz/features/channels/local_message_send_animation_provider.dart';
 import 'package:buzz/features/channels/message_action_backdrop_state.dart';
 import 'package:buzz/features/channels/message_actions.dart';
 import 'package:buzz/features/channels/reaction_row.dart';
@@ -46,6 +51,7 @@ import 'package:buzz/shared/widgets/frosted_app_bar.dart';
 import 'package:buzz/shared/widgets/frosted_scaffold.dart';
 import 'package:buzz/shared/widgets/keyboard_dismiss_on_drag.dart';
 import 'package:buzz/shared/widgets/ios_glass_navigation_button.dart';
+import 'package:buzz/shared/widgets/lucide_star_icon.dart';
 import 'package:buzz/shared/widgets/masked_avatar_badge.dart';
 import 'package:buzz/shared/widgets/skeleton.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -229,6 +235,8 @@ Widget _buildTestable({
       ),
       profileProvider.overrideWith(() => _FakeProfileNotifier()),
       channelsProvider.overrideWith(() => fakeChannelsNotifier),
+      channelStarsProvider.overrideWith(_FakeChannelStarsNotifier.new),
+      channelMutesProvider.overrideWith(_FakeChannelMutesNotifier.new),
       channelDetailsProvider(_channelId).overrideWith(
         (ref) async => ChannelDetails.fromChannel(resolvedChannel),
       ),
@@ -1062,7 +1070,7 @@ void main() {
       final starSemantics = tester.getSemantics(
         find.byKey(const ValueKey('channel-details-star-action')),
       );
-      expect(starSemantics.label, 'Star channel');
+      expect(starSemantics.label, 'Star');
       expect(starSemantics.flagsCollection.isButton, isTrue);
       expect(
         starSemantics.flagsCollection.isEnabled.toString(),
@@ -1088,6 +1096,56 @@ void main() {
       );
     });
 
+    testWidgets(
+      'star and mute actions update their visible state immediately',
+      (tester) async {
+        await tester.pumpWidget(_buildTestable(messages: const []));
+        await tester.pumpAndSettle();
+
+        await tester.tap(
+          find.byKey(const ValueKey('channel-header-settings-trigger')),
+        );
+        await tester.pumpAndSettle();
+
+        final starAction = find.byKey(
+          const ValueKey('channel-details-star-action'),
+        );
+        final muteAction = find.byKey(
+          const ValueKey('channel-details-mute-action'),
+        );
+        expect(find.text('Star'), findsOneWidget);
+        var star = tester.widget<LucideStarIcon>(find.byType(LucideStarIcon));
+        expect(star.filled, isFalse);
+        expect(find.text('Mute'), findsOneWidget);
+        expect(find.byIcon(LucideIcons.bellOff), findsOneWidget);
+
+        await tester.tap(starAction);
+        await tester.pump();
+
+        expect(find.text('Unstar'), findsOneWidget);
+        star = tester.widget<LucideStarIcon>(find.byType(LucideStarIcon));
+        expect(star.filled, isTrue);
+        expect(star.color, AppTheme.light().colorScheme.primary);
+
+        await tester.tap(muteAction);
+        await tester.pump();
+
+        expect(find.text('Unmute'), findsOneWidget);
+        final activeBell = tester.widget<Icon>(find.byIcon(LucideIcons.bell));
+        expect(activeBell.color, AppTheme.light().colorScheme.primary);
+
+        await tester.tap(starAction);
+        await tester.tap(muteAction);
+        await tester.pump();
+
+        expect(find.text('Star'), findsOneWidget);
+        expect(find.text('Mute'), findsOneWidget);
+        star = tester.widget<LucideStarIcon>(find.byType(LucideStarIcon));
+        expect(star.filled, isFalse);
+        expect(find.byIcon(LucideIcons.bellOff), findsOneWidget);
+      },
+    );
+
     testWidgets('action tiles grow together for large text on a narrow page', (
       tester,
     ) async {
@@ -1118,8 +1176,8 @@ void main() {
       final editAction = find.byKey(
         const ValueKey('channel-details-edit-action'),
       );
-      expect(find.text('Star channel'), findsOneWidget);
-      expect(find.text('Mute channel'), findsOneWidget);
+      expect(find.text('Star'), findsOneWidget);
+      expect(find.text('Mute'), findsOneWidget);
       expect(find.text('Edit'), findsOneWidget);
       expect(tester.getSize(starAction).height, greaterThan(84));
       expect(
@@ -1651,7 +1709,7 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      expect(find.text('Mute channel'), findsOneWidget);
+      expect(find.text('Mute'), findsOneWidget);
       expect(find.text('Leave channel'), findsNothing);
       expect(find.text('Topic'), findsNothing);
       expect(find.text('Purpose'), findsNothing);
@@ -3466,6 +3524,70 @@ void main() {
       );
     });
 
+    testWidgets(
+      'a same-second local send follows its inserted row when the tail ID stays unchanged',
+      (tester) async {
+        tester.view.physicalSize = const Size(400, 600);
+        tester.view.devicePixelRatio = 1;
+        addTearDown(tester.view.reset);
+
+        final initialMessages = [
+          for (var i = 0; i < 39; i++)
+            _textMsg(
+              id: 'msg$i',
+              pubkey: 'alice',
+              content: 'Message $i',
+              createdAt: 1000 + i,
+            ),
+          _textMsg(
+            id: 'z-final',
+            pubkey: 'alice',
+            content: List.filled(20, 'Tall final message').join('\n'),
+            createdAt: 2000,
+          ),
+        ];
+        final messagesNotifier = _FakeMessagesNotifier(initialMessages);
+
+        await tester.pumpWidget(
+          _buildTestable(
+            messages: const [],
+            messagesNotifier: messagesNotifier,
+            users: const {
+              'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+              'self': UserProfile(pubkey: 'self', displayName: 'Self'),
+            },
+          ),
+        );
+        await tester.pumpAndSettle();
+
+        final messageList = find.byKey(const ValueKey('channel-message-list'));
+        await tester.drag(messageList, const Offset(0, 300));
+        await tester.pumpAndSettle();
+        expect(findRichText('My same-second send'), findsNothing);
+
+        final localSend = _textMsg(
+          id: 'a-local',
+          pubkey: 'self',
+          content: 'My same-second send',
+          createdAt: 2000,
+        );
+        final container = ProviderScope.containerOf(
+          tester.element(find.byType(ChannelDetailPage)),
+        );
+        container
+            .read(localMessageSendAnimationProvider(_channelId).notifier)
+            .mark(localSend.id);
+        messagesNotifier.setMessages([...initialMessages, localSend]);
+        await tester.pumpAndSettle();
+
+        expect(findRichText('My same-second send'), findsOneWidget);
+        expect(
+          find.byKey(const ValueKey('channel-jump-to-latest')),
+          findsNothing,
+        );
+      },
+    );
+
     testWidgets(
       'Latest reveals the channel tail while the Android keyboard stays open',
       (tester) async {
@@ -5197,6 +5319,79 @@ void main() {
   });
 
   group('App bar', () {
+    testWidgets('aligns the Channel Details iOS back control with channels', (
+      tester,
+    ) async {
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      addTearDown(() => debugDefaultTargetPlatformOverride = null);
+
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: const [],
+          home: Builder(
+            builder: (context) => Scaffold(
+              body: TextButton(
+                onPressed: () => Navigator.of(context).push(
+                  MaterialPageRoute<void>(
+                    builder: (_) => ChannelDetailPage(channel: _testChannel),
+                  ),
+                ),
+                child: const Text('Open channel'),
+              ),
+            ),
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.text('Open channel'));
+      await tester.pumpAndSettle();
+
+      final channelBack = find.byKey(const ValueKey('channel-ios-glass-back'));
+      final channelNativeView = tester.widget<UiKitView>(
+        find.descendant(of: channelBack, matching: find.byType(UiKitView)),
+      );
+      final channelParams =
+          channelNativeView.creationParams as Map<String, Object>;
+      final channelButtonCenter =
+          tester.getTopLeft(channelBack).dx +
+          (channelParams['buttonCenterX']! as double);
+
+      await tester.tap(
+        find.byKey(const ValueKey('channel-header-settings-trigger')),
+      );
+      await tester.pumpAndSettle();
+
+      final detailsBack = find.byKey(
+        const ValueKey('channel-details-ios-glass-back'),
+      );
+      final detailsNativeView = tester.widget<UiKitView>(
+        find.descendant(of: detailsBack, matching: find.byType(UiKitView)),
+      );
+      final detailsParams =
+          detailsNativeView.creationParams as Map<String, Object>;
+      final detailsButtonCenter =
+          tester.getTopLeft(detailsBack).dx +
+          (detailsParams['buttonCenterX']! as double);
+      debugDefaultTargetPlatformOverride = null;
+
+      expect(detailsBack, findsOneWidget);
+      expect(
+        detailsParams['buttonCenterX'],
+        iosGlassChannelHeaderButtonCenterX,
+      );
+      expect(
+        detailsParams['hitTargetWidth'],
+        iosGlassChannelHeaderLeadingWidth,
+      );
+      expect(detailsButtonCenter, moreOrLessEquals(channelButtonCenter));
+      expect(
+        tester.getRect(detailsBack).width,
+        iosGlassChannelHeaderLeadingWidth,
+      );
+      expect(tester.takeException(), isNull);
+    });
+
     testWidgets('matches the channel header placement on iOS', (tester) async {
       debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
       addTearDown(() => debugDefaultTargetPlatformOverride = null);
@@ -5566,8 +5761,8 @@ void main() {
       expect(find.text('General discussion'), findsOneWidget);
       expect(find.text('5 members'), findsOneWidget);
       expect(find.text('Preferences'), findsNothing);
-      expect(find.text('Star channel'), findsOneWidget);
-      expect(find.text('Mute channel'), findsOneWidget);
+      expect(find.text('Star'), findsOneWidget);
+      expect(find.text('Mute'), findsOneWidget);
       expect(find.text('Edit'), findsOneWidget);
       expect(find.text('Actions'), findsNothing);
       expect(find.byTooltip('Back'), findsOneWidget);
@@ -9748,6 +9943,54 @@ class _FakeProfileNotifier extends ProfileNotifier {
       const UserProfile(pubkey: 'self', displayName: 'Self');
 }
 
+class _FakeChannelStarsNotifier extends ChannelStarsNotifier {
+  @override
+  ChannelStarsState build() => const ChannelStarsState(isReady: true);
+
+  @override
+  void starChannel(String channelId) => _setStarred(channelId, true);
+
+  @override
+  void unstarChannel(String channelId) => _setStarred(channelId, false);
+
+  void _setStarred(String channelId, bool starred) {
+    state = ChannelStarsState(
+      isReady: true,
+      store: ChannelStarStore(
+        channels: {
+          ...state.store.channels,
+          channelId: ChannelStarEntry(starred: starred, updatedAt: 1),
+        },
+      ),
+      version: state.version + 1,
+    );
+  }
+}
+
+class _FakeChannelMutesNotifier extends ChannelMutesNotifier {
+  @override
+  ChannelMutesState build() => const ChannelMutesState(isReady: true);
+
+  @override
+  void muteChannel(String channelId) => _setMuted(channelId, true);
+
+  @override
+  void unmuteChannel(String channelId) => _setMuted(channelId, false);
+
+  void _setMuted(String channelId, bool muted) {
+    state = ChannelMutesState(
+      isReady: true,
+      store: ChannelMuteStore(
+        channels: {
+          ...state.store.channels,
+          channelId: ChannelMuteEntry(muted: muted, updatedAt: 1),
+        },
+      ),
+      version: state.version + 1,
+    );
+  }
+}
+
 class _FakeUserCacheNotifier extends UserCacheNotifier {
   final Map<String, UserProfile> _users;
   _FakeUserCacheNotifier(this._users);
diff --git a/mobile/test/features/channels/channel_preferences_manager_test.dart b/mobile/test/features/channels/channel_preferences_manager_test.dart
new file mode 100644
index 0000000000..776221ae31
--- /dev/null
+++ b/mobile/test/features/channels/channel_preferences_manager_test.dart
@@ -0,0 +1,57 @@
+import 'package:buzz/features/channels/channel_mutes/channel_mutes_manager.dart';
+import 'package:buzz/features/channels/channel_stars/channel_stars_manager.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:nostr/nostr.dart' as nostr;
+import 'package:shared_preferences/shared_preferences.dart';
+
+void main() {
+  setUp(() => SharedPreferences.setMockInitialValues({}));
+
+  test('local star changes notify listeners immediately', () async {
+    final prefs = await SharedPreferences.getInstance();
+    final keys = nostr.Keys.generate();
+    var changes = 0;
+    final manager = ChannelStarsManager(
+      pubkey: keys.public,
+      prefs: prefs,
+      crypto: ChannelStarsCrypto(keys.nsec, keys.public),
+      relaySession: null,
+      signedEventRelay: null,
+      remoteEnabled: false,
+      onChanged: () => changes += 1,
+    );
+    addTearDown(manager.dispose);
+
+    manager.starChannel('general');
+    expect(manager.store.channels['general']?.starred, isTrue);
+    expect(changes, 1);
+
+    manager.unstarChannel('general');
+    expect(manager.store.channels['general']?.starred, isFalse);
+    expect(changes, 2);
+  });
+
+  test('local mute changes notify listeners immediately', () async {
+    final prefs = await SharedPreferences.getInstance();
+    final keys = nostr.Keys.generate();
+    var changes = 0;
+    final manager = ChannelMutesManager(
+      pubkey: keys.public,
+      prefs: prefs,
+      crypto: ChannelMutesCrypto(keys.nsec, keys.public),
+      relaySession: null,
+      signedEventRelay: null,
+      remoteEnabled: false,
+      onChanged: () => changes += 1,
+    );
+    addTearDown(manager.dispose);
+
+    manager.muteChannel('general');
+    expect(manager.store.channels['general']?.muted, isTrue);
+    expect(changes, 1);
+
+    manager.unmuteChannel('general');
+    expect(manager.store.channels['general']?.muted, isFalse);
+    expect(changes, 2);
+  });
+}
diff --git a/mobile/test/features/channels/compose_bar_test.dart b/mobile/test/features/channels/compose_bar_test.dart
index 775c9f4f71..d1e2e63384 100644
--- a/mobile/test/features/channels/compose_bar_test.dart
+++ b/mobile/test/features/channels/compose_bar_test.dart
@@ -378,6 +378,10 @@ class _RecordingRelaySocket extends RelaySocket {
   final List<Map<String, dynamic>> events;
   final void Function(List<dynamic> message) handleMessage;
 
+  /// Invoked after an event is handed to the socket but before its relay
+  /// acknowledgement is delivered. Tests may defer that acknowledgement.
+  final Future<void> Function(Map<String, dynamic> event)? beforeAcknowledged;
+
   /// Invoked after an event has been recorded and acknowledged, before the
   /// caller's `await` resumes. Lets a test interleave state changes (such as
   /// a community switch) between two relay round trips.
@@ -386,6 +390,7 @@ class _RecordingRelaySocket extends RelaySocket {
   _RecordingRelaySocket(
     this.events,
     this.handleMessage, {
+    this.beforeAcknowledged,
     this.onEventAcknowledged,
   }) : super(
          wsUrl: 'ws://localhost',
@@ -403,8 +408,18 @@ class _RecordingRelaySocket extends RelaySocket {
     if (payload case ['EVENT', final Map<String, dynamic> event]) {
       events.add(event);
       final id = event['id'] as String;
-      super.debugHandleOkForTest(['OK', id, true, '']);
-      onEventAcknowledged?.call(event);
+      final pending = beforeAcknowledged?.call(event);
+      if (pending == null) {
+        super.debugHandleOkForTest(['OK', id, true, '']);
+        onEventAcknowledged?.call(event);
+      } else {
+        unawaited(
+          pending.then((_) {
+            super.debugHandleOkForTest(['OK', id, true, '']);
+            onEventAcknowledged?.call(event);
+          }),
+        );
+      }
     }
   }
 
@@ -913,6 +928,124 @@ void main() {
       expect(sentContent, 'First line\nSecond line');
     });
 
+    testWidgets('clears text before the optimistic send completes', (
+      tester,
+    ) async {
+      final delivery = Completer<void>();
+      await tester.pumpWidget(
+        _buildComposeBar(
+          uploadService: _testUploadService(nostr.Keys.generate().nsec),
+          onSend:
+              (content, mentionPubkeys, {mediaTags = const <List<String>>[]}) =>
+                  delivery.future,
+        ),
+      );
+
+      await _expandComposer(tester);
+      await tester.enterText(find.byType(TextField), 'hello');
+      await tester.pumpAndSettle();
+      await tester.tap(find.byIcon(LucideIcons.arrowUp));
+      for (var i = 0; i < 20; i++) {
+        await tester.pump(const Duration(milliseconds: 20));
+        if (tester
+            .widget<TextField>(find.byType(TextField))
+            .controller!
+            .text
+            .isEmpty) {
+          break;
+        }
+      }
+
+      expect(
+        tester.widget<TextField>(find.byType(TextField)).controller!.text,
+        '',
+      );
+
+      delivery.complete();
+      await tester.pumpAndSettle();
+    });
+
+    testWidgets('a failed send restores an untouched cleared draft', (
+      tester,
+    ) async {
+      final delivery = Completer<void>();
+      await tester.pumpWidget(
+        _buildComposeBar(
+          uploadService: _testUploadService(nostr.Keys.generate().nsec),
+          onSend:
+              (content, mentionPubkeys, {mediaTags = const <List<String>>[]}) =>
+                  delivery.future,
+        ),
+      );
+
+      await _expandComposer(tester);
+      await tester.enterText(find.byType(TextField), 'retry me');
+      await tester.pumpAndSettle();
+      await tester.tap(find.byIcon(LucideIcons.arrowUp));
+      for (var i = 0; i < 20; i++) {
+        await tester.pump(const Duration(milliseconds: 20));
+        if (tester
+            .widget<TextField>(find.byType(TextField))
+            .controller!
+            .text
+            .isEmpty) {
+          break;
+        }
+      }
+      expect(
+        tester.widget<TextField>(find.byType(TextField)).controller!.text,
+        '',
+      );
+
+      delivery.completeError(Exception('relay rejected'));
+      await tester.pumpAndSettle();
+
+      expect(
+        tester.widget<TextField>(find.byType(TextField)).controller!.text,
+        'retry me',
+      );
+    });
+
+    testWidgets('a failed send does not overwrite a new draft', (tester) async {
+      final delivery = Completer<void>();
+      await tester.pumpWidget(
+        _buildComposeBar(
+          uploadService: _testUploadService(nostr.Keys.generate().nsec),
+          onSend:
+              (content, mentionPubkeys, {mediaTags = const <List<String>>[]}) =>
+                  delivery.future,
+        ),
+      );
+
+      await _expandComposer(tester);
+      await tester.enterText(find.byType(TextField), 'first draft');
+      await tester.pumpAndSettle();
+      await tester.tap(find.byIcon(LucideIcons.arrowUp));
+      for (var i = 0; i < 20; i++) {
+        await tester.pump(const Duration(milliseconds: 20));
+        if (tester
+            .widget<TextField>(find.byType(TextField))
+            .controller!
+            .text
+            .isEmpty) {
+          break;
+        }
+      }
+      expect(
+        tester.widget<TextField>(find.byType(TextField)).controller!.text,
+        '',
+      );
+
+      await tester.enterText(find.byType(TextField), 'new draft');
+      delivery.completeError(StateError('relay rejected'));
+      await tester.pumpAndSettle();
+
+      expect(
+        tester.widget<TextField>(find.byType(TextField)).controller!.text,
+        'new draft',
+      );
+    });
+
     testWidgets('smoothly resizes the text field when a new line is added', (
       tester,
     ) async {
@@ -3734,6 +3867,78 @@ void main() {
       ]);
     });
 
+    testWidgets('preserves edits made while a mentioned agent is being added', (
+      tester,
+    ) async {
+      final agentPubkey = 'c' * 64;
+      final signer = nostr.Keys.generate();
+      final publishedEvents = <Map<String, dynamic>>[];
+      final addMemberAcknowledgement = Completer<void>();
+      String? sentContent;
+
+      await tester.pumpWidget(
+        _buildComposeBar(
+          uploadService: _testUploadService(signer.nsec),
+          currentPubkey: signer.public,
+          relayAgents: [
+            AgentDirectoryEntry(
+              pubkey: agentPubkey,
+              displayName: 'Helper Bot',
+              respondTo: 'anyone',
+              channelIds: const ['shared-channel'],
+            ),
+          ],
+          channels: [_makeCurrentChannel(), _makeSharedMemberChannel()],
+          onSend:
+              (
+                content,
+                mentionPubkeys, {
+                mediaTags = const <List<String>>[],
+              }) async {
+                sentContent = content;
+              },
+        ),
+      );
+
+      final container = ProviderScope.containerOf(
+        tester.element(find.byType(ComposeBar)),
+      );
+      final session = container.read(relaySessionProvider.notifier);
+      session.debugAttachSocketForTest(
+        _RecordingRelaySocket(
+          publishedEvents,
+          session.debugHandleSocketMessageForTest,
+          beforeAcknowledged: (event) async {
+            if (event['kind'] == 9000) await addMemberAcknowledgement.future;
+          },
+        ),
+      );
+
+      await _expandComposer(tester);
+      await tester.enterText(find.byType(TextField), '@hel');
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Helper Bot'));
+      await tester.pumpAndSettle();
+      await tester.enterText(find.byType(TextField), 'hello @Helper Bot');
+      await tester.tap(find.byIcon(LucideIcons.arrowUp));
+      await tester.pump();
+
+      expect(
+        publishedEvents.where((event) => event['kind'] == 9000),
+        hasLength(1),
+      );
+
+      await tester.enterText(find.byType(TextField), 'newer draft');
+      addMemberAcknowledgement.complete();
+      await tester.pumpAndSettle();
+
+      expect(sentContent, 'hello @Helper Bot');
+      expect(
+        tester.widget<TextField>(find.byType(TextField)).controller!.text,
+        'newer draft',
+      );
+    });
+
     testWidgets(
       'renders chips only for selected agents outside code and composition',
       (tester) async {
diff --git a/mobile/test/features/channels/local_message_send_transition_test.dart b/mobile/test/features/channels/local_message_send_transition_test.dart
new file mode 100644
index 0000000000..574c12fc51
--- /dev/null
+++ b/mobile/test/features/channels/local_message_send_transition_test.dart
@@ -0,0 +1,107 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:buzz/features/channels/local_message_send_animation_provider.dart';
+import 'package:buzz/features/channels/local_message_send_transition.dart';
+
+Widget _testable({
+  bool animate = true,
+  bool reduceMotion = false,
+  double startOffsetFactor = localMessageSendTransitionStartOffset,
+}) => MaterialApp(
+  home: MediaQuery(
+    data: MediaQueryData(disableAnimations: reduceMotion),
+    child: Scaffold(
+      body: LocalMessageSendTransition(
+        animate: animate,
+        startOffsetFactor: startOffsetFactor,
+        child: const SizedBox(key: ValueKey('message'), width: 100, height: 40),
+      ),
+    ),
+  ),
+);
+
+void main() {
+  Finder sendTranslation() => find.descendant(
+    of: find.byType(LocalMessageSendTransition),
+    matching: find.byType(FractionalTranslation),
+  );
+
+  test('local send claims expire before a later navigation', () {
+    final markedAt = DateTime(2026);
+    final animations = {'event': markedAt};
+
+    expect(
+      isRecentLocalMessageSendAnimation(
+        animations,
+        'event',
+        now: markedAt.add(const Duration(milliseconds: 999)),
+      ),
+      isTrue,
+    );
+    expect(
+      isRecentLocalMessageSendAnimation(
+        animations,
+        'event',
+        now: markedAt.add(const Duration(seconds: 2)),
+      ),
+      isFalse,
+    );
+  });
+
+  testWidgets('local send rises from behind the composer', (tester) async {
+    await tester.pumpWidget(_testable());
+
+    var transition = tester.widget<FractionalTranslation>(sendTranslation());
+    expect(
+      transition.translation,
+      const Offset(0, localMessageSendTransitionStartOffset),
+    );
+    expect(
+      find.descendant(
+        of: find.byType(LocalMessageSendTransition),
+        matching: find.byType(FadeTransition),
+      ),
+      findsNothing,
+    );
+
+    await tester.pump(localMessageSendTransitionDuration ~/ 2);
+    transition = tester.widget<FractionalTranslation>(sendTranslation());
+    expect(transition.translation.dy, greaterThan(0));
+    expect(
+      transition.translation.dy,
+      lessThan(localMessageSendTransitionStartOffset),
+    );
+
+    await tester.pump(localMessageSendTransitionDuration);
+    transition = tester.widget<FractionalTranslation>(sendTranslation());
+    expect(transition.translation, Offset.zero);
+  });
+
+  testWidgets('an avatar row starts deeper behind the composer', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      _testable(startOffsetFactor: localMessageSendTransitionAvatarStartOffset),
+    );
+
+    final transition = tester.widget<FractionalTranslation>(sendTranslation());
+    expect(
+      transition.translation,
+      const Offset(0, localMessageSendTransitionAvatarStartOffset),
+    );
+  });
+
+  testWidgets('ordinary messages do not animate', (tester) async {
+    await tester.pumpWidget(_testable(animate: false));
+
+    final transition = tester.widget<FractionalTranslation>(sendTranslation());
+    expect(transition.translation, Offset.zero);
+  });
+
+  testWidgets('reduced motion skips the send translation', (tester) async {
+    await tester.pumpWidget(_testable(reduceMotion: true));
+
+    final transition = tester.widget<FractionalTranslation>(sendTranslation());
+    expect(transition.translation, Offset.zero);
+  });
+}
diff --git a/mobile/test/features/channels/send_message_provider_test.dart b/mobile/test/features/channels/send_message_provider_test.dart
index 2361360d5c..5766fab255 100644
--- a/mobile/test/features/channels/send_message_provider_test.dart
+++ b/mobile/test/features/channels/send_message_provider_test.dart
@@ -16,6 +16,7 @@ void main() {
       final localMessages = <NostrEvent>[];
       final removedIds = <String>[];
       final completedIds = <String>[];
+      final animatedIds = <String>[];
       final send = SendMessage(
         signedEventRelay: SignedEventRelay(
           session: session,
@@ -24,6 +25,7 @@ void main() {
         fetchMembers: (_) async => const [],
         readUserCache: () => const {},
         addLocalMessage: (_, event) => localMessages.add(event),
+        markLocalMessageForAnimation: (_, eventId) => animatedIds.add(eventId),
         completeLocalMessage: (_, eventId) => completedIds.add(eventId),
         removeLocalMessage: (_, eventId) => removedIds.add(eventId),
       );
@@ -35,6 +37,7 @@ void main() {
       expect(localMessages.single.id, session.event.id);
       expect(localMessages.single.content, 'hello');
       expect(localMessages.single.channelId, _channelId);
+      expect(animatedIds, [localMessages.single.id]);
       expect(removedIds, isEmpty);
 
       session.accept();
diff --git a/mobile/test/features/pairing/pairing_page_test.dart b/mobile/test/features/pairing/pairing_page_test.dart
index 54d7ac52c8..cdcda87f51 100644
--- a/mobile/test/features/pairing/pairing_page_test.dart
+++ b/mobile/test/features/pairing/pairing_page_test.dart
@@ -11,6 +11,7 @@ import 'package:buzz/shared/community/community.dart';
 import 'package:buzz/shared/security/sensitive_action_authorizer.dart';
 import 'package:buzz/shared/theme/theme.dart';
 import 'package:buzz/shared/widgets/buzz_loading_indicator.dart';
+import 'package:buzz/shared/widgets/ios_glass_navigation_button.dart';
 import 'package:buzz/shared/widgets/tappable_flapping_bee.dart';
 
 import '../../helpers/widget_helpers.dart';
@@ -150,6 +151,21 @@ void main() {
       final nativeBack = tester.widget<UiKitView>(find.byType(UiKitView));
       expect(nativeBack.viewType, 'buzz/navigation_glass');
       expect(nativeBack.creationParams, containsPair('icon', 'back'));
+      expect(
+        nativeBack.creationParams,
+        containsPair('buttonCenterX', iosGlassChannelHeaderButtonCenterX),
+      );
+      expect(
+        nativeBack.creationParams,
+        containsPair('hitTargetWidth', iosGlassChannelHeaderLeadingWidth),
+      );
+      final backRect = tester.getRect(
+        find.byKey(const ValueKey('pairing-ios-glass-back')),
+      );
+      expect(
+        backRect.left + iosGlassChannelHeaderButtonCenterX,
+        Grid.quarter + iosGlassChannelHeaderButtonCenterX,
+      );
       expect(find.byTooltip('Back'), findsOneWidget);
       debugDefaultTargetPlatformOverride = null;
     });
diff --git a/mobile/test/shared/widgets/frosted_app_bar_test.dart b/mobile/test/shared/widgets/frosted_app_bar_test.dart
index 37040ce9fb..8f1f40a8b1 100644
--- a/mobile/test/shared/widgets/frosted_app_bar_test.dart
+++ b/mobile/test/shared/widgets/frosted_app_bar_test.dart
@@ -99,7 +99,14 @@ void main() {
             onPressed: () => Navigator.of(context).push(
               MaterialPageRoute<void>(
                 builder: (_) => const Stack(
-                  children: [FrostedAppBar(title: Text('Destination'))],
+                  children: [
+                    FrostedAppBar(
+                      title: Text(
+                        'Destination',
+                        key: ValueKey('destination-title'),
+                      ),
+                    ),
+                  ],
                 ),
               ),
             ),
@@ -119,8 +126,20 @@ void main() {
       nativeBack.creationParams,
       containsPair('accessibilityLabel', 'Back'),
     );
-    expect(nativeBack.creationParams, containsPair('hitTargetWidth', 48.0));
+    expect(
+      nativeBack.creationParams,
+      containsPair('buttonCenterX', iosGlassChannelHeaderButtonCenterX),
+    );
+    expect(
+      nativeBack.creationParams,
+      containsPair('hitTargetWidth', iosGlassChannelHeaderLeadingWidth),
+    );
     expect(nativeBack.creationParams, containsPair('hitTargetHeight', 48.0));
+    final backRect = tester.getRect(find.byType(IosGlassNavigationButton));
+    final titleRect = tester.getRect(
+      find.byKey(const ValueKey('destination-title')),
+    );
+    expect(titleRect.left - backRect.right, iosGlassChannelHeaderTitleSpacing);
     expect(find.byTooltip('Back'), findsOneWidget);
     expect(
       tester.widget<Tooltip>(find.byTooltip('Back')).excludeFromSemantics,

From 025425591ed67518a63870316f1473ffd02dd520 Mon Sep 17 00:00:00 2001
From: Salman Mohammed <smohammed@squareup.com>
Date: Fri, 21 Aug 2026 16:09:14 -0400
Subject: [PATCH 21/38] fix(benchmarks): wait for scripted event delivery
 (#6487)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Why

The Buzz-native runtime could stop a solo agent after one turn even when
a scripted follow-up event was queued or already running. That could
turn a harness timing race into a benchmark failure.

Follow-up to #6448.

## What

- Treat solo tasks with scripted events separately from ordinary
one-turn tasks.
- Wait until turn counts and authored message IDs remain idle and
unchanged for several polls before stopping the agent.
- Remove the message-count shortcut that could stop an active turn.
- Add focused regressions for a delayed follow-up turn and an
already-running turn with a `DONE:` message.

## Testing

- `pytest -q tests/test_container_runtime.py -k "solo_turn_end or
scripted_events"` — 3 passed
- `ruff check` on the three touched Python files
- `ruff format --check` on the three touched Python files
- Local `buzz-native-solo-luna.yaml` Harbor run, one attempt per
affected task:
- `cross-thread-requests` — reward 1.0; all 6 task-specific checks
passed
- `interleaved-agent-reports` — reward 1.0; all 7 task-specific checks
passed
  - 2 completed trials, 0 exceptions, 56 seconds total

## Risk

Low. This only changes completion detection for solo benchmark tasks
with scripted events. Ordinary solo tasks retain immediate completion
after their first turn ends.

---
**Update Aug 21, 13:07 EDT:** Replaced the fixed settle delay with exact
delivery receipts after [review
feedback](https://github.com/block/buzz/pull/6487#discussion_r3832050452).

- ACP now records the event IDs delivered by each completed turn; the
runtime also recognizes existing successful-steer receipts.
- Scripted trials stop only after every expected event ID is
acknowledged and no turn is active. Missing receipts wait for the trial
budget instead of producing partial evidence.
- TDD regression delayed delivery beyond the old five-poll boundary and
failed before the implementation; the receipt parser and Rust receipt
format are pinned independently.
- Focused verification: 31 container-runtime tests passed, 6 ACP
delivery tests passed, plus Ruff, rustfmt, and Clippy.
- Receipt-gated Luna run: 2 completed trials and 0 exceptions.
`interleaved-agent-reports` scored 1.0. `cross-thread-requests`
completed both calculations and thread isolation but Luna omitted the
user mention on ALPHA, so that model-output dimension scored 0.
- Risk remains low: the ACP production change adds delivery receipt
logging and restores a missing turn-end log on a
completed-before-control race; it does not change queue dispatch
behavior.

Generated with Codex

---------

Signed-off-by: Salman Mohammed <smohammed@squareup.com>
---
 .../container_runtime.py                      |  72 +++++++----
 .../harbor_buzz_orchestra/task_fixtures.py    |   2 -
 .../tests/test_container_runtime.py           | 113 +++++++++++++++---
 crates/buzz-acp/src/pool.rs                   |  49 +++++++-
 4 files changed, 196 insertions(+), 40 deletions(-)

diff --git a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/container_runtime.py b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/container_runtime.py
index e4415755de..797e3a860c 100644
--- a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/container_runtime.py
+++ b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/container_runtime.py
@@ -13,6 +13,7 @@ from __future__ import annotations
 import asyncio
 import json
 import os
+import re
 import shlex
 import traceback
 from dataclasses import dataclass, field
@@ -49,8 +50,10 @@ FORWARDER = f"{REMOTE_BIN}/relay-forwarder"
 FORWARDER_LOG = f"{REMOTE_LOGS}/relay-forwarder.log"
 # How many done-poll iterations between in-container liveness probes.
 LIVENESS_EVERY = 10
-SCRIPTED_EVENT_IDLE_POLLS = 5
 TRANSCRIPT_LIMIT = 1000
+DELIVERY_RECEIPT_MARKER = "turn delivered Buzz events for channel"
+EVENT_ID_PATTERN = re.compile(r"(?<![0-9a-f])[0-9a-f]{64}(?![0-9a-f])")
+ANSI_ESCAPE_PATTERN = re.compile(r"\x1b\[[0-9;]*m")
 TURN_ENDED_MARKERS = (
     "turn complete for",
     "turn cancelled for",
@@ -206,9 +209,9 @@ class BuzzContainerRuntime:
                     trial,
                     agents + infra,
                     solo=agents[0] if len(agents) == 1 else None,
-                    minimum_agent_messages=fixture_for(
-                        trial.task_name
-                    ).minimum_agent_messages,
+                    scripted_event_ids={
+                        str(event["event_id"]) for event in scripted_events
+                    },
                 ),
                 timeout=manifest.trial_budget.timeout_seconds,
             )
@@ -506,16 +509,15 @@ class BuzzContainerRuntime:
         trial: TrialHandle,
         agents: list[_Agent],
         solo: _Agent | None = None,
-        minimum_agent_messages: int = 0,
+        scripted_event_ids: set[str] | frozenset[str] = frozenset(),
     ) -> dict[str, Any] | None:
-        """Observe until a team posts DONE or a solo agent finishes its one turn.
+        """Observe until a team posts DONE or a solo agent finishes its work.
 
         Observation only: the harness never speaks as any agent. If the team
         stalls, the trial times out and the stall is the measured result. A solo
-        agent cannot be woken by a teammate, so its logged turn end is final.
+        task without scripted events finishes at its first logged turn end.
         """
         polls = 0
-        idle_terminal_polls = 0
         while True:
             if polls % LIVENESS_EVERY == 0:
                 await self._raise_for_dead_agents(environment, agents)
@@ -531,25 +533,29 @@ class BuzzContainerRuntime:
                 "100",
             )
             for message in messages:
-                if message.get("pubkey") == orchestrator.nostr_pubkey and str(
-                    message.get("content", "")
-                ).startswith("DONE:"):
+                if (
+                    message.get("pubkey") == orchestrator.nostr_pubkey
+                    and str(message.get("content", "")).startswith("DONE:")
+                    and (solo is None or not scripted_event_ids)
+                ):
                     return message
             if solo is not None:
-                starts, ends = await self._turn_counts(environment, solo)
+                starts, ends, delivered_event_ids = await self._turn_status(
+                    environment, solo
+                )
                 authored = [
                     message
                     for message in messages
                     if message.get("pubkey") == orchestrator.nostr_pubkey
                 ]
-                if ends > 0 and len(authored) >= minimum_agent_messages:
+                if not scripted_event_ids and ends > 0:
+                    return authored[-1] if authored else None
+                if (
+                    starts > 0
+                    and starts == ends
+                    and scripted_event_ids <= delivered_event_ids
+                ):
                     return authored[-1] if authored else None
-                if starts > 0 and starts == ends:
-                    idle_terminal_polls += 1
-                    if idle_terminal_polls >= SCRIPTED_EVENT_IDLE_POLLS:
-                        return authored[-1] if authored else None
-                else:
-                    idle_terminal_polls = 0
             await asyncio.sleep(self.poll_seconds)
 
     @staticmethod
@@ -561,14 +567,36 @@ class BuzzContainerRuntime:
     async def _turn_counts(
         environment: BaseEnvironment, agent: _Agent
     ) -> tuple[int, int]:
+        starts, ends, _ = await BuzzContainerRuntime._turn_status(environment, agent)
+        return starts, ends
+
+    @staticmethod
+    async def _turn_status(
+        environment: BaseEnvironment, agent: _Agent
+    ) -> tuple[int, int, set[str]]:
         result = await environment.exec(
             f"cat {shlex.quote(agent.stdout_log)} "
             f"{shlex.quote(agent.stderr_log)} 2>/dev/null"
         )
-        output = result.stdout or ""
+        return BuzzContainerRuntime._parse_turn_status(result.stdout or "")
+
+    @staticmethod
+    def _parse_turn_status(output: str) -> tuple[int, int, set[str]]:
+        output = ANSI_ESCAPE_PATTERN.sub("", output)
+        delivered_event_ids: set[str] = set()
+        for line in output.splitlines():
+            if DELIVERY_RECEIPT_MARKER in line:
+                delivered_event_ids.update(EVENT_ID_PATTERN.findall(line))
+            elif (
+                "non-cancelling steer ack received" in line and "ack=Ok(Success" in line
+            ):
+                match = re.search(r"event_id=([0-9a-f]{64})", line)
+                if match is not None:
+                    delivered_event_ids.add(match.group(1))
         return (
             output.count("turn starting for"),
             sum(output.count(marker) for marker in TURN_ENDED_MARKERS),
+            delivered_event_ids,
         )
 
     async def _raise_for_dead_agents(
@@ -824,6 +852,10 @@ class BuzzContainerRuntime:
                 and isinstance(response.get("event_id"), str)
                 else None
             )
+            if event_id is None:
+                raise RuntimeLaunchError(
+                    f"scripted event {message.label!r} did not return an event ID"
+                )
             recorded.append(
                 {
                     "label": message.label,
diff --git a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/task_fixtures.py b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/task_fixtures.py
index da94871bea..451b97f9c1 100644
--- a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/task_fixtures.py
+++ b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/task_fixtures.py
@@ -38,7 +38,6 @@ class BuzzTaskFixture:
 
     directory: tuple[DirectoryEntry, ...] = ()
     scripted_messages: tuple[ScriptedMessage, ...] = ()
-    minimum_agent_messages: int = 0
     observe_channel_names: tuple[str, ...] = ()
     user_display_name: str | None = None
     # Whether the task's verifier grades the exported relay snapshot. Only
@@ -137,7 +136,6 @@ _CROSS_THREAD_REQUESTS_FIXTURE = BuzzTaskFixture(
             ),
         ),
     ),
-    minimum_agent_messages=2,
     user_display_name="Priya Simone Patel",
     requires_evidence=True,
 )
diff --git a/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py b/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
index 53bf268499..182db9893f 100644
--- a/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
+++ b/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
@@ -502,6 +502,25 @@ async def test_sends_task_declared_actor_messages_and_records_event_ids(
     assert all(call[3]["reply_to"] == "task-root" for call in calls)
 
 
+async def test_scripted_message_requires_an_event_id(tmp_path, monkeypatch):
+    rt = runtime(tmp_path)
+    orch = credential("solo-1", "orchestrator", "orch-model")
+    trial = replace(
+        trial_handle((orch,)),
+        task_name="cross-thread-requests",
+    )
+
+    async def send(*args, **kwargs):
+        return {}
+
+    monkeypatch.setattr(rt, "_send", send)
+
+    with pytest.raises(RuntimeLaunchError, match="did not return an event ID"):
+        await rt._send_scripted_messages(
+            trial=trial, orchestrator=orch, task_event_id="task-root"
+        )
+
+
 async def test_wait_for_done_requires_orchestrator_authorship(tmp_path, monkeypatch):
     rt = runtime(tmp_path, poll_seconds=0)
     orch = credential("orch-1", "orchestrator", "orch-model")
@@ -549,33 +568,32 @@ async def test_solo_turn_end_completes_without_done_message(tmp_path, monkeypatc
     assert await rt._wait_for_done(environment, orch, trial, [], solo=solo) is None
 
 
-async def test_scripted_events_wait_for_second_agent_message(tmp_path, monkeypatch):
+async def test_scripted_events_wait_for_delivery_receipt(tmp_path, monkeypatch):
     from harbor_buzz_orchestra.container_runtime import _Agent
 
     rt = runtime(tmp_path, poll_seconds=0)
     orch = credential("orch-1", "orchestrator", "orch-model")
     trial = trial_handle((orch,))
     solo = _Agent(orch, 7, "stdout.log", "stderr.log")
-    message_rounds = iter(
-        [
-            [{"id": "alpha", "pubkey": orch.nostr_pubkey, "content": "ALPHA"}],
-            [{"id": "alpha", "pubkey": orch.nostr_pubkey, "content": "ALPHA"}],
-            [
-                {"id": "alpha", "pubkey": orch.nostr_pubkey, "content": "ALPHA"},
-                {"id": "beta", "pubkey": orch.nostr_pubkey, "content": "BETA"},
-            ],
-        ]
+    alpha = {"id": "alpha", "pubkey": orch.nostr_pubkey, "content": "ALPHA"}
+    beta = {"id": "beta", "pubkey": orch.nostr_pubkey, "content": "BETA"}
+    scripted_event_id = "b" * 64
+    message_rounds = iter([[alpha]] * 8 + [[alpha, beta]] * 2)
+    turn_rounds = iter(
+        [(1, 1, set())] * 8 + [(2, 1, set()), (2, 2, {scripted_event_id})]
     )
-    turn_rounds = iter([(1, 1), (2, 1), (2, 2)])
+    polls = 0
 
     async def buzz_json(*args, **kwargs):
+        nonlocal polls
+        polls += 1
         return next(message_rounds)
 
-    async def turn_counts(*args, **kwargs):
+    async def turn_status(*args, **kwargs):
         return next(turn_rounds)
 
     monkeypatch.setattr(rt, "_buzz_json", buzz_json)
-    monkeypatch.setattr(rt, "_turn_counts", turn_counts)
+    monkeypatch.setattr(rt, "_turn_status", turn_status)
 
     result = await rt._wait_for_done(
         Environment(),
@@ -583,10 +601,77 @@ async def test_scripted_events_wait_for_second_agent_message(tmp_path, monkeypat
         trial,
         [],
         solo=solo,
-        minimum_agent_messages=2,
+        scripted_event_ids={scripted_event_id},
     )
 
     assert result["id"] == "beta"
+    assert polls == 10
+
+
+async def test_scripted_events_do_not_stop_an_active_turn(tmp_path, monkeypatch):
+    from harbor_buzz_orchestra.container_runtime import _Agent
+
+    rt = runtime(tmp_path, poll_seconds=0)
+    orch = credential("orch-1", "orchestrator", "orch-model")
+    trial = trial_handle((orch,))
+    solo = _Agent(orch, 7, "stdout.log", "stderr.log")
+    messages = [
+        {"id": "alpha", "pubkey": orch.nostr_pubkey, "content": "ALPHA"},
+        {"id": "beta", "pubkey": orch.nostr_pubkey, "content": "DONE: BETA"},
+    ]
+    scripted_event_id = "b" * 64
+    turn_rounds = iter([(2, 1, {scripted_event_id}), (2, 2, {scripted_event_id})])
+    polls = 0
+
+    async def buzz_json(*args, **kwargs):
+        nonlocal polls
+        polls += 1
+        return messages
+
+    async def turn_status(*args, **kwargs):
+        return next(turn_rounds)
+
+    monkeypatch.setattr(rt, "_buzz_json", buzz_json)
+    monkeypatch.setattr(rt, "_turn_status", turn_status)
+
+    result = await rt._wait_for_done(
+        Environment(),
+        orch,
+        trial,
+        [],
+        solo=solo,
+        scripted_event_ids={scripted_event_id},
+    )
+
+    assert result["id"] == "beta"
+    assert polls == 2
+
+
+def test_turn_status_parses_completed_batch_and_successful_steer_receipts():
+    batch_event_id = "a" * 64
+    steer_event_id = "b" * 64
+    rejected_event_id = "c" * 64
+    output = "\n".join(
+        [
+            "turn starting for channel test",
+            f"turn delivered Buzz events for channel test: {batch_event_id}",
+            "turn complete for channel test: end_turn",
+            (
+                "non-cancelling steer ack received "
+                f"event_id={steer_event_id} ack=Ok(Success {{ session_id: session }})"
+            ),
+            (
+                "non-cancelling steer ack received "
+                f"event_id={rejected_event_id} ack=Ok(Err(OutcomeRejected))"
+            ),
+        ]
+    )
+
+    assert BuzzContainerRuntime._parse_turn_status(output) == (
+        1,
+        1,
+        {batch_event_id, steer_event_id},
+    )
 
 
 async def test_collect_evidence_uploads_verifier_artifact(tmp_path, monkeypatch):
diff --git a/crates/buzz-acp/src/pool.rs b/crates/buzz-acp/src/pool.rs
index 2c173646ba..f3916b5fda 100644
--- a/crates/buzz-acp/src/pool.rs
+++ b/crates/buzz-acp/src/pool.rs
@@ -2619,12 +2619,14 @@ pub async fn run_prompt_task(
                                 "control signal arrived but turn already completed — treating as success"
                             );
                         }
+                        log_stop_reason(&source, &StopReason::EndTurn);
                         if let PromptSource::Channel(cid) = &source {
                             let standing_sent = !agent.has_system_prompt_support();
-                            agent.state.mark_channel_delivery_success(
+                            record_channel_delivery_success(
+                                &mut agent,
                                 *cid,
                                 standing_sent,
-                                pending_delivered_event_ids.iter().cloned(),
+                                &pending_delivered_event_ids,
                             );
                         }
                         apply_completed_before_control_signal(
@@ -2663,10 +2665,11 @@ pub async fn run_prompt_task(
 
             if let PromptSource::Channel(cid) = &source {
                 let standing_sent = !agent.has_system_prompt_support();
-                agent.state.mark_channel_delivery_success(
+                record_channel_delivery_success(
+                    &mut agent,
                     *cid,
                     standing_sent,
-                    pending_delivered_event_ids.iter().cloned(),
+                    &pending_delivered_event_ids,
                 );
             } else if !agent.has_system_prompt_support() {
                 agent.state.heartbeat_standing_context_sent = true;
@@ -4085,6 +4088,33 @@ fn log_stop_reason(source: &PromptSource, stop_reason: &StopReason) {
     }
 }
 
+fn delivery_receipt_line(channel_id: Uuid, event_ids: &HashSet<String>) -> String {
+    let mut event_ids: Vec<&str> = event_ids.iter().map(String::as_str).collect();
+    event_ids.sort_unstable();
+    format!(
+        "turn delivered Buzz events for channel {channel_id}: {}",
+        event_ids.join(",")
+    )
+}
+
+fn record_channel_delivery_success(
+    agent: &mut OwnedAgent,
+    channel_id: Uuid,
+    standing_context_sent: bool,
+    event_ids: &HashSet<String>,
+) {
+    tracing::info!(
+        target: "pool::prompt",
+        "{}",
+        delivery_receipt_line(channel_id, event_ids)
+    );
+    agent.state.mark_channel_delivery_success(
+        channel_id,
+        standing_context_sent,
+        event_ids.iter().cloned(),
+    );
+}
+
 //
 // Two-phase lifecycle visible to users:
 //   👀  "seen"    — event was queued and an agent will handle it
@@ -4709,6 +4739,17 @@ mod tests {
         }
     }
 
+    #[test]
+    fn delivery_receipt_line_sorts_event_ids() {
+        let channel_id = Uuid::nil();
+        let event_ids = HashSet::from(["beta".to_string(), "alpha".to_string()]);
+
+        assert_eq!(
+            delivery_receipt_line(channel_id, &event_ids),
+            format!("turn delivered Buzz events for channel {channel_id}: alpha,beta")
+        );
+    }
+
     // MINOR (#2884): the permission-mode RPC is gated on agent_supports_mode.
     // An advertised mode issues set_config_option; an absent one is skipped so
     // the harness falls back to per-tool auto-approval. Pin both edges directly.

From d97780b4777f2fe3430b4e30a7d47fc6837ee059 Mon Sep 17 00:00:00 2001
From: Tyler <109685178+tlongwell-block@users.noreply.github.com>
Date: Fri, 21 Aug 2026 17:18:24 -0400
Subject: [PATCH 22/38] =?UTF-8?q?docs(nips):=20comprehensive=20NIP-FI=20?=
 =?UTF-8?q?=E2=80=94=20core=20+=20claimable=20profiles=20(EDGE/LIFECYCLE/D?=
 =?UTF-8?q?ELEG/CONF)=20(#5946)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## What

Comprehensive NIP-FI against `main`: one normative core plus four
separately
claimable profiles, replacing the single-document structure of #3726
(which was
based on #1485's branch, not `main`). Six documents, 1,975 lines, docs
only.

- **`NIP-FI.md` (core, 632 lines)** — issuer-qualified identity `(iss,
sub)`,
independent Nostr proof, client-attached assertion, partial bijection
with
durable tombstones, atomic final admission, bounded leases, private
denials
  with a closed response vocabulary, retire/revoke/rotate, two contract
identities (`assertion_policy_id`, `transport_contract_id`), per-policy
  `skew` / `maximum_assertion_age` / `maximum_status_age` with missing
configuration denying, a closed token-class rule (`at+jwt`,
`nip-fi+jwt`,
  named compatibility; ID tokens always deny), declared freshness class
  (`offline-jwt` | `current-status`), server-declared body authorization
  relevance (NIP-98 payload-binding fix, including a `payload` tag on an
irrelevant-body operation), BCP 14, "equivalent" defined over identity /
bounds / provenance classes, a compact non-normative worked wire
example,
  and a non-normative comparison with DPoP, mTLS-bound tokens, and HTTP
  Message Signatures. FI-INV-01..16 are normative core text. The
behavioral-oracle table lists exactly 30 oracle IDs, one per row, with
no
  shorthand.
- **`NIP-FI-EDGE.md`** — trusted-edge surface: the
`trusted-proxy-hmac-v2`
envelope + canonicalization, or a private authenticated-edge adapter
under a
reviewed contract; `authorization_domain_id` derivation (exact 16 RFC
9562
UUID bytes); `proof_transport_code` registry (0x01 NIP-42, 0x02 NIP-98;
  0x03 Git smart-HTTP and 0x04 Blossom reserved pending their transport
contracts; 0x05–0x7f unassigned pending published stable specifications)
  + extension procedure; body-acquisition bounds; three normative test
vectors. An independent Nostr proof (the NIP-98 event in
`Authorization`,
  which reaches the verifier byte-identical, or the NIP-42 event after
connect) is the only decision input outside the MAC; absent or
incomplete
  provenance on an edge-required route is `missing_evidence`,
  present-but-failing provenance is `evidence_rejected`.
  Header-trust-without-provenance is nonconformant.
- **`NIP-FI-LIFECYCLE.md`** — provision / disable / re-enable /
administrative
expiry (`binding_not_after`) / pending-replacement lineage, one
conformance
trace per privileged transition; every binding-creating transition
declares
whether it continues or establishes a grant; a private-condition table
for
  CONF enumeration agreement.
- **`NIP-FI-DELEG.md`** — delegated agents; explicit temporal boundaries
matching core's inclusive-`nbf`/exclusive-`exp` idiom, with the
delegated
`skew` configured by this profile; lease deadline anchored to the lease
  issue instant; strict path separation — a delegated request carries no
assertion or provenance field, so it cannot traverse an edge-provenance
  route and uses ingress on which NIP-FI-EDGE is not required.
- **`NIP-FI-CONF.md`** — conformance evidence: an immutable claim tuple
  including the governing document revision and exit fixture digest; the
  complete 16-row denial-fixture enumeration with three mechanical
  enumeration-agreement checks; mutation adequacy with a countable
  denominator — one retained killed mutant per literal oracle-table row
(30 core + 6 EDGE + 11 LIFECYCLE + 7 DELEG + 4 CONF = 58), rows selected
structurally by their first cell, never by section title, with the
release
gate and CONF's own oracle rows stated in the same listed-oracle terms
and
  a mutant defined for CONF's own report- and suite-subject oracles; an
  interoperability exit test compared over signing inputs (per-transport
NIP-01 serialization for the NIP-98 and NIP-42 proofs; decoded protected
header and claims as JSON values for the assertion), with a shared exit
  fixture pinning complete pre-signature header/claim JSON and complete
unsigned event fields for both transports, and mandatory negative
controls.
  `FI-CONF-INTEROP-EXIT` is `deferred` with reason
`no-independent-implementation` until a second independent
implementation
  exists; the canonical fixture is editor-authored at
`docs/nips/fixtures/nip-fi-conf-exit.json` and is **not in this PR** —
until
it is published a claim records `pending-canonical-fixture`, valid only
  while the exit test is deferred. Explicit not-applicable dispositions,
including `offline-jwt` deployments for the two current-status oracles
and
  absence of a revocation-bounded external capability projection for
  `FI-TRACE-CAPABILITY-REVOCATION`.
- **`NIP-FI-MODEL.md`** — non-normative companion; defines no
requirement or
  conformance claim and is not claimable.

## Why

The prior draft rated 9 (soundness) / 6 (minimalness) / 7 (elegance) /
7 (correctness) in adversarial + comparative review. This restructure
keeps the
two-invariant spine untouched, makes everything else a claimable
profile, and
collapses five stacked versioning mechanisms into two contract
identities.

Mutation adequacy counts one mutant per literal oracle-table row — a set
two
implementers enumerate identically — instead of "each normative
requirement,"
which had four defensible readings.

Resolved product calls (owner-approved):
1. Enrollment/denial posture is private — boolean enrollment discovery,
TOFU
extension claim not self-advertised, `key_mismatch →
authorization_denied`
   joins the denial anonymity set, and replayed evidence is classed
   `authorization_denied` so resubmission reveals nothing about commit.
2. Revocation honesty — only `current-status` deployments may advertise
an
   unconditional residual-revocation bound; `offline-jwt` advertises
unbounded/unknown. Access tokens keep RFC 9068 `at+jwt`; `nip-fi+jwt` is
   reserved for a separately minted Buzz assertion.

## Acceptance bar

- Nothing in core is deletable without losing a stated core guarantee.
- From the core document plus the CONF exit fixture, a second
implementer can
produce a valid request equal over the request compared object (signing
  inputs), and a byte-exact public denial per class — no reference
  implementation.
- Every oracle-table row ships a retained killed mutant satisfying only
the
  entry it was selected for.
- Both deployment profiles (trusted proxy = EDGE, client-held OIDC =
core
  client-attached) pass the same lifecycle conformance suite.

## Status

Ready at head e720a5cda. Every revision below is on this branch: the
2026-08-17 and 2026-08-18 review laps (Wren, Dawn, Perci, Sami, Mari,
Quinn)
closed at 513e03b06, 17d455a9b, and 4f913a813; the 2026-08-20 external
line-by-line review (R1–R10, R12) closed across 56e74141e..772ba7a72;
the
2026-08-20/21 adversarial lap (#6437) squash-merged as b8db13d88; the
round-3
external review (R13, R14), the DELEG×EDGE composition note, and three
terminology nits closed at e720a5cda; R11 is this description. Oracle
census: 58 (30 core, 6 EDGE, 11 LIFECYCLE, 7 DELEG, 4 CONF).

Known follow-ups, filed after merge and out of scope here: adapter-only
edge
deployments and FI-EDGE claimability; an EDGE private-condition table
for
CONF's enumeration-agreement check; an enumerable definition of the
positive/negative oracle sets used by the global mutation controls;
NIP-OA's clock-free verification versus NIP-FI-DELEG's wall-clock
expiry.

Supersedes #3726 as the spec vehicle; #1485 remains the design-history
anchor.

---------

Signed-off-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz>
Signed-off-by: Max <d8473ee32b973aa31a21a65adddcc4b69cc2a8a4dee8121ecd51926e0cddbc02@buzz.block.builderlab.xyz>
Signed-off-by: Perci <5a968df9a7494b4e019b9ecf739e088ba61097b4312124e9a88ae5b42e3f5f3e@buzz.block.builderlab.xyz>
Signed-off-by: Wren <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@buzz.block.builderlab.xyz>
Signed-off-by: Dawn <c6237ef84fa537c78dcee78efd2d4e59f728859c7f194da42ac51ededfa0be05@buzz.block.builderlab.xyz>
Signed-off-by: Tyler Longwell <tlongwell@squareup.com>
Signed-off-by: Meli <5aaa86bce934fc3445fc254aab560a40923f10252f92107e665073dede0e04d3@buzz.block.builderlab.xyz>
Co-authored-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz>
Co-authored-by: Max <d8473ee32b973aa31a21a65adddcc4b69cc2a8a4dee8121ecd51926e0cddbc02@buzz.block.builderlab.xyz>
Co-authored-by: Perci <5a968df9a7494b4e019b9ecf739e088ba61097b4312124e9a88ae5b42e3f5f3e@buzz.block.builderlab.xyz>
Co-authored-by: Wren <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@buzz.block.builderlab.xyz>
Co-authored-by: Dawn <c6237ef84fa537c78dcee78efd2d4e59f728859c7f194da42ac51ededfa0be05@buzz.block.builderlab.xyz>
Co-authored-by: Meli <5aaa86bce934fc3445fc254aab560a40923f10252f92107e665073dede0e04d3@buzz.block.builderlab.xyz>
---
 docs/nips/NIP-FI-CONF.md      | 375 ++++++++++++++++++++
 docs/nips/NIP-FI-DELEG.md     | 186 ++++++++++
 docs/nips/NIP-FI-EDGE.md      | 417 ++++++++++++++++++++++
 docs/nips/NIP-FI-LIFECYCLE.md | 269 +++++++++++++++
 docs/nips/NIP-FI-MODEL.md     |  96 ++++++
 docs/nips/NIP-FI.md           | 632 ++++++++++++++++++++++++++++++++++
 6 files changed, 1975 insertions(+)
 create mode 100644 docs/nips/NIP-FI-CONF.md
 create mode 100644 docs/nips/NIP-FI-DELEG.md
 create mode 100644 docs/nips/NIP-FI-EDGE.md
 create mode 100644 docs/nips/NIP-FI-LIFECYCLE.md
 create mode 100644 docs/nips/NIP-FI-MODEL.md
 create mode 100644 docs/nips/NIP-FI.md

diff --git a/docs/nips/NIP-FI-CONF.md b/docs/nips/NIP-FI-CONF.md
new file mode 100644
index 0000000000..c6ba387977
--- /dev/null
+++ b/docs/nips/NIP-FI-CONF.md
@@ -0,0 +1,375 @@
+NIP-FI-CONF
+===========
+
+Conformance evidence profile
+----------------------------
+
+`draft` `optional`
+
+**Dependencies**: NIP-FI core. Applies additionally to any claimed
+NIP-FI-EDGE, NIP-FI-LIFECYCLE, and NIP-FI-DELEG profile.
+
+The key words "MUST", "MUST NOT", "REQUIRED", "SHOULD", "SHOULD NOT", and
+"MAY" in this document are to be interpreted as described in BCP 14 (RFC 2119
+and RFC 8174) when, and only when, they appear in all capitals.
+
+## Abstract
+
+NIP-FI core and its profiles state required behavior. This profile states what
+counts as evidence that an implementation has it: the claim unit, the evidence
+rules, the complete denial-fixture enumeration, mutation adequacy, and the
+interoperability exit test.
+
+This profile is separately claimable and is never advertised in discovery:
+conformance is a property of a reviewed revision, not a wire feature. It
+defines no wire behavior, denial mapping, invariant, or admission rule; where
+it names one, NIP-FI core or the owning profile is normative.
+
+## Claim unit
+
+A conformance claim names exactly one immutable tuple:
+
+```text
+(implementation revision,
+ adapter revision,
+ build artifact digest,
+ deployment revision,
+ governing document revision,
+ exit fixture digest,
+ claimed profiles,
+ assertion_policy_id,
+ transport_contract_id,
+ enrollment mode)
+```
+
+Changing any element creates a new claim. Results from one tuple MUST NOT be
+carried into another. A report contains every applicable oracle from core and
+every claimed profile exactly once, with status `pass` or `not-applicable`
+only, except that `FI-CONF-INTEROP-EXIT` alone may instead carry `deferred`
+under the condition in **Interoperability exit test**. Blank, skipped,
+expected-failure, and not-run results cannot support a claim
+(`FI-CONF-CLAIM-COMPLETE`).
+
+Enrollment mode is part of the claim unit and is private: it is recorded in
+the access-controlled report, never in discovery or any public artifact.
+
+## Evidence rules
+
+Each passing oracle records the claim tuple, a stable test identifier and
+adapter entry point, the command with start time, end time, exit status, and
+any random seed, the synthetic input or a privacy-safe digest of it, the
+before-and-after authoritative state relevant to the oracle, the expected and
+observed outcomes, and artifact locations with SHA-256 digests. Stateful
+oracles use an isolated database or namespace and inspect committed state
+rather than inferring it from a response. Concurrency oracles record every
+contender and the single serialized outcome. Time-boundary oracles use a
+controlled clock.
+
+Adapters MUST drive public or production-equivalent entry points. A storage
+helper MAY inspect state or inject a dependency outage; it MUST NOT replace the
+operation under test. Calling an internal authorization function without
+traversing the protected ingress does not satisfy ingress coverage.
+
+None of the following satisfies any oracle: searching source, documentation,
+schemas, or binaries for a token; asserting that a route calls a named
+function; recording a test name without its execution result; using a mock to
+prove a deployed network boundary; citing a check from another revision; or
+marking an oracle passed because the feature is configured.
+
+`FI-TRACE-TOFU-THEFT` takes an access-controlled **configuration** witness
+only; under the private-posture rule no discovery witness for enrollment mode
+can exist. Discovery invariance is proved separately by
+`FI-TRACE-DISCOVERY-PRIVATE`.
+
+Requirements marked `[deployment artifact: ...]` in core or a profile are
+evidenced by the named access-controlled review record at the claimed
+deployment revision, not by a behavioral oracle. A claim listing an artifact
+without the record is incomplete.
+
+Reports and artifacts hold private deployment detail and MUST remain access
+controlled. They MUST NOT enter public reports, examples, discovery, or
+protocol output, and MUST NOT contain raw assertions, secrets, or unredacted
+`iss`, `sub`, or claim values. The shared exit fixture is exempt: its values
+are synthetic by construction and name no real principal, issuer, or key.
+
+## Denial fixtures
+
+`FI-TRACE-DENIAL-ORACLE` requires one fixture per **private condition**, not
+one per public class; a per-class suite compares a class against itself. The
+enumeration below is the required fixture set (`FI-CONF-DENIAL-FIXTURES`). The
+public-class column restates NIP-FI core, which owns the mapping and the bytes.
+
+| # | Private condition | Public class | Defined by |
+|---|---|---|---|
+| 1 | assertion, proof, or delegation evidence absent | `missing_evidence` | core |
+| 2 | edge provenance absent or incomplete on an edge-required route (assertion may be present) | `missing_evidence` | NIP-FI-EDGE |
+| 3 | evidence present but rejected: signature, key selection, issuer, audience, time, size, ambiguity, token class, body binding, or edge provenance (present but rejected) | `evidence_rejected` | core, NIP-FI-EDGE |
+| 4 | replayed evidence — committed replay identity already claimed | `authorization_denied` | core, NIP-FI-EDGE |
+| 5 | `key_mismatch` — asserted key is not the proven actor | `authorization_denied` | core |
+| 6 | `attestation_required` — attested-key enrollment without a matching key claim | `authorization_denied` | core |
+| 7 | `binding_conflict` — either side of the active relation is taken | `authorization_denied` | core |
+| 8 | `pair_retired` | `authorization_denied` | core |
+| 9 | `key_revoked` | `authorization_denied` | core |
+| 10 | `policy_denied` — local operation policy | `authorization_denied` | core |
+| 11 | `binding_required` — enrollment policy creates no binding at this request: provisioned mode with no binding, or any unrecognized policy value | `authorization_denied` | core |
+| 12 | `identity_disabled` | `authorization_denied` | NIP-FI-LIFECYCLE |
+| 13 | `explicit_replacement_required` — pending lineage | `authorization_denied` | NIP-FI-LIFECYCLE |
+| 14 | `binding_expired` — administrative expiry | `authorization_denied` | NIP-FI-LIFECYCLE |
+| 15 | `delegation_not_current` — owner or relationship no longer current | `authorization_denied` | NIP-FI-DELEG |
+| 16 | `dependency_unreadable` | `authorization_unavailable` | core |
+
+Private-condition names are fixture identifiers, not wire values; a deployment
+MAY use other internal reason codes if every enumerated condition has a
+fixture. Rows for an unclaimed profile are `not-applicable` with absence
+evidence. A profile that introduces a private condition MUST add its row; an
+unenumerated condition escapes this oracle entirely.
+
+**Enumeration agreement.** `policy_denied` and `dependency_unreadable` are the
+*prose-only allowlist*: core conditions that core states in prose and does not
+name symbolically. The suite MUST check mechanically at the claimed head, by
+symbol and never by row number, and every check MUST be green on the unmutated
+documents before any mutant is scored:
+
+1. every symbol core denies by name has a row here attributed to core with the
+   same public class;
+2. the set of symbols in core-attributed rows equals core's symbolic denial set
+   together with the allowlist, exactly, and the allowlist is disjoint from
+   that set; and
+3. for each claimed profile that owns a private-denial-condition table, the
+   set of `(identifier, public class)` pairs in that table equals the set of
+   pairs attributed to that profile here, exactly; a row with multiple owners
+   contributes its pair to each.
+
+If a later core names an allowlisted symbol, check 2's disjointness fails
+until the allowlist entry is deleted, and check 1 validates the promoted
+symbol's class.
+
+**Anonymity comparison.** Every `authorization_denied` row is in the
+private-state anonymity set. Between two private conditions on one
+implementation, every response byte as transmitted MUST agree — transfer
+framing included — except values a server cannot hold constant across two
+instants, such as `Date`. This is wider than the interoperability object
+below: within one implementation, any byte that varies by private condition is
+a disclosure, whatever field it sits in.
+
+**Interoperability compared object.** Between two implementations, comparison
+is over what core pins and nothing more. Over Nostr: the complete relay message
+excluding only the event or subscription identifier echoed from the request,
+as compact JSON with no insignificant whitespace per NIP-01. Over HTTP: the
+status code; the content per RFC 9110 Section 6.4, after transfer decoding with
+chunk framing and trailers excluded; and the exact values of only the header
+fields core's denial table names, field names matched case-insensitively per
+RFC 9110 Section 5.1. `Content-Length` is not pinned. Header order and unnamed
+fields are outside the object, and their values MUST NOT depend on the private
+condition. A field core names that an implementation cannot hold constant MUST
+be reported with the reason, and its value MUST be independent of the private
+condition. If core later pins another field, it joins with no edit here.
+
+**Run discipline.** The oracle runs a fixed positive iteration count on a
+pinned isolated runner at the exact claimed head. Before the run the operator
+records the environment, public-response corpus, bounds, sampling method,
+statistical rule, noise treatment, and acceptance threshold. A breach fails the
+gate, MUST NOT trigger an automatic retry, and is retained and investigated
+before a separately authorized rerun.
+
+`authorization_unavailable` is observably distinct from `authorization_denied`.
+This is accepted residual: it discloses no per-principal state, and collapsing
+it would make fail-closed behavior undiagnosable.
+
+**Negative control.** The suite MUST include an implementation deliberately
+patched to vary its denial response by private condition, and it MUST fail
+this oracle.
+
+## Mutation adequacy
+
+An oracle that cannot fail is untested text that reads as tested. The
+denominator is the **listed oracle**: every table row whose first cell names
+exactly one complete literal oracle identifier, in NIP-FI core, in each claimed
+normative profile, and in this document when CONF is claimed — selected by
+that cell, not by section title. It is not the set of normative sentences, RFC
+2119 keywords, or invariant labels, none of which two readers enumerate alike.
+
+For each listed oracle the suite MUST retain at least one **mutant**: an
+implementation variant that violates a requirement that oracle governs,
+together with that oracle's failing output (`FI-CONF-MUTATION`). Evidence is
+the exact patch identity, the oracle identifier, and the retained failure
+output at the claimed head. For this document's own oracles the implementation
+under test includes the conformance suite and its report; a mutant is a single
+variant of the suite or report that the entry's own oracle rejects.
+
+While `FI-CONF-INTEROP-EXIT` is validly deferred it remains in claim
+completeness but is excluded from this section's mutation and global-control
+obligations, since its failing output cannot exist without the run. Both
+obligations attach with the run and MUST be discharged before either
+implementation's interoperable conformance claim is accepted. No other
+oracle's obligation under this section is deferrable.
+
+Normative prose outside the oracle tables remains binding but is not a second
+denominator. Prose that no listed oracle can detect is untestable text: add the
+oracle that detects it, or delete it.
+
+1. **One at a time.** Mutants are applied singly against an otherwise
+   unmodified implementation, so layered defenses cannot mask each other.
+2. **Attribution.** The kill MUST come from the entry's own oracle. A mutant
+   killed only by another oracle establishes coverage for neither.
+3. **One entry per mutant.** A mutant satisfies only the entry it was selected
+   for, even when it also kills other oracles.
+4. **Reachability.** The suite MUST witness that a fixture reaches the mutated
+   decision, not merely the enclosing operation.
+5. **Survivors are recorded.** A mutant its named oracle fails to kill is a
+   defect in the specification or the suite. It is recorded with that
+   disposition and MUST NOT be waived or replaced by an easier mutant.
+
+Two global controls bound the suite. A deny-everything implementation MUST
+fail every positive oracle; an allow-everything implementation MUST fail every
+negative oracle. Neither substitutes for per-entry mutants.
+
+## Interoperability exit test
+
+A claim of core conformance requires evidence that the documents alone are
+sufficient to build against (`FI-CONF-INTEROP-EXIT`). Two implementations that
+have not shared code and have not consulted a common reference implementation
+each produce, from NIP-FI core and any claimed profile documents alone:
+
+- one valid `client-attached` request, over WebSocket upgrade and over HTTP,
+  compared over its signing inputs as defined below; and
+- one byte-exact public denial response for each of the four public classes,
+  on each transport where the class can be decided, compared over the
+  interoperability compared object under **Denial fixtures**.
+
+Independence is a claim about code, not inputs: two implementations given
+different issuers, keys, or clocks cannot produce equal bytes. The run is
+therefore parameterized by a **shared exit fixture** that both sides load and
+neither side authors:
+
+- one issuer identity and one JWK set, including the private key needed to
+  mint assertions and the `kid` selecting it;
+- one assertion per denial class and one for the valid request, each as
+  complete pre-signature protected-header and claim-set JSON values —
+  including `alg`, `typ`, `kid`, every member the policy allows, and fixed
+  `iss`, `sub`, `aud`, `nostr_pubkey`, `client_id`, `iat`, `exp`, and token
+  class;
+- one Nostr secret key for the proof, with the complete unsigned event fields
+  for each transport — the NIP-98 event over HTTP and the NIP-42 event with
+  its challenge and relay values over the WebSocket upgrade — including
+  `created_at`;
+- one frozen evaluation instant, and the skew and lifetime bounds in force;
+  and
+- the domain, target resource, operation, and enrollment policy for each case.
+
+The canonical fixture is authored by this document's editors, not by any
+claiming implementation, and MUST be published as a single file at
+`docs/nips/fixtures/nip-fi-conf-exit.json` in the same repository as these
+documents, with its SHA-256 digest, before any `FI-CONF-INTEROP-EXIT` run.
+Both sides MUST load that file, MUST verify the digest before the run, and
+MUST record the digest with the evidence; a run against any other fixture
+instance is not `FI-CONF-INTEROP-EXIT` evidence. While the canonical fixture
+is unpublished, the claim tuple's exit fixture digest records the reserved
+value `pending-canonical-fixture`, valid only in a claim whose
+`FI-CONF-INTEROP-EXIT` result is `deferred`. Publication changes the element
+and therefore creates a new claim.
+
+**Request compared object.** Signature octets are excluded, because conforming
+implementations need not agree on them (randomized `ES256` and fresh-aux
+BIP-340 do not) and no document here pins JWS or JSON member order. The
+compared object is the **signing inputs**: for each transport's Nostr proof,
+the NIP-01 serialization the event id is taken over, compared against its own
+transport's serialization; for the assertion, the decoded protected header and
+claim set compared as JSON values with member order excluded. Every value the
+compared object depends on MUST be pinned in the fixture.
+
+The exchanged artifact per case is the complete request and response frame on
+each transport — for HTTP the request line, headers, and body and the response
+status, headers, and body; for Nostr the complete client and relay messages —
+so that a mismatch can be explained from fields outside the compared object.
+
+The test passes when outputs compare equal over their compared objects and
+each implementation accepts the other's valid request and reproduces the
+other's denials. Exit evidence includes the exchanged artifacts and each
+implementation's statement of independence. A divergence traced to an
+underspecified value is a defect in the specification, not in either
+implementation, and is fixed there.
+
+**Negative control.** One implementation is patched to emit a denial that
+differs from the other only outside the compared object — a header core does
+not name, or reordered fields — and the run MUST still pass. A run that fails
+this control is comparing more than core pins; the exit test is then the
+defect. The control is retained with the evidence.
+
+`FI-CONF-INTEROP-EXIT` is REQUIRED only once a second implementation meeting
+the independence conditions exists. Until then a conformance claim MUST record
+it as deferred with the machine-readable reason
+`no-independent-implementation`. A deferred exit test MUST be run and passed
+before the second implementation's conformance claim is accepted, and the
+first implementation's claim MUST be re-evidenced against that run.
+
+## Applicability
+
+`not-applicable` requires a machine-readable reason and behavioral proof that
+the surface is absent:
+
+- edge oracles only when no trusted-edge profile is accepted, none is
+  advertised, and executable cases reject every trusted-edge evidence shape;
+- snapshot-rotation oracles only when no local key or status snapshot source
+  is configured and executable evidence proves the absence;
+- `FI-TRACE-TOFU-THEFT` only when TOFU is neither configurable nor configured
+  and executable first-use cases deny;
+- `FI-TRACE-CURRENT-STATUS-STALE` and `FI-TRACE-CURRENT-STATUS-REVOKED` only
+  when every configured assertion policy declares freshness class
+  `offline-jwt` and executable cases prove a presented witness is never
+  consulted;
+- `FI-TRACE-CAPABILITY-REVOCATION` only when no external capability
+  projection requiring a declared revocation bound is configured, and
+  executable evidence proves no assertion capability or local-policy value
+  claims such a bound;
+- lifecycle and delegation oracles only when the profile is unclaimed,
+  disabled, and denied on every ingress; and
+- every other oracle is required for an enforcing deployment.
+
+An implementation that supports an optional surface runs its oracles even when
+one deployed domain does not activate it.
+
+## Release gate
+
+Before NIP-FI enforcement or discovery is enabled, reviewers verify, at one
+reviewed revision, that:
+
+- one immutable claim tuple passes every applicable oracle other than a
+  validly deferred `FI-CONF-INTEROP-EXIT`;
+- if the canonical fixture was published before the review, the tuple's exit
+  fixture digest is not `pending-canonical-fixture`;
+- the protected-ingress inventory has no uncovered or competing authority;
+- every listed oracle, other than a validly deferred `FI-CONF-INTEROP-EXIT`,
+  has a killed, attributed, reachable mutant and every survivor is recorded;
+- the denial-fixture enumeration is complete for the claimed profiles and its
+  negative control fails as required;
+- the interoperability exit test has passed against an independent
+  implementation, or is recorded as deferred because none exists;
+- every named deployment artifact exists at the claimed deployment revision;
+  and
+- public and operational sinks pass privacy-canary inspection.
+
+Documentation review, source review, and static scans are review inputs. They
+close no item in this gate.
+
+## Behavioral oracles
+
+| ID | Required outcome |
+|---|---|
+| `FI-CONF-CLAIM-COMPLETE` | A report missing an applicable oracle, duplicating one, carrying a result from another claim tuple, claiming a status other than `pass`/`not-applicable` — or `deferred` on any oracle other than `FI-CONF-INTEROP-EXIT` — or omitting mutant evidence for any oracle other than a deferred `FI-CONF-INTEROP-EXIT`, or recording the exit fixture digest `pending-canonical-fixture` with any `FI-CONF-INTEROP-EXIT` result other than `deferred`, is rejected. |
+| `FI-CONF-DENIAL-FIXTURES` | Every enumerated private condition has a fixture; core and each claimed profile pass exact identifier/class/owner enumeration agreement; anonymity-set responses compare byte-identical; the distinguishing negative control fails. |
+| `FI-CONF-MUTATION` | Every listed oracle — except `FI-CONF-INTEROP-EXIT` while validly deferred, per **Mutation adequacy** — has a singly-applied, attributed, reachability-witnessed mutant killed by that entry's own oracle; the deny-everything and allow-everything global controls fail every oracle **Mutation adequacy** requires of them, with retained evidence; survivors are recorded, not waived. |
+| `FI-CONF-INTEROP-EXIT` | Two independent implementations produce, from the documents alone, valid requests equal over the request compared object and per-class denials equal over the denial compared object, and accept each other's output. |
+
+## Security considerations
+
+Conformance evidence is a privileged artifact: it enumerates private denial
+conditions, enrollment posture, and deployment topology that the protocol
+deliberately keeps off the wire. Publishing a report, a fixture corpus, or a
+mutant catalogue would disclose exactly what `FI-INV-13` and
+`FI-TRACE-DISCOVERY-PRIVATE` protect.
+
+A passing suite bounds the behaviors it exercises and nothing else. Mutation
+adequacy raises the cost of a masked defect; it does not prove absence of
+defects, and a claim that cites this profile as proof of security rather than
+of tested behavior is misusing it.
diff --git a/docs/nips/NIP-FI-DELEG.md b/docs/nips/NIP-FI-DELEG.md
new file mode 100644
index 0000000000..9b9134c2b3
--- /dev/null
+++ b/docs/nips/NIP-FI-DELEG.md
@@ -0,0 +1,186 @@
+NIP-FI-DELEG
+============
+
+Delegated agent authorization profile
+--------------------------------------
+
+`draft` `optional` `relay`
+
+**Protocol dependency**: NIP-FI core.
+
+The key words "MUST", "MUST NOT", "REQUIRED", "SHOULD", "SHOULD NOT", and
+"MAY" in this document are to be interpreted as described in BCP 14 (RFC 2119
+and RFC 8174) when, and only when, they appear in all capitals.
+
+## Scope
+
+This profile authorizes a delegate key from separately validated delegation
+evidence rooted in a currently eligible NIP-FI owner binding. The delegate
+proves its own key. It does not present a federated assertion and never receives
+or inherits the owner's binding. Because a trusted edge inserts assertion and
+provenance fields on every request it forwards, and `FI-DELEG-PATH-SEPARATION`
+denies any such field on a delegated request, delegated requests cannot traverse
+a route that requires edge provenance; they use ingress on which NIP-FI-EDGE is
+not required.
+
+This profile defines the normalized delegation result and its additional
+preparation, final-admission, and lease witnesses. It does not define a wire
+format for creating delegation relationships; NIP-OA or another protocol may
+supply the evidence if it satisfies this contract.
+
+## Delegation evidence
+
+A validator returns this closed result:
+
+```text
+DelegationEvidence = (
+  domain,
+  owner_key,
+  delegate_key,
+  relationship_id,
+  relationship_revision,
+  audience,
+  operations,
+  conditions,
+  resource_or_target,
+  not_before?,
+  mandatory_expiry
+)
+```
+
+`relationship_id` and `relationship_revision` are deployment-local dependency
+identifiers. All other fields are interoperability-critical in meaning even
+when their concrete encoding belongs to the supplying delegation protocol.
+
+The evidence authenticates every field, has one unambiguous owner and delegate,
+matches the server-owned domain and exact request or target, and has a finite
+expiry satisfying `now < mandatory_expiry`; equality at an expiry is expired.
+Optional `not_before` satisfies `not_before <= now + skew`, using the
+configured delegated `skew`; arithmetic is overflow-safe. A missing
+configured `skew` denies. The proven actor equals `delegate_key`.
+[FI-DELEG-EVIDENCE-CLOSED]
+
+A delegated request carries fresh request-appropriate Nostr proof and no
+`Nostr-Federated-Identity` or profile provenance field. Mixed direct and
+delegated evidence denies rather than selecting a path. [FI-DELEG-PATH-SEPARATION]
+
+## Private denial conditions
+
+This profile defines exactly this private condition identifier and owning public
+class for NIP-FI-CONF enumeration agreement:
+
+| Private condition identifier | Public class |
+|---|---|
+| `delegation_not_current` | `authorization_denied` |
+
+The identifier is a fixture name, not a wire value. Adding, removing, renaming,
+or reclassifying it requires the same change in NIP-FI-CONF's denial-fixture
+table.
+
+## Preparation
+
+Preparation resolves the exact server-owned domain, target context, operation,
+resource, and proven delegate actor before validating delegation evidence. It
+then atomically reads:
+
+- the active owner binding and exact binding version;
+- every owner tombstone, key-revocation, administrative, and profile lifecycle
+  gate applicable to that binding;
+- the exact relationship identifier and revision;
+- current local policy and resource versions; and
+- every invalidation dependency and deadline.
+
+The owner binding is current and authorization-eligible at preparation. A
+cached owner lease is not authority. The requested capability is the
+intersection of the delegation's operation, audience, conditions, and target
+with current local policy; an unsupported operation or empty intersection
+denies. [FI-DELEG-OWNER-CURRENT]
+
+Preparation remains read-only under `FI-INV-08`. It cannot create or change an
+owner or delegate binding, identity, provenance, lifecycle fact, relationship,
+last-seen value, replay claim, receipt, lease, or application effect.
+[FI-DELEG-NO-BINDING]
+
+## Final admission
+
+Core final admission additionally requires:
+
+1. the exact delegation evidence and delegate proof remain live;
+2. domain, actor, target, audience, operation, resource, and relationship match
+   the prepared value;
+3. the exact current owner binding and binding version remain eligible;
+4. relationship identity and revision remain current;
+5. current capability intersection equals the prepared intersection; and
+6. changed dependencies are reread and the complete delegated decision is
+   recomputed before atomic commit.
+
+Any mismatch, expiry, owner retirement, owner key revocation, owner binding
+version change, relationship change, unreadable dependency, or unsupported
+capability denies. Rotation makes the former owner key non-current; its
+relationships do not transfer to the new key. [FI-DELEG-OWNER-CURRENT]
+
+The delegated path creates no owner or delegate binding and cannot consume an
+enrollment opportunity. Its receipt identifies the delegate actor and exact
+owner-binding and relationship dependencies without publishing identity
+material. [FI-DELEG-NO-BINDING]
+
+## Delegated leases
+
+A deployment configures a positive finite delegated maximum and a non-negative
+finite delegated `skew`. The lease deadline is no later than the minimum of:
+
+- delegation expiry;
+- delegate proof or connection bound;
+- owner binding administrative bound, when applicable;
+- current relationship bound;
+- local policy bound;
+- the lease issue instant plus the configured delegated maximum; and
+- any stronger owner-assertion bound the deployment requires.
+
+Missing finite configuration denies. Equality is expired and arithmetic is
+overflow-safe. [FI-DELEG-LEASE-BOUND]
+
+Before each protected use, the service checks the delegate actor, owner binding
+and version, relationship and revision, capability intersection, target,
+resource, local policy, deadline, and invalidation state. It closes or rejects
+the lease within the deployment's tested revocation-detection bound after any
+owner or relationship dependency becomes ineligible. The claimed bound is no
+smaller than measured worst-case detection plus enforcement delay.
+[FI-DELEG-INVALIDATION-BOUND]
+
+Owner retirement, revocation, rotation, disablement under NIP-FI-LIFECYCLE, or
+binding replacement invalidates dependent delegates on the same effective
+schedule as owner authority. A delegate lease never authorizes another delegate
+or owner key on the same connection. [FI-DELEG-OWNER-CURRENT]
+
+## Discovery
+
+A relay claiming this profile MAY add `"delegation": true` to the NIP-11
+`federated_identity` object only when owner-current resolution, the positive
+finite maximum, uniform final admission, and all profile oracles are active. It
+does not advertise relationship IDs, owner keys, private delegation protocol
+names, or policy detail. [FI-DELEG-DISCOVERY]
+
+## Behavioral oracles
+
+| ID | Required outcome |
+|---|---|
+| `FI-DELEG-EVIDENCE-CLOSED` | Valid closed evidence passes; unauthenticated, ambiguous, wrong-domain/actor/target/audience, not-yet-valid, and expiry-equality variants deny. |
+| `FI-DELEG-PATH-SEPARATION` | Delegation plus any direct assertion/provenance field denies; neither path falls back to the other. |
+| `FI-DELEG-OWNER-CURRENT` | Exact current owner succeeds; retirement, revocation, rotation, replacement, stale owner version, stale relationship, and unreadable owner state deny without inheritance. |
+| `FI-DELEG-NO-BINDING` | Successful, denied, and concurrent delegated requests create or change no owner/delegate binding or lifecycle state. |
+| `FI-DELEG-LEASE-BOUND` | Every authority bound and equality boundary closes the lease; absent finite maximum denies. |
+| `FI-DELEG-INVALIDATION-BOUND` | Measured owner/relationship revocation closes prepared evidence and live leases within the claimed detection bound. |
+| `FI-DELEG-DISCOVERY` | Discovery is false/absent until the complete active profile passes; public output contains no relationship or owner detail. |
+
+NIP-FI-CONF defines evidence packaging and mutation adequacy. Each uppercase
+requirement above names the oracle that detects its violation.
+
+## Security considerations
+
+Delegation expands authority only by intersection and never by copying owner
+capabilities. A stolen delegation still requires the delegate key. A stolen
+delegate key is bounded by the relationship and finite lease. Owner rotation
+cannot silently transfer delegation because the exact owner key and binding
+version are dependencies. Implementations should invalidate by dependency index
+rather than wait for incidental delegate traffic.
diff --git a/docs/nips/NIP-FI-EDGE.md b/docs/nips/NIP-FI-EDGE.md
new file mode 100644
index 0000000000..1f54d36e37
--- /dev/null
+++ b/docs/nips/NIP-FI-EDGE.md
@@ -0,0 +1,417 @@
+# NIP-FI-EDGE: Trusted Edge Profile
+
+`draft` `optional`
+
+## Scope
+
+This profile lets a trusted enterprise edge deliver federated assertion evidence to
+a NIP-FI verifier. It defines two constructions:
+
+- `trusted-proxy-hmac-v2`, a portable request-bound HMAC envelope; and
+- a private authenticated-edge assertion adapter, for platforms that provide an
+  equivalent closed trust boundary without the stock envelope.
+
+NIP-FI-EDGE is optional. A deployment can implement NIP-FI core using only
+`client-attached`. Claiming this profile does not weaken core assertion validation,
+independent Nostr proof, binding, lifecycle, policy, final-admission, or lease rules.
+The key words **MUST**, **MUST NOT**, **REQUIRED**, **SHALL**, **SHALL NOT**,
+**SHOULD**, **SHOULD NOT**, **RECOMMENDED**, **NOT RECOMMENDED**, **MAY**, and
+**OPTIONAL** are to be interpreted as described in BCP 14 when, and only when,
+they appear in all capitals.
+
+Every identifier this document serializes on the wire — header names, the
+profile identifier, provenance envelope fields, and proof transport codes — is
+interoperability-critical. `transport_contract_id` remains deployment-local as
+core classifies it: its value is opaque outside a deployment, while the
+canonical contract semantics this profile contributes to it are normative and
+fixed here. Local adapter revision identifiers and key identifiers are
+deployment-local and MUST NOT appear in public discovery.
+
+## Common trusted-edge requirements
+
+Server-owned listener, route, and authorization-domain configuration selects exactly
+one edge profile before protected traffic is accepted. Request evidence cannot
+select, negotiate, or downgrade that profile. Missing, repeated, comma-combined,
+malformed, oversized, mixed-profile, or profile-inconsistent evidence denies without
+fallback to `client-attached` or another edge profile.
+
+Every trusted edge MUST:
+
+1. strip every inbound copy of each `Nostr-Federated-Identity`,
+   `Nostr-Federated-Identity-Provenance`, and `Nostr-Federated-Identity-Client-Peer`
+   field, and of every other edge profile's assertion, identity, capability,
+   provenance, and client-peer field, before inserting its own fields. A trusted
+   edge MUST NOT remove or modify the `Authorization` field, which remains reserved
+   for the independent NIP-98 proof and MUST reach final admission unmodified;
+2. cryptographically authenticate the immediate edge to the accepting origin and
+   isolate the origin from direct or alternate ingress;
+3. integrity-protect every request component used by authorization other than
+   an independent Nostr proof, which is protected by its own signature;
+4. apply a positive finite provenance deadline that is included in final admission
+   and every resulting lease;
+5. validate a closed upstream identity and authorization claim set and produce the
+   same normalized assertion result required by core;
+6. preserve the server-resolved domain, operation, resource, method, authority,
+   path/query, body semantics, proof transport, and Nostr actor key through final
+   admission; and
+7. keep assertions, credentials, signatures, MACs, raw client addresses, and private
+   claims out of URLs, public protocol output, logs, metrics, and traces.
+
+Header presence, source address, private-network location, hostname, or reachability
+alone is not provenance. Accepting unsigned identity or capability headers, or
+accepting signed headers without authenticating and isolating the immediate caller,
+is nonconformant. A trusted edge that strips, rewrites, or reorders the
+`Authorization` field, or that admits a proof-transport-`0x02` request whose
+`Authorization` field did not arrive at the verifier byte-identical to the
+client-sent value, is nonconformant.
+
+An adapter's reviewed contract MUST identify its accepting origins, direct-origin
+controls, field-stripping point, immediate-caller authentication, protected request
+components, upstream assertion and policy validation, freshness bounds, independent
+Nostr-proof path, compromise impact, and conformance evidence. It MUST deny when any
+part of this boundary is absent or unreadable.
+
+### Authenticated-edge assertion adapters
+
+A deployment MAY install a private authenticated-edge adapter instead of HMAC-v2.
+The adapter MUST satisfy all common requirements and demonstrate together:
+origin isolation, cryptographically authenticated immediate caller, inbound-field
+stripping, integrity of the complete authorization-relevant request, bounded
+assertion and policy freshness, no direct-origin fallback, and the core final-
+admission path with independent Nostr proof.
+
+The adapter maps only its closed, validated claim set into the normalized result.
+An opaque edge token is acceptable only inside this complete contract; opacity does
+not make an unchecked header authoritative. Vendor names, issuer details, caller
+identities, private field names, capability semantics, and adapter identifiers MUST
+NOT appear in NIP-11 or portable examples.
+
+## `trusted-proxy-hmac-v2`
+
+The stock profile identifier is `trusted-proxy-hmac-v2`. Core computes the
+`transport_contract_id` from a canonical contract that includes this profile's exact
+wire format, protected components, replay rules, deadline rules, configured code
+meanings, and adapter semantics. Changing any of those inputs produces a different
+contract identity; the profile identifier itself remains stable. The proxy strips
+all inbound assertion, provenance, and client-peer fields and inserts exactly one of
+each:
+
+```text
+Nostr-Federated-Identity: Bearer <compact-JWS>
+Nostr-Federated-Identity-Provenance: v2.<timestamp>.<nonce>.<mac>
+Nostr-Federated-Identity-Client-Peer: <client-peer>
+```
+
+The assertion field follows core's compact-JWS and size rules. `timestamp` is
+canonical unsigned decimal without leading zeroes, except zero is `0`. `nonce` and
+`mac` are canonical unpadded base64url. Padding, the standard base64 alphabet,
+ignored whitespace, or another encoding denies. The proxy generates a fresh nonce
+containing at least 128 bits from a cryptographically secure random source. The
+decoded MAC is exactly 32 octets. Finite field and decoded-nonce maxima are applied
+before decoding, replay lookup, hashing, or allocation.
+
+`client-peer` is at most 64 ASCII octets. IPv4 uses dotted decimal with no leading
+zeroes. IPv6 uses lowercase RFC 5952 text. The edge converts an observed IPv4-mapped
+IPv6 address to canonical IPv4 before constructing the field; a textual mapped IPv6
+field is noncanonical. Empty, repeated, comma-combined, whitespace-padded, non-IP,
+or noncanonical values deny. After verification, the verifier MAY retain only a
+domain-separated keyed digest of this value in bounded private state.
+
+The profile uses HMAC-SHA-256 with a deployment secret containing at least 256 bits.
+Let `LP(x) = uint64be(len(x)) || x`, where length is in octets. The literal prefix is
+14 ASCII octets and is not length-prefixed. The pre-MAC input is exactly:
+
+```text
+"NIP-FI-PROXY-2" ||
+LP(timestamp_u64be) || LP(nonce_bytes) || LP(SHA256(jwt_ascii)) ||
+LP(authorization_domain_id) ||
+LP(method_ascii) || LP(authority_ascii) || LP(path_and_query_ascii) ||
+LP(SHA256(payload_octets)) || LP(proof_transport_octet) || LP(client_peer_ascii)
+```
+
+`mac = HMAC-SHA-256(secret, pre_mac_input)`. The transmitted `mac` is canonical
+unpadded base64url of the raw 32-octet result. The verifier compares it in constant
+time.
+
+### Canonical components
+
+- **Timestamp:** Parse canonical decimal into an unsigned 64-bit integer, rejecting
+  overflow, then serialize it as exactly eight-byte big-endian. Freshness checks are
+  separate from serialization.
+- **Nonce:** Decode the exact canonical base64url field before serialization.
+- **Assertion:** Hash the exact ASCII compact-JWS octets after the one space in
+  `Bearer `. No whitespace, Unicode, JSON, or base64 normalization is allowed.
+- **Authorization domain:** Configuration contains a canonical lowercase,
+  hyphenated RFC 9562 UUID named `authorization_domain_uuid`. Parse its 32 displayed
+  hexadecimal digits into the exact 16 UUID octets in display/network order. For
+  example, `00112233-4455-6677-8899-aabbccddeeff` becomes
+  `00112233445566778899aabbccddeeff`. UTF-8 UUID text, hashing, truncation,
+  namespace derivation, mixed-endian GUID encoding, uppercase, and unhyphenated
+  configuration are forbidden. The UUID is generated once, is immutable for the
+  domain's lifetime, and is shared through authenticated proxy/verifier
+  configuration. Duplicate UUIDs among active domains MUST fail startup.
+- **Method:** Use the exact uppercase ASCII method token after trusted route
+  resolution. Lowercase or noncanonical input denies; the verifier does not repair it.
+- **Authority:** Use server-configured lowercase ASCII host plus explicit effective
+  decimal port. IPv6 uses brackets and RFC 5952. Userinfo, a trailing dot, an omitted
+  port, percent encoding, or an authority derived solely from `Host`, `Forwarded`, or
+  `X-Forwarded-Host` denies.
+- **Path and query:** Use the exact post-rewrite ASCII origin-form. Empty path becomes
+  `/`; a present query includes `?`. Percent octets and hex case, an empty query,
+  repeated names, and parameter order are preserved. No decoding, sorting,
+  dot-segment removal, or re-encoding may occur after the edge snapshot. An
+  unaccounted rewrite denies.
+- **Payload:** Hash the complete HTTP payload octets after transfer-coding removal and
+  before content-coding decompression. These are exactly the octets forwarded by the
+  edge and exposed to verification. HTTP framing, chunk delimiters, and trailers are
+  excluded; `Content-Encoding` is not decoded. A WebSocket upgrade uses the empty
+  payload. Substitution of the protected octets after the snapshot denies.
+- **Proof transport:** Serialize exactly one assigned octet from the registry below.
+- **Client peer:** Serialize the exact canonical ASCII field value.
+
+No authorization decision, target, resource, capability, or effect selector
+derives from any request or connection component outside the protected pre-MAC
+components, except an independent Nostr proof validated on its own signature,
+such as the NIP-98 event in `Authorization` or the NIP-42 event after connect,
+which the MAC does not protect; body interpretation follows the server-resolved
+body semantics, never unprotected transport metadata such as `Content-Type` or
+`Content-Encoding`.
+
+### Freshness, replay, and key rotation
+
+The deployment configures a positive finite `maximum_provenance_age` and a
+non-negative finite `future_skew`. Evidence is live exactly when, using overflow-safe
+comparisons:
+
+```text
+timestamp <= now + future_skew
+now < timestamp + maximum_provenance_age
+```
+
+Equality at the age bound is expired. A direct lease deadline is no later than
+`timestamp + maximum_provenance_age` and every core assertion, proof, policy, and
+state deadline.
+
+Absent, malformed, stale, future-dated, wrong-key, or mismatched provenance denies.
+On a route that requires edge provenance, absent or incomplete provenance —
+including provenance that omits the proxy-authenticated end-client peer — maps
+to the `missing_evidence` public class, regardless of whether an assertion is
+present. Provenance that is present and complete but fails verification maps to
+`evidence_rejected`.
+A v1 envelope denies. A verifier MAY try only a configured finite set of active
+secrets. Rotation does not change nonce identity: replay uniqueness is scoped to
+`(authorization_domain_id, trusted-proxy-hmac-v2, nonce)` and is independent of the
+secret that verifies the MAC. A committed nonce is retained through at least
+`timestamp + maximum_provenance_age`.
+
+Preparation consumes neither nonce nor Nostr-proof replay identity. Final admission
+atomically consumes both with any enrollment, receipt, and authorization decision.
+A failed or rolled-back admission consumes neither. Two concurrent admissions with
+the same nonce commit at most one authorization. The proxy-to-verifier hop still
+requires confidentiality and integrity.
+
+## Proof-transport code registry
+
+| Code | Meaning and allocation policy |
+|---|---|
+| `0x00` | Invalid; MUST deny. |
+| `0x01` | NIP-42 connection proof. |
+| `0x02` | NIP-98 HTTP proof. |
+| `0x03` | Git smart-HTTP session proof: the proxy verifies a session-scoped Nostr authorization for a Git smart-HTTP request before forwarding. Reserved; allocation completes on publication of its transport contract (see below). |
+| `0x04` | Blossom media proof: the proxy verifies a Blossom media-HTTP authorization event for the request before forwarding. Reserved; allocation completes on publication of its transport contract (see below). |
+| `0x05`–`0x7f` | Unassigned; allocation requires a published stable specification. |
+| `0x80`–`0xfe` | Private use under an explicit shared proxy/verifier contract only. |
+| `0xff` | Reserved for a future extended encoding; invalid in HMAC-v2. |
+
+An allocation MUST define exact proof validation, request binding, freshness, replay
+identity and window, and conformance vectors. Assigned semantics never change; an
+incompatible meaning receives a new code. Unknown, unconfigured, or private-use
+codes without the same configured contract at proxy and verifier deny. Private-use
+codes MUST NOT be advertised as portable NIP-FI-EDGE interoperability.
+
+Codes `0x03` and `0x04` are reserved to fix their meanings and prevent
+reassignment; their transport contracts are not yet published, so their
+allocations are not complete. Until the contract for such a code is published,
+the code is valid only under an explicit shared proxy/verifier contract,
+exactly as for private use, and MUST NOT be presented as portable NIP-FI-EDGE
+interoperability.
+
+## Bounded payload acquisition
+
+Every protected `(authorization_domain_id, route, proof_transport_code)` tuple MUST
+configure a finite `maximum_payload_octets` and finite per-request
+`maximum_spool_octets >= maximum_payload_octets`. Zero is allowed only for a route
+that requires an empty payload. Proxy and verifier configuration MUST agree and is
+part of the transport contract.
+
+If trusted `Content-Length` exceeds the route limit, the edge denies before reading,
+hashing, JWT verification, replay lookup, or authoritative mutation. For absent,
+unknown, or streamed length, acquisition uses a bounded counter and spool and stops
+on octet `limit + 1`. Incremental SHA-256 is allowed, but no digest or prefix can
+authorize until EOF proves completeness.
+
+Spooling uses memory or access-controlled temporary storage with finite per-request
+and aggregate quotas, cleanup on every outcome, no public or log output, and no reuse
+across requests. Quota exhaustion fails closed and creates no nonce claim, proof
+claim, receipt, lease, or application mutation. At or below the limit, the exact
+captured payload is replayed unchanged. HMAC verification and core final admission
+complete before application effects. Forwarding to a rollback-safe private spool is
+not an application effect; forwarding to a parser, decoder, handler, or origin that
+can act is.
+
+A content decoder, multipart parser, Git/Blossom handler, framework, or intermediary
+that cannot expose and replay the exact stage defined above before effects cannot
+claim HMAC-v2 for that route. It MUST use core `client-attached` or another specified
+edge profile, never a partial-body MAC.
+
+## Normative HMAC-v2 vectors
+
+All vector integers and lengths are big-endian. Common values are:
+
+```text
+secret_hex = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
+nonce_hex = 000102030405060708090a0b0c0d0e0f
+nonce_base64url = AAECAwQFBgcICQoLDA0ODw
+authorization_domain_uuid = 00112233-4455-6677-8899-aabbccddeeff
+authorization_domain_id_hex = 00112233445566778899aabbccddeeff
+jwt_ascii = eyJhbGciOiJFUzI1NiIsInR5cCI6Im5pcC1maStqd3QifQ.eyJpc3MiOiJodHRwczovL2lkLmV4YW1wbGUiLCJzdWIiOiIxMjMifQ.c2ln
+assertion_digest_hex = 6103b52a52730bc065d65673247603a63c9810488c90d0ada3d8d227eee5285f
+```
+
+The fixture JWT represents a separately minted `nip-fi+jwt` assertion and is opaque
+test input; its deliberately synthetic signature is not an assertion-validation
+vector. Implementations MUST reproduce each field, complete pre-MAC input,
+diagnostic input digest, raw MAC, and wire MAC exactly
+(`FI-TRACE-EDGE-VECTORS`).
+
+### Vector 1: HTTP / NIP-98 / non-empty payload
+
+```text
+timestamp_decimal = 1700000000
+timestamp_u64be_hex = 000000006553f100
+method_ascii = POST
+authority_ascii = api.example:443
+path_and_query_ascii = /upload?part=1&part=2&x=%2F
+payload_hex = 68656c6c6f0a
+body_digest_hex = 5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03
+proof_transport_hex = 02
+client_peer_ascii = 203.0.113.9
+pre_mac_input_hex = 4e49502d46492d50524f58592d320000000000000008000000006553f1000000000000000010000102030405060708090a0b0c0d0e0f00000000000000206103b52a52730bc065d65673247603a63c9810488c90d0ada3d8d227eee5285f000000000000001000112233445566778899aabbccddeeff0000000000000004504f5354000000000000000f6170692e6578616d706c653a343433000000000000001b2f75706c6f61643f706172743d3126706172743d3226783d25324600000000000000205891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03000000000000000102000000000000000b3230332e302e3131332e39
+pre_mac_input_sha256 = df2870230d2170595dccd17d9e61a82282d8cd8b978ac18bff07419ed59091d5
+mac_hex = 761d3ecbf609f0f558b4a02a1a18a25070f3dbe89fce9cac59a80bce4436ade5
+mac_base64url = dh0-y_YJ8PVYtKAqGhiiUHDz2-ifzpysWagLzkQ2reU
+provenance = v2.1700000000.AAECAwQFBgcICQoLDA0ODw.dh0-y_YJ8PVYtKAqGhiiUHDz2-ifzpysWagLzkQ2reU
+```
+
+### Vector 2: WebSocket / NIP-42 / empty payload / mapped peer
+
+The edge observed `::ffff:192.0.2.128` and emitted canonical `192.0.2.128`.
+
+```text
+timestamp_decimal = 1
+timestamp_u64be_hex = 0000000000000001
+method_ascii = GET
+authority_ascii = relay.example:443
+path_and_query_ascii = /
+payload_hex =
+body_digest_hex = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+proof_transport_hex = 01
+client_peer_ascii = 192.0.2.128
+pre_mac_input_hex = 4e49502d46492d50524f58592d32000000000000000800000000000000010000000000000010000102030405060708090a0b0c0d0e0f00000000000000206103b52a52730bc065d65673247603a63c9810488c90d0ada3d8d227eee5285f000000000000001000112233445566778899aabbccddeeff0000000000000003474554000000000000001172656c61792e6578616d706c653a34343300000000000000012f0000000000000020e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855000000000000000101000000000000000b3139322e302e322e313238
+pre_mac_input_sha256 = 67564d241499491b3ea53b31d6111fbc9efac37a294f6ce591519e4bf21b53e9
+mac_hex = f71a179a018637a0582cf3de39ccb7b976216c18ada312127d4c983c14af4b20
+mac_base64url = 9xoXmgGGN6BYLPPeOcy3uXYhbBitoxISfUyYPBSvSyA
+```
+
+### Vector 3: IPv6 authority and path/query byte preservation
+
+```text
+timestamp_decimal = 1700000000
+timestamp_u64be_hex = 000000006553f100
+method_ascii = GET
+authority_ascii = [2001:db8::1]:443
+path_and_query_ascii = /a%2Fb?b=2&a=1&a=0
+payload_hex =
+body_digest_hex = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+proof_transport_hex = 02
+client_peer_ascii = 2001:db8::2
+pre_mac_input_hex = 4e49502d46492d50524f58592d320000000000000008000000006553f1000000000000000010000102030405060708090a0b0c0d0e0f00000000000000206103b52a52730bc065d65673247603a63c9810488c90d0ada3d8d227eee5285f000000000000001000112233445566778899aabbccddeeff000000000000000347455400000000000000115b323030313a6462383a3a315d3a34343300000000000000122f61253246623f623d3226613d3126613d300000000000000020e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855000000000000000102000000000000000b323030313a6462383a3a32
+pre_mac_input_sha256 = 8a93a29c4ac30b0f2551d346d0636040b639bb1f109d287e93ce44ddaed73e33
+mac_hex = df2936f81d752f3d6bac2a36d3381c38db2c9abc3570236cb121274ad34a6161
+mac_base64url = 3yk2-B11Lz1rrCo20zgcONssmrw1cCNssSEnStNKYWE
+```
+
+### Serialization and negative matrix
+
+The following timestamp values MUST serialize as shown before freshness evaluation:
+
+| Decimal | `uint64be` hex |
+|---:|---|
+| `0` | `0000000000000000` |
+| `1` | `0000000000000001` |
+| `255` | `00000000000000ff` |
+| `256` | `0000000000000100` |
+| `18446744073709551615` | `ffffffffffffffff` |
+
+`00`, `01`, `+1`, surrounding whitespace, negative values, and
+`18446744073709551616` deny before MAC comparison. The maximum value above is an
+encoding vector; ordinary freshness policy will reject it.
+
+Every implementation MUST run these normative negative cases:
+
+| Class | Required cases and result |
+|---|---|
+| Envelope | Absent/repeated/comma-combined fields, `v1`, missing/extra component, padding, alternate alphabet, nonce below 16 octets or above configured max, and MAC lengths 31 or 33 all deny. |
+| Domain | Uppercase/nonhyphenated UUID config fails configuration; mixed-endian UUID bytes or any one-bit domain transplant fails the baseline MAC; duplicate active UUID fails startup. |
+| Request | Mutating assertion, method, authority, path/query, body, proof code, or peer while retaining Vector 1's MAC denies. |
+| Metadata | Mutating `Content-Type` or `Content-Encoding` in flight changes no authorization decision, target, capability, or effect selector; a request whose server-resolved body semantics no longer hold denies. |
+| Path | `%2F`→`%2f`, decoding to `/`, reordering repeated query values, or adding/removing an empty `?` fails the baseline MAC. |
+| Authority | Unbracketed or non-RFC-5952 IPv6, uppercase host, trailing dot, or missing port denies before MAC comparison. |
+| Peer | Textual `::ffff:192.0.2.128`, padded IPv4, uppercase/noncanonical IPv6, or whitespace denies before MAC comparison. |
+| Proof | `0x00`, `0xff`, unknown stock code, or private code without a shared configured contract denies. |
+| Body | Known and unknown lengths `0`, `limit-1`, and `limit` may proceed only after EOF; `limit+1`, disconnect before EOF, aggregate-quota exhaustion, or any post-snapshot substitution of the protected octets denies with no replay or authoritative mutation. |
+| Replay | Concurrent final admissions of one valid envelope commit at most one; preparation and failed final admission consume none; secret rotation does not create a new nonce namespace. |
+| Fallback | Direct ingress, mixed evidence, and failed HMAC never retry as `client-attached` or another adapter. |
+
+## Discovery and conformance
+
+A relay that completely implements the stock profile MAY add exactly
+`"edge_transports": ["trusted-proxy-hmac-v2"]` inside the top-level NIP-11
+`federated_identity` object. `edge_transports` is an array of unique ASCII string
+profile identifiers in ascending bytewise order; this document assigns only the
+single value shown. A relay that does not completely implement the stock profile
+MUST omit the member. It MUST NOT advertise private adapters, keys, domains, field
+names, or code contracts. No request may select behavior from this discovery
+member; server-owned configuration selects the edge profile. Claiming FI-EDGE
+requires every configured edge profile to pass the applicable core conformance suite
+and these profile traces:
+
+| Trace | Required oracle |
+|---|---|
+| `FI-TRACE-EDGE-VECTORS` | Reproduce all three normative vectors field-for-field, including each complete pre-MAC input, diagnostic input digest, raw MAC, and wire MAC; reproduce all five timestamp serialization rows; every listed serialization and negative-matrix case produces its required denial or configuration failure. |
+| `FI-TRACE-PROXY-SPOOF` | Direct ingress, unsigned/header-only identity, unauthenticated caller, or invalid provenance denies without fallback. |
+| `FI-TRACE-PROXY-REPLAY` | Two HMAC-v2 final admissions using one nonce commit at most one; preparation consumes neither. A private adapter proves its declared replay semantics. |
+| `FI-TRACE-PROXY-CROSS-REQUEST` | Each protected component mutation denies. HMAC-v2 covers assertion, domain, method, authority, path/query, complete body, proof transport, and peer. On a `0x02` route the `Authorization` bytes at final admission equal the client-sent bytes, witnessed at both points; an edge that substitutes a valid proof from the same actor fails the witness. |
+| `FI-TRACE-EDGE-BODY-BOUNDS` | Known and streamed boundary cases prove bounded work/storage, EOF completeness, cleanup, and no pre-authorization effect. |
+| `FI-TRACE-EDGE-KEY-ROTATION` | A finite active-key set accepts an intended overlap without allowing nonce reuse or an unknown key. |
+
+The conformance record binds the exact implementation, adapter, deployment,
+assertion policy, transport contract, configured code meanings, and vector revision.
+Two HMAC-v2 implementations interoperate only when they reproduce all valid vector
+bytes exactly, reject every negative, agree on UUID and code configuration, and
+preserve atomic replay and bounded complete-body behavior.
+
+## Security considerations
+
+HMAC-v2 limits header spoofing, replay, and cross-request transplantation only when
+its secret remains confidential, the edge snapshots the final routed request, the
+origin authenticates that edge, and final admission atomically consumes replay state.
+It does not replace TLS or independent Nostr proof. A compromised edge or shared
+secret can forge federated evidence within its configured domains; use distinct
+secrets and UUIDs to limit blast radius.
+
+Authenticated-edge adapters intentionally shift more proof to deployment controls.
+A hostname, private network, or opaque token is not an equivalent construction unless
+the complete boundary obligations above are demonstrated. Body buffering and replay
+state are attacker-controlled resource surfaces, so all field, payload, spool,
+aggregate, key-set, and retention bounds fail closed.
diff --git a/docs/nips/NIP-FI-LIFECYCLE.md b/docs/nips/NIP-FI-LIFECYCLE.md
new file mode 100644
index 0000000000..fdd08d4dfb
--- /dev/null
+++ b/docs/nips/NIP-FI-LIFECYCLE.md
@@ -0,0 +1,269 @@
+# NIP-FI-LIFECYCLE: Binding Lifecycle Profile
+
+`draft` `optional`
+
+## Abstract
+
+This profile extends NIP-FI with provisioned enrollment, identity disablement,
+re-enablement, and an administrative binding-expiry gate. It is for deployments
+whose binding changes require separately authorized operator or enterprise
+workflows. It does not change NIP-FI assertion validation, Nostr proof, final
+admission, or public denial semantics.
+
+The key words **MUST**, **MUST NOT**, **REQUIRED**, **SHALL**, **SHALL NOT**,
+**SHOULD**, **SHOULD NOT**, **RECOMMENDED**, **MAY**, and **OPTIONAL** in this
+document are to be interpreted as described in BCP 14 when, and only when, they
+appear in all capitals as shown here.
+
+## Dependencies and claim
+
+An implementation of this profile implements NIP-FI Core and advertises only
+the boolean `"lifecycle": true` inside its NIP-11 `federated_identity` object.
+This boolean claims support for this profile; it deliberately reveals neither an
+enrollment mode nor lifecycle state. For a fixed set of claimed profiles, the
+complete discovery output MUST be byte-identical whether enrollment is
+attested-key, TOFU, or provisioned and whether lifecycle facts exist. A server
+MUST NOT advertise the claim until every protected ingress in the advertised
+authorization domain applies this profile through the same final-admission
+authority (`FI-LC-CLAIM`).
+
+This profile contributes lifecycle dependencies and deadlines to the core
+prepared decision and lease. They compose with core dependencies by set union;
+the earliest applicable deadline wins. This profile cannot weaken, replace, or
+bypass a core check.
+
+## Additional state
+
+For authorization domain `D`, this profile adds:
+
+```text
+X_D : set of disabled identities
+Q_D : identity -> pending lineage
+
+PendingLineage = (
+  identity,
+  old_key,
+  old_binding_version
+)
+```
+
+It also permits a core binding to carry `binding_not_after`, an optional
+administrative deadline. The pending lineage names one exact retired pair and
+binding version. There is at most one pending lineage per identity.
+
+`binding_not_after` bounds the grant represented by **one binding**; it is not a
+bound on the identity. Rotation continues the same grant: the replacement binding
+preserves the carried bound, and only expiry authority changes it. Retirement,
+revocation, and disablement end the existing grant. Re-enablement, provisioning,
+and ordinary enrollment establish a *new* grant that carries no prior bound — so
+retirement of a bound pair followed by ordinary enrollment under `attested-key`
+or `tofu` policy yields an unbounded binding, and that is conformant. A deadline that must survive the end
+of a grant — an identity-scoped access bound — belongs in the capability
+projection of authoritative local-policy state, which core already requires for
+any projection whose removal must close authority within a declared bound and
+which is reread at preparation, final admission, and every protected lease use.
+`binding_not_after` is not that mechanism and cannot substitute for it: it does
+not survive the end of the grant that carries it, so a deployment relying on it
+for identity-scoped expiry cannot claim a revocation bound for that expiry
+(`FI-LC-ADMIN-EXPIRY`).
+
+A binding carrying a reached bound is **active** for every core relation and
+eligibility test in this profile and in core, including the core partial
+bijection and `TargetEligible` below. It is ineligible for authorization, not
+absent from the binding relation.
+
+`X_D`, `Q_D`, and `binding_not_after` are deployment-local state. Their versions
+are revalidation dependencies, not contract identities. A change invalidates a
+prepared decision and every dependent lease unless complete final-admission
+recomputation produces the required current result.
+
+Ordinary authorization MUST deny when its identity is disabled, when pending
+lineage exists for that identity, or when `now >= binding_not_after`; it MUST
+NOT clear, consume, or alter any of those facts (`FI-LC-ORDINARY-GATES`). An
+absent `binding_not_after` has no administrative expiry. Assertion `exp`,
+`iat`, refresh, or maximum age never creates, renews, extends, or clears it.
+Time passage alone creates no tombstone, lineage, or history.
+
+## Private denial conditions
+
+This profile defines exactly these private condition identifiers and owning
+public classes for NIP-FI-CONF enumeration agreement:
+
+| Private condition identifier | Public class |
+|---|---|
+| `identity_disabled` | `authorization_denied` |
+| `explicit_replacement_required` | `authorization_denied` |
+| `binding_expired` | `authorization_denied` |
+
+The identifiers are fixture names, not wire values. Adding, removing, renaming,
+or reclassifying one requires the same change in NIP-FI-CONF's denial-fixture
+table.
+
+## Common transition contract
+
+Each transition below requires privileged authority distinct from an ordinary
+federated assertion and Nostr proof. That authority MUST be bound to the exact
+`D`, transition name, identity, request, old binding version when present, and
+target key when present (`FI-LC-AUTHORITY`). The deployment defines how that
+authority is obtained; role names, approval count, and operator APIs are out of
+scope.
+
+A transition MUST, in one atomic commit:
+
+1. validate that privileged authority and fresh target-key evidence;
+2. read and recheck the applicable core binding relation, retired pairs,
+   revoked keys, `X_D`, `Q_D`, policy, and dependency versions;
+3. apply exactly the state changes specified below;
+4. append immutable lifecycle history identifying the transition and versions;
+   and
+5. advance lifecycle state so dependent prepared decisions and leases cannot
+   authorize after commit.
+
+A stale precondition, denied transition, unreadable dependency, or failed commit
+MUST leave all authoritative state unchanged (`FI-LC-ATOMIC`). Lease
+invalidation MAY be delivered asynchronously, but authorization use after the
+commit MUST recheck the advanced dependency before allowing an operation.
+
+Every transition that creates a binding MUST state whether it **continues** an
+existing grant, and therefore preserves that grant's administrative bound, or
+**establishes** a new grant carrying no prior bound. The two cases partition the
+binding-creating transitions with no remainder: core rotation continues, and
+provisioning, re-enablement, and ordinary enrollment establish. A profile that
+adds a binding-creating transition without this declaration cannot claim
+conformance (`FI-LC-CLAIM`).
+
+`TargetEligible(i, k, allow_disabled)` means that `k` is not revoked, `(i, k)`
+is not retired, neither `i` nor `k` has an active binding, and `i` is not
+disabled unless `allow_disabled` is true. Every new target key requires fresh,
+request-bound Nostr proof by that key. If domain policy requires issuer key
+attestation, the transition also requires a current assertion for `i` whose key
+claim equals `k`. Supplied stale, absent, wrong-identity, or mismatched required
+attestation denies; it is never ignored as optional evidence
+(`FI-LC-TARGET-PROOF`).
+
+A replacement binding records `attested-key` provenance only when current
+matching issuer attestation was validated; otherwise it records `provisioned`.
+TOFU provenance can arise only from the core ordinary first-use extension and
+is never inherited by a replacement.
+
+## Privileged transitions
+
+### Provision binding
+
+```text
+ProvisionBinding(i, k):
+  require domain enrollment policy = provisioned
+  require TargetEligible(i, k, false)
+  require Q_D(i) is absent
+  require fresh target-key evidence
+  create Binding(i, k, new_version, provisioned)
+```
+
+The transition creates no authorization lease. Later use requires a current
+assertion, fresh Nostr proof, and ordinary final admission. Ordinary
+request-time authorization under `provisioned` policy MUST NOT create a binding
+(`FI-LC-PROVISION`).
+
+### Disable identity
+
+```text
+DisableIdentity(i):
+  add i to X_D
+  if Binding(i, k, old_version) exists:
+    remove Binding(i, k, old_version)
+    add (i, k) to the core retired-pair set
+    set Q_D(i) = (i, k, old_version)
+```
+
+Applying an authorized disablement repeatedly is idempotent. It MUST NOT erase
+or replace existing lineage. If `i` has no active binding, disablement creates
+no lineage (`FI-LC-DISABLE`).
+
+### Re-enable identity
+
+```text
+ReenableIdentity(i, expected_lineage?, k_new):
+  require i is in X_D
+  require Q_D(i) is absent when expected_lineage is absent,
+          otherwise require Q_D(i) = expected_lineage
+  require TargetEligible(i, k_new, true)
+  require fresh target-key evidence
+  remove i from X_D
+  consume expected_lineage when present
+  create Binding(i, k_new, new_version, ReplacementProvenance(evidence))
+```
+
+Clearing disabled state and creating the target binding are inseparable. There
+is no clear-only transition: it would permit a later ordinary enrollment to
+capture the identity. An operator that intends to provision later leaves the
+identity disabled until the target and fresh proof are available
+(`FI-LC-REENABLE`).
+
+### Set administrative expiry
+
+```text
+SetAdministrativeExpiry(i, k, old_version, binding_not_after?):
+  require exact current Binding(i, k, old_version)
+  require separate privileged expiry authority
+  replace it with Binding(i, k, new_version,
+                          same_provenance, binding_not_after?)
+```
+
+This transition changes neither side of the pair nor its provenance. Setting,
+replacing, or clearing the bound advances the binding version. At equality the
+binding is ineligible but remains durable and occupies both sides of the core
+partial bijection. This transition is the only expiry authority: no other
+transition in this profile or in core sets, replaces, or clears the bound, and
+core rotation carries it onto the replacement binding unchanged. Only this or
+another applicable privileged transition can restore access; ordinary
+authorization cannot renew the bound (`FI-LC-ADMIN-EXPIRY`).
+
+## One-shot lineage and concurrency
+
+Consumption of `Q_D` and creation of its replacement binding MUST be one
+compare-and-commit operation over the exact pending lineage. Of two concurrent
+re-enablings presenting the same lineage, at most one can commit. The loser
+observes changed state and denies without creating a binding, consuming another
+lineage, or changing history (`FI-LC-QD-ONCE`).
+
+A lifecycle transition racing ordinary final admission is ordered by the same
+authoritative state transaction or dependency check. If the lifecycle commit
+wins, the ordinary operation denies; if final admission wins first, the
+lifecycle transition still invalidates subsequent lease use. No ordering
+permits authority from a disabled identity, consumed lineage, or expired
+binding after the corresponding state change is observed.
+
+## Behavioral oracles
+
+Each oracle is normative. A conforming implementation produces the stated
+result at final admission and retains no partial authoritative mutation from a
+denied case.
+
+| ID | Setup and required result |
+|---|---|
+| `FI-LC-CLAIM` | For a fixed profile set, compare complete discovery bytes across attested-key, TOFU, and provisioned configurations and across lifecycle states: they are identical. If one protected ingress omits lifecycle gates or uses a different lifecycle lineage, the domain cannot advertise the profile and the uncovered ingress fails closed. If any claimed profile defines a binding-creating transition that declares neither grant continuation nor grant establishment, the domain cannot advertise that profile. |
+| `FI-LC-ORDINARY-GATES` | Fresh assertion and proof for a disabled identity, an identity with pending lineage, and a binding at administrative-expiry equality each deny without changing lifecycle state. |
+| `FI-LC-AUTHORITY` | An ordinary assertion plus valid Nostr proof, but no transition-specific authority, cannot perform any transition; mutation of any authority-bound field denies. |
+| `FI-LC-ATOMIC` | Inject failure at each transition write boundary; no binding, tombstone, disabled fact, lineage, history entry, or dependency version is partially committed. |
+| `FI-LC-TARGET-PROOF` | Missing, stale, wrong-key, wrong-request, or mismatched required attestation for a new target denies without mutation. |
+| `FI-LC-PROVISION` | Ordinary first use in provisioned mode denies; authorized provisioning creates one binding and no lease; later current ordinary admission may use it. |
+| `FI-LC-DISABLE` | Disabling an active identity atomically disables it, retires its exact pair, records exact lineage, and closes subsequent lease use; replay is idempotent and preserves lineage. |
+| `FI-LC-REENABLE` | Re-enablement creates an eligible proven binding in the same commit that clears disabled state; absent or wrong expected lineage and a clear-only attempt deny. |
+| `FI-LC-ADMIN-EXPIRY` | Before the bound the binding may authorize; at equality it denies while still occupying the relation, so a target eligibility test for either side of that pair fails. Rotating the expired binding to a new key carries the bound: the replacement denies at the same instant. No non-expiry transition clears it. Only an authorized version-checked update by the expiry authority changes the bound. Conversely, retirement, revocation, or re-enablement of the bound pair followed by an authorized or ordinary new grant produces an unbounded binding, which is the required result and not an escape. |
+| `FI-LC-QD-ONCE` | Two concurrent re-enablings consume the same `Q_D` lineage; exactly one commits and the loser leaves every authoritative store unchanged. |
+| `FI-LC-RACE` | Race each transition against prepared ordinary admission and lease use; no operation authorizes after observing the advanced lifecycle or binding dependency. |
+
+## Security considerations
+
+Privileged authority compromise can provision or replace enterprise bindings;
+deployments should apply controls proportionate to that authority. This profile
+makes the authority request-bound and transitions atomic, but does not define
+approval UX or key custody.
+
+Disabled identities, retired pairs, revoked keys, and pending lineage serve
+different purposes. Re-enablement removes only the exact disabled fact and
+optional exact lineage named by its transition. No transition in this profile
+removes a core revoked-key or retired-pair fact.
+
+Administrative expiry is local policy, not upstream revocation freshness. It
+cannot extend an assertion, status witness, Nostr proof, or lease deadline.
diff --git a/docs/nips/NIP-FI-MODEL.md b/docs/nips/NIP-FI-MODEL.md
new file mode 100644
index 0000000000..821477755c
--- /dev/null
+++ b/docs/nips/NIP-FI-MODEL.md
@@ -0,0 +1,96 @@
+NIP-FI-MODEL
+============
+
+Composed authorization model (non-normative)
+--------------------------------------------
+
+This companion is explanatory. It defines no requirement, invariant, wire
+value, denial mapping, or conformance claim. Normative requirements live in
+[NIP-FI](NIP-FI.md) and the claimed profile documents. In particular,
+`FI-INV-01` through `FI-INV-16` are defined only by NIP-FI core.
+
+## State sketch
+
+One useful implementation model keeps these authoritative relations per domain:
+
+```text
+B_D : active identity-to-key relation
+T_D : retired identity/key pairs
+Y_D : revoked keys
+H_D : immutable lifecycle history
+V_D : binding and lifecycle versions
+```
+
+NIP-FI-LIFECYCLE adds disabled identities and pending replacement lineage.
+NIP-FI-DELEG adds relationship state but no delegate binding. NIP-FI-EDGE adds
+transport-provenance and replay witnesses. Implementations may use different
+storage as long as their observable behavior satisfies the owning normative
+documents.
+
+## Composed direct decision
+
+The core decision can be read as this equation:
+
+```text
+validated issuer-qualified identity
++ fresh request/connection-bound Nostr proof
++ current durable partial-bijection state
++ current local policy
++ atomic final admission
+= authority for exactly the proven key and operation
+```
+
+Preparation gathers immutable evidence and snapshots every dependency without
+mutation. Final admission compares exact context and stable contract identities,
+checks all deadlines, revalidates changed snapshots, recomputes from current
+binding and policy state, then commits replay claims, optional enrollment, and a
+receipt atomically. The special concurrent-enrollment normalization is narrow:
+an `enroll(i,k)` proposal may become the same eligible `existing(i,k)` result;
+a different winner is not equivalent.
+
+## Profile composition
+
+Profiles contribute witnesses, never alternate final authority:
+
+```text
+core witnesses
+∪ EDGE provenance/replay witnesses
+∪ LIFECYCLE eligibility/lineage witnesses
+∪ DELEG owner/relationship witnesses
+```
+
+The lease deadline is the minimum of every bound in the resulting set. A missing
+or unreadable required witness denies. A profile cannot remove a core witness,
+extend a core deadline, replace the proven actor, or create a second admission
+lineage.
+
+For direct authorization, the path dependency is the normalized assertion and
+its current snapshot/status witnesses. For delegated authorization, it is the
+exact eligible owner binding plus relationship evidence; direct assertion fields
+are absent. Both paths share context resolution, Nostr-proof validation, local
+policy, read-only preparation, and atomic final admission.
+
+## Lifecycle intuition
+
+Bindings are durable; leases are ephemeral. Retirement makes one exact pair
+permanently ineligible for ordinary recreation. Revocation makes a key
+ineligible throughout the domain. Rotation retires the old pair and creates a
+new binding version but does not globally revoke the old key. Extended lifecycle
+operations may add disabled identity and one-shot pending-lineage state, as
+specified by NIP-FI-LIFECYCLE.
+
+## Privacy intuition
+
+Private reasons collapse to fixed public bytes. In particular, binding
+conflicts, tombstones, lifecycle gates, key mismatch, enrollment requirements,
+and local-policy decisions are indistinguishable. Operational diagnostics may
+retain bounded private reason codes, but such records are not protocol objects
+and never become authorization witnesses.
+
+## Reading order
+
+1. NIP-FI for core state, wire behavior, invariants, and direct admission.
+2. NIP-FI-EDGE for a trusted-enterprise edge.
+3. NIP-FI-LIFECYCLE for provisioning, disablement, and re-enablement.
+4. NIP-FI-DELEG for delegated agents.
+5. NIP-FI-CONF for claim and evidence rules.
diff --git a/docs/nips/NIP-FI.md b/docs/nips/NIP-FI.md
new file mode 100644
index 0000000000..663210659b
--- /dev/null
+++ b/docs/nips/NIP-FI.md
@@ -0,0 +1,632 @@
+NIP-FI
+======
+
+Federated identity authorization — core
+----------------------------------------
+
+`draft` `optional` `relay`
+
+**Protocol dependencies**: NIP-01 and either NIP-42 or NIP-98. Optional
+profiles are defined by NIP-FI-EDGE, NIP-FI-LIFECYCLE, NIP-FI-DELEG, and
+NIP-FI-CONF.
+
+The key words "MUST", "MUST NOT", "REQUIRED", "SHOULD", "SHOULD NOT", and
+"MAY" in this document are to be interpreted as described in BCP 14 (RFC 2119
+and RFC 8174) when, and only when, they appear in all capitals.
+
+## Abstract
+
+NIP-FI authorizes a Nostr key only when four independent facts agree: a valid
+issuer-qualified identity assertion, fresh proof of that Nostr key, current
+identity-to-key binding state, and current local policy for the exact operation.
+The identity provider never signs Nostr events, and an assertion never replaces
+Nostr proof.
+
+Bindings outlive individual assertions. Assertions and authorization leases do
+not outlive their evidence. This core defines the portable client-attached
+assertion transport, direct enrollment, atomic final admission, bounded
+sessions, privacy-preserving denial responses, and the smallest useful binding
+lifecycle. Companion profiles add trusted edges, extended lifecycle operations,
+and delegation without changing the core admission rule.
+
+This NIP does not define an identity provider, database schema, operator API,
+public identity projection, application membership policy, or user interface.
+
+## Terms and identifier classes
+
+- **domain** (`D`): an authorization boundary selected only by authenticated
+  server routing and configuration.
+- **identity** (`i`): the exact tuple `(iss, sub)` returned by assertion
+  validation. Email, display name, employee number, and a bare `sub` are not
+  identities.
+- **target context** (`R_t`): the server-resolved method, authority, path and
+  query, body semantics, transport, operation, and resource.
+- **actor** (`k`): the 32-byte public key returned by Nostr-proof validation.
+- **request context** (`R`): `R_t` sealed with `k`.
+- **binding**: a durable, versioned association `(D, i, k)` with immutable
+  provenance `attested-key`, `tofu`, or `provisioned`.
+- **retired pair**: a durable denial fact for an exact `(D, i, k)`.
+- **revoked key**: a durable denial fact for `(D, k)`.
+- **prepared authorization**: immutable, read-only evidence and witnesses for a
+  possible admission.
+- **committed authorization**: authority returned only after final revalidation
+  and atomic commit.
+- **lease**: a cached committed decision for one actor and bounded operation
+  set. A lease is not a binding.
+
+Identity and authorization-state comparisons preserve every tuple component.
+Equal `sub` values under different `iss` values are distinct identities; equal
+`(i, k)` pairs under different domains are distinct bindings, retired pairs,
+and authorization state. [FI-TRACE-CROSS-DOMAIN-COLLISION]
+
+Every identifier is either **interoperability-critical** or
+**deployment-local**. Header names, public response bytes, token type values,
+and trace identifiers are interoperability-critical and fixed here.
+`assertion_policy_id`, `transport_contract_id`, domain IDs, snapshot versions,
+binding versions, policy versions, and correlation IDs are deployment-local;
+their values are opaque outside a deployment, while their stability and
+invalidation behavior are normative.
+
+## Core security invariants
+
+These labels are the normative home of the NIP-FI invariants. Companion
+profiles may add witnesses and bounds but cannot weaken them.
+
+1. **`FI-INV-01 — partial bijection.`** Active bindings are one-to-one within a
+   domain: one identity has at most one active key and one key has at most one
+   active identity. [FI-TRACE-BINDING-CONFLICT]
+2. **`FI-INV-02 — durable binding.`** Assertion expiry removes neither a
+   binding nor its provenance. Fresh eligible evidence may authorize the same
+   binding later. [FI-TRACE-ASSERTION-REFRESH]
+3. **`FI-INV-03 — tombstone monotonicity.`** Ordinary authorization never
+   removes a retired-pair or revoked-key fact and never recreates a retired
+   pair. [FI-TRACE-TOMBSTONE-REPLAY]
+4. **`FI-INV-04 — server-owned context.`** Every admitted operation uses one
+   server-resolved domain, target, resource, operation, and proven actor.
+   Unauthenticated input cannot replace them. [FI-TRACE-DOMAIN-SPOOF]
+5. **`FI-INV-05 — independent evidence.`** Direct authorization requires a
+   current assertion and fresh Nostr proof. If the assertion names a key, it
+   equals the proven actor. [FI-TRACE-ASSERTION-KEY-MISMATCH]
+6. **`FI-INV-06 — stable assertion policy.`** Assertion-policy identity changes
+   when accepted assertion semantics change, but not when only authenticated
+   key or status snapshot contents rotate. [FI-TRACE-VERIFIER-PARITY]
+7. **`FI-INV-07 — current-snapshot verification.`** Evidence cannot survive
+   removal of the key or policy snapshot that authenticated it; a changed
+   snapshot requires revalidation. [FI-TRACE-JWKS-REMOVE]
+8. **`FI-INV-08 — read-only preparation.`** Preparation creates no binding,
+   tombstone, replay claim, receipt, lease, publication, last-seen value, audit
+   authority, or application mutation. [FI-TRACE-FINAL-DENIAL-NO-MUTATION]
+9. **`FI-INV-09 — atomic final admission.`** Enrollment, replay claims,
+   receipts, and required authorization evidence commit only after complete
+   final revalidation, all or none. [FI-TRACE-PREPARED-STALE]
+10. **`FI-INV-10 — explicit lifecycle authority.`** Retirement, revocation,
+    rotation, and profile-defined lifecycle changes occur only through their
+    separately authorized transition. [FI-TRACE-LIFECYCLE-AUTHORITY]
+11. **`FI-INV-11 — evidence-bounded leases.`** A lease ends no later than every
+    evidence, snapshot, proof, binding, local-policy, and implementation bound
+    on which it depends. [FI-TRACE-LEASE-BOUND]
+12. **`FI-INV-12 — current-owner delegation.`** When NIP-FI-DELEG is claimed,
+    delegation requires the exact current eligible owner binding, fresh
+    delegate proof, capability intersection, and a positive finite deadline.
+    [FI-DELEG-OWNER-CURRENT]
+13. **`FI-INV-13 — privacy-safe denial.`** Public rejection is many-to-one and
+    reveals no identity, key, claim, binding, tombstone, enrollment mode, key
+    identifier, or private policy fact. [FI-TRACE-DENIAL-ORACLE]
+14. **`FI-INV-14 — fail closed.`** Unreadable, ambiguous, stale beyond policy,
+    or inconsistent evidence or authoritative state cannot produce authority.
+    [FI-TRACE-DEPENDENCY-FAIL-CLOSED]
+15. **`FI-INV-15 — uniform authority.`** Every protected ingress in a domain
+    uses the same current domain policy and final-admission authority. An
+    uncovered or competing path is unavailable. [FI-TRACE-AUTHORITY-UNIFORM]
+16. **`FI-INV-16 — canonical verifier.`** Assertion transports feed one closed,
+    provider-neutral normalized-result contract and cannot fork final
+    admission. [FI-TRACE-VERIFIER-PARITY]
+
+## Client-attached transport
+
+Server configuration selects `client-attached` before protected traffic is
+accepted. Request fields cannot select, negotiate, or downgrade transport.
+Failure never falls back to another transport. [FI-TRACE-TRANSPORT-CLOSED]
+
+The client sends exactly one field on the request or WebSocket upgrade:
+
+```text
+Nostr-Federated-Identity: Bearer <compact-JWS>
+```
+
+`Authorization` remains reserved for NIP-98. Assertion and provenance fields
+from any other profile are absent. Missing, repeated, comma-combined, empty,
+malformed, non-Bearer, or mixed-profile fields deny. Assertions never appear in
+URLs, query parameters, Nostr events, tags, filters, application history, or
+public identity projections. [FI-TRACE-TRANSPORT-CLOSED]
+
+The core transport contract has deployment-local identity
+`transport_contract_id`. It deterministically identifies the exact field,
+parsing, request-attachment, no-fallback, and context-preservation semantics.
+Changing any of those semantics changes the ID; changing request data does not.
+[FI-TRACE-CONTRACT-IDENTITIES]
+
+## Assertion validation
+
+A configured assertion policy accepts exactly one bounded compact JWS and
+returns this closed result:
+
+```text
+VerifiedAssertion = (
+  identity = (iss, sub),
+  asserted_key?,
+  claims_or_capabilities,
+  authority_deadlines,          // non-empty
+  assertion_policy_id,
+  transport_contract_id,
+  revalidation_dependencies
+)
+```
+
+The verifier rejects ambiguous protected-header or claim members, unknown
+critical headers, `alg=none`, symmetric algorithms, algorithm/key mismatch,
+incompatible JWK usage, ambiguous key selection, and signatures not valid
+under exactly one accepted asymmetric key. It bounds the assertion, headers,
+claims, subject, key identifiers, and authenticated key set before lookup or
+logging. [FI-TRACE-ASSERTION-VALIDATION]
+
+The exact `iss` selects an authenticated policy and key source; `iss` and at
+least one `aud` value exactly match configured values. `sub` is a non-empty
+bounded string. Each policy configures a non-negative finite `skew`, a positive
+finite `maximum_assertion_age`, and, for `current-status`, a positive finite
+`maximum_status_age`; a missing value denies. `exp` and `iat` are finite
+NumericDate values satisfying `now < exp`, `iat <= now + skew`, and
+`now < iat + maximum_assertion_age`. Optional `nbf` satisfies
+`nbf <= now + skew`. Arithmetic is overflow-safe and equality at an expiry is
+expired. [FI-TRACE-ASSERTION-VALIDATION]
+
+The Nostr-key claim is named `nostr_pubkey`. When present it MUST be a
+lowercase hexadecimal encoding of exactly one 32-byte Nostr public key; other
+encodings and aliases deny. In `attested-key` enrollment policy and wherever
+current matching issuer attestation is required, this exact claim MUST be
+present and equal the proven actor; authorization claims or capabilities use a
+closed bounded input set and deterministic canonical encoding. Unchecked claims
+never enter the result. [FI-TRACE-VERIFIER-PARITY]
+
+### Token class
+
+Policy selects exactly one token class before parsing claims:
+
+- **`at+jwt` access token**: a Buzz-resource access token whose protected
+  `typ` is exactly `at+jwt` and whose `aud` contains the configured Buzz
+  resource audience. This class selects tokens carrying the RFC 9068 `at+jwt`
+  type but validates them under this document's claim contract; it does not
+  implement the full RFC 9068 validation profile, and the long-form media type
+  `application/at+jwt` is not accepted;
+- **dedicated Buzz assertion**: a separately minted assertion whose protected
+  `typ` is exactly `nip-fi+jwt`;
+- **named compatibility access token**: absent or generic protected `typ=JWT`
+  only under an explicit issuer policy whose required and forbidden claims,
+  audience, issuer, key source, and validation rules are mutually exclusive
+  with every accepted ID-token and other JWT class.
+
+OIDC ID Tokens always deny, even when `iss`, `aud`, and `sub` match. A generic
+or absent type has no stock fallback. Failure under one class never triggers
+validation under another. An `at+jwt` access token MUST contain one non-empty
+bounded `client_id`. Issuer policy MUST distinguish a resource-owner token from a token
+whose subject represents the OAuth client, including a client-credentials token,
+using authenticated claim semantics and mutually exclusive validation rules. A
+token that admits both interpretations denies. If client-subject tokens are
+accepted, the issuer MUST guarantee that their `(iss, sub)` coordinates cannot
+collide with resource-owner coordinates; otherwise that token class is
+ineligible. Token class and every class-specific validation rule are inputs to
+`assertion_policy_id`. [FI-TRACE-TOKEN-CLASS]
+
+### Policy identity and snapshots
+
+Core has exactly two semantic contract identities:
+
+```text
+assertion_policy_id  = H(canonical assertion-policy contract)
+transport_contract_id = H(canonical transport contract)
+```
+
+Each uses one implementation-defined but deterministic, versioned encoding and
+collision-resistant hash within a deployment. `assertion_policy_id` covers the
+canonical issuer, audience, token class, allowed algorithms, authenticated
+key/status-source contracts, identity/key/claim mapping, time and size rules,
+normalization, freshness class, and compiled verifier behavior. The verifier
+fingerprint is an input, not a third identity. `transport_contract_id` covers
+the client-attached field, parsing, attachment, context preservation, and
+no-fallback semantics; a companion transport may define its own canonical
+contract under that same identity slot. A semantic change changes exactly its
+owning ID. [FI-TRACE-CONTRACT-IDENTITIES]
+
+Mutable contents and deployment state are not contract identities. They remain
+in `revalidation_dependencies`: authenticated assertion-snapshot version,
+verification-key identity, key-snapshot hard deadline, optional status
+source/version/deadline, binding/lifecycle/local-policy/resource versions,
+proof and replay witnesses, and a confidential handle to the exact compact JWS.
+Adding, removing, or replacing an accepted key changes the snapshot version,
+not `assertion_policy_id`. Changed dependencies require revalidation under
+current state; a retained key may continue, while an absent key denies.
+Unknown-key refresh is bounded and coalesced and has no attacker-triggered
+stale-key fallback. [FI-TRACE-JWKS-ADD] [FI-TRACE-JWKS-REMOVE]
+
+The base contract compares the current authenticated snapshot and makes no
+anti-rollback promise. A deployment claiming rollback prevention records a
+separately authenticated monotonic floor and tests it. [deployment artifact:
+assertion-policy review]
+
+### Freshness class
+
+Each policy declares exactly one server-owned freshness class, included in
+`assertion_policy_id`:
+
+- **`offline-jwt`** validates the JWT and authenticated key snapshot only.
+  `upstream_authority_deadline` is the minimum of `exp`,
+  `iat + maximum_assertion_age`, and the key-snapshot hard deadline. Token age
+  bounds assertions minted before revocation; it cannot bound an issuer that
+  continues minting accepted assertions afterward. Enabling this class therefore
+  requires deployment evidence that revocation stops new accepted issuance, and
+  discovery reports the unconditional residual bound as unknown (`null`). It
+  MUST NOT advertise a finite unconditional residual bound. [deployment
+  artifact: issuer revocation review]
+- **`current-status`** additionally requires an authenticated witness
+  `(iss, sub, token_or_session_id?, active=true, observed_at, valid_until,
+  status_version, authenticated_source_id)`. Issuer, subject, and optional
+  session identifier exactly match the assertion. Ambiguous, unauthenticated,
+  inactive, or expired status denies. `valid_until` is finite and no later than
+  `observed_at + maximum_status_age`. The upstream deadline is the minimum of
+  the offline assertion deadlines and `valid_until`. Source outage cannot mint
+  or extend a witness; an already verified witness remains usable only until
+  its existing `valid_until`. [FI-TRACE-CURRENT-STATUS-STALE]
+
+A current-status deployment advertises a tested positive
+`maximum_residual_upstream_revocation_seconds`. Prepared evidence and leases
+close within that value after upstream revocation, including a revocation racing
+final admission. Poll/cache age, event-delivery and processing delay, and
+enforcement delay all fit within the advertised value. A push implementation
+may close authority sooner but cannot claim a value below its tested worst case.
+[FI-TRACE-CURRENT-STATUS-REVOKED]
+
+An external capability projection whose removal is required to close authority
+within a declared revocation bound MUST enter authoritative local-policy state,
+not `claims_or_capabilities` from the assertion. That state is reread during
+preparation, final admission, and protected lease use. A deployment that carries
+such a projection only in assertions cannot claim a revocation bound for its
+changes. [FI-TRACE-CAPABILITY-REVOCATION]
+
+Before enabling an issuer, the operator records authoritative evidence that
+`sub` is stable for the account lifetime, never reassigned, and not intentionally
+derived from mutable profile data. An issuer that cannot provide this property
+is ineligible. [deployment artifact: issuer subject-stability review]
+
+## Nostr proof and body semantics
+
+The actor is always returned by fresh Nostr-proof validation, never by an
+assertion or unsigned field. NIP-42 binds its AUTH event to the current
+challenge, relay URL, connection, and freshness window. NIP-98 binds its event
+to the exact server-resolved URL, method, and freshness window. All evidence
+agrees with the same `D` and `R_t`. [FI-TRACE-DOMAIN-SPOOF]
+
+Each protected HTTP operation declares in server policy whether its body is
+authorization-relevant; clients cannot select the declaration.
+
+For a relevant body, the NIP-98 event contains exactly one `payload` tag equal
+to lowercase hexadecimal SHA-256 of the **body bytes**: the complete content
+after transfer decoding and before any content decoding. Absence, duplication,
+mismatch, validation of only a prefix, or substitution of the body bytes after
+validation denies. For an irrelevant body, no
+authorization decision, target, capability, or effect selector derives from a
+body field not bound by NIP-98. A `payload` tag present on an operation whose
+body is declared authorization-irrelevant is validated identically against the
+body bytes; duplication or mismatch denies. [FI-TRACE-BODY-BINDING]
+
+Every operation has finite body and spool bounds. A known oversized body is
+rejected before hashing; a stream is rejected at octet `limit + 1`; admission
+waits for EOF. Before EOF there is no application effect, replay mutation,
+receipt, or partial digest authority. Quota failure cleans up staged bytes and
+denies. [FI-TRACE-BODY-BOUNDS]
+
+## Direct preparation
+
+The following is normative pseudocode; every read is from authoritative state.
+
+```text
+PrepareDirect(request, assertion, proof):
+  (D, R_t, operation, resource) := ResolveTargetContext(request) or DENY
+  e := ValidateClientAttached(assertion, D, R_t) or DENY
+  k := ValidateNostrProof(proof, D, R_t) or DENY
+  R := SealActor(R_t, k)
+  i := e.identity
+
+  if e.asserted_key exists and e.asserted_key != k: DENY(key_mismatch)
+  atomically read B_D(i), B_D(k), T_D(i,k), Y_D(k), enrollment policy,
+                      local policy, resource, and all dependency versions
+  if k in Y_D: DENY(key_revoked)
+  if (i,k) in T_D: DENY(pair_retired)
+
+  if B_D(i) = B_D(k) = binding(i,k):
+      proposal := existing(binding.version, binding.provenance)
+  else if B_D(i) exists or B_D(k) exists:
+      DENY(binding_conflict)
+  else if enrollment policy = attested-key:
+      if e.asserted_key != k: DENY(attestation_required)
+      proposal := enroll(i, k, attested-key)
+  else if enrollment policy = tofu:
+      proposal := enroll(i, k, e.asserted_key = k ? attested-key : tofu)
+  else:
+      DENY(binding_required)
+
+  EvaluateLocalPolicy(D, R, operation, resource, k,
+                      e.claims_or_capabilities) or DENY
+  return PreparedAuthorization(evidence, proposal, witnesses, deadlines)
+```
+
+TOFU is optional private deployment posture and is not self-advertised. It
+accepts that a stolen assertion for a never-enrolled identity can bind an
+attacker's proven key; deployments enabling it retain a passing
+FI-TRACE-TOFU-THEFT artifact. Binding provenance is immutable. A policy change
+affects only future creation. [deployment artifact: TOFU risk review]
+
+Preparation, including first-use enrollment, is read-only and produces no
+authoritative mutation. [FI-TRACE-FINAL-DENIAL-NO-MUTATION]
+
+## Final admission
+
+A prepared value is consumed at most once. Final admission first requires an
+exact domain, context, operation, resource, actor, and transport match; both
+contract IDs unchanged; and every bound live. A changed dependency is reread
+and re-evaluated from authoritative evidence. [FI-TRACE-PREPARED-STALE]
+
+Two verified assertion results are **equivalent** when:
+
+1. identity-class fields are byte-equal: `iss`, `sub`, asserted-key presence and
+   value, canonical claims/capabilities, `assertion_policy_id`, and
+   `transport_contract_id`;
+2. each bounds-class deadline — every `authority_deadlines` member, the
+   key-snapshot hard deadline, and any status deadline — is live now and is no
+   later than its prepared value; and
+3. provenance-class fields — snapshot version, verification-key identity,
+   status source and version, binding, lifecycle, local-policy, and resource
+   versions, proof and replay witnesses, the confidential JWS handle, cache
+   metadata, ordering, and retrieval time — are ignored after successful
+   current revalidation.
+
+Every `revalidation_dependencies` member is bounds-class if it is a deadline
+and provenance-class otherwise. Any new or unclassified assertion-content field
+belongs to the identity class. A fresher assertion cannot silently extend a
+prepared decision. [FI-TRACE-PREPARED-STALE]
+
+Final admission atomically rereads binding, tombstone, revocation, enrollment,
+policy, resource, status, replay, receipt, and invalidation witnesses;
+recomputes the complete decision; claims applicable proof replay identities;
+creates an eligible proposed binding; and appends its request-bound receipt and
+required authorization evidence. All commit or none. A concurrent identical
+enrollment may recompute as the same `existing` binding; conflicting enrollment
+commits at most one winner. [FI-TRACE-CONCURRENT-ENROLLMENT]
+
+A failed admission rolls back all authority mutation. The application operation
+runs only after committed authorization. If it cannot share the transaction, a
+request-bound idempotent receipt prevents the same proof from creating a second
+effect. [FI-TRACE-FINAL-DENIAL-NO-MUTATION]
+
+## Base lifecycle
+
+Retirement, revocation, and rotation require separate privileged authority
+bound to the exact domain, transition, identity, old binding version when
+present, target key when present, and request. Each atomically rechecks current
+state, appends immutable lifecycle history, and invalidates dependent leases
+after commit. Every new target key supplies fresh target-bound Nostr proof and
+any policy-required current matching issuer attestation. [FI-TRACE-LIFECYCLE-AUTHORITY]
+
+- **RetirePair** removes one exact active binding and durably retires its pair.
+- **RevokeKey** records the key as revoked even if inactive; if active, it also
+  removes the binding and retires that pair. Repeating the same authorized
+  revocation is idempotent.
+- **Rotate** replaces one exact active binding with one unused, unrevoked,
+  non-retired target key, retires the old pair, and creates a fresh binding
+  version. The replacement provenance is `attested-key` when current matching
+  issuer attestation was validated and `provisioned` otherwise. Rotation does
+  not globally revoke the old key. Rotation continues one grant onto a new key
+  rather than establishing a new one: the replacement preserves every
+  profile-defined administrative bound carried by the binding it replaces, as an
+  opaque field core neither interprets nor clears. Only the authority that set
+  such a bound can change it. [FI-TRACE-LIFECYCLE-AUTHORITY]
+
+Failure or stale state causes no partial mutation. Ordinary authorization cannot
+perform or undo these transitions. Extended disablement, re-enablement,
+provisioning, and administrative expiry are defined only by NIP-FI-LIFECYCLE.
+
+## Request and session bounds
+
+HTTP authority covers one exact request and is never reusable.
+
+A WebSocket lease is scoped to one actor, domain, operation set, binding
+version, normalized result, policy/resource versions, and invalidation
+witnesses. Its deadline is the earliest assertion, upstream-authority,
+key-snapshot, proof/connection, local-policy, and implementation deadline.
+Arithmetic is overflow-safe and equality is expired. [FI-TRACE-LEASE-BOUND]
+
+Before each protected use, the service checks actor, domain, operation,
+resource, deadline, binding version, contract IDs, snapshot/status versions,
+policy versions, and invalidation state. Changed dependencies require current
+revalidation to an equivalent result; unreadable or ineligible state denies.
+A lease for one key never authorizes another key on the same connection.
+[FI-TRACE-MULTI-KEY-SESSION]
+
+Expiry ends the lease, not the binding. Renewal requires a new connection with
+a fresh assertion attached to its WebSocket upgrade, fresh Nostr proof,
+preparation, and final admission; there is no in-band renewal path. Confidential
+assertion revalidation material is destroyed on expiry, close, or invalidation.
+
+## Rejection and privacy
+
+Public class is a function only of evidence the requester supplied, never of
+private per-principal server state; `authorization_unavailable` is the sole
+exception and reveals only that a required authoritative dependency is
+unreadable, never any per-principal fact. Replay status is a function of
+committed per-principal server state, not of the supplied evidence alone;
+replayed evidence is therefore classed `authorization_denied`, indistinguishable
+from any other private-state denial, so that resubmitting captured evidence
+reveals nothing about whether the original request committed. Under the
+private-posture rule, even `key_mismatch` joins the private-state anonymity set.
+
+| Private condition | Public class | Nostr prefix and exact text | HTTP response |
+|---|---|---|---|
+| assertion/proof absent | `missing_evidence` | `auth-required: authentication required` | `401`; `WWW-Authenticate: Nostr`; `Content-Type: text/plain; charset=utf-8`; `authentication required\n` |
+| malformed, invalid, or expired evidence | `evidence_rejected` | `restricted: evidence rejected` | `403`; `Content-Type: text/plain; charset=utf-8`; `evidence rejected\n` |
+| replayed evidence; key mismatch; attestation required; binding conflict; retired pair; revoked key; lifecycle gate; binding required/expired; local policy denial | `authorization_denied` | `restricted: authorization denied` | `403`; `Content-Type: text/plain; charset=utf-8`; `authorization denied\n` |
+| required current dependency unreadable | `authorization_unavailable` | `restricted: authorization unavailable` | `503`; `Content-Type: text/plain; charset=utf-8`; `authorization unavailable\n` |
+
+Nostr text is the exact UTF-8 text after an applicable NIP-42/NIP-01 prefix.
+A denial decided on a WebSocket upgrade request, before any NIP-42 proof
+exists, is the HTTP response in the table, sent instead of `101`; a denial
+decided after the connection is established is the Nostr text. For HTTP, the
+compared denial contract is closed over the
+status, complete body,
+and exact values of only the header fields named in the table; header order and
+other fields are outside that contract and their values cannot depend on the
+private condition. The body is the shown UTF-8 bytes with one LF and no other
+bytes. The `Nostr` challenge satisfies RFC 9110 Section 15.5.2.
+Responses contain no free text, reason code, request ID, issuer, subject, key,
+claim, binding state, enrollment posture, token material, or timing hint. All
+private conditions in `authorization_denied` produce byte-identical responses.
+[FI-TRACE-DENIAL-ORACLE]
+
+NIP-FI defines no public identity projection. Public events, tags, filters,
+discovery, responses, logs, metrics, and traces contain no raw assertions or
+unredacted `iss`, `sub`, email, display name, or private claim. Access-controlled
+authoritative stores retain only what enforcement and investigation require.
+A separate presentation protocol cannot confer NIP-FI authority.
+[FI-TRACE-PRIVACY-NONPUBLIC]
+
+## Discovery
+
+A relay SHOULD advertise core support in NIP-11 as:
+
+```json
+{
+  "limitation": { "federated_identity": true },
+  "federated_identity": {
+    "core": "client-attached",
+    "assertion_freshness": {
+      "class": "offline-jwt",
+      "maximum_residual_upstream_revocation_seconds": null
+    }
+  }
+}
+```
+
+NIP-FI-EDGE owns the optional `edge_transports` member and its exact type,
+placement, and value semantics. For `current-status`, the final value is a tested
+positive integer. Discovery never states enrollment mode or TOFU posture and
+never exposes issuer URLs, audiences, claim names, tenant IDs, or
+deployment-local identifiers. For a fixed
+set of claimed profiles, the complete public discovery output is byte-identical
+for every enrollment policy, including `attested-key`, private `tofu`, and any
+companion profile mode: no field, flag, value, omission, ordering, or object shape
+may distinguish the configured mode. Profile documents own only non-enrollment
+public claims.
+[FI-TRACE-DISCOVERY-PRIVATE]
+
+## Worked example (non-normative)
+
+A protected HTTP POST under `client-attached` with NIP-98 proof and an
+authorization-relevant body. Credentials are elided; the NIP-FI-CONF exit
+fixture pins the complete request compared objects.
+
+```text
+POST /media HTTP/1.1
+Host: relay.example
+Nostr-Federated-Identity: Bearer eyJhbGciOiJFUzI1NiIsInR5cCI6ImF0K2p3dCIs...
+Authorization: Nostr eyJpZCI6IjE1ZTI3ZDc0Li4uIiwicHVia2V5IjoiOTljNzQ4Li4u...
+Content-Type: application/octet-stream
+Content-Length: 4
+
+abcd
+```
+
+The bearer JWS validates under the configured assertion policy: exact `iss`
+and `aud`, token class `at+jwt`, live time claims, and `nostr_pubkey` equal to
+the NIP-98 event's `pubkey`. The NIP-98 event binds the server-resolved method
+and URL, and its single `payload` tag equals the SHA-256 of the four body
+bytes. Admission then follows Direct preparation and Final admission; success
+returns the application response, and every failure class returns exactly the
+bytes fixed in the Rejection table. On a WebSocket upgrade the same header
+attaches to the upgrade request and NIP-42 supplies the proof after connect.
+
+## Core behavioral oracles
+
+A core claim covers every applicable oracle below at one implementation and
+policy revision. NIP-FI-CONF defines evidence and mutation-adequacy rules.
+
+| ID | Required outcome |
+|---|---|
+| `FI-TRACE-TRANSPORT-CLOSED` | Exact one-header input succeeds; missing, repeated, combined, malformed, mixed, URL, and fallback variants deny. |
+| `FI-TRACE-ASSERTION-VALIDATION` | Valid boundary input passes; each signature, key-selection, issuer, audience, time, size, ambiguity, and missing-configuration negative denies. |
+| `FI-TRACE-TOKEN-CLASS` | An `at+jwt` access token and a dedicated `nip-fi+jwt` assertion pass only their selected class. ID tokens, wrong/generic types outside a named compatibility policy, client-only audiences, absent or ambiguous `client_id`, resource-owner/client-subject ambiguity, and every attempted cross-class fallback deny. |
+| `FI-TRACE-CONTRACT-IDENTITIES` | Mutate each assertion semantic, transport semantic, and mutable dependency independently: semantic mutations change only their owning contract ID; snapshot/binding/lifecycle/policy/resource/status mutations change neither ID but force current revalidation. |
+| `FI-TRACE-VERIFIER-PARITY` | Equal authoritative input and policy produce the same canonical normalized result. |
+| `FI-TRACE-JWKS-ADD` | Retained-key rotation revalidates successfully under the changed snapshot version. |
+| `FI-TRACE-JWKS-REMOVE` | Evidence and leases under a removed key deny after snapshot change. |
+| `FI-TRACE-CURRENT-STATUS-REVOKED` | Revocation, including one racing final admission, closes authority within the advertised tested bound. |
+| `FI-TRACE-CURRENT-STATUS-STALE` | Inactive/ambiguous status denies; an issuer, subject, or session-identifier mismatch denies; expiry equality, outage, delayed events, and changed status versions cannot mint or extend a witness. |
+| `FI-TRACE-CAPABILITY-REVOCATION` | Removal of a revocation-bounded external capability projection from authoritative local policy closes prepared evidence and lease use within the declared bound; assertion-only projection cannot satisfy this oracle. |
+| `FI-TRACE-BODY-BINDING` | Exact complete relevant body passes; absent/duplicate/mutated/partial/substituted payload variants deny without effects; a payload tag on an irrelevant-body operation validates identically and denies on duplication or mismatch. |
+| `FI-TRACE-BODY-BOUNDS` | Oversized, over-quota, and pre-EOF variants deny with bounded work, cleanup, and no effects. |
+| `FI-TRACE-DOMAIN-SPOOF` | Client routing and forwarded authority cannot replace server-owned context. |
+| `FI-TRACE-ASSERTION-KEY-MISMATCH` | Mismatch denies with no mutation and the private-state response. |
+| `FI-TRACE-BINDING-CONFLICT` | A binding conflict denies without replacing either existing binding. |
+| `FI-TRACE-TOMBSTONE-REPLAY` | Fresh eligible evidence for a retired pair or revoked key denies without recreation. |
+| `FI-TRACE-ASSERTION-REFRESH` | Fresh evidence reuses the same eligible durable binding after prior assertion expiry. |
+| `FI-TRACE-PREPARED-STALE` | Changed identity-class witnesses or extended bounds deny; provenance-only rotation revalidates. |
+| `FI-TRACE-CONCURRENT-ENROLLMENT` | Identical first use converges; conflicting first use commits at most one winner. |
+| `FI-TRACE-FINAL-DENIAL-NO-MUTATION` | Every failed phase leaves all authoritative stores and effects unchanged. |
+| `FI-TRACE-LIFECYCLE-AUTHORITY` | Unprivileged/stale transitions deny; authorized retirement/revocation/rotation is atomic. |
+| `FI-TRACE-LEASE-BOUND` | A lease ends at its earliest bound; equality at any bound is expired. |
+| `FI-TRACE-MULTI-KEY-SESSION` | One actor's lease never authorizes another key on the same connection. |
+| `FI-TRACE-DENIAL-ORACLE` | Each private row produces its exact fixed bytes on every surface where its condition can be decided — HTTP, a WebSocket upgrade, or after connect; all private-state rows compare byte-identical. |
+| `FI-TRACE-DEPENDENCY-FAIL-CLOSED` | Each unreadable authoritative dependency denies. |
+| `FI-TRACE-AUTHORITY-UNIFORM` | Every protected ingress reaches one current final-admission authority. |
+| `FI-TRACE-CROSS-DOMAIN-COLLISION` | Equal subjects across issuers and equal pairs across domains remain distinct. |
+| `FI-TRACE-PRIVACY-NONPUBLIC` | Private identity does not enter public surfaces. |
+| `FI-TRACE-DISCOVERY-PRIVATE` | Complete discovery bytes remain identical across attested-key, TOFU, and companion enrollment modes. |
+| `FI-TRACE-TOFU-THEFT` | Stolen-assertion first use denies unless private TOFU is enabled and the attacker also proves its chosen key. |
+
+## Relationship to other work (non-normative)
+
+NIP-FI binds an access token to a key the resource server itself verifies, the
+goal DPoP (RFC 9449) and mTLS-bound tokens (RFC 8705) reach through a `cnf`
+claim. Here the proof is the NIP-42 or NIP-98 event the relay already
+validates, so no second proof is defined and the issuer need not attest the
+key; `nostr_pubkey` is the optional `cnf` analogue. Unlike those profiles the
+binding is durable server state rather than a per-token claim: a stolen
+assertion cannot reach an enrolled identity without its key, and revocation is
+a local fact rather than a token-lifetime race. One identity, one key per
+domain is stricter than WebAuthn's many-credentials-per-account model because
+the Nostr key is itself the public identity; additional devices do not create
+additional active bindings. Two contract identities plus explicit dependency
+versions exist because folding a mutable key snapshot into policy identity would make benign
+rotation change policy lineage, while omitting it would let evidence under a
+removed key survive. Denial responses deliberately collapse the conditions that
+RFC 6750 error codes distinguish. `trusted-proxy-hmac-v2` in NIP-FI-EDGE is a
+fixed-component request MAC in the family of HTTP Message Signatures (RFC 9421)
+and AWS SigV4, without negotiation and with length-prefixed canonicalization.
+
+## Security considerations
+
+Issuer compromise can impersonate a principal but cannot prove an uncompromised
+bound Nostr key. Assertion theft cannot use an existing binding without that
+key; private TOFU intentionally retains first-use theft risk. Snapshot
+revalidation limits removed-key reuse but the base policy accepts authenticated
+key-source rollback as residual issuer risk. Two-phase admission closes the
+binding and policy TOCTOU window only when every authoritative witness is reread
+atomically. Availability failures deny rather than degrade to Nostr-only access.
+
+## Sources
+
+- NIP-42 authentication: <https://github.com/nostr-protocol/nips/blob/6d2979b3f503a8539c983efbcdcf901bbcf9ed23/42.md>
+- NIP-98 HTTP authentication: <https://github.com/nostr-protocol/nips/blob/6d2979b3f503a8539c983efbcdcf901bbcf9ed23/98.md>
+- JWT BCP: <https://www.rfc-editor.org/rfc/rfc8725>
+- JWT access-token profile: <https://www.rfc-editor.org/rfc/rfc9068>
+- DPoP: <https://www.rfc-editor.org/rfc/rfc9449>
+- OAuth 2.0 mTLS client certificate-bound tokens: <https://www.rfc-editor.org/rfc/rfc8705>
+- HTTP Message Signatures: <https://www.rfc-editor.org/rfc/rfc9421>
+- Non-normative composed model: [NIP-FI-MODEL.md](NIP-FI-MODEL.md)

From 47526784d5c1967de6b2c5d1ee642bccfefbfab9 Mon Sep 17 00:00:00 2001
From: Brad Seiler <seiler@squareup.com>
Date: Fri, 21 Aug 2026 19:14:00 -0400
Subject: [PATCH 23/38] fix(deletion): allow IRSA S3 credentials (#6495)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Why
`buzz-admin deletions` runs inside bb-public relay pods, where S3
credentials are provided by the pod credential chain rather than static
`BUZZ_S3_ACCESS_KEY` / `BUZZ_S3_SECRET_KEY` values. The deletion CLI was
requiring those two env vars to be non-empty before constructing the
shared media storage client, so it could not reach the existing default
AWS credential chain.

## What
- Treat missing/blank deletion S3 access key and secret key as an empty
credential pair so `MediaStorage::new` can use `Credentials::default()`.
- Keep the existing static-credential path unchanged when both values
are non-empty.
- Keep deletion unit tests deterministic by covering only deletion env
normalization for missing/blank pair, trimmed static pair, and
partial/whitespace-partial outputs; shared media tests continue to own
credential-pair enforcement.

## Risk Assessment
Low and scoped to the operator-only community deletion CLI startup path.
The shared media storage credential validation still owns
static-vs-default credential selection and still rejects mixed partial
credentials.

## Testing
At committed head `0a86c2914b1f97caf4788a771048aa8d9d9d88ac` with a
clean worktree before and after (`git rev-parse HEAD` before/after
matched):
- `just fmt-check` — passed.
- `cargo test -p buzz-deletion` — passed: 12 passed, 9 ignored.
- `cargo test -p buzz-media` — passed: 120 passed;
`static_creds_round_trip_against_minio` remained ignored because it
requires live MinIO.
- `cargo test -p buzz-admin` — passed: 1 passed.
- `cargo clippy -p buzz-deletion --all-targets -- -D warnings` — passed.
- Startup smoke at the same head: built `buzz-admin`, then ran
`target/debug/buzz-admin deletions drain` with `BUZZ_S3_ACCESS_KEY=` and
`BUZZ_S3_SECRET_KEY=' '` plus `AWS_ACCESS_KEY_ID` /
`AWS_SECRET_ACCESS_KEY` fallback credentials; command exited `0`,
proving startup transitions past deletion S3 key validation and
exercises the shared default credential-chain branch using AWS env
fallback credentials.
- `git push origin HEAD:seiler/deletion-irsa-credentials` — passed;
pre-push hooks passed.

Not run: the full `TESTING.md` live-local relay workflow. Docker Desktop
currently refuses CLI access on this machine with `Sign in to continue
using Docker Desktop. Membership in the [squareup] organization is
required.`

## References
- Buzz channel:
`buzz://message?channel=9e4aabc6-414c-4978-aba7-b9f5228776de&id=177c5b8ad9e78a647f438ec7040d25f0c20a7c2b8678dd0e34768effe053f7f4`

Generated with Codex

---------

Signed-off-by: coder 0 <d97ebdbb198c7237c94f84ea8bb8a73583ea067407eebd0062abbb3962527fb1@buzz.block.builderlab.xyz>
Co-authored-by: coder 0 <d97ebdbb198c7237c94f84ea8bb8a73583ea067407eebd0062abbb3962527fb1@buzz.block.builderlab.xyz>
---
 crates/buzz-deletion/src/lib.rs | 98 ++++++++++++++++++++++++++++++---
 1 file changed, 89 insertions(+), 9 deletions(-)

diff --git a/crates/buzz-deletion/src/lib.rs b/crates/buzz-deletion/src/lib.rs
index 4e27b85fe9..ae3dbe4f39 100644
--- a/crates/buzz-deletion/src/lib.rs
+++ b/crates/buzz-deletion/src/lib.rs
@@ -547,23 +547,17 @@ fn nonempty_s3_region(region: String) -> Option<String> {
     (!region.is_empty()).then(|| region.to_string())
 }
 
-fn s3_region_from_env() -> String {
-    resolve_s3_region(
-        std::env::var("BUZZ_S3_REGION").ok(),
-        std::env::var("AWS_REGION").ok(),
-    )
-}
-
 async fn connect_services() -> Result<Services> {
     let store = connect_store().await?;
     connect_services_with_store(store).await
 }
 
 async fn connect_services_with_store(store: DeletionStore) -> Result<Services> {
+    let (s3_access_key, s3_secret_key) = s3_key_pair_from_env();
     let media_config = buzz_media::MediaConfig {
         s3_endpoint: required_env("BUZZ_S3_ENDPOINT")?,
-        s3_access_key: required_env("BUZZ_S3_ACCESS_KEY")?,
-        s3_secret_key: required_env("BUZZ_S3_SECRET_KEY")?,
+        s3_access_key,
+        s3_secret_key,
         s3_bucket: required_env("BUZZ_S3_BUCKET")?,
         s3_region: s3_region_from_env(),
         s3_addressing_style: std::env::var("BUZZ_S3_ADDRESSING_STYLE")
@@ -596,6 +590,24 @@ async fn connect_services_with_store(store: DeletionStore) -> Result<Services> {
     })
 }
 
+fn s3_region_from_env() -> String {
+    resolve_s3_region(
+        std::env::var("BUZZ_S3_REGION").ok(),
+        std::env::var("AWS_REGION").ok(),
+    )
+}
+
+fn s3_key_pair_from_env() -> (String, String) {
+    s3_key_pair_from(|name| std::env::var(name).ok())
+}
+
+fn s3_key_pair_from(get_env: impl Fn(&str) -> Option<String>) -> (String, String) {
+    (
+        optional_env_from(&get_env, "BUZZ_S3_ACCESS_KEY"),
+        optional_env_from(&get_env, "BUZZ_S3_SECRET_KEY"),
+    )
+}
+
 fn required_env(name: &str) -> Result<String> {
     std::env::var(name)
         .ok()
@@ -604,6 +616,12 @@ fn required_env(name: &str) -> Result<String> {
         .ok_or_else(|| anyhow::anyhow!("{name} is required for community deletion"))
 }
 
+fn optional_env_from(get_env: impl Fn(&str) -> Option<String>, name: &str) -> String {
+    get_env(name)
+        .map(|value| value.trim().to_owned())
+        .unwrap_or_default()
+}
+
 fn env_parse<T>(name: &str, default: T) -> T
 where
     T: std::str::FromStr,
@@ -1543,6 +1561,68 @@ mod tests {
         (db, services, claim)
     }
 
+    fn env_of<'a>(set: &'a [(&'a str, &'a str)]) -> impl Fn(&str) -> Option<String> + use<'a> {
+        move |name| {
+            set.iter()
+                .find(|(key, _)| *key == name)
+                .map(|(_, value)| (*value).to_string())
+        }
+    }
+
+    #[test]
+    fn deletion_s3_key_pair_normalizes_missing_and_blank_pairs_for_default_credentials() {
+        assert_eq!(
+            s3_key_pair_from(env_of(&[])),
+            (String::new(), String::new())
+        );
+
+        assert_eq!(
+            s3_key_pair_from(env_of(&[
+                ("BUZZ_S3_ACCESS_KEY", ""),
+                ("BUZZ_S3_SECRET_KEY", "   "),
+            ])),
+            (String::new(), String::new())
+        );
+    }
+
+    #[test]
+    fn deletion_s3_key_pair_trims_static_and_preserves_partial_pairs() {
+        assert_eq!(
+            s3_key_pair_from(env_of(&[
+                ("BUZZ_S3_ACCESS_KEY", " buzz_dev "),
+                ("BUZZ_S3_SECRET_KEY", " buzz_dev_secret "),
+            ])),
+            ("buzz_dev".to_string(), "buzz_dev_secret".to_string())
+        );
+
+        for (env, expected) in [
+            (
+                &[("BUZZ_S3_ACCESS_KEY", " buzz_dev ")][..],
+                ("buzz_dev".to_string(), String::new()),
+            ),
+            (
+                &[("BUZZ_S3_SECRET_KEY", " buzz_dev_secret ")][..],
+                (String::new(), "buzz_dev_secret".to_string()),
+            ),
+            (
+                &[
+                    ("BUZZ_S3_ACCESS_KEY", " buzz_dev "),
+                    ("BUZZ_S3_SECRET_KEY", "   "),
+                ][..],
+                ("buzz_dev".to_string(), String::new()),
+            ),
+            (
+                &[
+                    ("BUZZ_S3_ACCESS_KEY", "   "),
+                    ("BUZZ_S3_SECRET_KEY", " buzz_dev_secret "),
+                ][..],
+                (String::new(), "buzz_dev_secret".to_string()),
+            ),
+        ] {
+            assert_eq!(s3_key_pair_from(env_of(env)), expected);
+        }
+    }
+
     fn deletion_test_media_storage() -> Arc<MediaStorage> {
         let endpoint = std::env::var("BUZZ_TEST_S3_ENDPOINT")
             .or_else(|_| std::env::var("BUZZ_S3_ENDPOINT"))

From b0466ac465336cb773fbf7355ec05f7d61f4a3aa Mon Sep 17 00:00:00 2001
From: Max Lampert <maxwell@squareup.com>
Date: Fri, 21 Aug 2026 16:40:20 -0700
Subject: [PATCH 24/38] perf(desktop): keep the member roster off the
 channel-switch path (#6456)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Switching channels triggered a full-roster fetch (kind:39002 plus a
kind:0 profile batch with every member pubkey as an author) in the
common case, and several render paths walked the full roster per render.
None of this scales past a few hundred members; the product target is
10k+.

- **Members query staleTime 30s → 5min.** Every membership change the
client can observe already invalidates the key explicitly: live
join/leave system messages for the active channel, member-added/removed
notifications for the current identity, and all membership mutations —
including previously-uncovered direct write paths (moderation kick,
agent-deletion cleanup), which now invalidate through a shared helper.
The 30s window bought correctness we already had and charged a roster
fetch per switch.
- **ChannelMembersBar no longer mounts the roster query for non-DM
channels** — the count renders from the channel summary, and the
private-channel huddle gate accepts `channel.isMember` (derived from the
same kind:39002 event as the roster's self entry).
- **Roster-derived lookups are cached on roster identity**
(`rosterDerivations.ts`): role map, agent-member subset, member/bot
pubkey sets. These were rebuilt O(members) on every live message /
profile re-key. React Query's structural sharing keeps the roster
identity stable, so each derivation computes once per distinct roster.
- **Backend: the kind:0 profile join in `get_channel_members` is capped
at the first 500 members** (roster order). Members past the cap keep
`display_name: None` (UI falls back to pubkey labels and profile
caches); `role=="bot"` agent flags are roster-derived and unaffected.
Full roster pagination is the structural follow-up.
- **Composer keystroke path**: `useCanAddChannelMembers` re-scanned
channels + roster per keystroke; now memoized on data identities,
sharing the cached pubkey set.

### Measured / estimated impact

| metric | before | after |
|---|---|---|
| roster fetches while switching (live trace) | nearly every switch | ≤1
per channel per 5 min |
| roster fetch cost on the wire (live, 51-member channel) | 273ms per
fetch | amortized away |
| kind:0 `authors` filter size at 10k members | ~670KB per request (~67
B/pubkey) | capped at 500 authors (~34KB) |
| warm-switch longtask at 10k members (mock harness, 4× throttle) |
364ms | 318ms |
| per-render roster walks (role map, agent sets) at 10k members |
O(members) per live message | once per distinct roster |

Deferred deliberately: protocol-level roster pagination and removing
`memberPubkeys` from channel summaries (needs relay support).

---------

Signed-off-by: Max Lampert <maxwell@squareup.com>
---
 desktop/src-tauri/src/commands/channels.rs    | 23 ++++-
 .../src-tauri/src/commands/channels_tests.rs  | 23 +++++
 .../src/features/agents/knownAgentPubkeys.ts  | 10 +-
 .../agents/ui/useManagedAgentActions.ts       |  6 ++
 desktop/src/features/channels/hooks.test.mjs  | 19 ++++
 desktop/src/features/channels/hooks.ts        | 35 +------
 .../channels/lib/huddleAvailability.test.mjs  | 19 +++-
 .../channels/lib/huddleAvailability.ts        |  7 +-
 .../src/features/channels/rosterFreshness.ts  | 45 +++++++++
 .../channels/ui/ChannelMembersBar.tsx         |  9 +-
 .../channels/ui/useChannelActivityTyping.ts   | 10 +-
 .../channels/ui/useChannelAgentSessions.ts    | 15 +--
 .../channels/useCanAddChannelMembers.ts       | 44 +++++++++
 .../messages/lib/formatTimelineMessages.ts    | 12 +--
 .../src/features/messages/lib/useMentions.ts  |  6 +-
 .../messages/ui/useMentionSendFlow.ts         |  6 +-
 .../profile/ui/UserProfilePanelDeletion.ts    |  9 +-
 .../settings/ui/ModerationQueueCard.tsx       | 10 ++
 .../src/shared/lib/rosterDerivations.test.mjs | 66 +++++++++++++
 desktop/src/shared/lib/rosterDerivations.ts   | 96 +++++++++++++++++++
 20 files changed, 406 insertions(+), 64 deletions(-)
 create mode 100644 desktop/src/features/channels/rosterFreshness.ts
 create mode 100644 desktop/src/features/channels/useCanAddChannelMembers.ts
 create mode 100644 desktop/src/shared/lib/rosterDerivations.test.mjs
 create mode 100644 desktop/src/shared/lib/rosterDerivations.ts

diff --git a/desktop/src-tauri/src/commands/channels.rs b/desktop/src-tauri/src/commands/channels.rs
index abf40c028f..e0c6e3bc5b 100644
--- a/desktop/src-tauri/src/commands/channels.rs
+++ b/desktop/src-tauri/src/commands/channels.rs
@@ -121,6 +121,24 @@ pub async fn get_channel_details(
         .ok_or_else(|| "channel not found".to_string())
 }
 
+/// Cap for the kind:0 profile join in `get_channel_members`. Enriching a
+/// huge roster required an `authors` filter carrying every member pubkey — a
+/// query whose size and relay cost grow linearly with membership and which
+/// dominated channel-open latency on large channels. Members past the cap
+/// keep `display_name: None` (the UI falls back to pubkey-derived labels and
+/// resolves visible names through its profile caches); `role == "bot"` agent
+/// flags are roster-derived and unaffected by the cap.
+const MEMBER_PROFILE_JOIN_LIMIT: usize = 500;
+
+/// The pubkeys eligible for the kind:0 profile join: roster order, capped.
+fn profile_join_pubkeys(members: &[crate::models::ChannelMemberInfo], limit: usize) -> Vec<String> {
+    members
+        .iter()
+        .take(limit)
+        .map(|member| member.pubkey.clone())
+        .collect()
+}
+
 #[tauri::command]
 pub async fn get_channel_members(
     channel_id: String,
@@ -142,8 +160,9 @@ pub async fn get_channel_members(
         .transpose()?
         .ok_or_else(|| "channel members not found".to_string())?;
 
-    // Batch-fetch kind:0 profiles to populate display names.
-    let pubkeys: Vec<String> = response.members.iter().map(|m| m.pubkey.clone()).collect();
+    // Batch-fetch kind:0 profiles to populate display names, capped so the
+    // query cost is bounded on large rosters (see MEMBER_PROFILE_JOIN_LIMIT).
+    let pubkeys = profile_join_pubkeys(&response.members, MEMBER_PROFILE_JOIN_LIMIT);
     if !pubkeys.is_empty() {
         let profile_events = query_relay(
             &state,
diff --git a/desktop/src-tauri/src/commands/channels_tests.rs b/desktop/src-tauri/src/commands/channels_tests.rs
index fb43bb7a70..91e636d5f2 100644
--- a/desktop/src-tauri/src/commands/channels_tests.rs
+++ b/desktop/src-tauri/src/commands/channels_tests.rs
@@ -490,3 +490,26 @@ fn last_message_filters_stay_within_relay_channel_cap() {
     );
     assert_eq!(batches.concat(), filters);
 }
+
+fn member(pubkey: &str) -> crate::models::ChannelMemberInfo {
+    crate::models::ChannelMemberInfo {
+        pubkey: pubkey.to_string(),
+        role: "member".to_string(),
+        is_agent: false,
+        joined_at: None,
+        display_name: None,
+    }
+}
+
+#[test]
+fn profile_join_pubkeys_caps_in_roster_order() {
+    let members = vec![member(PK_A), member(PK_B), member(PK_C)];
+
+    assert_eq!(
+        profile_join_pubkeys(&members, 2),
+        vec![PK_A.to_string(), PK_B.to_string()]
+    );
+    assert_eq!(profile_join_pubkeys(&members, 3).len(), 3);
+    assert_eq!(profile_join_pubkeys(&members, 10).len(), 3);
+    assert!(profile_join_pubkeys(&[], 10).is_empty());
+}
diff --git a/desktop/src/features/agents/knownAgentPubkeys.ts b/desktop/src/features/agents/knownAgentPubkeys.ts
index 70cbac68fd..37e0b8d6af 100644
--- a/desktop/src/features/agents/knownAgentPubkeys.ts
+++ b/desktop/src/features/agents/knownAgentPubkeys.ts
@@ -1,4 +1,5 @@
 import { normalizePubkey } from "@/shared/lib/pubkey";
+import { channelAgentMembers } from "@/shared/lib/rosterDerivations";
 
 /**
  * Pure merge behind `useKnownAgentPubkeys`: managed agents ∪ relay agents,
@@ -62,10 +63,11 @@ export function mergeChannelKnownAgentPubkeys(
   relayAgents: readonly { pubkey: string }[] | undefined,
 ): ReadonlySet<string> {
   const pubkeys = new Set(mergeKnownAgentPubkeys(managedAgents, relayAgents));
-  for (const member of channelMembers ?? []) {
-    if (member.role === "bot" || member.isAgent) {
-      pubkeys.add(normalizePubkey(member.pubkey));
-    }
+  // Identity-cached agent subset: avoids walking the full roster per call.
+  for (const member of channelMembers
+    ? channelAgentMembers(channelMembers)
+    : []) {
+    pubkeys.add(normalizePubkey(member.pubkey));
   }
   return pubkeys;
 }
diff --git a/desktop/src/features/agents/ui/useManagedAgentActions.ts b/desktop/src/features/agents/ui/useManagedAgentActions.ts
index 8270bea11f..0627ad6ac3 100644
--- a/desktop/src/features/agents/ui/useManagedAgentActions.ts
+++ b/desktop/src/features/agents/ui/useManagedAgentActions.ts
@@ -1,4 +1,5 @@
 import * as React from "react";
+import { useQueryClient } from "@tanstack/react-query";
 import { toast } from "sonner";
 
 import {
@@ -15,6 +16,7 @@ import {
 } from "@/features/agents/hooks";
 import { useGlobalAgentConfig } from "@/features/agents/useGlobalAgentConfig";
 import { useChannelsQuery } from "@/features/channels/hooks";
+import { invalidateChannelMembersRosters } from "@/features/channels/rosterFreshness";
 import { usePresenceQuery } from "@/features/presence/hooks";
 import type { AgentPersona, Channel, ManagedAgent } from "@/shared/api/types";
 import { removeChannelMember } from "@/shared/api/tauri";
@@ -34,6 +36,7 @@ import {
 } from "../lib/instanceInputForDefinition";
 
 export function useManagedAgentActions() {
+  const queryClient = useQueryClient();
   const { globalConfig } = useGlobalAgentConfig();
   const relayAgentsQuery = useRelayAgentsQuery();
   const managedAgentsQuery = useManagedAgentsQuery();
@@ -296,6 +299,9 @@ export function useManagedAgentActions() {
     await Promise.allSettled(
       channelIds.map((channelId) => removeChannelMember(channelId, pubkey)),
     );
+    // Direct writes bypass the member mutations' invalidation; without this,
+    // the deleted agent stays in cached rosters for the freshness window.
+    await invalidateChannelMembersRosters(queryClient, channelIds);
   }
 
   async function handleDelete(pubkey: string) {
diff --git a/desktop/src/features/channels/hooks.test.mjs b/desktop/src/features/channels/hooks.test.mjs
index 8efeed8536..7f4ee63656 100644
--- a/desktop/src/features/channels/hooks.test.mjs
+++ b/desktop/src/features/channels/hooks.test.mjs
@@ -353,3 +353,22 @@ test("reconcileRefreshedCachedChannel_preservesRefreshedDmRecency", () => {
     ownerPubkey,
   ]);
 });
+
+test("invalidateChannelMembersRosters dedupes and targets member keys", async () => {
+  const { invalidateChannelMembersRosters } = await import(
+    "./rosterFreshness.ts"
+  );
+  const invalidated = [];
+  const queryClient = {
+    invalidateQueries: async ({ queryKey }) => {
+      invalidated.push(queryKey);
+    },
+  };
+
+  await invalidateChannelMembersRosters(queryClient, ["ch-a", "ch-b", "ch-a"]);
+
+  assert.deepEqual(invalidated, [
+    ["channels", "ch-a", "members"],
+    ["channels", "ch-b", "members"],
+  ]);
+});
diff --git a/desktop/src/features/channels/hooks.ts b/desktop/src/features/channels/hooks.ts
index 9f612031f3..9069b052da 100644
--- a/desktop/src/features/channels/hooks.ts
+++ b/desktop/src/features/channels/hooks.ts
@@ -44,12 +44,15 @@ import { mergeConcurrentChannelRecency } from "@/features/channels/lib/channelRe
 import { useIdentityQuery } from "@/shared/api/hooks";
 import { useFocusedRefetchInterval } from "@/shared/lib/useDocumentVisible";
 import { useCommunities } from "@/features/communities/useCommunities";
-import { canAddChannelMembers } from "@/features/channels/lib/channelMemberAdmission";
 import {
   inspectChannelSnapshot,
   type ChannelSnapshot,
   writeChannelSnapshot,
 } from "@/features/channels/channelSnapshot";
+import {
+  CHANNEL_MEMBERS_STALE_TIME_MS,
+  channelMembersQueryKey,
+} from "@/features/channels/rosterFreshness";
 
 export const channelsQueryKey = ["channels"] as const;
 /** Keeps focused polling at the established one-minute cadence. */
@@ -69,8 +72,6 @@ export const channelsFocusRefetchPolicy = {
 const channelsSnapshotPairKey = ["channels", "_snapshot-pair"] as const;
 const channelDetailQueryKey = (channelId: string) =>
   ["channels", channelId, "detail"] as const;
-const channelMembersQueryKey = (channelId: string) =>
-  ["channels", channelId, "members"] as const;
 const channelTypeOrder = {
   stream: 0,
   forum: 1,
@@ -628,7 +629,7 @@ export function useChannelMembersQuery(
 
       return getChannelMembers(channelId);
     },
-    staleTime: 30_000,
+    staleTime: CHANNEL_MEMBERS_STALE_TIME_MS,
   });
 }
 
@@ -795,32 +796,6 @@ export function useDeleteChannelMutation(channelId: string | null) {
   });
 }
 
-/**
- * Whether the signed-in identity may add *another* identity to this channel,
- * per {@link canAddChannelMembers}. Both queries are the ones the channel UI
- * already holds, so this shares their cache rather than fetching again.
- */
-export function useCanAddChannelMembers(channelId: string | null) {
-  const channelsQuery = useChannelsQuery();
-  const membersQuery = useChannelMembersQuery(channelId);
-  const identityQuery = useIdentityQuery();
-
-  const channel =
-    channelsQuery.data?.find((candidate) => candidate.id === channelId) ?? null;
-  const selfPubkey = identityQuery.data?.pubkey ?? null;
-  const selfRole = selfPubkey
-    ? (membersQuery.data?.find(
-        (member) => member.pubkey.toLowerCase() === selfPubkey.toLowerCase(),
-      )?.role ?? null)
-    : null;
-
-  return canAddChannelMembers({
-    channelType: channel?.channelType,
-    visibility: channel?.visibility,
-    selfRole,
-  });
-}
-
 export function useAddChannelMembersMutation(channelId: string | null) {
   const queryClient = useQueryClient();
 
diff --git a/desktop/src/features/channels/lib/huddleAvailability.test.mjs b/desktop/src/features/channels/lib/huddleAvailability.test.mjs
index 061d2cdc42..8351651a75 100644
--- a/desktop/src/features/channels/lib/huddleAvailability.test.mjs
+++ b/desktop/src/features/channels/lib/huddleAvailability.test.mjs
@@ -87,11 +87,9 @@ test("canStartHuddleInChannel blocks non-participant DMs", () => {
 });
 
 test("canStartHuddleInChannel keeps private channels member-gated", () => {
-  const privateChannel = channel({ visibility: "private" });
-
   assert.equal(
     canStartHuddleInChannel({
-      channel: privateChannel,
+      channel: channel({ visibility: "private", isMember: false }),
       currentPubkey: SELF,
       selfMember: null,
     }),
@@ -100,7 +98,7 @@ test("canStartHuddleInChannel keeps private channels member-gated", () => {
 
   assert.equal(
     canStartHuddleInChannel({
-      channel: privateChannel,
+      channel: channel({ visibility: "private", isMember: false }),
       currentPubkey: SELF,
       selfMember: member(),
     }),
@@ -108,6 +106,19 @@ test("canStartHuddleInChannel keeps private channels member-gated", () => {
   );
 });
 
+test("canStartHuddleInChannel accepts channel-level membership without a roster", () => {
+  // The roster is fetched lazily; `channel.isMember` derives from the same
+  // kind:39002 event, so it must satisfy the private-channel gate on its own.
+  assert.equal(
+    canStartHuddleInChannel({
+      channel: channel({ visibility: "private", isMember: true }),
+      currentPubkey: SELF,
+      selfMember: null,
+    }),
+    true,
+  );
+});
+
 test("canStartHuddleInChannel blocks archived channels and DMs", () => {
   assert.equal(
     canStartHuddleInChannel({
diff --git a/desktop/src/features/channels/lib/huddleAvailability.ts b/desktop/src/features/channels/lib/huddleAvailability.ts
index 828712d9dd..15f5f57ab4 100644
--- a/desktop/src/features/channels/lib/huddleAvailability.ts
+++ b/desktop/src/features/channels/lib/huddleAvailability.ts
@@ -31,5 +31,10 @@ export function canStartHuddleInChannel({
     );
   }
 
-  return channel.visibility === "open" || selfMember !== null;
+  // `channel.isMember` and the roster's self entry derive from the same
+  // kind:39002 event; either satisfies the private-channel gate, so callers
+  // that no longer fetch the roster eagerly keep huddle access.
+  return (
+    channel.visibility === "open" || channel.isMember || selfMember !== null
+  );
 }
diff --git a/desktop/src/features/channels/rosterFreshness.ts b/desktop/src/features/channels/rosterFreshness.ts
new file mode 100644
index 0000000000..a0a3603165
--- /dev/null
+++ b/desktop/src/features/channels/rosterFreshness.ts
@@ -0,0 +1,45 @@
+/**
+ * Member-roster freshness policy and the invalidation helper for write paths
+ * that bypass the member mutations. Split from hooks.ts to keep that file
+ * under the per-file line cap; behavior unchanged.
+ */
+
+import type { useQueryClient } from "@tanstack/react-query";
+
+/** Single source for the members cache key; hooks.ts imports it from here. */
+export const channelMembersQueryKey = (channelId: string) =>
+  ["channels", channelId, "members"] as const;
+
+/**
+ * Freshness window for the full member roster. Kept long because every
+ * membership change the client can observe invalidates this key explicitly:
+ * live join/leave/removed system messages for the active channel
+ * (useChannelSubscription), member-added/removed notifications targeting the
+ * current identity (useMembershipNotifications), and every membership
+ * mutation (add/remove/join/leave, template apply). The residual staleness is
+ * a third party joining a channel the viewer is not currently subscribed to,
+ * which corrects within this window. The previous 30s window put a full
+ * roster fetch (kind:39002 + a kind:0 batch over every member) on nearly
+ * every channel switch.
+ */
+export const CHANNEL_MEMBERS_STALE_TIME_MS = 5 * 60_000;
+
+/**
+ * Invalidates cached rosters for channels whose membership was written
+ * through direct `removeChannelMember` calls that bypass the member
+ * mutations (moderation kick, agent-deletion cleanup). The roster's long
+ * freshness window (CHANNEL_MEMBERS_STALE_TIME_MS) means any direct write
+ * path that skips this leaves the removed identity visible until the window
+ * lapses. Accepts a minimal client shape so node unit tests can stub it.
+ */
+export async function invalidateChannelMembersRosters(
+  queryClient: Pick<ReturnType<typeof useQueryClient>, "invalidateQueries">,
+  channelIds: Iterable<string>,
+) {
+  const uniqueChannelIds = [...new Set(channelIds)];
+  for (const channelId of uniqueChannelIds) {
+    await queryClient.invalidateQueries({
+      queryKey: channelMembersQueryKey(channelId),
+    });
+  }
+}
diff --git a/desktop/src/features/channels/ui/ChannelMembersBar.tsx b/desktop/src/features/channels/ui/ChannelMembersBar.tsx
index 2debd9e7a9..a347cf41bb 100644
--- a/desktop/src/features/channels/ui/ChannelMembersBar.tsx
+++ b/desktop/src/features/channels/ui/ChannelMembersBar.tsx
@@ -65,7 +65,14 @@ export function ChannelMembersBar({
   );
   const { startHuddle, isStarting: isStartingHuddle } = useHuddle();
   const queryClient = useQueryClient();
-  const membersQuery = useChannelMembersQuery(channel.id);
+  // The roster is only needed for DM huddle composition (agent detection and
+  // participant naming). Streams/forums render the count from the channel
+  // summary and gate huddle access on `channel.isMember`, so mounting this
+  // bar must not put a full-roster fetch on the channel-switch path.
+  const membersQuery = useChannelMembersQuery(
+    channel.id,
+    channel.channelType === "dm",
+  );
   const providersQuery = useAvailableAcpRuntimes();
   const managedAgentsQuery = useManagedAgentsQuery();
   const relayAgentsQuery = useRelayAgentsQuery();
diff --git a/desktop/src/features/channels/ui/useChannelActivityTyping.ts b/desktop/src/features/channels/ui/useChannelActivityTyping.ts
index 0f6807c059..75a8974d00 100644
--- a/desktop/src/features/channels/ui/useChannelActivityTyping.ts
+++ b/desktop/src/features/channels/ui/useChannelActivityTyping.ts
@@ -10,6 +10,7 @@ import type {
   RelayAgent,
 } from "@/shared/api/types";
 import { normalizePubkey } from "@/shared/lib/pubkey";
+import { channelAgentMembers } from "@/shared/lib/rosterDerivations";
 import {
   buildChannelAgentSessionCandidates,
   getChannelAgentSessionAgents,
@@ -178,9 +179,12 @@ export function mergeMemberAgentFlagsIntoProfiles(
     | readonly Pick<ChannelMember, "pubkey" | "role" | "isAgent">[]
     | undefined,
 ): UserProfileLookup {
-  const agentMembers = (channelMembers ?? []).filter(
-    (member) => member.role === "bot" || member.isAgent,
-  );
+  if (!channelMembers) {
+    return profiles;
+  }
+  // Identity-cached: this merge re-runs whenever the profile lookup re-keys,
+  // and the filter walked the full roster (10k+ members) each time.
+  const agentMembers = channelAgentMembers(channelMembers);
   if (agentMembers.length === 0) {
     return profiles;
   }
diff --git a/desktop/src/features/channels/ui/useChannelAgentSessions.ts b/desktop/src/features/channels/ui/useChannelAgentSessions.ts
index 8420c37327..20c561e798 100644
--- a/desktop/src/features/channels/ui/useChannelAgentSessions.ts
+++ b/desktop/src/features/channels/ui/useChannelAgentSessions.ts
@@ -9,6 +9,10 @@ import type {
 } from "@/shared/api/types";
 import { usePanelReturnTarget } from "@/shared/hooks/usePanelReturnTarget";
 import { normalizePubkey, truncatePubkey } from "@/shared/lib/pubkey";
+import {
+  channelBotMemberPubkeySet,
+  channelMemberPubkeySet,
+} from "@/shared/lib/rosterDerivations";
 import {
   type AgentSessionReturnTarget,
   resolveAgentSessionReturnTarget,
@@ -121,15 +125,14 @@ export function getChannelAgentSessionAgents({
     return [];
   }
 
+  // Identity-cached: the memo recomputes whenever the active channel object
+  // churns (e.g. lastMessageAt updates), and these Sets walked the full
+  // roster each time.
   const memberPubkeys = channelMembers
-    ? new Set(channelMembers.map((member) => normalizePubkey(member.pubkey)))
+    ? channelMemberPubkeySet(channelMembers)
     : null;
   const botMemberPubkeys = channelMembers
-    ? new Set(
-        channelMembers
-          .filter((member) => member.role === "bot")
-          .map((member) => normalizePubkey(member.pubkey)),
-      )
+    ? channelBotMemberPubkeySet(channelMembers)
     : null;
 
   return agents.filter((agent) => {
diff --git a/desktop/src/features/channels/useCanAddChannelMembers.ts b/desktop/src/features/channels/useCanAddChannelMembers.ts
new file mode 100644
index 0000000000..1b1a61d4c1
--- /dev/null
+++ b/desktop/src/features/channels/useCanAddChannelMembers.ts
@@ -0,0 +1,44 @@
+import * as React from "react";
+
+import { canAddChannelMembers } from "@/features/channels/lib/channelMemberAdmission";
+import {
+  useChannelMembersQuery,
+  useChannelsQuery,
+} from "@/features/channels/hooks";
+import { useIdentityQuery } from "@/shared/api/hooks";
+
+// Split from hooks.ts to keep that file under the per-file line cap.
+
+/**
+ * Whether the signed-in identity may add *another* identity to this channel,
+ * per {@link canAddChannelMembers}. Both queries are the ones the channel UI
+ * already holds, so this shares their cache rather than fetching again.
+ */
+export function useCanAddChannelMembers(channelId: string | null) {
+  const channelsQuery = useChannelsQuery();
+  const membersQuery = useChannelMembersQuery(channelId);
+  const identityQuery = useIdentityQuery();
+
+  const channels = channelsQuery.data;
+  const members = membersQuery.data;
+  const selfPubkey = identityQuery.data?.pubkey ?? null;
+  // Memoized: this hook sits in the composer (useMentionSendFlow), which
+  // re-renders per keystroke, and these scans are O(channels) + O(members)
+  // — rosters can be 10k+. Structural sharing keeps the inputs' identities
+  // stable, so the scans run once per data change instead of per keystroke.
+  return React.useMemo(() => {
+    const channel =
+      channels?.find((candidate) => candidate.id === channelId) ?? null;
+    const selfRole = selfPubkey
+      ? (members?.find(
+          (member) => member.pubkey.toLowerCase() === selfPubkey.toLowerCase(),
+        )?.role ?? null)
+      : null;
+
+    return canAddChannelMembers({
+      channelType: channel?.channelType,
+      visibility: channel?.visibility,
+      selfRole,
+    });
+  }, [channelId, channels, members, selfPubkey]);
+}
diff --git a/desktop/src/features/messages/lib/formatTimelineMessages.ts b/desktop/src/features/messages/lib/formatTimelineMessages.ts
index ab35ecfcc4..a24da67f70 100644
--- a/desktop/src/features/messages/lib/formatTimelineMessages.ts
+++ b/desktop/src/features/messages/lib/formatTimelineMessages.ts
@@ -38,6 +38,9 @@ import {
 } from "@/shared/constants/kinds";
 import { resolveEventAuthorPubkey } from "@/shared/lib/authors";
 import { normalizePubkey } from "@/shared/lib/pubkey";
+import { channelRoleMap } from "@/shared/lib/rosterDerivations";
+
+const EMPTY_ROLE_MAP: ReadonlyMap<string, string> = new Map();
 import { formatTime } from "@/features/messages/lib/dateFormatters";
 // Pure overlay helper lives in a sibling .mjs so node:test (no TS loader)
 // can exercise the exact same source the renderer uses.
@@ -228,12 +231,9 @@ export function formatTimelineMessages(
   ownerProfiles?: UserProfileLookup,
 ): TimelineMessage[] {
   const currentPubkeyLower = currentPubkey?.toLowerCase();
-  const roleByPubkey = new Map<string, string>();
-  if (members) {
-    for (const member of members) {
-      roleByPubkey.set(member.pubkey.toLowerCase(), member.role);
-    }
-  }
+  // Identity-cached: rosters can be 10k+ members and this formatter re-runs
+  // on every live message; the map is computed once per distinct roster.
+  const roleByPubkey = members ? channelRoleMap(members) : EMPTY_ROLE_MAP;
   const deletedEventIds = new Set<string>();
   for (const event of events) {
     // Both kind:5 and kind:9005 are deletion markers; mirror the relay.
diff --git a/desktop/src/features/messages/lib/useMentions.ts b/desktop/src/features/messages/lib/useMentions.ts
index af60534606..f9b73548de 100644
--- a/desktop/src/features/messages/lib/useMentions.ts
+++ b/desktop/src/features/messages/lib/useMentions.ts
@@ -39,6 +39,7 @@ import type {
 import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import { detectPrefixQuery } from "@/shared/lib/detectPrefixQuery";
 import { normalizePubkey } from "@/shared/lib/pubkey";
+import { channelMemberPubkeySet } from "@/shared/lib/rosterDerivations";
 import { trimMapToSize } from "@/shared/lib/trimMapToSize";
 import { flushMentionDebounce } from "./flushMentionDebounce";
 import { useAgentMentionRevalidation } from "./agentMentionRevalidation";
@@ -225,9 +226,10 @@ export function useMentions(
     () => new Set(activePersonas.map((persona) => persona.id)),
     [activePersonas],
   );
+  // Identity-cached (shared with the timeline's roster derivations) — the
+  // Set is built once per distinct roster instead of per consumer.
   const memberPubkeys = React.useMemo(
-    () =>
-      new Set((members ?? []).map((member) => normalizePubkey(member.pubkey))),
+    () => (members ? channelMemberPubkeySet(members) : new Set<string>()),
     [members],
   );
   const agentIdentityPubkeys = React.useMemo(
diff --git a/desktop/src/features/messages/ui/useMentionSendFlow.ts b/desktop/src/features/messages/ui/useMentionSendFlow.ts
index e322f91987..508384d6b9 100644
--- a/desktop/src/features/messages/ui/useMentionSendFlow.ts
+++ b/desktop/src/features/messages/ui/useMentionSendFlow.ts
@@ -10,10 +10,8 @@ import {
   useStartManagedAgentMutation,
 } from "@/features/agents/hooks";
 import { resolvePersonaRuntime } from "@/features/agents/lib/resolvePersonaRuntime";
-import {
-  useAddChannelMembersMutation,
-  useCanAddChannelMembers,
-} from "@/features/channels/hooks";
+import { useAddChannelMembersMutation } from "@/features/channels/hooks";
+import { useCanAddChannelMembers } from "@/features/channels/useCanAddChannelMembers";
 import { PRIVATE_CHANNEL_ADD_DENIED_MESSAGE } from "@/features/channels/lib/channelMemberAdmission";
 import { dmThreadAgentMentionError } from "@/features/messages/lib/dmThreadAgentMentionError";
 import { filterEffectiveExplicitAgentPubkeys } from "@/features/messages/lib/effectiveExplicitAgentPubkeys";
diff --git a/desktop/src/features/profile/ui/UserProfilePanelDeletion.ts b/desktop/src/features/profile/ui/UserProfilePanelDeletion.ts
index e52864727f..c708bffe82 100644
--- a/desktop/src/features/profile/ui/UserProfilePanelDeletion.ts
+++ b/desktop/src/features/profile/ui/UserProfilePanelDeletion.ts
@@ -1,9 +1,11 @@
 import * as React from "react";
+import { useQueryClient } from "@tanstack/react-query";
 
 import {
   deleteManagedAgentWithRules,
   type ManagedAgentActionResult,
 } from "@/features/agents/lib/managedAgentControlActions";
+import { invalidateChannelMembersRosters } from "@/features/channels/rosterFreshness";
 import { removeChannelMember } from "@/shared/api/tauri";
 import type {
   AgentPersona,
@@ -46,6 +48,7 @@ export function useProfileAgentDeletion({
   presenceLookup,
   relayAgents,
 }: UseProfileAgentDeletionInput) {
+  const queryClient = useQueryClient();
   const removeAgentFromAllChannels = React.useCallback(
     async (agentPubkey: string) => {
       const normalizedPubkey = agentPubkey.toLowerCase();
@@ -67,8 +70,12 @@ export function useProfileAgentDeletion({
           removeChannelMember(channelId, agentPubkey),
         ),
       );
+      // Direct writes bypass the member mutations' invalidation; without
+      // this, the deleted agent stays in cached rosters for the freshness
+      // window.
+      await invalidateChannelMembersRosters(queryClient, channelIds);
     },
-    [channels, relayAgents],
+    [channels, queryClient, relayAgents],
   );
 
   const deleteManagedAgentRecord = React.useCallback(
diff --git a/desktop/src/features/settings/ui/ModerationQueueCard.tsx b/desktop/src/features/settings/ui/ModerationQueueCard.tsx
index de414bbf0d..58dbe87ab7 100644
--- a/desktop/src/features/settings/ui/ModerationQueueCard.tsx
+++ b/desktop/src/features/settings/ui/ModerationQueueCard.tsx
@@ -1,7 +1,10 @@
+import { useQueryClient } from "@tanstack/react-query";
 import { AlertTriangle, ChevronDown, ShieldAlert } from "lucide-react";
 import { useMemo } from "react";
 import { toast } from "sonner";
 
+import { invalidateChannelMembersRosters } from "@/features/channels/rosterFreshness";
+
 import {
   useModerationAuditQuery,
   useModerationReportsQuery,
@@ -365,6 +368,7 @@ function QueueGroupCard({
 }
 
 function QueueTab() {
+  const queryClient = useQueryClient();
   const reportsQuery = useModerationReportsQuery({ status: "open" });
   const auditQuery = useModerationAuditQuery();
   const resolveMutation = useResolveReportMutation();
@@ -408,6 +412,12 @@ function QueueTab() {
       // report open (retryable, no orphan decision row). Only after the paired
       // 9040/9005/9001 lands do we resolve every open report about this target.
       await enforceResolution(group, action, banMutation.mutateAsync);
+      if (action === "kick" && group.channelId != null) {
+        // The kick writes the roster directly (no member mutation); without
+        // this, the kicked identity stays in the cached roster for the
+        // freshness window.
+        await invalidateChannelMembersRosters(queryClient, [group.channelId]);
+      }
       await Promise.all(
         openReports.map((report) =>
           resolveMutation.mutateAsync({
diff --git a/desktop/src/shared/lib/rosterDerivations.test.mjs b/desktop/src/shared/lib/rosterDerivations.test.mjs
new file mode 100644
index 0000000000..07837ab36f
--- /dev/null
+++ b/desktop/src/shared/lib/rosterDerivations.test.mjs
@@ -0,0 +1,66 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  channelAgentMembers,
+  channelBotMemberPubkeySet,
+  channelMemberPubkeySet,
+  channelRoleMap,
+} from "./rosterDerivations.ts";
+
+const HUMAN = "A".repeat(64);
+const BOT_ROLE = "b".repeat(64);
+const FLAGGED_AGENT = "c".repeat(64);
+
+function roster() {
+  return [
+    { pubkey: HUMAN, role: "owner", isAgent: false },
+    { pubkey: BOT_ROLE, role: "bot", isAgent: false },
+    { pubkey: FLAGGED_AGENT, role: "member", isAgent: true },
+  ];
+}
+
+test("channelRoleMap lowercases pubkeys and maps roles", () => {
+  const map = channelRoleMap(roster());
+  assert.equal(map.get(HUMAN.toLowerCase()), "owner");
+  assert.equal(map.get(BOT_ROLE), "bot");
+  assert.equal(map.size, 3);
+});
+
+test("channelAgentMembers keeps bot-role and agent-flagged members", () => {
+  const agents = channelAgentMembers(roster());
+  assert.deepEqual(
+    agents.map((member) => member.pubkey),
+    [BOT_ROLE, FLAGGED_AGENT],
+  );
+});
+
+test("channelMemberPubkeySet normalizes; bot set is role-gated only", () => {
+  const members = roster();
+  assert.deepEqual(
+    [...channelMemberPubkeySet(members)],
+    [HUMAN.toLowerCase(), BOT_ROLE, FLAGGED_AGENT],
+  );
+  // role === "bot" only — an isAgent flag without the role stays out, matching
+  // the agent-session filter this set feeds.
+  assert.deepEqual([...channelBotMemberPubkeySet(members)], [BOT_ROLE]);
+});
+
+test("derivations are cached on roster identity", () => {
+  const members = roster();
+  assert.equal(channelRoleMap(members), channelRoleMap(members));
+  assert.equal(channelAgentMembers(members), channelAgentMembers(members));
+  assert.equal(
+    channelMemberPubkeySet(members),
+    channelMemberPubkeySet(members),
+  );
+  assert.equal(
+    channelBotMemberPubkeySet(members),
+    channelBotMemberPubkeySet(members),
+  );
+
+  // A new array — even with equal content — recomputes: the cache is keyed on
+  // identity, which React Query's structural sharing keeps stable for
+  // unchanged rosters.
+  assert.notEqual(channelRoleMap(members), channelRoleMap(roster()));
+});
diff --git a/desktop/src/shared/lib/rosterDerivations.ts b/desktop/src/shared/lib/rosterDerivations.ts
new file mode 100644
index 0000000000..c3bcb04959
--- /dev/null
+++ b/desktop/src/shared/lib/rosterDerivations.ts
@@ -0,0 +1,96 @@
+/**
+ * Roster-derived lookups cached on the roster array's identity.
+ *
+ * Channel rosters can be 10k+ members, and several render-path consumers
+ * (timeline role badges, agent-flag merges, agent-session filters) each
+ * derived their own Map/Set from the full roster on every recompute — every
+ * live message re-ran the O(members) passes. React Query's structural sharing
+ * keeps the roster array's identity stable across refetches that return
+ * identical data, so a WeakMap keyed on that identity computes each
+ * derivation once per distinct roster.
+ */
+
+import { normalizePubkey } from "@/shared/lib/pubkey";
+
+type RosterMember = {
+  pubkey: string;
+  role: string;
+  isAgent: boolean;
+};
+
+const roleMaps = new WeakMap<
+  readonly RosterMember[],
+  ReadonlyMap<string, string>
+>();
+
+/** Lowercased pubkey → channel role for the given roster. */
+export function channelRoleMap<T extends RosterMember>(
+  members: readonly T[],
+): ReadonlyMap<string, string> {
+  const cached = roleMaps.get(members);
+  if (cached) return cached;
+  const map = new Map<string, string>();
+  for (const member of members) {
+    map.set(member.pubkey.toLowerCase(), member.role);
+  }
+  roleMaps.set(members, map);
+  return map;
+}
+
+const agentMemberLists = new WeakMap<
+  readonly RosterMember[],
+  readonly RosterMember[]
+>();
+
+/** Members that are agents: role `bot` or an explicit `isAgent` flag. */
+export function channelAgentMembers<T extends RosterMember>(
+  members: readonly T[],
+): readonly T[] {
+  const cached = agentMemberLists.get(members);
+  if (cached) return cached as readonly T[];
+  const agents = members.filter(
+    (member) => member.role === "bot" || member.isAgent,
+  );
+  agentMemberLists.set(members, agents);
+  return agents;
+}
+
+const memberPubkeySets = new WeakMap<
+  readonly RosterMember[],
+  ReadonlySet<string>
+>();
+
+/** Normalized pubkeys of every roster member. */
+export function channelMemberPubkeySet(
+  members: readonly RosterMember[],
+): ReadonlySet<string> {
+  const cached = memberPubkeySets.get(members);
+  if (cached) return cached;
+  const set = new Set(members.map((member) => normalizePubkey(member.pubkey)));
+  memberPubkeySets.set(members, set);
+  return set;
+}
+
+const botMemberPubkeySets = new WeakMap<
+  readonly RosterMember[],
+  ReadonlySet<string>
+>();
+
+/**
+ * Normalized pubkeys of role-`bot` members only. Deliberately narrower than
+ * {@link channelAgentMembers}: the agent-session filter treats the membership
+ * role as authoritative and ignores profile-derived agent flags.
+ */
+export function channelBotMemberPubkeySet(
+  members: readonly RosterMember[],
+): ReadonlySet<string> {
+  const cached = botMemberPubkeySets.get(members);
+  if (cached) return cached;
+  const set = new Set(
+    members
+      .filter((member) => member.role === "bot")
+      .map((member) => normalizePubkey(member.pubkey)),
+  );
+  botMemberPubkeySets.set(members, set);
+  return set;
+}

From b85d680fb1e3cc7eef6d31d47598741b35836a2e Mon Sep 17 00:00:00 2001
From: Max Lampert <maxwell@squareup.com>
Date: Fri, 21 Aug 2026 16:40:35 -0700
Subject: [PATCH 25/38] perf(desktop): stop the Projects fan refetching on
 re-entry and running after leave (#6458)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Entering Projects fires a large fan: an exhaustive paginated relay
enumeration (projects/repos/tombstones), five 2,000-event work-item
queries plus assignment-operation scans, per-repo activity summaries,
and a local-repository filesystem scan. Measured on a large community
(101 issues / 258 PRs):

| query | measured cost |
|---|---|
| work-items (5 × 2,000-event REQs + assignment scans) | 3.5–3.9s |
| activity summaries | 4.1s |
| repository activity | 1.0–2.2s |
| local repository scan | 1.7s |

Two lifecycle bugs made the fan far more expensive than it needs to be:

- **Freshness windows guaranteed a full refetch on nearly every
re-entry** (60s enumeration, 30s work-items/activity, 10s local scan) —
i.e., the costs above were re-paid on almost every visit. Every local
write path already invalidates its keys explicitly (issue/PR mutations,
project creation, repo sync), so the short windows only served
remote-actor freshness. Raised to 5m/2m/2m with a 30m enumeration cache:
re-entries now paint from cache, and the fan re-runs at most every 2–5
minutes.
- **Leaving Projects left the whole fan running**, competing with the
next surface's channel fetches on the same relay connection. AbortSignal
is now threaded through the enumeration and assignment pagination loops
(optional params — behavior identical without a signal), and leaving the
surface cancels the work-items query. Deliberately NOT cancelled: the
enumeration (the always-mounted sidebar projects section observes it and
its 30m cache is valuable), repo snapshots and local scans (native work
that can't abort — cancelling would discard the finished result and
force the same clones again), and activity summaries (a single bounded
request).

Abort behavior is covered by red-first unit tests on both pagination
loops. Remaining follow-up (out of scope): the queries themselves want a
relay-side aggregate instead of shipping thousands of events to compute
counts client-side.

---------

Signed-off-by: Max Lampert <maxwell@squareup.com>
---
 .../assignmentOperationFetch.test.mjs         | 35 +++++++++++
 .../projects/assignmentOperationFetch.ts      |  9 ++-
 desktop/src/features/projects/hooks.ts        | 63 +++++++++++++++----
 .../projects/projectEnumeration.test.mjs      | 28 +++++++++
 .../features/projects/projectEnumeration.ts   |  8 +++
 .../src/features/projects/projectWorkItems.ts |  8 +++
 .../projects/repositoryActivityHooks.ts       |  3 +-
 .../features/projects/ui/ProjectsScreen.tsx   | 24 +++++++
 .../api/relayQueryInvalidation.test.mjs       |  3 +
 .../src/shared/api/relayQueryInvalidation.ts  |  4 ++
 10 files changed, 172 insertions(+), 13 deletions(-)

diff --git a/desktop/src/features/projects/assignmentOperationFetch.test.mjs b/desktop/src/features/projects/assignmentOperationFetch.test.mjs
index 3882d1807e..c669ee5a26 100644
--- a/desktop/src/features/projects/assignmentOperationFetch.test.mjs
+++ b/desktop/src/features/projects/assignmentOperationFetch.test.mjs
@@ -285,3 +285,38 @@ test("a failed assignment query surfaces as a failed section instead of silent l
 
   assert.ok(result.issues.failedSections.includes("assignments"));
 });
+
+test("fetchAssignmentOperationEvents stops paginating once its signal aborts", async () => {
+  // A permanently-full page would paginate forever without the cursor; abort
+  // after the first page and require the loop to stop with AbortError.
+  const controller = new AbortController();
+  let fetches = 0;
+  const fullPage = (until) =>
+    Array.from({ length: 500 }, (_, index) => ({
+      id: `${until ?? "head"}-${index}`.padEnd(64, "0"),
+      kind: 1,
+      pubkey: "a".repeat(64),
+      created_at: 1_000_000 - fetches * 1_000 - index,
+      content: JSON.stringify({ type: "assign" }),
+      tags: [],
+    }));
+  const fetchEvents = async (filter) => {
+    fetches += 1;
+    // Bound the fake: without the abort support the loop would paginate
+    // forever (each page has a fresh cursor) and OOM the test run.
+    if (fetches > 3) throw new Error("kept paginating after abort");
+    const page = fullPage(filter.until);
+    controller.abort();
+    return page;
+  };
+
+  await assert.rejects(
+    fetchAssignmentOperationEvents(
+      ["issue".padEnd(64, "1")],
+      fetchEvents,
+      controller.signal,
+    ),
+    (error) => error.name === "AbortError",
+  );
+  assert.equal(fetches, 1);
+});
diff --git a/desktop/src/features/projects/assignmentOperationFetch.ts b/desktop/src/features/projects/assignmentOperationFetch.ts
index fbdc90b218..fa4e258514 100644
--- a/desktop/src/features/projects/assignmentOperationFetch.ts
+++ b/desktop/src/features/projects/assignmentOperationFetch.ts
@@ -68,6 +68,7 @@ export async function fetchAssignmentOperationEvents(
   fetchEvents: (
     filter: FetchEventsInput,
   ) => Promise<RelayEvent[]> = relayClient.fetchEvents.bind(relayClient),
+  signal?: AbortSignal,
 ): Promise<RelayEvent[]> {
   if (issueIds.length === 0) return [];
   const chunks: string[][] = [];
@@ -75,7 +76,9 @@ export async function fetchAssignmentOperationEvents(
     chunks.push(issueIds.slice(i, i + ISSUE_ID_CHUNK_SIZE));
   }
   const pages = await Promise.all(
-    chunks.map((chunk) => fetchIssueCommentsExhaustively(chunk, fetchEvents)),
+    chunks.map((chunk) =>
+      fetchIssueCommentsExhaustively(chunk, fetchEvents, signal),
+    ),
   );
   const seen = new Map<string, RelayEvent>();
   for (const page of pages) {
@@ -91,11 +94,15 @@ export async function fetchAssignmentOperationEvents(
 async function fetchIssueCommentsExhaustively(
   issueIds: string[],
   fetchEvents: (filter: FetchEventsInput) => Promise<RelayEvent[]>,
+  signal?: AbortSignal,
 ): Promise<RelayEvent[]> {
   const seen = new Map<string, RelayEvent>();
   let limit = ASSIGNMENT_PAGE_LIMIT;
   let until: number | undefined;
   for (;;) {
+    // Leaving the Projects surface cancels its queries; stop queuing pages
+    // behind the next surface's fetches.
+    signal?.throwIfAborted();
     const page = await fetchEvents({
       kinds: [KIND_TEXT_NOTE],
       "#e": issueIds,
diff --git a/desktop/src/features/projects/hooks.ts b/desktop/src/features/projects/hooks.ts
index 17ab58d062..432fa85e02 100644
--- a/desktop/src/features/projects/hooks.ts
+++ b/desktop/src/features/projects/hooks.ts
@@ -168,13 +168,18 @@ export function eventToProject(
 }
 
 export async function fetchProjects(
-  fetchExhaustively: FetchProjectEventsExhaustively = fetchProjectEventsExhaustively,
+  fetchExhaustively?: FetchProjectEventsExhaustively,
+  signal?: AbortSignal,
 ): Promise<Project[]> {
   // Delegates to `buildProjectsFromFetcher` in `projectEnumeration.ts`, which
   // is the pure, Tauri-free core of this operation. That helper's javadoc
   // explains the fail-closed tombstone contract and the NIP-OA owner-deletion
   // relay-side-suppression decision.
-  return buildProjectsFromFetcher(fetchExhaustively, {
+  const fetcher: FetchProjectEventsExhaustively =
+    fetchExhaustively ??
+    ((kinds, extraFilter) =>
+      fetchProjectEventsExhaustively(kinds, extraFilter, undefined, signal));
+  return buildProjectsFromFetcher(fetcher, {
     relayOrigin: getCachedRelayOrigin(),
     hiddenAddresses: new Set(readHiddenProjectCards()),
   });
@@ -637,22 +642,44 @@ async function deleteProject(project: Project): Promise<void> {
 
 export const projectsQueryKey = ["projects"] as const;
 
+/**
+ * Freshness windows for the Projects surface. Every local write path
+ * invalidates its keys explicitly (issue/PR mutations, project creation,
+ * repo sync), so short windows bought nothing for own-actions and charged a
+ * full relay fan-out — project enumeration is an exhaustive paginated scan,
+ * work items are five 2,000-event queries — on nearly every Projects
+ * re-entry. Remote actors' changes surface within the window. gcTime keeps
+ * the enumeration cached across visits so re-entering Projects paints from
+ * cache instead of blocking on the scan.
+ */
+export const PROJECTS_STALE_TIME_MS = 5 * 60_000;
+// Window-guarded like react-query's own server default (Infinity): an
+// explicit finite gcTime schedules a real, non-unref'd timeout per cache
+// entry, which keeps node test processes alive for the full 30 minutes.
+export const PROJECTS_GC_TIME_MS =
+  typeof window === "undefined" ? Number.POSITIVE_INFINITY : 30 * 60_000;
+export const PROJECT_WORK_ITEMS_STALE_TIME_MS = 2 * 60_000;
+export const PROJECT_ACTIVITY_STALE_TIME_MS = 2 * 60_000;
+export const PROJECT_LOCAL_REPOS_STALE_TIME_MS = 2 * 60_000;
+
 export function useProjectsQuery() {
   return useQuery({
     queryKey: projectsQueryKey,
-    queryFn: () => fetchProjects(),
-    staleTime: 60_000,
+    queryFn: ({ signal }) => fetchProjects(undefined, signal),
+    staleTime: PROJECTS_STALE_TIME_MS,
+    gcTime: PROJECTS_GC_TIME_MS,
   });
 }
 
 export function useProjectQuery(projectId: string) {
   return useQuery({
     queryKey: projectsQueryKey,
-    queryFn: () => fetchProjects(),
+    queryFn: ({ signal }) => fetchProjects(undefined, signal),
     select: (projects) =>
       projects.find((project) => projectMatchesRouteId(project, projectId)) ??
       null,
-    staleTime: 60_000,
+    staleTime: PROJECTS_STALE_TIME_MS,
+    gcTime: PROJECTS_GC_TIME_MS,
   });
 }
 
@@ -793,7 +820,8 @@ export function useProjectLocalRepositoriesQuery(reposDir?: string | null) {
   return useQuery({
     queryKey: ["projects", "local-repositories", reposDir ?? "default"],
     queryFn: () => listProjectLocalRepositories({ reposDir }),
-    staleTime: 10_000,
+    // Filesystem scan; repo sync/clone flows invalidate this key on change.
+    staleTime: PROJECT_LOCAL_REPOS_STALE_TIME_MS,
     retry: 1,
   });
 }
@@ -828,9 +856,22 @@ export function useProjectPullRequestsQuery(
 export function useProjectsWorkItemsQuery(projects: Project[]) {
   return useQuery({
     enabled: projects.length > 0,
-    queryKey: ["projects", "work-items", projects.map((project) => project.id)],
-    queryFn: () => fetchProjectsWorkItems(projects),
-    staleTime: 30_000,
+    queryKey: [
+      "projects",
+      "work-items",
+      projects.map((project) => project.id),
+      // Repo attach/detach changes the fan-out inputs without changing
+      // project ids; keying on addresses too prevents a pre-attach result
+      // from serving as fresh for the whole staleTime window.
+      projects
+        .flatMap((project) =>
+          project.repositories.map((repository) => repository.repoAddress),
+        )
+        .sort(),
+    ],
+    queryFn: ({ signal }) =>
+      fetchProjectsWorkItems(projects, undefined, signal),
+    staleTime: PROJECT_WORK_ITEMS_STALE_TIME_MS,
   });
 }
 
@@ -935,7 +976,7 @@ export function useProjectActivitySummariesQuery(projects: Project[]) {
     enabled: repoAddresses.length > 0,
     queryKey: ["projects", "activity-summaries", repoAddresses],
     queryFn: () => fetchProjectActivitySummaries(projects),
-    staleTime: 30_000,
+    staleTime: PROJECT_ACTIVITY_STALE_TIME_MS,
   });
 }
 
diff --git a/desktop/src/features/projects/projectEnumeration.test.mjs b/desktop/src/features/projects/projectEnumeration.test.mjs
index 240546b8a4..49cec52516 100644
--- a/desktop/src/features/projects/projectEnumeration.test.mjs
+++ b/desktop/src/features/projects/projectEnumeration.test.mjs
@@ -245,3 +245,31 @@ test("buildProjectsFromFetcher still suppresses deleted heads via the scoped fet
   const projects = await buildProjectsFromFetcher(fetchExhaustively);
   assert.deepEqual(projects, [], "deleted repo must not surface as a project");
 });
+
+test("enumerateProjectEvents stops paginating once its signal aborts", async () => {
+  // 3 full pages of 2 → without an abort the enumeration would fetch all of
+  // them plus boundary drains. Abort after the first page: the loop must
+  // throw before requesting another page.
+  const events = [
+    relayEvent("a", 1_000),
+    relayEvent("b", 900),
+    relayEvent("c", 800),
+    relayEvent("d", 700),
+    relayEvent("e", 600),
+    relayEvent("f", 500),
+  ];
+  const controller = new AbortController();
+  let pageFetches = 0;
+  const fetchPage = async (filter) => {
+    pageFetches += 1;
+    const page = await fetcherFor(events)(filter);
+    controller.abort();
+    return page;
+  };
+
+  await assert.rejects(
+    enumerateProjectEvents(fetchPage, [30617], 2, undefined, controller.signal),
+    (error) => error.name === "AbortError",
+  );
+  assert.equal(pageFetches, 1);
+});
diff --git a/desktop/src/features/projects/projectEnumeration.ts b/desktop/src/features/projects/projectEnumeration.ts
index ab1502c757..ac49432104 100644
--- a/desktop/src/features/projects/projectEnumeration.ts
+++ b/desktop/src/features/projects/projectEnumeration.ts
@@ -44,6 +44,7 @@ export async function enumerateProjectEvents(
   kinds: number[],
   pageSize: number,
   extraFilter?: ProjectEventExtraFilter,
+  signal?: AbortSignal,
 ): Promise<RelayEvent[]> {
   if (!Number.isSafeInteger(pageSize) || pageSize <= 0) {
     throw new Error(
@@ -55,6 +56,10 @@ export async function enumerateProjectEvents(
   let until: number | undefined;
 
   for (;;) {
+    // Each relay REQ is bounded, but this loop is not: leaving the Projects
+    // surface cancels its queries, and the abort must stop the enumeration
+    // from queuing further pages behind the next surface's fetches.
+    signal?.throwIfAborted();
     const page = await fetchPage({
       ...extraFilter,
       kinds,
@@ -65,6 +70,7 @@ export async function enumerateProjectEvents(
     if (page.length < pageSize) return [...eventsById.values()];
 
     const oldest = Math.min(...page.map((event) => event.created_at));
+    signal?.throwIfAborted();
     const boundary = await fetchPage({
       ...extraFilter,
       kinds,
@@ -94,12 +100,14 @@ export function fetchProjectEventsExhaustively(
   kinds: number[],
   extraFilter?: ProjectEventExtraFilter,
   pageSize = PROJECT_ENUMERATION_PAGE_SIZE,
+  signal?: AbortSignal,
 ): Promise<RelayEvent[]> {
   return enumerateProjectEvents(
     (filter) => relayClient.fetchEvents(filter),
     kinds,
     pageSize,
     extraFilter,
+    signal,
   );
 }
 
diff --git a/desktop/src/features/projects/projectWorkItems.ts b/desktop/src/features/projects/projectWorkItems.ts
index 80ab32c62a..11acbc8b34 100644
--- a/desktop/src/features/projects/projectWorkItems.ts
+++ b/desktop/src/features/projects/projectWorkItems.ts
@@ -82,6 +82,7 @@ export async function fetchProjectsWorkItems<TProject extends ProjectReference>(
   fetchEvents: (
     filter: FetchEventsInput,
   ) => Promise<RelayEvent[]> = relayClient.fetchEvents.bind(relayClient),
+  signal?: AbortSignal,
 ): Promise<ProjectsWorkItemsResult<TProject>> {
   const repoAddresses = [
     ...new Set(
@@ -129,10 +130,17 @@ export async function fetchProjectsWorkItems<TProject extends ProjectReference>(
             .filter((event) => event.kind === KIND_GIT_ISSUE)
             .map((event) => event.id),
           fetchEvents,
+          signal,
         ),
       ),
     ]);
 
+  // The five eager queries above are single bounded REQs the relay client
+  // cannot abort mid-flight; only the assignment pagination is abort-aware.
+  // What cancellation CAN save here is the reduce work below and caching a
+  // result for a surface the user already left.
+  signal?.throwIfAborted();
+
   if (rootResult.status === "rejected") {
     throw rootResult.reason instanceof Error
       ? rootResult.reason
diff --git a/desktop/src/features/projects/repositoryActivityHooks.ts b/desktop/src/features/projects/repositoryActivityHooks.ts
index 10733116a8..39a9cdb98a 100644
--- a/desktop/src/features/projects/repositoryActivityHooks.ts
+++ b/desktop/src/features/projects/repositoryActivityHooks.ts
@@ -3,6 +3,7 @@ import * as React from "react";
 
 import {
   fetchRepositoryActivitySummaries,
+  PROJECT_ACTIVITY_STALE_TIME_MS,
   type Project,
 } from "@/features/projects/hooks";
 
@@ -27,6 +28,6 @@ export function useRepositoryActivitySummariesQuery(projects: Project[]) {
     enabled: repoAddresses.length > 0,
     queryKey: ["projects", "activity-summaries", "repositories", repoAddresses],
     queryFn: () => fetchRepositoryActivitySummaries(repositories),
-    staleTime: 30_000,
+    staleTime: PROJECT_ACTIVITY_STALE_TIME_MS,
   });
 }
diff --git a/desktop/src/features/projects/ui/ProjectsScreen.tsx b/desktop/src/features/projects/ui/ProjectsScreen.tsx
index 9d13c574d4..bb84804e8e 100644
--- a/desktop/src/features/projects/ui/ProjectsScreen.tsx
+++ b/desktop/src/features/projects/ui/ProjectsScreen.tsx
@@ -1,6 +1,30 @@
+import { useQueryClient } from "@tanstack/react-query";
+import * as React from "react";
+
 import { ProjectsView } from "@/features/projects/ui/ProjectsView";
 
 export function ProjectsScreen() {
+  const queryClient = useQueryClient();
+  React.useEffect(() => {
+    return () => {
+      // Leaving the surface: stop the work-items fan. Its assignment-operation
+      // pagination is abort-aware and unbounded, so cancellation genuinely
+      // stops relay work that would otherwise compete with the next surface's
+      // channel fetches. Cached data stays; the next visit refetches per
+      // staleTime.
+      //
+      // Deliberately NOT cancelled:
+      // - projects enumeration: the always-mounted sidebar projects section
+      //   observes this key, so it must keep filling its 30-minute cache.
+      // - repo snapshots / local repositories: native clone/scan work cannot
+      //   be aborted mid-flight; cancellation would only discard the finished
+      //   result and force the same clones again on the next visit.
+      // - activity summaries: a single bounded request — it completes either
+      //   way, so cancelling just wastes the response.
+      void queryClient.cancelQueries({ queryKey: ["projects", "work-items"] });
+    };
+  }, [queryClient]);
+
   return (
     <div className="relative flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden">
       <ProjectsView />
diff --git a/desktop/src/shared/api/relayQueryInvalidation.test.mjs b/desktop/src/shared/api/relayQueryInvalidation.test.mjs
index 6130992a30..059d2f4b7f 100644
--- a/desktop/src/shared/api/relayQueryInvalidation.test.mjs
+++ b/desktop/src/shared/api/relayQueryInvalidation.test.mjs
@@ -63,6 +63,9 @@ test("relay invalidation separates relay project queries from local repo work",
     ["project", "project-1", "pull-requests"],
     ["projects", "issues", ["project-1"]],
     ["projects", "activity-summaries", ["addr-1"]],
+    // Work items fan out over the relay and are fresh for two minutes;
+    // reconnect auto-heal must be able to repair a partial result.
+    ["projects", "work-items", ["project-1"], ["addr-1"]],
   ]) {
     assert.equal(isRelayDependentQueryKey(queryKey), true, queryKey.join("/"));
   }
diff --git a/desktop/src/shared/api/relayQueryInvalidation.ts b/desktop/src/shared/api/relayQueryInvalidation.ts
index e07992184d..6892c54a34 100644
--- a/desktop/src/shared/api/relayQueryInvalidation.ts
+++ b/desktop/src/shared/api/relayQueryInvalidation.ts
@@ -39,6 +39,10 @@ const RELAY_PROJECT_QUERY_PARTS = new Set<string>([
   "activity-summaries",
   "issues",
   "pull-requests",
+  // Fresh for two minutes (PROJECT_WORK_ITEMS_STALE_TIME_MS) and tolerant of
+  // partial fan-out failure — reconnect auto-heal is what repairs a partial
+  // result inside that window.
+  "work-items",
 ]);
 
 const LOCAL_PROJECT_QUERY_PARTS = new Set<string>([

From 0e48ff26915aa32d5f05208847b9aba75f4f19cd Mon Sep 17 00:00:00 2001
From: Taylor Ho <taylorkmho@gmail.com>
Date: Fri, 21 Aug 2026 16:53:50 -0700
Subject: [PATCH 26/38] feat(workflows): clarify workflow setup and activation
 (#6470)

**Category:** new-feature
**User Impact:** Workflow authors can build filtered, runtime-aware
automations, understand them at a glance, and get a clear warning before
turning on workflows likely to run often.
**Problem:** Workflow setup exposed raw configuration without enough
help composing message templates, filtering triggers, or understanding
saved behavior; activation could also make a broadly triggered workflow
live without explaining its likely frequency.
**Solution:** Batch 3 adds local, deterministic template variables,
trigger filters, and semantic summaries, then refines cards and
activation around configured behavior and a risk-aware warning boundary.
Scheduling remains the already-shipped implementation, advanced
expressions remain lossless, and network-backed identity/message
enrichment stays in Batch 4.

| Message inputs | Trigger filters |
| --- | --- |
| Caret-aware, keyboard-accessible suggestions expose trigger-local
values and safe prior-step outputs in `send_message.text`. | Structured
conditions and validated manual IDs block invalid submission while
preserving advanced expressions. |
| ![Message variable
autocomplete](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6470/message-variables.png)
| ![Structured trigger
filters](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6470/trigger-filters.png)
|

| Workflow cards | Risk-aware activation |
| --- | --- |
| Semantic labels, channel-first hierarchy, configured reaction/action
visuals, real step stacks, and compact status controls make behavior
scannable. | Broad message and frequent schedule triggers explain the
risk before **Turn on**; narrowly scoped triggers proceed without
unnecessary ceremony. |
| ![Semantic workflow
card](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6470/workflow-card.png)
| ![Activation
confirmation](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6470/activation-choice-v2.png)
|

## Changes

<details>
<summary>File changes</summary>

**desktop/src/features/workflows/ui/WorkflowActionsMenu.tsx**
Separates direct card status controls from secondary actions while
retaining modal status actions.

**desktop/src/features/workflows/ui/WorkflowCard.tsx**
Adds semantic behavior, channel-first hierarchy, configured
reaction/action visuals, real subsequent-step stacks, status controls,
and reduced-motion-aware trigger feedback.

**desktop/src/features/workflows/ui/WorkflowDialog.tsx**
Warns before activating broadly triggered workflows while allowing
narrowly scoped workflows to proceed directly.

**desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx**
Connects structured trigger filters and template-aware step inputs while
preserving schedules, trigger transitions, and selected YAML authority.

**desktop/src/features/workflows/ui/WorkflowStepCard.tsx**
Replaces generic labels with deterministic configured-step descriptions.

**desktop/src/features/workflows/ui/WorkflowTemplateTextarea.tsx**
Adds caret-aware variable suggestions with keyboard navigation and focus
restoration.

**desktop/src/features/workflows/ui/WorkflowTriggerConditions.tsx**
Adds structured local filters, validated author/message IDs, and a
lossless advanced-expression fallback.

**desktop/src/features/workflows/ui/workflowActivationWarning.ts** and
**workflowActivationWarning.test.mjs**
Classify broad message and frequent schedule triggers for contextual
activation warnings.

**desktop/src/features/workflows/ui/workflowConditionExpression.ts** and
**workflowConditionExpression.test.mjs**
Model and cover parsing, serialization, validation, and
advanced-expression preservation.

**desktop/src/features/workflows/ui/workflowDefinition.ts** and
**workflowDefinition.test.mjs**
Preserve trigger/step configuration and derive deterministic card
metadata across YAML round trips.

**desktop/src/features/workflows/ui/workflowStepDescription.ts** and
**workflowStepDescription.test.mjs**
Generate and cover local step summaries.

**desktop/src/features/workflows/ui/workflowTemplateVariables.ts** and
**workflowTemplateVariables.test.mjs**
Define and cover trigger-specific, order-bounded variables and caret
insertion.

**desktop/src/features/workflows/ui/workflowTriggerDescription.ts** and
**workflowTriggerDescription.test.mjs**
Generate and cover semantic trigger summaries without network lookups.

**desktop/tests/e2e/workflow-local-controls.spec.ts** and snapshot
Cover filters, IDs, advanced expressions, autocomplete, activation
choices, summaries, and YAML authority.

**desktop/tests/e2e/workflow-reaction-picker.spec.ts**
Covers configured reaction emoji in workflow nodes and summaries.

**desktop/tests/e2e/workflows.spec.ts**
Covers risk-aware activation warnings, direct safe creation,
duplication, and card status controls.

</details>

## Reproduction steps

1. Create a message-posted workflow in **Workflows**, add a Send message
step, and type `{{trig`; verify keyboard-selectable variables insert at
the caret.
2. Configure message-text and manual ID filters; verify malformed IDs
block submission and advanced expressions survive Form/YAML transitions.
3. Create a broad message workflow; verify **Back** persists nothing,
**Keep off** saves it disabled, and **Turn on** enables it. Confirm a
narrowly triggered webhook skips the warning.
4. Inspect the saved card; verify its channel, semantic behavior,
configured actions/reaction, real step stack, and status are
understandable without opening YAML.

## Validation

Validated at exact clean head `f99503819889b95ee3c61657c5c3850aae35481e`
on base `24ec6a468ec9d0d425ee58fbfc4d416412c446ad`.

- Focused workflow regressions passed 59/60 locally; the only local miss
was a 438-pixel macOS snapshot drift, while the checked-in Linux
baseline comes from the failing CI artifact. Repository pre-push gates
and E2E build/typecheck passed.
- A broader 36-test smoke invocation had 31 passes and five unrelated
pre-existing expectation/snapshot failures, so it is not claimed as
fully green. Adversarial fixes are recorded in [round
one](https://github.com/block/buzz/pull/6470#issuecomment-5366366670)
and [round
two](https://github.com/block/buzz/pull/6470#issuecomment-5366407535).

---------

Signed-off-by: Taylor Ho <taylorkmho@gmail.com>
Signed-off-by: Rizz <302abe414ca6e3134763d2539bfcf145aea2a63fe5f8455204ed602fd40cf381@buzz.block.builderlab.xyz>
Co-authored-by: Rizz <302abe414ca6e3134763d2539bfcf145aea2a63fe5f8455204ed602fd40cf381@buzz.block.builderlab.xyz>
Co-authored-by: Carl <acda9e433d19dcd0e6b6840f7f4b98f3a56f1fab98049d444c087019e6d36560@buzz.block.builderlab.xyz>
Co-authored-by: Mongo <5398c5fd039b963ce132b3e078e7c4af097dd997517bb5e14c2682fe68c25197@buzz.block.builderlab.xyz>
---
 .../workflows/ui/WorkflowActionsMenu.tsx      |  58 +--
 .../features/workflows/ui/WorkflowCard.tsx    | 211 ++++++--
 .../features/workflows/ui/WorkflowDialog.tsx  | 120 ++++-
 .../workflows/ui/WorkflowFormBuilder.tsx      | 189 +++++---
 .../workflows/ui/WorkflowStepCard.tsx         |  14 +-
 .../workflows/ui/WorkflowTemplateTextarea.tsx | 188 ++++++++
 .../ui/WorkflowTriggerConditions.tsx          | 327 +++++++++++++
 .../features/workflows/ui/WorkflowsView.tsx   |  62 ++-
 .../ui/workflowActivationWarning.test.mjs     | 107 +++++
 .../workflows/ui/workflowActivationWarning.ts | 160 +++++++
 .../ui/workflowConditionExpression.test.mjs   | 171 +++++++
 .../ui/workflowConditionExpression.ts         | 276 +++++++++++
 .../workflows/ui/workflowDefinition.test.mjs  | 276 ++++++++++-
 .../workflows/ui/workflowDefinition.ts        | 453 ++++++++++++++++--
 .../ui/workflowReactionCondition.test.mjs     |  49 ++
 .../workflows/ui/workflowReactionCondition.ts |  15 +
 .../ui/workflowStepDescription.test.mjs       | 109 +++++
 .../workflows/ui/workflowStepDescription.ts   |  83 ++++
 .../ui/workflowTemplateVariables.test.mjs     |  87 ++++
 .../workflows/ui/workflowTemplateVariables.ts | 147 ++++++
 .../ui/workflowTriggerDescription.test.mjs    | 158 ++++++
 .../ui/workflowTriggerDescription.ts          | 209 ++++++++
 desktop/tests/e2e/navigation.spec.ts          |  12 +
 .../tests/e2e/workflow-local-controls.spec.ts | 369 +++++++++++++-
 ...ate-variable-autocomplete-smoke-darwin.png | Bin 0 -> 104623 bytes
 ...late-variable-autocomplete-smoke-linux.png | Bin 0 -> 98835 bytes
 .../e2e/workflow-reaction-picker.spec.ts      |  57 ++-
 .../e2e/workflow-title-stability.spec.ts      |  34 +-
 desktop/tests/e2e/workflows.spec.ts           | 143 ++++--
 29 files changed, 3812 insertions(+), 272 deletions(-)
 create mode 100644 desktop/src/features/workflows/ui/WorkflowTemplateTextarea.tsx
 create mode 100644 desktop/src/features/workflows/ui/WorkflowTriggerConditions.tsx
 create mode 100644 desktop/src/features/workflows/ui/workflowActivationWarning.test.mjs
 create mode 100644 desktop/src/features/workflows/ui/workflowActivationWarning.ts
 create mode 100644 desktop/src/features/workflows/ui/workflowConditionExpression.test.mjs
 create mode 100644 desktop/src/features/workflows/ui/workflowConditionExpression.ts
 create mode 100644 desktop/src/features/workflows/ui/workflowReactionCondition.test.mjs
 create mode 100644 desktop/src/features/workflows/ui/workflowReactionCondition.ts
 create mode 100644 desktop/src/features/workflows/ui/workflowStepDescription.test.mjs
 create mode 100644 desktop/src/features/workflows/ui/workflowStepDescription.ts
 create mode 100644 desktop/src/features/workflows/ui/workflowTemplateVariables.test.mjs
 create mode 100644 desktop/src/features/workflows/ui/workflowTemplateVariables.ts
 create mode 100644 desktop/src/features/workflows/ui/workflowTriggerDescription.test.mjs
 create mode 100644 desktop/src/features/workflows/ui/workflowTriggerDescription.ts
 create mode 100644 desktop/tests/e2e/workflow-local-controls.spec.ts-snapshots/workflow-template-variable-autocomplete-smoke-darwin.png
 create mode 100644 desktop/tests/e2e/workflow-local-controls.spec.ts-snapshots/workflow-template-variable-autocomplete-smoke-linux.png

diff --git a/desktop/src/features/workflows/ui/WorkflowActionsMenu.tsx b/desktop/src/features/workflows/ui/WorkflowActionsMenu.tsx
index 69cd3103f3..1114e2b1af 100644
--- a/desktop/src/features/workflows/ui/WorkflowActionsMenu.tsx
+++ b/desktop/src/features/workflows/ui/WorkflowActionsMenu.tsx
@@ -26,6 +26,7 @@ type WorkflowActionsMenuProps = {
   onEdit: () => void;
   onToggleEnabled: () => void;
   onTrigger: () => void;
+  showEnabledToggle?: boolean;
 };
 
 export function WorkflowActionsMenu({
@@ -36,6 +37,7 @@ export function WorkflowActionsMenu({
   onEdit,
   onToggleEnabled,
   onTrigger,
+  showEnabledToggle = true,
 }: WorkflowActionsMenuProps) {
   return (
     <DropdownMenu>
@@ -63,37 +65,39 @@ export function WorkflowActionsMenu({
           <Copy className="mr-2 h-4 w-4" />
           Duplicate
         </DropdownMenuItem>
-        <DropdownMenuCheckboxItem
-          checked={isEnabled}
-          className="gap-2 pl-2 [&>span:first-child]:hidden"
-          disabled={isTogglingEnabled}
-          onCheckedChange={(checked) => {
-            if (checked !== isEnabled) onToggleEnabled();
-          }}
-          onSelect={(event) => event.preventDefault()}
-        >
-          {isEnabled ? (
-            <Power className="mr-2 h-4 w-4 shrink-0" />
-          ) : (
-            <PowerOff className="mr-2 h-4 w-4 shrink-0" />
-          )}
-          <span>Enable</span>
-          <span
-            aria-hidden="true"
-            className={
-              "ml-auto inline-flex h-5 w-9 shrink-0 items-center rounded-full border-2 border-transparent transition-colors " +
-              (isEnabled ? "bg-primary" : "bg-input")
-            }
-            data-testid="workflow-enabled-switch-visual"
+        {showEnabledToggle ? (
+          <DropdownMenuCheckboxItem
+            checked={isEnabled}
+            className="gap-2 pl-2 [&>span:first-child]:hidden"
+            disabled={isTogglingEnabled}
+            onCheckedChange={(checked) => {
+              if (checked !== isEnabled) onToggleEnabled();
+            }}
+            onSelect={(event) => event.preventDefault()}
           >
+            {isEnabled ? (
+              <Power className="mr-2 h-4 w-4 shrink-0" />
+            ) : (
+              <PowerOff className="mr-2 h-4 w-4 shrink-0" />
+            )}
+            <span>Enable</span>
             <span
+              aria-hidden="true"
               className={
-                "block h-4 w-4 rounded-full bg-background transition-transform " +
-                (isEnabled ? "translate-x-4" : "translate-x-0")
+                "ml-auto inline-flex h-5 w-9 shrink-0 items-center rounded-full border-2 border-transparent transition-colors " +
+                (isEnabled ? "bg-primary" : "bg-input")
               }
-            />
-          </span>
-        </DropdownMenuCheckboxItem>
+              data-testid="workflow-enabled-switch-visual"
+            >
+              <span
+                className={
+                  "block h-4 w-4 rounded-full bg-background transition-transform " +
+                  (isEnabled ? "translate-x-4" : "translate-x-0")
+                }
+              />
+            </span>
+          </DropdownMenuCheckboxItem>
+        ) : null}
         <DropdownMenuSeparator />
         <DropdownMenuItem className="text-destructive" onClick={onDelete}>
           <Trash2 className="mr-2 h-4 w-4" />
diff --git a/desktop/src/features/workflows/ui/WorkflowCard.tsx b/desktop/src/features/workflows/ui/WorkflowCard.tsx
index 3d3044d63d..48ce8d2db6 100644
--- a/desktop/src/features/workflows/ui/WorkflowCard.tsx
+++ b/desktop/src/features/workflows/ui/WorkflowCard.tsx
@@ -6,25 +6,27 @@ import {
   Hash,
   MessageCircle,
   MessageSquare,
-  Send,
   SmilePlus,
   Timer,
   Webhook,
   Zap,
 } from "lucide-react";
 import type { LucideIcon } from "lucide-react";
+import { motion, useReducedMotion } from "motion/react";
+import * as React from "react";
 
 import type { Workflow } from "@/shared/api/types";
 import { cn } from "@/shared/lib/cn";
+import { Switch } from "@/shared/ui/switch";
 import { WorkflowActionsMenu } from "./WorkflowActionsMenu";
 import {
-  getWorkflowDescription,
-  getWorkflowDisplayStatus,
   getWorkflowEnabled,
-  getWorkflowPrimaryAction,
-  getWorkflowTriggerSummary,
+  getWorkflowActionTiles,
+  getWorkflowCardLabel,
+  getWorkflowTriggerEmoji,
   getWorkflowTriggerType,
 } from "./workflowDefinition";
+import { StatusEmoji } from "@/features/user-status/ui/StatusEmoji";
 
 type WorkflowCardProps = {
   workflow: Workflow;
@@ -52,7 +54,7 @@ const ACTION_ICONS: Record<string, LucideIcon> = {
   delay: Timer,
   request_approval: CircleCheckBig,
   send_dm: MessageCircle,
-  send_message: Send,
+  send_message: MessageSquare,
   set_channel_topic: Hash,
 };
 
@@ -64,15 +66,123 @@ const TRIGGER_ACCENTS: Record<string, string> = {
   webhook: "border-orange-300/30 bg-orange-500 text-white",
 };
 
-function StatusBadge({ status }: { status: Workflow["status"] }) {
+const ACTION_ACCENTS: Record<string, string> = {
+  add_reaction: "border-pink-400/30 bg-pink-600 text-white",
+  call_webhook: "border-orange-300/30 bg-orange-500 text-white",
+  delay: "border-sky-300/30 bg-sky-500 text-white",
+  request_approval: "border-emerald-300/30 bg-emerald-600 text-white",
+  send_dm: "border-indigo-300/30 bg-indigo-600 text-white",
+  send_message: "border-blue-300/30 bg-blue-600 text-white",
+  set_channel_topic: "border-violet-300/30 bg-violet-600 text-white",
+};
+
+function StatusToggle({
+  disabled,
+  enabled,
+  onToggle,
+}: {
+  disabled: boolean;
+  enabled: boolean;
+  onToggle: () => void;
+}) {
+  return (
+    <Switch
+      aria-label={enabled ? "Disable workflow" : "Enable workflow"}
+      checked={enabled}
+      disabled={disabled}
+      onCheckedChange={(checked) => {
+        if (checked !== enabled) onToggle();
+      }}
+    />
+  );
+}
+
+function ActionTile({
+  action,
+  animationSequence,
+  className,
+  emoji,
+  index,
+}: {
+  action: string;
+  animationSequence: number;
+  className?: string;
+  emoji: string | null;
+  index: number;
+}) {
+  const ActionIcon = ACTION_ICONS[action];
+  const accent = ACTION_ACCENTS[action];
+  const reduceMotion = useReducedMotion();
+
+  return (
+    <span
+      aria-hidden="true"
+      className={cn(
+        "absolute inset-y-0 flex w-9 items-center justify-center rounded-xl border shadow-xs",
+        accent ?? "border-border/65 bg-background/80 text-muted-foreground",
+        className,
+      )}
+    >
+      <motion.span
+        animate={
+          animationSequence > 0 && !reduceMotion
+            ? { scale: [1, 1.18, 0.94, 1], y: [0, -5, 1, 0] }
+            : undefined
+        }
+        className="flex items-center justify-center"
+        transition={{
+          delay: index * 0.11,
+          duration: 0.48,
+          ease: "easeOut",
+        }}
+      >
+        {emoji ? (
+          <StatusEmoji className="h-6 w-6 text-xl" value={emoji} />
+        ) : ActionIcon ? (
+          <ActionIcon className="h-5 w-5" />
+        ) : (
+          <Zap className="h-5 w-5" />
+        )}
+      </motion.span>
+    </span>
+  );
+}
+
+function ActionTileStack({
+  actions,
+  animationSequence = 0,
+}: {
+  actions: Array<{ action: string; emoji: string | null; key: string }>;
+  animationSequence?: number;
+}) {
+  const visibleActions = actions.slice(0, 3);
+
   return (
     <span
       className={cn(
-        "rounded-full border border-border/65 bg-background/80 px-2 py-1 text-2xs font-semibold uppercase tracking-wider shadow-xs",
-        status === "active" ? "text-foreground" : "text-muted-foreground",
+        "relative h-9",
+        visibleActions.length === 1 && "w-9",
+        visibleActions.length === 2 && "w-[2.625rem]",
+        visibleActions.length > 2 && "w-12",
       )}
+      data-testid="workflow-card-action-stack"
     >
-      {status}
+      {visibleActions
+        .map((action, index) => (
+          <ActionTile
+            action={action.action}
+            animationSequence={animationSequence}
+            className={cn(
+              index === 0 && "left-0 z-10",
+              index === 1 && "left-1.5 z-[5] scale-90 opacity-60",
+              index === 2 && "left-3 scale-75 opacity-35",
+            )}
+            emoji={action.emoji}
+            index={index}
+            key={`${action.key}-${animationSequence}`}
+          />
+        ))
+        .reverse()}
     </span>
   );
 }
@@ -88,19 +198,20 @@ export function WorkflowCard({
   onDuplicate,
   onDelete,
 }: WorkflowCardProps) {
-  const displayStatus = getWorkflowDisplayStatus(workflow);
-  const triggerSummary = getWorkflowTriggerSummary(workflow.definition);
-  const description = getWorkflowDescription(workflow.definition);
+  const [triggerAnimationSequence, setTriggerAnimationSequence] =
+    React.useState(0);
+  const isEnabled = getWorkflowEnabled(workflow.definition);
+  const cardLabel = getWorkflowCardLabel(workflow.definition);
   const triggerType = getWorkflowTriggerType(workflow.definition);
-  const actionType = getWorkflowPrimaryAction(workflow.definition);
+  const actionTiles = getWorkflowActionTiles(workflow.definition);
+  const triggerEmoji = getWorkflowTriggerEmoji(workflow.definition);
   const TriggerIcon = triggerType ? TRIGGER_ICONS[triggerType] : undefined;
-  const ActionIcon = actionType ? ACTION_ICONS[actionType] : undefined;
   const triggerAccent = triggerType ? TRIGGER_ACCENTS[triggerType] : undefined;
 
   return (
     <div
       className={cn(
-        "group relative min-h-60 w-full overflow-hidden rounded-2xl bg-muted/50 p-5 text-left text-foreground shadow-xs transition-colors hover:bg-muted/65",
+        "group relative flex min-h-60 w-full flex-col overflow-hidden rounded-2xl bg-muted/50 p-5 text-left text-foreground shadow-xs transition-colors hover:bg-muted/65",
       )}
       data-testid={`workflow-card-${workflow.id}`}
     >
@@ -112,7 +223,7 @@ export function WorkflowCard({
         <span className="sr-only">View {workflow.name}</span>
       </button>
 
-      <div className="pointer-events-none relative z-10 flex h-full min-h-48 flex-col">
+      <div className="pointer-events-none relative z-10 flex min-h-48 flex-1 flex-col">
         <div className="flex items-start justify-between gap-3">
           <div className="flex items-center gap-2" aria-hidden="true">
             <span
@@ -121,54 +232,74 @@ export function WorkflowCard({
                 triggerAccent ?? "border-slate-400/30 bg-slate-600 text-white",
               )}
             >
-              {TriggerIcon ? (
+              {triggerEmoji ? (
+                <StatusEmoji className="h-6 w-6 text-xl" value={triggerEmoji} />
+              ) : TriggerIcon ? (
                 <TriggerIcon className="h-5 w-5" />
               ) : (
                 <Zap className="h-5 w-5" />
               )}
             </span>
-            {ActionIcon ? (
+            {actionTiles.length > 0 ? (
               <>
                 <ArrowRight className="h-4 w-4 text-muted-foreground/60" />
-                <span className="flex h-9 w-9 items-center justify-center rounded-xl border border-border/65 bg-background/80 text-muted-foreground shadow-xs">
-                  <ActionIcon className="h-5 w-5" />
-                </span>
+                <ActionTileStack
+                  actions={actionTiles}
+                  animationSequence={triggerAnimationSequence}
+                />
               </>
             ) : null}
           </div>
 
           <div className="pointer-events-auto flex items-center gap-1.5">
-            <StatusBadge status={displayStatus} />
+            <StatusToggle
+              disabled={isTogglingEnabled}
+              enabled={isEnabled}
+              onToggle={() => onToggleEnabled(workflow)}
+            />
             <WorkflowActionsMenu
-              isEnabled={getWorkflowEnabled(workflow.definition)}
+              isEnabled={isEnabled}
               isTogglingEnabled={isTogglingEnabled}
               onDelete={() => onDelete(workflow)}
               onDuplicate={() => onDuplicate(workflow)}
               onEdit={() => onEdit(workflow)}
               onToggleEnabled={() => onToggleEnabled(workflow)}
-              onTrigger={() => onTrigger(workflow.id)}
+              onTrigger={() => {
+                setTriggerAnimationSequence((sequence) => sequence + 1);
+                onTrigger(workflow.id);
+              }}
+              showEnabledToggle={false}
             />
           </div>
         </div>
 
-        {triggerSummary ? (
-          <p className="mt-4 line-clamp-1 text-xs font-semibold text-muted-foreground">
-            {triggerSummary}
-          </p>
-        ) : null}
-        <h3 className="mt-1 line-clamp-4 text-xl font-bold leading-tight tracking-tight">
-          {workflow.name}
+        <h3
+          className="mt-4 line-clamp-4 text-xl font-bold leading-tight tracking-tight"
+          data-testid="workflow-card-semantic-label"
+        >
+          {cardLabel}
         </h3>
-        {description ? (
-          <p className="mt-2 line-clamp-2 text-sm leading-relaxed text-muted-foreground">
-            {description}
-          </p>
-        ) : null}
 
         <div className="mt-auto flex min-w-0 items-end justify-between gap-3 pt-5 text-muted-foreground">
-          <p className="min-w-0 truncate text-2xs">
-            {channelName ? `#${channelName}` : "Channel workflow"}
-          </p>
+          <div className="min-w-0">
+            {channelName ? (
+              <p
+                className="truncate text-xs font-semibold text-foreground"
+                data-testid="workflow-card-channel"
+              >
+                #{channelName}
+              </p>
+            ) : null}
+            <p
+              className={cn(
+                "truncate text-2xs text-muted-foreground",
+                channelName && "mt-0.5",
+              )}
+              data-testid="workflow-card-name"
+            >
+              {workflow.name}
+            </p>
+          </div>
           <span className="shrink-0 text-2xs">
             {new Date(workflow.updatedAt * 1000).toLocaleDateString()}
           </span>
diff --git a/desktop/src/features/workflows/ui/WorkflowDialog.tsx b/desktop/src/features/workflows/ui/WorkflowDialog.tsx
index fc23515b55..3f8655a3aa 100644
--- a/desktop/src/features/workflows/ui/WorkflowDialog.tsx
+++ b/desktop/src/features/workflows/ui/WorkflowDialog.tsx
@@ -41,6 +41,7 @@ import {
   type WorkflowFormBuilderHandle,
 } from "./WorkflowFormBuilder";
 import { WorkflowWebhookSecretDialog } from "./WorkflowWebhookSecretDialog";
+import { getWorkflowActivationWarning } from "./workflowActivationWarning";
 import { getWorkflowEnabled } from "./workflowDefinition";
 import type { WorkflowEditorPane } from "./workflowEditorPane";
 import {
@@ -49,6 +50,7 @@ import {
   yamlToFormState,
 } from "./workflowFormTypes";
 import {
+  readWorkflowDocumentFields,
   readWorkflowHeaderState,
   yamlWithWorkflowEnabled,
   yamlWithWorkflowName,
@@ -117,7 +119,7 @@ function WorkflowNameEditor({
   generating: boolean;
   name: string;
   onCommit: (name: string) => boolean;
-  onEditingChange: (editing: boolean) => void;
+  onEditingChange?: (editing: boolean) => void;
 }) {
   const [editing, setEditing] = React.useState(false);
   const [draft, setDraft] = React.useState(name);
@@ -134,7 +136,7 @@ function WorkflowNameEditor({
   const changeEditing = React.useCallback(
     (nextEditing: boolean) => {
       setEditing(nextEditing);
-      onEditingChange(nextEditing);
+      onEditingChange?.(nextEditing);
     },
     [onEditingChange],
   );
@@ -247,13 +249,10 @@ export function WorkflowDialog({
   const [editorParseError, setEditorParseError] = React.useState<string | null>(
     null,
   );
-  const [workflowNameEditing, setWorkflowNameEditing] = React.useState(false);
   const [historyOpen, setHistoryOpen] = React.useState(false);
   const [channelAutoOpenPending, setChannelAutoOpenPending] = React.useState(
     mode === "create" && !channelId,
   );
-  const [nameLeadingElement, setNameLeadingElement] =
-    React.useState<HTMLDivElement | null>(null);
   const [savedWebhookInfo, setSavedWebhookInfo] = React.useState<{
     relayHttpUrl: string | null;
     relayUrlError: string | null;
@@ -262,6 +261,12 @@ export function WorkflowDialog({
   } | null>(null);
   const [discardConfirmationOpen, setDiscardConfirmationOpen] =
     React.useState(false);
+  const [activationConfirmationOpen, setActivationConfirmationOpen] =
+    React.useState(false);
+  const [pendingCreateYaml, setPendingCreateYaml] = React.useState<
+    string | null
+  >(null);
+  const [formValid, setFormValid] = React.useState(true);
   const [secretConfirmationOpen, setSecretConfirmationOpen] =
     React.useState(false);
   const [generatingName, setGeneratingName] = React.useState(false);
@@ -299,6 +304,9 @@ export function WorkflowDialog({
     let active = true;
     setSavedWebhookInfo(null);
     setDiscardConfirmationOpen(false);
+    setActivationConfirmationOpen(false);
+    setPendingCreateYaml(null);
+    setFormValid(true);
     resetCreate();
     resetUpdate();
 
@@ -338,6 +346,8 @@ export function WorkflowDialog({
     resetCreate();
     resetUpdate();
     setDiscardConfirmationOpen(false);
+    setActivationConfirmationOpen(false);
+    setPendingCreateYaml(null);
     onOpenChange(false);
   }, [onOpenChange, resetCreate, resetUpdate]);
 
@@ -402,14 +412,12 @@ export function WorkflowDialog({
     [closeDialog, isDirty, onOpenChange, savedWebhookInfo],
   );
 
-  async function handleSubmit() {
-    if (!selectedChannelId || !yamlDefinition.trim()) return;
-
+  async function saveWorkflow(yaml: string) {
     try {
-      const saved = await mutation.mutateAsync(yamlDefinition);
+      const saved = await mutation.mutateAsync(yaml);
       initialValuesRef.current = {
         channelId: selectedChannelId,
-        yaml: yamlDefinition,
+        yaml,
       };
       if (saved.webhookSecret) {
         allowNavigationRef.current = false;
@@ -441,6 +449,37 @@ export function WorkflowDialog({
     }
   }
 
+  function handleSubmit() {
+    if (!selectedChannelId || !yamlDefinition.trim() || !formValid) return;
+
+    const documentEnabled = readWorkflowDocumentFields(yamlDefinition).enabled;
+    const savedEnabled = workflowSnapshot
+      ? getWorkflowEnabled(workflowSnapshot.definition)
+      : null;
+    const enablesWorkflow =
+      documentEnabled !== false && (mode !== "edit" || savedEnabled === false);
+    if (enablesWorkflow && getWorkflowActivationWarning(yamlDefinition)) {
+      const disabledYaml = yamlWithWorkflowEnabled(yamlDefinition, false);
+      if (disabledYaml === null) return;
+      setPendingCreateYaml(disabledYaml);
+      setActivationConfirmationOpen(true);
+      return;
+    }
+
+    void saveWorkflow(yamlDefinition);
+  }
+
+  function handleCreateActivation(enabled: boolean) {
+    if (pendingCreateYaml === null) return;
+    const yaml = enabled
+      ? yamlWithWorkflowEnabled(pendingCreateYaml, true)
+      : pendingCreateYaml;
+    if (yaml === null) return;
+    setActivationConfirmationOpen(false);
+    setPendingCreateYaml(null);
+    void saveWorkflow(yaml);
+  }
+
   const handleEditorModeChange = React.useCallback(
     (nextMode: string) => {
       if (nextMode === editorMode) return;
@@ -504,6 +543,10 @@ export function WorkflowDialog({
     setYamlDefinition(nextYaml);
   }, [mutation.reset, workflowEnabled]);
   const showChannelSelector = mode !== "edit";
+  const activationWarning =
+    pendingCreateYaml === null
+      ? null
+      : getWorkflowActivationWarning(pendingCreateYaml);
 
   return (
     <>
@@ -539,17 +582,6 @@ export function WorkflowDialog({
                   generating={generatingName}
                   name={workflowName}
                   onCommit={handleWorkflowNameCommit}
-                  onEditingChange={setWorkflowNameEditing}
-                />
-                <div
-                  className={
-                    mode !== "edit" &&
-                    editorMode === "form" &&
-                    !workflowNameEditing
-                      ? "flex items-center"
-                      : "hidden"
-                  }
-                  ref={setNameLeadingElement}
                 />
               </div>
             </div>
@@ -634,13 +666,14 @@ export function WorkflowDialog({
               channels={channels}
               disabled={mutation.isPending}
               mode={editorMode}
-              nameLeadingContainer={mode === "edit" ? null : nameLeadingElement}
+              nameLeadingContainer={null}
               onChange={(yaml) => {
                 mutation.reset();
                 yamlDefinitionRef.current = yaml;
                 setYamlDefinition(yaml);
               }}
               onSelectedNodeChange={onEditorPaneChange}
+              onValidityChange={setFormValid}
               parseError={editorParseError}
               ref={formBuilderRef}
               scopeField={
@@ -744,6 +777,7 @@ export function WorkflowDialog({
                   disabled={
                     !selectedChannelId ||
                     !yamlDefinition.trim() ||
+                    !formValid ||
                     mutation.isPending
                   }
                   onClick={handleSubmit}
@@ -759,6 +793,48 @@ export function WorkflowDialog({
         </DialogContent>
       </Dialog>
 
+      <AlertDialog
+        onOpenChange={(nextOpen) => {
+          setActivationConfirmationOpen(nextOpen);
+          if (!nextOpen) setPendingCreateYaml(null);
+        }}
+        open={activationConfirmationOpen}
+      >
+        <AlertDialogContent data-testid="workflow-activation-confirmation">
+          <AlertDialogHeader>
+            <AlertDialogTitle>
+              {activationWarning?.title ?? "Turn on this workflow?"}
+            </AlertDialogTitle>
+            <AlertDialogDescription>
+              {activationWarning?.description ??
+                "Turn it on to let it run immediately, or keep it off until you’re ready."}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel asChild>
+              <Button type="button" variant="ghost">
+                Back
+              </Button>
+            </AlertDialogCancel>
+            <Button
+              onClick={() => handleCreateActivation(false)}
+              type="button"
+              variant="outline"
+            >
+              Keep off
+            </Button>
+            <AlertDialogAction asChild>
+              <Button
+                onClick={() => handleCreateActivation(true)}
+                type="button"
+              >
+                Turn on
+              </Button>
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+
       <AlertDialog
         onOpenChange={(nextOpen) => {
           setDiscardConfirmationOpen(nextOpen);
diff --git a/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx b/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx
index 9a525591eb..58e4b4a960 100644
--- a/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx
+++ b/desktop/src/features/workflows/ui/WorkflowFormBuilder.tsx
@@ -1,11 +1,15 @@
 import {
   ArrowDown,
+  CalendarClock,
   Check,
   ChevronDown,
+  GitPullRequest,
+  MessageSquare,
   Plus,
+  SmilePlus,
   Trash2,
+  Webhook,
   X,
-  Zap,
 } from "lucide-react";
 import { FocusScope } from "@radix-ui/react-focus-scope";
 import { AnimatePresence, motion, useReducedMotion } from "motion/react";
@@ -13,6 +17,7 @@ import * as React from "react";
 import { createPortal } from "react-dom";
 
 import type { Channel } from "@/shared/api/types";
+import { StatusEmoji } from "@/features/user-status/ui/StatusEmoji";
 import { Button } from "@/shared/ui/button";
 import { cn } from "@/shared/lib/cn";
 import {
@@ -21,15 +26,20 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/shared/ui/dropdown-menu";
-import { Input } from "@/shared/ui/input";
 import { Switch } from "@/shared/ui/switch";
 import { Textarea } from "@/shared/ui/textarea";
-import { WorkflowEmojiField } from "./WorkflowEmojiField";
-import { WorkflowMessageTextCondition } from "./WorkflowMessageTextConditionEditor";
+import { reactionConditionValue } from "./workflowReactionCondition";
+import { WorkflowTriggerConditions } from "./WorkflowTriggerConditions";
+import { workflowStepDescription } from "./workflowStepDescription";
+import { workflowTriggerDescription } from "./workflowTriggerDescription";
 import { WorkflowScheduleFields } from "./WorkflowScheduleFields";
 import { WorkflowStepCard } from "./WorkflowStepCard";
+import {
+  parseConditionExpressions,
+  conditionValueError,
+  type ParsedConditionExpression,
+} from "./workflowConditionExpression";
 import type { WorkflowEditorPane } from "./workflowEditorPane";
-import { FieldLabel } from "./workflowFormPrimitives";
 import {
   DEFAULT_FORM_STATE,
   ACTION_LABELS,
@@ -52,62 +62,39 @@ import type {
 } from "./workflowFormTypes";
 
 function TriggerConfigFields({
+  conditionDrafts,
   disabled,
   trigger,
+  onConditionDraftsChange,
   onUpdate,
 }: {
+  conditionDrafts: ParsedConditionExpression[] | null;
   disabled?: boolean;
   trigger: TriggerConfig;
+  onConditionDraftsChange: (drafts: ParsedConditionExpression[] | null) => void;
   onUpdate: (trigger: TriggerConfig) => void;
 }) {
   switch (trigger.on) {
     case "message_posted":
-      return (
-        <WorkflowMessageTextCondition
-          disabled={disabled}
-          onChange={(filter) => onUpdate({ ...trigger, filter })}
-          value={trigger.filter ?? ""}
-        />
-      );
     case "diff_posted":
-      return (
-        <div className="space-y-1.5">
-          <FieldLabel htmlFor="wf-trigger-filter">
-            Condition (optional)
-          </FieldLabel>
-          <Input
-            autoCapitalize="off"
-            disabled={disabled}
-            id="wf-trigger-filter"
-            onChange={(event) =>
-              onUpdate({ ...trigger, filter: event.target.value })
-            }
-            placeholder='e.g. str_contains(trigger_text, "deploy")'
-            value={trigger.filter ?? ""}
-          />
-          <p className="text-xs text-muted-foreground">
-            Evalexpr. Empty matches all events.
-          </p>
-        </div>
-      );
     case "reaction_added":
       return (
-        <div className="space-y-1.5">
-          <FieldLabel htmlFor="wf-trigger-emoji">
-            Emoji filter (optional)
-          </FieldLabel>
-          <WorkflowEmojiField
-            ariaLabel="Choose trigger emoji"
-            clearAriaLabel="Clear trigger emoji"
-            disabled={disabled}
-            id="wf-trigger-emoji"
-            onChange={(emoji) => onUpdate({ ...trigger, emoji })}
-            value={trigger.emoji ?? ""}
-          />
-          <p className="text-xs text-muted-foreground">
-            Empty matches any reaction.
-          </p>
-        </div>
+        <WorkflowTriggerConditions
+          key={trigger.on}
+          conditionDrafts={conditionDrafts}
+          disabled={disabled}
+          onConditionDraftsChange={onConditionDraftsChange}
+          onChange={(filter) =>
+            onUpdate({
+              ...trigger,
+              emoji:
+                trigger.on === "reaction_added" ? undefined : trigger.emoji,
+              filter,
+            })
+          }
+          triggerType={trigger.on}
+          value={reactionConditionValue(trigger)}
+        />
       );
     case "webhook":
       return (
@@ -135,6 +122,7 @@ type WorkflowFormBuilderProps = {
   mode: WorkflowEditorMode;
   onChange: (yaml: string) => void;
   onSelectedNodeChange: (pane: WorkflowEditorPane) => void;
+  onValidityChange?: (valid: boolean) => void;
   parseError: string | null;
   scopeField?: React.ReactNode;
   selectedNode: WorkflowEditorPane;
@@ -275,6 +263,7 @@ function WorkflowNode({
               isNumbered && "text-sm font-semibold",
             )}
             data-selected={selected}
+            data-testid="workflow-node-icon"
           >
             {isNumbered ? number : icon}
           </span>
@@ -362,12 +351,13 @@ export const WorkflowFormBuilder = React.forwardRef<
   WorkflowFormBuilderProps
 >(function WorkflowFormBuilder(
   {
-    channels: _channels,
+    channels,
     disabled,
     nameLeadingContainer,
     mode,
     onChange,
     onSelectedNodeChange,
+    onValidityChange,
     parseError,
     scopeField,
     selectedNode: selectedRouteNode,
@@ -383,6 +373,18 @@ export const WorkflowFormBuilder = React.forwardRef<
       ? initialParseRef.current.state
       : DEFAULT_FORM_STATE,
   );
+  const [triggerConditionDrafts, setTriggerConditionDrafts] = React.useState<
+    ParsedConditionExpression[] | null
+  >(null);
+  const conditionDraftsValid =
+    triggerConditionDrafts === null ||
+    triggerConditionDrafts.every(
+      (condition) => !conditionValueError(condition.field, condition.value),
+    );
+
+  React.useEffect(() => {
+    onValidityChange?.(mode !== "form" || conditionDraftsValid);
+  }, [conditionDraftsValid, mode, onValidityChange]);
   const selectedNode =
     selectedRouteNode?.type === "trigger" ||
     (selectedRouteNode?.type === "step" &&
@@ -424,6 +426,7 @@ export const WorkflowFormBuilder = React.forwardRef<
     previousModeRef.current = mode;
 
     if (mode === "yaml") {
+      setTriggerConditionDrafts(null);
       onSelectedNodeChange(null);
       return;
     }
@@ -595,6 +598,33 @@ export const WorkflowFormBuilder = React.forwardRef<
   const selectedStepIndex = selectedStep
     ? formState.steps.findIndex((step) => step.id === selectedStep.id)
     : -1;
+  const triggerEmoji = React.useMemo(() => {
+    if (formState.trigger.on !== "reaction_added") return undefined;
+    const legacyEmoji = formState.trigger.emoji?.trim();
+    if (legacyEmoji) return legacyEmoji;
+    if (!formState.trigger.filter) return undefined;
+    const conditions = parseConditionExpressions(
+      formState.trigger.filter,
+      "reaction_added",
+    );
+    return conditions
+      ?.find(
+        ({ field, operator }) =>
+          field === "trigger_emoji" && operator === "equals",
+      )
+      ?.value.trim();
+  }, [formState.trigger]);
+  const triggerDescription = workflowTriggerDescription(formState.trigger);
+  const visibleTriggerDescription = triggerEmoji
+    ? "Reaction added"
+    : triggerDescription;
+  const TriggerIcon = {
+    diff_posted: GitPullRequest,
+    message_posted: MessageSquare,
+    reaction_added: SmilePlus,
+    schedule: CalendarClock,
+    webhook: Webhook,
+  }[formState.trigger.on];
 
   return (
     <>
@@ -637,10 +667,19 @@ export const WorkflowFormBuilder = React.forwardRef<
                   {scopeField ? <div className="mb-3">{scopeField}</div> : null}
                   <ol aria-label="Workflow sequence">
                     <WorkflowNode
-                      description={TRIGGER_LABELS[formState.trigger.on]}
+                      description={visibleTriggerDescription}
                       disabled={disabled}
-                      icon={<Zap className="h-4 w-4" />}
-                      label={`Trigger: ${TRIGGER_LABELS[formState.trigger.on]}`}
+                      icon={
+                        triggerEmoji ? (
+                          <StatusEmoji
+                            className="h-6 w-6 text-xl"
+                            value={triggerEmoji}
+                          />
+                        ) : (
+                          <TriggerIcon className="h-4 w-4" />
+                        )
+                      }
+                      label={`Trigger: ${triggerDescription}`}
                       onAddAfter={(action) => insertStep(0, action)}
                       onClick={() => selectNode({ type: "trigger" })}
                       selected={selectedNode?.type === "trigger"}
@@ -649,16 +688,39 @@ export const WorkflowFormBuilder = React.forwardRef<
                     />
 
                     {formState.steps.map((step, index) => {
-                      const stepName = step.name?.trim();
                       const actionLabel = ACTION_LABELS[step.action];
-                      const nodeTitle = stepName || actionLabel;
+                      const channelLabel = step.channel
+                        ? channels.find(
+                            (channel) => channel.id === step.channel,
+                          )?.name
+                        : undefined;
+                      const nodeDescription = workflowStepDescription(step, {
+                        channelLabel,
+                      });
+                      const stepEmoji =
+                        step.action === "add_reaction"
+                          ? step.emoji?.trim()
+                          : undefined;
+                      const visibleNodeDescription = stepEmoji
+                        ? actionLabel
+                        : nodeDescription;
+                      const showActionSubtitle =
+                        !stepEmoji && nodeDescription !== actionLabel;
                       return (
                         <WorkflowNode
-                          description={nodeTitle}
+                          description={visibleNodeDescription}
                           disabled={disabled}
+                          icon={
+                            stepEmoji ? (
+                              <StatusEmoji
+                                className="h-6 w-6 text-xl"
+                                value={stepEmoji}
+                              />
+                            ) : undefined
+                          }
                           key={step.id}
-                          label={`Step ${index + 1}: ${nodeTitle}`}
-                          number={index + 1}
+                          label={`Step ${index + 1}: ${nodeDescription}`}
+                          number={stepEmoji ? undefined : index + 1}
                           onAddAfter={(action) => insertStep(index + 1, action)}
                           onClick={() =>
                             selectNode({ type: "step", stepId: step.id })
@@ -669,7 +731,9 @@ export const WorkflowFormBuilder = React.forwardRef<
                             selectedNode.stepId === step.id
                           }
                           showTitle={false}
-                          subtitle={stepName ? actionLabel : undefined}
+                          subtitle={
+                            showActionSubtitle ? actionLabel : undefined
+                          }
                           terminal={index === formState.steps.length - 1}
                           title={`Step ${index + 1}`}
                         />
@@ -746,6 +810,7 @@ export const WorkflowFormBuilder = React.forwardRef<
                                 disabled={disabled}
                                 labels={TRIGGER_LABELS}
                                 onChange={(triggerType) => {
+                                  setTriggerConditionDrafts(null);
                                   const next = withTriggerType(
                                     formState,
                                     triggerType,
@@ -842,7 +907,11 @@ export const WorkflowFormBuilder = React.forwardRef<
                               {selectedNode.type === "trigger" ? (
                                 <div>
                                   <TriggerConfigFields
+                                    conditionDrafts={triggerConditionDrafts}
                                     disabled={disabled}
+                                    onConditionDraftsChange={
+                                      setTriggerConditionDrafts
+                                    }
                                     onUpdate={(trigger) =>
                                       updateFormState({ ...formState, trigger })
                                     }
@@ -858,6 +927,10 @@ export const WorkflowFormBuilder = React.forwardRef<
                                   onUpdate={(updated) =>
                                     updateStep(selectedStepIndex, updated)
                                   }
+                                  previousSteps={formState.steps.slice(
+                                    0,
+                                    selectedStepIndex,
+                                  )}
                                   showHeader={false}
                                   step={selectedStep}
                                   triggerType={formState.trigger.on}
diff --git a/desktop/src/features/workflows/ui/WorkflowStepCard.tsx b/desktop/src/features/workflows/ui/WorkflowStepCard.tsx
index 20c6d4dad3..539edf2ba9 100644
--- a/desktop/src/features/workflows/ui/WorkflowStepCard.tsx
+++ b/desktop/src/features/workflows/ui/WorkflowStepCard.tsx
@@ -6,6 +6,7 @@ import { Button } from "@/shared/ui/button";
 import { Checkbox } from "@/shared/ui/checkbox";
 import { Input } from "@/shared/ui/input";
 import { Textarea } from "@/shared/ui/textarea";
+import { WorkflowTemplateTextarea } from "./WorkflowTemplateTextarea";
 import { WorkflowDurationField } from "./WorkflowDurationField";
 import { WorkflowMessageTextCondition } from "./WorkflowMessageTextConditionEditor";
 import { FieldLabel, FormSelect } from "./workflowFormPrimitives";
@@ -109,6 +110,7 @@ function StepConfigFields({
   step,
   prefix,
   disabled,
+  previousSteps,
   triggerType,
   workflowChannelId,
   onUpdate,
@@ -116,6 +118,7 @@ function StepConfigFields({
   step: StepFormState;
   prefix: string;
   disabled?: boolean;
+  previousSteps: StepFormState[];
   triggerType: TriggerType;
   workflowChannelId?: string | null;
   onUpdate: (step: StepFormState) => void;
@@ -142,15 +145,15 @@ function StepConfigFields({
         <div className="space-y-2">
           <div className="space-y-1.5">
             <FieldLabel htmlFor={`${prefix}-text`}>Message text</FieldLabel>
-            <Textarea
+            <WorkflowTemplateTextarea
               autoCapitalize="off"
               className="min-h-[60px] resize-y text-xs"
               disabled={disabled}
               id={`${prefix}-text`}
-              onChange={(event) =>
-                onUpdate({ ...step, text: event.target.value })
-              }
+              onValueChange={(text) => onUpdate({ ...step, text })}
               placeholder="e.g. Deployment started by {{trigger.author}}"
+              previousSteps={previousSteps}
+              triggerType={triggerType}
               value={step.text ?? ""}
             />
           </div>
@@ -390,6 +393,7 @@ export function WorkflowStepCard({
   onRemove,
   onUpdate,
   step,
+  previousSteps = [],
   triggerType,
   workflowChannelId,
 }: {
@@ -400,6 +404,7 @@ export function WorkflowStepCard({
   onRemove: () => void;
   onUpdate: (step: StepFormState) => void;
   step: StepFormState;
+  previousSteps?: StepFormState[];
   triggerType: TriggerType;
   workflowChannelId?: string | null;
 }) {
@@ -443,6 +448,7 @@ export function WorkflowStepCard({
           disabled={disabled}
           onUpdate={onUpdate}
           prefix={prefix}
+          previousSteps={previousSteps}
           step={step}
           triggerType={triggerType}
           workflowChannelId={workflowChannelId}
diff --git a/desktop/src/features/workflows/ui/WorkflowTemplateTextarea.tsx b/desktop/src/features/workflows/ui/WorkflowTemplateTextarea.tsx
new file mode 100644
index 0000000000..7abf8e98e1
--- /dev/null
+++ b/desktop/src/features/workflows/ui/WorkflowTemplateTextarea.tsx
@@ -0,0 +1,188 @@
+import * as React from "react";
+
+import { cn } from "@/shared/lib/cn";
+import { Popover, PopoverAnchor, PopoverContent } from "@/shared/ui/popover";
+import { Textarea } from "@/shared/ui/textarea";
+import type { StepFormState, TriggerType } from "./workflowFormTypes";
+import {
+  activeTemplateToken,
+  insertTemplateVariable,
+  workflowTemplateVariables,
+} from "./workflowTemplateVariables";
+import type {
+  ActiveTemplateToken,
+  WorkflowTemplateVariable,
+} from "./workflowTemplateVariables";
+
+export function WorkflowTemplateTextarea({
+  className,
+  disabled,
+  onValueChange,
+  previousSteps,
+  triggerType,
+  value,
+  ...props
+}: Omit<React.ComponentProps<typeof Textarea>, "onChange" | "value"> & {
+  onValueChange: (value: string) => void;
+  previousSteps: StepFormState[];
+  triggerType: TriggerType;
+  value: string;
+}) {
+  const textareaRef = React.useRef<HTMLTextAreaElement>(null);
+  const generatedId = React.useId();
+  const textareaId = props.id ?? `workflow-template-${generatedId}`;
+  const listboxId = `${textareaId}-variables`;
+  const [token, setToken] = React.useState<ActiveTemplateToken | null>(null);
+  const [selectedIndex, setSelectedIndex] = React.useState(0);
+  const variables = React.useMemo(
+    () => workflowTemplateVariables(triggerType, previousSteps),
+    [previousSteps, triggerType],
+  );
+  const suggestions = React.useMemo(() => {
+    if (!token) return [];
+    const query = token.query.toLowerCase();
+    return variables.filter(
+      (variable) =>
+        variable.value.toLowerCase().includes(query) ||
+        variable.description.toLowerCase().includes(query),
+    );
+  }, [token, variables]);
+  const open = token !== null;
+  const selectedOptionId = suggestions[selectedIndex]
+    ? `${listboxId}-option-${selectedIndex}`
+    : undefined;
+
+  const updateToken = React.useCallback((nextValue: string, caret: number) => {
+    setToken(activeTemplateToken(nextValue, caret));
+    setSelectedIndex(0);
+  }, []);
+
+  const selectVariable = React.useCallback(
+    (variable: WorkflowTemplateVariable) => {
+      if (!token) return;
+      const next = insertTemplateVariable(value, token, variable.value);
+      onValueChange(next.value);
+      setToken(null);
+      requestAnimationFrame(() => {
+        const textarea = textareaRef.current;
+        textarea?.focus();
+        textarea?.setSelectionRange(next.caret, next.caret);
+      });
+    },
+    [onValueChange, token, value],
+  );
+
+  return (
+    <Popover
+      open={open}
+      onOpenChange={(nextOpen) => {
+        if (!nextOpen) setToken(null);
+      }}
+    >
+      <PopoverAnchor asChild>
+        <Textarea
+          {...props}
+          aria-activedescendant={open ? selectedOptionId : undefined}
+          aria-autocomplete="list"
+          aria-controls={open ? listboxId : undefined}
+          aria-expanded={open}
+          aria-haspopup="listbox"
+          className={className}
+          disabled={disabled}
+          id={textareaId}
+          onChange={(event) => {
+            const nextValue = event.target.value;
+            onValueChange(nextValue);
+            updateToken(nextValue, event.target.selectionStart);
+          }}
+          onClick={(event) =>
+            updateToken(
+              event.currentTarget.value,
+              event.currentTarget.selectionStart,
+            )
+          }
+          onKeyDown={(event) => {
+            if (!open) return;
+            if (event.key === "Escape") {
+              event.preventDefault();
+              setToken(null);
+              return;
+            }
+            if (suggestions.length === 0) return;
+            if (event.key === "ArrowDown" || event.key === "ArrowUp") {
+              event.preventDefault();
+              const direction = event.key === "ArrowDown" ? 1 : -1;
+              setSelectedIndex(
+                (current) =>
+                  (current + direction + suggestions.length) %
+                  suggestions.length,
+              );
+              return;
+            }
+            if (event.key === "Enter" || event.key === "Tab") {
+              event.preventDefault();
+              selectVariable(suggestions[selectedIndex] ?? suggestions[0]);
+            }
+          }}
+          ref={textareaRef}
+          value={value}
+        />
+      </PopoverAnchor>
+      <PopoverContent
+        align="start"
+        className="w-[var(--radix-popover-trigger-width)] min-w-72 p-1.5"
+        onOpenAutoFocus={(event) => event.preventDefault()}
+        side="bottom"
+        sideOffset={6}
+      >
+        <div className="max-h-72 overflow-y-auto" id={listboxId} role="listbox">
+          {suggestions.length > 0 ? (
+            suggestions.map((variable, index) => {
+              const previousGroup = suggestions[index - 1]?.group;
+              return (
+                <React.Fragment key={variable.value}>
+                  {variable.group !== previousGroup ? (
+                    <p className="px-2 pb-1 pt-1.5 text-2xs font-semibold uppercase tracking-wide text-muted-foreground">
+                      {variable.group}
+                    </p>
+                  ) : null}
+                  <button
+                    aria-selected={index === selectedIndex}
+                    className={cn(
+                      "flex w-full items-center justify-between gap-3 rounded-md px-2 py-1.5 text-left",
+                      index === selectedIndex
+                        ? "bg-muted text-foreground"
+                        : "text-foreground hover:bg-muted/60",
+                    )}
+                    id={`${listboxId}-option-${index}`}
+                    onMouseDown={(event) => event.preventDefault()}
+                    onMouseEnter={() => setSelectedIndex(index)}
+                    onClick={() => selectVariable(variable)}
+                    role="option"
+                    type="button"
+                  >
+                    <code className="min-w-0 truncate text-xs">
+                      {`{{${variable.value}}}`}
+                    </code>
+                    <span className="shrink-0 text-2xs text-muted-foreground">
+                      {variable.description}
+                    </span>
+                  </button>
+                </React.Fragment>
+              );
+            })
+          ) : (
+            <p className="px-2 py-2 text-xs text-muted-foreground">
+              No matching variables
+            </p>
+          )}
+        </div>
+        {triggerType === "webhook" ? (
+          <p className="border-t border-border/50 px-2 pb-1 pt-2 text-2xs text-muted-foreground">
+            JSON fields are available as {"{{trigger.field_name}}"}.
+          </p>
+        ) : null}
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/desktop/src/features/workflows/ui/WorkflowTriggerConditions.tsx b/desktop/src/features/workflows/ui/WorkflowTriggerConditions.tsx
new file mode 100644
index 0000000000..39caec253a
--- /dev/null
+++ b/desktop/src/features/workflows/ui/WorkflowTriggerConditions.tsx
@@ -0,0 +1,327 @@
+import { ChevronRight } from "lucide-react";
+import * as React from "react";
+
+import { cn } from "@/shared/lib/cn";
+import { Input } from "@/shared/ui/input";
+import { Tabs, TabsList, TabsTrigger } from "@/shared/ui/tabs";
+import { WorkflowEmojiField } from "./WorkflowEmojiField";
+import { FieldLabel } from "./workflowFormPrimitives";
+import {
+  buildConditionExpressions,
+  conditionFieldsForTrigger,
+  conditionOperatorNeedsValue,
+  conditionOperatorsForField,
+  conditionValueError,
+  parseConditionExpressions,
+  type ConditionOperator,
+  type ParsedConditionExpression,
+} from "./workflowConditionExpression";
+import type { TriggerType } from "./workflowFormTypes";
+
+const OPERATOR_LABELS: Record<ConditionOperator, string> = {
+  contains: "contains",
+  not_contains: "does not contain",
+  starts_with: "starts with",
+  ends_with: "ends with",
+  equals: "is",
+  not_equals: "is not",
+  is_not_empty: "is not empty",
+  is_empty: "is empty",
+};
+
+function emptyCondition(field: string): ParsedConditionExpression {
+  return {
+    field,
+    operator: conditionOperatorsForField(field)[0],
+    value: "",
+    webhookField: "",
+  };
+}
+
+function compact(value: string): string {
+  const trimmed = value.trim();
+  return trimmed.length <= 20
+    ? trimmed
+    : `${trimmed.slice(0, 11)}…${trimmed.slice(-6)}`;
+}
+
+function fieldPlaceholder(field: string): string {
+  if (field === "trigger_author") return "64-character hex pubkey";
+  if (field === "trigger_message_id") return "64-character hex event ID";
+  return "e.g. deploy";
+}
+
+export function WorkflowTriggerConditions({
+  conditionDrafts,
+  disabled,
+  onChange,
+  onConditionDraftsChange,
+  triggerType,
+  value,
+}: {
+  conditionDrafts: ParsedConditionExpression[] | null;
+  disabled?: boolean;
+  onChange: (value: string) => void;
+  onConditionDraftsChange: (drafts: ParsedConditionExpression[] | null) => void;
+  triggerType: Extract<
+    TriggerType,
+    "message_posted" | "diff_posted" | "reaction_added"
+  >;
+  value: string;
+}) {
+  const parsedValue = React.useMemo(
+    () => parseConditionExpressions(value, triggerType),
+    [triggerType, value],
+  );
+  const [mode, setMode] = React.useState<"basic" | "advanced">(() =>
+    value && parsedValue === null ? "advanced" : "basic",
+  );
+  const [expandedField, setExpandedField] = React.useState<string | null>(
+    () => conditionFieldsForTrigger(triggerType)[0]?.value ?? null,
+  );
+  const conditions = conditionDrafts ?? parsedValue ?? [];
+  const localValue = React.useRef(value);
+
+  React.useEffect(() => {
+    if (value === localValue.current) return;
+    localValue.current = value;
+    const parsed = parseConditionExpressions(value, triggerType);
+    if (parsed) {
+      onConditionDraftsChange(null);
+      setMode("basic");
+    } else if (value) {
+      setMode("advanced");
+    }
+  }, [onConditionDraftsChange, triggerType, value]);
+
+  const updateConditions = (next: ParsedConditionExpression[]) => {
+    onConditionDraftsChange(next);
+    if (
+      next.some((condition) =>
+        conditionValueError(condition.field, condition.value),
+      )
+    ) {
+      return;
+    }
+    const expression = buildConditionExpressions(next);
+    localValue.current = expression;
+    onChange(expression);
+  };
+
+  const fields = conditionFieldsForTrigger(triggerType);
+
+  return (
+    <Tabs
+      className="space-y-3"
+      onValueChange={(next) => setMode(next as "basic" | "advanced")}
+      value={mode}
+    >
+      <TabsList
+        aria-label="Condition editor mode"
+        className="grid h-9 w-full grid-cols-2 p-0.5"
+      >
+        <TabsTrigger className="h-8" disabled={disabled} value="basic">
+          Basic
+        </TabsTrigger>
+        <TabsTrigger className="h-8" disabled={disabled} value="advanced">
+          Advanced
+        </TabsTrigger>
+      </TabsList>
+
+      {mode === "advanced" ? (
+        <div className="space-y-2">
+          <Input
+            aria-label="Advanced expression"
+            autoCapitalize="off"
+            autoCorrect="off"
+            disabled={disabled}
+            onChange={(event) => {
+              onConditionDraftsChange(null);
+              localValue.current = event.target.value;
+              onChange(event.target.value.trim());
+            }}
+            placeholder='e.g. trigger_author == "…"'
+            value={value}
+          />
+          <p className="text-xs text-muted-foreground">
+            Use an evalexpr expression. Existing custom expressions stay
+            unchanged.
+          </p>
+        </div>
+      ) : parsedValue === null && value.trim() ? (
+        <div className="space-y-3 rounded-md border border-border/70 p-3">
+          <p className="text-xs text-muted-foreground">
+            An advanced expression is active. Replacing it with basic filters
+            cannot be undone.
+          </p>
+          <button
+            className="text-sm font-medium text-destructive hover:underline"
+            disabled={disabled}
+            onClick={() => {
+              onConditionDraftsChange(null);
+              localValue.current = "";
+              onChange("");
+            }}
+            type="button"
+          >
+            Replace with basic filters
+          </button>
+        </div>
+      ) : (
+        <div className="divide-y divide-border/50">
+          {fields.map((field) => {
+            const existing = conditions.find(
+              (condition) => condition.field === field.value,
+            );
+            const condition = existing ?? emptyCondition(field.value);
+            const expanded = expandedField === field.value;
+            const error = conditionValueError(field.value, condition.value);
+            const summary = existing
+              ? `${OPERATOR_LABELS[condition.operator]}${condition.value ? ` ${compact(condition.value)}` : ""}`
+              : "Any";
+            return (
+              <div className={cn(expanded && "pb-4")} key={field.value}>
+                <button
+                  aria-expanded={expanded}
+                  className="flex min-h-12 w-full items-center gap-3 py-3 text-left transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring disabled:opacity-50"
+                  disabled={disabled}
+                  onClick={() =>
+                    setExpandedField(expanded ? null : field.value)
+                  }
+                  type="button"
+                >
+                  <span className="min-w-0 flex-1 truncate text-base font-medium">
+                    {field.label}
+                  </span>
+                  <span className="max-w-44 truncate font-mono text-xs text-muted-foreground">
+                    {summary}
+                  </span>
+                  <ChevronRight
+                    className={cn(
+                      "h-4 w-4 shrink-0 text-muted-foreground/70 transition-transform duration-150 motion-reduce:transition-none",
+                      expanded && "rotate-90",
+                    )}
+                  />
+                </button>
+                {expanded ? (
+                  <div className="animate-in space-y-3 pt-1 fade-in slide-in-from-top-1 duration-150 motion-reduce:animate-none">
+                    <fieldset>
+                      <legend className="sr-only">Match</legend>
+                      <div className="grid grid-cols-2 gap-2.5">
+                        {conditionOperatorsForField(field.value).map(
+                          (operator) => {
+                            const selected = condition.operator === operator;
+                            return (
+                              <button
+                                aria-pressed={selected}
+                                className={cn(
+                                  "flex min-h-12 items-center justify-center rounded-lg border px-3 py-2 text-center text-sm font-medium",
+                                  "outline-2 outline-offset-2 outline-transparent transition-[background-color,border-color,color,outline-color] focus-visible:ring-2 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+                                  selected
+                                    ? "border-border/0 bg-transparent text-foreground outline-foreground/45"
+                                    : "border-border/70 bg-background/35 text-muted-foreground hover:border-border hover:bg-muted/55 hover:text-foreground hover:outline-muted-foreground/20",
+                                )}
+                                disabled={disabled}
+                                key={operator}
+                                onClick={() => {
+                                  const next = { ...condition, operator };
+                                  updateConditions([
+                                    ...conditions.filter(
+                                      (item) => item.field !== field.value,
+                                    ),
+                                    next,
+                                  ]);
+                                }}
+                                type="button"
+                              >
+                                {OPERATOR_LABELS[operator]}
+                              </button>
+                            );
+                          },
+                        )}
+                      </div>
+                    </fieldset>
+                    {conditionOperatorNeedsValue(condition.operator) ? (
+                      field.value === "trigger_emoji" ? (
+                        <WorkflowEmojiField
+                          ariaLabel="Choose trigger emoji"
+                          clearAriaLabel="Clear trigger emoji"
+                          disabled={disabled}
+                          id="wf-trigger-emoji"
+                          onChange={(emoji) =>
+                            updateConditions([
+                              ...conditions.filter(
+                                (item) => item.field !== field.value,
+                              ),
+                              { ...condition, value: emoji ?? "" },
+                            ])
+                          }
+                          value={condition.value}
+                        />
+                      ) : (
+                        <div className="space-y-1.5">
+                          <FieldLabel
+                            htmlFor={`wf-trigger-${field.value}-value`}
+                          >
+                            {field.label}
+                          </FieldLabel>
+                          <Input
+                            aria-describedby={
+                              error
+                                ? `wf-trigger-${field.value}-error`
+                                : undefined
+                            }
+                            aria-invalid={error ? true : undefined}
+                            autoCapitalize="off"
+                            autoCorrect="off"
+                            disabled={disabled}
+                            id={`wf-trigger-${field.value}-value`}
+                            onChange={(event) =>
+                              updateConditions([
+                                ...conditions.filter(
+                                  (item) => item.field !== field.value,
+                                ),
+                                { ...condition, value: event.target.value },
+                              ])
+                            }
+                            placeholder={fieldPlaceholder(field.value)}
+                            spellCheck={field.value === "trigger_text"}
+                            value={condition.value}
+                          />
+                          {error ? (
+                            <p
+                              className="text-xs text-destructive"
+                              id={`wf-trigger-${field.value}-error`}
+                            >
+                              {error}
+                            </p>
+                          ) : null}
+                        </div>
+                      )
+                    ) : null}
+                    {existing ? (
+                      <button
+                        className="text-xs font-medium text-muted-foreground hover:text-foreground"
+                        disabled={disabled}
+                        onClick={() =>
+                          updateConditions(
+                            conditions.filter(
+                              (item) => item.field !== field.value,
+                            ),
+                          )
+                        }
+                        type="button"
+                      >
+                        Clear filter
+                      </button>
+                    ) : null}
+                  </div>
+                ) : null}
+              </div>
+            );
+          })}
+        </div>
+      )}
+    </Tabs>
+  );
+}
diff --git a/desktop/src/features/workflows/ui/WorkflowsView.tsx b/desktop/src/features/workflows/ui/WorkflowsView.tsx
index f0dfb1b7dd..ba4cdf0bae 100644
--- a/desktop/src/features/workflows/ui/WorkflowsView.tsx
+++ b/desktop/src/features/workflows/ui/WorkflowsView.tsx
@@ -9,6 +9,7 @@ import {
   workflowListFocusRefetchPolicy,
   workflowQueryKey,
 } from "@/features/workflows/hooks";
+import { getWorkflowActivationWarning } from "@/features/workflows/ui/workflowActivationWarning";
 import { WorkflowCard } from "@/features/workflows/ui/WorkflowCard";
 import { WorkflowDeleteDialog } from "@/features/workflows/ui/WorkflowDeleteDialog";
 import { WorkflowEditorHost } from "@/features/workflows/ui/WorkflowEditorHost";
@@ -25,6 +26,16 @@ import {
   triggerWorkflow,
   updateWorkflow,
 } from "@/shared/api/tauriWorkflows";
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from "@/shared/ui/alert-dialog";
 import { Button } from "@/shared/ui/button";
 import { PageHeader } from "@/shared/ui/PageHeader";
 import { Skeleton } from "@/shared/ui/skeleton";
@@ -99,6 +110,8 @@ export function WorkflowsView({
   onEditorPaneChange,
 }: WorkflowsViewProps) {
   const [deleteTarget, setDeleteTarget] = React.useState<Workflow | null>(null);
+  const [activationTarget, setActivationTarget] =
+    React.useState<Workflow | null>(null);
   const queryClient = useQueryClient();
 
   const editorWorkflowId =
@@ -175,6 +188,7 @@ export function WorkflowsView({
       });
     },
     onSuccess: (_data, workflow) => {
+      setActivationTarget(null);
       void queryClient.invalidateQueries({
         queryKey: workflowQueryKey(workflow.id),
       });
@@ -230,9 +244,21 @@ export function WorkflowsView({
 
   const toggleEnabled = toggleEnabledMutation.mutate;
   const handleToggleEnabled = React.useCallback(
-    (workflow: Workflow) => toggleEnabled(workflow),
+    (workflow: Workflow) => {
+      if (
+        !getWorkflowEnabled(workflow.definition) &&
+        getWorkflowActivationWarning(yamlStringify(workflow.definition))
+      ) {
+        setActivationTarget(workflow);
+        return;
+      }
+      toggleEnabled(workflow);
+    },
     [toggleEnabled],
   );
+  const activationWarning = activationTarget
+    ? getWorkflowActivationWarning(yamlStringify(activationTarget.definition))
+    : null;
 
   const editorWorkflowHint = allWorkflows.find(
     ({ workflow }) => workflow.id === editorWorkflowId,
@@ -316,6 +342,40 @@ export function WorkflowsView({
         workflowHint={editorWorkflowHint}
       />
 
+      <AlertDialog
+        onOpenChange={(open) => {
+          if (!open && !toggleEnabledMutation.isPending) {
+            setActivationTarget(null);
+          }
+        }}
+        open={activationTarget !== null}
+      >
+        <AlertDialogContent data-testid="workflow-activation-confirmation">
+          <AlertDialogHeader>
+            <AlertDialogTitle>
+              {activationWarning?.title ?? "Turn on this workflow?"}
+            </AlertDialogTitle>
+            <AlertDialogDescription>
+              {activationWarning?.description ??
+                "Turn it on to let it run immediately, or keep it off until you’re ready."}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel>Keep off</AlertDialogCancel>
+            <AlertDialogAction
+              disabled={toggleEnabledMutation.isPending}
+              onClick={(event) => {
+                if (!activationTarget) return;
+                event.preventDefault();
+                toggleEnabled(activationTarget);
+              }}
+            >
+              Turn on
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+
       <WorkflowDeleteDialog
         error={
           deleteMutation.error instanceof Error
diff --git a/desktop/src/features/workflows/ui/workflowActivationWarning.test.mjs b/desktop/src/features/workflows/ui/workflowActivationWarning.test.mjs
new file mode 100644
index 0000000000..dcd6155c44
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowActivationWarning.test.mjs
@@ -0,0 +1,107 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { getWorkflowActivationWarning } from "./workflowActivationWarning.ts";
+
+function workflowYaml(trigger) {
+  return `name: Test\ntrigger:\n${trigger}\nsteps:\n  - id: notify\n    action: send_message\n    text: Hi\n`;
+}
+
+test("warns when a message trigger matches every message", () => {
+  assert.deepEqual(
+    getWorkflowActivationWarning(workflowYaml("  on: message_posted")),
+    {
+      description:
+        "It will run for every new message in this channel. Review the trigger before turning it on.",
+      title: "This workflow may run often",
+    },
+  );
+});
+
+test("does not warn when a message trigger is narrowed", () => {
+  assert.equal(
+    getWorkflowActivationWarning(
+      workflowYaml('  on: message_posted\n  filter: text == "deploy"'),
+    ),
+    null,
+  );
+});
+
+test("warns for hourly-or-faster interval schedules with concrete copy", () => {
+  assert.equal(
+    getWorkflowActivationWarning(
+      workflowYaml("  on: schedule\n  interval: 15m"),
+    )?.description,
+    "It is scheduled to run every 15 minutes. Review the schedule before turning it on.",
+  );
+  assert.equal(
+    getWorkflowActivationWarning(
+      workflowYaml("  on: schedule\n  interval: 2h"),
+    ),
+    null,
+  );
+});
+
+test("warns for clear hourly-or-faster cron schedules", () => {
+  for (const cron of ["*/5 * * * *", "0 */5 * * * *", "0 */5 * * * * *"]) {
+    assert.equal(
+      getWorkflowActivationWarning(
+        workflowYaml(`  on: schedule\n  cron: "${cron}"`),
+      )?.description,
+      "It is scheduled to run every 5 minutes. Review the schedule before turning it on.",
+    );
+  }
+  assert.equal(
+    getWorkflowActivationWarning(
+      workflowYaml('  on: schedule\n  cron: "*/10 * * * * *"'),
+    )?.description,
+    "It is scheduled to run multiple times a minute. Review the schedule before turning it on.",
+  );
+  assert.equal(
+    getWorkflowActivationWarning(
+      workflowYaml('  on: schedule\n  cron: "0 9 * * *"'),
+    ),
+    null,
+  );
+});
+
+test("warns for stepped, ranged, and listed hourly cron schedules", () => {
+  for (const cron of [
+    "0 0 */1 * * *",
+    "0 0 * * * *",
+    "0 0 0-23 * * *",
+    "0 0 0-11,12-23 * * *",
+    "0 0 */1 * * * *",
+  ]) {
+    assert.equal(
+      getWorkflowActivationWarning(
+        workflowYaml(`  on: schedule\n  cron: "${cron}"`),
+      )?.description,
+      "It is scheduled to run every hour. Review the schedule before turning it on.",
+      cron,
+    );
+  }
+  assert.equal(
+    getWorkflowActivationWarning(
+      workflowYaml('  on: schedule\n  cron: "*/5 0-23 * * *"'),
+    )?.description,
+    "It is scheduled to run every 5 minutes. Review the schedule before turning it on.",
+  );
+  for (const cron of ["0 */3 * * *", "0 0 0,12 * * *", "0 0 8-17 * * *"]) {
+    assert.equal(
+      getWorkflowActivationWarning(
+        workflowYaml(`  on: schedule\n  cron: "${cron}"`),
+      ),
+      null,
+      cron,
+    );
+  }
+});
+
+test("returns no warning for malformed or unrelated definitions", () => {
+  assert.equal(getWorkflowActivationWarning("not: [valid"), null);
+  assert.equal(
+    getWorkflowActivationWarning(workflowYaml("  on: reaction_added")),
+    null,
+  );
+});
diff --git a/desktop/src/features/workflows/ui/workflowActivationWarning.ts b/desktop/src/features/workflows/ui/workflowActivationWarning.ts
new file mode 100644
index 0000000000..ff1cd971fb
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowActivationWarning.ts
@@ -0,0 +1,160 @@
+import { parse as yamlParse } from "yaml";
+
+import {
+  formatDurationSecondsVerbose,
+  parseDurationSeconds,
+} from "./workflowDuration";
+
+type WorkflowActivationWarning = {
+  description: string;
+  title: string;
+};
+
+const FREQUENT_SCHEDULE_THRESHOLD_SECONDS = 60 * 60;
+
+function asRecord(value: unknown): Record<string, unknown> | null {
+  return value !== null && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : null;
+}
+
+function nonEmptyString(value: unknown): string | null {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+
+function frequentIntervalDescription(interval: string): string | null {
+  const seconds = parseDurationSeconds(interval);
+  if (
+    seconds === null ||
+    seconds <= 0 ||
+    seconds > FREQUENT_SCHEDULE_THRESHOLD_SECONDS
+  ) {
+    return null;
+  }
+  return `It is scheduled to run every ${formatDurationSecondsVerbose(seconds)}. Review the schedule before turning it on.`;
+}
+
+function normalizedCronFields(cron: string): string[] | null {
+  const fields = cron.trim().split(/\s+/);
+  if (fields.length === 5) return ["0", ...fields, "*"];
+  if (fields.length === 6) return [...fields, "*"];
+  return fields.length === 7 ? fields : null;
+}
+
+function repeatedFieldCount(field: string, maximum: number): number | null {
+  if (field === "*") return maximum + 1;
+  const step = /^\*\/(\d+)$/.exec(field);
+  if (step) {
+    const size = Number(step[1]);
+    return size >= 1 && size <= maximum + 1
+      ? Math.ceil((maximum + 1) / size)
+      : null;
+  }
+  if (field.includes(",") || field.includes("-")) return 2;
+  return /^\d+$/.test(field) ? 1 : null;
+}
+
+/**
+ * Reports whether an hour field selects every hour of the day, so schedules
+ * written as `*`, `*\/1`, `0-23`, or an equivalent list still classify as
+ * hourly. Unrecognized fields are treated as not matching every hour.
+ */
+function matchesEveryHour(field: string): boolean {
+  const HOURS = 24;
+  const selected = new Set<number>();
+  for (const segment of field.split(",")) {
+    const [base, step] = segment.split("/");
+    if (step !== undefined && (!/^\d+$/.test(step) || Number(step) < 1)) {
+      return false;
+    }
+    const size = step === undefined ? 1 : Number(step);
+    let start: number, end: number;
+    if (base === "*") {
+      start = 0;
+      end = HOURS - 1;
+    } else {
+      const bounds = base.split("-");
+      if (bounds.length > 2 || bounds.some((part) => !/^\d+$/.test(part))) {
+        return false;
+      }
+      start = Number(bounds[0]);
+      end = bounds.length === 2 ? Number(bounds[1]) : start;
+      if (start > end || end >= HOURS) return false;
+      // A bare hour selects only itself; a stepped one runs to end of day.
+      if (bounds.length === 1) {
+        if (step === undefined) {
+          selected.add(start);
+          continue;
+        }
+        end = HOURS - 1;
+      }
+    }
+    for (let hour = start; hour <= end; hour += size) selected.add(hour);
+  }
+  return selected.size === HOURS;
+}
+
+function frequentCronDescription(cron: string): string | null {
+  const fields = normalizedCronFields(cron);
+  if (!fields) return null;
+  const [second, minute, hour] = fields;
+  const secondRuns = repeatedFieldCount(second, 59);
+  const minuteRuns = repeatedFieldCount(minute, 59);
+  if (secondRuns === null || minuteRuns === null) return null;
+  if (!matchesEveryHour(hour)) return null;
+
+  if (secondRuns > 1) {
+    return "It is scheduled to run multiple times a minute. Review the schedule before turning it on.";
+  }
+  if (minute === "*") {
+    return "It is scheduled to run every minute. Review the schedule before turning it on.";
+  }
+  const steppedMinute = /^\*\/(\d+)$/.exec(minute);
+  if (steppedMinute) {
+    const minutes = Number(steppedMinute[1]);
+    return `It is scheduled to run every ${minutes} minute${minutes === 1 ? "" : "s"}. Review the schedule before turning it on.`;
+  }
+  if (minuteRuns === 1) {
+    return "It is scheduled to run every hour. Review the schedule before turning it on.";
+  }
+  if (minuteRuns > 1) {
+    return "It is scheduled to run multiple times an hour. Review the schedule before turning it on.";
+  }
+  return null;
+}
+
+export function getWorkflowActivationWarning(
+  yaml: string,
+): WorkflowActivationWarning | null {
+  let definition: Record<string, unknown> | null;
+  try {
+    definition = asRecord(yamlParse(yaml));
+  } catch {
+    return null;
+  }
+  const trigger = asRecord(definition?.trigger);
+  const triggerType = nonEmptyString(trigger?.on);
+
+  if (triggerType === "message_posted" && !nonEmptyString(trigger?.filter)) {
+    return {
+      description:
+        "It will run for every new message in this channel. Review the trigger before turning it on.",
+      title: "This workflow may run often",
+    };
+  }
+
+  if (triggerType === "schedule") {
+    const interval = nonEmptyString(trigger?.interval);
+    const cron = nonEmptyString(trigger?.cron);
+    const description = interval
+      ? frequentIntervalDescription(interval)
+      : cron
+        ? frequentCronDescription(cron)
+        : null;
+    if (description) {
+      return { description, title: "This workflow may run often" };
+    }
+  }
+
+  return null;
+}
diff --git a/desktop/src/features/workflows/ui/workflowConditionExpression.test.mjs b/desktop/src/features/workflows/ui/workflowConditionExpression.test.mjs
new file mode 100644
index 0000000000..9f59e8bffe
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowConditionExpression.test.mjs
@@ -0,0 +1,171 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+
+import {
+  buildConditionExpression,
+  buildConditionExpressions,
+  conditionFieldsForTrigger,
+  conditionOperatorsForField,
+  conditionValueError,
+  parseConditionExpression,
+  parseConditionExpressions,
+} from "./workflowConditionExpression.ts";
+
+const AUTHOR = "a".repeat(64);
+const MESSAGE_ID = "b".repeat(64);
+
+test("builds and escapes supported text conditions", () => {
+  assert.equal(
+    buildConditionExpression({
+      field: "trigger_text",
+      operator: "contains",
+      value: 'deploy "buzz"\\path',
+      webhookField: "",
+    }),
+    'str_contains(trigger_text, "deploy \\"buzz\\"\\\\path")',
+  );
+});
+
+test("limits opaque identifiers to equality and validates 64-char hex", () => {
+  for (const field of [
+    "trigger_author",
+    "trigger_emoji",
+    "trigger_message_id",
+    "future_id",
+  ]) {
+    assert.deepEqual(conditionOperatorsForField(field), [
+      "equals",
+      "not_equals",
+    ]);
+  }
+  assert.equal(
+    conditionValueError("trigger_author", "abc"),
+    "Enter a 64-character hex pubkey.",
+  );
+  assert.equal(conditionValueError("trigger_author", AUTHOR), null);
+  assert.equal(
+    conditionValueError("trigger_message_id", "z".repeat(64)),
+    "Enter a 64-character hex event ID.",
+  );
+  assert.equal(conditionValueError("trigger_message_id", MESSAGE_ID), null);
+});
+
+test("normalizes generated hex identifiers to lowercase", () => {
+  const uppercaseAuthor = "A".repeat(64);
+  const uppercaseMessageId = "B".repeat(64);
+  assert.equal(
+    buildConditionExpressions([
+      {
+        field: "trigger_author",
+        operator: "equals",
+        value: uppercaseAuthor,
+        webhookField: "",
+      },
+      {
+        field: "trigger_message_id",
+        operator: "not_equals",
+        value: uppercaseMessageId,
+        webhookField: "",
+      },
+    ]),
+    `trigger_author == "${AUTHOR}" && trigger_message_id != "${MESSAGE_ID}"`,
+  );
+});
+
+test("exposes only trigger-relevant local fields", () => {
+  assert.deepEqual(
+    conditionFieldsForTrigger("reaction_added").map(({ value }) => value),
+    ["trigger_emoji", "trigger_author", "trigger_message_id"],
+  );
+  assert.deepEqual(
+    conditionFieldsForTrigger("message_posted").map(({ value }) => value),
+    ["trigger_text", "trigger_author"],
+  );
+  for (const trigger of [
+    "message_posted",
+    "diff_posted",
+    "reaction_added",
+    "webhook",
+    "schedule",
+  ]) {
+    assert.equal(
+      conditionFieldsForTrigger(trigger).some(
+        ({ value }) => value === "trigger_channel_id",
+      ),
+      false,
+    );
+  }
+});
+
+test("round-trips reaction emoji, author, and message ID conjunctions", () => {
+  const conditions = [
+    {
+      field: "trigger_emoji",
+      operator: "equals",
+      value: "👾",
+      webhookField: "",
+    },
+    {
+      field: "trigger_author",
+      operator: "not_equals",
+      value: AUTHOR,
+      webhookField: "",
+    },
+    {
+      field: "trigger_message_id",
+      operator: "equals",
+      value: MESSAGE_ID,
+      webhookField: "",
+    },
+  ];
+  const expression = buildConditionExpressions(conditions);
+  assert.equal(
+    expression,
+    `trigger_emoji == "👾" && trigger_author != "${AUTHOR}" && trigger_message_id == "${MESSAGE_ID}"`,
+  );
+  assert.deepEqual(
+    parseConditionExpressions(expression, "reaction_added"),
+    conditions,
+  );
+});
+
+test("does not split conjunctions inside values and rejects duplicates", () => {
+  const expression = `str_contains(trigger_text, "one && two") && trigger_author == "${AUTHOR}"`;
+  assert.equal(
+    parseConditionExpressions(expression, "message_posted")?.length,
+    2,
+  );
+  assert.equal(
+    parseConditionExpressions(
+      `trigger_author == "${AUTHOR}" && trigger_author != "${MESSAGE_ID}"`,
+      "message_posted",
+    ),
+    null,
+  );
+});
+
+test("keeps unsupported expressions in advanced mode", () => {
+  assert.equal(
+    parseConditionExpression("trigger_timestamp > 0", "message_posted"),
+    null,
+  );
+  assert.equal(
+    parseConditionExpression('trigger_emoji == "👍"', "message_posted"),
+    null,
+  );
+  assert.equal(
+    parseConditionExpression('trigger_author == "abc"', "message_posted"),
+    null,
+  );
+  assert.equal(
+    parseConditionExpression("str_len(trigger_author) == 0", "message_posted"),
+    null,
+  );
+  assert.equal(
+    parseConditionExpression(
+      "str_len(trigger_message_id) > 0",
+      "reaction_added",
+    ),
+    null,
+  );
+});
diff --git a/desktop/src/features/workflows/ui/workflowConditionExpression.ts b/desktop/src/features/workflows/ui/workflowConditionExpression.ts
new file mode 100644
index 0000000000..e44d6a7a16
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowConditionExpression.ts
@@ -0,0 +1,276 @@
+import type { TriggerType } from "./workflowFormTypes";
+
+export const CONDITION_OPERATORS = [
+  "contains",
+  "not_contains",
+  "starts_with",
+  "ends_with",
+  "equals",
+  "not_equals",
+  "is_not_empty",
+  "is_empty",
+] as const;
+export type ConditionOperator = (typeof CONDITION_OPERATORS)[number];
+
+const EXACT_MATCH_OPERATORS = [
+  "equals",
+  "not_equals",
+] as const satisfies readonly ConditionOperator[];
+const HEX_ID_PATTERN = /^[0-9a-fA-F]{64}$/;
+
+export type ConditionField = { label: string; value: string };
+export type ParsedConditionExpression = {
+  field: string;
+  operator: ConditionOperator;
+  value: string;
+  webhookField: string;
+};
+
+const AUTHOR_FIELD: ConditionField = {
+  label: "Author pubkey",
+  value: "trigger_author",
+};
+const FIELDS_BY_TRIGGER: Record<TriggerType, ConditionField[]> = {
+  message_posted: [
+    { label: "Message text", value: "trigger_text" },
+    AUTHOR_FIELD,
+  ],
+  diff_posted: [{ label: "Diff text", value: "trigger_text" }, AUTHOR_FIELD],
+  reaction_added: [
+    { label: "Reaction emoji", value: "trigger_emoji" },
+    AUTHOR_FIELD,
+    { label: "Message event ID", value: "trigger_message_id" },
+  ],
+  webhook: [],
+  schedule: [],
+};
+
+export function conditionFieldsForTrigger(
+  triggerType: TriggerType,
+): ConditionField[] {
+  return FIELDS_BY_TRIGGER[triggerType];
+}
+
+export function conditionOperatorsForField(
+  field: string,
+): readonly ConditionOperator[] {
+  return field === "trigger_author" ||
+    field === "trigger_emoji" ||
+    field.endsWith("_id")
+    ? EXACT_MATCH_OPERATORS
+    : CONDITION_OPERATORS;
+}
+
+export function defaultConditionOperatorForField(
+  field: string,
+): ConditionOperator {
+  return conditionOperatorsForField(field)[0];
+}
+
+export function conditionOperatorNeedsValue(
+  operator: ConditionOperator,
+): boolean {
+  return operator !== "is_not_empty" && operator !== "is_empty";
+}
+
+export function conditionValueError(
+  field: string,
+  value: string,
+): string | null {
+  const trimmed = value.trim();
+  if (!trimmed) return null;
+  if (field === "trigger_author" && !HEX_ID_PATTERN.test(trimmed)) {
+    return "Enter a 64-character hex pubkey.";
+  }
+  if (field.endsWith("_id") && !HEX_ID_PATTERN.test(trimmed)) {
+    return "Enter a 64-character hex event ID.";
+  }
+  return null;
+}
+
+function escapeEvalexprString(value: string): string {
+  return value.replaceAll("\\", "\\\\").replaceAll('"', '\\"');
+}
+
+export function buildConditionExpression(
+  condition: ParsedConditionExpression,
+): string | null {
+  const { field, operator } = condition;
+  if (operator === "is_not_empty") return `str_len(${field}) > 0`;
+  if (operator === "is_empty") return `str_len(${field}) == 0`;
+  const value = condition.value.trim();
+  if (!value || conditionValueError(field, value)) return null;
+  const normalizedValue =
+    field === "trigger_author" || field.endsWith("_id")
+      ? value.toLowerCase()
+      : value;
+  const quoted = `"${escapeEvalexprString(normalizedValue)}"`;
+  switch (operator) {
+    case "contains":
+      return `str_contains(${field}, ${quoted})`;
+    case "not_contains":
+      return `!str_contains(${field}, ${quoted})`;
+    case "starts_with":
+      return `str_starts_with(${field}, ${quoted})`;
+    case "ends_with":
+      return `str_ends_with(${field}, ${quoted})`;
+    case "equals":
+      return `${field} == ${quoted}`;
+    case "not_equals":
+      return `${field} != ${quoted}`;
+    default:
+      return null;
+  }
+}
+
+export function buildConditionExpressions(
+  conditions: ParsedConditionExpression[],
+): string {
+  return conditions
+    .map(buildConditionExpression)
+    .filter((value): value is string => value !== null)
+    .join(" && ");
+}
+
+function unescapeEvalexprString(value: string): string {
+  return value.replaceAll(/\\(["\\])/g, "$1");
+}
+
+function parseField(variable: string, triggerType: TriggerType): string | null {
+  return conditionFieldsForTrigger(triggerType).some(
+    (field) => field.value === variable,
+  )
+    ? variable
+    : null;
+}
+
+export function parseConditionExpression(
+  expression: string,
+  triggerType: TriggerType,
+): ParsedConditionExpression | null {
+  const trimmed = expression.trim();
+  const empty = /^str_len\(([A-Za-z_][A-Za-z0-9_]*)\) (>|==) 0$/.exec(trimmed);
+  if (empty && parseField(empty[1], triggerType)) {
+    const operator: ConditionOperator =
+      empty[2] === ">" ? "is_not_empty" : "is_empty";
+    if (!conditionOperatorsForField(empty[1]).includes(operator)) return null;
+    return {
+      field: empty[1],
+      operator,
+      value: "",
+      webhookField: "",
+    };
+  }
+  const literal = '"((?:\\\\["\\\\]|[^"\\\\])*)"';
+  const fn = new RegExp(
+    `^(!)?str_(contains|starts_with|ends_with)\\(([A-Za-z_][A-Za-z0-9_]*), ${literal}\\)$`,
+  ).exec(trimmed);
+  if (fn && parseField(fn[3], triggerType)) {
+    const operator: ConditionOperator = fn[1]
+      ? "not_contains"
+      : fn[2] === "starts_with"
+        ? "starts_with"
+        : fn[2] === "ends_with"
+          ? "ends_with"
+          : "contains";
+    const result = {
+      field: fn[3],
+      operator,
+      value: unescapeEvalexprString(fn[4]),
+      webhookField: "",
+    };
+    return conditionOperatorsForField(result.field).includes(result.operator)
+      ? result
+      : null;
+  }
+  const equality = new RegExp(
+    `^([A-Za-z_][A-Za-z0-9_]*) (!=|==) ${literal}$`,
+  ).exec(trimmed);
+  if (equality && parseField(equality[1], triggerType)) {
+    const result = {
+      field: equality[1],
+      operator:
+        equality[2] === "==" ? ("equals" as const) : ("not_equals" as const),
+      value: unescapeEvalexprString(equality[3]),
+      webhookField: "",
+    };
+    return conditionValueError(result.field, result.value) ? null : result;
+  }
+  return null;
+}
+
+function splitTopLevel(
+  expression: string,
+  operator: "&&" | "||",
+): string[] | null {
+  const parts: string[] = [];
+  let start = 0,
+    depth = 0,
+    inString = false,
+    escaped = false;
+  for (let index = 0; index < expression.length; index += 1) {
+    const character = expression[index];
+    if (inString) {
+      if (escaped) escaped = false;
+      else if (character === "\\") escaped = true;
+      else if (character === '"') inString = false;
+      continue;
+    }
+    if (character === '"') inString = true;
+    else if (character === "(") depth += 1;
+    else if (character === ")") {
+      depth -= 1;
+      if (depth < 0) return null;
+    } else if (
+      character === operator[0] &&
+      expression[index + 1] === operator[1] &&
+      depth === 0
+    ) {
+      const part = expression.slice(start, index).trim();
+      if (!part) return null;
+      parts.push(part);
+      index += 1;
+      start = index + 1;
+    }
+  }
+  if (inString || depth !== 0) return null;
+  const last = expression.slice(start).trim();
+  if (!last) return null;
+  parts.push(last);
+  return parts;
+}
+
+function splitTopLevelConjunctions(expression: string): string[] | null {
+  return splitTopLevel(expression, "&&");
+}
+
+/**
+ * Reports whether `expression` needs parentheses before it can be combined
+ * with `&&`. Conjunction binds tighter than disjunction in evalexpr, so a
+ * top-level `||` would otherwise absorb the added conjunct. Structurally
+ * unparseable expressions are grouped defensively.
+ */
+export function needsConjunctionGrouping(expression: string): boolean {
+  const parts = splitTopLevel(expression, "||");
+  return parts === null || parts.length > 1;
+}
+
+export function parseConditionExpressions(
+  expression: string,
+  triggerType: TriggerType,
+): ParsedConditionExpression[] | null {
+  if (!expression.trim()) return [];
+  const parts = splitTopLevelConjunctions(expression);
+  if (!parts) return null;
+  const parsed = parts.map((part) =>
+    parseConditionExpression(part, triggerType),
+  );
+  if (parsed.some((condition) => condition === null)) return null;
+  const conditions = parsed.filter(
+    (condition): condition is ParsedConditionExpression => condition !== null,
+  );
+  return new Set(conditions.map((condition) => condition.field)).size ===
+    conditions.length
+    ? conditions
+    : null;
+}
diff --git a/desktop/src/features/workflows/ui/workflowDefinition.test.mjs b/desktop/src/features/workflows/ui/workflowDefinition.test.mjs
index 57ced7d9c1..85b9a12d28 100644
--- a/desktop/src/features/workflows/ui/workflowDefinition.test.mjs
+++ b/desktop/src/features/workflows/ui/workflowDefinition.test.mjs
@@ -2,8 +2,14 @@ import assert from "node:assert/strict";
 import test from "node:test";
 
 import {
+  getWorkflowActionTiles,
+  getWorkflowCardLabel,
   getWorkflowDisplayStatus,
   getWorkflowPrimaryAction,
+  getWorkflowPrimaryActionEmoji,
+  getWorkflowStepCount,
+  getWorkflowTriggerEmoji,
+  getWorkflowTriggerSummary,
   getWorkflowTriggerType,
   withWorkflowEnabled,
 } from "./workflowDefinition.ts";
@@ -23,19 +29,244 @@ test("reads only direct trigger and first-action types for card icons", () => {
   assert.equal(getWorkflowPrimaryAction({ steps: [null] }), null);
 });
 
-test("updates enabled state without mutating the workflow definition", () => {
+test("builds a plain-language workflow card label", () => {
+  assert.equal(
+    getWorkflowCardLabel({
+      trigger: { on: "message_posted" },
+      steps: [{ action: "send_message", text: "Deploying now" }],
+    }),
+    "When a message is posted, send “Deploying now”",
+  );
+
+  assert.equal(
+    getWorkflowCardLabel({
+      trigger: { on: "reaction_added", emoji: "🔥" },
+      steps: [
+        { action: "delay", duration: "5m" },
+        { action: "add_reaction", emoji: "✅" },
+      ],
+    }),
+    "When someone reacts with 🔥, wait 5 minutes, then 1 more step",
+  );
+
+  assert.equal(
+    getWorkflowCardLabel(
+      {
+        trigger: {
+          on: "reaction_added",
+          filter: 'trigger_emoji == "🫠"',
+        },
+        steps: [{ action: "add_reaction", emoji: "👍" }],
+      },
+      { triggerReaction: "🫠" },
+    ),
+    "When someone reacts with 🫠, add a 👍 reaction",
+  );
+
+  assert.equal(
+    getWorkflowCardLabel({
+      trigger: {
+        on: "reaction_added",
+        filter: 'trigger_emoji == "🫠"',
+      },
+      steps: [{ action: "add_reaction", emoji: "👍" }],
+    }),
+    "When someone reacts with 🫠, add a 👍 reaction",
+  );
+
+  assert.equal(
+    getWorkflowCardLabel(
+      {
+        trigger: { on: "message_posted" },
+        steps: [{ action: "send_message", text: "Deploying now" }],
+      },
+      { actionChannelLabel: "releases" },
+    ),
+    "When a message is posted, send “Deploying now” in #releases",
+  );
+
+  assert.equal(
+    getWorkflowCardLabel(
+      {
+        trigger: {
+          on: "message_posted",
+          filter: `trigger_author == "${"a".repeat(64)}"`,
+        },
+        steps: [{ action: "send_message", text: "Deploying now" }],
+      },
+      { triggerDescription: "Message posted by Carl" },
+    ),
+    "When a message is posted by Carl, send “Deploying now”",
+  );
+
+  assert.equal(
+    getWorkflowCardLabel(
+      {
+        trigger: {
+          on: "message_posted",
+          filter: 'str_contains(trigger_text, "deploy")',
+        },
+        steps: [{ action: "call_webhook" }],
+      },
+      { triggerDescription: "Message contains “deploy”" },
+    ),
+    "When a message contains “deploy”, call a webhook",
+  );
+
+  assert.equal(
+    getWorkflowCardLabel({
+      trigger: {
+        on: "message_posted",
+        filter: 'str_contains(trigger_text, "deploy")',
+      },
+      steps: [{ action: "call_webhook" }],
+    }),
+    "When a message contains “deploy”, call a webhook",
+  );
+
+  assert.equal(
+    getWorkflowCardLabel({
+      trigger: {
+        on: "reaction_added",
+        filter: `trigger_message_id == "${"b".repeat(64)}"`,
+      },
+      steps: [{ action: "add_reaction", emoji: "👍" }],
+    }),
+    "When a reaction is added, add a 👍 reaction",
+  );
+
+  assert.equal(
+    getWorkflowCardLabel(
+      {
+        trigger: {
+          on: "message_posted",
+          filter: `trigger_text == "FUCK" && trigger_author == "${"a".repeat(64)}"`,
+        },
+        steps: [{ action: "send_message", text: "{{trigger.text}} yourself" }],
+      },
+      {
+        triggerDescription: "Message “FUCK” is posted by Carl",
+      },
+    ),
+    "When “FUCK” is posted by Carl, send “{{trigger.text}} yourself”",
+  );
+});
+
+test("builds a concise semantic trigger label for workflow cards", () => {
+  assert.equal(
+    getWorkflowTriggerSummary({
+      trigger: {
+        on: "message_posted",
+        filter: 'str_contains(trigger_text, "deploy")',
+      },
+    }),
+    "Message contains “deploy”",
+  );
+  assert.equal(
+    getWorkflowTriggerSummary({
+      trigger: {
+        on: "reaction_added",
+        filter: `trigger_emoji == "🔥" && trigger_author == "${"a".repeat(64)}" && trigger_message_id == "${"b".repeat(64)}"`,
+      },
+    }),
+    "🔥 reaction added",
+  );
+  assert.equal(
+    getWorkflowTriggerSummary({
+      trigger: { on: "schedule", interval: "15m" },
+    }),
+    "Schedule",
+  );
+});
+
+test("counts configured steps for card stack presentation", () => {
+  assert.equal(getWorkflowStepCount({}), 0);
+  assert.equal(
+    getWorkflowStepCount({
+      steps: [{ action: "send_message" }, { action: "add_reaction" }],
+    }),
+    2,
+  );
+});
+
+test("returns configured reaction emoji for rich card rendering", () => {
+  assert.equal(
+    getWorkflowTriggerEmoji({
+      trigger: {
+        on: "reaction_added",
+        filter: 'trigger_emoji == "👀"',
+      },
+    }),
+    "👀",
+  );
+  assert.equal(
+    getWorkflowTriggerEmoji({
+      trigger: { on: "reaction_added", emoji: ":blob-wave:" },
+    }),
+    ":blob-wave:",
+  );
+  assert.equal(
+    getWorkflowTriggerEmoji({
+      trigger: {
+        on: "reaction_added",
+        filter: 'trigger_emoji != "👀"',
+      },
+    }),
+    null,
+  );
+  assert.equal(
+    getWorkflowTriggerEmoji({
+      trigger: {
+        on: "message_posted",
+        filter: 'trigger_emoji == "👀"',
+      },
+    }),
+    null,
+  );
+
+  assert.equal(
+    getWorkflowPrimaryActionEmoji({
+      steps: [{ action: "add_reaction", emoji: ":blob-wave:" }],
+    }),
+    ":blob-wave:",
+  );
+  assert.equal(
+    getWorkflowPrimaryActionEmoji({
+      steps: [{ action: "send_message", emoji: ":blob-wave:" }],
+    }),
+    null,
+  );
+  assert.deepEqual(
+    getWorkflowActionTiles({
+      steps: [
+        { action: "add_reaction", emoji: "🐥" },
+        { action: "send_message", text: "hello" },
+        { action: "delay", duration: "5m" },
+      ],
+    }),
+    [
+      { action: "add_reaction", emoji: "🐥", key: "step-0" },
+      { action: "send_message", emoji: null, key: "step-1" },
+      { action: "delay", emoji: null, key: "step-2" },
+    ],
+  );
+});
+
+test("toggles workflow enabled state without mutating its definition", () => {
   const definition = {
     name: "deploy",
+    enabled: false,
     trigger: { on: "message_posted" },
+    future_field: { keep: true },
   };
-  const disabled = withWorkflowEnabled(definition, false);
 
-  assert.deepEqual(disabled, { ...definition, enabled: false });
-  assert.deepEqual(definition, {
+  assert.deepEqual(withWorkflowEnabled(definition, true), {
     name: "deploy",
     trigger: { on: "message_posted" },
+    future_field: { keep: true },
   });
-  assert.deepEqual(withWorkflowEnabled(disabled, true), definition);
+  assert.deepEqual(withWorkflowEnabled(definition, false), definition);
+  assert.equal(definition.enabled, false);
 });
 
 test("shows a disabled definition as disabled while preserving other statuses", () => {
@@ -55,3 +286,38 @@ test("shows a disabled definition as disabled while preserving other statuses",
     "archived",
   );
 });
+
+test("summarizes common and custom schedules", () => {
+  assert.equal(
+    getWorkflowCardLabel({
+      trigger: { on: "schedule", interval: "15m" },
+      steps: [{ action: "call_webhook" }],
+    }),
+    "Every 15 minutes, call a webhook",
+  );
+  assert.equal(
+    getWorkflowCardLabel({
+      trigger: { on: "schedule", cron: "30 9 * * *" },
+      steps: [{ action: "request_approval" }],
+    }),
+    "Every day at 09:30 UTC, request approval",
+  );
+  assert.equal(
+    getWorkflowCardLabel({
+      trigger: { on: "schedule", cron: "*/5 8-17 * * 1-5" },
+      steps: [],
+    }),
+    "On a custom schedule",
+  );
+});
+
+test("gracefully labels definitions with future trigger and action types", () => {
+  assert.equal(
+    getWorkflowCardLabel({
+      trigger: { on: "issue_closed" },
+      steps: [{ action: "archive_issue" }],
+    }),
+    "When issue closed happens, archive issue",
+  );
+  assert.equal(getWorkflowCardLabel({}), "When this workflow starts");
+});
diff --git a/desktop/src/features/workflows/ui/workflowDefinition.ts b/desktop/src/features/workflows/ui/workflowDefinition.ts
index d70b40abd1..e6d7084596 100644
--- a/desktop/src/features/workflows/ui/workflowDefinition.ts
+++ b/desktop/src/features/workflows/ui/workflowDefinition.ts
@@ -1,6 +1,22 @@
 import type { Workflow } from "@/shared/api/types";
-import { TRIGGER_LABELS } from "./workflowFormTypes";
-import type { TriggerType } from "./workflowFormTypes";
+import {
+  scheduleFormFromTrigger,
+  SCHEDULE_FREQUENCY_LABELS,
+} from "./workflowSchedule";
+import {
+  ACTION_LABELS,
+  TRIGGER_LABELS,
+  TRIGGER_TYPES,
+} from "./workflowFormTypes";
+import type {
+  ActionType,
+  StepFormState,
+  TriggerConfig,
+  TriggerType,
+} from "./workflowFormTypes";
+import { workflowStepDescription } from "./workflowStepDescription";
+import { parseConditionExpressions } from "./workflowConditionExpression";
+import { workflowTriggerDescription } from "./workflowTriggerDescription";
 
 function asRecord(value: unknown): Record<string, unknown> | null {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
@@ -9,25 +25,389 @@ function asRecord(value: unknown): Record<string, unknown> | null {
   return value as Record<string, unknown>;
 }
 
+function nonEmptyString(value: unknown): string | null {
+  return typeof value === "string" && value.trim().length > 0
+    ? value.trim()
+    : null;
+}
+
+function humanizeIdentifier(value: string): string {
+  return value.replaceAll("_", " ").replace(/\s+/g, " ").trim();
+}
+
+function getWorkflowSteps(
+  definition: Record<string, unknown>,
+): Record<string, unknown>[] {
+  return Array.isArray(definition.steps)
+    ? definition.steps.map(asRecord).filter((step) => step !== null)
+    : [];
+}
+
 export function getWorkflowTriggerType(
   definition: Record<string, unknown>,
 ): string | null {
-  const trigger = asRecord(definition.trigger);
-  return typeof trigger?.on === "string" && trigger.on.trim().length > 0
-    ? trigger.on
-    : null;
+  return nonEmptyString(asRecord(definition.trigger)?.on);
 }
 
 export function getWorkflowPrimaryAction(
   definition: Record<string, unknown>,
 ): string | null {
-  const firstStep = Array.isArray(definition.steps)
-    ? asRecord(definition.steps[0])
+  return nonEmptyString(getWorkflowSteps(definition)[0]?.action);
+}
+
+export function getWorkflowPrimaryActionEmoji(
+  definition: Record<string, unknown>,
+): string | null {
+  return getWorkflowActionTiles(definition)[0]?.emoji ?? null;
+}
+
+export function getWorkflowActionTiles(
+  definition: Record<string, unknown>,
+): Array<{ action: string; emoji: string | null; key: string }> {
+  return getWorkflowSteps(definition).map((step, index) => ({
+    action: nonEmptyString(step.action) ?? "",
+    emoji: step.action === "add_reaction" ? nonEmptyString(step.emoji) : null,
+    key: nonEmptyString(step.id) ?? `step-${index}`,
+  }));
+}
+
+export function getWorkflowTriggerEmoji(
+  definition: Record<string, unknown>,
+): string | null {
+  const trigger = asRecord(definition.trigger);
+  if (trigger?.on !== "reaction_added") return null;
+
+  const legacyEmoji = nonEmptyString(trigger.emoji);
+  if (legacyEmoji) return legacyEmoji;
+
+  const filter = nonEmptyString(trigger.filter);
+  if (!filter) return null;
+  const conditions = parseConditionExpressions(filter, "reaction_added");
+  const emojiCondition = conditions?.find(
+    ({ field, operator }) => field === "trigger_emoji" && operator === "equals",
+  );
+  return nonEmptyString(emojiCondition?.value);
+}
+
+function getWorkflowTriggerConfig(
+  definition: Record<string, unknown>,
+): TriggerConfig | null {
+  const trigger = asRecord(definition.trigger);
+  const triggerType = nonEmptyString(trigger?.on);
+  if (
+    !trigger ||
+    !triggerType ||
+    !TRIGGER_TYPES.includes(triggerType as TriggerType)
+  ) {
+    return null;
+  }
+
+  return {
+    on: triggerType as TriggerType,
+    filter: nonEmptyString(trigger.filter) ?? undefined,
+    emoji: nonEmptyString(trigger.emoji) ?? undefined,
+    cron: nonEmptyString(trigger.cron) ?? undefined,
+    interval: nonEmptyString(trigger.interval) ?? undefined,
+  };
+}
+
+function getScheduleCardClause(trigger: Record<string, unknown>): string {
+  const schedule = scheduleFormFromTrigger({
+    on: "schedule",
+    cron: nonEmptyString(trigger.cron) ?? undefined,
+    interval: nonEmptyString(trigger.interval) ?? undefined,
+  });
+
+  switch (schedule.frequency) {
+    case "daily":
+      return `Every day at ${schedule.time} UTC`;
+    case "weekly":
+      return `Every week at ${schedule.time} UTC`;
+    case "monthly":
+      return `Every month at ${schedule.time} UTC`;
+    case "custom_interval":
+      return schedule.customInterval
+        ? `Every ${schedule.customInterval}`
+        : "On a schedule";
+    case "custom_cron":
+      return "On a custom schedule";
+    default:
+      return SCHEDULE_FREQUENCY_LABELS[schedule.frequency];
+  }
+}
+
+function getTriggerCardClause(
+  definition: Record<string, unknown>,
+  presentedReaction?: string,
+): string {
+  const trigger = asRecord(definition.trigger);
+  const triggerType = nonEmptyString(trigger?.on);
+  if (!trigger || !triggerType) return "When this workflow starts";
+
+  switch (triggerType) {
+    case "message_posted":
+      return nonEmptyString(trigger.filter)
+        ? "When a matching message is posted"
+        : "When a message is posted";
+    case "reaction_added": {
+      const emoji = nonEmptyString(presentedReaction ?? trigger.emoji);
+      return emoji
+        ? `When someone reacts with ${emoji}`
+        : "When someone adds a reaction";
+    }
+    case "diff_posted":
+      return nonEmptyString(trigger.filter)
+        ? "When a matching diff is posted"
+        : "When a diff is posted";
+    case "webhook":
+      return "When a webhook arrives";
+    case "schedule":
+      return getScheduleCardClause(trigger);
+    default:
+      return `When ${humanizeIdentifier(triggerType)} happens`;
+  }
+}
+
+function eventDescriptionCardClause(
+  description: string,
+  event: "message" | "diff",
+): string | null {
+  const subject = event === "message" ? "Message" : "Diff";
+  const eventPhrase = `${subject} posted`;
+  if (!description.startsWith(eventPhrase)) return null;
+
+  const detail = description.slice(eventPhrase.length);
+  if (!detail) return `When a ${event} is posted`;
+  if (detail.startsWith(" is ") || detail.startsWith(" is not ")) {
+    return `When a ${event}${detail}`;
+  }
+  if (
+    detail.startsWith(" containing ") ||
+    detail.startsWith(" without ") ||
+    detail.startsWith(" starting with ") ||
+    detail.startsWith(" ending with ") ||
+    detail === " with text"
+  ) {
+    return `When a ${event}${detail} is posted`;
+  }
+  return `When a ${event} is posted${detail}`;
+}
+
+function textDescriptionCardClause(
+  description: string,
+  event: "message" | "diff",
+): string | null {
+  const subject = event === "message" ? "Message" : "Diff";
+  if (!description.startsWith(`${subject} `)) return null;
+  return `When a ${event}${description.slice(subject.length)}`;
+}
+
+function postedValueCardClause(description: string): string | null {
+  const postedIndex = description.indexOf(" posted");
+  if (postedIndex < 1) return null;
+
+  const value = description.slice(0, postedIndex);
+  if (!value.startsWith("“") && !value.startsWith("Anything except ")) {
+    return null;
+  }
+  const normalizedValue = value.startsWith("Anything")
+    ? `anything${value.slice("Anything".length)}`
+    : value;
+  return `When ${normalizedValue} is posted${description.slice(postedIndex + " posted".length)}`;
+}
+
+function qualifiedPostedEventCardClause(
+  description: string,
+  event: "message" | "diff",
+): string | null {
+  const subject = event === "message" ? "Message" : "Diff";
+  const postedIndex = description.indexOf(" posted");
+  if (postedIndex < 1) return null;
+
+  const suffix = description.slice(postedIndex + " posted".length);
+  const otherTextPrefix = `${subject} with text other than `;
+  if (description.startsWith(otherTextPrefix)) {
+    const value = description.slice(otherTextPrefix.length, postedIndex);
+    return `When a ${event} with text other than ${value} is posted${suffix}`;
+  }
+
+  if (description.startsWith(`${subject} with text posted`)) {
+    return `When a ${event} with text is posted${suffix}`;
+  }
+  if (description.startsWith(`${subject} without text posted`)) {
+    return `When a ${event} without text is posted${suffix}`;
+  }
+  return null;
+}
+
+function exactValueEventCardClause(
+  description: string,
+  event: "message" | "diff",
+): string | null {
+  const subject = event === "message" ? "Message" : "Diff";
+  const prefix = `${subject} “`;
+  const postedMarker = " is posted";
+  if (!description.startsWith(prefix)) return null;
+
+  const postedIndex = description.indexOf(postedMarker);
+  if (postedIndex < prefix.length) return null;
+  const value = description.slice(subject.length + 1, postedIndex);
+  const suffix = description.slice(postedIndex + postedMarker.length);
+  return event === "message"
+    ? `When ${value} is posted${suffix}`
+    : `When a diff ${value} is posted${suffix}`;
+}
+
+function getPresentedTriggerCardClause(description?: string): string | null {
+  if (!description) return null;
+
+  const eventClause =
+    exactValueEventCardClause(description, "message") ??
+    exactValueEventCardClause(description, "diff") ??
+    qualifiedPostedEventCardClause(description, "message") ??
+    qualifiedPostedEventCardClause(description, "diff") ??
+    postedValueCardClause(description) ??
+    eventDescriptionCardClause(description, "message") ??
+    eventDescriptionCardClause(description, "diff") ??
+    textDescriptionCardClause(description, "message") ??
+    textDescriptionCardClause(description, "diff");
+  if (eventClause) return eventClause;
+
+  if (description.startsWith("Reaction added")) {
+    return `When a reaction is added${description.slice("Reaction added".length)}`;
+  }
+  if (description.endsWith(" reaction added")) {
+    return `When someone reacts with ${description.slice(0, -" reaction added".length)}`;
+  }
+  if (
+    description.startsWith("Any reaction ") &&
+    description.endsWith(" added")
+  ) {
+    return `When ${description.slice(0, -" added".length).toLocaleLowerCase()} is added`;
+  }
+  return null;
+}
+
+function getActionCardClause(
+  step: Record<string, unknown>,
+  channelLabel?: string,
+): string | null {
+  const action = nonEmptyString(step.action);
+  if (!action) return null;
+
+  const actionLabel = ACTION_LABELS[action as ActionType];
+  const parsedStep: StepFormState | null = actionLabel
+    ? {
+        action: action as ActionType,
+        id: nonEmptyString(step.id) ?? "step_1",
+        duration: nonEmptyString(step.duration) ?? undefined,
+        emoji: nonEmptyString(step.emoji) ?? undefined,
+        from: nonEmptyString(step.from) ?? undefined,
+        message: nonEmptyString(step.message) ?? undefined,
+        method: nonEmptyString(step.method) ?? undefined,
+        name: nonEmptyString(step.name) ?? undefined,
+        text: nonEmptyString(step.text) ?? undefined,
+        to: nonEmptyString(step.to) ?? undefined,
+        topic: nonEmptyString(step.topic) ?? undefined,
+        url: nonEmptyString(step.url) ?? undefined,
+      }
     : null;
-  return typeof firstStep?.action === "string" &&
-    firstStep.action.trim().length > 0
-    ? firstStep.action
+  const detail = parsedStep
+    ? workflowStepDescription(parsedStep, {
+        channelLabel,
+        includeName: false,
+      })
     : null;
+  const configuredDetail =
+    detail &&
+    detail !== actionLabel &&
+    detail !==
+      (actionLabel
+        ? `${actionLabel[0]}${actionLabel.slice(1).toLocaleLowerCase()}`
+        : null)
+      ? detail
+      : null;
+
+  switch (action) {
+    case "delay": {
+      return configuredDetail
+        ? `wait ${configuredDetail}`
+        : "wait for a moment";
+    }
+    case "send_message":
+      if (!configuredDetail) return "send a channel message";
+      return nonEmptyString(step.text)
+        ? `send ${configuredDetail}`
+        : `send a message in ${configuredDetail}`;
+    case "call_webhook":
+      return configuredDetail ? `call ${configuredDetail}` : "call a webhook";
+    case "send_dm":
+      return configuredDetail
+        ? `send ${configuredDetail}`
+        : "send a direct message";
+    case "request_approval":
+      return configuredDetail
+        ? `request approval: ${configuredDetail}`
+        : "request approval";
+    case "add_reaction": {
+      return configuredDetail
+        ? `add a ${configuredDetail} reaction`
+        : "add a reaction";
+    }
+    case "set_channel_topic":
+      return configuredDetail
+        ? `set the channel topic to ${configuredDetail}`
+        : "update the channel topic";
+    default: {
+      return (actionLabel ?? humanizeIdentifier(action)).toLocaleLowerCase();
+    }
+  }
+}
+
+export function getWorkflowStepCount(
+  definition: Record<string, unknown>,
+): number {
+  return getWorkflowSteps(definition).length;
+}
+
+/** Build a short plain-language label from the workflow's trigger and steps. */
+export function getWorkflowCardLabel(
+  definition: Record<string, unknown>,
+  options: {
+    actionChannelLabel?: string;
+    triggerDescription?: string;
+    triggerReaction?: string;
+  } = {},
+): string {
+  const triggerConfig = getWorkflowTriggerConfig(definition);
+  const triggerClause =
+    getPresentedTriggerCardClause(options.triggerDescription) ??
+    getPresentedTriggerCardClause(
+      triggerConfig?.filter && !options.triggerReaction
+        ? workflowTriggerDescription(triggerConfig, {
+            omitUnresolvedReferences: true,
+          })
+        : undefined,
+    ) ??
+    getTriggerCardClause(definition, options.triggerReaction);
+  const steps = getWorkflowSteps(definition);
+  const firstAction = steps[0]
+    ? getActionCardClause(steps[0], options.actionChannelLabel)
+    : null;
+  if (!firstAction) return triggerClause;
+
+  const remainingStepCount = steps.length - 1;
+  if (remainingStepCount === 0) return `${triggerClause}, ${firstAction}`;
+
+  return `${triggerClause}, ${firstAction}, then ${remainingStepCount} more ${
+    remainingStepCount === 1 ? "step" : "steps"
+  }`;
+}
+
+export function getWorkflowDescription(
+  definition: Record<string, unknown>,
+): string | null {
+  return nonEmptyString(definition.description);
 }
 
 export function getWorkflowEnabled(
@@ -59,49 +439,18 @@ export function getWorkflowDisplayStatus(
   return getWorkflowEnabled(workflow.definition) ? workflow.status : "disabled";
 }
 
-export function getWorkflowDescription(
-  definition: Record<string, unknown>,
-): string | null {
-  const description = definition.description;
-  return typeof description === "string" && description.trim().length > 0
-    ? description.trim()
-    : null;
-}
-
 export function getWorkflowTriggerSummary(
   definition: Record<string, unknown>,
 ): string | null {
-  const trigger = asRecord(definition.trigger);
-  if (!trigger) return null;
+  const trigger = getWorkflowTriggerConfig(definition);
+  if (trigger)
+    return workflowTriggerDescription(trigger, {
+      omitUnresolvedReferences: true,
+    });
 
-  const on = trigger.on;
-  if (typeof on !== "string") return null;
-
-  const label = TRIGGER_LABELS[on as TriggerType] ?? on;
-  switch (on) {
-    case "message_posted":
-    case "diff_posted":
-      return typeof trigger.filter === "string" &&
-        trigger.filter.trim().length > 0
-        ? `${label} · ${trigger.filter}`
-        : label;
-    case "reaction_added":
-      return typeof trigger.emoji === "string" &&
-        trigger.emoji.trim().length > 0
-        ? `${label} · ${trigger.emoji}`
-        : label;
-    case "schedule":
-      if (typeof trigger.cron === "string" && trigger.cron.trim().length > 0) {
-        return `${label} · ${trigger.cron}`;
-      }
-      if (
-        typeof trigger.interval === "string" &&
-        trigger.interval.trim().length > 0
-      ) {
-        return `${label} · ${trigger.interval}`;
-      }
-      return label;
-    default:
-      return label;
-  }
+  const rawTrigger = asRecord(definition.trigger);
+  const triggerType = nonEmptyString(rawTrigger?.on);
+  return triggerType
+    ? (TRIGGER_LABELS[triggerType as TriggerType] ?? triggerType)
+    : null;
 }
diff --git a/desktop/src/features/workflows/ui/workflowReactionCondition.test.mjs b/desktop/src/features/workflows/ui/workflowReactionCondition.test.mjs
new file mode 100644
index 0000000000..db13b94ef8
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowReactionCondition.test.mjs
@@ -0,0 +1,49 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { reactionConditionValue } from "./workflowReactionCondition.ts";
+
+test("merges a legacy reaction emoji with a separate structured filter", () => {
+  const author = "a".repeat(64);
+  assert.equal(
+    reactionConditionValue({
+      on: "reaction_added",
+      emoji: "🔥",
+      filter: `trigger_author == "${author}"`,
+    }),
+    `trigger_emoji == "🔥" && trigger_author == "${author}"`,
+  );
+});
+
+test("groups a legacy filter that has top-level alternatives", () => {
+  const a = "a".repeat(64);
+  const b = "b".repeat(64);
+  assert.equal(
+    reactionConditionValue({
+      on: "reaction_added",
+      emoji: "✅",
+      filter: `trigger_author == "${a}" || trigger_author == "${b}"`,
+    }),
+    `trigger_emoji == "✅" && (trigger_author == "${a}" || trigger_author == "${b}")`,
+  );
+});
+
+test("does not add redundant grouping to an already-parenthesized filter", () => {
+  const a = "a".repeat(64);
+  const b = "b".repeat(64);
+  assert.equal(
+    reactionConditionValue({
+      on: "reaction_added",
+      emoji: "✅",
+      filter: `(trigger_author == "${a}" || trigger_author == "${b}")`,
+    }),
+    `trigger_emoji == "✅" && (trigger_author == "${a}" || trigger_author == "${b}")`,
+  );
+});
+
+test("leaves non-reaction filters unchanged", () => {
+  assert.equal(
+    reactionConditionValue({ on: "message_posted", filter: "trigger_text" }),
+    "trigger_text",
+  );
+});
diff --git a/desktop/src/features/workflows/ui/workflowReactionCondition.ts b/desktop/src/features/workflows/ui/workflowReactionCondition.ts
new file mode 100644
index 0000000000..536f916695
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowReactionCondition.ts
@@ -0,0 +1,15 @@
+import { needsConjunctionGrouping } from "./workflowConditionExpression";
+import type { TriggerConfig } from "./workflowFormTypes";
+
+/** Presents legacy reaction emoji constraints alongside structured filters. */
+export function reactionConditionValue(trigger: TriggerConfig): string {
+  const filter = trigger.filter?.trim() ?? "";
+  const emoji = trigger.on === "reaction_added" ? trigger.emoji?.trim() : null;
+  if (!emoji) return filter;
+  const emojiCondition = `trigger_emoji == ${JSON.stringify(emoji)}`;
+  if (!filter) return emojiCondition;
+  // The emoji constraint and the filter are ANDed at runtime, so a filter with
+  // top-level alternatives must be grouped to preserve its original meaning.
+  const guarded = needsConjunctionGrouping(filter) ? `(${filter})` : filter;
+  return `${emojiCondition} && ${guarded}`;
+}
diff --git a/desktop/src/features/workflows/ui/workflowStepDescription.test.mjs b/desktop/src/features/workflows/ui/workflowStepDescription.test.mjs
new file mode 100644
index 0000000000..83286334d8
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowStepDescription.test.mjs
@@ -0,0 +1,109 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { workflowStepDescription } from "./workflowStepDescription.ts";
+
+test("describes configured workflow steps on the canvas", () => {
+  assert.equal(
+    workflowStepDescription({
+      id: "message",
+      action: "send_message",
+      name: "say hello",
+      text: "hey yourself",
+    }),
+    "say hello · “hey yourself”",
+  );
+  assert.equal(
+    workflowStepDescription(
+      {
+        id: "channel-message",
+        action: "send_message",
+        text: "deploying now",
+        channel: "channel-id",
+      },
+      { channelLabel: "deployments" },
+    ),
+    "“deploying now” in #deployments",
+  );
+  assert.equal(
+    workflowStepDescription({
+      id: "delay",
+      action: "delay",
+      duration: "5m",
+    }),
+    "5 minutes",
+  );
+  assert.equal(
+    workflowStepDescription({
+      id: "long-delay",
+      action: "delay",
+      duration: "4w",
+    }),
+    "4 weeks",
+  );
+  assert.equal(
+    workflowStepDescription({
+      id: "webhook",
+      action: "call_webhook",
+      method: "PATCH",
+      url: "https://example.com/deploy",
+    }),
+    "PATCH https://example.com/deploy",
+  );
+  assert.equal(
+    workflowStepDescription({
+      id: "dm",
+      action: "send_dm",
+      text: "Build finished",
+      to: "team-on-call",
+    }),
+    "“Build finished” to team-on-call",
+  );
+  assert.equal(
+    workflowStepDescription({
+      id: "approval",
+      action: "request_approval",
+      message: "Ship the release?",
+      from: "release-managers",
+    }),
+    "“Ship the release?” from release-managers",
+  );
+  assert.equal(
+    workflowStepDescription({
+      id: "reaction",
+      action: "add_reaction",
+      emoji: ":buzz:",
+    }),
+    ":buzz:",
+  );
+  assert.equal(
+    workflowStepDescription({
+      id: "topic",
+      action: "set_channel_topic",
+      topic: "Shipping this week",
+    }),
+    "“Shipping this week”",
+  );
+});
+
+test("falls back to the action label until a step is configured", () => {
+  assert.equal(
+    workflowStepDescription({ id: "message", action: "send_message" }),
+    "Send Message",
+  );
+});
+
+test("can omit a custom step name when composing an index label", () => {
+  assert.equal(
+    workflowStepDescription(
+      {
+        id: "message",
+        action: "send_message",
+        name: "say hello",
+        text: "hey yourself",
+      },
+      { includeName: false },
+    ),
+    "“hey yourself”",
+  );
+});
diff --git a/desktop/src/features/workflows/ui/workflowStepDescription.ts b/desktop/src/features/workflows/ui/workflowStepDescription.ts
new file mode 100644
index 0000000000..136ce02611
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowStepDescription.ts
@@ -0,0 +1,83 @@
+import { truncatePubkey } from "@/shared/lib/pubkey";
+import {
+  formatDurationSecondsVerbose,
+  parseDurationSeconds,
+} from "./workflowDuration";
+import { ACTION_LABELS } from "./workflowFormTypes";
+import type { StepFormState } from "./workflowFormTypes";
+
+const MAX_DETAIL_LENGTH = 42;
+
+function compact(value: string): string {
+  const normalized = value.trim().replaceAll(/\s+/g, " ");
+  return normalized.length > MAX_DETAIL_LENGTH
+    ? `${normalized.slice(0, MAX_DETAIL_LENGTH - 3)}...`
+    : normalized;
+}
+
+function quoted(value: string | undefined): string | null {
+  const normalized = value ? compact(value) : "";
+  return normalized ? `“${normalized}”` : null;
+}
+
+function destination(value: string | undefined): string | null {
+  const normalized = value?.trim();
+  if (!normalized) return null;
+  return /^[0-9a-f]{64}$/i.test(normalized)
+    ? truncatePubkey(normalized)
+    : compact(normalized);
+}
+
+function configuredStepDetail(
+  step: StepFormState,
+  channelLabel?: string,
+): string | null {
+  switch (step.action) {
+    case "delay": {
+      const duration = step.duration?.trim();
+      if (!duration) return null;
+      const seconds = parseDurationSeconds(duration);
+      return compact(
+        seconds === null ? duration : formatDurationSecondsVerbose(seconds),
+      );
+    }
+    case "send_message": {
+      const text = quoted(step.text);
+      const channel = channelLabel ? `#${channelLabel}` : null;
+      if (text && channel) return `${text} in ${channel}`;
+      return text ?? channel;
+    }
+    case "send_dm": {
+      const text = quoted(step.text);
+      const recipient = destination(step.to);
+      if (text && recipient) return `${text} to ${recipient}`;
+      return text ?? recipient;
+    }
+    case "call_webhook": {
+      const url = step.url?.trim();
+      if (!url) return null;
+      return `${step.method?.trim() || "POST"} ${compact(url)}`;
+    }
+    case "request_approval": {
+      const message = quoted(step.message);
+      const approver = destination(step.from);
+      if (message && approver) return `${message} from ${approver}`;
+      return message ?? approver;
+    }
+    case "add_reaction":
+      return step.emoji?.trim() || null;
+    case "set_channel_topic":
+      return quoted(step.topic);
+  }
+}
+
+/** Build the concise action summary rendered on a workflow step node. */
+export function workflowStepDescription(
+  step: StepFormState,
+  options: { channelLabel?: string; includeName?: boolean } = {},
+): string {
+  const name = options.includeName === false ? undefined : step.name?.trim();
+  const detail = configuredStepDetail(step, options.channelLabel);
+  if (name && detail) return `${name} · ${detail}`;
+  return name || detail || ACTION_LABELS[step.action];
+}
diff --git a/desktop/src/features/workflows/ui/workflowTemplateVariables.test.mjs b/desktop/src/features/workflows/ui/workflowTemplateVariables.test.mjs
new file mode 100644
index 0000000000..ee174bdc91
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowTemplateVariables.test.mjs
@@ -0,0 +1,87 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+
+import {
+  activeTemplateToken,
+  insertTemplateVariable,
+  workflowTemplateVariables,
+} from "./workflowTemplateVariables.ts";
+
+test("finds the active template token at the caret", () => {
+  assert.deepEqual(activeTemplateToken("hello {{trig", 12), {
+    start: 6,
+    end: 12,
+    query: "trig",
+  });
+  assert.equal(activeTemplateToken("hello {{trigger.text}}", 22), null);
+  assert.equal(activeTemplateToken("hello {{trigger ", 16), null);
+});
+
+test("inserts a selected variable and preserves surrounding text", () => {
+  const token = activeTemplateToken("before {{tri after", 12);
+  assert.ok(token);
+  assert.deepEqual(
+    insertTemplateVariable("before {{tri after", token, "trigger.text"),
+    {
+      value: "before {{trigger.text}} after",
+      caret: 23,
+    },
+  );
+});
+
+test("replaces the whole template when editing inside an existing token", () => {
+  const token = activeTemplateToken("{{trigger.text}}", 9);
+  assert.ok(token);
+  assert.deepEqual(
+    insertTemplateVariable("{{trigger.text}}", token, "trigger.author"),
+    {
+      value: "{{trigger.author}}",
+      caret: 18,
+    },
+  );
+});
+
+test("offers trigger fields and known previous-step outputs", () => {
+  const variables = workflowTemplateVariables("message_posted", [
+    { id: "notify", action: "send_message" },
+    { id: "pause", action: "delay" },
+  ]).map(({ value }) => value);
+
+  assert.ok(variables.includes("trigger.text"));
+  assert.ok(variables.includes("trigger.author"));
+  assert.ok(variables.includes("steps.notify.output.event_id"));
+  assert.ok(variables.includes("steps.pause.output.slept_secs"));
+});
+
+test("offers only outputs available in every runtime shape", () => {
+  const variables = workflowTemplateVariables("reaction_added", [
+    { id: "react", action: "add_reaction" },
+  ]).map(({ value }) => value);
+
+  assert.ok(variables.includes("trigger.emoji"));
+  assert.ok(variables.includes("steps.react.output.added"));
+  assert.ok(!variables.includes("steps.react.output.status"));
+  assert.ok(!variables.includes("steps.react.output.response"));
+});
+
+test("keeps prior-step ordering and ignores unsafe step IDs", () => {
+  const variables = workflowTemplateVariables("webhook", [
+    { id: "first", action: "delay" },
+    { id: "unsafe-id", action: "send_message" },
+    { id: "second", action: "send_message" },
+  ]).map(({ value }) => value);
+
+  assert.deepEqual(variables, [
+    "trigger.channel_id",
+    "steps.first.output.slept_secs",
+    "steps.second.output.sent",
+    "steps.second.output.event_id",
+  ]);
+});
+
+test("only offers values populated by the selected trigger", () => {
+  const variables = workflowTemplateVariables("schedule", []).map(
+    ({ value }) => value,
+  );
+  assert.deepEqual(variables, ["trigger.channel_id", "trigger.timestamp"]);
+});
diff --git a/desktop/src/features/workflows/ui/workflowTemplateVariables.ts b/desktop/src/features/workflows/ui/workflowTemplateVariables.ts
new file mode 100644
index 0000000000..c4f038fef9
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowTemplateVariables.ts
@@ -0,0 +1,147 @@
+import type {
+  ActionType,
+  StepFormState,
+  TriggerType,
+} from "./workflowFormTypes";
+
+export type WorkflowTemplateVariable = {
+  description: string;
+  group: "Trigger" | "Previous steps";
+  value: string;
+};
+
+export type ActiveTemplateToken = {
+  end: number;
+  query: string;
+  start: number;
+};
+
+const COMMON_EVENT_VARIABLES: WorkflowTemplateVariable[] = [
+  {
+    value: "trigger.author",
+    description: "Author pubkey",
+    group: "Trigger",
+  },
+  {
+    value: "trigger.channel_id",
+    description: "Channel UUID",
+    group: "Trigger",
+  },
+  {
+    value: "trigger.timestamp",
+    description: "Unix timestamp",
+    group: "Trigger",
+  },
+  {
+    value: "trigger.message_id",
+    description: "Message event ID",
+    group: "Trigger",
+  },
+];
+
+const STEP_OUTPUTS: Partial<Record<ActionType, Record<string, string>>> = {
+  delay: { slept_secs: "Seconds elapsed" },
+  send_message: {
+    sent: "Whether the message was sent",
+    event_id: "Sent message ID",
+  },
+  call_webhook: { status: "HTTP response status", body: "HTTP response body" },
+  add_reaction: {
+    added: "Whether the reaction was added",
+  },
+};
+
+function triggerVariables(
+  triggerType: TriggerType,
+): WorkflowTemplateVariable[] {
+  switch (triggerType) {
+    case "message_posted":
+      return [
+        {
+          value: "trigger.text",
+          description: "Message text",
+          group: "Trigger",
+        },
+        ...COMMON_EVENT_VARIABLES,
+      ];
+    case "diff_posted":
+      return [
+        { value: "trigger.text", description: "Diff text", group: "Trigger" },
+        ...COMMON_EVENT_VARIABLES,
+      ];
+    case "reaction_added":
+      return [
+        {
+          value: "trigger.emoji",
+          description: "Reaction emoji",
+          group: "Trigger",
+        },
+        ...COMMON_EVENT_VARIABLES,
+      ];
+    case "schedule":
+      return COMMON_EVENT_VARIABLES.filter(
+        ({ value }) =>
+          value === "trigger.channel_id" || value === "trigger.timestamp",
+      );
+    case "webhook":
+      return [
+        {
+          value: "trigger.channel_id",
+          description: "Workflow channel UUID",
+          group: "Trigger",
+        },
+      ];
+  }
+}
+
+export function workflowTemplateVariables(
+  triggerType: TriggerType,
+  previousSteps: StepFormState[],
+): WorkflowTemplateVariable[] {
+  const priorOutputs = previousSteps.flatMap((step) => {
+    const outputs = STEP_OUTPUTS[step.action];
+    if (!outputs || !/^[A-Za-z0-9_]+$/.test(step.id)) return [];
+    return Object.entries(outputs).map(([field, description]) => ({
+      value: `steps.${step.id}.output.${field}`,
+      description,
+      group: "Previous steps" as const,
+    }));
+  });
+
+  return [...triggerVariables(triggerType), ...priorOutputs];
+}
+
+/** Find an unfinished `{{variable` token immediately before the caret. */
+export function activeTemplateToken(
+  value: string,
+  caret: number,
+): ActiveTemplateToken | null {
+  const beforeCaret = value.slice(0, caret);
+  const start = beforeCaret.lastIndexOf("{{");
+  if (start < 0) return null;
+
+  const query = beforeCaret.slice(start + 2);
+  if (query.includes("}}") || !/^[A-Za-z0-9._]*$/.test(query)) return null;
+
+  // If the caret is inside an existing template, replace the complete token
+  // instead of leaving its old suffix behind after a suggestion is chosen.
+  const closingBraces = value.indexOf("}}", caret);
+  const nestedOpening = value.indexOf("{{", start + 2);
+  const end =
+    closingBraces >= 0 && (nestedOpening < 0 || closingBraces < nestedOpening)
+      ? closingBraces + 2
+      : caret;
+  return { start, end, query };
+}
+
+export function insertTemplateVariable(
+  value: string,
+  token: ActiveTemplateToken,
+  variable: string,
+): { caret: number; value: string } {
+  const insertion = `{{${variable}}}`;
+  return {
+    value: `${value.slice(0, token.start)}${insertion}${value.slice(token.end)}`,
+    caret: token.start + insertion.length,
+  };
+}
diff --git a/desktop/src/features/workflows/ui/workflowTriggerDescription.test.mjs b/desktop/src/features/workflows/ui/workflowTriggerDescription.test.mjs
new file mode 100644
index 0000000000..94b04356cd
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowTriggerDescription.test.mjs
@@ -0,0 +1,158 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { workflowTriggerDescription } from "./workflowTriggerDescription.ts";
+
+test("describes selected trigger conditions on the workflow canvas", () => {
+  assert.equal(
+    workflowTriggerDescription(
+      {
+        on: "message_posted",
+        filter: `trigger_author == "${"a".repeat(64)}"`,
+      },
+      { authorLabel: "Carl" },
+    ),
+    "Message posted by Carl",
+  );
+
+  assert.equal(
+    workflowTriggerDescription(
+      {
+        on: "message_posted",
+        filter: `trigger_author == "${"a".repeat(64)}"`,
+      },
+      { authorLoading: true },
+    ),
+    "Message posted by loading author",
+  );
+
+  assert.equal(
+    workflowTriggerDescription({
+      on: "message_posted",
+      filter: 'str_contains(trigger_text, "deploy")',
+    }),
+    "Message contains “deploy”",
+  );
+
+  assert.equal(
+    workflowTriggerDescription({
+      on: "message_posted",
+      filter: '!str_contains(trigger_text, "deploy")',
+    }),
+    "Message doesn’t contain “deploy”",
+  );
+
+  assert.equal(
+    workflowTriggerDescription({
+      on: "message_posted",
+      filter: 'str_starts_with(trigger_text, "deploy")',
+    }),
+    "Message starts with “deploy”",
+  );
+
+  assert.equal(
+    workflowTriggerDescription({
+      on: "message_posted",
+      filter: 'str_ends_with(trigger_text, "done")',
+    }),
+    "Message ends with “done”",
+  );
+
+  assert.equal(
+    workflowTriggerDescription({
+      on: "message_posted",
+      filter: 'trigger_text == "deploy"',
+    }),
+    "Message “deploy” is posted",
+  );
+
+  assert.equal(
+    workflowTriggerDescription({
+      on: "message_posted",
+      filter: 'trigger_text != "deploy"',
+    }),
+    "Message with text other than “deploy” posted",
+  );
+
+  assert.equal(
+    workflowTriggerDescription(
+      {
+        on: "message_posted",
+        filter: `trigger_text == "FUCK" && trigger_author == "${"a".repeat(64)}"`,
+      },
+      { authorLabel: "Carl" },
+    ),
+    "Message “FUCK” is posted by Carl",
+  );
+
+  assert.equal(
+    workflowTriggerDescription(
+      {
+        on: "message_posted",
+        filter: `str_contains(trigger_text, "deploy") && trigger_author == "${"a".repeat(64)}"`,
+      },
+      { authorLabel: "Carl" },
+    ),
+    "Message by Carl contains “deploy”",
+  );
+
+  assert.equal(
+    workflowTriggerDescription({
+      on: "message_posted",
+      filter: "str_len(trigger_text) == 0",
+    }),
+    "Message without text posted",
+  );
+
+  assert.equal(
+    workflowTriggerDescription({
+      on: "message_posted",
+      filter: "str_len(trigger_text) > 0",
+    }),
+    "Message with text posted",
+  );
+
+  assert.equal(
+    workflowTriggerDescription({
+      on: "reaction_added",
+      filter: 'trigger_emoji == "🔥"',
+    }),
+    "🔥 reaction added",
+  );
+
+  assert.equal(
+    workflowTriggerDescription(
+      {
+        on: "reaction_added",
+        filter: `trigger_message_id == "${"b".repeat(64)}"`,
+      },
+      { messageLoading: true },
+    ),
+    "Reaction added to loading message",
+  );
+
+  assert.equal(
+    workflowTriggerDescription(
+      {
+        on: "reaction_added",
+        filter: `trigger_emoji == "👾" && trigger_author == "${"a".repeat(64)}" && trigger_message_id == "${"b".repeat(64)}"`,
+      },
+      { authorLabel: "Carl", messageLabel: "hey yourself" },
+    ),
+    "👾 reaction added by Carl to “hey yourself”",
+  );
+});
+
+test("keeps the base label for unfiltered and custom triggers", () => {
+  assert.equal(
+    workflowTriggerDescription({ on: "message_posted" }),
+    "Message posted",
+  );
+  assert.equal(
+    workflowTriggerDescription({
+      on: "message_posted",
+      filter: "custom_variable == 1",
+    }),
+    "Message posted",
+  );
+});
diff --git a/desktop/src/features/workflows/ui/workflowTriggerDescription.ts b/desktop/src/features/workflows/ui/workflowTriggerDescription.ts
new file mode 100644
index 0000000000..49d3842f97
--- /dev/null
+++ b/desktop/src/features/workflows/ui/workflowTriggerDescription.ts
@@ -0,0 +1,209 @@
+import { truncatePubkey } from "@/shared/lib/pubkey";
+import { parseConditionExpressions } from "./workflowConditionExpression";
+import { TRIGGER_LABELS } from "./workflowFormTypes";
+import type { ParsedConditionExpression } from "./workflowConditionExpression";
+import type { TriggerConfig } from "./workflowFormTypes";
+
+const EVENT_PHRASES = {
+  diff_posted: "Diff posted",
+  message_posted: "Message posted",
+  reaction_added: "Reaction added",
+} as const;
+
+export const TRIGGER_MESSAGE_LOADING_LABEL = "loading message";
+export const TRIGGER_AUTHOR_LOADING_LABEL = "loading author";
+
+function authorReference(
+  condition: ParsedConditionExpression,
+  authorLabel?: string,
+  authorLoading?: boolean,
+): string {
+  if (authorLoading) return TRIGGER_AUTHOR_LOADING_LABEL;
+  return authorLabel ?? truncatePubkey(condition.value);
+}
+
+function quotedValue(value: string): string {
+  const normalized = value.trim().replaceAll(/\s+/g, " ");
+  const abbreviated =
+    normalized.length > 36 ? `${normalized.slice(0, 33)}...` : normalized;
+  return `“${abbreviated}”`;
+}
+
+function messageReference(
+  condition: ParsedConditionExpression,
+  messageLabel?: string,
+  messageLoading?: boolean,
+): string {
+  if (messageLoading) return TRIGGER_MESSAGE_LOADING_LABEL;
+  return messageLabel
+    ? quotedValue(messageLabel)
+    : truncatePubkey(condition.value);
+}
+
+function textConditionDescription(
+  eventPhrase: string,
+  condition: ParsedConditionExpression,
+): string {
+  const subject = eventPhrase.replace(/ posted$/, "");
+  const value = quotedValue(condition.value);
+  switch (condition.operator) {
+    case "contains":
+      return `${subject} contains ${value}`;
+    case "not_contains":
+      return `${subject} doesn’t contain ${value}`;
+    case "starts_with":
+      return `${subject} starts with ${value}`;
+    case "ends_with":
+      return `${subject} ends with ${value}`;
+    case "equals":
+      return `${subject} ${value} is posted`;
+    case "not_equals":
+      return `${subject} with text other than ${value} posted`;
+    case "is_not_empty":
+      return `${subject} with text posted`;
+    case "is_empty":
+      return `${subject} without text posted`;
+  }
+}
+
+/** Build the concise trigger summary rendered on the workflow canvas. */
+export function workflowTriggerDescription(
+  trigger: TriggerConfig,
+  options: {
+    authorLoading?: boolean;
+    authorLabel?: string;
+    messageLabel?: string;
+    messageLoading?: boolean;
+    omitUnresolvedReferences?: boolean;
+  } = {},
+): string {
+  const baseLabel =
+    EVENT_PHRASES[trigger.on as keyof typeof EVENT_PHRASES] ??
+    TRIGGER_LABELS[trigger.on];
+  const eventPhrase = EVENT_PHRASES[trigger.on as keyof typeof EVENT_PHRASES];
+  if (!eventPhrase) return baseLabel;
+
+  const conditions = trigger.filter
+    ? parseConditionExpressions(trigger.filter, trigger.on)
+    : [];
+  if (!conditions || conditions.length === 0) {
+    return trigger.on === "reaction_added" && trigger.emoji
+      ? eventPhrase
+      : baseLabel;
+  }
+
+  const condition = conditions[0];
+
+  if (conditions.length > 1) {
+    const authorCondition = conditions.find(
+      ({ field }) => field === "trigger_author",
+    );
+    const textCondition = conditions.find(
+      ({ field }) => field === "trigger_text",
+    );
+    const emojiCondition = conditions.find(
+      ({ field }) => field === "trigger_emoji",
+    );
+    const messageCondition = conditions.find(
+      ({ field }) => field === "trigger_message_id",
+    );
+    let description = textCondition
+      ? textConditionDescription(eventPhrase, textCondition)
+      : eventPhrase;
+
+    if (emojiCondition) {
+      description =
+        emojiCondition.operator === "not_equals"
+          ? `Any reaction except ${emojiCondition.value} added`
+          : `${emojiCondition.value} reaction added`;
+    }
+    if (
+      authorCondition &&
+      (!options.omitUnresolvedReferences ||
+        options.authorLabel ||
+        options.authorLoading)
+    ) {
+      const author = authorReference(
+        authorCondition,
+        options.authorLabel,
+        options.authorLoading,
+      );
+      const attribution =
+        authorCondition.operator === "not_equals"
+          ? ` by anyone except ${author}`
+          : ` by ${author}`;
+      const subject = eventPhrase.replace(/ posted$/, "");
+      description =
+        textCondition &&
+        description.startsWith(subject) &&
+        !/ (?:is )?posted$/.test(description)
+          ? `${subject}${attribution}${description.slice(subject.length)}`
+          : `${description}${attribution}`;
+    }
+    if (
+      messageCondition &&
+      (!options.omitUnresolvedReferences ||
+        options.messageLabel ||
+        options.messageLoading)
+    ) {
+      const message = messageReference(
+        messageCondition,
+        options.messageLabel,
+        options.messageLoading,
+      );
+      description +=
+        messageCondition.operator === "not_equals"
+          ? ` anywhere except ${message}`
+          : ` to ${message}`;
+    }
+    return description;
+  }
+
+  if (condition.field === "trigger_author") {
+    if (
+      options.omitUnresolvedReferences &&
+      !options.authorLabel &&
+      !options.authorLoading
+    ) {
+      return baseLabel;
+    }
+    const author = authorReference(
+      condition,
+      options.authorLabel,
+      options.authorLoading,
+    );
+    return condition.operator === "not_equals"
+      ? `${eventPhrase} by anyone except ${author}`
+      : `${eventPhrase} by ${author}`;
+  }
+
+  if (condition.field === "trigger_text") {
+    return textConditionDescription(eventPhrase, condition);
+  }
+
+  if (condition.field === "trigger_emoji") {
+    return condition.operator === "not_equals"
+      ? `Any reaction except ${condition.value} added`
+      : `${condition.value} reaction added`;
+  }
+
+  if (condition.field === "trigger_message_id") {
+    if (
+      options.omitUnresolvedReferences &&
+      !options.messageLabel &&
+      !options.messageLoading
+    ) {
+      return baseLabel;
+    }
+    const message = messageReference(
+      condition,
+      options.messageLabel,
+      options.messageLoading,
+    );
+    return condition.operator === "not_equals"
+      ? `Reaction added anywhere except ${message}`
+      : `Reaction added to ${message}`;
+  }
+
+  return baseLabel;
+}
diff --git a/desktop/tests/e2e/navigation.spec.ts b/desktop/tests/e2e/navigation.spec.ts
index ed5a261a98..189db09e0f 100644
--- a/desktop/tests/e2e/navigation.spec.ts
+++ b/desktop/tests/e2e/navigation.spec.ts
@@ -62,6 +62,18 @@ async function createWorkflow(
   await page.getByRole("menuitem", { name: "Send Message" }).click();
   await dialog.getByLabel("Message text").fill("Workflow notification");
   await dialog.getByRole("button", { name: "Create" }).click();
+  const activationConfirmation = page.getByRole("alertdialog", {
+    name: "This workflow may run often",
+  });
+  await Promise.race([
+    activationConfirmation.waitFor({ state: "visible" }),
+    dialog.waitFor({ state: "hidden" }),
+  ]);
+  if (await activationConfirmation.isVisible()) {
+    await activationConfirmation
+      .getByRole("button", { name: "Turn on" })
+      .click();
+  }
   await expect(dialog).not.toBeVisible();
 }
 
diff --git a/desktop/tests/e2e/workflow-local-controls.spec.ts b/desktop/tests/e2e/workflow-local-controls.spec.ts
index f153afc69c..2cdd1b28d7 100644
--- a/desktop/tests/e2e/workflow-local-controls.spec.ts
+++ b/desktop/tests/e2e/workflow-local-controls.spec.ts
@@ -1,6 +1,7 @@
 import { expect, test } from "@playwright/test";
-import { parse as parseYaml } from "yaml";
+import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
 
+import { waitForAnimations } from "../helpers/animations";
 import { installMockBridge } from "../helpers/bridge";
 
 test.beforeEach(async ({ page }) => {
@@ -39,11 +40,10 @@ async function selectTrigger(
 
 async function openTriggerInspector(
   dialog: import("@playwright/test").Locator,
-  trigger: string,
 ) {
   const menu = dialog.getByRole("button", { name: "Trigger event" });
   if (!(await menu.isVisible())) {
-    await dialog.getByRole("button", { name: `Trigger: ${trigger}` }).click();
+    await dialog.getByRole("button", { name: /^Trigger:/ }).click();
   }
   await expect(menu).toBeVisible();
 }
@@ -57,6 +57,19 @@ async function addMessageStep(
   await dialog.getByLabel("Message text").fill("Workflow notification");
 }
 
+async function createEnabled(
+  page: import("@playwright/test").Page,
+  dialog: import("@playwright/test").Locator,
+) {
+  await dialog.getByRole("button", { name: "Create" }).click();
+  const confirmation = page.getByRole("alertdialog", {
+    name: "This workflow may run often",
+  });
+  if (await confirmation.isVisible()) {
+    await confirmation.getByRole("button", { name: "Turn on" }).click();
+  }
+}
+
 async function reopenWorkflow(
   page: import("@playwright/test").Page,
   name: string,
@@ -69,6 +82,111 @@ async function reopenWorkflow(
   return page.getByRole("dialog", { name: "Edit workflow" });
 }
 
+test("confirms activation after create and preserves a safe disabled path", async ({
+  page,
+}) => {
+  const name = `activation_confirmation_${Date.now()}`;
+  const dialog = await openCreateWorkflow(page, name);
+  await addMessageStep(page, dialog);
+
+  await expect(
+    dialog.getByRole("switch", { name: "Enable workflow" }),
+  ).toHaveCount(0);
+  await dialog.getByRole("button", { name: "Create" }).click();
+  const confirmation = page.getByRole("alertdialog", {
+    name: "This workflow may run often",
+  });
+  await expect(confirmation).toBeVisible();
+  await expect(
+    confirmation.getByRole("button", { name: "Back" }),
+  ).toBeFocused();
+
+  await confirmation.getByRole("button", { name: "Back" }).click();
+  await expect(confirmation).toBeHidden();
+  await expect(dialog).toBeVisible();
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? []).filter(
+            (call) => call.command === "create_workflow",
+          ).length,
+      ),
+    )
+    .toBe(0);
+
+  await dialog.getByRole("button", { name: "Create" }).click();
+  await confirmation.getByRole("button", { name: "Keep off" }).click();
+  await expect(dialog).toBeHidden();
+
+  const yaml = await page.evaluate(() => {
+    const call = [...(window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? [])]
+      .reverse()
+      .find((candidate) => candidate.command === "create_workflow");
+    return (call?.payload as { yamlDefinition?: string } | undefined)
+      ?.yamlDefinition;
+  });
+  expect(parseYaml(yaml ?? "").enabled).toBe(false);
+  const card = page
+    .locator('[data-testid^="workflow-card-"]')
+    .filter({ hasText: name })
+    .first();
+  await expect(
+    card.getByRole("switch", { name: "Enable workflow" }),
+  ).not.toBeChecked();
+});
+
+test("inserts template variables with keyboard control and restores the caret", async ({
+  page,
+}) => {
+  const dialog = await openCreateWorkflow(page, "template_variables_keyboard");
+  await dialog.getByRole("button", { name: "Add step", exact: true }).click();
+  await page.getByRole("menuitem", { name: "Send Message" }).click();
+
+  const textarea = dialog.getByLabel("Message text");
+  const listbox = page.getByRole("listbox");
+  await textarea.fill("Hello {{trig");
+  await expect(listbox).toBeVisible();
+  await expect(listbox.getByRole("option")).toHaveCount(5);
+  await waitForAnimations(page);
+  expect(await page.locator("body").screenshot()).toMatchSnapshot(
+    "workflow-template-variable-autocomplete.png",
+  );
+
+  await textarea.press("ArrowUp");
+  await expect(textarea).toHaveAttribute(
+    "aria-activedescendant",
+    /-variables-option-4$/,
+  );
+  await textarea.press("ArrowDown");
+  await expect(textarea).toHaveAttribute(
+    "aria-activedescendant",
+    /-variables-option-0$/,
+  );
+  await textarea.press("Enter");
+  await expect(textarea).toHaveValue("Hello {{trigger.text}}");
+  await expect(textarea).toBeFocused();
+  await expect
+    .poll(() =>
+      textarea.evaluate((element) =>
+        element instanceof HTMLTextAreaElement ? element.selectionStart : -1,
+      ),
+    )
+    .toBe("Hello {{trigger.text}}".length);
+
+  await textarea.fill("Keep {{auth");
+  await expect(listbox).toBeVisible();
+  await textarea.press("Escape");
+  await expect(listbox).toBeHidden();
+  await expect(textarea).toBeFocused();
+  await expect(textarea).toHaveValue("Keep {{auth");
+
+  await textarea.fill("By {{auth");
+  await textarea.press("Tab");
+  await expect(textarea).toHaveValue("By {{trigger.author}}");
+  await expect(textarea).toBeFocused();
+});
+
 test("round-trips schedule presets and saves a custom UTC cron", async ({
   page,
 }) => {
@@ -86,7 +204,7 @@ test("round-trips schedule presets and saves a custom UTC cron", async ({
   expect(definition.trigger).toEqual({ on: "schedule", interval: "15m" });
 
   await dialog.getByRole("tab", { name: "Form" }).click();
-  await openTriggerInspector(dialog, "Schedule");
+  await openTriggerInspector(dialog);
   await expect(
     dialog.getByRole("radio", { name: "Every 15 minutes" }),
   ).toBeChecked();
@@ -114,7 +232,7 @@ test("round-trips schedule presets and saves a custom UTC cron", async ({
     cron: "5 */2 * * 2-4",
   });
   await dialog.getByRole("tab", { name: "Form" }).click();
-  await openTriggerInspector(dialog, "Schedule");
+  await openTriggerInspector(dialog);
   await expect(
     dialog.getByRole("radio", { name: "Custom cron" }),
   ).toBeChecked();
@@ -123,9 +241,9 @@ test("round-trips schedule presets and saves a custom UTC cron", async ({
   ).toHaveValue("2-4");
 
   await addMessageStep(page, dialog);
-  await dialog.getByRole("button", { name: "Create" }).click();
+  await createEnabled(page, dialog);
   const reopened = await reopenWorkflow(page, name);
-  await openTriggerInspector(reopened, "Schedule");
+  await openTriggerInspector(reopened);
   await expect(
     reopened.getByRole("radio", { name: "Custom cron" }),
   ).toBeChecked();
@@ -145,17 +263,41 @@ test("round-trips and reopens structured message-text conditions", async ({
   const expression = 'str_ends_with(trigger_text, "deploy \\"buzz\\"\\\\path")';
   const dialog = await openCreateWorkflow(page, name);
 
-  await dialog.getByText("ends with", { exact: true }).click();
-  await dialog.getByLabel("Text to match").fill(text);
+  await dialog
+    .getByRole("group", { name: "Match" })
+    .getByRole("button", {
+      name: "ends with",
+    })
+    .click();
+  await dialog.getByLabel("Message text").fill(text);
   await dialog.getByRole("tab", { name: "YAML" }).click();
   const yamlEditor = dialog.getByRole("textbox", { name: "Workflow YAML" });
   const definition = parseYaml(await yamlEditor.inputValue());
   expect(definition.trigger.filter).toBe(expression);
 
   await dialog.getByRole("tab", { name: "Form" }).click();
-  await openTriggerInspector(dialog, "Message Posted");
-  await expect(dialog.getByText("ends with", { exact: true })).toBeVisible();
-  await expect(dialog.getByLabel("Text to match")).toHaveValue(text);
+  await openTriggerInspector(dialog);
+  const matchControls = dialog.getByRole("group", { name: "Match" });
+  const operatorButtons = matchControls.getByRole("button");
+  const firstOperatorBox = await operatorButtons.nth(0).boundingBox();
+  const secondOperatorBox = await operatorButtons.nth(1).boundingBox();
+  const thirdOperatorBox = await operatorButtons.nth(2).boundingBox();
+  expect(firstOperatorBox).not.toBeNull();
+  expect(secondOperatorBox).not.toBeNull();
+  expect(thirdOperatorBox).not.toBeNull();
+  expect(secondOperatorBox?.x).toBeGreaterThan(firstOperatorBox?.x ?? 0);
+  expect(
+    Math.abs((secondOperatorBox?.y ?? 0) - (firstOperatorBox?.y ?? 0)),
+  ).toBeLessThan(1);
+  expect(thirdOperatorBox?.y).toBeGreaterThan(firstOperatorBox?.y ?? 0);
+  await waitForAnimations(page);
+  await matchControls.screenshot({
+    path: "test-results/workflow-message-condition-operators.png",
+  });
+  await expect(
+    matchControls.getByRole("button", { name: "ends with" }),
+  ).toHaveAttribute("aria-pressed", "true");
+  await expect(dialog.getByLabel("Message text")).toHaveValue(text);
   await dialog.getByRole("tab", { name: "Advanced" }).click();
   await expect(dialog.getByLabel("Advanced expression")).toHaveValue(
     expression,
@@ -163,11 +305,196 @@ test("round-trips and reopens structured message-text conditions", async ({
   await dialog.getByRole("tab", { name: "Basic" }).click();
 
   await addMessageStep(page, dialog);
-  await dialog.getByRole("button", { name: "Create" }).click();
+  await createEnabled(page, dialog);
   const reopened = await reopenWorkflow(page, name);
-  await openTriggerInspector(reopened, "Message Posted");
-  await expect(reopened.getByText("ends with", { exact: true })).toBeVisible();
-  await expect(reopened.getByLabel("Text to match")).toHaveValue(text);
+  await openTriggerInspector(reopened);
+  await expect(
+    reopened
+      .getByRole("group", { name: "Match" })
+      .getByRole("button", { name: "ends with" }),
+  ).toHaveAttribute("aria-pressed", "true");
+  await expect(reopened.getByLabel("Message text")).toHaveValue(text);
+});
+
+test("renders deterministic trigger, step, and workflow-card summaries", async ({
+  page,
+}) => {
+  const name = `semantic_summaries_${Date.now()}`;
+  await page.addInitScript((workflowName) => {
+    const positions: number[] = [];
+    Object.defineProperty(window, "__WORKFLOW_METADATA_POSITIONS__", {
+      configurable: true,
+      value: positions,
+    });
+
+    const findTarget = () => {
+      const target = Array.from(
+        document.querySelectorAll<HTMLElement>(
+          '[data-testid="workflow-card-name"]',
+        ),
+      ).find((element) => element.textContent === workflowName);
+      if (!target) {
+        requestAnimationFrame(findTarget);
+        return;
+      }
+
+      let remainingFrames = 12;
+      const sample = () => {
+        positions.push(target.getBoundingClientRect().y);
+        remainingFrames -= 1;
+        if (remainingFrames > 0) requestAnimationFrame(sample);
+      };
+      sample();
+    };
+    requestAnimationFrame(findTarget);
+  }, name);
+  const dialog = await openCreateWorkflow(page, name);
+
+  await dialog.getByLabel("Message text").fill("deploy");
+  const triggerNode = dialog.getByRole("button", {
+    name: "Trigger: Message contains “deploy”",
+  });
+  await expect(triggerNode).toContainText("Trigger");
+  await expect(triggerNode).toContainText("Message contains “deploy”");
+
+  await addMessageStep(page, dialog);
+  await dialog.getByRole("tab", { name: "YAML" }).click();
+  const yamlEditor = dialog.getByRole("textbox", { name: "Workflow YAML" });
+  const definition = parseYaml(await yamlEditor.inputValue());
+  definition.steps[0].channel = "94a444a4-c0a3-5966-ab05-530c6ddc2301";
+  await yamlEditor.fill(stringifyYaml(definition));
+  await dialog.getByRole("tab", { name: "Form" }).click();
+  const stepNode = dialog.getByRole("button", {
+    name: "Step 1: “Workflow notification” in #agents",
+  });
+  await expect(stepNode).toContainText("Send Message");
+  await expect(stepNode).toContainText("“Workflow notification” in #agents");
+  await createEnabled(page, dialog);
+
+  const card = page
+    .locator('[data-testid^="workflow-card-"]')
+    .filter({ hasText: name })
+    .first();
+  const semanticLabel = card.getByTestId("workflow-card-semantic-label");
+  const workflowName = card.getByTestId("workflow-card-name");
+  const channelName = card.getByTestId("workflow-card-channel");
+  await expect(card.getByTestId("workflow-card-trigger-summary")).toHaveCount(
+    0,
+  );
+  await expect(semanticLabel).toHaveText(
+    "When a message contains “deploy”, send “Workflow notification”",
+  );
+  await expect(workflowName).toHaveText(name);
+  await expect(channelName).toHaveText("#agents");
+  const semanticBox = await semanticLabel.boundingBox();
+  const nameBox = await workflowName.boundingBox();
+  const channelBox = await channelName.boundingBox();
+  expect(semanticBox).not.toBeNull();
+  expect(nameBox).not.toBeNull();
+  expect(channelBox).not.toBeNull();
+  expect(semanticBox?.y).toBeLessThan(nameBox?.y ?? 0);
+  expect(channelBox?.y).toBeLessThan(nameBox?.y ?? 0);
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (
+            window as typeof window & {
+              __WORKFLOW_METADATA_POSITIONS__?: number[];
+            }
+          ).__WORKFLOW_METADATA_POSITIONS__?.length ?? 0,
+      ),
+    )
+    .toBe(12);
+  const metadataPositions = await page.evaluate(
+    () =>
+      (
+        window as typeof window & {
+          __WORKFLOW_METADATA_POSITIONS__?: number[];
+        }
+      ).__WORKFLOW_METADATA_POSITIONS__ ?? [],
+  );
+  expect(
+    Math.max(...metadataPositions) - Math.min(...metadataPositions),
+  ).toBeLessThan(0.5);
+});
+
+test("round-trips manual author and reaction message IDs through save and reopen", async ({
+  page,
+}) => {
+  const name = `manual_trigger_ids_${Date.now()}`;
+  const author = "a".repeat(64);
+  const messageId = "b".repeat(64);
+  const dialog = await openCreateWorkflow(page, name);
+  await selectTrigger(page, dialog, "Reaction Added");
+  await addMessageStep(page, dialog);
+  await dialog.getByRole("button", { name: /^Trigger:/ }).click();
+  await openTriggerInspector(dialog);
+
+  await dialog.getByRole("button", { name: "Author pubkey" }).click();
+  await dialog.getByLabel("Author pubkey").fill("not-hex");
+  await expect(
+    dialog.getByText("Enter a 64-character hex pubkey."),
+  ).toBeVisible();
+  await expect(dialog.getByRole("button", { name: "Create" })).toBeDisabled();
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? []).filter(
+            (call) => call.command === "create_workflow",
+          ).length,
+      ),
+    )
+    .toBe(0);
+  await dialog.getByLabel("Author pubkey").fill(author);
+  await expect(dialog.getByRole("button", { name: "Create" })).toBeEnabled();
+  await dialog.getByLabel("Author pubkey").fill("still-not-hex");
+  await expect(dialog.getByRole("button", { name: "Create" })).toBeDisabled();
+  await dialog.getByRole("tab", { name: "YAML" }).click();
+  const correctionEditor = dialog.getByRole("textbox", {
+    name: "Workflow YAML",
+  });
+  const correctedDefinition = parseYaml(await correctionEditor.inputValue());
+  delete correctedDefinition.trigger.filter;
+  await correctionEditor.fill(stringifyYaml(correctedDefinition));
+  await expect(dialog.getByRole("button", { name: "Create" })).toBeEnabled();
+  await dialog.getByRole("tab", { name: "Form" }).click();
+  await openTriggerInspector(dialog);
+  await dialog.getByRole("button", { name: "Author pubkey" }).click();
+  await expect(dialog.getByLabel("Author pubkey")).toHaveValue("");
+  await dialog.getByLabel("Author pubkey").fill(author);
+  await dialog
+    .getByRole("group", { name: "Match" })
+    .getByRole("button", { name: "is not", exact: true })
+    .click();
+
+  await dialog.getByRole("button", { name: "Message event ID" }).click();
+  await dialog.getByLabel("Message event ID").fill(messageId);
+
+  await dialog.getByRole("tab", { name: "YAML" }).click();
+  const yamlEditor = dialog.getByRole("textbox", { name: "Workflow YAML" });
+  let definition = parseYaml(await yamlEditor.inputValue());
+  expect(definition.trigger).toEqual({
+    on: "reaction_added",
+    filter: `trigger_author != "${author}" && trigger_message_id == "${messageId}"`,
+  });
+
+  await dialog.getByRole("tab", { name: "Form" }).click();
+  await openTriggerInspector(dialog);
+  await createEnabled(page, dialog);
+
+  const reopened = await reopenWorkflow(page, name);
+  await openTriggerInspector(reopened);
+  await reopened.getByRole("button", { name: "Author pubkey" }).click();
+  await expect(reopened.getByLabel("Author pubkey")).toHaveValue(author);
+  await reopened.getByRole("button", { name: "Message event ID" }).click();
+  await expect(reopened.getByLabel("Message event ID")).toHaveValue(messageId);
+  await reopened.getByRole("tab", { name: "YAML" }).click();
+  definition = parseYaml(
+    await reopened.getByRole("textbox", { name: "Workflow YAML" }).inputValue(),
+  );
+  expect(definition.trigger.filter).toContain(messageId);
 });
 
 test("hides and clears message-text step conditions for schedule triggers", async ({
@@ -181,9 +508,9 @@ test("hides and clears message-text step conditions for schedule triggers", asyn
   await dialog.getByRole("button", { name: "Run controls" }).click();
   await dialog.getByLabel("Text to match").fill("deploy");
 
-  await dialog.getByRole("button", { name: "Trigger: Message Posted" }).click();
+  await dialog.getByRole("button", { name: /^Trigger:/ }).click();
   await selectTrigger(page, dialog, "Schedule");
-  await dialog.getByRole("button", { name: "Step 1: Send Message" }).click();
+  await dialog.getByRole("button", { name: /^Step 1:/ }).click();
   await dialog.getByRole("button", { name: "Run controls" }).click();
 
   await expect(dialog.getByLabel("Text to match")).toHaveCount(0);
@@ -212,7 +539,7 @@ test("keeps advanced and malformed definitions lossless", async ({ page }) => {
     ),
   );
   await dialog.getByRole("tab", { name: "Form" }).click();
-  await openTriggerInspector(dialog, "Message Posted");
+  await openTriggerInspector(dialog);
   await expect(dialog.getByRole("tab", { name: "Advanced" })).toHaveAttribute(
     "data-state",
     "active",
@@ -223,7 +550,9 @@ test("keeps advanced and malformed definitions lossless", async ({ page }) => {
     dialog.getByText(/advanced expression is active/i),
   ).toBeVisible();
 
-  await dialog.getByRole("switch", { name: "Enable workflow" }).click();
+  await expect(
+    dialog.getByRole("switch", { name: "Enable workflow" }),
+  ).toHaveCount(0);
   await dialog.getByRole("tab", { name: "YAML" }).click();
   expect(parseYaml(await yamlEditor.inputValue()).trigger.filter).toBe(
     advanced,
diff --git a/desktop/tests/e2e/workflow-local-controls.spec.ts-snapshots/workflow-template-variable-autocomplete-smoke-darwin.png b/desktop/tests/e2e/workflow-local-controls.spec.ts-snapshots/workflow-template-variable-autocomplete-smoke-darwin.png
new file mode 100644
index 0000000000000000000000000000000000000000..54cc63d5b2a520a9fe9aff54caff40b69d25909f
GIT binary patch
literal 104623
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

literal 0
HcmV?d00001

diff --git a/desktop/tests/e2e/workflow-local-controls.spec.ts-snapshots/workflow-template-variable-autocomplete-smoke-linux.png b/desktop/tests/e2e/workflow-local-controls.spec.ts-snapshots/workflow-template-variable-autocomplete-smoke-linux.png
new file mode 100644
index 0000000000000000000000000000000000000000..492b815d76d49fd46b0b7559fc25ffe3af8f5ba0
GIT binary patch
literal 98835
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
H>dpTF$MIY+

literal 0
HcmV?d00001

diff --git a/desktop/tests/e2e/workflow-reaction-picker.spec.ts b/desktop/tests/e2e/workflow-reaction-picker.spec.ts
index 457b23a4d5..2d39e145eb 100644
--- a/desktop/tests/e2e/workflow-reaction-picker.spec.ts
+++ b/desktop/tests/e2e/workflow-reaction-picker.spec.ts
@@ -73,15 +73,60 @@ test("reaction trigger uses the emoji picker instead of a free-text field", asyn
   await expect(
     dialog.getByRole("button", { name: "Clear trigger emoji" }),
   ).toHaveCount(0);
+  await expect(
+    dialog
+      .getByRole("button", { name: "Trigger: Reaction Added" })
+      .getByTestId("workflow-node-icon")
+      .locator("svg"),
+  ).toHaveCount(1);
 
   await pickEmoji(page, dialog, "rocket", EMOJI);
 
+  const triggerNode = dialog.getByRole("button", {
+    name: "Trigger: 🚀 reaction added",
+  });
+  await expect(triggerNode.getByTestId("workflow-node-icon")).toHaveText(EMOJI);
+  await expect(triggerNode).toContainText("Reaction added");
+  await expect(triggerNode).not.toContainText(`${EMOJI} reaction added`);
+  await expect(
+    triggerNode.getByTestId("workflow-node-icon").locator("svg"),
+  ).toHaveCount(0);
+  await waitForAnimations(page);
+  await triggerNode.screenshot({
+    path: "test-results/workflow-reaction-trigger-node.png",
+  });
+
   // Selecting closes the popover and shows the chosen reaction by name.
   await expect(page.locator("em-emoji-picker")).toHaveCount(0);
   await expect(pickerButton).toContainText(EMOJI_SHORTCODE);
   await expect(pickerButton).not.toContainText("Choose a reaction");
 });
 
+test("add-reaction step replaces its sequence number with the configured emoji", async ({
+  page,
+}) => {
+  const dialog = await openReactionTrigger(page);
+  await dialog.getByRole("tab", { name: "YAML" }).click();
+  const yamlEditor = dialog.getByRole("textbox", { name: "Workflow YAML" });
+  await yamlEditor.fill(
+    (await yamlEditor.inputValue()).replace(
+      "steps: []",
+      "steps:\n  - id: step_1\n    action: add_reaction\n    emoji: ✅",
+    ),
+  );
+
+  await dialog.getByRole("tab", { name: "Form" }).click();
+  const stepNode = dialog.getByRole("button", { name: "Step 1: ✅" });
+  await expect(stepNode.getByTestId("workflow-node-icon")).toHaveText("✅");
+  await expect(stepNode).toContainText("Add Reaction");
+  await expect(stepNode).not.toContainText("✅✅");
+  await expect(stepNode.getByTestId("workflow-node-icon")).not.toHaveText("1");
+  await waitForAnimations(page);
+  await stepNode.screenshot({
+    path: "test-results/workflow-add-reaction-step-node.png",
+  });
+});
+
 test("picked reaction persists into canonical YAML and clears back out", async ({
   page,
 }) => {
@@ -92,15 +137,17 @@ test("picked reaction persists into canonical YAML and clears back out", async (
   const yamlEditor = dialog.getByRole("textbox", { name: "Workflow YAML" });
   const yaml = await yamlEditor.inputValue();
   expect(yaml).toContain("on: reaction_added");
-  // Stored verbatim as the reaction content the executor compares against.
-  expect(yaml).toContain(`emoji: ${EMOJI}`);
+  // Stored verbatim in the local filter expression the executor compares.
+  expect(yaml).toContain(`trigger_emoji == "${EMOJI}"`);
 
   // Clearing the optional filter removes the key entirely rather than
   // writing an empty string, so the trigger matches any reaction again.
   await dialog.getByRole("tab", { name: "Form" }).click();
   // Switching editor modes drops the inspector selection, so re-open the
   // trigger node before reaching for its fields.
-  await dialog.getByRole("button", { name: "Trigger: Reaction Added" }).click();
+  await dialog
+    .getByRole("button", { name: `Trigger: ${EMOJI} reaction added` })
+    .click();
   await dialog.getByRole("button", { name: "Clear trigger emoji" }).click();
   await expect(
     dialog.getByRole("button", { name: "Choose trigger emoji" }),
@@ -109,7 +156,7 @@ test("picked reaction persists into canonical YAML and clears back out", async (
   await dialog.getByRole("tab", { name: "YAML" }).click();
   const clearedYaml = await yamlEditor.inputValue();
   expect(clearedYaml).toContain("on: reaction_added");
-  expect(clearedYaml).not.toContain("emoji:");
+  expect(clearedYaml).not.toContain("trigger_emoji");
 });
 
 test("legacy free-text emoji values survive a trip through the picker", async ({
@@ -164,7 +211,7 @@ test("saved reaction filter round-trips back into the picker", async ({
   const editDialog = page.getByRole("dialog", { name: "Edit workflow" });
   await expect(editDialog).toBeVisible();
   await editDialog
-    .getByRole("button", { name: "Trigger: Reaction Added" })
+    .getByRole("button", { name: `Trigger: ${EMOJI} reaction added` })
     .click();
 
   // Reopening rehydrates the stored glyph into the picker, not an empty field.
diff --git a/desktop/tests/e2e/workflow-title-stability.spec.ts b/desktop/tests/e2e/workflow-title-stability.spec.ts
index b9c52de7c0..3fc5fbbf54 100644
--- a/desktop/tests/e2e/workflow-title-stability.spec.ts
+++ b/desktop/tests/e2e/workflow-title-stability.spec.ts
@@ -62,6 +62,20 @@ async function addStepAfterTrigger(page: Page, dialog: Locator) {
   await page.getByRole("menuitem", { name: "Send Message" }).click();
 }
 
+async function finishRiskyActivationIfShown(page: Page, dialog: Locator) {
+  const confirmation = page.getByRole("alertdialog", {
+    name: "This workflow may run often",
+  });
+  await Promise.race([
+    confirmation.waitFor({ state: "visible" }),
+    dialog.waitFor({ state: "hidden" }),
+  ]);
+  if (await confirmation.isVisible()) {
+    await confirmation.getByRole("button", { name: "Turn on" }).click();
+  }
+  await expect(dialog).toBeHidden();
+}
+
 async function createNamedWorkflow(page: Page, name: string) {
   await page.getByRole("button", { name: "Create Workflow" }).click();
   const dialog = page.getByRole("dialog", { name: "Create workflow" });
@@ -73,8 +87,17 @@ async function createNamedWorkflow(page: Page, name: string) {
   await dialog.getByRole("button", { name: "Save workflow name" }).click();
 
   await dialog.getByRole("button", { name: "Add first step" }).click();
-  await dialog.getByLabel("Message text").fill("Workflow notification");
+  await dialog.getByRole("tab", { name: "YAML" }).click();
+  const yamlEditor = dialog.getByRole("textbox", { name: "Workflow YAML" });
+  const yaml = await yamlEditor.inputValue();
+  await yamlEditor.fill(
+    yaml.replace(
+      "    action: send_message",
+      '    action: send_message\n    text: "Workflow notification"',
+    ),
+  );
   await dialog.getByRole("button", { name: "Create workflow" }).click();
+  await finishRiskyActivationIfShown(page, dialog);
 
   await expect(page.getByTestId("workflows-view")).toContainText(name);
 }
@@ -154,10 +177,14 @@ test("renames stay visible across pane navigation before the step is filled in",
   // Completing the step re-serializes the definition from the builder's form
   // state, which must have picked the rename up rather than writing back the
   // generated name it was holding when the rename happened.
-  await dialog.getByLabel("Message text").fill("Workflow notification");
+  await dialog
+    .getByTestId("workflow-node-inspector")
+    .getByLabel("Message text")
+    .fill("Workflow notification");
   expect(await readWorkflowName(dialog)).toBe(name);
 
   await dialog.getByRole("button", { name: "Create workflow" }).click();
+  await finishRiskyActivationIfShown(page, dialog);
   await expect(page.getByTestId("workflows-view")).toContainText(name);
 });
 
@@ -174,6 +201,7 @@ test("keeps a header disable across a later form edit", async ({ page }) => {
 
   const dialog = page.getByRole("dialog", { name: "Edit workflow" });
   await expect(dialog).toBeVisible();
+  await dialog.getByRole("tab", { name: "Form" }).click();
 
   const enableItem = page.getByRole("menuitemcheckbox", { name: "Enable" });
   // The open menu aria-hides the dialog behind it, so it has to be dismissed
@@ -223,6 +251,7 @@ test("keeps the saved name while editing an existing workflow", async ({
 
   const dialog = page.getByRole("dialog", { name: "Edit workflow" });
   await expect(dialog).toBeVisible();
+  await dialog.getByRole("tab", { name: "Form" }).click();
   expect(await readWorkflowName(dialog)).toBe(name);
 
   await openTriggerPane(dialog);
@@ -259,6 +288,7 @@ test("keeps the copy name while duplicating an existing workflow", async ({
 
   const dialog = page.getByRole("dialog", { name: "Duplicate workflow" });
   await expect(dialog).toBeVisible();
+  await dialog.getByRole("tab", { name: "Form" }).click();
   expect(await readWorkflowName(dialog)).toBe(`${name} (copy)`);
 
   await openStepPane(dialog, 1);
diff --git a/desktop/tests/e2e/workflows.spec.ts b/desktop/tests/e2e/workflows.spec.ts
index 2e26f57382..16844a2f3e 100644
--- a/desktop/tests/e2e/workflows.spec.ts
+++ b/desktop/tests/e2e/workflows.spec.ts
@@ -1,4 +1,5 @@
 import { expect, test } from "@playwright/test";
+import { parse as parseYaml } from "yaml";
 
 import { installMockBridge } from "../helpers/bridge";
 import { waitForAnimations } from "../helpers/animations";
@@ -74,9 +75,6 @@ async function createWorkflow(
     );
     await dialog.getByRole("tab", { name: "Form" }).click();
   }
-  if (options?.enabled === false) {
-    await dialog.getByRole("switch", { name: "Enable" }).click();
-  }
   if (options?.trigger) {
     await dialog
       .getByRole("button", { name: "Trigger: Message Posted" })
@@ -116,6 +114,16 @@ async function createWorkflow(
   }
 
   await dialog.getByRole("button", { name: "Create" }).click();
+  if (!options?.trigger || options.trigger === "message_posted") {
+    const activationConfirmation = page.getByRole("alertdialog", {
+      name: "This workflow may run often",
+    });
+    await activationConfirmation
+      .getByRole("button", {
+        name: options?.enabled === false ? "Keep off" : "Turn on",
+      })
+      .click();
+  }
 
   await expect(
     page.getByRole("heading", { name: "Create Workflow" }),
@@ -131,6 +139,27 @@ test("navigates to workflows view and shows the empty create tile", async ({
   await expect(page.locator('[data-testid^="workflow-card-"]')).toHaveCount(0);
 });
 
+test("creates a narrowly triggered workflow without an activation warning", async ({
+  page,
+}) => {
+  await navigateToWorkflows(page);
+  await createWorkflow(page, `safe_webhook_${Date.now()}`, {
+    trigger: "webhook",
+  });
+
+  await expect(
+    page.getByTestId("workflow-activation-confirmation"),
+  ).toHaveCount(0);
+  const yaml = await page.evaluate(() => {
+    const call = [...(window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? [])]
+      .reverse()
+      .find((candidate) => candidate.command === "create_workflow");
+    return (call?.payload as { yamlDefinition?: string } | undefined)
+      ?.yamlDefinition;
+  });
+  expect(parseYaml(yaml ?? "").enabled).not.toBe(false);
+});
+
 test("creation reveals the trigger pane only after a one-shot channel pick", async ({
   page,
 }) => {
@@ -211,6 +240,10 @@ test("accepts the generated name through the first form mutation", async ({
 
   await dialog.getByRole("button", { name: "Add first step" }).click();
   await dialog.getByRole("button", { name: "Create workflow" }).click();
+  const activationConfirmation = page.getByRole("alertdialog", {
+    name: "This workflow may run often",
+  });
+  await activationConfirmation.getByRole("button", { name: "Turn on" }).click();
 
   await expect(page.getByTestId("workflows-view")).toContainText(generatedName);
 });
@@ -249,9 +282,9 @@ test("shows executable guidance for diff trigger conditions", async ({
     .getByRole("menuitem", { name: "Diff Posted", exact: true })
     .click();
 
-  await expect(dialog.getByLabel("Condition (optional)")).toHaveAttribute(
+  await expect(dialog.getByLabel("Diff text")).toHaveAttribute(
     "placeholder",
-    'e.g. str_contains(trigger_text, "deploy")',
+    "e.g. deploy",
   );
 });
 
@@ -300,11 +333,9 @@ test("captures workflow library across responsive viewports", async ({
 
 test("captures disabled diff workflows in the list UI", async ({ page }) => {
   const workflowName = `diff_workflow_${Date.now()}`;
-  const description = "Watches diff events for src/ changes";
 
   await navigateToWorkflows(page);
   await createWorkflow(page, workflowName, {
-    description,
     enabled: false,
     trigger: "diff_posted",
     stepName: "Notify reviewers",
@@ -316,13 +347,18 @@ test("captures disabled diff workflows in the list UI", async ({ page }) => {
     .locator('[data-testid^="workflow-card-"]')
     .filter({ hasText: workflowName })
     .first();
-  await expect(card.getByText("Diff Posted", { exact: true })).toBeVisible();
-  await expect(card.locator("h3")).toHaveText(workflowName);
-  await expect(card.getByText(description, { exact: true })).toBeVisible();
-  await expect(card).toContainText("disabled");
+  await expect(card.locator("h3")).toHaveText(
+    "When a diff is posted, send “Workflow notification”",
+  );
+  await expect(card).toContainText(workflowName);
+  await expect(
+    card.getByRole("switch", { name: "Disable workflow" }),
+  ).toBeChecked();
 });
 
-test("enables and disables a workflow from its card menu", async ({ page }) => {
+test("enables and disables a workflow from its card status toggle", async ({
+  page,
+}) => {
   const workflowName = `toggle_workflow_${Date.now()}`;
 
   await navigateToWorkflows(page);
@@ -333,26 +369,32 @@ test("enables and disables a workflow from its card menu", async ({ page }) => {
       .locator('[data-testid^="workflow-card-"]')
       .filter({ hasText: workflowName })
       .first();
-  const workflowActions = () =>
-    workflowCard().getByRole("button", { name: "Workflow actions" });
 
-  const enableItem = page.getByRole("menuitemcheckbox", { name: "Enable" });
+  const disable = workflowCard().getByRole("switch", {
+    name: "Disable workflow",
+  });
+  await expect(disable).toBeChecked();
+  await disable.click();
+  const enable = workflowCard().getByRole("switch", {
+    name: "Enable workflow",
+  });
+  await expect(enable).not.toBeChecked();
+  await enable.click();
+  const activationConfirmation = page.getByRole("alertdialog", {
+    name: "This workflow may run often",
+  });
+  await expect(activationConfirmation).toBeVisible();
+  await activationConfirmation.getByRole("button", { name: "Turn on" }).click();
+  await expect(
+    workflowCard().getByRole("switch", { name: "Disable workflow" }),
+  ).toBeChecked();
 
-  await workflowActions().click();
-  await expect(enableItem).toHaveAttribute("aria-checked", "true");
-  await expect(enableItem.locator("button")).toHaveCount(0);
+  await workflowCard()
+    .getByRole("button", { name: "Workflow actions" })
+    .click();
   await expect(
-    enableItem.getByTestId("workflow-enabled-switch-visual"),
-  ).toHaveAttribute("aria-hidden", "true");
-  await enableItem.click();
-  await expect(
-    workflowCard().getByText("disabled", { exact: true }),
-  ).toBeVisible();
-
-  await enableItem.click();
-  await expect(
-    workflowCard().getByText("active", { exact: true }),
-  ).toBeVisible();
+    page.getByRole("menuitemcheckbox", { name: "Enable" }),
+  ).toHaveCount(0);
 });
 
 test("rejects a stale card toggle without overwriting a newer edit", async ({
@@ -395,8 +437,7 @@ test("rejects a stale card toggle without overwriting a newer edit", async ({
     });
   }, workflowName);
 
-  await workflowCard.getByRole("button", { name: "Workflow actions" }).click();
-  await page.getByRole("menuitemcheckbox", { name: "Enable" }).click();
+  await workflowCard.getByRole("switch", { name: "Disable workflow" }).click();
 
   await expect(
     page
@@ -436,14 +477,15 @@ test("reports a rejected workflow status change", async ({ page }) => {
     .locator('[data-testid^="workflow-card-"]')
     .filter({ hasText: workflowName })
     .first();
-  await workflowCard.getByRole("button", { name: "Workflow actions" }).click();
-  await page.getByRole("menuitemcheckbox", { name: "Enable" }).click();
+  await workflowCard.getByRole("switch", { name: "Disable workflow" }).click();
 
   const errorToast = page
     .locator("[data-sonner-toast][data-removed='false']")
     .filter({ hasText: "Couldn’t change workflow status" });
   await expect(errorToast).toContainText("relay refused the update");
-  await expect(workflowCard.getByText("active", { exact: true })).toBeVisible();
+  await expect(
+    workflowCard.getByRole("switch", { name: "Disable workflow" }),
+  ).toBeChecked();
 });
 
 test("shows the webhook secret dialog after saving a webhook workflow", async ({
@@ -528,8 +570,37 @@ test("duplicates a workflow", async ({ page }) => {
   const dialog = page.getByRole("dialog", { name: "Duplicate workflow" });
   await selectWorkflowChannel(page, dialog);
   await dialog.getByRole("button", { name: "Create copy" }).click();
+  const activationConfirmation = page.getByRole("alertdialog", {
+    name: "This workflow may run often",
+  });
+  await expect(activationConfirmation).toBeVisible();
+  await activationConfirmation.getByRole("button", { name: "Back" }).click();
+  await expect(dialog).toBeVisible();
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? []).filter(
+            (call) => call.command === "create_workflow",
+          ).length,
+      ),
+    )
+    .toBe(1);
+  await dialog.getByRole("button", { name: "Create copy" }).click();
+  await activationConfirmation
+    .getByRole("button", { name: "Keep off" })
+    .click();
   await expect(page.getByRole("dialog")).not.toBeVisible();
 
+  const copiedYaml = await page.evaluate(() => {
+    const calls = (window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? []).filter(
+      (call) => call.command === "create_workflow",
+    );
+    return (calls.at(-1)?.payload as { yamlDefinition?: string } | undefined)
+      ?.yamlDefinition;
+  });
+  expect(parseYaml(copiedYaml ?? "").enabled).toBe(false);
+
   // Both the original and copy should exist
   await expect(page.getByTestId("workflows-view")).toContainText(originalName);
 });
@@ -742,7 +813,7 @@ test("pane routes use stable IDs and Form/YAML changes stay synchronized", async
   await dialog.getByLabel("Duration").fill("5m");
   await expect(page).toHaveURL(/pane=step%3Astep_2/);
 
-  await dialog.getByRole("button", { name: "Step 1: Send Message" }).click();
+  await dialog.getByRole("button", { name: /^Step 1:/ }).click();
   await expect(page).toHaveURL(/pane=step%3Astep_1/);
   await dialog
     .getByTestId("workflow-node-inspector")
@@ -757,7 +828,7 @@ test("pane routes use stable IDs and Form/YAML changes stay synchronized", async
   const yaml = await yamlEditor.inputValue();
   await yamlEditor.fill(yaml.replace("duration: 5m", "duration: 10m"));
   await dialog.getByRole("tab", { name: "Form" }).click();
-  await dialog.getByRole("button", { name: "Step 1: Delay" }).click();
+  await dialog.getByRole("button", { name: /^Step 1:/ }).click();
   await expect(dialog.getByLabel("Duration")).toHaveValue("10m");
 });
 

From eb484387d5816b6f9155ad3a0be79ede3c3d7ad5 Mon Sep 17 00:00:00 2001
From: Max Lampert <maxwell@squareup.com>
Date: Fri, 21 Aug 2026 17:20:19 -0700
Subject: [PATCH 27/38] chore(desktop): drop unused ORIGINAL_CONTENT from
 empty-edit-delete spec (#6517)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`biome check` fails with `lint/correctness/noUnusedVariables` on
`ORIGINAL_CONTENT` in `desktop/tests/e2e/empty-edit-delete.spec.ts`,
which fails `pnpm check` (Desktop Core) for **every PR touching desktop
paths** — e.g. it currently blocks #6460. It presumably landed while
Desktop Core was path-skipped on the introducing PR.

One-line removal; the constant has no remaining references (the
assertions use `RENDERED_ORIGINAL_CONTENT`).

Signed-off-by: Max Lampert <maxwell@squareup.com>
---
 desktop/tests/e2e/empty-edit-delete.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/desktop/tests/e2e/empty-edit-delete.spec.ts b/desktop/tests/e2e/empty-edit-delete.spec.ts
index 2d8149966f..3c4fec6804 100644
--- a/desktop/tests/e2e/empty-edit-delete.spec.ts
+++ b/desktop/tests/e2e/empty-edit-delete.spec.ts
@@ -6,7 +6,6 @@ import { installMockBridge } from "../helpers/bridge";
 // DEFAULT_MOCK_IDENTITY.pubkey in e2eBridge.ts). Editing/deleting one's own
 // message is exactly Sam's workflow: "delete a message by clearing its edit."
 const OWN_MESSAGE_ID = "mock-general-welcome";
-const ORIGINAL_CONTENT = "Welcome to #general";
 const RENDERED_ORIGINAL_CONTENT = "Welcome to general";
 
 // Open the more-actions menu for a message row and wait for the menu to mount.

From 97b1fee5c3d9ad574196e974b520061fccc47d07 Mon Sep 17 00:00:00 2001
From: morgmart <98432065+morgmart@users.noreply.github.com>
Date: Fri, 21 Aug 2026 17:21:36 -0700
Subject: [PATCH 28/38] fix(desktop): restore true zoom by scaling the root rem
 (#6514)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

Follow-up to #5644. Cmd +/- had become a text-only zoom: type scaled
while rem-based padding, gaps, widths, avatars, and controls stayed
frozen, which produced cramped layouts (see [#buzz-frontend
thread](buzz://message?channel=a410ffde-c61f-416a-96e0-c296b5f5ecc9&id=1a758115cf07b00c097f6e988553908c045165325a57637519cfa7ed9c9accec)).

Root cause: #5644 introduced a virtual typography rem so the **Font
size** preference could change text without moving layout — a good
decoupling — but it also routed **Cmd +/- zoom** through that same
px-valued token and pinned the real root at 16px. One decision ("freeze
layout") was applied to two dials that shouldn't share it.

This PR gives each dial one owner and lets CSS compose them:

| Control | Changes | How |
|---|---|---|
| **Cmd +/- zoom** | Everything — true zoom | Scales the real `<html>`
font-size again (`useWebviewZoomShortcuts`) |
| **Font size preference** | Text only | Sets `data-font-size`;
`typography.css` maps it to a unitless `--buzz-type-scale`, mirroring
how density already works |

`--buzz-type-rem` becomes `calc(1rem * var(--buzz-type-scale))` —
rem-relative, so it rides on zoom automatically. Resulting text px = `16
× zoom × scale × token-ratio`. The 13 / 14 / 15px conversation contract
is unchanged at default zoom. Density and the type ramp from #5644 are
untouched.

The preference module no longer does px math or knows about zoom; the
zoom hook no longer imports the preference module. Net deletion in
production code.

## Validation

- `pnpm test` — 5,308 desktop unit tests
- `pnpm check:px-text`, `tsc --noEmit`, biome
- Playwright: `top-chrome-zoom-clearance.spec.ts` (native-chrome
clearance stays fixed under root zoom),
`inbox-refactor-screenshots.spec.ts` (zoomed row padding now asserts
`4.4px` instead of the frozen `4px`), and both `profile.spec.ts` zoom
tests (composed zoom × preference, cross-window storage reset)
- Before/after screenshots at 140% zoom in the comment below

---------

Signed-off-by: morgmart <98432065+morgmart@users.noreply.github.com>
Co-authored-by: Claude <noreply@anthropic.com>
---
 desktop/src/app/useWebviewZoomShortcuts.ts    |  21 ++-
 .../shared/lib/fontSizePreference.test.mjs    |  43 ++++--
 desktop/src/shared/lib/fontSizePreference.ts  |  32 +---
 .../src/shared/styles/globals/typography.css  |  26 +++-
 desktop/tailwind.config.js                    |   7 +-
 .../tests/e2e/buzz-theme-screenshots.spec.ts  | 144 ++++++++++--------
 .../e2e/inbox-refactor-screenshots.spec.ts    |  24 +--
 desktop/tests/e2e/profile.spec.ts             |  83 +++++-----
 .../e2e/top-chrome-zoom-clearance.spec.ts     |  22 +--
 9 files changed, 218 insertions(+), 184 deletions(-)

diff --git a/desktop/src/app/useWebviewZoomShortcuts.ts b/desktop/src/app/useWebviewZoomShortcuts.ts
index e8b9320794..3d797b3bb7 100644
--- a/desktop/src/app/useWebviewZoomShortcuts.ts
+++ b/desktop/src/app/useWebviewZoomShortcuts.ts
@@ -1,9 +1,14 @@
 import * as React from "react";
 import { getCurrentWebview } from "@tauri-apps/api/webview";
 
-import { applyTextZoomFactor } from "@/shared/lib/fontSizePreference";
 import { hasPrimaryShortcutModifier } from "@/shared/lib/platform";
 
+/**
+ * Cmd +/- scales the real root font-size, so every rem in the app — text,
+ * spacing, widths, radii — zooms together. The Font size preference is a
+ * separate, text-only dial layered on top (see `styles/globals/typography.css`).
+ */
+const BASE_FONT_SIZE_PX = 16;
 const DEFAULT_ZOOM_FACTOR = 1;
 const MIN_ZOOM_FACTOR = 0.75;
 const MAX_ZOOM_FACTOR = 1.5;
@@ -75,8 +80,15 @@ function readStoredZoomFactor() {
   return Math.min(Math.max(parsed, MIN_ZOOM_FACTOR), MAX_ZOOM_FACTOR);
 }
 
+function applyRootZoom(zoomFactor: number) {
+  document.documentElement.style.fontSize =
+    zoomFactor === DEFAULT_ZOOM_FACTOR
+      ? ""
+      : `${BASE_FONT_SIZE_PX * zoomFactor}px`;
+}
+
 function applyTextScale(zoomFactor: number) {
-  applyTextZoomFactor(zoomFactor);
+  applyRootZoom(zoomFactor);
   if (zoomFactor === DEFAULT_ZOOM_FACTOR) {
     window.localStorage.removeItem(TEXT_SCALE_STORAGE_KEY);
     return;
@@ -95,7 +107,8 @@ export function useWebviewZoomShortcuts() {
     zoomFactorRef.current = storedZoomFactor;
     applyTextScale(storedZoomFactor);
 
-    // Keep the webview coordinate system stable; only text should scale.
+    // Pin the native webview zoom so the rem root is the only zoom dial and
+    // window/coordinate math stays stable.
     void webview.setZoom(DEFAULT_ZOOM_FACTOR).catch((error) => {
       console.error("Failed to reset webview zoom", error);
     });
@@ -126,7 +139,7 @@ export function useWebviewZoomShortcuts() {
 
       const storedZoomFactor = readStoredZoomFactor();
       zoomFactorRef.current = storedZoomFactor;
-      applyTextZoomFactor(storedZoomFactor);
+      applyRootZoom(storedZoomFactor);
     }
 
     window.addEventListener("keydown", handleKeyDown);
diff --git a/desktop/src/shared/lib/fontSizePreference.test.mjs b/desktop/src/shared/lib/fontSizePreference.test.mjs
index 217a3e5a00..363a7604d1 100644
--- a/desktop/src/shared/lib/fontSizePreference.test.mjs
+++ b/desktop/src/shared/lib/fontSizePreference.test.mjs
@@ -1,15 +1,18 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
+import { readFileSync } from "node:fs";
+
 import config from "../../../tailwind.config.js";
 
+const typographyCss = readFileSync(
+  new URL("../styles/globals/typography.css", import.meta.url),
+  "utf8",
+);
+
 const values = new Map();
 const attributes = new Map();
-const styleValues = new Map();
 const windowListeners = new Map();
-const style = {
-  setProperty: (name, value) => styleValues.set(name, value),
-};
 
 globalThis.window = {
   addEventListener: (type, listener) => windowListeners.set(type, listener),
@@ -21,7 +24,6 @@ globalThis.localStorage = {
 globalThis.document = {
   documentElement: {
     setAttribute: (name, value) => attributes.set(name, value),
-    style,
   },
 };
 
@@ -39,6 +41,28 @@ test("scales fixed line-height utilities with the typography rem", () => {
   });
 });
 
+test("derives the typography rem from the real root so zoom scales layout too", () => {
+  // Cmd +/- scales the root font-size; the type rem must stay rem-relative
+  // (never an absolute px) or text would zoom while containers froze.
+  assert.match(
+    typographyCss,
+    /--buzz-type-rem:\s*calc\(1rem \* var\(--buzz-type-scale\)\);/,
+  );
+  assert.doesNotMatch(typographyCss, /--buzz-type-rem:\s*[\d.]+px/);
+});
+
+test("maps the font size attribute to the 13 / 14 / 15px type contract", () => {
+  assert.match(typographyCss, /:root\s*\{[^}]*--buzz-type-scale:\s*1;/s);
+  assert.match(
+    typographyCss,
+    /:root\[data-font-size="smaller"\]\s*\{\s*--buzz-type-scale:\s*calc\(13 \/ 14\);/,
+  );
+  assert.match(
+    typographyCss,
+    /:root\[data-font-size="larger"\]\s*\{\s*--buzz-type-scale:\s*calc\(15 \/ 14\);/,
+  );
+});
+
 test("defaults invalid and missing font sizes to default", () => {
   assert.equal(preference.parseFontSize(null), "default");
   assert.equal(preference.parseFontSize("medium"), "default");
@@ -48,35 +72,28 @@ test("defaults invalid and missing font sizes to default", () => {
 });
 
 test("persists and applies the selected font size across the app", () => {
-  preference.applyTextZoomFactor(1);
   preference.setFontSize("smaller");
   assert.equal(preference.getFontSize(), "smaller");
   assert.equal(values.get(preference.FONT_SIZE_STORAGE_KEY), "smaller");
   assert.equal(attributes.get("data-font-size"), "smaller");
-  assert.equal(styleValues.get("--buzz-type-rem"), "14.857143px");
 });
 
 test("previews a font size without changing the saved preference", () => {
-  preference.applyTextZoomFactor(1.1);
   preference.setFontSize("smaller");
   preference.previewFontSize("larger");
   assert.equal(preference.getFontSize(), "smaller");
   assert.equal(values.get(preference.FONT_SIZE_STORAGE_KEY), "smaller");
   assert.equal(attributes.get("data-font-size"), "larger");
-  assert.equal(styleValues.get("--buzz-type-rem"), "18.857143px");
 
   preference.previewFontSize(null);
   assert.equal(attributes.get("data-font-size"), "smaller");
-  assert.equal(styleValues.get("--buzz-type-rem"), "16.342857px");
 });
 
 test("initializes from the stored font size", () => {
-  preference.applyTextZoomFactor(1);
   values.set(preference.FONT_SIZE_STORAGE_KEY, "larger");
   preference.initializeFontSizePreference();
   assert.equal(preference.getFontSize(), "larger");
   assert.equal(attributes.get("data-font-size"), "larger");
-  assert.equal(styleValues.get("--buzz-type-rem"), "17.142857px");
 });
 
 test("applies font size changes from another window", () => {
@@ -84,7 +101,6 @@ test("applies font size changes from another window", () => {
   windowListeners.get("storage")({ key: preference.FONT_SIZE_STORAGE_KEY });
   assert.equal(preference.getFontSize(), "smaller");
   assert.equal(attributes.get("data-font-size"), "smaller");
-  assert.equal(styleValues.get("--buzz-type-rem"), "14.857143px");
 });
 
 test("returns to the default when another window clears storage", () => {
@@ -93,5 +109,4 @@ test("returns to the default when another window clears storage", () => {
   windowListeners.get("storage")({ key: null });
   assert.equal(preference.getFontSize(), "default");
   assert.equal(attributes.get("data-font-size"), "default");
-  assert.equal(styleValues.get("--buzz-type-rem"), "16px");
 });
diff --git a/desktop/src/shared/lib/fontSizePreference.ts b/desktop/src/shared/lib/fontSizePreference.ts
index 9604a2c2cb..0db303f00b 100644
--- a/desktop/src/shared/lib/fontSizePreference.ts
+++ b/desktop/src/shared/lib/fontSizePreference.ts
@@ -7,20 +7,15 @@ export const FONT_SIZE_STORAGE_KEY = "buzz.appearance.fontSize";
 export const DEFAULT_FONT_SIZE: FontSize = "default";
 
 /**
- * Virtual rem sizes used by typography tokens. Keeping the real root at 16px
- * prevents a text preference from also resizing rem-based layout geometry.
+ * Root attribute that selects the type scale. The 13 / 14 / 15px contract and
+ * the virtual typography rem it drives live in `styles/globals/typography.css`;
+ * this module only records the user's choice. Cmd +/- zoom is a separate dial
+ * (`useWebviewZoomShortcuts`) that scales the real root font-size.
  */
-const TYPE_REM_SIZE_PX: Record<FontSize, number> = {
-  smaller: 13 / 0.875,
-  default: 14 / 0.875,
-  larger: 15 / 0.875,
-};
-
-const TYPE_REM_PROPERTY = "--buzz-type-rem";
+const FONT_SIZE_ATTRIBUTE = "data-font-size";
 
 const listeners = new Set<() => void>();
 let fontSize: FontSize = DEFAULT_FONT_SIZE;
-let textZoomFactor = 1;
 let listeningForStorageChanges = false;
 
 export function parseFontSize(value: string | null | undefined): FontSize {
@@ -39,16 +34,8 @@ function readStoredFontSize(): FontSize {
   }
 }
 
-function typeRemSizePx(size: FontSize): number {
-  return (
-    Math.round(TYPE_REM_SIZE_PX[size] * textZoomFactor * 1_000_000) / 1_000_000
-  );
-}
-
 function applyFontSize(size: FontSize): void {
-  const root = globalThis.document?.documentElement;
-  root?.setAttribute("data-font-size", size);
-  root?.style.setProperty(TYPE_REM_PROPERTY, `${typeRemSizePx(size)}px`);
+  globalThis.document?.documentElement?.setAttribute(FONT_SIZE_ATTRIBUTE, size);
 }
 
 function notifyListeners(): void {
@@ -80,13 +67,6 @@ export function initializeFontSizePreference(): void {
   listenForStorageChanges();
 }
 
-/** Combine Cmd +/- zoom with the selected app-wide type scale. */
-export function applyTextZoomFactor(zoomFactor: number): void {
-  if (!Number.isFinite(zoomFactor) || zoomFactor <= 0) return;
-  textZoomFactor = zoomFactor;
-  applyFontSize(fontSize);
-}
-
 function subscribe(listener: () => void): () => void {
   listeners.add(listener);
   return () => listeners.delete(listener);
diff --git a/desktop/src/shared/styles/globals/typography.css b/desktop/src/shared/styles/globals/typography.css
index fa59d37241..e25a84afc9 100644
--- a/desktop/src/shared/styles/globals/typography.css
+++ b/desktop/src/shared/styles/globals/typography.css
@@ -1,11 +1,20 @@
 @layer base {
   :root {
     /*
-     * A virtual typography rem. Font preferences and Cmd +/- change this
-     * token while the browser root remains 16px, so text scales without also
-     * resizing rem-based widths, gaps, radii, and controls.
+     * Two independent dials compose here:
+     *
+     * - Cmd +/- zoom scales the real root font-size (see
+     *   useWebviewZoomShortcuts), so every rem in the app — text, gaps,
+     *   widths, radii — grows and shrinks together. True zoom.
+     * - The Font size preference sets `data-font-size` on the root; it nudges
+     *   only the type scale below, so text changes without moving layout.
+     *
+     * Every text token derives from this virtual typography rem, which is
+     * rem-relative so it rides on top of zoom automatically. At the default
+     * preference and zoom it equals 16px, making `text-sm` 14px.
      */
-    --buzz-type-rem: 1rem;
+    --buzz-type-scale: 1;
+    --buzz-type-rem: calc(1rem * var(--buzz-type-scale));
     --text-xs: calc(var(--buzz-type-rem) * 0.75);
     --text-sm: calc(var(--buzz-type-rem) * 0.875);
     --text-base: var(--buzz-type-rem);
@@ -33,6 +42,15 @@
     --conversation-timestamp-line-height: var(--buzz-type-rem);
   }
 
+  /* Conversation text contract: 13 / 14 / 15px before keyboard zoom. */
+  :root[data-font-size="smaller"] {
+    --buzz-type-scale: calc(13 / 14);
+  }
+
+  :root[data-font-size="larger"] {
+    --buzz-type-scale: calc(15 / 14);
+  }
+
   :root[data-conversation-density="compact"] {
     --conversation-body-gap: 0rem;
     --conversation-row-padding-block: 0.25rem;
diff --git a/desktop/tailwind.config.js b/desktop/tailwind.config.js
index 07d00b0db9..4816b3ddc3 100644
--- a/desktop/tailwind.config.js
+++ b/desktop/tailwind.config.js
@@ -3,9 +3,10 @@ export default {
   theme: {
     extend: {
       // Sub-`text-xs` ramp for meta text (timestamps, count badges, tracking
-      // labels) and tiny glyphs. These follow the virtual typography rem so
-      // preferences and Cmd +/- scale text without changing layout geometry.
-      // Do NOT reintroduce arbitrary `text-[…rem]` / `text-[…px]` literals;
+      // labels) and tiny glyphs. These follow the virtual typography rem
+      // (`--buzz-type-rem` in styles/globals/typography.css), which is
+      // rem-relative: Cmd +/- zooms it with the rest of the layout, and the
+      // Font size preference nudges it alone. Do NOT reintroduce arbitrary `text-[…rem]` / `text-[…px]` literals;
       // the px-text guard rejects them. Stock scale picks up from xs.
       fontSize: {
         "2xs": "calc(var(--buzz-type-rem) * 0.6875)", // 11px at 16px type rem
diff --git a/desktop/tests/e2e/buzz-theme-screenshots.spec.ts b/desktop/tests/e2e/buzz-theme-screenshots.spec.ts
index 408fa851d9..a075c7bd36 100644
--- a/desktop/tests/e2e/buzz-theme-screenshots.spec.ts
+++ b/desktop/tests/e2e/buzz-theme-screenshots.spec.ts
@@ -676,33 +676,43 @@ test("app font size and conversation density apply independently", async ({
   const fontSizeDescription = page
     .getByTestId("font-size-row")
     .locator("[data-settings-subcopy]");
+  // The conversation tokens are rem-relative `calc(...)` expressions (the
+  // type tokens ride on `--buzz-type-rem`, which itself derives from the
+  // root rem so Cmd +/- zooms everything together). Reading the raw custom
+  // property strings off <html> would just return unresolved calc text, so
+  // resolve each token to px through a probe element instead: assign the
+  // token to the probe's font-size and read the computed value back.
+  // font-size is used (rather than width) because its computed value keeps
+  // fractional precision instead of snapping to layout units.
   const readScale = () =>
     root.evaluate((element) => {
-      const style = window.getComputedStyle(element);
-      return {
-        authorLineHeight: Number.parseFloat(
-          style.getPropertyValue("--conversation-author-line-height"),
-        ),
-        bodyGap: Number.parseFloat(
-          style.getPropertyValue("--conversation-body-gap"),
-        ),
-        fontSize: style.getPropertyValue("--conversation-message-font-size"),
-        lineHeight: style.getPropertyValue(
-          "--conversation-message-line-height",
-        ),
-        paragraphGap: Number.parseFloat(
-          style.getPropertyValue("--conversation-paragraph-gap"),
-        ),
-        rowPadding: Number.parseFloat(
-          style.getPropertyValue("--conversation-row-padding-block"),
-        ),
-        timestampFontSize: style.getPropertyValue(
-          "--conversation-timestamp-font-size",
-        ),
-        timestampLineHeight: Number.parseFloat(
-          style.getPropertyValue("--conversation-timestamp-line-height"),
-        ),
+      const PROBE_ID = "buzz-e2e-conversation-scale-probe";
+      const tokens = {
+        authorLineHeight: "--conversation-author-line-height",
+        bodyGap: "--conversation-body-gap",
+        fontSize: "--conversation-message-font-size",
+        lineHeight: "--conversation-message-line-height",
+        paragraphGap: "--conversation-paragraph-gap",
+        rowPadding: "--conversation-row-padding-block",
+        timestampFontSize: "--conversation-timestamp-font-size",
+        timestampLineHeight: "--conversation-timestamp-line-height",
+      } as const;
+      let probe = element.ownerDocument.getElementById(PROBE_ID);
+      if (!probe) {
+        probe = element.ownerDocument.createElement("span");
+        probe.id = PROBE_ID;
+        probe.style.cssText =
+          "position:absolute;left:-9999px;top:0;visibility:hidden;pointer-events:none";
+        element.appendChild(probe);
+      }
+      const resolvePx = (token: string) => {
+        probe.style.fontSize = `var(${token})`;
+        const px = Number.parseFloat(window.getComputedStyle(probe).fontSize);
+        return Math.round(px * 100) / 100;
       };
+      return Object.fromEntries(
+        Object.entries(tokens).map(([key, token]) => [key, resolvePx(token)]),
+      ) as Record<keyof typeof tokens, number>;
     });
   const readSettingsScale = () =>
     page.getByTestId("conversation-density-row").evaluate((element) => {
@@ -753,14 +763,15 @@ test("app font size and conversation density apply independently", async ({
   await expect(fontSizeDescription).toHaveText(
     "Applies across conversations and interface text",
   );
+  // Comfy + Default: 14px conversation text on a 16px root rem.
   await expect.poll(readScale).toEqual({
     authorLineHeight: 16,
-    bodyGap: 0.125,
-    fontSize: "calc(16px * .875)",
-    lineHeight: "calc(16px * 1.25)",
-    paragraphGap: 0.5,
-    rowPadding: 0.25,
-    timestampFontSize: "calc(16px * .75)",
+    bodyGap: 2,
+    fontSize: 14,
+    lineHeight: 20,
+    paragraphGap: 8,
+    rowPadding: 4,
+    timestampFontSize: 12,
     timestampLineHeight: 16,
   });
   await expect
@@ -876,14 +887,15 @@ test("app font size and conversation density apply independently", async ({
       ),
     )
     .toBe("compact");
+  // Compact only tightens spacing; type is untouched.
   await expect.poll(readScale).toEqual({
     authorLineHeight: 16,
     bodyGap: 0,
-    fontSize: "calc(16px * .875)",
-    lineHeight: "calc(16px * 1.25)",
-    paragraphGap: 0.375,
-    rowPadding: 0.25,
-    timestampFontSize: "calc(16px * .75)",
+    fontSize: 14,
+    lineHeight: 20,
+    paragraphGap: 6,
+    rowPadding: 4,
+    timestampFontSize: 12,
     timestampLineHeight: 16,
   });
   await expect.poll(readSettingsScale).toEqual({
@@ -907,15 +919,16 @@ test("app font size and conversation density apply independently", async ({
       ),
     )
     .toBe("larger");
+  // Larger scales only the type tokens (15/14); compact spacing is unchanged.
   await expect.poll(readScale).toEqual({
-    authorLineHeight: 17.142857,
+    authorLineHeight: 17.14,
     bodyGap: 0,
-    fontSize: "calc(17.142857px * .875)",
-    lineHeight: "calc(17.142857px * 1.25)",
-    paragraphGap: 0.375,
-    rowPadding: 0.25,
-    timestampFontSize: "calc(17.142857px * .75)",
-    timestampLineHeight: 17.142857,
+    fontSize: 15,
+    lineHeight: 21.43,
+    paragraphGap: 6,
+    rowPadding: 4,
+    timestampFontSize: 12.86,
+    timestampLineHeight: 17.14,
   });
   await expect
     .poll(() =>
@@ -946,15 +959,16 @@ test("app font size and conversation density apply independently", async ({
   await expect(root).toHaveAttribute("data-conversation-density", "spacious");
   await expect(root).toHaveAttribute("data-font-size", "larger");
   await expect(spacious).toHaveAttribute("aria-pressed", "true");
+  // Spacious loosens spacing only; Larger type carries over.
   await expect.poll(readScale).toEqual({
-    authorLineHeight: 17.142857,
-    bodyGap: 0.25,
-    fontSize: "calc(17.142857px * .875)",
-    lineHeight: "calc(17.142857px * 1.25)",
-    paragraphGap: 0.625,
-    rowPadding: 0.5,
-    timestampFontSize: "calc(17.142857px * .75)",
-    timestampLineHeight: 17.142857,
+    authorLineHeight: 17.14,
+    bodyGap: 4,
+    fontSize: 15,
+    lineHeight: 21.43,
+    paragraphGap: 10,
+    rowPadding: 8,
+    timestampFontSize: 12.86,
+    timestampLineHeight: 17.14,
   });
   await expect.poll(readSettingsScale).toEqual({
     fontSize: "15px",
@@ -973,15 +987,16 @@ test("app font size and conversation density apply independently", async ({
   await expect(root).toHaveAttribute("data-conversation-density", "spacious");
   await expect(root).toHaveAttribute("data-font-size", "smaller");
   await expect(smaller).toHaveAttribute("aria-pressed", "true");
+  // Smaller scales only the type tokens (13/14); spacious spacing is unchanged.
   await expect.poll(readScale).toEqual({
-    authorLineHeight: 14.857143,
-    bodyGap: 0.25,
-    fontSize: "calc(14.857143px * .875)",
-    lineHeight: "calc(14.857143px * 1.25)",
-    paragraphGap: 0.625,
-    rowPadding: 0.5,
-    timestampFontSize: "calc(14.857143px * .75)",
-    timestampLineHeight: 14.857143,
+    authorLineHeight: 14.86,
+    bodyGap: 4,
+    fontSize: 13,
+    lineHeight: 18.57,
+    paragraphGap: 10,
+    rowPadding: 8,
+    timestampFontSize: 11.14,
+    timestampLineHeight: 14.86,
   });
   await expect
     .poll(() =>
@@ -1044,14 +1059,15 @@ test("app font size and conversation density apply independently", async ({
       ),
     )
     .toBe("comfortable");
+  // Back to Default type while the drag previews spacious spacing.
   await expect.poll(readScale).toEqual({
     authorLineHeight: 16,
-    bodyGap: 0.25,
-    fontSize: "calc(16px * .875)",
-    lineHeight: "calc(16px * 1.25)",
-    paragraphGap: 0.625,
-    rowPadding: 0.5,
-    timestampFontSize: "calc(16px * .75)",
+    bodyGap: 4,
+    fontSize: 14,
+    lineHeight: 20,
+    paragraphGap: 10,
+    rowPadding: 8,
+    timestampFontSize: 12,
     timestampLineHeight: 16,
   });
   await expect.poll(readSettingsScale).toEqual({
diff --git a/desktop/tests/e2e/inbox-refactor-screenshots.spec.ts b/desktop/tests/e2e/inbox-refactor-screenshots.spec.ts
index 8f1f074e27..cc1a8f1e67 100644
--- a/desktop/tests/e2e/inbox-refactor-screenshots.spec.ts
+++ b/desktop/tests/e2e/inbox-refactor-screenshots.spec.ts
@@ -449,9 +449,14 @@ test.describe("inbox refactor screenshots", () => {
           if (!header || !body) {
             throw new Error("Inbox message spacing geometry is missing");
           }
+          // Round to 0.1px: under Cmd +/- zoom the rem gap is fractional and
+          // layout snaps it to 1/64px.
           return (
-            body.getBoundingClientRect().top -
-            header.getBoundingClientRect().bottom
+            Math.round(
+              (body.getBoundingClientRect().top -
+                header.getBoundingClientRect().bottom) *
+                10,
+            ) / 10
           );
         }),
         selectedAuthor.evaluate((element) => {
@@ -558,21 +563,22 @@ test.describe("inbox refactor screenshots", () => {
       );
     });
 
+    // Cmd +/- is a true zoom: the root rem scales, so conversation text AND
+    // the rem-based row padding / body gap grow together (4px → 4.4px,
+    // 2px → 2.2px). Text-only zoom with frozen spacing is the regression
+    // this guards against.
     await expect
       .poll(async () => [
-        await page.evaluate(() =>
-          window
-            .getComputedStyle(document.documentElement)
-            .getPropertyValue("--buzz-type-rem")
-            .trim(),
+        await page.evaluate(
+          () => window.getComputedStyle(document.documentElement).fontSize,
         ),
         ...(await readConversationMetrics()),
       ])
       .toEqual([
         "17.6px",
         { fontSize: "15.4px", lineHeight: "22px" },
-        { paddingBottom: "4px", paddingTop: "4px" },
-        2,
+        { paddingBottom: "4.4px", paddingTop: "4.4px" },
+        2.2,
         { fontSize: "15.4px", lineHeight: "17.6px" },
         { fontSize: "15.4px", lineHeight: "22px" },
         { fontSize: "13.2px", lineHeight: "17.6px" },
diff --git a/desktop/tests/e2e/profile.spec.ts b/desktop/tests/e2e/profile.spec.ts
index 04411720ac..8601f34d24 100644
--- a/desktop/tests/e2e/profile.spec.ts
+++ b/desktop/tests/e2e/profile.spec.ts
@@ -2490,9 +2490,6 @@ test("supports webview zoom keyboard shortcuts", async ({ page }) => {
   const getTextScaleState = () =>
     page.evaluate(() => ({
       rootFontSize: getComputedStyle(document.documentElement).fontSize,
-      textRemSize: getComputedStyle(document.documentElement)
-        .getPropertyValue("--buzz-type-rem")
-        .trim(),
       storedScale: localStorage.getItem("buzz:text-scale"),
       webviewZoom: (window as Window & { __BUZZ_E2E_WEBVIEW_ZOOM__?: number })
         .__BUZZ_E2E_WEBVIEW_ZOOM__,
@@ -2523,8 +2520,7 @@ test("supports webview zoom keyboard shortcuts", async ({ page }) => {
   await dispatchPrimaryShortcut("+", "Equal", true);
 
   await expect.poll(getTextScaleState).toEqual({
-    rootFontSize: "16px",
-    textRemSize: "17.6px",
+    rootFontSize: "17.6px",
     storedScale: "1.1",
     webviewZoom: 1,
   });
@@ -2533,7 +2529,6 @@ test("supports webview zoom keyboard shortcuts", async ({ page }) => {
 
   await expect.poll(getTextScaleState).toEqual({
     rootFontSize: "16px",
-    textRemSize: "16px",
     storedScale: null,
     webviewZoom: 1,
   });
@@ -2542,8 +2537,7 @@ test("supports webview zoom keyboard shortcuts", async ({ page }) => {
   await dispatchPrimaryShortcut("+", "Equal", true);
 
   await expect.poll(getTextScaleState).toEqual({
-    rootFontSize: "16px",
-    textRemSize: "19.2px",
+    rootFontSize: "19.2px",
     storedScale: "1.2",
     webviewZoom: 1,
   });
@@ -2552,7 +2546,6 @@ test("supports webview zoom keyboard shortcuts", async ({ page }) => {
 
   await expect.poll(getTextScaleState).toEqual({
     rootFontSize: "16px",
-    textRemSize: "16px",
     storedScale: null,
     webviewZoom: 1,
   });
@@ -2586,56 +2579,54 @@ test("storage clear resets composed font size and keyboard zoom across windows",
     await dispatchZoomIn();
   }
 
-  await expect
-    .poll(() =>
-      page.evaluate(() => ({
+  // Zoom scales the real root; the Font size preference layers a text-only
+  // multiplier on top. Resolve the composed type rem through a rendered probe
+  // so the CSS calc is actually evaluated (root px × 15/14 for "larger").
+  const readTypographyState = () =>
+    page.evaluate(() => {
+      const probe = document.createElement("span");
+      probe.style.fontSize = "var(--buzz-type-rem)";
+      document.documentElement.appendChild(probe);
+      const typeRemPx =
+        Math.round(Number.parseFloat(getComputedStyle(probe).fontSize) * 100) /
+        100;
+      probe.remove();
+      return {
         fontSize: document.documentElement.dataset.fontSize,
-        textRemSize: getComputedStyle(document.documentElement)
-          .getPropertyValue("--buzz-type-rem")
-          .trim(),
+        rootFontSize: getComputedStyle(document.documentElement).fontSize,
+        typeRemPx,
         textScale: localStorage.getItem("buzz:text-scale"),
-      })),
-    )
-    .toEqual({
-      fontSize: "larger",
-      textRemSize: "25.714286px",
-      textScale: "1.5",
+      };
     });
 
+  await expect.poll(readTypographyState).toEqual({
+    fontSize: "larger",
+    rootFontSize: "24px",
+    typeRemPx: 25.71,
+    textScale: "1.5",
+  });
+
   const peerPage = await context.newPage();
   await installMockBridge(peerPage);
   await peerPage.goto("/");
   await peerPage.evaluate(() => localStorage.clear());
 
-  await expect
-    .poll(() =>
-      page.evaluate(() => ({
-        fontSize: document.documentElement.dataset.fontSize,
-        textRemSize: getComputedStyle(document.documentElement)
-          .getPropertyValue("--buzz-type-rem")
-          .trim(),
-        textScale: localStorage.getItem("buzz:text-scale"),
-      })),
-    )
-    .toEqual({
-      fontSize: "default",
-      textRemSize: "16px",
-      textScale: null,
-    });
+  await expect.poll(readTypographyState).toEqual({
+    fontSize: "default",
+    rootFontSize: "16px",
+    typeRemPx: 16,
+    textScale: null,
+  });
 
   await page.keyboard.press(
     process.platform === "darwin" ? "Meta+-" : "Control+-",
   );
-  await expect
-    .poll(() =>
-      page.evaluate(() => ({
-        textRemSize: getComputedStyle(document.documentElement)
-          .getPropertyValue("--buzz-type-rem")
-          .trim(),
-        textScale: localStorage.getItem("buzz:text-scale"),
-      })),
-    )
-    .toEqual({ textRemSize: "14.4px", textScale: "0.9" });
+  await expect.poll(readTypographyState).toEqual({
+    fontSize: "default",
+    rootFontSize: "14.4px",
+    typeRemPx: 14.4,
+    textScale: "0.9",
+  });
 
   await peerPage.close();
 });
diff --git a/desktop/tests/e2e/top-chrome-zoom-clearance.spec.ts b/desktop/tests/e2e/top-chrome-zoom-clearance.spec.ts
index d26001ba6e..d1615dbcc6 100644
--- a/desktop/tests/e2e/top-chrome-zoom-clearance.spec.ts
+++ b/desktop/tests/e2e/top-chrome-zoom-clearance.spec.ts
@@ -90,24 +90,18 @@ async function seedTextScale(
   }, scale);
 }
 
-async function expectTextRemSize(
+// Cmd +/- scales the real root font-size so every rem in the app zooms. The
+// top chrome below must stay fixed *despite* that, which is what these tests
+// guard.
+async function expectRootFontSize(
   page: import("@playwright/test").Page,
   fontSize: string,
 ) {
-  await expect
-    .poll(() =>
-      page.evaluate(() =>
-        getComputedStyle(document.documentElement)
-          .getPropertyValue("--buzz-type-rem")
-          .trim(),
-      ),
-    )
-    .toBe(fontSize);
   await expect
     .poll(() =>
       page.evaluate(() => getComputedStyle(document.documentElement).fontSize),
     )
-    .toBe("16px");
+    .toBe(fontSize);
 }
 
 test.describe("top chrome macOS traffic-light clearance under text zoom", () => {
@@ -152,8 +146,8 @@ test.describe("top chrome macOS traffic-light clearance under text zoom", () =>
     await installMockBridge(page);
     await page.goto("/");
 
-    // Confirm the zoomed-out text scale applied without changing the root.
-    await expectTextRemSize(page, "12px");
+    // Confirm the zoomed-out scale reached the root.
+    await expectRootFontSize(page, "12px");
 
     expect(await firstNavButtonX(page)).toBeGreaterThanOrEqual(
       TRAFFIC_LIGHT_RIGHT_EDGE,
@@ -170,7 +164,7 @@ test.describe("top chrome macOS traffic-light clearance under text zoom", () =>
     await installMockBridge(page);
     await page.goto("/");
 
-    await expectTextRemSize(page, "24px");
+    await expectRootFontSize(page, "24px");
 
     expect(await firstNavButtonX(page)).toBeGreaterThanOrEqual(
       TRAFFIC_LIGHT_RIGHT_EDGE,

From 694d804b24cd0b97403b3caf159a55ffd1fc3b08 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:26:43 -0600
Subject: [PATCH 29/38] chore(deps): update swatinem/rust-cache digest to
 6323deb (#5441)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [Swatinem/rust-cache](https://redirect.github.com/Swatinem/rust-cache)
([changelog](https://redirect.github.com/Swatinem/rust-cache/compare/e18b497796c12c097a38f9edb9d0641fb99eee32..6323deb102c322ba6fcbdcafc7e3dddab59af2b6))
| action | digest | `e18b497` → `6323deb` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the [Dependency
Dashboard](../issues/1) for more information.

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - Between 12:00 AM and 03:59 AM, only on Monday (`* 0-3 * * 1`)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/block/buzz).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4xMi4wIiwidXBkYXRlZEluVmVyIjoiNDQuMzkuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml             | 16 ++++++++--------
 .github/workflows/mesh-lifecycle.yml |  2 +-
 .github/workflows/release.yml        |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a832c0a0af..59b9a73ec9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,7 +101,7 @@ jobs:
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
         with:
           save-if: ${{ github.event_name != 'pull_request' }}
       - name: Format check
@@ -123,7 +123,7 @@ jobs:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
       - uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
         with:
           save-if: ${{ github.event_name != 'pull_request' }}
       - name: Install cargo-nextest
@@ -147,7 +147,7 @@ jobs:
           fetch-depth: 2
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
       - uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
         with:
           workspaces: desktop/src-tauri
           save-if: ${{ github.event_name != 'pull_request' }}
@@ -340,7 +340,7 @@ jobs:
           key: relay-artifacts-${{ runner.os }}-${{ hashFiles('crates/**', 'migrations/**', 'Dockerfile', 'Cargo.toml', 'Cargo.lock', 'rust-toolchain.toml', '.cargo/config.toml', '.github/workflows/ci.yml') }}
       - uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1
         if: steps.relay-artifacts-cache.outputs.cache-hit != 'true'
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
         if: steps.relay-artifacts-cache.outputs.cache-hit != 'true'
         with:
           workspaces: |
@@ -763,7 +763,7 @@ jobs:
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
         with:
           save-if: ${{ github.event_name != 'pull_request' }}
       # Reuse the relay + git-credential-nostr built by Desktop E2E Relay
@@ -952,7 +952,7 @@ jobs:
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
         with:
           key: cross-${{ matrix.target }}
           save-if: ${{ github.event_name != 'pull_request' }}
@@ -993,7 +993,7 @@ jobs:
       # toolchain (1.95.0 + clippy via profile = default) comes from the
       # repo-root rust-toolchain.toml, which the runner's preinstalled rustup
       # honors on demand; the host triple already is x86_64-pc-windows-msvc.
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
         with:
           workspaces: |
             .
@@ -1070,7 +1070,7 @@ jobs:
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
         with:
           workspaces: desktop/src-tauri
           save-if: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/mesh-lifecycle.yml b/.github/workflows/mesh-lifecycle.yml
index 4780083ba4..b5f9660dfe 100644
--- a/.github/workflows/mesh-lifecycle.yml
+++ b/.github/workflows/mesh-lifecycle.yml
@@ -55,7 +55,7 @@ jobs:
 
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
 
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
         with:
           save-if: ${{ github.event_name != 'pull_request' }}
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2b0eb25c68..6509e0ec67 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -511,7 +511,7 @@ jobs:
 
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
 
-      - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
         with:
           workspaces: desktop/src-tauri
           lookup-only: true

From 9008a4d1724afbd8dba0fd99e99cd8305b5d2ecb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:27:17 -0600
Subject: [PATCH 30/38] chore(deps): update ubuntu:24.04 docker digest to
 561618e (#5442)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [ubuntu](https://hub.docker.com/_/ubuntu)
([source](https://git.launchpad.net/cloud-images/+oci/ubuntu-base)) |
container | digest | `4fbb8e6` → `561618e` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the [Dependency
Dashboard](../issues/1) for more information.

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - Between 12:00 AM and 03:59 AM, only on Monday (`* 0-3 * * 1`)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/block/buzz).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4xMi4wIiwidXBkYXRlZEluVmVyIjoiNDQuMjkuNSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/desktop-release-cache-proof.yml | 2 +-
 .github/workflows/linux-canary.yml                | 2 +-
 .github/workflows/release.yml                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/desktop-release-cache-proof.yml b/.github/workflows/desktop-release-cache-proof.yml
index cf9c8e7827..71436d00c3 100644
--- a/.github/workflows/desktop-release-cache-proof.yml
+++ b/.github/workflows/desktop-release-cache-proof.yml
@@ -67,7 +67,7 @@ jobs:
     name: Prove Linux cache visibility
     if: github.repository == 'block/buzz'
     runs-on: ubuntu-latest
-    container: ubuntu:24.04@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90
+    container: ubuntu:24.04@sha256:561618e2c15bf2397621dd04f96926663a3b5616c189cf7e38db7e82f5c538ea
     timeout-minutes: 15
     defaults:
       run:
diff --git a/.github/workflows/linux-canary.yml b/.github/workflows/linux-canary.yml
index d8b10032b2..cdf8fe3bda 100644
--- a/.github/workflows/linux-canary.yml
+++ b/.github/workflows/linux-canary.yml
@@ -21,7 +21,7 @@ jobs:
     name: Build Linux canary
     if: github.repository == 'block/buzz'
     runs-on: ubuntu-latest
-    container: ubuntu:24.04@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90
+    container: ubuntu:24.04@sha256:561618e2c15bf2397621dd04f96926663a3b5616c189cf7e38db7e82f5c538ea
     timeout-minutes: 60
     permissions:
       contents: read
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6509e0ec67..cc8147515a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -428,7 +428,7 @@ jobs:
     if: github.repository == 'block/buzz'
     runs-on: ubuntu-latest
     # Digest-pinned like the SHA-pinned actions below; Renovate keeps it fresh.
-    container: ubuntu:24.04@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90
+    container: ubuntu:24.04@sha256:561618e2c15bf2397621dd04f96926663a3b5616c189cf7e38db7e82f5c538ea
     needs: setup
     timeout-minutes: 60
     permissions:

From f84511c169cf9a98ac03e9c1acb6bf4d68de5cb8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:27:38 -0600
Subject: [PATCH 31/38] chore(deps): update dependency @tauri-apps/api to
 v2.11.1 (#5444)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change |
[Age](https://docs.renovatebot.com/merge-confidence/) |
[Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [@tauri-apps/api](https://redirect.github.com/tauri-apps/tauri) |
[`2.11.0` →
`2.11.1`](https://renovatebot.com/diffs/npm/@tauri-apps%2fapi/2.11.0/2.11.1)
|
![age](https://developer.mend.io/api/mc/badges/age/npm/@tauri-apps%2fapi/2.11.1?slim=true)
|
![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@tauri-apps%2fapi/2.11.0/2.11.1?slim=true)
|

---

> [!WARNING]
> Some dependencies could not be looked up. Check the [Dependency
Dashboard](../issues/1) for more information.

---

### Release Notes

<details>
<summary>tauri-apps/tauri (@&#8203;tauri-apps/api)</summary>

###
[`v2.11.1`](https://redirect.github.com/tauri-apps/tauri/releases/tag/%40tauri-apps/api-v2.11.1):
@&#8203;tauri-apps/api v2.11.1

[Compare
Source](https://redirect.github.com/tauri-apps/tauri/compare/@tauri-apps/api-v2.11.0...@tauri-apps/api-v2.11.1)

<details>
<summary><em><h4>PNPM Audit</h4></em></summary>

```
No known vulnerabilities found
```

</details>

#### \[2.11.1]
##### Enhancements

-
[`916782601`](https://www.github.com/tauri-apps/tauri/commit/9167826011cc3d114bf12dfb301968fae479891f)
([#&#8203;15520](https://redirect.github.com/tauri-apps/tauri/pull/15520)
by [@&#8203;polw1](https://www.github.com/tauri-apps/tauri/../../polw1))
Document that `Monitor.size`, `Monitor.position` and `Monitor.workArea`
are in physical pixels, with examples showing how to convert them to the
logical pixels expected by window creation options via
`toLogical(monitor.scaleFactor)`.

<details>
<summary><em><h4>PNPM Publish</h4></em></summary>

```
> @tauri-apps/api@2.11.1 npm-publish /home/runner/work/tauri/tauri/packages/api
> pnpm build && cd ./dist && pnpm publish --access public --loglevel silly --no-git-checks

> @tauri-apps/api@2.11.1 build /home/runner/work/tauri/tauri/packages/api
> rollup -c --configPlugin typescript


./src/app.ts, ./src/core.ts, ./src/dpi.ts, ./src/event.ts, ./src/image.ts, ./src/index.ts, ./src/menu.ts, ./src/mocks.ts, ./src/path.ts, ./src/tray.ts, ./src/webview.ts, ./src/webviewWindow.ts, ./src/window.ts → ./dist, ./dist...
created ./dist, ./dist in 883ms

src/index.ts → ../../crates/tauri/scripts/bundle.global.js...
created ../../crates/tauri/scripts/bundle.global.js in 1.4s
npm verbose cli /opt/hostedtoolcache/node/24.16.0/x64/bin/node /opt/hostedtoolcache/node/24.16.0/x64/bin/npm
npm info using npm@11.13.0
npm info using node@v24.16.0
npm silly config load:file:/opt/hostedtoolcache/node/24.16.0/x64/lib/node_modules/npm/npmrc
npm silly config load:file:/tmp/286e8dee195254a4370e608b672019b0/.npmrc
npm silly config load:file:/home/runner/.npmrc
npm silly config load:file:/home/runner/.config/pnpm/rc
npm verbose title npm publish tauri-apps-api-2.11.1.tgz
npm verbose argv "publish" "--ignore-scripts" "tauri-apps-api-2.11.1.tgz" "--access" "public" "--loglevel" "silly"
npm verbose logfile logs-max:10 dir:/home/runner/.npm/_logs/2026-06-17T13_41_23_851Z-
npm verbose logfile /home/runner/.npm/_logs/2026-06-17T13_41_23_851Z-debug-0.log
npm warn Unknown env config "verify-deps-before-run". This will stop working in the next major version of npm. See `npm help npmrc` for supported config options.
npm warn Unknown env config "npm-globalconfig". This will stop working in the next major version of npm. See `npm help npmrc` for supported config options.
npm warn Unknown env config "overrides". This will stop working in the next major version of npm. See `npm help npmrc` for supported config options.
npm warn Unknown env config "_jsr-registry". This will stop working in the next major version of npm. See `npm help npmrc` for supported config options.
npm silly logfile done cleaning log files
npm verbose publish [ 'tauri-apps-api-2.11.1.tgz' ]
npm http cache file:/tmp/286e8dee195254a4370e608b672019b0/tauri-apps-api-2.11.1.tgz 0ms (cache hit)
npm notice
npm notice 📦  @tauri-apps/api@2.11.1
npm notice Tarball Contents
npm notice 99.3kB CHANGELOG.md
npm notice 10.2kB LICENSE_APACHE-2.0
npm notice 1.1kB LICENSE_MIT
npm notice 3.5kB README.md
npm notice 5.9kB app.cjs
npm notice 5.4kB app.d.ts
npm notice 5.5kB app.js
npm notice 11.2kB core.cjs
npm notice 6.5kB core.d.ts
npm notice 10.7kB core.js
npm notice 11.0kB dpi.cjs
npm notice 8.8kB dpi.d.ts
npm notice 10.8kB dpi.js
npm notice 5.8kB event.cjs
npm notice 4.9kB event.d.ts
npm notice 5.7kB event.js
npm notice 2.2kB external/tslib/tslib.es6.cjs
npm notice 2.2kB external/tslib/tslib.es6.js
npm notice 3.0kB image.cjs
npm notice 2.4kB image.d.ts
npm notice 2.9kB image.js
npm notice 738B index.cjs
npm notice 1.2kB index.d.ts
npm notice 669B index.js
npm notice 1.1kB menu.cjs
npm notice 451B menu.d.ts
npm notice 717B menu.js
npm notice 3.6kB menu/base.cjs
npm notice 887B menu/base.d.ts
npm notice 3.6kB menu/base.js
npm notice 2.2kB menu/checkMenuItem.cjs
npm notice 1.5kB menu/checkMenuItem.d.ts
npm notice 2.2kB menu/checkMenuItem.js
npm notice 7.4kB menu/iconMenuItem.cjs
npm notice 6.1kB menu/iconMenuItem.d.ts
npm notice 7.4kB menu/iconMenuItem.js
npm notice 5.1kB menu/menu.cjs
npm notice 4.4kB menu/menu.d.ts
npm notice 5.0kB menu/menu.js
npm notice 1.7kB menu/menuItem.cjs
npm notice 1.3kB menu/menuItem.d.ts
npm notice 1.6kB menu/menuItem.js
npm notice 1.1kB menu/predefinedMenuItem.cjs
npm notice 2.6kB menu/predefinedMenuItem.d.ts
npm notice 1.1kB menu/predefinedMenuItem.js
npm notice 7.1kB menu/submenu.cjs
npm notice 4.8kB menu/submenu.d.ts
npm notice 6.9kB menu/submenu.js
npm notice 9.8kB mocks.cjs
npm notice 5.0kB mocks.d.ts
npm notice 9.7kB mocks.js
npm notice 1.8kB package.json
npm notice 22.7kB path.cjs
npm notice 17.7kB path.d.ts
npm notice 21.7kB path.js
npm notice 7.1kB tray.cjs
npm notice 8.5kB tray.d.ts
npm notice 7.0kB tray.js
npm notice 20.7kB webview.cjs
npm notice 23.8kB webview.d.ts
npm notice 20.5kB webview.js
npm notice 8.4kB webviewWindow.cjs
npm notice 4.9kB webviewWindow.d.ts
npm notice 8.3kB webviewWindow.js
npm notice 68.1kB window.cjs
npm notice 64.9kB window.d.ts
npm notice 67.2kB window.js
npm notice Tarball Details
npm notice name: @tauri-apps/api
npm notice version: 2.11.1
npm notice filename: tauri-apps-api-2.11.1.tgz
npm notice package size: 135.7 kB
npm notice unpacked size: 699.0 kB
npm notice shasum: cd6b13fc26403ca095a02e39ecdbec8048d2872d
npm notice integrity: sha512-M2FPuYND2m+wh[...]sUepJWugQCvAA==
npm notice total files: 67
npm notice
npm http fetch GET https://run-actions-1-azure-eastus.actions.githubusercontent.com/113//idtoken/***/***?api-version=2.0&audience=npm%3Aregistry.npmjs.org 200 76ms
npm http fetch POST 201 https://registry.npmjs.org/-/npm/v1/oidc/token/exchange/package/@tauri-apps%2fapi 674ms
npm verbose oidc Successfully retrieved and set token
npm http fetch GET 200 https://registry.npmjs.org/@tauri-apps%2fapi 54ms (cache miss)
npm notice Publishing to https://registry.npmjs.org/ with tag latest and public access
npm notice publish Signed provenance statement with source and build information from GitHub Actions
npm notice publish Provenance statement published to transparency log: https://search.sigstore.dev/?logIndex=1851797040
npm http fetch PUT 200 https://registry.npmjs.org/@tauri-apps%2fapi 2070ms
+ @tauri-apps/api@2.11.1
npm verbose cwd /tmp/286e8dee195254a4370e608b672019b0
npm verbose os Linux 6.17.0-1018-azure
npm verbose node v24.16.0
npm verbose npm  v11.13.0
npm verbose exit 0
npm info ok
```

</details>

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - Between 12:00 AM and 03:59 AM, only on Monday (`* 0-3 * * 1`)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/block/buzz).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4xMi4wIiwidXBkYXRlZEluVmVyIjoiNDQuMzkuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c8be559938..079f39bde9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -143,7 +143,7 @@ importers:
         version: 3.14.9(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@tauri-apps/api':
         specifier: ~2.11
-        version: 2.11.0
+        version: 2.11.1
       '@tauri-apps/plugin-notification':
         specifier: ^2.3.3
         version: 2.3.3
@@ -1772,8 +1772,8 @@ packages:
     resolution: {integrity: sha512-uhOeFyxLcU41HzvrxsGpiWdcMbScY1EDgbZ5K7DVRMYInbLYWAC0EA/kx9wXAoSM8q82bUG2hRl8+EAjE6XAbA==}
     engines: {node: '>=20.19'}
 
-  '@tauri-apps/api@2.11.0':
-    resolution: {integrity: sha512-7CinYODhky9lmO23xHnUFv0Xt43fbtWMyxZcLcRBlFkcgXKuEirBvHpmtJ89YMhyeGcq20Wuc47Fa4XjyniywA==}
+  '@tauri-apps/api@2.11.1':
+    resolution: {integrity: sha512-M2FPuYND2m+wh5hfW9ZpSdxMPdEJovPBWwoHJmwUpysTYNHaOkVFN419m/K0LIgjb/7KU2vBgsUepJWugQCvAA==}
 
   '@tauri-apps/cli-darwin-arm64@2.11.4':
     resolution: {integrity: sha512-1ryOF3ZhpZ/nemHV5zVwBQBz9jDGKmKPvWPADOhc83ig0P4bMc2iER4NbC6r9sjeIZ6RVQ4g3RZIYvezhcl4TQ==}
@@ -5019,7 +5019,7 @@ snapshots:
 
   '@tanstack/virtual-file-routes@1.162.0': {}
 
-  '@tauri-apps/api@2.11.0': {}
+  '@tauri-apps/api@2.11.1': {}
 
   '@tauri-apps/cli-darwin-arm64@2.11.4':
     optional: true
@@ -5070,19 +5070,19 @@ snapshots:
 
   '@tauri-apps/plugin-notification@2.3.3':
     dependencies:
-      '@tauri-apps/api': 2.11.0
+      '@tauri-apps/api': 2.11.1
 
   '@tauri-apps/plugin-opener@2.5.4':
     dependencies:
-      '@tauri-apps/api': 2.11.0
+      '@tauri-apps/api': 2.11.1
 
   '@tauri-apps/plugin-process@2.3.1':
     dependencies:
-      '@tauri-apps/api': 2.11.0
+      '@tauri-apps/api': 2.11.1
 
   '@tauri-apps/plugin-updater@2.10.1':
     dependencies:
-      '@tauri-apps/api': 2.11.0
+      '@tauri-apps/api': 2.11.1
 
   '@testing-library/dom@10.4.1':
     dependencies:

From 2cef92df676490654f13ebe1de56923b2636123f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:27:52 -0600
Subject: [PATCH 32/38] chore(deps): update rust crate futures to v0.3.33
 (#5445)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [futures](https://rust-lang.github.io/futures-rs)
([source](https://redirect.github.com/rust-lang/futures-rs)) |
dev-dependencies | patch | `0.3.32` → `0.3.34` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the [Dependency
Dashboard](../issues/1) for more information.

---

### Release Notes

<details>
<summary>rust-lang/futures-rs (futures)</summary>

###
[`v0.3.34`](https://redirect.github.com/rust-lang/futures-rs/blob/HEAD/CHANGELOG.md#0334---2026-08-11)

[Compare
Source](https://redirect.github.com/rust-lang/futures-rs/compare/0.3.33...0.3.34)

- Preserve cloned waker identity.
([#&#8203;3032](https://redirect.github.com/rust-lang/futures-rs/issues/3032))
- Updato `syn` to 3.
([#&#8203;3028](https://redirect.github.com/rust-lang/futures-rs/issues/3028))

###
[`v0.3.33`](https://redirect.github.com/rust-lang/futures-rs/blob/HEAD/CHANGELOG.md#0333---2026-07-18)

[Compare
Source](https://redirect.github.com/rust-lang/futures-rs/compare/0.3.32...0.3.33)

- Fix `ReadLine`'s soundness issue regarding to exception safety.
([#&#8203;3020](https://redirect.github.com/rust-lang/futures-rs/issues/3020))
- Fix unsound `Send` impl for `IterPinRef` and `Iter`.
([#&#8203;3003](https://redirect.github.com/rust-lang/futures-rs/issues/3003))
- Fix stacked borrows violation in `compat01as03` implementation.
([#&#8203;3012](https://redirect.github.com/rust-lang/futures-rs/issues/3012))
- Fix memory leak in `FuturesUnordered::IntoIter`.
([#&#8203;3005](https://redirect.github.com/rust-lang/futures-rs/issues/3005))
- Add `portable-atomic-alloc` feature and use it in `FuturesUnordered`.
([#&#8203;3007](https://redirect.github.com/rust-lang/futures-rs/issues/3007))
- Re-export `alloc::task::Wake`.
([#&#8203;3010](https://redirect.github.com/rust-lang/futures-rs/issues/3010))
- Update `spin` to 0.12.
([#&#8203;3014](https://redirect.github.com/rust-lang/futures-rs/issues/3014))

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - Between 12:00 AM and 03:59 AM, only on Monday (`* 0-3 * * 1`)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/block/buzz).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4xMi4wIiwidXBkYXRlZEluVmVyIjoiNDQuMjkuNSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Cargo.lock | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 16d86d0206..585f451cc7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3040,9 +3040,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
 [[package]]
 name = "futures"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
+checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3068,9 +3068,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3078,15 +3078,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
+checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -3106,9 +3106,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed"
 
 [[package]]
 name = "futures-lite"
@@ -3125,32 +3125,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 3.0.3",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d"
 
 [[package]]
 name = "futures-task"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
 
 [[package]]
 name = "futures-util"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
 dependencies = [
  "futures-channel",
  "futures-core",

From d874d67c117e4582cc9549ebe85c942e5e49faf7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:28:08 -0600
Subject: [PATCH 33/38] chore(deps): update rust crate futures-util to v0.3.33
 (#5448)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [futures-util](https://rust-lang.github.io/futures-rs)
([source](https://redirect.github.com/rust-lang/futures-rs)) |
dependencies | patch | `0.3.32` → `0.3.34` |
| [futures-util](https://rust-lang.github.io/futures-rs)
([source](https://redirect.github.com/rust-lang/futures-rs)) |
workspace.dependencies | patch | `0.3.32` → `0.3.34` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the [Dependency
Dashboard](../issues/1) for more information.

---

### Release Notes

<details>
<summary>rust-lang/futures-rs (futures-util)</summary>

###
[`v0.3.34`](https://redirect.github.com/rust-lang/futures-rs/blob/HEAD/CHANGELOG.md#0334---2026-08-11)

[Compare
Source](https://redirect.github.com/rust-lang/futures-rs/compare/0.3.33...0.3.34)

- Preserve cloned waker identity.
([#&#8203;3032](https://redirect.github.com/rust-lang/futures-rs/issues/3032))
- Updato `syn` to 3.
([#&#8203;3028](https://redirect.github.com/rust-lang/futures-rs/issues/3028))

###
[`v0.3.33`](https://redirect.github.com/rust-lang/futures-rs/blob/HEAD/CHANGELOG.md#0333---2026-07-18)

[Compare
Source](https://redirect.github.com/rust-lang/futures-rs/compare/0.3.32...0.3.33)

- Fix `ReadLine`'s soundness issue regarding to exception safety.
([#&#8203;3020](https://redirect.github.com/rust-lang/futures-rs/issues/3020))
- Fix unsound `Send` impl for `IterPinRef` and `Iter`.
([#&#8203;3003](https://redirect.github.com/rust-lang/futures-rs/issues/3003))
- Fix stacked borrows violation in `compat01as03` implementation.
([#&#8203;3012](https://redirect.github.com/rust-lang/futures-rs/issues/3012))
- Fix memory leak in `FuturesUnordered::IntoIter`.
([#&#8203;3005](https://redirect.github.com/rust-lang/futures-rs/issues/3005))
- Add `portable-atomic-alloc` feature and use it in `FuturesUnordered`.
([#&#8203;3007](https://redirect.github.com/rust-lang/futures-rs/issues/3007))
- Re-export `alloc::task::Wake`.
([#&#8203;3010](https://redirect.github.com/rust-lang/futures-rs/issues/3010))
- Update `spin` to 0.12.
([#&#8203;3014](https://redirect.github.com/rust-lang/futures-rs/issues/3014))

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - Between 12:00 AM and 03:59 AM, only on Monday (`* 0-3 * * 1`)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/block/buzz).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4xMi4wIiwidXBkYXRlZEluVmVyIjoiNDQuMzkuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 desktop/src-tauri/Cargo.lock | 41 +++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock
index ac982df6f2..fb60a35189 100644
--- a/desktop/src-tauri/Cargo.lock
+++ b/desktop/src-tauri/Cargo.lock
@@ -3080,9 +3080,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3090,9 +3090,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
 
 [[package]]
 name = "futures-executor"
@@ -3107,9 +3107,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed"
 
 [[package]]
 name = "futures-lite"
@@ -3126,32 +3126,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 3.0.3",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d"
 
 [[package]]
 name = "futures-task"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
 
 [[package]]
 name = "futures-util"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -10239,6 +10239,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"

From 1a0a27d3586b14fb79ec8e162441e610f8548188 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:28:22 -0600
Subject: [PATCH 34/38] chore(deps): update rust crate http to v1.4.2 (#5451)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [http](https://redirect.github.com/hyperium/http) | dependencies |
patch | `1.4.0` → `1.4.2` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the [Dependency
Dashboard](../issues/1) for more information.

---

### Release Notes

<details>
<summary>hyperium/http (http)</summary>

###
[`v1.4.2`](https://redirect.github.com/hyperium/http/blob/HEAD/CHANGELOG.md#142-June-8-2026)

[Compare
Source](https://redirect.github.com/hyperium/http/compare/v1.4.1...v1.4.2)

- Fix `uri::Builder` to allow `"*"` as the path when scheme and
authority are also set, used in HTTP/2 requests.
- Fix `Uri` to properly reject `DEL` characters.

###
[`v1.4.1`](https://redirect.github.com/hyperium/http/blob/HEAD/CHANGELOG.md#141-May-25-2026)

[Compare
Source](https://redirect.github.com/hyperium/http/compare/v1.4.0...v1.4.1)

- Fix `PathAndQuery::from_static()` and `from_shared()` to reject inputs
that do not start with `/`.
- Fix `Extend` for `HeaderMap` to clamp max size hint and not overflow.
- Fix `header::IntoIter` that could use-after-free if the generic value
type could panic on drop.
- Fix `header::{IterMut, ValuesIterMut}` to not violate stacked borrows.

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - Between 12:00 AM and 03:59 AM, only on Monday (`* 0-3 * * 1`)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/block/buzz).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4xMi4wIiwidXBkYXRlZEluVmVyIjoiNDQuMzkuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 585f451cc7..73b175c4dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3617,9 +3617,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
+checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
 dependencies = [
  "bytes",
  "itoa",

From 9390e11c9babeef221aeb0a22cc61a52700d168f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:28:38 -0600
Subject: [PATCH 35/38] chore(deps): update rust crate http-body-util to v0.1.4
 (#5452)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [http-body-util](https://redirect.github.com/hyperium/http-body) |
dependencies | patch | `0.1.3` → `0.1.5` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the [Dependency
Dashboard](../issues/1) for more information.

---

### Release Notes

<details>
<summary>hyperium/http-body (http-body-util)</summary>

###
[`v0.1.5`](https://redirect.github.com/hyperium/http-body/compare/http-body-util-v0.1.4...http-body-util-v0.1.5)

[Compare
Source](https://redirect.github.com/hyperium/http-body/compare/http-body-util-v0.1.4...http-body-util-v0.1.5)

###
[`v0.1.4`](https://redirect.github.com/hyperium/http-body/releases/tag/http-body-util-v0.1.4)

[Compare
Source](https://redirect.github.com/hyperium/http-body/compare/http-body-util-v0.1.3...http-body-util-v0.1.4)

#### What's Changed

- Add `Fused` body combinator that always returns `None` once completed.
- Add `BodyExt::into_stream()` to convert a body into a `Stream`.
- Add `Full::into_inner()` to get the full `Buf`.
- Add `InspectFrame` and `InspectErr` combinators.

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - Between 12:00 AM and 03:59 AM, only on Monday (`* 0-3 * * 1`)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/block/buzz).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4xMi4wIiwidXBkYXRlZEluVmVyIjoiNDQuMzkuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 73b175c4dd..39527083b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3637,9 +3637,9 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c"
 dependencies = [
  "bytes",
  "futures-core",

From 2d93ea095535e42ee3a9933f00a4c0bd5e9e1c67 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:28:51 -0600
Subject: [PATCH 36/38] chore(deps): update dependency sonner to v2.0.8 (#6093)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change |
[Age](https://docs.renovatebot.com/merge-confidence/) |
[Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [sonner](https://sonner.emilkowal.ski/)
([source](https://redirect.github.com/emilkowalski/sonner)) | [`2.0.7` →
`2.0.8`](https://renovatebot.com/diffs/npm/sonner/2.0.7/2.0.8) |
![age](https://developer.mend.io/api/mc/badges/age/npm/sonner/2.0.8?slim=true)
|
![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/sonner/2.0.7/2.0.8?slim=true)
|

---

> [!WARNING]
> Some dependencies could not be looked up. Check the [Dependency
Dashboard](../issues/1) for more information.

---

### Release Notes

<details>
<summary>emilkowalski/sonner (sonner)</summary>

###
[`v2.0.8`](https://redirect.github.com/emilkowalski/sonner/compare/v2.0.7...ecce1841c55e4a72dfe139a8992b56498660125e)

[Compare
Source](https://redirect.github.com/emilkowalski/sonner/compare/v2.0.7...v2.0.8)

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - Between 12:00 AM and 03:59 AM, only on Monday (`* 0-3 * * 1`)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/block/buzz).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4yOS41IiwidXBkYXRlZEluVmVyIjoiNDQuMzkuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 079f39bde9..11fef7c534 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -227,7 +227,7 @@ importers:
         version: 4.1.0
       sonner:
         specifier: ^2.0.7
-        version: 2.0.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 2.0.8(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       tailwind-merge:
         specifier: ^3.5.0
         version: 3.6.0
@@ -354,7 +354,7 @@ importers:
         version: 4.0.1
       sonner:
         specifier: ^2.0.7
-        version: 2.0.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 2.0.8(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       tailwind-merge:
         specifier: ^3.5.0
         version: 3.6.0
@@ -3347,11 +3347,15 @@ packages:
   simple-get@4.0.1:
     resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
 
-  sonner@2.0.7:
-    resolution: {integrity: sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w==}
+  sonner@2.0.8:
+    resolution: {integrity: sha512-UM/ByIoFra8yzV75n1o0Puu0bw5U/9UNnDacrJNspekBewIfsQ3D6ez1nvlWpt7aTsO6rujQtifBpycwIivqlg==}
     peerDependencies:
+      '@types/react': ^18.0.0 || ^19.0.0
       react: ^18.0.0 || ^19.0.0 || ^19.0.0-rc
       react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
 
   source-map-js@1.2.1:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
@@ -6812,10 +6816,12 @@ snapshots:
       once: 1.4.0
       simple-concat: 1.0.1
 
-  sonner@2.0.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
+  sonner@2.0.8(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
+    optionalDependencies:
+      '@types/react': 19.2.18
 
   source-map-js@1.2.1: {}
 

From f7942167372501576c9f0f589cf2c166882668bb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 18:29:04 -0600
Subject: [PATCH 37/38] chore(deps): update rust crate async-trait to v0.1.92
 (#6094)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [async-trait](https://redirect.github.com/dtolnay/async-trait) |
dependencies | patch | `0.1.91` → `0.1.92` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the [Dependency
Dashboard](../issues/1) for more information.

---

### Release Notes

<details>
<summary>dtolnay/async-trait (async-trait)</summary>

###
[`v0.1.92`](https://redirect.github.com/dtolnay/async-trait/releases/tag/0.1.92)

[Compare
Source](https://redirect.github.com/dtolnay/async-trait/compare/0.1.91...0.1.92)

- Resolve double\_must\_use clippy lint in generated code
([#&#8203;303](https://redirect.github.com/dtolnay/async-trait/issues/303))

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - Between 12:00 AM and 03:59 AM, only on Monday (`* 0-3 * * 1`)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/block/buzz).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4yOS41IiwidXBkYXRlZEluVmVyIjoiNDQuMzkuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 39527083b9..18c53c18ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -329,9 +329,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.91"
+version = "0.1.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae36dc4177970ef04fde5178d3e2429882def40e57a451f919c098f72baa6cec"
+checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667"
 dependencies = [
  "proc-macro2",
  "quote",

From 074561233eef71df9690ec22c2a9c5e798c297a7 Mon Sep 17 00:00:00 2001
From: Taylor Ho <taylorkmho@gmail.com>
Date: Fri, 21 Aug 2026 17:48:21 -0700
Subject: [PATCH 38/38] fix(composer): preserve caret when inserting mentions
 mid-message (#6531)

**Category:** fix
**User Impact:** Users can insert mentions earlier in a draft and
continue typing without the caret corrupting the rest of the message.

**Problem:** Caret correction ran after every document change, so typing
a mention before existing text repeatedly advanced across the mention
separator and interleaved spaces into the draft. **Solution:** Limit
correction to the autocomplete settlement it was designed for, with
transaction-level and browser-level regression coverage for known and
unregistered mentions.

<details>
<summary>File changes</summary>

**desktop/src/features/messages/lib/mentionHighlightExtension.ts**
Restricts trailing-space caret advancement to an armed autocomplete
settlement instead of every document change.

**desktop/src/features/messages/lib/mentionHighlightExtension.test.mjs**
Exercises the real ProseMirror plugin state and verifies mid-draft
mention typing, unknown tokens, end-of-message typing, and
completed-mention separators.

**desktop/tests/e2e/mentions.spec.ts**
Reproduces the reported composer workflow in Chromium and covers the
same corruption path for an unregistered `@token`.

</details>

## Reproduction steps

1. Open a channel and enter `hello world` in the composer.
2. Move the caret between `hello` and ` world`.
3. Type ` @bo`, select `bob` from autocomplete, and continue typing
`abc`.
4. Confirm the composer reads `hello @bob abc world` with the caret
after `abc`.
5. Repeat with an unregistered token such as ` @zzq` and confirm the
existing text remains intact.

## Before / After

| Before | After |
| --- | --- |
| Typing after a mid-draft mention walks the caret through the existing
message. | Continued typing stays after the inserted mention. |
| ![Before: mention caret corrupts existing draft
text](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6531/mention-caret-before.gif)
| ![After: caret remains after the inserted
mention](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/6531/mention-caret-after.gif)
|

---------

Signed-off-by: Taylor Ho <taylorkmho@gmail.com>
Co-authored-by: Mongo <5398c5fd039b963ce132b3e078e7c4af097dd997517bb5e14c2682fe68c25197@buzz.block.builderlab.xyz>
---
 .../lib/mentionHighlightExtension.test.mjs    | 86 ++++++++++++++++---
 .../messages/lib/mentionHighlightExtension.ts | 12 +--
 desktop/tests/e2e/mentions.spec.ts            | 47 ++++++++++
 3 files changed, 130 insertions(+), 15 deletions(-)

diff --git a/desktop/src/features/messages/lib/mentionHighlightExtension.test.mjs b/desktop/src/features/messages/lib/mentionHighlightExtension.test.mjs
index 2747bdb186..6c7055c20d 100644
--- a/desktop/src/features/messages/lib/mentionHighlightExtension.test.mjs
+++ b/desktop/src/features/messages/lib/mentionHighlightExtension.test.mjs
@@ -2,6 +2,7 @@ import assert from "node:assert/strict";
 import test from "node:test";
 
 import { getSchema } from "@tiptap/core";
+import { EditorState, TextSelection } from "@tiptap/pm/state";
 import StarterKit from "@tiptap/starter-kit";
 
 import {
@@ -10,6 +11,7 @@ import {
   createMentionCaretSettlement,
   findHighlightMatches,
   insertPosForMentionTextInput,
+  MentionHighlightExtension,
   mentionTextInputInsertPos,
   positionAfterArrowLeftThroughMentionSpace,
   selectionAfterMentionTrailingSpace,
@@ -213,7 +215,6 @@ test("shouldAdvanceMentionCaret restores a remap while this editor is settling",
       from: 7,
       next: 8,
       settling: true,
-      docChanged: false,
     }),
     true,
   );
@@ -225,21 +226,18 @@ test("shouldAdvanceMentionCaret does not steal ArrowLeft after settlement is can
       from: 7,
       next: 8,
       settling: false,
-      docChanged: false,
     }),
     false,
   );
 });
 
-test("shouldAdvanceMentionCaret still advances after a document change", () => {
+test("shouldAdvanceMentionCaret does not advance on an unsettled document change", () => {
+  // Regression: `docChanged` used to force an advance. That walked the caret
+  // across a mention's trailing space on every keystroke, so typing `@name`
+  // before existing text interleaved spaces into the draft.
   assert.equal(
-    shouldAdvanceMentionCaret({
-      from: 7,
-      next: 8,
-      settling: false,
-      docChanged: true,
-    }),
-    true,
+    shouldAdvanceMentionCaret({ from: 7, next: 8, settling: false }),
+    false,
   );
 });
 
@@ -312,3 +310,71 @@ test("assignMentionHighlightNames updates when a new mention is added", () => {
   );
   assert.deepEqual(storage.names, ["bob", "quinn"]);
 });
+
+// ── caret regression: typing a mention before existing text ───────────
+//
+// Drives the real plugin through EditorState so `appendTransaction` runs.
+// Before the fix, every keystroke advanced the caret across a mention's
+// trailing space, interleaving spaces into the rest of the draft.
+
+function editorStateWithMentionHighlight(initialText, names) {
+  // The plugin factory only reads `this.storage`, so a minimal stand-in is
+  // enough to exercise it without constructing a full editor (needs a DOM).
+  const plugins = MentionHighlightExtension.config.addProseMirrorPlugins.call({
+    storage: { names, agentNames: [], channelNames: [] },
+  });
+  return EditorState.create({
+    doc: document(paragraph(text(initialText))),
+    schema,
+    plugins,
+  });
+}
+
+/** Insert `typed` one character at a time at `startPos`, as typing does. */
+function typeAt(state, startPos, typed) {
+  let next = state.apply(
+    state.tr.setSelection(TextSelection.create(state.doc, startPos)),
+  );
+  for (const char of typed) {
+    const { from, to } = next.selection;
+    const tr = next.tr.insertText(char, from, to);
+    tr.setSelection(TextSelection.create(tr.doc, tr.mapping.map(to, 1)));
+    next = next.apply(tr);
+  }
+  return next;
+}
+
+test("typing a mention before existing text does not interleave spaces", () => {
+  // Caret placed just after "hello" in "hello world", then " @qu" is typed.
+  const state = editorStateWithMentionHighlight("hello world", ["quinn"]);
+  const typed = typeAt(state, 1 + "hello".length, " @qu");
+  assert.equal(typed.doc.textContent, "hello @qu world");
+});
+
+test("typing a mention before existing text keeps the caret with the text", () => {
+  const state = editorStateWithMentionHighlight("hello world", ["quinn"]);
+  const typed = typeAt(state, 1 + "hello".length, " @qu");
+  assert.equal(typed.selection.from, 1 + "hello @qu".length);
+});
+
+test("an unknown @token before existing text is not rewritten either", () => {
+  // The trailing-space scan is purely textual, so it fired even for names
+  // that were never registered as mentions.
+  const state = editorStateWithMentionHighlight("hello world", []);
+  const typed = typeAt(state, 1 + "hello".length, " @zz");
+  assert.equal(typed.doc.textContent, "hello @zz world");
+});
+
+test("typing a mention at the end of a message still works", () => {
+  const state = editorStateWithMentionHighlight("hello world", ["quinn"]);
+  const typed = typeAt(state, 1 + "hello world".length, " @qu");
+  assert.equal(typed.doc.textContent, "hello world @qu");
+});
+
+test("typing after a completed mention keeps the separator intact", () => {
+  // "@quinn " already exists; typing at the very end must not consume or
+  // duplicate the trailing space.
+  const state = editorStateWithMentionHighlight("@quinn world", ["quinn"]);
+  const typed = typeAt(state, 1 + "@quinn world".length, "!");
+  assert.equal(typed.doc.textContent, "@quinn world!");
+});
diff --git a/desktop/src/features/messages/lib/mentionHighlightExtension.ts b/desktop/src/features/messages/lib/mentionHighlightExtension.ts
index f20feef26d..82809eaabc 100644
--- a/desktop/src/features/messages/lib/mentionHighlightExtension.ts
+++ b/desktop/src/features/messages/lib/mentionHighlightExtension.ts
@@ -40,19 +40,22 @@ export function createMentionCaretSettlement(): MentionCaretSettlement {
  * Whether to move an empty caret from `from` to `next` after a mention
  * trailing space. Settlement is per editor: autocomplete arms it, and
  * ArrowLeft/click cancel it so we do not steal an intentional caret.
+ *
+ * Only an armed settlement may advance the caret. Advancing on any
+ * document change instead walked the caret across the separator on every
+ * keystroke, so typing `@name` before existing text interleaved spaces
+ * into the draft (`hello @q uworld`).
  */
 export function shouldAdvanceMentionCaret({
   from,
   next,
   settling,
-  docChanged,
 }: {
   from: number;
   next: number;
   settling: boolean;
-  docChanged: boolean;
 }): boolean {
-  return next !== from && (settling || docChanged);
+  return next !== from && settling;
 }
 
 /**
@@ -334,7 +337,7 @@ export const MentionHighlightExtension = Extension.create({
             return oldDecorations.map(tr.mapping, tr.doc);
           },
         },
-        appendTransaction(transactions, _oldState, newState) {
+        appendTransaction(_transactions, _oldState, newState) {
           if (!newState.selection.empty) {
             settlement.cancel();
             return null;
@@ -346,7 +349,6 @@ export const MentionHighlightExtension = Extension.create({
               from,
               next,
               settling: settlement.peek() !== null,
-              docChanged: transactions.some((tr) => tr.docChanged),
             })
           ) {
             return null;
diff --git a/desktop/tests/e2e/mentions.spec.ts b/desktop/tests/e2e/mentions.spec.ts
index 351f4c71f0..8aaef67cc0 100644
--- a/desktop/tests/e2e/mentions.spec.ts
+++ b/desktop/tests/e2e/mentions.spec.ts
@@ -885,6 +885,53 @@ test("clicking a person mention chip edge is not treated as after the trailing s
   expect(text).not.toMatch(/@bob x/);
 });
 
+test("typing a mention before existing text does not interleave spaces", async ({
+  page,
+}) => {
+  // Regression (the reported repro): with a draft already written, place the
+  // caret earlier in the message, type a partial mention, pick a suggestion,
+  // then keep typing. Caret correction used to fire on every document change
+  // and walk the caret across the mention's trailing space, so each keystroke
+  // pushed a space further into the rest of the draft.
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await expect(page.getByTestId("chat-title")).toHaveText("general");
+
+  const input = page.getByTestId("message-input");
+  await input.fill("hello world");
+
+  // Click between "hello" and " world", then open autocomplete there.
+  await input.focus();
+  for (let i = 0; i < " world".length; i++) {
+    await page.keyboard.press("ArrowLeft");
+  }
+  await page.keyboard.type(" @bo");
+  await autocomplete(page).getByText("bob").click();
+  await page.keyboard.type("abc");
+
+  await expect(input).toHaveText("hello @bob abc world");
+});
+
+test("typing an unregistered @token before existing text is left alone", async ({
+  page,
+}) => {
+  // The trailing-space scan is purely textual, so it also fired for tokens
+  // that were never registered as mentions.
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await expect(page.getByTestId("chat-title")).toHaveText("general");
+
+  const input = page.getByTestId("message-input");
+  await input.fill("hello world");
+  await input.focus();
+  for (let i = 0; i < " world".length; i++) {
+    await page.keyboard.press("ArrowLeft");
+  }
+  await page.keyboard.type(" @zzq");
+
+  await expect(input).toHaveText("hello @zzq world");
+});
+
 test("channel references keep caret movement through the channel name", async ({
   page,
 }) => {