diff --git a/.env.example b/.env.example
index b9bfcada0ec..0f7bbba6f13 100644
--- a/.env.example
+++ b/.env.example
@@ -102,11 +102,10 @@ BUZZ_S3_ADDRESSING_STYLE=path
 # BUZZ_MEDIA_MAX_CONCURRENT_UPLOADS=8
 # BUZZ_MEDIA_MAX_CONCURRENT_UPLOADS_PER_PUBKEY=2
 # BUZZ_MEDIA_UPLOADS_PER_MINUTE=30
-# Require Blossom t=get auth and relay membership for GET/HEAD /media/*.
-# Keep off until desktop/mobile/CLI clients that attach media read auth are deployed.
-# BUZZ_REQUIRE_MEDIA_GET_AUTH=false
-# Legacy alias accepted by the relay while rollout docs catch up:
-# BUZZ_REQUIRE_MEDIA_READ_AUTH=false
+# GET/HEAD /media/* always require Blossom t=get auth and relay membership.
+# BUZZ_REQUIRE_MEDIA_GET_AUTH and BUZZ_REQUIRE_MEDIA_READ_AUTH are no longer
+# read; setting either (including to false) changes nothing and the relay warns
+# about it at startup.
 
 # -----------------------------------------------------------------------------
 # Ephemeral Channels (TTL testing)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e65157705ad..c0a81d86aea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 2
-      - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+      - uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
         id: filter
         with:
           token: ''
@@ -768,6 +768,19 @@ jobs:
         env:
           RELAY_URL: ws://localhost:3000
           GIT_CREDENTIAL_NOSTR_BIN: ${{ github.workspace }}/target/ci/git-credential-nostr
+      - name: Media read-auth e2e
+        # Reads require kind:24242 `t=get` auth, so these binaries are the only
+        # coverage that a real relay rejects bare reads and honours host- and
+        # hash-scoped tokens. They were #[ignore]d and selected by no CI job, so
+        # the lane never ran; select it here, where MinIO and the seeded
+        # 'localhost:3000' community already exist.
+        # --no-fail-fast: without it cargo stops after the first failing binary,
+        # so one broken case hides every later binary's result.
+        run: |
+          cargo test -p buzz-test-client --no-fail-fast --test e2e_media --test e2e_media_extended --test e2e_media_video -- --ignored --nocapture
+        env:
+          RELAY_URL: ws://localhost:3000
+          RELAY_HTTP_URL: http://localhost:3000
       - name: Upload relay logs
         if: failure()
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
diff --git a/.release/desktop-candidate.json b/.release/desktop-candidate.json
index cc2c2670191..843ac0dd7d7 100644
--- a/.release/desktop-candidate.json
+++ b/.release/desktop-candidate.json
@@ -1,8 +1,10 @@
 {
-  "schema": 1,
-  "version": "0.5.5",
-  "base_sha": "25a9cf1be6d245fbd7373cb1160dbc790baf5bd5",
-  "previous_tag": "desktop-v0.5.4",
-  "tag": "desktop-v0.5.5",
-  "commit_count": 44
+  "schema": 2,
+  "version": "0.5.8",
+  "base_sha": "6a17d035f79ad582ca3f4f3cdc38d376f2c4087f",
+  "previous_tag": "desktop-v0.5.7",
+  "previous_base_sha": "74b913cff8512c015dc6f1a7473b253fa803f954",
+  "previous_merge_sha": "13c9e900c84cac1e2c8eeb7551bd1510ecb544d3",
+  "tag": "desktop-v0.5.8",
+  "commit_count": 4
 }
diff --git a/AGENTS.md b/AGENTS.md
index 571871c3a45..2d3939bbb36 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -100,10 +100,11 @@ Run `just test` for integration tests if you touched `buzz-relay`,
 formatting via `stage_fixed`. Pre-commit runs fix variants in parallel (Rust
 fmt, Tauri Rust fmt, desktop biome fix, web biome fix, mobile dart format).
 Auto-fixable issues are fixed and re-staged; unfixable lint issues block the
-commit. **Pre-push hooks** run clippy (workspace + Tauri) and fast unit tests
-in parallel (Rust, desktop JS, Tauri Rust, mobile Flutter) — no overlap with
-pre-commit. Builds are CI-only. Run `just fix-all` to auto-fix all formatting
-in one shot. Run `just ci` for the full local gate. Run `just hooks` to
+commit. **Pre-push hooks** run clippy (workspace + Tauri), desktop TypeScript
+typechecking (`tsc --noEmit`), and fast unit tests in parallel (Rust, desktop
+JS, Tauri Rust, mobile Flutter) — no overlap with pre-commit. Builds are
+CI-only. Run `just fix-all` to auto-fix all formatting in one shot. Run
+`just ci` for the full local gate. Run `just hooks` to
 re-install hooks after env changes. Before agents run Git or hooks, activate the
 repo's Hermit environment (`. ./bin/activate-hermit`); do not rewrite hook
 commands to compensate for an unconfigured shell `PATH`.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 171f260d3e9..7ca95250749 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,118 @@
 # Changelog
 
+## v0.5.8
+
+### Desktop and shared changes
+
+- feat(desktop): unify add agent flows ([#5015](https://github.com/block/buzz/pull/5015)) ([`02f640bc4559c48ac0c2ec595ef34dd2c294b0db`](https://github.com/block/buzz/commit/02f640bc4559c48ac0c2ec595ef34dd2c294b0db))
+- fix(buzz-agent): budget summarizer reasoning separately so it cannot starve the handoff summary ([#5248](https://github.com/block/buzz/pull/5248)) ([`c7b663680a29a837dbd2fdde810f239f3d303025`](https://github.com/block/buzz/commit/c7b663680a29a837dbd2fdde810f239f3d303025))
+
+### Other repository changes
+
+- Revert "fix(acp): reject unattended permission requests" ([#5323](https://github.com/block/buzz/pull/5323)) ([`6a17d035f79ad582ca3f4f3cdc38d376f2c4087f`](https://github.com/block/buzz/commit/6a17d035f79ad582ca3f4f3cdc38d376f2c4087f))
+- infra: bind development services to loopback ([#4871](https://github.com/block/buzz/pull/4871)) ([`65834d68d0d3441c4e628540d6d5c8b0a2e757c9`](https://github.com/block/buzz/commit/65834d68d0d3441c4e628540d6d5c8b0a2e757c9))
+
+[Compare desktop-v0.5.7...desktop-v0.5.8](https://github.com/block/buzz/compare/desktop-v0.5.7...desktop-v0.5.8)
+
+## v0.5.7
+
+### Desktop and shared changes
+
+- fix(desktop): isolate relay admission tests ([#5221](https://github.com/block/buzz/pull/5221)) ([`74b913cff8512c015dc6f1a7473b253fa803f954`](https://github.com/block/buzz/commit/74b913cff8512c015dc6f1a7473b253fa803f954))
+- fix(desktop): externalize boot <style> to prevent Tauri CSP nonce override ([#5242](https://github.com/block/buzz/pull/5242)) ([`dcc1231d6d6935819597bc42f7bc59fa0a47c8e5`](https://github.com/block/buzz/commit/dcc1231d6d6935819597bc42f7bc59fa0a47c8e5))
+- fix(desktop): let imported and recovered identities finish onboarding ([#5228](https://github.com/block/buzz/pull/5228)) ([`a5a9240241ad584c839f79af546df9bf0216ca1f`](https://github.com/block/buzz/commit/a5a9240241ad584c839f79af546df9bf0216ca1f))
+- Recover from max-token response truncation ([#5223](https://github.com/block/buzz/pull/5223)) ([`2b873cf208bf2143bfdb77dbe34b04edcdb723a1`](https://github.com/block/buzz/commit/2b873cf208bf2143bfdb77dbe34b04edcdb723a1))
+
+### Other repository changes
+
+- fix(mobile): keep latest messages above composer ([#4981](https://github.com/block/buzz/pull/4981)) ([`07999425dca4a94ca0dea4f47d674661ea52fac3`](https://github.com/block/buzz/commit/07999425dca4a94ca0dea4f47d674661ea52fac3))
+
+[Compare desktop-v0.5.6...desktop-v0.5.7](https://github.com/block/buzz/compare/desktop-v0.5.6...desktop-v0.5.7)
+
+## v0.5.6
+
+### Desktop and shared changes
+
+- fix(sdk): preserve self-mention p tags in message and forum event builders ([#4975](https://github.com/block/buzz/pull/4975)) ([`78c87ae20e182fffdd99744d6c9ff99df82b159c`](https://github.com/block/buzz/commit/78c87ae20e182fffdd99744d6c9ff99df82b159c))
+- bump @tauri-apps/cli to ~2.11.4 to fix linux app icon issue ([#4858](https://github.com/block/buzz/pull/4858)) ([`c3c39cc263daefceb21aa73b1196699445829fe4`](https://github.com/block/buzz/commit/c3c39cc263daefceb21aa73b1196699445829fe4))
+- feat(desktop): adding rich link previews to messages ([#3818](https://github.com/block/buzz/pull/3818)) ([`1922d49cb200a3382a91ec253f530b44dfda5f55`](https://github.com/block/buzz/commit/1922d49cb200a3382a91ec253f530b44dfda5f55))
+- fix(buzz-agent): Responses reasoning summary, Anthropic display:summarized, ACP v2 messageId ([#5195](https://github.com/block/buzz/pull/5195)) ([`742e8d11974498a6ed71c70dd87dc6c25fcbf2b7`](https://github.com/block/buzz/commit/742e8d11974498a6ed71c70dd87dc6c25fcbf2b7))
+- fix(desktop): retain distinct agent instances in autocomplete ([#5202](https://github.com/block/buzz/pull/5202)) ([`e9925db54e04db2f72c9ba6af5ecb6e2976d6269`](https://github.com/block/buzz/commit/e9925db54e04db2f72c9ba6af5ecb6e2976d6269))
+- fix(desktop): defer channel visibility change to Save ([#5203](https://github.com/block/buzz/pull/5203)) ([`ef2ecaf8730b4f04bc370cfaa2370cf074507154`](https://github.com/block/buzz/commit/ef2ecaf8730b4f04bc370cfaa2370cf074507154))
+- feat(desktop): Projects follow-ups — access restrictions, fast loading, activity feed polish ([#5073](https://github.com/block/buzz/pull/5073)) ([`fb73561e64e8adc2cfbbd8f17e52d787e046b801`](https://github.com/block/buzz/commit/fb73561e64e8adc2cfbbd8f17e52d787e046b801))
+- fix(desktop): drop unhandled rejection from throwing window.Notification ([#5143](https://github.com/block/buzz/pull/5143)) ([`e47894a133c2a685efd7aca5dd210daad8cd13b8`](https://github.com/block/buzz/commit/e47894a133c2a685efd7aca5dd210daad8cd13b8))
+- fix(desktop): fence localStorage SecurityError from killing the React tree ([#5142](https://github.com/block/buzz/pull/5142)) ([`8630e58eb03480c262111c2544194b30b10af772`](https://github.com/block/buzz/commit/8630e58eb03480c262111c2544194b30b10af772))
+- fix(desktop): make terminal output selectable ([#4980](https://github.com/block/buzz/pull/4980)) ([`cc9a2f783375e51a6e8d1f2f9d01d5f7e22813d1`](https://github.com/block/buzz/commit/cc9a2f783375e51a6e8d1f2f9d01d5f7e22813d1))
+- fix(desktop): use WEBKIT_DMABUF_RENDERER_FORCE_SHM for NVIDIA/AppImage (#3654) ([#4505](https://github.com/block/buzz/pull/4505)) ([`60ae74b656a8e612d726575521c75cba4433e688`](https://github.com/block/buzz/commit/60ae74b656a8e612d726575521c75cba4433e688))
+- Make public starter channels best effort ([#5192](https://github.com/block/buzz/pull/5192)) ([`daa887758101e11f07650e897341e653ff8b2398`](https://github.com/block/buzz/commit/daa887758101e11f07650e897341e653ff8b2398))
+- Remove agent creation success modal ([#5063](https://github.com/block/buzz/pull/5063)) ([`c8743b2f204519df8001e1b5bbd270159eeb4aed`](https://github.com/block/buzz/commit/c8743b2f204519df8001e1b5bbd270159eeb4aed))
+- fix(buzz-agent): escalate LLM timeouts per retry and log per-call latency ([#5130](https://github.com/block/buzz/pull/5130)) ([`346ae8cadca3c872242e2858bb87ce31a0eb5bf6`](https://github.com/block/buzz/commit/346ae8cadca3c872242e2858bb87ce31a0eb5bf6))
+- fix(agent): resolve oauth cache home cross-platform ([#5151](https://github.com/block/buzz/pull/5151)) ([`c293b3cd4027775d7580cafd5108a0b22ca7381b`](https://github.com/block/buzz/commit/c293b3cd4027775d7580cafd5108a0b22ca7381b))
+- Improve video review readiness and controls ([#5161](https://github.com/block/buzz/pull/5161)) ([`cd2125c34b1ac182698acb29bb3334c5d4884e96`](https://github.com/block/buzz/commit/cd2125c34b1ac182698acb29bb3334c5d4884e96))
+- Polish advanced agent setup and Welcome composer ([#4926](https://github.com/block/buzz/pull/4926)) ([`c71f6585391421843b552150cef2d927966ee3ba`](https://github.com/block/buzz/commit/c71f6585391421843b552150cef2d927966ee3ba))
+- fix(media): require authenticated reads ([#4610](https://github.com/block/buzz/pull/4610)) ([`769ac70b741e3ad6809bff14eba29d3dd2cbd318`](https://github.com/block/buzz/commit/769ac70b741e3ad6809bff14eba29d3dd2cbd318))
+- fix(desktop): preserve authoritative agent avatars ([#4984](https://github.com/block/buzz/pull/4984)) ([`f03de210cd0e384870aaa00cb1fa6985a75640ff`](https://github.com/block/buzz/commit/f03de210cd0e384870aaa00cb1fa6985a75640ff))
+- fix(desktop): next/back navigation during key creation onboarding ([#4978](https://github.com/block/buzz/pull/4978)) ([`67b77344d61fa663411f99a9518296f31969078e`](https://github.com/block/buzz/commit/67b77344d61fa663411f99a9518296f31969078e))
+- Alert community owners and admins when a new key joins ([#4900](https://github.com/block/buzz/pull/4900)) ([`1399ec1d13c4560f50fd947e504deeea70929751`](https://github.com/block/buzz/commit/1399ec1d13c4560f50fd947e504deeea70929751))
+- fix(desktop): prevent sidebar prefs from reverting on stale-localStorage boot ([#5086](https://github.com/block/buzz/pull/5086)) ([`b08c8b126cee8de424eb0c03af22a45ff9a1e8a7`](https://github.com/block/buzz/commit/b08c8b126cee8de424eb0c03af22a45ff9a1e8a7))
+- feat(identity): recover desktop identity from a signed-in phone ([#4845](https://github.com/block/buzz/pull/4845)) ([`6eb65919f1eabd46b3850c15eefab31092dd500b`](https://github.com/block/buzz/commit/6eb65919f1eabd46b3850c15eefab31092dd500b))
+- fix(buzz-agent): classify read timeouts distinctly in LLM error messages ([#4959](https://github.com/block/buzz/pull/4959)) ([`bd2fdf4a2f8e00ec25ddc2372b39958b8df77176`](https://github.com/block/buzz/commit/bd2fdf4a2f8e00ec25ddc2372b39958b8df77176))
+- Refine agent runtime controls ([#5026](https://github.com/block/buzz/pull/5026)) ([`6ca9641a9555e48f99b3ebccc123ca8c25648a45`](https://github.com/block/buzz/commit/6ca9641a9555e48f99b3ebccc123ca8c25648a45))
+- test(desktop): await thread scroll anchor ([#3174](https://github.com/block/buzz/pull/3174)) ([`9213090f6076bf3b7667b9b984752b3e47ef8f2f`](https://github.com/block/buzz/commit/9213090f6076bf3b7667b9b984752b3e47ef8f2f))
+- Improve desktop mobile pairing flow ([#5024](https://github.com/block/buzz/pull/5024)) ([`480c41ebf1173dfe923bf59774dc283b046211fc`](https://github.com/block/buzz/commit/480c41ebf1173dfe923bf59774dc283b046211fc))
+- feat(desktop): show selected community in rail ([#5000](https://github.com/block/buzz/pull/5000)) ([`5babb97ca3b9c9d640f7dcdfdef456178e868ff7`](https://github.com/block/buzz/commit/5babb97ca3b9c9d640f7dcdfdef456178e868ff7))
+- fix(desktop): stop rate-limited reconnect backfill from tearing down the authenticated socket ([#4990](https://github.com/block/buzz/pull/4990)) ([`19b41e9c8edafb02159e597935a8c41f1b6493a2`](https://github.com/block/buzz/commit/19b41e9c8edafb02159e597935a8c41f1b6493a2))
+- fix(desktop): skip native notifications outside app bundles ([#5004](https://github.com/block/buzz/pull/5004)) ([`96ae141763e5459beb68a847e0082e931af72f4c`](https://github.com/block/buzz/commit/96ae141763e5459beb68a847e0082e931af72f4c))
+- fix(desktop): virtualize channel member lists ([#4991](https://github.com/block/buzz/pull/4991)) ([`e2796d4a8907586b457a65675c2c88c818973173`](https://github.com/block/buzz/commit/e2796d4a8907586b457a65675c2c88c818973173))
+- fix(desktop): enforce owner-only access in internal builds ([#4053](https://github.com/block/buzz/pull/4053)) ([`16cc3de6d6bb23ebdc3a928172fb585494079232`](https://github.com/block/buzz/commit/16cc3de6d6bb23ebdc3a928172fb585494079232))
+- test(desktop): match attachment button label ([#4993](https://github.com/block/buzz/pull/4993)) ([`5677e4ca050bcfe2aef16b89f7abe326e45d0b0d`](https://github.com/block/buzz/commit/5677e4ca050bcfe2aef16b89f7abe326e45d0b0d))
+- fix(acp): pace observer telemetry at 1/s with per-channel batch envelopes ([#4917](https://github.com/block/buzz/pull/4917)) ([`4da7264d9070ae48c755819598294c9de44c6d3d`](https://github.com/block/buzz/commit/4da7264d9070ae48c755819598294c9de44c6d3d))
+- fix(desktop): enable the content security policy ([#4614](https://github.com/block/buzz/pull/4614)) ([`a7ea86cdcf2aa3cbb1486baabc4c9d6aea8c576c`](https://github.com/block/buzz/commit/a7ea86cdcf2aa3cbb1486baabc4c9d6aea8c576c))
+- fix(desktop): enable message editing in Inbox ([#2198](https://github.com/block/buzz/pull/2198)) ([`eb6a37569df2fcee5bd37e2ce9341181cdd2a10a`](https://github.com/block/buzz/commit/eb6a37569df2fcee5bd37e2ce9341181cdd2a10a))
+- fix(desktop): outline the selected community ([#4969](https://github.com/block/buzz/pull/4969)) ([`005fe54d026a9844d22a26f0d482de6de5580b29`](https://github.com/block/buzz/commit/005fe54d026a9844d22a26f0d482de6de5580b29))
+- fix(desktop): clamp thread panel to channel surface ([#4965](https://github.com/block/buzz/pull/4965)) ([`24c79957403d2b3a58a8e0450020e59212307896`](https://github.com/block/buzz/commit/24c79957403d2b3a58a8e0450020e59212307896))
+- style(messages): increase username contrast ([#4948](https://github.com/block/buzz/pull/4948)) ([`cda33978b1fc86237ae54e150840df9dd513b1c7`](https://github.com/block/buzz/commit/cda33978b1fc86237ae54e150840df9dd513b1c7))
+- fix(desktop): rename generic attachment action from 'Attach image' to 'Attach file' (#2381) ([#4304](https://github.com/block/buzz/pull/4304)) ([`d42d60d64e983c13c7dd2c0ed5af7ca3af8ea79a`](https://github.com/block/buzz/commit/d42d60d64e983c13c7dd2c0ed5af7ca3af8ea79a))
+- fix(reactions): support max-length custom emoji ([#3833](https://github.com/block/buzz/pull/3833)) ([`2ea9385015fb922de2adf0a53e86fc5a21d07b90`](https://github.com/block/buzz/commit/2ea9385015fb922de2adf0a53e86fc5a21d07b90))
+- feat(desktop): allow leaving your final community ([#3621](https://github.com/block/buzz/pull/3621)) ([`719f9730d46541f816946bba8d693e11ff49b439`](https://github.com/block/buzz/commit/719f9730d46541f816946bba8d693e11ff49b439))
+- fix(buzz-agent): recover from context-window 400s instead of sticking ([#4946](https://github.com/block/buzz/pull/4946)) ([`ed4b3e7afafb5f5a688c210f39b90d747e6f0f00`](https://github.com/block/buzz/commit/ed4b3e7afafb5f5a688c210f39b90d747e6f0f00))
+- docs(persona-pack): fix stale desktop import instructions ([#4500](https://github.com/block/buzz/pull/4500)) ([`ccdaa161613ba362369340ebdad9aaacd624eab8`](https://github.com/block/buzz/commit/ccdaa161613ba362369340ebdad9aaacd624eab8))
+- fix(desktop): route macos notification clicks ([#4799](https://github.com/block/buzz/pull/4799)) ([`7334ad1e164a050902dadfc659c82b5ef777531f`](https://github.com/block/buzz/commit/7334ad1e164a050902dadfc659c82b5ef777531f))
+- feat(desktop): sync themes per community ([#3653](https://github.com/block/buzz/pull/3653)) ([`43cced308df0f163e09d1e0d4b422338fe1502de`](https://github.com/block/buzz/commit/43cced308df0f163e09d1e0d4b422338fe1502de))
+- feat(desktop): cap OpenClaw agent parallelism at 5 ([#4019](https://github.com/block/buzz/pull/4019)) ([`6c40ce394f860d832b74323bd9b5ca70c46c1285`](https://github.com/block/buzz/commit/6c40ce394f860d832b74323bd9b5ca70c46c1285))
+- fix(buzz-agent): scope handoff cap per turn, not per session lifetime ([#4805](https://github.com/block/buzz/pull/4805)) ([`6df7eba24d49b6a2c7f0188b19e24f3df999678c`](https://github.com/block/buzz/commit/6df7eba24d49b6a2c7f0188b19e24f3df999678c))
+- Fix media attachment actions ([#4849](https://github.com/block/buzz/pull/4849)) ([`f2ce575b62f8a6dfee444263da00d1aa8419d92f`](https://github.com/block/buzz/commit/f2ce575b62f8a6dfee444263da00d1aa8419d92f))
+- fix(desktop): remove join API token control ([#4897](https://github.com/block/buzz/pull/4897)) ([`2034e693a8b021eb02108d6bc47f409900c40848`](https://github.com/block/buzz/commit/2034e693a8b021eb02108d6bc47f409900c40848))
+- fix(desktop): allow shared agent mentions ([#4913](https://github.com/block/buzz/pull/4913)) ([`014562c063eae6ab1b7c6e3d20f2be3024c5f3a8`](https://github.com/block/buzz/commit/014562c063eae6ab1b7c6e3d20f2be3024c5f3a8))
+- fix(channels): restrict private-channel invitations ([#4612](https://github.com/block/buzz/pull/4612)) ([`efe1893dd372cfb92ed2e8a3ada2ed7b62c9477a`](https://github.com/block/buzz/commit/efe1893dd372cfb92ed2e8a3ada2ed7b62c9477a))
+- fix(agent): recover from unsupported image input instead of poisoning the turn ([#4896](https://github.com/block/buzz/pull/4896)) ([`8a7eb8d3d71cd6ecc988963b36ff5777715f33ef`](https://github.com/block/buzz/commit/8a7eb8d3d71cd6ecc988963b36ff5777715f33ef))
+- Define private managed agent wire protocol ([#4593](https://github.com/block/buzz/pull/4593)) ([`067c085f37d9dcb2f598b0e2a6b6653903364783`](https://github.com/block/buzz/commit/067c085f37d9dcb2f598b0e2a6b6653903364783))
+- fix(desktop): make missing-command error actionable for released builds ([#4802](https://github.com/block/buzz/pull/4802)) ([`6dbc94651201154ceb88c1b54653bf6e8ca77518`](https://github.com/block/buzz/commit/6dbc94651201154ceb88c1b54653bf6e8ca77518))
+
+### Other repository changes
+
+- refactor(cli): replace probe/decider/detail split with single typed extractor ([#5191](https://github.com/block/buzz/pull/5191)) ([`b2ac66cde81df7ce1afc50016e1571cb6e8b7779`](https://github.com/block/buzz/commit/b2ac66cde81df7ce1afc50016e1571cb6e8b7779))
+- Mobile: add anchored reaction popover ([#5025](https://github.com/block/buzz/pull/5025)) ([`8476ea05e7d27ea9e4bab0b6c31a42c6552c772a`](https://github.com/block/buzz/commit/8476ea05e7d27ea9e4bab0b6c31a42c6552c772a))
+- feat(mobile): add bee pull-to-refresh ([#5059](https://github.com/block/buzz/pull/5059)) ([`626e2c34a34027d24512b2397bd99757c1a82ef3`](https://github.com/block/buzz/commit/626e2c34a34027d24512b2397bd99757c1a82ef3))
+- fix(cli): emit structured JSON warning when archive/unarchive owner-auth extraction fails ([#4824](https://github.com/block/buzz/pull/4824)) ([`ee9690a93c315d7049e9f7a4def05191c398303c`](https://github.com/block/buzz/commit/ee9690a93c315d7049e9f7a4def05191c398303c))
+- fix(bench): mention the orchestrator by pubkey when posting the task ([#5136](https://github.com/block/buzz/pull/5136)) ([`f53bbd1152464ecbb1de495e2d1d959e156138f0`](https://github.com/block/buzz/commit/f53bbd1152464ecbb1de495e2d1d959e156138f0))
+- feat(relay): accept kind:30179 private managed-agent events at ingest ([#5133](https://github.com/block/buzz/pull/5133)) ([`ad923353a24b784df13a7c88757d6b24ebe36299`](https://github.com/block/buzz/commit/ad923353a24b784df13a7c88757d6b24ebe36299))
+- chore(hooks): run desktop typecheck in pre-push ([#5110](https://github.com/block/buzz/pull/5110)) ([`c777d4fb9af4c3f66009ee3216650d9ea30310d7`](https://github.com/block/buzz/commit/c777d4fb9af4c3f66009ee3216650d9ea30310d7))
+- ci: prove the relay-driven mesh lifecycle — discover, join, infer, deny — with real nodes ([#3862](https://github.com/block/buzz/pull/3862)) ([`38bf642fcfa7a9fc1e06d6cf87d66ae94da29341`](https://github.com/block/buzz/commit/38bf642fcfa7a9fc1e06d6cf87d66ae94da29341))
+- fix(mobile): merge relay recounts with locally seen thread replies ([#4633](https://github.com/block/buzz/pull/4633)) ([`06b60e682d5dd78e6cdcb8e93fe96c7ec4391e2a`](https://github.com/block/buzz/commit/06b60e682d5dd78e6cdcb8e93fe96c7ec4391e2a))
+- relay: fuzz WebSocket 1012 restart-close timing on graceful drain (BUZZ_DRAIN_JITTER_MS) ([#4542](https://github.com/block/buzz/pull/4542)) ([`e14fff74d00623acd30945eec5be366e25b0cf09`](https://github.com/block/buzz/commit/e14fff74d00623acd30945eec5be366e25b0cf09))
+- feat(mobile): sync themes per community ([#3767](https://github.com/block/buzz/pull/3767)) ([`05150c11883b9064cb5187c39568d41a35d4a780`](https://github.com/block/buzz/commit/05150c11883b9064cb5187c39568d41a35d4a780))
+- Fix mobile message timeline bounce ([#4862](https://github.com/block/buzz/pull/4862)) ([`0c6842931b46c5c12f0f05ecc37af03de502a644`](https://github.com/block/buzz/commit/0c6842931b46c5c12f0f05ecc37af03de502a644))
+- Polish mobile bottom sheets and profile cards ([#4911](https://github.com/block/buzz/pull/4911)) ([`27b51144f3002fb2b70229ff8171d940d79b7da7`](https://github.com/block/buzz/commit/27b51144f3002fb2b70229ff8171d940d79b7da7))
+- Polish mobile top navigation ([#4778](https://github.com/block/buzz/pull/4778)) ([`ff0b7982f1af694056acbb0e2f8c40faefc39c45`](https://github.com/block/buzz/commit/ff0b7982f1af694056acbb0e2f8c40faefc39c45))
+- fix(release): tag immutable desktop candidates ([#4811](https://github.com/block/buzz/pull/4811)) ([`4674750b7ee1b3a6b299b79d69f11a8ec5128f26`](https://github.com/block/buzz/commit/4674750b7ee1b3a6b299b79d69f11a8ec5128f26))
+- fix(acp): reject unattended permission requests ([#4609](https://github.com/block/buzz/pull/4609)) ([`ad538bfb1e6bfebcb03afaf4dd4d22323e7e62bd`](https://github.com/block/buzz/commit/ad538bfb1e6bfebcb03afaf4dd4d22323e7e62bd))
+- fix(workflow): bind trigger author to the signed event ([#4607](https://github.com/block/buzz/pull/4607)) ([`885bed35eee3f933c48d333c8979fdbc038e98b9`](https://github.com/block/buzz/commit/885bed35eee3f933c48d333c8979fdbc038e98b9))
+- fix(git): revoke access for banned relay members ([#4608](https://github.com/block/buzz/pull/4608)) ([`997b8caaa4c9e5af69dd8a496b4995d09a69f694`](https://github.com/block/buzz/commit/997b8caaa4c9e5af69dd8a496b4995d09a69f694))
+- fix(mobile): serialize channel sections sync ([#3165](https://github.com/block/buzz/pull/3165)) ([`dc17965c792fc9f9d4d9e70028980821d5d89c71`](https://github.com/block/buzz/commit/dc17965c792fc9f9d4d9e70028980821d5d89c71))
+
+[Compare desktop-v0.5.5...desktop-v0.5.6](https://github.com/block/buzz/compare/desktop-v0.5.5...desktop-v0.5.6)
+
 ## v0.5.5
 
 ### Desktop and shared changes
diff --git a/Cargo.lock b/Cargo.lock
index 73ecb249d48..ac4ea620bb6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -117,7 +117,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -128,14 +128,14 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
+checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
 [[package]]
 name = "appattest"
@@ -172,9 +172,9 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "1.9.1"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
+checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
 dependencies = [
  "rustversion",
 ]
@@ -235,9 +235,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac"
+checksum = "3976abdc8fe7d1133d43d304afd42abdf5bc3e1319d263d223bde07b5efc4be8"
 dependencies = [
  "compression-codecs",
  "compression-core",
@@ -329,13 +329,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.89"
+version = "0.1.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+checksum = "ae36dc4177970ef04fde5178d3e2429882def40e57a451f919c098f72baa6cec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -862,6 +862,7 @@ dependencies = [
  "async-trait",
  "axum",
  "base64 0.22.1",
+ "dirs",
  "getrandom 0.4.3",
  "hex",
  "nix 0.31.3",
@@ -1179,7 +1180,7 @@ dependencies = [
 
 [[package]]
 name = "buzz-relay"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -1556,9 +1557,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.6.1"
+version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
+checksum = "473c7e07f409a8d772161724aa8db6a765a2532a70f9667eeb7b49d3d02fbdca"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1566,9 +1567,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.6.0"
+version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
+checksum = "7b48fea5a88e9ae728a2dcbedbfc0e730f7d60da42e1cb049a83c9fb8b789889"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1578,14 +1579,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.6.1"
+version = "4.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
+checksum = "d012d2b9d65aca7f18f4d9878a045bc17899bba951561ba5ec3c2ba1eed9a061"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -1636,7 +1637,7 @@ version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2284,7 +2285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccc2776f0c61eca1ca32528f85548abd1a4be8fb53d1b21c013e4f18da1e7090"
 dependencies = [
  "data-encoding",
- "syn 2.0.117",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2447,9 +2448,9 @@ checksum = "ab03c107fafeb3ee9f5925686dbb7a73bc76e3932abb0d2b365cb64b169cf04c"
 
 [[package]]
 name = "diffy"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05264ab2aab4fb952fc4b0f3f6eff1ddfb4563064053a4ea174d91537584a769"
+checksum = "10aec8f7f9393bd6a4f2762be0ceb012d3cbe2478987258cc9960de148561914"
 dependencies = [
  "hashbrown 0.17.1",
 ]
@@ -2495,7 +2496,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2733,7 +2734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3139,7 +3140,7 @@ dependencies = [
  "libc",
  "log",
  "rustversion",
- "windows-link 0.2.1",
+ "windows-link 0.1.3",
  "windows-result 0.4.1",
 ]
 
@@ -5901,7 +5902,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -8041,7 +8042,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -8100,7 +8101,7 @@ dependencies = [
  "security-framework 3.7.0",
  "security-framework-sys",
  "webpki-root-certs",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -8372,7 +8373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -8867,7 +8868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -9379,6 +9380,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"
@@ -9484,7 +9496,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix 1.1.4",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -9497,7 +9509,7 @@ dependencies = [
  "parking_lot",
  "rustix 1.1.4",
  "signal-hook",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -10233,7 +10245,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
 dependencies = [
  "memoffset",
  "tempfile",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -10811,7 +10823,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/TESTING.md b/TESTING.md
index 764b86d408c..7c107da5754 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -277,7 +277,6 @@ out of the box with `just setup` or `just relay`. Common overrides:
 | `REDIS_URL`                       | `redis://localhost:6379`    | |
 | `BUZZ_REQUIRE_AUTH_TOKEN`       | `false`                     | When true, REST requires NIP-98 (no `X-Pubkey` fallback) |
 | `BUZZ_REQUIRE_RELAY_MEMBERSHIP` | `false`                     | When true, only pubkeys in `relay_members` can connect |
-| `BUZZ_REQUIRE_MEDIA_GET_AUTH`   | `false`                     | When true, `GET`/`HEAD /media/*` require Blossom kind 24242 `t=get` auth plus relay membership. |
 | `BUZZ_DRAIN_JITTER_MS`          | `0` (off)                   | Per-connection upper bound, in ms, for the random delay before each live WebSocket gets its `1012 Service Restart` close on graceful shutdown. `0` closes every socket at once (the previous behavior). A positive value spreads closes uniformly over `[1, value]` ms to avoid a reconnect thundering herd on rolling deploys. Values above `20000` are capped to `20000` (`MAX_DRAIN_JITTER_MS`) to leave close-frame delivery headroom under the relay's 30s hard-drain timeout. Empty or whitespace-only is treated as unset (off); a non-integer fails startup loudly. |
 | `BUZZ_AUDIT_ENABLED`            | `true`                      | Tamper-evident event/media audit log. Set `false`/`0`/`off` to skip its DB pool and writes. Does not disable the separate moderation audit trail. |
 | `BUZZ_AUTO_MIGRATE`             | `false`                     | Opt in with `true`/`1`/`yes`/`on` to run embedded SQLx migrations on relay startup |
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 149a5295a7a..a0602111d13 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
@@ -24,7 +24,7 @@
 from .provisioning import AgentCredential, TrialHandle
 from .runtime import RuntimeResult
 
-DEFAULT_MAX_AGENT_ROUNDS = 32
+DEFAULT_MAX_AGENT_ROUNDS = 0  # 0 = unbounded (BUZZ_AGENT_MAX_ROUNDS=0); the trial budget is the clock
 # Container-side layout for the uploaded Buzz stack.
 REMOTE_ROOT = "/opt/buzz"
 REMOTE_BIN = f"{REMOTE_ROOT}/bin"
@@ -80,8 +80,8 @@ def __init__(
         readiness_timeout_seconds: float = 60.0,
         poll_seconds: float = 1.0,
     ) -> None:
-        if max_agent_rounds <= 0:
-            raise ValueError("max_agent_rounds must be positive")
+        if max_agent_rounds < 0:
+            raise ValueError("max_agent_rounds must be >= 0 (0 = unbounded)")
         if readiness_timeout_seconds <= 0:
             raise ValueError("readiness_timeout_seconds must be positive")
         self.logs_dir = Path(logs_dir)
@@ -157,9 +157,17 @@ async def run(
             )
             # The task arrives exactly as it would in production Buzz: a
             # user prompt @mentioning the orchestrator. The harness never
-            # speaks as any agent.
+            # speaks as any agent. The orchestrator is mentioned by pubkey,
+            # not by name resolution: task text is untrusted payload, and any
+            # @-token inside it (e.g. Vim's `:%normal! @a`) would otherwise
+            # fail member resolution and kill the trial before the agent
+            # ever saw the task. An explicit --mention demotes unresolved
+            # @-tokens in the text to presentation-only.
             await self._send(
-                trial.user, trial, f"@{orchestrator.agent_id} {instruction}"
+                trial.user,
+                trial,
+                f"@{orchestrator.agent_id} {instruction}",
+                mention=orchestrator.nostr_pubkey,
             )
             final_message = await asyncio.wait_for(
                 self._wait_for_done(environment, orchestrator, trial, agents + infra),
@@ -519,18 +527,24 @@ async def _verify_m1_output(
             )
 
     async def _send(
-        self, credential: AgentCredential, trial: TrialHandle, content: str
+        self,
+        credential: AgentCredential,
+        trial: TrialHandle,
+        content: str,
+        *,
+        mention: str | None = None,
     ) -> None:
-        await self._buzz_json(
-            credential,
-            trial,
+        args = [
             "messages",
             "send",
             "--channel",
             trial.channel_id,
             "--content",
             content,
-        )
+        ]
+        if mention is not None:
+            args += ["--mention", mention]
+        await self._buzz_json(credential, trial, *args)
 
     async def _buzz_json(
         self, credential: AgentCredential, trial: TrialHandle, *args: str
diff --git a/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py b/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
index ebf0eb4b5d2..c0f5beeef22 100644
--- a/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
+++ b/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
@@ -247,7 +247,7 @@ async def test_forwarder_bridges_the_canonical_relay_address(tmp_path):
         rt._ws_authority("http://relay")
 
 
-@pytest.mark.parametrize(("configured", "expected"), [(None, "32"), (7, "7")])
+@pytest.mark.parametrize(("configured", "expected"), [(None, "0"), (7, "7")])
 async def test_launch_wires_the_desktop_environment(tmp_path, configured, expected):
     manifest = write_manifest(tmp_path)
     agent_class = manifest.roster[0]
@@ -290,9 +290,12 @@ async def test_launch_wires_the_desktop_environment(tmp_path, configured, expect
     )
 
 
-def test_runtime_rejects_unbounded_agent_rounds(tmp_path):
-    with pytest.raises(ValueError, match="positive"):
-        runtime(tmp_path, max_agent_rounds=0)
+def test_runtime_validates_construction_bounds(tmp_path):
+    # 0 is legal and means unbounded (BUZZ_AGENT_MAX_ROUNDS=0); the trial
+    # budget is the clock. Only negatives are rejected.
+    runtime(tmp_path, max_agent_rounds=0)
+    with pytest.raises(ValueError, match="unbounded"):
+        runtime(tmp_path, max_agent_rounds=-1)
     with pytest.raises(ValueError, match="positive"):
         runtime(tmp_path, readiness_timeout_seconds=0)
 
@@ -372,6 +375,37 @@ async def test_m1_output_probe_matches_grader_and_is_condition_scoped(
     assert bool(probed) == (condition == "M1-hello-world")
 
 
+async def test_send_mentions_by_pubkey_so_task_text_stays_inert(
+    tmp_path, monkeypatch
+):
+    """Task text is untrusted payload: `:%normal! @a` in a task statement must
+    not be fed to member-name resolution (it would fail and kill the trial).
+    An explicit --mention pins delivery to the orchestrator's pubkey."""
+    rt = runtime(tmp_path)
+    orch = credential("orch-1", "orchestrator", "orch-model")
+    trial = trial_handle((orch,))
+    calls = []
+
+    async def buzz_json(credential, trial, *args):
+        calls.append(args)
+        return {}
+
+    monkeypatch.setattr(rt, "_buzz_json", buzz_json)
+
+    await rt._send(
+        trial.user,
+        trial,
+        "@orch-1 run `:%normal! @a` on the file",
+        mention=orch.nostr_pubkey,
+    )
+    assert calls[-1][-2:] == ("--mention", "pubkey-orch-1")
+
+    # Without an explicit mention the send is unchanged (name resolution).
+    await rt._send(trial.user, trial, "plain content")
+    assert "--mention" not in calls[-1]
+    assert calls[-1][-2:] == ("--content", "plain content")
+
+
 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")
diff --git a/crates/buzz-acp/src/acp.rs b/crates/buzz-acp/src/acp.rs
index 93109fa94df..700d5e8dcfd 100644
--- a/crates/buzz-acp/src/acp.rs
+++ b/crates/buzz-acp/src/acp.rs
@@ -155,7 +155,7 @@ pub struct AcpClient {
     /// a `cancelled` outcome before the agent returns from `session/prompt`.
     pending_permission_id: Option<serde_json::Value>,
     /// Whether we have already sent a response to the pending permission request.
-    /// Guards against double-response if a timeout fires after the rejection
+    /// Guards against double-response if a timeout fires after the allow_once
     /// response was written but before `pending_permission_id` was cleared.
     permission_responded: bool,
     /// The JSON-RPC id of the most recently sent `session/prompt` request.
@@ -1162,8 +1162,7 @@ impl AcpClient {
     ///
     /// While waiting, handles:
     /// - `session/update` notifications → logged via tracing
-    /// - `session/request_permission` requests → rejected unless an owner has
-    ///   already selected a non-interactive permission mode at session setup
+    /// - `session/request_permission` requests → auto-approved with `allow_once`
     /// - Any other messages → debug-logged and ignored; if they carry an `id`
     ///   (i.e. they are requests, not notifications), a JSON-RPC -32601 error is sent.
     ///
@@ -1871,12 +1870,12 @@ impl AcpClient {
         }
     }
 
-    /// Reject a `session/request_permission` request from the agent.
+    /// Auto-approve a `session/request_permission` request from the agent.
     ///
-    /// Buzz has no human permission prompt in this harness, so selecting
-    /// `allow_once` would turn any admitted prompt into an implicit approval.
-    /// Find `reject_once` by kind when the adapter offers it; otherwise use the
-    /// protocol's cancelled outcome, which is also fail-closed.
+    /// Finds the option with `kind == "allow_once"` and responds with its `optionId`.
+    /// If no `allow_once` option exists, falls back to `reject_once`.
+    ///
+    /// **Critical:** Never hardcode `optionId` — always find it dynamically by `kind`.
     ///
     /// The request `id` is stored as `serde_json::Value` to support both numeric
     /// and string IDs per JSON-RPC 2.0.
@@ -1902,7 +1901,40 @@ impl AcpClient {
             options.len()
         );
 
-        let response = permission_denial_response(&id, options)?;
+        // Find allow_once by kind — NEVER hardcode optionId.
+        let allow_once = options
+            .iter()
+            .find(|opt| opt.get("kind").and_then(|k| k.as_str()) == Some("allow_once"));
+
+        let response = if let Some(opt) = allow_once {
+            let option_id = opt["optionId"]
+                .as_str()
+                .ok_or_else(|| AcpError::Protocol("allow_once option missing optionId".into()))?;
+            tracing::info!(
+                target: "acp::permission",
+                "auto-approving permission id={id} with allow_once optionId={option_id:?}"
+            );
+            permission_response_selected(&id, option_id)
+        } else {
+            // No allow_once — fall back to reject_once.
+            tracing::warn!(
+                target: "acp::permission",
+                "no allow_once option found in permission request id={id}, falling back to reject_once"
+            );
+            let reject = options
+                .iter()
+                .find(|opt| opt.get("kind").and_then(|k| k.as_str()) == Some("reject_once"));
+
+            if let Some(opt) = reject {
+                let option_id = opt["optionId"].as_str().unwrap_or("reject");
+                permission_response_selected(&id, option_id)
+            } else {
+                return Err(AcpError::Protocol(
+                    "no suitable permission option found (neither allow_once nor reject_once)"
+                        .into(),
+                ));
+            }
+        };
 
         // Write the response first, then mark as responded.
         //
@@ -2014,42 +2046,6 @@ fn permission_response_cancelled(id: &serde_json::Value) -> serde_json::Value {
     })
 }
 
-/// Choose the fail-closed response to a `session/request_permission` request.
-///
-/// Buzz has no human permission prompt in this harness, so selecting
-/// `allow_once` would turn any admitted prompt into an implicit approval.
-/// Prefer the adapter's `reject_once` option — matched by `kind`, never by a
-/// hardcoded `optionId` — and fall back to the protocol's cancelled outcome for
-/// adapters that do not offer one. Both answers deny.
-///
-/// Kept free of the client so the decision is testable without an agent
-/// subprocess: `AcpClient` owns a real `Child` and its stdio pipes.
-fn permission_denial_response(
-    id: &serde_json::Value,
-    options: &[serde_json::Value],
-) -> Result<serde_json::Value, AcpError> {
-    let reject_once = options
-        .iter()
-        .find(|opt| opt.get("kind").and_then(|k| k.as_str()) == Some("reject_once"));
-
-    let Some(opt) = reject_once else {
-        tracing::warn!(
-            target: "acp::permission",
-            "no reject_once option found in permission request id={id}, cancelling"
-        );
-        return Ok(permission_response_cancelled(id));
-    };
-
-    let option_id = opt["optionId"]
-        .as_str()
-        .ok_or_else(|| AcpError::Protocol("reject_once option missing optionId".into()))?;
-    tracing::info!(
-        target: "acp::permission",
-        "rejecting permission id={id} with reject_once optionId={option_id:?}"
-    );
-    Ok(permission_response_selected(id, option_id))
-}
-
 /// Full `session/new` response — session ID plus the raw JSON result.
 ///
 /// Callers use the extractor helpers to pull model info from `raw`.
@@ -2304,96 +2300,63 @@ mod tests {
         assert_eq!(StopReason::from_str("Refusal"), Some(StopReason::Refusal));
     }
 
-    fn options(json: &str) -> Vec<serde_json::Value> {
-        serde_json::from_str(json).expect("option list")
-    }
-
-    fn outcome(response: &serde_json::Value) -> Option<&str> {
-        response["result"]["outcome"]["outcome"].as_str()
-    }
-
-    /// The offered `allow_once` and `allow_always` options must be ignored:
-    /// there is no human to click them, so choosing either would make every
-    /// admitted prompt an implicit approval. `optionId`s are deliberately
-    /// non-obvious to prove they are matched by `kind`, never hardcoded.
     #[test]
-    fn permission_requests_select_reject_once_not_allow_once() {
-        let options = options(
+    fn find_allow_once_by_kind_not_by_option_id() {
+        // optionId values are intentionally non-obvious to prove we don't hardcode them.
+        let options: Vec<serde_json::Value> = serde_json::from_str(
             r#"[
             {"optionId": "opt-reject-42",  "name": "Reject",       "kind": "reject_once"},
             {"optionId": "opt-allow-99",   "name": "Allow once",   "kind": "allow_once"},
             {"optionId": "opt-always-7",   "name": "Always allow", "kind": "allow_always"}
         ]"#,
-        );
+        )
+        .unwrap();
 
-        let response =
-            permission_denial_response(&serde_json::json!(7), &options).expect("denial response");
+        let allow_once = options
+            .iter()
+            .find(|opt| opt.get("kind").and_then(|k| k.as_str()) == Some("allow_once"));
 
-        assert_eq!(outcome(&response), Some("selected"));
-        assert_eq!(
-            response["result"]["outcome"]["optionId"].as_str(),
-            Some("opt-reject-42"),
-            "must select reject_once even when allow options are offered"
-        );
+        assert!(allow_once.is_some(), "should find allow_once option");
+        let opt = allow_once.unwrap();
+        // Found by kind, not by hardcoded optionId
+        assert_eq!(opt["kind"].as_str(), Some("allow_once"));
+        assert_eq!(opt["optionId"].as_str(), Some("opt-allow-99"));
     }
 
-    /// Fail-closed backstop: an adapter that offers no `reject_once` must still
-    /// be denied, via the protocol's cancelled outcome rather than an error or
-    /// an approval.
     #[test]
-    fn permission_request_without_reject_once_is_cancelled() {
-        let options = options(
+    fn find_allow_once_returns_none_when_absent() {
+        let options: Vec<serde_json::Value> = serde_json::from_str(
             r#"[
-            {"optionId": "opt-allow-99", "name": "Allow once",   "kind": "allow_once"},
-            {"optionId": "opt-always-7", "name": "Always allow", "kind": "allow_always"}
+            {"optionId": "reject-1",      "name": "Reject",        "kind": "reject_once"},
+            {"optionId": "reject-always", "name": "Always reject", "kind": "reject_always"}
         ]"#,
-        );
-
-        let response = permission_denial_response(&serde_json::json!("req-1"), &options)
-            .expect("cancelled response");
-
-        assert_eq!(outcome(&response), Some("cancelled"));
-        assert_eq!(
-            response["id"].as_str(),
-            Some("req-1"),
-            "string ids must round-trip per JSON-RPC 2.0"
-        );
-    }
-
-    /// An empty option list is the degenerate form of the same backstop.
-    #[test]
-    fn permission_request_with_no_options_is_cancelled() {
-        let response =
-            permission_denial_response(&serde_json::json!(1), &[]).expect("cancelled response");
-
-        assert_eq!(outcome(&response), Some("cancelled"));
-    }
-
-    /// A `reject_once` option missing its `optionId` is a protocol violation.
-    /// Erroring propagates to the caller, which tears the turn down — still no
-    /// approval is ever sent.
-    #[test]
-    fn reject_once_without_option_id_is_a_protocol_error() {
-        let options = options(r#"[{"name": "Reject", "kind": "reject_once"}]"#);
+        )
+        .unwrap();
 
-        let err = permission_denial_response(&serde_json::json!(1), &options)
-            .expect_err("missing optionId must error");
+        let allow_once = options
+            .iter()
+            .find(|opt| opt.get("kind").and_then(|k| k.as_str()) == Some("allow_once"));
 
-        assert!(matches!(err, AcpError::Protocol(_)), "got {err:?}");
+        assert!(allow_once.is_none());
     }
 
     #[test]
-    fn find_reject_once_by_kind() {
-        let options =
-            options(r#"[{"optionId": "rej-x", "name": "Reject", "kind": "reject_once"}]"#);
+    fn find_reject_once_fallback_when_no_allow_once() {
+        let options: Vec<serde_json::Value> = serde_json::from_str(
+            r#"[{"optionId": "rej-x", "name": "Reject", "kind": "reject_once"}]"#,
+        )
+        .unwrap();
 
-        let response =
-            permission_denial_response(&serde_json::json!(1), &options).expect("denial response");
+        let allow_once = options
+            .iter()
+            .find(|opt| opt.get("kind").and_then(|k| k.as_str()) == Some("allow_once"));
+        assert!(allow_once.is_none());
 
-        assert_eq!(
-            response["result"]["outcome"]["optionId"].as_str(),
-            Some("rej-x")
-        );
+        let reject_once = options
+            .iter()
+            .find(|opt| opt.get("kind").and_then(|k| k.as_str()) == Some("reject_once"));
+        assert!(reject_once.is_some());
+        assert_eq!(reject_once.unwrap()["optionId"].as_str(), Some("rej-x"));
     }
 
     #[test]
diff --git a/crates/buzz-acp/src/config.rs b/crates/buzz-acp/src/config.rs
index d9596858460..35aaec188db 100644
--- a/crates/buzz-acp/src/config.rs
+++ b/crates/buzz-acp/src/config.rs
@@ -116,6 +116,7 @@ impl std::fmt::Display for RespondTo {
 ///
 /// - `default` — agent's built-in behaviour (permission requests per tool call).
 /// - `acceptEdits` — auto-approve file edits, still ask for other tools.
+/// - `bypassPermissions` — skip the permission flow entirely.
 /// - `dontAsk` — never prompt; reject anything that would require permission.
 /// - `plan` — planning-only mode (no tool execution).
 #[derive(Debug, Clone, Copy, PartialEq, clap::ValueEnum)]
@@ -126,6 +127,9 @@ pub enum PermissionMode {
     /// Auto-approve file edits, still ask for other tools.
     #[value(alias = "acceptEdits")]
     AcceptEdits,
+    /// Skip the permission flow entirely.
+    #[value(alias = "bypassPermissions")]
+    BypassPermissions,
     /// Never prompt; reject anything that would require permission.
     #[value(alias = "dontAsk")]
     DontAsk,
@@ -141,6 +145,7 @@ impl PermissionMode {
         match self {
             Self::Default => "default",
             Self::AcceptEdits => "acceptEdits",
+            Self::BypassPermissions => "bypassPermissions",
             Self::DontAsk => "dontAsk",
             Self::Plan => "plan",
         }
@@ -427,12 +432,13 @@ pub struct CliArgs {
     /// Permission mode for agents that support `session/set_config_option`
     /// with `configId: "mode"` (e.g. `claude-agent-acp`).
     ///
-    /// Defaults to `dontAsk`, which rejects operations that need interactive
-    /// approval because Buzz does not expose a human permission prompt.
+    /// Defaults to `bypassPermissions` which skips the per-tool-call
+    /// permission flow. Set to `default` to restore the agent's built-in
+    /// behaviour.
     #[arg(
         long,
         env = "BUZZ_ACP_PERMISSION_MODE",
-        default_value = "dont-ask",
+        default_value = "bypass-permissions",
         value_enum
     )]
     pub permission_mode: PermissionMode,
@@ -1463,7 +1469,7 @@ mod tests {
             memory_enabled: true,
             model: None,
             session_title: None,
-            permission_mode: PermissionMode::DontAsk,
+            permission_mode: PermissionMode::BypassPermissions,
             respond_to: RespondTo::Anyone,
             respond_to_allowlist: HashSet::new(),
             allowed_respond_to: Vec::new(),
@@ -2264,6 +2270,10 @@ channels = "ALL"
     fn test_permission_mode_wire_strings() {
         assert_eq!(PermissionMode::Default.as_wire_str(), "default");
         assert_eq!(PermissionMode::AcceptEdits.as_wire_str(), "acceptEdits");
+        assert_eq!(
+            PermissionMode::BypassPermissions.as_wire_str(),
+            "bypassPermissions"
+        );
         assert_eq!(PermissionMode::DontAsk.as_wire_str(), "dontAsk");
         assert_eq!(PermissionMode::Plan.as_wire_str(), "plan");
     }
@@ -2271,6 +2281,7 @@ channels = "ALL"
     #[test]
     fn test_permission_mode_is_default() {
         assert!(PermissionMode::Default.is_default());
+        assert!(!PermissionMode::BypassPermissions.is_default());
         assert!(!PermissionMode::AcceptEdits.is_default());
         assert!(!PermissionMode::DontAsk.is_default());
         assert!(!PermissionMode::Plan.is_default());
@@ -2278,17 +2289,20 @@ channels = "ALL"
 
     #[test]
     fn test_permission_mode_display() {
-        assert_eq!(format!("{}", PermissionMode::DontAsk), "dontAsk");
+        assert_eq!(
+            format!("{}", PermissionMode::BypassPermissions),
+            "bypassPermissions"
+        );
         assert_eq!(format!("{}", PermissionMode::Default), "default");
     }
 
     #[test]
     fn test_summary_includes_permission_mode() {
         let mut config = test_config(SubscribeMode::Mentions);
-        config.permission_mode = PermissionMode::DontAsk;
+        config.permission_mode = PermissionMode::BypassPermissions;
         let s = config.summary();
         assert!(
-            s.contains("permission_mode=dontAsk"),
+            s.contains("permission_mode=bypassPermissions"),
             "summary should include permission_mode, got: {s}"
         );
     }
@@ -2305,9 +2319,9 @@ channels = "ALL"
     }
 
     #[test]
-    fn test_default_config_rejects_interactive_permissions() {
+    fn test_default_config_uses_bypass_permissions() {
         let config = test_config(SubscribeMode::Mentions);
-        assert_eq!(config.permission_mode, PermissionMode::DontAsk);
+        assert_eq!(config.permission_mode, PermissionMode::BypassPermissions);
     }
 
     #[test]
@@ -2318,6 +2332,7 @@ channels = "ALL"
         let cases = [
             ("default", PermissionMode::Default),
             ("accept-edits", PermissionMode::AcceptEdits),
+            ("bypass-permissions", PermissionMode::BypassPermissions),
             ("dont-ask", PermissionMode::DontAsk),
             ("plan", PermissionMode::Plan),
         ];
@@ -2332,12 +2347,14 @@ channels = "ALL"
 
     #[test]
     fn test_permission_mode_value_enum_camel_case_aliases() {
-        // Operators may set env vars using the camelCase wire-format strings.
-        // The #[value(alias)] attributes ensure these parse correctly.
+        // Operators may set env vars using the camelCase wire-format strings
+        // (e.g. BUZZ_ACP_PERMISSION_MODE=bypassPermissions). The #[value(alias)]
+        // attributes ensure these parse correctly.
         use clap::ValueEnum;
         let cases = [
             ("default", PermissionMode::Default),
             ("acceptEdits", PermissionMode::AcceptEdits),
+            ("bypassPermissions", PermissionMode::BypassPermissions),
             ("dontAsk", PermissionMode::DontAsk),
             ("plan", PermissionMode::Plan),
         ];
@@ -2350,18 +2367,6 @@ channels = "ALL"
         }
     }
 
-    #[test]
-    fn test_permission_mode_rejects_unattended_bypass() {
-        use clap::ValueEnum;
-
-        for input in ["bypass-permissions", "bypassPermissions"] {
-            assert!(
-                PermissionMode::from_str(input, true).is_err(),
-                "{input:?} must not disable the ACP permission boundary"
-            );
-        }
-    }
-
     /// Helper: resolve idle_timeout_secs using the same precedence logic as Config::from_args.
     /// Precedence: explicit --idle-timeout > --turn-timeout (deprecated) > `DEFAULT_IDLE_TIMEOUT_SECS`.
     fn resolve_idle_timeout(idle: Option<u64>, turn: Option<u64>) -> u64 {
diff --git a/crates/buzz-acp/src/lib.rs b/crates/buzz-acp/src/lib.rs
index 65c9dd6203c..b69a1f453a5 100644
--- a/crates/buzz-acp/src/lib.rs
+++ b/crates/buzz-acp/src/lib.rs
@@ -6199,7 +6199,7 @@ mod build_mcp_servers_tests {
             memory_enabled: false,
             model: None,
             session_title: None,
-            permission_mode: config::PermissionMode::DontAsk,
+            permission_mode: config::PermissionMode::BypassPermissions,
             respond_to: config::RespondTo::Anyone,
             respond_to_allowlist: std::collections::HashSet::new(),
             allowed_respond_to: vec![],
@@ -6421,7 +6421,7 @@ mod error_outcome_emission_tests {
             memory_enabled: false,
             model: None,
             session_title: None,
-            permission_mode: config::PermissionMode::DontAsk,
+            permission_mode: config::PermissionMode::BypassPermissions,
             respond_to: config::RespondTo::Anyone,
             respond_to_allowlist: HashSet::new(),
             allowed_respond_to: vec![],
diff --git a/crates/buzz-acp/src/pool.rs b/crates/buzz-acp/src/pool.rs
index 8430307d9cd..ddc0330d9f2 100644
--- a/crates/buzz-acp/src/pool.rs
+++ b/crates/buzz-acp/src/pool.rs
@@ -1017,7 +1017,7 @@ async fn create_session_and_apply_model(
     // Apply permission mode if not the agent's built-in default AND the agent
     // advertises the requested mode in session/new. Agents that don't support
     // the mode (e.g., goose crashes on unrecognized set_config_option values)
-    // are safely skipped — the harness rejects interactive permission requests.
+    // are safely skipped — the harness auto-approves via handle_permission_request.
     if !ctx.permission_mode.is_default()
         && agent_supports_mode(&resp.raw, ctx.permission_mode.as_wire_str())
     {
@@ -1130,7 +1130,11 @@ async fn apply_model_switch(
     Ok(())
 }
 
-/// Check whether the agent's `session/new` response advertises a given mode ID
+/// Set the session permission mode via `session/set_config_option`.
+///
+/// Non-fatal for most errors: logs and proceeds. The agent falls back
+/// to its default permission mode (`"default"`), which still works via
+/// Check if the agent's `session/new` response advertises a given mode ID
 /// in `result.modes.availableModes[].id`. Returns `false` if the modes
 /// field is absent or the mode isn't listed.
 fn agent_supports_mode(session_new_result: &serde_json::Value, mode_wire: &str) -> bool {
@@ -1146,11 +1150,7 @@ fn agent_supports_mode(session_new_result: &serde_json::Value, mode_wire: &str)
         .unwrap_or(false)
 }
 
-/// Set the session permission mode via `session/set_config_option`.
-///
-/// Non-fatal for most errors: logs and proceeds. The agent falls back to its
-/// default mode, and any interactive permission request is rejected by
-/// `handle_permission_request`.
+/// per-tool auto-approval in `handle_permission_request`.
 ///
 /// **Fatal exception:** if the agent process exits (e.g., goose crashes on
 /// unrecognized methods), returns `Err(AgentExited)` so the caller can respawn.
@@ -1190,7 +1190,7 @@ async fn apply_permission_mode(
         Ok(Err(e)) => {
             tracing::warn!(
                 target: "pool::permission",
-                "failed to set permission mode {wire:?}: {e} — falling back to per-tool rejection"
+                "failed to set permission mode {wire:?}: {e} — falling back to per-tool auto-approval"
             );
         }
         Err(_) => {
diff --git a/crates/buzz-agent/Cargo.toml b/crates/buzz-agent/Cargo.toml
index 7889ad34a75..f1a10890460 100644
--- a/crates/buzz-agent/Cargo.toml
+++ b/crates/buzz-agent/Cargo.toml
@@ -43,6 +43,7 @@ hex = { workspace = true }
 sha2 = { workspace = true }
 urlencoding = "2"
 webbrowser = "1"
+dirs = "6"
 
 [target.'cfg(unix)'.dependencies]
 nix = { version = "0.31", default-features = false, features = ["signal", "process"] }
diff --git a/crates/buzz-agent/src/agent.rs b/crates/buzz-agent/src/agent.rs
index 054c334405c..f3fbabdcda3 100644
--- a/crates/buzz-agent/src/agent.rs
+++ b/crates/buzz-agent/src/agent.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
 use serde_json::json;
 use tokio::sync::{mpsc, watch, Semaphore};
 use tokio::task::JoinSet;
+use tracing::Instrument as _;
 
 use crate::builtin;
 use crate::config::{Config, MAX_PROMPT_BYTES, MAX_TOOL_CALLS_PER_TURN, MAX_TOOL_RESULT_BYTES};
@@ -23,6 +24,17 @@ const ERROR_REFLECTION_SUFFIX: &str =
 
 const UNSUPPORTED_IMAGE_TOOL_MESSAGE: &str = "The current model does not support image input. The image was removed from conversation history so this turn can continue. Use a text-based inspection tool or ask the user for a textual description instead.";
 
+/// Model-visible feedback after the provider truncates an assistant response at
+/// its output-token limit. This is a user message rather than a synthetic tool
+/// result because truncation can happen without a tool call (and an unpaired
+/// tool result is invalid on every provider wire format).
+const MAX_TOKENS_RECOVERY_MESSAGE: &str = "Your previous response exceeded the model's output token limit and was truncated. Any incomplete tool call was not run. Continue the task, breaking the work or tool call into smaller steps and keeping the response concise.";
+
+/// A provider can repeatedly spend its entire output allowance without making
+/// progress, while `max_rounds` is unbounded by default. Keep the in-turn rescue
+/// finite so a persistently truncating model eventually surfaces `max_tokens`.
+const MAX_TOKENS_RECOVERIES_PER_RUN: u32 = 2;
+
 /// Remove image blocks that the provider has explicitly rejected while keeping
 /// their surrounding tool result (and therefore the tool-call/result pairing)
 /// intact. Returns the number of images removed; zero means the provider error
@@ -144,6 +156,12 @@ pub struct RunCtx<'a> {
     pub history: &'a mut Vec<HistoryItem>,
     pub original_task: &'a mut Option<String>,
     pub handoff_count: &'a mut usize,
+    /// ACP v2 session identifier for this prompt turn. Used to derive
+    /// per-message `messageId` values that are unique within the ACP session.
+    /// Distinct from `session_id` (which is the ACP session); this is a
+    /// per-`session/prompt` random token so that IDs from one prompt invocation
+    /// never collide with those from another even within the same session.
+    pub run_id: String,
     /// Cache-summed input tokens reported by the provider on this session's
     /// most recent request (persists across `session/prompt` calls), or `None`
     /// before the first response and immediately after a handoff resets the
@@ -255,6 +273,10 @@ impl RunCtx<'_> {
         // per-session: a fresh prompt deserves a fresh chance to recover, and
         // `max_rounds` defaults to 0 (unbounded) so it cannot bound this.
         let mut context_recoveries = 0u32;
+        // Per-run output-truncation recovery budget. Unlike context recovery,
+        // these successful provider requests consume a real round and are not
+        // refunded; this counter only bounds the default-unlimited case.
+        let mut max_tokens_recoveries = 0u32;
         loop {
             if self.cfg.max_rounds > 0 && round >= self.cfg.max_rounds {
                 return Ok(StopReason::MaxTurnRequests);
@@ -292,7 +314,8 @@ impl RunCtx<'_> {
             let response_result = tokio::select! {
                 biased;
                 _ = self.cancel.changed() => return Ok(StopReason::Cancelled),
-                r = self.llm.complete(self.cfg, self.system_prompt, self.history, &tools, self.effective_model) => r,
+                r = self.llm.complete(self.cfg, self.system_prompt, self.history, &tools, self.effective_model)
+                        .instrument(tracing::info_span!("llm", session_id = %self.session_id)) => r,
                 _ = async {
                     // Keepalive ticker: emit a lightweight session update every 30s
                     // while waiting on the LLM provider. This resets the ACP harness
@@ -460,6 +483,23 @@ impl RunCtx<'_> {
                 self.emit_usage_update().await;
             }
 
+            // Stable per-kind message IDs for ACP v2 ContentChunk compliance.
+            // ACP v2 requires every ContentChunk to carry `messageId`; all chunks
+            // that belong to the same logical message must share the same ID, and
+            // IDs must be unique per message within the ACP session.
+            //
+            // A provider round produces at most one thought and one assistant
+            // message (the parsers collapse all provider output into one
+            // LlmResponse.reasoning string and one LlmResponse.text string).
+            // These are two *distinct* logical messages, so they get distinct IDs.
+            //
+            // `run_id` is a fresh random token per `session/prompt` invocation,
+            // so `<run_id>-thought-<round>` and `<run_id>-message-<round>` are
+            // unique within the ACP session even across multiple prompts.
+            //
+            // ACP v1 allows the field, so this is a backwards-safe addition.
+            let thought_msg_id = format!("{}-thought-{round}", self.run_id);
+            let message_msg_id = format!("{}-message-{round}", self.run_id);
             if !response.reasoning.is_empty() {
                 wire::send(
                     self.wire,
@@ -467,6 +507,7 @@ impl RunCtx<'_> {
                         self.session_id,
                         json!({
                             "sessionUpdate": "agent_thought_chunk",
+                            "messageId": &thought_msg_id,
                             "content": { "type": "text", "text": &response.reasoning }
                         }),
                     ),
@@ -481,6 +522,7 @@ impl RunCtx<'_> {
                         self.session_id,
                         json!({
                             "sessionUpdate": "agent_message_chunk",
+                            "messageId": &message_msg_id,
                             "content": { "type": "text", "text": &response.text }
                         }),
                     ),
@@ -488,6 +530,37 @@ impl RunCtx<'_> {
                 .await;
             }
 
+            // `max_tokens` describes a truncated assistant response, not turn
+            // completion. Never execute tool calls from it: although one may
+            // parse as valid, a later call (or surrounding instructions) may
+            // have been cut off. Replay only the text, with no tool calls, so
+            // the history remains valid without fabricated tool results; then
+            // add actionable user-role feedback and ask the model to continue.
+            if response.stop == ProviderStop::MaxTokens {
+                self.history.push(HistoryItem::Assistant {
+                    text: response.text,
+                    tool_calls: Vec::new(),
+                    reasoning_details: response.reasoning_details,
+                });
+                if max_tokens_recoveries >= MAX_TOKENS_RECOVERIES_PER_RUN {
+                    tracing::warn!(
+                        recoveries = max_tokens_recoveries,
+                        "provider repeatedly hit output token limit; recovery budget exhausted"
+                    );
+                    return Ok(StopReason::MaxTokens);
+                }
+                max_tokens_recoveries = max_tokens_recoveries.saturating_add(1);
+                tracing::warn!(
+                    recovery = max_tokens_recoveries,
+                    max_recoveries = MAX_TOKENS_RECOVERIES_PER_RUN,
+                    discarded_tool_calls = response.tool_calls.len(),
+                    "provider hit output token limit; asking model to continue in smaller steps"
+                );
+                self.history
+                    .push(HistoryItem::User(MAX_TOKENS_RECOVERY_MESSAGE.to_string()));
+                continue;
+            }
+
             if response.tool_calls.is_empty() {
                 if response.stop == ProviderStop::ToolUse {
                     return Err(AgentError::Llm(
diff --git a/crates/buzz-agent/src/auth.rs b/crates/buzz-agent/src/auth.rs
index 34974fbf0b6..3f43925de36 100644
--- a/crates/buzz-agent/src/auth.rs
+++ b/crates/buzz-agent/src/auth.rs
@@ -453,15 +453,12 @@ fn cache_path_for(cfg: &PkceOAuthConfig) -> Result<PathBuf, AgentError> {
 
     let dir = match &cfg.cache_dir_override {
         Some(p) => p.join(&cfg.cache_namespace),
-        None => {
-            let home = std::env::var("HOME")
-                .map_err(|_| AgentError::Llm("oauth cache: $HOME not set".into()))?;
-            PathBuf::from(home)
-                .join(".config")
-                .join("buzz-agent")
-                .join("oauth")
-                .join(&cfg.cache_namespace)
-        }
+        None => dirs::home_dir()
+            .ok_or_else(|| AgentError::Llm("oauth cache: home directory not found".into()))?
+            .join(".config")
+            .join("buzz-agent")
+            .join("oauth")
+            .join(&cfg.cache_namespace),
     };
     Ok(dir.join(format!("{hash}.json")))
 }
@@ -683,8 +680,7 @@ mod tests {
     }
 
     #[test]
-    fn cache_path_includes_namespace_and_hash() {
-        // HOME is required; cargo test runs set it.
+    fn cache_path_uses_platform_home_directory() {
         let cfg = PkceOAuthConfig {
             discovery_url: "https://example.com/.well-known".into(),
             client_id: "abc".into(),
@@ -693,8 +689,14 @@ mod tests {
             cache_dir_override: None,
         };
         let p = cache_path_for(&cfg).unwrap();
-        assert!(p.to_string_lossy().contains("/buzz-agent/oauth/demo/"));
-        assert!(p.extension().and_then(|s| s.to_str()) == Some("json"));
+        let expected_dir = dirs::home_dir()
+            .unwrap()
+            .join(".config")
+            .join("buzz-agent")
+            .join("oauth")
+            .join("demo");
+        assert_eq!(p.parent(), Some(expected_dir.as_path()));
+        assert_eq!(p.extension().and_then(|s| s.to_str()), Some("json"));
     }
 
     #[test]
diff --git a/crates/buzz-agent/src/config.rs b/crates/buzz-agent/src/config.rs
index 439e49f4e5d..ecd2e88668b 100644
--- a/crates/buzz-agent/src/config.rs
+++ b/crates/buzz-agent/src/config.rs
@@ -98,20 +98,29 @@ fn strip_catalog_prefix(model: &str) -> &str {
 
 /// Build the Anthropic thinking/effort request fields for the given model and effort level.
 ///
-/// API shape selection (per Anthropic extended-thinking support table,
-/// https://platform.claude.com/docs/en/build-with-claude/extended-thinking, July 2025):
+/// API shape selection (per Anthropic thinking docs and per-model support table,
+/// https://platform.claude.com/docs/en/build-with-claude/thinking and
+/// https://platform.claude.com/docs/en/build-with-claude/thinking-troubleshooting#supported-models):
 ///
-/// **Adaptive families** — `thinking: {type:"adaptive"}` + `output_config: {effort}`.
-/// These models use adaptive thinking; `thinking:{type:"adaptive"}` is required to enable
-/// thinking — without it requests run without thinking even when `output_config.effort` is set.
-/// Doc-verified (extended-thinking table): Opus 4.8, Opus 4.7, Opus 4.6, Sonnet 5.x, Sonnet 4.6.
-/// Matched by explicit version strings (no wildcard over version numbers).
+/// **Adaptive families — `thinking:{type:"adaptive"}` activates effort control**:
+///
+///   - Opus 4.6, Opus 4.7, Opus 4.8, Sonnet 4.6: status **Off** — thinking is OFF by default;
+///     `thinking:{type:"adaptive"}` is required to enable thinking; without it no thinking occurs.
+///   - Opus 5, Sonnet 5: status **On** — thinking is on by default (can be disabled);
+///     we still send `thinking:{type:"adaptive"}` so `output_config.effort` is honoured.
+///   - Fable 5, Mythos 5, Mythos Preview: status **Always on** — thinking cannot be disabled;
+///     we still send `thinking:{type:"adaptive"}` so `output_config.effort` is honoured.
+///
+/// In all three sub-buckets `output_config: {effort}` controls depth, clamped per-model.
+/// Also sends `thinking: {display:"summarized"}` so thinking text is always visible in the
+/// observer feed (without this, Anthropic defaults to `display:"omitted"` on newest models).
 ///
 /// **Manual-budget families** — `thinking: {type:"enabled", budget_tokens}`.
 /// `budget_tokens` is clamped to `min(level_budget, max_output_tokens - 1024)` to preserve
 /// at least 1024 answer tokens. If the result is < 1024 (i.e., `max_output_tokens <= 2047`),
 /// thinking is omitted entirely with a `warn!`.
 /// Doc-verified: claude-3* (legacy), claude-opus-4-5 (effort page: "uses manual thinking").
+/// Also sends `display:"summarized"` to ensure thinking text is returned.
 ///
 /// **Everything else** — omit both fields. This includes unknown/future `claude-*` names
 /// not yet in the support table. Safer to omit than to guess an unverified shape.
@@ -155,17 +164,20 @@ pub fn anthropic_thinking_config(
             return (None, None);
         }
         (
-            Some(json!({ "type": "enabled", "budget_tokens": budget })),
+            Some(json!({ "type": "enabled", "budget_tokens": budget, "display": "summarized" })),
             None,
         )
     } else if is_adaptive_thinking_model(model) {
-        // Adaptive families: thinking must be explicitly enabled via type:"adaptive".
-        // output_config.effort controls the depth. Both fields are required together.
+        // Adaptive families: we always send type:"adaptive" to activate output_config.effort.
+        // Sub-bucket A (Off: Opus 4.6/4.7/4.8, Sonnet 4.6): this field is required to enable
+        // thinking at all. Sub-bucket B (On: Opus 5/Sonnet 5) and sub-bucket C (Always on:
+        // Fable 5/Mythos 5/Mythos Preview): thinking is already on; we send the field so
+        // output_config.effort is honoured, not to enable thinking.
         // Apply per-model effort clamping: if the requested level exceeds the model's
         // doc-verified maximum, clamp down to the highest supported level with a warning.
         let clamped = clamp_adaptive_effort(model, effort);
         (
-            Some(json!({ "type": "adaptive" })),
+            Some(json!({ "type": "adaptive", "display": "summarized" })),
             Some(json!({ "effort": clamped.anthropic_effort_str() })),
         )
     } else {
@@ -588,14 +600,23 @@ fn is_manual_budget_model(model: &str) -> bool {
     model.starts_with("claude-3") || model == "claude-opus-4-5"
 }
 
-/// Returns true for Claude model families that use adaptive thinking (doc-verified, July 2025).
+/// Returns true for Claude model families that use adaptive thinking (doc-verified against
+/// https://platform.claude.com/docs/en/build-with-claude/thinking-troubleshooting#supported-models).
+///
+/// **Sub-bucket A — status Off (thinking OFF until `thinking:{type:"adaptive"}` is sent)**:
+///   Opus 4.6, Opus 4.7, Opus 4.8, Sonnet 4.6.
 ///
-/// Sources: https://platform.claude.com/docs/en/build-with-claude/extended-thinking (support table)
-///          https://platform.claude.com/docs/en/build-with-claude/effort (effort page)
+/// **Sub-bucket B — status On (thinking on by default; can be disabled)**:
+///   Opus 5, Sonnet 5.
+///   We still send `thinking:{type:"adaptive"}` so `output_config.effort` is honoured.
 ///
-/// Adaptive thinking models (always-on or default-on):
-///   Opus 4.8, Opus 4.7, Opus 4.6, Sonnet 5.x, Sonnet 4.6,
-///   Fable 5 (always-on), Mythos 5 (always-on), Mythos Preview (default-on).
+/// **Sub-bucket C — status Always on (thinking cannot be disabled)**:
+///   Fable 5, Mythos 5, Mythos Preview.
+///   We still send `thinking:{type:"adaptive"}` so `output_config.effort` is honoured.
+///
+/// All three sub-buckets accept the same request shape. The distinction matters only when
+/// thinking effort is NOT configured: sub-bucket B/C models still produce thinking even
+/// without us sending the field; sub-bucket A models do not.
 ///
 /// Note: Opus 4.5 is NOT in this bucket — it uses manual budget (see `is_manual_budget_model`).
 /// No prefix wildcards over version numbers; each entry is doc-verified explicitly.
@@ -612,14 +633,66 @@ fn is_adaptive_thinking_model(model: &str) -> bool {
         || model.starts_with("claude-sonnet-5")
         // Sonnet 4.6 exactly (not Sonnet 4.5 or earlier — not in the adaptive table).
         || model.starts_with("claude-sonnet-4-6")
-        // Fable 5 and Mythos 5 (always-on adaptive thinking, July 2025).
+        // Fable 5 and Mythos 5 (Always on — thinking cannot be disabled, July 2025).
         || model.starts_with("claude-fable-5")
         || model.starts_with("claude-mythos-5")
-        // Mythos Preview (default-on adaptive thinking, July 2025).
+        // Mythos Preview (Always on — thinking cannot be disabled, July 2025).
         // Note: xhigh is NOT available on Mythos Preview — clamp_adaptive_effort handles this.
         || model.starts_with("claude-mythos-preview")
 }
 
+/// Reasoning summary mode for the OpenAI Responses API route.
+///
+/// Controls the `reasoning.summary` field sent alongside `reasoning.effort` in
+/// `responses_body`. The Responses API only returns populated `summary` arrays
+/// when a summary mode is requested — without it, `summary: []` is returned and
+/// the observer feed shows no reasoning text even though the model billed thinking
+/// tokens.
+///
+/// **Responses-route only.** On the Anthropic route, thinking blocks contain the
+/// full reasoning text directly (no summary concept); this field is ignored there.
+/// On Chat Completions and OpenRouter paths the field is also ignored.
+///
+/// Set via `BUZZ_AGENT_THINKING_SUMMARY` (`auto|concise|detailed`).
+/// Unset/empty → `auto` (the provider chooses the best available summary for the
+/// model). Use `detailed` for maximum reasoning visibility in the observer feed.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ThinkingSummary {
+    /// Provider selects the best available summary format for the model.
+    Auto,
+    /// Shorter summaries — lower token overhead.
+    Concise,
+    /// Full-length summaries — maximum reasoning visibility.
+    Detailed,
+}
+
+impl ThinkingSummary {
+    /// The string value sent in the `reasoning.summary` field.
+    pub fn as_str(self) -> &'static str {
+        match self {
+            ThinkingSummary::Auto => "auto",
+            ThinkingSummary::Concise => "concise",
+            ThinkingSummary::Detailed => "detailed",
+        }
+    }
+}
+
+/// Parse `BUZZ_AGENT_THINKING_SUMMARY`. Pure (env-free) for testability.
+///
+/// Unset or empty → `Auto` (the safe default that works for all Responses-capable models).
+/// Invalid value → startup error.
+pub fn parse_thinking_summary(raw: Option<&str>) -> Result<ThinkingSummary, String> {
+    match raw.map(|s| s.trim().to_ascii_lowercase()).as_deref() {
+        None | Some("") => Ok(ThinkingSummary::Auto),
+        Some("auto") => Ok(ThinkingSummary::Auto),
+        Some("concise") => Ok(ThinkingSummary::Concise),
+        Some("detailed") => Ok(ThinkingSummary::Detailed),
+        Some(other) => Err(format!(
+            "config: BUZZ_AGENT_THINKING_SUMMARY={other} not supported (use auto|concise|detailed)"
+        )),
+    }
+}
+
 /// Parse `BUZZ_AGENT_THINKING_EFFORT`. Pure (env-free) for testability.
 pub fn parse_thinking_effort(raw: Option<&str>) -> Result<Option<ThinkingEffort>, String> {
     match raw.map(|s| s.trim().to_ascii_lowercase()).as_deref() {
@@ -770,6 +843,12 @@ pub struct Config {
     /// Thinking/reasoning effort level. `None` = use provider default (no
     /// thinking config sent). Set via `BUZZ_AGENT_THINKING_EFFORT`.
     pub thinking_effort: Option<ThinkingEffort>,
+    /// Reasoning summary mode for the OpenAI Responses route. Controls the
+    /// `reasoning.summary` field emitted alongside `reasoning.effort`; only
+    /// takes effect when `thinking_effort` is also set. Default `Auto`.
+    /// Set via `BUZZ_AGENT_THINKING_SUMMARY`. Ignored on Anthropic, Chat
+    /// Completions, and OpenRouter routes.
+    pub thinking_summary: ThinkingSummary,
     /// Emit Anthropic `cache_control` breakpoints on the stable prefix
     /// (tools + system prompt) and the rolling conversation tail. Default on;
     /// disable with `BUZZ_AGENT_PROMPT_CACHING=0`. Consulted on every route that
@@ -885,6 +964,9 @@ impl Config {
             hook_servers: parse_hook_servers_env("MCP_HOOK_SERVERS"),
             hints_enabled: parse_env("BUZZ_AGENT_NO_HINTS", 0u8)? == 0,
             thinking_effort: parse_thinking_effort(env("BUZZ_AGENT_THINKING_EFFORT").as_deref())?,
+            thinking_summary: parse_thinking_summary(
+                env("BUZZ_AGENT_THINKING_SUMMARY").as_deref(),
+            )?,
             prompt_caching: parse_env("BUZZ_AGENT_PROMPT_CACHING", 1u8)? != 0,
         };
         cfg.validate()?;
@@ -928,6 +1010,7 @@ impl Config {
             hook_servers: HookServers::None,
             hints_enabled: false,
             thinking_effort: None,
+            thinking_summary: ThinkingSummary::Auto,
             prompt_caching: false,
         }
     }
@@ -1415,6 +1498,60 @@ mod tests {
         );
     }
 
+    #[test]
+    fn parse_thinking_summary_round_trips_all_values() {
+        for (raw, expected) in [
+            ("auto", ThinkingSummary::Auto),
+            ("concise", ThinkingSummary::Concise),
+            ("detailed", ThinkingSummary::Detailed),
+        ] {
+            assert_eq!(
+                parse_thinking_summary(Some(raw)).unwrap(),
+                expected,
+                "raw={raw:?}"
+            );
+        }
+    }
+
+    #[test]
+    fn parse_thinking_summary_unset_and_empty_yield_auto() {
+        assert_eq!(parse_thinking_summary(None).unwrap(), ThinkingSummary::Auto);
+        assert_eq!(
+            parse_thinking_summary(Some("")).unwrap(),
+            ThinkingSummary::Auto
+        );
+        assert_eq!(
+            parse_thinking_summary(Some("   ")).unwrap(),
+            ThinkingSummary::Auto
+        );
+    }
+
+    #[test]
+    fn parse_thinking_summary_is_case_insensitive() {
+        assert_eq!(
+            parse_thinking_summary(Some("DETAILED")).unwrap(),
+            ThinkingSummary::Detailed
+        );
+        assert_eq!(
+            parse_thinking_summary(Some("  Concise  ")).unwrap(),
+            ThinkingSummary::Concise
+        );
+    }
+
+    #[test]
+    fn parse_thinking_summary_rejects_unknown_value() {
+        let err = parse_thinking_summary(Some("verbose")).unwrap_err();
+        assert!(err.contains("BUZZ_AGENT_THINKING_SUMMARY=verbose"), "{err}");
+        assert!(err.contains("auto|concise|detailed"), "{err}");
+    }
+
+    #[test]
+    fn thinking_summary_as_str_mapping() {
+        assert_eq!(ThinkingSummary::Auto.as_str(), "auto");
+        assert_eq!(ThinkingSummary::Concise.as_str(), "concise");
+        assert_eq!(ThinkingSummary::Detailed.as_str(), "detailed");
+    }
+
     #[test]
     fn thinking_effort_anthropic_budget_tokens_mapping() {
         assert_eq!(ThinkingEffort::Low.anthropic_budget_tokens(), 1_024);
@@ -1713,6 +1850,56 @@ mod tests {
         assert_eq!(oc["effort"], "max");
     }
 
+    // ---- anthropic_thinking_config: display:"summarized" in all enabled shapes ----
+
+    #[test]
+    fn anthropic_thinking_config_adaptive_emits_display_summarized() {
+        // Adaptive families (Opus 4.7, Sonnet 5, Fable 5, etc.) must include
+        // display:"summarized" so thinking text is returned, not omitted.
+        for model in &[
+            "claude-opus-4-7",
+            "claude-opus-4-8",
+            "claude-sonnet-5-20250901",
+            "claude-fable-5",
+            "claude-mythos-5",
+        ] {
+            let (thinking, _) = anthropic_thinking_config(model, ThinkingEffort::High, 32_768);
+            let t = thinking
+                .unwrap_or_else(|| panic!("thinking must be present for adaptive model {model}"));
+            assert_eq!(
+                t["display"], "summarized",
+                "display:summarized must be present for adaptive model {model}: got {t}"
+            );
+        }
+    }
+
+    #[test]
+    fn anthropic_thinking_config_manual_budget_emits_display_summarized() {
+        // Manual-budget families (claude-3.x, opus-4-5) must also include
+        // display:"summarized" so thinking text is returned.
+        for model in &["claude-3-7-sonnet-20250219", "claude-opus-4-5"] {
+            let (thinking, _) = anthropic_thinking_config(model, ThinkingEffort::High, 65_536);
+            let t = thinking.unwrap_or_else(|| {
+                panic!("thinking must be present for manual-budget model {model}")
+            });
+            assert_eq!(
+                t["display"], "summarized",
+                "display:summarized must be present for manual-budget model {model}: got {t}"
+            );
+        }
+    }
+
+    #[test]
+    fn anthropic_thinking_config_omitted_when_no_thinking_has_no_display_field() {
+        // Models that don't produce a thinking field at all should have no display key.
+        let (thinking, _) =
+            anthropic_thinking_config("claude-haiku-4-5", ThinkingEffort::High, 32_768);
+        assert!(
+            thinking.is_none(),
+            "thinking must be absent for unknown model"
+        );
+    }
+
     // ---- clamp_adaptive_effort — per-model clamping tests ----
 
     #[test]
@@ -2143,7 +2330,7 @@ mod tests {
 
     #[test]
     fn anthropic_thinking_config_mythos_preview_emits_adaptive_and_effort() {
-        // Mythos Preview — default-on adaptive thinking.
+        // Mythos Preview — Always on adaptive thinking.
         let (thinking, output_config) =
             anthropic_thinking_config("claude-mythos-preview", ThinkingEffort::Low, 32_768);
         let t = thinking.expect("thinking must be present for claude-mythos-preview");
diff --git a/crates/buzz-agent/src/handoff.rs b/crates/buzz-agent/src/handoff.rs
index 5fdbc3079da..4748678059d 100644
--- a/crates/buzz-agent/src/handoff.rs
+++ b/crates/buzz-agent/src/handoff.rs
@@ -3,6 +3,7 @@ use crate::config::{
     HANDOFF_MAX_OUTPUT_TOKENS, HANDOFF_MAX_TOOL_NAMES, HANDOFF_MIN_PROMPT_BUDGET_BYTES,
     HANDOFF_ORIGINAL_TASK_MAX_BYTES, MAX_CONTEXT_RECOVERIES_PER_RUN,
 };
+use crate::llm::summary_completion_cap;
 use crate::types::HistoryItem;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -35,10 +36,21 @@ pub(crate) enum ContextRecovery {
     Exhausted,
 }
 
-const HANDOFF_SYSTEM_PROMPT: &str = "You are generating a context handoff summary for the next \
-turn of an autonomous agent. Be concise but thorough. Cover: what the original task was, what \
-you accomplished, key decisions made, what remains, and one concrete next step. Output plain \
-text only — no tool calls, no JSON. Stay under 8192 tokens.";
+/// System prompt for the handoff summarizer. `LazyLock` + `format!` so the
+/// token figure is derived from [`HANDOFF_MAX_OUTPUT_TOKENS`] instead of a
+/// duplicated literal, and "visible plain-text summary" makes explicit that
+/// the limit is on summary text, not on any hidden reasoning the model does
+/// first (which is budgeted separately on the wire — see
+/// `openrouter_summary_body`).
+static HANDOFF_SYSTEM_PROMPT: std::sync::LazyLock<String> = std::sync::LazyLock::new(|| {
+    format!(
+        "You are generating a context handoff summary for the next turn of an autonomous agent. \
+         Be concise but thorough. Cover: what the original task was, what you accomplished, key \
+         decisions made, what remains, and one concrete next step. Output plain text only — no \
+         tool calls, no JSON. Keep the visible plain-text summary under \
+         {HANDOFF_MAX_OUTPUT_TOKENS} tokens."
+    )
+});
 
 impl RunCtx<'_> {
     pub(crate) async fn maybe_handoff(&mut self, handoff_attempts: &mut usize) -> HandoffOutcome {
@@ -170,7 +182,7 @@ impl RunCtx<'_> {
             _ = self.cancel.changed() => return HandoffOutcome::Cancelled,
             r = self.llm.summarize(
                 self.cfg,
-                HANDOFF_SYSTEM_PROMPT,
+                &HANDOFF_SYSTEM_PROMPT,
                 &prompt,
                 HANDOFF_MAX_OUTPUT_TOKENS,
                 self.effective_model,
@@ -331,7 +343,7 @@ impl RunCtx<'_> {
             Some(explicit) => explicit.saturating_sub(fixed_bytes),
             None => handoff_prompt_budget_bytes(
                 self.cfg.max_context_tokens,
-                HANDOFF_MAX_OUTPUT_TOKENS,
+                summary_completion_cap(self.cfg.provider, HANDOFF_MAX_OUTPUT_TOKENS),
                 fixed_bytes,
             ),
         };
@@ -513,8 +525,9 @@ fn byte_fallback_threshold(
 mod tests {
     use super::{
         byte_fallback_threshold, estimate_tokens_from_bytes, handoff_prompt_budget_bytes,
-        token_threshold,
+        summary_completion_cap, token_threshold, HANDOFF_SYSTEM_PROMPT,
     };
+    use crate::config::{Provider, HANDOFF_MAX_OUTPUT_TOKENS};
 
     #[test]
     fn handoff_prompt_budget_reserves_summary_output_and_fixed_prompt() {
@@ -526,6 +539,71 @@ mod tests {
         assert_eq!(handoff_prompt_budget_bytes(1_000, 2_000, 10_000), 0);
     }
 
+    /// OpenRouter's summary request grants reasoning an equal budget on top of
+    /// the visible-text budget, so its completion cap is 2× the handoff text
+    /// budget; the input budget must reserve that doubled cap. At the
+    /// 1-byte/token upper bound, prompt bytes bound prompt tokens, so the join
+    /// to pin is: (budget + fixed prompt) + actual completion cap ≤ window.
+    /// Reserving only `HANDOFF_MAX_OUTPUT_TOKENS` would break this by exactly
+    /// one extra reasoning budget at the maximum constructed prompt.
+    #[test]
+    fn openrouter_prompt_budget_reserves_doubled_completion_cap() {
+        let cap = summary_completion_cap(Provider::OpenRouter, HANDOFF_MAX_OUTPUT_TOKENS);
+        assert_eq!(
+            cap,
+            2 * HANDOFF_MAX_OUTPUT_TOKENS,
+            "OpenRouter doubles: text + reasoning"
+        );
+        let window = 200_000u64;
+        let fixed = 1_000usize;
+        let budget = handoff_prompt_budget_bytes(window, cap, fixed);
+        assert_eq!(budget, 182_616); // 200_000 - 16_384 - 1_000
+        let max_prompt_tokens = estimate_tokens_from_bytes(budget + fixed);
+        assert!(
+            max_prompt_tokens + u64::from(cap) <= window,
+            "input + completion allowance must fit the configured window"
+        );
+        // The old single reservation violates the same join — the regression
+        // this guards against.
+        let stale_budget = handoff_prompt_budget_bytes(window, HANDOFF_MAX_OUTPUT_TOKENS, fixed);
+        assert!(
+            estimate_tokens_from_bytes(stale_budget + fixed) + u64::from(cap) > window,
+            "reserving only the text budget must be observable as an overflow here"
+        );
+    }
+
+    /// Anthropic/OpenAI/Databricks summary bodies request exactly the caller's
+    /// budget, so their input reservation is unchanged.
+    #[test]
+    fn non_openrouter_completion_cap_is_the_callers_budget() {
+        for provider in [
+            Provider::Anthropic,
+            Provider::OpenAi,
+            Provider::Databricks,
+            Provider::DatabricksV2,
+        ] {
+            assert_eq!(
+                summary_completion_cap(provider, HANDOFF_MAX_OUTPUT_TOKENS),
+                HANDOFF_MAX_OUTPUT_TOKENS
+            );
+        }
+    }
+
+    /// The prompt's token figure is derived from `HANDOFF_MAX_OUTPUT_TOKENS`
+    /// and names the *visible plain-text summary* as its target, so hidden
+    /// reasoning (budgeted separately on the wire) is not the referent.
+    #[test]
+    fn handoff_system_prompt_derives_limit_and_targets_visible_text() {
+        let expected = format!(
+            "Keep the visible plain-text summary under {HANDOFF_MAX_OUTPUT_TOKENS} tokens."
+        );
+        assert!(
+            HANDOFF_SYSTEM_PROMPT.contains(&expected),
+            "prompt must derive its token figure from HANDOFF_MAX_OUTPUT_TOKENS: {}",
+            *HANDOFF_SYSTEM_PROMPT
+        );
+    }
+
     #[test]
     fn token_threshold_uses_fraction_when_output_is_small() {
         // 200k window, 1k output. fractional = 0.9*200000 = 180000;
diff --git a/crates/buzz-agent/src/lib.rs b/crates/buzz-agent/src/lib.rs
index 940bd2a9c2a..f222ce7ac24 100644
--- a/crates/buzz-agent/src/lib.rs
+++ b/crates/buzz-agent/src/lib.rs
@@ -714,6 +714,7 @@ async fn run_prompt(app: Arc<App>, id: Value, params: Value, wire_tx: WireSender
         history: &mut history,
         original_task: &mut original_task,
         handoff_count: &mut handoff_count,
+        run_id,
         last_request_input_tokens: &mut last_request_input_tokens,
         last_request_history_bytes: &mut last_request_history_bytes,
         turn_input_tokens: &mut turn_input_tokens,
@@ -830,6 +831,13 @@ async fn acquire_session(
     if s.busy {
         return Err("prompt already in flight");
     }
+    // Generate the run id before mutating session state. On RNG failure we reject
+    // the prompt cleanly: the session stays idle and the caller can retry. Generating
+    // after `s.busy = true` with `?` would wedge the session permanently busy.
+    let run_id = format!(
+        "run_{}",
+        session_token().map_err(|_| "rng failure; retry prompt")?
+    );
     s.busy = true;
     let (tx, rx) = watch::channel(false);
     s.cancel_tx = tx;
@@ -839,7 +847,6 @@ async fn acquire_session(
     // Fresh run id + steer channel for this turn. The run id lets steer-capable
     // clients target *this* turn (rejecting steers aimed at a turn that already
     // ended); the channel carries mid-turn injections to the run loop.
-    let run_id = format!("run_{}", session_token().unwrap_or_else(|_| "x".into()));
     s.active_run_id = Some(run_id.clone());
     let (steer_tx, steer_rx) = mpsc::unbounded_channel();
     s.steer_tx = Some(steer_tx);
diff --git a/crates/buzz-agent/src/llm.rs b/crates/buzz-agent/src/llm.rs
index 267b2d21b50..c8c0a8550f7 100644
--- a/crates/buzz-agent/src/llm.rs
+++ b/crates/buzz-agent/src/llm.rs
@@ -104,11 +104,21 @@ pub struct Llm {
     auth: Arc<dyn TokenSource>,
 }
 
+/// Connect-phase timeout applied to every outgoing LLM HTTP request.
+///
+/// A 10-second budget is generous for a TLS + HTTP/2 handshake to a
+/// well-provisioned gateway.  Repeated connect timeouts indicate a
+/// network/reachability problem, not a slow generation.
+const LLM_CONNECT_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
+
 impl Llm {
     pub fn new(cfg: &Config) -> Result<Self, AgentError> {
         let http = Client::builder()
-            .connect_timeout(std::time::Duration::from_secs(10))
-            .read_timeout(cfg.llm_timeout)
+            .connect_timeout(LLM_CONNECT_TIMEOUT)
+            // No client-level read_timeout: we apply a per-request total
+            // timeout via RequestBuilder::timeout() so that escalated budgets
+            // on slow models are not silently floored by a fixed client-level
+            // value. The connect_timeout above still bounds the handshake phase.
             .build()
             .map_err(|e| AgentError::Llm(format!("http: {e}")))?;
         let auth = build_token_source(cfg)?;
@@ -129,6 +139,7 @@ impl Llm {
         effective_model: &str,
     ) -> Result<LlmResponse, AgentError> {
         let effort = cfg.thinking_effort;
+        let call_start = std::time::Instant::now();
         let result = match cfg.provider {
             Provider::Anthropic => self
                 .post_anthropic(
@@ -225,7 +236,7 @@ impl Llm {
         // Every arm above returns its `Result` into this mapper rather than
         // using `?` — an early return would silently skip the stamp, which is
         // exactly what the Anthropic and OpenRouter arms used to do.
-        result.map_err(|e| match e {
+        let stamped = result.map_err(|e| match e {
             AgentError::Llm(s) => AgentError::Llm(format!("({effective_model}) {s}")),
             AgentError::LlmModelNotFound(s) => {
                 AgentError::LlmModelNotFound(format!("({effective_model}) {s}"))
@@ -238,7 +249,25 @@ impl Llm {
                 AgentError::LlmContextExceeded(format!("({effective_model}) {s}"))
             }
             other => other,
-        })
+        });
+        // Emit one INFO event per successful LLM call. This gives operators
+        // visibility into healthy-but-slow generation (which previously logged
+        // nothing at INFO) and provides a wall-clock record even when no error
+        // fires. Token counts use `?`-formatting to preserve the None-vs-zero
+        // distinction: `None` means the provider omitted usage entirely.
+        if let Ok(ref response) = stamped {
+            let duration_ms = call_start.elapsed().as_millis();
+            tracing::info!(
+                model = effective_model,
+                provider = ?cfg.provider,
+                duration_ms,
+                input_tokens = ?response.input_tokens,
+                cached_input_tokens = ?response.cached_input_tokens,
+                output_tokens = ?response.output_tokens,
+                "llm: call completed"
+            );
+        }
+        stamped
     }
 
     pub async fn summarize(
@@ -249,111 +278,125 @@ impl Llm {
         max_output_tokens: u32,
         effective_model: &str,
     ) -> Result<String, AgentError> {
-        match cfg.provider {
-            Provider::Anthropic => {
-                let body = json!({
-                    "model": effective_model,
-                    "max_tokens": max_output_tokens,
-                    "system": system_prompt,
-                    "messages": [{
-                        "role": "user",
-                        "content": [{ "type": "text", "text": user_prompt }],
-                    }],
-                });
-                Ok(parse_anthropic(self.post_anthropic(cfg, &body).await?)?.text)
-            }
-            Provider::OpenRouter => {
-                let body = openrouter_summary_body(
-                    effective_model,
-                    system_prompt,
-                    user_prompt,
-                    max_output_tokens,
-                );
-                let v = self.post_openrouter(cfg, &body).await?;
-                Ok(parse_openai(v)?.text)
-            }
-            Provider::OpenAi | Provider::Databricks => {
-                let r = self
-                    .openai_request(
-                        cfg,
+        let call_start = std::time::Instant::now();
+        let result = (async {
+            match cfg.provider {
+                Provider::Anthropic => {
+                    let body = json!({
+                        "model": effective_model,
+                        "max_tokens": max_output_tokens,
+                        "system": system_prompt,
+                        "messages": [{
+                            "role": "user",
+                            "content": [{ "type": "text", "text": user_prompt }],
+                        }],
+                    });
+                    Ok(parse_anthropic(self.post_anthropic(cfg, &body).await?)?.text)
+                }
+                Provider::OpenRouter => {
+                    let body = openrouter_summary_body(
                         effective_model,
-                        false,
-                        |use_responses, request_model| {
-                            if use_responses {
-                                (
-                                    json!({
-                                        "model": request_model,
-                                        "max_output_tokens": max_output_tokens,
-                                        "instructions": system_prompt,
-                                        "input": user_prompt,
-                                    }),
-                                    parse_responses as OpenAiParse,
-                                )
-                            } else {
-                                (
-                                    json!({
-                                        "model": request_model,
-                                        "stream": false,
-                                        "max_completion_tokens": max_output_tokens,
-                                        "messages": [
-                                            { "role": "system", "content": system_prompt },
-                                            { "role": "user", "content": user_prompt },
-                                        ],
-                                    }),
-                                    parse_openai as OpenAiParse,
-                                )
-                            }
-                        },
-                    )
-                    .await?;
-                Ok(r.text)
-            }
-            Provider::DatabricksV2 => {
-                let r = self
-                    .databricks_v2_request(cfg, effective_model, |route| match route {
-                        DatabricksV2Route::OpenAiResponses => (
-                            json!({
-                                "model": effective_model,
-                                "max_output_tokens": max_output_tokens,
-                                "instructions": system_prompt,
-                                "input": user_prompt,
-                            }),
-                            parse_responses as OpenAiParse,
-                        ),
-                        DatabricksV2Route::AnthropicMessages => (
-                            json!({
-                                "model": effective_model,
-                                "max_tokens": max_output_tokens,
-                                "system": system_prompt,
-                                "messages": [{
-                                    "role": "user",
-                                    "content": [{ "type": "text", "text": user_prompt }],
-                                }],
-                            }),
-                            parse_anthropic as OpenAiParse,
-                        ),
-                        DatabricksV2Route::MlflowChatCompletions => (
-                            json!({
-                                "model": effective_model,
-                                "stream": false,
-                                "max_completion_tokens": max_output_tokens,
-                                "messages": [
-                                    { "role": "system", "content": system_prompt },
-                                    { "role": "user", "content": user_prompt },
-                                ],
-                            }),
-                            parse_openai as OpenAiParse,
-                        ),
-                    })
-                    .await?;
-                Ok(r.text)
+                        system_prompt,
+                        user_prompt,
+                        max_output_tokens,
+                    );
+                    let v = self.post_openrouter(cfg, &body).await?;
+                    Ok(parse_openai(v)?.text)
+                }
+                Provider::OpenAi | Provider::Databricks => {
+                    let r = self
+                        .openai_request(
+                            cfg,
+                            effective_model,
+                            false,
+                            |use_responses, request_model| {
+                                if use_responses {
+                                    (
+                                        json!({
+                                            "model": request_model,
+                                            "max_output_tokens": max_output_tokens,
+                                            "instructions": system_prompt,
+                                            "input": user_prompt,
+                                        }),
+                                        parse_responses as OpenAiParse,
+                                    )
+                                } else {
+                                    (
+                                        json!({
+                                            "model": request_model,
+                                            "stream": false,
+                                            "max_completion_tokens": max_output_tokens,
+                                            "messages": [
+                                                { "role": "system", "content": system_prompt },
+                                                { "role": "user", "content": user_prompt },
+                                            ],
+                                        }),
+                                        parse_openai as OpenAiParse,
+                                    )
+                                }
+                            },
+                        )
+                        .await?;
+                    Ok(r.text)
+                }
+                Provider::DatabricksV2 => {
+                    let r = self
+                        .databricks_v2_request(cfg, effective_model, |route| match route {
+                            DatabricksV2Route::OpenAiResponses => (
+                                json!({
+                                    "model": effective_model,
+                                    "max_output_tokens": max_output_tokens,
+                                    "instructions": system_prompt,
+                                    "input": user_prompt,
+                                }),
+                                parse_responses as OpenAiParse,
+                            ),
+                            DatabricksV2Route::AnthropicMessages => (
+                                json!({
+                                    "model": effective_model,
+                                    "max_tokens": max_output_tokens,
+                                    "system": system_prompt,
+                                    "messages": [{
+                                        "role": "user",
+                                        "content": [{ "type": "text", "text": user_prompt }],
+                                    }],
+                                }),
+                                parse_anthropic as OpenAiParse,
+                            ),
+                            DatabricksV2Route::MlflowChatCompletions => (
+                                json!({
+                                    "model": effective_model,
+                                    "stream": false,
+                                    "max_completion_tokens": max_output_tokens,
+                                    "messages": [
+                                        { "role": "system", "content": system_prompt },
+                                        { "role": "user", "content": user_prompt },
+                                    ],
+                                }),
+                                parse_openai as OpenAiParse,
+                            ),
+                        })
+                        .await?;
+                    Ok(r.text)
+                }
             }
+        })
+        .await;
+        if result.is_ok() {
+            let duration_ms = call_start.elapsed().as_millis();
+            tracing::info!(
+                model = effective_model,
+                provider = ?cfg.provider,
+                duration_ms,
+                "llm: summarize completed"
+            );
         }
+        result
     }
 
     async fn post_anthropic(&self, cfg: &Config, body: &Value) -> Result<Value, AgentError> {
         let url = format!("{}/v1/messages", cfg.base_url.trim_end_matches('/'));
-        post(&self.http, &url, body, false, |r| {
+        post(&self.http, &url, body, false, cfg.llm_timeout, |r| {
             r.header("x-api-key", &cfg.api_key)
                 .header("anthropic-version", &cfg.anthropic_api_version)
         })
@@ -659,6 +702,7 @@ impl Llm {
                 &url,
                 body_ref,
                 effective_model == MESH_VIRTUAL_MODEL_ID,
+                cfg.llm_timeout,
                 |r| r.bearer_auth(&bearer),
             )
             .await
@@ -681,7 +725,7 @@ impl Llm {
         let mut bearer = self.auth.bearer().await?;
         let mut refreshed = false;
         loop {
-            match openrouter_post(&self.http, &url, body, &bearer).await {
+            match openrouter_post(&self.http, &url, body, &bearer, cfg.llm_timeout).await {
                 Err(AgentError::LlmAuth(_)) if !refreshed => {
                     refreshed = true;
                     let new_bearer = self.auth.refresh_now(&bearer).await?;
@@ -1077,7 +1121,10 @@ fn responses_body(
         "input": input,
     });
     if let Some(e) = effort {
-        body["reasoning"] = json!({ "effort": e.openai_effort_str() });
+        body["reasoning"] = json!({
+            "effort": e.openai_effort_str(),
+            "summary": cfg.thinking_summary.as_str(),
+        });
     }
     if !tools_json.is_empty() {
         body["tools"] = Value::Array(tools_json);
@@ -1182,6 +1229,11 @@ fn databricks_v2_path(route: DatabricksV2Route) -> &'static str {
 }
 
 fn parse_responses(v: Value) -> Result<LlmResponse, AgentError> {
+    let max_tokens = v.get("status").and_then(Value::as_str) == Some("incomplete")
+        && v.get("incomplete_details")
+            .and_then(|d| d.get("reason"))
+            .and_then(Value::as_str)
+            == Some("max_output_tokens");
     let mut text = String::new();
     let mut reasoning = String::new();
     let mut tool_calls = Vec::new();
@@ -1212,7 +1264,7 @@ fn parse_responses(v: Value) -> Result<LlmResponse, AgentError> {
                     }
                 }
             }
-            Some("function_call") => {
+            Some("function_call") if !max_tokens => {
                 saw_function_call = true;
                 let raw = item
                     .get("arguments")
@@ -1232,6 +1284,9 @@ fn parse_responses(v: Value) -> Result<LlmResponse, AgentError> {
                     Default::default(),
                 )?);
             }
+            // Incomplete Responses output can carry a partial function call.
+            // It is intentionally discarded by the in-turn recovery path.
+            Some("function_call") => {}
             Some("reasoning") => {
                 // Reasoning summary items from the Responses API. Each item has a
                 // `summary` array of `{"type": "summary_text", "text": "..."}` objects.
@@ -1504,13 +1559,19 @@ fn parse_anthropic(v: Value) -> Result<LlmResponse, AgentError> {
                         reasoning.push_str(t);
                     }
                 }
-                // Anthropic's replay shape is fully modelled, so nothing to keep.
-                Some("tool_use") => tool_calls.push(make_tool_call(
-                    str_field(b, "id"),
-                    str_field(b, "name"),
-                    b.get("input").cloned().unwrap_or(Value::Null),
-                    Default::default(),
-                )?),
+                // A max-token response may end in the middle of a tool input.
+                // The agent discards all calls from truncated responses, so do
+                // not reject the whole response trying to parse an input that
+                // can never be executed.
+                Some("tool_use") if stop != ProviderStop::MaxTokens => {
+                    tool_calls.push(make_tool_call(
+                        str_field(b, "id"),
+                        str_field(b, "name"),
+                        b.get("input").cloned().unwrap_or(Value::Null),
+                        Default::default(),
+                    )?)
+                }
+                Some("tool_use") => {}
                 _ => {}
             }
         }
@@ -1598,30 +1659,33 @@ fn parse_openai(v: Value) -> Result<LlmResponse, AgentError> {
         }
     };
     let mut tool_calls = Vec::new();
-    if let Some(arr) = msg.get("tool_calls").and_then(Value::as_array) {
-        for tc in arr {
-            let f = tc
-                .get("function")
-                .ok_or_else(|| AgentError::Llm("tool_call missing function".into()))?;
-            let raw = f.get("arguments").and_then(Value::as_str).unwrap_or("{}");
-            let args: Value = serde_json::from_str(raw)
-                .map_err(|e| AgentError::Llm(format!("tool_call.arguments not valid JSON: {e}")))?;
-            // Everything on the wire object we do not model, kept for replay.
-            let extra = tc
-                .as_object()
-                .map(|o| {
-                    o.iter()
-                        .filter(|(k, _)| !matches!(k.as_str(), "id" | "type" | "function"))
-                        .map(|(k, v)| (k.clone(), v.clone()))
-                        .collect()
-                })
-                .unwrap_or_default();
-            tool_calls.push(make_tool_call(
-                str_field(tc, "id"),
-                str_field(f, "name"),
-                args,
-                extra,
-            )?);
+    if stop != ProviderStop::MaxTokens {
+        if let Some(arr) = msg.get("tool_calls").and_then(Value::as_array) {
+            for tc in arr {
+                let f = tc
+                    .get("function")
+                    .ok_or_else(|| AgentError::Llm("tool_call missing function".into()))?;
+                let raw = f.get("arguments").and_then(Value::as_str).unwrap_or("{}");
+                let args: Value = serde_json::from_str(raw).map_err(|e| {
+                    AgentError::Llm(format!("tool_call.arguments not valid JSON: {e}"))
+                })?;
+                // Everything on the wire object we do not model, kept for replay.
+                let extra = tc
+                    .as_object()
+                    .map(|o| {
+                        o.iter()
+                            .filter(|(k, _)| !matches!(k.as_str(), "id" | "type" | "function"))
+                            .map(|(k, v)| (k.clone(), v.clone()))
+                            .collect()
+                    })
+                    .unwrap_or_default();
+                tool_calls.push(make_tool_call(
+                    str_field(tc, "id"),
+                    str_field(f, "name"),
+                    args,
+                    extra,
+                )?);
+            }
         }
     }
     dedupe_provider_ids(&mut tool_calls);
@@ -1705,6 +1769,44 @@ const MAX_RETRIES: u32 = 3;
 const BASE_BACKOFF_MS: u64 = 500;
 const MAX_BACKOFF_MS: u64 = 8_000;
 
+/// Maximum per-request timeout after escalation.
+///
+/// Each attempt that ends with a timeout doubles the budget for the next
+/// attempt: base, 2×base, 4×base, … The escalation is bounded here so a
+/// slow model cannot keep a worker alive indefinitely. The cap is also
+/// applied when `base` already exceeds it (e.g. an operator-set 1500 s stays
+/// 1500 s instead of being truncated to 1200 s — we never shrink the budget).
+const ESCALATION_TIMEOUT_CAP: std::time::Duration = std::time::Duration::from_secs(1200);
+
+/// Compute the per-attempt timeout after `timeout_failures` prior attempts
+/// timed out.
+///
+/// The budget doubles for every timeout failure: `base × 2^timeout_failures`.
+/// Non-timeout retryable failures (429, 5xx, connect resets) are not counted
+/// here — they are not evidence of a slow model. The budget is capped at
+/// `max(ESCALATION_TIMEOUT_CAP, base)` so a base already above the cap is
+/// preserved as-is.
+///
+/// Examples at base = 240 s: 0 failures → 240 s; 1 → 480 s; 2 → 960 s; 3 → 1200 s.
+///
+/// **Worst-case turn ceiling** (all 3 attempts time out, `MAX_RETRIES = 3`):
+///
+/// ```text
+/// total ≤ base + min(2×base, cap) + min(4×base, cap)
+/// ```
+///
+/// Concrete anchors operators can use to size their outer turn timeout:
+/// - 240 s base (default): 240 + 480 + 960 = **1680 s** (~28 min)
+/// - 900 s base: 900 + 1200 + 1200 = **3300 s** (~55 min)
+fn escalated_timeout(base: std::time::Duration, timeout_failures: u32) -> std::time::Duration {
+    // `checked_shl` returns None when the shift would overflow u32; saturate to
+    // u32::MAX so the cap below clamps it rather than panicking or wrapping.
+    let multiplier = 1u32.checked_shl(timeout_failures).unwrap_or(u32::MAX);
+    let scaled = base.saturating_mul(multiplier);
+    let cap = ESCALATION_TIMEOUT_CAP.max(base);
+    scaled.min(cap)
+}
+
 async fn backoff_with_jitter(attempt: u32) {
     let base = BASE_BACKOFF_MS
         .saturating_mul(1u64 << attempt)
@@ -1731,9 +1833,123 @@ fn is_retryable_transport_error(e: &reqwest::Error) -> bool {
     e.is_timeout() || e.is_connect() || e.is_request()
 }
 
+/// Which phase of an HTTP exchange produced a timeout error.
+///
+/// Used by `timeout_message` to choose the right factual description.
+#[derive(Clone, Copy)]
+enum TimeoutPhase {
+    /// Timeout before any response bytes — transport/send phase.
+    Transport,
+    /// Timeout after headers were received, while reading body chunks.
+    BodyRead,
+}
+
+/// Pure function: build the human-readable timeout message for an LLM call.
+///
+/// Takes the two reqwest flags and the per-request total timeout rather than a
+/// `&reqwest::Error` so the flag-precedence logic can be tested without any
+/// network involvement.
+///
+/// `per_request_timeout` is the `RequestBuilder::timeout()` value applied to
+/// the attempt that fired; this is computed by `escalated_timeout` and may be
+/// larger than `cfg.llm_timeout` when earlier attempts already timed out.
+/// Connect timeouts use `LLM_CONNECT_TIMEOUT`.
+///
+/// This message appears in the terminal error produced by `classify_transport_error`
+/// (transport-phase timeout, always terminal) and `classify_body_read_error`
+/// (body-read timeout, terminal only on the final attempt — earlier attempts
+/// are retried with an escalated budget before reaching this message).
+fn timeout_message(
+    is_connect: bool,
+    per_request_timeout: std::time::Duration,
+    phase: TimeoutPhase,
+) -> String {
+    if is_connect {
+        // Connect-phase timeout: the TCP/TLS handshake didn't complete.
+        // reqwest sets both is_timeout() and is_connect() for this case.
+        format!("connect timeout: no connection established within {LLM_CONNECT_TIMEOUT:?}")
+    } else {
+        match phase {
+            TimeoutPhase::Transport => format!(
+                "read timeout: no response bytes received within {per_request_timeout:?} \
+                 (consider raising BUZZ_AGENT_LLM_TIMEOUT_SECS)"
+            ),
+            // Total-request timeout fired during body streaming: the response
+            // started but did not complete within the window.
+            TimeoutPhase::BodyRead => format!(
+                "request timed out: response did not complete within {per_request_timeout:?} \
+                 (consider raising BUZZ_AGENT_LLM_TIMEOUT_SECS)"
+            ),
+        }
+    }
+}
+
+/// Produce a human-readable description of a transport-layer reqwest error.
+///
+/// reqwest's `Display` for a timeout fire is the opaque
+/// `"error sending request for url (...)"` — the same text as every other
+/// pre-response failure — because the HTTP layer lumps them together.
+/// We replace that string with a factual message that names which kind of
+/// timeout fired, making it immediately obvious in logs whether the client
+/// never connected or whether no response bytes arrived within the window.
+///
+/// `per_request_timeout` is the `RequestBuilder::timeout()` value applied to
+/// the attempt that fired; it is the `escalated_timeout` for that attempt and
+/// may be larger than `cfg.llm_timeout` on retried attempts.
+fn classify_transport_error(
+    e: &reqwest::Error,
+    per_request_timeout: std::time::Duration,
+) -> String {
+    if e.is_timeout() {
+        timeout_message(e.is_connect(), per_request_timeout, TimeoutPhase::Transport)
+    } else {
+        format!("transport: {e}")
+    }
+}
+
+/// Produce a human-readable description of an error that occurred while
+/// reading response body chunks (`resp.chunk()`).
+///
+/// A timeout here means the total per-request budget expired during body
+/// streaming — headers (and possibly some body bytes) arrived but the response
+/// did not complete within the window. Non-final-attempt body timeouts are
+/// retried with an escalated budget before this function is called, so the
+/// message is only produced on the final attempt. Any other body-decode failure
+/// preserves the `"body read: ..."` prefix expected by callers and existing
+/// tests.
+///
+/// `per_request_timeout` is the `RequestBuilder::timeout()` value applied to
+/// the attempt that fired; it is the `escalated_timeout` for that attempt and
+/// may be larger than `cfg.llm_timeout` on retried attempts.
+fn classify_body_read_error(
+    e: &reqwest::Error,
+    per_request_timeout: std::time::Duration,
+) -> String {
+    if e.is_timeout() {
+        timeout_message(e.is_connect(), per_request_timeout, TimeoutPhase::BodyRead)
+    } else {
+        format!("body read: {e}")
+    }
+}
+
+/// Provider bodies that mean "this model cannot accept image input", the
+/// signal the agent loop uses to strip rejected images from history and
+/// continue the turn (see `replace_unsupported_images`).
+///
+/// Deliberately tight, same doctrine as [`is_context_length_error`]: each
+/// phrase is a verbatim capability rejection observed live. Misclassifying a
+/// generic 400 as recoverable would mutate history for an error that removing
+/// images cannot fix.
 fn is_unsupported_image_input_error(body: &str) -> bool {
-    body.to_ascii_lowercase()
-        .contains("no endpoints found that support image input")
+    let b = body.to_ascii_lowercase();
+    // OpenRouter 404: no provider endpoint accepts images for this model.
+    b.contains("no endpoints found that support image input")
+        // OpenAI-compatible 400 from text-only single-model deployments,
+        // e.g. Crusoe serverless GLM: `"crusoeai/GLM-5.2-NVFP4 is not a
+        // multimodal model"`. Without this arm the 400 is terminal, the image
+        // stays in history, and every subsequent request in the session fails
+        // identically — the turn wedges until the harness/user gives up.
+        || b.contains("is not a multimodal model")
 }
 
 /// Build the terminal `AgentError::Llm` for a `post()` exit that has given up
@@ -1816,6 +2032,7 @@ async fn post<F>(
     url: &str,
     body: &Value,
     detect_mesh_fallback: bool,
+    base_timeout: std::time::Duration,
     apply: F,
 ) -> Result<Value, PostError>
 where
@@ -1824,22 +2041,33 @@ where
     let body_bytes = serde_json::to_vec(body)
         .map_err(|e| PostError::Agent(AgentError::Llm(format!("serialize: {e}"))))?;
     let call_start = std::time::Instant::now();
-    for attempt in 0..MAX_RETRIES {
+    // Count prior attempts that ended with a timeout so we can double the
+    // budget on the next attempt. Non-timeout retryable failures (429, 5xx,
+    // connect resets) are not evidence of a slow model and do NOT escalate.
+    let mut timeout_failures: u32 = 0;
+    'attempt: for attempt in 0..MAX_RETRIES {
+        let per_request_timeout = escalated_timeout(base_timeout, timeout_failures);
         let resp = match apply(
             http.post(url)
                 .header("content-type", "application/json")
-                .body(body_bytes.clone()),
+                .body(body_bytes.clone())
+                .timeout(per_request_timeout),
         )
         .send()
         .await
         {
             Ok(r) => r,
             Err(e) => {
+                if e.is_timeout() {
+                    timeout_failures += 1;
+                }
                 if attempt + 1 < MAX_RETRIES && is_retryable_transport_error(&e) {
                     tracing::warn!(
                         attempt = attempt + 1,
                         max_attempts = MAX_RETRIES,
                         error = %e,
+                        is_timeout = e.is_timeout(),
+                        timeout_failures,
                         "llm: transport error, retrying"
                     );
                     backoff_with_jitter(attempt).await;
@@ -1848,7 +2076,7 @@ where
                 return Err(PostError::Agent(terminal_llm_error(
                     call_start.elapsed(),
                     attempt + 1,
-                    &format!("transport: {e}"),
+                    &classify_transport_error(&e, per_request_timeout),
                 )));
             }
         };
@@ -1916,6 +2144,13 @@ where
                     "{status}: {body}"
                 ))));
             }
+            // Image-capability rejection is equally recoverable and equally
+            // deterministic: a text-only deployment 400s the same request
+            // forever. Typed here (not just on the 404 arm) because
+            // OpenAI-compatible providers report it as a 400.
+            if status == 400 && is_unsupported_image_input_error(&body) {
+                return Err(PostError::Agent(AgentError::UnsupportedImageInput(body)));
+            }
             return Err(PostError::Agent(AgentError::Llm(format!(
                 "{status}: {body}"
             ))));
@@ -1933,6 +2168,7 @@ where
             match stream.chunk().await {
                 Ok(Some(chunk)) => {
                     if buf.len() + chunk.len() > MAX_LLM_RESPONSE_BYTES {
+                        // Size overflow: not a timeout, not retryable.
                         return Err(PostError::Agent(AgentError::Llm(format!(
                             "response exceeded {MAX_LLM_RESPONSE_BYTES} bytes"
                         ))));
@@ -1941,18 +2177,69 @@ where
                 }
                 Ok(None) => break,
                 Err(e) => {
+                    // A timeout during body streaming means the total
+                    // per-request budget expired mid-body (headers arrived but
+                    // the response stalled). Retry with an escalated budget,
+                    // same as a transport-phase timeout — the server may be
+                    // slow to flush, not permanently broken.
+                    if e.is_timeout() && attempt + 1 < MAX_RETRIES {
+                        timeout_failures += 1;
+                        tracing::warn!(
+                            attempt = attempt + 1,
+                            max_attempts = MAX_RETRIES,
+                            is_timeout = true,
+                            timeout_failures,
+                            error = %e,
+                            "llm: body-read timeout, retrying with escalated budget"
+                        );
+                        backoff_with_jitter(attempt).await;
+                        continue 'attempt;
+                    }
                     return Err(PostError::Agent(terminal_llm_error(
                         call_start.elapsed(),
                         attempt + 1,
-                        &format!("body read: {e}"),
+                        &classify_body_read_error(&e, per_request_timeout),
                     )));
                 }
             }
         }
-        return serde_json::from_slice(&buf)
-            .map_err(|e| PostError::Agent(AgentError::Llm(format!("json: {e}"))));
+        // A 2xx body that fails to parse (e.g. a provider flushing a
+        // truncated JSON document and closing the stream cleanly) is a
+        // transient upstream fault, not a request problem: retry it like a
+        // 5xx. Safe to re-send — a malformed body produced no parsed
+        // response, so no tool call was ever extracted from it, and the
+        // retried request is the identical completion POST captured in
+        // `body_bytes` at function entry.
+        match serde_json::from_slice(&buf) {
+            Ok(value) => return Ok(value),
+            Err(e) => {
+                if attempt + 1 < MAX_RETRIES {
+                    tracing::warn!(
+                        attempt = attempt + 1,
+                        max_attempts = MAX_RETRIES,
+                        error = %e,
+                        "llm: malformed response body, retrying"
+                    );
+                    backoff_with_jitter(attempt).await;
+                    continue;
+                }
+                return Err(PostError::Agent(terminal_llm_error(
+                    call_start.elapsed(),
+                    attempt + 1,
+                    &format!("json: {e}"),
+                )));
+            }
+        }
     }
-    unreachable!("loop always returns on its final iteration (attempt + 1 == MAX_RETRIES)");
+    // Unreachable in practice: every iteration either returns or continues.
+    // A fallthrough here would mean MAX_RETRIES was 0, which is rejected at
+    // config validation. Return a terminal error rather than panic so the
+    // invariant is not load-bearing.
+    Err(PostError::Agent(terminal_llm_error(
+        call_start.elapsed(),
+        MAX_RETRIES,
+        "exhausted retries",
+    )))
 }
 
 pub(crate) fn databricks_pkce_config(host: &str) -> PkceOAuthConfig {
@@ -1997,22 +2284,56 @@ pub(crate) fn build_token_source(cfg: &Config) -> Result<Arc<dyn TokenSource>, A
     }
 }
 
+/// Completion-token cap that [`Llm::summarize`] actually requests from
+/// `provider`, given the caller's visible-text budget. OpenRouter grants
+/// reasoning a separate, equal budget on top of the text budget (see
+/// [`openrouter_summary_body`]), so its top-level cap is double the caller's
+/// budget; every other provider requests the caller's budget unchanged.
+/// Callers that reserve output headroom in an input budget
+/// (`handoff_prompt_budget_bytes`) must reserve THIS value, not the text
+/// budget — otherwise input plus the actual completion allowance can exceed
+/// the configured context window.
+pub(crate) fn summary_completion_cap(provider: Provider, max_output_tokens: u32) -> u32 {
+    match provider {
+        Provider::OpenRouter => max_output_tokens.saturating_mul(2),
+        Provider::Anthropic | Provider::OpenAi | Provider::Databricks | Provider::DatabricksV2 => {
+            max_output_tokens
+        }
+    }
+}
+
 /// Build the request body for `Llm::summarize` on `Provider::OpenRouter`.
 /// Extracted so tests can assert on the actual wire shape instead of a
-/// hand-rolled literal — summaries never carry `reasoning` (see
-/// `apply_openrouter_mutations`, which the summary path never calls).
-/// It spells the token limit `max_tokens` directly for the same reason: the
-/// mutation that renames it is never applied here.
+/// hand-rolled literal — summaries never carry config-driven reasoning
+/// *effort* (see `apply_openrouter_mutations`, which the summary path never
+/// calls). It spells the token limit `max_tokens` directly for the same
+/// reason: the mutation that renames it is never applied here.
 fn openrouter_summary_body(
     effective_model: &str,
     system_prompt: &str,
     user_prompt: &str,
     max_output_tokens: u32,
 ) -> Value {
+    // Reasoning models spend output tokens thinking before emitting any
+    // visible text, and that spend counts against `max_tokens`. Left
+    // unseparated, a model can burn the entire cap mid-reasoning and return an
+    // empty `content` — observed with deepseek-v4-flash, where 13 consecutive
+    // handoff attempts length-stopped inside the reasoning channel and every
+    // one degraded to lossy history truncation. Give reasoning its own
+    // equal-sized budget on top of the text budget so `max_output_tokens`
+    // remains what the caller means: visible summary text. `exclude` keeps the
+    // reasoning out of the response body; `summarize()` only reads `content`.
+    // Non-reasoning endpoints ignore the `reasoning` object (see
+    // `apply_openrouter_mutations` on why it is never paired with
+    // `provider.require_parameters`).
     json!({
         "model": effective_model,
         "stream": false,
-        "max_tokens": max_output_tokens,
+        "max_tokens": summary_completion_cap(Provider::OpenRouter, max_output_tokens),
+        "reasoning": {
+            "max_tokens": max_output_tokens,
+            "exclude": true,
+        },
         "messages": [
             { "role": "system", "content": system_prompt },
             { "role": "user", "content": user_prompt },
@@ -2042,20 +2363,33 @@ enum OpenRouterErrorClass {
 
 /// Ceiling applied to the server-supplied `Retry-After` header before we
 /// sleep on it. OpenRouter can advertise waits up to an hour, but
-/// `openrouter_post`'s per-attempt sleep happens *outside*
-/// `Client::timeout` (`cfg.llm_timeout`, default 240s) — an unclamped hint
-/// could keep a single turn alive for up to two full-duration sleeps across
-/// `MAX_RETRIES`. Clamping (never rejecting) keeps us honoring the server's
-/// backoff signal while bounding worst-case turn latency to a value smaller
-/// than the connect/response timeout.
+/// `openrouter_post`'s per-attempt sleep happens *outside* the per-request
+/// `.timeout()` budget — an unclamped hint could keep a single turn alive for
+/// up to two full-duration sleeps across `MAX_RETRIES`. Clamping (never
+/// rejecting) keeps us honoring the server's backoff signal while bounding
+/// worst-case turn latency to a value smaller than the per-request timeout.
 const RETRY_AFTER_CAP_SECS: u64 = 60;
 
-fn parse_retry_after_header(headers: &reqwest::header::HeaderMap) -> Option<std::time::Duration> {
-    let val = headers.get(reqwest::header::RETRY_AFTER)?.to_str().ok()?;
+/// Compute the retry delay from a raw `Retry-After` header value.
+///
+/// Returns `Some(duration)` when the header is present, non-zero, and
+/// parseable as a decimal number of seconds; the value is capped at
+/// `RETRY_AFTER_CAP_SECS`. Returns `None` when the header is absent,
+/// unparseable, or zero — callers should fall back to `backoff_with_jitter`.
+///
+/// This is the single place the cap logic lives; `parse_retry_after_header`
+/// delegates here so the cap can be unit tested without an HTTP header map.
+fn retry_delay_for_429(header_value: Option<&str>) -> Option<std::time::Duration> {
+    let val = header_value?;
     let secs: u64 = val.trim().parse().ok()?;
     (secs > 0).then(|| std::time::Duration::from_secs(secs.min(RETRY_AFTER_CAP_SECS)))
 }
 
+fn parse_retry_after_header(headers: &reqwest::header::HeaderMap) -> Option<std::time::Duration> {
+    let val = headers.get(reqwest::header::RETRY_AFTER)?.to_str().ok()?;
+    retry_delay_for_429(Some(val))
+}
+
 fn classify_openrouter_error(
     status: u16,
     body: &str,
@@ -2098,11 +2432,16 @@ async fn openrouter_post(
     url: &str,
     body: &Value,
     bearer: &str,
+    base_timeout: std::time::Duration,
 ) -> Result<Value, AgentError> {
     let body_bytes =
         serde_json::to_vec(body).map_err(|e| AgentError::Llm(format!("serialize: {e}")))?;
     let call_start = std::time::Instant::now();
-    for attempt in 0..MAX_RETRIES {
+    // Count prior timeout failures for per-attempt budget escalation; see
+    // `escalated_timeout` for the doubling strategy.
+    let mut timeout_failures: u32 = 0;
+    'attempt: for attempt in 0..MAX_RETRIES {
+        let per_request_timeout = escalated_timeout(base_timeout, timeout_failures);
         let resp = match http
             .post(url)
             .header("content-type", "application/json")
@@ -2110,16 +2449,22 @@ async fn openrouter_post(
             .header("X-OpenRouter-Title", "Buzz")
             .bearer_auth(bearer)
             .body(body_bytes.clone())
+            .timeout(per_request_timeout)
             .send()
             .await
         {
             Ok(r) => r,
             Err(e) => {
+                if e.is_timeout() {
+                    timeout_failures += 1;
+                }
                 if attempt + 1 < MAX_RETRIES && is_retryable_transport_error(&e) {
                     tracing::warn!(
                         attempt = attempt + 1,
                         max_attempts = MAX_RETRIES,
                         error = %e,
+                        is_timeout = e.is_timeout(),
+                        timeout_failures,
                         "llm: openrouter transport error, retrying"
                     );
                     backoff_with_jitter(attempt).await;
@@ -2128,7 +2473,7 @@ async fn openrouter_post(
                 return Err(terminal_llm_error(
                     call_start.elapsed(),
                     attempt + 1,
-                    &format!("transport: {e}"),
+                    &classify_transport_error(&e, per_request_timeout),
                 ));
             }
         };
@@ -2237,6 +2582,12 @@ async fn openrouter_post(
             if status == 400 && is_context_length_error(&body) {
                 return Err(AgentError::LlmContextExceeded(format!("{status}: {body}")));
             }
+            // Same 400-shaped image rejection as the shared `post()` terminal:
+            // OpenRouter normally reports this as a 404 (handled above), but a
+            // BYOK/passthrough upstream can surface the provider's own 400.
+            if status == 400 && is_unsupported_image_input_error(&body) {
+                return Err(AgentError::UnsupportedImageInput(body));
+            }
             return Err(AgentError::Llm(format!("{status}: {body}")));
         }
         if let Some(len) = resp.content_length() {
@@ -2260,15 +2611,55 @@ async fn openrouter_post(
                 }
                 Ok(None) => break,
                 Err(e) => {
+                    // Body-read timeout: retry with escalated budget, same as
+                    // transport-phase timeouts — see the corresponding arm in
+                    // `post()` for the full rationale.
+                    if e.is_timeout() && attempt + 1 < MAX_RETRIES {
+                        timeout_failures += 1;
+                        tracing::warn!(
+                            attempt = attempt + 1,
+                            max_attempts = MAX_RETRIES,
+                            is_timeout = true,
+                            timeout_failures,
+                            error = %e,
+                            "llm: openrouter body-read timeout, retrying with escalated budget"
+                        );
+                        backoff_with_jitter(attempt).await;
+                        continue 'attempt;
+                    }
                     return Err(terminal_llm_error(
                         call_start.elapsed(),
                         attempt + 1,
-                        &format!("body read: {e}"),
-                    ))
+                        &classify_body_read_error(&e, per_request_timeout),
+                    ));
+                }
+            }
+        }
+        // Same malformed-body retry as the shared `post()` terminal: a
+        // truncated 2xx JSON body is transient upstream trouble, and
+        // re-sending is provably tool-safe — nothing was parsed, so no tool
+        // call could have been extracted, and the retry re-uses the
+        // identical `body_bytes` completion request.
+        match serde_json::from_slice(&buf) {
+            Ok(value) => return Ok(value),
+            Err(e) => {
+                if attempt + 1 < MAX_RETRIES {
+                    tracing::warn!(
+                        attempt = attempt + 1,
+                        max_attempts = MAX_RETRIES,
+                        error = %e,
+                        "llm: openrouter malformed response body, retrying"
+                    );
+                    backoff_with_jitter(attempt).await;
+                    continue;
                 }
+                return Err(terminal_llm_error(
+                    call_start.elapsed(),
+                    attempt + 1,
+                    &format!("json: {e}"),
+                ));
             }
         }
-        return serde_json::from_slice(&buf).map_err(|e| AgentError::Llm(format!("json: {e}")));
     }
     Err(terminal_llm_error(
         call_start.elapsed(),
@@ -2384,7 +2775,7 @@ fn apply_anthropic_cache_control(body: &mut serde_json::Map<String, Value>) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::config::{Config, HookServers, OpenAiApi, Provider};
+    use crate::config::{Config, HookServers, OpenAiApi, Provider, ThinkingSummary};
     use crate::types::{HistoryItem, ToolCall, ToolResult, ToolResultContent};
     use std::collections::VecDeque;
     use std::time::Duration;
@@ -2422,6 +2813,7 @@ mod tests {
             prefer_mesh_for_auto: false,
             hints_enabled: true,
             thinking_effort: None,
+            thinking_summary: ThinkingSummary::Auto,
             prompt_caching: true,
         }
     }
@@ -3263,10 +3655,51 @@ mod tests {
         let v = serde_json::json!({
             "status": "incomplete",
             "incomplete_details": {"reason": "max_output_tokens"},
-            "output": [],
+            "output": [{
+                "type": "function_call",
+                "call_id": "partial",
+                "name": "dev__shell",
+                "arguments": "{\"command\":\"unterminated",
+            }],
         });
         let r = parse_responses(v).unwrap();
         assert_eq!(r.stop, ProviderStop::MaxTokens);
+        assert!(r.tool_calls.is_empty());
+    }
+
+    #[test]
+    fn truncated_openai_tool_arguments_are_discarded_not_rejected() {
+        let v = serde_json::json!({
+            "choices": [{
+                "finish_reason": "length",
+                "message": {
+                    "content": "partial text",
+                    "tool_calls": [{
+                        "id": "partial",
+                        "type": "function",
+                        "function": {
+                            "name": "dev__shell",
+                            "arguments": "{\"command\":\"unterminated",
+                        },
+                    }],
+                },
+            }],
+        });
+        let r = parse_openai(v).unwrap();
+        assert_eq!(r.stop, ProviderStop::MaxTokens);
+        assert_eq!(r.text, "partial text");
+        assert!(r.tool_calls.is_empty());
+    }
+
+    #[test]
+    fn truncated_anthropic_tool_use_is_discarded_not_rejected() {
+        let v = serde_json::json!({
+            "stop_reason": "max_tokens",
+            "content": [{"type": "tool_use", "id": "", "name": "", "input": null}],
+        });
+        let r = parse_anthropic(v).unwrap();
+        assert_eq!(r.stop, ProviderStop::MaxTokens);
+        assert!(r.tool_calls.is_empty());
     }
 
     #[test]
@@ -3839,6 +4272,75 @@ mod tests {
             Some(ThinkingEffort::Low),
         );
         assert_eq!(body["reasoning"]["effort"], "low");
+        // summary defaults to "auto" when effort is set.
+        assert_eq!(body["reasoning"]["summary"], "auto");
+    }
+
+    #[test]
+    fn responses_body_summary_present_iff_effort_set() {
+        // effort set → reasoning object present with both effort and summary.
+        let body_with_effort = responses_body(
+            &cfg_responses(),
+            "system",
+            &[HistoryItem::User("hi".into())],
+            &[],
+            "model",
+            Some(ThinkingEffort::Medium),
+        );
+        assert!(
+            body_with_effort.get("reasoning").is_some(),
+            "reasoning must be present when effort is set"
+        );
+        assert_eq!(body_with_effort["reasoning"]["effort"], "medium");
+        assert_eq!(body_with_effort["reasoning"]["summary"], "auto");
+
+        // effort None → reasoning object entirely absent.
+        let body_no_effort = responses_body(
+            &cfg_responses(),
+            "system",
+            &[HistoryItem::User("hi".into())],
+            &[],
+            "model",
+            None,
+        );
+        assert!(
+            body_no_effort.get("reasoning").is_none(),
+            "reasoning must be absent when effort is None"
+        );
+    }
+
+    #[test]
+    fn responses_body_emits_configured_summary_mode() {
+        let mut cfg = cfg_responses();
+        cfg.thinking_summary = ThinkingSummary::Detailed;
+        let body = responses_body(
+            &cfg,
+            "system",
+            &[HistoryItem::User("hi".into())],
+            &[],
+            "model",
+            Some(ThinkingEffort::High),
+        );
+        assert_eq!(body["reasoning"]["effort"], "high");
+        assert_eq!(
+            body["reasoning"]["summary"], "detailed",
+            "configured summary mode must be forwarded to reasoning object"
+        );
+    }
+
+    #[test]
+    fn responses_body_concise_summary_mode() {
+        let mut cfg = cfg_responses();
+        cfg.thinking_summary = ThinkingSummary::Concise;
+        let body = responses_body(
+            &cfg,
+            "system",
+            &[HistoryItem::User("hi".into())],
+            &[],
+            "model",
+            Some(ThinkingEffort::Low),
+        );
+        assert_eq!(body["reasoning"]["summary"], "concise");
     }
 
     #[test]
@@ -4179,9 +4681,16 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let out = post(&client, &url, &serde_json::json!({}), false, |b| b)
-            .await
-            .expect("post should succeed after retry");
+        let out = post(
+            &client,
+            &url,
+            &serde_json::json!({}),
+            false,
+            Duration::from_secs(5),
+            |b| b,
+        )
+        .await
+        .expect("post should succeed after retry");
         assert_eq!(out, serde_json::json!({ "ok": true }));
         assert!(
             accepts.load(Ordering::SeqCst) >= 2,
@@ -4243,9 +4752,16 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let out = post(&client, &url, &serde_json::json!({}), false, |b| b)
-            .await
-            .expect("post should succeed after 499 retry");
+        let out = post(
+            &client,
+            &url,
+            &serde_json::json!({}),
+            false,
+            Duration::from_secs(5),
+            |b| b,
+        )
+        .await
+        .expect("post should succeed after 499 retry");
         assert_eq!(out, serde_json::json!({ "ok": true }));
         assert!(
             accepts.load(Ordering::SeqCst) >= 2,
@@ -4294,9 +4810,16 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let err = post(&client, &url, &serde_json::json!({}), false, |b| b)
-            .await
-            .unwrap_err();
+        let err = post(
+            &client,
+            &url,
+            &serde_json::json!({}),
+            false,
+            Duration::from_secs(5),
+            |b| b,
+        )
+        .await
+        .unwrap_err();
         match &err {
             PostError::Agent(AgentError::Llm(msg)) => {
                 assert!(
@@ -4317,40 +4840,435 @@ mod tests {
         );
     }
 
-    /// `terminal_llm_error` below `STALL_NOTICE_THRESHOLD` carries the detail
-    /// and attempt count but no stall-specific text — this is the common case
-    /// (a handful of quick retries), not an outage.
-    #[test]
-    fn terminal_llm_error_below_threshold_carries_detail_no_stall_claim() {
-        let err = terminal_llm_error(Duration::from_secs(2), 3, "exhausted retries: 499: body");
-        match err {
-            AgentError::Llm(msg) => {
-                assert!(msg.contains("cumulative 2s"), "must carry duration: {msg}");
-                assert!(
-                    msg.contains("3 attempts"),
-                    "must carry attempt count: {msg}"
-                );
-                assert!(
-                    msg.contains("exhausted retries") && msg.contains("499"),
-                    "must preserve detail: {msg}"
-                );
-            }
-            other => panic!("expected Llm, got: {other:?}"),
-        }
-    }
+    /// Regression (write-compressor, tb21-twins-1): a provider returning
+    /// HTTP 200 with a *truncated* JSON body (cleanly closed, correct
+    /// framing, unparseable content) previously surfaced as a terminal
+    /// `AgentError::Llm("json: EOF while parsing a value ...")` on the very
+    /// first attempt, killing the agent turn. A malformed body is transient
+    /// upstream trouble and must be retried like a 5xx. Re-sending is
+    /// tool-safe: nothing was parsed, so no tool call was extracted from the
+    /// bad body, and the retry replays the identical completion request.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn post_retries_malformed_json_body_and_succeeds() {
+        use std::sync::atomic::{AtomicU32, Ordering};
+        use std::sync::Arc;
+        use tokio::io::{AsyncReadExt, AsyncWriteExt};
+        use tokio::net::TcpListener;
 
-    /// Above `STALL_NOTICE_THRESHOLD`, the error still carries the same
-    /// detail/duration/count — the threshold only gates the extra
-    /// `tracing::warn!` (not separately assertable here), not the error text.
-    /// Singular "1 attempt" (not "1 attempts") confirms the pluralization.
-    #[test]
-    fn terminal_llm_error_above_threshold_uses_singular_attempt() {
-        let err = terminal_llm_error(Duration::from_secs(301), 1, "transport: connection reset");
-        match err {
-            AgentError::Llm(msg) => {
-                assert!(
-                    msg.contains("cumulative 301s"),
-                    "must carry duration: {msg}"
+        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let url = format!("http://{}/v1/x", listener.local_addr().unwrap());
+        let accepts = Arc::new(AtomicU32::new(0));
+        let accepts_srv = accepts.clone();
+
+        tokio::spawn(async move {
+            loop {
+                let (mut sock, _) = match listener.accept().await {
+                    Ok(p) => p,
+                    Err(_) => return,
+                };
+                let n = accepts_srv.fetch_add(1, Ordering::SeqCst);
+                let mut buf = Vec::new();
+                let mut tmp = [0u8; 4096];
+                while !buf.windows(4).any(|w| w == b"\r\n\r\n") {
+                    match sock.read(&mut tmp).await {
+                        Ok(0) | Err(_) => return,
+                        Ok(k) => buf.extend_from_slice(&tmp[..k]),
+                    }
+                }
+                if n == 0 {
+                    // First attempt: 200 OK with a truncated JSON document.
+                    // Content-Length matches the bytes actually sent, so the
+                    // body read completes cleanly — the fault is purely that
+                    // the JSON is cut off mid-value.
+                    let body = "{\"choices\":[{\"mess";
+                    let resp = format!(
+                        "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\
+                         Content-Length: {}\r\nConnection: close\r\n\r\n{}",
+                        body.len(),
+                        body,
+                    );
+                    let _ = sock.write_all(resp.as_bytes()).await;
+                    let _ = sock.shutdown().await;
+                    continue;
+                }
+                // Subsequent attempts: complete valid JSON.
+                let body = "{\"ok\":true}";
+                let resp = format!(
+                    "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\
+                     Content-Length: {}\r\nConnection: close\r\n\r\n{}",
+                    body.len(),
+                    body,
+                );
+                let _ = sock.write_all(resp.as_bytes()).await;
+                let _ = sock.shutdown().await;
+            }
+        });
+
+        let client = Client::builder()
+            .timeout(Duration::from_secs(5))
+            .build()
+            .unwrap();
+        let out = post(
+            &client,
+            &url,
+            &serde_json::json!({}),
+            false,
+            Duration::from_secs(5),
+            |b| b,
+        )
+        .await
+        .expect("post should succeed after retrying the malformed body");
+        assert_eq!(out, serde_json::json!({ "ok": true }));
+        assert_eq!(
+            accepts.load(Ordering::SeqCst),
+            2,
+            "server must see exactly 2 attempts (malformed body retried once)"
+        );
+    }
+
+    /// A persistently malformed 200 body exhausts MAX_RETRIES and surfaces
+    /// the terminal error with the `json:` detail plus cumulative
+    /// duration/attempt count — never an early first-attempt death.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn post_exhausts_retries_on_persistent_malformed_json() {
+        use std::sync::atomic::{AtomicU32, Ordering};
+        use std::sync::Arc;
+        use tokio::io::{AsyncReadExt, AsyncWriteExt};
+        use tokio::net::TcpListener;
+
+        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let url = format!("http://{}/v1/x", listener.local_addr().unwrap());
+        let accepts = Arc::new(AtomicU32::new(0));
+        let accepts_srv = accepts.clone();
+
+        tokio::spawn(async move {
+            loop {
+                let (mut sock, _) = match listener.accept().await {
+                    Ok(p) => p,
+                    Err(_) => return,
+                };
+                accepts_srv.fetch_add(1, Ordering::SeqCst);
+                let mut buf = Vec::new();
+                let mut tmp = [0u8; 4096];
+                while !buf.windows(4).any(|w| w == b"\r\n\r\n") {
+                    match sock.read(&mut tmp).await {
+                        Ok(0) | Err(_) => return,
+                        Ok(k) => buf.extend_from_slice(&tmp[..k]),
+                    }
+                }
+                let body = "{\"choices\":[{\"mess";
+                let resp = format!(
+                    "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\
+                     Content-Length: {}\r\nConnection: close\r\n\r\n{}",
+                    body.len(),
+                    body,
+                );
+                let _ = sock.write_all(resp.as_bytes()).await;
+                let _ = sock.shutdown().await;
+            }
+        });
+
+        let client = Client::builder()
+            .timeout(Duration::from_secs(5))
+            .build()
+            .unwrap();
+        let err = post(
+            &client,
+            &url,
+            &serde_json::json!({}),
+            false,
+            Duration::from_secs(5),
+            |b| b,
+        )
+        .await
+        .unwrap_err();
+        match &err {
+            PostError::Agent(AgentError::Llm(msg)) => {
+                assert!(
+                    msg.contains("json:"),
+                    "expected the json parse detail, got: {msg}"
+                );
+                assert!(
+                    msg.contains("cumulative") && msg.contains("3 attempts"),
+                    "expected cumulative duration + exact attempt count, got: {msg}"
+                );
+            }
+            other => panic!("expected PostError::Agent(AgentError::Llm), got: {other:?}"),
+        }
+        assert_eq!(
+            accepts.load(Ordering::SeqCst),
+            MAX_RETRIES,
+            "server must see exactly MAX_RETRIES attempts — malformed bodies must be retried"
+        );
+    }
+
+    /// Same regression coverage for `openrouter_post`, which carries its own
+    /// retry loop: a truncated 200 body on the first attempt is retried and
+    /// the call succeeds on the second.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn openrouter_post_retries_malformed_json_body_and_succeeds() {
+        use std::sync::atomic::{AtomicU32, Ordering};
+        use std::sync::Arc;
+        use tokio::io::{AsyncReadExt, AsyncWriteExt};
+        use tokio::net::TcpListener;
+
+        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let url = format!("http://{}/v1/x", listener.local_addr().unwrap());
+        let accepts = Arc::new(AtomicU32::new(0));
+        let accepts_srv = accepts.clone();
+
+        tokio::spawn(async move {
+            loop {
+                let (mut sock, _) = match listener.accept().await {
+                    Ok(p) => p,
+                    Err(_) => return,
+                };
+                let n = accepts_srv.fetch_add(1, Ordering::SeqCst);
+                let mut buf = Vec::new();
+                let mut tmp = [0u8; 4096];
+                while !buf.windows(4).any(|w| w == b"\r\n\r\n") {
+                    match sock.read(&mut tmp).await {
+                        Ok(0) | Err(_) => return,
+                        Ok(k) => buf.extend_from_slice(&tmp[..k]),
+                    }
+                }
+                if n == 0 {
+                    let body = "{\"choices\":[{\"mess";
+                    let resp = format!(
+                        "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\
+                         Content-Length: {}\r\nConnection: close\r\n\r\n{}",
+                        body.len(),
+                        body,
+                    );
+                    let _ = sock.write_all(resp.as_bytes()).await;
+                    let _ = sock.shutdown().await;
+                    continue;
+                }
+                let body = r#"{"choices":[{"message":{"role":"assistant","content":"ok"},"finish_reason":"stop"}]}"#;
+                let resp = format!(
+                    "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\
+                     Content-Length: {}\r\nConnection: close\r\n\r\n{}",
+                    body.len(),
+                    body,
+                );
+                let _ = sock.write_all(resp.as_bytes()).await;
+                let _ = sock.shutdown().await;
+            }
+        });
+
+        let client = Client::builder()
+            .timeout(Duration::from_secs(5))
+            .build()
+            .unwrap();
+        let out = openrouter_post(&client, &url, &json!({}), "key", Duration::from_secs(5))
+            .await
+            .expect("openrouter_post should succeed after retrying the malformed body");
+        assert!(out.is_object(), "expected a JSON object: {out:?}");
+        assert_eq!(
+            accepts.load(Ordering::SeqCst),
+            2,
+            "server must see exactly 2 attempts (malformed body retried once)"
+        );
+    }
+
+    /// A body-read timeout on the first attempt triggers a retry under an
+    /// escalated budget, and the call succeeds on the second attempt.
+    ///
+    /// The stub sends HTTP 200 headers for the first request, writes a partial
+    /// body, then stalls long enough to exhaust the base timeout (1 s).  On the
+    /// second request it sends a complete response immediately.  The test asserts
+    /// that `post()` returns success and that the server saw exactly 2 requests.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn post_body_read_timeout_retries_with_escalated_budget() {
+        use std::sync::atomic::{AtomicU32, Ordering};
+        use std::sync::Arc;
+        use tokio::io::{AsyncReadExt, AsyncWriteExt};
+        use tokio::net::TcpListener;
+
+        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let url = format!("http://{}/v1/x", listener.local_addr().unwrap());
+        let accepts = Arc::new(AtomicU32::new(0));
+        let accepts_srv = accepts.clone();
+
+        tokio::spawn(async move {
+            loop {
+                let (mut sock, _) = match listener.accept().await {
+                    Ok(p) => p,
+                    Err(_) => return,
+                };
+                let n = accepts_srv.fetch_add(1, Ordering::SeqCst);
+
+                // Drain the incoming request headers on every attempt.
+                let mut buf = Vec::new();
+                let mut tmp = [0u8; 4096];
+                while !buf.windows(4).any(|w| w == b"\r\n\r\n") {
+                    match sock.read(&mut tmp).await {
+                        Ok(0) | Err(_) => return,
+                        Ok(k) => buf.extend_from_slice(&tmp[..k]),
+                    }
+                }
+
+                if n == 0 {
+                    // First attempt: declare a 64-byte body, send only 4 bytes,
+                    // then stall for 3 s — long enough to outlast the 1 s
+                    // base timeout and trigger a body-read timeout.
+                    let _ = sock
+                        .write_all(
+                            b"HTTP/1.1 200 OK\r\n\
+                              Content-Type: application/json\r\n\
+                              Content-Length: 64\r\n\
+                              \r\n\
+                              {\"s",
+                        )
+                        .await;
+                    tokio::time::sleep(std::time::Duration::from_secs(3)).await;
+                    // Connection closes here; the client has already timed out.
+                    continue;
+                }
+
+                // Second attempt: complete a valid JSON response immediately.
+                let body = r#"{"stop_reason":"end_turn","content":[{"type":"text","text":"ok"}],"usage":{"input_tokens":1,"output_tokens":1}}"#;
+                let resp = format!(
+                    "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\
+                     Content-Length: {}\r\nConnection: close\r\n\r\n{}",
+                    body.len(),
+                    body,
+                );
+                let _ = sock.write_all(resp.as_bytes()).await;
+                let _ = sock.shutdown().await;
+            }
+        });
+
+        // No client-level timeout — per-request timeout is applied inside post().
+        let client = Client::builder().build().unwrap();
+        let out = post(
+            &client,
+            &url,
+            &serde_json::json!({"model": "x"}),
+            false,
+            // Small base timeout so the body stall triggers quickly.
+            Duration::from_secs(1),
+            |b| b,
+        )
+        .await
+        .expect("post should succeed on the second attempt after body-read timeout");
+        assert!(out.is_object(), "expected a JSON object response: {out:?}");
+        assert_eq!(
+            accepts.load(Ordering::SeqCst),
+            2,
+            "server must see exactly 2 requests (body-read timeout retry)"
+        );
+    }
+
+    /// `openrouter_post`: a body-read timeout on the first attempt retries under
+    /// an escalated budget and succeeds on the second attempt.
+    ///
+    /// Same shape as `post_body_read_timeout_retries_with_escalated_budget` —
+    /// the stub stalls mid-body on the first request, then returns a complete
+    /// response immediately on the second.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn openrouter_post_body_read_timeout_retries_with_escalated_budget() {
+        use std::sync::atomic::{AtomicU32, Ordering};
+        use std::sync::Arc;
+        use tokio::io::{AsyncReadExt, AsyncWriteExt};
+        use tokio::net::TcpListener;
+
+        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let url = format!("http://{}/chat/completions", listener.local_addr().unwrap());
+        let accepts = Arc::new(AtomicU32::new(0));
+        let accepts_srv = accepts.clone();
+
+        tokio::spawn(async move {
+            loop {
+                let (mut sock, _) = match listener.accept().await {
+                    Ok(p) => p,
+                    Err(_) => return,
+                };
+                let n = accepts_srv.fetch_add(1, Ordering::SeqCst);
+
+                let mut buf = Vec::new();
+                let mut tmp = [0u8; 4096];
+                while !buf.windows(4).any(|w| w == b"\r\n\r\n") {
+                    match sock.read(&mut tmp).await {
+                        Ok(0) | Err(_) => return,
+                        Ok(k) => buf.extend_from_slice(&tmp[..k]),
+                    }
+                }
+
+                if n == 0 {
+                    // First attempt: declare 64-byte body, send 4 bytes, stall.
+                    let _ = sock
+                        .write_all(
+                            b"HTTP/1.1 200 OK\r\n\
+                              Content-Type: application/json\r\n\
+                              Content-Length: 64\r\n\
+                              \r\n\
+                              {\"c",
+                        )
+                        .await;
+                    tokio::time::sleep(std::time::Duration::from_secs(3)).await;
+                    continue;
+                }
+
+                // Second attempt: complete valid OpenRouter JSON response.
+                let body = r#"{"choices":[{"message":{"role":"assistant","content":"ok"},"finish_reason":"stop"}]}"#;
+                let resp = format!(
+                    "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\
+                     Content-Length: {}\r\nConnection: close\r\n\r\n{}",
+                    body.len(),
+                    body,
+                );
+                let _ = sock.write_all(resp.as_bytes()).await;
+                let _ = sock.shutdown().await;
+            }
+        });
+
+        let client = Client::builder().build().unwrap();
+        let out = openrouter_post(&client, &url, &json!({}), "key", Duration::from_secs(1))
+            .await
+            .expect("openrouter_post should succeed on the second attempt after body-read timeout");
+        assert!(out.is_object(), "expected a JSON object: {out:?}");
+        assert_eq!(
+            accepts.load(Ordering::SeqCst),
+            2,
+            "server must see exactly 2 requests (body-read timeout retry)"
+        );
+    }
+
+    /// `terminal_llm_error` below `STALL_NOTICE_THRESHOLD` carries the detail
+    /// and attempt count but no stall-specific text — this is the common case
+    /// (a handful of quick retries), not an outage.
+    #[test]
+    fn terminal_llm_error_below_threshold_carries_detail_no_stall_claim() {
+        let err = terminal_llm_error(Duration::from_secs(2), 3, "exhausted retries: 499: body");
+        match err {
+            AgentError::Llm(msg) => {
+                assert!(msg.contains("cumulative 2s"), "must carry duration: {msg}");
+                assert!(
+                    msg.contains("3 attempts"),
+                    "must carry attempt count: {msg}"
+                );
+                assert!(
+                    msg.contains("exhausted retries") && msg.contains("499"),
+                    "must preserve detail: {msg}"
+                );
+            }
+            other => panic!("expected Llm, got: {other:?}"),
+        }
+    }
+
+    /// Above `STALL_NOTICE_THRESHOLD`, the error still carries the same
+    /// detail/duration/count — the threshold only gates the extra
+    /// `tracing::warn!` (not separately assertable here), not the error text.
+    /// Singular "1 attempt" (not "1 attempts") confirms the pluralization.
+    #[test]
+    fn terminal_llm_error_above_threshold_uses_singular_attempt() {
+        let err = terminal_llm_error(Duration::from_secs(301), 1, "transport: connection reset");
+        match err {
+            AgentError::Llm(msg) => {
+                assert!(
+                    msg.contains("cumulative 301s"),
+                    "must carry duration: {msg}"
                 );
                 assert!(msg.contains("1 attempt"), "must carry count: {msg}");
                 assert!(
@@ -4362,94 +5280,451 @@ mod tests {
         }
     }
 
-    /// Captures `tracing::warn!` events emitted during a scoped subscriber
-    /// so a test can assert on the stall-notice threshold without a real
-    /// sleep or a global logger.
-    struct StallWarnCapture {
-        count: Arc<std::sync::atomic::AtomicUsize>,
+    /// Captures `tracing::warn!` events emitted during a scoped subscriber
+    /// so a test can assert on the stall-notice threshold without a real
+    /// sleep or a global logger.
+    struct StallWarnCapture {
+        count: Arc<std::sync::atomic::AtomicUsize>,
+    }
+
+    struct StallWarnVisitor {
+        saw_cumulative_stall: bool,
+        saw_attempts: bool,
+    }
+
+    impl tracing::field::Visit for StallWarnVisitor {
+        fn record_debug(&mut self, field: &tracing::field::Field, _value: &dyn std::fmt::Debug) {
+            match field.name() {
+                "cumulative_stall" => self.saw_cumulative_stall = true,
+                "attempts" => self.saw_attempts = true,
+                _ => {}
+            }
+        }
+
+        fn record_u64(&mut self, field: &tracing::field::Field, _value: u64) {
+            if field.name() == "attempts" {
+                self.saw_attempts = true;
+            }
+        }
+    }
+
+    impl<S: tracing::Subscriber> tracing_subscriber::Layer<S> for StallWarnCapture {
+        fn on_event(
+            &self,
+            event: &tracing::Event<'_>,
+            _ctx: tracing_subscriber::layer::Context<'_, S>,
+        ) {
+            if *event.metadata().level() != tracing::Level::WARN {
+                return;
+            }
+            let mut visitor = StallWarnVisitor {
+                saw_cumulative_stall: false,
+                saw_attempts: false,
+            };
+            event.record(&mut visitor);
+            if visitor.saw_cumulative_stall && visitor.saw_attempts {
+                self.count.fetch_add(1, Ordering::SeqCst);
+            }
+        }
+    }
+
+    /// Runs `f` under a scoped subscriber that only counts `WARN` events
+    /// carrying both `cumulative_stall` and `attempts` fields — the shape
+    /// `terminal_llm_error`'s stall notice emits. Returns that count.
+    fn count_stall_warnings(f: impl FnOnce()) -> usize {
+        let count = Arc::new(std::sync::atomic::AtomicUsize::new(0));
+        let subscriber = tracing_subscriber::registry().with(StallWarnCapture {
+            count: count.clone(),
+        });
+        tracing::subscriber::with_default(subscriber, f);
+        count.load(Ordering::SeqCst)
+    }
+
+    /// Below `STALL_NOTICE_THRESHOLD`, `terminal_llm_error` must not emit the
+    /// stall warning at all — otherwise every ordinary retry-exhaustion would
+    /// falsely read as an outage. This is mutation-sensitive: deleting the
+    /// threshold branch, weakening `>=` to `>` at the boundary, or an
+    /// always-warn mutation are all caught by pairing this with the 300s case
+    /// below.
+    #[test]
+    fn terminal_llm_error_below_threshold_emits_no_stall_warning() {
+        let warnings = count_stall_warnings(|| {
+            let _ = terminal_llm_error(Duration::from_secs(299), 3, "exhausted retries: 499");
+        });
+        assert_eq!(warnings, 0, "no stall warning below STALL_NOTICE_THRESHOLD");
+    }
+
+    /// At `STALL_NOTICE_THRESHOLD`, `terminal_llm_error` must emit exactly
+    /// one stall warning carrying the duration and attempt count — the
+    /// never-warn mutation is caught here; combined with the 299s case above,
+    /// a deleted branch or an always-warn mutation are caught by whichever
+    /// assertion it violates.
+    #[test]
+    fn terminal_llm_error_at_threshold_emits_one_stall_warning() {
+        let warnings = count_stall_warnings(|| {
+            let _ = terminal_llm_error(Duration::from_secs(300), 5, "transport: connection reset");
+        });
+        assert_eq!(
+            warnings, 1,
+            "exactly one stall warning with duration+attempts fields at threshold"
+        );
+    }
+
+    // ---- escalated_timeout (pure-function tests) ----------------------------
+
+    /// No prior timeouts → budget is base unchanged.
+    #[test]
+    fn escalated_timeout_zero_failures_returns_base() {
+        let base = Duration::from_secs(240);
+        assert_eq!(
+            escalated_timeout(base, 0),
+            base,
+            "0 timeout failures must return base unchanged"
+        );
+    }
+
+    /// One prior timeout → budget doubles.
+    #[test]
+    fn escalated_timeout_one_failure_doubles() {
+        let base = Duration::from_secs(240);
+        assert_eq!(
+            escalated_timeout(base, 1),
+            Duration::from_secs(480),
+            "1 timeout failure must double the base to 480s"
+        );
+    }
+
+    /// Two prior timeouts → budget quadruples.
+    #[test]
+    fn escalated_timeout_two_failures_quadruples() {
+        let base = Duration::from_secs(240);
+        assert_eq!(
+            escalated_timeout(base, 2),
+            Duration::from_secs(960),
+            "2 timeout failures must quadruple the base to 960s"
+        );
+    }
+
+    /// At three prior timeouts (base 240 s, 240×8 = 1920 s) the cap kicks in
+    /// and the result is clamped to ESCALATION_TIMEOUT_CAP (1200 s).
+    #[test]
+    fn escalated_timeout_three_failures_capped_at_1200s() {
+        let base = Duration::from_secs(240);
+        assert_eq!(
+            escalated_timeout(base, 3),
+            Duration::from_secs(1200),
+            "3 timeout failures with 240s base must be capped at 1200s"
+        );
+    }
+
+    /// When base already exceeds the cap, the cap is raised to base (we never
+    /// shrink the operator-configured budget).
+    #[test]
+    fn escalated_timeout_base_above_cap_is_never_shrunk() {
+        let base = Duration::from_secs(1500);
+        // All scaled values (1×, 2×, 4×, …) are ≥ base, and the effective cap
+        // is max(ESCALATION_TIMEOUT_CAP, base) = 1500s, so they're all clamped
+        // to 1500s.
+        assert_eq!(
+            escalated_timeout(base, 0),
+            Duration::from_secs(1500),
+            "base 1500s at 0 failures must stay 1500s"
+        );
+        assert_eq!(
+            escalated_timeout(base, 1),
+            Duration::from_secs(1500),
+            "base 1500s at 1 failure must be capped at 1500s (not truncated to 1200s)"
+        );
+    }
+
+    // ---- timeout_message (pure-function tests, no network) ------------------
+
+    /// Connect timeout (is_connect=true) wins regardless of phase and shows
+    /// the LLM_CONNECT_TIMEOUT value — never the read-timeout text.
+    #[test]
+    fn timeout_message_connect_true_shows_connect_timeout() {
+        let llm = std::time::Duration::from_secs(240);
+        for phase in [TimeoutPhase::Transport, TimeoutPhase::BodyRead] {
+            let msg = timeout_message(true, llm, phase);
+            assert!(
+                msg.starts_with("connect timeout:"),
+                "is_connect=true must start with 'connect timeout:': {msg}"
+            );
+            // The configured connect timeout (10s) must appear verbatim.
+            assert!(
+                msg.contains("10s"),
+                "connect timeout must include the 10s configured value: {msg}"
+            );
+            assert!(
+                !msg.contains("read timeout"),
+                "connect timeout must not mention 'read timeout': {msg}"
+            );
+            assert!(
+                !msg.contains("BUZZ_AGENT_LLM_TIMEOUT_SECS"),
+                "connect timeout must not reference the read-timeout config knob: {msg}"
+            );
+        }
+    }
+
+    /// Transport read-timeout (is_connect=false, Transport phase) shows the
+    /// configured llm_timeout value and the config-knob hint.
+    #[test]
+    fn timeout_message_transport_phase_shows_read_timeout_and_duration() {
+        let llm = std::time::Duration::from_secs(240);
+        let msg = timeout_message(false, llm, TimeoutPhase::Transport);
+        assert!(
+            msg.starts_with("read timeout:"),
+            "transport read-timeout must start with 'read timeout:': {msg}"
+        );
+        assert!(
+            msg.contains("240s"),
+            "transport read-timeout must include the 240s configured value: {msg}"
+        );
+        assert!(
+            msg.contains("BUZZ_AGENT_LLM_TIMEOUT_SECS"),
+            "transport read-timeout must reference the config knob: {msg}"
+        );
+        assert!(
+            !msg.contains("connect timeout"),
+            "transport read-timeout must not say 'connect timeout': {msg}"
+        );
+    }
+
+    /// Body-read timeout (BodyRead phase) says "response did not complete" and
+    /// shows the per-request timeout value and the config-knob hint.
+    ///
+    /// With per-request total timeouts, a body-stall fires the same total-budget
+    /// timer as a transport stall — the message reflects that the entire request
+    /// (not just a read-idle window) expired.
+    #[test]
+    fn timeout_message_body_read_phase_says_did_not_complete_and_duration() {
+        let per_request = std::time::Duration::from_secs(300);
+        let msg = timeout_message(false, per_request, TimeoutPhase::BodyRead);
+        assert!(
+            msg.starts_with("request timed out:"),
+            "body-read timeout must start with 'request timed out:': {msg}"
+        );
+        assert!(
+            msg.contains("did not complete"),
+            "body-read timeout must say 'did not complete': {msg}"
+        );
+        assert!(
+            msg.contains("300s"),
+            "body-read timeout must include the 300s per-request value: {msg}"
+        );
+        assert!(
+            msg.contains("BUZZ_AGENT_LLM_TIMEOUT_SECS"),
+            "body-read timeout must reference the config knob: {msg}"
+        );
+        assert!(
+            !msg.contains("read timeout"),
+            "body-read timeout must not say 'read timeout': {msg}"
+        );
+    }
+
+    /// A non-default duration threads through correctly — verifies the value
+    /// is not hard-coded anywhere in the pure function.
+    #[test]
+    fn timeout_message_duration_is_not_hardcoded() {
+        let msg = timeout_message(
+            false,
+            std::time::Duration::from_secs(600),
+            TimeoutPhase::Transport,
+        );
+        assert!(
+            msg.contains("600s"),
+            "transport read-timeout must reflect the supplied 600s value: {msg}"
+        );
+        assert!(
+            !msg.contains("240s"),
+            "must not hard-code 240s when 600s was supplied: {msg}"
+        );
+    }
+
+    // ---- classify_transport_error / classify_body_read_error (reqwest integration) --
+
+    /// A real loopback read-timeout must produce a message rooted at "read
+    /// timeout:" that contains the configured value — and must NOT use reqwest's
+    /// opaque "error sending request" string.
+    ///
+    /// This is the one test that requires real network I/O (loopback only) to
+    /// verify that reqwest actually sets is_timeout() for the scenario in which
+    /// Buzz agents stall (server connected but emitting no bytes).
+    #[tokio::test]
+    async fn classify_transport_error_read_timeout_is_loopback_verified() {
+        use tokio::net::TcpListener;
+
+        let llm_timeout = std::time::Duration::from_millis(50);
+        // Bind and never accept — TCP connect succeeds, no bytes follow.
+        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let addr = listener.local_addr().unwrap();
+        let _listener = listener; // keep alive so connect succeeds
+
+        let client = reqwest::Client::builder()
+            .read_timeout(llm_timeout)
+            .build()
+            .unwrap();
+
+        let err = client
+            .get(format!("http://{addr}/"))
+            .send()
+            .await
+            .expect_err("must time out");
+
+        // Preconditions: verify reqwest's classification before asserting our output.
+        assert!(
+            err.is_timeout(),
+            "precondition: reqwest must report is_timeout"
+        );
+        assert!(
+            !err.is_connect(),
+            "precondition: read timeout must not set is_connect"
+        );
+
+        let msg = classify_transport_error(&err, llm_timeout);
+        assert!(
+            msg.starts_with("read timeout:"),
+            "read timeout must start with 'read timeout:': {msg}"
+        );
+        assert!(
+            msg.contains("50ms"),
+            "read timeout must include the configured 50ms value: {msg}"
+        );
+        assert!(
+            msg.contains("BUZZ_AGENT_LLM_TIMEOUT_SECS"),
+            "read timeout must name the config knob: {msg}"
+        );
+        assert!(
+            !msg.contains("error sending request"),
+            "read timeout must not use the opaque reqwest string: {msg}"
+        );
     }
 
-    struct StallWarnVisitor {
-        saw_cumulative_stall: bool,
-        saw_attempts: bool,
-    }
+    /// Non-timeout transport errors preserve the original reqwest error text.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn classify_transport_error_non_timeout_preserves_reqwest_text() {
+        use tokio::net::TcpListener;
 
-    impl tracing::field::Visit for StallWarnVisitor {
-        fn record_debug(&mut self, field: &tracing::field::Field, _value: &dyn std::fmt::Debug) {
-            match field.name() {
-                "cumulative_stall" => self.saw_cumulative_stall = true,
-                "attempts" => self.saw_attempts = true,
-                _ => {}
+        // Accept-then-close: keep the listener alive so the endpoint stays
+        // owned throughout, spawn a task that accepts exactly one connection
+        // and immediately drops the socket.  Produces a deterministic
+        // non-timeout reqwest error (request-class, not is_timeout()) while
+        // the test holds exclusive ownership of the address — no released-port
+        // race possible.
+        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let addr = listener.local_addr().unwrap();
+        tokio::spawn(async move {
+            if let Ok((sock, _)) = listener.accept().await {
+                drop(sock); // close immediately, no response written
             }
-        }
+        });
 
-        fn record_u64(&mut self, field: &tracing::field::Field, _value: u64) {
-            if field.name() == "attempts" {
-                self.saw_attempts = true;
-            }
-        }
-    }
+        let client = reqwest::Client::builder()
+            .connect_timeout(std::time::Duration::from_millis(200))
+            .build()
+            .unwrap();
 
-    impl<S: tracing::Subscriber> tracing_subscriber::Layer<S> for StallWarnCapture {
-        fn on_event(
-            &self,
-            event: &tracing::Event<'_>,
-            _ctx: tracing_subscriber::layer::Context<'_, S>,
-        ) {
-            if *event.metadata().level() != tracing::Level::WARN {
-                return;
-            }
-            let mut visitor = StallWarnVisitor {
-                saw_cumulative_stall: false,
-                saw_attempts: false,
-            };
-            event.record(&mut visitor);
-            if visitor.saw_cumulative_stall && visitor.saw_attempts {
-                self.count.fetch_add(1, Ordering::SeqCst);
-            }
-        }
-    }
+        let err = client
+            .get(format!("http://{addr}/"))
+            .send()
+            .await
+            .expect_err("must fail: server closes connection before response");
 
-    /// Runs `f` under a scoped subscriber that only counts `WARN` events
-    /// carrying both `cumulative_stall` and `attempts` fields — the shape
-    /// `terminal_llm_error`'s stall notice emits. Returns that count.
-    fn count_stall_warnings(f: impl FnOnce()) -> usize {
-        let count = Arc::new(std::sync::atomic::AtomicUsize::new(0));
-        let subscriber = tracing_subscriber::registry().with(StallWarnCapture {
-            count: count.clone(),
-        });
-        tracing::subscriber::with_default(subscriber, f);
-        count.load(Ordering::SeqCst)
-    }
+        assert!(
+            !err.is_timeout(),
+            "precondition: connection-closed is not a timeout: {err}"
+        );
 
-    /// Below `STALL_NOTICE_THRESHOLD`, `terminal_llm_error` must not emit the
-    /// stall warning at all — otherwise every ordinary retry-exhaustion would
-    /// falsely read as an outage. This is mutation-sensitive: deleting the
-    /// threshold branch, weakening `>=` to `>` at the boundary, or an
-    /// always-warn mutation are all caught by pairing this with the 300s case
-    /// below.
-    #[test]
-    fn terminal_llm_error_below_threshold_emits_no_stall_warning() {
-        let warnings = count_stall_warnings(|| {
-            let _ = terminal_llm_error(Duration::from_secs(299), 3, "exhausted retries: 499");
-        });
-        assert_eq!(warnings, 0, "no stall warning below STALL_NOTICE_THRESHOLD");
+        assert_eq!(
+            classify_transport_error(&err, std::time::Duration::from_secs(240)),
+            format!("transport: {err}")
+        );
     }
 
-    /// At `STALL_NOTICE_THRESHOLD`, `terminal_llm_error` must emit exactly
-    /// one stall warning carrying the duration and attempt count — the
-    /// never-warn mutation is caught here; combined with the 299s case above,
-    /// a deleted branch or an always-warn mutation are caught by whichever
-    /// assertion it violates.
-    #[test]
-    fn terminal_llm_error_at_threshold_emits_one_stall_warning() {
-        let warnings = count_stall_warnings(|| {
-            let _ = terminal_llm_error(Duration::from_secs(300), 5, "transport: connection reset");
+    /// A body-read timeout fires after headers arrive but before the body is
+    /// complete.  A loopback server sends an HTTP 200 with a declared content-
+    /// length larger than the payload it actually delivers; the client reads
+    /// one chunk, then stalls until the per-request total timeout fires.
+    ///
+    /// Asserts the exact wording, configured duration, and config-knob hint.
+    /// Also covers the non-timeout fallback via classify_body_read_error.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn classify_body_read_error_timeout_says_did_not_complete() {
+        use tokio::io::{AsyncReadExt, AsyncWriteExt};
+        use tokio::net::TcpListener;
+
+        let per_request_timeout = std::time::Duration::from_millis(100);
+
+        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let addr = listener.local_addr().unwrap();
+
+        // Server: accept once, send headers + one body chunk, then hang.
+        tokio::spawn(async move {
+            if let Ok((mut sock, _)) = listener.accept().await {
+                // Consume the request.
+                let mut buf = [0u8; 512];
+                let _ = sock.read(&mut buf).await;
+                // Declare 1 KiB body, send 4 bytes, then do nothing.
+                let _ = sock
+                    .write_all(
+                        b"HTTP/1.1 200 OK\r\n\
+                          Content-Type: application/json\r\n\
+                          Content-Length: 1024\r\n\
+                          \r\n\
+                          test",
+                    )
+                    .await;
+                // Hold the connection open so the client times out rather than
+                // seeing EOF.
+                tokio::time::sleep(std::time::Duration::from_secs(10)).await;
+            }
         });
-        assert_eq!(
-            warnings, 1,
-            "exactly one stall warning with duration+attempts fields at threshold"
+
+        // Use a client-level read_timeout to produce a body-stall error; in
+        // production we use per-request .timeout(), but the error classification
+        // is the same — reqwest sets is_timeout() in both cases.
+        let client = reqwest::Client::builder()
+            .read_timeout(per_request_timeout)
+            .build()
+            .unwrap();
+
+        let resp = client
+            .get(format!("http://{addr}/"))
+            .send()
+            .await
+            .expect("headers must arrive before timeout");
+
+        // Consume the response body — this is where the timeout fires.
+        let err = resp.bytes().await.expect_err("body read must time out");
+
+        assert!(
+            err.is_timeout(),
+            "precondition: reqwest must report is_timeout for body stall"
+        );
+
+        // ---- classify_body_read_error: timeout path ----
+        let msg = classify_body_read_error(&err, per_request_timeout);
+        assert!(
+            msg.starts_with("request timed out:"),
+            "body-read timeout must start with 'request timed out:': {msg}"
         );
+        assert!(
+            msg.contains("did not complete"),
+            "body-read timeout must say 'did not complete': {msg}"
+        );
+        assert!(
+            msg.contains("100ms"),
+            "body-read timeout must include the per-request 100ms value: {msg}"
+        );
+        assert!(
+            msg.contains("BUZZ_AGENT_LLM_TIMEOUT_SECS"),
+            "body-read timeout must reference the config knob: {msg}"
+        );
+
+        // ---- classify_body_read_error: non-timeout fallback (pure, no I/O) ----
+        // We can't produce a real non-timeout body error without real I/O, but
+        // the pure-function path is identical to classify_transport_error's
+        // non-timeout fallback and is covered by the pure tests above.
     }
 
     // ---- usage / input-token extraction -------------------------------------
@@ -5330,8 +6605,14 @@ mod tests {
         assert!(body.get("max_completion_tokens").is_none());
     }
 
+    /// The summary body reserves `max_output_tokens` for visible text by
+    /// granting reasoning a separate, equal budget on top and excluding it
+    /// from the response. Without the separation, a reasoning model can spend
+    /// the entire cap thinking and length-stop with empty `content`, which
+    /// `summarize()` reports as an empty summary and the handoff degrades to
+    /// lossy truncation.
     #[test]
-    fn openrouter_summary_carries_neither_reasoning_nor_provider() {
+    fn openrouter_summary_budgets_reasoning_separately_and_carries_no_provider() {
         let body = openrouter_summary_body(
             "anthropic/claude-opus-4-7",
             "summarize",
@@ -5341,14 +6622,25 @@ mod tests {
         assert_eq!(body["model"], "anthropic/claude-opus-4-7");
         assert_eq!(body["messages"][0]["role"], "system");
         assert_eq!(body["messages"][1]["content"], "text to summarize");
-        assert_eq!(body["max_tokens"], 1024);
+        assert_eq!(
+            body["max_tokens"], 2048,
+            "total cap must cover the text budget plus the reasoning budget"
+        );
+        assert_eq!(
+            body["reasoning"]["max_tokens"], 1024,
+            "reasoning gets its own budget so it cannot starve the summary text"
+        );
+        assert_eq!(
+            body["reasoning"]["exclude"], true,
+            "reasoning must not be included in the response; summarize() reads only content"
+        );
         assert!(
-            body.get("max_completion_tokens").is_none(),
-            "summary body must use OpenRouter's token-limit spelling"
+            body["reasoning"].get("effort").is_none(),
+            "budget-based cap only; effort stays unset for the summary call"
         );
         assert!(
-            body.get("reasoning").is_none(),
-            "summary body must not carry reasoning"
+            body.get("max_completion_tokens").is_none(),
+            "summary body must use OpenRouter's token-limit spelling"
         );
         assert!(
             body.get("provider").is_none(),
@@ -6437,9 +7729,15 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let err = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .unwrap_err();
+        let err = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .unwrap_err();
         assert!(
             matches!(&err, AgentError::Llm(s) if s.contains("403") && s.contains("model flagged by moderation")),
             "403 must surface as AgentError::Llm with status+body, not LlmAuth: got {err:?}"
@@ -6464,9 +7762,15 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let err = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .unwrap_err();
+        let err = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .unwrap_err();
         assert!(
             matches!(&err, AgentError::Llm(s) if s.contains("credits exhausted")),
             "got {err:?}"
@@ -6494,9 +7798,15 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let err = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .unwrap_err();
+        let err = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .unwrap_err();
         assert!(
             matches!(&err, AgentError::Llm(s) if s.contains("no OpenRouter endpoint supports")),
             "parameter-routing 404 must not be reported as a missing model: got {err:?}"
@@ -6522,11 +7832,84 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let err = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
+        let err = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .unwrap_err();
+        assert!(
+            matches!(&err, AgentError::UnsupportedImageInput(s) if s.contains("support image input")),
+            "image rejection must reach the history-recovery path: got {err:?}"
+        );
+        assert_eq!(
+            attempts.load(std::sync::atomic::Ordering::SeqCst),
+            1,
+            "a deterministic capability rejection must not be retried"
+        );
+    }
+
+    /// OpenAI-compatible text-only deployments report the image rejection as a
+    /// 400, not OpenRouter's 404 — Crusoe serverless GLM answers
+    /// `"crusoeai/GLM-5.2-NVFP4 is not a multimodal model"` to every request
+    /// whose history contains an image. Before the 400 arm existed, this fell
+    /// through to terminal `AgentError::Llm`: the image stayed in history and
+    /// every later call in the session failed identically (measured live:
+    /// 8 wedged benchmark trials, 40 min of doomed retries each). Asserted
+    /// through `complete()` so the arm's return path into the convergence
+    /// mapper is covered, same doctrine as the context-400 tests above.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn openai_400_unsupported_image_is_typed_through_complete() {
+        let (base_url, captured) = spawn_sequence_stub(vec![StubHttpResponse {
+            status: 400,
+            body: json!({"error":{"message":"crusoeai/GLM-5.2-NVFP4 is not a multimodal model","type":"invalid_request_error"}}),
+        }])
+        .await;
+        let mut c = cfg(Provider::OpenAi);
+        c.base_url = base_url;
+        let llm = Llm::new(&c).unwrap();
+        let err = complete_model(&llm, &c, "gpt-probe-model")
             .await
             .unwrap_err();
         assert!(
-            matches!(&err, AgentError::UnsupportedImageInput(s) if s.contains("support image input")),
+            matches!(&err, AgentError::UnsupportedImageInput(s) if s.contains("not a multimodal model")),
+            "a text-only deployment's 400 must reach the history-recovery path: got {err:?}"
+        );
+        assert_eq!(
+            captured.lock().await.len(),
+            1,
+            "a deterministic capability rejection must not be retried"
+        );
+    }
+
+    /// Same 400-shaped rejection at the OpenRouter terminal, which has its own
+    /// status ladder: a BYOK/passthrough upstream can surface the provider's
+    /// own 400 body instead of OpenRouter's 404 routing error.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn openrouter_post_400_unsupported_image_is_typed_and_not_retried() {
+        let (url, _captured, attempts) = spawn_openrouter_stub(vec![CannedResponse::new(
+            400,
+            r#"{"error":{"message":"crusoeai/GLM-5.2-NVFP4 is not a multimodal model"}}"#,
+        )])
+        .await;
+        let http = Client::builder()
+            .timeout(Duration::from_secs(5))
+            .build()
+            .unwrap();
+        let err = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .unwrap_err();
+        assert!(
+            matches!(&err, AgentError::UnsupportedImageInput(s) if s.contains("not a multimodal model")),
             "image rejection must reach the history-recovery path: got {err:?}"
         );
         assert_eq!(
@@ -6552,9 +7935,15 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let err = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .unwrap_err();
+        let err = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .unwrap_err();
         assert!(
             matches!(&err, AgentError::LlmModelNotFound(s) if s.contains("404") && s.contains("vendor/nonexistent-model")),
             "a model-level 404 must stay LlmModelNotFound: got {err:?}"
@@ -6577,9 +7966,15 @@ mod tests {
             .build()
             .unwrap();
         let before = std::time::Instant::now();
-        let out = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .expect("second attempt succeeds");
+        let out = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .expect("second attempt succeeds");
         assert_eq!(out["choices"][0]["message"]["content"], "ok");
         assert!(
             before.elapsed() >= Duration::from_secs(1),
@@ -6588,33 +7983,65 @@ mod tests {
         assert_eq!(attempts.load(std::sync::atomic::Ordering::SeqCst), 2);
     }
 
-    /// A `Retry-After` far beyond `RETRY_AFTER_CAP_SECS` must not stall the
-    /// retry loop for anywhere near its advertised duration — proving the
-    /// cap is enforced end-to-end in `openrouter_post`'s actual sleep, not
-    /// merely in the isolated `parse_retry_after_header` unit tests above.
-    /// Runs on a paused clock so a real 999999s wait would hang the test
-    /// instead of silently passing.
-    #[tokio::test(start_paused = true)]
-    async fn openrouter_post_429_retry_sleep_capped_despite_huge_retry_after() {
-        let (url, _captured, attempts) = spawn_openrouter_stub(vec![
-            CannedResponse::new(429, r#"{"error":{"message":"rate limited"}}"#)
-                .with_header("Retry-After", "999999"),
-            CannedResponse::new(200, r#"{"choices":[{"message":{"content":"ok"}}]}"#),
-        ])
-        .await;
-        let http = Client::builder().build().unwrap();
-        let before = tokio::time::Instant::now();
-        let out = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .expect("second attempt succeeds");
-        assert_eq!(out["choices"][0]["message"]["content"], "ok");
+    // ---- retry_delay_for_429 (pure-function tests, no network) ---------------
+
+    /// A huge server-advertised Retry-After is capped at RETRY_AFTER_CAP_SECS.
+    /// This test proves the cap is actually wired into the loop's only delay
+    /// computation (not just a dead constant), because `openrouter_post`'s 429
+    /// arm calls `parse_retry_after_header` which delegates to this function.
+    #[test]
+    fn retry_delay_for_429_huge_value_is_capped() {
+        let d = retry_delay_for_429(Some("999999")).unwrap();
+        assert_eq!(
+            d,
+            Duration::from_secs(RETRY_AFTER_CAP_SECS),
+            "999999s must be capped to {RETRY_AFTER_CAP_SECS}s"
+        );
+    }
+
+    /// A small value below the cap is returned as-is.
+    #[test]
+    fn retry_delay_for_429_small_value_honored() {
+        let d = retry_delay_for_429(Some("3")).unwrap();
+        assert_eq!(d, Duration::from_secs(3), "3s must be honored verbatim");
+    }
+
+    /// A value equal to the cap is returned unchanged (boundary).
+    #[test]
+    fn retry_delay_for_429_exact_cap_is_not_truncated() {
+        let d = retry_delay_for_429(Some(&RETRY_AFTER_CAP_SECS.to_string())).unwrap();
+        assert_eq!(
+            d,
+            Duration::from_secs(RETRY_AFTER_CAP_SECS),
+            "exact cap must not be truncated"
+        );
+    }
+
+    /// Missing header returns None → caller falls back to backoff.
+    #[test]
+    fn retry_delay_for_429_missing_header_is_none() {
         assert!(
-            before.elapsed() <= Duration::from_secs(RETRY_AFTER_CAP_SECS + 5),
-            "retry sleep must be clamped to RETRY_AFTER_CAP_SECS ({RETRY_AFTER_CAP_SECS}s), \
-             not the header's 999999s: elapsed {:?}",
-            before.elapsed()
+            retry_delay_for_429(None).is_none(),
+            "absent header must return None"
+        );
+    }
+
+    /// Garbage / non-numeric header returns None.
+    #[test]
+    fn retry_delay_for_429_garbage_header_is_none() {
+        assert!(
+            retry_delay_for_429(Some("not-a-number")).is_none(),
+            "unparseable header must return None"
+        );
+    }
+
+    /// Zero is treated as absent (no-op: don't sleep 0 seconds).
+    #[test]
+    fn retry_delay_for_429_zero_is_none() {
+        assert!(
+            retry_delay_for_429(Some("0")).is_none(),
+            "zero Retry-After must return None (no-op sleep)"
         );
-        assert_eq!(attempts.load(std::sync::atomic::Ordering::SeqCst), 2);
     }
 
     /// An untyped 503 (no `error.metadata.error_type`) exhausts all
@@ -6628,9 +8055,15 @@ mod tests {
             .timeout(Duration::from_secs(30))
             .build()
             .unwrap();
-        let err = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .unwrap_err();
+        let err = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .unwrap_err();
         assert!(
             matches!(&err, AgentError::Llm(s) if s.contains("no OpenRouter endpoint supports")),
             "got {err:?}"
@@ -6655,9 +8088,15 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .expect("200 succeeds");
+        openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .expect("200 succeeds");
         let headers = captured.lock().await;
         let header_str = headers
             .first()
@@ -6686,9 +8125,15 @@ mod tests {
             .timeout(Duration::from_secs(30))
             .build()
             .unwrap();
-        let out = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .expect("retry after 499 should succeed");
+        let out = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .expect("retry after 499 should succeed");
         assert_eq!(out["choices"][0]["message"]["content"], "ok");
         assert_eq!(
             attempts.load(std::sync::atomic::Ordering::SeqCst),
@@ -6711,9 +8156,15 @@ mod tests {
             .timeout(Duration::from_secs(30))
             .build()
             .unwrap();
-        let out = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .expect("retry succeeds");
+        let out = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .expect("retry succeeds");
         assert_eq!(out["choices"][0]["message"]["content"], "ok");
         assert_eq!(attempts.load(std::sync::atomic::Ordering::SeqCst), 2);
     }
@@ -6762,9 +8213,15 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let err = openrouter_post(&http, &format!("{url}/x"), &json!({}), "key")
-            .await
-            .unwrap_err();
+        let err = openrouter_post(
+            &http,
+            &format!("{url}/x"),
+            &json!({}),
+            "key",
+            Duration::from_secs(5),
+        )
+        .await
+        .unwrap_err();
         assert!(
             matches!(&err, AgentError::Llm(s) if s.contains("body read")),
             "truncated body must surface as AgentError::Llm with 'body read': got {err:?}"
diff --git a/crates/buzz-agent/tests/golden_transcripts.rs b/crates/buzz-agent/tests/golden_transcripts.rs
index 4ac35034646..92e9e11dc92 100644
--- a/crates/buzz-agent/tests/golden_transcripts.rs
+++ b/crates/buzz-agent/tests/golden_transcripts.rs
@@ -808,3 +808,137 @@ async fn test_cancel_notification_no_reply() {
 
     h.shutdown().await;
 }
+
+/// ACP v2 ContentChunk compliance: both `agent_thought_chunk` and
+/// `agent_message_chunk` must carry `messageId` and `content` when the
+/// client negotiates protocol version 2.
+///
+/// ACP v2 requires `ContentChunk.messageId` (required in v2 schema at
+/// agentclientprotocol/agent-client-protocol schema/v2/schema.json @d13d1baa).
+/// ACP v1 allows the field, so adding it is backwards-safe.
+///
+/// Additional invariants verified here:
+/// - The thought and assistant message IDs are **distinct** (two logical messages).
+/// - IDs do **not** recur across two consecutive `session/prompt` calls in the same
+///   ACP session (`run_id` is fresh per prompt, so no cross-turn collision).
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_acp_v2_chunks_carry_message_id() {
+    // OpenAI Responses API: reasoning item + text item. Both emitted chunks
+    // must have messageId + content on a v2 connection.
+    // Two responses so we can send two session/prompt calls and verify no ID reuse.
+    let url = spawn_fake_llm(vec![
+        responses_reasoning_response("Thinking about it.", "Here is my response."),
+        responses_reasoning_response("Thinking again.", "Second response."),
+    ])
+    .await;
+    let mut h = Harness::spawn(&[
+        ("BUZZ_AGENT_PROVIDER", "openai"),
+        ("OPENAI_COMPAT_API_KEY", "test"),
+        ("OPENAI_COMPAT_MODEL", "fake-model"),
+        ("OPENAI_COMPAT_API", "responses"),
+        ("OPENAI_COMPAT_BASE_URL", &url),
+    ])
+    .await;
+
+    let sid = handshake(&mut h).await; // negotiates protocolVersion: 2
+
+    // ── First prompt ──────────────────────────────────────────────────────────
+    let p1 = h
+        .send(
+            "session/prompt",
+            json!({
+                "sessionId": sid,
+                "prompt": [{ "type": "text", "text": "think and respond" }],
+            }),
+        )
+        .await;
+    let updates1 = collect_updates_until_done(&mut h, p1).await;
+
+    let thought1 = updates1
+        .iter()
+        .find(|u| u["sessionUpdate"] == "agent_thought_chunk")
+        .expect("agent_thought_chunk must be emitted on prompt 1");
+    let message1 = updates1
+        .iter()
+        .find(|u| u["sessionUpdate"] == "agent_message_chunk")
+        .expect("agent_message_chunk must be emitted on prompt 1");
+
+    // ACP v2 ContentChunk compliance: messageId must be present and non-empty.
+    let thought_id1 = thought1["messageId"]
+        .as_str()
+        .expect("agent_thought_chunk must carry messageId (ACP v2 required field)");
+    assert!(
+        !thought_id1.is_empty(),
+        "agent_thought_chunk messageId must not be empty"
+    );
+
+    let message_id1 = message1["messageId"]
+        .as_str()
+        .expect("agent_message_chunk must carry messageId (ACP v2 required field)");
+    assert!(
+        !message_id1.is_empty(),
+        "agent_message_chunk messageId must not be empty"
+    );
+
+    // Thought and assistant message are two distinct logical messages — their IDs must differ.
+    assert_ne!(
+        thought_id1, message_id1,
+        "agent_thought_chunk and agent_message_chunk are distinct logical messages; their messageIds must differ"
+    );
+
+    // content must be present and correct.
+    assert_eq!(
+        thought1["content"]["text"], "Thinking about it.",
+        "thought content mismatch"
+    );
+    assert_eq!(
+        message1["content"]["text"], "Here is my response.",
+        "message content mismatch"
+    );
+
+    // ── Second prompt (same ACP session) ─────────────────────────────────────
+    let p2 = h
+        .send(
+            "session/prompt",
+            json!({
+                "sessionId": sid,
+                "prompt": [{ "type": "text", "text": "think again" }],
+            }),
+        )
+        .await;
+    let updates2 = collect_updates_until_done(&mut h, p2).await;
+
+    let thought2 = updates2
+        .iter()
+        .find(|u| u["sessionUpdate"] == "agent_thought_chunk")
+        .expect("agent_thought_chunk must be emitted on prompt 2");
+    let message2 = updates2
+        .iter()
+        .find(|u| u["sessionUpdate"] == "agent_message_chunk")
+        .expect("agent_message_chunk must be emitted on prompt 2");
+
+    let thought_id2 = thought2["messageId"]
+        .as_str()
+        .expect("agent_thought_chunk must carry messageId on prompt 2");
+    let message_id2 = message2["messageId"]
+        .as_str()
+        .expect("agent_message_chunk must carry messageId on prompt 2");
+
+    // IDs from prompt 2 must be distinct from each other.
+    assert_ne!(
+        thought_id2, message_id2,
+        "prompt 2: thought and message IDs must differ"
+    );
+
+    // IDs must NOT recur across prompts — ACP requires session-unique messageIds.
+    assert_ne!(
+        thought_id1, thought_id2,
+        "thought messageId must not recur across session/prompt calls (run_id must differ)"
+    );
+    assert_ne!(
+        message_id1, message_id2,
+        "message messageId must not recur across session/prompt calls (run_id must differ)"
+    );
+
+    h.shutdown().await;
+}
diff --git a/crates/buzz-agent/tests/regressions.rs b/crates/buzz-agent/tests/regressions.rs
index c82be76dc04..a972f9b2429 100644
--- a/crates/buzz-agent/tests/regressions.rs
+++ b/crates/buzz-agent/tests/regressions.rs
@@ -233,6 +233,26 @@ fn openai_text_with_usage(content: &str, prompt_tokens: u64) -> Value {
     v
 }
 
+fn openai_max_tokens(content: &str, tool_calls: Value) -> Value {
+    json!({
+        "id": "cc-max", "object": "chat.completion", "model": "fake-model",
+        "choices": [{
+            "index": 0,
+            "message": {
+                "role": "assistant",
+                "content": content,
+                "tool_calls": tool_calls,
+            },
+            "finish_reason": "length",
+        }],
+        "usage": {
+            "prompt_tokens": 10,
+            "completion_tokens": 100,
+            "total_tokens": 110,
+        },
+    })
+}
+
 fn openai_tool_call(id: &str, name: &str, args: Value) -> Value {
     json!({
         "id": "cc-2", "object": "chat.completion", "model": "fake-model",
@@ -2437,6 +2457,110 @@ async fn context_window_400_recovers_instead_of_sticking() {
     h.shutdown().await;
 }
 
+/// A provider output-token stop is an interrupted round, not completion. The
+/// agent must preserve any text, discard a possibly partial tool call, provide
+/// actionable feedback, and let the same prompt finish normally.
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn max_tokens_recovers_in_turn_without_running_partial_tool_call() {
+    const PARTIAL: &str = "partial-before-limit";
+    let partial_call = json!([{
+        "id": "partial-call", "type": "function",
+        "function": { "name": "dev__shell", "arguments": "{\"command\":\"echo" },
+    }]);
+    let llm = spawn_capturing_llm(vec![
+        openai_max_tokens(PARTIAL, partial_call),
+        openai_text("done after truncation"),
+    ])
+    .await;
+    let mut h = Harness::spawn(&llm.url).await;
+    let sid = init_session(&mut h, json!([])).await;
+
+    let prompt_id = h
+        .send(
+            "session/prompt",
+            json!({"sessionId": sid, "prompt": [{"type":"text","text":"do the task"}]}),
+        )
+        .await;
+    let reply = h.recv_until(|v| v["id"] == json!(prompt_id)).await;
+    assert_eq!(reply["result"]["stopReason"], "end_turn", "{reply}");
+
+    let requests = llm.captured.lock().await;
+    assert_eq!(requests.len(), 2, "truncation should trigger one retry");
+    let retry = &requests[1]["messages"];
+    let serialized = retry.to_string();
+    assert!(
+        serialized.contains(PARTIAL),
+        "partial text was lost: {retry}"
+    );
+    assert!(
+        serialized.contains("output token limit")
+            && serialized.contains("smaller steps")
+            && serialized.contains("tool call"),
+        "retry lacks actionable truncation feedback: {retry}"
+    );
+    assert!(
+        !serialized.contains("partial-call") && !serialized.contains("tool_call_id"),
+        "partial tool call must not be replayed or executed: {retry}"
+    );
+    drop(requests);
+    h.shutdown().await;
+}
+
+/// `max_rounds` counts max-token responses because they are successful, billed
+/// provider requests. Recovery must not grant them the refund reserved for a
+/// rejected context-overflow request.
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn max_tokens_recovery_respects_finite_round_cap() {
+    let llm = spawn_capturing_llm(vec![
+        openai_max_tokens("cut off", json!([])),
+        openai_text("must not be requested"),
+    ])
+    .await;
+    let mut h = Harness::spawn_with_env(&llm.url, &[("BUZZ_AGENT_MAX_ROUNDS", "1")]).await;
+    let sid = init_session(&mut h, json!([])).await;
+    let prompt_id = h
+        .send(
+            "session/prompt",
+            json!({"sessionId": sid, "prompt": [{"type":"text","text":"go"}]}),
+        )
+        .await;
+    let reply = h.recv_until(|v| v["id"] == json!(prompt_id)).await;
+    assert_eq!(
+        reply["result"]["stopReason"], "max_turn_requests",
+        "{reply}"
+    );
+    assert_eq!(llm.captured.lock().await.len(), 1);
+    h.shutdown().await;
+}
+
+/// With the production-unbounded round setting, a model that always fills its
+/// output allowance still has to return. Two recovery prompts are allowed; the
+/// third truncation surfaces the original stop reason.
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn repeated_max_tokens_is_bounded() {
+    let responses = (0..4)
+        .map(|_| openai_max_tokens("still truncated", json!([])))
+        .collect();
+    let llm = spawn_capturing_llm(responses).await;
+    let mut h = Harness::spawn_with_env(&llm.url, &[("BUZZ_AGENT_MAX_ROUNDS", "0")]).await;
+    let sid = init_session(&mut h, json!([])).await;
+    let prompt_id = h
+        .send(
+            "session/prompt",
+            json!({"sessionId": sid, "prompt": [{"type":"text","text":"go"}]}),
+        )
+        .await;
+    let reply = tokio::time::timeout(
+        Duration::from_secs(10),
+        h.recv_until(|v| v["id"] == json!(prompt_id)),
+    )
+    .await
+    .expect("max-token recovery must be bounded");
+    assert_eq!(reply["result"]["stopReason"], "max_tokens", "{reply}");
+    assert_eq!(llm.captured.lock().await.len(), 3);
+    h.shutdown().await;
+}
+
 /// A successful recovery must actually send the recovered completion, even when
 /// `max_rounds` is finite. `round` is incremented BEFORE the completion that
 /// gets rejected, so a naive `continue` after recovery re-enters the loop with
diff --git a/crates/buzz-cli/src/commands/agents.rs b/crates/buzz-cli/src/commands/agents.rs
index 58564a45c2f..568249d0829 100644
--- a/crates/buzz-cli/src/commands/agents.rs
+++ b/crates/buzz-cli/src/commands/agents.rs
@@ -90,10 +90,18 @@ pub async fn dispatch(command: AgentsCmd, client: &BuzzClient) -> Result<(), Cli
             reason,
             replaced_by,
             content,
+            admin,
         } => {
             validate_hex64(&target_pubkey)?;
             let signer_hex = client.keys().public_key().to_hex();
-            let auth = resolve_auth(client, &target_pubkey, &signer_hex).await?;
+            let auth = resolve_auth(
+                client,
+                &target_pubkey,
+                &signer_hex,
+                admin,
+                &mut std::io::stderr(),
+            )
+            .await?;
             let builder = build_archive_identity_request(
                 &target_pubkey,
                 &content,
@@ -121,10 +129,18 @@ pub async fn dispatch(command: AgentsCmd, client: &BuzzClient) -> Result<(), Cli
             target_pubkey,
             reason,
             content,
+            admin,
         } => {
             validate_hex64(&target_pubkey)?;
             let signer_hex = client.keys().public_key().to_hex();
-            let auth = resolve_auth(client, &target_pubkey, &signer_hex).await?;
+            let auth = resolve_auth(
+                client,
+                &target_pubkey,
+                &signer_hex,
+                admin,
+                &mut std::io::stderr(),
+            )
+            .await?;
             let builder = build_unarchive_identity_request(
                 &target_pubkey,
                 &content,
@@ -160,23 +176,197 @@ fn require_owner(client: &BuzzClient) -> Result<PublicKey, CliError> {
     PublicKey::parse(&hex).map_err(|e| CliError::Auth(format!("invalid owner attestation: {e}")))
 }
 
-/// Resolve the optional NIP-OA `auth` tag for archive/unarchive requests.
+/// Typed reason why NIP-OA owner-auth could not be extracted.
+///
+/// Covers all distinguishable failure causes from profile fetch through tag
+/// validation so the diagnostic in [`resolve_auth`] is always precise and
+/// never duplicates classification logic.
+#[derive(Debug, PartialEq)]
+enum AuthFailure {
+    /// No kind:0 profile was found for the target; target pubkey included.
+    NoProfile(String),
+    /// kind:0 was found but has no `tags` array; target pubkey included.
+    NoTagsArray(String),
+    /// `tags` array has no `auth`-labelled entries.
+    NoAuthTag,
+    /// `tags` array has more than one `auth`-labelled entry; count included.
+    AmbiguousAuthTag(usize),
+    /// Sole `auth` tag has wrong element count; actual count included.
+    WrongArity(usize),
+    /// Sole `auth` tag contains a non-string element.
+    NonStringElement,
+    /// Sole `auth` tag owner field is not a valid 64-hex pubkey; value included.
+    InvalidOwnerHex(String),
+    /// Sole `auth` tag sig field is not a valid 128-hex signature.
+    InvalidSigHex,
+    /// Tag is structurally valid but names a different owner; actual owner included.
+    OwnerMismatch(String),
+}
+
+impl AuthFailure {
+    /// Human-readable description suitable for the `"warning"` JSON field.
+    fn message(&self) -> String {
+        match self {
+            AuthFailure::NoProfile(target) => {
+                format!("no kind:0 profile found for target {target}")
+            }
+            AuthFailure::NoTagsArray(target) => {
+                format!("target {target} kind:0 has no tags array")
+            }
+            AuthFailure::NoAuthTag => "target kind:0 has no \"auth\" tag".to_owned(),
+            AuthFailure::AmbiguousAuthTag(n) => format!(
+                "target kind:0 has {n} \"auth\" tags (expected exactly 1) — ambiguous ownership"
+            ),
+            AuthFailure::WrongArity(n) => format!(
+                "sole \"auth\" tag has {n} element(s) (expected 4: label, owner, conditions, sig)"
+            ),
+            AuthFailure::NonStringElement => {
+                "sole \"auth\" tag contains a non-string element".to_owned()
+            }
+            AuthFailure::InvalidOwnerHex(v) => {
+                format!("sole \"auth\" tag owner field is not a valid 64-hex pubkey: {v}")
+            }
+            AuthFailure::InvalidSigHex => {
+                "sole \"auth\" tag sig field is not a valid 128-hex signature".to_owned()
+            }
+            AuthFailure::OwnerMismatch(actual) => {
+                format!("sole \"auth\" tag names owner {actual} which does not match your key")
+            }
+        }
+    }
+}
+
+/// Single classifier: either extract the auth tag or return the typed reason
+/// for failure. [`extract_owner_auth_tag`] is a thin `.ok()` wrapper kept for
+/// the existing tests that assert on `Option`.
+fn classify_owner_auth_tag(
+    tags: &[serde_json::Value],
+    signer_hex: &str,
+) -> Result<[String; 4], AuthFailure> {
+    let auth_tags: Vec<&serde_json::Value> = tags
+        .iter()
+        .filter(|tag| {
+            tag.as_array()
+                .and_then(|elems| elems.first())
+                .and_then(|v| v.as_str())
+                == Some("auth")
+        })
+        .collect();
+    match auth_tags.len() {
+        0 => return Err(AuthFailure::NoAuthTag),
+        n if n > 1 => return Err(AuthFailure::AmbiguousAuthTag(n)),
+        _ => {}
+    }
+
+    // Exactly one auth tag.
+    let elems = auth_tags[0]
+        .as_array()
+        .ok_or(AuthFailure::NonStringElement)?;
+    if elems.len() != 4 {
+        return Err(AuthFailure::WrongArity(elems.len()));
+    }
+    let label = elems[0].as_str().ok_or(AuthFailure::NonStringElement)?;
+    let owner = elems[1].as_str().ok_or(AuthFailure::NonStringElement)?;
+    let conditions = elems[2].as_str().ok_or(AuthFailure::NonStringElement)?;
+    let sig = elems[3].as_str().ok_or(AuthFailure::NonStringElement)?;
+    if owner.len() != 64 || !owner.chars().all(|c| c.is_ascii_hexdigit()) {
+        return Err(AuthFailure::InvalidOwnerHex(owner.to_owned()));
+    }
+    if sig.len() != 128 || !sig.chars().all(|c| c.is_ascii_hexdigit()) {
+        return Err(AuthFailure::InvalidSigHex);
+    }
+    if !owner.eq_ignore_ascii_case(signer_hex) {
+        return Err(AuthFailure::OwnerMismatch(owner.to_owned()));
+    }
+    Ok([
+        label.to_owned(),
+        owner.to_owned(),
+        conditions.to_owned(),
+        sig.to_owned(),
+    ])
+}
+
+/// Pure typed extractor: given a fetched kind:0 profile (or `None` when no
+/// event was found), return the auth tag or the typed failure reason.
 ///
-/// Mirrors the desktop's `maybe_owner_auth_tag`:
-/// - `target == signer`: self path — no auth needed → `Ok(None)`.
-/// - Otherwise: fetch target's kind:0, look for an `auth` tag whose owner
-///   (index 1) matches the signer. Return it when present; `Ok(None)` when
-///   absent or structurally malformed. Query/network failures surface as
-///   `Err` — silent degradation to bare would make the relay reject the
-///   request with a misleading error.
+/// Separated from [`resolve_auth`] so pure-unit tests can exercise all
+/// failure cases without a live `BuzzClient` or async runtime.
+fn extract_auth(
+    profile: Option<&serde_json::Value>,
+    target_hex: &str,
+    signer_hex: &str,
+) -> Result<[String; 4], AuthFailure> {
+    let event = profile.ok_or_else(|| AuthFailure::NoProfile(target_hex.to_owned()))?;
+    let tags = event
+        .get("tags")
+        .and_then(|v| v.as_array())
+        .ok_or_else(|| AuthFailure::NoTagsArray(target_hex.to_owned()))?;
+    classify_owner_auth_tag(tags, signer_hex)
+}
+
+/// Resolve the optional NIP-OA `auth` tag for archive/unarchive requests,
+/// with one automatic retry on extraction failure.
+///
+/// Resolution logic (linear state machine):
+/// - `target == signer`: self path — no auth needed → `Ok(None)`, silent, zero fetches.
+/// - Otherwise: fetch target's kind:0 and attempt extraction.
+///   - Success (attempt 1) → `Ok(Some(tag))`, one fetch.
+///   - Failure (attempt 1) → fetch again once (transient republish is the
+///     dominant cause), then attempt extraction again.
+///     - Success (attempt 2) → `Ok(Some(tag))`, two fetches.
+///     - Failure (attempt 2), `allow_bare == false` → `Err(CliError::Usage)`
+///       with an actionable message naming the reason. Request is NOT sent.
+///     - Failure (attempt 2), `allow_bare == true` → emit one
+///       `{"warning":"..."}` line to `warn_sink`, return `Ok(None)` (bare
+///       send) for relay-admin callers.
+/// - Network/parse failures surface as `Err` regardless of `allow_bare`.
 async fn resolve_auth(
     client: &BuzzClient,
     target_hex: &str,
     signer_hex: &str,
+    allow_bare: bool,
+    warn_sink: &mut dyn std::io::Write,
 ) -> Result<Option<[String; 4]>, CliError> {
     if target_hex.eq_ignore_ascii_case(signer_hex) {
         return Ok(None);
     }
+
+    // Attempt 1.
+    let profile = fetch_kind0(client, target_hex).await?;
+    if let Ok(tag) = extract_auth(profile.as_ref(), target_hex, signer_hex) {
+        return Ok(Some(tag));
+    }
+
+    // Attempt 2 — one retry for transient republish churn.
+    let profile = fetch_kind0(client, target_hex).await?;
+    match extract_auth(profile.as_ref(), target_hex, signer_hex) {
+        Ok(tag) => Ok(Some(tag)),
+        Err(failure) => {
+            let detail = failure.message();
+            if allow_bare {
+                let msg = format!(
+                    "{detail}; proceeding without owner attestation (--admin) — \
+                     this succeeds only if your key is a relay admin"
+                );
+                let _ = writeln!(warn_sink, "{}", serde_json::json!({"warning": msg}));
+                Ok(None)
+            } else {
+                Err(CliError::Usage(format!(
+                    "{detail}; refusing to send a bare request that the relay will reject — \
+                     re-run once the target's profile has finished publishing, or pass --admin \
+                     if your key is a relay admin"
+                )))
+            }
+        }
+    }
+}
+
+/// Fetch the most-recent kind:0 for `target_hex` from the relay.
+/// Returns `None` when no event was found, `Err` on network/parse failure.
+async fn fetch_kind0(
+    client: &BuzzClient,
+    target_hex: &str,
+) -> Result<Option<serde_json::Value>, CliError> {
     let filter = json!({"kinds": [0], "authors": [target_hex], "limit": 1});
     let raw = client
         .query(&filter)
@@ -184,15 +374,7 @@ async fn resolve_auth(
         .map_err(|e| CliError::Other(format!("failed to fetch target kind:0: {e}")))?;
     let events: Vec<serde_json::Value> = serde_json::from_str(&raw)
         .map_err(|e| CliError::Other(format!("invalid kind:0 query response: {e}")))?;
-    let event = match events.into_iter().next() {
-        Some(e) => e,
-        None => return Ok(None),
-    };
-    let tags = match event.get("tags").and_then(|v| v.as_array()) {
-        Some(t) => t,
-        None => return Ok(None),
-    };
-    Ok(extract_owner_auth_tag(tags, signer_hex))
+    Ok(events.into_iter().next())
 }
 
 /// Pure extraction helper: require exactly one kind:0 tag whose first
@@ -201,46 +383,11 @@ async fn resolve_auth(
 /// then structurally validate that sole tag as
 /// `["auth", owner, conditions, sig]` matching `signer_hex`.
 ///
-/// Malformed tags (wrong arity, non-string elements, non-hex fields) are
-/// silently skipped — the contract is "bare" (None), not error.
+/// Thin wrapper around [`classify_owner_auth_tag`] that collapses the typed
+/// failure reason to `None`. Malformed tags → `None`; valid tag → `Some`.
+#[cfg(test)]
 fn extract_owner_auth_tag(tags: &[serde_json::Value], signer_hex: &str) -> Option<[String; 4]> {
-    let auth_tags: Vec<&serde_json::Value> = tags
-        .iter()
-        .filter(|tag| {
-            tag.as_array()
-                .and_then(|elems| elems.first())
-                .and_then(|v| v.as_str())
-                == Some("auth")
-        })
-        .collect();
-    if auth_tags.len() != 1 {
-        return None;
-    }
-
-    let elems = auth_tags[0].as_array()?;
-    if elems.len() != 4 {
-        return None;
-    }
-    let label = elems[0].as_str()?;
-    let owner = elems[1].as_str()?;
-    if !owner.eq_ignore_ascii_case(signer_hex) {
-        return None;
-    }
-    let conditions = elems[2].as_str()?;
-    let sig = elems[3].as_str()?;
-    if owner.len() != 64
-        || !owner.chars().all(|c| c.is_ascii_hexdigit())
-        || sig.len() != 128
-        || !sig.chars().all(|c| c.is_ascii_hexdigit())
-    {
-        return None;
-    }
-    Some([
-        label.to_owned(),
-        owner.to_owned(),
-        conditions.to_owned(),
-        sig.to_owned(),
-    ])
+    classify_owner_auth_tag(tags, signer_hex).ok()
 }
 
 /// Validate the NIP-11 relay-info `self` field is a 64-hex pubkey and
@@ -521,6 +668,418 @@ mod tests {
         assert!(extract_owner_auth_tag(&tags, &signer).is_none());
     }
 
+    // --- (c) auth-failure classifier: classify_owner_auth_tag ---
+    //
+    // Tests the typed failure taxonomy. Each case asserts the exact
+    // AuthFailure variant so a wrong classification causes a compile-time or
+    // assertion failure — not just a message-substring miss.
+
+    #[test]
+    fn classify_no_auth_tag_returns_no_auth_tag() {
+        // Case 3 (zero auth tags): tags array has entries but none labelled "auth".
+        let signer = hex64('a');
+        let tags = vec![json!(["p", hex64('b')]), json!(["e", hex64('c')])];
+        assert_eq!(
+            classify_owner_auth_tag(&tags, &signer),
+            Err(AuthFailure::NoAuthTag)
+        );
+    }
+
+    #[test]
+    fn classify_empty_tags_returns_no_auth_tag() {
+        assert_eq!(
+            classify_owner_auth_tag(&[], &hex64('a')),
+            Err(AuthFailure::NoAuthTag)
+        );
+    }
+
+    #[test]
+    fn classify_duplicate_auth_tags_returns_ambiguous() {
+        let signer = hex64('a');
+        let sig = hex128('b');
+        let tags = vec![
+            json!(["auth", signer, "conditions", sig]),
+            json!(["auth", signer, "conditions", sig]),
+        ];
+        assert_eq!(
+            classify_owner_auth_tag(&tags, &signer),
+            Err(AuthFailure::AmbiguousAuthTag(2))
+        );
+    }
+
+    #[test]
+    fn classify_wrong_arity_returns_wrong_arity() {
+        let signer = hex64('a');
+        let tags = vec![json!(["auth", signer, "conditions"])];
+        assert_eq!(
+            classify_owner_auth_tag(&tags, &signer),
+            Err(AuthFailure::WrongArity(3))
+        );
+    }
+
+    #[test]
+    fn classify_non_string_element_returns_non_string() {
+        let signer = hex64('a');
+        let tags = vec![json!(["auth", signer, 42, hex128('b')])];
+        assert_eq!(
+            classify_owner_auth_tag(&tags, &signer),
+            Err(AuthFailure::NonStringElement)
+        );
+    }
+
+    #[test]
+    fn classify_invalid_owner_hex_returns_invalid_owner_hex() {
+        let bad_owner = "z".repeat(64);
+        let tags = vec![json!(["auth", bad_owner, "", hex128('a')])];
+        assert_eq!(
+            classify_owner_auth_tag(&tags, &bad_owner),
+            Err(AuthFailure::InvalidOwnerHex(bad_owner))
+        );
+    }
+
+    #[test]
+    fn classify_invalid_sig_hex_returns_invalid_sig_hex() {
+        let signer = hex64('a');
+        let bad_sig = "z".repeat(128);
+        let tags = vec![json!(["auth", signer, "", bad_sig])];
+        assert_eq!(
+            classify_owner_auth_tag(&tags, &signer),
+            Err(AuthFailure::InvalidSigHex)
+        );
+    }
+
+    #[test]
+    fn classify_owner_mismatch_returns_owner_mismatch_with_actual_owner() {
+        // Case 4: structurally valid tag but owner ≠ signer. The failure must
+        // carry the actual owner so resolve_auth can print it in the warning.
+        let actual_owner = hex64('a');
+        let signer = hex64('b');
+        let sig = hex128('c');
+        let tags = vec![json!(["auth", actual_owner, "conditions", sig])];
+        assert_eq!(
+            classify_owner_auth_tag(&tags, &signer),
+            Err(AuthFailure::OwnerMismatch(actual_owner.clone()))
+        );
+        // Message must include the actual owner for actionability.
+        let msg = AuthFailure::OwnerMismatch(actual_owner.clone()).message();
+        assert!(
+            msg.contains(&actual_owner),
+            "OwnerMismatch message must include actual owner, got: {msg}"
+        );
+    }
+
+    // --- (c2) extract_auth: profile-level failure taxonomy ---
+    //
+    // Pure-unit tests: exercise `extract_auth` directly with pre-built
+    // profiles. No relay, no async runtime. These guard all failure paths
+    // that the async production resolver depends on.
+
+    #[test]
+    fn extract_auth_no_profile_returns_no_profile_failure() {
+        let target = hex64('t');
+        let signer = hex64('s');
+        assert_eq!(
+            extract_auth(None, &target, &signer),
+            Err(AuthFailure::NoProfile(target.clone()))
+        );
+    }
+
+    #[test]
+    fn extract_auth_no_tags_array_returns_no_tags_array_failure() {
+        let target = hex64('t');
+        let signer = hex64('s');
+        let profile = json!({"kind": 0, "content": "{}"});
+        assert_eq!(
+            extract_auth(Some(&profile), &target, &signer),
+            Err(AuthFailure::NoTagsArray(target.clone()))
+        );
+    }
+
+    #[test]
+    fn extract_auth_no_auth_tag_returns_no_auth_tag_failure() {
+        let target = hex64('t');
+        let signer = hex64('s');
+        let profile = json!({"tags": [["p", hex64('b')]]});
+        assert_eq!(
+            extract_auth(Some(&profile), &target, &signer),
+            Err(AuthFailure::NoAuthTag)
+        );
+    }
+
+    #[test]
+    fn extract_auth_valid_tag_returns_ok() {
+        let signer = hex64('a');
+        let sig = hex128('b');
+        let profile = json!({"tags": [["auth", signer, "conditions", sig]]});
+        let result = extract_auth(Some(&profile), &hex64('t'), &signer);
+        assert!(result.is_ok(), "must succeed with a valid tag");
+        let tag = result.unwrap();
+        assert_eq!(tag[0], "auth");
+        assert_eq!(tag[1], signer);
+    }
+
+    #[test]
+    fn extract_auth_owner_mismatch_returns_owner_mismatch_failure() {
+        let actual_owner = hex64('a');
+        let signer = hex64('b');
+        let sig = hex128('c');
+        let profile = json!({"tags": [["auth", actual_owner, "conditions", sig]]});
+        assert_eq!(
+            extract_auth(Some(&profile), &hex64('t'), &signer),
+            Err(AuthFailure::OwnerMismatch(actual_owner.clone()))
+        );
+        // Message must include the actual owner for actionability.
+        let msg = AuthFailure::OwnerMismatch(actual_owner.clone()).message();
+        assert!(
+            msg.contains(&actual_owner),
+            "OwnerMismatch message must include actual owner, got: {msg}"
+        );
+    }
+
+    // --- (c3) resolve_auth: production async resolver via counted test server ---
+    //
+    // Each test spins up a local Axum server that handles POST /query, counts
+    // calls, and returns a canned kind:0 (or empty array) based on the
+    // attempt number. The test drives the production `resolve_auth` function
+    // and asserts on both return value and exact fetch count.
+
+    use std::net::SocketAddr;
+    use std::sync::atomic::{AtomicU32, Ordering};
+    use std::sync::Arc;
+
+    use axum::body::Body;
+    use axum::extract::State;
+    use axum::http::{HeaderMap, Response, StatusCode};
+    use axum::Router;
+    use tokio::net::TcpListener;
+
+    /// Spin up an Axum server handling POST /query.
+    /// `f(n)` is called with the 1-based attempt number and returns the JSON body.
+    async fn query_server<F>(f: F) -> (String, Arc<AtomicU32>)
+    where
+        F: Fn(u32) -> String + Send + Sync + 'static,
+    {
+        let counter = Arc::new(AtomicU32::new(0));
+        let handler: Arc<dyn Fn(u32) -> String + Send + Sync> = Arc::new(f);
+        let state = (handler, counter.clone());
+
+        type S = (Arc<dyn Fn(u32) -> String + Send + Sync>, Arc<AtomicU32>);
+        let app = Router::new()
+            .route(
+                "/query",
+                axum::routing::post(
+                    |State((handler, ctr)): State<S>, _headers: HeaderMap, _body: Body| async move {
+                        let n = ctr.fetch_add(1, Ordering::SeqCst) + 1;
+                        let body = handler(n);
+                        Response::builder()
+                            .status(StatusCode::OK)
+                            .header("content-type", "application/json")
+                            .body(Body::from(body))
+                            .unwrap()
+                    },
+                ),
+            )
+            .with_state(state);
+
+        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let addr: SocketAddr = listener.local_addr().unwrap();
+        tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
+        (format!("http://{addr}"), counter)
+    }
+
+    fn test_client(base_url: &str) -> crate::client::BuzzClient {
+        let keys = nostr::Keys::generate();
+        crate::client::BuzzClient::new(base_url.to_string(), keys, None, None).unwrap()
+    }
+
+    fn kind0_response(signer_hex: &str) -> String {
+        let sig = hex128('b');
+        serde_json::json!([{
+            "kind": 0,
+            "tags": [["auth", signer_hex, "conditions", sig]],
+            "content": "{}"
+        }])
+        .to_string()
+    }
+
+    fn empty_response() -> String {
+        "[]".to_string()
+    }
+
+    fn no_auth_response() -> String {
+        serde_json::json!([{"kind": 0, "tags": [["p", "xx"]], "content": "{}"}]).to_string()
+    }
+
+    /// First attempt succeeds — exactly 1 fetch, Ok(Some(tag)).
+    #[tokio::test]
+    async fn resolve_auth_first_success_one_fetch() {
+        let signer = hex64('a');
+        let signer_clone = signer.clone();
+        let (url, counter) = query_server(move |_n| kind0_response(&signer_clone)).await;
+        let client = test_client(&url);
+        let target = hex64('b'); // target ≠ signer
+        let mut sink: Vec<u8> = Vec::new();
+
+        let result = resolve_auth(&client, &target, &signer, false, &mut sink).await;
+
+        assert!(result.is_ok(), "first success must return Ok: {result:?}");
+        assert!(result.unwrap().is_some(), "must return the extracted tag");
+        assert_eq!(
+            counter.load(Ordering::SeqCst),
+            1,
+            "first-success path must issue exactly 1 query"
+        );
+        assert!(sink.is_empty(), "no warning on success");
+    }
+
+    /// First fails (no auth tag), retry succeeds — exactly 2 fetches, Ok(Some(tag)).
+    #[tokio::test]
+    async fn resolve_auth_retry_success_two_fetches() {
+        let signer = hex64('a');
+        let signer_clone = signer.clone();
+        let (url, counter) = query_server(move |n| {
+            if n == 1 {
+                no_auth_response()
+            } else {
+                kind0_response(&signer_clone)
+            }
+        })
+        .await;
+        let client = test_client(&url);
+        let target = hex64('b');
+        let mut sink: Vec<u8> = Vec::new();
+
+        let result = resolve_auth(&client, &target, &signer, false, &mut sink).await;
+
+        assert!(result.is_ok(), "retry success must return Ok: {result:?}");
+        assert!(result.unwrap().is_some(), "must return the extracted tag");
+        assert_eq!(
+            counter.load(Ordering::SeqCst),
+            2,
+            "retry-success path must issue exactly 2 queries"
+        );
+        assert!(sink.is_empty(), "no warning on success");
+    }
+
+    /// Both attempts fail, allow_bare == false — exactly 2 fetches, Err (fail closed).
+    #[tokio::test]
+    async fn resolve_auth_double_failure_no_admin_fail_closed() {
+        let (url, counter) = query_server(|_n| no_auth_response()).await;
+        let client = test_client(&url);
+        let signer = hex64('s');
+        let target = hex64('t');
+        let mut sink: Vec<u8> = Vec::new();
+
+        let result = resolve_auth(&client, &target, &signer, false, &mut sink).await;
+
+        assert!(result.is_err(), "double failure must fail closed");
+        let err = result.unwrap_err().to_string();
+        assert!(
+            err.contains("refusing to send"),
+            "error must name the refusal: {err}"
+        );
+        assert!(
+            err.contains("--admin"),
+            "error must mention --admin escape: {err}"
+        );
+        assert_eq!(
+            counter.load(Ordering::SeqCst),
+            2,
+            "double-failure path must issue exactly 2 queries"
+        );
+        assert!(sink.is_empty(), "no warning on fail-closed path");
+    }
+
+    /// Both attempts fail, allow_bare == true (--admin) — exactly 2 fetches,
+    /// Ok(None) + exactly one warning line.
+    #[tokio::test]
+    async fn resolve_auth_double_failure_admin_allows_bare_with_warning() {
+        let (url, counter) = query_server(|_n| no_auth_response()).await;
+        let client = test_client(&url);
+        let signer = hex64('s');
+        let target = hex64('t');
+        let mut sink: Vec<u8> = Vec::new();
+
+        let result = resolve_auth(&client, &target, &signer, true, &mut sink).await;
+
+        assert!(result.is_ok(), "--admin must allow bare send: {result:?}");
+        assert!(result.unwrap().is_none(), "bare path returns None");
+        assert_eq!(
+            counter.load(Ordering::SeqCst),
+            2,
+            "--admin double-failure path must issue exactly 2 queries"
+        );
+        // Exactly one warning line.
+        let text = std::str::from_utf8(&sink).expect("UTF-8");
+        let lines: Vec<&str> = text.lines().collect();
+        assert_eq!(
+            lines.len(),
+            1,
+            "expected exactly one warning, got: {text:?}"
+        );
+        let parsed: serde_json::Value = serde_json::from_str(lines[0]).expect("valid JSON warning");
+        let warning = parsed["warning"].as_str().expect("string warning field");
+        assert!(
+            warning.contains("proceeding without owner attestation"),
+            "warning must name the bare-send: {warning}"
+        );
+    }
+
+    /// Self path (target == signer, case-insensitive) — zero fetches, Ok(None).
+    #[tokio::test]
+    async fn resolve_auth_self_path_zero_fetches() {
+        // Server counts every /query call; we assert 0.
+        let (url, counter) = query_server(|_n| empty_response()).await;
+        let client = test_client(&url);
+        let signer = hex64('a');
+        let target_upper = signer.to_uppercase(); // case-insensitive self
+        let mut sink: Vec<u8> = Vec::new();
+
+        let result = resolve_auth(&client, &target_upper, &signer, false, &mut sink).await;
+
+        assert!(result.is_ok(), "self path must return Ok: {result:?}");
+        assert!(result.unwrap().is_none(), "self path returns None");
+        assert_eq!(
+            counter.load(Ordering::SeqCst),
+            0,
+            "self path must issue zero queries"
+        );
+        assert!(sink.is_empty(), "no warning on self path");
+    }
+
+    // --- (c4) --admin flag parser: both archive and unarchive ---
+    //
+    // These tests confirm the flag is declared and parsed on both subcommands
+    // so it can't silently disappear from one of them.
+
+    #[test]
+    fn archive_admin_flag_is_parsed() {
+        use crate::Cli;
+        use clap::Parser;
+        let cli = Cli::try_parse_from(["buzz", "agents", "archive", &hex64('a'), "--admin"])
+            .expect("--admin must be accepted by agents archive");
+        match cli.command {
+            crate::Cmd::Agents(crate::AgentsCmd::Archive { admin, .. }) => {
+                assert!(admin, "--admin must be true when flag is present");
+            }
+            _ => panic!("unexpected command variant"),
+        }
+    }
+
+    #[test]
+    fn unarchive_admin_flag_is_parsed() {
+        use crate::Cli;
+        use clap::Parser;
+        let cli = Cli::try_parse_from(["buzz", "agents", "unarchive", &hex64('a'), "--admin"])
+            .expect("--admin must be accepted by agents unarchive");
+        match cli.command {
+            crate::Cmd::Agents(crate::AgentsCmd::Unarchive { admin, .. }) => {
+                assert!(admin, "--admin must be true when flag is present");
+            }
+            _ => panic!("unexpected command variant"),
+        }
+    }
+
     // --- (d) NIP-11 self normalization: normalize_relay_self_hex ---
 
     #[test]
diff --git a/crates/buzz-cli/src/lib.rs b/crates/buzz-cli/src/lib.rs
index 8a8bb053b0f..0b00f92e2e2 100644
--- a/crates/buzz-cli/src/lib.rs
+++ b/crates/buzz-cli/src/lib.rs
@@ -298,8 +298,10 @@ pub enum AgentsCmd {
     },
     /// Submit a NIP-IA archive request for an identity (kind 9035)
     #[command(
-        after_help = "The relay chooses the consent path (self / admin / owner) from the \
-submitted request; this command does not retry with a different shape.\n\n\
+        after_help = "Auth flow: when target != signer, the CLI fetches the target's kind:0 and \
+attaches its owner-auth tag. On extraction failure it retries once (common cause: profile \
+republish in progress). If the retry also fails, the command exits with an error — use \
+--admin to bypass this guard when your key is a relay admin.\n\n\
 Suggested --reason codes (unknown values are allowed): rotated, retired, \
 bot-rebuilt, left-organization, spam\n\n\
 Archiving a third-party identity is a human owner/admin action: an agent \
@@ -322,10 +324,21 @@ buzz agents archive <PUBKEY> --reason bot-rebuilt --replaced-by <NEW_PUBKEY>"
         /// Optional human-readable note (not parsed for authorization)
         #[arg(long, default_value = "")]
         content: String,
+        /// Allow sending without owner-auth attestation after extraction fails
+        /// (relay-admin path). Use only when your key is a relay admin; ordinary
+        /// owners do not need this flag. Without it, auth-extraction failure after
+        /// one automatic retry is a hard error rather than a silent bare send.
+        #[arg(long, default_value_t = false)]
+        admin: bool,
     },
     /// Submit a NIP-IA unarchive request for an identity (kind 9036)
-    #[command(after_help = "Examples:\n  \
-buzz agents unarchive <PUBKEY> --reason returned")]
+    #[command(
+        after_help = "Auth flow: same as `archive` — retries kind:0 fetch once on \
+extraction failure, then exits with an error if still unresolvable. Use --admin to bypass \
+for relay-admin callers.\n\n\
+Examples:\n  \
+buzz agents unarchive <PUBKEY> --reason returned"
+    )]
     Unarchive {
         /// Target identity pubkey (hex)
         target_pubkey: String,
@@ -335,6 +348,12 @@ buzz agents unarchive <PUBKEY> --reason returned")]
         /// Optional human-readable note (not parsed for authorization)
         #[arg(long, default_value = "")]
         content: String,
+        /// Allow sending without owner-auth attestation after extraction fails
+        /// (relay-admin path). Use only when your key is a relay admin; ordinary
+        /// owners do not need this flag. Without it, auth-extraction failure after
+        /// one automatic retry is a hard error rather than a silent bare send.
+        #[arg(long, default_value_t = false)]
+        admin: bool,
     },
     /// Read the relay's current NIP-IA archive snapshot (kind 13535)
     #[command(
diff --git a/crates/buzz-core/src/pairing/session.rs b/crates/buzz-core/src/pairing/session.rs
index 431b87fcc03..0d43d4d8279 100644
--- a/crates/buzz-core/src/pairing/session.rs
+++ b/crates/buzz-core/src/pairing/session.rs
@@ -223,6 +223,48 @@ impl PairingSession {
         Ok(event)
     }
 
+    /// (Source) Process a payload sent back by the target.
+    ///
+    /// This is used by recovery flows where the QR-displaying device requests
+    /// a secret from an already-authorized scanning device.
+    pub fn handle_return_payload(
+        &mut self,
+        event: &Event,
+    ) -> Result<(PayloadType, Zeroizing<String>), PairingError> {
+        self.check_expired()?;
+        self.expect_state(SessionState::Transferring)?;
+        self.expect_role(Role::Source)?;
+        self.validate_event_from_peer(event)?;
+
+        let msg = self.decrypt_message(event)?;
+        match msg {
+            PairingMessage::Payload {
+                payload_type,
+                payload,
+            } => {
+                self.state = SessionState::PayloadExchanged;
+                self.record_event(event);
+                Ok((payload_type, Zeroizing::new(payload)))
+            }
+            other => Err(unexpected("payload", &other)),
+        }
+    }
+
+    /// (Source) Report whether a returned payload was imported successfully.
+    pub fn send_source_complete(&mut self, success: bool) -> Result<Event, PairingError> {
+        self.check_expired()?;
+        self.expect_state(SessionState::PayloadExchanged)?;
+        self.expect_role(Role::Source)?;
+
+        let event = self.build_event(&PairingMessage::Complete { success })?;
+        self.state = if success {
+            SessionState::Completed
+        } else {
+            SessionState::Aborted
+        };
+        Ok(event)
+    }
+
     /// (Source) Build the payload event carrying the secret.
     pub fn send_payload(
         &mut self,
@@ -821,6 +863,74 @@ mod tests {
         assert_eq!(source.state(), SessionState::Completed);
     }
 
+    /// Reverse happy-path: the scanning target returns an nsec and the source
+    /// reports the import result. Duplicate payloads remain single-use.
+    #[test]
+    fn reverse_payload_flow_is_single_use() {
+        let (mut source, qr) = PairingSession::new_source("wss://relay.test".into());
+        let (mut target, offer) = PairingSession::new_target(&qr).expect("target");
+        let source_sas = source.handle_offer(&offer).expect("offer");
+        let sas_confirm = source.confirm_sas().expect("source confirm");
+        assert_eq!(
+            target
+                .handle_sas_confirm(&sas_confirm)
+                .expect("sas-confirm"),
+            source_sas
+        );
+        target.confirm_target_sas().expect("target confirm");
+
+        let payload = target
+            .build_event(&PairingMessage::Payload {
+                payload_type: PayloadType::Nsec,
+                payload: "nsec1recovered".into(),
+            })
+            .expect("return payload");
+        let (payload_type, secret) = source
+            .handle_return_payload(&payload)
+            .expect("handle return payload");
+        assert_eq!(payload_type, PayloadType::Nsec);
+        assert_eq!(*secret, "nsec1recovered");
+        assert_eq!(source.state(), SessionState::PayloadExchanged);
+        assert!(source.handle_return_payload(&payload).is_err());
+
+        let complete = source.send_source_complete(true).expect("source complete");
+        assert_eq!(source.state(), SessionState::Completed);
+        assert!(matches!(
+            target.decrypt_message(&complete).expect("decrypt complete"),
+            PairingMessage::Complete { success: true }
+        ));
+    }
+
+    #[test]
+    fn reverse_payload_import_failure_aborts_both_peers() {
+        let (mut source, qr) = PairingSession::new_source("wss://relay.test".into());
+        let (mut target, offer) = PairingSession::new_target(&qr).expect("target");
+        source.handle_offer(&offer).expect("offer");
+        let sas_confirm = source.confirm_sas().expect("source confirm");
+        target
+            .handle_sas_confirm(&sas_confirm)
+            .expect("sas-confirm");
+        target.confirm_target_sas().expect("target confirm");
+        let payload = target
+            .build_event(&PairingMessage::Payload {
+                payload_type: PayloadType::Nsec,
+                payload: "invalid".into(),
+            })
+            .expect("return payload");
+        source
+            .handle_return_payload(&payload)
+            .expect("handle return payload");
+
+        let complete = source
+            .send_source_complete(false)
+            .expect("failure complete");
+        assert_eq!(source.state(), SessionState::Aborted);
+        assert!(matches!(
+            target.decrypt_message(&complete).expect("decrypt complete"),
+            PairingMessage::Complete { success: false }
+        ));
+    }
+
     /// State machine rejects out-of-order operations.
     #[test]
     fn reject_out_of_order_operations() {
diff --git a/crates/buzz-relay/CHANGELOG.md b/crates/buzz-relay/CHANGELOG.md
index c0d6ab9ccd5..7ee7e9a303b 100644
--- a/crates/buzz-relay/CHANGELOG.md
+++ b/crates/buzz-relay/CHANGELOG.md
@@ -1,5 +1,114 @@
 # Changelog
 
+## relay-v0.2.1
+
+- fix(sdk): preserve self-mention p tags in message and forum event builders ([#4975](https://github.com/block/buzz/pull/4975)) ([`78c87ae20e`](https://github.com/block/buzz/commit/78c87ae20e182fffdd99744d6c9ff99df82b159c))
+- feat(desktop): adding rich link previews to messages ([#3818](https://github.com/block/buzz/pull/3818)) ([`1922d49cb2`](https://github.com/block/buzz/commit/1922d49cb200a3382a91ec253f530b44dfda5f55))
+- feat(relay): accept kind:30179 private managed-agent events at ingest ([#5133](https://github.com/block/buzz/pull/5133)) ([`ad923353a2`](https://github.com/block/buzz/commit/ad923353a24b784df13a7c88757d6b24ebe36299))
+- fix(media): require authenticated reads ([#4610](https://github.com/block/buzz/pull/4610)) ([`769ac70b74`](https://github.com/block/buzz/commit/769ac70b741e3ad6809bff14eba29d3dd2cbd318))
+- feat(identity): recover desktop identity from a signed-in phone ([#4845](https://github.com/block/buzz/pull/4845)) ([`6eb65919f1`](https://github.com/block/buzz/commit/6eb65919f1eabd46b3850c15eefab31092dd500b))
+- ci: prove the relay-driven mesh lifecycle — discover, join, infer, deny — with real nodes ([#3862](https://github.com/block/buzz/pull/3862)) ([`38bf642fcf`](https://github.com/block/buzz/commit/38bf642fcfa7a9fc1e06d6cf87d66ae94da29341))
+- relay: fuzz WebSocket 1012 restart-close timing on graceful drain (BUZZ_DRAIN_JITTER_MS) ([#4542](https://github.com/block/buzz/pull/4542)) ([`e14fff74d0`](https://github.com/block/buzz/commit/e14fff74d00623acd30945eec5be366e25b0cf09))
+- fix(reactions): support max-length custom emoji ([#3833](https://github.com/block/buzz/pull/3833)) ([`2ea9385015`](https://github.com/block/buzz/commit/2ea9385015fb922de2adf0a53e86fc5a21d07b90))
+- fix(channels): restrict private-channel invitations ([#4612](https://github.com/block/buzz/pull/4612)) ([`efe1893dd3`](https://github.com/block/buzz/commit/efe1893dd372cfb92ed2e8a3ada2ed7b62c9477a))
+- fix(workflow): bind trigger author to the signed event ([#4607](https://github.com/block/buzz/pull/4607)) ([`885bed35ee`](https://github.com/block/buzz/commit/885bed35eee3f933c48d333c8979fdbc038e98b9))
+- fix(git): revoke access for banned relay members ([#4608](https://github.com/block/buzz/pull/4608)) ([`997b8caaa4`](https://github.com/block/buzz/commit/997b8caaa4c9e5af69dd8a496b4995d09a69f694))
+- Define private managed agent wire protocol ([#4593](https://github.com/block/buzz/pull/4593)) ([`067c085f37`](https://github.com/block/buzz/commit/067c085f37d9dcb2f598b0e2a6b6653903364783))
+- perf(relay): index channel-id lookups and skip trace-only reads ([#4647](https://github.com/block/buzz/pull/4647)) ([`bc9e6528a7`](https://github.com/block/buzz/commit/bc9e6528a7ba6007c5a25f6a0aca9c05d72e9d2c))
+- Polish mobile inbox and media flows ([#4512](https://github.com/block/buzz/pull/4512)) ([`feccf4eabc`](https://github.com/block/buzz/commit/feccf4eabc23fdba94ce3537a194357ed17b197c))
+- fix(git): allow deleting the default branch ([#4297](https://github.com/block/buzz/pull/4297)) ([`fc598f5f8d`](https://github.com/block/buzz/commit/fc598f5f8d70728d11d0712b9fa8e3acc44ea4c3))
+- feat(projects): add buzz projects CLI commands (NIP-MP kind:30621) ([#4020](https://github.com/block/buzz/pull/4020)) ([`b7bb15122e`](https://github.com/block/buzz/commit/b7bb15122e8a2053b545dc2210afc167f6c7a626))
+- perf(relay): serve relay-membership checks from the read replica ([#4124](https://github.com/block/buzz/pull/4124)) ([`ac4fa13b8e`](https://github.com/block/buzz/commit/ac4fa13b8e4d947071d57deb6918dcf12bf74961))
+- fix(relay): allow open relays to set their NIP-11 workspace icon (kind:9033) ([#3998](https://github.com/block/buzz/pull/3998)) ([`5765fc74b7`](https://github.com/block/buzz/commit/5765fc74b77224f0207ddd4b41736a5ff18d333d))
+- feat(relay): accept kind:30621 multi-repo projects at ingest ([#3171](https://github.com/block/buzz/pull/3171)) ([`cb9701cd30`](https://github.com/block/buzz/commit/cb9701cd30fb344bf134585634a09007f3155bfb))
+- feat(relay): raise hosted community limit to five ([#3829](https://github.com/block/buzz/pull/3829)) ([`10d5a26414`](https://github.com/block/buzz/commit/10d5a26414dc90dc89fd27de74b21e105d4fa622))
+- fix(relay): align NIP-11 max_limit with REQ ceiling ([#3635](https://github.com/block/buzz/pull/3635)) ([`23f0c26b1c`](https://github.com/block/buzz/commit/23f0c26b1ceba8e07bf3c160a1e08c7bda82ccd9))
+- feat(relay): gate kind 30178 team-catalog reads behind the shared tag ([#3358](https://github.com/block/buzz/pull/3358)) ([`114d40d9d3`](https://github.com/block/buzz/commit/114d40d9d37f05eff83ee90347ed93fb3da512c5))
+- fix(db): isolate usage metrics advisory-lock test on scratch DB ([#3670](https://github.com/block/buzz/pull/3670)) ([`dba97eecd9`](https://github.com/block/buzz/commit/dba97eecd9d8659c9c816cd6666fa6d687b6bca1))
+- perf(presence): reduce heartbeat frequency ([#3783](https://github.com/block/buzz/pull/3783)) ([`bf139e8d0b`](https://github.com/block/buzz/commit/bf139e8d0bdba10df9a5adbf16843140e0a78a59))
+- feat(mesh): upgrade embedded mesh to v0.74 and harden shared compute (split 1/2 of #3467) ([#3741](https://github.com/block/buzz/pull/3741)) ([`4933672eb4`](https://github.com/block/buzz/commit/4933672eb4589e7208b312829ebddcd10dfa9dd3))
+- feat(replica): portable heartbeat-token fence with snapshot-local reader routing ([#3268](https://github.com/block/buzz/pull/3268)) ([`63496cc1d4`](https://github.com/block/buzz/commit/63496cc1d4c6f1b7c613801bdcc694169dcf391a))
+- fix(git): channel binding tooling + author remediation for unbound repos ([#3626](https://github.com/block/buzz/pull/3626)) ([`788b3c002b`](https://github.com/block/buzz/commit/788b3c002bd2509455444f57f8a03a054b4b496a))
+- feat: configure S3 URL addressing style ([#3400](https://github.com/block/buzz/pull/3400)) ([`7012d86d52`](https://github.com/block/buzz/commit/7012d86d52fd188b27c7beedeaa132d9c1f61fa8))
+- feat(tracing): correlate trace IDs in relay logs ([#3608](https://github.com/block/buzz/pull/3608)) ([`005b5b819a`](https://github.com/block/buzz/commit/005b5b819a98ce85d4d80cd81b258fb6f9b8d51e))
+- fix(relay): avoid subscription lock inversion ([#3413](https://github.com/block/buzz/pull/3413)) ([`22be8bb351`](https://github.com/block/buzz/commit/22be8bb35177e27efc2dca2534df9a8dd871eae0))
+- feat(cli): add users set-status command for NIP-38 profile status ([#3253](https://github.com/block/buzz/pull/3253)) ([`60158fce3e`](https://github.com/block/buzz/commit/60158fce3e670f11bb35d42627857ccaea50ff06))
+- feat(relay): make Postgres pool size configurable, default 50 ([#3191](https://github.com/block/buzz/pull/3191)) ([`2ce2d71cc3`](https://github.com/block/buzz/commit/2ce2d71cc38a9657eaf344c10e07f155b8a18615))
+- feat(tracing): add datastore tracing plumbing ([#2760](https://github.com/block/buzz/pull/2760)) ([`e94b9aeda0`](https://github.com/block/buzz/commit/e94b9aeda0b2272d36e3744e78680be69295b8b5))
+- feat(invites): add use-limited invite links ([#3141](https://github.com/block/buzz/pull/3141)) ([`d500c2d5cf`](https://github.com/block/buzz/commit/d500c2d5cf5d9aabe0ca4ebebfcafdbe5f5b7fd3))
+- feat(admin): show reported message content in report detail ([#3149](https://github.com/block/buzz/pull/3149)) ([`f069a85503`](https://github.com/block/buzz/commit/f069a8550373328babe4239ed614fcdf884721e2))
+- resolve findings ([#3150](https://github.com/block/buzz/pull/3150)) ([`9b0f744804`](https://github.com/block/buzz/commit/9b0f744804697b802f7afb88947194702765c78d))
+- Revert "fix(cli,relay): resolve agents by verified owner" ([#3168](https://github.com/block/buzz/pull/3168)) ([`a041e2d21e`](https://github.com/block/buzz/commit/a041e2d21e292a271fdfc26f0cdcdd0456f815c5))
+- fix(cli,relay): resolve agents by verified owner ([#2615](https://github.com/block/buzz/pull/2615)) ([`c3084b36d9`](https://github.com/block/buzz/commit/c3084b36d975259f2dfeee8edc9131b40a8bce83))
+- fix(security): enforce durable community ban on NIP-43 relay-admin kinds 9030-9033 ([#3128](https://github.com/block/buzz/pull/3128)) ([`e2e0079101`](https://github.com/block/buzz/commit/e2e007910114ddf7c5a4e93bb03f6afe13552e92))
+- fix(security): authorize kind:9000 role changes in both directions ([#3017](https://github.com/block/buzz/pull/3017)) ([`00ecf2cac7`](https://github.com/block/buzz/commit/00ecf2cac7544d986b4eb111ad0a8b1d7560791f))
+- feat(desktop): handle project work from Inbox ([#3117](https://github.com/block/buzz/pull/3117)) ([`c5c4f390b6`](https://github.com/block/buzz/commit/c5c4f390b6713256e2efb8394c59823ebad73db6))
+- feat(relay): make per-owner community limit configurable via BUZZ_MAX_COMMUNITIES_PER_OWNER ([#2599](https://github.com/block/buzz/pull/2599)) ([`2a051a404d`](https://github.com/block/buzz/commit/2a051a404dcde42dddbff2a0b33f717ffe9cf999))
+- feat(relay): add author-only-unless-shared read gate for kind 30175 ([#2768](https://github.com/block/buzz/pull/2768)) ([`ab3af82871`](https://github.com/block/buzz/commit/ab3af828714ab699dfc87644d234014987a4fe6b))
+- fix(core): block IPv6 transition SSRF targets ([#2801](https://github.com/block/buzz/pull/2801)) ([`c26bf5945d`](https://github.com/block/buzz/commit/c26bf5945d8f2ef19746a78e80a7c1dae2ef3db9))
+- fix(workflow): bypass system proxies for webhooks ([#2800](https://github.com/block/buzz/pull/2800)) ([`60a171b19e`](https://github.com/block/buzz/commit/60a171b19efd515d9213b535d52a2bcbec3ff2fe))
+- fix(audit): hash created_at at the precision Postgres stores ([#2638](https://github.com/block/buzz/pull/2638)) ([`264a56a226`](https://github.com/block/buzz/commit/264a56a2260ac87350bfe1f5d3ec3d89615eb47c))
+- feat(desktop): make pull request reviews actionable ([#2510](https://github.com/block/buzz/pull/2510)) ([`9081ab0ec9`](https://github.com/block/buzz/commit/9081ab0ec9c5d91548c7f5ff52eba6cca4788dd0))
+- fix(relay): decompress gzip-encoded git smart-HTTP request bodies ([#2670](https://github.com/block/buzz/pull/2670)) ([`5ca36e7b91`](https://github.com/block/buzz/commit/5ca36e7b919097733868764d8e0073e99c3206c3))
+- fix(sharing): preserve agent/team snapshot tEXt chunks through media sanitization ([#2438](https://github.com/block/buzz/pull/2438)) ([`b096b0a15a`](https://github.com/block/buzz/commit/b096b0a15af4c4566365c5b1efe7f39b700222ed))
+- fix(relay): send 1012 restart close to all clients on graceful drain ([#2575](https://github.com/block/buzz/pull/2575)) ([`1911c69aa2`](https://github.com/block/buzz/commit/1911c69aa2912c1408bd6b21759b657458fb43af))
+- fix(media): sanitize animated image uploads ([#2524](https://github.com/block/buzz/pull/2524)) ([`8f8f5fa5a4`](https://github.com/block/buzz/commit/8f8f5fa5a4b2463cdc6c2a527acb7086150cdaae))
+- fix(channels): strip leading hash prefixes from names ([#2250](https://github.com/block/buzz/pull/2250)) ([`d0ab3fdb05`](https://github.com/block/buzz/commit/d0ab3fdb054e0cfedbf21e4c5143ad6c671c10cc))
+- feat(relay): make Redis pool size configurable, default 16 ([#2521](https://github.com/block/buzz/pull/2521)) ([`bcc3e13069`](https://github.com/block/buzz/commit/bcc3e1306946528102bb26be9a7c41299e2f8e00))
+- feat(desktop+acp): spawn a harness per (agent, community) pair at GUI startup — warm sockets, lazy LLM pool ([#2122](https://github.com/block/buzz/pull/2122)) ([`61cc738ee8`](https://github.com/block/buzz/commit/61cc738ee8991e92563136de4b77e54cb9756420))
+- feat(media): add S3-truth per-community storage sweep ([#2044](https://github.com/block/buzz/pull/2044)) ([`bd37a4d584`](https://github.com/block/buzz/commit/bd37a4d584fefc1d13ad8abadf6e890e66183072))
+- feat(relay): log NIP-98 pubkey attribution on HTTP bridge requests ([#2206](https://github.com/block/buzz/pull/2206)) ([`7e34bee62c`](https://github.com/block/buzz/commit/7e34bee62cacaa9d8a96c14d5892a471b59a1983))
+- Revert "feat(relay): inventory unreachable Git objects" ([#2275](https://github.com/block/buzz/pull/2275)) ([`0fb820f9bf`](https://github.com/block/buzz/commit/0fb820f9bfbd7e19e48f9826e332920c2ee2c229))
+- feat(relay): inventory unreachable Git objects ([#2264](https://github.com/block/buzz/pull/2264)) ([`3afc9dae15`](https://github.com/block/buzz/commit/3afc9dae159262220c4149e9c8add50772869318))
+- relay: add author_type label to buzz_events_stored_total ([#2243](https://github.com/block/buzz/pull/2243)) ([`b9f54c43fe`](https://github.com/block/buzz/commit/b9f54c43fe2bcd0eb8fb3b76914e9aa0c31f6927))
+- fix(git): make project branch workflows reliable ([#2213](https://github.com/block/buzz/pull/2213)) ([`166f27be4b`](https://github.com/block/buzz/commit/166f27be4bc1abf2d465493bf2137353045399dc))
+- feat(cli): manage repository protection rules ([#2193](https://github.com/block/buzz/pull/2193)) ([`f94324598d`](https://github.com/block/buzz/commit/f94324598d84b2db9a05a3fa1f855970c4c5b575))
+- feat(cli): add agents archive/unarchive/archived subcommands ([#2173](https://github.com/block/buzz/pull/2173)) ([`7d7992067b`](https://github.com/block/buzz/commit/7d7992067b2914b582b7e6d31a6174603b480b4b))
+- fix(mobile): sanitize Android image uploads ([#2188](https://github.com/block/buzz/pull/2188)) ([`ee21da90bd`](https://github.com/block/buzz/commit/ee21da90bd6b1da6bfaaf22ba00749398aaa9640))
+- fix(cli): paginate channel directory queries ([#2181](https://github.com/block/buzz/pull/2181)) ([`03fe19d603`](https://github.com/block/buzz/commit/03fe19d6033094ae2ec4c89c26eb23174ef53daa))
+- fix(mobile): image upload fails due to unstripped metadata ([#2185](https://github.com/block/buzz/pull/2185)) ([`37f15b2001`](https://github.com/block/buzz/commit/37f15b20019169363b697aee41c99573b7bc3f24))
+- perf(relay): compact Git packs before manifest limits ([#2172](https://github.com/block/buzz/pull/2172)) ([`80e0ab16b0`](https://github.com/block/buzz/commit/80e0ab16b03c656ec8def18bedc27eaf29c02867))
+- perf(relay): cache Git pack hydration ([#2169](https://github.com/block/buzz/pull/2169)) ([`a4d82ec722`](https://github.com/block/buzz/commit/a4d82ec7226e685a933dbd829b6bb8bce0787b4e))
+- fix(relay): bound and observe Git read operations ([#2167](https://github.com/block/buzz/pull/2167)) ([`5f7c93d9c1`](https://github.com/block/buzz/commit/5f7c93d9c12ce7894288ae47f3fe223fcff2dce3))
+- relay: gate push enqueue on live leases; batch matcher pipeline (T1b/T1a-repair/T2b) ([#2145](https://github.com/block/buzz/pull/2145)) ([`e43b2d5aac`](https://github.com/block/buzz/commit/e43b2d5aac0d1f2b6b623b04f7af5a51f77da8c6))
+- relay: add audit logging disable switch ([#2134](https://github.com/block/buzz/pull/2134)) ([`bf5acabdde`](https://github.com/block/buzz/commit/bf5acabdde44aa133bdcbafcf9e1a4ff752c3302))
+- relay: skip TTL deadline bump for known-permanent channels (T1a write-amp) ([#2125](https://github.com/block/buzz/pull/2125)) ([`2e936d439c`](https://github.com/block/buzz/commit/2e936d439ce29182b48086f9f8a7a3ffe3b9b345))
+- fix(git): carry NIP-OA delegation in auth event ([#2120](https://github.com/block/buzz/pull/2120)) ([`c12257d57a`](https://github.com/block/buzz/commit/c12257d57a54d5c1e16435440b02beb5d1c057b8))
+- Route lag-tolerant reads to an optional Postgres read replica ([#2084](https://github.com/block/buzz/pull/2084)) ([`29c48883d3`](https://github.com/block/buzz/commit/29c48883d30e6feed75e33490571ca96082c6282))
+- fix: recover community access visibility ([#2074](https://github.com/block/buzz/pull/2074)) ([`ca384d082d`](https://github.com/block/buzz/commit/ca384d082d9804ec53a3fd12ccbf4a0846b21d92))
+- feat: proxy feedback-scoped admin attachments ([#2059](https://github.com/block/buzz/pull/2059)) ([`d7f918e3cb`](https://github.com/block/buzz/commit/d7f918e3cbcc4d30f222d0f4ae836de808f859a2))
+- feat: add read-only deployment moderation dashboard ([#1999](https://github.com/block/buzz/pull/1999)) ([`68e670e001`](https://github.com/block/buzz/commit/68e670e001d2bed2cf141095926feaf482c3bed8))
+- Bug-bash round 2: table scroll, Goose instructions, workflow mention wake ([#2034](https://github.com/block/buzz/pull/2034)) ([`64b8fea6dc`](https://github.com/block/buzz/commit/64b8fea6dce3be684aa0bac5dbd701e46dc7e432))
+- Strip media metadata on clients and reject it at the relay ([#2006](https://github.com/block/buzz/pull/2006)) ([`5cfd69cb0c`](https://github.com/block/buzz/commit/5cfd69cb0cf1dc63d718454defe3b8a8aaf5f15b))
+- [codex] Hold Git concurrency permits through streaming (BUZZ-SEC-018) ([#1916](https://github.com/block/buzz/pull/1916)) ([`7baea42abb`](https://github.com/block/buzz/commit/7baea42abbbb794e6e5ab0e9df11e2d1b0550d0b))
+- [codex] Enforce shared relay admission limits (BUZZ-SEC-019) ([#1917](https://github.com/block/buzz/pull/1917)) ([`73fc0ec6cf`](https://github.com/block/buzz/commit/73fc0ec6cf58a79bfc65e42faba457bf49c2d232))
+- [codex] Block banned actors from moderation commands (BUZZ-SEC-007) ([#1915](https://github.com/block/buzz/pull/1915)) ([`caa195ca58`](https://github.com/block/buzz/commit/caa195ca58ea49cf8ed9c3ede55d6a2e4ed37096))
+- [codex] Fix relay WebSocket admission limits ([#1682](https://github.com/block/buzz/pull/1682)) ([`d3ce971fc7`](https://github.com/block/buzz/commit/d3ce971fc75a34162d5498c27ac4a1c30236630a))
+- feat: add invite QR and mobile direct join ([#1957](https://github.com/block/buzz/pull/1957)) ([`648cbf3610`](https://github.com/block/buzz/commit/648cbf36109d97be6bd8530e77073d1c7e6008a0))
+- fix(join-policy): require legal consent on hosted invites ([#1987](https://github.com/block/buzz/pull/1987)) ([`2e1577f76f`](https://github.com/block/buzz/commit/2e1577f76f5105ddacda7be884518574ca8d6b96))
+- [codex] Prevent actor-tag UI impersonation ([#1931](https://github.com/block/buzz/pull/1931)) ([`c540ec9678`](https://github.com/block/buzz/commit/c540ec967869ef0f4eef90439bf70929fc74f7f6))
+- Scope relay runtime state by community ([#1658](https://github.com/block/buzz/pull/1658)) ([`d52dedb06f`](https://github.com/block/buzz/commit/d52dedb06fc2c7692c6d9225c7a08b41a509633a))
+- Apply optional relay join policy across join flows ([#1894](https://github.com/block/buzz/pull/1894)) ([`6c2d667575`](https://github.com/block/buzz/commit/6c2d667575cbc372ba42d26134448660fb1d2ee9))
+- feat(media): require auth for relay media reads ([#1926](https://github.com/block/buzz/pull/1926)) ([`f308762852`](https://github.com/block/buzz/commit/f3087628524951de91028c9d263bcd0d0a727fab))
+- feat(relay): add community unarchive endpoint ([#1908](https://github.com/block/buzz/pull/1908)) ([`6b9641db2b`](https://github.com/block/buzz/commit/6b9641db2b4709b71622b7ef0b799117a0605ca6))
+- feat(relay): gate Git web GUI separately ([#1901](https://github.com/block/buzz/pull/1901)) ([`34dc7dec75`](https://github.com/block/buzz/commit/34dc7dec75285ab6f2107ce5cad170b80b92206a))
+- mesh: upgrade runtime, enforce membership, add shared compute provider ([#1656](https://github.com/block/buzz/pull/1656)) ([`54638ff4bb`](https://github.com/block/buzz/commit/54638ff4bb5af2d3d3759b44118b43052f814bb1))
+- Route Git scratch through configured volume ([#1884](https://github.com/block/buzz/pull/1884)) ([`2318b3096c`](https://github.com/block/buzz/commit/2318b3096c585f8d31bd43e27dc5d6305c5fe20d))
+- feat(relay): gate usage metrics behind stable leader ([#1814](https://github.com/block/buzz/pull/1814)) ([`59e9821503`](https://github.com/block/buzz/commit/59e9821503a2fe23fc4630aa0f36bb252ae4566f))
+- Relay mesh: cross-pod tunnel + huddle transport (buzz-relay-mesh) ([#1670](https://github.com/block/buzz/pull/1670)) ([`ccb021d713`](https://github.com/block/buzz/commit/ccb021d71339009aabedc383c8f3d8e5c23e1e42))
+- feat(push): deliver accepted relay events as wakes ([#1866](https://github.com/block/buzz/pull/1866)) ([`bffbc5f22c`](https://github.com/block/buzz/commit/bffbc5f22cc80e9a07dedc622798347d598a215c))
+- fix(db): resolve duplicate migration version ([#1863](https://github.com/block/buzz/pull/1863)) ([`08ad38a07f`](https://github.com/block/buzz/commit/08ad38a07f0c49bb3f20b775b8f534f1cfa529c3))
+- Add private product feedback sidecar ([#1857](https://github.com/block/buzz/pull/1857)) ([`af190c93e1`](https://github.com/block/buzz/commit/af190c93e1048af64c3fbfb3831c689cb703997c))
+- feat(relay): add durable community archival ([#1834](https://github.com/block/buzz/pull/1834)) ([`2b15a72675`](https://github.com/block/buzz/commit/2b15a726750dbd7437711050cd3241b679dff317))
+- feat(push): add public APNs gateway ([#1770](https://github.com/block/buzz/pull/1770)) ([`1c006822e4`](https://github.com/block/buzz/commit/1c006822e4484d68e33fce14f9139c2f70ce9d66))
+- feat(relay): add atomic community ownership transfer ([#1845](https://github.com/block/buzz/pull/1845)) ([`52e42ccb9f`](https://github.com/block/buzz/commit/52e42ccb9fc85445814614c72d40f346e986152b))
+- Bound NIP-RS retention and search indexing ([#1771](https://github.com/block/buzz/pull/1771)) ([`1b4703021d`](https://github.com/block/buzz/commit/1b4703021dbfd37dc31845223dba9ba182e4647f))
+- Add optional standalone pairing relay to Helm chart ([#1799](https://github.com/block/buzz/pull/1799)) ([`9b47c8548f`](https://github.com/block/buzz/commit/9b47c8548fd061fbb806ea8b9ddee831c19cf80e))
+- fix(relay): publish membership snapshot on provisioning ([#1761](https://github.com/block/buzz/pull/1761)) ([`0950d392b7`](https://github.com/block/buzz/commit/0950d392b7a862694c95cbea1cec45985ee42996))
+- feat(relay): per-community usage metrics ([#1723](https://github.com/block/buzz/pull/1723)) ([`620822899a`](https://github.com/block/buzz/commit/620822899a6373fa3a17a87815cd7cade25ed332))
+- refactor(desktop): remove vestigial MCP toolsets config ([#1776](https://github.com/block/buzz/pull/1776)) ([`dfec75b3c0`](https://github.com/block/buzz/commit/dfec75b3c0b8080529e4d9089d4ed80e3902aaed))
+
+
 ## relay-v0.2.0
 
 - feat: relay invite links (mint + claim + landing page + deep link) ([#1668](https://github.com/block/buzz/pull/1668)) ([`2e529aab7`](https://github.com/block/buzz/commit/2e529aab759a18c1bb81e447f3696fe99db53a27))
diff --git a/crates/buzz-relay/Cargo.toml b/crates/buzz-relay/Cargo.toml
index cbad2a3b296..65fe32b6b31 100644
--- a/crates/buzz-relay/Cargo.toml
+++ b/crates/buzz-relay/Cargo.toml
@@ -4,7 +4,7 @@ default-run = "buzz-relay"
 # Independent version: buzz-relay ships as a pinnable artifact
 # (ghcr.io/block/buzz), released on its own cadence via `just release-relay`.
 # It does NOT inherit the workspace version.
-version = "0.2.0"
+version = "0.2.1"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true
diff --git a/crates/buzz-relay/src/api/media.rs b/crates/buzz-relay/src/api/media.rs
index fa0401bc262..a2f3640bde5 100644
--- a/crates/buzz-relay/src/api/media.rs
+++ b/crates/buzz-relay/src/api/media.rs
@@ -493,10 +493,6 @@ async fn authenticate_media_read(
 ) -> Result<MediaReadAuth, MediaError> {
     let tenant = bind_media_read_tenant(state, headers).await?;
 
-    if !state.config.require_media_get_auth {
-        return Ok(MediaReadAuth { tenant });
-    }
-
     let auth_event = extract_blossom_auth(headers)?;
     let sha256 = sha256_ext.split('.').next().unwrap_or(sha256_ext);
     buzz_media::auth::verify_blossom_get_auth(&auth_event, sha256, Some(tenant.host()), 3600)?;
@@ -514,12 +510,8 @@ async fn authenticate_media_read(
     Ok(MediaReadAuth { tenant })
 }
 
-fn blob_cache_control(require_auth: bool) -> &'static str {
-    if require_auth {
-        "private, max-age=31536000, immutable"
-    } else {
-        "public, max-age=31536000, immutable"
-    }
+fn blob_cache_control() -> &'static str {
+    "private, max-age=31536000, immutable"
 }
 
 /// Whether a path-segment extension is a safe token.
@@ -623,7 +615,7 @@ pub(crate) async fn serve_blob_for_tenant(
     req_headers: &HeaderMap,
 ) -> Result<Response, MediaError> {
     validate_media_path(sha256_ext)?;
-    let cache_control = blob_cache_control(state.config.require_media_get_auth);
+    let cache_control = blob_cache_control();
 
     // Sidecar gate FIRST — reject before any blob I/O. Storage is not authoritative.
     let content_type = if sha256_ext.ends_with(".thumb.jpg") {
@@ -801,10 +793,9 @@ pub async fn head_blob(
     Path(sha256_ext): Path<String>,
 ) -> Result<Response, MediaError> {
     validate_media_path(&sha256_ext)?;
-    let require_media_get_auth = state.config.require_media_get_auth;
     let media_auth = authenticate_media_read(&state, &headers, &sha256_ext).await?;
     let tenant = media_auth.tenant;
-    let cache_control = blob_cache_control(require_media_get_auth);
+    let cache_control = blob_cache_control();
 
     // Sidecar gate FIRST — reject before any blob I/O.
     let content_type = if sha256_ext.ends_with(".thumb.jpg") {
@@ -946,13 +937,8 @@ mod tests {
     }
 
     async fn test_state() -> Arc<AppState> {
-        test_state_with_media_get_auth(false).await
-    }
-
-    async fn test_state_with_media_get_auth(require_media_get_auth: bool) -> Arc<AppState> {
         let mut config = crate::config::Config::from_env().expect("default config loads");
         config.require_relay_membership = false;
-        config.require_media_get_auth = require_media_get_auth;
         config.redis_url = "redis://127.0.0.1:1".to_string();
         config.media_uploads_per_minute = 1;
         config.media_max_concurrent_uploads = 2;
@@ -994,8 +980,8 @@ mod tests {
         Arc::new(state)
     }
 
-    async fn media_get_auth_router(require_media_get_auth: bool) -> axum::Router {
-        let state = test_state_with_media_get_auth(require_media_get_auth).await;
+    async fn media_get_auth_router() -> axum::Router {
+        let state = test_state().await;
         axum::Router::new()
             .route(
                 "/media/{sha256_ext}",
@@ -1041,20 +1027,9 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn media_get_auth_flag_off_allows_unauthenticated_read_until_sidecar_gate() {
-        let response = media_get_auth_router(false)
-            .await
-            .oneshot(media_request("GET", None))
-            .await
-            .expect("response");
-
-        assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    }
-
-    #[tokio::test]
-    async fn media_get_auth_flag_on_rejects_unauthenticated_get_and_head_before_sidecar_gate() {
+    async fn media_reads_reject_unauthenticated_get_and_head_before_sidecar_gate() {
         for method in ["GET", "HEAD"] {
-            let response = media_get_auth_router(true)
+            let response = media_get_auth_router()
                 .await
                 .oneshot(media_request(method, None))
                 .await
@@ -1065,10 +1040,10 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn media_get_auth_flag_on_valid_server_scoped_token_reaches_sidecar_gate() {
+    async fn media_read_with_valid_server_scoped_token_reaches_sidecar_gate() {
         let keys = Keys::generate();
         let auth = media_get_auth_header(&keys, media_get_tags_for("relay.example", None));
-        let response = media_get_auth_router(true)
+        let response = media_get_auth_router()
             .await
             .oneshot(media_request("GET", Some(auth)))
             .await
@@ -1078,7 +1053,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn media_get_auth_flag_on_rejects_upload_verb_wrong_server_and_wrong_x() {
+    async fn media_read_rejects_upload_verb_wrong_server_and_wrong_x() {
         let keys = Keys::generate();
         let now = Timestamp::now().as_secs();
         let expiration = (now + 300).to_string();
@@ -1102,7 +1077,7 @@ mod tests {
 
         for tags in cases {
             let auth = media_get_auth_header(&keys, tags);
-            let response = media_get_auth_router(true)
+            let response = media_get_auth_router()
                 .await
                 .oneshot(media_request("GET", Some(auth)))
                 .await
@@ -1119,7 +1094,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn media_get_auth_flag_on_accepts_range_header_only_after_auth() {
+    async fn media_read_accepts_range_header_only_after_auth() {
         let keys = Keys::generate();
         let auth = media_get_auth_header(&keys, media_get_tags_for("relay.example", None));
         let mut request = media_request("GET", Some(auth));
@@ -1127,7 +1102,7 @@ mod tests {
             .headers_mut()
             .insert(header::RANGE, "bytes=0-0".parse().expect("range header"));
 
-        let response = media_get_auth_router(true)
+        let response = media_get_auth_router()
             .await
             .oneshot(request)
             .await
diff --git a/crates/buzz-relay/src/config.rs b/crates/buzz-relay/src/config.rs
index dd50973d030..037c6b1dd3d 100644
--- a/crates/buzz-relay/src/config.rs
+++ b/crates/buzz-relay/src/config.rs
@@ -227,10 +227,6 @@ pub struct Config {
     /// Maximum media upload starts accepted from one pubkey per minute.
     pub media_uploads_per_minute: u32,
 
-    /// Require Blossom kind:24242 `t=get` auth plus relay membership before
-    /// serving media GET/HEAD. Default off for staged client rollout.
-    pub require_media_get_auth: bool,
-
     /// Whether tamper-evident event/media audit logging is enabled. Defaults to true.
     /// This does not control the separate `moderation_actions` audit trail.
     /// Set `BUZZ_AUDIT_ENABLED=false` for deployments that do not require it.
@@ -435,6 +431,31 @@ fn ensure_git_path(
     Ok(git_repo_path)
 }
 
+/// Env vars that once gated authenticated media reads.
+///
+/// `BUZZ_REQUIRE_MEDIA_GET_AUTH` was the real flag; `BUZZ_REQUIRE_MEDIA_READ_AUTH`
+/// was documented in `.env.example` as an accepted alias but was never read by
+/// the relay. Media reads are now unconditionally authenticated, so both are
+/// inert and an operator still setting either — especially to `false` — holds a
+/// belief about their deployment that is no longer true.
+const INERT_MEDIA_READ_AUTH_VARS: [&str; 2] = [
+    "BUZZ_REQUIRE_MEDIA_GET_AUTH",
+    "BUZZ_REQUIRE_MEDIA_READ_AUTH",
+];
+
+/// Which of `names` are present, so startup can warn that they do nothing.
+///
+/// `lookup` is injected rather than calling `std::env::var` directly: process
+/// env is global mutable state, so a test that set real vars would race every
+/// other test in the binary.
+fn inert_env_vars<'a>(names: &[&'a str], lookup: impl Fn(&str) -> Option<String>) -> Vec<&'a str> {
+    names
+        .iter()
+        .copied()
+        .filter(|name| lookup(name).is_some())
+        .collect()
+}
+
 impl Config {
     /// Loads configuration from environment variables, falling back to development defaults.
     pub fn from_env() -> Result<Self, ConfigError> {
@@ -776,14 +797,13 @@ impl Config {
             .filter(|&v| v > 0)
             .unwrap_or(30);
 
-        let require_media_get_auth = std::env::var("BUZZ_REQUIRE_MEDIA_GET_AUTH")
-            .map(|v| {
-                v == "true"
-                    || v == "1"
-                    || v.eq_ignore_ascii_case("yes")
-                    || v.eq_ignore_ascii_case("on")
-            })
-            .unwrap_or(false);
+        for name in inert_env_vars(&INERT_MEDIA_READ_AUTH_VARS, |n| std::env::var(n).ok()) {
+            warn!(
+                "{name} is set but is no longer read — GET/HEAD /media/* always require \
+                 Blossom t=get auth plus relay membership. Remove it; a value of `false` \
+                 does not re-open unauthenticated media reads."
+            );
+        }
 
         let ephemeral_ttl_override = std::env::var("BUZZ_EPHEMERAL_TTL_OVERRIDE")
             .ok()
@@ -1003,7 +1023,6 @@ impl Config {
             media_max_concurrent_uploads,
             media_max_concurrent_uploads_per_pubkey,
             media_uploads_per_minute,
-            require_media_get_auth,
             audit_enabled,
             ephemeral_ttl_override,
             git_repo_path,
@@ -1035,6 +1054,59 @@ mod tests {
     // value set by `invalid_bind_addr_returns_error`, causing a flaky failure.
     static ENV_MUTEX: std::sync::Mutex<()> = std::sync::Mutex::new(());
 
+    /// Look up against a fixed set, standing in for process env.
+    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())
+        }
+    }
+
+    /// The case that matters: an operator who pinned the old flag to `false`
+    /// must be told it is inert, not left believing media reads are still open.
+    #[test]
+    fn inert_media_read_auth_vars_are_reported_even_when_false() {
+        let found = inert_env_vars(
+            &INERT_MEDIA_READ_AUTH_VARS,
+            env_of(&[("BUZZ_REQUIRE_MEDIA_GET_AUTH", "false")]),
+        );
+
+        assert_eq!(found, vec!["BUZZ_REQUIRE_MEDIA_GET_AUTH"]);
+    }
+
+    /// `BUZZ_REQUIRE_MEDIA_READ_AUTH` was advertised in `.env.example` as an
+    /// accepted alias but the relay never read it, so operators may hold it
+    /// today. It warns too.
+    #[test]
+    fn inert_media_read_auth_vars_include_the_documented_alias() {
+        let found = inert_env_vars(
+            &INERT_MEDIA_READ_AUTH_VARS,
+            env_of(&[
+                ("BUZZ_REQUIRE_MEDIA_GET_AUTH", "true"),
+                ("BUZZ_REQUIRE_MEDIA_READ_AUTH", "false"),
+            ]),
+        );
+
+        assert_eq!(
+            found,
+            vec![
+                "BUZZ_REQUIRE_MEDIA_GET_AUTH",
+                "BUZZ_REQUIRE_MEDIA_READ_AUTH"
+            ]
+        );
+    }
+
+    #[test]
+    fn inert_media_read_auth_vars_stay_quiet_when_unset() {
+        let found = inert_env_vars(
+            &INERT_MEDIA_READ_AUTH_VARS,
+            env_of(&[("BUZZ_REQUIRE_RELAY_MEMBERSHIP", "true")]),
+        );
+
+        assert!(found.is_empty(), "unrelated vars must not warn: {found:?}");
+    }
+
     #[test]
     fn defaults_are_valid() {
         let _guard = ENV_MUTEX.lock().unwrap();
@@ -1072,10 +1144,6 @@ mod tests {
             !config.serve_git_web_gui,
             "serve_git_web_gui should default to false"
         );
-        assert!(
-            !config.require_media_get_auth,
-            "require_media_get_auth should default to false for staged client rollout"
-        );
         assert_eq!(
             config.media.s3_addressing_style,
             buzz_media::config::S3AddressingStyle::Path,
diff --git a/crates/buzz-relay/src/handlers/imeta.rs b/crates/buzz-relay/src/handlers/imeta.rs
index b75060ce6f1..e3d564e448a 100644
--- a/crates/buzz-relay/src/handlers/imeta.rs
+++ b/crates/buzz-relay/src/handlers/imeta.rs
@@ -369,6 +369,55 @@ fn extract_ext_from_media_url(url: &str) -> Option<&str> {
     }
 }
 
+/// Validate an authored link-preview media URL/hash pair.
+///
+/// Empty pairs are allowed. Non-empty media must be an exact, credential-free
+/// URL on this tenant's media origin with a content-addressed image path.
+pub fn validate_local_image_media_pair(
+    media_url: &str,
+    sha256: &str,
+    media_base_url: &str,
+) -> bool {
+    const IMAGE_EXTS: &[&str] = &["jpg", "png", "gif", "webp"];
+    if media_url.is_empty() && sha256.is_empty() {
+        return true;
+    }
+    if media_url.is_empty()
+        || sha256.len() != 64
+        || !sha256.chars().all(|c| matches!(c, '0'..='9' | 'a'..='f'))
+    {
+        return false;
+    }
+
+    let Ok(parsed) = url::Url::parse(media_url) else {
+        return false;
+    };
+    let Ok(base) = url::Url::parse(media_base_url) else {
+        return false;
+    };
+    if parsed.scheme() != base.scheme()
+        || parsed.host_str() != base.host_str()
+        || parsed.port_or_known_default() != base.port_or_known_default()
+        || !parsed.username().is_empty()
+        || parsed.password().is_some()
+        || parsed.query().is_some()
+        || parsed.fragment().is_some()
+    {
+        return false;
+    }
+
+    let Some(filename) = parsed.path().strip_prefix("/media/") else {
+        return false;
+    };
+    let Some((path_hash, ext)) = filename.split_once('.') else {
+        return false;
+    };
+    !filename.contains('/')
+        && !filename.contains('%')
+        && path_hash == sha256
+        && IMAGE_EXTS.contains(&ext)
+}
+
 /// Validate that a URL references a valid local media blob path.
 fn is_local_media_url(url: &str, media_base_url: &str) -> bool {
     // A safe extension token: 1–8 lowercase alphanumeric chars. Covers media
@@ -423,6 +472,48 @@ mod tests {
     const HASH: &str = "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789";
     const BASE: &str = "https://relay.example.com/media";
 
+    #[test]
+    fn link_preview_media_pair_requires_exact_local_image_url_and_hash() {
+        let hash = HASH;
+        let valid = format!("{BASE}/{hash}.png");
+        assert!(validate_local_image_media_pair(&valid, hash, BASE));
+        assert!(!validate_local_image_media_pair(
+            &format!("https://evil.example/media/{hash}.png"),
+            hash,
+            BASE
+        ));
+        assert!(!validate_local_image_media_pair(
+            &format!("{BASE}/{hash}.png?token=leak"),
+            hash,
+            BASE
+        ));
+        assert!(!validate_local_image_media_pair(
+            &format!("{BASE}/{hash}.png#fragment"),
+            hash,
+            BASE
+        ));
+        assert!(!validate_local_image_media_pair(
+            &format!("https://user@relay.example.com/media/{hash}.png"),
+            hash,
+            BASE
+        ));
+        assert!(!validate_local_image_media_pair(
+            &format!("{BASE}/{hash}.svg"),
+            hash,
+            BASE
+        ));
+        assert!(!validate_local_image_media_pair(
+            &format!("{BASE}/{hash}.png/extra"),
+            hash,
+            BASE
+        ));
+        assert!(!validate_local_image_media_pair(
+            &format!("{BASE}/{hash}.png"),
+            &"0".repeat(64),
+            BASE
+        ));
+    }
+
     #[test]
     fn test_local_media_url_relative() {
         assert!(is_local_media_url(&format!("/media/{HASH}.jpg"), BASE));
diff --git a/crates/buzz-relay/src/handlers/ingest.rs b/crates/buzz-relay/src/handlers/ingest.rs
index cd9f20b5f4a..7aea2ed02e4 100644
--- a/crates/buzz-relay/src/handlers/ingest.rs
+++ b/crates/buzz-relay/src/handlers/ingest.rs
@@ -28,12 +28,13 @@ use buzz_core::kind::{
     KIND_NIP29_EDIT_METADATA, KIND_NIP29_JOIN_REQUEST, KIND_NIP29_LEAVE_REQUEST,
     KIND_NIP29_PUT_USER, KIND_NIP29_REMOVE_USER, KIND_NIP43_LEAVE_REQUEST,
     KIND_NIP65_RELAY_LIST_METADATA, KIND_PERSONA, KIND_PIN_LIST, KIND_PRESENCE_UPDATE,
-    KIND_PRODUCT_FEEDBACK, KIND_PROFILE, KIND_PROJECT, KIND_REACTION, KIND_READ_STATE, KIND_REPORT,
-    KIND_STREAM_MESSAGE, KIND_STREAM_MESSAGE_BOOKMARKED, KIND_STREAM_MESSAGE_DIFF,
-    KIND_STREAM_MESSAGE_EDIT, KIND_STREAM_MESSAGE_PINNED, KIND_STREAM_MESSAGE_SCHEDULED,
-    KIND_STREAM_MESSAGE_V2, KIND_STREAM_REMINDER, KIND_TEAM, KIND_TEAM_CATALOG, KIND_TEXT_NOTE,
-    KIND_USER_STATUS, KIND_WORKFLOW_DEF, KIND_WORKFLOW_TRIGGER, RELAY_ADMIN_ADD_MEMBER,
-    RELAY_ADMIN_CHANGE_ROLE, RELAY_ADMIN_REMOVE_MEMBER, RELAY_ADMIN_SET_WORKSPACE_PROFILE,
+    KIND_PRIVATE_MANAGED_AGENT, KIND_PRODUCT_FEEDBACK, KIND_PROFILE, KIND_PROJECT, KIND_REACTION,
+    KIND_READ_STATE, KIND_REPORT, KIND_STREAM_MESSAGE, KIND_STREAM_MESSAGE_BOOKMARKED,
+    KIND_STREAM_MESSAGE_DIFF, KIND_STREAM_MESSAGE_EDIT, KIND_STREAM_MESSAGE_PINNED,
+    KIND_STREAM_MESSAGE_SCHEDULED, KIND_STREAM_MESSAGE_V2, KIND_STREAM_REMINDER, KIND_TEAM,
+    KIND_TEAM_CATALOG, KIND_TEXT_NOTE, KIND_USER_STATUS, KIND_WORKFLOW_DEF, KIND_WORKFLOW_TRIGGER,
+    RELAY_ADMIN_ADD_MEMBER, RELAY_ADMIN_CHANGE_ROLE, RELAY_ADMIN_REMOVE_MEMBER,
+    RELAY_ADMIN_SET_WORKSPACE_PROFILE,
 };
 use buzz_core::tenant::TenantContext;
 use buzz_core::verification::verify_event;
@@ -211,6 +212,72 @@ pub fn reject_with_transport(transport: &'static str, reason: &'static str) {
     .increment(1);
 }
 
+fn valid_link_preview_text(value: &str, max: usize, allow_newlines: bool) -> bool {
+    value.len() <= max
+        && !value
+            .chars()
+            .any(|character| character.is_control() && !(allow_newlines && character == '\n'))
+}
+
+fn validate_link_preview_tags(event: &Event, media_base_url: &str) -> Result<(), String> {
+    const MAX_SNAPSHOTS: usize = 8;
+    const MAX_TITLE: usize = 300;
+    const MAX_SITE: usize = 100;
+    const MAX_DESCRIPTION: usize = 1000;
+
+    let mut count = 0;
+    let mut suppressed = false;
+    let mut seen = std::collections::HashSet::new();
+    for tag in event.tags.iter() {
+        let parts = tag.as_slice();
+        if parts.first().map(String::as_str) != Some("link-preview") {
+            continue;
+        }
+        count += 1;
+        if parts == ["link-preview", "none"] {
+            if count > 1 {
+                return Err("link-preview suppression cannot include snapshots".into());
+            }
+            suppressed = true;
+            continue;
+        }
+        if suppressed
+            || count > MAX_SNAPSHOTS
+            || parts.len() != 11
+            || parts[1] != "snapshot"
+            || parts[2] != "1"
+        {
+            return Err("invalid link-preview snapshot tag".into());
+        }
+        let canonical =
+            url::Url::parse(&parts[3]).map_err(|_| "invalid link-preview canonical URL")?;
+        if canonical.scheme() != "https"
+            || !canonical.username().is_empty()
+            || canonical.password().is_some()
+            || canonical.fragment().is_some()
+            || !seen.insert(parts[3].clone())
+            || !event.content.contains(&parts[3])
+        {
+            return Err("invalid link-preview canonical URL".into());
+        }
+        for (value, max, allow_newlines) in [
+            (&parts[4], MAX_TITLE, false),
+            (&parts[5], MAX_SITE, false),
+            (&parts[6], MAX_DESCRIPTION, true),
+        ] {
+            if !valid_link_preview_text(value, max, allow_newlines) {
+                return Err("invalid link-preview snapshot text".into());
+            }
+        }
+        if !super::imeta::validate_local_image_media_pair(&parts[7], &parts[8], media_base_url)
+            || !super::imeta::validate_local_image_media_pair(&parts[9], &parts[10], media_base_url)
+        {
+            return Err("link-preview media must reference matching local image blobs".into());
+        }
+    }
+    Ok(())
+}
+
 /// Successful ingestion result.
 pub struct IngestResult {
     /// Hex-encoded event ID.
@@ -263,7 +330,7 @@ fn required_scope_for_kind(kind: u32, event: &Event) -> Result<Scope, &'static s
         KIND_TEXT_NOTE | KIND_LONG_FORM => Ok(Scope::MessagesWrite),
         KIND_CONTACT_LIST | KIND_READ_STATE | KIND_USER_STATUS | KIND_AGENT_ENGRAM
         | KIND_EVENT_REMINDER | KIND_PERSONA | KIND_TEAM | KIND_MANAGED_AGENT
-        | KIND_TEAM_CATALOG | super::push_lease::KIND_PUSH_LEASE => {
+        | KIND_PRIVATE_MANAGED_AGENT | KIND_TEAM_CATALOG | super::push_lease::KIND_PUSH_LEASE => {
             Ok(Scope::UsersWrite)
         }
         // NIP-AM: agent turn metrics are agent-authored global events (encrypted to owner).
@@ -476,6 +543,7 @@ pub(crate) fn is_global_only_kind(kind: u32) -> bool {
             // (pubkey, kind, d_tag). A stray `h` tag must not channel-scope them.
             | KIND_TEAM
             | KIND_MANAGED_AGENT
+            | KIND_PRIVATE_MANAGED_AGENT
             | KIND_TEAM_CATALOG
             // NIP-34: git events use `a` tags (repo reference), not `h` tags (channel scope).
             // Parameterized replaceable kinds are keyed by (pubkey, kind, d_tag).
@@ -2645,6 +2713,13 @@ async fn ingest_event_inner(
         });
     }
 
+    let tenant_media_base =
+        crate::api::media::media_base_url_for_tenant(&state.config.relay_url, tenant.host());
+    if kind_u32 == KIND_STREAM_MESSAGE {
+        validate_link_preview_tags(&event, &tenant_media_base)
+            .map_err(|e| IngestError::Rejected(format!("invalid: {e}")))?;
+    }
+
     let imeta_tags: Vec<Vec<String>> = event
         .tags
         .iter()
@@ -2652,8 +2727,6 @@ async fn ingest_event_inner(
         .map(|t| t.as_slice().iter().map(|s| s.to_string()).collect())
         .collect();
     if !imeta_tags.is_empty() {
-        let tenant_media_base =
-            crate::api::media::media_base_url_for_tenant(&state.config.relay_url, tenant.host());
         crate::api::validate_imeta_tags(&imeta_tags, &tenant_media_base)
             .map_err(|e| IngestError::Rejected(format!("invalid: {e}")))?;
         crate::api::verify_imeta_blobs(tenant, &imeta_tags, &state.media_storage)
@@ -3338,15 +3411,14 @@ mod tests {
     }
 
     #[test]
-    fn private_managed_agent_kind_remains_rejected_until_atomic_ingest_exists() {
-        assert!(
-            required_scope_for_kind(
-                buzz_core::kind::KIND_PRIVATE_MANAGED_AGENT,
-                &make_dummy_event(),
-            )
-            .is_err(),
-            "kind 30179 must not enter generic EVENT ingest before privacy and aggregate CAS deploy"
+    fn private_managed_agent_kind_is_owner_scoped_global_user_data() {
+        let event = make_dummy_event();
+        assert_eq!(
+            required_scope_for_kind(KIND_PRIVATE_MANAGED_AGENT, &event),
+            Ok(Scope::UsersWrite)
         );
+        assert!(is_global_only_kind(KIND_PRIVATE_MANAGED_AGENT));
+        assert!(!requires_h_channel_scope(KIND_PRIVATE_MANAGED_AGENT));
     }
 
     #[test]
@@ -3631,6 +3703,109 @@ mod tests {
         assert!(validate_diff_event(&event).is_err());
     }
 
+    #[test]
+    fn link_preview_suppression_accepts_blanket_marker() {
+        let event = make_event_with_tags(
+            KIND_STREAM_MESSAGE,
+            "https://example.com",
+            &[&["link-preview", "none"]],
+        );
+
+        assert!(validate_link_preview_tags(&event, "https://media.example.com").is_ok());
+    }
+
+    #[test]
+    fn link_preview_suppression_rejects_duplicate_marker() {
+        let event = make_event_with_tags(
+            KIND_STREAM_MESSAGE,
+            "https://example.com",
+            &[&["link-preview", "none"], &["link-preview", "none"]],
+        );
+
+        assert_eq!(
+            validate_link_preview_tags(&event, "https://media.example.com"),
+            Err("link-preview suppression cannot include snapshots".into())
+        );
+    }
+
+    #[test]
+    fn link_preview_suppression_rejects_mixed_snapshot_tags_in_either_order() {
+        let snapshot = [
+            "link-preview",
+            "snapshot",
+            "1",
+            "https://example.com",
+            "Example",
+            "Example",
+            "Description",
+            "",
+            "",
+            "",
+            "",
+        ];
+        for tags in [
+            vec![&["link-preview", "none"][..], &snapshot[..]],
+            vec![&snapshot[..], &["link-preview", "none"][..]],
+        ] {
+            let event = make_event_with_tags(KIND_STREAM_MESSAGE, "https://example.com", &tags);
+            assert!(validate_link_preview_tags(&event, "https://media.example.com").is_err());
+        }
+    }
+
+    fn make_link_preview_event(title: &str, site: &str, description: &str) -> Event {
+        make_event_with_tags(
+            KIND_STREAM_MESSAGE,
+            "https://example.com",
+            &[&[
+                "link-preview",
+                "snapshot",
+                "1",
+                "https://example.com",
+                title,
+                site,
+                description,
+                "",
+                "",
+                "",
+                "",
+            ]],
+        )
+    }
+
+    #[test]
+    fn link_preview_snapshot_accepts_description_newlines() {
+        let event = make_link_preview_event(
+            "Example title",
+            "Example site",
+            "First paragraph\n\nSecond paragraph",
+        );
+
+        assert!(validate_link_preview_tags(&event, "https://media.example.com").is_ok());
+    }
+
+    #[test]
+    fn link_preview_snapshot_rejects_title_and_site_newlines() {
+        for (title, site) in [
+            ("Example\ntitle", "Example site"),
+            ("Example title", "Example\nsite"),
+        ] {
+            let event = make_link_preview_event(title, site, "Description");
+            assert!(validate_link_preview_tags(&event, "https://media.example.com").is_err());
+        }
+    }
+
+    #[test]
+    fn link_preview_snapshot_rejects_non_newline_controls_in_all_text_fields() {
+        for (title, site, description) in [
+            ("Example\ttitle", "Example site", "Description"),
+            ("Example title", "Example\rsite", "Description"),
+            ("Example title", "Example site", "Unsafe\tdescription"),
+        ] {
+            let event = make_link_preview_event(title, site, description);
+            assert!(validate_link_preview_tags(&event, "https://media.example.com").is_err());
+        }
+    }
+
     fn make_dummy_event() -> Event {
         let keys = nostr::Keys::generate();
         nostr::EventBuilder::new(nostr::Kind::Custom(9), "")
diff --git a/crates/buzz-sdk/src/builders.rs b/crates/buzz-sdk/src/builders.rs
index c3b4432101b..948fa775f51 100644
--- a/crates/buzz-sdk/src/builders.rs
+++ b/crates/buzz-sdk/src/builders.rs
@@ -239,7 +239,9 @@ pub fn build_message(
         tags.push(tag(&["broadcast", "1"])?);
     }
     imeta_tags(media_tags, &mut tags)?;
-    Ok(EventBuilder::new(Kind::Custom(9), content).tags(tags))
+    Ok(EventBuilder::new(Kind::Custom(9), content)
+        .tags(tags)
+        .allow_self_tagging())
 }
 
 /// Build an encrypted agent observer frame (kind 24200).
@@ -290,7 +292,9 @@ pub fn build_forum_post(
     let mut tags = vec![tag(&["h", &channel_id.to_string()])?];
     mention_tags(mentions, &mut tags)?;
     imeta_tags(media_tags, &mut tags)?;
-    Ok(EventBuilder::new(Kind::Custom(45001), content).tags(tags))
+    Ok(EventBuilder::new(Kind::Custom(45001), content)
+        .tags(tags)
+        .allow_self_tagging())
 }
 
 /// Build a forum comment reply (kind 45003).
@@ -306,7 +310,9 @@ pub fn build_forum_comment(
     thread_tags(thread_ref, &mut tags)?;
     mention_tags(mentions, &mut tags)?;
     imeta_tags(media_tags, &mut tags)?;
-    Ok(EventBuilder::new(Kind::Custom(45003), content).tags(tags))
+    Ok(EventBuilder::new(Kind::Custom(45003), content)
+        .tags(tags)
+        .allow_self_tagging())
 }
 
 /// Build a diff/patch message (kind 40008).
@@ -2253,6 +2259,53 @@ mod tests {
         assert!(has_tag(&ev, "h", &cid.to_string()));
     }
 
+    #[test]
+    fn message_preserves_self_mention_p_tag() {
+        // nostr 0.44 strips p tags matching the signer by default.
+        // build_message must opt in via allow_self_tagging() so that
+        // explicit self-mentions survive signing. See #4906.
+        let cid = uuid();
+        let sender = keys();
+        let self_pk = sender.public_key().to_hex();
+        let builder = build_message(cid, "self-canary", None, &[&self_pk], false, &[]).unwrap();
+        let ev = builder.sign_with_keys(&sender).expect("sign");
+        assert!(
+            has_tag(&ev, "p", &self_pk),
+            "self-mention p tag must survive signing"
+        );
+    }
+
+    #[test]
+    fn forum_post_preserves_self_mention_p_tag() {
+        let cid = uuid();
+        let sender = keys();
+        let self_pk = sender.public_key().to_hex();
+        let builder = build_forum_post(cid, "self-canary", &[&self_pk], &[]).unwrap();
+        let ev = builder.sign_with_keys(&sender).expect("sign");
+        assert!(
+            has_tag(&ev, "p", &self_pk),
+            "self-mention p tag must survive signing"
+        );
+    }
+
+    #[test]
+    fn forum_comment_preserves_self_mention_p_tag() {
+        let cid = uuid();
+        let sender = keys();
+        let self_pk = sender.public_key().to_hex();
+        let root = event_id();
+        let tr = ThreadRef {
+            root_event_id: root,
+            parent_event_id: root,
+        };
+        let builder = build_forum_comment(cid, "self-canary", &tr, &[&self_pk], &[]).unwrap();
+        let ev = builder.sign_with_keys(&sender).expect("sign");
+        assert!(
+            has_tag(&ev, "p", &self_pk),
+            "self-mention p tag must survive signing"
+        );
+    }
+
     #[test]
     fn agent_observer_frame_happy_path() {
         let sender = keys();
diff --git a/crates/buzz-test-client/tests/conformance_multitenant.rs b/crates/buzz-test-client/tests/conformance_multitenant.rs
index 15002142e42..4c8c8904ac5 100644
--- a/crates/buzz-test-client/tests/conformance_multitenant.rs
+++ b/crates/buzz-test-client/tests/conformance_multitenant.rs
@@ -2612,17 +2612,27 @@ mod pubsub_presence_typing {
 mod media_blossom {
     use super::*;
 
-    /// Obligation: public blob `GET/HEAD /media/{sha256.ext}` stays
-    /// unauthenticated (N=1 compat, shared CAS bytes). The community boundary is
-    /// the metadata/descriptor/upload-auth/quota/audit layer: B's private upload
-    /// metadata/errors must not be observable from A, even when the blob bytes
-    /// are deduplicated and shared.
+    /// Obligation: blob `GET/HEAD /media/{sha256.ext}` requires Blossom read auth
+    /// scoped to the serving host or the blob hash, and the request is bound to the
+    /// tenant resolved from the request headers. A bare read is rejected before any
+    /// storage lookup, so the endpoint does not leak blob existence.
+    ///
+    /// CAS bytes are still deduplicated across communities, so the boundary is not
+    /// the bytes: it is the metadata/descriptor/upload-auth/quota/audit layer plus
+    /// the per-tenant read binding. B's private upload metadata and errors must not
+    /// be observable from A even when the underlying blob is shared.
+    ///
+    /// Known limitation, deferred: relay membership plus knowledge of a hash is
+    /// sufficient to read a blob. Read auth binds host and tenant, not the channel
+    /// ACL of the message the blob was attached to.
     #[tokio::test]
     #[ignore]
     async fn media_metadata_boundary_holds_while_blob_bytes_shared() {
         pending_lane(
             "buzz-media",
-            "shared SHA bytes OK; A cannot read B's upload metadata/quota/audit; errors generic",
+            "reads require host/hash-scoped Blossom auth and bind to the header tenant; \
+             bare reads 401 before storage; shared SHA bytes OK; A cannot read B's upload \
+             metadata/quota/audit; errors generic",
         );
     }
 }
diff --git a/crates/buzz-test-client/tests/e2e_media.rs b/crates/buzz-test-client/tests/e2e_media.rs
index 14001f641cd..690fd9c8a50 100644
--- a/crates/buzz-test-client/tests/e2e_media.rs
+++ b/crates/buzz-test-client/tests/e2e_media.rs
@@ -48,6 +48,26 @@ fn sign_blossom_auth(keys: &Keys, sha256: &str) -> nostr::Event {
         .expect("sign blossom auth")
 }
 
+/// Sign a kind:24242 Blossom *read* auth event for the given sha256.
+///
+/// Reads are authenticated unconditionally, so every successful GET/HEAD in this
+/// file has to present one of these. The `x` tag is hash-scoped and covers the
+/// derived paths too -- the relay matches on the sha256 before the extension, so
+/// one token serves `{sha}.jpg` and `{sha}.thumb.jpg` alike.
+fn sign_blossom_get_auth(keys: &Keys, sha256: &str) -> nostr::Event {
+    let now = Timestamp::now().as_secs();
+    let exp_str = (now + 300).to_string();
+    let tags = vec![
+        Tag::parse(["t", "get"]).expect("t tag"),
+        Tag::parse(["x", sha256]).expect("x tag"),
+        Tag::parse(["expiration", &exp_str]).expect("expiration tag"),
+    ];
+    EventBuilder::new(Kind::from(24242), "Get test")
+        .tags(tags)
+        .sign_with_keys(keys)
+        .expect("sign blossom get auth")
+}
+
 /// Build `Authorization: Nostr <base64url(json)>` header value.
 fn blossom_auth_header(event: &nostr::Event) -> String {
     format!(
@@ -144,10 +164,14 @@ async fn test_upload_and_get() {
         descriptor["dim"], descriptor["blurhash"]
     );
 
+    // Reads are authenticated, so mint one hash-scoped token for all three below.
+    let read_auth = blossom_auth_header(&sign_blossom_get_auth(&keys, &sha256));
+
     // GET /media/{sha256}.jpg — bytes must match
     let get_url = format!("{}/media/{sha256}.jpg", relay_http_url());
     let get_resp = client
         .get(&get_url)
+        .header("Authorization", &read_auth)
         .send()
         .await
         .expect("GET /media/{sha256}.jpg failed");
@@ -162,6 +186,7 @@ async fn test_upload_and_get() {
     // HEAD /media/{sha256}.jpg — must return 200 with content-type
     let head_resp = client
         .head(&get_url)
+        .header("Authorization", &read_auth)
         .send()
         .await
         .expect("HEAD /media/{sha256}.jpg failed");
@@ -175,6 +200,7 @@ async fn test_upload_and_get() {
     let thumb_url = format!("{}/media/{sha256}.thumb.jpg", relay_http_url());
     let thumb_resp = client
         .get(&thumb_url)
+        .header("Authorization", &read_auth)
         .send()
         .await
         .expect("GET thumbnail failed");
@@ -293,19 +319,69 @@ async fn test_upload_hash_mismatch_returns_400() {
     assert_eq!(resp.status(), 401, "hash mismatch must be 401");
 }
 
-/// GET a sha256 that was never uploaded must return 404.
+/// GET an authenticated sha256 that was never uploaded must return 404.
+///
+/// The token has to be valid for the 404 to be reachable at all: authentication
+/// runs before the storage lookup, so a bare request is rejected with 401 and
+/// never distinguishes "missing" from "unauthorized" (see
+/// `test_unauthenticated_reads_are_rejected`).
 #[tokio::test]
 #[ignore]
 async fn test_get_nonexistent_returns_404() {
     let client = http_client();
+    let keys = Keys::generate();
     let missing_sha256 = "0".repeat(64);
     let url = format!("{}/media/{missing_sha256}.jpg", relay_http_url());
 
-    let resp = client.get(&url).send().await.expect("GET failed");
+    let resp = client
+        .get(&url)
+        .header(
+            "Authorization",
+            blossom_auth_header(&sign_blossom_get_auth(&keys, &missing_sha256)),
+        )
+        .send()
+        .await
+        .expect("GET failed");
     println!("missing blob → {}", resp.status());
     assert_eq!(resp.status(), 404, "missing blob must be 404");
 }
 
+/// Bare reads are rejected with 401 before any storage lookup.
+///
+/// This is the boundary PR #4610 made unconditional: there is no longer a config
+/// flag that lets an unauthenticated GET through, so the acceptance lane has to
+/// assert the rejection directly. Uses a never-uploaded hash deliberately -- a 401
+/// here rather than a 404 proves auth runs ahead of the storage lookup and that the
+/// endpoint does not leak blob existence to an unauthenticated caller.
+#[tokio::test]
+#[ignore]
+async fn test_unauthenticated_reads_are_rejected() {
+    let client = http_client();
+    let missing_sha256 = "0".repeat(64);
+    let blob_url = format!("{}/media/{missing_sha256}.jpg", relay_http_url());
+    let thumb_url = format!("{}/media/{missing_sha256}.thumb.jpg", relay_http_url());
+
+    let get_resp = client.get(&blob_url).send().await.expect("bare GET failed");
+    println!("bare GET → {}", get_resp.status());
+    assert_eq!(get_resp.status(), 401, "bare GET must be 401");
+
+    let head_resp = client
+        .head(&blob_url)
+        .send()
+        .await
+        .expect("bare HEAD failed");
+    println!("bare HEAD → {}", head_resp.status());
+    assert_eq!(head_resp.status(), 401, "bare HEAD must be 401");
+
+    let thumb_resp = client
+        .get(&thumb_url)
+        .send()
+        .await
+        .expect("bare thumbnail GET failed");
+    println!("bare thumbnail GET → {}", thumb_resp.status());
+    assert_eq!(thumb_resp.status(), 401, "bare thumbnail GET must be 401");
+}
+
 /// Upload a real image from the filesystem (set TEST_IMAGE_PATH env var).
 /// Verifies the full round-trip: upload → BlobDescriptor → GET bytes match.
 #[tokio::test]
@@ -363,7 +439,15 @@ async fn test_upload_real_image() {
 
     // GET bytes back and verify
     let get_url = descriptor["url"].as_str().unwrap();
-    let get_resp = client.get(get_url).send().await.expect("GET failed");
+    let get_resp = client
+        .get(get_url)
+        .header(
+            "Authorization",
+            blossom_auth_header(&sign_blossom_get_auth(&keys, &sha256)),
+        )
+        .send()
+        .await
+        .expect("GET failed");
     assert_eq!(get_resp.status(), 200);
     let returned = get_resp.bytes().await.unwrap();
     assert_eq!(
diff --git a/crates/buzz-test-client/tests/e2e_media_extended.rs b/crates/buzz-test-client/tests/e2e_media_extended.rs
index 955bd9d6c4e..8a9283c0409 100644
--- a/crates/buzz-test-client/tests/e2e_media_extended.rs
+++ b/crates/buzz-test-client/tests/e2e_media_extended.rs
@@ -39,6 +39,21 @@ fn sign_blossom_auth(keys: &Keys, sha256: &str) -> nostr::Event {
         .unwrap()
 }
 
+/// Sign a kind:24242 Blossom *read* auth event. Reads are authenticated
+/// unconditionally, so round-trip GETs must present one of these.
+fn sign_blossom_get_auth(keys: &Keys, sha256: &str) -> nostr::Event {
+    let now = Timestamp::now().as_secs();
+    let tags = vec![
+        Tag::parse(["t", "get"]).unwrap(),
+        Tag::parse(["x", sha256]).unwrap(),
+        Tag::parse(["expiration", &(now + 300).to_string()]).unwrap(),
+    ];
+    EventBuilder::new(Kind::from(24242), "Get test")
+        .tags(tags)
+        .sign_with_keys(keys)
+        .unwrap()
+}
+
 fn blossom_auth_header(event: &nostr::Event) -> String {
     format!(
         "Nostr {}",
@@ -98,15 +113,15 @@ fn tiny_jpeg() -> Vec<u8> {
 }
 
 fn tiny_png() -> Vec<u8> {
-    // Valid 2x2 red PNG generated by ffmpeg
+    // Valid 2x2 red PNG generated by ffmpeg, with ffmpeg's pHYs chunk stripped:
+    // `validate_png_metadata_free` rejects pHYs as an identity channel, so the
+    // original fixture uploaded as 422 MetadataForbidden. IHDR/IDAT/IEND only.
     vec![
         0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44,
         0x52, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x08, 0x02, 0x00, 0x00, 0x00, 0xfd,
-        0xd4, 0x9a, 0x73, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x01,
-        0x00, 0x00, 0x00, 0x01, 0x00, 0x4f, 0x25, 0xc4, 0xd6, 0x00, 0x00, 0x00, 0x10, 0x49, 0x44,
-        0x41, 0x54, 0x78, 0x9c, 0x63, 0xfc, 0xc3, 0x00, 0x02, 0x2c, 0x60, 0x92, 0x01, 0x00, 0x0d,
-        0x04, 0x01, 0x02, 0xbf, 0x50, 0x15, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
-        0xae, 0x42, 0x60, 0x82,
+        0xd4, 0x9a, 0x73, 0x00, 0x00, 0x00, 0x10, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0xfc,
+        0xc3, 0x00, 0x02, 0x2c, 0x60, 0x92, 0x01, 0x00, 0x0d, 0x04, 0x01, 0x02, 0xbf, 0x50, 0x15,
+        0xb3, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
     ]
 }
 
@@ -168,9 +183,14 @@ async fn test_upload_png_roundtrip() {
     assert!(desc["url"].as_str().unwrap().ends_with(".png"));
     println!("✅ PNG upload: {}", desc["url"]);
 
-    // GET back
+    // GET back — reads are authenticated, so scope a token to the uploaded hash.
+    let sha256 = desc["sha256"].as_str().expect("descriptor sha256");
     let get = client
         .get(desc["url"].as_str().unwrap())
+        .header(
+            "Authorization",
+            blossom_auth_header(&sign_blossom_get_auth(&keys, sha256)),
+        )
         .send()
         .await
         .unwrap();
@@ -192,8 +212,13 @@ async fn test_upload_gif_roundtrip() {
     assert!(desc["url"].as_str().unwrap().ends_with(".gif"));
     println!("✅ GIF upload: {}", desc["url"]);
 
+    let sha256 = desc["sha256"].as_str().expect("descriptor sha256");
     let get = client
         .get(desc["url"].as_str().unwrap())
+        .header(
+            "Authorization",
+            blossom_auth_header(&sign_blossom_get_auth(&keys, sha256)),
+        )
         .send()
         .await
         .unwrap();
diff --git a/crates/buzz-test-client/tests/e2e_media_video.rs b/crates/buzz-test-client/tests/e2e_media_video.rs
index 64a5878f13d..2ec0b1e6986 100644
--- a/crates/buzz-test-client/tests/e2e_media_video.rs
+++ b/crates/buzz-test-client/tests/e2e_media_video.rs
@@ -40,6 +40,23 @@ fn sign_blossom_auth(keys: &Keys, sha256: &str) -> nostr::Event {
         .expect("sign blossom auth")
 }
 
+/// Sign a kind:24242 Blossom *read* auth event. Reads are authenticated
+/// unconditionally, so blob and range GETs must present one of these -- without it
+/// the 206 and 416 range behaviour below would never be reached.
+fn sign_blossom_get_auth(keys: &Keys, sha256: &str) -> nostr::Event {
+    let now = Timestamp::now().as_secs();
+    let exp_str = (now + 300).to_string();
+    let tags = vec![
+        Tag::parse(["t", "get"]).expect("t tag"),
+        Tag::parse(["x", sha256]).expect("x tag"),
+        Tag::parse(["expiration", &exp_str]).expect("expiration tag"),
+    ];
+    EventBuilder::new(Kind::from(24242), "Get test")
+        .tags(tags)
+        .sign_with_keys(keys)
+        .expect("sign blossom get auth")
+}
+
 fn blossom_auth_header(event: &nostr::Event) -> String {
     format!(
         "Nostr {}",
@@ -272,7 +289,15 @@ async fn test_video_upload_and_get() {
 
     // GET the blob back
     let get_url = desc["url"].as_str().unwrap();
-    let get_resp = client.get(get_url).send().await.expect("GET blob");
+    let get_resp = client
+        .get(get_url)
+        .header(
+            "Authorization",
+            blossom_auth_header(&sign_blossom_get_auth(&keys, &sha256)),
+        )
+        .send()
+        .await
+        .expect("GET blob");
     assert_eq!(get_resp.status(), StatusCode::OK);
     let body = get_resp.bytes().await.expect("body bytes");
     assert_eq!(body.len(), mp4.len());
@@ -345,6 +370,10 @@ async fn test_video_range_request_206() {
     // Range request: first 100 bytes
     let range_resp = client
         .get(blob_url)
+        .header(
+            "Authorization",
+            blossom_auth_header(&sign_blossom_get_auth(&keys, &sha256)),
+        )
         .header("Range", "bytes=0-99")
         .send()
         .await
@@ -389,6 +418,10 @@ async fn test_video_range_request_416() {
     // Request a range beyond the file size
     let range_resp = client
         .get(blob_url)
+        .header(
+            "Authorization",
+            blossom_auth_header(&sign_blossom_get_auth(&keys, &sha256)),
+        )
         .header(
             "Range",
             format!("bytes={}-{}", mp4.len() + 1000, mp4.len() + 2000),
diff --git a/deny.toml b/deny.toml
index d3c5fcd4bc7..c432a20ea4f 100644
--- a/deny.toml
+++ b/deny.toml
@@ -15,6 +15,10 @@ ignore = [
     # remove these when upstream catches up.
     { id = "RUSTSEC-2026-0194", reason = "transitive via rust-s3 and mesh-llm→plist; trusted-input XML only; no upstream fix available yet" },
     { id = "RUSTSEC-2026-0195", reason = "transitive via rust-s3 and mesh-llm→plist; trusted-input XML only; no upstream fix available yet" },
+    # nostr-relay-pool 0.44.3 — informational/unmaintained, not a vulnerability.
+    # Transitive via mesh-llm 0.74 → nostr-sdk 0.44.1. Remove after mesh-llm
+    # migrates to nostr-sdk >= 0.45, which absorbed the standalone relay pool.
+    { id = "RUSTSEC-2026-0243", reason = "transitive via mesh-llm; upstream nostr-sdk 0.45 migration requires API changes" },
 ]
 
 [licenses]
diff --git a/deploy/charts/buzz/templates/NOTES.txt b/deploy/charts/buzz/templates/NOTES.txt
index b409f4d9424..a0dd96a1a4e 100644
--- a/deploy/charts/buzz/templates/NOTES.txt
+++ b/deploy/charts/buzz/templates/NOTES.txt
@@ -62,11 +62,6 @@
 {{- if not .Values.relay.requireRelayMembership }}
   ⚠ relay.requireRelayMembership=false — relay is OPEN. Anyone can publish.
 {{- end }}
-{{- if not .Values.relay.requireMediaGetAuth }}
-  ⚠ relay.requireMediaGetAuth=false — media GET/HEAD reads are not auth-gated.
-    Anyone who learns a media URL/hash can fetch private attachments. Only
-    use for local development or fully public communities.
-{{- end }}
 {{- if not .Values.migrate.autoMigrate }}
   ⚠ migrate.autoMigrate=false — relay startup will NOT run sqlx migrations.
     You must run `buzz-admin migrate` against the database before every
diff --git a/deploy/charts/buzz/templates/deployment.yaml b/deploy/charts/buzz/templates/deployment.yaml
index 5c876f7d241..0ad41ac4611 100644
--- a/deploy/charts/buzz/templates/deployment.yaml
+++ b/deploy/charts/buzz/templates/deployment.yaml
@@ -131,7 +131,6 @@ spec:
             - { name: BUZZ_DRAIN_JITTER_MS,        value: {{ .Values.relay.drainJitterMs | quote }} }
             - { name: BUZZ_REQUIRE_AUTH_TOKEN,     value: {{ .Values.relay.requireAuthToken | quote }} }
             - { name: BUZZ_REQUIRE_RELAY_MEMBERSHIP, value: {{ .Values.relay.requireRelayMembership | quote }} }
-            - { name: BUZZ_REQUIRE_MEDIA_GET_AUTH, value: {{ .Values.relay.requireMediaGetAuth | quote }} }
             - { name: BUZZ_ALLOW_NIP_OA_AUTH,      value: {{ .Values.relay.allowNipOaAuth | quote }} }
             - { name: BUZZ_PUBKEY_ALLOWLIST,       value: {{ .Values.relay.pubkeyAllowlist | quote }} }
             {{- if .Values.relay.corsOrigins }}
diff --git a/deploy/charts/buzz/tests/render_test.yaml b/deploy/charts/buzz/tests/render_test.yaml
index cf082107813..196a4a53032 100644
--- a/deploy/charts/buzz/tests/render_test.yaml
+++ b/deploy/charts/buzz/tests/render_test.yaml
@@ -48,17 +48,6 @@ tests:
             name: BUZZ_HUDDLE_AUDIO_AVAILABLE
             value: "true"
         template: templates/deployment.yaml
-      # Security default: media GET/HEAD reads must be auth-gated out of the
-      # box. A private attachment must never be publicly readable by URL/hash
-      # in an unmodified render. If this assertion fails, someone flipped the
-      # default — treat that as a security regression, not a config tweak.
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: BUZZ_REQUIRE_MEDIA_GET_AUTH
-            value: "true"
-        template: templates/deployment.yaml
-
   - it: renders virtual-hosted S3 addressing for providers that require it
     set:
       relayUrl: wss://buzz.example.com
@@ -85,24 +74,6 @@ tests:
             value: "virtual"
         template: templates/deployment.yaml
 
-  - it: lets an explicit value opt out of media read auth for dev/public deployments
-    set:
-      relayUrl: wss://buzz.example.com
-      ownerPubkey: "0000000000000000000000000000000000000000000000000000000000000000"
-      externalPostgresql.url: postgres://u:p@h:5432/d
-      externalRedis.url: redis://h:6379
-      s3.endpoint: http://minio:9000
-      s3.accessKey: a
-      s3.secretKey: s
-      relay.requireMediaGetAuth: false
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: BUZZ_REQUIRE_MEDIA_GET_AUTH
-            value: "false"
-        template: templates/deployment.yaml
-
   - it: lets an explicit value disable huddle audio in a single-replica render
     set:
       relayUrl: wss://buzz.example.com
diff --git a/deploy/charts/buzz/values.schema.json b/deploy/charts/buzz/values.schema.json
index e1e362a531a..d3670595b5b 100644
--- a/deploy/charts/buzz/values.schema.json
+++ b/deploy/charts/buzz/values.schema.json
@@ -62,7 +62,6 @@
         "drainJitterMs": { "type": "integer", "minimum": 0 },
         "requireAuthToken": { "type": "boolean" },
         "requireRelayMembership": { "type": "boolean" },
-        "requireMediaGetAuth": { "type": "boolean" },
         "allowNipOaAuth": { "type": "boolean" },
         "huddleAudioAvailable": {
           "type": ["boolean", "null"],
diff --git a/deploy/charts/buzz/values.yaml b/deploy/charts/buzz/values.yaml
index 42b09f1b3e1..8131aef4321 100644
--- a/deploy/charts/buzz/values.yaml
+++ b/deploy/charts/buzz/values.yaml
@@ -117,12 +117,6 @@ relay:
   drainJitterMs: 0
   requireAuthToken: true
   requireRelayMembership: true
-  # Authenticated media reads: relay GET/HEAD /media/* requires Blossom
-  # kind 24242 t=get plus relay membership. Enabled by default so private
-  # attachments are never publicly readable by URL/hash. Only set false for
-  # local development or fully public communities — desktop, mobile, and CLI
-  # clients all attach read auth.
-  requireMediaGetAuth: true
   allowNipOaAuth: true
   pubkeyAllowlist: false
   corsOrigins: []
diff --git a/desktop/index.html b/desktop/index.html
index 4b58bd43264..a8baf91d3b9 100644
--- a/desktop/index.html
+++ b/desktop/index.html
@@ -12,6 +12,10 @@
       in tauri.conf.json. The body paints its own themed background once the app
       CSS loads, so this never shows through after boot.
 
+      The linked stylesheet (boot.css) applies the initial black background.
+      Kept as a <link> rather than an inline <style> to avoid Tauri's nonce
+      injection for style-src (see boot.css for the full rationale).
+
       The inline script below reads the cached theme background (same
       `buzz-theme-cache` entry ThemeProvider writes) and applies it synchronously
       so the boot color matches the themed loading gate — no black flash on light
@@ -20,11 +24,7 @@
       that ThemeProvider applies moments later — no wrong-scheme flash before
       it loads.
     -->
-    <style>
-      html {
-        background-color: #000;
-      }
-    </style>
+    <link rel="stylesheet" href="/boot.css" />
     <script>
       (() => {
         var cached, bg, parsed;
diff --git a/desktop/package.json b/desktop/package.json
index a1fd2e919d8..14c412ff1de 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "buzz",
   "private": true,
-  "version": "0.5.5",
+  "version": "0.5.8",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -90,7 +90,7 @@
     "@tailwindcss/postcss": "^4.3.0",
     "@tanstack/router-plugin": "^1.167.12",
     "@tanstack/virtual-file-routes": "^1.161.7",
-    "@tauri-apps/cli": "~2.11",
+    "@tauri-apps/cli": "~2.11.4",
     "@testing-library/react": "^16.3.2",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
diff --git a/desktop/public/boot.css b/desktop/public/boot.css
new file mode 100644
index 00000000000..db1ee047ac7
--- /dev/null
+++ b/desktop/public/boot.css
@@ -0,0 +1,18 @@
+/*
+ * Boot background — applied before the app bundle loads so the window never
+ * flashes an unstyled background on cold start. The inline script in
+ * index.html overwrites this with the cached theme color once ThemeProvider's
+ * state is available; on first-ever launch it falls back to this black default.
+ *
+ * Kept as a linked stylesheet (not an inline <style>) so that Tauri's
+ * build-time asset processing does not inject a nonce token into this element.
+ * Tauri nonces inline <style> elements and adds the corresponding 'nonce-…'
+ * source to style-src at runtime; per the CSP spec a nonce in a directive
+ * causes the browser to ignore 'unsafe-inline', which would block TipTap's
+ * runtime stylesheet injection and emoji-mart's shadow-root styles in packaged
+ * builds. The inline boot script is SHA-256 hashed (not nonced) — that path
+ * only applies to scripts, not stylesheets.
+ */
+html {
+  background-color: #000;
+}
diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock
index fbaa547a032..ad7cfed53d9 100644
--- a/desktop/src-tauri/Cargo.lock
+++ b/desktop/src-tauri/Cargo.lock
@@ -226,9 +226,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
+checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
 [[package]]
 name = "approx"
@@ -1021,6 +1021,7 @@ dependencies = [
  "async-trait",
  "axum",
  "base64 0.22.1",
+ "dirs",
  "getrandom 0.4.3",
  "hex",
  "nix 0.31.3",
@@ -1060,7 +1061,7 @@ dependencies = [
 
 [[package]]
 name = "buzz-desktop"
-version = "0.5.5"
+version = "0.5.8"
 dependencies = [
  "anyhow",
  "arboard",
diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml
index bbf245e29a9..9b2de6a575f 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.5"
+version = "0.5.8"
 description = "Buzz desktop app"
 authors = ["you"]
 edition = "2021"
diff --git a/desktop/src-tauri/crates/buzz-terminal/src/damage.rs b/desktop/src-tauri/crates/buzz-terminal/src/damage.rs
index 0cc41e16855..c4bed4f1f37 100644
--- a/desktop/src-tauri/crates/buzz-terminal/src/damage.rs
+++ b/desktop/src-tauri/crates/buzz-terminal/src/damage.rs
@@ -118,6 +118,10 @@ pub struct Style {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct RowFrame {
     pub line: usize,
+    /// Whether this row continues onto the next screen row without a hard
+    /// line break. Retained separately from visual style so copy serialization
+    /// can reconstruct logical lines without exposing geometry flags to spans.
+    pub wrapped: bool,
     pub spans: Vec<Span>,
 }
 
@@ -332,6 +336,9 @@ impl Encoder {
             self.hashes[line] = hash;
             rows.push(RowFrame {
                 line,
+                wrapped: cells
+                    .last()
+                    .is_some_and(|cell| cell.flags.contains(Flags::WRAPLINE)),
                 spans: spans(&cells),
             });
         }
diff --git a/desktop/src-tauri/crates/buzz-terminal/tests/clusters.rs b/desktop/src-tauri/crates/buzz-terminal/tests/clusters.rs
index 9486aa8742d..a8bb94b02fe 100644
--- a/desktop/src-tauri/crates/buzz-terminal/tests/clusters.rs
+++ b/desktop/src-tauri/crates/buzz-terminal/tests/clusters.rs
@@ -306,6 +306,10 @@ fn wrapping_does_not_split_a_uniform_run() {
         .iter()
         .find(|row| row.line == 0)
         .expect("wrapped row must be present");
+    assert!(
+        first.wrapped,
+        "soft-wrap geometry must survive row encoding"
+    );
     let texts: Vec<&str> = first.spans.iter().map(|s| s.text.as_str()).collect();
     assert_eq!(
         texts,
diff --git a/desktop/src-tauri/src/commands/agent_config_tests.rs b/desktop/src-tauri/src/commands/agent_config_tests.rs
index 55191535784..b63370b95f8 100644
--- a/desktop/src-tauri/src/commands/agent_config_tests.rs
+++ b/desktop/src-tauri/src/commands/agent_config_tests.rs
@@ -623,6 +623,19 @@ fn baked_env_thinking_effort_is_unmasked() {
     assert!(!effort.masked);
 }
 
+#[test]
+fn baked_env_thinking_summary_is_unmasked() {
+    // BUZZ_AGENT_THINKING_SUMMARY is a non-secret enum — must not be masked.
+    let entries = baked_env_from_map(&[("BUZZ_AGENT_THINKING_SUMMARY", "detailed")]);
+    assert_eq!(entries.len(), 1);
+    let summary = entries
+        .iter()
+        .find(|e| e.key == "BUZZ_AGENT_THINKING_SUMMARY")
+        .unwrap();
+    assert_eq!(summary.value, "detailed");
+    assert!(!summary.masked);
+}
+
 #[test]
 fn baked_env_allowlist_is_case_insensitive() {
     // Known-safe keys — case-insensitive match must allow them.
@@ -632,6 +645,8 @@ fn baked_env_allowlist_is_case_insensitive() {
     assert!(super::is_safe_to_reveal("BUZZ_AGENT_MODEL"));
     assert!(super::is_safe_to_reveal("buzz_agent_thinking_effort"));
     assert!(super::is_safe_to_reveal("BUZZ_AGENT_THINKING_EFFORT"));
+    assert!(super::is_safe_to_reveal("buzz_agent_thinking_summary"));
+    assert!(super::is_safe_to_reveal("BUZZ_AGENT_THINKING_SUMMARY"));
     assert!(super::is_safe_to_reveal("databricks_host"));
     assert!(super::is_safe_to_reveal("DATABRICKS_HOST"));
     assert!(super::is_safe_to_reveal("databricks_model"));
diff --git a/desktop/src-tauri/src/commands/identity.rs b/desktop/src-tauri/src/commands/identity.rs
index bddf2e725a7..ec2357b85e7 100644
--- a/desktop/src-tauri/src/commands/identity.rs
+++ b/desktop/src-tauri/src/commands/identity.rs
@@ -404,7 +404,7 @@ pub async fn import_identity(
 ///    as a command `Err` would claim a half-applied import that actually
 ///    succeeded. The leftover blob is still passphrase-encrypted and is
 ///    replaced by the next backup creation; we log and move on.
-fn commit_imported_identity(
+pub(crate) fn commit_imported_identity(
     state: &AppState,
     data_dir: &std::path::Path,
     keys: nostr::Keys,
diff --git a/desktop/src-tauri/src/commands/link_preview.rs b/desktop/src-tauri/src/commands/link_preview.rs
index 5cc9c01d333..5ada1b38840 100644
--- a/desktop/src-tauri/src/commands/link_preview.rs
+++ b/desktop/src-tauri/src/commands/link_preview.rs
@@ -1,116 +1,513 @@
-use std::time::Duration;
+use std::{io::Cursor, net::IpAddr, time::Duration};
+
+use base64::{engine::general_purpose::STANDARD as BASE64_STANDARD, Engine as _};
+use image::ImageDecoder;
 
 use futures_util::StreamExt;
 use reqwest::{
-    header::{ACCEPT, CONTENT_TYPE, USER_AGENT},
+    header::{ACCEPT, CONTENT_TYPE, LOCATION, USER_AGENT},
     redirect::Policy,
 };
+use serde::Serialize;
 use url::Url;
 
-const MAX_TITLE_FETCH_BYTES: usize = 256 * 1024;
-const TITLE_FETCH_TIMEOUT: Duration = Duration::from_secs(4);
+#[path = "link_preview_rate_limit.rs"]
+mod rate_limit;
+
+use rate_limit::{image_host_cooldown_remaining, retry_after_duration, set_image_host_cooldown};
+
+const MAX_PREVIEW_FETCH_BYTES: usize = 256 * 1024;
+const MAX_IMAGE_FETCH_BYTES: usize = 2 * 1024 * 1024;
+const MAX_IMAGE_DIMENSION: u32 = 4096;
+const MAX_IMAGE_PIXELS: u64 = 16_000_000;
+const MAX_SANITIZED_DIMENSION: u32 = 1200;
+const PREVIEW_FETCH_TIMEOUT: Duration = Duration::from_secs(4);
+const PREVIEW_TOTAL_TIMEOUT: Duration = Duration::from_secs(10);
+const MAX_REDIRECTS: usize = 3;
+const MAX_METADATA_CHARS: usize = 180;
+const MAX_METADATA_DESCRIPTION_CHARS: usize = 280;
+
+#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")]
+enum LinkPreviewImageFetchState {
+    None,
+    Image,
+    TransientFailure,
+    Rejected,
+}
+
+#[derive(Debug, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct LinkPreviewMetadata {
+    title: String,
+    site_name: Option<String>,
+    description: Option<String>,
+    image_data_url: Option<String>,
+    image_domain: Option<String>,
+    image_fetch_state: LinkPreviewImageFetchState,
+    image_retry_after_ms: Option<u64>,
+    favicon_data_url: Option<String>,
+}
 
 #[tauri::command]
-pub async fn fetch_link_preview_title(href: String) -> Result<Option<String>, String> {
-    let url = Url::parse(href.trim()).map_err(|error| format!("invalid URL: {error}"))?;
-    if !is_supported_google_link(&url) {
-        return Ok(None);
+pub async fn fetch_link_preview_metadata(
+    href: String,
+) -> Result<Option<LinkPreviewMetadata>, String> {
+    tokio::time::timeout(
+        PREVIEW_TOTAL_TIMEOUT,
+        fetch_link_preview_metadata_inner(href),
+    )
+    .await
+    .map_err(|_| "link preview request timed out".to_string())?
+}
+
+async fn fetch_link_preview_metadata_inner(
+    href: String,
+) -> Result<Option<LinkPreviewMetadata>, String> {
+    let mut url = Url::parse(href.trim()).map_err(|error| format!("invalid URL: {error}"))?;
+    validate_public_https_url(&url).await?;
+
+    for redirect_count in 0..=MAX_REDIRECTS {
+        let response = send_pinned_request(&url, "text/html,application/xhtml+xml;q=0.9").await?;
+
+        if response.status().is_redirection() {
+            if redirect_count == MAX_REDIRECTS {
+                return Ok(None);
+            }
+            let Some(location) = response.headers().get(LOCATION) else {
+                return Ok(None);
+            };
+            let location = location
+                .to_str()
+                .map_err(|_| "link preview redirect has an invalid location".to_string())?;
+            url = url
+                .join(location)
+                .map_err(|error| format!("invalid link preview redirect: {error}"))?;
+            validate_public_https_url(&url).await?;
+            continue;
+        }
+
+        if !response.status().is_success() || !is_html_response(&response) {
+            return Ok(None);
+        }
+        let body = read_bytes_prefix(response, MAX_PREVIEW_FETCH_BYTES).await?;
+        let body = String::from_utf8_lossy(&body);
+        let Some(mut metadata) = extract_link_preview_metadata(&body) else {
+            return Ok(None);
+        };
+        let image_url = extract_image_url(&body, &url);
+        let favicon_url = extract_favicon_url(&body, &url);
+        let (image_result, favicon_result) = tokio::join!(
+            async {
+                match image_url {
+                    Some(image_url) => Some(
+                        tokio::time::timeout(
+                            PREVIEW_FETCH_TIMEOUT,
+                            fetch_sanitized_image(image_url, false),
+                        )
+                        .await
+                        .unwrap_or(Err(ImageFetchError::Transient { retry_after: None })),
+                    ),
+                    None => None,
+                }
+            },
+            async {
+                match favicon_url {
+                    Some(favicon_url) => tokio::time::timeout(
+                        PREVIEW_FETCH_TIMEOUT,
+                        fetch_sanitized_image(favicon_url, true),
+                    )
+                    .await
+                    .ok(),
+                    None => None,
+                }
+            }
+        );
+
+        apply_image_result(&mut metadata, image_result);
+        if let Some(Ok((data_url, _))) = favicon_result {
+            metadata.favicon_data_url = Some(data_url);
+        }
+        return Ok(Some(metadata));
     }
 
+    Ok(None)
+}
+
+fn apply_image_result(
+    metadata: &mut LinkPreviewMetadata,
+    image_result: Option<Result<(String, String), ImageFetchError>>,
+) {
+    match image_result {
+        Some(Ok((data_url, domain))) => {
+            metadata.image_data_url = Some(data_url);
+            metadata.image_domain = Some(domain);
+            metadata.image_fetch_state = LinkPreviewImageFetchState::Image;
+        }
+        Some(Err(ImageFetchError::Transient { retry_after })) => {
+            metadata.image_fetch_state = LinkPreviewImageFetchState::TransientFailure;
+            metadata.image_retry_after_ms =
+                retry_after.and_then(|duration| u64::try_from(duration.as_millis()).ok());
+        }
+        Some(Err(ImageFetchError::Rejected)) => {
+            metadata.image_fetch_state = LinkPreviewImageFetchState::Rejected;
+        }
+        None => {}
+    }
+}
+
+async fn validate_public_https_url(url: &Url) -> Result<(), String> {
+    if url.scheme() != "https" || url.username() != "" || url.password().is_some() {
+        return Err("link previews require an HTTPS URL without credentials".to_string());
+    }
+    if url.port().is_some_and(|port| port != 443) {
+        return Err("link previews require the default HTTPS port".to_string());
+    }
+
+    let host = url
+        .host_str()
+        .ok_or_else(|| "link preview URL has no host".to_string())?;
+    resolve_public_addresses(host).await.map(|_| ())
+}
+
+async fn resolve_public_addresses(host: &str) -> Result<Vec<IpAddr>, String> {
+    let host = host.to_string();
+    let addresses = tokio::net::lookup_host((host.as_str(), 443))
+        .await
+        .map_err(|error| format!("link preview DNS resolution failed: {error}"))?
+        .map(|address| address.ip())
+        .collect::<Vec<_>>();
+
+    if addresses.is_empty() {
+        return Err("link preview DNS resolution returned no addresses".to_string());
+    }
+    if addresses.iter().any(buzz_core_pkg::network::is_private_ip) {
+        return Err("link preview host resolved to a private or reserved address".to_string());
+    }
+
+    Ok(addresses)
+}
+
+async fn send_pinned_request(url: &Url, accept: &str) -> Result<reqwest::Response, String> {
+    let host = url
+        .host_str()
+        .ok_or_else(|| "link preview URL has no host".to_string())?;
+    let addresses = resolve_public_addresses(host).await?;
+    let socket_addresses = addresses
+        .into_iter()
+        .map(|address| std::net::SocketAddr::new(address, 443))
+        .collect::<Vec<_>>();
     let client = reqwest::Client::builder()
+        .no_proxy()
         .redirect(Policy::none())
-        .pool_idle_timeout(Duration::from_secs(10))
-        .pool_max_idle_per_host(1)
+        .pool_max_idle_per_host(0)
+        .resolve_to_addrs(host, &socket_addresses)
         .build()
-        .map_err(|error| format!("link preview title client failed: {error}"))?;
-
+        .map_err(|error| format!("link preview client failed: {error}"))?;
     let request = client
         .get(url.as_str())
-        .header(
-            ACCEPT,
-            "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-        )
+        .header(ACCEPT, accept)
         .header(USER_AGENT, "Buzz Desktop link preview");
 
-    let response = tokio::time::timeout(TITLE_FETCH_TIMEOUT, request.send())
+    tokio::time::timeout(PREVIEW_FETCH_TIMEOUT, request.send())
         .await
-        .map_err(|_| "link preview title request timed out".to_string())?
-        .map_err(|error| format!("link preview title request failed: {error}"))?;
-
-    if !response.status().is_success() {
-        return Ok(None);
-    }
+        .map_err(|_| "link preview request timed out".to_string())?
+        .map_err(|error| format!("link preview request failed: {error}"))
+}
 
-    let is_html = response
+fn is_html_response(response: &reqwest::Response) -> bool {
+    response
         .headers()
         .get(CONTENT_TYPE)
         .and_then(|value| value.to_str().ok())
-        .map(|value| value.to_ascii_lowercase().contains("text/html"))
-        .unwrap_or(true);
-    if !is_html {
-        return Ok(None);
-    }
-
-    let body = read_limited_text(response).await?;
-    Ok(extract_google_title(&body))
+        .map(|value| {
+            let mime = value.split(';').next().unwrap_or_default().trim();
+            mime.eq_ignore_ascii_case("text/html")
+                || mime.eq_ignore_ascii_case("application/xhtml+xml")
+        })
+        .unwrap_or(false)
 }
 
-fn is_supported_google_link(url: &Url) -> bool {
-    if url.scheme() != "https" {
-        return false;
-    }
+async fn read_bytes_prefix(response: reqwest::Response, limit: usize) -> Result<Vec<u8>, String> {
+    let mut stream = response.bytes_stream();
+    let mut bytes = Vec::with_capacity(limit);
 
-    let Some(host) = url.host_str().map(|host| host.to_ascii_lowercase()) else {
-        return false;
-    };
-    let segments = url
-        .path_segments()
-        .map(|segments| segments.collect::<Vec<_>>())
-        .unwrap_or_default();
-
-    match host.trim_start_matches("www.") {
-        "docs.google.com" => {
-            matches!(
-                segments.as_slice(),
-                ["document", "d", _, ..]
-                    | ["spreadsheets", "d", _, ..]
-                    | ["presentation", "d", _, ..]
-            )
-        }
-        "drive.google.com" => {
-            matches!(segments.as_slice(), ["file", "d", _, ..])
-                || matches!(segments.as_slice(), ["drive", "folders", _, ..])
-                || (segments.first() == Some(&"open")
-                    && url.query_pairs().any(|(key, _)| key == "id"))
-        }
-        _ => false,
+    while bytes.len() < limit {
+        let Some(chunk) = stream.next().await else {
+            break;
+        };
+        let chunk = chunk.map_err(|error| format!("reading link preview failed: {error}"))?;
+        let remaining = limit - bytes.len();
+        bytes.extend_from_slice(&chunk[..chunk.len().min(remaining)]);
     }
+    Ok(bytes)
 }
 
-async fn read_limited_text(response: reqwest::Response) -> Result<String, String> {
+async fn read_limited_bytes(response: reqwest::Response, limit: usize) -> Result<Vec<u8>, String> {
     let mut stream = response.bytes_stream();
     let mut bytes = Vec::new();
 
     while let Some(chunk) = stream.next().await {
-        let chunk = chunk.map_err(|error| format!("reading title response failed: {error}"))?;
-        if bytes.len() + chunk.len() > MAX_TITLE_FETCH_BYTES {
-            let remaining = MAX_TITLE_FETCH_BYTES.saturating_sub(bytes.len());
-            bytes.extend_from_slice(&chunk[..remaining]);
-            break;
+        let chunk = chunk.map_err(|error| format!("reading link preview failed: {error}"))?;
+        if bytes.len().saturating_add(chunk.len()) > limit {
+            return Err("link preview response exceeded the size limit".to_string());
         }
         bytes.extend_from_slice(&chunk);
     }
+    Ok(bytes)
+}
+
+fn extract_favicon_url(html: &str, page_url: &Url) -> Option<Url> {
+    let lower = html.to_ascii_lowercase();
+    let mut search_from = 0;
+    let mut fallback = None;
+
+    while let Some(relative_start) = lower[search_from..].find("<link") {
+        let start = search_from + relative_start;
+        let Some(relative_end) = lower[start..].find('>') else {
+            break;
+        };
+        let end = start + relative_end + 1;
+        let tag = &html[start..end];
+        let rel = attr_value(tag, "rel");
+        let is_icon = rel.as_ref().is_some_and(|value| {
+            value.split_ascii_whitespace().any(|token| {
+                token.eq_ignore_ascii_case("icon") || token.eq_ignore_ascii_case("apple-touch-icon")
+            })
+        });
+        if is_icon {
+            if let Some(href) = attr_value(tag, "href") {
+                if let Ok(url) = page_url.join(href.trim()) {
+                    let declared_type = attr_value(tag, "type");
+                    let is_supported_raster = declared_type.as_ref().is_some_and(|value| {
+                        matches!(
+                            value.to_ascii_lowercase().as_str(),
+                            "image/jpeg" | "image/png" | "image/webp"
+                        )
+                    }) || matches!(
+                        url.path()
+                            .rsplit_once('.')
+                            .map(|(_, extension)| extension.to_ascii_lowercase())
+                            .as_deref(),
+                        Some("jpg" | "jpeg" | "png" | "webp")
+                    );
+                    if is_supported_raster {
+                        return Some(url);
+                    }
+                    fallback.get_or_insert(url);
+                }
+            }
+        }
+        search_from = end;
+    }
+
+    fallback
+}
+
+fn extract_image_url(html: &str, page_url: &Url) -> Option<Url> {
+    let raw = extract_meta_content(html, "property", "og:image")
+        .or_else(|| extract_meta_content(html, "property", "og:image:secure_url"))
+        .or_else(|| extract_meta_content(html, "name", "twitter:image"))?;
+    page_url.join(raw.trim()).ok()
+}
+
+#[derive(Debug, PartialEq)]
+enum ImageFetchError {
+    Transient { retry_after: Option<Duration> },
+    Rejected,
+}
+
+async fn fetch_sanitized_image(
+    mut url: Url,
+    preserve_transparency: bool,
+) -> Result<(String, String), ImageFetchError> {
+    validate_public_https_url(&url)
+        .await
+        .map_err(|_| ImageFetchError::Rejected)?;
+    for redirect_count in 0..=MAX_REDIRECTS {
+        if let Some(retry_after) = image_host_cooldown_remaining(&url) {
+            return Err(ImageFetchError::Transient {
+                retry_after: Some(retry_after),
+            });
+        }
+        let response = send_pinned_request(&url, "image/jpeg,image/png,image/webp")
+            .await
+            .map_err(|_| ImageFetchError::Transient { retry_after: None })?;
+        if response.status().is_redirection() {
+            if redirect_count == MAX_REDIRECTS {
+                return Err(ImageFetchError::Rejected);
+            }
+            let location = response
+                .headers()
+                .get(LOCATION)
+                .and_then(|value| value.to_str().ok())
+                .ok_or(ImageFetchError::Rejected)?;
+            url = url.join(location).map_err(|_| ImageFetchError::Rejected)?;
+            validate_public_https_url(&url)
+                .await
+                .map_err(|_| ImageFetchError::Rejected)?;
+            continue;
+        }
+        if !response.status().is_success() {
+            let status = response.status();
+            if status == reqwest::StatusCode::TOO_MANY_REQUESTS
+                || status == reqwest::StatusCode::REQUEST_TIMEOUT
+                || status == reqwest::StatusCode::TOO_EARLY
+                || status.is_server_error()
+            {
+                let retry_after = retry_after_duration(&response);
+                if let Some(retry_after) = retry_after {
+                    set_image_host_cooldown(&url, retry_after);
+                }
+                return Err(ImageFetchError::Transient { retry_after });
+            }
+            return Err(ImageFetchError::Rejected);
+        }
+        let declared_mime = response
+            .headers()
+            .get(CONTENT_TYPE)
+            .and_then(|value| value.to_str().ok())
+            .map(|value| {
+                value
+                    .split(';')
+                    .next()
+                    .unwrap_or_default()
+                    .trim()
+                    .to_ascii_lowercase()
+            })
+            .ok_or(ImageFetchError::Rejected)?;
+        if !matches!(
+            declared_mime.as_str(),
+            "image/jpeg" | "image/png" | "image/webp"
+        ) {
+            return Err(ImageFetchError::Rejected);
+        }
+        if response
+            .content_length()
+            .is_some_and(|size| size > MAX_IMAGE_FETCH_BYTES as u64)
+        {
+            return Err(ImageFetchError::Rejected);
+        }
+        let bytes = read_limited_bytes(response, MAX_IMAGE_FETCH_BYTES)
+            .await
+            .map_err(|_| ImageFetchError::Rejected)?;
+        let data_url = tokio::task::spawn_blocking(move || {
+            sanitize_image(&bytes, &declared_mime, preserve_transparency)
+        })
+        .await
+        .map_err(|_| ImageFetchError::Rejected)?
+        .map_err(|_| ImageFetchError::Rejected)?;
+        let domain = url.host_str().unwrap_or_default().to_string();
+        return Ok((data_url, domain));
+    }
+    Err(ImageFetchError::Rejected)
+}
+
+fn sanitize_image(
+    bytes: &[u8],
+    declared_mime: &str,
+    preserve_transparency: bool,
+) -> Result<String, String> {
+    let sniffed = infer::get(bytes)
+        .map(|kind| kind.mime_type())
+        .ok_or_else(|| "link preview image magic bytes are unsupported".to_string())?;
+    if sniffed != declared_mime {
+        return Err("link preview image content type does not match its bytes".to_string());
+    }
+    let format = match sniffed {
+        "image/jpeg" => image::ImageFormat::Jpeg,
+        "image/png" => image::ImageFormat::Png,
+        "image/webp" => image::ImageFormat::WebP,
+        _ => return Err("link preview image type is unsupported".to_string()),
+    };
+    if declares_animation(bytes, format) {
+        return Err("animated link preview images are unsupported".to_string());
+    }
+
+    let reader = image::ImageReader::with_format(Cursor::new(bytes), format);
+    let mut decoder = reader
+        .into_decoder()
+        .map_err(|_| "link preview image is malformed".to_string())?;
+    let (width, height) = decoder.dimensions();
+    if width == 0
+        || height == 0
+        || width > MAX_IMAGE_DIMENSION
+        || height > MAX_IMAGE_DIMENSION
+        || u64::from(width) * u64::from(height) > MAX_IMAGE_PIXELS
+    {
+        return Err("link preview image dimensions exceed safe limits".to_string());
+    }
+    let mut limits = image::Limits::default();
+    limits.max_image_width = Some(MAX_IMAGE_DIMENSION);
+    limits.max_image_height = Some(MAX_IMAGE_DIMENSION);
+    limits.max_alloc = Some(MAX_IMAGE_PIXELS * 4);
+    decoder
+        .set_limits(limits)
+        .map_err(|_| "link preview image exceeds safe decoding limits".to_string())?;
+    let orientation = decoder
+        .orientation()
+        .unwrap_or(image::metadata::Orientation::NoTransforms);
+    let mut decoded = image::DynamicImage::from_decoder(decoder)
+        .map_err(|_| "link preview image could not be decoded".to_string())?;
+    decoded.apply_orientation(orientation);
+    let decoded = decoded.thumbnail(MAX_SANITIZED_DIMENSION, MAX_SANITIZED_DIMENSION);
+    let mut output = Vec::new();
+    if preserve_transparency && decoded.color().has_alpha() {
+        decoded
+            .write_to(&mut Cursor::new(&mut output), image::ImageFormat::Png)
+            .map_err(|_| "link preview image could not be sanitized".to_string())?;
+        return Ok(format!(
+            "data:image/png;base64,{}",
+            BASE64_STANDARD.encode(output)
+        ));
+    }
+    image::codecs::jpeg::JpegEncoder::new_with_quality(&mut output, 82)
+        .encode_image(&decoded)
+        .map_err(|_| "link preview image could not be sanitized".to_string())?;
+    Ok(format!(
+        "data:image/jpeg;base64,{}",
+        BASE64_STANDARD.encode(output)
+    ))
+}
 
-    Ok(String::from_utf8_lossy(&bytes).into_owned())
+fn declares_animation(bytes: &[u8], format: image::ImageFormat) -> bool {
+    match format {
+        image::ImageFormat::Png => bytes.windows(4).any(|chunk| chunk == b"acTL"),
+        image::ImageFormat::WebP => {
+            bytes.len() >= 21
+                && bytes.starts_with(b"RIFF")
+                && &bytes[8..12] == b"WEBP"
+                && ((&bytes[12..16] == b"VP8X" && bytes[20] & 0x02 != 0)
+                    || bytes.windows(4).any(|chunk| chunk == b"ANIM"))
+        }
+        _ => false,
+    }
 }
 
-fn extract_google_title(html: &str) -> Option<String> {
-    extract_meta_title(html)
+fn extract_link_preview_metadata(html: &str) -> Option<LinkPreviewMetadata> {
+    let title = extract_meta_content(html, "property", "og:title")
+        .or_else(|| extract_meta_content(html, "name", "twitter:title"))
         .or_else(|| extract_title_tag(html))
-        .and_then(|title| normalize_google_title(&title))
+        .and_then(|value| normalize_metadata_text(&value))?;
+    let site_name = extract_meta_content(html, "property", "og:site_name")
+        .and_then(|value| normalize_metadata_text(&value));
+    let description = extract_meta_content(html, "property", "og:description")
+        .or_else(|| extract_meta_content(html, "name", "twitter:description"))
+        .and_then(|value| normalize_metadata_description(&value));
+
+    Some(LinkPreviewMetadata {
+        title,
+        site_name,
+        description,
+        image_data_url: None,
+        image_domain: None,
+        image_fetch_state: LinkPreviewImageFetchState::None,
+        image_retry_after_ms: None,
+        favicon_data_url: None,
+    })
 }
 
-fn extract_meta_title(html: &str) -> Option<String> {
+fn extract_meta_content(html: &str, key_attr: &str, key_value: &str) -> Option<String> {
     let lower = html.to_ascii_lowercase();
     let mut search_from = 0;
 
@@ -121,14 +518,11 @@ fn extract_meta_title(html: &str) -> Option<String> {
         };
         let end = start + relative_end + 1;
         let tag = &html[start..end];
-        let lower_tag = &lower[start..end];
-
-        if lower_tag.contains("og:title") || lower_tag.contains("twitter:title") {
+        if attr_value(tag, key_attr).is_some_and(|value| value.eq_ignore_ascii_case(key_value)) {
             if let Some(content) = attr_value(tag, "content") {
                 return Some(content);
             }
         }
-
         search_from = end;
     }
 
@@ -140,7 +534,7 @@ fn extract_title_tag(html: &str) -> Option<String> {
     let start = lower.find("<title")?;
     let content_start = start + lower[start..].find('>')? + 1;
     let content_end = content_start + lower[content_start..].find("</title>")?;
-    Some(html[content_start..content_end].to_string())
+    Some(decode_html_entities(&html[content_start..content_end]))
 }
 
 fn attr_value(tag: &str, attr: &str) -> Option<String> {
@@ -157,62 +551,70 @@ fn attr_value(tag: &str, attr: &str) -> Option<String> {
             && !matches!(after, Some(c) if c.is_ascii_alphanumeric() || c == '-' || c == '_');
 
         if has_name_boundary {
-            let lower_rest = &lower[name_end..];
-            let equals_offset = lower_rest.find('=')?;
-            let value_start = name_end + equals_offset + 1;
-            let value = tag[value_start..].trim_start();
+            let rest = &tag[name_end..];
+            let equals_offset = rest.find('=')?;
+            let value = rest[equals_offset + 1..].trim_start();
             let quote = value.chars().next()?;
-
             if quote == '"' || quote == '\'' {
                 let value_body = &value[quote.len_utf8()..];
                 let value_end = value_body.find(quote)?;
                 return Some(decode_html_entities(&value_body[..value_end]));
             }
-
             let value_end = value
                 .find(|c: char| c.is_ascii_whitespace() || c == '>')
                 .unwrap_or(value.len());
             return Some(decode_html_entities(&value[..value_end]));
         }
-
         search_from = name_end;
     }
 
     None
 }
 
-fn normalize_google_title(raw_title: &str) -> Option<String> {
-    let mut title = decode_html_entities(raw_title)
+fn normalize_metadata_text(raw: &str) -> Option<String> {
+    let mut normalized = decode_html_entities(raw)
         .split_whitespace()
         .collect::<Vec<_>>()
         .join(" ");
-
     for suffix in [
         " - Google Docs",
         " - Google Sheets",
         " - Google Slides",
         " - Google Drive",
     ] {
-        if let Some(stripped) = title.strip_suffix(suffix) {
-            title = stripped.trim().to_string();
+        if let Some(stripped) = normalized.strip_suffix(suffix) {
+            normalized = stripped.trim().to_string();
             break;
         }
     }
+    if matches!(
+        normalized.as_str(),
+        "" | "Sign in - Google Accounts" | "Google Docs" | "Google Sheets" | "Google Slides"
+    ) {
+        return None;
+    }
+    Some(normalized.chars().take(MAX_METADATA_CHARS).collect())
+}
 
-    match title.as_str() {
-        ""
-        | "Document"
-        | "Spreadsheet"
-        | "Presentation"
-        | "Drive file"
-        | "Drive folder"
-        | "Google Docs"
-        | "Google Sheets"
-        | "Google Slides"
-        | "Google Drive"
-        | "Sign in - Google Accounts" => None,
-        _ => Some(title.chars().take(180).collect()),
+fn normalize_metadata_description(raw: &str) -> Option<String> {
+    let decoded = decode_html_entities(raw)
+        .replace("\r\n", "\n")
+        .replace('\r', "\n");
+    let normalized = decoded
+        .split('\n')
+        .map(|line| line.split_whitespace().collect::<Vec<_>>().join(" "))
+        .collect::<Vec<_>>()
+        .join("\n");
+    let normalized = normalized.trim();
+    if normalized.is_empty() {
+        return None;
     }
+    Some(
+        normalized
+            .chars()
+            .take(MAX_METADATA_DESCRIPTION_CHARS)
+            .collect(),
+    )
 }
 
 fn decode_html_entities(value: &str) -> String {
@@ -231,71 +633,328 @@ fn decode_html_entities(value: &str) -> String {
         };
         let end = start + relative_end + 1;
         let entity = &decoded[start + 2..end - 1];
-        let parsed = if let Some(hex) = entity
+        let parsed = entity
             .strip_prefix('x')
             .or_else(|| entity.strip_prefix('X'))
-        {
-            u32::from_str_radix(hex, 16).ok()
-        } else {
-            entity.parse::<u32>().ok()
-        };
-
+            .and_then(|hex| u32::from_str_radix(hex, 16).ok())
+            .or_else(|| entity.parse::<u32>().ok());
         let Some(ch) = parsed.and_then(char::from_u32) else {
             break;
         };
         decoded.replace_range(start..end, &ch.to_string());
     }
-
     decoded
 }
 
 #[cfg(test)]
 mod tests {
-    use super::{extract_google_title, is_supported_google_link};
+    use super::rate_limit::MAX_IMAGE_RETRY_AFTER;
+    use super::{
+        apply_image_result, declares_animation, extract_favicon_url, extract_image_url,
+        extract_link_preview_metadata, is_html_response, read_bytes_prefix, retry_after_duration,
+        sanitize_image, ImageFetchError, LinkPreviewImageFetchState, LinkPreviewMetadata,
+        MAX_METADATA_DESCRIPTION_CHARS,
+    };
+    use axum::{body::Body, http::Response, routing::get, Router};
+    use base64::Engine as _;
+    use bytes::Bytes;
+    use futures_util::stream;
+    use image::{DynamicImage, ImageFormat, Rgb, RgbImage, Rgba, RgbaImage};
+    use std::{convert::Infallible, io::Cursor};
     use url::Url;
 
+    async fn test_response(router: Router, path: &str) -> reqwest::Response {
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let address = listener.local_addr().unwrap();
+        tokio::spawn(async move {
+            axum::serve(listener, router).await.unwrap();
+        });
+        reqwest::get(format!("http://{address}{path}"))
+            .await
+            .unwrap()
+    }
+
     #[test]
-    fn title_prefers_open_graph_title() {
-        let html = r#"
-          <html>
-            <head>
-              <meta property="og:title" content="Composer links &amp; previews - Google Docs">
-              <title>Fallback - Google Docs</title>
-            </head>
-          </html>
-        "#;
+    fn metadata_prefers_open_graph_and_reads_site_name() {
+        let html = r#"<meta content="Buzz" property="og:site_name">
+          <meta content="Rich previews &amp; cards" property="og:title">
+          <meta content="Safe &amp; useful previews" property="og:description">
+          <meta name="twitter:title" content="Twitter fallback"><title>Fallback</title>"#;
+        assert_eq!(
+            extract_link_preview_metadata(html),
+            Some(LinkPreviewMetadata {
+                title: "Rich previews & cards".to_string(),
+                site_name: Some("Buzz".to_string()),
+                description: Some("Safe & useful previews".to_string()),
+                image_data_url: None,
+                image_domain: None,
+                image_fetch_state: LinkPreviewImageFetchState::None,
+                image_retry_after_ms: None,
+                favicon_data_url: None,
+            })
+        );
+    }
 
+    #[test]
+    fn image_results_preserve_absence_and_classify_recovery() {
+        let mut metadata = extract_link_preview_metadata("<title>Preview result</title>").unwrap();
+        apply_image_result(&mut metadata, None);
+        assert_eq!(metadata.image_fetch_state, LinkPreviewImageFetchState::None);
+
+        apply_image_result(
+            &mut metadata,
+            Some(Err(ImageFetchError::Transient {
+                retry_after: Some(std::time::Duration::from_secs(15)),
+            })),
+        );
+        assert_eq!(
+            metadata.image_fetch_state,
+            LinkPreviewImageFetchState::TransientFailure
+        );
+        assert_eq!(metadata.image_retry_after_ms, Some(15_000));
+
+        apply_image_result(
+            &mut metadata,
+            Some(Ok((
+                "data:image/jpeg;base64,abc".to_string(),
+                "images.example.com".to_string(),
+            ))),
+        );
         assert_eq!(
-            extract_google_title(html).as_deref(),
-            Some("Composer links & previews")
+            metadata.image_fetch_state,
+            LinkPreviewImageFetchState::Image
         );
+        assert_eq!(metadata.image_domain.as_deref(), Some("images.example.com"));
     }
 
     #[test]
-    fn title_ignores_generic_google_titles() {
+    fn metadata_falls_back_to_twitter_then_title() {
         assert_eq!(
-            extract_google_title("<title>Sign in - Google Accounts</title>"),
+            extract_link_preview_metadata("<meta content='Tweet title' name='twitter:title'>")
+                .map(|metadata| metadata.title),
+            Some("Tweet title".to_string())
+        );
+        assert_eq!(
+            extract_link_preview_metadata("<title> Plain   title </title>")
+                .map(|metadata| metadata.title),
+            Some("Plain title".to_string())
+        );
+    }
+
+    #[test]
+    fn metadata_preserves_description_line_breaks() {
+        let html = r#"<meta property="og:title" content="Tweet title">
+          <meta property="og:description" content="First paragraph.&#10;&#10;Agents:&#10;- One&#10;- Two">"#;
+        assert_eq!(
+            extract_link_preview_metadata(html).and_then(|metadata| metadata.description),
+            Some("First paragraph.\n\nAgents:\n- One\n- Two".to_string())
+        );
+    }
+
+    #[test]
+    fn metadata_description_supports_standard_x_posts() {
+        let description = "x".repeat(MAX_METADATA_DESCRIPTION_CHARS + 1);
+        let html = format!(
+            r#"<meta property="og:title" content="Long post"><meta property="og:description" content="{description}">"#
+        );
+        let extracted = extract_link_preview_metadata(&html)
+            .and_then(|metadata| metadata.description)
+            .unwrap();
+        assert_eq!(extracted.chars().count(), MAX_METADATA_DESCRIPTION_CHARS);
+    }
+
+    #[test]
+    fn favicon_metadata_resolves_relative_icon_links() {
+        let page = Url::parse("https://example.com/articles/one").unwrap();
+        let html = r#"<link rel="stylesheet" href="styles.css">
+          <link href="../favicon.png" rel="shortcut icon">"#;
+        assert_eq!(
+            extract_favicon_url(html, &page).unwrap().as_str(),
+            "https://example.com/favicon.png"
+        );
+    }
+
+    #[test]
+    fn favicon_metadata_prefers_a_supported_raster_candidate() {
+        let page = Url::parse("https://github.com/block/buzz").unwrap();
+        let html = r#"<link rel="mask-icon" href="https://assets.example/favicon.svg">
+          <link rel="alternate icon" type="image/png" href="https://assets.example/favicon.png">
+          <link rel="icon" type="image/svg+xml" href="https://assets.example/favicon.svg">"#;
+        assert_eq!(
+            extract_favicon_url(html, &page).unwrap().as_str(),
+            "https://assets.example/favicon.png"
+        );
+    }
+
+    #[test]
+    fn favicon_metadata_uses_touch_icon_before_unsupported_ico() {
+        let page = Url::parse("https://twitter.com/tellaho").unwrap();
+        let html = r#"<link rel="icon" href="/favicon.ico">
+          <link rel="apple-touch-icon" sizes="192x192" href="/apple-touch-icon.png">"#;
+        assert_eq!(
+            extract_favicon_url(html, &page).unwrap().as_str(),
+            "https://twitter.com/apple-touch-icon.png"
+        );
+    }
+
+    #[test]
+    fn image_metadata_resolves_relative_urls_and_prefers_open_graph() {
+        let page = Url::parse("https://example.com/articles/one").unwrap();
+        let html = r#"<meta name="twitter:image" content="https://cdn.example/twitter.jpg">
+          <meta property="og:image" content="../preview.png">"#;
+        assert_eq!(
+            extract_image_url(html, &page).unwrap().as_str(),
+            "https://example.com/preview.png"
+        );
+    }
+
+    #[tokio::test]
+    async fn oversized_html_uses_metadata_within_the_bounded_prefix() {
+        const LIMIT: usize = 256;
+        let metadata = r#"<meta property="og:title" content="Prefix title"><meta property="og:image" content="https://example.com/preview.png">"#;
+        let body = format!("{metadata}{}", "x".repeat(LIMIT));
+        let response = test_response(
+            Router::new().route(
+                "/declared",
+                get(move || {
+                    let body = body.clone();
+                    async move {
+                        Response::builder()
+                            .header("content-type", "text/html")
+                            .body(Body::from(body))
+                            .unwrap()
+                    }
+                }),
+            ),
+            "/declared",
+        )
+        .await;
+        assert!(response
+            .content_length()
+            .is_some_and(|size| size > LIMIT as u64));
+        assert!(is_html_response(&response));
+
+        let prefix = read_bytes_prefix(response, LIMIT).await.unwrap();
+        assert_eq!(prefix.len(), LIMIT);
+        let html = String::from_utf8_lossy(&prefix);
+        assert_eq!(
+            extract_link_preview_metadata(&html).map(|metadata| metadata.title),
+            Some("Prefix title".to_string())
+        );
+        assert!(extract_image_url(&html, &Url::parse("https://example.com").unwrap()).is_some());
+    }
+
+    #[tokio::test]
+    async fn image_retry_after_uses_bounded_delta_seconds() {
+        let response = test_response(
+            Router::new().route(
+                "/rate-limited",
+                get(|| async {
+                    Response::builder()
+                        .status(429)
+                        .header("retry-after", "900")
+                        .body(Body::empty())
+                        .unwrap()
+                }),
+            ),
+            "/rate-limited",
+        )
+        .await;
+        assert_eq!(
+            retry_after_duration(&response),
+            Some(std::time::Duration::from_secs(900))
+        );
+
+        let response = test_response(
+            Router::new().route(
+                "/excessive",
+                get(|| async {
+                    Response::builder()
+                        .status(429)
+                        .header("retry-after", "7200")
+                        .body(Body::empty())
+                        .unwrap()
+                }),
+            ),
+            "/excessive",
+        )
+        .await;
+        assert_eq!(retry_after_duration(&response), Some(MAX_IMAGE_RETRY_AFTER));
+    }
+
+    #[tokio::test]
+    async fn oversized_chunked_html_ignores_metadata_beyond_the_bounded_prefix() {
+        const LIMIT: usize = 256;
+        let response = test_response(
+            Router::new().route(
+                "/chunked",
+                get(|| async {
+                    let chunks = stream::iter([
+                        Ok::<_, Infallible>(Bytes::from(vec![b'x'; LIMIT])),
+                        Ok(Bytes::from_static(
+                            br#"<meta property="og:title" content="Too late"><meta property="og:image" content="https://example.com/late.png">"#,
+                        )),
+                    ]);
+                    Response::builder()
+                        .header("content-type", "text/html")
+                        .body(Body::from_stream(chunks))
+                        .unwrap()
+                }),
+            ),
+            "/chunked",
+        )
+        .await;
+        assert_eq!(response.content_length(), None);
+
+        let prefix = read_bytes_prefix(response, LIMIT).await.unwrap();
+        assert_eq!(prefix.len(), LIMIT);
+        let html = String::from_utf8_lossy(&prefix);
+        assert_eq!(extract_link_preview_metadata(&html), None);
+        assert_eq!(
+            extract_image_url(&html, &Url::parse("https://example.com").unwrap()),
             None
         );
-        assert_eq!(extract_google_title("<title>Google Docs</title>"), None);
     }
 
     #[test]
-    fn supported_urls_are_google_file_links_only() {
-        assert!(is_supported_google_link(
-            &Url::parse("https://docs.google.com/document/d/abc/edit").unwrap()
-        ));
-        assert!(is_supported_google_link(
-            &Url::parse("https://docs.google.com/spreadsheets/d/abc/edit").unwrap()
-        ));
-        assert!(is_supported_google_link(
-            &Url::parse("https://drive.google.com/file/d/abc/view").unwrap()
-        ));
-        assert!(!is_supported_google_link(
-            &Url::parse("https://example.com/document/d/abc/edit").unwrap()
-        ));
-        assert!(!is_supported_google_link(
-            &Url::parse("http://docs.google.com/document/d/abc/edit").unwrap()
-        ));
+    fn sanitizer_rejects_mime_mismatch_and_outputs_static_jpeg() {
+        let source = DynamicImage::ImageRgb8(RgbImage::from_pixel(2, 2, Rgb([10, 20, 30])));
+        let mut png = Cursor::new(Vec::new());
+        source.write_to(&mut png, ImageFormat::Png).unwrap();
+        assert!(sanitize_image(png.get_ref(), "image/jpeg", false).is_err());
+        let sanitized = sanitize_image(png.get_ref(), "image/png", false).unwrap();
+        assert!(sanitized.starts_with("data:image/jpeg;base64,"));
+    }
+
+    #[test]
+    fn favicon_sanitizer_preserves_png_transparency() {
+        let source = DynamicImage::ImageRgba8(RgbaImage::from_pixel(2, 2, Rgba([36, 41, 47, 0])));
+        let mut png = Cursor::new(Vec::new());
+        source.write_to(&mut png, ImageFormat::Png).unwrap();
+
+        let sanitized = sanitize_image(png.get_ref(), "image/png", true).unwrap();
+        assert!(sanitized.starts_with("data:image/png;base64,"));
+        let encoded = sanitized.split_once(',').unwrap().1;
+        let bytes = base64::engine::general_purpose::STANDARD
+            .decode(encoded)
+            .unwrap();
+        assert!(image::load_from_memory(&bytes).unwrap().color().has_alpha());
+    }
+
+    #[test]
+    fn animation_markers_are_rejected_before_decode() {
+        let mut apng = b"\x89PNG\r\n\x1a\n".to_vec();
+        apng.extend_from_slice(b"junkacTLjunk");
+        assert!(declares_animation(&apng, ImageFormat::Png));
+
+        let mut webp = b"RIFF\x00\x00\x00\x00WEBPVP8X\x0a\x00\x00\x00".to_vec();
+        webp.push(0x02);
+        assert!(declares_animation(&webp, ImageFormat::WebP));
+    }
+
+    #[test]
+    fn metadata_requires_a_non_empty_title() {
+        assert_eq!(extract_link_preview_metadata("<title>   </title>"), None);
+        assert_eq!(extract_link_preview_metadata("<html></html>"), None);
     }
 }
diff --git a/desktop/src-tauri/src/commands/link_preview_rate_limit.rs b/desktop/src-tauri/src/commands/link_preview_rate_limit.rs
new file mode 100644
index 00000000000..c3f7ed7188c
--- /dev/null
+++ b/desktop/src-tauri/src/commands/link_preview_rate_limit.rs
@@ -0,0 +1,62 @@
+use std::{
+    collections::HashMap,
+    sync::{Mutex, OnceLock},
+    time::{Duration, Instant},
+};
+
+use reqwest::header::RETRY_AFTER;
+use url::Url;
+
+pub(super) const MAX_IMAGE_RETRY_AFTER: Duration = Duration::from_secs(60 * 60);
+const MAX_IMAGE_HOST_COOLDOWNS: usize = 128;
+
+static IMAGE_HOST_COOLDOWNS: OnceLock<Mutex<HashMap<String, Instant>>> = OnceLock::new();
+
+pub(super) fn retry_after_duration(response: &reqwest::Response) -> Option<Duration> {
+    response
+        .headers()
+        .get(RETRY_AFTER)
+        .and_then(|value| value.to_str().ok())
+        .and_then(|value| value.trim().parse::<u64>().ok())
+        .map(Duration::from_secs)
+        .map(|duration| duration.min(MAX_IMAGE_RETRY_AFTER))
+}
+
+pub(super) fn image_host_cooldown_remaining(url: &Url) -> Option<Duration> {
+    let host = url.host_str()?;
+    let cooldowns = IMAGE_HOST_COOLDOWNS.get_or_init(|| Mutex::new(HashMap::new()));
+    let Ok(mut cooldowns) = cooldowns.lock() else {
+        return None;
+    };
+    let expires_at = cooldowns.get(host).copied()?;
+    let now = Instant::now();
+    if expires_at <= now {
+        cooldowns.remove(host);
+        return None;
+    }
+    Some(expires_at.duration_since(now))
+}
+
+pub(super) fn set_image_host_cooldown(url: &Url, retry_after: Duration) {
+    let Some(host) = url.host_str() else {
+        return;
+    };
+    let now = Instant::now();
+    let Some(expires_at) = now.checked_add(retry_after) else {
+        return;
+    };
+    let cooldowns = IMAGE_HOST_COOLDOWNS.get_or_init(|| Mutex::new(HashMap::new()));
+    if let Ok(mut cooldowns) = cooldowns.lock() {
+        cooldowns.retain(|_, current_expiry| *current_expiry > now);
+        if cooldowns.len() >= MAX_IMAGE_HOST_COOLDOWNS && !cooldowns.contains_key(host) {
+            let oldest_host = cooldowns
+                .iter()
+                .min_by_key(|(_, current_expiry)| *current_expiry)
+                .map(|(current_host, _)| current_host.clone());
+            if let Some(oldest_host) = oldest_host {
+                cooldowns.remove(&oldest_host);
+            }
+        }
+        cooldowns.insert(host.to_string(), expires_at);
+    }
+}
diff --git a/desktop/src-tauri/src/commands/media.rs b/desktop/src-tauri/src/commands/media.rs
index 86a91a98428..070381f55e8 100644
--- a/desktop/src-tauri/src/commands/media.rs
+++ b/desktop/src-tauri/src/commands/media.rs
@@ -350,11 +350,9 @@ pub(crate) fn sign_blossom_get_auth_header(
 /// Mint a `t=get` Authorization header value for a relay media fetch, or
 /// `None` when signing is unavailable (identity in recovery mode).
 ///
-/// Fail-open by design: while the relay's `BUZZ_REQUIRE_MEDIA_GET_AUTH` flag
-/// is off, an unauthenticated request still succeeds, so degrading to no
-/// header (instead of erroring) keeps media rendering during key recovery.
-/// Once the flag is on, these requests will 403 — the correct outcome for an
-/// identity that can't prove membership.
+/// When signing is unavailable, callers send no header and the relay rejects
+/// the read. This keeps recovery mode from accidentally treating a media URL
+/// as a bearer capability.
 ///
 /// Safety contract: callers must only attach the returned header to URLs
 /// constructed from (or validated against) the app's own relay base URL —
diff --git a/desktop/src-tauri/src/commands/messages.rs b/desktop/src-tauri/src/commands/messages.rs
index b7c37bec3df..7b4b9b785f1 100644
--- a/desktop/src-tauri/src/commands/messages.rs
+++ b/desktop/src-tauri/src/commands/messages.rs
@@ -3,16 +3,18 @@ use tauri::{AppHandle, State};
 
 mod forum;
 
-use forum::{forum_message_from_event, forum_reply_from_event};
+use forum::{
+    apply_link_preview_suppression, fetch_agent_owner_pubkeys, link_preview_suppression_targets,
+};
+pub use forum::{get_forum_posts, get_forum_thread};
 
 use crate::{
     app_state::AppState,
     events,
     managed_agents::{find_managed_agent_mut, load_managed_agents, ManagedAgentRecord},
     models::{
-        FeedItemInfo, FeedMeta, FeedResponse, FeedSections, ForumMessageInfo, ForumPostsResponse,
-        ForumThreadReplyInfo, ForumThreadResponse, SearchResponse, SendChannelMessageResponse,
-        ThreadRepliesResponse,
+        FeedItemInfo, FeedMeta, FeedResponse, FeedSections, SearchResponse,
+        SendChannelMessageResponse, ThreadRepliesResponse,
     },
     nostr_convert,
     relay::{query_relay, submit_event, submit_event_with_keys},
@@ -113,9 +115,30 @@ pub async fn get_feed(
         Vec::new()
     };
 
+    let mention_ids = mention_events
+        .iter()
+        .map(|event| event.id.to_hex())
+        .collect::<Vec<_>>();
+    let mention_edits = if mention_ids.is_empty() {
+        Vec::new()
+    } else {
+        query_relay(
+            &state,
+            &[serde_json::json!({ "kinds": [40003], "#e": mention_ids })],
+        )
+        .await
+        .unwrap_or_default()
+    };
+    let mention_owner_pubkeys = fetch_agent_owner_pubkeys(&state, &mention_events).await;
+    let suppressed_mentions =
+        link_preview_suppression_targets(&mention_events, &mention_edits, &mention_owner_pubkeys);
     let mentions: Vec<FeedItemInfo> = mention_events
         .iter()
-        .map(|ev| feed_item_from_event(ev, "mentions"))
+        .map(|ev| {
+            let mut item = feed_item_from_event(ev, "mentions");
+            apply_link_preview_suppression(&mut item.tags, &item.id, &suppressed_mentions);
+            item
+        })
         .collect();
     let needs_action: Vec<FeedItemInfo> = approval_events
         .iter()
@@ -206,79 +229,6 @@ pub async fn search_messages(
     Ok(nostr_convert::search_response_from_events(&events))
 }
 
-#[tauri::command]
-pub async fn get_forum_posts(
-    channel_id: String,
-    limit: Option<u32>,
-    before: Option<i64>,
-    state: State<'_, AppState>,
-) -> Result<ForumPostsResponse, String> {
-    let cap = limit.unwrap_or(20).min(100);
-    let mut filter = serde_json::Map::new();
-    filter.insert("kinds".to_string(), serde_json::json!([45001]));
-    filter.insert("#h".to_string(), serde_json::json!([channel_id.clone()]));
-    filter.insert("limit".to_string(), serde_json::json!(cap));
-    if let Some(t) = before {
-        filter.insert("until".to_string(), serde_json::json!(t));
-    }
-
-    let events = query_relay(&state, &[serde_json::Value::Object(filter)]).await?;
-    let messages: Vec<ForumMessageInfo> = events
-        .iter()
-        .map(|ev| forum_message_from_event(ev, &channel_id))
-        .collect();
-
-    let next_cursor = messages.last().map(|m| m.created_at);
-    Ok(ForumPostsResponse {
-        messages,
-        next_cursor,
-    })
-}
-
-#[tauri::command]
-pub async fn get_forum_thread(
-    channel_id: String,
-    event_id: String,
-    limit: Option<u32>,
-    cursor: Option<String>,
-    state: State<'_, AppState>,
-) -> Result<ForumThreadResponse, String> {
-    let _ = (limit, cursor);
-    // Two filters: the root event itself, plus any reply (kinds 9/45003)
-    // that references it via #e.
-    let events = query_relay(
-        &state,
-        &[
-            serde_json::json!({ "ids": [event_id.clone()], "kinds": [9, 40002, 45001, 45003] }),
-            serde_json::json!({
-                "kinds": [9, 45003],
-                "#e": [event_id.clone()],
-                "#h": [channel_id.clone()],
-            }),
-        ],
-    )
-    .await?;
-
-    let mut root: Option<ForumMessageInfo> = None;
-    let mut replies: Vec<ForumThreadReplyInfo> = Vec::new();
-    for ev in &events {
-        if ev.id.to_hex() == event_id {
-            root = Some(forum_message_from_event(ev, &channel_id));
-        } else {
-            replies.push(forum_reply_from_event(ev, &channel_id, &event_id));
-        }
-    }
-    let total_replies = replies.len() as u32;
-
-    let root = root.ok_or_else(|| "forum thread root event not found".to_string())?;
-    Ok(ForumThreadResponse {
-        root,
-        replies,
-        total_replies,
-        next_cursor: None,
-    })
-}
-
 /// Fetch the full reply subtree under a thread root, server-side.
 ///
 /// Unlike the channel timeline (which the desktop assembles from its local
@@ -535,6 +485,7 @@ pub async fn send_channel_message(
     media_tags: Option<Vec<Vec<String>>>,
     emoji_tags: Option<Vec<Vec<String>>>,
     mention_tags: Option<Vec<Vec<String>>>,
+    link_preview_tags: Option<Vec<Vec<String>>>,
     mention_pubkeys: Option<Vec<String>>,
     kind: Option<u32>,
     state: State<'_, AppState>,
@@ -546,6 +497,8 @@ pub async fn send_channel_message(
     let media = media_tags.unwrap_or_default();
     let emoji = emoji_tags.unwrap_or_default();
     let mention_refs_only = mention_tags.unwrap_or_default();
+    let link_previews = link_preview_tags.unwrap_or_default();
+    let relay_base = crate::relay::relay_api_base_url_with_override(&state);
     let kind_num = kind.unwrap_or(buzz_core_pkg::kind::KIND_STREAM_MESSAGE);
 
     let mut resolved_root: Option<String> = None;
@@ -590,6 +543,8 @@ pub async fn send_channel_message(
                 &media,
                 &emoji,
                 &mention_refs_only,
+                &link_previews,
+                &relay_base,
             )?
         }
     };
@@ -756,6 +711,8 @@ fn build_managed_agent_channel_message(
         &[],
         &[],
         &[],
+        &[],
+        &crate::relay::relay_api_base_url(),
         client_tags,
     )
 }
@@ -919,38 +876,48 @@ pub async fn remove_reaction(
     Ok(())
 }
 
-#[tauri::command]
-pub async fn edit_message(
+#[derive(serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct EditMessageInput {
     channel_id: String,
     event_id: String,
     content: String,
+    #[serde(default)]
     media_tags: Vec<Vec<String>>,
-    emoji_tags: Option<Vec<Vec<String>>>,
-    // Pubkeys of mentions *newly added* by this edit (the composer diffs the
-    // edited body against the original). Only these get a `p` tag, so a typo-fix
-    // edit that leaves the mention set unchanged never re-wakes anyone.
-    mention_pubkeys: Option<Vec<String>>,
+    #[serde(default)]
+    emoji_tags: Vec<Vec<String>>,
+    // Pubkeys of mentions *newly added* by this edit. Only these get a `p`
+    // tag, so a typo-fix edit never re-wakes existing mentions.
+    #[serde(default)]
+    mention_pubkeys: Vec<String>,
+    #[serde(default)]
+    suppress_link_previews: bool,
+}
+
+#[tauri::command]
+pub async fn edit_message(
+    input: EditMessageInput,
     state: State<'_, AppState>,
 ) -> Result<(), String> {
-    let channel_uuid = uuid::Uuid::parse_str(&channel_id)
-        .map_err(|_| format!("invalid channel UUID: {channel_id}"))?;
-    let target_eid = EventId::from_hex(&event_id).map_err(|e| format!("invalid event ID: {e}"))?;
-    let trimmed = content.trim();
+    let channel_uuid = uuid::Uuid::parse_str(&input.channel_id)
+        .map_err(|_| format!("invalid channel UUID: {}", input.channel_id))?;
+    let target_eid =
+        EventId::from_hex(&input.event_id).map_err(|e| format!("invalid event ID: {e}"))?;
+    let trimmed = input.content.trim();
     // Empty text is allowed when the edit still carries imeta attachments
     // (a media-only edit). Reject only when both are empty.
-    if trimmed.is_empty() && media_tags.is_empty() {
+    if trimmed.is_empty() && input.media_tags.is_empty() {
         return Err("edit must have content or attachments".into());
     }
-    let emoji = emoji_tags.unwrap_or_default();
-    let mentions = mention_pubkeys.unwrap_or_default();
-    let mention_refs: Vec<&str> = mentions.iter().map(|s| s.as_str()).collect();
+    let mention_refs: Vec<&str> = input.mention_pubkeys.iter().map(|s| s.as_str()).collect();
     let builder = events::build_message_edit(
         channel_uuid,
         target_eid,
         trimmed,
-        &media_tags,
-        &emoji,
+        &input.media_tags,
+        &input.emoji_tags,
         &mention_refs,
+        input.suppress_link_previews,
     )?;
     submit_event(builder, &state).await?;
     Ok(())
diff --git a/desktop/src-tauri/src/commands/messages/forum.rs b/desktop/src-tauri/src/commands/messages/forum.rs
index ffcf3a62e05..086e8c9f793 100644
--- a/desktop/src-tauri/src/commands/messages/forum.rs
+++ b/desktop/src-tauri/src/commands/messages/forum.rs
@@ -1,4 +1,41 @@
-use crate::models::{ForumMessageInfo, ForumThreadReplyInfo, ThreadSummary};
+use tauri::State;
+
+use crate::{
+    app_state::AppState,
+    models::{
+        ForumMessageInfo, ForumPostsResponse, ForumThreadReplyInfo, ForumThreadResponse,
+        ThreadSummary,
+    },
+    relay::query_relay,
+};
+
+pub(super) async fn fetch_agent_owner_pubkeys(
+    state: &AppState,
+    events: &[nostr::Event],
+) -> std::collections::HashMap<String, String> {
+    let authors = events
+        .iter()
+        .map(|event| event.pubkey.to_hex())
+        .collect::<std::collections::HashSet<_>>()
+        .into_iter()
+        .collect::<Vec<_>>();
+    if authors.is_empty() {
+        return std::collections::HashMap::new();
+    }
+
+    super::query_relay(
+        state,
+        &[serde_json::json!({ "kinds": [0], "authors": authors })],
+    )
+    .await
+    .unwrap_or_default()
+    .into_iter()
+    .filter_map(|profile| {
+        crate::nostr_convert::profile_valid_oa_owner_pubkey(&profile)
+            .map(|owner| (profile.pubkey.to_hex(), owner))
+    })
+    .collect()
+}
 
 fn tags_to_vec(event: &nostr::Event) -> Vec<Vec<String>> {
     event
@@ -68,3 +105,214 @@ pub(super) fn forum_reply_from_event(
         reactions: serde_json::Value::Null,
     }
 }
+
+pub(super) fn link_preview_suppression_targets(
+    originals: &[nostr::Event],
+    edits: &[nostr::Event],
+    owner_pubkeys: &std::collections::HashMap<String, String>,
+) -> std::collections::HashSet<String> {
+    let originals_by_id = originals
+        .iter()
+        .map(|event| (event.id.to_hex(), event))
+        .collect::<std::collections::HashMap<_, _>>();
+
+    edits
+        .iter()
+        .filter(|event| {
+            event.kind.as_u16() == 40003
+                && event
+                    .tags
+                    .iter()
+                    .any(|tag| tag.as_slice() == ["link-preview".to_string(), "none".to_string()])
+        })
+        .filter_map(|edit| {
+            let target_id = edit.tags.iter().find_map(|tag| {
+                let values = tag.as_slice();
+                (values.first().map(String::as_str) == Some("e"))
+                    .then(|| values.get(1).cloned())
+                    .flatten()
+            })?;
+            let target = originals_by_id.get(&target_id)?;
+            let author = target.pubkey.to_hex();
+            let signer = edit.pubkey.to_hex();
+            (signer == author || owner_pubkeys.get(&author) == Some(&signer)).then_some(target_id)
+        })
+        .collect()
+}
+
+pub(super) fn apply_link_preview_suppression(
+    tags: &mut Vec<Vec<String>>,
+    event_id: &str,
+    suppressed: &std::collections::HashSet<String>,
+) {
+    if suppressed.contains(event_id)
+        && !tags
+            .iter()
+            .any(|tag| tag.as_slice() == ["link-preview".to_string(), "none".to_string()])
+    {
+        tags.push(vec!["link-preview".to_string(), "none".to_string()]);
+    }
+}
+
+#[tauri::command]
+pub async fn get_forum_posts(
+    channel_id: String,
+    limit: Option<u32>,
+    before: Option<i64>,
+    state: State<'_, AppState>,
+) -> Result<ForumPostsResponse, String> {
+    let cap = limit.unwrap_or(20).min(100);
+    let mut filter = serde_json::Map::new();
+    filter.insert("kinds".to_string(), serde_json::json!([45001]));
+    filter.insert("#h".to_string(), serde_json::json!([channel_id.clone()]));
+    filter.insert("limit".to_string(), serde_json::json!(cap));
+    if let Some(t) = before {
+        filter.insert("until".to_string(), serde_json::json!(t));
+    }
+
+    let events = query_relay(&state, &[serde_json::Value::Object(filter)]).await?;
+    let ids = events
+        .iter()
+        .map(|event| event.id.to_hex())
+        .collect::<Vec<_>>();
+    let edits = if ids.is_empty() {
+        Vec::new()
+    } else {
+        query_relay(
+            &state,
+            &[serde_json::json!({ "kinds": [40003], "#e": ids })],
+        )
+        .await
+        .unwrap_or_default()
+    };
+    let owner_pubkeys = fetch_agent_owner_pubkeys(&state, &events).await;
+    let suppressed = link_preview_suppression_targets(&events, &edits, &owner_pubkeys);
+    let messages: Vec<ForumMessageInfo> = events
+        .iter()
+        .map(|ev| {
+            let mut message = forum_message_from_event(ev, &channel_id);
+            apply_link_preview_suppression(&mut message.tags, &message.event_id, &suppressed);
+            message
+        })
+        .collect();
+
+    let next_cursor = messages.last().map(|m| m.created_at);
+    Ok(ForumPostsResponse {
+        messages,
+        next_cursor,
+    })
+}
+
+#[tauri::command]
+pub async fn get_forum_thread(
+    channel_id: String,
+    event_id: String,
+    limit: Option<u32>,
+    cursor: Option<String>,
+    state: State<'_, AppState>,
+) -> Result<ForumThreadResponse, String> {
+    let _ = (limit, cursor);
+    // Two filters: the root event itself, plus any reply (kinds 9/45003)
+    // that references it via #e.
+    let events = query_relay(
+        &state,
+        &[
+            serde_json::json!({ "ids": [event_id.clone()], "kinds": [9, 40002, 45001, 45003] }),
+            serde_json::json!({
+                "kinds": [9, 45003],
+                "#e": [event_id.clone()],
+                "#h": [channel_id.clone()],
+            }),
+        ],
+    )
+    .await?;
+    let ids = events
+        .iter()
+        .map(|event| event.id.to_hex())
+        .collect::<Vec<_>>();
+    let edits = if ids.is_empty() {
+        Vec::new()
+    } else {
+        query_relay(
+            &state,
+            &[serde_json::json!({ "kinds": [40003], "#e": ids })],
+        )
+        .await
+        .unwrap_or_default()
+    };
+    let owner_pubkeys = fetch_agent_owner_pubkeys(&state, &events).await;
+    let suppressed = link_preview_suppression_targets(&events, &edits, &owner_pubkeys);
+
+    let mut root: Option<ForumMessageInfo> = None;
+    let mut replies: Vec<ForumThreadReplyInfo> = Vec::new();
+    for ev in &events {
+        if ev.id.to_hex() == event_id {
+            let mut message = forum_message_from_event(ev, &channel_id);
+            apply_link_preview_suppression(&mut message.tags, &message.event_id, &suppressed);
+            root = Some(message);
+        } else if ev.kind.as_u16() as u32 != 40003 {
+            let mut reply = forum_reply_from_event(ev, &channel_id, &event_id);
+            apply_link_preview_suppression(&mut reply.tags, &reply.event_id, &suppressed);
+            replies.push(reply);
+        }
+    }
+    let total_replies = replies.len() as u32;
+
+    let root = root.ok_or_else(|| "forum thread root event not found".to_string())?;
+    Ok(ForumThreadResponse {
+        root,
+        replies,
+        total_replies,
+        next_cursor: None,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use nostr::{EventBuilder, Keys, Kind};
+
+    fn signed_event(keys: &Keys, kind: u16, tags: Vec<Vec<String>>) -> nostr::Event {
+        let tags = tags
+            .into_iter()
+            .map(nostr::Tag::parse)
+            .collect::<Result<Vec<_>, _>>()
+            .expect("valid tags");
+        EventBuilder::new(Kind::Custom(kind), "body")
+            .tags(tags)
+            .sign_with_keys(keys)
+            .expect("event signs")
+    }
+
+    #[test]
+    fn suppression_targets_accepts_author_and_verified_owner_only() {
+        let author = Keys::generate();
+        let owner = Keys::generate();
+        let attacker = Keys::generate();
+        let original = signed_event(&author, 9, Vec::new());
+        let marker = vec!["link-preview".to_string(), "none".to_string()];
+        let target = vec!["e".to_string(), original.id.to_hex()];
+        let author_edit = signed_event(&author, 40003, vec![target.clone(), marker.clone()]);
+        let owner_edit = signed_event(&owner, 40003, vec![target.clone(), marker.clone()]);
+        let spoofed_edit = signed_event(&attacker, 40003, vec![target, marker]);
+        let owners = std::collections::HashMap::from([(
+            author.public_key().to_hex(),
+            owner.public_key().to_hex(),
+        )]);
+
+        for edit in [&author_edit, &owner_edit] {
+            assert!(link_preview_suppression_targets(
+                std::slice::from_ref(&original),
+                std::slice::from_ref(edit),
+                &owners,
+            )
+            .contains(&original.id.to_hex()));
+        }
+        assert!(link_preview_suppression_targets(
+            std::slice::from_ref(&original),
+            std::slice::from_ref(&spoofed_edit),
+            &owners,
+        )
+        .is_empty());
+    }
+}
diff --git a/desktop/src-tauri/src/commands/pairing.rs b/desktop/src-tauri/src/commands/pairing.rs
index fc874a01500..aedd67854c1 100644
--- a/desktop/src-tauri/src/commands/pairing.rs
+++ b/desktop/src-tauri/src/commands/pairing.rs
@@ -9,7 +9,7 @@ use buzz_core_pkg::pairing::types::{AbortReason, PayloadType};
 use futures_util::{SinkExt, StreamExt};
 use nostr::ToBech32;
 use serde::Serialize;
-use tauri::{AppHandle, Emitter, State};
+use tauri::{AppHandle, Emitter, Manager, State};
 use tokio::sync::mpsc;
 use tokio_tungstenite::{connect_async, tungstenite::Message};
 use tokio_util::sync::CancellationToken;
@@ -33,16 +33,36 @@ struct PairingErrorPayload {
     message: String,
 }
 
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum PairingMode {
+    SendIdentity,
+    RecoverIdentity,
+}
+
+#[derive(Clone)]
+struct PairingTaskContext {
+    mode: PairingMode,
+    generation: Arc<AtomicU64>,
+    generation_fence: Arc<std::sync::Mutex<()>>,
+    task_generation: u64,
+}
+
 /// Managed Tauri state for an active pairing session.
 pub struct PairingHandle {
     session: Arc<tokio::sync::Mutex<Option<PairingSession>>>,
     generation: Arc<AtomicU64>,
+    /// Linearizes cancellation/replacement against recovered identity commits.
+    generation_fence: Arc<std::sync::Mutex<()>>,
+    /// Serializes session setup so an older start cannot resume after relay
+    /// discovery and overwrite a newer session's shared state.
+    start_lock: tokio::sync::Mutex<()>,
     cancel: std::sync::Mutex<Option<CancellationToken>>,
     /// Send JSON-serialized events to the background WS task for relay publication.
     outbound_tx: std::sync::Mutex<Option<mpsc::Sender<String>>>,
     /// Pre-built payload string (contains nsec) to send after SAS confirmation.
     /// Wrapped in Zeroizing so the nsec is cleared from memory on drop.
     payload: std::sync::Mutex<Option<Zeroizing<String>>>,
+    mode: Arc<std::sync::Mutex<PairingMode>>,
 }
 
 impl PairingHandle {
@@ -50,9 +70,12 @@ impl PairingHandle {
         Self {
             session: Arc::new(tokio::sync::Mutex::new(None)),
             generation: Arc::new(AtomicU64::new(0)),
+            generation_fence: Arc::new(std::sync::Mutex::new(())),
+            start_lock: tokio::sync::Mutex::new(()),
             cancel: std::sync::Mutex::new(None),
             outbound_tx: std::sync::Mutex::new(None),
             payload: std::sync::Mutex::new(None),
+            mode: Arc::new(std::sync::Mutex::new(PairingMode::SendIdentity)),
         }
     }
 
@@ -63,21 +86,36 @@ impl PairingHandle {
     }
 }
 
-/// Start a NIP-AB pairing session as the source device.
-///
-/// Creates a `PairingSession`, connects to the relay, and returns the
-/// `nostrpair://` QR URI for the frontend to display. The mobile peer will
-/// receive the desktop's nsec (NIP-OA auth — no token minting needed).
+/// Start a NIP-AB pairing session that sends this desktop identity to mobile.
 #[tauri::command]
 pub async fn start_pairing(
     app: AppHandle,
     state: State<'_, AppState>,
     pairing: State<'_, PairingHandle>,
 ) -> Result<String, String> {
-    let task_generation = pairing
-        .generation
-        .fetch_add(1, Ordering::SeqCst)
-        .wrapping_add(1);
+    start_pairing_session(app, state, pairing, PairingMode::SendIdentity).await
+}
+
+/// Start a recovery session. The fresh desktop shows the QR and receives the
+/// full identity from an already-authorized phone after both users approve SAS.
+#[tauri::command]
+pub async fn start_identity_recovery_pairing(
+    app: AppHandle,
+    state: State<'_, AppState>,
+    pairing: State<'_, PairingHandle>,
+) -> Result<String, String> {
+    start_pairing_session(app, state, pairing, PairingMode::RecoverIdentity).await
+}
+
+async fn start_pairing_session(
+    app: AppHandle,
+    state: State<'_, AppState>,
+    pairing: State<'_, PairingHandle>,
+    mode: PairingMode,
+) -> Result<String, String> {
+    let _start_guard = pairing.start_lock.lock().await;
+    let task_generation =
+        invalidate_pairing_generation(&pairing.generation, &pairing.generation_fence)?;
     if let Some(token) = pairing.cancel.lock().map_err(|e| e.to_string())?.take() {
         token.cancel();
     }
@@ -86,54 +124,52 @@ pub async fn start_pairing(
         let mut session = pairing.session.lock().await;
         *session = None;
     }
-
-    let keys = state.signing_keys()?;
-    let nsec = keys
-        .secret_key()
-        .to_bech32()
-        .map_err(|e| format!("encode nsec: {e}"))?;
-    let pubkey_hex = keys.public_key().to_hex();
+    *pairing.mode.lock().map_err(|e| e.to_string())? = mode;
+    *pairing.payload.lock().map_err(|e| e.to_string())? = None;
 
     let ws_url = relay_ws_url_with_override(&state);
     let http_url = relay_api_base_url_with_override(&state);
-
-    // NIP-43 relays gate connections on membership, so an unpaired peer can't
-    // reach the main relay yet — it must go through the /pair sidecar. Open
-    // relays (no NIP-43) accept the peer directly. We key off the relay's
-    // own NIP-11 declaration of NIP-43 support rather than `auth_required`,
-    // which is also true for plain NIP-42 / NIP-OA relays where the main
-    // relay is reachable.
     let pairing_relay_url = resolve_pairing_relay_url(&ws_url, probe_pairing_relay(&ws_url).await)?;
-
     let (session, qr_payload) = PairingSession::new_source(pairing_relay_url.clone());
-    let qr_uri = encode_qr(&qr_payload);
+    let mut qr_uri = encode_qr(&qr_payload);
+    if mode == PairingMode::RecoverIdentity {
+        qr_uri.push_str("&mode=recover");
+    }
 
-    let payload_json = serde_json::json!({
-        "relayUrl": http_url,
-        "pubkey": pubkey_hex,
-        "nsec": nsec,
-    });
+    if mode == PairingMode::SendIdentity {
+        let keys = state.signing_keys()?;
+        let nsec = keys
+            .secret_key()
+            .to_bech32()
+            .map_err(|e| format!("encode nsec: {e}"))?;
+        let payload_json = serde_json::json!({
+            "relayUrl": http_url,
+            "pubkey": keys.public_key().to_hex(),
+            "nsec": nsec,
+        });
+        *pairing.payload.lock().map_err(|e| e.to_string())? =
+            Some(Zeroizing::new(payload_json.to_string()));
+    }
 
     {
-        let mut s = pairing.session.lock().await;
-        *s = Some(session);
+        let mut active = pairing.session.lock().await;
+        *active = Some(session);
     }
-    *pairing.payload.lock().map_err(|e| e.to_string())? =
-        Some(Zeroizing::new(payload_json.to_string()));
 
     let (outbound_tx, outbound_rx) = mpsc::channel::<String>(16);
     let cancel = CancellationToken::new();
-
     *pairing.outbound_tx.lock().map_err(|e| e.to_string())? = Some(outbound_tx);
     *pairing.cancel.lock().map_err(|e| e.to_string())? = Some(cancel.clone());
 
-    let session_arc = Arc::clone(&pairing.session);
-    let generation = Arc::clone(&pairing.generation);
     tauri::async_runtime::spawn(pairing_ws_task(
         pairing_relay_url,
-        session_arc,
-        generation,
-        task_generation,
+        Arc::clone(&pairing.session),
+        PairingTaskContext {
+            mode,
+            generation: Arc::clone(&pairing.generation),
+            generation_fence: Arc::clone(&pairing.generation_fence),
+            task_generation,
+        },
         cancel,
         outbound_rx,
         app,
@@ -161,27 +197,30 @@ pub async fn confirm_pairing_sas(pairing: State<'_, PairingHandle>) -> Result<()
 
     tx.send(sas_confirm_json)
         .await
-        .map_err(|_| "failed to send sas-confirm")?;
-
-    let payload = pairing
-        .payload
-        .lock()
-        .map_err(|e| e.to_string())?
-        .take()
-        .ok_or("no payload prepared")?;
+        .map_err(|_| "Pairing code expired. Create a new code and try again.")?;
 
-    let payload_json = {
-        let mut guard = pairing.session.lock().await;
-        let session = guard.as_mut().ok_or("no active pairing session")?;
-        let event = session
-            .send_payload(PayloadType::Custom, payload)
-            .map_err(|e| e.to_string())?;
-        event_to_relay_json(&event)
-    };
-
-    tx.send(payload_json)
-        .await
-        .map_err(|_| "failed to send payload")?;
+    let mode = *pairing.mode.lock().map_err(|e| e.to_string())?;
+    if mode == PairingMode::SendIdentity {
+        let payload = pairing
+            .payload
+            .lock()
+            .map_err(|e| e.to_string())?
+            .take()
+            .ok_or("no payload prepared")?;
+
+        let payload_json = {
+            let mut guard = pairing.session.lock().await;
+            let session = guard.as_mut().ok_or("no active pairing session")?;
+            let event = session
+                .send_payload(PayloadType::Custom, payload)
+                .map_err(|e| e.to_string())?;
+            event_to_relay_json(&event)
+        };
+
+        tx.send(payload_json)
+            .await
+            .map_err(|_| "failed to send payload")?;
+    }
 
     Ok(())
 }
@@ -189,6 +228,14 @@ pub async fn confirm_pairing_sas(pairing: State<'_, PairingHandle>) -> Result<()
 /// Cancel the active pairing session.
 #[tauri::command]
 pub async fn cancel_pairing(pairing: State<'_, PairingHandle>) -> Result<(), String> {
+    // Invalidate the task before waiting for its session lock. Recovery may be
+    // blocked on identity persistence after releasing this lock, and must see
+    // cancellation before crossing the durable commit boundary.
+    invalidate_pairing_generation(&pairing.generation, &pairing.generation_fence)?;
+    if let Some(token) = pairing.cancel.lock().map_err(|e| e.to_string())?.take() {
+        token.cancel();
+    }
+
     let abort_json = {
         let mut guard = pairing.session.lock().await;
         if let Some(session) = guard.as_mut() {
@@ -213,11 +260,6 @@ pub async fn cancel_pairing(pairing: State<'_, PairingHandle>) -> Result<(), Str
         }
     }
 
-    pairing.generation.fetch_add(1, Ordering::SeqCst);
-
-    if let Some(token) = pairing.cancel.lock().map_err(|e| e.to_string())?.take() {
-        token.cancel();
-    }
     pairing.clear();
 
     {
@@ -231,8 +273,7 @@ pub async fn cancel_pairing(pairing: State<'_, PairingHandle>) -> Result<(), Str
 async fn pairing_ws_task(
     relay_url: String,
     session: Arc<tokio::sync::Mutex<Option<PairingSession>>>,
-    generation: Arc<AtomicU64>,
-    task_generation: u64,
+    context: PairingTaskContext,
     cancel: CancellationToken,
     mut outbound_rx: mpsc::Receiver<String>,
     app: AppHandle,
@@ -240,26 +281,24 @@ async fn pairing_ws_task(
     if let Err(e) = pairing_ws_task_inner(
         &relay_url,
         &session,
-        &generation,
-        task_generation,
+        &context,
         &cancel,
         &mut outbound_rx,
         &app,
     )
     .await
     {
-        if pairing_task_is_current(&generation, task_generation) {
+        if pairing_task_is_current(&context.generation, context.task_generation) {
             let _ = app.emit("pairing-error", PairingErrorPayload { message: e });
         }
     }
-    clear_pairing_session_if_current(&session, &generation, task_generation).await;
+    clear_pairing_session_if_current(&session, &context.generation, context.task_generation).await;
 }
 
 async fn pairing_ws_task_inner(
     relay_url: &str,
     session: &Arc<tokio::sync::Mutex<Option<PairingSession>>>,
-    generation: &AtomicU64,
-    task_generation: u64,
+    context: &PairingTaskContext,
     cancel: &CancellationToken,
     outbound_rx: &mut mpsc::Receiver<String>,
     app: &AppHandle,
@@ -290,14 +329,14 @@ async fn pairing_ws_task_inner(
     tokio::pin!(hard_timeout);
 
     loop {
-        if !pairing_task_is_current(generation, task_generation) {
+        if !pairing_task_is_current(&context.generation, context.task_generation) {
             break;
         }
 
         tokio::select! {
             _ = cancel.cancelled() => break,
             _ = &mut hard_timeout => {
-                if pairing_task_is_current(generation, task_generation) {
+                if pairing_task_is_current(&context.generation, context.task_generation) {
                     let _ = app.emit("pairing-error", PairingErrorPayload {
                         message: "Session timed out".into(),
                     });
@@ -317,7 +356,7 @@ async fn pairing_ws_task_inner(
                 let Message::Text(text) = msg else { continue };
 
                 if let Some(event) = parse_relay_event(text.as_str(), "pair") {
-                    if !pairing_task_is_current(generation, task_generation) {
+                    if !pairing_task_is_current(&context.generation, context.task_generation) {
                         break;
                     }
 
@@ -325,7 +364,7 @@ async fn pairing_ws_task_inner(
                     let Some(s) = guard.as_mut() else { break };
 
                     if let Ok(reason) = s.handle_abort(&event) {
-                        if pairing_task_is_current(generation, task_generation) {
+                        if pairing_task_is_current(&context.generation, context.task_generation) {
                             let _ = app.emit("pairing-aborted", PairingAbortedPayload {
                                 reason: format!("{reason:?}"),
                             });
@@ -334,28 +373,83 @@ async fn pairing_ws_task_inner(
                     }
 
                     if let Ok(sas) = s.handle_offer(&event) {
-                        if pairing_task_is_current(generation, task_generation) {
+                        if pairing_task_is_current(&context.generation, context.task_generation) {
                             let _ = app.emit("pairing-sas-received", PairingSasPayload { sas });
                         }
                         continue;
                     }
 
-                    match s.handle_complete(&event) {
-                        Ok(()) => {
-                            if pairing_task_is_current(generation, task_generation) {
-                                let _ = app.emit("pairing-complete", serde_json::json!({}));
+                    if context.mode == PairingMode::RecoverIdentity {
+                        if let Ok((payload_type, payload)) = s.handle_return_payload(&event) {
+                            if let Err(message) = validate_recovery_payload_type(payload_type) {
+                                let complete = s
+                                    .send_source_complete(false)
+                                    .map_err(|e| e.to_string())?;
+                                write
+                                    .send(Message::Text(event_to_relay_json(&complete).into()))
+                                    .await
+                                    .map_err(|e| format!("publish complete failed: {e}"))?;
+                                if pairing_task_is_current(
+                                    &context.generation,
+                                    context.task_generation,
+                                ) {
+                                    let _ = app.emit(
+                                        "pairing-error",
+                                        PairingErrorPayload { message },
+                                    );
+                                }
+                                break;
                             }
+
+                            let payload = payload;
+                            drop(guard);
+
+                            let imported = import_recovered_identity(
+                                app,
+                                payload,
+                                &context.generation,
+                                &context.generation_fence,
+                                context.task_generation,
+                            )
+                            .await;
+                            let success = imported.is_ok();
+                            let complete = {
+                                let mut guard = session.lock().await;
+                                if !pairing_task_is_current(
+                                    &context.generation,
+                                    context.task_generation,
+                                ) {
+                                    break;
+                                }
+                                let Some(s) = guard.as_mut() else { break };
+                                s.send_source_complete(success)
+                                    .map_err(|e| e.to_string())?
+                            };
+                            let completion_result = write
+                                .send(Message::Text(event_to_relay_json(&complete).into()))
+                                .await
+                                .map_err(|e| format!("publish complete failed: {e}"));
+                            finish_recovery(imported, completion_result, context, app)?;
                             break;
                         }
-                        Err(ref e) if format!("{e}").contains("success=false") => {
-                            if pairing_task_is_current(generation, task_generation) {
-                                let _ = app.emit("pairing-error", PairingErrorPayload {
-                                    message: "Mobile device reported failure importing credentials".into(),
-                                });
+                    } else {
+                        match s.handle_complete(&event) {
+                            Ok(()) => {
+                                if pairing_task_is_current(&context.generation, context.task_generation) {
+                                    let _ = app.emit("pairing-complete", serde_json::json!({}));
+                                }
+                                break;
                             }
-                            break;
+                            Err(ref e) if format!("{e}").contains("success=false") => {
+                                if pairing_task_is_current(&context.generation, context.task_generation) {
+                                    let _ = app.emit("pairing-error", PairingErrorPayload {
+                                        message: "Mobile device reported failure importing credentials".into(),
+                                    });
+                                }
+                                break;
+                            }
+                            Err(_) => {}
                         }
-                        Err(_) => {}
                     }
                 }
             }
@@ -365,10 +459,111 @@ async fn pairing_ws_task_inner(
     Ok(())
 }
 
+async fn import_recovered_identity(
+    app: &AppHandle,
+    nsec: Zeroizing<String>,
+    generation: &Arc<AtomicU64>,
+    generation_fence: &Arc<std::sync::Mutex<()>>,
+    task_generation: u64,
+) -> Result<(), String> {
+    let app = app.clone();
+    let generation = Arc::clone(generation);
+    let generation_fence = Arc::clone(generation_fence);
+    tokio::task::spawn_blocking(move || {
+        let keys = nostr::Keys::parse(nsec.trim())
+            .map_err(|e| format!("Phone sent an invalid identity: {e}"))?;
+        let state = app.state::<AppState>();
+        let _mutation_guard = state.identity_mutation.lock().map_err(|e| e.to_string())?;
+        commit_recovery_if_current(&generation, &generation_fence, task_generation, || {
+            let data_dir = app
+                .path()
+                .app_data_dir()
+                .map_err(|e| format!("app data dir: {e}"))?;
+            std::fs::create_dir_all(&data_dir).map_err(|e| format!("create app data dir: {e}"))?;
+            let key_path = data_dir.join("identity.key");
+            crate::commands::identity::commit_imported_identity(&state, &data_dir, keys, |keys| {
+                let store =
+                    crate::secret_store::SecretStore::shared(crate::app_state::keyring_service());
+                crate::app_state::persist_imported_identity(store, keys, &key_path, &data_dir)
+            })?;
+            Ok(())
+        })
+    })
+    .await
+    .map_err(|e| format!("identity recovery task failed: {e}"))?
+}
+
+fn ensure_pairing_task_is_current(
+    generation: &AtomicU64,
+    task_generation: u64,
+) -> Result<(), String> {
+    if pairing_task_is_current(generation, task_generation) {
+        Ok(())
+    } else {
+        Err("Pairing session was superseded or cancelled".into())
+    }
+}
+
+fn invalidate_pairing_generation(
+    generation: &AtomicU64,
+    generation_fence: &std::sync::Mutex<()>,
+) -> Result<u64, String> {
+    let _fence = generation_fence.lock().map_err(|e| e.to_string())?;
+    Ok(generation.fetch_add(1, Ordering::SeqCst).wrapping_add(1))
+}
+
+fn commit_recovery_if_current<T>(
+    generation: &AtomicU64,
+    generation_fence: &std::sync::Mutex<()>,
+    task_generation: u64,
+    commit: impl FnOnce() -> Result<T, String>,
+) -> Result<T, String> {
+    let _fence = generation_fence.lock().map_err(|e| e.to_string())?;
+    ensure_pairing_task_is_current(generation, task_generation)?;
+    commit()
+}
+
+fn recovery_result_after_completion(
+    imported: Result<(), String>,
+    _completion_result: Result<(), String>,
+) -> Result<(), String> {
+    // Once the identity is durable, notifying the peer cannot roll it back.
+    imported
+}
+
+fn finish_recovery(
+    imported: Result<(), String>,
+    completion_result: Result<(), String>,
+    context: &PairingTaskContext,
+    app: &AppHandle,
+) -> Result<(), String> {
+    if !pairing_task_is_current(&context.generation, context.task_generation) {
+        return Ok(());
+    }
+
+    match recovery_result_after_completion(imported, completion_result) {
+        Ok(()) => {
+            let _ = app.emit("pairing-complete", serde_json::json!({}));
+        }
+        Err(message) => {
+            let _ = app.emit("pairing-error", PairingErrorPayload { message });
+        }
+    }
+    Ok(())
+}
+
 fn pairing_task_is_current(generation: &AtomicU64, task_generation: u64) -> bool {
     generation.load(Ordering::SeqCst) == task_generation
 }
 
+fn validate_recovery_payload_type(payload_type: PayloadType) -> Result<(), String> {
+    if payload_type == PayloadType::Nsec {
+        Ok(())
+    } else {
+        Err("Mobile device sent an unsupported recovery payload".into())
+    }
+}
+
 async fn clear_pairing_session_if_current(
     session: &Arc<tokio::sync::Mutex<Option<PairingSession>>>,
     generation: &AtomicU64,
@@ -590,143 +785,9 @@ where
 }
 
 #[cfg(test)]
-mod pairing_generation_tests {
-    use std::sync::atomic::{AtomicU64, Ordering};
-    use std::sync::Arc;
-
-    use super::{clear_pairing_session_if_current, PairingSession};
-
-    #[tokio::test]
-    async fn stale_task_does_not_clear_replacement_session() {
-        let (initial, _) = PairingSession::new_source("ws://initial.example".to_string());
-        let session = Arc::new(tokio::sync::Mutex::new(Some(initial)));
-        let generation = AtomicU64::new(1);
-
-        generation.store(2, Ordering::SeqCst);
-        let (replacement, _) = PairingSession::new_source("ws://replacement.example".to_string());
-        *session.lock().await = Some(replacement);
-
-        clear_pairing_session_if_current(&session, &generation, 1).await;
-
-        assert!(session.lock().await.is_some());
-    }
-
-    #[tokio::test]
-    async fn current_task_clears_its_session() {
-        let (active, _) = PairingSession::new_source("ws://active.example".to_string());
-        let session = Arc::new(tokio::sync::Mutex::new(Some(active)));
-        let generation = AtomicU64::new(3);
-
-        clear_pairing_session_if_current(&session, &generation, 3).await;
-
-        assert!(session.lock().await.is_none());
-    }
-}
+#[path = "pairing_generation_tests.rs"]
+mod pairing_generation_tests;
 
 #[cfg(test)]
-mod pairing_relay_tests {
-    use super::{
-        pairing_relay_from_nip11, probe_pairing_relay, resolve_pairing_relay_url, PairingRelay,
-    };
-    use tokio::io::{AsyncReadExt, AsyncWriteExt};
-
-    #[tokio::test]
-    async fn live_nip11_probe_discovers_configured_pairing_relay() {
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0")
-            .await
-            .expect("bind test NIP-11 server");
-        let addr = listener.local_addr().expect("test server address");
-        let server = tokio::spawn(async move {
-            let (mut stream, _) = listener.accept().await.expect("accept NIP-11 request");
-            let mut request = vec![0; 2048];
-            let bytes_read = stream.read(&mut request).await.expect("read request");
-            let request = String::from_utf8_lossy(&request[..bytes_read]);
-            assert!(request.starts_with("GET / HTTP/1.1"));
-            assert!(request
-                .to_ascii_lowercase()
-                .contains("accept: application/nostr+json"));
-
-            let body = r#"{"pairing_relay_url":"ws://127.0.0.1:5000"}"#;
-            let response = format!(
-                "HTTP/1.1 200 OK\r\nContent-Type: application/nostr+json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{body}",
-                body.len()
-            );
-            stream
-                .write_all(response.as_bytes())
-                .await
-                .expect("write response");
-        });
-
-        assert_eq!(
-            probe_pairing_relay(&format!("ws://{addr}")).await,
-            PairingRelay::Configured("ws://127.0.0.1:5000".to_string())
-        );
-        server.await.expect("NIP-11 server task");
-    }
-
-    #[test]
-    fn configured_pairing_relay_takes_precedence_over_legacy_path() {
-        let document = serde_json::json!({
-            "pairing_relay_url": "wss://pairing.buzz.xyz",
-            "supported_nips": [43]
-        });
-
-        assert_eq!(
-            pairing_relay_from_nip11(&document),
-            PairingRelay::Configured("wss://pairing.buzz.xyz".to_string())
-        );
-    }
-
-    #[test]
-    fn invalid_pairing_relay_url_falls_back_to_legacy_path() {
-        let document = serde_json::json!({
-            "pairing_relay_url": "https://pairing.buzz.xyz",
-            "supported_nips": [43]
-        });
-
-        assert_eq!(
-            pairing_relay_from_nip11(&document),
-            PairingRelay::LegacyPath
-        );
-    }
-
-    #[test]
-    fn document_without_pairing_configuration_uses_main_relay() {
-        let document = serde_json::json!({ "supported_nips": [1, 11] });
-
-        assert_eq!(pairing_relay_from_nip11(&document), PairingRelay::MainRelay);
-    }
-
-    #[test]
-    fn configured_pairing_relay_resolves_to_configured_url() {
-        let resolved = resolve_pairing_relay_url(
-            "wss://flint.communities.buzz.xyz",
-            PairingRelay::Configured("wss://pairing.buzz.xyz".to_string()),
-        )
-        .expect("resolve configured pairing relay");
-
-        assert_eq!(resolved, "wss://pairing.buzz.xyz");
-    }
-
-    #[test]
-    fn legacy_pairing_relay_appends_pair_path() {
-        let resolved = resolve_pairing_relay_url(
-            "wss://flint.communities.buzz.xyz/community",
-            PairingRelay::LegacyPath,
-        )
-        .expect("resolve legacy pairing relay");
-
-        assert_eq!(resolved, "wss://flint.communities.buzz.xyz/community/pair");
-    }
-
-    #[test]
-    fn main_relay_pairing_uses_main_relay_url() {
-        let resolved = resolve_pairing_relay_url(
-            "wss://sprout-oss.stage.blox.sqprod.co",
-            PairingRelay::MainRelay,
-        )
-        .expect("resolve main pairing relay");
-
-        assert_eq!(resolved, "wss://sprout-oss.stage.blox.sqprod.co");
-    }
-}
+#[path = "pairing_relay_tests.rs"]
+mod pairing_relay_tests;
diff --git a/desktop/src-tauri/src/commands/pairing_generation_tests.rs b/desktop/src-tauri/src/commands/pairing_generation_tests.rs
new file mode 100644
index 00000000000..8a2291ae86f
--- /dev/null
+++ b/desktop/src-tauri/src/commands/pairing_generation_tests.rs
@@ -0,0 +1,129 @@
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::Arc;
+use std::time::Duration;
+
+use super::{
+    clear_pairing_session_if_current, commit_recovery_if_current, invalidate_pairing_generation,
+    recovery_result_after_completion, validate_recovery_payload_type, PairingHandle,
+    PairingSession, PayloadType,
+};
+
+#[tokio::test]
+async fn overlapping_starts_are_serialized() {
+    let pairing = Arc::new(PairingHandle::new());
+    let first_pairing = Arc::clone(&pairing);
+    let (locked_tx, locked_rx) = tokio::sync::oneshot::channel();
+    let first = tokio::spawn(async move {
+        let _guard = first_pairing.start_lock.lock().await;
+        locked_tx.send(()).expect("signal acquired start lock");
+        tokio::time::sleep(Duration::from_millis(50)).await;
+    });
+
+    locked_rx.await.expect("first start acquired lock");
+    assert!(pairing.start_lock.try_lock().is_err());
+    first.await.expect("first start task");
+    assert!(pairing.start_lock.try_lock().is_ok());
+}
+
+#[test]
+fn recovery_rejects_non_nsec_payloads() {
+    assert!(validate_recovery_payload_type(PayloadType::Nsec).is_ok());
+    assert_eq!(
+        validate_recovery_payload_type(PayloadType::Custom).unwrap_err(),
+        "Mobile device sent an unsupported recovery payload"
+    );
+}
+
+#[test]
+fn superseded_recovery_cannot_commit_identity() {
+    let generation = AtomicU64::new(2);
+    let committed = std::sync::atomic::AtomicBool::new(false);
+
+    let generation_fence = std::sync::Mutex::new(());
+    let result = commit_recovery_if_current(&generation, &generation_fence, 1, || {
+        committed.store(true, Ordering::SeqCst);
+        Ok(())
+    });
+
+    assert_eq!(
+        result.unwrap_err(),
+        "Pairing session was superseded or cancelled"
+    );
+    assert!(!committed.load(Ordering::SeqCst));
+}
+
+#[test]
+fn invalidation_after_check_waits_for_identity_commit() {
+    let generation = Arc::new(AtomicU64::new(7));
+    let generation_fence = Arc::new(std::sync::Mutex::new(()));
+    let (checked_tx, checked_rx) = std::sync::mpsc::channel();
+    let (finish_tx, finish_rx) = std::sync::mpsc::channel();
+    let committed = Arc::new(std::sync::atomic::AtomicBool::new(false));
+
+    let recovery_generation = Arc::clone(&generation);
+    let recovery_fence = Arc::clone(&generation_fence);
+    let recovery_committed = Arc::clone(&committed);
+    let recovery = std::thread::spawn(move || {
+        commit_recovery_if_current(&recovery_generation, &recovery_fence, 7, || {
+            checked_tx.send(()).expect("signal generation checked");
+            finish_rx.recv().expect("release identity commit");
+            recovery_committed.store(true, Ordering::SeqCst);
+            Ok(())
+        })
+    });
+
+    checked_rx.recv().expect("generation checked");
+    let invalidation_generation = Arc::clone(&generation);
+    let invalidation_fence = Arc::clone(&generation_fence);
+    let (attempted_tx, attempted_rx) = std::sync::mpsc::channel();
+    let (invalidated_tx, invalidated_rx) = std::sync::mpsc::channel();
+    let invalidation = std::thread::spawn(move || {
+        attempted_tx.send(()).expect("signal invalidation attempt");
+        let next = invalidate_pairing_generation(&invalidation_generation, &invalidation_fence)
+            .expect("invalidate generation");
+        invalidated_tx.send(next).expect("signal invalidated");
+    });
+
+    attempted_rx.recv().expect("invalidation attempted");
+    assert!(invalidated_rx
+        .recv_timeout(Duration::from_millis(50))
+        .is_err());
+    assert!(!committed.load(Ordering::SeqCst));
+
+    finish_tx.send(()).expect("finish identity commit");
+    recovery.join().expect("recovery task").unwrap();
+    assert!(committed.load(Ordering::SeqCst));
+    assert_eq!(invalidated_rx.recv().expect("invalidation completed"), 8);
+    invalidation.join().expect("invalidation task");
+}
+
+#[test]
+fn completion_publish_failure_does_not_undo_successful_import() {
+    assert!(recovery_result_after_completion(Ok(()), Err("socket closed".into())).is_ok());
+}
+
+#[tokio::test]
+async fn stale_task_does_not_clear_replacement_session() {
+    let (initial, _) = PairingSession::new_source("ws://initial.example".to_string());
+    let session = Arc::new(tokio::sync::Mutex::new(Some(initial)));
+    let generation = AtomicU64::new(1);
+
+    generation.store(2, Ordering::SeqCst);
+    let (replacement, _) = PairingSession::new_source("ws://replacement.example".to_string());
+    *session.lock().await = Some(replacement);
+
+    clear_pairing_session_if_current(&session, &generation, 1).await;
+
+    assert!(session.lock().await.is_some());
+}
+
+#[tokio::test]
+async fn current_task_clears_its_session() {
+    let (active, _) = PairingSession::new_source("ws://active.example".to_string());
+    let session = Arc::new(tokio::sync::Mutex::new(Some(active)));
+    let generation = AtomicU64::new(3);
+
+    clear_pairing_session_if_current(&session, &generation, 3).await;
+
+    assert!(session.lock().await.is_none());
+}
diff --git a/desktop/src-tauri/src/commands/pairing_relay_tests.rs b/desktop/src-tauri/src/commands/pairing_relay_tests.rs
new file mode 100644
index 00000000000..f0e765eb9c5
--- /dev/null
+++ b/desktop/src-tauri/src/commands/pairing_relay_tests.rs
@@ -0,0 +1,104 @@
+use super::{
+    pairing_relay_from_nip11, probe_pairing_relay, resolve_pairing_relay_url, PairingRelay,
+};
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+
+#[tokio::test]
+async fn live_nip11_probe_discovers_configured_pairing_relay() {
+    let listener = tokio::net::TcpListener::bind("127.0.0.1:0")
+        .await
+        .expect("bind test NIP-11 server");
+    let addr = listener.local_addr().expect("test server address");
+    let server = tokio::spawn(async move {
+        let (mut stream, _) = listener.accept().await.expect("accept NIP-11 request");
+        let mut request = vec![0; 2048];
+        let bytes_read = stream.read(&mut request).await.expect("read request");
+        let request = String::from_utf8_lossy(&request[..bytes_read]);
+        assert!(request.starts_with("GET / HTTP/1.1"));
+        assert!(request
+            .to_ascii_lowercase()
+            .contains("accept: application/nostr+json"));
+
+        let body = r#"{"pairing_relay_url":"ws://127.0.0.1:5000"}"#;
+        let response = format!(
+                "HTTP/1.1 200 OK\r\nContent-Type: application/nostr+json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{body}",
+                body.len()
+            );
+        stream
+            .write_all(response.as_bytes())
+            .await
+            .expect("write response");
+    });
+
+    assert_eq!(
+        probe_pairing_relay(&format!("ws://{addr}")).await,
+        PairingRelay::Configured("ws://127.0.0.1:5000".to_string())
+    );
+    server.await.expect("NIP-11 server task");
+}
+
+#[test]
+fn configured_pairing_relay_takes_precedence_over_legacy_path() {
+    let document = serde_json::json!({
+        "pairing_relay_url": "wss://pairing.buzz.xyz",
+        "supported_nips": [43]
+    });
+
+    assert_eq!(
+        pairing_relay_from_nip11(&document),
+        PairingRelay::Configured("wss://pairing.buzz.xyz".to_string())
+    );
+}
+
+#[test]
+fn invalid_pairing_relay_url_falls_back_to_legacy_path() {
+    let document = serde_json::json!({
+        "pairing_relay_url": "https://pairing.buzz.xyz",
+        "supported_nips": [43]
+    });
+
+    assert_eq!(
+        pairing_relay_from_nip11(&document),
+        PairingRelay::LegacyPath
+    );
+}
+
+#[test]
+fn document_without_pairing_configuration_uses_main_relay() {
+    let document = serde_json::json!({ "supported_nips": [1, 11] });
+
+    assert_eq!(pairing_relay_from_nip11(&document), PairingRelay::MainRelay);
+}
+
+#[test]
+fn configured_pairing_relay_resolves_to_configured_url() {
+    let resolved = resolve_pairing_relay_url(
+        "wss://flint.communities.buzz.xyz",
+        PairingRelay::Configured("wss://pairing.buzz.xyz".to_string()),
+    )
+    .expect("resolve configured pairing relay");
+
+    assert_eq!(resolved, "wss://pairing.buzz.xyz");
+}
+
+#[test]
+fn legacy_pairing_relay_appends_pair_path() {
+    let resolved = resolve_pairing_relay_url(
+        "wss://flint.communities.buzz.xyz/community",
+        PairingRelay::LegacyPath,
+    )
+    .expect("resolve legacy pairing relay");
+
+    assert_eq!(resolved, "wss://flint.communities.buzz.xyz/community/pair");
+}
+
+#[test]
+fn main_relay_pairing_uses_main_relay_url() {
+    let resolved = resolve_pairing_relay_url(
+        "wss://sprout-oss.stage.blox.sqprod.co",
+        PairingRelay::MainRelay,
+    )
+    .expect("resolve main pairing relay");
+
+    assert_eq!(resolved, "wss://sprout-oss.stage.blox.sqprod.co");
+}
diff --git a/desktop/src-tauri/src/commands/personas/card.rs b/desktop/src-tauri/src/commands/personas/card.rs
index 29a5c35e6a7..14c7c196b2b 100644
--- a/desktop/src-tauri/src/commands/personas/card.rs
+++ b/desktop/src-tauri/src/commands/personas/card.rs
@@ -668,9 +668,9 @@ pub async fn mint_agent_card(
             .ok_or_else(|| "Agent avatar data URL could not be decoded.".to_string())?,
         Some(url) if url.starts_with("http://") || url.starts_with("https://") => {
             // Relay-hosted avatars (kind:0 pictures under the relay's /media/)
-            // may require Blossom get-auth (`require_media_get_auth`). Mint the
-            // header ONLY for same-origin URLs so the token never leaves the
-            // relay (same contract as `media_download.rs`).
+            // require Blossom get-auth. Mint the header ONLY for same-origin URLs
+            // so the token never leaves the relay (same contract as
+            // `media_download.rs`).
             let relay_base = crate::relay::relay_api_base_url_with_override(&state);
             let auth = is_same_origin(url, &relay_base)
                 .then(|| crate::commands::media::mint_media_get_auth(&state, &relay_base))
diff --git a/desktop/src-tauri/src/egress_guard_tests.rs b/desktop/src-tauri/src/egress_guard_tests.rs
index f487c8ce167..23cb2ba220c 100644
--- a/desktop/src-tauri/src/egress_guard_tests.rs
+++ b/desktop/src-tauri/src/egress_guard_tests.rs
@@ -156,14 +156,34 @@ async fn boundary_submit_signed_event_with_keys_blocks_ncryptsec() {
 fn boundary_huddle_stt_blocks_ncryptsec() {
     let keys = nostr::Keys::generate();
     let channel = uuid::Uuid::new_v4();
-    let builder =
-        crate::events::build_message(channel, NCRYPTSEC, None, &[], &[], &[], &[]).unwrap();
+    let builder = crate::events::build_message(
+        channel,
+        NCRYPTSEC,
+        None,
+        &[],
+        &[],
+        &[],
+        &[],
+        &[],
+        &crate::relay::relay_api_base_url(),
+    )
+    .unwrap();
     let err = crate::huddle::pipeline::sign_and_guard_stt_body(builder, &keys).unwrap_err();
     assert_guard_error(&err);
 
     // Clean transcripts pass through the same seam.
-    let builder =
-        crate::events::build_message(channel, "hello huddle", None, &[], &[], &[], &[]).unwrap();
+    let builder = crate::events::build_message(
+        channel,
+        "hello huddle",
+        None,
+        &[],
+        &[],
+        &[],
+        &[],
+        &[],
+        &crate::relay::relay_api_base_url(),
+    )
+    .unwrap();
     assert!(crate::huddle::pipeline::sign_and_guard_stt_body(builder, &keys).is_ok());
 }
 
diff --git a/desktop/src-tauri/src/events.rs b/desktop/src-tauri/src/events.rs
index 777d56d02ef..b7937419bf1 100644
--- a/desktop/src-tauri/src/events.rs
+++ b/desktop/src-tauri/src/events.rs
@@ -8,11 +8,9 @@
 //!
 //! Each function validates inputs and returns a nostr::EventBuilder.
 //! Signing and submission happen in relay::submit_event.
-
 use buzz_core_pkg::kind::{KIND_IA_ARCHIVE_REQUEST, KIND_IA_UNARCHIVE_REQUEST};
 use nostr::{EventBuilder, EventId, Kind, Tag};
 use uuid::Uuid;
-
 // ── Constants ────────────────────────────────────────────────────────────────
 
 /// Maximum content size — matches buzz-sdk (64 KiB).
@@ -180,7 +178,6 @@ pub fn build_leave(channel_id: Uuid) -> Result<EventBuilder, String> {
 }
 
 /// Kind 9002 — update channel name/description/visibility/ttl.
-///
 /// `ttl`: outer `None` leaves it unchanged; `Some(Some(secs))` sets the
 /// ephemeral timeout; `Some(None)` clears it (emits `["ttl", ""]`).
 pub fn build_update_channel(
@@ -295,6 +292,7 @@ pub fn build_remove_member(channel_id: Uuid, target_pubkey: &str) -> Result<Even
 // ── Messages ─────────────────────────────────────────────────────────────────
 
 /// Kind 9 — stream message.
+#[allow(clippy::too_many_arguments)]
 pub fn build_message(
     channel_id: Uuid,
     content: &str,
@@ -303,6 +301,8 @@ pub fn build_message(
     media_tags: &[Vec<String>],
     custom_emoji_tags: &[Vec<String>],
     mention_ref_tags: &[Vec<String>],
+    link_preview_tags: &[Vec<String>],
+    relay_base: &str,
 ) -> Result<EventBuilder, String> {
     build_message_with_client_tags(
         channel_id,
@@ -312,6 +312,8 @@ pub fn build_message(
         media_tags,
         custom_emoji_tags,
         mention_ref_tags,
+        link_preview_tags,
+        relay_base,
         &[],
     )
 }
@@ -330,6 +332,8 @@ pub fn build_message_with_client_tags(
     media_tags: &[Vec<String>],
     custom_emoji_tags: &[Vec<String>],
     mention_ref_tags: &[Vec<String>],
+    link_preview_tags: &[Vec<String>],
+    relay_base: &str,
     client_tags: &[Vec<String>],
 ) -> Result<EventBuilder, String> {
     check_content(content)?;
@@ -341,6 +345,7 @@ pub fn build_message_with_client_tags(
     imeta_tags(media_tags, &mut tags)?;
     emoji_tags(custom_emoji_tags, &mut tags)?;
     mention_reference_tags(mention_ref_tags, &mut tags)?;
+    crate::link_preview_tags::append(link_preview_tags, relay_base, &mut tags)?;
     append_client_tags(client_tags, &mut tags)?;
     Ok(EventBuilder::new(Kind::Custom(9), content).tags(tags))
 }
@@ -396,18 +401,8 @@ pub fn build_forum_comment(
     Ok(EventBuilder::new(Kind::Custom(45003), content).tags(tags))
 }
 
-/// Kind 40003 — edit a message. Carries the full new content AND a fresh
-/// imeta tag set; the receiver overlays the imeta tags onto the original
-/// event so the rendered message reflects exactly the edited state. NIP-30
-/// custom-emoji tags ride along the same way so an edited body's `:shortcode:`s
-/// stay resolvable (the send path attaches these too).
-///
-/// `mentions` carries the pubkeys of mentions that are *newly added* by this
-/// edit (the caller diffs the edited body against the original). Only those get
-/// a `p` tag so the newly-mentioned party is notified/woken, while a typo-fix
-/// edit that leaves the mention set unchanged emits no `p` tags and never
-/// re-wakes anyone. This mirrors the send path's `mention_tags` (dedup +
-/// lowercase); the receiver overlays these onto the original event's audience.
+/// Kind 40003 — edit a message with full content, media, emoji, mentions,
+/// and optional monotonic link-preview suppression.
 pub fn build_message_edit(
     channel_id: Uuid,
     target_event_id: EventId,
@@ -415,6 +410,7 @@ pub fn build_message_edit(
     media_tags: &[Vec<String>],
     custom_emoji_tags: &[Vec<String>],
     mentions: &[&str],
+    suppress_link_previews: bool,
 ) -> Result<EventBuilder, String> {
     check_content(content)?;
     let mut tags = vec![
@@ -424,6 +420,9 @@ pub fn build_message_edit(
     tags.extend(mention_tags(mentions)?);
     imeta_tags(media_tags, &mut tags)?;
     emoji_tags(custom_emoji_tags, &mut tags)?;
+    if suppress_link_previews {
+        tags.push(tag(vec!["link-preview", "none"])?);
+    }
     Ok(EventBuilder::new(Kind::Custom(40003), content).tags(tags))
 }
 
@@ -948,7 +947,8 @@ mod tests {
         let target =
             EventId::from_hex("d24da132115ca0a46233cf4c2ad8338fbf914250cbcaa9181a6dd59533cb5ac1")
                 .unwrap();
-        let builder = build_message_edit(channel, target, "hi @alice", &[], &[], mentions).unwrap();
+        let builder =
+            build_message_edit(channel, target, "hi @alice", &[], &[], mentions, false).unwrap();
         let secret = nostr::SecretKey::from_hex(
             "0000000000000000000000000000000000000000000000000000000000000003",
         )
diff --git a/desktop/src-tauri/src/huddle/pipeline.rs b/desktop/src-tauri/src/huddle/pipeline.rs
index e523ee22bf2..4d4e840104e 100644
--- a/desktop/src-tauri/src/huddle/pipeline.rs
+++ b/desktop/src-tauri/src/huddle/pipeline.rs
@@ -659,14 +659,23 @@ pub(crate) fn spawn_transcription_task(
                 .clone();
 
             let p_tags: Vec<&str> = agent_pubkeys.iter().map(|s| s.as_str()).collect();
-            let builder =
-                match events::build_message(channel_uuid, &t, None, &p_tags, &[], &[], &[]) {
-                    Ok(b) => b,
-                    Err(e) => {
-                        eprintln!("buzz-desktop: STT build_message: {e}");
-                        continue;
-                    }
-                };
+            let builder = match events::build_message(
+                channel_uuid,
+                &t,
+                None,
+                &p_tags,
+                &[],
+                &[],
+                &[],
+                &[],
+                &crate::relay::relay_api_base_url(),
+            ) {
+                Ok(b) => b,
+                Err(e) => {
+                    eprintln!("buzz-desktop: STT build_message: {e}");
+                    continue;
+                }
+            };
             // Wait before signing: the relay enforces NIP-98 freshness (±60s)
             // and the gate may hold for up to MAX_HINT_SECONDS (300s). Sign
             // the kind event and build NIP-98 auth after the wait so both
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index 2847b87877a..66816f8b988 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -12,6 +12,7 @@ mod huddle;
 mod identity_storage;
 mod initial_window;
 mod key_backup;
+mod link_preview_tags;
 mod linux_media;
 #[cfg(target_os = "macos")]
 mod macos_notifications;
@@ -82,7 +83,6 @@ use tauri::{Emitter, Manager, RunEvent, WindowEvent};
 use tauri_plugin_window_state::StateFlags;
 #[cfg(target_os = "macos")]
 use tray_menu::show_main_window;
-
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     // mesh-llm's async chains (model download, node start/join) overflow
@@ -672,7 +672,7 @@ pub fn run() {
             get_relay_ws_url,
             get_relay_http_url,
             get_media_proxy_port,
-            fetch_link_preview_title,
+            fetch_link_preview_metadata,
             discover_acp_auth_methods,
             discover_acp_providers,
             discover_git_bash_prerequisite,
@@ -880,6 +880,7 @@ pub fn run() {
             set_audio_output_device,
             get_audio_output_device,
             start_pairing,
+            start_identity_recovery_pairing,
             confirm_pairing_sas,
             cancel_pairing,
             apply_workspace,
diff --git a/desktop/src-tauri/src/link_preview_tags.rs b/desktop/src-tauri/src/link_preview_tags.rs
new file mode 100644
index 00000000000..fc57e2e47cd
--- /dev/null
+++ b/desktop/src-tauri/src/link_preview_tags.rs
@@ -0,0 +1,189 @@
+use nostr::Tag;
+use std::collections::HashSet;
+
+const MAX_SNAPSHOTS: usize = 8;
+const MAX_TITLE: usize = 300;
+const MAX_SITE: usize = 100;
+const MAX_DESCRIPTION: usize = 1000;
+
+fn valid_text(value: &str, max: usize, allow_newlines: bool) -> bool {
+    value.len() <= max
+        && !value
+            .chars()
+            .any(|character| character.is_control() && !(allow_newlines && character == '\n'))
+}
+
+fn valid_sha256(value: &str) -> bool {
+    value.len() == 64 && value.chars().all(|c| matches!(c, '0'..='9' | 'a'..='f'))
+}
+
+fn valid_media_pair(url: &str, hash: &str, relay_base: &url::Url) -> bool {
+    if url.is_empty() && hash.is_empty() {
+        return true;
+    }
+    if url.is_empty() || !valid_sha256(hash) {
+        return false;
+    }
+    let Ok(parsed) = url::Url::parse(url) else {
+        return false;
+    };
+    if parsed.origin() != relay_base.origin()
+        || !parsed.username().is_empty()
+        || parsed.password().is_some()
+        || parsed.query().is_some()
+        || parsed.fragment().is_some()
+    {
+        return false;
+    }
+    let Some(filename) = parsed.path().strip_prefix("/media/") else {
+        return false;
+    };
+    if filename.contains('/') || filename.contains('%') {
+        return false;
+    }
+    let Some((path_hash, ext)) = filename.split_once('.') else {
+        return false;
+    };
+    path_hash == hash && valid_sha256(path_hash) && matches!(ext, "jpg" | "png" | "gif" | "webp")
+}
+
+pub fn append(
+    preview_tags: &[Vec<String>],
+    relay_base: &str,
+    tags: &mut Vec<Tag>,
+) -> Result<(), String> {
+    if preview_tags.len() > MAX_SNAPSHOTS {
+        return Err(format!(
+            "too many link preview snapshots (max {MAX_SNAPSHOTS})"
+        ));
+    }
+    let base = url::Url::parse(relay_base).map_err(|_| "invalid relay base URL")?;
+    let mut seen = HashSet::new();
+    for preview_tag in preview_tags {
+        if preview_tag.as_slice() == ["link-preview", "none"] {
+            if preview_tags.len() != 1 {
+                return Err("link-preview suppression cannot include snapshots".into());
+            }
+            tags.push(
+                Tag::parse(["link-preview", "none"])
+                    .map_err(|e| format!("invalid link-preview tag: {e}"))?,
+            );
+            continue;
+        }
+        let valid = preview_tag.len() == 11
+            && preview_tag[0] == "link-preview"
+            && preview_tag[1] == "snapshot"
+            && preview_tag[2] == "1"
+            && url::Url::parse(&preview_tag[3]).is_ok_and(|url| {
+                url.scheme() == "https"
+                    && url.username().is_empty()
+                    && url.password().is_none()
+                    && url.fragment().is_none()
+            })
+            && seen.insert(preview_tag[3].clone())
+            && valid_text(&preview_tag[4], MAX_TITLE, false)
+            && valid_text(&preview_tag[5], MAX_SITE, false)
+            && valid_text(&preview_tag[6], MAX_DESCRIPTION, true)
+            && valid_media_pair(&preview_tag[7], &preview_tag[8], &base)
+            && valid_media_pair(&preview_tag[9], &preview_tag[10], &base);
+        if !valid {
+            return Err("invalid link-preview snapshot tag".into());
+        }
+        let parts: Vec<&str> = preview_tag.iter().map(String::as_str).collect();
+        tags.push(Tag::parse(parts).map_err(|e| format!("invalid link-preview tag: {e}"))?);
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const HASH: &str = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+    const BASE: &str = "https://relay.example";
+
+    fn tag(image_url: &str, image_hash: &str) -> Vec<String> {
+        [
+            "link-preview",
+            "snapshot",
+            "1",
+            "https://linear.app/acme/issue/ABC-123/example",
+            "Example",
+            "Linear",
+            "Description",
+            image_url,
+            image_hash,
+            "",
+            "",
+        ]
+        .map(str::to_string)
+        .to_vec()
+    }
+
+    #[test]
+    fn append_accepts_complete_local_snapshot() {
+        let mut tags = Vec::new();
+        append(
+            &[tag(&format!("{BASE}/media/{HASH}.png"), HASH)],
+            BASE,
+            &mut tags,
+        )
+        .unwrap();
+        assert_eq!(tags.len(), 1);
+    }
+
+    #[test]
+    fn append_accepts_blanket_suppression_by_itself() {
+        let mut tags = Vec::new();
+        append(
+            &[vec!["link-preview".into(), "none".into()]],
+            BASE,
+            &mut tags,
+        )
+        .unwrap();
+        assert_eq!(tags[0].as_slice(), ["link-preview", "none"]);
+        assert!(append(
+            &[vec!["link-preview".into(), "none".into()], tag("", ""),],
+            BASE,
+            &mut Vec::new(),
+        )
+        .is_err());
+    }
+
+    #[test]
+    fn append_accepts_description_newlines() {
+        let mut preview_tag = tag("", "");
+        preview_tag[6] = "First paragraph\n\nSecond paragraph".into();
+        assert!(append(&[preview_tag], BASE, &mut Vec::new()).is_ok());
+    }
+
+    #[test]
+    fn append_rejects_other_control_characters() {
+        let mut preview_tag = tag("", "");
+        preview_tag[6] = "Unsafe\tdescription".into();
+        assert!(append(&[preview_tag], BASE, &mut Vec::new()).is_err());
+    }
+
+    #[test]
+    fn append_rejects_untrusted_or_malformed_snapshot_media() {
+        for url in [
+            format!("https://evil.example/media/{HASH}.png"),
+            format!("{BASE}/media/{HASH}.png?token=leak"),
+            format!("{BASE}/media/{HASH}.png#fragment"),
+            format!("https://user@relay.example/media/{HASH}.png"),
+            format!("{BASE}/media/{HASH}.svg"),
+            format!("{BASE}/media/{HASH}.png/extra"),
+        ] {
+            assert!(
+                append(&[tag(&url, HASH)], BASE, &mut Vec::new()).is_err(),
+                "{url}"
+            );
+        }
+        assert!(append(
+            &[tag(&format!("{BASE}/media/{HASH}.png"), &"b".repeat(64))],
+            BASE,
+            &mut Vec::new(),
+        )
+        .is_err());
+    }
+}
diff --git a/desktop/src-tauri/src/managed_agents/env_vars.rs b/desktop/src-tauri/src/managed_agents/env_vars.rs
index 9ca5fd080de..de6ec28c41a 100644
--- a/desktop/src-tauri/src/managed_agents/env_vars.rs
+++ b/desktop/src-tauri/src/managed_agents/env_vars.rs
@@ -179,12 +179,14 @@ pub fn validate_user_env_keys(env_vars: &BTreeMap<String, String>) -> Result<(),
 /// Allowlist (case-insensitive):
 /// - `BUZZ_AGENT_PROVIDER`, `BUZZ_AGENT_MODEL` — agent runtime selection
 /// - `BUZZ_AGENT_THINKING_EFFORT` — non-secret enum (none/minimal/low/medium/high/xhigh/max)
+/// - `BUZZ_AGENT_THINKING_SUMMARY` — non-secret enum (auto/concise/detailed)
 /// - `DATABRICKS_HOST`, `DATABRICKS_MODEL` — Block non-secret defaults
 pub(crate) fn is_safe_to_reveal(key: &str) -> bool {
     const SAFE_KEYS: &[&str] = &[
         "BUZZ_AGENT_PROVIDER",
         "BUZZ_AGENT_MODEL",
         "BUZZ_AGENT_THINKING_EFFORT",
+        "BUZZ_AGENT_THINKING_SUMMARY",
         "DATABRICKS_HOST",
         "DATABRICKS_MODEL",
     ];
diff --git a/desktop/src-tauri/src/relay.rs b/desktop/src-tauri/src/relay.rs
index 71aa21c4133..7b636a4a822 100644
--- a/desktop/src-tauri/src/relay.rs
+++ b/desktop/src-tauri/src/relay.rs
@@ -652,9 +652,12 @@ mod tests {
 
     #[tokio::test]
     async fn oversized_hint_is_capped_in_relay_error_message_string() {
-        use crate::relay_admission::MAX_HINT_SECONDS;
+        use crate::relay_admission::{reset_rate_limit_gate, MAX_HINT_SECONDS, TEST_SERIAL};
         use std::io::{Read as _, Write as _};
 
+        let _serial = TEST_SERIAL.lock().await;
+        reset_rate_limit_gate();
+
         // Use a std::net listener on a std::thread — the same pattern as the
         // relay_admission loopback tests. This avoids two races that cause CI
         // failures with tokio::net + into_std():
@@ -702,6 +705,7 @@ mod tests {
             !msg.contains(&oversized.to_string()),
             "raw oversized hint must not appear in the message string"
         );
+        reset_rate_limit_gate();
     }
 
     // ── effective_agent_relay_url: legacy pin ignored ─────────────────────────
diff --git a/desktop/src-tauri/src/relay_admission.rs b/desktop/src-tauri/src/relay_admission.rs
index 15222f85908..4b0dd1f3696 100644
--- a/desktop/src-tauri/src/relay_admission.rs
+++ b/desktop/src-tauri/src/relay_admission.rs
@@ -42,6 +42,10 @@ pub const MAX_HINT_SECONDS: u64 = 300;
 
 static GATE_EXPIRY: Mutex<Option<Instant>> = Mutex::new(None);
 
+// The gate is process-wide, so every test that can arm it must serialize.
+#[cfg(test)]
+pub(crate) static TEST_SERIAL: tokio::sync::Mutex<()> = tokio::sync::Mutex::const_new(());
+
 /// Arm (or extend) the admission gate from a relay 429.
 ///
 /// `retry_in_seconds` is the parsed `retry in Ns` hint, if the relay provided
@@ -105,9 +109,8 @@ mod tests {
     use super::*;
 
     // The gate is a process-wide static shared by every test in this binary,
-    // so all gate tests serialize on one async lock to keep armed expiries
+    // so all tests that arm it serialize on one async lock to keep expiries
     // from bleeding between parallel test threads.
-    pub(crate) static TEST_SERIAL: tokio::sync::Mutex<()> = tokio::sync::Mutex::const_new(());
 
     #[tokio::test(start_paused = true)]
     async fn wait_returns_immediately_when_gate_is_inactive() {
diff --git a/desktop/src-tauri/src/terminal_runtime.rs b/desktop/src-tauri/src/terminal_runtime.rs
index 87f969592d5..840c0ee2573 100644
--- a/desktop/src-tauri/src/terminal_runtime.rs
+++ b/desktop/src-tauri/src/terminal_runtime.rs
@@ -113,6 +113,7 @@ pub(crate) struct WireSpan {
 #[serde(rename_all = "camelCase")]
 pub(crate) struct WireRow {
     line: usize,
+    wrapped: bool,
     spans: Vec<WireSpan>,
 }
 
@@ -187,6 +188,7 @@ fn wire_publication(publication: Publication) -> Result<FrameMessage> {
                 .collect::<Result<Vec<_>>>()?;
             Ok(WireRow {
                 line: row.line,
+                wrapped: row.wrapped,
                 spans,
             })
         })
@@ -819,7 +821,11 @@ mod tests {
             subscription_id: SubscriptionId::new(),
             sequence: 7,
             frame: buzz_terminal::damage::Frame {
-                rows: vec![RowFrame { line: 3, spans }],
+                rows: vec![RowFrame {
+                    line: 3,
+                    wrapped: true,
+                    spans,
+                }],
                 cursor: CursorFrame {
                     line: 1,
                     column: 2,
@@ -848,6 +854,7 @@ mod tests {
         Frame {
             rows: vec![RowFrame {
                 line: marker,
+                wrapped: false,
                 spans: Vec::new(),
             }],
             cursor: CursorFrame {
@@ -922,6 +929,12 @@ mod tests {
         assert_post_snapshot_capture_survives_attach(publisher);
     }
 
+    #[test]
+    fn mapper_preserves_soft_wrap_metadata() {
+        let message = wire_publication(publication(Vec::new())).unwrap();
+        assert!(message.rows[0].wrapped);
+    }
+
     #[test]
     fn mapper_expands_ascii_runs_without_unicode_classification() {
         let message = wire_publication(publication(vec![Span {
diff --git a/desktop/src-tauri/src/terminal_transport.rs b/desktop/src-tauri/src/terminal_transport.rs
index 548cd3087a8..b6f44844282 100644
--- a/desktop/src-tauri/src/terminal_transport.rs
+++ b/desktop/src-tauri/src/terminal_transport.rs
@@ -240,6 +240,7 @@ mod tests {
         Frame {
             rows: vec![RowFrame {
                 line: marker,
+                wrapped: false,
                 spans: Vec::new(),
             }],
             cursor: CursorFrame {
diff --git a/desktop/src-tauri/src/webkit_rendering.rs b/desktop/src-tauri/src/webkit_rendering.rs
index 905da5eeed8..c67816a0548 100644
--- a/desktop/src-tauri/src/webkit_rendering.rs
+++ b/desktop/src-tauri/src/webkit_rendering.rs
@@ -2,9 +2,14 @@
 //!
 //! WebKitGTK's dmabuf renderer aborts the web process during startup on some
 //! GPU/driver/compositor combinations, so Buzz comes up with no window at all
-//! and the user has no way to fix it (#2338, upstream tauri#9394). Setting
-//! `WEBKIT_DISABLE_DMABUF_RENDERER=1` avoids the abort by falling back to the
-//! shared-memory buffer path.
+//! and the user has no way to fix it (#2338, upstream tauri#9394).
+//!
+//! Historically Buzz set `WEBKIT_DISABLE_DMABUF_RENDERER=1`, which used to fall
+//! back to shared-memory buffers. On current WebKitGTK that variable leaves the
+//! transport mode empty, so `AcceleratedBackingStore::create()` returns null
+//! and the UI SIGSEGVs the first time compositing is needed (#3654).
+//! `WEBKIT_DMABUF_RENDERER_FORCE_SHM=1` is the documented replacement: it keeps
+//! SharedMemory in the transport set and still avoids the hardware dmabuf path.
 //!
 //! WebKit reads each of these variables exactly once per process, so the choice
 //! has to be made before anything initializes — there is no runtime toggle and
@@ -20,7 +25,7 @@
 //!
 //! This is the shape the Tauri ecosystem converged on: clash-verge-rev's
 //! `utils/linux/workarounds.rs` and screenpipe's `linux_webkit_env.rs` both set
-//! the same variable from the same signals at the same point in startup.
+//! WebKit dmabuf env vars from the same signals at the same point in startup.
 
 use std::ffi::{OsStr, OsString};
 use std::path::Path;
@@ -34,21 +39,30 @@ const NVIDIA_PCI_VENDOR: &str = "0x10de";
 /// Where DRM devices advertise their PCI vendor.
 const DRM_ROOT: &str = "/sys/class/drm";
 
-/// Drops the zero-copy dmabuf buffer path. The workaround for #2338.
+/// Prefer shared-memory dmabuf transport. The #3654 replacement for
+/// `WEBKIT_DISABLE_DMABUF_RENDERER` on current WebKitGTK.
+const FORCE_SHM: &str = "WEBKIT_DMABUF_RENDERER_FORCE_SHM";
+/// Legacy kill-switch. Still owned so operators can set `=0` / `=1` and take
+/// the decision away from this module, but never written by the heuristic
+/// (it crashes modern WebKitGTK — see #3654).
 const DISABLE_DMABUF: &str = "WEBKIT_DISABLE_DMABUF_RENDERER";
 /// Drops accelerated compositing as well. `--safe-rendering` only.
 const DISABLE_COMPOSITING: &str = "WEBKIT_DISABLE_COMPOSITING_MODE";
 
-/// What the heuristic applies: the #2338 workaround alone, matching the
-/// ecosystem precedents. `DISABLE_COMPOSITING` is deliberately not here — no
-/// report has isolated it as necessary, and it costs more rendering than this.
-const HEURISTIC: [&str; 1] = [DISABLE_DMABUF];
+/// What the heuristic applies: force shared-memory transport without emptying
+/// the buffer mode set (#3654).
+const HEURISTIC: [&str; 1] = [FORCE_SHM];
+
+/// What `--safe-rendering` applies: FORCE_SHM plus compositing off. Deliberately
+/// omits DISABLE_DMABUF — that variable is the #3654 crash on current WebKit.
+const SAFE_VARS: [&str; 2] = [FORCE_SHM, DISABLE_COMPOSITING];
 
-/// What `--safe-rendering` applies, which is also every variable this module may
-/// set and therefore every variable a user assignment takes away from it. Being
-/// the same list is the invariant: nothing outside it is ever written, so a user
-/// value for any other WebKit variable is not a conflict.
-const OWNED: [&str; 2] = [DISABLE_DMABUF, DISABLE_COMPOSITING];
+/// Every variable this module may set, and therefore every variable a user
+/// assignment takes away from it. Being the same list is the invariant: nothing
+/// outside it is ever written, so a user value for any other WebKit variable is
+/// not a conflict. DISABLE_DMABUF stays owned so `=0` still stands the heuristic
+/// down for operators who need the old path or an explicit override.
+const OWNED: [&str; 3] = [FORCE_SHM, DISABLE_DMABUF, DISABLE_COMPOSITING];
 
 /// Reads one environment variable. Injected so the decision is testable without
 /// mutating the process environment. `OsString` rather than `String` because
@@ -124,15 +138,29 @@ fn plan(
             true => Plan::Fatal {
                 diagnostic: conflict(&user_set),
             },
-            false => Plan::Leave {
-                why: format!("{} set in the environment", describe(&user_set)),
-            },
+            false => {
+                let mut why = format!("{} set in the environment", describe(&user_set));
+                // Older docs told people to export DISABLE_DMABUF=1; on current
+                // WebKitGTK that empties the transport and SIGSEGVs (#3654).
+                // Leave the takeover alone, but point survivors at FORCE_SHM.
+                if user_set
+                    .iter()
+                    .any(|(key, value)| *key == DISABLE_DMABUF && value.as_os_str() != "0")
+                {
+                    why.push_str(&format!(
+                        "; warning: {DISABLE_DMABUF} (other than =0) empties the \
+                         transport on current WebKitGTK and SIGSEGVs — prefer \
+                         {FORCE_SHM}=1 (see #3654)"
+                    ));
+                }
+                Plan::Leave { why }
+            }
         };
     }
 
     if safe_rendering {
         return Plan::Apply {
-            vars: &OWNED,
+            vars: &SAFE_VARS,
             why: format!("{SAFE_RENDERING} requested, this launch only"),
         };
     }
diff --git a/desktop/src-tauri/src/webkit_rendering/tests.rs b/desktop/src-tauri/src/webkit_rendering/tests.rs
index 5be1612b216..f9df47a9034 100644
--- a/desktop/src-tauri/src/webkit_rendering/tests.rs
+++ b/desktop/src-tauri/src/webkit_rendering/tests.rs
@@ -44,13 +44,13 @@ fn applied(plan: &Plan) -> Option<&[&str]> {
 // ── Detection ───────────────────────────────────────────────────────────────
 
 #[test]
-fn test_nvidia_gpu_disables_the_dmabuf_renderer() {
+fn test_nvidia_gpu_forces_shared_memory_dmabuf_transport() {
     let drm = drm(&["0x10de"]);
     let plan = plan(NO_ARGS, &env_from(&[]), drm.path());
 
     assert_eq!(
         applied(&plan),
-        Some(&["WEBKIT_DISABLE_DMABUF_RENDERER"][..])
+        Some(&["WEBKIT_DMABUF_RENDERER_FORCE_SHM"][..])
     );
     let Plan::Apply { why, .. } = &plan else {
         unreachable!()
@@ -66,7 +66,7 @@ fn test_an_nvidia_gpu_alongside_another_vendor_still_counts() {
 
     assert_eq!(
         applied(&plan(NO_ARGS, &env_from(&[]), drm.path())),
-        Some(&["WEBKIT_DISABLE_DMABUF_RENDERER"][..])
+        Some(&["WEBKIT_DMABUF_RENDERER_FORCE_SHM"][..])
     );
 }
 
@@ -76,12 +76,12 @@ fn test_the_vendor_id_match_ignores_case() {
 
     assert_eq!(
         applied(&plan(NO_ARGS, &env_from(&[]), drm.path())),
-        Some(&["WEBKIT_DISABLE_DMABUF_RENDERER"][..])
+        Some(&["WEBKIT_DMABUF_RENDERER_FORCE_SHM"][..])
     );
 }
 
 #[test]
-fn test_an_appimage_launch_disables_the_dmabuf_renderer() {
+fn test_an_appimage_launch_forces_shared_memory_dmabuf_transport() {
     // No NVIDIA GPU: the AppImage signal has to carry this on its own, which is
     // #2338's reporter (Intel Mesa under the AppRun's pinned XWayland backend).
     let drm = drm(&["0x8086"]);
@@ -90,7 +90,7 @@ fn test_an_appimage_launch_disables_the_dmabuf_renderer() {
 
     assert_eq!(
         applied(&plan),
-        Some(&["WEBKIT_DISABLE_DMABUF_RENDERER"][..])
+        Some(&["WEBKIT_DMABUF_RENDERER_FORCE_SHM"][..])
     );
     let Plan::Apply { why, .. } = &plan else {
         unreachable!()
@@ -133,7 +133,7 @@ fn test_a_device_without_a_vendor_file_is_skipped_not_fatal() {
 
     assert_eq!(
         applied(&plan(NO_ARGS, &env_from(&[]), root.path())),
-        Some(&["WEBKIT_DISABLE_DMABUF_RENDERER"][..])
+        Some(&["WEBKIT_DMABUF_RENDERER_FORCE_SHM"][..])
     );
 }
 
@@ -153,6 +153,34 @@ fn test_a_user_set_variable_disables_the_heuristic_wholesale() {
     assert!(why.contains("WEBKIT_DISABLE_DMABUF_RENDERER=0"), "{why}");
 }
 
+#[test]
+fn test_a_user_set_force_shm_also_stands_the_heuristic_down() {
+    // FORCE_SHM joined OWNED in the #3654 swap; a user export must take the
+    // whole decision away, same as the older DISABLE_DMABUF takeover.
+    let drm = drm(&["0x10de"]);
+    let env = env_from(&[(FORCE_SHM, "1")]);
+    let plan = plan(NO_ARGS, &env, drm.path());
+
+    let Plan::Leave { why } = &plan else {
+        panic!("a user FORCE_SHM assignment must not be overwritten: {plan:?}");
+    };
+    assert!(why.contains("WEBKIT_DMABUF_RENDERER_FORCE_SHM=1"), "{why}");
+}
+
+#[test]
+fn test_user_set_disable_dmabuf_one_warns_about_the_crashy_var() {
+    let drm = drm(&["0x10de"]);
+    let env = env_from(&[(DISABLE_DMABUF, "1")]);
+    let plan = plan(NO_ARGS, &env, drm.path());
+
+    let Plan::Leave { why } = &plan else {
+        panic!("expected Leave: {plan:?}");
+    };
+    assert!(why.contains("WEBKIT_DISABLE_DMABUF_RENDERER=1"), "{why}");
+    assert!(why.contains("WEBKIT_DMABUF_RENDERER_FORCE_SHM"), "{why}");
+    assert!(why.contains("#3654"), "{why}");
+}
+
 #[test]
 fn test_an_empty_assignment_is_still_a_user_assignment() {
     let drm = drm(&["0x10de"]);
@@ -192,7 +220,7 @@ fn test_safe_rendering_applies_the_safest_set_without_any_hardware_signal() {
         applied(&plan),
         Some(
             &[
-                "WEBKIT_DISABLE_DMABUF_RENDERER",
+                "WEBKIT_DMABUF_RENDERER_FORCE_SHM",
                 "WEBKIT_DISABLE_COMPOSITING_MODE"
             ][..]
         )
diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json
index 39950d59028..3f332ddbf1a 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.5",
+  "version": "0.5.8",
   "identifier": "xyz.block.buzz.app",
   "build": {
     "beforeDevCommand": {
diff --git a/desktop/src-tauri/tests/csp.rs b/desktop/src-tauri/tests/csp.rs
index a8cc880e41d..3497c368632 100644
--- a/desktop/src-tauri/tests/csp.rs
+++ b/desktop/src-tauri/tests/csp.rs
@@ -195,7 +195,10 @@ fn connect_src_allows_ipc_and_cleartext_relays() {
 fn script_src_stays_free_of_unsafe_inline_and_eval() {
     let allowed = sources("script-src");
     // The inline boot script in index.html is covered by Tauri's build-time
-    // sha256 hashing, so neither escape hatch is ever needed here.
+    // SHA-256 hashing (scripts only — Tauri nonces inline <style> elements via
+    // a different path), so neither escape hatch is ever needed here. The boot
+    // background style was moved to public/boot.css to avoid the nonce path for
+    // style-src; see boot.css for the full rationale.
     assert!(!allowed.contains(&"'unsafe-inline'".to_owned()));
     assert!(!allowed.contains(&"'unsafe-eval'".to_owned()));
 }
diff --git a/desktop/src/app/App.tsx b/desktop/src/app/App.tsx
index 811da043f92..0f311f3a650 100644
--- a/desktop/src/app/App.tsx
+++ b/desktop/src/app/App.tsx
@@ -706,6 +706,7 @@ function MachineBootstrap({ sharedIdentity }: { sharedIdentity: boolean }) {
       <MachineOnboardingFlow
         complete={completeMachineOnboarding}
         continueWithIdentity={machine.continueWithIdentity}
+        continueWithRecoveredIdentity={machine.continueWithRecoveredIdentity}
         identityLost={machine.identityLost}
         initialPage={machineInitialPage}
         navigateAfterComplete={navigateAfterOnboarding}
diff --git a/desktop/src/app/AppShell.tsx b/desktop/src/app/AppShell.tsx
index f765b843b3b..e4233a8fae6 100644
--- a/desktop/src/app/AppShell.tsx
+++ b/desktop/src/app/AppShell.tsx
@@ -173,9 +173,11 @@ export function AppShell() {
   const identityQuery = useIdentityQuery();
   const { mutedChannelIds, muteChannel, unmuteChannel } = useChannelMutes(
     identityQuery.data?.pubkey,
+    communitiesHook.activeCommunity?.relayUrl,
   );
   const { starredChannelIds, starChannel, unstarChannel } = useChannelStars(
     identityQuery.data?.pubkey,
+    communitiesHook.activeCommunity?.relayUrl,
   );
   usePersonaSync(
     identityQuery.data?.pubkey,
@@ -786,7 +788,7 @@ export function AppShell() {
               />
             ) : null}
             <SidebarProvider
-              className="relative z-10 min-h-0 flex-1 flex-col overflow-visible"
+              className="relative z-10 min-h-0 min-w-0 flex-1 flex-col overflow-visible"
               data-testid="app-sidebar-layer"
             >
               <AppProfilePanelProvider>
diff --git a/desktop/src/app/RootErrorBoundary.test.mjs b/desktop/src/app/RootErrorBoundary.test.mjs
new file mode 100644
index 00000000000..09cfed47465
--- /dev/null
+++ b/desktop/src/app/RootErrorBoundary.test.mjs
@@ -0,0 +1,84 @@
+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",
+});
+const originalConsoleError = console.error;
+
+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();
+  console.error = originalConsoleError;
+});
+
+after(() => dom.window.close());
+
+test("ThemeProvider renders defaults when localStorage reads are denied", async () => {
+  const deniedStorage = {
+    getItem() {
+      throw new dom.window.DOMException("private diagnostic", "SecurityError");
+    },
+    setItem() {
+      throw new dom.window.DOMException("private diagnostic", "SecurityError");
+    },
+    removeItem() {
+      throw new dom.window.DOMException("private diagnostic", "SecurityError");
+    },
+  };
+  Object.defineProperty(dom.window, "localStorage", {
+    configurable: true,
+    value: deniedStorage,
+  });
+
+  const { createElement } = await import("react");
+  const { render, screen } = await import("@testing-library/react");
+  const { ThemeProvider } = await import("@/shared/theme/ThemeProvider");
+
+  render(
+    createElement(
+      ThemeProvider,
+      { defaultTheme: "buzz" },
+      createElement("p", null, "Buzz is visible"),
+    ),
+  );
+
+  assert.ok(screen.getByText("Buzz is visible"));
+});
+
+test("root boundary shows recovery UI without exposing error details", async () => {
+  const diagnostic = "/Users/alice/private/session-token";
+  console.error = () => {};
+
+  const { createElement } = await import("react");
+  const { render, screen } = await import("@testing-library/react");
+  const { RootErrorBoundary } = await import("./RootErrorBoundary.tsx");
+  function ThrowingProvider() {
+    throw new Error(diagnostic);
+  }
+
+  render(
+    createElement(RootErrorBoundary, null, createElement(ThrowingProvider)),
+  );
+
+  assert.ok(screen.getByText("Buzz failed to start"));
+  assert.ok(screen.getByRole("button", { name: "Reload" }));
+  assert.equal(document.body.textContent.includes(diagnostic), false);
+  assert.match(document.body.textContent, /contact support/i);
+});
diff --git a/desktop/src/app/RootErrorBoundary.tsx b/desktop/src/app/RootErrorBoundary.tsx
new file mode 100644
index 00000000000..0c4bbe80b0f
--- /dev/null
+++ b/desktop/src/app/RootErrorBoundary.tsx
@@ -0,0 +1,58 @@
+import { Component, type ReactNode } from "react";
+
+type RootErrorBoundaryProps = {
+  children: ReactNode;
+};
+
+type RootErrorBoundaryState = {
+  error: Error | null;
+};
+
+/**
+ * Root-level render fence for the desktop app (block/buzz#5078).
+ *
+ * Any uncaught throw inside the React tree — in particular a WebKit
+ * `SecurityError` from `localStorage.getItem` under a denied-storage origin,
+ * before the `safeStorage` accessors have a chance to fence it — previously
+ * propagated to the reconciler's error boundary (there isn't one) and left
+ * the window blank. This boundary renders a degraded splash instead so the
+ * user always sees something actionable, and the throw is logged at least
+ * once for diagnosis.
+ */
+export class RootErrorBoundary extends Component<
+  RootErrorBoundaryProps,
+  RootErrorBoundaryState
+> {
+  override state: RootErrorBoundaryState = { error: null };
+
+  static getDerivedStateFromError(error: unknown): RootErrorBoundaryState {
+    return { error: error instanceof Error ? error : new Error(String(error)) };
+  }
+
+  override componentDidCatch(error: unknown, info: React.ErrorInfo): void {
+    console.error("[RootErrorBoundary] uncaught render error:", error, info);
+  }
+
+  override render(): ReactNode {
+    const { error } = this.state;
+    if (error) {
+      return (
+        <div className="flex h-screen w-screen flex-col items-center justify-center gap-3 bg-background px-6 text-foreground">
+          <p className="text-base font-semibold">Buzz failed to start</p>
+          <p className="max-w-md text-center text-sm text-muted-foreground">
+            Reload Buzz to try again. If this keeps happening, check that Buzz
+            can access website data, then contact support.
+          </p>
+          <button
+            type="button"
+            className="rounded-md border border-border bg-secondary px-4 py-2 text-sm hover:bg-secondary/80"
+            onClick={() => window.location.reload()}
+          >
+            Reload
+          </button>
+        </div>
+      );
+    }
+    return this.props.children;
+  }
+}
diff --git a/desktop/src/app/useAppShellDesktopNotifications.ts b/desktop/src/app/useAppShellDesktopNotifications.ts
index f739e900dfb..6792faf21a7 100644
--- a/desktop/src/app/useAppShellDesktopNotifications.ts
+++ b/desktop/src/app/useAppShellDesktopNotifications.ts
@@ -5,6 +5,7 @@ import {
   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";
 import {
@@ -45,6 +46,13 @@ export function useAppShellDesktopNotifications({
   pubkey?: string;
   silentChannelIds?: ReadonlySet<string>;
 }) {
+  // Roster alerts are owner/admin-only and self-gating; mounted here because
+  // it shares this hook's "desktop notifications are on" precondition and
+  // AppShell sits at the file-size ratchet ceiling.
+  useCommunityJoinAlerts({
+    enabled: enabled && notificationSettings.desktopEnabled,
+  });
+
   const handleChannelNotification = React.useEffectEvent(
     (_channelId: string, event: RelayEvent) => {
       if (!enabled) return;
diff --git a/desktop/src/features/agents/AGENTS.md b/desktop/src/features/agents/AGENTS.md
index b929dbb6131..b578326eba3 100644
--- a/desktop/src/features/agents/AGENTS.md
+++ b/desktop/src/features/agents/AGENTS.md
@@ -113,13 +113,16 @@ with a TypeScript lookup table or an id comparison in a component.
    Once the Advanced toggle is visible, its expanded state is exclusively
    user-controlled: provider, harness, and required-env changes must never
    open it automatically in defaults, create, or edit flows. In Create mode,
-   the defaults summary follows preferred-harness changes saved while the
-   dialog is open, and its configured state includes required credentials as
-   well as provider/model values. If no available harness can resolve, Create
-   starts in Customize and lets unavailable catalog entries be selected only
-   to expose their setup guidance; submission remains blocked.
-   Advanced-only required credentials mark the collapsed Advanced toggle
-   without opening it in Global Defaults and Edit, and block incomplete saves.
+   `Run on` belongs in Advanced directly after **Who can send instructions**;
+   keep it out of the basic create fields. The defaults summary follows
+   preferred-harness changes saved while the dialog is open, and its configured
+   state includes required credentials as well as provider/model values. If no
+   available harness can resolve, Create starts in Customize and lets unavailable
+   catalog entries be selected only to expose their setup guidance; submission
+   remains blocked.
+   Advanced-only required credentials and incomplete remote **Run on** setup
+   mark the collapsed Advanced toggle without opening it, and block incomplete
+   saves.
    Runtime-file credentials satisfy Global Defaults just as they do Create and
    Edit. In Edit,
    selecting Custom command keeps its required command field beside the harness
diff --git a/desktop/src/features/agents/channelAttachmentFailure.ts b/desktop/src/features/agents/channelAttachmentFailure.ts
deleted file mode 100644
index e3248829af4..00000000000
--- a/desktop/src/features/agents/channelAttachmentFailure.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export type AgentChannelAttachmentFailure = {
-  channelName: string;
-  error: string;
-};
diff --git a/desktop/src/features/agents/lib/agentAutocompleteEligibility.test.mjs b/desktop/src/features/agents/lib/agentAutocompleteEligibility.test.mjs
index 2cb2068d513..0f911ad41bf 100644
--- a/desktop/src/features/agents/lib/agentAutocompleteEligibility.test.mjs
+++ b/desktop/src/features/agents/lib/agentAutocompleteEligibility.test.mjs
@@ -336,7 +336,7 @@ test("shouldHideAgentFromMentions: normalizes the pubkey before lookup", () => {
   );
 });
 
-test("coalesceAgentAutocompleteCandidates: merges agents with the same persona id", () => {
+test("coalesceAgentAutocompleteCandidates: keeps agents with the same persona id distinct", () => {
   const first = makeAgent({ pubkey: PUB_A, personaId: "pinky" });
   const second = makeAgent({
     pubkey: PUB_B,
@@ -344,10 +344,10 @@ test("coalesceAgentAutocompleteCandidates: merges agents with the same persona i
     isMember: true,
   });
 
-  assert.deepEqual(coalesce([first, second]), [second]);
+  assert.deepEqual(coalesce([first, second]), [first, second]);
 });
 
-test("coalesceAgentAutocompleteCandidates: merges agents with the same owner and name", () => {
+test("coalesceAgentAutocompleteCandidates: keeps agents with the same owner and name distinct", () => {
   const first = makeAgent({ pubkey: PUB_A, ownerPubkey: OWNER_PUBKEY });
   const second = makeAgent({
     pubkey: PUB_B,
@@ -355,7 +355,7 @@ test("coalesceAgentAutocompleteCandidates: merges agents with the same owner and
     isMember: true,
   });
 
-  assert.deepEqual(coalesce([first, second]), [second]);
+  assert.deepEqual(coalesce([first, second]), [first, second]);
 });
 
 test("coalesceAgentAutocompleteCandidates: keeps same-name agents with different owners distinct", () => {
@@ -382,7 +382,7 @@ test("coalesceAgentAutocompleteCandidates: keeps owner-less managed same-name ag
   assert.deepEqual(coalesce([first, second]), [first, second]);
 });
 
-test("coalesceAgentAutocompleteCandidates: merges current-owner same-name agents", () => {
+test("coalesceAgentAutocompleteCandidates: keeps current-owner same-name agents distinct", () => {
   const first = makeAgent({ pubkey: PUB_A, ownerPubkey: CURRENT_PUBKEY });
   const second = makeAgent({
     pubkey: PUB_B,
@@ -390,6 +390,16 @@ test("coalesceAgentAutocompleteCandidates: merges current-owner same-name agents
     isManagedAgent: true,
   });
 
+  assert.deepEqual(coalesce([first, second]), [first, second]);
+});
+
+test("coalesceAgentAutocompleteCandidates: coalesces repeated source rows for the same pubkey", () => {
+  const first = makeAgent({ pubkey: PUB_A });
+  const second = makeAgent({
+    pubkey: PUB_A.toUpperCase(),
+    isMember: true,
+  });
+
   assert.deepEqual(coalesce([first, second]), [second]);
 });
 
diff --git a/desktop/src/features/agents/lib/agentAutocompleteEligibility.ts b/desktop/src/features/agents/lib/agentAutocompleteEligibility.ts
index 0abdad82fa6..3fb4e23c154 100644
--- a/desktop/src/features/agents/lib/agentAutocompleteEligibility.ts
+++ b/desktop/src/features/agents/lib/agentAutocompleteEligibility.ts
@@ -184,75 +184,39 @@ type AgentAutocompleteCandidate = {
   personaId?: string | null;
 };
 
-function normalizeLabel(label: string | null | undefined) {
-  return label?.trim().toLowerCase() || null;
-}
-
-function agentIdentityKey<T extends AgentAutocompleteCandidate>(
-  candidate: T,
-  currentPubkey: string | null | undefined,
-  getLabel: (candidate: T) => string | null | undefined,
-) {
-  if (candidate.isAgent !== true) {
-    return null;
-  }
-
-  if (candidate.personaId) {
-    return `persona:${candidate.personaId}`;
-  }
-
-  const label = normalizeLabel(getLabel(candidate));
-  if (!label) {
+function agentIdentityKey<T extends AgentAutocompleteCandidate>(candidate: T) {
+  if (candidate.isAgent !== true || !candidate.pubkey) {
     return null;
   }
 
-  const ownerPubkey = candidate.ownerPubkey
-    ? normalizePubkey(candidate.ownerPubkey)
-    : null;
-  if (ownerPubkey) {
-    if (currentPubkey && ownerPubkey === normalizePubkey(currentPubkey)) {
-      return `local:name:${label}`;
-    }
-    return `owner:${ownerPubkey}:name:${label}`;
-  }
-
-  return null;
+  // Pubkeys—not persona metadata or a display name—are agent identities.
+  // A persona may be installed more than once, and an owner may intentionally
+  // create multiple same-named agents. Collapsing either case makes one agent
+  // impossible to choose from autocomplete.
+  return `pubkey:${normalizePubkey(candidate.pubkey)}`;
 }
 
 function agentCandidateRank<T extends AgentAutocompleteCandidate>(
   candidate: T,
-  currentPubkey: string | null | undefined,
   preferredPubkeys: ReadonlySet<string>,
 ) {
   const pubkey = candidate.pubkey ? normalizePubkey(candidate.pubkey) : null;
-  const ownerPubkey = candidate.ownerPubkey
-    ? normalizePubkey(candidate.ownerPubkey)
-    : null;
-  const normalizedCurrentPubkey = currentPubkey
-    ? normalizePubkey(currentPubkey)
-    : null;
 
   return [
     candidate.isMember === true ? 0 : 1,
     pubkey && preferredPubkeys.has(pubkey) ? 0 : 1,
     candidate.isManagedAgent === true ? 0 : 1,
     candidate.personaId ? 0 : 1,
-    ownerPubkey && ownerPubkey === normalizedCurrentPubkey ? 0 : 1,
   ];
 }
 
 function isPreferredAgentCandidate<T extends AgentAutocompleteCandidate>(
   next: T,
   current: T,
-  currentPubkey: string | null | undefined,
   preferredPubkeys: ReadonlySet<string>,
 ) {
-  const nextRank = agentCandidateRank(next, currentPubkey, preferredPubkeys);
-  const currentRank = agentCandidateRank(
-    current,
-    currentPubkey,
-    preferredPubkeys,
-  );
+  const nextRank = agentCandidateRank(next, preferredPubkeys);
+  const currentRank = agentCandidateRank(current, preferredPubkeys);
 
   for (let index = 0; index < nextRank.length; index++) {
     if (nextRank[index] !== currentRank[index]) {
@@ -291,8 +255,8 @@ export function coalesceAgentAutocompleteCandidates<
 >(
   candidates: readonly T[],
   {
-    currentPubkey,
-    getLabel,
+    currentPubkey: _currentPubkey,
+    getLabel: _getLabel,
     preferredPubkeys = new Set(),
   }: {
     currentPubkey?: string | null;
@@ -304,7 +268,7 @@ export function coalesceAgentAutocompleteCandidates<
   const indexesByKey = new Map<string, number>();
 
   for (const candidate of candidates) {
-    const key = agentIdentityKey(candidate, currentPubkey, getLabel);
+    const key = agentIdentityKey(candidate);
     if (!key) {
       output.push(candidate);
       continue;
@@ -321,7 +285,6 @@ export function coalesceAgentAutocompleteCandidates<
       isPreferredAgentCandidate(
         candidate,
         output[currentIndex],
-        currentPubkey,
         preferredPubkeys,
       )
     ) {
diff --git a/desktop/src/features/agents/lib/agentCardAvatar.test.mjs b/desktop/src/features/agents/lib/agentCardAvatar.test.mjs
new file mode 100644
index 00000000000..5acd9ae109b
--- /dev/null
+++ b/desktop/src/features/agents/lib/agentCardAvatar.test.mjs
@@ -0,0 +1,37 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  isAgentCardAvatarLoading,
+  resolveAgentCardAvatarUrl,
+} from "./agentCardAvatar.ts";
+
+test("running agent card prefers the pubkey profile avatar", () => {
+  assert.equal(
+    resolveAgentCardAvatarUrl(
+      "https://relay.example/instance.png",
+      "https://relay.example/definition.png",
+    ),
+    "https://relay.example/instance.png",
+  );
+});
+
+test("running agent card falls back to the definition avatar", () => {
+  assert.equal(
+    resolveAgentCardAvatarUrl(null, " https://relay.example/definition.png "),
+    "https://relay.example/definition.png",
+  );
+});
+
+test("running agent card ignores blank avatar values", () => {
+  assert.equal(resolveAgentCardAvatarUrl("  ", ""), null);
+});
+
+test("linked agent actions wait for the authoritative profile avatar", () => {
+  assert.equal(isAgentCardAvatarLoading(true, true), true);
+  assert.equal(isAgentCardAvatarLoading(true, false), false);
+});
+
+test("unlinked persona actions do not wait for a profile", () => {
+  assert.equal(isAgentCardAvatarLoading(false, true), false);
+});
diff --git a/desktop/src/features/agents/lib/agentCardAvatar.ts b/desktop/src/features/agents/lib/agentCardAvatar.ts
new file mode 100644
index 00000000000..057c413daac
--- /dev/null
+++ b/desktop/src/features/agents/lib/agentCardAvatar.ts
@@ -0,0 +1,29 @@
+/**
+ * Resolve the avatar for a running agent card.
+ *
+ * The card opens the concrete agent pubkey's profile, so that profile's kind:0
+ * picture is authoritative. The linked definition remains a fallback while the
+ * profile is missing or has no picture.
+ */
+export function resolveAgentCardAvatarUrl(
+  profileAvatarUrl: string | null | undefined,
+  personaAvatarUrl: string | null | undefined,
+): string | null {
+  for (const candidate of [profileAvatarUrl, personaAvatarUrl]) {
+    const trimmed = candidate?.trim();
+    if (trimmed) return trimmed;
+  }
+  return null;
+}
+
+/**
+ * A linked agent's profile is authoritative even when the definition already
+ * supplies a fallback. Avatar-dependent actions must wait for that profile
+ * query so they cannot snapshot the fallback before the profile resolves.
+ */
+export function isAgentCardAvatarLoading(
+  hasLinkedAgent: boolean,
+  isProfilePending: boolean,
+): boolean {
+  return hasLinkedAgent && isProfilePending;
+}
diff --git a/desktop/src/features/agents/lib/managedAgentControlActions.ts b/desktop/src/features/agents/lib/managedAgentControlActions.ts
index dbaaaba8035..50a92e4f170 100644
--- a/desktop/src/features/agents/lib/managedAgentControlActions.ts
+++ b/desktop/src/features/agents/lib/managedAgentControlActions.ts
@@ -44,7 +44,7 @@ export function getManagedAgentPrimaryActionLabel(agent: ManagedAgent) {
     return "Stop";
   }
 
-  return agent.status === "stopped" ? "Respawn" : "Spawn";
+  return agent.status === "stopped" ? "Restart Agent" : "Start Agent";
 }
 
 export function resolveManagedAgentChannelId(
diff --git a/desktop/src/features/agents/lib/personaCatalogRelay.test.mjs b/desktop/src/features/agents/lib/personaCatalogRelay.test.mjs
index fbaf1f52742..ef516f4b01c 100644
--- a/desktop/src/features/agents/lib/personaCatalogRelay.test.mjs
+++ b/desktop/src/features/agents/lib/personaCatalogRelay.test.mjs
@@ -319,12 +319,20 @@ function localPersona(overrides = {}) {
 // The duplicate-add bug: a copy of Alice's entry carries a fresh local UUID, so
 // matching by id finds nothing and the catalog offers "Add" again. Only the
 // stored catalogSource coordinate links the copy back to the publication.
-test("test_added_foreign_catalog_entry_resolves_to_its_local_copy", () => {
+test("test_added_foreign_catalog_entry_keeps_publisher_identity_and_local_selection", () => {
+  const publisherAvatar = "https://relay.example/publisher.png";
   const publications = catalogPublicationsFromEvents([
-    personaEvent({ createdAt: 1, id: "alice-reviewer" }),
+    personaEvent({
+      createdAt: 1,
+      id: "alice-reviewer",
+      avatarUrl: publisherAvatar,
+    }),
   ]);
   const copy = localPersona({
     id: "a-fresh-uuid",
+    displayName: "Locally Renamed Reviewer",
+    avatarUrl: "https://relay.example/local-copy.png",
+    systemPrompt: "Locally edited instructions.",
     catalogSource: { ownerPubkey: ALICE, personaId: "reviewer" },
   });
 
@@ -334,13 +342,16 @@ test("test_added_foreign_catalog_entry_resolves_to_its_local_copy", () => {
   assert.equal(
     personas[0].id,
     "a-fresh-uuid",
-    "the projection must resolve to the existing local copy, not a synthetic id",
+    "the projection must retain the existing local copy's linkage id",
   );
   assert.equal(
     personas[0].isActive,
     true,
     "an added foreign entry must read as already selected",
   );
+  assert.equal(personas[0].displayName, "Relay Reviewer");
+  assert.equal(personas[0].avatarUrl, publisherAvatar);
+  assert.equal(personas[0].systemPrompt, "Review changes.");
 });
 
 test("test_foreign_entry_with_no_local_copy_stays_unselected", () => {
diff --git a/desktop/src/features/agents/lib/personaCatalogRelay.ts b/desktop/src/features/agents/lib/personaCatalogRelay.ts
index 02c3f8e2023..a588843b1ef 100644
--- a/desktop/src/features/agents/lib/personaCatalogRelay.ts
+++ b/desktop/src/features/agents/lib/personaCatalogRelay.ts
@@ -289,8 +289,14 @@ function publicationToPersona(
   isOwn: boolean,
 ): CatalogPersona {
   const timestamp = new Date(publication.createdAt * 1_000).toISOString();
-  const basePersona: AgentPersona = localPersona ?? {
-    id: `catalog:${publication.ownerPubkey}:${publication.sourcePersonaId}`,
+  // The publication remains authoritative for catalog presentation. An added
+  // local copy contributes only the linkage id and selected state; merging the
+  // whole copy would leak local edits (notably its avatar) into the publisher's
+  // catalog entry.
+  const basePersona: AgentPersona = {
+    id:
+      localPersona?.id ??
+      `catalog:${publication.ownerPubkey}:${publication.sourcePersonaId}`,
     displayName: publication.agent.displayName,
     avatarUrl: publication.agent.avatarUrl,
     systemPrompt: publication.agent.systemPrompt,
@@ -299,7 +305,7 @@ function publicationToPersona(
     provider: publication.agent.provider,
     namePool: publication.agent.namePool,
     isBuiltIn: false,
-    isActive: false,
+    isActive: localPersona?.isActive ?? false,
     shared: true,
     sourceTeam: null,
     envVars: {},
diff --git a/desktop/src/features/agents/managedAgentRuntimeStatus.ts b/desktop/src/features/agents/managedAgentRuntimeStatus.ts
index a9f2734f21b..c3a952f7d5d 100644
--- a/desktop/src/features/agents/managedAgentRuntimeStatus.ts
+++ b/desktop/src/features/agents/managedAgentRuntimeStatus.ts
@@ -57,9 +57,9 @@ export const MANAGED_AGENT_PAIR_ACTION_LABELS: Record<
   ManagedAgentPairAction,
   string
 > = {
-  start: "Start",
-  stop: "Stop",
-  restart: "Restart",
+  start: "Start Agent",
+  stop: "Stop Agent",
+  restart: "Restart Agent",
 };
 
 /**
diff --git a/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx b/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx
index 12702f45ac4..b4606a0f686 100644
--- a/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx
+++ b/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx
@@ -8,8 +8,6 @@ import type {
   UpdatePersonaInput,
 } from "@/shared/api/types";
 import { cn } from "@/shared/lib/cn";
-import { ChooserDialogContent } from "@/shared/ui/chooser-dialog-content";
-import { Dialog } from "@/shared/ui/dialog";
 import { Input } from "@/shared/ui/input";
 import { Textarea } from "@/shared/ui/textarea";
 import { AgentCreationPreview } from "./AgentCreationPreview";
@@ -85,6 +83,7 @@ import {
 import { useProviderApiKeyFieldState } from "./providerApiKeyFieldState";
 import { buildRuntimeModelProviderPayload } from "./agentDefinitionSubmitPayload";
 import { AgentDefinitionDialogFooter } from "./AgentDefinitionDialogFooter";
+import { AgentDefinitionDialogShell } from "./AgentDefinitionDialogShell";
 import { AddCustomHarnessDialog } from "./AddCustomHarnessDialog";
 import {
   ADD_CUSTOM_HARNESS_OPTION,
@@ -94,6 +93,7 @@ import {
 
 type AgentDefinitionDialogProps = {
   open: boolean;
+  embedded?: boolean;
   title: string;
   description: string;
   submitLabel: string;
@@ -102,6 +102,7 @@ type AgentDefinitionDialogProps = {
   isPending: boolean;
   runtimes: AcpRuntimeCatalogEntry[];
   runtimeCatalogStatus?: "loading" | "ready" | "error";
+  onDirtyChange?: (dirty: boolean) => void;
   onOpenChange: (open: boolean) => void;
   onSubmit: (
     input: CreatePersonaInput | UpdatePersonaInput,
@@ -109,7 +110,6 @@ type AgentDefinitionDialogProps = {
   ) => Promise<unknown>;
   /** Publishes saved changes when the edited agent is shared in the catalog. */
   publishCatalogUpdatesOnSave?: boolean;
-  /** Rendered below the form fields in create mode only ("Where to run"). */
   createRunSection?: React.ReactNode;
   /** Extra create-mode submit gate (e.g. incomplete provider config). */
   createSubmitBlocked?: boolean;
@@ -121,6 +121,7 @@ export type AgentDefinitionSubmitOptions = {
 
 export function AgentDefinitionDialog({
   open,
+  embedded = false,
   title,
   description,
   submitLabel,
@@ -129,6 +130,7 @@ export function AgentDefinitionDialog({
   isPending,
   runtimes,
   runtimeCatalogStatus = "ready" as const,
+  onDirtyChange,
   onOpenChange,
   onSubmit,
   publishCatalogUpdatesOnSave = false,
@@ -193,6 +195,10 @@ export function AgentDefinitionDialog({
       (hasText(initialValues.model) || hasText(initialValues.provider)),
   );
 
+  React.useEffect(() => {
+    onDirtyChange?.(hasUserChanges);
+  }, [hasUserChanges, onDirtyChange]);
+
   React.useEffect(() => {
     if (!open || !initialValues) {
       return;
@@ -296,7 +302,8 @@ export function AgentDefinitionDialog({
   }, [defaultRuntime, isCreateMode, open, runtime, runtimesLoading]);
 
   function handleOpenChange(next: boolean) {
-    if (!next) {
+    // The catalog may veto embedded close requests; preserve the draft until unmount.
+    if (!next && !embedded) {
       setDisplayName("");
       setAvatarUrl("");
       setSystemPrompt("");
@@ -725,316 +732,309 @@ export function AgentDefinitionDialog({
     );
   }
 
-  return (
-    <Dialog
-      onOpenChange={(nextOpen) => {
-        if (!nextOpen && (isPending || isAvatarUploadPending)) return;
-        handleOpenChange(nextOpen);
-      }}
-      open={open}
+  const footer = (
+    <AgentDefinitionDialogFooter
+      canSubmit={canSubmit}
+      isAvatarUploadPending={isAvatarUploadPending}
+      isPending={isPending}
+      onCancel={() => handleOpenChange(false)}
+      publishesCatalogUpdates={publishCatalogUpdatesOnSave && hasUserChanges}
+      submitBlockReason={null}
+      submitLabel={submitLabel}
+    />
+  );
+  const form = (
+    <form
+      className="grid gap-5 lg:grid-cols-[220px_minmax(0,1fr)]"
+      id="persona-dialog-form"
+      onChangeCapture={() => setHasUserChanges(true)}
+      onSubmit={handleSubmitForm}
     >
-      <ChooserDialogContent
-        className="max-w-3xl border-0"
-        contentClassName="pt-3"
-        data-testid="persona-dialog"
-        description={description}
-        footerClassName="border-t-0 pt-0"
-        headerClassName="pb-2"
-        title={title}
-        footer={
-          <AgentDefinitionDialogFooter
-            canSubmit={canSubmit}
-            isAvatarUploadPending={isAvatarUploadPending}
-            isPending={isPending}
-            onCancel={() => handleOpenChange(false)}
-            publishesCatalogUpdates={
-              publishCatalogUpdatesOnSave && hasUserChanges
-            }
-            submitBlockReason={null}
-            submitLabel={submitLabel}
-          />
-        }
-      >
-        <form
-          className="grid gap-5 lg:grid-cols-[220px_minmax(0,1fr)]"
-          id="persona-dialog-form"
-          onChangeCapture={() => setHasUserChanges(true)}
-          onSubmit={handleSubmitForm}
-        >
-          <AgentCreationPreview
-            avatarUrl={previewAvatarUrl}
-            disabled={isPending || isAvatarUploadPending}
-            label={previewLabel}
-            onClearAvatar={() => {
-              setHasUserChanges(true);
-              setAvatarUrl("");
-            }}
-            onUploadPendingChange={setIsAvatarUploadPending}
-            onSelectAvatar={(nextAvatarUrl) => {
-              setHasUserChanges(true);
-              setAvatarUrl(nextAvatarUrl);
-            }}
+      <AgentCreationPreview
+        avatarUrl={previewAvatarUrl}
+        disabled={isPending || isAvatarUploadPending}
+        label={previewLabel}
+        onClearAvatar={() => {
+          setHasUserChanges(true);
+          setAvatarUrl("");
+        }}
+        onUploadPendingChange={setIsAvatarUploadPending}
+        onSelectAvatar={(nextAvatarUrl) => {
+          setHasUserChanges(true);
+          setAvatarUrl(nextAvatarUrl);
+        }}
+      />
+
+      <div className="space-y-5">
+        <div className="space-y-1.5">
+          <label
+            className="text-sm font-medium text-foreground"
+            htmlFor="persona-display-name"
+          >
+            Agent name
+          </label>
+          <div
+            className={cn(
+              "flex min-h-11 items-center px-3",
+              PERSONA_FIELD_SHELL_CLASS,
+            )}
+          >
+            <Input
+              autoCorrect="off"
+              className={cn(
+                "h-8 px-0 py-0 leading-6",
+                PERSONA_FIELD_CONTROL_CLASS,
+              )}
+              disabled={isPending}
+              id="persona-display-name"
+              onChange={(event) => setDisplayName(event.target.value)}
+              placeholder="Fizz"
+              value={displayName}
+            />
+          </div>
+        </div>
+
+        <div className="space-y-1.5">
+          <label
+            className="text-sm font-medium text-foreground"
+            htmlFor="persona-system-prompt"
+          >
+            Agent instructions
+          </label>
+          <div className={PERSONA_FIELD_SHELL_CLASS}>
+            <Textarea
+              className={cn(
+                "min-h-40 resize-y px-3 py-3 leading-5",
+                PERSONA_FIELD_CONTROL_CLASS,
+              )}
+              disabled={isPending}
+              id="persona-system-prompt"
+              onChange={(event) => setSystemPrompt(event.target.value)}
+              placeholder="Describe what this agent should do."
+              value={systemPrompt}
+            />
+          </div>
+        </div>
+
+        {modelFieldVisible ? (
+          <AgentAiConfigurationModeField
+            mode={aiConfigurationMode}
+            needsProviderSelection={runtimeCanChooseLlmProvider}
+            onModeChange={handleAiConfigurationModeChange}
           />
+        ) : null}
 
-          <div className="space-y-5">
-            <div className="space-y-1.5">
-              <label
-                className="text-sm font-medium text-foreground"
-                htmlFor="persona-display-name"
-              >
-                Agent name
-              </label>
-              <div
-                className={cn(
-                  "flex min-h-11 items-center px-3",
-                  PERSONA_FIELD_SHELL_CLASS,
-                )}
-              >
-                <Input
-                  autoCorrect="off"
-                  className={cn(
-                    "h-8 px-0 py-0 leading-6",
-                    PERSONA_FIELD_CONTROL_CLASS,
-                  )}
-                  disabled={isPending}
-                  id="persona-display-name"
-                  onChange={(event) => setDisplayName(event.target.value)}
-                  placeholder="Fizz"
-                  value={displayName}
-                />
-              </div>
-            </div>
+        <div
+          className="space-y-5"
+          data-testid={`agent-${aiConfigurationMode}-configuration-section`}
+        >
+          {aiConfigurationMode === "custom" ? (
+            <AgentHarnessField
+              disabled={isPending || runtimesLoading}
+              onValueChange={handleRuntimeDropdownChange}
+              options={runtimeDropdownOptions}
+              placeholder={blankRuntimeOptionLabel}
+              value={runtimeDropdownValue}
+              warning={runtimeWarning}
+            />
+          ) : null}
 
+          {llmProviderFieldVisible && aiConfigurationMode === "custom" ? (
             <div className="space-y-1.5">
-              <label
-                className="text-sm font-medium text-foreground"
-                htmlFor="persona-system-prompt"
+              <RequiredFieldLabel
+                htmlFor="persona-llm-provider"
+                isRequired={providerIsRequired}
               >
-                Agent instructions
-              </label>
-              <div className={PERSONA_FIELD_SHELL_CLASS}>
-                <Textarea
+                LLM provider
+                {!providerIsRequired ? (
+                  <span className={PERSONA_LABEL_OPTIONAL_CLASS}>Optional</span>
+                ) : null}
+              </RequiredFieldLabel>
+              <PersonaDropdownField
+                disabled={isPending}
+                id="persona-llm-provider"
+                onValueChange={handleProviderDropdownChange}
+                options={providerDropdownOptions}
+                placeholder="Choose a provider"
+                value={providerSelectValue}
+              />
+              {showCustomProviderInput ? (
+                <div
                   className={cn(
-                    "min-h-40 resize-y px-3 py-3 leading-5",
-                    PERSONA_FIELD_CONTROL_CLASS,
+                    "mt-2 flex min-h-11 items-center px-3",
+                    PERSONA_FIELD_SHELL_CLASS,
                   )}
-                  disabled={isPending}
-                  id="persona-system-prompt"
-                  onChange={(event) => setSystemPrompt(event.target.value)}
-                  placeholder="Describe what this agent should do."
-                  value={systemPrompt}
-                />
-              </div>
-            </div>
-
-            {modelFieldVisible ? (
-              <AgentAiConfigurationModeField
-                mode={aiConfigurationMode}
-                needsProviderSelection={runtimeCanChooseLlmProvider}
-                onModeChange={handleAiConfigurationModeChange}
-              />
-            ) : null}
-
-            <div
-              className="space-y-5"
-              data-testid={`agent-${aiConfigurationMode}-configuration-section`}
-            >
-              {aiConfigurationMode === "custom" ? (
-                <AgentHarnessField
-                  disabled={isPending || runtimesLoading}
-                  onValueChange={handleRuntimeDropdownChange}
-                  options={runtimeDropdownOptions}
-                  placeholder={blankRuntimeOptionLabel}
-                  value={runtimeDropdownValue}
-                  warning={runtimeWarning}
-                />
-              ) : null}
-
-              {llmProviderFieldVisible && aiConfigurationMode === "custom" ? (
-                <div className="space-y-1.5">
-                  <RequiredFieldLabel
-                    htmlFor="persona-llm-provider"
-                    isRequired={providerIsRequired}
-                  >
-                    LLM provider
-                    {!providerIsRequired ? (
-                      <span className={PERSONA_LABEL_OPTIONAL_CLASS}>
-                        Optional
-                      </span>
-                    ) : null}
-                  </RequiredFieldLabel>
-                  <PersonaDropdownField
+                >
+                  <Input
+                    aria-label="Custom provider ID"
+                    autoCorrect="off"
+                    className={cn(
+                      "h-8 px-0 py-0 leading-6",
+                      PERSONA_FIELD_CONTROL_CLASS,
+                    )}
                     disabled={isPending}
-                    id="persona-llm-provider"
-                    onValueChange={handleProviderDropdownChange}
-                    options={providerDropdownOptions}
-                    placeholder="Choose a provider"
-                    value={providerSelectValue}
+                    id="persona-custom-provider"
+                    onChange={(event) => setProvider(event.target.value)}
+                    placeholder="Custom provider ID"
+                    value={provider}
                   />
-                  {showCustomProviderInput ? (
-                    <div
-                      className={cn(
-                        "mt-2 flex min-h-11 items-center px-3",
-                        PERSONA_FIELD_SHELL_CLASS,
-                      )}
-                    >
-                      <Input
-                        aria-label="Custom provider ID"
-                        autoCorrect="off"
-                        className={cn(
-                          "h-8 px-0 py-0 leading-6",
-                          PERSONA_FIELD_CONTROL_CLASS,
-                        )}
-                        disabled={isPending}
-                        id="persona-custom-provider"
-                        onChange={(event) => setProvider(event.target.value)}
-                        placeholder="Custom provider ID"
-                        value={provider}
-                      />
-                    </div>
-                  ) : null}
                 </div>
               ) : null}
-
-              {llmProviderFieldVisible &&
-              aiConfigurationMode === "custom" &&
-              topLevelSecretEnvVar ? (
-                <PersonaProviderApiKeyField
-                  disabled={isPending}
-                  envVarName={topLevelSecretEnvVar}
-                  isInherited={apiKeyIsInherited}
-                  inheritedLabel={apiKeyInheritedLabel}
-                  isRequired={apiKeyIsRequired}
-                  label={getProviderApiKeyLabel(effectiveProvider) ?? "API key"}
-                  onValueChange={(next) => {
-                    setEnvVars((prev) => ({
-                      ...prev,
-                      [topLevelSecretEnvVar]: next,
-                    }));
-                  }}
-                  value={apiKeyValue}
-                />
-              ) : null}
-
-              <AnimatePresence initial={false}>
-                {modelFieldVisible && aiConfigurationMode === "custom" ? (
-                  <PersonaModelField
-                    disabled={isPending}
-                    isExplicitModelRequired={isExplicitModelRequired}
-                    model={model}
-                    modelDiscoveryStatus={modelDiscoveryStatus}
-                    modelDropdownOptions={modelDropdownOptions}
-                    modelSelectValue={modelSelectValue}
-                    onCustomModelChange={setModel}
-                    showSharedComputeAutoHint={
-                      isRelayMesh &&
-                      modelSelectValue === AUTO_MODEL_DROPDOWN_VALUE
-                    }
-                    onModelValueChange={handleModelDropdownChange}
-                    showCustomModelInput={showCustomModelInput}
-                    transition={advancedFieldsTransition}
-                  />
-                ) : null}
-              </AnimatePresence>
-
-              {aiConfigurationMode === "defaults" ? (
-                <AgentCreateAiDefaultsSummary
-                  canChooseProvider={runtimeCanChooseLlmProvider}
-                  harness={runtimeSummaryLabel}
-                  inheritedModel={inheritedModelDefault}
-                  inheritedProvider={inheritedProviderDefault}
-                  isConfigured={localModeGate.satisfied}
-                  model={runtimeFileConfig?.model}
-                  onEditDefaults={() => setAiDefaultsOpen(true)}
-                  triggerRef={aiDefaultsTriggerRef}
-                />
-              ) : null}
             </div>
+          ) : null}
 
-            <AgentDefaultsDialog
-              onOpenChange={setAiDefaultsOpen}
-              open={runtimeCanChooseLlmProvider && aiDefaultsOpen}
-              returnFocusRef={aiDefaultsTriggerRef}
+          {llmProviderFieldVisible &&
+          aiConfigurationMode === "custom" &&
+          topLevelSecretEnvVar ? (
+            <PersonaProviderApiKeyField
+              disabled={isPending}
+              envVarName={topLevelSecretEnvVar}
+              isInherited={apiKeyIsInherited}
+              inheritedLabel={apiKeyInheritedLabel}
+              isRequired={apiKeyIsRequired}
+              label={getProviderApiKeyLabel(effectiveProvider) ?? "API key"}
+              onValueChange={(next) => {
+                setEnvVars((prev) => ({
+                  ...prev,
+                  [topLevelSecretEnvVar]: next,
+                }));
+              }}
+              value={apiKeyValue}
             />
+          ) : null}
+
+          <AnimatePresence initial={false}>
+            {modelFieldVisible && aiConfigurationMode === "custom" ? (
+              <PersonaModelField
+                disabled={isPending}
+                isExplicitModelRequired={isExplicitModelRequired}
+                model={model}
+                modelDiscoveryStatus={modelDiscoveryStatus}
+                modelDropdownOptions={modelDropdownOptions}
+                modelSelectValue={modelSelectValue}
+                onCustomModelChange={setModel}
+                showSharedComputeAutoHint={
+                  isRelayMesh && modelSelectValue === AUTO_MODEL_DROPDOWN_VALUE
+                }
+                onModelValueChange={handleModelDropdownChange}
+                showCustomModelInput={showCustomModelInput}
+                transition={advancedFieldsTransition}
+              />
+            ) : null}
+          </AnimatePresence>
 
-            <AddCustomHarnessDialog
-              onOpenChange={setIsAddHarnessOpen}
-              onSaved={selectSavedHarness}
-              open={isAddHarnessOpen}
+          {aiConfigurationMode === "defaults" ? (
+            <AgentCreateAiDefaultsSummary
+              canChooseProvider={runtimeCanChooseLlmProvider}
+              harness={runtimeSummaryLabel}
+              inheritedModel={inheritedModelDefault}
+              inheritedProvider={inheritedProviderDefault}
+              isConfigured={localModeGate.satisfied}
+              model={runtimeFileConfig?.model}
+              onEditDefaults={() => setAiDefaultsOpen(true)}
+              triggerRef={aiDefaultsTriggerRef}
             />
+          ) : null}
+        </div>
+
+        <AgentDefaultsDialog
+          onOpenChange={setAiDefaultsOpen}
+          open={runtimeCanChooseLlmProvider && aiDefaultsOpen}
+          returnFocusRef={aiDefaultsTriggerRef}
+        />
 
-            {isCreateMode ? createRunSection : null}
+        <AddCustomHarnessDialog
+          onOpenChange={setIsAddHarnessOpen}
+          onSaved={selectSavedHarness}
+          open={isAddHarnessOpen}
+        />
 
-            <div className="space-y-3">
-              <button
-                aria-expanded={showAdvancedFields}
-                className="inline-flex h-9 items-center gap-1.5 text-sm font-medium text-foreground transition-colors hover:text-foreground/80 focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring"
-                onClick={() => setShowAdvancedFields((current) => !current)}
-                type="button"
+        <div className="space-y-3">
+          <button
+            aria-expanded={showAdvancedFields}
+            className="inline-flex h-9 items-center gap-1.5 text-sm font-medium text-foreground transition-colors hover:text-foreground/80 focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring"
+            onClick={() => setShowAdvancedFields((current) => !current)}
+            type="button"
+          >
+            <span>Advanced</span>
+            {(isCreateMode && createSubmitBlocked) ||
+            localModeGate.missingEnvKeys.some((key) =>
+              advancedRequiredEnvKeys.includes(key),
+            ) ? (
+              <span
+                aria-hidden="true"
+                className="rounded-full bg-destructive/10 px-2 py-0.5 text-xs text-destructive"
+                data-testid="persona-advanced-required-badge"
               >
-                <span>Advanced</span>
-                {localModeGate.missingEnvKeys.some((key) =>
-                  advancedRequiredEnvKeys.includes(key),
-                ) ? (
-                  <span
-                    aria-hidden="true"
-                    className="rounded-full bg-destructive/10 px-2 py-0.5 text-xs text-destructive"
-                    data-testid="persona-advanced-required-badge"
-                  >
-                    Required
-                  </span>
-                ) : null}
-                <ChevronDown
-                  className={cn(
-                    "h-4 w-4 text-muted-foreground transition-transform duration-150 ease-out",
-                    showAdvancedFields && "rotate-180",
-                  )}
+                Required
+              </span>
+            ) : null}
+            <ChevronDown
+              className={cn(
+                "h-4 w-4 text-muted-foreground transition-transform duration-150 ease-out",
+                showAdvancedFields && "rotate-180",
+              )}
+            />
+          </button>
+          <AnimatePresence initial={false}>
+            {showAdvancedFields ? (
+              <motion.div
+                animate={{ height: "auto", opacity: 1, scale: 1 }}
+                className="origin-top overflow-hidden"
+                exit={{ height: 0, opacity: 0, scale: 0.98 }}
+                initial={{ height: 0, opacity: 0, scale: 0.98 }}
+                key="persona-advanced-fields"
+                transition={advancedFieldsTransition}
+              >
+                <PersonaAdvancedFields
+                  afterRespondTo={isCreateMode ? createRunSection : undefined}
+                  behaviorDraft={behaviorDraft}
+                  disabled={isPending}
+                  envVars={envVars}
+                  fileSatisfiedEnvKeys={localModeGate.fileSatisfiedEnvKeys}
+                  hiddenEnvKeys={
+                    topLevelSecretEnvVar ? [topLevelSecretEnvVar] : []
+                  }
+                  inheritedEnvVars={inheritedEnvVarsForAdvanced}
+                  model={model}
+                  modelTuningRuntimeId={runtime}
+                  namePoolText={namePoolText}
+                  catalogStatus={runtimeCatalogStatus}
+                  selectedRuntime={selectedRuntime}
+                  onBehaviorDraftChange={(nextBehaviorDraft) => {
+                    setHasUserChanges(true);
+                    setBehaviorDraft(nextBehaviorDraft);
+                  }}
+                  onEnvVarsChange={setEnvVars}
+                  onNamePoolTextChange={setNamePoolText}
+                  provider={effectiveProvider}
+                  requiredEnvKeys={advancedRequiredEnvKeys}
                 />
-              </button>
-              <AnimatePresence initial={false}>
-                {showAdvancedFields ? (
-                  <motion.div
-                    animate={{ height: "auto", opacity: 1, scale: 1 }}
-                    className="origin-top overflow-hidden"
-                    exit={{ height: 0, opacity: 0, scale: 0.98 }}
-                    initial={{ height: 0, opacity: 0, scale: 0.98 }}
-                    key="persona-advanced-fields"
-                    transition={advancedFieldsTransition}
-                  >
-                    <PersonaAdvancedFields
-                      behaviorDraft={behaviorDraft}
-                      disabled={isPending}
-                      envVars={envVars}
-                      fileSatisfiedEnvKeys={localModeGate.fileSatisfiedEnvKeys}
-                      hiddenEnvKeys={
-                        topLevelSecretEnvVar ? [topLevelSecretEnvVar] : []
-                      }
-                      inheritedEnvVars={inheritedEnvVarsForAdvanced}
-                      model={model}
-                      modelTuningRuntimeId={runtime}
-                      namePoolText={namePoolText}
-                      catalogStatus={runtimeCatalogStatus}
-                      selectedRuntime={selectedRuntime}
-                      onBehaviorDraftChange={(nextBehaviorDraft) => {
-                        setHasUserChanges(true);
-                        setBehaviorDraft(nextBehaviorDraft);
-                      }}
-                      onEnvVarsChange={setEnvVars}
-                      onNamePoolTextChange={setNamePoolText}
-                      provider={effectiveProvider}
-                      requiredEnvKeys={advancedRequiredEnvKeys}
-                    />
-                  </motion.div>
-                ) : null}
-              </AnimatePresence>
-            </div>
-
-            {error ? (
-              <p className="text-sm text-destructive">{error.message}</p>
+              </motion.div>
             ) : null}
-          </div>
-        </form>
-      </ChooserDialogContent>
-    </Dialog>
+          </AnimatePresence>
+        </div>
+
+        {error ? (
+          <p className="text-sm text-destructive">{error.message}</p>
+        ) : null}
+      </div>
+    </form>
+  );
+
+  return (
+    <AgentDefinitionDialogShell
+      description={description}
+      embedded={embedded}
+      footer={footer}
+      onOpenChange={(nextOpen) => {
+        if (!nextOpen && (isPending || isAvatarUploadPending)) return;
+        handleOpenChange(nextOpen);
+      }}
+      open={open}
+      title={title}
+    >
+      {form}
+    </AgentDefinitionDialogShell>
   );
 }
diff --git a/desktop/src/features/agents/ui/AgentDefinitionDialogShell.tsx b/desktop/src/features/agents/ui/AgentDefinitionDialogShell.tsx
new file mode 100644
index 00000000000..78d4c9b4f37
--- /dev/null
+++ b/desktop/src/features/agents/ui/AgentDefinitionDialogShell.tsx
@@ -0,0 +1,57 @@
+import type * as React from "react";
+
+import { ChooserDialogContent } from "@/shared/ui/chooser-dialog-content";
+import { Dialog } from "@/shared/ui/dialog";
+
+type AgentDefinitionDialogShellProps = {
+  children: React.ReactNode;
+  description: string;
+  embedded: boolean;
+  footer: React.ReactNode;
+  onOpenChange: (open: boolean) => void;
+  open: boolean;
+  title: string;
+};
+
+export function AgentDefinitionDialogShell({
+  children,
+  description,
+  embedded,
+  footer,
+  onOpenChange,
+  open,
+  title,
+}: AgentDefinitionDialogShellProps) {
+  if (embedded) {
+    return (
+      <div
+        className="relative flex min-h-0 min-w-0 flex-1 flex-col"
+        data-testid="persona-dialog"
+      >
+        <div className="min-h-0 min-w-0 flex-1 overflow-y-auto px-5 pb-20 pt-5">
+          {children}
+        </div>
+        <div className="pointer-events-none absolute inset-x-0 bottom-0 flex justify-end bg-linear-to-t from-background via-background/95 to-transparent px-4 pb-3 pt-10 [&_button]:pointer-events-auto">
+          {footer}
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <Dialog onOpenChange={onOpenChange} open={open}>
+      <ChooserDialogContent
+        className="max-w-3xl border-0"
+        contentClassName="pt-3"
+        data-testid="persona-dialog"
+        description={description}
+        footer={footer}
+        footerClassName="border-t-0 pt-0"
+        headerClassName="pb-2"
+        title={title}
+      >
+        {children}
+      </ChooserDialogContent>
+    </Dialog>
+  );
+}
diff --git a/desktop/src/features/agents/ui/AgentDialog.tsx b/desktop/src/features/agents/ui/AgentDialog.tsx
index a875770b38c..309bd3cdc72 100644
--- a/desktop/src/features/agents/ui/AgentDialog.tsx
+++ b/desktop/src/features/agents/ui/AgentDialog.tsx
@@ -29,7 +29,10 @@ import {
 
 type AgentDialogCreateProps = {
   mode: "definition";
+  embedded?: boolean;
+  submitLabel?: string;
   initialValues?: CreatePersonaInput | null;
+  onDirtyChange?: (dirty: boolean) => void;
   onOpenChange: (open: boolean) => void;
   definitionError: Error | null;
   isDefinitionPending: boolean;
@@ -120,12 +123,15 @@ export function AgentDialog(props: AgentDialogProps) {
 }
 
 function AgentCreateDialogRouter({
+  embedded,
   initialValues: providedInitialValues,
   onOpenChange,
   definitionError,
   isDefinitionPending,
   runtimes,
   runtimeCatalogStatus,
+  submitLabel,
+  onDirtyChange,
   onSubmitDefinition,
 }: AgentDialogCreateProps) {
   const [runDraft, setRunDraft] = React.useState(emptyWhereToRunDraft);
@@ -145,14 +151,19 @@ function AgentCreateDialogRouter({
           <WhereToRunSection
             draft={runDraft}
             isPending={isDefinitionPending}
-            onDraftChange={setRunDraft}
+            onDraftChange={(nextDraft) => {
+              setRunDraft(nextDraft);
+              onDirtyChange?.(true);
+            }}
           />
         }
         createSubmitBlocked={!canSubmitWhereToRun(runDraft)}
         description={copy.description}
+        embedded={embedded}
         error={definitionError}
         initialValues={initialValues}
         isPending={isDefinitionPending}
+        onDirtyChange={onDirtyChange}
         onOpenChange={onOpenChange}
         onSubmit={async (input) => {
           const submitted = await onSubmitDefinition(
@@ -161,13 +172,14 @@ function AgentCreateDialogRouter({
             resolveBackendIntent(runDraft),
           );
           if (submitted) {
+            onDirtyChange?.(false);
             onOpenChange(false);
           }
         }}
         open
         runtimes={runtimes}
         runtimeCatalogStatus={runtimeCatalogStatus}
-        submitLabel={copy.submitLabel}
+        submitLabel={submitLabel ?? copy.submitLabel}
         title={copy.title}
       />
     </AgentRunLocationProvider>
diff --git a/desktop/src/features/agents/ui/AgentManagementDialogs.tsx b/desktop/src/features/agents/ui/AgentManagementDialogs.tsx
index b72669e5f6b..27541889f26 100644
--- a/desktop/src/features/agents/ui/AgentManagementDialogs.tsx
+++ b/desktop/src/features/agents/ui/AgentManagementDialogs.tsx
@@ -1,7 +1,6 @@
 import { useAgentManagement } from "@/features/agents/useAgentManagement";
 import { AgentCardDialogs } from "./AgentCardViewerDialog";
 import { AgentDialog } from "./AgentDialog";
-import { SecretRevealDialog } from "./SecretRevealDialog";
 
 /** Global review surfaces opened by owned agents through the Buzz harness. */
 export function AgentManagementDialogs() {
@@ -25,19 +24,6 @@ export function AgentManagementDialogs() {
           runtimeCatalogStatus={management.runtimeCatalogStatus}
         />
       ) : null}
-      {management.createdAgent ? (
-        <SecretRevealDialog
-          attachmentFailure={management.attachmentFailure}
-          created={management.createdAgent}
-          isRetryingAttachment={management.isRetryingAttachment}
-          onOpenChange={(open) => {
-            if (!open) management.dismissCreatedAgent();
-          }}
-          onRetryAttachment={() => {
-            void management.retryAttachment();
-          }}
-        />
-      ) : null}
       {management.request?.action === "update" ? (
         <AgentDialog
           description=""
diff --git a/desktop/src/features/agents/ui/AgentRuntimeAvatarControl.tsx b/desktop/src/features/agents/ui/AgentRuntimeAvatarControl.tsx
index 6f34ffba79a..1b3c7a05748 100644
--- a/desktop/src/features/agents/ui/AgentRuntimeAvatarControl.tsx
+++ b/desktop/src/features/agents/ui/AgentRuntimeAvatarControl.tsx
@@ -1,7 +1,6 @@
-import { CircleAlert, Play } from "lucide-react";
+import { CircleAlert } from "lucide-react";
 import { useReducedMotion } from "motion/react";
 
-import { PresenceDot } from "@/features/presence/ui/PresenceBadge";
 import {
   type AvatarBadgeCurve,
   MaskedAvatarBadgeFrame,
@@ -18,8 +17,10 @@ type AgentRuntimeAvatarControlProps = {
   errorLabel?: string | null;
   errorTestId?: string;
   isActive: boolean;
+  isRestarting?: boolean;
   isStarting: boolean;
   label: string;
+  requiresRestart?: boolean;
   startTestId: string;
   onOpenError?: () => void;
   onStart: () => void;
@@ -29,6 +30,7 @@ const TAILWIND_SPACING = {
   "1": 4,
   "2": 8,
   "2.5": 10,
+  "3.5": 14,
   "6": 24,
   "11": 44,
   "24": 96,
@@ -36,44 +38,58 @@ const TAILWIND_SPACING = {
 
 const AGENT_AVATAR_SIZE = TAILWIND_SPACING["24"];
 const ACTION_BADGE_SIZE = TAILWIND_SPACING["11"];
-const ACTIVE_BADGE_SIZE = TAILWIND_SPACING["6"];
-const ACTION_BADGE_OFFSET = TAILWIND_SPACING["2.5"];
+const ACTION_BUTTON_HEIGHT = 36;
+const START_ACTION_BADGE_WIDTH = 56;
+const RESTART_ACTION_BADGE_WIDTH = 72;
+const ACTIVE_BADGE_CUTOUT_SIZE = TAILWIND_SPACING["6"];
+const ACTIVE_DOT_SIZE = 18;
+const ACTION_BADGE_OFFSET = TAILWIND_SPACING["3.5"] + TAILWIND_SPACING["1"];
 const ACTIVE_BADGE_INSET = TAILWIND_SPACING["1"];
-const ACTIVE_DOT_CLASS_NAME = "h-4.5 w-4.5";
 const PROFILE_STATUS_CUTOUT_RATIO = 1.25;
 
 function getBadgeCenter(badgeSize: number, outwardOffset: number) {
   return AGENT_AVATAR_SIZE + outwardOffset - badgeSize / 2;
 }
 
-function getActionBadge(offset: number) {
+function getActionBadge(width: number, height: number, offset: number) {
+  const centerY = getBadgeCenter(ACTION_BADGE_SIZE, offset);
+  const clearance = (ACTION_BADGE_SIZE - height) / 2;
+
   return {
     cutout: {
-      cx: getBadgeCenter(ACTION_BADGE_SIZE, offset),
-      cy: getBadgeCenter(ACTION_BADGE_SIZE, offset),
+      // Keep the cutout on the avatar edge so the mask has the same soft,
+      // two-point join as the status dot. Unlike the status dot, center the
+      // primary action horizontally to make its purpose easier to spot.
+      cx: AGENT_AVATAR_SIZE / 2,
+      cy: centerY,
       r: ACTION_BADGE_SIZE / 2,
     },
     shell: {
-      bottom: -offset,
-      height: ACTION_BADGE_SIZE,
-      right: -offset,
-      width: ACTION_BADGE_SIZE,
+      bottom: AGENT_AVATAR_SIZE - centerY - height / 2,
+      height,
+      right: (AGENT_AVATAR_SIZE - width) / 2,
+      width,
     },
+    // Carry the vertical clearance around the end caps horizontally too, so
+    // the avatar gap stays even around the pill.
+    cutoutWidth: width + clearance * 2,
   } as const;
 }
 
 function getActiveBadge(inset: number) {
+  const center = getBadgeCenter(ACTIVE_BADGE_CUTOUT_SIZE, -inset);
+
   return {
     cutout: {
-      cx: getBadgeCenter(ACTIVE_BADGE_SIZE, -inset),
-      cy: getBadgeCenter(ACTIVE_BADGE_SIZE, -inset),
-      r: (ACTIVE_BADGE_SIZE / 2) * PROFILE_STATUS_CUTOUT_RATIO,
+      cx: center,
+      cy: center,
+      r: (ACTIVE_BADGE_CUTOUT_SIZE / 2) * PROFILE_STATUS_CUTOUT_RATIO,
     },
     shell: {
-      bottom: inset,
-      height: ACTIVE_BADGE_SIZE,
-      right: inset,
-      width: ACTIVE_BADGE_SIZE,
+      bottom: AGENT_AVATAR_SIZE - center - ACTIVE_DOT_SIZE / 2,
+      height: ACTIVE_DOT_SIZE,
+      right: AGENT_AVATAR_SIZE - center - ACTIVE_DOT_SIZE / 2,
+      width: ACTIVE_DOT_SIZE,
     },
   } as const;
 }
@@ -87,12 +103,26 @@ const ACTION_MASK_CURVE = {
   handleLengthRatio: 0.26,
 } satisfies AvatarBadgeCurve;
 
-const ACTION_BADGE = getActionBadge(ACTION_BADGE_OFFSET);
+const START_ACTION_BADGE = getActionBadge(
+  START_ACTION_BADGE_WIDTH,
+  ACTION_BUTTON_HEIGHT,
+  ACTION_BADGE_OFFSET,
+);
+const RESTART_ACTION_BADGE = getActionBadge(
+  RESTART_ACTION_BADGE_WIDTH,
+  ACTION_BUTTON_HEIGHT,
+  ACTION_BADGE_OFFSET,
+);
+const ERROR_BADGE = getActionBadge(
+  ACTION_BADGE_SIZE,
+  ACTION_BUTTON_HEIGHT,
+  ACTION_BADGE_OFFSET,
+);
 const ACTIVE_BADGE = getActiveBadge(ACTIVE_BADGE_INSET);
 
 const MASK_TRANSITION = {
-  duration: 0.22,
-  ease: [0.23, 1, 0.32, 1],
+  duration: 0.3,
+  ease: [0.4, 0, 0.2, 1],
 } as const;
 
 export function AgentRuntimeAvatarControl({
@@ -101,45 +131,66 @@ export function AgentRuntimeAvatarControl({
   errorLabel,
   errorTestId,
   isActive,
+  isRestarting = false,
   isStarting,
   label,
+  requiresRestart = false,
   startTestId,
   onOpenError,
   onStart,
 }: AgentRuntimeAvatarControlProps) {
   const shouldReduceMotion = useReducedMotion();
   const trimmedAvatarUrl = avatarUrl?.trim() || null;
-  const actionLabel = isStarting ? `Starting ${label}` : `Start ${label}`;
-  const hasError = !isActive && !isStarting && Boolean(errorLabel);
+  const isRestartAction = requiresRestart || isRestarting;
+  const actionLabel = isRestarting
+    ? "Restarting Agent"
+    : isStarting
+      ? "Starting Agent"
+      : isRestartAction
+        ? "Restart Agent"
+        : "Start Agent";
+  const actionText = isRestartAction ? "Restart" : "Start";
+  const isPending = isStarting || isRestarting;
+  const showRunningDot = isActive && !isRestartAction;
+  const hasError = !isActive && !isPending && Boolean(errorLabel);
   const errorActionLabel = `${label} has a runtime error. Open runtime details.`;
   const transition = shouldReduceMotion ? { duration: 0 } : MASK_TRANSITION;
-  const badge = isActive ? ACTIVE_BADGE : ACTION_BADGE;
+  const actionBadge = isRestartAction
+    ? RESTART_ACTION_BADGE
+    : START_ACTION_BADGE;
+  const badge = showRunningDot
+    ? ACTIVE_BADGE
+    : hasError
+      ? ERROR_BADGE
+      : actionBadge;
+  const actionCutoutWidth =
+    showRunningDot || hasError ? undefined : actionBadge.cutoutWidth;
 
   return (
     <MaskedAvatarBadgeFrame
       badge={
         <span className="grid h-full w-full place-items-center">
-          {isActive ? (
+          {showRunningDot ? (
             <span
               aria-label={`${label} is running`}
-              className="flex h-6 w-6 items-center justify-center rounded-full"
+              className="h-full w-full rounded-full"
               data-testid={activeTestId}
               role="img"
               title={`${label} is running`}
-            >
-              <PresenceDot className={ACTIVE_DOT_CLASS_NAME} status="online" />
-            </span>
+            />
           ) : (
             <button
               aria-label={hasError ? errorActionLabel : actionLabel}
               className={cn(
-                "pointer-events-auto flex h-9 w-9 items-center justify-center rounded-full transition-colors duration-150 ease-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-default disabled:opacity-90",
+                "pointer-events-auto flex h-full w-full items-center justify-center rounded-full px-2.5 text-xs font-semibold leading-none transition-colors duration-150 ease-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-default disabled:opacity-90",
                 hasError
                   ? "bg-destructive text-destructive-foreground hover:bg-destructive/90"
-                  : "bg-primary text-primary-foreground hover:bg-primary/90",
+                  : isRestartAction
+                    ? "bg-transparent text-amber-800 hover:bg-amber-500/10 dark:text-amber-400"
+                    : "bg-primary text-primary-foreground hover:bg-primary/90",
               )}
               data-testid={hasError ? errorTestId : startTestId}
-              disabled={isStarting}
+              disabled={isPending}
               onClick={(event) => {
                 event.stopPropagation();
                 if (hasError) {
@@ -151,26 +202,36 @@ export function AgentRuntimeAvatarControl({
               title={hasError ? errorLabel || errorActionLabel : actionLabel}
               type="button"
             >
-              <span className="grid h-4 w-4 place-items-center">
-                {isStarting ? (
-                  <Spinner
-                    aria-label={actionLabel}
-                    className="h-4 w-4 border-2"
-                  />
-                ) : hasError ? (
-                  <CircleAlert className="h-4 w-4" />
-                ) : (
-                  <Play className="h-4 w-4 fill-current" />
-                )}
-              </span>
+              {isPending ? (
+                <Spinner
+                  aria-label={actionLabel}
+                  className="h-4 w-4 border-2"
+                />
+              ) : hasError ? (
+                <CircleAlert className="h-4 w-4" />
+              ) : (
+                actionText
+              )}
             </button>
           )}
         </span>
       }
       badgeBox={badge.shell}
+      badgeClassName={cn(
+        "transition-colors ease-in-out",
+        shouldReduceMotion ? "duration-0" : "duration-300",
+        showRunningDot
+          ? "bg-emerald-500"
+          : hasError
+            ? "bg-destructive"
+            : isRestartAction
+              ? "bg-amber-500/15"
+              : "bg-primary",
+      )}
       className="h-24 w-24"
-      curve={isActive ? STATUS_DOT_MASK_CURVE : ACTION_MASK_CURVE}
+      curve={showRunningDot ? STATUS_DOT_MASK_CURVE : ACTION_MASK_CURVE}
       cutout={badge.cutout}
+      cutoutWidth={actionCutoutWidth}
       maskTransition={transition}
       size={AGENT_AVATAR_SIZE}
     >
diff --git a/desktop/src/features/agents/ui/AgentSessionTranscriptList.tsx b/desktop/src/features/agents/ui/AgentSessionTranscriptList.tsx
index 29bfd7dbab5..d24c8fab79f 100644
--- a/desktop/src/features/agents/ui/AgentSessionTranscriptList.tsx
+++ b/desktop/src/features/agents/ui/AgentSessionTranscriptList.tsx
@@ -747,7 +747,7 @@ function PromptContextDialog({
   return (
     <Dialog onOpenChange={onOpenChange} open={open}>
       <DialogContent className="max-w-xl overflow-hidden p-0">
-        <div className="flex max-h-[85vh] flex-col">
+        <div className="flex min-w-0 max-h-[85vh] flex-col">
           <DialogHeader className="px-6 pb-3 pt-5 pr-14">
             <DialogTitle>Prompt context</DialogTitle>
             {setupText ? (
diff --git a/desktop/src/features/agents/ui/AgentsView.tsx b/desktop/src/features/agents/ui/AgentsView.tsx
index 720d6e62ade..e1e1f37f35f 100644
--- a/desktop/src/features/agents/ui/AgentsView.tsx
+++ b/desktop/src/features/agents/ui/AgentsView.tsx
@@ -16,7 +16,6 @@ import { AgentSnapshotImportDialog } from "./AgentSnapshotImportDialog";
 import { TeamSnapshotExportDialog } from "./TeamSnapshotExportDialog";
 import { TeamSnapshotImportDialog } from "./TeamSnapshotImportDialog";
 import { TeamShareDialog } from "./TeamShareDialog";
-import { SecretRevealDialog } from "./SecretRevealDialog";
 import { TeamDeleteDialog } from "./TeamDeleteDialog";
 import { TeamDialog } from "./TeamDialog";
 import { TeamsSection } from "./TeamsSection";
@@ -50,13 +49,10 @@ export function AgentsView() {
   const fullAiDefaultsTriggerRef = React.useRef<HTMLButtonElement>(null);
   const compactActionsTriggerRef = React.useRef<HTMLButtonElement>(null);
   const [isAiDefaultsOpen, setIsAiDefaultsOpen] = React.useState(false);
-  // Exclusivity: create never sets `personaDialogState` (edit/dup/import do),
-  // so the create-mode and definition-edit AgentDialog mounts never coexist.
-  const [isCreateDialogOpen, setIsCreateDialogOpen] = React.useState(false);
 
-  function openUnifiedCreate() {
+  function openUnifiedCatalog() {
     personas.prepareCreate();
-    setIsCreateDialogOpen(true);
+    personas.openCatalog();
   }
 
   function openAiDefaults(trigger: HTMLButtonElement | null) {
@@ -225,6 +221,7 @@ export function AgentsView() {
               isActionPending={isActionPending}
               isAgentsLoading={agents.managedAgentsQuery.isLoading}
               startingAgentPubkey={agents.startingAgentPubkey}
+              restartingAgentPubkey={agents.restartingAgentPubkey}
               startingPersonaIds={agents.startingPersonaIds}
               onOpenAgentProfile={(pubkey, options) => {
                 openProfilePanel?.(pubkey, options);
@@ -235,6 +232,9 @@ export function AgentsView() {
               onStartAgent={(pubkey) => {
                 void agents.handleStart(pubkey);
               }}
+              onRestartAgent={(pubkey) => {
+                void agents.handleRestart(pubkey);
+              }}
               onStartPersona={(persona) => {
                 void agents.handleStartPersona(persona);
               }}
@@ -257,8 +257,7 @@ export function AgentsView() {
               }
               isPersonasLoading={personas.personasQuery.isLoading}
               isPersonasPending={personas.isPending}
-              onCreatePersona={openUnifiedCreate}
-              onDiscoverPersonas={personas.openCatalog}
+              onOpenCatalog={openUnifiedCatalog}
               onDuplicatePersona={personas.openDuplicate}
               onEditPersona={personas.openEdit}
               onSharePersona={personas.openShare}
@@ -266,9 +265,6 @@ export function AgentsView() {
                 void personas.handleSetActive(persona, false, "library");
               }}
               onDeletePersona={personas.openDelete}
-              onImportSnapshotFile={(fileBytes, fileName) => {
-                void personas.handleImportSnapshotFile(fileBytes, fileName);
-              }}
             />
 
             <TeamsSection
@@ -305,29 +301,6 @@ export function AgentsView() {
         returnFocusRef={aiDefaultsTriggerRef}
       />
 
-      {isCreateDialogOpen ? (
-        <AgentDialog
-          definitionError={
-            personas.createPersonaMutation.error instanceof Error
-              ? personas.createPersonaMutation.error
-              : null
-          }
-          isDefinitionPending={personas.isPending}
-          mode="definition"
-          onOpenChange={(open) => {
-            if (!open) setIsCreateDialogOpen(false);
-          }}
-          onSubmitDefinition={personas.handleSubmit}
-          runtimes={personas.acpRuntimesQuery.data ?? []}
-          runtimeCatalogStatus={
-            personas.acpRuntimesQuery.isLoading
-              ? "loading"
-              : personas.acpRuntimesQuery.isError
-                ? "error"
-                : "ready"
-          }
-        />
-      ) : null}
       {agents.agentToAddToChannel ? (
         <AddAgentToChannelDialog
           agent={agents.agentToAddToChannel}
@@ -340,24 +313,6 @@ export function AgentsView() {
           open={agents.agentToAddToChannel !== null}
         />
       ) : null}
-      {agents.createdAgent ? (
-        <SecretRevealDialog
-          created={agents.createdAgent}
-          onOpenChange={(open) => {
-            if (!open) {
-              agents.setCreatedAgent(null);
-            }
-          }}
-        />
-      ) : null}
-      {personas.createdAgent ? (
-        <SecretRevealDialog
-          created={personas.createdAgent}
-          onOpenChange={(open) => {
-            if (!open) personas.dismissCreatedAgent();
-          }}
-        />
-      ) : null}
       {personas.personaDialogState ? (
         <AgentDialog
           description={personas.personaDialogState.description}
@@ -499,6 +454,32 @@ export function AgentsView() {
       ) : null}
       {personas.isCatalogDialogOpen ? (
         <PersonaCatalogDialog
+          createContent={({ onDirtyChange, onRequestClose }) => (
+            <AgentDialog
+              definitionError={
+                personas.createPersonaMutation.error instanceof Error
+                  ? personas.createPersonaMutation.error
+                  : null
+              }
+              embedded
+              isDefinitionPending={personas.isPending}
+              mode="definition"
+              onDirtyChange={onDirtyChange}
+              onOpenChange={(open) => {
+                if (!open) onRequestClose();
+              }}
+              onSubmitDefinition={personas.handleSubmit}
+              runtimes={personas.acpRuntimesQuery.data ?? []}
+              runtimeCatalogStatus={
+                personas.acpRuntimesQuery.isLoading
+                  ? "loading"
+                  : personas.acpRuntimesQuery.isError
+                    ? "error"
+                    : "ready"
+              }
+              submitLabel="Add agent"
+            />
+          )}
           error={
             personas.catalogQuery.error instanceof Error
               ? personas.catalogQuery.error
@@ -519,9 +500,20 @@ export function AgentsView() {
           onClearFeedback={() => {
             personas.clearFeedback("catalog");
           }}
+          onImportFile={(fileBytes, fileName) => {
+            void personas.handleImportSnapshotFile(fileBytes, fileName);
+          }}
           onOpenChange={personas.setIsCatalogDialogOpen}
-          onSelectPersona={(persona, active) => {
-            void personas.handleSetActive(persona, active, "catalog");
+          onSelectPersona={async (persona, active) => {
+            const addedPersona = await personas.handleSetActive(
+              persona,
+              active,
+              "catalog",
+            );
+            if (!active || !addedPersona) return;
+
+            personas.setIsCatalogDialogOpen(false);
+            openPersonaProfilePanel?.(addedPersona);
           }}
           open={personas.isCatalogDialogOpen}
           personas={personas.catalogPersonas}
diff --git a/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx b/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx
index 622fe5d6745..c81d4405fb4 100644
--- a/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx
+++ b/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx
@@ -38,6 +38,7 @@ export function PersonaAdvancedFields({
   behaviorDraft,
   disabled,
   envVars,
+  afterRespondTo,
   inheritedEnvVars = {},
   model,
   modelTuningRuntimeId = "",
@@ -55,6 +56,8 @@ export function PersonaAdvancedFields({
   behaviorDraft: PersonaBehaviorDraft;
   disabled: boolean;
   envVars: EnvVarsValue;
+  /** Optional create-only field rendered after instruction permissions. */
+  afterRespondTo?: React.ReactNode;
   /** Env vars to display as inherited defaults in tuning-field placeholders.
    *  For templates, pass `globalConfig.env_vars` (the fallback layer). */
   inheritedEnvVars?: EnvVarsValue;
@@ -153,6 +156,8 @@ export function PersonaAdvancedFields({
         variant="persona"
       />
 
+      {afterRespondTo}
+
       <div className="grid gap-5 sm:grid-cols-2">
         <div className="space-y-1.5">
           <label
diff --git a/desktop/src/features/agents/ui/PersonaCatalogDialog.tsx b/desktop/src/features/agents/ui/PersonaCatalogDialog.tsx
index e1ec9460920..1b8be031cc8 100644
--- a/desktop/src/features/agents/ui/PersonaCatalogDialog.tsx
+++ b/desktop/src/features/agents/ui/PersonaCatalogDialog.tsx
@@ -1,4 +1,5 @@
 import * as React from "react";
+import { Plus, Upload } from "lucide-react";
 
 import { isCatalogPersonaSelected } from "@/features/agents/lib/catalog";
 import { isCatalogPersona } from "@/features/agents/lib/personaCatalogRelay";
@@ -7,30 +8,48 @@ import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
 import type { AgentPersona } from "@/shared/api/types";
 import { useFeedbackToasts } from "@/shared/hooks/useToastEffect";
 import { cn } from "@/shared/lib/cn";
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from "@/shared/ui/alert-dialog";
 import { Button } from "@/shared/ui/button";
 import { Dialog } from "@/shared/ui/dialog";
 import { ChooserDialogContent } from "@/shared/ui/chooser-dialog-content";
 import { Markdown } from "@/shared/ui/markdown";
 import { Skeleton } from "@/shared/ui/skeleton";
 
-import agentOutlineUrl from "../assets/agent-outline.svg";
 import { AgentDefinitionMetadata } from "./AgentDefinitionMetadata";
 import { PersonaAddedBy } from "./PersonaAddedBy";
 import { personaCatalogCopy } from "./personaLibraryCopy";
 
 type PersonaCatalogDialogProps = {
+  createContent: (controls: {
+    onDirtyChange: (dirty: boolean) => void;
+    onRequestClose: () => void;
+  }) => React.ReactNode;
   error: Error | null;
   feedbackErrorMessage: string | null;
   feedbackNoticeMessage: string | null;
   isLoading: boolean;
   isPending: boolean;
   onClearFeedback: () => void;
+  onImportFile: (fileBytes: number[], fileName: string) => void;
   onOpenChange: (open: boolean) => void;
   onSelectPersona: (persona: AgentPersona, active: boolean) => void;
   open: boolean;
   personas: AgentPersona[];
 };
 
+type PendingNavigation =
+  | { type: "close" }
+  | { type: "selection"; selection: string };
+
 const agentInstructionMarkdownClassName = [
   "mt-3 w-full min-w-0 max-w-full overflow-x-hidden leading-6 text-muted-foreground [&>*]:min-w-0 [&>*]:max-w-full [&_.code-block-lines]:min-w-0 [&_.code-block-lines]:max-w-full [&_.code-block-lines]:whitespace-pre-wrap [&_.code-block-lines]:[overflow-wrap:anywhere] [&_.inline-code-chip]:max-w-full [&_.inline-code-chip]:whitespace-pre-wrap [&_.inline-code-chip]:[overflow-wrap:anywhere] [&_blockquote]:!text-muted-foreground [&_code]:!text-muted-foreground [&_li]:text-muted-foreground [&_ol]:text-muted-foreground [&_p]:text-muted-foreground [&_strong]:text-muted-foreground [&_td]:text-muted-foreground [&_ul]:text-muted-foreground",
   "[&>h1]:!text-sm [&>h1]:!font-semibold [&>h1]:!leading-6 [&>h1]:!tracking-normal [&>h1]:!text-foreground",
@@ -42,48 +61,56 @@ const agentInstructionMarkdownClassName = [
 ].join(" ");
 
 export function PersonaCatalogDialog({
+  createContent,
   error,
   feedbackErrorMessage,
   feedbackNoticeMessage,
   isLoading,
   isPending,
   onClearFeedback,
+  onImportFile,
   onOpenChange,
   onSelectPersona,
   open,
   personas,
 }: PersonaCatalogDialogProps) {
   const contentRef = React.useRef<HTMLDivElement | null>(null);
-  const [selectedPersonaId, setSelectedPersonaId] = React.useState<
-    string | null
-  >(null);
+  const fileInputRef = React.useRef<HTMLInputElement | null>(null);
+  const dragDepthRef = React.useRef(0);
+  const createDirtyRef = React.useRef(false);
+  const [isDragOver, setIsDragOver] = React.useState(false);
+  const [pendingNavigation, setPendingNavigation] =
+    React.useState<PendingNavigation | null>(null);
+  const [selection, setSelection] = React.useState("create");
+  const selectedPersonaId = selection.startsWith("persona:")
+    ? selection.slice("persona:".length)
+    : null;
   const selectedPersona = React.useMemo(() => {
-    if (personas.length === 0) {
+    if (!selectedPersonaId) {
       return null;
     }
 
-    return (
-      personas.find((persona) => persona.id === selectedPersonaId) ??
-      personas[0]
-    );
+    return personas.find((persona) => persona.id === selectedPersonaId) ?? null;
   }, [personas, selectedPersonaId]);
 
   React.useEffect(() => {
-    if (!open) {
-      return;
+    if (open) {
+      createDirtyRef.current = false;
+      setSelection("create");
+      setPendingNavigation(null);
+      dragDepthRef.current = 0;
+      setIsDragOver(false);
     }
+  }, [open]);
 
-    if (personas.length === 0) {
-      setSelectedPersonaId(null);
-      return;
+  React.useEffect(() => {
+    if (
+      selectedPersonaId &&
+      !personas.some((persona) => persona.id === selectedPersonaId)
+    ) {
+      setSelection("create");
     }
-
-    setSelectedPersonaId((current) =>
-      current && personas.some((persona) => persona.id === current)
-        ? current
-        : personas[0].id,
-    );
-  }, [open, personas]);
+  }, [personas, selectedPersonaId]);
 
   useFeedbackToasts(feedbackNoticeMessage, feedbackErrorMessage);
 
@@ -100,96 +127,252 @@ export function PersonaCatalogDialog({
     onSelectPersona(selectedPersona, true);
   };
 
+  const isImportSelected = selection === "import";
+  const handleCreateDirtyChange = React.useCallback((dirty: boolean) => {
+    createDirtyRef.current = dirty;
+  }, []);
+
+  function requestSelection(nextSelection: string) {
+    if (
+      selection === "create" &&
+      nextSelection !== "create" &&
+      createDirtyRef.current
+    ) {
+      setPendingNavigation({
+        type: "selection",
+        selection: nextSelection,
+      });
+      return;
+    }
+    setSelection(nextSelection);
+  }
+
+  function requestClose() {
+    if (selection === "create" && createDirtyRef.current) {
+      setPendingNavigation({ type: "close" });
+      return;
+    }
+    onOpenChange(false);
+  }
+
+  function discardChangesAndNavigate() {
+    const navigation = pendingNavigation;
+    createDirtyRef.current = false;
+    setPendingNavigation(null);
+    if (navigation?.type === "selection") {
+      setSelection(navigation.selection);
+    } else if (navigation?.type === "close") {
+      onOpenChange(false);
+    }
+  }
+
+  React.useEffect(() => {
+    if (!isImportSelected) {
+      dragDepthRef.current = 0;
+      setIsDragOver(false);
+    }
+  }, [isImportSelected]);
+
+  function hasFiles(event: React.DragEvent) {
+    return event.dataTransfer.types.includes("Files");
+  }
+
+  function isAgentSnapshot(file: File) {
+    const lowerName = file.name.toLowerCase();
+    return (
+      lowerName.endsWith(".agent.json") || lowerName.endsWith(".agent.png")
+    );
+  }
+
+  async function importFile(file: File) {
+    if (!isAgentSnapshot(file)) return;
+    const buffer = await file.arrayBuffer();
+    onOpenChange(false);
+    onImportFile(Array.from(new Uint8Array(buffer)), file.name);
+  }
+
   return (
-    <Dialog onOpenChange={onOpenChange} open={open}>
-      <ChooserDialogContent
-        className="h-[42rem] max-w-4xl"
-        contentClassName="flex min-h-0 min-w-0 flex-1 p-0"
-        data-testid="persona-catalog-dialog"
-        description={personaCatalogCopy.dialogDescription}
-        headerClassName="bg-sidebar pb-3 text-sidebar-foreground"
-        headerTestId="persona-catalog-dialog-header"
-        onOpenAutoFocus={(event) => {
-          event.preventDefault();
-          contentRef.current?.focus();
+    <>
+      <Dialog
+        onOpenChange={(nextOpen) => {
+          if (!nextOpen && isPending) return;
+          if (!nextOpen) {
+            requestClose();
+            return;
+          }
+          onOpenChange(true);
         }}
-        ref={contentRef}
-        scrollAreaClassName="flex min-h-0 overflow-hidden px-0"
-        scrollAreaTestId="persona-catalog-dialog-body"
-        tabIndex={-1}
-        title={personaCatalogCopy.dialogTitle}
+        open={open}
       >
-        <PersonaCatalogChooser
-          error={error}
-          isLoading={isLoading}
-          isPending={isPending}
-          isSelectedPersonaActive={selectedPersonaIsActive}
-          onUsePersona={handleUseSelectedPersona}
-          onSelectPersona={setSelectedPersonaId}
-          personas={personas}
-          selectedPersona={selectedPersona}
-          selectedPersonaId={selectedPersona?.id ?? null}
-        />
-      </ChooserDialogContent>
-    </Dialog>
+        <ChooserDialogContent
+          className="h-[42rem] max-w-5xl"
+          contentClassName="flex min-h-0 min-w-0 flex-1 p-0"
+          data-testid="persona-catalog-dialog"
+          description={personaCatalogCopy.dialogDescription}
+          headerClassName="bg-sidebar pb-3 text-sidebar-foreground"
+          headerTestId="persona-catalog-dialog-header"
+          onOpenAutoFocus={(event) => {
+            event.preventDefault();
+            contentRef.current?.focus();
+          }}
+          ref={contentRef}
+          scrollAreaClassName="flex min-h-0 overflow-hidden px-0"
+          scrollAreaTestId="persona-catalog-dialog-body"
+          tabIndex={-1}
+          title={personaCatalogCopy.dialogTitle}
+          onDragEnter={(event) => {
+            if (!isImportSelected || !hasFiles(event)) return;
+            event.preventDefault();
+            dragDepthRef.current += 1;
+            setIsDragOver(true);
+          }}
+          onDragLeave={(event) => {
+            if (!isImportSelected) return;
+            event.preventDefault();
+            dragDepthRef.current = Math.max(0, dragDepthRef.current - 1);
+            if (dragDepthRef.current === 0) setIsDragOver(false);
+          }}
+          onDragOver={(event) => {
+            if (!isImportSelected || !hasFiles(event)) return;
+            event.preventDefault();
+            event.dataTransfer.dropEffect = "copy";
+          }}
+          onDrop={(event) => {
+            if (!isImportSelected || !hasFiles(event)) return;
+            event.preventDefault();
+            dragDepthRef.current = 0;
+            setIsDragOver(false);
+            const file = event.dataTransfer.files[0];
+            if (file) void importFile(file);
+          }}
+        >
+          <PersonaCatalogChooser
+            createContent={createContent({
+              onDirtyChange: handleCreateDirtyChange,
+              onRequestClose: requestClose,
+            })}
+            error={error}
+            isDragOver={isDragOver}
+            isLoading={isLoading}
+            isPending={isPending}
+            onImport={() => fileInputRef.current?.click()}
+            isSelectedPersonaActive={selectedPersonaIsActive}
+            onUsePersona={handleUseSelectedPersona}
+            onSelectionChange={requestSelection}
+            personas={personas}
+            selection={selection}
+            selectedPersona={selectedPersona}
+            selectedPersonaId={selectedPersona?.id ?? null}
+          />
+          <input
+            accept=".agent.json,.agent.png"
+            className="hidden"
+            data-testid="agent-catalog-import-input"
+            onChange={(event) => {
+              const file = event.target.files?.[0];
+              if (file) void importFile(file);
+              event.target.value = "";
+            }}
+            ref={fileInputRef}
+            type="file"
+          />
+        </ChooserDialogContent>
+      </Dialog>
+
+      <AlertDialog
+        onOpenChange={(nextOpen) => {
+          if (!nextOpen) setPendingNavigation(null);
+        }}
+        open={pendingNavigation !== null}
+      >
+        <AlertDialogContent data-testid="discard-create-agent-dialog">
+          <AlertDialogHeader>
+            <AlertDialogTitle>Discard agent changes?</AlertDialogTitle>
+            <AlertDialogDescription>
+              Your changes to this agent will be lost.
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel>Keep editing</AlertDialogCancel>
+            <AlertDialogAction asChild>
+              <Button onClick={discardChangesAndNavigate} variant="destructive">
+                Discard changes
+              </Button>
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </>
   );
 }
 
 type PersonaCatalogChooserProps = {
+  createContent: React.ReactNode;
   error: Error | null;
+  isDragOver: boolean;
   isLoading: boolean;
   isPending: boolean;
   isSelectedPersonaActive: boolean;
+  onImport: () => void;
   onUsePersona: () => void;
-  onSelectPersona: (personaId: string) => void;
+  onSelectionChange: (selection: string) => void;
   personas: AgentPersona[];
+  selection: string;
   selectedPersona: AgentPersona | null;
   selectedPersonaId: string | null;
 };
 
 function PersonaCatalogChooser({
+  createContent,
   error,
+  isDragOver,
   isLoading,
   isPending,
   isSelectedPersonaActive,
+  onImport,
   onUsePersona,
-  onSelectPersona,
+  onSelectionChange,
   personas,
+  selection,
   selectedPersona,
   selectedPersonaId,
 }: PersonaCatalogChooserProps) {
-  if (!isLoading && personas.length === 0 && !error) {
-    return (
-      <div
-        className="flex min-h-0 flex-1 items-center justify-center bg-sidebar px-6 py-10 text-center"
-        data-testid="persona-catalog-empty-state"
-      >
-        <div className="flex max-w-sm flex-col items-center">
-          <img
-            alt=""
-            aria-hidden="true"
-            className="h-32 w-32 dark:opacity-60"
-            data-testid="persona-catalog-empty-agent-artwork"
-            src={agentOutlineUrl}
-          />
-          <p className="mt-4 text-sm font-semibold">
-            {personaCatalogCopy.emptyCatalogTitle}
-          </p>
-          <p className="mt-2 text-sm text-muted-foreground">
-            {personaCatalogCopy.emptyCatalogDescription}
+  return (
+    <div className="relative flex min-h-0 flex-1 flex-col overflow-hidden bg-sidebar sm:flex-row">
+      {selection === "import" && isDragOver ? (
+        <div
+          className="pointer-events-none absolute inset-2 z-50 flex items-center justify-center rounded-2xl border-2 border-dashed border-primary bg-primary/10 backdrop-blur-sm"
+          data-testid="agent-catalog-drop-overlay"
+        >
+          <p className="rounded-full bg-background/90 px-4 py-2 text-sm font-medium text-primary shadow-sm">
+            Drop .agent.json or .agent.png to import
           </p>
         </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex min-h-0 flex-1 flex-col overflow-hidden bg-sidebar sm:flex-row">
+      ) : null}
       <div className="flex max-h-56 min-h-0 flex-col sm:max-h-none sm:w-56">
         <div
           className="min-h-0 flex-1 overflow-y-auto px-2 py-3"
           data-testid="persona-catalog-dialog-scroll-area"
         >
+          <div className="space-y-1">
+            <CatalogNavigationButton
+              icon={<Plus className="h-4 w-4" />}
+              isCurrent={selection === "create"}
+              label="Create agent"
+              onClick={() => onSelectionChange("create")}
+              testId="agent-catalog-create"
+            />
+            <CatalogNavigationButton
+              icon={<Upload className="h-4 w-4" />}
+              isCurrent={selection === "import"}
+              label="Import"
+              onClick={() => onSelectionChange("import")}
+              testId="agent-catalog-import"
+            />
+          </div>
+
+          <div className="my-3 border-t border-sidebar-border/60" />
+
           {isLoading ? <PersonaCatalogListSkeleton /> : null}
 
           {!isLoading && personas.length > 0 ? (
@@ -209,7 +392,7 @@ function PersonaCatalogChooser({
                     data-testid={`persona-catalog-list-item-${persona.id}`}
                     key={persona.id}
                     onClick={() => {
-                      onSelectPersona(persona.id);
+                      onSelectionChange(`persona:${persona.id}`);
                     }}
                     type="button"
                   >
@@ -226,57 +409,117 @@ function PersonaCatalogChooser({
               })}
             </div>
           ) : null}
-        </div>
-      </div>
-
-      <div className="relative z-10 mb-3 ml-px mr-3 flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden rounded-xl bg-background shadow-[-1px_0_0_0_hsl(var(--sidebar-border)/0.45)]">
-        <div
-          className="min-h-0 min-w-0 max-w-full flex-1 overflow-x-hidden overflow-y-auto px-5 pb-24 pt-5"
-          data-testid="persona-catalog-detail-pane"
-        >
-          {isLoading ? <PersonaCatalogDetailSkeleton /> : null}
-
-          {!isLoading && selectedPersona ? (
-            <PersonaCatalogDetail persona={selectedPersona} />
-          ) : null}
-
-          {error ? (
-            <p className="rounded-lg border border-destructive/30 bg-destructive/10 px-4 py-3 text-sm text-destructive">
-              {error.message}
+          {!isLoading && personas.length === 0 && !error ? (
+            <p className="px-4 py-2 text-xs text-sidebar-foreground/50">
+              No shared agents
             </p>
           ) : null}
         </div>
+      </div>
 
-        <div className="pointer-events-none absolute inset-x-0 bottom-0 flex justify-end bg-gradient-to-t from-background via-background/95 to-transparent px-5 pb-4 pt-12">
-          <Button
-            aria-label={
-              selectedPersona && isSelectedPersonaActive
-                ? `${selectedPersona.displayName} is already in My Agents`
-                : selectedPersona
-                  ? `Add ${selectedPersona.displayName} from Agent Catalog`
-                  : undefined
-            }
-            data-testid={
-              selectedPersona
-                ? `persona-catalog-use-agent-target-${selectedPersona.id}`
-                : "persona-catalog-use-agent-target"
-            }
-            className="pointer-events-auto"
-            disabled={!selectedPersona || isSelectedPersonaActive || isPending}
-            onClick={onUsePersona}
-            size="sm"
-            type="button"
-          >
-            {isSelectedPersonaActive
-              ? personaCatalogCopy.addedAction
-              : personaCatalogCopy.useAction}
-          </Button>
-        </div>
+      <div className="relative z-10 mb-3 ml-px mr-3 flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden rounded-xl bg-background shadow-[-1px_0_0_0_hsl(var(--sidebar-border)/0.45)]">
+        {selection === "create" ? createContent : null}
+        {selection === "import" ? (
+          <ImportAgentPane onImport={onImport} />
+        ) : null}
+        {selectedPersona ? (
+          <>
+            <div
+              className="min-h-0 min-w-0 max-w-full flex-1 overflow-x-hidden overflow-y-auto px-5 pb-20 pt-5"
+              data-testid="persona-catalog-detail-pane"
+            >
+              <PersonaCatalogDetail persona={selectedPersona} />
+            </div>
+            <div className="pointer-events-none absolute inset-x-0 bottom-0 flex justify-end bg-linear-to-t from-background via-background/95 to-transparent px-4 pb-3 pt-10">
+              <Button
+                aria-label={
+                  isSelectedPersonaActive
+                    ? `${selectedPersona.displayName} is already in My Agents`
+                    : `Add ${selectedPersona.displayName} from Agent Catalog`
+                }
+                className="pointer-events-auto"
+                data-testid={`persona-catalog-use-agent-target-${selectedPersona.id}`}
+                disabled={isSelectedPersonaActive || isPending}
+                onClick={onUsePersona}
+                type="button"
+              >
+                {isSelectedPersonaActive
+                  ? personaCatalogCopy.addedAction
+                  : personaCatalogCopy.useAction}
+              </Button>
+            </div>
+          </>
+        ) : null}
+        {selection.startsWith("persona:") && isLoading ? (
+          <div className="min-h-0 flex-1 overflow-y-auto px-5 py-5">
+            <PersonaCatalogDetailSkeleton />
+          </div>
+        ) : null}
+        {error ? (
+          <p className="m-5 rounded-lg border border-destructive/30 bg-destructive/10 px-4 py-3 text-sm text-destructive">
+            {error.message}
+          </p>
+        ) : null}
       </div>
     </div>
   );
 }
 
+function CatalogNavigationButton({
+  icon,
+  isCurrent,
+  label,
+  onClick,
+  testId,
+}: {
+  icon: React.ReactNode;
+  isCurrent: boolean;
+  label: string;
+  onClick: () => void;
+  testId: string;
+}) {
+  return (
+    <button
+      aria-current={isCurrent ? "true" : undefined}
+      className={cn(
+        "flex w-full items-center gap-2 rounded-lg px-4 py-2 text-left text-sm font-medium transition-[background-color,color,box-shadow] focus:outline-hidden focus-visible:ring-2 focus-visible:ring-sidebar-ring/50 focus-visible:ring-offset-2 focus-visible:ring-offset-sidebar",
+        isCurrent
+          ? "bg-sidebar-active text-sidebar-active-foreground"
+          : "text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground",
+      )}
+      data-testid={testId}
+      onClick={onClick}
+      type="button"
+    >
+      {icon}
+      <span>{label}</span>
+    </button>
+  );
+}
+
+function ImportAgentPane({ onImport }: { onImport: () => void }) {
+  return (
+    <button
+      className="m-5 flex min-h-0 flex-1 flex-col items-center justify-center rounded-xl border-2 border-dashed border-border bg-muted/20 px-8 py-12 text-center transition-colors hover:border-primary/60 hover:bg-primary/5 focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring"
+      data-testid="agent-catalog-import-dropzone"
+      onClick={onImport}
+      type="button"
+    >
+      <span className="flex h-14 w-14 items-center justify-center rounded-full bg-muted text-muted-foreground">
+        <Upload className="h-6 w-6" />
+      </span>
+      <span className="mt-4 text-base font-semibold">Import an agent</span>
+      <span className="mt-2 max-w-sm text-sm text-muted-foreground">
+        Drop an .agent.json or .agent.png file anywhere in this window, or
+        choose a file.
+      </span>
+      <span className="mt-5 rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground">
+        Choose file
+      </span>
+    </button>
+  );
+}
+
 /**
  * Derives the "Added by" label for a catalog entry from a resolved profile
  * summary. Prefers `displayName`, falls back to `name`, then to the default
diff --git a/desktop/src/features/agents/ui/PromptSectionAccordion.tsx b/desktop/src/features/agents/ui/PromptSectionAccordion.tsx
index 0b5e58cc6c7..ad5346db157 100644
--- a/desktop/src/features/agents/ui/PromptSectionAccordion.tsx
+++ b/desktop/src/features/agents/ui/PromptSectionAccordion.tsx
@@ -47,7 +47,7 @@ export function PromptSectionAccordion({
             <div
               className={cn(
                 "text-sm font-semibold text-foreground",
-                !open && "line-clamp-2 wrap-break-word",
+                !open && "line-clamp-2 wrap-anywhere",
               )}
             >
               {section.title}
@@ -56,8 +56,8 @@ export function PromptSectionAccordion({
               className={cn(
                 "mt-1 text-xs leading-5 text-foreground/70",
                 open
-                  ? "whitespace-pre-wrap wrap-break-word"
-                  : "line-clamp-2 wrap-break-word",
+                  ? "whitespace-pre-wrap wrap-anywhere"
+                  : "line-clamp-2 wrap-anywhere",
               )}
             >
               {body.length > 0 ? (
diff --git a/desktop/src/features/agents/ui/RequestedAgentCreateDialogs.tsx b/desktop/src/features/agents/ui/RequestedAgentCreateDialogs.tsx
index 966e2e5d0f9..4b04de638d7 100644
--- a/desktop/src/features/agents/ui/RequestedAgentCreateDialogs.tsx
+++ b/desktop/src/features/agents/ui/RequestedAgentCreateDialogs.tsx
@@ -6,7 +6,6 @@ import {
   type OpenCreateAgentOptions,
 } from "@/features/agents/openCreateAgentEvent";
 import { AgentDialog } from "./AgentDialog";
-import { SecretRevealDialog } from "./SecretRevealDialog";
 import { usePersonaActions } from "./usePersonaActions";
 
 /** App-level create flow so contextual entry points do not navigate away. */
@@ -64,19 +63,6 @@ export function RequestedAgentCreateDialogs() {
           }
         />
       ) : null}
-      {personas.createdAgent ? (
-        <SecretRevealDialog
-          attachmentFailure={personas.attachmentFailure}
-          created={personas.createdAgent}
-          isRetryingAttachment={personas.isRetryingAttachment}
-          onOpenChange={(open) => {
-            if (!open) personas.dismissCreatedAgent();
-          }}
-          onRetryAttachment={() => {
-            void personas.retryAttachment();
-          }}
-        />
-      ) : null}
     </>
   );
 }
diff --git a/desktop/src/features/agents/ui/SecretRevealDialog.tsx b/desktop/src/features/agents/ui/SecretRevealDialog.tsx
deleted file mode 100644
index e1826cec6ea..00000000000
--- a/desktop/src/features/agents/ui/SecretRevealDialog.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import type { AgentChannelAttachmentFailure } from "@/features/agents/channelAttachmentFailure";
-import type { CreateManagedAgentResponse } from "@/shared/api/types";
-import { Button } from "@/shared/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from "@/shared/ui/dialog";
-import { CopyButton } from "./CopyButton";
-
-export function SecretRevealDialog({
-  attachmentFailure,
-  created,
-  isRetryingAttachment = false,
-  onOpenChange,
-  onRetryAttachment,
-}: {
-  attachmentFailure?: AgentChannelAttachmentFailure | null;
-  created: CreateManagedAgentResponse | null;
-  isRetryingAttachment?: boolean;
-  onOpenChange: (open: boolean) => void;
-  onRetryAttachment?: () => void;
-}) {
-  return (
-    <Dialog onOpenChange={onOpenChange} open={created !== null}>
-      <DialogContent className="max-w-2xl overflow-hidden p-0">
-        <div className="flex max-h-[85vh] flex-col">
-          <DialogHeader className="border-b border-border/60 px-6 py-5 pr-14">
-            <DialogTitle>Agent created</DialogTitle>
-            <DialogDescription>
-              Save the private key now. The app can keep running the harness
-              locally, but this secret is only revealed here.
-            </DialogDescription>
-          </DialogHeader>
-
-          <div className="flex-1 space-y-4 overflow-y-auto px-6 py-5">
-            {created ? (
-              <>
-                <div className="rounded-2xl border border-border/70 bg-muted/20 p-4">
-                  <div className="flex items-center justify-between gap-3">
-                    <div>
-                      <p className="text-sm font-semibold tracking-tight">
-                        Private key (nsec)
-                      </p>
-                      <p className="text-sm text-muted-foreground">
-                        This is the agent identity used by `buzz-acp`.
-                      </p>
-                    </div>
-                    <CopyButton
-                      label="Copy key"
-                      value={created.privateKeyNsec}
-                    />
-                  </div>
-                  <code className="mt-3 block break-all rounded-xl border border-border/70 bg-background/80 px-3 py-2 text-xs">
-                    {created.privateKeyNsec}
-                  </code>
-                </div>
-
-                {created.profileSyncError ? (
-                  <p className="rounded-2xl border border-amber-500/30 bg-amber-500/10 px-4 py-3 text-sm text-warning">
-                    {created.profileSyncError}
-                  </p>
-                ) : null}
-
-                {created.spawnError ? (
-                  <p className="rounded-2xl border border-destructive/30 bg-destructive/10 px-4 py-3 text-sm text-destructive">
-                    {created.spawnError}
-                  </p>
-                ) : attachmentFailure ? (
-                  <div
-                    className="space-y-1 rounded-2xl border border-destructive/30 bg-destructive/10 px-4 py-3 text-sm text-destructive"
-                    role="alert"
-                  >
-                    <p>
-                      {created.agent.name} was created, but couldn’t be added to
-                      #{attachmentFailure.channelName}.
-                    </p>
-                    <p>{attachmentFailure.error}</p>
-                  </div>
-                ) : (
-                  <p className="rounded-2xl border border-primary/20 bg-primary/10 px-4 py-3 text-sm text-primary">
-                    {created.agent.name} is ready
-                    {created.agent.status === "running"
-                      ? " and running."
-                      : created.agent.status === "deployed"
-                        ? " and deployed."
-                        : "."}
-                  </p>
-                )}
-              </>
-            ) : null}
-          </div>
-
-          <div className="flex justify-end gap-2 border-t border-border/60 px-6 py-4">
-            {attachmentFailure && onRetryAttachment ? (
-              <Button
-                disabled={isRetryingAttachment}
-                onClick={onRetryAttachment}
-                size="sm"
-                type="button"
-              >
-                {isRetryingAttachment ? "Trying again…" : "Try again"}
-              </Button>
-            ) : null}
-            <Button
-              disabled={isRetryingAttachment}
-              onClick={() => onOpenChange(false)}
-              size="sm"
-              type="button"
-              variant="outline"
-            >
-              Done
-            </Button>
-          </div>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/desktop/src/features/agents/ui/TeamsSection.tsx b/desktop/src/features/agents/ui/TeamsSection.tsx
index c5a7a078b3f..986c9bdc26b 100644
--- a/desktop/src/features/agents/ui/TeamsSection.tsx
+++ b/desktop/src/features/agents/ui/TeamsSection.tsx
@@ -84,6 +84,11 @@ export function TeamsSection({
 
       {!isLoading ? (
         <div className={IDENTITY_CARD_GRID_CLASS}>
+          <NewTeamCard
+            isPending={isPending}
+            onCreate={onCreate}
+            onImport={onImport}
+          />
           {teams.map((team) => {
             const resolution = resolveTeamPersonas(team, personas);
             const missingPersonaCount = resolution.missingPersonaCount;
@@ -169,11 +174,6 @@ export function TeamsSection({
               </TeamIdentityCard>
             );
           })}
-          <NewTeamCard
-            isPending={isPending}
-            onCreate={onCreate}
-            onImport={onImport}
-          />
         </div>
       ) : null}
 
diff --git a/desktop/src/features/agents/ui/UnifiedAgentsSection.tsx b/desktop/src/features/agents/ui/UnifiedAgentsSection.tsx
index cf39b0859e9..b0a835e7a94 100644
--- a/desktop/src/features/agents/ui/UnifiedAgentsSection.tsx
+++ b/desktop/src/features/agents/ui/UnifiedAgentsSection.tsx
@@ -1,6 +1,10 @@
 import * as React from "react";
 import { AlertTriangle, ChevronDown, ChevronRight } from "lucide-react";
 
+import {
+  isAgentCardAvatarLoading,
+  resolveAgentCardAvatarUrl,
+} from "@/features/agents/lib/agentCardAvatar";
 import { resolveAgentCardModelLabel } from "@/features/agents/lib/agentCardModelLabel";
 import { friendlyAgentLastError } from "@/features/agents/lib/friendlyAgentLastError";
 import { isManagedAgentActive } from "@/features/agents/lib/managedAgentControlActions";
@@ -8,15 +12,7 @@ import { useUserProfileQuery } from "@/features/profile/hooks";
 import type { AgentPersona, ManagedAgent } from "@/shared/api/types";
 import type { ProfilePanelOpenOptions } from "@/shared/context/ProfilePanelContext";
 import { useFeedbackToasts } from "@/shared/hooks/useToastEffect";
-import { useFileImportZone } from "@/shared/hooks/useFileImportZone";
 import { Badge } from "@/shared/ui/badge";
-import { RestartDiffBadge } from "./RestartDiffBadge";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/shared/ui/dropdown-menu";
 import { IdentityCardSkeleton } from "@/shared/ui/identity-card-skeleton";
 import { AgentIdentityCard } from "./AgentIdentityCard";
 import { AgentRuntimeAvatarControl } from "./AgentRuntimeAvatarControl";
@@ -32,6 +28,7 @@ type UnifiedAgentsSectionProps = {
   agentsError: Error | null;
   isActionPending: boolean;
   isAgentsLoading: boolean;
+  restartingAgentPubkey: string | null;
   startingAgentPubkey: string | null;
   startingPersonaIds: ReadonlySet<string>;
   onOpenAgentProfile: (
@@ -39,6 +36,7 @@ type UnifiedAgentsSectionProps = {
     options?: ProfilePanelOpenOptions,
   ) => void;
   onOpenPersonaProfile: (persona: AgentPersona) => void;
+  onRestartAgent: (pubkey: string) => void;
   onStartAgent: (pubkey: string) => void;
   onStartPersona: (persona: AgentPersona) => void;
   personas: AgentPersona[];
@@ -47,8 +45,7 @@ type UnifiedAgentsSectionProps = {
   personaFeedbackNoticeMessage: string | null;
   isPersonasLoading: boolean;
   isPersonasPending: boolean;
-  onCreatePersona: () => void;
-  onDiscoverPersonas: () => void;
+  onOpenCatalog: () => void;
   onDuplicatePersona: (persona: AgentPersona) => void;
   onEditPersona: (persona: AgentPersona) => void;
   onSharePersona: (
@@ -58,13 +55,12 @@ type UnifiedAgentsSectionProps = {
   ) => void;
   onDeactivatePersona: (persona: AgentPersona) => void;
   onDeletePersona: (persona: AgentPersona) => void;
-  onImportSnapshotFile: (fileBytes: number[], fileName: string) => void;
 };
 
 const AGENT_CARD_COLUMN_CLASS = "w-full";
 export const AGENT_CARD_GRID_COLUMNS_CLASS =
-  "grid-cols-[repeat(auto-fill,minmax(220px,240px))]";
-export const IDENTITY_CARD_GRID_CLASS = `${AGENT_CARD_COLUMN_CLASS} ${AGENT_CARD_GRID_COLUMNS_CLASS} grid justify-start gap-3 [@container(max-width:40rem)]:justify-center`;
+  "grid-cols-1 [@container(min-width:21rem)]:grid-cols-2 [@container(min-width:32rem)]:grid-cols-3 [@container(min-width:43rem)]:grid-cols-4 [@container(min-width:54rem)]:grid-cols-5";
+export const IDENTITY_CARD_GRID_CLASS = `${AGENT_CARD_COLUMN_CLASS} ${AGENT_CARD_GRID_COLUMNS_CLASS} grid gap-3`;
 
 export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
   const {
@@ -75,10 +71,12 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
     agentsError,
     isActionPending,
     isAgentsLoading,
+    restartingAgentPubkey,
     startingAgentPubkey,
     startingPersonaIds,
     onOpenAgentProfile,
     onOpenPersonaProfile,
+    onRestartAgent,
     onStartAgent,
     onStartPersona,
     personas,
@@ -87,14 +85,12 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
     personaFeedbackNoticeMessage,
     isPersonasLoading,
     isPersonasPending,
-    onCreatePersona,
-    onDiscoverPersonas,
+    onOpenCatalog,
     onDuplicatePersona,
     onEditPersona,
     onSharePersona,
     onDeactivatePersona,
     onDeletePersona,
-    onImportSnapshotFile,
   } = props;
 
   const { groups, ungrouped, unknown } = React.useMemo(
@@ -102,14 +98,6 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
     [personas, agents],
   );
   const [collapsed, setCollapsed] = React.useState<Set<string>>(new Set());
-  const {
-    fileInputRef,
-    isDragOver,
-    dropHandlers,
-    handleFileChange,
-    openFilePicker,
-  } = useFileImportZone({ onImportFile: onImportSnapshotFile });
-
   function toggle(key: string) {
     setCollapsed((prev) => {
       const next = new Set(prev);
@@ -127,29 +115,18 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
     <section
       className="relative space-y-4"
       data-testid="agents-library-personas"
-      {...dropHandlers}
     >
-      {isDragOver ? (
-        <div className="pointer-events-none absolute -inset-1 z-10 flex items-center justify-center rounded-2xl border-2 border-dashed border-primary/50 bg-background/80 backdrop-blur-sm">
-          <p className="text-sm font-medium text-primary">
-            Drop .agent.json or .agent.png to import
-          </p>
-        </div>
-      ) : null}
-
-      <input
-        accept=".agent.json,.agent.png"
-        className="hidden"
-        onChange={handleFileChange}
-        ref={fileInputRef}
-        type="file"
-      />
-
       {isLoading ? <LoadingSkeleton /> : null}
 
       {!isLoading ? (
         <div className="space-y-3" data-testid="unified-agents-groups">
           <div className={IDENTITY_CARD_GRID_CLASS}>
+            <CreateIdentityCard
+              ariaLabel="New agent"
+              dataTestId="new-agent-card"
+              disabled={isPersonasPending}
+              onClick={onOpenCatalog}
+            />
             {groups.map((group) => {
               const profileAgent = pickProfileAgent(group.agents);
               return (
@@ -175,21 +152,17 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
                   defaultModel={defaultModel}
                   key={group.persona.id}
                   persona={group.persona}
+                  restartingAgentPubkey={restartingAgentPubkey}
                   startingAgentPubkey={startingAgentPubkey}
                   startingPersonaIds={startingPersonaIds}
                   onOpenAgentProfile={onOpenAgentProfile}
                   onOpenPersonaProfile={onOpenPersonaProfile}
+                  onRestartAgent={onRestartAgent}
                   onStartAgent={onStartAgent}
                   onStartPersona={onStartPersona}
                 />
               );
             })}
-            <NewAgentCard
-              isPending={isPersonasPending}
-              onCreate={onCreatePersona}
-              onDiscover={onDiscoverPersonas}
-              onImport={openFilePicker}
-            />
           </div>
 
           {unknown.length > 0 ? (
@@ -199,9 +172,11 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
               defaultModel={defaultModel}
               groupKey="__unknown__"
               label="Unknown agents"
+              restartingAgentPubkey={restartingAgentPubkey}
               startingAgentPubkey={startingAgentPubkey}
               onToggle={toggle}
               onOpenAgentProfile={onOpenAgentProfile}
+              onRestartAgent={onRestartAgent}
               onStartAgent={onStartAgent}
             />
           ) : null}
@@ -212,9 +187,11 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
               defaultModel={defaultModel}
               groupKey="__ungrouped__"
               label="Custom agents"
+              restartingAgentPubkey={restartingAgentPubkey}
               startingAgentPubkey={startingAgentPubkey}
               onToggle={toggle}
               onOpenAgentProfile={onOpenAgentProfile}
+              onRestartAgent={onRestartAgent}
               onStartAgent={onStartAgent}
             />
           ) : null}
@@ -244,10 +221,12 @@ function AgentPersonaCard({
   agent,
   defaultModel,
   persona,
+  restartingAgentPubkey,
   startingAgentPubkey,
   startingPersonaIds,
   onOpenAgentProfile,
   onOpenPersonaProfile,
+  onRestartAgent,
   onStartAgent,
   onStartPersona,
 }: {
@@ -258,6 +237,7 @@ function AgentPersonaCard({
   agent: ManagedAgent | undefined;
   defaultModel: string;
   persona: AgentPersona;
+  restartingAgentPubkey: string | null;
   startingAgentPubkey: string | null;
   startingPersonaIds: ReadonlySet<string>;
   onOpenAgentProfile: (
@@ -265,6 +245,7 @@ function AgentPersonaCard({
     options?: ProfilePanelOpenOptions,
   ) => void;
   onOpenPersonaProfile: (persona: AgentPersona) => void;
+  onRestartAgent: (pubkey: string) => void;
   onStartAgent: (pubkey: string) => void;
   onStartPersona: (persona: AgentPersona) => void;
 }) {
@@ -277,7 +258,7 @@ function AgentPersonaCard({
   const isActive = agent ? isManagedAgentActive(agent) : false;
   const profileQuery = useUserProfileQuery(agent?.pubkey);
   const avatarUrl = agent
-    ? firstAvatarUrl(persona.avatarUrl, profileQuery.data?.avatarUrl)
+    ? resolveAgentCardAvatarUrl(profileQuery.data?.avatarUrl, persona.avatarUrl)
     : persona.avatarUrl;
   const friendlyError = agent
     ? friendlyAgentLastError(agent.lastError, agent.lastErrorCode)?.copy
@@ -288,7 +269,7 @@ function AgentPersonaCard({
     <AgentIdentityCard
       actions={actions?.(
         avatarUrl,
-        Boolean(agent && !persona.avatarUrl && profileQuery.isPending),
+        isAgentCardAvatarLoading(Boolean(agent), profileQuery.isPending),
       )}
       ariaLabel={`${title} agent profile`}
       avatar={
@@ -299,13 +280,19 @@ function AgentPersonaCard({
             errorLabel={friendlyError}
             errorTestId={`agent-runtime-error-${agent.pubkey}`}
             isActive={isActive}
+            isRestarting={restartingAgentPubkey === agent.pubkey}
             isStarting={startingAgentPubkey === agent.pubkey}
             label={title}
+            requiresRestart={agent.needsRestart}
             startTestId={`agent-runtime-start-${agent.pubkey}`}
             onOpenError={() => {
               onOpenAgentProfile(agent.pubkey, { tab: "runtime" });
             }}
-            onStart={() => onStartAgent(agent.pubkey)}
+            onStart={() =>
+              agent.needsRestart
+                ? onRestartAgent(agent.pubkey)
+                : onStartAgent(agent.pubkey)
+            }
           />
         ) : (
           <AgentRuntimeAvatarControl
@@ -339,11 +326,6 @@ function AgentPersonaCard({
             <AlertTriangle className="h-3 w-3" />
             Configuration missing
           </Badge>
-        ) : agent?.needsRestart ? (
-          <RestartDiffBadge
-            autoRestartEnabled={agent.autoRestartOnConfigChange}
-            restartDiff={agent.restartDiff}
-          />
         ) : null
       }
     />
@@ -353,17 +335,21 @@ function AgentPersonaCard({
 function StandaloneAgentCard({
   agent,
   defaultModel,
+  restartingAgentPubkey,
   startingAgentPubkey,
   onOpenAgentProfile,
+  onRestartAgent,
   onStartAgent,
 }: {
   agent: ManagedAgent;
   defaultModel: string;
+  restartingAgentPubkey: string | null;
   startingAgentPubkey: string | null;
   onOpenAgentProfile: (
     pubkey: string,
     options?: ProfilePanelOpenOptions,
   ) => void;
+  onRestartAgent: (pubkey: string) => void;
   onStartAgent: (pubkey: string) => void;
 }) {
   const title = agent.name;
@@ -385,13 +371,19 @@ function StandaloneAgentCard({
           errorLabel={friendlyError}
           errorTestId={`agent-runtime-error-${agent.pubkey}`}
           isActive={isActive}
+          isRestarting={restartingAgentPubkey === agent.pubkey}
           isStarting={startingAgentPubkey === agent.pubkey}
           label={title}
+          requiresRestart={agent.needsRestart}
           startTestId={`agent-runtime-start-${agent.pubkey}`}
           onOpenError={() => {
             onOpenAgentProfile(agent.pubkey, { tab: "runtime" });
           }}
-          onStart={() => onStartAgent(agent.pubkey)}
+          onStart={() =>
+            agent.needsRestart
+              ? onRestartAgent(agent.pubkey)
+              : onStartAgent(agent.pubkey)
+          }
         />
       }
       avatarUrl={profileQuery.data?.avatarUrl}
@@ -414,65 +406,12 @@ function StandaloneAgentCard({
             <AlertTriangle className="h-3 w-3" />
             Configuration missing
           </Badge>
-        ) : agent.needsRestart ? (
-          <RestartDiffBadge
-            autoRestartEnabled={agent.autoRestartOnConfigChange}
-            restartDiff={agent.restartDiff}
-          />
         ) : null
       }
     />
   );
 }
 
-function firstAvatarUrl(
-  ...candidates: Array<string | null | undefined>
-): string | null {
-  for (const candidate of candidates) {
-    const trimmed = candidate?.trim();
-    if (trimmed) return trimmed;
-  }
-  return null;
-}
-
-function NewAgentCard({
-  isPending,
-  onCreate,
-  onDiscover,
-  onImport,
-}: {
-  isPending: boolean;
-  onCreate: () => void;
-  onDiscover: () => void;
-  onImport: () => void;
-}) {
-  return (
-    <DropdownMenu modal={false}>
-      <DropdownMenuTrigger asChild>
-        <CreateIdentityCard ariaLabel="New agent" dataTestId="new-agent-card" />
-      </DropdownMenuTrigger>
-      <DropdownMenuContent
-        align="start"
-        onCloseAutoFocus={(event) => event.preventDefault()}
-      >
-        <DropdownMenuItem disabled={isPending} onClick={onCreate}>
-          Create agent
-        </DropdownMenuItem>
-        <DropdownMenuItem disabled={isPending} onClick={onDiscover}>
-          Discover agents
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          data-testid="import-agent-snapshot-menu-item"
-          disabled={isPending}
-          onClick={onImport}
-        >
-          Import
-        </DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-}
-
 function LoadingSkeleton() {
   return (
     <div className={IDENTITY_CARD_GRID_CLASS}>
@@ -498,9 +437,11 @@ function CollapsibleAgentGroup({
   agents,
   collapsed,
   defaultModel,
+  restartingAgentPubkey,
   startingAgentPubkey,
   onToggle,
   onOpenAgentProfile,
+  onRestartAgent,
   onStartAgent,
 }: {
   groupKey: string;
@@ -508,12 +449,14 @@ function CollapsibleAgentGroup({
   agents: ManagedAgent[];
   collapsed: ReadonlySet<string>;
   defaultModel: string;
+  restartingAgentPubkey: string | null;
   startingAgentPubkey: string | null;
   onToggle: (key: string) => void;
   onOpenAgentProfile: (
     pubkey: string,
     options?: ProfilePanelOpenOptions,
   ) => void;
+  onRestartAgent: (pubkey: string) => void;
   onStartAgent: (pubkey: string) => void;
 }) {
   const isCollapsed = collapsed.has(groupKey);
@@ -539,8 +482,10 @@ function CollapsibleAgentGroup({
               agent={agent}
               defaultModel={defaultModel}
               key={agent.pubkey}
+              restartingAgentPubkey={restartingAgentPubkey}
               startingAgentPubkey={startingAgentPubkey}
               onOpenAgentProfile={onOpenAgentProfile}
+              onRestartAgent={onRestartAgent}
               onStartAgent={onStartAgent}
             />
           ))}
diff --git a/desktop/src/features/agents/ui/WhereToRunSection.tsx b/desktop/src/features/agents/ui/WhereToRunSection.tsx
index ee9ec37132d..eb2fc8f0f12 100644
--- a/desktop/src/features/agents/ui/WhereToRunSection.tsx
+++ b/desktop/src/features/agents/ui/WhereToRunSection.tsx
@@ -5,6 +5,7 @@ import { useBackendProvidersQuery } from "@/features/agents/hooks";
 import { probeBackendProvider } from "@/shared/api/tauri";
 
 import { ProviderConfigFields } from "./ProviderConfigFields";
+import { PersonaDropdownField } from "./PersonaDropdownField";
 import {
   applyProbeResult,
   emptyWhereToRunDraft,
@@ -23,6 +24,16 @@ export function WhereToRunSection({
 }) {
   const backendProviders = useBackendProvidersQuery().data ?? [];
   const [probeError, setProbeError] = React.useState<string | null>(null);
+  const runOnOptions = React.useMemo(
+    () => [
+      { label: "This computer", value: "local" },
+      ...backendProviders.map((provider) => ({
+        label: provider.id,
+        value: provider.id,
+      })),
+    ],
+    [backendProviders],
+  );
   const isProviderMode = draft.runOn !== "local";
   const selectedBackendProvider = React.useMemo(
     () =>
@@ -51,7 +62,7 @@ export function WhereToRunSection({
     ? (selectedBackendProvider?.binaryPath ?? null)
     : null;
   React.useEffect(() => {
-    if (!selectedBinaryPath) {
+    if (!selectedBinaryPath || draft.probedProvider) {
       setProbeError(null);
       return;
     }
@@ -70,7 +81,7 @@ export function WhereToRunSection({
     return () => {
       cancelled = true;
     };
-  }, [selectedBinaryPath]);
+  }, [selectedBinaryPath, draft.probedProvider]);
 
   if (backendProviders.length === 0) return null;
 
@@ -80,25 +91,19 @@ export function WhereToRunSection({
         <label className="text-sm font-medium" htmlFor="agent-run-on">
           Run on
         </label>
-        <select
-          className="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-xs"
+        <PersonaDropdownField
           disabled={isPending}
           id="agent-run-on"
-          onChange={(event) =>
+          onValueChange={(runOn) =>
             onDraftChange({
               ...emptyWhereToRunDraft,
-              runOn: event.target.value,
+              runOn,
             })
           }
+          options={runOnOptions}
+          placeholder="Choose where to run"
           value={draft.runOn}
-        >
-          <option value="local">This computer</option>
-          {backendProviders.map((provider) => (
-            <option key={provider.id} value={provider.id}>
-              {provider.id}
-            </option>
-          ))}
-        </select>
+        />
       </div>
 
       {isProviderMode && selectedBackendProvider ? (
diff --git a/desktop/src/features/agents/ui/personaLibraryCopy.ts b/desktop/src/features/agents/ui/personaLibraryCopy.ts
index 79ddad1c3ce..dd4b0b5209b 100644
--- a/desktop/src/features/agents/ui/personaLibraryCopy.ts
+++ b/desktop/src/features/agents/ui/personaLibraryCopy.ts
@@ -15,7 +15,7 @@ export const personaLibraryCopy = {
 export const personaCatalogCopy = {
   title: "Agent Catalog",
   description: "Browse agents shared to this relay.",
-  dialogTitle: "Agent Catalog",
+  dialogTitle: "Add agent",
   dialogDescription: "Browse agents shared to this relay.",
   emptyTitle: "You're all set",
   emptyDescription: "Everything in Agent Catalog is already in My Agents.",
diff --git a/desktop/src/features/agents/ui/useManagedAgentActions.ts b/desktop/src/features/agents/ui/useManagedAgentActions.ts
index e1c2e9c9fc1..8270bea11f8 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 { toast } from "sonner";
 
 import {
   type AttachManagedAgentToChannelResult,
@@ -15,17 +16,13 @@ import {
 import { useGlobalAgentConfig } from "@/features/agents/useGlobalAgentConfig";
 import { useChannelsQuery } from "@/features/channels/hooks";
 import { usePresenceQuery } from "@/features/presence/hooks";
-import type {
-  AgentPersona,
-  Channel,
-  CreateManagedAgentResponse,
-  ManagedAgent,
-} from "@/shared/api/types";
+import type { AgentPersona, Channel, ManagedAgent } from "@/shared/api/types";
 import { removeChannelMember } from "@/shared/api/tauri";
 import { normalizePubkey } from "@/shared/lib/pubkey";
 import {
   deleteManagedAgentWithRules,
   isManagedAgentActive,
+  respawnManagedAgentWithRules,
   startManagedAgentWithRules,
   stopManagedAgentWithRules,
 } from "../lib/managedAgentControlActions";
@@ -51,12 +48,13 @@ export function useManagedAgentActions() {
   const [isCreateOpen, setIsCreateOpen] = React.useState(false);
   const [agentToAddToChannel, setAgentToAddToChannel] =
     React.useState<ManagedAgent | null>(null);
-  const [createdAgent, setCreatedAgent] =
-    React.useState<CreateManagedAgentResponse | null>(null);
   const [startingPersonaIds, setStartingPersonaIds] = React.useState<
     ReadonlySet<string>
   >(() => new Set());
   const startingPersonaIdsRef = React.useRef(new Set<string>());
+  const [restartingAgentPubkey, setRestartingAgentPubkey] = React.useState<
+    string | null
+  >(null);
   const [logAgentPubkey, setLogAgentPubkey] = React.useState<string | null>(
     null,
   );
@@ -174,6 +172,30 @@ export function useManagedAgentActions() {
     }
   }
 
+  async function handleRestart(pubkey: string) {
+    if (restartingAgentPubkey) return;
+    clearFeedback();
+    setRestartingAgentPubkey(pubkey);
+    try {
+      const agent = managedAgents.find(
+        (candidate) => candidate.pubkey === pubkey,
+      );
+      if (!agent) return;
+      await respawnManagedAgentWithRules({
+        agent,
+        startManagedAgent: startMutation.mutateAsync,
+        stopManagedAgent: stopMutation.mutateAsync,
+        onStopped: () => clearActiveTurnsForAgentOnStop(agent.pubkey),
+      });
+    } catch (error) {
+      setActionErrorMessage(
+        error instanceof Error ? error.message : "Failed to restart agent.",
+      );
+    } finally {
+      setRestartingAgentPubkey(null);
+    }
+  }
+
   function setPersonaStartPending(personaId: string, pending: boolean) {
     const next = new Set(startingPersonaIdsRef.current);
     if (pending) {
@@ -201,13 +223,11 @@ export function useManagedAgentActions() {
       const input = await buildInstanceInputForDefinition(persona, runtime);
 
       const created = await createAgentMutation.mutateAsync(input);
-      setCreatedAgent(created);
+      toast.success("Agent created");
       const notices = [...warnings];
 
       if (created.spawnError) {
         setActionErrorMessage(created.spawnError);
-      } else {
-        notices.push(`Started ${created.agent.name}.`);
       }
 
       if (created.profileSyncError) {
@@ -387,6 +407,7 @@ export function useManagedAgentActions() {
   }
 
   const isPending =
+    restartingAgentPubkey !== null ||
     createAgentMutation.isPending ||
     startMutation.isPending ||
     stopMutation.isPending ||
@@ -411,8 +432,6 @@ export function useManagedAgentActions() {
     setIsCreateOpen,
     agentToAddToChannel,
     setAgentToAddToChannel,
-    createdAgent,
-    setCreatedAgent,
     logAgentPubkey,
     setLogAgentPubkey,
     actionNoticeMessage,
@@ -420,8 +439,10 @@ export function useManagedAgentActions() {
     actionErrorMessage,
     setActionErrorMessage,
     startingAgentPubkey,
+    restartingAgentPubkey,
     startingPersonaIds,
     handleStart,
+    handleRestart,
     handleStartPersona,
     handleStop,
     handleDelete,
diff --git a/desktop/src/features/agents/ui/usePersonaActions.ts b/desktop/src/features/agents/ui/usePersonaActions.ts
index 2c7668969a1..b4ef5afb6c8 100644
--- a/desktop/src/features/agents/ui/usePersonaActions.ts
+++ b/desktop/src/features/agents/ui/usePersonaActions.ts
@@ -254,10 +254,6 @@ export function usePersonaActions() {
             setPersonaErrorMessage(
               `${persona.displayName} was created, but it did not start: ${created.spawnError}`,
             );
-          } else {
-            setPersonaNoticeMessage(
-              `Created and started ${created.agent.name}.`,
-            );
           }
           if (created.profileSyncError) {
             setPersonaErrorMessage(
@@ -301,9 +297,10 @@ export function usePersonaActions() {
     persona: AgentPersona,
     active: boolean,
     surface: PersonaFeedbackSurface,
-  ) {
+  ): Promise<AgentPersona | null> {
     clearFeedback(surface);
     try {
+      let updatedPersona: AgentPersona;
       if (active && isCatalogPersona(persona)) {
         const localPersona = findLocalPersonaForCatalogEntry(
           personas,
@@ -312,13 +309,15 @@ export function usePersonaActions() {
 
         if (localPersona) {
           if (!localPersona.isActive) {
-            await setPersonaActiveMutation.mutateAsync({
+            updatedPersona = await setPersonaActiveMutation.mutateAsync({
               id: localPersona.id,
               active: true,
             });
+          } else {
+            updatedPersona = localPersona;
           }
         } else {
-          await createPersonaMutation.mutateAsync({
+          updatedPersona = await createPersonaMutation.mutateAsync({
             displayName: persona.displayName,
             avatarUrl: persona.avatarUrl ?? undefined,
             systemPrompt: persona.systemPrompt,
@@ -342,13 +341,17 @@ export function usePersonaActions() {
           });
         }
       } else {
-        await setPersonaActiveMutation.mutateAsync({ id: persona.id, active });
+        updatedPersona = await setPersonaActiveMutation.mutateAsync({
+          id: persona.id,
+          active,
+        });
       }
       setPersonaNoticeMessage(
         active
           ? `Selected ${persona.displayName} for My Agents.`
           : `Deselected ${persona.displayName} from My Agents.`,
       );
+      return updatedPersona;
     } catch (error) {
       setPersonaErrorMessage(
         error instanceof Error
@@ -357,6 +360,7 @@ export function usePersonaActions() {
             ? "Failed to select agent for My Agents."
             : "Failed to deselect agent from My Agents.",
       );
+      return null;
     }
   }
 
diff --git a/desktop/src/features/agents/useCreatedAgentChannelAttachment.ts b/desktop/src/features/agents/useCreatedAgentChannelAttachment.ts
index e016766c2e1..a754469f69c 100644
--- a/desktop/src/features/agents/useCreatedAgentChannelAttachment.ts
+++ b/desktop/src/features/agents/useCreatedAgentChannelAttachment.ts
@@ -1,82 +1,74 @@
-import * as React from "react";
+import { toast } from "sonner";
 
 import { attachManagedAgentToChannel } from "./channelAgents";
-import type { AgentChannelAttachmentFailure } from "./channelAttachmentFailure";
 import type { Channel, CreateManagedAgentResponse } from "@/shared/api/types";
 
 type TargetChannel = Pick<Channel, "id" | "name">;
 
-/**
- * Keeps agent creation successful even when the follow-up channel attachment
- * fails, and retries only that attachment rather than recreating the agent.
- */
-export function useCreatedAgentChannelAttachment() {
-  const [createdAgent, setCreatedAgent] =
-    React.useState<CreateManagedAgentResponse | null>(null);
-  const [attachmentFailure, setAttachmentFailure] =
-    React.useState<AgentChannelAttachmentFailure | null>(null);
-  const targetChannelRef = React.useRef<TargetChannel | null>(null);
-  const [isRetryingAttachment, setIsRetryingAttachment] = React.useState(false);
+async function attach(
+  created: CreateManagedAgentResponse,
+  targetChannel: TargetChannel,
+) {
+  const attached = await attachManagedAgentToChannel(targetChannel.id, {
+    agent: created.agent,
+    role: "bot",
+    ensureRunning: true,
+  });
+  created.agent = attached.agent;
+}
 
-  async function attach(
-    created: CreateManagedAgentResponse,
-    targetChannel: TargetChannel,
-  ) {
-    targetChannelRef.current = targetChannel;
-    try {
-      const attached = await attachManagedAgentToChannel(targetChannel.id, {
-        agent: created.agent,
-        role: "bot",
-        ensureRunning: true,
-      });
-      created.agent = attached.agent;
-      targetChannelRef.current = null;
-      setAttachmentFailure(null);
-    } catch (cause) {
-      setAttachmentFailure({
-        channelName: targetChannel.name,
-        error: cause instanceof Error ? cause.message : "Failed to add agent.",
-      });
-    }
-  }
+function showAttachmentFailure(
+  created: CreateManagedAgentResponse,
+  targetChannel: TargetChannel,
+  cause: unknown,
+  toastId?: string | number,
+) {
+  const error = cause instanceof Error ? cause.message : "Failed to add agent.";
+  const id = toast.warning("Agent created", {
+    description: `${created.agent.name} couldn’t be added to #${targetChannel.name}. ${error}`,
+    id: toastId,
+    action: {
+      label: "Try again",
+      onClick: (event) => {
+        event.preventDefault();
+        toast.loading("Agent created", {
+          description: `Adding ${created.agent.name} to #${targetChannel.name}…`,
+          id,
+        });
+        void attach(created, targetChannel).then(
+          () => {
+            toast.success("Agent created", {
+              description: `Added ${created.agent.name} to #${targetChannel.name}`,
+              id,
+            });
+          },
+          (retryCause: unknown) => {
+            showAttachmentFailure(created, targetChannel, retryCause, id);
+          },
+        );
+      },
+    },
+  });
+}
 
+/** Keeps creation successful when its optional channel attachment fails. */
+export function useCreatedAgentChannelAttachment() {
   async function presentCreatedAgent(
     created: CreateManagedAgentResponse,
     targetChannel?: TargetChannel | null,
   ) {
-    setAttachmentFailure(null);
-    targetChannelRef.current = null;
-    if (!created.spawnError && targetChannel) {
-      await attach(created, targetChannel);
+    if (created.spawnError || !targetChannel) {
+      toast.success("Agent created");
+      return;
     }
-    setCreatedAgent({ ...created });
-  }
-
-  async function retryAttachment() {
-    const targetChannel = targetChannelRef.current;
-    if (!createdAgent || !targetChannel || isRetryingAttachment) return;
 
-    setIsRetryingAttachment(true);
     try {
-      await attach(createdAgent, targetChannel);
-      setCreatedAgent({ ...createdAgent });
-    } finally {
-      setIsRetryingAttachment(false);
+      await attach(created, targetChannel);
+      toast.success("Agent created");
+    } catch (cause) {
+      showAttachmentFailure(created, targetChannel, cause);
     }
   }
 
-  function dismissCreatedAgent() {
-    setCreatedAgent(null);
-    setAttachmentFailure(null);
-    targetChannelRef.current = null;
-  }
-
-  return {
-    attachmentFailure,
-    createdAgent,
-    dismissCreatedAgent,
-    isRetryingAttachment,
-    presentCreatedAgent,
-    retryAttachment,
-  };
+  return { presentCreatedAgent };
 }
diff --git a/desktop/src/features/channels/ui/ChannelManagementSheet.tsx b/desktop/src/features/channels/ui/ChannelManagementSheet.tsx
index 3c1727e00a0..ee963ad01dd 100644
--- a/desktop/src/features/channels/ui/ChannelManagementSheet.tsx
+++ b/desktop/src/features/channels/ui/ChannelManagementSheet.tsx
@@ -124,8 +124,6 @@ export function ChannelManagementSheet({
   const deleteChannelMutation = useDeleteChannelMutation(channelId);
   const joinChannelMutation = useJoinChannelMutation(channelId);
   const leaveChannelMutation = useLeaveChannelMutation(channelId);
-  const channelIdRef = React.useRef(channelId);
-  channelIdRef.current = channelId;
 
   const detail = detailsQuery.data ?? channel;
   const members = React.useMemo(() => {
@@ -167,8 +165,6 @@ export function ChannelManagementSheet({
   );
   const [isDeleteDialogOpen, setIsDeleteDialogOpen] = React.useState(false);
   const [isEditDialogOpen, setIsEditDialogOpen] = React.useState(false);
-  const [isConvertingVisibility, setIsConvertingVisibility] =
-    React.useState(false);
   const [hasUserEditedChannelDraft, setHasUserEditedChannelDraft] =
     React.useState(false);
   const [activeView, setActiveView] = React.useState<"summary" | "canvas">(
@@ -268,6 +264,7 @@ export function ChannelManagementSheet({
     if (!next) {
       setNameDraft(resolvedChannel.name);
       setDescriptionDraft(resolvedChannel.description);
+      setIsPrivateDraft(currentVisibility === "private");
       setIsEphemeralDraft(currentTtlSeconds !== null);
       setTtlSecondsDraft(currentTtlSeconds ?? DEFAULT_EPHEMERAL_TTL_SECONDS);
       setHasUserEditedChannelDraft(false);
@@ -298,25 +295,6 @@ export function ChannelManagementSheet({
     }
   }
 
-  async function handleConvertVisibility(visibility: "open" | "private") {
-    if (visibility === currentVisibility) {
-      return;
-    }
-    setIsConvertingVisibility(true);
-    try {
-      const updatedChannel = await updateChannelDetailsMutation.mutateAsync({
-        visibility,
-      });
-      if (channelIdRef.current === updatedChannel.id) {
-        setIsPrivateDraft(visibility === "private");
-      }
-    } catch {
-      // React Query stores mutation errors; keep the dialog open and render them.
-    } finally {
-      setIsConvertingVisibility(false);
-    }
-  }
-
   return (
     <DialogPrimitive.Root
       modal={!isSplitLayout}
@@ -441,7 +419,7 @@ export function ChannelManagementSheet({
             <div className="flex max-h-[85vh] flex-col">
               <DialogHeader className="shrink-0 border-b border-border/60 px-6 py-5 pr-14">
                 <DialogTitle>
-                  Edit {currentVisibility === "private" ? "private" : "public"}{" "}
+                  Edit {nextVisibility === "private" ? "private" : "public"}{" "}
                   channel
                 </DialogTitle>
               </DialogHeader>
@@ -525,10 +503,10 @@ export function ChannelManagementSheet({
                     />
                     <ChannelPermissionsSettings
                       disabled={isSavingChannelEdits}
-                      isPending={isConvertingVisibility}
-                      onVisibilityChange={(visibility) =>
-                        void handleConvertVisibility(visibility)
-                      }
+                      onVisibilityChange={(visibility) => {
+                        setIsPrivateDraft(visibility === "private");
+                        setHasUserEditedChannelDraft(true);
+                      }}
                       testIdPrefix="channel-management"
                       visibility={isPrivateDraft ? "private" : "open"}
                     />
diff --git a/desktop/src/features/channels/ui/ChannelPane.tsx b/desktop/src/features/channels/ui/ChannelPane.tsx
index 9e5152edfe4..410b05a2ccd 100644
--- a/desktop/src/features/channels/ui/ChannelPane.tsx
+++ b/desktop/src/features/channels/ui/ChannelPane.tsx
@@ -22,7 +22,7 @@ import {
   getDmHuddleMemberPubkeys,
   hasOtherDmParticipant,
 } from "@/features/channels/lib/dmHuddleMembers";
-import { buildVideoReviewContextsByMessageId } from "@/features/messages/lib/videoReviewContext";
+import { buildVideoReviewPresentationByMessageId } from "@/features/messages/lib/videoReviewContext";
 import { useComposerHeightPadding } from "@/features/messages/ui/useComposerHeightPadding";
 import { UserProfilePanel } from "@/features/profile/ui/UserProfilePanel";
 import { ChannelFindBar } from "@/features/search/ui/ChannelFindBar";
@@ -42,13 +42,9 @@ import { BotActivityComposerAction } from "@/features/channels/ui/BotActivityBar
 import { ChannelComposerActivityAccessory } from "@/features/channels/ui/ChannelComposerActivityAccessory";
 import {
   containsWelcomePersonaMention,
-  WelcomeComposerBanner,
-  WELCOME_COMPOSER_BANNER_DISMISS_DURATION_SECONDS,
-  WELCOME_COMPOSER_BANNER_HIDE_BUFFER_MS,
-  WELCOME_COMPOSER_BANNER_SUCCESS_SETTLE_MS,
-  WELCOME_PERSONA_ROTATION_MS,
-  type WelcomeComposerBannerState,
+  WelcomeComposerGuidanceLayer,
 } from "@/features/channels/ui/WelcomeComposerBanner";
+import { useWelcomeComposerBanner } from "@/features/channels/ui/useWelcomeComposerBanner";
 import { mentionsKnownAgent } from "@/features/channels/ui/ChannelPane.helpers";
 import { HuddleStartingView, HuddleTranscriptIntro } from "@/features/huddle";
 import { useChannelIntro } from "@/features/channels/ui/useChannelIntro";
@@ -168,11 +164,6 @@ export const ChannelPane = React.memo(function ChannelPane({
   const timelineScrollRef = React.useRef<HTMLDivElement>(null);
   const messageTimelineRef = React.useRef<MessageTimelineHandle>(null);
   const composerWrapperRef = React.useRef<HTMLDivElement>(null);
-  const completedWelcomeBannerChannelIdsRef = React.useRef(new Set<string>());
-  const welcomeComposerDismissTimerRef = React.useRef<number | null>(null);
-  const welcomeComposerHideTimerRef = React.useRef<number | null>(null);
-  const [welcomeComposerBannerState, setWelcomeComposerBannerState] =
-    React.useState<WelcomeComposerBannerState>("prompt");
   const { goChannel } = useAppNavigation();
   const prepareDmSendChannel = usePrepareDmSendChannel(
     activeChannel,
@@ -221,36 +212,15 @@ export const ChannelPane = React.memo(function ChannelPane({
     "css-variable",
     () => messageTimelineRef.current?.settleAtBottom() ?? false,
   );
-  const clearWelcomeComposerDismissTimer = React.useCallback(() => {
-    if (welcomeComposerDismissTimerRef.current !== null) {
-      window.clearTimeout(welcomeComposerDismissTimerRef.current);
-      welcomeComposerDismissTimerRef.current = null;
-    }
-    if (welcomeComposerHideTimerRef.current !== null) {
-      window.clearTimeout(welcomeComposerHideTimerRef.current);
-      welcomeComposerHideTimerRef.current = null;
-    }
-  }, []);
-  React.useEffect(
-    () => () => clearWelcomeComposerDismissTimer(),
-    [clearWelcomeComposerDismissTimer],
-  );
-  React.useEffect(() => {
-    clearWelcomeComposerDismissTimer();
-    if (
-      activeChannelId &&
-      isActiveWelcomeChannel &&
-      completedWelcomeBannerChannelIdsRef.current.has(activeChannelId)
-    ) {
-      setWelcomeComposerBannerState("hidden");
-      return;
-    }
-    setWelcomeComposerBannerState("prompt");
-  }, [
+  const {
+    bannerState: welcomeComposerBannerState,
+    completeBanner: completeWelcomeComposerBanner,
+    dismissBanner: handleDismissWelcomeBanner,
+  } = useWelcomeComposerBanner(
     activeChannelId,
-    clearWelcomeComposerDismissTimer,
     isActiveWelcomeChannel,
-  ]);
+    currentPubkey ?? null,
+  );
   const isEditInThread =
     editTarget != null &&
     threadHeadMessage != null &&
@@ -330,31 +300,6 @@ export const ChannelPane = React.memo(function ChannelPane({
 
     return pubkeys;
   }, [activityAgents, agentPubkeys, agentSessionAgents]);
-  const completeWelcomeComposerBanner = React.useCallback(() => {
-    if (!activeChannelId || !isActiveWelcomeChannel) {
-      return;
-    }
-
-    clearWelcomeComposerDismissTimer();
-    completedWelcomeBannerChannelIdsRef.current.add(activeChannelId);
-    setWelcomeComposerBannerState("complete");
-    welcomeComposerDismissTimerRef.current = window.setTimeout(() => {
-      setWelcomeComposerBannerState("dismissing");
-      welcomeComposerDismissTimerRef.current = null;
-      welcomeComposerHideTimerRef.current = window.setTimeout(
-        () => {
-          setWelcomeComposerBannerState("hidden");
-          welcomeComposerHideTimerRef.current = null;
-        },
-        WELCOME_COMPOSER_BANNER_DISMISS_DURATION_SECONDS * 1000 +
-          WELCOME_COMPOSER_BANNER_HIDE_BUFFER_MS,
-      );
-    }, WELCOME_PERSONA_ROTATION_MS + WELCOME_COMPOSER_BANNER_SUCCESS_SETTLE_MS);
-  }, [
-    activeChannelId,
-    clearWelcomeComposerDismissTimer,
-    isActiveWelcomeChannel,
-  ]);
   const handleSendMessage = React.useCallback(
     async (
       content: string,
@@ -464,7 +409,7 @@ export const ChannelPane = React.memo(function ChannelPane({
   const activeVideoReviewCommentSender = activeChannel?.archivedAt
     ? undefined
     : onSendVideoReviewComment;
-  const threadVideoReviewContextsByMessageId = React.useMemo(() => {
+  const threadVideoReviewPresentation = React.useMemo(() => {
     const messagesById = new Map(
       messages.map((message) => [message.id, message]),
     );
@@ -475,7 +420,7 @@ export const ChannelPane = React.memo(function ChannelPane({
       messagesById.set(message.id, message);
     }
 
-    return buildVideoReviewContextsByMessageId({
+    return buildVideoReviewPresentationByMessageId({
       channelId: activeChannel?.id ?? null,
       channelName: activeChannel?.name,
       channelType: activeChannel?.channelType ?? null,
@@ -737,18 +682,19 @@ export const ChannelPane = React.memo(function ChannelPane({
                   hasComposerBottomActivity && "composer-dock--with-activity",
                 )}
               >
+                {isActiveWelcomeChannel && !timeoutState.active ? (
+                  <WelcomeComposerGuidanceLayer
+                    onDismiss={handleDismissWelcomeBanner}
+                    settingUp={welcomeKickoffSettingUp}
+                    state={welcomeComposerBannerState}
+                  >
+                    {welcomeKickoffStage}
+                  </WelcomeComposerGuidanceLayer>
+                ) : null}
                 {timeoutState.active ? (
                   <ComposerTimeoutBanner
                     expiresAtMs={timeoutState.expiresAtMs}
                   />
-                ) : isActiveWelcomeChannel ? (
-                  <div className="relative">
-                    {welcomeKickoffStage}
-                    <WelcomeComposerBanner
-                      settingUp={welcomeKickoffSettingUp}
-                      state={welcomeComposerBannerState}
-                    />
-                  </div>
                 ) : null}
                 <ComposerDockBackdrop gutterClassName="inset-x-5" />
                 <MessageComposer
@@ -883,9 +829,7 @@ export const ChannelPane = React.memo(function ChannelPane({
                 scrollTargetHighlights={!layoutScrollTargetId}
                 scrollTargetId={layoutScrollTargetId ?? threadScrollTargetId}
                 threadHead={threadHeadMessage}
-                videoReviewContextsByMessageId={
-                  threadVideoReviewContextsByMessageId
-                }
+                videoReviewPresentation={threadVideoReviewPresentation}
                 widthPx={threadPanelWidthPx}
                 threadReplies={threadMessages}
                 threadRepliesPending={threadMessagesPending}
diff --git a/desktop/src/features/channels/ui/ChannelPermissionsSettings.tsx b/desktop/src/features/channels/ui/ChannelPermissionsSettings.tsx
index 70829413652..eb7ee4739c8 100644
--- a/desktop/src/features/channels/ui/ChannelPermissionsSettings.tsx
+++ b/desktop/src/features/channels/ui/ChannelPermissionsSettings.tsx
@@ -1,4 +1,4 @@
-import { ChevronDown, LoaderCircle } from "lucide-react";
+import { ChevronDown } from "lucide-react";
 
 import type { ChannelVisibility } from "@/shared/api/types";
 import { Button } from "@/shared/ui/button";
@@ -13,13 +13,11 @@ import { cn } from "@/shared/lib/cn";
 
 export function ChannelPermissionsSettings({
   disabled,
-  isPending = false,
   onVisibilityChange,
   testIdPrefix,
   visibility,
 }: {
   disabled?: boolean;
-  isPending?: boolean;
   onVisibilityChange: (visibility: ChannelVisibility) => void;
   testIdPrefix: string;
   visibility: ChannelVisibility;
@@ -38,12 +36,7 @@ export function ChannelPermissionsSettings({
       <DropdownMenu modal={false}>
         <DropdownMenuTrigger asChild>
           <Button
-            aria-busy={isPending}
-            aria-label={
-              isPending
-                ? "Updating visibility"
-                : `Visibility: ${visibilityLabel}`
-            }
+            aria-label={`Visibility: ${visibilityLabel}`}
             className="-mr-2.5 ml-auto h-9 w-fit justify-end px-2.5 text-right text-sm font-medium text-foreground hover:bg-muted/50"
             data-testid={`${testIdPrefix}-permissions`}
             disabled={disabled}
@@ -51,16 +44,9 @@ export function ChannelPermissionsSettings({
             variant="ghost"
           >
             <span aria-live="polite" className="text-right">
-              {isPending ? "Updating…" : visibilityLabel}
+              {visibilityLabel}
             </span>
-            {isPending ? (
-              <LoaderCircle
-                aria-hidden="true"
-                className="size-4 shrink-0 text-muted-foreground/70 motion-safe:animate-spin"
-              />
-            ) : (
-              <ChevronDown className="size-4 shrink-0 text-muted-foreground/70" />
-            )}
+            <ChevronDown className="size-4 shrink-0 text-muted-foreground/70" />
           </Button>
         </DropdownMenuTrigger>
         <DropdownMenuContent
diff --git a/desktop/src/features/channels/ui/MembersSidebar.tsx b/desktop/src/features/channels/ui/MembersSidebar.tsx
index 459e8f7776c..8f431fb0afe 100644
--- a/desktop/src/features/channels/ui/MembersSidebar.tsx
+++ b/desktop/src/features/channels/ui/MembersSidebar.tsx
@@ -280,12 +280,6 @@ export function MembersSidebar({
         agent,
       ]),
     );
-    const memberAgentLabels = new Set(
-      rawMembers
-        .filter((member) => member.isAgent === true || member.role === "bot")
-        .map((member) => member.displayName?.trim().toLowerCase())
-        .filter((label): label is string => Boolean(label)),
-    );
     const sharedChannelIds = getSharedChannelIds(channelsQuery.data);
     const allowedAgentPubkeys = getMentionableAgentPubkeys({
       currentPubkey,
@@ -298,10 +292,6 @@ export function MembersSidebar({
     const addCandidate = (candidate: AddMemberSearchCandidate) => {
       const pubkey = normalizePubkey(candidate.pubkey);
       if (
-        (candidate.isAgent &&
-          memberAgentLabels.has(
-            formatAddCandidateName(candidate).toLowerCase(),
-          )) ||
         memberPubkeys.has(pubkey) ||
         isArchivedDiscovery(pubkey) ||
         !isAgentIdentityInAllowedList(candidate, allowedAgentPubkeys)
@@ -391,7 +381,6 @@ export function MembersSidebar({
     normalizedDeferredSearchQuery,
     relayAgentsQuery.data,
     userSearchResults,
-    rawMembers,
   ]);
   const isAddSearchLoading =
     userSearchQuery.isLoading ||
@@ -969,6 +958,9 @@ function AddMemberSearchResultRow({
                 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}
diff --git a/desktop/src/features/channels/ui/WelcomeComposerBanner.tsx b/desktop/src/features/channels/ui/WelcomeComposerBanner.tsx
index 8d492c9181e..9a8db082ed2 100644
--- a/desktop/src/features/channels/ui/WelcomeComposerBanner.tsx
+++ b/desktop/src/features/channels/ui/WelcomeComposerBanner.tsx
@@ -1,7 +1,8 @@
 import * as React from "react";
 import { AnimatePresence, motion, useReducedMotion } from "motion/react";
-import { Bot, Check } from "lucide-react";
+import { Bot, Check, X } from "lucide-react";
 
+import { ComposerDockGlassBackdrop } from "@/features/messages/ui/ComposerDockBackdrop";
 import { cn } from "@/shared/lib/cn";
 
 const WELCOME_PERSONA_NAMES = ["Fizz"] as const;
@@ -290,9 +291,15 @@ type WelcomeComposerBannerProps = {
    * banner during this window.
    */
   settingUp?: boolean;
+  /**
+   * Called when the user dismisses the banner manually via the close button.
+   * Only rendered while `state === "prompt"`.
+   */
+  onDismiss?: () => void;
 };
 
 export function WelcomeComposerBanner({
+  onDismiss,
   settingUp = false,
   state,
 }: WelcomeComposerBannerProps) {
@@ -306,7 +313,7 @@ export function WelcomeComposerBanner({
         animate={{
           height: state === "dismissing" ? 0 : "auto",
         }}
-        className="overflow-visible"
+        className="overflow-hidden"
         initial={false}
         transition={{
           duration:
@@ -325,7 +332,7 @@ export function WelcomeComposerBanner({
                 : 0,
           }}
           className={cn(
-            "relative z-[1] mx-5 -mb-3 flex items-center gap-2 rounded-t-2xl border border-b-0 px-4 pb-5 pt-2.5 text-sm leading-5 transition-colors",
+            "relative z-[1] mx-5 mb-0 flex items-center gap-2 rounded-t-2xl border border-b-0 px-4 pb-5 pt-2.5 text-sm leading-5 transition-colors",
             state !== "prompt"
               ? "border-emerald-500/30 bg-emerald-500/15 text-foreground"
               : "border-border/60 bg-muted/55 text-muted-foreground",
@@ -375,7 +382,7 @@ export function WelcomeComposerBanner({
             {state !== "prompt" ? (
               <motion.span
                 animate="animate"
-                className="min-w-0"
+                className="min-w-0 flex-1"
                 data-animation-target="success-copy"
                 initial="initial"
                 key="complete-copy"
@@ -386,7 +393,7 @@ export function WelcomeComposerBanner({
             ) : settingUp ? (
               <motion.span
                 animate="animate"
-                className="min-w-0"
+                className="min-w-0 flex-1"
                 data-testid="welcome-composer-setting-up-copy"
                 exit="exit"
                 initial="initial"
@@ -398,7 +405,7 @@ export function WelcomeComposerBanner({
             ) : (
               <motion.span
                 animate="animate"
-                className="min-w-0"
+                className="min-w-0 flex-1"
                 exit="exit"
                 initial="initial"
                 key="prompt-copy"
@@ -409,8 +416,49 @@ export function WelcomeComposerBanner({
               </motion.span>
             )}
           </AnimatePresence>
+          {state === "prompt" && onDismiss && !settingUp ? (
+            <button
+              aria-label="Dismiss hint"
+              className="ml-auto flex h-5 w-5 shrink-0 items-center justify-center rounded-full text-muted-foreground/60 transition-colors hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+              data-testid="welcome-composer-dismiss-button"
+              onClick={onDismiss}
+              type="button"
+            >
+              <X aria-hidden className="h-3 w-3" />
+            </button>
+          ) : null}
         </motion.div>
       </motion.div>
     </AnimatePresence>
   );
 }
+
+type WelcomeComposerGuidanceLayerProps = WelcomeComposerBannerProps & {
+  children: React.ReactNode;
+};
+
+export function WelcomeComposerGuidanceLayer({
+  children,
+  onDismiss,
+  settingUp,
+  state,
+}: WelcomeComposerGuidanceLayerProps) {
+  if (state === "hidden") {
+    return null;
+  }
+
+  return (
+    <div className="relative" data-testid="welcome-composer-guidance-layer">
+      <ComposerDockGlassBackdrop
+        className="absolute inset-x-5 top-0 bottom-3 z-0 rounded-t-2xl"
+        testId="welcome-composer-guidance-backdrop"
+      />
+      {children}
+      <WelcomeComposerBanner
+        onDismiss={onDismiss}
+        settingUp={settingUp}
+        state={state}
+      />
+    </div>
+  );
+}
diff --git a/desktop/src/features/channels/ui/useWelcomeComposerBanner.ts b/desktop/src/features/channels/ui/useWelcomeComposerBanner.ts
new file mode 100644
index 00000000000..541d8c10dc6
--- /dev/null
+++ b/desktop/src/features/channels/ui/useWelcomeComposerBanner.ts
@@ -0,0 +1,114 @@
+import * as React from "react";
+
+import {
+  WELCOME_COMPOSER_BANNER_DISMISS_DURATION_SECONDS,
+  WELCOME_COMPOSER_BANNER_HIDE_BUFFER_MS,
+  WELCOME_COMPOSER_BANNER_SUCCESS_SETTLE_MS,
+  WELCOME_PERSONA_ROTATION_MS,
+  type WelcomeComposerBannerState,
+} from "@/features/channels/ui/WelcomeComposerBanner";
+
+const completedWelcomeComposerIdentityPubkeys = new Set<string>();
+
+/**
+ * Manages the Welcome-channel composer hint banner's state machine.
+ *
+ * Remembers completion across the Welcome experience per identity for this app
+ * session, so the hint stays hidden while moving between the private and
+ * starter Welcome channels without leaking dismissal to another identity.
+ * - `completeBanner`: agent-mention path — plays the "Nice work." success
+ *   animation before auto-dismissing.
+ * - `dismissBanner`: manual X-button path — immediately begins the slide-down
+ *   dismiss animation.
+ */
+export function useWelcomeComposerBanner(
+  activeChannelId: string | null,
+  isActiveWelcomeChannel: boolean,
+  identityPubkey: string | null,
+): {
+  bannerState: WelcomeComposerBannerState;
+  completeBanner: () => void;
+  dismissBanner: () => void;
+} {
+  const dismissTimerRef = React.useRef<number | null>(null);
+  const hideTimerRef = React.useRef<number | null>(null);
+  const [bannerState, setBannerState] =
+    React.useState<WelcomeComposerBannerState>("prompt");
+
+  const clearTimers = React.useCallback(() => {
+    if (dismissTimerRef.current !== null) {
+      window.clearTimeout(dismissTimerRef.current);
+      dismissTimerRef.current = null;
+    }
+    if (hideTimerRef.current !== null) {
+      window.clearTimeout(hideTimerRef.current);
+      hideTimerRef.current = null;
+    }
+  }, []);
+
+  React.useEffect(() => () => clearTimers(), [clearTimers]);
+
+  React.useEffect(() => {
+    clearTimers();
+    if (
+      isActiveWelcomeChannel &&
+      identityPubkey &&
+      completedWelcomeComposerIdentityPubkeys.has(identityPubkey)
+    ) {
+      setBannerState("hidden");
+      return;
+    }
+    setBannerState("prompt");
+  }, [clearTimers, identityPubkey, isActiveWelcomeChannel]);
+
+  const scheduleHide = React.useCallback(() => {
+    hideTimerRef.current = window.setTimeout(
+      () => {
+        setBannerState("hidden");
+        hideTimerRef.current = null;
+      },
+      WELCOME_COMPOSER_BANNER_DISMISS_DURATION_SECONDS * 1000 +
+        WELCOME_COMPOSER_BANNER_HIDE_BUFFER_MS,
+    );
+  }, []);
+
+  const completeBanner = React.useCallback(() => {
+    if (!activeChannelId || !isActiveWelcomeChannel || !identityPubkey) {
+      return;
+    }
+
+    clearTimers();
+    completedWelcomeComposerIdentityPubkeys.add(identityPubkey);
+    setBannerState("complete");
+    dismissTimerRef.current = window.setTimeout(() => {
+      setBannerState("dismissing");
+      dismissTimerRef.current = null;
+      scheduleHide();
+    }, WELCOME_PERSONA_ROTATION_MS + WELCOME_COMPOSER_BANNER_SUCCESS_SETTLE_MS);
+  }, [
+    activeChannelId,
+    clearTimers,
+    identityPubkey,
+    isActiveWelcomeChannel,
+    scheduleHide,
+  ]);
+
+  const dismissBanner = React.useCallback(() => {
+    if (!activeChannelId || !isActiveWelcomeChannel || !identityPubkey) {
+      return;
+    }
+
+    clearTimers();
+    completedWelcomeComposerIdentityPubkeys.add(identityPubkey);
+    setBannerState("dismissing");
+    scheduleHide();
+  }, [
+    activeChannelId,
+    clearTimers,
+    identityPubkey,
+    isActiveWelcomeChannel,
+    scheduleHide,
+  ]);
+
+  return { bannerState, completeBanner, dismissBanner };
+}
diff --git a/desktop/src/features/communities/communityStorage.ts b/desktop/src/features/communities/communityStorage.ts
index 7c8778712e1..6f99ce8d336 100644
--- a/desktop/src/features/communities/communityStorage.ts
+++ b/desktop/src/features/communities/communityStorage.ts
@@ -1,6 +1,7 @@
 import type { Community } from "./types";
 import { homeDir } from "@tauri-apps/api/path";
 import { setLocalStorageItemWithRecovery } from "@/shared/lib/localStorageQuota";
+import { getStorageItem, removeStorageItem } from "@/shared/lib/safeStorage";
 
 const COMMUNITIES_KEY = "buzz-communities";
 const ACTIVE_COMMUNITY_KEY = "buzz-active-community-id";
@@ -34,24 +35,36 @@ export async function expandTilde(input: string): Promise<string | undefined> {
 export function migrateLegacyCommunityStorage(
   storage: Storage = localStorage,
 ): void {
-  if (storage.getItem(COMMUNITIES_KEY) === null) {
-    const legacyCommunities = storage.getItem(LEGACY_WORKSPACES_KEY);
-    if (legacyCommunities !== null) {
-      storage.setItem(COMMUNITIES_KEY, legacyCommunities);
+  try {
+    if (storage.getItem(COMMUNITIES_KEY) === null) {
+      const legacyCommunities = storage.getItem(LEGACY_WORKSPACES_KEY);
+      if (legacyCommunities !== null) {
+        storage.setItem(COMMUNITIES_KEY, legacyCommunities);
+      }
     }
-  }
-  if (storage.getItem(ACTIVE_COMMUNITY_KEY) === null) {
-    const legacyActiveCommunity = storage.getItem(LEGACY_ACTIVE_WORKSPACE_KEY);
-    if (legacyActiveCommunity !== null) {
-      storage.setItem(ACTIVE_COMMUNITY_KEY, legacyActiveCommunity);
+    if (storage.getItem(ACTIVE_COMMUNITY_KEY) === null) {
+      const legacyActiveCommunity = storage.getItem(
+        LEGACY_ACTIVE_WORKSPACE_KEY,
+      );
+      if (legacyActiveCommunity !== null) {
+        storage.setItem(ACTIVE_COMMUNITY_KEY, legacyActiveCommunity);
+      }
     }
+  } catch (error) {
+    // WebKit throws SecurityError from getItem when storage access is denied
+    // for the origin (block/buzz#5078). Fencing here so the app can still
+    // boot with an empty/default community list instead of a blank window.
+    console.warn(
+      "[communityStorage] migrateLegacyCommunityStorage failed (storage denied?):",
+      error,
+    );
   }
 }
 
 export function loadCommunities(): Community[] {
   try {
     migrateLegacyCommunityStorage();
-    const raw = localStorage.getItem(COMMUNITIES_KEY);
+    const raw = getStorageItem(COMMUNITIES_KEY);
     if (!raw) {
       return [];
     }
@@ -60,7 +73,7 @@ export function loadCommunities(): Community[] {
       return [];
     }
     if (parsed.length > 0) {
-      localStorage.removeItem(COMMUNITY_DISCOVERY_AFTER_LEAVE_KEY);
+      removeStorageItem(COMMUNITY_DISCOVERY_AFTER_LEAVE_KEY);
     }
     // Migration: older builds stored the user's `nsec` in localStorage and
     // re-applied it to the backend on every reload, which silently overwrote
@@ -100,7 +113,17 @@ export function saveCommunities(communities: Community[]): boolean {
 export function loadCommunityDiscoveryAfterLeave(
   storage: Storage = localStorage,
 ): boolean {
-  return storage.getItem(COMMUNITY_DISCOVERY_AFTER_LEAVE_KEY) === "1";
+  try {
+    return storage.getItem(COMMUNITY_DISCOVERY_AFTER_LEAVE_KEY) === "1";
+  } catch (error) {
+    // block/buzz#5078 — storage access can be denied for the origin; degrade
+    // to the default ("didn't just leave") instead of crashing the boot path.
+    console.warn(
+      "[communityStorage] loadCommunityDiscoveryAfterLeave failed:",
+      error,
+    );
+    return false;
+  }
 }
 
 export function markCommunityDiscoveryAfterLeave(
@@ -129,7 +152,10 @@ export function clearCommunityStorage(storage: Storage = localStorage): void {
 
 export function loadActiveCommunityId(): string | null {
   migrateLegacyCommunityStorage();
-  return localStorage.getItem(ACTIVE_COMMUNITY_KEY);
+  // block/buzz#5078 — WebKit can throw SecurityError from a denied-storage
+  // getItem. Fail closed so the boot path renders the default community UI
+  // instead of unmounting the root.
+  return getStorageItem(ACTIVE_COMMUNITY_KEY);
 }
 
 export function saveActiveCommunityId(id: string): boolean {
@@ -199,7 +225,10 @@ export function initFirstCommunity(
     pubkey,
     addedAt: new Date().toISOString(),
   };
-  const previousActiveCommunityId = localStorage.getItem(ACTIVE_COMMUNITY_KEY);
+  // block/buzz#5078 — read the prior active id through the throw-safe helper;
+  // a denied-storage origin would otherwise kill onboarding before a single
+  // write is attempted.
+  const previousActiveCommunityId = getStorageItem(ACTIVE_COMMUNITY_KEY);
   const didSaveActiveCommunity = saveActiveCommunityId(community.id);
   if (!didSaveActiveCommunity) {
     return null;
diff --git a/desktop/src/features/communities/legacyCommunityStorage.ts b/desktop/src/features/communities/legacyCommunityStorage.ts
index d140fa4c628..b871ec0bbe4 100644
--- a/desktop/src/features/communities/legacyCommunityStorage.ts
+++ b/desktop/src/features/communities/legacyCommunityStorage.ts
@@ -1,4 +1,5 @@
 import { invokeTauri } from "@/shared/api/tauri";
+import { getStorageItem } from "@/shared/lib/safeStorage";
 import { migrateLegacyCommunityStorage } from "./communityStorage";
 
 const BUZZ_COMMUNITIES_KEY = "buzz-communities";
@@ -116,11 +117,10 @@ export async function migrateLegacyCommunityStorageBeforeRender(): Promise<void>
   }
 
   migrateLegacyCommunityStorage(window.localStorage);
-  const currentCommunitiesRaw =
-    window.localStorage.getItem(BUZZ_COMMUNITIES_KEY);
-  const hasCurrentActiveCommunity = window.localStorage.getItem(
-    BUZZ_ACTIVE_COMMUNITY_KEY,
-  );
+  // block/buzz#5078 — read through the throw-safe accessor so a denied-storage
+  // origin degrades to "no community state" instead of crashing pre-render.
+  const currentCommunitiesRaw = getStorageItem(BUZZ_COMMUNITIES_KEY);
+  const hasCurrentActiveCommunity = getStorageItem(BUZZ_ACTIVE_COMMUNITY_KEY);
   if (
     currentCommunitiesRaw &&
     hasCurrentActiveCommunity &&
diff --git a/desktop/src/features/communities/useCommunityInit.ts b/desktop/src/features/communities/useCommunityInit.ts
index baf12613103..0c27ab0541f 100644
--- a/desktop/src/features/communities/useCommunityInit.ts
+++ b/desktop/src/features/communities/useCommunityInit.ts
@@ -13,7 +13,7 @@ import { getIdentity } from "@/shared/api/tauriIdentity";
 import { clearTrayAgentActivity } from "@/shared/api/trayMenu";
 import { getOverrides } from "@/shared/features";
 import { resetMediaCaches } from "@/shared/lib/mediaUrl";
-import { resetLinkPreviewTitleCache } from "@/shared/lib/useResolvedLinkPreviews";
+import { resetLinkPreviewMetadataCache } from "@/shared/lib/useResolvedLinkPreviews";
 import { clearSearchHitEventCache } from "@/app/navigation/searchHitEventCache";
 import {
   clearAllDrafts,
@@ -67,12 +67,12 @@ function resetCommunityState({
   }
   resetSidebarRelayConnectionCardState();
   resetMediaCaches();
+  resetLinkPreviewMetadataCache();
   resetVideoPlayerState();
   resetRenderScopedReactionHydration();
   resetBackgroundMediaUploads();
   clearSearchHitEventCache();
   clearMarkdownNodeCache();
-  resetLinkPreviewTitleCache();
 }
 
 type CommunityInitResult =
diff --git a/desktop/src/features/community-members/lib/joinAlerts.test.mjs b/desktop/src/features/community-members/lib/joinAlerts.test.mjs
new file mode 100644
index 00000000000..f7346bd5e98
--- /dev/null
+++ b/desktop/src/features/community-members/lib/joinAlerts.test.mjs
@@ -0,0 +1,265 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  EMPTY_JOIN_ALERT_LEDGER,
+  JOIN_ALERT_DEPARTED_MAX_ITEMS,
+  joinAlertBody,
+  joinAlertTitle,
+  readJoinAlertLedger,
+  reconcileJoinAlertLedger,
+  writeJoinAlertLedger,
+} from "./joinAlerts.ts";
+
+const COMMUNITY = "community-1";
+const OWNER = "a".repeat(64);
+const ALICE = "b".repeat(64);
+const BOB = "c".repeat(64);
+
+function installLocalStorage({ throwOnSet = false } = {}) {
+  const values = new Map();
+  globalThis.window = {
+    localStorage: {
+      get length() {
+        return values.size;
+      },
+      key: (index) => [...values.keys()][index] ?? null,
+      getItem: (key) => values.get(key) ?? null,
+      setItem: (key, value) => {
+        if (throwOnSet) {
+          const error = new Error("quota exceeded");
+          error.name = "QuotaExceededError";
+          throw error;
+        }
+        values.set(key, value);
+      },
+      removeItem: (key) => values.delete(key),
+    },
+  };
+  return values;
+}
+
+/** Fold a roster in and persist, the way the hook does. */
+function applySnapshot(ledger, rosterPubkeys) {
+  const result = reconcileJoinAlertLedger({
+    ledger,
+    rosterPubkeys,
+    viewerPubkey: OWNER,
+  });
+  if (result.changed) {
+    writeJoinAlertLedger(COMMUNITY, OWNER, result.ledger);
+  }
+  return result;
+}
+
+test("first snapshot seeds an existing roster without alerting", () => {
+  installLocalStorage();
+
+  const result = applySnapshot(EMPTY_JOIN_ALERT_LEDGER, [OWNER, ALICE, BOB]);
+
+  assert.deepEqual(result.alerts, []);
+  assert.equal(result.ledger.seeded, true);
+  assert.deepEqual(result.ledger.pubkeys, [ALICE, BOB]);
+});
+
+test("a key joining after the seed alerts exactly once", () => {
+  installLocalStorage();
+
+  const seeded = applySnapshot(EMPTY_JOIN_ALERT_LEDGER, [OWNER, ALICE]).ledger;
+  const joined = applySnapshot(seeded, [OWNER, ALICE, BOB]);
+
+  assert.deepEqual(joined.alerts, [BOB]);
+
+  // A redelivered identical snapshot must not re-alert or rewrite.
+  const redelivered = applySnapshot(joined.ledger, [OWNER, ALICE, BOB]);
+  assert.deepEqual(redelivered.alerts, []);
+  assert.equal(redelivered.changed, false);
+});
+
+test("a community seeded with only the viewer still alerts on the first join", () => {
+  // Regression: inferring "seeded" from a non-empty ledger classified this
+  // first genuine join as the seeding run and dropped the alert silently.
+  installLocalStorage();
+
+  const seeded = applySnapshot(EMPTY_JOIN_ALERT_LEDGER, [OWNER]);
+  assert.deepEqual(seeded.alerts, []);
+  assert.deepEqual(seeded.ledger.pubkeys, []);
+  assert.equal(seeded.ledger.seeded, true);
+
+  const joined = applySnapshot(seeded.ledger, [OWNER, ALICE]);
+  assert.deepEqual(joined.alerts, [ALICE]);
+});
+
+test("the seeded flag survives a reload through storage", () => {
+  installLocalStorage();
+
+  applySnapshot(EMPTY_JOIN_ALERT_LEDGER, [OWNER]);
+  const reloaded = readJoinAlertLedger(COMMUNITY, OWNER);
+
+  assert.equal(reloaded.seeded, true);
+  assert.deepEqual(reloaded.pubkeys, []);
+  assert.deepEqual(applySnapshot(reloaded, [OWNER, ALICE]).alerts, [ALICE]);
+});
+
+test("remove then re-add does not alert a second time", () => {
+  installLocalStorage();
+
+  const seeded = applySnapshot(EMPTY_JOIN_ALERT_LEDGER, [OWNER]).ledger;
+  assert.deepEqual(applySnapshot(seeded, [OWNER, ALICE]).alerts, [ALICE]);
+
+  const afterRemoval = applySnapshot(readJoinAlertLedger(COMMUNITY, OWNER), [
+    OWNER,
+  ]);
+  assert.deepEqual(afterRemoval.alerts, []);
+
+  const afterReAdd = applySnapshot(readJoinAlertLedger(COMMUNITY, OWNER), [
+    OWNER,
+    ALICE,
+  ]);
+  assert.deepEqual(afterReAdd.alerts, []);
+});
+
+test("the kind:8000 accelerator and the live snapshot yield one alert", () => {
+  installLocalStorage();
+
+  const seeded = applySnapshot(EMPTY_JOIN_ALERT_LEDGER, [OWNER]).ledger;
+
+  // Delta arrives first and triggers a snapshot refetch...
+  const viaDelta = applySnapshot(seeded, [OWNER, ALICE]);
+  assert.deepEqual(viaDelta.alerts, [ALICE]);
+
+  // ...then the live 13534 for the same join lands.
+  const viaLive = applySnapshot(readJoinAlertLedger(COMMUNITY, OWNER), [
+    OWNER,
+    ALICE,
+  ]);
+  assert.deepEqual(viaLive.alerts, []);
+});
+
+test("the viewer is never alerted on or recorded", () => {
+  installLocalStorage();
+
+  const seeded = applySnapshot(EMPTY_JOIN_ALERT_LEDGER, [ALICE]).ledger;
+  const result = applySnapshot(seeded, [ALICE, OWNER]);
+
+  assert.deepEqual(result.alerts, []);
+  assert.equal(result.changed, false);
+  assert.equal(result.ledger.pubkeys.includes(OWNER), false);
+});
+
+test("roster pubkeys are matched case-insensitively", () => {
+  installLocalStorage();
+
+  const seeded = applySnapshot(EMPTY_JOIN_ALERT_LEDGER, [OWNER]).ledger;
+  const joined = applySnapshot(seeded, [OWNER, ALICE.toUpperCase()]);
+
+  assert.deepEqual(joined.alerts, [ALICE]);
+  assert.deepEqual(applySnapshot(joined.ledger, [OWNER, ALICE]).alerts, []);
+});
+
+test("a duplicated pubkey in one snapshot alerts once", () => {
+  installLocalStorage();
+
+  const seeded = applySnapshot(EMPTY_JOIN_ALERT_LEDGER, [OWNER]).ledger;
+  const joined = applySnapshot(seeded, [OWNER, ALICE, ALICE]);
+
+  assert.deepEqual(joined.alerts, [ALICE]);
+  assert.deepEqual(joined.ledger.pubkeys, [ALICE]);
+});
+
+test("a ledger stored before the seeded flag existed is treated as seeded", () => {
+  const values = installLocalStorage();
+  const [key] = [...values.keys()];
+  writeJoinAlertLedger(COMMUNITY, OWNER, { seeded: true, pubkeys: [ALICE] });
+  const storageKey = key ?? [...values.keys()][0];
+  values.set(storageKey, JSON.stringify({ pubkeys: [ALICE] }));
+
+  const ledger = readJoinAlertLedger(COMMUNITY, OWNER);
+  assert.equal(ledger.seeded, true);
+  assert.deepEqual(applySnapshot(ledger, [OWNER, ALICE, BOB]).alerts, [BOB]);
+});
+
+test("unreadable storage reads as an unseeded ledger", () => {
+  const values = installLocalStorage();
+  writeJoinAlertLedger(COMMUNITY, OWNER, { seeded: true, pubkeys: [ALICE] });
+  values.set([...values.keys()][0], "{not json");
+
+  assert.deepEqual(readJoinAlertLedger(COMMUNITY, OWNER), {
+    seeded: false,
+    pubkeys: [],
+  });
+});
+
+test("a roster larger than the departed cap never re-alerts its own members", () => {
+  // Regression: capping *all* retained keys shed pubkeys that were still on the
+  // roster, so the next snapshot saw them as unknown and alerted again — every
+  // snapshot, forever, for any community past the cap.
+  installLocalStorage();
+
+  const roster = Array.from(
+    { length: JOIN_ALERT_DEPARTED_MAX_ITEMS + 100 },
+    (_unused, index) => index.toString(16).padStart(64, "0"),
+  );
+
+  const seeded = applySnapshot(EMPTY_JOIN_ALERT_LEDGER, roster);
+  assert.deepEqual(seeded.alerts, []);
+  assert.equal(seeded.ledger.pubkeys.length, roster.length);
+
+  for (let pass = 0; pass < 3; pass++) {
+    const repeat = applySnapshot(readJoinAlertLedger(COMMUNITY, OWNER), roster);
+    assert.deepEqual(repeat.alerts, []);
+    assert.equal(repeat.changed, false);
+  }
+
+  // The read path must not truncate either: a stored ledger above the cap has
+  // to come back whole or the same re-alert loop reopens on reload.
+  assert.equal(
+    readJoinAlertLedger(COMMUNITY, OWNER).pubkeys.length,
+    roster.length,
+  );
+});
+
+test("the cap sheds only departed pubkeys, oldest first", () => {
+  installLocalStorage();
+
+  const roster = Array.from(
+    { length: JOIN_ALERT_DEPARTED_MAX_ITEMS + 10 },
+    (_unused, index) => index.toString(16).padStart(64, "0"),
+  );
+  const seeded = applySnapshot(EMPTY_JOIN_ALERT_LEDGER, roster).ledger;
+
+  // Everyone leaves except the newest member; one new key joins.
+  const survivor = roster.at(-1);
+  const shrunk = applySnapshot(seeded, [OWNER, survivor, BOB]);
+
+  assert.deepEqual(shrunk.alerts, [BOB]);
+  // 5010 retained - 9 departed over the cap, plus BOB.
+  assert.equal(shrunk.ledger.pubkeys.length, roster.length - 9 + 1);
+  assert.equal(shrunk.ledger.pubkeys.includes(roster[0]), false);
+  assert.equal(shrunk.ledger.pubkeys.includes(roster[8]), false);
+  assert.equal(shrunk.ledger.pubkeys.includes(roster[9]), true);
+  // The on-roster key is retained no matter where it sits in insertion order.
+  assert.equal(shrunk.ledger.pubkeys.includes(survivor), true);
+});
+
+test("a write that cannot land is reported, not thrown", () => {
+  // The writer runs inside an async snapshot handler: a raw QuotaExceededError
+  // would reject before the notification is sent, on every snapshot.
+  installLocalStorage({ throwOnSet: true });
+
+  assert.equal(
+    writeJoinAlertLedger(COMMUNITY, OWNER, { seeded: true, pubkeys: [ALICE] }),
+    false,
+  );
+  assert.deepEqual(readJoinAlertLedger(COMMUNITY, OWNER), {
+    seeded: false,
+    pubkeys: [],
+  });
+});
+
+test("notification copy names the community when known", () => {
+  assert.equal(joinAlertTitle("Buzz HQ"), "New member in Buzz HQ");
+  assert.equal(joinAlertTitle("  "), "New community member");
+  assert.equal(joinAlertTitle(null), "New community member");
+  assert.equal(joinAlertBody("Alice"), "Alice joined");
+});
diff --git a/desktop/src/features/community-members/lib/joinAlerts.ts b/desktop/src/features/community-members/lib/joinAlerts.ts
new file mode 100644
index 00000000000..2a3ed3fa954
--- /dev/null
+++ b/desktop/src/features/community-members/lib/joinAlerts.ts
@@ -0,0 +1,227 @@
+/**
+ * First-join alert bookkeeping for community owners/admins.
+ *
+ * # Why the roster snapshot is the source of truth, not the kind:8000 delta
+ *
+ * The relay emits a kind:8000 "member-added" delta on the invite-claim and
+ * relay-admin paths, but `buzz-admin add-member` deliberately emits none
+ * (`crates/buzz-admin/src/main.rs:6-13`), and kind:8000 fan-out is pod-local
+ * (`fan_out_event_to_local_subscribers` never calls `publish_event`, unlike
+ * `dispatch_persistent_event_inner`). The kind:13534 membership snapshot is the
+ * only signal that covers every join path *and* propagates across pods, so it
+ * is the correctness signal here; kind:8000 is a latency accelerator only.
+ *
+ * # Why a persisted ledger rather than snapshot-to-snapshot diffing
+ *
+ * Snapshot publication is eventual, not transactional: a failed post-commit
+ * publish is repaired by the relay's periodic reconciler, so the same member
+ * can first appear in a snapshot arriving up to a reconcile interval late, and
+ * a reconciler-published snapshot is indistinguishable from a fresh one. Only a
+ * ledger of pubkeys we have already alerted on can answer "is this new to the
+ * user", which is the question the notification actually asks. The ledger also
+ * absorbs kind:8000 redelivery on reconnect, where the replay filter re-sends
+ * events at or after `lastSeenCreatedAt - skew` and can repeat a seen delta.
+ */
+
+import { setLocalStorageItemWithRecovery } from "@/shared/lib/localStorageQuota";
+
+const JOIN_ALERT_STORAGE_PREFIX = "buzz-community-join-seen.v1";
+
+/**
+ * Cap on *departed* pubkeys retained per community.
+ *
+ * A pubkey still on the roster can never be shed: the next snapshot presents it
+ * again, the ledger no longer recognizes it, and it is alerted as a fresh join
+ * — on every snapshot, forever. So the cap bounds only the tail of keys that
+ * have left, and the ledger's real ceiling is the roster the relay can deliver
+ * (a kind:13534 snapshot larger than `BUZZ_MAX_FRAME_BYTES` never arrives).
+ */
+export const JOIN_ALERT_DEPARTED_MAX_ITEMS = 5_000;
+
+export type JoinAlertLedger = {
+  /**
+   * Whether a roster snapshot has already been folded in for this community.
+   *
+   * Tracked explicitly rather than inferred from `pubkeys.length > 0`, because
+   * the two are not the same proposition: a community whose only member is the
+   * viewer seeds to an *empty* pubkey list (the viewer is never recorded), and
+   * inferring from emptiness would then classify the first genuine join as the
+   * seeding run and silently swallow the very alert this feature exists for.
+   */
+  seeded: boolean;
+  /** Pubkeys already alerted on, oldest first. */
+  pubkeys: string[];
+};
+
+export const EMPTY_JOIN_ALERT_LEDGER: JoinAlertLedger = {
+  seeded: false,
+  pubkeys: [],
+};
+
+export function joinAlertStorageKey(communityId: string, viewerPubkey: string) {
+  return `${JOIN_ALERT_STORAGE_PREFIX}:${communityId}:${viewerPubkey}`;
+}
+
+export function normalizeJoinPubkey(pubkey: string): string {
+  return pubkey.trim().toLowerCase();
+}
+
+export function readJoinAlertLedger(
+  communityId: string,
+  viewerPubkey: string,
+): JoinAlertLedger {
+  if (
+    typeof window === "undefined" ||
+    communityId.length === 0 ||
+    viewerPubkey.length === 0
+  ) {
+    return EMPTY_JOIN_ALERT_LEDGER;
+  }
+
+  const rawValue = window.localStorage.getItem(
+    joinAlertStorageKey(communityId, viewerPubkey),
+  );
+  if (!rawValue) {
+    return EMPTY_JOIN_ALERT_LEDGER;
+  }
+
+  try {
+    const parsed: unknown = JSON.parse(rawValue);
+    if (parsed === null || typeof parsed !== "object") {
+      return EMPTY_JOIN_ALERT_LEDGER;
+    }
+
+    const { pubkeys, seeded } = parsed as Partial<JoinAlertLedger>;
+    if (!Array.isArray(pubkeys)) {
+      return EMPTY_JOIN_ALERT_LEDGER;
+    }
+
+    return {
+      // A stored ledger is by definition the residue of a snapshot we already
+      // folded in, so unreadable/absent `seeded` reads as true. Defaulting the
+      // other way would re-seed and drop a real join.
+      seeded: seeded !== false,
+      pubkeys: pubkeys.filter(
+        (value): value is string => typeof value === "string",
+      ),
+    };
+  } catch {
+    return EMPTY_JOIN_ALERT_LEDGER;
+  }
+}
+
+/**
+ * Persist the ledger. Returns false when the write did not land.
+ *
+ * Routed through the quota-aware writer rather than `localStorage.setItem`:
+ * this runs inside an async snapshot handler, where a raw QuotaExceededError
+ * would reject before the notification is ever sent, and it would do so on
+ * every subsequent snapshot too.
+ */
+export function writeJoinAlertLedger(
+  communityId: string,
+  viewerPubkey: string,
+  ledger: JoinAlertLedger,
+): boolean {
+  if (
+    typeof window === "undefined" ||
+    communityId.length === 0 ||
+    viewerPubkey.length === 0
+  ) {
+    return false;
+  }
+
+  return setLocalStorageItemWithRecovery(
+    joinAlertStorageKey(communityId, viewerPubkey),
+    JSON.stringify(ledger satisfies JoinAlertLedger),
+  );
+}
+
+/**
+ * Fold a roster snapshot into the ledger, returning the pubkeys to alert on.
+ *
+ * The viewer's own pubkey is never alerted on or recorded: an owner does not
+ * need to be told they joined their own community.
+ *
+ * `alerts` is empty on the seeding run — the first snapshot for a community
+ * records every existing member silently, so installing the app against an
+ * established roster does not produce a notification per member.
+ */
+export function reconcileJoinAlertLedger({
+  ledger,
+  rosterPubkeys,
+  viewerPubkey,
+}: {
+  ledger: JoinAlertLedger;
+  rosterPubkeys: readonly string[];
+  viewerPubkey: string;
+}): { alerts: string[]; changed: boolean; ledger: JoinAlertLedger } {
+  const normalizedViewer = normalizeJoinPubkey(viewerPubkey);
+  const seen = new Set(ledger.pubkeys);
+  const roster = new Set<string>();
+  const fresh: string[] = [];
+
+  for (const rawPubkey of rosterPubkeys) {
+    const pubkey = normalizeJoinPubkey(rawPubkey);
+    if (pubkey.length === 0) continue;
+    if (pubkey === normalizedViewer) continue;
+    roster.add(pubkey);
+    if (seen.has(pubkey)) continue;
+    seen.add(pubkey);
+    fresh.push(pubkey);
+  }
+
+  if (fresh.length === 0 && ledger.seeded) {
+    return { alerts: [], changed: false, ledger };
+  }
+
+  // Shed only pubkeys absent from the roster we were just handed. Capping the
+  // whole ledger instead would evict keys that are still members, and every
+  // later snapshot would then re-alert them — permanently, once the roster
+  // passes the cap.
+  const departed = ledger.pubkeys.filter((pubkey) => !roster.has(pubkey));
+  const shedCount = departed.length - JOIN_ALERT_DEPARTED_MAX_ITEMS;
+  const shed = shedCount > 0 ? new Set(departed.slice(0, shedCount)) : null;
+  const retained =
+    shed === null
+      ? ledger.pubkeys
+      : ledger.pubkeys.filter((pubkey) => !shed.has(pubkey));
+
+  return {
+    alerts: ledger.seeded ? fresh : [],
+    changed: true,
+    ledger: {
+      seeded: true,
+      pubkeys: [...retained, ...fresh],
+    },
+  };
+}
+
+/** Notification copy for a single first join. */
+export function joinAlertTitle(communityName: string | null | undefined) {
+  const trimmed = communityName?.trim();
+  return trimmed && trimmed.length > 0
+    ? `New member in ${trimmed}`
+    : "New community member";
+}
+
+export function joinAlertBody(displayName: string) {
+  return `${displayName} joined`;
+}
+
+/**
+ * Most per-key notifications emitted for a single snapshot.
+ *
+ * Above this, one summary replaces the batch. A snapshot is a whole roster, not
+ * an event per join, so a bulk import or an invite link shared into a group
+ * chat lands every new key at once: without a cap that is one OS notification
+ * per member (measured: a 250-key snapshot emitted 248 banners in a serial
+ * loop). The cap is deliberately small — past a handful the individual
+ * identities are unreadable as notifications anyway, and the useful signal is
+ * that a batch arrived.
+ */
+export const JOIN_ALERT_MAX_INDIVIDUAL = 3;
+
+export function joinAlertSummaryBody(count: number) {
+  return `${count} new members joined`;
+}
diff --git a/desktop/src/features/community-members/useCommunityJoinAlerts.test.mjs b/desktop/src/features/community-members/useCommunityJoinAlerts.test.mjs
new file mode 100644
index 00000000000..7b34b901619
--- /dev/null
+++ b/desktop/src/features/community-members/useCommunityJoinAlerts.test.mjs
@@ -0,0 +1,2236 @@
+/**
+ * Mounted-hook tests for useCommunityJoinAlerts.
+ *
+ * The ledger reducer is covered by lib/joinAlerts.test.mjs. Nothing there
+ * exercises the parts of this feature that only exist once the hook is
+ * mounted, and those are exactly the parts a unit test cannot reach:
+ *
+ *   - the owner/admin gate sitting BEFORE any storage access, so a plain
+ *     member creates no ledger key at all;
+ *   - the reconnect arm, which refetches the snapshot across a socket gap and
+ *     must not re-alert keys the ledger already carries;
+ *   - the effect re-key on community switch, so each community gets its own
+ *     subscription and its own seed state;
+ *   - the kind:8000 arm refetching the authoritative snapshot rather than
+ *     alerting from the delta's own payload.
+ *
+ * Max's live-local matrix could not land the reconnect arm (simultaneous
+ * browser reloads tripped relay rate limiting) and did not exercise community
+ * switch, so these are the only evidence for those two paths.
+ *
+ * ── Harness shape ────────────────────────────────────────────────────────────
+ * Same pattern as useLoadArchivedObserverEvents.test.mjs: minimal DOM shim →
+ * __TAURI_INTERNALS__.invoke interception → production imports → createRoot/act
+ * inside a QueryClientProvider. relayClient's three entry points are replaced
+ * with mock.method so no socket is opened; window.Notification is stubbed so
+ * sendDesktopNotification takes its real permission-granted path and we can
+ * count what it emitted.
+ */
+
+import assert from "node:assert/strict";
+import { describe, it, beforeEach, afterEach, mock } from "node:test";
+
+// ── Minimal DOM shim ─────────────────────────────────────────────────────────
+
+function installDOMShim() {
+  class MinimalEventTarget {
+    constructor() {
+      this._listeners = {};
+    }
+    addEventListener(type, fn) {
+      if (!this._listeners[type]) this._listeners[type] = [];
+      this._listeners[type].push(fn);
+    }
+    removeEventListener(type, fn) {
+      if (this._listeners[type]) {
+        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 lastChild() {
+      return this.children[this.children.length - 1] ?? null;
+    }
+    get nextSibling() {
+      return null;
+    }
+    get nodeValue() {
+      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;
+  // react-dom's commit phase does `element instanceof window.HTMLIFrameElement`
+  // (getActiveElementDeep, react-dom-client.development.js:3667). Leaving it
+  // undefined throws "Right-hand side of 'instanceof' is not an object" out of
+  // commitRoot, before any assertion runs.
+  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();
+
+// ── localStorage shim ────────────────────────────────────────────────────────
+//
+// Backs the real production ledger read/write. Kept as a plain Map so a test
+// can inspect exactly which keys the feature created — the plain-member arm
+// asserts on key ABSENCE, so a shim that silently swallows writes would make
+// that assertion vacuous.
+
+const storage = new Map();
+/** When true the shim rejects writes the way a full origin quota does. */
+let storageFull = false;
+
+globalThis.localStorage = {
+  get length() {
+    return storage.size;
+  },
+  key: (index) => [...storage.keys()][index] ?? null,
+  getItem: (key) => storage.get(key) ?? null,
+  setItem: (key, value) => {
+    if (storageFull) {
+      const error = new Error("QuotaExceededError");
+      error.name = "QuotaExceededError";
+      throw error;
+    }
+    storage.set(key, value);
+  },
+  removeItem: (key) => storage.delete(key),
+  clear: () => storage.clear(),
+};
+globalThis.window.localStorage = globalThis.localStorage;
+
+// ── Notification shim ────────────────────────────────────────────────────────
+//
+// sendDesktopNotification returns false unless permission is "granted", so
+// without this every alert assertion would pass for the wrong reason (silent
+// success). Recording the constructor calls is how we count alerts.
+
+const notifications = [];
+/**
+ * Optional hook fired synchronously from inside the Notification constructor.
+ *
+ * The named-alert loop awaits each send, so "a demotion lands between send 1
+ * and send 2" is only expressible from inside a send. Nothing else in the
+ * harness can reach that point in the loop.
+ */
+let onNotification = null;
+
+class StubNotification {
+  static permission = "granted";
+  constructor(title, options) {
+    notifications.push({ title, body: options?.body, options });
+    if (onNotification) onNotification(notifications.length);
+  }
+  close() {}
+}
+
+globalThis.Notification = StubNotification;
+globalThis.window.Notification = StubNotification;
+
+// ── Tauri IPC interceptor ────────────────────────────────────────────────────
+
+/** @type {Map<string, (args: unknown) => Promise<unknown>>} */
+const ipcHandlers = new Map();
+
+globalThis.__TAURI_INTERNALS__ = {
+  invoke: (cmd, args) => {
+    const handler = ipcHandlers.get(cmd);
+    if (handler) return handler(args);
+    return Promise.reject(new Error(`unmocked Tauri command: ${cmd}`));
+  },
+  transformCallback: () => Math.random(),
+};
+
+// ── Production imports (after shims) ─────────────────────────────────────────
+
+import React from "react";
+import { createRoot } from "react-dom/client";
+import { act } from "react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+
+import { useCommunityJoinAlerts } from "@/features/community-members/useCommunityJoinAlerts.ts";
+import { joinAlertStorageKey } from "@/features/community-members/lib/joinAlerts.ts";
+import { relayClient } from "@/shared/api/relayClient.ts";
+import { CommunitiesProvider } from "@/features/communities/useCommunities.tsx";
+import { useCommunities } from "@/features/communities/useCommunities.tsx";
+import {
+  myRelayMembershipLookupQueryKey,
+  relayMembersQueryKey,
+  useRelayMembersQuery,
+} from "@/features/community-members/hooks.ts";
+
+// ── Constants ────────────────────────────────────────────────────────────────
+
+const VIEWER = "a".repeat(64);
+const ALICE = "b".repeat(64);
+const BOB = "c".repeat(64);
+const CAROL = "d".repeat(64);
+const COMMUNITY_A = "community-a";
+const COMMUNITY_B = "community-b";
+
+const KIND_SNAPSHOT = 13534;
+const KIND_MEMBER_ADDED = 8000;
+
+/**
+ * A kind:13534 membership snapshot carrying the given roster.
+ *
+ * The viewer is stamped `owner` unless `viewerRole` says otherwise, mirroring
+ * the relay: `publish_nip43_membership_locked` emits `["member", pubkey, role]`
+ * for every row, so the viewer's own authorization always rides in the
+ * snapshot. A fixture that stamped everyone `member` could not express the
+ * demotion this hook now gates on.
+ */
+function snapshot(
+  rosterPubkeys,
+  { id = "snap-1", createdAt = 1000, viewerRole = "owner" } = {},
+) {
+  return {
+    id,
+    pubkey: "f".repeat(64),
+    created_at: createdAt,
+    kind: KIND_SNAPSHOT,
+    tags: rosterPubkeys.map((pubkey) => [
+      "member",
+      pubkey,
+      pubkey === VIEWER ? viewerRole : "member",
+    ]),
+    content: "",
+    sig: "s".repeat(128),
+  };
+}
+
+/** Seed the communities the provider will load from localStorage. */
+function seedCommunities(activeId) {
+  storage.set(
+    "buzz-communities",
+    JSON.stringify([
+      {
+        id: COMMUNITY_A,
+        name: "Community A",
+        relayUrl: "wss://a.test",
+        addedAt: "2026-01-01T00:00:00Z",
+      },
+      {
+        id: COMMUNITY_B,
+        name: "Community B",
+        relayUrl: "wss://b.test",
+        addedAt: "2026-01-01T00:00:00Z",
+      },
+    ]),
+  );
+  storage.set("buzz-active-community-id", activeId);
+}
+
+/**
+ * Replace relayClient's three entry points and hand the test direct control of
+ * every callback the hook registers.
+ */
+function installRelayStub() {
+  /** @type {Map<number, Array<(event: unknown) => void>>} */
+  const liveByKind = new Map();
+  const reconnectListeners = [];
+  let fetchFirstEventCalls = 0;
+  let nextSnapshot = null;
+  let subscribeCount = 0;
+  let unsubscribeCount = 0;
+  /** When set, `fetchFirstEvent` parks here before resolving. */
+  let fetchGate = null;
+
+  mock.method(relayClient, "subscribeLive", async (filter, onEvent) => {
+    subscribeCount++;
+    const kind = filter.kinds[0];
+    if (!liveByKind.has(kind)) liveByKind.set(kind, []);
+    liveByKind.get(kind).push(onEvent);
+    return async () => {
+      unsubscribeCount++;
+      const list = liveByKind.get(kind) ?? [];
+      liveByKind.set(
+        kind,
+        list.filter((fn) => fn !== onEvent),
+      );
+    };
+  });
+
+  mock.method(relayClient, "fetchFirstEvent", async () => {
+    fetchFirstEventCalls++;
+    if (fetchGate) await fetchGate;
+    return nextSnapshot;
+  });
+
+  mock.method(relayClient, "subscribeToReconnects", (listener) => {
+    reconnectListeners.push(listener);
+    return () => {
+      const i = reconnectListeners.indexOf(listener);
+      if (i >= 0) reconnectListeners.splice(i, 1);
+    };
+  });
+
+  return {
+    /** Deliver a snapshot down every live kind:13534 callback. */
+    emitSnapshot: (event) => {
+      for (const fn of liveByKind.get(KIND_SNAPSHOT) ?? []) fn(event);
+    },
+    /** Deliver a kind:8000 delta down every live accelerator callback. */
+    emitDelta: (event) => {
+      for (const fn of liveByKind.get(KIND_MEMBER_ADDED) ?? []) fn(event);
+    },
+    /** Fire the relay client's reconnect notification. */
+    emitReconnect: () => {
+      for (const fn of [...reconnectListeners]) fn();
+    },
+    /** What a subsequent fetchFirstEvent (refetch) resolves to. */
+    setRefetchSnapshot: (event) => {
+      nextSnapshot = event;
+    },
+    /**
+     * Hold the snapshot refetch open, the way a slow relay does.
+     *
+     * The stale-frame privacy race is only expressible if a refetch can resolve
+     * AFTER a newer live frame has been processed. Without a gate here, the
+     * refetch resolves inside the same drain that started it and the two frames
+     * can never be interleaved.
+     */
+    deferRefetch: () => {
+      let release = null;
+      fetchGate = new Promise((resolve) => {
+        release = resolve;
+      });
+      return async () => {
+        fetchGate = null;
+        release();
+        await settle();
+      };
+    },
+    counts: () => ({
+      fetchFirstEventCalls,
+      subscribeCount,
+      unsubscribeCount,
+      liveSnapshotSubs: (liveByKind.get(KIND_SNAPSHOT) ?? []).length,
+      liveDeltaSubs: (liveByKind.get(KIND_MEMBER_ADDED) ?? []).length,
+      reconnectListeners: reconnectListeners.length,
+    }),
+  };
+}
+
+/** Mount the real hook under a real CommunitiesProvider + QueryClientProvider. */
+function mountHook({ role = "owner", enabled = true } = {}) {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false } },
+  });
+  queryClient.setQueryData(["identity"], { pubkey: VIEWER });
+  queryClient.setQueryData(myRelayMembershipLookupQueryKey, {
+    snapshotFound: true,
+    membershipRequired: true,
+    membership:
+      role === null
+        ? null
+        : { pubkey: VIEWER, role, addedBy: null, createdAt: null },
+  });
+
+  const invalidations = [];
+  const realInvalidate = queryClient.invalidateQueries.bind(queryClient);
+  queryClient.invalidateQueries = (args) => {
+    invalidations.push(args?.queryKey);
+    return realInvalidate(args);
+  };
+
+  // Captured from inside the tree so a test can switch community the way the
+  // rail does — in the SAME mounted tree. Unmount/remount would tear the
+  // subscriptions down no matter what the effect keys on, which makes the
+  // re-key assertion pass on a hook with an empty dependency array.
+  const control = { switchCommunity: null };
+
+  function Harness() {
+    control.switchCommunity = useCommunities().switchCommunity;
+    useCommunityJoinAlerts({ enabled });
+    return null;
+  }
+
+  const container = document.createElement("div");
+  const root = createRoot(container);
+
+  const render = async () => {
+    await act(async () => {
+      root.render(
+        React.createElement(
+          QueryClientProvider,
+          { client: queryClient },
+          React.createElement(
+            CommunitiesProvider,
+            null,
+            React.createElement(Harness, null),
+          ),
+        ),
+      );
+    });
+  };
+
+  return {
+    render,
+    invalidations,
+    queryClient,
+    switchCommunity: async (id) => {
+      await act(async () => {
+        control.switchCommunity(id);
+      });
+    },
+    unmount: async () => {
+      await act(async () => {
+        root.unmount();
+      });
+    },
+  };
+}
+
+async function settle(iterations = 4) {
+  for (let i = 0; i < iterations; i++) {
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 5));
+    });
+  }
+}
+
+/**
+ * Advance past the kind:8000 refetch debounce, then settle.
+ *
+ * The accelerator coalesces refetches on a 500ms trailing window so a bulk add
+ * costs one REQ instead of one per member; anything asserting on a refetch has
+ * to outwait that window or it is asserting on a timer that has not fired.
+ */
+async function settleAfterRefreshDebounce() {
+  await act(async () => {
+    await new Promise((r) => setTimeout(r, 600));
+  });
+  await settle();
+}
+
+/**
+ * Advance past the cross-snapshot notify window, then settle.
+ *
+ * Alerts are queued per snapshot and delivered on a trailing quiet window, so
+ * a burst spanning several intermediate 13534s produces one notification
+ * instead of one per snapshot. Anything asserting that a notification WAS
+ * delivered has to outwait that window; anything asserting an absence should
+ * outwait it too, or it proves only that delivery is deferred.
+ */
+async function settleAfterNotifyWindow() {
+  await act(async () => {
+    await new Promise((r) => setTimeout(r, 1_700));
+  });
+  await settle();
+}
+
+/**
+ * Hold the profile lookup open so the timer-fired/lookup-in-flight window is
+ * addressable from a test.
+ *
+ * `flushPending` consumes the pending refs at entry and then awaits
+ * `getUsersBatch` before it sends anything. Every arm that wants to assert on
+ * a revocation arriving DURING a flush has to be able to park the flush there;
+ * without this, the whole flush runs inside one microtask drain and the
+ * ordering Max and Wren found is not expressible at all.
+ *
+ * Routed through the Tauri IPC shim rather than a module mock so the real
+ * `getUsersBatch` runs — a stubbed production function would be a fixture
+ * re-declaring the code under test.
+ */
+function deferProfileLookup() {
+  let release = null;
+  const gate = new Promise((resolve) => {
+    release = resolve;
+  });
+  let calls = 0;
+  ipcHandlers.set("get_users_batch", async () => {
+    calls += 1;
+    await gate;
+    return { profiles: {}, missing: [] };
+  });
+  return {
+    calls: () => calls,
+    /** Let the in-flight lookup resolve, then drain. */
+    release: async () => {
+      release();
+      await settle();
+    },
+  };
+}
+
+function ledgerKeys() {
+  return [...storage.keys()].filter((key) =>
+    key.startsWith("buzz-community-join-seen.v1"),
+  );
+}
+
+// ── Tests ────────────────────────────────────────────────────────────────────
+
+describe("useCommunityJoinAlerts — mounted subscription behaviour", () => {
+  beforeEach(() => {
+    storage.clear();
+    storageFull = false;
+    notifications.length = 0;
+    onNotification = null;
+    ipcHandlers.clear();
+    seedCommunities(COMMUNITY_A);
+  });
+
+  afterEach(() => {
+    mock.restoreAll();
+  });
+
+  /**
+   * Positive control for the whole harness. Every other arm asserts an absence
+   * (no alert, no key, no extra subscription); if the harness could never
+   * produce an alert in the first place, all of them would pass vacuously.
+   */
+  it("seeds silently on the first snapshot, then alerts on a genuine join", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "the first snapshot per community must seed silently",
+    );
+    assert.equal(ledgerKeys().length, 1, "the seed must be persisted");
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE, BOB], { id: "snap-2" }));
+    await settleAfterNotifyWindow();
+
+    assert.equal(notifications.length, 1, "a genuine join must alert once");
+    assert.match(notifications[0].title, /Community A/);
+    assert.match(notifications[0].body, /joined/);
+
+    await unmount();
+  });
+
+  /**
+   * A plain member mounts the hook (it is mounted unconditionally alongside the
+   * other desktop notification wiring) and must be inert. Eva asked for the
+   * stronger assertion: not merely "no notification" but "no ledger key", which
+   * proves the role gate sits before storage access rather than after it.
+   *
+   * A key materializing here would not be a gate-ordering nit — it would mean
+   * canManageCommunityMembers returned true for a non-manager, i.e. a
+   * role-resolution bug upstream in relayMembers.ts.
+   */
+  it("is completely inert for a plain member: no subscription, no ledger key", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ role: "member" });
+
+    await render();
+    await settle();
+
+    const counts = relay.counts();
+    assert.equal(
+      counts.subscribeCount,
+      0,
+      "a plain member must open no subscription",
+    );
+    assert.equal(
+      counts.reconnectListeners,
+      0,
+      "a plain member must register no reconnect listener",
+    );
+
+    // Even if a snapshot somehow arrived, nothing is wired to receive it.
+    relay.emitSnapshot(snapshot([VIEWER, ALICE, BOB]));
+    await settle();
+
+    assert.equal(notifications.length, 0);
+    assert.deepEqual(
+      ledgerKeys(),
+      [],
+      "no buzz-community-join-seen.v1 key may be created for a plain member",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * `enabled: false` is the desktopEnabled precondition from
+   * useAppShellDesktopNotifications. An owner with notifications switched off
+   * must be as inert as a plain member — including writing no ledger, so
+   * turning notifications back on later seeds rather than back-alerting.
+   */
+  it("is inert for an owner when notifications are disabled", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ enabled: false });
+
+    await render();
+    await settle();
+
+    assert.equal(relay.counts().subscribeCount, 0);
+    assert.deepEqual(ledgerKeys(), []);
+
+    await unmount();
+  });
+
+  /**
+   * Reconnect arm. Max could not land this live (simultaneous browser reloads
+   * tripped relay rate limiting), so this is the only evidence for it.
+   *
+   * Two halves, and the second is the one that matters: the reconnect must
+   * refetch (a socket gap can span joins that `limit: 1` backfill will not
+   * redeliver), AND the refetched snapshot must not re-alert keys the ledger
+   * already carries. Asserting only the refetch would pass on a hook that
+   * alerts twice for every reconnect.
+   */
+  it("refetches on reconnect without re-alerting already-seen keys", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+    relay.emitSnapshot(snapshot([VIEWER, ALICE, BOB], { id: "snap-2" }));
+    await settleAfterNotifyWindow();
+    assert.equal(notifications.length, 1, "precondition: one join alerted");
+
+    const before = relay.counts().fetchFirstEventCalls;
+
+    // The socket drops and recovers; the relay client replays the same roster.
+    relay.setRefetchSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-replay", createdAt: 2000 }),
+    );
+    relay.emitReconnect();
+    await settleAfterRefreshDebounce();
+    await settleAfterNotifyWindow();
+
+    assert.ok(
+      relay.counts().fetchFirstEventCalls > before,
+      "reconnect must refetch the authoritative snapshot",
+    );
+    assert.equal(
+      notifications.length,
+      1,
+      "a reconnect replay of a known roster must not re-alert",
+    );
+
+    // A key that joined during the gap still alerts on the refetched snapshot.
+    relay.setRefetchSnapshot(
+      snapshot([VIEWER, ALICE, BOB, "d".repeat(64)], {
+        id: "snap-gap",
+        createdAt: 3000,
+      }),
+    );
+    relay.emitReconnect();
+    await settleAfterRefreshDebounce();
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      2,
+      "a join that landed during the socket gap must alert on refetch",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * The kind:8000 accelerator must refetch the authoritative snapshot rather
+   * than alert from the delta's own payload — that is what lets one ledger
+   * govern both signals so the pair cannot double-alert.
+   *
+   * The delta here names a pubkey that is NOT in the refetched roster. A hook
+   * alerting off the delta payload would fire; the correct hook fires nothing,
+   * because the snapshot is the authority.
+   */
+  it("treats kind:8000 as a refetch trigger, not an alert payload", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+    assert.equal(notifications.length, 0);
+
+    const before = relay.counts().fetchFirstEventCalls;
+
+    // Delta names a pubkey the authoritative roster does not (yet) carry.
+    relay.setRefetchSnapshot(
+      snapshot([VIEWER, ALICE], { id: "snap-unchanged", createdAt: 2000 }),
+    );
+    relay.emitDelta({
+      id: "delta-1",
+      pubkey: "f".repeat(64),
+      created_at: 1500,
+      kind: KIND_MEMBER_ADDED,
+      tags: [["p", BOB]],
+      content: "",
+      sig: "s".repeat(128),
+    });
+    await settleAfterRefreshDebounce();
+
+    assert.ok(
+      relay.counts().fetchFirstEventCalls > before,
+      "a kind:8000 delta must trigger a snapshot refetch",
+    );
+    assert.equal(
+      notifications.length,
+      0,
+      "the delta's own payload must never produce an alert — only the snapshot decides",
+    );
+
+    // Now the snapshot agrees, and exactly one alert follows.
+    relay.setRefetchSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-agrees", createdAt: 3000 }),
+    );
+    relay.emitDelta({
+      id: "delta-2",
+      pubkey: "f".repeat(64),
+      created_at: 2500,
+      kind: KIND_MEMBER_ADDED,
+      tags: [["p", BOB]],
+      content: "",
+      sig: "s".repeat(128),
+    });
+    await settleAfterRefreshDebounce();
+    await settleAfterNotifyWindow();
+
+    assert.equal(notifications.length, 1);
+
+    // And the live snapshot carrying the same join must not alert a second time.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-live", createdAt: 3500 }),
+    );
+    await settle();
+    assert.equal(
+      notifications.length,
+      1,
+      "the accelerator and the live snapshot share one ledger and must not double-alert",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * Community switch. Max's live-local run did not exercise this.
+   *
+   * The switch happens in the SAME mounted tree (via the provider's real
+   * switchCommunity), not by remounting: a remount tears every subscription
+   * down regardless of what the effect keys on, so a remount-based version of
+   * this test would pass on a hook with an empty dependency array. Switching
+   * in-tree makes the assertion actually about [active, communityId, viewer].
+   */
+  it("re-keys on community switch: fresh subscription and independent seed", async () => {
+    const relay = installRelayStub();
+    const harness = mountHook();
+
+    await harness.render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+    relay.emitSnapshot(snapshot([VIEWER, ALICE, BOB], { id: "snap-2" }));
+    await settleAfterNotifyWindow();
+    assert.equal(notifications.length, 1, "precondition: A alerted once");
+    assert.deepEqual(ledgerKeys(), [joinAlertStorageKey(COMMUNITY_A, VIEWER)]);
+
+    const beforeSwitch = relay.counts();
+    assert.equal(
+      beforeSwitch.liveSnapshotSubs,
+      1,
+      "precondition: A holds one live snapshot subscription",
+    );
+
+    await harness.switchCommunity(COMMUNITY_B);
+    await settle();
+
+    const afterSwitch = relay.counts();
+    assert.equal(
+      afterSwitch.unsubscribeCount,
+      beforeSwitch.subscribeCount,
+      `switching must close every subscription community A opened — opened ${beforeSwitch.subscribeCount}, closed ${afterSwitch.unsubscribeCount}`,
+    );
+    assert.equal(
+      afterSwitch.subscribeCount,
+      beforeSwitch.subscribeCount * 2,
+      "switching must open a fresh pair of subscriptions for community B",
+    );
+    assert.equal(
+      afterSwitch.liveSnapshotSubs,
+      1,
+      "exactly one live snapshot subscription may be open after the switch",
+    );
+    assert.equal(
+      afterSwitch.liveDeltaSubs,
+      1,
+      "exactly one live delta subscription may be open after the switch",
+    );
+
+    // B's existing roster must seed silently even though A is already seeded.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-b", createdAt: 4000 }),
+    );
+    await settle();
+
+    assert.equal(
+      notifications.length,
+      1,
+      "community B must seed silently — its roster is not a set of joins",
+    );
+
+    const keys = ledgerKeys().sort();
+    assert.deepEqual(
+      keys,
+      [
+        joinAlertStorageKey(COMMUNITY_A, VIEWER),
+        joinAlertStorageKey(COMMUNITY_B, VIEWER),
+      ].sort(),
+      "each community must keep its own ledger",
+    );
+
+    // And B alerts on its own first genuine join.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB, "d".repeat(64)], {
+        id: "snap-b2",
+        createdAt: 5000,
+      }),
+    );
+    await settleAfterNotifyWindow();
+    assert.equal(notifications.length, 2);
+
+    // Switching back must not re-alert A's roster: its ledger persisted.
+    await harness.switchCommunity(COMMUNITY_A);
+    await settle();
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-a-return", createdAt: 6000 }),
+    );
+    await settleAfterNotifyWindow();
+    assert.equal(
+      notifications.length,
+      2,
+      "returning to A must not re-alert keys A's ledger already carries",
+    );
+
+    await harness.unmount();
+  });
+
+  /**
+   * Eva's red-team finding (thread 866f149d): writeJoinAlertLedger returns
+   * whether the write landed, and the caller dropped it. On a quota failure
+   * that survives cache eviction the alert fired against an unpersisted
+   * ledger — so the next reload re-alerted the same keys, which is exactly the
+   * "repeat" the ordering comment one line above promises never to do.
+   *
+   * Two halves, and both are needed. Asserting only "no notification" would
+   * pass on a hook that also poisons the in-memory ref, silently swallowing
+   * the alert forever. The second half proves the alert is deferred, not lost:
+   * once storage recovers, the next snapshot delivers it.
+   */
+  it("does not notify when the ledger write cannot land, and delivers once it can", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+    assert.equal(ledgerKeys().length, 1, "precondition: the seed persisted");
+
+    // Origin quota is exhausted and cache eviction cannot free enough.
+    storageFull = true;
+    relay.emitSnapshot(snapshot([VIEWER, ALICE, BOB], { id: "snap-full" }));
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "an alert must not fire against a ledger that was never persisted",
+    );
+
+    // Storage recovers. The same join must still be pending, not consumed by
+    // the failed attempt: the ref was deliberately left un-advanced.
+    storageFull = false;
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-recovered", createdAt: 2000 }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      1,
+      "the deferred alert must be delivered by the first snapshot whose write lands",
+    );
+
+    // And it is not delivered twice now that the ledger is on disk.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-after", createdAt: 3000 }),
+    );
+    await settleAfterNotifyWindow();
+    assert.equal(notifications.length, 1);
+
+    await unmount();
+  });
+
+  /**
+   * A snapshot refreshes the members panel regardless of alert eligibility: a
+   * removal or a role change alters the roster without producing anything new
+   * to alert on, and the open panel must still repaint.
+   *
+   * The refresh is a direct cache WRITE, not an invalidation — an invalidation
+   * refetched every active observer, costing one REQ frame per snapshot (see
+   * the two-arm REQ test at the end of this file). So this asserts the roster
+   * that lands in the cache, which is the property the panel actually renders
+   * from, and is a strictly stronger claim than "an invalidation was issued":
+   * it fails both if the refresh disappears AND if it writes the wrong roster.
+   */
+  it("writes the roster into the members query on every snapshot, including a seeding one", async () => {
+    const relay = installRelayStub();
+    const { render, queryClient, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    assert.equal(
+      queryClient.getQueryData(relayMembersQueryKey),
+      undefined,
+      "precondition: nothing has populated the members query yet",
+    );
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+
+    const cached = queryClient.getQueryData(relayMembersQueryKey);
+    assert.deepEqual(
+      cached?.map((member) => member.pubkey).sort(),
+      [VIEWER, ALICE].sort(),
+      "the seeding snapshot must still refresh the roster panel",
+    );
+    // The viewer's own role rides in the snapshot, so the written rows carry it
+    // — a fixture writing bare pubkeys would render an owner as a plain member.
+    assert.equal(
+      cached?.find((member) => member.pubkey === VIEWER)?.role,
+      "owner",
+      "the written rows must carry roles, not just pubkeys",
+    );
+
+    await unmount();
+  });
+  /**
+   * Authorization must come from the snapshot in hand, not the cached role that
+   * mounted the effect.
+   *
+   * `useMyRelayMembershipLookupQuery` is invalidated only by this client's own
+   * membership mutations, and `staleTime` marks data stale without scheduling a
+   * refetch — so a viewer demoted by ANOTHER admin keeps a cached owner/admin
+   * role for as long as the app stays open. Found by Wren, reproduced live by
+   * Max against a real relay: the demoted viewer kept learning every later
+   * joiner's identity.
+   *
+   * The demotion and the join ride in the SAME snapshot, which is the racy
+   * shape: an async invalidation cannot beat the handler it is racing.
+   */
+  it("stops alerting when the snapshot itself demotes the viewer", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ role: "admin" });
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE], { viewerRole: "admin" }));
+    await settle();
+
+    // Positive control: still admin, so a genuine join must alert. Without
+    // this, a gate that refused everything would pass the assertions below.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-join", viewerRole: "admin" }),
+    );
+    await settleAfterNotifyWindow();
+    assert.equal(notifications.length, 1, "precondition: admin still alerts");
+
+    const ledgerBefore = storage.get(joinAlertStorageKey(COMMUNITY_A, VIEWER));
+
+    // Remote demotion + a new member, in one authoritative snapshot.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB, CAROL], {
+        id: "snap-demote",
+        createdAt: 4000,
+        viewerRole: "member",
+      }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      1,
+      "a demoted viewer must not be told who joined",
+    );
+    assert.equal(
+      storage.get(joinAlertStorageKey(COMMUNITY_A, VIEWER)),
+      ledgerBefore,
+      "the ledger must not advance on a snapshot the viewer is not authorized for",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * Removal is the same disclosure as demotion, and `find` returning undefined
+   * is a different code path from a role that is present but wrong.
+   */
+  it("stops alerting when the viewer is dropped from the roster entirely", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ role: "owner" });
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+
+    // Viewer absent from the snapshot; a new key arrives alongside.
+    relay.emitSnapshot({
+      id: "snap-removed",
+      pubkey: "f".repeat(64),
+      created_at: 5000,
+      kind: KIND_SNAPSHOT,
+      tags: [
+        ["member", ALICE, "member"],
+        ["member", BOB, "member"],
+      ],
+      content: "",
+      sig: "s".repeat(128),
+    });
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "a removed viewer must learn nothing about later joins",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * A snapshot is a whole roster, so a bulk add lands every new key at once.
+   * Uncapped that is one OS notification per member — measured at 248 banners
+   * for a 250-key snapshot, delivered through a serial await loop.
+   */
+  it("collapses a bulk join into one summary instead of a banner per member", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+
+    const bulk = [];
+    for (let i = 0; i < 40; i++) {
+      bulk.push(`${i.toString(16).padStart(2, "0").repeat(31)}ff`);
+    }
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, ...bulk], { id: "snap-bulk", createdAt: 6000 }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(notifications.length, 1, "one summary, not one per member");
+    assert.equal(notifications[0].body, "40 new members joined");
+
+    await unmount();
+  });
+
+  /**
+   * Below the cap the alert still names people — the summary must not swallow
+   * the ordinary one-or-two-join case the feature exists for.
+   */
+  it("still names individuals for a small batch", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB, CAROL], {
+        id: "snap-two",
+        createdAt: 7000,
+      }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(notifications.length, 2, "two joins, two named alerts");
+    assert.ok(
+      notifications.every((entry) => entry.body.endsWith(" joined")),
+      "each alert names the joiner rather than summarizing",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * Each refetch is a REQ frame billed against the same per-principal WsEvents
+   * budget as the user's own sends (default 10/s over a 5s window), and a bulk
+   * add emits one kind:8000 per member. Uncoalesced that was 250 REQs for 250
+   * deltas — spending the budget the owner needs to send messages and open
+   * channels.
+   */
+  it("coalesces a burst of kind:8000 deltas into a single refetch", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+
+    const before = relay.counts().fetchFirstEventCalls;
+    relay.setRefetchSnapshot(
+      snapshot([VIEWER, ALICE], { id: "snap-burst", createdAt: 8000 }),
+    );
+
+    for (let i = 0; i < 50; i++) {
+      relay.emitDelta({
+        id: `burst-${i}`,
+        pubkey: "f".repeat(64),
+        created_at: 8000 + i,
+        kind: KIND_MEMBER_ADDED,
+        tags: [["p", BOB]],
+        content: "",
+        sig: "s".repeat(128),
+      });
+    }
+    await settleAfterRefreshDebounce();
+
+    assert.equal(
+      relay.counts().fetchFirstEventCalls - before,
+      1,
+      "50 deltas must cost exactly one REQ, not 50",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * Max's live 50-join storm at `fdeda44f0`: 10 banners, not 1.
+   *
+   * The per-snapshot cap answers "one snapshot, many keys". The relay answers
+   * back "one burst, many snapshots" — it republishes the whole 13534 as each
+   * concurrent add commits, so a storm arrives as several growing rosters and
+   * each one independently emitted its own capped batch. The batch sizes below
+   * are Max's observed live values (6, 17, 4, 4, 4, 4, 11 = 50).
+   */
+  it("collapses a burst spanning several snapshots into one alert", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER]));
+    await settleAfterNotifyWindow();
+    assert.equal(notifications.length, 0, "precondition: seeded silently");
+
+    const roster = [VIEWER];
+    let minted = 0;
+    let snapIndex = 0;
+    for (const size of [6, 17, 4, 4, 4, 4, 11]) {
+      for (let i = 0; i < size; i++) {
+        minted += 1;
+        roster.push(minted.toString(16).padStart(2, "0").repeat(32));
+      }
+      snapIndex += 1;
+      relay.emitSnapshot(
+        snapshot([...roster], {
+          id: `storm-${snapIndex}`,
+          createdAt: 9000 + snapIndex,
+        }),
+      );
+      await settle();
+    }
+    await settleAfterNotifyWindow();
+
+    assert.equal(minted, 50, "fixture must mint Max's 50 joins");
+    assert.equal(
+      notifications.length,
+      1,
+      "a burst spanning 7 snapshots must produce one alert, not one per snapshot",
+    );
+    assert.equal(notifications[0].body, "50 new members joined");
+
+    await unmount();
+  });
+
+  /**
+   * Wren's arm 3, and the reason batching is not free: deferring delivery
+   * reopens his disclosure as a DELAYED one unless revocation also drops what
+   * is already queued. Measured failing before the clearPending() call existed
+   * — the queued batch flushed "5 new members joined" after the demotion.
+   */
+  it("drops queued alerts when a later snapshot demotes the viewer", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ role: "admin" });
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER], { viewerRole: "admin" }));
+    await settle();
+
+    // Joins land and are queued, but the flush window has not elapsed.
+    const roster = [VIEWER, ALICE, BOB, CAROL];
+    relay.emitSnapshot(
+      snapshot([...roster], {
+        id: "queued-joins",
+        createdAt: 10_000,
+        viewerRole: "admin",
+      }),
+    );
+    await settle();
+    assert.equal(
+      notifications.length,
+      0,
+      "precondition: delivery is still pending on the window",
+    );
+
+    // Demotion arrives before the timer fires.
+    relay.emitSnapshot(
+      snapshot([...roster], {
+        id: "queued-demote",
+        createdAt: 10_001,
+        viewerRole: "member",
+      }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "a demotion before the flush must cancel the queued batch, not delay it",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * Wren's arm 5. The window must batch a burst without swallowing legitimate
+   * later joins — otherwise the fix trades 10 spurious alerts for a silently
+   * dropped one.
+   */
+  it("still alerts separately for joins beyond the batching window", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER]));
+    await settleAfterNotifyWindow();
+
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE], { id: "join-1", createdAt: 11_000 }),
+    );
+    await settleAfterNotifyWindow();
+    assert.equal(notifications.length, 1, "first join alerts on its own");
+
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "join-2", createdAt: 12_000 }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      2,
+      "a join after the window closed must get its own alert, not be suppressed",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * Teardown must drop the queued batch, not just its timer. On a community
+   * switch the effect re-keys, and keys accumulated for the old community must
+   * never flush against the new one.
+   */
+  it("does not deliver a queued batch after unmount", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER]));
+    await settle();
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB, CAROL], {
+        id: "queued-at-teardown",
+        createdAt: 13_000,
+      }),
+    );
+    await settle();
+    assert.equal(notifications.length, 0, "precondition: still queued");
+
+    await unmount();
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "a torn-down mount must not fire its pending batch",
+    );
+  });
+
+  // ── Mid-flight cancellation (Max's race, Wren's arm list) ──────────────────
+  //
+  // Clearing the pending refs cannot stop a flush that already consumed them.
+  // Every send sits behind an await — the profile lookup, then each
+  // notification — so a revocation landing after the timer fired but before
+  // the sends resolve delivered anyway at 5d0d2b4c. These arms pin the
+  // generation token that closes it. All five park the flush on a deferred
+  // `get_users_batch`; without that the ordering is not expressible.
+
+  it("suppresses an in-flight flush when a demotion lands during the lookup", async () => {
+    const relay = installRelayStub();
+    const profiles = deferProfileLookup();
+    const { render, unmount } = mountHook({ role: "admin" });
+
+    await render();
+    await settle();
+    relay.emitSnapshot(snapshot([VIEWER], { viewerRole: "admin" }));
+    await settle();
+
+    const roster = [VIEWER, ALICE, BOB];
+    relay.emitSnapshot(
+      snapshot([...roster], {
+        id: "inflight-joins",
+        createdAt: 14_000,
+        viewerRole: "admin",
+      }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      profiles.calls(),
+      1,
+      "precondition: flush is parked on the lookup",
+    );
+    assert.equal(notifications.length, 0, "precondition: nothing sent yet");
+
+    // Authorization is revoked while the flush holds the batch in locals.
+    relay.emitSnapshot(
+      snapshot([...roster], {
+        id: "inflight-demote",
+        createdAt: 14_001,
+        viewerRole: "member",
+      }),
+    );
+    await settle();
+
+    await profiles.release();
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "a demotion during the profile lookup must abort the resumed flush",
+    );
+
+    await unmount();
+  });
+
+  it("suppresses an in-flight flush when the viewer is removed during the lookup", async () => {
+    const relay = installRelayStub();
+    const profiles = deferProfileLookup();
+    const { render, unmount } = mountHook({ role: "admin" });
+
+    await render();
+    await settle();
+    relay.emitSnapshot(snapshot([VIEWER], { viewerRole: "admin" }));
+    await settle();
+
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], {
+        id: "removal-joins",
+        createdAt: 15_000,
+        viewerRole: "admin",
+      }),
+    );
+    await settleAfterNotifyWindow();
+    assert.equal(
+      profiles.calls(),
+      1,
+      "precondition: flush is parked on the lookup",
+    );
+
+    // Dropped from the roster entirely — fail closed, same as a demotion.
+    relay.emitSnapshot(
+      snapshot([ALICE, BOB], { id: "removal", createdAt: 15_001 }),
+    );
+    await settle();
+
+    await profiles.release();
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "removal during the profile lookup must abort the resumed flush",
+    );
+
+    await unmount();
+  });
+
+  it("suppresses an in-flight flush across a community switch, under either name", async () => {
+    const relay = installRelayStub();
+    const profiles = deferProfileLookup();
+    const { render, switchCommunity, unmount } = mountHook();
+
+    await render();
+    await settle();
+    relay.emitSnapshot(snapshot([VIEWER]));
+    await settle();
+
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], {
+        id: "switch-joins",
+        createdAt: 16_000,
+      }),
+    );
+    await settleAfterNotifyWindow();
+    assert.equal(
+      profiles.calls(),
+      1,
+      "precondition: flush is parked on the lookup",
+    );
+
+    await switchCommunity(COMMUNITY_B);
+    await profiles.release();
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "community A's keys must not deliver after the switch to B",
+    );
+    // The title is read at send time from a ref, so a surviving flush would
+    // also mislabel A's joiners as B's. Assert the mislabel is impossible
+    // rather than inferring it from the count above.
+    assert.ok(
+      notifications.every((entry) => !entry.title.includes("Community B")),
+      "no alert may carry the new community's title",
+    );
+
+    await unmount();
+  });
+
+  it("suppresses the remainder of a batch when a demotion lands between sends", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ role: "admin" });
+
+    await render();
+    await settle();
+    relay.emitSnapshot(snapshot([VIEWER], { viewerRole: "admin" }));
+    await settle();
+
+    const roster = [VIEWER, ALICE, BOB, CAROL];
+    relay.emitSnapshot(
+      snapshot([...roster], {
+        id: "midloop-joins",
+        createdAt: 17_000,
+        viewerRole: "admin",
+      }),
+    );
+    await settle();
+
+    // Fire the demotion from inside the first send — the only point in the
+    // program where "between named send 1 and send 2" exists.
+    onNotification = (count) => {
+      if (count !== 1) return;
+      onNotification = null;
+      relay.emitSnapshot(
+        snapshot([...roster], {
+          id: "midloop-demote",
+          createdAt: 17_001,
+          viewerRole: "member",
+        }),
+      );
+    };
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      1,
+      "the send already in flight completes, but the rest of the batch is suppressed",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * Positive control for the cancellation token, and the semantics Eva asked
+   * to be pinned: the generation bumps on CANCELLATION only, never on an
+   * ordinary enqueue. A newer authorized batch queued while an earlier flush's
+   * lookup is in flight must neither cancel it nor be cancelled by it — both
+   * deliver.
+   *
+   * Without this arm a token that bumped on every enqueue would pass all four
+   * arms above by suppressing everything, which is the failure mode a
+   * suppression test cannot see.
+   */
+  it("delivers both batches when a new authorized batch queues during a flush", async () => {
+    const relay = installRelayStub();
+    const profiles = deferProfileLookup();
+    const { render, unmount } = mountHook();
+
+    await render();
+    await settle();
+    relay.emitSnapshot(snapshot([VIEWER]));
+    await settle();
+
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE], { id: "batch-one", createdAt: 18_000 }),
+    );
+    await settleAfterNotifyWindow();
+    assert.equal(
+      profiles.calls(),
+      1,
+      "precondition: first flush parked on the lookup",
+    );
+    assert.equal(notifications.length, 0, "precondition: nothing sent yet");
+
+    // A second, fully authorized join arrives while the first flush waits.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "batch-two", createdAt: 18_001 }),
+    );
+    await settle();
+
+    await profiles.release();
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      2,
+      "a legitimate concurrent batch must not erase, or be erased by, the in-flight one",
+    );
+    assert.ok(
+      notifications.every((entry) => entry.body.endsWith(" joined")),
+      "both alerts name their joiner",
+    );
+
+    await unmount();
+  });
+
+  // ── Stale-frame ordering: the fence and the revocation latch ───────────────
+  //
+  // Everything below concerns frames arriving out of order. The demotion arms
+  // above all deliver the revoking snapshot LAST, which is the only ordering a
+  // trailing-window suite naturally produces — and the ordering under which a
+  // hook with no fence and no latch passes every one of them.
+
+  /**
+   * The privacy regression. Red at 0cfe4832, green with the latch.
+   *
+   * A refetch (kind:8000 accelerator or reconnect) is held open while a newer
+   * live frame demotes the viewer. The stale frame then resolves still listing
+   * the viewer as owner AND carrying a new member. At 0cfe4832 the hook
+   * authorized that frame against its own roster, found "owner", and disclosed
+   * the joiner's identity to an admin who had already been demoted — measured as
+   * `notifications=1 bodies=["cccc… joined"]`.
+   *
+   * The latch is what closes it, not the fence: `created_at` ordering alone
+   * cannot, because the relay can emit two snapshots in the same second.
+   */
+  it("never discloses a joiner from a stale frame that outlives a demotion", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ role: "owner" });
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE]));
+    await settle();
+    assert.equal(notifications.length, 0, "precondition: seeded silently");
+
+    // A stale authorized frame — still owner, and it carries BOB — is put in
+    // flight and held there.
+    relay.setRefetchSnapshot(
+      snapshot([VIEWER, ALICE, BOB], {
+        id: "snap-stale-authorized",
+        createdAt: 20_000,
+      }),
+    );
+    const releaseRefetch = relay.deferRefetch();
+    relay.emitDelta({
+      id: "delta-1",
+      pubkey: "f".repeat(64),
+      created_at: 20_000,
+      kind: KIND_MEMBER_ADDED,
+      tags: [["p", BOB]],
+      content: "",
+      sig: "s".repeat(128),
+    });
+    await settleAfterRefreshDebounce();
+
+    // Meanwhile the live subscription delivers the demotion. Same second as the
+    // stale frame on purpose: a strictly-older fence does not reject it, so this
+    // arm cannot pass on the fence alone.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE], {
+        id: "snap-demote",
+        createdAt: 20_000,
+        viewerRole: "member",
+      }),
+    );
+    await settle();
+    assert.equal(
+      notifications.length,
+      0,
+      "precondition: the demotion itself discloses nothing",
+    );
+
+    // Persisted ledger immediately before the delayed frame is released. The
+    // notification count alone cannot distinguish "refused before touching the
+    // ledger" from "recorded BOB as seen but suppressed the banner" — and the
+    // second shape would silently swallow the alert forever once the session
+    // recovers, since a key already marked seen is never announced again.
+    const ledgerBeforeRelease = storage.get(
+      joinAlertStorageKey(COMMUNITY_A, VIEWER),
+    );
+
+    // Now the stale authorized frame lands.
+    await releaseRefetch();
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "a frame that predates the demotion must not re-open disclosure",
+    );
+    assert.ok(
+      !notifications.some((entry) => entry.body?.includes(BOB.slice(0, 8))),
+      "the demoted viewer must never learn the new member's identity",
+    );
+    assert.equal(
+      storage.get(joinAlertStorageKey(COMMUNITY_A, VIEWER)),
+      ledgerBeforeRelease,
+      "the latched session must refuse the frame before reconciliation, leaving the ledger untouched",
+    );
+    assert.ok(
+      !(ledgerBeforeRelease ?? "").includes(BOB),
+      "control: BOB must not already be in the ledger, or the assertion above is vacuous",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * The fence's own arm: a strictly older frame is not treated as current.
+   *
+   * Distinct from the latch above — here the viewer is never demoted, so the
+   * latch never trips and only the `created_at` comparison can reject the frame.
+   * A stale roster that has LOST a member must not cause that member to be
+   * re-alerted when they reappear in the (already-seen) newer roster.
+   */
+  it("ignores a strictly older snapshot rather than treating it as current", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ role: "owner" });
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE], { createdAt: 30_000 }));
+    await settle();
+
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-new", createdAt: 31_000 }),
+    );
+    await settleAfterNotifyWindow();
+    assert.equal(notifications.length, 1, "precondition: BOB alerted once");
+
+    const ledgerAfterBob = storage.get(
+      joinAlertStorageKey(COMMUNITY_A, VIEWER),
+    );
+
+    // An older frame arrives late, carrying a roster that predates BOB and adds
+    // CAROL. Processing it as current would fold a superseded roster in.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, CAROL], {
+        id: "snap-older",
+        createdAt: 30_500,
+      }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      1,
+      "an older frame must not alert from a superseded roster",
+    );
+    assert.equal(
+      storage.get(joinAlertStorageKey(COMMUNITY_A, VIEWER)),
+      ledgerAfterBob,
+      "an older frame must not advance the ledger",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * Eva's constraint: the fence advances only on frames actually accepted.
+   *
+   * If a rejected frame moved newest-seen, a stale frame could push the fence
+   * past a legitimate frame still in flight and that real snapshot would be
+   * dropped as though it were stale. The rejection used here is the empty
+   * roster, and the legitimate frame that follows carries a LOWER `created_at`
+   * than the rejected one.
+   *
+   * Scope, measured rather than assumed. Moving the empty-roster guard to AFTER
+   * the fence advance fails this arm and only this arm (28/29 still pass), so it
+   * is a real and uniquely-targeted guard. But moving the fence advance itself
+   * back up to the comparison — the literal edit Eva's constraint forbids —
+   * SURVIVES the whole suite, and that is not a gap in this test: it is an
+   * equivalent mutant. Only two guards sit between the comparison and the
+   * advance, and each is already immune:
+   *
+   *   - the empty-roster guard returns BEFORE the comparison, so a frame it
+   *     rejects never reaches either position;
+   *   - the authorization guard latches `revoked` on the way out, and a revoked
+   *     session refuses every later frame outright, so whether that frame moved
+   *     the fence first is unobservable.
+   *
+   * The placement is therefore defence in depth against a FUTURE reject-and-
+   * continue path, not a currently-reachable defect. Pinning it here is what
+   * makes the next such guard visible — a new early return added between these
+   * two points would be caught by this arm rather than by a user.
+   */
+  it("does not advance the stale-frame fence on a frame it rejects", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ role: "owner" });
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE], { createdAt: 40_000 }));
+    await settle();
+
+    // Rejected frame, far in the future. An empty roster is dropped before the
+    // fence would have anything to say about it.
+    relay.emitSnapshot(snapshot([], { id: "snap-empty", createdAt: 90_000 }));
+    await settle();
+
+    // A legitimate frame, newer than the accepted one but OLDER than the
+    // rejected one. If the rejected frame had advanced the fence, this real
+    // join would be silently discarded.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-real", createdAt: 41_000 }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      1,
+      "a rejected frame must not fence out a later legitimate one",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * Eva's constraint: the latch trip drops the queued batch before anything
+   * else, exactly as the pre-latch demotion path did.
+   *
+   * The latch is an addition to that path, not a replacement for it, and a latch
+   * that returned early WITHOUT clearing would leave an armed timer holding
+   * authorized-at-queue-time keys that fires after revocation. Asserted by
+   * queueing a batch, tripping the latch mid-window, and then outwaiting the
+   * window: silence can only come from the batch having been dropped.
+   */
+  it("drops the queued batch when the latch trips, not merely afterwards", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ role: "owner" });
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE], { createdAt: 50_000 }));
+    await settle();
+
+    // Queue a batch and leave it pending inside the trailing window.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], { id: "snap-queue", createdAt: 51_000 }),
+    );
+    await settle();
+    assert.equal(
+      notifications.length,
+      0,
+      "precondition: the batch is queued, not yet delivered",
+    );
+
+    // Trip the latch while that timer is still armed.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], {
+        id: "snap-latch",
+        createdAt: 52_000,
+        viewerRole: "member",
+      }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "a batch queued before revocation must be dropped by the latch trip",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * Known and accepted for v1 (Eva's ruling): a stale DEMOTING frame latches a
+   * viewer who is still a genuine admin, and the latch does not self-clear.
+   *
+   * This is the reverse ordering of the privacy race. The invalidation the latch
+   * fires refetches the membership lookup, which correctly returns admin, so
+   * `active` stays true, the effect deps do not change, and no re-key occurs —
+   * the session stays latched until reload or community switch.
+   *
+   * It is fail-safe (under-notify, never over-disclose) and consistent with the
+   * promotion-on-reload semantics this feature already ships, so it is pinned
+   * here as documented behaviour rather than left to be rediscovered as a bug.
+   * Clearing it would cost a third piece of timing state, which is not worth it
+   * at v1.
+   */
+  it("stays latched after a stale demoting frame, until reload or switch (accepted)", async () => {
+    const relay = installRelayStub();
+    const { render, switchCommunity, unmount } = mountHook({ role: "admin" });
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE], { createdAt: 60_000, viewerRole: "admin" }),
+    );
+    await settle();
+
+    // A stale frame that does not list the viewer as a manager arrives first.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE], {
+        id: "snap-stale-demote",
+        createdAt: 60_000,
+        viewerRole: "member",
+      }),
+    );
+    await settle();
+
+    // The viewer is in fact still an admin, and later frames say so.
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], {
+        id: "snap-still-admin",
+        createdAt: 61_000,
+        viewerRole: "admin",
+      }),
+    );
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      notifications.length,
+      0,
+      "documented: the latch does not self-clear, so alerts stay off for this session",
+    );
+
+    // A community switch re-keys the effect and builds a fresh session, which is
+    // the documented recovery path (alongside reload). Switching away and back
+    // is what a user does; assert the feature is alive again afterwards.
+    await switchCommunity(COMMUNITY_B);
+    await settle();
+    await switchCommunity(COMMUNITY_A);
+    await settle();
+
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB], {
+        id: "snap-after-switch",
+        createdAt: 62_000,
+        viewerRole: "admin",
+      }),
+    );
+    await settle();
+    relay.emitSnapshot(
+      snapshot([VIEWER, ALICE, BOB, CAROL], {
+        id: "snap-after-switch-join",
+        createdAt: 63_000,
+        viewerRole: "admin",
+      }),
+    );
+    await settleAfterNotifyWindow();
+
+    // Two, not one: the latched session suppressed BOB's alert but also never
+    // recorded him in the ledger, so the fresh session sees him as unseen and
+    // announces him alongside CAROL. The accepted cost of the latch is therefore
+    // DELAYED notification, not lost notification — which is what makes
+    // "fail-safe" true rather than merely reassuring.
+    assert.equal(
+      notifications.length,
+      2,
+      "a community switch clears the latch: the feature recovers without a reload",
+    );
+    assert.ok(
+      notifications.some((entry) => entry.body?.includes(BOB.slice(0, 8))),
+      "the join suppressed by the latch is re-announced, not lost",
+    );
+    assert.ok(
+      notifications.some((entry) => entry.body?.includes(CAROL.slice(0, 8))),
+      "and the new join lands too",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * F1: a snapshot in flight across a community switch is folded into the
+   * session that requested it, or into nothing — never into the new
+   * community's ledger.
+   *
+   * `handleSnapshot` is a `useEffectEvent`, so before the session binding it
+   * read whatever community was CURRENTLY rendered. A frame from community A
+   * resolving after a switch to B would be reconciled against B's ledger and
+   * persisted under B's storage key, alerting for A's members under B's name.
+   */
+  it("never folds a snapshot from the previous community into the new one", async () => {
+    const relay = installRelayStub();
+    const { render, switchCommunity, unmount } = mountHook({ role: "owner" });
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER, ALICE], { createdAt: 70_000 }));
+    await settle();
+
+    const keyA = joinAlertStorageKey(COMMUNITY_A, VIEWER);
+    const keyB = joinAlertStorageKey(COMMUNITY_B, VIEWER);
+    const ledgerABefore = storage.get(keyA);
+    assert.ok(ledgerABefore, "precondition: community A seeded");
+    assert.equal(storage.get(keyB), undefined, "precondition: B unseeded");
+
+    // Community A's refetch is held open across the switch.
+    relay.setRefetchSnapshot(
+      snapshot([VIEWER, ALICE, BOB], {
+        id: "snap-a-inflight",
+        createdAt: 71_000,
+      }),
+    );
+    const releaseRefetch = relay.deferRefetch();
+    relay.emitReconnect();
+    await settleAfterRefreshDebounce();
+
+    await switchCommunity(COMMUNITY_B);
+    await settle();
+
+    // A's frame now resolves, with B active.
+    await releaseRefetch();
+    await settleAfterNotifyWindow();
+
+    assert.equal(
+      storage.get(keyA),
+      ledgerABefore,
+      "the retired session must not write community A's ledger either",
+    );
+    const ledgerB = storage.get(keyB);
+    if (ledgerB !== undefined) {
+      assert.ok(
+        !ledgerB.includes(BOB),
+        "community A's roster must never reach community B's ledger",
+      );
+    }
+    assert.ok(
+      !notifications.some((entry) => entry.title?.includes("Community B")),
+      "community A's joiners must never be announced under community B",
+    );
+
+    await unmount();
+  });
+
+  /**
+   * F2: the trailing window is a pure debounce, so a join cadence faster than
+   * the window re-arms it indefinitely.
+   *
+   * Measured before the clamp: 13 joins at ~700ms intervals produced ZERO
+   * notifications across 9.1 continuous seconds, with the ledger persisted the
+   * whole time — so a quit mid-drip loses a batch already recorded as alerted.
+   * The clamp bounds that. This arm drips faster than the window for longer
+   * than the ceiling and asserts delivery happens DURING the drip.
+   *
+   * The existing burst arm cannot catch this: it emits its snapshots in a tight
+   * loop inside one drain, so the window never re-arms against wall-clock time
+   * and the starvation is structurally unreachable there.
+   */
+  it("delivers during a sustained drip instead of deferring without bound", async () => {
+    const relay = installRelayStub();
+    const { render, unmount } = mountHook({ role: "owner" });
+
+    await render();
+    await settle();
+
+    relay.emitSnapshot(snapshot([VIEWER], { createdAt: 80_000 }));
+    await settle();
+
+    const roster = [VIEWER];
+    // 1s apart — inside the 1.5s window, so every join re-arms it — for 8s,
+    // which is past the 5s ceiling.
+    for (let i = 0; i < 8; i++) {
+      roster.push(`${i.toString(16).repeat(63)}e`);
+      relay.emitSnapshot(
+        snapshot([...roster], {
+          id: `snap-drip-${i}`,
+          createdAt: 80_001 + i,
+        }),
+      );
+      await act(async () => {
+        await new Promise((r) => setTimeout(r, 1_000));
+      });
+    }
+
+    assert.ok(
+      notifications.length > 0,
+      `a sustained drip must not starve delivery; got ${notifications.length} alerts across 8s`,
+    );
+
+    await settleAfterNotifyWindow();
+    await unmount();
+  });
+  /**
+   * The members panel must not turn each roster snapshot into a REQ frame.
+   *
+   * `useRelayMembersQuery` is the settings card's own query, and its queryFn
+   * `listRelayMembers` is a REQ (`fetchFirstEvent({ kinds: [13534], limit: 1 })`).
+   * `invalidateQueries` refetches every ACTIVE observer, so while the panel was
+   * open the snapshot handler emitted one REQ per accepted snapshot — measured
+   * 1:1 at 20 snapshots, both here and live against a real relay — against a
+   * per-principal budget of 50 REQ per 5s. Unlike the kind:8000 accelerator this
+   * path is not behind `MEMBER_REFRESH_DEBOUNCE_MS`, so nothing coalesced it.
+   *
+   * Both arms are asserted, and the second is what makes this test honest:
+   * DELETING the cache write also produces zero REQ, so a REQ-only assertion is
+   * satisfied by a fix that silently freezes the panel. The observed roster is
+   * the discriminator (measured: 21 keys with the write, 0 without it).
+   *
+   * The closed arm is the negative control — without it, a hook that stopped
+   * subscribing entirely would pass the open arm.
+   */
+  it("keeps the members panel fresh across a burst without emitting a REQ per snapshot", async () => {
+    const SNAPSHOT_COUNT = 20;
+    const relay = installRelayStub();
+
+    const queryClient = new QueryClient({
+      defaultOptions: { queries: { retry: false } },
+    });
+    queryClient.setQueryData(["identity"], { pubkey: VIEWER });
+    queryClient.setQueryData(myRelayMembershipLookupQueryKey, {
+      snapshotFound: true,
+      membershipRequired: true,
+      membership: {
+        pubkey: VIEWER,
+        role: "owner",
+        addedBy: null,
+        createdAt: null,
+      },
+    });
+
+    // Mirrors CommunityMembersSettingsCard:251 — the real query hook, so this
+    // arm cannot pass by re-declaring the observer the regression runs through.
+    const observed = { roster: undefined };
+    function MembersPanelObserver() {
+      observed.roster = useRelayMembersQuery(true).data;
+      return null;
+    }
+
+    // The panel opens INSIDE the mounted tree, the way navigating to Settings
+    // does. Mounting a second tree instead would give the observer its own
+    // QueryClient and the invalidation could never reach it.
+    const openPanel = { current: null };
+    function Harness() {
+      useCommunityJoinAlerts({ enabled: true });
+      const [open, setOpen] = React.useState(false);
+      openPanel.current = setOpen;
+      return open ? React.createElement(MembersPanelObserver, null) : null;
+    }
+
+    const container = document.createElement("div");
+    const root = createRoot(container);
+    const render = async () => {
+      await act(async () => {
+        root.render(
+          React.createElement(
+            QueryClientProvider,
+            { client: queryClient },
+            React.createElement(
+              CommunitiesProvider,
+              null,
+              React.createElement(Harness, null),
+            ),
+          ),
+        );
+      });
+    };
+
+    /** Emit `SNAPSHOT_COUNT` growing rosters, returning REQ frames spent. */
+    const burst = async (startAt) => {
+      const before = relay.counts().fetchFirstEventCalls;
+      const roster = [VIEWER];
+      for (let i = 0; i < SNAPSHOT_COUNT; i++) {
+        roster.push(String(i).padStart(64, "e"));
+        const event = snapshot([...roster], {
+          id: `snap-req-${startAt}-${i}`,
+          createdAt: startAt + i,
+        });
+        relay.setRefetchSnapshot(event);
+        relay.emitSnapshot(event);
+        await settle(2);
+      }
+      await settleAfterNotifyWindow();
+      return relay.counts().fetchFirstEventCalls - before;
+    };
+
+    await render();
+    await settle();
+
+    // Arm 1 — panel closed (negative control).
+    const closedArmReqs = await burst(1_000);
+    assert.equal(
+      closedArmReqs,
+      0,
+      `panel closed must cost no REQ; spent ${closedArmReqs}`,
+    );
+
+    // Arm 2 — panel open: the regression arm.
+    await act(async () => {
+      openPanel.current(true);
+    });
+    await settle();
+    const openArmReqs = await burst(2_000);
+
+    assert.equal(
+      openArmReqs,
+      0,
+      `an open members panel must not cost a REQ per snapshot; spent ${openArmReqs} across ${SNAPSHOT_COUNT} snapshots`,
+    );
+
+    // The half a REQ count cannot see: deleting the write scores 0 REQ too.
+    assert.equal(
+      observed.roster?.length,
+      SNAPSHOT_COUNT + 1,
+      `the panel must observe the full roster (viewer + ${SNAPSHOT_COUNT}); got ${observed.roster?.length}`,
+    );
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+});
diff --git a/desktop/src/features/community-members/useCommunityJoinAlerts.ts b/desktop/src/features/community-members/useCommunityJoinAlerts.ts
new file mode 100644
index 00000000000..72c8a2e912f
--- /dev/null
+++ b/desktop/src/features/community-members/useCommunityJoinAlerts.ts
@@ -0,0 +1,538 @@
+import * as React from "react";
+import { useQueryClient } from "@tanstack/react-query";
+
+import {
+  myRelayMembershipLookupQueryKey,
+  relayMembersQueryKey,
+} from "@/features/community-members/hooks";
+import { useMyRelayMembershipLookupQuery } from "@/features/community-members/hooks";
+import { useCommunities } from "@/features/communities/useCommunities";
+import {
+  joinAlertBody,
+  joinAlertSummaryBody,
+  joinAlertTitle,
+  normalizeJoinPubkey,
+  readJoinAlertLedger,
+  reconcileJoinAlertLedger,
+  writeJoinAlertLedger,
+  type JoinAlertLedger,
+  JOIN_ALERT_MAX_INDIVIDUAL,
+} from "@/features/community-members/lib/joinAlerts";
+import { sendDesktopNotification } from "@/features/notifications/lib/desktop";
+import { resolveUserLabel } from "@/features/profile/lib/identity";
+import type { UserProfileLookup } from "@/features/profile/lib/identity";
+import { relayClient } from "@/shared/api/relayClient";
+import { useIdentityQuery } from "@/shared/api/hooks";
+import {
+  canManageCommunityMembers,
+  relayMembersFromEvent,
+} from "@/shared/api/relayMembers";
+import { getUsersBatch } from "@/shared/api/tauriProfiles";
+import type { RelayEvent, RelayMember } from "@/shared/api/types";
+
+const KIND_NIP43_MEMBERSHIP_LIST = 13534;
+const KIND_NIP43_MEMBER_ADDED = 8000;
+
+/**
+ * Trailing window for coalescing kind:8000-triggered snapshot refetches.
+ *
+ * Long enough that a bulk add collapses to a single REQ, short enough that a
+ * lone join still feels immediate — the accelerator exists only to beat the
+ * live snapshot's own arrival, so sub-second is the whole budget.
+ */
+const MEMBER_REFRESH_DEBOUNCE_MS = 500;
+
+/**
+ * Everything one mounted effect run is allowed to act on.
+ *
+ * The subscription callbacks that deliver snapshots belong to the effect run
+ * that registered them, but `handleSnapshot` is a `useEffectEvent` and so reads
+ * whatever is *currently* rendered. Between the re-render that switches
+ * community and that effect's cleanup, those two disagree — and a snapshot from
+ * the old community would be folded into the new community's ledger under the
+ * new community's storage key.
+ *
+ * Binding the identity, the ledger, and the ordering state into one object
+ * created by the effect run turns those scattered ambient reads into a single
+ * value with an identity that can be compared. `handleSnapshot` still reads
+ * `sessionRef.current`, so it is the surrounding ordering that makes the bug
+ * unreachable: cleanup retires the session before the next run installs its
+ * own, each retired callback is stopped by its run's `disposed` flag, and every
+ * send boundary re-checks that the session it captured is still the live one.
+ */
+type JoinAlertSession = {
+  communityId: string;
+  viewerPubkey: string;
+  ledger: JoinAlertLedger;
+  /**
+   * `created_at` of the newest snapshot already folded in.
+   *
+   * A snapshot older than this is a stale view of the roster — an in-flight
+   * refetch that resolves after a newer live frame — and must not be treated as
+   * current. Without this, an older frame can re-alert a departed key or, worse,
+   * re-assert an authorization a newer frame just revoked.
+   */
+  newestSnapshotAt: number;
+  /**
+   * Latched once a snapshot shows the viewer is no longer owner/admin.
+   *
+   * Fail-closed, and deliberately stronger than the `newestSnapshotAt` fence:
+   * the relay can publish two snapshots within the same second, so an
+   * equal-`created_at` stale frame passes a strictly-older fence. Dropping
+   * equal timestamps instead would discard legitimate same-second joins. The
+   * latch removes the timestamp from the safety argument entirely — once
+   * revocation is observed, this session is done disclosing, whatever order the
+   * remaining frames arrive in.
+   *
+   * Re-promotion is unaffected: nothing invalidates the membership lookup on
+   * promotion, so regaining the panel already requires a reload today.
+   */
+  revoked: boolean;
+};
+
+/**
+ * Trailing quiet window for coalescing join alerts ACROSS snapshots.
+ *
+ * The per-snapshot cap bounds "one snapshot, many keys". It does nothing for
+ * "one burst, many snapshots": the relay republishes the whole 13534 as each
+ * concurrent add commits, so a 50-join storm arrives as a handful of growing
+ * rosters and each one independently emitted its own capped batch. Max measured
+ * 10 banners from 50 real joins at `fdeda44f0` for exactly this reason.
+ *
+ * Sized above the observed intermediate-snapshot cadence so a burst lands in
+ * one batch, and above MEMBER_REFRESH_DEBOUNCE_MS so an 8000-triggered refetch
+ * folds into the same window rather than flushing behind it.
+ */
+const JOIN_ALERT_NOTIFY_WINDOW_MS = 1_500;
+
+/**
+ * Ceiling on how long a batch may be deferred by the trailing window.
+ *
+ * `JOIN_ALERT_NOTIFY_WINDOW_MS` is a pure trailing debounce: every snapshot
+ * re-arms it, so a join cadence faster than the window defers delivery for as
+ * long as the joins keep coming. Measured before this clamp existed: 13 joins at
+ * ~700ms intervals produced zero notifications across 9.1 continuous seconds.
+ *
+ * That is the wrong shape for an alerting feature, and it is worse than mere
+ * lateness — the ledger is persisted per snapshot while delivery waits, so a
+ * quit or community switch mid-drip drops a batch the ledger already recorded as
+ * alerted, and it is never re-announced. Clamping bounds both the silence and
+ * that loss window.
+ *
+ * Sized against both ends rather than picked round: it must exceed the span a
+ * bulk add's intermediate snapshots occupy, or the clamp would split the burst
+ * this window exists to collapse, and it must sit BELOW the measured drip above,
+ * or it would leave the case that motivated it unchanged. A burst's snapshots
+ * arrive within a second or two of each other; the drip ran 9.1s. Five seconds
+ * clears the first by a wide margin and cuts the second roughly in half.
+ */
+const JOIN_ALERT_MAX_DEFERRAL_MS = 5_000;
+
+/**
+ * Notify community owners/admins the first time a key appears in their roster.
+ *
+ * Delivery rests on a live kind:13534 subscription because that snapshot is the
+ * only membership signal covering every join path with cross-pod propagation;
+ * see `lib/joinAlerts.ts` for the full rationale. Desktop's other 13534 read
+ * (`relayMembers.ts`) is a one-shot fetch, so without this subscription no
+ * snapshot ever arrives passively and nothing could fire.
+ *
+ * The kind:8000 delta is subscribed purely to shorten latency on the paths that
+ * emit one. It refreshes the authoritative snapshot rather than alerting from
+ * the delta's own payload, so one ledger governs both signals and the pair
+ * cannot double-alert.
+ *
+ * Viewer, community, and role are read from context rather than passed in:
+ * `AppShell` is at the file-size ratchet ceiling, so the mount has to stay a
+ * single call.
+ */
+export function useCommunityJoinAlerts({ enabled }: { enabled: boolean }) {
+  const queryClient = useQueryClient();
+  const { activeCommunity } = useCommunities();
+  const identityQuery = useIdentityQuery();
+  const membershipQuery = useMyRelayMembershipLookupQuery();
+
+  const communityId = activeCommunity?.id ?? null;
+  const communityName = activeCommunity?.name ?? null;
+  const normalizedViewer = normalizeJoinPubkey(
+    identityQuery.data?.pubkey ?? "",
+  );
+  const active =
+    enabled &&
+    canManageCommunityMembers(membershipQuery.data) &&
+    communityId !== null &&
+    normalizedViewer.length > 0;
+
+  // Session for the current effect run. Callbacks read it through this ref so
+  // they stay stable — re-subscribing on every roster change would drop deltas
+  // in the gap between REQ and CLOSE — but every read is validated against the
+  // session's own bound community, never against ambient render state.
+  const sessionRef = React.useRef<JoinAlertSession | null>(null);
+
+  // Community name is read fresh rather than captured, because a rename does not
+  // re-key the effect and a captured name would go stale. Guarded by id at use
+  // time so it can only ever label its own community.
+  const communityNameRef = React.useRef<{ id: string; name: string } | null>(
+    null,
+  );
+  communityNameRef.current =
+    communityId === null
+      ? null
+      : { id: communityId, name: communityName ?? "" };
+
+  const resolveTitle = React.useCallback((session: JoinAlertSession) => {
+    const named = communityNameRef.current;
+    // Fall back to the generic title rather than a name belonging to a
+    // different community.
+    return joinAlertTitle(
+      named?.id === session.communityId ? named.name : null,
+    );
+  }, []);
+
+  // Pending cross-snapshot batch. A burst arrives as several growing rosters,
+  // so alerts accumulate here and flush once the roster stops moving.
+  //
+  // `pendingEventRef` holds the LATEST snapshot only, as the notification's
+  // click target. Every key in the batch is present in that roster (the ledger
+  // is monotonic within a burst), so the newest snapshot is the accurate
+  // referent for the whole batch.
+  const pendingRef = React.useRef<string[]>([]);
+  const pendingEventRef = React.useRef<RelayEvent | null>(null);
+  const notifyTimerRef = React.useRef<number | null>(null);
+  // When the batch currently pending first enqueued, for the deferral clamp.
+  const pendingSinceRef = React.useRef<number | null>(null);
+
+  // Cancellation token for flushes already past the refs.
+  //
+  // Clearing the refs cannot stop a flush that has already consumed them and
+  // is parked on an await, and every send in `flushPending` sits behind one:
+  // the profile lookup, and each notification itself. A demotion, removal,
+  // unmount, or community switch landing in that window would otherwise still
+  // deliver — Max and Wren both found this at 5d0d2b4c.
+  //
+  // Bumped ONLY by `clearPending`, never by an ordinary enqueue, so an
+  // authorized batch queued while an earlier flush's lookup is in flight
+  // neither cancels it nor is cancelled by it: both deliver. Cancellation is
+  // the only thing that invalidates a claim.
+  const flushGenerationRef = React.useRef(0);
+
+  /** Drop anything queued but not yet delivered, in flight or not. */
+  const clearPending = React.useCallback(() => {
+    pendingRef.current = [];
+    pendingEventRef.current = null;
+    pendingSinceRef.current = null;
+    flushGenerationRef.current += 1;
+    if (notifyTimerRef.current !== null) {
+      window.clearTimeout(notifyTimerRef.current);
+      notifyTimerRef.current = null;
+    }
+  }, []);
+
+  const flushPending = React.useEffectEvent(async () => {
+    const session = sessionRef.current;
+    const alerts = pendingRef.current;
+    const event = pendingEventRef.current;
+    pendingRef.current = [];
+    pendingEventRef.current = null;
+    pendingSinceRef.current = null;
+    if (alerts.length === 0 || !event || !session) return;
+    // A session that observed revocation never delivers, even if a batch was
+    // queued before the latch closed.
+    if (session.revoked) return;
+
+    // Claim this batch. Checked again at every side-effect boundary below —
+    // not merely after the awaits that exist today, so that adding an await
+    // later cannot silently reopen the disclosure.
+    const generation = flushGenerationRef.current;
+    const cancelled = () =>
+      flushGenerationRef.current !== generation ||
+      sessionRef.current !== session ||
+      session.revoked;
+
+    // Bind the title to the community these keys were queued under, not to
+    // whatever is active when the send resolves.
+    const title = resolveTitle(session);
+
+    // Resolve display names so the alert reads "Alice joined" rather than a
+    // truncated key; a lookup failure degrades to the key, it does not skip.
+    //
+    // Above the cap the batch collapses into one summary, so skip the profile
+    // fetch entirely — it would be a 250-key request whose result is unused.
+    if (alerts.length > JOIN_ALERT_MAX_INDIVIDUAL) {
+      if (cancelled()) return;
+      await sendDesktopNotification({
+        body: joinAlertSummaryBody(alerts.length),
+        target: {
+          channelId: null,
+          eventId: event.id,
+          kind: event.kind,
+          pubkey: undefined,
+        },
+        title,
+      });
+      return;
+    }
+
+    let profiles: UserProfileLookup | undefined;
+    try {
+      profiles = (await getUsersBatch(alerts)).profiles;
+    } catch {
+      profiles = undefined;
+    }
+
+    for (const pubkey of alerts) {
+      // Per-send, not once after the lookup: a demotion landing between two
+      // named sends must suppress the rest of the batch, not just the batch
+      // that had not started.
+      if (cancelled()) return;
+      await sendDesktopNotification({
+        body: joinAlertBody(
+          resolveUserLabel({ preferResolvedSelfLabel: true, profiles, pubkey }),
+        ),
+        target: {
+          channelId: null,
+          eventId: event.id,
+          kind: event.kind,
+          pubkey,
+        },
+        title,
+      });
+    }
+  });
+
+  const handleSnapshot = React.useEffectEvent(async (event: RelayEvent) => {
+    const session = sessionRef.current;
+    if (!session) return;
+    // Already revoked: this session neither alerts nor learns anything further.
+    if (session.revoked) return;
+
+    const roster = relayMembersFromEvent(event);
+    const rosterPubkeys = roster.map((member) => member.pubkey);
+    if (rosterPubkeys.length === 0) return;
+
+    // Drop a stale view of the roster before it can be treated as current.
+    //
+    // An in-flight refetch (kind:8000 accelerator or reconnect) can resolve
+    // AFTER a newer live frame. Processing it would fold a superseded roster in
+    // as authoritative — re-alerting a departed key, and re-asserting an
+    // authorization the newer frame revoked. Strictly older only: two snapshots
+    // can share a second, and dropping equal timestamps would discard real
+    // joins. The revocation latch, not this fence, is what makes the privacy
+    // arm safe at equal timestamps.
+    const snapshotAt = event.created_at;
+    if (snapshotAt < session.newestSnapshotAt) return;
+
+    // The roster can change shape without anything being new to us (a removal
+    // or a role change), so refresh the panel regardless of alert eligibility.
+    //
+    // Written directly rather than invalidated. `invalidateQueries` refetches
+    // every ACTIVE observer, and `listRelayMembers` is a REQ frame
+    // (`fetchFirstEvent({ kinds: [13534], limit: 1 })`), so with the members
+    // panel open this path emitted one REQ per accepted snapshot — measured
+    // 1:1 across 20 snapshots, live and in unit, against a documented budget
+    // of limit x window = 50 REQ per 5s (`default_human_ws()` = 10/s,
+    // `WS_BURST_WINDOW_SECS` = 5; REQ is billed as `WsEvents`). A join burst
+    // large enough to matter would rate-limit the owner out of their own app,
+    // and unlike the kind:8000 accelerator this path is not behind
+    // `MEMBER_REFRESH_DEBOUNCE_MS`.
+    //
+    // The refetch was never load-bearing: `roster` above is the output of the
+    // same `relayMembersFromEvent` parser `listRelayMembers` feeds the query
+    // with (`relayMembers.ts:125-127`), from a snapshot this session has
+    // already accepted as current — so the write is the identical shape and
+    // strictly fresher than a refetch, which would race the stream that
+    // triggered it. The stale fence above guarantees no superseded roster
+    // reaches here, and the query client is per-community
+    // (`CommunityQueryProvider key={communityKey}`, `App.tsx:556`), so this
+    // non-community-scoped key cannot be written across a switch.
+    queryClient.setQueryData<RelayMember[]>(relayMembersQueryKey, roster);
+
+    // Authorize against the snapshot in hand, not the cached role that mounted
+    // this effect. `useMyRelayMembershipLookupQuery` is only invalidated by this
+    // client's own membership mutations, and `staleTime` marks data stale
+    // without scheduling a refetch, so a viewer demoted by another admin keeps
+    // a cached owner/admin role for as long as the app stays open — and would
+    // otherwise keep learning every later joiner's identity from a role they no
+    // longer hold. The snapshot carries the viewer's own role
+    // (`["member", pubkey, role]`, relay-signed in `publish_nip43_membership_locked`),
+    // so the event that revokes authorization is the same event that would
+    // disclose the join. Checking it here closes that race in one read rather
+    // than racing an async invalidation.
+    //
+    // Fail closed: a snapshot that does not list the viewer at all means they
+    // were removed outright.
+    const viewerEntry = roster.find(
+      (member) => member.pubkey === session.viewerPubkey,
+    );
+    if (viewerEntry?.role !== "owner" && viewerEntry?.role !== "admin") {
+      // Latch, so no later frame — including an older authorized snapshot still
+      // in flight — can re-open disclosure for this session.
+      session.revoked = true;
+      // Revocation must also drop anything queued but not yet delivered.
+      // Batching across snapshots would otherwise reopen the disclosure Wren
+      // found as a *delayed* one: joins accumulated while authorized would
+      // still fire from a timer after the snapshot that revoked the role.
+      clearPending();
+      // Refresh the mount gate so the subscriptions themselves tear down.
+      void queryClient.invalidateQueries({
+        queryKey: myRelayMembershipLookupQueryKey,
+      });
+      return;
+    }
+
+    // Fence advances only here: past the roster and authorization checks, on a
+    // frame this session actually accepts as its current view. Advancing it at
+    // the comparison instead would let a frame rejected for some *other* reason
+    // push the fence past a legitimate frame still in flight, dropping a real
+    // snapshot as though it were stale.
+    session.newestSnapshotAt = snapshotAt;
+
+    const { alerts, changed, ledger } = reconcileJoinAlertLedger({
+      ledger: session.ledger,
+      rosterPubkeys,
+      viewerPubkey: session.viewerPubkey,
+    });
+    if (!changed) return;
+
+    // Persisted before notifying, never after: a crash between the two must
+    // lose the notification rather than repeat it on every later snapshot.
+    //
+    // A write that cannot land (quota still exceeded after cache eviction)
+    // leaves the session's ledger alone deliberately. Advancing it would mark
+    // these keys seen in memory while nothing reached storage, so the alert
+    // would be lost until a reload; leaving it means the next snapshot retries
+    // the write and the alert survives to whichever attempt lands. The notify is
+    // skipped either way — a false return means nothing was persisted, so
+    // notifying here is exactly the "repeat on every later snapshot" this
+    // ordering exists to prevent.
+    if (
+      !writeJoinAlertLedger(session.communityId, session.viewerPubkey, ledger)
+    ) {
+      return;
+    }
+    session.ledger = ledger;
+    if (alerts.length === 0) return;
+
+    // Queue rather than notify. Persistence and the ledger advance stay
+    // synchronous per snapshot (above), so cross-snapshot dedupe still holds
+    // and a crash before the flush loses the alert rather than repeating it —
+    // the ordering invariant this feature already committed to. Only the
+    // delivery is deferred, onto a trailing quiet window, so one burst
+    // produces one alert instead of one per intermediate snapshot.
+    pendingRef.current.push(...alerts);
+    pendingEventRef.current = event;
+    if (notifyTimerRef.current !== null) {
+      window.clearTimeout(notifyTimerRef.current);
+    }
+    const now = Date.now();
+    if (pendingSinceRef.current === null) pendingSinceRef.current = now;
+    // Clamp the trailing window so a sustained drip cannot defer delivery (and
+    // the ledger-already-written loss window) without bound.
+    const deadline = pendingSinceRef.current + JOIN_ALERT_MAX_DEFERRAL_MS;
+    const delay = Math.max(
+      0,
+      Math.min(JOIN_ALERT_NOTIFY_WINDOW_MS, deadline - now),
+    );
+    notifyTimerRef.current = window.setTimeout(() => {
+      notifyTimerRef.current = null;
+      void flushPending();
+    }, delay);
+  });
+
+  React.useEffect(() => {
+    if (!active || communityId === null) return;
+
+    // One session per effect run. Every callback below reaches this community's
+    // ledger and this viewer's role through it and cannot reach any other, so a
+    // switch mid-flight is a cancelled session rather than a mislabeled alert.
+    const session: JoinAlertSession = {
+      communityId,
+      ledger: readJoinAlertLedger(communityId, normalizedViewer),
+      newestSnapshotAt: 0,
+      revoked: false,
+      viewerPubkey: normalizedViewer,
+    };
+    sessionRef.current = session;
+
+    let disposed = false;
+    const disposers: Array<() => Promise<void>> = [];
+    let refreshTimeout: number | null = null;
+
+    const track = (unsubscribe: () => Promise<void>) => {
+      if (disposed) {
+        void unsubscribe();
+        return;
+      }
+      disposers.push(unsubscribe);
+    };
+
+    const fetchSnapshot = () => {
+      void relayClient
+        .fetchFirstEvent({ kinds: [KIND_NIP43_MEMBERSHIP_LIST], limit: 1 })
+        .then((snapshot) => {
+          if (!disposed && snapshot) void handleSnapshot(snapshot);
+        })
+        .catch(() => {
+          // Best effort: the live 13534 subscription still delivers.
+        });
+    };
+
+    /**
+     * Coalesce refetches on a trailing window.
+     *
+     * Each refetch is a REQ frame, and REQ is billed against the same per-
+     * principal `WsEvents` budget as the user's own sends (default 10/s over a
+     * 5s window). A bulk add emits one kind:8000 per member, so an uncoalesced
+     * 1:1 refetch would spend the budget the owner needs for messages and
+     * channel opens — rate-limiting them out of their own app. One snapshot is
+     * authoritative for the whole burst, so the trailing edge loses nothing.
+     */
+    const refreshSnapshot = () => {
+      if (disposed || refreshTimeout !== null) return;
+      refreshTimeout = window.setTimeout(() => {
+        refreshTimeout = null;
+        if (!disposed) fetchSnapshot();
+      }, MEMBER_REFRESH_DEBOUNCE_MS);
+    };
+
+    void relayClient
+      .subscribeLive({ kinds: [KIND_NIP43_MEMBERSHIP_LIST], limit: 1 }, (e) => {
+        if (!disposed) void handleSnapshot(e);
+      })
+      .then(track)
+      .catch((error) => {
+        console.error("Couldn’t subscribe to community membership", error);
+      });
+
+    // Accelerator only: refetch the authoritative snapshot instead of trusting
+    // the delta, so the ledger only ever sees one consistent roster view.
+    void relayClient
+      .subscribeLive({ kinds: [KIND_NIP43_MEMBER_ADDED], limit: 0 }, () => {
+        if (!disposed) refreshSnapshot();
+      })
+      .then(track)
+      .catch((error) => {
+        console.error("Couldn’t subscribe to community joins", error);
+      });
+
+    // A reconnect can span joins that landed while the socket was down, and
+    // `limit: 1` backfill is not guaranteed to redeliver them.
+    const unsubscribeReconnect =
+      relayClient.subscribeToReconnects(refreshSnapshot);
+
+    return () => {
+      disposed = true;
+      if (refreshTimeout !== null) window.clearTimeout(refreshTimeout);
+      // Retire the session before dropping the batch, so any flush already past
+      // the refs sees `sessionRef.current !== session` and stops. Guarded in
+      // case a later run has already installed its own.
+      if (sessionRef.current === session) sessionRef.current = null;
+      // Drop the queued batch too, not just its timer: on a community switch
+      // this effect re-keys, and keys accumulated for the old community must
+      // not flush against the new one.
+      clearPending();
+      unsubscribeReconnect();
+      for (const dispose of disposers) void dispose();
+    };
+  }, [active, communityId, normalizedViewer, clearPending]);
+}
diff --git a/desktop/src/features/forum/ui/ForumPostCard.tsx b/desktop/src/features/forum/ui/ForumPostCard.tsx
index 1fb3c35cc4f..8cbbdff2b4e 100644
--- a/desktop/src/features/forum/ui/ForumPostCard.tsx
+++ b/desktop/src/features/forum/ui/ForumPostCard.tsx
@@ -11,6 +11,7 @@ import type { ForumPost } from "@/shared/api/types";
 import { cn } from "@/shared/lib/cn";
 import { resolveMentionProps } from "@/shared/lib/resolveMentionNames";
 import { Markdown } from "@/shared/ui/markdown";
+import { hasLinkPreviewSuppression } from "@/features/messages/lib/formatTimelineMessages";
 import { parseImetaTags } from "@/shared/ui/markdown/parseImeta";
 
 import { formatRelativeTime } from "../lib/time";
@@ -121,6 +122,9 @@ export function ForumPostCard({
         <Markdown
           className="text-sm"
           content={previewContent}
+          messageId={post.eventId}
+          linkPreviewsSuppressed={hasLinkPreviewSuppression(post.tags)}
+          linkPreviewTags={post.tags}
           imetaByUrl={imetaByUrl}
           mentionNames={mentionNames}
           mentionPubkeysByName={mentionPubkeysByName}
diff --git a/desktop/src/features/forum/ui/ForumThreadPanel.tsx b/desktop/src/features/forum/ui/ForumThreadPanel.tsx
index 0e884dd247c..7bf40fbffe3 100644
--- a/desktop/src/features/forum/ui/ForumThreadPanel.tsx
+++ b/desktop/src/features/forum/ui/ForumThreadPanel.tsx
@@ -15,6 +15,7 @@ import { resolveMentionProps } from "@/shared/lib/resolveMentionNames";
 import { Button } from "@/shared/ui/button";
 import { parseImetaTags } from "@/shared/ui/markdown/parseImeta";
 import { Markdown } from "@/shared/ui/markdown";
+import { hasLinkPreviewSuppression } from "@/features/messages/lib/formatTimelineMessages";
 import { Skeleton } from "@/shared/ui/skeleton";
 
 import { formatRelativeTime } from "../lib/time";
@@ -115,6 +116,9 @@ function ReplyRow({
           channelNames={channelNames}
           className="text-sm"
           content={reply.content}
+          messageId={reply.eventId}
+          linkPreviewsSuppressed={hasLinkPreviewSuppression(reply.tags)}
+          linkPreviewTags={reply.tags}
           imetaByUrl={parseImetaTags(reply.tags)}
           mentionNames={replyMentionNames}
           mentionPubkeysByName={replyMentionPubkeysByName}
@@ -258,6 +262,9 @@ export function ForumThreadPanel({
               channelNames={channelNames}
               className="text-sm"
               content={post.content}
+              messageId={post.eventId}
+              linkPreviewsSuppressed={hasLinkPreviewSuppression(post.tags)}
+              linkPreviewTags={post.tags}
               imetaByUrl={parseImetaTags(post.tags)}
               mentionNames={postMentionNames}
               mentionPubkeysByName={postMentionPubkeysByName}
diff --git a/desktop/src/features/home/ui/FeedSection.tsx b/desktop/src/features/home/ui/FeedSection.tsx
index 22fc177190d..7e090b98a8f 100644
--- a/desktop/src/features/home/ui/FeedSection.tsx
+++ b/desktop/src/features/home/ui/FeedSection.tsx
@@ -20,6 +20,7 @@ import {
 import { resolveMentionProps } from "@/shared/lib/resolveMentionNames";
 import { Button } from "@/shared/ui/button";
 import { Markdown } from "@/shared/ui/markdown";
+import { hasLinkPreviewSuppression } from "@/features/messages/lib/formatTimelineMessages";
 import { UserAvatar } from "@/shared/ui/UserAvatar";
 
 const relativeTimeFormatter = new Intl.RelativeTimeFormat("en-US", {
@@ -228,6 +229,10 @@ export function FeedSection({
                   <Markdown
                     className="max-w-none text-sm leading-snug text-muted-foreground"
                     content={feedContent(item)}
+                    messageId={item.id}
+                    linkPreviewsSuppressed={hasLinkPreviewSuppression(
+                      item.tags,
+                    )}
                     mentionNames={mentionNames}
                     mentionPubkeysByName={mentionPubkeysByName}
                   />
diff --git a/desktop/src/features/home/ui/InboxMessageRow.tsx b/desktop/src/features/home/ui/InboxMessageRow.tsx
index d57db1a5d5b..039d418a148 100644
--- a/desktop/src/features/home/ui/InboxMessageRow.tsx
+++ b/desktop/src/features/home/ui/InboxMessageRow.tsx
@@ -16,6 +16,7 @@ import { UserProfilePopover } from "@/features/profile/ui/UserProfilePopover";
 import { cn } from "@/shared/lib/cn";
 import { normalizePubkey } from "@/shared/lib/pubkey";
 import { Markdown } from "@/shared/ui/markdown";
+import { hasLinkPreviewSuppression } from "@/features/messages/lib/formatTimelineMessages";
 import { UserAvatar } from "@/shared/ui/UserAvatar";
 
 export type InboxDisplayMessage = InboxContextMessage & {
@@ -215,6 +216,10 @@ export function InboxMessageRow({
                 isKnownAgentPubkey,
               )}
               content={message.content}
+              messageId={message.id}
+              linkPreviewsSuppressed={hasLinkPreviewSuppression(
+                timelineMessage.tags,
+              )}
               customEmoji={customEmoji}
               mentionNames={message.mentionNames}
               mentionPubkeysByName={message.mentionPubkeysByName}
diff --git a/desktop/src/features/messages/hooks.ts b/desktop/src/features/messages/hooks.ts
index 062b0ee40b4..545500bfe41 100644
--- a/desktop/src/features/messages/hooks.ts
+++ b/desktop/src/features/messages/hooks.ts
@@ -458,6 +458,7 @@ export function useSendMessageMutation(
         mediaTags: imetaTags,
         emojiTags,
         mentionTags,
+        linkPreviewTags,
       } = splitOutgoingTags(mediaTags);
       const recipientPubkeys = messageMentionPubkeys(
         effectiveChannel,
@@ -468,7 +469,12 @@ export function useSendMessageMutation(
       // Messages carrying media OR custom-emoji tags MUST go through REST so
       // the relay's tag validation runs. The WebSocket path emits no extra
       // tags, so emoji-only messages would otherwise lose their emoji tag.
-      if (parentEventId || imetaTags.length > 0 || emojiTags.length > 0) {
+      if (
+        parentEventId ||
+        imetaTags.length > 0 ||
+        emojiTags.length > 0 ||
+        linkPreviewTags.length > 0
+      ) {
         const cachedMessages =
           queryClient.getQueryData<RelayEvent[]>(
             channelMessagesKey(effectiveChannel.id),
@@ -482,6 +488,7 @@ export function useSendMessageMutation(
           undefined,
           emojiTags,
           mentionTags,
+          linkPreviewTags,
         );
 
         // Build tags matching relay-emitted shape: h, author p, mention ps, reply es, imeta, emoji.
@@ -519,6 +526,7 @@ export function useSendMessageMutation(
             ...imetaTags,
             ...emojiTags,
             ...mentionTags,
+            ...linkPreviewTags,
           ],
           content: content.trim(),
           sig: "",
diff --git a/desktop/src/features/messages/lib/formatTimelineMessages.test.mjs b/desktop/src/features/messages/lib/formatTimelineMessages.test.mjs
index 926738a60bf..ee4cc628f26 100644
--- a/desktop/src/features/messages/lib/formatTimelineMessages.test.mjs
+++ b/desktop/src/features/messages/lib/formatTimelineMessages.test.mjs
@@ -674,3 +674,102 @@ test("CHANNEL_TIMELINE_CONTENT_KINDS matches isTimelineContentEvent", () => {
     );
   }
 });
+
+test("original message link-preview none marker suppresses all generated previews", () => {
+  const [message] = formatTimelineMessages(
+    [
+      streamMessage({
+        content: "https://one.example https://two.example",
+        tags: [
+          ["h", CHANNEL_ID],
+          ["link-preview", "none"],
+        ],
+      }),
+    ],
+    null,
+    undefined,
+    null,
+  );
+  assert.deepEqual(
+    message.tags.find((tag) => tag[0] === "link-preview"),
+    ["link-preview", "none"],
+  );
+});
+
+test("authorized suppression edit remains monotonic across later body edits", () => {
+  const suppress = streamEdit(
+    HEX64_A,
+    "https://one.example https://two.example",
+    {
+      created_at: 1_700_000_001,
+      tags: [
+        ["h", CHANNEL_ID],
+        ["e", HEX64_A],
+        ["link-preview", "none"],
+      ],
+    },
+  );
+  const later = streamEdit(HEX64_A, "later body", {
+    id: "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+    created_at: 1_700_000_002,
+  });
+  const [message] = formatTimelineMessages(
+    [streamMessage(), suppress, later],
+    null,
+    undefined,
+    null,
+  );
+  assert.equal(message.body, "later body");
+  assert.equal(
+    message.tags.some((tag) => tag[0] === "link-preview" && tag[1] === "none"),
+    true,
+  );
+});
+
+test("spoofed suppression edit cannot hide another author's previews", () => {
+  const spoof = streamEdit(HEX64_A, "spoofed", {
+    pubkey: PUBKEY_B,
+    tags: [
+      ["h", CHANNEL_ID],
+      ["e", HEX64_A],
+      ["link-preview", "none"],
+    ],
+  });
+  const [message] = formatTimelineMessages(
+    [streamMessage(), spoof],
+    null,
+    undefined,
+    null,
+  );
+  assert.equal(message.body, "hello world");
+  assert.equal(
+    message.tags.some((tag) => tag[0] === "link-preview"),
+    false,
+  );
+});
+
+test("verified agent owner may publish a suppression edit", () => {
+  const ownerEdit = streamEdit(HEX64_A, "owner edit", {
+    pubkey: PUBKEY_B,
+    tags: [
+      ["h", CHANNEL_ID],
+      ["e", HEX64_A],
+      ["link-preview", "none"],
+    ],
+  });
+  const profiles = {
+    [PUBKEY_A]: { ownerPubkey: PUBKEY_B },
+  };
+  const [message] = formatTimelineMessages(
+    [streamMessage(), ownerEdit],
+    null,
+    undefined,
+    null,
+    profiles,
+  );
+  assert.equal(message.body, "owner edit");
+  assert.equal(
+    message.tags.some((tag) => tag[0] === "link-preview"),
+    true,
+  );
+});
diff --git a/desktop/src/features/messages/lib/formatTimelineMessages.ts b/desktop/src/features/messages/lib/formatTimelineMessages.ts
index 640c12bb758..ab35ecfcc41 100644
--- a/desktop/src/features/messages/lib/formatTimelineMessages.ts
+++ b/desktop/src/features/messages/lib/formatTimelineMessages.ts
@@ -181,6 +181,36 @@ function getAuthorAvatarUrl(input: {
   return profiles?.[authorPubkey.toLowerCase()]?.avatarUrl ?? null;
 }
 
+export function hasLinkPreviewSuppression(
+  tags: string[][] | undefined,
+): boolean {
+  return (
+    tags?.some(
+      (tag) =>
+        tag[0] === "link-preview" && tag[1] === "none" && tag.length === 2,
+    ) ?? false
+  );
+}
+
+function isAuthorizedMessageEdit(
+  edit: RelayEvent,
+  target: RelayEvent,
+  profiles: UserProfileLookup | undefined,
+  relaySelfPubkey?: string | null,
+): boolean {
+  const author = normalizePubkey(
+    resolveEventAuthorPubkey({
+      event: target,
+      preferActorTag: true,
+      relaySelfPubkey,
+      requireChannelTagForPTags: true,
+    }),
+  );
+  const signer = normalizePubkey(edit.pubkey);
+  if (signer === author) return true;
+  return normalizePubkey(profiles?.[author]?.ownerPubkey ?? "") === signer;
+}
+
 export function formatTimelineMessages(
   events: RelayEvent[],
   channel: Channel | null,
@@ -219,8 +249,14 @@ export function formatTimelineMessages(
     }
   }
 
-  // Build a map of latest edit per original message: targetId → { content, tags, createdAt }.
-  // When multiple edits exist for the same message, the most recent one wins.
+  const timelineEventsById = new Map(
+    events.filter(isTimelineContentEvent).map((event) => [event.id, event]),
+  );
+  const previewSuppressedTargetIds = new Set<string>();
+
+  // Build a map of latest authorized edit per original message. Preview
+  // suppression is monotonic: any authorized edit carrying the marker wins
+  // forever, independent of which edit supplies the latest body.
   // The edit's own tags are kept so the renderer can overlay imeta tags
   // (attachments) from the edit onto the original event — non-imeta tags on
   // the original (`h`, `p` mentions, etc.) stay untouched.
@@ -240,6 +276,16 @@ export function formatTimelineMessages(
     if (!targetId || deletedEventIds.has(targetId)) {
       continue;
     }
+    const target = timelineEventsById.get(targetId);
+    if (
+      !target ||
+      !isAuthorizedMessageEdit(event, target, profiles, relaySelfPubkey)
+    ) {
+      continue;
+    }
+    if (hasLinkPreviewSuppression(event.tags)) {
+      previewSuppressedTargetIds.add(targetId);
+    }
 
     const existing = editsByTargetId.get(targetId);
     if (!existing || event.created_at > existing.createdAt) {
@@ -469,7 +515,18 @@ export function formatTimelineMessages(
       // imeta tags. All non-imeta tags on the original are preserved.
       // Logic lives in `applyEditTagOverlay.mjs` so prod and tests share
       // a single source.
-      tags: applyEditTagOverlay(event.tags, edit?.tags),
+      tags: (() => {
+        const effectiveTags = applyEditTagOverlay(event.tags, edit?.tags);
+        if (
+          hasLinkPreviewSuppression(event.tags) ||
+          previewSuppressedTargetIds.has(event.id)
+        ) {
+          return hasLinkPreviewSuppression(effectiveTags)
+            ? effectiveTags
+            : [...effectiveTags, ["link-preview", "none"]];
+        }
+        return effectiveTags;
+      })(),
       reactions: (() => {
         const reactions = reactionsByEventId.get(event.id);
         if (!reactions) return undefined;
diff --git a/desktop/src/features/messages/lib/imetaMediaMarkdown.test.mjs b/desktop/src/features/messages/lib/imetaMediaMarkdown.test.mjs
index a2edaa6f8cf..79c193fb19b 100644
--- a/desktop/src/features/messages/lib/imetaMediaMarkdown.test.mjs
+++ b/desktop/src/features/messages/lib/imetaMediaMarkdown.test.mjs
@@ -662,6 +662,7 @@ test("round-trip: sparse imeta from legacy tags rebuilds without empty x/size",
 const IMETA = ["imeta", "url https://blossom/abc.png", "m image/png"];
 const EMOJI_A = ["emoji", "shipit", "https://relay/s.png"];
 const EMOJI_B = ["emoji", "party", "https://relay/p.gif"];
+const LINK_PREVIEW = ["link-preview", "snapshot", "1", "https://example.com/"];
 const MENTION_REF = [
   "mention",
   "1111111111111111111111111111111111111111111111111111111111111111",
@@ -672,55 +673,64 @@ test("splitOutgoingTags: undefined input yields three empty arrays", () => {
     mediaTags: [],
     emojiTags: [],
     mentionTags: [],
+    linkPreviewTags: [],
   });
 });
 
 test("splitOutgoingTags: separates emoji tags from imeta tags", () => {
-  const { mediaTags, emojiTags, mentionTags } = splitOutgoingTags([
-    IMETA,
-    EMOJI_A,
-    EMOJI_B,
-  ]);
+  const { mediaTags, emojiTags, mentionTags, linkPreviewTags } =
+    splitOutgoingTags([IMETA, EMOJI_A, EMOJI_B]);
   assert.deepEqual(mediaTags, [IMETA]);
   assert.deepEqual(emojiTags, [EMOJI_A, EMOJI_B]);
   assert.deepEqual(mentionTags, []);
+  assert.deepEqual(linkPreviewTags, []);
 });
 
 test("splitOutgoingTags: emoji-only set leaves mediaTags empty", () => {
-  const { mediaTags, emojiTags, mentionTags } = splitOutgoingTags([EMOJI_A]);
+  const { mediaTags, emojiTags, mentionTags, linkPreviewTags } =
+    splitOutgoingTags([EMOJI_A]);
   assert.deepEqual(mediaTags, []);
   assert.deepEqual(emojiTags, [EMOJI_A]);
   assert.deepEqual(mentionTags, []);
+  assert.deepEqual(linkPreviewTags, []);
 });
 
 test("splitOutgoingTags: separates reference-only mention tags", () => {
-  const { mediaTags, emojiTags, mentionTags } = splitOutgoingTags([
-    IMETA,
-    MENTION_REF,
-    EMOJI_A,
-  ]);
+  const { mediaTags, emojiTags, mentionTags, linkPreviewTags } =
+    splitOutgoingTags([IMETA, MENTION_REF, EMOJI_A]);
   assert.deepEqual(mediaTags, [IMETA]);
   assert.deepEqual(emojiTags, [EMOJI_A]);
   assert.deepEqual(mentionTags, [MENTION_REF]);
+  assert.deepEqual(linkPreviewTags, []);
+});
+
+test("splitOutgoingTags: separates authored link-preview snapshots", () => {
+  const { mediaTags, emojiTags, mentionTags, linkPreviewTags } =
+    splitOutgoingTags([IMETA, LINK_PREVIEW]);
+  assert.deepEqual(mediaTags, [IMETA]);
+  assert.deepEqual(emojiTags, []);
+  assert.deepEqual(mentionTags, []);
+  assert.deepEqual(linkPreviewTags, [LINK_PREVIEW]);
 });
 
 test("splitOutgoingTags: unknown prefixes stay with mediaTags (injection defense)", () => {
   // A forged ["p", ...] must NOT be misrouted to the emoji channel; it stays on
   // mediaTags where the server-side imeta guard rejects it.
   const forged = ["p", "deadbeef"];
-  const { mediaTags, emojiTags, mentionTags } = splitOutgoingTags([
-    forged,
-    EMOJI_A,
-  ]);
+  const { mediaTags, emojiTags, mentionTags, linkPreviewTags } =
+    splitOutgoingTags([forged, EMOJI_A]);
   assert.deepEqual(mediaTags, [forged]);
   assert.deepEqual(emojiTags, [EMOJI_A]);
   assert.deepEqual(mentionTags, []);
+  assert.deepEqual(linkPreviewTags, []);
 });
 
 test("splitOutgoingTags is the inverse of mergeOutgoingTags", () => {
   const merged = mergeOutgoingTags([IMETA], [EMOJI_A, EMOJI_B]);
-  const { mediaTags, emojiTags, mentionTags } = splitOutgoingTags(merged);
+  const { mediaTags, emojiTags, mentionTags, linkPreviewTags } =
+    splitOutgoingTags(merged);
   assert.deepEqual(mediaTags, [IMETA]);
   assert.deepEqual(emojiTags, [EMOJI_A, EMOJI_B]);
   assert.deepEqual(mentionTags, []);
+  assert.deepEqual(linkPreviewTags, []);
 });
diff --git a/desktop/src/features/messages/lib/imetaMediaMarkdown.ts b/desktop/src/features/messages/lib/imetaMediaMarkdown.ts
index 3e16cb332d0..fde84922897 100644
--- a/desktop/src/features/messages/lib/imetaMediaMarkdown.ts
+++ b/desktop/src/features/messages/lib/imetaMediaMarkdown.ts
@@ -359,18 +359,22 @@ export function splitOutgoingTags(tags: string[][] | undefined): {
   mediaTags: string[][];
   emojiTags: string[][];
   mentionTags: string[][];
+  linkPreviewTags: string[][];
 } {
   const mediaTags: string[][] = [];
   const emojiTags: string[][] = [];
   const mentionTags: string[][] = [];
+  const linkPreviewTags: string[][] = [];
   for (const tag of tags ?? []) {
     if (tag[0] === "emoji") {
       emojiTags.push(tag);
     } else if (tag[0] === "mention") {
       mentionTags.push(tag);
+    } else if (tag[0] === "link-preview") {
+      linkPreviewTags.push(tag);
     } else {
       mediaTags.push(tag);
     }
   }
-  return { mediaTags, emojiTags, mentionTags };
+  return { mediaTags, emojiTags, mentionTags, linkPreviewTags };
 }
diff --git a/desktop/src/features/messages/lib/linkPreviewContent.ts b/desktop/src/features/messages/lib/linkPreviewContent.ts
new file mode 100644
index 00000000000..ef7d57bccc9
--- /dev/null
+++ b/desktop/src/features/messages/lib/linkPreviewContent.ts
@@ -0,0 +1,24 @@
+import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
+
+import { buildPlainTextProjection } from "./plainTextProjection";
+
+export function buildPreviewUpdate(
+  doc: ProseMirrorNode,
+  selectionAnchor: number,
+) {
+  const projection = buildPlainTextProjection(doc);
+  const plainText = projection.text;
+  const hrefs = new Set<string>();
+  doc.descendants((node) => {
+    if (!node.isText || node.marks.some((mark) => mark.type.name === "spoiler"))
+      return;
+    const href = node.marks.find((mark) => mark.type.name === "link")?.attrs
+      .href;
+    if (typeof href === "string") hrefs.add(href);
+  });
+  return {
+    cursor: projection.mapPMToTextOffset(selectionAnchor),
+    linkPreviewContent: [plainText, ...hrefs].join("\n"),
+    text: plainText,
+  };
+}
diff --git a/desktop/src/features/messages/lib/useLinkEditor.tsx b/desktop/src/features/messages/lib/useLinkEditor.tsx
index 0b46a3082a4..22098ae76c4 100644
--- a/desktop/src/features/messages/lib/useLinkEditor.tsx
+++ b/desktop/src/features/messages/lib/useLinkEditor.tsx
@@ -113,36 +113,12 @@ export function useLinkEditor(richText: UseRichTextEditorResult) {
     [richText.editor],
   );
 
-  const showCard = React.useCallback(
-    (info: LinkSelectionInfo | null) => {
-      if (!info) {
-        setCardState(null);
-        return;
-      }
-
-      const rect = getLinkRect(info);
-      if (!rect) {
-        setCardState(null);
-        return;
-      }
-
-      setCardState((prev) => {
-        const sameLink =
-          prev?.info.href === info.href &&
-          prev.info.from === info.from &&
-          prev.info.to === info.to &&
-          prev.info.text === info.text;
-        const sameRect =
-          prev?.rect.left === rect.left &&
-          prev.rect.top === rect.top &&
-          prev.rect.width === rect.width &&
-          prev.rect.height === rect.height;
-        if (sameLink && sameRect) return prev;
-        return { info, rect };
-      });
-    },
-    [getLinkRect],
-  );
+  const showCard = React.useCallback((_info: LinkSelectionInfo | null) => {
+    // Keep clicks and caret movement inside composer links focused in the
+    // editor without opening contextual controls. Link editing remains
+    // available through the formatting toolbar and Cmd/Ctrl+K.
+    setCardState(null);
+  }, []);
 
   const openDialogFromInfo = React.useCallback((info: LinkSelectionInfo) => {
     setDraft({
diff --git a/desktop/src/features/messages/lib/useRichTextEditor.ts b/desktop/src/features/messages/lib/useRichTextEditor.ts
index c761081cc3b..054b8778bba 100644
--- a/desktop/src/features/messages/lib/useRichTextEditor.ts
+++ b/desktop/src/features/messages/lib/useRichTextEditor.ts
@@ -29,6 +29,8 @@ import {
 import { CUSTOM_EMOJI_NODE_NAME } from "./customEmojiNode";
 import { useComposerCustomEmoji } from "./useComposerCustomEmoji";
 import { buildPlainTextProjection } from "./plainTextProjection";
+import { parseSnapshotClipboardHtml } from "./agentSnapshotClipboard";
+import { buildPreviewUpdate } from "./linkPreviewContent";
 import { createLinkInteractionExtension } from "./linkInteractionExtension";
 import {
   CodeBlockAfterHardBreak,
@@ -76,7 +78,7 @@ export type AutocompleteEdit = {
 
 export type RichTextEditorOptions = {
   placeholder?: string;
-  onUpdate?: (info: { text: string; cursor: number }) => void;
+  onUpdate?: (info: ReturnType<typeof buildPreviewUpdate>) => void;
   editable?: boolean;
   mentionNames?: string[];
   agentMentionNames?: string[];
@@ -135,6 +137,11 @@ function shouldAppendSpaceAfterPaste(text: string): boolean {
   return PASTED_LINK_AT_END_RE.test(trimmedEnd);
 }
 
+function unwrapExactHttpLink(text: string): string | null {
+  const match = /^(?:<(https?:\/\/[^\s<>]+)>|(https?:\/\/\S+))$/i.exec(text);
+  return match?.[1] ?? match?.[2] ?? null;
+}
+
 const LinkPasteTrailingSpace = Extension.create({
   name: "linkPasteTrailingSpace",
 
@@ -487,6 +494,36 @@ export function useRichTextEditor({
         }),
       ],
       editorProps: {
+        handleDOMEvents: {
+          paste: (view, event) => {
+            const clipboard = (event as ClipboardEvent).clipboardData;
+            if (
+              parseSnapshotClipboardHtml(clipboard?.getData("text/html") ?? "")
+            )
+              return false;
+            const url = unwrapExactHttpLink(
+              clipboard?.getData("text/plain") ?? "",
+            );
+            if (!url) return false;
+            const link = view.state.schema.marks.link;
+            if (!link) return false;
+            const { from, to } = view.state.selection;
+            let transaction = view.state.tr.replaceRangeWith(
+              from,
+              to,
+              view.state.schema.text(url, [link.create({ href: url })]),
+            );
+            const end = transaction.mapping.map(to);
+            transaction = transaction.insertText(" ", end);
+            transaction = transaction.removeMark(end, end + 1, link);
+            transaction = transaction.setSelection(
+              TextSelection.create(transaction.doc, end + 1),
+            );
+            view.dispatch(transaction.setStoredMarks([]).scrollIntoView());
+            event.preventDefault();
+            return true;
+          },
+        },
         attributes: {
           autocapitalize: "none",
           autocorrect: "off",
@@ -619,11 +656,9 @@ export function useRichTextEditor({
         // still available through `getMarkdown()` for send/draft boundaries;
         // per-keystroke consumers only need textarea-shaped plain text for
         // autocomplete and empty/non-empty state.
-        const projection = buildPlainTextProjection(ed.state.doc);
-        onUpdateRef.current?.({
-          cursor: projection.mapPMToTextOffset(ed.state.selection.anchor),
-          text: projection.text,
-        });
+        onUpdateRef.current?.(
+          buildPreviewUpdate(ed.state.doc, ed.state.selection.anchor),
+        );
       },
     },
     [],
diff --git a/desktop/src/features/messages/lib/videoReviewContext.test.mjs b/desktop/src/features/messages/lib/videoReviewContext.test.mjs
index 8ecb5f57981..6c75883da98 100644
--- a/desktop/src/features/messages/lib/videoReviewContext.test.mjs
+++ b/desktop/src/features/messages/lib/videoReviewContext.test.mjs
@@ -4,6 +4,7 @@ import test from "node:test";
 import {
   buildVideoReviewCommentsByRootId,
   buildVideoReviewCommentsForRoot,
+  buildVideoReviewCommentRootIdsByMessageId,
   buildVideoReviewContextForMessage,
   buildVideoReviewContextsByMessageId,
   hasVideoAttachment,
@@ -159,6 +160,57 @@ test("buildVideoReviewCommentsForRoot returns descendants for one root", () => {
   );
 });
 
+test("buildVideoReviewCommentRootIdsByMessageId targets the nearest video ancestor", () => {
+  const root = message({ id: "root", body: "Review request" });
+  const firstVideo = message({
+    id: "first-video",
+    body: "![video](https://relay/media/a.mp4)",
+    parentId: root.id,
+    rootId: root.id,
+  });
+  const firstComment = message({
+    id: "first-comment",
+    body: "[00:01] tighten this",
+    parentId: firstVideo.id,
+    rootId: root.id,
+  });
+  const nestedVideo = message({
+    id: "nested-video",
+    body: "![video](https://relay/media/b.mp4)",
+    parentId: firstComment.id,
+    rootId: root.id,
+  });
+  const nestedComment = message({
+    id: "nested-comment",
+    body: "[00:02] check this frame",
+    parentId: nestedVideo.id,
+    rootId: root.id,
+  });
+  const plainReply = message({
+    id: "plain-reply",
+    body: "No video ancestor",
+    parentId: root.id,
+    rootId: root.id,
+  });
+
+  const rootIds = buildVideoReviewCommentRootIdsByMessageId([
+    root,
+    firstVideo,
+    firstComment,
+    nestedVideo,
+    nestedComment,
+    plainReply,
+  ]);
+
+  assert.deepEqual(
+    [...rootIds.entries()],
+    [
+      [firstComment.id, firstVideo.id],
+      [nestedComment.id, nestedVideo.id],
+    ],
+  );
+});
+
 test("buildVideoReviewContextForMessage posts against the source video", async () => {
   const video = message({
     id: "video",
diff --git a/desktop/src/features/messages/lib/videoReviewContext.ts b/desktop/src/features/messages/lib/videoReviewContext.ts
index f605952f5a7..78401214a20 100644
--- a/desktop/src/features/messages/lib/videoReviewContext.ts
+++ b/desktop/src/features/messages/lib/videoReviewContext.ts
@@ -93,6 +93,33 @@ export function buildVideoReviewCommentsForRoot(
   return comments;
 }
 
+export function buildVideoReviewCommentRootIdsByMessageId(
+  messages: TimelineMessage[],
+): ReadonlyMap<string, string> {
+  const messageById = new Map(messages.map((message) => [message.id, message]));
+  const videoMessageIds = new Set(
+    messages.filter(hasVideoAttachment).map((message) => message.id),
+  );
+  const rootIdsByMessageId = new Map<string, string>();
+
+  for (const message of messages) {
+    if (videoMessageIds.has(message.id)) continue;
+
+    let ancestorId = message.parentId ?? null;
+    const visited = new Set<string>();
+    while (ancestorId && !visited.has(ancestorId)) {
+      if (videoMessageIds.has(ancestorId)) {
+        rootIdsByMessageId.set(message.id, ancestorId);
+        break;
+      }
+      visited.add(ancestorId);
+      ancestorId = messageById.get(ancestorId)?.parentId ?? null;
+    }
+  }
+
+  return rootIdsByMessageId;
+}
+
 export function buildVideoReviewContextForMessage({
   channelId,
   channelName,
@@ -193,3 +220,18 @@ export function buildVideoReviewContextsByMessageId({
 
   return contexts;
 }
+
+export function buildVideoReviewPresentationByMessageId(
+  args: Parameters<typeof buildVideoReviewContextsByMessageId>[0],
+) {
+  return {
+    commentRootIdsByMessageId: buildVideoReviewCommentRootIdsByMessageId(
+      args.messages,
+    ),
+    contextsByMessageId: buildVideoReviewContextsByMessageId(args),
+  };
+}
+
+export type VideoReviewPresentation = ReturnType<
+  typeof buildVideoReviewPresentationByMessageId
+>;
diff --git a/desktop/src/features/messages/ui/ComposerDockBackdrop.tsx b/desktop/src/features/messages/ui/ComposerDockBackdrop.tsx
index 840be49beae..0e237d5145d 100644
--- a/desktop/src/features/messages/ui/ComposerDockBackdrop.tsx
+++ b/desktop/src/features/messages/ui/ComposerDockBackdrop.tsx
@@ -1,5 +1,30 @@
 import { cn } from "@/shared/lib/cn";
 
+type ComposerDockGlassBackdropProps = {
+  className?: string;
+  testId?: string;
+};
+
+/**
+ * Applies the composer dock's shared blur without adding color or layout.
+ * Reuse it for composer-adjacent surfaces that need the same glass treatment.
+ */
+export function ComposerDockGlassBackdrop({
+  className,
+  testId,
+}: ComposerDockGlassBackdropProps) {
+  return (
+    <div
+      aria-hidden="true"
+      className={cn(
+        "pointer-events-none backdrop-blur-md dark:backdrop-blur-xl",
+        className,
+      )}
+      data-testid={testId}
+    />
+  );
+}
+
 type ComposerDockBackdropProps = {
   gutterClassName: string;
 };
@@ -21,7 +46,7 @@ export function ComposerDockBackdrop({
         )}
         data-testid="composer-dock-backdrop"
       >
-        <div className="h-full w-full rounded-2xl backdrop-blur-md dark:backdrop-blur-xl" />
+        <ComposerDockGlassBackdrop className="h-full w-full rounded-2xl" />
       </div>
       <div
         aria-hidden="true"
diff --git a/desktop/src/features/messages/ui/MessageComposer.tsx b/desktop/src/features/messages/ui/MessageComposer.tsx
index 9e1fee53d31..0dc289eefaf 100644
--- a/desktop/src/features/messages/ui/MessageComposer.tsx
+++ b/desktop/src/features/messages/ui/MessageComposer.tsx
@@ -57,6 +57,7 @@ import { usePersistentAgentMentionHydration } from "./usePersistentAgentMentionH
 import { useComposerContentState } from "./useComposerContentState";
 import { useDraftPersistLifecycle } from "./useDraftPersistSnapshot";
 import { submitMessageEdit } from "./submitMessageEdit";
+import { useComposerLinkPreviews } from "./useComposerLinkPreviews";
 import type { MessageComposerProps } from "./MessageComposer.types";
 function MessageComposerImpl({
   audienceContext = null,
@@ -98,6 +99,12 @@ function MessageComposerImpl({
     syncComposerContentFromEditor,
     syncContentRefFromEditorRef,
   } = useComposerContentState();
+  const [previewContent, setPreviewContent] = React.useState("");
+  const deferredPreviewContent = React.useDeferredValue(previewContent);
+  const {
+    previewList: composerLinkPreviews,
+    getReadyTags: getReadyLinkPreviewTags,
+  } = useComposerLinkPreviews(deferredPreviewContent);
   const [isEmojiPickerOpen, setIsEmojiPickerOpen] = React.useState(false);
   const [isFormattingOpen, setIsFormattingOpen] = React.useState(false);
   const [spoileredAttachmentUrls, setSpoileredAttachmentUrls] = React.useState<
@@ -255,8 +262,9 @@ function MessageComposerImpl({
     onEditLink: (info) => onEditLinkRef.current?.(info),
     onLinkSelectionChange: (info) => onLinkSelectionChangeRef.current?.(info),
     onLinkShortcut: () => onLinkShortcutRef.current?.() ?? false,
-    onUpdate: ({ cursor, text }) => {
+    onUpdate: ({ cursor, linkPreviewContent, text }) => {
       setComposerContentFromText(text);
+      setPreviewContent(linkPreviewContent);
       mentions.updateMentionQuery(text, cursor);
       channelLinks.updateChannelQuery(text, cursor);
       emojiAutocomplete.updateEmojiQuery(text, cursor);
@@ -499,7 +507,6 @@ function MessageComposerImpl({
     richText.focus,
     mentions.updateMentionQuery,
   ]);
-  // ── Submit message ──────────────────────────────────────────────────
   const submitMessage = React.useCallback(async () => {
     const trimmed = syncComposerContentFromEditor().trim();
     // Edit mode
@@ -575,6 +582,7 @@ function MessageComposerImpl({
         capturedThreadContext,
         pendingImeta: currentPendingImeta,
         queuedAttachments: currentQueuedAttachments,
+        linkPreviewTags: getReadyLinkPreviewTags(),
         sentDraftKey: resolveSentDraftKey(
           effectiveDraftKeyRef.current,
           drafts.loadDraft,
@@ -595,6 +603,7 @@ function MessageComposerImpl({
     customEmoji,
     drafts.loadDraft,
     emojiAutocomplete.clearEmojis,
+    getReadyLinkPreviewTags,
     media.clearQueuedAttachments,
     media.pendingImetaRef,
     media.queuedAttachmentsRef,
@@ -699,7 +708,6 @@ function MessageComposerImpl({
         }
         return;
       }
-
       // Escape in edit mode
       if (
         event.key === "Escape" &&
@@ -725,14 +733,11 @@ function MessageComposerImpl({
       onCancelEdit,
     ],
   );
-
   // ── Media paste + ⌘K link shortcut via Tiptap editorProps ──────────
   const uploadFileRef = React.useRef(media.uploadFile);
   uploadFileRef.current = media.uploadFile;
-
   React.useEffect(() => {
     if (!richText.editor) return;
-
     richText.editor.setOptions({
       editorProps: {
         ...richText.editor.options.editorProps,
@@ -750,7 +755,6 @@ function MessageComposerImpl({
             }
             return true;
           }
-
           // --- Buzz code-block paste ---
           // The code block copy button writes a small Buzz marker alongside
           // plain text. Use it to paste back as a literal code block so Markdown
@@ -777,7 +781,6 @@ function MessageComposerImpl({
             scrollComposerToBottom();
             return true;
           }
-
           // Restore Buzz snapshots before normal styled-HTML normalization.
           if (handleAgentSnapshotPaste(event, media.setPendingImeta))
             return true;
@@ -789,18 +792,15 @@ function MessageComposerImpl({
             _view.pasteHTML(cleanHtml);
             return true;
           }
-
           const plainText = event.clipboardData?.getData("text/plain") ?? "";
           if (plainText.includes("\n")) {
             scrollComposerToBottom();
           }
-
           return false;
         },
       },
     });
   }, [media.setPendingImeta, richText.editor, scrollComposerToBottom]);
-
   // ── Send button state ───────────────────────────────────────────────
   const sendDisabled = React.useMemo(
     () =>
@@ -819,7 +819,6 @@ function MessageComposerImpl({
       media.queuedAttachments.length,
     ],
   );
-
   const handleCaptureSelection = React.useCallback(() => {}, []);
 
   const handlePaperclipClick = React.useCallback(() => {
@@ -951,6 +950,7 @@ function MessageComposerImpl({
               </div>
             ) : null}
 
+            {composerLinkPreviews}
             {(media.pendingImeta.length > 0 ||
               media.queuedAttachments.length > 0 ||
               media.isUploading) && (
diff --git a/desktop/src/features/messages/ui/MessageRow.tsx b/desktop/src/features/messages/ui/MessageRow.tsx
index 9f55e712f1f..51d9832c128 100644
--- a/desktop/src/features/messages/ui/MessageRow.tsx
+++ b/desktop/src/features/messages/ui/MessageRow.tsx
@@ -40,7 +40,13 @@ import { resolveSnapshotSharedBy } from "@/features/messages/lib/snapshotSharedB
 import { resolveMentionProps } from "@/shared/lib/resolveMentionNames";
 import { Markdown } from "@/shared/ui/markdown";
 import type { VideoReviewContext } from "@/shared/ui/VideoPlayer";
+import { useOpenVideoReviewAt } from "@/shared/ui/VideoReviewNavigation";
+import { parseVideoReviewTimecode } from "@/shared/ui/videoReviewTimecode";
+import { VideoReviewTimecodeButton } from "@/shared/ui/VideoReviewTimecodeButton";
 import { MessageActionBar } from "./MessageActionBar";
+import { editMessage } from "@/shared/api/tauri";
+import { hasLinkPreviewSuppression } from "@/features/messages/lib/formatTimelineMessages";
+import { toast } from "sonner";
 import { MessageAgentOwner } from "./MessageAgentOwner";
 import { MessageAuthorText, MessageHeaderRow } from "./MessageHeader";
 import { MessageTimestamp } from "./MessageTimestamp";
@@ -95,6 +101,7 @@ export const MessageRow = React.memo(
     profiles,
     searchQuery,
     showDepthGuides = true,
+    videoReviewCommentRootId,
     videoReviewContext,
   }: {
     channelId?: string | null;
@@ -143,6 +150,7 @@ export const MessageRow = React.memo(
     profiles?: UserProfileLookup;
     searchQuery?: string;
     showDepthGuides?: boolean;
+    videoReviewCommentRootId?: string;
     videoReviewContext?: VideoReviewContext;
   }) {
     // Keep the transient send state with its timestamp rather than collapsing
@@ -151,6 +159,29 @@ export const MessageRow = React.memo(
     const [expandedDiffId, setExpandedDiffId] = React.useState<string | null>(
       null,
     );
+    const linkPreviewsSuppressed = hasLinkPreviewSuppression(message.tags);
+    const removeLinkPreviewsForEveryone =
+      channelId && onEdit && !message.pending && !linkPreviewsSuppressed
+        ? async () => {
+            const tags = message.tags ?? [];
+            try {
+              await editMessage(
+                channelId,
+                message.id,
+                message.body,
+                tags.filter((tag) => tag[0] === "imeta"),
+                tags.filter((tag) => tag[0] === "emoji"),
+                undefined,
+                true,
+              );
+            } catch (error) {
+              toast.error(
+                `Failed to remove previews: ${error instanceof Error ? error.message : String(error)}`,
+              );
+              throw error;
+            }
+          }
+        : undefined;
     const [badgeBurstEmoji, setBadgeBurstEmoji] = React.useState<string | null>(
       null,
     );
@@ -244,6 +275,7 @@ export const MessageRow = React.memo(
     const bodyOffsetClass = emojiOnly ? "mt-1" : "-mt-0.5";
 
     const { nonDmChannelNames: channelNames } = useChannelNavigation();
+    const openVideoReviewAt = useOpenVideoReviewAt();
 
     const indentRem = getThreadReplyIndentRem(message.depth);
     const descendantGuideOffsetRem = connectDescendants
@@ -340,22 +372,24 @@ export const MessageRow = React.memo(
               message={message}
             />
           );
-        default:
-          {
-            const waveMessage = parseWaveMessageContent(message.body);
-            if (waveMessage) {
-              return (
-                <WaveMessageAttachment
-                  channelId={channelId}
-                  fallbackText={waveMessage.fallbackText}
-                  huddleMemberPubkeys={huddleMemberPubkeys}
-                  huddleMemberPubkeysPending={huddleMemberPubkeysPending}
-                />
-              );
-            }
+        default: {
+          const waveMessage = parseWaveMessageContent(message.body);
+          if (waveMessage) {
+            return (
+              <WaveMessageAttachment
+                channelId={channelId}
+                fallbackText={waveMessage.fallbackText}
+                huddleMemberPubkeys={huddleMemberPubkeys}
+                huddleMemberPubkeysPending={huddleMemberPubkeysPending}
+              />
+            );
           }
 
-          return (
+          const reviewRootEventId = videoReviewCommentRootId;
+          const reviewTimecode = reviewRootEventId
+            ? parseVideoReviewTimecode(message.body)
+            : null;
+          const markdown = (
             <Markdown
               channelNames={channelNames}
               className={cn(
@@ -371,7 +405,11 @@ export const MessageRow = React.memo(
                 message,
                 isKnownAgentPubkey,
               )}
-              content={message.body}
+              content={reviewTimecode?.text ?? message.body}
+              messageId={message.id}
+              linkPreviewsSuppressed={linkPreviewsSuppressed}
+              linkPreviewTags={message.tags}
+              onRemoveLinkPreviewsForEveryone={removeLinkPreviewsForEveryone}
               customEmoji={customEmoji}
               imetaByUrl={imetaByUrl}
               agentMentionPubkeysByName={agentMentionPubkeysByName}
@@ -382,6 +420,24 @@ export const MessageRow = React.memo(
               videoReviewContext={videoReviewContext}
             />
           );
+          if (!reviewRootEventId || !reviewTimecode || !openVideoReviewAt) {
+            return markdown;
+          }
+
+          return (
+            <div className="flex min-w-0 items-start gap-1.5">
+              <VideoReviewTimecodeButton
+                surface="message"
+                timecode={reviewTimecode.timecode}
+                onClick={(event) => {
+                  event.stopPropagation();
+                  openVideoReviewAt(reviewRootEventId, reviewTimecode.seconds);
+                }}
+              />
+              <div className="min-w-0 flex-1">{markdown}</div>
+            </div>
+          );
+        }
       }
     };
 
@@ -893,6 +949,7 @@ export const MessageRow = React.memo(
     prev.playEntrance === next.playEntrance &&
     prev.profiles === next.profiles &&
     prev.searchQuery === next.searchQuery &&
+    prev.videoReviewCommentRootId === next.videoReviewCommentRootId &&
     prev.videoReviewContext === next.videoReviewContext,
 );
 
diff --git a/desktop/src/features/messages/ui/MessageThreadPanel.tsx b/desktop/src/features/messages/ui/MessageThreadPanel.tsx
index fb01783bf46..2c82268462f 100644
--- a/desktop/src/features/messages/ui/MessageThreadPanel.tsx
+++ b/desktop/src/features/messages/ui/MessageThreadPanel.tsx
@@ -18,11 +18,13 @@ import {
 import type { ImetaMedia } from "@/features/messages/lib/imetaMediaMarkdown";
 import { canManageMessageForCurrentUser } from "@/features/messages/lib/canManageMessage";
 import type { TimelineMessage } from "@/features/messages/types";
+import type { VideoReviewPresentation } from "@/features/messages/lib/videoReviewContext";
 import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import type { Channel } from "@/shared/api/types";
 import type { ThreadPanelLayoutProps } from "@/features/channels/lib/threadPanelLayout";
 import { useEscapeKey } from "@/shared/hooks/useEscapeKey";
 import { useIsThreadPanelOverlay } from "@/shared/hooks/use-mobile";
+import { VideoReviewNavigationProvider } from "@/shared/ui/VideoReviewNavigation";
 import { cn } from "@/shared/lib/cn";
 import { AuxiliaryPanel } from "@/shared/layout/AuxiliaryPanel";
 import { AuxiliaryPanelBody } from "@/shared/layout/AuxiliaryPanel";
@@ -38,7 +40,6 @@ import {
 } from "@/features/messages/lib/messageThreadPanelLayout";
 import { Button } from "@/shared/ui/button";
 import { Separator } from "@/shared/ui/separator";
-import type { VideoReviewContext } from "@/shared/ui/VideoPlayer";
 import { ComposerActivityAccessory } from "./ComposerActivityAccessory";
 import { ComposerDockBackdrop } from "./ComposerDockBackdrop";
 import { MessageComposer } from "./MessageComposer";
@@ -111,7 +112,7 @@ type MessageThreadPanelProps = ThreadPanelLayoutProps & {
   threadUnreadCount?: number;
   threadReplyUnreadCounts?: ReadonlyMap<string, number>;
   threadTypingPubkeys: string[];
-  videoReviewContextsByMessageId?: ReadonlyMap<string, VideoReviewContext>;
+  videoReviewPresentation?: VideoReviewPresentation;
   activityAccessoryContent?: React.ReactNode;
   activityAccessoryVisible: boolean;
   widthPx: number;
@@ -225,7 +226,7 @@ export function MessageThreadPanel({
   scrollTargetId,
   scrollTargetHighlights = true,
   threadHead,
-  videoReviewContextsByMessageId,
+  videoReviewPresentation,
   threadReplies,
   threadRepliesPending = false,
   threadUnreadCount,
@@ -617,7 +618,10 @@ export function MessageThreadPanel({
                 }
                 profiles={profiles}
                 showDepthGuides={shouldShowThreadBranchGuides}
-                videoReviewContext={videoReviewContextsByMessageId?.get(
+                videoReviewCommentRootId={videoReviewPresentation?.commentRootIdsByMessageId.get(
+                  threadHead.id,
+                )}
+                videoReviewContext={videoReviewPresentation?.contextsByMessageId.get(
                   threadHead.id,
                 )}
               />
@@ -776,7 +780,10 @@ export function MessageThreadPanel({
                         onToggleReaction={onToggleReaction}
                         profiles={profiles}
                         showDepthGuides={shouldShowThreadBranchGuides}
-                        videoReviewContext={videoReviewContextsByMessageId?.get(
+                        videoReviewCommentRootId={videoReviewPresentation?.commentRootIdsByMessageId.get(
+                          entry.message.id,
+                        )}
+                        videoReviewContext={videoReviewPresentation?.contextsByMessageId.get(
                           entry.message.id,
                         )}
                       />
@@ -955,24 +962,26 @@ export function MessageThreadPanel({
   );
 
   return (
-    <AuxiliaryPanel
-      className="relative"
-      // The focus drawer animates itself; a second slide here would compound.
-      enterMotion={!isFocusMode}
-      footer={threadFooter}
-      header={
-        isHuddleTranscript ? undefined : (
-          <AuxiliaryPanelHeader>{threadHeaderContent}</AuxiliaryPanelHeader>
-        )
-      }
-      isSinglePanelView={isSinglePanelView}
-      layout={layout}
-      onClose={onClose}
-      testId="message-thread-panel"
-      transparentChrome={transparentChrome}
-      widthPx={widthPx}
-    >
-      {threadScrollRegion}
-    </AuxiliaryPanel>
+    <VideoReviewNavigationProvider>
+      <AuxiliaryPanel
+        className="relative"
+        // The focus drawer animates itself; a second slide here would compound.
+        enterMotion={!isFocusMode}
+        footer={threadFooter}
+        header={
+          isHuddleTranscript ? undefined : (
+            <AuxiliaryPanelHeader>{threadHeaderContent}</AuxiliaryPanelHeader>
+          )
+        }
+        isSinglePanelView={isSinglePanelView}
+        layout={layout}
+        onClose={onClose}
+        testId="message-thread-panel"
+        transparentChrome={transparentChrome}
+        widthPx={widthPx}
+      >
+        {threadScrollRegion}
+      </AuxiliaryPanel>
+    </VideoReviewNavigationProvider>
   );
 }
diff --git a/desktop/src/features/messages/ui/useComposerLinkPreviews.tsx b/desktop/src/features/messages/ui/useComposerLinkPreviews.tsx
new file mode 100644
index 00000000000..39d5d9db8ee
--- /dev/null
+++ b/desktop/src/features/messages/ui/useComposerLinkPreviews.tsx
@@ -0,0 +1,252 @@
+import * as React from "react";
+import { ImageOff, LoaderCircle, X } from "lucide-react";
+
+import { getRelayHttpUrl, uploadMediaBytes } from "@/shared/api/tauri";
+import { extractSupportedLinkPreviews } from "@/shared/lib/linkPreview";
+import {
+  buildLinkPreviewSnapshotTag,
+  isValidLinkPreviewSnapshotCanonicalUrl,
+} from "@/shared/lib/linkPreviewSnapshot";
+import {
+  beginRelayOriginFetch,
+  getCachedRelayOrigin,
+} from "@/shared/lib/mediaUrl";
+import type { ResolvedLinkPreview } from "@/shared/lib/useResolvedLinkPreviews";
+import { useResolvedLinkPreviews } from "@/shared/lib/useResolvedLinkPreviews";
+import {
+  Attachment,
+  AttachmentContent,
+  AttachmentDescription,
+  AttachmentGroup,
+  AttachmentMedia,
+  AttachmentTitle,
+  AttachmentTrigger,
+} from "@/shared/ui/attachment";
+import { Button } from "@/shared/ui/button";
+
+function previewHostname(href: string): string {
+  try {
+    return new URL(href).hostname.replace(/^www\./, "");
+  } catch {
+    return href;
+  }
+}
+
+function ComposerLinkPreviewCard({
+  preview,
+}: {
+  preview: ResolvedLinkPreview;
+}) {
+  const imageSrc = preview.imageState === "image" ? preview.imageDataUrl : null;
+  const [failedImageSrc, setFailedImageSrc] = React.useState<string | null>(
+    null,
+  );
+  const showImage = Boolean(imageSrc && failedImageSrc !== imageSrc);
+  const hostname = previewHostname(preview.href);
+  let path = "";
+  try {
+    const url = new URL(preview.href);
+    path = `${url.pathname}${url.search}`;
+  } catch {}
+
+  return (
+    <Attachment
+      className="h-[55px] w-80 max-w-full gap-2 overflow-hidden p-0 pr-2 shadow-none"
+      data-image-state={preview.imageState}
+      data-link-preview={preview.kind}
+      data-link-preview-composer-card=""
+      state={preview.snapshotReady ? "done" : "processing"}
+    >
+      <AttachmentMedia
+        className="h-[55px] w-[55px] rounded-none rounded-l-2xl bg-muted"
+        data-link-preview-thumbnail=""
+        variant="image"
+      >
+        {showImage ? (
+          <img
+            alt=""
+            className="h-full w-full object-cover"
+            onError={() => setFailedImageSrc(imageSrc ?? null)}
+            src={imageSrc ?? undefined}
+          />
+        ) : preview.imageState === "pending" ? (
+          <LoaderCircle
+            aria-label="Loading link preview"
+            className="size-4 animate-spin"
+          />
+        ) : preview.faviconDataUrl ? (
+          <img
+            alt=""
+            className="size-7 rounded-md object-contain opacity-70"
+            src={preview.faviconDataUrl}
+          />
+        ) : (
+          <ImageOff aria-hidden="true" className="size-4 opacity-60" />
+        )}
+      </AttachmentMedia>
+      <AttachmentContent>
+        <AttachmentTitle className="line-clamp-1" data-link-preview-hostname="">
+          {preview.snapshotReady ? preview.title : hostname}
+        </AttachmentTitle>
+        <AttachmentDescription>
+          {preview.snapshotReady
+            ? preview.provider || hostname
+            : path && path !== "/"
+              ? path
+              : preview.typeLabel}
+        </AttachmentDescription>
+      </AttachmentContent>
+      <AttachmentTrigger asChild>
+        <a
+          aria-label={`Open ${preview.title}`}
+          href={preview.href}
+          rel="noreferrer"
+          target="_blank"
+        >
+          <span className="sr-only">Open {preview.title}</span>
+        </a>
+      </AttachmentTrigger>
+    </Attachment>
+  );
+}
+
+function dataUrlBytes(dataUrl: string): Uint8Array | null {
+  const match = /^data:([^;,]+);base64,([A-Za-z0-9+/=]+)$/.exec(dataUrl);
+  if (!match) return null;
+  try {
+    return Uint8Array.from(atob(match[2]), (char) => char.charCodeAt(0));
+  } catch {
+    return null;
+  }
+}
+
+async function uploadDataUrl(
+  dataUrl: string | null | undefined,
+  filename: string,
+) {
+  if (!dataUrl) return { url: "", sha256: "" };
+  const bytes = dataUrlBytes(dataUrl);
+  if (!bytes) throw new Error("invalid preview media data");
+  const uploaded = await uploadMediaBytes([...bytes], filename);
+  return { url: uploaded.url, sha256: uploaded.sha256 };
+}
+
+export function useComposerLinkPreviews(content: string) {
+  const [suppressed, setSuppressed] = React.useState(false);
+  const candidates = React.useMemo(
+    () =>
+      extractSupportedLinkPreviews(content).filter((preview) =>
+        preview.href.startsWith("buzz://")
+          ? true
+          : isValidLinkPreviewSnapshotCanonicalUrl(preview.href),
+      ),
+    [content],
+  );
+  const previews = useResolvedLinkPreviews(suppressed ? [] : candidates);
+  React.useEffect(() => {
+    if (candidates.length === 0) setSuppressed(false);
+  }, [candidates.length]);
+  const [readyTags, setReadyTags] = React.useState<Record<string, string[]>>(
+    {},
+  );
+  const readyTagsRef = React.useRef<string[][]>([]);
+  const readyTagsByHrefRef = React.useRef(readyTags);
+  readyTagsByHrefRef.current = readyTags;
+  const suppressedRef = React.useRef(suppressed);
+  suppressedRef.current = suppressed;
+  const uploadsRef = React.useRef(new Set<string>());
+  const activeHrefsRef = React.useRef(new Set<string>());
+  activeHrefsRef.current = new Set(candidates.map((preview) => preview.href));
+
+  React.useEffect(() => {
+    if (getCachedRelayOrigin()) return;
+    const publishRelayOrigin = beginRelayOriginFetch();
+    void getRelayHttpUrl()
+      .then((url) => publishRelayOrigin(url))
+      .catch(() => publishRelayOrigin(null));
+  }, []);
+
+  React.useEffect(() => {
+    const active = new Set(candidates.map((preview) => preview.href));
+    setReadyTags((current) =>
+      Object.fromEntries(
+        Object.entries(current).filter(([href]) => active.has(href)),
+      ),
+    );
+  }, [candidates]);
+
+  React.useEffect(() => {
+    for (const preview of previews) {
+      if (
+        !preview.snapshotReady ||
+        readyTags[preview.href] ||
+        uploadsRef.current.has(preview.href)
+      )
+        continue;
+      uploadsRef.current.add(preview.href);
+      void Promise.all([
+        uploadDataUrl(preview.imageDataUrl, "link-preview-image.png"),
+        uploadDataUrl(preview.faviconDataUrl, "link-preview-favicon.png"),
+      ])
+        .then(([image, favicon]) => {
+          if (!activeHrefsRef.current.has(preview.href)) return;
+          const tag = buildLinkPreviewSnapshotTag({
+            canonicalUrl: preview.href,
+            title: preview.title,
+            siteName: preview.provider,
+            description: preview.description ?? "",
+            imageUrl: image.url,
+            imageSha256: image.sha256,
+            faviconUrl: favicon.url,
+            faviconSha256: favicon.sha256,
+          });
+          if (!tag) return;
+          setReadyTags((current) => ({ ...current, [preview.href]: tag }));
+        })
+        .catch(() => {})
+        .finally(() => uploadsRef.current.delete(preview.href));
+    }
+  }, [previews, readyTags]);
+
+  readyTagsRef.current = suppressed
+    ? [["link-preview", "none"]]
+    : candidates.flatMap((candidate) =>
+        readyTags[candidate.href] ? [readyTags[candidate.href]] : [],
+      );
+  const hideAll = React.useCallback(() => setSuppressed(true), []);
+  const previewList = previews.length ? (
+    <div
+      className="mb-2"
+      data-composer-link-previews=""
+      data-ready-snapshot-count={readyTagsRef.current.length}
+    >
+      <div className="flex max-w-full items-start gap-1">
+        <AttachmentGroup className="max-w-full flex-row flex-wrap items-start overflow-visible pb-0">
+          {previews.map((preview) => (
+            <ComposerLinkPreviewCard key={preview.href} preview={preview} />
+          ))}
+        </AttachmentGroup>
+        <Button
+          aria-label="Hide all link previews"
+          className="mt-1 size-5 shrink-0 rounded-full text-muted-foreground hover:text-foreground [&_svg]:size-3"
+          data-testid="composer-hide-link-previews"
+          onClick={hideAll}
+          size="icon-xs"
+          title="Hide previews"
+          type="button"
+          variant="ghost"
+        >
+          <X aria-hidden="true" />
+        </Button>
+      </div>
+    </div>
+  ) : null;
+  const getReadyTags = React.useCallback(() => {
+    if (suppressedRef.current) return [["link-preview", "none"]];
+    return [...activeHrefsRef.current].flatMap((href) => {
+      const tag = readyTagsByHrefRef.current[href];
+      return tag ? [tag] : [];
+    });
+  }, []);
+  return { previewList, getReadyTags };
+}
diff --git a/desktop/src/features/messages/ui/useMentionSendFlow.helpers.ts b/desktop/src/features/messages/ui/useMentionSendFlow.helpers.ts
index 76503bfab1e..b2eb3893b7f 100644
--- a/desktop/src/features/messages/ui/useMentionSendFlow.helpers.ts
+++ b/desktop/src/features/messages/ui/useMentionSendFlow.helpers.ts
@@ -36,6 +36,7 @@ export type SendMessageWithMentionFlowInput = {
   capturedThreadContext?: PendingNonMemberMentionSend["capturedThreadContext"];
   pendingImeta: ImetaMedia[];
   queuedAttachments?: QueuedMediaAttachment[];
+  linkPreviewTags?: string[][];
   sentDraftKey: string | null | undefined;
   recoveryDraftKey: string | null | undefined;
   spoileredAttachmentUrls?: ReadonlySet<string>;
diff --git a/desktop/src/features/messages/ui/useMentionSendFlow.ts b/desktop/src/features/messages/ui/useMentionSendFlow.ts
index 647ad4cbe8f..cc51c733453 100644
--- a/desktop/src/features/messages/ui/useMentionSendFlow.ts
+++ b/desktop/src/features/messages/ui/useMentionSendFlow.ts
@@ -187,7 +187,6 @@ export function useMentionSendFlow({
           pubkeys: [] as string[],
         };
       }
-
       const managedAgentsByPubkey = await getManagedAgentsByPubkey();
       for (const agent of preparedManagedAgents) {
         managedAgentsByPubkey.set(normalizePubkey(agent.pubkey), agent);
@@ -198,13 +197,11 @@ export function useMentionSendFlow({
       ]);
       const errors: string[] = [];
       const pubkeys: string[] = [];
-
       for (const pubkey of uniqueNormalizedPubkeys(mentionPubkeys)) {
         const agent = managedAgentsByPubkey.get(pubkey);
         if (!agent) {
           continue;
         }
-
         try {
           if (participantPubkeys.has(pubkey)) {
             if (isProviderBackedAgent(agent)) {
@@ -231,7 +228,6 @@ export function useMentionSendFlow({
           );
         }
       }
-
       return {
         errors,
         pubkeys: uniqueNormalizedPubkeys(pubkeys),
@@ -713,6 +709,7 @@ export function useMentionSendFlow({
       capturedThreadContext = null,
       pendingImeta,
       queuedAttachments = [],
+      linkPreviewTags = [],
       sentDraftKey,
       recoveryDraftKey,
       spoileredAttachmentUrls = new Set(),
@@ -775,7 +772,10 @@ export function useMentionSendFlow({
             createdPersonaAgentPubkeySet.has(pubkey),
         );
         const pubkeys = explicitMentionPubkeys;
-        const outgoingTags = buildCustomEmojiTags(trimmed, customEmoji);
+        const outgoingTags = [
+          ...buildCustomEmojiTags(trimmed, customEmoji),
+          ...linkPreviewTags,
+        ];
         const nonMemberPubkeys = getNonMemberMentionPubkeys(pubkeys);
         let promptNonMemberPubkeys = nonMemberPubkeys.filter(
           (pubkey) =>
diff --git a/desktop/src/features/notifications/lib/desktop.test.mjs b/desktop/src/features/notifications/lib/desktop.test.mjs
new file mode 100644
index 00000000000..7fb8830683a
--- /dev/null
+++ b/desktop/src/features/notifications/lib/desktop.test.mjs
@@ -0,0 +1,52 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+const notifications = [];
+
+class WorkingNotification {
+  static permission = "granted";
+
+  constructor(title, options) {
+    notifications.push({ title, options });
+  }
+
+  close() {}
+}
+
+class ThrowingNotification {
+  static permission = "granted";
+
+  constructor() {
+    throw new Error("notification backend unavailable");
+  }
+}
+
+globalThis.window = { Notification: ThrowingNotification };
+
+const { sendDesktopNotification } = await import("./desktop.ts");
+
+test("constructor failure is a delivery miss and does not prevent a later notification", async (t) => {
+  const warnings = [];
+  t.mock.method(console, "warn", (...args) => warnings.push(args));
+
+  const failed = await sendDesktopNotification({ title: "First" });
+
+  assert.equal(failed, false);
+  assert.equal(warnings.length, 1);
+  assert.match(String(warnings[0][1]), /notification backend unavailable/);
+
+  window.Notification = WorkingNotification;
+
+  const delivered = await sendDesktopNotification({
+    title: "Second",
+    body: "Recovered",
+  });
+
+  assert.equal(delivered, true);
+  assert.deepEqual(notifications, [
+    {
+      title: "Second",
+      options: { body: "Recovered", silent: true, extra: undefined },
+    },
+  ]);
+});
diff --git a/desktop/src/features/notifications/lib/desktop.ts b/desktop/src/features/notifications/lib/desktop.ts
index dbc21d9d23c..45716de2d94 100644
--- a/desktop/src/features/notifications/lib/desktop.ts
+++ b/desktop/src/features/notifications/lib/desktop.ts
@@ -381,19 +381,32 @@ export async function sendDesktopNotification(
     }
   }
 
-  const notification = new window.Notification(payload.title, {
-    body: payload.body,
-    silent: true,
-    extra: notificationExtra(payload.target),
-  } as DesktopNotificationOptions);
-
-  const target = payload.target;
-  if (!isTauri() && target) {
-    notification.onclick = () => {
-      dispatchDesktopNotificationTarget(target);
-      notification.close();
-    };
-  }
+  // block/buzz#5081 — WebKit throws `NotificationError` from the constructor
+  // when the notification backend becomes temporarily unavailable. Callers
+  // discard the returned promise without a rejection handler, so an
+  // un-guarded throw becomes an unhandled rejection. Treat constructor failure
+  // as a delivery miss (return false) and log the failed delivery.
+  try {
+    const notification = new window.Notification(payload.title, {
+      body: payload.body,
+      silent: true,
+      extra: notificationExtra(payload.target),
+    } as DesktopNotificationOptions);
+
+    const target = payload.target;
+    if (!isTauri() && target) {
+      notification.onclick = () => {
+        dispatchDesktopNotificationTarget(target);
+        notification.close();
+      };
+    }
 
-  return true;
+    return true;
+  } catch (error) {
+    console.warn(
+      "[desktop] window.Notification constructor threw — notification dropped:",
+      error,
+    );
+    return false;
+  }
 }
diff --git a/desktop/src/features/onboarding/hooks.ts b/desktop/src/features/onboarding/hooks.ts
index 7495af48ebb..f8c08afc2b2 100644
--- a/desktop/src/features/onboarding/hooks.ts
+++ b/desktop/src/features/onboarding/hooks.ts
@@ -82,14 +82,15 @@ export async function initializeStarterChannels(
     let starterChannels: Awaited<
       ReturnType<typeof ensureStarterChannels>
     > | null = null;
-    let starterChannelsError: unknown = null;
     try {
       starterChannels = await ensureStarterChannels({
         ensureStarterChannels: ensureStarterChannelsCommand,
         getChannels,
       });
     } catch (error) {
-      starterChannelsError = error;
+      // Public starter channels are optional. Owners may have deliberately
+      // deleted their deterministic starter channels; that must not strand a
+      // new member after the required private Welcome channel succeeds.
       console.warn("Failed to initialize public starter channels.", error);
     }
 
@@ -145,16 +146,6 @@ export async function initializeStarterChannels(
       notifyWelcomeChannelReady(welcomeChannel.id);
     }
     const focusChannelId = focus ? welcomeChannel.id : undefined;
-    if (starterChannelsError) {
-      return {
-        ok: false,
-        focusChannelId,
-        reason:
-          starterChannelsError instanceof Error
-            ? starterChannelsError.message
-            : "Failed to set up starter channels",
-      };
-    }
     return { ok: true, focusChannelId };
   } catch (error) {
     console.warn("Failed to initialize starter channels.", error);
diff --git a/desktop/src/features/onboarding/machineOnboarding.ts b/desktop/src/features/onboarding/machineOnboarding.ts
index 8bc4cadaa9f..eacc2c35628 100644
--- a/desktop/src/features/onboarding/machineOnboarding.ts
+++ b/desktop/src/features/onboarding/machineOnboarding.ts
@@ -176,6 +176,11 @@ export function useMachineOnboardingState({
         completionKey(MACHINE_ONBOARDING_COMPLETION_STORAGE_KEY, pubkey),
         "true",
       );
+      // Clear the "continuing" marker so completion actually settles the flow.
+      // Imported/recovered identities set continuingPubkeyRef to pin the stage
+      // to "onboarding" until setup finishes; leaving it set after complete()
+      // keeps the stage pinned forever, so Skip/Next appear to do nothing.
+      continuingPubkeyRef.current = null;
       setCompletedPubkey(pubkey);
     },
     [currentPubkey],
@@ -185,6 +190,12 @@ export function useMachineOnboardingState({
     continuingPubkeyRef.current = pubkey;
   }, []);
 
+  const continueWithRecoveredIdentity = React.useCallback((pubkey: string) => {
+    continuingPubkeyRef.current = pubkey;
+    setBootedLost(false);
+    setBootedLocked(false);
+  }, []);
+
   const reopen = React.useCallback(() => {
     clearMachineOnboardingCompletion(currentPubkey);
     setCompletedPubkey((pubkey) => (pubkey === currentPubkey ? null : pubkey));
@@ -224,7 +235,11 @@ export function useMachineOnboardingState({
       continuingPubkeyRef.current !== currentPubkey)
   ) {
     stage = "blocking";
-  } else if (identityLost || !hasCompletedCurrentPubkey) {
+  } else if (
+    identityLost ||
+    continuingPubkeyRef.current === currentPubkey ||
+    !hasCompletedCurrentPubkey
+  ) {
     stage = "onboarding";
   } else {
     stage = "ready";
@@ -233,6 +248,7 @@ export function useMachineOnboardingState({
   return {
     complete,
     continueWithIdentity,
+    continueWithRecoveredIdentity,
     currentPubkey,
     identityLost,
     queryClient,
diff --git a/desktop/src/features/onboarding/ui/BackupPasswordTimeline.tsx b/desktop/src/features/onboarding/ui/BackupPasswordTimeline.tsx
index 610c104d956..555d6e13655 100644
--- a/desktop/src/features/onboarding/ui/BackupPasswordTimeline.tsx
+++ b/desktop/src/features/onboarding/ui/BackupPasswordTimeline.tsx
@@ -46,6 +46,66 @@ const TIMELINE_BOTTOM_DOT_TRANSITIONS = TIMELINE_CONNECTOR_DOTS.map(
   }),
 );
 
+export function BackupFileUnlockPreview() {
+  const reduceMotion = useReducedMotion() ?? false;
+
+  return (
+    <div
+      aria-hidden
+      className="mx-auto flex w-[min(28rem,calc(100vw-5rem))] flex-col items-center text-foreground/75"
+      data-testid="backup-file-unlock-preview"
+    >
+      <TimelineDots
+        reduceMotion={reduceMotion}
+        transitions={TIMELINE_TOP_DOT_TRANSITIONS}
+      />
+      <div
+        className="flex items-center justify-center gap-2 py-1"
+        data-testid="backup-file-key-dots"
+      >
+        {BACKUP_KEY_DOTS.map((dot) => (
+          <span
+            className="block size-2 rounded-full bg-foreground/85"
+            key={`preview-${dot}`}
+          />
+        ))}
+      </div>
+      <TimelineDots
+        reduceMotion={reduceMotion}
+        transitions={TIMELINE_BOTTOM_DOT_TRANSITIONS}
+      />
+      <LockOpen
+        className="size-9"
+        data-testid="backup-file-unlock-preview-icon"
+      />
+    </div>
+  );
+}
+
+function TimelineDots({
+  reduceMotion,
+  transitions,
+}: {
+  reduceMotion: boolean;
+  transitions: ReadonlyArray<
+    typeof TIMELINE_DOT_TRANSITION & { delay: number }
+  >;
+}) {
+  return (
+    <div className="my-3 flex h-12 flex-col items-center justify-between">
+      {TIMELINE_CONNECTOR_DOTS.map((dot, index) => (
+        <motion.span
+          animate={reduceMotion ? undefined : TIMELINE_DOT_PULSE}
+          className="block size-1.5 rounded-full bg-foreground/65"
+          initial={reduceMotion ? false : TIMELINE_DOT_INITIAL}
+          key={dot}
+          transition={reduceMotion ? undefined : transitions[index]}
+        />
+      ))}
+    </div>
+  );
+}
+
 /**
  * Decorative timeline shared by backup creation and encrypted-backup restore.
  * Backup creation reads key → password → lock; restore reads encrypted file →
diff --git a/desktop/src/features/onboarding/ui/BackupStep.tsx b/desktop/src/features/onboarding/ui/BackupStep.tsx
index 99d9c6324da..2367b9faf98 100644
--- a/desktop/src/features/onboarding/ui/BackupStep.tsx
+++ b/desktop/src/features/onboarding/ui/BackupStep.tsx
@@ -410,29 +410,27 @@ export function BackupStep({
         </div>
       )}
 
-      {created ? (
-        <OnboardingFooter className={REVEAL_ANIMATION_CLASS}>
-          <Button
-            className={ONBOARDING_PRIMARY_CTA_CLASS}
-            data-testid="onboarding-next"
-            disabled={backupNextDisabled()}
-            onClick={onNext}
-            type="button"
-          >
-            Next
-          </Button>
+      <OnboardingFooter className={REVEAL_ANIMATION_CLASS}>
+        <Button
+          className={ONBOARDING_PRIMARY_CTA_CLASS}
+          data-testid="onboarding-next"
+          disabled={!created || backupNextDisabled()}
+          onClick={onNext}
+          type="button"
+        >
+          Next
+        </Button>
 
-          <Button
-            className={ONBOARDING_SECONDARY_CTA_CLASS}
-            data-testid="onboarding-back"
-            onClick={onBack}
-            type="button"
-            variant="ghost"
-          >
-            Back
-          </Button>
-        </OnboardingFooter>
-      ) : null}
+        <Button
+          className={ONBOARDING_SECONDARY_CTA_CLASS}
+          data-testid="onboarding-back"
+          onClick={onBack}
+          type="button"
+          variant="ghost"
+        >
+          Back
+        </Button>
+      </OnboardingFooter>
     </OnboardingSlideTransition>
   );
 }
diff --git a/desktop/src/features/onboarding/ui/IdentityRecoveryPairing.tsx b/desktop/src/features/onboarding/ui/IdentityRecoveryPairing.tsx
new file mode 100644
index 00000000000..5cca7c1bf5e
--- /dev/null
+++ b/desktop/src/features/onboarding/ui/IdentityRecoveryPairing.tsx
@@ -0,0 +1,278 @@
+import * as React from "react";
+import { listen } from "@tauri-apps/api/event";
+import {
+  Check,
+  Copy,
+  LoaderCircle,
+  RefreshCw,
+  ShieldCheck,
+  TriangleAlert,
+  X,
+} from "lucide-react";
+
+import { cancelPairing, confirmPairingSas } from "@/shared/api/tauri";
+import { startIdentityRecoveryPairing } from "@/shared/api/tauriPairing";
+import { writeTextToClipboard } from "@/shared/lib/clipboard";
+import { Button } from "@/shared/ui/button";
+import { StyledQrCode } from "@/shared/ui/styled-qr-code";
+
+type Step = "loading" | "qr" | "sas" | "receiving" | "done" | "error";
+
+// Refresh before the pairing relay's two-minute connection cap so Desktop never
+// leaves a code on screen after its publishing channel has closed.
+const QR_REFRESH_MS = 90_000;
+
+function recoveryErrorMessage(message: string): string {
+  const normalized = message.toLowerCase();
+  if (
+    normalized.includes("sas-confirm") ||
+    normalized.includes("relay connection closed") ||
+    normalized.includes("websocket") ||
+    normalized.includes("expired") ||
+    normalized.includes("timed out")
+  ) {
+    return "This pairing code expired or lost its connection. Create a new code and try again.";
+  }
+  return message;
+}
+
+export function IdentityRecoveryPairing({
+  onRecovered,
+  onStepChange,
+}: {
+  onRecovered: () => Promise<void>;
+  onStepChange?: (step: Step) => void;
+}) {
+  const [step, setStep] = React.useState<Step>("loading");
+  const [qrUri, setQrUri] = React.useState<string | null>(null);
+  const [sas, setSas] = React.useState<string | null>(null);
+  const [error, setError] = React.useState<string | null>(null);
+  const [copied, setCopied] = React.useState(false);
+  const active = React.useRef(true);
+  const copyTimer = React.useRef<number | null>(null);
+
+  React.useEffect(() => {
+    onStepChange?.(step);
+  }, [onStepChange, step]);
+
+  const start = React.useCallback(async () => {
+    active.current = true;
+    setStep("loading");
+    setError(null);
+    setSas(null);
+    setQrUri(null);
+    setCopied(false);
+    try {
+      setQrUri(await startIdentityRecoveryPairing());
+      setStep("qr");
+    } catch (cause) {
+      setError(
+        cause instanceof Error ? cause.message : "Could not start recovery.",
+      );
+      setStep("error");
+    }
+  }, []);
+
+  React.useEffect(() => {
+    void start();
+    const unlisteners: Array<() => void> = [];
+    let disposed = false;
+    listen<{ sas: string }>("pairing-sas-received", ({ payload }) => {
+      if (!disposed && active.current) {
+        setSas(payload.sas);
+        setStep("sas");
+      }
+    }).then((unlisten) => (disposed ? unlisten() : unlisteners.push(unlisten)));
+    listen("pairing-complete", () => {
+      if (!disposed && active.current) {
+        active.current = false;
+        setStep("done");
+        void onRecovered();
+      }
+    }).then((unlisten) => (disposed ? unlisten() : unlisteners.push(unlisten)));
+    listen<{ message: string }>("pairing-error", ({ payload }) => {
+      if (!disposed && active.current) {
+        active.current = false;
+        setError(recoveryErrorMessage(payload.message));
+        setStep("error");
+      }
+    }).then((unlisten) => (disposed ? unlisten() : unlisteners.push(unlisten)));
+    listen<{ reason: string }>("pairing-aborted", ({ payload }) => {
+      if (!disposed && active.current) {
+        active.current = false;
+        setError(`Recovery stopped: ${payload.reason}`);
+        setStep("error");
+      }
+    }).then((unlisten) => (disposed ? unlisten() : unlisteners.push(unlisten)));
+    return () => {
+      disposed = true;
+      active.current = false;
+      for (const unlisten of unlisteners) unlisten();
+      if (copyTimer.current !== null) window.clearTimeout(copyTimer.current);
+      void cancelPairing();
+    };
+  }, [onRecovered, start]);
+
+  React.useEffect(() => {
+    if (step !== "qr") return;
+    const timer = window.setTimeout(() => void start(), QR_REFRESH_MS);
+    return () => window.clearTimeout(timer);
+  }, [start, step]);
+
+  async function copyPairingCode() {
+    if (!qrUri) return;
+    try {
+      await writeTextToClipboard(qrUri);
+      setCopied(true);
+      if (copyTimer.current !== null) window.clearTimeout(copyTimer.current);
+      copyTimer.current = window.setTimeout(() => setCopied(false), 2_000);
+    } catch {
+      setError("Could not copy the pairing code. Try again.");
+    }
+  }
+
+  async function deny() {
+    active.current = false;
+    await cancelPairing().catch(() => {});
+    setError("The codes didn't match. Pairing was canceled.");
+    setStep("error");
+  }
+
+  async function confirm() {
+    setStep("receiving");
+    try {
+      await confirmPairingSas();
+    } catch (cause) {
+      if (!active.current) return;
+      setError(
+        recoveryErrorMessage(
+          cause instanceof Error
+            ? cause.message
+            : "Could not confirm recovery.",
+        ),
+      );
+      setStep("error");
+    }
+  }
+
+  return (
+    <div
+      className="mb-4 flex w-fit max-w-full flex-col items-stretch gap-3 rounded-xl border border-foreground/15 bg-background/55 p-4"
+      data-testid="identity-recovery-pairing"
+    >
+      <div
+        className="flex min-h-[266px] w-[266px] shrink-0 items-center justify-center rounded-lg border border-border/70 bg-white p-3"
+        data-testid="identity-recovery-qr-container"
+      >
+        {step === "qr" && qrUri ? (
+          <StyledQrCode
+            animate
+            centerImageSrc="/app-icon@2x.png"
+            data-testid="identity-recovery-qr"
+            size={240}
+            title="Desktop identity recovery QR code"
+            value={qrUri}
+          />
+        ) : step === "sas" && sas ? (
+          <div className="flex max-w-60 flex-col items-center gap-3 py-2 text-center text-foreground">
+            <ShieldCheck className="h-10 w-10 text-primary" />
+            <p className="text-sm font-medium">
+              Does this code match your phone?
+            </p>
+            <div className="rounded-xl border-2 border-primary/30 bg-primary/5 px-5 py-3">
+              <p
+                className="font-mono text-3xl font-bold tracking-[0.25em]"
+                data-testid="identity-recovery-sas"
+              >
+                {sas.slice(0, 3)} {sas.slice(3)}
+              </p>
+            </div>
+            <p className="text-xs text-muted-foreground">
+              This gives this desktop permanent access to your Buzz identity.
+              Only continue if you trust it.
+            </p>
+            <div className="flex w-full flex-col gap-2">
+              <Button
+                className="flex-1"
+                data-testid="confirm-identity-recovery-sas"
+                onClick={() => void confirm()}
+              >
+                <Check className="mr-1.5 h-4 w-4" />
+                Codes match
+              </Button>
+              <Button
+                className="flex-1"
+                data-testid="deny-identity-recovery-sas"
+                onClick={() => void deny()}
+                variant="outline"
+              >
+                <X className="mr-1.5 h-4 w-4" />
+                Cancel
+              </Button>
+            </div>
+          </div>
+        ) : step === "done" ? (
+          <div className="flex flex-col items-center gap-3 text-foreground">
+            <div className="flex h-12 w-12 items-center justify-center rounded-full bg-green-100 dark:bg-green-900/30">
+              <Check className="h-6 w-6 text-green-600 dark:text-green-400" />
+            </div>
+            <p className="text-sm font-medium">Identity received securely</p>
+          </div>
+        ) : step === "error" ? (
+          <div className="flex max-w-52 flex-col items-center gap-3 text-center text-foreground">
+            <TriangleAlert className="h-6 w-6 text-destructive" />
+            <p className="text-sm text-destructive">{error}</p>
+            <Button onClick={() => void start()} size="sm" variant="outline">
+              <RefreshCw className="mr-1.5 h-4 w-4" />
+              Try again
+            </Button>
+          </div>
+        ) : (
+          <div className="flex flex-col items-center gap-3 text-foreground">
+            <LoaderCircle className="h-6 w-6 animate-spin text-muted-foreground" />
+            <p className="text-sm text-muted-foreground">
+              {step === "receiving"
+                ? "Receiving identity from mobile device..."
+                : "Starting pairing..."}
+            </p>
+          </div>
+        )}
+      </div>
+      {step === "loading" || (step === "qr" && qrUri) ? (
+        <Button
+          className="w-full border-foreground/20 bg-white text-foreground shadow-none hover:bg-black/5"
+          data-testid="copy-identity-recovery-code"
+          disabled={step === "loading"}
+          onClick={() => void copyPairingCode()}
+          size="sm"
+          type="button"
+          variant="outline"
+        >
+          {step === "loading" ? (
+            <LoaderCircle className="mr-1.5 h-4 w-4 animate-spin" />
+          ) : copied ? (
+            <Check className="mr-1.5 h-4 w-4" />
+          ) : (
+            <Copy className="mr-1.5 h-4 w-4" />
+          )}
+          {step === "loading"
+            ? "Generating pairing code..."
+            : copied
+              ? "Copied"
+              : "Copy pairing code"}
+        </Button>
+      ) : null}
+      {step === "qr" && error ? (
+        <p className="max-w-[266px] text-center text-xs text-destructive">
+          {error}
+        </p>
+      ) : null}
+      {step === "qr" || step === "loading" ? (
+        <p className="max-w-[266px] text-sm leading-5 text-foreground/75">
+          On your phone, open Settings → Send identity to desktop. This code
+          expires shortly and works once.
+        </p>
+      ) : null}
+    </div>
+  );
+}
diff --git a/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx b/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx
index 693d1af0584..c0cc2d8f795 100644
--- a/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx
+++ b/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx
@@ -10,6 +10,12 @@ import {
 } from "@/shared/api/tauriIdentity";
 import type { IdentityStorage } from "@/shared/api/types";
 import { Button } from "@/shared/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogTitle,
+} from "@/shared/ui/dialog";
 import { StartupWindowDragRegion } from "@/shared/ui/StartupWindowDragRegion";
 import { BackupStep } from "./BackupStep";
 import { DefaultConfigStep } from "./DefaultConfigStep";
@@ -20,12 +26,14 @@ import {
   useEncryptedBackupSession,
 } from "./EncryptedBackupCreator";
 import { IdentityKeyHelpDialog } from "./IdentityKeyHelpDialog";
+import { IdentityRecoveryPairing } from "./IdentityRecoveryPairing";
 import { LandingBees } from "./LandingBees";
 import {
   NostrKeyImportForm,
   type NostrKeyImportStage,
 } from "./NostrKeyImportForm";
 import {
+  ONBOARDING_INK_ICON_CLASS,
   ONBOARDING_LANDING_CTA_CLASS,
   ONBOARDING_SECONDARY_CTA_CLASS,
   OnboardingChrome,
@@ -53,6 +61,7 @@ export type PostOnboardingNavigation = {
 export function MachineOnboardingFlow({
   complete,
   continueWithIdentity,
+  continueWithRecoveredIdentity,
   identityLost,
   initialPage,
   queryClient,
@@ -60,6 +69,7 @@ export function MachineOnboardingFlow({
 }: {
   complete: (pubkey?: string) => void;
   continueWithIdentity: (pubkey: string) => void;
+  continueWithRecoveredIdentity: (pubkey: string) => void;
   identityLost: boolean;
   initialPage?: MachineOnboardingPage;
   queryClient: QueryClient;
@@ -79,6 +89,10 @@ export function MachineOnboardingFlow({
   const [identityWasImported, setIdentityWasImported] = React.useState(false);
   const [keyImportStage, setKeyImportStage] =
     React.useState<NostrKeyImportStage>("key-entry");
+  const [keyImportDialog, setKeyImportDialog] = React.useState<
+    "backup" | "phone" | null
+  >(null);
+  const [phoneRecoveryStep, setPhoneRecoveryStep] = React.useState("loading");
   const [selectedPubkey, setSelectedPubkey] = React.useState<string | null>(
     null,
   );
@@ -128,6 +142,26 @@ export function MachineOnboardingFlow({
     }
   }, [queryClient]);
 
+  const loadRecoveredIdentity = React.useCallback(async () => {
+    setIsPending(true);
+    setError(null);
+    try {
+      const identity = await getIdentity();
+      continueWithRecoveredIdentity(identity.pubkey);
+      queryClient.setQueryData(["identity"], identity);
+      setIdentityWasImported(true);
+      setSelectedPubkey(identity.pubkey);
+      setIdentityStorage(identity.storage);
+      setPage("setup");
+    } catch (cause) {
+      setError(
+        cause instanceof Error ? cause.message : "Failed to load identity",
+      );
+    } finally {
+      setIsPending(false);
+    }
+  }, [continueWithRecoveredIdentity, queryClient]);
+
   const replaceLostIdentity = React.useCallback(async () => {
     const confirmed = window.confirm(
       "This will create a new identity and abandon your previous key. This cannot be undone. Continue?",
@@ -243,6 +277,7 @@ export function MachineOnboardingFlow({
                   className={`${ONBOARDING_SECONDARY_CTA_CLASS} px-5`}
                   disabled={isPending}
                   onClick={() => {
+                    setKeyImportDialog(null);
                     setKeyImportStage("key-entry");
                     setPage("key-import");
                   }}
@@ -265,7 +300,7 @@ export function MachineOnboardingFlow({
             >
               <motion.div
                 animate={{ opacity: 1, y: 0 }}
-                className="shrink-0"
+                className="relative z-10 shrink-0"
                 initial={reduceMotion ? false : { opacity: 0, y: 10 }}
                 key={keyImportStage}
                 transition={{
@@ -276,31 +311,132 @@ export function MachineOnboardingFlow({
                 <h1 className="text-title font-normal text-foreground">
                   {keyImportStage === "backup-password"
                     ? "Unlock your account"
-                    : identityLost
-                      ? "Re-import your key"
-                      : "Enter your private key"}
+                    : "Enter your private key"}
                 </h1>
-                <p className="mt-5 max-w-[440px] text-sm leading-6 text-foreground/80">
-                  {keyImportStage === "backup-password"
-                    ? "Enter your backup password to unlock your key and restore your identity."
-                    : identityLost
-                      ? "Your identity is no longer in the system keyring. Re-import your nsec to restore it."
-                      : "If you already have a Buzz account, enter your private key below to get started."}
-                </p>
+                <div className="mt-5 max-w-[440px] text-sm leading-6 text-foreground/80">
+                  {keyImportStage === "backup-password" ? (
+                    "Enter your backup password to restore your identity."
+                  ) : (
+                    <p>
+                      Paste your private key to sign in to Buzz. You can also
+                      use a{" "}
+                      <button
+                        className="rounded-sm font-medium underline decoration-foreground/40 underline-offset-4 transition-colors hover:decoration-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-60"
+                        data-testid="nostr-import-file-button"
+                        disabled={isPending}
+                        onClick={() => setKeyImportDialog("backup")}
+                        type="button"
+                      >
+                        backup file
+                      </button>
+                      , or{" "}
+                      <button
+                        className="rounded-sm font-medium underline decoration-foreground/40 underline-offset-4 transition-colors hover:decoration-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-60"
+                        data-testid="nostr-import-phone-link"
+                        disabled={isPending}
+                        onClick={() => setKeyImportDialog("phone")}
+                        type="button"
+                      >
+                        recover from your phone
+                      </button>
+                      .
+                    </p>
+                  )}
+                </div>
               </motion.div>
               <div className="buzz-onboarding-key-import-position w-full">
-                <NostrKeyImportForm
-                  backLabel={identityLost ? "Start new identity" : "Back"}
-                  onBack={
-                    identityLost
-                      ? () => void replaceLostIdentity()
-                      : () => setPage("identity")
-                  }
-                  onImport={importExistingIdentity}
-                  onStageChange={setKeyImportStage}
-                  variant="spotlight"
-                />
+                <div className="flex flex-col items-center">
+                  <NostrKeyImportForm
+                    backLabel="Back"
+                    onBack={() => {
+                      setKeyImportStage("key-entry");
+                      if (identityLost) {
+                        return;
+                      }
+                      setPage("identity");
+                    }}
+                    onImport={importExistingIdentity}
+                    onStageChange={setKeyImportStage}
+                    showBack={!identityLost}
+                    variant="spotlight"
+                  />
+                  {identityLost && keyImportStage === "key-entry" ? (
+                    <Button
+                      className={`${ONBOARDING_SECONDARY_CTA_CLASS} mt-2 px-5`}
+                      onClick={() => void replaceLostIdentity()}
+                      type="button"
+                      variant="ghost"
+                    >
+                      Start new identity
+                    </Button>
+                  ) : null}
+                </div>
               </div>
+              <Dialog
+                onOpenChange={(open) => {
+                  if (!open) setKeyImportDialog(null);
+                }}
+                open={keyImportDialog === "backup"}
+              >
+                <DialogContent
+                  className="buzz-onboarding-neutral-theme max-w-[47.5rem] -translate-y-5"
+                  closeButtonClassName={ONBOARDING_INK_ICON_CLASS}
+                  data-system-color-scheme="light"
+                  data-testid="backup-recovery-dialog"
+                  surface="textured"
+                >
+                  <div className="mx-auto w-full max-w-[35rem] pb-6 pt-10 text-center max-sm:pb-4 max-sm:pt-6">
+                    <DialogTitle className="text-balance px-8 text-3xl font-normal text-foreground">
+                      Restore from a backup file
+                    </DialogTitle>
+                    <DialogDescription className="mx-auto mt-4 max-w-[28rem] text-sm leading-6 text-foreground/80">
+                      Choose the encrypted backup file you saved from Buzz.
+                    </DialogDescription>
+                    <NostrKeyImportForm
+                      footerMode="inline"
+                      mode="backup"
+                      onBack={() => setKeyImportDialog(null)}
+                      onImport={importExistingIdentity}
+                      showBack={false}
+                      variant="spotlight"
+                    />
+                  </div>
+                </DialogContent>
+              </Dialog>
+              <Dialog
+                onOpenChange={(open) => {
+                  if (!open) setKeyImportDialog(null);
+                }}
+                open={keyImportDialog === "phone"}
+              >
+                <DialogContent
+                  className="buzz-onboarding-neutral-theme max-h-[calc(100dvh-2rem)] max-w-[47.5rem] -translate-y-5 overflow-y-auto"
+                  closeButtonClassName={ONBOARDING_INK_ICON_CLASS}
+                  data-system-color-scheme="light"
+                  data-testid="phone-recovery-dialog"
+                  surface="textured"
+                >
+                  <div className="mx-auto flex w-full max-w-[35rem] flex-col items-center pb-6 pt-8 text-center max-sm:pb-4 max-sm:pt-4">
+                    <DialogTitle className="text-balance px-8 text-3xl font-normal text-foreground">
+                      {identityLost
+                        ? "Recover from your phone"
+                        : "Use your Buzz identity"}
+                    </DialogTitle>
+                    <DialogDescription className="mt-4 text-sm leading-6 text-foreground/80">
+                      {phoneRecoveryStep === "loading" ||
+                      phoneRecoveryStep === "qr"
+                        ? "Scan this code with a signed-in Buzz phone."
+                        : "Confirm the code before sharing your identity."}
+                    </DialogDescription>
+                    <div className="mt-5">
+                      <IdentityRecoveryPairing
+                        onRecovered={loadRecoveredIdentity}
+                        onStepChange={setPhoneRecoveryStep}
+                      />
+                    </div>
+                  </div>
+                </DialogContent>
+              </Dialog>
             </OnboardingSlideTransition>
           ) : page === "backup" ? (
             backupSubview === "password" ? (
diff --git a/desktop/src/features/onboarding/ui/NostrKeyImportForm.tsx b/desktop/src/features/onboarding/ui/NostrKeyImportForm.tsx
index 59e5bfdb0b4..a424236eb69 100644
--- a/desktop/src/features/onboarding/ui/NostrKeyImportForm.tsx
+++ b/desktop/src/features/onboarding/ui/NostrKeyImportForm.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Check, Eye, EyeOff, KeyRound } from "lucide-react";
+import { Check, Eye, EyeOff, FileKey2, KeyRound } from "lucide-react";
 
 import { cn } from "@/shared/lib/cn";
 import { nsecToNpub } from "@/shared/lib/nostrUtils";
@@ -16,7 +16,10 @@ import {
   ONBOARDING_PRIMARY_CTA_CLASS,
   ONBOARDING_SECONDARY_CTA_CLASS,
 } from "./OnboardingChrome";
-import { BackupPasswordTimeline } from "./BackupPasswordTimeline";
+import {
+  BackupFileUnlockPreview,
+  BackupPasswordTimeline,
+} from "./BackupPasswordTimeline";
 import { OnboardingFooter } from "./OnboardingFooter";
 
 const NOSTR_KEY_FILE_MAX_BYTES = 1024;
@@ -30,6 +33,11 @@ type NostrKeyImportFormProps = {
   onBack: () => void;
   onImport: (nsec: string, password?: string) => Promise<void>;
   onStageChange?: (stage: NostrKeyImportStage) => void;
+  showBack?: boolean;
+  /** Restrict this instance to selecting a backup file instead of typing a key. */
+  mode?: "key" | "backup";
+  /** Dialogs keep their actions inside the surface instead of the onboarding dock. */
+  footerMode?: "onboarding" | "inline";
   /** "spotlight" is the first-launch treatment: glowy centered input, no drop zone, pill buttons. */
   variant?: "default" | "spotlight";
 };
@@ -48,6 +56,9 @@ export function NostrKeyImportForm({
   onBack,
   onImport,
   onStageChange,
+  showBack = true,
+  mode = "key",
+  footerMode = "onboarding",
   variant = "default",
 }: NostrKeyImportFormProps) {
   const [nsecInput, setNsecInput] = React.useState("");
@@ -55,6 +66,7 @@ export function NostrKeyImportForm({
   const [isImporting, setIsImporting] = React.useState(false);
   const [importError, setImportError] = React.useState<string | null>(null);
   const [isDragging, setIsDragging] = React.useState(false);
+  const dragDepthRef = React.useRef(0);
   const [isRevealed, setIsRevealed] = React.useState(false);
   const inputRef = React.useRef<HTMLInputElement | null>(null);
   const passphraseInputRef = React.useRef<HTMLInputElement | null>(null);
@@ -89,6 +101,7 @@ export function NostrKeyImportForm({
     previewNpub === null &&
     trimmedInput.length >= 5;
   const errorMessage = importError ?? externalErrorMessage;
+  const Footer = footerMode === "inline" ? "div" : OnboardingFooter;
 
   React.useLayoutEffect(() => {
     if (isPasswordStage) {
@@ -102,6 +115,39 @@ export function NostrKeyImportForm({
     onStageChange?.(isPasswordStage ? "backup-password" : "key-entry");
   }, [isPasswordStage, onStageChange]);
 
+  React.useEffect(() => {
+    if (mode !== "backup" || isPasswordStage || isInteractionDisabled) {
+      dragDepthRef.current = 0;
+      setIsDragging(false);
+      return;
+    }
+
+    const handleDragEnter = (event: DragEvent) => {
+      if (!event.dataTransfer?.types.includes("Files")) return;
+      dragDepthRef.current += 1;
+      setIsDragging(true);
+    };
+    const handleDragLeave = () => {
+      dragDepthRef.current = Math.max(0, dragDepthRef.current - 1);
+      if (dragDepthRef.current === 0) setIsDragging(false);
+    };
+    const handleDragEnd = () => {
+      dragDepthRef.current = 0;
+      setIsDragging(false);
+    };
+
+    window.addEventListener("dragenter", handleDragEnter);
+    window.addEventListener("dragleave", handleDragLeave);
+    window.addEventListener("drop", handleDragEnd);
+    window.addEventListener("dragend", handleDragEnd);
+    return () => {
+      window.removeEventListener("dragenter", handleDragEnter);
+      window.removeEventListener("dragleave", handleDragLeave);
+      window.removeEventListener("drop", handleDragEnd);
+      window.removeEventListener("dragend", handleDragEnd);
+    };
+  }, [isInteractionDisabled, isPasswordStage, mode]);
+
   const openFilePicker = React.useCallback(() => {
     if (isInteractionDisabled) {
       return;
@@ -194,12 +240,27 @@ export function NostrKeyImportForm({
   return (
     <form
       className="mt-8 flex w-full flex-col gap-4"
+      onDragOver={(event) => {
+        if (mode !== "backup" || isPasswordStage) return;
+        event.preventDefault();
+        if (!isInteractionDisabled) {
+          event.dataTransfer.dropEffect = "copy";
+        }
+      }}
+      onDrop={(event) => {
+        if (mode !== "backup" || isPasswordStage) return;
+        event.preventDefault();
+        setIsDragging(false);
+        if (!isInteractionDisabled) {
+          void handleFiles(event.dataTransfer.files);
+        }
+      }}
       onSubmit={(event) => {
         event.preventDefault();
         void handleSubmit();
       }}
     >
-      {!isPasswordStage ? (
+      {!isPasswordStage && mode === "key" ? (
         <div className="space-y-1.5 text-left">
           <label
             className={cn(
@@ -286,37 +347,61 @@ export function NostrKeyImportForm({
       {/* Hidden file input shared by both variants: the default drop zone and
           the spotlight "Choose a backup file" button both open it. Accepts the
           .ncryptsec backups our own save flow emits alongside raw .key files. */}
-      <input
-        accept=".key,.ncryptsec,text/plain"
-        className="sr-only"
-        data-testid="nostr-import-file-input"
-        disabled={isInteractionDisabled}
-        onChange={(event) => {
-          void handleFiles(event.currentTarget.files);
-          event.currentTarget.value = "";
-        }}
-        ref={fileInputRef}
-        tabIndex={-1}
-        type="file"
-      />
-
-      {!isPasswordStage && variant === "spotlight" ? (
-        // First-launch/wiped-identity treatment: no drop zone, but the file
-        // path must still exist — a backup saved through the OS dialog is
-        // exactly what a wiped user returns with.
-        <div className="mt-2 text-center">
-          <Button
-            className={ONBOARDING_SECONDARY_CTA_CLASS}
-            data-testid="nostr-import-file-button"
-            disabled={isInteractionDisabled}
-            onClick={openFilePicker}
-            type="button"
-            variant="ghost"
+      {mode === "backup" || variant !== "spotlight" ? (
+        <input
+          accept=".key,.ncryptsec,text/plain"
+          className="sr-only"
+          data-testid="nostr-import-file-input"
+          disabled={isInteractionDisabled}
+          id={
+            mode === "backup"
+              ? "nostr-import-backup-file-input"
+              : "nostr-import-file-input"
+          }
+          onChange={(event) => {
+            void handleFiles(event.currentTarget.files);
+            event.currentTarget.value = "";
+          }}
+          ref={fileInputRef}
+          tabIndex={-1}
+          type="file"
+        />
+      ) : null}
+
+      {!isPasswordStage && mode === "backup" ? (
+        <>
+          <div
+            className="mx-auto flex h-[312px] w-full max-w-[500px] flex-col items-center justify-center gap-4 [@media(max-height:40rem)]:h-auto"
+            data-testid="nostr-import-backup-file-section"
           >
-            Choose a backup file
-          </Button>
-        </div>
-      ) : !isPasswordStage ? (
+            <Button
+              className="h-9 rounded-full px-6"
+              data-testid="nostr-import-backup-picker"
+              disabled={isInteractionDisabled}
+              onClick={openFilePicker}
+              type="button"
+            >
+              <FileKey2 aria-hidden="true" className="mr-2 size-4" />
+              Choose a backup file
+            </Button>
+            <BackupFileUnlockPreview />
+          </div>
+          {isDragging ? (
+            <fieldset
+              className="absolute inset-[var(--buzz-card-textured-safe-inset)] z-10 flex items-center justify-center rounded-2xl border-2 border-dashed border-primary/60 bg-background/80 backdrop-blur-sm"
+              data-dragging="true"
+              data-testid="nostr-import-backup-drop"
+            >
+              <span className="flex items-center gap-2 rounded-full bg-foreground px-4 py-2 text-sm font-semibold text-background shadow-sm ring-1 ring-background/15">
+                <KeyRound aria-hidden="true" className="size-4" />
+                <span>Drop your backup file here</span>
+              </span>
+            </fieldset>
+          ) : null}
+        </>
+      ) : null}
+
+      {!isPasswordStage && mode === "key" && variant !== "spotlight" ? (
         <button
           className={cn(
             "relative flex h-[120px] flex-col items-center justify-center gap-3 overflow-hidden rounded-xl border border-transparent bg-muted text-foreground transition-[background-color,border-color,box-shadow,color] duration-[250ms] ease-out hover:bg-muted/80 disabled:opacity-60",
@@ -490,45 +575,58 @@ export function NostrKeyImportForm({
         </div>
       ) : null}
 
-      <OnboardingFooter>
-        <Button
-          className={
-            // Only the spotlight (onboarding) treatment gets the docked pill CTA.
-            // The default variant renders outside the onboarding footer provider
-            // (e.g. KeyringLockedScreen) and must stay full-width to match its
-            // sibling Back button.
-            variant === "spotlight"
-              ? ONBOARDING_PRIMARY_CTA_CLASS
-              : "h-10 w-full"
-          }
-          data-testid="nostr-import-submit"
-          disabled={!isValid || isInteractionDisabled}
-          onClick={() => void handleSubmit()}
-          type="button"
-        >
-          {isImporting ? (
-            <Spinner aria-label="Importing key" className="h-4 w-4 border-2" />
-          ) : variant === "spotlight" ? (
-            "Next"
-          ) : (
-            "Continue with this key"
-          )}
-        </Button>
+      <Footer
+        className={
+          footerMode === "inline"
+            ? "mt-6 flex flex-col items-center gap-2"
+            : undefined
+        }
+      >
+        {mode === "key" || isPasswordStage ? (
+          <Button
+            className={
+              // Only the spotlight (onboarding) treatment gets the docked pill CTA.
+              // The default variant renders outside the onboarding footer provider
+              // (e.g. KeyringLockedScreen) and must stay full-width to match its
+              // sibling Back button.
+              variant === "spotlight"
+                ? ONBOARDING_PRIMARY_CTA_CLASS
+                : "h-10 w-full"
+            }
+            data-testid="nostr-import-submit"
+            disabled={!isValid || isInteractionDisabled}
+            onClick={() => void handleSubmit()}
+            type="button"
+          >
+            {isImporting ? (
+              <Spinner
+                aria-label="Importing key"
+                className="h-4 w-4 border-2"
+              />
+            ) : variant === "spotlight" ? (
+              "Next"
+            ) : (
+              "Continue with this key"
+            )}
+          </Button>
+        ) : null}
 
-        <Button
-          className={
-            variant === "spotlight"
-              ? ONBOARDING_SECONDARY_CTA_CLASS
-              : "h-10 w-full text-muted-foreground hover:text-accent-foreground"
-          }
-          disabled={isImporting}
-          onClick={handleBack}
-          type="button"
-          variant="ghost"
-        >
-          {isPasswordStage ? "Back" : backLabel}
-        </Button>
-      </OnboardingFooter>
+        {showBack || isPasswordStage ? (
+          <Button
+            className={
+              variant === "spotlight"
+                ? ONBOARDING_SECONDARY_CTA_CLASS
+                : "h-10 w-full text-muted-foreground hover:text-accent-foreground"
+            }
+            disabled={isImporting}
+            onClick={handleBack}
+            type="button"
+            variant="ghost"
+          >
+            {isPasswordStage ? "Back" : backLabel}
+          </Button>
+        ) : null}
+      </Footer>
     </form>
   );
 }
diff --git a/desktop/src/features/profile/lib/selfProfileStorage.ts b/desktop/src/features/profile/lib/selfProfileStorage.ts
index dbc4f887609..02e083ae1d4 100644
--- a/desktop/src/features/profile/lib/selfProfileStorage.ts
+++ b/desktop/src/features/profile/lib/selfProfileStorage.ts
@@ -11,16 +11,10 @@
  * prevents one community's cached identity from bleeding into another.
  */
 
-const STORAGE_KEY_PREFIX = "buzz-self-profile.v1";
+export { normalizeRelayUrl } from "@/shared/lib/normalizeRelayUrl";
+import { normalizeRelayUrl } from "@/shared/lib/normalizeRelayUrl";
 
-/**
- * Normalizes a relay URL for use in storage keys.
- * Trim, strip trailing slashes, lowercase — ensures equivalent URLs map to
- * the same key regardless of formatting differences.
- */
-export function normalizeRelayUrl(relayUrl: string): string {
-  return relayUrl.trim().replace(/\/+$/, "").toLowerCase();
-}
+const STORAGE_KEY_PREFIX = "buzz-self-profile.v1";
 
 /**
  * Dispatched on window after a successful writeSelfProfileCache so that any
diff --git a/desktop/src/features/profile/ui/MaskedAvatarBadgeFrame.tsx b/desktop/src/features/profile/ui/MaskedAvatarBadgeFrame.tsx
index 294a87e5e26..ea6e2344932 100644
--- a/desktop/src/features/profile/ui/MaskedAvatarBadgeFrame.tsx
+++ b/desktop/src/features/profile/ui/MaskedAvatarBadgeFrame.tsx
@@ -43,12 +43,14 @@ type BadgeMotionTarget = {
 type MaskedAvatarBadgeFrameProps = {
   badge?: React.ReactNode;
   badgeBox?: AvatarBadgeBox;
+  badgeClassName?: string;
   children: React.ReactNode;
   className?: string;
   clipTestId?: string;
   cornerRadius?: number;
   curve?: AvatarBadgeCurve;
   cutout?: AvatarBadgeCircle;
+  cutoutWidth?: number;
   maskMode?: "clip-path" | "radial";
   maskTransition?: React.ComponentProps<typeof motion.path>["transition"];
   size: number;
@@ -323,6 +325,30 @@ function sampleArc(
   );
 }
 
+function sampleStableOuterBoundary(
+  avatar: AvatarBadgeCircle,
+  startAngle: number,
+  endAngle: number,
+  direction: 1 | -1,
+  largeArc: boolean,
+  segments: number,
+) {
+  const outerBoundary = { ...avatar, r: avatar.r * 4 };
+
+  return [
+    getPointOnCircle(outerBoundary, startAngle),
+    ...sampleArc(
+      outerBoundary,
+      startAngle,
+      endAngle,
+      direction,
+      largeArc,
+      segments - 2,
+    ),
+    getPointOnCircle(avatar, endAngle),
+  ];
+}
+
 function toPolygonPoint(point: Point, size: number) {
   return `${toPercent(point.x / size)} ${toPercent(point.y / size)}`;
 }
@@ -331,6 +357,7 @@ function getRoundedAvatarMaskPolygon(
   size: number,
   cutout: AvatarBadgeCircle,
   curve?: AvatarBadgeCurve,
+  stabilizeOuterBoundary = false,
 ) {
   const {
     avatar,
@@ -361,14 +388,23 @@ function getRoundedAvatarMaskPolygon(
       avatarUpper,
       12,
     ),
-    ...sampleArc(
-      avatar,
-      getAngle(avatar, avatarUpper),
-      getAngle(avatar, avatarLower),
-      -1,
-      true,
-      96,
-    ),
+    ...(stabilizeOuterBoundary
+      ? sampleStableOuterBoundary(
+          avatar,
+          getAngle(avatar, avatarUpper),
+          getAngle(avatar, avatarLower),
+          -1,
+          true,
+          96,
+        )
+      : sampleArc(
+          avatar,
+          getAngle(avatar, avatarUpper),
+          getAngle(avatar, avatarLower),
+          -1,
+          true,
+          96,
+        )),
     ...sampleCubic(
       avatarLower,
       getControlPoint(avatarLower, lowerAvatarTangent, lowerHandleLength),
@@ -389,6 +425,141 @@ function getRoundedAvatarMaskPolygon(
   return `polygon(${points.map((point) => toPolygonPoint(point, size)).join(", ")})`;
 }
 
+function getRoundedAvatarCapsuleMaskPolygon(
+  size: number,
+  cutout: AvatarBadgeCircle,
+  cutoutWidth: number,
+  curve?: AvatarBadgeCurve,
+  stabilizeOuterBoundary = false,
+) {
+  const resolvedCurve = { ...DEFAULT_AVATAR_BADGE_CURVE, ...curve };
+  const avatar = {
+    cx: size / 2,
+    cy: size / 2,
+    r: size / 2,
+  };
+  const straightHalfWidth = Math.max(0, cutoutWidth / 2 - cutout.r);
+  const leftCap = {
+    cx: cutout.cx - straightHalfWidth,
+    cy: cutout.cy,
+    r: cutout.r,
+  };
+  const rightCap = {
+    cx: cutout.cx + straightHalfWidth,
+    cy: cutout.cy,
+    r: cutout.r,
+  };
+  const leftIntersection = getCircleIntersections(avatar, leftCap).reduce(
+    (leftmost, point) => (point.x < leftmost.x ? point : leftmost),
+  );
+  const rightIntersection = getCircleIntersections(avatar, rightCap).reduce(
+    (rightmost, point) => (point.x > rightmost.x ? point : rightmost),
+  );
+  const cutoutRoundingAngle = Math.min(
+    resolvedCurve.cutoutRoundingMaxAngle,
+    Math.max(
+      resolvedCurve.cutoutRoundingMinAngle,
+      resolvedCurve.cutoutRoundingLength / cutout.r,
+    ),
+  );
+  const avatarLeft = getPointOnCircle(
+    avatar,
+    getAngle(avatar, leftIntersection) + resolvedCurve.avatarRoundingAngle,
+  );
+  const avatarRight = getPointOnCircle(
+    avatar,
+    getAngle(avatar, rightIntersection) - resolvedCurve.avatarRoundingAngle,
+  );
+  const cutoutLeft = getPointOnCircle(
+    leftCap,
+    getAngle(leftCap, leftIntersection) + cutoutRoundingAngle,
+  );
+  const cutoutRight = getPointOnCircle(
+    rightCap,
+    getAngle(rightCap, rightIntersection) - cutoutRoundingAngle,
+  );
+  const leftHandleLength = Math.min(
+    cutout.r * resolvedCurve.handleLengthRatio,
+    getDistance(cutoutLeft, avatarLeft) * resolvedCurve.handleDistanceRatio,
+  );
+  const rightHandleLength = Math.min(
+    cutout.r * resolvedCurve.handleLengthRatio,
+    getDistance(avatarRight, cutoutRight) * resolvedCurve.handleDistanceRatio,
+  );
+  const cutoutLeftTangent = getTangent(getAngle(leftCap, cutoutLeft), -1);
+  const avatarLeftTangent = getTangent(getAngle(avatar, avatarLeft), 1);
+  const avatarRightTangent = getTangent(getAngle(avatar, avatarRight), 1);
+  const cutoutRightTangent = getTangent(getAngle(rightCap, cutoutRight), -1);
+  const points = [
+    cutoutLeft,
+    ...sampleCubic(
+      cutoutLeft,
+      getControlPoint(cutoutLeft, cutoutLeftTangent, leftHandleLength),
+      getControlPoint(avatarLeft, avatarLeftTangent, -leftHandleLength),
+      avatarLeft,
+      12,
+    ),
+    ...(stabilizeOuterBoundary
+      ? sampleStableOuterBoundary(
+          avatar,
+          getAngle(avatar, avatarLeft),
+          getAngle(avatar, avatarRight),
+          1,
+          true,
+          96,
+        )
+      : sampleArc(
+          avatar,
+          getAngle(avatar, avatarLeft),
+          getAngle(avatar, avatarRight),
+          1,
+          true,
+          96,
+        )),
+    ...sampleCubic(
+      avatarRight,
+      getControlPoint(avatarRight, avatarRightTangent, rightHandleLength),
+      getControlPoint(cutoutRight, cutoutRightTangent, -rightHandleLength),
+      cutoutRight,
+      12,
+    ),
+    ...sampleArc(
+      rightCap,
+      getAngle(rightCap, cutoutRight),
+      -Math.PI / 2,
+      -1,
+      false,
+      12,
+    ),
+    { x: leftCap.cx, y: cutout.cy - cutout.r },
+    ...sampleArc(
+      leftCap,
+      -Math.PI / 2,
+      getAngle(leftCap, cutoutLeft),
+      -1,
+      false,
+      11,
+    ),
+  ];
+
+  // Keep the capsule contour aligned with the circular status cutout's point
+  // order. Matching like-for-like edges prevents the polygon from folding
+  // across the avatar while Motion interpolates between the two shapes.
+  const joinSegments = 12;
+  const outerSegments = 96;
+  const outerEndIndex = joinSegments + outerSegments;
+  const rightJoinEndIndex = joinSegments * 2 + outerSegments;
+  const alignedPoints = [
+    points[rightJoinEndIndex],
+    ...points.slice(outerEndIndex, rightJoinEndIndex).reverse(),
+    ...points.slice(joinSegments, outerEndIndex).reverse(),
+    ...points.slice(0, joinSegments).reverse(),
+    ...points.slice(rightJoinEndIndex + 1).reverse(),
+  ];
+
+  return `polygon(${alignedPoints.map((point) => toPolygonPoint(point, size)).join(", ")})`;
+}
+
 function getRoundedSquareMaskPolygon(
   size: number,
   cornerRadius: number,
@@ -488,20 +659,36 @@ function getRoundedSquareMaskPolygon(
 export function MaskedAvatarBadgeFrame({
   badge,
   badgeBox,
+  badgeClassName,
   children,
   className,
   clipTestId,
   cornerRadius,
   curve,
   cutout,
+  cutoutWidth,
   maskMode = "clip-path",
   maskTransition,
   size,
 }: MaskedAvatarBadgeFrameProps) {
   const shouldMask = Boolean(badge && badgeBox && cutout);
+  const stabilizeOuterBoundary = Boolean(maskTransition);
   const maskPolygon = cutout
     ? cornerRadius === undefined
-      ? getRoundedAvatarMaskPolygon(size, cutout, curve)
+      ? cutoutWidth && cutoutWidth > cutout.r * 2
+        ? getRoundedAvatarCapsuleMaskPolygon(
+            size,
+            cutout,
+            cutoutWidth,
+            curve,
+            stabilizeOuterBoundary,
+          )
+        : getRoundedAvatarMaskPolygon(
+            size,
+            cutout,
+            curve,
+            stabilizeOuterBoundary,
+          )
       : getRoundedSquareMaskPolygon(size, cornerRadius, cutout, curve)
     : undefined;
   const radialMask =
@@ -539,10 +726,18 @@ export function MaskedAvatarBadgeFrame({
         data-testid={clipTestId}
         initial={false}
         style={{
-          WebkitClipPath: radialMask ? undefined : maskPolygon,
+          // WebKit otherwise applies the prefixed path immediately while the
+          // unprefixed path is still animating, which briefly tears the avatar.
+          WebkitClipPath:
+            radialMask || maskTransition ? undefined : maskPolygon,
           WebkitMaskImage: radialMask,
+          backfaceVisibility:
+            maskTransition && !radialMask ? "hidden" : undefined,
           clipPath: radialMask ? undefined : maskPolygon,
           maskImage: radialMask,
+          transform:
+            maskTransition && !radialMask ? "translateZ(0)" : undefined,
+          willChange: maskTransition && !radialMask ? "clip-path" : undefined,
         }}
         transition={maskTransition}
       >
@@ -551,7 +746,10 @@ export function MaskedAvatarBadgeFrame({
 
       <motion.span
         animate={maskTransition ? badgeMotionTarget : undefined}
-        className="absolute z-20 flex items-center justify-center rounded-full"
+        className={cn(
+          "absolute z-20 flex items-center justify-center rounded-full",
+          badgeClassName,
+        )}
         initial={false}
         style={badgeStyle}
         transition={maskTransition}
diff --git a/desktop/src/features/profile/ui/UserProfilePrimaryActions.tsx b/desktop/src/features/profile/ui/UserProfilePrimaryActions.tsx
index f03635ff18e..254b556e86f 100644
--- a/desktop/src/features/profile/ui/UserProfilePrimaryActions.tsx
+++ b/desktop/src/features/profile/ui/UserProfilePrimaryActions.tsx
@@ -108,7 +108,7 @@ export function ProfilePrimaryActions({
         <ProfileQuickAction
           disabled={agentActionDisabled}
           icon={RefreshCw}
-          label="Restart"
+          label="Restart Agent"
           onClick={onAgentRestart}
           testId="user-profile-agent-restart"
         />
@@ -143,7 +143,7 @@ export function ProfilePersonaPrimaryActions({
       <ProfileQuickAction
         disabled={disabled}
         icon={Play}
-        label="Start agent"
+        label="Start Agent"
         onClick={onStartAgent}
         testId="user-profile-start-agent"
       />
diff --git a/desktop/src/features/projects/hooks.ts b/desktop/src/features/projects/hooks.ts
index f6e5d2f1b0a..8591430cc22 100644
--- a/desktop/src/features/projects/hooks.ts
+++ b/desktop/src/features/projects/hooks.ts
@@ -62,6 +62,7 @@ import {
 } from "./projectModels";
 import {
   buildProjectsFromFetcher,
+  type FetchProjectEventsExhaustively,
   fetchProjectEventsExhaustively,
 } from "./projectEnumeration";
 import { projectMatchesRouteId } from "./projectRoutes";
@@ -163,9 +164,7 @@ export function eventToProject(
 }
 
 export async function fetchProjects(
-  fetchExhaustively: (
-    kinds: number[],
-  ) => Promise<RelayEvent[]> = fetchProjectEventsExhaustively,
+  fetchExhaustively: FetchProjectEventsExhaustively = fetchProjectEventsExhaustively,
 ): Promise<Project[]> {
   // Delegates to `buildProjectsFromFetcher` in `projectEnumeration.ts`, which
   // is the pure, Tauri-free core of this operation. That helper's javadoc
diff --git a/desktop/src/features/projects/lib/projectCloneUrl.test.mjs b/desktop/src/features/projects/lib/projectCloneUrl.test.mjs
index cc00d5f6311..e9e13f56f50 100644
--- a/desktop/src/features/projects/lib/projectCloneUrl.test.mjs
+++ b/desktop/src/features/projects/lib/projectCloneUrl.test.mjs
@@ -5,6 +5,7 @@ import { deriveRelayCloneUrl, effectiveCloneUrls } from "./projectCloneUrl.ts";
 import {
   projectRepoHost,
   projectRepoHostForProject,
+  repositoryDisplayPath,
 } from "./projectRepoHost.ts";
 
 const OWNER = "a".repeat(64);
@@ -104,3 +105,52 @@ test("projectRepoHostForProject recognizes an implicit relay repository", () =>
     { kind: "buzz" },
   );
 });
+
+test("repositoryDisplayPath renders an external repo as host/path without .git", () => {
+  assert.equal(
+    repositoryDisplayPath(
+      {
+        cloneUrls: ["https://github.com/block/buzz.git"],
+        dtag: "buzz",
+        owner: OWNER,
+      },
+      ORIGIN,
+    ),
+    "github.com/block/buzz",
+  );
+});
+
+test("repositoryDisplayPath renders a relay-hosted repo as owner/repo", () => {
+  assert.equal(
+    repositoryDisplayPath(
+      { cloneUrls: [], dtag: "buzz", owner: OWNER },
+      ORIGIN,
+      "thomas",
+    ),
+    "thomas/buzz",
+  );
+});
+
+test("repositoryDisplayPath falls back to a shortened pubkey owner", () => {
+  assert.equal(
+    repositoryDisplayPath(
+      { cloneUrls: [], dtag: "buzz", owner: OWNER },
+      ORIGIN,
+    ),
+    `${"a".repeat(8)}…/buzz`,
+  );
+});
+
+test("repositoryDisplayPath fails closed without a resolvable clone URL", () => {
+  assert.equal(
+    repositoryDisplayPath({ cloneUrls: [], dtag: "buzz", owner: OWNER }, null),
+    null,
+  );
+  assert.equal(
+    repositoryDisplayPath(
+      { cloneUrls: ["not a URL"], dtag: "buzz", owner: OWNER },
+      ORIGIN,
+    ),
+    null,
+  );
+});
diff --git a/desktop/src/features/projects/lib/projectRepoAvailability.test.mjs b/desktop/src/features/projects/lib/projectRepoAvailability.test.mjs
index b1a40ca9ba1..7c9e6834bc4 100644
--- a/desktop/src/features/projects/lib/projectRepoAvailability.test.mjs
+++ b/desktop/src/features/projects/lib/projectRepoAvailability.test.mjs
@@ -1,7 +1,10 @@
 import assert from "node:assert/strict";
 import { test } from "node:test";
 
-import { projectRepoUnavailableReason } from "./projectRepoAvailability.ts";
+import {
+  projectRepoUnavailableReason,
+  refineRepoUnavailableReason,
+} from "./projectRepoAvailability.ts";
 
 test("classifies a missing repository", () => {
   assert.equal(
@@ -47,3 +50,58 @@ test("keeps unmatched failures generic", () => {
     "unknown",
   );
 });
+
+test("refines a masked 404 into an unbound-repository reason", () => {
+  assert.equal(
+    refineRepoUnavailableReason({
+      reason: "missing",
+      repositoryChannelId: null,
+      memberChannelIds: ["11111111-1111-4111-8111-111111111111"],
+    }),
+    "unbound",
+  );
+});
+
+test("refines a masked 404 into an access-denied reason for non-members", () => {
+  assert.equal(
+    refineRepoUnavailableReason({
+      reason: "missing",
+      repositoryChannelId: "22222222-2222-4222-8222-222222222222",
+      memberChannelIds: ["11111111-1111-4111-8111-111111111111"],
+    }),
+    "access",
+  );
+});
+
+test("keeps missing when the viewer is a member of the bound channel", () => {
+  assert.equal(
+    refineRepoUnavailableReason({
+      reason: "missing",
+      repositoryChannelId: "11111111-1111-4111-8111-111111111111",
+      memberChannelIds: ["11111111-1111-4111-8111-111111111111"],
+    }),
+    "missing",
+  );
+});
+
+test("does not guess while memberships are still loading", () => {
+  assert.equal(
+    refineRepoUnavailableReason({
+      reason: "missing",
+      repositoryChannelId: "22222222-2222-4222-8222-222222222222",
+      memberChannelIds: null,
+    }),
+    "missing",
+  );
+});
+
+test("never rewrites non-missing reasons", () => {
+  assert.equal(
+    refineRepoUnavailableReason({
+      reason: "network",
+      repositoryChannelId: null,
+      memberChannelIds: [],
+    }),
+    "network",
+  );
+});
diff --git a/desktop/src/features/projects/lib/projectRepoAvailability.ts b/desktop/src/features/projects/lib/projectRepoAvailability.ts
index 803548d3dda..ce1b520cf03 100644
--- a/desktop/src/features/projects/lib/projectRepoAvailability.ts
+++ b/desktop/src/features/projects/lib/projectRepoAvailability.ts
@@ -1,5 +1,7 @@
 export type ProjectRepoUnavailableReason =
   | "missing"
+  | "access"
+  | "unbound"
   | "authentication"
   | "network"
   | "ref"
@@ -46,3 +48,33 @@ export function projectRepoUnavailableReason(
   }
   return "unknown";
 }
+
+/**
+ * The relay deliberately answers channel-ACL denials with the same 404 as a
+ * genuinely absent repository (SEC-005 anti-enumeration), so the git error
+ * alone cannot distinguish "never initialized" from "you have no access".
+ * The announcement events ARE visible to every relay member though, so the
+ * client can re-classify a `missing` result using the repository's
+ * `buzz-channel` binding and the viewer's own channel memberships:
+ *
+ * - no binding at all → `unbound` (the relay refuses access for everyone
+ *   until the owner binds a channel)
+ * - bound to a channel the viewer is not a member of → `access`
+ * - bound to a channel the viewer IS a member of → keep `missing` (the
+ *   repository truly has no git data pointer on the relay)
+ *
+ * `memberChannelIds === null` means memberships are still loading — the
+ * reason is left untouched rather than guessed.
+ */
+export function refineRepoUnavailableReason(input: {
+  reason: ProjectRepoUnavailableReason;
+  repositoryChannelId: string | null | undefined;
+  memberChannelIds: readonly string[] | null;
+}): ProjectRepoUnavailableReason {
+  if (input.reason !== "missing") return input.reason;
+  if (!input.repositoryChannelId) return "unbound";
+  if (input.memberChannelIds === null) return input.reason;
+  return input.memberChannelIds.includes(input.repositoryChannelId)
+    ? input.reason
+    : "access";
+}
diff --git a/desktop/src/features/projects/lib/projectRepoHost.ts b/desktop/src/features/projects/lib/projectRepoHost.ts
index 07e27f922c9..681a8753bdf 100644
--- a/desktop/src/features/projects/lib/projectRepoHost.ts
+++ b/desktop/src/features/projects/lib/projectRepoHost.ts
@@ -52,6 +52,41 @@ export function projectRepoHostForRepository(
   return projectRepoHost(cloneUrl, relayOrigin);
 }
 
+/**
+ * Human-readable location of a repository's git data — "github.com/block/buzz"
+ * for external repos (host + path, `.git` stripped), or "owner/repo" for
+ * Buzz-hosted ones (the relay host and full owner pubkey carry no signal;
+ * `ownerLabel` should be the resolved profile name, falling back to a
+ * shortened pubkey). Returns `null` when no clone URL can be resolved.
+ */
+export function repositoryDisplayPath(
+  repository: RepositoryHostInput | null | undefined,
+  relayOrigin: string | null | undefined,
+  ownerLabel?: string | null,
+): string | null {
+  if (!repository) return null;
+  const cloneUrl = effectiveCloneUrls(
+    repository.cloneUrls,
+    relayOrigin,
+    repository.owner,
+    repository.dtag,
+  )[0];
+  if (!cloneUrl) return null;
+
+  if (projectRepoHost(cloneUrl, relayOrigin).kind === "buzz") {
+    const owner = ownerLabel?.trim() || `${repository.owner.slice(0, 8)}…`;
+    return `${owner}/${repository.dtag}`;
+  }
+
+  try {
+    const url = new URL(cloneUrl);
+    const path = url.pathname.replace(/\.git$/, "").replace(/\/+$/, "");
+    return `${url.host}${path}`;
+  } catch {
+    return null;
+  }
+}
+
 export function projectRepoHostForProject(
   project:
     | RepositoryHostInput
diff --git a/desktop/src/features/projects/lib/projectsViewHelpers.test.mjs b/desktop/src/features/projects/lib/projectsViewHelpers.test.mjs
index cd58f06a516..b296ea3ece4 100644
--- a/desktop/src/features/projects/lib/projectsViewHelpers.test.mjs
+++ b/desktop/src/features/projects/lib/projectsViewHelpers.test.mjs
@@ -1,7 +1,11 @@
 import assert from "node:assert/strict";
 import { test } from "node:test";
 
-import { relativeTime } from "./projectsViewHelpers.ts";
+import {
+  isProjectAccessibleToViewer,
+  isRepositoryAccessibleToViewer,
+  relativeTime,
+} from "./projectsViewHelpers.ts";
 
 const DAY_SECONDS = 24 * 60 * 60;
 
@@ -9,6 +13,133 @@ function localSeconds(year, month, day) {
   return Math.floor(new Date(year, month, day, 12).getTime() / 1_000);
 }
 
+const REPO_OWNER = "a".repeat(64);
+const VIEWER = "b".repeat(64);
+const BOUND_CHANNEL = "11111111-1111-4111-8111-111111111111";
+const RELAY_ORIGIN = "https://relay.example";
+
+function makeRepository(overrides = {}) {
+  return {
+    channelId: BOUND_CHANNEL,
+    cloneUrls: [`${RELAY_ORIGIN}/git/${REPO_OWNER}/repo-a`],
+    contributors: [],
+    createdAt: 0,
+    defaultBranch: "main",
+    dtag: "repo-a",
+    id: `${REPO_OWNER}:repo-a`,
+    name: "repo-a",
+    owner: REPO_OWNER,
+    repoAddress: `30617:${REPO_OWNER}:repo-a`,
+    ...overrides,
+  };
+}
+
+function makeAccessInput(overrides = {}) {
+  return {
+    currentPubkey: VIEWER,
+    localRepoNames: new Set(),
+    memberChannelIds: [],
+    relayOrigin: RELAY_ORIGIN,
+    ...overrides,
+  };
+}
+
+test("a channel-bound repository is accessible only to channel members", () => {
+  const repository = makeRepository();
+
+  assert.equal(
+    isRepositoryAccessibleToViewer(
+      repository,
+      makeAccessInput({ memberChannelIds: [BOUND_CHANNEL] }),
+    ),
+    true,
+  );
+  assert.equal(
+    isRepositoryAccessibleToViewer(
+      repository,
+      makeAccessInput({ memberChannelIds: [] }),
+    ),
+    false,
+  );
+});
+
+test("an unbound repository stays accessible to its owner", () => {
+  const repository = makeRepository({ channelId: null });
+
+  assert.equal(
+    isRepositoryAccessibleToViewer(repository, makeAccessInput()),
+    false,
+  );
+  assert.equal(
+    isRepositoryAccessibleToViewer(
+      repository,
+      makeAccessInput({ currentPubkey: REPO_OWNER }),
+    ),
+    true,
+  );
+});
+
+test("external hosting and local checkouts bypass the channel gate", () => {
+  assert.equal(
+    isRepositoryAccessibleToViewer(
+      makeRepository({ cloneUrls: ["https://github.com/acme/site.git"] }),
+      makeAccessInput(),
+    ),
+    true,
+  );
+  assert.equal(
+    isRepositoryAccessibleToViewer(
+      makeRepository(),
+      makeAccessInput({ localRepoNames: new Set(["repo-a"]) }),
+    ),
+    true,
+  );
+});
+
+test("channel-bound repositories stay visible while memberships load", () => {
+  assert.equal(
+    isRepositoryAccessibleToViewer(
+      makeRepository(),
+      makeAccessInput({ memberChannelIds: null }),
+    ),
+    true,
+  );
+});
+
+test("a project is accessible when any repository is, or when owned", () => {
+  const accessible = makeRepository({ channelId: BOUND_CHANNEL });
+  const restricted = makeRepository({
+    channelId: "22222222-2222-4222-8222-222222222222",
+    dtag: "repo-b",
+    id: `${REPO_OWNER}:repo-b`,
+    name: "repo-b",
+    repoAddress: `30617:${REPO_OWNER}:repo-b`,
+  });
+  const input = makeAccessInput({ memberChannelIds: [BOUND_CHANNEL] });
+
+  assert.equal(
+    isProjectAccessibleToViewer(
+      { owner: REPO_OWNER, repositories: [restricted, accessible] },
+      input,
+    ),
+    true,
+  );
+  assert.equal(
+    isProjectAccessibleToViewer(
+      { owner: REPO_OWNER, repositories: [restricted] },
+      input,
+    ),
+    false,
+  );
+  assert.equal(
+    isProjectAccessibleToViewer(
+      { owner: VIEWER, repositories: [restricted] },
+      input,
+    ),
+    true,
+  );
+});
+
 test("relativeTime switches to an absolute date at seven days", () => {
   const now = localSeconds(2025, 5, 15);
 
diff --git a/desktop/src/features/projects/lib/projectsViewHelpers.ts b/desktop/src/features/projects/lib/projectsViewHelpers.ts
index 6084c7275f3..45bb3e3254d 100644
--- a/desktop/src/features/projects/lib/projectsViewHelpers.ts
+++ b/desktop/src/features/projects/lib/projectsViewHelpers.ts
@@ -1,7 +1,10 @@
 import type {
   Project,
   ProjectActivitySummary,
+  Repository,
 } from "@/features/projects/hooks";
+import { hasLocalRepositoryCheckout } from "@/features/projects/lib/projectLocalRepos";
+import { projectRepoHostForRepository } from "@/features/projects/lib/projectRepoHost";
 import { selectProjectRepository } from "@/features/projects/projectModels";
 import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import { normalizePubkey } from "@/shared/lib/pubkey";
@@ -9,6 +12,7 @@ import { normalizePubkey } from "@/shared/lib/pubkey";
 export type ProjectsViewMode = "grid" | "list";
 export type ProjectsRepositoryScope =
   | "all"
+  | "accessible"
   | "mine"
   | "local"
   | "buzz"
@@ -85,6 +89,7 @@ export function readStoredRepositoryScope(): ProjectsRepositoryScope {
       PROJECTS_REPOSITORY_SCOPE_STORAGE_KEY,
     );
     if (
+      value === "accessible" ||
       value === "mine" ||
       value === "local" ||
       value === "buzz" ||
@@ -360,6 +365,63 @@ export function isProjectOwnedByCurrentUser(
     : false;
 }
 
+export type RepositoryAccessInput = {
+  currentPubkey: string | undefined;
+  localRepoNames: Set<string>;
+  /** `null` while channel memberships are still loading. */
+  memberChannelIds: readonly string[] | null;
+  relayOrigin: string | null | undefined;
+};
+
+/**
+ * Whether the viewer can actually read a repository's git data. The relay
+ * gates git reads on membership in the repository's bound `buzz-channel`,
+ * so a repository is considered accessible when the viewer owns it (owners
+ * can repair a missing binding), has a local checkout, the code is hosted
+ * externally (no relay ACL applies), or the viewer is a member of the bound
+ * channel. While memberships are still loading (`memberChannelIds === null`)
+ * channel-bound repositories are kept visible rather than flashing out.
+ */
+export function isRepositoryAccessibleToViewer(
+  repository: Repository,
+  input: RepositoryAccessInput,
+) {
+  if (
+    input.currentPubkey &&
+    normalizePubkey(repository.owner) === normalizePubkey(input.currentPubkey)
+  ) {
+    return true;
+  }
+  if (hasLocalRepositoryCheckout(repository, input.localRepoNames)) {
+    return true;
+  }
+  if (
+    projectRepoHostForRepository(repository, input.relayOrigin).kind ===
+    "external"
+  ) {
+    return true;
+  }
+  if (!repository.channelId) return false;
+  if (input.memberChannelIds === null) return true;
+  return input.memberChannelIds.includes(repository.channelId);
+}
+
+/**
+ * A project is accessible when the viewer owns it or can read at least one
+ * of its repositories.
+ */
+export function isProjectAccessibleToViewer(
+  project: Project,
+  input: RepositoryAccessInput,
+) {
+  return (
+    isProjectOwnedByCurrentUser(project, input.currentPubkey) ||
+    project.repositories.some((repository) =>
+      isRepositoryAccessibleToViewer(repository, input),
+    )
+  );
+}
+
 export function projectHasAgent(
   project: Project,
   people: string[],
diff --git a/desktop/src/features/projects/projectEnumeration.test.mjs b/desktop/src/features/projects/projectEnumeration.test.mjs
index 5d60bd47661..240546b8a4b 100644
--- a/desktop/src/features/projects/projectEnumeration.test.mjs
+++ b/desktop/src/features/projects/projectEnumeration.test.mjs
@@ -142,3 +142,106 @@ test("buildProjectsFromFetcher does not throw when tombstone enumeration succeed
     "unclaimed repo must appear as legacy project",
   );
 });
+
+// ── Tombstone scoping ────────────────────────────────────────────────────────
+//
+// Kind:5 is the app-wide NIP-09 deletion kind (every deleted chat message is
+// one), so the tombstone fetch must be scoped server-side with `#a` filters
+// on the announcement coordinates rather than crawling the relay's entire
+// deletion history.
+
+test("buildProjectsFromFetcher scopes the tombstone fetch to announcement coordinates", async () => {
+  const OWNER = "a".repeat(64);
+
+  const projectEvent = {
+    id: "p".repeat(64),
+    kind: 30621,
+    pubkey: OWNER,
+    created_at: 200,
+    content: "",
+    tags: [["d", "proj"]],
+  };
+  const repoEvent = {
+    id: "r".repeat(64),
+    kind: 30617,
+    pubkey: OWNER,
+    created_at: 100,
+    content: "",
+    tags: [
+      ["d", "repo"],
+      ["name", "repo"],
+    ],
+  };
+
+  const deletionCalls = [];
+  const fetchExhaustively = async (kinds, extraFilter) => {
+    if (kinds.includes(5)) {
+      deletionCalls.push(extraFilter);
+      return [];
+    }
+    if (kinds.includes(30621)) return [projectEvent];
+    if (kinds.includes(30617)) return [repoEvent];
+    return [];
+  };
+
+  await buildProjectsFromFetcher(fetchExhaustively);
+
+  assert.equal(deletionCalls.length, 1, "one scoped tombstone query");
+  assert.deepEqual(deletionCalls[0], {
+    "#a": [`30621:${OWNER}:proj`, `30617:${OWNER}:repo`],
+  });
+});
+
+test("buildProjectsFromFetcher skips the tombstone fetch when there are no announcements", async () => {
+  let deletionQueried = false;
+  const fetchExhaustively = async (kinds) => {
+    if (kinds.includes(5)) deletionQueried = true;
+    return [];
+  };
+
+  const projects = await buildProjectsFromFetcher(fetchExhaustively);
+
+  assert.deepEqual(projects, []);
+  assert.equal(
+    deletionQueried,
+    false,
+    "no coordinates means no tombstone query at all",
+  );
+});
+
+test("buildProjectsFromFetcher still suppresses deleted heads via the scoped fetch", async () => {
+  const OWNER = "a".repeat(64);
+
+  const repoEvent = {
+    id: "r".repeat(64),
+    kind: 30617,
+    pubkey: OWNER,
+    created_at: 100,
+    content: "",
+    tags: [
+      ["d", "repo"],
+      ["name", "repo"],
+    ],
+  };
+  const deletionEvent = {
+    id: "5".repeat(64),
+    kind: 5,
+    pubkey: OWNER,
+    created_at: 150,
+    content: "",
+    tags: [["a", `30617:${OWNER}:repo`]],
+  };
+
+  const fetchExhaustively = async (kinds, extraFilter) => {
+    if (kinds.includes(5)) {
+      return extraFilter?.["#a"]?.includes(`30617:${OWNER}:repo`)
+        ? [deletionEvent]
+        : [];
+    }
+    if (kinds.includes(30617)) return [repoEvent];
+    return [];
+  };
+
+  const projects = await buildProjectsFromFetcher(fetchExhaustively);
+  assert.deepEqual(projects, [], "deleted repo must not surface as a project");
+});
diff --git a/desktop/src/features/projects/projectEnumeration.ts b/desktop/src/features/projects/projectEnumeration.ts
index 072b417a5b4..ab1502c7577 100644
--- a/desktop/src/features/projects/projectEnumeration.ts
+++ b/desktop/src/features/projects/projectEnumeration.ts
@@ -9,13 +9,27 @@ import { buildProjectReadModels, type Project } from "./projectModels";
 
 const PROJECT_ENUMERATION_PAGE_SIZE = 500;
 
-type ProjectEventFilter = {
+// Relays commonly cap filter tag-value lists; chunk `#a` scoping well below
+// any such cap.
+const TOMBSTONE_COORDINATE_CHUNK_SIZE = 100;
+
+/** Additional server-side scoping merged into every enumeration page. */
+export type ProjectEventExtraFilter = {
+  "#a"?: string[];
+};
+
+type ProjectEventFilter = ProjectEventExtraFilter & {
   kinds: number[];
   limit: number;
   since?: number;
   until?: number;
 };
 
+export type FetchProjectEventsExhaustively = (
+  kinds: number[],
+  extraFilter?: ProjectEventExtraFilter,
+) => Promise<RelayEvent[]>;
+
 type FetchProjectEventPage = (
   filter: ProjectEventFilter,
 ) => Promise<RelayEvent[]>;
@@ -29,6 +43,7 @@ export async function enumerateProjectEvents(
   fetchPage: FetchProjectEventPage,
   kinds: number[],
   pageSize: number,
+  extraFilter?: ProjectEventExtraFilter,
 ): Promise<RelayEvent[]> {
   if (!Number.isSafeInteger(pageSize) || pageSize <= 0) {
     throw new Error(
@@ -41,6 +56,7 @@ export async function enumerateProjectEvents(
 
   for (;;) {
     const page = await fetchPage({
+      ...extraFilter,
       kinds,
       limit: pageSize,
       ...(until === undefined ? {} : { until }),
@@ -50,6 +66,7 @@ export async function enumerateProjectEvents(
 
     const oldest = Math.min(...page.map((event) => event.created_at));
     const boundary = await fetchPage({
+      ...extraFilter,
       kinds,
       limit: pageSize,
       since: oldest,
@@ -75,13 +92,62 @@ export async function enumerateProjectEvents(
 
 export function fetchProjectEventsExhaustively(
   kinds: number[],
+  extraFilter?: ProjectEventExtraFilter,
   pageSize = PROJECT_ENUMERATION_PAGE_SIZE,
 ): Promise<RelayEvent[]> {
   return enumerateProjectEvents(
     (filter) => relayClient.fetchEvents(filter),
     kinds,
     pageSize,
+    extraFilter,
+  );
+}
+
+/** `kind:owner:dtag` coordinate for an addressable announcement event. */
+function eventCoordinate(event: RelayEvent): string | null {
+  const dtag = event.tags.find((tag) => tag[0] === "d")?.[1];
+  if (typeof dtag !== "string" || dtag.length === 0) return null;
+  return `${event.kind}:${event.pubkey.toLowerCase()}:${dtag}`;
+}
+
+/**
+ * Fetches the NIP-09 kind:5 tombstones relevant to the given announcement
+ * events, scoped server-side with `#a` filters on the announcements' own
+ * coordinates. Kind:5 is the app-wide deletion kind (every deleted chat
+ * message is one), so enumerating it unscoped crawls the entire community's
+ * deletion history — minutes on a large relay. Only tombstones addressing a
+ * currently visible project/repo coordinate can affect the read models, so
+ * scoping is semantically equivalent (see `buildDeletionThresholds`).
+ */
+async function fetchScopedDeletionEvents(
+  fetchExhaustively: FetchProjectEventsExhaustively,
+  announcementEvents: RelayEvent[],
+): Promise<RelayEvent[]> {
+  const coordinates = [
+    ...new Set(
+      announcementEvents.flatMap((event) => {
+        const coordinate = eventCoordinate(event);
+        return coordinate ? [coordinate] : [];
+      }),
+    ),
+  ];
+  if (coordinates.length === 0) return [];
+
+  const chunks: string[][] = [];
+  for (
+    let index = 0;
+    index < coordinates.length;
+    index += TOMBSTONE_COORDINATE_CHUNK_SIZE
+  ) {
+    chunks.push(
+      coordinates.slice(index, index + TOMBSTONE_COORDINATE_CHUNK_SIZE),
+    );
+  }
+
+  const pages = await Promise.all(
+    chunks.map((chunk) => fetchExhaustively([KIND_DELETION], { "#a": chunk })),
   );
+  return pages.flat();
 }
 
 /**
@@ -95,24 +161,31 @@ export function fetchProjectEventsExhaustively(
  * returning an empty deletion set that would resurrect every deleted head.
  */
 export async function buildProjectsFromFetcher(
-  fetchExhaustively: (kinds: number[]) => Promise<RelayEvent[]>,
+  fetchExhaustively: FetchProjectEventsExhaustively,
   options: {
     relayOrigin?: string | null;
     hiddenAddresses?: ReadonlySet<string>;
   } = {},
 ): Promise<Project[]> {
-  const [projectEvents, repositoryEvents, tombstoneResult] = await Promise.all([
+  const [projectEvents, repositoryEvents] = await Promise.all([
     fetchExhaustively([KIND_PROJECT_ANNOUNCEMENT]),
     fetchExhaustively([KIND_REPO_ANNOUNCEMENT]),
-    fetchExhaustively([KIND_DELETION]).then(
-      (events) => ({ ok: true as const, events }),
-      (error: unknown) => ({
-        ok: false as const,
-        message: error instanceof Error ? error.message : "Unknown error",
-      }),
-    ),
   ]);
 
+  // Tombstones are fetched second (not in parallel) because the `#a` scoping
+  // needs the announcement coordinates; both announcement kinds are small,
+  // so this costs one extra round trip, not a full crawl.
+  const tombstoneResult = await fetchScopedDeletionEvents(fetchExhaustively, [
+    ...projectEvents,
+    ...repositoryEvents,
+  ]).then(
+    (events) => ({ ok: true as const, events }),
+    (error: unknown) => ({
+      ok: false as const,
+      message: error instanceof Error ? error.message : "Unknown error",
+    }),
+  );
+
   if (!tombstoneResult.ok) {
     throw new Error(
       `Could not fetch project deletion records: ${tombstoneResult.message} — refresh to retry.`,
diff --git a/desktop/src/features/projects/ui/ProjectCards.tsx b/desktop/src/features/projects/ui/ProjectCards.tsx
index ed28ddd5834..09535fdfc77 100644
--- a/desktop/src/features/projects/ui/ProjectCards.tsx
+++ b/desktop/src/features/projects/ui/ProjectCards.tsx
@@ -280,6 +280,16 @@ function RepositoryUnavailableIndicator({
       description: "No git repository was found on the Buzz relay.",
       label: "Uninitialized",
     },
+    access: {
+      description:
+        "You’re not a member of the channel that grants access to this repository.",
+      label: "No access",
+    },
+    unbound: {
+      description:
+        "The repository has no access channel binding, so the relay cannot authorize reads.",
+      label: "No access channel",
+    },
     network: {
       description: "The Buzz git service could not be reached.",
       label: "Unreachable",
@@ -292,13 +302,17 @@ function RepositoryUnavailableIndicator({
       description: "Buzz could not load this repository.",
       label: "Unavailable",
     },
-  }[reason];
+  } satisfies Record<
+    ProjectRepoUnavailableReason,
+    { description: string; label: string }
+  >;
+  const { description, label } = status[reason];
 
   return (
     <Tooltip>
       <TooltipTrigger asChild>
         <span
-          aria-label={`Repository ${status.label.toLowerCase()}`}
+          aria-label={`Repository ${label.toLowerCase()}`}
           className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-amber-600 hover:bg-amber-500/10 dark:text-amber-300"
           role="img"
         >
@@ -306,8 +320,8 @@ function RepositoryUnavailableIndicator({
         </span>
       </TooltipTrigger>
       <TooltipContent className="max-w-64">
-        <p className="font-medium">{status.label}</p>
-        <p className="text-muted-foreground">{status.description}</p>
+        <p className="font-medium">{label}</p>
+        <p className="text-muted-foreground">{description}</p>
       </TooltipContent>
     </Tooltip>
   );
diff --git a/desktop/src/features/projects/ui/ProjectOverviewPanel.tsx b/desktop/src/features/projects/ui/ProjectOverviewPanel.tsx
index de9044e1a50..0cb06b3e99a 100644
--- a/desktop/src/features/projects/ui/ProjectOverviewPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectOverviewPanel.tsx
@@ -29,6 +29,8 @@ import { ReadmePanel } from "./ProjectReadmePanel";
 import type { RepoSourceHeaderControls } from "./ProjectRepositorySource";
 
 type ProjectOverviewPanelProps = {
+  /** `buzz-channel` binding of the repository, for access-restricted copy. */
+  accessChannelId?: string | null;
   contributors: ProjectRepoContributor[];
   externalHost?: string;
   externalUrl?: string | null;
@@ -141,6 +143,7 @@ export function OverviewRailSection({
 }
 
 export function ProjectOverviewPanel({
+  accessChannelId,
   contributors,
   externalHost,
   externalUrl,
@@ -174,6 +177,7 @@ export function ProjectOverviewPanel({
         {/* ReadmePanel renders its own "no README" fallback while keeping
             the branch + source controls reachable. */}
         <ReadmePanel
+          accessChannelId={accessChannelId}
           externalHost={externalHost}
           externalUrl={externalUrl}
           file={readmeFile}
diff --git a/desktop/src/features/projects/ui/ProjectReadmePanel.tsx b/desktop/src/features/projects/ui/ProjectReadmePanel.tsx
index 290733aeca8..c398f129215 100644
--- a/desktop/src/features/projects/ui/ProjectReadmePanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectReadmePanel.tsx
@@ -11,6 +11,8 @@ import {
   RefreshCw,
 } from "lucide-react";
 
+import { useAppNavigation } from "@/app/navigation/useAppNavigation";
+import { useChannelsQuery } from "@/features/channels/hooks";
 import type { ProjectRepoFile } from "@/features/projects/hooks";
 import type { ProjectRepoUnavailableReason } from "@/features/projects/lib/projectRepoAvailability";
 import { Button } from "@/shared/ui/button";
@@ -90,7 +92,50 @@ function normalizeReadmeMarkdown(content: string) {
     .trim();
 }
 
+/**
+ * Description for the access-restricted state. Links to the bound channel
+ * when it is visible to the viewer (public channels appear in the channel
+ * list even before joining); private channels fall back to generic copy.
+ */
+function AccessRestrictedDescription({
+  accessChannelId,
+}: {
+  accessChannelId: string;
+}) {
+  const { goChannel } = useAppNavigation();
+  const channelsQuery = useChannelsQuery();
+  const channel = channelsQuery.data?.find(
+    (candidate) => candidate.id === accessChannelId,
+  );
+
+  if (!channel) {
+    return (
+      <>
+        Repository access is granted through a channel you can’t see. Ask the
+        repository owner for an invite.
+      </>
+    );
+  }
+
+  return (
+    <>
+      Repository access is granted through{" "}
+      <button
+        aria-label={`Open repository access channel #${channel.name}`}
+        className="font-medium text-foreground underline-offset-2 hover:underline"
+        onClick={() => void goChannel(channel.id)}
+        type="button"
+      >
+        #{channel.name}
+      </button>
+      , and you’re not a member. Join the channel or ask the repository owner
+      for an invite.
+    </>
+  );
+}
+
 export function ReadmePanel({
+  accessChannelId,
   file,
   gitDataState,
   externalHost,
@@ -98,6 +143,8 @@ export function ReadmePanel({
   sourceControls,
   unavailableReason,
 }: {
+  /** `buzz-channel` binding of the repository, for access-restricted copy. */
+  accessChannelId?: string | null;
   file: ProjectRepoFile | null;
   gitDataState: "checking" | "available" | "empty" | "unavailable";
   externalHost?: string;
@@ -174,6 +221,18 @@ export function ReadmePanel({
         icon: CircleAlert,
         title: "Repository not initialized",
       },
+      access: {
+        description:
+          "Repository access is granted through its channel, and you’re not a member of the channel bound to this repository. Ask the repository owner for an invite.",
+        icon: LockKeyhole,
+        title: "Repository access restricted",
+      },
+      unbound: {
+        description:
+          "This repository has no access channel binding, so the relay cannot authorize anyone to read it. The repository owner can bind a channel from the Access menu.",
+        icon: LockKeyhole,
+        title: "No access channel bound",
+      },
       network: {
         description:
           "The Buzz git service could not be reached. Check your connection and try again.",
@@ -221,9 +280,13 @@ export function ReadmePanel({
               : unavailable.title}
           </h3>
           <p className="mt-1 max-w-lg text-sm text-muted-foreground">
-            {externalHost
-              ? "Clone this repository locally to explore its files, commits, and contributors in Buzz."
-              : unavailable.description}
+            {externalHost ? (
+              "Clone this repository locally to explore its files, commits, and contributors in Buzz."
+            ) : reason === "access" && accessChannelId ? (
+              <AccessRestrictedDescription accessChannelId={accessChannelId} />
+            ) : (
+              unavailable.description
+            )}
           </p>
           {externalUrl ? (
             <a
diff --git a/desktop/src/features/projects/ui/ProjectWorkspaceTabs.tsx b/desktop/src/features/projects/ui/ProjectWorkspaceTabs.tsx
index 1548f3607b6..238f8390e0c 100644
--- a/desktop/src/features/projects/ui/ProjectWorkspaceTabs.tsx
+++ b/desktop/src/features/projects/ui/ProjectWorkspaceTabs.tsx
@@ -23,7 +23,11 @@ import {
   type ViewerGitIdentity,
 } from "@/features/projects/lib/projectContributorMatching";
 import type { ProjectRepoHost } from "@/features/projects/lib/projectRepoHost";
-import { projectRepoUnavailableReason } from "@/features/projects/lib/projectRepoAvailability";
+import {
+  projectRepoUnavailableReason,
+  refineRepoUnavailableReason,
+} from "@/features/projects/lib/projectRepoAvailability";
+import { useMemberChannelIds } from "@/features/projects/useRepositoryAccess";
 import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import { Button } from "@/shared/ui/button";
 import { Tabs, TabsContent } from "@/shared/ui/tabs";
@@ -216,9 +220,17 @@ export function WorkspaceTabs({
       : files.length === 0
         ? "empty"
         : "available";
+  // The relay masks channel-ACL denials as 404 (anti-enumeration), so a
+  // "missing" git result is re-classified with the repository's channel
+  // binding and the viewer's memberships before it reaches the UI copy.
+  const memberChannelIds = useMemberChannelIds();
   const unavailableReason =
     gitDataState === "unavailable" && !externalHost
-      ? projectRepoUnavailableReason(displayedSnapshotError)
+      ? refineRepoUnavailableReason({
+          reason: projectRepoUnavailableReason(displayedSnapshotError),
+          repositoryChannelId: project.channelId,
+          memberChannelIds,
+        })
       : undefined;
   const repositoryLoaded =
     gitDataState === "available" || gitDataState === "empty";
@@ -411,6 +423,7 @@ export function WorkspaceTabs({
 
       <TabsContent className="m-0" value="overview">
         <ProjectOverviewPanel
+          accessChannelId={project.channelId}
           contributors={displayedContributors}
           externalHost={externalHost}
           externalUrl={externalHost ? sourceControls?.externalUrl : null}
diff --git a/desktop/src/features/projects/ui/ProjectsActivityFeed.tsx b/desktop/src/features/projects/ui/ProjectsActivityFeed.tsx
index eb47fbc8127..dc317ab03c3 100644
--- a/desktop/src/features/projects/ui/ProjectsActivityFeed.tsx
+++ b/desktop/src/features/projects/ui/ProjectsActivityFeed.tsx
@@ -252,18 +252,23 @@ function buildActivityItems({
 
 function ActivityCard({
   compact,
+  isFirst,
+  isLast,
   item,
   onOpen,
   onOpenProject,
   profiles,
 }: {
   compact: boolean;
+  isFirst: boolean;
+  isLast: boolean;
   item: ProjectActivityItem;
   onOpen: () => void;
   onOpenProject: () => void;
   profiles?: UserProfileLookup;
 }) {
   const visual = PROJECT_EVENT_VISUALS[item.kind];
+  const TypeIcon = visual.icon;
   const profile = item.actorPubkey
     ? profiles?.[normalizePubkey(item.actorPubkey)]
     : undefined;
@@ -274,42 +279,71 @@ function ActivityCard({
   return (
     <div
       className={cn(
-        "relative block w-full rounded-xl border border-border/60 bg-transparent text-left transition-colors hover:bg-muted/20",
-        compact ? "p-3" : "p-4",
+        "relative block w-full rounded-xl bg-transparent text-left transition-colors hover:bg-muted/20",
+        compact ? "py-3 pr-3" : "py-4 pr-4",
       )}
       data-testid="projects-activity-card"
     >
       <button
         aria-label={`Open ${item.title} in ${item.target.project.name}`}
-        className="absolute inset-0 rounded-xl focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring"
+        className="absolute inset-0 rounded-xl focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring"
         onClick={onOpen}
         type="button"
       />
       <div className="pointer-events-none relative flex min-w-0 items-start gap-3">
-        {item.actorPubkey ? (
-          <UserProfilePopover pubkey={item.actorPubkey} triggerElement="span">
-            <button
-              aria-label={`View ${actorLabel}'s profile`}
-              className="pointer-events-auto relative z-10 shrink-0 rounded-full focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring"
-              type="button"
-            >
-              <UserAvatar
-                accent={profile?.isAgent === true}
-                avatarUrl={profile?.avatarUrl ?? null}
-                displayName={actorLabel}
-                size={compact ? "xs" : "md"}
-              />
-            </button>
-          </UserProfilePopover>
-        ) : (
-          <UserAvatar
-            accent={profile?.isAgent === true}
-            avatarUrl={profile?.avatarUrl ?? null}
-            className="shrink-0"
-            displayName={actorLabel}
-            size={compact ? "xs" : "md"}
-          />
-        )}
+        {/* Avatar gutter: a vertical spine runs through the avatar centers
+            to connect consecutive cards. Segments extend into the card's
+            vertical padding so they meet the neighbouring card's segments;
+            the first card has no incoming line and the last no outgoing. */}
+        <div
+          className={cn(
+            "relative flex shrink-0 items-start justify-center self-stretch",
+            compact ? "w-5" : "w-9",
+          )}
+        >
+          {isFirst ? null : (
+            <span
+              aria-hidden="true"
+              className={cn(
+                "absolute left-1/2 w-px -translate-x-1/2 bg-border/80",
+                compact ? "-top-3 h-3" : "-top-4 h-4",
+              )}
+            />
+          )}
+          {isLast ? null : (
+            <span
+              aria-hidden="true"
+              className={cn(
+                "absolute left-1/2 w-px -translate-x-1/2 bg-border/80",
+                compact ? "-bottom-3 top-5" : "-bottom-4 top-9",
+              )}
+            />
+          )}
+          {item.actorPubkey ? (
+            <UserProfilePopover pubkey={item.actorPubkey} triggerElement="span">
+              <button
+                aria-label={`View ${actorLabel}'s profile`}
+                className="pointer-events-auto relative z-10 shrink-0 rounded-full focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring"
+                type="button"
+              >
+                <UserAvatar
+                  accent={profile?.isAgent === true}
+                  avatarUrl={profile?.avatarUrl ?? null}
+                  displayName={actorLabel}
+                  size={compact ? "xs" : "md"}
+                />
+              </button>
+            </UserProfilePopover>
+          ) : (
+            <UserAvatar
+              accent={profile?.isAgent === true}
+              avatarUrl={profile?.avatarUrl ?? null}
+              className="relative z-10 shrink-0"
+              displayName={actorLabel}
+              size={compact ? "xs" : "md"}
+            />
+          )}
+        </div>
         <div className="min-w-0 flex-1">
           <div className="flex min-w-0 items-start gap-2">
             <div className="min-w-0 flex-1 text-xs text-muted-foreground/70">
@@ -320,7 +354,7 @@ function ActivityCard({
                     triggerElement="span"
                   >
                     <button
-                      className="pointer-events-auto relative z-10 rounded-sm hover:underline focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring"
+                      className="pointer-events-auto relative z-10 rounded-sm font-semibold text-foreground hover:underline focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring"
                       type="button"
                     >
                       {actorLabel}
@@ -331,7 +365,7 @@ function ActivityCard({
                 )}{" "}
                 {item.action}{" "}
                 <button
-                  className="pointer-events-auto relative z-10 inline-block max-w-48 truncate rounded-sm align-bottom hover:underline focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring sm:max-w-64 2xl:max-w-none"
+                  className="pointer-events-auto relative z-10 inline-block max-w-48 truncate rounded-sm align-bottom font-semibold text-foreground hover:underline focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring sm:max-w-64 2xl:max-w-none"
                   onClick={onOpenProject}
                   type="button"
                 >
@@ -365,9 +399,16 @@ function ActivityCard({
             ) : null}
           </div>
           <div className={compact ? "mt-2" : "mt-3"}>
-            <p className="min-w-0 truncate text-sm font-semibold leading-5 text-foreground">
-              {item.title}
-            </p>
+            {/* Bare event-type glyph beside the headline (no badge circle). */}
+            <div className="flex min-w-0 items-start gap-2">
+              <TypeIcon
+                aria-hidden="true"
+                className={cn("mt-0.5 h-4 w-4 shrink-0", visual.iconClassName)}
+              />
+              <p className="min-w-0 flex-1 truncate text-sm font-semibold leading-5 text-foreground">
+                {item.title}
+              </p>
+            </div>
             {item.body ? (
               <p
                 className={cn(
@@ -420,13 +461,16 @@ export function ProjectsActivityFeed(props: ProjectsActivityFeedProps) {
 
   return (
     <div
-      className={cn("relative", props.compact ? "space-y-2.5" : "space-y-3")}
+      className="relative bg-transparent"
+      data-testid="projects-activity-timeline"
     >
-      {items.map((item) => {
+      {items.map((item, index) => {
         return (
           <div className="relative" key={item.id}>
             <ActivityCard
               compact={props.compact === true}
+              isFirst={index === 0}
+              isLast={index === items.length - 1}
               item={item}
               onOpen={() => {
                 if (item.target.type === "project") {
diff --git a/desktop/src/features/projects/ui/ProjectsCreateMenu.tsx b/desktop/src/features/projects/ui/ProjectsCreateMenu.tsx
index b1e64002a5f..07888230f10 100644
--- a/desktop/src/features/projects/ui/ProjectsCreateMenu.tsx
+++ b/desktop/src/features/projects/ui/ProjectsCreateMenu.tsx
@@ -50,7 +50,7 @@ export function ProjectsCreateMenu({
   return (
     <nav
       aria-label="Create project item"
-      className="relative shrink-0 pl-4"
+      className="relative shrink-0"
       onBlurCapture={(event) => {
         if (!event.currentTarget.contains(event.relatedTarget)) {
           setOpen(false);
diff --git a/desktop/src/features/projects/ui/ProjectsIssuesList.tsx b/desktop/src/features/projects/ui/ProjectsIssuesList.tsx
index ea0fdf5d8ad..f3f5f5aa414 100644
--- a/desktop/src/features/projects/ui/ProjectsIssuesList.tsx
+++ b/desktop/src/features/projects/ui/ProjectsIssuesList.tsx
@@ -12,6 +12,7 @@ import {
   resolveUserLabel,
   type UserProfileLookup,
 } from "@/features/profile/lib/identity";
+import { cn } from "@/shared/lib/cn";
 import { Button } from "@/shared/ui/button";
 import { Card } from "@/shared/ui/card";
 import { DropdownMenuItem } from "@/shared/ui/dropdown-menu";
@@ -31,6 +32,8 @@ import {
 } from "./projectListRowStyles";
 
 type ProjectsIssuesListProps = {
+  /** Render without container chrome — a parent table container provides border and rounding. */
+  embedded?: boolean;
   error: unknown;
   failedSections: ProjectWorkItemSection[];
   isLoading: boolean;
@@ -73,25 +76,40 @@ function IssueHeader({
       <div className="flex min-w-0 items-center gap-1.5">
         <p className={PROJECT_LIST_ROW_TITLE_CLASS}>{issue.title}</p>
       </div>
-      <p className={`truncate ${PROJECT_LIST_ROW_SUBTEXT_CLASS}`}>
-        {project.name}
-        {includeDate ? ` · created ${relativeTime(issue.createdAt)}` : null} ·
-        by{" "}
-        <ProjectAuthorIdentity
-          label={authorLabel}
-          profiles={profiles}
-          pubkey={issue.author}
-          testId={authorTestId}
-        />
+      {/* Flex (not inline flow) so the 20px author avatar cannot grow the
+          line box — keeps row heights identical to the PR list. */}
+      <div
+        className={`flex min-w-0 items-center gap-x-1.5 overflow-hidden whitespace-nowrap ${PROJECT_LIST_ROW_SUBTEXT_CLASS}`}
+      >
+        <span>{project.name}</span>
+        {includeDate ? (
+          <>
+            <span>·</span>
+            <span>created {relativeTime(issue.createdAt)}</span>
+          </>
+        ) : null}
+        <span>·</span>
+        <span className="inline-flex items-center gap-1">
+          <span>by</span>
+          <ProjectAuthorIdentity
+            label={authorLabel}
+            profiles={profiles}
+            pubkey={issue.author}
+            testId={authorTestId}
+          />
+        </span>
         {includeDate ? (
-          ` · ${issue.status}`
+          <>
+            <span>·</span>
+            <span>{issue.status}</span>
+          </>
         ) : (
           <>
-            <span className="md:hidden"> · </span>
+            <span className="md:hidden">·</span>
             <span className="md:hidden">{issue.status}</span>
           </>
         )}
-      </p>
+      </div>
     </div>
   );
 }
@@ -223,6 +241,7 @@ function IssueListRow({
 }
 
 export function ProjectsIssuesList({
+  embedded,
   error,
   failedSections,
   isLoading,
@@ -235,7 +254,12 @@ export function ProjectsIssuesList({
 }: ProjectsIssuesListProps) {
   if (isLoading) {
     return (
-      <div className="border border-border/60 px-4 py-12 text-center text-sm text-muted-foreground">
+      <div
+        className={cn(
+          "px-4 py-12 text-center text-sm text-muted-foreground",
+          !embedded && "border border-border/60",
+        )}
+      >
         Loading issues...
       </div>
     );
@@ -259,7 +283,12 @@ export function ProjectsIssuesList({
     return (
       <div className="space-y-3">
         {loadNotice}
-        <div className="border border-dashed border-border/60 px-4 py-12 text-center text-sm text-muted-foreground">
+        <div
+          className={cn(
+            "px-4 py-12 text-center text-sm text-muted-foreground",
+            !embedded && "border border-dashed border-border/60",
+          )}
+        >
           No issues yet.
         </div>
       </div>
@@ -291,7 +320,9 @@ export function ProjectsIssuesList({
     <div className="space-y-3">
       {loadNotice}
       <div
-        className={PROJECT_LIST_CONTAINER_CLASS}
+        className={
+          embedded ? "divide-y divide-border/60" : PROJECT_LIST_CONTAINER_CLASS
+        }
         data-testid="projects-list-container"
       >
         {issues.map(({ project, issue, repository }) => (
diff --git a/desktop/src/features/projects/ui/ProjectsListHeaderBar.tsx b/desktop/src/features/projects/ui/ProjectsListHeaderBar.tsx
new file mode 100644
index 00000000000..3d3fdb9383e
--- /dev/null
+++ b/desktop/src/features/projects/ui/ProjectsListHeaderBar.tsx
@@ -0,0 +1,149 @@
+import type {
+  ProjectsFilter,
+  ProjectsRepositoryScope,
+  ProjectsSort,
+  ProjectsViewMode,
+  ProjectsWorkItemScope,
+} 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;
+  value: ProjectsRepositoryScope;
+}> = [
+  { label: "All", value: "all" },
+  { label: "Accessible", value: "accessible" },
+  { label: "My Projects", value: "mine" },
+  { label: "Local", value: "local" },
+];
+const REPOSITORY_SCOPE_OPTIONS: Array<{
+  label: string;
+  value: ProjectsRepositoryScope;
+}> = [
+  { label: "All", value: "all" },
+  { label: "Accessible", value: "accessible" },
+  { label: "My Repositories", value: "mine" },
+  { label: "Local", value: "local" },
+  { label: "Buzz-hosted", value: "buzz" },
+  { label: "Linked", value: "linked" },
+];
+const PULL_REQUEST_SCOPE_OPTIONS: Array<{
+  label: string;
+  value: ProjectsWorkItemScope;
+}> = [
+  { label: "All", value: "all" },
+  { label: "My Pull Requests", value: "mine" },
+];
+const ISSUE_SCOPE_OPTIONS: Array<{
+  label: string;
+  value: ProjectsWorkItemScope;
+}> = [
+  { label: "All", value: "all" },
+  { label: "My Issues", value: "mine" },
+];
+
+type ProjectsListHeaderBarProps = {
+  filter: ProjectsFilter;
+  issueScope: ProjectsWorkItemScope;
+  onIssueScopeChange: (scope: ProjectsWorkItemScope) => void;
+  onPullRequestScopeChange: (scope: ProjectsWorkItemScope) => void;
+  onRepositoryScopeChange: (scope: ProjectsRepositoryScope) => void;
+  onSortChange: (sort: ProjectsSort) => void;
+  onViewModeChange: (viewMode: ProjectsViewMode) => void;
+  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.
+ */
+export function ProjectsListHeaderBar({
+  filter,
+  issueScope,
+  onIssueScopeChange,
+  onPullRequestScopeChange,
+  onRepositoryScopeChange,
+  onSortChange,
+  onViewModeChange,
+  pullRequestScope,
+  repositoryScope,
+  sort,
+  variant,
+  viewMode,
+}: ProjectsListHeaderBarProps) {
+  const scopeDropdown =
+    filter === "prs" ? (
+      <ProjectsListScopeDropdown
+        label="Filter pull requests"
+        onChange={onPullRequestScopeChange}
+        options={PULL_REQUEST_SCOPE_OPTIONS}
+        value={pullRequestScope}
+      />
+    ) : filter === "issues" ? (
+      <ProjectsListScopeDropdown
+        label="Filter issues"
+        onChange={onIssueScopeChange}
+        options={ISSUE_SCOPE_OPTIONS}
+        value={issueScope}
+      />
+    ) : filter === "projects" ? (
+      <ProjectsListScopeDropdown
+        label="Filter projects"
+        onChange={onRepositoryScopeChange}
+        options={PROJECT_SCOPE_OPTIONS}
+        value={repositoryScope}
+      />
+    ) : (
+      <ProjectsListScopeDropdown
+        label="Filter repositories"
+        onChange={onRepositoryScopeChange}
+        options={REPOSITORY_SCOPE_OPTIONS}
+        value={repositoryScope}
+      />
+    );
+
+  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",
+      )}
+      data-testid="projects-list-header"
+    >
+      {scopeDropdown}
+      <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>
+    </div>
+  );
+}
diff --git a/desktop/src/features/projects/ui/ProjectsOverviewPanel.tsx b/desktop/src/features/projects/ui/ProjectsOverviewPanel.tsx
index b31e120abc1..f93b953a225 100644
--- a/desktop/src/features/projects/ui/ProjectsOverviewPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectsOverviewPanel.tsx
@@ -60,7 +60,7 @@ function StatPill({
         </span>
         <Icon className="h-3.5 w-3.5 text-muted-foreground/70" />
       </span>
-      <span className="mt-auto pt-4 text-4xl font-semibold leading-none tracking-tight text-foreground">
+      <span className="mt-auto pt-3 text-2xl font-semibold leading-none tracking-tight text-foreground">
         {count}
       </span>
     </button>
@@ -76,42 +76,51 @@ export function ProjectsOverviewPanel({
 }: ProjectsOverviewPanelProps) {
   const stats = overviewStats(projects, summaries);
 
+  // The feed owns the full left column; the stat counters live at the top
+  // of the side rail as compact cards, above People and Contribution
+  // Activity, instead of a full-width row over the feed. The feed column
+  // has no left inset so the timeline spine lines up with the section tabs.
   return (
-    <section className="-mx-4 mb-4" data-testid="projects-overview-panel">
+    <section
+      className="-mr-[calc(1rem+10px)] mb-4"
+      data-testid="projects-overview-panel"
+    >
       <div className="grid xl:grid-cols-[minmax(0,1fr)_18rem] 2xl:grid-cols-[minmax(0,1fr)_24rem]">
-        <div className="order-1 grid grid-cols-2 gap-2 p-4 pt-0 sm:gap-3 xl:order-none xl:col-start-1 xl:row-start-1 xl:grid-cols-4">
-          <StatPill
-            count={projects.length}
-            icon={Folders}
-            label="Projects"
-            onClick={() => onSelectSection("projects")}
-          />
-          <StatPill
-            count={projects.reduce(
-              (count, project) => count + project.repositories.length,
-              0,
-            )}
-            icon={FolderGit2}
-            label="Repositories"
-            onClick={() => onSelectSection("repositories")}
-          />
-          <StatPill
-            count={stats.prs}
-            icon={GitPullRequest}
-            label="Pull requests"
-            onClick={() => onSelectSection("prs")}
-          />
-          <StatPill
-            count={stats.issues}
-            icon={CircleDot}
-            label="Issues"
-            onClick={() => onSelectSection("issues")}
-          />
-        </div>
-        {metadata}
-        <div className="order-2 min-w-0 p-4 pt-2 xl:order-none xl:col-start-1 xl:row-start-2">
+        <div className="order-1 min-w-0 pb-4 pr-4 pt-2 xl:order-none xl:col-start-1 xl:row-start-1">
           {children}
         </div>
+        <div className="order-2 flex min-w-0 flex-col gap-3 px-4 pb-4 pt-2 xl:order-none xl:col-start-2 xl:row-start-1">
+          <div className="grid grid-cols-2 gap-2">
+            <StatPill
+              count={projects.length}
+              icon={Folders}
+              label="Projects"
+              onClick={() => onSelectSection("projects")}
+            />
+            <StatPill
+              count={projects.reduce(
+                (count, project) => count + project.repositories.length,
+                0,
+              )}
+              icon={FolderGit2}
+              label="Repositories"
+              onClick={() => onSelectSection("repositories")}
+            />
+            <StatPill
+              count={stats.prs}
+              icon={GitPullRequest}
+              label="Pull requests"
+              onClick={() => onSelectSection("prs")}
+            />
+            <StatPill
+              count={stats.issues}
+              icon={CircleDot}
+              label="Issues"
+              onClick={() => onSelectSection("issues")}
+            />
+          </div>
+          {metadata}
+        </div>
       </div>
     </section>
   );
diff --git a/desktop/src/features/projects/ui/ProjectsOverviewRail.tsx b/desktop/src/features/projects/ui/ProjectsOverviewRail.tsx
index 284c53365fe..38660b3a049 100644
--- a/desktop/src/features/projects/ui/ProjectsOverviewRail.tsx
+++ b/desktop/src/features/projects/ui/ProjectsOverviewRail.tsx
@@ -62,9 +62,11 @@ export function ProjectsOverviewRail({
   const people = overviewPeople(projects, summaries);
   const activityByDay = overviewActivityByDay(projects, summaries);
 
+  // Plain stacked cards — the overview panel's rail column owns placement
+  // and spacing, so the sections can never drift apart or collide.
   return (
     <>
-      <div className="order-4 min-w-0 border-t border-border/40 px-4 py-4 xl:order-none xl:col-start-2 xl:row-start-1 xl:border-t-0 xl:pt-0">
+      <div className="rounded-lg border border-border/60 p-4">
         <OverviewRailSection title="People" titleClassName="text-base">
           {people.length > 0 ? (
             <div className="flex flex-wrap gap-1.5">
@@ -94,13 +96,13 @@ export function ProjectsOverviewRail({
         </OverviewRailSection>
       </div>
 
-      <div className="order-5 min-w-0 border-t border-border/40 px-4 pb-4 pt-3 xl:order-none xl:col-start-2 xl:row-start-2 xl:border-t-0">
-        <section className="space-y-2">
-          <h3 className="text-base font-semibold text-foreground">
-            Contribution Activity
-          </h3>
+      <div className="min-w-0 rounded-lg border border-border/60 p-4">
+        <OverviewRailSection
+          title="Contribution Activity"
+          titleClassName="text-base"
+        >
           <ProjectsContributionGraph activityByDay={activityByDay} compact />
-        </section>
+        </OverviewRailSection>
       </div>
     </>
   );
diff --git a/desktop/src/features/projects/ui/ProjectsPullRequestsList.tsx b/desktop/src/features/projects/ui/ProjectsPullRequestsList.tsx
index f04acb5b828..7ebfcf685ac 100644
--- a/desktop/src/features/projects/ui/ProjectsPullRequestsList.tsx
+++ b/desktop/src/features/projects/ui/ProjectsPullRequestsList.tsx
@@ -8,6 +8,7 @@ import type {
 } from "@/features/projects/hooks";
 import { relativeTime } from "@/features/projects/lib/projectsViewHelpers";
 import type { ProjectWorkItemSection } from "@/features/projects/projectWorkItems";
+import { cn } from "@/shared/lib/cn";
 import {
   resolveUserLabel,
   type UserProfileLookup,
@@ -31,6 +32,8 @@ import {
 } from "./projectListRowStyles";
 
 type ProjectsPullRequestsListProps = {
+  /** Render without container chrome — a parent table container provides border and rounding. */
+  embedded?: boolean;
   error: unknown;
   failedSections: ProjectWorkItemSection[];
   isLoading: boolean;
@@ -231,6 +234,7 @@ function PullRequestListRow({
 }
 
 export function ProjectsPullRequestsList({
+  embedded,
   error,
   failedSections,
   isLoading,
@@ -243,7 +247,12 @@ export function ProjectsPullRequestsList({
 }: ProjectsPullRequestsListProps) {
   if (isLoading) {
     return (
-      <div className="border border-border/60 px-4 py-12 text-center text-sm text-muted-foreground">
+      <div
+        className={cn(
+          "px-4 py-12 text-center text-sm text-muted-foreground",
+          !embedded && "border border-border/60",
+        )}
+      >
         Loading pull requests...
       </div>
     );
@@ -267,7 +276,12 @@ export function ProjectsPullRequestsList({
     return (
       <div className="space-y-3">
         {loadNotice}
-        <div className="border border-dashed border-border/60 px-4 py-12 text-center text-sm text-muted-foreground">
+        <div
+          className={cn(
+            "px-4 py-12 text-center text-sm text-muted-foreground",
+            !embedded && "border border-dashed border-border/60",
+          )}
+        >
           No pull requests yet.
         </div>
       </div>
@@ -299,7 +313,9 @@ export function ProjectsPullRequestsList({
     <div className="space-y-3">
       {loadNotice}
       <div
-        className={PROJECT_LIST_CONTAINER_CLASS}
+        className={
+          embedded ? "divide-y divide-border/60" : PROJECT_LIST_CONTAINER_CLASS
+        }
         data-testid="projects-list-container"
       >
         {pullRequests.map(({ project, pullRequest, repository }) => (
diff --git a/desktop/src/features/projects/ui/ProjectsToolbar.tsx b/desktop/src/features/projects/ui/ProjectsToolbar.tsx
index 925e708c3ba..f4955fcb36b 100644
--- a/desktop/src/features/projects/ui/ProjectsToolbar.tsx
+++ b/desktop/src/features/projects/ui/ProjectsToolbar.tsx
@@ -1,4 +1,5 @@
 import { LayoutGrid, List } from "lucide-react";
+import * as React from "react";
 
 import type {
   ProjectsFilter,
@@ -10,6 +11,17 @@ import { Button } from "@/shared/ui/button";
 const SELECTED_MENU_ITEM_CLASSES =
   "font-semibold text-foreground after:opacity-100 hover:text-foreground";
 
+// Fade the clipped edge(s) of the scrollable tab row so a cut-off label
+// reads as "scroll for more" instead of a rendering bug. Masking the row
+// itself (rather than overlaying a gradient) keeps the effect correct over
+// the translucent sticky header backdrop.
+const MASK_BOTH =
+  "[mask-image:linear-gradient(to_right,transparent,black_1.5rem,black_calc(100%-1.5rem),transparent)]";
+const MASK_LEFT =
+  "[mask-image:linear-gradient(to_right,transparent,black_1.5rem)]";
+const MASK_RIGHT =
+  "[mask-image:linear-gradient(to_left,transparent,black_1.5rem)]";
+
 type ProjectsToolbarProps = {
   filter: ProjectsFilter;
   onFilterChange: (filter: ProjectsFilter) => void;
@@ -51,10 +63,58 @@ export function ProjectsViewModeToggle({
   );
 }
 
+/** Tracks which edges of a horizontal scroller are currently clipped. */
+function useHorizontalOverflow(ref: React.RefObject<HTMLElement | null>) {
+  const [overflow, setOverflow] = React.useState({
+    left: false,
+    right: false,
+  });
+
+  React.useEffect(() => {
+    const element = ref.current;
+    if (!element) return;
+
+    const update = () => {
+      const maxScrollLeft = element.scrollWidth - element.clientWidth;
+      setOverflow((previous) => {
+        const next = {
+          left: element.scrollLeft > 1,
+          right: element.scrollLeft < maxScrollLeft - 1,
+        };
+        return previous.left === next.left && previous.right === next.right
+          ? previous
+          : next;
+      });
+    };
+
+    update();
+    element.addEventListener("scroll", update, { passive: true });
+    const observer = new ResizeObserver(update);
+    observer.observe(element);
+    return () => {
+      element.removeEventListener("scroll", update);
+      observer.disconnect();
+    };
+  }, [ref]);
+
+  return overflow;
+}
+
 export function ProjectsToolbar({
   filter,
   onFilterChange,
 }: ProjectsToolbarProps) {
+  const scrollRef = React.useRef<HTMLFieldSetElement>(null);
+  const overflow = useHorizontalOverflow(scrollRef);
+
+  // Keep the active tab visible when it changes (e.g. selected while
+  // partially scrolled out of view, or restored from storage on mount).
+  React.useEffect(() => {
+    scrollRef.current
+      ?.querySelector<HTMLElement>(`[data-testid="projects-section-${filter}"]`)
+      ?.scrollIntoView({ block: "nearest", inline: "nearest" });
+  }, [filter]);
+
   const filterOptions: Array<{
     label: string;
     value: ProjectsFilter;
@@ -72,7 +132,19 @@ export function ProjectsToolbar({
       data-tauri-drag-region
     >
       <div className="flex h-full min-w-0 flex-1 items-center gap-0.5 overflow-hidden">
-        <fieldset className="flex h-full min-w-0 flex-1 flex-nowrap items-stretch gap-1 overflow-x-auto scrollbar-none [&::-webkit-scrollbar]:hidden">
+        <fieldset
+          className={cn(
+            "flex h-full min-w-0 flex-1 flex-nowrap items-stretch gap-1 overflow-x-auto scrollbar-none [&::-webkit-scrollbar]:hidden",
+            overflow.left && overflow.right
+              ? MASK_BOTH
+              : overflow.left
+                ? MASK_LEFT
+                : overflow.right
+                  ? MASK_RIGHT
+                  : undefined,
+          )}
+          ref={scrollRef}
+        >
           <legend className="sr-only">Project owner filter</legend>
           {filterOptions.map((option) => (
             <Button
diff --git a/desktop/src/features/projects/ui/ProjectsView.tsx b/desktop/src/features/projects/ui/ProjectsView.tsx
index 72a514cea5b..78ba09934de 100644
--- a/desktop/src/features/projects/ui/ProjectsView.tsx
+++ b/desktop/src/features/projects/ui/ProjectsView.tsx
@@ -18,6 +18,10 @@ import { useRepositoryActivitySummariesQuery } from "@/features/projects/reposit
 import { useCreateProjectMutation } from "@/features/projects/useCreateProject";
 import { selectProjectRepository } from "@/features/projects/projectModels";
 import { useProjectsRepoSnapshotsQuery } from "@/features/projects/useProjectsRepoSnapshots";
+import {
+  useMemberChannelIds,
+  useRepositoryUnavailableReasonFor,
+} from "@/features/projects/useRepositoryAccess";
 import {
   projectRepoHostForProject,
   projectRepoHostForRepository,
@@ -38,12 +42,8 @@ import { ProjectsOverviewPanel } from "@/features/projects/ui/ProjectsOverviewPa
 import { ProjectsOverviewRail } from "@/features/projects/ui/ProjectsOverviewRail";
 import { ProjectsPullRequestsList } from "@/features/projects/ui/ProjectsPullRequestsList";
 import { ProjectsWorkItemsLoadNotice } from "@/features/projects/ui/ProjectsWorkItemsLoadNotice";
-import { ProjectsListScopeDropdown } from "@/features/projects/ui/ProjectsListScopeDropdown";
-import { PROJECT_LIST_CONTAINER_CLASS } from "@/features/projects/ui/projectListRowStyles";
-import {
-  ProjectsToolbar,
-  ProjectsViewModeToggle,
-} from "@/features/projects/ui/ProjectsToolbar";
+import { ProjectsListHeaderBar } from "@/features/projects/ui/ProjectsListHeaderBar";
+import { ProjectsToolbar } from "@/features/projects/ui/ProjectsToolbar";
 import {
   hasLocalCheckout,
   hasLocalRepositoryCheckout,
@@ -54,8 +54,10 @@ import {
 } from "@/features/projects/ui/RepositoryCards";
 import {
   getProjectUpdatedAt,
+  isProjectAccessibleToViewer,
   isProjectMine,
   isProjectOwnedByCurrentUser,
+  isRepositoryAccessibleToViewer,
   projectHasAgent,
   projectOwnerIsUser,
   projectPeople,
@@ -89,38 +91,6 @@ import { Button } from "@/shared/ui/button";
 import { PageHeader } from "@/shared/ui/PageHeader";
 
 const MANY_PROJECTS_THRESHOLD = 12;
-const PROJECT_SCOPE_OPTIONS: Array<{
-  label: string;
-  value: ProjectsRepositoryScope;
-}> = [
-  { label: "All", value: "all" },
-  { label: "My Projects", value: "mine" },
-  { label: "Local", value: "local" },
-];
-const REPOSITORY_SCOPE_OPTIONS: Array<{
-  label: string;
-  value: ProjectsRepositoryScope;
-}> = [
-  { label: "All", value: "all" },
-  { label: "My Repositories", value: "mine" },
-  { label: "Local", value: "local" },
-  { label: "Buzz-hosted", value: "buzz" },
-  { label: "Linked", value: "linked" },
-];
-const PULL_REQUEST_SCOPE_OPTIONS: Array<{
-  label: string;
-  value: ProjectsWorkItemScope;
-}> = [
-  { label: "All", value: "all" },
-  { label: "My Pull Requests", value: "mine" },
-];
-const ISSUE_SCOPE_OPTIONS: Array<{
-  label: string;
-  value: ProjectsWorkItemScope;
-}> = [
-  { label: "All", value: "all" },
-  { label: "My Issues", value: "mine" },
-];
 
 export function ProjectsView() {
   const { goProject } = useAppNavigation();
@@ -217,6 +187,11 @@ export function ProjectsView() {
     snapshotProjects,
     activeCommunity?.reposDir,
   );
+  const memberChannelIds = useMemberChannelIds();
+  const repositoryUnavailableReasonFor = useRepositoryUnavailableReasonFor(
+    repoSnapshotsQuery.data?.unavailable,
+    memberChannelIds,
+  );
   const [createProjectOpen, setCreateProjectOpen] = React.useState(false);
   const [createIssueOpen, setCreateIssueOpen] = React.useState(false);
   const [createPullRequestOpen, setCreatePullRequestOpen] =
@@ -325,6 +300,16 @@ export function ProjectsView() {
     [localRepositoriesQuery.data],
   );
 
+  const repositoryAccessInput = React.useMemo(
+    () => ({
+      currentPubkey,
+      localRepoNames,
+      memberChannelIds,
+      relayOrigin,
+    }),
+    [currentPubkey, localRepoNames, memberChannelIds, relayOrigin],
+  );
+
   const visibleProjects = React.useMemo(() => {
     if (filter !== "projects" && filter !== "agents" && filter !== "users") {
       return [];
@@ -334,6 +319,8 @@ export function ProjectsView() {
       .filter((project) => {
         const summary = activitySummariesQuery.data?.[project.id];
         const people = projectPeople(project, summary);
+        if (repositoryScope === "accessible")
+          return isProjectAccessibleToViewer(project, repositoryAccessInput);
         if (repositoryScope === "mine")
           return isProjectMine(project, currentPubkey);
         if (repositoryScope === "local")
@@ -376,6 +363,7 @@ export function ProjectsView() {
     profiles,
     projects,
     relayOrigin,
+    repositoryAccessInput,
     repositoryScope,
     sort,
   ]);
@@ -396,6 +384,12 @@ export function ProjectsView() {
     ];
     return repositories
       .filter(({ repository }) => {
+        if (repositoryScope === "accessible") {
+          return isRepositoryAccessibleToViewer(
+            repository,
+            repositoryAccessInput,
+          );
+        }
         if (repositoryScope === "mine") {
           if (!currentPubkey) return false;
           const normalizedCurrentPubkey = normalizePubkey(currentPubkey);
@@ -444,6 +438,7 @@ export function ProjectsView() {
     localRepoNames,
     projects,
     relayOrigin,
+    repositoryAccessInput,
     repositoryActivitySummariesQuery.data,
     repositoryScope,
     sort,
@@ -625,9 +620,9 @@ export function ProjectsView() {
               people={projectPeople(project, summary)}
               profiles={profiles}
               project={project}
-              repositoryUnavailableReason={
-                repoSnapshotsQuery.data?.unavailable[project.id]
-              }
+              repositoryUnavailableReason={repositoryUnavailableReasonFor(
+                project,
+              )}
               summary={summary}
             />
           );
@@ -635,7 +630,7 @@ export function ProjectsView() {
       </div>
     ) : (
       <div
-        className={PROJECT_LIST_CONTAINER_CLASS}
+        className="divide-y divide-border/60"
         data-testid="projects-list-container"
       >
         {visibleProjects.map((project) => {
@@ -652,9 +647,9 @@ export function ProjectsView() {
               people={projectPeople(project, summary)}
               profiles={profiles}
               project={project}
-              repositoryUnavailableReason={
-                repoSnapshotsQuery.data?.unavailable[project.id]
-              }
+              repositoryUnavailableReason={repositoryUnavailableReasonFor(
+                project,
+              )}
               summary={summary}
             />
           );
@@ -683,7 +678,7 @@ export function ProjectsView() {
         ))}
       </div>
     ) : (
-      <div className={PROJECT_LIST_CONTAINER_CLASS}>
+      <div className="divide-y divide-border/60">
         {visibleRepositories.map(({ project, repository }) => (
           <RepositoryListRow
             hasLocal={hasLocalRepositoryCheckout(repository, localRepoNames)}
@@ -701,27 +696,21 @@ export function ProjectsView() {
       </div>
     );
 
-  const listControls = (
-    <div className="flex flex-wrap items-center gap-2 sm:justify-end">
-      <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) =>
-            handleSortChange(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={handleViewModeChange}
-        viewMode={viewMode}
-      />
-    </div>
+  const listHeaderBar = (
+    <ProjectsListHeaderBar
+      filter={filter}
+      variant={viewMode === "list" ? "row" : "bar"}
+      issueScope={issueScope}
+      onIssueScopeChange={handleIssueScopeChange}
+      onPullRequestScopeChange={handlePullRequestScopeChange}
+      onRepositoryScopeChange={handleRepositoryScopeChange}
+      onSortChange={handleSortChange}
+      onViewModeChange={handleViewModeChange}
+      pullRequestScope={pullRequestScope}
+      repositoryScope={repositoryScope}
+      sort={sort}
+      viewMode={viewMode}
+    />
   );
 
   const workItemFailedSections = [
@@ -776,10 +765,9 @@ export function ProjectsView() {
 
   const projectsNavigation = (
     <div className="flex h-[3.25rem] min-w-0 items-center">
-      <div className="h-full min-w-0 flex-1">
+      <div className="h-full min-w-0 flex-1 overflow-hidden">
         <ProjectsToolbar filter={filter} onFilterChange={handleFilterChange} />
       </div>
-      {createMenu}
     </div>
   );
 
@@ -797,6 +785,9 @@ export function ProjectsView() {
         className="pointer-events-none absolute right-[3px] top-0 z-50 w-1 rounded-full bg-border/80 opacity-0 transition-opacity duration-200"
         ref={scrollIndicatorRef}
       />
+      {/* Create button pinned to the pane's top-right corner: it never
+          scrolls with the page, it just stays put. */}
+      <div className="absolute right-4 top-4 z-40">{createMenu}</div>
       <CreateProjectDialog
         isCreating={createProjectMutation.isPending}
         onCreate={async (input) => {
@@ -877,79 +868,62 @@ export function ProjectsView() {
                   <section className="space-y-3">{activityFeed}</section>
                 </ProjectsOverviewPanel>
               ) : (
-                <section className="space-y-3">
-                  <div className="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
+                <section>
+                  {/* In list view the header is the table's first row inside
+                      the bordered container; in card view it is a standalone
+                      bar with the cards flowing below. */}
+                  <div
+                    className={
+                      viewMode === "list"
+                        ? "overflow-hidden rounded-xl border border-border/60"
+                        : "space-y-3"
+                    }
+                  >
+                    {listHeaderBar}
                     {filter === "prs" ? (
-                      <ProjectsListScopeDropdown
-                        label="Filter pull requests"
-                        onChange={handlePullRequestScopeChange}
-                        options={PULL_REQUEST_SCOPE_OPTIONS}
-                        value={pullRequestScope}
+                      <ProjectsPullRequestsList
+                        embedded={viewMode === "list"}
+                        error={projectsWorkItemsQuery.error}
+                        failedSections={
+                          projectsWorkItemsQuery.data?.pullRequests
+                            .failedSections ?? []
+                        }
+                        isLoading={projectsWorkItemsQuery.isLoading}
+                        isRetrying={
+                          projectsWorkItemsQuery.isFetching &&
+                          !projectsWorkItemsQuery.isLoading
+                        }
+                        onOpen={handleOpenPullRequest}
+                        onRetry={() => void projectsWorkItemsQuery.refetch()}
+                        profiles={profiles}
+                        pullRequests={visiblePullRequests}
+                        viewMode={viewMode}
                       />
                     ) : filter === "issues" ? (
-                      <ProjectsListScopeDropdown
-                        label="Filter issues"
-                        onChange={handleIssueScopeChange}
-                        options={ISSUE_SCOPE_OPTIONS}
-                        value={issueScope}
+                      <ProjectsIssuesList
+                        embedded={viewMode === "list"}
+                        error={projectsWorkItemsQuery.error}
+                        failedSections={
+                          projectsWorkItemsQuery.data?.issues.failedSections ??
+                          []
+                        }
+                        isLoading={projectsWorkItemsQuery.isLoading}
+                        isRetrying={
+                          projectsWorkItemsQuery.isFetching &&
+                          !projectsWorkItemsQuery.isLoading
+                        }
+                        issues={visibleIssues}
+                        onOpen={handleOpenIssue}
+                        onRetry={() => void projectsWorkItemsQuery.refetch()}
+                        profiles={profiles}
+                        viewMode={viewMode}
                       />
                     ) : filter === "projects" ? (
-                      <ProjectsListScopeDropdown
-                        label="Filter projects"
-                        onChange={handleRepositoryScopeChange}
-                        options={PROJECT_SCOPE_OPTIONS}
-                        value={repositoryScope}
-                      />
+                      projectItems
                     ) : (
-                      <ProjectsListScopeDropdown
-                        label="Filter repositories"
-                        onChange={handleRepositoryScopeChange}
-                        options={REPOSITORY_SCOPE_OPTIONS}
-                        value={repositoryScope}
-                      />
+                      repositoryItems
                     )}
-                    {listControls}
                   </div>
-                  {filter === "prs" ? (
-                    <ProjectsPullRequestsList
-                      error={projectsWorkItemsQuery.error}
-                      failedSections={
-                        projectsWorkItemsQuery.data?.pullRequests
-                          .failedSections ?? []
-                      }
-                      isLoading={projectsWorkItemsQuery.isLoading}
-                      isRetrying={
-                        projectsWorkItemsQuery.isFetching &&
-                        !projectsWorkItemsQuery.isLoading
-                      }
-                      onOpen={handleOpenPullRequest}
-                      onRetry={() => void projectsWorkItemsQuery.refetch()}
-                      profiles={profiles}
-                      pullRequests={visiblePullRequests}
-                      viewMode={viewMode}
-                    />
-                  ) : filter === "issues" ? (
-                    <ProjectsIssuesList
-                      error={projectsWorkItemsQuery.error}
-                      failedSections={
-                        projectsWorkItemsQuery.data?.issues.failedSections ?? []
-                      }
-                      isLoading={projectsWorkItemsQuery.isLoading}
-                      isRetrying={
-                        projectsWorkItemsQuery.isFetching &&
-                        !projectsWorkItemsQuery.isLoading
-                      }
-                      issues={visibleIssues}
-                      onOpen={handleOpenIssue}
-                      onRetry={() => void projectsWorkItemsQuery.refetch()}
-                      profiles={profiles}
-                      viewMode={viewMode}
-                    />
-                  ) : filter === "projects" ? (
-                    projectItems
-                  ) : (
-                    repositoryItems
-                  )}
                 </section>
               )}
             </div>
diff --git a/desktop/src/features/projects/ui/RepositoryCards.tsx b/desktop/src/features/projects/ui/RepositoryCards.tsx
index b412b439474..575e4f35507 100644
--- a/desktop/src/features/projects/ui/RepositoryCards.tsx
+++ b/desktop/src/features/projects/ui/RepositoryCards.tsx
@@ -5,8 +5,14 @@ import type {
   ProjectActivitySummary,
   Repository,
 } from "@/features/projects/hooks";
-import type { UserProfileLookup } from "@/features/profile/lib/identity";
-import { projectRepoHostForRepository } from "@/features/projects/lib/projectRepoHost";
+import {
+  resolveUserLabel,
+  type UserProfileLookup,
+} from "@/features/profile/lib/identity";
+import {
+  projectRepoHostForRepository,
+  repositoryDisplayPath,
+} from "@/features/projects/lib/projectRepoHost";
 import {
   formatExactTimestamp,
   relativeTime,
@@ -99,11 +105,20 @@ function RepositoryOpenButton({
 
 function RepositoryIdentity({
   inlineBranch = false,
+  profiles,
   project,
   repository,
-}: Pick<RepositoryItemProps, "project" | "repository"> & {
+}: Pick<RepositoryItemProps, "profiles" | "project" | "repository"> & {
   inlineBranch?: boolean;
 }) {
+  // Where the git data lives beats repeating the (often identical) project
+  // name — "github.com/block/buzz" for external repos, "owner/repo" for
+  // Buzz-hosted ones.
+  const displayPath = repositoryDisplayPath(
+    repository,
+    useRelayOrigin(),
+    resolveUserLabel({ pubkey: repository.owner, profiles }),
+  );
   return (
     <>
       <RepositoryHostIcon repository={repository} />
@@ -114,7 +129,7 @@ function RepositoryIdentity({
           </span>
         </div>
         <p className={PROJECT_LIST_ROW_PREVIEW_CLASS}>
-          {project.name}
+          {displayPath ?? project.name}
           {inlineBranch ? ` · ${repository.defaultBranch}` : ""}
         </p>
       </div>
@@ -203,6 +218,7 @@ export function RepositoryGridCard(props: RepositoryItemProps) {
         <div className="flex min-w-0 items-start gap-2.5">
           <RepositoryIdentity
             inlineBranch
+            profiles={profiles}
             project={project}
             repository={repository}
           />
@@ -258,7 +274,11 @@ export function RepositoryListRow(props: RepositoryItemProps) {
       />
       <div className="pointer-events-none relative z-10 flex min-w-0 flex-1 items-center gap-2.5">
         <div className="flex min-w-0 flex-1 items-center gap-2.5">
-          <RepositoryIdentity project={project} repository={repository} />
+          <RepositoryIdentity
+            profiles={profiles}
+            project={project}
+            repository={repository}
+          />
         </div>
         <div
           className={cn(PROJECT_LIST_ROW_TRAILING_CLASS, "pointer-events-auto")}
diff --git a/desktop/src/features/projects/useRepositoryAccess.ts b/desktop/src/features/projects/useRepositoryAccess.ts
new file mode 100644
index 00000000000..16ba7085cb2
--- /dev/null
+++ b/desktop/src/features/projects/useRepositoryAccess.ts
@@ -0,0 +1,47 @@
+import * as React from "react";
+
+import { useChannelsQuery } from "@/features/channels/hooks";
+import type { Project } from "@/features/projects/hooks";
+import {
+  type ProjectRepoUnavailableReason,
+  refineRepoUnavailableReason,
+} from "@/features/projects/lib/projectRepoAvailability";
+import { selectProjectRepository } from "@/features/projects/projectModels";
+
+/** Channel ids the viewer is a member of, or `null` while they load. */
+export function useMemberChannelIds(): readonly string[] | null {
+  const channelsQuery = useChannelsQuery();
+  return React.useMemo(
+    () =>
+      channelsQuery.data
+        ? channelsQuery.data
+            .filter((channel) => channel.isMember)
+            .map((channel) => channel.id)
+        : null,
+    [channelsQuery.data],
+  );
+}
+
+/**
+ * Channel-ACL denials arrive as the same 404 as a missing repository
+ * (anti-enumeration), so a project's raw snapshot reason is re-classified
+ * with the repository's channel binding and the viewer's memberships
+ * before it reaches the status indicator.
+ */
+export function useRepositoryUnavailableReasonFor(
+  unavailable: Record<string, ProjectRepoUnavailableReason> | undefined,
+  memberChannelIds: readonly string[] | null,
+): (project: Project) => ProjectRepoUnavailableReason | undefined {
+  return React.useCallback(
+    (project: Project) => {
+      const reason = unavailable?.[project.id];
+      if (!reason) return undefined;
+      return refineRepoUnavailableReason({
+        reason,
+        repositoryChannelId: selectProjectRepository(project, null)?.channelId,
+        memberChannelIds,
+      });
+    },
+    [memberChannelIds, unavailable],
+  );
+}
diff --git a/desktop/src/features/settings/ui/SettingsPanels.tsx b/desktop/src/features/settings/ui/SettingsPanels.tsx
index 901c9152b71..64ec8ff552e 100644
--- a/desktop/src/features/settings/ui/SettingsPanels.tsx
+++ b/desktop/src/features/settings/ui/SettingsPanels.tsx
@@ -37,6 +37,11 @@ import {
   useThreadViewMode,
   type ThreadViewMode,
 } from "@/features/channels/lib/threadViewModePreference";
+import {
+  setLinkPreviewStyle,
+  useLinkPreviewStyle,
+  type LinkPreviewStyle,
+} from "@/shared/lib/linkPreviewStylePreference";
 import { cn } from "@/shared/lib/cn";
 import { useCommunities } from "@/features/communities/useCommunities";
 import { Badge } from "@/shared/ui/badge";
@@ -694,11 +699,86 @@ function ThemeSettingsCard() {
         </AnimatePresence>
       )}
 
+      <LinkPreviewStyleSetting />
       <ThreadLayoutSetting />
     </section>
   );
 }
 
+const LINK_PREVIEW_STYLE_OPTIONS: {
+  value: LinkPreviewStyle;
+  label: string;
+  description: string;
+}[] = [
+  {
+    value: "compact",
+    label: "Compact",
+    description: "Show links as compact horizontal cards",
+  },
+  {
+    value: "rich",
+    label: "Rich",
+    description: "Unfurl links with larger images and descriptions",
+  },
+];
+
+function LinkPreviewStyleSetting() {
+  const style = useLinkPreviewStyle();
+  const activeOption =
+    LINK_PREVIEW_STYLE_OPTIONS.find((option) => option.value === style) ??
+    LINK_PREVIEW_STYLE_OPTIONS[0];
+
+  return (
+    <SettingsOptionGroup className="mt-8">
+      <SettingsOptionRow>
+        <div className="min-w-0">
+          <p className="text-sm font-medium">Links</p>
+          <p className="text-sm font-normal text-muted-foreground">
+            {activeOption.description}
+          </p>
+        </div>
+        <DropdownMenu modal={false}>
+          <DropdownMenuTrigger asChild>
+            <Button
+              className="h-7 min-w-28 justify-between gap-1.5 rounded-full border border-border/50 bg-muted/45 px-2.5 text-xs font-medium text-foreground shadow-none hover:bg-muted/70"
+              data-testid="link-preview-style-trigger"
+              size="sm"
+              type="button"
+              variant="ghost"
+            >
+              <span className="truncate">{activeOption.label}</span>
+              <ChevronDown className="h-4 w-4 text-muted-foreground" />
+            </Button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="end" className="min-w-72">
+            <DropdownMenuRadioGroup
+              onValueChange={(next) =>
+                setLinkPreviewStyle(next as LinkPreviewStyle)
+              }
+              value={style}
+            >
+              {LINK_PREVIEW_STYLE_OPTIONS.map((option) => (
+                <DropdownMenuRadioItem
+                  data-testid={`link-preview-style-${option.value}`}
+                  key={option.value}
+                  value={option.value}
+                >
+                  <span className="flex min-w-0 flex-col">
+                    <span className="font-medium">{option.label}</span>
+                    <span className="text-2xs text-muted-foreground">
+                      {option.description}
+                    </span>
+                  </span>
+                </DropdownMenuRadioItem>
+              ))}
+            </DropdownMenuRadioGroup>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </SettingsOptionRow>
+    </SettingsOptionGroup>
+  );
+}
+
 const THREAD_VIEW_MODE_OPTIONS: {
   value: ThreadViewMode;
   label: string;
diff --git a/desktop/src/features/sidebar/lib/channelMutesSync.test.mjs b/desktop/src/features/sidebar/lib/channelMutesSync.test.mjs
new file mode 100644
index 00000000000..845e5a5accc
--- /dev/null
+++ b/desktop/src/features/sidebar/lib/channelMutesSync.test.mjs
@@ -0,0 +1,198 @@
+import assert from "node:assert/strict";
+import test, { mock } from "node:test";
+
+import { relayClient } from "@/shared/api/relayClient";
+import { ChannelMuteSyncManager } from "./channelMutesSync.ts";
+import {
+  makeFakeWindow,
+  installFakeWindow,
+} from "./sidebarSyncTestHelpers.mjs";
+
+const RELAY = "wss://r.test";
+const RELAY_KEY = encodeURIComponent(RELAY);
+
+function makeStore(channels = {}) {
+  return { version: 1, channels };
+}
+
+// ─── destroy() must cancel pending publish, not flush ─────────────────────────
+
+// Regression guard for the community-switch cross-relay publish vector:
+// mute a channel in relay A → destroy() called (relayUrl dep change) →
+// no publish should fire.
+test("destroy: cancels pending publish without flushing to the relay", () => {
+  const publishCalls = [];
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", (...args) => {
+    publishCalls.push(args);
+    return Promise.resolve();
+  });
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelMuteSyncManager("pk-test", RELAY);
+    manager.publishMutes(makeStore({ ch1: { muted: true, updatedAt: 100 } }));
+    manager.destroy();
+    assert.equal(publishCalls.length, 0);
+    assert.equal(manager.getPendingMuteStore(), null);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
+
+test("destroy: aborts in-flight doPublish after fetchOwnBlobBeforePublish resolves", async () => {
+  let releaseFetch = null;
+  const publishCalls = [];
+  mock.method(
+    relayClient,
+    "fetchEvents",
+    () =>
+      new Promise((res) => {
+        releaseFetch = () => res([]);
+      }),
+  );
+  mock.method(relayClient, "publishEvent", (...args) => {
+    publishCalls.push(args);
+    return Promise.resolve();
+  });
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelMuteSyncManager("pk-race", RELAY);
+    manager.publishMutes(makeStore({ ch1: { muted: true, updatedAt: 100 } }));
+    fw._fireTimer();
+    manager.destroy();
+    releaseFetch();
+    await new Promise((r) => setTimeout(r, 0));
+    assert.equal(publishCalls.length, 0);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
+
+test("destroy: is safe to call with no pending publish", () => {
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelMuteSyncManager("pk-no-pending", RELAY);
+    assert.doesNotThrow(() => manager.destroy());
+  } finally {
+    restore();
+  }
+});
+
+// ─── Boot seed-publish guard (the revert-fix regression suite) ─────────────────
+
+// 1. fetch failed → hold, pendingStore null (mutation: remove failed guard → seed queued)
+test("revert-fix: fetch failed (error) does not trigger seed-publish via bootstrap", async () => {
+  mock.method(relayClient, "fetchEvents", () =>
+    Promise.reject(new Error("relay timeout")),
+  );
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelMuteSyncManager("pk-fail", RELAY);
+    const result = await manager.bootstrap(
+      makeStore({ ch1: { muted: true, updatedAt: 1 } }),
+    );
+    assert.equal(result.action, "hold");
+    assert.equal(manager.getPendingMuteStore(), null);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
+
+// 2. absent + prior watermark → hold, pendingStore null (mutation: clear watermark → seed queued)
+test("revert-fix: absent fetch with prior watermark blocks seed-publish via bootstrap", async () => {
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  fw.localStorage.setItem(
+    `buzz-sync-watermark.v1:channel-mutes:pk-stale:${RELAY_KEY}`,
+    "1700000000",
+  );
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelMuteSyncManager("pk-stale", RELAY);
+    assert.ok(
+      Number(
+        fw.localStorage.getItem(
+          `buzz-sync-watermark.v1:channel-mutes:pk-stale:${RELAY_KEY}`,
+        ) ?? "0",
+      ) > 0,
+    );
+    const result = await manager.bootstrap(
+      makeStore({ ch1: { muted: true, updatedAt: 1 } }),
+    );
+    assert.equal(result.action, "hold");
+    assert.equal(manager.getPendingMuteStore(), null);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
+
+// 3. absent + zero watermark + non-empty → seed queued (mutation: remove seed call → pendingStore null)
+test("revert-fix: absent fetch with zero watermark seeds via bootstrap (first-sync preserved)", async () => {
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelMuteSyncManager("pk-fresh", RELAY);
+    assert.equal(
+      fw.localStorage.getItem(
+        `buzz-sync-watermark.v1:channel-mutes:pk-fresh:${RELAY_KEY}`,
+      ),
+      null,
+    );
+    const result = await manager.bootstrap(
+      makeStore({ ch1: { muted: true, updatedAt: 1 } }),
+    );
+    assert.equal(result.action, "hold");
+    assert.ok(manager.getPendingMuteStore() !== null);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
+
+// 4. relay-A / relay-B watermark isolation
+// Mutation: using pubkey-only key (no relay) makes relay A's head suppress relay B's first-sync.
+test("revert-fix: relay-A watermark does not suppress first-sync seed on relay-B", async () => {
+  const relayA = "wss://a.relay.test";
+  const relayB = "wss://b.relay.test";
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  fw.localStorage.setItem(
+    `buzz-sync-watermark.v1:channel-mutes:pk-iso:${encodeURIComponent(relayA)}`,
+    "1700000100",
+  );
+  const restore = installFakeWindow(fw);
+  try {
+    const managerB = new ChannelMuteSyncManager("pk-iso", relayB);
+    assert.equal(
+      fw.localStorage.getItem(
+        `buzz-sync-watermark.v1:channel-mutes:pk-iso:${encodeURIComponent(relayB)}`,
+      ),
+      null,
+      "relay B watermark must be independent of relay A head",
+    );
+    const result = await managerB.bootstrap(
+      makeStore({ ch1: { muted: true, updatedAt: 1 } }),
+    );
+    assert.equal(result.action, "hold");
+    assert.ok(
+      managerB.getPendingMuteStore() !== null,
+      "first-sync seed on relay B must not be blocked by relay A watermark",
+    );
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
diff --git a/desktop/src/features/sidebar/lib/channelMutesSync.ts b/desktop/src/features/sidebar/lib/channelMutesSync.ts
index 0a0d2bb9f63..5e8a17e74d9 100644
--- a/desktop/src/features/sidebar/lib/channelMutesSync.ts
+++ b/desktop/src/features/sidebar/lib/channelMutesSync.ts
@@ -11,8 +11,15 @@ import {
   parseMutePayload,
   type ChannelMuteStore,
 } from "./channelMutesStorage";
+import {
+  advanceWatermark,
+  readWatermark,
+  runBootstrap,
+  type FetchResult,
+} from "./sidebarSyncWatermark";
 
 const D_TAG = "channel-mutes";
+const BLOB_TYPE = D_TAG;
 const DEBOUNCE_MS = 2_000;
 
 export type RemoteMutes = {
@@ -34,16 +41,20 @@ async function decryptAndParse(event: RelayEvent): Promise<RemoteMutes | null> {
 
 export class ChannelMuteSyncManager {
   private pubkey: string;
+  private relayUrl: string;
   private debounceTimer: number | null = null;
-  private lastRemoteCreatedAt = 0;
+  private lastRemoteCreatedAt: number;
   private pendingStore: ChannelMuteStore | null = null;
   private lastPublishedStore: ChannelMuteStore | null = null;
+  private destroyed = false;
 
-  constructor(pubkey: string) {
+  constructor(pubkey: string, relayUrl: string) {
     this.pubkey = pubkey;
+    this.relayUrl = relayUrl;
+    this.lastRemoteCreatedAt = readWatermark(pubkey, BLOB_TYPE, relayUrl);
   }
 
-  async fetchRemoteMutes(): Promise<RemoteMutes | null> {
+  async fetchRemoteMutes(): Promise<FetchResult<RemoteMutes>> {
     try {
       const events = await relayClient.fetchEvents({
         kinds: [KIND_CHANNEL_MUTES],
@@ -51,19 +62,31 @@ export class ChannelMuteSyncManager {
         "#d": [D_TAG],
         limit: 1,
       });
-      if (events.length === 0) return null;
-      if (events[0].pubkey !== this.pubkey) return null;
-      const result = await decryptAndParse(events[0]);
-      if (result) {
-        this.lastRemoteCreatedAt = Math.max(
-          this.lastRemoteCreatedAt,
-          result.createdAt,
-        );
+      if (events.length === 0 || events[0].pubkey !== this.pubkey) {
+        return { status: "absent" };
+      }
+      const event = events[0];
+      this.recordRemoteHead(event.created_at);
+      const result = await decryptAndParse(event);
+      if (!result) {
+        return { status: "failed", createdAt: event.created_at };
       }
-      return result;
+      return {
+        status: "found",
+        data: result,
+        createdAt: result.createdAt,
+        eventId: result.eventId,
+      };
     } catch {
-      return null;
+      return { status: "failed" };
+    }
+  }
+
+  private recordRemoteHead(createdAt: number): void {
+    if (createdAt > this.lastRemoteCreatedAt) {
+      this.lastRemoteCreatedAt = createdAt;
     }
+    advanceWatermark(this.pubkey, BLOB_TYPE, this.relayUrl, createdAt);
   }
 
   cancelPendingMutePublish(): void {
@@ -99,12 +122,11 @@ export class ChannelMuteSyncManager {
         limit: 1,
       });
       if (events.length === 0 || events[0].pubkey !== this.pubkey) return store;
-      const remote = await decryptAndParse(events[0]);
+      const event = events[0];
+      // Record the raw head before decrypt on the pre-publish path too.
+      this.recordRemoteHead(event.created_at);
+      const remote = await decryptAndParse(event);
       if (!remote) return store;
-      this.lastRemoteCreatedAt = Math.max(
-        this.lastRemoteCreatedAt,
-        remote.createdAt,
-      );
       return mergeStores(store, remote.store);
     } catch {
       return store;
@@ -132,6 +154,10 @@ export class ChannelMuteSyncManager {
   private async doPublish(store: ChannelMuteStore): Promise<void> {
     try {
       const merged = await this.fetchOwnBlobBeforePublish(store);
+      // Guard: manager may have been destroyed while fetchOwnBlobBeforePublish
+      // was awaited (community switch during in-flight fetch). If so, abort
+      // before touching the relay.
+      if (this.destroyed) return;
       if (this.isIdenticalToLastPublished(merged)) {
         this.pendingStore = null;
         return;
@@ -154,15 +180,13 @@ export class ChannelMuteSyncManager {
           ["t", D_TAG], // relay discoverability; not used in our filters
         ],
       });
+      if (this.destroyed) return;
       await relayClient.publishEvent(
         event,
         "Timed out publishing channel mutes.",
         "Failed to publish channel mutes.",
       );
-      this.lastRemoteCreatedAt = Math.max(
-        this.lastRemoteCreatedAt,
-        event.created_at,
-      );
+      this.recordRemoteHead(event.created_at);
       this.lastPublishedStore = merged;
       this.pendingStore = null;
     } catch (error) {
@@ -182,12 +206,11 @@ export class ChannelMuteSyncManager {
       },
       (event: RelayEvent) => {
         if (event.pubkey !== this.pubkey) return;
+        // Record the raw head before decrypt so an undecryptable live event
+        // still advances the watermark and blocks future seed-publish.
+        this.recordRemoteHead(event.created_at);
         void decryptAndParse(event).then((result) => {
           if (result) {
-            this.lastRemoteCreatedAt = Math.max(
-              this.lastRemoteCreatedAt,
-              result.createdAt,
-            );
             onUpdate(result);
           }
         });
@@ -195,14 +218,30 @@ export class ChannelMuteSyncManager {
     );
   }
 
+  /**
+   * Fetches the remote blob on first mount, records the remote head, and
+   * delegates the seed/hold/apply-remote decision to `runBootstrap`.
+   */
+  async bootstrap(localStore: ChannelMuteStore) {
+    const fetchResult = await this.fetchRemoteMutes();
+    return runBootstrap({
+      fetchResult,
+      lastHead: this.lastRemoteCreatedAt,
+      localStore,
+      isLocalNonEmpty: (s) => Object.keys(s.channels).length > 0,
+      publishFn: (s) => this.publishMutes(s),
+    });
+  }
+
   destroy(): void {
-    if (this.debounceTimer !== null && this.pendingStore !== null) {
-      window.clearTimeout(this.debounceTimer);
-      this.debounceTimer = null;
-      void this.doPublish(this.pendingStore);
-    } else if (this.debounceTimer !== null) {
-      window.clearTimeout(this.debounceTimer);
-      this.debounceTimer = null;
-    }
+    // Cancel any pending publish and mark this manager as destroyed so any
+    // in-flight doPublish() calls abort before reaching relayClient.
+    // Pending debounce-window changes are intentionally dropped: flushing
+    // could publish relay A's state to relay B via the shared relayClient
+    // singleton. Local entries survive because the apply/publish paths merge
+    // per-entry via mergeStores, so no local work is permanently lost.
+    this.destroyed = true;
+    this.cancelPendingMutePublish();
+    this.pendingStore = null;
   }
 }
diff --git a/desktop/src/features/sidebar/lib/channelSectionsStorage.ts b/desktop/src/features/sidebar/lib/channelSectionsStorage.ts
index 0d6b5768b6d..3900c40c184 100644
--- a/desktop/src/features/sidebar/lib/channelSectionsStorage.ts
+++ b/desktop/src/features/sidebar/lib/channelSectionsStorage.ts
@@ -1,4 +1,4 @@
-import { normalizeRelayUrl } from "@/features/profile/lib/selfProfileStorage";
+import { normalizeRelayUrl } from "@/shared/lib/normalizeRelayUrl";
 
 const STORAGE_KEY_PREFIX = "buzz-channel-sections.v1";
 
diff --git a/desktop/src/features/sidebar/lib/channelSectionsSync.test.mjs b/desktop/src/features/sidebar/lib/channelSectionsSync.test.mjs
index 5dad6c86735..904ac1f3f24 100644
--- a/desktop/src/features/sidebar/lib/channelSectionsSync.test.mjs
+++ b/desktop/src/features/sidebar/lib/channelSectionsSync.test.mjs
@@ -3,6 +3,11 @@ import test, { mock } from "node:test";
 
 import { relayClient } from "@/shared/api/relayClient";
 import { ChannelSectionSyncManager } from "./channelSectionsSync.ts";
+import {
+  makeFakeWindow,
+  installFakeWindow,
+  installTauriMock,
+} from "./sidebarSyncTestHelpers.mjs";
 
 function makeStore(overrides = {}) {
   return {
@@ -13,198 +18,265 @@ function makeStore(overrides = {}) {
   };
 }
 
+function makeSectionsStore(sections = []) {
+  return { version: 1, sections, assignments: {} };
+}
+
+const RELAY = "wss://r.test";
+const RELAY_KEY = encodeURIComponent(RELAY);
+
 // ─── destroy() must cancel pending publish, not flush ─────────────────────────
 
 // Regression guard for the community-switch cross-relay publish vector:
 // edit sections in relay A → destroy() is called (relayUrl dep change) →
-// no publish should fire. The scoped localStorage write is durable; when the
-// user returns to relay A the seed-publish path handles it.
+// no publish should fire.
 test("destroy: cancels pending publish without flushing to the relay", () => {
-  const publishCalls = [];
   mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  const publishCalls = [];
   mock.method(relayClient, "publishEvent", (...args) => {
     publishCalls.push(args);
     return Promise.resolve();
   });
-
-  // Simulate the timer scheduler with a manual clock so we can advance it.
-  let timerCallback = null;
-  const originalSetTimeout = globalThis.window?.setTimeout;
-  const originalClearTimeout = globalThis.window?.clearTimeout;
-
-  // Inject a fake window.setTimeout/clearTimeout if needed.
-  const fakeTimers = [];
-  let nextId = 1;
-  if (typeof globalThis.window === "undefined") {
-    globalThis.window = {};
-  }
-  globalThis.window.setTimeout = (fn, _ms) => {
-    const id = nextId++;
-    fakeTimers.push({ id, fn });
-    timerCallback = fn;
-    return id;
-  };
-  globalThis.window.clearTimeout = (id) => {
-    const idx = fakeTimers.findIndex((t) => t.id === id);
-    if (idx !== -1) {
-      fakeTimers.splice(idx, 1);
-      timerCallback = null;
-    }
-  };
-
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
   try {
-    const manager = new ChannelSectionSyncManager("pk-test");
-    const store = makeStore({
-      sections: [{ id: "s1", name: "Work", order: 0 }],
-    });
-
-    // Queue a publish — this sets the debounce timer.
-    manager.publishSections(store);
-    assert.ok(timerCallback !== null, "debounce timer should be set");
-
-    // Destroy before the debounce fires — simulates community switch.
-    manager.destroy();
-
-    // Timer must be cleared and no publish should fire now.
-    assert.ok(
-      timerCallback === null,
-      "debounce timer should be cleared on destroy",
-    );
-
-    // Advance time by invoking the callback that was cleared — it shouldn't exist.
-    // If clearTimeout didn't work, try firing whatever was captured before destroy.
-    // (There's nothing to fire after a correct destroy.)
-    assert.equal(
-      publishCalls.length,
-      0,
-      "no publish event should have been sent after destroy",
+    const manager = new ChannelSectionSyncManager("pk-test", RELAY);
+    manager.publishSections(
+      makeStore({ sections: [{ id: "s1", name: "Work", order: 0 }] }),
     );
+    assert.ok(fw._hasTimer(), "debounce timer should be set");
+    manager.destroy();
+    assert.ok(!fw._hasTimer(), "debounce timer should be cleared on destroy");
+    assert.equal(publishCalls.length, 0);
+    assert.equal(manager.getPendingStore(), null);
   } finally {
-    // Restore timer functions.
-    if (originalSetTimeout !== undefined) {
-      globalThis.window.setTimeout = originalSetTimeout;
-    }
-    if (originalClearTimeout !== undefined) {
-      globalThis.window.clearTimeout = originalClearTimeout;
-    }
+    restore();
     mock.reset();
   }
 });
 
-// Regression guard for the timer-fired race: debounce fires → doPublish starts
-// awaiting fetchOwnBlobBeforePublish → destroy() is called (relayUrl dep
-// change) → publishEvent must never be called even though the timer already
-// fired and cleared itself before destroy() ran.
+// Regression guard for the timer-fired race: debounce fires → doPublish awaits
+// fetchOwnBlobBeforePublish → destroy() called → publishEvent must not fire.
 test("destroy: aborts in-flight doPublish after fetchOwnBlobBeforePublish resolves", async () => {
-  // fetchEvents is held until we release it — simulates the latency window.
   let releaseFetch = null;
   const publishCalls = [];
-
-  mock.method(relayClient, "fetchEvents", () => {
-    return new Promise((resolve) => {
-      // resolve with empty so fetchOwnBlobBeforePublish returns the local store
-      releaseFetch = () => resolve([]);
-    });
-  });
+  mock.method(
+    relayClient,
+    "fetchEvents",
+    () =>
+      new Promise((res) => {
+        releaseFetch = () => res([]);
+      }),
+  );
   mock.method(relayClient, "publishEvent", (...args) => {
     publishCalls.push(args);
     return Promise.resolve();
   });
-
-  if (typeof globalThis.window === "undefined") {
-    globalThis.window = {};
-  }
-  let capturedCallback = null;
-  let nextId = 1;
-  const origSetTimeout = globalThis.window.setTimeout;
-  const origClearTimeout = globalThis.window.clearTimeout;
-  globalThis.window.setTimeout = (fn, _ms) => {
-    capturedCallback = fn;
-    return nextId++;
-  };
-  globalThis.window.clearTimeout = (_id) => {
-    capturedCallback = null;
-  };
-
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
   try {
-    const manager = new ChannelSectionSyncManager("pk-race");
-    const store = makeStore({
-      sections: [{ id: "s1", name: "Work", order: 0 }],
-    });
-
-    // Queue the publish — captures the debounce callback.
-    manager.publishSections(store);
-    assert.ok(capturedCallback !== null, "debounce timer should be set");
-
-    // Fire the debounce manually — this starts doPublish() and nulls
-    // debounceTimer inside publishSections' callback, leaving the async
-    // doPublish running and awaiting fetchOwnBlobBeforePublish.
-    const timerFn = capturedCallback;
-    capturedCallback = null; // timer cleared itself inside the callback
-    timerFn();
-
-    // Now destroy() — debounceTimer is already null (timer fired), so only
-    // the destroyed flag can stop doPublish.
+    const manager = new ChannelSectionSyncManager("pk-race", RELAY);
+    manager.publishSections(
+      makeStore({ sections: [{ id: "s1", name: "Work", order: 0 }] }),
+    );
+    fw._fireTimer(); // starts doPublish, which is now awaiting fetchOwnBlobBeforePublish
     manager.destroy();
-
-    // Release the held fetchEvents — fetchOwnBlobBeforePublish resolves with
-    // the local store, then doPublish should check destroyed and abort.
     releaseFetch();
-
-    // Drain microtasks so doPublish fully runs through to its abort point.
-    await new Promise((resolve) => setTimeout(resolve, 0));
-
+    await new Promise((r) => setTimeout(r, 0));
     assert.equal(
       publishCalls.length,
       0,
-      "publishEvent must not be called after destroy() even when timer already fired",
+      "publishEvent must not fire after destroy",
     );
   } finally {
-    globalThis.window.setTimeout = origSetTimeout;
-    globalThis.window.clearTimeout = origClearTimeout;
+    restore();
     mock.reset();
   }
 });
 
 test("destroy: is safe to call with no pending publish", () => {
-  const manager = new ChannelSectionSyncManager("pk-no-pending");
-  // Should not throw even with nothing queued.
-  assert.doesNotThrow(() => manager.destroy());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelSectionSyncManager("pk-no-pending", RELAY);
+    assert.doesNotThrow(() => manager.destroy());
+  } finally {
+    restore();
+  }
+});
+
+// ─── Boot seed-publish guard (the revert-fix regression suite) ────────────────
+// Wiring tests 1-3 drive the production bootstrap() path; policy tested once
+// in sidebarSyncWatermark.test.mjs.
+
+// 1. fetch failed → hold, pendingStore null (mutation: remove failed guard → seed queued)
+test("revert-fix: fetch failed (error) does not trigger seed-publish via bootstrap", async () => {
+  mock.method(relayClient, "fetchEvents", () =>
+    Promise.reject(new Error("relay timeout")),
+  );
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelSectionSyncManager("pk-fail", RELAY);
+    const result = await manager.bootstrap(
+      makeSectionsStore([{ id: "s1", name: "Work", order: 0 }]),
+    );
+    assert.equal(result.action, "hold");
+    assert.equal(manager.getPendingStore(), null);
+  } finally {
+    restore();
+    mock.reset();
+  }
 });
 
-test("destroy: cancelPendingPublish clears pendingStore", () => {
-  let timerCallback = null;
-  let nextId = 1;
-  if (typeof globalThis.window === "undefined") {
-    globalThis.window = {};
+// 2. absent + prior watermark → hold, pendingStore null (mutation: clear watermark → seed queued)
+test("revert-fix: absent fetch with prior watermark blocks seed-publish via bootstrap", async () => {
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  fw.localStorage.setItem(
+    `buzz-sync-watermark.v1:channel-sections:pk-stale:${RELAY_KEY}`,
+    "1700000000",
+  );
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelSectionSyncManager("pk-stale", RELAY);
+    assert.ok(
+      Number(
+        fw.localStorage.getItem(
+          `buzz-sync-watermark.v1:channel-sections:pk-stale:${RELAY_KEY}`,
+        ) ?? "0",
+      ) > 0,
+    );
+    const result = await manager.bootstrap(
+      makeSectionsStore([{ id: "s1", name: "Work", order: 0 }]),
+    );
+    assert.equal(result.action, "hold");
+    assert.equal(manager.getPendingStore(), null);
+  } finally {
+    restore();
+    mock.reset();
   }
-  const orig = globalThis.window.setTimeout;
-  const origClear = globalThis.window.clearTimeout;
-  globalThis.window.setTimeout = (fn, _ms) => {
-    timerCallback = fn;
-    return nextId++;
-  };
-  globalThis.window.clearTimeout = (_id) => {
-    timerCallback = null;
-  };
+});
 
+// 3. absent + zero watermark + non-empty → seed queued (mutation: remove seed call → pendingStore null)
+test("revert-fix: absent fetch with zero watermark seeds via bootstrap (first-sync preserved)", async () => {
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
   try {
-    const manager = new ChannelSectionSyncManager("pk-pending-null");
-    const store = makeStore({
-      sections: [{ id: "s1", name: "Test", order: 0 }],
-    });
-    manager.publishSections(store);
-    assert.deepEqual(manager.getPendingStore(), store);
+    const manager = new ChannelSectionSyncManager("pk-fresh", RELAY);
+    const result = await manager.bootstrap(
+      makeSectionsStore([{ id: "s1", name: "Work", order: 0 }]),
+    );
+    assert.equal(result.action, "hold");
+    assert.ok(manager.getPendingStore() !== null);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
 
-    manager.destroy();
+// 4. LWW baseline: newer decryptable pre-publish event still wins after an
+//    undecryptable head was recorded.
+// Mutation test: headBeforeFetch → this.lastRemoteCreatedAt makes comparison
+// 200>200=false → local wins instead of remote → wrong content encrypted.
+test("revert-fix: sections LWW — newer decryptable pre-publish event selected after undecryptable head recorded", async () => {
+  const REMOTE_ID = "remote-section-from-relay";
+  let callCount = 0;
+  mock.method(relayClient, "fetchEvents", () => {
+    callCount++;
+    return Promise.resolve([
+      {
+        pubkey: "pk-lww",
+        content: callCount === 1 ? "bad-cipher" : "good-cipher",
+        created_at: callCount === 1 ? 100 : 200,
+        id: `evt-${callCount}`,
+      },
+    ]);
+  });
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  const tauri = installTauriMock(
+    JSON.stringify({
+      version: 1,
+      sections: [{ id: REMOTE_ID, name: "Remote", order: 0 }],
+      assignments: {},
+    }),
+  );
+  try {
+    const manager = new ChannelSectionSyncManager("pk-lww", RELAY);
+    await manager.fetchRemoteSections();
+    assert.ok(
+      Number(
+        fw.localStorage.getItem(
+          `buzz-sync-watermark.v1:channel-sections:pk-lww:${RELAY_KEY}`,
+        ) ?? "0",
+      ) >= 100,
+    );
+    manager.publishSections(
+      makeSectionsStore([{ id: "local-s", name: "Local", order: 0 }]),
+    );
+    fw._fireTimer();
+    await new Promise((r) => setTimeout(r, 20));
+    const pt = tauri.capturedPlaintext();
+    assert.ok(pt !== null, "nip44EncryptToSelf must have been called");
+    assert.ok(
+      JSON.parse(pt).sections?.some((s) => s.id === REMOTE_ID),
+      `remote sections must win LWW merge — got: ${pt}`,
+    );
+  } finally {
+    tauri.restore();
+    restore();
+    mock.reset();
+  }
+});
+
+// 5. live-sub: undecryptable event on live path records head before decrypt
+// Mutation test: removing recordRemoteHead before decrypt in the live callback
+// leaves watermark at 0 after a live event.
+test("revert-fix: undecryptable live event advances watermark before decrypt attempt", async () => {
+  let liveCallback = null;
+  mock.method(relayClient, "subscribeLive", (_filter, onEvent) => {
+    liveCallback = onEvent;
+    return Promise.resolve(async () => {});
+  });
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelSectionSyncManager("pk-live", RELAY);
     assert.equal(
-      manager.getPendingStore(),
+      fw.localStorage.getItem(
+        `buzz-sync-watermark.v1:channel-sections:pk-live:${RELAY_KEY}`,
+      ),
       null,
-      "pendingStore must be null after destroy",
+      "watermark starts absent",
+    );
+    await manager.subscribeToSections(() => {});
+    assert.ok(
+      liveCallback !== null,
+      "subscribeLive must have captured the callback",
+    );
+    liveCallback({
+      pubkey: "pk-live",
+      content: "!bad-cipher!",
+      created_at: 1700005555,
+      id: "live-evt-1",
+    });
+    await new Promise((r) => setTimeout(r, 0));
+    assert.ok(
+      Number(
+        fw.localStorage.getItem(
+          `buzz-sync-watermark.v1:channel-sections:pk-live:${RELAY_KEY}`,
+        ) ?? "0",
+      ) >= 1700005555,
+      "live undecryptable event must advance the watermark before decrypt is attempted",
     );
-    assert.ok(timerCallback === null, "timer must be cleared after destroy");
   } finally {
-    globalThis.window.setTimeout = orig;
-    globalThis.window.clearTimeout = origClear;
+    restore();
+    mock.reset();
   }
 });
diff --git a/desktop/src/features/sidebar/lib/channelSectionsSync.ts b/desktop/src/features/sidebar/lib/channelSectionsSync.ts
index 70930c26f6c..858b62430f3 100644
--- a/desktop/src/features/sidebar/lib/channelSectionsSync.ts
+++ b/desktop/src/features/sidebar/lib/channelSectionsSync.ts
@@ -11,8 +11,15 @@ import {
   type ChannelSection,
   type ChannelSectionStore,
 } from "./channelSectionsStorage";
+import {
+  advanceWatermark,
+  readWatermark,
+  runBootstrap,
+  type FetchResult,
+} from "./sidebarSyncWatermark";
 
 const D_TAG = "channel-sections";
+const BLOB_TYPE = D_TAG;
 const DEBOUNCE_MS = 2_000;
 
 export type RemoteSections = {
@@ -36,17 +43,22 @@ async function decryptAndParse(
 
 export class ChannelSectionSyncManager {
   private pubkey: string;
+  private relayUrl: string;
   private debounceTimer: number | null = null;
-  private lastRemoteCreatedAt = 0;
+  private lastRemoteCreatedAt: number;
   private pendingStore: ChannelSectionStore | null = null;
   private lastPublishedStore: ChannelSectionStore | null = null;
   private destroyed = false;
 
-  constructor(pubkey: string) {
+  constructor(pubkey: string, relayUrl: string) {
     this.pubkey = pubkey;
+    this.relayUrl = relayUrl;
+    // Hydrate from localStorage so we never seed-publish if a remote blob has
+    // been seen in a prior session.
+    this.lastRemoteCreatedAt = readWatermark(pubkey, BLOB_TYPE, relayUrl);
   }
 
-  async fetchRemoteSections(): Promise<RemoteSections | null> {
+  async fetchRemoteSections(): Promise<FetchResult<RemoteSections>> {
     try {
       const events = await relayClient.fetchEvents({
         kinds: [KIND_CHANNEL_SECTIONS],
@@ -54,21 +66,37 @@ export class ChannelSectionSyncManager {
         "#d": [D_TAG],
         limit: 1,
       });
-      if (events.length === 0) return null;
-      if (events[0].pubkey !== this.pubkey) return null;
-      const result = await decryptAndParse(events[0]);
-      if (result) {
-        this.lastRemoteCreatedAt = Math.max(
-          this.lastRemoteCreatedAt,
-          result.createdAt,
-        );
+      if (events.length === 0 || events[0].pubkey !== this.pubkey) {
+        return { status: "absent" };
+      }
+      const event = events[0];
+      // An event exists — record its created_at regardless of whether we can
+      // decrypt it, so seed-publish is blocked even when the payload is
+      // unreadable (e.g. wrong key).
+      this.recordRemoteHead(event.created_at);
+      const result = await decryptAndParse(event);
+      if (!result) {
+        return { status: "failed", createdAt: event.created_at };
       }
-      return result;
+      return {
+        status: "found",
+        data: result,
+        createdAt: result.createdAt,
+        eventId: result.eventId,
+      };
     } catch {
-      return null;
+      return { status: "failed" };
     }
   }
 
+  /** Update in-memory + persisted watermark. */
+  private recordRemoteHead(createdAt: number): void {
+    if (createdAt > this.lastRemoteCreatedAt) {
+      this.lastRemoteCreatedAt = createdAt;
+    }
+    advanceWatermark(this.pubkey, BLOB_TYPE, this.relayUrl, createdAt);
+  }
+
   cancelPendingPublish(): void {
     if (this.debounceTimer !== null) {
       window.clearTimeout(this.debounceTimer);
@@ -102,11 +130,17 @@ export class ChannelSectionSyncManager {
         limit: 1,
       });
       if (events.length === 0 || events[0].pubkey !== this.pubkey) return store;
-      const remote = await decryptAndParse(events[0]);
+      const event = events[0];
+      // Snapshot the watermark before advancing it: after recordRemoteHead
+      // runs, lastRemoteCreatedAt equals event.created_at, so the LWW
+      // comparison remote.createdAt > lastRemoteCreatedAt would always be
+      // false and silently suppress the merge.
+      const headBeforeFetch = this.lastRemoteCreatedAt;
+      this.recordRemoteHead(event.created_at);
+      const remote = await decryptAndParse(event);
       if (!remote) return store;
       // Sections use whole-blob LWW: take whichever is newer
-      if (remote.createdAt > this.lastRemoteCreatedAt) {
-        this.lastRemoteCreatedAt = remote.createdAt;
+      if (remote.createdAt > headBeforeFetch) {
         return remote.store;
       }
       return store;
@@ -181,10 +215,7 @@ export class ChannelSectionSyncManager {
         "Timed out publishing channel sections.",
         "Failed to publish channel sections.",
       );
-      this.lastRemoteCreatedAt = Math.max(
-        this.lastRemoteCreatedAt,
-        event.created_at,
-      );
+      this.recordRemoteHead(event.created_at);
       this.lastPublishedStore = merged;
       this.pendingStore = null;
     } catch (error) {
@@ -204,12 +235,11 @@ export class ChannelSectionSyncManager {
       },
       (event: RelayEvent) => {
         if (event.pubkey !== this.pubkey) return;
+        // Record the raw head before decrypt so an undecryptable live event
+        // still advances the watermark and blocks future seed-publish.
+        this.recordRemoteHead(event.created_at);
         void decryptAndParse(event).then((result) => {
           if (result) {
-            this.lastRemoteCreatedAt = Math.max(
-              this.lastRemoteCreatedAt,
-              result.createdAt,
-            );
             onUpdate(result);
           }
         });
@@ -217,14 +247,28 @@ export class ChannelSectionSyncManager {
     );
   }
 
+  /**
+   * Fetches the remote blob on first mount, records the remote head, and
+   * delegates the seed/hold/apply-remote decision to `runBootstrap`.
+   */
+  async bootstrap(localStore: ChannelSectionStore) {
+    const fetchResult = await this.fetchRemoteSections();
+    return runBootstrap({
+      fetchResult,
+      lastHead: this.lastRemoteCreatedAt,
+      localStore,
+      isLocalNonEmpty: (s) => s.sections.length > 0,
+      publishFn: (s) => this.publishSections(s),
+    });
+  }
+
   destroy(): void {
     // Cancel any pending publish and mark this manager as destroyed so any
-    // in-flight doPublish() calls abort before reaching relayClient. The
-    // scoped localStorage write is already durable; when the user returns to
-    // this relay the existing seed-publish guard will re-publish from local
-    // state. Flushing here would race against community switching and could
-    // publish relay A's sections to relay B via the shared relayClient
-    // singleton.
+    // in-flight doPublish() calls abort before reaching relayClient.
+    // Pending debounce-window changes are intentionally dropped: flushing
+    // could publish relay A's sections to relay B via the shared relayClient
+    // singleton. On return, bootstrap's found path whole-blob-replaces from
+    // remote, so any dropped pending edit is lost.
     this.destroyed = true;
     this.cancelPendingPublish();
     this.pendingStore = null;
diff --git a/desktop/src/features/sidebar/lib/channelSortPreference.ts b/desktop/src/features/sidebar/lib/channelSortPreference.ts
index 6bd9b48d7b4..aa67ca3fb16 100644
--- a/desktop/src/features/sidebar/lib/channelSortPreference.ts
+++ b/desktop/src/features/sidebar/lib/channelSortPreference.ts
@@ -1,4 +1,4 @@
-import { normalizeRelayUrl } from "@/features/profile/lib/selfProfileStorage";
+import { normalizeRelayUrl } from "@/shared/lib/normalizeRelayUrl";
 import type { Channel } from "@/shared/api/types";
 
 const STORAGE_KEY_PREFIX = "buzz-channel-sort.v1";
diff --git a/desktop/src/features/sidebar/lib/channelSortSync.test.mjs b/desktop/src/features/sidebar/lib/channelSortSync.test.mjs
index 76bf57b6c5e..28159eedd34 100644
--- a/desktop/src/features/sidebar/lib/channelSortSync.test.mjs
+++ b/desktop/src/features/sidebar/lib/channelSortSync.test.mjs
@@ -3,174 +3,260 @@ import test, { mock } from "node:test";
 
 import { relayClient } from "@/shared/api/relayClient";
 import { ChannelSortSyncManager } from "./channelSortSync.ts";
+import {
+  makeFakeWindow,
+  installFakeWindow,
+  installTauriMock,
+} from "./sidebarSyncTestHelpers.mjs";
 
 function makeStore(groups = {}) {
   return { version: 1, groups };
 }
 
-// ─── destroy() must cancel pending publish, not flush ─────────────────────────
+const RELAY = "wss://r.test";
+const RELAY_KEY = encodeURIComponent(RELAY);
 
-// Regression guard for the community-switch cross-relay publish vector:
-// change a sort mode in relay A → destroy() is called (relayUrl dep change) →
-// no publish should fire. The scoped localStorage write is durable; when the
-// user returns to relay A the seed-publish path handles it.
+// ─── destroy() must cancel pending publish, not flush ─────────────────────────
 test("destroy: cancels pending publish without flushing to the relay", () => {
-  const publishCalls = [];
   mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  const publishCalls = [];
   mock.method(relayClient, "publishEvent", (...args) => {
     publishCalls.push(args);
     return Promise.resolve();
   });
-
-  let timerCallback = null;
-  const fakeTimers = [];
-  let nextId = 1;
-  if (typeof globalThis.window === "undefined") {
-    globalThis.window = {};
-  }
-  const originalSetTimeout = globalThis.window.setTimeout;
-  const originalClearTimeout = globalThis.window.clearTimeout;
-  globalThis.window.setTimeout = (fn, _ms) => {
-    const id = nextId++;
-    fakeTimers.push({ id, fn });
-    timerCallback = fn;
-    return id;
-  };
-  globalThis.window.clearTimeout = (id) => {
-    const idx = fakeTimers.findIndex((t) => t.id === id);
-    if (idx !== -1) {
-      fakeTimers.splice(idx, 1);
-      timerCallback = null;
-    }
-  };
-
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
   try {
-    const manager = new ChannelSortSyncManager("pk-test");
-    const store = makeStore({ channels: "recent" });
-
-    manager.publishSortPrefs(store);
-    assert.ok(timerCallback !== null, "debounce timer should be set");
-
+    const manager = new ChannelSortSyncManager("pk-test", RELAY);
+    manager.publishSortPrefs(makeStore({ channels: "recent" }));
+    assert.ok(fw._hasTimer(), "debounce timer should be set");
     manager.destroy();
-
-    assert.ok(
-      timerCallback === null,
-      "debounce timer should be cleared on destroy",
-    );
-    assert.equal(
-      publishCalls.length,
-      0,
-      "no publish event should have been sent after destroy",
-    );
+    assert.ok(!fw._hasTimer(), "debounce timer should be cleared on destroy");
+    assert.equal(publishCalls.length, 0);
+    assert.equal(manager.getPendingStore(), null);
   } finally {
-    if (originalSetTimeout !== undefined) {
-      globalThis.window.setTimeout = originalSetTimeout;
-    }
-    if (originalClearTimeout !== undefined) {
-      globalThis.window.clearTimeout = originalClearTimeout;
-    }
+    restore();
     mock.reset();
   }
 });
 
-// Regression guard for the timer-fired race: debounce fires → doPublish starts
-// awaiting fetchOwnBlobBeforePublish → destroy() is called (relayUrl dep
-// change) → publishEvent must never be called even though the timer already
-// fired and cleared itself before destroy() ran.
+// Regression guard for the timer-fired race: debounce fires → doPublish awaits
+// fetchOwnBlobBeforePublish → destroy() called → publishEvent must not fire.
 test("destroy: aborts in-flight doPublish after fetchOwnBlobBeforePublish resolves", async () => {
   let releaseFetch = null;
   const publishCalls = [];
-
-  mock.method(relayClient, "fetchEvents", () => {
-    return new Promise((resolve) => {
-      releaseFetch = () => resolve([]);
-    });
-  });
+  mock.method(
+    relayClient,
+    "fetchEvents",
+    () =>
+      new Promise((res) => {
+        releaseFetch = () => res([]);
+      }),
+  );
   mock.method(relayClient, "publishEvent", (...args) => {
     publishCalls.push(args);
     return Promise.resolve();
   });
-
-  if (typeof globalThis.window === "undefined") {
-    globalThis.window = {};
-  }
-  let capturedCallback = null;
-  let nextId = 1;
-  const origSetTimeout = globalThis.window.setTimeout;
-  const origClearTimeout = globalThis.window.clearTimeout;
-  globalThis.window.setTimeout = (fn, _ms) => {
-    capturedCallback = fn;
-    return nextId++;
-  };
-  globalThis.window.clearTimeout = (_id) => {
-    capturedCallback = null;
-  };
-
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
   try {
-    const manager = new ChannelSortSyncManager("pk-race");
-    const store = makeStore({ dms: "recent" });
-
-    manager.publishSortPrefs(store);
-    assert.ok(capturedCallback !== null, "debounce timer should be set");
-
-    const timerFn = capturedCallback;
-    capturedCallback = null; // timer cleared itself inside the callback
-    timerFn();
-
+    const manager = new ChannelSortSyncManager("pk-race", RELAY);
+    manager.publishSortPrefs(makeStore({ dms: "recent" }));
+    fw._fireTimer(); // starts doPublish, which is now awaiting fetchOwnBlobBeforePublish
     manager.destroy();
-
     releaseFetch();
-
-    await new Promise((resolve) => setTimeout(resolve, 0));
-
+    await new Promise((r) => setTimeout(r, 0));
     assert.equal(
       publishCalls.length,
       0,
-      "publishEvent must not be called after destroy() even when timer already fired",
+      "publishEvent must not fire after destroy",
     );
   } finally {
-    globalThis.window.setTimeout = origSetTimeout;
-    globalThis.window.clearTimeout = origClearTimeout;
+    restore();
     mock.reset();
   }
 });
 
 test("destroy: is safe to call with no pending publish", () => {
-  const manager = new ChannelSortSyncManager("pk-no-pending");
-  assert.doesNotThrow(() => manager.destroy());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelSortSyncManager("pk-no-pending", RELAY);
+    assert.doesNotThrow(() => manager.destroy());
+  } finally {
+    restore();
+  }
 });
 
-test("destroy: cancelPendingPublish clears pendingStore", () => {
-  let timerCallback = null;
-  let nextId = 1;
-  if (typeof globalThis.window === "undefined") {
-    globalThis.window = {};
+// ─── Boot seed-publish guard (the revert-fix regression suite) ────────────────
+// Wiring tests 1-3 drive the production bootstrap() path; policy tested once
+// in sidebarSyncWatermark.test.mjs.
+
+// 1. fetch failed (error/timeout) + local non-empty → hold, zero publish calls
+// Mutation: removing the failed guard causes bootstrap to call publishSortPrefs → pendingStore set.
+test("revert-fix: fetch failed (error) does not trigger seed-publish via bootstrap", async () => {
+  mock.method(relayClient, "fetchEvents", () =>
+    Promise.reject(new Error("relay timeout")),
+  );
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelSortSyncManager("pk-fail", RELAY);
+    const result = await manager.bootstrap(makeStore({ channels: "recent" }));
+    assert.equal(result.action, "hold");
+    assert.equal(manager.getPendingStore(), null);
+  } finally {
+    restore();
+    mock.reset();
   }
-  const orig = globalThis.window.setTimeout;
-  const origClear = globalThis.window.clearTimeout;
-  globalThis.window.setTimeout = (fn, _ms) => {
-    timerCallback = fn;
-    return nextId++;
-  };
-  globalThis.window.clearTimeout = (_id) => {
-    timerCallback = null;
-  };
+});
 
+// 2. absent + persisted head > 0 → hold, zero publish calls (the dev-build stale-copy case)
+// Mutation: setting watermark to 0 in localStorage causes bootstrap to seed.
+test("revert-fix: absent fetch with prior watermark blocks seed-publish via bootstrap", async () => {
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  fw.localStorage.setItem(
+    `buzz-sync-watermark.v1:channel-sort:pk-stale:${RELAY_KEY}`,
+    "1700000000",
+  );
+  const restore = installFakeWindow(fw);
   try {
-    const manager = new ChannelSortSyncManager("pk-pending-null");
-    const store = makeStore({ starred: "recent" });
-    manager.publishSortPrefs(store);
-    assert.deepEqual(manager.getPendingStore(), store);
+    const manager = new ChannelSortSyncManager("pk-stale", RELAY);
+    assert.ok(
+      Number(
+        fw.localStorage.getItem(
+          `buzz-sync-watermark.v1:channel-sort:pk-stale:${RELAY_KEY}`,
+        ) ?? "0",
+      ) > 0,
+    );
+    const result = await manager.bootstrap(makeStore({ channels: "recent" }));
+    assert.equal(result.action, "hold");
+    assert.equal(manager.getPendingStore(), null);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
 
-    manager.destroy();
+// 3. absent + head 0 + local non-empty → seed-publish queued (first-sync preserved)
+// Mutation: removing the absent+head-0 seed call leaves pendingStore null.
+test("revert-fix: absent fetch with zero watermark seeds via bootstrap (first-sync preserved)", async () => {
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelSortSyncManager("pk-fresh", RELAY);
     assert.equal(
-      manager.getPendingStore(),
+      fw.localStorage.getItem(
+        `buzz-sync-watermark.v1:channel-sort:pk-fresh:${RELAY_KEY}`,
+      ),
       null,
-      "pendingStore must be null after destroy",
     );
-    assert.ok(timerCallback === null, "timer must be cleared after destroy");
+    const result = await manager.bootstrap(makeStore({ channels: "recent" }));
+    assert.equal(result.action, "hold");
+    assert.ok(manager.getPendingStore() !== null);
   } finally {
-    globalThis.window.setTimeout = orig;
-    globalThis.window.clearTimeout = origClear;
+    restore();
+    mock.reset();
+  }
+});
+
+// 4. LWW baseline: newer decryptable pre-publish event still wins after an
+//    undecryptable head was recorded.
+// Mutation test: headBeforeFetch → this.lastRemoteCreatedAt makes comparison
+// 200>200=false → local wins instead of remote → wrong content encrypted.
+test("revert-fix: sort LWW — newer decryptable pre-publish event selected after undecryptable head recorded", async () => {
+  const REMOTE_KEY = "remote-group-from-relay";
+  let callCount = 0;
+  mock.method(relayClient, "fetchEvents", () => {
+    callCount++;
+    return Promise.resolve([
+      {
+        pubkey: "pk-lww",
+        content: callCount === 1 ? "bad-cipher" : "good-cipher",
+        created_at: callCount === 1 ? 100 : 200,
+        id: `evt-${callCount}`,
+      },
+    ]);
+  });
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  const tauri = installTauriMock(
+    JSON.stringify({ version: 1, groups: { [REMOTE_KEY]: "recent" } }),
+  );
+  try {
+    const manager = new ChannelSortSyncManager("pk-lww", RELAY);
+    await manager.fetchRemoteSortPrefs();
+    assert.ok(
+      Number(
+        fw.localStorage.getItem(
+          `buzz-sync-watermark.v1:channel-sort:pk-lww:${RELAY_KEY}`,
+        ) ?? "0",
+      ) >= 100,
+    );
+    manager.publishSortPrefs(makeStore({ "local-group": "recent" }));
+    fw._fireTimer();
+    await new Promise((r) => setTimeout(r, 20));
+    const pt = tauri.capturedPlaintext();
+    assert.ok(pt !== null, "nip44EncryptToSelf must have been called");
+    assert.ok(
+      JSON.parse(pt).groups && REMOTE_KEY in JSON.parse(pt).groups,
+      `remote groups must win LWW merge — got: ${pt}`,
+    );
+  } finally {
+    tauri.restore();
+    restore();
+    mock.reset();
+  }
+});
+
+// 5. live-sub: undecryptable event on live path records head before decrypt
+// Mutation test: removing recordRemoteHead before decrypt in the live callback
+// leaves watermark at 0 after a live event.
+test("revert-fix: undecryptable live event advances watermark before decrypt attempt", async () => {
+  let liveCallback = null;
+  mock.method(relayClient, "subscribeLive", (_filter, onEvent) => {
+    liveCallback = onEvent;
+    return Promise.resolve(async () => {});
+  });
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelSortSyncManager("pk-live", RELAY);
+    assert.equal(
+      fw.localStorage.getItem(
+        `buzz-sync-watermark.v1:channel-sort:pk-live:${RELAY_KEY}`,
+      ),
+      null,
+      "watermark starts absent",
+    );
+    await manager.subscribeToSortPrefs(() => {});
+    assert.ok(
+      liveCallback !== null,
+      "subscribeLive must have captured the callback",
+    );
+    liveCallback({
+      pubkey: "pk-live",
+      content: "!bad-cipher!",
+      created_at: 1700005555,
+      id: "live-evt-1",
+    });
+    await new Promise((r) => setTimeout(r, 0));
+    assert.ok(
+      Number(
+        fw.localStorage.getItem(
+          `buzz-sync-watermark.v1:channel-sort:pk-live:${RELAY_KEY}`,
+        ) ?? "0",
+      ) >= 1700005555,
+      "live undecryptable event must advance the watermark before decrypt is attempted",
+    );
+  } finally {
+    restore();
+    mock.reset();
   }
 });
diff --git a/desktop/src/features/sidebar/lib/channelSortSync.ts b/desktop/src/features/sidebar/lib/channelSortSync.ts
index e23387368d1..fe71fe62dfa 100644
--- a/desktop/src/features/sidebar/lib/channelSortSync.ts
+++ b/desktop/src/features/sidebar/lib/channelSortSync.ts
@@ -10,8 +10,15 @@ import {
   parseChannelSortPayload,
   type ChannelSortStore,
 } from "./channelSortPreference";
+import {
+  advanceWatermark,
+  readWatermark,
+  runBootstrap,
+  type FetchResult,
+} from "./sidebarSyncWatermark";
 
 const D_TAG = "channel-sort";
+const BLOB_TYPE = D_TAG;
 const DEBOUNCE_MS = 2_000;
 
 export type RemoteSortPrefs = {
@@ -44,17 +51,20 @@ async function decryptAndParse(
  */
 export class ChannelSortSyncManager {
   private pubkey: string;
+  private relayUrl: string;
   private debounceTimer: number | null = null;
-  private lastRemoteCreatedAt = 0;
+  private lastRemoteCreatedAt: number;
   private pendingStore: ChannelSortStore | null = null;
   private lastPublishedStore: ChannelSortStore | null = null;
   private destroyed = false;
 
-  constructor(pubkey: string) {
+  constructor(pubkey: string, relayUrl: string) {
     this.pubkey = pubkey;
+    this.relayUrl = relayUrl;
+    this.lastRemoteCreatedAt = readWatermark(pubkey, BLOB_TYPE, relayUrl);
   }
 
-  async fetchRemoteSortPrefs(): Promise<RemoteSortPrefs | null> {
+  async fetchRemoteSortPrefs(): Promise<FetchResult<RemoteSortPrefs>> {
     try {
       const events = await relayClient.fetchEvents({
         kinds: [KIND_CHANNEL_SORT],
@@ -62,21 +72,33 @@ export class ChannelSortSyncManager {
         "#d": [D_TAG],
         limit: 1,
       });
-      if (events.length === 0) return null;
-      if (events[0].pubkey !== this.pubkey) return null;
-      const result = await decryptAndParse(events[0]);
-      if (result) {
-        this.lastRemoteCreatedAt = Math.max(
-          this.lastRemoteCreatedAt,
-          result.createdAt,
-        );
+      if (events.length === 0 || events[0].pubkey !== this.pubkey) {
+        return { status: "absent" };
+      }
+      const event = events[0];
+      this.recordRemoteHead(event.created_at);
+      const result = await decryptAndParse(event);
+      if (!result) {
+        return { status: "failed", createdAt: event.created_at };
       }
-      return result;
+      return {
+        status: "found",
+        data: result,
+        createdAt: result.createdAt,
+        eventId: result.eventId,
+      };
     } catch {
-      return null;
+      return { status: "failed" };
     }
   }
 
+  private recordRemoteHead(createdAt: number): void {
+    if (createdAt > this.lastRemoteCreatedAt) {
+      this.lastRemoteCreatedAt = createdAt;
+    }
+    advanceWatermark(this.pubkey, BLOB_TYPE, this.relayUrl, createdAt);
+  }
+
   cancelPendingPublish(): void {
     if (this.debounceTimer !== null) {
       window.clearTimeout(this.debounceTimer);
@@ -110,11 +132,17 @@ export class ChannelSortSyncManager {
         limit: 1,
       });
       if (events.length === 0 || events[0].pubkey !== this.pubkey) return store;
-      const remote = await decryptAndParse(events[0]);
+      const event = events[0];
+      // Snapshot the watermark before advancing it: after recordRemoteHead
+      // runs, lastRemoteCreatedAt equals event.created_at, so the LWW
+      // comparison remote.createdAt > lastRemoteCreatedAt would always be
+      // false and silently suppress the merge.
+      const headBeforeFetch = this.lastRemoteCreatedAt;
+      this.recordRemoteHead(event.created_at);
+      const remote = await decryptAndParse(event);
       if (!remote) return store;
       // Sort prefs use whole-blob LWW: take whichever is newer
-      if (remote.createdAt > this.lastRemoteCreatedAt) {
-        this.lastRemoteCreatedAt = remote.createdAt;
+      if (remote.createdAt > headBeforeFetch) {
         return remote.store;
       }
       return store;
@@ -174,10 +202,7 @@ export class ChannelSortSyncManager {
         "Timed out publishing channel sort preferences.",
         "Failed to publish channel sort preferences.",
       );
-      this.lastRemoteCreatedAt = Math.max(
-        this.lastRemoteCreatedAt,
-        event.created_at,
-      );
+      this.recordRemoteHead(event.created_at);
       this.lastPublishedStore = merged;
       this.pendingStore = null;
     } catch (error) {
@@ -197,12 +222,11 @@ export class ChannelSortSyncManager {
       },
       (event: RelayEvent) => {
         if (event.pubkey !== this.pubkey) return;
+        // Record the raw head before decrypt so an undecryptable live event
+        // still advances the watermark and blocks future seed-publish.
+        this.recordRemoteHead(event.created_at);
         void decryptAndParse(event).then((result) => {
           if (result) {
-            this.lastRemoteCreatedAt = Math.max(
-              this.lastRemoteCreatedAt,
-              result.createdAt,
-            );
             onUpdate(result);
           }
         });
@@ -210,14 +234,28 @@ export class ChannelSortSyncManager {
     );
   }
 
+  /**
+   * Fetches the remote blob on first mount, records the remote head, and
+   * delegates the seed/hold/apply-remote decision to `runBootstrap`.
+   */
+  async bootstrap(localStore: ChannelSortStore) {
+    const fetchResult = await this.fetchRemoteSortPrefs();
+    return runBootstrap({
+      fetchResult,
+      lastHead: this.lastRemoteCreatedAt,
+      localStore,
+      isLocalNonEmpty: (s) => Object.keys(s.groups).length > 0,
+      publishFn: (s) => this.publishSortPrefs(s),
+    });
+  }
+
   destroy(): void {
     // Cancel any pending publish and mark this manager as destroyed so any
-    // in-flight doPublish() calls abort before reaching relayClient. The
-    // scoped localStorage write is already durable; when the user returns to
-    // this relay the existing seed-publish guard will re-publish from local
-    // state. Flushing here would race against community switching and could
-    // publish relay A's sort prefs to relay B via the shared relayClient
-    // singleton.
+    // in-flight doPublish() calls abort before reaching relayClient.
+    // Pending debounce-window changes are intentionally dropped: flushing
+    // could publish relay A's sort prefs to relay B via the shared relayClient
+    // singleton. On return, bootstrap's found path whole-blob-replaces from
+    // remote, so any dropped pending edit is lost.
     this.destroyed = true;
     this.cancelPendingPublish();
     this.pendingStore = null;
diff --git a/desktop/src/features/sidebar/lib/channelStarsSync.test.mjs b/desktop/src/features/sidebar/lib/channelStarsSync.test.mjs
new file mode 100644
index 00000000000..b0235744672
--- /dev/null
+++ b/desktop/src/features/sidebar/lib/channelStarsSync.test.mjs
@@ -0,0 +1,202 @@
+import assert from "node:assert/strict";
+import test, { mock } from "node:test";
+
+import { relayClient } from "@/shared/api/relayClient";
+import { ChannelStarSyncManager } from "./channelStarsSync.ts";
+import {
+  makeFakeWindow,
+  installFakeWindow,
+} from "./sidebarSyncTestHelpers.mjs";
+
+const RELAY = "wss://r.test";
+const RELAY_KEY = encodeURIComponent(RELAY);
+
+function makeStore(channels = {}) {
+  return { version: 1, channels };
+}
+
+// ─── destroy() must cancel pending publish, not flush ─────────────────────────
+
+// Regression guard for the community-switch cross-relay publish vector:
+// star a channel in relay A → destroy() called (relayUrl dep change) →
+// no publish should fire.
+test("destroy: cancels pending publish without flushing to the relay", () => {
+  const publishCalls = [];
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", (...args) => {
+    publishCalls.push(args);
+    return Promise.resolve();
+  });
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelStarSyncManager("pk-test", RELAY);
+    manager.publishStars(makeStore({ ch1: { starred: true, updatedAt: 100 } }));
+    manager.destroy();
+    assert.equal(publishCalls.length, 0, "no publish after destroy");
+    assert.equal(manager.getPendingStarStore(), null);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
+
+test("destroy: aborts in-flight doPublish after fetchOwnBlobBeforePublish resolves", async () => {
+  let releaseFetch = null;
+  const publishCalls = [];
+  mock.method(
+    relayClient,
+    "fetchEvents",
+    () =>
+      new Promise((res) => {
+        releaseFetch = () => res([]);
+      }),
+  );
+  mock.method(relayClient, "publishEvent", (...args) => {
+    publishCalls.push(args);
+    return Promise.resolve();
+  });
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelStarSyncManager("pk-race", RELAY);
+    manager.publishStars(makeStore({ ch1: { starred: true, updatedAt: 100 } }));
+    fw._fireTimer();
+    manager.destroy();
+    releaseFetch();
+    await new Promise((r) => setTimeout(r, 0));
+    assert.equal(
+      publishCalls.length,
+      0,
+      "publishEvent must not be called after destroy",
+    );
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
+
+test("destroy: is safe to call with no pending publish", () => {
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelStarSyncManager("pk-no-pending", RELAY);
+    assert.doesNotThrow(() => manager.destroy());
+  } finally {
+    restore();
+  }
+});
+
+// ─── Boot seed-publish guard (the revert-fix regression suite) ─────────────────
+
+// 1. fetch failed → hold, pendingStore null (mutation: remove failed guard → seed queued)
+test("revert-fix: fetch failed (error) does not trigger seed-publish via bootstrap", async () => {
+  mock.method(relayClient, "fetchEvents", () =>
+    Promise.reject(new Error("relay timeout")),
+  );
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelStarSyncManager("pk-fail", RELAY);
+    const result = await manager.bootstrap(
+      makeStore({ ch1: { starred: true, updatedAt: 1 } }),
+    );
+    assert.equal(result.action, "hold");
+    assert.equal(manager.getPendingStarStore(), null);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
+
+// 2. absent + prior watermark → hold, pendingStore null (mutation: clear watermark → seed queued)
+test("revert-fix: absent fetch with prior watermark blocks seed-publish via bootstrap", async () => {
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  fw.localStorage.setItem(
+    `buzz-sync-watermark.v1:channel-stars:pk-stale:${RELAY_KEY}`,
+    "1700000000",
+  );
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelStarSyncManager("pk-stale", RELAY);
+    assert.ok(
+      Number(
+        fw.localStorage.getItem(
+          `buzz-sync-watermark.v1:channel-stars:pk-stale:${RELAY_KEY}`,
+        ) ?? "0",
+      ) > 0,
+    );
+    const result = await manager.bootstrap(
+      makeStore({ ch1: { starred: true, updatedAt: 1 } }),
+    );
+    assert.equal(result.action, "hold");
+    assert.equal(manager.getPendingStarStore(), null);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
+
+// 3. absent + zero watermark + non-empty → seed queued (mutation: remove seed call → pendingStore null)
+test("revert-fix: absent fetch with zero watermark seeds via bootstrap (first-sync preserved)", async () => {
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  const restore = installFakeWindow(fw);
+  try {
+    const manager = new ChannelStarSyncManager("pk-fresh", RELAY);
+    assert.equal(
+      fw.localStorage.getItem(
+        `buzz-sync-watermark.v1:channel-stars:pk-fresh:${RELAY_KEY}`,
+      ),
+      null,
+    );
+    const result = await manager.bootstrap(
+      makeStore({ ch1: { starred: true, updatedAt: 1 } }),
+    );
+    assert.equal(result.action, "hold");
+    assert.ok(manager.getPendingStarStore() !== null);
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
+
+// 4. relay-A / relay-B watermark isolation
+// Mutation: using pubkey-only key (no relay) makes relay A's head suppress relay B's first-sync.
+test("revert-fix: relay-A watermark does not suppress first-sync seed on relay-B", async () => {
+  const relayA = "wss://a.relay.test";
+  const relayB = "wss://b.relay.test";
+  mock.method(relayClient, "fetchEvents", () => Promise.resolve([]));
+  mock.method(relayClient, "publishEvent", () => Promise.resolve());
+  const fw = makeFakeWindow();
+  fw.localStorage.setItem(
+    `buzz-sync-watermark.v1:channel-stars:pk-iso:${encodeURIComponent(relayA)}`,
+    "1700000100",
+  );
+  const restore = installFakeWindow(fw);
+  try {
+    const managerB = new ChannelStarSyncManager("pk-iso", relayB);
+    assert.equal(
+      fw.localStorage.getItem(
+        `buzz-sync-watermark.v1:channel-stars:pk-iso:${encodeURIComponent(relayB)}`,
+      ),
+      null,
+      "relay B watermark must be independent of relay A head",
+    );
+    const result = await managerB.bootstrap(
+      makeStore({ ch1: { starred: true, updatedAt: 1 } }),
+    );
+    assert.equal(result.action, "hold");
+    assert.ok(
+      managerB.getPendingStarStore() !== null,
+      "first-sync seed on relay B must not be blocked by relay A watermark",
+    );
+  } finally {
+    restore();
+    mock.reset();
+  }
+});
diff --git a/desktop/src/features/sidebar/lib/channelStarsSync.ts b/desktop/src/features/sidebar/lib/channelStarsSync.ts
index 6681030d47f..a5abec03fba 100644
--- a/desktop/src/features/sidebar/lib/channelStarsSync.ts
+++ b/desktop/src/features/sidebar/lib/channelStarsSync.ts
@@ -11,8 +11,15 @@ import {
   parseStarPayload,
   type ChannelStarStore,
 } from "./channelStarsStorage";
+import {
+  advanceWatermark,
+  readWatermark,
+  runBootstrap,
+  type FetchResult,
+} from "./sidebarSyncWatermark";
 
 const D_TAG = "channel-stars";
+const BLOB_TYPE = D_TAG;
 const DEBOUNCE_MS = 2_000;
 
 export type RemoteStars = {
@@ -34,16 +41,20 @@ async function decryptAndParse(event: RelayEvent): Promise<RemoteStars | null> {
 
 export class ChannelStarSyncManager {
   private pubkey: string;
+  private relayUrl: string;
   private debounceTimer: number | null = null;
-  private lastRemoteCreatedAt = 0;
+  private lastRemoteCreatedAt: number;
   private pendingStore: ChannelStarStore | null = null;
   private lastPublishedStore: ChannelStarStore | null = null;
+  private destroyed = false;
 
-  constructor(pubkey: string) {
+  constructor(pubkey: string, relayUrl: string) {
     this.pubkey = pubkey;
+    this.relayUrl = relayUrl;
+    this.lastRemoteCreatedAt = readWatermark(pubkey, BLOB_TYPE, relayUrl);
   }
 
-  async fetchRemoteStars(): Promise<RemoteStars | null> {
+  async fetchRemoteStars(): Promise<FetchResult<RemoteStars>> {
     try {
       const events = await relayClient.fetchEvents({
         kinds: [KIND_CHANNEL_STARS],
@@ -51,19 +62,31 @@ export class ChannelStarSyncManager {
         "#d": [D_TAG],
         limit: 1,
       });
-      if (events.length === 0) return null;
-      if (events[0].pubkey !== this.pubkey) return null;
-      const result = await decryptAndParse(events[0]);
-      if (result) {
-        this.lastRemoteCreatedAt = Math.max(
-          this.lastRemoteCreatedAt,
-          result.createdAt,
-        );
+      if (events.length === 0 || events[0].pubkey !== this.pubkey) {
+        return { status: "absent" };
+      }
+      const event = events[0];
+      this.recordRemoteHead(event.created_at);
+      const result = await decryptAndParse(event);
+      if (!result) {
+        return { status: "failed", createdAt: event.created_at };
       }
-      return result;
+      return {
+        status: "found",
+        data: result,
+        createdAt: result.createdAt,
+        eventId: result.eventId,
+      };
     } catch {
-      return null;
+      return { status: "failed" };
+    }
+  }
+
+  private recordRemoteHead(createdAt: number): void {
+    if (createdAt > this.lastRemoteCreatedAt) {
+      this.lastRemoteCreatedAt = createdAt;
     }
+    advanceWatermark(this.pubkey, BLOB_TYPE, this.relayUrl, createdAt);
   }
 
   cancelPendingStarPublish(): void {
@@ -99,12 +122,11 @@ export class ChannelStarSyncManager {
         limit: 1,
       });
       if (events.length === 0 || events[0].pubkey !== this.pubkey) return store;
-      const remote = await decryptAndParse(events[0]);
+      const event = events[0];
+      // Record the raw head before decrypt on the pre-publish path too.
+      this.recordRemoteHead(event.created_at);
+      const remote = await decryptAndParse(event);
       if (!remote) return store;
-      this.lastRemoteCreatedAt = Math.max(
-        this.lastRemoteCreatedAt,
-        remote.createdAt,
-      );
       return mergeStores(store, remote.store);
     } catch {
       return store;
@@ -132,6 +154,10 @@ export class ChannelStarSyncManager {
   private async doPublish(store: ChannelStarStore): Promise<void> {
     try {
       const merged = await this.fetchOwnBlobBeforePublish(store);
+      // Guard: manager may have been destroyed while fetchOwnBlobBeforePublish
+      // was awaited (community switch during in-flight fetch). If so, abort
+      // before touching the relay.
+      if (this.destroyed) return;
       if (this.isIdenticalToLastPublished(merged)) {
         this.pendingStore = null;
         return;
@@ -154,15 +180,13 @@ export class ChannelStarSyncManager {
           ["t", D_TAG], // relay discoverability; not used in our filters
         ],
       });
+      if (this.destroyed) return;
       await relayClient.publishEvent(
         event,
         "Timed out publishing channel stars.",
         "Failed to publish channel stars.",
       );
-      this.lastRemoteCreatedAt = Math.max(
-        this.lastRemoteCreatedAt,
-        event.created_at,
-      );
+      this.recordRemoteHead(event.created_at);
       this.lastPublishedStore = merged;
       this.pendingStore = null;
     } catch (error) {
@@ -182,12 +206,11 @@ export class ChannelStarSyncManager {
       },
       (event: RelayEvent) => {
         if (event.pubkey !== this.pubkey) return;
+        // Record the raw head before decrypt so an undecryptable live event
+        // still advances the watermark and blocks future seed-publish.
+        this.recordRemoteHead(event.created_at);
         void decryptAndParse(event).then((result) => {
           if (result) {
-            this.lastRemoteCreatedAt = Math.max(
-              this.lastRemoteCreatedAt,
-              result.createdAt,
-            );
             onUpdate(result);
           }
         });
@@ -195,14 +218,30 @@ export class ChannelStarSyncManager {
     );
   }
 
+  /**
+   * Fetches the remote blob on first mount, records the remote head, and
+   * delegates the seed/hold/apply-remote decision to `runBootstrap`.
+   */
+  async bootstrap(localStore: ChannelStarStore) {
+    const fetchResult = await this.fetchRemoteStars();
+    return runBootstrap({
+      fetchResult,
+      lastHead: this.lastRemoteCreatedAt,
+      localStore,
+      isLocalNonEmpty: (s) => Object.keys(s.channels).length > 0,
+      publishFn: (s) => this.publishStars(s),
+    });
+  }
+
   destroy(): void {
-    if (this.debounceTimer !== null && this.pendingStore !== null) {
-      window.clearTimeout(this.debounceTimer);
-      this.debounceTimer = null;
-      void this.doPublish(this.pendingStore);
-    } else if (this.debounceTimer !== null) {
-      window.clearTimeout(this.debounceTimer);
-      this.debounceTimer = null;
-    }
+    // Cancel any pending publish and mark this manager as destroyed so any
+    // in-flight doPublish() calls abort before reaching relayClient.
+    // Pending debounce-window changes are intentionally dropped: flushing
+    // could publish relay A's state to relay B via the shared relayClient
+    // singleton. Local entries survive because the apply/publish paths merge
+    // per-entry via mergeStores, so no local work is permanently lost.
+    this.destroyed = true;
+    this.cancelPendingStarPublish();
+    this.pendingStore = null;
   }
 }
diff --git a/desktop/src/features/sidebar/lib/sidebarSyncTestHelpers.mjs b/desktop/src/features/sidebar/lib/sidebarSyncTestHelpers.mjs
new file mode 100644
index 00000000000..c94d76db705
--- /dev/null
+++ b/desktop/src/features/sidebar/lib/sidebarSyncTestHelpers.mjs
@@ -0,0 +1,85 @@
+// Shared helpers for sidebar sync manager tests.
+
+export function makeFakeWindow() {
+  const storage = new Map();
+  const ls = {
+    getItem: (k) => storage.get(k) ?? null,
+    setItem: (k, v) => storage.set(k, v),
+    removeItem: (k) => storage.delete(k),
+    clear: () => storage.clear(),
+  };
+  let timerCallback = null;
+  let nextTimerId = 100;
+  return {
+    localStorage: ls,
+    setTimeout: (fn, _ms) => {
+      timerCallback = fn;
+      return nextTimerId++;
+    },
+    clearTimeout: (_id) => {
+      timerCallback = null;
+    },
+    _fireTimer: () => {
+      if (timerCallback) {
+        const fn = timerCallback;
+        timerCallback = null;
+        fn();
+      }
+    },
+    _hasTimer: () => timerCallback !== null,
+  };
+}
+
+export function installFakeWindow(fw) {
+  if (typeof globalThis.window === "undefined") globalThis.window = {};
+  const origLs = globalThis.window.localStorage;
+  const origSt = globalThis.window.setTimeout;
+  const origCt = globalThis.window.clearTimeout;
+  globalThis.window.localStorage = fw.localStorage;
+  globalThis.window.setTimeout = fw.setTimeout;
+  globalThis.window.clearTimeout = fw.clearTimeout;
+  return () => {
+    if (origLs !== undefined) globalThis.window.localStorage = origLs;
+    if (origSt !== undefined) globalThis.window.setTimeout = origSt;
+    if (origCt !== undefined) globalThis.window.clearTimeout = origCt;
+  };
+}
+
+export function installTauriMock(goodCipherPayload) {
+  const orig = globalThis.window?.__TAURI_INTERNALS__;
+  if (typeof globalThis.window === "undefined") globalThis.window = {};
+  let captured = null;
+  globalThis.window.__TAURI_INTERNALS__ = {
+    invoke: (cmd, args) => {
+      if (cmd === "nip44_decrypt_from_self") {
+        if (args?.ciphertext === "bad-cipher")
+          return Promise.reject(new Error("decrypt failed"));
+        return Promise.resolve(goodCipherPayload);
+      }
+      if (cmd === "nip44_encrypt_to_self") {
+        captured = args?.plaintext ?? null;
+        return Promise.resolve("ct");
+      }
+      if (cmd === "sign_event")
+        return Promise.resolve(
+          JSON.stringify({
+            id: "eid",
+            pubkey: "pk-lww",
+            content: "ct",
+            created_at: args?.createdAt ?? 0,
+            kind: args?.kind ?? 0,
+            tags: args?.tags ?? [],
+            sig: "s",
+          }),
+        );
+      return Promise.reject(new Error(`unmocked: ${cmd}`));
+    },
+  };
+  return {
+    restore: () => {
+      if (orig !== undefined) globalThis.window.__TAURI_INTERNALS__ = orig;
+      else delete globalThis.window.__TAURI_INTERNALS__;
+    },
+    capturedPlaintext: () => captured,
+  };
+}
diff --git a/desktop/src/features/sidebar/lib/sidebarSyncWatermark.test.mjs b/desktop/src/features/sidebar/lib/sidebarSyncWatermark.test.mjs
new file mode 100644
index 00000000000..0e8cb373c16
--- /dev/null
+++ b/desktop/src/features/sidebar/lib/sidebarSyncWatermark.test.mjs
@@ -0,0 +1,253 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+// We need a minimal localStorage stub since we're running in Node.
+function withFreshStorage(fn) {
+  const store = new Map();
+  const ls = {
+    getItem: (k) => store.get(k) ?? null,
+    setItem: (k, v) => store.set(k, v),
+    removeItem: (k) => store.delete(k),
+    clear: () => store.clear(),
+  };
+  const orig = globalThis.window?.localStorage;
+  if (typeof globalThis.window === "undefined") globalThis.window = {};
+  globalThis.window.localStorage = ls;
+  try {
+    fn(ls);
+  } finally {
+    if (orig !== undefined) globalThis.window.localStorage = orig;
+    else delete globalThis.window.localStorage;
+  }
+}
+
+const { readWatermark, advanceWatermark, runBootstrap } = await import(
+  "./sidebarSyncWatermark.ts"
+);
+
+// Relay URLs are normalised (trimmed, lowercase, trailing slash stripped)
+// so the same relay written two ways produces the same key.
+const RELAY = "wss://relay.example.com";
+const RELAY_ENCODED = encodeURIComponent("wss://relay.example.com");
+
+// ── readWatermark ────────────────────────────────────────────────────────────
+
+test("readWatermark: returns 0 when no key exists", () => {
+  withFreshStorage(() => {
+    assert.equal(readWatermark("pk", "sections", RELAY), 0);
+  });
+});
+
+test("readWatermark: returns 0 when stored value is 0", () => {
+  withFreshStorage((ls) => {
+    ls.setItem(`buzz-sync-watermark.v1:sections:pk:${RELAY_ENCODED}`, "0");
+    assert.equal(readWatermark("pk", "sections", RELAY), 0);
+  });
+});
+
+test("readWatermark: returns stored positive integer", () => {
+  withFreshStorage((ls) => {
+    ls.setItem(
+      `buzz-sync-watermark.v1:sections:pk:${RELAY_ENCODED}`,
+      "1700000000",
+    );
+    assert.equal(readWatermark("pk", "sections", RELAY), 1700000000);
+  });
+});
+
+test("readWatermark: scopes by blobType", () => {
+  withFreshStorage((ls) => {
+    ls.setItem(`buzz-sync-watermark.v1:sections:pk:${RELAY_ENCODED}`, "100");
+    ls.setItem(`buzz-sync-watermark.v1:sort:pk:${RELAY_ENCODED}`, "200");
+    assert.equal(readWatermark("pk", "sections", RELAY), 100);
+    assert.equal(readWatermark("pk", "sort", RELAY), 200);
+  });
+});
+
+test("readWatermark: normalises relay URL (trailing slash, case)", () => {
+  withFreshStorage(() => {
+    // Write with one form, read with another — must produce the same value.
+    advanceWatermark("pk", "sections", "WSS://Relay.Example.Com/", 999);
+    assert.equal(
+      readWatermark("pk", "sections", "wss://relay.example.com"),
+      999,
+    );
+    assert.equal(
+      readWatermark("pk", "sections", "WSS://Relay.Example.Com/"),
+      999,
+    );
+  });
+});
+
+// ── advanceWatermark ─────────────────────────────────────────────────────────
+
+test("advanceWatermark: writes when no prior value exists", () => {
+  withFreshStorage(() => {
+    advanceWatermark("pk", "sections", RELAY, 1700000000);
+    assert.equal(readWatermark("pk", "sections", RELAY), 1700000000);
+  });
+});
+
+test("advanceWatermark: advances when next > current", () => {
+  withFreshStorage(() => {
+    advanceWatermark("pk", "sections", RELAY, 100);
+    advanceWatermark("pk", "sections", RELAY, 200);
+    assert.equal(readWatermark("pk", "sections", RELAY), 200);
+  });
+});
+
+test("advanceWatermark: does not regress when next <= current (monotonic)", () => {
+  withFreshStorage(() => {
+    advanceWatermark("pk", "sections", RELAY, 500);
+    advanceWatermark("pk", "sections", RELAY, 400); // older — must not overwrite
+    advanceWatermark("pk", "sections", RELAY, 500); // equal — must not overwrite
+    assert.equal(readWatermark("pk", "sections", RELAY), 500);
+  });
+});
+
+test("advanceWatermark: round-trips across separate reads (simulated restart)", () => {
+  withFreshStorage(() => {
+    // Session A writes watermark.
+    advanceWatermark("pk", "sections", RELAY, 1700000042);
+    // Session B reads it back.
+    assert.equal(readWatermark("pk", "sections", RELAY), 1700000042);
+  });
+});
+
+// ── Relay-A / Relay-B isolation ──────────────────────────────────────────────
+
+test("relay-A watermark does not suppress first-sync on relay-B", () => {
+  withFreshStorage(() => {
+    const relayA = "wss://a.relay.test";
+    const relayB = "wss://b.relay.test";
+    advanceWatermark("pk", "sections", relayA, 1700000100);
+    assert.equal(
+      readWatermark("pk", "sections", relayB),
+      0,
+      "relay B watermark must be independent of relay A",
+    );
+  });
+});
+
+test("relay-A watermark is preserved after relay-B session", () => {
+  withFreshStorage(() => {
+    const relayA = "wss://a.relay.test";
+    const relayB = "wss://b.relay.test";
+    advanceWatermark("pk", "sections", relayA, 1700000100);
+    advanceWatermark("pk", "sections", relayB, 1700000200);
+    assert.equal(
+      readWatermark("pk", "sections", relayA),
+      1700000100,
+      "relay A head must not be clobbered by relay B activity",
+    );
+  });
+});
+
+// ── runBootstrap policy — tested once; mutations to any branch fail here ─────
+
+function makeBootstrapArgs({ fetchResult, lastHead, localNonEmpty }) {
+  let n = 0;
+  return {
+    args: {
+      fetchResult,
+      lastHead,
+      localStore: { items: localNonEmpty ? ["x"] : [] },
+      isLocalNonEmpty: (s) => s.items.length > 0,
+      publishFn: () => {
+        n++;
+      },
+    },
+    publishCount: () => n,
+  };
+}
+
+// Guard: fetch failed → hold, zero publishes.
+// Mutation: removing the failed branch causes a seed on first-sync case.
+test("runBootstrap: fetch failed returns hold and never calls publishFn", () => {
+  const { args, publishCount } = makeBootstrapArgs({
+    fetchResult: { status: "failed" },
+    lastHead: 0,
+    localNonEmpty: true,
+  });
+  const result = runBootstrap(args);
+  assert.equal(result.action, "hold");
+  assert.equal(
+    publishCount(),
+    0,
+    "publishFn must not be called on failed fetch",
+  );
+});
+
+// Guard: fetch absent + prior head > 0 → hold, zero publishes (stale-dev-build case).
+// Mutation: setting lastHead to 0 causes a seed.
+test("runBootstrap: fetch absent with prior head returns hold and never calls publishFn", () => {
+  const { args, publishCount } = makeBootstrapArgs({
+    fetchResult: { status: "absent" },
+    lastHead: 1700000000,
+    localNonEmpty: true,
+  });
+  const result = runBootstrap(args);
+  assert.equal(result.action, "hold");
+  assert.equal(
+    publishCount(),
+    0,
+    "publishFn must not be called when prior head exists",
+  );
+});
+
+// Guard: fetch absent + head 0 + local non-empty → publishFn called exactly once, hold returned.
+// Mutation: removing the absent+head-0 seed call leaves publishCount at 0.
+test("runBootstrap: first-sync (absent + zero head + non-empty local) calls publishFn and returns hold", () => {
+  const { args, publishCount } = makeBootstrapArgs({
+    fetchResult: { status: "absent" },
+    lastHead: 0,
+    localNonEmpty: true,
+  });
+  const result = runBootstrap(args);
+  assert.equal(result.action, "hold");
+  assert.equal(
+    publishCount(),
+    1,
+    "publishFn must be called exactly once on first-sync",
+  );
+});
+
+// Guard: fetch absent + head 0 + empty local → no publish, hold returned.
+test("runBootstrap: first-sync with empty local store does not call publishFn", () => {
+  const { args, publishCount } = makeBootstrapArgs({
+    fetchResult: { status: "absent" },
+    lastHead: 0,
+    localNonEmpty: false,
+  });
+  const result = runBootstrap(args);
+  assert.equal(result.action, "hold");
+  assert.equal(publishCount(), 0, "empty local store must not trigger seed");
+});
+
+// Guard: fetch found → apply-remote returned, no publish.
+// Mutation: removing the found branch drops the remote data.
+test("runBootstrap: fetch found returns apply-remote with data and never calls publishFn", () => {
+  const remoteData = {
+    store: { version: 1, items: [] },
+    createdAt: 100,
+    eventId: "e1",
+  };
+  const { args, publishCount } = makeBootstrapArgs({
+    fetchResult: {
+      status: "found",
+      data: remoteData,
+      createdAt: 100,
+      eventId: "e1",
+    },
+    lastHead: 0,
+    localNonEmpty: true,
+  });
+  const result = runBootstrap(args);
+  assert.equal(result.action, "apply-remote");
+  assert.deepEqual(result.data, remoteData);
+  assert.equal(
+    publishCount(),
+    0,
+    "publishFn must not be called when remote was found",
+  );
+});
diff --git a/desktop/src/features/sidebar/lib/sidebarSyncWatermark.ts b/desktop/src/features/sidebar/lib/sidebarSyncWatermark.ts
new file mode 100644
index 00000000000..d81b188ad67
--- /dev/null
+++ b/desktop/src/features/sidebar/lib/sidebarSyncWatermark.ts
@@ -0,0 +1,135 @@
+/**
+ * Persisted remote-head watermark for sidebar-preference sync managers.
+ *
+ * Each manager (sections, sort, stars, mutes) persists the highest
+ * `created_at` it has ever observed from the relay under a key scoped to
+ * pubkey + relay + blob type.  On the next boot the manager reads this value
+ * back: if it is > 0 a remote blob has existed before and seed-publishing
+ * must be skipped even when the fetch comes back empty (error, timeout, or
+ * auth-race).
+ *
+ * Keys live in localStorage alongside the payload blobs.  They are tiny
+ * (one integer string per key) and scoped so they never bleed across
+ * identities, communities, or blob types.
+ *
+ * `relayUrl` is always required — a pubkey-only fallback is not safe because
+ * a head seen on relay A would suppress legitimate first-time seeding on
+ * relay B.  The URL is normalised (trimmed, trailing slash stripped,
+ * lower-cased) before being embedded in the key so the same relay written
+ * two ways never produces two different keys.
+ */
+
+import { normalizeRelayUrl } from "@/shared/lib/normalizeRelayUrl";
+
+const PREFIX = "buzz-sync-watermark.v1";
+
+/**
+ * Tri-state result returned by every `fetchRemote*()` method.
+ *
+ * - `found`  — the relay returned an event that decrypted and parsed cleanly.
+ * - `absent` — the relay was successfully queried and returned zero events
+ *              (genuine first-time use on this relay).
+ * - `failed` — the fetch threw (timeout, relay error, auth-race), or an event
+ *              existed but could not be decrypted/parsed.  In the `failed`
+ *              case, `createdAt` may be set when the event itself was readable
+ *              even though its payload was not — the manager records the head
+ *              so seed-publish is still blocked.
+ */
+export type FetchResult<T> =
+  | { status: "found"; data: T; createdAt: number; eventId: string }
+  | { status: "absent" }
+  | { status: "failed"; createdAt?: number };
+
+function watermarkKey(
+  pubkey: string,
+  blobType: string,
+  relayUrl: string,
+): string {
+  return `${PREFIX}:${blobType}:${pubkey}:${encodeURIComponent(normalizeRelayUrl(relayUrl))}`;
+}
+
+/** Read the persisted watermark (0 when absent or on read error). */
+export function readWatermark(
+  pubkey: string,
+  blobType: string,
+  relayUrl: string,
+): number {
+  try {
+    const raw = window.localStorage.getItem(
+      watermarkKey(pubkey, blobType, relayUrl),
+    );
+    if (raw === null) return 0;
+    const n = Number(raw);
+    return Number.isFinite(n) && n > 0 ? n : 0;
+  } catch {
+    return 0;
+  }
+}
+
+/**
+ * Persist a new watermark if it is strictly greater than the current value.
+ * Absence or error never lowers the watermark (monotonic).
+ */
+export function advanceWatermark(
+  pubkey: string,
+  blobType: string,
+  relayUrl: string,
+  next: number,
+): void {
+  try {
+    const current = readWatermark(pubkey, blobType, relayUrl);
+    if (next <= current) return;
+    window.localStorage.setItem(
+      watermarkKey(pubkey, blobType, relayUrl),
+      String(next),
+    );
+  } catch {
+    // Ignore write failures — the in-memory lastRemoteCreatedAt still guards
+    // seed-publish within this session; the watermark is belt-and-suspenders
+    // across sessions.
+  }
+}
+
+/** Result returned by `bootstrap()` — the hook acts on this without publishing. */
+export type BootstrapResult<T> =
+  | { action: "apply-remote"; data: T }
+  | { action: "hold" };
+
+/**
+ * Shared boot policy for all four sidebar-preference sync managers.
+ *
+ * Each manager calls this from its `bootstrap()` method, supplying its
+ * surface-specific fetch, publish, and local-store accessors.  The full
+ * decision lives here once so that a mutation to any one surface cannot
+ * escape via a per-manager copy.
+ *
+ * Policy:
+ *   - `found`                           → return `apply-remote`; hook applies data.
+ *   - `failed`                          → hold; seed-publish blocked (error or unreadable event).
+ *   - `absent` + `lastHead > 0`         → hold; relay blob seen before, absence may be transient.
+ *   - `absent` + `lastHead === 0` + non-empty local → call `publishFn(local)`; return `hold`.
+ *   - `absent` + `lastHead === 0` + empty local     → hold; nothing to seed.
+ */
+export function runBootstrap<TRemote, TLocal>({
+  fetchResult,
+  lastHead,
+  localStore,
+  isLocalNonEmpty,
+  publishFn,
+}: {
+  fetchResult: FetchResult<TRemote>;
+  lastHead: number;
+  localStore: TLocal;
+  isLocalNonEmpty: (store: TLocal) => boolean;
+  publishFn: (store: TLocal) => void;
+}): BootstrapResult<TRemote> {
+  if (fetchResult.status === "found") {
+    return { action: "apply-remote", data: fetchResult.data };
+  }
+  if (fetchResult.status === "absent" && lastHead === 0) {
+    if (isLocalNonEmpty(localStore)) {
+      publishFn(localStore);
+    }
+  }
+  return { action: "hold" };
+}
diff --git a/desktop/src/features/sidebar/lib/useChannelMutes.ts b/desktop/src/features/sidebar/lib/useChannelMutes.ts
index 1fe92b60a31..cab913834dc 100644
--- a/desktop/src/features/sidebar/lib/useChannelMutes.ts
+++ b/desktop/src/features/sidebar/lib/useChannelMutes.ts
@@ -14,7 +14,10 @@ import {
 import { ChannelMuteSyncManager } from "./channelMutesSync";
 import type { RemoteMutes } from "./channelMutesSync";
 
-export function useChannelMutes(pubkey: string | undefined): {
+export function useChannelMutes(
+  pubkey: string | undefined,
+  relayUrl?: string,
+): {
   mutedChannelIds: Set<string>;
   muteChannel: (channelId: string) => void;
   unmuteChannel: (channelId: string) => void;
@@ -31,7 +34,7 @@ export function useChannelMutes(pubkey: string | undefined): {
   const lastAppliedEventId = React.useRef("");
 
   React.useEffect(() => {
-    if (!pubkey) {
+    if (!pubkey || !relayUrl) {
       setStore(DEFAULT_STORE);
       lastAppliedRemoteTs.current = 0;
       lastAppliedEventId.current = "";
@@ -40,12 +43,12 @@ export function useChannelMutes(pubkey: string | undefined): {
     setStore(readChannelMutesStore(pubkey));
     lastAppliedRemoteTs.current = 0;
     lastAppliedEventId.current = "";
-    managerRef.current = new ChannelMuteSyncManager(pubkey);
+    managerRef.current = new ChannelMuteSyncManager(pubkey, relayUrl);
     return () => {
       managerRef.current?.destroy();
       managerRef.current = null;
     };
-  }, [pubkey]);
+  }, [pubkey, relayUrl]);
 
   React.useEffect(() => {
     if (!pubkey) {
@@ -86,24 +89,22 @@ export function useChannelMutes(pubkey: string | undefined): {
   );
 
   React.useEffect(() => {
-    if (!pubkey) return;
+    if (!pubkey || !relayUrl) return;
     let cancelled = false;
-    void managerRef.current?.fetchRemoteMutes().then((remote) => {
+    const local = readChannelMutesStore(pubkey);
+    void managerRef.current?.bootstrap(local).then((result) => {
       if (cancelled) return;
-      if (remote) {
-        setStore(applyRemote(remote));
-      } else {
-        const local = readChannelMutesStore(pubkey);
-        if (Object.keys(local.channels).length > 0) {
-          managerRef.current?.publishMutes(local);
-        }
+      if (result.action === "apply-remote") {
+        setStore(applyRemote(result.data));
       }
+      // "hold": seed already performed by bootstrap (if first-sync), or blocked.
     });
     return () => {
       cancelled = true;
     };
-  }, [pubkey, applyRemote]);
+  }, [pubkey, relayUrl, applyRemote]);
 
+  // biome-ignore lint/correctness/useExhaustiveDependencies: relayUrl is intentional — rebinds subscription when the active relay changes even though it is not used inside the effect body directly (the manager via managerRef.current carries it)
   React.useEffect(() => {
     if (!pubkey) return;
     let unsub: (() => Promise<void>) | null = null;
@@ -124,16 +125,17 @@ export function useChannelMutes(pubkey: string | undefined): {
       cancelled = true;
       if (unsub) void unsub();
     };
-  }, [pubkey, applyRemote]);
+  }, [pubkey, relayUrl, applyRemote]);
 
+  // biome-ignore lint/correctness/useExhaustiveDependencies: relayUrl is intentional — rebinds reconnect listener when the active relay changes (community switch) even though it is not referenced directly inside the effect body
   React.useEffect(() => {
     if (!pubkey) return;
     let cancelled = false;
     const unsub = relayClient.subscribeToReconnects(() => {
-      void managerRef.current?.fetchRemoteMutes().then((remote) => {
+      void managerRef.current?.fetchRemoteMutes().then((result) => {
         if (cancelled) return;
-        if (remote) {
-          setStore(applyRemote(remote));
+        if (result.status === "found") {
+          setStore(applyRemote(result.data));
         }
         const pending = managerRef.current?.getPendingMuteStore();
         if (pending) {
@@ -145,7 +147,7 @@ export function useChannelMutes(pubkey: string | undefined): {
       cancelled = true;
       unsub();
     };
-  }, [pubkey, applyRemote]);
+  }, [pubkey, relayUrl, applyRemote]);
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: store.channels is the relevant dep — the outer store identity can change without channels changing (e.g., on reconnect writes)
   const mutedChannelIds = React.useMemo(
diff --git a/desktop/src/features/sidebar/lib/useChannelSections.ts b/desktop/src/features/sidebar/lib/useChannelSections.ts
index 2ba659a4841..3d8aa736086 100644
--- a/desktop/src/features/sidebar/lib/useChannelSections.ts
+++ b/desktop/src/features/sidebar/lib/useChannelSections.ts
@@ -45,7 +45,7 @@ export function useChannelSections(
   const lastAppliedEventId = React.useRef("");
 
   React.useEffect(() => {
-    if (!pubkey) {
+    if (!pubkey || !relayUrl) {
       setStore(DEFAULT_STORE);
       lastAppliedRemoteTs.current = 0;
       lastAppliedEventId.current = "";
@@ -54,7 +54,7 @@ export function useChannelSections(
     setStore(readChannelSectionsStore(pubkey, relayUrl));
     lastAppliedRemoteTs.current = 0;
     lastAppliedEventId.current = "";
-    managerRef.current = new ChannelSectionSyncManager(pubkey);
+    managerRef.current = new ChannelSectionSyncManager(pubkey, relayUrl);
     return () => {
       managerRef.current?.destroy();
       managerRef.current = null;
@@ -102,18 +102,16 @@ export function useChannelSections(
   );
 
   React.useEffect(() => {
-    if (!pubkey) return;
+    if (!pubkey || !relayUrl) return;
     let cancelled = false;
-    void managerRef.current?.fetchRemoteSections().then((remote) => {
+    const local = readChannelSectionsStore(pubkey, relayUrl);
+    void managerRef.current?.bootstrap(local).then((result) => {
       if (cancelled) return;
-      if (remote) {
-        setStore(applyRemote(remote));
-      } else {
-        const local = readChannelSectionsStore(pubkey, relayUrl);
-        if (local.sections.length > 0) {
-          managerRef.current?.publishSections(local);
-        }
+      if (result.action === "apply-remote") {
+        setStore(applyRemote(result.data));
       }
+      // "hold": seed already performed by bootstrap (if first-sync), or
+      // blocked (failed fetch / prior watermark). Hook does nothing.
     });
     return () => {
       cancelled = true;
@@ -146,10 +144,10 @@ export function useChannelSections(
     if (!pubkey) return;
     let cancelled = false;
     const unsub = relayClient.subscribeToReconnects(() => {
-      void managerRef.current?.fetchRemoteSections().then((remote) => {
+      void managerRef.current?.fetchRemoteSections().then((result) => {
         if (cancelled) return;
-        if (remote) {
-          setStore(applyRemote(remote));
+        if (result.status === "found") {
+          setStore(applyRemote(result.data));
         }
         const pending = managerRef.current?.getPendingStore();
         if (pending) {
diff --git a/desktop/src/features/sidebar/lib/useChannelSortPreference.ts b/desktop/src/features/sidebar/lib/useChannelSortPreference.ts
index e347d41a9d8..a7963a11e4f 100644
--- a/desktop/src/features/sidebar/lib/useChannelSortPreference.ts
+++ b/desktop/src/features/sidebar/lib/useChannelSortPreference.ts
@@ -49,7 +49,7 @@ export function useChannelSortPreference(
   const lastAppliedEventId = React.useRef("");
 
   React.useEffect(() => {
-    if (!pubkey) {
+    if (!pubkey || !relayUrl) {
       setStore(DEFAULT_STORE);
       lastAppliedRemoteTs.current = 0;
       lastAppliedEventId.current = "";
@@ -58,7 +58,7 @@ export function useChannelSortPreference(
     setStore(readChannelSortStore(pubkey, relayUrl));
     lastAppliedRemoteTs.current = 0;
     lastAppliedEventId.current = "";
-    managerRef.current = new ChannelSortSyncManager(pubkey);
+    managerRef.current = new ChannelSortSyncManager(pubkey, relayUrl);
     return () => {
       managerRef.current?.destroy();
       managerRef.current = null;
@@ -101,18 +101,15 @@ export function useChannelSortPreference(
   );
 
   React.useEffect(() => {
-    if (!pubkey) return;
+    if (!pubkey || !relayUrl) return;
     let cancelled = false;
-    void managerRef.current?.fetchRemoteSortPrefs().then((remote) => {
+    const local = readChannelSortStore(pubkey, relayUrl);
+    void managerRef.current?.bootstrap(local).then((result) => {
       if (cancelled) return;
-      if (remote) {
-        setStore(applyRemote(remote));
-      } else {
-        const local = readChannelSortStore(pubkey, relayUrl);
-        if (Object.keys(local.groups).length > 0) {
-          managerRef.current?.publishSortPrefs(local);
-        }
+      if (result.action === "apply-remote") {
+        setStore(applyRemote(result.data));
       }
+      // "hold": seed already performed by bootstrap (if first-sync), or blocked.
     });
     return () => {
       cancelled = true;
@@ -145,10 +142,10 @@ export function useChannelSortPreference(
     if (!pubkey) return;
     let cancelled = false;
     const unsub = relayClient.subscribeToReconnects(() => {
-      void managerRef.current?.fetchRemoteSortPrefs().then((remote) => {
+      void managerRef.current?.fetchRemoteSortPrefs().then((result) => {
         if (cancelled) return;
-        if (remote) {
-          setStore(applyRemote(remote));
+        if (result.status === "found") {
+          setStore(applyRemote(result.data));
         }
         const pending = managerRef.current?.getPendingStore();
         if (pending) {
diff --git a/desktop/src/features/sidebar/lib/useChannelStars.ts b/desktop/src/features/sidebar/lib/useChannelStars.ts
index 777bf52cfd8..b19b18a8643 100644
--- a/desktop/src/features/sidebar/lib/useChannelStars.ts
+++ b/desktop/src/features/sidebar/lib/useChannelStars.ts
@@ -14,7 +14,10 @@ import {
 import { ChannelStarSyncManager } from "./channelStarsSync";
 import type { RemoteStars } from "./channelStarsSync";
 
-export function useChannelStars(pubkey: string | undefined): {
+export function useChannelStars(
+  pubkey: string | undefined,
+  relayUrl?: string,
+): {
   starredChannelIds: Set<string>;
   starChannel: (channelId: string) => void;
   unstarChannel: (channelId: string) => void;
@@ -31,7 +34,7 @@ export function useChannelStars(pubkey: string | undefined): {
   const lastAppliedEventId = React.useRef("");
 
   React.useEffect(() => {
-    if (!pubkey) {
+    if (!pubkey || !relayUrl) {
       setStore(DEFAULT_STORE);
       lastAppliedRemoteTs.current = 0;
       lastAppliedEventId.current = "";
@@ -40,12 +43,12 @@ export function useChannelStars(pubkey: string | undefined): {
     setStore(readChannelStarsStore(pubkey));
     lastAppliedRemoteTs.current = 0;
     lastAppliedEventId.current = "";
-    managerRef.current = new ChannelStarSyncManager(pubkey);
+    managerRef.current = new ChannelStarSyncManager(pubkey, relayUrl);
     return () => {
       managerRef.current?.destroy();
       managerRef.current = null;
     };
-  }, [pubkey]);
+  }, [pubkey, relayUrl]);
 
   React.useEffect(() => {
     if (!pubkey) {
@@ -86,24 +89,22 @@ export function useChannelStars(pubkey: string | undefined): {
   );
 
   React.useEffect(() => {
-    if (!pubkey) return;
+    if (!pubkey || !relayUrl) return;
     let cancelled = false;
-    void managerRef.current?.fetchRemoteStars().then((remote) => {
+    const local = readChannelStarsStore(pubkey);
+    void managerRef.current?.bootstrap(local).then((result) => {
       if (cancelled) return;
-      if (remote) {
-        setStore(applyRemote(remote));
-      } else {
-        const local = readChannelStarsStore(pubkey);
-        if (Object.keys(local.channels).length > 0) {
-          managerRef.current?.publishStars(local);
-        }
+      if (result.action === "apply-remote") {
+        setStore(applyRemote(result.data));
       }
+      // "hold": seed already performed by bootstrap (if first-sync), or blocked.
     });
     return () => {
       cancelled = true;
     };
-  }, [pubkey, applyRemote]);
+  }, [pubkey, relayUrl, applyRemote]);
 
+  // biome-ignore lint/correctness/useExhaustiveDependencies: relayUrl is intentional — rebinds subscription when the active relay changes even though it is not used inside the effect body directly (the manager via managerRef.current carries it)
   React.useEffect(() => {
     if (!pubkey) return;
     let unsub: (() => Promise<void>) | null = null;
@@ -124,16 +125,17 @@ export function useChannelStars(pubkey: string | undefined): {
       cancelled = true;
       if (unsub) void unsub();
     };
-  }, [pubkey, applyRemote]);
+  }, [pubkey, relayUrl, applyRemote]);
 
+  // biome-ignore lint/correctness/useExhaustiveDependencies: relayUrl is intentional — rebinds reconnect listener when the active relay changes (community switch) even though it is not referenced directly inside the effect body
   React.useEffect(() => {
     if (!pubkey) return;
     let cancelled = false;
     const unsub = relayClient.subscribeToReconnects(() => {
-      void managerRef.current?.fetchRemoteStars().then((remote) => {
+      void managerRef.current?.fetchRemoteStars().then((result) => {
         if (cancelled) return;
-        if (remote) {
-          setStore(applyRemote(remote));
+        if (result.status === "found") {
+          setStore(applyRemote(result.data));
         }
         const pending = managerRef.current?.getPendingStarStore();
         if (pending) {
@@ -145,7 +147,7 @@ export function useChannelStars(pubkey: string | undefined): {
       cancelled = true;
       unsub();
     };
-  }, [pubkey, applyRemote]);
+  }, [pubkey, relayUrl, applyRemote]);
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: store.channels is the relevant dep — the outer store identity can change without channels changing (e.g., on reconnect writes)
   const starredChannelIds = React.useMemo(
diff --git a/desktop/src/features/terminal/TerminalSubstrate.test.mjs b/desktop/src/features/terminal/TerminalSubstrate.test.mjs
index ef138396b90..d6113cbf083 100644
--- a/desktop/src/features/terminal/TerminalSubstrate.test.mjs
+++ b/desktop/src/features/terminal/TerminalSubstrate.test.mjs
@@ -558,6 +558,7 @@ function frameWith(text, generation = 1) {
     rows: [
       {
         line: 0,
+        wrapped: false,
         spans: [
           {
             style: { fg: 0, bg: 0, flags: 0 },
@@ -857,3 +858,180 @@ test("the handoff chord still toggles with the tab layer installed", async () =>
 // Splash animation lifecycle.
 //
 // This substrate is mounted unconditionally on every route and merely
+
+test("mirrors the active canvas grid into a selectable plain-text layer", async () => {
+  const subject = fixture({
+    sessionFrames: [
+      { frame: frameWith("one"), sessionId: "one" },
+      { frame: frameWith("two"), sessionId: "two" },
+    ],
+    sessions: TWO_SESSIONS,
+  });
+  await ready(subject.view);
+  const selectionLayer = subject.view.container.querySelector(
+    ".buzz-terminal-selection-layer",
+  );
+  await waitFor(() =>
+    assert.equal(
+      selectionLayer.querySelector("[data-terminal-selection-row='0']")
+        .textContent,
+      "one",
+    ),
+  );
+
+  subject.rerender({ sessions: SWAPPED_SESSIONS });
+  await waitFor(() =>
+    assert.equal(
+      selectionLayer.querySelector("[data-terminal-selection-row='0']")
+        .textContent,
+      "two",
+    ),
+  );
+});
+
+test("lays out screen rows separately but copies soft wraps as one logical line", async () => {
+  const frame = {
+    cursor: { column: 0, line: 0, visible: false },
+    full: true,
+    rows: [
+      {
+        line: 0,
+        wrapped: true,
+        spans: [
+          {
+            style: { fg: 0, bg: 0, flags: 0 },
+            clusters: [
+              { column: 0, text: "a", width: 1 },
+              { column: 1, text: "b", width: 1 },
+              { column: 2, text: "c", width: 1 },
+              { column: 3, text: "d", width: 1 },
+              { column: 4, text: " ", width: 1 },
+            ],
+          },
+        ],
+      },
+      {
+        line: 1,
+        wrapped: false,
+        spans: [
+          {
+            style: { fg: 0, bg: 0, flags: 0 },
+            clusters: [
+              { column: 0, text: "é", width: 1 },
+              { column: 1, text: "f", width: 1 },
+            ],
+          },
+        ],
+      },
+    ],
+    viewport: { columns: 5, generation: 1, screenLines: 2 },
+  };
+  const subject = fixture({
+    sessionFrames: [{ frame, sessionId: "one" }],
+  });
+  await ready(subject.view);
+  const selectionLayer = subject.view.container.querySelector(
+    ".buzz-terminal-selection-layer",
+  );
+  await waitFor(() =>
+    assert.equal(
+      selectionLayer.querySelectorAll("[data-terminal-selection-row]").length,
+      2,
+    ),
+  );
+  const rows = selectionLayer.querySelectorAll("[data-terminal-selection-row]");
+  assert.equal(rows[0].textContent, "abcd ");
+  assert.equal(rows[1].textContent, "éf");
+
+  const selection = window.getSelection();
+  selection.removeAllRanges();
+  const range = document.createRange();
+  range.setStart(rows[0].firstChild, 1);
+  range.setEnd(rows[1].firstChild, rows[1].textContent.length);
+  selection.addRange(range);
+  const copied = new Map();
+  fireEvent.copy(rows[0].parentElement, {
+    clipboardData: { setData: (type, value) => copied.set(type, value) },
+  });
+  assert.equal(copied.get("text/plain"), "bcd éf");
+});
+
+test("copy normalizes grapheme and empty-row DOM endpoints", async () => {
+  const frame = {
+    cursor: { column: 0, line: 0, visible: false },
+    full: true,
+    rows: [
+      {
+        line: 0,
+        wrapped: false,
+        spans: [
+          {
+            style: { fg: 0, bg: 0, flags: 0 },
+            clusters: [
+              { column: 0, text: "😀", width: 2 },
+              { column: 2, text: "é", width: 1 },
+            ],
+          },
+        ],
+      },
+      { line: 1, wrapped: false, spans: [] },
+      {
+        line: 2,
+        wrapped: false,
+        spans: [
+          {
+            style: { fg: 0, bg: 0, flags: 0 },
+            clusters: [{ column: 0, text: "界", width: 2 }],
+          },
+        ],
+      },
+    ],
+    viewport: { columns: 5, generation: 1, screenLines: 3 },
+  };
+  const subject = fixture({ sessionFrames: [{ frame, sessionId: "one" }] });
+  await ready(subject.view);
+  const layer = subject.view.container.querySelector(
+    ".buzz-terminal-selection-layer",
+  );
+  await waitFor(() =>
+    assert.equal(
+      layer.querySelectorAll("[data-terminal-selection-row]").length,
+      3,
+    ),
+  );
+  const rows = layer.querySelectorAll("[data-terminal-selection-row]");
+  const copyRange = (range) => {
+    const selection = window.getSelection();
+    selection.removeAllRanges();
+    selection.addRange(range);
+    const copied = new Map();
+    fireEvent.copy(layer, {
+      clipboardData: { setData: (type, value) => copied.set(type, value) },
+    });
+    return copied.get("text/plain");
+  };
+
+  const splitEmoji = document.createRange();
+  splitEmoji.setStart(rows[0].firstChild, 1);
+  splitEmoji.setEnd(rows[0].firstChild, 1);
+  // A collapsed native selection does not dispatch custom clipboard content;
+  // span from the middle of the emoji into the combining cluster instead.
+  splitEmoji.setEnd(rows[0].firstChild, 3);
+  assert.equal(copyRange(splitEmoji), "😀é");
+
+  const throughBlank = document.createRange();
+  throughBlank.setStart(rows[0], 1);
+  throughBlank.setEnd(rows[2], 0);
+  assert.equal(copyRange(throughBlank), "\n\n");
+
+  const selection = window.getSelection();
+  selection.removeAllRanges();
+  selection.setBaseAndExtent(rows[2].firstChild, 1, rows[0].firstChild, 0);
+  const reverseCopied = new Map();
+  fireEvent.copy(layer, {
+    clipboardData: {
+      setData: (type, value) => reverseCopied.set(type, value),
+    },
+  });
+  assert.equal(reverseCopied.get("text/plain"), "😀é\n\n界");
+});
diff --git a/desktop/src/features/terminal/TerminalSubstrate.tsx b/desktop/src/features/terminal/TerminalSubstrate.tsx
index 81ac91528a4..d8aaee2e2df 100644
--- a/desktop/src/features/terminal/TerminalSubstrate.tsx
+++ b/desktop/src/features/terminal/TerminalSubstrate.tsx
@@ -19,6 +19,7 @@ import { buildBannerColorTable, phaseAt } from "./terminalBannerWave";
 import {
   TERMINAL_CELL_METRICS,
   type TerminalFrame,
+  type TerminalSelectionRow,
   TerminalGrid,
 } from "./terminalRenderer";
 
@@ -128,6 +129,9 @@ export function TerminalSubstrate({
   );
   const [owner, setOwner] = React.useState<"buzz" | "terminal">("buzz");
   const [viewport, setViewport] = React.useState({ columns: 1, rows: 1 });
+  const [selectionRows, setSelectionRows] = React.useState<
+    readonly TerminalSelectionRow[]
+  >([]);
   const [welcomeVisible, setWelcomeVisible] = React.useState(false);
   const [cursorPainted, setCursorPainted] = React.useState(true);
   const [cursorReset, setCursorReset] = React.useState(0);
@@ -457,6 +461,7 @@ export function TerminalSubstrate({
     gridRef.current = activeSessionId
       ? (gridsRef.current.get(activeSessionId) ?? null)
       : null;
+    setSelectionRows(gridRef.current?.selectionRows() ?? []);
 
     paintTerminal();
   }, [activeSessionId, cursorPainted, frames, terminalPalette]);
@@ -672,17 +677,84 @@ export function TerminalSubstrate({
           </button>
         </div>
       </div>
-      {/* biome-ignore lint/a11y/noStaticElementInteractions: the hidden textarea owns keyboard semantics; this only preserves its focus across canvas clicks. */}
-      <div
-        className="buzz-terminal-viewport px-5 pt-2"
-        onMouseDown={(event) => {
-          // Preventing the canvas mousedown also suppresses selection. Revisit
-          // this when the terminal gains mouse selection support.
-          event.preventDefault();
-          textareaRef.current?.focus({ preventScroll: true });
-        }}
-      >
+      <div className="buzz-terminal-viewport px-5 pt-2">
         <canvas ref={canvasRef} />
+        <div
+          aria-hidden="true"
+          className="buzz-terminal-selection-layer"
+          onCopy={(event) => {
+            const selection = window.getSelection();
+            const grid = gridRef.current;
+            if (!selection || selection.isCollapsed || !grid) return;
+            const rowFor = (node: Node | null) =>
+              (node?.nodeType === 1
+                ? (node as Element)
+                : node?.parentElement
+              )?.closest<HTMLElement>("[data-terminal-selection-row]");
+            const anchorNode = selection.anchorNode;
+            const focusNode = selection.focusNode;
+            if (!anchorNode || !focusNode) return;
+            let startRow = rowFor(anchorNode);
+            let endRow = rowFor(focusNode);
+            if (!startRow || !endRow) return;
+            let startIndex = Number(startRow.dataset.terminalSelectionRow);
+            let endIndex = Number(endRow.dataset.terminalSelectionRow);
+            const offsetInRow = (
+              row: HTMLElement,
+              node: Node,
+              offset: number,
+            ) => {
+              const range = document.createRange();
+              range.selectNodeContents(row);
+              range.setEnd(node, offset);
+              return range.toString().length;
+            };
+            let startOffset = offsetInRow(
+              startRow,
+              anchorNode,
+              selection.anchorOffset,
+            );
+            let endOffset = offsetInRow(
+              endRow,
+              focusNode,
+              selection.focusOffset,
+            );
+            if (
+              startIndex > endIndex ||
+              (startIndex === endIndex && startOffset > endOffset)
+            ) {
+              [startRow, endRow] = [endRow, startRow];
+              [startIndex, endIndex] = [endIndex, startIndex];
+              [startOffset, endOffset] = [endOffset, startOffset];
+            }
+            startOffset = grid.normalizeSelectionOffset(
+              startIndex,
+              startOffset,
+              "start",
+            );
+            endOffset = grid.normalizeSelectionOffset(
+              endIndex,
+              endOffset,
+              "end",
+            );
+            event.preventDefault();
+            event.clipboardData.setData(
+              "text/plain",
+              grid.selectionText(startIndex, startOffset, endIndex, endOffset),
+            );
+          }}
+          onMouseUp={() => {
+            if (window.getSelection()?.isCollapsed !== false) {
+              textareaRef.current?.focus({ preventScroll: true });
+            }
+          }}
+        >
+          {selectionRows.map((row) => (
+            <div data-terminal-selection-row={row.line} key={row.line}>
+              {row.text || "\u00a0"}
+            </div>
+          ))}
+        </div>
         {welcomeVisible && banner ? (
           <canvas className="buzz-terminal-welcome" ref={bannerCanvasRef} />
         ) : null}
diff --git a/desktop/src/features/terminal/terminalRenderer.test.mjs b/desktop/src/features/terminal/terminalRenderer.test.mjs
index e718310f5ad..97c3ca925e9 100644
--- a/desktop/src/features/terminal/terminalRenderer.test.mjs
+++ b/desktop/src/features/terminal/terminalRenderer.test.mjs
@@ -68,6 +68,7 @@ test("clusters draw at computed columns, never accumulated text width", () => {
       rows: [
         {
           line: 0,
+          wrapped: false,
           spans: [
             {
               style: { fg: 0x01000007, bg: 0x01000101, flags: 0 },
@@ -108,6 +109,7 @@ test("combining marks stay in one cluster and consume one cell", () => {
     rows: [
       {
         line: 0,
+        wrapped: false,
         spans: [
           {
             style: { fg: 0x01000007, bg: 0x01000101, flags: 0 },
@@ -165,3 +167,84 @@ test("cursor visibility can blink without a new terminal frame", () => {
   grid.paint(restored, metrics, palette);
   assert.ok(restored.fills.some((fill) => fill[0] === 20 && fill[2] === 1.2));
 });
+
+test("text preserves soft-wrap spaces and hard line breaks", () => {
+  const grid = new TerminalGrid({ generation: 0, columns: 5, screenLines: 3 });
+  grid.apply({
+    viewport: grid.viewport,
+    full: true,
+    cursor: { line: 0, column: 0, visible: false },
+    rows: [
+      {
+        line: 0,
+        wrapped: true,
+        spans: [
+          {
+            style: { fg: 0, bg: 0, flags: 0 },
+            clusters: [..."abcd "].map((text, column) => ({
+              column,
+              text,
+              width: 1,
+            })),
+          },
+        ],
+      },
+      {
+        line: 1,
+        wrapped: false,
+        spans: [
+          {
+            style: { fg: 0, bg: 0, flags: 0 },
+            clusters: [
+              { column: 0, text: "é", width: 1 },
+              { column: 1, text: "f", width: 1 },
+            ],
+          },
+        ],
+      },
+      {
+        line: 2,
+        wrapped: false,
+        spans: [
+          {
+            style: { fg: 0, bg: 0, flags: 0 },
+            clusters: [{ column: 0, text: "tail", width: 1 }],
+          },
+        ],
+      },
+    ],
+  });
+
+  assert.equal(grid.text(), "abcd éf\ntail");
+});
+
+test("selection offsets expand to complete grapheme clusters and clamp empty rows", () => {
+  const grid = new TerminalGrid({ generation: 0, columns: 5, screenLines: 2 });
+  grid.apply({
+    viewport: grid.viewport,
+    full: true,
+    cursor: { line: 0, column: 0, visible: false },
+    rows: [
+      {
+        line: 0,
+        wrapped: false,
+        spans: [
+          {
+            style: { fg: 0, bg: 0, flags: 0 },
+            clusters: [
+              { column: 0, text: "😀", width: 2 },
+              { column: 2, text: "é", width: 1 },
+            ],
+          },
+        ],
+      },
+      { line: 1, wrapped: false, spans: [] },
+    ],
+  });
+
+  assert.equal(grid.normalizeSelectionOffset(0, 1, "start"), 0);
+  assert.equal(grid.normalizeSelectionOffset(0, 1, "end"), 2);
+  assert.equal(grid.normalizeSelectionOffset(0, 3, "start"), 2);
+  assert.equal(grid.normalizeSelectionOffset(0, 3, "end"), 4);
+  assert.equal(grid.normalizeSelectionOffset(1, 1, "end"), 0);
+});
diff --git a/desktop/src/features/terminal/terminalRenderer.ts b/desktop/src/features/terminal/terminalRenderer.ts
index 085679408ae..8b46899710a 100644
--- a/desktop/src/features/terminal/terminalRenderer.ts
+++ b/desktop/src/features/terminal/terminalRenderer.ts
@@ -23,7 +23,11 @@ export type TerminalSpan = {
   clusters: readonly TerminalCluster[];
 };
 
-export type TerminalRow = { line: number; spans: readonly TerminalSpan[] };
+export type TerminalRow = {
+  line: number;
+  wrapped: boolean;
+  spans: readonly TerminalSpan[];
+};
 export type TerminalCursor = {
   line: number;
   column: number;
@@ -52,7 +56,17 @@ export const TERMINAL_CELL_METRICS = {
   boldFont: '700 14px "JetBrains Mono", monospace',
 } as const satisfies CellMetrics;
 
-type RetainedRow = readonly TerminalSpan[];
+export type TerminalSelectionRow = {
+  boundaries: readonly number[];
+  line: number;
+  text: string;
+  wrapped: boolean;
+};
+
+type RetainedRow = {
+  wrapped: boolean;
+  spans: readonly TerminalSpan[];
+};
 
 export type PaintContext = Pick<
   CanvasRenderingContext2D,
@@ -120,7 +134,10 @@ export class TerminalGrid {
 
   constructor(viewport: TerminalViewport) {
     this.#viewport = viewport;
-    this.#rows = Array.from({ length: viewport.screenLines }, () => []);
+    this.#rows = Array.from({ length: viewport.screenLines }, () => ({
+      wrapped: false,
+      spans: [],
+    }));
     this.markAllDirty();
   }
 
@@ -128,6 +145,87 @@ export class TerminalGrid {
     return this.#viewport;
   }
 
+  selectionRows(): readonly TerminalSelectionRow[] {
+    return this.#rows.map((row, line) => {
+      const cells = Array.from({ length: this.#viewport.columns }, () => " ");
+      for (const span of row.spans) {
+        for (const cluster of span.clusters) {
+          cells[cluster.column] = cluster.text;
+          for (let offset = 1; offset < cluster.width; offset++) {
+            cells[cluster.column + offset] = "";
+          }
+        }
+      }
+      const text = cells.join("");
+      const retainedText = row.wrapped ? text : text.trimEnd();
+      const boundaries = [0];
+      for (const segment of new Intl.Segmenter(undefined, {
+        granularity: "grapheme",
+      }).segment(retainedText)) {
+        boundaries.push(segment.index + segment.segment.length);
+      }
+      return {
+        boundaries,
+        line,
+        text: retainedText,
+        wrapped: row.wrapped,
+      };
+    });
+  }
+
+  normalizeSelectionOffset(
+    rowIndex: number,
+    offset: number,
+    edge: "start" | "end",
+  ): number {
+    const row = this.selectionRows()[rowIndex];
+    if (!row) return 0;
+    const clamped = Math.max(0, Math.min(offset, row.text.length));
+    if (edge === "start") {
+      for (let index = row.boundaries.length - 1; index >= 0; index--) {
+        if (row.boundaries[index] <= clamped) return row.boundaries[index];
+      }
+      return 0;
+    }
+    return (
+      row.boundaries.find((boundary) => boundary >= clamped) ?? row.text.length
+    );
+  }
+
+  selectionText(
+    startRow: number,
+    startOffset: number,
+    endRow: number,
+    endOffset: number,
+  ): string {
+    const rows = this.selectionRows();
+    if (
+      startRow < 0 ||
+      endRow < startRow ||
+      endRow >= rows.length ||
+      startOffset < 0 ||
+      endOffset < 0
+    ) {
+      return "";
+    }
+    let selected = "";
+    for (let index = startRow; index <= endRow; index++) {
+      const row = rows[index];
+      const from = index === startRow ? startOffset : 0;
+      const to = index === endRow ? endOffset : row.text.length;
+      selected += row.text.slice(from, to);
+      if (index < endRow && !row.wrapped) selected += "\n";
+    }
+    return selected;
+  }
+
+  text(): string {
+    return this.selectionRows()
+      .map((row) => (row.wrapped ? row.text : `${row.text}\n`))
+      .join("")
+      .replace(/\n$/, "");
+  }
+
   apply(frame: TerminalFrame): boolean {
     if (
       frame.viewport.generation !== this.#viewport.generation ||
@@ -142,7 +240,7 @@ export class TerminalGrid {
     this.#dirty.add(this.#cursor.line);
     for (const row of frame.rows) {
       if (row.line < this.#rows.length) {
-        this.#rows[row.line] = row.spans;
+        this.#rows[row.line] = { wrapped: row.wrapped, spans: row.spans };
         this.#dirty.add(row.line);
       }
     }
@@ -151,7 +249,10 @@ export class TerminalGrid {
 
   resize(viewport: TerminalViewport): void {
     this.#viewport = viewport;
-    this.#rows = Array.from({ length: viewport.screenLines }, () => []);
+    this.#rows = Array.from({ length: viewport.screenLines }, () => ({
+      wrapped: false,
+      spans: [],
+    }));
     this.#cursor = { line: 0, column: 0, visible: false };
     this.markAllDirty();
   }
@@ -186,7 +287,7 @@ export class TerminalGrid {
         this.#viewport.columns * metrics.width,
         metrics.height,
       );
-      for (const span of this.#rows[line] ?? []) {
+      for (const span of this.#rows[line]?.spans ?? []) {
         const background = resolvePackedColor(
           span.style.bg,
           palette,
diff --git a/desktop/src/main.tsx b/desktop/src/main.tsx
index d2751dfe16c..0092c086e01 100644
--- a/desktop/src/main.tsx
+++ b/desktop/src/main.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 import { App } from "@/app/App";
+import { RootErrorBoundary } from "@/app/RootErrorBoundary";
 import { NostrBindConsentDialog } from "@/features/profile/ui/NostrBindConsentDialog";
 import "@fontsource-variable/inter/wght.css";
 import "@fontsource/jetbrains-mono/400.css";
@@ -76,23 +77,29 @@ function configureDevE2eBridgeFromUrl() {
 function renderApp() {
   ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
     <React.StrictMode>
-      <CommunitiesProvider>
-        <CommunityOnboardingProvider enabled={huddleWindowChannelId() === null}>
-          <ThemeProvider defaultTheme="buzz">
-            <TooltipProvider delayDuration={300}>
-              <EmojiBurstProvider>
-                <PoofBurstProvider>
-                  <UpdaterProvider>
-                    <App />
-                    <NostrBindConsentDialog />
-                  </UpdaterProvider>
-                  <Toaster />
-                </PoofBurstProvider>
-              </EmojiBurstProvider>
-            </TooltipProvider>
-          </ThemeProvider>
-        </CommunityOnboardingProvider>
-      </CommunitiesProvider>
+      {/* block/buzz#5078 — catch any uncaught render error so a WebKit
+          SecurityError from localStorage can't blank the whole window. */}
+      <RootErrorBoundary>
+        <CommunitiesProvider>
+          <CommunityOnboardingProvider
+            enabled={huddleWindowChannelId() === null}
+          >
+            <ThemeProvider defaultTheme="buzz">
+              <TooltipProvider delayDuration={300}>
+                <EmojiBurstProvider>
+                  <PoofBurstProvider>
+                    <UpdaterProvider>
+                      <App />
+                      <NostrBindConsentDialog />
+                    </UpdaterProvider>
+                    <Toaster />
+                  </PoofBurstProvider>
+                </EmojiBurstProvider>
+              </TooltipProvider>
+            </ThemeProvider>
+          </CommunityOnboardingProvider>
+        </CommunitiesProvider>
+      </RootErrorBoundary>
     </React.StrictMode>,
   );
 }
diff --git a/desktop/src/shared/api/editMessage.ts b/desktop/src/shared/api/editMessage.ts
new file mode 100644
index 00000000000..fc63502e49b
--- /dev/null
+++ b/desktop/src/shared/api/editMessage.ts
@@ -0,0 +1,23 @@
+import { invokeTauri } from "@/shared/api/tauri";
+
+export async function editMessage(
+  channelId: string,
+  eventId: string,
+  content: string,
+  mediaTags?: string[][],
+  emojiTags?: string[][],
+  mentionPubkeys?: string[],
+  suppressLinkPreviews?: boolean,
+): Promise<void> {
+  await invokeTauri("edit_message", {
+    input: {
+      channelId,
+      eventId,
+      content,
+      mediaTags: mediaTags ?? [],
+      emojiTags: emojiTags ?? [],
+      mentionPubkeys: mentionPubkeys ?? [],
+      suppressLinkPreviews: suppressLinkPreviews ?? false,
+    },
+  });
+}
diff --git a/desktop/src/shared/api/tauri.ts b/desktop/src/shared/api/tauri.ts
index 67ba582a1d4..52aa8f19ebb 100644
--- a/desktop/src/shared/api/tauri.ts
+++ b/desktop/src/shared/api/tauri.ts
@@ -549,6 +549,7 @@ export async function sendChannelMessage(
   kind?: number,
   emojiTags?: string[][],
   mentionTags?: string[][],
+  linkPreviewTags?: string[][],
 ): Promise<SendChannelMessageResult> {
   const response = await invokeTauri<RawSendChannelMessageResult>(
     "send_channel_message",
@@ -559,6 +560,7 @@ export async function sendChannelMessage(
       mediaTags: mediaTags ?? null,
       emojiTags: emojiTags ?? null,
       mentionTags: mentionTags ?? null,
+      linkPreviewTags,
       mentionPubkeys: mentionPubkeys ?? null,
       kind: kind ?? null,
     },
@@ -615,23 +617,7 @@ export async function uploadMediaBytes(
   });
 }
 
-export async function editMessage(
-  channelId: string,
-  eventId: string,
-  content: string,
-  mediaTags?: string[][],
-  emojiTags?: string[][],
-  mentionPubkeys?: string[],
-): Promise<void> {
-  await invokeTauri("edit_message", {
-    channelId,
-    eventId,
-    content,
-    mediaTags: mediaTags ?? [],
-    emojiTags: emojiTags ?? [],
-    mentionPubkeys: mentionPubkeys ?? null,
-  });
-}
+export { editMessage } from "@/shared/api/editMessage";
 
 export async function deleteMessage(
   channelId: string,
@@ -1126,8 +1112,6 @@ export async function nip44DecryptFromSelf(
   return invokeTauri<string>("nip44_decrypt_from_self", { ciphertext });
 }
 
-// ── NIP-AB device pairing ───────────────────────────────────────────────────
-
 export async function startPairing(): Promise<string> {
   return invokeTauri<string>("start_pairing");
 }
diff --git a/desktop/src/shared/api/tauriPairing.ts b/desktop/src/shared/api/tauriPairing.ts
new file mode 100644
index 00000000000..6fdf7794463
--- /dev/null
+++ b/desktop/src/shared/api/tauriPairing.ts
@@ -0,0 +1,5 @@
+import { invokeTauri } from "@/shared/api/tauri";
+
+export async function startIdentityRecoveryPairing(): Promise<string> {
+  return invokeTauri<string>("start_identity_recovery_pairing");
+}
diff --git a/desktop/src/shared/lib/linkPreview.test.mjs b/desktop/src/shared/lib/linkPreview.test.mjs
index 43cfa66060e..4bf3245dbff 100644
--- a/desktop/src/shared/lib/linkPreview.test.mjs
+++ b/desktop/src/shared/lib/linkPreview.test.mjs
@@ -71,12 +71,12 @@ test("parseSupportedLinkPreview parses Buzz relay git clone URLs", () => {
       typeLabel: "repo",
     },
   );
-  // Same URL without a matching origin stays external.
+  // Same URL without a matching origin stays an ordinary external preview.
   assert.equal(
     parseSupportedLinkPreview(
       `https://buzz.block.builderlab.xyz/git/${BUZZ_OWNER}/buzz-world-galaxy`,
-    ),
-    null,
+    )?.kind,
+    "generic-link",
   );
 });
 
@@ -108,10 +108,10 @@ test("parseSupportedLinkPreview rejects malformed Buzz git URLs", () => {
     // Deeper transport paths are not repo links.
     `https://relay.example/git/${BUZZ_OWNER}/repo/info/refs`,
   ]) {
-    // Even with a matching origin, structural issues return null.
+    // Structural non-matches remain ordinary external previews.
     assert.equal(
-      parseSupportedLinkPreview(href, "https://relay.example"),
-      null,
+      parseSupportedLinkPreview(href, "https://relay.example")?.kind,
+      "generic-link",
       href,
     );
   }
@@ -123,8 +123,8 @@ test("parseSupportedLinkPreview rejects clone URLs from non-relay hosts", () =>
     parseSupportedLinkPreview(
       `https://evil.example/git/${BUZZ_OWNER}/my-repo`,
       "https://buzz.block.builderlab.xyz",
-    ),
-    null,
+    )?.kind,
+    "generic-link",
   );
   // github.com sharing the path shape must never become a Buzz repo card.
   assert.equal(
@@ -139,8 +139,8 @@ test("parseSupportedLinkPreview rejects clone URLs from non-relay hosts", () =>
     parseSupportedLinkPreview(
       `https://buzz.block.builderlab.xyz/git/${BUZZ_OWNER}/buzz-world`,
       null,
-    ),
-    null,
+    )?.kind,
+    "generic-link",
   );
 });
 
@@ -288,8 +288,8 @@ test("extractSupportedLinkPreviews picks up bare Buzz clone URLs in prose", () =
   assert.deepEqual(
     extractSupportedLinkPreviews(
       `clone: https://buzz.block.builderlab.xyz/git/${BUZZ_OWNER}/buzz-world-galaxy`,
-    ),
-    [],
+    ).map((preview) => preview.kind),
+    ["generic-link"],
   );
 });
 
@@ -323,6 +323,7 @@ test("clone URLs and buzz://repo links for the same repo dedupe to one card", ()
         `https://relay.example/git/${BUZZ_OWNER}/buzz-world-galaxy`,
         `buzz://repo?owner=${BUZZ_OWNER}&d=buzz-world-galaxy`,
       ].join(" "),
+      "https://relay.example",
     ).map((preview) => preview.href),
     [`buzz://repo?owner=${BUZZ_OWNER}&d=buzz-world-galaxy`],
   );
@@ -412,7 +413,7 @@ test("extractSupportedLinkPreviews skips markdown image link URLs", () => {
   );
 });
 
-test("extractSupportedLinkPreviews requires bare URL boundaries", () => {
+test("extractSupportedLinkPreviews treats other absolute HTTPS URLs as generic", () => {
   assert.deepEqual(
     extractSupportedLinkPreviews(
       [
@@ -421,7 +422,7 @@ test("extractSupportedLinkPreviews requires bare URL boundaries", () => {
         "(https://github.com/block/sprout/pull/2)",
       ].join(" "),
     ).map((preview) => preview.title),
-    ["block/sprout #2"],
+    ["evil-github.com", "example.com", "block/sprout #2"],
   );
 });
 
@@ -467,105 +468,38 @@ test("isSupportedLinkAutolinkLabel matches normalized bare URL labels", () => {
   assert.equal(isSupportedLinkAutolinkLabel("review this", preview), false);
 });
 
-// ── useResolvedLinkPreviews: behavioral regression pins ──────────────────────
-//
-// These tests pin the three behaviors that were implemented without tests in
-// the initial fix round. They use the exported pure helpers directly so no
-// React hook environment is required.
-
-import {
-  getLinkPreviewCacheGeneration,
-  resetLinkPreviewTitleCache,
-  shouldResolveTitle,
-} from "./useResolvedLinkPreviews.ts";
-import { buzzEntityFallbackTitle } from "./linkPreview.ts";
-
-const OWNER_HEX =
-  "71d67180ba17e749ee825fc8819c9c6ee7003617e1c126504f9b658070ab9224";
-const EVENT_HEX =
-  "c3b589fa5713ba25bad6dc095e2de00a4ac8f50050fdea00fc6444e603be1dd1";
-
-function makePrPreview(title) {
-  return {
-    kind: "buzz-pull-request",
-    href: `buzz://pr?id=${EVENT_HEX}&owner=${OWNER_HEX}&d=buzz-world`,
-    title,
-    provider: "Buzz",
-    typeLabel: "pr",
-  };
-}
-
-// 1. Cache epoch: stale promise cannot seed the new generation.
-//    `resetLinkPreviewTitleCache` must increment the generation counter so that
-//    a promise captured before the reset sees a different generation and skips
-//    writing back.
-test("resetLinkPreviewTitleCache_incrementsGenerationCounter", () => {
-  const before = getLinkPreviewCacheGeneration();
-  resetLinkPreviewTitleCache();
-  const after = getLinkPreviewCacheGeneration();
-  assert.equal(after, before + 1, "each reset must bump the generation by 1");
-  resetLinkPreviewTitleCache();
-  assert.equal(
-    getLinkPreviewCacheGeneration(),
-    before + 2,
-    "second reset must increment again",
-  );
-});
-
-// 2. Mismatched a-tag: shouldResolveTitle uses buzzEntityFallbackTitle to
-//    decide whether to attempt a relay lookup. When the link's href parses to a
-//    PR/issue with the expected fallback title, resolution should proceed. When
-//    the title has already been set to something else (explicit label or earlier
-//    relay result), shouldResolveTitle must return false so the label wins.
-test("shouldResolveTitle_fallbackTitle_returnsTrue", () => {
-  const parsed = {
-    ok: true,
-    value: { type: "pr", id: EVENT_HEX, owner: OWNER_HEX, dtag: "buzz-world" },
-  };
-  // Construct the expected fallback title and verify shouldResolveTitle allows lookup.
-  const fallback = buzzEntityFallbackTitle(parsed.value);
-  const preview = makePrPreview(fallback);
-  assert.equal(
-    shouldResolveTitle(preview),
-    true,
-    "fallback title should trigger relay lookup",
+test("parseSupportedLinkPreview parses generic HTTPS URLs", () => {
+  assert.deepEqual(
+    parseSupportedLinkPreview("https://example.com/articles/rich-previews"),
+    {
+      kind: "generic-link",
+      href: "https://example.com/articles/rich-previews",
+      provider: "example.com",
+      title: "example.com",
+      typeLabel: "link",
+    },
   );
 });
 
-test("shouldResolveTitle_customLabel_returnsFalse_labelMustWin", () => {
-  // User has written `[My custom PR title](buzz://pr?...)` — the label must
-  // win; shouldResolveTitle must return false to skip writing the relay title.
-  const preview = makePrPreview("My custom PR title");
+test("parseSupportedLinkPreview rejects generic HTTP URLs", () => {
   assert.equal(
-    shouldResolveTitle(preview),
-    false,
-    "custom label must suppress relay title lookup (label-must-win invariant)",
+    parseSupportedLinkPreview("http://example.com/articles/rich-previews"),
+    null,
   );
 });
 
-// 3. Label-rerender: converting a bare link to `[label](link)` changes the
-//    preview title away from the fallback — shouldResolveTitle transitions
-//    from true to false, so a cached relay title is not applied.
-test("shouldResolveTitle_transitionsFromTrueToFalseWhenLabelApplied", () => {
-  const parsed = {
-    ok: true,
-    value: { type: "pr", id: EVENT_HEX, owner: OWNER_HEX, dtag: "buzz-world" },
-  };
-  const fallback = buzzEntityFallbackTitle(parsed.value);
-
-  // Before the label: bare link with fallback title — should resolve.
-  const barePreview = makePrPreview(fallback);
-  assert.equal(
-    shouldResolveTitle(barePreview),
-    true,
-    "bare link should resolve",
-  );
-
-  // After the label: same href but title is now the user's label — must NOT resolve.
-  const labeledPreview = makePrPreview("My labeled PR");
-  assert.equal(
-    shouldResolveTitle(labeledPreview),
-    false,
-    "labeled link must not overwrite label with cached relay title",
+test("extractSupportedLinkPreviews finds generic links and preserves exclusions", () => {
+  assert.deepEqual(
+    extractSupportedLinkPreviews(
+      [
+        "Read https://example.com/article first.",
+        "`https://hidden.example.com/secret`",
+        "then [the details](https://docs.example.org/details)",
+      ].join(" "),
+    ).map(({ kind, title }) => ({ kind, title })),
+    [
+      { kind: "generic-link", title: "example.com" },
+      { kind: "generic-link", title: "the details" },
+    ],
   );
 });
diff --git a/desktop/src/shared/lib/linkPreview.ts b/desktop/src/shared/lib/linkPreview.ts
index b518b0728ee..58d8739ef14 100644
--- a/desktop/src/shared/lib/linkPreview.ts
+++ b/desktop/src/shared/lib/linkPreview.ts
@@ -19,20 +19,17 @@ export type SupportedLinkPreviewKind =
   | "google-drive-folder"
   | "google-docs-document"
   | "google-sheets-spreadsheet"
-  | "google-slides-presentation";
+  | "google-slides-presentation"
+  | "generic-link";
 
 export type SupportedLinkPreview = {
   kind: SupportedLinkPreviewKind;
   href: string;
-  provider:
-    | "Buzz"
-    | "GitHub"
-    | "Linear"
-    | "Google Drive"
-    | "Google Docs"
-    | "Google Sheets"
-    | "Google Slides";
+  provider: string;
   title: string;
+  /** Sanitized native-fetched bitmap; never a remote URL. */
+  imageDataUrl?: string | null;
+  imageDomain?: string | null;
   typeLabel:
     | "PR"
     | "issue"
@@ -41,16 +38,17 @@ export type SupportedLinkPreview = {
     | "folder"
     | "document"
     | "spreadsheet"
-    | "presentation";
+    | "presentation"
+    | "link";
 };
 
 // Buzz relay hosts differ per community, so relay git URLs are recognized by
 // their distinctive path shape (`/git/<64-hex-pubkey>/<repo>`) rather than by
-// hostname, and require an explicit scheme.
+// hostname, and require an explicit scheme. Generic previews remain HTTPS-only.
 const SUPPORTED_URL_RE =
-  /(^|[\s([{<>"'])((?:https?:\/\/)?(?:(?:www\.)?github\.com|(?:www\.)?linear\.app|drive\.google\.com|docs\.google\.com)\/[^\s<>"'\]]+|https?:\/\/[^\s<>"'\]]+\/git\/[a-f0-9]{64}\/[^\s<>"'\]]+|buzz:\/\/(?:pr|issue|repo)\?[^\s<>"'\]]+)/gi;
+  /(^|[\s([{<>"'])(https:\/\/[^\s<>"'\]]+|https?:\/\/[^\s<>"'\]]+\/git\/[a-f0-9]{64}\/[^\s<>"'\]]+|buzz:\/\/(?:pr|issue|repo)\?[^\s<>"'\]]+|(?:(?:www\.)?github\.com|(?:www\.)?linear\.app|drive\.google\.com|docs\.google\.com)\/[^\s<>"'\]]+)/gi;
 const MARKDOWN_SUPPORTED_LINK_RE =
-  /!?\[([^\]\n]+)\]\(((?:https?:\/\/)?(?:(?:www\.)?github\.com|(?:www\.)?linear\.app|drive\.google\.com|docs\.google\.com)\/[^)\s<>"']+|https?:\/\/[^)\s<>"']+\/git\/[a-f0-9]{64}\/[^)\s<>"']+|buzz:\/\/(?:pr|issue|repo)\?[^)\s<>"']+)\)/gi;
+  /!?\[([^\]\n]+)\]\((https:\/\/[^)\s<>"']+|https?:\/\/[^)\s<>"']+\/git\/[a-f0-9]{64}\/[^)\s<>"']+|buzz:\/\/(?:pr|issue|repo)\?[^)\s<>"']+|(?:(?:www\.)?github\.com|(?:www\.)?linear\.app|drive\.google\.com|docs\.google\.com)\/[^)\s<>"']+)\)/gi;
 const MAX_PREVIEWS = 8;
 
 type HiddenRange = {
@@ -543,13 +541,28 @@ export function parseSupportedLinkPreview(
     return null;
   }
 
-  return (
+  const recognized =
     parseBuzzGitLink(parsed, activeRelayOrigin ?? null) ??
     parseGithubLink(parsed) ??
     parseLinearIssue(parsed) ??
     parseGoogleDriveLink(parsed) ??
-    parseGoogleDocsLink(parsed)
-  );
+    parseGoogleDocsLink(parsed);
+  if (recognized) return recognized;
+  const hostname = normalizeHostname(parsed);
+  if (
+    parsed.protocol !== "https:" ||
+    [
+      "github.com",
+      "linear.app",
+      "drive.google.com",
+      "docs.google.com",
+    ].includes(hostname)
+  ) {
+    return null;
+  }
+
+  const provider = hostname;
+  return createPreview("generic-link", parsed, provider, "link", provider);
 }
 
 export function isSupportedLinkAutolinkLabel(
diff --git a/desktop/src/shared/lib/linkPreviewSnapshot.test.mjs b/desktop/src/shared/lib/linkPreviewSnapshot.test.mjs
new file mode 100644
index 00000000000..c001e3fb6f3
--- /dev/null
+++ b/desktop/src/shared/lib/linkPreviewSnapshot.test.mjs
@@ -0,0 +1,116 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  buildLinkPreviewSnapshotTag,
+  parseLinkPreviewSnapshots,
+} from "./linkPreviewSnapshot.ts";
+
+const HASH = "a".repeat(64);
+const ORIGIN = "https://relay.example";
+const CONTENT = "Read https://linear.app/acme/issue/ABC-123/example";
+const URL = "https://linear.app/acme/issue/ABC-123/example";
+const valid = [
+  "link-preview",
+  "snapshot",
+  "1",
+  URL,
+  "Example",
+  "Linear",
+  "Description",
+  `${ORIGIN}/media/${HASH}.png`,
+  HASH,
+  "",
+  "",
+];
+
+test("authored snapshots render only exact local media tied to message content", () => {
+  assert.equal(parseLinkPreviewSnapshots([valid], CONTENT, ORIGIN).length, 1);
+  assert.equal(
+    parseLinkPreviewSnapshots([valid], "no matching link", ORIGIN).length,
+    0,
+  );
+  assert.equal(parseLinkPreviewSnapshots([valid], CONTENT, null).length, 0);
+});
+
+test("authored snapshots reject remote, malformed, credentialed, and hash-mismatched media", () => {
+  for (const image of [
+    `https://evil.example/media/${HASH}.png`,
+    `${ORIGIN}/media/${HASH}.png?token=leak`,
+    `${ORIGIN}/media/${HASH}.png#fragment`,
+    `https://user@relay.example/media/${HASH}.png`,
+    `${ORIGIN}/media/${HASH}.svg`,
+    `${ORIGIN}/media/${HASH}.png/extra`,
+  ]) {
+    const tag = [...valid];
+    tag[7] = image;
+    assert.equal(
+      parseLinkPreviewSnapshots([tag], CONTENT, ORIGIN).length,
+      0,
+      image,
+    );
+  }
+  const mismatch = [...valid];
+  mismatch[8] = "b".repeat(64);
+  assert.equal(
+    parseLinkPreviewSnapshots([mismatch], CONTENT, ORIGIN).length,
+    0,
+  );
+});
+
+test("snapshot tags sanitize control characters and enforce UTF-8 byte limits", () => {
+  const tag = buildLinkPreviewSnapshotTag({
+    canonicalUrl: URL,
+    title: `Title\n${"😀".repeat(100)}`,
+    siteName: `Linear\u0000${"é".repeat(100)}`,
+    description: `First\nSecond\t${"😀".repeat(300)}`,
+    imageUrl: "",
+    imageSha256: "",
+    faviconUrl: "",
+    faviconSha256: "",
+  });
+
+  assert.ok(tag);
+  assert.equal(tag[6].startsWith("First\nSecond"), true);
+  assert.equal(tag[6].includes("\t"), false);
+  for (const value of tag.slice(4, 6)) {
+    assert.ok(
+      Array.from(value).every((char) => {
+        const code = char.charCodeAt(0);
+        return code > 0x1f && code !== 0x7f;
+      }),
+    );
+  }
+  assert.ok(Buffer.byteLength(tag[4], "utf8") <= 300);
+  assert.ok(Buffer.byteLength(tag[5], "utf8") <= 100);
+  assert.ok(Buffer.byteLength(tag[6], "utf8") <= 1000);
+});
+
+test("snapshot tags omit canonical URLs rejected by native validation", () => {
+  for (const canonicalUrl of [
+    `${URL}#`,
+    `${URL}#details`,
+    `http://linear.app/acme/issue/ABC-123/example`,
+    `https://user@linear.app/acme/issue/ABC-123/example`,
+  ]) {
+    assert.equal(
+      buildLinkPreviewSnapshotTag({
+        canonicalUrl,
+        title: "Example",
+        siteName: "Linear",
+        description: "Description",
+        imageUrl: "",
+        imageSha256: "",
+        faviconUrl: "",
+        faviconSha256: "",
+      }),
+      null,
+      canonicalUrl,
+    );
+  }
+});
+
+test("messages without authored snapshots never create recipient previews", () => {
+  assert.deepEqual(parseLinkPreviewSnapshots([], CONTENT, ORIGIN), []);
+  assert.deepEqual(parseLinkPreviewSnapshots(undefined, CONTENT, ORIGIN), []);
+});
diff --git a/desktop/src/shared/lib/linkPreviewSnapshot.ts b/desktop/src/shared/lib/linkPreviewSnapshot.ts
new file mode 100644
index 00000000000..59284f26169
--- /dev/null
+++ b/desktop/src/shared/lib/linkPreviewSnapshot.ts
@@ -0,0 +1,179 @@
+import {
+  extractSupportedLinkPreviews,
+  parseSupportedLinkPreview,
+} from "./linkPreview";
+import type { ResolvedLinkPreview } from "./useResolvedLinkPreviews";
+
+export const LINK_PREVIEW_SNAPSHOT_VERSION = "1";
+const MAX_SNAPSHOTS = 8;
+const SHA256_RE = /^[0-9a-f]{64}$/;
+const IMAGE_EXT_RE = /^(?:jpg|png|gif|webp)$/;
+
+export function isValidLinkPreviewSnapshotCanonicalUrl(value: string): boolean {
+  if (value.includes("#")) return false;
+  try {
+    const url = new URL(value);
+    return (
+      url.protocol === "https:" && !url.username && !url.password && !url.hash
+    );
+  } catch {
+    return false;
+  }
+}
+
+export type LinkPreviewSnapshot = {
+  canonicalUrl: string;
+  title: string;
+  siteName: string;
+  description: string;
+  imageUrl: string;
+  imageSha256: string;
+  faviconUrl: string;
+  faviconSha256: string;
+};
+
+function isControlCharacter(char: string, allowNewlines = false): boolean {
+  if (allowNewlines && char === "\n") return false;
+  const code = char.charCodeAt(0);
+  return code <= 0x1f || code === 0x7f;
+}
+
+function sanitizeSnapshotText(
+  value: string,
+  maxBytes: number,
+  allowNewlines = false,
+): string {
+  let result = "";
+  let byteLength = 0;
+  for (const rawChar of value) {
+    const char = isControlCharacter(rawChar, allowNewlines) ? " " : rawChar;
+    const charBytes = new TextEncoder().encode(char).length;
+    if (byteLength + charBytes > maxBytes) break;
+    result += char;
+    byteLength += charBytes;
+  }
+  return result;
+}
+
+function validText(value: string, max: number, allowNewlines = false): boolean {
+  return (
+    new TextEncoder().encode(value).length <= max &&
+    !Array.from(value).some((char) => {
+      return isControlCharacter(char, allowNewlines);
+    })
+  );
+}
+
+function isRelayMediaPair(
+  url: string,
+  sha256: string,
+  relayOrigin: string,
+): boolean {
+  if (!url && !sha256) return true;
+  if (!url || !SHA256_RE.test(sha256)) return false;
+  try {
+    const parsed = new URL(url);
+    if (
+      parsed.origin !== relayOrigin ||
+      parsed.username ||
+      parsed.password ||
+      parsed.search ||
+      parsed.hash
+    )
+      return false;
+    const match = /^\/media\/([0-9a-f]{64})\.([a-z0-9]{1,8})$/.exec(
+      parsed.pathname,
+    );
+    return Boolean(
+      match && match[1] === sha256 && IMAGE_EXT_RE.test(match[2] ?? ""),
+    );
+  } catch {
+    return false;
+  }
+}
+
+export function parseLinkPreviewSnapshots(
+  tags: readonly (readonly string[])[] | undefined,
+  content: string,
+  relayOrigin: string | null,
+): ResolvedLinkPreview[] {
+  if (!relayOrigin || !tags) return [];
+  const contentUrls = new Set(
+    extractSupportedLinkPreviews(content).map((preview) => preview.href),
+  );
+  const seen = new Set<string>();
+  const snapshots: ResolvedLinkPreview[] = [];
+  for (const tag of tags) {
+    if (tag[0] !== "link-preview" || tag[1] !== "snapshot") continue;
+    if (
+      snapshots.length >= MAX_SNAPSHOTS ||
+      tag.length !== 11 ||
+      tag[2] !== LINK_PREVIEW_SNAPSHOT_VERSION
+    )
+      continue;
+    const [
+      ,
+      ,
+      ,
+      canonicalUrl,
+      title,
+      siteName,
+      description,
+      imageUrl,
+      imageSha256,
+      faviconUrl,
+      faviconSha256,
+    ] = tag;
+    const parsed = parseSupportedLinkPreview(canonicalUrl);
+    if (
+      !parsed ||
+      parsed.href !== canonicalUrl ||
+      !contentUrls.has(canonicalUrl) ||
+      seen.has(canonicalUrl)
+    )
+      continue;
+    if (
+      !validText(title, 300) ||
+      !validText(siteName, 100) ||
+      !validText(description, 1000, true)
+    )
+      continue;
+    if (
+      !isRelayMediaPair(imageUrl, imageSha256, relayOrigin) ||
+      !isRelayMediaPair(faviconUrl, faviconSha256, relayOrigin)
+    )
+      continue;
+    seen.add(canonicalUrl);
+    snapshots.push({
+      ...parsed,
+      title: title || parsed.title,
+      provider: siteName || parsed.provider,
+      description: description || null,
+      faviconDataUrl: faviconUrl || null,
+      imageDataUrl: imageUrl || null,
+      imageDomain: imageUrl ? new URL(imageUrl).hostname : null,
+      imageState: imageUrl ? "image" : "none",
+    });
+  }
+  return snapshots;
+}
+
+export function buildLinkPreviewSnapshotTag(
+  snapshot: LinkPreviewSnapshot,
+): string[] | null {
+  if (!isValidLinkPreviewSnapshotCanonicalUrl(snapshot.canonicalUrl))
+    return null;
+  return [
+    "link-preview",
+    "snapshot",
+    LINK_PREVIEW_SNAPSHOT_VERSION,
+    snapshot.canonicalUrl,
+    sanitizeSnapshotText(snapshot.title, 300),
+    sanitizeSnapshotText(snapshot.siteName, 100),
+    sanitizeSnapshotText(snapshot.description, 1000, true),
+    snapshot.imageUrl,
+    snapshot.imageSha256,
+    snapshot.faviconUrl,
+    snapshot.faviconSha256,
+  ];
+}
diff --git a/desktop/src/shared/lib/linkPreviewStylePreference.test.mjs b/desktop/src/shared/lib/linkPreviewStylePreference.test.mjs
new file mode 100644
index 00000000000..2cbfdfad481
--- /dev/null
+++ b/desktop/src/shared/lib/linkPreviewStylePreference.test.mjs
@@ -0,0 +1,23 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+const values = new Map();
+globalThis.localStorage = {
+  getItem: (key) => values.get(key) ?? null,
+  setItem: (key, value) => values.set(key, value),
+};
+
+const preference = await import("./linkPreviewStylePreference.ts");
+
+test("defaults invalid and missing link preview styles to compact", () => {
+  assert.equal(preference.parseLinkPreviewStyle(null), "compact");
+  assert.equal(preference.parseLinkPreviewStyle("expanded"), "compact");
+  assert.equal(preference.parseLinkPreviewStyle("compact"), "compact");
+  assert.equal(preference.parseLinkPreviewStyle("rich"), "rich");
+});
+
+test("persists and exposes the selected link preview style", () => {
+  preference.setLinkPreviewStyle("rich");
+  assert.equal(preference.getLinkPreviewStyle(), "rich");
+  assert.equal(values.get(preference.LINK_PREVIEW_STYLE_STORAGE_KEY), "rich");
+});
diff --git a/desktop/src/shared/lib/linkPreviewStylePreference.ts b/desktop/src/shared/lib/linkPreviewStylePreference.ts
new file mode 100644
index 00000000000..3a3c5d78920
--- /dev/null
+++ b/desktop/src/shared/lib/linkPreviewStylePreference.ts
@@ -0,0 +1,56 @@
+import * as React from "react";
+
+/** User preference for how link previews are presented. */
+export type LinkPreviewStyle = "compact" | "rich";
+
+export const LINK_PREVIEW_STYLE_STORAGE_KEY =
+  "buzz.appearance.linkPreviewStyle";
+export const DEFAULT_LINK_PREVIEW_STYLE: LinkPreviewStyle = "compact";
+
+const listeners = new Set<() => void>();
+let linkPreviewStyle = readStoredLinkPreviewStyle();
+
+export function parseLinkPreviewStyle(
+  value: string | null | undefined,
+): LinkPreviewStyle {
+  return value === "rich" || value === "compact"
+    ? value
+    : DEFAULT_LINK_PREVIEW_STYLE;
+}
+
+function readStoredLinkPreviewStyle(): LinkPreviewStyle {
+  try {
+    return parseLinkPreviewStyle(
+      globalThis.localStorage?.getItem(LINK_PREVIEW_STYLE_STORAGE_KEY),
+    );
+  } catch {
+    return DEFAULT_LINK_PREVIEW_STYLE;
+  }
+}
+
+function subscribe(listener: () => void): () => void {
+  listeners.add(listener);
+  return () => listeners.delete(listener);
+}
+
+export function getLinkPreviewStyle(): LinkPreviewStyle {
+  return linkPreviewStyle;
+}
+
+export function setLinkPreviewStyle(style: LinkPreviewStyle): void {
+  linkPreviewStyle = style;
+  try {
+    globalThis.localStorage?.setItem(LINK_PREVIEW_STYLE_STORAGE_KEY, style);
+  } catch {
+    // Persistence is best-effort; the in-memory preference still applies.
+  }
+  for (const listener of listeners) listener();
+}
+
+export function useLinkPreviewStyle(): LinkPreviewStyle {
+  return React.useSyncExternalStore(
+    subscribe,
+    getLinkPreviewStyle,
+    () => DEFAULT_LINK_PREVIEW_STYLE,
+  );
+}
diff --git a/desktop/src/shared/lib/normalizeRelayUrl.ts b/desktop/src/shared/lib/normalizeRelayUrl.ts
new file mode 100644
index 00000000000..7222b1fe255
--- /dev/null
+++ b/desktop/src/shared/lib/normalizeRelayUrl.ts
@@ -0,0 +1,8 @@
+/**
+ * Normalizes a relay URL for use in storage keys.
+ * Trim, strip trailing slashes, lowercase — ensures equivalent URLs map to
+ * the same key regardless of formatting differences.
+ */
+export function normalizeRelayUrl(relayUrl: string): string {
+  return relayUrl.trim().replace(/\/+$/, "").toLowerCase();
+}
diff --git a/desktop/src/shared/lib/safeStorage.test.mjs b/desktop/src/shared/lib/safeStorage.test.mjs
new file mode 100644
index 00000000000..9d0c10c8a8a
--- /dev/null
+++ b/desktop/src/shared/lib/safeStorage.test.mjs
@@ -0,0 +1,113 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  __resetSafeStorageWarningsForTests,
+  getStorageItem,
+  removeStorageItem,
+  setStorageItem,
+} from "./safeStorage.ts";
+
+function createThrowingStorage(initial = {}) {
+  const values = new Map(Object.entries(initial));
+  return {
+    values,
+    getItem: (key) => {
+      if (key === "__THROW__") throw new Error("SecurityError");
+      return values.get(key) ?? null;
+    },
+    setItem: (key, value) => {
+      if (key === "__THROW__") throw new Error("SecurityError");
+      values.set(key, String(value));
+    },
+    removeItem: (key) => {
+      if (key === "__THROW__") throw new Error("SecurityError");
+      values.delete(key);
+    },
+  };
+}
+
+function patchLocalStorage(storage) {
+  globalThis.window ??= {};
+  const original = globalThis.window.localStorage;
+  Object.defineProperty(globalThis.window, "localStorage", {
+    configurable: true,
+    writable: true,
+    value: storage,
+  });
+  return () => {
+    if (original === undefined) {
+      delete globalThis.window.localStorage;
+      return;
+    }
+    Object.defineProperty(globalThis.window, "localStorage", {
+      configurable: true,
+      writable: true,
+      value: original,
+    });
+  };
+}
+
+test.beforeEach(() => {
+  __resetSafeStorageWarningsForTests();
+});
+
+test("getStorageItem returns the stored value when storage is healthy", () => {
+  const restore = patchLocalStorage(
+    createThrowingStorage({ "buzz-theme": "buzz" }),
+  );
+  try {
+    assert.equal(getStorageItem("buzz-theme"), "buzz");
+    assert.equal(getStorageItem("missing"), null);
+  } finally {
+    restore();
+  }
+});
+
+test("getStorageItem returns null when the key is absent", () => {
+  const restore = patchLocalStorage(createThrowingStorage());
+  try {
+    assert.equal(getStorageItem("buzz-theme"), null);
+  } finally {
+    restore();
+  }
+});
+
+test("getStorageItem swallows SecurityError and returns the fallback", () => {
+  const restore = patchLocalStorage(createThrowingStorage());
+  try {
+    assert.equal(getStorageItem("__THROW__"), null);
+    assert.equal(getStorageItem("__THROW__", "fallback"), "fallback");
+  } finally {
+    restore();
+  }
+});
+
+test("setStorageItem returns true on a healthy write", () => {
+  const storage = createThrowingStorage();
+  const restore = patchLocalStorage(storage);
+  try {
+    assert.equal(setStorageItem("buzz-theme", "buzz-dark"), true);
+    assert.equal(storage.values.get("buzz-theme"), "buzz-dark");
+  } finally {
+    restore();
+  }
+});
+
+test("setStorageItem returns false instead of throwing on denied storage", () => {
+  const restore = patchLocalStorage(createThrowingStorage());
+  try {
+    assert.equal(setStorageItem("__THROW__", "x"), false);
+  } finally {
+    restore();
+  }
+});
+
+test("removeStorageItem returns false instead of throwing on denied storage", () => {
+  const restore = patchLocalStorage(createThrowingStorage());
+  try {
+    assert.equal(removeStorageItem("__THROW__"), false);
+  } finally {
+    restore();
+  }
+});
diff --git a/desktop/src/shared/lib/safeStorage.ts b/desktop/src/shared/lib/safeStorage.ts
new file mode 100644
index 00000000000..3dc4784bdbf
--- /dev/null
+++ b/desktop/src/shared/lib/safeStorage.ts
@@ -0,0 +1,86 @@
+/**
+ * Throw-safe localStorage accessors.
+ *
+ * WKWebView throws `SecurityError` from `localStorage.getItem` (not just
+ * `setItem`) when storage access is denied for the origin — e.g. the user
+ * disabled website data, or the Tauri webview runs under a restricted
+ * storage policy. A raw `window.localStorage.getItem(...)` executed inside
+ * a React `useState`/`useMemo` initializer or provider render propagates
+ * that throw up the reconcile path and unmounts the whole tree (there is
+ * no `ErrorBoundary` in `desktop/src`), leaving a dead window.
+ *
+ * These helpers make reads fail-closed (return the fallback / `null`) and
+ * writes fail-silently-with-a-warning, preserving the app's ability to start
+ * and degrade to in-memory state instead of crashing to a blank screen.
+ *
+ * Issue contexts: block/buzz#5078.
+ */
+
+// Keep the console noise down on repeated reads — one warn per (action, key)
+// pair per process is enough. This also keeps unit tests deterministic.
+const WARNED_KEYS = new Set<string>();
+
+function warnOnce(action: "read" | "write", key: string, error: unknown): void {
+  if (WARNED_KEYS.has(`${action}:${key}`)) return;
+  WARNED_KEYS.add(`${action}:${key}`);
+  console.warn(
+    `[safeStorage] localStorage.${action === "read" ? "getItem" : "setItem"} threw for key "${key}" (storage access denied?):`,
+    error,
+  );
+}
+
+/** Reset the warn-once dedup — test-only helper. */
+export function __resetSafeStorageWarningsForTests(): void {
+  WARNED_KEYS.clear();
+}
+
+/**
+ * Read a localStorage entry, resolving `fallback` when the underlying call
+ * throws (e.g. WebKit `SecurityError` under a restricted storage policy) or
+ * storage is unavailable. Never throws.
+ */
+export function getStorageItem(
+  key: string,
+  fallback: string | null = null,
+): string | null {
+  try {
+    return window.localStorage.getItem(key) ?? fallback;
+  } catch (error) {
+    warnOnce("read", key, error);
+    return fallback;
+  }
+}
+
+/**
+ * Write a localStorage entry; returns `false` when the underlying call throws
+ * (quota exceeded or storage denied) instead of propagating. Prefer
+ * `setLocalStorageItemWithRecovery` from `./localStorageQuota` for writes that
+ * need cache-eviction recovery — this wrapper exists for call sites that only
+ * need the throw converted to a boolean result.
+ */
+export function setStorageItem(key: string, value: string): boolean {
+  try {
+    window.localStorage.setItem(key, value);
+    return true;
+  } catch (error) {
+    warnOnce("write", key, error);
+    return false;
+  }
+}
+
+/**
+ * Remove a localStorage entry; never throws. Returns `false` when removal
+ * threw (treated as best-effort, matching `localStorage.removeItem` semantics
+ * callers assume).
+ */
+export function removeStorageItem(key: string): boolean {
+  try {
+    window.localStorage.removeItem(key);
+    return true;
+  } catch (error) {
+    // Reads/writes share the SecurityError class; log under the read bucket
+    // because a denied-storage origin will fail all three the same way.
+    warnOnce("read", key, error);
+    return false;
+  }
+}
diff --git a/desktop/src/shared/lib/useResolvedLinkPreviews.test.mjs b/desktop/src/shared/lib/useResolvedLinkPreviews.test.mjs
new file mode 100644
index 00000000000..bf7e3936126
--- /dev/null
+++ b/desktop/src/shared/lib/useResolvedLinkPreviews.test.mjs
@@ -0,0 +1,182 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  __linkPreviewMetadataTest,
+  resolveLinkPreview,
+} from "./useResolvedLinkPreviews.ts";
+
+const preview = {
+  kind: "generic-link",
+  href: "https://example.com/story",
+  provider: "example.com",
+  title: "example.com/story",
+  typeLabel: "link",
+};
+
+function metadata(overrides = {}) {
+  return {
+    title: "A story",
+    siteName: "Example",
+    description: "Story description",
+    imageDataUrl: null,
+    imageDomain: null,
+    imageFetchState: "none",
+    imageRetryAfterMs: null,
+    ...overrides,
+  };
+}
+
+test("pending metadata reserves the image treatment", () => {
+  assert.deepEqual(resolveLinkPreview(preview, undefined), {
+    ...preview,
+    imageState: "pending",
+  });
+});
+
+test("resolved image metadata keeps the reserved image treatment", () => {
+  const resolved = resolveLinkPreview(preview, {
+    title: "A story",
+    siteName: "Example",
+    imageDataUrl: "data:image/jpeg;base64,abc",
+    imageDomain: "cdn.example.com",
+  });
+
+  assert.equal(resolved.imageState, "image");
+  assert.equal(resolved.provider, "Example");
+  assert.equal(resolved.imageDomain, "cdn.example.com");
+});
+
+test("resolved metadata without a complete image collapses to the compact treatment", () => {
+  const resolved = resolveLinkPreview(preview, {
+    title: "A story",
+    siteName: "Example",
+    imageDataUrl: null,
+    imageDomain: null,
+  });
+
+  assert.equal(resolved.imageState, "none");
+  assert.equal(resolved.imageDataUrl, null);
+  assert.equal(resolved.imageDomain, null);
+});
+
+test("transient and rejected image fetches use the stable fallback treatment", () => {
+  const transient = resolveLinkPreview(
+    preview,
+    metadata({
+      imageFetchState: "transient_failure",
+      imageRetryAfterMs: 900_000,
+    }),
+  );
+  const rejected = resolveLinkPreview(
+    preview,
+    metadata({ imageFetchState: "rejected" }),
+  );
+
+  assert.equal(transient.imageState, "fallback");
+  assert.equal(rejected.imageState, "fallback");
+});
+
+test("metadata cache keys deduplicate URL fragments", () => {
+  assert.equal(
+    __linkPreviewMetadataTest.metadataCacheKey(
+      "https://github.com/block/buzz/pull/3834#issuecomment-1",
+    ),
+    "https://github.com/block/buzz/pull/3834",
+  );
+});
+
+test("transient metadata expires at the server retry boundary", () => {
+  assert.equal(
+    __linkPreviewMetadataTest.metadataExpiry(
+      metadata({
+        imageFetchState: "transient_failure",
+        imageRetryAfterMs: 900_000,
+      }),
+      1_000,
+    ),
+    901_000,
+  );
+});
+
+test("metadata loader retries transient images after the server cooldown", async () => {
+  let now = 1_000;
+  let calls = 0;
+  const loader = __linkPreviewMetadataTest.createMetadataLoader({
+    fetcher: async () => {
+      calls += 1;
+      return calls === 1
+        ? metadata({
+            imageFetchState: "transient_failure",
+            imageRetryAfterMs: 10_000,
+          })
+        : metadata({
+            imageDataUrl: "data:image/jpeg;base64,abc",
+            imageDomain: "images.example.com",
+            imageFetchState: "image",
+          });
+    },
+    now: () => now,
+  });
+
+  assert.equal(
+    (await loader.load(preview.href)).metadata?.imageFetchState,
+    "transient_failure",
+  );
+  assert.equal(calls, 1);
+
+  now += 10_000;
+  assert.equal(
+    (await loader.load(preview.href)).metadata?.imageFetchState,
+    "image",
+  );
+  assert.equal(calls, 2);
+});
+
+test("metadata loader retries rejected requests after the negative-cache TTL", async () => {
+  let now = 1_000;
+  let calls = 0;
+  const loader = __linkPreviewMetadataTest.createMetadataLoader({
+    fetcher: async () => {
+      calls += 1;
+      if (calls === 1) throw new Error("temporary failure");
+      return metadata();
+    },
+    now: () => now,
+  });
+
+  assert.equal((await loader.load(preview.href)).metadata, null);
+  assert.equal((await loader.load(preview.href)).metadata, null);
+  assert.equal(calls, 1);
+
+  now += 5 * 60_000;
+  assert.deepEqual((await loader.load(preview.href)).metadata, metadata());
+  assert.equal(calls, 2);
+});
+
+test("metadata loader coalesces fragment variants and bounds concurrency", async () => {
+  let active = 0;
+  let maxActive = 0;
+  let calls = 0;
+  const loader = __linkPreviewMetadataTest.createMetadataLoader({
+    concurrency: 2,
+    fetcher: async () => {
+      calls += 1;
+      active += 1;
+      maxActive = Math.max(maxActive, active);
+      await new Promise((resolve) => setImmediate(resolve));
+      active -= 1;
+      return metadata();
+    },
+  });
+
+  await Promise.all([
+    loader.load("https://example.com/one#first"),
+    loader.load("https://example.com/one#second"),
+    loader.load("https://example.com/two"),
+    loader.load("https://example.com/three"),
+  ]);
+
+  assert.equal(calls, 3);
+  assert.equal(maxActive, 2);
+});
diff --git a/desktop/src/shared/lib/useResolvedLinkPreviews.ts b/desktop/src/shared/lib/useResolvedLinkPreviews.ts
index d1e3d27b35d..136f8f4b1c3 100644
--- a/desktop/src/shared/lib/useResolvedLinkPreviews.ts
+++ b/desktop/src/shared/lib/useResolvedLinkPreviews.ts
@@ -13,189 +13,380 @@ import {
   type SupportedLinkPreview,
 } from "./linkPreview";
 
-const GOOGLE_FALLBACK_TITLES = new Set([
-  "Drive file",
-  "Drive folder",
-  "Document",
-  "Spreadsheet",
-  "Presentation",
-]);
-
-const titleCache = new Map<string, Promise<string | null> | string | null>();
-/**
- * Generation counter incremented on every `resetLinkPreviewTitleCache` call.
- * Each in-flight promise captures the generation at creation time and only
- * writes back if no reset has happened since — preventing a resolved promise
- * from a previous community from repopulating stale entries into the fresh
- * cache of a new community.
- */
-let cacheGeneration = 0;
+type LinkPreviewImageFetchState =
+  | "none"
+  | "image"
+  | "transient_failure"
+  | "rejected";
+
+export type LinkPreviewMetadata = {
+  title: string;
+  siteName: string | null;
+  description: string | null;
+  imageDataUrl: string | null;
+  imageDomain: string | null;
+  imageFetchState?: LinkPreviewImageFetchState;
+  imageRetryAfterMs?: number | null;
+  faviconDataUrl?: string | null;
+};
+
+type MetadataCacheEntry = {
+  expiresAt: number | null;
+  metadata: LinkPreviewMetadata | null;
+};
+
+type MetadataLoadResult = MetadataCacheEntry & {
+  key: string;
+};
+
+const DEFAULT_TRANSIENT_RETRY_MS = 30_000;
+const NULL_METADATA_RETRY_MS = 5 * 60_000;
+const MAX_CONCURRENT_METADATA_FETCHES = 2;
 
 /**
- * Buzz entity titles come from relay events, so they are community-scoped —
- * wired into `resetCommunityState()` (see useCommunityInit.ts) to avoid
- * leaking titles across community switches.
+ * React may flush an interaction-triggered effect before the browser paints.
+ * Start uncached preview I/O after a frame plus a task boundary so the pasted
+ * text and loading card are visible before native IPC work begins.
  */
-export function resetLinkPreviewTitleCache(): void {
-  cacheGeneration += 1;
-  titleCache.clear();
+function scheduleAfterPaint(task: () => void): () => void {
+  let frameId: number | null = null;
+  let timeoutId: ReturnType<typeof setTimeout> | null = null;
+  const run = () => {
+    timeoutId = setTimeout(task, 0);
+  };
+
+  if (typeof requestAnimationFrame === "function") {
+    frameId = requestAnimationFrame(run);
+  } else {
+    run();
+  }
+
+  return () => {
+    if (frameId !== null) cancelAnimationFrame(frameId);
+    if (timeoutId !== null) clearTimeout(timeoutId);
+  };
 }
 
-/**
- * Returns the current cache generation counter. Used in tests to verify that
- * `resetLinkPreviewTitleCache` increments the generation so stale in-flight
- * promises cannot seed the new cache.
- *
- * @internal test-only export
- */
-export function getLinkPreviewCacheGeneration(): number {
-  return cacheGeneration;
+function metadataCacheKey(href: string): string {
+  try {
+    const url = new URL(href);
+    url.hash = "";
+    return url.href;
+  } catch {
+    return href.split("#", 1)[0] ?? href;
+  }
 }
 
-function fetchLinkPreviewTitle(href: string): Promise<string | null> {
-  return invokeTauri<string | null>("fetch_link_preview_title", { href });
+function metadataExpiry(
+  metadata: LinkPreviewMetadata | null,
+  now: number,
+): number | null {
+  if (metadata === null) return now + NULL_METADATA_RETRY_MS;
+  if (metadata.imageFetchState !== "transient_failure") return null;
+  const retryAfterMs =
+    typeof metadata.imageRetryAfterMs === "number" &&
+    Number.isFinite(metadata.imageRetryAfterMs)
+      ? Math.max(1_000, metadata.imageRetryAfterMs)
+      : DEFAULT_TRANSIENT_RETRY_MS;
+  return now + retryAfterMs;
 }
 
-/**
- * Resolve a Buzz PR/issue card title from the relay event's `subject` tag
- * (first content line as fallback — the same precedence the projects views
- * use).
- *
- * Security: the fetched event's canonical `a` tag must equal
- * `30617:<owner>:<d>` from the link before we adopt its title. Without this
- * check, a crafted link could pair the real title of a legitimate PR with an
- * unrelated repository destination.
- */
-async function fetchBuzzEntityTitle(href: string): Promise<string | null> {
-  const parsed = parseEntityLink(href);
-  if (!parsed.ok || parsed.value.type === "repo") return null;
-
-  const { id, owner, dtag } = parsed.value;
-  const expectedCoordinate = `30617:${owner}:${dtag}`;
-
-  const events = await relayClient.fetchEvents({
-    kinds: [
-      parsed.value.type === "pr" ? KIND_GIT_PULL_REQUEST : KIND_GIT_ISSUE,
-    ],
-    ids: [id],
-    limit: 1,
-  });
-  const event = events[0];
-  if (!event) return null;
-
-  // Verify the event belongs to the claimed repository coordinate.
-  const aTag = event.tags.find(
-    (tag) => tag[0] === "a" && tag[1] === expectedCoordinate,
-  );
-  if (!aTag) return null;
+function createTaskScheduler(concurrency: number) {
+  const pending: Array<() => void> = [];
+  let active = 0;
 
-  const subject = event.tags.find((tag) => tag[0] === "subject")?.[1];
-  return subject || event.content.split("\n")[0] || null;
+  const drain = () => {
+    while (active < concurrency) {
+      const run = pending.shift();
+      if (!run) return;
+      active += 1;
+      run();
+    }
+  };
+
+  return <T>(task: () => Promise<T>): Promise<T> =>
+    new Promise<T>((resolve, reject) => {
+      pending.push(() => {
+        void task()
+          .then(resolve, reject)
+          .finally(() => {
+            active -= 1;
+            drain();
+          });
+      });
+      drain();
+    });
 }
 
-/**
- * Returns true when the preview's current title is still the auto-generated
- * fallback and a relay lookup should be attempted to replace it. Returns false
- * once the user has applied a markdown label (`[My label](link)`) so that the
- * label wins over any cached relay title.
- *
- * Exported for unit testing of the label-must-win invariant.
- */
-export function shouldResolveTitle(preview: SupportedLinkPreview): boolean {
-  if (preview.kind === "buzz-pull-request" || preview.kind === "buzz-issue") {
-    // A markdown-label override replaces the fallback title and must win
-    // over the relay lookup.
-    const parsed = parseEntityLink(preview.href);
-    return parsed.ok && preview.title === buzzEntityFallbackTitle(parsed.value);
-  }
+function createMetadataLoader({
+  concurrency = MAX_CONCURRENT_METADATA_FETCHES,
+  fetcher,
+  now = Date.now,
+}: {
+  concurrency?: number;
+  fetcher: (href: string) => Promise<LinkPreviewMetadata | null>;
+  now?: () => number;
+}) {
+  const cache = new Map<
+    string,
+    MetadataCacheEntry | Promise<MetadataLoadResult>
+  >();
+  const schedule = createTaskScheduler(Math.max(1, concurrency));
+  let generation = 0;
 
-  return (
-    preview.kind.startsWith("google-") &&
-    GOOGLE_FALLBACK_TITLES.has(preview.title)
-  );
+  const peek = (href: string): MetadataLoadResult | undefined => {
+    const key = metadataCacheKey(href);
+    const cached = cache.get(key);
+    if (!cached || cached instanceof Promise) return undefined;
+    if (cached.expiresAt !== null && cached.expiresAt <= now()) {
+      cache.delete(key);
+      return undefined;
+    }
+    return { key, ...cached };
+  };
+
+  const load = (href: string): Promise<MetadataLoadResult> => {
+    const key = metadataCacheKey(href);
+    const cached = cache.get(key);
+    if (cached instanceof Promise) return cached;
+    if (cached) {
+      if (cached.expiresAt === null || cached.expiresAt > now()) {
+        return Promise.resolve({ key, ...cached });
+      }
+      cache.delete(key);
+    }
+
+    const requestGeneration = generation;
+    const promise = schedule(() => fetcher(href))
+      .catch(() => null)
+      .then((metadata) => {
+        const entry = {
+          expiresAt: metadataExpiry(metadata, now()),
+          metadata,
+        };
+        if (requestGeneration === generation) {
+          cache.set(key, entry);
+        }
+        return { key, ...entry };
+      });
+    cache.set(key, promise);
+    return promise;
+  };
+
+  return {
+    deleteKey(key: string) {
+      cache.delete(key);
+    },
+    load,
+    peek,
+    reset() {
+      generation += 1;
+      cache.clear();
+    },
+  };
 }
 
-function resolveTitle(preview: SupportedLinkPreview): Promise<string | null> {
-  return preview.href.startsWith("buzz://")
-    ? fetchBuzzEntityTitle(preview.href)
-    : fetchLinkPreviewTitle(preview.href);
+function fetchLinkPreviewMetadata(
+  href: string,
+): Promise<LinkPreviewMetadata | null> {
+  return invokeTauri<LinkPreviewMetadata | null>(
+    "fetch_link_preview_metadata",
+    {
+      href,
+    },
+  );
 }
 
-function cacheTitle(preview: SupportedLinkPreview): Promise<string | null> {
-  const cached = titleCache.get(preview.href);
-  if (cached instanceof Promise) return cached;
-  if (cached !== undefined) return Promise.resolve(cached);
-
-  const generation = cacheGeneration;
-  const promise = resolveTitle(preview)
-    .then((title) => {
-      // Only write back if no community switch has happened since we started.
-      if (cacheGeneration === generation) {
-        titleCache.set(preview.href, title);
-      }
-      return title;
-    })
-    .catch(() => {
-      if (cacheGeneration === generation) {
-        titleCache.set(preview.href, null);
-      }
-      return null;
+const metadataLoader = createMetadataLoader({
+  fetcher: fetchLinkPreviewMetadata,
+});
+const entityTitleLoader = createMetadataLoader({
+  fetcher: async (href) => {
+    const parsed = parseEntityLink(href);
+    if (!parsed.ok || parsed.value.type === "repo") return null;
+
+    const { id, owner, dtag } = parsed.value;
+    const expectedCoordinate = `30617:${owner}:${dtag}`;
+    const events = await relayClient.fetchEvents({
+      kinds: [
+        parsed.value.type === "pr" ? KIND_GIT_PULL_REQUEST : KIND_GIT_ISSUE,
+      ],
+      ids: [id],
+      limit: 1,
     });
-  titleCache.set(preview.href, promise);
-  return promise;
+    const event = events[0];
+    if (
+      !event?.tags.some(
+        (tag) => tag[0] === "a" && tag[1] === expectedCoordinate,
+      )
+    ) {
+      return null;
+    }
+
+    const subject = event.tags.find((tag) => tag[0] === "subject")?.[1];
+    const title = subject || event.content.split("\n")[0] || null;
+    return title
+      ? {
+          title,
+          siteName: "Buzz",
+          description: null,
+          imageDataUrl: null,
+          imageDomain: null,
+        }
+      : null;
+  },
+});
+
+/** Clear ephemeral metadata when the active relay/community changes. */
+export function resetLinkPreviewMetadataCache(): void {
+  metadataLoader.reset();
+  entityTitleLoader.reset();
+}
+
+export type LinkPreviewImageState = "pending" | "image" | "fallback" | "none";
+
+export type ResolvedLinkPreview = SupportedLinkPreview & {
+  description?: string | null;
+  faviconDataUrl?: string | null;
+  imageState: LinkPreviewImageState;
+  /** Metadata extraction completed successfully; safe to snapshot after media uploads. */
+  snapshotReady?: boolean;
+};
+
+type ResolvedMetadataByHref = Record<
+  string,
+  LinkPreviewMetadata | null | undefined
+>;
+
+/** Only auto-generated titles may be replaced; explicit markdown labels win. */
+export function shouldResolveTitle(preview: SupportedLinkPreview): boolean {
+  if (preview.kind !== "buzz-pull-request" && preview.kind !== "buzz-issue") {
+    return true;
+  }
+  const parsed = parseEntityLink(preview.href);
+  return parsed.ok && preview.title === buzzEntityFallbackTitle(parsed.value);
+}
+
+export function resolveLinkPreview(
+  preview: SupportedLinkPreview,
+  metadata: LinkPreviewMetadata | null | undefined,
+): ResolvedLinkPreview {
+  if (metadata === undefined) {
+    return { ...preview, imageState: "pending" };
+  }
+  if (metadata === null) {
+    return { ...preview, imageState: "none" };
+  }
+
+  const hasImage = Boolean(metadata.imageDataUrl && metadata.imageDomain);
+  const imageState: LinkPreviewImageState = hasImage
+    ? "image"
+    : metadata.imageFetchState === "image" ||
+        metadata.imageFetchState === "transient_failure" ||
+        metadata.imageFetchState === "rejected"
+      ? "fallback"
+      : "none";
+  return {
+    ...preview,
+    snapshotReady: !preview.href.startsWith("buzz://"),
+    title: shouldResolveTitle(preview) ? metadata.title : preview.title,
+    description: metadata.description,
+    faviconDataUrl: metadata.faviconDataUrl,
+    provider:
+      preview.kind === "generic-link" && metadata.siteName
+        ? metadata.siteName
+        : preview.provider,
+    imageDataUrl: hasImage ? metadata.imageDataUrl : null,
+    imageDomain: hasImage ? metadata.imageDomain : null,
+    imageState,
+  };
 }
 
 export function useResolvedLinkPreviews(
   previews: SupportedLinkPreview[],
-): SupportedLinkPreview[] {
-  const [resolvedTitles, setResolvedTitles] = React.useState<
-    Record<string, string>
-  >({});
+): ResolvedLinkPreview[] {
+  const [resolvedMetadata, setResolvedMetadata] =
+    React.useState<ResolvedMetadataByHref>({});
+  const [retryGeneration, setRetryGeneration] = React.useState(0);
 
   React.useEffect(() => {
     let cancelled = false;
-    const pending = previews.filter(shouldResolveTitle);
-    if (pending.length === 0) return undefined;
-
-    for (const preview of pending) {
-      const cached = titleCache.get(preview.href);
-      if (typeof cached === "string" && cached) {
-        setResolvedTitles((current) =>
-          current[preview.href] === cached
+    let retryAt = Number.POSITIVE_INFINITY;
+    let retryTimer: ReturnType<typeof setTimeout> | null = null;
+
+    const scheduleRetry = (
+      { expiresAt, key }: Pick<MetadataLoadResult, "expiresAt" | "key">,
+      loader: typeof metadataLoader,
+    ) => {
+      if (expiresAt === null || expiresAt >= retryAt) return;
+      retryAt = expiresAt;
+      if (retryTimer !== null) clearTimeout(retryTimer);
+      retryTimer = setTimeout(
+        () => {
+          loader.deleteKey(key);
+          setResolvedMetadata((current) => {
+            if (!(key in current)) return current;
+            const next = { ...current };
+            delete next[key];
+            return next;
+          });
+          setRetryGeneration(retryGeneration + 1);
+        },
+        Math.max(0, expiresAt - Date.now()),
+      );
+    };
+
+    const cancelScheduledLoads: Array<() => void> = [];
+    for (const preview of previews) {
+      const loader = preview.href.startsWith("buzz://")
+        ? entityTitleLoader
+        : metadataLoader;
+      const cached = loader.peek(preview.href);
+      if (cached !== undefined) {
+        setResolvedMetadata((current) =>
+          current[cached.key] === cached.metadata
             ? current
-            : { ...current, [preview.href]: cached },
+            : { ...current, [cached.key]: cached.metadata },
         );
+        scheduleRetry(cached, loader);
         continue;
       }
 
-      void cacheTitle(preview).then((title) => {
-        if (cancelled || !title) return;
-        setResolvedTitles((current) =>
-          current[preview.href] === title
-            ? current
-            : { ...current, [preview.href]: title },
-        );
-      });
+      cancelScheduledLoads.push(
+        scheduleAfterPaint(() => {
+          void loader.load(preview.href).then((result) => {
+            if (cancelled) return;
+            setResolvedMetadata((current) =>
+              current[result.key] === result.metadata
+                ? current
+                : { ...current, [result.key]: result.metadata },
+            );
+            scheduleRetry(result, loader);
+          });
+        }),
+      );
     }
 
     return () => {
       cancelled = true;
+      for (const cancel of cancelScheduledLoads) cancel();
+      if (retryTimer !== null) clearTimeout(retryTimer);
     };
-  }, [previews]);
+  }, [previews, retryGeneration]);
 
   return React.useMemo(
     () =>
-      previews.map((preview) => {
-        const title = resolvedTitles[preview.href];
-        // Only apply a relay-resolved title while the preview still has the
-        // fallback title (i.e. no markdown-label override). If the user edits
-        // a bare link into `[My label](same-link)`, `shouldResolveTitle`
-        // returns false and the label wins — the cached relay title is not
-        // applied to prevent it from silently overriding the explicit label.
-        return title && shouldResolveTitle(preview)
-          ? { ...preview, title }
-          : preview;
+      previews.flatMap((preview) => {
+        const metadata = resolvedMetadata[metadataCacheKey(preview.href)];
+        return metadata === null ? [] : [resolveLinkPreview(preview, metadata)];
       }),
-    [previews, resolvedTitles],
+    [previews, resolvedMetadata],
   );
 }
+
+export const __linkPreviewMetadataTest = {
+  createMetadataLoader,
+  createTaskScheduler,
+  metadataCacheKey,
+  metadataExpiry,
+};
diff --git a/desktop/src/shared/styles/globals/terminal.css b/desktop/src/shared/styles/globals/terminal.css
index 26b5f42ba8a..544f0ae2efe 100644
--- a/desktop/src/shared/styles/globals/terminal.css
+++ b/desktop/src/shared/styles/globals/terminal.css
@@ -183,6 +183,31 @@
     display: block;
   }
 
+  .buzz-terminal-selection-layer {
+    bottom: 0;
+    color: transparent;
+    font:
+      14px / 17px "JetBrains Mono",
+      monospace;
+    left: 1.25rem;
+    margin: 0;
+    overflow: hidden;
+    position: absolute;
+    right: 1.25rem;
+    top: 0.5rem;
+    user-select: text;
+    white-space: pre;
+  }
+
+  .buzz-terminal-selection-layer > div {
+    height: 17px;
+  }
+
+  .buzz-terminal-selection-layer::selection {
+    background: hsl(var(--accent) / 0.65);
+    color: transparent;
+  }
+
   .buzz-terminal-welcome {
     inset: 0;
     pointer-events: none;
diff --git a/desktop/src/shared/theme/ThemeProvider.tsx b/desktop/src/shared/theme/ThemeProvider.tsx
index 4596694345b..1150f3baca1 100644
--- a/desktop/src/shared/theme/ThemeProvider.tsx
+++ b/desktop/src/shared/theme/ThemeProvider.tsx
@@ -11,6 +11,7 @@ import { isTauri } from "@tauri-apps/api/core";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 import { invokeTauri } from "@/shared/api/tauri";
 import { isMacPlatform } from "@/shared/lib/platform";
+import { getStorageItem } from "@/shared/lib/safeStorage";
 import { createThemeVars, hexToHsl } from "./adaptive-theme";
 import {
   SYNTAX_THEMES,
@@ -80,7 +81,10 @@ function isValidThemeName(name: string): name is SyntaxThemeName {
 
 /** Read stored theme, migrating legacy "light"/"dark"/"system" values. */
 function readStoredTheme(fallback: SyntaxThemeName): SyntaxThemeName {
-  const stored = window.localStorage.getItem(THEME_STORAGE_KEY);
+  // block/buzz#5078 — WebKit throws SecurityError from getItem under a
+  // denied-storage origin; the throw-safe helper lets the provider degrade to
+  // the fallback instead of unmounting the root during first render.
+  const stored = getStorageItem(THEME_STORAGE_KEY);
   if (!stored) return fallback;
 
   // Migrate legacy values
@@ -416,8 +420,7 @@ function applyCachedVars(): string | null {
     root.classList.add(isDark ? "dark" : "light");
     applyBuzzSidebar(themeName);
 
-    const accent =
-      window.localStorage.getItem(ACCENT_STORAGE_KEY) ?? DEFAULT_ACCENT;
+    const accent = getStorageItem(ACCENT_STORAGE_KEY) ?? DEFAULT_ACCENT;
     // Pin Buzz themes to the neutral accent here too, matching applyTheme.
     // Otherwise a cached Buzz theme + non-neutral stored accent flashes the
     // old accent on reload until the async applyTheme effect runs.
@@ -471,7 +474,7 @@ async function applyTheme(name: SyntaxThemeName): Promise<{
   applyAccentColor(
     resolveEffectiveAccent(
       name,
-      window.localStorage.getItem(ACCENT_STORAGE_KEY) ?? DEFAULT_ACCENT,
+      getStorageItem(ACCENT_STORAGE_KEY) ?? DEFAULT_ACCENT,
     ),
   );
 
@@ -506,15 +509,17 @@ export function ThemeProvider({
   >(null);
   const loadingRef = useRef<string | null>(null);
   const [accentColor, setAccentColorState] = useState<string>(() => {
-    return window.localStorage.getItem(ACCENT_STORAGE_KEY) ?? DEFAULT_ACCENT;
+    // block/buzz#5078 — use the throw-safe accessor for init-time reads; a
+    // denied-storage origin would otherwise kill the root on first mount.
+    return getStorageItem(ACCENT_STORAGE_KEY) ?? DEFAULT_ACCENT;
   });
   const [followSystem, setFollowSystemState] = useState<boolean>(() => {
-    const stored = window.localStorage.getItem(FOLLOW_SYSTEM_KEY);
+    const stored = getStorageItem(FOLLOW_SYSTEM_KEY);
     if (stored !== null) return stored === "true";
     // Fresh profiles (no saved theme) default to System mode so the Buzz
     // default tracks the OS light/dark scheme. Profiles that picked a theme
     // before this toggle existed keep their fixed theme until they opt in.
-    return window.localStorage.getItem(THEME_STORAGE_KEY) === null;
+    return getStorageItem(THEME_STORAGE_KEY) === null;
   });
   const [systemIsDark, setSystemIsDark] = useState<boolean>(() => {
     return window.matchMedia("(prefers-color-scheme: dark)").matches;
diff --git a/desktop/src/shared/ui/VideoPlayer.tsx b/desktop/src/shared/ui/VideoPlayer.tsx
index 908bd8e3f01..74703dc5e8c 100644
--- a/desktop/src/shared/ui/VideoPlayer.tsx
+++ b/desktop/src/shared/ui/VideoPlayer.tsx
@@ -28,6 +28,13 @@ import { UserAvatar } from "@/shared/ui/UserAvatar";
 import { Spinner } from "./spinner";
 import { useNaturalVideoAspectRatio } from "./videoAspectRatio";
 import { useVideoContextMenu } from "./useVideoContextMenu";
+import { useRegisterVideoReview } from "./VideoReviewNavigation";
+import { VideoReviewPosterPreview } from "./VideoReviewPosterPreview";
+import { parseVideoReviewTimecode } from "./videoReviewTimecode";
+import {
+  VideoReviewTimecodeButton,
+  VIDEO_REVIEW_TIMECODE_ACCENT_CLASS,
+} from "./VideoReviewTimecodeButton";
 import {
   getInlinePlaybackPosition,
   getReviewPlaybackPosition,
@@ -109,16 +116,10 @@ type TimecodedComment = {
   text: string;
 };
 
-const TIMECODE_RE =
-  /^\s*\[((?:(?:\d{1,2}:)?\d{1,2}:)?\d{2}(?:\.\d{1,3})?)\]\s*/;
 const QUICK_REACTIONS = ["😂", "😍", "😮", "🙌", "👍", "👎"];
 const DEFAULT_PLAYBACK_SPEED = 1;
 const INLINE_SPEED_CONTROL_MIN_WIDTH = 220;
 const PLAYBACK_SPEEDS = [2, 1.75, 1.5, 1.25, 1, 0.75, 0.5, 0.25];
-const TIMECODE_ACCENT_CLASS =
-  "bg-[hsl(var(--buzz-video-review-accent,var(--primary))/0.15)] text-[hsl(var(--buzz-video-review-accent-foreground,var(--buzz-video-review-accent,var(--primary))))]";
-const TIMECODE_ACCENT_HOVER_CLASS =
-  "hover:bg-[hsl(var(--buzz-video-review-accent,var(--primary))/0.3)]";
 
 /**
  * Frosted-glass backing layer for floating media controls. The parent must
@@ -188,40 +189,11 @@ function isPlaybackSpeedOption(speed: number): boolean {
   return PLAYBACK_SPEEDS.some((option) => option === speed);
 }
 
-function parseTimecode(value: string): number | null {
-  const parts = value.split(":").map((part) => Number(part));
-  if (parts.some((part) => !Number.isFinite(part) || part < 0)) {
-    return null;
-  }
-
-  if (parts.length === 2) {
-    return parts[0] * 60 + parts[1];
-  }
-
-  if (parts.length === 3) {
-    return parts[0] * 3600 + parts[1] * 60 + parts[2];
-  }
-
-  return null;
-}
-
 function parseTimecodedComment(comment: VideoReviewComment): TimecodedComment {
-  const match = comment.body.match(TIMECODE_RE);
-  if (!match) {
-    return {
-      comment,
-      seconds: null,
-      timecode: null,
-      text: comment.body.trim(),
-    };
-  }
-
-  return {
-    comment,
-    seconds: parseTimecode(match[1]),
-    timecode: match[1],
-    text: comment.body.slice(match[0].length).trim(),
-  };
+  const parsed = parseVideoReviewTimecode(comment.body);
+  return parsed
+    ? { comment, ...parsed }
+    : { comment, seconds: null, text: comment.body.trim(), timecode: null };
 }
 
 function sortTimecodedComments(
@@ -928,20 +900,32 @@ export function VideoPlayer({
     video.muted = value <= 0;
   }, []);
 
+  const openReviewAt = React.useCallback(
+    (seconds: number) => {
+      const video = videoRef.current;
+      video?.pause();
+      const safeSeconds = Number.isFinite(seconds) ? Math.max(seconds, 0) : 0;
+      const nextSeconds =
+        duration > 0 ? Math.min(safeSeconds, duration) : safeSeconds;
+      setPendingSeekSeconds(nextSeconds);
+      setReviewCurrentTime(nextSeconds);
+      setReviewOpen(true);
+    },
+    [duration, setReviewCurrentTime, setReviewOpen],
+  );
+  useRegisterVideoReview(reviewContext, persistedReviewKey, openReviewAt);
+
   const handleOpenReview = React.useCallback(
     (event?: React.SyntheticEvent) => {
       event?.stopPropagation();
       const video = videoRef.current;
-      video?.pause();
       const startTime =
         video && Number.isFinite(video.currentTime)
           ? video.currentTime
           : currentTime;
-      setPendingSeekSeconds(startTime);
-      setReviewCurrentTime(startTime);
-      setReviewOpen(true);
+      openReviewAt(startTime);
     },
-    [currentTime, setReviewCurrentTime, setReviewOpen],
+    [currentTime, openReviewAt],
   );
 
   const handleReviewOpenChange = React.useCallback(
@@ -989,7 +973,12 @@ export function VideoPlayer({
     maxHeight: 256,
     width: inlineSurfaceWidth,
   };
-  const showControls = started && !hasError;
+  const hideInlineControls = !started || isPlaying;
+  const inlineControlsRevealClass = cn(
+    "transition-opacity duration-150 ease-[cubic-bezier(0.23,1,0.32,1)] motion-reduce:transition-none",
+    hideInlineControls &&
+      "opacity-0 group-focus-within/inline-controls:opacity-100 group-hover/video:opacity-100",
+  );
 
   return (
     <>
@@ -1015,7 +1004,7 @@ export function VideoPlayer({
             poster={poster}
             preload="metadata"
             src={src}
-            onClick={showControls ? handleTogglePlay : undefined}
+            onClick={started ? handleTogglePlay : undefined}
             onDurationChange={(event) =>
               handleMediaDuration(event.currentTarget.duration)
             }
@@ -1072,16 +1061,29 @@ export function VideoPlayer({
             }}
             onWaiting={() => setIsBuffering(true)}
           />
-          {!started && !hasError ? (
+          {!hasError && !isBuffering ? (
             <button
+              aria-label={isPlaying ? "Pause video" : "Play video"}
+              className={cn(
+                "absolute inset-0 flex cursor-pointer items-center justify-center opacity-100 outline-hidden transition-opacity duration-150 ease-[cubic-bezier(0.23,1,0.32,1)] focus-visible:ring-2 focus-visible:ring-white/60 motion-reduce:transition-none",
+                started &&
+                  isPlaying &&
+                  "opacity-0 group-hover/video:opacity-100 focus-visible:opacity-100",
+              )}
+              data-testid="video-inline-center-playback"
               type="button"
-              aria-label="Play video"
-              className="group absolute inset-0 flex cursor-pointer items-center justify-center"
               onClick={handleTogglePlay}
             >
-              <span className="relative isolate flex h-14 w-14 items-center justify-center rounded-full transition-transform duration-200 ease-out group-hover:scale-105">
+              <span
+                className="relative isolate flex h-14 w-14 items-center justify-center rounded-full"
+                data-testid="video-inline-center-icon"
+              >
                 <GlassSurface className="rounded-full" />
-                <Play className="h-6 w-6 fill-white text-white" />
+                {isPlaying ? (
+                  <Pause className="h-6 w-6 fill-white text-white" />
+                ) : (
+                  <Play className="h-6 w-6 fill-white text-white" />
+                )}
               </span>
             </button>
           ) : null}
@@ -1109,33 +1111,22 @@ export function VideoPlayer({
               </span>
             </button>
           ) : null}
-          {/* Slide (not fade) the pill out: animating opacity on an ancestor
-              of a backdrop-filter flattens the glass into a plain fill
-              mid-transition, which reads as a flicker. The video container's
-              overflow-hidden clips the slid-out pill. */}
-          {showControls ? (
+          {!hasError ? (
             <div
               className={cn(
-                "absolute inset-x-1.5 bottom-1.5 z-10 transition-transform duration-300 ease-out",
-                isPlaying &&
-                  "pointer-events-none translate-y-[150%] focus-within:pointer-events-auto focus-within:translate-y-0 group-hover/video:pointer-events-auto group-hover/video:translate-y-0",
+                "group/inline-controls absolute inset-x-1.5 bottom-1.5 z-10 isolate rounded-[10px]",
+                hideInlineControls &&
+                  "pointer-events-none focus-within:pointer-events-auto group-hover/video:pointer-events-auto",
               )}
-              data-testid="video-inline-controls"
             >
-              <div className="relative isolate flex items-center gap-1 rounded-[10px] px-1.5 py-1">
-                <GlassSurface />
-                <button
-                  aria-label={isPlaying ? "Pause video" : "Play video"}
-                  className="flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-white transition-colors hover:bg-white/15 focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-primary"
-                  type="button"
-                  onClick={handleTogglePlay}
-                >
-                  {isPlaying ? (
-                    <Pause className="pointer-events-none h-4 w-4 fill-white" />
-                  ) : (
-                    <Play className="pointer-events-none h-4 w-4 fill-white" />
-                  )}
-                </button>
+              <GlassSurface className={inlineControlsRevealClass} />
+              <div
+                className={cn(
+                  "flex items-center gap-1 px-1.5 py-1",
+                  inlineControlsRevealClass,
+                )}
+                data-testid="video-inline-controls"
+              >
                 <span
                   className="shrink-0 text-2xs font-medium tabular-nums leading-none text-white"
                   data-testid="video-inline-time"
@@ -1260,6 +1251,7 @@ function VideoReviewDialog({
   const [volume, setVolume] = React.useState(1);
   const [muted, setMuted] = React.useState(false);
   const [mediaRatio, setMediaRatio] = React.useState<number | null>(null);
+  const [hasVisibleFrame, setHasVisibleFrame] = React.useState(false);
   const [videoAreaSize, setVideoAreaSize] = React.useState<{
     height: number;
     width: number;
@@ -1364,6 +1356,7 @@ function VideoReviewDialog({
   React.useEffect(() => {
     if (!open) {
       setIsComposerMounted(false);
+      setHasVisibleFrame(false);
       return;
     }
     // Two frames: one for the dialog to paint, one for the browser to
@@ -1715,7 +1708,7 @@ function VideoReviewDialog({
                     className="h-full w-full min-h-0 object-contain"
                     playsInline
                     poster={poster}
-                    preload="metadata"
+                    preload="auto"
                     src={src}
                     onClick={togglePlay}
                     onDurationChange={(event) =>
@@ -1740,6 +1733,7 @@ function VideoReviewDialog({
                         syncCurrentTime(pendingSeekSeconds);
                       }
                     }}
+                    onLoadedData={() => setHasVisibleFrame(true)}
                     onPause={(event) => {
                       syncCurrentTime(event.currentTarget.currentTime);
                       setIsPlaying(false);
@@ -1748,7 +1742,15 @@ function VideoReviewDialog({
                       syncCurrentTime(event.currentTarget.currentTime);
                       setIsPlaying(true);
                     }}
-                    onSeeked={reviewSeek.handleSeeked}
+                    onSeeked={(event) => {
+                      reviewSeek.handleSeeked();
+                      if (
+                        event.currentTarget.readyState >=
+                        HTMLMediaElement.HAVE_CURRENT_DATA
+                      ) {
+                        setHasVisibleFrame(true);
+                      }
+                    }}
                     onTimeUpdate={(event) => {
                       syncCurrentTime(event.currentTarget.currentTime);
                     }}
@@ -1757,6 +1759,10 @@ function VideoReviewDialog({
                       setMuted(event.currentTarget.muted);
                     }}
                   />
+                  <VideoReviewPosterPreview
+                    poster={poster}
+                    visible={!hasVisibleFrame}
+                  />
                 </div>
                 <div className="absolute inset-x-2 bottom-2 z-20 sm:inset-x-4 sm:bottom-3">
                   <div className="relative isolate flex items-center gap-2 rounded-xl px-2 py-1.5">
@@ -1903,12 +1909,12 @@ function VideoReviewDialog({
 
           {showCommentsPanel ? (
             <aside
-              className="min-h-0 shrink-0 overflow-hidden transition-[width] duration-200 ease-out"
+              className="relative z-10 min-h-0 shrink-0 overflow-hidden bg-neutral-950 transition-[width] duration-200 ease-out"
               data-testid="video-review-comments-panel"
               inert={!isPanelOpen || undefined}
               style={{ width: isPanelOpen ? 380 : 0 }}
             >
-              <div className="flex h-full w-[380px] min-h-0 flex-col border-l border-border bg-background">
+              <div className="flex h-full w-[380px] min-h-0 flex-col border-l border-border bg-neutral-950">
                 <div className="flex h-12 shrink-0 items-center border-b border-border px-4">
                   <div className="flex min-w-0 items-center gap-2">
                     <MessageCircle className="h-4 w-4 text-muted-foreground" />
@@ -1960,7 +1966,7 @@ function VideoReviewDialog({
                       className={cn(
                         "rounded-md px-2 py-1 font-mono text-xs font-semibold transition-colors",
                         !replyTarget && postAtCurrentFrame
-                          ? TIMECODE_ACCENT_CLASS
+                          ? VIDEO_REVIEW_TIMECODE_ACCENT_CLASS
                           : "bg-muted text-muted-foreground/70",
                       )}
                       data-testid="video-review-composer-timecode"
@@ -2124,19 +2130,10 @@ function VideoReviewCommentBody({
   const text = item.text || item.comment.body;
   const timecodeButton =
     item.seconds !== null && item.timecode ? (
-      <button
-        aria-label={`Jump to ${item.timecode}`}
-        className={cn(
-          "inline-flex h-5 shrink-0 items-center rounded px-1.5 align-middle font-mono text-2xs font-semibold outline-hidden transition-colors focus-visible:ring-2 focus-visible:ring-white/60",
-          TIMECODE_ACCENT_CLASS,
-          TIMECODE_ACCENT_HOVER_CLASS,
-        )}
-        data-testid="video-review-comment-timecode"
-        type="button"
+      <VideoReviewTimecodeButton
+        timecode={item.timecode}
         onClick={() => onSeek(item.seconds ?? 0)}
-      >
-        {item.timecode}
-      </button>
+      />
     ) : null;
 
   return (
diff --git a/desktop/src/shared/ui/VideoReviewNavigation.tsx b/desktop/src/shared/ui/VideoReviewNavigation.tsx
new file mode 100644
index 00000000000..76c8bda0290
--- /dev/null
+++ b/desktop/src/shared/ui/VideoReviewNavigation.tsx
@@ -0,0 +1,101 @@
+import * as React from "react";
+
+type OpenVideoReview = (seconds: number) => void;
+
+type VideoReviewNavigationValue = {
+  open: (rootEventId: string, seconds: number) => void;
+  register: (
+    rootEventId: string,
+    attachmentKey: string,
+    handler: OpenVideoReview,
+  ) => () => void;
+};
+
+const VideoReviewNavigationContext =
+  React.createContext<VideoReviewNavigationValue | null>(null);
+
+export function VideoReviewNavigationProvider({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  // Review comments are scoped to their message, not an individual attachment.
+  // Keep attachment registration order so a multi-video message always opens
+  // its first video instead of whichever player happened to update last.
+  const handlersRef = React.useRef(
+    new Map<string, Map<string, Set<OpenVideoReview>>>(),
+  );
+  const value = React.useMemo<VideoReviewNavigationValue>(
+    () => ({
+      open(rootEventId, seconds) {
+        handlersRef.current
+          .get(rootEventId)
+          ?.values()
+          .next()
+          .value?.values()
+          .next()
+          .value?.(seconds);
+      },
+      register(rootEventId, attachmentKey, handler) {
+        let rootHandlers = handlersRef.current.get(rootEventId);
+        if (!rootHandlers) {
+          rootHandlers = new Map();
+          handlersRef.current.set(rootEventId, rootHandlers);
+        }
+        let attachmentHandlers = rootHandlers.get(attachmentKey);
+        if (!attachmentHandlers) {
+          attachmentHandlers = new Set();
+          rootHandlers.set(attachmentKey, attachmentHandlers);
+        }
+        attachmentHandlers.add(handler);
+        return () => {
+          const registeredHandlers = handlersRef.current.get(rootEventId);
+          const registeredAttachmentHandlers =
+            registeredHandlers?.get(attachmentKey);
+          registeredAttachmentHandlers?.delete(handler);
+          if (registeredAttachmentHandlers?.size === 0) {
+            registeredHandlers?.delete(attachmentKey);
+          }
+          if (registeredHandlers?.size === 0) {
+            handlersRef.current.delete(rootEventId);
+          }
+        };
+      },
+    }),
+    [],
+  );
+
+  return (
+    <VideoReviewNavigationContext.Provider value={value}>
+      {children}
+    </VideoReviewNavigationContext.Provider>
+  );
+}
+
+export function useOpenVideoReviewAt():
+  | VideoReviewNavigationValue["open"]
+  | null {
+  return React.useContext(VideoReviewNavigationContext)?.open ?? null;
+}
+
+export function useRegisterVideoReview(
+  reviewContext: { rootEventId?: string } | undefined,
+  attachmentKey: string,
+  handler: OpenVideoReview,
+): void {
+  const navigation = React.useContext(VideoReviewNavigationContext);
+  const rootEventId = reviewContext?.rootEventId;
+  const handlerRef = React.useRef(handler);
+  React.useLayoutEffect(() => {
+    handlerRef.current = handler;
+  }, [handler]);
+  const registeredHandler = React.useCallback(
+    (seconds: number) => handlerRef.current(seconds),
+    [],
+  );
+
+  React.useEffect(() => {
+    if (!navigation || !rootEventId) return;
+    return navigation.register(rootEventId, attachmentKey, registeredHandler);
+  }, [attachmentKey, navigation, registeredHandler, rootEventId]);
+}
diff --git a/desktop/src/shared/ui/VideoReviewPosterPreview.tsx b/desktop/src/shared/ui/VideoReviewPosterPreview.tsx
new file mode 100644
index 00000000000..c2c18befc4e
--- /dev/null
+++ b/desktop/src/shared/ui/VideoReviewPosterPreview.tsx
@@ -0,0 +1,22 @@
+export function VideoReviewPosterPreview({
+  poster,
+  visible,
+}: {
+  poster?: string;
+  visible: boolean;
+}) {
+  if (!poster || !visible) return null;
+
+  return (
+    <img
+      alt=""
+      aria-hidden="true"
+      className="pointer-events-none absolute inset-0 h-full w-full object-contain"
+      data-testid="video-review-poster-preview"
+      decoding="sync"
+      draggable={false}
+      fetchPriority="high"
+      src={poster}
+    />
+  );
+}
diff --git a/desktop/src/shared/ui/VideoReviewTimecodeButton.tsx b/desktop/src/shared/ui/VideoReviewTimecodeButton.tsx
new file mode 100644
index 00000000000..53904f886f1
--- /dev/null
+++ b/desktop/src/shared/ui/VideoReviewTimecodeButton.tsx
@@ -0,0 +1,42 @@
+import type * as React from "react";
+
+import { cn } from "@/shared/lib/cn";
+
+const TIMECODE_ACCENT_CLASS =
+  "bg-[hsl(var(--buzz-video-review-accent,var(--primary))/0.15)] text-[hsl(var(--buzz-video-review-accent-foreground,var(--buzz-video-review-accent,var(--primary))))]";
+const TIMECODE_ACCENT_HOVER_CLASS =
+  "hover:bg-[hsl(var(--buzz-video-review-accent,var(--primary))/0.3)]";
+const MESSAGE_TIMECODE_ACCENT_CLASS =
+  "bg-primary/15 text-primary hover:bg-primary/30";
+
+export function VideoReviewTimecodeButton({
+  className,
+  onClick,
+  surface = "review",
+  timecode,
+}: {
+  className?: string;
+  onClick: React.MouseEventHandler<HTMLButtonElement>;
+  surface?: "message" | "review";
+  timecode: string;
+}) {
+  return (
+    <button
+      aria-label={`Jump to ${timecode}`}
+      className={cn(
+        "inline-flex h-5 shrink-0 items-center rounded px-1.5 align-middle font-mono text-2xs font-semibold outline-hidden transition-colors focus-visible:ring-2 focus-visible:ring-white/60",
+        surface === "review"
+          ? [TIMECODE_ACCENT_CLASS, TIMECODE_ACCENT_HOVER_CLASS]
+          : MESSAGE_TIMECODE_ACCENT_CLASS,
+        className,
+      )}
+      data-testid="video-review-comment-timecode"
+      type="button"
+      onClick={onClick}
+    >
+      {timecode}
+    </button>
+  );
+}
+
+export const VIDEO_REVIEW_TIMECODE_ACCENT_CLASS = TIMECODE_ACCENT_CLASS;
diff --git a/desktop/src/shared/ui/compact-link-preview-attachment.tsx b/desktop/src/shared/ui/compact-link-preview-attachment.tsx
new file mode 100644
index 00000000000..89ec2c34e77
--- /dev/null
+++ b/desktop/src/shared/ui/compact-link-preview-attachment.tsx
@@ -0,0 +1,176 @@
+import { ImageOff } from "lucide-react";
+import { useState } from "react";
+
+import type { ResolvedLinkPreview } from "@/shared/lib/useResolvedLinkPreviews";
+import { cn } from "@/shared/lib/cn";
+import {
+  Attachment,
+  AttachmentContent,
+  AttachmentDescription,
+  AttachmentMedia,
+  AttachmentTitle,
+  AttachmentTrigger,
+} from "@/shared/ui/attachment";
+import { LinkPreviewControls } from "@/shared/ui/link-preview-controls";
+
+function getHostname(preview: ResolvedLinkPreview): string {
+  try {
+    return new URL(preview.href).hostname.replace(/^www\./, "");
+  } catch {
+    return preview.provider;
+  }
+}
+
+function LinkPreviewImageFallback({
+  preview,
+}: {
+  preview: ResolvedLinkPreview;
+}) {
+  return (
+    <div
+      aria-hidden="true"
+      className="flex h-full w-full items-center justify-center bg-muted text-muted-foreground"
+      data-link-preview-image-fallback=""
+    >
+      {preview.faviconDataUrl ? (
+        <img
+          alt=""
+          className="size-7 rounded-md object-contain opacity-70"
+          src={preview.faviconDataUrl}
+        />
+      ) : (
+        <ImageOff className="size-5 opacity-60" />
+      )}
+    </div>
+  );
+}
+
+export function CompactLinkPreviewAttachment({
+  className,
+  onOpen,
+  onRemove,
+  preview,
+  showControls = false,
+}: {
+  className?: string;
+  onOpen?: () => void;
+  onRemove?: () => void;
+  preview: ResolvedLinkPreview;
+  showControls?: boolean;
+}) {
+  const reserveImage = preview.imageState !== "none";
+  const imageSrc =
+    preview.imageState === "image" ? (preview.imageDataUrl ?? null) : null;
+  const [failedImageSrc, setFailedImageSrc] = useState<string | null>(null);
+  const showImage = Boolean(imageSrc && failedImageSrc !== imageSrc);
+  const showFallback =
+    preview.imageState === "fallback" || Boolean(imageSrc && !showImage);
+  const hostname = getHostname(preview);
+
+  return (
+    <div className={cn("relative w-96 max-w-full shrink-0", className)}>
+      <Attachment
+        className={cn(
+          "h-21 min-h-21 max-h-21 w-full bg-transparent no-underline shadow-none hover:bg-transparent",
+          reserveImage
+            ? "gap-0 border-0 p-0 hover:border-transparent"
+            : "rounded-none border-0 border-l-[3px] border-border px-0 py-1 pl-3 hover:border-border",
+        )}
+        data-image-state={preview.imageState}
+        data-link-preview={preview.kind}
+        orientation="horizontal"
+      >
+        {reserveImage ? (
+          <AttachmentMedia
+            aria-hidden={showImage ? undefined : "true"}
+            className="aspect-auto h-full min-h-0 w-30 min-w-30 max-w-30 self-stretch rounded-xl bg-muted sm:w-34 sm:min-w-34 sm:max-w-34"
+            data-link-preview-thumbnail=""
+            variant="image"
+          >
+            {showImage ? (
+              <img
+                alt={`Preview from ${preview.imageDomain}`}
+                className="h-full w-full object-cover"
+                onError={() => setFailedImageSrc(imageSrc)}
+                src={imageSrc ?? undefined}
+              />
+            ) : showFallback ? (
+              <LinkPreviewImageFallback preview={preview} />
+            ) : (
+              <div
+                className="h-full w-full animate-pulse bg-muted-foreground/10"
+                data-link-preview-skeleton=""
+              />
+            )}
+          </AttachmentMedia>
+        ) : null}
+        <AttachmentContent className={reserveImage ? "px-2 py-2" : undefined}>
+          <a
+            className="relative z-20 flex w-fit max-w-full min-w-0 items-center gap-1.5 text-xs font-normal leading-4 text-muted-foreground/70 group-hover/attachment:underline"
+            data-link-preview-hostname=""
+            href={preview.href}
+            onClick={
+              onOpen
+                ? (event) => {
+                    event.preventDefault();
+                    onOpen();
+                  }
+                : undefined
+            }
+            rel="noreferrer"
+            target="_blank"
+          >
+            {preview.faviconDataUrl ? (
+              <img
+                alt=""
+                aria-hidden="true"
+                className="size-3 shrink-0 rounded-sm object-contain"
+                data-link-preview-hostname-favicon=""
+                src={preview.faviconDataUrl}
+              />
+            ) : null}
+            <span className="truncate">{hostname}</span>
+          </a>
+          <AttachmentTitle className="line-clamp-2 whitespace-normal group-hover/attachment:underline">
+            {preview.title}
+          </AttachmentTitle>
+          {preview.description ? (
+            <AttachmentDescription className="text-muted-foreground/70">
+              {preview.description}
+            </AttachmentDescription>
+          ) : null}
+        </AttachmentContent>
+        {onOpen ? (
+          <AttachmentTrigger
+            aria-label={`Open ${preview.provider} ${preview.typeLabel}: ${preview.title}`}
+            className={reserveImage ? undefined : "rounded-none"}
+            onClick={onOpen}
+          >
+            <span className="sr-only">
+              Open {preview.provider} {preview.typeLabel}: {preview.title}
+            </span>
+          </AttachmentTrigger>
+        ) : (
+          <AttachmentTrigger
+            asChild
+            className={reserveImage ? undefined : "rounded-none"}
+          >
+            <a
+              aria-label={`Open ${preview.provider} ${preview.typeLabel}: ${preview.title}`}
+              href={preview.href}
+              rel="noreferrer"
+              target="_blank"
+            >
+              <span className="sr-only">
+                Open {preview.provider} {preview.typeLabel}: {preview.title}
+              </span>
+            </a>
+          </AttachmentTrigger>
+        )}
+      </Attachment>
+      {showControls ? (
+        <LinkPreviewControls onRemove={onRemove} placement="left" />
+      ) : null}
+    </div>
+  );
+}
diff --git a/desktop/src/shared/ui/link-preview-attachment.tsx b/desktop/src/shared/ui/link-preview-attachment.tsx
index ad848a42ba2..743d2471ef2 100644
--- a/desktop/src/shared/ui/link-preview-attachment.tsx
+++ b/desktop/src/shared/ui/link-preview-attachment.tsx
@@ -1,181 +1,47 @@
-import { ExternalLink } from "lucide-react";
-
-import type { SupportedLinkPreview } from "@/shared/lib/linkPreview";
-import { cn } from "@/shared/lib/cn";
-import { BuzzMark } from "@/shared/ui/buzz-logo/BuzzMark";
+import type { ResolvedLinkPreview } from "@/shared/lib/useResolvedLinkPreviews";
+import { useLinkPreviewStyle } from "@/shared/lib/linkPreviewStylePreference";
+import { CompactLinkPreviewAttachment } from "@/shared/ui/compact-link-preview-attachment";
 import {
-  Attachment,
-  AttachmentActions,
-  AttachmentContent,
-  AttachmentMedia,
-  AttachmentTitle,
-  AttachmentTrigger,
-} from "@/shared/ui/attachment";
-
-function LinearLogo({ className }: { className?: string }) {
-  return (
-    <svg
-      aria-hidden="true"
-      className={className}
-      fill="currentColor"
-      viewBox="0 0 24 24"
-    >
-      <path d="M2.886 4.18A11.982 11.982 0 0 1 11.99 0C18.624 0 24 5.376 24 12.009c0 3.64-1.62 6.903-4.18 9.105L2.887 4.18ZM1.817 5.626l16.556 16.556c-.524.33-1.075.62-1.65.866L.951 7.277c.247-.575.537-1.126.866-1.65ZM.322 9.163l14.515 14.515c-.71.172-1.443.282-2.195.322L0 11.358a12 12 0 0 1 .322-2.195Zm-.17 4.862 9.823 9.824a12.02 12.02 0 0 1-9.824-9.824Z" />
-    </svg>
-  );
-}
-
-function GitHubLogo({ className }: { className?: string }) {
-  return (
-    <svg
-      aria-hidden="true"
-      className={className}
-      fill="currentColor"
-      viewBox="0 0 24 24"
-    >
-      <path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
-    </svg>
-  );
-}
-
-function GoogleDriveLogo({ className }: { className?: string }) {
-  return (
-    <svg
-      aria-hidden="true"
-      className={className}
-      fill="currentColor"
-      viewBox="0 0 24 24"
-    >
-      <path d="M12.01 1.485c-2.082 0-3.754.02-3.743.047.01.02 1.708 3.001 3.774 6.62l3.76 6.574h3.76c2.081 0 3.753-.02 3.742-.047-.005-.02-1.708-3.001-3.775-6.62l-3.76-6.574zm-4.76 1.73a789.828 789.861 0 0 0-3.63 6.319L0 15.868l1.89 3.298 1.885 3.297 3.62-6.335 3.618-6.33-1.88-3.287C8.1 4.704 7.255 3.22 7.25 3.214zm2.259 12.653-.203.348c-.114.198-.96 1.672-1.88 3.287a423.93 423.948 0 0 1-1.698 2.97c-.01.026 3.24.042 7.222.042h7.244l1.796-3.157c.992-1.734 1.85-3.23 1.906-3.323l.104-.167h-7.249z" />
-    </svg>
-  );
-}
-
-function GoogleDocsLogo({ className }: { className?: string }) {
-  return (
-    <svg
-      aria-hidden="true"
-      className={className}
-      fill="currentColor"
-      viewBox="0 0 24 24"
-    >
-      <path d="M14.727 6.727H14V0H4.91c-.905 0-1.637.732-1.637 1.636v20.728c0 .904.732 1.636 1.636 1.636h14.182c.904 0 1.636-.732 1.636-1.636V6.727h-6zm-.545 10.455H7.09v-1.364h7.09v1.364zm2.727-3.273H7.091v-1.364h9.818v1.364zm0-3.273H7.091V9.273h9.818v1.363zM14.727 6h6l-6-6v6z" />
-    </svg>
-  );
-}
-
-function GoogleSheetsLogo({ className }: { className?: string }) {
-  return (
-    <svg
-      aria-hidden="true"
-      className={className}
-      fill="currentColor"
-      viewBox="0 0 24 24"
-    >
-      <path d="M11.318 12.545H7.91v-1.909h3.41v1.91zM14.728 0v6h6l-6-6zm1.363 10.636h-3.41v1.91h3.41v-1.91zm0 3.273h-3.41v1.91h3.41v-1.91zM20.727 6.5v15.864c0 .904-.732 1.636-1.636 1.636H4.909a1.636 1.636 0 0 1-1.636-1.636V1.636C3.273.732 4.005 0 4.909 0h9.318v6.5h6.5zm-3.273 2.773H6.545v7.909h10.91v-7.91zm-6.136 4.636H7.91v1.91h3.41v-1.91z" />
-    </svg>
-  );
-}
-
-function GoogleSlidesLogo({ className }: { className?: string }) {
-  return (
-    <svg
-      aria-hidden="true"
-      className={className}
-      fill="currentColor"
-      viewBox="0 0 24 24"
-    >
-      <path d="M16.09 15.273H7.91v-4.637h8.18v4.637zm1.728-8.523h2.91v15.614c0 .904-.733 1.636-1.637 1.636H4.909a1.636 1.636 0 0 1-1.636-1.636V1.636C3.273.732 4.005 0 4.909 0h9.068v6.75h3.841zm-.363 2.523H6.545v7.363h10.91V9.273zm-2.728-5.979V6h6.001l-6-6v3.294z" />
-    </svg>
-  );
-}
-
-function LinkPreviewLogo({ preview }: { preview: SupportedLinkPreview }) {
-  switch (preview.kind) {
-    case "buzz-issue":
-    case "buzz-pull-request":
-    case "buzz-repository":
-      return <BuzzMark className="h-4 w-4" />;
-    case "github-issue":
-    case "github-pull-request":
-    case "github-repository":
-      return <GitHubLogo className="h-4 w-4" />;
-    case "linear-issue":
-      return <LinearLogo className="h-4 w-4" />;
-    case "google-drive-file":
-    case "google-drive-folder":
-      return <GoogleDriveLogo className="h-4 w-4" />;
-    case "google-docs-document":
-      return <GoogleDocsLogo className="h-4 w-4" />;
-    case "google-sheets-spreadsheet":
-      return <GoogleSheetsLogo className="h-4 w-4" />;
-    case "google-slides-presentation":
-      return <GoogleSlidesLogo className="h-4 w-4" />;
-  }
-}
+  type LinkPreviewImageLightboxComponent,
+  RichLinkPreviewAttachment,
+} from "@/shared/ui/rich-link-preview-attachment";
 
 export function LinkPreviewAttachment({
   className,
+  ImageLightbox,
   onOpen,
+  onRemove,
   preview,
+  showControls,
 }: {
   className?: string;
-  /**
-   * In-app navigation handler for links the OS cannot open (e.g. `buzz://`
-   * entity deep links). When set, the card renders a button trigger instead
-   * of an external anchor.
-   */
+  ImageLightbox: LinkPreviewImageLightboxComponent;
   onOpen?: () => void;
-  preview: SupportedLinkPreview;
+  onRemove?: () => void;
+  preview: ResolvedLinkPreview;
+  showControls?: boolean;
 }) {
+  const style = useLinkPreviewStyle();
+  if (style === "rich") {
+    return (
+      <RichLinkPreviewAttachment
+        className={className}
+        ImageLightbox={ImageLightbox}
+        onOpen={onOpen}
+        onRemove={onRemove}
+        preview={preview}
+        showControls={showControls}
+      />
+    );
+  }
+
   return (
-    <Attachment
-      className={cn(
-        "w-80 max-w-full shrink-0 no-underline shadow-none",
-        className,
-      )}
-      data-link-preview={preview.kind}
-    >
-      <AttachmentMedia className="link-preview-media">
-        <LinkPreviewLogo preview={preview} />
-      </AttachmentMedia>
-      <AttachmentContent>
-        <div className="truncate text-xs font-medium leading-4 text-muted-foreground">
-          {preview.provider}
-          <span aria-hidden="true"> · </span>
-          {preview.typeLabel}
-        </div>
-        <AttachmentTitle>{preview.title}</AttachmentTitle>
-      </AttachmentContent>
-      <AttachmentActions>
-        <ExternalLink
-          aria-hidden="true"
-          className="h-4 w-4 text-muted-foreground opacity-0 transition-opacity group-hover/attachment:opacity-100 group-focus-within/attachment:opacity-100"
-        />
-      </AttachmentActions>
-      {onOpen ? (
-        <AttachmentTrigger
-          aria-label={`Open ${preview.provider} ${preview.typeLabel}: ${preview.title}`}
-          onClick={onOpen}
-        >
-          <span className="sr-only">
-            Open {preview.provider} {preview.typeLabel}: {preview.title}
-          </span>
-        </AttachmentTrigger>
-      ) : (
-        <AttachmentTrigger asChild>
-          <a
-            aria-label={`Open ${preview.provider} ${preview.typeLabel}: ${preview.title}`}
-            href={preview.href}
-            rel="noreferrer"
-            target="_blank"
-          >
-            <span className="sr-only">
-              Open {preview.provider} {preview.typeLabel}: {preview.title}
-            </span>
-          </a>
-        </AttachmentTrigger>
-      )}
-    </Attachment>
+    <CompactLinkPreviewAttachment
+      className={className}
+      onOpen={onOpen}
+      onRemove={onRemove}
+      preview={preview}
+      showControls={showControls}
+    />
   );
 }
diff --git a/desktop/src/shared/ui/link-preview-controls.tsx b/desktop/src/shared/ui/link-preview-controls.tsx
new file mode 100644
index 00000000000..66ac98bb6fe
--- /dev/null
+++ b/desktop/src/shared/ui/link-preview-controls.tsx
@@ -0,0 +1,125 @@
+import { EllipsisVertical, EyeOff } from "lucide-react";
+import { toast } from "sonner";
+
+import { useAppShell } from "@/app/AppShellContext";
+import {
+  setLinkPreviewStyle,
+  type LinkPreviewStyle,
+  useLinkPreviewStyle,
+} from "@/shared/lib/linkPreviewStylePreference";
+import { cn } from "@/shared/lib/cn";
+import { Button } from "@/shared/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuSeparator,
+  DropdownMenuSub,
+  DropdownMenuSubContent,
+  DropdownMenuSubTrigger,
+  DropdownMenuTrigger,
+} from "@/shared/ui/dropdown-menu";
+
+const CONTROL_BUTTON_CLASS =
+  "h-5 w-5 rounded-full text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:opacity-100 group-hover/message:opacity-100 data-[state=open]:opacity-100";
+
+const LINK_PREVIEW_STYLE_OPTIONS: {
+  value: LinkPreviewStyle;
+  label: string;
+}[] = [
+  { value: "rich", label: "Rich" },
+  { value: "compact", label: "Compact" },
+];
+
+export function LinkPreviewControls({
+  onRemove,
+  placement = "right",
+}: {
+  onRemove?: () => void;
+  placement?: "left" | "right";
+}) {
+  const style = useLinkPreviewStyle();
+  const { onOpenSettings } = useAppShell();
+
+  const handleStyleChange = (nextStyle: string) => {
+    if (
+      (nextStyle !== "rich" && nextStyle !== "compact") ||
+      nextStyle === style
+    ) {
+      return;
+    }
+
+    setLinkPreviewStyle(nextStyle);
+    toast.success(
+      `Link previews set to ${nextStyle === "rich" ? "Rich" : "Compact"}.`,
+      {
+        action: onOpenSettings
+          ? {
+              label: "Appearance",
+              onClick: () => onOpenSettings("appearance"),
+            }
+          : undefined,
+        description:
+          "You can always modify this and other settings in Appearance.",
+      },
+    );
+  };
+
+  return (
+    <div
+      className={cn(
+        "absolute top-0 z-20 flex flex-col",
+        placement === "left" ? "right-full" : "left-full ml-1",
+      )}
+    >
+      <DropdownMenu modal={false}>
+        <DropdownMenuTrigger asChild>
+          <Button
+            aria-label="Link display settings"
+            className={CONTROL_BUTTON_CLASS}
+            size="icon-xs"
+            title="Link display settings"
+            type="button"
+            variant="ghost"
+          >
+            <EllipsisVertical aria-hidden="true" />
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="start" side="right">
+          <DropdownMenuSub>
+            <DropdownMenuSubTrigger>Display</DropdownMenuSubTrigger>
+            <DropdownMenuSubContent>
+              <DropdownMenuRadioGroup
+                onValueChange={handleStyleChange}
+                value={style}
+              >
+                {LINK_PREVIEW_STYLE_OPTIONS.map((option) => (
+                  <DropdownMenuRadioItem
+                    key={option.value}
+                    value={option.value}
+                  >
+                    {option.label}
+                  </DropdownMenuRadioItem>
+                ))}
+              </DropdownMenuRadioGroup>
+            </DropdownMenuSubContent>
+          </DropdownMenuSub>
+          {onRemove ? (
+            <>
+              <DropdownMenuSeparator />
+              <DropdownMenuItem
+                className="text-destructive focus:text-destructive"
+                onClick={onRemove}
+              >
+                <EyeOff aria-hidden="true" />
+                Remove preview
+              </DropdownMenuItem>
+            </>
+          ) : null}
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </div>
+  );
+}
diff --git a/desktop/src/shared/ui/link-preview-list.tsx b/desktop/src/shared/ui/link-preview-list.tsx
new file mode 100644
index 00000000000..a389e3a1365
--- /dev/null
+++ b/desktop/src/shared/ui/link-preview-list.tsx
@@ -0,0 +1,98 @@
+import { useState } from "react";
+
+import { useLinkPreviewStyle } from "@/shared/lib/linkPreviewStylePreference";
+import type { ResolvedLinkPreview } from "@/shared/lib/useResolvedLinkPreviews";
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from "@/shared/ui/alert-dialog";
+import { AttachmentGroup } from "@/shared/ui/attachment";
+import { Button } from "@/shared/ui/button";
+import { LinkPreviewAttachment } from "@/shared/ui/link-preview-attachment";
+import type { LinkPreviewImageLightboxComponent } from "@/shared/ui/rich-link-preview-attachment";
+
+export function LinkPreviewList({
+  ImageLightbox,
+  onOpenByHref,
+  onRemoveForEveryone,
+  previews,
+}: {
+  ImageLightbox: LinkPreviewImageLightboxComponent;
+  onOpenByHref?: ReadonlyMap<string, () => void>;
+  onRemoveForEveryone?: () => Promise<void>;
+  previews: ResolvedLinkPreview[];
+}) {
+  const [dialogOpen, setDialogOpen] = useState(false);
+  const [removed, setRemoved] = useState(false);
+  const style = useLinkPreviewStyle();
+  if (removed || previews.length === 0) return null;
+
+  const previewNoun = previews.length === 1 ? "preview" : "previews";
+  const controlsIndex = 0;
+  return (
+    <>
+      <AttachmentGroup
+        className={
+          style === "compact"
+            ? "max-w-full flex-row flex-wrap items-start overflow-visible pb-0"
+            : "max-w-full flex-col items-start overflow-visible pb-0"
+        }
+        data-link-preview-list=""
+      >
+        {previews.map((preview, index) => (
+          <LinkPreviewAttachment
+            key={preview.href}
+            ImageLightbox={ImageLightbox}
+            onOpen={onOpenByHref?.get(preview.href)}
+            onRemove={
+              onRemoveForEveryone && index === controlsIndex
+                ? () => setDialogOpen(true)
+                : undefined
+            }
+            preview={preview}
+            showControls={index === controlsIndex}
+          />
+        ))}
+      </AttachmentGroup>
+      {onRemoveForEveryone ? (
+        <AlertDialog onOpenChange={setDialogOpen} open={dialogOpen}>
+          <AlertDialogContent>
+            <AlertDialogHeader>
+              <AlertDialogTitle>Remove {previewNoun}?</AlertDialogTitle>
+              <AlertDialogDescription>
+                This removes{" "}
+                {previews.length === 1 ? "the preview" : "the previews"} for
+                everyone.
+              </AlertDialogDescription>
+            </AlertDialogHeader>
+            <AlertDialogFooter>
+              <AlertDialogCancel asChild>
+                <Button type="button" variant="outline">
+                  Cancel
+                </Button>
+              </AlertDialogCancel>
+              <AlertDialogAction asChild>
+                <Button
+                  onClick={() => {
+                    setRemoved(true);
+                    void onRemoveForEveryone().catch(() => setRemoved(false));
+                  }}
+                  type="button"
+                  variant="destructive"
+                >
+                  Remove {previewNoun}
+                </Button>
+              </AlertDialogAction>
+            </AlertDialogFooter>
+          </AlertDialogContent>
+        </AlertDialog>
+      ) : null}
+    </>
+  );
+}
diff --git a/desktop/src/shared/ui/markdown.tsx b/desktop/src/shared/ui/markdown.tsx
index 414b44a9664..a2fb0e42d61 100644
--- a/desktop/src/shared/ui/markdown.tsx
+++ b/desktop/src/shared/ui/markdown.tsx
@@ -22,16 +22,13 @@ import { UserProfilePopover } from "@/features/profile/ui/UserProfilePopover";
 import { invokeTauri } from "@/shared/api/tauri";
 import { useChannelNavigation } from "@/shared/context/ChannelNavigationContext";
 import { cn } from "@/shared/lib/cn";
-import {
-  extractSupportedLinkPreviews,
-  parseSupportedLinkPreview,
-} from "@/shared/lib/linkPreview";
-import { useResolvedLinkPreviews } from "@/shared/lib/useResolvedLinkPreviews";
+import { parseSupportedLinkPreview } from "@/shared/lib/linkPreview";
+import { parseLinkPreviewSnapshots } from "@/shared/lib/linkPreviewSnapshot";
 import { rewriteRelayUrl } from "@/shared/lib/mediaUrl";
 import { useRelayOrigin } from "@/shared/lib/useRelayOrigin";
 import { AttachmentGroup } from "@/shared/ui/attachment";
 import { ConfigNudgeCard } from "@/shared/ui/config-nudge-attachment";
-import { LinkPreviewAttachment } from "@/shared/ui/link-preview-attachment";
+import { LinkPreviewList } from "@/shared/ui/link-preview-list";
 import { useSmoothCorners } from "@/shared/ui/smoothCorners";
 import {
   computeConfigNudge,
@@ -66,6 +63,7 @@ import {
 import { ExternalLinkAnchor } from "./markdown/ExternalLinkAnchor";
 import { FileCard } from "./markdown/FileCard";
 import { InlineEmojiPopover } from "./markdown/InlineEmojiPopover";
+import { createLinkPreviewImageLightbox } from "./markdown/LinkPreviewImageLightbox";
 import { MarkdownInput } from "./markdown/MarkdownInput";
 import {
   MediaContextMenu,
@@ -663,16 +661,10 @@ function ImageZoomOverlay({
   const frameCornerRadii = isReturning
     ? returnCornerRadii
     : imageLightboxExpandedCornerRadii();
-  // Once fully settled at 1x, drop the transform to `none` so the wrapper
-  // leaves the GPU-composited path and the <img> repaints through WebKit's
-  // high-quality paint rasterizer — matching inline-image sharpness. An
-  // identity `translate3d` would keep it composited, so it must be `none`.
   const atRest =
     isOpen &&
     hasEntered &&
     zoom === IMAGE_LIGHTBOX_MIN_ZOOM &&
-    // Holds composited through the trackpad gesture-end idle window: after a
-    // pinch settles back to exactly 1x, `isAdjustingZoom` stays true for
     // IMAGE_LIGHTBOX_TRACKPAD_ZOOM_IDLE_MS, avoiding a demote/re-promote thrash.
     !isAdjustingZoom;
   const transform = atRest
@@ -999,6 +991,9 @@ function ImageZoomOverlay({
   );
 }
 
+export const LinkPreviewImageLightbox =
+  createLinkPreviewImageLightbox(ImageZoomOverlay);
+
 /**
  * Inline image embed with click-to-zoom lightbox and right-click download.
  *
@@ -1777,6 +1772,10 @@ function MarkdownInner({
   interactive = true,
   agentMentionPubkeysByName,
   mediaInset = false,
+  messageId,
+  linkPreviewsSuppressed = false,
+  linkPreviewTags,
+  onRemoveLinkPreviewsForEveryone,
   mentionNames,
   mentionPubkeysByName,
   searchQuery,
@@ -1810,10 +1809,18 @@ function MarkdownInner({
     [goChannel],
   );
   const relayOrigin = useRelayOrigin();
-  const linkPreviews = React.useMemo(
+  const resolvedLinkPreviews = React.useMemo(
     () =>
-      interactive ? extractSupportedLinkPreviews(content, relayOrigin) : [],
-    [content, interactive, relayOrigin],
+      interactive && !linkPreviewsSuppressed
+        ? parseLinkPreviewSnapshots(linkPreviewTags, content, relayOrigin)
+        : [],
+    [
+      content,
+      interactive,
+      linkPreviewTags,
+      linkPreviewsSuppressed,
+      relayOrigin,
+    ],
   );
   const configNudge = React.useMemo(
     () => computeConfigNudge(content, interactive, configNudgeAuthorPubkey),
@@ -1868,7 +1875,6 @@ function MarkdownInner({
     processedContent = `${processedContent}\u200B`;
   }
 
-  const resolvedLinkPreviews = useResolvedLinkPreviews(linkPreviews);
   const entityCardOpenHandlers = useEntityCardOpenHandlers(
     resolvedLinkPreviews,
     onOpenEntityLink,
@@ -1922,20 +1928,13 @@ function MarkdownInner({
               <ConfigNudgeCard nudge={configNudge} />
             </AttachmentGroup>
           ) : null}
-          {resolvedLinkPreviews.length > 0 ? (
-            <AttachmentGroup
-              className="max-w-full flex-wrap overflow-visible pb-0"
-              data-link-preview-list=""
-            >
-              {resolvedLinkPreviews.map((preview) => (
-                <LinkPreviewAttachment
-                  key={preview.href}
-                  onOpen={entityCardOpenHandlers.get(preview.href)}
-                  preview={preview}
-                />
-              ))}
-            </AttachmentGroup>
-          ) : null}
+          <LinkPreviewList
+            ImageLightbox={LinkPreviewImageLightbox}
+            key={messageId}
+            onOpenByHref={entityCardOpenHandlers}
+            onRemoveForEveryone={onRemoveLinkPreviewsForEveryone}
+            previews={resolvedLinkPreviews}
+          />
         </VideoReviewMarkdownContext.Provider>
       </MarkdownRuntimeContext.Provider>
     </div>
diff --git a/desktop/src/shared/ui/markdown/LinkPreviewImageLightbox.tsx b/desktop/src/shared/ui/markdown/LinkPreviewImageLightbox.tsx
new file mode 100644
index 00000000000..c689dd9efdd
--- /dev/null
+++ b/desktop/src/shared/ui/markdown/LinkPreviewImageLightbox.tsx
@@ -0,0 +1,118 @@
+import type { ComponentType } from "react";
+import { useRef, useState } from "react";
+
+import { cn } from "@/shared/lib/cn";
+import type { LinkPreviewImageLightboxProps } from "@/shared/ui/rich-link-preview-attachment";
+
+import {
+  type ImageGalleryItem,
+  type ImageLightboxBox,
+  type ImageLightboxCornerRadii,
+  imageLightboxBoxFromRect,
+  imageLightboxCornerRadiiFromElement,
+  visibleImageGalleryForTrigger,
+} from "./imageLightbox";
+
+type ImageZoomOverlayProps = {
+  alt: string | undefined;
+  galleryIndex?: number;
+  galleryItems?: ImageGalleryItem[];
+  onClose: () => void;
+  onCopy: (src: string | undefined) => void;
+  onDownload: (src: string | undefined) => void;
+  resolvedSrc: string;
+  sourceBox: ImageLightboxBox;
+  sourceCornerRadii: ImageLightboxCornerRadii;
+  sourceScope?: Element | null;
+  src: string | undefined;
+};
+
+const ignoreUnavailableImageAction = () => undefined;
+
+export function createLinkPreviewImageLightbox(
+  ImageZoomOverlay: ComponentType<ImageZoomOverlayProps>,
+): ComponentType<LinkPreviewImageLightboxProps> {
+  return function LinkPreviewImageLightbox({ alt, children, className, src }) {
+    const [lightboxState, setLightboxState] = useState<{
+      galleryIndex: number;
+      galleryItems?: ImageGalleryItem[];
+      sourceBox: ImageLightboxBox;
+      sourceCornerRadii: ImageLightboxCornerRadii;
+      sourceScope: Element | null;
+    } | null>(null);
+    const triggerRef = useRef<HTMLButtonElement | null>(null);
+
+    const openLightbox = () => {
+      const trigger = triggerRef.current;
+      const image = trigger?.querySelector("img");
+      if (!trigger || !image) return;
+
+      const rect = image.getBoundingClientRect();
+      if (rect.width <= 0 || rect.height <= 0) return;
+
+      const sourceBox = imageLightboxBoxFromRect(rect);
+      const sourceCornerRadii = imageLightboxCornerRadiiFromElement(image);
+      const sourceScope = trigger.closest("[data-link-preview-list]");
+      const dim =
+        image.naturalWidth > 0 && image.naturalHeight > 0
+          ? `${image.naturalWidth}x${image.naturalHeight}`
+          : undefined;
+      const gallery = visibleImageGalleryForTrigger(
+        trigger,
+        {
+          alt,
+          dim,
+          resolvedSrc: src,
+          src: undefined,
+          thumbnailBox: sourceBox,
+          thumbnailCornerRadii: sourceCornerRadii,
+        },
+        sourceScope,
+      );
+
+      setLightboxState({
+        galleryIndex: gallery.galleryIndex,
+        galleryItems: gallery.galleryItems,
+        sourceBox,
+        sourceCornerRadii,
+        sourceScope,
+      });
+    };
+
+    return (
+      <>
+        <button
+          aria-label={`Zoom image: ${alt}`}
+          className={cn(
+            "cursor-zoom-in border-0 p-0 text-left focus:outline-hidden focus-visible:ring-2 focus-visible:ring-ring/50",
+            lightboxState && "opacity-0",
+            className,
+          )}
+          data-image-lightbox-alt={alt}
+          data-image-lightbox-resolved-src={src}
+          data-image-lightbox-trigger=""
+          onClick={openLightbox}
+          ref={triggerRef}
+          type="button"
+        >
+          {children}
+        </button>
+        {lightboxState ? (
+          <ImageZoomOverlay
+            alt={alt}
+            galleryIndex={lightboxState.galleryIndex}
+            galleryItems={lightboxState.galleryItems}
+            onClose={() => setLightboxState(null)}
+            onCopy={ignoreUnavailableImageAction}
+            onDownload={ignoreUnavailableImageAction}
+            resolvedSrc={src}
+            sourceBox={lightboxState.sourceBox}
+            sourceCornerRadii={lightboxState.sourceCornerRadii}
+            sourceScope={lightboxState.sourceScope}
+            src={undefined}
+          />
+        ) : null}
+      </>
+    );
+  };
+}
diff --git a/desktop/src/shared/ui/markdown/imageLightbox.ts b/desktop/src/shared/ui/markdown/imageLightbox.ts
index 1c57cb9e5a9..4c0c01f93e5 100644
--- a/desktop/src/shared/ui/markdown/imageLightbox.ts
+++ b/desktop/src/shared/ui/markdown/imageLightbox.ts
@@ -316,9 +316,15 @@ function imageGalleryItemFromTrigger(
     return null;
   }
 
+  const image = trigger.querySelector("img");
+  const inferredDim =
+    image && image.naturalWidth > 0 && image.naturalHeight > 0
+      ? `${image.naturalWidth}x${image.naturalHeight}`
+      : undefined;
+
   return {
     alt: trigger.dataset.imageLightboxAlt || undefined,
-    dim: trigger.dataset.imageLightboxDim || undefined,
+    dim: trigger.dataset.imageLightboxDim || inferredDim,
     resolvedSrc,
     src: trigger.dataset.imageLightboxSrc || undefined,
     thumbnailBox: thumbnail?.box,
@@ -403,3 +409,25 @@ export function visibleImageGalleryForTrigger(
     galleryItems: galleryItems.length > 1 ? galleryItems : undefined,
   };
 }
+
+export function getImageLightboxFocusableElements(
+  container: HTMLElement,
+): HTMLElement[] {
+  return Array.from(
+    container.querySelectorAll<HTMLElement>(
+      [
+        "a[href]",
+        "button:not(:disabled)",
+        "input:not(:disabled)",
+        "select:not(:disabled)",
+        "textarea:not(:disabled)",
+        "[tabindex]:not([tabindex='-1'])",
+      ].join(","),
+    ),
+  ).filter(
+    (element) =>
+      !element.hasAttribute("disabled") &&
+      element.getAttribute("aria-hidden") !== "true" &&
+      element.getClientRects().length > 0,
+  );
+}
diff --git a/desktop/src/shared/ui/markdown/types.ts b/desktop/src/shared/ui/markdown/types.ts
index f736922f93e..20ecfc2e084 100644
--- a/desktop/src/shared/ui/markdown/types.ts
+++ b/desktop/src/shared/ui/markdown/types.ts
@@ -68,6 +68,11 @@ export type MarkdownProps = {
   mentionNames?: string[];
   mentionPubkeysByName?: Record<string, string>;
   mediaInset?: boolean;
+  /** Event/message identity used only for local preview-image visibility. */
+  messageId?: string;
+  linkPreviewsSuppressed?: boolean;
+  linkPreviewTags?: readonly (readonly string[])[];
+  onRemoveLinkPreviewsForEveryone?: () => Promise<void>;
   searchQuery?: string;
   /** Display name shown in shared-agent card metadata. */
   snapshotSharedBy?: string;
diff --git a/desktop/src/shared/ui/rich-link-preview-attachment.tsx b/desktop/src/shared/ui/rich-link-preview-attachment.tsx
new file mode 100644
index 00000000000..4d32aa1f123
--- /dev/null
+++ b/desktop/src/shared/ui/rich-link-preview-attachment.tsx
@@ -0,0 +1,350 @@
+import { ChevronDown, ChevronUp, ImageOff } from "lucide-react";
+import type { ComponentType, ReactNode } from "react";
+import { useState } from "react";
+
+import type { ResolvedLinkPreview } from "@/shared/lib/useResolvedLinkPreviews";
+import { cn } from "@/shared/lib/cn";
+import { LinkPreviewControls } from "@/shared/ui/link-preview-controls";
+
+export type LinkPreviewImageLightboxProps = {
+  alt: string;
+  children: ReactNode;
+  className?: string;
+  src: string;
+};
+
+export type LinkPreviewImageLightboxComponent =
+  ComponentType<LinkPreviewImageLightboxProps>;
+
+function LinkPreviewIdentity({ preview }: { preview: ResolvedLinkPreview }) {
+  if (preview.faviconDataUrl) {
+    return (
+      <img
+        alt=""
+        aria-hidden="true"
+        className="size-4 rounded-sm object-contain"
+        data-link-preview-favicon=""
+        src={preview.faviconDataUrl}
+      />
+    );
+  }
+  return null;
+}
+
+function getHostname(preview: ResolvedLinkPreview): string {
+  try {
+    return new URL(preview.href).hostname.replace(/^www\./, "");
+  } catch {
+    return preview.provider;
+  }
+}
+
+function isTweetPreview(preview: ResolvedLinkPreview): boolean {
+  try {
+    const url = new URL(preview.href);
+    return (
+      (url.hostname === "x.com" || url.hostname === "twitter.com") &&
+      /^\/[^/]+\/status\/\d+/.test(url.pathname)
+    );
+  } catch {
+    return false;
+  }
+}
+
+function LinkPreviewImage({
+  aspectClassName,
+  className,
+  ImageLightbox,
+  preview,
+}: {
+  aspectClassName: string;
+  className?: string;
+  ImageLightbox: LinkPreviewImageLightboxComponent;
+  preview: ResolvedLinkPreview;
+}) {
+  const imageSrc =
+    preview.imageState === "image" ? preview.imageDataUrl : undefined;
+  const [failedImageSrc, setFailedImageSrc] = useState<string | null>(null);
+  const imageFailed = Boolean(imageSrc && failedImageSrc === imageSrc);
+  const showFallback = preview.imageState === "fallback" || imageFailed;
+  const alt = `Preview from ${preview.imageDomain}`;
+
+  if (!imageSrc || imageFailed) {
+    return (
+      <div
+        className={cn("overflow-hidden rounded-xl bg-muted", className)}
+        data-link-preview-thumbnail=""
+      >
+        {showFallback ? (
+          <div
+            aria-hidden="true"
+            className={cn(
+              "flex w-full items-center justify-center bg-muted text-muted-foreground",
+              aspectClassName,
+            )}
+            data-link-preview-image-fallback=""
+          >
+            {preview.faviconDataUrl ? (
+              <img
+                alt=""
+                className="size-10 rounded-lg object-contain opacity-70"
+                src={preview.faviconDataUrl}
+              />
+            ) : (
+              <ImageOff className="size-7 opacity-60" />
+            )}
+          </div>
+        ) : (
+          <div
+            className={cn(
+              "w-full animate-pulse bg-muted-foreground/10",
+              aspectClassName,
+            )}
+            data-link-preview-skeleton=""
+          />
+        )}
+      </div>
+    );
+  }
+
+  return (
+    <ImageLightbox
+      alt={alt}
+      className={cn("block overflow-hidden rounded-xl bg-muted", className)}
+      src={imageSrc}
+    >
+      <div
+        className={cn("w-full", aspectClassName)}
+        data-link-preview-thumbnail=""
+      >
+        <img
+          alt={alt}
+          className="h-full w-full rounded-xl object-cover"
+          onError={() => setFailedImageSrc(imageSrc)}
+          src={imageSrc}
+        />
+      </div>
+    </ImageLightbox>
+  );
+}
+
+function LinkPreviewDescription({
+  className,
+  description,
+}: {
+  className?: string;
+  description: string;
+}) {
+  return (
+    <div
+      className={cn("mt-1 space-y-2 text-sm leading-5", className)}
+      data-slot="attachment-description"
+    >
+      {description.split(/\n{2,}/).map((paragraph) => (
+        <p className="whitespace-pre-line" key={paragraph}>
+          {paragraph}
+        </p>
+      ))}
+    </div>
+  );
+}
+
+function TweetPreview({
+  className,
+  ImageLightbox,
+  onRemove,
+  preview,
+  showControls,
+}: {
+  className?: string;
+  ImageLightbox: LinkPreviewImageLightboxComponent;
+  onRemove?: () => void;
+  preview: ResolvedLinkPreview;
+  showControls: boolean;
+}) {
+  const [contentExpanded, setContentExpanded] = useState(true);
+  const reserveImage = preview.imageState !== "none";
+  const hasExpandableContent = Boolean(preview.description) || reserveImage;
+  const hostname = getHostname(preview);
+
+  return (
+    <div
+      className={cn(
+        "relative w-lg max-w-full shrink-0 border-l-[3px] border-border py-1 pl-3",
+        className,
+      )}
+      data-image-state={preview.imageState}
+      data-link-preview={preview.kind}
+      data-tweet-preview=""
+    >
+      <a
+        className="block w-fit max-w-full truncate text-xs leading-4 text-muted-foreground/70 hover:underline"
+        data-link-preview-hostname=""
+        href={preview.href}
+        rel="noreferrer"
+        target="_blank"
+      >
+        {hostname}
+      </a>
+      <a
+        className="mt-0.5 line-clamp-2 whitespace-normal text-sm font-semibold leading-5 text-foreground hover:underline"
+        href={preview.href}
+        rel="noreferrer"
+        target="_blank"
+      >
+        {preview.title}
+      </a>
+      {contentExpanded && preview.description ? (
+        <LinkPreviewDescription
+          className="text-foreground"
+          description={preview.description}
+        />
+      ) : null}
+      {contentExpanded && reserveImage ? (
+        <LinkPreviewImage
+          aspectClassName="aspect-video"
+          className="mt-2 w-full max-w-96"
+          ImageLightbox={ImageLightbox}
+          preview={preview}
+        />
+      ) : null}
+      {hasExpandableContent ? (
+        <button
+          aria-expanded={contentExpanded}
+          className="mt-1 flex items-center gap-1 text-xs leading-4 text-muted-foreground hover:text-foreground"
+          onClick={() => setContentExpanded((expanded) => !expanded)}
+          type="button"
+        >
+          {contentExpanded ? (
+            <ChevronUp aria-hidden="true" className="size-3" />
+          ) : (
+            <ChevronDown aria-hidden="true" className="size-3" />
+          )}
+          {contentExpanded ? "Show less" : "Show more"}
+        </button>
+      ) : null}
+      {showControls ? (
+        <LinkPreviewControls onRemove={onRemove} placement="left" />
+      ) : null}
+    </div>
+  );
+}
+
+export function RichLinkPreviewAttachment({
+  className,
+  ImageLightbox,
+  onOpen,
+  onRemove,
+  preview,
+  showControls = false,
+}: {
+  className?: string;
+  ImageLightbox: LinkPreviewImageLightboxComponent;
+  onOpen?: () => void;
+  onRemove?: () => void;
+  preview: ResolvedLinkPreview;
+  showControls?: boolean;
+}) {
+  const [contentExpanded, setContentExpanded] = useState(true);
+
+  if (isTweetPreview(preview)) {
+    return (
+      <TweetPreview
+        className={className}
+        ImageLightbox={ImageLightbox}
+        onRemove={onRemove}
+        preview={preview}
+        showControls={showControls}
+      />
+    );
+  }
+
+  const reserveImage = preview.imageState !== "none";
+  const hasExpandableContent = Boolean(preview.description) || reserveImage;
+  const hostname = getHostname(preview);
+
+  return (
+    <div
+      className={cn(
+        "relative w-lg max-w-full shrink-0 border-l-[3px] border-border py-1 pl-3",
+        className,
+      )}
+      data-image-state={preview.imageState}
+      data-link-preview={preview.kind}
+      data-link-preview-inline=""
+    >
+      <div
+        className={cn(contentExpanded && reserveImage && "min-h-[3.875rem]")}
+      >
+        <a
+          className="flex w-fit max-w-full items-center gap-1.5 text-xs leading-4 text-muted-foreground/70 hover:underline"
+          data-link-preview-identity=""
+          data-link-preview-hostname=""
+          href={preview.href}
+          onClick={
+            onOpen
+              ? (event) => {
+                  event.preventDefault();
+                  onOpen();
+                }
+              : undefined
+          }
+          rel="noreferrer"
+          target="_blank"
+        >
+          <LinkPreviewIdentity preview={preview} />
+          <span className="truncate">{hostname}</span>
+        </a>
+        <a
+          aria-label={`Open ${preview.provider} ${preview.typeLabel}: ${preview.title}`}
+          className="mt-0.5 block text-sm font-semibold leading-5 text-foreground hover:underline"
+          href={preview.href}
+          onClick={
+            onOpen
+              ? (event) => {
+                  event.preventDefault();
+                  onOpen();
+                }
+              : undefined
+          }
+          rel="noreferrer"
+          target="_blank"
+        >
+          <span className="line-clamp-2">{preview.title}</span>
+        </a>
+        {contentExpanded && preview.description ? (
+          <LinkPreviewDescription
+            className="text-muted-foreground"
+            description={preview.description}
+          />
+        ) : null}
+      </div>
+      {contentExpanded && reserveImage ? (
+        <LinkPreviewImage
+          aspectClassName="aspect-[1.91/1]"
+          className="mt-2 w-full max-w-96"
+          ImageLightbox={ImageLightbox}
+          preview={preview}
+        />
+      ) : null}
+      {hasExpandableContent ? (
+        <button
+          aria-expanded={contentExpanded}
+          className="mt-1 flex items-center gap-1 text-xs leading-4 text-muted-foreground hover:text-foreground"
+          onClick={() => setContentExpanded((expanded) => !expanded)}
+          type="button"
+        >
+          {contentExpanded ? (
+            <ChevronUp aria-hidden="true" className="size-3" />
+          ) : (
+            <ChevronDown aria-hidden="true" className="size-3" />
+          )}
+          {contentExpanded ? "Show less" : "Show more"}
+        </button>
+      ) : null}
+      {showControls ? (
+        <LinkPreviewControls onRemove={onRemove} placement="left" />
+      ) : null}
+    </div>
+  );
+}
diff --git a/desktop/src/shared/ui/videoReviewTimecode.test.mjs b/desktop/src/shared/ui/videoReviewTimecode.test.mjs
new file mode 100644
index 00000000000..40c11ebde42
--- /dev/null
+++ b/desktop/src/shared/ui/videoReviewTimecode.test.mjs
@@ -0,0 +1,22 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { parseVideoReviewTimecode } from "./videoReviewTimecode.ts";
+
+test("parseVideoReviewTimecode extracts supported leading timecodes", () => {
+  assert.deepEqual(parseVideoReviewTimecode("[00:10.7] Tighten **this** cut"), {
+    seconds: 10.7,
+    text: "Tighten **this** cut",
+    timecode: "00:10.7",
+  });
+  assert.deepEqual(parseVideoReviewTimecode("[1:02:03] Long-form note"), {
+    seconds: 3723,
+    text: "Long-form note",
+    timecode: "1:02:03",
+  });
+});
+
+test("parseVideoReviewTimecode ignores ordinary bracketed markdown", () => {
+  assert.equal(parseVideoReviewTimecode("[docs](https://example.com)"), null);
+  assert.equal(parseVideoReviewTimecode("Comment at [00:10]"), null);
+});
diff --git a/desktop/src/shared/ui/videoReviewTimecode.ts b/desktop/src/shared/ui/videoReviewTimecode.ts
new file mode 100644
index 00000000000..6b097323c12
--- /dev/null
+++ b/desktop/src/shared/ui/videoReviewTimecode.ts
@@ -0,0 +1,41 @@
+export type VideoReviewTimecode = {
+  seconds: number;
+  text: string;
+  timecode: string;
+};
+
+const TIMECODE_RE =
+  /^\s*\[((?:(?:\d{1,2}:)?\d{1,2}:)?\d{2}(?:\.\d{1,3})?)\]\s*/;
+
+function parseTimecode(value: string): number | null {
+  const parts = value.split(":").map((part) => Number(part));
+  if (parts.some((part) => !Number.isFinite(part) || part < 0)) {
+    return null;
+  }
+
+  if (parts.length === 2) {
+    return parts[0] * 60 + parts[1];
+  }
+
+  if (parts.length === 3) {
+    return parts[0] * 3600 + parts[1] * 60 + parts[2];
+  }
+
+  return null;
+}
+
+export function parseVideoReviewTimecode(
+  content: string,
+): VideoReviewTimecode | null {
+  const match = content.match(TIMECODE_RE);
+  if (!match) return null;
+
+  const seconds = parseTimecode(match[1]);
+  if (seconds === null) return null;
+
+  return {
+    seconds,
+    text: content.slice(match[0].length).trim(),
+    timecode: match[1],
+  };
+}
diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts
index 1987e00ff1b..6961488fefa 100644
--- a/desktop/src/testing/e2eBridge.ts
+++ b/desktop/src/testing/e2eBridge.ts
@@ -62,6 +62,10 @@ import type {
   RuntimeFileConfigSubset,
 } from "@/shared/api/tauri";
 import { normalizePubkey } from "@/shared/lib/pubkey";
+import {
+  isValidLinkPreviewSnapshotCanonicalUrl,
+  parseLinkPreviewSnapshots,
+} from "@/shared/lib/linkPreviewSnapshot";
 
 type TestIdentity = {
   privateKey: string;
@@ -335,6 +339,32 @@ type E2eConfig = {
     profileHasEvent?: boolean;
     profileUpdateError?: string;
     profileUpdateErrors?: string[];
+    linkPreviewMetadata?: {
+      title: string;
+      siteName: string | null;
+      description: string | null;
+      imageDataUrl: string | null;
+      imageDomain: string | null;
+      imageFetchState?: "none" | "image" | "transient_failure" | "rejected";
+      imageRetryAfterMs?: number | null;
+      faviconDataUrl?: string | null;
+    } | null;
+    linkPreviewMetadataByHref?: Record<
+      string,
+      {
+        title: string;
+        siteName: string | null;
+        description: string | null;
+        imageDataUrl: string | null;
+        imageDomain: string | null;
+        imageFetchState?: "none" | "image" | "transient_failure" | "rejected";
+        imageRetryAfterMs?: number | null;
+        faviconDataUrl?: string | null;
+      } | null
+    >;
+    linkPreviewMetadataDelayMs?: number;
+    /** Simulates native cold-cache startup work before the async response. */
+    linkPreviewMetadataStartBlockMs?: number;
     searchProfiles?: MockSearchProfileSeed[];
     updateAvailable?: boolean;
     updateChannelDelayMs?: number;
@@ -8912,12 +8942,30 @@ async function resolveMockUploadDescriptorForBytes(
     value.toString(16).padStart(2, "0"),
   ).join("");
   const filename = args.filename ?? "upload.bin";
-  const isAgentJson = filename.toLowerCase().endsWith(".agent.json");
+  const normalizedFilename = filename.toLowerCase();
+  const isAgentJson = normalizedFilename.endsWith(".agent.json");
+  const extension = isAgentJson
+    ? "json"
+    : normalizedFilename.endsWith(".png")
+      ? "png"
+      : normalizedFilename.endsWith(".jpg") ||
+          normalizedFilename.endsWith(".jpeg")
+        ? "jpg"
+        : normalizedFilename.endsWith(".gif")
+          ? "gif"
+          : normalizedFilename.endsWith(".webp")
+            ? "webp"
+            : "bin";
+  const type = isAgentJson
+    ? "application/json"
+    : extension === "bin"
+      ? "application/octet-stream"
+      : `image/${extension === "jpg" ? "jpeg" : extension}`;
   return {
-    url: `https://mock.relay/media/${sha256}${isAgentJson ? ".json" : ".bin"}`,
+    url: `${getRelayHttpUrl(config)}/media/${sha256}.${extension}`,
     sha256,
     size: bytes.length,
-    type: isAgentJson ? "application/json" : "application/octet-stream",
+    type,
     uploaded: Math.floor(Date.now() / 1000),
     filename,
   };
@@ -8933,6 +8981,8 @@ async function handleSendChannelMessage(
     mediaTags?: string[][] | null;
     emojiTags?: string[][] | null;
     mentionTags?: string[][] | null;
+    linkPreviewTags?: string[][] | null;
+    suppressLinkPreviews?: boolean;
   },
   config: E2eConfig | undefined,
 ): Promise<RawSendChannelMessageResponse> {
@@ -8955,7 +9005,44 @@ async function handleSendChannelMessage(
   // Reference-only mentions are already part of the outbound event. Preserve
   // them in the mock event too so local echoes match the complete sent tag set.
   const mentionTags = args.mentionTags ?? [];
-  const extraTags = [...mediaTags, ...emojiTags, ...mentionTags];
+  // Sender-authored link preview snapshots are independently validated by the
+  // real command and echoed on the stored event. Preserve them in the mock so
+  // E2E recipient rendering exercises the same authored-snapshot path.
+  const linkPreviewTags = args.linkPreviewTags ?? [];
+  if (linkPreviewTags.length > 0) {
+    const suppression = linkPreviewTags.some(
+      (tag) =>
+        tag.length === 2 && tag[0] === "link-preview" && tag[1] === "none",
+    );
+    const snapshots = linkPreviewTags.filter(
+      (tag) => tag[0] === "link-preview" && tag[1] === "snapshot",
+    );
+    const validSnapshots = parseLinkPreviewSnapshots(
+      snapshots,
+      args.content,
+      new URL(getRelayHttpUrl(config)).origin,
+    );
+    if (
+      (suppression && linkPreviewTags.length !== 1) ||
+      (!suppression &&
+        (snapshots.length !== linkPreviewTags.length ||
+          validSnapshots.length !== snapshots.length ||
+          snapshots.some(
+            (tag) => !isValidLinkPreviewSnapshotCanonicalUrl(tag[3] ?? ""),
+          )))
+    ) {
+      throw new Error("invalid link-preview snapshot tag");
+    }
+  }
+  // All independently validated kinds end up on the stored event's tag set,
+  // just like the real relay.
+  const extraTags = [
+    ...mediaTags,
+    ...emojiTags,
+    ...mentionTags,
+    ...linkPreviewTags,
+    ...(args.suppressLinkPreviews ? [["link-preview", "none"]] : []),
+  ];
   const identity = getIdentity(config);
   if (!identity) {
     const createdAt = Math.floor(Date.now() / 1000);
@@ -11122,6 +11209,26 @@ export function maybeInstallE2eTauriMocks() {
         return;
       case "fetch_join_policy":
         return activeConfig?.mock?.joinPolicy ?? null;
+      case "fetch_link_preview_metadata": {
+        const startBlockMs =
+          activeConfig?.mock?.linkPreviewMetadataStartBlockMs ?? 0;
+        if (startBlockMs > 0) {
+          const stopAt = performance.now() + startBlockMs;
+          while (performance.now() < stopAt) {
+            // Deliberately block to model uncached native command startup.
+          }
+        }
+        const delayMs = activeConfig?.mock?.linkPreviewMetadataDelayMs ?? 0;
+        if (delayMs > 0) {
+          await new Promise((resolve) => window.setTimeout(resolve, delayMs));
+        }
+        const href = (payload as { href?: string }).href;
+        const metadataByHref = activeConfig?.mock?.linkPreviewMetadataByHref;
+        if (href && metadataByHref && Object.hasOwn(metadataByHref, href)) {
+          return metadataByHref[href];
+        }
+        return activeConfig?.mock?.linkPreviewMetadata ?? null;
+      }
       case "apply_workspace": {
         const applyDelayMs = activeConfig?.mock?.applyCommunityDelayMs ?? 0;
         if (applyDelayMs > 0) {
@@ -12502,7 +12609,7 @@ export function maybeInstallE2eTauriMocks() {
         return null;
       case "edit_message":
         return handleEditMessage(
-          payload as Parameters<typeof handleEditMessage>[0],
+          (payload as { input: Parameters<typeof handleEditMessage>[0] }).input,
           activeConfig,
         );
       case "add_reaction":
@@ -12763,9 +12870,20 @@ export function maybeInstallE2eTauriMocks() {
         }
         return "nostrpair://8f4b8db31967ce14fef970a1ff1e8eecf19a430aa1c83875e2f5be68dcac0f1a?relay=wss%3A%2F%2Frelay.example.com&secret=87d5a8cfd5807a0cb44f728b67d88d6dcb8daf99be137c158f21a50c1e913c0a&v=1";
       }
+      case "start_identity_recovery_pairing": {
+        const delayMs = activeConfig?.mock?.pairingStartDelayMs ?? 0;
+        if (delayMs > 0) {
+          await new Promise((resolve) => window.setTimeout(resolve, delayMs));
+        }
+        return `nostrpair://8f4b8db31967ce14fef970a1ff1e8eecf19a430aa1c83875e2f5be68dcac0f1a?relay=wss%3A%2F%2Frelay.example.com&secret=87d5a8cfd5807a0cb44f728b67d88d6dcb8daf99be137c158f21a50c1e913c0a&v=1&mode=recover`;
+      }
       case "cancel_pairing":
       case "confirm_pairing_sas":
         return null;
+      case "complete_identity_recovery_pairing":
+        mockIdentityLostCleared = true;
+        await emit("pairing-complete", {});
+        return null;
       // ── NIP-IA identity archival ────────────────────────────────────────
       // These mocks drive the archive-button gate matrix in
       // tests/e2e/identity-archive.spec.ts. Defaults keep the button hidden
diff --git a/desktop/tests/e2e/agent-readiness-screenshots.spec.ts b/desktop/tests/e2e/agent-readiness-screenshots.spec.ts
index a92efcd40a3..75e400d4a59 100644
--- a/desktop/tests/e2e/agent-readiness-screenshots.spec.ts
+++ b/desktop/tests/e2e/agent-readiness-screenshots.spec.ts
@@ -18,7 +18,6 @@ async function openCreateDialog(page: import("@playwright/test").Page) {
   await page.goto("/");
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create agent" }).click();
   await page.locator("#persona-display-name").fill("Test Agent");
 }
 
diff --git a/desktop/tests/e2e/agents.spec.ts b/desktop/tests/e2e/agents.spec.ts
index 3cbe097c054..66f9e4e707a 100644
--- a/desktop/tests/e2e/agents.spec.ts
+++ b/desktop/tests/e2e/agents.spec.ts
@@ -67,9 +67,6 @@ async function gotoApp(page: import("@playwright/test").Page) {
 
 async function openPersonaCatalog(page: import("@playwright/test").Page) {
   await page.getByTestId("new-agent-card").click();
-  await page
-    .getByRole("menuitem", { exact: true, name: "Discover agents" })
-    .click();
 }
 
 async function getCatalogOrder(page: import("@playwright/test").Page) {
@@ -239,10 +236,8 @@ test("catalog hides built-ins and shows the shared-agent empty state", async ({
   }
   await expect(page.getByTestId("persona-catalog-dialog-header")).toBeVisible();
   await expect(page.getByTestId("persona-catalog-dialog-body")).toBeVisible();
-  const emptyState = page.getByTestId("persona-catalog-empty-state");
-  await expect(emptyState).toContainText("No agents are being shared");
   await expect(
-    emptyState.getByTestId("persona-catalog-empty-agent-artwork"),
+    page.getByText("No shared agents", { exact: true }),
   ).toBeVisible();
   await expect(
     page.locator('[data-testid^="persona-catalog-list-item-"]'),
@@ -267,7 +262,9 @@ test("catalog empty state remains available after reopening", async ({
   await gotoApp(page);
   await page.getByTestId("open-agents-view").click();
   await openPersonaCatalog(page);
-  await expect(page.getByTestId("persona-catalog-empty-state")).toBeVisible();
+  await expect(
+    page.getByText("No shared agents", { exact: true }),
+  ).toBeVisible();
 
   await page
     .getByTestId("persona-catalog-dialog")
@@ -275,9 +272,9 @@ test("catalog empty state remains available after reopening", async ({
     .click();
   await expect(page.getByTestId("persona-catalog-dialog")).not.toBeVisible();
   await openPersonaCatalog(page);
-  await expect(page.getByTestId("persona-catalog-empty-state")).toContainText(
-    "No agents are being shared",
-  );
+  await expect(
+    page.getByText("No shared agents", { exact: true }),
+  ).toBeVisible();
 });
 
 test("built-in persona edits persist", async ({ page }) => {
@@ -319,9 +316,6 @@ test("searches agent avatar emoji with focus on open", async ({ page }) => {
   await gotoApp(page);
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page
-    .getByRole("menuitem", { exact: true, name: "Create agent" })
-    .click();
 
   await expect(page.getByTestId("persona-dialog")).toBeVisible();
   await page.getByLabel("Add avatar").click();
@@ -346,9 +340,6 @@ test("agent avatar emoji picker scrolls inside its popover", async ({
   await gotoApp(page);
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page
-    .getByRole("menuitem", { exact: true, name: "Create agent" })
-    .click();
 
   await expect(page.getByTestId("persona-dialog")).toBeVisible();
   await page.getByLabel("Add avatar").click();
@@ -385,7 +376,7 @@ test("agent avatar emoji picker scrolls inside its popover", async ({
     .toBeGreaterThan(before);
 });
 
-test("the new agent card offers create, discover, and import", async ({
+test("the new agent card opens unified create, catalog, and import flows", async ({
   page,
 }) => {
   await installMockBridge(page, {
@@ -396,6 +387,11 @@ test("the new agent card offers create, discover, and import", async ({
         displayName: "Code Reviewer",
         systemPrompt: "Review code changes.",
       },
+      {
+        id: "custom:layout-auditor",
+        displayName: "Layout Auditor",
+        systemPrompt: "Review responsive layouts.",
+      },
     ],
   });
   await gotoApp(page);
@@ -420,6 +416,9 @@ test("the new agent card offers create, discover, and import", async ({
     }),
   );
   const firstRowTop = Math.min(...cardBoxes.map(({ top }) => top));
+  expect(
+    cardBoxes.filter(({ top }) => Math.abs(top - firstRowTop) < 1),
+  ).toHaveLength(5);
   const rightmostFirstRowCard = Math.max(
     ...cardBoxes
       .filter(({ top }) => Math.abs(top - firstRowTop) < 1)
@@ -437,27 +436,12 @@ test("the new agent card offers create, discover, and import", async ({
   );
 
   await newAgentCard.click();
-  await expect(
-    page.getByRole("menuitem", { exact: true, name: "Create agent" }),
-  ).toBeVisible();
-  await expect(
-    page.getByRole("menuitem", { exact: true, name: "Discover agents" }),
-  ).toBeVisible();
-  await expect(
-    page.getByRole("menuitem", { exact: true, name: "Import" }),
-  ).toBeVisible();
-  await page
-    .getByRole("menuitem", { exact: true, name: "Discover agents" })
-    .click();
-  await expect(page.getByTestId("persona-catalog-dialog")).toBeVisible();
-  await page
-    .getByTestId("persona-catalog-dialog")
-    .getByRole("button", { name: "Close" })
-    .click();
-  await newAgentCard.click();
-  await page
-    .getByRole("menuitem", { exact: true, name: "Create agent" })
-    .click();
+  const catalogDialog = page.getByTestId("persona-catalog-dialog");
+  await expect(catalogDialog).toBeVisible();
+  await expect(page.getByTestId("agent-catalog-create")).toHaveAttribute(
+    "aria-current",
+    "true",
+  );
 
   const dialog = page.getByTestId("persona-dialog");
   await expect(dialog).toBeVisible();
@@ -466,10 +450,10 @@ test("the new agent card offers create, discover, and import", async ({
   ).toHaveCount(0);
   await expect(dialog).not.toContainText("Enter a name for this agent.");
 
-  await dialog.getByRole("button", { name: "Cancel" }).click();
-  await newAgentCard.click();
+  await page.getByTestId("agent-catalog-import").click();
+  await expect(page.getByTestId("agent-catalog-import-dropzone")).toBeVisible();
   const fileChooserPromise = page.waitForEvent("filechooser");
-  await page.getByRole("menuitem", { exact: true, name: "Import" }).click();
+  await page.getByTestId("agent-catalog-import-dropzone").click();
   const fileChooser = await fileChooserPromise;
   await fileChooser.setFiles({
     buffer: Buffer.from("{}"),
@@ -479,6 +463,31 @@ test("the new agent card offers create, discover, and import", async ({
   await expect(page.getByTestId("agent-snapshot-import-dialog")).toBeVisible();
 });
 
+test("embedded create keeps its draft when discard is cancelled", async ({
+  page,
+}) => {
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+  await page.getByTestId("new-agent-card").click();
+
+  const dialog = page.getByTestId("persona-dialog");
+  const name = dialog.locator("#persona-display-name");
+  const instructions = dialog.locator("#persona-system-prompt");
+  await name.fill("Draft Keeper");
+  await instructions.fill("Preserve this draft through confirmation.");
+
+  await dialog.getByRole("button", { name: "Cancel" }).click();
+  const discardDialog = page.getByTestId("discard-create-agent-dialog");
+  await expect(discardDialog).toBeVisible();
+  await discardDialog.getByRole("button", { name: "Keep editing" }).click();
+
+  await expect(dialog).toBeVisible();
+  await expect(name).toHaveValue("Draft Keeper");
+  await expect(instructions).toHaveValue(
+    "Preserve this draft through confirmation.",
+  );
+});
+
 test("the new team card offers create and import", async ({ page }) => {
   await gotoApp(page);
   await page.getByTestId("open-agents-view").click();
@@ -542,12 +551,12 @@ test("team cards follow the agents grid alignment at compact widths", async ({
   await agentsContent.evaluate((element) => {
     (element as HTMLElement).style.width = "600px";
   });
-  await expect
-    .poll(async () => (await firstAgentGridCard.boundingBox())?.x ?? 0)
-    .toBeGreaterThan(wideAgentBox?.x ?? 0);
-
   const compactAgentBox = await firstAgentGridCard.boundingBox();
   const compactTeamBox = await firstTeamGridCard.boundingBox();
+  expect(compactAgentBox?.width ?? 0).toBeLessThan(wideAgentBox?.width ?? 0);
+  expect(
+    Math.abs((compactAgentBox?.width ?? 0) - (compactTeamBox?.width ?? 0)),
+  ).toBeLessThan(1);
   expect(
     Math.abs((compactAgentBox?.x ?? 0) - (compactTeamBox?.x ?? 0)),
   ).toBeLessThan(1);
@@ -1675,7 +1684,9 @@ test("a foreign reader does not receive an unshared kind 30175 persona", async (
   await expect(
     page.getByTestId(`persona-catalog-list-item-${remoteCatalogId}`),
   ).toHaveCount(0);
-  await expect(page.getByTestId("persona-catalog-empty-state")).toBeVisible();
+  await expect(
+    page.getByText("No shared agents", { exact: true }),
+  ).toBeVisible();
 });
 
 test("a catalog entry keeps the owner's emoji avatar", async ({ page }) => {
@@ -2437,6 +2448,100 @@ test("personas referenced by teams cannot be deleted", async ({ page }) => {
   );
 });
 
+test("start pill morphs into the running dot without remounting the avatar", async ({
+  page,
+}) => {
+  const personaId = "custom:motion-auditor";
+  const pubkey = "ab".repeat(32);
+  const activeDotSize = 18;
+  await page.emulateMedia({ reducedMotion: "no-preference" });
+  await installMockBridge(page, {
+    personas: [
+      {
+        avatarUrl: emojiAvatarDataUrl("✨", "#7657FF"),
+        displayName: "Motion Auditor",
+        id: personaId,
+        systemPrompt: "You audit motion continuity.",
+      },
+    ],
+    managedAgents: [
+      {
+        name: "Motion Auditor",
+        personaId,
+        pubkey,
+        status: "stopped",
+      },
+    ],
+  });
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+
+  const card = page.getByTestId(`persona-agent-row-${personaId}`);
+  const startButton = page.getByTestId(`agent-runtime-start-${pubkey}`);
+  const badge = startButton.locator("xpath=../..");
+  const initialAvatar = await card
+    .getByAltText("Motion Auditor avatar")
+    .elementHandle();
+  expect(initialAvatar).not.toBeNull();
+
+  const samplesPromise = badge.evaluate(async (element) => {
+    const samples: Array<{
+      backgroundColor: string;
+      height: number;
+      width: number;
+    }> = [];
+    const startedAt = performance.now();
+
+    while (performance.now() - startedAt < 440) {
+      const bounds = element.getBoundingClientRect();
+      samples.push({
+        backgroundColor: getComputedStyle(element).backgroundColor,
+        height: bounds.height,
+        width: bounds.width,
+      });
+      await new Promise<void>((resolve) =>
+        requestAnimationFrame(() => resolve()),
+      );
+    }
+
+    return samples;
+  });
+
+  await page.waitForTimeout(32);
+  await startButton.click();
+  await expect(
+    page.getByTestId(`agent-runtime-active-${pubkey}`),
+  ).toBeVisible();
+  const samples = await samplesPromise;
+  const finalAvatar = await card
+    .getByAltText("Motion Auditor avatar")
+    .elementHandle();
+
+  expect(samples[0]?.width).toBeCloseTo(56, 0);
+  expect(samples[0]?.height).toBeCloseTo(36, 0);
+  expect(
+    samples.some(
+      (sample) =>
+        sample.width > activeDotSize &&
+        sample.width < 56 &&
+        sample.height > activeDotSize &&
+        sample.height < 36,
+    ),
+  ).toBe(true);
+  expect(samples.at(-1)?.width).toBeCloseTo(activeDotSize, 0);
+  expect(samples.at(-1)?.height).toBeCloseTo(activeDotSize, 0);
+  expect(samples.at(-1)?.backgroundColor).not.toBe(samples[0]?.backgroundColor);
+  await expect(
+    page.getByTestId(`agent-runtime-active-${pubkey}`).locator("xpath=../.."),
+  ).toHaveClass(/bg-emerald-500/);
+  expect(
+    await initialAvatar?.evaluate(
+      (before, after) => before === after,
+      finalAvatar,
+    ),
+  ).toBe(true);
+});
+
 test("duplicate instances move from the agents gallery into the agent profile", async ({
   page,
 }) => {
diff --git a/desktop/tests/e2e/channel-controls.spec.ts b/desktop/tests/e2e/channel-controls.spec.ts
index ff88ecbf62d..0e671a70681 100644
--- a/desktop/tests/e2e/channel-controls.spec.ts
+++ b/desktop/tests/e2e/channel-controls.spec.ts
@@ -3,7 +3,8 @@ import { expect, test } from "@playwright/test";
 import { installMockBridge } from "../helpers/bridge";
 
 // `general` seeds the mock identity as owner, so the owner/admin-gated
-// visibility + ephemeral controls are live and interactive.
+// visibility + ephemeral controls are editable. Visibility is a deferred
+// draft: selecting a value only updates local state; it persists on Save.
 async function openManagementSheet(page: import("@playwright/test").Page) {
   await page.goto("/");
   await page.getByTestId("channel-general").click();
@@ -83,7 +84,7 @@ test.describe("channel controls", () => {
     await settle(page);
   });
 
-  test("02 — visibility updates immediately", async ({ page }) => {
+  test("02 — visibility defers to Save", async ({ page }) => {
     await installMockBridge(page, { updateChannelDelayMs: 500 });
     await openManagementSheet(page);
     await openEditDialog(page);
@@ -91,20 +92,34 @@ test.describe("channel controls", () => {
     const lifecycle = page.getByTestId("channel-management-lifecycle");
     await lifecycle.scrollIntoViewIfNeeded();
     const permissions = page.getByTestId("channel-management-permissions");
+
+    // Save starts disabled with no pending edits.
+    await expect(
+      page.getByTestId("channel-management-save-changes"),
+    ).toBeDisabled();
+
+    // Selecting a visibility only updates the local draft: the dialog title
+    // reflects the pending choice and Save becomes enabled, but nothing is
+    // persisted yet (no "Updating…" state).
     await permissions.click();
     await page
       .getByTestId("channel-management-permissions-option-private")
       .click();
-    await expect(permissions).toHaveAttribute("aria-busy", "true");
-    await expect(permissions).toContainText("Updating…");
     await expect(
       page.getByRole("dialog", { name: "Edit private channel" }),
     ).toBeVisible();
     await expect(permissions).toHaveAccessibleName("Visibility: Private");
+    await expect(permissions).not.toHaveAttribute("aria-busy", "true");
     await expect(
       page.getByTestId("channel-management-save-changes"),
-    ).toBeDisabled();
+    ).toBeEnabled();
+    // Wait for the dropdown to fully close before reopening it, so the
+    // trigger stays mounted/stable for the next interaction.
+    await expect(
+      page.getByTestId("channel-management-permissions-option-private"),
+    ).toHaveCount(0);
 
+    // Toggling back to the original value clears the draft and disables Save.
     await permissions.click();
     await page
       .getByTestId("channel-management-permissions-option-open")
@@ -116,6 +131,36 @@ test.describe("channel controls", () => {
     await expect(
       page.getByTestId("channel-management-save-changes"),
     ).toBeDisabled();
+    await expect(
+      page.getByTestId("channel-management-permissions-option-open"),
+    ).toHaveCount(0);
+
+    // Choose Private again and commit via Save.
+    await permissions.click();
+    await page
+      .getByTestId("channel-management-permissions-option-private")
+      .click();
+    await expect(
+      page.getByTestId("channel-management-save-changes"),
+    ).toBeEnabled();
+    await page.getByTestId("channel-management-save-changes").click();
+    await expect(
+      page.getByTestId("channel-management-save-changes"),
+    ).toHaveText("Saving...");
+    await expect(
+      page.getByRole("dialog", {
+        name: /Edit (?:public|private) channel/,
+      }),
+    ).toHaveCount(0);
+
+    // Reopen to confirm the visibility change persisted.
+    await openEditDialog(page);
+    await expect(
+      page.getByRole("dialog", { name: "Edit private channel" }),
+    ).toBeVisible();
+    await expect(
+      page.getByTestId("channel-management-permissions"),
+    ).toHaveAccessibleName("Visibility: Private");
     await settle(page);
   });
 
@@ -272,6 +317,13 @@ test.describe("channel controls", () => {
     await page
       .getByRole("textbox", { name: "Description" })
       .fill("This description should be discarded");
+    await page.getByTestId("channel-management-permissions").click();
+    await page
+      .getByTestId("channel-management-permissions-option-private")
+      .click();
+    await expect(
+      page.getByRole("dialog", { name: "Edit private channel" }),
+    ).toBeVisible();
     await selectTemporaryChannelType(page);
     await expect(
       page.getByTestId("channel-management-save-changes"),
@@ -291,6 +343,12 @@ test.describe("channel controls", () => {
     await expect(
       page.getByRole("textbox", { name: "Description" }),
     ).toHaveValue("General discussion for everyone");
+    await expect(
+      page.getByRole("dialog", { name: "Edit public channel" }),
+    ).toBeVisible();
+    await expect(
+      page.getByTestId("channel-management-permissions"),
+    ).toHaveAccessibleName("Visibility: Public");
     await expect(
       page.getByTestId("channel-management-channel-type"),
     ).toContainText("Ongoing");
@@ -302,7 +360,7 @@ test.describe("channel controls", () => {
     ).toBeDisabled();
   });
 
-  test("10 — stale visibility updates do not affect a new channel", async ({
+  test("10 — unsaved visibility draft does not leak to a new channel", async ({
     page,
   }) => {
     await installMockBridge(page, { updateChannelDelayMs: 1_500 });
@@ -314,7 +372,10 @@ test.describe("channel controls", () => {
     await page
       .getByTestId("channel-management-permissions-option-private")
       .click();
-    await expect(permissions).toHaveAttribute("aria-busy", "true");
+    // Draft only — never saved. The dialog title reflects the pending choice.
+    await expect(
+      page.getByRole("dialog", { name: "Edit private channel" }),
+    ).toBeVisible();
 
     const agentsChannelId = await page
       .getByTestId("channel-agents")
@@ -335,14 +396,12 @@ test.describe("channel controls", () => {
       window.dispatchEvent(new PopStateEvent("popstate"));
     }, agentsChannelId);
     await expect(page.getByTestId("chat-title")).toHaveText("agents");
-    await expect(
-      page.getByRole("dialog", { name: "Edit public channel" }),
-    ).toBeVisible();
 
-    await expect(permissions).toHaveAttribute("aria-busy", "false");
-    await expect(permissions).toHaveAccessibleName("Visibility: Public");
+    // The unsaved draft must not carry over: the new channel re-syncs from
+    // server state and shows its own (public) visibility.
     await expect(
       page.getByRole("dialog", { name: "Edit public channel" }),
     ).toBeVisible();
+    await expect(permissions).toHaveAccessibleName("Visibility: Public");
   });
 });
diff --git a/desktop/tests/e2e/channels.spec.ts b/desktop/tests/e2e/channels.spec.ts
index d58c3303dfb..13c6d5504a8 100644
--- a/desktop/tests/e2e/channels.spec.ts
+++ b/desktop/tests/e2e/channels.spec.ts
@@ -3774,7 +3774,7 @@ test("channel header actions show tooltips", async ({ page }) => {
   }
 });
 
-test("members sidebar collapses same-persona managed agents", async ({
+test("members sidebar retains distinct same-persona managed agents", async ({
   page,
 }) => {
   const inChannelAgentPubkey =
@@ -3824,8 +3824,8 @@ test("members sidebar collapses same-persona managed agents", async ({
   ).toHaveCount(0);
   await expect(
     page.getByTestId(`channel-user-search-result-${outOfChannelAgentPubkey}`),
-  ).toHaveCount(0);
-  await expect(page.getByText("Pinky", { exact: true })).toHaveCount(1);
+  ).toBeVisible();
+  await expect(page.getByText("Pinky", { exact: true })).toHaveCount(2);
 });
 
 test("private-channel members cannot add people without owner/admin", async ({
diff --git a/desktop/tests/e2e/composer-link-shortcut.spec.ts b/desktop/tests/e2e/composer-link-shortcut.spec.ts
index 81f8896f7db..43a6646f4c1 100644
--- a/desktop/tests/e2e/composer-link-shortcut.spec.ts
+++ b/desktop/tests/e2e/composer-link-shortcut.spec.ts
@@ -61,10 +61,11 @@ test("⌘K with caret inside an existing link opens the edit-link dialog", async
     "docs",
   );
 
-  // Click into the linked text to place the caret inside it, then re-trigger
-  // the shortcut. (The click also surfaces the composer link hover card —
-  // ⌘K must open the full dialog from that state.)
+  // Click into the linked text to place the caret inside it. This must not
+  // surface contextual controls; editing stays accessible through ⌘K.
   await input.locator('a[href="https://example.com"]').click();
+  await expect(page.getByRole("button", { name: "Edit link" })).toHaveCount(0);
+  await expect(page.getByRole("button", { name: "Unlink" })).toHaveCount(0);
   await page.keyboard.press("ControlOrMeta+k");
 
   const editDialog = page.getByRole("dialog", { name: "Edit link" });
diff --git a/desktop/tests/e2e/deep-link-invite.spec.ts b/desktop/tests/e2e/deep-link-invite.spec.ts
index 0b3ccb7b5a3..42c4f8ea9f3 100644
--- a/desktop/tests/e2e/deep-link-invite.spec.ts
+++ b/desktop/tests/e2e/deep-link-invite.spec.ts
@@ -8,7 +8,7 @@ import { seedActiveIdentity } from "../helpers/onboarding";
 // Invite claiming waits until setup finishes and the final identity is known.
 
 const DEFAULT_MOCK_PUBKEY = "deadbeef".repeat(8);
-const WELCOME_FAILURE_PUBKEY = TEST_IDENTITIES.tyler.pubkey;
+const COMMUNITY_ONBOARDING_PUBKEY = TEST_IDENTITIES.tyler.pubkey;
 const TRANSACTION_STORAGE_KEY = "buzz-community-onboarding-transaction.v1";
 const COMMUNITY_RELAY_URL = "wss://hive.example.com";
 
@@ -262,10 +262,11 @@ test("queued add-community links open and acknowledge one at a time", async ({
     ]);
 });
 
-test("Welcome failure retries once before allowing starter channel setup to be skipped", async ({
+test("deleted public starter channels do not strand community onboarding", async ({
   page,
 }) => {
-  const welcomeError = "Channel creation is not permitted.";
+  const starterError =
+    "starter channels created but metadata not yet available";
   await seedActiveIdentity(page, TEST_IDENTITIES.tyler);
   await page.addInitScript(
     ({ pubkey, relayUrl, storageKey }) => {
@@ -277,7 +278,7 @@ test("Welcome failure retries once before allowing starter channel setup to be s
       window.localStorage.setItem(
         storageKey,
         JSON.stringify({
-          id: "txn-welcome-failure-1",
+          id: "txn-deleted-starters-1",
           source: "deep-link-join",
           stage: "team-intro",
           relayUrl,
@@ -289,64 +290,24 @@ test("Welcome failure retries once before allowing starter channel setup to be s
       );
     },
     {
-      pubkey: WELCOME_FAILURE_PUBKEY,
+      pubkey: COMMUNITY_ONBOARDING_PUBKEY,
       relayUrl: COMMUNITY_RELAY_URL,
       storageKey: TRANSACTION_STORAGE_KEY,
     },
   );
   await installMockBridge(
     page,
-    { ensureStarterChannelsErrors: [welcomeError, welcomeError, welcomeError] },
+    { ensureStarterChannelsErrors: [starterError] },
     { relayWsUrl: COMMUNITY_RELAY_URL, skipOnboardingSeed: true },
   );
   await page.goto("/");
 
-  for (const name of ["fizz", "honey", "bumble"]) {
-    const character = page.getByTestId(`starter-persona-${name}`);
-    await expect(character).toBeVisible();
-    await expect(character).toHaveAttribute(
-      "src",
-      `/onboarding/starter-team/${name}.png`,
-    );
-  }
-
-  const enterButton = page.getByRole("button", { name: "Take me to Buzz" });
-  await enterButton.click();
-
-  await expect(page.getByText(`${welcomeError} Try again.`)).toBeVisible();
-  await expect(enterButton).toBeEnabled();
-  const backButton = page.getByRole("button", { name: "Back" });
-  await expect(backButton).toBeVisible();
-  await backButton.click();
-
-  await expect(
-    page.getByRole("heading", { name: "Build your profile" }),
-  ).toBeVisible();
-  await page.getByLabel("Community username").fill("Tyler");
-  await page.getByTestId("community-profile-next").click();
-
-  await enterButton.click();
-  await expect(page.getByText(`${welcomeError} Try again.`)).toBeVisible();
-  await expect(enterButton).toBeEnabled();
-
-  await enterButton.click();
-
-  const skipButton = page.getByRole("button", { name: "Skip for now" });
-  await expect(page.getByText(welcomeError, { exact: true })).toBeVisible();
-  await expect(skipButton).toBeEnabled();
-  await expect(page.getByRole("button", { name: "Back" })).toBeVisible();
-
-  const starterChannelAttempts = await page.evaluate(
-    () =>
-      window.__BUZZ_E2E_COMMANDS__?.filter(
-        (command) => command === "ensure_starter_channels",
-      ).length ?? 0,
-  );
-  expect(starterChannelAttempts).toBe(3);
-
-  await skipButton.click();
+  await page.getByRole("button", { name: "Take me to Buzz" }).click();
 
   await expect(page.getByTestId("community-onboarding-flow")).toHaveCount(0);
+  await expect(page).toHaveURL(/#\/channels\/[^/]+$/);
+  await expect(page.getByTestId("chat-title")).toContainText("Welcome");
+  await expect(page.getByText(starterError)).toHaveCount(0);
   expect(
     await page.evaluate(
       () =>
@@ -354,15 +315,56 @@ test("Welcome failure retries once before allowing starter channel setup to be s
           (command) => command === "ensure_starter_channels",
         ).length ?? 0,
     ),
-  ).toBe(3);
-  await expect
-    .poll(() =>
-      page.evaluate(
-        (transaction) => window.localStorage.getItem(transaction),
-        TRANSACTION_STORAGE_KEY,
-      ),
-    )
-    .toBeNull();
+  ).toBe(1);
+});
+
+test("required Welcome creation failure keeps community onboarding open", async ({
+  page,
+}) => {
+  const welcomeError = "Channel creation is not permitted.";
+  await seedActiveIdentity(page, TEST_IDENTITIES.tyler);
+  await page.addInitScript(
+    ({ pubkey, relayUrl, storageKey }) => {
+      window.localStorage.setItem(
+        `buzz-machine-onboarding-complete.v2:${pubkey}`,
+        "true",
+      );
+      const timestamp = new Date().toISOString();
+      window.localStorage.setItem(
+        storageKey,
+        JSON.stringify({
+          id: "txn-welcome-failure-1",
+          source: "deep-link-join",
+          stage: "team-intro",
+          relayUrl,
+          communityName: "hive",
+          communityId: "e2e-default-community",
+          createdAt: timestamp,
+          updatedAt: timestamp,
+        }),
+      );
+    },
+    {
+      pubkey: COMMUNITY_ONBOARDING_PUBKEY,
+      relayUrl: COMMUNITY_RELAY_URL,
+      storageKey: TRANSACTION_STORAGE_KEY,
+    },
+  );
+  await installMockBridge(
+    page,
+    { createChannelErrors: [welcomeError] },
+    { relayWsUrl: COMMUNITY_RELAY_URL, skipOnboardingSeed: true },
+  );
+  await page.goto("/");
+
+  await page.getByRole("button", { name: "Take me to Buzz" }).click();
+
+  await expect(page.getByTestId("community-onboarding-flow")).toBeVisible();
+  await expect(page.getByText(`${welcomeError} Try again.`)).toBeVisible();
+  await expect(
+    page.getByRole("button", { name: "Take me to Buzz" }),
+  ).toBeEnabled();
+  await expect(page.getByTestId("chat-title")).toHaveCount(0);
 });
 
 test("persisted deep-link invite hands off to Joining after machine onboarding", async ({
diff --git a/desktop/tests/e2e/edit-agent.spec.ts b/desktop/tests/e2e/edit-agent.spec.ts
index 4c4834b5526..e7fbe3d7bdc 100644
--- a/desktop/tests/e2e/edit-agent.spec.ts
+++ b/desktop/tests/e2e/edit-agent.spec.ts
@@ -89,7 +89,6 @@ test.describe("agent definition dialog", () => {
     await page.goto("/");
     await page.getByTestId("open-agents-view").click();
     await page.getByTestId("new-agent-card").click();
-    await page.getByRole("menuitem", { name: "Create agent" }).click();
 
     const dialog = page.getByRole("dialog");
     await dialog.getByRole("button", { name: "Advanced", exact: true }).click();
diff --git a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts
index 451989fb7f1..534ea36e706 100644
--- a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts
+++ b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts
@@ -32,7 +32,6 @@ async function openCreateDialog(page: import("@playwright/test").Page) {
   await page.goto("/");
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create agent" }).click();
   await page.locator("#persona-display-name").fill("Test Agent");
 }
 
@@ -713,7 +712,6 @@ test.describe("global agent config screenshots", () => {
     await page.goto("/");
     await page.getByTestId("open-agents-view").click();
     await page.getByTestId("new-agent-card").click();
-    await page.getByRole("menuitem", { name: "Create agent" }).click();
 
     await expect(page.getByTestId("persona-dialog-submit")).toBeDisabled({
       timeout: 10_000,
diff --git a/desktop/tests/e2e/identity-lost.spec.ts b/desktop/tests/e2e/identity-lost.spec.ts
index 71c663ab4ff..2ab41cb52d3 100644
--- a/desktop/tests/e2e/identity-lost.spec.ts
+++ b/desktop/tests/e2e/identity-lost.spec.ts
@@ -52,7 +52,7 @@ test("normal first launch uses the already-persisted identity", async ({
 
 test("lost boot opens onboarding gate directly on the key-import page", async ({
   page,
-}) => {
+}, testInfo) => {
   await installMockBridge(
     page,
     { identityLost: true },
@@ -62,13 +62,44 @@ test("lost boot opens onboarding gate directly on the key-import page", async ({
 
   await expect(page.getByTestId("machine-onboarding-gate")).toBeVisible();
   await expect(
-    page.getByRole("heading", { name: "Re-import your key" }),
+    page.getByRole("heading", { name: "Enter your private key" }),
   ).toBeVisible();
+  await page.waitForTimeout(1_000);
+  await page.screenshot({
+    path: testInfo.outputPath("desktop-private-key-recovery.png"),
+  });
 });
 
-test("importing a key from lost mode shows the relaunch-required screen", async ({
+test("lost boot keeps the pairing-code action stable while generating", async ({
   page,
 }) => {
+  await installMockBridge(
+    page,
+    { identityLost: true, pairingStartDelayMs: 2_500 },
+    { skipOnboardingSeed: true },
+  );
+  await page.goto("/");
+
+  await page.getByTestId("nostr-import-phone-link").click();
+  const copyButton = page.getByTestId("copy-identity-recovery-code");
+  await expect(copyButton).toBeVisible();
+  await expect(copyButton).toBeDisabled();
+  await expect(copyButton).toHaveText("Generating pairing code...");
+  const loadingButton = await copyButton.elementHandle();
+
+  await expect(copyButton).toBeEnabled();
+  await expect(copyButton).toHaveText("Copy pairing code");
+  expect(
+    await copyButton.evaluate(
+      (button, loading) => button === loading,
+      loadingButton,
+    ),
+  ).toBe(true);
+});
+
+test("lost boot offers phone recovery with a single-use QR", async ({
+  page,
+}, testInfo) => {
   await installMockBridge(
     page,
     { identityLost: true },
@@ -76,8 +107,254 @@ test("importing a key from lost mode shows the relaunch-required screen", async
   );
   await page.goto("/");
 
+  await page.getByTestId("nostr-import-phone-link").click();
+  await expect(page.getByTestId("identity-recovery-pairing")).toBeVisible();
+  await expect(page.getByTestId("identity-recovery-qr")).toBeVisible();
   await expect(
-    page.getByRole("heading", { name: "Re-import your key" }),
+    page.getByText("Scan this code with a signed-in Buzz phone."),
+  ).toBeVisible();
+  await expect(
+    page.getByText("On your phone, open Settings → Send identity to desktop."),
+  ).toBeVisible();
+  await page.waitForTimeout(1_000); // Let the onboarding entrance motion settle.
+  await page.screenshot({
+    path: testInfo.outputPath("desktop-phone-recovery-qr.png"),
+    fullPage: true,
+  });
+
+  const copyButton = page.getByTestId("copy-identity-recovery-code");
+  await expect(copyButton).toHaveText("Copy pairing code");
+  await page.context().grantPermissions(["clipboard-read", "clipboard-write"]);
+  await copyButton.click();
+  await expect(copyButton).toHaveText("Copied");
+
+  const copiedPayload = await page.evaluate(() => {
+    const log = (
+      window as Window & {
+        __BUZZ_E2E_COMMAND_LOG__?: Array<{
+          command: string;
+          payload: Record<string, unknown> | null;
+        }>;
+      }
+    ).__BUZZ_E2E_COMMAND_LOG__;
+    return log?.findLast(({ command }) => command === "copy_text_to_clipboard")
+      ?.payload;
+  });
+  expect(copiedPayload?.text).toMatch(/^nostrpair:\/\/.+&mode=recover$/);
+
+  const commands = await page.evaluate(
+    () =>
+      (
+        window as Window & {
+          __BUZZ_E2E_COMMAND_PAYLOADS__?: Array<{ command: string }>;
+        }
+      ).__BUZZ_E2E_COMMAND_PAYLOADS__ ?? [],
+  );
+  expect(
+    commands.some(
+      (entry) => entry.command === "start_identity_recovery_pairing",
+    ),
+  ).toBe(true);
+});
+
+test("phone recovery uses the desktop pairing card semantics", async ({
+  page,
+}) => {
+  await installMockBridge(
+    page,
+    { identityLost: true },
+    { skipOnboardingSeed: true },
+  );
+  await page.goto("/");
+
+  await page.getByTestId("nostr-import-phone-link").click();
+  const card = page.getByTestId("identity-recovery-pairing");
+  const qrContainer = card.getByTestId("identity-recovery-qr-container");
+  const qrCode = card.getByTestId("identity-recovery-qr");
+  const copyButton = card.getByTestId("copy-identity-recovery-code");
+  await expect(qrCode).toBeVisible();
+  await expect(qrCode).toHaveAttribute("data-qr-matrix-size", "57");
+  await expect(qrCode.locator("[data-qr-finder-pattern]")).toHaveCount(3);
+  await expect(qrCode.locator(".buzz-qr-cell-reveal").first()).toHaveCSS(
+    "animation-name",
+    "buzz-qr-cell-reveal",
+  );
+  const qrBox = await qrContainer.boundingBox();
+  const copyBox = await copyButton.boundingBox();
+  expect(qrBox).not.toBeNull();
+  expect(copyBox).not.toBeNull();
+  expect(Math.abs((copyBox?.x ?? 0) - (qrBox?.x ?? 0))).toBeLessThan(1);
+  expect(Math.abs((copyBox?.width ?? 0) - (qrBox?.width ?? 0))).toBeLessThan(1);
+
+  await page.evaluate(async () => {
+    await window.__TAURI_INTERNALS__?.invoke?.("plugin:event|emit", {
+      event: "pairing-sas-received",
+      payload: { sas: "123456" },
+    });
+  });
+
+  await expect(
+    card.getByText("Does this code match your phone?"),
+  ).toBeVisible();
+  await expect(
+    page.getByText("Confirm the code before sharing your identity."),
+  ).toBeVisible();
+  await expect(
+    card.getByText(
+      "This gives this desktop permanent access to your Buzz identity. Only continue if you trust it.",
+    ),
+  ).toBeVisible();
+  await expect(
+    card.getByText(/On your phone, open Settings/),
+  ).not.toBeVisible();
+  await expect(card.getByTestId("identity-recovery-sas")).toHaveText("123 456");
+  await expect(card.getByTestId("confirm-identity-recovery-sas")).toHaveText(
+    "Codes match",
+  );
+  await expect(card.getByTestId("deny-identity-recovery-sas")).toHaveText(
+    "Cancel",
+  );
+  const cancelBox = await card
+    .getByTestId("deny-identity-recovery-sas")
+    .boundingBox();
+  const confirmBox = await card
+    .getByTestId("confirm-identity-recovery-sas")
+    .boundingBox();
+  expect(cancelBox).not.toBeNull();
+  expect(confirmBox).not.toBeNull();
+  expect((cancelBox?.y ?? 0) - (confirmBox?.y ?? 0)).toBeGreaterThan(
+    confirmBox?.height ?? 0,
+  );
+});
+
+test("canceling recovery uses the standard pairing cancellation state", async ({
+  page,
+}) => {
+  await installMockBridge(
+    page,
+    { identityLost: true },
+    { skipOnboardingSeed: true },
+  );
+  await page.goto("/");
+  await page.getByTestId("nostr-import-phone-link").click();
+  await expect(page.getByTestId("identity-recovery-qr")).toBeVisible();
+
+  await page.evaluate(async () => {
+    await window.__TAURI_INTERNALS__?.invoke?.("plugin:event|emit", {
+      event: "pairing-sas-received",
+      payload: { sas: "123456" },
+    });
+  });
+  await page.getByTestId("deny-identity-recovery-sas").click();
+
+  await expect(
+    page.getByText("The codes didn't match. Pairing was canceled."),
+  ).toBeVisible();
+  await expect(page.getByRole("button", { name: "Try again" })).toBeVisible();
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (window.__BUZZ_E2E_COMMAND_LOG__ ?? []).filter(
+            ({ command }) => command === "cancel_pairing",
+          ).length,
+      ),
+    )
+    .toBeGreaterThan(0);
+});
+
+test("phone recovery continues to harness setup without creating or restarting", async ({
+  page,
+}) => {
+  await installMockBridge(
+    page,
+    { identityLost: true },
+    { skipOnboardingSeed: true },
+  );
+  await page.goto("/");
+  await page.getByTestId("nostr-import-phone-link").click();
+  await expect(page.getByTestId("identity-recovery-qr")).toBeVisible();
+
+  await page.evaluate(async () => {
+    await window.__TAURI_INTERNALS__?.invoke?.(
+      "complete_identity_recovery_pairing",
+    );
+  });
+
+  await expect(
+    page.getByRole("heading", { name: "Set up your agent harnesses" }),
+  ).toBeVisible();
+  await expect(page.getByTestId("relaunch-required")).toHaveCount(0);
+  await expect(
+    page.getByRole("heading", {
+      name: "Your unique identity key has been created",
+    }),
+  ).toHaveCount(0);
+});
+
+test("recovery turns relay failures into actionable copy", async ({ page }) => {
+  await installMockBridge(
+    page,
+    { identityLost: true },
+    { skipOnboardingSeed: true },
+  );
+  await page.goto("/");
+  await page.getByTestId("nostr-import-phone-link").click();
+  await expect(page.getByTestId("identity-recovery-qr")).toBeVisible();
+
+  await page.evaluate(async () => {
+    await window.__TAURI_INTERNALS__?.invoke?.("plugin:event|emit", {
+      event: "pairing-error",
+      payload: { message: "failed to send sas-confirm" },
+    });
+  });
+
+  await expect(
+    page.getByText(
+      "This pairing code expired or lost its connection. Create a new code and try again.",
+    ),
+  ).toBeVisible();
+  await expect(page.getByRole("button", { name: "Try again" })).toBeVisible();
+});
+
+test("desktop refreshes recovery codes before the relay expires them", async ({
+  page,
+}) => {
+  await page.clock.install();
+  await installMockBridge(
+    page,
+    { identityLost: true },
+    { skipOnboardingSeed: true },
+  );
+  await page.goto("/");
+  await page.getByTestId("nostr-import-phone-link").click();
+  await expect(page.getByTestId("identity-recovery-qr")).toBeVisible();
+
+  const recoveryStarts = () =>
+    page.evaluate(
+      () =>
+        (window.__BUZZ_E2E_COMMAND_LOG__ ?? []).filter(
+          ({ command }) => command === "start_identity_recovery_pairing",
+        ).length,
+    );
+  await expect.poll(recoveryStarts).toBe(1);
+
+  await page.clock.fastForward(90_000);
+  await expect.poll(recoveryStarts).toBe(2);
+  await expect(page.getByTestId("identity-recovery-qr")).toBeVisible();
+});
+
+test("importing a key from lost mode shows the relaunch-required screen", async ({
+  page,
+}) => {
+  await installMockBridge(
+    page,
+    { identityLost: true },
+    { skipOnboardingSeed: true },
+  );
+  await page.goto("/");
+  await expect(
+    page.getByRole("heading", { name: "Enter your private key" }),
   ).toBeVisible();
 
   const importedNsec = nsecEncode(hexToBytes(TEST_IDENTITIES.alice.privateKey));
@@ -97,9 +374,8 @@ test("start-new-identity from lost mode persists the ephemeral key after confirm
     { skipOnboardingSeed: true },
   );
   await page.goto("/");
-
   await expect(
-    page.getByRole("heading", { name: "Re-import your key" }),
+    page.getByRole("heading", { name: "Enter your private key" }),
   ).toBeVisible();
 
   page.on("dialog", (dialog) => dialog.accept());
@@ -131,9 +407,8 @@ test("cancelling start-new-identity in lost mode stays on the import screen", as
     { skipOnboardingSeed: true },
   );
   await page.goto("/");
-
   await expect(
-    page.getByRole("heading", { name: "Re-import your key" }),
+    page.getByRole("heading", { name: "Enter your private key" }),
   ).toBeVisible();
 
   page.on("dialog", (dialog) => dialog.dismiss());
@@ -141,7 +416,7 @@ test("cancelling start-new-identity in lost mode stays on the import screen", as
 
   // Still on the import screen — no navigation, no persist
   await expect(
-    page.getByRole("heading", { name: "Re-import your key" }),
+    page.getByRole("heading", { name: "Enter your private key" }),
   ).toBeVisible();
   await expect(page.getByTestId("relaunch-required")).toHaveCount(0);
 });
@@ -159,7 +434,7 @@ test("locked boot shows the keyring-locked screen without the onboarding gate or
   await expect(page.getByTestId("keyring-locked")).toBeVisible();
   await expect(page.getByTestId("onboarding-gate")).toHaveCount(0);
   await expect(
-    page.getByRole("heading", { name: "Re-import your key" }),
+    page.getByRole("heading", { name: "Enter your private key" }),
   ).toHaveCount(0);
 });
 
diff --git a/desktop/tests/e2e/inbox-edit.spec.ts b/desktop/tests/e2e/inbox-edit.spec.ts
index a962056fa65..63cc3c570da 100644
--- a/desktop/tests/e2e/inbox-edit.spec.ts
+++ b/desktop/tests/e2e/inbox-edit.spec.ts
@@ -290,17 +290,19 @@ test("editing an immediate attachment reply preserves its media tags", async ({
   });
   expect(editPayload).toEqual(
     expect.objectContaining({
-      eventId: replyId,
-      mediaTags: [
-        [
-          "imeta",
-          `url ${ATTACHMENT_URL}`,
-          "m application/pdf",
-          `x ${"a".repeat(64)}`,
-          "size 12345",
-          `filename ${ATTACHMENT_FILENAME}`,
+      input: expect.objectContaining({
+        eventId: replyId,
+        mediaTags: [
+          [
+            "imeta",
+            `url ${ATTACHMENT_URL}`,
+            "m application/pdf",
+            `x ${"a".repeat(64)}`,
+            "size 12345",
+            `filename ${ATTACHMENT_FILENAME}`,
+          ],
         ],
-      ],
+      }),
     }),
   );
 
diff --git a/desktop/tests/e2e/inline-custom-harness.spec.ts b/desktop/tests/e2e/inline-custom-harness.spec.ts
index 6b3845d65a9..1ef7e67bb79 100644
--- a/desktop/tests/e2e/inline-custom-harness.spec.ts
+++ b/desktop/tests/e2e/inline-custom-harness.spec.ts
@@ -50,7 +50,6 @@ async function openCreateDialog(page: Page) {
   await page.goto("/", { waitUntil: "domcontentloaded" });
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create agent" }).click();
   const dialog = page.getByTestId("persona-dialog");
   await expect(dialog).toBeVisible({ timeout: 10_000 });
   await dialog.getByRole("tab", { name: "Customize for this agent" }).click();
diff --git a/desktop/tests/e2e/messaging.spec.ts b/desktop/tests/e2e/messaging.spec.ts
index 5d833f77133..a0808e4a6af 100644
--- a/desktop/tests/e2e/messaging.spec.ts
+++ b/desktop/tests/e2e/messaging.spec.ts
@@ -1,9 +1,20 @@
 import { expect, test, type Locator } from "@playwright/test";
 
+import { waitForAnimations } from "../helpers/animations";
 import { installMockBridge, TEST_IDENTITIES } from "../helpers/bridge";
 import { expectCornerRadiusPx, expectSmoothCorners } from "../helpers/css";
 import { openSettings } from "../helpers/settings";
 
+async function waitForReadyComposerSnapshots(
+  page: import("@playwright/test").Page,
+  count = 1,
+) {
+  await expect(page.locator("[data-composer-link-previews]")).toHaveAttribute(
+    "data-ready-snapshot-count",
+    String(count),
+  );
+}
+
 async function expectThreadReplyUnobscured(row: Locator) {
   await expect
     .poll(async () =>
@@ -93,7 +104,7 @@ async function measureThreadSummaryGeometry(summaryRow: Locator) {
 }
 
 test.beforeEach(async ({ page }, testInfo) => {
-  const mock = testInfo.title.includes("agent owner label")
+  const baseMock = testInfo.title.includes("agent owner label")
     ? {
         searchProfiles: [
           {
@@ -108,7 +119,137 @@ test.beforeEach(async ({ page }, testInfo) => {
           },
         ],
       }
-    : undefined;
+    : testInfo.title.includes("cardless short tweet preview")
+      ? {
+          linkPreviewMetadata: {
+            title: "jack (@jack) on X",
+            siteName: "X (formerly Twitter)",
+            description: "just setting up my twttr",
+            imageDataUrl: null,
+            imageDomain: null,
+          },
+        }
+      : testInfo.title.includes("cardless tweet preview")
+        ? {
+            linkPreviewMetadata: {
+              title: "Buzz (@buzz) on X",
+              siteName: "X (formerly Twitter)",
+              description:
+                "This is a real tweet-style description long enough to wrap across several lines while preserving the message-like treatment. It keeps going with enough distinct words to exceed five rendered lines at the preview width, proving that the overflow-aware control appears only when the content is genuinely clipped rather than relying on a brittle character-count guess.",
+              imageDataUrl:
+                "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='1200' height='675'%3E%3Crect width='1200' height='675' fill='%231d9bf0'/%3E%3C/svg%3E",
+              imageDomain: "pbs.twimg.com",
+            },
+          }
+        : testInfo.title.includes("mixed link preview image outcomes")
+          ? {
+              linkPreviewMetadataByHref: {
+                "https://github.com/block/buzz/pull/4001": {
+                  title: "Loaded preview image",
+                  siteName: "GitHub",
+                  description: "The image request completed.",
+                  imageDataUrl:
+                    "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=",
+                  imageDomain: "opengraph.githubassets.com",
+                  imageFetchState: "image",
+                  imageRetryAfterMs: null,
+                },
+                "https://github.com/block/buzz/pull/4002": {
+                  title: "Rate-limited preview image",
+                  siteName: "GitHub",
+                  description: "Metadata remains available during cooldown.",
+                  imageDataUrl: null,
+                  imageDomain: null,
+                  imageFetchState: "transient_failure",
+                  imageRetryAfterMs: 900_000,
+                },
+              },
+            }
+          : testInfo.title.includes("link preview browser image error")
+            ? {
+                linkPreviewMetadata: {
+                  title: "Invalid decoded preview image",
+                  siteName: "GitHub",
+                  description: "The browser should replace this image.",
+                  imageDataUrl: null,
+                  imageDomain: null,
+                  imageFetchState: "rejected",
+                  imageRetryAfterMs: null,
+                },
+              }
+            : testInfo.title.includes("link preview image geometry")
+              ? {
+                  linkPreviewMetadata: {
+                    title:
+                      "Ship a wider horizontal preview with a two-line title that wraps cleanly",
+                    siteName: "GitHub",
+                    description: "A polished, stable preview for shared links.",
+                    imageDataUrl:
+                      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=",
+                    imageDomain: "opengraph.githubassets.com",
+                    faviconDataUrl:
+                      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=",
+                  },
+                  linkPreviewMetadataDelayMs: 800,
+                }
+              : testInfo.title.includes("link preview no-image layout") ||
+                  testInfo.title.includes("composer no-image link embeds")
+                ? {
+                    linkPreviewMetadata: {
+                      title: "Buzz",
+                      siteName: "GitHub",
+                      description:
+                        "Open-source collaboration for the Buzz app.",
+                      imageDataUrl: null,
+                      imageDomain: null,
+                      faviconDataUrl:
+                        "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=",
+                    },
+                    linkPreviewMetadataDelayMs: 2_000,
+                  }
+                : testInfo.title.includes(
+                      "rich link preview preserves description newlines",
+                    )
+                  ? {
+                      linkPreviewMetadata: {
+                        title: "Buzz pull request",
+                        siteName: "GitHub",
+                        description:
+                          "First paragraph line one.\nFirst paragraph line two.\n\nSecond paragraph.",
+                        imageDataUrl: null,
+                        imageDomain: null,
+                      },
+                    }
+                  : testInfo.title.includes("link preview") ||
+                      testInfo.title.includes("supported Compact")
+                    ? {
+                        linkPreviewMetadata: {
+                          title: "Buzz pull request",
+                          siteName: "GitHub",
+                          description: "A sender-authored preview snapshot.",
+                          imageDataUrl: null,
+                          imageDomain: null,
+                        },
+                        linkPreviewMetadataDelayMs: testInfo.title.includes(
+                          "loading card before cold resolver work",
+                        )
+                          ? 10_000
+                          : testInfo.title.includes("style defaults") ||
+                              testInfo.title.includes("send does not wait") ||
+                              testInfo.title.includes("attachment-sized")
+                            ? 1_500
+                            : undefined,
+                        linkPreviewMetadataStartBlockMs:
+                          testInfo.title.includes(
+                            "loading card before cold resolver work",
+                          )
+                            ? 150
+                            : undefined,
+                      }
+                    : undefined;
+  const mock = testInfo.title.includes("unresolvable preview")
+    ? { linkPreviewMetadata: null, linkPreviewMetadataDelayMs: 150 }
+    : baseMock;
   await installMockBridge(page, mock);
 });
 
@@ -250,7 +391,529 @@ test("markdown tables overflow wide content and fill the message when narrow", a
     .toBeLessThanOrEqual(1);
 });
 
-test("supported link previews keep the message link visible", async ({
+test("link preview style defaults to compact and Rich unfurls descriptions", async ({
+  page,
+}) => {
+  const previewUrl = "https://github.com/block/buzz/pull/3246?inline=1";
+  await page.setViewportSize({ width: 800, height: 900 });
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await page.getByTestId("message-input").fill(previewUrl);
+  const composerPreview = page
+    .locator("[data-composer-link-previews]")
+    .locator('[data-link-preview="github-pull-request"]');
+  await expect(composerPreview).toHaveAttribute("data-image-state", "pending");
+  if (process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR) {
+    await waitForAnimations(page);
+    await page.screenshot({
+      animations: "disabled",
+      path: `${process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR}/compact-composer-loading.png`,
+    });
+  }
+  await waitForReadyComposerSnapshots(page);
+  await expect(composerPreview).toHaveAttribute("data-image-state", "none");
+  if (process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR) {
+    await waitForAnimations(page);
+    await page.screenshot({
+      animations: "disabled",
+      path: `${process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR}/compact-composer-ready.png`,
+    });
+  }
+  await page.getByTestId("send-message").click();
+
+  const row = page.getByTestId("message-row").last();
+  const compactPreview = row.locator(
+    '[data-link-preview="github-pull-request"]',
+  );
+  await expect(compactPreview).toHaveCSS("border-top-left-radius", "0px");
+  await expect(compactPreview).toHaveCSS("border-left-width", "3px");
+  if (process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR) {
+    await waitForAnimations(page);
+    await page.screenshot({
+      animations: "disabled",
+      path: `${process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR}/recipient-compact.png`,
+    });
+  }
+
+  await openSettings(page, "appearance");
+  await expect(page.getByTestId("link-preview-style-trigger")).toHaveText(
+    "Compact",
+  );
+  await page.getByTestId("link-preview-style-trigger").click();
+  await page.getByTestId("link-preview-style-rich").click();
+  await expect(page.getByTestId("link-preview-style-trigger")).toHaveText(
+    "Rich",
+  );
+  await expect
+    .poll(() =>
+      page.evaluate(() =>
+        localStorage.getItem("buzz.appearance.linkPreviewStyle"),
+      ),
+    )
+    .toBe("rich");
+
+  await page.getByTestId("settings-back-to-app").click();
+  const richPreview = row.locator(
+    '[data-link-preview="github-pull-request"][data-link-preview-inline]',
+  );
+  await expect(richPreview).toBeVisible();
+  const richHostname = richPreview.locator("[data-link-preview-hostname]");
+  await expect(richHostname).toHaveText("github.com");
+  await expect(richHostname).toHaveAttribute("href", previewUrl);
+  if (process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR) {
+    await waitForAnimations(page);
+    await page.screenshot({
+      animations: "disabled",
+      path: `${process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR}/recipient-rich.png`,
+    });
+    const richComposerUrl = `${previewUrl}&composer=rich`;
+    await page.getByTestId("message-input").fill(richComposerUrl);
+    const richComposerPreview = page
+      .locator("[data-composer-link-previews]")
+      .locator('[data-link-preview="github-pull-request"]');
+    await expect(richComposerPreview).toHaveAttribute(
+      "data-image-state",
+      "pending",
+    );
+    await waitForAnimations(page);
+    await page.screenshot({
+      animations: "disabled",
+      path: `${process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR}/rich-composer-loading.png`,
+    });
+    await waitForReadyComposerSnapshots(page);
+    await expect(richComposerPreview).toHaveAttribute(
+      "data-image-state",
+      "none",
+    );
+    await waitForAnimations(page);
+    await page.screenshot({
+      animations: "disabled",
+      path: `${process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR}/rich-composer-ready.png`,
+    });
+    await page.getByTestId("message-input").fill("");
+  }
+
+  await openSettings(page, "appearance");
+  await page.getByTestId("link-preview-style-trigger").click();
+  await page.getByTestId("link-preview-style-compact").click();
+});
+
+for (const [pasteShape, wrapUrl] of [
+  ["bare", (url: string) => url],
+  ["angle-bracket", (url: string) => `<${url}>`],
+] as const) {
+  test(`${pasteShape} link preview paste paints before cold resolver work`, async ({
+    page,
+  }) => {
+    const previewUrl = `https://github.com/block/buzz/pull/3246?paste=${pasteShape}`;
+    await page.goto("/");
+    await page.getByTestId("channel-general").click();
+    const input = page.getByTestId("message-input");
+    await input.focus();
+
+    const pasteText = wrapUrl(previewUrl);
+    const firstPaint = await input.evaluate(async (element, pasteText) => {
+      const clipboardData = new DataTransfer();
+      clipboardData.setData("text/plain", pasteText);
+      const startedAt = performance.now();
+      element.dispatchEvent(
+        new ClipboardEvent("paste", {
+          bubbles: true,
+          cancelable: true,
+          clipboardData,
+        }),
+      );
+      await new Promise<void>((resolve) =>
+        requestAnimationFrame(() => resolve()),
+      );
+      return {
+        elapsedMs: performance.now() - startedAt,
+        resolverStarted: (window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? []).some(
+          (entry) => entry.command === "fetch_link_preview_metadata",
+        ),
+        text: element.textContent,
+      };
+    }, pasteText);
+    expect(firstPaint.text).toContain(previewUrl);
+    expect(firstPaint.resolverStarted).toBe(false);
+    expect(firstPaint.elapsedMs).toBeLessThan(100);
+    const composerPreview = page
+      .locator("[data-composer-link-previews]")
+      .locator('[data-link-preview="github-pull-request"]');
+    await expect(input).toContainText(previewUrl, { timeout: 1_000 });
+    await expect(composerPreview).toHaveAttribute(
+      "data-state",
+      /^(processing|done)$/,
+      { timeout: 1_000 },
+    );
+    await expect(page.getByTestId("send-message")).toBeEnabled();
+  });
+}
+
+test("display-text link preview produces and sends its preview", async ({
+  page,
+}) => {
+  const previewUrl = "https://github.com/block/buzz/pull/3246?display=text";
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+
+  const input = page.getByTestId("message-input");
+  await input.click();
+  await input.pressSequentially("review the pull request");
+  await page.keyboard.press("ControlOrMeta+a");
+  await page.keyboard.press("ControlOrMeta+k");
+  const dialog = page.getByRole("dialog", { name: "Add link" });
+  await dialog.getByLabel("URL").fill(previewUrl);
+  await dialog.getByRole("button", { name: "Save" }).click();
+
+  await expect(input.locator(`a[href="${previewUrl}"]`)).toHaveText(
+    "review the pull request",
+  );
+  await expect(page.locator("[data-composer-link-previews]")).toBeVisible();
+  await waitForReadyComposerSnapshots(page);
+  await page.getByTestId("send-message").click();
+
+  const row = page.getByTestId("message-row").last();
+  await expect(
+    row.getByRole("link", { name: "review the pull request", exact: true }),
+  ).toHaveAttribute("href", previewUrl);
+  await expect(row.locator("[data-link-preview]")).toBeVisible();
+  const linkPreviewTags = await page.evaluate(() => {
+    const call = [...(window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? [])]
+      .reverse()
+      .find((entry) => entry.command === "send_channel_message");
+    return (
+      call?.payload as { linkPreviewTags?: string[][] | null } | undefined
+    )?.linkPreviewTags;
+  });
+  expect(linkPreviewTags?.map((tag) => tag[3])).toEqual([previewUrl]);
+});
+
+test("rich link preview preserves description newlines after sending", async ({
+  page,
+}) => {
+  const previewUrl = "https://github.com/block/buzz/pull/3246?newlines=1";
+  await page.addInitScript(() =>
+    localStorage.setItem("buzz.appearance.linkPreviewStyle", "rich"),
+  );
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await page.getByTestId("message-input").fill(previewUrl);
+  await waitForReadyComposerSnapshots(page);
+  await page.getByTestId("send-message").click();
+
+  const description = page
+    .getByTestId("message-row")
+    .last()
+    .locator('[data-link-preview-inline] [data-slot="attachment-description"]');
+  await expect(description.locator("p")).toHaveCount(2);
+  await expect(description).toHaveText(
+    "First paragraph line one.\nFirst paragraph line two.\n\nSecond paragraph.",
+    { useInnerText: true },
+  );
+});
+
+test("completed link previews send when one URL has an unsnapshotable fragment", async ({
+  page,
+}) => {
+  const previewUrls = [
+    "https://twitter.com/tellaho",
+    "https://github.com/block/buzz/pull/3246",
+    "https://x.com/tellaho/status/1884289176381841506#",
+  ];
+  const pastedText = previewUrls.join("\n");
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  const input = page.getByTestId("message-input");
+  await input.focus();
+  await input.evaluate((element, text) => {
+    const clipboardData = new DataTransfer();
+    clipboardData.setData("text/plain", text);
+    element.dispatchEvent(
+      new ClipboardEvent("paste", {
+        bubbles: true,
+        cancelable: true,
+        clipboardData,
+      }),
+    );
+  }, pastedText);
+  const composerPreviewCards = page.locator(
+    "[data-link-preview-composer-card]",
+  );
+  await expect(composerPreviewCards).toHaveCount(2);
+  await expect(
+    composerPreviewCards.locator(`a[href="${previewUrls[2]}"]`),
+  ).toHaveCount(0);
+  await waitForReadyComposerSnapshots(page, 2);
+
+  const send = page.getByTestId("send-message");
+  await expect(send).toBeEnabled();
+  await send.click();
+  await expect(page.getByTestId("message-input")).toHaveText("");
+  await expect(page.locator("[data-composer-link-previews]")).toHaveCount(0);
+  await page.waitForTimeout(250);
+  await expect(page.getByTestId("message-input")).toHaveText("");
+
+  const calls = await page.evaluate(() =>
+    (window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? []).filter(
+      (entry) => entry.command === "send_channel_message",
+    ),
+  );
+  expect(calls).toHaveLength(1);
+  expect(
+    (
+      calls[0]?.payload as { linkPreviewTags?: string[][] | null } | undefined
+    )?.linkPreviewTags?.map((tag) => tag[3]),
+  ).toEqual(previewUrls.slice(0, 2));
+});
+
+test("unresolvable preview disappears after the terminal miss", async ({
+  page,
+}) => {
+  const previewUrl = "https://x.com/tellaho/status";
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await page.getByTestId("message-input").fill(previewUrl);
+
+  const composerPreviews = page.locator("[data-composer-link-previews]");
+  await expect(composerPreviews).toBeVisible();
+  await expect(
+    composerPreviews.locator("[data-link-preview-composer-card]"),
+  ).toHaveAttribute("data-image-state", "pending");
+  await expect(composerPreviews).toHaveCount(0);
+
+  await page.getByTestId("send-message").click();
+  const row = page.getByTestId("message-row").last();
+  await expect(row).toContainText(previewUrl);
+  await expect(row.locator("[data-link-preview]")).toHaveCount(0);
+});
+
+test("send does not wait for a pending link preview snapshot", async ({
+  page,
+}) => {
+  const previewUrl = "https://github.com/block/buzz/pull/3246?send=pending";
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await page.getByTestId("message-input").fill(previewUrl);
+
+  const composerPreviews = page.locator("[data-composer-link-previews]");
+  await expect(composerPreviews).toHaveAttribute(
+    "data-ready-snapshot-count",
+    "0",
+  );
+  await expect(
+    composerPreviews.locator('[data-link-preview="github-pull-request"]'),
+  ).toHaveAttribute("data-image-state", "pending");
+
+  await page.getByTestId("send-message").click();
+  const row = page.getByTestId("message-row").last();
+  await expect(row).toContainText(previewUrl);
+  await expect(row.locator("[data-link-preview]")).toHaveCount(0);
+
+  const linkPreviewTags = await page.evaluate(() => {
+    const call = [...(window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? [])]
+      .reverse()
+      .find((entry) => entry.command === "send_channel_message");
+    return (
+      call?.payload as { linkPreviewTags?: string[][] | null } | undefined
+    )?.linkPreviewTags;
+  });
+  expect(linkPreviewTags ?? []).toEqual([]);
+});
+
+test("hiding composer link previews suppresses the whole draft and emits the blanket marker", async ({
+  page,
+}) => {
+  const firstUrl = "https://github.com/block/buzz/pull/3246?hide=all";
+  const secondUrl = "https://linear.app/acme/issue/ABC-123/hidden-too";
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await page.getByTestId("message-input").fill(firstUrl);
+  await expect(page.locator("[data-composer-link-previews]")).toBeVisible();
+  await waitForReadyComposerSnapshots(page);
+
+  await page.getByTestId("composer-hide-link-previews").click();
+  await expect(page.locator("[data-composer-link-previews]")).toHaveCount(0);
+  await page.getByTestId("message-input").fill(`${firstUrl} ${secondUrl}`);
+  await expect(page.locator("[data-composer-link-previews]")).toHaveCount(0);
+  await page.getByTestId("send-message").click();
+
+  const row = page.getByTestId("message-row").last();
+  await expect(row).toContainText(firstUrl);
+  await expect(row).toContainText(secondUrl);
+  await expect(row.locator("[data-link-preview]")).toHaveCount(0);
+  const linkPreviewTags = await page.evaluate(() => {
+    const call = [...(window.__BUZZ_E2E_COMMAND_PAYLOADS__ ?? [])]
+      .reverse()
+      .find((entry) => entry.command === "send_channel_message");
+    return (
+      call?.payload as { linkPreviewTags?: string[][] | null } | undefined
+    )?.linkPreviewTags;
+  });
+  expect(linkPreviewTags).toEqual([["link-preview", "none"]]);
+
+  await page.getByTestId("message-input").fill(firstUrl);
+  await expect(page.locator("[data-composer-link-previews]")).toBeVisible();
+});
+
+test("composer link preview embeds stay attachment-sized while loading and ready", async ({
+  page,
+}) => {
+  const previewUrl = "https://github.com/block/buzz/pull/3246";
+
+  for (const width of [800, 420]) {
+    await page.setViewportSize({ width: 800, height: 700 });
+    await page.goto("/");
+    await page.getByTestId("channel-general").click();
+    await page.setViewportSize({ width, height: 700 });
+    await page
+      .getByTestId("message-input")
+      .fill(`${previewUrl}?viewport=${width}`);
+    const card = page
+      .locator("[data-composer-link-previews]")
+      .locator('[data-link-preview="github-pull-request"]');
+    await expect(card).toBeVisible();
+    const initial = await card.evaluate((element) => ({
+      height: element.getBoundingClientRect().height,
+      width: element.getBoundingClientRect().width,
+      thumbnailHeight: element
+        .querySelector("[data-link-preview-thumbnail]")
+        ?.getBoundingClientRect().height,
+      thumbnailWidth: element
+        .querySelector("[data-link-preview-thumbnail]")
+        ?.getBoundingClientRect().width,
+    }));
+    if (process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR) {
+      await waitForAnimations(page);
+      await page.screenshot({
+        animations: "disabled",
+        path: `${process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR}/composer-${width}-loading.png`,
+      });
+    }
+
+    await expect
+      .poll(() =>
+        card.evaluate((element) => element.getAttribute("data-state")),
+      )
+      .toBe("done");
+    const ready = await card.evaluate((element) => ({
+      height: element.getBoundingClientRect().height,
+      width: element.getBoundingClientRect().width,
+      thumbnailHeight: element
+        .querySelector("[data-link-preview-thumbnail]")
+        ?.getBoundingClientRect().height,
+      thumbnailWidth: element
+        .querySelector("[data-link-preview-thumbnail]")
+        ?.getBoundingClientRect().width,
+    }));
+    if (process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR) {
+      await waitForAnimations(page);
+      await page.screenshot({
+        animations: "disabled",
+        path: `${process.env.BUZZ_LINK_PREVIEW_SCREENSHOTS_DIR}/composer-${width}-ready.png`,
+      });
+    }
+
+    expect(initial.height).toBe(55);
+    expect(initial.width).toBe(320);
+    expect(initial.thumbnailHeight).toBe(55);
+    expect(initial.thumbnailWidth).toBe(55);
+    expect(ready).toEqual(initial);
+  }
+});
+
+test("composer no-image link embeds keep the attachment footprint", async ({
+  page,
+}) => {
+  const previewUrl = "https://github.com/block/buzz/pull/3246?inline=none";
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await page.getByTestId("message-input").fill(previewUrl);
+  const card = page
+    .locator("[data-composer-link-previews]")
+    .locator('[data-link-preview="github-pull-request"]');
+  await expect(card).toHaveAttribute("data-image-state", "none");
+  await expect(card.locator("[data-link-preview-thumbnail]")).toBeVisible();
+  await expect(card.locator('[data-slot="attachment-title"]')).toContainText(
+    /github\.com|Buzz/,
+  );
+  await expect(card).toHaveCSS("height", "55px");
+});
+
+test("mixed link preview image outcomes keep Compact and Rich fallbacks stable", async ({
+  page,
+}) => {
+  const loadedUrl = "https://github.com/block/buzz/pull/4001";
+  const rateLimitedUrl = "https://github.com/block/buzz/pull/4002";
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await page
+    .getByTestId("message-input")
+    .fill(`${loadedUrl}\n${rateLimitedUrl}`);
+  await waitForReadyComposerSnapshots(page, 2);
+  await page.getByTestId("send-message").click();
+
+  const row = page.getByTestId("message-row").last();
+  const compactCards = row.locator('[data-link-preview="github-pull-request"]');
+  await expect(compactCards).toHaveCount(2);
+  await expect(compactCards.nth(0)).toHaveAttribute(
+    "data-image-state",
+    "image",
+  );
+  await expect(
+    compactCards.nth(0).locator("[data-link-preview-thumbnail]"),
+  ).toBeVisible();
+  await expect(compactCards.nth(1)).toHaveAttribute("data-image-state", "none");
+  await expect(
+    compactCards.nth(1).locator("[data-link-preview-image-fallback]"),
+  ).toHaveCount(0);
+
+  await openSettings(page, "appearance");
+  await page.getByTestId("link-preview-style-trigger").click();
+  await page.getByTestId("link-preview-style-rich").click();
+  await page.getByTestId("settings-back-to-app").click();
+
+  const richCards = row.locator(
+    '[data-link-preview="github-pull-request"][data-link-preview-inline]',
+  );
+  await expect(richCards).toHaveCount(2);
+  await expect(
+    richCards.nth(1).locator("[data-link-preview-image-fallback]"),
+  ).toHaveCount(0);
+});
+
+test("link preview browser image errors render a fallback", async ({
+  page,
+}) => {
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await page
+    .getByTestId("message-input")
+    .fill("https://github.com/block/buzz/pull/4003");
+  await waitForReadyComposerSnapshots(page);
+  await page.getByTestId("send-message").click();
+
+  const row = page.getByTestId("message-row").last();
+  const compactCard = row.locator('[data-link-preview="github-pull-request"]');
+  await expect(compactCard).toHaveAttribute("data-image-state", "none");
+  await expect(
+    compactCard.locator("[data-link-preview-image-fallback]"),
+  ).toHaveCount(0);
+
+  await openSettings(page, "appearance");
+  await page.getByTestId("link-preview-style-trigger").click();
+  await page.getByTestId("link-preview-style-rich").click();
+  await page.getByTestId("settings-back-to-app").click();
+
+  const richCard = row.locator(
+    '[data-link-preview="github-pull-request"][data-link-preview-inline]',
+  );
+  await expect(
+    richCard.locator("[data-link-preview-image-fallback]"),
+  ).toHaveCount(0);
+});
+
+test("supported Compact link previews keep the message link visible with square outer corners", async ({
   page,
 }) => {
   const previewUrl = "https://github.com/block/sprout/pull/1334";
@@ -260,6 +923,7 @@ test("supported link previews keep the message link visible", async ({
   await expect(page.getByTestId("chat-title")).toHaveText("general");
 
   await page.getByTestId("message-input").fill(previewUrl);
+  await waitForReadyComposerSnapshots(page);
   await page.getByTestId("send-message").click();
 
   const row = page.getByTestId("message-row").last();
@@ -268,8 +932,7 @@ test("supported link previews keep the message link visible", async ({
   ).toBeVisible();
   const previewCard = row.locator('[data-link-preview="github-pull-request"]');
   await expect(previewCard).toBeVisible();
-  await expectCornerRadiusPx(previewCard, 16);
-  await expectSmoothCorners(previewCard);
+  await expectCornerRadiusPx(previewCard, 0);
 });
 
 test("send multiple messages in sequence", async ({ page }) => {
diff --git a/desktop/tests/e2e/needs-restart-screenshots.spec.ts b/desktop/tests/e2e/needs-restart-screenshots.spec.ts
index 1a695844fb2..508a5d91e93 100644
--- a/desktop/tests/e2e/needs-restart-screenshots.spec.ts
+++ b/desktop/tests/e2e/needs-restart-screenshots.spec.ts
@@ -3,8 +3,8 @@
  * overlay work).
  *
  * Exercises:
- *   - Agent grid card and list-row badges at all three badge sites.
- *   - Hover tooltip with itemised before→after diff (capped at 6 + "and N more").
+ *   - Agent grid restart actions without a duplicate status badge.
+ *   - Profile badge tooltip with itemised before→after diff.
  *   - Runtime-tab banner with full uncapped diff list.
  *   - Side-panel badge visible on the default (Info) tab — not only Runtime.
  *   - DOM validity: tooltip trigger has no <button> ancestor.
@@ -80,7 +80,7 @@ const PERSONA_AGENT = {
   restartDiff: DIFF_ENTRIES,
 };
 
-/** Running agent with no config drift — badge must be absent. */
+/** Running agent with no config drift — restart action must be absent. */
 const NO_DRIFT_AGENT = {
   pubkey: TEST_IDENTITIES.tyler.pubkey,
   name: "Stable Agent",
@@ -88,25 +88,6 @@ const NO_DRIFT_AGENT = {
   needsRestart: false,
 };
 
-/** Agent with only 3 diff entries — tooltip shows all, no "and N more". */
-const SHORT_DIFF_AGENT = {
-  pubkey: TEST_IDENTITIES.charlie.pubkey,
-  name: "Short Diff Agent",
-  status: "running" as const,
-  needsRestart: true,
-  restartDiff: [
-    {
-      field: "model",
-      change: { kind: "value" as const, before: null, after: "gpt-5" },
-    },
-    {
-      field: "some_unknown_field",
-      change: { kind: "value" as const, before: "old", after: "new" },
-    },
-    { field: "env.MY_TOKEN", change: { kind: "removed" as const } },
-  ],
-};
-
 /**
  * Inactive agent with a friendly error AND a restart diff. Opening its card
  * forces the panel to open on the Runtime tab (opensRuntimeTab logic).
@@ -122,6 +103,21 @@ const INACTIVE_FRIENDLY_ERROR_AGENT = {
   lastErrorCode: -32002,
 };
 
+const RESTART_AGENT = {
+  pubkey: "cd".repeat(32),
+  name: "Restart Agent",
+  status: "running" as const,
+  needsRestart: true,
+  restartDiff: DIFF_ENTRIES,
+};
+
+const START_AGENT = {
+  pubkey: "ef".repeat(32),
+  name: "Start Agent",
+  status: "stopped" as const,
+  needsRestart: false,
+};
+
 async function gotoAgentsView(page: import("@playwright/test").Page) {
   await page.goto("/", { waitUntil: "domcontentloaded" });
   await expect(page.getByTestId("open-agents-view")).toBeVisible({
@@ -133,6 +129,86 @@ async function gotoAgentsView(page: import("@playwright/test").Page) {
   });
 }
 
+const WCAG_AA_NORMAL_TEXT_CONTRAST = 4.5;
+
+async function renderedTextContrast(
+  locator: import("@playwright/test").Locator,
+): Promise<number> {
+  return locator.evaluate((element) => {
+    type Rgba = { r: number; g: number; b: number; a: number };
+
+    const canvas = document.createElement("canvas");
+    canvas.width = 1;
+    canvas.height = 1;
+    const context = canvas.getContext("2d", { willReadFrequently: true });
+    if (!context) throw new Error("Could not create contrast test canvas");
+
+    const parseColor = (color: string): Rgba => {
+      context.clearRect(0, 0, 1, 1);
+      context.fillStyle = color;
+      context.fillRect(0, 0, 1, 1);
+      const [r, g, b, alpha] = context.getImageData(0, 0, 1, 1).data;
+      return { r, g, b, a: alpha / 255 };
+    };
+
+    const composite = (foreground: Rgba, background: Rgba): Rgba => {
+      const alpha = foreground.a + background.a * (1 - foreground.a);
+      if (alpha === 0) return { r: 0, g: 0, b: 0, a: 0 };
+
+      return {
+        r:
+          (foreground.r * foreground.a +
+            background.r * background.a * (1 - foreground.a)) /
+          alpha,
+        g:
+          (foreground.g * foreground.a +
+            background.g * background.a * (1 - foreground.a)) /
+          alpha,
+        b:
+          (foreground.b * foreground.a +
+            background.b * background.a * (1 - foreground.a)) /
+          alpha,
+        a: alpha,
+      };
+    };
+
+    const backgroundLayers: Rgba[] = [];
+    let current: Element | null = element;
+    while (current) {
+      backgroundLayers.push(
+        parseColor(window.getComputedStyle(current).backgroundColor),
+      );
+      current = current.parentElement;
+    }
+
+    let renderedBackground: Rgba = { r: 255, g: 255, b: 255, a: 1 };
+    for (const layer of backgroundLayers.reverse()) {
+      renderedBackground = composite(layer, renderedBackground);
+    }
+
+    const renderedForeground = composite(
+      parseColor(window.getComputedStyle(element).color),
+      renderedBackground,
+    );
+    const luminance = (color: Rgba) => {
+      const channels = [color.r, color.g, color.b].map((value) => {
+        const channel = value / 255;
+        return channel <= 0.04045
+          ? channel / 12.92
+          : ((channel + 0.055) / 1.055) ** 2.4;
+      });
+      return 0.2126 * channels[0] + 0.7152 * channels[1] + 0.0722 * channels[2];
+    };
+    const foregroundLuminance = luminance(renderedForeground);
+    const backgroundLuminance = luminance(renderedBackground);
+
+    return (
+      (Math.max(foregroundLuminance, backgroundLuminance) + 0.05) /
+      (Math.min(foregroundLuminance, backgroundLuminance) + 0.05)
+    );
+  });
+}
+
 test.describe("restart-diff screenshots", () => {
   test.use({ viewport: { width: 1280, height: 900 } });
 
@@ -159,17 +235,16 @@ test.describe("restart-diff screenshots", () => {
       `managed-agent-${STANDALONE_AGENT.pubkey}`,
     );
     await expect(agentCard).toBeVisible({ timeout: 10_000 });
-    await expect(
-      agentCard.getByText("Restart required", { exact: true }),
-    ).toBeVisible();
+    await expect(agentCard.getByText("Restart", { exact: true })).toBeVisible();
+    await expect(agentCard.getByTestId("restart-diff-badge")).toHaveCount(0);
 
     const stableCard = page.getByTestId(
       `managed-agent-${NO_DRIFT_AGENT.pubkey}`,
     );
     await expect(stableCard).toBeVisible({ timeout: 10_000 });
-    await expect(
-      stableCard.getByText("Restart required", { exact: true }),
-    ).toHaveCount(0);
+    await expect(stableCard.getByText("Restart", { exact: true })).toHaveCount(
+      0,
+    );
 
     await waitForAnimations(page);
     await agentCard.screenshot({
@@ -190,8 +265,9 @@ test.describe("restart-diff screenshots", () => {
     );
     await expect(personaCard).toBeVisible({ timeout: 10_000 });
     await expect(
-      personaCard.getByText("Restart required", { exact: true }),
+      personaCard.getByText("Restart", { exact: true }),
     ).toBeVisible();
+    await expect(personaCard.getByTestId("restart-diff-badge")).toHaveCount(0);
 
     await waitForAnimations(page);
     await personaCard.screenshot({
@@ -199,119 +275,101 @@ test.describe("restart-diff screenshots", () => {
     });
   });
 
-  // ── Tooltip on card badge + no-button-ancestor (B4: badge is sibling of the overlay button) ─
-
-  test("03-card-badge-tooltip-and-no-button-ancestor", async ({ page }) => {
+  test("03-running-restart-action", async ({ page }) => {
     await installMockBridge(page, {
-      managedAgents: [STANDALONE_AGENT, NO_DRIFT_AGENT],
+      managedAgents: [RESTART_AGENT],
     });
 
     await gotoAgentsView(page);
 
-    const agentCard = page.getByTestId(
-      `managed-agent-${STANDALONE_AGENT.pubkey}`,
-    );
+    const agentCard = page.getByTestId(`managed-agent-${RESTART_AGENT.pubkey}`);
     await expect(agentCard).toBeVisible({ timeout: 10_000 });
-
-    // B4: the tooltip trigger must have no <button> ancestor.
-    // In AgentIdentityCard the badge lives in a z-30 container that is a
-    // sibling of the z-10 overlay <button> — not a descendant of it.
-    const badgeLocator = agentCard.getByTestId("restart-diff-badge");
-    await expect(badgeLocator).toBeVisible();
-
-    const hasButtonAncestor = await badgeLocator.evaluate((el) => {
-      let node: Element | null = el.parentElement;
-      while (node) {
-        if (node.tagName === "BUTTON") return true;
-        node = node.parentElement;
-      }
-      return false;
-    });
-    expect(hasButtonAncestor).toBe(false);
-
-    // Hover to open tooltip
-    await badgeLocator.hover();
-    const tooltip = page.locator("[role=tooltip]");
-    await expect(tooltip).toBeVisible({ timeout: 5_000 });
-
-    // Tooltip is capped at 6 entries with "and 2 more" for 8-entry diff
-    await expect(tooltip.getByText("Model:")).toBeVisible();
-    await expect(tooltip.getByText("and 2 more")).toBeVisible();
-
-    // Array value rendered as JSON.stringify in the value slot
-    await expect(tooltip.getByText(/\["acp"\]/)).toBeVisible();
-
-    await waitForAnimations(page);
-    await page.screenshot({ path: `${SHOTS}/03-card-badge-tooltip.png` });
-  });
-
-  // ── Tooltip with short diff (no truncation) ─────────────────────────────────
-
-  test("04-card-tooltip-short-diff-no-truncation", async ({ page }) => {
-    await installMockBridge(page, {
-      managedAgents: [SHORT_DIFF_AGENT],
-    });
-
-    await gotoAgentsView(page);
-
-    const agentCard = page.getByTestId(
-      `managed-agent-${SHORT_DIFF_AGENT.pubkey}`,
+    const restartAction = page.getByTestId(
+      `agent-runtime-start-${RESTART_AGENT.pubkey}`,
+    );
+    await expect(restartAction).toHaveText("Restart");
+    await expect(restartAction).toHaveAttribute("aria-label", "Restart Agent");
+    await expect(restartAction).toHaveClass(/bg-transparent/);
+    await expect(restartAction).toHaveClass(/text-amber-800/);
+    await expect(restartAction).toHaveClass(/dark:text-amber-400/);
+    await expect(restartAction.locator("svg")).toHaveCount(0);
+    await expect(restartAction).toHaveCSS("width", "72px");
+    await expect(restartAction).toHaveCSS("height", "36px");
+    await expect(agentCard.getByTestId("restart-diff-badge")).toHaveCount(0);
+    await expect(page.locator("html")).toHaveClass(/light/);
+    expect(await renderedTextContrast(restartAction)).toBeGreaterThanOrEqual(
+      WCAG_AA_NORMAL_TEXT_CONTRAST,
     );
-    const badge = agentCard.getByTestId("restart-diff-badge");
-    await expect(badge).toBeVisible({ timeout: 10_000 });
-    await badge.hover();
-    const tooltip = page.locator("[role=tooltip]");
-    await expect(tooltip).toBeVisible({ timeout: 5_000 });
-
-    // All 3 entries visible
-    await expect(tooltip.getByText("Model:")).toBeVisible();
-    // Unknown field humanised generically
-    await expect(tooltip.getByText("Some unknown field:")).toBeVisible();
-    // No truncation line
-    await expect(tooltip.getByText(/and \d+ more/)).toHaveCount(0);
 
     await waitForAnimations(page);
-    await page.screenshot({ path: `${SHOTS}/04-short-diff-no-truncation.png` });
+    await agentCard.screenshot({
+      path: `${SHOTS}/03-running-restart-action.png`,
+    });
   });
 
-  // ── Keyboard focus shows tooltip ──────────────────────────────────────────
-
-  test("05-card-tooltip-keyboard-focus", async ({ page }) => {
+  test("restart action meets WCAG AA contrast in dark mode", async ({
+    page,
+  }) => {
+    await page.addInitScript(() => {
+      window.localStorage.setItem("buzz-theme", "catppuccin-mocha");
+    });
     await installMockBridge(page, {
-      managedAgents: [STANDALONE_AGENT],
+      managedAgents: [RESTART_AGENT],
     });
 
     await gotoAgentsView(page);
 
-    const badge = page
-      .getByTestId(`managed-agent-${STANDALONE_AGENT.pubkey}`)
-      .getByTestId("restart-diff-badge");
-    await badge.focus();
-    const tooltip = page.locator("[role=tooltip]");
-    await expect(tooltip).toBeVisible({ timeout: 5_000 });
+    const restartAction = page.getByTestId(
+      `agent-runtime-start-${RESTART_AGENT.pubkey}`,
+    );
+    await expect(restartAction).toBeVisible();
+    await expect(page.locator("html")).toHaveClass(/dark/);
+    expect(await renderedTextContrast(restartAction)).toBeGreaterThanOrEqual(
+      WCAG_AA_NORMAL_TEXT_CONTRAST,
+    );
   });
 
-  // ── Persona card tooltip (AgentIdentityCard — pointer-events-auto) ─────────
-
-  test("06-persona-card-tooltip", async ({ page }) => {
+  test("start and restart pills share geometry except for width", async ({
+    page,
+  }) => {
     await installMockBridge(page, {
-      activePersonaIds: ["builtin:fizz"],
-      managedAgents: [PERSONA_AGENT],
+      managedAgents: [START_AGENT, RESTART_AGENT],
     });
 
     await gotoAgentsView(page);
 
-    const personaCard = page.getByTestId(
-      `persona-agent-row-${PERSONA_AGENT.personaId}`,
+    const startAction = page.getByTestId(
+      `agent-runtime-start-${START_AGENT.pubkey}`,
     );
-    const badge = personaCard.getByTestId("restart-diff-badge");
-    await expect(badge).toBeVisible({ timeout: 10_000 });
-    await badge.hover();
-    const tooltip = page.locator("[role=tooltip]");
-    await expect(tooltip).toBeVisible({ timeout: 5_000 });
-
-    await waitForAnimations(page);
-    await page.screenshot({ path: `${SHOTS}/06-persona-card-tooltip.png` });
+    const restartAction = page.getByTestId(
+      `agent-runtime-start-${RESTART_AGENT.pubkey}`,
+    );
+    await expect(startAction).toHaveText("Start");
+    await expect(restartAction).toHaveText("Restart");
+
+    const relativeGeometry = async (locator: typeof startAction) =>
+      locator.evaluate((element) => {
+        const frame = element.parentElement?.parentElement?.parentElement;
+        if (!frame) throw new Error("Could not resolve avatar frame");
+        const bounds = element.getBoundingClientRect();
+        const frameBounds = frame.getBoundingClientRect();
+        return {
+          centerX: bounds.x + bounds.width / 2 - frameBounds.x,
+          centerY: bounds.y + bounds.height / 2 - frameBounds.y,
+          height: bounds.height,
+          width: bounds.width,
+        };
+      });
+
+    const [start, restart] = await Promise.all([
+      relativeGeometry(startAction),
+      relativeGeometry(restartAction),
+    ]);
+    expect(start.height).toBeCloseTo(restart.height, 2);
+    expect(start.centerX).toBeCloseTo(restart.centerX, 2);
+    expect(start.centerY).toBeCloseTo(restart.centerY, 2);
+    expect(start.width).toBeCloseTo(56, 2);
+    expect(restart.width).toBeCloseTo(72, 2);
   });
 
   // ── Runtime-tab banner with full uncapped diff ────────────────────────────
diff --git a/desktop/tests/e2e/onboarding-backup.spec.ts b/desktop/tests/e2e/onboarding-backup.spec.ts
index df3528c8bde..4b9040bd2b9 100644
--- a/desktop/tests/e2e/onboarding-backup.spec.ts
+++ b/desktop/tests/e2e/onboarding-backup.spec.ts
@@ -59,6 +59,9 @@ test("backup step appears on fresh-key path after profile submit", async ({
     page.getByRole("heading", { name: "Creating your identity key" }),
   ).toBeVisible();
   await expect(page.getByTestId("backup-intro-logo")).toBeVisible();
+  await expect(page.getByTestId("onboarding-next")).toBeVisible();
+  await expect(page.getByTestId("onboarding-next")).toBeDisabled();
+  await expect(page.getByTestId("onboarding-back")).toBeEnabled();
 
   await expect(
     page.getByRole("heading", {
@@ -66,6 +69,7 @@ test("backup step appears on fresh-key path after profile submit", async ({
     }),
   ).toBeVisible();
   await expect(page.getByTestId("backup-intro-logo")).toHaveCount(0);
+  await expect(page.getByTestId("onboarding-next")).toBeEnabled();
 });
 
 // ---------------------------------------------------------------------------
diff --git a/desktop/tests/e2e/onboarding.spec.ts b/desktop/tests/e2e/onboarding.spec.ts
index 57e812091cf..403edbcda13 100644
--- a/desktop/tests/e2e/onboarding.spec.ts
+++ b/desktop/tests/e2e/onboarding.spec.ts
@@ -202,8 +202,25 @@ async function expectWelcomeComposerBannerLayout(page: Page) {
   const bannerBox = await banner.boundingBox();
   const personaMentionBox = await personaMention.boundingBox();
   const composerBox = await composer.boundingBox();
+  const dockBackdropBox = await page
+    .getByTestId("composer-dock-backdrop")
+    .locator("div")
+    .boundingBox();
+  const guidanceLayer = page.getByTestId("welcome-composer-guidance-layer");
+  const guidanceLayerBox = await guidanceLayer.boundingBox();
+  const guidanceBackdrop = page.getByTestId(
+    "welcome-composer-guidance-backdrop",
+  );
+  const guidanceBackdropBox = await guidanceBackdrop.boundingBox();
 
-  if (!bannerBox || !personaMentionBox || !composerBox) {
+  if (
+    !bannerBox ||
+    !personaMentionBox ||
+    !composerBox ||
+    !dockBackdropBox ||
+    !guidanceLayerBox ||
+    !guidanceBackdropBox
+  ) {
     throw new Error("Could not measure welcome composer banner layout");
   }
 
@@ -211,12 +228,38 @@ async function expectWelcomeComposerBannerLayout(page: Page) {
     await composer.getByTestId("welcome-composer-guide-banner").count(),
   ).toBe(0);
   expect(bannerBox.y).toBeLessThan(composerBox.y);
-  expect(bannerBox.y + bannerBox.height).toBeGreaterThan(composerBox.y);
+  // Banner is in normal flow above the composer, no overlap.
+  expect(bannerBox.y + bannerBox.height).toBeLessThanOrEqual(composerBox.y);
+  // The dock backdrop is absolute inset-y-0 inside composer-dock, which now
+  // contains the guidance layer + composer in flow, so its top aligns with the
+  // guidance layer top (not the composer top).
+  expect(Math.abs(dockBackdropBox.y - guidanceLayerBox.y)).toBeLessThanOrEqual(
+    1,
+  );
+  expect(guidanceBackdropBox.y).toBeLessThanOrEqual(bannerBox.y);
+  // The guidance backdrop extends bottom-3 (12px) short of the banner's bottom,
+  // visually connecting up to the composer.
+  expect(guidanceBackdropBox.y + guidanceBackdropBox.height).toBeLessThan(
+    composerBox.y,
+  );
+  expect(
+    await page
+      .getByTestId("channel-composer-overlay")
+      .getByTestId("welcome-composer-guidance-layer")
+      .count(),
+  ).toBe(1);
+  expect(
+    await page
+      .getByTestId("composer-dock-backdrop")
+      .getByTestId("welcome-composer-guidance-layer")
+      .count(),
+  ).toBe(0);
 
   const radii = await banner.evaluate((element) => {
     const styles = window.getComputedStyle(element);
     return {
       backdropFilter: styles.backdropFilter,
+      backgroundColor: styles.backgroundColor,
       bottomLeft: styles.borderBottomLeftRadius,
       bottomRight: styles.borderBottomRightRadius,
       filter: styles.filter,
@@ -227,11 +270,24 @@ async function expectWelcomeComposerBannerLayout(page: Page) {
       willChange: styles.willChange,
     };
   });
+  const composerBackgroundColor = await composer.evaluate(
+    (element) => window.getComputedStyle(element).backgroundColor,
+  );
+  const dockBackdropFilter = await page
+    .getByTestId("composer-dock-backdrop")
+    .locator("div")
+    .evaluate((element) => window.getComputedStyle(element).backdropFilter);
+  const guidanceBackdropFilter = await guidanceBackdrop.evaluate(
+    (element) => window.getComputedStyle(element).backdropFilter,
+  );
 
   expect(radii.topLeft).toBe(radii.topRight);
   expect(radii.bottomLeft).toBe("0px");
   expect(radii.bottomRight).toBe("0px");
   expect(radii.backdropFilter).toBe("none");
+  expect(radii.backgroundColor).not.toBe(composerBackgroundColor);
+  expect(dockBackdropFilter).not.toBe("none");
+  expect(guidanceBackdropFilter).toBe(dockBackdropFilter);
   expect(radii.filter).toBe("none");
   expect(radii.transform).toBe("none");
   expect(radii.willChange).toBe("auto");
@@ -385,6 +441,11 @@ async function expectWelcomeComposerBannerCompletesAfterPersonaMention(
 ) {
   const banner = page.getByTestId("welcome-composer-guide-banner");
   const channelIntro = page.getByTestId("message-channel-intro");
+  const composer = page.getByTestId("message-composer");
+  const initialComposerBox = await composer.boundingBox();
+  if (!initialComposerBox) {
+    throw new Error("Could not measure the Welcome composer");
+  }
 
   await page.getByTestId("message-input").fill("Thanks @Fizz");
   await page.getByTestId("send-message").click();
@@ -403,6 +464,17 @@ async function expectWelcomeComposerBannerCompletesAfterPersonaMention(
   await expect(banner).toContainText("Nice work.");
   await expect(banner).not.toContainText("Try mentioning");
   await expect(channelIntro).toBeVisible();
+  const completeComposerBox = await composer.boundingBox();
+  expect(completeComposerBox).not.toBeNull();
+  expect(
+    Math.abs((completeComposerBox?.y ?? 0) - initialComposerBox.y),
+  ).toBeLessThanOrEqual(1);
+  await expect(banner).toHaveCount(0, { timeout: 6_000 });
+  const hiddenComposerBox = await composer.boundingBox();
+  expect(hiddenComposerBox).not.toBeNull();
+  expect(
+    Math.abs((hiddenComposerBox?.y ?? 0) - initialComposerBox.y),
+  ).toBeLessThanOrEqual(1);
 }
 
 async function getMockChannels(page: Page) {
@@ -620,6 +692,99 @@ test("completed users skip the loading gate while profile is still settling", as
   await expectHomeView(page);
 });
 
+test("fresh existing-identity path leads with private-key recovery", async ({
+  page,
+}) => {
+  await installMockBridge(page, undefined, {
+    skipCommunitySeed: true,
+    skipOnboardingSeed: true,
+  });
+  await page.goto("/");
+
+  await page.getByRole("button", { name: "Use an existing key" }).click();
+  await expect(
+    page.getByRole("heading", { name: "Enter your private key" }),
+  ).toBeVisible();
+  await expect(
+    page.getByText("Paste your private key to sign in to Buzz."),
+  ).toBeVisible();
+  await expect(page.getByTestId("nostr-import-card")).toBeVisible();
+  await expect(page.getByTestId("nostr-import-file-button")).toHaveText(
+    "backup file",
+  );
+  await expect(page.getByTestId("nostr-import-phone-link")).toHaveText(
+    "recover from your phone",
+  );
+  await expect(page.getByTestId("identity-recovery-pairing")).toHaveCount(0);
+
+  await page.getByTestId("nostr-import-file-button").click();
+  const backupDialog = page.getByTestId("backup-recovery-dialog");
+  await expect(backupDialog).toBeVisible();
+  await expect(
+    backupDialog.getByRole("heading", { name: "Restore from a backup file" }),
+  ).toBeVisible();
+  await expect(
+    backupDialog.getByTestId("nostr-import-backup-picker"),
+  ).toBeVisible();
+  const unlockPreview = backupDialog.getByTestId("backup-file-unlock-preview");
+  await expect(unlockPreview).toBeVisible();
+  await expect(unlockPreview.locator("span")).toHaveCount(17);
+  await expect(
+    unlockPreview.getByTestId("backup-file-key-dots").locator("span"),
+  ).toHaveCount(9);
+  await expect(
+    unlockPreview.getByTestId("backup-file-unlock-preview-icon"),
+  ).toBeVisible();
+  await expect(
+    backupDialog.getByTestId("nostr-import-backup-drop"),
+  ).toHaveCount(0);
+  await backupDialog
+    .getByTestId("nostr-import-backup-picker")
+    .evaluate((element) => {
+      const dataTransfer = new DataTransfer();
+      dataTransfer.items.add(
+        new File(["backup"], "identity.ncryptsec", { type: "text/plain" }),
+      );
+      element.dispatchEvent(
+        new DragEvent("dragenter", {
+          bubbles: true,
+          cancelable: true,
+          dataTransfer,
+        }),
+      );
+    });
+  const backupDrop = backupDialog.getByTestId("nostr-import-backup-drop");
+  await expect(backupDrop).toHaveAttribute("data-dragging", "true");
+  await expect(backupDrop).toContainText("Drop your backup file here");
+  const [backupDropBox, backupFileSectionBox] = await Promise.all([
+    backupDrop.boundingBox(),
+    unlockPreview.boundingBox(),
+  ]);
+  expect(backupDropBox?.width).toBeGreaterThan(
+    backupFileSectionBox?.width ?? 0,
+  );
+  await expect(
+    backupDialog.getByTestId("nostr-import-backup-picker"),
+  ).toBeVisible();
+  await backupDrop.evaluate((element) => {
+    element.dispatchEvent(
+      new DragEvent("dragleave", { bubbles: true, cancelable: true }),
+    );
+  });
+  await expect(backupDrop).toHaveCount(0);
+  await expect(page.getByTestId("nostr-import-card")).toBeVisible();
+  await backupDialog.getByRole("button", { name: "Close" }).click();
+
+  await page.getByTestId("nostr-import-phone-link").click();
+  const phoneDialog = page.getByTestId("phone-recovery-dialog");
+  await expect(phoneDialog).toBeVisible();
+  await expect(
+    phoneDialog.getByRole("heading", { name: "Use your Buzz identity" }),
+  ).toBeVisible();
+  await expect(phoneDialog.getByTestId("identity-recovery-qr")).toBeVisible();
+  await expect(page.getByTestId("nostr-import-card")).toBeVisible();
+});
+
 test("first-launch key import continues to machine setup", async ({ page }) => {
   await installMockBridge(page, undefined, {
     skipCommunitySeed: true,
@@ -637,6 +802,32 @@ test("first-launch key import continues to machine setup", async ({ page }) => {
   await expect(page.getByTestId("app-loading-gate")).toHaveCount(0);
 });
 
+test("imported-key users can skip out of harness setup", async ({ page }) => {
+  // Regression: importing an existing key sets the onboarding state machine's
+  // "continuing" marker, which pinned the stage to onboarding even after
+  // complete() ran — so Skip/Next silently did nothing. The fresh-key skip
+  // tests never exercised the import path, so this gap shipped. Prove an
+  // imported-key user actually leaves onboarding on Skip.
+  await installMockBridge(page, undefined, {
+    skipCommunitySeed: true,
+    skipOnboardingSeed: true,
+  });
+  await page.goto("/");
+
+  await page.getByRole("button", { name: "Use an existing key" }).click();
+  const importedNsec = nsecEncode(hexToBytes(TEST_IDENTITIES.alice.privateKey));
+  await page.getByTestId("nostr-import-nsec-input").fill(importedNsec);
+  await page.getByTestId("nostr-import-submit").click();
+
+  await expect(page.getByTestId("onboarding-page-2")).toBeVisible();
+  await page.getByTestId("onboarding-setup-skip").click();
+
+  // Reaching community onboarding proves machine onboarding completed rather
+  // than staying pinned on the setup step.
+  await expect(page.getByText("Join or create a community")).toBeVisible();
+  await expect(page.getByTestId("onboarding-page-2")).toHaveCount(0);
+});
+
 test("first-launch encrypted backup import asks for a passphrase and continues", async ({
   page,
 }) => {
@@ -707,8 +898,10 @@ test("first-launch import accepts an .ncryptsec backup file", async ({
   // exactly the identity.ncryptsec our own save dialog produced. The accept
   // attribute is asserted explicitly because setInputFiles bypasses it — the
   // OS picker is what filters on it in real use.
-  await expect(page.getByTestId("nostr-import-file-button")).toBeVisible();
-  const fileInput = page.getByTestId("nostr-import-file-input");
+  await page.getByTestId("nostr-import-file-button").click();
+  const fileInput = page
+    .getByTestId("backup-recovery-dialog")
+    .getByTestId("nostr-import-file-input");
   await expect(fileInput).toHaveAttribute(
     "accept",
     ".key,.ncryptsec,text/plain",
@@ -719,44 +912,87 @@ test("first-launch import accepts an .ncryptsec backup file", async ({
     mimeType: "text/plain",
     name: "not-a-backup.txt",
   });
-  await expect(page.getByTestId("nostr-import-feedback")).toContainText(
-    /too large to be a key backup/i,
-  );
+  await expect(
+    page
+      .getByTestId("backup-recovery-dialog")
+      .getByTestId("nostr-import-feedback"),
+  ).toContainText(/too large to be a key backup/i);
 
   // Spec-vector blob the mock bridge accepts with the mock passphrase.
   const mockNcryptsec =
     "ncryptsec1qgg9947rlpvqu76pj5ecreduf9jxhselq2nae2kghhvd5g7dgjtcxfqtd67p9m0w57lspw8gsq6yphnm8623nsl8xn9j4jdzz84zm3frztj3z7s35vpzmqf6ksu8r89qk5z2zxfmu5gv8th8wclt0h4p";
-  await fileInput.setInputFiles({
-    buffer: Buffer.from(`${mockNcryptsec}\n`),
-    mimeType: "text/plain",
-    name: "identity.ncryptsec",
+  // File contents advance to the password stage inside the same dialog.
+  const backupDialog = page.getByTestId("backup-recovery-dialog");
+  const backupFileSection = backupDialog.getByTestId(
+    "nostr-import-backup-file-section",
+  );
+  const backupFileSectionHeight = await backupFileSection.evaluate((element) =>
+    Number.parseFloat(getComputedStyle(element).height),
+  );
+  expect(backupFileSectionHeight).toBe(312);
+  const backupPicker = backupDialog.getByTestId("nostr-import-backup-picker");
+  await backupPicker.evaluate((element) => {
+    const dataTransfer = new DataTransfer();
+    dataTransfer.items.add(
+      new File(["backup"], "identity.ncryptsec", { type: "text/plain" }),
+    );
+    element.dispatchEvent(
+      new DragEvent("dragenter", {
+        bubbles: true,
+        cancelable: true,
+        dataTransfer,
+      }),
+    );
   });
+  const backupDrop = backupDialog.getByTestId("nostr-import-backup-drop");
+  await expect(backupDrop).toBeVisible();
+  await backupDrop.evaluate((element, contents) => {
+    const dataTransfer = new DataTransfer();
+    dataTransfer.items.add(
+      new File([contents], "identity.ncryptsec", { type: "text/plain" }),
+    );
+    element.dispatchEvent(
+      new DragEvent("drop", {
+        bubbles: true,
+        cancelable: true,
+        dataTransfer,
+      }),
+    );
+  }, `${mockNcryptsec}\n`);
 
-  // File contents advance to the same focused password stage as manual input.
   await expect(
-    page.getByRole("heading", { name: "Unlock your account" }),
+    backupDialog.getByTestId("backup-password-timeline"),
   ).toBeVisible();
-  await expect(page.getByTestId("backup-password-timeline")).toBeVisible();
-  await expect(page.getByTestId("nostr-import-passphrase")).toBeFocused();
+  const passphraseSection = backupDialog.getByTestId(
+    "nostr-import-passphrase-section",
+  );
+  await expect(passphraseSection).toBeVisible();
+  const passphraseSectionHeight = await passphraseSection.evaluate((element) =>
+    Number.parseFloat(getComputedStyle(element).height),
+  );
+  expect(passphraseSectionHeight).toBe(backupFileSectionHeight);
+  await expect(
+    backupDialog.getByTestId("nostr-import-passphrase"),
+  ).toBeFocused();
 
-  // Back first returns to key/file selection instead of leaving import.
-  await page.getByRole("button", { name: "Back", exact: true }).click();
+  // Back first returns to backup-file selection instead of closing the dialog.
+  await backupDialog.getByRole("button", { name: "Back", exact: true }).click();
   await expect(
-    page.getByRole("heading", { name: "Enter your private key" }),
+    backupDialog.getByRole("heading", { name: "Restore from a backup file" }),
+  ).toBeVisible();
+  await expect(
+    backupDialog.getByTestId("nostr-import-backup-picker"),
   ).toBeVisible();
-  await expect(page.getByTestId("nostr-import-card")).toBeVisible();
-  await expect(page.getByTestId("nostr-import-file-button")).toBeVisible();
-  await expect(page.getByTestId("nostr-import-nsec-input")).toHaveValue("");
 
   await fileInput.setInputFiles({
     buffer: Buffer.from(`${mockNcryptsec}\n`),
     mimeType: "text/plain",
     name: "identity.ncryptsec",
   });
-  await page
+  await backupDialog
     .getByTestId("nostr-import-passphrase")
     .fill("mock horse battery staple lake orbit");
-  await page.getByTestId("nostr-import-submit").click();
+  await backupDialog.getByTestId("nostr-import-submit").click();
 
   await expect(page.getByTestId("onboarding-page-2")).toBeVisible();
   await expect(page.getByTestId("machine-onboarding-gate")).toBeVisible();
@@ -2774,27 +3010,6 @@ test("first-run onboarding keeps the shell hidden and lands on private Welcome a
   await expectWelcomeGuideIntro(page);
 });
 
-function retryToast(page: Page, title: string) {
-  return page
-    .locator("[data-sonner-toast][data-removed='false']")
-    .filter({ hasText: title });
-}
-
-async function retryToastAction(
-  page: Page,
-  { command, title }: { command: string; title: string },
-) {
-  const activeToast = retryToast(page, title);
-  await expect(
-    activeToast.getByRole("button", { name: "Retry" }),
-  ).toBeVisible();
-  const before = await commandCount(page, command);
-  await activeToast
-    .getByRole("button", { name: "Retry" })
-    .dispatchEvent("click");
-  await expect.poll(() => commandCount(page, command)).toBeGreaterThan(before);
-}
-
 async function commandCount(page: Page, command: string) {
   return page.evaluate(
     (target) =>
@@ -2804,16 +3019,14 @@ async function commandCount(page: Page, command: string) {
   );
 }
 
-test("failed starter channel retries recreate actionable toasts", async ({
+test("failed public starter channel setup does not show a retry toast", async ({
   page,
 }) => {
   const starterError = "Mock starter channel setup failed.";
   await seedActiveIdentity(page, BLANK_TYLER_IDENTITY);
   await installMockBridge(
     page,
-    {
-      ensureStarterChannelsErrors: [starterError, starterError, starterError],
-    },
+    { ensureStarterChannelsErrors: [starterError, starterError] },
     { skipOnboardingSeed: true },
   );
   await page.goto("/");
@@ -2822,45 +3035,12 @@ test("failed starter channel retries recreate actionable toasts", async ({
   await completeProfileOnboarding(page);
 
   await expectPrivateWelcomeLanding(page);
-  const title = "Couldn't set up starter channels";
-  const activeToast = retryToast(page, title);
-  await expect(activeToast).toContainText(starterError);
-  await retryToastAction(page, {
-    command: "ensure_starter_channels",
-    title,
-  });
-  await expect(activeToast).toContainText(starterError);
   await expect(
-    activeToast.getByRole("button", { name: "Retry" }),
-  ).toBeVisible();
-});
-
-test("successful starter channel retry clears its actionable toast", async ({
-  page,
-}) => {
-  const starterError = "Mock starter channel setup failed.";
-  await seedActiveIdentity(page, BLANK_TYLER_IDENTITY);
-  await installMockBridge(
-    page,
-    {
-      ensureStarterChannelsErrors: [starterError, starterError],
-    },
-    { skipOnboardingSeed: true },
-  );
-  await page.goto("/");
-
-  await page.getByTestId("onboarding-display-name").fill("Morty QA");
-  await completeProfileOnboarding(page);
-
-  const title = "Couldn't set up starter channels";
-  await expect(retryToast(page, title)).toContainText(starterError);
-  await retryToastAction(page, {
-    command: "ensure_starter_channels",
-    title,
-  });
-  await expect(retryToast(page, title)).toHaveCount(0);
-  await expectWelcomeView(page);
-  await expectStarterChannels(page);
+    page
+      .locator("[data-sonner-toast][data-removed='false']")
+      .filter({ hasText: "Couldn't set up starter channels" }),
+  ).toHaveCount(0);
+  expect(await commandCount(page, "ensure_starter_channels")).toBe(2);
 });
 
 test("first-run onboarding posts the live Fizz kickoff", async ({ page }) => {
@@ -2989,6 +3169,61 @@ test("finishing onboarding creates starter channels and focuses welcome-everyone
   await expectWelcomeComposerBannerCompletesAfterPersonaMention(page);
 });
 
+test("welcome-everywhere banner: X dismiss removes the guidance surface", async ({
+  page,
+}) => {
+  await seedActiveIdentity(page, BLANK_TYLER_IDENTITY);
+  await installMockBridge(page, undefined, { skipOnboardingSeed: true });
+  await page.goto("/");
+
+  await page.getByTestId("onboarding-display-name").fill("Morty QA");
+  await completeProfileOnboarding(page);
+
+  const banner = page.getByTestId("welcome-composer-guide-banner");
+  const guidanceLayer = page.getByTestId("welcome-composer-guidance-layer");
+  const dismissButton = page.getByTestId("welcome-composer-dismiss-button");
+
+  // Banner and guidance layer are visible in the prompt state.
+  await expect(banner).toBeVisible();
+  await expect(guidanceLayer).toBeVisible();
+  await expect(dismissButton).toBeVisible();
+
+  await dismissButton.click();
+
+  // After dismiss the entire guidance surface must be gone.
+  await expect(banner).toHaveCount(0, { timeout: 2_000 });
+  await expect(guidanceLayer).toHaveCount(0);
+});
+
+test("welcome-everywhere banner: dismiss persists after channel re-entry", async ({
+  page,
+}) => {
+  await seedActiveIdentity(page, BLANK_TYLER_IDENTITY);
+  await installMockBridge(page, undefined, { skipOnboardingSeed: true });
+  await page.goto("/");
+
+  await page.getByTestId("onboarding-display-name").fill("Morty QA");
+  await completeProfileOnboarding(page);
+
+  const banner = page.getByTestId("welcome-composer-guide-banner");
+
+  await expect(banner).toBeVisible();
+  await page.getByTestId("welcome-composer-dismiss-button").click();
+  await expect(banner).toHaveCount(0, { timeout: 2_000 });
+
+  // Leave the Welcome channel.
+  await page.getByTestId("channel-general").click();
+  await expect(page.getByTestId("chat-title")).toContainText("general");
+  await expect(banner).toHaveCount(0);
+
+  // Return — banner must stay hidden.
+  await page.getByTestId("channel-welcome-everyone").click();
+  await expect(page.getByTestId("chat-title")).toContainText(
+    "welcome-everyone",
+  );
+  await expect(banner).toHaveCount(0);
+});
+
 test("initial profile read failures still hold incomplete users in onboarding", async ({
   page,
 }) => {
diff --git a/desktop/tests/e2e/persona-env-vars.spec.ts b/desktop/tests/e2e/persona-env-vars.spec.ts
index 60a8e888b2a..8827fd0bb8b 100644
--- a/desktop/tests/e2e/persona-env-vars.spec.ts
+++ b/desktop/tests/e2e/persona-env-vars.spec.ts
@@ -267,10 +267,9 @@ test("env vars editor renders in PersonaDialog new-persona form", async ({
 }) => {
   await gotoApp(page);
 
-  // Open the Agents view, then choose Create agent from the new-agent menu.
+  // Open the Agents view; the new-agent card opens the embedded create pane.
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create agent" }).click();
 
   // Scope all env-vars queries to the dialog: AgentDefaultsSettingsCard
   // also renders an EnvVarsEditor in the background settings pane (introduced
@@ -315,7 +314,6 @@ test("persona model options follow the selected LLM provider", async ({
 
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create agent" }).click();
 
   const provider = page.locator("#persona-runtime");
   await page.getByRole("tab", { name: "Customize for this agent" }).click();
diff --git a/desktop/tests/e2e/persona-model-combobox-screenshots.spec.ts b/desktop/tests/e2e/persona-model-combobox-screenshots.spec.ts
index 508b123d7f1..5afc5344baf 100644
--- a/desktop/tests/e2e/persona-model-combobox-screenshots.spec.ts
+++ b/desktop/tests/e2e/persona-model-combobox-screenshots.spec.ts
@@ -36,7 +36,6 @@ async function openNewPersonaDialog(page: import("@playwright/test").Page) {
   });
 
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create agent" }).click();
 
   const dialog = page.getByTestId("persona-dialog");
   await expect(dialog).toBeVisible({ timeout: 8_000 });
diff --git a/desktop/tests/e2e/project-commit-detail.spec.ts b/desktop/tests/e2e/project-commit-detail.spec.ts
index 9b516473352..4b386f57eaf 100644
--- a/desktop/tests/e2e/project-commit-detail.spec.ts
+++ b/desktop/tests/e2e/project-commit-detail.spec.ts
@@ -93,7 +93,8 @@ test("top-level project lists align dates and overflow actions", async ({
   await expect(
     repositoryRow.getByTestId("repositories-row-branch"),
   ).toContainText("main");
-  await expect(repositoryRow.locator("p")).toHaveText("buzz");
+  // Subtitle is the repository location (owner/repo for Buzz-hosted repos).
+  await expect(repositoryRow.locator("p")).toHaveText(/\/buzz$/);
   const repositoryPositions = await trailingPositions(repositoryRow, {
     actionName: /More options for/,
     dateTestId: "repositories-row-date",
@@ -526,7 +527,7 @@ test("commit detail opens from the commits feed with a diff", async ({
     page.getByRole("button", { name: "Copy commit hash" }),
   ).toBeVisible();
   await expect(
-    page.getByRole("link", { name: "project guide" }),
+    page.getByRole("link", { name: "project guide", exact: true }),
   ).toHaveAttribute("href", "https://example.com/project-guide");
   await expect(
     page.getByRole("button", { name: "Architecture" }),
diff --git a/desktop/tests/e2e/smoke.spec.ts b/desktop/tests/e2e/smoke.spec.ts
index 0f61de0f7c4..58ed2975942 100644
--- a/desktop/tests/e2e/smoke.spec.ts
+++ b/desktop/tests/e2e/smoke.spec.ts
@@ -138,7 +138,6 @@ test("Buzz shared compute explains automatic model selection", async ({
   });
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create agent" }).click();
   await chooseSharedComputeProvider(page);
 
   await expect
@@ -167,7 +166,6 @@ test("create agent persists Buzz shared compute with auto model", async ({
   await page.goto("/");
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create agent" }).click();
   await page.locator("#persona-display-name").fill(agentName);
 
   await chooseSharedComputeProvider(page);
@@ -175,9 +173,12 @@ test("create agent persists Buzz shared compute with auto model", async ({
   const model = page.locator("#persona-model");
   await expect(model).toContainText("Automatic");
   await page.getByTestId("persona-dialog-submit").click();
-  await expect(
-    page.getByRole("heading", { name: "Agent created" }),
-  ).toBeVisible({ timeout: 10_000 });
+  const createdToast = page
+    .locator("[data-sonner-toast][data-removed='false']")
+    .filter({ hasText: "Agent created" });
+  await expect(createdToast).toBeVisible({ timeout: 10_000 });
+  await expect(createdToast).toHaveCount(1);
+  await expect(page.getByRole("dialog")).toHaveCount(0);
 
   const createPayload = await page.evaluate((name) => {
     const log = (
@@ -211,7 +212,6 @@ test("create agent supports parallelism and system prompt overrides", async ({
   await page.goto("/");
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create agent" }).click();
 
   await page.locator("#persona-display-name").fill(agentName);
   await page
@@ -252,10 +252,12 @@ test("create agent supports parallelism and system prompt overrides", async ({
   // the definition (agents always start after creation).
   await page.getByTestId("persona-dialog-submit").click();
 
-  await expect(
-    page.getByRole("heading", { name: "Agent created" }),
-  ).toBeVisible({ timeout: 10_000 });
-  await page.getByRole("button", { name: "Done" }).click();
+  const createdToast = page
+    .locator("[data-sonner-toast][data-removed='false']")
+    .filter({ hasText: "Agent created" });
+  await expect(createdToast).toBeVisible({ timeout: 10_000 });
+  await expect(createdToast).toHaveCount(1);
+  await expect(page.getByRole("dialog")).toHaveCount(0);
 
   await expect(page.getByTestId("agents-library-personas")).toContainText(
     agentName,
diff --git a/desktop/tests/e2e/thread-focus-mode.spec.ts b/desktop/tests/e2e/thread-focus-mode.spec.ts
index 8bb9a3b52be..36eb0630baa 100644
--- a/desktop/tests/e2e/thread-focus-mode.spec.ts
+++ b/desktop/tests/e2e/thread-focus-mode.spec.ts
@@ -30,17 +30,37 @@ async function seedLongThread(page: import("@playwright/test").Page) {
   });
 }
 
-async function topVisibleMessageId(
+async function scrollToMiddleVisibleMessage(
   body: import("@playwright/test").Locator,
+  threadRootId: string,
 ): Promise<string> {
-  return body.evaluate((element) => {
-    const top = element.getBoundingClientRect().top;
-    const row = Array.from(
-      element.querySelectorAll<HTMLElement>("[data-message-id]"),
-    ).find((candidate) => candidate.getBoundingClientRect().bottom > top);
-    if (!row?.dataset.messageId) throw new Error("No visible thread anchor");
-    return row.dataset.messageId;
-  });
+  let anchorId: string | null = null;
+  await expect
+    .poll(async () => {
+      anchorId = await body.evaluate((element) => {
+        const maxScrollTop = element.scrollHeight - element.clientHeight;
+        if (maxScrollTop <= 0) return null;
+
+        const targetScrollTop = Math.floor(maxScrollTop * 0.4);
+        element.scrollTop = targetScrollTop;
+        element.dispatchEvent(new Event("scroll", { bubbles: true }));
+
+        if (Math.abs(element.scrollTop - targetScrollTop) > 1) return null;
+        const bounds = element.getBoundingClientRect();
+        const row = Array.from(
+          element.querySelectorAll<HTMLElement>("[data-message-id]"),
+        ).find((candidate) => {
+          const rect = candidate.getBoundingClientRect();
+          return rect.bottom > bounds.top && rect.top < bounds.bottom;
+        });
+        return row?.dataset.messageId ?? null;
+      });
+      return anchorId !== null && anchorId !== threadRootId;
+    })
+    .toBe(true);
+
+  if (!anchorId) throw new Error("No visible middle-thread anchor");
+  return anchorId;
 }
 
 /**
@@ -181,11 +201,7 @@ test("focus and split preserve reading context and interaction ownership", async
     .toBe(true);
   await expect(channel).toHaveAttribute("inert", "");
 
-  await body.evaluate((element) => {
-    element.scrollTop = element.scrollHeight * 0.4;
-    element.dispatchEvent(new Event("scroll", { bubbles: true }));
-  });
-  const anchorId = await topVisibleMessageId(body);
+  const anchorId = await scrollToMiddleVisibleMessage(body, rootId);
 
   const focusModeToggle = page.getByRole("button", {
     name: "Show thread beside channel",
diff --git a/desktop/tests/e2e/video-attachment.spec.ts b/desktop/tests/e2e/video-attachment.spec.ts
index 488485292e5..763d54b8726 100644
--- a/desktop/tests/e2e/video-attachment.spec.ts
+++ b/desktop/tests/e2e/video-attachment.spec.ts
@@ -624,12 +624,20 @@ test("video upload previews use poster frames and inline videos open review mode
   // must not remount the review dialog or wipe an in-progress comment draft.
   await commentBox.click();
   await commentBox.fill("Second pass note");
+  const commentEditor = await commentBox.elementHandle();
+  if (!commentEditor) {
+    throw new Error("Expected the review comment editor to be mounted.");
+  }
   await emitMockMessage(page, "general", "Unrelated chatter mid-review");
-  await expect(
-    page
-      .getByTestId("message-row")
-      .filter({ hasText: "Unrelated chatter mid-review" }),
-  ).toHaveCount(1);
+  await page.evaluate(
+    () =>
+      new Promise<void>((resolve) => {
+        requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
+      }),
+  );
+  expect(await commentEditor.evaluate((element) => element.isConnected)).toBe(
+    true,
+  );
   await expect(commentBox).toHaveText("Second pass note");
   await expect(commentBox).toBeFocused();
   await expect(page.getByTestId("video-review-composer-timecode")).toHaveText(
@@ -746,6 +754,14 @@ test("video upload previews use poster frames and inline videos open review mode
     .click({ position: { x: 4, y: 4 } });
   await expect(page.getByTestId("video-review-dialog")).toHaveCount(0);
 
+  // Re-open the channel so the thread summary is sourced from the persisted
+  // mock history instead of depending on whether the background timeline row
+  // stayed mounted while the modal handled live comment updates.
+  await page.getByTestId("channel-random").click();
+  await expect(page.getByTestId("chat-title")).toHaveText("random");
+  await page.getByTestId("channel-general").click();
+  await expect(page.getByTestId("chat-title")).toHaveText("general");
+
   const videoSummaryRow = page.locator(
     `[data-thread-head-id="${videoMessageId}"]`,
   );
@@ -771,6 +787,103 @@ test("video upload previews use poster frames and inline videos open review mode
   ).toContainText("Color pass looks right");
 });
 
+test("inline video hover reveals a timeline without a second play control", async ({
+  page,
+}) => {
+  await installVideoReviewHarness(page);
+
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await expect(page.getByTestId("chat-title")).toHaveText("general");
+  await waitForMockLiveSubscription(page, "general");
+
+  await emitMockMessage(page, "general", `![video](${VIDEO_URL})`, {
+    extraTags: [
+      [
+        "imeta",
+        `url ${VIDEO_URL}`,
+        "m video/mp4",
+        `x ${VIDEO_SHA}`,
+        "size 987654",
+        "dim 160x80",
+        "duration 12.5",
+        `image ${POSTER_DATA_URL}`,
+        "filename launch-demo.mp4",
+      ],
+    ],
+  });
+
+  const player = page.getByTestId("video-player").last();
+  const video = player.locator("video");
+  const surface = video.locator("..");
+  const centerPlayback = player.getByTestId("video-inline-center-playback");
+  const centerIcon = player.getByTestId("video-inline-center-icon");
+  const controls = player.getByTestId("video-inline-controls");
+
+  await expect(centerPlayback).toHaveAttribute("aria-label", "Play video");
+  await expect(
+    controls.getByRole("button", { name: /^(?:Play|Pause) video$/ }),
+  ).toHaveCount(0);
+  await expect(
+    player.getByRole("button", { name: "Open video review" }),
+  ).toBeVisible();
+  await expect(player.getByTestId("video-inline-duration")).toHaveText("00:12");
+
+  await video.evaluate((element) => {
+    element.currentTime = 6.25;
+    element.dispatchEvent(new Event("timeupdate"));
+  });
+  await expect
+    .poll(() =>
+      player
+        .getByTestId("video-inline-progress-fill")
+        .evaluate((element) => element.style.width),
+    )
+    .toBe("50%");
+
+  const restingControlsBox = await controls.boundingBox();
+  const restingIconTransform = await centerIcon.evaluate(
+    (element) => window.getComputedStyle(element).transform,
+  );
+  expect(restingControlsBox).not.toBeNull();
+  await expect(controls).toHaveCSS("opacity", "0");
+  await surface.hover();
+  await expect(controls).toHaveCSS("opacity", "1");
+  const hoveredControlsBox = await controls.boundingBox();
+  expect(hoveredControlsBox).not.toBeNull();
+  expect(
+    Math.abs((hoveredControlsBox?.y ?? 0) - (restingControlsBox?.y ?? 0)),
+  ).toBeLessThan(0.5);
+  await expect
+    .poll(() =>
+      centerIcon.evaluate(
+        (element) => window.getComputedStyle(element).transform,
+      ),
+    )
+    .toBe(restingIconTransform);
+
+  await centerPlayback.click();
+  await expect
+    .poll(() => video.evaluate((element) => element.paused))
+    .toBe(false);
+  await expect(centerPlayback).toHaveAttribute("aria-label", "Pause video");
+  await page.mouse.move(0, 0);
+  await expect(centerPlayback).toHaveCSS("opacity", "0");
+  await surface.hover();
+  await expect(centerPlayback).toHaveCSS("opacity", "1");
+  await expect(centerPlayback).toHaveCSS("transition-property", "opacity");
+  await expect(centerPlayback).toHaveCSS("transition-duration", "0.15s");
+
+  await page.emulateMedia({ reducedMotion: "reduce" });
+  await expect(centerPlayback).toHaveCSS("transition-property", "none");
+  await expect(controls).toHaveCSS("transition-property", "none");
+
+  await centerPlayback.click();
+  await expect
+    .poll(() => video.evaluate((element) => element.paused))
+    .toBe(true);
+});
+
 test("video replies in threads open the review comments view", async ({
   page,
 }) => {
@@ -791,6 +904,19 @@ test("video replies in threads open the review comments view", async ({
     "general",
     `![video](${VIDEO_URL})`,
     {
+      extraTags: [
+        [
+          "imeta",
+          `url ${VIDEO_URL}`,
+          "m video/mp4",
+          `x ${VIDEO_SHA}`,
+          "size 987654",
+          "dim 160x80",
+          "duration 12.5",
+          `image ${POSTER_DATA_URL}`,
+          "filename launch-demo.mp4",
+        ],
+      ],
       parentEventId: root.id,
     },
   )) as { id: string };
@@ -808,9 +934,73 @@ test("video replies in threads open the review comments view", async ({
     name: "Open video review",
   });
   await expect(reviewButton).toBeVisible();
-  await reviewButton.click();
+  const nestedVideoSummary = threadReplies.locator(
+    `[data-thread-head-id="${videoReply.id}"]`,
+  );
+  await expect(nestedVideoSummary).toBeVisible();
+  await expect(threadReplies.locator("video")).toHaveAttribute(
+    "preload",
+    "metadata",
+  );
+  await nestedVideoSummary.click();
+  const outsideTimecode = threadReplies.getByRole("button", {
+    name: "Jump to 00:01",
+  });
+  await expect(outsideTimecode).toBeVisible();
+  await expect(outsideTimecode).toHaveAttribute(
+    "data-testid",
+    "video-review-comment-timecode",
+  );
+  const outsideTimecodeStyles = await outsideTimecode.evaluate((element) => {
+    const styles = window.getComputedStyle(element);
+    return {
+      backgroundColor: styles.backgroundColor,
+      borderRadius: styles.borderRadius,
+      fontFamily: styles.fontFamily,
+      height: styles.height,
+      paddingLeft: styles.paddingLeft,
+      paddingRight: styles.paddingRight,
+    };
+  });
+  expect(outsideTimecodeStyles.backgroundColor).not.toBe("rgba(0, 0, 0, 0)");
+  await outsideTimecode.click();
 
   const reviewDialog = page.getByTestId("video-review-dialog");
+  const reviewVideo = reviewDialog.locator("video");
+  const posterPreview = reviewDialog.getByTestId("video-review-poster-preview");
+  await expect(posterPreview).toBeVisible();
+  await expect(posterPreview).toHaveAttribute("src", POSTER_DATA_URL);
+  await expect(
+    reviewDialog.getByTestId("video-review-comments-panel"),
+  ).toHaveCSS("background-color", "oklch(0.145 0 0)");
+  const modalTimecode = reviewDialog
+    .getByRole("button", { name: "Jump to 00:01" })
+    .first();
+  await expect(modalTimecode).toBeVisible();
+  const modalTimecodeStyles = await modalTimecode.evaluate((element) => {
+    const styles = window.getComputedStyle(element);
+    return {
+      borderRadius: styles.borderRadius,
+      fontFamily: styles.fontFamily,
+      height: styles.height,
+      paddingLeft: styles.paddingLeft,
+      paddingRight: styles.paddingRight,
+    };
+  });
+  expect(outsideTimecodeStyles).toMatchObject(modalTimecodeStyles);
+  await expect(reviewVideo).toHaveAttribute("preload", "auto");
+  await expect
+    .poll(() =>
+      reviewVideo.evaluate((video) => (video as HTMLVideoElement).paused),
+    )
+    .toBe(true);
+  await expect
+    .poll(() =>
+      reviewVideo.evaluate((video) => (video as HTMLVideoElement).currentTime),
+    )
+    .toBe(1);
+  await reviewVideo.dispatchEvent("loadeddata");
+  await expect(posterPreview).toHaveCount(0);
   await expect(
     reviewDialog.getByTestId("video-review-comments-panel"),
   ).toBeVisible();
@@ -820,6 +1010,76 @@ test("video replies in threads open the review comments view", async ({
   );
 });
 
+test("message timecodes deterministically open the first attached video", async ({
+  page,
+}) => {
+  await installVideoReviewHarness(page);
+
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await expect(page.getByTestId("chat-title")).toHaveText("general");
+  await waitForMockLiveSubscription(page, "general");
+
+  const videoMessage = (await emitMockMessage(
+    page,
+    "general",
+    `![first video](${VIDEO_URL})\n\n![second video](${PORTRAIT_VIDEO_URL})`,
+    {
+      extraTags: [
+        [
+          "imeta",
+          `url ${VIDEO_URL}`,
+          "m video/mp4",
+          `x ${VIDEO_SHA}`,
+          "dim 160x80",
+          "duration 12.5",
+          "filename first-cut.mp4",
+        ],
+        [
+          "imeta",
+          `url ${PORTRAIT_VIDEO_URL}`,
+          "m video/mp4",
+          `x ${PORTRAIT_VIDEO_SHA}`,
+          "dim 80x160",
+          "duration 12.5",
+          "filename second-cut.mp4",
+        ],
+      ],
+    },
+  )) as { id: string };
+  await emitMockMessage(page, "general", "[00:01] Check this frame.", {
+    parentEventId: videoMessage.id,
+  });
+
+  const threadSummary = page.locator(
+    `[data-thread-head-id="${videoMessage.id}"]`,
+  );
+  await expect(threadSummary).toBeVisible();
+  await threadSummary.click();
+
+  const threadPanel = page.getByTestId("message-thread-panel");
+  const threadHead = threadPanel.getByTestId("message-thread-head");
+  const inlineVideos = threadHead.locator("video");
+  await expect(inlineVideos).toHaveCount(2);
+  const firstVideoSrc = await inlineVideos.nth(0).getAttribute("src");
+  const secondVideoSrc = await inlineVideos.nth(1).getAttribute("src");
+  expect(firstVideoSrc).toBeTruthy();
+  expect(firstVideoSrc).not.toBe(secondVideoSrc);
+
+  await threadPanel
+    .getByTestId("message-thread-replies")
+    .getByRole("button", { name: "Jump to 00:01" })
+    .click();
+
+  const reviewVideo = page.getByTestId("video-review-dialog").locator("video");
+  await expect(reviewVideo).toHaveAttribute("src", firstVideoSrc ?? "");
+  await expect
+    .poll(() =>
+      reviewVideo.evaluate((video) => (video as HTMLVideoElement).currentTime),
+    )
+    .toBe(1);
+});
+
 test("narrow inline videos hide playback speed control", async ({ page }) => {
   await installVideoReviewHarness(page);
 
diff --git a/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts b/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts
index c1873531019..0115b608bfa 100644
--- a/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts
+++ b/desktop/tests/e2e/welcome-agent-modal-screenshots.spec.ts
@@ -159,16 +159,16 @@ test.describe("welcome and channel agent entry points", () => {
     await expect(page.getByTestId("persona-dialog-submit")).toBeEnabled();
     await page.getByTestId("persona-dialog-submit").click();
 
-    const createdDialog = page.getByRole("dialog");
-    await expect(
-      createdDialog.getByRole("heading", { name: "Agent created" }),
-    ).toBeVisible({ timeout: 10_000 });
-    await expect(createdDialog).toContainText(
-      "Scout was created, but couldn’t be added to #random.",
+    const createdToast = page
+      .locator("[data-sonner-toast][data-removed='false']")
+      .filter({ hasText: "Agent created" });
+    await expect(createdToast).toBeVisible({ timeout: 10_000 });
+    await expect(createdToast).toContainText(
+      "Scout couldn’t be added to #random. Relay unavailable.",
     );
-    await expect(createdDialog).toContainText("Relay unavailable.");
+    await expect(page.getByRole("dialog")).toHaveCount(0);
     await waitForAnimations(page);
-    await createdDialog.screenshot({
+    await createdToast.screenshot({
       path: `${SHOTS}/05-agent-channel-attachment-failed.png`,
     });
 
@@ -179,10 +179,19 @@ test.describe("welcome and channel agent entry points", () => {
     );
     const addCount = commandCount(commandsBeforeRetry, "add_channel_members");
 
-    await createdDialog.getByRole("button", { name: "Try again" }).click();
-    await expect(createdDialog).toContainText("Scout is ready and running.");
+    await createdToast.getByRole("button", { name: "Try again" }).click();
+    await expect
+      .poll(async () => {
+        const commands = await readCommandLog(page);
+        return commandCount(commands, "add_channel_members");
+      })
+      .toEqual(addCount + 1);
+    const attachedToast = page
+      .locator("[data-sonner-toast][data-removed='false']")
+      .filter({ hasText: "Added Scout to #random" });
+    await expect(attachedToast).toBeVisible();
     await expect(
-      createdDialog.getByRole("button", { name: "Try again" }),
+      attachedToast.getByRole("button", { name: "Try again" }),
     ).toHaveCount(0);
 
     const commandsAfterRetry = await readCommandLog(page);
@@ -192,7 +201,6 @@ test.describe("welcome and channel agent entry points", () => {
     expect(commandCount(commandsAfterRetry, "add_channel_members")).toEqual(
       addCount + 1,
     );
-    await createdDialog.getByRole("button", { name: "Done" }).click();
     await expect(page.getByTestId("chat-title")).toHaveText("random");
   });
 
diff --git a/desktop/tests/e2e/where-to-run-config.spec.ts b/desktop/tests/e2e/where-to-run-config.spec.ts
index 869e9b2138c..dde0f70392d 100644
--- a/desktop/tests/e2e/where-to-run-config.spec.ts
+++ b/desktop/tests/e2e/where-to-run-config.spec.ts
@@ -9,9 +9,12 @@
  *
  * Covers:
  *  - typing into a defaultless provider field sticks, and the provider is
- *    probed exactly once for the selection (not once per keystroke)
+ *    probed exactly once for the selection (not once per keystroke or
+ *    Advanced disclosure toggle)
  *  - the config form is gated on probe resolution (no half-rendered form),
  *    and defaults prefill exactly once when a slow probe lands
+ *  - collapsing Advanced during an incomplete remote setup keeps the submit
+ *    blocker visible through the Required badge
  *  - switching provider → local → provider re-probes and resets cleanly
  *
  * The stale-closure merge on probe resolution (defaults beneath in-flight
@@ -63,15 +66,50 @@ async function probeInvocations(page: Page): Promise<number> {
   );
 }
 
-/** Open the create-agent dialog and select the mocked provider in "Run on". */
+async function selectRunOnOption(
+  page: Page,
+  dialog: import("@playwright/test").Locator,
+  optionName: string,
+) {
+  const trigger = dialog.locator("#agent-run-on");
+  await expect(trigger).toHaveAttribute("aria-expanded", "false");
+  await trigger.press("Enter");
+
+  const option = page.getByRole("menuitemradio", {
+    exact: true,
+    name: optionName,
+  });
+  await expect(option).toBeVisible();
+  // The shared PersonaDropdownField supports keyboard selection. Using it here
+  // avoids racing the menu's open animation when this test changes locations
+  // repeatedly.
+  await option.press("Enter");
+  await expect(trigger).toHaveAttribute("aria-expanded", "false");
+}
+
+/** Open Advanced in the create-agent dialog and select the mocked provider. */
 async function openCreateDialogOnProvider(page: Page) {
   await page.goto("/", { waitUntil: "domcontentloaded" });
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create agent" }).click();
   const dialog = page.getByTestId("persona-dialog");
   await expect(dialog).toBeVisible({ timeout: 10_000 });
-  await dialog.locator("#agent-run-on").selectOption(PROVIDER.id);
+  const advanced = dialog.getByRole("button", {
+    name: "Advanced",
+    exact: true,
+  });
+  await expect(advanced).toHaveAttribute("aria-expanded", "false");
+  await expect(dialog.locator("#agent-run-on")).toHaveCount(0);
+  await advanced.click();
+  await expect(advanced).toHaveAttribute("aria-expanded", "true");
+  const respondTo = dialog.getByTestId("agent-respond-to");
+  const runOn = dialog.locator("#agent-run-on");
+  await expect(respondTo).toBeVisible();
+  await expect(runOn).toBeVisible();
+  expect(await respondTo.evaluate((element) => element.offsetTop)).toBeLessThan(
+    await runOn.evaluate((element) => element.offsetTop),
+  );
+  await selectRunOnOption(page, dialog, PROVIDER.id);
   return dialog;
 }
 
@@ -92,10 +130,24 @@ test("typing into a defaultless provider field sticks and probes only once", asy
   );
   await expect(contextField).toHaveValue("");
 
-  await contextField.pressSequentially("prod-us-west", { delay: 20 });
+  await contextField.fill("prod-us-west");
   await expect(contextField).toHaveValue("prod-us-west");
 
-  // One selection, one probe — keystrokes must not refire it.
+  // One selection, one probe — keystrokes and Advanced disclosure toggles
+  // must not refire executable provider discovery after it has completed.
+  expect(await probeInvocations(page)).toBe(1);
+  const advanced = dialog.getByRole("button", {
+    name: "Advanced",
+    exact: true,
+  });
+  await advanced.click();
+  await expect(advanced).toHaveAttribute("aria-expanded", "false");
+  await expect(dialog.locator("#agent-run-on")).toHaveCount(0);
+  await advanced.click();
+  await expect(advanced).toHaveAttribute("aria-expanded", "true");
+  await expect(dialog.locator("#provider-cfg-context")).toHaveValue(
+    "prod-us-west",
+  );
   expect(await probeInvocations(page)).toBe(1);
 });
 
@@ -128,6 +180,31 @@ test("config fields render only after a slow probe resolves, with defaults", asy
   expect(await probeInvocations(page)).toBe(1);
 });
 
+test("collapsed Advanced marks incomplete remote setup as required", async ({
+  page,
+}) => {
+  await installMockBridge(page, {
+    backendProviders: [PROVIDER],
+    backendProviderProbeResult: PROBE_RESULT,
+    backendProviderProbeDelayMs: 10_000,
+  });
+  const dialog = await openCreateDialogOnProvider(page);
+  const advanced = dialog.getByRole("button", {
+    name: "Advanced",
+    exact: true,
+  });
+  const submit = dialog.getByTestId("persona-dialog-submit");
+
+  await expect(submit).toBeDisabled();
+  await advanced.click();
+  await expect(advanced).toHaveAttribute("aria-expanded", "false");
+  await expect(dialog.locator("#agent-run-on")).toHaveCount(0);
+  await expect(
+    dialog.getByTestId("persona-advanced-required-badge"),
+  ).toHaveText("Required");
+  await expect(submit).toBeDisabled();
+});
+
 test("provider → local → provider re-probes and resets the config", async ({
   page,
 }) => {
@@ -141,10 +218,10 @@ test("provider → local → provider re-probes and resets the config", async ({
   await expect(contextField).toBeVisible({ timeout: 10_000 });
   await contextField.fill("stale-value");
 
-  await dialog.locator("#agent-run-on").selectOption("local");
+  await selectRunOnOption(page, dialog, "This computer");
   await expect(contextField).toHaveCount(0);
 
-  await dialog.locator("#agent-run-on").selectOption(PROVIDER.id);
+  await selectRunOnOption(page, dialog, PROVIDER.id);
   await expect(dialog.locator("#provider-cfg-context")).toBeVisible({
     timeout: 10_000,
   });
diff --git a/desktop/tests/helpers/bridge.ts b/desktop/tests/helpers/bridge.ts
index 02342544102..f7a6c4ccecc 100644
--- a/desktop/tests/helpers/bridge.ts
+++ b/desktop/tests/helpers/bridge.ts
@@ -295,6 +295,32 @@ type MockBridgeOptions = {
   profileHasEvent?: boolean;
   profileUpdateError?: string;
   profileUpdateErrors?: string[];
+  linkPreviewMetadata?: {
+    title: string;
+    siteName: string | null;
+    description: string | null;
+    imageDataUrl: string | null;
+    imageDomain: string | null;
+    imageFetchState?: "none" | "image" | "transient_failure" | "rejected";
+    imageRetryAfterMs?: number | null;
+    faviconDataUrl?: string | null;
+  } | null;
+  linkPreviewMetadataByHref?: Record<
+    string,
+    {
+      title: string;
+      siteName: string | null;
+      description: string | null;
+      imageDataUrl: string | null;
+      imageDomain: string | null;
+      imageFetchState?: "none" | "image" | "transient_failure" | "rejected";
+      imageRetryAfterMs?: number | null;
+      faviconDataUrl?: string | null;
+    } | null
+  >;
+  linkPreviewMetadataDelayMs?: number;
+  /** Simulates native cold-cache startup work before the async response. */
+  linkPreviewMetadataStartBlockMs?: number;
   searchProfiles?: MockSearchProfileSeed[];
   updateAvailable?: boolean;
   updateChannelDelayMs?: number;
diff --git a/docker-compose.yml b/docker-compose.yml
index 0056ea6a426..e7dc09fafc4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       POSTGRES_DB: buzz
       PGDATA: /var/lib/postgresql/data
     ports:
-      - "5432:5432"
+      - "127.0.0.1:5432:5432"
     volumes:
       - postgres-data:/var/lib/postgresql/data
     networks:
@@ -34,7 +34,7 @@ services:
     image: redis:7-alpine
     container_name: buzz-redis
     ports:
-      - "6379:6379"
+      - "127.0.0.1:6379:6379"
     networks:
       - buzz-net
     healthcheck:
@@ -56,7 +56,7 @@ services:
     image: adminer:latest
     container_name: buzz-adminer
     ports:
-      - "8082:8080"
+      - "127.0.0.1:8082:8080"
     networks:
       - buzz-net
     depends_on:
@@ -82,7 +82,7 @@ services:
       KEYCLOAK_ADMIN: admin
       KEYCLOAK_ADMIN_PASSWORD: admin
     ports:
-      - "8180:8080"
+      - "127.0.0.1:8180:8080"
     networks:
       - buzz-net
     healthcheck:
@@ -108,8 +108,8 @@ services:
       MINIO_ROOT_USER: buzz_dev
       MINIO_ROOT_PASSWORD: buzz_dev_secret
     ports:
-      - "9000:9000"
-      - "9001:9001"
+      - "127.0.0.1:9000:9000"
+      - "127.0.0.1:9001:9001"
     volumes:
       - minio-data:/data
     networks:
@@ -152,7 +152,7 @@ services:
     image: prom/prometheus:latest
     container_name: buzz-prometheus
     ports:
-      - "9090:9090"
+      - "127.0.0.1:9090:9090"
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
       - prometheus-data:/prometheus
diff --git a/docs/admin/README.md b/docs/admin/README.md
index e51566fb292..f49cbdd71ad 100644
--- a/docs/admin/README.md
+++ b/docs/admin/README.md
@@ -54,9 +54,9 @@ sidecar before accessing the shared content-addressed blob. Unknown feedback,
 unreferenced hashes, malformed paths, and cross-community substitutions all
 collapse to `404`.
 
-Only `GET` and `HEAD` are routed. Existing community `/media/*` authorization is
-unchanged, including `BUZZ_REQUIRE_MEDIA_GET_AUTH`; the browser receives no
-Blossom credential or reusable signed URL. Responses are uncached, `nosniff`,
+Only `GET` and `HEAD` are routed. Community `/media/*` reads always require
+Blossom authorization and relay membership; the browser receives no reusable
+signed URL. Responses are uncached, `nosniff`,
 governed by a restrictive CSP, streamed from object storage, and non-previewable
 content retains attachment disposition. Successful reads produce a structured
 trace containing feedback ID, community ID, and attachment hash, but no feedback
diff --git a/docs/linux-rendering-troubleshooting.md b/docs/linux-rendering-troubleshooting.md
index 1e09ef1aca5..4bc8e80eb83 100644
--- a/docs/linux-rendering-troubleshooting.md
+++ b/docs/linux-rendering-troubleshooting.md
@@ -7,7 +7,7 @@ This guide covers the most common rendering failures on Linux and how to resolve
 | Symptom | Likely cause | Fix |
 |---------|-------------|-----|
 | Blank or transparent window, then `SIGABRT` with `colrv1_configure_skpaint` in the output | COLRv1 color emoji font (AppImage only) | Upgrade to the latest AppImage (v0.5.2+) |
-| Blank window on startup, no crash output | dmabuf renderer incompatibility (NVIDIA or AppImage) | `WEBKIT_DISABLE_DMABUF_RENDERER=1 ./Buzz.AppImage` or `--safe-rendering` |
+| Blank window on startup / SIGSEGV when switching workspaces | dmabuf renderer incompatibility (NVIDIA or AppImage) | Prefer `WEBKIT_DMABUF_RENDERER_FORCE_SHM=1` (shipped automatically) or `--safe-rendering`. Do **not** set `WEBKIT_DISABLE_DMABUF_RENDERER=1` on current WebKitGTK — see [#3654](https://github.com/block/buzz/issues/3654). On Debian/Ubuntu with the proprietary NVIDIA driver the crash can persist (distro WebKit patch) — [#3654](https://github.com/block/buzz/issues/3654) stays open for that path. |
 | Blank window on any hardware, no crash output | Unknown GPU/driver combination | `--safe-rendering` flag (see below) |
 
 ---
@@ -69,9 +69,11 @@ FONTCONFIG_FILE=~/.config/buzz-fontconfig/fonts.conf ./Buzz_*.AppImage
 
 **Root cause:** WebKitGTK's dmabuf zero-copy buffer path is incompatible with some GPU/driver/compositor combinations. The WebKit child process silently fails to paint.
 
-**Fix (shipped automatically starting with the first release containing [#3271](https://github.com/block/buzz/pull/3271) (v0.5.1)):** Buzz sets `WEBKIT_DISABLE_DMABUF_RENDERER=1` automatically before WebKit initializes when it detects an NVIDIA GPU (`/sys/class/drm` vendor ID `0x10de`) or when running as an AppImage. This restores a slightly slower shared-memory rendering path that works universally.
+**Fix (shipped automatically starting with the first release containing [#3271](https://github.com/block/buzz/pull/3271) (v0.5.1), updated for [#3654](https://github.com/block/buzz/issues/3654)):** Buzz sets `WEBKIT_DMABUF_RENDERER_FORCE_SHM=1` automatically before WebKit initializes when it detects an NVIDIA GPU (`/sys/class/drm` vendor ID `0x10de`) or when running as an AppImage. That keeps SharedMemory in WebKit's transport set while skipping the hardware dmabuf path (upstream WebKitGTK; Debian/Ubuntu's NVIDIA dmabuf patch can bypass this, so the crash can persist there — [#3654](https://github.com/block/buzz/issues/3654) stays open for that path). `WEBKIT_DMABUF_RENDERER_FORCE_SHM` exists in WebKitGTK ≥ 2.44 (absent at 2.42); on older system WebKit the export is a silent no-op.
 
-**If automatic detection doesn't help (`--safe-rendering`):** Pass `--safe-rendering` to force both `WEBKIT_DISABLE_DMABUF_RENDERER=1` and `WEBKIT_DISABLE_COMPOSITING_MODE=1` for that launch:
+**Do not use `WEBKIT_DISABLE_DMABUF_RENDERER=1` on current WebKitGTK** (2.52+): that variable no longer falls back to shared memory. It empties the transport mode, `AcceleratedBackingStore::create()` returns null, and the UI SIGSEGVs the first time compositing is needed (often on workspace switch). See [#3654](https://github.com/block/buzz/issues/3654).
+
+**If automatic detection doesn't help (`--safe-rendering`):** Pass `--safe-rendering` to force both `WEBKIT_DMABUF_RENDERER_FORCE_SHM=1` and `WEBKIT_DISABLE_COMPOSITING_MODE=1` for that launch:
 
 ```bash
 ./Buzz_*.AppImage --safe-rendering
@@ -83,10 +85,10 @@ buzz-desktop --safe-rendering
 
 ```bash
 # ~/.bashrc or ~/.profile
-export WEBKIT_DISABLE_DMABUF_RENDERER=1
+export WEBKIT_DMABUF_RENDERER_FORCE_SHM=1
 ```
 
-**Conflict detection:** If you set a WebKit variable in your environment and also pass `--safe-rendering`, Buzz will refuse to start and print exactly which variable conflicts. Unset the conflicting variable or drop the flag.
+**Conflict detection:** If you set a WebKit variable in your environment and also pass `--safe-rendering`, Buzz will refuse to start and print exactly which variable conflicts. Unset the conflicting variable or drop the flag. Operators who previously exported `WEBKIT_DISABLE_DMABUF_RENDERER=0` to override the old heuristic can keep that — the module still treats that assignment as a user takeover.
 
 ---
 
@@ -96,11 +98,11 @@ export WEBKIT_DISABLE_DMABUF_RENDERER=1
 
 **Symptom:** The Buzz window is transparent or renders with graphical corruption on AMD RDNA4 hardware.
 
-**Workaround (verified by reporter):** Set these three variables before launching Buzz:
+**Workaround (recommended; FORCE_SHM swap not re-verified on RDNA4):** Set these three variables before launching Buzz. The reporter originally verified a three-var set that used `WEBKIT_DISABLE_DMABUF_RENDERER=1`; that var is the [#3654](https://github.com/block/buzz/issues/3654) crash on current WebKitGTK, so this recipe swaps in `WEBKIT_DMABUF_RENDERER_FORCE_SHM=1` instead. Please re-confirm on RDNA4 if you can.
 
 ```bash
 export GDK_BACKEND=x11
-export WEBKIT_DISABLE_DMABUF_RENDERER=1
+export WEBKIT_DMABUF_RENDERER_FORCE_SHM=1
 export WEBKIT_SKIA_ENABLE_CPU_RENDERING=1
 ./Buzz_*.AppImage
 # or for native:
@@ -109,7 +111,7 @@ buzz-desktop
 
 - `WEBKIT_SKIA_ENABLE_CPU_RENDERING=1` forces Skia to use CPU rendering, bypassing the RDNA4 Skia/radv paint failure.
 - `GDK_BACKEND=x11` avoids the blank window that appears when running under a Plasma-Wayland compositor.
-- `WEBKIT_DISABLE_DMABUF_RENDERER=1` prevents post-first-paint transparency from the dmabuf renderer.
+- `WEBKIT_DMABUF_RENDERER_FORCE_SHM=1` keeps shared-memory transport without the #3654 empty-mode crash from `WEBKIT_DISABLE_DMABUF_RENDERER` (needs WebKitGTK ≥ 2.44).
 
 A dedicated fix for RDNA4 detection is being tracked in [#2643](https://github.com/block/buzz/issues/2643).
 
diff --git a/docs/multi-tenant-conformance.md b/docs/multi-tenant-conformance.md
index 3cd56066eb6..d8877b59319 100644
--- a/docs/multi-tenant-conformance.md
+++ b/docs/multi-tenant-conformance.md
@@ -49,7 +49,7 @@ Conformance obligations:
 | Workflows, runs, approvals, webhooks, schedules | Workflows are channel-scoped or project/channel-global; triggers fire on matching stored events; schedule/webhook/manual triggers create runs; approval tokens are hashed. | Workflow definition's community from `req.community` at create/update; webhook/schedule/manual routes resolve workflow id inside host-derived community. | Community-global workflow namespace; runs/approvals inherit workflow community. | `workflows`, `workflow_runs`, `workflow_approvals` include `community_id`; workflow id/token hash lookups are scoped; trigger event ids are scoped. | Trigger evaluation only sees events in the same community. Webhook URLs include host-derived community; approval token grants cannot act on another community's same hash/id. | Existing workflow APIs and YAML remain unchanged in default community. | Add tests for identical workflow UUID/approval token hash in different communities and schedule execution isolation. |
 | Search / FTS | Postgres FTS over the `events.search_tsv` generated `tsvector` column (GIN-indexed); searchable rows expose `id`, `content`, `kind`, `pubkey`, optional `channel_id`, `created_at`, tag terms; channel-less scope is `ChannelScope::ChannelLessOnly`; the relay refetches canonical events from Postgres by hit id. | Search query carries `req.community`; searchable rows carry `community_id`. | Community-global search results; operator-global FTS index infrastructure may be shared. | Every search query filters by `community_id`, BitmapAnd-ed with the GIN `@@` probe; refetch by `(community_id, event_id)`. | Every query carries `community_id` plus channel scope. `ChannelLessOnly` means channel-less within the community, not platform global. | One community produces the same search results as today. | Tests for same event id/content in A and B, deletion in A not deleting B. |
 | Redis pub/sub, presence, typing, and cache invalidation | Event fan-out uses `buzz:channel:{uuid}`; presence uses `buzz:presence:{pubkey}`; typing uses `buzz:typing:{channel_id}`; cache invalidation uses `buzz:cache-invalidate`. | Pub/sub calls receive `TenantContext` and derive keys from `community_id` plus channel/pubkey. | Pub/sub and presence are community-global; Redis deployment is operator-global shared infrastructure. | Redis keys include community: `buzz:{community}:channel:{uuid}`, `buzz:{community}:presence:{pubkey}`, `buzz:{community}:typing:{channel_id}`, and community-aware cache invalidation payloads/channels. | Cross-node fan-out must not deliver events to subscriptions in another community. Same pubkey can be online/away differently in two communities. Cache drops only affect same-community membership/visibility caches unless explicitly all-community operator maintenance. | Single-community can preserve existing key names only if deployment is isolated; shared multi-tenant Redis must use the prefixed form. | Add tests for same pubkey presence in two communities and same channel UUID collision in two communities. |
-| Media / Blossom / S3 | Authenticated uploads return content-addressed descriptors; public `GET/HEAD /media/{sha256.ext}` serves blobs; upload audit has `channel_id = None`. | Upload request host provides `req.community`; Blossom/NIP-98 auth URL host must agree. | Blob CAS bytes may be operator-global shared storage; metadata, authorization, quotas, audit, and visibility are community-global. | Media metadata/audit rows include `community_id`; if object keys stay SHA-addressed, any per-community policy lives outside the raw blob key. | Upload/read authorization uses community context. Shared hash bytes are allowed only as dedup/storage optimization; metadata/errors must not reveal another community's private upload. | Existing media URLs keep working for default community. | Decide whether unauthenticated blob `GET` remains intentionally public; if not, reads need host-scoped auth/visibility checks. |
+| Media / Blossom / S3 | Authenticated uploads return content-addressed descriptors; `GET/HEAD /media/{sha256.ext}` requires a Blossom `t=get` auth event scoped to the serving host or the blob hash and binds the read to the header-resolved tenant, so a bare read is rejected before any storage lookup; upload audit has `channel_id = None`. | Upload and read request host provides `req.community`; Blossom/NIP-98 auth URL host must agree. | Blob CAS bytes may be operator-global shared storage; metadata, authorization, quotas, audit, and visibility are community-global. | Media metadata/audit rows include `community_id`; if object keys stay SHA-addressed, any per-community policy lives outside the raw blob key. | Upload/read authorization uses community context. Shared hash bytes are allowed only as dedup/storage optimization; metadata/errors must not reveal another community's private upload. | Existing media URLs keep working for default community, but clients must now present read auth; there is no config flag that restores unauthenticated reads. | Resolved: blob reads are authenticated and host/tenant-scoped, not public. Remaining gap, deferred: a read is not gated on the channel ACL of the message the blob was attached to, so relay membership plus a known hash is sufficient. |
 | Git hosting / NIP-34 / object storage | Smart HTTP at `/git/{owner}/{repo}` hydrates from S3 object pointers; NIP-34 repo announcements use `d=repo-id`; pointer key is `repos/{owner}/{repo}/pointer`; git push emits kind:30618. | Git HTTP host gives `req.community`; NIP-98 URL and repo announcement community must agree. | Community-global repo namespace and NIP-34 state; pack/manifests CAS objects may be operator-global if pointers are scoped. | Pointer/name keys include community, e.g. `repos/{community}/{owner}/{repo}/pointer`; NIP-34 replaceable coords include `community_id`; any repo-name registry is `(community_id, owner, repo)` or `(community_id, repo)` per product rule. | Clone/push/read policy resolves repo and branch protections only inside the host community. Git hook policy callback carries community and rejects mismatches. | Existing clone URLs and repo ids work under the default community; object-store migration can move pointers under default prefix without changing git clients. | Add tests for same owner/repo in two communities and push in A not advancing B pointer. |
 | Mesh, agents, ACP/MCP, and CLI | Agents/CLI connect to a relay URL and use WS/REST; mesh/pairing/presence/status events are regular signed relay events. | The relay URL/host configured in the agent/CLI session selects community. | Agent membership, persona/profile, presence, jobs, memory events, and mesh status are community-global unless a future operator mesh plane is explicitly separate. | Any persisted agent profile/job/mesh status rows/events use `community_id`; Redis/presence/search keys follow the same community scoping. | A portable key may join multiple communities, but memberships, DMs, profiles, jobs, and presence do not bleed across them. | Existing `BUZZ_RELAY_URL` continues to select the one default community. | Add CLI/ACP smoke tests against two hosts using same key with different memberships/profile. |
 | Audit log and observability | One hash-chain audit log records event/channel/auth/media actions; errors are sanitized before reaching clients. | Every tenant-observable audit entry is labeled with `req.community` or inherited community from the object being acted on. | Community-global audit chains; operator metrics/log aggregation may be platform-global only if tenant labels are bounded and access-controlled. | `audit_log` key/sequence/head includes `community_id`; error/audit projection tables include `community_id`; uniqueness is `(community_id, seq)` and `(community_id, hash)` as appropriate. | Audit reads verify only one community chain. Error strings must not include cross-community IDs, constraint names, or existence facts. | Single-community audit verification still traverses one chain. | Eva owns model edits here; infra lane must ensure media/git/token/search rows emit community-labeled audit entries. |
diff --git a/lefthook.yml b/lefthook.yml
index 75d205722f5..5b992f19afe 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -2,9 +2,10 @@
 # .github/workflows/ci.yml — keep the two in sync. Deliberate deviations:
 # - The `.github/workflows/ci.yml` path CI adds to its `rust`/`mobile` filters
 #   is omitted; a CI-workflow-only edit doesn't need a local test run.
-# - `desktop-check`/`desktop-test` don't trigger on `rust` changes, though CI's
-#   Desktop Core job does. Those commands are pure TS (biome + node:test) with
-#   no Rust dependency, so the extra trigger would be spurious locally.
+# - `desktop-check`/`desktop-typecheck`/`desktop-test` don't trigger on `rust`
+#   changes, though CI's Desktop Core job does. Those commands are pure TS
+#   (biome + tsc + node:test) with no Rust dependency, so the extra trigger
+#   would be spurious locally.
 # - Deletion-only surface changes do not trigger local hooks: lefthook 2.1.x
 #   drops deleted paths from push-file discovery (`extractFiles` existence
 #   check, repository.go). CI's dorny/paths-filter catches deletions.
@@ -57,6 +58,10 @@ pre-push:
       glob: ["desktop/**", "pnpm-lock.yaml"]
       exclude: ["desktop/src-tauri/**"]
       run: just desktop-check
+    desktop-typecheck:
+      glob: ["desktop/**", "pnpm-lock.yaml"]
+      exclude: ["desktop/src-tauri/**"]
+      run: just desktop-typecheck
     desktop-test:
       glob: ["desktop/**", "pnpm-lock.yaml"]
       exclude: ["desktop/src-tauri/**"]
diff --git a/mobile/lib/app.dart b/mobile/lib/app.dart
index 057594dfad5..d5ae326afad 100644
--- a/mobile/lib/app.dart
+++ b/mobile/lib/app.dart
@@ -147,8 +147,11 @@ class App extends HookConsumerWidget {
   }
 }
 
-Widget _buildSettingsPage(BuildContext context) =>
-    const SettingsPage(profileHeader: SettingsProfileHeader());
+Widget _buildSettingsPage(BuildContext context) => SettingsPage(
+  profileHeader: const SettingsProfileHeader(),
+  identityRecoveryPageBuilder: (_) =>
+      const PairingPage(addingCommunity: true, identityRecoveryOnly: true),
+);
 
 class _SplashScreen extends StatelessWidget {
   const _SplashScreen();
diff --git a/mobile/lib/features/activity/activity_page.dart b/mobile/lib/features/activity/activity_page.dart
index 51a0861b513..99d0bbc0315 100644
--- a/mobile/lib/features/activity/activity_page.dart
+++ b/mobile/lib/features/activity/activity_page.dart
@@ -14,6 +14,7 @@ import '../../shared/theme/theme.dart';
 import '../../shared/utils/string_utils.dart';
 import '../../shared/widgets/avatar_image.dart';
 import '../../shared/widgets/anchored_popover_menu.dart';
+import '../../shared/widgets/bee_refresh_indicator.dart';
 import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
@@ -318,7 +319,7 @@ class ActivityPage extends HookConsumerWidget {
           : -1;
 
       bodyRidesOverTopSection = true;
-      body = RefreshIndicator(
+      body = BeeRefreshIndicator(
         edgeOffset: topSectionHeight,
         onRefresh: refresh,
         child: CustomScrollView(
diff --git a/mobile/lib/features/activity/activity_page/lists.dart b/mobile/lib/features/activity/activity_page/lists.dart
index 7b4be901e12..ad970492723 100644
--- a/mobile/lib/features/activity/activity_page/lists.dart
+++ b/mobile/lib/features/activity/activity_page/lists.dart
@@ -38,7 +38,7 @@ class _RemindersList extends ConsumerWidget {
     }
 
     final now = DateTime.now().millisecondsSinceEpoch ~/ 1000;
-    return RefreshIndicator(
+    return BeeRefreshIndicator(
       onRefresh: onRefresh,
       child: ListView.builder(
         controller: scrollController,
diff --git a/mobile/lib/features/channels/channel_detail_page.dart b/mobile/lib/features/channels/channel_detail_page.dart
index bee9639825d..c0b64f3e401 100644
--- a/mobile/lib/features/channels/channel_detail_page.dart
+++ b/mobile/lib/features/channels/channel_detail_page.dart
@@ -44,6 +44,7 @@ import 'dm_channel_labels.dart';
 import 'ephemeral_channel_display.dart';
 import 'members_sheet.dart';
 import 'message_actions.dart';
+import 'message_long_press_region.dart';
 import 'message_content.dart';
 import '../../shared/read_state/deferred_read_state_update.dart';
 import '../../shared/read_state/read_state_format.dart';
diff --git a/mobile/lib/features/channels/channel_detail_page/message_bubble.dart b/mobile/lib/features/channels/channel_detail_page/message_bubble.dart
index cb6ab670659..ac14f1d0a17 100644
--- a/mobile/lib/features/channels/channel_detail_page/message_bubble.dart
+++ b/mobile/lib/features/channels/channel_detail_page/message_bubble.dart
@@ -64,6 +64,21 @@ class _MessageBubble extends ConsumerWidget {
       agentMentionPubkeys: agentMentionPubkeys,
     );
 
+    void openMessageActions(Rect anchorRect) {
+      showMessageActions(
+        context: context,
+        ref: ref,
+        message: message,
+        channelId: currentChannelId,
+        canManageMessage: canManageMessage,
+        allMessages: allMessages,
+        currentPubkey: currentPubkey,
+        isMember: isMember,
+        isArchived: isArchived,
+        anchorRect: anchorRect,
+      );
+    }
+
     return Padding(
       padding: EdgeInsets.only(top: showAuthor ? Grid.xs : 0),
       child: Material(
@@ -73,8 +88,9 @@ class _MessageBubble extends ConsumerWidget {
         // gutter. InkWell still clips its ink to [borderRadius], while leaving
         // overflowing message content visible.
         clipBehavior: Clip.none,
-        child: InkWell(
+        child: MessageLongPressInkWell(
           key: ValueKey('message-row-${message.id}'),
+          onLongPress: openMessageActions,
           borderRadius: BorderRadius.circular(Radii.md),
           highlightColor: context.colors.primary.withValues(alpha: 0.1),
           // Tap opens the thread; long-press still opens the action sheet.
@@ -93,17 +109,6 @@ class _MessageBubble extends ConsumerWidget {
                     ),
                   ),
                 ),
-          onLongPress: () => showMessageActions(
-            context: context,
-            ref: ref,
-            message: message,
-            channelId: currentChannelId,
-            canManageMessage: canManageMessage,
-            allMessages: allMessages,
-            currentPubkey: currentPubkey,
-            isMember: isMember,
-            isArchived: isArchived,
-          ),
           child: Padding(
             padding: EdgeInsets.only(
               top: showAuthor ? 0 : Grid.xxs,
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 37082ab9630..b05126f314a 100644
--- a/mobile/lib/features/channels/channel_detail_page/message_list.dart
+++ b/mobile/lib/features/channels/channel_detail_page/message_list.dart
@@ -155,6 +155,13 @@ class _MessageList extends HookConsumerWidget {
           : displayEntries.length - 1 - chronologicalIndex;
     }
 
+    double latestAlignment() {
+      final viewportHeight = context.size?.height ?? 0;
+      return viewportHeight > 0
+          ? (composerBottomInset / viewportHeight).clamp(0.0, 1.0).toDouble()
+          : 0.0;
+    }
+
     Future<void> scrollToLatest() async {
       if (!itemScrollController.isAttached || isAutoScrolling.value) return;
       followsLatest.value = true;
@@ -163,6 +170,7 @@ class _MessageList extends HookConsumerWidget {
       try {
         await itemScrollController.scrollTo(
           index: 0,
+          alignment: latestAlignment(),
           duration: const Duration(milliseconds: 220),
           curve: Curves.easeOutCubic,
         );
@@ -199,12 +207,15 @@ class _MessageList extends HookConsumerWidget {
     }
 
     bool latestIsAtBoundary() {
-      // In this reversed list, item 0's leading edge is the bottom boundary.
-      // Being merely visible is not enough: a user who has pulled a tall
-      // newest row away from the boundary must not snap back on live updates.
+      // In this reversed list, item 0's leading edge is the visible bottom
+      // boundary above the composer. Being merely visible is not enough: a
+      // user who has pulled a tall newest row away from that boundary must not
+      // snap back on live updates.
+      final boundary = latestAlignment();
       return itemPositionsListener.itemPositions.value.any(
         (position) =>
-            position.index == 0 && position.itemLeadingEdge.abs() < 0.01,
+            position.index == 0 &&
+            (position.itemLeadingEdge - boundary).abs() < 0.01,
       );
     }
 
diff --git a/mobile/lib/features/channels/channel_detail_page/system_rows.dart b/mobile/lib/features/channels/channel_detail_page/system_rows.dart
index 4e8ba8ab17b..dc60bcd1b1a 100644
--- a/mobile/lib/features/channels/channel_detail_page/system_rows.dart
+++ b/mobile/lib/features/channels/channel_detail_page/system_rows.dart
@@ -1,6 +1,6 @@
 part of '../channel_detail_page.dart';
 
-class _SystemMessageRow extends ConsumerWidget {
+class _SystemMessageRow extends HookConsumerWidget {
   final TimelineMessage message;
   final List<TimelineMessage>? groupedMessages;
   final String channelId;
@@ -21,6 +21,7 @@ class _SystemMessageRow extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final spotlightKey = useMemoized(() => GlobalKey());
     final systemEvent = message.systemEvent;
     if (systemEvent == null) return const SizedBox.shrink();
 
@@ -77,25 +78,43 @@ class _SystemMessageRow extends ConsumerWidget {
       }
     }
 
+    void openReactionPopover(Rect anchorRect) {
+      final spotlightRenderObject = spotlightKey.currentContext
+          ?.findRenderObject();
+      final spotlightRect =
+          spotlightRenderObject is RenderBox && spotlightRenderObject.hasSize
+          ? spotlightRenderObject.localToGlobal(Offset.zero) &
+                spotlightRenderObject.size
+          : anchorRect;
+      showMessageActions(
+        context: context,
+        ref: ref,
+        message: message,
+        channelId: channelId,
+        canManageMessage: false,
+        allMessages: null,
+        currentPubkey: currentPubkey,
+        isMember: isMember,
+        isArchived: isArchived,
+        anchorRect: spotlightRect,
+        popoverSpotlightPadding: EdgeInsets.fromLTRB(
+          Grid.xxs,
+          Grid.xxs,
+          Grid.xxs,
+          reactions.isEmpty ? Grid.xxs : Grid.quarter,
+        ),
+      );
+    }
+
     return Material(
       color: Colors.transparent,
       borderRadius: BorderRadius.circular(Radii.md),
       clipBehavior: Clip.antiAlias,
-      child: InkWell(
+      child: MessageLongPressInkWell(
         key: ValueKey('system-message-row-${message.id}'),
+        onLongPress: openReactionPopover,
         borderRadius: BorderRadius.circular(Radii.md),
         highlightColor: context.colors.primary.withValues(alpha: 0.1),
-        onLongPress: () => showMessageActions(
-          context: context,
-          ref: ref,
-          message: message,
-          channelId: channelId,
-          canManageMessage: false,
-          allMessages: null,
-          currentPubkey: currentPubkey,
-          isMember: isMember,
-          isArchived: isArchived,
-        ),
         child: Padding(
           padding: EdgeInsets.only(
             top: usesMessageStyleLayout ? Grid.xs : Grid.xxs,
@@ -104,43 +123,47 @@ class _SystemMessageRow extends ConsumerWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              if (groupedMembership != null)
-                _MembershipSystemMessageContent(
-                  event: groupedMembership,
-                  createdAt: message.createdAt,
-                  resolveLabel: resolveLabel,
-                  userCache: userCache,
-                )
-              else if (messageStyleActor != null &&
-                  messageStyleActor.isNotEmpty &&
-                  messageStyleAction != null)
-                _MessageStyleSystemMessageContent(
-                  displayPubkey: messageStyleActor,
-                  createdAt: message.createdAt,
-                  resolveLabel: resolveLabel,
-                  userCache: userCache,
-                  actionSpans: [TextSpan(text: messageStyleAction)],
-                )
-              else
-                Row(
-                  children: [
-                    _systemEventAvatar(context, systemEvent, userCache),
-                    const SizedBox(width: Grid.xxs),
-                    Expanded(
-                      child: Text(
-                        systemEvent.describe(resolveLabel),
-                        style: systemMessageBodyTextStyle.copyWith(
-                          color: context.colors.onSurfaceVariant,
-                        ),
+              KeyedSubtree(
+                key: spotlightKey,
+                child: groupedMembership != null
+                    ? _MembershipSystemMessageContent(
+                        event: groupedMembership,
+                        createdAt: message.createdAt,
+                        resolveLabel: resolveLabel,
+                        userCache: userCache,
+                      )
+                    : messageStyleActor != null &&
+                          messageStyleActor.isNotEmpty &&
+                          messageStyleAction != null
+                    ? _MessageStyleSystemMessageContent(
+                        displayPubkey: messageStyleActor,
+                        createdAt: message.createdAt,
+                        resolveLabel: resolveLabel,
+                        userCache: userCache,
+                        actionSpans: [TextSpan(text: messageStyleAction)],
+                      )
+                    : Row(
+                        children: [
+                          _systemEventAvatar(context, systemEvent, userCache),
+                          const SizedBox(width: Grid.xxs),
+                          Expanded(
+                            child: Text(
+                              systemEvent.describe(resolveLabel),
+                              style: systemMessageBodyTextStyle.copyWith(
+                                color: context.colors.onSurfaceVariant,
+                              ),
+                            ),
+                          ),
+                          _messageTimestamp(
+                            context,
+                            message.createdAt,
+                            key: ValueKey(
+                              'system-message-timestamp-${message.id}',
+                            ),
+                          ),
+                        ],
                       ),
-                    ),
-                    _messageTimestamp(
-                      context,
-                      message.createdAt,
-                      key: ValueKey('system-message-timestamp-${message.id}'),
-                    ),
-                  ],
-                ),
+              ),
               if (reactions.isNotEmpty)
                 Padding(
                   padding: EdgeInsets.only(
diff --git a/mobile/lib/features/channels/channels_page.dart b/mobile/lib/features/channels/channels_page.dart
index d5ffb281cbd..5ecc21a73a5 100644
--- a/mobile/lib/features/channels/channels_page.dart
+++ b/mobile/lib/features/channels/channels_page.dart
@@ -17,6 +17,7 @@ import '../../shared/relay/relay.dart';
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
 import '../../shared/widgets/anchored_popover_menu.dart';
+import '../../shared/widgets/bee_refresh_indicator.dart';
 import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
diff --git a/mobile/lib/features/channels/channels_page/body.dart b/mobile/lib/features/channels/channels_page/body.dart
index ad71be1e504..2d68a26df82 100644
--- a/mobile/lib/features/channels/channels_page/body.dart
+++ b/mobile/lib/features/channels/channels_page/body.dart
@@ -40,7 +40,7 @@ class _ChannelsBody extends StatelessWidget {
           )
         : loadedChannels == null
         ? const SizedBox.shrink()
-        : RefreshIndicator(
+        : BeeRefreshIndicator(
             edgeOffset: barHeight,
             onRefresh: onRefresh,
             child: CustomScrollView(
diff --git a/mobile/lib/features/channels/message_actions.dart b/mobile/lib/features/channels/message_actions.dart
index 0b5c568860c..e09f9478a70 100644
--- a/mobile/lib/features/channels/message_actions.dart
+++ b/mobile/lib/features/channels/message_actions.dart
@@ -1,8 +1,11 @@
 import 'dart:async';
 import 'dart:io';
+import 'dart:math' as math;
+import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/physics.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
@@ -33,6 +36,8 @@ import 'thread_detail_page.dart';
 import 'thread_follows/thread_follows_provider.dart';
 import 'timeline_message.dart';
 
+part 'message_actions/reaction_popover.dart';
+
 /// Preview length for reminder targets — matches desktop's
 /// `msg.body.slice(0, 100)`.
 const _reminderPreviewLength = 100;
@@ -47,7 +52,21 @@ void showMessageActions({
   String? currentPubkey,
   bool isMember = false,
   bool isArchived = false,
+  Rect? anchorRect,
+  EdgeInsets popoverSpotlightPadding = const EdgeInsets.all(Grid.xxs),
 }) {
+  final hasReactionOnlyActions = message.isSystem && !canManageMessage;
+  if (anchorRect != null && hasReactionOnlyActions) {
+    _showMessageReactionPopover(
+      context: context,
+      ref: ref,
+      message: message,
+      anchorRect: anchorRect,
+      spotlightPadding: popoverSpotlightPadding,
+    );
+    return;
+  }
+
   showBuzzModalBottomSheet<void>(
     context: context,
     isScrollControlled: true,
@@ -639,11 +658,16 @@ class _QuickReactionRow extends ConsumerWidget {
   /// bottom sheet, so it must not read through the sheet's disposed ref.
   final WidgetRef pageRef;
 
+  /// Drives the staged glyph reveal when this row is shown in the popover.
+  /// The bottom sheet leaves this null and retains its existing static row.
+  final Animation<double>? presentationAnimation;
+
   const _QuickReactionRow({
     required this.message,
     required this.sheetContext,
     required this.pageContext,
     required this.pageRef,
+    this.presentationAnimation,
   });
 
   @override
@@ -685,31 +709,39 @@ class _QuickReactionRow extends ConsumerWidget {
                 .clamp(0.0, Grid.twelve)
                 .toDouble();
         final circles = <Widget>[
-          for (final value in emoji)
-            _QuickReactionCircle(
-              key: ValueKey('quick-reaction-$value'),
+          for (var index = 0; index < emoji.length; index++)
+            _ReactionItemReveal(
+              key: ValueKey('quick-reaction-${emoji[index]}'),
+              animation: presentationAnimation,
+              index: index,
+              child: _QuickReactionCircle(
+                size: circleSize,
+                onTap: () {
+                  Navigator.of(sheetContext).pop();
+                  react(emoji[index]);
+                },
+                child: _QuickReactionGlyph(
+                  value: emoji[index],
+                  customByShortcode: customByShortcode,
+                ),
+              ),
+            ),
+          _ReactionItemReveal(
+            key: const ValueKey('quick-reaction-more'),
+            animation: presentationAnimation,
+            index: emoji.length,
+            child: _QuickReactionCircle(
               size: circleSize,
               onTap: () {
                 Navigator.of(sheetContext).pop();
-                react(value);
+                showEmojiPicker(context: pageContext, onSelect: react);
               },
-              child: _QuickReactionGlyph(
-                value: value,
-                customByShortcode: customByShortcode,
+              child: Icon(
+                LucideIcons.plus,
+                size: 24,
+                color: context.colors.onSurfaceVariant,
               ),
             ),
-          _QuickReactionCircle(
-            key: const ValueKey('quick-reaction-more'),
-            size: circleSize,
-            onTap: () {
-              Navigator.of(sheetContext).pop();
-              showEmojiPicker(context: pageContext, onSelect: react);
-            },
-            child: Icon(
-              LucideIcons.plus,
-              size: 24,
-              color: context.colors.onSurfaceVariant,
-            ),
           ),
         ];
 
@@ -727,6 +759,44 @@ class _QuickReactionRow extends ConsumerWidget {
   }
 }
 
+class _ReactionItemReveal extends StatelessWidget {
+  final Animation<double>? animation;
+  final int index;
+  final Widget child;
+
+  const _ReactionItemReveal({
+    super.key,
+    required this.animation,
+    required this.index,
+    required this.child,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final parent = animation;
+    if (parent == null) return child;
+
+    final start = 0.06 + (index * 0.11);
+    final opacityEnd = math.min(1.0, start + 0.20);
+    final scaleEnd = math.min(1.0, start + 0.30);
+    final opacity = CurvedAnimation(
+      parent: parent,
+      curve: Interval(start, opacityEnd, curve: Curves.easeOutCubic),
+    );
+    final scale = Tween<double>(begin: 0.86, end: 1).animate(
+      CurvedAnimation(
+        parent: parent,
+        curve: Interval(start, scaleEnd, curve: _reactionSpringCurve),
+      ),
+    );
+
+    return FadeTransition(
+      opacity: opacity,
+      child: ScaleTransition(scale: scale, child: child),
+    );
+  }
+}
+
 /// Renders a quick-reaction value: a Unicode glyph as text, a `:shortcode:` as
 /// its custom-emoji image.
 class _QuickReactionGlyph extends StatelessWidget {
@@ -763,7 +833,6 @@ class _QuickReactionCircle extends StatelessWidget {
   final double size;
 
   const _QuickReactionCircle({
-    super.key,
     required this.onTap,
     required this.child,
     required this.size,
@@ -781,7 +850,11 @@ class _QuickReactionCircle extends StatelessWidget {
         height: size,
         alignment: Alignment.center,
         decoration: BoxDecoration(
-          color: context.colors.surfaceContainerHighest,
+          color: Color.lerp(
+            context.colors.surface,
+            context.colors.primaryContainer,
+            0.78,
+          ),
           shape: BoxShape.circle,
         ),
         child: child,
diff --git a/mobile/lib/features/channels/message_actions/reaction_popover.dart b/mobile/lib/features/channels/message_actions/reaction_popover.dart
new file mode 100644
index 00000000000..dfbc127861e
--- /dev/null
+++ b/mobile/lib/features/channels/message_actions/reaction_popover.dart
@@ -0,0 +1,260 @@
+part of '../message_actions.dart';
+
+const _reactionTrayMaxWidth = (52.0 * 6) + (Grid.twelve * 5) + (Grid.xxs * 2);
+const _reactionTrayMaxHeight = 52.0 + (Grid.xxs * 2);
+const _reactionTraySpringAllowance = 16.0;
+const _reactionPopoverDuration = Duration(milliseconds: 320);
+final _reactionSpringCurve = _SpringEaseOutCurve(
+  duration: const Duration(milliseconds: 260),
+  bounce: 0.22,
+);
+
+/// Presents the frequently-used reaction tray over a long-pressed message.
+///
+/// The conversation is frosted around [anchorRect] so the selected message
+/// remains visually connected to the tray.
+void _showMessageReactionPopover({
+  required BuildContext context,
+  required WidgetRef ref,
+  required TimelineMessage message,
+  required Rect anchorRect,
+  required EdgeInsets spotlightPadding,
+}) {
+  unawaited(HapticFeedback.mediumImpact());
+  final reduceMotion = MediaQuery.disableAnimationsOf(context);
+  showGeneralDialog<void>(
+    context: context,
+    barrierDismissible: true,
+    barrierLabel: 'Dismiss reaction picker',
+    barrierColor: Colors.transparent,
+    transitionDuration: reduceMotion ? Duration.zero : _reactionPopoverDuration,
+    transitionBuilder: (context, animation, secondaryAnimation, child) => child,
+    pageBuilder: (dialogContext, animation, secondaryAnimation) =>
+        _MessageReactionPopover(
+          anchorRect: anchorRect,
+          spotlightPadding: spotlightPadding,
+          animation: animation,
+          message: message,
+          pageContext: context,
+          pageRef: ref,
+        ),
+  );
+}
+
+class _MessageReactionPopover extends StatelessWidget {
+  final Rect anchorRect;
+  final EdgeInsets spotlightPadding;
+  final Animation<double> animation;
+  final TimelineMessage message;
+  final BuildContext pageContext;
+  final WidgetRef pageRef;
+
+  const _MessageReactionPopover({
+    required this.anchorRect,
+    required this.spotlightPadding,
+    required this.animation,
+    required this.message,
+    required this.pageContext,
+    required this.pageRef,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final mediaQuery = MediaQuery.of(context);
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final safeTop = mediaQuery.padding.top + mediaQuery.viewInsets.top;
+        final safeBottom =
+            constraints.maxHeight -
+            mediaQuery.padding.bottom -
+            mediaQuery.viewInsets.bottom;
+        final availableAbove = anchorRect.top - Grid.xxs - safeTop;
+        final availableBelow = safeBottom - anchorRect.bottom - Grid.xxs;
+        final showAbove =
+            availableAbove >= _reactionTrayMaxHeight ||
+            (availableBelow < _reactionTrayMaxHeight &&
+                availableAbove >= availableBelow);
+        final proposedTop = showAbove
+            ? anchorRect.top - _reactionTrayMaxHeight - Grid.xxs
+            : anchorRect.bottom + Grid.xxs;
+        final maxTop = math.max(safeTop, safeBottom - _reactionTrayMaxHeight);
+        final top = proposedTop.clamp(safeTop, maxTop).toDouble();
+        final trayScaleAlignment = showAbove
+            ? Alignment.bottomLeft
+            : Alignment.topLeft;
+        final trayWidth = math.min(
+          _reactionTrayMaxWidth,
+          constraints.maxWidth - (Grid.xxs * 2),
+        );
+        final maxLeft = constraints.maxWidth - trayWidth - Grid.xxs;
+        final left = (anchorRect.center.dx - (trayWidth / 2))
+            .clamp(Grid.xxs, maxLeft)
+            .toDouble();
+
+        return Stack(
+          children: [
+            Positioned.fill(
+              child: AnimatedBuilder(
+                animation: animation,
+                builder: (context, child) {
+                  final blurProgress = const Interval(
+                    0,
+                    0.30,
+                    curve: Curves.easeOutCubic,
+                  ).transform(animation.value);
+                  final sigma = 20 * blurProgress;
+                  return ClipPath(
+                    key: const ValueKey('reaction-popover-background'),
+                    clipper: _OutsideAnchorClipper(
+                      anchorRect,
+                      spotlightPadding,
+                    ),
+                    child: BackdropFilter(
+                      filter: ImageFilter.blur(sigmaX: sigma, sigmaY: sigma),
+                      child: ColoredBox(
+                        color: context.colors.inverseSurface.withValues(
+                          alpha: 0.10 * blurProgress,
+                        ),
+                      ),
+                    ),
+                  );
+                },
+              ),
+            ),
+            Positioned.fill(
+              child: GestureDetector(
+                behavior: HitTestBehavior.opaque,
+                onTap: () => Navigator.of(context).pop(),
+              ),
+            ),
+            Positioned(
+              top: top,
+              left: left,
+              width: trayWidth + _reactionTraySpringAllowance,
+              height: _reactionTrayMaxHeight,
+              child: AnimatedBuilder(
+                animation: animation,
+                child: SizedBox(
+                  width: trayWidth,
+                  height: _reactionTrayMaxHeight,
+                  child: Padding(
+                    padding: const EdgeInsets.all(Grid.xxs),
+                    child: _QuickReactionRow(
+                      message: message,
+                      sheetContext: context,
+                      pageContext: pageContext,
+                      pageRef: pageRef,
+                      presentationAnimation: animation,
+                    ),
+                  ),
+                ),
+                builder: (context, child) {
+                  final appearance = const Interval(
+                    0.04,
+                    0.23,
+                    curve: Curves.easeOutCubic,
+                  ).transform(animation.value);
+                  final expansion = const Interval(
+                    0.16,
+                    0.92,
+                  ).transform(animation.value);
+                  final springExpansion = _reactionSpringCurve.transform(
+                    expansion,
+                  );
+                  final width = lerpDouble(
+                    _reactionTrayMaxHeight,
+                    trayWidth,
+                    springExpansion,
+                  )!;
+
+                  return Opacity(
+                    opacity: appearance,
+                    child: Transform.scale(
+                      alignment: trayScaleAlignment,
+                      scale: lerpDouble(0.95, 1, appearance)!,
+                      child: Align(
+                        alignment: Alignment.centerLeft,
+                        child: SizedBox(
+                          key: const ValueKey('reaction-popover-tray'),
+                          width: width,
+                          height: _reactionTrayMaxHeight,
+                          child: Material(
+                            color: context.colors.surface,
+                            surfaceTintColor: Colors.transparent,
+                            elevation: 8,
+                            shadowColor: Colors.black.withValues(alpha: 0.2),
+                            shape: const StadiumBorder(),
+                            clipBehavior: Clip.antiAlias,
+                            child: OverflowBox(
+                              alignment: Alignment.centerLeft,
+                              minWidth: trayWidth,
+                              maxWidth: trayWidth,
+                              minHeight: _reactionTrayMaxHeight,
+                              maxHeight: _reactionTrayMaxHeight,
+                              child: child,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  );
+                },
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
+
+class _OutsideAnchorClipper extends CustomClipper<Path> {
+  final Rect anchorRect;
+  final EdgeInsets spotlightPadding;
+
+  const _OutsideAnchorClipper(this.anchorRect, this.spotlightPadding);
+
+  @override
+  Path getClip(Size size) {
+    final spotlightRect = Rect.fromLTRB(
+      anchorRect.left - spotlightPadding.left,
+      anchorRect.top - spotlightPadding.top,
+      anchorRect.right + spotlightPadding.right,
+      anchorRect.bottom + spotlightPadding.bottom,
+    );
+    return Path()
+      ..fillType = PathFillType.evenOdd
+      ..addRect(Offset.zero & size)
+      ..addRRect(
+        RRect.fromRectAndRadius(spotlightRect, const Radius.circular(Radii.lg)),
+      );
+  }
+
+  @override
+  bool shouldReclip(_OutsideAnchorClipper oldClipper) =>
+      oldClipper.anchorRect != anchorRect ||
+      oldClipper.spotlightPadding != spotlightPadding;
+}
+
+class _SpringEaseOutCurve extends Curve {
+  final double _durationSeconds;
+  final SpringSimulation _simulation;
+
+  _SpringEaseOutCurve({required Duration duration, required double bounce})
+    : _durationSeconds =
+          duration.inMicroseconds / Duration.microsecondsPerSecond,
+      _simulation = SpringSimulation(
+        SpringDescription.withDurationAndBounce(
+          duration: duration,
+          bounce: bounce,
+        ),
+        0,
+        1,
+        0,
+        snapToEnd: true,
+      );
+
+  @override
+  double transformInternal(double t) => _simulation.x(t * _durationSeconds);
+}
diff --git a/mobile/lib/features/channels/message_long_press_region.dart b/mobile/lib/features/channels/message_long_press_region.dart
new file mode 100644
index 00000000000..d894e4a035b
--- /dev/null
+++ b/mobile/lib/features/channels/message_long_press_region.dart
@@ -0,0 +1,112 @@
+import 'dart:async';
+
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+
+/// An [InkWell] whose long press is observed above interactive descendants.
+class MessageLongPressInkWell extends StatelessWidget {
+  final VoidCallback? onTap;
+  final ValueChanged<Rect> onLongPress;
+  final BorderRadius? borderRadius;
+  final Color? highlightColor;
+  final Widget child;
+
+  const MessageLongPressInkWell({
+    super.key,
+    this.onTap,
+    required this.onLongPress,
+    this.borderRadius,
+    this.highlightColor,
+    required this.child,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return _MessageLongPressRegion(
+      onLongPress: onLongPress,
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: borderRadius,
+        highlightColor: highlightColor,
+        child: child,
+      ),
+    );
+  }
+}
+
+/// Detects a message long press without competing with interactive descendants.
+///
+/// Links, media, reactions, and other nested controls keep their normal tap
+/// gestures. Moving far enough to scroll cancels the timer; recognizing the
+/// hold cancels the pointer so a descendant tap cannot fire on release.
+class _MessageLongPressRegion extends HookWidget {
+  final ValueChanged<Rect> onLongPress;
+  final Widget child;
+
+  const _MessageLongPressRegion({
+    required this.onLongPress,
+    required this.child,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final activePointer = useRef<int?>(null);
+    final origin = useRef<Offset?>(null);
+    final timer = useRef<Timer?>(null);
+
+    void cancel() {
+      timer.value?.cancel();
+      timer.value = null;
+      activePointer.value = null;
+      origin.value = null;
+    }
+
+    useEffect(() => cancel, const []);
+
+    void recognize() {
+      final renderObject = context.findRenderObject();
+      if (renderObject is! RenderBox || !renderObject.hasSize) return;
+      onLongPress(renderObject.localToGlobal(Offset.zero) & renderObject.size);
+    }
+
+    void handlePointerDown(PointerDownEvent event) {
+      if (activePointer.value != null) return;
+      activePointer.value = event.pointer;
+      origin.value = event.position;
+      timer.value = Timer(kLongPressTimeout, () {
+        final pointer = activePointer.value;
+        if (pointer == null) return;
+        timer.value = null;
+        activePointer.value = null;
+        origin.value = null;
+        GestureBinding.instance.cancelPointer(pointer);
+        recognize();
+      });
+    }
+
+    void handlePointerMove(PointerMoveEvent event) {
+      if (event.pointer != activePointer.value) return;
+      final start = origin.value;
+      if (start == null) return;
+      final delta = event.position - start;
+      if (delta.distanceSquared > kTouchSlop * kTouchSlop) cancel();
+    }
+
+    void handlePointerEnd(PointerEvent event) {
+      if (event.pointer == activePointer.value) cancel();
+    }
+
+    return Semantics(
+      onLongPress: recognize,
+      child: Listener(
+        behavior: HitTestBehavior.translucent,
+        onPointerDown: handlePointerDown,
+        onPointerMove: handlePointerMove,
+        onPointerUp: handlePointerEnd,
+        onPointerCancel: handlePointerEnd,
+        child: child,
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/channels/thread_detail_page.dart b/mobile/lib/features/channels/thread_detail_page.dart
index fff7f5834ba..2ce862ea711 100644
--- a/mobile/lib/features/channels/thread_detail_page.dart
+++ b/mobile/lib/features/channels/thread_detail_page.dart
@@ -25,6 +25,7 @@ import 'date_formatters.dart';
 import 'day_divider.dart';
 import '../profile/user_profile_sheet.dart';
 import 'message_actions.dart';
+import 'message_long_press_region.dart';
 import 'message_content.dart';
 import 'reaction_row.dart';
 import '../../shared/read_state/read_state_format.dart';
@@ -777,6 +778,21 @@ class _ThreadMessage extends ConsumerWidget {
       agentMentionPubkeys: agentMentionPubkeys,
     );
 
+    void openMessageActions(Rect anchorRect) {
+      showMessageActions(
+        context: context,
+        ref: ref,
+        message: message,
+        channelId: channelId,
+        canManageMessage: canManageMessage,
+        allMessages: allMessages,
+        currentPubkey: currentPubkey,
+        isMember: isMember,
+        isArchived: isArchived,
+        anchorRect: anchorRect,
+      );
+    }
+
     return Padding(
       padding: EdgeInsets.only(top: showAuthor ? Grid.xs : 0),
       child: DecoratedBox(
@@ -794,21 +810,11 @@ class _ThreadMessage extends ConsumerWidget {
           // trailing gutter. InkWell still clips its ink to [borderRadius],
           // while leaving overflowing message content visible.
           clipBehavior: Clip.none,
-          child: InkWell(
+          child: MessageLongPressInkWell(
             key: ValueKey('thread-message-row-${message.id}'),
+            onLongPress: openMessageActions,
             borderRadius: BorderRadius.circular(Radii.md),
             highlightColor: context.colors.primary.withValues(alpha: 0.1),
-            onLongPress: () => showMessageActions(
-              context: context,
-              ref: ref,
-              message: message,
-              channelId: channelId,
-              canManageMessage: canManageMessage,
-              allMessages: allMessages,
-              currentPubkey: currentPubkey,
-              isMember: isMember,
-              isArchived: isArchived,
-            ),
             child: Padding(
               padding: EdgeInsets.only(
                 top: showAuthor ? 0 : Grid.xxs,
diff --git a/mobile/lib/features/forum/forum_posts_view.dart b/mobile/lib/features/forum/forum_posts_view.dart
index f11d0444b47..13880427cfc 100644
--- a/mobile/lib/features/forum/forum_posts_view.dart
+++ b/mobile/lib/features/forum/forum_posts_view.dart
@@ -8,6 +8,7 @@ import 'package:lucide_icons_flutter/lucide_icons.dart';
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
+import '../../shared/widgets/bee_refresh_indicator.dart';
 import '../channels/channel.dart';
 import '../channels/compose_bar.dart';
 import 'forum_models.dart';
@@ -92,7 +93,7 @@ class ForumPostsView extends HookConsumerWidget {
                     isArchived: channel.isArchived,
                   );
                 }
-                return RefreshIndicator(
+                return BeeRefreshIndicator(
                   onRefresh: () async {
                     ref.invalidate(forumPostsProvider(channel.id));
                     await ref.read(forumPostsProvider(channel.id).future);
diff --git a/mobile/lib/features/pairing/pairing_page.dart b/mobile/lib/features/pairing/pairing_page.dart
index 85b781052d0..7061180b123 100644
--- a/mobile/lib/features/pairing/pairing_page.dart
+++ b/mobile/lib/features/pairing/pairing_page.dart
@@ -25,8 +25,13 @@ class PairingPage extends HookConsumerWidget {
   /// When true, the pairing page is being used to add a new community
   /// (user is already authenticated with at least one community).
   final bool addingCommunity;
+  final bool identityRecoveryOnly;
 
-  const PairingPage({super.key, this.addingCommunity = false});
+  const PairingPage({
+    super.key,
+    this.addingCommunity = false,
+    this.identityRecoveryOnly = false,
+  });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -51,6 +56,13 @@ class PairingPage extends HookConsumerWidget {
 
     Future<void> handleScannerResult(String? code) async {
       if (code != null && context.mounted) {
+        if (identityRecoveryOnly &&
+            Uri.tryParse(code)?.queryParameters['mode'] != 'recover') {
+          ScaffoldMessenger.of(context).showSnackBar(
+            const SnackBar(content: Text('Scan a desktop recovery code.')),
+          );
+          return;
+        }
         await ref.read(pairingProvider.notifier).pair(code);
       }
     }
@@ -91,7 +103,7 @@ class PairingPage extends HookConsumerWidget {
               onPressed: () => Navigator.of(context).pop(),
             ),
             title: Text(
-              'Add Community',
+              identityRecoveryOnly ? 'Send to Desktop' : 'Add Community',
               style: isVerifyingSas
                   ? null
                   : context.textTheme.titleMedium?.copyWith(
@@ -114,6 +126,7 @@ class PairingPage extends HookConsumerWidget {
                   child: _SasVerificationView(
                     sasCode: pairingState.sasCode ?? '------',
                     confirmed: pairingState.userConfirmedSas,
+                    sendsIdentityToDesktop: pairingState.sendsIdentityToDesktop,
                     onConfirm: () =>
                         ref.read(pairingProvider.notifier).confirmSas(),
                     onDeny: () => ref.read(pairingProvider.notifier).denySas(),
@@ -146,7 +159,7 @@ class PairingPage extends HookConsumerWidget {
                     onConnect: () {
                       final code = codeController.text.trim();
                       if (code.isNotEmpty) {
-                        ref.read(pairingProvider.notifier).pair(code);
+                        unawaited(handleScannerResult(code));
                       }
                     },
                   ),
@@ -182,12 +195,14 @@ class PairingPage extends HookConsumerWidget {
 class _SasVerificationView extends StatelessWidget {
   final String sasCode;
   final bool confirmed;
+  final bool sendsIdentityToDesktop;
   final VoidCallback onConfirm;
   final VoidCallback onDeny;
 
   const _SasVerificationView({
     required this.sasCode,
     required this.confirmed,
+    required this.sendsIdentityToDesktop,
     required this.onConfirm,
     required this.onDeny,
   });
@@ -242,7 +257,9 @@ class _SasVerificationView extends StatelessWidget {
         const SizedBox(height: Grid.lg),
 
         Text(
-          'You are about to transfer your Buzz identity\nto this device. Only confirm if you initiated\nthis pairing from your desktop.',
+          sendsIdentityToDesktop
+              ? 'This sends your full Buzz identity to the desktop\nand grants it permanent access. Only confirm a\ndesktop you trust and a recovery you started.'
+              : 'You are about to transfer your Buzz identity\nto this device. Only confirm if you initiated\nthis pairing from your desktop.',
           textAlign: TextAlign.center,
           style: context.textTheme.bodySmall?.copyWith(
             color: context.colors.onSurfaceVariant,
diff --git a/mobile/lib/features/pairing/pairing_provider.dart b/mobile/lib/features/pairing/pairing_provider.dart
index 6a6c57a673d..5adde987eb0 100644
--- a/mobile/lib/features/pairing/pairing_provider.dart
+++ b/mobile/lib/features/pairing/pairing_provider.dart
@@ -36,12 +36,14 @@ class PairingState {
   final String? errorMessage;
   final String? sasCode;
   final bool userConfirmedSas;
+  final bool sendsIdentityToDesktop;
 
   const PairingState({
     this.status = PairingStatus.idle,
     this.errorMessage,
     this.sasCode,
     this.userConfirmedSas = false,
+    this.sendsIdentityToDesktop = false,
   });
 
   PairingState copyWith({
@@ -49,11 +51,14 @@ class PairingState {
     String? errorMessage,
     String? sasCode,
     bool? userConfirmedSas,
+    bool? sendsIdentityToDesktop,
   }) => PairingState(
     status: status ?? this.status,
     errorMessage: errorMessage ?? this.errorMessage,
     sasCode: sasCode ?? this.sasCode,
     userConfirmedSas: userConfirmedSas ?? this.userConfirmedSas,
+    sendsIdentityToDesktop:
+        sendsIdentityToDesktop ?? this.sendsIdentityToDesktop,
   );
 }
 
@@ -111,10 +116,14 @@ class PairingNotifier extends Notifier<PairingState> {
     // transition immediately and process any buffered payload.
     if (_sasConfirmReceived) {
       state = state.copyWith(status: PairingStatus.transferring);
-      final pending = _pendingPayload;
-      if (pending != null) {
-        _pendingPayload = null;
-        _handlePayload(pending);
+      if (_sendIdentityToSource) {
+        _sendIdentityPayload();
+      } else {
+        final pending = _pendingPayload;
+        if (pending != null) {
+          _pendingPayload = null;
+          _handlePayload(pending);
+        }
       }
       return;
     }
@@ -149,6 +158,7 @@ class PairingNotifier extends Notifier<PairingState> {
     _sasConfirmReceived = false;
     _userConfirmedSas = false;
     _pendingPayload = null;
+    _sendIdentityToSource = false;
   }
 
   // ── NIP-AB pairing flow ─────────────────────────────────────────────────
@@ -163,6 +173,7 @@ class PairingNotifier extends Notifier<PairingState> {
   Uint8List? _conversationKey;
   bool _sasConfirmReceived = false;
   bool _userConfirmedSas = false;
+  bool _sendIdentityToSource = false;
   Map<String, dynamic>? _pendingPayload; // buffered until user confirms SAS
   final Set<String> _processedEventIds = {}; // NIP-AB §Duplicate Event Handling
 
@@ -174,6 +185,8 @@ class PairingNotifier extends Notifier<PairingState> {
       final qr = parseNostrpairUri(uri);
       _sourcePubkey = qr.sourcePubkey;
       _sessionSecret = qr.sessionSecret;
+      _sendIdentityToSource =
+          Uri.parse(uri).queryParameters['mode'] == 'recover';
 
       final relayWsUrl = qr.relays.first;
 
@@ -234,6 +247,7 @@ class PairingNotifier extends Notifier<PairingState> {
       state = PairingState(
         status: PairingStatus.confirmingSas,
         sasCode: formatSas(sasCode),
+        sendsIdentityToDesktop: _sendIdentityToSource,
       );
 
       // 9. Start 120s session timeout.
@@ -359,6 +373,9 @@ class PairingNotifier extends Notifier<PairingState> {
         case 'abort':
           _handleAbort(msg);
           _processedEventIds.add(eventId);
+        case 'complete':
+          _handleComplete(msg);
+          _processedEventIds.add(eventId);
       }
     } catch (e) {
       // Silently discard invalid events per NIP-AB §Event Validation.
@@ -400,15 +417,44 @@ class PairingNotifier extends Notifier<PairingState> {
     if (_userConfirmedSas) {
       _userConfirmedSas = false;
       state = state.copyWith(status: PairingStatus.transferring);
-      final pending = _pendingPayload;
-      if (pending != null) {
-        _pendingPayload = null;
-        _handlePayload(pending);
+      if (_sendIdentityToSource) {
+        _sendIdentityPayload();
+      } else {
+        final pending = _pendingPayload;
+        if (pending != null) {
+          _pendingPayload = null;
+          _handlePayload(pending);
+        }
       }
     }
     // Otherwise stay in confirmingSas — user must still confirm via confirmSas().
   }
 
+  void _sendIdentityPayload() {
+    final nsec = ref.read(relayConfigProvider).nsec;
+    if (nsec == null || nsec.isEmpty) {
+      _sendAbort('protocol_error');
+      _cleanup();
+      state = const PairingState(
+        status: PairingStatus.error,
+        errorMessage: 'No identity is available on this phone.',
+      );
+      return;
+    }
+    final content = _encryptMessage({
+      'type': 'payload',
+      'payload_type': 'nsec',
+      'payload': nsec,
+    });
+    _publishEvent(
+      kind: 24134,
+      content: content,
+      tags: [
+        ['p', _sourcePubkey!],
+      ],
+    );
+  }
+
   void _handlePayload(Map<String, dynamic> msg) {
     // Only accept payload after the transcript hash was verified.
     if (!_sasConfirmReceived) return;
@@ -436,6 +482,22 @@ class PairingNotifier extends Notifier<PairingState> {
     _processPayload(payloadType, payload);
   }
 
+  void _handleComplete(Map<String, dynamic> msg) {
+    if (!_sendIdentityToSource || state.status != PairingStatus.transferring) {
+      return;
+    }
+    if (msg['success'] != true) {
+      _cleanup();
+      state = const PairingState(
+        status: PairingStatus.error,
+        errorMessage: 'Desktop could not store the identity.',
+      );
+      return;
+    }
+    _cleanup();
+    state = const PairingState(status: PairingStatus.success);
+  }
+
   void _handleAbort(Map<String, dynamic> msg) {
     final reason = msg['reason'] as String? ?? 'unknown';
     _cleanup();
diff --git a/mobile/lib/features/pulse/pulse_page.dart b/mobile/lib/features/pulse/pulse_page.dart
index 860002d60a1..08568fc8dc6 100644
--- a/mobile/lib/features/pulse/pulse_page.dart
+++ b/mobile/lib/features/pulse/pulse_page.dart
@@ -6,6 +6,7 @@ import 'package:lucide_icons_flutter/lucide_icons.dart';
 import '../../shared/relay/relay.dart';
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/filter_chip_bar.dart';
+import '../../shared/widgets/bee_refresh_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
 import 'agent_activity_card.dart';
@@ -99,7 +100,7 @@ class PulsePage extends HookConsumerWidget {
             ],
           ),
           Expanded(
-            child: RefreshIndicator(
+            child: BeeRefreshIndicator(
               onRefresh: () async => _refresh(ref, active.value, currentPubkey),
               child: _PulseBody(
                 tab: active.value,
@@ -171,7 +172,6 @@ class _PulseBody extends ConsumerWidget {
         if (tab == PulseTab.agents) {
           final groups = groupAgentNotes(notes);
           return ListView.separated(
-            physics: const AlwaysScrollableScrollPhysics(),
             padding: const EdgeInsets.fromLTRB(
               Grid.gutter,
               Grid.xxs,
@@ -188,7 +188,6 @@ class _PulseBody extends ConsumerWidget {
           );
         }
         return ListView.separated(
-          physics: const AlwaysScrollableScrollPhysics(),
           padding: const EdgeInsets.fromLTRB(
             Grid.gutter,
             Grid.xxs,
@@ -243,7 +242,6 @@ class _MessageListShell extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListView(
-      physics: const AlwaysScrollableScrollPhysics(),
       padding: const EdgeInsets.all(Grid.xs),
       children: [SizedBox(height: 260, child: Center(child: child))],
     );
diff --git a/mobile/lib/features/settings/settings_page.dart b/mobile/lib/features/settings/settings_page.dart
index d53f39a672f..066dd1fd3d1 100644
--- a/mobile/lib/features/settings/settings_page.dart
+++ b/mobile/lib/features/settings/settings_page.dart
@@ -24,9 +24,14 @@ part 'settings_page/appearance_section.dart';
 part 'settings_page/connection_section.dart';
 
 class SettingsPage extends HookConsumerWidget {
-  const SettingsPage({super.key, required this.profileHeader});
+  const SettingsPage({
+    super.key,
+    required this.profileHeader,
+    required this.identityRecoveryPageBuilder,
+  });
 
   final Widget profileHeader;
+  final WidgetBuilder identityRecoveryPageBuilder;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -67,7 +72,9 @@ class SettingsPage extends HookConsumerWidget {
               children: [
                 profileHeader,
                 const _AppearanceSection(),
-                const _ConnectionSection(),
+                _ConnectionSection(
+                  identityRecoveryPageBuilder: identityRecoveryPageBuilder,
+                ),
                 const _RemoveCommunitySection(),
               ],
             ),
diff --git a/mobile/lib/features/settings/settings_page/connection_section.dart b/mobile/lib/features/settings/settings_page/connection_section.dart
index 19da784a638..631f870abca 100644
--- a/mobile/lib/features/settings/settings_page/connection_section.dart
+++ b/mobile/lib/features/settings/settings_page/connection_section.dart
@@ -1,7 +1,9 @@
 part of '../settings_page.dart';
 
 class _ConnectionSection extends ConsumerWidget {
-  const _ConnectionSection();
+  const _ConnectionSection({required this.identityRecoveryPageBuilder});
+
+  final WidgetBuilder identityRecoveryPageBuilder;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -16,7 +18,18 @@ class _ConnectionSection extends ConsumerWidget {
           title: 'Connected to',
           subtitle: config.baseUrl,
         ),
-        if (nsec != null && nsec.isNotEmpty) _IdentityRow(nsec: nsec),
+        if (nsec != null && nsec.isNotEmpty) ...[
+          _IdentityRow(nsec: nsec),
+          AppListRow(
+            icon: LucideIcons.scanQrCode,
+            title: 'Send identity to desktop',
+            subtitle: 'Scan a recovery code shown by Buzz Desktop',
+            trailing: const _RowChevron(),
+            onTap: () => Navigator.of(context).push(
+              MaterialPageRoute<void>(builder: identityRecoveryPageBuilder),
+            ),
+          ),
+        ],
       ],
     );
   }
diff --git a/mobile/lib/shared/widgets/bee_refresh_indicator.dart b/mobile/lib/shared/widgets/bee_refresh_indicator.dart
new file mode 100644
index 00000000000..4a9802f0dae
--- /dev/null
+++ b/mobile/lib/shared/widgets/bee_refresh_indicator.dart
@@ -0,0 +1,440 @@
+import 'dart:async' show Timer, unawaited;
+import 'dart:math' show cos, min, pi, sin;
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../theme/theme.dart';
+import 'flapping_bee.dart';
+
+/// Replaces the standard pull-to-refresh spinner with Buzz's loading bee.
+///
+/// Flutter continues to own the gesture, refresh lifecycle, and accessibility
+/// semantics. This widget maps those states into the elastic pull, retained
+/// loading gap, and bee animation.
+class BeeRefreshIndicator extends HookConsumerWidget {
+  /// Called when the user completes a pull, to load fresh data.
+  ///
+  /// The bee keeps flapping until this future settles, so it should complete
+  /// only once the refresh is done.
+  final Future<void> Function() onRefresh;
+
+  /// The scrollable this indicator wraps.
+  ///
+  /// It must scroll vertically; the indicator reads its scroll notifications
+  /// to couple the bee to the user's finger.
+  final Widget child;
+
+  /// The vertical offset of the scrollable's top edge, such as a pinned header.
+  final double edgeOffset;
+
+  const BeeRefreshIndicator({
+    required this.onRefresh,
+    required this.child,
+    this.edgeOffset = 0,
+    super.key,
+  });
+
+  static const _beeWidth = 60.0;
+  static const _beeHeight = _beeWidth * 309 / 466;
+  static const _triggerDistance = 100.0;
+  static const _loadingGap = 72.0;
+  static const _beeVerticalAlignment = 0.75;
+  static const _beeInitialScale = 0.6;
+  static const _beeRevealStartProgress = 0.18;
+  static const _pupilStartBeyondArmDistance = 96.0;
+  static const _pupilFullBeforeEmojiDistance = 8.0;
+  static const _eyeEmojiSwapViewportFraction = 0.26;
+  static const _eyeEmojiMinSwapBeyondArmDistance = 220.0;
+  static const _eyeEmojiMaxSwapBeyondArmDistance = 280.0;
+  static const _pupilMinBeyondArmDuration = Duration(milliseconds: 300);
+  static const _eyeEmojiMinBeyondArmDuration = Duration(milliseconds: 700);
+  static const _eyeShakePeriod = Duration(milliseconds: 140);
+  static const _settleDuration = Duration(milliseconds: 180);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final status = useState<RefreshIndicatorStatus?>(null);
+    final pullProgress = useState(0.0);
+    final pullDistance = useState(0.0);
+    final pullBeyondArmDistance = useState(0.0);
+    final pullBeyondArmDuration = useState(Duration.zero);
+    final activePointers = useRef(<int>{});
+    final lastPointerTime = useRef(Duration.zero);
+    final armedAt = useRef<Duration?>(null);
+    final didTriggerArmHaptic = useRef(false);
+    final didTriggerEmojiHaptic = useRef(false);
+    final eyeShakeHapticTimer = useRef<Timer?>(null);
+    final completionController = useAnimationController(
+      duration: _settleDuration,
+    );
+    final gapController = useAnimationController(
+      duration: _settleDuration,
+      reverseDuration: _settleDuration,
+    );
+    final flapController = useAnimationController(
+      duration: const Duration(milliseconds: 480),
+    );
+    final eyeShakeController = useAnimationController(
+      duration: _eyeShakePeriod,
+    );
+    final completionProgress = useAnimation(completionController);
+    final gapProgress = useAnimation(gapController);
+    final flapProgress = useAnimation(flapController);
+    final eyeShakeProgress = useAnimation(eyeShakeController);
+    final reducedMotion = MediaQuery.disableAnimationsOf(context);
+    useEffect(
+      () =>
+          () => eyeShakeHapticTimer.value?.cancel(),
+      const [],
+    );
+    final eyeEmojiSwapDistance =
+        (MediaQuery.sizeOf(context).height * _eyeEmojiSwapViewportFraction)
+            .clamp(
+              _eyeEmojiMinSwapBeyondArmDistance,
+              _eyeEmojiMaxSwapBeyondArmDistance,
+            )
+            .toDouble();
+
+    void stopEyeShake() {
+      eyeShakeController
+        ..stop()
+        ..reset();
+      eyeShakeHapticTimer.value?.cancel();
+      eyeShakeHapticTimer.value = null;
+    }
+
+    void startEyeShake() {
+      stopEyeShake();
+      if (reducedMotion) return;
+
+      eyeShakeController.repeat();
+      eyeShakeHapticTimer.value = Timer.periodic(
+        _eyeShakePeriod,
+        (_) => unawaited(HapticFeedback.selectionClick()),
+      );
+    }
+
+    void beginExpressionTracking() {
+      if (activePointers.value.isEmpty || armedAt.value != null) return;
+      pullBeyondArmDistance.value = 0;
+      pullBeyondArmDuration.value = Duration.zero;
+      armedAt.value = lastPointerTime.value;
+      if (!didTriggerArmHaptic.value) {
+        didTriggerArmHaptic.value = true;
+        unawaited(HapticFeedback.mediumImpact());
+      }
+    }
+
+    void updateStatus(RefreshIndicatorStatus? nextStatus) {
+      status.value = nextStatus;
+
+      if (nextStatus == RefreshIndicatorStatus.drag) {
+        completionController.reset();
+        gapController.reset();
+        flapController.stop();
+        if (!didTriggerArmHaptic.value) {
+          pullBeyondArmDistance.value = 0;
+          pullBeyondArmDuration.value = Duration.zero;
+          armedAt.value = null;
+        }
+      } else if (nextStatus == RefreshIndicatorStatus.armed) {
+        pullProgress.value = 1;
+        beginExpressionTracking();
+      } else if (nextStatus == RefreshIndicatorStatus.snap ||
+          nextStatus == RefreshIndicatorStatus.refresh) {
+        stopEyeShake();
+        pullProgress.value = 1;
+        pullBeyondArmDistance.value = 0;
+        pullBeyondArmDuration.value = Duration.zero;
+        armedAt.value = null;
+        if (reducedMotion) {
+          gapController.value = 1;
+        } else {
+          gapController.animateTo(1, curve: Curves.easeOutCubic);
+        }
+        if (!reducedMotion) flapController.repeat();
+      } else if (nextStatus == RefreshIndicatorStatus.done) {
+        stopEyeShake();
+        if (reducedMotion) {
+          gapController.value = 0;
+          pullProgress.value = 0;
+          pullDistance.value = 0;
+          pullBeyondArmDistance.value = 0;
+          pullBeyondArmDuration.value = Duration.zero;
+          status.value = null;
+        } else {
+          flapController.repeat();
+          gapController
+              .animateTo(1, curve: Curves.easeOutCubic)
+              .whenCompleteOrCancel(() {
+                if (!gapController.isCompleted || status.value == null) return;
+                gapController.animateBack(0, curve: Curves.easeInOutCubic);
+                completionController.forward(from: 0).whenCompleteOrCancel(() {
+                  if (!completionController.isCompleted) return;
+                  flapController.stop();
+                  pullProgress.value = 0;
+                  pullDistance.value = 0;
+                  pullBeyondArmDistance.value = 0;
+                  pullBeyondArmDuration.value = Duration.zero;
+                  status.value = null;
+                });
+              });
+        }
+      } else if (nextStatus == RefreshIndicatorStatus.canceled ||
+          nextStatus == null) {
+        stopEyeShake();
+        pullProgress.value = 0;
+        pullDistance.value = 0;
+        pullBeyondArmDistance.value = 0;
+        pullBeyondArmDuration.value = Duration.zero;
+        armedAt.value = null;
+        if (!gapController.isAnimating) gapController.reset();
+        flapController.stop();
+      }
+    }
+
+    bool trackPull(ScrollNotification notification) {
+      if (notification.metrics.axis != Axis.vertical) return false;
+
+      if (notification is! ScrollStartNotification &&
+          notification.metrics.extentBefore == 0) {
+        // BouncingScrollPhysics reports a live negative scroll position while
+        // the user is pulling. Reading it keeps the bee coupled to the finger.
+        final elasticPull =
+            (notification.metrics.minScrollExtent - notification.metrics.pixels)
+                .clamp(0.0, double.infinity)
+                .toDouble();
+        if (elasticPull > 0 || pullDistance.value > 0) {
+          pullDistance.value = elasticPull;
+          final nextProgress = (elasticPull / _triggerDistance).clamp(0.0, 1.0);
+          pullProgress.value = nextProgress;
+          if (nextProgress >= 1) beginExpressionTracking();
+        } else if (notification case OverscrollNotification()) {
+          // Clamping physics does not expose a negative position, so build the
+          // same progress from its overscroll deltas.
+          final nextDistance =
+              pullDistance.value + notification.overscroll.abs();
+          pullDistance.value = nextDistance;
+          pullProgress.value = (nextDistance / _triggerDistance).clamp(
+            0.0,
+            1.0,
+          );
+          if (pullProgress.value >= 1) beginExpressionTracking();
+        }
+      }
+      return false;
+    }
+
+    void startPointer(PointerDownEvent event) {
+      final isNewGesture = activePointers.value.isEmpty;
+      activePointers.value.add(event.pointer);
+      if (!isNewGesture) return;
+
+      lastPointerTime.value = event.timeStamp;
+      armedAt.value = null;
+      didTriggerArmHaptic.value = false;
+      didTriggerEmojiHaptic.value = false;
+      stopEyeShake();
+      pullProgress.value = 0;
+      pullDistance.value = 0;
+      pullBeyondArmDistance.value = 0;
+      pullBeyondArmDuration.value = Duration.zero;
+    }
+
+    void trackPointer(PointerMoveEvent event) {
+      if (!activePointers.value.contains(event.pointer)) return;
+      lastPointerTime.value = event.timeStamp;
+      if (armedAt.value == null) return;
+
+      pullBeyondArmDistance.value =
+          (pullBeyondArmDistance.value + event.delta.dy)
+              .clamp(0.0, double.infinity)
+              .toDouble();
+      if (armedAt.value case final armedTime?) {
+        pullBeyondArmDuration.value = event.timeStamp - armedTime;
+      }
+      if (!didTriggerEmojiHaptic.value &&
+          pullBeyondArmDuration.value >= _eyeEmojiMinBeyondArmDuration &&
+          pullBeyondArmDistance.value >= eyeEmojiSwapDistance) {
+        didTriggerEmojiHaptic.value = true;
+        unawaited(HapticFeedback.heavyImpact());
+        startEyeShake();
+      }
+    }
+
+    void finishPointer(PointerEvent event) {
+      if (!activePointers.value.remove(event.pointer)) return;
+      if (activePointers.value.isNotEmpty) return;
+
+      stopEyeShake();
+      armedAt.value = null;
+      pullBeyondArmDistance.value = 0;
+      pullBeyondArmDuration.value = Duration.zero;
+    }
+
+    final isLoading = switch (status.value) {
+      RefreshIndicatorStatus.snap ||
+      RefreshIndicatorStatus.refresh ||
+      RefreshIndicatorStatus.done => true,
+      _ => false,
+    };
+    final dragRevealProgress =
+        ((pullProgress.value - _beeRevealStartProgress) /
+                (1 - _beeRevealStartProgress))
+            .clamp(0.0, 1.0);
+    final isVisible =
+        status.value != null &&
+        (isLoading || dragRevealProgress > 0 || completionProgress > 0);
+    final retainedGap = _loadingGap * gapProgress;
+    final visibleGap = pullDistance.value + retainedGap;
+    final top = edgeOffset + (visibleGap - _beeHeight) * _beeVerticalAlignment;
+    final opacity = isLoading ? 1 - completionProgress : dragRevealProgress;
+    final beeScale = isLoading
+        ? 1.0
+        : _beeInitialScale + (1 - _beeInitialScale) * dragRevealProgress;
+    final flapAmount = reducedMotion
+        ? 0.0
+        : isLoading
+        ? 0.5 - (0.5 * cos(flapProgress * 4 * pi))
+        : pullProgress.value * 0.18;
+    final pupilFullDistance =
+        eyeEmojiSwapDistance - _pupilFullBeforeEmojiDistance;
+    final pupilDistanceProgress =
+        ((pullBeyondArmDistance.value - _pupilStartBeyondArmDistance) /
+                (pupilFullDistance - _pupilStartBeyondArmDistance))
+            .clamp(0.0, 1.0);
+    final pupilGrowthDuration =
+        _eyeEmojiMinBeyondArmDuration - _pupilMinBeyondArmDuration;
+    final pupilProgress =
+        pullBeyondArmDuration.value >= _pupilMinBeyondArmDuration
+        ? min(
+            pupilDistanceProgress,
+            ((pullBeyondArmDuration.value - _pupilMinBeyondArmDuration)
+                        .inMicroseconds /
+                    pupilGrowthDuration.inMicroseconds)
+                .clamp(0.0, 1.0),
+          ).toDouble()
+        : 0.0;
+    final showEyeEmoji = !isLoading && didTriggerEmojiHaptic.value;
+    final eyeShakeOffset = showEyeEmoji && !reducedMotion
+        ? sin(eyeShakeProgress * 2 * pi) * 0.75
+        : 0.0;
+    final scrollBehavior = ScrollConfiguration.of(context).copyWith(
+      overscroll: false,
+      physics: const BouncingScrollPhysics(
+        parent: AlwaysScrollableScrollPhysics(),
+      ),
+    );
+
+    return Stack(
+      clipBehavior: Clip.none,
+      children: [
+        RefreshIndicator.noSpinner(
+          onRefresh: onRefresh,
+          onStatusChange: updateStatus,
+          semanticsLabel: 'Pull to refresh',
+          child: NotificationListener<ScrollNotification>(
+            onNotification: trackPull,
+            child: Listener(
+              behavior: HitTestBehavior.translucent,
+              onPointerDown: startPointer,
+              onPointerMove: trackPointer,
+              onPointerUp: finishPointer,
+              onPointerCancel: finishPointer,
+              child: ScrollConfiguration(
+                behavior: scrollBehavior,
+                child: Transform.translate(
+                  key: const ValueKey('bee-refresh-retained-gap'),
+                  offset: Offset(0, retainedGap),
+                  child: child,
+                ),
+              ),
+            ),
+          ),
+        ),
+        if (isVisible)
+          Positioned(
+            top: edgeOffset,
+            left: 0,
+            right: 0,
+            bottom: 0,
+            child: ClipRect(
+              child: Align(
+                alignment: Alignment.topCenter,
+                child: Transform.translate(
+                  offset: Offset(0, top - edgeOffset),
+                  child: IgnorePointer(
+                    child: Opacity(
+                      key: const ValueKey('bee-refresh-opacity'),
+                      opacity: opacity.clamp(0.0, 1.0),
+                      child: Transform.scale(
+                        key: const ValueKey('bee-refresh-scale'),
+                        scale: beeScale,
+                        child: SizedBox(
+                          width: _beeWidth,
+                          height: _beeHeight,
+                          child: Stack(
+                            clipBehavior: Clip.none,
+                            alignment: Alignment.topCenter,
+                            children: [
+                              Positioned.fill(
+                                child: FlappingBee(
+                                  width: _beeWidth,
+                                  color: context.colors.primary,
+                                  flapAmount: flapAmount,
+                                  eyeProgress:
+                                      !isLoading &&
+                                          !showEyeEmoji &&
+                                          pupilProgress > 0
+                                      ? pupilProgress
+                                      : null,
+                                ),
+                              ),
+                              if (showEyeEmoji)
+                                Positioned(
+                                  top: 2,
+                                  left: 0,
+                                  right: 0,
+                                  child: ExcludeSemantics(
+                                    child: Transform.translate(
+                                      key: const ValueKey(
+                                        'bee-refresh-eyes-emoji-offset',
+                                      ),
+                                      offset: const Offset(2, 0),
+                                      child: Transform.translate(
+                                        key: const ValueKey(
+                                          'bee-refresh-eyes-emoji-shake',
+                                        ),
+                                        offset: Offset(eyeShakeOffset, 0),
+                                        child: const Text(
+                                          '👀',
+                                          key: ValueKey(
+                                            'bee-refresh-eyes-emoji',
+                                          ),
+                                          textAlign: TextAlign.center,
+                                          style: TextStyle(
+                                            fontSize: 18,
+                                            height: 1,
+                                          ),
+                                        ),
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/shared/widgets/flapping_bee.dart b/mobile/lib/shared/widgets/flapping_bee.dart
new file mode 100644
index 00000000000..9a99bd87966
--- /dev/null
+++ b/mobile/lib/shared/widgets/flapping_bee.dart
@@ -0,0 +1,155 @@
+import 'dart:math' show min;
+
+import 'package:flutter/material.dart';
+
+/// The Buzz mark at a caller-controlled wing position.
+///
+/// The geometry matches the desktop loading bee. Callers drive the wings
+/// themselves, which lets one painter serve both the tap-to-flutter mark
+/// ([TappableFlappingBee]) and the pull-to-refresh indicator
+/// ([BeeRefreshIndicator]).
+class FlappingBee extends StatelessWidget {
+  /// The rendered width of the complete bee mark.
+  ///
+  /// Height follows from the mark's 466:309 aspect ratio.
+  final double width;
+
+  /// The color used for the bee silhouette, wings, and pupils.
+  final Color color;
+
+  /// How far the wings are tucked toward the body, from 0 to 1.
+  ///
+  /// 0 renders the wings fully spread; 1 renders them at their innermost
+  /// tuck. Callers animate this to flap the wings.
+  final double flapAmount;
+
+  /// How far the pupils have grown, from 0 to 1, or null for cutout eyes.
+  ///
+  /// Only the pull-to-refresh treatment sets this. Leaving it null preserves
+  /// the mark's ordinary cutout eyes; a non-null value fills them in, with 1
+  /// drawing the pupils at full size.
+  final double? eyeProgress;
+
+  const FlappingBee({
+    required this.width,
+    required this.color,
+    required this.flapAmount,
+    this.eyeProgress,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return RepaintBoundary(
+      child: CustomPaint(
+        size: Size(width, width * 309 / 466),
+        painter: _FlappingBeePainter(
+          color: color,
+          flapAmount: flapAmount,
+          eyeProgress: eyeProgress,
+        ),
+      ),
+    );
+  }
+}
+
+class _FlappingBeePainter extends CustomPainter {
+  final Color color;
+  final double flapAmount;
+  final double? eyeProgress;
+
+  const _FlappingBeePainter({
+    required this.color,
+    required this.flapAmount,
+    this.eyeProgress,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final scale = min(size.width / 466, size.height / 309);
+    final renderedWidth = 466 * scale;
+    final renderedHeight = 309 * scale;
+
+    canvas
+      ..save()
+      ..translate(
+        (size.width - renderedWidth) / 2,
+        (size.height - renderedHeight) / 2,
+      )
+      ..scale(scale);
+
+    final wingRadiusX = 91.7 * (1 - (0.38 * flapAmount));
+    final wingTranslation = 30 * flapAmount;
+    final leftWing = Path()
+      ..addOval(
+        Rect.fromCenter(
+          center: Offset(91.7 + wingTranslation, 154.5),
+          width: wingRadiusX * 2,
+          height: 183.4,
+        ),
+      );
+    final rightWing = Path()
+      ..addOval(
+        Rect.fromCenter(
+          center: Offset(374.3 - wingTranslation, 154.5),
+          width: wingRadiusX * 2,
+          height: 183.4,
+        ),
+      );
+    final body = Path()
+      ..addRRect(
+        RRect.fromRectAndRadius(
+          const Rect.fromLTWH(128, 0, 210, 309),
+          const Radius.circular(34),
+        ),
+      );
+    final cutouts = Path()
+      ..addOval(
+        Rect.fromCenter(
+          center: const Offset(193.3, 84.4),
+          width: 54,
+          height: 54,
+        ),
+      )
+      ..addOval(
+        Rect.fromCenter(center: const Offset(276, 84.4), width: 54, height: 54),
+      )
+      ..addRRect(
+        RRect.fromRectAndRadius(
+          const Rect.fromLTWH(166.3, 157.2, 136.9, 38.3),
+          const Radius.circular(5),
+        ),
+      )
+      ..addRRect(
+        RRect.fromRectAndRadius(
+          const Rect.fromLTWH(166.9, 235.1, 136.2, 37.6),
+          const Radius.circular(5),
+        ),
+      );
+    final wings = Path.combine(PathOperation.union, leftWing, rightWing);
+    final silhouette = Path.combine(PathOperation.union, wings, body);
+    final finishedMark = Path.combine(
+      PathOperation.difference,
+      silhouette,
+      cutouts,
+    );
+
+    canvas.drawPath(finishedMark, Paint()..color = color);
+
+    if (eyeProgress case final progress?) {
+      final pupilRadius = 20 * progress.clamp(0.0, 1.0);
+      final pupilPaint = Paint()..color = color;
+      canvas
+        ..drawCircle(const Offset(193.3, 84.4), pupilRadius, pupilPaint)
+        ..drawCircle(const Offset(276, 84.4), pupilRadius, pupilPaint);
+    }
+
+    canvas.restore();
+  }
+
+  @override
+  bool shouldRepaint(_FlappingBeePainter oldDelegate) =>
+      color != oldDelegate.color ||
+      flapAmount != oldDelegate.flapAmount ||
+      eyeProgress != oldDelegate.eyeProgress;
+}
diff --git a/mobile/lib/shared/widgets/tappable_flapping_bee.dart b/mobile/lib/shared/widgets/tappable_flapping_bee.dart
index 5796e9749b3..2313de50f97 100644
--- a/mobile/lib/shared/widgets/tappable_flapping_bee.dart
+++ b/mobile/lib/shared/widgets/tappable_flapping_bee.dart
@@ -1,9 +1,11 @@
-import 'dart:math' show cos, min, pi;
+import 'dart:math' show cos, pi;
 
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
+import 'flapping_bee.dart';
+
 /// The Buzz mark with wings that flutter twice when the user taps it.
 ///
 /// The geometry and wing tuck match the desktop loading bee. When reduced
@@ -47,12 +49,10 @@ class TappableFlappingBee extends HookConsumerWidget {
             animation: animation,
             builder: (context, _) {
               final flapAmount = 0.5 - (0.5 * cos(animation.value * 4 * pi));
-              return CustomPaint(
-                size: Size(width, width * 309 / 466),
-                painter: _FlappingBeePainter(
-                  color: color,
-                  flapAmount: flapAmount,
-                ),
+              return FlappingBee(
+                width: width,
+                color: color,
+                flapAmount: flapAmount,
               );
             },
           ),
@@ -61,89 +61,3 @@ class TappableFlappingBee extends HookConsumerWidget {
     );
   }
 }
-
-class _FlappingBeePainter extends CustomPainter {
-  final Color color;
-  final double flapAmount;
-
-  const _FlappingBeePainter({required this.color, required this.flapAmount});
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    final scale = min(size.width / 466, size.height / 309);
-    final renderedWidth = 466 * scale;
-    final renderedHeight = 309 * scale;
-
-    canvas
-      ..save()
-      ..translate(
-        (size.width - renderedWidth) / 2,
-        (size.height - renderedHeight) / 2,
-      )
-      ..scale(scale);
-
-    final wingRadiusX = 91.7 * (1 - (0.38 * flapAmount));
-    final wingTranslation = 30 * flapAmount;
-    final leftWing = Path()
-      ..addOval(
-        Rect.fromCenter(
-          center: Offset(91.7 + wingTranslation, 154.5),
-          width: wingRadiusX * 2,
-          height: 183.4,
-        ),
-      );
-    final rightWing = Path()
-      ..addOval(
-        Rect.fromCenter(
-          center: Offset(374.3 - wingTranslation, 154.5),
-          width: wingRadiusX * 2,
-          height: 183.4,
-        ),
-      );
-    final body = Path()
-      ..addRRect(
-        RRect.fromRectAndRadius(
-          const Rect.fromLTWH(128, 0, 210, 309),
-          const Radius.circular(34),
-        ),
-      );
-    final cutouts = Path()
-      ..addOval(
-        Rect.fromCenter(
-          center: const Offset(193.3, 84.4),
-          width: 54,
-          height: 54,
-        ),
-      )
-      ..addOval(
-        Rect.fromCenter(center: const Offset(276, 84.4), width: 54, height: 54),
-      )
-      ..addRRect(
-        RRect.fromRectAndRadius(
-          const Rect.fromLTWH(166.3, 157.2, 136.9, 38.3),
-          const Radius.circular(5),
-        ),
-      )
-      ..addRRect(
-        RRect.fromRectAndRadius(
-          const Rect.fromLTWH(166.9, 235.1, 136.2, 37.6),
-          const Radius.circular(5),
-        ),
-      );
-    final wings = Path.combine(PathOperation.union, leftWing, rightWing);
-    final silhouette = Path.combine(PathOperation.union, wings, body);
-    final finishedMark = Path.combine(
-      PathOperation.difference,
-      silhouette,
-      cutouts,
-    );
-
-    canvas
-      ..drawPath(finishedMark, Paint()..color = color)
-      ..restore();
-  }
-
-  @override
-  bool shouldRepaint(_FlappingBeePainter oldDelegate) =>
-      color != oldDelegate.color || flapAmount != oldDelegate.flapAmount;
-}
diff --git a/mobile/test/features/channels/channel_detail_page_test.dart b/mobile/test/features/channels/channel_detail_page_test.dart
index 00b9f812295..15cf79a3133 100644
--- a/mobile/test/features/channels/channel_detail_page_test.dart
+++ b/mobile/test/features/channels/channel_detail_page_test.dart
@@ -166,6 +166,7 @@ Widget _buildTestable({
   required List<NostrEvent> messages,
   List<TypingEntry> typing = const [],
   Map<String, UserProfile> users = const {},
+  _FakeUserCacheNotifier? userCacheNotifier,
   List<ChannelMember> members = const [],
   Channel? channel,
   List<Channel>? channels,
@@ -197,7 +198,9 @@ Widget _buildTestable({
       channelTypingProvider(
         _channelId,
       ).overrideWith(() => _FakeTypingNotifier(typing)),
-      userCacheProvider.overrideWith(() => _FakeUserCacheNotifier(users)),
+      userCacheProvider.overrideWith(
+        () => userCacheNotifier ?? _FakeUserCacheNotifier(users),
+      ),
       profileProvider.overrideWith(() => _FakeProfileNotifier()),
       channelsProvider.overrideWith(() => fakeChannelsNotifier),
       channelDetailsProvider(_channelId).overrideWith(
@@ -1023,6 +1026,245 @@ void main() {
       );
     });
 
+    testWidgets('long press opens the anchored reaction popover', (
+      tester,
+    ) async {
+      final hapticCalls = <MethodCall>[];
+      tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
+        SystemChannels.platform,
+        (call) async {
+          if (call.method == 'HapticFeedback.vibrate') hapticCalls.add(call);
+          return null;
+        },
+      );
+      addTearDown(
+        () => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
+          SystemChannels.platform,
+          null,
+        ),
+      );
+
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: [
+            _systemMsg(
+              id: 'reaction-target',
+              payload: {
+                'type': 'member_joined',
+                'actor': 'alice',
+                'target': 'alice',
+              },
+            ),
+          ],
+          users: const {
+            'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      await tester.longPress(
+        find.byKey(const ValueKey('system-message-row-reaction-target')),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.byKey(const ValueKey('quick-reaction-more')), findsOneWidget);
+      expect(
+        find.byWidgetPredicate(
+          (widget) =>
+              widget.key is ValueKey<String> &&
+              (widget.key! as ValueKey<String>).value.startsWith(
+                'quick-reaction-',
+              ),
+        ),
+        findsNWidgets(6),
+      );
+      expect(find.byType(BottomSheet), findsNothing);
+      expect(find.text('Copy text'), findsNothing);
+      expect(findRichText('joined the channel'), findsOneWidget);
+      expect(hapticCalls, hasLength(1));
+      expect(hapticCalls.single.arguments, 'HapticFeedbackType.mediumImpact');
+    });
+
+    testWidgets('reaction popover leaves existing reactions in the blur', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: [
+            _systemMsg(
+              id: 'reacted-system-message',
+              payload: {
+                'type': 'member_joined',
+                'actor': 'alice',
+                'target': 'alice',
+              },
+            ),
+            _reaction(
+              id: 'existing-reaction',
+              targetId: 'reacted-system-message',
+            ),
+          ],
+          users: const {
+            'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final messageCenter = tester.getCenter(
+        findRichText('joined the channel'),
+      );
+      final reactionRect = tester.getRect(find.byType(ReactionRow));
+      final reactionCenter = reactionRect.center;
+      final reactionPillTop = Offset(
+        reactionRect.center.dx,
+        reactionRect.top + Grid.half + Grid.quarter,
+      );
+      await tester.longPress(
+        find.byKey(const ValueKey('system-message-row-reacted-system-message')),
+      );
+      await tester.pumpAndSettle();
+
+      final backgroundFinder = find.byKey(
+        const ValueKey('reaction-popover-background'),
+      );
+      final background = tester.widget<ClipPath>(backgroundFinder);
+      final backgroundOrigin = tester.getTopLeft(backgroundFinder);
+      final blurPath = background.clipper!.getClip(
+        tester.getSize(backgroundFinder),
+      );
+
+      expect(blurPath.contains(messageCenter - backgroundOrigin), isFalse);
+      expect(blurPath.contains(reactionPillTop - backgroundOrigin), isTrue);
+      expect(blurPath.contains(reactionCenter - backgroundOrigin), isTrue);
+    });
+
+    testWidgets('reaction popover grows right from a fixed left edge', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: [
+            _systemMsg(
+              id: 'left-growth-target',
+              payload: {
+                'type': 'member_joined',
+                'actor': 'alice',
+                'target': 'alice',
+              },
+            ),
+          ],
+          users: const {
+            'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      await tester.longPress(
+        find.byKey(const ValueKey('system-message-row-left-growth-target')),
+      );
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 100));
+      final earlyRect = tester.getRect(
+        find.byKey(const ValueKey('reaction-popover-tray')),
+      );
+      await tester.pump(const Duration(milliseconds: 80));
+      final laterRect = tester.getRect(
+        find.byKey(const ValueKey('reaction-popover-tray')),
+      );
+
+      expect(laterRect.left, moreOrLessEquals(earlyRect.left));
+      expect(laterRect.width, greaterThan(earlyRect.width));
+      await tester.pumpAndSettle();
+    });
+
+    testWidgets('long press survives a message rebuild during the hold', (
+      tester,
+    ) async {
+      final userCache = _FakeUserCacheNotifier({
+        'alice': const UserProfile(pubkey: 'alice', displayName: 'Alice'),
+      });
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: [
+            _systemMsg(
+              id: 'rebuild-target',
+              payload: {
+                'type': 'member_joined',
+                'actor': 'alice',
+                'target': 'alice',
+              },
+            ),
+          ],
+          userCacheNotifier: userCache,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final target = find.byKey(
+        const ValueKey('system-message-row-rebuild-target'),
+      );
+      final gesture = await tester.startGesture(tester.getCenter(target));
+      await tester.pump(const Duration(milliseconds: 250));
+      userCache.replace(
+        const UserProfile(pubkey: 'alice', displayName: 'Alice Updated'),
+      );
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 300));
+      await gesture.up();
+      await tester.pumpAndSettle();
+
+      expect(
+        find.byKey(const ValueKey('reaction-popover-tray')),
+        findsOneWidget,
+      );
+    });
+
+    testWidgets('long press works over nested rich message content', (
+      tester,
+    ) async {
+      tester.view.physicalSize = const Size(400, 800);
+      tester.view.devicePixelRatio = 1;
+      addTearDown(tester.view.resetPhysicalSize);
+      addTearDown(tester.view.resetDevicePixelRatio);
+
+      const firstImage = 'https://example.com/media/first.png';
+      const secondImage = 'https://example.com/media/second.png';
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: [
+            _textMsg(
+              id: 'rich-reaction-target',
+              pubkey: 'alice',
+              content:
+                  'Gallery\n'
+                  '![First]($firstImage)\n'
+                  '![Second]($secondImage)',
+              extraTags: const [
+                ['imeta', 'url $firstImage', 'm image/png'],
+                ['imeta', 'url $secondImage', 'm image/png'],
+              ],
+            ),
+          ],
+          users: const {
+            'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      await tester.longPress(
+        find.byKey(const ValueKey('message-media-carousel')),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.byKey(const ValueKey('reaction-popover-tray')), findsNothing);
+      expect(find.byType(BottomSheet), findsOneWidget);
+      expect(find.text('Copy text'), findsOneWidget);
+    });
+
     testWidgets(
       'keeps image galleries body-aligned and flush with the trailing edge',
       (tester) async {
@@ -1811,7 +2053,7 @@ void main() {
         expect(latestMessage, findsOneWidget);
         expect(
           tester.getBottomLeft(latestMessage).dy,
-          lessThanOrEqualTo(tester.getTopLeft(composerDock).dy + 1),
+          closeTo(tester.getTopLeft(composerDock).dy, 1),
         );
 
         await tester.tap(find.text('Message #general'));
@@ -1823,7 +2065,7 @@ void main() {
         );
         expect(
           tester.getBottomLeft(latestMessage).dy,
-          lessThanOrEqualTo(tester.getTopLeft(composerDock).dy + 1),
+          closeTo(tester.getTopLeft(composerDock).dy, 1),
         );
         expect(
           find.byKey(const ValueKey('channel-jump-to-latest')),
@@ -1836,7 +2078,7 @@ void main() {
         expect(latestMessage, findsOneWidget);
         expect(
           tester.getBottomLeft(latestMessage).dy,
-          lessThanOrEqualTo(tester.getTopLeft(composerDock).dy + 1),
+          closeTo(tester.getTopLeft(composerDock).dy, 1),
         );
         expect(
           find.byKey(const ValueKey('channel-jump-to-latest')),
@@ -1845,6 +2087,53 @@ void main() {
       },
     );
 
+    testWidgets('keeps a short followed tail flush through composer resize', (
+      tester,
+    ) async {
+      tester.view.physicalSize = const Size(400, 800);
+      tester.view.devicePixelRatio = 1;
+      addTearDown(tester.view.resetPhysicalSize);
+      addTearDown(tester.view.resetDevicePixelRatio);
+      addTearDown(tester.view.reset);
+
+      final messages = [
+        for (var i = 0; i < 3; i++)
+          _textMsg(
+            id: 'msg$i',
+            pubkey: 'alice',
+            content: 'Message $i',
+            createdAt: 1000 + i,
+          ),
+      ];
+
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: messages,
+          users: const {
+            'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final latestMessage = find.byKey(
+        const ValueKey('channel-message-group-msg2'),
+      );
+      final composerDock = find.byKey(const ValueKey('channel-composer-dock'));
+
+      await tester.tap(find.text('Message #general'));
+      await tester.pumpAndSettle();
+
+      expect(
+        tester.getBottomLeft(latestMessage).dy,
+        closeTo(tester.getTopLeft(composerDock).dy, 1),
+      );
+      expect(
+        find.byKey(const ValueKey('channel-jump-to-latest')),
+        findsNothing,
+      );
+    });
+
     testWidgets(
       'does not realign a user-detached timeline on keyboard resize',
       (tester) async {
@@ -1990,6 +2279,18 @@ void main() {
       await tester.pumpAndSettle();
 
       expect(findRichText('Newest live update'), findsOneWidget);
+      final latestMessage = find.byKey(
+        const ValueKey('channel-message-group-newest'),
+      );
+      final composerDock = find.byKey(const ValueKey('channel-composer-dock'));
+      expect(
+        tester.getBottomLeft(latestMessage).dy,
+        closeTo(tester.getTopLeft(composerDock).dy, 1),
+      );
+      expect(
+        find.byKey(const ValueKey('channel-jump-to-latest')),
+        findsNothing,
+      );
     });
 
     testWidgets(
@@ -4269,6 +4570,10 @@ class _FakeUserCacheNotifier extends UserCacheNotifier {
 
   @override
   UserProfile? get(String pubkey) => _users[pubkey.toLowerCase()];
+
+  void replace(UserProfile profile) {
+    state = {...state, profile.pubkey.toLowerCase(): profile};
+  }
 }
 
 class _FakeChannelsNotifier extends ChannelsNotifier {
diff --git a/mobile/test/features/channels/message_actions_test.dart b/mobile/test/features/channels/message_actions_test.dart
index 1c665efcb5c..842a97211b5 100644
--- a/mobile/test/features/channels/message_actions_test.dart
+++ b/mobile/test/features/channels/message_actions_test.dart
@@ -286,6 +286,66 @@ void main() {
       expect(tester.takeException(), isNull);
     });
 
+    testWidgets('keeps the reaction popover on-screen when neither side fits', (
+      tester,
+    ) async {
+      tester.view.physicalSize = const Size(320, 240);
+      tester.view.devicePixelRatio = 1;
+      addTearDown(tester.view.resetPhysicalSize);
+      addTearDown(tester.view.resetDevicePixelRatio);
+
+      const anchorRect = Rect.fromLTWH(40, 60, 240, 100);
+      const safeTop = 24.0;
+      const visibleBottom = 200.0;
+      const trayHeight = 68.0;
+      const trayGap = Grid.xxs;
+      final prefs = await _mockPrefs();
+      expect(anchorRect.top - trayGap - trayHeight, lessThan(safeTop));
+      expect(
+        anchorRect.bottom + trayGap + trayHeight,
+        greaterThan(visibleBottom),
+      );
+
+      await tester.pumpWidget(
+        ProviderScope(
+          overrides: [savedPrefsProvider.overrideWithValue(prefs)],
+          child: MaterialApp(
+            theme: AppTheme.light(),
+            builder: (context, child) => MediaQuery(
+              data: MediaQuery.of(context).copyWith(
+                padding: const EdgeInsets.only(top: safeTop),
+                viewInsets: const EdgeInsets.only(bottom: 40),
+              ),
+              child: child!,
+            ),
+            home: Scaffold(
+              body: Consumer(
+                builder: (context, ref, _) => TextButton(
+                  onPressed: () => showMessageActions(
+                    context: context,
+                    ref: ref,
+                    message: _message(isSystem: true),
+                    channelId: _channelId,
+                    canManageMessage: false,
+                    anchorRect: anchorRect,
+                  ),
+                  child: const Text('open popover'),
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+      await tester.tap(find.text('open popover'));
+      await tester.pumpAndSettle();
+
+      final trayRect = tester.getRect(
+        find.byKey(const ValueKey('reaction-popover-tray')),
+      );
+      expect(trayRect.top, greaterThanOrEqualTo(safeTop));
+      expect(trayRect.bottom, lessThanOrEqualTo(visibleBottom));
+    });
+
     testWidgets('shows Edit/Delete only with manage rights', (tester) async {
       final prefs = await _mockPrefs();
       await _pumpSheet(
diff --git a/mobile/test/features/pairing/pairing_page_test.dart b/mobile/test/features/pairing/pairing_page_test.dart
index 678be9dfe7b..e8f34a6f71c 100644
--- a/mobile/test/features/pairing/pairing_page_test.dart
+++ b/mobile/test/features/pairing/pairing_page_test.dart
@@ -179,6 +179,69 @@ void main() {
       expect(scanButton.onPressed, isNull);
       expect(pairingCodeButton.onPressed, isNull);
     });
+
+    testWidgets('recovery entry rejects ordinary nostrpair codes', (
+      tester,
+    ) async {
+      final notifier = _RecordingPairingNotifier();
+      await tester.pumpWidget(
+        WidgetHelpers.testable(
+          overrides: [pairingProvider.overrideWith(() => notifier)],
+          child: const PairingPage(
+            addingCommunity: true,
+            identityRecoveryOnly: true,
+          ),
+        ),
+      );
+
+      await _expandPairingCode(tester);
+      await tester.enterText(find.byType(TextField), 'nostrpair://ordinary');
+      await tester.tap(find.text('Connect'));
+      await tester.pump();
+
+      expect(find.text('Scan a desktop recovery code.'), findsOneWidget);
+      expect(notifier.pairedCodes, isEmpty);
+    });
+
+    testWidgets('recovery entry accepts mode=recover codes', (tester) async {
+      final notifier = _RecordingPairingNotifier();
+      await tester.pumpWidget(
+        WidgetHelpers.testable(
+          overrides: [pairingProvider.overrideWith(() => notifier)],
+          child: const PairingPage(
+            addingCommunity: true,
+            identityRecoveryOnly: true,
+          ),
+        ),
+      );
+
+      await _expandPairingCode(tester);
+      const code = 'nostrpair://desktop?mode=recover';
+      await tester.enterText(find.byType(TextField), code);
+      await tester.tap(find.text('Connect'));
+      await tester.pump();
+
+      expect(notifier.pairedCodes, [code]);
+    });
+
+    testWidgets('recovery SAS warns about permanent desktop access', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        ProviderScope(
+          overrides: [
+            pairingProvider.overrideWith(
+              () => _ConfirmingSasPairingNotifier(sendsIdentityToDesktop: true),
+            ),
+          ],
+          child: MaterialApp(theme: AppTheme.dark(), home: const PairingPage()),
+        ),
+      );
+
+      expect(find.textContaining('full Buzz identity'), findsOneWidget);
+      expect(find.textContaining('permanent access'), findsOneWidget);
+      expect(find.text('Codes Match'), findsOneWidget);
+    });
   });
 }
 
@@ -227,12 +290,37 @@ class _ConnectingPairingNotifier extends Notifier<PairingState>
   void denySas() {}
 }
 
+class _RecordingPairingNotifier extends Notifier<PairingState>
+    implements PairingNotifier {
+  final pairedCodes = <String>[];
+
+  @override
+  PairingState build() => const PairingState();
+
+  @override
+  Future<void> pair(String rawInput) async => pairedCodes.add(rawInput);
+
+  @override
+  void reset() {}
+
+  @override
+  void confirmSas() {}
+
+  @override
+  void denySas() {}
+}
+
 class _ConfirmingSasPairingNotifier extends Notifier<PairingState>
     implements PairingNotifier {
+  _ConfirmingSasPairingNotifier({this.sendsIdentityToDesktop = false});
+
+  final bool sendsIdentityToDesktop;
+
   @override
-  PairingState build() => const PairingState(
+  PairingState build() => PairingState(
     status: PairingStatus.confirmingSas,
     sasCode: '123456',
+    sendsIdentityToDesktop: sendsIdentityToDesktop,
   );
 
   @override
diff --git a/mobile/test/features/pairing/pairing_provider_test.dart b/mobile/test/features/pairing/pairing_provider_test.dart
index 6f49f719214..c14599bbefa 100644
--- a/mobile/test/features/pairing/pairing_provider_test.dart
+++ b/mobile/test/features/pairing/pairing_provider_test.dart
@@ -2,9 +2,14 @@ import 'dart:convert';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:nostr/nostr.dart' as nostr;
+import 'package:buzz/features/pairing/pairing_crypto.dart';
 import 'package:buzz/features/pairing/pairing_provider.dart';
 import 'package:buzz/features/pairing/pairing_socket.dart';
 import 'package:buzz/shared/auth/auth.dart';
+import 'package:buzz/shared/crypto/ecdh.dart';
+import 'package:buzz/shared/crypto/nip44.dart';
+import 'package:buzz/shared/relay/relay.dart';
 
 /// Tests for [PairingNotifier]'s legacy `buzz://` payload parsing and
 /// SSRF-prevention validation.
@@ -180,6 +185,115 @@ void main() {
       container.read(pairingProvider.notifier).reset();
       expect(container.read(pairingProvider).status, PairingStatus.idle);
     });
+
+    group('desktop identity recovery', () {
+      const sourceSecret =
+          '09b3065e3570a3a4054660dccd66e12774a99a904fdb0ca02dbc6c3136249506';
+      const sessionSecretHex =
+          'abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789';
+      late _ControllableSocket socket;
+      late PairingNotifier notifier;
+      late String recoveryCode;
+
+      setUp(() {
+        final source = nostr.Keys(sourceSecret);
+        recoveryCode =
+            'nostrpair://${source.public}'
+            '?secret=$sessionSecretHex'
+            '&relay=wss%3A%2F%2Fpairing.buzz.xyz&v=1&mode=recover';
+        notifier = PairingNotifier(
+          socketFactory:
+              ({
+                required wsUrl,
+                required ephemeralPrivkey,
+                required onMessage,
+                required onDisconnected,
+              }) {
+                socket = _ControllableSocket(
+                  ephemeralPrivkey: ephemeralPrivkey,
+                  onMessage: onMessage,
+                  onDisconnected: onDisconnected,
+                );
+                return socket;
+              },
+        );
+        container = ProviderContainer(
+          overrides: [
+            pairingProvider.overrideWith(() => notifier),
+            relayConfigProvider.overrideWith(_RecoveryRelayConfig.new),
+          ],
+        );
+        container.read(pairingProvider);
+        notifier = container.read(pairingProvider.notifier);
+      });
+
+      test('recovery URI enables phone-to-desktop transfer', () async {
+        await notifier.pair(recoveryCode);
+
+        final state = container.read(pairingProvider);
+        expect(state.status, PairingStatus.confirmingSas);
+        expect(state.sendsIdentityToDesktop, isTrue);
+        expect(state.sasCode, hasLength(6));
+      });
+
+      test(
+        'matching SAS sends nsec and successful completion finishes',
+        () async {
+          await notifier.pair(recoveryCode);
+          notifier.confirmSas();
+          expect(container.read(pairingProvider).userConfirmedSas, isTrue);
+
+          socket.sendSourceMessage(
+            sourceSecret: sourceSecret,
+            sessionSecretHex: sessionSecretHex,
+            message: {'type': 'sas-confirm'},
+            includeTranscriptHash: true,
+          );
+
+          expect(
+            container.read(pairingProvider).status,
+            PairingStatus.transferring,
+          );
+          final sentMessages = socket.decryptedPublishedMessages(sourceSecret);
+          expect(
+            sentMessages.any(
+              (message) =>
+                  message['type'] == 'payload' &&
+                  message['payload_type'] == 'nsec' &&
+                  message['payload'] == _RecoveryRelayConfig.nsec,
+            ),
+            isTrue,
+          );
+
+          socket.sendSourceMessage(
+            sourceSecret: sourceSecret,
+            sessionSecretHex: sessionSecretHex,
+            message: {'type': 'complete', 'success': true},
+          );
+          expect(container.read(pairingProvider).status, PairingStatus.success);
+        },
+      );
+
+      test('desktop storage failure surfaces an error', () async {
+        await notifier.pair(recoveryCode);
+        notifier.confirmSas();
+        socket.sendSourceMessage(
+          sourceSecret: sourceSecret,
+          sessionSecretHex: sessionSecretHex,
+          message: {'type': 'sas-confirm'},
+          includeTranscriptHash: true,
+        );
+        socket.sendSourceMessage(
+          sourceSecret: sourceSecret,
+          sessionSecretHex: sessionSecretHex,
+          message: {'type': 'complete', 'success': false},
+        );
+
+        final state = container.read(pairingProvider);
+        expect(state.status, PairingStatus.error);
+        expect(state.errorMessage, contains('could not store'));
+      });
+    });
   });
 }
 
@@ -241,3 +355,92 @@ class _DisconnectingSocket extends PairingSocket {
     disconnectCallback(Exception('Connection closed'));
   }
 }
+
+class _RecoveryRelayConfig extends RelayConfigNotifier {
+  static final nsec = nostr.Keys(
+    '1111111111111111111111111111111111111111111111111111111111111111',
+  ).nsec;
+
+  @override
+  RelayConfig build() => RelayConfig(baseUrl: 'https://relay.test', nsec: nsec);
+}
+
+class _ControllableSocket extends PairingSocket {
+  final String ephemeralPrivkey;
+  final void Function(List<dynamic> message) relayMessageCallback;
+  final List<Map<String, dynamic>> published = [];
+  bool _connected = false;
+  int _eventSequence = 0;
+
+  _ControllableSocket({
+    required this.ephemeralPrivkey,
+    required super.onMessage,
+    required super.onDisconnected,
+  }) : relayMessageCallback = onMessage,
+       super(wsUrl: 'ws://unused', ephemeralPrivkey: ephemeralPrivkey);
+
+  @override
+  bool get isConnected => _connected;
+
+  @override
+  Future<void> connect() async => _connected = true;
+
+  @override
+  void subscribe(String subId, int kind, String pubkeyHex) {}
+
+  @override
+  void publishEvent(Map<String, dynamic> event) => published.add(event);
+
+  @override
+  void dispose() => _connected = false;
+
+  List<Map<String, dynamic>> decryptedPublishedMessages(String sourceSecret) {
+    final key = getConversationKey(
+      sourceSecret,
+      nostr.Keys(ephemeralPrivkey).public,
+    );
+    return published
+        .map(
+          (event) =>
+              jsonDecode(nip44Decrypt(key, event['content'] as String))
+                  as Map<String, dynamic>,
+        )
+        .toList();
+  }
+
+  void sendSourceMessage({
+    required String sourceSecret,
+    required String sessionSecretHex,
+    required Map<String, dynamic> message,
+    bool includeTranscriptHash = false,
+  }) {
+    final source = nostr.Keys(sourceSecret);
+    final targetPubkey = nostr.Keys(ephemeralPrivkey).public;
+    final sessionSecret = hexToBytes(sessionSecretHex);
+    final body = Map<String, dynamic>.from(message);
+    if (includeTranscriptHash) {
+      final shared = ecdhSharedSecret(sourceSecret, targetPubkey);
+      final (_, sasInput) = deriveSas(shared, sessionSecret);
+      body['transcript_hash'] = bytesToHex(
+        deriveTranscriptHash(
+          deriveSessionId(sessionSecret),
+          hexToBytes(source.public),
+          hexToBytes(targetPubkey),
+          sasInput,
+          sessionSecret,
+        ),
+      );
+    }
+    final key = getConversationKey(sourceSecret, targetPubkey);
+    final event = nostr.Event.from(
+      kind: 24134,
+      content: nip44Encrypt(key, jsonEncode(body)),
+      tags: [
+        ['p', targetPubkey],
+      ],
+      secretKey: sourceSecret,
+      createdAt: 1_700_000_000 + _eventSequence++,
+    );
+    relayMessageCallback(['EVENT', 'pair', event.toMap()]);
+  }
+}
diff --git a/mobile/test/features/settings/theme_picker_page_test.dart b/mobile/test/features/settings/theme_picker_page_test.dart
index 010db98ba3c..6b166c8efa7 100644
--- a/mobile/test/features/settings/theme_picker_page_test.dart
+++ b/mobile/test/features/settings/theme_picker_page_test.dart
@@ -172,7 +172,10 @@ void main() {
     testWidgets('settings hides accent navigation for Buzz', (tester) async {
       await _pumpPicker(
         tester,
-        const SettingsPage(profileHeader: SizedBox.shrink()),
+        SettingsPage(
+          profileHeader: const SizedBox.shrink(),
+          identityRecoveryPageBuilder: (_) => const SizedBox.shrink(),
+        ),
         prefs: {'buzz_color_scheme': 'buzz', 'buzz_accent_color': 4},
       );
 
@@ -184,7 +187,10 @@ void main() {
     ) async {
       await _pumpPicker(
         tester,
-        const SettingsPage(profileHeader: SizedBox.shrink()),
+        SettingsPage(
+          profileHeader: const SizedBox.shrink(),
+          identityRecoveryPageBuilder: (_) => const SizedBox.shrink(),
+        ),
         prefs: {
           'buzz_theme_mode': 'light',
           'buzz_color_scheme': 'github-light',
diff --git a/mobile/test/shared/widgets/bee_refresh_indicator_test.dart b/mobile/test/shared/widgets/bee_refresh_indicator_test.dart
new file mode 100644
index 00000000000..de440ebb624
--- /dev/null
+++ b/mobile/test/shared/widgets/bee_refresh_indicator_test.dart
@@ -0,0 +1,379 @@
+import 'dart:async';
+
+import 'package:buzz/shared/widgets/bee_refresh_indicator.dart';
+import 'package:buzz/shared/widgets/flapping_bee.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../helpers/widget_helpers.dart';
+
+void main() {
+  testWidgets('shows the bee while pulling to refresh', (tester) async {
+    const contentKey = ValueKey('loading-content');
+    var refreshes = 0;
+    final refreshCompleter = Completer<void>();
+
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        child: BeeRefreshIndicator(
+          onRefresh: () {
+            refreshes++;
+            return refreshCompleter.future;
+          },
+          child: ListView(
+            children: const [SizedBox(key: contentKey, height: 800)],
+          ),
+        ),
+      ),
+    );
+
+    final listFinder = find.byType(ListView);
+    final restingTop = tester.getTopLeft(listFinder).dy;
+    final restingContentTop = tester.getTopLeft(find.byKey(contentKey)).dy;
+    await tester.timedDrag(
+      listFinder,
+      const Offset(0, 320),
+      const Duration(milliseconds: 500),
+    );
+    await tester.pump(const Duration(milliseconds: 16));
+    await tester.pump(const Duration(milliseconds: 300));
+
+    final beeFinder = find.byType(FlappingBee);
+    final loadingTop = tester.getTopLeft(listFinder).dy;
+    final loadingContentTop = tester.getTopLeft(find.byKey(contentKey)).dy;
+    final gapTransform = tester.widget<Transform>(
+      find.byKey(const ValueKey('bee-refresh-retained-gap')),
+    );
+    expect(beeFinder, findsOneWidget);
+    expect(refreshes, 1);
+    expect(gapTransform.transform.getTranslation().y, closeTo(72, 1));
+    expect(loadingTop - restingTop, closeTo(72, 1));
+    final loadingBeeRect = tester.getRect(beeFinder);
+    final loadingGap = loadingContentTop - restingContentTop;
+    expect(
+      loadingBeeRect.center.dy,
+      closeTo(
+        restingContentTop +
+            (loadingGap - loadingBeeRect.height) * 0.75 +
+            loadingBeeRect.height / 2,
+        1,
+      ),
+    );
+
+    refreshCompleter.complete();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 90));
+
+    final closingTop = tester.getTopLeft(listFinder).dy;
+    expect(closingTop, greaterThan(restingTop));
+    expect(closingTop, lessThan(loadingTop));
+
+    await tester.pumpAndSettle();
+    expect(tester.getTopLeft(listFinder).dy, closeTo(restingTop, 1));
+    expect(beeFinder, findsNothing);
+  });
+
+  testWidgets('tracks each stage of an active pull', (tester) async {
+    tester.view.physicalSize = const Size(420, 912);
+    tester.view.devicePixelRatio = 1;
+    addTearDown(tester.view.resetPhysicalSize);
+    addTearDown(tester.view.resetDevicePixelRatio);
+    final hapticCalls = <MethodCall>[];
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(SystemChannels.platform, (call) async {
+          if (call.method == 'HapticFeedback.vibrate') hapticCalls.add(call);
+          return null;
+        });
+    addTearDown(
+      () => TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockMethodCallHandler(SystemChannels.platform, null),
+    );
+
+    const contentKey = ValueKey('pull-content');
+    final refreshCompleter = Completer<void>();
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        child: BeeRefreshIndicator(
+          onRefresh: () => refreshCompleter.future,
+          child: ListView(
+            children: const [SizedBox(key: contentKey, height: 800)],
+          ),
+        ),
+      ),
+    );
+
+    final restingContentTop = tester.getTopLeft(find.byKey(contentKey)).dy;
+    final gesture = await tester.startGesture(
+      tester.getCenter(find.byType(ListView)),
+      pointer: 1,
+    );
+    await gesture.moveBy(const Offset(0, 12));
+    await tester.pump();
+
+    final beeFinder = find.byType(FlappingBee);
+    expect(beeFinder, findsNothing);
+    expect(
+      tester.getTopLeft(find.byKey(contentKey)).dy,
+      greaterThan(restingContentTop),
+    );
+
+    await gesture.moveBy(const Offset(0, 44));
+    await tester.pump();
+
+    final earlyTop = tester.getTopLeft(beeFinder).dy;
+    final partialOpacity = tester.widget<Opacity>(
+      find.byKey(const ValueKey('bee-refresh-opacity')),
+    );
+    expect(partialOpacity.opacity, greaterThan(0));
+    expect(partialOpacity.opacity, lessThan(1));
+    final partialScale = tester
+        .widget<Transform>(find.byKey(const ValueKey('bee-refresh-scale')))
+        .transform
+        .storage[0];
+    expect(partialScale, greaterThan(0.6));
+    expect(partialScale, lessThan(1));
+    expect(tester.widget<FlappingBee>(beeFinder).eyeProgress, isNull);
+    expect(hapticCalls, isEmpty);
+
+    await gesture.moveBy(const Offset(0, 120));
+    await tester.pump();
+
+    final pulledContentTop = tester.getTopLeft(find.byKey(contentKey)).dy;
+    expect(tester.getTopLeft(beeFinder).dy, greaterThan(earlyTop));
+    expect(tester.widget<FlappingBee>(beeFinder).eyeProgress, isNull);
+    expect(find.byKey(const ValueKey('bee-refresh-eyes-emoji')), findsNothing);
+    final pulledBeeRect = tester.getRect(beeFinder);
+    final pulledGap = pulledContentTop - restingContentTop;
+    expect(
+      pulledBeeRect.center.dy,
+      closeTo(
+        restingContentTop +
+            (pulledGap - pulledBeeRect.height) * 0.75 +
+            pulledBeeRect.height / 2,
+        1,
+      ),
+    );
+
+    await gesture.moveBy(const Offset(0, 120));
+    await tester.pump();
+
+    expect(
+      tester
+          .widget<Transform>(find.byKey(const ValueKey('bee-refresh-scale')))
+          .transform
+          .storage[0],
+      closeTo(1, 0.001),
+    );
+    expect(hapticCalls, hasLength(1));
+    expect(hapticCalls.single.arguments, 'HapticFeedbackType.mediumImpact');
+    expect(tester.widget<FlappingBee>(beeFinder).eyeProgress, isNull);
+    expect(find.byKey(const ValueKey('bee-refresh-eyes-emoji')), findsNothing);
+
+    await tester.pump(const Duration(milliseconds: 350));
+    await gesture.moveBy(
+      const Offset(0, 120),
+      timeStamp: const Duration(milliseconds: 350),
+    );
+    await tester.pump();
+
+    final pupilProgress = tester.widget<FlappingBee>(beeFinder).eyeProgress;
+    expect(pupilProgress, greaterThan(0));
+    expect(pupilProgress, lessThan(0.5));
+    expect(find.byKey(const ValueKey('bee-refresh-eyes-emoji')), findsNothing);
+    expect(hapticCalls, hasLength(1));
+
+    await tester.pump(const Duration(milliseconds: 400));
+    await gesture.moveBy(
+      const Offset(0, 240),
+      timeStamp: const Duration(milliseconds: 750),
+    );
+    await tester.pump();
+
+    expect(tester.widget<FlappingBee>(beeFinder).eyeProgress, isNull);
+    expect(
+      find.byKey(const ValueKey('bee-refresh-eyes-emoji')),
+      findsOneWidget,
+    );
+    expect(hapticCalls, hasLength(2));
+    expect(hapticCalls.last.arguments, 'HapticFeedbackType.heavyImpact');
+    expect(
+      tester
+          .widget<Transform>(
+            find.byKey(const ValueKey('bee-refresh-eyes-emoji-offset')),
+          )
+          .transform
+          .storage[12],
+      2,
+    );
+    final initialShake = tester
+        .widget<Transform>(
+          find.byKey(const ValueKey('bee-refresh-eyes-emoji-shake')),
+        )
+        .transform
+        .storage[12];
+    await tester.pump(const Duration(milliseconds: 35));
+    final movedShake = tester
+        .widget<Transform>(
+          find.byKey(const ValueKey('bee-refresh-eyes-emoji-shake')),
+        )
+        .transform
+        .storage[12];
+    expect(movedShake, isNot(closeTo(initialShake, 0.01)));
+    expect(movedShake.abs(), lessThanOrEqualTo(0.75));
+    await tester.pump(const Duration(milliseconds: 105));
+    expect(hapticCalls, hasLength(3));
+    expect(hapticCalls.last.arguments, 'HapticFeedbackType.selectionClick');
+
+    final secondGesture = await tester.startGesture(
+      tester.getCenter(find.byType(ListView)),
+      pointer: 2,
+    );
+    await secondGesture.moveBy(
+      const Offset(0, 40),
+      timeStamp: const Duration(milliseconds: 800),
+    );
+    await gesture.up();
+    await tester.pump();
+    expect(
+      find.byKey(const ValueKey('bee-refresh-eyes-emoji')),
+      findsOneWidget,
+    );
+    expect(hapticCalls, hasLength(3));
+
+    await secondGesture.moveBy(
+      const Offset(0, 80),
+      timeStamp: const Duration(milliseconds: 900),
+    );
+    await tester.pump();
+    expect(
+      find.byKey(const ValueKey('bee-refresh-eyes-emoji')),
+      findsOneWidget,
+    );
+    expect(hapticCalls, hasLength(3));
+
+    await secondGesture.up();
+    await tester.pump();
+    final hapticsAfterRelease = hapticCalls.length;
+    await tester.pump(const Duration(milliseconds: 300));
+
+    expect(tester.widget<FlappingBee>(beeFinder).eyeProgress, isNull);
+    expect(find.byKey(const ValueKey('bee-refresh-eyes-emoji')), findsNothing);
+    expect(hapticCalls, hasLength(hapticsAfterRelease));
+
+    refreshCompleter.complete();
+    await tester.pumpAndSettle();
+  });
+
+  testWidgets('keeps expressive eyes hidden for a quick refresh flick', (
+    tester,
+  ) async {
+    final hapticCalls = <MethodCall>[];
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(SystemChannels.platform, (call) async {
+          if (call.method == 'HapticFeedback.vibrate') hapticCalls.add(call);
+          return null;
+        });
+    addTearDown(
+      () => TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockMethodCallHandler(SystemChannels.platform, null),
+    );
+    final refreshCompleter = Completer<void>();
+    var refreshes = 0;
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        child: BeeRefreshIndicator(
+          onRefresh: () {
+            refreshes++;
+            return refreshCompleter.future;
+          },
+          child: ListView(children: const [SizedBox(height: 800)]),
+        ),
+      ),
+    );
+
+    final gesture = await tester.startGesture(
+      tester.getCenter(find.byType(ListView)),
+    );
+    final beeFinder = find.byType(FlappingBee);
+    for (var step = 0; step < 10; step++) {
+      await gesture.moveBy(
+        const Offset(0, 50),
+        timeStamp: Duration(milliseconds: (step + 1) * 10),
+      );
+      await tester.pump(const Duration(milliseconds: 10));
+      if (beeFinder.evaluate().isNotEmpty) {
+        expect(tester.widget<FlappingBee>(beeFinder).eyeProgress, isNull);
+        expect(
+          find.byKey(const ValueKey('bee-refresh-eyes-emoji')),
+          findsNothing,
+        );
+      }
+    }
+
+    await gesture.up();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 300));
+
+    expect(refreshes, 1);
+    expect(hapticCalls, hasLength(1));
+    expect(hapticCalls.single.arguments, 'HapticFeedbackType.mediumImpact');
+    expect(tester.widget<FlappingBee>(beeFinder).eyeProgress, isNull);
+    expect(find.byKey(const ValueKey('bee-refresh-eyes-emoji')), findsNothing);
+
+    refreshCompleter.complete();
+    await tester.pumpAndSettle();
+  });
+
+  testWidgets('keeps the bee static when motion is disabled', (tester) async {
+    await tester.pumpWidget(
+      MediaQuery(
+        data: const MediaQueryData(disableAnimations: true),
+        child: WidgetHelpers.testable(
+          child: Builder(
+            builder: (context) => MediaQuery(
+              data: MediaQuery.of(context).copyWith(disableAnimations: true),
+              child: BeeRefreshIndicator(
+                onRefresh: () async {},
+                child: ListView(children: const [SizedBox(height: 800)]),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    await tester.timedDrag(
+      find.byType(ListView),
+      const Offset(0, 160),
+      const Duration(milliseconds: 400),
+    );
+    await tester.pump();
+
+    final bee = tester.widget<FlappingBee>(find.byType(FlappingBee));
+    expect(bee.flapAmount, 0);
+  });
+
+  testWidgets('provides elastic always-scrollable physics', (tester) async {
+    late ScrollPhysics physics;
+
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        child: BeeRefreshIndicator(
+          onRefresh: () async {},
+          child: Builder(
+            builder: (context) {
+              physics = ScrollConfiguration.of(
+                context,
+              ).getScrollPhysics(context);
+              return ListView(children: const [SizedBox(height: 20)]);
+            },
+          ),
+        ),
+      ),
+    );
+
+    expect(physics, isA<BouncingScrollPhysics>());
+    expect(physics.parent, isA<AlwaysScrollableScrollPhysics>());
+  });
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 746aab05e6c..78a39628dc9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -28,7 +28,7 @@ importers:
     dependencies:
       '@vitejs/plugin-react':
         specifier: ^6.0.0
-        version: 6.0.3(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))
+        version: 6.0.5(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))
       react:
         specifier: ^19.1.0
         version: 19.2.8
@@ -47,13 +47,13 @@ importers:
         version: 6.9.1
       '@testing-library/react':
         specifier: ^16.3.2
-        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@types/react':
         specifier: ^19.1.8
-        version: 19.2.17
+        version: 19.2.18
       '@types/react-dom':
         specifier: ^19.1.6
-        version: 19.2.3(@types/react@19.2.17)
+        version: 19.2.4(@types/react@19.2.18)
       jsdom:
         specifier: ^27.3.0
         version: 27.4.0(@noble/hashes@2.2.0)
@@ -92,46 +92,46 @@ importers:
         version: 0.10.35
       '@radix-ui/react-alert-dialog':
         specifier: ^1.1.15
-        version: 1.1.23(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.1.23(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-avatar':
         specifier: ^1.1.11
-        version: 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.1.12(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-checkbox':
         specifier: ^1.3.3
-        version: 1.3.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.3.11(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-context-menu':
         specifier: ^2.2.16
-        version: 2.2.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 2.2.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-dialog':
         specifier: ^1.1.15
-        version: 1.1.23(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.1.23(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-dropdown-menu':
         specifier: ^2.1.16
-        version: 2.1.24(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 2.1.24(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-focus-scope':
         specifier: ^1.1.8
-        version: 1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.1.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-popover':
         specifier: ^1.1.15
-        version: 1.1.23(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.1.23(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-separator':
         specifier: ^1.1.8
-        version: 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.1.15(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-slot':
         specifier: ^1.2.4
-        version: 1.3.3(@types/react@19.2.17)(react@19.2.8)
+        version: 1.3.3(@types/react@19.2.18)(react@19.2.8)
       '@radix-ui/react-switch':
         specifier: ^1.2.6
-        version: 1.2.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.2.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-tabs':
         specifier: ^1.1.13
-        version: 1.1.21(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.1.21(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-toggle':
         specifier: ^1.1.10
-        version: 1.1.18(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.1.18(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@radix-ui/react-tooltip':
         specifier: ^1.2.8
-        version: 1.2.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.2.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@tanstack/react-query':
         specifier: ^5.90.21
         version: 5.100.14(react@19.2.8)
@@ -140,7 +140,7 @@ importers:
         version: 1.170.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@tanstack/react-virtual':
         specifier: ^3.14.2
-        version: 3.14.8(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        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
@@ -170,7 +170,7 @@ importers:
         version: 3.22.5
       '@tiptap/react':
         specifier: ^3.22.3
-        version: 3.22.5(@floating-ui/dom@1.8.0)(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 3.22.5(@floating-ui/dom@1.8.0)(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@tiptap/starter-kit':
         specifier: ^3.22.3
         version: 3.22.5
@@ -212,7 +212,7 @@ importers:
         version: 19.2.8(react@19.2.8)
       react-markdown:
         specifier: ^10.1.0
-        version: 10.1.0(@types/react@19.2.17)(react@19.2.8)
+        version: 10.1.0(@types/react@19.2.18)(react@19.2.8)
       remark-breaks:
         specifier: ^4.0.0
         version: 4.0.0
@@ -260,20 +260,20 @@ importers:
         specifier: ^1.161.7
         version: 1.162.0
       '@tauri-apps/cli':
-        specifier: ~2.11
-        version: 2.11.2
+        specifier: ~2.11.4
+        version: 2.11.4
       '@testing-library/react':
         specifier: ^16.3.2
-        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@types/react':
         specifier: ^19.1.8
-        version: 19.2.17
+        version: 19.2.18
       '@types/react-dom':
         specifier: ^19.1.6
-        version: 19.2.3(@types/react@19.2.17)
+        version: 19.2.4(@types/react@19.2.18)
       '@vitejs/plugin-react':
         specifier: ^6.0.0
-        version: 6.0.3(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))
+        version: 6.0.5(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))
       jsdom:
         specifier: ^27.4.0
         version: 27.4.0(@noble/hashes@2.2.0)
@@ -282,7 +282,7 @@ importers:
         version: 2.23.12(typescript@6.0.3)
       postcss:
         specifier: ^8.5.8
-        version: 8.5.19
+        version: 8.5.26
       tailwindcss:
         specifier: ^4.3.0
         version: 4.3.0
@@ -303,13 +303,13 @@ importers:
         version: 5.2.8
       '@isomorphic-git/lightning-fs':
         specifier: ^4.6.2
-        version: 4.6.2
+        version: 4.6.3
       '@radix-ui/react-slot':
         specifier: ^1.2.4
-        version: 1.3.3(@types/react@19.2.17)(react@19.2.8)
+        version: 1.3.3(@types/react@19.2.18)(react@19.2.8)
       '@radix-ui/react-tooltip':
         specifier: ^1.2.8
-        version: 1.2.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+        version: 1.2.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@tailwindcss/typography':
         specifier: ^0.5.19
         version: 0.5.20(tailwindcss@4.3.0)
@@ -330,7 +330,7 @@ importers:
         version: 2.1.1
       isomorphic-git:
         specifier: ^1.38.3
-        version: 1.38.7(patch_hash=e9b414a60d4cf1d8aa18f7a779483984e821989967c235662566e94ef0238d3f)
+        version: 1.38.10(patch_hash=e9b414a60d4cf1d8aa18f7a779483984e821989967c235662566e94ef0238d3f)
       lucide-react:
         specifier: ^1.0.0
         version: 1.16.0(react@19.2.8)
@@ -345,7 +345,7 @@ importers:
         version: 19.2.8(react@19.2.8)
       react-markdown:
         specifier: ^10.1.0
-        version: 10.1.0(@types/react@19.2.17)(react@19.2.8)
+        version: 10.1.0(@types/react@19.2.18)(react@19.2.8)
       remark-gfm:
         specifier: ^4.0.1
         version: 4.0.1
@@ -370,16 +370,16 @@ importers:
         version: 1.162.0
       '@types/react':
         specifier: ^19.1.8
-        version: 19.2.17
+        version: 19.2.18
       '@types/react-dom':
         specifier: ^19.1.6
-        version: 19.2.3(@types/react@19.2.17)
+        version: 19.2.4(@types/react@19.2.18)
       '@vitejs/plugin-react':
         specifier: ^6.0.0
-        version: 6.0.3(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))
+        version: 6.0.5(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))
       postcss:
         specifier: ^8.5.8
-        version: 8.5.19
+        version: 8.5.26
       tailwindcss:
         specifier: ^4.3.0
         version: 4.3.0
@@ -675,8 +675,8 @@ packages:
   '@isomorphic-git/idb-keyval@3.3.2':
     resolution: {integrity: sha512-r8/AdpiS0/WJCNR/t/gsgL+M8NMVj/ek7s60uz3LmpCaTF2mEVlZJlB01ZzalgYzRLXwSPC92o+pdzjM7PN/pA==}
 
-  '@isomorphic-git/lightning-fs@4.6.2':
-    resolution: {integrity: sha512-RS/oa1UBnoUFe56bsjOEgoUUReYKQzYUlQnbERRRNv9s9KmjyWuuylPV+YgsWirR2oONKaipWYMebVQ8SAe55Q==}
+  '@isomorphic-git/lightning-fs@4.6.3':
+    resolution: {integrity: sha512-uIXSSqutetjk+qHlswb5aKTzw7zOJ851R6r53szkkprtZ8Wp4A8gPNf7meeKS7uLDJaFvKhFTY7KISh3ULRojg==}
     hasBin: true
 
   '@jridgewell/gen-mapping@0.3.13':
@@ -1720,8 +1720,8 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  '@tanstack/react-virtual@3.14.8':
-    resolution: {integrity: sha512-O39GJQpAYEJcIu3uN1//YtmhjSEOyw75vg9CKCatBDPiD5hKtZQoJHfferyrB/LdOD3UWaoMLWtdEjarwIwdDw==}
+  '@tanstack/react-virtual@3.14.9':
+    resolution: {integrity: sha512-qZyr0FZDP8rDC4WBhsryIZmAd9bveJvFGUJJtskWaew6/0dTRS6wZxnR6VQ5bY2KwL3LjerrHqQLk3a0GKcPXQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -1762,8 +1762,8 @@ packages:
   '@tanstack/store@0.9.3':
     resolution: {integrity: sha512-8reSzl/qGWGGVKhBoxXPMWzATSbZLZFWhwBAFO9NAyp0TxzfBP0mIrGb8CP8KrQTmvzXlR/vFPPUrHTLBGyFyw==}
 
-  '@tanstack/virtual-core@3.17.6':
-    resolution: {integrity: sha512-h0/Ebo18CkOrChlQIhNtQkM5ySUnh/GumQ/D1st3hG2HWUPEF+ILUc2k29UtivCi/9G7w7G3/f7Xyd5cCFbKBw==}
+  '@tanstack/virtual-core@3.17.7':
+    resolution: {integrity: sha512-bp+v10y65sp2H7WpWfIMyxTNfl8ZVfxFTLRjPIFRryi6FV/J33z4IS53WO4pTk36KlvJ4iLiQz+oaydDC1xbcA==}
 
   '@tanstack/virtual-file-routes@1.162.0':
     resolution: {integrity: sha512-uhOeFyxLcU41HzvrxsGpiWdcMbScY1EDgbZ5K7DVRMYInbLYWAC0EA/kx9wXAoSM8q82bUG2hRl8+EAjE6XAbA==}
@@ -1772,79 +1772,79 @@ packages:
   '@tauri-apps/api@2.11.0':
     resolution: {integrity: sha512-7CinYODhky9lmO23xHnUFv0Xt43fbtWMyxZcLcRBlFkcgXKuEirBvHpmtJ89YMhyeGcq20Wuc47Fa4XjyniywA==}
 
-  '@tauri-apps/cli-darwin-arm64@2.11.2':
-    resolution: {integrity: sha512-+4UZzLt+eOAEQCwgd+TqKgyUJMrvx+BgdXLLaqJYmPqzP+nE6YZr/hY6CWLYGQb8jFn99jEkmC6uA3tNvamA1w==}
+  '@tauri-apps/cli-darwin-arm64@2.11.4':
+    resolution: {integrity: sha512-1ryOF3ZhpZ/nemHV5zVwBQBz9jDGKmKPvWPADOhc83ig0P4bMc2iER4NbC6r9sjeIZ6RVQ4g3RZIYvezhcl4TQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tauri-apps/cli-darwin-x64@2.11.2':
-    resolution: {integrity: sha512-VjYYtZUPqDMLutSfJEyxFE3Bz+DPi7c8wC3imckgvciLDZLq4qwKJxBicg0BXGhXjJsl8vKWgWRFNMPELQ+Xyg==}
+  '@tauri-apps/cli-darwin-x64@2.11.4':
+    resolution: {integrity: sha512-uFsGQAAfuyz1k/yGLmkWfkBlgKAqZfxqlHmLWx81QU27RJWfmbNHCIq8T8w1e+VClleIuZUjpHWfoE4E3DLo3A==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@2.11.2':
-    resolution: {integrity: sha512-yMemD6f4i95AQriS8EazyOFzbE34yjnP16i3IOzpHGQvBoy2DjypFMFBq0NtPuITURv/cOGguRtHR5d79/9CSA==}
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.11.4':
+    resolution: {integrity: sha512-IaHZn5CdBL21oUmjiVOS1ctw6Ip1O0pjp70FwOWmYz1myWe0SY96ZIj2FYf7pT0m8bI2h/hrs5ZbEXXh44/MkQ==}
     engines: {node: '>= 10'}
     cpu: [arm]
     os: [linux]
 
-  '@tauri-apps/cli-linux-arm64-gnu@2.11.2':
-    resolution: {integrity: sha512-cgI91D2wL8GSgoWwZXDqt+DwnuZCP2/bz03QAE4TrhgAKIsrB4hX26W/H1EONPUUNkqrsgeCD0wU6pcNjV/5kw==}
+  '@tauri-apps/cli-linux-arm64-gnu@2.11.4':
+    resolution: {integrity: sha512-N41/ukTRVe6XSuUTESuFdGeOW2i7k62tK+6gHK5Kd5/q5RPvvi19GaWAVPPb9u95HSGmTChSolBfzynUsssFaA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-arm64-musl@2.11.2':
-    resolution: {integrity: sha512-X1rm0BERqAAggtYTESSgXrS3sz4Sb/OiPiz54UqISlXW+GkR3vNIGnsy/lejNmoXGVqri3Q53BCfQiclOIyRPw==}
+  '@tauri-apps/cli-linux-arm64-musl@2.11.4':
+    resolution: {integrity: sha512-v277UnT/fB64xAfSroL5N3Km3tLmvATWqJJw/wRI+g6o+HkeD0slyE7gOhNs1MbjE41R7bQOTxMVoL3aomUJmw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@tauri-apps/cli-linux-riscv64-gnu@2.11.2':
-    resolution: {integrity: sha512-usbMLJbT3KtkOrBMDVeGYNM35aTHXx38SJSzTMSqqjeUIOQ+iVPjb2yAGNAE+KqmBbAx4FOFIyMeKXx2M/JKGQ==}
+  '@tauri-apps/cli-linux-riscv64-gnu@2.11.4':
+    resolution: {integrity: sha512-qqgNkQ2u1yZHxjhxsZaxUtRDW8dIqIYm33rx/mzwQv0SfY9x1B+iraj8vWeFiXjjSVVhEMepXSOts1TqPzvXNQ==}
     engines: {node: '>= 10'}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-x64-gnu@2.11.2':
-    resolution: {integrity: sha512-Ru4gwJKPG0ctVGchRGpRup4Y4lW2SSfFnrbQcyHhCliKy4g8Qz97TrUgCur4CbWyAgKxvGh3SjrkA0LDYzDGiw==}
+  '@tauri-apps/cli-linux-x64-gnu@2.11.4':
+    resolution: {integrity: sha512-2VRNWl84FOH0m2giiDkO2h0QXlcMJeX+zJDpI5kDIQAx6s+geF3v48F4DXfJez4GS/FdoDGnPnw1C2iYGbQ7bQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@tauri-apps/cli-linux-x64-musl@2.11.2':
-    resolution: {integrity: sha512-eUm7T6clN1MMmNSRQ9gaWsQdyehQx2Gmn5hht/QUlqZQI/qcP2OJK5dnaxqwFzCr2HdsEo9ydxaqcS1oJzMvUw==}
+  '@tauri-apps/cli-linux-x64-musl@2.11.4':
+    resolution: {integrity: sha512-o9GyhYor/nc7xarmwDE3ka2szuW3uuZzXjHWh64Q8YX5AtSgxdQkFWzrY4O8KiGtVNvFBI14H3Q49Qj5TOIP/A==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@tauri-apps/cli-win32-arm64-msvc@2.11.2':
-    resolution: {integrity: sha512-HeeZW80jU+gVTOEX4X/hC6NVSAdDVXajwP5fxIZ/3z9WvUC7qrudX2GMTilYq6Dg0e0sk0XgsAJD1hZ5wPBXUA==}
+  '@tauri-apps/cli-win32-arm64-msvc@2.11.4':
+    resolution: {integrity: sha512-ld5Ehb598m0VkYyylRPNeCFsBe/km0jxis6KgMpl3IGY6I/i1RwQXO05I1AsXUXO2WC6AvB/Lw4qTf/asiuEiQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@tauri-apps/cli-win32-ia32-msvc@2.11.2':
-    resolution: {integrity: sha512-YhjQNZcXfbkCLyazSv1nPnJ9iRFE1wm6kc51FDbU10/Dk09io+6PAGMLjkxnX2GdM0qMnDmTjstY8mTDVvtKeA==}
+  '@tauri-apps/cli-win32-ia32-msvc@2.11.4':
+    resolution: {integrity: sha512-12Hxi0XX/H5VFxO/bGgHkFWhml9VMgEOu9CidjeCeTNQ1l6fpUlbiGgSP7CLI3PFtW9/FfbeHieZ+kyWK5H7CA==}
     engines: {node: '>= 10'}
     cpu: [ia32]
     os: [win32]
 
-  '@tauri-apps/cli-win32-x64-msvc@2.11.2':
-    resolution: {integrity: sha512-d2JchlFIpZevZVReyqhQOekJmb1UH3rhZ5VX6sH3ty9ETE0TKQavpihvoScUXfKKpW6HZC0MrFGRU0ZtD+w3gA==}
+  '@tauri-apps/cli-win32-x64-msvc@2.11.4':
+    resolution: {integrity: sha512-+vDiqBIU5dMISg/wNvX3sF+ZHfgJGJ5T0AcO+EHNXV9GGAG+P5fzodlDXD3QdKCRgZxMoCm5PPvj3BqLNjBthw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
 
-  '@tauri-apps/cli@2.11.2':
-    resolution: {integrity: sha512-bk3HemqvGRoy+5D/dVMUQHKMYLglD0jVnMm/0iGMH6ufZ+p8r14m6BpIixwij3PBvZdvORUp1YifTD8QxVZ1Nw==}
+  '@tauri-apps/cli@2.11.4':
+    resolution: {integrity: sha512-R8xGtMpwyetawSqm9kYOuMmEqkhUbvcUy8n0aNXIxollKBLESUu5f4Fx+64hgASYm1H+jSWq6jCW6zqTnH6hqQ==}
     engines: {node: '>= 10'}
     hasBin: true
 
@@ -2088,13 +2088,13 @@ packages:
   '@types/node@25.6.0':
     resolution: {integrity: sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==}
 
-  '@types/react-dom@19.2.3':
-    resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
+  '@types/react-dom@19.2.4':
+    resolution: {integrity: sha512-Bsc+QHgp+P/F02XDzNCY9jnZNCUuLki36KT7VKrTXXLdHf+vHMNZnW1rVu5DNW/rCK+fya3DATySbLM4yhtKUw==}
     peerDependencies:
       '@types/react': ^19.2.0
 
-  '@types/react@19.2.17':
-    resolution: {integrity: sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==}
+  '@types/react@19.2.18':
+    resolution: {integrity: sha512-AnzbBERsrLKtk2XSfTbYRLjQPdy116Sty4q+T+Bp3IC4l6jNBvreVPAHmpq9qhXQM7CXZPjLVmGMw9sy+hxQ3w==}
 
   '@types/unist@2.0.11':
     resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
@@ -2109,8 +2109,8 @@ packages:
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
     deprecated: Potential CWE-502 - Update to 1.3.1 or higher
 
-  '@vitejs/plugin-react@6.0.3':
-    resolution: {integrity: sha512-vmFvco5/QuC2f9Oj+wTk0+9XeDFkHxSamwZKYc7MxYwKICfvUvlMhqKI0VuICPltGqh1neqBKDvO4kes1ya8vg==}
+  '@vitejs/plugin-react@6.0.5':
+    resolution: {integrity: sha512-BOVzne/NL162sMdResB25mUv+vWMF5NoAjNf09TeGlE7ZpszZWSD3winycicLJw72yeVsoCn/2kOhEuCvEShMA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     peerDependencies:
       '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0
@@ -2650,8 +2650,8 @@ packages:
     resolution: {integrity: sha512-yNeeynhhtIVRBk12tBV4eHNxwB42HzR4Q3Ea7vCOiJhImGaAIdIMrbJtacQlBizGLjUPw+akkFI5Dn9T70XoVQ==}
     engines: {node: '>=18'}
 
-  isomorphic-git@1.38.7:
-    resolution: {integrity: sha512-2J2rCV7gTgcpscEDT7PjU5shbsKKI10E4RqBlPDI3LmMXDjSKsN2w1jTIKiay14v87sPDfXjJkgp/Rrxc0zlSg==}
+  isomorphic-git@1.38.10:
+    resolution: {integrity: sha512-nJSSq7ypu97vM33rSdxXyPzSWksCberjKspzXhFEcBHdVyxdNkWByAzJ/AURV1jIlfv8pLq37lGdIEt7ORj17Q==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -3002,6 +3002,11 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  nanoid@3.3.17:
+    resolution: {integrity: sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
   node-releases@2.0.46:
     resolution: {integrity: sha512-GYVXHE2KnrzAfsAjl4uP++evGFCrAU1jta4ubEjIG7YWt/64Gqv66a30yKwWczVjA6j3bM4nBwH7Pk1JmDHaxQ==}
     engines: {node: '>=18'}
@@ -3102,6 +3107,10 @@ packages:
     resolution: {integrity: sha512-Mz8SaolMd8nB+G13WkORcxQKHZ/NE4xXevtkJHVuG+guo9/wYKlIMTKAqGdEmYOXR2ijPjTYNHssizdaVSUNdQ==}
     engines: {node: ^10 || ^12 || >=14}
 
+  postcss@8.5.26:
+    resolution: {integrity: sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==}
+    engines: {node: ^10 || ^12 || >=14}
+
   prettier@3.8.3:
     resolution: {integrity: sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==}
     engines: {node: '>=14'}
@@ -4004,7 +4013,7 @@ snapshots:
 
   '@isomorphic-git/idb-keyval@3.3.2': {}
 
-  '@isomorphic-git/lightning-fs@4.6.2':
+  '@isomorphic-git/lightning-fs@4.6.3':
     dependencies:
       '@isomorphic-git/idb-keyval': 3.3.2
       isomorphic-textencoder: 1.0.1
@@ -4059,677 +4068,677 @@ snapshots:
 
   '@radix-ui/primitive@1.1.7': {}
 
-  '@radix-ui/react-alert-dialog@1.1.23(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-alert-dialog@1.1.23(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-dialog': 1.1.23(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-dialog': 1.1.23(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-arrow@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-arrow@1.1.15(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-avatar@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-avatar@1.1.12(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-context': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.5(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.5(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-checkbox@1.3.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-checkbox@1.3.11(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-size': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-size': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-collection@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-collection@1.1.15(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-compose-refs@1.1.3(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-compose-refs@1.1.3(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-compose-refs@1.1.5(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-compose-refs@1.1.5(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-context-menu@2.2.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-context-menu@2.2.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-context@1.1.2(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-context@1.1.2(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-context@1.1.4(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-context@1.1.4(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-context@1.2.2(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-context@1.2.2(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-dialog@1.1.23(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-dialog@1.1.23(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-dismissable-layer': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-focus-guards': 1.1.6(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-focus-scope': 1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-id': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-portal': 1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.19(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-focus-guards': 1.1.6(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-focus-scope': 1.1.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.17(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       aria-hidden: 1.2.6
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.8)
+      react-remove-scroll: 2.7.2(@types/react@19.2.18)(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-direction@1.1.1(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-direction@1.1.1(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-direction@1.1.4(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-direction@1.1.4(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-dismissable-layer@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-dismissable-layer@1.1.19(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-effect-event': 0.0.5(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-effect-event': 0.0.5(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-dropdown-menu@2.1.24(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-dropdown-menu@2.1.24(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-id': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-menu': 2.1.24(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-menu': 2.1.24(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-focus-guards@1.1.6(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-focus-guards@1.1.6(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-focus-scope@1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-focus-scope@1.1.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-id@1.1.1(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-id@1.1.1(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-id@1.1.4(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-id@1.1.4(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-menu@2.1.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-dismissable-layer': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.19(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.18)(react@19.2.8)
       aria-hidden: 1.2.6
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.8)
+      react-remove-scroll: 2.7.2(@types/react@19.2.18)(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-menu@2.1.24(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-menu@2.1.24(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-collection': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-direction': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-dismissable-layer': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-focus-guards': 1.1.6(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-focus-scope': 1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-id': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-popper': 1.3.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-portal': 1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-roving-focus': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-collection': 1.1.15(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.19(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-focus-guards': 1.1.6(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-focus-scope': 1.1.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-popper': 1.3.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.17(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.19(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       aria-hidden: 1.2.6
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.8)
+      react-remove-scroll: 2.7.2(@types/react@19.2.18)(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-popover@1.1.23(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-popover@1.1.23(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-dismissable-layer': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-focus-guards': 1.1.6(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-focus-scope': 1.1.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-id': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-popper': 1.3.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-portal': 1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.19(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-focus-guards': 1.1.6(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-focus-scope': 1.1.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-popper': 1.3.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.17(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.18)(react@19.2.8)
       aria-hidden: 1.2.6
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.8)
+      react-remove-scroll: 2.7.2(@types/react@19.2.18)(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-popper@1.2.8(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-popper@1.2.8(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@floating-ui/react-dom': 2.1.9(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.18)(react@19.2.8)
       '@radix-ui/rect': 1.1.1
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-popper@1.3.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-popper@1.3.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@floating-ui/react-dom': 2.1.9(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-arrow': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-rect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-size': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-arrow': 1.1.15(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-rect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-size': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       '@radix-ui/rect': 1.1.3
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-portal@1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-portal@1.1.17(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-presence@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-presence@1.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-presence@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-presence@1.1.5(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-primitive@2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-primitive@2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-primitive@2.1.5(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-primitive@2.1.5(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.5(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-slot': 1.2.5(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-roving-focus@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-roving-focus@1.1.19(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-collection': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-direction': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-id': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-callback-ref': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-is-hydrated': 0.1.3(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-collection': 1.1.15(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-callback-ref': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-is-hydrated': 0.1.3(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-separator@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-separator@1.1.15(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-slot@1.2.3(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-slot@1.2.3(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-slot@1.2.5(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-slot@1.2.5(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-slot@1.3.3(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-slot@1.3.3(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-switch@1.2.6(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-switch@1.2.6(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-tabs@1.1.21(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-tabs@1.1.21(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-direction': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-id': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-roving-focus': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-direction': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-id': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-roving-focus': 1.1.19(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-toggle@1.1.18(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-toggle@1.1.18(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-tooltip@1.2.16(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-tooltip@1.2.16(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-context': 1.2.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-dismissable-layer': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-id': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-popper': 1.3.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-portal': 1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
-      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-visually-hidden': 1.2.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-context': 1.2.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-dismissable-layer': 1.1.19(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-id': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-popper': 1.3.7(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-portal': 1.1.17(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-presence': 1.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-controllable-state': 1.2.6(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-visually-hidden': 1.2.11(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
-  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-callback-ref@1.1.2(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-callback-ref@1.1.2(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-callback-ref@1.1.4(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-callback-ref@1.1.4(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-controllable-state@1.2.6(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-controllable-state@1.2.6(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       '@radix-ui/primitive': 1.1.7
-      '@radix-ui/react-use-effect-event': 0.0.5(@types/react@19.2.17)(react@19.2.8)
-      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-effect-event': 0.0.5(@types/react@19.2.18)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-effect-event@0.0.5(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-effect-event@0.0.5(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-is-hydrated@0.1.1(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-is-hydrated@0.1.1(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-is-hydrated@0.1.3(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-is-hydrated@0.1.3(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-layout-effect@1.1.2(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-layout-effect@1.1.2(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-layout-effect@1.1.4(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-layout-effect@1.1.4(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       '@radix-ui/rect': 1.1.1
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-rect@1.1.4(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-rect@1.1.4(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
       '@radix-ui/rect': 1.1.3
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-size@1.1.1(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-size@1.1.1(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-use-size@1.1.4(@types/react@19.2.17)(react@19.2.8)':
+  '@radix-ui/react-use-size@1.1.4(@types/react@19.2.18)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.18)(react@19.2.8)
       react: 19.2.8
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@radix-ui/react-visually-hidden@1.2.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@radix-ui/react-visually-hidden@1.2.11(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@radix-ui/react-primitive': 2.1.10(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
   '@radix-ui/rect@1.1.1': {}
 
@@ -4907,7 +4916,7 @@ snapshots:
       '@alloc/quick-lru': 5.2.0
       '@tailwindcss/node': 4.3.0
       '@tailwindcss/oxide': 4.3.0
-      postcss: 8.5.19
+      postcss: 8.5.26
       tailwindcss: 4.3.0
 
   '@tailwindcss/typography@0.5.20(tailwindcss@4.3.0)':
@@ -4940,9 +4949,9 @@ snapshots:
       react-dom: 19.2.8(react@19.2.8)
       use-sync-external-store: 1.6.0(react@19.2.8)
 
-  '@tanstack/react-virtual@3.14.8(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@tanstack/react-virtual@3.14.9(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@tanstack/virtual-core': 3.17.6
+      '@tanstack/virtual-core': 3.17.7
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
 
@@ -5003,58 +5012,58 @@ snapshots:
 
   '@tanstack/store@0.9.3': {}
 
-  '@tanstack/virtual-core@3.17.6': {}
+  '@tanstack/virtual-core@3.17.7': {}
 
   '@tanstack/virtual-file-routes@1.162.0': {}
 
   '@tauri-apps/api@2.11.0': {}
 
-  '@tauri-apps/cli-darwin-arm64@2.11.2':
+  '@tauri-apps/cli-darwin-arm64@2.11.4':
     optional: true
 
-  '@tauri-apps/cli-darwin-x64@2.11.2':
+  '@tauri-apps/cli-darwin-x64@2.11.4':
     optional: true
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@2.11.2':
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.11.4':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-gnu@2.11.2':
+  '@tauri-apps/cli-linux-arm64-gnu@2.11.4':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-musl@2.11.2':
+  '@tauri-apps/cli-linux-arm64-musl@2.11.4':
     optional: true
 
-  '@tauri-apps/cli-linux-riscv64-gnu@2.11.2':
+  '@tauri-apps/cli-linux-riscv64-gnu@2.11.4':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-gnu@2.11.2':
+  '@tauri-apps/cli-linux-x64-gnu@2.11.4':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-musl@2.11.2':
+  '@tauri-apps/cli-linux-x64-musl@2.11.4':
     optional: true
 
-  '@tauri-apps/cli-win32-arm64-msvc@2.11.2':
+  '@tauri-apps/cli-win32-arm64-msvc@2.11.4':
     optional: true
 
-  '@tauri-apps/cli-win32-ia32-msvc@2.11.2':
+  '@tauri-apps/cli-win32-ia32-msvc@2.11.4':
     optional: true
 
-  '@tauri-apps/cli-win32-x64-msvc@2.11.2':
+  '@tauri-apps/cli-win32-x64-msvc@2.11.4':
     optional: true
 
-  '@tauri-apps/cli@2.11.2':
+  '@tauri-apps/cli@2.11.4':
     optionalDependencies:
-      '@tauri-apps/cli-darwin-arm64': 2.11.2
-      '@tauri-apps/cli-darwin-x64': 2.11.2
-      '@tauri-apps/cli-linux-arm-gnueabihf': 2.11.2
-      '@tauri-apps/cli-linux-arm64-gnu': 2.11.2
-      '@tauri-apps/cli-linux-arm64-musl': 2.11.2
-      '@tauri-apps/cli-linux-riscv64-gnu': 2.11.2
-      '@tauri-apps/cli-linux-x64-gnu': 2.11.2
-      '@tauri-apps/cli-linux-x64-musl': 2.11.2
-      '@tauri-apps/cli-win32-arm64-msvc': 2.11.2
-      '@tauri-apps/cli-win32-ia32-msvc': 2.11.2
-      '@tauri-apps/cli-win32-x64-msvc': 2.11.2
+      '@tauri-apps/cli-darwin-arm64': 2.11.4
+      '@tauri-apps/cli-darwin-x64': 2.11.4
+      '@tauri-apps/cli-linux-arm-gnueabihf': 2.11.4
+      '@tauri-apps/cli-linux-arm64-gnu': 2.11.4
+      '@tauri-apps/cli-linux-arm64-musl': 2.11.4
+      '@tauri-apps/cli-linux-riscv64-gnu': 2.11.4
+      '@tauri-apps/cli-linux-x64-gnu': 2.11.4
+      '@tauri-apps/cli-linux-x64-musl': 2.11.4
+      '@tauri-apps/cli-win32-arm64-msvc': 2.11.4
+      '@tauri-apps/cli-win32-ia32-msvc': 2.11.4
+      '@tauri-apps/cli-win32-x64-msvc': 2.11.4
 
   '@tauri-apps/plugin-notification@2.3.3':
     dependencies:
@@ -5092,15 +5101,15 @@ snapshots:
       picocolors: 1.1.1
       redent: 3.0.0
 
-  '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@babel/runtime': 7.29.7
       '@testing-library/dom': 10.4.1
       react: 19.2.8
       react-dom: 19.2.8(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
 
   '@tiptap/core@3.22.5(@tiptap/pm@3.22.5)':
     dependencies:
@@ -5233,12 +5242,12 @@ snapshots:
       prosemirror-transform: 1.12.0
       prosemirror-view: 1.41.8
 
-  '@tiptap/react@3.22.5(@floating-ui/dom@1.8.0)(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
+  '@tiptap/react@3.22.5(@floating-ui/dom@1.8.0)(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@tiptap/core': 3.22.5(@tiptap/pm@3.22.5)
       '@tiptap/pm': 3.22.5
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
+      '@types/react': 19.2.18
+      '@types/react-dom': 19.2.4(@types/react@19.2.18)
       '@types/use-sync-external-store': 0.0.6
       fast-equals: 5.4.0
       react: 19.2.8
@@ -5333,11 +5342,11 @@ snapshots:
     dependencies:
       undici-types: 7.19.2
 
-  '@types/react-dom@19.2.3(@types/react@19.2.17)':
+  '@types/react-dom@19.2.4(@types/react@19.2.18)':
     dependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  '@types/react@19.2.17':
+  '@types/react@19.2.18':
     dependencies:
       csstype: 3.2.3
 
@@ -5349,7 +5358,7 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vitejs/plugin-react@6.0.3(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))':
+  '@vitejs/plugin-react@6.0.5(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))':
     dependencies:
       '@rolldown/pluginutils': 1.0.1
       vite: 8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0)
@@ -5843,7 +5852,7 @@ snapshots:
 
   isbot@5.1.40: {}
 
-  isomorphic-git@1.38.7(patch_hash=e9b414a60d4cf1d8aa18f7a779483984e821989967c235662566e94ef0238d3f):
+  isomorphic-git@1.38.10(patch_hash=e9b414a60d4cf1d8aa18f7a779483984e821989967c235662566e94ef0238d3f):
     dependencies:
       async-lock: 1.4.1
       clean-git-ref: 2.0.1
@@ -6384,6 +6393,8 @@ snapshots:
 
   nanoid@3.3.16: {}
 
+  nanoid@3.3.17: {}
+
   node-releases@2.0.46: {}
 
   nostr-tools@2.23.12(typescript@6.0.3):
@@ -6477,6 +6488,12 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
+  postcss@8.5.26:
+    dependencies:
+      nanoid: 3.3.17
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
   prettier@3.8.3: {}
 
   pretty-format@27.5.1:
@@ -6595,11 +6612,11 @@ snapshots:
 
   react-is@17.0.2: {}
 
-  react-markdown@10.1.0(@types/react@19.2.17)(react@19.2.8):
+  react-markdown@10.1.0(@types/react@19.2.18)(react@19.2.8):
     dependencies:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
       devlop: 1.1.0
       hast-util-to-jsx-runtime: 2.3.6
       html-url-attributes: 3.0.1
@@ -6613,32 +6630,32 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  react-remove-scroll-bar@2.3.8(@types/react@19.2.17)(react@19.2.8):
+  react-remove-scroll-bar@2.3.8(@types/react@19.2.18)(react@19.2.8):
     dependencies:
       react: 19.2.8
-      react-style-singleton: 2.2.3(@types/react@19.2.17)(react@19.2.8)
+      react-style-singleton: 2.2.3(@types/react@19.2.18)(react@19.2.8)
       tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  react-remove-scroll@2.7.2(@types/react@19.2.17)(react@19.2.8):
+  react-remove-scroll@2.7.2(@types/react@19.2.18)(react@19.2.8):
     dependencies:
       react: 19.2.8
-      react-remove-scroll-bar: 2.3.8(@types/react@19.2.17)(react@19.2.8)
-      react-style-singleton: 2.2.3(@types/react@19.2.17)(react@19.2.8)
+      react-remove-scroll-bar: 2.3.8(@types/react@19.2.18)(react@19.2.8)
+      react-style-singleton: 2.2.3(@types/react@19.2.18)(react@19.2.8)
       tslib: 2.8.1
-      use-callback-ref: 1.3.3(@types/react@19.2.17)(react@19.2.8)
-      use-sidecar: 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      use-callback-ref: 1.3.3(@types/react@19.2.18)(react@19.2.8)
+      use-sidecar: 1.1.3(@types/react@19.2.18)(react@19.2.8)
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  react-style-singleton@2.2.3(@types/react@19.2.17)(react@19.2.8):
+  react-style-singleton@2.2.3(@types/react@19.2.18)(react@19.2.8):
     dependencies:
       get-nonce: 1.0.1
       react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
   react@19.2.8: {}
 
@@ -6957,20 +6974,20 @@ snapshots:
     dependencies:
       pako: 1.0.11
 
-  use-callback-ref@1.3.3(@types/react@19.2.17)(react@19.2.8):
+  use-callback-ref@1.3.3(@types/react@19.2.18)(react@19.2.8):
     dependencies:
       react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
-  use-sidecar@1.1.3(@types/react@19.2.17)(react@19.2.8):
+  use-sidecar@1.1.3(@types/react@19.2.18)(react@19.2.8):
     dependencies:
       detect-node-es: 1.1.0
       react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 19.2.17
+      '@types/react': 19.2.18
 
   use-sync-external-store@1.6.0(react@19.2.8):
     dependencies: