diff --git a/.env.example b/.env.example
index db5a7ea25c..3dc54856e7 100644
--- a/.env.example
+++ b/.env.example
@@ -34,6 +34,10 @@ REDIS_URL=redis://localhost:6379
 # Max connections in the relay's shared Redis pool (default 16).
 # BUZZ_REDIS_POOL_SIZE=16
 
+# Max connections in each of the relay's Postgres pools — writer and, when
+# READ_DATABASE_URL is set, reader (default 50).
+# BUZZ_DB_POOL_SIZE=50
+
 # -----------------------------------------------------------------------------
 # Typesense (search)
 # -----------------------------------------------------------------------------
@@ -105,7 +109,10 @@ RELAY_URL=ws://localhost:3000
 # -----------------------------------------------------------------------------
 # Logging / Tracing
 # -----------------------------------------------------------------------------
-RUST_LOG=buzz_relay=debug,buzz_db=debug,buzz_auth=debug,buzz_pubsub=debug,tower_http=debug
+RUST_LOG=buzz_relay=debug,buzz_datastore=info,buzz_db=debug,buzz_auth=debug,buzz_pubsub=debug,tower_http=debug
+# Optional OpenTelemetry-only target filter. This is deliberately independent
+# from RUST_LOG so log verbosity changes cannot break trace parentage.
+# BUZZ_OTEL_FILTER=buzz_relay=info,buzz_datastore=info
 
 # OTLP tracing endpoint (optional — leave unset to disable)
 # OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..f36b1615d0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+# Git for Windows defaults to core.autocrlf=true, so without this every text
+# file lands in the working copy with CRLF. Biome formats with LF
+# (biome.json sets no lineEnding override), which fails `biome check` on
+# effectively every file, and
+# desktop/src/features/messages/ui/virtuaWheelModePatch.test.mjs asserts on
+# patches/*.patch with `\n`-joined patterns. Normalize to LF in the working
+# copy on every platform; the stored blobs are already LF.
+* text=auto eol=lf
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 325a485102..238878c749 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,4 +5,4 @@
 <!-- Fixes #1234, or N/A. Before opening: search existing issues/PRs for duplicates — link the closest one, or say "none found". -->
 
 ### Testing
-<!-- How was this verified? -->
+<!-- How was this verified? UI change? Include before/after screenshots (or a short recording). -->
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ad7f77f6bf..d4826d985f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,21 +48,30 @@ jobs:
               - 'scripts/run-tests.sh'
               - 'justfile'
             desktop:
+              - 'scripts/check-file-sizes-core.mjs'
+              - 'scripts/check-file-sizes-core.test.mjs'
               - 'desktop/**'
               - '!desktop/src-tauri/**'
               - 'pnpm-lock.yaml'
             desktop-rust:
               - 'desktop/src-tauri/**'
             web:
+              - 'scripts/check-file-sizes-core.mjs'
+              - 'scripts/check-file-sizes-core.test.mjs'
               - 'web/**'
               - 'pnpm-lock.yaml'
             mobile:
+              - 'scripts/check-file-sizes-core.mjs'
+              - 'scripts/check-file-sizes-core.test.mjs'
               - 'mobile/**'
               - 'scripts/mobile-release.sh'
+              - 'scripts/mobile-worktree-overrides.sh'
+              - 'scripts/mobile-worktree-clean.sh'
               - 'scripts/publish-mobile-release-candidate.sh'
               - 'scripts/release-rulesets.sh'
               - 'scripts/test-mobile-release-contract.sh'
               - 'scripts/test-mobile-release-candidate-publisher.sh'
+              - 'scripts/test-mobile-worktree-overrides.sh'
               - '.github/workflows/mobile-release-candidate.yml'
               - '.github/workflows/ci.yml'
       - name: Release workflow source contract
@@ -71,6 +80,10 @@ jobs:
         run: |
           scripts/test-mobile-release-contract.sh
           scripts/test-mobile-release-candidate-publisher.sh
+      - name: Mobile worktree identity contract
+        run: scripts/test-mobile-worktree-overrides.sh
+      - name: File size ratchet unit tests
+        run: node --test scripts/check-file-sizes-core.test.mjs
 
   rust-lint:
     name: Rust Lint
@@ -125,6 +138,8 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        with:
+          fetch-depth: 2
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
       - uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1
       - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
@@ -208,7 +223,7 @@ jobs:
   desktop-smoke-e2e:
     name: Desktop Smoke E2E (${{ matrix.shard }})
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     needs: [changes]
     if: github.event_name == 'push' || needs.changes.outputs.desktop == 'true' || needs.changes.outputs.desktop-rust == 'true' || needs.changes.outputs.rust == 'true'
     strategy:
@@ -335,6 +350,7 @@ jobs:
           cargo build --profile ci -p buzz-relay -p git-credential-nostr
           cargo nextest archive \
             --cargo-profile ci \
+            -p buzz-db \
             -p buzz-relay \
             -p buzz-test-client \
             --lib \
@@ -666,11 +682,11 @@ jobs:
           done
           cat /tmp/buzz-relay.log
           exit 1
-      - name: Invite claim security tests
+      - name: Invite security tests
         run: |
           cargo nextest run \
             --archive-file target/ci/backend-integration-tests.tar.zst \
-            -E 'package(buzz-relay) and test(claim_)' \
+            -E '(package(buzz-db) and test(/relay_invite::tests/)) or (package(buzz-relay) and test(/api::invites::tests/))' \
             --run-ignored ignored-only
         env:
           DATABASE_URL: postgres://buzz:${{ env.BUZZ_TEST_POSTGRES_PASSWORD }}@localhost:5432/buzz
@@ -745,6 +761,8 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        with:
+          fetch-depth: 2
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
       - name: Get pnpm store directory
         id: pnpm-cache
@@ -778,6 +796,8 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        with:
+          fetch-depth: 2
       - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
       - name: Compute Hermit cache key
         id: hermit-bin-hash
@@ -816,6 +836,8 @@ jobs:
         with:
           path: ~/.pub-cache
           key: pub-${{ runner.os }}-${{ hashFiles('mobile/pubspec.lock') }}
+      - name: File size ratchet
+        run: node mobile/scripts/check-file-sizes.mjs
       - name: Format check
         run: cd mobile && dart format --output=none --set-exit-if-changed .
       - name: Analyze
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 31080652ea..52f21b28bc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,6 +1,8 @@
 name: Docker image
 
-# Builds and publishes the public Buzz relay image as ghcr.io/block/buzz.
+# Builds and publishes the public Buzz relay images as ghcr.io/block/buzz.
+# Normal tags contain stripped binaries; matching debug-* tags contain the same
+# optimized binaries with line-table debug information for native profilers.
 #
 # Strategy: each architecture builds on its native runner (ubuntu-24.04 for
 # amd64, ubuntu-24.04-arm for arm64), pushes to GHCR by digest, then a final
@@ -15,8 +17,10 @@ name: Docker image
 #
 # Triggers:
 #   - push to main           → :main + :sha-<7>
+#                              + :debug-main + :debug-sha-<7>
 #   - push tags relay-v*.*.* → :{version} + :{major}.{minor} + :{major}
-#                              (+ :latest for stable, NOT for prereleases)
+#                              + matching :debug-* tags
+#                              (+ :latest/:debug-latest for stable releases)
 #   - pull_request           → build only (no push), cache stays warm
 #   - workflow_dispatch      → manual relay-tag rescue at the tag itself
 #
@@ -95,10 +99,6 @@ jobs:
             runner: ubuntu-24.04-arm
             arch: arm64
 
-    outputs:
-      # Used downstream by `merge` to stitch the manifest.
-      version: ${{ steps.meta.outputs.version }}
-
     steps:
       - name: Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6
@@ -163,12 +163,13 @@ jobs:
             org.opencontainers.image.description=WebSocket relay server for the Buzz communications platform
             org.opencontainers.image.licenses=Apache-2.0
 
-      - name: Build and push by digest
-        id: build
+      - name: Build and push release image by digest
+        id: build-release
         uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf  # v7.2.0
         with:
           context: .
           file: ./Dockerfile
+          target: runtime
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
           # Push by digest, not by tag — the merge job assembles the tags
@@ -180,25 +181,49 @@ jobs:
           cache-to: |
             ${{ (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && format('type=registry,ref={0}-buildcache:{1},mode=max,compression=zstd', env.IMAGE_NAME, matrix.arch) || '' }}
 
-      - name: Export digest
+      - name: Build and push debug image by digest
+        id: build-debug
+        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf  # v7.2.0
+        with:
+          context: .
+          file: ./Dockerfile
+          target: runtime-debug
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+          outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }}
+          cache-from: |
+            type=registry,ref=${{ env.IMAGE_NAME }}-buildcache:${{ matrix.arch }}
+
+      - name: Export release and debug digests
         if: github.event_name != 'pull_request'
         env:
-          DIGEST: ${{ steps.build.outputs.digest }}
+          RELEASE_DIGEST: ${{ steps.build-release.outputs.digest }}
+          DEBUG_DIGEST: ${{ steps.build-debug.outputs.digest }}
         run: |
-          mkdir -p /tmp/digests
-          touch "/tmp/digests/${DIGEST#sha256:}"
+          mkdir -p /tmp/digests-release /tmp/digests-debug
+          touch "/tmp/digests-release/${RELEASE_DIGEST#sha256:}"
+          touch "/tmp/digests-debug/${DEBUG_DIGEST#sha256:}"
 
-      - name: Upload digest
+      - name: Upload release digest
         if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
         with:
-          name: digests-${{ matrix.arch }}
-          path: /tmp/digests/*
+          name: digests-release-${{ matrix.arch }}
+          path: /tmp/digests-release/*
+          if-no-files-found: error
+          retention-days: 1
+
+      - name: Upload debug digest
+        if: github.event_name != 'pull_request'
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
+        with:
+          name: digests-debug-${{ matrix.arch }}
+          path: /tmp/digests-debug/*
           if-no-files-found: error
           retention-days: 1
 
   merge:
-    name: Merge multi-arch manifest
+    name: Merge ${{ matrix.variant }} multi-arch manifest
     if: github.event_name != 'pull_request'
     runs-on: ubuntu-24.04
     needs: build
@@ -208,13 +233,21 @@ jobs:
       packages: write    # push the merged manifest
       id-token: write    # OIDC for provenance attestation on the manifest
       attestations: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - variant: release
+            tag_prefix: ""
+          - variant: debug
+            tag_prefix: debug-
 
     steps:
       - name: Download all per-arch digests
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
         with:
           path: /tmp/digests
-          pattern: digests-*
+          pattern: digests-${{ matrix.variant }}-*
           merge-multiple: true
 
       - name: Set up Docker Buildx
@@ -237,9 +270,12 @@ jobs:
           # the build job's `meta` step for why match=^relay-v(.*)$, why
           # value=${{ inputs.version }} carries the rescue-dispatch version,
           # and why :latest is left to flavor.latest=auto.
+          flavor: |
+            latest=auto
+            prefix=${{ matrix.tag_prefix }},onlatest=true
           tags: |
             type=ref,event=branch,enable=${{ github.event_name != 'workflow_dispatch' || inputs.version == '' }}
-            type=sha,prefix=sha-,format=short,enable=${{ github.event_name != 'workflow_dispatch' || inputs.version == '' }}
+            type=sha,prefix=${{ matrix.tag_prefix }}sha-,format=short,enable=${{ github.event_name != 'workflow_dispatch' || inputs.version == '' }}
             type=semver,pattern={{version}},match=^relay-v(.*)$,value=${{ inputs.version }}
             type=semver,pattern={{major}}.{{minor}},match=^relay-v(.*)$,value=${{ inputs.version }}
             type=semver,pattern={{major}},match=^relay-v(.*)$,value=${{ inputs.version }}
@@ -284,11 +320,12 @@ jobs:
       - name: Summary
         env:
           IMAGE_NAME: ${{ env.IMAGE_NAME }}
+          VARIANT: ${{ matrix.variant }}
           MERGED_DIGEST: ${{ steps.manifest.outputs.digest }}
           META_TAGS: ${{ steps.meta.outputs.tags }}
         run: |
           {
-            echo "### Published \`${IMAGE_NAME}\`"
+            echo "### Published \`${IMAGE_NAME}\` (${VARIANT})"
             echo
             echo "**Digest:** \`${MERGED_DIGEST}\`"
             echo
diff --git a/.github/workflows/linux-canary.yml b/.github/workflows/linux-canary.yml
index 18d476e400..9806443378 100644
--- a/.github/workflows/linux-canary.yml
+++ b/.github/workflows/linux-canary.yml
@@ -21,7 +21,7 @@ jobs:
     name: Build Linux canary
     if: github.repository == 'block/buzz'
     runs-on: ubuntu-latest
-    container: ubuntu:22.04@sha256:0e0a0fc6d18feda9db1590da249ac93e8d5abfea8f4c3c0c849ce512b5ef8982
+    container: ubuntu:24.04@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90
     timeout-minutes: 60
     permissions:
       contents: read
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d3e20c393d..b87e9c8c08 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -476,7 +476,7 @@ jobs:
     if: github.repository == 'block/buzz'
     runs-on: ubuntu-latest
     # Digest-pinned like the SHA-pinned actions below; Renovate keeps it fresh.
-    container: ubuntu:22.04@sha256:0e0a0fc6d18feda9db1590da249ac93e8d5abfea8f4c3c0c849ce512b5ef8982
+    container: ubuntu:24.04@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90
     needs: setup
     timeout-minutes: 60
     permissions:
@@ -498,7 +498,7 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
         run: |
-          # Must run first: bare ubuntu:22.04 ships without curl, wget, git, or
+          # Must run first: bare ubuntu:24.04 ships without curl, wget, git, or
           # ca-certificates. activate-hermit bootstraps via curl+HTTPS (needs
           # both), and actions/checkout falls back to a REST tarball without git.
           # Running as root — no sudo needed.
@@ -629,7 +629,7 @@ jobs:
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
 
-      - name: Fix AppImage (remove infra libs, symlink system GStreamer)
+      - name: Fix AppImage (remove infra libs, shim host GStreamer)
         run: |
           mapfile -t APPIMAGES < <(find desktop/src-tauri/target/release/bundle/appimage -name '*.AppImage' -type f)
           if [[ ${#APPIMAGES[@]} -eq 0 ]]; then
diff --git a/AGENTS.md b/AGENTS.md
index 3edfb34f60..7ff0eb4d47 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -108,6 +108,8 @@ 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`.
 
+**Commit with `git commit -s`.** The required **DCO Check** fails any PR with a commit missing a `Signed-off-by` trailer, and `just hooks` installs a `commit-msg` hook that adds it to commits you create locally (`git rebase` and `git cherry-pick` still need `--signoff`) — if you build commit commands programmatically, include `-s` every time. To repair a branch that already has unsigned commits: `git rebase --signoff main`, then force-push.
+
 Additional rules:
 - No `unsafe` code
 - Do not introduce new `unwrap()` or `expect()` in production paths — use `?` and proper error types
@@ -341,9 +343,19 @@ Add specs to `desktop/tests/e2e/` and register them in `playwright.config.ts`
 (`smoke` project `testMatch`). Every test calls `installMockBridge(page)` for
 mock Tauri IPC. Mock pubkey, channel names, and UUIDs live in `e2eBridge.ts`.
 
+**Always build with `pnpm build:e2e`, never `pnpm run build`.** The mock Tauri
+bridge is compiled in only for `--mode e2e` (see `installE2eBridgeIfConfigured`
+in `desktop/src/main.tsx`). A plain `pnpm run build` strips it, so
+`window.__TAURI_INTERNALS__` is never defined and **every** mock-mode spec fails
+with `Cannot read properties of undefined (reading 'invoke')` — the app renders
+"Community connection failed" instead of the UI under test. That looks exactly
+like a product bug rather than a build mistake, so it burns real time.
+`pnpm test:e2e:smoke` and `pnpm test:e2e:integration` run the right build for
+you; prefer them over a manual build plus `playwright test`.
+
 **Stale server:** `reuseExistingServer: true` means a previous build's server
-serves old code. Kill port 4173 and `pnpm run build` before re-running tests
-after code changes.
+serves old code. Kill port 4173 and re-run `pnpm build:e2e` before re-running
+tests after code changes.
 
 **`addInitScript` before bridge:** `page.addInitScript` (localStorage seeding)
 must run BEFORE `installMockBridge(page)` — React reads state on mount, the
@@ -553,6 +565,15 @@ To run the app locally (starts Docker, relay, iOS simulator automatically):
 just mobile-dev
 ```
 
+When run from a git worktree, `just mobile-dev` (and `just
+mobile-build-android`) give the debug build a per-worktree app identifier
+(keyed to the worktree directory name) and a branch-labelled app name via
+`scripts/mobile-worktree-overrides.sh`, so builds from multiple worktrees
+install side by side. Release builds are unaffected. `just mobile-clean`
+removes stale worktree-suffixed installs from simulators/emulators. See
+[mobile/README.md](mobile/README.md) for direct Xcode / Android Studio
+usage.
+
 ### Testing Conventions
 
 - Prefer **widget tests** over unit tests for UI components — test the
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1223936504..956faa1ed3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,81 @@
 # Changelog
 
+## v0.5.1
+
+- perf(desktop): move observer-feed archive and decrypt commands off main thread ([#3415](https://github.com/block/buzz/pull/3415)) ([`294c8c821`](https://github.com/block/buzz/commit/294c8c821de51442a8c384c0bdb66b1a10224ca0))
+- fix(desktop): preserve shared agent fidelity ([#3553](https://github.com/block/buzz/pull/3553)) ([`f7a3988ba`](https://github.com/block/buzz/commit/f7a3988ba13b590d9a55a7e8413fc3fb5ffbef18))
+- feat(agent): route Claude/GPT model families to their native gateway wire ([#3538](https://github.com/block/buzz/pull/3538)) ([`6438dedf8`](https://github.com/block/buzz/commit/6438dedf83a9dbe1853e484326911bf6c7f1618c))
+- Refine community invite limits ([#3529](https://github.com/block/buzz/pull/3529)) ([`24d90d128`](https://github.com/block/buzz/commit/24d90d1280a9325c6cbcf8eea30ac54db5afd2cb))
+- feat(agent): fix Anthropic prompt caching with Databricks (+ MCP proxy/TLS passthrough) ([#3463](https://github.com/block/buzz/pull/3463)) ([`c405ad1d4`](https://github.com/block/buzz/commit/c405ad1d4b1da061c11b3d26761252d41dcc62d3))
+- feat: add explicit entry for claude-opus-5 in model config ([#2831](https://github.com/block/buzz/pull/2831)) ([`90e058ebf`](https://github.com/block/buzz/commit/90e058ebf68137e048a409aec6616519379ff726))
+- fix(desktop): clear stale thread new-message pill ([#3411](https://github.com/block/buzz/pull/3411)) ([`55a3ed7b9`](https://github.com/block/buzz/commit/55a3ed7b9217cee5b23e0a5441947dc929b2a38c))
+- fix(ci): ratchet file sizes against the base tree ([#3352](https://github.com/block/buzz/pull/3352)) ([`9227bdf58`](https://github.com/block/buzz/commit/9227bdf58ad6664ae3c1078888f2181ec19c4da4))
+- feat(desktop): apply WebKit rendering workarounds at startup on Linux ([#3271](https://github.com/block/buzz/pull/3271)) ([`3ece4461d`](https://github.com/block/buzz/commit/3ece4461df8a7b9663a8e68327483b8377d4086d))
+- fix(desktop): stabilize flaky DM expansion E2E ordering assertions ([#2004](https://github.com/block/buzz/pull/2004)) ([`913d564ce`](https://github.com/block/buzz/commit/913d564ce0f35924291bf3eeab6508517a6d8d1f))
+- fix(desktop): paint community rail full height ([#3382](https://github.com/block/buzz/pull/3382)) ([`1d3b810ad`](https://github.com/block/buzz/commit/1d3b810ad70d6325718ed91e723f32c4a376d5e1))
+- feat(desktop): add custom harness inline from agent dialogs ([#3252](https://github.com/block/buzz/pull/3252)) ([`b0503d80c`](https://github.com/block/buzz/commit/b0503d80c298b1ece3b0a43b41d316829a3379e7))
+- feat(desktop): refine agent catalog sharing ([#2439](https://github.com/block/buzz/pull/2439)) ([`a35771fc4`](https://github.com/block/buzz/commit/a35771fc441cdc3c6f517f419037206783b502d2))
+- fix(desktop): keep drafts out of the Inbox All view ([#3217](https://github.com/block/buzz/pull/3217)) ([`3afa129ee`](https://github.com/block/buzz/commit/3afa129ee785cc74d921d0ba969254a8255c4cc0))
+- fix(desktop): restore the inbox icon in the sidebar ([#3341](https://github.com/block/buzz/pull/3341)) ([`00ede2e7a`](https://github.com/block/buzz/commit/00ede2e7aa7eb95571b7db3ebbd163adbf6cf74e))
+- fix(desktop): gate codex-acp on a minimum supported version ([#3254](https://github.com/block/buzz/pull/3254)) ([`4e3998f36`](https://github.com/block/buzz/commit/4e3998f36e36d68b9a93dcbd85f0864450bb8f5f))
+- feat(cli): add users set-status command for NIP-38 profile status ([#3253](https://github.com/block/buzz/pull/3253)) ([`60158fce3`](https://github.com/block/buzz/commit/60158fce3e670f11bb35d42627857ccaea50ff06))
+- fix(composer): scope multiline block formatting ([#3246](https://github.com/block/buzz/pull/3246)) ([`5457c947a`](https://github.com/block/buzz/commit/5457c947a74f5ba4b979f9c6411aa7626a858387))
+
+
+## v0.5.0
+
+- feat(invites): add use-limited invite links ([#3141](https://github.com/block/buzz/pull/3141)) ([`d500c2d5c`](https://github.com/block/buzz/commit/d500c2d5cf5d9aabe0ca4ebebfcafdbe5f5b7fd3))
+- fix(node): bump Buzz-supplied Node runtimes past OpenClaw's >=24.15.0 floor ([#3218](https://github.com/block/buzz/pull/3218)) ([`98a7b1334`](https://github.com/block/buzz/commit/98a7b1334823ee0be3e3fa5cab7a2e349e438dab))
+- fix(desktop): preserve thread anchor through layout reflow ([#3212](https://github.com/block/buzz/pull/3212)) ([`9810d8545`](https://github.com/block/buzz/commit/9810d8545937329f229ff40d8a19edc9e3e325c1))
+- feat(search): parse from:/in:/after:/before: and pass them in the filter ([#2871](https://github.com/block/buzz/pull/2871)) ([`cb2a265b5`](https://github.com/block/buzz/commit/cb2a265b5399426e808461c1a16713754c593258))
+- fix(desktop): fetch join policies through native networking ([#2862](https://github.com/block/buzz/pull/2862)) ([`0019f8076`](https://github.com/block/buzz/commit/0019f80765e96f056e81b57789b8b5fb80936f72))
+- fix(desktop): republish agent identity records when a persona rename propagates ([#2607](https://github.com/block/buzz/pull/2607)) ([`7ca0bbd94`](https://github.com/block/buzz/commit/7ca0bbd946fd82a7008132f94d069a97bb53f94b))
+- fix(desktop): keep project Inbox previews compact ([#3193](https://github.com/block/buzz/pull/3193)) ([`de1396050`](https://github.com/block/buzz/commit/de13960505fd798070e177cb33b1663100ac06bb))
+- Inbox refactor ([#2045](https://github.com/block/buzz/pull/2045)) ([`2bd4c24b7`](https://github.com/block/buzz/commit/2bd4c24b71335e7ce272ec6de6491f7f37f4b20d))
+- Fix composer selection formatting and drop overlay ([#3172](https://github.com/block/buzz/pull/3172)) ([`99da5b7eb`](https://github.com/block/buzz/commit/99da5b7ebb19e26453e075bfb949672122b31be3))
+- Refine pending message status ([#3153](https://github.com/block/buzz/pull/3153)) ([`75588eaff`](https://github.com/block/buzz/commit/75588eaff2354d620e554c055b80ec83735ddb0a))
+- fix(desktop): recover full local storage on startup ([#3182](https://github.com/block/buzz/pull/3182)) ([`174c38e4b`](https://github.com/block/buzz/commit/174c38e4bd1ed8498641546bc4fcb6d5a4c9cede))
+- fix(desktop): keep collapsed table separators out of spoilers ([#3169](https://github.com/block/buzz/pull/3169)) ([`4d8b676bb`](https://github.com/block/buzz/commit/4d8b676bb283a1917cec5850c3b7327fe122b0c1))
+- feat(desktop): redesign agent runtime settings ([#3093](https://github.com/block/buzz/pull/3093)) ([`d98da7389`](https://github.com/block/buzz/commit/d98da7389e60cfbd79b219aa411449fe2e53a18a))
+- fix(desktop): use forward slashes for git credential.helper on Windows ([#3023](https://github.com/block/buzz/pull/3023)) ([`899531684`](https://github.com/block/buzz/commit/8995316844f7ad50552fbae67fbd35119262796f))
+- chore(desktop): add AgentCreationPreview file-size override to unblock main CI ([#3154](https://github.com/block/buzz/pull/3154)) ([`b92a1f4bf`](https://github.com/block/buzz/commit/b92a1f4bf400e7da5ab7a010cdd81a69497d8191))
+- fix(desktop): make the test loader work on Windows ([#2758](https://github.com/block/buzz/pull/2758)) ([`8bb43d519`](https://github.com/block/buzz/commit/8bb43d51912894553f2670b2d285a96cf09cd472))
+- fix(desktop): make lint and unit-test gates work on Windows ([#2943](https://github.com/block/buzz/pull/2943)) ([`545bb46b8`](https://github.com/block/buzz/commit/545bb46b824a3fbf4401062f03b72531d832ebb9))
+- feat(desktop): add search to agent emoji picker ([#2630](https://github.com/block/buzz/pull/2630)) ([`313f793c8`](https://github.com/block/buzz/commit/313f793c8753d413c22ff8edfe420d5ee78708bc))
+- fix(desktop): keep identity key help dialog readable in dark mode ([#2854](https://github.com/block/buzz/pull/2854)) ([`be275cfc6`](https://github.com/block/buzz/commit/be275cfc6c7b80fe43e9d66c6d14b6d2bbe58a10))
+- feat(acp): title agent sessions from the agent and channel name ([#3028](https://github.com/block/buzz/pull/3028)) ([`f2fe3b63c`](https://github.com/block/buzz/commit/f2fe3b63c21be55907175715c076cd3a9195b74d))
+- feat(git): use agent display name as git author name ([#3040](https://github.com/block/buzz/pull/3040)) ([`18eef633d`](https://github.com/block/buzz/commit/18eef633d88ac465c61d98f12655fbf51dc3ca44))
+- fix(deps): bump nostr to 0.44.6 for RUSTSEC-2026-0216 (NIP-44 remote DoS) ([#3135](https://github.com/block/buzz/pull/3135)) ([`31e2de196`](https://github.com/block/buzz/commit/31e2de1966672e73e026af3c54f3a1a9a2f5e103))
+- fix(desktop): read the newest pair-scoped harness log ([#3134](https://github.com/block/buzz/pull/3134)) ([`654f38490`](https://github.com/block/buzz/commit/654f384906b5c720a60a199d85031a6f1cb6efc9))
+- feat(desktop): handle project work from Inbox ([#3117](https://github.com/block/buzz/pull/3117)) ([`c5c4f390b`](https://github.com/block/buzz/commit/c5c4f390b6713256e2efb8394c59823ebad73db6))
+- fix(desktop): clarify identity key button when key exists ([#2357](https://github.com/block/buzz/pull/2357)) ([`87b3fcd3c`](https://github.com/block/buzz/commit/87b3fcd3c0131683569dd4268b099d18b25dcd5e))
+- Restore Goose and Buzz Agent to onboarding harness selection ([#2731](https://github.com/block/buzz/pull/2731)) ([`7fc0cc82d`](https://github.com/block/buzz/commit/7fc0cc82db4d9dced9c258bbe8b530164a832a77))
+- fix(desktop): render rich project work item content ([#3100](https://github.com/block/buzz/pull/3100)) ([`afb272bb7`](https://github.com/block/buzz/commit/afb272bb7b8d7d45d7de676fa97dcd5a8eefacc7))
+- feat(acp): bring your own harness (BYOH) — generic ACP runtime seam + settings gallery ([#2773](https://github.com/block/buzz/pull/2773)) ([`95fdf9788`](https://github.com/block/buzz/commit/95fdf978800982389b120c66ff5e766d785419c7))
+- feat(desktop): use collective mesh routing for Auto ([#2825](https://github.com/block/buzz/pull/2825)) ([`16d4ec335`](https://github.com/block/buzz/commit/16d4ec335e210295a9d9f77f36c1e85a18b6814a))
+- fix(desktop): strip legacy baked team instructions from stored prompts ([#3035](https://github.com/block/buzz/pull/3035)) ([`aee631448`](https://github.com/block/buzz/commit/aee63144843854ee32ed9d36a2e7511c82ddc6b0))
+- feat(agents): lower default agent parallelism from 24 to 10 ([#3038](https://github.com/block/buzz/pull/3038)) ([`5d8ede446`](https://github.com/block/buzz/commit/5d8ede446f8fdc48146fe56d389cab6bf3500f92))
+- Polish community rail and mobile pairing ([#2972](https://github.com/block/buzz/pull/2972)) ([`e6c90bb7c`](https://github.com/block/buzz/commit/e6c90bb7c430d1b2af16508b634f9a5283b7fa3b))
+- fix(desktop): remove bundled libsystemd from AppImage ([#2353](https://github.com/block/buzz/pull/2353)) ([`a31fc4d2f`](https://github.com/block/buzz/commit/a31fc4d2f35d51cdf45ff8c61fc3a07f49c665e8))
+- fix(desktop): make agent definition authoritative for model/provider/prompt ([#1968](https://github.com/block/buzz/pull/1968)) ([`8c0e8cb16`](https://github.com/block/buzz/commit/8c0e8cb1656b04ad269bce3c2deeda2a943ae78a))
+- chore(desktop): delete dead persona catalog UI cluster ([#2886](https://github.com/block/buzz/pull/2886)) ([`8e67cf399`](https://github.com/block/buzz/commit/8e67cf399d0291bcdbc69cd0402983ca030f05bb))
+- fix(desktop): surface install failures hidden by curl-pipe exit codes ([#2892](https://github.com/block/buzz/pull/2892)) ([`166c6655e`](https://github.com/block/buzz/commit/166c6655e8bca87d83ad60c087fb70a32a026baf))
+- Refactor managed-agent runtime into cohesive modules ([#2974](https://github.com/block/buzz/pull/2974)) ([`74b63e184`](https://github.com/block/buzz/commit/74b63e1846212af6e6751a62cfc631f74b1dfe07))
+- fix(desktop): make Linux AppImage GStreamer work on non-Debian distros ([#2176](https://github.com/block/buzz/pull/2176)) ([`cc6c4d347`](https://github.com/block/buzz/commit/cc6c4d3471629fad018bcf645f9471a01b9ffe2f))
+- refactor(desktop): remove Agent directory section from Agents page ([#2290](https://github.com/block/buzz/pull/2290)) ([`5d1233e84`](https://github.com/block/buzz/commit/5d1233e841b0efa91470bb45467b2c8e4284ebf6))
+- fix(desktop): enable arboard Wayland backend so Linux copies reach the Wayland clipboard ([#2904](https://github.com/block/buzz/pull/2904)) ([`ab7aa8b12`](https://github.com/block/buzz/commit/ab7aa8b1200710dbc2d7a8661ed5aab95c4199c1))
+- fix(desktop): supervise and re-arm relay-mesh runtime ([#2823](https://github.com/block/buzz/pull/2823)) ([`aa51dab9d`](https://github.com/block/buzz/commit/aa51dab9da5fef7054d03cf1a1207986d0000684))
+- fix(agents): run live Databricks discovery instead of the fallback list ([#2890](https://github.com/block/buzz/pull/2890)) ([`8eb6e3eb6`](https://github.com/block/buzz/commit/8eb6e3eb601174249642373a6a367262fa476753))
+- fix(desktop): retire prepend mode on every reader wheel ([#2913](https://github.com/block/buzz/pull/2913)) ([`07d0265cf`](https://github.com/block/buzz/commit/07d0265cfc212ef02e1c26153bf58ff46ce5ffe6))
+- fix(desktop): consolidate prepend scroll correction ([#2855](https://github.com/block/buzz/pull/2855)) ([`25e7864b3`](https://github.com/block/buzz/commit/25e7864b35f4dfd1c0ff31304a38555230a85f8d))
+- fix(desktop): track concurrent agent turns up to the harness maximum ([#2882](https://github.com/block/buzz/pull/2882)) ([`20bff5910`](https://github.com/block/buzz/commit/20bff591023daffc5ee1032cff02b54b75da3567))
+- fix(relay): preserve reconnect backoff ([#2759](https://github.com/block/buzz/pull/2759)) ([`499c5d349`](https://github.com/block/buzz/commit/499c5d349dab13bc906b1af5fe1fcb09ce2afa81))
+- refactor(relay): expose reconnect timing policy ([#2310](https://github.com/block/buzz/pull/2310)) ([`2f0041595`](https://github.com/block/buzz/commit/2f0041595d72529c06885680d2bd07ddb6a0beb4))
+- fix(desktop): clear stale working badges on agent stop/restart ([#2803](https://github.com/block/buzz/pull/2803)) ([`a64cc71f6`](https://github.com/block/buzz/commit/a64cc71f6c1605279b1a6fbd0fe904a2984cbdb0))
+- fix(desktop): surface agent rename relay profile sync failure as a warning toast ([#2279](https://github.com/block/buzz/pull/2279)) ([`5e3d2e484`](https://github.com/block/buzz/commit/5e3d2e4849c0f2512330801d804fb96f4ab72d28))
+- fix(discovery): inject PATH into Codex adapter planning ([#2767](https://github.com/block/buzz/pull/2767)) ([`6ab3835f3`](https://github.com/block/buzz/commit/6ab3835f3fe89ee215819fe8d193463c0ae7472b))
+
+
 ## v0.4.26
 
 - Style mobile pairing QR codes ([#2775](https://github.com/block/buzz/pull/2775)) ([`50655ac09`](https://github.com/block/buzz/commit/50655ac097fbf1a7db1a5284dccc7e2a0b0f1bfc))
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 565d740129..db0aea637f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,6 +43,29 @@ Buzz is an agent platform, so AI-assisted PRs are welcome. No need to disclose t
 
 We squash-merge, so your PR title becomes the commit subject in `main`. Use [Conventional Commits](https://www.conventionalcommits.org/) format: `feat(mcp): add get_feed_actions tool`. The type prefix (`feat`, `fix`, `docs`, `refactor`, `test`, `chore`) is required. See the [Commit Messages](#commit-messages) section for the full reference.
 
+### Sign Your Commits
+
+```bash
+git commit -s
+```
+
+Every commit needs a Developer Certificate of Origin (DCO) sign-off. The `-s` flag appends a `Signed-off-by` trailer that certifies you wrote the change and can contribute it under the project license. The **DCO Check** will block your PR without it.
+
+#### Fix unsigned commits already pushed
+
+```bash
+git rebase --signoff main
+git push --force-with-lease
+```
+
+#### Auto-setup for future commits
+
+```bash
+just hooks
+```
+
+This installs a `commit-msg` hook that adds the sign-off trailer automatically for `git commit` and `git merge`. Other flows (`git rebase`, `git cherry-pick`) still need their own flag — `--signoff` and `-s` respectively.
+
 We review as capacity allows — focused PRs that follow this guide move fastest.
 
 ---
@@ -75,6 +98,37 @@ Hermit pins Rust, `just`, Node, pnpm, and other tools to the versions in
 upfront. If you don't use Hermit, ensure your toolchain meets the minimum
 versions in the table above.
 
+#### Linux: Tauri system libraries
+
+Hermit pins language toolchains, not system libraries. On Linux, the desktop
+app's Rust crates link against GTK and WebKitGTK, so `just ci` (and any
+`just desktop-tauri-*` recipe) needs these installed system-wide first. On
+Debian/Ubuntu:
+
+```bash
+sudo apt-get install -y --no-install-recommends \
+  build-essential curl file libasound2-dev libayatana-appindicator3-dev \
+  libgtk-3-dev librsvg2-dev libssl-dev libwebkit2gtk-4.1-dev libxdo-dev \
+  patchelf wget
+```
+
+This is the same list CI installs (see `.github/workflows/ci.yml`), so matching
+it locally keeps your results comparable to CI. Other distributions ship these
+under different package names — see the
+[Tauri prerequisites](https://tauri.app/start/prerequisites/) for the
+equivalents.
+
+Without them, `just ci` fails partway through `just check` with a pkg-config
+error such as:
+
+```
+The system library `gdk-pixbuf-2.0` required by crate `gdk-pixbuf-sys` was not found.
+```
+
+If you're only touching the relay, CLI, or other server-side crates, you can
+skip this and run the narrower recipes instead — `just fmt-check`, `just
+clippy`, `just test-unit`, and `just test` need no GTK.
+
 ### First-Time Setup
 
 ```bash
@@ -185,7 +239,7 @@ just ci
 ```
 
 This is the same check that runs in CI. PRs that fail `just ci` will not be
-merged.
+merged. If `just ci` fails on formatting, `just fix-all` fixes it in one shot (`rustfmt` + Tauri fmt + desktop, web, and mobile formatters).
 
 ---
 
@@ -282,9 +336,34 @@ required. The scope (in parentheses) is optional but encouraged.
    - How to test it manually (if applicable)
    - Any follow-up work deferred to a future PR
 
-### Review Process
+6. **Shows the UI** — any PR that changes the desktop or mobile UI includes
+   before/after screenshots (or a short recording for interactions) in the
+   description. We can't run every branch locally — screenshots let us review
+   UI changes same-day instead of waiting for someone to build your branch.
 
-- We prioritize focused PRs that follow this guide and review as capacity allows.
+### PRs We're Unlikely to Merge
+
+Some kinds of PRs usually get closed — not because they're bad ideas, but
+because we can't safely review them without prior discussion:
+
+- **Large refactors or dependency swaps** without a prior issue agreeing on
+  the direction
+- **Cosmetic renames or style-only churn** that doesn't fix a bug or improve
+  clarity
+- **Entirely new features** with no prior discussion
+- **Drive-by changes bundled into an unrelated fix** — split them out
+
+If you're considering any of these, open an issue first and we'll tell you
+quickly whether it's a direction we'd merge. That saves your time as much as
+ours.
+
+### What to Expect After You Open a PR
+
+- Maintainers triage new PRs on a best-effort cadence. Focused PRs that
+  follow this guide move fastest.
+- Duplicates and PRs that skip this guide may be closed with a pointer here
+  rather than a full review. A close isn't a rejection of you or the idea —
+  address the gaps and reopen (or open a fresh PR) anytime.
 - Address review comments by pushing new commits (don't force-push during
   review; it makes it hard to see what changed).
 - Once approved, a maintainer will squash-merge your PR.
diff --git a/Cargo.lock b/Cargo.lock
index 9d0190868d..3b60dc4579 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -925,6 +925,7 @@ dependencies = [
 name = "buzz-core"
 version = "0.1.0"
 dependencies = [
+ "base64",
  "chrono",
  "hex",
  "hmac 0.13.0",
@@ -949,6 +950,7 @@ dependencies = [
  "chrono",
  "hex",
  "nostr",
+ "rand 0.10.1",
  "serde",
  "serde_json",
  "sha2 0.11.0",
@@ -3039,11 +3041,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if 1.0.4",
- "js-sys",
  "libc",
  "r-efi 5.3.0",
  "wasip2",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -5457,9 +5457,9 @@ dependencies = [
 
 [[package]]
 name = "nostr"
-version = "0.44.3"
+version = "0.44.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d8f0fe13526800300a36bf3b7c5f752e62e32ab81c74a8e5caa2865708625a"
+checksum = "e826dd648489de2c5b293920e20b92932ef820302007c1987c758d4d06eeb2cf"
 dependencies = [
  "base64",
  "bech32",
@@ -6823,15 +6823,16 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.14"
+version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
+checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560"
 dependencies = [
  "aws-lc-rs",
  "bytes",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "lru-slab",
- "rand 0.9.4",
+ "rand 0.10.1",
+ "rand_pcg",
  "ring",
  "rustc-hash",
  "rustls",
diff --git a/Cargo.toml b/Cargo.toml
index 3499285f91..3ac7ee4cce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -96,6 +96,7 @@ reqwest = { version = "0.13", features = ["json", "rustls"], default-features =
 sha2      = "0.11"
 hex       = "0.4"
 hmac      = "0.13"
+base64    = "0.22"
 
 # Randomness
 rand = "0.10"
diff --git a/Dockerfile b/Dockerfile
index 661be6c3a7..d883ac6b01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,6 +59,9 @@ RUN apt-get update \
         ca-certificates \
         git \
     && rm -rf /var/lib/apt/lists/*
+# Keep enough DWARF for native profilers to resolve optimized code to source
+# locations. The normal runtime strips it below; runtime-debug retains it.
+ENV CARGO_PROFILE_RELEASE_DEBUG=line-tables-only
 COPY --from=planner /build/recipe.json recipe.json
 # Cook the full workspace recipe — relay deps include workspace siblings, so
 # scoping to -p buzz-relay misses transitive deps and re-builds them later.
@@ -66,8 +69,12 @@ RUN cargo chef cook --release --recipe-path recipe.json
 COPY . .
 RUN cargo build --release --locked -p buzz-relay --bin buzz-relay \
                                    -p buzz-admin --bin buzz-admin \
-                                   -p buzz-pair-relay --bin buzz-pair-relay \
-    && strip target/release/buzz-relay \
+                                   -p buzz-pair-relay --bin buzz-pair-relay
+
+# Derive the normal release binaries from the same optimized ELF files as the
+# debug image so the two variants cannot drift at code-generation time.
+FROM builder AS stripped-binaries
+RUN strip target/release/buzz-relay \
     && strip target/release/buzz-admin \
     && strip target/release/buzz-pair-relay
 
@@ -111,8 +118,8 @@ COPY web/ web/
 COPY admin-web/ admin-web/
 RUN pnpm -C web build && pnpm -C admin-web build
 
-# ─── Stage 5: runtime ───────────────────────────────────────────────────────
-FROM debian:${DEBIAN_VERSION}-slim AS runtime
+# ─── Stage 5: shared runtime ────────────────────────────────────────────────
+FROM debian:${DEBIAN_VERSION}-slim AS runtime-base
 
 # OCI annotations: required for GHCR to auto-link the image to this repo and
 # inherit its visibility. org.opencontainers.image.source is the load-bearing
@@ -135,9 +142,6 @@ RUN apt-get update \
     && useradd  --system --uid 1000 --gid 1000 --home-dir /var/lib/buzz \
                 --create-home --shell /usr/sbin/nologin buzz
 
-COPY --from=builder    /build/target/release/buzz-relay /usr/local/bin/buzz-relay
-COPY --from=builder    /build/target/release/buzz-admin /usr/local/bin/buzz-admin
-COPY --from=builder    /build/target/release/buzz-pair-relay /usr/local/bin/buzz-pair-relay
 COPY --from=web-builder /build/web/dist                 /srv/buzz/web
 COPY --from=web-builder /build/admin-web/dist           /srv/buzz/admin-web
 
@@ -157,3 +161,18 @@ USER buzz:buzz
 WORKDIR /var/lib/buzz
 
 ENTRYPOINT ["/usr/local/bin/buzz-relay"]
+
+# Optimized binaries with line-table debug information for native profiling.
+# Published under debug-* tags; runtime behavior otherwise matches the normal
+# image exactly.
+FROM runtime-base AS runtime-debug
+COPY --from=builder /build/target/release/buzz-relay /usr/local/bin/buzz-relay
+COPY --from=builder /build/target/release/buzz-admin /usr/local/bin/buzz-admin
+COPY --from=builder /build/target/release/buzz-pair-relay /usr/local/bin/buzz-pair-relay
+
+# Keep the stripped runtime as the final/default Dockerfile target so existing
+# `docker build .` callers and release tags retain their current behavior.
+FROM runtime-base AS runtime
+COPY --from=stripped-binaries /build/target/release/buzz-relay /usr/local/bin/buzz-relay
+COPY --from=stripped-binaries /build/target/release/buzz-admin /usr/local/bin/buzz-admin
+COPY --from=stripped-binaries /build/target/release/buzz-pair-relay /usr/local/bin/buzz-pair-relay
diff --git a/Justfile b/Justfile
index 701a1f06b2..bcef8983bc 100644
--- a/Justfile
+++ b/Justfile
@@ -620,11 +620,12 @@ mobile-check:
 mobile-test:
     unset GIT_DIR GIT_WORK_TREE; cd {{mobile_dir}} && flutter test
 
-# Compile an unsigned Android debug APK
+# Compile an unsigned Android debug APK (worktree-aware debug identity)
 mobile-build-android:
+    ./scripts/mobile-worktree-overrides.sh
     unset GIT_DIR GIT_WORK_TREE; cd {{mobile_dir}} && flutter build apk --debug --no-pub
 
-# Run the mobile app on iOS simulator
+# Run the mobile app on iOS simulator (worktree-aware debug identity)
 mobile-dev:
     #!/usr/bin/env bash
     set -euo pipefail
@@ -632,10 +633,15 @@ mobile-dev:
         open -a Simulator
         sleep 3
     fi
+    ./scripts/mobile-worktree-overrides.sh
     cd {{mobile_dir}}
     unset GIT_DIR GIT_WORK_TREE
     flutter run
 
+# Uninstall stale worktree-suffixed Buzz debug installs (production apps kept)
+mobile-clean:
+    ./scripts/mobile-worktree-clean.sh
+
 # ─── Database ─────────────────────────────────────────────────────────────────
 
 # Apply database migrations
diff --git a/README.md b/README.md
index 89a131e73e..72af92ce13 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ If you'd rather point buzz at a different bash-compatible shell, set `BUZZ_SHELL
 ┌─────────────────────────────────────────────────────────────────────────┐
 │                          buzz-relay                                     │
 │  NIP-01 · NIP-42 auth · channel/DM/media/workflow/git REST · audit log  │
-└───┬──────────────────────────┬──────────────────────────┬──────────────┘
+└───┬──────────────────────────┬──────────────────────────┬───────────────┘
     │                          │                          │
  ┌──▼───────────┐       ┌──────▼──────┐           ┌───────▼─────┐
  │   Postgres   │       │    Redis    │           │   S3/MinIO  │
diff --git a/RELEASING.md b/RELEASING.md
index 9785122aad..063b813e2c 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -57,10 +57,13 @@ or mobile GitHub Release.
 2. **Merge the PR.** `auto-tag-on-release-pr-merge` pushes
    `relay-v<version>`.
 3. **The tag triggers `docker.yml`.** Stable releases update the version
-   aliases and `latest`; prereleases do not.
+   aliases and `latest`; prereleases do not. Each release also publishes an
+   optimized, symbol-bearing image under matching `debug-` tags (for example,
+   `debug-0.3.0` and `debug-latest`) for native profiling. The ordinary tags
+   remain stripped and are the default for deployments that do not need it.
 
 Every push to `main` continues to publish the rolling relay `:main` and
-`:sha-<7>` tags.
+`:sha-<7>` tags, plus matching `:debug-main` and `:debug-sha-<7>` variants.
 
 ### Mobile
 
diff --git a/admin-web/src/App.tsx b/admin-web/src/App.tsx
index 49202e9778..f39ecc33c5 100644
--- a/admin-web/src/App.tsx
+++ b/admin-web/src/App.tsx
@@ -7,7 +7,12 @@ import {
   useState,
 } from "react";
 import { ApiFailure, request } from "./api";
-import type { FeedbackDetail, FeedbackSummary, Report } from "./types";
+import type {
+  FeedbackDetail,
+  FeedbackSummary,
+  Report,
+  ReportDetail as ReportDetailData,
+} from "./types";
 import { useResource } from "./useResource";
 
 function usePath() {
@@ -131,7 +136,10 @@ function Reports() {
 }
 
 function ReportDetail({ id }: { id: string }) {
-  const resource = useResource(() => request<Report>(`/reports/${id}`), id);
+  const resource = useResource(
+    () => request<ReportDetailData>(`/reports/${id}`),
+    id,
+  );
   return (
     <Page
       eyebrow="Moderation"
@@ -164,6 +172,32 @@ function ReportDetail({ id }: { id: string }) {
               <dd>
                 <code>{report.target}</code>
               </dd>
+              {report.targetKind === "event" ? (
+                <>
+                  <dt>Message</dt>
+                  <dd>
+                    {report.message ? (
+                      <div className="reported-message">
+                        {report.message.deletedAt ? (
+                          <span className="status">Deleted</span>
+                        ) : null}
+                        <p>{report.message.content}</p>
+                        <div className="reported-message-meta">
+                          <span>Author</span>
+                          <code>{report.message.authorPubkey}</code>
+                          <span>Created</span>
+                          <time>{date(report.message.createdAt)}</time>
+                        </div>
+                      </div>
+                    ) : (
+                      <p className="message-unavailable">
+                        Message content is unavailable. It may have expired or
+                        been removed from event storage.
+                      </p>
+                    )}
+                  </dd>
+                </>
+              ) : null}
               <dt>Note</dt>
               <dd className="sensitive">
                 {report.note ?? "No note provided."}
diff --git a/admin-web/src/styles.css b/admin-web/src/styles.css
index f72747c0a7..93ebceeb14 100644
--- a/admin-web/src/styles.css
+++ b/admin-web/src/styles.css
@@ -496,6 +496,38 @@ dd {
   margin: 0;
 }
 
+.reported-message {
+  display: grid;
+  justify-items: start;
+  gap: 1rem;
+  border-left: 3px solid #d7d72e;
+  border-radius: 0 0.8rem 0.8rem 0;
+  background: #f6f6f1;
+  padding: 1rem;
+}
+
+.reported-message p,
+.message-unavailable {
+  margin: 0;
+  overflow-wrap: anywhere;
+  line-height: 1.5;
+  white-space: pre-wrap;
+}
+
+.reported-message-meta {
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr);
+  gap: 0.4rem 0.75rem;
+  width: 100%;
+  color: rgb(35 30 30 / 48%);
+  font-size: 0.78rem;
+}
+
+.message-unavailable {
+  color: rgb(35 30 30 / 60%);
+  font-style: italic;
+}
+
 .sensitive {
   border-left: 3px solid #d7d72e;
   border-radius: 0 0.8rem 0.8rem 0;
diff --git a/admin-web/src/types.ts b/admin-web/src/types.ts
index 1aab0cb9ac..6c10837758 100644
--- a/admin-web/src/types.ts
+++ b/admin-web/src/types.ts
@@ -12,6 +12,17 @@ export interface Report {
   createdAt: string;
 }
 
+export interface ReportedMessage {
+  authorPubkey: string;
+  content: string;
+  createdAt: string;
+  deletedAt: string | null;
+}
+
+export interface ReportDetail extends Report {
+  message: ReportedMessage | null;
+}
+
 export interface FeedbackSummary {
   id: string;
   communityId: string;
diff --git a/admin-web/tests/routes.spec.ts b/admin-web/tests/routes.spec.ts
index 002ce456b3..3c965dd2d8 100644
--- a/admin-web/tests/routes.spec.ts
+++ b/admin-web/tests/routes.spec.ts
@@ -58,6 +58,72 @@ test("report rows render the relay response contract", async ({ page }) => {
   await expect(page.getByText("Unknown date")).toHaveCount(0);
 });
 
+test("event report detail renders the reported message content", async ({
+  page,
+}) => {
+  const id = "0e6caad8-1e18-4cd7-84fa-7264103f0a08";
+  await page.route(`**/api/admin/v1/reports/${id}`, (route) =>
+    route.fulfill({
+      contentType: "application/json",
+      body: JSON.stringify({
+        id,
+        communityId: "6d474feb-c50a-44e4-a0b5-f30532df49bc",
+        communityHost: "design.buzz.xyz",
+        reporterPubkey: "21".repeat(32),
+        targetKind: "event",
+        target: "12".repeat(32),
+        reportType: "spam",
+        status: "open",
+        createdAt: "2026-07-17T17:30:00Z",
+        message: {
+          authorPubkey: "31".repeat(32),
+          content:
+            "This is the complete reported message.\nIt preserves lines.",
+          createdAt: "2026-07-17T17:25:00Z",
+          deletedAt: null,
+        },
+      }),
+    }),
+  );
+
+  await page.goto(`/reports/${id}`);
+  await expect(
+    page.getByText("This is the complete reported message.", { exact: false }),
+  ).toBeVisible();
+  await expect(page.getByText("31".repeat(32))).toBeVisible();
+  await expect(
+    page.getByText("Message content is unavailable", { exact: false }),
+  ).toHaveCount(0);
+});
+
+test("event report detail explains when message content is unavailable", async ({
+  page,
+}) => {
+  const id = "0e6caad8-1e18-4cd7-84fa-7264103f0a09";
+  await page.route(`**/api/admin/v1/reports/${id}`, (route) =>
+    route.fulfill({
+      contentType: "application/json",
+      body: JSON.stringify({
+        id,
+        communityId: "6d474feb-c50a-44e4-a0b5-f30532df49bc",
+        communityHost: "design.buzz.xyz",
+        reporterPubkey: "21".repeat(32),
+        targetKind: "event",
+        target: "12".repeat(32),
+        reportType: "spam",
+        status: "open",
+        createdAt: "2026-07-17T17:30:00Z",
+        message: null,
+      }),
+    }),
+  );
+
+  await page.goto(`/reports/${id}`);
+  await expect(
+    page.getByText("Message content is unavailable", { exact: false }),
+  ).toBeVisible();
+});
+
 test("feedback cards open the complete submission", async ({ page }) => {
   const id = "feed0000-0000-4000-8000-000000000001";
   const fullBody = `${"Long feedback ".repeat(30)}end of feedback`;
diff --git a/benchmarks/harbor-buzz-orchestra/scripts/benchmark.py b/benchmarks/harbor-buzz-orchestra/scripts/benchmark.py
index f1e91d022b..b6f5601a82 100755
--- a/benchmarks/harbor-buzz-orchestra/scripts/benchmark.py
+++ b/benchmarks/harbor-buzz-orchestra/scripts/benchmark.py
@@ -84,51 +84,75 @@ def parse_args(argv: list[str] | None = None) -> argparse.Namespace:
     )
     problems = parser.add_mutually_exclusive_group()
     problems.add_argument(
-        "--dataset", "-d", default=None,
+        "--dataset",
+        "-d",
+        default=None,
         help=f"Registry dataset (default: {DEFAULT_DATASET})",
     )
     problems.add_argument(
         "--path", "-p", type=Path, help="Local task or dataset directory"
     )
     parser.add_argument(
-        "--include-task", "-i", action="append", default=[],
+        "--include-task",
+        "-i",
+        action="append",
+        default=[],
         help="Task name to include (glob, repeatable)",
     )
     parser.add_argument(
-        "--exclude-task", "-x", action="append", default=[],
+        "--exclude-task",
+        "-x",
+        action="append",
+        default=[],
         help="Task name to exclude (glob, repeatable)",
     )
     parser.add_argument(
-        "--attempts", "-k", type=int, default=DEFAULT_ATTEMPTS,
+        "--attempts",
+        "-k",
+        type=int,
+        default=DEFAULT_ATTEMPTS,
         help=f"Runs per problem (default: {DEFAULT_ATTEMPTS}, the leaderboard requirement)",
     )
     parser.add_argument(
-        "--manifest", type=Path, default=DEFAULT_MANIFEST,
+        "--manifest",
+        type=Path,
+        default=DEFAULT_MANIFEST,
         help=f"Team manifest YAML (default: {DEFAULT_MANIFEST.name})",
     )
     parser.add_argument(
-        "--endpoint-config", type=Path, default=DEFAULT_ENDPOINTS,
+        "--endpoint-config",
+        type=Path,
+        default=DEFAULT_ENDPOINTS,
         help=f"Endpoint provider/API-key mapping (default: {DEFAULT_ENDPOINTS.name})",
     )
-    parser.add_argument("--n-concurrent", "-n", type=int, default=4, help="Concurrent trials")
+    parser.add_argument(
+        "--n-concurrent", "-n", type=int, default=4, help="Concurrent trials"
+    )
     parser.add_argument(
         "--jobs-dir", type=Path, default=PACKAGE_ROOT / "jobs", help="Job output root"
     )
-    parser.add_argument("--job-name", default=None, help="Job name (default: lb-<condition>-<UTC>)")
     parser.add_argument(
-        "--upload", action="store_true", help="Upload to Harbor Hub when the job finishes"
+        "--job-name", default=None, help="Job name (default: lb-<condition>-<UTC>)"
     )
     parser.add_argument(
-        "--gui", action="store_true",
+        "--upload",
+        action="store_true",
+        help="Upload to Harbor Hub when the job finishes",
+    )
+    parser.add_argument(
+        "--gui",
+        action="store_true",
         help="Open the Buzz desktop app as the benchmark user to watch the run live",
     )
     parser.add_argument(
-        "--fresh", action="store_true",
+        "--fresh",
+        action="store_true",
         help="Reset first: drop the stack's Docker volumes and the benchmark "
-             "GUI's app state (keys in state.json are kept)",
+        "GUI's app state (keys in state.json are kept)",
     )
     parser.add_argument(
-        "--dry-run", action="store_true",
+        "--dry-run",
+        action="store_true",
         help="Print the underlying harbor command and exit (no stack bring-up)",
     )
     return parser.parse_args(argv)
@@ -153,7 +177,6 @@ def load_state() -> dict[str, str]:
             "user_secret_key": user.secret_key,
             "postgres_password": secrets.token_urlsafe(24),
             "redis_password": secrets.token_urlsafe(24),
-            "typesense_api_key": secrets.token_hex(16),
             "s3_access_key": secrets.token_hex(10),
             "s3_secret_key": secrets.token_hex(20),
             "git_hook_hmac_secret": secrets.token_hex(32),
@@ -202,7 +225,6 @@ def write_env_file(state: dict[str, str]) -> Path:
         "POSTGRES_USER": "buzz",
         "POSTGRES_PASSWORD": state["postgres_password"],
         "REDIS_PASSWORD": state["redis_password"],
-        "TYPESENSE_API_KEY": state["typesense_api_key"],
         "BUZZ_S3_ACCESS_KEY": state["s3_access_key"],
         "BUZZ_S3_SECRET_KEY": state["s3_secret_key"],
         "BUZZ_S3_BUCKET": "buzz-media",
@@ -217,14 +239,11 @@ def write_env_file(state: dict[str, str]) -> Path:
 
 def postgres_dsn(state: dict[str, str]) -> str:
     return (
-        f"postgresql://buzz:{state['postgres_password']}"
-        f"@127.0.0.1:{PG_HOST_PORT}/buzz"
+        f"postgresql://buzz:{state['postgres_password']}@127.0.0.1:{PG_HOST_PORT}/buzz"
     )
 
 
-def write_provisioner_config(
-    state: dict[str, str], endpoint_config: Path
-) -> Path:
+def write_provisioner_config(state: dict[str, str], endpoint_config: Path) -> Path:
     """Resolve per-endpoint API keys from the environment and write the
     provisioner config: pinned user, keep-channels teardown."""
     endpoints = json.loads(endpoint_config.read_text())
@@ -262,10 +281,14 @@ def write_provisioner_config(
 
 def compose_command(*args: str) -> list[str]:
     command = [
-        "docker", "compose",
-        "--project-name", COMPOSE_PROJECT,
-        "--project-directory", str(STATE_DIR),
-        "--env-file", str(STATE_DIR / ".env"),
+        "docker",
+        "compose",
+        "--project-name",
+        COMPOSE_PROJECT,
+        "--project-directory",
+        str(STATE_DIR),
+        "--env-file",
+        str(STATE_DIR / ".env"),
     ]
     for file in COMPOSE_FILES:
         command += ["-f", str(file)]
@@ -360,7 +383,9 @@ def linux_triple() -> str:
     """The musl triple matching the Docker engine that runs task containers."""
     arch = subprocess.run(
         ["docker", "version", "--format", "{{.Server.Arch}}"],
-        capture_output=True, text=True, check=True,
+        capture_output=True,
+        text=True,
+        check=True,
     ).stdout.strip()
     try:
         return {
@@ -385,22 +410,32 @@ def ensure_agent_binaries() -> Path:
     targets = AGENT_BINARIES + (FORWARDER_BINARY,)
     if all((bin_dir / name).is_file() for name in targets):
         return bin_dir
-    print(f"Linux agent binaries missing — cross-building for {triple} "
-          f"in {RUST_IMAGE} (first run only, ~2 min)...")
+    print(
+        f"Linux agent binaries missing — cross-building for {triple} "
+        f"in {RUST_IMAGE} (first run only, ~2 min)..."
+    )
     LINUX_TARGET_DIR.mkdir(parents=True, exist_ok=True)
     (STATE_DIR / "cargo-registry").mkdir(exist_ok=True)
     packages = [arg for name in AGENT_BINARIES for arg in ("-p", name)]
     forwarder_src = FORWARDER_SOURCE.relative_to(REPO_ROOT)
     subprocess.run(
         [
-            "docker", "run", "--rm",
-            "-v", f"{REPO_ROOT}:/src:ro",
-            "-v", f"{LINUX_TARGET_DIR}:/target",
-            "-v", f"{STATE_DIR / 'cargo-registry'}:/usr/local/cargo/registry",
-            "-e", "CARGO_TARGET_DIR=/target",
-            "-w", "/src",
+            "docker",
+            "run",
+            "--rm",
+            "-v",
+            f"{REPO_ROOT}:/src:ro",
+            "-v",
+            f"{LINUX_TARGET_DIR}:/target",
+            "-v",
+            f"{STATE_DIR / 'cargo-registry'}:/usr/local/cargo/registry",
+            "-e",
+            "CARGO_TARGET_DIR=/target",
+            "-w",
+            "/src",
             RUST_IMAGE,
-            "sh", "-c",
+            "sh",
+            "-c",
             "apk add --no-cache musl-dev >/dev/null && "
             f"cargo build --release --locked --target {triple} "
             + " ".join(packages)
@@ -429,8 +464,13 @@ def launch_gui(state: dict[str, str]) -> subprocess.Popen:
     """
     subprocess.run(
         compose_command(
-            "exec", "-T", "relay",
-            "buzz-admin", "add-member", "--pubkey", state["user_pubkey"],
+            "exec",
+            "-T",
+            "relay",
+            "buzz-admin",
+            "add-member",
+            "--pubkey",
+            state["user_pubkey"],
         ),
         check=True,
     )
@@ -445,12 +485,20 @@ def launch_gui(state: dict[str, str]) -> subprocess.Popen:
         ["rustc", "-vV"], capture_output=True, text=True, check=True
     ).stdout
     triple = next(
-        line.split(": ", 1)[1] for line in target.splitlines() if line.startswith("host: ")
+        line.split(": ", 1)[1]
+        for line in target.splitlines()
+        if line.startswith("host: ")
     )
     sidecar_dir = desktop_dir / "src-tauri" / "binaries"
     sidecar_dir.mkdir(parents=True, exist_ok=True)
     binaries = ensure_binaries()
-    for name in ("buzz-acp", "buzz-agent", "buzz-dev-mcp", "git-credential-nostr", "buzz"):
+    for name in (
+        "buzz-acp",
+        "buzz-agent",
+        "buzz-dev-mcp",
+        "git-credential-nostr",
+        "buzz",
+    ):
         stub = sidecar_dir / f"{name}-{triple}"
         if not stub.exists():
             stub.touch()
@@ -498,21 +546,30 @@ def leaderboard_argv(
     for pattern in args.exclude_task:
         argv += ["--exclude-task", pattern]
     argv += [
-        "--attempts", str(args.attempts),
-        "--manifest", str(args.manifest),
-        "--endpoint-config", str(args.endpoint_config),
-        "--provisioner-config", str(provisioner_config),
-        "--agent-bin-dir", str(agent_bin_dir),
+        "--attempts",
+        str(args.attempts),
+        "--manifest",
+        str(args.manifest),
+        "--endpoint-config",
+        str(args.endpoint_config),
+        "--provisioner-config",
+        str(provisioner_config),
+        "--agent-bin-dir",
+        str(agent_bin_dir),
         # The relay as reachable from inside a task container: Docker's
         # host alias, bridged to the canonical localhost address by the
         # uploaded forwarder. Override the alias with
         # BUZZ_BENCHMARK_DOCKER_HOST if your engine exposes the host
         # differently.
         "--relay-gateway",
-        f"{os.environ.get('BUZZ_BENCHMARK_DOCKER_HOST', 'host.docker.internal')}"
-        f":{RELAY_HTTP_PORT}",
-        "--n-concurrent", str(args.n_concurrent),
-        "--jobs-dir", str(args.jobs_dir),
+        (
+            f"{os.environ.get('BUZZ_BENCHMARK_DOCKER_HOST', 'host.docker.internal')}"
+            f":{RELAY_HTTP_PORT}"
+        ),
+        "--n-concurrent",
+        str(args.n_concurrent),
+        "--jobs-dir",
+        str(args.jobs_dir),
     ]
     if args.job_name:
         argv += ["--job-name", args.job_name]
diff --git a/benchmarks/harbor-buzz-orchestra/scripts/run_leaderboard.py b/benchmarks/harbor-buzz-orchestra/scripts/run_leaderboard.py
index 6fd43ea6fb..6eaf8d6af0 100755
--- a/benchmarks/harbor-buzz-orchestra/scripts/run_leaderboard.py
+++ b/benchmarks/harbor-buzz-orchestra/scripts/run_leaderboard.py
@@ -45,64 +45,101 @@ AGENT_BINARIES = ("buzz-acp", "buzz-agent", "buzz-dev-mcp")
 # host-header tenant-bound, so agents must present its canonical Host).
 FORWARDER_BINARY = "relay-forwarder"
 
-PROVIDER_ORGS = {"anthropic": "Anthropic", "openai": "OpenAI", "databricks": "Databricks"}
+PROVIDER_ORGS = {
+    "anthropic": "Anthropic",
+    "openai": "OpenAI",
+    "databricks": "Databricks",
+}
 
 
 def parse_args(argv: list[str] | None = None) -> argparse.Namespace:
     parser = argparse.ArgumentParser(
-        description=__doc__.splitlines()[0], formatter_class=argparse.RawDescriptionHelpFormatter
+        description=__doc__.splitlines()[0],
+        formatter_class=argparse.RawDescriptionHelpFormatter,
     )
     problems = parser.add_mutually_exclusive_group(required=True)
     problems.add_argument(
-        "--dataset", "-d", help="Registry dataset (e.g. terminal-bench/terminal-bench-2-1)"
+        "--dataset",
+        "-d",
+        help="Registry dataset (e.g. terminal-bench/terminal-bench-2-1)",
     )
     problems.add_argument(
         "--path", "-p", type=Path, help="Local task or dataset directory"
     )
     parser.add_argument(
-        "--include-task", "-i", action="append", default=[],
+        "--include-task",
+        "-i",
+        action="append",
+        default=[],
         help="Task name to include from the dataset (glob, repeatable)",
     )
     parser.add_argument(
-        "--exclude-task", "-x", action="append", default=[],
+        "--exclude-task",
+        "-x",
+        action="append",
+        default=[],
         help="Task name to exclude from the dataset (glob, repeatable)",
     )
     parser.add_argument(
-        "--attempts", "-k", type=int, required=True,
+        "--attempts",
+        "-k",
+        type=int,
+        required=True,
         help="Runs per problem (leaderboards require 5)",
     )
-    parser.add_argument("--manifest", type=Path, required=True, help="Team manifest YAML")
     parser.add_argument(
-        "--endpoint-config", type=Path, required=True,
+        "--manifest", type=Path, required=True, help="Team manifest YAML"
+    )
+    parser.add_argument(
+        "--endpoint-config",
+        type=Path,
+        required=True,
         help="JSON mapping manifest endpoint names to providers/API keys",
     )
     parser.add_argument(
-        "--provisioner-config", type=Path, required=True,
+        "--provisioner-config",
+        type=Path,
+        required=True,
         help="JSON config for the Buzz relay/Postgres provisioner",
     )
     parser.add_argument(
-        "--buzz-bin-dir", type=Path, default=None,
+        "--buzz-bin-dir",
+        type=Path,
+        default=None,
         help="Directory with the host buzz CLI (default: repo target/release, then target/debug)",
     )
     parser.add_argument(
-        "--agent-bin-dir", type=Path, required=True,
+        "--agent-bin-dir",
+        type=Path,
+        required=True,
         help="Directory with Linux builds of buzz-acp/buzz-agent/buzz-dev-mcp "
         "to upload into each task container",
     )
     parser.add_argument(
-        "--relay-gateway", default="",
+        "--relay-gateway",
+        default="",
         help="host:port of the benchmark relay as reachable from inside the "
         "task container (e.g. host.docker.internal:3600). When set, a "
         "loopback forwarder from --agent-bin-dir bridges the canonical "
         "relay address to this gateway",
     )
-    parser.add_argument("--n-concurrent", "-n", type=int, default=4, help="Concurrent trials")
-    parser.add_argument("--jobs-dir", type=Path, default=Path("jobs"), help="Job output root")
-    parser.add_argument("--job-name", default=None, help="Job name (default: lb-<condition>-<UTC>)")
     parser.add_argument(
-        "--upload", action="store_true", help="Upload to Harbor Hub when the job finishes"
+        "--n-concurrent", "-n", type=int, default=4, help="Concurrent trials"
+    )
+    parser.add_argument(
+        "--jobs-dir", type=Path, default=Path("jobs"), help="Job output root"
+    )
+    parser.add_argument(
+        "--job-name", default=None, help="Job name (default: lb-<condition>-<UTC>)"
+    )
+    parser.add_argument(
+        "--upload",
+        action="store_true",
+        help="Upload to Harbor Hub when the job finishes",
+    )
+    parser.add_argument(
+        "--dry-run", action="store_true", help="Print the harbor command and exit"
     )
-    parser.add_argument("--dry-run", action="store_true", help="Print the harbor command and exit")
     return parser.parse_args(argv)
 
 
@@ -110,7 +147,9 @@ def find_binaries(bin_dir: Path | None) -> dict[str, Path]:
     candidates = (
         [bin_dir]
         if bin_dir is not None
-        else [PACKAGE_ROOT.parents[1] / "target" / kind for kind in ("release", "debug")]
+        else [
+            PACKAGE_ROOT.parents[1] / "target" / kind for kind in ("release", "debug")
+        ]
     )
     for candidate in candidates:
         found = {name: candidate / name for name in BINARIES}
@@ -146,11 +185,17 @@ def build_command(
     resource override would fail leaderboard static validation, so none are
     accepted or forwarded."""
     command = [
-        "harbor", "run", "--yes",
-        "--job-name", args.job_name,
-        "--jobs-dir", str(args.jobs_dir),
-        "-k", str(args.attempts),
-        "--n-concurrent", str(args.n_concurrent),
+        "harbor",
+        "run",
+        "--yes",
+        "--job-name",
+        args.job_name,
+        "--jobs-dir",
+        str(args.jobs_dir),
+        "-k",
+        str(args.attempts),
+        "--n-concurrent",
+        str(args.n_concurrent),
     ]
     if args.dataset:
         command += ["--dataset", args.dataset]
@@ -250,7 +295,7 @@ def main(argv: list[str] | None = None) -> int:
             f"{PACKAGE_ROOT / 'testbed'} {Path(__file__).resolve()} ..."
         )
 
-    result = subprocess.run(command)
+    result = subprocess.run(command, check=False)
     job_dir = args.jobs_dir / args.job_name
     if result.returncode != 0:
         print(f"harbor run failed (exit {result.returncode}); job dir: {job_dir}")
diff --git a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/__init__.py b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/__init__.py
index b423e8aa47..1b79d233b9 100644
--- a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/__init__.py
+++ b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/__init__.py
@@ -1,25 +1,25 @@
 """Buzz orchestra custom agent for Harbor."""
 
 from .agent import BuzzOrchestraAgent
-from .manifest import ExperimentManifest, ManifestError
-from .provisioning import AgentCredential, TrialHandle, TrialProvisioner
-from .runtime import OrchestraRuntime, RuntimeResult
 from .container_runtime import (
     BuzzContainerRuntime,
     EndpointLaunchConfig,
     RuntimeLaunchError,
 )
+from .manifest import ExperimentManifest, ManifestError
+from .provisioning import AgentCredential, TrialHandle, TrialProvisioner
+from .runtime import OrchestraRuntime, RuntimeResult
 
 __all__ = [
     "AgentCredential",
-    "BuzzOrchestraAgent",
     "BuzzContainerRuntime",
+    "BuzzOrchestraAgent",
     "EndpointLaunchConfig",
     "ExperimentManifest",
     "ManifestError",
     "OrchestraRuntime",
-    "RuntimeResult",
     "RuntimeLaunchError",
+    "RuntimeResult",
     "TrialHandle",
     "TrialProvisioner",
 ]
diff --git a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/agent.py b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/agent.py
index 6354e9a587..3d1c81364f 100644
--- a/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/agent.py
+++ b/benchmarks/harbor-buzz-orchestra/src/harbor_buzz_orchestra/agent.py
@@ -9,10 +9,10 @@ from harbor.agents.base import BaseAgent
 from harbor.environments.base import BaseEnvironment
 from harbor.models.agent.context import AgentContext
 
+from .container_runtime import BuzzContainerRuntime, EndpointLaunchConfig
 from .manifest import ExperimentManifest
 from .provisioning import TrialProvisioner
 from .runtime import OrchestraRuntime
-from .container_runtime import BuzzContainerRuntime, EndpointLaunchConfig
 
 
 class BuzzOrchestraAgent(BaseAgent):
@@ -83,7 +83,7 @@ class BuzzOrchestraAgent(BaseAgent):
         except (OSError, json.JSONDecodeError) as error:
             raise ValueError(f"cannot load JSON config {path}: {error}") from error
         if not isinstance(value, dict):
-            raise ValueError(f"JSON config {path} must contain an object")
+            raise TypeError(f"JSON config {path} must contain an object")
         return value
 
     @classmethod
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 3909f081f5..149a5295a7 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,6 @@ from .manifest import AgentClass, ExperimentManifest
 from .provisioning import AgentCredential, TrialHandle
 from .runtime import RuntimeResult
 
-
 DEFAULT_MAX_AGENT_ROUNDS = 32
 # Container-side layout for the uploaded Buzz stack.
 REMOTE_ROOT = "/opt/buzz"
@@ -128,12 +127,20 @@ class BuzzContainerRuntime:
             if forwarder is not None:
                 infra.append(forwarder)
             await self._buzz_json(
-                trial.user, trial, "users", "set-profile", "--name",
+                trial.user,
+                trial,
+                "users",
+                "set-profile",
+                "--name",
                 trial.user.agent_id,
             )
             for credential in trial.credentials:
                 await self._buzz_json(
-                    credential, trial, "users", "set-profile", "--name",
+                    credential,
+                    trial,
+                    "users",
+                    "set-profile",
+                    "--name",
                     credential.agent_id,
                 )
                 agents.append(
@@ -244,11 +251,17 @@ class BuzzContainerRuntime:
             ) from error
         forwarder = _Agent(
             AgentCredential(
-                agent_id="relay-forwarder", role="infra",
-                nostr_secret_key="", nostr_pubkey="", nostr_auth_tag="",
-                llm_endpoint="", llm_api_key="",
+                agent_id="relay-forwarder",
+                role="infra",
+                nostr_secret_key="",
+                nostr_pubkey="",
+                nostr_auth_tag="",
+                llm_endpoint="",
+                llm_api_key="",
             ),
-            pid, log, log,
+            pid,
+            log,
+            log,
         )
         deadline = asyncio.get_running_loop().time() + self.readiness_timeout_seconds
         while True:
@@ -418,9 +431,14 @@ class BuzzContainerRuntime:
                 await self._raise_for_dead_agents(environment, agents)
             polls += 1
             messages = await self._buzz_json(
-                trial.user, trial,
-                "messages", "get", "--channel", trial.channel_id,
-                "--limit", "100",
+                trial.user,
+                trial,
+                "messages",
+                "get",
+                "--channel",
+                trial.channel_id,
+                "--limit",
+                "100",
             )
             for message in messages:
                 if message.get("pubkey") == orchestrator.nostr_pubkey and str(
@@ -451,9 +469,7 @@ class BuzzContainerRuntime:
             )
 
     @staticmethod
-    async def _stop_agents(
-        environment: BaseEnvironment, agents: list[_Agent]
-    ) -> None:
+    async def _stop_agents(environment: BaseEnvironment, agents: list[_Agent]) -> None:
         """Terminate every process of the uploaded stack (acp, agent, mcp)."""
         if not agents:
             return
@@ -461,14 +477,14 @@ class BuzzContainerRuntime:
         # to exist in task images, the /proc filesystem is.
         sweep = (
             "for d in /proc/[0-9]*; do "
-            f"grep -aq {REMOTE_BIN} \"$d/cmdline\" 2>/dev/null "
-            "&& kill -TERM \"${d#/proc/}\" 2>/dev/null; done; true"
+            f'grep -aq {REMOTE_BIN} "$d/cmdline" 2>/dev/null '
+            '&& kill -TERM "${d#/proc/}" 2>/dev/null; done; true'
         )
         try:
             await environment.exec(sweep)
             await asyncio.sleep(2)
             await environment.exec(sweep.replace("-TERM", "-KILL"))
-        except Exception:  # noqa: BLE001 — environment may already be gone
+        except Exception:  # noqa: S110, BLE001 — environment may already be gone
             pass
 
     async def _collect_logs(
@@ -476,7 +492,7 @@ class BuzzContainerRuntime:
     ) -> None:
         try:
             await environment.download_dir(REMOTE_LOGS, trial_dir)
-        except Exception:  # noqa: BLE001 — best effort; env may be torn down
+        except Exception:  # noqa: S110, BLE001 — best effort; env may be torn down
             pass
 
     # -- Buzz CLI as the trial user / provisioning identities -------------------
@@ -506,9 +522,14 @@ class BuzzContainerRuntime:
         self, credential: AgentCredential, trial: TrialHandle, content: str
     ) -> None:
         await self._buzz_json(
-            credential, trial,
-            "messages", "send", "--channel", trial.channel_id,
-            "--content", content,
+            credential,
+            trial,
+            "messages",
+            "send",
+            "--channel",
+            trial.channel_id,
+            "--content",
+            content,
         )
 
     async def _buzz_json(
@@ -614,9 +635,11 @@ class BuzzContainerRuntime:
             "",
             f"You are `{credential.agent_id}` (pubkey `{credential.nostr_pubkey}`).",
             f"The team coordinates in Buzz channel `{trial.channel_id}`.",
-            f"Tasks come from the user `{trial.user.agent_id}` "
-            f"(pubkey `{trial.user.nostr_pubkey}`); address your final report "
-            "to them.",
+            (
+                f"Tasks come from the user `{trial.user.agent_id}` "
+                f"(pubkey `{trial.user.nostr_pubkey}`); address your final report "
+                "to them."
+            ),
             "",
             "| Name | Role | Pubkey |",
             "|------|------|--------|",
@@ -625,8 +648,7 @@ class BuzzContainerRuntime:
             if teammate.agent_id == credential.agent_id:
                 continue
             lines.append(
-                f"| {teammate.agent_id} | {teammate.role} "
-                f"| `{teammate.nostr_pubkey}` |"
+                f"| {teammate.agent_id} | {teammate.role} | `{teammate.nostr_pubkey}` |"
             )
         composed = persona + "\n".join(lines) + "\n"
         path = trial_dir / f"{credential.agent_id}.system-prompt.md"
diff --git a/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/buzz_cli.py b/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/buzz_cli.py
index ed2bb31cc9..bd11f193ca 100644
--- a/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/buzz_cli.py
+++ b/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/buzz_cli.py
@@ -38,6 +38,7 @@ class BuzzCli:
                 capture_output=True,
                 text=True,
                 timeout=self._timeout,
+                check=False,
                 env={
                     "BUZZ_RELAY_URL": self._relay_url,
                     "BUZZ_PRIVATE_KEY": self._secret_key,
diff --git a/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/provisioner.py b/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/provisioner.py
index cfda6b59fa..d8f380387d 100644
--- a/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/provisioner.py
+++ b/benchmarks/harbor-buzz-orchestra/testbed/src/harbor_buzz_testbed/provisioner.py
@@ -44,7 +44,7 @@ class TestbedConfig:
     archive_on_teardown: bool = True
 
 
-def provisioner_from_dict(config: dict[str, object]) -> "BuzzTrialProvisioner":
+def provisioner_from_dict(config: dict[str, object]) -> BuzzTrialProvisioner:
     """Harbor CLI factory for a JSON-decoded testbed configuration."""
     return BuzzTrialProvisioner(TestbedConfig(**config))
 
@@ -100,7 +100,7 @@ class BuzzTrialProvisioner:
         cli = self._cli_for(handle.credentials[0])
         try:
             cli.archive_channel(handle.channel_id)
-        except Exception as error:  # noqa: BLE001 — idempotent re-teardown
+        except Exception as error:
             if "archived" not in str(error).lower():
                 raise
         with psycopg.connect(self._config.postgres_dsn) as conn:
diff --git a/benchmarks/harbor-buzz-orchestra/testbed/tests/test_benchmark.py b/benchmarks/harbor-buzz-orchestra/testbed/tests/test_benchmark.py
index 2d88e339f5..e0c6d32ec4 100644
--- a/benchmarks/harbor-buzz-orchestra/testbed/tests/test_benchmark.py
+++ b/benchmarks/harbor-buzz-orchestra/testbed/tests/test_benchmark.py
@@ -37,8 +37,19 @@ def test_defaults_are_leaderboard_eligible():
 
 def test_selectors_pass_through():
     args = benchmark.parse_args(
-        ["--path", "/tmp/task", "-i", "cobol*", "-x", "flaky*", "-k", "1",
-         "--job-name", "smoke", "--dry-run"]
+        [
+            "--path",
+            "/tmp/task",
+            "-i",
+            "cobol*",
+            "-x",
+            "flaky*",
+            "-k",
+            "1",
+            "--job-name",
+            "smoke",
+            "--dry-run",
+        ]
     )
     argv = benchmark.leaderboard_argv(args, Path("p.json"), Path("b"))
     assert argv[argv.index("--path") + 1] == "/tmp/task"
@@ -59,11 +70,15 @@ def test_state_is_generated_once_and_reused(state_dir):
     assert "user_pubkey" not in stored  # derived, never persisted
 
 
-def test_provisioner_config_pins_user_and_keeps_channels(state_dir, tmp_path, monkeypatch):
+def test_provisioner_config_pins_user_and_keeps_channels(
+    state_dir, tmp_path, monkeypatch
+):
     monkeypatch.setenv("FAKE_KEY_ENV", "sk-test")
     endpoints = tmp_path / "endpoints.json"
     endpoints.write_text(
-        json.dumps({"model-a": {"provider": "anthropic", "api_key_env": "FAKE_KEY_ENV"}})
+        json.dumps(
+            {"model-a": {"provider": "anthropic", "api_key_env": "FAKE_KEY_ENV"}}
+        )
     )
     state = benchmark.load_state()
     path = benchmark.write_provisioner_config(state, endpoints)
@@ -78,7 +93,9 @@ def test_provisioner_config_pins_user_and_keeps_channels(state_dir, tmp_path, mo
     assert config["relay_http_url"].startswith("http://localhost:")
 
 
-def test_provisioner_config_missing_api_key_is_explicit(state_dir, tmp_path, monkeypatch):
+def test_provisioner_config_missing_api_key_is_explicit(
+    state_dir, tmp_path, monkeypatch
+):
     monkeypatch.delenv("MISSING_KEY_ENV", raising=False)
     endpoints = tmp_path / "endpoints.json"
     endpoints.write_text(
@@ -91,9 +108,7 @@ def test_provisioner_config_missing_api_key_is_explicit(state_dir, tmp_path, mon
 def test_env_file_wires_owner_and_ports(state_dir):
     state = benchmark.load_state()
     env_path = benchmark.write_env_file(state)
-    env = dict(
-        line.split("=", 1) for line in env_path.read_text().splitlines() if line
-    )
+    env = dict(line.split("=", 1) for line in env_path.read_text().splitlines() if line)
     assert env["RELAY_OWNER_PUBKEY"] == state["owner_pubkey"]
     assert env["BUZZ_HTTP_PORT"] == str(benchmark.RELAY_HTTP_PORT)
     assert env["BUZZ_PG_HOST_PORT"] == str(benchmark.PG_HOST_PORT)
diff --git a/benchmarks/harbor-buzz-orchestra/testbed/tests/test_keys.py b/benchmarks/harbor-buzz-orchestra/testbed/tests/test_keys.py
index 0f82578369..0ac794e0fa 100644
--- a/benchmarks/harbor-buzz-orchestra/testbed/tests/test_keys.py
+++ b/benchmarks/harbor-buzz-orchestra/testbed/tests/test_keys.py
@@ -6,6 +6,7 @@ import hashlib
 import json
 
 import coincurve
+
 from harbor_buzz_testbed.keys import (
     compute_auth_tag,
     encode_nsec,
@@ -21,8 +22,10 @@ RUST_TAG = [
     "auth",
     "f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9",
     "",
-    "20105c618d6e5d8f559cffb6f0d7a7b4f44f3a567e1be94c96378d45ac3625da"
-    "34c2e7357ea1d3ce980978334546b3e740c155e81b833ebe140d519d39ed8867",
+    (
+        "20105c618d6e5d8f559cffb6f0d7a7b4f44f3a567e1be94c96378d45ac3625da"
+        "34c2e7357ea1d3ce980978334546b3e740c155e81b833ebe140d519d39ed8867"
+    ),
 ]
 
 
diff --git a/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_live.py b/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_live.py
index 5a6b40d8cf..711b877ab4 100644
--- a/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_live.py
+++ b/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_live.py
@@ -14,6 +14,7 @@ import uuid
 
 import psycopg
 import pytest
+
 from harbor_buzz_testbed.buzz_cli import BuzzCli, BuzzCliError
 from harbor_buzz_testbed.provisioner import (
     BuzzTrialProvisioner,
diff --git a/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_unit.py b/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_unit.py
index 9620be4bc8..e784de5825 100644
--- a/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_unit.py
+++ b/benchmarks/harbor-buzz-orchestra/testbed/tests/test_provisioner_unit.py
@@ -7,6 +7,7 @@ import json
 
 import coincurve
 import pytest
+
 from harbor_buzz_testbed.provisioner import (
     BuzzTrialProvisioner,
     ProvisioningError,
@@ -17,13 +18,13 @@ OWNER_SECRET = "0" * 63 + "3"
 
 
 def config(**overrides) -> TestbedConfig:
-    defaults = dict(
-        relay_http_url="http://localhost:3000",
-        relay_ws_url="ws://host.docker.internal:3000",
-        owner_secret_key=OWNER_SECRET,
-        postgres_dsn="postgresql://unused",
-        llm_api_keys={"databricks/glm": "glm-key", "databricks/opus": "opus-key"},
-    )
+    defaults = {
+        "relay_http_url": "http://localhost:3000",
+        "relay_ws_url": "ws://host.docker.internal:3000",
+        "owner_secret_key": OWNER_SECRET,
+        "postgres_dsn": "postgresql://unused",
+        "llm_api_keys": {"databricks/glm": "glm-key", "databricks/opus": "opus-key"},
+    }
     defaults.update(overrides)
     return TestbedConfig(**defaults)
 
diff --git a/benchmarks/harbor-buzz-orchestra/tests/conftest.py b/benchmarks/harbor-buzz-orchestra/tests/conftest.py
index bd0bcaf2dd..b1de094d76 100644
--- a/benchmarks/harbor-buzz-orchestra/tests/conftest.py
+++ b/benchmarks/harbor-buzz-orchestra/tests/conftest.py
@@ -1,4 +1,5 @@
 from typing import Any
+
 import pytest
 
 
diff --git a/benchmarks/harbor-buzz-orchestra/tests/test_agent.py b/benchmarks/harbor-buzz-orchestra/tests/test_agent.py
index 62c6047ab3..b305344c51 100644
--- a/benchmarks/harbor-buzz-orchestra/tests/test_agent.py
+++ b/benchmarks/harbor-buzz-orchestra/tests/test_agent.py
@@ -1,7 +1,9 @@
 from types import SimpleNamespace
 from uuid import uuid4
+
 import pytest
 from harbor.models.agent.context import AgentContext
+
 from harbor_buzz_orchestra import (
     AgentCredential,
     BuzzOrchestraAgent,
@@ -73,9 +75,7 @@ class Runtime:
 
 async def test_agent_lifecycle_and_context(tmp_path, manifest_data):
     provisioner, runtime, context_id = Provisioner(), Runtime(), uuid4()
-    environment = SimpleNamespace(
-        context_id=context_id, environment_name="hello-world"
-    )
+    environment = SimpleNamespace(context_id=context_id, environment_name="hello-world")
     agent = BuzzOrchestraAgent(
         logs_dir=tmp_path,
         manifest=manifest_data,
diff --git a/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py b/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
index 8669fe980c..ebf0eb4b5d 100644
--- a/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
+++ b/benchmarks/harbor-buzz-orchestra/tests/test_container_runtime.py
@@ -8,8 +8,6 @@ from pathlib import Path
 import pytest
 from harbor.environments.base import ExecResult
 
-from harbor_buzz_orchestra.manifest import ExperimentManifest
-from harbor_buzz_orchestra.provisioning import AgentCredential, TrialHandle
 from harbor_buzz_orchestra.container_runtime import (
     REMOTE_BIN,
     REMOTE_LOGS,
@@ -17,6 +15,8 @@ from harbor_buzz_orchestra.container_runtime import (
     EndpointLaunchConfig,
     RuntimeLaunchError,
 )
+from harbor_buzz_orchestra.manifest import ExperimentManifest
+from harbor_buzz_orchestra.provisioning import AgentCredential, TrialHandle
 
 
 def write_manifest(tmp_path: Path) -> ExperimentManifest:
@@ -33,10 +33,20 @@ def write_manifest(tmp_path: Path) -> ExperimentManifest:
         {
             "condition": "test",
             "roster": [
-                {"id": "orch", "kind": "orchestrator", "role": "lead",
-                 "endpoint": "orch-model", **roster_entry},
-                {"id": "worker", "kind": "worker", "role": "implementer",
-                 "endpoint": "worker-model", **roster_entry},
+                {
+                    "id": "orch",
+                    "kind": "orchestrator",
+                    "role": "lead",
+                    "endpoint": "orch-model",
+                    **roster_entry,
+                },
+                {
+                    "id": "worker",
+                    "kind": "worker",
+                    "role": "implementer",
+                    "endpoint": "worker-model",
+                    **roster_entry,
+                },
             ],
             "prices": {
                 name: {
@@ -162,10 +172,7 @@ def test_user_relay_url_prefers_host_view(tmp_path):
         == "http://localhost:3600"
     )
     # pre-v1.2 handles fall back to deriving http from the agents' ws view.
-    assert (
-        rt._user_relay_url(trial_handle(()))
-        == "http://host.docker.internal:3600"
-    )
+    assert rt._user_relay_url(trial_handle(())) == "http://host.docker.internal:3600"
     with pytest.raises(RuntimeLaunchError, match="ws://"):
         rt._cli_relay_url("http://relay")
 
@@ -209,16 +216,21 @@ async def test_forwarder_bridges_the_canonical_relay_address(tmp_path):
         forwarder_binary=str(forwarder),
     )
     trial = TrialHandle(
-        run_id="run", trial_id="trial", manifest_hash="hash",
-        relay_ws_url="ws://localhost:3600", channel_id="channel",
-        credentials=(), user=user_credential(),
+        run_id="run",
+        trial_id="trial",
+        manifest_hash="hash",
+        relay_ws_url="ws://localhost:3600",
+        channel_id="channel",
+        credentials=(),
+        user=user_credential(),
     )
     environment = Environment(
         responses={
             FORWARDER: ExecResult(stdout="99\n", stderr="", return_code=0),
             "cat ": ExecResult(
                 stdout="forwarding 127.0.0.1:3600 -> host.docker.internal:3600",
-                stderr="", return_code=0,
+                stderr="",
+                return_code=0,
             ),
         }
     )
@@ -295,9 +307,7 @@ async def test_wait_for_agents_ready_requires_every_channel_subscription(tmp_pat
         async def exec(self, command, env=None, **kwargs):
             if command.startswith("cat "):
                 agent_id = re.search(r"([\w-]+)\.stdout\.log", command).group(1)
-                return ExecResult(
-                    stdout=logs[agent_id], stderr="", return_code=0
-                )
+                return ExecResult(stdout=logs[agent_id], stderr="", return_code=0)
             return ExecResult(stdout="", stderr="", return_code=0)
 
     from harbor_buzz_orchestra.container_runtime import _Agent
@@ -326,9 +336,7 @@ async def test_wait_for_agents_ready_requires_every_channel_subscription(tmp_pat
 async def test_dead_agent_processes_fail_the_trial(tmp_path):
     from harbor_buzz_orchestra.container_runtime import _Agent
 
-    agents = [
-        _Agent(credential("worker-1", "worker", "worker-model"), 7, "o", "e")
-    ]
+    agents = [_Agent(credential("worker-1", "worker", "worker-model"), 7, "o", "e")]
     environment = Environment(
         responses={
             "kill -0": ExecResult(stdout="DEAD:worker-1\n", stderr="", return_code=0)
diff --git a/benchmarks/harbor-buzz-orchestra/tests/test_manifest.py b/benchmarks/harbor-buzz-orchestra/tests/test_manifest.py
index 36533db3bf..f8230036b3 100644
--- a/benchmarks/harbor-buzz-orchestra/tests/test_manifest.py
+++ b/benchmarks/harbor-buzz-orchestra/tests/test_manifest.py
@@ -1,6 +1,8 @@
 import copy
+
 import pytest
 import yaml
+
 from harbor_buzz_orchestra import ExperimentManifest, ManifestError
 
 
diff --git a/benchmarks/harbor-buzz-orchestra/tests/test_run_leaderboard.py b/benchmarks/harbor-buzz-orchestra/tests/test_run_leaderboard.py
index ed048ee5d9..451de72e79 100644
--- a/benchmarks/harbor-buzz-orchestra/tests/test_run_leaderboard.py
+++ b/benchmarks/harbor-buzz-orchestra/tests/test_run_leaderboard.py
@@ -109,8 +109,16 @@ def test_forbidden_flags_are_not_accepted(tmp_path):
     for flag in FORBIDDEN_FLAGS:
         with pytest.raises(SystemExit):
             run_leaderboard.parse_args(
-                ["--dataset", "d", "--attempts", "5",
-                 "--agent-bin-dir", str(tmp_path), flag, "1"]
+                [
+                    "--dataset",
+                    "d",
+                    "--attempts",
+                    "5",
+                    "--agent-bin-dir",
+                    str(tmp_path),
+                    flag,
+                    "1",
+                ]
             )
 
 
diff --git a/bin/.node-24.14.0.pkg b/bin/.node-24.15.0.pkg
similarity index 100%
rename from bin/.node-24.14.0.pkg
rename to bin/.node-24.15.0.pkg
diff --git a/bin/corepack b/bin/corepack
index 07e8834efb..4df063726c 120000
--- a/bin/corepack
+++ b/bin/corepack
@@ -1 +1 @@
-.node-24.14.0.pkg
\ No newline at end of file
+.node-24.15.0.pkg
\ No newline at end of file
diff --git a/bin/node b/bin/node
index 07e8834efb..4df063726c 120000
--- a/bin/node
+++ b/bin/node
@@ -1 +1 @@
-.node-24.14.0.pkg
\ No newline at end of file
+.node-24.15.0.pkg
\ No newline at end of file
diff --git a/bin/npm b/bin/npm
index 07e8834efb..4df063726c 120000
--- a/bin/npm
+++ b/bin/npm
@@ -1 +1 @@
-.node-24.14.0.pkg
\ No newline at end of file
+.node-24.15.0.pkg
\ No newline at end of file
diff --git a/bin/npx b/bin/npx
index 07e8834efb..4df063726c 120000
--- a/bin/npx
+++ b/bin/npx
@@ -1 +1 @@
-.node-24.14.0.pkg
\ No newline at end of file
+.node-24.15.0.pkg
\ No newline at end of file
diff --git a/crates/buzz-acp/README.md b/crates/buzz-acp/README.md
index d9cd362cb8..e6164b02dd 100644
--- a/crates/buzz-acp/README.md
+++ b/crates/buzz-acp/README.md
@@ -25,13 +25,22 @@ export PATH="$PWD/target/release:$PATH"
 
 ## Generating Keys
 
-Each agent needs a Nostr keypair — this is the agent's identity in Buzz. Use `buzz-admin` to mint one:
+Each agent needs a Nostr keypair — this is the agent's identity in Buzz. Use `buzz-admin` to generate one:
 
 ```bash
-cargo run -p buzz-admin -- mint-token --name "my-agent" --scopes "messages:read,messages:write,channels:read"
+cargo run -p buzz-admin -- generate-key
 ```
 
-This prints an `nsec1...` private key and an API token. **Save both immediately — they're shown only once.**
+This prints a public and secret key pair as hex. **Save the secret key immediately — it is not stored and cannot be recovered.** Set `BUZZ_PRIVATE_KEY` to the secret key to act as this identity.
+
+Then register the agent's public key as a relay member so it can read and publish:
+
+```bash
+BUZZ_RELAY_PRIVATE_KEY=<relay signing key> \
+  cargo run -p buzz-admin -- add-member --pubkey <agent public key>
+```
+
+`add-member` publishes a kind:13534 membership event, so the relay needs a stable signing key: set `BUZZ_RELAY_PRIVATE_KEY` in the relay's environment (uncomment it in `.env`) and restart the relay before running this.
 
 > **Running multiple agents?** Mint a separate keypair for each. Every agent needs its own identity.
 
@@ -252,6 +261,65 @@ Each channel has at most one prompt in flight. Multiple channels can be processe
 
 > **Note:** On startup, the harness replays all unprocessed @mentions since the last run. Expect a burst of activity if there are stale events in the channel.
 
+## Bring Your Own Harness (BYOH)
+
+Buzz Desktop supports registering any ACP-speaking agent tool as a selectable runtime without a PR.
+
+### How it works
+
+**Tier-1 — compiled-in runtimes** (Goose, Claude Code, Codex, Buzz Agent): have auto-installers, auth probes, and first-class onboarding. Their IDs (`goose`, `claude`, `codex`, `buzz-agent`) are reserved and cannot be overridden.
+
+**Tier-2 — preset catalog** (Cursor, Oh My Pi, Grok Build, OpenCode, Kimi Code, Amp, Hermes Agent, OpenClaw): static `HarnessDefinition` entries in `desktop/src-tauri/src/managed_agents/discovery.rs` (`PRESET_HARNESSES`). They are always present in the runtime catalog, PATH-probed for availability, not editable or deletable by the user. Displayed with bundled logos; if not installed, a docs link appears instead.
+
+> **Note — OpenClaw:** `openclaw acp` is a Gateway-backed bridge; PATH availability shows "Available" even when the OpenClaw Gateway daemon is not running. This is expected tier-2 semantics (same class as a preset with unconfigured auth). The Gateway URL is configured via `OPENCLAW_GATEWAY_URL` (or the equivalent env var from OpenClaw's docs) — set it in the agent's **env vars** in Edit Agent, not in the definition env (the preset definition carries no env entries). Note that `openclaw acp` executes tools inside the Gateway daemon, not the Desktop process, so Desktop-injected `BUZZ_*` env vars do NOT reach the execution locus unless you also set them on the Gateway's own environment.
+
+**Tier-3 — user custom harnesses**: JSON files in `<app-data>/custom_harnesses/` that the user can create from the Settings UI or drop in directly. Each file describes one harness — no install scripts.
+
+### Custom harness JSON schema
+
+```json
+{
+  "id": "my-agent",
+  "label": "My Agent",
+  "command": "my-agent-bin",
+  "args": ["acp"],
+  "env": {
+    "MY_AGENT_MODE": "acp"
+  },
+  "installInstructionsUrl": "https://example.com/docs",
+  "installHint": "Download from example.com"
+}
+```
+
+Fields:
+- `id` — `[a-z0-9_][a-z0-9_-]*` (used as the runtime picker value and file name)
+- `label` — human-readable name shown in the UI
+- `command` — the executable name or absolute path (must be non-empty)
+- `args` — optional default CLI arguments (array); instance-level args override this when non-empty
+- `env` — optional environment variables injected at spawn time (definition env is a floor; user/persona/global env overrides it; Buzz-reserved keys like `BUZZ_MANAGED_AGENT` are always stripped and cannot be overridden)
+- `installInstructionsUrl` / `installHint` — shown when the binary is not on PATH
+
+Invalid files (bad JSON, unknown id, empty command) are skipped with a warning and do not break discovery for other entries.
+
+### Security guarantees
+
+- No install shell commands in preset or custom definitions — only the user's own PATH is consulted.
+- `can_auto_install` is always `false` for preset and custom entries.
+- No user-supplied icon URLs — icons are bundled assets keyed by id in `RuntimeIcon.tsx`.
+- `BUZZ_MANAGED_AGENT` and other Buzz identity keys cannot be overridden by `env` in a custom definition; they are stripped before merging.
+
+### Adding a preset (contributor guide)
+
+To add a new runtime to the tier-2 gallery:
+
+1. **Verify the ACP entrypoint** from the vendor's own documentation — do not rely on a PR description alone. Test with the actual binary.
+2. **Add a `HarnessDefinition` entry** to the `PRESET_HARNESSES` slice in `desktop/src-tauri/src/managed_agents/discovery.rs`. Fill `id`, `label`, `command`, `args`, `install_instructions_url`, `install_hint`. Leave `env` empty unless the harness requires a specific env var to enable ACP mode.
+3. **Add the preset id to `BUILTIN_IDS`** in `desktop/src-tauri/src/managed_agents/custom_harnesses.rs` so custom JSON files cannot shadow it.
+4. **Add a bundled logo** (64×64 PNG or optimised SVG) to `desktop/public/harness-logos/<id>.png` and add a corresponding entry to `PRESET_LOGOS` in `desktop/src/features/onboarding/ui/RuntimeIcon.tsx`. Record the source and license in `desktop/public/harness-logos/CREDITS.md`. Only bundle a mark whose upstream license permits redistribution; skipping this step is caught by `presetLogos.test.mjs`, which asserts every `PRESET_HARNESSES` id has a mapped logo that exists on disk.
+5. Run `cargo test --lib` and `just desktop-typecheck` to verify everything compiles.
+
+The built-in `BUILTIN_IDS` set (`goose`, `claude`, `codex`, `buzz-agent`, and all current preset ids) is the reserved namespace; every other id is available for custom harnesses.
+
 ## Using Any ACP Agent
 
 The harness works with any agent that implements the [ACP spec](https://agentclientprotocol.com/) over stdio. The requirements are:
diff --git a/crates/buzz-acp/src/acp.rs b/crates/buzz-acp/src/acp.rs
index 78db7ff718..8a698954a0 100644
--- a/crates/buzz-acp/src/acp.rs
+++ b/crates/buzz-acp/src/acp.rs
@@ -187,6 +187,17 @@ pub struct AcpClient {
     /// Other agents may leave this unset — readers must treat `None` as
     /// "no active run to steer into" and fall back to cancel+merge.
     active_run_id: Option<String>,
+    /// Whether the agent advertised `_meta.steering.supported: true` in its
+    /// `initialize` response, meaning it implements the cross-adapter
+    /// [`ACP_STEER_METHOD`] extension.
+    ///
+    /// Set once by [`initialize`](Self::initialize); `false` for agents that
+    /// omit the key. This is the **only** gate on writing an
+    /// [`ACP_STEER_METHOD`] request. It must never be replaced by error-code
+    /// probing: codex-acp answers unrecognized extension methods with `{}` —
+    /// a JSON-RPC *success*, not `-32601` — which the main loop would read as
+    /// a delivered steer and drop the user's message from the queue.
+    steering_supported: bool,
     /// Per-turn channel for receiving goose-native non-cancelling steer
     /// requests from the main loop. Installed by
     /// [`install_steer_rx`](Self::install_steer_rx) at dispatch and
@@ -344,6 +355,38 @@ pub(crate) fn build_codex_config_env(
     Ok(Some(serde_json::Value::Object(base).to_string()))
 }
 
+/// goose's non-standard mid-turn steer method. Requires `expectedRunId`, so it
+/// is only usable once a `session_info_update` has supplied
+/// `_meta.goose.activeRunId`. Emitted by goose and buzz-agent only.
+const GOOSE_STEER_METHOD: &str = "_goose/unstable/session/steer";
+
+/// The cross-adapter mid-turn steer method, shipped by claude-agent-acp
+/// (`src/acp-agent.ts:200`) and codex-acp (`src/AcpExtensions.ts:11`).
+/// Params are `{sessionId, prompt}` — no run id — and the result is
+/// `{outcome}`. Gated on [`AcpClient::steering_supported`].
+const ACP_STEER_METHOD: &str = "_session/steering";
+
+/// `outcome` value meaning the steer was applied to the turn Buzz is waiting
+/// on, which therefore keeps running.
+const STEER_OUTCOME_INJECTED: &str = "injected";
+
+/// `outcome` value meaning the turn Buzz was steering had already finished, so
+/// the adapter began a fresh turn carrying the message. Still a delivery
+/// success, but the awaited turn is over — see the steer-response arm for why
+/// this must not renew the hard deadline.
+const STEER_OUTCOME_STARTED_NEW_TURN: &str = "startedNewTurn";
+
+/// Which wire method carried an in-flight steer request, recorded so the
+/// response arm decodes the shape that method actually returns.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum SteerTransport {
+    /// [`GOOSE_STEER_METHOD`] — any success result is a delivered steer.
+    Goose,
+    /// [`ACP_STEER_METHOD`] — success carries an `outcome` that must be
+    /// positively recognized before the steer counts as delivered.
+    AcpExtension,
+}
+
 fn build_client_capabilities() -> serde_json::Value {
     serde_json::json!({
         // Signal to ACP adapters that Buzz can hand users to terminal-native
@@ -447,12 +490,22 @@ impl AcpClient {
         // entry falls through to the standard operator-wins treatment below.
         let codex_merge_active = codex_config_value.is_some();
 
+        // Per-runtime environment defaults (e.g. Hermes MCP-startup isolation).
+        // Applied first so both persona `extra_env` (below, via `Command::env`
+        // key replacement) and inherited parent env (via the parent-presence
+        // check) override them.
+        for &(key, value) in crate::config::default_agent_env(command) {
+            if std::env::var_os(key).is_none() {
+                cmd.env(key, value);
+            }
+        }
+
         for (key, value) in extra_env {
             if key == "CODEX_CONFIG" && codex_merge_active {
                 // Handled by build_codex_config_env; skip here to avoid double-setting.
                 continue;
             }
-            if std::env::var(key).is_err() {
+            if std::env::var_os(key).is_none() {
                 cmd.env(key, value);
             }
         }
@@ -494,6 +547,7 @@ impl AcpClient {
             observer_agent_index: None,
             observer_context: ObserverContext::default(),
             active_run_id: None,
+            steering_supported: false,
             steer_rx: None,
             goose_usage: UsageTracker::default(),
         })
@@ -536,11 +590,20 @@ impl AcpClient {
     ///
     /// Must be called exactly once, before any other ACP method.
     /// The caller may inspect `agentCapabilities` in the returned value.
+    ///
+    /// Records `_meta.steering.supported` into
+    /// [`steering_supported`](Self::steering_supported) so the read loop's steer
+    /// arm can choose [`ACP_STEER_METHOD`] for adapters that implement it.
+    /// Parsed here rather than at each call site so no caller can forget it.
     pub async fn initialize(&mut self) -> Result<serde_json::Value, AcpError> {
         // Requesting version 2 is an intentional temporary pin — we are squatting
         // on ACP v2 ahead of the upstream ACP RFD. Revisit when that RFD merges.
         let params = build_initialize_params();
         let result = self.send_request("initialize", params).await?;
+        self.steering_supported = result
+            .pointer("/_meta/steering/supported")
+            .and_then(|v| v.as_bool())
+            .unwrap_or(false);
         tracing::debug!(target: "acp::init", "initialize response: {result}");
         Ok(result)
     }
@@ -558,6 +621,9 @@ impl AcpClient {
     /// `cwd` must be an absolute path. `mcp_servers` may be empty.
     /// `system_prompt` is included in the request when `Some` — agents that
     /// support the field will use it; others ignore unknown fields per JSON-RPC.
+    /// `session_title` rides in `_meta.sessionTitle` when `Some`; `_meta` is
+    /// omitted entirely otherwise, since adapters may distinguish an absent
+    /// member from a null one.
     /// Callers use [`extract_model_config_options`] and [`extract_model_state`]
     /// to pull model info from the raw result.
     pub async fn session_new_full(
@@ -565,6 +631,7 @@ impl AcpClient {
         cwd: &str,
         mcp_servers: Vec<McpServer>,
         system_prompt: Option<&str>,
+        session_title: Option<&str>,
     ) -> Result<SessionNewResponse, AcpError> {
         let mut params = serde_json::json!({
             "cwd": cwd,
@@ -573,6 +640,9 @@ impl AcpClient {
         if let Some(sp) = system_prompt {
             params["systemPrompt"] = serde_json::Value::String(sp.to_owned());
         }
+        if let Some(title) = session_title {
+            params["_meta"] = serde_json::json!({ "sessionTitle": title });
+        }
         let result = self.send_request("session/new", params).await?;
         let session_id = result["sessionId"]
             .as_str()
@@ -594,9 +664,10 @@ impl AcpClient {
         cwd: &str,
         mcp_servers: Vec<McpServer>,
         system_prompt: Option<&str>,
+        session_title: Option<&str>,
     ) -> Result<String, AcpError> {
         Ok(self
-            .session_new_full(cwd, mcp_servers, system_prompt)
+            .session_new_full(cwd, mcp_servers, system_prompt, session_title)
             .await?
             .session_id)
     }
@@ -770,6 +841,15 @@ impl AcpClient {
         self.active_run_id.as_deref()
     }
 
+    /// Whether the agent advertised the [`ACP_STEER_METHOD`] extension at
+    /// `initialize` time (`_meta.steering.supported`).
+    ///
+    /// The read loop's steer arm reads the field directly; this accessor exists
+    /// for the supervisor's post-initialize log line.
+    pub fn steering_supported(&self) -> bool {
+        self.steering_supported
+    }
+
     /// Consume and return the per-turn usage record computed from the most
     /// recent `_goose/unstable/session/update` notification.
     ///
@@ -1211,14 +1291,18 @@ impl AcpClient {
         // so the ack_tx oneshot is never leaked silently).
         let mut steer_rx = self.steer_rx.take();
 
-        // Tracks the in-flight steer write: `(request_id, ack_tx)`. While
-        // `Some`, the steer arm is gated off so we don't stack writes,
+        // Tracks the in-flight steer write: `(request_id, transport, ack_tx)`.
+        // While `Some`, the steer arm is gated off so we don't stack writes,
         // and a response matching `id` is routed to the ack_tx instead
-        // of being treated as the prompt result. Drained on every return
-        // path with `PromptCompletedNeutral` so callers are never left
-        // hanging.
-        let mut pending_steer: Option<(u64, tokio::sync::oneshot::Sender<crate::pool::SteerAck>)> =
-            None;
+        // of being treated as the prompt result. `transport` records which
+        // method was written so the response arm decodes the result shape
+        // that method actually returns. Drained on every return path with
+        // `PromptCompletedNeutral` so callers are never left hanging.
+        let mut pending_steer: Option<(
+            u64,
+            SteerTransport,
+            tokio::sync::oneshot::Sender<crate::pool::SteerAck>,
+        )> = None;
 
         let now = Instant::now();
         let mut idle_deadline = now + idle_timeout;
@@ -1243,7 +1327,7 @@ impl AcpClient {
             // exists). Check the classified deadline here so a steady-
             // stream agent is still bounded.
             if Instant::now() >= next_deadline {
-                if let Some((_, ack_tx)) = pending_steer.take() {
+                if let Some((_, _, ack_tx)) = pending_steer.take() {
                     // Prompt is timing out — release the withheld event via
                     // PromptCompletedNeutral (no fallback signal: there is
                     // no in-flight turn to signal once we return, and
@@ -1278,39 +1362,64 @@ impl AcpClient {
                         None => None,
                     }
                 }, if pending_steer.is_none() => {
-                    // Selected: build steer params at write time using the
-                    // lexical `session_id` and the freshest `active_run_id`.
+                    // Selected: choose the steer transport and build its
+                    // params at write time using the lexical `session_id`
+                    // and the freshest `active_run_id`.
                     //
                     // `active_run_id` is updated by `session/update`
                     // notifications inside this very loop; reading it here
                     // (rather than snapshotting at dispatch) guarantees the
                     // value matches what goose's run-id check will compare
-                    // against. If it's `None`, no `session/update` has
-                    // arrived yet so we cannot form a valid `expectedRunId`
-                    // — ack `ExpectedRunIdMissing` and drop the request
-                    // without writing anything. The main loop maps this to
-                    // the universal cancel+merge `Steer` fallback.
-                    match self.active_run_id.clone() {
+                    // against.
+                    //
+                    // Transport precedence:
+                    //   Some(run_id)              → GOOSE_STEER_METHOD. goose
+                    //     wins whenever a run id exists: `expectedRunId` is
+                    //     strictly more precise about *which* run is steered.
+                    //   None + steering_supported → ACP_STEER_METHOD, the
+                    //     cross-adapter extension (claude-agent-acp,
+                    //     codex-acp), which takes no run id.
+                    //   None + !steering_supported → write nothing and ack
+                    //     `ExpectedRunIdMissing`; the main loop maps this to
+                    //     the universal cancel+merge `Steer` fallback.
+                    //
+                    // The capability flag is the ONLY gate on writing
+                    // ACP_STEER_METHOD. Probing an unknown method is unsafe:
+                    // codex-acp answers unrecognized extension methods with
+                    // `{}` — a JSON-RPC success — which would be read as a
+                    // delivered steer and silently drop the user's message.
+                    let prompt_block_refs: Vec<&str> =
+                        req.prompt_blocks.iter().map(String::as_str).collect();
+                    let selected = match (&self.active_run_id, self.steering_supported) {
+                        (Some(run_id), _) => Some((
+                            SteerTransport::Goose,
+                            GOOSE_STEER_METHOD,
+                            build_goose_steer_params(session_id, run_id, &prompt_block_refs),
+                        )),
+                        (None, true) => Some((
+                            SteerTransport::AcpExtension,
+                            ACP_STEER_METHOD,
+                            build_acp_steer_params(session_id, &prompt_block_refs),
+                        )),
+                        (None, false) => None,
+                    };
+                    match selected {
                         None => {
                             tracing::warn!(
-                                "goose-native steer: no active_run_id at write time \
-                                 (no session/update seen yet) — falling back to cancel+merge"
+                                "steer: no active_run_id and agent did not advertise \
+                                 {ACP_STEER_METHOD} — falling back to cancel+merge"
                             );
                             let _ = req.ack_tx.send(crate::pool::SteerAck::Err(
                                 crate::pool::SteerError::ExpectedRunIdMissing,
                             ));
                         }
-                        Some(run_id) => {
+                        Some((transport, method, params)) => {
                             let id = self.next_id;
                             self.next_id += 1;
-                            let prompt_block_refs: Vec<&str> =
-                                req.prompt_blocks.iter().map(String::as_str).collect();
-                            let params =
-                                build_steer_params(session_id, &run_id, &prompt_block_refs);
                             let msg = serde_json::json!({
                                 "jsonrpc": "2.0",
                                 "id": id,
-                                "method": "_goose/unstable/session/steer",
+                                "method": method,
                                 "params": params,
                             });
                             tracing::debug!(
@@ -1320,11 +1429,11 @@ impl AcpClient {
                             );
                             match self.write_ndjson(&msg).await {
                                 Ok(()) => {
-                                    pending_steer = Some((id, req.ack_tx));
+                                    pending_steer = Some((id, transport, req.ack_tx));
                                 }
                                 Err(e) => {
                                     tracing::warn!(
-                                        "goose-native steer write failed: {e} — releasing withheld event"
+                                        "steer write failed ({method}): {e} — releasing withheld event"
                                     );
                                     let _ = req.ack_tx.send(crate::pool::SteerAck::Err(
                                         crate::pool::SteerError::Transport(e.to_string()),
@@ -1343,7 +1452,7 @@ impl AcpClient {
                     // would catch this anyway, but firing the deadline arm
                     // here makes the wakeup immediate (no extra reader poll
                     // round-trip when stdout is idle).
-                    if let Some((_, ack_tx)) = pending_steer.take() {
+                    if let Some((_, _, ack_tx)) = pending_steer.take() {
                         let _ = ack_tx.send(crate::pool::SteerAck::PromptCompletedNeutral);
                     }
                     if idle_fires_first {
@@ -1367,13 +1476,13 @@ impl AcpClient {
 
             match read_result {
                 None => {
-                    if let Some((_, ack_tx)) = pending_steer.take() {
+                    if let Some((_, _, ack_tx)) = pending_steer.take() {
                         let _ = ack_tx.send(crate::pool::SteerAck::PromptCompletedNeutral);
                     }
                     return Err(AcpError::AgentExited);
                 }
                 Some(Err(LinesCodecError::MaxLineLengthExceeded)) => {
-                    if let Some((_, ack_tx)) = pending_steer.take() {
+                    if let Some((_, _, ack_tx)) = pending_steer.take() {
                         let _ = ack_tx.send(crate::pool::SteerAck::PromptCompletedNeutral);
                     }
                     return Err(AcpError::Protocol(
@@ -1381,7 +1490,7 @@ impl AcpClient {
                     ));
                 }
                 Some(Err(e)) => {
-                    if let Some((_, ack_tx)) = pending_steer.take() {
+                    if let Some((_, _, ack_tx)) = pending_steer.take() {
                         let _ = ack_tx.send(crate::pool::SteerAck::PromptCompletedNeutral);
                     }
                     return Err(AcpError::Io(std::io::Error::other(e)));
@@ -1424,13 +1533,14 @@ impl AcpClient {
                     // share the `no method` guard.
                     if let Some(id) = msg.get("id") {
                         if msg.get("method").is_none() {
-                            if let Some((steer_id, _)) = pending_steer.as_ref() {
+                            if let Some((steer_id, _, _)) = pending_steer.as_ref() {
                                 if *id == serde_json::json!(*steer_id) {
                                     // Take the ack_tx out and route the
                                     // response. We do not return — keep
                                     // reading until the prompt response
                                     // arrives.
-                                    let (_, ack_tx) = pending_steer.take().expect("just checked");
+                                    let (_, transport, ack_tx) =
+                                        pending_steer.take().expect("just checked");
                                     let ack = if let Some(error) = msg.get("error") {
                                         let code = error
                                             .get("code")
@@ -1441,16 +1551,83 @@ impl AcpClient {
                                             crate::pool::SteerError::AgentError { code, message },
                                         )
                                     } else {
-                                        let renew_now = Instant::now();
-                                        let new_deadline = renew_now + max_duration;
-                                        if new_deadline > hard_deadline {
-                                            hard_deadline = new_deadline;
-                                            self.current_hard_deadline = Some(new_deadline);
-                                            tracing::info!(
-                                                "steer success: renewed hard deadline ({max_duration:?} from now)"
-                                            );
+                                        // Success result. Whether it counts as
+                                        // a delivered steer — and whether the
+                                        // turn Buzz awaits is still running —
+                                        // depends on the transport.
+                                        let outcome = match transport {
+                                            // goose returns no outcome field;
+                                            // a success response means the
+                                            // steer landed in the live run.
+                                            SteerTransport::Goose => Some(STEER_OUTCOME_INJECTED),
+                                            // The outcome must be positively
+                                            // recognized. An unknown or absent
+                                            // value (codex-acp answers
+                                            // unrecognized ext methods with a
+                                            // bare `{}`) is a rejection, never
+                                            // a delivery — treating it as
+                                            // success would drop the event.
+                                            SteerTransport::AcpExtension => msg
+                                                .pointer("/result/outcome")
+                                                .and_then(|v| v.as_str())
+                                                .filter(|o| {
+                                                    *o == STEER_OUTCOME_INJECTED
+                                                        || *o == STEER_OUTCOME_STARTED_NEW_TURN
+                                                }),
+                                        };
+                                        match outcome {
+                                            Some(STEER_OUTCOME_STARTED_NEW_TURN) => {
+                                                // Delivered, but into a NEW
+                                                // turn: the one this read loop
+                                                // is awaiting had already
+                                                // finished. Renewing the hard
+                                                // deadline here would extend
+                                                // the clock on a settled turn,
+                                                // so leave it alone and let the
+                                                // prompt response land on its
+                                                // original budget.
+                                                tracing::info!(
+                                                    "steer accepted as {STEER_OUTCOME_STARTED_NEW_TURN}: \
+                                                     awaited turn had ended — hard deadline not renewed"
+                                                );
+                                                crate::pool::SteerAck::Success
+                                            }
+                                            Some(_) => {
+                                                let renew_now = Instant::now();
+                                                let new_deadline = renew_now + max_duration;
+                                                if new_deadline > hard_deadline {
+                                                    hard_deadline = new_deadline;
+                                                    self.current_hard_deadline = Some(new_deadline);
+                                                    tracing::info!(
+                                                        "steer success: renewed hard deadline ({max_duration:?} from now)"
+                                                    );
+                                                }
+                                                crate::pool::SteerAck::Success
+                                            }
+                                            None => {
+                                                // Report the raw string when
+                                                // there is one, so logs read
+                                                // `failed` not `"failed"`;
+                                                // fall back to the JSON for a
+                                                // non-string value.
+                                                let reported = match msg.pointer("/result/outcome")
+                                                {
+                                                    None => "<absent>".to_string(),
+                                                    Some(serde_json::Value::String(s)) => s.clone(),
+                                                    Some(other) => other.to_string(),
+                                                };
+                                                tracing::warn!(
+                                                    "steer rejected: {ACP_STEER_METHOD} returned \
+                                                     unrecognized outcome {reported} — releasing \
+                                                     withheld event for cancel+merge"
+                                                );
+                                                crate::pool::SteerAck::Err(
+                                                    crate::pool::SteerError::OutcomeRejected {
+                                                        outcome: reported,
+                                                    },
+                                                )
+                                            }
                                         }
-                                        crate::pool::SteerAck::Success
                                     };
                                     let _ = ack_tx.send(ack);
                                     continue;
@@ -1458,13 +1635,13 @@ impl AcpClient {
                             }
                             if *id == serde_json::json!(expected_id) {
                                 if let Some(error) = msg.get("error") {
-                                    if let Some((_, ack_tx)) = pending_steer.take() {
+                                    if let Some((_, _, ack_tx)) = pending_steer.take() {
                                         let _ = ack_tx
                                             .send(crate::pool::SteerAck::PromptCompletedNeutral);
                                     }
                                     return Err(agent_error_from_json(error));
                                 }
-                                if let Some((_, ack_tx)) = pending_steer.take() {
+                                if let Some((_, _, ack_tx)) = pending_steer.take() {
                                     let _ =
                                         ack_tx.send(crate::pool::SteerAck::PromptCompletedNeutral);
                                 }
@@ -1523,7 +1700,10 @@ impl AcpClient {
     /// Takes `&mut self` (not `&self`) because some updates carry agent state
     /// the client must observe — notably goose's `session_info_update` with
     /// `_meta.goose.activeRunId`, which seeds [`active_run_id`](Self::active_run_id)
-    /// so callers can target `_goose/unstable/session/steer` at the correct run.
+    /// so the steer arm can target `_goose/unstable/session/steer` at the
+    /// correct run. Agents that never emit it (claude-agent-acp, codex-acp)
+    /// leave it `None` and are steered via `_session/steering` instead, which
+    /// needs no run id.
     fn handle_session_update(&mut self, msg: &serde_json::Value) -> bool {
         let update = &msg["params"]["update"];
         let update_type = update
@@ -1654,6 +1834,11 @@ impl AcpClient {
                         session_id = %notif.session_id,
                         input = payload.accumulated_input_tokens,
                         output = payload.accumulated_output_tokens,
+                        // A subset of `input`, logged so downstream accounting can
+                        // price it at the provider's cached rate. Always emitted,
+                        // including as 0, so a parser can tell "no cache hits"
+                        // apart from "this build predates the field".
+                        cached = payload.accumulated_cached_input_tokens,
                         "goose usage update"
                     );
                     self.goose_usage.record(&notif.session_id, payload);
@@ -1788,22 +1973,44 @@ fn build_prompt_params(session_id: &str, prompt_blocks: &[&str]) -> serde_json::
 /// matches goose's *current* run (it advances on each `session/update`).
 /// See [`crate::pool::SteerRequest`] for why this is the read loop's job
 /// and not the main loop's.
-fn build_steer_params(
+fn build_goose_steer_params(
     session_id: &str,
     expected_run_id: &str,
     prompt_blocks: &[&str],
 ) -> serde_json::Value {
-    let blocks: Vec<serde_json::Value> = prompt_blocks
-        .iter()
-        .map(|text| serde_json::json!({ "type": "text", "text": text }))
-        .collect();
     serde_json::json!({
         "sessionId": session_id,
         "expectedRunId": expected_run_id,
-        "prompt": blocks,
+        "prompt": steer_prompt_blocks(prompt_blocks),
     })
 }
 
+/// Build the params for an [`ACP_STEER_METHOD`] request.
+///
+/// Wire shape:
+/// ```json
+/// { "sessionId": "...", "prompt": [{"type":"text","text":"..."}, ...] }
+/// ```
+///
+/// Deliberately carries **no** `expectedRunId`: the cross-adapter method
+/// steers whatever turn is currently running and neither claude-agent-acp nor
+/// codex-acp emits a run id to target.
+fn build_acp_steer_params(session_id: &str, prompt_blocks: &[&str]) -> serde_json::Value {
+    serde_json::json!({
+        "sessionId": session_id,
+        "prompt": steer_prompt_blocks(prompt_blocks),
+    })
+}
+
+/// Render steer body strings as ACP `text` content blocks. Shared by both
+/// steer transports so the prompt shape cannot drift between them.
+fn steer_prompt_blocks(prompt_blocks: &[&str]) -> Vec<serde_json::Value> {
+    prompt_blocks
+        .iter()
+        .map(|text| serde_json::json!({ "type": "text", "text": text }))
+        .collect()
+}
+
 /// Build a JSON-RPC permission response with `outcome: "selected"`.
 fn permission_response_selected(id: &serde_json::Value, option_id: &str) -> serde_json::Value {
     serde_json::json!({
@@ -1846,7 +2053,8 @@ pub enum ModelSwitchMethod {
 
 /// Extract `configOptions` entries with `category == "model"` from a `session/new` result.
 ///
-/// Returns the raw JSON array entries. Each entry has `configId`, `displayName`,
+/// Returns the raw JSON array entries. Each entry has `configId` (spelled `id`
+/// by some adapters, e.g. claude-agent-acp), `displayName`,
 /// `options: [{ value, displayName }]`, etc.
 pub fn extract_model_config_options(result: &serde_json::Value) -> Vec<serde_json::Value> {
     result["configOptions"]
@@ -1880,7 +2088,14 @@ pub fn resolve_model_switch_method(
     // 1. Search stable configOptions for a "model"-category entry whose
     //    options contain a value matching desired_model.
     for config_opt in extract_model_config_options(session_new_result) {
-        let config_id = match config_opt.get("configId").and_then(|v| v.as_str()) {
+        // Adapters disagree on the key: the ACP spec says `configId`, but
+        // claude-agent-acp emits `id`. Accept both; the set request always
+        // uses `configId` on the wire.
+        let config_id = match config_opt
+            .get("configId")
+            .or_else(|| config_opt.get("id"))
+            .and_then(|v| v.as_str())
+        {
             Some(id) => id,
             None => continue,
         };
@@ -2456,6 +2671,36 @@ mod tests {
         );
     }
 
+    #[test]
+    fn resolve_accepts_id_keyed_config_options() {
+        // claude-agent-acp (observed on v0.61.0) keys config options with
+        // `id` instead of the spec's `configId`. Payload mirrors its real
+        // `session/new` response.
+        let result = serde_json::json!({
+            "configOptions": [{
+                "id": "model",
+                "name": "Model",
+                "category": "model",
+                "type": "select",
+                "currentValue": "default",
+                "options": [
+                    { "value": "default", "name": "Default" },
+                    { "value": "opus[1m]", "name": "Opus" },
+                    { "value": "sonnet", "name": "Sonnet" }
+                ]
+            }],
+            "models": null
+        });
+        let method = super::resolve_model_switch_method(&result, "opus[1m]");
+        assert_eq!(
+            method,
+            Some(super::ModelSwitchMethod::ConfigOption {
+                config_id: "model".to_string(),
+                option_value: "opus[1m]".to_string(),
+            })
+        );
+    }
+
     #[test]
     fn resolve_falls_back_to_unstable() {
         let result = serde_json::json!({
@@ -2607,6 +2852,78 @@ mod tests {
             .expect("failed to spawn test script")
     }
 
+    /// Spawn a probe script whose file name carries a runtime identity (e.g.
+    /// `hermes-acp`) and return the value of `var` as the child observed it.
+    /// `<unset>` means the child did not receive the var.
+    #[cfg(unix)]
+    async fn spawn_named_and_read_child_env(
+        file_name: &str,
+        var: &str,
+        extra_env: &[(String, String)],
+    ) -> String {
+        use std::os::unix::fs::PermissionsExt;
+
+        let dir = std::env::temp_dir().join(format!("buzz-acp-env-probe-{}", uuid::Uuid::new_v4()));
+        std::fs::create_dir_all(&dir).expect("create env probe dir");
+        let path = dir.join(file_name);
+        std::fs::write(
+            &path,
+            format!("#!/bin/sh\nprintf '%s\\n' \"${{{var}:-<unset>}}\"\n"),
+        )
+        .expect("write env probe script");
+        let mut permissions = std::fs::metadata(&path).expect("stat probe").permissions();
+        permissions.set_mode(0o700);
+        std::fs::set_permissions(&path, permissions).expect("chmod probe");
+
+        let mut client = AcpClient::spawn(
+            path.to_str().expect("probe path is UTF-8"),
+            &[],
+            extra_env,
+            false,
+        )
+        .await
+        .expect("spawn env probe script");
+        let observed = client
+            .reader
+            .next()
+            .await
+            .unwrap_or_else(|| panic!("child produced no output for {var}"))
+            .expect("child stdout was not readable");
+        client.shutdown().await;
+        std::fs::remove_dir_all(&dir).expect("remove env probe dir");
+        observed
+    }
+
+    /// Buzz-owned Hermes processes get the configured-MCP isolation default,
+    /// and an explicit persona entry still overrides it (defaults are applied
+    /// before `extra_env`, so the later `Command::env` write wins).
+    #[cfg(unix)]
+    #[tokio::test]
+    async fn spawn_applies_runtime_env_defaults_with_extra_env_precedence() {
+        const VAR: &str = "HERMES_ACP_SKIP_CONFIGURED_MCP";
+        if std::env::var_os(VAR).is_some() {
+            // Inherited parent values win over both layers; the default and
+            // override behavior below is unobservable in such an environment.
+            return;
+        }
+
+        assert_eq!(
+            spawn_named_and_read_child_env("hermes-acp", VAR, &[]).await,
+            "1",
+            "Hermes spawns must default {VAR}=1"
+        );
+        assert_eq!(
+            spawn_named_and_read_child_env("hermes-acp", VAR, &[(VAR.into(), "0".into())]).await,
+            "0",
+            "an explicit extra_env entry must override the runtime default"
+        );
+        assert_eq!(
+            spawn_named_and_read_child_env("other-agent", VAR, &[]).await,
+            "<unset>",
+            "non-Hermes spawns must not receive Hermes defaults"
+        );
+    }
+
     #[tokio::test]
     async fn idle_timeout_fires_on_silent_process() {
         let mut client = spawn_script("sleep 10").await;
@@ -2954,7 +3271,7 @@ mod tests {
             .expect("initialize should succeed");
 
         let resp = client
-            .session_new_full("/tmp", vec![], Some("Custom system prompt"))
+            .session_new_full("/tmp", vec![], Some("Custom system prompt"), None)
             .await
             .expect("session_new_full should succeed");
 
@@ -3039,7 +3356,7 @@ mod tests {
             .expect("initialize should succeed");
 
         let resp = client
-            .session_new_full("/tmp", vec![], None)
+            .session_new_full("/tmp", vec![], None, None)
             .await
             .expect("session_new_full should succeed");
 
@@ -3051,6 +3368,61 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    async fn session_new_full_sends_session_title_in_meta_when_some() {
+        let script = r#"
+            read -t 2 _init
+            echo '{"jsonrpc":"2.0","id":0,"result":{"protocolVersion":1,"agentCapabilities":{}}}'
+            read -t 2 REQ
+            echo '{"jsonrpc":"2.0","id":1,"result":{"sessionId":"ses_test","_receivedRequest":'"$REQ"'}}'
+            sleep 1
+        "#;
+        let mut client = spawn_script(script).await;
+        client
+            .initialize()
+            .await
+            .expect("initialize should succeed");
+
+        let resp = client
+            .session_new_full("/tmp", vec![], None, Some("Fizz · #buzz-dev"))
+            .await
+            .expect("session_new_full should succeed");
+
+        let received = &resp.raw["_receivedRequest"];
+        assert_eq!(
+            received["params"]["_meta"]["sessionTitle"].as_str(),
+            Some("Fizz · #buzz-dev"),
+            "title should ride in _meta.sessionTitle, out of band from the prompt"
+        );
+    }
+
+    #[tokio::test]
+    async fn session_new_full_omits_meta_when_session_title_none() {
+        let script = r#"
+            read -t 2 _init
+            echo '{"jsonrpc":"2.0","id":0,"result":{"protocolVersion":1,"agentCapabilities":{}}}'
+            read -t 2 REQ
+            echo '{"jsonrpc":"2.0","id":1,"result":{"sessionId":"ses_test","_receivedRequest":'"$REQ"'}}'
+            sleep 1
+        "#;
+        let mut client = spawn_script(script).await;
+        client
+            .initialize()
+            .await
+            .expect("initialize should succeed");
+
+        let resp = client
+            .session_new_full("/tmp", vec![], None, None)
+            .await
+            .expect("session_new_full should succeed");
+
+        let received = &resp.raw["_receivedRequest"];
+        assert!(
+            received["params"].get("_meta").is_none(),
+            "_meta should be absent entirely, not an empty object or null"
+        );
+    }
+
     // ── Goose-native steer scaffold (PR follow-up to #1160) ──────────────
 
     /// Helper: spawn an inert `cat` subprocess so we have a real AcpClient
@@ -3364,6 +3736,412 @@ mod tests {
         }
     }
 
+    // ── Cross-harness steer transport tests ───────────────────────────────
+    //
+    // These cover the `_session/steering` transport added alongside the
+    // goose-native method: capability capture at `initialize`, write-time
+    // transport selection, and outcome decoding. Wire-shape assertions read
+    // the actual serialized request bytes via `capture_steer_request` rather
+    // than inferring the shape from response-id routing.
+
+    /// Spawn a client whose script captures the first line written to its
+    /// stdin into `capture_path`, then emits `response` (already-serialized
+    /// JSON-RPC) and idles.
+    ///
+    /// The steer request is the first thing this read loop writes, so the
+    /// captured line IS the steer request bytes.
+    async fn spawn_steer_capture_script(
+        capture_path: &std::path::Path,
+        response: &str,
+    ) -> AcpClient {
+        let script = format!(
+            "read -r line; printf '%s' \"$line\" > {capture}; \
+             printf '%s\\n' '{response}'; sleep 10",
+            capture = capture_path.display(),
+            response = response,
+        );
+        spawn_script(&script).await
+    }
+
+    /// Drive one steer through the read loop and return
+    /// `(captured_request_bytes, ack)`.
+    ///
+    /// `capture_path` may be absent afterwards when the arm wrote nothing —
+    /// callers assert on that. The read loop is expected to exit via a
+    /// timeout or EOF; the ack is what these tests care about.
+    async fn run_one_steer(
+        client: &mut AcpClient,
+        capture_path: &std::path::Path,
+    ) -> (Option<String>, crate::pool::SteerAck) {
+        let (steer_tx, steer_rx) = tokio::sync::mpsc::channel::<crate::pool::SteerRequest>(1);
+        client.install_steer_rx(steer_rx);
+
+        let (ack_tx, ack_rx) = tokio::sync::oneshot::channel::<crate::pool::SteerAck>();
+        let send_task = tokio::spawn(async move {
+            steer_tx
+                .send(crate::pool::SteerRequest {
+                    prompt_blocks: vec!["steer body".into()],
+                    ack_tx,
+                })
+                .await
+                .expect("steer_tx send should succeed");
+        });
+
+        let idle = std::time::Duration::from_millis(800);
+        let max_dur = std::time::Duration::from_secs(10);
+        let hard_deadline = tokio::time::Instant::now() + max_dur;
+        let _ = client
+            .read_until_response_with_idle_timeout("sess-test", 999, idle, hard_deadline, max_dur)
+            .await;
+        send_task.await.expect("send_task should complete");
+
+        let ack = ack_rx
+            .await
+            .expect("ack oneshot must have received a SteerAck");
+        (std::fs::read_to_string(capture_path).ok(), ack)
+    }
+
+    /// Unique temp path for one test's captured request bytes.
+    fn capture_path(name: &str) -> std::path::PathBuf {
+        let dir = std::env::temp_dir().join("buzz-acp-steer-capture");
+        std::fs::create_dir_all(&dir).expect("create capture dir");
+        let path = dir.join(format!("{name}.json"));
+        let _ = std::fs::remove_file(&path);
+        path
+    }
+
+    /// Mark a client as having advertised `_meta.steering.supported` without
+    /// running a real `initialize` handshake. The capability-parsing tests
+    /// cover the handshake itself.
+    fn set_steering_supported(client: &mut AcpClient) {
+        client.steering_supported = true;
+    }
+
+    /// Run `initialize` against a script that replies with `init_result` as
+    /// the JSON-RPC result, and return the resulting `steering_supported`.
+    async fn steering_supported_after_initialize(init_result: &str) -> bool {
+        let script = format!(
+            "read -r _init; printf '%s\\n' '{{\"jsonrpc\":\"2.0\",\"id\":0,\"result\":{result}}}'; \
+             sleep 5",
+            result = init_result,
+        );
+        let mut client = spawn_script(&script).await;
+        client
+            .initialize()
+            .await
+            .expect("initialize should succeed");
+        client.steering_supported()
+    }
+
+    /// Test 1a: an adapter advertising `_meta.steering.supported: true`
+    /// (claude-agent-acp `src/acp-agent.ts:1444`, codex-acp
+    /// `src/CodexAcpServer.ts:247`) is recorded as steering-capable.
+    #[tokio::test]
+    async fn initialize_records_steering_supported_when_advertised() {
+        let supported = steering_supported_after_initialize(
+            r#"{"protocolVersion":2,"agentCapabilities":{},"_meta":{"steering":{"supported":true}}}"#,
+        )
+        .await;
+        assert!(
+            supported,
+            "_meta.steering.supported: true must set steering_supported"
+        );
+    }
+
+    /// Test 1b: no `_meta` at all (goose, buzz-agent, any older adapter) must
+    /// leave the capability off — this is what keeps a steer off the wire for
+    /// agents that never implemented it.
+    #[tokio::test]
+    async fn initialize_leaves_steering_unsupported_when_meta_absent() {
+        let supported =
+            steering_supported_after_initialize(r#"{"protocolVersion":2,"agentCapabilities":{}}"#)
+                .await;
+        assert!(
+            !supported,
+            "absent _meta must leave steering_supported false"
+        );
+    }
+
+    /// Test 1c: an explicit `supported: false` is respected, not treated as
+    /// "the key exists so it must work".
+    #[tokio::test]
+    async fn initialize_leaves_steering_unsupported_when_explicitly_false() {
+        let supported = steering_supported_after_initialize(
+            r#"{"protocolVersion":2,"_meta":{"steering":{"supported":false}}}"#,
+        )
+        .await;
+        assert!(
+            !supported,
+            "_meta.steering.supported: false must leave steering_supported false"
+        );
+    }
+
+    /// Test 2: no `active_run_id` + capability advertised → the bytes on the
+    /// wire are an `_session/steering` request carrying `sessionId` and
+    /// `prompt`, and carrying **no** `expectedRunId` (the adapters reject
+    /// unknown required fields, and there is no run id to report anyway).
+    #[tokio::test]
+    async fn acp_steer_request_omits_expected_run_id_and_carries_session_and_prompt() {
+        let capture = capture_path("acp_shape");
+        let mut client = spawn_steer_capture_script(
+            &capture,
+            r#"{"jsonrpc":"2.0","id":0,"result":{"outcome":"injected"}}"#,
+        )
+        .await;
+        set_steering_supported(&mut client);
+        assert!(
+            client.active_run_id().is_none(),
+            "precondition: no active_run_id"
+        );
+
+        let (written, ack) = run_one_steer(&mut client, &capture).await;
+
+        let written = written.expect("steer request must have been written");
+        let msg: serde_json::Value =
+            serde_json::from_str(&written).expect("written line must be valid JSON");
+        assert_eq!(
+            msg["method"].as_str(),
+            Some(ACP_STEER_METHOD),
+            "must use the cross-adapter steer method; wrote: {written}"
+        );
+        assert_eq!(msg["params"]["sessionId"].as_str(), Some("sess-test"));
+        assert_eq!(
+            msg["params"]["prompt"][0]["text"].as_str(),
+            Some("steer body"),
+            "prompt must carry the steer body as a text block"
+        );
+        assert!(
+            msg["params"].get("expectedRunId").is_none(),
+            "_session/steering must not carry expectedRunId; wrote: {written}"
+        );
+        assert!(
+            matches!(ack, crate::pool::SteerAck::Success),
+            "injected outcome must ack Success, got {ack:?}"
+        );
+    }
+
+    /// Test 3: goose keeps priority. With both an `active_run_id` and the
+    /// advertised capability, the goose method wins — `expectedRunId` is
+    /// strictly more precise about which run is being steered.
+    #[tokio::test]
+    async fn goose_transport_wins_when_both_run_id_and_capability_present() {
+        let capture = capture_path("goose_priority");
+        let mut client =
+            spawn_steer_capture_script(&capture, r#"{"jsonrpc":"2.0","id":0,"result":{}}"#).await;
+        set_steering_supported(&mut client);
+        let update = session_info_update_msg(Some(serde_json::json!("run-77")));
+        let _ = client.handle_session_update(&update);
+
+        let (written, ack) = run_one_steer(&mut client, &capture).await;
+
+        let written = written.expect("steer request must have been written");
+        let msg: serde_json::Value =
+            serde_json::from_str(&written).expect("written line must be valid JSON");
+        assert_eq!(
+            msg["method"].as_str(),
+            Some(GOOSE_STEER_METHOD),
+            "goose method must win when a run id exists; wrote: {written}"
+        );
+        assert_eq!(msg["params"]["expectedRunId"].as_str(), Some("run-77"));
+        // A bare `{}` result is a success on the goose transport (goose sends
+        // no `outcome`) — the OutcomeRejected guard applies only to
+        // `_session/steering`.
+        assert!(
+            matches!(ack, crate::pool::SteerAck::Success),
+            "goose success result must ack Success, got {ack:?}"
+        );
+    }
+
+    /// Test 7: codex-acp's third outcome, `failed`
+    /// (`src/AcpExtensions.ts:92`), is a delivery rejection despite being a
+    /// JSON-RPC success — release the event and fall back.
+    #[tokio::test]
+    async fn acp_steer_failed_outcome_acks_outcome_rejected() {
+        let capture = capture_path("outcome_failed");
+        let mut client = spawn_steer_capture_script(
+            &capture,
+            r#"{"jsonrpc":"2.0","id":0,"result":{"outcome":"failed"}}"#,
+        )
+        .await;
+        set_steering_supported(&mut client);
+
+        let (_written, ack) = run_one_steer(&mut client, &capture).await;
+
+        match ack {
+            crate::pool::SteerAck::Err(crate::pool::SteerError::OutcomeRejected { outcome }) => {
+                assert_eq!(
+                    outcome, "failed",
+                    "rejected outcome must report what the agent said, unquoted"
+                );
+            }
+            other => panic!("expected Err(OutcomeRejected), got {other:?}"),
+        }
+    }
+
+    /// Test 8: **codex `extMethod` silent-loss regression guard.** codex-acp's
+    /// ext dispatcher answers unrecognized methods with a bare `{}` — a
+    /// JSON-RPC *success*, not `-32601` (`src/CodexAcpServer.ts:255-258`).
+    /// Buzz maps `SteerAck::Success` to `queue.remove_event`, so decoding
+    /// `{}` as success would delete the user's message with no error, no
+    /// fallback, and no log. An absent `outcome` must therefore be a
+    /// rejection, which releases the event and fires cancel+merge.
+    #[tokio::test]
+    async fn acp_steer_missing_outcome_acks_outcome_rejected_and_never_drops_event() {
+        let capture = capture_path("outcome_absent");
+        let mut client =
+            spawn_steer_capture_script(&capture, r#"{"jsonrpc":"2.0","id":0,"result":{}}"#).await;
+        set_steering_supported(&mut client);
+
+        let (_written, ack) = run_one_steer(&mut client, &capture).await;
+
+        match ack {
+            crate::pool::SteerAck::Err(crate::pool::SteerError::OutcomeRejected { outcome }) => {
+                assert_eq!(
+                    outcome, "<absent>",
+                    "a result with no outcome field must be reported as absent"
+                );
+            }
+            other => panic!(
+                "expected Err(OutcomeRejected) for a bare {{}} success — \
+                 anything else risks dropping the event, got {other:?}"
+            ),
+        }
+    }
+
+    /// Test 5: `injected` renews the hard deadline, so the turn survives past
+    /// its original one. Mirrors
+    /// `steer_success_renews_hard_deadline_and_survives_past_original` for
+    /// the `_session/steering` transport.
+    ///
+    /// Timeline: original hard deadline at t≈1s; steer response at t≈0.5s
+    /// renews it to t≈3.5s; prompt response at t≈1.5s lands inside it.
+    #[tokio::test]
+    async fn acp_steer_injected_renews_hard_deadline_and_survives_past_original() {
+        let script = "sleep 0.5; \
+                      echo '{\"jsonrpc\":\"2.0\",\"id\":0,\"result\":{\"outcome\":\"injected\"}}'; \
+                      sleep 1; \
+                      echo '{\"jsonrpc\":\"2.0\",\"id\":999,\"result\":{\"done\":true}}'";
+        let mut client = spawn_script(script).await;
+        set_steering_supported(&mut client);
+
+        let (steer_tx, steer_rx) = tokio::sync::mpsc::channel::<crate::pool::SteerRequest>(1);
+        client.install_steer_rx(steer_rx);
+        let (ack_tx, ack_rx) = tokio::sync::oneshot::channel::<crate::pool::SteerAck>();
+        let send_task = tokio::spawn(async move {
+            steer_tx
+                .send(crate::pool::SteerRequest {
+                    prompt_blocks: vec!["steer body".into()],
+                    ack_tx,
+                })
+                .await
+                .expect("steer_tx send should succeed");
+        });
+
+        let idle = std::time::Duration::from_secs(10);
+        let max_dur = std::time::Duration::from_secs(3);
+        let hard_deadline = tokio::time::Instant::now() + std::time::Duration::from_secs(1);
+        let result = client
+            .read_until_response_with_idle_timeout("sess-test", 999, idle, hard_deadline, max_dur)
+            .await;
+        send_task.await.expect("send_task should complete");
+
+        assert!(
+            result.is_ok(),
+            "injected must renew the deadline so the prompt response still lands, got {result:?}"
+        );
+        assert_eq!(result.unwrap()["done"], serde_json::json!(true));
+        let ack = ack_rx.await.expect("ack must be received");
+        assert!(
+            matches!(ack, crate::pool::SteerAck::Success),
+            "injected must ack Success, got {ack:?}"
+        );
+    }
+
+    /// Test 6: **red/green for the no-renewal rule.** `startedNewTurn` means
+    /// the turn Buzz was steering had already ended and the adapter began a
+    /// fresh, detached one. It acks `Success` (the message WAS delivered, so
+    /// the event must not be redelivered) but must NOT renew the hard
+    /// deadline — that clock belongs to a turn which is already settled.
+    ///
+    /// Same timeline as the `injected` test, so the only difference is the
+    /// outcome string: original hard deadline at t≈1s, steer response at
+    /// t≈0.5s, prompt response at t≈1.5s. With renewal the prompt response
+    /// would land and this returns `Ok`; without renewal the original
+    /// deadline fires first and we get `HardTimeout`.
+    #[tokio::test]
+    async fn acp_steer_started_new_turn_acks_success_without_renewing_hard_deadline() {
+        let script = "sleep 0.5; \
+             echo '{\"jsonrpc\":\"2.0\",\"id\":0,\"result\":{\"outcome\":\"startedNewTurn\"}}'; \
+             sleep 1; \
+             echo '{\"jsonrpc\":\"2.0\",\"id\":999,\"result\":{\"done\":true}}'";
+        let mut client = spawn_script(script).await;
+        set_steering_supported(&mut client);
+
+        let (steer_tx, steer_rx) = tokio::sync::mpsc::channel::<crate::pool::SteerRequest>(1);
+        client.install_steer_rx(steer_rx);
+        let (ack_tx, ack_rx) = tokio::sync::oneshot::channel::<crate::pool::SteerAck>();
+        let send_task = tokio::spawn(async move {
+            steer_tx
+                .send(crate::pool::SteerRequest {
+                    prompt_blocks: vec!["steer body".into()],
+                    ack_tx,
+                })
+                .await
+                .expect("steer_tx send should succeed");
+        });
+
+        let idle = std::time::Duration::from_secs(10);
+        let max_dur = std::time::Duration::from_secs(3);
+        let hard_deadline = tokio::time::Instant::now() + std::time::Duration::from_secs(1);
+        let result = client
+            .read_until_response_with_idle_timeout("sess-test", 999, idle, hard_deadline, max_dur)
+            .await;
+        send_task.await.expect("send_task should complete");
+
+        // The original deadline must still fire — renewal here would extend
+        // the clock on a turn the adapter has already finished.
+        assert!(
+            matches!(result, Err(AcpError::HardTimeout { .. })),
+            "startedNewTurn must NOT renew the hard deadline, so the original \
+             one must still fire; got {result:?}"
+        );
+        // Delivery still succeeded, so the withheld event must be dropped
+        // rather than released — hence Success, not an Err.
+        let ack = ack_rx.await.expect("ack must be received");
+        assert!(
+            matches!(ack, crate::pool::SteerAck::Success),
+            "startedNewTurn is a delivery success, got {ack:?}"
+        );
+    }
+
+    /// Test 4 (companion to the existing
+    /// `native_steer_with_no_active_run_id_acks_expected_run_id_missing`):
+    /// no run id AND no advertised capability means nothing is written at
+    /// all. This is the gate that keeps a steer off the wire for adapters
+    /// that never implemented either method.
+    #[tokio::test]
+    async fn steer_writes_nothing_when_no_run_id_and_capability_absent() {
+        let capture = capture_path("no_transport");
+        let mut client =
+            spawn_steer_capture_script(&capture, r#"{"jsonrpc":"2.0","id":0,"result":{}}"#).await;
+        assert!(!client.steering_supported(), "precondition: not advertised");
+        assert!(
+            client.active_run_id().is_none(),
+            "precondition: no active_run_id"
+        );
+
+        let (written, ack) = run_one_steer(&mut client, &capture).await;
+
+        assert!(
+            written.is_none(),
+            "no transport available must write nothing; wrote: {written:?}"
+        );
+        match ack {
+            crate::pool::SteerAck::Err(crate::pool::SteerError::ExpectedRunIdMissing) => {}
+            other => panic!("expected Err(ExpectedRunIdMissing), got {other:?}"),
+        }
+    }
+
     // ── Goose usage notification integration ──────────────────────────────
 
     /// Build a `_goose/unstable/session/update` JSON-RPC notification.
diff --git a/crates/buzz-acp/src/base_prompt.md b/crates/buzz-acp/src/base_prompt.md
index c42e65cb83..e360d24982 100644
--- a/crates/buzz-acp/src/base_prompt.md
+++ b/crates/buzz-acp/src/base_prompt.md
@@ -40,6 +40,8 @@ For explicit changes to an existing personal agent, use `buzz agents draft-updat
 
 - Use the person's **exact full display name** after `@` (e.g., `@Will Pfleger`, not `@Will`). Partial names fail silently.
 - Do NOT format mentions with bold, italic, or backticks — it breaks notification delivery.
+- When you know intended recipient pubkeys, send readable `@Name` text and pass the identities separately in the same command: `buzz messages send ... --content "@Name ..." --mention <hex-or-npub>`. Repeat `--mention` for multiple recipients. Any explicit identity (`--mention` or `nostr:npub...`) permits unresolved or ambiguous `@Name` text as presentation-only; uniquely resolved member names still add their own recipients. Include a pubkey for every presentation-only name that should notify. The success JSON's `mention_pubkeys` comes from the signed event and is the delivery evidence; no follow-up verification command is needed.
+- Without `--mention`, the CLI resolves `@Name` against current channel members. It stops before sending on an unresolved/ambiguous name or a mentioned pubkey that is not a member. For a non-member, add them explicitly with `buzz channels add-member` only when authorized, then retry. Sending never changes membership automatically.
 - Only `@mention` when you need their attention. Don't mention in narrative (e.g., "coordinating with Duncan" — no `@`). Naming someone while talking *about* them is narrative — "waiting on @morgan", "until @morgan brings work", "I'll loop in @morgan later". Drop the `@`. Every mention sends a notification; a mention nobody needs to act on is a false alarm.
 
 ### Callback Mentions
diff --git a/crates/buzz-acp/src/config.rs b/crates/buzz-acp/src/config.rs
index a38d6faa14..dab61be30a 100644
--- a/crates/buzz-acp/src/config.rs
+++ b/crates/buzz-acp/src/config.rs
@@ -240,7 +240,7 @@ pub struct CliArgs {
     #[arg(long, env = "BUZZ_RELAY_URL", default_value = "ws://localhost:3000")]
     pub relay_url: String,
 
-    #[arg(long, env = "BUZZ_PRIVATE_KEY")]
+    #[arg(long, env = "BUZZ_PRIVATE_KEY", hide_env_values = true)]
     pub private_key: String,
 
     /// Agent owner pubkey (64-char hex). Used for --respond-to=owner-only gate.
@@ -423,6 +423,12 @@ pub struct CliArgs {
     #[arg(long, env = "BUZZ_ACP_MODEL")]
     pub model: Option<String>,
 
+    /// Title for the agent's ACP sessions, passed out-of-band in `session/new`
+    /// `_meta`. Adapters that recognize it name the session after this value;
+    /// others ignore it. Never enters the prompt.
+    #[arg(long, env = "BUZZ_ACP_SESSION_TITLE")]
+    pub session_title: Option<String>,
+
     /// Permission mode for agents that support `session/set_config_option`
     /// with `configId: "mode"` (e.g. `claude-agent-acp`).
     ///
@@ -522,6 +528,9 @@ pub struct Config {
     pub memory_enabled: bool,
     /// Desired LLM model ID. Applied after every `session_new_full()`.
     pub model: Option<String>,
+    /// Sanitized session title, sent as `_meta.sessionTitle` on `session/new`.
+    /// `None` when unset or when the configured value sanitized to empty.
+    pub session_title: Option<String>,
     /// Permission mode to apply after session creation. `Default` = skip.
     pub permission_mode: PermissionMode,
     /// Inbound author gate mode.
@@ -554,6 +563,68 @@ pub struct Config {
     pub base_prompt_content: Option<String>,
 }
 
+/// Maximum length, in characters, of a session title sent to the adapter.
+const SESSION_TITLE_MAX_CHARS: usize = 80;
+
+/// Normalize a configured session title into something safe to hand an adapter.
+///
+/// Control characters are dropped, runs of whitespace collapse to a single
+/// space, and the result is trimmed and capped at
+/// [`SESSION_TITLE_MAX_CHARS`]. Returns `None` when nothing printable is left.
+///
+/// Buzz is the only guard here: Codex's own `normalize_thread_name` merely
+/// trims, so an unbounded display name would be persisted verbatim into its
+/// thread store.
+fn sanitize_session_title(raw: &str) -> Option<String> {
+    let collapsed = raw
+        .split_whitespace()
+        .map(|word| word.chars().filter(|c| !c.is_control()).collect::<String>())
+        .filter(|word| !word.is_empty())
+        .collect::<Vec<_>>()
+        .join(" ");
+    // Truncate by chars, not bytes, so a multi-byte name can't be cut mid-UTF-8.
+    let title: String = collapsed
+        .chars()
+        .take(SESSION_TITLE_MAX_CHARS)
+        .collect::<String>()
+        .trim_end()
+        .to_string();
+    if title.is_empty() {
+        None
+    } else {
+        Some(title)
+    }
+}
+
+/// Separator between the agent name and the channel in a composed title.
+/// U+00B7 MIDDLE DOT, spaces on both sides.
+const SESSION_TITLE_SEPARATOR: &str = " · ";
+
+/// Compose a per-session title as `Agent · #channel`.
+///
+/// One agent in five channels gets five sessions; a bare agent name would show
+/// five identical rows in the adapter's thread list. Only the channel part is
+/// truncated to fit [`SESSION_TITLE_MAX_CHARS`], so the agent name always
+/// survives. Returns the bare agent name when there is no channel, the channel
+/// name is blank, or no room is left for it.
+pub(crate) fn compose_session_title(agent: &str, channel_name: Option<&str>) -> String {
+    let Some(channel) = channel_name.and_then(sanitize_session_title) else {
+        return agent.to_string();
+    };
+    // Reserve the separator and the `#` sigil alongside the agent name.
+    let reserved = agent.chars().count() + SESSION_TITLE_SEPARATOR.chars().count() + 1;
+    let channel: String = channel
+        .chars()
+        .take(SESSION_TITLE_MAX_CHARS.saturating_sub(reserved))
+        .collect::<String>()
+        .trim_end()
+        .to_string();
+    if channel.is_empty() {
+        return agent.to_string();
+    }
+    format!("{agent}{SESSION_TITLE_SEPARATOR}#{channel}")
+}
+
 /// Validate and deduplicate allowlist entries: each must be exactly 64 hex chars.
 fn validate_allowlist(entries: &[String]) -> Result<HashSet<String>, ConfigError> {
     let mut validated = HashSet::new();
@@ -605,7 +676,12 @@ pub(crate) fn normalize_agent_command_identity(command: &str) -> String {
         .next()
         .expect("rsplit always yields at least one element");
     let lower = basename.to_ascii_lowercase();
-    let stem = lower.strip_suffix(".exe").unwrap_or(&lower);
+    // Windows resolves commands through `.exe` binaries and npm's `.cmd`/`.bat`
+    // shims; all three name the same runtime identity.
+    let stem = [".exe", ".cmd", ".bat"]
+        .iter()
+        .find_map(|extension| lower.strip_suffix(extension))
+        .unwrap_or(&lower);
     stem.chars()
         .map(|character| match character {
             ' ' | '_' => '-',
@@ -623,6 +699,25 @@ fn default_agent_args(command: &str) -> Option<Vec<String>> {
     }
 }
 
+/// Per-runtime environment defaults applied when Buzz owns the agent process.
+///
+/// Mirrors [`default_agent_args`]: keyed on the normalized command identity,
+/// with the merge (in `AcpClient::spawn`) giving explicit persona env and
+/// inherited parent env precedence over these defaults.
+///
+/// Hermes: ACP hosts supply session MCP servers explicitly through
+/// `session/new`, but Hermes otherwise starts every profile-configured MCP
+/// server before it responds to `initialize` — which can exhaust the host's
+/// startup budget (see block/buzz#3355). Skip that unrelated global startup
+/// by default; an operator or persona can still opt back in by setting the
+/// variable explicitly.
+pub(crate) fn default_agent_env(command: &str) -> &'static [(&'static str, &'static str)] {
+    match normalize_agent_command_identity(command).as_str() {
+        "hermes" | "hermes-agent" | "hermes-acp" => &[("HERMES_ACP_SKIP_CONFIGURED_MCP", "1")],
+        _ => &[],
+    }
+}
+
 /// Build the `CODEX_CONFIG` environment variable that enables full outbound
 /// network access in Codex's macOS Seatbelt sandbox.
 ///
@@ -992,6 +1087,10 @@ impl Config {
             typing_enabled: !args.no_typing,
             memory_enabled: args.memory && !args.no_memory,
             model,
+            session_title: args
+                .session_title
+                .as_deref()
+                .and_then(sanitize_session_title),
             permission_mode: args.permission_mode,
             respond_to: args.respond_to,
             respond_to_allowlist,
@@ -1361,6 +1460,7 @@ mod tests {
             typing_enabled: true,
             memory_enabled: true,
             model: None,
+            session_title: None,
             permission_mode: PermissionMode::BypassPermissions,
             respond_to: RespondTo::Anyone,
             respond_to_allowlist: HashSet::new(),
@@ -1513,6 +1613,15 @@ mod tests {
             "claude-code"
         );
         assert_eq!(normalize_agent_command_identity("Goose.EXE"), "goose");
+        // Windows npm shims resolve to `.cmd`/`.bat` wrappers.
+        assert_eq!(
+            normalize_agent_command_identity(r"C:\Users\test\AppData\Roaming\npm\hermes-acp.cmd"),
+            "hermes-acp"
+        );
+        assert_eq!(
+            normalize_agent_command_identity(r"C:\Tools\Hermes\HERMES-AGENT.BAT"),
+            "hermes-agent"
+        );
         // Non-ASCII must not panic.
         assert_eq!(normalize_agent_command_identity("my-agënt"), "my-agënt");
         // Edge cases: empty, whitespace-only, bare separators.
@@ -1522,6 +1631,30 @@ mod tests {
         assert_eq!(normalize_agent_command_identity("///"), "");
     }
 
+    #[test]
+    fn default_agent_env_recognizes_hermes_identities() {
+        for command in [
+            "hermes",
+            "hermes-agent",
+            "hermes-acp",
+            "/opt/hermes/bin/hermes-acp",
+            r"C:\Users\test\bin\HERMES_ACP.EXE",
+            r"C:\Users\test\AppData\Roaming\npm\hermes-acp.cmd",
+        ] {
+            assert_eq!(
+                default_agent_env(command),
+                &[("HERMES_ACP_SKIP_CONFIGURED_MCP", "1")],
+                "unexpected env defaults for {command}"
+            );
+        }
+        for command in ["goose", "codex-acp", "claude-agent-acp", "buzz-agent", ""] {
+            assert!(
+                default_agent_env(command).is_empty(),
+                "non-Hermes command must have no env defaults: {command}"
+            );
+        }
+    }
+
     #[test]
     fn strips_legacy_acp_arg_case_insensitively() {
         assert_eq!(
@@ -2706,4 +2839,93 @@ channels = "ALL"
             assert!(MAX_TURN_DURATION_CEILING_SECS < u64::MAX - 100);
         }
     }
+
+    #[test]
+    fn sanitize_session_title_collapses_whitespace_and_strips_control_chars() {
+        assert_eq!(
+            sanitize_session_title("  Fizz\t\tthe\n Bot\u{7}  "),
+            Some("Fizz the Bot".to_string())
+        );
+    }
+
+    #[test]
+    fn sanitize_session_title_returns_none_when_nothing_printable_remains() {
+        assert_eq!(sanitize_session_title("   \n\t "), None);
+        assert_eq!(sanitize_session_title(""), None);
+        assert_eq!(sanitize_session_title("\u{1}\u{2}"), None);
+    }
+
+    #[test]
+    fn sanitize_session_title_caps_length_without_splitting_multibyte_chars() {
+        let raw = "\u{1f41d}".repeat(SESSION_TITLE_MAX_CHARS + 10);
+        let title = sanitize_session_title(&raw).expect("emoji title survives sanitizing");
+        assert_eq!(title.chars().count(), SESSION_TITLE_MAX_CHARS);
+        assert!(title.chars().all(|c| c == '\u{1f41d}'));
+    }
+
+    #[test]
+    fn sanitize_session_title_does_not_leave_a_trailing_space_after_the_cap() {
+        // The cap lands mid-word, so trimming must not leave a dangling space.
+        let raw = format!("{} tail", "a".repeat(SESSION_TITLE_MAX_CHARS - 1));
+        let title = sanitize_session_title(&raw).expect("title survives sanitizing");
+        assert_eq!(title, "a".repeat(SESSION_TITLE_MAX_CHARS - 1));
+    }
+
+    #[test]
+    fn compose_session_title_qualifies_the_agent_name_with_the_channel() {
+        assert_eq!(
+            compose_session_title("Fizz", Some("buzz-dev")),
+            "Fizz · #buzz-dev"
+        );
+    }
+
+    #[test]
+    fn compose_session_title_falls_back_to_bare_agent_name_without_a_channel() {
+        assert_eq!(compose_session_title("Fizz", None), "Fizz");
+        assert_eq!(compose_session_title("Fizz", Some("   ")), "Fizz");
+    }
+
+    #[test]
+    fn compose_session_title_truncates_the_channel_and_keeps_the_agent_name() {
+        let channel = "c".repeat(200);
+        let title = compose_session_title("Fizz", Some(&channel));
+        assert_eq!(title.chars().count(), SESSION_TITLE_MAX_CHARS);
+        assert!(title.starts_with("Fizz · #c"));
+    }
+
+    #[test]
+    fn compose_session_title_drops_the_channel_when_the_agent_name_fills_the_cap() {
+        let agent = "a".repeat(SESSION_TITLE_MAX_CHARS);
+        assert_eq!(compose_session_title(&agent, Some("buzz-dev")), agent);
+    }
+
+    /// Every arg whose env var name contains KEY/SECRET/TOKEN/PASSWORD/CRED/AUTH
+    /// must set `hide_env_values = true` to prevent credential leakage in --help.
+    #[test]
+    fn secret_env_args_hide_their_values_in_help() {
+        use clap::CommandFactory;
+
+        const SECRET_PATTERNS: &[&str] = &["KEY", "SECRET", "TOKEN", "PASSWORD", "CRED", "AUTH"];
+
+        let cmd = CliArgs::command();
+        let violations: Vec<String> = cmd
+            .get_arguments()
+            .filter_map(|arg| {
+                let env_key = arg.get_env()?;
+                let env_name = env_key.to_string_lossy().to_uppercase();
+                let is_secret = SECRET_PATTERNS.iter().any(|pat| env_name.contains(pat));
+                if is_secret && !arg.is_hide_env_values_set() {
+                    Some(env_name)
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        assert!(
+            violations.is_empty(),
+            "Found secret-bearing env args without hide_env_values=true. \
+             Add `hide_env_values = true` to each: {violations:?}"
+        );
+    }
 }
diff --git a/crates/buzz-acp/src/lib.rs b/crates/buzz-acp/src/lib.rs
index 0230ea0875..403512a322 100644
--- a/crates/buzz-acp/src/lib.rs
+++ b/crates/buzz-acp/src/lib.rs
@@ -1140,9 +1140,7 @@ fn any_respawn_in_flight(crash_history: &[SlotCircuit]) -> bool {
 /// Result of a background respawn task.
 struct RespawnResult {
     index: usize,
-    /// Tuple: (initialized client, protocol version, supports_goose_steer).
-    /// The third element is always `true` — the supervisor uses
-    /// try-and-tolerate for the steer extension.
+    /// Tuple: (initialized client, protocol version, agent name).
     result: Result<(AcpClient, u32, String)>,
 }
 
@@ -1535,6 +1533,7 @@ async fn tokio_main() -> Result<()> {
         turn_liveness_interval: Duration::from_secs(config.turn_liveness_secs),
         dedup_mode: config.dedup_mode,
         system_prompt: config.system_prompt.clone(),
+        session_title: config.session_title.clone(),
         team_instructions: config.team_instructions.clone(),
         base_prompt: if config.no_base_prompt {
             None
@@ -2227,18 +2226,18 @@ async fn tokio_main() -> Result<()> {
                                     owner_cache.get(),
                                 );
                                 if let Some(signal) = signal {
-                                    // Try-and-tolerate fork: when the mode
-                                    // wants a Steer, attempt the non-cancelling
-                                    // path first for any agent. On accept,
+                                    // Non-cancelling fork: when the mode
+                                    // wants a Steer, attempt the
+                                    // non-cancelling path first. On accept,
                                     // withhold the queued event and spawn an
                                     // ack watcher; the main loop's
                                     // `PoolEvent::SteerAck` arm decides
                                     // success/release/fallback. On reject
-                                    // (including `-32601 method_not_found`
-                                    // from agents that don't implement the
-                                    // extension), fall through to the universal
-                                    // cancel+merge `Steer` signal so the event
-                                    // still reaches the agent.
+                                    // (including agents that advertise no
+                                    // steer transport at all), fall through
+                                    // to the universal cancel+merge `Steer`
+                                    // signal so the event still reaches the
+                                    // agent.
                                     let native_attempted = matches!(signal, ControlSignal::Steer)
                                         && try_native_steer(
                                             &mut pool,
@@ -2418,14 +2417,26 @@ async fn tokio_main() -> Result<()> {
                 event_id,
                 ack,
             })) => {
-                // Goose-native steer attempt resolved. Locked semantics
-                // (Eva + Max + Perci, unanimous on Option X):
+                // Mid-turn steer attempt resolved (either transport:
+                // `_goose/unstable/session/steer` or `_session/steering`).
+                // Locked semantics (Eva + Max + Perci, unanimous on Option X):
                 //
                 //   Success
                 //     The agent received the steer via the non-cancelling
                 //     path. Drop the withheld event so normal dispatch
                 //     never redelivers it.
                 //
+                //     Also covers `_session/steering`'s `startedNewTurn`
+                //     outcome: the message was delivered, but into a fresh
+                //     turn because the one being steered had already
+                //     finished. Delivery is what this arm keys on, so the
+                //     event is still dropped. The read loop deliberately
+                //     does NOT renew its hard deadline in that case (the
+                //     awaited turn is settled), while
+                //     `extend_in_flight_deadline` below still applies —
+                //     the agent really is running more work, so the
+                //     channel's in-flight budget should reflect it.
+                //
                 //   Err(_) where the write never landed (Transport /
                 //   ExpectedRunIdMissing):
                 //     Delivery state of the underlying message is "never
@@ -2433,6 +2444,16 @@ async fn tokio_main() -> Result<()> {
                 //     queue front AND issue the cancel+merge fallback so
                 //     the message still reaches the agent.
                 //
+                //   Err(OutcomeRejected { .. })
+                //     A `_session/steering` request returned a JSON-RPC
+                //     success whose `outcome` was not `injected` or
+                //     `startedNewTurn` (codex's `failed`, an unknown value,
+                //     or a bare `{}` with no `outcome` at all). The steer
+                //     did not land, so this is treated exactly like a write
+                //     that never happened: release withheld AND fire the
+                //     cancel+merge fallback. Handled by the catch-all
+                //     `Err(_)` arm below.
+                //
                 //   Err(AgentError { code: -32601, .. })
                 //     The agent returned method_not_found — it does not
                 //     implement the steer extension. Release withheld AND
@@ -2489,9 +2510,9 @@ async fn tokio_main() -> Result<()> {
                     Ok(pool::SteerAck::Err(pool::SteerError::AgentError { .. })) => {
                         (true, false, false)
                     }
-                    // Transport / ExpectedRunIdMissing: write never landed.
-                    // Release and fire the cancel+merge fallback so the
-                    // message still reaches the agent.
+                    // Transport / ExpectedRunIdMissing / OutcomeRejected: the
+                    // steer did not land. Release and fire the cancel+merge
+                    // fallback so the message still reaches the agent.
                     Ok(pool::SteerAck::Err(_)) => (true, false, true),
                     Ok(pool::SteerAck::PromptCompletedNeutral) => (true, false, false),
                     Err(_recv_err) => (true, false, false),
@@ -2925,15 +2946,15 @@ fn dispatch_pending(
         let ctx_clone = Arc::clone(ctx);
         let agent_index = agent.index;
 
-        // Goose-native non-cancelling steer seam: snapshot capability before
-        // the agent moves into `run_prompt_task`, and install the per-turn
-        // steer receiver on the read loop so the main loop's mode-gate fork
+        // Mid-turn non-cancelling steer seam: install the per-turn steer
+        // receiver on the read loop so the main loop's mode-gate fork
         // (see the `if accepted && queue.is_channel_in_flight(...)` block
         // in the relay event branch of the main `select!` loop) can drive
         // it via the matching sender stored in `TaskMeta.steer_tx`.
-        // Install the steer channel for every prompt task — the supervisor
-        // uses try-and-tolerate: it attempts the steer for any agent and
-        // treats `-32601 method_not_found` as "fall back to cancel+merge".
+        // Installed for every prompt task: the read loop picks the steer
+        // transport at write time from `active_run_id` and the agent's
+        // advertised `_session/steering` capability, and acks
+        // `ExpectedRunIdMissing` (→ cancel+merge) when it has neither.
         let (tx, rx) = tokio::sync::mpsc::channel::<pool::SteerRequest>(1);
         agent.acp.install_steer_rx(rx);
         let steer_tx = Some(tx);
@@ -3604,6 +3625,22 @@ mod agent_draft_prompt_tests {
         assert!(prompt.contains("single-quoted shell strings preserve `\\n` literally"));
         assert!(prompt.contains("buzz messages send ... --content -"));
     }
+
+    #[test]
+    fn shared_base_prompt_teaches_single_command_mentions_and_preflight() {
+        let prompt = include_str!("base_prompt.md");
+        assert!(prompt.contains("--mention <hex-or-npub>"));
+        assert!(prompt.contains("every presentation-only name that should notify"));
+        assert!(
+            prompt.contains("permits unresolved or ambiguous `@Name` text as presentation-only")
+        );
+        assert!(prompt.contains("success JSON's `mention_pubkeys`"));
+        assert!(prompt.contains("no follow-up verification command is needed"));
+        assert!(prompt.contains("stops before sending"));
+        assert!(prompt
+            .contains("add them explicitly with `buzz channels add-member` only when authorized"));
+        assert!(prompt.contains("never changes membership automatically"));
+    }
 }
 
 fn default_heartbeat_prompt() -> String {
@@ -3782,7 +3819,8 @@ async fn initialize_agent_pool(
                                 .and_then(|info| info.get("name"))
                                 .and_then(|v| v.as_str())
                                 .unwrap_or("unknown"),
-                            "agent initialized — non-cancelling steer enabled (try-and-tolerate)"
+                            steering_supported = acp.steering_supported(),
+                            "agent initialized"
                         );
                         acp.observe(
                             "agent_initialized",
@@ -4026,7 +4064,7 @@ async fn run_models(args: ModelsArgs) -> Result<()> {
     // so shutdown() runs on all paths (success, error, timeout).
     let protocol_result = tokio::time::timeout(MODELS_TIMEOUT, async {
         let init = client.initialize().await?;
-        let session = client.session_new_full(&cwd, vec![], None).await?;
+        let session = client.session_new_full(&cwd, vec![], None, None).await?;
         Ok::<_, acp::AcpError>((init, session))
     })
     .await;
@@ -4178,6 +4216,18 @@ fn build_mcp_servers(config: &Config) -> Vec<McpServer> {
                     });
                 }
             }
+            // Forward the agent's display name so dev-mcp can use it as the git
+            // author name instead of the raw npub. Read from the process env
+            // rather than Config: this is a pass-through of a contract owned
+            // upstream, and absent simply means dev-mcp falls back to the npub.
+            if let Ok(display_name) = std::env::var("BUZZ_ACP_DISPLAY_NAME") {
+                if !display_name.is_empty() {
+                    env.push(EnvVar {
+                        name: "BUZZ_ACP_DISPLAY_NAME".into(),
+                        value: display_name,
+                    });
+                }
+            }
             env
         },
     }]
@@ -4973,6 +5023,7 @@ mod build_mcp_servers_tests {
             typing_enabled: true,
             memory_enabled: false,
             model: None,
+            session_title: None,
             permission_mode: config::PermissionMode::BypassPermissions,
             respond_to: config::RespondTo::Anyone,
             respond_to_allowlist: std::collections::HashSet::new(),
@@ -5036,6 +5087,60 @@ mod build_mcp_servers_tests {
         assert!(!has_auth_tag, "empty BUZZ_AUTH_TAG should not be forwarded");
     }
 
+    #[test]
+    fn test_display_name_set_is_forwarded_to_mcp_server() {
+        let _guard = ENV_LOCK.lock().unwrap();
+        std::env::set_var("BUZZ_ACP_DISPLAY_NAME", "Duncan");
+        let config = test_config();
+        let servers = build_mcp_servers(&config);
+        std::env::remove_var("BUZZ_ACP_DISPLAY_NAME");
+
+        let entry = servers[0]
+            .env
+            .iter()
+            .find(|e| e.name == "BUZZ_ACP_DISPLAY_NAME");
+        assert_eq!(
+            entry.map(|e| e.value.as_str()),
+            Some("Duncan"),
+            "a set display name should reach the MCP server verbatim"
+        );
+    }
+
+    #[test]
+    fn test_display_name_unset_omits_the_key_entirely() {
+        let _guard = ENV_LOCK.lock().unwrap();
+        std::env::remove_var("BUZZ_ACP_DISPLAY_NAME");
+        let config = test_config();
+        let servers = build_mcp_servers(&config);
+
+        // Absent, not empty-valued: dev-mcp distinguishes the two and only
+        // falls back to the npub when the key is missing or blank.
+        assert!(
+            !servers[0]
+                .env
+                .iter()
+                .any(|e| e.name == "BUZZ_ACP_DISPLAY_NAME"),
+            "unset display name should not add the key"
+        );
+    }
+
+    #[test]
+    fn test_display_name_empty_omits_the_key_entirely() {
+        let _guard = ENV_LOCK.lock().unwrap();
+        std::env::set_var("BUZZ_ACP_DISPLAY_NAME", "");
+        let config = test_config();
+        let servers = build_mcp_servers(&config);
+        std::env::remove_var("BUZZ_ACP_DISPLAY_NAME");
+
+        assert!(
+            !servers[0]
+                .env
+                .iter()
+                .any(|e| e.name == "BUZZ_ACP_DISPLAY_NAME"),
+            "empty display name should not be forwarded"
+        );
+    }
+
     #[test]
     fn empty_mcp_command_returns_no_servers() {
         let mut config = test_config();
@@ -5139,6 +5244,7 @@ mod error_outcome_emission_tests {
             typing_enabled: true,
             memory_enabled: false,
             model: None,
+            session_title: None,
             permission_mode: config::PermissionMode::BypassPermissions,
             respond_to: config::RespondTo::Anyone,
             respond_to_allowlist: HashSet::new(),
diff --git a/crates/buzz-acp/src/pool.rs b/crates/buzz-acp/src/pool.rs
index cc537f8683..038f8a714c 100644
--- a/crates/buzz-acp/src/pool.rs
+++ b/crates/buzz-acp/src/pool.rs
@@ -32,7 +32,7 @@ use crate::acp::{
     extract_model_config_options, extract_model_state, model_in_catalog,
     resolve_model_switch_method, AcpClient, AcpError, McpServer, ModelSwitchMethod, StopReason,
 };
-use crate::config::{DedupMode, PermissionMode};
+use crate::config::{compose_session_title, DedupMode, PermissionMode};
 use crate::observer;
 use crate::queue::{
     CancelReason, ContextMessage, ConversationContext, FlushBatch, PromptChannelInfo,
@@ -309,10 +309,13 @@ pub enum ControlSignal {
 /// for that — only a function parameter pass-through.
 ///
 /// If `active_run_id` is `None` at write time (no `session/update` seen yet
-/// — e.g. agents that never emit run-id metadata), the steer cannot form a
-/// valid `expectedRunId` and the read loop acks
-/// [`SteerError::ExpectedRunIdMissing`]. The main loop maps this to the
-/// "Err-before-pending" bucket: no withhold/mark was established at
+/// — e.g. agents that never emit run-id metadata), the goose-native method
+/// cannot form a valid `expectedRunId`, and the read loop falls back to the
+/// cross-adapter `_session/steering` method when the agent advertised
+/// `_meta.steering.supported` at `initialize`. That method takes no run id, so
+/// no freshness concern applies to it. When neither transport is available the
+/// read loop acks [`SteerError::ExpectedRunIdMissing`]. The main loop maps that
+/// to the "Err-before-pending" bucket: no withhold/mark was established at
 /// `pool::send_steer` time because the request was rejected before any
 /// write, so the watcher only needs to release nothing and fall back to the
 /// universal `ControlSignal::Steer` cancel+merge path.
@@ -326,7 +329,8 @@ pub struct SteerRequest {
     pub ack_tx: tokio::sync::oneshot::Sender<SteerAck>,
 }
 
-/// Why a goose-native steer failed.
+/// Why a mid-turn steer failed, on either transport
+/// (`_goose/unstable/session/steer` or `_session/steering`).
 ///
 /// String and integer fields are intentionally `Debug`-only — read by
 /// `tracing` macros in the main loop's `PoolEvent::SteerAck` arm via
@@ -349,14 +353,28 @@ pub enum SteerError {
     /// Transport-level failure: write error, read EOF, JSON-RPC framing
     /// violation, etc. The string carries the underlying `AcpError`'s display.
     Transport(String),
-    /// At steer-write time `AcpClient::active_run_id` was `None`, so the
-    /// read loop couldn't form a valid `expectedRunId`. The read loop drops
-    /// the request without writing anything; the main loop should release
-    /// any withheld event and fall back to the universal cancel+merge
+    /// At steer-write time neither steer transport was available: no
+    /// `expectedRunId` (`AcpClient::active_run_id` was `None`, so the
+    /// goose-native method could not be formed) and the agent did not
+    /// advertise the cross-adapter `_session/steering` extension. The read
+    /// loop drops the request without writing anything; the main loop should
+    /// release any withheld event and fall back to the universal cancel+merge
     /// `ControlSignal::Steer` path. This is in the same "Err-before-pending"
     /// bucket as `Transport` write failures: no in-process state was
     /// established, so no in-process cleanup is needed.
     ExpectedRunIdMissing,
+    /// A `_session/steering` request returned a JSON-RPC *success* whose
+    /// `outcome` was not one of the two recognized delivery outcomes
+    /// (`injected`, `startedNewTurn`) — including `failed` (codex-acp) and a
+    /// missing `outcome` entirely. `outcome` carries what the agent actually
+    /// reported, for logs.
+    ///
+    /// The steer did NOT land, so the main loop must release the withheld
+    /// event and fire the cancel+merge fallback — exactly like a write that
+    /// never happened. Treating an unrecognized success as delivery would
+    /// drop the user's message: codex-acp answers unrecognized extension
+    /// methods with a bare `{}` success rather than `-32601`.
+    OutcomeRejected { outcome: String },
     /// The read loop never got to dispatch the steer because the prompt
     /// completed first. Delivery state for the underlying message is
     /// unknown after prompt completion — the main loop must treat this as
@@ -369,7 +387,7 @@ pub enum SteerError {
     PromptCompleted,
 }
 
-/// Outcome of a goose-native steer, sent from the read loop back to the
+/// Outcome of a mid-turn steer, sent from the read loop back to the
 /// main loop's ack watcher.
 #[derive(Debug)]
 pub enum SteerAck {
@@ -490,6 +508,9 @@ pub struct PromptContext {
     pub turn_liveness_interval: Duration,
     pub dedup_mode: DedupMode,
     pub system_prompt: Option<String>,
+    /// Sanitized title for each new ACP session, sent as `_meta.sessionTitle`
+    /// on `session/new`. Never part of the prompt.
+    pub session_title: Option<String>,
     pub team_instructions: Option<String>,
     pub heartbeat_prompt: Option<String>,
     /// Base prompt content, or `None` if `--no-base-prompt` was passed.
@@ -795,6 +816,49 @@ const CONTROL_CANCEL_GRACE: Duration = Duration::from_secs(5);
 /// Timeout for permission-mode requests (`session/set_config_option` with `configId: "mode"`).
 const PERMISSION_MODE_TIMEOUT: Duration = Duration::from_secs(5);
 
+/// Placeholder [`fetch_channel_info`] substitutes when a channel's metadata
+/// event carries no `name` tag. Not a real channel name — consumers that need
+/// an identifying name must treat it as absent.
+const UNKNOWN_CHANNEL_NAME: &str = "unknown";
+
+/// Channel-derived inputs for a new session — `(is_dm, title_channel)` — from
+/// **one** metadata resolve.
+///
+/// Both new-session consumers need the same lookup: the canvas block skips DMs
+/// (and fails closed when the channel type can't be determined), and the
+/// session title is qualified with the channel name. Resolving once is
+/// load-bearing rather than tidy: [`ChannelInfoResolver`] caches only `Some`,
+/// so two calls against an unresolvable channel pay the whole
+/// [`fetch_channel_info`] retry sequence twice — two `CONTEXT_FETCH_TIMEOUT`
+/// attempts plus `CONTEXT_FETCH_RETRY_DELAY` each, in front of `session/new`,
+/// precisely when the relay is already degraded.
+///
+/// `title_channel` is `None` whenever the channel can't usefully identify the
+/// session: an unresolved channel, a DM (no meaningful name), or the literal
+/// `"unknown"` that [`fetch_channel_info`] substitutes for a metadata event
+/// with no `name` tag. Composing that sentinel would title every unnamed
+/// channel identically (`Agent · #unknown`) — reintroducing the collision the
+/// suffix exists to remove, while naming a channel something it isn't. The
+/// startup cache already refuses `channel_type == "unknown"` for the same
+/// reason.
+///
+/// Renames do not retitle live sessions, and a **channel** rename is stickier
+/// than an agent rename: `invalidate_channel` drops the session but not the
+/// resolver's cached entry, so a renamed channel keeps its old suffix until the
+/// process restarts. An agent rename lands on the next spawn (the desktop
+/// restart badge covers it — see `spawn_config_hash`).
+async fn resolve_new_session_channel_context(
+    channel_info: &ChannelInfoResolver,
+    channel_id: Uuid,
+) -> (bool, Option<String>) {
+    let Some(info) = channel_info.resolve(channel_id).await else {
+        return (true, None);
+    };
+    let is_dm = info.channel_type == "dm";
+    let title_channel = (!is_dm && info.name != UNKNOWN_CHANNEL_NAME).then_some(info.name);
+    (is_dm, title_channel)
+}
+
 /// Create a new ACP session via `session_new_full()`, populate model capabilities
 /// on the agent (first session only), and apply `desired_model` if set.
 ///
@@ -806,6 +870,7 @@ async fn create_session_and_apply_model(
     ctx: &PromptContext,
     agent_core: Option<&str>,
     agent_canvas: Option<&str>,
+    channel_name: Option<&str>,
 ) -> Result<String, AcpError> {
     // Build base_prompt + system_prompt + agent core + canvas metadata into a
     // single prompt. Standard protocol-v2 agents receive it in `session/new`;
@@ -825,6 +890,11 @@ async fn create_session_and_apply_model(
         agent_canvas,
     );
 
+    let session_title = ctx
+        .session_title
+        .as_deref()
+        .map(|agent_name| compose_session_title(agent_name, channel_name));
+
     let resp = agent
         .acp
         .session_new_full(
@@ -835,6 +905,7 @@ async fn create_session_and_apply_model(
                 agent.protocol_version,
                 combined_system_prompt.as_deref(),
             ),
+            session_title.as_deref(),
         )
         .await?;
 
@@ -1427,18 +1498,20 @@ pub async fn run_prompt_task(
     // prevents a stale revision A surviving a failed create and being re-used by
     // the next attempt after the canvas was cleared.
     let mut pending_canvas: Option<(Uuid, String)> = None;
+    // Channel name for the session title, from the same single resolve the
+    // canvas DM check uses — see `resolve_new_session_channel_context`.
+    let mut title_channel: Option<String> = None;
     if let PromptSource::Channel(cid) = &source {
         let is_new_channel_session = !agent.state.sessions.contains_key(cid);
-        if is_new_channel_session && !agent.state.canvas_sections.contains_key(cid) {
-            // Resolve DM status: prefer the startup cache, lazy-fetch as fallback.
-            // Unknown → treat as DM (fail-closed).
-            let is_dm = ctx
-                .channel_info
-                .resolve(*cid)
-                .await
-                .map(|ci| ci.channel_type == "dm")
-                .unwrap_or(true);
-            if !is_dm {
+        let needs_canvas = is_new_channel_session && !agent.state.canvas_sections.contains_key(cid);
+        let needs_title = is_new_channel_session && ctx.session_title.is_some();
+        if needs_canvas || needs_title {
+            let (is_dm, resolved_channel) =
+                resolve_new_session_channel_context(&ctx.channel_info, *cid).await;
+            title_channel = resolved_channel;
+            // A confirmed DM never receives a canvas section; an undeterminable
+            // channel type fails closed as a DM for the same reason.
+            if needs_canvas && !is_dm {
                 if let Some(section) = fetch_canvas_section(*cid, &ctx.rest_client).await {
                     pending_canvas = Some((*cid, section));
                 }
@@ -1470,12 +1543,16 @@ pub async fn run_prompt_task(
             if let Some(sid) = agent.state.sessions.get(cid) {
                 (sid.clone(), false)
             } else {
-                // Create new session with model application.
+                // The title is channel-qualified (`Agent · #channel`) so one
+                // agent in several channels doesn't produce identical session
+                // rows; `title_channel` comes from the single resolve above and
+                // is `None` for DM, unresolved, and unnamed channels.
                 match create_session_and_apply_model(
                     &mut agent,
                     &ctx,
                     agent_core.as_deref(),
                     agent_canvas.as_deref(),
+                    title_channel.as_deref(),
                 )
                 .await
                 {
@@ -1523,7 +1600,7 @@ pub async fn run_prompt_task(
             if let Some(sid) = &agent.state.heartbeat_session {
                 (sid.clone(), false)
             } else {
-                match create_session_and_apply_model(&mut agent, &ctx, None, None).await {
+                match create_session_and_apply_model(&mut agent, &ctx, None, None, None).await {
                     Ok(sid) => {
                         tracing::info!(
                             target: "pool::session",
@@ -1820,6 +1897,18 @@ pub async fn run_prompt_task(
         None => prompt_sections.iter().map(String::as_str).collect(),
     };
 
+    // Turn start, labelled exactly as `log_stop_reason` labels the end, so a
+    // log reads as start/stop pairs. Purely observational: an unpaired start is
+    // the only durable evidence that a turn was entered and never returned, and
+    // without it a stalled agent and an agent nobody woke leave identical logs —
+    // zero completions either way, so anything reading them afterwards has to
+    // guess which happened.
+    tracing::info!(
+        target: "pool::prompt",
+        "turn starting for {}",
+        prompt_label(&source)
+    );
+
     // When control_rx is Some (channel tasks), wrap the prompt in select! so
     // the main loop can cancel, interrupt, or rotate it. Heartbeats
     // (control_rx=None) take the simple await path — they are not controllable.
@@ -2268,7 +2357,7 @@ pub(crate) async fn fetch_channel_info(
                 }
                 let channel_type = crate::relay::channel_type_from_tags(tags);
                 Some(PromptChannelInfo {
-                    name: name.unwrap_or("unknown").to_string(),
+                    name: name.unwrap_or(UNKNOWN_CHANNEL_NAME).to_string(),
                     channel_type,
                 })
             }
@@ -3054,12 +3143,19 @@ fn classify_control_cancel_failure(
     }
 }
 
-/// Log a stop reason at the appropriate tracing level.
-fn log_stop_reason(source: &PromptSource, stop_reason: &StopReason) {
-    let label = match source {
+/// How a turn's source is named in the `pool::prompt` log lines.
+///
+/// Shared by the turn-start and turn-stop lines so a log can be read as pairs.
+fn prompt_label(source: &PromptSource) -> String {
+    match source {
         PromptSource::Channel(cid) => format!("channel {cid}"),
         PromptSource::Heartbeat => "heartbeat".to_string(),
-    };
+    }
+}
+
+/// Log a stop reason at the appropriate tracing level.
+fn log_stop_reason(source: &PromptSource, stop_reason: &StopReason) {
+    let label = prompt_label(source);
     match stop_reason {
         StopReason::EndTurn => {
             tracing::info!(target: "pool::prompt", "turn complete for {label}: end_turn");
@@ -3781,6 +3877,9 @@ mod tests {
 
     #[test]
     fn test_framed_system_prompt_both_present_carries_both_headers() {
+        // Also the regression guard against #2372: the session title travels
+        // out of band in `_meta.sessionTitle`, so this exact-bytes assertion is
+        // what pins the framing against a `[Session]` section reappearing here.
         let framed = framed_system_prompt("/", Some("base text"), Some("persona text"))
             .expect("both present yields Some");
         assert_eq!(framed, "[Base]\nbase text\n\n[System]\npersona text");
@@ -5280,6 +5379,7 @@ mod tests {
             turn_liveness_interval: Duration::ZERO,
             dedup_mode: DedupMode::Drop,
             system_prompt: None,
+            session_title: None,
             team_instructions: None,
             heartbeat_prompt: None,
             base_prompt: None,
@@ -5617,4 +5717,142 @@ mod tests {
             "timestamp must not use +00:00 offset"
         );
     }
+
+    // ── new-session channel context (one resolve, two consumers) ─────────────
+
+    /// A [`ChannelInfoResolver`] whose lazy REST fallback is served by a local
+    /// HTTP server, plus a counter of the requests that actually reached it.
+    /// Counting real requests is the point: the composition tests are pure and
+    /// cannot see duplicated I/O.
+    async fn counting_resolver(
+        response: serde_json::Value,
+    ) -> (
+        ChannelInfoResolver,
+        std::sync::Arc<std::sync::atomic::AtomicUsize>,
+        tokio::task::JoinHandle<()>,
+    ) {
+        use std::sync::atomic::{AtomicUsize, Ordering};
+        use tokio::io::{AsyncReadExt, AsyncWriteExt};
+
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:0")
+            .await
+            .expect("bind test HTTP server");
+        let base_url = format!("http://{}", listener.local_addr().unwrap());
+        let requests = std::sync::Arc::new(AtomicUsize::new(0));
+        let server_requests = requests.clone();
+        let body = response.to_string();
+        let server = tokio::spawn(async move {
+            while let Ok((mut socket, _)) = listener.accept().await {
+                let mut buf = vec![0; 8192];
+                let _ = socket.read(&mut buf).await;
+                server_requests.fetch_add(1, Ordering::SeqCst);
+                let response = format!(
+                    "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
+                    body.len(),
+                    body
+                );
+                let _ = socket.write_all(response.as_bytes()).await;
+            }
+        });
+        let rest = crate::relay::RestClient {
+            http: reqwest::Client::new(),
+            base_url,
+            keys: nostr::Keys::generate(),
+            auth_tag_json: None,
+        };
+        (
+            ChannelInfoResolver::new(std::collections::HashMap::new(), rest),
+            requests,
+            server,
+        )
+    }
+
+    fn channel_metadata_response(id: Uuid, tags: &[[&str; 2]]) -> serde_json::Value {
+        let mut event_tags = vec![json!(["d", id.to_string()])];
+        event_tags.extend(tags.iter().map(|[k, v]| json!([k, v])));
+        json!([{ "tags": event_tags }])
+    }
+
+    /// A normal channel yields a non-DM (canvas allowed) and its name for the
+    /// title suffix — and the second consumer reads it from cache, not the wire.
+    #[tokio::test]
+    async fn test_new_session_channel_context_qualifies_a_normal_channel() {
+        use std::sync::atomic::Ordering;
+
+        let id = Uuid::new_v4();
+        let response = channel_metadata_response(id, &[["name", "buzz-dev"], ["t", "stream"]]);
+        let (resolver, requests, server) = counting_resolver(response).await;
+
+        let (is_dm, title_channel) = resolve_new_session_channel_context(&resolver, id).await;
+        assert!(!is_dm, "a stream channel is not a DM");
+        assert_eq!(title_channel.as_deref(), Some("buzz-dev"));
+        assert_eq!(requests.load(Ordering::SeqCst), 1);
+
+        let (_, again) = resolve_new_session_channel_context(&resolver, id).await;
+        assert_eq!(again.as_deref(), Some("buzz-dev"));
+        assert_eq!(
+            requests.load(Ordering::SeqCst),
+            1,
+            "a resolved channel is cached — no second lookup"
+        );
+        server.abort();
+    }
+
+    /// A DM carries no useful name, so it gets the bare agent title (and no
+    /// canvas section).
+    #[tokio::test]
+    async fn test_new_session_channel_context_leaves_a_dm_unqualified() {
+        let id = Uuid::new_v4();
+        let response = channel_metadata_response(id, &[["name", "DM"], ["t", "dm"]]);
+        let (resolver, _requests, server) = counting_resolver(response).await;
+
+        let (is_dm, title_channel) = resolve_new_session_channel_context(&resolver, id).await;
+        assert!(is_dm);
+        assert_eq!(
+            title_channel, None,
+            "a DM name must never reach the session title"
+        );
+        server.abort();
+    }
+
+    /// The `"unknown"` placeholder `fetch_channel_info` substitutes for a
+    /// metadata event with no `name` tag is not a channel name: qualifying with
+    /// it would title every unnamed channel `Agent · #unknown`.
+    #[tokio::test]
+    async fn test_new_session_channel_context_treats_the_unknown_name_as_absent() {
+        let id = Uuid::new_v4();
+        let response = channel_metadata_response(id, &[["t", "stream"]]);
+        let (resolver, _requests, server) = counting_resolver(response).await;
+
+        let (is_dm, title_channel) = resolve_new_session_channel_context(&resolver, id).await;
+        assert!(!is_dm, "a nameless stream channel is still not a DM");
+        assert_eq!(
+            title_channel, None,
+            "the `unknown` placeholder must yield a bare title"
+        );
+        server.abort();
+    }
+
+    /// An unresolvable channel yields the bare title, fails closed as a DM, and
+    /// costs exactly ONE `fetch_channel_info` sequence — two attempts, because
+    /// `fetch_with_retry` retries once. `resolve()` caches only `Some`, so a
+    /// second resolve for the title would double this in front of `session/new`,
+    /// exactly when the relay is already degraded.
+    #[tokio::test]
+    async fn test_new_session_channel_context_attempts_an_unresolved_channel_once() {
+        use std::sync::atomic::Ordering;
+
+        let (resolver, requests, server) = counting_resolver(json!([])).await;
+
+        let (is_dm, title_channel) =
+            resolve_new_session_channel_context(&resolver, Uuid::new_v4()).await;
+        assert!(is_dm, "an undeterminable channel type must fail closed");
+        assert_eq!(title_channel, None, "unresolved channels get a bare title");
+        assert_eq!(
+            requests.load(Ordering::SeqCst),
+            2,
+            "one fetch_channel_info sequence (initial attempt + single retry)"
+        );
+        server.abort();
+    }
 }
diff --git a/crates/buzz-acp/src/usage.rs b/crates/buzz-acp/src/usage.rs
index a4f7abd3b3..8cca9c96f8 100644
--- a/crates/buzz-acp/src/usage.rs
+++ b/crates/buzz-acp/src/usage.rs
@@ -85,6 +85,12 @@ pub(crate) struct UsageUpdatePayload {
     pub context_limit: u64,
     pub accumulated_input_tokens: u64,
     pub accumulated_output_tokens: u64,
+    /// The cache-served subset of `accumulated_input_tokens`. Optional — goose
+    /// does not send it, and buzz-agent only reports a non-zero value when the
+    /// provider returned a cache split, so `0` legitimately means either "no
+    /// cache hits" or "provider reported none".
+    #[serde(default)]
+    pub accumulated_cached_input_tokens: u64,
     pub accumulated_cost: Option<f64>,
     /// Effective model id for this turn. Optional — goose payloads that
     /// predate this field deserialize cleanly as `None`.
@@ -323,12 +329,44 @@ impl UsageTracker {
 mod tests {
     use super::*;
 
+    /// The camelCase key buzz-agent actually puts on the wire must land on the
+    /// field. A rename mismatch here would deserialize to the serde default of
+    /// 0, and every trial would price as if nothing had ever been cached — the
+    /// exact silent failure this field was added to remove.
+    #[test]
+    fn cached_input_tokens_deserialize_from_the_wire_key() {
+        let p: UsageUpdatePayload = serde_json::from_value(serde_json::json!({
+            "used": 15_247,
+            "contextLimit": 0,
+            "accumulatedInputTokens": 15_091,
+            "accumulatedOutputTokens": 156,
+            "accumulatedCachedInputTokens": 5_033,
+        }))
+        .expect("payload must deserialize");
+        assert_eq!(p.accumulated_cached_input_tokens, 5_033);
+        assert!(p.accumulated_cached_input_tokens <= p.accumulated_input_tokens);
+    }
+
+    /// goose does not send the field; its payloads must still deserialize.
+    #[test]
+    fn a_payload_without_the_cache_field_defaults_to_zero() {
+        let p: UsageUpdatePayload = serde_json::from_value(serde_json::json!({
+            "used": 500,
+            "contextLimit": 200_000,
+            "accumulatedInputTokens": 400,
+            "accumulatedOutputTokens": 100,
+        }))
+        .expect("payload must deserialize without the cache field");
+        assert_eq!(p.accumulated_cached_input_tokens, 0);
+    }
+
     fn payload(input: u64, output: u64, cost: Option<f64>) -> UsageUpdatePayload {
         UsageUpdatePayload {
             used: input + output,
             context_limit: 200_000,
             accumulated_input_tokens: input,
             accumulated_output_tokens: output,
+            accumulated_cached_input_tokens: 0,
             accumulated_cost: cost,
             model: None,
         }
@@ -340,6 +378,7 @@ mod tests {
             context_limit: 0,
             accumulated_input_tokens: input,
             accumulated_output_tokens: output,
+            accumulated_cached_input_tokens: 0,
             accumulated_cost: cost,
             model: None,
         }
@@ -836,6 +875,7 @@ mod tests {
             context_limit: 200_000,
             accumulated_input_tokens: input,
             accumulated_output_tokens: output,
+            accumulated_cached_input_tokens: 0,
             accumulated_cost: cost,
             model: model.map(str::to_string),
         }
diff --git a/crates/buzz-agent/src/agent.rs b/crates/buzz-agent/src/agent.rs
index 730e87b2e8..ed04daca2c 100644
--- a/crates/buzz-agent/src/agent.rs
+++ b/crates/buzz-agent/src/agent.rs
@@ -60,6 +60,11 @@ pub struct RunCtx<'a> {
     /// Accumulated output tokens across all LLM rounds in this turn, for
     /// NIP-AM metric publishing. Reset to `None` at turn start in `run()`.
     pub turn_output_tokens: &'a mut Option<u64>,
+    /// The cache-served subset of `turn_input_tokens`, accumulated across all
+    /// LLM rounds in this turn. Reset to `None` at turn start in `run()`.
+    /// Consumers price this slice at the provider's cached rate; without it
+    /// every round of a growing conversation is billed at full price.
+    pub turn_cached_input_tokens: &'a mut Option<u64>,
 }
 
 impl RunCtx<'_> {
@@ -78,6 +83,7 @@ impl RunCtx<'_> {
         // Reset per-turn token accumulators for this prompt.
         *self.turn_input_tokens = None;
         *self.turn_output_tokens = None;
+        *self.turn_cached_input_tokens = None;
 
         let mut round = 0u32;
         // Per-prompt `_Stop` objection count. Bounded per prompt (not per
@@ -175,6 +181,17 @@ impl RunCtx<'_> {
                 *self.turn_output_tokens =
                     Some(self.turn_output_tokens.unwrap_or(0).saturating_add(out));
             }
+            // Accumulate the cache-served subset of this turn's input. Tracked
+            // separately from `turn_input_tokens` rather than subtracted from
+            // it: the input total must stay inclusive for the handoff gate,
+            // which cares how much context was sent, not what it cost.
+            if let Some(cached) = response.cached_input_tokens {
+                *self.turn_cached_input_tokens = Some(
+                    self.turn_cached_input_tokens
+                        .unwrap_or(0)
+                        .saturating_add(cached),
+                );
+            }
 
             if !response.reasoning.is_empty() {
                 wire::send(
@@ -679,6 +696,9 @@ pub(crate) fn push_hook_outputs_as_tool_results(
                 provider_id: provider_id.clone(),
                 name: tool_name,
                 arguments: serde_json::json!({}),
+                // Synthesised locally, so there is no provider wire form to
+                // preserve.
+                provider_extra: Default::default(),
             }],
         });
         history.push(HistoryItem::ToolResult(ToolResult {
diff --git a/crates/buzz-agent/src/catalog.rs b/crates/buzz-agent/src/catalog.rs
index fa57935717..aa2a121c99 100644
--- a/crates/buzz-agent/src/catalog.rs
+++ b/crates/buzz-agent/src/catalog.rs
@@ -37,8 +37,11 @@ pub const DATABRICKS_V2_KNOWN_MODELS: &[&str] =
 /// This is the list of models advertised by `session/new` when
 /// `discover_databricks_models` returns an error (e.g., no token available).
 ///
-/// - `DatabricksV2` falls back to [`DATABRICKS_V2_KNOWN_MODELS`] so the
-///   model-picker is always populated for AI Gateway v2 users.
+/// - `DatabricksV2` falls back to the configured model plus
+///   [`DATABRICKS_V2_KNOWN_MODELS`] so the model-picker is always populated for
+///   AI Gateway v2 users. The configured model leads: without it a fallback
+///   catalog can omit the very model the agent is running, leaving the picker
+///   unable to represent the current selection.
 /// - Legacy `Databricks` falls back to only the configured model — the
 ///   `DATABRICKS_V2_KNOWN_MODELS` IDs are AI Gateway v2 endpoints that the
 ///   `/serving-endpoints/{model}/invocations` API may not serve.
@@ -46,25 +49,62 @@ pub const DATABRICKS_V2_KNOWN_MODELS: &[&str] =
 /// Extracting this as a pure function makes the split testable without
 /// spawning an async runtime or making network calls.
 pub fn discovery_failure_fallback(provider: Provider, configured_model: &str) -> Vec<ModelEntry> {
+    // `resolve_model` does not trim, so a padded `DATABRICKS_MODEL` reaches here:
+    // normalize once, or the dedupe below misses and the picker lists the model
+    // twice (once padded, once from the known slate).
+    let configured_model = configured_model.trim();
+    let configured = ModelEntry {
+        id: configured_model.to_string(),
+        name: configured_model.to_string(),
+    };
     match provider {
-        Provider::DatabricksV2 => DATABRICKS_V2_KNOWN_MODELS
-            .iter()
-            .map(|id| ModelEntry {
-                id: id.to_string(),
-                name: id.to_string(),
-            })
-            .collect(),
-        Provider::Databricks => vec![ModelEntry {
-            id: configured_model.to_string(),
-            name: configured_model.to_string(),
-        }],
-        _ => vec![ModelEntry {
-            id: configured_model.to_string(),
-            name: configured_model.to_string(),
-        }],
+        Provider::DatabricksV2 => {
+            let mut entries = Vec::with_capacity(DATABRICKS_V2_KNOWN_MODELS.len() + 1);
+            if !configured_model.is_empty() {
+                entries.push(configured);
+            }
+            entries.extend(
+                DATABRICKS_V2_KNOWN_MODELS
+                    .iter()
+                    .filter(|id| **id != configured_model)
+                    .map(|id| ModelEntry {
+                        id: id.to_string(),
+                        name: id.to_string(),
+                    }),
+            );
+            entries
+        }
+        Provider::Databricks => vec![configured],
+        _ => vec![configured],
     }
 }
 
+/// Heuristic: `true` when a v2 AI Gateway endpoint name looks like it serves
+/// chat/completions traffic.
+///
+/// The v1 `serving-endpoints` payload carries `task`, so [`parse_v1_endpoints`]
+/// can filter on it directly. The v2 `ai-gateway/v2/endpoints` payload carries
+/// no task or readiness field at all, so the only signal available here is the
+/// endpoint name. Embedding endpoints are the one family that reliably cannot
+/// serve a chat request — they reject it with
+/// `API type 'mlflow/v1/chat/completions' is not supported by '<name>'` — so
+/// they are dropped rather than offered as selectable models.
+///
+/// Deliberately narrow: image-capable endpoints (e.g.
+/// `databricks-gemini-3-pro-image`) do answer chat requests, so they stay. Any
+/// name this heuristic does not recognise is kept — preferring to include over
+/// silently dropping, matching [`parse_v1_endpoints`].
+pub(crate) fn is_chat_capable_endpoint(name: &str) -> bool {
+    let lower = name.to_ascii_lowercase();
+    if lower.contains("embedding") {
+        return false;
+    }
+    // Segment match so `bge`/`gte` cannot fire on a substring of a longer word.
+    !lower
+        .split('-')
+        .any(|segment| matches!(segment, "bge" | "gte"))
+}
+
 /// Discover available models for a Databricks provider.
 ///
 /// Returns a non-empty `Vec<ModelEntry>` on success. Returns
@@ -197,7 +237,7 @@ async fn fetch_v2_models(
     host: &str,
     bearer: &str,
 ) -> Result<Vec<ModelEntry>, AgentError> {
-    let mut all_models: Vec<ModelEntry> = Vec::new();
+    let mut all_endpoints: Vec<V2Endpoint> = Vec::new();
     let mut page_token: Option<String> = None;
     let base_url = format!("{host}/api/ai-gateway/v2/endpoints");
 
@@ -235,8 +275,8 @@ async fn fetch_v2_models(
             ))
         })?;
 
-        let (page_models, next) = parse_v2_endpoints_page(&json)?;
-        all_models.extend(page_models);
+        let (page_endpoints, next) = parse_v2_endpoints_page(&json)?;
+        all_endpoints.extend(page_endpoints);
 
         match next {
             Some(tok) if Some(&tok) != page_token.as_ref() => page_token = Some(tok),
@@ -245,26 +285,74 @@ async fn fetch_v2_models(
     }
 
     // Fall back to known-model list if the API returned nothing.
-    if all_models.is_empty() {
-        all_models = DATABRICKS_V2_KNOWN_MODELS
+    if all_endpoints.is_empty() {
+        return Ok(DATABRICKS_V2_KNOWN_MODELS
             .iter()
             .map(|id| ModelEntry {
                 id: id.to_string(),
                 name: id.to_string(),
             })
-            .collect();
+            .collect());
     }
 
-    Ok(all_models)
+    sort_v2_endpoints_newest_first(&mut all_endpoints);
+
+    Ok(all_endpoints
+        .into_iter()
+        .map(|endpoint| endpoint.entry)
+        .collect())
+}
+
+/// A v2 gateway endpoint plus the key discovery orders the catalog by.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) struct V2Endpoint {
+    pub(crate) entry: ModelEntry,
+    /// `created_timestamp` as epoch milliseconds. `None` when the field is
+    /// absent or unparseable — those sort last rather than jumping the queue.
+    pub(crate) created_ms: Option<i64>,
+}
+
+/// Read `created_timestamp` from one endpoint object.
+///
+/// The gateway sends epoch milliseconds as a JSON *string*
+/// (`"created_timestamp": "1699610000000"`); accept a bare number too, so a
+/// wire-shape change doesn't silently drop every endpoint to the bottom.
+fn endpoint_created_ms(endpoint: &serde_json::Value) -> Option<i64> {
+    let value = endpoint.get("created_timestamp")?;
+    value
+        .as_i64()
+        .or_else(|| value.as_str()?.trim().parse::<i64>().ok())
+}
+
+/// Order the catalog newest-first, breaking ties by name.
+///
+/// The gateway returns endpoints in two phases — Databricks-managed first, then
+/// workspace-created — each alphabetical by name, which buries a brand-new
+/// frontier model deep in the list. Newest-first puts the models people are
+/// reaching for at the top of the picker.
+///
+/// Endpoints with no usable timestamp sort last, and the name tiebreak keeps the
+/// result stable: several managed endpoints share one placeholder timestamp, so
+/// without it their relative order would be arbitrary.
+pub(crate) fn sort_v2_endpoints_newest_first(endpoints: &mut [V2Endpoint]) {
+    endpoints.sort_by(|a, b| {
+        // `None` < `Some(_)`, so reversing puts timestamped endpoints first.
+        b.created_ms
+            .cmp(&a.created_ms)
+            .then_with(|| a.entry.name.cmp(&b.entry.name))
+    });
 }
 
 /// Parse one page of a `GET api/ai-gateway/v2/endpoints` response.
 ///
-/// Returns `(models, next_page_token)`. An empty or absent `next_page_token`
-/// signals the last page.
+/// Returns `(endpoints, next_page_token)`. An empty or absent `next_page_token`
+/// signals the last page. Endpoints that cannot serve chat traffic are dropped
+/// (see [`is_chat_capable_endpoint`]) so the model picker only offers models the
+/// agent can actually run. Page order is preserved here; the caller sorts once
+/// every page is in (see [`sort_v2_endpoints_newest_first`]).
 pub(crate) fn parse_v2_endpoints_page(
     json: &serde_json::Value,
-) -> Result<(Vec<ModelEntry>, Option<String>), AgentError> {
+) -> Result<(Vec<V2Endpoint>, Option<String>), AgentError> {
     let endpoints = json
         .get("endpoints")
         .and_then(|v| v.as_array())
@@ -279,9 +367,15 @@ pub(crate) fn parse_v2_endpoints_page(
         .iter()
         .filter_map(|endpoint| {
             let name = endpoint.get("name")?.as_str()?.to_string();
-            Some(ModelEntry {
-                id: name.clone(),
-                name,
+            if !is_chat_capable_endpoint(&name) {
+                return None;
+            }
+            Some(V2Endpoint {
+                entry: ModelEntry {
+                    id: name.clone(),
+                    name,
+                },
+                created_ms: endpoint_created_ms(endpoint),
             })
         })
         .collect();
@@ -356,7 +450,7 @@ mod tests {
         });
 
         let (models, next) = parse_v2_endpoints_page(&json).unwrap();
-        let ids: Vec<&str> = models.iter().map(|m| m.id.as_str()).collect();
+        let ids: Vec<&str> = models.iter().map(|m| m.entry.id.as_str()).collect();
         assert_eq!(
             ids,
             vec![
@@ -399,4 +493,139 @@ mod tests {
             "got: {err}"
         );
     }
+
+    #[test]
+    fn v2_parse_drops_embedding_endpoints() {
+        // The v2 payload carries no `task`, so embedding endpoints are only
+        // recognisable by name. They reject chat requests, so offering them in
+        // the picker can only produce a 400 at send time.
+        let json = serde_json::json!({
+            "endpoints": [
+                {"name": "databricks-bge-large-en"},
+                {"name": "databricks-gte-large-en"},
+                {"name": "databricks-qwen3-embedding-0-6b"},
+                {"name": "databricks-claude-opus-5"},
+                {"name": "databricks-gemini-3-pro-image"},
+            ]
+        });
+
+        let (models, _) = parse_v2_endpoints_page(&json).unwrap();
+        let ids: Vec<&str> = models.iter().map(|m| m.entry.id.as_str()).collect();
+        // Image endpoints DO answer chat requests, so they are retained.
+        assert_eq!(
+            ids,
+            vec!["databricks-claude-opus-5", "databricks-gemini-3-pro-image"]
+        );
+    }
+
+    #[test]
+    fn v2_parse_reads_created_timestamp_in_either_wire_shape() {
+        // The gateway sends epoch ms as a string; a bare number must work too.
+        let json = serde_json::json!({
+            "endpoints": [
+                {"name": "string-ts", "created_timestamp": "1784932442251"},
+                {"name": "number-ts", "created_timestamp": 1784932442251i64},
+                {"name": "junk-ts", "created_timestamp": "not-a-number"},
+                {"name": "no-ts"},
+            ]
+        });
+
+        let (models, _) = parse_v2_endpoints_page(&json).unwrap();
+        let stamps: Vec<Option<i64>> = models.iter().map(|m| m.created_ms).collect();
+        assert_eq!(
+            stamps,
+            vec![Some(1784932442251), Some(1784932442251), None, None,]
+        );
+    }
+
+    #[test]
+    fn v2_endpoints_sort_newest_first_then_by_name() {
+        // Mirrors the real catalog: the gateway pages Databricks-managed
+        // endpoints first, then workspace-created ones, each alphabetical — so
+        // the newest model is buried mid-list until this sort runs.
+        let json = serde_json::json!({
+            "endpoints": [
+                {"name": "databricks-claude-opus-5", "created_timestamp": "1784851200000"},
+                {"name": "databricks-gpt-5-6-sol", "created_timestamp": "1784073600000"},
+                {"name": "databricks-gpt-5-6-luna", "created_timestamp": "1784073600000"},
+                {"name": "databricks-llama-4-maverick", "created_timestamp": "1699610000000"},
+                {"name": "goose-claude-opus-5", "created_timestamp": "1784932442251"},
+                {"name": "endpoint-without-timestamp"},
+            ]
+        });
+
+        let (mut models, _) = parse_v2_endpoints_page(&json).unwrap();
+        sort_v2_endpoints_newest_first(&mut models);
+
+        let ids: Vec<&str> = models.iter().map(|m| m.entry.id.as_str()).collect();
+        assert_eq!(
+            ids,
+            vec![
+                // Newest first, across both pagination phases.
+                "goose-claude-opus-5",
+                "databricks-claude-opus-5",
+                // Same timestamp — the name tiebreak keeps this deterministic.
+                "databricks-gpt-5-6-luna",
+                "databricks-gpt-5-6-sol",
+                "databricks-llama-4-maverick",
+                // No usable timestamp sorts last, never first.
+                "endpoint-without-timestamp",
+            ]
+        );
+    }
+
+    #[test]
+    fn is_chat_capable_endpoint_keeps_unrecognised_names() {
+        // Prefer including over silently dropping — an unknown family is kept.
+        assert!(is_chat_capable_endpoint("databricks-glm-5-2"));
+        assert!(is_chat_capable_endpoint("some-teams-custom-endpoint"));
+        // `bge`/`gte` match as whole segments only, never as substrings.
+        assert!(is_chat_capable_endpoint("databricks-budget-gtex-model"));
+        assert!(!is_chat_capable_endpoint("databricks-bge-large-en"));
+        assert!(!is_chat_capable_endpoint("databricks-gte-large-en"));
+        assert!(!is_chat_capable_endpoint("databricks-qwen3-embedding-0-6b"));
+    }
+
+    #[test]
+    fn v2_discovery_failure_fallback_leads_with_configured_model() {
+        let result = discovery_failure_fallback(Provider::DatabricksV2, "databricks-claude-opus-5");
+        let ids: Vec<&str> = result.iter().map(|m| m.id.as_str()).collect();
+
+        // The running model must be representable in the picker even when
+        // discovery failed, so it leads the fallback catalog.
+        assert_eq!(ids.first(), Some(&"databricks-claude-opus-5"));
+        for known in DATABRICKS_V2_KNOWN_MODELS {
+            assert!(ids.contains(known), "fallback must retain '{known}'");
+        }
+    }
+
+    #[test]
+    fn v2_discovery_failure_fallback_does_not_duplicate_configured_model() {
+        let configured = DATABRICKS_V2_KNOWN_MODELS[0];
+        let result = discovery_failure_fallback(Provider::DatabricksV2, configured);
+        let occurrences = result.iter().filter(|m| m.id == configured).count();
+        assert_eq!(occurrences, 1, "got: {result:?}");
+        assert_eq!(result.len(), DATABRICKS_V2_KNOWN_MODELS.len());
+    }
+
+    #[test]
+    fn v2_discovery_failure_fallback_tolerates_blank_configured_model() {
+        for configured in ["", "   "] {
+            let result = discovery_failure_fallback(Provider::DatabricksV2, configured);
+            let ids: Vec<&str> = result.iter().map(|m| m.id.as_str()).collect();
+            assert_eq!(ids, DATABRICKS_V2_KNOWN_MODELS.to_vec());
+        }
+    }
+
+    #[test]
+    fn v2_discovery_failure_fallback_dedupes_a_padded_configured_model() {
+        // `DATABRICKS_MODEL=" databricks-gpt-5-5 "` reaches here untrimmed, and an
+        // untrimmed comparison would list the model twice — once padded, once from
+        // the known slate.
+        let configured = DATABRICKS_V2_KNOWN_MODELS[0];
+        let result =
+            discovery_failure_fallback(Provider::DatabricksV2, &format!("  {configured} "));
+        let ids: Vec<&str> = result.iter().map(|m| m.id.as_str()).collect();
+        assert_eq!(ids, DATABRICKS_V2_KNOWN_MODELS.to_vec());
+    }
 }
diff --git a/crates/buzz-agent/src/config.rs b/crates/buzz-agent/src/config.rs
index f06849c7d1..037b67b3cb 100644
--- a/crates/buzz-agent/src/config.rs
+++ b/crates/buzz-agent/src/config.rs
@@ -184,6 +184,7 @@ pub fn anthropic_thinking_config(
 fn anthropic_model_supports_xhigh(model: &str) -> bool {
     model.starts_with("claude-opus-4-7")
         || model.starts_with("claude-opus-4-8")
+        || model.starts_with("claude-opus-5")
         || model.starts_with("claude-sonnet-5")
         || model.starts_with("claude-fable-5")
         || model.starts_with("claude-mythos-5")
@@ -606,6 +607,7 @@ fn is_adaptive_thinking_model(model: &str) -> bool {
     model.starts_with("claude-opus-4-6")
         || model.starts_with("claude-opus-4-7")
         || model.starts_with("claude-opus-4-8")
+        || model.starts_with("claude-opus-5")
         // Sonnet 5.x (any patch/date suffix after "claude-sonnet-5").
         || model.starts_with("claude-sonnet-5")
         // Sonnet 4.6 exactly (not Sonnet 4.5 or earlier — not in the adaptive table).
@@ -726,10 +728,23 @@ pub struct Config {
     pub anthropic_api_version: String,
     /// OpenAI endpoint selection. See [`OpenAiApi`].
     pub openai_api: OpenAiApi,
+    /// Prefer mesh-llm's virtual `mesh` model when the configured/effective
+    /// OpenAI model is `auto` and the live model catalog advertises it.
+    /// Set by Buzz's relay-mesh provider via
+    /// `BUZZ_AGENT_PREFER_MESH_FOR_AUTO=1`; other providers keep their
+    /// existing `auto` semantics.
+    pub prefer_mesh_for_auto: bool,
     pub hints_enabled: bool,
     /// Thinking/reasoning effort level. `None` = use provider default (no
     /// thinking config sent). Set via `BUZZ_AGENT_THINKING_EFFORT`.
     pub thinking_effort: Option<ThinkingEffort>,
+    /// 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`. Only consulted on Anthropic
+    /// Messages routes (first-party Anthropic and the DatabricksV2 Claude
+    /// route) — the Databricks gateway does not auto-cache, so without this the
+    /// surfaced `cache_read_input_tokens` is structurally always 0.
+    pub prompt_caching: bool,
 }
 
 impl Config {
@@ -798,6 +813,7 @@ impl Config {
             base_url,
             anthropic_api_version: env_or("ANTHROPIC_API_VERSION", "2023-06-01"),
             openai_api,
+            prefer_mesh_for_auto: parse_env("BUZZ_AGENT_PREFER_MESH_FOR_AUTO", 0u8)? != 0,
             max_rounds: parse_env("BUZZ_AGENT_MAX_ROUNDS", 0)?,
             max_output_tokens: parse_env("BUZZ_AGENT_MAX_OUTPUT_TOKENS", 32_768)?,
             llm_timeout: Duration::from_secs(parse_env("BUZZ_AGENT_LLM_TIMEOUT_SECS", 240)?),
@@ -824,6 +840,7 @@ 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())?,
+            prompt_caching: parse_env("BUZZ_AGENT_PROMPT_CACHING", 1u8)? != 0,
         };
         cfg.validate()?;
         Ok(cfg)
@@ -844,6 +861,7 @@ impl Config {
             system_prompt: String::new(),
             anthropic_api_version: "2023-06-01".into(),
             openai_api: OpenAiApi::Chat,
+            prefer_mesh_for_auto: false,
             max_rounds: 0,
             max_output_tokens: 1,
             llm_timeout: Duration::from_secs(30),
@@ -864,6 +882,7 @@ impl Config {
             hook_servers: HookServers::None,
             hints_enabled: false,
             thinking_effort: None,
+            prompt_caching: false,
         }
     }
 
diff --git a/crates/buzz-agent/src/lib.rs b/crates/buzz-agent/src/lib.rs
index f5faafe853..6745dd0f92 100644
--- a/crates/buzz-agent/src/lib.rs
+++ b/crates/buzz-agent/src/lib.rs
@@ -100,6 +100,11 @@ struct Session {
     accumulated_input_tokens: u64,
     /// Session-cumulative output tokens across all turns.
     accumulated_output_tokens: u64,
+    /// Session-cumulative cache-served input tokens across all turns — a subset
+    /// of `accumulated_input_tokens`, not an addition to it. Emitted alongside
+    /// it so a consumer can price the cached slice at the provider's discounted
+    /// rate instead of assuming every input token cost full price.
+    accumulated_cached_input_tokens: u64,
 }
 
 fn die(msg: String) -> ! {
@@ -426,6 +431,7 @@ async fn session_new(app: &Arc<App>, id: Value, params: Value, wire_tx: &WireSen
             effective_model: None,
             accumulated_input_tokens: 0,
             accumulated_output_tokens: 0,
+            accumulated_cached_input_tokens: 0,
         },
     );
     drop(sessions);
@@ -672,6 +678,7 @@ async fn run_prompt(app: Arc<App>, id: Value, params: Value, wire_tx: WireSender
         .unwrap_or(&app.cfg.model);
     let mut turn_input_tokens: Option<u64> = None;
     let mut turn_output_tokens: Option<u64> = None;
+    let mut turn_cached_input_tokens: Option<u64> = None;
     let mut ctx = RunCtx {
         cfg: &app.cfg,
         effective_model: effective_model_str,
@@ -690,6 +697,7 @@ async fn run_prompt(app: Arc<App>, id: Value, params: Value, wire_tx: WireSender
         last_request_history_bytes: &mut last_request_history_bytes,
         turn_input_tokens: &mut turn_input_tokens,
         turn_output_tokens: &mut turn_output_tokens,
+        turn_cached_input_tokens: &mut turn_cached_input_tokens,
     };
     let result = ctx.run(p.prompt).await;
     if let Some(s) = app.sessions.lock().await.get_mut(&sid) {
@@ -722,14 +730,21 @@ async fn run_prompt(app: Arc<App>, id: Value, params: Value, wire_tx: WireSender
                 s.accumulated_output_tokens = s
                     .accumulated_output_tokens
                     .saturating_add(turn_output_tokens.unwrap_or(0));
-                Some((s.accumulated_input_tokens, s.accumulated_output_tokens))
+                s.accumulated_cached_input_tokens = s
+                    .accumulated_cached_input_tokens
+                    .saturating_add(turn_cached_input_tokens.unwrap_or(0));
+                Some((
+                    s.accumulated_input_tokens,
+                    s.accumulated_output_tokens,
+                    s.accumulated_cached_input_tokens,
+                ))
             } else {
                 // Session is gone — the accumulated baseline no longer exists, so
                 // there is nothing correct to emit. Skip the usage notification.
                 None
             }
         };
-        if let Some((accumulated_in, accumulated_out)) = accumulated {
+        if let Some((accumulated_in, accumulated_out, accumulated_cached)) = accumulated {
             wire::send(
                 &wire_tx,
                 goose_session_update(
@@ -742,6 +757,11 @@ async fn run_prompt(app: Arc<App>, id: Value, params: Value, wire_tx: WireSender
                         "contextLimit": 0u64,
                         "accumulatedInputTokens": accumulated_in,
                         "accumulatedOutputTokens": accumulated_out,
+                        // A subset of accumulatedInputTokens, not an addition to
+                        // it. Extends goose's usage_update shape; a consumer that
+                        // does not know the field ignores it and prices exactly as
+                        // it did before.
+                        "accumulatedCachedInputTokens": accumulated_cached,
                         "model": effective_model_str,
                     }),
                 ),
@@ -920,11 +940,13 @@ mod tests {
         let configured = "my-configured-model";
         let result = discovery_failure_fallback(Provider::DatabricksV2, configured);
 
-        // DatabricksV2 must return the full DATABRICKS_V2_KNOWN_MODELS list.
+        // DatabricksV2 must return the full DATABRICKS_V2_KNOWN_MODELS list,
+        // plus the configured model so the picker can still represent the model
+        // the agent is actually running.
         assert_eq!(
             result.len(),
-            DATABRICKS_V2_KNOWN_MODELS.len(),
-            "DatabricksV2 fallback must return all known models"
+            DATABRICKS_V2_KNOWN_MODELS.len() + 1,
+            "DatabricksV2 fallback must return all known models plus the configured model"
         );
         let result_ids: Vec<&str> = result.iter().map(|m| m.id.as_str()).collect();
         for known_id in DATABRICKS_V2_KNOWN_MODELS {
@@ -933,6 +955,10 @@ mod tests {
                 "DatabricksV2 fallback must include known model '{known_id}'"
             );
         }
+        assert!(
+            result_ids.contains(&configured),
+            "DatabricksV2 fallback must include the configured model"
+        );
     }
 
     #[test]
diff --git a/crates/buzz-agent/src/llm.rs b/crates/buzz-agent/src/llm.rs
index 758be4e124..22d3f8b73e 100644
--- a/crates/buzz-agent/src/llm.rs
+++ b/crates/buzz-agent/src/llm.rs
@@ -1,8 +1,11 @@
+use std::collections::BTreeSet;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 
 use reqwest::Client;
-use serde_json::{json, Value};
+use serde_json::{json, Map, Value};
+use tokio::sync::Mutex;
+use tokio::time::Instant;
 
 use crate::auth::{PkceOAuthConfig, PkceOAuthTokenSource, StaticTokenSource, TokenSource};
 use crate::config::{
@@ -22,11 +25,59 @@ const DATABRICKS_OAUTH_SCOPES: &[&str] = &["all-apis", "offline_access"];
 const MAX_LLM_RESPONSE_BYTES: usize = 16 * 1024 * 1024;
 const MAX_LLM_ERROR_BODY_BYTES: usize = 4 * 1024;
 const STALL_NOTICE_THRESHOLD: std::time::Duration = std::time::Duration::from_secs(300);
+const MESH_VIRTUAL_MODEL_ID: &str = "mesh";
+const MESH_AUTO_MODEL_ID: &str = "auto";
+const MESH_AUTO_CATALOG_TTL: std::time::Duration = std::time::Duration::from_secs(5);
+const MESH_AUTO_CATALOG_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(2);
+const MESH_AUTO_COOLDOWN: std::time::Duration = std::time::Duration::from_secs(30);
+const MESH_AUTO_ENABLE_OBSERVATIONS: u8 = 2;
+const MESH_MOA_UNAVAILABLE_MESSAGE: &str = "MoA requires ≥2 models available in the mesh";
 
 /// Parser for an OpenAI-family JSON response. Per-endpoint pair lives
 /// alongside its `_body` serializer.
 type OpenAiParse = fn(Value) -> Result<LlmResponse, AgentError>;
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum MeshCatalogObservation {
+    Available,
+    Unavailable,
+    Unknown,
+}
+
+fn mesh_catalog_supports_collective(catalog: &Value) -> Option<bool> {
+    let models = catalog.get("data").and_then(Value::as_array)?;
+    let mut has_virtual_mesh = false;
+    let mut physical_models = BTreeSet::new();
+    for id in models
+        .iter()
+        .filter_map(|model| model.get("id").and_then(Value::as_str))
+        .map(str::trim)
+        .filter(|id| !id.is_empty())
+    {
+        if id == MESH_VIRTUAL_MODEL_ID {
+            has_virtual_mesh = true;
+        } else if id != MESH_AUTO_MODEL_ID {
+            physical_models.insert(id.replace("@main", ""));
+        }
+    }
+    Some(has_virtual_mesh && physical_models.len() >= 2)
+}
+
+fn looks_like_unstructured_tool_call(text: &str) -> bool {
+    let text = text.trim_start().to_ascii_lowercase();
+    text.starts_with("<|tool_call")
+        || text.starts_with("<tool_call")
+        || text.starts_with("[tool_call]")
+}
+
+#[derive(Debug, Default)]
+struct MeshAutoState {
+    last_checked: Option<Instant>,
+    consecutive_available: u8,
+    collective_enabled: bool,
+    cooldown_until: Option<Instant>,
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum DatabricksV2Route {
     OpenAiResponses,
@@ -41,6 +92,10 @@ pub struct Llm {
     /// == Auto`. Subsequent OpenAI calls then go straight to Responses
     /// for the lifetime of the process.
     auto_upgraded: AtomicBool,
+    /// Hysteretic view of whether mesh-llm currently advertises its virtual
+    /// Mixture-of-Agents model. A TTL, confirmation count, and failure cooldown
+    /// let long-running agents adapt without bouncing as peers briefly flap.
+    mesh_auto_state: Mutex<MeshAutoState>,
     /// Bearer-token source for OpenAI-family requests. Static for OpenAI
     /// (the `OPENAI_COMPAT_API_KEY` env var) and Databricks-with-token
     /// (the `DATABRICKS_TOKEN` env var); a refreshable PKCE engine for
@@ -60,6 +115,7 @@ impl Llm {
         Ok(Self {
             http,
             auto_upgraded: AtomicBool::new(false),
+            mesh_auto_state: Mutex::new(MeshAutoState::default()),
             auth,
         })
     }
@@ -91,24 +147,37 @@ impl Llm {
                 parse_anthropic(v)
             }
             Provider::OpenAi | Provider::Databricks => {
-                self.openai_request(cfg, effective_model, |use_responses| {
-                    // Normalize effort for model-specific availability. Startup no longer rejects
-                    // `max` for pure OpenAI/Databricks; this per-model table is the single authority
-                    // — it keeps `max` for gpt-5.6, clamps `max`→`xhigh` for other OpenAI-shaped
-                    // models, and still applies corrections like none→minimal on the gpt-5 base.
-                    let e = effort.map(|ef| normalize_effort_for_openai_route(ef, effective_model));
-                    if use_responses {
-                        (
-                            responses_body(cfg, system_prompt, history, tools, effective_model, e),
-                            parse_responses as OpenAiParse,
-                        )
-                    } else {
-                        (
-                            openai_body(cfg, system_prompt, history, tools, effective_model, e),
-                            parse_openai as OpenAiParse,
-                        )
-                    }
-                })
+                self.openai_request(
+                    cfg,
+                    effective_model,
+                    !tools.is_empty(),
+                    |use_responses, request_model| {
+                        // Normalize effort for model-specific availability. Startup no longer rejects
+                        // `max` for pure OpenAI/Databricks; this per-model table is the single authority
+                        // — it keeps `max` for gpt-5.6, clamps `max`→`xhigh` for other OpenAI-shaped
+                        // models, and still applies corrections like none→minimal on the gpt-5 base.
+                        let e =
+                            effort.map(|ef| normalize_effort_for_openai_route(ef, request_model));
+                        if use_responses {
+                            (
+                                responses_body(
+                                    cfg,
+                                    system_prompt,
+                                    history,
+                                    tools,
+                                    request_model,
+                                    e,
+                                ),
+                                parse_responses as OpenAiParse,
+                            )
+                        } else {
+                            (
+                                openai_body(cfg, system_prompt, history, tools, request_model, e),
+                                parse_openai as OpenAiParse,
+                            )
+                        }
+                    },
+                )
                 .await
             }
             Provider::DatabricksV2 => {
@@ -181,32 +250,37 @@ impl Llm {
             }
             Provider::OpenAi | Provider::Databricks => {
                 let r = self
-                    .openai_request(cfg, effective_model, |use_responses| {
-                        if use_responses {
-                            (
-                                json!({
-                                    "model": effective_model,
-                                    "max_output_tokens": max_output_tokens,
-                                    "instructions": system_prompt,
-                                    "input": user_prompt,
-                                }),
-                                parse_responses as OpenAiParse,
-                            )
-                        } else {
-                            (
-                                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,
-                            )
-                        }
-                    })
+                    .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)
             }
@@ -255,49 +329,247 @@ impl Llm {
 
     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, |r| {
+        post(&self.http, &url, body, false, |r| {
             r.header("x-api-key", &cfg.api_key)
                 .header("anthropic-version", &cfg.anthropic_api_version)
         })
         .await
+        .map_err(PostError::into_agent)
     }
 
-    /// OpenAI dispatch: resolve endpoint (pinned > sticky-upgraded > auto by
-    /// host), POST, and on `auto` retry once on Responses if the provider
-    /// asks for it. `build` is called with `use_responses` so callers
-    /// only construct the body actually needed.
+    /// OpenAI dispatch with Buzz's relay-mesh `auto` policy layered over the
+    /// normal endpoint selection. When enabled, a live virtual `mesh` model is
+    /// preferred; if the mesh contracts between discovery and inference, retry
+    /// the same request once through the router's ordinary `auto` model.
     async fn openai_request<F>(
         &self,
         cfg: &Config,
         effective_model: &str,
+        tools_supplied: bool,
         mut build: F,
     ) -> Result<LlmResponse, AgentError>
     where
-        F: FnMut(bool) -> (Value, OpenAiParse) + Send,
+        F: FnMut(bool, &str) -> (Value, OpenAiParse) + Send,
+    {
+        let request_model = self.resolve_openai_model(cfg, effective_model).await;
+        let adaptive_mesh =
+            effective_model == MESH_AUTO_MODEL_ID && request_model == MESH_VIRTUAL_MODEL_ID;
+
+        let first = self
+            .openai_request_for_model(cfg, &request_model, &mut build)
+            .await;
+        match first {
+            Err(PostError::MeshFallback(detail)) if adaptive_mesh => {
+                self.cool_down_collective().await;
+                tracing::warn!(
+                    configured_model = effective_model,
+                    attempted_model = MESH_VIRTUAL_MODEL_ID,
+                    fallback_model = MESH_AUTO_MODEL_ID,
+                    provider_message = detail,
+                    "relay-mesh auto: collective request failed; retrying once with auto"
+                );
+                self.openai_request_for_model(cfg, MESH_AUTO_MODEL_ID, &mut build)
+                    .await
+                    .map_err(PostError::into_agent)
+            }
+            Ok(response)
+                if adaptive_mesh
+                    && tools_supplied
+                    && response.tool_calls.is_empty()
+                    && looks_like_unstructured_tool_call(&response.text) =>
+            {
+                self.cool_down_collective().await;
+                tracing::warn!(
+                    configured_model = effective_model,
+                    attempted_model = MESH_VIRTUAL_MODEL_ID,
+                    fallback_model = MESH_AUTO_MODEL_ID,
+                    "relay-mesh auto: collective response emitted unstructured tool markup; retrying once with auto"
+                );
+                self.openai_request_for_model(cfg, MESH_AUTO_MODEL_ID, &mut build)
+                    .await
+                    .map_err(PostError::into_agent)
+            }
+            Ok(response) => Ok(response),
+            Err(error) => Err(error.into_agent()),
+        }
+    }
+
+    async fn cool_down_collective(&self) {
+        let now = Instant::now();
+        let mut state = self.mesh_auto_state.lock().await;
+        state.last_checked = Some(now);
+        state.consecutive_available = 0;
+        state.collective_enabled = false;
+        state.cooldown_until = Some(now + MESH_AUTO_COOLDOWN);
+    }
+
+    /// Resolve the model for one OpenAI-family request. Explicit model choices
+    /// are never changed. Relay-mesh `auto` dynamically follows the short-lived
+    /// `/models` catalog so long-running agents can adopt or leave MoA without
+    /// being restarted.
+    async fn resolve_openai_model(&self, cfg: &Config, effective_model: &str) -> String {
+        if cfg.provider != Provider::OpenAi
+            || !cfg.prefer_mesh_for_auto
+            || effective_model != MESH_AUTO_MODEL_ID
+        {
+            return effective_model.to_string();
+        }
+
+        let mut state = self.mesh_auto_state.lock().await;
+        let now = Instant::now();
+        if let Some(cooldown_until) = state.cooldown_until {
+            if now < cooldown_until {
+                return MESH_AUTO_MODEL_ID.to_string();
+            }
+            state.cooldown_until = None;
+        }
+        if state
+            .last_checked
+            .is_some_and(|checked_at| checked_at.elapsed() < MESH_AUTO_CATALOG_TTL)
+        {
+            return if state.collective_enabled {
+                MESH_VIRTUAL_MODEL_ID.to_string()
+            } else {
+                MESH_AUTO_MODEL_ID.to_string()
+            };
+        }
+
+        let observation = self.observe_mesh_virtual_model(cfg).await;
+        let checked_at = Instant::now();
+        state.last_checked = Some(checked_at);
+        match observation {
+            MeshCatalogObservation::Available => {
+                state.consecutive_available = state.consecutive_available.saturating_add(1);
+                if state.consecutive_available >= MESH_AUTO_ENABLE_OBSERVATIONS {
+                    state.collective_enabled = true;
+                }
+            }
+            MeshCatalogObservation::Unavailable => {
+                if state.collective_enabled {
+                    state.cooldown_until = Some(checked_at + MESH_AUTO_COOLDOWN);
+                }
+                state.consecutive_available = 0;
+                state.collective_enabled = false;
+            }
+            // A failed catalog check is not evidence that a previously stable
+            // mesh disappeared. Preserve the last confirmed state; inference
+            // itself remains authoritative and has the narrow 503 fallback.
+            MeshCatalogObservation::Unknown => {}
+        }
+        let request_model = if state.collective_enabled {
+            MESH_VIRTUAL_MODEL_ID
+        } else {
+            MESH_AUTO_MODEL_ID
+        };
+        tracing::debug!(
+            configured_model = effective_model,
+            request_model,
+            "relay-mesh auto: resolved request model from live catalog"
+        );
+        request_model.to_string()
+    }
+
+    async fn observe_mesh_virtual_model(&self, cfg: &Config) -> MeshCatalogObservation {
+        let url = format!("{}/models", cfg.base_url.trim_end_matches('/'));
+        let bearer = match self.auth.bearer().await {
+            Ok(bearer) => bearer,
+            Err(error) => {
+                tracing::debug!(
+                    %error,
+                    "relay-mesh auto: catalog auth unavailable; preserving last confirmed route"
+                );
+                return MeshCatalogObservation::Unknown;
+            }
+        };
+        let response = match self
+            .http
+            .get(&url)
+            .bearer_auth(bearer)
+            .timeout(MESH_AUTO_CATALOG_TIMEOUT)
+            .send()
+            .await
+        {
+            Ok(response) => response,
+            Err(error) => {
+                tracing::debug!(
+                    %error,
+                    "relay-mesh auto: catalog probe failed; preserving last confirmed route"
+                );
+                return MeshCatalogObservation::Unknown;
+            }
+        };
+        if !response.status().is_success() {
+            tracing::debug!(
+                status = %response.status(),
+                "relay-mesh auto: catalog probe was not successful; preserving last confirmed route"
+            );
+            return MeshCatalogObservation::Unknown;
+        }
+        match response.json::<Value>().await {
+            Ok(catalog) => {
+                let Some(available) = mesh_catalog_supports_collective(&catalog) else {
+                    tracing::debug!(
+                        "relay-mesh auto: catalog response has no data array; preserving last confirmed route"
+                    );
+                    return MeshCatalogObservation::Unknown;
+                };
+                if available {
+                    MeshCatalogObservation::Available
+                } else {
+                    MeshCatalogObservation::Unavailable
+                }
+            }
+            Err(error) => {
+                tracing::debug!(
+                    %error,
+                    "relay-mesh auto: invalid catalog response; preserving last confirmed route"
+                );
+                MeshCatalogObservation::Unknown
+            }
+        }
+    }
+
+    /// Dispatch one OpenAI request for an already-resolved model. Endpoint
+    /// selection remains unchanged: pinned > sticky-upgraded > host default,
+    /// with the existing one-shot Chat-to-Responses upgrade.
+    async fn openai_request_for_model<F>(
+        &self,
+        cfg: &Config,
+        request_model: &str,
+        build: &mut F,
+    ) -> Result<LlmResponse, PostError>
+    where
+        F: FnMut(bool, &str) -> (Value, OpenAiParse) + Send,
     {
         let use_responses = self.auto_upgraded.load(Ordering::Relaxed)
             || matches!(cfg.openai_api, OpenAiApi::Responses)
             || matches!(cfg.openai_api, OpenAiApi::Auto) && is_openai_host(&cfg.base_url);
 
         if use_responses {
-            let (b, p) = build(true);
-            return p(self
-                .post_openai(cfg, "/responses", &b, effective_model)
-                .await?);
+            let (body, parse) = build(true, request_model);
+            return parse(
+                self.post_openai(cfg, "/responses", &body, request_model)
+                    .await?,
+            )
+            .map_err(PostError::from);
         }
-        let (b, p) = build(false);
+        let (body, parse) = build(false, request_model);
         match self
-            .post_openai(cfg, "/chat/completions", &b, effective_model)
+            .post_openai(cfg, "/chat/completions", &body, request_model)
             .await
         {
-            Ok(v) => p(v),
-            Err(e) if cfg.openai_api == OpenAiApi::Auto && self.try_upgrade(&e) => {
-                let (b, p) = build(true);
-                p(self
-                    .post_openai(cfg, "/responses", &b, effective_model)
-                    .await?)
+            Ok(value) => parse(value).map_err(PostError::from),
+            Err(PostError::Agent(error))
+                if cfg.openai_api == OpenAiApi::Auto && self.try_upgrade(&error) =>
+            {
+                let (body, parse) = build(true, request_model);
+                parse(
+                    self.post_openai(cfg, "/responses", &body, request_model)
+                        .await?,
+                )
+                .map_err(PostError::from)
             }
-            Err(e) => Err(e),
+            Err(error) => Err(error),
         }
     }
 
@@ -314,7 +586,8 @@ impl Llm {
         let (body, parse) = build(route);
         parse(
             self.post_openai(cfg, databricks_v2_path(route), &body, effective_model)
-                .await?,
+                .await
+                .map_err(PostError::into_agent)?,
         )
     }
 
@@ -329,7 +602,7 @@ impl Llm {
         path: &str,
         body: &Value,
         effective_model: &str,
-    ) -> Result<Value, AgentError> {
+    ) -> Result<Value, PostError> {
         let (url, body_owned);
         let body_ref: &Value = match cfg.provider {
             Provider::Databricks => {
@@ -354,13 +627,25 @@ impl Llm {
         // rejection can never suppress a later turn's legitimate retry. Both
         // statuses map to `LlmAuth` in `post`: a 403 is indistinguishable from
         // an expired-token 403 here, so we refresh once and let it propagate.
-        let mut bearer = self.auth.bearer().await?;
+        let mut bearer = self.auth.bearer().await.map_err(PostError::from)?;
         let mut refreshed = false;
         loop {
-            match post(&self.http, &url, body_ref, |r| r.bearer_auth(&bearer)).await {
-                Err(AgentError::LlmAuth(_)) if !refreshed => {
+            match post(
+                &self.http,
+                &url,
+                body_ref,
+                effective_model == MESH_VIRTUAL_MODEL_ID,
+                |r| r.bearer_auth(&bearer),
+            )
+            .await
+            {
+                Err(PostError::Agent(AgentError::LlmAuth(_))) if !refreshed => {
                     refreshed = true;
-                    bearer = self.auth.refresh_now(&bearer).await?;
+                    bearer = self
+                        .auth
+                        .refresh_now(&bearer)
+                        .await
+                        .map_err(PostError::from)?;
                 }
                 result => return result,
             }
@@ -435,6 +720,12 @@ fn anthropic_body(
         }
     }
     flush(&mut messages, &mut pending);
+    // Rolling cache breakpoint: mark the tail of the (append-only) conversation
+    // so the next turn re-reads this whole prefix from cache instead of paying
+    // full input price for it. See `stamp_rolling_cache_breakpoint`.
+    if cfg.prompt_caching {
+        stamp_rolling_cache_breakpoint(&mut messages);
+    }
     let tools_json: Vec<Value> = tools
         .iter()
         .map(|t| {
@@ -442,8 +733,19 @@ fn anthropic_body(
         "name": t.name, "description": t.description, "input_schema": t.input_schema })
         })
         .collect();
+    // Static prefix breakpoint: caching the `system` block caches the whole
+    // prefix up to and including it — and the prefix order is
+    // `tools -> system -> messages`, so this single marker caches tools +
+    // system together. Requires the structured (array) form of `system`; skip
+    // it for an empty prompt since Anthropic rejects empty text blocks.
+    let system_value = if cfg.prompt_caching && !system_prompt.is_empty() {
+        json!([{ "type": "text", "text": system_prompt,
+            "cache_control": { "type": "ephemeral" } }])
+    } else {
+        json!(system_prompt)
+    };
     let mut body = json!({ "model": effective_model, "max_tokens": cfg.max_output_tokens,
-        "system": system_prompt, "messages": messages });
+        "system": system_value, "messages": messages });
     if let Some(e) = effort {
         let (thinking, output_config) =
             crate::config::anthropic_thinking_config(effective_model, e, cfg.max_output_tokens);
@@ -460,6 +762,41 @@ fn anthropic_body(
     body
 }
 
+/// Attach ephemeral `cache_control` markers to the tail of the conversation so
+/// the next turn re-reads the whole prior prefix from cache (~0.1x input price)
+/// rather than re-billing it as fresh input. Anthropic caches the prefix up to
+/// and including each marked block.
+///
+/// We mark the last content block of the last *two* messages, not just the
+/// final one. Each Anthropic breakpoint walks back at most 20 content blocks to
+/// find a prior cache entry, and one agentic turn can append ~17 blocks at the
+/// default `max_parallel_tools` (1 assistant text + N `tool_use` +
+/// N `tool_result`). With only a tail marker, consecutive breakpoints sit a
+/// full turn apart, which slips past the 20-block window as soon as parallelism
+/// rises or a turn carries extra blocks — and the miss is silent. Marking the
+/// last two messages halves the gap (to ~N+1 blocks), keeping a live cache
+/// entry comfortably within reach. Uses 2 of the 4 allowed breakpoints; the
+/// static `system` marker is the third.
+///
+/// A no-op for messages whose content is empty or whose tail block is not a
+/// JSON object.
+fn stamp_rolling_cache_breakpoint(messages: &mut [Value]) {
+    let n = messages.len();
+    // The two most-recently-appended messages (the current turn's tool results
+    // and the assistant turn before them). `checked_sub` + `flatten` skips the
+    // second index when there is only one message.
+    for idx in [n.checked_sub(1), n.checked_sub(2)].into_iter().flatten() {
+        if let Some(block) = messages[idx]
+            .get_mut("content")
+            .and_then(Value::as_array_mut)
+            .and_then(|c| c.last_mut())
+            .and_then(Value::as_object_mut)
+        {
+            block.insert("cache_control".into(), json!({ "type": "ephemeral" }));
+        }
+    }
+}
+
 fn anthropic_tool_result_content(content: &[ToolResultContent]) -> Vec<Value> {
     content
         .iter()
@@ -511,11 +848,24 @@ fn openai_body(
                     let calls: Vec<Value> = tool_calls
                         .iter()
                         .map(|c| {
-                            json!({
-                        "id": c.provider_id, "type": "function",
-                        "function": { "name": c.name,
-                            "arguments": serde_json::to_string(&c.arguments)
-                                .unwrap_or_else(|_| "{}".into()) } })
+                            let mut call = serde_json::Map::new();
+                            call.insert("id".into(), json!(c.provider_id));
+                            call.insert("type".into(), json!("function"));
+                            // Provider-owned fields go back beside `function`,
+                            // which is where the provider put them. Position is
+                            // load-bearing, not cosmetic: Gemini rejects a
+                            // `thoughtSignature` nested inside `function{}` with
+                            // the same 400 it gives for one that is missing.
+                            for (k, v) in &c.provider_extra {
+                                call.insert(k.clone(), v.clone());
+                            }
+                            call.insert(
+                                "function".into(),
+                                json!({ "name": c.name,
+                                    "arguments": serde_json::to_string(&c.arguments)
+                                        .unwrap_or_else(|_| "{}".into()) }),
+                            );
+                            Value::Object(call)
                         })
                         .collect();
                     msg.insert("tool_calls".into(), Value::Array(calls));
@@ -682,13 +1032,53 @@ fn is_responses_required_error(body: &str) -> bool {
         || b.contains("use the responses api")
 }
 
+/// OpenAI-family code names that appear as their own segment in a Databricks v2
+/// endpoint name (the GPT-5 launch aliases). The `gpt` family itself is matched
+/// separately by segment prefix so `gpt`, `gpt5`, and the `gpt` of a split
+/// `gpt-5` all qualify.
+const DATABRICKS_V2_OPENAI_CODE_NAMES: &[&str] = &["sol", "luna", "terra"];
+
+/// Anthropic (Claude) family and release code names that appear as their own
+/// segment in a Databricks v2 endpoint name — the `claude` prefix, the family
+/// names (`opus`, `sonnet`, `haiku`), and the release code names (`mythos`,
+/// `fable`). Getting a Claude model onto the Anthropic Messages route is what
+/// lets it carry a `cache_control` breakpoint; an endpoint that matches none of
+/// these falls through to the MLflow (OpenAI-wire) path, where Anthropic prompt
+/// caching is structurally impossible and the discount is silently lost.
+const DATABRICKS_V2_CLAUDE_NAMES: &[&str] =
+    &["claude", "opus", "sonnet", "haiku", "mythos", "fable"];
+
+/// Split a Databricks v2 endpoint name into its lowercase alphanumeric segments,
+/// breaking on any non-alphanumeric delimiter (`-`, `_`, `.`, `/`, …). E.g.
+/// `Databricks-Claude-Opus-5` -> `["databricks", "claude", "opus", "5"]`.
+fn model_name_segments(model: &str) -> Vec<String> {
+    model
+        .split(|c: char| !c.is_ascii_alphanumeric())
+        .filter(|s| !s.is_empty())
+        .map(str::to_ascii_lowercase)
+        .collect()
+}
+
 fn databricks_v2_route_for_model(model: &str) -> DatabricksV2Route {
-    // Databricks v2 catalog names currently identify OpenAI-shaped GPT-5
-    // models and Anthropic-shaped Claude models by these substrings.
-    let lower = model.to_ascii_lowercase();
-    if lower.contains("gpt-5") || lower.contains("gpt5") {
+    // The v2 catalog exposes no family field, so the wire format is inferred
+    // from the endpoint name. Discovery deliberately keeps arbitrary custom
+    // aliases, so we match whole name *segments* rather than raw substrings: a
+    // substring test would misroute unrelated names — `consolidated-llama`
+    // (`sol`), `terraform-coder` (`terra`), `corpus-reranker`/`octopus-model`
+    // (`opus`) — onto a wire whose request shape their backend can't parse,
+    // turning a caching optimization into a hard request/parse failure. Segment
+    // matching still accepts real prefixed names like `goose-opus-5`.
+    let segments = model_name_segments(model);
+    let has_named_segment =
+        |names: &[&str]| segments.iter().any(|seg| names.contains(&seg.as_str()));
+    // `gpt` family: any segment beginning with `gpt` — covers `gpt`, `gpt5`, and
+    // the `gpt` segment of a split `gpt-5`, without matching mid-word.
+    let is_gpt_family = segments.iter().any(|seg| seg.starts_with("gpt"));
+    // OpenAI is checked before Claude so a name carrying both markers resolves
+    // to the OpenAI wire (preserving the prior `gpt-5`-first precedence).
+    if is_gpt_family || has_named_segment(DATABRICKS_V2_OPENAI_CODE_NAMES) {
         DatabricksV2Route::OpenAiResponses
-    } else if lower.contains("claude") {
+    } else if has_named_segment(DATABRICKS_V2_CLAUDE_NAMES) {
         DatabricksV2Route::AnthropicMessages
     } else {
         DatabricksV2Route::MlflowChatCompletions
@@ -743,10 +1133,15 @@ fn parse_responses(v: Value) -> Result<LlmResponse, AgentError> {
                 let args: Value = serde_json::from_str(raw).map_err(|e| {
                     AgentError::Llm(format!("function_call.arguments not valid JSON: {e}"))
                 })?;
+                // No passthrough on this route: `responses_body` replays a
+                // function call as `{call_id, name, arguments}` and the Responses
+                // API asks for nothing else, so an empty map keeps the request
+                // byte-identical to before.
                 tool_calls.push(make_tool_call(
                     str_field(item, "call_id"),
                     str_field(item, "name"),
                     args,
+                    Default::default(),
                 )?);
             }
             Some("reasoning") => {
@@ -794,11 +1189,18 @@ fn parse_responses(v: Value) -> Result<LlmResponse, AgentError> {
     };
     let input_tokens = sum_usage(&v, &["input_tokens"]);
     let output_tokens = sum_usage(&v, &["output_tokens"]);
+    // The Responses API nests the cache split under `input_tokens_details`.
+    let cached_input_tokens = usage_first(
+        &v,
+        &["cache_read_input_tokens"],
+        &[("input_tokens_details", "cached_tokens")],
+    );
     Ok(LlmResponse {
         text,
         tool_calls,
         stop,
         input_tokens,
+        cached_input_tokens,
         output_tokens,
         reasoning,
     })
@@ -846,19 +1248,70 @@ fn anthropic_input_tokens(v: &Value) -> Option<u64> {
     )
 }
 
-/// Input-token total for OpenAI Chat Completions and Databricks responses.
-/// OpenAI's `prompt_tokens` is already inclusive. Databricks uses the same
-/// `prompt_tokens` wire field but ALSO reports Anthropic-style cache fields
-/// alongside it, so we sum them; the cache fields are simply absent (and
-/// contribute 0) for vanilla OpenAI.
+/// Input-token total for OpenAI Chat Completions and Databricks MLflow-route
+/// responses. `prompt_tokens` is already the inclusive input total on both, so
+/// it is read alone and never summed with the cache fields.
+///
+/// Vanilla OpenAI nests the cache split under `prompt_tokens_details` and
+/// `prompt_tokens` includes it. The Databricks MLflow route reports the split
+/// with the flat Anthropic spelling (`cache_read_input_tokens`) *alongside* an
+/// already-inclusive `prompt_tokens` — so summing double-counts. Verified on
+/// `databricks-glm-5-2` (2026-07-28): `prompt_tokens 13320`,
+/// `cache_read_input_tokens 13312`, `completion_tokens 30`, `total_tokens
+/// 13350`; since `prompt_tokens + completion_tokens == total_tokens`, the 13312
+/// cached tokens are contained in the 13320, not additional to it. Summing gave
+/// 26632 — nearly double — inflating both the context-budget gate and cost.
+///
+/// This differs from Anthropic's native route (see [`anthropic_input_tokens`]),
+/// where `input_tokens` genuinely EXCLUDES the cache fields and must be summed.
+/// The two never collide here: the router sends `claude*` models to the
+/// Anthropic route, so `parse_openai` only ever sees inclusive `prompt_tokens`.
 fn openai_chat_input_tokens(v: &Value) -> Option<u64> {
-    sum_usage(
+    sum_usage(v, &["prompt_tokens"])
+}
+
+/// First present value among `usage.<field>` and `usage.<nested>.<leaf>` pairs.
+///
+/// Cache counts are the one usage figure providers do not agree on the shape of.
+/// Anthropic puts `cache_read_input_tokens` flat on `usage`; OpenAI nests the
+/// same quantity one level down, under `prompt_tokens_details` on
+/// `/chat/completions` and `input_tokens_details` on `/responses`. [`sum_usage`]
+/// only reads flat keys, which is why the OpenAI split was invisible for so
+/// long: `prompt_tokens` is already inclusive, so the *total* was right and
+/// nothing looked broken while the discount silently went unclaimed.
+///
+/// Returns the first candidate that resolves, not a sum — these are alternative
+/// spellings of one number, so adding them would double-count on Databricks,
+/// which reports both shapes.
+fn usage_first(v: &Value, flat: &[&str], nested: &[(&str, &str)]) -> Option<u64> {
+    let usage = v.get("usage")?;
+    for f in flat {
+        if let Some(n) = usage.get(*f).and_then(Value::as_u64) {
+            return Some(n);
+        }
+    }
+    for (outer, leaf) in nested {
+        if let Some(n) = usage
+            .get(*outer)
+            .and_then(|o| o.get(*leaf))
+            .and_then(Value::as_u64)
+        {
+            return Some(n);
+        }
+    }
+    None
+}
+
+/// Cache-read tokens for an OpenAI Chat Completions response.
+///
+/// `prompt_tokens_details.cached_tokens` is where vanilla OpenAI reports it.
+/// The flat Anthropic spelling is checked first for Databricks, which routes
+/// Anthropic models through an OpenAI-shaped envelope.
+fn openai_chat_cached_tokens(v: &Value) -> Option<u64> {
+    usage_first(
         v,
-        &[
-            "prompt_tokens",
-            "cache_read_input_tokens",
-            "cache_creation_input_tokens",
-        ],
+        &["cache_read_input_tokens"],
+        &[("prompt_tokens_details", "cached_tokens")],
     )
 }
 
@@ -866,6 +1319,76 @@ fn str_field(v: &Value, key: &str) -> String {
     v.get(key).and_then(Value::as_str).unwrap_or("").to_owned()
 }
 
+/// Append `part` to `buf` on its own line, ignoring empties.
+fn push_part(buf: &mut String, part: &str) {
+    if part.is_empty() {
+        return;
+    }
+    if !buf.is_empty() {
+        buf.push('\n');
+    }
+    buf.push_str(part);
+}
+
+/// Split an OpenAI-shaped `message.content` into `(text, reasoning)`.
+///
+/// Standard OpenAI sends a string. Several models on the Databricks MLflow route
+/// — Gemini, Qwen35, gpt-oss — send an array of typed blocks instead, and
+/// `as_str()` yields nothing for an array, so their entire answer was being
+/// discarded: no error, no warning, just a turn that looked like the model had
+/// said nothing. `parse_anthropic` already walks a block array; this gives
+/// `parse_openai` the same tolerance.
+fn openai_content_parts(content: Option<&Value>) -> (String, String) {
+    let mut text = String::new();
+    let mut reasoning = String::new();
+    match content {
+        Some(Value::String(s)) => text.push_str(s),
+        Some(Value::Array(blocks)) => {
+            for b in blocks {
+                match b.get("type").and_then(Value::as_str) {
+                    Some("text") => push_part(&mut text, &str_field(b, "text")),
+                    Some("reasoning") => match b.get("summary").and_then(Value::as_array) {
+                        // Gemini nests the prose one level down under `summary`.
+                        Some(summary) => {
+                            for s in summary {
+                                push_part(&mut reasoning, &str_field(s, "text"));
+                            }
+                        }
+                        None => push_part(&mut reasoning, &str_field(b, "text")),
+                    },
+                    // An untyped block carrying text is still the model talking;
+                    // treating it as text loses nothing and keeps one more
+                    // provider out of the silent-empty-answer failure mode.
+                    _ => push_part(&mut text, &str_field(b, "text")),
+                }
+            }
+        }
+        _ => {}
+    }
+    (text, reasoning)
+}
+
+/// Make `provider_id` unique across one assistant turn's tool calls.
+///
+/// Gemini returns the function name as the id, so two parallel calls to the same
+/// function arrive sharing one id — and that id is what pairs a `role:"tool"`
+/// result back to its call, leaving two results indistinguishable. Rewriting is
+/// safe because both halves of that pairing are re-emitted from this same value;
+/// the provider never sees its original id again.
+fn dedupe_provider_ids(calls: &mut [ToolCall]) {
+    let mut seen: BTreeSet<String> = BTreeSet::new();
+    for c in calls.iter_mut() {
+        if seen.contains(&c.provider_id) {
+            let mut n = 2;
+            while seen.contains(&format!("{}-{n}", c.provider_id)) {
+                n += 1;
+            }
+            c.provider_id = format!("{}-{n}", c.provider_id);
+        }
+        seen.insert(c.provider_id.clone());
+    }
+}
+
 fn parse_anthropic(v: Value) -> Result<LlmResponse, AgentError> {
     let stop = map_stop(v.get("stop_reason").and_then(Value::as_str));
     let mut tool_calls = Vec::new();
@@ -888,10 +1411,12 @@ 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(),
                 )?),
                 _ => {}
             }
@@ -899,11 +1424,15 @@ fn parse_anthropic(v: Value) -> Result<LlmResponse, AgentError> {
     }
     let input_tokens = anthropic_input_tokens(&v);
     let output_tokens = sum_usage(&v, &["output_tokens"]);
+    // Anthropic reports the cache split flat on `usage`. Note this is already
+    // part of `input_tokens` above, which sums it in deliberately.
+    let cached_input_tokens = usage_first(&v, &["cache_read_input_tokens"], &[]);
     Ok(LlmResponse {
         text,
         tool_calls,
         stop,
         input_tokens,
+        cached_input_tokens,
         output_tokens,
         reasoning,
     })
@@ -919,17 +1448,23 @@ fn parse_openai(v: Value) -> Result<LlmResponse, AgentError> {
     let msg = choice
         .get("message")
         .ok_or_else(|| AgentError::Llm("missing message".into()))?;
-    let text = str_field(msg, "content");
+    let (text, block_reasoning) = openai_content_parts(msg.get("content"));
     // DeepSeek and vLLM-style OpenAI-compat hosts expose reasoning tokens on the
     // message object. Prefer `reasoning_content` (DeepSeek's field name); fall
-    // back to `reasoning` (some other providers). Both are absent for standard
-    // OpenAI responses, which leaves this empty without any special-casing.
+    // back to `reasoning` (some other providers), and last to reasoning blocks
+    // found inside `content`. All three are absent for standard OpenAI
+    // responses, which leaves this empty without any special-casing.
     let reasoning = {
         let rc = str_field(msg, "reasoning_content");
-        if rc.is_empty() {
+        let rc = if rc.is_empty() {
             str_field(msg, "reasoning")
         } else {
             rc
+        };
+        if rc.is_empty() {
+            block_reasoning
+        } else {
+            rc
         }
     };
     let mut tool_calls = Vec::new();
@@ -941,26 +1476,45 @@ fn parse_openai(v: Value) -> Result<LlmResponse, AgentError> {
             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);
     let input_tokens = openai_chat_input_tokens(&v);
     let output_tokens = sum_usage(&v, &["completion_tokens"]);
+    let cached_input_tokens = openai_chat_cached_tokens(&v);
     Ok(LlmResponse {
         text,
         tool_calls,
         stop,
         input_tokens,
+        cached_input_tokens,
         output_tokens,
         reasoning,
     })
 }
 
-fn make_tool_call(id: String, name: String, args: Value) -> Result<ToolCall, AgentError> {
+fn make_tool_call(
+    id: String,
+    name: String,
+    args: Value,
+    provider_extra: Map<String, Value>,
+) -> Result<ToolCall, AgentError> {
     if id.is_empty() || name.is_empty() {
         return Err(AgentError::Llm("tool_call missing id or name".into()));
     }
@@ -977,6 +1531,7 @@ fn make_tool_call(id: String, name: String, args: Value) -> Result<ToolCall, Age
         provider_id: id,
         name,
         arguments,
+        provider_extra,
     })
 }
 
@@ -1049,12 +1604,71 @@ fn terminal_llm_error(elapsed: std::time::Duration, attempts: u32, detail: &str)
     ))
 }
 
-async fn post<F>(http: &Client, url: &str, body: &Value, apply: F) -> Result<Value, AgentError>
+/// Internal HTTP failure that preserves a mesh-specific MoA failure as a
+/// typed signal. This covers both pre-inference eligibility rejection and a
+/// structured `moa_failure` from workers/reducers. It is consumed inside
+/// `openai_request`: an adaptive `auto` call falls back once, while an explicit
+/// `mesh` call is surfaced as the ordinary LLM error callers already
+/// understand.
+#[derive(Debug)]
+enum PostError {
+    Agent(AgentError),
+    MeshFallback(String),
+}
+
+impl PostError {
+    fn into_agent(self) -> AgentError {
+        match self {
+            Self::Agent(error) => error,
+            Self::MeshFallback(detail) => AgentError::Llm(detail),
+        }
+    }
+}
+
+impl From<AgentError> for PostError {
+    fn from(error: AgentError) -> Self {
+        Self::Agent(error)
+    }
+}
+
+fn is_mesh_moa_unavailable_body(body: &str) -> bool {
+    serde_json::from_str::<Value>(body)
+        .ok()
+        .and_then(|value| {
+            value
+                .pointer("/error/message")
+                .and_then(Value::as_str)
+                .map(str::to_owned)
+        })
+        .as_deref()
+        == Some(MESH_MOA_UNAVAILABLE_MESSAGE)
+}
+
+fn is_mesh_moa_failure_body(body: &str) -> bool {
+    serde_json::from_str::<Value>(body)
+        .ok()
+        .and_then(|value| {
+            value
+                .pointer("/error/type")
+                .and_then(Value::as_str)
+                .map(str::to_owned)
+        })
+        .as_deref()
+        == Some("moa_failure")
+}
+
+async fn post<F>(
+    http: &Client,
+    url: &str,
+    body: &Value,
+    detect_mesh_fallback: bool,
+    apply: F,
+) -> Result<Value, PostError>
 where
     F: Fn(reqwest::RequestBuilder) -> reqwest::RequestBuilder,
 {
-    let body_bytes =
-        serde_json::to_vec(body).map_err(|e| AgentError::Llm(format!("serialize: {e}")))?;
+    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 {
         let resp = match apply(
@@ -1077,11 +1691,11 @@ where
                     backoff_with_jitter(attempt).await;
                     continue;
                 }
-                return Err(terminal_llm_error(
+                return Err(PostError::Agent(terminal_llm_error(
                     call_start.elapsed(),
                     attempt + 1,
                     &format!("transport: {e}"),
-                ));
+                )));
             }
         };
         let status = resp.status();
@@ -1093,9 +1707,19 @@ where
         // Not a stall path: auth failures are not surfaced through
         // terminal_llm_error, they resolve on the next call after refresh.
         if status == 401 || status == 403 {
-            return Err(AgentError::LlmAuth(read_error_body(resp).await));
+            return Err(PostError::Agent(AgentError::LlmAuth(
+                read_error_body(resp).await,
+            )));
         }
         if status.is_server_error() || status == 429 || status.as_u16() == 499 {
+            let body = read_error_body(resp).await;
+            let mesh_fallback = detect_mesh_fallback
+                && (status == reqwest::StatusCode::SERVICE_UNAVAILABLE
+                    && is_mesh_moa_unavailable_body(&body)
+                    || status.is_server_error() && is_mesh_moa_failure_body(&body));
+            if mesh_fallback {
+                return Err(PostError::MeshFallback(format!("{status}: {body}")));
+            }
             if attempt + 1 < MAX_RETRIES {
                 tracing::warn!(
                     attempt = attempt + 1,
@@ -1106,33 +1730,32 @@ where
                 backoff_with_jitter(attempt).await;
                 continue;
             }
-            let body = read_error_body(resp).await;
-            return Err(terminal_llm_error(
+            return Err(PostError::Agent(terminal_llm_error(
                 call_start.elapsed(),
                 attempt + 1,
                 &format!("exhausted retries: {status}: {body}"),
-            ));
+            )));
         }
         // Not a stall path: the model is misconfigured, not the transport or
         // upstream capacity — no retry was attempted, so cumulative duration
         // would be misleading.
         if status == 404 {
-            return Err(AgentError::LlmModelNotFound(format!(
+            return Err(PostError::Agent(AgentError::LlmModelNotFound(format!(
                 "{status}: {}",
                 read_error_body(resp).await
-            )));
+            ))));
         }
         if !status.is_success() {
-            return Err(AgentError::Llm(format!(
+            return Err(PostError::Agent(AgentError::Llm(format!(
                 "{status}: {}",
                 read_error_body(resp).await
-            )));
+            ))));
         }
         if let Some(len) = resp.content_length() {
             if len as usize > MAX_LLM_RESPONSE_BYTES {
-                return Err(AgentError::Llm(format!(
+                return Err(PostError::Agent(AgentError::Llm(format!(
                     "response too large: {len} > {MAX_LLM_RESPONSE_BYTES}"
-                )));
+                ))));
             }
         }
         let mut buf: Vec<u8> = Vec::new();
@@ -1141,23 +1764,24 @@ where
             match stream.chunk().await {
                 Ok(Some(chunk)) => {
                     if buf.len() + chunk.len() > MAX_LLM_RESPONSE_BYTES {
-                        return Err(AgentError::Llm(format!(
+                        return Err(PostError::Agent(AgentError::Llm(format!(
                             "response exceeded {MAX_LLM_RESPONSE_BYTES} bytes"
-                        )));
+                        ))));
                     }
                     buf.extend_from_slice(&chunk);
                 }
                 Ok(None) => break,
                 Err(e) => {
-                    return Err(terminal_llm_error(
+                    return Err(PostError::Agent(terminal_llm_error(
                         call_start.elapsed(),
                         attempt + 1,
                         &format!("body read: {e}"),
-                    ));
+                    )));
                 }
             }
         }
-        return serde_json::from_slice(&buf).map_err(|e| AgentError::Llm(format!("json: {e}")));
+        return serde_json::from_slice(&buf)
+            .map_err(|e| PostError::Agent(AgentError::Llm(format!("json: {e}"))));
     }
     unreachable!("loop always returns on its final iteration (attempt + 1 == MAX_RETRIES)");
 }
@@ -1249,11 +1873,603 @@ mod tests {
             base_url: "http://example.invalid".into(),
             anthropic_api_version: "2023-06-01".into(),
             openai_api: OpenAiApi::Chat,
+            prefer_mesh_for_auto: false,
             hints_enabled: true,
             thinking_effort: None,
+            prompt_caching: true,
         }
     }
 
+    #[derive(Debug, Clone)]
+    struct CapturedHttpRequest {
+        method: String,
+        path: String,
+        body: Option<Value>,
+    }
+
+    #[derive(Debug)]
+    struct StubHttpResponse {
+        status: u16,
+        body: Value,
+    }
+
+    impl StubHttpResponse {
+        fn ok(body: Value) -> Self {
+            Self { status: 200, body }
+        }
+
+        fn error(status: u16, message: &str) -> Self {
+            Self {
+                status,
+                body: json!({
+                    "error": {
+                        "message": message,
+                        "type": "server_error",
+                        "code": "service_unavailable",
+                    }
+                }),
+            }
+        }
+
+        fn moa_failure(status: u16, code: &str, message: &str) -> Self {
+            Self {
+                status,
+                body: json!({
+                    "choices": [{
+                        "finish_reason": "error",
+                        "message": { "content": message, "role": "assistant" },
+                    }],
+                    "error": {
+                        "message": message,
+                        "type": "moa_failure",
+                        "code": code,
+                    },
+                    "model": "mesh",
+                }),
+            }
+        }
+    }
+
+    async fn spawn_sequence_stub(
+        responses: Vec<StubHttpResponse>,
+    ) -> (String, Arc<Mutex<Vec<CapturedHttpRequest>>>) {
+        use std::collections::VecDeque;
+        use tokio::io::{AsyncReadExt, AsyncWriteExt};
+        use tokio::net::TcpListener;
+
+        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let base_url = format!("http://{}/v1", listener.local_addr().unwrap());
+        let captured = Arc::new(Mutex::new(Vec::new()));
+        let captured_for_server = captured.clone();
+        let responses = Arc::new(Mutex::new(VecDeque::from(responses)));
+
+        tokio::spawn(async move {
+            loop {
+                let (mut socket, _) = match listener.accept().await {
+                    Ok(connection) => connection,
+                    Err(_) => return,
+                };
+                let mut bytes = Vec::new();
+                let mut chunk = [0u8; 4096];
+                let header_end = loop {
+                    if let Some(index) = bytes.windows(4).position(|window| window == b"\r\n\r\n") {
+                        break index + 4;
+                    }
+                    match socket.read(&mut chunk).await {
+                        Ok(0) | Err(_) => return,
+                        Ok(read) => bytes.extend_from_slice(&chunk[..read]),
+                    }
+                };
+                let header_text = String::from_utf8_lossy(&bytes[..header_end]).into_owned();
+                let content_length = header_text
+                    .lines()
+                    .find_map(|line| {
+                        let (name, value) = line.split_once(':')?;
+                        name.eq_ignore_ascii_case("content-length")
+                            .then(|| value.trim().parse::<usize>().ok())
+                            .flatten()
+                    })
+                    .unwrap_or(0);
+                while bytes.len() < header_end + content_length {
+                    match socket.read(&mut chunk).await {
+                        Ok(0) | Err(_) => return,
+                        Ok(read) => bytes.extend_from_slice(&chunk[..read]),
+                    }
+                }
+                let mut request_line = header_text.lines().next().unwrap_or_default().split(' ');
+                let method = request_line.next().unwrap_or_default().to_string();
+                let path = request_line.next().unwrap_or_default().to_string();
+                let body = if content_length == 0 {
+                    None
+                } else {
+                    serde_json::from_slice(&bytes[header_end..header_end + content_length]).ok()
+                };
+                captured_for_server
+                    .lock()
+                    .await
+                    .push(CapturedHttpRequest { method, path, body });
+
+                let response = responses.lock().await.pop_front().unwrap_or_else(|| {
+                    StubHttpResponse::error(500, "stub response sequence exhausted")
+                });
+                let status_text = match response.status {
+                    200 => "OK",
+                    500 => "Internal Server Error",
+                    502 => "Bad Gateway",
+                    503 => "Service Unavailable",
+                    other => panic!("unsupported stub status: {other}"),
+                };
+                let body = response.body.to_string();
+                let wire = format!(
+                    "HTTP/1.1 {} {}\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
+                    response.status,
+                    status_text,
+                    body.len(),
+                    body,
+                );
+                let _ = socket.write_all(wire.as_bytes()).await;
+                let _ = socket.shutdown().await;
+            }
+        });
+        (base_url, captured)
+    }
+
+    fn model_catalog(ids: &[&str]) -> Value {
+        json!({
+            "object": "list",
+            "data": ids
+                .iter()
+                .map(|id| json!({ "id": id, "object": "model" }))
+                .collect::<Vec<_>>(),
+        })
+    }
+
+    fn chat_response(text: &str) -> Value {
+        json!({
+            "choices": [{
+                "finish_reason": "stop",
+                "message": { "content": text },
+            }]
+        })
+    }
+
+    async fn complete_model(
+        llm: &Llm,
+        cfg: &Config,
+        model: &str,
+    ) -> Result<LlmResponse, AgentError> {
+        llm.complete(
+            cfg,
+            "system",
+            &[HistoryItem::User("hello".into())],
+            &[],
+            model,
+        )
+        .await
+    }
+
+    async fn complete_model_with_tool(
+        llm: &Llm,
+        cfg: &Config,
+        model: &str,
+    ) -> Result<LlmResponse, AgentError> {
+        llm.complete(
+            cfg,
+            "system",
+            &[HistoryItem::User("add two numbers".into())],
+            &[ToolDef {
+                name: "add_numbers".into(),
+                description: "Add two numbers".into(),
+                input_schema: json!({
+                    "type": "object",
+                    "properties": {
+                        "a": {"type": "number"},
+                        "b": {"type": "number"}
+                    },
+                    "required": ["a", "b"]
+                }),
+            }],
+            model,
+        )
+        .await
+    }
+
+    async fn expire_mesh_catalog_check(llm: &Llm) {
+        llm.mesh_auto_state.lock().await.last_checked =
+            Some(Instant::now() - MESH_AUTO_CATALOG_TTL);
+    }
+
+    async fn expire_mesh_auto_cooldown(llm: &Llm) {
+        let mut state = llm.mesh_auto_state.lock().await;
+        state.last_checked = Some(Instant::now() - MESH_AUTO_CATALOG_TTL);
+        state.cooldown_until = Some(Instant::now() - std::time::Duration::from_secs(1));
+    }
+
+    fn posted_models(requests: &[CapturedHttpRequest]) -> Vec<&str> {
+        requests
+            .iter()
+            .filter(|request| request.method == "POST")
+            .filter_map(|request| request.body.as_ref()?.get("model")?.as_str())
+            .collect()
+    }
+
+    #[tokio::test]
+    async fn mesh_auto_requires_two_stable_catalog_observations() {
+        let (base_url, captured) = spawn_sequence_stub(vec![
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("direct")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("collective")),
+        ])
+        .await;
+        let mut config = cfg(Provider::OpenAi);
+        config.base_url = base_url;
+        config.prefer_mesh_for_auto = true;
+        let llm = Llm::new(&config).unwrap();
+
+        assert_eq!(
+            complete_model(&llm, &config, "auto").await.unwrap().text,
+            "direct"
+        );
+        expire_mesh_catalog_check(&llm).await;
+        assert_eq!(
+            complete_model(&llm, &config, "auto").await.unwrap().text,
+            "collective"
+        );
+
+        let requests = captured.lock().await;
+        assert_eq!(posted_models(&requests), vec!["auto", "mesh"]);
+        assert_eq!(
+            requests
+                .iter()
+                .filter(|request| request.path == "/v1/models")
+                .count(),
+            2
+        );
+    }
+
+    #[tokio::test]
+    async fn mesh_auto_does_not_enable_while_second_model_flaps() {
+        let (base_url, captured) = spawn_sequence_stub(vec![
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("one")),
+            StubHttpResponse::ok(model_catalog(&["model-a"])),
+            StubHttpResponse::ok(chat_response("two")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("three")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("four")),
+        ])
+        .await;
+        let mut config = cfg(Provider::OpenAi);
+        config.base_url = base_url;
+        config.prefer_mesh_for_auto = true;
+        let llm = Llm::new(&config).unwrap();
+
+        for _ in 0..4 {
+            complete_model(&llm, &config, "auto").await.unwrap();
+            expire_mesh_catalog_check(&llm).await;
+        }
+
+        let requests = captured.lock().await;
+        assert_eq!(
+            posted_models(&requests),
+            vec!["auto", "auto", "auto", "mesh"]
+        );
+    }
+
+    #[test]
+    fn collective_catalog_requires_two_distinct_physical_models() {
+        assert_eq!(mesh_catalog_supports_collective(&json!({})), None);
+        assert_eq!(
+            mesh_catalog_supports_collective(&model_catalog(&[])),
+            Some(false)
+        );
+        assert_eq!(
+            mesh_catalog_supports_collective(&model_catalog(&["model-a", "mesh"])),
+            Some(false)
+        );
+        assert_eq!(
+            mesh_catalog_supports_collective(&model_catalog(&[
+                "org/model@main:Q4",
+                "org/model:Q4",
+                "mesh"
+            ])),
+            Some(false),
+            "two spellings of one model are not collective capacity"
+        );
+        assert_eq!(
+            mesh_catalog_supports_collective(&model_catalog(&["model-a", "model-b", "mesh"])),
+            Some(true)
+        );
+    }
+
+    #[tokio::test]
+    async fn mesh_auto_tracks_models_appearing_disappearing_and_reappearing() {
+        let (base_url, captured) = spawn_sequence_stub(vec![
+            StubHttpResponse::ok(model_catalog(&[])),
+            StubHttpResponse::ok(chat_response("zero")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "mesh"])),
+            StubHttpResponse::ok(chat_response("one")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("two-first-observation")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("two-stable")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "mesh"])),
+            StubHttpResponse::ok(chat_response("contracted")),
+            StubHttpResponse::ok(model_catalog(&[])),
+            StubHttpResponse::ok(chat_response("empty-again")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("rejoin-first-observation")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("rejoined-stable")),
+        ])
+        .await;
+        let mut config = cfg(Provider::OpenAi);
+        config.base_url = base_url;
+        config.prefer_mesh_for_auto = true;
+        let llm = Llm::new(&config).unwrap();
+
+        for call in 0..8 {
+            if call == 5 {
+                expire_mesh_auto_cooldown(&llm).await;
+            } else if call > 0 {
+                expire_mesh_catalog_check(&llm).await;
+            }
+            complete_model(&llm, &config, "auto").await.unwrap();
+        }
+
+        let requests = captured.lock().await;
+        assert_eq!(
+            posted_models(&requests),
+            vec!["auto", "auto", "auto", "mesh", "auto", "auto", "auto", "mesh"]
+        );
+        assert_eq!(
+            requests
+                .iter()
+                .filter(|request| request.path == "/v1/models")
+                .count(),
+            8
+        );
+    }
+
+    #[tokio::test]
+    async fn mesh_auto_falls_back_once_and_cools_down_when_mesh_contracts() {
+        let (base_url, captured) = spawn_sequence_stub(vec![
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("warmup")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::error(503, MESH_MOA_UNAVAILABLE_MESSAGE),
+            StubHttpResponse::ok(chat_response("fallback")),
+            StubHttpResponse::ok(chat_response("cooldown")),
+        ])
+        .await;
+        let mut config = cfg(Provider::OpenAi);
+        config.base_url = base_url;
+        config.prefer_mesh_for_auto = true;
+        let llm = Llm::new(&config).unwrap();
+
+        complete_model(&llm, &config, "auto").await.unwrap();
+        expire_mesh_catalog_check(&llm).await;
+        assert_eq!(
+            complete_model(&llm, &config, "auto").await.unwrap().text,
+            "fallback"
+        );
+        assert_eq!(
+            complete_model(&llm, &config, "auto").await.unwrap().text,
+            "cooldown"
+        );
+
+        let requests = captured.lock().await;
+        assert_eq!(
+            posted_models(&requests),
+            vec!["auto", "mesh", "auto", "auto"]
+        );
+        assert_eq!(
+            requests
+                .iter()
+                .filter(|request| request.path == "/v1/models")
+                .count(),
+            2,
+            "cooldown request must not re-probe the catalog"
+        );
+    }
+
+    #[tokio::test]
+    async fn mesh_auto_falls_back_once_when_moa_reducer_fails() {
+        let (base_url, captured) = spawn_sequence_stub(vec![
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("warmup")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::moa_failure(
+                502,
+                "all_reducers_failed",
+                "Reducer failed: unsupported chat template",
+            ),
+            StubHttpResponse::ok(chat_response("fallback")),
+            StubHttpResponse::ok(chat_response("cooldown")),
+        ])
+        .await;
+        let mut config = cfg(Provider::OpenAi);
+        config.base_url = base_url;
+        config.prefer_mesh_for_auto = true;
+        let llm = Llm::new(&config).unwrap();
+
+        complete_model(&llm, &config, "auto").await.unwrap();
+        expire_mesh_catalog_check(&llm).await;
+        assert_eq!(
+            complete_model(&llm, &config, "auto").await.unwrap().text,
+            "fallback"
+        );
+        assert_eq!(
+            complete_model(&llm, &config, "auto").await.unwrap().text,
+            "cooldown"
+        );
+
+        let requests = captured.lock().await;
+        assert_eq!(
+            posted_models(&requests),
+            vec!["auto", "mesh", "auto", "auto"]
+        );
+        assert_eq!(
+            requests
+                .iter()
+                .filter(|request| request.path == "/v1/models")
+                .count(),
+            2,
+            "mesh-specific failure must enter cooldown without re-probing"
+        );
+    }
+
+    #[tokio::test]
+    async fn mesh_auto_retries_unstructured_tool_markup_through_auto() {
+        let (base_url, captured) = spawn_sequence_stub(vec![
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response("warmup")),
+            StubHttpResponse::ok(model_catalog(&["model-a", "model-b", "mesh"])),
+            StubHttpResponse::ok(chat_response(
+                "<|tool_call>call:add_numbers{a:17,b:25}<tool_call|>",
+            )),
+            StubHttpResponse::ok(chat_response("safe fallback")),
+            StubHttpResponse::ok(chat_response("cooldown")),
+        ])
+        .await;
+        let mut config = cfg(Provider::OpenAi);
+        config.base_url = base_url;
+        config.prefer_mesh_for_auto = true;
+        let llm = Llm::new(&config).unwrap();
+
+        complete_model(&llm, &config, "auto").await.unwrap();
+        expire_mesh_catalog_check(&llm).await;
+        assert_eq!(
+            complete_model_with_tool(&llm, &config, "auto")
+                .await
+                .unwrap()
+                .text,
+            "safe fallback"
+        );
+        assert_eq!(
+            complete_model_with_tool(&llm, &config, "auto")
+                .await
+                .unwrap()
+                .text,
+            "cooldown"
+        );
+
+        let requests = captured.lock().await;
+        assert_eq!(
+            posted_models(&requests),
+            vec!["auto", "mesh", "auto", "auto"]
+        );
+        assert_eq!(
+            requests
+                .iter()
+                .filter(|request| request.path == "/v1/models")
+                .count(),
+            2,
+            "pseudo tool markup must enter cooldown without another catalog probe"
+        );
+    }
+
+    #[tokio::test]
+    async fn mesh_auto_catalog_failure_fails_open_to_auto() {
+        let (base_url, captured) = spawn_sequence_stub(vec![
+            StubHttpResponse::error(500, "catalog unavailable"),
+            StubHttpResponse::ok(chat_response("direct")),
+        ])
+        .await;
+        let mut config = cfg(Provider::OpenAi);
+        config.base_url = base_url;
+        config.prefer_mesh_for_auto = true;
+        let llm = Llm::new(&config).unwrap();
+
+        complete_model(&llm, &config, "auto").await.unwrap();
+        let requests = captured.lock().await;
+        assert_eq!(posted_models(&requests), vec!["auto"]);
+    }
+
+    #[tokio::test]
+    async fn generic_openai_auto_does_not_probe_or_select_mesh() {
+        let (base_url, captured) =
+            spawn_sequence_stub(vec![StubHttpResponse::ok(chat_response("provider auto"))]).await;
+        let mut config = cfg(Provider::OpenAi);
+        config.base_url = base_url;
+        config.prefer_mesh_for_auto = false;
+        let llm = Llm::new(&config).unwrap();
+
+        complete_model(&llm, &config, "auto").await.unwrap();
+        let requests = captured.lock().await;
+        assert_eq!(posted_models(&requests), vec!["auto"]);
+        assert!(requests.iter().all(|request| request.path != "/v1/models"));
+    }
+
+    #[tokio::test]
+    async fn explicit_models_are_never_rewritten_or_fallback_retried() {
+        let (base_url, captured) = spawn_sequence_stub(vec![StubHttpResponse::error(
+            503,
+            MESH_MOA_UNAVAILABLE_MESSAGE,
+        )])
+        .await;
+        let mut config = cfg(Provider::OpenAi);
+        config.base_url = base_url;
+        config.prefer_mesh_for_auto = true;
+        let llm = Llm::new(&config).unwrap();
+
+        let error = complete_model(&llm, &config, "mesh").await.unwrap_err();
+        assert!(error.to_string().contains(MESH_MOA_UNAVAILABLE_MESSAGE));
+        let requests = captured.lock().await;
+        assert_eq!(posted_models(&requests), vec!["mesh"]);
+        assert!(requests.iter().all(|request| request.path != "/v1/models"));
+    }
+
+    #[tokio::test]
+    async fn explicit_real_model_bypasses_mesh_auto_policy() {
+        let (base_url, captured) =
+            spawn_sequence_stub(vec![StubHttpResponse::ok(chat_response("explicit"))]).await;
+        let mut config = cfg(Provider::OpenAi);
+        config.base_url = base_url;
+        config.prefer_mesh_for_auto = true;
+        let llm = Llm::new(&config).unwrap();
+
+        let response = complete_model(&llm, &config, "model-a").await.unwrap();
+        assert_eq!(response.text, "explicit");
+        let requests = captured.lock().await;
+        assert_eq!(posted_models(&requests), vec!["model-a"]);
+        assert!(requests.iter().all(|request| request.path != "/v1/models"));
+    }
+
+    #[test]
+    fn mesh_unavailable_classifier_requires_exact_openai_error_message() {
+        assert!(is_mesh_moa_unavailable_body(
+            &StubHttpResponse::error(503, MESH_MOA_UNAVAILABLE_MESSAGE)
+                .body
+                .to_string()
+        ));
+        assert!(!is_mesh_moa_unavailable_body(
+            &StubHttpResponse::error(503, "some other outage")
+                .body
+                .to_string()
+        ));
+    }
+
+    #[test]
+    fn mesh_failure_classifier_requires_structured_moa_failure_type() {
+        assert!(is_mesh_moa_failure_body(
+            &StubHttpResponse::moa_failure(
+                502,
+                "all_reducers_failed",
+                "Reducer failed: unsupported chat template",
+            )
+            .body
+            .to_string()
+        ));
+        assert!(!is_mesh_moa_failure_body(
+            &StubHttpResponse::error(502, "some other bad gateway")
+                .body
+                .to_string()
+        ));
+    }
+
     fn image_history() -> Vec<HistoryItem> {
         vec![
             HistoryItem::User("describe the image".into()),
@@ -1263,6 +2479,7 @@ mod tests {
                     provider_id: "toolu_1".into(),
                     name: "dev__view_image".into(),
                     arguments: serde_json::json!({"source":"x.png"}),
+                    provider_extra: Default::default(),
                 }],
             },
             HistoryItem::ToolResult(ToolResult {
@@ -1312,6 +2529,7 @@ mod tests {
                     provider_id: "call_abc".into(),
                     name: "dev__shell".into(),
                     arguments: serde_json::json!({"command": "ls"}),
+                    provider_extra: Default::default(),
                 }],
             },
             HistoryItem::ToolResult(ToolResult {
@@ -1410,6 +2628,7 @@ mod tests {
                     provider_id: "call_x".into(),
                     name: "t".into(),
                     arguments: serde_json::json!({}),
+                    provider_extra: Default::default(),
                 }],
             },
         ];
@@ -1517,20 +2736,105 @@ mod tests {
 
     #[test]
     fn databricks_v2_routes_by_model_family() {
+        use DatabricksV2Route::{AnthropicMessages, MlflowChatCompletions, OpenAiResponses};
         for (model, route, path) in [
+            // OpenAI-shaped: the gpt family plus the GPT-5 code names.
             (
                 "databricks-gpt-5-5",
-                DatabricksV2Route::OpenAiResponses,
+                OpenAiResponses,
+                "/ai-gateway/openai/v1/responses",
+            ),
+            ("gpt-4o", OpenAiResponses, "/ai-gateway/openai/v1/responses"),
+            // The intentional dashless `gpt5` spelling still routes to OpenAI.
+            ("gpt5", OpenAiResponses, "/ai-gateway/openai/v1/responses"),
+            (
+                "databricks-gpt-5-6-luna",
+                OpenAiResponses,
                 "/ai-gateway/openai/v1/responses",
             ),
+            (
+                "databricks-gpt-5-6-sol",
+                OpenAiResponses,
+                "/ai-gateway/openai/v1/responses",
+            ),
+            (
+                "databricks-terra",
+                OpenAiResponses,
+                "/ai-gateway/openai/v1/responses",
+            ),
+            // Anthropic-shaped: the claude prefix, the family names, and the
+            // release code names — each must reach the cache-capable route even
+            // when the endpoint name omits the literal "claude".
             (
                 "databricks-claude-opus-4-7",
-                DatabricksV2Route::AnthropicMessages,
+                AnthropicMessages,
                 "/ai-gateway/anthropic/v1/messages",
             ),
+            (
+                "goose-opus-5",
+                AnthropicMessages,
+                "/ai-gateway/anthropic/v1/messages",
+            ),
+            (
+                "databricks-sonnet-5",
+                AnthropicMessages,
+                "/ai-gateway/anthropic/v1/messages",
+            ),
+            (
+                "databricks-haiku-4-5",
+                AnthropicMessages,
+                "/ai-gateway/anthropic/v1/messages",
+            ),
+            (
+                "databricks-mythos-5",
+                AnthropicMessages,
+                "/ai-gateway/anthropic/v1/messages",
+            ),
+            (
+                "databricks-fable-5",
+                AnthropicMessages,
+                "/ai-gateway/anthropic/v1/messages",
+            ),
+            // Case-insensitive.
+            (
+                "Databricks-Claude-Opus-5",
+                AnthropicMessages,
+                "/ai-gateway/anthropic/v1/messages",
+            ),
+            // Unrecognised names still fall through to the MLflow chat route.
             (
                 "custom-tool-model",
-                DatabricksV2Route::MlflowChatCompletions,
+                MlflowChatCompletions,
+                "/ai-gateway/mlflow/v1/chat/completions",
+            ),
+            (
+                "databricks-gemini-3-pro",
+                MlflowChatCompletions,
+                "/ai-gateway/mlflow/v1/chat/completions",
+            ),
+            // Collision guard: short code names must match only as whole
+            // segments, never as substrings of an unrelated custom alias.
+            // Each of these embeds a marker (`sol`, `terra`, `opus`) mid-word
+            // and must stay on the MLflow fallback, not adopt a wire its
+            // backend can't parse.
+            (
+                "consolidated-llama",
+                MlflowChatCompletions,
+                "/ai-gateway/mlflow/v1/chat/completions",
+            ),
+            (
+                "terraform-coder",
+                MlflowChatCompletions,
+                "/ai-gateway/mlflow/v1/chat/completions",
+            ),
+            (
+                "corpus-reranker",
+                MlflowChatCompletions,
+                "/ai-gateway/mlflow/v1/chat/completions",
+            ),
+            (
+                "octopus-model",
+                MlflowChatCompletions,
                 "/ai-gateway/mlflow/v1/chat/completions",
             ),
         ] {
@@ -1603,11 +2907,13 @@ mod tests {
                         provider_id: "toolu_a".into(),
                         name: "dev__view_image".into(),
                         arguments: serde_json::json!({"source": "a.png"}),
+                        provider_extra: Default::default(),
                     },
                     ToolCall {
                         provider_id: "toolu_b".into(),
                         name: "dev__view_image".into(),
                         arguments: serde_json::json!({"source": "b.png"}),
+                        provider_extra: Default::default(),
                     },
                 ],
             },
@@ -1659,6 +2965,100 @@ mod tests {
         assert_eq!(imgs[1]["image_url"]["url"], "data:image/png;base64,bbb");
     }
 
+    // ---- prompt caching (cache_control) body-shape tests ----
+
+    #[test]
+    fn anthropic_body_stamps_cache_control_when_enabled() {
+        let body = anthropic_body(
+            &cfg(Provider::DatabricksV2),
+            "sys",
+            &[
+                HistoryItem::User("hello".into()),
+                HistoryItem::Assistant {
+                    text: "hi".into(),
+                    tool_calls: vec![],
+                },
+                HistoryItem::User("more".into()),
+            ],
+            &[],
+            "databricks-claude-opus-5",
+            None,
+        );
+        // Static prefix: system promoted to a structured block carrying the marker.
+        assert_eq!(body["system"][0]["type"], "text");
+        assert_eq!(body["system"][0]["text"], "sys");
+        assert_eq!(body["system"][0]["cache_control"]["type"], "ephemeral");
+        // Leapfrog: the last block of the last TWO messages is marked; earlier
+        // ones are not. Three distinct user/assistant/user turns → messages[1]
+        // and messages[2] marked, messages[0] clean.
+        let msgs = body["messages"].as_array().unwrap();
+        assert_eq!(msgs.len(), 3);
+        let tail_block = |m: &Value| m["content"].as_array().unwrap().last().unwrap().clone();
+        assert_eq!(tail_block(&msgs[2])["cache_control"]["type"], "ephemeral");
+        assert_eq!(tail_block(&msgs[1])["cache_control"]["type"], "ephemeral");
+        assert!(
+            tail_block(&msgs[0]).get("cache_control").is_none(),
+            "only the last two messages carry a breakpoint"
+        );
+    }
+
+    #[test]
+    fn anthropic_body_single_message_stamps_only_one_breakpoint() {
+        // With a single message there is no second turn to leapfrog to; the
+        // checked_sub(2) index is skipped rather than panicking.
+        let body = anthropic_body(
+            &cfg(Provider::DatabricksV2),
+            "sys",
+            &[HistoryItem::User("hello".into())],
+            &[],
+            "databricks-claude-opus-5",
+            None,
+        );
+        let msgs = body["messages"].as_array().unwrap();
+        assert_eq!(msgs.len(), 1);
+        assert_eq!(
+            msgs[0]["content"].as_array().unwrap().last().unwrap()["cache_control"]["type"],
+            "ephemeral"
+        );
+    }
+
+    #[test]
+    fn anthropic_body_no_cache_control_when_disabled() {
+        let mut c = cfg(Provider::DatabricksV2);
+        c.prompt_caching = false;
+        let body = anthropic_body(
+            &c,
+            "sys",
+            &[HistoryItem::User("hello".into())],
+            &[],
+            "databricks-claude-opus-5",
+            None,
+        );
+        // system stays a bare string; no marker anywhere.
+        assert_eq!(body["system"], "sys");
+        let last_block = &body["messages"][0]["content"][0];
+        assert!(last_block.get("cache_control").is_none());
+    }
+
+    #[test]
+    fn anthropic_body_empty_system_stays_string_even_when_caching() {
+        // An empty system prompt must not become an empty text block —
+        // Anthropic rejects those. Caching is still applied to the tail.
+        let body = anthropic_body(
+            &cfg(Provider::DatabricksV2),
+            "",
+            &[HistoryItem::User("hello".into())],
+            &[],
+            "databricks-claude-opus-5",
+            None,
+        );
+        assert_eq!(body["system"], "");
+        assert_eq!(
+            body["messages"][0]["content"][0]["cache_control"]["type"],
+            "ephemeral"
+        );
+    }
+
     // ---- ThinkingEffort body-shape tests ----
 
     #[test]
@@ -2226,7 +3626,7 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let out = post(&client, &url, &serde_json::json!({}), |b| b)
+        let out = post(&client, &url, &serde_json::json!({}), false, |b| b)
             .await
             .expect("post should succeed after retry");
         assert_eq!(out, serde_json::json!({ "ok": true }));
@@ -2290,7 +3690,7 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let out = post(&client, &url, &serde_json::json!({}), |b| b)
+        let out = post(&client, &url, &serde_json::json!({}), false, |b| b)
             .await
             .expect("post should succeed after 499 retry");
         assert_eq!(out, serde_json::json!({ "ok": true }));
@@ -2341,11 +3741,11 @@ mod tests {
             .timeout(Duration::from_secs(5))
             .build()
             .unwrap();
-        let err = post(&client, &url, &serde_json::json!({}), |b| b)
+        let err = post(&client, &url, &serde_json::json!({}), false, |b| b)
             .await
             .unwrap_err();
         match &err {
-            AgentError::Llm(msg) => {
+            PostError::Agent(AgentError::Llm(msg)) => {
                 assert!(
                     msg.contains("exhausted retries") && msg.contains("499"),
                     "expected 'exhausted retries' + '499' in error, got: {msg}"
@@ -2355,7 +3755,7 @@ mod tests {
                     "expected cumulative duration + exact attempt count, got: {msg}"
                 );
             }
-            other => panic!("expected AgentError::Llm, got: {other:?}"),
+            other => panic!("expected PostError::Agent(AgentError::Llm), got: {other:?}"),
         }
         assert_eq!(
             accepts.load(Ordering::SeqCst),
@@ -2538,6 +3938,92 @@ mod tests {
         assert_eq!(parse_anthropic(v).unwrap().input_tokens, None);
     }
 
+    /// A Gemini reply as the Databricks MLflow route actually returns it:
+    /// block-array `content`, and a `thoughtSignature` beside `function`.
+    fn gemini_choice() -> Value {
+        json!({"choices": [{"finish_reason": "tool_calls", "message": {
+            "role": "assistant",
+            "content": [
+                {"type": "reasoning", "summary": [{"type": "summary_text", "text": "weighing it"}]},
+                {"type": "text", "text": "391"}
+            ],
+            "tool_calls": [{
+                "id": "get_weather", "type": "function", "thoughtSignature": "SIG-A",
+                "function": {"name": "get_weather", "arguments": "{\"city\":\"Paris\"}"}
+            }]
+        }}]})
+    }
+
+    #[test]
+    fn parse_openai_reads_text_out_of_a_block_array() {
+        // Before this, `as_str()` on the array yielded "" and the model's answer
+        // was discarded with no error at all.
+        let r = parse_openai(gemini_choice()).unwrap();
+        assert_eq!(r.text, "391");
+        assert_eq!(r.reasoning, "weighing it");
+    }
+
+    #[test]
+    fn parse_openai_still_reads_a_plain_string_content() {
+        let v = json!({"choices": [{"finish_reason": "stop", "message": {
+            "role": "assistant", "content": "plain"}}]});
+        let r = parse_openai(v).unwrap();
+        assert_eq!(r.text, "plain");
+        assert_eq!(r.reasoning, "");
+    }
+
+    #[test]
+    fn parse_openai_keeps_unmodelled_tool_call_fields() {
+        let r = parse_openai(gemini_choice()).unwrap();
+        let extra = &r.tool_calls[0].provider_extra;
+        assert_eq!(extra.get("thoughtSignature"), Some(&json!("SIG-A")));
+        // `id`/`type`/`function` are modelled, so they must not be duplicated
+        // into the passthrough — they would be re-emitted twice.
+        assert!(!extra.contains_key("id"));
+        assert!(!extra.contains_key("type"));
+        assert!(!extra.contains_key("function"));
+    }
+
+    #[test]
+    fn openai_body_replays_the_signature_beside_function_not_inside_it() {
+        // Position is what the gateway checks: nested inside `function{}` it is
+        // rejected with the same 400 as a missing signature.
+        let r = parse_openai(gemini_choice()).unwrap();
+        let history = vec![HistoryItem::Assistant {
+            text: r.text.clone(),
+            tool_calls: r.tool_calls.clone(),
+        }];
+        let body = openai_body(
+            &cfg(Provider::DatabricksV2),
+            "sys",
+            &history,
+            &[],
+            "databricks-gemini-3-6-flash",
+            None,
+        );
+        let call = &body["messages"][1]["tool_calls"][0];
+        assert_eq!(call["thoughtSignature"], json!("SIG-A"));
+        assert!(call["function"].get("thoughtSignature").is_none());
+        assert_eq!(call["function"]["name"], json!("get_weather"));
+    }
+
+    #[test]
+    fn parse_openai_makes_duplicate_tool_call_ids_unique() {
+        // Gemini returns the function name as the id, so parallel calls to one
+        // function collide and their results become indistinguishable.
+        let v = json!({"choices": [{"finish_reason": "tool_calls", "message": {
+        "role": "assistant", "content": "",
+        "tool_calls": [
+            {"id": "get_weather", "type": "function",
+             "function": {"name": "get_weather", "arguments": "{\"city\":\"Paris\"}"}},
+            {"id": "get_weather", "type": "function",
+             "function": {"name": "get_weather", "arguments": "{\"city\":\"Rome\"}"}}
+        ]}}]});
+        let r = parse_openai(v).unwrap();
+        assert_eq!(r.tool_calls[0].provider_id, "get_weather");
+        assert_eq!(r.tool_calls[1].provider_id, "get_weather-2");
+    }
+
     #[test]
     fn parse_openai_uses_prompt_tokens() {
         let v = serde_json::json!({
@@ -2548,20 +4034,34 @@ mod tests {
     }
 
     #[test]
-    fn parse_openai_databricks_sums_cache_fields() {
-        // Databricks uses the OpenAI chat wire format (prompt_tokens) but also
-        // reports Anthropic-style cache fields; the inclusive total sums them.
+    fn parse_openai_databricks_prompt_tokens_already_inclusive() {
+        // Databricks' MLflow route uses the OpenAI chat wire format
+        // (prompt_tokens) but ALSO reports the flat Anthropic-style
+        // cache_read_input_tokens. prompt_tokens is already inclusive of that
+        // slice, so the total is prompt_tokens alone — summing double-counts.
+        // Values are the live databricks-glm-5-2 response (2026-07-28), where
+        // prompt_tokens + completion_tokens == total_tokens proves inclusivity.
         let v = serde_json::json!({
             "choices": [{"finish_reason": "stop", "message": {"content": "hi"}}],
             "usage": {
-                "prompt_tokens": 200,
-                "completion_tokens": 4,
-                "total_tokens": 204,
-                "cache_read_input_tokens": 800,
-                "cache_creation_input_tokens": 0
+                "prompt_tokens": 13320,
+                "completion_tokens": 30,
+                "total_tokens": 13350,
+                "cache_read_input_tokens": 13312,
+                "prompt_tokens_details": {"cached_tokens": 13312}
             }
         });
-        assert_eq!(parse_openai(v).unwrap().input_tokens, Some(1000));
+        let r = parse_openai(v).unwrap();
+        assert_eq!(
+            r.input_tokens,
+            Some(13320),
+            "prompt_tokens is the inclusive total"
+        );
+        assert_eq!(r.cached_input_tokens, Some(13312));
+        assert!(
+            r.cached_input_tokens.unwrap() <= r.input_tokens.unwrap(),
+            "the cached slice is a subset of the input total"
+        );
     }
 
     #[test]
@@ -2572,6 +4072,115 @@ mod tests {
         assert_eq!(parse_openai(v).unwrap().input_tokens, None);
     }
 
+    #[test]
+    fn parse_openai_reads_nested_cached_tokens() {
+        // The shape vanilla OpenAI actually returns, captured from a live
+        // /chat/completions probe on gpt-5.6-luna: `prompt_tokens` is already
+        // inclusive and the cache split is nested one level down. Reading only
+        // flat keys left the discount unclaimed while the total looked correct,
+        // which is why this went unnoticed.
+        let v = serde_json::json!({
+            "choices": [{"finish_reason": "stop", "message": {"content": "OK"}}],
+            "usage": {
+                "prompt_tokens": 5229,
+                "completion_tokens": 4,
+                "total_tokens": 5233,
+                "prompt_tokens_details": {"audio_tokens": 0, "cached_tokens": 5226,
+                                          "cache_write_tokens": 0}
+            }
+        });
+        let r = parse_openai(v).unwrap();
+        assert_eq!(r.input_tokens, Some(5229), "total must stay inclusive");
+        assert_eq!(r.cached_input_tokens, Some(5226));
+    }
+
+    #[test]
+    fn parse_openai_cache_write_round_reports_zero_cached() {
+        // First request of a cold prefix: the provider writes the cache and
+        // serves nothing from it. `Some(0)` not `None` — the split was reported,
+        // it was simply zero, and a consumer must be able to tell the two apart.
+        let v = serde_json::json!({
+            "choices": [{"finish_reason": "stop", "message": {"content": "OK"}}],
+            "usage": {
+                "prompt_tokens": 5229,
+                "completion_tokens": 4,
+                "prompt_tokens_details": {"cached_tokens": 0, "cache_write_tokens": 5226}
+            }
+        });
+        assert_eq!(parse_openai(v).unwrap().cached_input_tokens, Some(0));
+    }
+
+    #[test]
+    fn parse_openai_no_cache_detail_is_none() {
+        let v = serde_json::json!({
+            "choices": [{"finish_reason": "stop", "message": {"content": "hi"}}],
+            "usage": {"prompt_tokens": 123, "completion_tokens": 4}
+        });
+        assert_eq!(parse_openai(v).unwrap().cached_input_tokens, None);
+    }
+
+    #[test]
+    fn parse_openai_prefers_flat_anthropic_spelling_over_nested() {
+        // Databricks reports both shapes for the same quantity. Take one, never
+        // the sum, or the cached slice double-counts. cache_read (800) is a
+        // subset of the inclusive prompt_tokens (1000), as it must be.
+        let v = serde_json::json!({
+            "choices": [{"finish_reason": "stop", "message": {"content": "hi"}}],
+            "usage": {
+                "prompt_tokens": 1000,
+                "completion_tokens": 4,
+                "cache_read_input_tokens": 800,
+                "prompt_tokens_details": {"cached_tokens": 800}
+            }
+        });
+        let r = parse_openai(v).unwrap();
+        assert_eq!(r.input_tokens, Some(1000));
+        assert_eq!(r.cached_input_tokens, Some(800));
+        assert!(r.cached_input_tokens.unwrap() <= r.input_tokens.unwrap());
+    }
+
+    #[test]
+    fn parse_anthropic_reports_cache_read_as_cached() {
+        // Anthropic's `input_tokens` EXCLUDES cached, so the inclusive total is
+        // a sum -- but the cached slice must still be a subset of that total.
+        let v = serde_json::json!({
+            "stop_reason": "end_turn",
+            "content": [{"type": "text", "text": "hi"}],
+            "usage": {
+                "input_tokens": 100,
+                "output_tokens": 7,
+                "cache_read_input_tokens": 900,
+                "cache_creation_input_tokens": 50
+            }
+        });
+        let r = parse_anthropic(v).unwrap();
+        assert_eq!(r.input_tokens, Some(1050));
+        assert_eq!(r.cached_input_tokens, Some(900));
+        assert!(r.cached_input_tokens.unwrap() <= r.input_tokens.unwrap());
+    }
+
+    #[test]
+    fn parse_responses_reads_nested_cached_tokens() {
+        // The Responses API nests the same figure under a different key than
+        // /chat/completions does.
+        let v = serde_json::json!({
+            "status": "completed",
+            "output": [{
+                "type": "message",
+                "role": "assistant",
+                "content": [{"type": "output_text", "text": "hi"}]
+            }],
+            "usage": {
+                "input_tokens": 4000,
+                "output_tokens": 9,
+                "input_tokens_details": {"cached_tokens": 3584}
+            }
+        });
+        let r = parse_responses(v).unwrap();
+        assert_eq!(r.input_tokens, Some(4000));
+        assert_eq!(r.cached_input_tokens, Some(3584));
+    }
+
     #[test]
     fn parse_responses_uses_input_tokens() {
         let v = serde_json::json!({
@@ -2693,6 +4302,7 @@ mod tests {
                 .build()
                 .unwrap(),
             auto_upgraded: std::sync::atomic::AtomicBool::new(false),
+            mesh_auto_state: Mutex::new(MeshAutoState::default()),
             auth,
         }
     }
@@ -2753,7 +4363,10 @@ mod tests {
             .post_openai(&c, "/v1/x", &json!({}), "model")
             .await
             .unwrap_err();
-        assert!(matches!(err, AgentError::LlmAuth(_)), "got {err:?}");
+        assert!(
+            matches!(err, PostError::Agent(AgentError::LlmAuth(_))),
+            "got {err:?}"
+        );
         assert_eq!(
             auth.refreshes.load(Ordering::SeqCst),
             1,
@@ -2781,7 +4394,10 @@ mod tests {
             .post_openai(&c, "/v1/x", &json!({}), "model")
             .await
             .unwrap_err();
-        assert!(matches!(err, AgentError::LlmAuth(_)), "got {err:?}");
+        assert!(
+            matches!(err, PostError::Agent(AgentError::LlmAuth(_))),
+            "got {err:?}"
+        );
         assert_eq!(
             auth.refreshes.load(Ordering::SeqCst),
             1,
diff --git a/crates/buzz-agent/src/mcp.rs b/crates/buzz-agent/src/mcp.rs
index fa8815df50..9ae125a0b7 100644
--- a/crates/buzz-agent/src/mcp.rs
+++ b/crates/buzz-agent/src/mcp.rs
@@ -52,6 +52,31 @@ const PASSTHROUGH_ENV: &[&str] = &[
     "GIT_ASKPASS",
     "GIT_SSH_COMMAND",
     "GIT_CONFIG_GLOBAL",
+    // Proxy — on a host whose only route out is a CONNECT proxy, dropping
+    // these does not degrade the tools, it blinds them: apt, curl, pip and git
+    // all connect directly instead, and the egress firewall resets the socket.
+    // The agent then reports "Connection reset by peer" and concludes the
+    // environment has no network, which is indistinguishable in the transcript
+    // from a task that is genuinely offline.
+    //
+    // Both cases are needed. curl and git read the lowercase spellings, most
+    // Go and Python tooling reads the uppercase ones, and libcurl deliberately
+    // ignores uppercase HTTP_PROXY (CGI ambiguity), so keeping only one form
+    // silently breaks half the toolchain.
+    "HTTP_PROXY",
+    "HTTPS_PROXY",
+    "NO_PROXY",
+    "ALL_PROXY",
+    "http_proxy",
+    "https_proxy",
+    "no_proxy",
+    "all_proxy",
+    // TLS trust — a proxy that terminates TLS presents its own CA, and an
+    // image whose trust store does not carry it fails every https fetch with a
+    // verification error. Same class of failure as the proxy vars: the parent
+    // was configured correctly and the child could not see it.
+    "SSL_CERT_FILE",
+    "SSL_CERT_DIR",
     // Buzz identity — dev-mcp writes NOSTR_PRIVATE_KEY to a keyfile then
     // removes it from its own env (children never see it). BUZZ_PRIVATE_KEY
     // and BUZZ_RELAY_URL are kept for the buzz CLI. BUZZ_AUTH_TAG is a
@@ -61,6 +86,11 @@ const PASSTHROUGH_ENV: &[&str] = &[
     "BUZZ_PRIVATE_KEY",
     "BUZZ_RELAY_URL",
     "BUZZ_AUTH_TAG",
+    // Agent display name — dev-mcp uses it as the git author name. On the
+    // Desktop path this arrives via the wire `mcpServers[].env` declaration
+    // (which wins here anyway); the allowlist entry covers ACP clients that
+    // spawn buzz-agent without declaring it.
+    "BUZZ_ACP_DISPLAY_NAME",
 ];
 
 // Windows has no $TMPDIR/$HOME. TMP/TEMP/USERPROFILE are what
@@ -1010,6 +1040,41 @@ mod content_tests {
     fn passthrough_includes_buzz_owner_attestation() {
         assert!(PASSTHROUGH_ENV.contains(&"BUZZ_AUTH_TAG"));
     }
+
+    #[test]
+    fn passthrough_carries_proxy_configuration_to_tools() {
+        // On a proxy-only host this is the difference between an agent that can
+        // install a package and one that reports the network is down. Both
+        // spellings: libcurl ignores uppercase HTTP_PROXY, and Go/Python
+        // tooling largely ignores the lowercase set.
+        for var in [
+            "HTTP_PROXY",
+            "HTTPS_PROXY",
+            "NO_PROXY",
+            "ALL_PROXY",
+            "http_proxy",
+            "https_proxy",
+            "no_proxy",
+            "all_proxy",
+        ] {
+            assert!(
+                PASSTHROUGH_ENV.contains(&var),
+                "{var} must survive env_clear() or every MCP tool loses the proxy"
+            );
+        }
+    }
+
+    #[test]
+    fn passthrough_carries_tls_trust_to_tools() {
+        // A TLS-terminating proxy presents its own CA; without these the child
+        // rejects every https fetch even though the proxy itself is reachable.
+        for var in ["SSL_CERT_FILE", "SSL_CERT_DIR"] {
+            assert!(
+                PASSTHROUGH_ENV.contains(&var),
+                "{var} must survive env_clear() or https fails inside tools"
+            );
+        }
+    }
     use rmcp::model::Content;
 
     #[cfg(windows)]
diff --git a/crates/buzz-agent/src/types.rs b/crates/buzz-agent/src/types.rs
index d29e975e03..a3d48a7cf1 100644
--- a/crates/buzz-agent/src/types.rs
+++ b/crates/buzz-agent/src/types.rs
@@ -1,5 +1,5 @@
 use serde::Deserialize;
-use serde_json::Value;
+use serde_json::{Map, Value};
 
 /// Byte-equivalent charged to the handoff/context-pressure gate for a single
 /// image tool result. The gate maps bytes to tokens at 1 byte/token (see
@@ -93,6 +93,13 @@ impl HistoryItem {
                                 + serde_json::to_vec(&c.arguments)
                                     .map(|b| b.len())
                                     .unwrap_or(0)
+                                // `provider_extra` (e.g. a Gemini
+                                // `thoughtSignature`) is re-serialized into
+                                // every replayed call, so it counts toward the
+                                // request body and the context-pressure gate.
+                                + serde_json::to_vec(&c.provider_extra)
+                                    .map(|b| b.len())
+                                    .unwrap_or(0)
                         })
                         .sum::<usize>()
             }
@@ -108,6 +115,17 @@ pub struct ToolCall {
     pub provider_id: String,
     pub name: String,
     pub arguments: Value,
+    /// Fields the provider put on the tool call that we do not model, kept so
+    /// the assistant turn can be replayed the way it arrived.
+    ///
+    /// Gemini on the Databricks MLflow route returns a `thoughtSignature` per
+    /// call and *requires* it echoed back: replaying without it fails the whole
+    /// request with `Function call is missing a thought_signature in functionCall
+    /// parts`. For an agent loop that lands on the very first tool call, so the
+    /// model is unusable without this. Carrying whatever we did not model,
+    /// rather than naming that one field, means the next provider with an opaque
+    /// per-call token needs no change here.
+    pub provider_extra: Map<String, Value>,
 }
 
 #[derive(Debug, Clone)]
@@ -139,6 +157,17 @@ pub struct LlmResponse {
     /// tokens, so reading it alone would undercount). Used to gate handoff on
     /// the real token budget rather than a byte estimate.
     pub input_tokens: Option<u64>,
+    /// The portion of `input_tokens` the provider served from its prompt cache,
+    /// or `None` when the response reported no cache split. Providers bill this
+    /// slice at a large discount (roughly 10x for both OpenAI and Anthropic),
+    /// so a consumer that prices all of `input_tokens` at the full rate
+    /// *overstates* cost — by a lot on an append-only agent loop, where most of
+    /// each request is a prefix the provider already has.
+    ///
+    /// This is a subset of `input_tokens`, never an addition to it: every
+    /// provider we speak to reports an inclusive input total, so adding this
+    /// would double-count.
+    pub cached_input_tokens: Option<u64>,
     /// Output tokens the provider reported for this request, or `None` if the
     /// response carried no usage. Used to accumulate per-turn output counts
     /// for NIP-AM metric publishing.
@@ -342,6 +371,39 @@ mod tests {
         assert!(item.estimated_bytes() >= 3_118_884);
     }
 
+    #[test]
+    fn assistant_size_counts_provider_extra() {
+        // A Gemini `thoughtSignature` rides the wire on every replayed call, so
+        // both size measures must see it — otherwise `truncate_history` and the
+        // handoff gate under-count and let the real request exceed the budget.
+        let mut extra = Map::new();
+        extra.insert("thoughtSignature".into(), Value::String("S".repeat(500)));
+        let with_extra = HistoryItem::Assistant {
+            text: String::new(),
+            tool_calls: vec![ToolCall {
+                provider_id: "id".into(),
+                name: "t".into(),
+                arguments: Value::Null,
+                provider_extra: extra,
+            }],
+        };
+        let without_extra = HistoryItem::Assistant {
+            text: String::new(),
+            tool_calls: vec![ToolCall {
+                provider_id: "id".into(),
+                name: "t".into(),
+                arguments: Value::Null,
+                provider_extra: Map::new(),
+            }],
+        };
+        assert!(with_extra.estimated_bytes() > without_extra.estimated_bytes() + 500);
+        assert_eq!(
+            with_extra.estimated_bytes(),
+            with_extra.context_pressure_bytes(),
+            "provider_extra is text, so both measures must agree"
+        );
+    }
+
     #[test]
     fn text_content_size_is_identical_for_both_measures() {
         // Only images diverge; text must size the same under both paths.
diff --git a/crates/buzz-cli/README.md b/crates/buzz-cli/README.md
index a8c668cf06..40699459fc 100644
--- a/crates/buzz-cli/README.md
+++ b/crates/buzz-cli/README.md
@@ -57,6 +57,8 @@ buzz users get                          # your own profile
 buzz users get --pubkey <hex>           # single user
 buzz users get --pubkey <hex> --pubkey <hex>  # batch (max 200)
 buzz users set-presence --status online
+buzz users set-status --text "heads down on the CLI" --emoji "🚀"
+buzz users set-status --clear                 # remove your status
 
 # DMs
 buzz dms open --pubkey <hex>
@@ -133,6 +135,7 @@ stored rules in `validation_error` so an owner can remove and repair them.
 | | `set-profile` | Update your profile |
 | | `presence` | Get presence status |
 | | `set-presence` | Set presence status |
+| | `set-status` | Set or clear your NIP-38 profile status |
 | `workflows` | `list` | List workflows |
 | | `get` | Get workflow definition |
 | | `create` | Create a workflow |
diff --git a/crates/buzz-cli/TESTING.md b/crates/buzz-cli/TESTING.md
index 4b7257aba7..77234b7faa 100644
--- a/crates/buzz-cli/TESTING.md
+++ b/crates/buzz-cli/TESTING.md
@@ -87,7 +87,7 @@ export BUZZ_PRIVATE_KEY="nsec1..."   # from the mint output
 | `channels:read` | ✅ | `channels list`, `channels get`, `channels members` |
 | `channels:write` | ✅ | `channels create`, `channels update`, `channels join`, `channels leave`, `channels topic`, `channels purpose` |
 | `users:read` | ✅ | `users get`, `users presence` |
-| `users:write` | ✅ | `users set-profile`, `users set-presence` |
+| `users:write` | ✅ | `users set-profile`, `users set-presence`, `users set-status` |
 | `files:read` | ✅ | — |
 | `files:write` | ✅ | — |
 | `admin:channels` | ❌ | `channels archive`, `channels unarchive`, `channels delete`, `channels add-member`, `channels remove-member` |
@@ -331,6 +331,20 @@ buzz users set-presence --status online | jq .
 buzz users set-presence --status away | jq .
 buzz users set-presence --status offline | jq .
 # Note: set-presence may fail — kind:20001 is ephemeral and rejected by the HTTP bridge
+
+# users set-status — NIP-38 kind:30315 on the d:general coordinate
+buzz users set-status --text "reviewing PRs" --emoji "🔍" | jq .
+buzz users set-status --text "no emoji this time" | jq .
+
+# users set-status — emoji-only status (intentional: text is blank, emoji is kept)
+buzz users set-status --text "" --emoji "🎶" | jq .
+
+# users set-status --clear — removes the status (empty content, d:general only)
+buzz users set-status --clear | jq .
+
+# --clear is mutually exclusive with --text/--emoji
+buzz users set-status --clear --text "nope" 2>&1; echo "exit: $?"
+# Expected: exit 1 — clap conflict error
 ```
 
 ### 6.8 Channel Members (add/remove require admin:channels)
@@ -606,3 +620,4 @@ buzz channels delete --channel "$FORUM_ID" | jq .
 | 59 | `notes get` | ☐ | By name, by naddr, --content-only, cross-author, ambiguous → exit 1 |
 | 60 | `notes ls` | ☐ | Own, --author all, --tag, --limit |
 | 61 | `notes rm` | ☐ | Delete→get 404, double-delete idempotent, missing slug → NotFound |
+| 62 | `users set-status` | ☐ | Text+emoji, text only, emoji-only (`--text ""`), `--clear`, `--clear` + `--text` → exit 1 |
diff --git a/crates/buzz-cli/src/commands/messages.rs b/crates/buzz-cli/src/commands/messages.rs
index 290cc59fa8..40a9ae80b5 100644
--- a/crates/buzz-cli/src/commands/messages.rs
+++ b/crates/buzz-cli/src/commands/messages.rs
@@ -9,8 +9,7 @@ use crate::validate::{
     validate_content_size, validate_hex64, validate_uuid, MAX_DIFF_BYTES,
 };
 use buzz_sdk::mentions::{
-    extract_at_mentions_with_known, extract_nostr_uris, merge_mentions, strip_code_regions,
-    MENTION_CAP,
+    extract_at_mentions_with_known, extract_nostr_uris, strip_code_regions, MENTION_CAP,
 };
 
 /// Extract the thread root event ID from a Nostr tag array.
@@ -119,47 +118,82 @@ async fn resolve_channel_id(client: &BuzzClient, event_id: &str) -> Result<Uuid,
     )))
 }
 
-/// Resolve `@name` mentions in `content` against this channel's members.
+fn resolve_names_to_pubkeys(
+    names: &[String],
+    name_to_pubkeys: &std::collections::HashMap<String, Vec<String>>,
+    has_explicit_mentions: bool,
+) -> Result<Vec<String>, CliError> {
+    let mut resolved = Vec::new();
+    for name in names {
+        match name_to_pubkeys
+            .get(name)
+            .map(Vec::as_slice)
+            .unwrap_or_default()
+        {
+            [pubkey] => resolved.push(pubkey.clone()),
+            [] if has_explicit_mentions => {}
+            [] => {
+                return Err(CliError::Usage(format!(
+                    "mention '@{name}' does not match a current channel member; retry with --mention <pubkey>"
+                )))
+            }
+            _ if has_explicit_mentions => {}
+            candidates => {
+                return Err(CliError::Usage(format!(
+                    "mention '@{name}' is ambiguous; candidates: {}. Retry with --mention <pubkey>",
+                    candidates.join(", ")
+                )))
+            }
+        }
+    }
+    Ok(resolved)
+}
+
+/// Resolve mention text against the channel membership snapshot.
 ///
-/// Queries kind 39002 (channel members) then kind 0 (profiles), parses
-/// display names once, and feeds them to [`extract_at_mentions_with_known`]
-/// for multi-word matching. On any I/O or parse failure, returns an empty
-/// vec — auto-tagging is best-effort and must never block a send.
+/// Returns both the current member set and uniquely name-resolved pubkeys.
+/// Lookup failures are fatal when mention processing is requested: publishing
+/// visible mention text without its intended `p` tag is worse than not sending.
 async fn resolve_content_mentions(
     client: &BuzzClient,
     channel_id: &str,
     content: &str,
-) -> Vec<String> {
-    if !content.contains('@') {
-        return vec![];
+    has_explicit_mentions: bool,
+) -> Result<(Vec<String>, Vec<String>), CliError> {
+    let stripped = strip_code_regions(content);
+    if !stripped.contains('@') && !has_explicit_mentions {
+        return Ok((vec![], vec![]));
     }
 
-    // 1. Membership list (kind 39002 is parameterized-replaceable, addressed by `d` tag).
     let members_filter = serde_json::json!({
         "kinds": [39002],
         "#d": [channel_id],
         "limit": 1,
     });
-    let member_pubkeys = match fetch_member_pubkeys(client, &members_filter).await {
-        Some(pks) if !pks.is_empty() => pks,
-        _ => return vec![],
-    };
+    let member_pubkeys = fetch_member_pubkeys(client, &members_filter)
+        .await
+        .ok_or_else(|| {
+            CliError::Other("could not load channel membership for mention preflight".into())
+        })?;
+
+    if !stripped.contains('@') {
+        return Ok((member_pubkeys, vec![]));
+    }
 
-    // 2. Profiles for those members (kind 0).
     let profiles_filter = serde_json::json!({
         "kinds": [0],
         "authors": member_pubkeys,
         "limit": member_pubkeys.len(),
     });
-    let profile_events = match fetch_events(client, &profiles_filter).await {
-        Some(v) => v,
-        None => return vec![],
-    };
+    let profile_events = fetch_events(client, &profiles_filter)
+        .await
+        .ok_or_else(|| {
+            CliError::Other("could not load member profiles for mention resolution".into())
+        })?;
 
-    // 3. Single parse: extract (pubkey, display_name) pairs from profile JSON.
     let mut name_to_pubkeys: std::collections::HashMap<String, Vec<String>> =
         std::collections::HashMap::new();
-    let mut display_names: Vec<String> = Vec::new();
+    let mut display_names = Vec::new();
     for e in &profile_events {
         let Some(pubkey) = e.get("pubkey").and_then(|v| v.as_str()) else {
             continue;
@@ -178,26 +212,82 @@ async fn resolve_content_mentions(
         else {
             continue;
         };
-        let lower = name.to_ascii_lowercase();
         name_to_pubkeys
-            .entry(lower)
+            .entry(name.to_ascii_lowercase())
             .or_default()
             .push(pubkey.to_string());
         display_names.push(name.to_string());
     }
 
-    // 4. Two-pass extraction: known multi-word names first, single-word fallback.
-    let known_refs: Vec<&str> = display_names.iter().map(|s| s.as_str()).collect();
-    let names = extract_at_mentions_with_known(content, &known_refs);
+    let known_refs: Vec<&str> = display_names.iter().map(String::as_str).collect();
+    let names = extract_at_mentions_with_known(&stripped, &known_refs);
+    let resolved = resolve_names_to_pubkeys(&names, &name_to_pubkeys, has_explicit_mentions)?;
+    Ok((member_pubkeys, resolved))
+}
 
-    // 5. Look up matched names → pubkeys via the map we already built.
-    names
+fn normalize_explicit_mentions(values: &[String]) -> Result<Vec<String>, CliError> {
+    let mut normalized = Vec::new();
+    for value in values {
+        let pubkey = PublicKey::parse(value.trim())
+            .map_err(|_| CliError::Usage(format!("invalid --mention pubkey: {value}")))?;
+        let hex = pubkey.to_hex();
+        if !normalized.contains(&hex) {
+            normalized.push(hex);
+        }
+    }
+    if normalized.len() > MENTION_CAP {
+        return Err(CliError::Usage(format!(
+            "too many --mention values (max {MENTION_CAP})"
+        )));
+    }
+    Ok(normalized)
+}
+
+fn merge_message_mentions(
+    explicit: &[String],
+    uri_pubkeys: &[String],
+    auto_resolved: &[String],
+) -> Result<Vec<String>, CliError> {
+    let mut mentions = Vec::new();
+    for pubkey in explicit
         .iter()
-        .flat_map(|n| name_to_pubkeys.get(n).into_iter().flatten())
+        .chain(uri_pubkeys.iter())
+        .chain(auto_resolved.iter())
+    {
+        if !mentions.contains(pubkey) {
+            mentions.push(pubkey.clone());
+        }
+    }
+    if mentions.len() > MENTION_CAP {
+        return Err(CliError::Usage(format!(
+            "too many unique message mentions (max {MENTION_CAP})"
+        )));
+    }
+    Ok(mentions)
+}
+
+fn missing_members(mentions: &[String], members: &[String]) -> Vec<String> {
+    let members: std::collections::HashSet<&str> = members.iter().map(String::as_str).collect();
+    mentions
+        .iter()
+        .filter(|pk| !members.contains(pk.as_str()))
         .cloned()
         .collect()
 }
 
+fn event_mention_pubkeys(event: &nostr::Event) -> Vec<String> {
+    event
+        .tags
+        .iter()
+        .filter_map(|tag| {
+            let parts = tag.as_slice();
+            (parts.first().map(String::as_str) == Some("p"))
+                .then(|| parts.get(1).cloned())
+                .flatten()
+        })
+        .collect()
+}
+
 /// Fetch raw events for `filter` via the relay's `/query` endpoint.
 /// Returns `None` on any I/O or parse failure.
 async fn fetch_events(
@@ -478,6 +568,7 @@ pub struct SendMessageParams {
     pub reply_to: Option<String>,
     pub broadcast: bool,
     pub files: Vec<String>,
+    pub mentions: Vec<String>,
 }
 
 pub async fn cmd_send_message(
@@ -495,6 +586,30 @@ pub async fn cmd_send_message(
     }
     let channel_uuid = parse_uuid(&p.channel_id)?;
 
+    let explicit_mentions = normalize_explicit_mentions(&p.mentions)?;
+    let stripped = strip_code_regions(&p.content);
+    let uri_pubkeys = extract_nostr_uris(&stripped);
+    // Supplying any identity explicitly authorizes unresolved or ambiguous @Name text
+    // as presentation-only, matching Desktop's separate visible-label and p-tag model.
+    // Uniquely resolvable member names still add their own p-tags; callers must supply
+    // every intended identity whose visible label cannot be resolved uniquely.
+    let has_explicit_mentions = !explicit_mentions.is_empty() || !uri_pubkeys.is_empty();
+    let (member_pubkeys, auto_resolved) =
+        resolve_content_mentions(client, &p.channel_id, &p.content, has_explicit_mentions).await?;
+    let mention_pubkeys = merge_message_mentions(&explicit_mentions, &uri_pubkeys, &auto_resolved)?;
+
+    let missing = missing_members(&mention_pubkeys, &member_pubkeys);
+    if !missing.is_empty() {
+        return Err(CliError::Usage(
+            serde_json::json!({
+                "message": "mentioned pubkeys are not channel members; add them explicitly before retrying",
+                "missing_member_pubkeys": missing,
+                "add_member_command": format!("buzz channels add-member --channel {} --pubkey <pubkey> --role <member|bot>", p.channel_id),
+            })
+            .to_string(),
+        ));
+    }
+
     // Upload files and build imeta tags
     let mut media_tags: Vec<Vec<String>> = Vec::new();
     let mut media_content = String::new();
@@ -526,16 +641,7 @@ pub async fn cmd_send_message(
         None
     };
 
-    // Resolve @name mentions in the author-written body only — not the media markdown we
-    // append above, which is derived from upload metadata and can't carry `@names`.
-    let mut auto_resolved = resolve_content_mentions(client, &p.channel_id, &p.content).await;
-
-    // NIP-27: also extract nostr:npub1… inline references (skipping code regions)
-    let stripped = strip_code_regions(&p.content);
-    let uri_pubkeys = extract_nostr_uris(&stripped);
-    merge_mentions(&mut auto_resolved, &uri_pubkeys, MENTION_CAP);
-
-    let mention_refs: Vec<&str> = auto_resolved.iter().map(|s| s.as_str()).collect();
+    let mention_refs: Vec<&str> = mention_pubkeys.iter().map(String::as_str).collect();
 
     let builder = match p.kind {
         Some(45001) => {
@@ -572,9 +678,17 @@ pub async fn cmd_send_message(
     };
 
     let event = client.sign_event(builder)?;
-
+    let emitted_mentions = event_mention_pubkeys(&event);
     let resp = client.submit_event(event).await?;
-    println!("{}", normalize_write_response(&resp));
+    let mut output: serde_json::Value = serde_json::from_str(&normalize_write_response(&resp))
+        .unwrap_or_else(|_| serde_json::json!({ "response": resp }));
+    if let Some(object) = output.as_object_mut() {
+        object.insert(
+            "mention_pubkeys".into(),
+            serde_json::json!(emitted_mentions),
+        );
+    }
+    println!("{output}");
     Ok(())
 }
 
@@ -765,6 +879,7 @@ pub async fn dispatch(
             reply_to,
             broadcast,
             files,
+            mentions,
         } => {
             cmd_send_message(
                 client,
@@ -775,6 +890,7 @@ pub async fn dispatch(
                     reply_to,
                     broadcast,
                     files,
+                    mentions,
                 },
             )
             .await
@@ -876,7 +992,11 @@ pub async fn dispatch(
 
 #[cfg(test)]
 mod tests {
-    use super::{find_root_from_tags, match_profiles_by_name, parse_member_pubkeys};
+    use super::{
+        event_mention_pubkeys, find_root_from_tags, match_profiles_by_name, merge_message_mentions,
+        missing_members, normalize_explicit_mentions, parse_member_pubkeys,
+        resolve_names_to_pubkeys,
+    };
     use buzz_sdk::mentions::{
         extract_at_mentions_with_known, extract_at_names, match_names_to_profiles, MentionProfile,
     };
@@ -1103,6 +1223,94 @@ mod tests {
         assert_eq!(parse_member_pubkeys(&event), vec![PK_VALID_A, PK_VALID_A]);
     }
 
+    #[test]
+    fn explicit_mentions_accept_hex_and_npub_and_deduplicate() {
+        use nostr::ToBech32;
+        let npub = nostr::PublicKey::from_hex(PK_VALID_A)
+            .unwrap()
+            .to_bech32()
+            .unwrap();
+        assert_eq!(
+            normalize_explicit_mentions(&[PK_VALID_A.into(), npub]).unwrap(),
+            vec![PK_VALID_A]
+        );
+        assert!(normalize_explicit_mentions(&["not-a-key".into()]).is_err());
+    }
+
+    #[test]
+    fn explicit_mentions_authorize_presentation_text_without_name_resolution() {
+        let names = vec!["renamed user".into()];
+        let profiles = std::collections::HashMap::new();
+        assert_eq!(
+            resolve_names_to_pubkeys(&names, &profiles, true).unwrap(),
+            Vec::<String>::new()
+        );
+        assert!(resolve_names_to_pubkeys(&names, &profiles, false).is_err());
+    }
+
+    #[test]
+    fn explicit_mentions_authorize_ambiguous_presentation_text() {
+        let names = vec!["alice".into()];
+        let profiles = std::collections::HashMap::from([(
+            "alice".into(),
+            vec![PK_VALID_A.into(), PK_VALID_B.into()],
+        )]);
+        assert_eq!(
+            resolve_names_to_pubkeys(&names, &profiles, true).unwrap(),
+            Vec::<String>::new()
+        );
+        let error = resolve_names_to_pubkeys(&names, &profiles, false).unwrap_err();
+        assert!(error.to_string().contains(PK_VALID_A));
+        assert!(error.to_string().contains(PK_VALID_B));
+    }
+
+    #[test]
+    fn explicit_mentions_make_all_at_names_presentation_only() {
+        let names = vec!["alice".into(), "bob".into()];
+        let profiles = std::collections::HashMap::from([("alice".into(), vec![PK_VALID_A.into()])]);
+        assert_eq!(
+            resolve_names_to_pubkeys(&names, &profiles, true).unwrap(),
+            vec![PK_VALID_A]
+        );
+        assert!(resolve_names_to_pubkeys(&names, &profiles, false).is_err());
+    }
+
+    #[test]
+    fn combined_mention_union_errors_instead_of_truncating() {
+        let explicit: Vec<String> = (0..50).map(|i| format!("explicit-{i}")).collect();
+        assert!(merge_message_mentions(&explicit, &[], &["resolved-bob".into()]).is_err());
+
+        let mut with_duplicate = explicit.clone();
+        with_duplicate.push(explicit[0].clone());
+        assert_eq!(
+            merge_message_mentions(&with_duplicate, &[explicit[1].clone()], &[])
+                .unwrap()
+                .len(),
+            50
+        );
+    }
+
+    #[test]
+    fn membership_preflight_lists_only_missing_mentions() {
+        assert_eq!(
+            missing_members(
+                &[PK_VALID_A.into(), PK_VALID_B.into()],
+                &[PK_VALID_A.into()]
+            ),
+            vec![PK_VALID_B]
+        );
+    }
+
+    #[test]
+    fn mention_evidence_comes_from_signed_event_tags() {
+        use nostr::{EventBuilder, Keys, Tag};
+        let event = EventBuilder::text_note("hello")
+            .tags(vec![Tag::parse(["p", PK_VALID_A]).unwrap()])
+            .sign_with_keys(&Keys::generate())
+            .unwrap();
+        assert_eq!(event_mention_pubkeys(&event), vec![PK_VALID_A]);
+    }
+
     // ---- match_profiles_by_name (author resolution for `messages search --author`) ----
 
     fn profile_event(
diff --git a/crates/buzz-cli/src/commands/users.rs b/crates/buzz-cli/src/commands/users.rs
index 3f8325b4b9..f5a0bee879 100644
--- a/crates/buzz-cli/src/commands/users.rs
+++ b/crates/buzz-cli/src/commands/users.rs
@@ -304,6 +304,22 @@ pub async fn cmd_set_presence(client: &BuzzClient, status: &str) -> Result<(), C
     Ok(())
 }
 
+/// Set user status — sign and submit a NIP-38 kind:30315 user status event.
+///
+/// Uses the `d:general` coordinate that the desktop client reads for the
+/// profile status line. A blank `text` with no `emoji` clears the status.
+pub async fn cmd_set_status(
+    client: &BuzzClient,
+    text: &str,
+    emoji: Option<&str>,
+) -> Result<(), CliError> {
+    let builder = buzz_sdk::build_user_status(text, emoji).map_err(crate::validate::sdk_err)?;
+    let event = client.sign_event(builder)?;
+    let resp = client.submit_event(event).await?;
+    println!("{}", normalize_write_response(&resp));
+    Ok(())
+}
+
 pub async fn dispatch(
     cmd: crate::UsersCmd,
     client: &BuzzClient,
@@ -331,6 +347,16 @@ pub async fn dispatch(
         }
         UsersCmd::Presence { pubkeys } => cmd_get_presence(client, &pubkeys).await,
         UsersCmd::SetPresence { status } => cmd_set_presence(client, &status.to_string()).await,
+        UsersCmd::SetStatus { text, emoji, clear } => {
+            // `--clear` is mutually exclusive with `--text`/`--emoji`: publish the
+            // empty `d:general` event that clients read as "no status".
+            let (text, emoji) = if clear {
+                ("", None)
+            } else {
+                (text.as_deref().unwrap_or_default(), emoji.as_deref())
+            };
+            cmd_set_status(client, text, emoji).await
+        }
     }
 }
 
diff --git a/crates/buzz-cli/src/lib.rs b/crates/buzz-cli/src/lib.rs
index 6ab81a082d..df02c65be9 100644
--- a/crates/buzz-cli/src/lib.rs
+++ b/crates/buzz-cli/src/lib.rs
@@ -82,11 +82,11 @@ struct Cli {
     relay: String,
 
     /// Nostr private key (hex or nsec). This is the CLI's identity.
-    #[arg(long, env = "BUZZ_PRIVATE_KEY")]
+    #[arg(long, env = "BUZZ_PRIVATE_KEY", hide_env_values = true)]
     private_key: Option<String>,
 
     /// NIP-OA auth tag JSON (owner attestation). Injected into every signed event.
-    #[arg(long, env = "BUZZ_AUTH_TAG")]
+    #[arg(long, env = "BUZZ_AUTH_TAG", hide_env_values = true)]
     auth_tag: Option<String>,
 
     /// Output format: 'json' (default, full fields) or 'compact' (reduced fields).
@@ -369,6 +369,9 @@ pub enum MessagesCmd {
         /// Attach file(s) — uploads and includes as imeta tags
         #[arg(long = "file")]
         files: Vec<String>,
+        /// Pubkey to mention (hex or npub; repeatable). Supplying any explicit identity permits unresolved or ambiguous @Name text as presentation-only; uniquely resolved member names still notify.
+        #[arg(long = "mention")]
+        mentions: Vec<String>,
     },
     /// Send a code diff / patch to a channel
     SendDiff {
@@ -838,6 +841,19 @@ pub enum UsersCmd {
         #[arg(long, value_enum)]
         status: PresenceStatus,
     },
+    /// Set your user status (NIP-38 kind:30315 — the "status" line on your profile)
+    #[command(name = "set-status")]
+    SetStatus {
+        /// Status text (required unless --clear)
+        #[arg(long, required_unless_present = "clear")]
+        text: Option<String>,
+        /// Optional emoji shown before the status text
+        #[arg(long)]
+        emoji: Option<String>,
+        /// Remove your status entirely
+        #[arg(long, conflicts_with_all = ["text", "emoji"])]
+        clear: bool,
+    },
 }
 
 #[derive(Subcommand)]
@@ -1803,6 +1819,30 @@ mod tests {
         Cli::command().debug_assert();
     }
 
+    #[test]
+    fn set_status_clear_rejects_text_and_emoji() {
+        for extra in [["--text", "busy"], ["--emoji", "🎶"]] {
+            let args = ["buzz", "users", "set-status", "--clear"]
+                .into_iter()
+                .chain(extra);
+            assert!(
+                Cli::try_parse_from(args).is_err(),
+                "--clear must conflict with {}",
+                extra[0]
+            );
+        }
+    }
+
+    #[test]
+    fn set_status_requires_text_or_clear() {
+        assert!(Cli::try_parse_from(["buzz", "users", "set-status"]).is_err());
+        assert!(
+            Cli::try_parse_from(["buzz", "users", "set-status", "--emoji", "🎶"]).is_err(),
+            "--emoji alone must not imply a status"
+        );
+        assert!(Cli::try_parse_from(["buzz", "users", "set-status", "--clear"]).is_ok());
+    }
+
     #[test]
     fn command_inventory_is_stable() {
         let expected_groups: Vec<&str> = vec![
@@ -1924,7 +1964,13 @@ mod tests {
         );
         assert_eq!(
             names(&cmd, "users"),
-            vec!["get", "presence", "set-presence", "set-profile"]
+            vec![
+                "get",
+                "presence",
+                "set-presence",
+                "set-profile",
+                "set-status"
+            ]
         );
         assert_eq!(
             names(&cmd, "workflows"),
@@ -2011,7 +2057,7 @@ mod tests {
             ("repos", 4),
             ("social", 7),
             ("upload", 1),
-            ("users", 4),
+            ("users", 5),
             ("workflows", 8),
         ];
 
@@ -2032,4 +2078,46 @@ mod tests {
             );
         }
     }
+
+    /// Collect all args (recursing into subcommands) whose env var name looks
+    /// like a credential but does NOT have `hide_env_values` set.
+    fn collect_unhidden_secret_args(cmd: &clap::Command) -> Vec<(String, String)> {
+        const SECRET_PATTERNS: &[&str] = &["KEY", "SECRET", "TOKEN", "PASSWORD", "CRED", "AUTH"];
+
+        let mut violations: Vec<(String, String)> = Vec::new();
+
+        for arg in cmd.get_arguments() {
+            if let Some(env_key) = arg.get_env() {
+                let env_name = env_key.to_string_lossy().to_uppercase();
+                let is_secret = SECRET_PATTERNS.iter().any(|pat| env_name.contains(pat));
+                if is_secret && !arg.is_hide_env_values_set() {
+                    violations.push((cmd.get_name().to_string(), env_name));
+                }
+            }
+        }
+
+        for sub in cmd.get_subcommands() {
+            violations.extend(collect_unhidden_secret_args(sub));
+        }
+
+        violations
+    }
+
+    /// Every arg whose env var name contains KEY/SECRET/TOKEN/PASSWORD/CRED/AUTH
+    /// must set `hide_env_values = true` to prevent credential leakage in --help.
+    #[test]
+    fn secret_env_args_hide_their_values_in_help() {
+        let cmd = Cli::command();
+        let violations = collect_unhidden_secret_args(&cmd);
+        assert!(
+            violations.is_empty(),
+            "Found secret-bearing env args without hide_env_values=true. \
+             Add `hide_env_values = true` to each:\n{}",
+            violations
+                .iter()
+                .map(|(cmd, env)| format!("  command={cmd:?} env={env:?}"))
+                .collect::<Vec<_>>()
+                .join("\n")
+        );
+    }
 }
diff --git a/crates/buzz-core/Cargo.toml b/crates/buzz-core/Cargo.toml
index 489df360dd..c55225adf6 100644
--- a/crates/buzz-core/Cargo.toml
+++ b/crates/buzz-core/Cargo.toml
@@ -11,6 +11,7 @@ description = "Core types, event verification, and filter matching for Buzz"
 test-utils = []
 
 [dependencies]
+base64     = { workspace = true }
 nostr      = { workspace = true }
 serde      = { workspace = true }
 serde_json = { workspace = true }
diff --git a/crates/buzz-core/src/invite.rs b/crates/buzz-core/src/invite.rs
new file mode 100644
index 0000000000..8f557c95aa
--- /dev/null
+++ b/crates/buzz-core/src/invite.rs
@@ -0,0 +1,109 @@
+//! Shared pure contracts for relay invite links.
+//!
+//! The relay transport and database persistence layers both depend on
+//! `buzz-core`. Protocol constants and deterministic v2 code operations live
+//! here so neither layer becomes the accidental source of truth.
+
+use base64::engine::general_purpose::URL_SAFE_NO_PAD;
+use base64::Engine as _;
+use sha2::{Digest, Sha256};
+
+/// Minimum invite lifetime accepted by the mint API: 60 seconds.
+pub const MIN_INVITE_TTL_SECS: u64 = 60;
+
+/// Default invite lifetime when the mint request omits `ttl_secs`: 72 hours.
+pub const DEFAULT_INVITE_TTL_SECS: u64 = 72 * 60 * 60;
+
+/// Maximum invite lifetime accepted by the mint API: 30 days.
+pub const MAX_INVITE_TTL_SECS: u64 = 30 * 24 * 60 * 60;
+
+/// Maximum supported `max_uses` value. Matches the database constraint.
+pub const MAX_INVITE_USES: i32 = 10_000;
+
+/// Prefix that distinguishes v2 opaque database-backed codes from v1 tokens.
+pub const V2_PREFIX: &str = "v2.";
+
+/// Number of random bytes encoded in a v2 invite code.
+pub const V2_SECRET_LEN: usize = 32;
+
+/// A malformed v2 opaque invite code.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct InvalidV2InviteCode;
+
+/// Build a canonical v2 code from its random secret.
+pub fn encode_v2_code(secret: &[u8; V2_SECRET_LEN]) -> String {
+    format!("{V2_PREFIX}{}", URL_SAFE_NO_PAD.encode(secret))
+}
+
+/// Validate the canonical v2 opaque-code shape without consulting storage.
+///
+/// A valid code is exactly `v2.` followed by the unpadded base64url encoding
+/// of a 32-byte secret. The decode/re-encode comparison rejects aliases such
+/// as padded or otherwise non-canonical encodings.
+pub fn validate_v2_code(code: &str) -> Result<(), InvalidV2InviteCode> {
+    let encoded = code.strip_prefix(V2_PREFIX).ok_or(InvalidV2InviteCode)?;
+    let secret = URL_SAFE_NO_PAD
+        .decode(encoded)
+        .map_err(|_| InvalidV2InviteCode)?;
+    if secret.len() != V2_SECRET_LEN || URL_SAFE_NO_PAD.encode(&secret) != encoded {
+        return Err(InvalidV2InviteCode);
+    }
+    Ok(())
+}
+
+/// Hash the complete v2 code to the digest persisted by the database.
+pub fn hash_v2_code(code: &str) -> [u8; 32] {
+    Sha256::digest(code.as_bytes()).into()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn v2_code_round_trip_is_canonical() {
+        let secret = [7_u8; V2_SECRET_LEN];
+        let code = encode_v2_code(&secret);
+
+        assert_eq!(validate_v2_code(&code), Ok(()));
+        assert_eq!(
+            code,
+            format!("{V2_PREFIX}{}", URL_SAFE_NO_PAD.encode(secret))
+        );
+    }
+
+    #[test]
+    fn v2_validation_rejects_malformed_and_noncanonical_codes() {
+        let valid = encode_v2_code(&[7_u8; V2_SECRET_LEN]);
+        let short = format!(
+            "{V2_PREFIX}{}",
+            URL_SAFE_NO_PAD.encode([7_u8; V2_SECRET_LEN - 1])
+        );
+
+        for malformed in [
+            "v2.",
+            "v2.not-base64!",
+            short.as_str(),
+            &format!("{valid}="),
+        ] {
+            assert_eq!(
+                validate_v2_code(malformed),
+                Err(InvalidV2InviteCode),
+                "accepted malformed v2 code: {malformed}"
+            );
+        }
+    }
+
+    #[test]
+    fn v2_hash_covers_the_complete_code() {
+        let code = encode_v2_code(&[7_u8; V2_SECRET_LEN]);
+
+        let expected: [u8; 32] = Sha256::digest(code.as_bytes()).into();
+
+        assert_eq!(hash_v2_code(&code), expected);
+        assert_ne!(
+            hash_v2_code(&code),
+            hash_v2_code(code.trim_start_matches(V2_PREFIX))
+        );
+    }
+}
diff --git a/crates/buzz-core/src/lib.rs b/crates/buzz-core/src/lib.rs
index dd57b46937..66b7708f1d 100644
--- a/crates/buzz-core/src/lib.rs
+++ b/crates/buzz-core/src/lib.rs
@@ -20,6 +20,8 @@ pub mod event;
 pub mod filter;
 /// Git permission types — ref patterns, protection rules, policy evaluation.
 pub mod git_perms;
+/// Shared invite-link contract constants.
+pub mod invite;
 /// Buzz kind number registry — custom event type constants.
 pub mod kind;
 /// Network utilities — SSRF-safe IP classification.
diff --git a/crates/buzz-db/Cargo.toml b/crates/buzz-db/Cargo.toml
index 23ea3c9d8f..01f1e172b6 100644
--- a/crates/buzz-db/Cargo.toml
+++ b/crates/buzz-db/Cargo.toml
@@ -20,6 +20,7 @@ sha2        = { workspace = true }
 tracing     = { workspace = true }
 thiserror   = { workspace = true }
 nostr       = { workspace = true }
+rand        = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true }
diff --git a/crates/buzz-db/src/admin_moderation.rs b/crates/buzz-db/src/admin_moderation.rs
index 2a0d276894..31efaca362 100644
--- a/crates/buzz-db/src/admin_moderation.rs
+++ b/crates/buzz-db/src/admin_moderation.rs
@@ -54,6 +54,31 @@ pub struct AdminReport {
     pub created_at: DateTime<Utc>,
 }
 
+/// Reported message details available only on the admin report detail read.
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AdminReportedMessage {
+    /// Message author public key.
+    pub author_pubkey: String,
+    /// Complete message content.
+    pub content: String,
+    /// Timestamp signed into the message event.
+    pub created_at: DateTime<Utc>,
+    /// Soft-deletion time, when the message has since been deleted.
+    pub deleted_at: Option<DateTime<Utc>>,
+}
+
+/// Deployment-global moderation report detail.
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AdminReportDetail {
+    /// Report metadata.
+    #[serde(flatten)]
+    pub report: AdminReport,
+    /// Reported message when the report targets a stored event.
+    pub message: Option<AdminReportedMessage>,
+}
+
 /// Deployment-global product feedback with source-community provenance.
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -128,24 +153,54 @@ pub async fn list_reports(
     rows.into_iter().map(row_to_report).collect()
 }
 
-/// Fetch one report globally by its row id.
-pub async fn get_report(pool: &PgPool, report_id: Uuid) -> Result<Option<AdminReport>> {
+/// Fetch one report globally by its row id, including its event target content.
+pub async fn get_report(pool: &PgPool, report_id: Uuid) -> Result<Option<AdminReportDetail>> {
     let row = sqlx::query(
         r#"
         SELECT r.id, r.community_id, c.host AS community_host,
                r.report_event_id, r.reporter_pubkey, r.target_kind,
                r.target_event_id, r.target_pubkey, r.target_blob_sha256,
                r.channel_id, r.report_type, r.note, r.status, r.resolved_by,
-               r.resolved_at, r.action_id, r.created_at
+               r.resolved_at, r.action_id, r.created_at,
+               target.pubkey AS message_author_pubkey,
+               target.content AS message_content,
+               target.created_at AS message_created_at,
+               target.deleted_at AS message_deleted_at
         FROM moderation_reports r
         JOIN communities c ON c.id = r.community_id
+        LEFT JOIN LATERAL (
+            SELECT e.pubkey, e.content, e.created_at, e.deleted_at
+            FROM events e
+            WHERE r.target_kind = 'event'
+              AND e.community_id = r.community_id
+              AND e.id = r.target_event_id
+            ORDER BY e.created_at DESC
+            LIMIT 1
+        ) target ON TRUE
         WHERE r.id = $1
         "#,
     )
     .bind(report_id)
     .fetch_optional(pool)
     .await?;
-    row.map(row_to_report).transpose()
+    row.map(|row| {
+        let message = row
+            .try_get::<Option<Vec<u8>>, _>("message_author_pubkey")?
+            .map(|author_pubkey| -> Result<AdminReportedMessage> {
+                Ok(AdminReportedMessage {
+                    author_pubkey: hex::encode(author_pubkey),
+                    content: row.try_get("message_content")?,
+                    created_at: row.try_get("message_created_at")?,
+                    deleted_at: row.try_get("message_deleted_at")?,
+                })
+            })
+            .transpose()?;
+        Ok(AdminReportDetail {
+            report: row_to_report(row)?,
+            message,
+        })
+    })
+    .transpose()
 }
 
 fn row_to_report(row: sqlx::postgres::PgRow) -> Result<AdminReport> {
@@ -228,3 +283,206 @@ fn row_to_feedback(row: sqlx::postgres::PgRow) -> Result<AdminFeedback> {
         received_at: row.try_get("received_at")?,
     })
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const TEST_DB_URL: &str = "postgres://buzz:buzz_dev@localhost:5432/buzz";
+
+    async fn setup_pool() -> PgPool {
+        let database_url = std::env::var("BUZZ_TEST_DATABASE_URL")
+            .or_else(|_| std::env::var("DATABASE_URL"))
+            .unwrap_or_else(|_| TEST_DB_URL.to_owned());
+        PgPool::connect(&database_url)
+            .await
+            .expect("connect to test DB")
+    }
+
+    async fn insert_community(pool: &PgPool, label: &str) -> Uuid {
+        let id = Uuid::new_v4();
+        sqlx::query("INSERT INTO communities (id, host) VALUES ($1, $2)")
+            .bind(id)
+            .bind(format!("admin-report-{label}-{}.example", id.simple()))
+            .execute(pool)
+            .await
+            .expect("insert community");
+        id
+    }
+
+    async fn insert_event(
+        pool: &PgPool,
+        community_id: Uuid,
+        event_id: &[u8],
+        author: &[u8],
+        content: &str,
+        deleted_at: Option<DateTime<Utc>>,
+    ) {
+        sqlx::query(
+            r#"
+            INSERT INTO events (
+                community_id, id, pubkey, created_at, kind, tags, content, sig, deleted_at
+            ) VALUES ($1, $2, $3, $4, 9, '[]'::jsonb, $5, $6, $7)
+            "#,
+        )
+        .bind(community_id)
+        .bind(event_id)
+        .bind(author)
+        .bind(Utc::now())
+        .bind(content)
+        .bind(vec![3_u8; 64])
+        .bind(deleted_at)
+        .execute(pool)
+        .await
+        .expect("insert event");
+    }
+
+    async fn insert_event_report(
+        pool: &PgPool,
+        community_id: Uuid,
+        target_event_id: &[u8],
+    ) -> Uuid {
+        let id = Uuid::new_v4();
+        sqlx::query(
+            r#"
+            INSERT INTO moderation_reports (
+                community_id, id, report_event_id, reporter_pubkey,
+                target_kind, target_event_id, report_type
+            ) VALUES ($1, $2, $3, $4, 'event', $5, 'spam')
+            "#,
+        )
+        .bind(community_id)
+        .bind(id)
+        .bind(Uuid::new_v4().as_bytes().repeat(2))
+        .bind(vec![4_u8; 32])
+        .bind(target_event_id)
+        .execute(pool)
+        .await
+        .expect("insert report");
+        id
+    }
+
+    async fn insert_pubkey_report(pool: &PgPool, community_id: Uuid) -> Uuid {
+        let id = Uuid::new_v4();
+        sqlx::query(
+            r#"
+            INSERT INTO moderation_reports (
+                community_id, id, report_event_id, reporter_pubkey,
+                target_kind, target_pubkey, report_type
+            ) VALUES ($1, $2, $3, $4, 'pubkey', $5, 'spam')
+            "#,
+        )
+        .bind(community_id)
+        .bind(id)
+        .bind(Uuid::new_v4().as_bytes().repeat(2))
+        .bind(vec![4_u8; 32])
+        .bind(vec![7_u8; 32])
+        .execute(pool)
+        .await
+        .expect("insert report");
+        id
+    }
+
+    async fn delete_report_fixture(pool: &PgPool, community_id: Uuid) {
+        sqlx::query("DELETE FROM moderation_reports WHERE community_id = $1")
+            .bind(community_id)
+            .execute(pool)
+            .await
+            .expect("delete report fixture");
+        sqlx::query("DELETE FROM communities WHERE id = $1")
+            .bind(community_id)
+            .execute(pool)
+            .await
+            .expect("delete community fixture");
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn report_detail_reads_only_the_same_community_target_and_includes_deleted_content() {
+        let pool = setup_pool().await;
+        let report_community = insert_community(&pool, "reported").await;
+        let other_community = insert_community(&pool, "other").await;
+        let event_id = vec![1_u8; 32];
+        let deleted_at = Utc::now();
+        insert_event(
+            &pool,
+            report_community,
+            &event_id,
+            &[5_u8; 32],
+            "reported message",
+            Some(deleted_at),
+        )
+        .await;
+        insert_event(
+            &pool,
+            other_community,
+            &event_id,
+            &[6_u8; 32],
+            "wrong tenant message",
+            None,
+        )
+        .await;
+        let report_id = insert_event_report(&pool, report_community, &event_id).await;
+
+        let detail = get_report(&pool, report_id)
+            .await
+            .expect("query report")
+            .expect("report exists");
+        let message = detail.message.expect("reported message exists");
+        assert_eq!(message.content, "reported message");
+        assert_eq!(message.author_pubkey, hex::encode([5_u8; 32]));
+        assert!(message.deleted_at.is_some());
+
+        sqlx::query("DELETE FROM moderation_reports WHERE community_id = $1")
+            .bind(report_community)
+            .execute(&pool)
+            .await
+            .expect("delete report fixture");
+        sqlx::query("DELETE FROM events WHERE community_id = ANY($1)")
+            .bind(vec![report_community, other_community])
+            .execute(&pool)
+            .await
+            .expect("delete event fixtures");
+        sqlx::query("DELETE FROM communities WHERE id = ANY($1)")
+            .bind(vec![report_community, other_community])
+            .execute(&pool)
+            .await
+            .expect("delete community fixtures");
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn report_detail_has_no_message_for_non_event_target() {
+        let pool = setup_pool().await;
+        let community_id = insert_community(&pool, "pubkey-target").await;
+        let report_id = insert_pubkey_report(&pool, community_id).await;
+
+        let detail = get_report(&pool, report_id)
+            .await
+            .expect("query report")
+            .expect("report exists");
+        assert_eq!(detail.report.target_kind, "pubkey");
+        assert!(detail.message.is_none());
+
+        delete_report_fixture(&pool, community_id).await;
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn report_detail_has_no_message_when_event_row_is_missing() {
+        let pool = setup_pool().await;
+        let community_id = insert_community(&pool, "missing-event").await;
+        let missing_event_id = vec![8_u8; 32];
+        let report_id = insert_event_report(&pool, community_id, &missing_event_id).await;
+
+        let detail = get_report(&pool, report_id)
+            .await
+            .expect("query report")
+            .expect("report exists");
+        assert_eq!(detail.report.target_kind, "event");
+        assert_eq!(detail.report.target, hex::encode(missing_event_id));
+        assert!(detail.message.is_none());
+
+        delete_report_fixture(&pool, community_id).await;
+    }
+}
diff --git a/crates/buzz-db/src/channel.rs b/crates/buzz-db/src/channel.rs
index 396244cc96..5508c95cad 100644
--- a/crates/buzz-db/src/channel.rs
+++ b/crates/buzz-db/src/channel.rs
@@ -332,6 +332,40 @@ pub async fn set_canvas(
     Ok(())
 }
 
+/// Namespace for the per-channel membership advisory lock. Serializes the
+/// role-authorization + last-owner-count + write sequences in [`add_member`]
+/// and [`remove_member`] against each other.
+///
+/// Both functions read an owner COUNT and then write a *different* row than the
+/// one they counted, so `READ COMMITTED` snapshot isolation alone permits two
+/// concurrent demotions (or a demotion racing a removal) to each observe two
+/// owners, each pass, and together leave zero — the exact governance loss the
+/// guards exist to prevent. An advisory key rather than `SELECT ... FOR UPDATE`
+/// on the channel row: membership is its own contention domain and must not
+/// serialize against unrelated channel metadata writers (`update_channel`,
+/// `set_topic`, the TTL transition). Distinct key domain from
+/// `buzz_channel_ttl:`.
+const CHANNEL_MEMBERSHIP_LOCK_NAMESPACE: &str = "buzz_channel_membership:";
+
+/// Take the per-channel membership lock. MUST be the first statement in the
+/// transaction that then reads roles/owner counts and writes membership, so the
+/// whole check-then-write sequence is atomic against a concurrent one.
+async fn acquire_channel_membership_lock(
+    tx: &mut Transaction<'_, Postgres>,
+    community_id: CommunityId,
+    channel_id: Uuid,
+) -> Result<()> {
+    sqlx::query("SELECT pg_advisory_xact_lock(hashtextextended($1, 0))")
+        .bind(format!(
+            "{CHANNEL_MEMBERSHIP_LOCK_NAMESPACE}{}:{}",
+            community_id.as_uuid(),
+            channel_id
+        ))
+        .execute(&mut **tx)
+        .await?;
+    Ok(())
+}
+
 /// Add a member to a channel.
 ///
 /// Role enforcement:
@@ -360,6 +394,10 @@ pub async fn add_member(
 
     let mut tx = pool.begin().await?;
 
+    // First statement: serialize the whole role-check / owner-count / upsert
+    // sequence against concurrent membership writes on this channel.
+    acquire_channel_membership_lock(&mut tx, community_id, channel_id).await?;
+
     let channel = get_channel_tx(&mut tx, community_id, channel_id).await?;
 
     let effective_role = if channel.visibility == "private" {
@@ -411,6 +449,56 @@ pub async fn add_member(
         }
     };
 
+    // Changing an *active* member's role is privileged in BOTH directions.
+    // Demotion is as consequential as promotion: only owners/admins may grant
+    // elevated roles, so a demoted owner cannot restore themselves. Guarding
+    // only `role.is_elevated()` above therefore left owner→member demotion
+    // unauthorized-by-anyone. Re-adding an active member with the role they
+    // already hold stays idempotent and unguarded — the huddle bot-add and
+    // kind:9021 join paths rely on that.
+    //
+    // Deliberately keyed on the *active* role. A soft-removed row's stored role
+    // is history, not live authority: `removed_at` says it is no longer in
+    // force. Reactivation therefore lands at whatever `effective_role` the
+    // checks above already authorized — `Member` for any unprivileged caller,
+    // elevated only when a currently-elevated granter asked for it. Inferring
+    // current authority from a removed row would make soft-deleted ownership a
+    // resurrection token: an owner removed by another owner could self-rejoin
+    // via kind:9021 (`Member, None`) and silently regain ownership.
+    let current_role = get_active_role_tx(&mut tx, community_id, channel_id, pubkey).await?;
+    if let Some(current_role) = current_role.filter(|r| r != effective_role.as_str()) {
+        let actor_role = match invited_by {
+            Some(inviter) => get_active_role_tx(&mut tx, community_id, channel_id, inviter).await?,
+            None => None,
+        };
+        let actor_role: Option<MemberRole> = actor_role.and_then(|r| r.parse().ok());
+        if !actor_role.is_some_and(|r| r.is_elevated()) {
+            return Err(DbError::AccessDenied(
+                "only owners/admins may change an active member's role".to_string(),
+            ));
+        }
+
+        // Defense-in-depth, mirroring `remove_member`: a demotion must not
+        // strip the channel of its last owner, which would leave nobody able
+        // to moderate, edit metadata, or re-grant ownership.
+        if current_role == "owner" && effective_role != MemberRole::Owner {
+            let row = sqlx::query(
+                "SELECT COUNT(*) as cnt FROM channel_members \
+                 WHERE community_id = $1 AND channel_id = $2 AND role = 'owner' AND removed_at IS NULL",
+            )
+            .bind(community_id.as_uuid())
+            .bind(channel_id)
+            .fetch_one(&mut *tx)
+            .await?;
+            let owner_count: i64 = row.try_get("cnt")?;
+            if owner_count <= 1 {
+                return Err(DbError::AccessDenied(
+                    "cannot demote the last owner — transfer ownership first".to_string(),
+                ));
+            }
+        }
+    }
+
     sqlx::query(
         r#"
         INSERT INTO channel_members (community_id, channel_id, pubkey, role, invited_by)
@@ -452,10 +540,19 @@ pub async fn add_member(
 /// removing themselves.
 ///
 /// Returns `Err(DbError::MemberNotFound)` if the target is not an active member.
-/// The actor's role check and the UPDATE run inside a transaction to prevent a
-/// TOCTOU race where the actor's role changes between the check and the update.
-/// The `is_agent_owner` check runs outside the transaction against the main pool
-/// because `agent_owner_pubkey` is immutable (set once at token mint).
+///
+/// The per-channel membership lock is the transaction's first statement, so the
+/// actor's role check, the last-owner count, and the UPDATE are all serialized
+/// against concurrent membership writes — otherwise a concurrent demotion of the
+/// actor could commit after their role was read and this removal would proceed on
+/// a stale elevated role.
+///
+/// The `is_agent_owner` lookup deliberately runs *before* the transaction opens:
+/// it borrows a second connection from `pool`, and issuing it while holding the
+/// lock could deadlock against ourselves on a small pool. That is safe because
+/// `agent_owner_pubkey` is immutable — [`crate::user::set_agent_owner`] only
+/// updates it when it `IS NULL` (first-mint-wins), so its value cannot change
+/// under us and needs no serialization.
 pub async fn remove_member(
     pool: &PgPool,
     community_id: CommunityId,
@@ -463,9 +560,24 @@ pub async fn remove_member(
     pubkey: &[u8],
     actor_pubkey: &[u8],
 ) -> Result<()> {
+    let is_self_remove = pubkey == actor_pubkey;
+
+    // Immutable, and must not be queried while holding the lock (second pool
+    // connection). Resolved up front so every *mutable* authorization read can
+    // sit behind the serialization point below.
+    let actor_is_agent_owner = if is_self_remove {
+        false
+    } else {
+        crate::user::is_agent_owner(pool, community_id, pubkey, actor_pubkey).await?
+    };
+
     let mut tx = pool.begin().await?;
 
-    let is_self_remove = pubkey == actor_pubkey;
+    // First statement: serialize the actor-role check, the last-owner count and
+    // the UPDATE against concurrent membership writes on this channel (same key
+    // as `add_member`).
+    acquire_channel_membership_lock(&mut tx, community_id, channel_id).await?;
+
     if !is_self_remove {
         let actor_role_str = get_active_role_tx(&mut tx, community_id, channel_id, actor_pubkey)
             .await?
@@ -473,11 +585,7 @@ pub async fn remove_member(
         let actor_role: MemberRole = actor_role_str.parse().map_err(|_| {
             DbError::InvalidData(format!("invalid role in database: {actor_role_str}"))
         })?;
-        // Safe to query outside the transaction: agent_owner_pubkey is immutable
-        // (set once at token mint, first-mint-wins).
-        if !actor_role.is_elevated()
-            && !crate::user::is_agent_owner(pool, community_id, pubkey, actor_pubkey).await?
-        {
+        if !actor_role.is_elevated() && !actor_is_agent_owner {
             return Err(DbError::AccessDenied(
                 "only owners/admins or the agent's owner may remove other members".to_string(),
             ));
@@ -1892,4 +2000,688 @@ mod tests {
             "random user should not be able to remove someone else's bot"
         );
     }
+
+    /// SECURITY REPRO (Dawn, kind:9000 demotion report): an unprivileged plain
+    /// member calls add_member with role=Member against the channel OWNER.
+    /// If this succeeds, add_member has no demotion authorization and no
+    /// last-owner guard.
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn repro_unprivileged_member_can_demote_owner() {
+        let pool = setup_pool().await;
+        let community_id = make_test_community(&pool).await;
+        let community = CommunityId::from_uuid(community_id);
+        let victim_owner = random_pubkey();
+        let attacker = random_pubkey();
+
+        for pk in [&victim_owner, &attacker] {
+            ensure_user(&pool, community, pk)
+                .await
+                .expect("ensure user");
+        }
+
+        let channel = create_test_channel(
+            &pool,
+            community_id,
+            "repro-demote-owner",
+            ChannelType::Stream,
+            ChannelVisibility::Open,
+            None,
+            &victim_owner,
+            None,
+        )
+        .await
+        .expect("create channel");
+
+        // create_test_channel already seeds the creator as 'owner', mirroring
+        // create_channel's own INSERT (channel.rs:131-145).
+        let role_of = |members: Vec<MemberRecord>, pk: Vec<u8>| -> Option<String> {
+            members.into_iter().find(|m| m.pubkey == pk).map(|m| m.role)
+        };
+        let before = role_of(
+            get_members(&pool, community, channel.id)
+                .await
+                .expect("members"),
+            victim_owner.clone(),
+        );
+        assert_eq!(
+            before.as_deref(),
+            Some("owner"),
+            "victim must start as owner"
+        );
+
+        // Attacker: plain member, not owner/admin.
+        add_member(
+            &pool,
+            community,
+            channel.id,
+            &attacker,
+            MemberRole::Member,
+            None,
+        )
+        .await
+        .expect("attacker self-joins open channel");
+
+        // The attack: attacker is `invited_by` and demotes the owner.
+        let res = add_member(
+            &pool,
+            community,
+            channel.id,
+            &victim_owner,
+            MemberRole::Member,
+            Some(&attacker),
+        )
+        .await;
+
+        let after = role_of(
+            get_members(&pool, community, channel.id)
+                .await
+                .expect("members"),
+            victim_owner.clone(),
+        );
+        let owners = get_members(&pool, community, channel.id)
+            .await
+            .expect("members")
+            .into_iter()
+            .filter(|m| m.role == "owner")
+            .count();
+
+        assert!(
+            res.is_err(),
+            "unprivileged member must not be able to demote the owner"
+        );
+        assert_eq!(after.as_deref(), Some("owner"), "owner role must survive");
+        assert_eq!(owners, 1, "channel must still have its owner");
+    }
+
+    /// SECURITY REPRO (Dawn): same demotion on a PRIVATE channel, where the
+    /// attacker is a plain member. The report claims any member suffices here.
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn repro_private_channel_member_can_demote_owner() {
+        let pool = setup_pool().await;
+        let community_id = make_test_community(&pool).await;
+        let community = CommunityId::from_uuid(community_id);
+        let victim_owner = random_pubkey();
+        let attacker = random_pubkey();
+
+        for pk in [&victim_owner, &attacker] {
+            ensure_user(&pool, community, pk)
+                .await
+                .expect("ensure user");
+        }
+
+        let channel = create_test_channel(
+            &pool,
+            community_id,
+            "repro-demote-owner-private",
+            ChannelType::Stream,
+            ChannelVisibility::Private,
+            None,
+            &victim_owner,
+            None,
+        )
+        .await
+        .expect("create private channel");
+
+        // Owner invites the attacker as a plain member (legitimate).
+        add_member(
+            &pool,
+            community,
+            channel.id,
+            &attacker,
+            MemberRole::Member,
+            Some(&victim_owner),
+        )
+        .await
+        .expect("owner invites attacker");
+
+        // Attack: plain member demotes the owner.
+        let res = add_member(
+            &pool,
+            community,
+            channel.id,
+            &victim_owner,
+            MemberRole::Member,
+            Some(&attacker),
+        )
+        .await;
+
+        let members = get_members(&pool, community, channel.id)
+            .await
+            .expect("members");
+        let victim_role = members
+            .iter()
+            .find(|m| m.pubkey == victim_owner)
+            .map(|m| m.role.clone());
+        let owners = members.iter().filter(|m| m.role == "owner").count();
+
+        assert!(
+            res.is_err(),
+            "plain member must not be able to demote the owner on a private channel"
+        );
+        assert_eq!(
+            victim_role.as_deref(),
+            Some("owner"),
+            "owner role must survive"
+        );
+        assert_eq!(owners, 1, "channel must still have its owner");
+    }
+
+    /// The fix must not break legitimate role management: an owner demoting a
+    /// co-owner (while another owner remains) must still succeed, and promotion
+    /// by an owner must still succeed.
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn owner_can_still_manage_roles_after_demotion_guard() {
+        let pool = setup_pool().await;
+        let community_id = make_test_community(&pool).await;
+        let community = CommunityId::from_uuid(community_id);
+        let owner = random_pubkey();
+        let other = random_pubkey();
+
+        for pk in [&owner, &other] {
+            ensure_user(&pool, community, pk)
+                .await
+                .expect("ensure user");
+        }
+
+        let channel = create_test_channel(
+            &pool,
+            community_id,
+            "roles-still-manageable",
+            ChannelType::Stream,
+            ChannelVisibility::Open,
+            None,
+            &owner,
+            None,
+        )
+        .await
+        .expect("create channel");
+
+        // Owner promotes `other` to owner — allowed (actor is elevated).
+        add_member(
+            &pool,
+            community,
+            channel.id,
+            &other,
+            MemberRole::Owner,
+            Some(&owner),
+        )
+        .await
+        .expect("owner may promote to owner");
+
+        // Owner demotes the co-owner back to member — allowed: actor is elevated
+        // and another owner remains, so the last-owner guard does not trip.
+        add_member(
+            &pool,
+            community,
+            channel.id,
+            &other,
+            MemberRole::Member,
+            Some(&owner),
+        )
+        .await
+        .expect("owner may demote a co-owner while another owner remains");
+
+        let members = get_members(&pool, community, channel.id)
+            .await
+            .expect("members");
+        let role_of = |pk: &Vec<u8>| {
+            members
+                .iter()
+                .find(|m| &m.pubkey == pk)
+                .map(|m| m.role.clone())
+        };
+        assert_eq!(role_of(&other).as_deref(), Some("member"));
+        assert_eq!(role_of(&owner).as_deref(), Some("owner"));
+
+        // Idempotent re-add at the SAME role must stay unguarded even from a
+        // non-elevated actor — the huddle bot-add path depends on this.
+        let bot = random_pubkey();
+        ensure_user(&pool, community, &bot)
+            .await
+            .expect("ensure bot");
+        add_member(
+            &pool,
+            community,
+            channel.id,
+            &bot,
+            MemberRole::Bot,
+            Some(&owner),
+        )
+        .await
+        .expect("add bot");
+        add_member(
+            &pool,
+            community,
+            channel.id,
+            &bot,
+            MemberRole::Bot,
+            Some(&other),
+        )
+        .await
+        .expect("re-adding at the same role must remain idempotent");
+
+        // But the last owner cannot be demoted, even by themselves.
+        let err = add_member(
+            &pool,
+            community,
+            channel.id,
+            &owner,
+            MemberRole::Member,
+            Some(&owner),
+        )
+        .await
+        .expect_err("last owner must not be demotable");
+        println!("last-owner demotion rejected: {err}");
+    }
+
+    /// Isolates the actor-authorization guard from the last-owner guard.
+    ///
+    /// `repro_unprivileged_member_can_demote_owner` demotes the *sole* owner, so
+    /// the last-owner guard alone is enough to reject it: stubbing out the actor
+    /// check leaves that test green and the authorization hole invisible. Here a
+    /// second owner remains, so the last-owner guard cannot fire and only the
+    /// actor check stands between an unprivileged member and a co-owner's role.
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn unprivileged_member_cannot_demote_a_co_owner() {
+        let pool = setup_pool().await;
+        let community_id = make_test_community(&pool).await;
+        let community = CommunityId::from_uuid(community_id);
+        let owner = random_pubkey();
+        let co_owner = random_pubkey();
+        let attacker = random_pubkey();
+
+        for pk in [&owner, &co_owner, &attacker] {
+            ensure_user(&pool, community, pk)
+                .await
+                .expect("ensure user");
+        }
+
+        let channel = create_test_channel(
+            &pool,
+            community_id,
+            "co-owner-demotion-authz",
+            ChannelType::Stream,
+            ChannelVisibility::Open,
+            None,
+            &owner,
+            None,
+        )
+        .await
+        .expect("create channel");
+
+        add_member(
+            &pool,
+            community,
+            channel.id,
+            &co_owner,
+            MemberRole::Owner,
+            Some(&owner),
+        )
+        .await
+        .expect("owner may promote a co-owner");
+
+        add_member(
+            &pool,
+            community,
+            channel.id,
+            &attacker,
+            MemberRole::Member,
+            None,
+        )
+        .await
+        .expect("attacker self-joins the open channel");
+
+        // Two owners remain, so the last-owner guard cannot reject this. Only
+        // the actor-authorization check can.
+        let err = add_member(
+            &pool,
+            community,
+            channel.id,
+            &co_owner,
+            MemberRole::Member,
+            Some(&attacker),
+        )
+        .await
+        .expect_err("an unprivileged member must not demote a co-owner");
+        println!("co-owner demotion by unprivileged actor rejected: {err}");
+
+        let members = get_members(&pool, community, channel.id)
+            .await
+            .expect("members");
+        let role_of = |pk: &Vec<u8>| {
+            members
+                .iter()
+                .find(|m| &m.pubkey == pk)
+                .map(|m| m.role.clone())
+        };
+        assert_eq!(
+            role_of(&co_owner).as_deref(),
+            Some("owner"),
+            "co-owner must keep their role"
+        );
+        assert_eq!(
+            members.iter().filter(|m| m.role == "owner").count(),
+            2,
+            "both owners must survive"
+        );
+    }
+
+    /// Sets up an open channel with exactly two owners, returning
+    /// `(community, channel_id, owner_a, owner_b)`.
+    async fn channel_with_two_owners(
+        pool: &PgPool,
+        name: &str,
+    ) -> (CommunityId, Uuid, Vec<u8>, Vec<u8>) {
+        let community_id = make_test_community(pool).await;
+        let community = CommunityId::from_uuid(community_id);
+        let owner_a = random_pubkey();
+        let owner_b = random_pubkey();
+        for pk in [&owner_a, &owner_b] {
+            ensure_user(pool, community, pk).await.expect("ensure user");
+        }
+
+        let channel = create_test_channel(
+            pool,
+            community_id,
+            name,
+            ChannelType::Stream,
+            ChannelVisibility::Open,
+            None,
+            &owner_a,
+            None,
+        )
+        .await
+        .expect("create channel");
+
+        add_member(
+            pool,
+            community,
+            channel.id,
+            &owner_b,
+            MemberRole::Owner,
+            Some(&owner_a),
+        )
+        .await
+        .expect("promote second owner");
+
+        (community, channel.id, owner_a, owner_b)
+    }
+
+    /// The lock must be shared with `remove_member`: a demotion racing an owner
+    /// removal goes through a separate count/update path, so both must serialize
+    /// on the same key or they can jointly empty the owner set.
+    ///
+    /// Deterministic rather than timing-based: an outer transaction takes the
+    /// per-channel membership key first, then each membership writer must block
+    /// until it is released. Verified by mutation — dropping the lock from either
+    /// function makes that call return immediately and fails this test.
+    #[tokio::test]
+    #[ignore]
+    async fn membership_writes_serialize_on_the_shared_channel_lock() {
+        let pool = setup_pool().await;
+        let (community, channel_id, owner_a, owner_b) =
+            channel_with_two_owners(&pool, "membership-lock-shared").await;
+
+        for label in ["add_member", "remove_member"] {
+            // Hold the same advisory key an in-tree membership write would take.
+            let mut holder = pool.begin().await.expect("begin lock holder");
+            acquire_channel_membership_lock(&mut holder, community, channel_id)
+                .await
+                .expect("holder acquires membership key");
+
+            let pool2 = pool.clone();
+            let (target, actor) = (owner_a.clone(), owner_b.clone());
+            let mut writer = tokio::spawn(async move {
+                match label {
+                    "add_member" => add_member(
+                        &pool2,
+                        community,
+                        channel_id,
+                        &target,
+                        MemberRole::Member,
+                        Some(&actor),
+                    )
+                    .await
+                    .map(|_| ()),
+                    _ => remove_member(&pool2, community, channel_id, &target, &actor).await,
+                }
+            });
+
+            // While the key is held, the writer must make no progress.
+            let blocked =
+                tokio::time::timeout(std::time::Duration::from_millis(750), &mut writer).await;
+            assert!(
+                blocked.is_err(),
+                "{label} completed while the channel membership key was held — \
+                 it is not serializing on the shared lock"
+            );
+            println!("{label} blocked on the held membership key, as required");
+
+            // Releasing the key lets it proceed.
+            holder.rollback().await.expect("release membership key");
+            tokio::time::timeout(std::time::Duration::from_secs(10), writer)
+                .await
+                .expect("writer must proceed once the key is released")
+                .expect("writer task panicked")
+                .expect("writer must succeed after the key is released");
+
+            // Restore two owners for the next iteration.
+            add_member(
+                &pool,
+                community,
+                channel_id,
+                &owner_a,
+                MemberRole::Owner,
+                Some(&owner_b),
+            )
+            .await
+            .expect("restore second owner");
+        }
+    }
+
+    /// Every *mutable* authorization read must sit behind the membership lock.
+    /// A remover that reads its elevated role before acquiring the lock can be
+    /// demoted by a concurrent writer and still proceed on the stale role.
+    ///
+    /// Deterministic: the holder takes the key, `remove_member` blocks on it, the
+    /// holder then demotes the remover and commits. Once the key is released the
+    /// remover must re-read its (now unprivileged) role and be rejected.
+    #[tokio::test]
+    #[ignore]
+    async fn remove_member_rejects_an_actor_demoted_while_it_waited() {
+        let pool = setup_pool().await;
+        let (community, channel_id, owner_a, owner_b) =
+            channel_with_two_owners(&pool, "stale-actor-role").await;
+        // owner_b removes a plain member, so the last-owner guard is not what
+        // rejects this — only the actor's own role can.
+        let victim = random_pubkey();
+        ensure_user(&pool, community, &victim)
+            .await
+            .expect("ensure victim");
+        add_member(
+            &pool,
+            community,
+            channel_id,
+            &victim,
+            MemberRole::Member,
+            Some(&owner_a),
+        )
+        .await
+        .expect("add victim");
+
+        let mut holder = pool.begin().await.expect("begin lock holder");
+        acquire_channel_membership_lock(&mut holder, community, channel_id)
+            .await
+            .expect("holder acquires membership key");
+
+        let pool2 = pool.clone();
+        let (actor, target) = (owner_b.clone(), victim.clone());
+        let mut remover = tokio::spawn(async move {
+            remove_member(&pool2, community, channel_id, &target, &actor).await
+        });
+
+        // Must be waiting on the key, not already authorized past it.
+        assert!(
+            tokio::time::timeout(std::time::Duration::from_millis(750), &mut remover)
+                .await
+                .is_err(),
+            "remove_member must block on the membership key before authorizing"
+        );
+
+        // Demote the waiting actor to a plain member and release the key.
+        sqlx::query(
+            "UPDATE channel_members SET role = 'member' \
+             WHERE community_id = $1 AND channel_id = $2 AND pubkey = $3",
+        )
+        .bind(community.as_uuid())
+        .bind(channel_id)
+        .bind(&owner_b)
+        .execute(&mut *holder)
+        .await
+        .expect("demote the waiting actor");
+        holder.commit().await.expect("commit demotion");
+
+        let result = tokio::time::timeout(std::time::Duration::from_secs(10), remover)
+            .await
+            .expect("remover must proceed once the key is released")
+            .expect("remover task panicked");
+
+        let err = result.expect_err("a demoted actor must not remove another member");
+        println!("stale-role removal rejected: {err}");
+
+        // The victim must still be an active member.
+        let members = get_members(&pool, community, channel_id)
+            .await
+            .expect("members");
+        assert!(
+            members.iter().any(|m| m.pubkey == victim),
+            "victim must not have been removed by a demoted actor"
+        );
+    }
+
+    /// A soft-removed row keeps its stored `role`, but that role is history,
+    /// not live authority — `removed_at` says it is no longer in force. So
+    /// reactivation must land at the baseline the caller was authorized for,
+    /// never at the role the row happens to remember.
+    ///
+    /// Regression for the sharper vulnerability the alternative would create:
+    /// an owner kicked by another owner self-rejoins through the kind:9021
+    /// path (`Member`, no inviter) and must come back as a plain member. If
+    /// `add_member` inferred authority from the removed row, soft-deleted
+    /// ownership would be a resurrection token.
+    ///
+    /// Two owners on purpose, so the last-owner guard can never be what
+    /// decides the outcome — only role resolution can.
+    #[tokio::test]
+    #[ignore]
+    async fn kicked_owner_rejoins_as_member_not_owner() {
+        let pool = setup_pool().await;
+        let (community, channel_id, owner_a, owner_b) =
+            channel_with_two_owners(&pool, "kicked-owner-rejoin").await;
+
+        // owner_a kicks owner_b (allowed: owner_a remains as the last owner).
+        remove_member(&pool, community, channel_id, &owner_b, &owner_a)
+            .await
+            .expect("an owner may remove another owner");
+
+        let stored: String = sqlx::query_scalar(
+            "SELECT role::text FROM channel_members \
+             WHERE community_id = $1 AND channel_id = $2 AND pubkey = $3",
+        )
+        .bind(community.as_uuid())
+        .bind(channel_id)
+        .bind(&owner_b)
+        .fetch_one(&pool)
+        .await
+        .expect("stored role survives soft removal");
+        assert_eq!(
+            stored, "owner",
+            "the removed row still remembers `owner` — which is exactly why \
+             authorization must not read it"
+        );
+
+        // The kind:9021 self-rejoin path: `Member`, no inviter.
+        add_member(
+            &pool,
+            community,
+            channel_id,
+            &owner_b,
+            MemberRole::Member,
+            None,
+        )
+        .await
+        .expect("a removed member may rejoin an open channel");
+
+        let rejoined = get_member_role(&pool, community, channel_id, &owner_b)
+            .await
+            .expect("read role after rejoin");
+        assert_eq!(
+            rejoined.as_deref(),
+            Some("member"),
+            "a kicked owner must rejoin at baseline privilege, not regain ownership"
+        );
+    }
+
+    /// The other side of the same boundary: reactivation may reach an elevated
+    /// role, but only because a *currently* elevated granter asked for it.
+    #[tokio::test]
+    #[ignore]
+    async fn removed_owner_is_restored_only_by_a_current_owner() {
+        let pool = setup_pool().await;
+        let (community, channel_id, owner_a, owner_b) =
+            channel_with_two_owners(&pool, "removed-owner-restore").await;
+
+        remove_member(&pool, community, channel_id, &owner_b, &owner_a)
+            .await
+            .expect("an owner may remove another owner");
+
+        // An unprivileged member cannot re-add them at `owner`.
+        let rando = random_pubkey();
+        ensure_user(&pool, community, &rando)
+            .await
+            .expect("ensure rando");
+        add_member(
+            &pool,
+            community,
+            channel_id,
+            &rando,
+            MemberRole::Member,
+            None,
+        )
+        .await
+        .expect("rando self-joins open channel");
+        let denied = add_member(
+            &pool,
+            community,
+            channel_id,
+            &owner_b,
+            MemberRole::Owner,
+            Some(&rando),
+        )
+        .await;
+        assert!(
+            matches!(denied, Err(DbError::AccessDenied(_))),
+            "an unprivileged actor must not re-add anyone at `owner`, got {denied:?}"
+        );
+
+        // The remaining owner can.
+        add_member(
+            &pool,
+            community,
+            channel_id,
+            &owner_b,
+            MemberRole::Owner,
+            Some(&owner_a),
+        )
+        .await
+        .expect("a current owner may restore ownership");
+        let restored = get_member_role(&pool, community, channel_id, &owner_b)
+            .await
+            .expect("read role after restore");
+        assert_eq!(restored.as_deref(), Some("owner"));
+    }
 }
diff --git a/crates/buzz-db/src/feed.rs b/crates/buzz-db/src/feed.rs
index 7cc02d8011..511a2a6083 100644
--- a/crates/buzz-db/src/feed.rs
+++ b/crates/buzz-db/src/feed.rs
@@ -34,9 +34,10 @@ use sqlx::{PgPool, QueryBuilder};
 use uuid::Uuid;
 
 use buzz_core::kind::{
-    KIND_FORUM_COMMENT, KIND_FORUM_POST, KIND_JOB_PROGRESS, KIND_JOB_REQUEST, KIND_JOB_RESULT,
-    KIND_STREAM_MESSAGE, KIND_STREAM_MESSAGE_V2, KIND_STREAM_REMINDER,
-    KIND_WORKFLOW_APPROVAL_REQUESTED,
+    KIND_FORUM_COMMENT, KIND_FORUM_POST, KIND_GIT_ISSUE, KIND_GIT_PR_UPDATE, KIND_GIT_PULL_REQUEST,
+    KIND_GIT_STATUS_CLOSED, KIND_GIT_STATUS_DRAFT, KIND_GIT_STATUS_MERGED, KIND_GIT_STATUS_OPEN,
+    KIND_JOB_PROGRESS, KIND_JOB_REQUEST, KIND_JOB_RESULT, KIND_STREAM_MESSAGE,
+    KIND_STREAM_MESSAGE_V2, KIND_STREAM_REMINDER, KIND_TEXT_NOTE, KIND_WORKFLOW_APPROVAL_REQUESTED,
 };
 use buzz_core::{CommunityId, StoredEvent};
 
@@ -103,7 +104,9 @@ fn build_mentions_query(
     qb.push(" AND e.deleted_at IS NULL");
     qb.push(format!(
         " AND e.kind IN ({KIND_STREAM_MESSAGE}, {KIND_STREAM_MESSAGE_V2}, \
-         {KIND_FORUM_POST}, {KIND_FORUM_COMMENT})"
+         {KIND_TEXT_NOTE}, {KIND_FORUM_POST}, {KIND_FORUM_COMMENT}, {KIND_GIT_PULL_REQUEST}, \
+         {KIND_GIT_PR_UPDATE}, {KIND_GIT_ISSUE}, {KIND_GIT_STATUS_OPEN}, \
+         {KIND_GIT_STATUS_MERGED}, {KIND_GIT_STATUS_CLOSED}, {KIND_GIT_STATUS_DRAFT})"
     ));
     push_visible_channel_filter(&mut qb, "e.channel_id", accessible_channel_ids);
     if let Some(s) = since {
@@ -252,7 +255,7 @@ mod tests {
     use nostr::{EventBuilder, Keys, Kind, Tag};
     use uuid::Uuid;
 
-    const TEST_DB_URL: &str = "postgres://buzz:buzz_dev@localhost:5432/buzz";
+    const TEST_DB_URL: &str = "postgres://buzz:buzz_dev@localhost:5432/buzz"; // sadscan:disable np.postgres.1 -- local test-only credentials
 
     async fn setup_pool() -> PgPool {
         let database_url = std::env::var("BUZZ_TEST_DATABASE_URL")
@@ -777,6 +780,12 @@ mod tests {
             sql.contains("AND m.community_id = "),
             "mentions feed must also bind event_mentions.community_id: {sql}"
         );
+        assert!(
+            sql.contains(&KIND_GIT_PULL_REQUEST.to_string())
+                && sql.contains(&KIND_GIT_ISSUE.to_string())
+                && sql.contains(&KIND_TEXT_NOTE.to_string()),
+            "mentions feed must include Buzz Git roots and comments: {sql}"
+        );
     }
 
     #[test]
diff --git a/crates/buzz-db/src/lib.rs b/crates/buzz-db/src/lib.rs
index 9c63b2e8ab..2a3ba9a63e 100644
--- a/crates/buzz-db/src/lib.rs
+++ b/crates/buzz-db/src/lib.rs
@@ -39,6 +39,8 @@ pub mod product_feedback;
 pub mod push;
 /// Reaction persistence.
 pub mod reaction;
+/// Use-limited relay invite persistence (v2 opaque tokens).
+pub mod relay_invite;
 /// Relay-level membership persistence (NIP-43).
 pub mod relay_members;
 /// Replica freshness fence for keyset-cursor read routing.
@@ -563,7 +565,7 @@ impl Db {
     pub async fn admin_get_report(
         &self,
         id: Uuid,
-    ) -> Result<Option<admin_moderation::AdminReport>> {
+    ) -> Result<Option<admin_moderation::AdminReportDetail>> {
         admin_moderation::get_report(&self.pool, id).await
     }
 
@@ -2639,6 +2641,23 @@ impl Db {
         workflow::set_workflow_enabled(&self.pool, community_id, id, enabled).await
     }
 
+    /// Disable all of an owner's workflows in a channel (SEC-006, on
+    /// membership loss). Returns the number of workflows disabled.
+    pub async fn disable_workflows_for_owner_in_channel(
+        &self,
+        community_id: CommunityId,
+        channel_id: Uuid,
+        owner_pubkey: &[u8],
+    ) -> Result<u64> {
+        workflow::disable_workflows_for_owner_in_channel(
+            &self.pool,
+            community_id,
+            channel_id,
+            owner_pubkey,
+        )
+        .await
+    }
+
     /// Delete a workflow and all its runs/approvals.
     pub async fn delete_workflow(&self, community_id: CommunityId, id: Uuid) -> Result<()> {
         workflow::delete_workflow(&self.pool, community_id, id).await
@@ -3028,6 +3047,51 @@ impl Db {
         relay_members::backfill_from_allowlist(&self.pool, community).await
     }
 
+    /// Mints a v2 use-limited relay invite. The plaintext code is returned
+    /// exactly once; only its SHA-256 hash is persisted.
+    ///
+    /// `max_uses` is `None` for unlimited or `Some(1..=10000)`.
+    /// `ttl_secs` must be in the shared invite lifetime range.
+    pub async fn mint_relay_invite(
+        &self,
+        community: CommunityId,
+        created_by: &str,
+        ttl_secs: u64,
+        max_uses: Option<i32>,
+    ) -> Result<relay_invite::MintedInvite> {
+        relay_invite::mint_relay_invite(&self.pool, community, created_by, ttl_secs, max_uses).await
+    }
+
+    /// Delete one bounded batch of invites expired before `cutoff`.
+    pub async fn reap_expired_relay_invites(
+        &self,
+        cutoff: chrono::DateTime<chrono::Utc>,
+    ) -> Result<u64> {
+        relay_invite::reap_expired_relay_invites(&self.pool, cutoff).await
+    }
+
+    /// Atomically claims a v2 relay invite. The full redemption (membership
+    /// insert, policy evidence, use_count increment) runs in one PostgreSQL
+    /// transaction with `FOR UPDATE` on the invite row.
+    ///
+    /// `token_hash` is the SHA-256 of the presented v2 code (32 bytes).
+    pub async fn claim_relay_invite(
+        &self,
+        community: CommunityId,
+        token_hash: &[u8; 32],
+        claimer_pubkey: &str,
+        policy_version: Option<&str>,
+    ) -> Result<relay_invite::ClaimOutcome> {
+        relay_invite::claim_relay_invite(
+            &self.pool,
+            community,
+            token_hash,
+            claimer_pubkey,
+            policy_version,
+        )
+        .await
+    }
+
     /// Sidecar an accepted product-feedback event, idempotent by event id.
     pub async fn insert_product_feedback(
         &self,
diff --git a/crates/buzz-db/src/migration.rs b/crates/buzz-db/src/migration.rs
index 1674b0ec4d..1d1b7e05d4 100644
--- a/crates/buzz-db/src/migration.rs
+++ b/crates/buzz-db/src/migration.rs
@@ -560,7 +560,7 @@ mod tests {
         let mut migrations: Vec<_> = MIGRATOR.iter().collect();
         migrations.sort_by_key(|migration| migration.version);
 
-        assert_eq!(migrations.len(), 24);
+        assert_eq!(migrations.len(), 25);
         assert_eq!(migrations[0].version, 1);
         assert_eq!(&*migrations[0].description, "initial schema");
         assert!(migrations[0]
@@ -879,6 +879,31 @@ mod tests {
             .to_lowercase()
             .contains("for update"));
         assert!(ttl_shared.contains("NEW.kind <> 9007"));
+
+        // Use-limited invite links: durable relay_invites table stores only
+        // the SHA-256 of an opaque v2 code, scoped by community_id. Never
+        // listed in _operator_global_tables — it is community-scoped.
+        assert_eq!(migrations[24].version, 25);
+        let relay_invites = migrations[24].sql.as_str();
+        assert!(relay_invites.contains("CREATE TABLE relay_invites"));
+        assert!(relay_invites
+            .contains("token_hash   BYTEA       NOT NULL CHECK (length(token_hash) = 32)"));
+        assert!(relay_invites.contains("PRIMARY KEY (community_id, id)"));
+        assert!(relay_invites.contains("UNIQUE (community_id, token_hash)"));
+        assert!(
+            relay_invites.contains("max_uses     INTEGER     CHECK (max_uses BETWEEN 1 AND 10000)")
+        );
+        assert!(relay_invites.contains("CHECK (max_uses IS NULL OR use_count <= max_uses)"));
+        assert!(relay_invites.contains("role = 'member'"));
+        assert!(relay_invites
+            .contains("CREATE INDEX relay_invites_expires_at_idx ON relay_invites (expires_at)"));
+        assert!(!relay_invites.contains("_operator_global_tables"));
+
+        let desired_schema = include_str!("../../../schema/schema.sql");
+        assert!(
+            desired_schema.contains("CREATE TABLE join_policy_acceptances"),
+            "desired-state schema must include join-policy evidence used by invite claims",
+        );
     }
 
     #[test]
@@ -1121,7 +1146,7 @@ mod tests {
         run_migrations(&pool)
             .await
             .expect("retry succeeds after operator repair");
-        assert_eq!(applied_versions(&pool).await.last().copied(), Some(24));
+        assert_eq!(applied_versions(&pool).await.last().copied(), Some(25));
     }
 
     #[tokio::test]
diff --git a/crates/buzz-db/src/relay_invite.rs b/crates/buzz-db/src/relay_invite.rs
new file mode 100644
index 0000000000..82b71b07bb
--- /dev/null
+++ b/crates/buzz-db/src/relay_invite.rs
@@ -0,0 +1,671 @@
+//! Use-limited relay invite persistence (v2 opaque tokens).
+//!
+//! Unlike the stateless v1 HMAC invite tokens in `buzz-relay::invite_token`,
+//! v2 invites are backed by durable rows in `relay_invites`. The table stores
+//! only `SHA-256(code)` — never the reusable bearer secret — so a leaked
+//! database does not immediately yield valid invite codes.
+//!
+//! Every lookup binds both `(community_id, token_hash)` to prevent cross-tenant
+//! authorization seams: a code minted on tenant A presented to tenant B returns
+//! `Invalid`, not a membership.
+//!
+//! ## Atomic redemption
+//!
+//! `claim_relay_invite` executes the full redemption in one PostgreSQL
+//! transaction: `SELECT FOR UPDATE` on the invite row, membership insert,
+//! join-policy evidence insert, and `use_count` increment all commit together.
+//! `FOR UPDATE` serializes concurrent claims for one invite across relay
+//! processes — exactly one claimant can win the final slot.
+
+use buzz_core::invite::{
+    encode_v2_code, hash_v2_code, MAX_INVITE_TTL_SECS, MAX_INVITE_USES, MIN_INVITE_TTL_SECS,
+    V2_SECRET_LEN,
+};
+use chrono::{DateTime, Utc};
+use sqlx::{PgPool, Row as _};
+
+use crate::error::Result;
+use crate::CommunityId;
+
+/// Outcome of a v2 invite claim. Expected invalid/expired/exhausted states are
+/// typed variants so the relay layer can map them to distinct HTTP responses
+/// without inspecting database errors.
+#[derive(Debug, PartialEq)]
+pub enum ClaimOutcome {
+    /// A new relay member was inserted. `use_count` is the post-increment count;
+    /// `uses_remaining` is `None` for unlimited invites.
+    Joined {
+        /// Post-claim use count.
+        use_count: i32,
+        /// Remaining slots, or `None` when the invite is unlimited.
+        uses_remaining: Option<i32>,
+    },
+    /// The claimer was already a member. `use_count` was NOT incremented.
+    AlreadyMember {
+        /// Current use count (unchanged by this claim).
+        use_count: i32,
+        /// Remaining slots, or `None` when the invite is unlimited.
+        uses_remaining: Option<i32>,
+    },
+    /// The invite's `expires_at` has passed.
+    Expired,
+    /// The invite's use budget is fully consumed.
+    Exhausted,
+    /// No invite row matches `(community_id, token_hash)`.
+    Invalid,
+}
+
+/// A freshly minted v2 invite, including the plaintext code and metadata.
+#[derive(Debug)]
+pub struct MintedInvite {
+    /// The full v2 code string (`v2.<base64url secret>`). Returned to the caller
+    /// exactly once; the database stores only the SHA-256 hash.
+    pub code: String,
+    /// When the invite expires (UTC).
+    pub expires_at: DateTime<Utc>,
+    /// `None` means unlimited; `Some(n)` means at most `n` uses.
+    pub max_uses: Option<i32>,
+    /// Remaining uses at mint time (equals `max_uses` when bounded, `None`
+    /// when unlimited).
+    pub uses_remaining: Option<i32>,
+    /// The invite's database-generated UUID.
+    pub invite_id: uuid::Uuid,
+}
+
+fn validate_mint_inputs(ttl_secs: u64, max_uses: Option<i32>) -> Result<()> {
+    if !(MIN_INVITE_TTL_SECS..=MAX_INVITE_TTL_SECS).contains(&ttl_secs) {
+        return Err(crate::error::DbError::InvalidData(format!(
+            "ttl_secs must be between {MIN_INVITE_TTL_SECS} and {MAX_INVITE_TTL_SECS}"
+        )));
+    }
+
+    if let Some(max_uses) = max_uses {
+        if !(1..=MAX_INVITE_USES).contains(&max_uses) {
+            return Err(crate::error::DbError::InvalidData(format!(
+                "max_uses must be between 1 and {MAX_INVITE_USES}"
+            )));
+        }
+    }
+
+    Ok(())
+}
+
+/// Mint a v2 invite: generate a 32-byte random secret, hash it, persist the
+/// row, and return the plaintext code plus metadata.
+///
+/// `ttl_secs` must be in the shared invite lifetime range.
+/// `max_uses` must be `None` (unlimited) or `Some(1..=10000)`.
+pub async fn mint_relay_invite(
+    pool: &PgPool,
+    community: CommunityId,
+    created_by: &str,
+    ttl_secs: u64,
+    max_uses: Option<i32>,
+) -> Result<MintedInvite> {
+    validate_mint_inputs(ttl_secs, max_uses)?;
+
+    // Generate 32 random bytes and encode as base64url — this is the secret.
+    let secret: [u8; V2_SECRET_LEN] = rand::random();
+    let code = encode_v2_code(&secret);
+    let token_hash = hash_v2_code(&code);
+    let now = Utc::now();
+    let expires_at = now + chrono::Duration::seconds(ttl_secs as i64);
+
+    let row = sqlx::query(
+        "INSERT INTO relay_invites (community_id, token_hash, max_uses, expires_at, created_by) \
+         VALUES ($1, $2, $3, $4, $5) \
+         RETURNING id",
+    )
+    .bind(community.as_uuid())
+    .bind(token_hash.as_slice())
+    .bind(max_uses)
+    .bind(expires_at)
+    .bind(created_by)
+    .fetch_one(pool)
+    .await?;
+
+    let invite_id: uuid::Uuid = row.try_get("id")?;
+
+    Ok(MintedInvite {
+        code,
+        expires_at,
+        max_uses,
+        uses_remaining: max_uses,
+        invite_id,
+    })
+}
+
+fn log_claim_outcome(
+    community: CommunityId,
+    invite_id: Option<uuid::Uuid>,
+    outcome: &'static str,
+    max_uses: Option<i32>,
+    use_count: Option<i32>,
+) {
+    tracing::info!(
+        community = %community,
+        invite_id = ?invite_id,
+        outcome,
+        max_uses = ?max_uses,
+        use_count = ?use_count,
+        "relay invite claim completed"
+    );
+}
+
+/// Maximum rows deleted by one retention sweep so cleanup cannot monopolize
+/// the invite table on a busy deployment.
+const RETENTION_SWEEP_BATCH_SIZE: i64 = 1_000;
+
+/// Delete one bounded batch of invite rows expired before `cutoff`.
+///
+/// The relay calls this from its leader-only periodic tick. Ordering by the
+/// expiry index makes old rows drain first without turning cleanup into an
+/// unbounded transaction.
+pub async fn reap_expired_relay_invites(pool: &PgPool, cutoff: DateTime<Utc>) -> Result<u64> {
+    let result = sqlx::query(
+        "DELETE FROM relay_invites \
+         WHERE (community_id, id) IN (\
+             SELECT community_id, id FROM relay_invites \
+             WHERE expires_at < $1 \
+             ORDER BY expires_at \
+             LIMIT $2\
+         )",
+    )
+    .bind(cutoff)
+    .bind(RETENTION_SWEEP_BATCH_SIZE)
+    .execute(pool)
+    .await?;
+
+    Ok(result.rows_affected())
+}
+
+/// Atomically claim a v2 relay invite.
+///
+/// Executes the full redemption in one PostgreSQL transaction:
+/// 1. Hash the presented code.
+/// 2. `SELECT ... FOR UPDATE` on the invite row scoped by `(community, token_hash)`.
+/// 3. If no row → `Invalid`.
+/// 4. If `expires_at <= now()` → `Expired`.
+/// 5. Check existing membership.
+/// 6. If already a member → insert policy evidence (if configured), commit,
+///    return `AlreadyMember` (no increment).
+/// 7. If `max_uses` is set and `use_count >= max_uses` → `Exhausted`.
+/// 8. Insert relay member with role `member`, `added_by = 'invite'`.
+/// 9. Insert join-policy acceptance evidence (if configured).
+/// 10. Increment `use_count`.
+/// 11. Commit.
+///
+/// `FOR UPDATE` serializes concurrent claims so exactly one claimant wins the
+/// final slot. Membership insertion, policy evidence, and consumption share
+/// one commit — a failure in any rolls back all.
+pub async fn claim_relay_invite(
+    pool: &PgPool,
+    community: CommunityId,
+    token_hash: &[u8; 32],
+    claimer_pubkey: &str,
+    policy_version: Option<&str>,
+) -> Result<ClaimOutcome> {
+    let mut tx = pool.begin().await?;
+
+    // 2. SELECT FOR UPDATE — lock the invite row for the duration of this txn.
+    let row = sqlx::query(
+        "SELECT id, max_uses, use_count, expires_at \
+         FROM relay_invites \
+         WHERE community_id = $1 AND token_hash = $2 \
+         FOR UPDATE",
+    )
+    .bind(community.as_uuid())
+    .bind(token_hash)
+    .fetch_optional(&mut *tx)
+    .await?;
+
+    // 3. No matching invite.
+    let Some(invite) = row else {
+        tx.rollback().await?;
+        log_claim_outcome(community, None, "invalid", None, None);
+        return Ok(ClaimOutcome::Invalid);
+    };
+
+    let invite_id: uuid::Uuid = invite.try_get("id")?;
+    let max_uses: Option<i32> = invite.try_get("max_uses")?;
+    let use_count: i32 = invite.try_get("use_count")?;
+    let expires_at: DateTime<Utc> = invite.try_get("expires_at")?;
+
+    // Expiry is checked before membership deliberately. An expired bearer must
+    // not authorize fresh policy-acceptance evidence, even for an existing
+    // member; exhausted-but-live invites remain valid for idempotent retries.
+    if expires_at <= Utc::now() {
+        tx.rollback().await?;
+        log_claim_outcome(
+            community,
+            Some(invite_id),
+            "expired",
+            max_uses,
+            Some(use_count),
+        );
+        return Ok(ClaimOutcome::Expired);
+    }
+
+    let uses_remaining = || max_uses.map(|mu| mu - use_count);
+
+    // 5. Check existing membership.
+    let existing =
+        sqlx::query("SELECT 1 FROM relay_members WHERE community_id = $1 AND pubkey = $2")
+            .bind(community.as_uuid())
+            .bind(claimer_pubkey)
+            .fetch_optional(&mut *tx)
+            .await?;
+
+    if existing.is_some() {
+        // 6. Already a member — insert policy evidence but do NOT increment.
+        if let Some(version) = policy_version {
+            sqlx::query(
+                "INSERT INTO join_policy_acceptances (community_id, pubkey, policy_version) \
+                 VALUES ($1, $2, $3) ON CONFLICT DO NOTHING",
+            )
+            .bind(community.as_uuid())
+            .bind(claimer_pubkey)
+            .bind(version)
+            .execute(&mut *tx)
+            .await?;
+        }
+        tx.commit().await?;
+        log_claim_outcome(
+            community,
+            Some(invite_id),
+            "already_member",
+            max_uses,
+            Some(use_count),
+        );
+        return Ok(ClaimOutcome::AlreadyMember {
+            use_count,
+            uses_remaining: uses_remaining(),
+        });
+    }
+
+    // 7. Capacity check.
+    if let Some(mu) = max_uses {
+        if use_count >= mu {
+            tx.rollback().await?;
+            log_claim_outcome(
+                community,
+                Some(invite_id),
+                "exhausted",
+                max_uses,
+                Some(use_count),
+            );
+            return Ok(ClaimOutcome::Exhausted);
+        }
+    }
+
+    // 8. Insert relay member. The conflict branch covers a claimant admitted
+    // concurrently through a different invite: only the transaction that
+    // actually inserted membership may consume this invite.
+    let inserted = sqlx::query(
+        "INSERT INTO relay_members (community_id, pubkey, role, added_by) \
+         VALUES ($1, $2, 'member', 'invite') \
+         ON CONFLICT (community_id, pubkey) DO NOTHING",
+    )
+    .bind(community.as_uuid())
+    .bind(claimer_pubkey)
+    .execute(&mut *tx)
+    .await?
+    .rows_affected()
+        > 0;
+
+    // 9. Insert join-policy acceptance evidence. This is required for both a
+    // new member and a claimant whose concurrent membership insert won first.
+    if let Some(version) = policy_version {
+        sqlx::query(
+            "INSERT INTO join_policy_acceptances (community_id, pubkey, policy_version) \
+             VALUES ($1, $2, $3) ON CONFLICT DO NOTHING",
+        )
+        .bind(community.as_uuid())
+        .bind(claimer_pubkey)
+        .bind(version)
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    if !inserted {
+        tx.commit().await?;
+        log_claim_outcome(
+            community,
+            Some(invite_id),
+            "already_member",
+            max_uses,
+            Some(use_count),
+        );
+        return Ok(ClaimOutcome::AlreadyMember {
+            use_count,
+            uses_remaining: uses_remaining(),
+        });
+    }
+
+    // 10. Increment use_count (for every new member, even unlimited).
+    let new_use_count = use_count + 1;
+    sqlx::query("UPDATE relay_invites SET use_count = $1 WHERE community_id = $2 AND id = $3")
+        .bind(new_use_count)
+        .bind(community.as_uuid())
+        .bind(invite_id)
+        .execute(&mut *tx)
+        .await?;
+
+    // 11. Commit.
+    tx.commit().await?;
+
+    let new_uses_remaining = max_uses.map(|mu| mu - new_use_count);
+
+    log_claim_outcome(
+        community,
+        Some(invite_id),
+        "joined",
+        max_uses,
+        Some(new_use_count),
+    );
+
+    Ok(ClaimOutcome::Joined {
+        use_count: new_use_count,
+        uses_remaining: new_uses_remaining,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::relay_members::is_relay_member;
+    use sqlx::PgPool;
+    use uuid::Uuid;
+
+    const TEST_DB_URL: &str = "postgres://buzz:buzz_dev@localhost:5432/buzz"; // sadscan:disable np.postgres.1
+
+    async fn setup_pool() -> PgPool {
+        let database_url = std::env::var("BUZZ_TEST_DATABASE_URL")
+            .or_else(|_| std::env::var("DATABASE_URL"))
+            .unwrap_or_else(|_| TEST_DB_URL.to_owned());
+        PgPool::connect(&database_url)
+            .await
+            .expect("connect to test DB")
+    }
+
+    async fn make_test_community(pool: &PgPool) -> CommunityId {
+        let id = Uuid::new_v4();
+        sqlx::query("INSERT INTO communities (id, host) VALUES ($1, $2)")
+            .bind(id)
+            .bind(format!("relay-invite-test-{}.example", id.simple()))
+            .execute(pool)
+            .await
+            .expect("insert test community");
+        CommunityId::from_uuid(id)
+    }
+
+    async fn delete_test_community(pool: &PgPool, community: CommunityId) {
+        let mut tx = pool.begin().await.expect("begin test cleanup");
+        sqlx::query("DELETE FROM relay_invites WHERE community_id = $1")
+            .bind(community.as_uuid())
+            .execute(&mut *tx)
+            .await
+            .expect("delete test invites");
+        sqlx::query("DELETE FROM relay_members WHERE community_id = $1")
+            .bind(community.as_uuid())
+            .execute(&mut *tx)
+            .await
+            .expect("delete test members");
+        sqlx::query("DELETE FROM communities WHERE id = $1")
+            .bind(community.as_uuid())
+            .execute(&mut *tx)
+            .await
+            .expect("delete test community");
+        tx.commit().await.expect("commit test cleanup");
+    }
+
+    fn test_pubkey() -> String {
+        format!("{:064x}", Uuid::new_v4().as_u128())
+    }
+
+    async fn use_count(pool: &PgPool, community: CommunityId, invite_id: Uuid) -> i32 {
+        sqlx::query_scalar(
+            "SELECT use_count FROM relay_invites WHERE community_id = $1 AND id = $2",
+        )
+        .bind(community.as_uuid())
+        .bind(invite_id)
+        .fetch_one(pool)
+        .await
+        .expect("read invite use_count")
+    }
+
+    #[test]
+    fn mint_validation_rejects_invalid_bounds_before_database_access() {
+        for (ttl, max_uses) in [
+            (MIN_INVITE_TTL_SECS - 1, None),
+            (MAX_INVITE_TTL_SECS + 1, None),
+            (3600, Some(0)),
+            (3600, Some(-1)),
+            (3600, Some(MAX_INVITE_USES + 1)),
+        ] {
+            let error = validate_mint_inputs(ttl, max_uses).expect_err("invalid mint contract");
+            assert!(matches!(error, crate::DbError::InvalidData(_)), "{error:?}");
+        }
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn bounded_claim_exhausts_and_existing_member_retry_does_not_consume() {
+        let pool = setup_pool().await;
+        let community = make_test_community(&pool).await;
+        let first = test_pubkey();
+        let second = test_pubkey();
+        let invite = mint_relay_invite(&pool, community, "owner", 3600, Some(1))
+            .await
+            .expect("mint bounded invite");
+        let hash = hash_v2_code(&invite.code);
+
+        assert_eq!(
+            claim_relay_invite(&pool, community, &hash, &first, None)
+                .await
+                .expect("first claim"),
+            ClaimOutcome::Joined {
+                use_count: 1,
+                uses_remaining: Some(0),
+            }
+        );
+        assert_eq!(
+            claim_relay_invite(&pool, community, &hash, &first, None)
+                .await
+                .expect("idempotent retry"),
+            ClaimOutcome::AlreadyMember {
+                use_count: 1,
+                uses_remaining: Some(0),
+            }
+        );
+        assert_eq!(
+            claim_relay_invite(&pool, community, &hash, &second, None)
+                .await
+                .expect("exhausted claim"),
+            ClaimOutcome::Exhausted
+        );
+        assert_eq!(use_count(&pool, community, invite.invite_id).await, 1);
+        assert!(is_relay_member(&pool, community, &first)
+            .await
+            .expect("first membership"));
+        assert!(!is_relay_member(&pool, community, &second)
+            .await
+            .expect("second membership"));
+        delete_test_community(&pool, community).await;
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn concurrent_claims_serialize_the_final_slot() {
+        let pool = setup_pool().await;
+        let community = make_test_community(&pool).await;
+        let first = test_pubkey();
+        let second = test_pubkey();
+        let invite = mint_relay_invite(&pool, community, "owner", 3600, Some(1))
+            .await
+            .expect("mint bounded invite");
+        let hash = hash_v2_code(&invite.code);
+
+        let (first_outcome, second_outcome) = tokio::join!(
+            claim_relay_invite(&pool, community, &hash, &first, None),
+            claim_relay_invite(&pool, community, &hash, &second, None),
+        );
+        let outcomes = [
+            first_outcome.expect("first concurrent claim"),
+            second_outcome.expect("second concurrent claim"),
+        ];
+        assert_eq!(
+            outcomes
+                .iter()
+                .filter(|outcome| matches!(outcome, ClaimOutcome::Joined { .. }))
+                .count(),
+            1
+        );
+        assert_eq!(
+            outcomes
+                .iter()
+                .filter(|outcome| matches!(outcome, ClaimOutcome::Exhausted))
+                .count(),
+            1
+        );
+        assert_eq!(use_count(&pool, community, invite.invite_id).await, 1);
+        let admitted = is_relay_member(&pool, community, &first)
+            .await
+            .expect("first membership") as u8
+            + is_relay_member(&pool, community, &second)
+                .await
+                .expect("second membership") as u8;
+        assert_eq!(admitted, 1);
+        delete_test_community(&pool, community).await;
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn expiry_and_tenant_scope_return_typed_failures() {
+        let pool = setup_pool().await;
+        let community_a = make_test_community(&pool).await;
+        let community_b = make_test_community(&pool).await;
+        let invite = mint_relay_invite(&pool, community_a, "owner", 3600, Some(2))
+            .await
+            .expect("mint invite");
+        let hash = hash_v2_code(&invite.code);
+
+        assert_eq!(
+            claim_relay_invite(&pool, community_b, &hash, &test_pubkey(), None)
+                .await
+                .expect("cross-tenant claim"),
+            ClaimOutcome::Invalid
+        );
+
+        sqlx::query(
+            "UPDATE relay_invites SET expires_at = now() - interval '1 second' \
+             WHERE community_id = $1 AND id = $2",
+        )
+        .bind(community_a.as_uuid())
+        .bind(invite.invite_id)
+        .execute(&pool)
+        .await
+        .expect("expire invite");
+        assert_eq!(
+            claim_relay_invite(&pool, community_a, &hash, &test_pubkey(), None)
+                .await
+                .expect("expired claim"),
+            ClaimOutcome::Expired
+        );
+        assert_eq!(use_count(&pool, community_a, invite.invite_id).await, 0);
+        delete_test_community(&pool, community_a).await;
+        delete_test_community(&pool, community_b).await;
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn retention_sweep_deletes_only_invites_older_than_cutoff() {
+        let pool = setup_pool().await;
+        let community = make_test_community(&pool).await;
+        let old = mint_relay_invite(&pool, community, "owner", 3600, Some(1))
+            .await
+            .expect("mint old invite");
+        let recent = mint_relay_invite(&pool, community, "owner", 3600, Some(1))
+            .await
+            .expect("mint recent invite");
+        let cutoff = Utc::now() - chrono::Duration::days(30);
+
+        sqlx::query("UPDATE relay_invites SET expires_at = $1 WHERE community_id = $2 AND id = $3")
+            .bind(cutoff - chrono::Duration::seconds(1))
+            .bind(community.as_uuid())
+            .bind(old.invite_id)
+            .execute(&pool)
+            .await
+            .expect("age old invite");
+
+        assert_eq!(
+            reap_expired_relay_invites(&pool, cutoff)
+                .await
+                .expect("reap expired invites"),
+            1
+        );
+        let remaining: Vec<Uuid> =
+            sqlx::query_scalar("SELECT id FROM relay_invites WHERE community_id = $1 ORDER BY id")
+                .bind(community.as_uuid())
+                .fetch_all(&pool)
+                .await
+                .expect("read remaining invites");
+        assert_eq!(remaining, vec![recent.invite_id]);
+
+        delete_test_community(&pool, community).await;
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn unlimited_invites_count_each_new_member() {
+        let pool = setup_pool().await;
+        let community = make_test_community(&pool).await;
+        let invite = mint_relay_invite(&pool, community, "owner", 3600, None)
+            .await
+            .expect("mint unlimited invite");
+        let hash = hash_v2_code(&invite.code);
+
+        for (expected_count, pubkey) in [(1, test_pubkey()), (2, test_pubkey())] {
+            assert_eq!(
+                claim_relay_invite(&pool, community, &hash, &pubkey, None)
+                    .await
+                    .expect("unlimited claim"),
+                ClaimOutcome::Joined {
+                    use_count: expected_count,
+                    uses_remaining: None,
+                }
+            );
+        }
+        assert_eq!(use_count(&pool, community, invite.invite_id).await, 2);
+        delete_test_community(&pool, community).await;
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn policy_evidence_failure_rolls_back_membership_and_consumption() {
+        let pool = setup_pool().await;
+        let community = make_test_community(&pool).await;
+        let pubkey = test_pubkey();
+        let invite = mint_relay_invite(&pool, community, "owner", 3600, Some(1))
+            .await
+            .expect("mint bounded invite");
+        let hash = hash_v2_code(&invite.code);
+
+        let error = claim_relay_invite(&pool, community, &hash, &pubkey, Some("too-short"))
+            .await
+            .expect_err("policy CHECK must reject an invalid version");
+        assert!(matches!(error, crate::DbError::Sqlx(_)), "{error:?}");
+        assert!(!is_relay_member(&pool, community, &pubkey)
+            .await
+            .expect("membership after rollback"));
+        assert_eq!(use_count(&pool, community, invite.invite_id).await, 0);
+
+        assert!(matches!(
+            claim_relay_invite(&pool, community, &hash, &pubkey, None)
+                .await
+                .expect("claim after rollback"),
+            ClaimOutcome::Joined { use_count: 1, .. }
+        ));
+        delete_test_community(&pool, community).await;
+    }
+}
diff --git a/crates/buzz-db/src/workflow.rs b/crates/buzz-db/src/workflow.rs
index 9c02f162c9..7a2396c1fd 100644
--- a/crates/buzz-db/src/workflow.rs
+++ b/crates/buzz-db/src/workflow.rs
@@ -707,6 +707,36 @@ pub async fn set_workflow_enabled(
     Ok(())
 }
 
+/// Disable all of `owner_pubkey`'s workflows in a channel (SEC-006).
+///
+/// Called when the owner loses channel membership (kind 9001 removal or kind
+/// 9022 leave) so their workflows stop firing durably — across pods and
+/// restarts — rather than only until the per-fire authority gate happens to
+/// run. Idempotent; returns the number of workflows disabled so the caller
+/// can decide whether a trigger-cache invalidation is needed.
+pub async fn disable_workflows_for_owner_in_channel(
+    pool: &PgPool,
+    community_id: CommunityId,
+    channel_id: Uuid,
+    owner_pubkey: &[u8],
+) -> Result<u64> {
+    let affected = sqlx::query(
+        r#"
+        UPDATE workflows
+        SET enabled = FALSE
+        WHERE community_id = $1 AND channel_id = $2 AND owner_pubkey = $3 AND enabled = TRUE
+        "#,
+    )
+    .bind(community_id.as_uuid())
+    .bind(channel_id)
+    .bind(owner_pubkey)
+    .execute(pool)
+    .await?
+    .rows_affected();
+
+    Ok(affected)
+}
+
 /// Delete a workflow and all its runs/approvals (CASCADE).
 ///
 /// NOTE: see the cache-invalidation note on [`update_workflow`]. The relay's
@@ -2272,4 +2302,100 @@ mod tests {
             "B's approval must remain pending after A is granted"
         );
     }
+
+    // -- SEC-006: disable-on-membership-loss primitive -------------------------
+
+    /// `disable_workflows_for_owner_in_channel` must disable exactly the
+    /// departing owner's enabled workflows in that channel — not other owners'
+    /// workflows, not the same owner's workflows in other channels — and be
+    /// idempotent. Disabled workflows must drop out of the trigger-path list.
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn disable_for_owner_scopes_to_owner_and_channel() {
+        let pool = setup_pool().await;
+        let community = make_community(&pool).await;
+
+        let departing = vec![0xd1; 32];
+        let staying = vec![0xd2; 32];
+        ensure_user(&pool, community, &departing)
+            .await
+            .expect("ensure departing");
+        ensure_user(&pool, community, &staying)
+            .await
+            .expect("ensure staying");
+
+        let channel_a = make_channel(&pool, community, &departing).await;
+        let channel_b = make_channel(&pool, community, &departing).await;
+
+        let def = r#"{"trigger":{"on":"message_posted"},"steps":[]}"#;
+        let wf_departing_a = create_workflow(
+            &pool,
+            community,
+            Some(channel_a),
+            &departing,
+            "departing-a",
+            def,
+            &[0u8; 32],
+        )
+        .await
+        .expect("wf departing a");
+        let wf_departing_b = create_workflow(
+            &pool,
+            community,
+            Some(channel_b),
+            &departing,
+            "departing-b",
+            def,
+            &[0u8; 32],
+        )
+        .await
+        .expect("wf departing b");
+        let wf_staying_a = create_workflow(
+            &pool,
+            community,
+            Some(channel_a),
+            &staying,
+            "staying-a",
+            def,
+            &[0u8; 32],
+        )
+        .await
+        .expect("wf staying a");
+
+        let disabled =
+            disable_workflows_for_owner_in_channel(&pool, community, channel_a, &departing)
+                .await
+                .expect("disable");
+        assert_eq!(
+            disabled, 1,
+            "exactly the departing owner's channel-A workflow"
+        );
+
+        // Idempotent: second call finds nothing enabled.
+        let again = disable_workflows_for_owner_in_channel(&pool, community, channel_a, &departing)
+            .await
+            .expect("disable again");
+        assert_eq!(again, 0, "second disable must be a no-op");
+
+        let enabled_a = list_enabled_channel_workflows(&pool, community, channel_a)
+            .await
+            .expect("list channel a");
+        let enabled_a_ids: Vec<Uuid> = enabled_a.iter().map(|w| w.id).collect();
+        assert!(
+            !enabled_a_ids.contains(&wf_departing_a),
+            "departing owner's workflow must no longer be trigger-eligible"
+        );
+        assert!(
+            enabled_a_ids.contains(&wf_staying_a),
+            "other owners' workflows in the channel must be untouched"
+        );
+
+        let enabled_b = list_enabled_channel_workflows(&pool, community, channel_b)
+            .await
+            .expect("list channel b");
+        assert!(
+            enabled_b.iter().any(|w| w.id == wf_departing_b),
+            "same owner's workflow in a different channel must be untouched"
+        );
+    }
 }
diff --git a/crates/buzz-dev-mcp/src/shim.rs b/crates/buzz-dev-mcp/src/shim.rs
index 36a07a18ca..cccf0e6eca 100644
--- a/crates/buzz-dev-mcp/src/shim.rs
+++ b/crates/buzz-dev-mcp/src/shim.rs
@@ -171,15 +171,126 @@ fn derive_git_email(pubkey_hex: &str) -> String {
     format!("{pubkey_hex}@{host}")
 }
 
+/// Stable identity contract for git attribution: the bare agent display name,
+/// never channel-qualified, safe to embed in commit history.
+///
+/// Deliberately distinct from `BUZZ_ACP_SESSION_TITLE`, which is per-session UI
+/// chrome and may be composed (`Agent · #channel`) by consumers. Commits
+/// outlive sessions, so git attribution must not follow a mutable title.
+///
+/// Nothing writes this yet — when unset, [`build_git_env`] falls back to the
+/// npub, which is byte-for-byte today's behavior.
+const DISPLAY_NAME_ENV_VAR: &str = "BUZZ_ACP_DISPLAY_NAME";
+
+/// Max characters in a git author name. Nostr display names are unbounded.
+const MAX_GIT_USER_NAME_CHARS: usize = 80;
+
+/// Characters git's `ident.c` treats as "crud": stripped from both ends of a
+/// name, and — when a name is *nothing but* these — rejected outright with
+/// `fatal: name consists only of disallowed characters`.
+///
+/// Verified empirically against git 2.54.0 by committing with each ASCII byte
+/// 32..=126 as the entire `user.name`: exactly space, `"`, `'`, `,`, `:`, `;`,
+/// `<`, `>`, and `\` abort. Control characters abort too (the predicate is
+/// `c <= 32`). Note `.` is *not* crud in this version despite older lore.
+fn is_git_crud(c: char) -> bool {
+    c <= ' ' || matches!(c, '"' | '\'' | ',' | ':' | ';' | '<' | '>' | '\\')
+}
+
+/// Characters in Unicode general category `Cf` (format): zero-width space and
+/// joiners, bidi embedding/override marks, invisible math operators, interlinear
+/// annotations, and tag characters.
+///
+/// `char::is_control` covers only `Cc`, so every one of these survives it — and
+/// none is whitespace or [`is_git_crud`]. A display name of nothing but U+200B
+/// ZERO WIDTH SPACE would therefore satisfy the "at least one non-crud
+/// character" gate and hand git a visually blank author instead of falling back
+/// to the npub. An embedded U+202E RIGHT-TO-LEFT OVERRIDE is worse: it makes a
+/// commit's persisted author line render as something other than what it says,
+/// the same confusion the angle-bracket filter exists to prevent.
+///
+/// The whole category is rejected rather than the two known-bad marks, because
+/// the boundary that matters is "invisible or reorders text", not "the codepoint
+/// someone thought of". Ranges transcribed from the UCD's
+/// `DerivedGeneralCategory.txt` (17.0.0) and independently cross-checked against
+/// Python's `unicodedata` (16.0.0); both yield exactly these 21 ranges. Inlined
+/// rather than taking a Unicode-tables dependency for one predicate.
+fn is_unicode_format(c: char) -> bool {
+    matches!(c,
+        '\u{00AD}'
+        | '\u{0600}'..='\u{0605}'
+        | '\u{061C}'
+        | '\u{06DD}'
+        | '\u{070F}'
+        | '\u{0890}'..='\u{0891}'
+        | '\u{08E2}'
+        | '\u{180E}'
+        | '\u{200B}'..='\u{200F}'
+        | '\u{202A}'..='\u{202E}'
+        | '\u{2060}'..='\u{2064}'
+        | '\u{2066}'..='\u{206F}'
+        | '\u{FEFF}'
+        | '\u{FFF9}'..='\u{FFFB}'
+        | '\u{110BD}'
+        | '\u{110CD}'
+        | '\u{13430}'..='\u{1343F}'
+        | '\u{1BCA0}'..='\u{1BCA3}'
+        | '\u{1D173}'..='\u{1D17A}'
+        | '\u{E0001}'
+        | '\u{E0020}'..='\u{E007F}'
+    )
+}
+
+/// Normalize a Buzz display name into a git author name, or `None` to fall
+/// back to the npub.
+///
+/// Strips control and Unicode format characters plus angle brackets, collapses
+/// whitespace runs, trims, and caps at [`MAX_GIT_USER_NAME_CHARS`] by `chars()`
+/// so a multi-byte name cannot be split mid-UTF-8. Angle brackets go because git
+/// silently drops them rather than erroring — `Duncan <evil@x.com>` would
+/// render as `Duncan evil@x.com <hex@relay>`, which forges nothing but reads as
+/// though it might.
+///
+/// Returns `None` unless at least one non-crud character survives. A bare
+/// emptiness check is not sufficient: git rejects a name built only of crud,
+/// so a display name of `;;` or `""` would abort **every commit** the agent
+/// makes. Falling back to the npub keeps the agent able to commit.
+fn sanitize_git_user_name(raw: &str) -> Option<String> {
+    let collapsed = raw
+        .split_whitespace()
+        .map(|word| {
+            word.chars()
+                .filter(|c| !c.is_control() && !is_unicode_format(*c) && *c != '<' && *c != '>')
+                .collect::<String>()
+        })
+        .filter(|word| !word.is_empty())
+        .collect::<Vec<_>>()
+        .join(" ");
+    let name: String = collapsed
+        .chars()
+        .take(MAX_GIT_USER_NAME_CHARS)
+        .collect::<String>()
+        .trim_end()
+        .to_string();
+    name.chars().any(|c| !is_git_crud(c)).then_some(name)
+}
+
 /// Build GIT_CONFIG_COUNT/KEY/VALUE env vars for ephemeral nostr git config.
 /// Composes with any existing GIT_CONFIG_COUNT in the environment. When launched
 /// via buzz-agent (which clears env), the base is always 0 — composition only
 /// matters when dev-mcp is run directly with pre-existing GIT_CONFIG vars.
 fn build_git_env(info: &KeyInfo) -> Vec<(String, String)> {
     let email = derive_git_email(&info.pubkey_hex);
+    // Display name for humans reading `git log`; the pubkey stays in the email,
+    // which is what NIP-98 auth, NIP-GS signing, and contributor matching key on.
+    let user_name = std::env::var(DISPLAY_NAME_ENV_VAR)
+        .ok()
+        .as_deref()
+        .and_then(sanitize_git_user_name)
+        .unwrap_or_else(|| info.npub.clone());
     let entries: Vec<(&str, String)> = vec![
-        // Identity — npub as display name, NIP-05-style email
-        ("user.name", info.npub.clone()),
+        // Identity — Buzz display name (npub fallback), NIP-05-style email
+        ("user.name", user_name),
         ("user.email", email),
         // Nostr credential helper is additive — it silently declines non-Buzz
         // remotes (exits 0, no credential), so git falls through to system
@@ -246,3 +357,339 @@ pub fn artifact_dir(session_root: &Path) -> PathBuf {
     let _ = std::fs::create_dir_all(&p);
     p
 }
+
+#[cfg(test)]
+mod git_user_name_tests {
+    use super::{
+        build_git_env, is_git_crud, is_unicode_format, sanitize_git_user_name, KeyInfo,
+        MAX_GIT_USER_NAME_CHARS,
+    };
+    use std::sync::Mutex;
+
+    /// Env-var-touching tests must run serially — env vars are process-global.
+    static ENV_LOCK: Mutex<()> = Mutex::new(());
+
+    const PUBKEY_HEX: &str = "dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95";
+    const NPUB: &str = "npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7";
+
+    fn key_info() -> KeyInfo {
+        KeyInfo {
+            keyfile_path: "/tmp/.nostr-key".into(),
+            pubkey_hex: PUBKEY_HEX.into(),
+            npub: NPUB.into(),
+        }
+    }
+
+    /// Read a git config value back out of the flat GIT_CONFIG_KEY_n/VALUE_n pairs.
+    fn git_config(env: &[(String, String)], key: &str) -> Option<String> {
+        let idx = env
+            .iter()
+            .find(|(k, v)| k.starts_with("GIT_CONFIG_KEY_") && v == key)?
+            .0
+            .strip_prefix("GIT_CONFIG_KEY_")?
+            .to_owned();
+        env.iter()
+            .find(|(k, _)| *k == format!("GIT_CONFIG_VALUE_{idx}"))
+            .map(|(_, v)| v.clone())
+    }
+
+    #[test]
+    fn test_ordinary_name_passes_through_unchanged() {
+        assert_eq!(sanitize_git_user_name("Duncan"), Some("Duncan".into()));
+    }
+
+    #[test]
+    fn test_angle_brackets_are_stripped_so_no_second_email_is_rendered() {
+        // git drops the brackets itself and renders `Duncan evil@x.com
+        // <hex@relay>` — no forgery, but a confusing author line.
+        assert_eq!(
+            sanitize_git_user_name("Duncan <evil@x.com>"),
+            Some("Duncan evil@x.com".into())
+        );
+    }
+
+    #[test]
+    fn test_whitespace_control_characters_become_a_single_separator() {
+        // Newline, tab and carriage return are whitespace: they collapse to one
+        // space like any other run, so a multi-line name stays readable.
+        assert_eq!(
+            sanitize_git_user_name("Dun\ncan\tThe\r\nIdaho"),
+            Some("Dun can The Idaho".into())
+        );
+    }
+
+    #[test]
+    fn test_non_whitespace_control_characters_are_dropped_outright() {
+        // NUL is the important one: an interior NUL makes `Command::env` fail
+        // the entire spawn upstream, so it must never survive to git config.
+        let got = sanitize_git_user_name("Idaho\0Blade\u{7}").expect("non-empty");
+        assert_eq!(got, "IdahoBlade");
+        assert!(!got.chars().any(char::is_control));
+    }
+
+    #[test]
+    fn test_internal_whitespace_runs_collapse_to_one_space() {
+        assert_eq!(
+            sanitize_git_user_name("  Duncan   Idaho  "),
+            Some("Duncan Idaho".into())
+        );
+    }
+
+    #[test]
+    fn test_whitespace_only_name_falls_back_to_npub() {
+        assert_eq!(sanitize_git_user_name("   \t\n  "), None);
+    }
+
+    #[test]
+    fn test_empty_name_falls_back_to_npub() {
+        assert_eq!(sanitize_git_user_name(""), None);
+    }
+
+    #[test]
+    fn test_crud_only_name_falls_back_rather_than_aborting_every_commit() {
+        // git rejects a name built only of crud with `fatal: name consists
+        // only of disallowed characters`, which would break EVERY commit the
+        // agent makes. Verified against git 2.54.0.
+        for raw in ["<>", ";;", "\"\"", "''", ",", ":", "\\", ",;:"] {
+            assert_eq!(
+                sanitize_git_user_name(raw),
+                None,
+                "crud-only name {raw:?} must fall back to the npub"
+            );
+        }
+    }
+
+    #[test]
+    fn test_crud_mixed_with_real_characters_is_kept() {
+        // Legitimate names contain crud; only an all-crud result is fatal.
+        assert_eq!(sanitize_git_user_name("O'Brien"), Some("O'Brien".into()));
+        assert_eq!(
+            sanitize_git_user_name("Smith, Jr."),
+            Some("Smith, Jr.".into())
+        );
+    }
+
+    #[test]
+    fn test_over_length_name_is_truncated_to_the_cap() {
+        let long = "a".repeat(200);
+        let got = sanitize_git_user_name(&long).expect("non-empty");
+        assert_eq!(got.chars().count(), MAX_GIT_USER_NAME_CHARS);
+    }
+
+    #[test]
+    fn test_truncation_never_splits_a_multibyte_character() {
+        let long = "🐝".repeat(200);
+        let got = sanitize_git_user_name(&long).expect("non-empty");
+        assert_eq!(got.chars().count(), MAX_GIT_USER_NAME_CHARS);
+        assert!(got.chars().all(|c| c == '🐝'), "no replacement chars");
+    }
+
+    #[test]
+    fn test_truncation_does_not_leave_a_trailing_space() {
+        // Cutting mid-word would otherwise strand the separator at the end.
+        let raw = format!("{} tail", "a".repeat(MAX_GIT_USER_NAME_CHARS - 1));
+        let got = sanitize_git_user_name(&raw).expect("non-empty");
+        assert!(!got.ends_with(' '), "got {got:?}");
+    }
+
+    #[test]
+    fn test_non_ascii_names_survive() {
+        assert_eq!(
+            sanitize_git_user_name("Élodie 🐝"),
+            Some("Élodie 🐝".into())
+        );
+    }
+
+    #[test]
+    fn test_format_only_name_falls_back_to_npub() {
+        // U+200B is neither control, nor whitespace, nor crud, so before Cf
+        // filtering this passed the non-crud gate and handed git a visually
+        // blank author instead of falling back.
+        assert_eq!(sanitize_git_user_name("\u{200B}\u{200B}"), None);
+        // Same class, different marks: joiner, word joiner, BOM, bidi override.
+        for raw in ["\u{200D}", "\u{2060}", "\u{FEFF}", "\u{202E}", "\u{00AD}"] {
+            assert_eq!(
+                sanitize_git_user_name(raw),
+                None,
+                "format-only name {raw:?} must fall back to the npub"
+            );
+        }
+    }
+
+    #[test]
+    fn test_bidi_override_is_stripped_and_the_name_is_kept() {
+        // A trailing RLO would reorder everything after it in `git log`, so the
+        // mark goes and the readable name stays.
+        assert_eq!(
+            sanitize_git_user_name("Duncan\u{202E}"),
+            Some("Duncan".into())
+        );
+        assert_eq!(
+            sanitize_git_user_name("Dun\u{202E}can Idaho"),
+            Some("Duncan Idaho".into())
+        );
+    }
+
+    #[test]
+    fn test_zero_width_space_inside_a_word_is_removed_without_splitting_it() {
+        // U+200B is not whitespace, so it must not become a separator: the word
+        // rejoins rather than turning into "Dun can".
+        assert_eq!(
+            sanitize_git_user_name("Dun\u{200B}can"),
+            Some("Duncan".into())
+        );
+    }
+
+    #[test]
+    fn test_format_characters_do_not_consume_the_length_budget() {
+        // Filtering happens before truncation, so invisible padding cannot
+        // shorten the visible name.
+        let raw = format!("{}{}", "\u{200B}".repeat(200), "a".repeat(90));
+        let got = sanitize_git_user_name(&raw).expect("non-empty");
+        assert_eq!(got.chars().count(), MAX_GIT_USER_NAME_CHARS);
+        assert!(got.chars().all(|c| c == 'a'), "got {got:?}");
+    }
+
+    #[test]
+    fn test_unicode_format_covers_every_cf_range_and_nothing_adjacent() {
+        // Both endpoints of each of the 21 `Cf` ranges in UCD 17.0.0. Endpoints
+        // are what a transcription error moves, so they are what gets asserted.
+        for c in [
+            '\u{00AD}',
+            '\u{0600}',
+            '\u{0605}',
+            '\u{061C}',
+            '\u{06DD}',
+            '\u{070F}',
+            '\u{0890}',
+            '\u{0891}',
+            '\u{08E2}',
+            '\u{180E}',
+            '\u{200B}',
+            '\u{200F}',
+            '\u{202A}',
+            '\u{202E}',
+            '\u{2060}',
+            '\u{2064}',
+            '\u{2066}',
+            '\u{206F}',
+            '\u{FEFF}',
+            '\u{FFF9}',
+            '\u{FFFB}',
+            '\u{110BD}',
+            '\u{110CD}',
+            '\u{13430}',
+            '\u{1343F}',
+            '\u{1BCA0}',
+            '\u{1BCA3}',
+            '\u{1D173}',
+            '\u{1D17A}',
+            '\u{E0001}',
+            '\u{E0020}',
+            '\u{E007F}',
+        ] {
+            assert!(is_unicode_format(c), "U+{:04X} is Cf", c as u32);
+        }
+        // Codepoints immediately outside those ranges, plus ordinary characters.
+        // U+2065 is the notable one: it sits *inside* the 2060..206F block but
+        // is unassigned, not `Cf`.
+        for c in [
+            '\u{00AC}',
+            '\u{00AE}',
+            '\u{05FF}',
+            '\u{0606}',
+            '\u{061B}',
+            '\u{061D}',
+            '\u{200A}',
+            '\u{2010}',
+            '\u{2029}',
+            '\u{202F}',
+            '\u{2065}',
+            '\u{205F}',
+            '\u{2070}',
+            '\u{FEFE}',
+            '\u{FFF8}',
+            '\u{FFFC}',
+            '\u{110BC}',
+            '\u{1342F}',
+            '\u{E0000}',
+            '\u{E0080}',
+            'a',
+            ' ',
+            '🐝',
+            'É',
+        ] {
+            assert!(!is_unicode_format(c), "U+{:04X} is not Cf", c as u32);
+        }
+    }
+
+    #[test]
+    fn test_build_git_env_uses_display_name_and_leaves_email_on_the_pubkey() {
+        let _guard = ENV_LOCK.lock().unwrap();
+        std::env::set_var("BUZZ_ACP_DISPLAY_NAME", "Duncan");
+        std::env::remove_var("BUZZ_RELAY_URL");
+        std::env::remove_var("GIT_CONFIG_COUNT");
+        let env = build_git_env(&key_info());
+        std::env::remove_var("BUZZ_ACP_DISPLAY_NAME");
+
+        assert_eq!(git_config(&env, "user.name").as_deref(), Some("Duncan"));
+        // The pubkey — the thing NIP-98 auth, NIP-GS signing, and contributor
+        // matching key on — must stay in the email untouched.
+        assert_eq!(
+            git_config(&env, "user.email").as_deref(),
+            Some(format!("{PUBKEY_HEX}@buzz").as_str())
+        );
+        assert_eq!(
+            git_config(&env, "user.signingkey").as_deref(),
+            Some(PUBKEY_HEX)
+        );
+    }
+
+    #[test]
+    fn test_build_git_env_falls_back_to_npub_when_display_name_unset() {
+        let _guard = ENV_LOCK.lock().unwrap();
+        std::env::remove_var("BUZZ_ACP_DISPLAY_NAME");
+        std::env::remove_var("BUZZ_RELAY_URL");
+        std::env::remove_var("GIT_CONFIG_COUNT");
+        let env = build_git_env(&key_info());
+
+        // Today's behavior, and what every agent gets until a writer for
+        // BUZZ_ACP_DISPLAY_NAME lands on the Desktop side.
+        assert_eq!(git_config(&env, "user.name").as_deref(), Some(NPUB));
+        assert_eq!(
+            git_config(&env, "user.email").as_deref(),
+            Some(format!("{PUBKEY_HEX}@buzz").as_str())
+        );
+    }
+
+    #[test]
+    fn test_build_git_env_falls_back_to_npub_when_display_name_is_unusable() {
+        let _guard = ENV_LOCK.lock().unwrap();
+        std::env::remove_var("BUZZ_RELAY_URL");
+        std::env::remove_var("GIT_CONFIG_COUNT");
+
+        // Crud-only and format-only names both reach git as the npub — one
+        // would abort every commit, the other would render as blank.
+        for raw in ["<>", "\u{200B}"] {
+            std::env::set_var("BUZZ_ACP_DISPLAY_NAME", raw);
+            let env = build_git_env(&key_info());
+            assert_eq!(
+                git_config(&env, "user.name").as_deref(),
+                Some(NPUB),
+                "unusable display name {raw:?} must reach git as the npub"
+            );
+        }
+        std::env::remove_var("BUZZ_ACP_DISPLAY_NAME");
+    }
+
+    #[test]
+    fn test_git_crud_set_matches_observed_git_behavior() {
+        // Empirically derived from git 2.54.0: these bytes, alone, abort a commit.
+        for c in [' ', '"', '\'', ',', ':', ';', '<', '>', '\\', '\t', '\n'] {
+            assert!(is_git_crud(c), "{c:?} should be crud");
+        }
+        for c in ['.', '-', '_', '@', '(', 'a', '🐝'] {
+            assert!(!is_git_crud(c), "{c:?} should not be crud");
+        }
+    }
+}
diff --git a/crates/buzz-relay/Cargo.toml b/crates/buzz-relay/Cargo.toml
index 10a83f0324..01f78a2d49 100644
--- a/crates/buzz-relay/Cargo.toml
+++ b/crates/buzz-relay/Cargo.toml
@@ -92,3 +92,4 @@ reqwest = { workspace = true }
 tokio-tungstenite = { workspace = true }
 futures = "0.3"
 flate2 = "1.1.9"
+opentelemetry_sdk = { workspace = true, features = ["testing"] }
diff --git a/crates/buzz-relay/src/api/admin/mod.rs b/crates/buzz-relay/src/api/admin/mod.rs
index f0f4c5e633..21f30065f0 100644
--- a/crates/buzz-relay/src/api/admin/mod.rs
+++ b/crates/buzz-relay/src/api/admin/mod.rs
@@ -126,7 +126,7 @@ async fn report_detail(
     State(state): State<Arc<crate::state::AppState>>,
     headers: HeaderMap,
     Path(id): Path<Uuid>,
-) -> Result<Json<buzz_db::admin_moderation::AdminReport>, ApiError> {
+) -> Result<Json<buzz_db::admin_moderation::AdminReportDetail>, ApiError> {
     authorize(&state, &headers)?;
     state
         .db
@@ -374,6 +374,36 @@ mod tests {
 
     const HASH: &str = "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789";
 
+    #[tokio::test]
+    async fn report_detail_requires_admin_host_before_database_access() {
+        let response = router(test_state().await)
+            .oneshot(
+                Request::builder()
+                    .uri(format!("/reports/{}", Uuid::nil()))
+                    .header(header::HOST, "community.example")
+                    .body(Body::empty())
+                    .expect("request"),
+            )
+            .await
+            .expect("response");
+        assert_eq!(response.status(), axum::http::StatusCode::FORBIDDEN);
+    }
+
+    #[tokio::test]
+    async fn report_detail_rejects_unknown_report() {
+        let response = router(test_state().await)
+            .oneshot(
+                Request::builder()
+                    .uri(format!("/reports/{}", Uuid::nil()))
+                    .header(header::HOST, "admin.example")
+                    .body(Body::empty())
+                    .expect("request"),
+            )
+            .await
+            .expect("response");
+        assert_eq!(response.status(), axum::http::StatusCode::NOT_FOUND);
+    }
+
     #[tokio::test]
     async fn feedback_attachment_requires_admin_host_before_database_access() {
         let response = router(test_state().await)
diff --git a/crates/buzz-relay/src/api/bridge.rs b/crates/buzz-relay/src/api/bridge.rs
index c8ec0cdbc9..2e00d6bd2f 100644
--- a/crates/buzz-relay/src/api/bridge.rs
+++ b/crates/buzz-relay/src/api/bridge.rs
@@ -1872,6 +1872,26 @@ pub async fn workflow_webhook(
     }
     let trigger_ctx_json = serde_json::to_value(&trigger_ctx).ok();
 
+    // SEC-006: the webhook secret authenticates the *caller*, but the run
+    // executes with the workflow **owner's** standing authority — so the
+    // secret alone is insufficient. Immediately before run creation, reject
+    // disabled/inactive workflows and recheck the owner's current channel
+    // membership (and role, for exfiltration-capable definitions). Fail
+    // closed with the same generic 404 as the lookups above so a
+    // revoked-owner workflow is indistinguishable from a nonexistent one.
+    if !workflow.enabled || workflow.status != buzz_db::workflow::WorkflowStatus::Active {
+        return Err(not_found("workflow not found"));
+    }
+    let Some(wf_channel_id) = workflow.channel_id else {
+        // No channel scope means no channel authority to verify — fail closed.
+        return Err(not_found("workflow not found"));
+    };
+    state
+        .workflow_engine
+        .check_owner_authority(community_id, wf_channel_id, &workflow.owner_pubkey, &def)
+        .await
+        .map_err(|_| not_found("workflow not found"))?;
+
     let run_id = state
         .db
         .create_workflow_run(community_id, id, None, trigger_ctx_json.as_ref())
diff --git a/crates/buzz-relay/src/api/git/transport.rs b/crates/buzz-relay/src/api/git/transport.rs
index 80e74e1ca0..df5bdd4c3e 100644
--- a/crates/buzz-relay/src/api/git/transport.rs
+++ b/crates/buzz-relay/src/api/git/transport.rs
@@ -63,8 +63,10 @@ const UPLOAD_PACK_MAX_DECODED_BYTES: u64 = 64 * 1024 * 1024;
 /// Validates the `Authorization: Nostr <base64>` header before the request body
 /// is read. Same pattern as `AuthenticatedUpload` in media.rs.
 ///
-/// Authorization model: any authenticated pubkey can clone; push authorization
-/// is handled by the pre-receive hook (calls back to the internal policy endpoint
+/// Authorization model: reads (ref advertisement, upload-pack) require the
+/// caller's *current* active membership in the repo's bound channel — see
+/// [`authorize_git_read`] (SEC-005). Push authorization is additionally
+/// handled by the pre-receive hook (calls back to the internal policy endpoint
 /// which checks channel role + protection rules from kind:30617).
 pub struct GitAuth {
     /// The authenticated user's public key, extracted from the NIP-98 event.
@@ -354,6 +356,114 @@ fn hydrate_error_to_response(owner: &str, repo: &str, err: HydrateError) -> Resp
         .into_response()
 }
 
+/// SEC-005: authorize a repository *read* (ref advertisement, upload-pack).
+///
+/// The authorization invariant is the authenticated git caller's **current
+/// active membership in the repo's bound channel**. NIP-98 alone only proves
+/// key possession — without this gate any authenticated pubkey (including a
+/// member removed from the channel) can clone channel-bound repositories.
+///
+/// Resolution follows the current authoritative announcement, the same
+/// mapping the push policy endpoint uses:
+/// 1. current live kind:30617 by `(community, owner pubkey from the URL,
+///    d = canonical repo name)` — soft-deleted/replaced announcements do not
+///    resolve;
+/// 2. its `buzz-channel` tag → channel UUID;
+/// 3. [`buzz_db::Db::get_member_role`] for the caller — a read is allowed
+///    only on `Ok(Some(role))` with a role the relay recognizes.
+///
+/// Fail-closed: missing/deleted announcement, invalid owner, missing or
+/// malformed `buzz-channel` binding, non-member, unknown role, and every DB
+/// error all deny. There is deliberately **no repo-owner bypass**: an owner
+/// removed from the bound channel loses read access, which is the exact
+/// exploit shape this gate closes. Every denial is the same generic 404 as a
+/// nonexistent repo so membership cannot be probed through the git endpoints.
+async fn authorize_git_read(
+    db: &buzz_db::Db,
+    community: buzz_core::CommunityId,
+    caller: &nostr::PublicKey,
+    owner_hex: &str,
+    repo_name: &str,
+) -> Result<(), Response> {
+    fn denied() -> Response {
+        (StatusCode::NOT_FOUND, "repository not found").into_response()
+    }
+
+    let Ok(owner_bytes) = hex::decode(owner_hex) else {
+        return Err(denied());
+    };
+    if owner_bytes.len() != 32 {
+        return Err(denied());
+    }
+
+    let query = buzz_db::EventQuery {
+        kinds: Some(vec![30617]),
+        pubkey: Some(owner_bytes),
+        d_tag: Some(repo_name.to_string()),
+        global_only: true,
+        limit: Some(1),
+        ..buzz_db::EventQuery::for_community(community)
+    };
+    let repo_event = match db.query_events(&query).await {
+        Ok(mut events) => match events.pop() {
+            Some(event) => event,
+            None => return Err(denied()),
+        },
+        Err(e) => {
+            error!(repo = %repo_name, error = %e, "git read gate: 30617 lookup failed (deny)");
+            return Err(denied());
+        }
+    };
+
+    let Some(channel_id) = repo_bound_channel_id(&repo_event.event) else {
+        warn!(repo = %repo_name, "git read gate: missing/malformed buzz-channel binding (deny)");
+        return Err(denied());
+    };
+
+    match db
+        .get_member_role(community, channel_id, &caller.to_bytes())
+        .await
+    {
+        Ok(role) if read_role_allows(role.as_deref()) => Ok(()),
+        Ok(_) => Err(denied()),
+        Err(e) => {
+            error!(repo = %repo_name, error = %e, "git read gate: role lookup failed (deny)");
+            Err(denied())
+        }
+    }
+}
+
+/// Extract the `buzz-channel` UUID from a kind:30617 announcement.
+///
+/// First-tag semantics, matching the push policy endpoint: only the *first*
+/// `buzz-channel` tag is considered, and it must carry a valid UUID. A
+/// malformed first binding denies even if a later duplicate tag is valid —
+/// an ambiguous announcement must fail closed, not silently resolve to
+/// whichever duplicate happens to parse.
+fn repo_bound_channel_id(event: &nostr::Event) -> Option<uuid::Uuid> {
+    let first = event
+        .tags
+        .iter()
+        .find(|t| t.as_slice().first().map(String::as_str) == Some("buzz-channel"))?;
+    first
+        .as_slice()
+        .get(1)
+        .and_then(|v| uuid::Uuid::parse_str(v).ok())
+}
+
+/// Pure decision for [`authorize_git_read`]: a read requires a current
+/// active membership row whose role the relay recognizes.
+///
+/// `None` = not an active member (removed, left, never joined) ⇒ deny.
+/// An unrecognized role string ⇒ deny (fail-closed, same as the push
+/// policy endpoint).
+fn read_role_allows(role: Option<&str>) -> bool {
+    match role {
+        Some(r) => r.parse::<buzz_core::channel::MemberRole>().is_ok(),
+        None => false,
+    }
+}
+
 #[derive(Deserialize)]
 /// Query parameters for the `info/refs` endpoint.
 pub struct InfoRefsQuery {
@@ -547,7 +657,19 @@ pub async fn info_refs(
         "git-upload-pack" | "git-receive-pack" => &query.service,
         _ => return Err((StatusCode::BAD_REQUEST, "invalid service").into_response()),
     };
-    let _repo_name = validate_repo_id(&params.owner, &params.repo)?;
+    let repo_name = validate_repo_id(&params.owner, &params.repo)?;
+
+    // SEC-005: channel-membership gate before any manifest load, hydration,
+    // or subprocess work. Both services — the receive-pack advertisement
+    // leaks the ref list just like the upload-pack one.
+    authorize_git_read(
+        &state.db,
+        auth.tenant.community(),
+        &auth.pubkey,
+        &params.owner,
+        repo_name,
+    )
+    .await?;
 
     // Track C fast path: only for clone advertisement. The receive-pack
     // advertisement carries a different capability set (report-status,
@@ -790,7 +912,21 @@ pub async fn upload_pack(
     AxumPath(params): AxumPath<GitRepoParams>,
     body: Body,
 ) -> Result<Response, Response> {
-    let _ = validate_repo_id(&params.owner, &params.repo)?;
+    let repo_name = validate_repo_id(&params.owner, &params.repo)?;
+
+    // SEC-005: the reused NIP-98 token means the GET advertisement's
+    // authorization cannot stand in for POST-time membership — gate this
+    // door independently, before body decode work is driven or hydration
+    // starts.
+    authorize_git_read(
+        &state.db,
+        auth.tenant.community(),
+        &auth.pubkey,
+        &params.owner,
+        repo_name,
+    )
+    .await?;
+
     let body = decode_git_request_body(&headers, body, UPLOAD_PACK_MAX_DECODED_BYTES);
     let permit = acquire_git_permit(&state, "upload_pack")?;
 
@@ -2286,3 +2422,335 @@ mod track_c_tests {
         assert!(caps.contains("object-format=sha256"));
     }
 }
+
+#[cfg(test)]
+mod sec005_read_gate_tests {
+    use super::*;
+    use nostr::{EventBuilder, Keys, Kind, Tag};
+
+    // ── Pure decision helpers ────────────────────────────────────────────
+
+    #[test]
+    fn read_role_allows_every_recognized_role() {
+        for role in ["owner", "admin", "member", "guest", "bot"] {
+            assert!(read_role_allows(Some(role)), "role {role:?} must allow");
+        }
+    }
+
+    #[test]
+    fn read_role_denies_non_members_and_unknown_roles() {
+        assert!(!read_role_allows(None), "no membership row must deny");
+        assert!(
+            !read_role_allows(Some("superuser")),
+            "unrecognized role must deny (fail-closed)"
+        );
+        assert!(!read_role_allows(Some("")), "empty role must deny");
+    }
+
+    fn announcement(keys: &Keys, tags: Vec<Tag>) -> nostr::Event {
+        EventBuilder::new(Kind::Custom(30617), "")
+            .tags(tags)
+            .sign_with_keys(keys)
+            .expect("sign 30617")
+    }
+
+    #[test]
+    fn repo_bound_channel_id_extracts_valid_uuid() {
+        let keys = Keys::generate();
+        let ch = uuid::Uuid::new_v4();
+        let event = announcement(
+            &keys,
+            vec![
+                Tag::parse(["d", "r"]).unwrap(),
+                Tag::parse(["buzz-channel", &ch.to_string()]).unwrap(),
+            ],
+        );
+        assert_eq!(repo_bound_channel_id(&event), Some(ch));
+    }
+
+    #[test]
+    fn repo_bound_channel_id_rejects_absent_and_malformed_bindings() {
+        let keys = Keys::generate();
+        let absent = announcement(&keys, vec![Tag::parse(["d", "r"]).unwrap()]);
+        assert_eq!(repo_bound_channel_id(&absent), None);
+
+        let malformed = announcement(
+            &keys,
+            vec![
+                Tag::parse(["d", "r"]).unwrap(),
+                Tag::parse(["buzz-channel", "not-a-uuid"]).unwrap(),
+            ],
+        );
+        assert_eq!(repo_bound_channel_id(&malformed), None);
+
+        let empty = announcement(
+            &keys,
+            vec![
+                Tag::parse(["d", "r"]).unwrap(),
+                Tag::parse(["buzz-channel"]).unwrap(),
+            ],
+        );
+        assert_eq!(repo_bound_channel_id(&empty), None);
+    }
+
+    #[test]
+    fn repo_bound_channel_id_fails_closed_on_ambiguous_duplicate_bindings() {
+        // First-tag semantics: a malformed first binding must deny even when
+        // a later duplicate tag is valid. An ambiguous announcement must not
+        // silently resolve to whichever duplicate happens to parse.
+        let keys = Keys::generate();
+        let ch = uuid::Uuid::new_v4();
+        let malformed_first = announcement(
+            &keys,
+            vec![
+                Tag::parse(["d", "r"]).unwrap(),
+                Tag::parse(["buzz-channel", "not-a-uuid"]).unwrap(),
+                Tag::parse(["buzz-channel", &ch.to_string()]).unwrap(),
+            ],
+        );
+        assert_eq!(repo_bound_channel_id(&malformed_first), None);
+
+        // And the mirror image: a valid first binding wins, matching the
+        // push policy endpoint's first-tag resolution.
+        let other = uuid::Uuid::new_v4();
+        let valid_first = announcement(
+            &keys,
+            vec![
+                Tag::parse(["d", "r"]).unwrap(),
+                Tag::parse(["buzz-channel", &ch.to_string()]).unwrap(),
+                Tag::parse(["buzz-channel", &other.to_string()]).unwrap(),
+            ],
+        );
+        assert_eq!(repo_bound_channel_id(&valid_first), Some(ch));
+    }
+
+    // ── authorize_git_read matrix (requires Postgres) ────────────────────
+
+    const TEST_DB_URL: &str = "postgres://buzz:buzz_dev@localhost:5432/buzz"; // sadscan:disable np.postgres.1
+
+    async fn setup_db() -> buzz_db::Db {
+        let url = std::env::var("BUZZ_TEST_DATABASE_URL")
+            .or_else(|_| std::env::var("DATABASE_URL"))
+            .unwrap_or_else(|_| TEST_DB_URL.to_string());
+        let pool = sqlx::PgPool::connect(&url).await.expect("connect test DB");
+        buzz_db::Db::from_pool(pool)
+    }
+
+    /// How the fixture's kind:30617 binds (or fails to bind) a channel.
+    enum Binding {
+        /// `buzz-channel` tag carrying the fixture channel's UUID.
+        Channel,
+        /// No `buzz-channel` tag at all.
+        Missing,
+        /// `buzz-channel` tag whose value is not a UUID.
+        Malformed,
+    }
+
+    struct RepoFixture {
+        db: buzz_db::Db,
+        community: buzz_core::CommunityId,
+        channel: uuid::Uuid,
+        owner_keys: Keys,
+        owner_hex: String,
+        member_keys: Keys,
+        repo: String,
+    }
+
+    /// Community + channel + one plain member + a kind:30617 announcement.
+    /// The repo owner is a *different* key that is not a channel member —
+    /// deliberately, to pin "no repo-owner bypass".
+    async fn setup_repo(binding: Binding) -> RepoFixture {
+        let db = setup_db().await;
+        let host = format!("sec005-{}.example", uuid::Uuid::new_v4().simple());
+        let community = db
+            .ensure_configured_community(&host)
+            .await
+            .expect("community")
+            .id;
+
+        let owner_keys = Keys::generate();
+        let member_keys = Keys::generate();
+        let creator = Keys::generate(); // channel creator, distinct from repo owner
+        let creator_pk = creator.public_key().to_bytes().to_vec();
+        let member_pk = member_keys.public_key().to_bytes().to_vec();
+        db.ensure_user(community, &creator_pk).await.expect("user");
+        db.ensure_user(community, &member_pk).await.expect("user");
+
+        let channel = uuid::Uuid::new_v4();
+        db.create_channel_with_id(
+            community,
+            channel,
+            &format!("ch-{}", channel.simple()),
+            buzz_db::channel::ChannelType::Stream,
+            buzz_db::channel::ChannelVisibility::Open,
+            None,
+            &creator_pk,
+            None,
+        )
+        .await
+        .expect("channel");
+        db.add_member(
+            community,
+            channel,
+            &member_pk,
+            buzz_core::channel::MemberRole::Member,
+            Some(&creator_pk),
+        )
+        .await
+        .expect("member");
+
+        let repo = format!("repo-{}", uuid::Uuid::new_v4().simple());
+        let mut tags = vec![Tag::parse(["d", &repo]).unwrap()];
+        match binding {
+            Binding::Channel => {
+                tags.push(Tag::parse(["buzz-channel", &channel.to_string()]).unwrap());
+            }
+            Binding::Missing => {}
+            Binding::Malformed => {
+                tags.push(Tag::parse(["buzz-channel", "not-a-uuid"]).unwrap());
+            }
+        }
+        let event = announcement(&owner_keys, tags);
+        db.insert_event(community, &event, None)
+            .await
+            .expect("30617");
+
+        let owner_hex = owner_keys.public_key().to_hex();
+        RepoFixture {
+            db,
+            community,
+            channel,
+            owner_keys,
+            owner_hex,
+            member_keys,
+            repo,
+        }
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn read_gate_allows_current_member_denies_removed_and_owner_bypass() {
+        let f = setup_repo(Binding::Channel).await;
+
+        // Current member: allowed.
+        let member = f.member_keys.public_key();
+        assert!(
+            authorize_git_read(&f.db, f.community, &member, &f.owner_hex, &f.repo)
+                .await
+                .is_ok(),
+            "current member must be allowed to read"
+        );
+
+        // Never-a-member caller: denied.
+        let stranger = Keys::generate().public_key();
+        assert!(
+            authorize_git_read(&f.db, f.community, &stranger, &f.owner_hex, &f.repo)
+                .await
+                .is_err(),
+            "non-member must be denied"
+        );
+
+        // Member removed → denied. THE finding-005 exploit shape.
+        let member_pk = member.to_bytes().to_vec();
+        f.db.remove_member(f.community, f.channel, &member_pk, &member_pk)
+            .await
+            .expect("self-remove");
+        assert!(
+            authorize_git_read(&f.db, f.community, &member, &f.owner_hex, &f.repo)
+                .await
+                .is_err(),
+            "removed member must be denied"
+        );
+
+        // No repo-owner bypass: the announcement author is not a channel
+        // member and must be denied too.
+        let owner = f.owner_keys.public_key();
+        assert!(
+            authorize_git_read(&f.db, f.community, &owner, &f.owner_hex, &f.repo)
+                .await
+                .is_err(),
+            "repo owner outside the channel must be denied (no owner bypass)"
+        );
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn read_gate_denies_missing_or_malformed_binding_and_absent_repo() {
+        // Missing buzz-channel tag → deny even for a channel member.
+        let f = setup_repo(Binding::Missing).await;
+        let member = f.member_keys.public_key();
+        assert!(
+            authorize_git_read(&f.db, f.community, &member, &f.owner_hex, &f.repo)
+                .await
+                .is_err(),
+            "announcement without buzz-channel binding must deny"
+        );
+
+        // Malformed buzz-channel tag → deny.
+        let g = setup_repo(Binding::Malformed).await;
+        let member_g = g.member_keys.public_key();
+        assert!(
+            authorize_git_read(&g.db, g.community, &member_g, &g.owner_hex, &g.repo)
+                .await
+                .is_err(),
+            "announcement with malformed buzz-channel binding must deny"
+        );
+
+        // Nonexistent announcement → deny.
+        assert!(
+            authorize_git_read(&f.db, f.community, &member, &f.owner_hex, "no-such-repo")
+                .await
+                .is_err(),
+            "nonexistent repo must deny"
+        );
+
+        // Owner-mismatch: URL owner differs from announcement author → deny.
+        let impostor_hex = Keys::generate().public_key().to_hex();
+        assert!(
+            authorize_git_read(&f.db, f.community, &member, &impostor_hex, &f.repo)
+                .await
+                .is_err(),
+            "URL owner that never announced this repo must deny"
+        );
+
+        // Invalid owner hex in URL → deny (never panics).
+        assert!(
+            authorize_git_read(&f.db, f.community, &member, "zz-not-hex", &f.repo)
+                .await
+                .is_err(),
+            "malformed owner hex must deny"
+        );
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn read_gate_follows_current_announcement_not_stale_registry() {
+        // Max's registry/pointer concern: a soft-deleted 30617 can leave the
+        // `git_repo_names` reservation and the manifest pointer alive. Reads
+        // must follow the current authoritative announcement — once it's
+        // deleted, the gate denies even a current channel member.
+        let f = setup_repo(Binding::Channel).await;
+
+        let member = f.member_keys.public_key();
+        assert!(
+            authorize_git_read(&f.db, f.community, &member, &f.owner_hex, &f.repo)
+                .await
+                .is_ok(),
+            "precondition: member allowed while announcement is live"
+        );
+
+        let owner_pk = f.owner_keys.public_key().to_bytes().to_vec();
+        let deleted =
+            f.db.soft_delete_by_coordinate(f.community, 30617, &owner_pk, &f.repo)
+                .await
+                .expect("soft delete 30617");
+        assert!(deleted, "precondition: a live announcement row was deleted");
+
+        assert!(
+            authorize_git_read(&f.db, f.community, &member, &f.owner_hex, &f.repo)
+                .await
+                .is_err(),
+            "deleted announcement must deny reads even for channel members"
+        );
+    }
+}
diff --git a/crates/buzz-relay/src/api/invites.rs b/crates/buzz-relay/src/api/invites.rs
index 6719e85f79..6104171cca 100644
--- a/crates/buzz-relay/src/api/invites.rs
+++ b/crates/buzz-relay/src/api/invites.rs
@@ -25,7 +25,12 @@ use serde::Deserialize;
 use serde_json::Value;
 
 use crate::handlers::side_effects::{publish_nip43_member_added, publish_nip43_membership_list};
-use crate::invite_token::{self, DEFAULT_INVITE_TTL_SECS};
+use buzz_core::invite::{
+    hash_v2_code, validate_v2_code, DEFAULT_INVITE_TTL_SECS, MAX_INVITE_TTL_SECS, MAX_INVITE_USES,
+    MIN_INVITE_TTL_SECS, V2_PREFIX,
+};
+
+use crate::invite_token;
 use crate::state::AppState;
 
 use super::{api_error, bridge, internal_error};
@@ -43,10 +48,42 @@ pub(crate) const CLAIM_RATE_CACHE_CAPACITY: u64 = 10_000;
 /// Body for `POST /api/invites`.
 #[derive(Debug, Default, Deserialize)]
 pub struct MintInviteRequest {
-    /// Requested lifetime in seconds. Clamped to
+    /// Requested lifetime in seconds. Must be between
+    /// [`MIN_INVITE_TTL_SECS`] and
     /// [`invite_token::MAX_INVITE_TTL_SECS`]; defaults to 72 h.
     #[serde(default)]
     pub ttl_secs: Option<u64>,
+    /// Maximum number of uses before the invite is exhausted. `None` (omitted
+    /// or `null`) means unlimited — preserves current behavior. When present,
+    /// must be an integer from 1 through [`MAX_INVITE_USES`].
+    #[serde(default)]
+    pub max_uses: Option<i32>,
+}
+
+fn validate_mint_request(
+    request: &MintInviteRequest,
+) -> Result<(u64, Option<i32>), (StatusCode, Json<Value>)> {
+    let ttl = request.ttl_secs.unwrap_or(DEFAULT_INVITE_TTL_SECS);
+    if !(MIN_INVITE_TTL_SECS..=MAX_INVITE_TTL_SECS).contains(&ttl) {
+        return Err(api_error(
+            StatusCode::BAD_REQUEST,
+            &format!(
+                "ttl_secs must be between {} and {MAX_INVITE_TTL_SECS}",
+                MIN_INVITE_TTL_SECS
+            ),
+        ));
+    }
+
+    if let Some(max_uses) = request.max_uses {
+        if !(1..=MAX_INVITE_USES).contains(&max_uses) {
+            return Err(api_error(
+                StatusCode::BAD_REQUEST,
+                &format!("max_uses must be between 1 and {MAX_INVITE_USES}"),
+            ));
+        }
+    }
+
+    Ok((ttl, request.max_uses))
 }
 
 /// Body for `POST /api/invites/claim`.
@@ -260,9 +297,17 @@ pub async fn mint_invite(
         })?
     };
 
-    let key = invite_token::derive_invite_key(&state.relay_keypair);
-    let ttl = request.ttl_secs.unwrap_or(DEFAULT_INVITE_TTL_SECS);
-    let (code, expires_at) = invite_token::mint_invite(&key, tenant.community(), ttl);
+    let (ttl, max_uses) = validate_mint_request(&request)?;
+
+    // Mint a v2 opaque, database-backed invite.
+    let invite = state
+        .db
+        .mint_relay_invite(tenant.community(), &sender_hex, ttl, max_uses)
+        .await
+        .map_err(|error| match error {
+            buzz_db::DbError::InvalidData(message) => api_error(StatusCode::BAD_REQUEST, &message),
+            error => internal_error(&format!("invite mint: {error}")),
+        })?;
 
     // Same TLS-posture logic as nip98_expected_url: wss deployments get an
     // https landing page URL, ws dev/test deployments get http.
@@ -275,19 +320,30 @@ pub async fn mint_invite(
     tracing::info!(
         community = %tenant.community(),
         minted_by = %sender_hex,
-        expires_at,
+        invite_id = %invite.invite_id,
+        expires_at = %invite.expires_at,
+        max_uses = ?invite.max_uses,
         "relay invite minted"
     );
 
+    // expires_at as unix seconds for the response contract.
+    let expires_at_unix = invite.expires_at.timestamp() as u64;
+
     Ok(Json(serde_json::json!({
-        "code": code,
-        "expires_at": expires_at,
-        "url": format!("{scheme}://{}/invite/{}", tenant.host(), code),
+        "code": invite.code,
+        "expires_at": expires_at_unix,
+        "max_uses": invite.max_uses,
+        "uses_remaining": invite.uses_remaining,
+        "url": format!("{scheme}://{}/invite/{}", tenant.host(), invite.code),
     })))
 }
 
 /// Claim an invite code — `POST /api/invites/claim`, NIP-98 signed by the
 /// *joining* pubkey. Exempt from the relay-membership gate by design.
+///
+/// Routing is by exact prefix: `v2.` codes go to the database-backed
+/// redemption path; every other code goes to the v1 HMAC verifier. A `v2.`
+/// code is never fallen back to v1 verification.
 pub async fn claim_invite(
     State(state): State<Arc<AppState>>,
     headers: HeaderMap,
@@ -305,7 +361,88 @@ pub async fn claim_invite(
     let request: ClaimInviteRequest = serde_json::from_slice(&body)
         .map_err(|e| api_error(StatusCode::BAD_REQUEST, &format!("invalid claim JSON: {e}")))?;
 
+    let claimer_hex = pubkey.to_hex();
     let key = invite_token::derive_invite_key(&state.relay_keypair);
+
+    // --- v2 database-backed path ---
+    //
+    // Route by exact prefix: v2. codes use the durable invite table. No
+    // fallback to v1 HMAC verification for malformed v2 input.
+    if request.code.starts_with(V2_PREFIX) {
+        validate_v2_code(&request.code)
+            .map_err(|_| api_error(StatusCode::FORBIDDEN, "invite_invalid"))?;
+
+        // Join-policy receipt verification, same mechanism as v1: the receipt
+        // is bound to the code string by SHA-256, so it works for v2 codes.
+        if let Some(policy) = &state.config.join_policy {
+            let receipt = request
+                .policy_receipt
+                .as_deref()
+                .ok_or_else(|| api_error(StatusCode::FORBIDDEN, "join_policy_required"))?;
+            invite_token::verify_policy_acceptance(&key, receipt, &request.code, &policy.version)
+                .map_err(|_| api_error(StatusCode::FORBIDDEN, "join_policy_required"))?;
+        }
+
+        let token_hash = hash_v2_code(&request.code);
+        let outcome = state
+            .db
+            .claim_relay_invite(
+                tenant.community(),
+                &token_hash,
+                &claimer_hex,
+                state
+                    .config
+                    .join_policy
+                    .as_ref()
+                    .map(|policy| policy.version.as_str()),
+            )
+            .await
+            .map_err(|e| internal_error(&format!("v2 invite claim: {e}")))?;
+
+        return match outcome {
+            buzz_db::relay_invite::ClaimOutcome::Joined { .. } => {
+                tracing::info!(
+                    community = %tenant.community(),
+                    member = %claimer_hex,
+                    "relay member added via v2 invite"
+                );
+                // NIP-43 side effects only on Joined, never on other outcomes.
+                if let Err(e) = publish_nip43_member_added(&tenant, &state, &claimer_hex).await {
+                    tracing::warn!(
+                        "failed to publish NIP-43 member-added delta after v2 claim: {e}"
+                    );
+                }
+                if let Err(e) = publish_nip43_membership_list(&tenant, &state).await {
+                    tracing::warn!("failed to publish NIP-43 membership list after v2 claim: {e}");
+                }
+                Ok(Json(serde_json::json!({
+                    "status": "joined",
+                    "community_id": tenant.community().to_string(),
+                    "host": tenant.host(),
+                    "role": "member",
+                })))
+            }
+            buzz_db::relay_invite::ClaimOutcome::AlreadyMember { .. } => {
+                Ok(Json(serde_json::json!({
+                    "status": "already_member",
+                    "community_id": tenant.community().to_string(),
+                    "host": tenant.host(),
+                    "role": "member",
+                })))
+            }
+            buzz_db::relay_invite::ClaimOutcome::Expired => {
+                Err(api_error(StatusCode::FORBIDDEN, "invite_expired"))
+            }
+            buzz_db::relay_invite::ClaimOutcome::Exhausted => {
+                Err(api_error(StatusCode::FORBIDDEN, "invite_exhausted"))
+            }
+            buzz_db::relay_invite::ClaimOutcome::Invalid => {
+                Err(api_error(StatusCode::FORBIDDEN, "invite_invalid"))
+            }
+        };
+    }
+
+    // --- v1 HMAC path (stateless tokens, drain window) ---
     let payload = invite_token::verify_invite(&key, tenant.community(), &request.code).map_err(
         |e| match e {
             // Expired is post-MAC: revealing it helps the UX without helping a forger.
@@ -317,7 +454,6 @@ pub async fn claim_invite(
         },
     )?;
 
-    let claimer_hex = pubkey.to_hex();
     if let Some(policy) = &state.config.join_policy {
         let receipt = request
             .policy_receipt
@@ -395,7 +531,7 @@ mod tests {
     use std::sync::Arc;
     use std::time::Duration;
 
-    use super::{claim_key_rate_limited, CLAIM_RATE_LIMIT};
+    use super::{claim_key_rate_limited, CLAIM_RATE_LIMIT, MAX_INVITE_USES, MIN_INVITE_TTL_SECS};
     use axum::{
         body::{to_bytes, Body},
         http::{header, Request, StatusCode},
@@ -409,7 +545,7 @@ mod tests {
     use tower::ServiceExt;
     use uuid::Uuid;
 
-    use crate::invite_token::{derive_invite_key, InvitePayload};
+    use crate::invite_token::{derive_invite_key, InvitePayload, MAX_INVITE_TTL_SECS};
 
     use crate::router::build_router;
     use crate::state::AppState;
@@ -592,6 +728,355 @@ mod tests {
         serde_json::from_slice(&bytes).expect("response JSON")
     }
 
+    async fn mint_code(state: Arc<AppState>, host: &str, owner: &Keys, request: Value) -> String {
+        let response = post_json(state, host, "/api/invites", owner, request.to_string()).await;
+        assert_eq!(response.status(), StatusCode::OK);
+        read_json(response)
+            .await
+            .get("code")
+            .and_then(Value::as_str)
+            .expect("minted code")
+            .to_string()
+    }
+
+    async fn event_count(state: &AppState, community: buzz_core::CommunityId, kind: i32) -> i64 {
+        state
+            .db
+            .count_events(&buzz_db::EventQuery {
+                kinds: Some(vec![kind]),
+                global_only: true,
+                ..buzz_db::EventQuery::for_community(community)
+            })
+            .await
+            .expect("count side-effect events")
+    }
+
+    #[test]
+    fn mint_request_deserialization_is_strict() {
+        for valid in [
+            serde_json::json!({}),
+            serde_json::json!({ "max_uses": null }),
+            serde_json::json!({ "max_uses": 1 }),
+            serde_json::json!({ "max_uses": MAX_INVITE_USES }),
+        ] {
+            serde_json::from_value::<super::MintInviteRequest>(valid).expect("valid request");
+        }
+
+        for invalid in [
+            serde_json::json!({ "max_uses": 1.5 }),
+            serde_json::json!({ "max_uses": "10" }),
+            serde_json::json!({ "ttl_secs": -1 }),
+            serde_json::json!({ "ttl_secs": 1.5 }),
+            serde_json::json!({ "ttl_secs": "3600" }),
+        ] {
+            assert!(
+                serde_json::from_value::<super::MintInviteRequest>(invalid.clone()).is_err(),
+                "accepted wrong JSON type: {invalid}"
+            );
+        }
+    }
+
+    #[test]
+    fn mint_request_validation_enforces_bounds_without_a_database() {
+        use super::validate_mint_request;
+
+        for (request, expected) in [
+            (
+                super::MintInviteRequest::default(),
+                (crate::invite_token::DEFAULT_INVITE_TTL_SECS, None),
+            ),
+            (
+                super::MintInviteRequest {
+                    ttl_secs: Some(MIN_INVITE_TTL_SECS),
+                    max_uses: Some(1),
+                },
+                (MIN_INVITE_TTL_SECS, Some(1)),
+            ),
+            (
+                super::MintInviteRequest {
+                    ttl_secs: Some(MAX_INVITE_TTL_SECS),
+                    max_uses: Some(MAX_INVITE_USES),
+                },
+                (MAX_INVITE_TTL_SECS, Some(MAX_INVITE_USES)),
+            ),
+        ] {
+            assert_eq!(
+                validate_mint_request(&request).expect("valid request"),
+                expected
+            );
+        }
+
+        for request in [
+            super::MintInviteRequest {
+                ttl_secs: None,
+                max_uses: Some(0),
+            },
+            super::MintInviteRequest {
+                ttl_secs: None,
+                max_uses: Some(-1),
+            },
+            super::MintInviteRequest {
+                ttl_secs: None,
+                max_uses: Some(MAX_INVITE_USES + 1),
+            },
+            super::MintInviteRequest {
+                ttl_secs: Some(MIN_INVITE_TTL_SECS - 1),
+                max_uses: None,
+            },
+            super::MintInviteRequest {
+                ttl_secs: Some(MAX_INVITE_TTL_SECS + 1),
+                max_uses: None,
+            },
+        ] {
+            assert_eq!(
+                validate_mint_request(&request)
+                    .expect_err("invalid request")
+                    .0,
+                StatusCode::BAD_REQUEST
+            );
+        }
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn mint_validates_max_uses_and_ttl_bounds() {
+        let host = format!("invites-validation-{}.example", Uuid::new_v4().simple());
+        let owner = Keys::generate();
+        let state = invite_test_state(&host)
+            .await
+            .expect("requires reachable Postgres and relay test state");
+        let community = state
+            .db
+            .lookup_community_by_host(&host)
+            .await
+            .expect("lookup")
+            .expect("community exists");
+        state
+            .db
+            .add_relay_member(community.id, &owner.public_key().to_hex(), "owner", None)
+            .await
+            .expect("seed owner");
+
+        for body in [
+            serde_json::json!({ "max_uses": 0 }),
+            serde_json::json!({ "max_uses": -1 }),
+            serde_json::json!({ "max_uses": MAX_INVITE_USES + 1 }),
+            serde_json::json!({ "ttl_secs": MIN_INVITE_TTL_SECS - 1 }),
+            serde_json::json!({ "ttl_secs": MAX_INVITE_TTL_SECS + 1 }),
+        ] {
+            let response = post_json(
+                state.clone(),
+                &host,
+                "/api/invites",
+                &owner,
+                body.to_string(),
+            )
+            .await;
+            assert_eq!(response.status(), StatusCode::BAD_REQUEST, "{body}");
+        }
+
+        for body in [
+            serde_json::json!({}),
+            serde_json::json!({ "max_uses": null }),
+            serde_json::json!({ "max_uses": 1 }),
+            serde_json::json!({ "max_uses": MAX_INVITE_USES }),
+            serde_json::json!({ "ttl_secs": MIN_INVITE_TTL_SECS }),
+            serde_json::json!({ "ttl_secs": MAX_INVITE_TTL_SECS }),
+        ] {
+            let response = post_json(
+                state.clone(),
+                &host,
+                "/api/invites",
+                &owner,
+                body.to_string(),
+            )
+            .await;
+            assert_eq!(response.status(), StatusCode::OK, "{body}");
+        }
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn malformed_and_unknown_v2_codes_are_forbidden_without_v1_fallback() {
+        let host = format!("invites-v2-invalid-{}.example", Uuid::new_v4().simple());
+        let joiner = Keys::generate();
+        let state = invite_test_state(&host)
+            .await
+            .expect("requires reachable Postgres and relay test state");
+        let unknown = format!("v2.{}", URL_SAFE_NO_PAD.encode([9_u8; 32]));
+
+        for code in [
+            "v2.".to_string(),
+            "v2.not-base64!".to_string(),
+            format!("v2.{}", URL_SAFE_NO_PAD.encode([9_u8; 31])),
+            unknown,
+        ] {
+            let response = post_json(
+                state.clone(),
+                &host,
+                "/api/invites/claim",
+                &joiner,
+                serde_json::json!({ "code": code }).to_string(),
+            )
+            .await;
+            assert_eq!(response.status(), StatusCode::FORBIDDEN, "{code}");
+            assert_eq!(
+                read_json(response)
+                    .await
+                    .get("error")
+                    .and_then(Value::as_str),
+                Some("invite_invalid")
+            );
+        }
+    }
+
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn bounded_v2_claims_publish_side_effects_only_for_joined() {
+        let host = format!(
+            "invites-v2-side-effects-{}.example",
+            Uuid::new_v4().simple()
+        );
+        let owner = Keys::generate();
+        let first = Keys::generate();
+        let second = Keys::generate();
+        let state = invite_test_state(&host)
+            .await
+            .expect("requires reachable Postgres and relay test state");
+        let community = state
+            .db
+            .lookup_community_by_host(&host)
+            .await
+            .expect("lookup")
+            .expect("community exists");
+        state
+            .db
+            .add_relay_member(community.id, &owner.public_key().to_hex(), "owner", None)
+            .await
+            .expect("seed owner");
+        let before_delta_count = event_count(
+            &state,
+            community.id,
+            buzz_core::kind::KIND_NIP43_MEMBER_ADDED as i32,
+        )
+        .await;
+        let before_list_count = event_count(
+            &state,
+            community.id,
+            buzz_core::kind::KIND_NIP43_MEMBERSHIP_LIST as i32,
+        )
+        .await;
+        let code = mint_code(
+            state.clone(),
+            &host,
+            &owner,
+            serde_json::json!({ "max_uses": 1 }),
+        )
+        .await;
+        let claim_body = serde_json::json!({ "code": code }).to_string();
+
+        let response = post_json(
+            state.clone(),
+            &host,
+            "/api/invites/claim",
+            &first,
+            claim_body.clone(),
+        )
+        .await;
+        assert_eq!(response.status(), StatusCode::OK);
+        assert_eq!(
+            read_json(response)
+                .await
+                .get("status")
+                .and_then(Value::as_str),
+            Some("joined")
+        );
+        let delta_count = event_count(
+            &state,
+            community.id,
+            buzz_core::kind::KIND_NIP43_MEMBER_ADDED as i32,
+        )
+        .await;
+        let list_count = event_count(
+            &state,
+            community.id,
+            buzz_core::kind::KIND_NIP43_MEMBERSHIP_LIST as i32,
+        )
+        .await;
+        assert_eq!(delta_count, before_delta_count + 1);
+        assert_eq!(list_count, before_list_count + 1);
+
+        let response = post_json(
+            state.clone(),
+            &host,
+            "/api/invites/claim",
+            &first,
+            claim_body.clone(),
+        )
+        .await;
+        assert_eq!(response.status(), StatusCode::OK);
+        assert_eq!(
+            read_json(response)
+                .await
+                .get("status")
+                .and_then(Value::as_str),
+            Some("already_member")
+        );
+        assert_eq!(
+            event_count(
+                &state,
+                community.id,
+                buzz_core::kind::KIND_NIP43_MEMBER_ADDED as i32,
+            )
+            .await,
+            delta_count
+        );
+        assert_eq!(
+            event_count(
+                &state,
+                community.id,
+                buzz_core::kind::KIND_NIP43_MEMBERSHIP_LIST as i32,
+            )
+            .await,
+            list_count
+        );
+
+        let response = post_json(
+            state.clone(),
+            &host,
+            "/api/invites/claim",
+            &second,
+            claim_body,
+        )
+        .await;
+        assert_eq!(response.status(), StatusCode::FORBIDDEN);
+        assert_eq!(
+            read_json(response)
+                .await
+                .get("error")
+                .and_then(Value::as_str),
+            Some("invite_exhausted")
+        );
+        assert_eq!(
+            event_count(
+                &state,
+                community.id,
+                buzz_core::kind::KIND_NIP43_MEMBER_ADDED as i32,
+            )
+            .await,
+            delta_count
+        );
+        assert_eq!(
+            event_count(
+                &state,
+                community.id,
+                buzz_core::kind::KIND_NIP43_MEMBERSHIP_LIST as i32,
+            )
+            .await,
+            list_count
+        );
+    }
+
     #[tokio::test]
     #[ignore = "requires Postgres"]
     async fn owner_mints_and_new_pubkey_claims() {
diff --git a/crates/buzz-relay/src/config.rs b/crates/buzz-relay/src/config.rs
index 47030dcf3f..a1691349d6 100644
--- a/crates/buzz-relay/src/config.rs
+++ b/crates/buzz-relay/src/config.rs
@@ -64,6 +64,14 @@ pub struct Config {
     /// pod is only 4 — small enough that rate-limit checks, presence, and
     /// pub/sub publishes queue behind each other under load.
     pub redis_pool_size: usize,
+    /// Maximum connections in the Postgres writer/reader pools. Defaults to 50.
+    ///
+    /// The `buzz-db` default of 20 was sized for a handful of pods against
+    /// `max_connections=100`. Against Aurora (~5,000 connections) that cap
+    /// is the binding constraint: a burst of concurrent handlers exhausts
+    /// the per-pod pool and requests fail on acquire timeout while the
+    /// database sits idle.
+    pub db_pool_size: u32,
     /// Public WebSocket URL of this relay, advertised in NIP-11.
     pub relay_url: String,
     /// Public WebSocket URL of the dedicated device-pairing relay, when configured.
@@ -424,6 +432,12 @@ impl Config {
             .filter(|&v| v > 0)
             .unwrap_or(16);
 
+        let db_pool_size = std::env::var("BUZZ_DB_POOL_SIZE")
+            .ok()
+            .and_then(|v| v.parse::<u32>().ok())
+            .filter(|&v| v > 0)
+            .unwrap_or(50);
+
         let relay_url =
             std::env::var("RELAY_URL").unwrap_or_else(|_| "ws://localhost:3000".to_string());
 
@@ -875,6 +889,7 @@ impl Config {
             read_database_url,
             redis_url,
             redis_pool_size,
+            db_pool_size,
             relay_url,
             pairing_relay_url,
             max_connections,
@@ -942,6 +957,7 @@ mod tests {
         assert!(!config.database_url.is_empty());
         assert!(!config.redis_url.is_empty());
         assert_eq!(config.redis_pool_size, 16);
+        assert_eq!(config.db_pool_size, 50);
         assert!(config.max_connections > 0);
         assert!(config.send_buffer_size > 0);
         assert_eq!(config.max_frame_bytes, DEFAULT_MAX_FRAME_BYTES);
@@ -1009,6 +1025,31 @@ mod tests {
         assert_eq!(junk, 16, "unparsable value must fall back to the default");
     }
 
+    #[test]
+    fn db_pool_size_env_override_and_invalid_fallback() {
+        let _guard = ENV_MUTEX.lock().unwrap();
+        let previous = std::env::var_os("BUZZ_DB_POOL_SIZE");
+
+        std::env::set_var("BUZZ_DB_POOL_SIZE", "80");
+        let overridden = Config::from_env().expect("config").db_pool_size;
+
+        std::env::set_var("BUZZ_DB_POOL_SIZE", "0");
+        let zero = Config::from_env().expect("config").db_pool_size;
+
+        std::env::set_var("BUZZ_DB_POOL_SIZE", "not-a-number");
+        let junk = Config::from_env().expect("config").db_pool_size;
+
+        if let Some(value) = previous {
+            std::env::set_var("BUZZ_DB_POOL_SIZE", value);
+        } else {
+            std::env::remove_var("BUZZ_DB_POOL_SIZE");
+        }
+
+        assert_eq!(overridden, 80);
+        assert_eq!(zero, 50, "zero must fall back to the default");
+        assert_eq!(junk, 50, "unparsable value must fall back to the default");
+    }
+
     #[test]
     fn read_database_url_unset_or_blank_is_none() {
         let _guard = ENV_MUTEX.lock().unwrap();
diff --git a/crates/buzz-relay/src/handlers/command_executor.rs b/crates/buzz-relay/src/handlers/command_executor.rs
index bd3eff4de9..2d82736807 100644
--- a/crates/buzz-relay/src/handlers/command_executor.rs
+++ b/crates/buzz-relay/src/handlers/command_executor.rs
@@ -685,6 +685,24 @@ async fn handle_workflow_def(
         .map_err(|e| IngestError::Rejected(format!("invalid: workflow YAML parse error: {e}")))?;
     let workflow_name = extract_tag(event, "name").unwrap_or_else(|| def.name.clone());
 
+    // SEC-006: definitions with exfiltration-capable actions (call_webhook)
+    // require elevated channel authority to save — plain membership is not
+    // enough, because the workflow will forward channel content outward with
+    // the owner's standing authority. Fail-closed on lookup errors.
+    if def.requires_elevated_authority() {
+        let role = state
+            .db
+            .get_member_role(tenant.community(), channel_id, &self_bytes)
+            .await
+            .map_err(|e| IngestError::Internal(format!("error: role check: {e}")))?;
+        if !matches!(role.as_deref(), Some("owner") | Some("admin")) {
+            return Err(IngestError::Rejected(
+                "forbidden: workflows with call_webhook actions require the owner or admin role"
+                    .into(),
+            ));
+        }
+    }
+
     let mut definition_json: serde_json::Value = serde_json::from_str(&definition_json_str)
         .map_err(|e| IngestError::Internal(format!("error: json parse of definition: {e}")))?;
 
@@ -843,6 +861,31 @@ async fn handle_workflow_trigger(
         ));
     }
 
+    // SEC-006: manual triggers must honor the workflow's lifecycle state and
+    // recheck the owner's *current* channel authority before creating a run.
+    // Without this, a disabled workflow — including one disabled because its
+    // owner was removed from the channel — could still be fired by the owner.
+    if !workflow.enabled || workflow.status != buzz_db::workflow::WorkflowStatus::Active {
+        return Err(IngestError::Rejected(
+            "forbidden: workflow is disabled or inactive".into(),
+        ));
+    }
+    let def: buzz_workflow::WorkflowDef = serde_json::from_value(workflow.definition.clone())
+        .map_err(|e| IngestError::Internal(format!("error: corrupt workflow definition: {e}")))?;
+    let Some(wf_channel_id) = workflow.channel_id else {
+        // No channel scope means no channel authority to verify — fail closed.
+        return Err(IngestError::Rejected(
+            "forbidden: workflow has no channel scope".into(),
+        ));
+    };
+    state
+        .workflow_engine
+        .check_owner_authority(community_id, wf_channel_id, &workflow.owner_pubkey, &def)
+        .await
+        .map_err(|_| {
+            IngestError::Rejected("forbidden: not authorized to trigger this workflow".into())
+        })?;
+
     // Persist the command event under the workflow channel even though the
     // trigger event itself only carries the workflow UUID. Storing channel
     // triggers as global events leaks workflow IDs to unrelated relay members.
diff --git a/crates/buzz-relay/src/handlers/ingest.rs b/crates/buzz-relay/src/handlers/ingest.rs
index 497adc6c73..a30b0e714d 100644
--- a/crates/buzz-relay/src/handlers/ingest.rs
+++ b/crates/buzz-relay/src/handlers/ingest.rs
@@ -183,6 +183,19 @@ pub enum IngestError {
     Internal(String),
 }
 
+fn map_relay_admin_error(error: super::relay_admin::RelayAdminError) -> IngestError {
+    use super::relay_admin::RelayAdminError;
+    match error {
+        // Same wire prefix and HTTP status (403) as every other durable
+        // restriction refusal — see the write-path gate below and `auth.rs`.
+        RelayAdminError::Banned => {
+            IngestError::AuthFailed("blocked: you are banned from this community".to_string())
+        }
+        RelayAdminError::Rejected(reason) => IngestError::Rejected(format!("invalid: {reason}")),
+        RelayAdminError::Internal(reason) => IngestError::Internal(format!("error: {reason}")),
+    }
+}
+
 fn map_push_accept_error(error: super::push_lease::AcceptError) -> IngestError {
     match error {
         super::push_lease::AcceptError::Validation(reason) => {
@@ -1624,7 +1637,10 @@ async fn ingest_event_inner(
     // is the durable backstop the fan-out's best-effort delivery relies on.
     // Moderation commands enforce bans inside their handler and remain exempt
     // here only so timeouts do not disarm the tool used to lift them. Relay-admin
-    // commands retain their separate authorization policy.
+    // commands (9030–9033) are exempt for the same reason — a timed-out admin
+    // must still be able to administer the roster — and likewise enforce the
+    // durable ban inside `relay_admin::handle_relay_admin_event`. Any kind added
+    // to this exemption owes the same handler-local ban check.
     //
     // Scope: this gate checks the *authoring* pubkey only, with no NIP-OA
     // owner→agent cascade. That cascade lives at the auth seam for bans, where
@@ -1831,10 +1847,13 @@ async fn ingest_event_inner(
     }
 
     // Handled directly — these mutate relay_members and do NOT get stored.
+    // The handler enforces the durable community ban itself: the write-path
+    // gate above exempts relay-admin kinds so timed-out admins keep their
+    // administrative capability, which leaves bans to the handler.
     if is_relay_admin_kind(event.kind.as_u16() as u32) {
         crate::handlers::relay_admin::handle_relay_admin_event(tenant, state, &event)
             .await
-            .map_err(|e| IngestError::Rejected(format!("invalid: {e}")))?;
+            .map_err(map_relay_admin_error)?;
         return Ok(IngestResult {
             event_id: event_id_hex,
             accepted: true,
@@ -2542,6 +2561,62 @@ mod tests {
     };
     use nostr::{EventBuilder, Kind};
 
+    /// A banned relay admin must be refused with the same wire prefix and
+    /// transport status as every other durable-restriction refusal:
+    /// `blocked:` and (via `bridge.rs`'s `AuthFailed` arm) HTTP 403 — never
+    /// `invalid:`/400, which reads as "your request was malformed" and lets a
+    /// client retry-loop against an authorization decision.
+    #[test]
+    fn relay_admin_ban_maps_to_blocked_auth_failure() {
+        let mapped = map_relay_admin_error(super::super::relay_admin::RelayAdminError::Banned);
+        match mapped {
+            IngestError::AuthFailed(msg) => {
+                assert_eq!(msg, "blocked: you are banned from this community");
+            }
+            other => panic!("banned admin must map to AuthFailed (HTTP 403), got {other:?}"),
+        }
+    }
+
+    /// Validation/authorization failures keep the pre-existing `invalid:`
+    /// prefix and 400 status — this is the arm the whole 9030-series relied on
+    /// before the ban category existed, so it must not regress.
+    #[test]
+    fn relay_admin_rejection_keeps_invalid_prefix() {
+        let mapped = map_relay_admin_error(super::super::relay_admin::RelayAdminError::Rejected(
+            "actor not authorized: must be admin or owner".to_string(),
+        ));
+        match mapped {
+            IngestError::Rejected(msg) => {
+                assert_eq!(
+                    msg, "invalid: actor not authorized: must be admin or owner",
+                    "existing relay-admin rejections must keep their exact wire text"
+                );
+            }
+            other => panic!("validation failure must map to Rejected, got {other:?}"),
+        }
+    }
+
+    /// A restriction-lookup outage is a server fault, not a client one. It
+    /// must fail closed as `error:`/500 so a Postgres blip can neither admit a
+    /// banned admin nor be reported to an innocent one as a bad request.
+    #[test]
+    fn relay_admin_internal_maps_to_error_not_client_fault() {
+        let mapped = map_relay_admin_error(super::super::relay_admin::RelayAdminError::Internal(
+            "internal error checking restriction state: pool timed out".to_string(),
+        ));
+        match mapped {
+            IngestError::Internal(msg) => {
+                assert!(
+                    msg.starts_with("error: "),
+                    "internal failures need the `error:` NIP-01 prefix, got {msg:?}"
+                );
+            }
+            other => {
+                panic!("restriction DB failure must map to Internal (HTTP 500), got {other:?}")
+            }
+        }
+    }
+
     #[derive(Debug, Default)]
     struct VecTracer {
         steps: Mutex<Vec<TraceStep>>,
diff --git a/crates/buzz-relay/src/handlers/relay_admin.rs b/crates/buzz-relay/src/handlers/relay_admin.rs
index 840d9dcfe5..3f58a9c2aa 100644
--- a/crates/buzz-relay/src/handlers/relay_admin.rs
+++ b/crates/buzz-relay/src/handlers/relay_admin.rs
@@ -94,8 +94,92 @@ fn validate_workspace_icon(icon: &str) -> Result<(), String> {
     Ok(())
 }
 
+/// A relay-admin command failure, carrying the *category* of the failure so
+/// the ingest seam can map it to the right NIP-01 prefix and HTTP status.
+///
+/// The category is part of the security contract, not cosmetics: a ban must
+/// surface as `blocked:` / HTTP 403 (like every other durable-restriction
+/// refusal), and a restriction-lookup outage must surface as a 500 rather than
+/// a client-side 400 that reads as "your request was malformed". Mirrors
+/// [`super::push_lease::AcceptError`] and its `map_push_accept_error` seam.
+#[derive(Debug, PartialEq, Eq)]
+pub(super) enum RelayAdminError {
+    /// Sender is under a durable community ban — `blocked:` / HTTP 403.
+    Banned,
+    /// Legacy command rejection — `invalid:` / HTTP 400. This is whatever
+    /// [`execute_relay_admin_command`] returned as a `String`, which is mostly
+    /// validation and authorization but also still includes that function's own
+    /// DB failures. Categorizing those is deliberately out of scope for the ban
+    /// fix, so this arm claims no stronger invariant than "the command body said
+    /// no".
+    Rejected(String),
+    /// Admission could not be decided because the restriction lookup failed —
+    /// `error:` / HTTP 500.
+    Internal(String),
+}
+
+/// Decide whether a durable restriction state admits a relay-admin command.
+///
+/// Ban only, deliberately: a timeout is a write-block on *content*, and
+/// `ingest_event` exempts relay-admin kinds from its durable write-path gate
+/// precisely so restricted-but-not-banned admins retain their administrative
+/// capability. Mirrors `moderation_commands::ensure_actor_not_banned`.
+///
+/// Split out as a pure function so the admission rule itself is unit-testable
+/// without a live relay: the end-to-end HTTP test proves the transport, this
+/// proves the decision.
+fn admits_relay_admin_command(
+    restriction: &buzz_db::moderation::RestrictionState,
+) -> Result<(), RelayAdminError> {
+    if restriction.banned {
+        return Err(RelayAdminError::Banned);
+    }
+    Ok(())
+}
+
 /// Validate and execute a relay admin command (kinds 9030–9033).
 ///
+/// Admission: rejects a sender under a durable community ban before any
+/// command runs. The command itself is executed by
+/// [`execute_relay_admin_command`].
+///
+/// Returns `Ok(())` on success, or a categorized [`RelayAdminError`].
+pub(super) async fn handle_relay_admin_event(
+    tenant: &TenantContext,
+    state: &Arc<AppState>,
+    event: &Event,
+) -> Result<(), RelayAdminError> {
+    // A ban is an admission boundary, not only a WebSocket-auth check. HTTP
+    // NIP-98 requests and already-authenticated sockets reach this handler
+    // without passing through a fresh NIP-42 challenge, and `ingest_event`
+    // exempts relay-admin kinds from its durable write-path gate so a *timed
+    // out* admin can still administer the roster. That exemption is ban-blind,
+    // so the ban must be enforced here or not at all: a banned admin otherwise
+    // keeps mutating `relay_members` — the very table `moderation_authz`
+    // derives moderator capability from — until someone manually deletes the
+    // row. Mirrors `moderation_commands.rs`, which defends the same boundary
+    // for 9040–9044, and holds that file's stated invariant that a direct
+    // command handler rejects a banned actor on every transport.
+    //
+    // This gate wraps execution rather than opening it so no future early
+    // return inside the command body can precede it.
+    let restriction = state
+        .db
+        .moderation_restriction_state(tenant.community(), &event.pubkey.to_bytes())
+        .await
+        // Fail closed: a DB blip must never admit a banned admin.
+        .map_err(|e| {
+            RelayAdminError::Internal(format!("internal error checking restriction state: {e}"))
+        })?;
+    admits_relay_admin_command(&restriction)?;
+
+    execute_relay_admin_command(tenant, state, event)
+        .await
+        .map_err(RelayAdminError::Rejected)
+}
+
+/// Execute an already-admitted relay admin command.
+///
 /// The handler:
 /// 1. Extracts the target pubkey from the `["p", ...]` tag.
 /// 2. Extracts the role from the `["role", ...]` tag (kinds 9030 and 9032).
@@ -103,9 +187,11 @@ fn validate_workspace_icon(icon: &str) -> Result<(), String> {
 /// 4. Enforces the permission matrix.
 /// 5. Applies the change via the DB.
 ///
-/// Returns `Ok(())` on success.  Returns `Err(msg)` — where `msg` is a
-/// human-readable rejection reason — on any validation failure.
-pub async fn handle_relay_admin_event(
+/// Returns `Ok(())` on success.  Returns `Err(msg)` — where `msg` is the
+/// legacy rejection reason — on any failure. This body does not distinguish
+/// validation failures from execution DB failures; both surface as `Err(msg)`
+/// and are categorised by the caller as [`RelayAdminError::Rejected`].
+async fn execute_relay_admin_command(
     tenant: &TenantContext,
     state: &Arc<AppState>,
     event: &Event,
@@ -349,6 +435,46 @@ mod tests {
     use super::*;
     use nostr::{EventBuilder, Keys, Kind, Tag};
 
+    /// The vulnerability this file's ban gate closes: `ingest_event` exempts
+    /// relay-admin kinds 9030–9033 from its durable write-path restriction
+    /// gate, so a **banned** admin could add/remove relay members and change
+    /// the workspace icon over signed NIP-98 `POST /events`. Deleting the
+    /// admission check must fail here, in the default (non-ignored) suite.
+    #[test]
+    fn banned_actor_is_not_admitted_to_a_relay_admin_command() {
+        let banned = buzz_db::moderation::RestrictionState {
+            banned: true,
+            muted_until: None,
+        };
+        assert_eq!(
+            admits_relay_admin_command(&banned),
+            Err(RelayAdminError::Banned),
+            "a durably banned admin must never reach a relay-admin command"
+        );
+    }
+
+    /// The counter-invariant, and the reason the ingest exemption exists at
+    /// all: a timeout restricts *content* writes, not administrative
+    /// capability. Widening this gate to timeouts would silently change policy.
+    #[test]
+    fn timed_out_actor_is_still_admitted() {
+        let timed_out = buzz_db::moderation::RestrictionState {
+            banned: false,
+            muted_until: Some(chrono::Utc::now() + chrono::Duration::minutes(5)),
+        };
+        assert!(
+            admits_relay_admin_command(&timed_out).is_ok(),
+            "a timed-out admin must still administer the roster"
+        );
+    }
+
+    #[test]
+    fn unrestricted_actor_is_admitted() {
+        assert!(
+            admits_relay_admin_command(&buzz_db::moderation::RestrictionState::default()).is_ok()
+        );
+    }
+
     /// Build a minimal signed Event with the given kind and tags.
     /// The pubkey will be randomly generated — sufficient for tag extraction tests.
     fn make_test_event(kind: u16, tags: Vec<Vec<&'static str>>) -> Event {
diff --git a/crates/buzz-relay/src/handlers/side_effects.rs b/crates/buzz-relay/src/handlers/side_effects.rs
index 3112e9a559..65d04ef0ba 100644
--- a/crates/buzz-relay/src/handlers/side_effects.rs
+++ b/crates/buzz-relay/src/handlers/side_effects.rs
@@ -51,6 +51,52 @@ async fn evict_live_channel_subscriptions(
     }
 }
 
+/// Durably disable a departing member's workflows in the channel (SEC-006).
+///
+/// A workflow runs with its owner's standing authority; once the owner is no
+/// longer a member (removed via kind 9001 or left via kind 9022) their
+/// workflows must stop firing on every path — event triggers, the scheduler,
+/// manual triggers, and the webhook endpoint all honor `enabled = FALSE`.
+/// The per-fire authority gate in `buzz-workflow` is the fail-closed backstop;
+/// this makes the revocation durable and immediately visible.
+///
+/// Failures are logged, not propagated: membership removal has already been
+/// committed, and the per-fire gate still denies a removed owner even if this
+/// disable write is lost.
+async fn disable_departed_member_workflows(
+    tenant: &TenantContext,
+    state: &Arc<AppState>,
+    channel_id: Uuid,
+    target_pubkey: &[u8],
+) {
+    match state
+        .db
+        .disable_workflows_for_owner_in_channel(tenant.community(), channel_id, target_pubkey)
+        .await
+    {
+        Ok(0) => {}
+        Ok(n) => {
+            tracing::info!(
+                channel = %channel_id,
+                owner = %hex::encode(target_pubkey),
+                disabled = n,
+                "Disabled departed member's workflows"
+            );
+            state
+                .workflow_engine
+                .invalidate_channel_workflows(tenant.community(), channel_id);
+        }
+        Err(e) => {
+            warn!(
+                channel = %channel_id,
+                owner = %hex::encode(target_pubkey),
+                error = %e,
+                "Failed to disable departed member's workflows — per-fire authority gate still denies"
+            );
+        }
+    }
+}
+
 /// Close every live channel-scoped subscription on `conn_id`, removing them from
 /// the connection's local map and sending `CLOSED restricted` for each.
 async fn evict_conn_channel_subscriptions(
@@ -291,35 +337,39 @@ pub async fn validate_admin_event(
 
     match kind {
         9000 => {
-            // Validate role tag if present
-            let role_str = extract_tag_value(event, "role").unwrap_or_else(|| "member".to_string());
-            if role_str.parse::<buzz_db::channel::MemberRole>().is_err() {
-                return Err(anyhow::anyhow!("invalid role: {role_str}"));
-            }
+            // An absent role tag means "no role change requested": for an existing
+            // member that preserves the role they already hold, and only defaults
+            // to Member for a genuinely new member. Defaulting unconditionally to
+            // Member made a bare self-targeted PUT_USER silently demote an owner.
+            let role_str = extract_tag_value(event, "role");
+            let requested_role = match role_str {
+                Some(ref s) => match s.parse::<buzz_db::channel::MemberRole>() {
+                    Ok(r) => Some(r),
+                    Err(_) => return Err(anyhow::anyhow!("invalid role: {s}")),
+                },
+                None => None,
+            };
+
+            let members = state.db.get_members(tenant.community(), channel_id).await?;
+            let actor_role: Option<buzz_db::channel::MemberRole> = members
+                .iter()
+                .find(|m| m.pubkey == actor_bytes)
+                .and_then(|m| m.role.parse().ok());
 
             // PUT_USER: open channels allow any authenticated user; private channels
             // require the actor to be an existing member (any role can invite).
             if channel.visibility == "private" {
-                let members = state.db.get_members(tenant.community(), channel_id).await?;
-                let actor_member = members.iter().find(|m| m.pubkey == actor_bytes);
-                match actor_member {
-                    Some(_) => {}
-                    None => return Err(anyhow::anyhow!("actor not authorized")),
+                if actor_role.is_none() {
+                    return Err(anyhow::anyhow!("actor not authorized"));
                 }
 
                 // Only owners/admins may grant elevated roles.
-                let role: buzz_db::channel::MemberRole = role_str.parse().unwrap();
-                if role.is_elevated() {
-                    let actor_role: buzz_db::channel::MemberRole = actor_member
-                        .unwrap()
-                        .role
-                        .parse()
-                        .unwrap_or(buzz_db::channel::MemberRole::Member);
-                    if !actor_role.is_elevated() {
-                        return Err(anyhow::anyhow!(
-                            "only owners/admins may grant elevated roles"
-                        ));
-                    }
+                if requested_role.is_some_and(|r| r.is_elevated())
+                    && !actor_role.is_some_and(|r| r.is_elevated())
+                {
+                    return Err(anyhow::anyhow!(
+                        "only owners/admins may grant elevated roles"
+                    ));
                 }
             }
 
@@ -327,6 +377,39 @@ pub async fn validate_admin_event(
             let target_pubkey =
                 extract_p_tag(event).ok_or_else(|| anyhow::anyhow!("missing p tag"))?;
 
+            // Changing an ACTIVE existing member's role is privileged in both
+            // directions, on every visibility. `get_members` filters
+            // `removed_at IS NULL`, so a soft-removed row is deliberately not an
+            // "existing member" here: its stored role is history, not live
+            // authority, and reactivation is governed by the elevated-granter
+            // check above rather than by the role the row remembers.
+            //
+            // `add_member` is the authority (it also covers the desktop/admin
+            // callers that skip this validator); rejecting here too means the
+            // client gets a real error instead of an OK for an event whose side
+            // effect then fails. Re-adding at the same role stays idempotent —
+            // the huddle bot-add path relies on that.
+            if let Some((target, role)) = members
+                .iter()
+                .find(|m| m.pubkey == target_pubkey)
+                .zip(requested_role)
+                .filter(|(m, role)| m.role != role.as_str())
+            {
+                if !actor_role.is_some_and(|r| r.is_elevated()) {
+                    return Err(anyhow::anyhow!(
+                        "only owners/admins may change an active member's role"
+                    ));
+                }
+                if target.role == "owner"
+                    && role != buzz_db::channel::MemberRole::Owner
+                    && members.iter().filter(|m| m.role == "owner").count() <= 1
+                {
+                    return Err(anyhow::anyhow!(
+                        "cannot demote the last owner — transfer ownership first"
+                    ));
+                }
+            }
+
             // Self-add: always allowed regardless of policy.
             if target_pubkey == actor_bytes {
                 return Ok(());
@@ -1208,10 +1291,22 @@ async fn handle_put_user(
     let channel_id =
         extract_h_tag_channel(event).ok_or_else(|| anyhow::anyhow!("missing h tag"))?;
     let target_pubkey = extract_p_tag(event).ok_or_else(|| anyhow::anyhow!("missing p tag"))?;
-    let role_str = extract_tag_value(event, "role").unwrap_or_else(|| "member".to_string());
-    let role: MemberRole = role_str
-        .parse()
-        .map_err(|_| anyhow::anyhow!("invalid role: {role_str}"))?;
+    // No role tag = no role change: preserve an existing member's current role and
+    // fall back to Member only for a new member. Unconditionally defaulting to
+    // Member let a bare PUT_USER silently demote an existing owner/admin.
+    let role: MemberRole = match extract_tag_value(event, "role") {
+        Some(role_str) => role_str
+            .parse()
+            .map_err(|_| anyhow::anyhow!("invalid role: {role_str}"))?,
+        None => state
+            .db
+            .get_members(tenant.community(), channel_id)
+            .await?
+            .iter()
+            .find(|m| m.pubkey == target_pubkey)
+            .and_then(|m| m.role.parse().ok())
+            .unwrap_or(MemberRole::Member),
+    };
 
     let actor_bytes = event.pubkey.to_bytes().to_vec();
 
@@ -1292,6 +1387,7 @@ async fn handle_remove_user(
         .await?;
     state.invalidate_membership(tenant, channel_id, &target_pubkey);
     evict_live_channel_subscriptions(tenant, state, channel_id, &target_pubkey).await;
+    disable_departed_member_workflows(tenant, state, channel_id, &target_pubkey).await;
 
     let actor_hex = hex::encode(&actor_bytes);
     let target_hex = hex::encode(&target_pubkey);
@@ -1938,6 +2034,7 @@ async fn handle_leave_request(
         .await?;
     state.invalidate_membership(tenant, channel_id, &actor_bytes);
     evict_live_channel_subscriptions(tenant, state, channel_id, &actor_bytes).await;
+    disable_departed_member_workflows(tenant, state, channel_id, &actor_bytes).await;
 
     let actor_hex = hex::encode(&actor_bytes);
     emit_system_message(
diff --git a/crates/buzz-relay/src/invite_token.rs b/crates/buzz-relay/src/invite_token.rs
index 436040c32a..e271f40f0b 100644
--- a/crates/buzz-relay/src/invite_token.rs
+++ b/crates/buzz-relay/src/invite_token.rs
@@ -49,10 +49,10 @@ use buzz_core::tenant::CommunityId;
 type HmacSha256 = Hmac<Sha256>;
 
 /// Default invite lifetime: 72 hours.
-pub const DEFAULT_INVITE_TTL_SECS: u64 = 72 * 60 * 60;
+pub use buzz_core::invite::DEFAULT_INVITE_TTL_SECS;
 
 /// Maximum invite lifetime a mint request may ask for: 30 days.
-pub const MAX_INVITE_TTL_SECS: u64 = 30 * 24 * 60 * 60;
+pub use buzz_core::invite::MAX_INVITE_TTL_SECS;
 
 /// Maximum accepted code length (defense against absurd inputs before any
 /// parsing work happens). A real code is ~200 bytes.
@@ -121,10 +121,11 @@ fn sign_payload(key: &[u8; 32], payload_bytes: &[u8]) -> Vec<u8> {
     mac.finalize().into_bytes().to_vec()
 }
 
-/// Mint an invite code for `community`, expiring `ttl_secs` from now.
+/// Mint a legacy v1 invite code for compatibility tests.
 ///
-/// The role is fixed to `"member"` — elevated roles are granted post-join via
-/// the existing kind:9032 change-role command, never via a bearer link.
+/// Production minting uses database-backed v2 codes. Remove this helper with
+/// v1 claim verification after the compatibility drain window.
+#[cfg(test)]
 pub fn mint_invite(key: &[u8; 32], community: CommunityId, ttl_secs: u64) -> (String, u64) {
     let ttl = ttl_secs.clamp(60, MAX_INVITE_TTL_SECS);
     let expires_at = now_unix() + ttl;
diff --git a/crates/buzz-relay/src/main.rs b/crates/buzz-relay/src/main.rs
index 22101219eb..9e6ca828e0 100644
--- a/crates/buzz-relay/src/main.rs
+++ b/crates/buzz-relay/src/main.rs
@@ -4,6 +4,10 @@ use std::sync::Arc;
 
 use tracing::{error, info, warn};
 use tracing_subscriber::{fmt, prelude::*, EnvFilter};
+
+fn log_env_filter(rust_log: Option<&str>) -> EnvFilter {
+    EnvFilter::new(rust_log.unwrap_or("buzz_relay=info"))
+}
 use uuid::Uuid;
 
 use buzz_audit::AuditService;
@@ -98,6 +102,7 @@ async fn main() -> anyhow::Result<()> {
     // spans under the correct service identity.
     let resource = telemetry::service_resource();
     let tracer_init = telemetry::try_init_tracer(resource.clone());
+    let otel_enabled = matches!(&tracer_init, telemetry::TracerInit::Enabled(_));
     let otel_layer = match &tracer_init {
         telemetry::TracerInit::Enabled(p) => {
             use opentelemetry::trace::TracerProvider as _;
@@ -105,11 +110,26 @@ async fn main() -> anyhow::Result<()> {
         }
         _ => None,
     };
+    let trace_context_lookup = telemetry::TraceContextLookup::default();
+    let trace_context_lookup_layer = otel_enabled.then(|| {
+        trace_context_lookup
+            .clone()
+            .with_filter(tracing_subscriber::filter::LevelFilter::OFF)
+    });
 
     tracing_subscriber::registry()
-        .with(fmt::layer().json().flatten_event(true))
-        .with(EnvFilter::from_default_env().add_directive("buzz_relay=info".parse()?))
-        .with(otel_layer)
+        .with(
+            fmt::layer()
+                .json()
+                .event_format(trace_context_lookup.json_formatter(otel_enabled))
+                .with_filter(log_env_filter(std::env::var("RUST_LOG").ok().as_deref())),
+        )
+        .with(otel_layer.map(|layer| {
+            layer.with_filter(telemetry::otel_env_filter(
+                std::env::var("BUZZ_OTEL_FILTER").ok().as_deref(),
+            ))
+        }))
+        .with(trace_context_lookup_layer)
         .init();
 
     // Log any exporter-build failure now that the subscriber is installed.
@@ -146,6 +166,7 @@ async fn main() -> anyhow::Result<()> {
     let db_config = DbConfig {
         database_url: config.database_url.clone(),
         read_database_url: config.read_database_url.clone(),
+        max_connections: config.db_pool_size,
         ..DbConfig::default()
     };
     let db = Db::new(&db_config).await.map_err(|e| {
@@ -1060,6 +1081,52 @@ async fn main() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[cfg(test)]
+mod env_filter_tests {
+    use super::log_env_filter;
+    use buzz_relay::telemetry::otel_env_filter;
+    use tracing_subscriber::prelude::*;
+
+    #[test]
+    fn unset_enables_datastore_only_for_otel_filter() {
+        let logs = tracing_subscriber::registry().with(log_env_filter(None));
+        tracing::subscriber::with_default(logs, || {
+            assert!(!tracing::enabled!(target: "buzz_datastore", tracing::Level::INFO));
+            assert!(tracing::enabled!(target: "buzz_relay", tracing::Level::INFO));
+        });
+
+        let otel = tracing_subscriber::registry().with(otel_env_filter(None));
+        tracing::subscriber::with_default(otel, || {
+            assert!(tracing::enabled!(target: "buzz_datastore", tracing::Level::INFO));
+        });
+    }
+
+    #[test]
+    fn explicit_datastore_off_is_preserved_alone() {
+        assert_eq!(
+            otel_env_filter(Some("buzz_datastore=off")).to_string(),
+            "buzz_datastore=off"
+        );
+    }
+
+    #[test]
+    fn explicit_datastore_debug_is_preserved_alone() {
+        assert_eq!(
+            otel_env_filter(Some("buzz_datastore=debug")).to_string(),
+            "buzz_datastore=debug"
+        );
+    }
+
+    #[test]
+    fn log_and_otel_filters_are_configured_independently() {
+        assert_eq!(log_env_filter(Some("warn")).to_string(), "warn");
+        assert_eq!(
+            otel_env_filter(Some("buzz_relay=debug")).to_string(),
+            "buzz_relay=debug"
+        );
+    }
+}
+
 async fn run_community_revalidator(
     state: Arc<AppState>,
     period: std::time::Duration,
@@ -1426,6 +1493,20 @@ async fn run_usage_metrics_tick(
             *leader = None;
             return Err(error);
         }
+        let invite_retention_cutoff = chrono::Utc::now() - chrono::Duration::days(30);
+        match state
+            .db
+            .reap_expired_relay_invites(invite_retention_cutoff)
+            .await
+        {
+            Ok(deleted) if deleted > 0 => {
+                info!(deleted, "reaped expired relay invites");
+            }
+            Ok(_) => {}
+            Err(error) => {
+                warn!(error = %error, "failed to reap expired relay invites");
+            }
+        }
         run_storage_sweep_tick(state, emission_scope, &host_map).await;
     }
 
diff --git a/crates/buzz-relay/src/router.rs b/crates/buzz-relay/src/router.rs
index 2af036079f..400ed1dfe3 100644
--- a/crates/buzz-relay/src/router.rs
+++ b/crates/buzz-relay/src/router.rs
@@ -4,8 +4,9 @@ use std::sync::atomic::Ordering;
 use std::sync::Arc;
 
 use axum::{
+    body::Body,
     extract::{ConnectInfo, FromRequest, State, WebSocketUpgrade},
-    http::{HeaderMap, StatusCode},
+    http::{HeaderMap, Request, StatusCode},
     middleware,
     response::{IntoResponse, Json},
     routing::{get, post, put},
@@ -16,7 +17,7 @@ use tower::ServiceExt;
 use tower_http::cors::{AllowOrigin, CorsLayer};
 use tower_http::limit::RequestBodyLimitLayer;
 use tower_http::services::ServeDir;
-use tower_http::trace::TraceLayer;
+use tower_http::trace::{HttpMakeClassifier, TraceLayer};
 
 use crate::api;
 use crate::audio;
@@ -187,10 +188,23 @@ pub fn build_router(state: Arc<AppState>) -> Router {
 
     merged
         .layer(middleware::from_fn(track_metrics))
-        .layer(TraceLayer::new_for_http())
+        .layer(http_trace_layer())
         .layer(build_cors_layer(&state.config.cors_origins))
 }
 
+fn http_trace_layer() -> TraceLayer<HttpMakeClassifier, fn(&Request<Body>) -> tracing::Span> {
+    TraceLayer::new_for_http().make_span_with(make_http_span as fn(&Request<Body>) -> tracing::Span)
+}
+
+fn make_http_span(request: &Request<Body>) -> tracing::Span {
+    tracing::info_span!(
+        target: "buzz_relay",
+        "http.request",
+        otel.kind = "server",
+        http.request.method = %request.method(),
+    )
+}
+
 fn is_admin_spa_path(path: &str) -> bool {
     path == "/"
         || path == "/reports"
@@ -435,9 +449,14 @@ fn build_cors_layer(cors_origins: &[String]) -> CorsLayer {
 mod tests {
     use axum::{routing::get, Router};
     use futures_util::SinkExt;
+    use opentelemetry::trace::TracerProvider as _;
+    use opentelemetry_sdk::trace::{InMemorySpanExporter, SdkTracerProvider};
     use tokio::net::TcpListener;
     use tokio::sync::mpsc;
     use tokio_tungstenite::{connect_async, tungstenite::Message};
+    use tower::ServiceBuilder;
+    use tracing::Instrument as _;
+    use tracing_subscriber::prelude::*;
 
     use super::*;
 
@@ -471,6 +490,60 @@ mod tests {
         assert!(!should_serve_spa("/arbitrary", true));
     }
 
+    #[tokio::test(flavor = "current_thread")]
+    async fn http_and_datastore_spans_are_exported_in_the_same_trace() {
+        let exporter = InMemorySpanExporter::default();
+        let provider = SdkTracerProvider::builder()
+            .with_simple_exporter(exporter.clone())
+            .build();
+        let subscriber = tracing_subscriber::registry().with(
+            tracing_opentelemetry::layer()
+                .with_tracer(provider.tracer("test"))
+                .with_filter(crate::telemetry::otel_env_filter(None)),
+        );
+        let _subscriber_guard = tracing::subscriber::set_default(subscriber);
+        let service = ServiceBuilder::new()
+            .layer(http_trace_layer())
+            .service(tower::service_fn(
+                |_: axum::http::Request<axum::body::Body>| async {
+                    async {}
+                        .instrument(tracing::info_span!(
+                            target: "buzz_datastore",
+                            "SELECT",
+                            otel.kind = "client",
+                            db.system.name = "postgresql",
+                        ))
+                        .await;
+                    Ok::<_, std::convert::Infallible>(axum::response::Response::new(
+                        axum::body::Body::empty(),
+                    ))
+                },
+            ));
+
+        service
+            .oneshot(
+                axum::http::Request::get("/")
+                    .body(axum::body::Body::empty())
+                    .unwrap(),
+            )
+            .await
+            .unwrap();
+
+        provider.force_flush().unwrap();
+        let spans = exporter.get_finished_spans().unwrap();
+        let http = spans
+            .iter()
+            .find(|span| span.name == "http.request")
+            .unwrap();
+        let datastore = spans.iter().find(|span| span.name == "SELECT").unwrap();
+
+        assert_eq!(
+            datastore.span_context.trace_id(),
+            http.span_context.trace_id()
+        );
+        assert_eq!(datastore.parent_span_id, http.span_context.span_id());
+    }
+
     async fn handler_receives_message_with_limit(limit: usize, size: usize) -> bool {
         let (received_tx, mut received_rx) = mpsc::unbounded_channel();
         let app = Router::new().route(
diff --git a/crates/buzz-relay/src/subscription.rs b/crates/buzz-relay/src/subscription.rs
index 68f0fea3c4..7a62188d3a 100644
--- a/crates/buzz-relay/src/subscription.rs
+++ b/crates/buzz-relay/src/subscription.rs
@@ -164,17 +164,30 @@ impl SubscriptionRegistry {
         conn_id: ConnId,
         sub_id: &str,
     ) -> Option<RemovedSubscription> {
-        if let Some(mut conn_subs) = self.subs.get_mut(&conn_id) {
-            if let Some((filters, community_id, channel_id)) = conn_subs.remove(sub_id) {
-                self.remove_from_index(conn_id, sub_id, &filters, community_id, channel_id);
-                metrics::gauge!("buzz_subscriptions_active").decrement(1.0);
-                return Some(RemovedSubscription {
-                    community_id,
-                    channel_id,
-                });
-            }
-        }
-        None
+        self.remove_subscription_inner(conn_id, sub_id, || {})
+    }
+
+    fn remove_subscription_inner<F>(
+        &self,
+        conn_id: ConnId,
+        sub_id: &str,
+        after_remove: F,
+    ) -> Option<RemovedSubscription>
+    where
+        F: FnOnce(),
+    {
+        let mut conn_subs = self.subs.get_mut(&conn_id)?;
+        let (filters, community_id, channel_id) = conn_subs.remove(sub_id)?;
+
+        after_remove();
+        self.remove_from_index(conn_id, sub_id, &filters, community_id, channel_id);
+        drop(conn_subs);
+
+        metrics::gauge!("buzz_subscriptions_active").decrement(1.0);
+        Some(RemovedSubscription {
+            community_id,
+            channel_id,
+        })
     }
 
     /// Remove all subscriptions for a connection and clean up index entries.
@@ -275,15 +288,37 @@ impl SubscriptionRegistry {
                 channel_id,
                 kind: event.event.kind,
             };
-            if let Some(candidates) = self.channel_kind_index.get(&(community_id, key)) {
-                for (conn_id, sub_id) in candidates.iter() {
-                    self.push_match(*conn_id, sub_id, event, &mut results, &mut seen);
+            if let Some(candidates) = self
+                .channel_kind_index
+                .get(&(community_id, key))
+                .map(|entry| entry.value().clone())
+            {
+                for (conn_id, sub_id) in candidates {
+                    self.push_match(
+                        conn_id,
+                        &sub_id,
+                        community_id,
+                        event,
+                        &mut results,
+                        &mut seen,
+                    );
                 }
             }
             // Also check wildcard (channel-only, kindless) index.
-            if let Some(wildcards) = self.channel_wildcard_index.get(&(community_id, channel_id)) {
-                for (conn_id, sub_id) in wildcards.iter() {
-                    self.push_match(*conn_id, sub_id, event, &mut results, &mut seen);
+            if let Some(wildcards) = self
+                .channel_wildcard_index
+                .get(&(community_id, channel_id))
+                .map(|entry| entry.value().clone())
+            {
+                for (conn_id, sub_id) in wildcards {
+                    self.push_match(
+                        conn_id,
+                        &sub_id,
+                        community_id,
+                        event,
+                        &mut results,
+                        &mut seen,
+                    );
                 }
             }
         } else {
@@ -296,24 +331,54 @@ impl SubscriptionRegistry {
                     kind: event.event.kind,
                     p,
                 };
-                if let Some(candidates) = self.global_p_kind_index.get(&key) {
-                    for (conn_id, sub_id) in candidates.iter() {
-                        self.push_match(*conn_id, sub_id, event, &mut results, &mut seen);
+                if let Some(candidates) = self
+                    .global_p_kind_index
+                    .get(&key)
+                    .map(|entry| entry.value().clone())
+                {
+                    for (conn_id, sub_id) in candidates {
+                        self.push_match(
+                            conn_id,
+                            &sub_id,
+                            community_id,
+                            event,
+                            &mut results,
+                            &mut seen,
+                        );
                     }
                 }
             }
             if let Some(candidates) = self
                 .global_kind_index
                 .get(&(community_id, event.event.kind))
+                .map(|entry| entry.value().clone())
             {
-                for (conn_id, sub_id) in candidates.iter() {
-                    self.push_match(*conn_id, sub_id, event, &mut results, &mut seen);
+                for (conn_id, sub_id) in candidates {
+                    self.push_match(
+                        conn_id,
+                        &sub_id,
+                        community_id,
+                        event,
+                        &mut results,
+                        &mut seen,
+                    );
                 }
             }
             // Also check global wildcard (kindless global subs).
-            if let Some(wildcards) = self.global_wildcard_index.get(&community_id) {
-                for (conn_id, sub_id) in wildcards.iter() {
-                    self.push_match(*conn_id, sub_id, event, &mut results, &mut seen);
+            if let Some(wildcards) = self
+                .global_wildcard_index
+                .get(&community_id)
+                .map(|entry| entry.value().clone())
+            {
+                for (conn_id, sub_id) in wildcards {
+                    self.push_match(
+                        conn_id,
+                        &sub_id,
+                        community_id,
+                        event,
+                        &mut results,
+                        &mut seen,
+                    );
                 }
             }
         }
@@ -370,13 +435,20 @@ impl SubscriptionRegistry {
         &self,
         conn_id: ConnId,
         sub_id: &str,
+        community_id: CommunityId,
         event: &StoredEvent,
         results: &mut Vec<(ConnId, SubId)>,
         seen: &mut HashSet<(ConnId, SubId)>,
     ) {
         if let Some(conn_subs) = self.subs.get(&conn_id) {
-            if let Some((filters, _, _)) = conn_subs.get(sub_id) {
-                if filters_match(filters, event) {
+            if let Some((filters, sub_community_id, sub_channel_id)) = conn_subs.get(sub_id) {
+                // Candidate snapshots can become stale while a same-ID replacement
+                // moves the subscription. Re-check its authoritative scope before
+                // matching so an old index entry cannot deliver across scopes.
+                if *sub_community_id == community_id
+                    && *sub_channel_id == event.channel_id
+                    && filters_match(filters, event)
+                {
                     let entry = (conn_id, sub_id.to_string());
                     if seen.insert(entry.clone()) {
                         results.push(entry);
@@ -576,6 +648,8 @@ mod tests {
     use buzz_core::StoredEvent;
     use chrono::Utc;
     use nostr::{EventBuilder, Keys, Kind, Tag};
+    use std::sync::Arc;
+    use std::time::{Duration, Instant};
 
     fn make_stored_event(kind: Kind, channel_id: Option<Uuid>) -> StoredEvent {
         let keys = Keys::generate();
@@ -629,6 +703,141 @@ mod tests {
         assert!(matches.is_empty());
     }
 
+    #[test]
+    fn test_subscription_removal_cannot_delete_replacement_index() {
+        let registry = Arc::new(SubscriptionRegistry::new());
+        let conn_id = Uuid::new_v4();
+        let channel_id = Uuid::new_v4();
+        let sub_id = "same-id".to_string();
+        let filters = vec![Filter::new().kind(Kind::TextNote)];
+        registry.register(conn_id, sub_id.clone(), filters.clone(), Some(channel_id));
+
+        let (removed_tx, removed_rx) = std::sync::mpsc::sync_channel(0);
+        let (resume_tx, resume_rx) = std::sync::mpsc::sync_channel(0);
+        let remove_registry = Arc::clone(&registry);
+        let remove_sub_id = sub_id.clone();
+        let remove = std::thread::spawn(move || {
+            remove_registry.remove_subscription_inner(conn_id, &remove_sub_id, || {
+                removed_tx.send(()).expect("signal authoritative removal");
+                resume_rx.recv().expect("resume index cleanup");
+            })
+        });
+
+        removed_rx.recv().expect("old subscription removed");
+
+        let (registered_tx, registered_rx) = std::sync::mpsc::sync_channel(0);
+        let register_registry = Arc::clone(&registry);
+        let register_sub_id = sub_id.clone();
+        let register = std::thread::spawn(move || {
+            register_registry.register(conn_id, register_sub_id, filters, Some(channel_id));
+            registered_tx
+                .send(())
+                .expect("signal replacement registration");
+        });
+
+        let replacement_finished_early = registered_rx
+            .recv_timeout(Duration::from_millis(100))
+            .is_ok();
+        resume_tx.send(()).expect("resume old cleanup");
+        remove.join().expect("removal thread completes");
+        if !replacement_finished_early {
+            registered_rx
+                .recv_timeout(Duration::from_secs(1))
+                .expect("replacement registration completes");
+        }
+        register.join().expect("registration thread completes");
+        assert!(
+            !replacement_finished_early,
+            "replacement must wait until old index cleanup is complete"
+        );
+
+        let event = make_stored_event(Kind::TextNote, Some(channel_id));
+        assert_eq!(
+            registry.fan_out(&event),
+            vec![(conn_id, sub_id)],
+            "replacement must remain reachable through its index"
+        );
+    }
+
+    #[test]
+    fn test_stale_candidate_snapshot_does_not_cross_subscription_scope() {
+        let registry = SubscriptionRegistry::new();
+        let conn_id = Uuid::new_v4();
+        let channel_a = Uuid::new_v4();
+        let channel_b = Uuid::new_v4();
+        let sub_id = "same-id".to_string();
+        let filters = vec![Filter::new().kind(Kind::TextNote)];
+        registry.register(conn_id, sub_id.clone(), filters.clone(), Some(channel_a));
+
+        // Reproduce fan-out's unlocked candidate snapshot, then move the same
+        // subscription ID before the authoritative subscription lookup.
+        let key = IndexKey {
+            channel_id: channel_a,
+            kind: Kind::TextNote,
+        };
+        let candidates = registry
+            .channel_kind_index
+            .get(&(test_community(), key))
+            .expect("channel A candidate exists")
+            .value()
+            .clone();
+        registry.register(conn_id, sub_id, filters, Some(channel_b));
+
+        let event = make_stored_event(Kind::TextNote, Some(channel_a));
+        let mut results = Vec::new();
+        let mut seen = HashSet::new();
+        for (candidate_conn_id, candidate_sub_id) in candidates {
+            registry.push_match(
+                candidate_conn_id,
+                &candidate_sub_id,
+                test_community(),
+                &event,
+                &mut results,
+                &mut seen,
+            );
+        }
+
+        assert!(
+            results.is_empty(),
+            "replacement on channel B received channel A event through stale snapshot"
+        );
+    }
+
+    #[test]
+    fn test_fan_out_concurrent_with_subscription_replacement_completes() {
+        let registry = Arc::new(SubscriptionRegistry::new());
+        let conn_id = Uuid::new_v4();
+        let channel_id = Uuid::new_v4();
+        let sub_id = "sub1".to_string();
+        let filters = vec![Filter::new().kind(Kind::TextNote)];
+        registry.register(conn_id, sub_id.clone(), filters.clone(), Some(channel_id));
+        let event = Arc::new(make_stored_event(Kind::TextNote, Some(channel_id)));
+        let deadline = Instant::now() + Duration::from_secs(2);
+
+        let fan_out_registry = Arc::clone(&registry);
+        let fan_out_event = Arc::clone(&event);
+        let fan_out = std::thread::spawn(move || {
+            while Instant::now() < deadline {
+                let _ = fan_out_registry.fan_out(&fan_out_event);
+            }
+        });
+
+        let replace_registry = Arc::clone(&registry);
+        let replace = std::thread::spawn(move || {
+            while Instant::now() < deadline {
+                replace_registry.register(
+                    conn_id,
+                    sub_id.clone(),
+                    filters.clone(),
+                    Some(channel_id),
+                );
+            }
+        });
+
+        fan_out.join().expect("fan-out thread completes");
+        replace.join().expect("replacement thread completes");
+    }
+
     #[test]
     fn test_subscription_registry_remove_connection() {
         let registry = SubscriptionRegistry::new();
diff --git a/crates/buzz-relay/src/telemetry.rs b/crates/buzz-relay/src/telemetry.rs
index 8dd305cd42..91bd92f0f3 100644
--- a/crates/buzz-relay/src/telemetry.rs
+++ b/crates/buzz-relay/src/telemetry.rs
@@ -23,8 +23,166 @@
 //! - `OTEL_TRACES_SAMPLER` (default: `parentbased_always_on`)
 //! - `OTEL_TRACES_SAMPLER_ARG`
 
+use std::{
+    fmt,
+    sync::{Arc, OnceLock},
+};
+
+use opentelemetry::trace::{SpanId, TraceContextExt as _, TraceId};
 use opentelemetry_otlp::ExporterBuildError;
 use opentelemetry_sdk::{resource::EnvResourceDetector, trace::SdkTracerProvider, Resource};
+use tracing::{Event, Subscriber};
+use tracing_subscriber::{
+    fmt::{
+        format::{Format, FormatEvent, FormatFields, Json, Writer},
+        FmtContext,
+    },
+    registry::LookupSpan,
+    EnvFilter, Layer,
+};
+
+/// Captures the subscriber dispatch used to resolve tracing span IDs to their
+/// OpenTelemetry contexts.
+#[derive(Clone, Default)]
+pub struct TraceContextLookup {
+    dispatch: Arc<OnceLock<tracing::dispatcher::WeakDispatch>>,
+}
+
+impl TraceContextLookup {
+    /// Build a JSON formatter backed by this subscriber dispatch lookup.
+    pub fn json_formatter(&self, enabled: bool) -> TraceContextJson {
+        TraceContextJson {
+            inner: tracing_subscriber::fmt::format().json().flatten_event(true),
+            enabled,
+            context_lookup: self.clone(),
+        }
+    }
+
+    fn nearest_otel_context(&self, span_id: &tracing::span::Id) -> Option<opentelemetry::Context> {
+        let dispatch = self.dispatch.get()?.upgrade()?;
+        let registry = dispatch.downcast_ref::<tracing_subscriber::Registry>()?;
+
+        let context = registry.span(span_id)?.scope().find_map(|span| {
+            let context = tracing_opentelemetry::get_otel_context(&span.id(), &dispatch)?;
+            context.span().span_context().is_valid().then_some(context)
+        });
+        context
+    }
+}
+
+impl<S: Subscriber> Layer<S> for TraceContextLookup {
+    fn on_register_dispatch(&self, subscriber: &tracing::Dispatch) {
+        let _ = self.dispatch.set(subscriber.downgrade());
+    }
+}
+
+/// JSON event formatter that adds the active OpenTelemetry trace context.
+///
+/// Datadog recognizes the OpenTelemetry-standard `trace_id` and `span_id`
+/// fields when they are lowercase hexadecimal strings. Events outside a valid
+/// OpenTelemetry span retain the standard `tracing-subscriber` JSON format.
+pub struct TraceContextJson {
+    inner: Format<Json>,
+    enabled: bool,
+    context_lookup: TraceContextLookup,
+}
+
+struct CorrelationWriter<'writer> {
+    inner: Writer<'writer>,
+    trace_id: TraceId,
+    span_id: SpanId,
+    injected: bool,
+}
+
+impl fmt::Write for CorrelationWriter<'_> {
+    fn write_str(&mut self, value: &str) -> fmt::Result {
+        if self.injected {
+            return self.inner.write_str(value);
+        }
+
+        let Some(object_start) = value.find('{') else {
+            return self.inner.write_str(value);
+        };
+        self.inner.write_str(&value[..=object_start])?;
+        write!(
+            self.inner,
+            "\"trace_id\":\"{}\",\"span_id\":\"{}\",",
+            self.trace_id, self.span_id
+        )?;
+        self.injected = true;
+        self.inner.write_str(&value[object_start + 1..])
+    }
+}
+
+impl<S, N> FormatEvent<S, N> for TraceContextJson
+where
+    S: Subscriber + for<'lookup> LookupSpan<'lookup>,
+    N: for<'writer> FormatFields<'writer> + 'static,
+{
+    fn format_event(
+        &self,
+        ctx: &FmtContext<'_, S, N>,
+        mut writer: Writer<'_>,
+        event: &Event<'_>,
+    ) -> fmt::Result {
+        if !self.enabled {
+            return self.inner.format_event(ctx, writer, event);
+        }
+
+        let otel_context = match event.parent() {
+            Some(span_id) => self.context_lookup.nearest_otel_context(span_id),
+            None if event.is_contextual() => Some(opentelemetry::Context::current()),
+            None => None,
+        };
+        let Some(otel_context) = otel_context else {
+            return self.inner.format_event(ctx, writer, event);
+        };
+        let otel_span = otel_context.span();
+        let span_context = otel_span.span_context();
+
+        if !span_context.is_valid() {
+            return self.inner.format_event(ctx, writer, event);
+        }
+
+        let trace_id = span_context.trace_id();
+        let span_id = span_context.span_id();
+
+        // Events may define fields with the correlation names themselves. In
+        // that uncommon case, overwrite them rather than emitting duplicate
+        // JSON keys. Preserve the allocation-free streaming path for ordinary
+        // events.
+        let fields = event.metadata().fields();
+        if fields.field("trace_id").is_some() || fields.field("span_id").is_some() {
+            let mut json = String::new();
+            self.inner
+                .format_event(ctx, Writer::new(&mut json), event)?;
+            let mut object: serde_json::Map<String, serde_json::Value> =
+                serde_json::from_str(json.trim_end()).map_err(|_| fmt::Error)?;
+            object.insert("trace_id".into(), trace_id.to_string().into());
+            object.insert("span_id".into(), span_id.to_string().into());
+            writer.write_str(&serde_json::to_string(&object).map_err(|_| fmt::Error)?)?;
+            return writeln!(writer);
+        }
+
+        let mut writer = CorrelationWriter {
+            inner: writer,
+            trace_id,
+            span_id,
+            injected: false,
+        };
+        self.inner
+            .format_event(ctx, Writer::new(&mut writer), event)
+    }
+}
+
+/// Build the filter for spans exported through OpenTelemetry.
+///
+/// This is intentionally independent from `RUST_LOG`: changing stdout log
+/// verbosity must not remove parent spans from exported traces. Set
+/// `BUZZ_OTEL_FILTER` to override the default targets.
+pub fn otel_env_filter(configured: Option<&str>) -> EnvFilter {
+    EnvFilter::new(configured.unwrap_or("buzz_relay=info,buzz_datastore=info"))
+}
 
 /// Build the OTEL [`Resource`] used by the trace provider.
 ///
@@ -112,8 +270,13 @@ fn classify_exporter_result(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use opentelemetry::KeyValue;
-    use std::sync::Mutex;
+    use opentelemetry::{trace::TracerProvider as _, KeyValue};
+    use opentelemetry_sdk::trace::InMemorySpanExporter;
+    use std::{
+        io,
+        sync::{Arc, Mutex},
+    };
+    use tracing_subscriber::prelude::*;
 
     // Env vars are process-global — serialize tests that mutate them to prevent
     // cross-test races when the suite runs with multiple threads.
@@ -127,6 +290,209 @@ mod tests {
             .map(|(_, v)| v.to_string())
     }
 
+    #[derive(Clone)]
+    struct CapturingWriter(Arc<Mutex<Vec<u8>>>);
+
+    impl io::Write for CapturingWriter {
+        fn write(&mut self, bytes: &[u8]) -> io::Result<usize> {
+            self.0.lock().unwrap().extend_from_slice(bytes);
+            Ok(bytes.len())
+        }
+
+        fn flush(&mut self) -> io::Result<()> {
+            Ok(())
+        }
+    }
+
+    #[test]
+    fn trace_context_json_correlates_nested_span_logs() {
+        let output = Arc::new(Mutex::new(Vec::new()));
+        let output_writer = Arc::clone(&output);
+        let exporter = InMemorySpanExporter::default();
+        let provider = SdkTracerProvider::builder()
+            .with_simple_exporter(exporter.clone())
+            .build();
+        let tracer = provider.tracer("trace-context-json-test");
+        let context_lookup = TraceContextLookup::default();
+
+        let subscriber = tracing_subscriber::registry()
+            .with(
+                tracing_subscriber::fmt::layer()
+                    .json()
+                    .event_format(context_lookup.json_formatter(true))
+                    .with_writer(move || CapturingWriter(Arc::clone(&output_writer)))
+                    .with_filter(tracing_subscriber::filter::filter_fn(|metadata| {
+                        metadata.target() != "stdout_filtered"
+                    })),
+            )
+            .with(
+                tracing_opentelemetry::layer()
+                    .with_tracer(tracer)
+                    .with_filter(tracing_subscriber::filter::filter_fn(|metadata| {
+                        !matches!(metadata.target(), "filtered" | "otel_event_filtered")
+                    })),
+            )
+            .with(
+                context_lookup
+                    .clone()
+                    .with_filter(tracing_subscriber::filter::LevelFilter::OFF),
+            );
+
+        tracing::subscriber::with_default(subscriber, || {
+            let explicit = tracing::info_span!("explicit");
+            let root = tracing::info_span!("root");
+            root.in_scope(|| {
+                tracing::info!(answer = 42, "root event");
+                tracing::info!(
+                    trace_id = "event-provided-trace",
+                    span_id = "event-provided-span",
+                    "colliding-fields event"
+                );
+                tracing::info!(parent: &explicit, "explicit-parent event");
+                tracing::info!(parent: None, "explicit-root event");
+                let child = tracing::info_span!("child");
+                child.in_scope(|| tracing::info!("child event"));
+
+                let filtered_child = tracing::info_span!(target: "filtered", "filtered-child");
+                filtered_child.in_scope(|| tracing::info!("filtered-child event"));
+                tracing::info!(
+                    parent: &filtered_child,
+                    "explicit-filtered-child event"
+                );
+
+                let stdout_filtered_child =
+                    tracing::info_span!(target: "stdout_filtered", "stdout-filtered-child");
+                stdout_filtered_child.in_scope(|| tracing::info!("stdout-filtered-child event"));
+
+                tracing::info!(target: "otel_event_filtered", "otel-filtered event");
+            });
+            let filtered = tracing::info_span!(target: "filtered", "filtered");
+            filtered.in_scope(|| tracing::info!("filtered-span event"));
+            tracing::info!("unscoped event");
+        });
+
+        provider.force_flush().unwrap();
+        let spans = exporter.get_finished_spans().unwrap();
+        let root = spans.iter().find(|span| span.name == "root").unwrap();
+        let explicit = spans.iter().find(|span| span.name == "explicit").unwrap();
+        let child = spans.iter().find(|span| span.name == "child").unwrap();
+        let stdout_filtered_child = spans
+            .iter()
+            .find(|span| span.name == "stdout-filtered-child")
+            .unwrap();
+
+        let bytes = output.lock().unwrap().clone();
+        let output = String::from_utf8(bytes).unwrap();
+        let lines: Vec<&str> = output.lines().collect();
+        let logs: Vec<serde_json::Value> = lines
+            .iter()
+            .map(|line| serde_json::from_str(line).unwrap())
+            .collect();
+        assert_eq!(logs.len(), 11);
+
+        assert_eq!(logs[0]["message"], "root event");
+        assert_eq!(logs[0]["answer"], 42);
+        assert_eq!(
+            logs[0]["trace_id"],
+            root.span_context.trace_id().to_string()
+        );
+        assert_eq!(logs[0]["span_id"], root.span_context.span_id().to_string());
+        assert_eq!(logs[0]["trace_id"].as_str().unwrap().len(), 32);
+        assert_eq!(logs[0]["span_id"].as_str().unwrap().len(), 16);
+
+        assert_eq!(logs[1]["message"], "colliding-fields event");
+        assert_eq!(
+            logs[1]["trace_id"],
+            root.span_context.trace_id().to_string()
+        );
+        assert_eq!(logs[1]["span_id"], root.span_context.span_id().to_string());
+        assert_eq!(lines[1].matches("\"trace_id\":").count(), 1);
+        assert_eq!(lines[1].matches("\"span_id\":").count(), 1);
+
+        assert_eq!(logs[2]["message"], "explicit-parent event");
+        assert_eq!(
+            logs[2]["trace_id"],
+            explicit.span_context.trace_id().to_string()
+        );
+        assert_eq!(
+            logs[2]["span_id"],
+            explicit.span_context.span_id().to_string()
+        );
+
+        assert_eq!(logs[3]["message"], "explicit-root event");
+        assert!(logs[3].get("trace_id").is_none());
+        assert!(logs[3].get("span_id").is_none());
+
+        assert_eq!(logs[4]["message"], "child event");
+        assert_eq!(
+            logs[4]["trace_id"],
+            child.span_context.trace_id().to_string()
+        );
+        assert_eq!(logs[4]["span_id"], child.span_context.span_id().to_string());
+        assert_eq!(logs[0]["trace_id"], logs[4]["trace_id"]);
+
+        assert_eq!(logs[5]["message"], "filtered-child event");
+        assert_eq!(
+            logs[5]["trace_id"],
+            root.span_context.trace_id().to_string()
+        );
+        assert_eq!(logs[5]["span_id"], root.span_context.span_id().to_string());
+
+        assert_eq!(logs[6]["message"], "explicit-filtered-child event");
+        assert_eq!(
+            logs[6]["trace_id"],
+            root.span_context.trace_id().to_string()
+        );
+        assert_eq!(logs[6]["span_id"], root.span_context.span_id().to_string());
+
+        assert_eq!(logs[7]["message"], "stdout-filtered-child event");
+        assert_eq!(
+            logs[7]["trace_id"],
+            stdout_filtered_child.span_context.trace_id().to_string()
+        );
+        assert_eq!(
+            logs[7]["span_id"],
+            stdout_filtered_child.span_context.span_id().to_string()
+        );
+
+        assert_eq!(logs[8]["message"], "otel-filtered event");
+        assert_eq!(
+            logs[8]["trace_id"],
+            root.span_context.trace_id().to_string()
+        );
+        assert_eq!(logs[8]["span_id"], root.span_context.span_id().to_string());
+
+        assert_eq!(logs[9]["message"], "filtered-span event");
+        assert!(logs[9].get("trace_id").is_none());
+        assert!(logs[9].get("span_id").is_none());
+
+        assert_eq!(logs[10]["message"], "unscoped event");
+        assert!(logs[10].get("trace_id").is_none());
+        assert!(logs[10].get("span_id").is_none());
+    }
+
+    #[test]
+    fn trace_context_lookup_does_not_enable_callsites() {
+        let context_lookup = TraceContextLookup::default();
+        let subscriber = tracing_subscriber::registry().with(
+            context_lookup
+                .clone()
+                .with_filter(tracing_subscriber::filter::LevelFilter::OFF),
+        );
+
+        tracing::subscriber::with_default(subscriber, || {
+            assert!(context_lookup
+                .dispatch
+                .get()
+                .and_then(tracing::dispatcher::WeakDispatch::upgrade)
+                .is_some());
+            assert!(!tracing::enabled!(
+                target: "trace_context_lookup_filter_test",
+                tracing::Level::ERROR
+            ));
+        });
+    }
+
     #[test]
     fn test_service_resource_default_when_env_unset() {
         let _guard = ENV_LOCK.lock().unwrap();
diff --git a/crates/buzz-sdk/src/builders.rs b/crates/buzz-sdk/src/builders.rs
index f9e54de9c5..8cc9c8650a 100644
--- a/crates/buzz-sdk/src/builders.rs
+++ b/crates/buzz-sdk/src/builders.rs
@@ -11,8 +11,8 @@ use buzz_core::{
         KIND_GIT_STATUS_CLOSED, KIND_GIT_STATUS_DRAFT, KIND_GIT_STATUS_MERGED,
         KIND_GIT_STATUS_OPEN, KIND_IA_ARCHIVE_REQUEST, KIND_IA_UNARCHIVE_REQUEST,
         KIND_MODERATION_BAN, KIND_MODERATION_RESOLVE_REPORT, KIND_MODERATION_TIMEOUT,
-        KIND_MODERATION_UNBAN, KIND_MODERATION_UNTIMEOUT, KIND_PRESENCE_UPDATE, KIND_WORKFLOW_DEF,
-        KIND_WORKFLOW_TRIGGER,
+        KIND_MODERATION_UNBAN, KIND_MODERATION_UNTIMEOUT, KIND_PRESENCE_UPDATE, KIND_USER_STATUS,
+        KIND_WORKFLOW_DEF, KIND_WORKFLOW_TRIGGER,
     },
     observer::{
         content_looks_like_nip44, OBSERVER_AGENT_TAG, OBSERVER_FRAME_CONTROL, OBSERVER_FRAME_TAG,
@@ -1580,6 +1580,22 @@ pub fn build_presence_update(status: &str) -> Result<EventBuilder, SdkError> {
     Ok(EventBuilder::new(Kind::Custom(KIND_PRESENCE_UPDATE as u16), status).tags(tags))
 }
 
+/// Build a NIP-38 user status event (kind 30315) on the `d:general` coordinate.
+///
+/// `text` becomes the event content and `emoji`, when non-blank, an
+/// `["emoji", ...]` tag; both are trimmed. Blank text with no emoji clears the
+/// status — kind 30315 is parameterized-replaceable, so an event carrying
+/// neither is what clients read as "no status".
+pub fn build_user_status(text: &str, emoji: Option<&str>) -> Result<EventBuilder, SdkError> {
+    let text = text.trim();
+    check_content(text, 64 * 1024)?;
+    let mut tags = vec![tag(&["d", "general"])?];
+    if let Some(emoji) = emoji.map(str::trim).filter(|e| !e.is_empty()) {
+        tags.push(tag(&["emoji", emoji])?);
+    }
+    Ok(EventBuilder::new(Kind::Custom(KIND_USER_STATUS as u16), text).tags(tags))
+}
+
 // ---------------------------------------------------------------------------
 // Community moderation commands (kinds 9040–9044).
 //
@@ -3391,6 +3407,53 @@ mod tests {
         assert!(matches!(err, SdkError::InvalidInput(_)));
     }
 
+    // ── build_user_status ─────────────────────────────────────────────────────
+
+    #[test]
+    fn user_status_carries_text_and_emoji_on_d_general() {
+        let ev = sign(build_user_status("shipping the CLI", Some("🚀")).unwrap());
+        assert_eq!(ev.kind.as_u16(), 30315);
+        assert_eq!(ev.content, "shipping the CLI");
+        assert_eq!(tag_values(&ev, "d"), vec!["general"]);
+        assert_eq!(tag_values(&ev, "emoji"), vec!["🚀"]);
+    }
+
+    #[test]
+    fn user_status_trims_text_and_emoji() {
+        let ev = sign(build_user_status("  heads down  ", Some("  🎧 ")).unwrap());
+        assert_eq!(ev.content, "heads down");
+        assert_eq!(tag_values(&ev, "emoji"), vec!["🎧"]);
+    }
+
+    #[test]
+    fn user_status_omits_blank_emoji_tag() {
+        let ev = sign(build_user_status("on call", Some("   ")).unwrap());
+        assert_eq!(ev.content, "on call");
+        assert!(tag_values(&ev, "emoji").is_empty());
+    }
+
+    #[test]
+    fn user_status_keeps_emoji_when_text_is_blank() {
+        let ev = sign(build_user_status("", Some("🎶")).unwrap());
+        assert_eq!(ev.content, "");
+        assert_eq!(tag_values(&ev, "emoji"), vec!["🎶"]);
+    }
+
+    #[test]
+    fn user_status_clear_shape_is_empty_content_and_d_tag_only() {
+        let ev = sign(build_user_status("", None).unwrap());
+        assert_eq!(ev.kind.as_u16(), 30315);
+        assert_eq!(ev.content, "");
+        assert_eq!(tag_values(&ev, "d"), vec!["general"]);
+        assert_eq!(ev.tags.len(), 1);
+    }
+
+    #[test]
+    fn user_status_rejects_oversize_text() {
+        let err = build_user_status(&"x".repeat(64 * 1024 + 1), None).unwrap_err();
+        assert!(matches!(err, SdkError::ContentTooLarge { .. }));
+    }
+
     // ── build_git_pull_request / build_git_pr_update ──────────────────────────
 
     fn pr_repo() -> GitRepoCoord {
diff --git a/crates/buzz-test-client/tests/e2e_relay.rs b/crates/buzz-test-client/tests/e2e_relay.rs
index 7a7f7e19fa..6f59299ed2 100644
--- a/crates/buzz-test-client/tests/e2e_relay.rs
+++ b/crates/buzz-test-client/tests/e2e_relay.rs
@@ -2475,3 +2475,441 @@ async fn test_reply_ingest_pushes_live_thread_summary() {
 
     client.disconnect().await.expect("disconnect");
 }
+
+/// Read a member's authoritative role from the relay-signed kind:39002 member
+/// list. The relay's own view of membership, not the client's — a kind:9000 can
+/// be `accepted` (stored) while its membership side effect fails, so asserting
+/// on the OK alone cannot see a broken write.
+async fn member_role(url: &str, keys: &Keys, channel_id: &str, pubkey_hex: &str) -> Option<String> {
+    let mut ws = BuzzTestClient::connect(url, keys).await.expect("connect");
+    let sid = sub_id("members");
+    let filter = Filter::new()
+        .kind(Kind::Custom(39002))
+        .custom_tags(SingleLetterTag::lowercase(Alphabet::D), [channel_id]);
+    ws.subscribe(&sid, vec![filter])
+        .await
+        .expect("subscribe 39002");
+    let events = ws
+        .collect_until_eose(&sid, Duration::from_secs(5))
+        .await
+        .expect("39002 EOSE");
+    ws.disconnect().await.ok();
+    // Latest 39002 wins; find this pubkey's tag. Shape is
+    // ["p", pubkey, relay_url, role] (side_effects.rs:1058-1062) — role is
+    // index 3, not 2.
+    events.iter().max_by_key(|e| e.created_at).and_then(|e| {
+        e.tags.iter().find_map(|t| {
+            let p = t.as_slice();
+            (p.len() >= 4 && p[0] == "p" && p[1] == pubkey_hex).then(|| p[3].clone())
+        })
+    })
+}
+
+/// SECURITY REPRO (Dawn): can an unprivileged NON-MEMBER demote the owner of an
+/// OPEN channel to `member` with a single kind:9000? Asserts the reported
+/// vulnerability is FIXED; it fails on vulnerable code.
+#[tokio::test]
+#[ignore]
+async fn test_nip29_put_user_cannot_demote_owner() {
+    let url = relay_url();
+
+    let victim_keys = Keys::generate();
+    let victim_hex = victim_keys.public_key().to_hex();
+    let attacker_keys = Keys::generate();
+
+    // Victim creates an open channel -> victim is seeded as its owner.
+    let channel_id = create_test_channel(&victim_keys).await;
+
+    let before = member_role(&url, &victim_keys, &channel_id, &victim_hex).await;
+    assert_eq!(
+        before.as_deref(),
+        Some("owner"),
+        "victim must start as owner (got {before:?})"
+    );
+
+    // The attack: attacker (not a member, not the creator) publishes
+    // kind:9000 { h=channel, p=victim, role=member }.
+    let mut ws = BuzzTestClient::connect(&url, &attacker_keys)
+        .await
+        .expect("connect as attacker");
+    let event = EventBuilder::new(Kind::Custom(9000), "")
+        .tags([
+            Tag::parse(["h", &channel_id]).unwrap(),
+            Tag::parse(["p", &victim_hex]).unwrap(),
+            Tag::parse(["role", "member"]).unwrap(),
+        ])
+        .sign_with_keys(&attacker_keys)
+        .expect("sign kind 9000");
+    let ok = ws.send_event(event).await.expect("send kind 9000");
+    ws.disconnect().await.ok();
+
+    let after = member_role(&url, &victim_keys, &channel_id, &victim_hex).await;
+    println!(
+        "attacker kind:9000 accepted = {} ({})",
+        ok.accepted, ok.message
+    );
+    println!("victim role before = {before:?}, after = {after:?}");
+
+    assert_eq!(
+        after.as_deref(),
+        Some("owner"),
+        "PRIVESC: unprivileged non-member demoted the channel owner to {after:?}"
+    );
+    assert!(
+        !ok.accepted,
+        "unprivileged non-member's role-demotion kind:9000 must be rejected"
+    );
+}
+
+/// SECURITY REPRO (Dawn), follow-on questions the report asserts but does not test:
+/// after the owner is demoted, (a) can the attacker promote itself to owner, and
+/// (b) can the ex-owner restore its own role? Both must be rejected — which is
+/// exactly what makes the demotion unrecoverable over the relay.
+#[tokio::test]
+#[ignore]
+async fn test_nip29_owner_demotion_recovery_paths() {
+    let url = relay_url();
+
+    let victim_keys = Keys::generate();
+    let victim_hex = victim_keys.public_key().to_hex();
+    let attacker_keys = Keys::generate();
+    let attacker_hex = attacker_keys.public_key().to_hex();
+
+    let channel_id = create_test_channel(&victim_keys).await;
+
+    let put_user = |signer: Keys, target_hex: String, role: &'static str| {
+        let channel_id = channel_id.clone();
+        let url = url.clone();
+        async move {
+            let mut ws = BuzzTestClient::connect(&url, &signer)
+                .await
+                .expect("connect");
+            // `allow_self_tagging` is REQUIRED: EventBuilder otherwise silently
+            // drops any `p` tag matching the signer (nostr-0.44.3
+            // builder.rs:435-449), which would make self-targeted PUT_USER
+            // events fail as "missing p tag" and mask the real verdict.
+            let event = EventBuilder::new(Kind::Custom(9000), "")
+                .allow_self_tagging()
+                .tags([
+                    Tag::parse(["h", &channel_id]).unwrap(),
+                    Tag::parse(["p", &target_hex]).unwrap(),
+                    Tag::parse(["role", role]).unwrap(),
+                ])
+                .sign_with_keys(&signer)
+                .expect("sign kind 9000");
+            let ok = ws.send_event(event).await.expect("send kind 9000");
+            ws.disconnect().await.ok();
+            ok
+        }
+    };
+
+    // Step 1: strip the owner.
+    let demote = put_user(attacker_keys.clone(), victim_hex.clone(), "member").await;
+    println!(
+        "1. attacker demotes owner   -> accepted={} {}",
+        demote.accepted, demote.message
+    );
+
+    // Step 2: attacker tries to make itself owner.
+    let self_promote = put_user(attacker_keys.clone(), attacker_hex.clone(), "owner").await;
+    println!(
+        "2. attacker self->owner     -> accepted={} {}",
+        self_promote.accepted, self_promote.message
+    );
+
+    // Step 3: ex-owner tries to restore itself.
+    let restore = put_user(victim_keys.clone(), victim_hex.clone(), "owner").await;
+    println!(
+        "3. ex-owner restores self   -> accepted={} {}",
+        restore.accepted, restore.message
+    );
+
+    // `accepted` only means the event was stored — the membership side effect can
+    // still fail. Read the authoritative roles back from the relay-signed 39002.
+    let mut ws = BuzzTestClient::connect(&url, &victim_keys)
+        .await
+        .expect("connect");
+    let sid = sub_id("members-final");
+    let filter = Filter::new().kind(Kind::Custom(39002)).custom_tags(
+        SingleLetterTag::lowercase(Alphabet::D),
+        [channel_id.as_str()],
+    );
+    ws.subscribe(&sid, vec![filter])
+        .await
+        .expect("subscribe 39002");
+    let events = ws
+        .collect_until_eose(&sid, Duration::from_secs(5))
+        .await
+        .expect("39002 EOSE");
+    ws.disconnect().await.ok();
+    let latest = events.iter().max_by_key(|e| e.created_at).expect("a 39002");
+    let roles: Vec<(String, String)> = latest
+        .tags
+        .iter()
+        .filter_map(|t| {
+            let p = t.as_slice();
+            (p.len() >= 4 && p[0] == "p").then(|| (p[1].clone(), p[3].clone()))
+        })
+        .collect();
+    let role_of = |hex: &str| {
+        roles
+            .iter()
+            .find(|(pk, _)| pk == hex)
+            .map(|(_, r)| r.clone())
+    };
+    println!("FINAL victim   role = {:?}", role_of(&victim_hex));
+    println!("FINAL attacker role = {:?}", role_of(&attacker_hex));
+    assert_eq!(
+        role_of(&victim_hex).as_deref(),
+        Some("owner"),
+        "owner must retain its role through all three attempts"
+    );
+    assert_eq!(
+        role_of(&attacker_hex),
+        None,
+        "attacker must never gain a role"
+    );
+}
+
+/// SECURITY REPRO (Dawn), finding #2: a kind:9000 PUT_USER with NO `role` tag.
+///
+/// `handle_put_user` used to default an absent role tag to `member`, so a bare
+/// self-targeted PUT_USER silently demoted the sender — no attacker required.
+/// `test_nip29_put_user_self_add_bypasses_policy` sends exactly this event but
+/// asserts only `ok.accepted`, and side-effect failures are logged rather than
+/// surfaced (ingest.rs:2460-2467), so an `accepted` assertion structurally
+/// cannot observe the demotion. This asserts the resulting STATE instead.
+///
+/// TWO owners on purpose. With a sole owner the last-owner guard rejects the
+/// demotion anyway, so the test would pass even with the role-preservation
+/// removed — it would be measuring a different defect's fix. A second owner
+/// disarms that guard, leaving the absent-role-tag handling as the only thing
+/// that can decide the outcome.
+#[tokio::test]
+#[ignore]
+async fn test_nip29_put_user_without_role_tag_preserves_role() {
+    let url = relay_url();
+
+    let owner_a = Keys::generate();
+    let owner_b = Keys::generate();
+    let b_hex = owner_b.public_key().to_hex();
+    let channel_id = create_test_channel(&owner_a).await;
+
+    // owner_a promotes owner_b, so the channel has two owners.
+    let mut ws = BuzzTestClient::connect(&url, &owner_a)
+        .await
+        .expect("connect as owner_a");
+    let promote = EventBuilder::new(Kind::Custom(9000), "")
+        .tags([
+            Tag::parse(["h", &channel_id]).unwrap(),
+            Tag::parse(["p", &b_hex]).unwrap(),
+            Tag::parse(["role", "owner"]).unwrap(),
+        ])
+        .sign_with_keys(&owner_a)
+        .expect("sign promote");
+    let ok = ws.send_event(promote).await.expect("send promote");
+    ws.disconnect().await.ok();
+    assert!(ok.accepted, "promote rejected: {}", ok.message);
+    assert_eq!(
+        member_role(&url, &owner_a, &channel_id, &b_hex)
+            .await
+            .as_deref(),
+        Some("owner"),
+        "owner_b must be a second owner before the probe"
+    );
+
+    // The probe: owner_b sends a bare self-targeted PUT_USER — h + p, no `role`.
+    // `allow_self_tagging` is required or EventBuilder drops the self `p` tag
+    // (nostr-0.44.3 builder.rs:435-449) and the event fails as "missing p tag".
+    let mut ws = BuzzTestClient::connect(&url, &owner_b)
+        .await
+        .expect("connect as owner_b");
+    let bare = EventBuilder::new(Kind::Custom(9000), "")
+        .allow_self_tagging()
+        .tags([
+            Tag::parse(["h", &channel_id]).unwrap(),
+            Tag::parse(["p", &b_hex]).unwrap(),
+        ])
+        .sign_with_keys(&owner_b)
+        .expect("sign bare put_user");
+    let ok = ws.send_event(bare).await.expect("send bare put_user");
+    ws.disconnect().await.ok();
+    assert!(
+        ok.accepted,
+        "self-targeted PUT_USER must stay accepted: {}",
+        ok.message
+    );
+
+    assert_eq!(
+        member_role(&url, &owner_a, &channel_id, &b_hex)
+            .await
+            .as_deref(),
+        Some("owner"),
+        "an absent role tag means no role change — it must not demote an owner"
+    );
+}
+
+/// SECURITY (Dawn), relay-layer guard isolation — the *validator*, not the DB.
+///
+/// The DB guards in `add_member` are what actually stop the privesc, and every
+/// other test here asserts the resulting STATE ("the role didn't change").
+/// That makes them structurally blind to `validate_admin_event`: stubbing out
+/// either relay-side check leaves the whole nip29 suite green, because the DB
+/// still refuses the write and the role is still correct. Verified by mutation
+/// — the relay returns `accepted:true` and logs `Side effect failed: access
+/// denied: ...` while the state assertion happily passes.
+///
+/// The relay guards earn their keep by giving the client an honest
+/// `accepted:false` instead of an OK for an event that silently fails after the
+/// fact. So these two tests assert `accepted == false` — the one observable
+/// only the validator controls — and each is shaped so exactly one guard can
+/// fire.
+///
+/// Guard under test: "only owners/admins may change an active member's role".
+/// TWO owners on purpose, so the last-owner guard cannot fire and take the
+/// credit; a plain member targeting a co-owner leaves the actor check as the
+/// only thing that can reject.
+#[tokio::test]
+#[ignore]
+async fn test_nip29_relay_rejects_role_change_by_unprivileged_actor() {
+    let url = relay_url();
+
+    let owner_a = Keys::generate();
+    let owner_b = Keys::generate();
+    let b_hex = owner_b.public_key().to_hex();
+    let attacker = Keys::generate();
+    let attacker_hex = attacker.public_key().to_hex();
+    let channel_id = create_test_channel(&owner_a).await;
+
+    // owner_a promotes owner_b -> the channel has two owners.
+    let mut ws = BuzzTestClient::connect(&url, &owner_a)
+        .await
+        .expect("connect as owner_a");
+    let promote = EventBuilder::new(Kind::Custom(9000), "")
+        .tags([
+            Tag::parse(["h", &channel_id]).unwrap(),
+            Tag::parse(["p", &b_hex]).unwrap(),
+            Tag::parse(["role", "owner"]).unwrap(),
+        ])
+        .sign_with_keys(&owner_a)
+        .expect("sign promote");
+    let ok = ws.send_event(promote).await.expect("send promote");
+    ws.disconnect().await.ok();
+    assert!(ok.accepted, "promote rejected: {}", ok.message);
+
+    // The attacker joins the open channel as a plain member.
+    let mut ws = BuzzTestClient::connect(&url, &attacker)
+        .await
+        .expect("connect as attacker");
+    let join = EventBuilder::new(Kind::Custom(9000), "")
+        .allow_self_tagging()
+        .tags([
+            Tag::parse(["h", &channel_id]).unwrap(),
+            Tag::parse(["p", &attacker_hex]).unwrap(),
+            Tag::parse(["role", "member"]).unwrap(),
+        ])
+        .sign_with_keys(&attacker)
+        .expect("sign self-join");
+    let ok = ws.send_event(join).await.expect("send self-join");
+    ws.disconnect().await.ok();
+    assert!(ok.accepted, "self-join rejected: {}", ok.message);
+    assert_eq!(
+        member_role(&url, &owner_a, &channel_id, &attacker_hex)
+            .await
+            .as_deref(),
+        Some("member"),
+        "attacker must be an active plain member before the probe"
+    );
+
+    // The probe: a plain member demotes a co-owner. Two owners remain, so only
+    // the actor-authorization guard can reject this.
+    let mut ws = BuzzTestClient::connect(&url, &attacker)
+        .await
+        .expect("connect as attacker");
+    let attack = EventBuilder::new(Kind::Custom(9000), "")
+        .tags([
+            Tag::parse(["h", &channel_id]).unwrap(),
+            Tag::parse(["p", &b_hex]).unwrap(),
+            Tag::parse(["role", "member"]).unwrap(),
+        ])
+        .sign_with_keys(&attacker)
+        .expect("sign attack");
+    let ok = ws.send_event(attack).await.expect("send attack");
+    ws.disconnect().await.ok();
+    println!(
+        "unprivileged co-owner demotion -> accepted={} {}",
+        ok.accepted, ok.message
+    );
+
+    assert!(
+        !ok.accepted,
+        "the relay validator must reject an unprivileged actor's role change, \
+         not accept it and let the side effect fail silently"
+    );
+    assert_eq!(
+        member_role(&url, &owner_a, &channel_id, &b_hex)
+            .await
+            .as_deref(),
+        Some("owner"),
+        "co-owner must keep their role"
+    );
+}
+
+/// SECURITY (Dawn), relay-layer guard isolation — see the test above for why
+/// `accepted` rather than state is the assertion that matters here.
+///
+/// Guard under test: the relay-side last-owner check. The actor is the SOLE
+/// owner demoting themselves, so the actor-authorization guard is satisfied
+/// (an owner is elevated) and cannot mask the result — only the last-owner
+/// check can reject.
+#[tokio::test]
+#[ignore]
+async fn test_nip29_relay_rejects_last_owner_self_demotion() {
+    let url = relay_url();
+
+    let owner = Keys::generate();
+    let owner_hex = owner.public_key().to_hex();
+    let channel_id = create_test_channel(&owner).await;
+
+    assert_eq!(
+        member_role(&url, &owner, &channel_id, &owner_hex)
+            .await
+            .as_deref(),
+        Some("owner"),
+        "creator must be the sole owner before the probe"
+    );
+
+    // The probe: the sole owner demotes themselves. Elevated actor, so the
+    // actor check passes; the last-owner guard is the only thing left.
+    let mut ws = BuzzTestClient::connect(&url, &owner)
+        .await
+        .expect("connect as owner");
+    let demote = EventBuilder::new(Kind::Custom(9000), "")
+        .allow_self_tagging()
+        .tags([
+            Tag::parse(["h", &channel_id]).unwrap(),
+            Tag::parse(["p", &owner_hex]).unwrap(),
+            Tag::parse(["role", "member"]).unwrap(),
+        ])
+        .sign_with_keys(&owner)
+        .expect("sign self-demote");
+    let ok = ws.send_event(demote).await.expect("send self-demote");
+    ws.disconnect().await.ok();
+    println!(
+        "sole-owner self-demotion -> accepted={} {}",
+        ok.accepted, ok.message
+    );
+
+    assert!(
+        !ok.accepted,
+        "the relay validator must reject demoting the last owner, not accept \
+         it and let the side effect fail silently"
+    );
+    assert_eq!(
+        member_role(&url, &owner, &channel_id, &owner_hex)
+            .await
+            .as_deref(),
+        Some("owner"),
+        "the last owner must keep their role"
+    );
+}
diff --git a/crates/buzz-test-client/tests/regression_relay_admin_ban_gate.rs b/crates/buzz-test-client/tests/regression_relay_admin_ban_gate.rs
new file mode 100644
index 0000000000..c37be8ca40
--- /dev/null
+++ b/crates/buzz-test-client/tests/regression_relay_admin_ban_gate.rs
@@ -0,0 +1,377 @@
+//! Regression test for the NIP-43 relay-admin durable-ban bypass
+//! (BUZZ-SEC-007 class, reported 2026-07-27).
+//!
+//! `ingest_event` exempts relay-admin kinds 9030-9033 from its durable
+//! write-path restriction gate so a *timed out* admin keeps its administrative
+//! capability. That exemption was ban-blind, so a **banned** admin could still
+//! add/remove relay members and change the workspace icon via signed NIP-98
+//! `POST /events`. The ban is now enforced inside
+//! `relay_admin::handle_relay_admin_event`; this test pins both halves of that
+//! contract — bans refused, timeouts still admitted.
+//!
+//! Requires a running relay and its Postgres. Ignored by default:
+//!   REPRO_RELAY_HTTP=http://localhost:3999 REPRO_HOST=localhost:3999 \
+//!   DATABASE_URL=postgres://buzz:buzz_dev@localhost:5432/buzz_relay_admin_regression \
+//!   cargo test -p buzz-test-client --test regression_relay_admin_ban_gate \
+//!     -- --ignored --nocapture
+
+use base64::engine::general_purpose::STANDARD as BASE64;
+use base64::Engine;
+use nostr::{EventBuilder, Keys, Kind, Tag};
+use sha2::{Digest, Sha256};
+use uuid::Uuid;
+
+fn http_base() -> String {
+    std::env::var("REPRO_RELAY_HTTP").unwrap_or_else(|_| "http://localhost:3999".into())
+}
+fn host() -> String {
+    std::env::var("REPRO_HOST").unwrap_or_else(|_| "localhost:3999".into())
+}
+fn db_url() -> String {
+    std::env::var("DATABASE_URL").expect("DATABASE_URL required")
+}
+
+fn sha256_hex(b: &[u8]) -> String {
+    hex::encode(Sha256::digest(b))
+}
+
+fn nip98(keys: &Keys, url: &str, body: &str) -> String {
+    let ev = EventBuilder::new(Kind::Custom(27_235), "")
+        .tags(vec![
+            Tag::parse(["u", url]).unwrap(),
+            Tag::parse(["method", "POST"]).unwrap(),
+            Tag::parse(["payload", &sha256_hex(body.as_bytes())]).unwrap(),
+            Tag::parse(["nonce", &Uuid::new_v4().to_string()]).unwrap(),
+        ])
+        .sign_with_keys(keys)
+        .unwrap();
+    format!(
+        "Nostr {}",
+        BASE64.encode(serde_json::to_string(&ev).unwrap())
+    )
+}
+
+async fn post_event(keys: &Keys, event: &nostr::Event) -> (u16, String) {
+    let body = serde_json::to_string(event).unwrap();
+    let signed_url = format!("http://{}/events", host());
+    let r = reqwest::Client::new()
+        .post(format!("{}/events", http_base()))
+        .header("Host", host())
+        .header("Content-Type", "application/json")
+        .header("Authorization", nip98(keys, &signed_url, &body))
+        .body(body)
+        .send()
+        .await
+        .expect("POST /events");
+    let status = r.status().as_u16();
+    (status, r.text().await.unwrap_or_default())
+}
+
+fn signed(keys: &Keys, kind: u16, tags: Vec<Tag>) -> nostr::Event {
+    EventBuilder::new(Kind::Custom(kind), "")
+        .tags(tags)
+        .sign_with_keys(keys)
+        .unwrap()
+}
+
+async fn pool() -> sqlx::Pool<sqlx::Postgres> {
+    sqlx::postgres::PgPoolOptions::new()
+        .max_connections(2)
+        .connect(&db_url())
+        .await
+        .expect("connect Postgres")
+}
+
+async fn community_id(p: &sqlx::Pool<sqlx::Postgres>) -> Uuid {
+    let id = Uuid::new_v4();
+    sqlx::query(
+        "INSERT INTO communities (id, host) VALUES ($1, $2) ON CONFLICT (lower(host)) DO NOTHING",
+    )
+    .bind(id)
+    .bind(host())
+    .execute(p)
+    .await
+    .unwrap();
+    sqlx::query_scalar("SELECT id FROM communities WHERE lower(host) = lower($1)")
+        .bind(host())
+        .fetch_one(p)
+        .await
+        .unwrap()
+}
+
+async fn seed(p: &sqlx::Pool<sqlx::Postgres>, cid: Uuid, keys: &Keys, role: &str) {
+    sqlx::query("INSERT INTO users (community_id, pubkey) VALUES ($1, $2) ON CONFLICT DO NOTHING")
+        .bind(cid)
+        .bind(keys.public_key().to_bytes().to_vec())
+        .execute(p)
+        .await
+        .ok();
+    sqlx::query(
+        "INSERT INTO relay_members (community_id, pubkey, role, added_by) VALUES ($1,$2,$3,NULL) \
+         ON CONFLICT (community_id, pubkey) DO UPDATE SET role = $3, updated_at = now()",
+    )
+    .bind(cid)
+    .bind(keys.public_key().to_hex())
+    .bind(role)
+    .execute(p)
+    .await
+    .unwrap();
+}
+
+/// Post-fix regression bar.
+///
+/// Asserts the full contract rather than just "the exploit stopped":
+/// - banned admin: 403 + exact `blocked:` prefix on 9030/9031/9033, and a
+///   banned *owner* likewise on 9032 (owner-only kind), covering all four
+///   exempt kinds,
+/// - no roster, role, or icon mutation from any of those attempts,
+/// - a *timed-out* admin still reaches relay-admin authorization (the ingest
+///   exemption's whole purpose — the fix must not silently widen to timeouts),
+/// - an unrestricted admin's behaviour is unchanged, mutation included.
+#[tokio::test]
+#[ignore]
+async fn banned_admin_is_refused_but_timed_out_admin_still_administers() {
+    let p = pool().await;
+    let cid = community_id(&p).await;
+
+    let owner = Keys::generate();
+    let banned_owner = Keys::generate();
+    let banned_admin = Keys::generate();
+    let timed_out_admin = Keys::generate();
+    let good_admin = Keys::generate();
+    let victim = Keys::generate();
+    let victim2 = Keys::generate();
+    let victim3 = Keys::generate();
+    let role_target = Keys::generate();
+    // Retained (not generated inline) so the 9030 attempt can be checked for
+    // absence afterward — a planted member is the mutation that attempt buys.
+    let planted = Keys::generate();
+    for (k, r) in [
+        (&owner, "owner"),
+        (&banned_owner, "owner"),
+        (&banned_admin, "admin"),
+        (&timed_out_admin, "admin"),
+        (&good_admin, "admin"),
+        (&victim, "member"),
+        (&victim2, "member"),
+        (&victim3, "member"),
+        (&role_target, "member"),
+    ] {
+        seed(&p, cid, k, r).await;
+    }
+
+    // Owner bans one admin and times out another, through the real 9040/9042
+    // command path.
+    let (s, _) = post_event(
+        &owner,
+        &signed(
+            &owner,
+            9040,
+            vec![Tag::parse(["p", &banned_admin.public_key().to_hex()]).unwrap()],
+        ),
+    )
+    .await;
+    assert_eq!(s, 200, "ban must land");
+    let expiry = (chrono_now() + 3600).to_string();
+    let (s, b) = post_event(
+        &owner,
+        &signed(
+            &owner,
+            9042,
+            vec![
+                Tag::parse(["p", &timed_out_admin.public_key().to_hex()]).unwrap(),
+                Tag::parse(["expiration", &expiry]).unwrap(),
+            ],
+        ),
+    )
+    .await;
+    assert_eq!(s, 200, "timeout must land: {b}");
+
+    // 9032 is owner-only, so its banned case needs a banned *owner*. Whether
+    // one owner may 9040 another is a moderation-policy question independent of
+    // this fix, so the ban row is seeded directly to keep the test pinned to
+    // the admission gate.
+    sqlx::query(
+        "INSERT INTO community_bans (community_id, pubkey, banned, actor_pubkey) \
+         VALUES ($1,$2,true,$3) \
+         ON CONFLICT (community_id, pubkey) DO UPDATE SET banned = true",
+    )
+    .bind(cid)
+    .bind(banned_owner.public_key().to_bytes().to_vec())
+    .bind(owner.public_key().to_bytes().to_vec())
+    .execute(&p)
+    .await
+    .unwrap();
+
+    // ── Banned actors: every relay-admin kind must be 403 + `blocked:`. ──
+    for (actor, kind, tags, label) in [
+        (
+            &banned_admin,
+            9031u16,
+            vec![Tag::parse(["p", &victim.public_key().to_hex()]).unwrap()],
+            "9031 remove",
+        ),
+        (
+            &banned_admin,
+            9030u16,
+            vec![
+                Tag::parse(["p", &planted.public_key().to_hex()]).unwrap(),
+                Tag::parse(["role", "member"]).unwrap(),
+            ],
+            "9030 add",
+        ),
+        (
+            &banned_admin,
+            9033u16,
+            vec![Tag::parse(["icon", "https://evil.example/pwned.png"]).unwrap()],
+            "9033 icon",
+        ),
+        (
+            &banned_owner,
+            9032u16,
+            vec![
+                Tag::parse(["p", &role_target.public_key().to_hex()]).unwrap(),
+                Tag::parse(["role", "admin"]).unwrap(),
+            ],
+            "9032 change role",
+        ),
+    ] {
+        let (st, body) = post_event(actor, &signed(actor, kind, tags)).await;
+        println!("[banned] {label} -> {st} {body}");
+        assert_eq!(
+            st, 403,
+            "{label}: banned actor must get 403, got {st} {body}"
+        );
+        let msg: serde_json::Value = serde_json::from_str(&body).unwrap_or_default();
+        let text = msg.get("error").and_then(|v| v.as_str()).unwrap_or(&body);
+        assert_eq!(
+            text, "blocked: you are banned from this community",
+            "{label}: must carry the exact `blocked:` wire contract"
+        );
+    }
+
+    // No mutation from any banned attempt.
+    let role_of = |k: &Keys| {
+        let hex = k.public_key().to_hex();
+        let p = p.clone();
+        async move {
+            sqlx::query_scalar::<_, String>(
+                "SELECT role FROM relay_members WHERE community_id=$1 AND pubkey=$2",
+            )
+            .bind(cid)
+            .bind(hex)
+            .fetch_optional(&p)
+            .await
+            .unwrap()
+        }
+    };
+    assert_eq!(
+        role_of(&victim).await.as_deref(),
+        Some("member"),
+        "9031: banned admin must not remove a member"
+    );
+    assert_eq!(
+        role_of(&planted).await,
+        None,
+        "9030: banned admin must not plant a new member"
+    );
+    assert_eq!(
+        role_of(&role_target).await.as_deref(),
+        Some("member"),
+        "9032: banned owner must not change a member's role"
+    );
+    let icon: Option<String> = sqlx::query_scalar("SELECT icon FROM communities WHERE id=$1")
+        .bind(cid)
+        .fetch_one(&p)
+        .await
+        .unwrap();
+    assert!(
+        icon.is_none(),
+        "9033: banned admin must not change the workspace icon, got {icon:?}"
+    );
+
+    // ── Timed-out admin: still administers (ingest exemption preserved). ──
+    let (ts, tb) = post_event(
+        &timed_out_admin,
+        &signed(
+            &timed_out_admin,
+            9031,
+            vec![Tag::parse(["p", &victim2.public_key().to_hex()]).unwrap()],
+        ),
+    )
+    .await;
+    println!("[timed-out] 9031 remove -> {ts} {tb}");
+    assert_eq!(
+        ts, 200,
+        "timed-out admin must still administer the roster: {tb}"
+    );
+    assert_eq!(
+        role_of(&victim2).await,
+        None,
+        "timed-out admin's removal must take effect"
+    );
+
+    // Control: the same timed-out admin is still write-blocked for content.
+    let (cs, cb) = post_event(
+        &timed_out_admin,
+        &EventBuilder::new(Kind::Custom(9), "x")
+            .tags(vec![Tag::parse(["h", &Uuid::new_v4().to_string()]).unwrap()])
+            .sign_with_keys(&timed_out_admin)
+            .unwrap(),
+    )
+    .await;
+    println!("[timed-out] control kind:9 -> {cs} {cb}");
+    assert_ne!(
+        cs, 200,
+        "timed-out admin must still be write-blocked for content"
+    );
+
+    // ── Unrestricted admin: behaviour unchanged, mutation included. ──
+    let (gs, gb) = post_event(
+        &good_admin,
+        &signed(
+            &good_admin,
+            9031,
+            vec![Tag::parse(["p", &victim3.public_key().to_hex()]).unwrap()],
+        ),
+    )
+    .await;
+    println!("[clean] 9031 remove -> {gs} {gb}");
+    assert_eq!(gs, 200, "unrestricted admin must be unaffected: {gb}");
+    assert_eq!(
+        role_of(&victim3).await,
+        None,
+        "unrestricted admin's removal must actually take effect"
+    );
+
+    // ── Unchanged rejection contract: non-admin still gets `invalid:`/400. ──
+    let nobody = Keys::generate();
+    seed(&p, cid, &nobody, "member").await;
+    let (ns, nb) = post_event(
+        &nobody,
+        &signed(
+            &nobody,
+            9031,
+            vec![Tag::parse(["p", &victim.public_key().to_hex()]).unwrap()],
+        ),
+    )
+    .await;
+    println!("[non-admin] 9031 -> {ns} {nb}");
+    assert_eq!(
+        ns, 400,
+        "a plain member's 9031 must stay a 400 validation reject"
+    );
+    assert!(
+        nb.contains("invalid: actor not authorized"),
+        "non-admin rejection must keep its `invalid:` prefix, got {nb}"
+    );
+
+    println!("\nALL INVARIANTS HELD");
+}
+
+fn chrono_now() -> i64 {
+    std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .map(|d| d.as_secs() as i64)
+        .unwrap_or(0)
+}
diff --git a/crates/buzz-workflow/src/error.rs b/crates/buzz-workflow/src/error.rs
index 34e3d5311f..292f8dd027 100644
--- a/crates/buzz-workflow/src/error.rs
+++ b/crates/buzz-workflow/src/error.rs
@@ -54,6 +54,12 @@ pub enum WorkflowError {
     #[error("database error: {0}")]
     Database(String),
 
+    /// The workflow's owner is not currently authorized to run it (removed
+    /// from the channel, insufficient role for the definition's actions, or
+    /// the authority lookup failed — all deny, fail-closed).
+    #[error("unauthorized: {0}")]
+    Unauthorized(String),
+
     /// The action is defined but not yet implemented.
     #[error("action not implemented: {0}")]
     NotImplemented(String),
diff --git a/crates/buzz-workflow/src/lib.rs b/crates/buzz-workflow/src/lib.rs
index 93581225ee..7aaa3d1702 100644
--- a/crates/buzz-workflow/src/lib.rs
+++ b/crates/buzz-workflow/src/lib.rs
@@ -132,6 +132,44 @@ impl WorkflowEngine {
         self.workflow_cache.invalidate(&(community_id, channel_id));
     }
 
+    /// Fail-closed pre-run authority gate (SEC-006).
+    ///
+    /// A workflow executes with its **owner's** standing authority long after
+    /// the definition was saved, so every run-creation door must recheck the
+    /// owner's *current* channel authority immediately before creating a run:
+    ///
+    /// - the owner must still be an active member of the workflow's channel;
+    /// - if the definition contains an exfiltration-capable action
+    ///   (`call_webhook`), the owner must currently hold the `owner` or
+    ///   `admin` role.
+    ///
+    /// Any lookup error denies (fail-closed): a removed owner must never keep
+    /// exfiltration authority because a membership read happened to fail.
+    pub async fn check_owner_authority(
+        &self,
+        community_id: CommunityId,
+        channel_id: Uuid,
+        owner_pubkey: &[u8],
+        def: &WorkflowDef,
+    ) -> Result<(), WorkflowError> {
+        let role = self
+            .db
+            .get_member_role(community_id, channel_id, owner_pubkey)
+            .await
+            .map_err(|e| {
+                WorkflowError::Unauthorized(format!(
+                    "owner authority lookup failed (fail-closed): {e}"
+                ))
+            })?;
+        if owner_authority_allows(role.as_deref(), def.requires_elevated_authority()) {
+            Ok(())
+        } else {
+            Err(WorkflowError::Unauthorized(
+                "workflow owner lacks current channel authority".into(),
+            ))
+        }
+    }
+
     /// Set the action sink. Called once after `AppState` construction.
     ///
     /// # Panics
@@ -340,6 +378,23 @@ impl WorkflowEngine {
                 continue;
             }
 
+            // SEC-006: recheck the owner's *current* channel authority
+            // immediately before run creation. The cached workflow list can be
+            // up to 10s stale, and disable-on-removal can race a concurrent
+            // event — this per-fire gate is the authoritative, fail-closed
+            // check that a removed (or under-privileged, for exfiltration
+            // definitions) owner cannot cause a run.
+            if let Err(e) = self
+                .check_owner_authority(community_id, channel_id, &workflow.owner_pubkey, &def)
+                .await
+            {
+                tracing::warn!(
+                    workflow_id = %workflow.id,
+                    "Skipping workflow — owner authority check failed: {e}"
+                );
+                continue;
+            }
+
             let trigger_event_id_bytes = event.event.id.as_bytes().to_vec();
             let run_id = match self
                 .db
@@ -537,6 +592,22 @@ impl WorkflowEngine {
                     _ => continue, // Non-schedule triggers handled by on_event()
                 };
 
+                // SEC-006: recheck the owner's current channel authority
+                // BEFORE the durable claim. Placing the gate after the claim
+                // would let a revoked owner's workflow consume the
+                // at-most-once fire slot (claims are never re-fired), turning
+                // revocation into a denial-of-fire for a later re-enable.
+                if let Err(e) = self
+                    .check_owner_authority(community_id, channel_id, &workflow.owner_pubkey, &def)
+                    .await
+                {
+                    tracing::warn!(
+                        workflow_id = %workflow.id,
+                        "Cron tick: skipping workflow — owner authority check failed: {e}"
+                    );
+                    continue;
+                }
+
                 // Durable at-most-once claim — the cross-pod fire boundary.
                 // The loser receives `None` and skips BEFORE any run creation or
                 // side effect. `community_id` is the workflow row's own
@@ -951,6 +1022,25 @@ pub fn build_trigger_context(event: &buzz_core::StoredEvent) -> executor::Trigge
     }
 }
 
+/// Pure authority decision for [`WorkflowEngine::check_owner_authority`].
+///
+/// `role` is the owner's *current* active role in the workflow's channel
+/// (`None` = not an active member — removed, left, or never joined).
+/// `needs_elevated` is true when the definition contains an
+/// exfiltration-capable action (see `WorkflowDef::requires_elevated_authority`).
+///
+/// Rules:
+/// - not a member ⇒ deny, always;
+/// - member ⇒ allowed for ordinary definitions;
+/// - elevated definitions ⇒ only `owner` / `admin` roles.
+fn owner_authority_allows(role: Option<&str>, needs_elevated: bool) -> bool {
+    match role {
+        None => false,
+        Some(r) if needs_elevated => matches!(r, "owner" | "admin"),
+        Some(_) => true,
+    }
+}
+
 /// Returns `true` if the trigger type matches the given event kind.
 fn trigger_matches_event(trigger: &TriggerDef, kind_u32: u32) -> bool {
     use buzz_core::kind::{KIND_REACTION, KIND_STREAM_MESSAGE, KIND_STREAM_MESSAGE_DIFF};
@@ -1561,4 +1651,244 @@ steps:
         // Should pick the LAST e tag (direct target), not the first (thread root)
         assert_eq!(ctx.message_id, direct_target_id.to_hex());
     }
+
+    // -- SEC-006: owner authority decision --------------------------------
+
+    #[test]
+    fn owner_authority_denies_non_members_always() {
+        assert!(!owner_authority_allows(None, false));
+        assert!(!owner_authority_allows(None, true));
+    }
+
+    #[test]
+    fn owner_authority_allows_any_member_for_ordinary_definitions() {
+        assert!(owner_authority_allows(Some("member"), false));
+        assert!(owner_authority_allows(Some("admin"), false));
+        assert!(owner_authority_allows(Some("owner"), false));
+    }
+
+    #[test]
+    fn owner_authority_requires_elevated_role_for_exfiltration_definitions() {
+        assert!(!owner_authority_allows(Some("member"), true));
+        assert!(owner_authority_allows(Some("admin"), true));
+        assert!(owner_authority_allows(Some("owner"), true));
+    }
+
+    #[test]
+    fn requires_elevated_authority_detects_call_webhook() {
+        let (plain, _) = WorkflowEngine::parse_yaml(concat!(
+            "name: plain\n",
+            "trigger:\n  on: message_posted\n",
+            "steps:\n  - id: s1\n    action: send_message\n    text: hi\n",
+        ))
+        .expect("parse plain");
+        assert!(!plain.requires_elevated_authority());
+
+        let (hook, _) = WorkflowEngine::parse_yaml(concat!(
+            "name: hook\n",
+            "trigger:\n  on: message_posted\n",
+            "steps:\n  - id: s1\n    action: send_message\n    text: hi\n",
+            "  - id: s2\n    action: call_webhook\n    url: https://example.com/x\n",
+        ))
+        .expect("parse hook");
+        assert!(hook.requires_elevated_authority());
+    }
+
+    // -- SEC-006: event-path regression (requires Postgres) ----------------
+
+    async fn setup_db() -> buzz_db::Db {
+        let database_url = std::env::var("BUZZ_TEST_DATABASE_URL")
+            .or_else(|_| std::env::var("DATABASE_URL"))
+            .unwrap_or_else(|_| "postgres://buzz:buzz_dev@localhost:5432/buzz".to_owned());
+        buzz_db::Db::new(&buzz_db::DbConfig {
+            database_url,
+            ..Default::default()
+        })
+        .await
+        .expect("connect test DB")
+    }
+
+    /// Create a community, a channel owned by `creator`, and add `member` as a
+    /// plain member. Returns `(community, channel)`.
+    async fn setup_channel(db: &buzz_db::Db, creator: &[u8], member: &[u8]) -> (CommunityId, Uuid) {
+        let host = format!("sec006-{}.example", Uuid::new_v4().simple());
+        let community = match db
+            .create_community_with_owner(&host, &hex::encode(creator))
+            .await
+            .expect("create community")
+        {
+            buzz_db::CreateCommunityWithOwnerResult::Created(rec) => rec.id,
+            other => panic!("unexpected community create result: {other:?}"),
+        };
+        db.ensure_user(community, creator)
+            .await
+            .expect("creator user");
+        db.ensure_user(community, member)
+            .await
+            .expect("member user");
+        let channel_id = Uuid::new_v4();
+        db.create_channel_with_id(
+            community,
+            channel_id,
+            &format!("ch-{}", channel_id.simple()),
+            buzz_db::channel::ChannelType::Stream,
+            buzz_db::channel::ChannelVisibility::Open,
+            None,
+            creator,
+            None,
+        )
+        .await
+        .expect("create channel");
+        db.add_member(
+            community,
+            channel_id,
+            member,
+            buzz_db::channel::MemberRole::Member,
+            Some(creator),
+        )
+        .await
+        .expect("add member");
+        (community, channel_id)
+    }
+
+    fn message_event(channel_id: Uuid) -> buzz_core::StoredEvent {
+        let keys = nostr::Keys::generate();
+        let event = nostr::EventBuilder::new(nostr::Kind::Custom(9), "hello")
+            .sign_with_keys(&keys)
+            .expect("sign");
+        buzz_core::StoredEvent::new(event, Some(channel_id))
+    }
+
+    /// The event path must stop creating runs the moment the workflow's owner
+    /// loses channel membership — even while the workflow row is still
+    /// `enabled` (the disable-on-removal side effect is a separate, relay-side
+    /// write; this gate must hold on its own).
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn on_event_denies_run_after_owner_removed() {
+        let db = setup_db().await;
+        let creator = nostr::Keys::generate().public_key().to_bytes().to_vec();
+        let member = nostr::Keys::generate().public_key().to_bytes().to_vec();
+        let (community, channel_id) = setup_channel(&db, &creator, &member).await;
+
+        let def_json = serde_json::json!({
+            "name": "sec006-event",
+            "trigger": {"on": "message_posted"},
+            "steps": [{"id": "s1", "action": "send_message", "text": "hi"}],
+            "enabled": true,
+        })
+        .to_string();
+        let workflow_id = db
+            .create_workflow(
+                community,
+                Some(channel_id),
+                &member,
+                "sec006-event",
+                &def_json,
+                &[0u8; 32],
+            )
+            .await
+            .expect("create workflow");
+
+        let engine = Arc::new(WorkflowEngine::new(db.clone(), WorkflowConfig::default()));
+
+        // Owner is an active member: the event fires the workflow.
+        engine
+            .on_event(community, &message_event(channel_id))
+            .await
+            .expect("on_event while member");
+        let runs = db
+            .list_workflow_runs(community, workflow_id, 10)
+            .await
+            .expect("list runs");
+        assert_eq!(runs.len(), 1, "member owner's workflow must fire");
+
+        // Remove the owner (actor = channel creator, an owner-role member).
+        db.remove_member(community, channel_id, &member, &creator)
+            .await
+            .expect("remove member");
+
+        // Workflow row is still enabled — only the authority gate stands.
+        engine
+            .on_event(community, &message_event(channel_id))
+            .await
+            .expect("on_event after removal");
+        let runs = db
+            .list_workflow_runs(community, workflow_id, 10)
+            .await
+            .expect("list runs after removal");
+        assert_eq!(
+            runs.len(),
+            1,
+            "no new run may be created after the owner lost membership"
+        );
+    }
+
+    /// Exfiltration-capable definitions (call_webhook) require the owner to
+    /// currently hold an elevated role — a plain member's workflow must not
+    /// fire even though the owner is still an active channel member.
+    #[tokio::test]
+    #[ignore = "requires Postgres"]
+    async fn on_event_denies_webhook_definition_for_plain_member_owner() {
+        let db = setup_db().await;
+        let creator = nostr::Keys::generate().public_key().to_bytes().to_vec();
+        let member = nostr::Keys::generate().public_key().to_bytes().to_vec();
+        let (community, channel_id) = setup_channel(&db, &creator, &member).await;
+
+        let def_json = serde_json::json!({
+            "name": "sec006-hook",
+            "trigger": {"on": "message_posted"},
+            "steps": [{"id": "s1", "action": "call_webhook", "url": "https://example.com/x"}],
+            "enabled": true,
+        })
+        .to_string();
+
+        // Same definition, two owners: plain member vs channel owner.
+        let wf_member = db
+            .create_workflow(
+                community,
+                Some(channel_id),
+                &member,
+                "hook-member",
+                &def_json,
+                &[0u8; 32],
+            )
+            .await
+            .expect("create member workflow");
+        let wf_owner = db
+            .create_workflow(
+                community,
+                Some(channel_id),
+                &creator,
+                "hook-owner",
+                &def_json,
+                &[1u8; 32],
+            )
+            .await
+            .expect("create owner workflow");
+
+        let engine = Arc::new(WorkflowEngine::new(db.clone(), WorkflowConfig::default()));
+        engine
+            .on_event(community, &message_event(channel_id))
+            .await
+            .expect("on_event");
+
+        let member_runs = db
+            .list_workflow_runs(community, wf_member, 10)
+            .await
+            .expect("member runs");
+        assert!(
+            member_runs.is_empty(),
+            "plain member's call_webhook workflow must not fire"
+        );
+        let owner_runs = db
+            .list_workflow_runs(community, wf_owner, 10)
+            .await
+            .expect("owner runs");
+        assert_eq!(
+            owner_runs.len(),
+            1,
+            "channel owner's call_webhook workflow fires"
+        );
+    }
 }
diff --git a/crates/buzz-workflow/src/schema.rs b/crates/buzz-workflow/src/schema.rs
index 34e8bb1960..9bc79aa48b 100644
--- a/crates/buzz-workflow/src/schema.rs
+++ b/crates/buzz-workflow/src/schema.rs
@@ -147,6 +147,19 @@ pub enum ActionDef {
 }
 
 impl WorkflowDef {
+    /// True when any step performs an action that can exfiltrate channel data
+    /// to an arbitrary external destination (`call_webhook`).
+    ///
+    /// Definitions with such steps require elevated (owner/admin) channel
+    /// authority both to save and to run — plain membership is not enough,
+    /// because a workflow forwards channel content with the *owner's* standing
+    /// authority long after the save (SEC-006).
+    pub fn requires_elevated_authority(&self) -> bool {
+        self.steps
+            .iter()
+            .any(|s| matches!(s.action, ActionDef::CallWebhook { .. }))
+    }
+
     /// Validate the workflow definition. Returns `Err` with a descriptive message
     /// if any invariant is violated.
     pub fn validate(&self) -> Result<(), WorkflowError> {
diff --git a/deploy/charts/buzz/Chart.yaml b/deploy/charts/buzz/Chart.yaml
index 956e085749..9309074895 100644
--- a/deploy/charts/buzz/Chart.yaml
+++ b/deploy/charts/buzz/Chart.yaml
@@ -7,7 +7,7 @@ description: |
   PostgreSQL and Redis. Configurable for single-node evaluation
   (subcharts on) and HA production (external services, existingSecret).
 type: application
-version: 0.1.6
+version: 0.1.7
 appVersion: "0.1.0"
 home: https://github.com/block/buzz
 sources:
@@ -24,7 +24,7 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: added
-      description: Optional READ_DATABASE_URL env (secretKeyRef) enabling relay read-replica routing; absent key preserves prior behavior.
+      description: Generic init-container, volume, volume-mount, command, and args extension points for the relay Pod.
   artifacthub.io/license: Apache-2.0
 
 # Optional eval-only subcharts. Production deploys disable both and point
diff --git a/deploy/charts/buzz/README.md b/deploy/charts/buzz/README.md
index 4cf4b22b24..a7c4bcf63b 100644
--- a/deploy/charts/buzz/README.md
+++ b/deploy/charts/buzz/README.md
@@ -12,7 +12,7 @@ This chart has two operating profiles selected by values:
 ## Quickstart (eval only)
 
 ```sh
-helm install buzz oci://ghcr.io/block/buzz/charts/buzz --version 0.1.0 \
+helm install buzz oci://ghcr.io/block/buzz/charts/buzz --version 0.1.7 \
   --create-namespace --namespace buzz \
   --set quickstart=true \
   --set postgresql.enabled=true \
@@ -52,6 +52,57 @@ See:
 
 The chart fails at `helm install` / `helm template` time with a clear message if any of these are missing or malformed (see `templates/_validate.tpl`).
 
+## Relay Pod extensions
+
+The chart exposes narrow extension points for init containers, volumes, relay
+volume mounts, and image command/argument overrides. `extraManifests` creates
+independent Kubernetes resources but cannot modify the chart-managed relay
+Deployment. These extension values insert fields into that Deployment, avoiding
+duplication of its environment, probes, security context, secrets, and
+chart-owned volumes.
+
+For example, an init container can copy a wrapper binary into a shared volume
+and make that wrapper the relay entrypoint:
+
+```yaml
+extraInitContainers:
+  - name: install-wrapper
+    image: example.com/wrapper-init:v1
+    args: [/opt/wrapper/wrapper]
+    securityContext:
+      runAsNonRoot: true
+      runAsUser: 65532
+      runAsGroup: 65532
+      allowPrivilegeEscalation: false
+      capabilities:
+        drop: [ALL]
+    resources:
+      requests:
+        cpu: 10m
+        memory: 16Mi
+    volumeMounts:
+      - name: wrapper
+        mountPath: /opt/wrapper
+
+extraVolumes:
+  - name: wrapper
+    emptyDir: {}
+
+relay:
+  command: [/opt/wrapper/wrapper]
+  args: [/usr/local/bin/buzz-relay]
+  extraVolumeMounts:
+    - name: wrapper
+      mountPath: /opt/wrapper
+```
+
+These values are raw Kubernetes fragments rendered with `toYaml`, not `tpl`.
+The chart does not validate cross-field relationships: extension names must not
+collide with chart-owned containers or volumes, mounts must reference existing
+volumes, and each init container must define an appropriate security context
+and resources. Empty `relay.command` and `relay.args` arrays preserve the image
+defaults; non-empty values override its entrypoint and arguments respectively.
+
 ## Device pairing relay
 
 The chart can run Buzz's stateless pairing WebSocket relay as an independent
diff --git a/deploy/charts/buzz/templates/NOTES.txt b/deploy/charts/buzz/templates/NOTES.txt
index d65c1f837b..b409f4d942 100644
--- a/deploy/charts/buzz/templates/NOTES.txt
+++ b/deploy/charts/buzz/templates/NOTES.txt
@@ -64,7 +64,8 @@
 {{- end }}
 {{- if not .Values.relay.requireMediaGetAuth }}
   ⚠ relay.requireMediaGetAuth=false — media GET/HEAD reads are not auth-gated.
-    Keep this false only during staged client rollout.
+    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.
diff --git a/deploy/charts/buzz/templates/deployment.yaml b/deploy/charts/buzz/templates/deployment.yaml
index f8d67de31d..bf2df4c2c8 100644
--- a/deploy/charts/buzz/templates/deployment.yaml
+++ b/deploy/charts/buzz/templates/deployment.yaml
@@ -55,13 +55,14 @@ spec:
       topologySpreadConstraints:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if or .Values.minio.enabled .Values.extraInitContainers }}
+      initContainers:
       {{- if .Values.minio.enabled }}
       # Quickstart only: the bundled MinIO bucket is created by a concurrent
       # init Job (templates/quickstart-minio-init.yaml). The relay's A3 S3
       # conformance probe is startup-fatal, so without this gate the relay Pods
       # CrashLoopBackOff (with growing backoff) until the bucket appears. Block
       # relay start until the bucket exists — deterministic, no crash-loops.
-      initContainers:
         - name: wait-for-bucket
           image: {{ .Values.minio.mcImage | quote }}
           securityContext:
@@ -90,12 +91,24 @@ spec:
               done
               echo "bucket {{ .Values.s3.bucket }} present"
       {{- end }}
+      {{- with .Values.extraInitContainers }}
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
       containers:
         - name: relay
           image: {{ include "buzz.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           securityContext:
             {{- toYaml .Values.relay.containerSecurityContext | nindent 12 }}
+          {{- with .Values.relay.command }}
+          command:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.relay.args }}
+          args:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           ports:
             - { name: app,     containerPort: 3000, protocol: TCP }
             - { name: health,  containerPort: {{ .Values.service.healthPort }}, protocol: TCP }
@@ -225,6 +238,9 @@ spec:
           volumeMounts:
             - { name: git-repos, mountPath: {{ .Values.persistence.git.mountPath | quote }} }
             - { name: git-pack-cache, mountPath: {{ .Values.git.packCachePath | quote }} }
+            {{- with .Values.relay.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
 
       volumes:
         - name: git-repos
@@ -238,3 +254,6 @@ spec:
         - name: git-pack-cache
           emptyDir:
             sizeLimit: {{ .Values.git.packCacheVolumeSize | quote }}
+        {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
diff --git a/deploy/charts/buzz/tests/render_test.yaml b/deploy/charts/buzz/tests/render_test.yaml
index 6313fd5958..3e044f5d7c 100644
--- a/deploy/charts/buzz/tests/render_test.yaml
+++ b/deploy/charts/buzz/tests/render_test.yaml
@@ -36,6 +36,34 @@ 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: 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:
@@ -137,3 +165,118 @@ tests:
       - hasDocuments:
           count: 0
         template: templates/pvc-git.yaml
+
+  - it: preserves image defaults when Pod extensions are empty
+    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
+    asserts:
+      - notExists:
+          path: spec.template.spec.initContainers
+        template: templates/deployment.yaml
+      - notExists:
+          path: spec.template.spec.containers[0].command
+        template: templates/deployment.yaml
+      - notExists:
+          path: spec.template.spec.containers[0].args
+        template: templates/deployment.yaml
+
+  - it: appends generic Pod extensions and overrides the relay command
+    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.command:
+        - /opt/wrapper/wrapper
+      relay.args:
+        - /usr/local/bin/buzz-relay
+      relay.extraVolumeMounts:
+        - name: wrapper
+          mountPath: /opt/wrapper
+      extraInitContainers:
+        - name: install-wrapper
+          image: example.com/wrapper-init:v1
+          args:
+            - /opt/wrapper/wrapper
+          env:
+            - name: LITERAL_TEMPLATE
+              value: '{{ .Release.Name }}'
+          securityContext:
+            runAsNonRoot: true
+          resources:
+            requests:
+              cpu: 10m
+              memory: 16Mi
+          volumeMounts:
+            - name: wrapper
+              mountPath: /opt/wrapper
+      extraVolumes:
+        - name: wrapper
+          emptyDir: {}
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].name
+          value: install-wrapper
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.initContainers[0].securityContext.runAsNonRoot
+          value: true
+        template: templates/deployment.yaml
+      # Extension fragments are deliberately rendered with toYaml, not tpl.
+      - equal:
+          path: spec.template.spec.initContainers[0].env[0].value
+          value: '{{ .Release.Name }}'
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.containers[0].command
+          value:
+            - /opt/wrapper/wrapper
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.containers[0].args
+          value:
+            - /usr/local/bin/buzz-relay
+        template: templates/deployment.yaml
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: wrapper
+            mountPath: /opt/wrapper
+        template: templates/deployment.yaml
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: wrapper
+            emptyDir: {}
+        template: templates/deployment.yaml
+
+  - it: appends generic init containers after the bundled MinIO readiness gate
+    release:
+      name: rel
+    set:
+      relayUrl: wss://buzz.example.com
+      ownerPubkey: "0000000000000000000000000000000000000000000000000000000000000000"
+      postgresql.enabled: true
+      redis.enabled: true
+      minio.enabled: true
+      extraInitContainers:
+        - name: install-wrapper
+          image: example.com/wrapper-init:v1
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].name
+          value: wait-for-bucket
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.initContainers[1].name
+          value: install-wrapper
+        template: templates/deployment.yaml
diff --git a/deploy/charts/buzz/values.schema.json b/deploy/charts/buzz/values.schema.json
index 203fd9b69b..53bb29bb60 100644
--- a/deploy/charts/buzz/values.schema.json
+++ b/deploy/charts/buzz/values.schema.json
@@ -72,9 +72,34 @@
           "type": "array",
           "items": { "type": "string" }
         },
-        "ephemeralTtlOverride": { "type": "integer", "minimum": 0 }
+        "ephemeralTtlOverride": { "type": "integer", "minimum": 0 },
+        "command": {
+          "type": "array",
+          "items": { "type": "string" },
+          "description": "Optional relay container entrypoint override. Empty preserves the image default."
+        },
+        "args": {
+          "type": "array",
+          "items": { "type": "string" },
+          "description": "Optional relay container arguments override. Empty preserves the image default."
+        },
+        "extraVolumeMounts": {
+          "type": "array",
+          "items": { "type": "object" },
+          "description": "Raw Kubernetes volumeMount fragments appended to the relay container."
+        }
       }
     },
+    "extraInitContainers": {
+      "type": "array",
+      "items": { "type": "object" },
+      "description": "Raw Kubernetes init-container fragments appended to the relay Pod."
+    },
+    "extraVolumes": {
+      "type": "array",
+      "items": { "type": "object" },
+      "description": "Raw Kubernetes volume fragments appended to the relay Pod."
+    },
     "service": {
       "type": "object",
       "additionalProperties": true,
diff --git a/deploy/charts/buzz/values.yaml b/deploy/charts/buzz/values.yaml
index 180afc6746..8ac5086e27 100644
--- a/deploy/charts/buzz/values.yaml
+++ b/deploy/charts/buzz/values.yaml
@@ -107,10 +107,12 @@ relay:
   sendBuffer: 1000
   requireAuthToken: true
   requireRelayMembership: true
-  # Staged rollout gate for authenticated media reads. When true, relay
-  # GET/HEAD /media/* requires Blossom kind 24242 t=get plus relay membership.
-  # Keep false until deployed desktop/mobile/CLI clients attach read auth.
-  requireMediaGetAuth: false
+  # 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: []
@@ -183,9 +185,24 @@ relay:
     readOnlyRootFilesystem: false  # git writes need a writable repo path
   terminationGracePeriodSeconds: 60
 
+  # Optional image entrypoint/arguments overrides. Empty arrays preserve the
+  # relay image's defaults. Consumers own compatibility with the selected image.
+  command: []
+  args: []
+  # Appended to the chart-owned relay mounts. Names must match extraVolumes (or
+  # another volume supplied by the platform) and must not collide with built-ins.
+  extraVolumeMounts: []
+
   extraEnv: []
   extraEnvFrom: []
 
+# ── Pod extensions ──────────────────────────────────────────────────────────
+# Raw Kubernetes fragments appended to the relay Pod. They are rendered with
+# toYaml, not tpl. Init containers must define their own securityContext and
+# resources; names must not collide with chart-owned containers or volumes.
+extraInitContainers: []
+extraVolumes: []
+
 # ── Device pairing relay ─────────────────────────────────────────────────────
 # Optional, stateless NIP-AB relay. When enabled, the main relay advertises
 # pairingRelay.url in NIP-11 and Buzz clients use it instead of the legacy
diff --git a/deploy/compose/.env.example b/deploy/compose/.env.example
index cebe879da0..838824c17f 100644
--- a/deploy/compose/.env.example
+++ b/deploy/compose/.env.example
@@ -30,7 +30,6 @@ POSTGRES_DB=buzz
 POSTGRES_USER=buzz
 POSTGRES_PASSWORD=CHANGE_ME_RANDOM_PASSWORD
 REDIS_PASSWORD=CHANGE_ME_RANDOM_PASSWORD
-TYPESENSE_API_KEY=CHANGE_ME_RANDOM_API_KEY
 BUZZ_S3_ACCESS_KEY=CHANGE_ME_RANDOM_ACCESS_KEY
 BUZZ_S3_SECRET_KEY=CHANGE_ME_RANDOM_SECRET_KEY
 BUZZ_S3_BUCKET=buzz-media
@@ -45,7 +44,6 @@ CADDY_HTTPS_PORT=443
 # Dev override ports. Only used with compose.dev.yml.
 POSTGRES_PORT=5432
 REDIS_PORT=6379
-TYPESENSE_PORT=8108
 MINIO_API_PORT=9000
 MINIO_CONSOLE_PORT=9001
 ADMINER_PORT=8082
diff --git a/desktop/package.json b/desktop/package.json
index 8c5795e359..7943b949b9 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "buzz",
   "private": true,
-  "version": "0.4.26",
+  "version": "0.5.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -14,7 +14,7 @@
     "lint": "biome lint .",
     "check": "biome check . && pnpm check:file-sizes && pnpm check:px-text && pnpm check:pubkey-truncation",
     "format": "biome format --write .",
-    "test": "node --import ./test-loader.mjs --experimental-strip-types --test 'src/**/*.test.mjs'",
+    "test": "node --import ./test-loader.mjs --experimental-strip-types --test \"src/**/*.test.mjs\"",
     "preview": "vite preview",
     "tauri": "tauri",
     "test:e2e": "pnpm build:e2e && playwright test",
diff --git a/desktop/playwright.config.ts b/desktop/playwright.config.ts
index 457e62ffc7..52d4d5c704 100644
--- a/desktop/playwright.config.ts
+++ b/desktop/playwright.config.ts
@@ -59,6 +59,7 @@ export default defineConfig({
         "**/video-attachment.spec.ts",
         "**/spoiler.spec.ts",
         "**/composer-link-shortcut.spec.ts",
+        "**/composer-selection-formatting.spec.ts",
         "**/composer-tooltip-dismiss.spec.ts",
         "**/mentions.spec.ts",
         "**/team-mentions.spec.ts",
@@ -98,9 +99,12 @@ export default defineConfig({
         "**/inbox-reactions.spec.ts",
         "**/send-channel-binding.spec.ts",
         "**/project-commit-detail.spec.ts",
+        "**/project-inbox.spec.ts",
         "**/project-pr-review.spec.ts",
         "**/persona-model-combobox-screenshots.spec.ts",
         "**/drafts-screenshots.spec.ts",
+        "**/drafts-all-fix-screenshots.spec.ts",
+        "**/inbox-refactor-screenshots.spec.ts",
         "**/buzz-theme-screenshots.spec.ts",
         "**/channel-sort.spec.ts",
         "**/identity-lost.spec.ts",
@@ -122,6 +126,9 @@ export default defineConfig({
         "**/observer-archive-policy.spec.ts",
         "**/agent-usage.spec.ts",
         "**/agent-usage-screenshots.spec.ts",
+        "**/harness-management.spec.ts",
+        "**/harness-catalog-screenshots.spec.ts",
+        "**/inline-custom-harness.spec.ts",
       ],
       use: {
         ...devices["Desktop Chrome"],
diff --git a/desktop/public/harness-logos/CREDITS.md b/desktop/public/harness-logos/CREDITS.md
new file mode 100644
index 0000000000..de4e003c3f
--- /dev/null
+++ b/desktop/public/harness-logos/CREDITS.md
@@ -0,0 +1,39 @@
+# Preset harness logos — provenance
+
+Third-party marks bundled to identify tier-2 preset harnesses in the runtime
+gallery (`PRESET_LOGOS` in `desktop/src/features/onboarding/ui/RuntimeIcon.tsx`).
+Nominative use only — each mark identifies its own vendor's harness.
+
+Add a row here when adding a preset logo; only bundle marks whose upstream
+license permits redistribution.
+
+| File | Upstream | Commit | License | Source path | Modifications |
+|---|---|---|---|---|---|
+| `hermes.png` | [NousResearch/hermes-agent](https://github.com/NousResearch/hermes-agent) | `6ad632b` | MIT © 2025 Nous Research | `website/static/img/logo.png` | Cropped the baked-in border frame, padded to square, resized to 64×64, quantised to a 16-colour palette |
+| `openclaw.svg` | [openclaw/openclaw](https://github.com/openclaw/openclaw) | `b06f40a` | MIT © 2026 OpenClaw Foundation | `ui/public/favicon.svg` | Removed the SMIL animation elements (renders the upstream rest pose statically — verified pixel-identical to the upstream frame at t=0); minified paths |
+| `omp.svg` | [can1357/oh-my-pi](https://github.com/can1357/oh-my-pi) | `667111575ebba136dadfd6989379e7f67e0d40d9` | MIT © 2025 Mario Zechner; © 2025–2026 Can Bölük | `assets/icon.svg` | None |
+| `kimi.png` | [MoonshotAI/kimi-cli](https://github.com/MoonshotAI/kimi-cli) | `4a550effdfcb29a25a5d325bf935296cc50cd417` | Apache-2.0; NOTICE: Kimi Code CLI © 2025 Moonshot AI | `web/public/logo.png` | None |
+| `grok.svg` | [SpaceXAI brand guidelines](https://x.ai/legal/brand-guidelines) | Retrieved 2026-07-25 | xAI Brand Guidelines: marks may be used to accurately refer to xAI or its services; logos must be used exactly as provided | `SpaceXAI_Grok_Assets.zip` → `Grok_Logomark_Dark.svg` | None |
+
+## Inline SVG marks (`RUNTIME_MARKS`)
+
+Monochrome marks inlined as `currentColor` paths in
+`desktop/src/features/onboarding/ui/HarnessMarks.tsx` (no files under
+`public/`), so they adapt to dark/light themes without bitmap filters.
+
+| Mark | Upstream | Version/Commit | License | Source path | Modifications |
+|---|---|---|---|---|---|
+| Goose | [block/goose](https://github.com/block/goose) | `305849b71709b95b86ed9f11bd3bc939899c0aab` | Apache-2.0 © Block, Inc. | `documentation/static/img/goose.svg` | `fill="#101010"` → `currentColor`; dropped the redundant clipPath wrapper |
+| Cursor | [simple-icons](https://github.com/simple-icons/simple-icons) | `16.27.1` (slug `cursor`) | CC0-1.0 (path data); nominative use of the Cursor mark to identify Cursor's harness | `icons/cursor.svg` | `fill` → `currentColor` |
+
+Codex deliberately has **no** bundled mark: the OpenAI blossom was removed
+from simple-icons in v16 at the vendor's request, so we do not ship it —
+Codex renders `RuntimeIcon`'s neutral terminal-glyph fallback instead.
+
+`amp.png` and `opencode.svg` predate this file; their provenance was not
+recorded when they were added. Cursor previously used the generic terminal
+fallback because Cursor's own brand page does not grant redistribution; the
+CC0-licensed simple-icons path (above) resolves that, mirroring the grok
+nominative-use precedent. The previous unproven `cursor.png` was removed, as
+were the unproven `chatgpt.png` and `goose.png` builtin-runtime bitmaps
+(replaced by the inline marks above).
diff --git a/desktop/public/harness-logos/amp.png b/desktop/public/harness-logos/amp.png
new file mode 100644
index 0000000000..00176e85bf
Binary files /dev/null and b/desktop/public/harness-logos/amp.png differ
diff --git a/desktop/public/harness-logos/grok.svg b/desktop/public/harness-logos/grok.svg
new file mode 100644
index 0000000000..642d7b6b0d
--- /dev/null
+++ b/desktop/public/harness-logos/grok.svg
@@ -0,0 +1,4 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M395.479 633.828L735.91 381.105C752.599 368.715 776.454 373.548 784.406 392.792C826.26 494.285 807.561 616.253 724.288 699.996C641.016 783.739 525.151 802.104 419.247 760.277L303.556 814.143C469.49 928.202 670.987 899.995 796.901 773.282C896.776 672.843 927.708 535.937 898.785 412.476L899.047 412.739C857.105 231.37 909.358 158.874 1016.4 10.6326C1018.93 7.11771 1021.47 3.60279 1024 0L883.144 141.651V141.212L395.392 633.916" fill="#0A0A0A"/>
+<path d="M325.226 695.251C206.128 580.84 226.662 403.776 328.285 301.668C403.431 226.097 526.549 195.254 634.026 240.596L749.454 186.994C728.657 171.88 702.007 155.623 671.424 144.2C533.19 86.9942 367.693 115.465 255.323 228.382C147.234 337.081 113.244 504.215 171.613 646.833C215.216 753.423 143.739 828.818 71.7385 904.916C46.2237 931.893 20.6216 958.87 0 987.429L325.139 695.339" fill="#0A0A0A"/>
+</svg>
diff --git a/desktop/public/harness-logos/hermes.png b/desktop/public/harness-logos/hermes.png
new file mode 100644
index 0000000000..6acf0020b1
Binary files /dev/null and b/desktop/public/harness-logos/hermes.png differ
diff --git a/desktop/public/harness-logos/kimi.png b/desktop/public/harness-logos/kimi.png
new file mode 100644
index 0000000000..033c0f4fb2
Binary files /dev/null and b/desktop/public/harness-logos/kimi.png differ
diff --git a/desktop/public/harness-logos/omp.svg b/desktop/public/harness-logos/omp.svg
new file mode 100644
index 0000000000..f1ccf2a08a
--- /dev/null
+++ b/desktop/public/harness-logos/omp.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 90" width="120" height="90">
+  <!-- Pi symbol with plugin connector -->
+  <!-- Horizontal bar -->
+  <rect x="10" y="8" width="100" height="12" rx="2" fill="#fafafa"/>
+  <!-- Left leg -->
+  <rect x="25" y="20" width="12" height="62" rx="2" fill="#fafafa"/>
+  <!-- Right leg -->
+  <rect x="75" y="20" width="12" height="45" rx="2" fill="#fafafa"/>
+  <!-- Plugin connector -->
+  <rect x="71" y="55" width="20" height="16" rx="3" fill="#f97316"/>
+  <rect x="76" y="59" width="3" height="8" rx="1" fill="#0d0d0d"/>
+  <rect x="82" y="59" width="3" height="8" rx="1" fill="#0d0d0d"/>
+  <!-- Decorative dots -->
+  <circle cx="18" cy="14" r="2" fill="#f97316" opacity="0.8"/>
+  <circle cx="102" cy="14" r="2" fill="#f97316" opacity="0.8"/>
+</svg>
diff --git a/desktop/public/harness-logos/openclaw.svg b/desktop/public/harness-logos/openclaw.svg
new file mode 100644
index 0000000000..8c1496d622
--- /dev/null
+++ b/desktop/public/harness-logos/openclaw.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 120" fill="none">
+  <defs>
+    <linearGradient id="a" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#ff4d4d"/>
+      <stop offset="100%" stop-color="#991b1b"/>
+    </linearGradient>
+  </defs>
+  <path d="M60 10C30 10 15 35 15 55c0 20 15 40 30 45v10h10v-10s5 2 10 0v10h10v-10c15-5 30-25 30-45 0-20-15-45-45-45Z" fill="url(#a)"/>
+  <path d="M20 45C5 40 0 50 5 60s15 5 20-5c3-7 0-10-5-10Z" fill="url(#a)"/>
+  <path d="M100 45c15-5 20 5 15 15s-15 5-20-5c-3-7 0-10 5-10Z" fill="url(#a)"/>
+  <path d="M45 15Q35 5 30 8M75 15Q85 5 90 8" stroke="#ff4d4d" stroke-width="3" stroke-linecap="round"/>
+  <circle cx="45" cy="35" r="6" fill="#050810"/>
+  <circle cx="75" cy="35" r="6" fill="#050810"/>
+  <circle cx="46" cy="34" r="2.5" fill="#00e5cc"/>
+  <circle cx="76" cy="34" r="2.5" fill="#00e5cc"/>
+</svg>
diff --git a/desktop/public/harness-logos/opencode.svg b/desktop/public/harness-logos/opencode.svg
new file mode 100644
index 0000000000..157edc4d75
--- /dev/null
+++ b/desktop/public/harness-logos/opencode.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512"><svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="512" height="512" fill="#131010"></rect>
+<path d="M320 224V352H192V224H320Z" fill="#5A5858"></path>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M384 416H128V96H384V416ZM320 160H192V352H320V160Z" fill="white"></path>
+</svg><style>@media (prefers-color-scheme: light) { :root { filter: none; } }
+@media (prefers-color-scheme: dark) { :root { filter: none; } }
+</style></svg>
\ No newline at end of file
diff --git a/desktop/public/runtime-icons/codex.png b/desktop/public/runtime-icons/codex.png
deleted file mode 100644
index fbdd19c060..0000000000
Binary files a/desktop/public/runtime-icons/codex.png and /dev/null differ
diff --git a/desktop/public/runtime-icons/goose.svg b/desktop/public/runtime-icons/goose.svg
deleted file mode 100644
index c5ed5e00a8..0000000000
--- a/desktop/public/runtime-icons/goose.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="2048" height="2048" viewBox="0 0 2048 2048" xmlns="http://www.w3.org/2000/svg">
-  <rect x="200" y="200" width="1648" height="1648" rx="400" ry="400" fill="#fff"/>
-  <g transform="translate(128 94) scale(3)">
-    <path fill="#000" d="M455.145 485.687c18.641-4.048 38.414-15.065 38.414-15.065l-34.607-28.507c-17.108-14.081-31.67-30.999-43.054-50.007-15.731-26.263-37.467-48.425-63.413-64.663l-12.672-7.379c-4.342-3.018-7.369-7.722-7.8-13.029-.276-3.422.544-6.481 2.457-9.173 6.598-9.3 40.702-49.767 46.952-54.938 8.049-6.653 17.018-12.187 25.339-18.523 1.183-.902 2.37-1.799 3.539-2.714.041-.041.1-.073.136-.109 2.67-2.108 5.19-4.347 7.193-7.002 7.233-8.376 8.991-15.781 9.422-19.058-.979-3.154-3.898-10.206-12.033-18.341 5.099.313 11.272 4.346 16.869 9.091 3.757-6.005 7.691-12.35 11.62-18.708 2.624-4.247-1.269-7.424-1.378-7.523l-.022-.005v-.018c-.1-.109-3.277-4.002-7.514-1.378-9.06 5.606-18.115 11.217-26.168 16.315 0 0-9.545-.199-20.848 9.563-2.66 2.008-4.899 4.527-7.002 7.192-.041.041-.077.095-.109.136-.92 1.165-1.817 2.352-2.714 3.54-6.341 8.325-11.87 17.29-18.523 25.339-5.167 6.254-45.638 40.353-54.938 46.952-2.692 1.913-5.747 2.737-9.173 2.456-5.302-.426-10.011-3.458-13.03-7.799l-7.378-12.672c-16.238-25.955-38.4-47.682-64.663-63.413-19.008-11.384-35.922-25.951-50.007-43.055l-28.516-34.607s-11.022 19.769-15.065 38.414c5.624 6.839 20.295 23.812 37.372 36.774-18.36-8.634-31.933-15.31-42.638-20.893-1.65 12.209-1.006 30.673.693 44.972 11.589 5.071 31.321 12.884 51.408 17.036-16.067 3.757-33.692 4.441-47.302 4.174 2.398 8.851 5.733 17.879 10.22 26.961 1.908 4.201 3.997 8.303 6.254 12.318 7.202 1.981 35.478 6.1 50.524 2.719-14.969 5.344-40.1 14.322-40.1 14.322 19.302 24.015 40.635 43.553 40.635 43.553 32.449-17.448 39.846-19.832 64.183-35.749-39.411 32.069-49.64 45.162-60.703 58.618l-7.709 10.818c-4.006 5.62-7.482 11.589-10.387 17.847-9.721 20.916-23.481 65.484-23.481 65.484-2.456 7.768 3.236 13.461 10.777 10.778 0 0 44.56-13.76 65.484-23.481 6.255-2.91 12.233-6.386 17.848-10.388l10.818-7.709c3.63-2.986 7.238-5.914 11.199-9.367 0 0 27.233 32.263 55.227 53.487 0 0 8.979-25.13 14.322-40.1-3.386 15.051.734 43.327 2.719 50.524 4.006 2.257 8.117 4.346 12.318 6.254 9.087 4.491 18.11 7.822 26.962 10.22-.263-13.614.417-31.235 4.174-47.301 4.151 20.086 11.96 39.823 17.036 51.407 14.298 1.7 32.762 2.343 44.972.693-5.584-10.704-12.26-24.287-20.893-42.637 12.961 17.077 29.934 31.747 36.773 37.371l-.014-.013z"/>
-  </g>
-</svg>
diff --git a/desktop/scripts/check-file-sizes.mjs b/desktop/scripts/check-file-sizes.mjs
index f34b6dc332..326587b87f 100644
--- a/desktop/scripts/check-file-sizes.mjs
+++ b/desktop/scripts/check-file-sizes.mjs
@@ -46,520 +46,8 @@ const rules = [
   },
 ];
 
-// TEMP — these files exceed the 1000-line limit and are queued to be split.
-// Do not add to this list; split the file instead. Remove each entry as its
-// file is broken up. Tracked as a follow-up.
-const overrides = new Map([
-  // Native Builderlab auth/community commands add a small registration surface
-  // to the existing Tauri composition root. The implementation lives in
-  // builderlab.rs; this narrowly ratchets the command wiring while lib.rs is
-  // queued for a broader composition-root split. Bumped for the
-  // archive/unarchive/transfer community-management commands (web parity).
-  ["src-tauri/src/lib.rs", 1013],
-  // persona-events rebase: build_deploy_payload threads `state` for the
-  // read-time relay-URL workspace fallback while keeping the create-time env
-  // pin (the credential-leak guard). Load-bearing feature growth from the
-  // rebase, queued to split with the rest of this list.
-  // persona-refresh-on-spawn: re-snapshot + retain_managed_agent_pending call
-  // in start_local_agent_with_preflight adds ~23 lines. Queued to split.
-  // rebase onto main (2026-06-25): main's agents.rs grew by ~17 lines since
-  // config-bridge: get_agent_config_surface/write_agent_config_field/put_agent_session_config
-  // commands add ~40 lines. Queued to split.
-  // branch cut; override bumped to cover the merged total. Queued to split.
-  // persona-blank-fallback: persona_snapshot_with_agent_config_fallback call
-  // sites add ~4 lines (extra fallback params + inline comments). build_deploy_payload
-  // fix (blank-persona provider/model fallback) adds ~6 lines. Bug fix.
-  // archive/mod_tests.rs carries the full test module for archive/mod.rs:
-  // unit tests + 4 real-relay integration tests (ignored, live-relay only).
-  // Production logic in mod.rs is now ~527 lines (under 1000). mod_tests.rs
-  // is test-only content; the override covers the test growth accumulated
-  // across the local-archive + agent-metric-archive PR series. store_tests.rs
-  // (~731 lines) is under 1000 so needs no override.
-  ["src-tauri/src/archive/mod_tests.rs", 1208],
-  // unified-agent-model 1A.1: profile reconcile split to agents_profile.rs,
-  // ratcheting 1443 -> 1295. Queued to split further in the A2 fold.
-  // global-agent-config: resolve_deploy_model_provider + visibility exports
-  // add ~40 lines on top of the 1A.1 ratchet. Queued to split.
-  ["src-tauri/src/commands/agents.rs", 1340],
-  // agent-lifecycle-fixes: cascade-delete in delete_persona restructured into
-  // 3-phase (stage/stop/commit) + commit_cascade_agents injectable helper for
-  // retry-safety. Load-bearing reviewer-required change; queued to split.
-  // Consolidation removed the legacy persona-card import/export codecs.
-  ["src-tauri/src/commands/personas/mod.rs", 984],
-  // #1418 read-path fix: get_thread_replies' blocker fix (shared TIMELINE_KINDS
-  // const + build_thread_replies_filter helper, mirroring the channel sibling so
-  // the two p-gate filters can't drift) plus two guard unit tests. The file was
-  // already at 995; this load-bearing correctness fix crossed 1000. Not generic
-  // debt growth. Approved override; queued to split with the rest of this list.
-  ["src-tauri/src/commands/messages.rs", 1082],
-  // Residual repos_dir integration in ensure_nest_at: REPOS is provisioned
-  // outside NEST_DIRS (it may be a symlink), so it needs its own create +
-  // chmod-only-when-real-dir handling plus integration test coverage. The
-  // self-contained repos_dir functions and their unit tests live in repos.rs;
-  // this is the seam that must stay in nest.rs. Approved override; still queued
-  // to split with the rest of this list.
-  // dev-nest namespace: OnceLock<Option<PathBuf>> + init_nest_dir + constants
-  // added to plumb the dev/prod discriminator. Load-bearing for the D2 nest fix.
-  // dev-build CLI symlink: cli_link_name helper + is_dev param on
-  // ensure_cli_symlink + prod/dev test variants add ~68 lines. Load-bearing;
-  // queued to split with the rest of this list.
-  // +4 lines: adopt shared create_symlink wrapper (behavior-preserving refactor
-  // for multi-line rustfmt expansion of the skills symlink call site).
-  // unified-agent-model 1A.1: inline test module moved to nest/tests.rs,
-  // ratcheting 1575 -> 679 (under the 1000 default; entry kept as a ratchet).
-  // observer-archive dev-default: path_is_dev_nest + nest_is_dev getters
-  // (+25 lines) so observer_archive_default_enabled() keys off the dev nest.
-  // Load-bearing; spends banked ratchet headroom, still well under 1000.
-  ["src-tauri/src/managed_agents/nest.rs", 704],
-  // keyring-dev-isolation: agent key migration added copy_agent_keys_between_stores
-  // and load_readonly support; file grew past 1000 default. Queued to split.
-  // +7 for try_delete_agent_key result-returning seam (snapshot-import rollback).
-  // +48 (1335 -> 1383): agents-everywhere pair re-key — pair-scoped runtime
-  // receipts (write_agent_runtime_receipt atomic JSON + remove/read_all
-  // helpers) replace the pubkey-keyed PID file, plus the hashed pair-scoped
-  // runtime log path. Load-bearing crash-recovery surface; queued to split.
-  ["src-tauri/src/managed_agents/storage.rs", 1383],
-  // harness-persona-sync: persona-runtime resolution threaded into the spawn
-  // path here. Load-bearing feature growth; queued to split in the resolver
-  // unify refactor followup. +26 for resolve_effective_prompt_model_provider
-  // re-introduced after 826d735fe removal (config-bridge caller still needs it).
-  // PGID resolution helper + PID-recycling safety guard added for orphan sweep.
-  // activity-feed threads avatar_url into build_managed_agent_summary for the
-  // assistant-bubble pinned snapshot.
-  // +1 for agent_pubkey field in setup payload (config-nudge card wire).
-  // persona-blank-fallback: resolve_effective_prompt_model_provider gains a
-  // record_provider param + applies persona_field_with_record_fallback. +5 lines.
-  // global-agent-config: spawn_agent_child loads global config and merges as
-  // lowest env layer (+8 lines). Queued to split.
-  ["src-tauri/src/managed_agents/runtime.rs", 2216],
-  // config-bridge setup-payload env-boundary fix adds readiness wiring in
-  // spawn_agent_child; load-bearing security fix, queued to split.
-  ["src-tauri/src/managed_agents/config_bridge/reader.rs", 1016],
-  // config-bridge-aware requirements: goose_requirements + injection tests
-  // (4 new tests in goose_file_config_tests module) + test-determinism fixes
-  // for the 3 existing goose tests that previously read real disk config.
-  // New file in this PR; queued to split.
-  // +2 readiness integration tests for flat-DATABRICKS_HOST canonicalization fix.
-  // +1 cargo fmt whitespace reformat (readiness.rs closures inline after rebase).
-  // +2 unit tests for cli_login_requirements resolve_command integration (DMG PATH fix).
-  // Doctor-CTA: reworked cli_login_requirements to carry AcpAvailabilityStatus,
-  // skip login probe for not-installed/adapter-missing/cli-missing states, and
-  // added 4 unit tests covering each arm. Load-bearing discoverability fix.
-  // Updated existing codex_not_ready test to use make_cli_runtime stub.
-  // +4 lines: #1640 persona-env-vars-refresh rebase added availability-classification
-  // growth in the live-persona env merge path. Feature plumbing, not generic debt.
-  // Windows-CI portability: replaced POSIX true/false probes with current_exe()
-  // stand-in + present_binary_str()/static_commands() helpers (+29 lines).
-  // Tests now pass on windows-latest CI shard without POSIX shell utilities.
-  // databricks-v1-to-v2-migration: databricks-v2 hyphen-alias added to all
-  // host/credential match arms + 30+ readiness tests for provider aliases,
-  // missing-host, and DATABRICKS_MODEL fallback. Load-bearing correctness fix.
-  // #1613 augmented-PATH readiness probes grew the file +3 past the prior cap.
-  // +16: resolve_effective_agent_env + global-config readiness wiring (#1448).
-  // +1 rebase merge: GlobalAgentConfig import added alongside AcpAvailabilityStatus.
-  // +2 rebase onto #1667: behavioral quad fields in AgentDefinition/ManagedAgentRecord.
-  // +3 rebase onto main (#1568 + #1613): identity-import-keyring + augmented-PATH probes.
-  // +18: CliConfigInvalid requirement surface for config-parse probe classification —
-  // new Requirement variant + updated cli_login_requirements + 3 new probe-layer tests.
-  // Load-bearing UX fix (bad config → clear diagnostic, not "run codex login").
-  // codex-acp-package-swap: AdapterOutdated version-probe in cli_login_requirements
-  // (+22 lines). Load-bearing — blocks login gate for deprecated 0.16.x adapter.
-  // code-reviewer fix-round: codex readiness gate tests — 2 new tests for
-  // outdated-adapter and garbage-version-output paths through the codex id gate
-  // (+140 lines: make_codex_runtime helper, PATH_MUTEX serializer, 2 test fns).
-  // Load-bearing test coverage; queued to split with the file generally.
-  // +1: pub(crate) mod cli_probe declaration for doctor auth probe access.
-  // +3: auth_probe_args: None + login_hint: None added to make_cli_runtime and
-  // make_codex_runtime stubs (new KnownAcpRuntime fields).
-  // Git Bash readiness is intentionally colocated with buzz-agent's other
-  // setup-mode requirements. The Windows-only requirement and serialization
-  // test add eight lines; split remains queued with the existing file debt.
-  // Windows Doctor install fix: cli_install_commands_windows field added to test stubs.
-  // team-instructions-first-class: ManagedAgentRecord fixture gains the new
-  // team_id field (+1 line).
-  ["src-tauri/src/managed_agents/readiness.rs", 1765],
-  // Windows PATH-correctness fix: 3 #[cfg(windows)] test functions covering
-  // .cmd shim rejection, .bat shim rejection, and .exe acceptance for
-  // configure_runtime_cli (fix #2397). Test-only growth; queued to split.
-  ["src-tauri/src/managed_agents/runtime/tests.rs", 1041],
-  // applyWorkspace reposDir parameter plus the validateReposDir binding,
-  // threaded through Tauri invokes for configurable repos_dir, plus the
-  // harness-persona-sync `harnessOverride` create-input bit — load-bearing
-  // parameter plumbing, not generic debt growth. Approved override; still
-  // queued to split. Read-path lanes 1+2 add server-side fetch bindings
-  // (getThreadReplies + getChannelMessagesBefore) and paged people-search
-  // reachability — load-bearing reachability plumbing, not generic debt.
-  // #1418 read-path fix: +3 doc-only lines correcting the getThreadReplies
-  // contract (replies-only, root excluded — the query keys on root_event_id,
-  // which root rows lack). Documentation accuracy, not code growth.
-  // linux-updater isAutoUpdateSupported() binding + onboarding has_profile_event field.
-  // config-bridge-aware requirements: getRuntimeFileConfig command adds ~15 lines.
-  // +26 lines from PRs landing on main between prior rebase and this rebase.
-  // baked-env-required-badge: getBakedBuildEnvKeys wrapper adds ~16 lines. Queued to split.
-  // restart-badge: started the queued split — start/stopManagedAgent moved to
-  // tauriManagedAgents.ts; limit ratcheted down 1388 → 1380 to bank the headroom.
-  // identity-import-keyring: identity wrappers (RawIdentity, getIdentity, getNsec,
-  // importIdentity, persistCurrentIdentity) moved to tauriIdentity.ts;
-  // limit ratcheted down 1380 → 1360 to bank the headroom (absorbs main-side
-  // growth landed between the split and the rebase).
-  // mention-alias fix: profile wrappers (RawProfile/RawUserProfileSummary types,
-  // getProfile/updateProfile/getUserProfile/getUsersBatch/searchUsers) moved to
-  // tauriProfiles.ts; limit ratcheted down 1360 → 1241 to bank the headroom.
-  // baked-env fold-in: getBakedBuildEnv + BakedEnvEntry type adds ~28 lines.
-  // doctor-npm-eacces-preflight: hint field on RawInstallStepResult + mapper
-  // passthrough (+2 lines).
-  // doctor-install-reliability: node_required + auth_status + login_hint fields
-  // added to RawAcpRuntimeCatalogEntry + fromRawAcpRuntimeCatalogEntry mapper (+8).
-  // codex-install-auto-restart: restarted_count + failed_restart_count added to
-  // RawInstallRuntimeResult + fromRawInstallRuntimeResult mapper (+2).
-  // Git Bash Doctor discovery adds the raw Tauri response and its camelCase
-  // mapper. This is the existing API boundary; split remains queued.
-  // team-instructions-first-class: createManagedAgent Tauri bridge threads the
-  // new teamId input through to the backend (+1 line).
-  ["src/shared/api/tauri.ts", 1305],
-  // doctor-npm-eacces-preflight: hint field added to InstallStepResult (+1 line).
-  // codex-acp-package-swap: "adapter_outdated" variant added to AcpAvailabilityStatus (+1 line).
-  // doctor-install-reliability: AuthStatus tagged union + nodeRequired/authStatus/
-  // loginHint fields on AcpRuntimeCatalogEntry (+14 lines). Load-bearing new feature.
-  // agent-lifecycle-fixes: GlobalAgentConfigSaveResult type grows with
-  // failed_restart_count (+2 lines). Queued to split with the rest of this list.
-  // mcp-readonly-view rebase: PR2 MCP config surface FE-type fields force +1 over the grandfathered ceiling.
-  // Git Bash prerequisite payload adds four fields to the shared Tauri API
-  // contract. This is the canonical type location; split remains queued.
-  // signout-wipe: resetFailed field added to Identity type (+6 lines).
-  // team-instructions-first-class: CreateManagedAgentInput.teamId (+2, incl.
-  // doc comment) and AgentTeam/CreateTeamInput/UpdateTeamInput.instructions
-  // (+3) — the new team-id spawn link and the runtime-layered instructions
-  // field.
-  ["src/shared/api/types.ts", 1047],
-  // readiness-gate: PersonaDialog.tsx threads computeLocalModeGate +
-  // requiredCredentialEnvKeys + RequiredFieldLabel so the "New agent" dialog
-  // shows required markers and credential amber rows (parity with
-  // CreateAgentDialog). +23 lines of gate wiring. Queued to split.
-  // config-bridge-aware requirements: useRuntimeFileConfigQuery wiring adds
-  // ~16 lines. Queued to split.
-  // baked-env-required-badge: useBakedBuildEnvKeysQuery + bakedEnvKeys wiring
-  // + correct exclusion-semantics for requiredEnvKeys adds ~14 lines.
-  // +2 lines: filter managed provider key from requiredEnvKeys (suppress dead-input locked row).
-  // global-agent-config parity: wire useGlobalAgentConfig into PersonaDialog
-  // (Gap A: global-aware computeLocalModeGate + drop bare requiredCredentialEnvKeys;
-  // Gap B: hasAutoOpenedAdvancedRef auto-expand effect) + effective-provider
-  // save gate + Inherit/Select-a-provider label. Queued to split.
-  ["src/features/agents/ui/PersonaDialog.tsx", 1080],
-  // harness-persona-sync feature growth, queued to split in the resolver-unify
-  // refactor followup. discovery.rs is dominated by the new test module
-  // (the effective_agent_command / divergent / create-time override matrix);
-  // alias-preservation coverage extends that matrix so create-time persona
-  // agents keep an installed runtime alias when the primary command is absent.
-  // Load-bearing, not generic debt.
-  // config-bridge: schema-driven field extraction adds ~26 lines. Queued to split.
-  // config-parity: max_tokens_env_var + context_limit_env_var fields added to
-  // KnownAcpRuntime (2 fields × 4 runtimes + discovery tests = ~13 lines).
-  // Load-bearing — required for buzz-agent normalized config parity.
-  // same-runtime-pin: update_time_agent_command_override + its override /
-  // same-runtime / alias / sentinel / non-override / persona-less test matrix
-  // (~135 lines, mostly tests) so a deliberate Custom pin survives the update
-  // path instead of being dropped back to inherit. Load-bearing, not debt.
-  // unified-agent-model 1A.1: inline test module moved to discovery/tests.rs,
-  // ratcheting 1259 -> 802 (under the 1000 default; entry kept as a ratchet).
-  // agent-config-propagation: the agent_command_override decision family
-  // (divergent / create-time / update-time / apply) moved to
-  // discovery/overrides.rs; ratcheting 802 -> 685 to bank the headroom.
-  // codex-acp-package-swap: probe_codex_acp_major_version (+24 lines) +
-  // AdapterOutdated version-gate in discover_acp_runtimes (+22 lines). Both
-  // load-bearing — required to detect the deprecated 0.16.x adapter and
-  // prevent silent relay breakage after the spawn-contract change.
-  // codex-acp-package-swap follow-up: tempfile-based bounded stdout read
-  // (+18 lines), codex_adapter_availability/is_outdated helpers (+16 lines),
-  // cross-platform probe contract. All load-bearing — required for correct
-  // probe behaviour on Windows and descendant-process edge cases.
-  // doctor-install-reliability: refreshable login_shell_path cache,
-  // find_nvm_default_bin + parse_semver_tag helpers, auth probe cache +
-  // probe_auth_status/cached_auth_status, runtime_needs_npm, probe_args_for,
-  // PartialEntry struct, and updated discover_acp_runtimes with parallel auth
-  // probes. Load-bearing fresh-install reliability fixes. (+289 lines)
-  // doctor-install-reliability review fixes: LoginShellPath enum + double-checked
-  // locking, is_safe_nvm_tag security validation, classify_probe_output helper,
-  // auth_probe_args on KnownAcpRuntime (removes probe_args_for indirection),
-  // process-level timeout replacing inner-thread pattern. (+75 lines)
-  // codex-install-auto-restart review-fixes: availability_drift pure predicate
-  // + updated adapter_availability_cached() signature (Option return, cold=None)
-  // prevents false restart badge on newly restarted agents. Correctness fix;
-  // load-bearing — required by Thufir's IMPORTANT findings. (+15 lines)
-  // Windows Doctor install fix: cli_install_commands_windows field, impl block
-  // for cli_install_commands_for_os(), command_basenames() + .cmd/.bat resolution,
-  // Windows well-known dirs in common_binary_paths(), login_shell_candidates(),
-  // path_candidates_from_env_raw(). Load-bearing Windows platform support.
-  // +13: fetch_login_shell_path_inner Windows guard (POSIX PATH → None).
-  // resolve_git_bash made pub(crate) for Windows test access.
-  // +1: login_shell_candidates doc comment expanded for resolve_bash_path.
-  // Buzz-managed Node path helpers and resolution tests moved to
-  // managed_node_paths.rs and discovery/tests/managed_path_resolution.rs;
-  // ratcheting 1366 -> 1392 after adding the managed-path probes to discovery.
-  ["src-tauri/src/managed_agents/discovery.rs", 1393],
-  // rebase over codex-acp-package-swap: its version-probe tests union with the
-  // doctor-install-reliability nvm/login-shell/semver tests — each side alone
-  // stayed under the 1000 default; the union exceeds it.
-  // Windows Doctor install fix: command_basenames, cli_install_commands_for_os,
-  // and login_shell_candidates tests. Load-bearing platform-awareness coverage.
-  // +132: pass 2 — five cfg(windows) behavioral tests: command_basenames .cmd/.bat
-  // candidates, cli_install_commands_for_os PowerShell selection, login_shell_path
-  // None regression, .cmd shim resolution, no-git-bash error hint.
-  // +32: deterministic .cmd resolver + no-registry + install_shell_from tests.
-  // Managed-path resolution test split to discovery/tests/managed_path_resolution.rs.
-  ["src-tauri/src/managed_agents/discovery/tests.rs", 1273],
-  // identity-import-keyring: the identity resolution state machine's behavioral
-  // matrix (46 tests over FakeIdentityStore — probe × marker × file cells,
-  // adoption / read-back-corruption / marker-failure arms, recovery-mode
-  // gating). Load-bearing regression coverage for silent identity rotation,
-  // not generic debt growth. Approved override; split if the matrix grows.
-  ["src-tauri/src/app_state_tests.rs", 1420],
-  // migration_tests.rs carries the harness-sync migration coverage plus the
-  // patch_json_records owner-only writeback regression test (SECURITY.md:90
-  // crash-safe 0o600 fallback). Load-bearing security + feature coverage, not
-  // generic debt growth. Approved override; still queued to split. Event-sync
-  // (persona/team event reconcile) tests were split out to event_sync_tests.rs
-  // and the limit ratcheted 1410 → 1110.
-  // unified-agent-model 1A.1: materialize tests live with their module in
-  // migration/materialize.rs; ratchet held at 1110.
-  ["src-tauri/src/migration_tests.rs", 1110],
-  ["src-tauri/src/nostr_convert.rs", 1126],
-  // degraded-network resilience: relay.rs grew past 1000 with the addition of
-  // relay_error_message hint-capping (oversized-hint test via loopback TCP) and
-  // the relay_admission freshness-verification test. The loopback mock was
-  // hardened (std::net + request-read-before-write) adding ~10 lines.
-  // Queued to split test helpers to relay/tests.rs.
-  // +30 (1047 -> 1077): agents-everywhere pair re-key — query_relay_at_with_keys
-  // (NIP-98 signed /query with explicit agent keys + optional x-auth-tag) for
-  // bounded-auth agent relay-membership discovery. Load-bearing; queued to
-  // split alongside the test-helper split.
-  ["src-tauri/src/relay.rs", 1077],
-  // degraded-network resilience: visibleChannelId field + getter/setter, NOTICE
-  // handler for relay back-pressure, and rate-limit gate imports add ~74 lines
-  // of load-bearing degraded-network recovery code. Queued to split.
-  ["src/shared/api/relayClientSession.ts", 1096],
-  // Boot-time event sync (persona/team/agent event reconcile) was split out
-  // to event_sync.rs, ratcheting this limit 1575 → 1310. Remaining content is
-  // the pre-identity data migrations; still queued to split further.
-  // unified-agent-model 1A.1: materialize_agent_runtimes split to
-  // migration/materialize.rs, ratcheting 1310 -> 1297.
-  // databricks-v1-to-v2-migration: reconcile_databricks_v1_to_v2 migration
-  // + inner fn with baked-env gate + 26 tests. Load-bearing correctness fix.
-  // am review fix: also clear stale V1 model field on provider rewrite +
-  // new model-clear test. Load-bearing chimera fix.
-  // keyring-dev-isolation: run_boot_migrations wires agent-key migration.
-  ["src-tauri/src/migration.rs", 1436],
-  // onMarkRead + isUnread prop threading (mirrors the onMarkUnread prop
-  // already here) for the single-toggle mark-read/unread menu item — a small
-  // overage from load-bearing per-message plumbing, not generic debt growth.
-  // Approved override; still queued to split with the rest of this list.
-  ["src/features/messages/ui/MessageThreadPanel.tsx", 1006],
-  // AgentConfigPanel footer fold into ProfileFieldGroup for the config-bridge
-  // panel — a small overage from load-bearing UI plumbing, not generic debt
-  // growth. Approved override; still queued to split with the rest of this list.
-  // +135 for AgentInfoFocusedView/DiagnosticsFocusedView/ChannelsFocusedView
-  // props restored after 826d735fe removal (UserProfilePanel.tsx still needs them).
-  ["src/features/profile/ui/UserProfilePanelSections.tsx", 1140],
-  // +14 for openEditAgent event subscription (config-nudge card "Open Edit Agent" action).
-  // +11 for editAgentFocus state + initialFocus prop threading (deep-link granularity).
-  ["src/features/profile/ui/UserProfilePanel.tsx", 1025],
-  // PersistBackend enum + marker-on-keyring-success plumbing and its three
-  // fail-closed regression tests (silent identity rotation on keyring outage).
-  // A small overage from load-bearing security plumbing on a file already at
-  // 893 lines, not generic debt growth. Approved override; still queued to split.
-  // cross-process keychain race fix (D3): interprocess lock + BlobLockGuard +
-  // uid-keyed lockfile path + behavioral tests add ~303 lines. Load-bearing
-  // security fix for the lost-update race that stranded agent keys.
-  // identity-import-keyring: KeyringLockedScreen, RecoveryScreen,
-  // load_readonly + load_all_readonly + store_all for safe cross-service reads.
-  // sign-out wipe: delete_all() method removes the entire keychain blob under
-  // the interprocess advisory lock; +8 lines. Load-bearing; queued to split.
-  // signout-wipe phase 2: delete_all_with_legacy_cleanup replaces delete_all;
-  // reads blob keys + deletes per-key legacy entries to prevent resurrection.
-  // + regression test for per-key resurrection via real OS keychain.
-  // Net growth ~36+32 lines over prior cap. Load-bearing correctness fix.
-  // signout-wipe pass-2 (F2): delete_all_with_legacy_cleanup DPK deletes now
-  // observable (propagate real errors); verify_fully_wiped checks all three
-  // keychain shapes (main blob, DPK blob, per-key "identity"). +73 lines.
-  ["src-tauri/src/secret_store.rs", 1307],
-  // keyring-dev-isolation: keyring_service() fn (7 lines) replaces the const
-  // to return "buzz-desktop-dev" in debug builds. Load-bearing isolation fix.
-  // +10 (1042 -> 1052): media_fetch_client with redirect::Policy::none() so a
-  // relay 3xx cannot forward the minted auth header cross-origin (SSRF fix).
-  // +16 (1052 -> 1068): extracted that client into `build_media_fetch_client()`
-  // -> Result so the fail-closed invariant is testable (no silent redirect-
-  // following fallback; startup panics loudly instead). The function belongs
-  // here beside `build_app_state` and its sibling client; its doc comment
-  // carries the load-bearing SSRF rationale. Extraction would only relocate,
-  // not reduce, the security-critical code.
-  // +5 (1068 -> 1073): merge with main, which independently added the
-  // managed_agent_profile_reconcile_enabled flag (field + doc + init) under
-  // its own 1042-line override. Union of two separately approved additions.
-  // +8 (1073 -> 1081): agents-everywhere pair re-key — managed_agent_processes
-  // and session_config_cache re-keyed by ManagedAgentRuntimeKey, the runtime
-  // transition lock doc broadened to cover all protected-PID transitions, and
-  // clear_agent_session_caches (per-pubkey retain) added alongside the
-  // per-key clear. Load-bearing identity-contract change; queued to split.
-  ["src-tauri/src/app_state.rs", 1081],
-  // multi-slot splitting + no-op suppression (#1309): the ReadStateManager
-  // class grew from ~700 lines to ~1019 with the addition of
-  // splitContextsIntoBudgetedSlots (pure fn + 5 tests), publishSplitSlots,
-  // publishOneSlot, deleteExtraSlots, and the no-op suppression integration
-  // test. Load-bearing feature growth, queued to split publishSplitSlots path
-  // into readStateManagerSplit.ts.
-  ["src/features/channels/readState/readStateManager.ts", 1030],
-  // review feedback on #1492 restored the two-line load-bearing comment
-  // documenting why `lastMessageAt` must not be an `activeReadAt` fallback
-  // (reply-inclusive; would clear unread state early). The file was already
-  // at the 1000 ceiling; comment-only overage, not code growth. Queued to
-  // split with the rest of this list.
-  // member-agent-flags: messageProfiles merge + ref stabilisation split out to
-  // useMessageProfiles.ts, ratcheting 1002 -> 972 (under the 1000 default;
-  // entry kept as a ratchet). +7 rebase onto main (#1698 timeline-window
-  // growth), 972 -> 979.
-  ["src/features/channels/ui/ChannelScreen.tsx", 979],
-  // forced-unread persistence: markChannelUnread now writes through to
-  // forcedUnreadStore (localStorage) so the sidebar badge survives reload and
-  // the rail observer can read it. Three clear points added (markChannelRead,
-  // markAllChannelsRead, drainSyncedAdvances). Load-bearing fix, not generic
-  // debt growth. Queued to split with the rest of this list.
-  ["src/features/channels/useUnreadChannels.ts", 1022],
-  // Shared UI was added to this guard after splitting globals/markdown so
-  // large shared renderers cannot grow further while follow-up splits land.
-  // +33 for config-nudge detect-and-render + author-auth gate (normalizePubkey guard).
-  ["src/shared/ui/markdown.tsx", 2152],
-  // +15 (2199 -> 2214): the video right-click Download/Copy menu's props,
-  // hook wiring, and render slot. The stateful menu logic (~52 lines) was
-  // extracted to useVideoContextMenu.tsx; what remains here is the component's
-  // public interface (downloadUrl/filename props) and cannot move out.
-  ["src/shared/ui/VideoPlayer.tsx", 2214],
-  ["src/shared/ui/sidebar.tsx", 1042],
-  // permission-outcome (fix #1381 regression): pendingPermissions state map,
-  // describePermissionOutcome helper, jsonRpcId key helper (handles both
-  // string and finite-number JSON-RPC ids per spec), and the acp_write
-  // response correlation branch are all tightly coupled to the existing
-  // request handler. Load-bearing logic growth, not generic debt. Queued to
-  // split into a dedicated permission module in the next transcript refactor.
-  // +123: observer parity — 4 new named session/update classifier cases
-  // (current_mode_update, usage_update, available_commands_update,
-  // config_option_update) + replaceLifecycleItem helper for usage coalescing +
-  // system-prompt ordering fix (turnId: null for per-channel items).
-  // +35: session/new reposition-on-refire fix — removeItem helper +
-  // upsertMetadata restart branch (remove+sealOpenMessages+push instead of
-  // replaceItem in-place) so system-prompt anchor moves to stream tail.
-  // Load-bearing feature growth; queued to split in next transcript refactor.
-  ["src/features/agents/ui/agentSessionTranscript.ts", 1202],
-  // catalog module; agent_models.rs retains the thin wrapper (~50 lines).
-  // File still exceeds 1000 due to OpenAI/Anthropic discovery + subprocess
-  // fallback. Queued to split into dedicated discovery modules.
-  // Kept activity-feed design fixture: realistic prompt context and tool-heavy
-  // chatter for render-class test/reference coverage. Queued to split with the
-  // rest of this list if it grows further.
-  // +2: baked build env folded under merged_env in both get_agent_models and
-  // discover_agent_models so in-process discovery sees baked provider config on
-  // a GUI-launched DMG (the discovery_env_with_baked_floor fold).
-  // +3: provider tri-state applied in update_managed_agent handler
-  // (if let Some(provider_update) = input.provider { record.provider = provider_update; }).
-  // +8: harness_override thread-through in update_managed_agent so a deliberate
-  // Custom pin routes to update_time_agent_command_override (comment + call).
-  ["src-tauri/src/commands/agent_models.rs", 1079],
-  // global-agent-config: get_agent_config_surface / write_agent_config_field /
-  // put_agent_session_config commands + GlobalAgentConfig serde types. New file
-  // in this PR; queued to split with the command module refactor.
-  // +17: baked-env-global-unify: BUZZ_AGENT_THINKING_EFFORT added to
-  // is_safe_to_reveal allowlist + baked_env_thinking_effort_is_unmasked test.
-  // +1: doctor-install-reliability: login_hint: None added to goose_runtime test stub.
-  // +1: doctor-install-reliability review fixes: auth_probe_args: None added to stub.
-  // +11 (1021 -> 1032): agents-everywhere pair re-key — session-cache reads in
-  // get_agent_config_surface derive the ManagedAgentRuntimeKey (relay-URL
-  // fallback resolution) and put_agent_session_config gains a relay_url param.
-  // Load-bearing identity plumbing; queued to split.
-  // +18 (1032 -> 1050): review fix — put_agent_session_config reads the pair
-  // relay from the harness-attached payload relayUrl (with effective-relay
-  // fallback for older harnesses) instead of a required arg the frontend
-  // wrapper never passed, which silently broke the session-config cache.
-  ["src-tauri/src/commands/agent_config.rs", 1050],
-  // codex-install-auto-restart review-fixes: should_restart_after_install
-  // takes pid_alive:bool (pure predicate, no OS-dependent call); 3 racy
-  // cache tests replaced with 6 pure availability_drift predicate tests;
-  // dead-pid non-happy-path added. All load-bearing correctness fixes.
-  // (+17 lines net vs previous 1330 limit; rustfmt expanded some call sites)
-  // Git Bash Doctor discovery exposes a narrow async Tauri command at the
-  // existing discovery boundary. The ten-line addition preserves the platform
-  // neutral frontend contract; split remains queued.
-  // Windows Doctor install fix: resolve_install_shell() + install_shell_command()
-  // returns Result (Windows Git Bash resolution, CREATE_NO_WINDOW, taskkill timeout
-  // kill), cli_install_commands_for_os() callsite, unit tests for shell selection
-  // and per-OS install command accessor. Load-bearing Windows platform support.
-  // +53: pass 2 — three cfg(windows) install shell tests (resolve succeeds with
-  // Git, error hint content, install_shell_command succeeds).
-  // +8: install_shell_from pure seam extracted for deterministic testing.
-  // +287: is_powershell_command + install_powershell_command + build_install_command
-  // route PowerShell CLI installs natively on Windows (bypasses Git Bash PATH
-  // poisoning that resolved GNU tar instead of bsdtar → Codex install failure).
-  // Includes unit tests for detection, routing, and -Command body preservation.
-  // +16: test_powershell_command_goose_catalog_dequoted proves the \$→$ escape
-  // fix for the Goose Windows installer (PR #2680 interaction with #2750).
-  // +10: pass an explicit PATH through Codex adapter install planning so unit
-  // tests avoid the process-global login-shell PATH cache.
-  ["src-tauri/src/commands/agent_discovery.rs", 1836],
-  // draft-persistence predicate: submit-time `loadDraft` check + inline comment
-  // + deps-array entry in submitMessage closes the never-persisted-boundary
-  // defect (Thufir Pass-3 finding). Load-bearing correctness fix; queued to
-  // split MessageComposer into submit/edit/media sub-modules.
-  // +18: pendingImetaForPersistRef (local snapshot ref) + synchronous restore
-  // path writes in the draft-key effect body, fixing the image-drop bug on
-  // top-level nav switch (StrictMode simulate-unmount race on remount).
-  // +12 autoSubmitDraftKey/onAutoSubmitComplete props + onAutoSubmitCompleteRef
-  // + mount-only useEffect for the Drafts-panel "Send message" confirm-dialog
-  // flow. Load-bearing feature growth; queued to split with the rest of this
-  // list.
-  // +3: onLinkShortcutRef wiring (ref decl + editor option + assignment) for
-  // the ⌘K link-editor shortcut, mirroring the existing onEditLinkRef
-  // pattern. Queued to split with the rest of this list.
-  // +35: persistent audience scope/hook wiring and chip component handoff. The
-  // chip markup lives separately; remaining lines connect existing composer
-  // send state to the audience store. Queued with the existing split.
-  // +23: edit-to-add-mention notify (8ace8eed) — onEditSave/edit-branch
-  // mentionPubkeys threading + two snapshot refs (extractMentionPubkeys,
-  // ownerPubkey) feeding the newly-added-mentions diff. Diff logic itself
-  // lives in threading.ts (diffAddedMentionPubkeys); this is the minimal
-  // composer-side wiring. Queued to split with the rest of this list.
-  ["src/features/messages/ui/MessageComposer.tsx", 1114],
-  // global-agent-config: model-tuning section (BuzzAgentModelTuningFields via
-  // EditAgentAdvancedFields) + providerValid gate + effectiveProvider derivation
-  // + globalProvider threading into getPersonaProviderOptions. All load-bearing
-  // feature logic; queued to split with the rest of this list.
-  ["src/features/agents/ui/EditAgentDialog.tsx", 1088],
-  // global-agent-config rebase over #1639: AgentInstanceEditDialog (renamed from
-  // EditAgentDialog by #1639) gained initialFocus?/EditAgentFocusTarget prop
-  // threading from the deep-link focus feature, and isEditAgentProviderSaveValid
-  // extracted as a testable helper with originalRuntimeSupportsProvider to close
-  // the runtime-switch hole in Will's (b) providerValid gate narrowing.
-  // E2E-fix round: added globalProvider fallback to useRequiredCredentialState
-  // call site and buzz-agent auto-expand effect for model-tuning knob visibility.
-  // F1-fix: added globalEnvVars to useRequiredCredentialState so globally-satisfied
-  // credential keys are excluded from requiredEnvKeyMissing (display/gate parity).
-  // Feature logic, not generic debt. Approved override; still queued to split.
-  // +23 rebase onto #1667: behavioral quad fields (respond_to/parallelism/toolsets)
-  // plumbed through AgentInstanceEditDialog from PersonaAdvancedFields.
-  // +2 provider-aware effort: model/provider props threaded to BuzzAgentModelTuningFields.
-  // +15 provider/model dropdown fixes: useBakedBuildEnvKeysQuery + hideProviderIds
-  // for Databricks v1 gate; prospectiveRuntimeId default fallback for builtins.
-  // PR-B moves default/API-key derivation into shared hooks; the explicit
-  // hidden-key projection keeps the top-level secret out of Advanced rows.
-  ["src/features/agents/ui/AgentInstanceEditDialog.tsx", 1195],
-  // AgentDefinitionDialog grew past 1000 with the following load-bearing fixes:
-  // isRuntimeAutoSeededRef tracking for edit-mode seeding (Fizz shows models);
-  // runtimeSupportsLlmProviderSelection guard on discovery provider (codex fix);
-  // hideProviderIds computation for Databricks v1 gate. Queued to split.
-  ["src/features/agents/ui/AgentDefinitionDialog.tsx", 1035],
-]);
-
 await runFileSizeCheck({
   projectRoot,
   rules,
-  overrides,
   label: "Desktop",
-  scriptPath: "desktop/scripts/check-file-sizes.mjs",
 });
diff --git a/desktop/scripts/fix-appimage.sh b/desktop/scripts/fix-appimage.sh
index 45f537bb72..3cd6411996 100755
--- a/desktop/scripts/fix-appimage.sh
+++ b/desktop/scripts/fix-appimage.sh
@@ -19,12 +19,19 @@
 #     skew causes eglGetDisplay to return EGL_BAD_PARAMETER under Wayland, which
 #     WebKitWebProcess treats as fatal and aborts before the window ever appears.
 #
-#  2. GStreamer crash: linuxdeploy also bundles libgst*.so* (GStreamer core libs).
-#     AppRun unconditionally sets GST_PLUGIN_SYSTEM_PATH_1_0 to a dir inside the
-#     AppImage that the bundler never populates (bundleMediaFramework is false by
-#     default), so GStreamer's plugin discovery yields an empty registry. The
-#     "GStreamer element appsink not found" error kills the render process; as a
-#     side effect the broken run poisons ~/.cache/gstreamer-1.0/registry.x86_64.bin.
+#  2. GStreamer crash: linuxdeploy's compiled AppRun.wrapped force-sets
+#     GST_PLUGIN_SYSTEM_PATH_1_0 to $APPDIR/usr/lib/gstreamer-1.0 -- a dir the
+#     bundler never populates (bundleMediaFramework is off, and we strip the
+#     bundled libgst* core below to use the host's). Crucially, once that variable
+#     is set it *replaces* GStreamer's compiled-in default search path rather than
+#     adding to it, so the app finds ZERO plugins on every distro:
+#     "GStreamer element appsink not found" kills the WebKitWebProcess and the
+#     window never paints. An earlier revision of this script hid the failure on
+#     Debian only by symlinking usr/lib/gstreamer-1.0 to the Debian multiarch dir
+#     (/usr/lib/x86_64-linux-gnu/gstreamer-1.0); that symlink dangles on Arch and
+#     Fedora, and the "safe fallback to default discovery" it assumed does not
+#     exist -- a set GST_PLUGIN_SYSTEM_PATH_1_0 disables the default. A broken run
+#     also poisons ~/.cache/gstreamer-1.0/registry.x86_64.bin.
 #
 #  3. WebKit helper mismatch (latent): the bundled WebKit helpers
 #     (WebKitNetworkProcess/WebKitWebProcess) have RUNPATH=$ORIGIN only, and
@@ -35,11 +42,17 @@
 #     wrong -- spawning nothing, dying on unresolved bundled libs, or spawning
 #     the system helpers -- and the window never appears.
 #
-# Fix: remove the offending libs so the app uses the system copies (which are
-# newer and ABI-compatible on any distro shipping glib >= 2.72 / Ubuntu 22.04+),
-# and symlink the system GStreamer plugin directory so discovery works correctly.
-# No tauri.conf.json knob can do this — bundle.linux.appimage only exposes
-# bundleMediaFramework, files (copy-only, no remove/symlink), and bundleXdgOpen.
+# Fix: (a) remove the offending libs so the app uses the system copies (newer and
+# ABI-compatible on any distro shipping glib >= 2.72 / Ubuntu 22.04+), and
+# (b) install a launcher shim in front of the app binary that strips the
+# bundle-pointing GST_PLUGIN_* overrides AppRun.wrapped injects, letting the host
+# GStreamer resolve plugins via its own default path (correct on Debian, Arch, and
+# Fedora alike). The shim has to run *after* AppRun.wrapped: the wrapper rewrites
+# the variable last -- after every apprun-hook -- so any value set before it is
+# discarded (verified empirically; a runtime GST_PLUGIN_SYSTEM_PATH_1_0 passed
+# into the AppImage does not survive). No tauri.conf.json knob can do this --
+# bundle.linux.appimage only exposes bundleMediaFramework, files (copy-only, no
+# remove/symlink), and bundleXdgOpen.
 
 set -euo pipefail
 
@@ -61,16 +74,6 @@ APPIMAGE_NAME="$(basename "$APPIMAGE_ABS")"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 DESKTOP_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
-# Detect multiarch triplet for GStreamer plugin path.
-case "$(uname -m)" in
-  x86_64)  MULTIARCH="x86_64-linux-gnu" ;;
-  aarch64) MULTIARCH="aarch64-linux-gnu" ;;
-  *)
-    echo "Error: unsupported architecture: $(uname -m)" >&2
-    exit 1
-    ;;
-esac
-
 WORKDIR="$(mktemp -d)"
 trap 'rm -rf "$WORKDIR"' EXIT
 
@@ -88,7 +91,7 @@ if ! compgen -G "$LIBDIR/libwayland-client.so*" > /dev/null; then
   exit 1
 fi
 
-echo "==> Removing infra libs that conflict with system Mesa / GLib / GStreamer"
+echo "==> Removing infra libs that conflict with system Mesa / GLib / GStreamer / systemd"
 rm -f \
   "$LIBDIR"/libwayland-client.so* \
   "$LIBDIR"/libwayland-cursor.so* \
@@ -101,18 +104,65 @@ rm -f \
   "$LIBDIR"/libmount.so* \
   "$LIBDIR"/libblkid.so* \
   "$LIBDIR"/libselinux.so* \
+  "$LIBDIR"/libsystemd.so* \
   "$LIBDIR"/libpcre2-8.so* \
   "$LIBDIR"/libgst*.so* \
   "$LIBDIR"/libzstd.so* \
   "$LIBDIR"/libelf.so* \
   "$LIBDIR"/libffi.so*
 
-echo "==> Symlinking system GStreamer plugin directory"
-# On distros without the Debian multiarch layout (e.g. Arch), this symlink
-# dangles — GStreamer then falls back to its default plugin discovery, which
-# is a safe degradation (unlike the original empty in-bundle dir).
-rm -rf "$LIBDIR/gstreamer-1.0"
-ln -s "/usr/lib/$MULTIARCH/gstreamer-1.0" "$LIBDIR/gstreamer-1.0"
+echo "==> Installing GStreamer launcher shim on the app binary"
+# AppRun.wrapped force-sets GST_PLUGIN_SYSTEM_PATH_1_0 (and the 0.10-era
+# GST_PLUGIN_SYSTEM_PATH) to $APPDIR/usr/lib/gstreamer-1.0 — a dir we bundle no
+# plugins into. Because a set path *replaces* GStreamer's default instead of
+# extending it, the app finds zero plugins on any distro and WebKit aborts. The
+# wrapper rewrites the variable after every apprun-hook, so the only place to undo
+# it is a shim between AppRun.wrapped and the real binary. First confirm the
+# wrapper still injects the override; if a tauri/linuxdeploy bump drops it, the
+# shim becomes a harmless no-op, but we want a human to re-verify rather than
+# silently ship — so fail loudly (mirrors the libwayland guard above).
+APPRUN_WRAPPED="$WORKDIR/squashfs-root/AppRun.wrapped"
+if ! grep -aq "GST_PLUGIN_SYSTEM_PATH_1_0" "$APPRUN_WRAPPED"; then
+  echo "Error: AppRun.wrapped is missing or no longer references GST_PLUGIN_SYSTEM_PATH_1_0 — GStreamer path injection changed; re-verify fix-appimage.sh" >&2
+  exit 1
+fi
+
+APP_BIN="$WORKDIR/squashfs-root/usr/bin/buzz-desktop"
+if [[ ! -f "$APP_BIN" ]]; then
+  echo "Error: app binary usr/bin/buzz-desktop not found — bundler layout changed; update fix-appimage.sh" >&2
+  exit 1
+fi
+if [[ -e "$APP_BIN.bin" ]]; then
+  echo "Error: usr/bin/buzz-desktop.bin already exists — shim already installed?" >&2
+  exit 1
+fi
+
+# The real binary moves aside; buzz-desktop becomes a shim AppRun.wrapped execs.
+mv "$APP_BIN" "$APP_BIN.bin"
+cat > "$APP_BIN" <<'SHIM'
+#!/usr/bin/env bash
+# GStreamer shim installed by desktop/scripts/fix-appimage.sh.
+#
+# linuxdeploy's AppRun.wrapped force-sets GST_PLUGIN_SYSTEM_PATH_1_0 to an empty
+# in-bundle dir ($APPDIR/usr/lib/gstreamer-1.0). A set path *replaces* the host's
+# default GStreamer search path, so the app finds zero plugins and WebKit aborts
+# (blank window). Drop the bundle-pointing GST_PLUGIN_* overrides so the system
+# GStreamer — which we use, having removed the bundled core libs — resolves
+# plugins via its own default path on any distro. Values that don't point into
+# this AppImage are the user's own and are preserved.
+here="$(dirname "$(readlink -f "$0")")"
+appdir="$(readlink -f "$here/../..")"
+for var in GST_PLUGIN_SYSTEM_PATH_1_0 GST_PLUGIN_SYSTEM_PATH \
+           GST_PLUGIN_PATH_1_0 GST_PLUGIN_PATH \
+           GST_PLUGIN_SCANNER GST_PLUGIN_SCANNER_1_0; do
+  val="${!var-}"
+  if [[ -n "$val" && "$val" == *"$appdir/"* ]]; then
+    unset "$var"
+  fi
+done
+exec -a "buzz-desktop" "$here/buzz-desktop.bin" "$@"
+SHIM
+chmod +x "$APP_BIN"
 
 echo "==> Repacking AppImage"
 # Pass a pinned type2 runtime when provided (CI sets APPIMAGETOOL_RUNTIME_FILE);
diff --git a/desktop/src-tauri/.gitignore b/desktop/src-tauri/.gitignore
index 8c86ed783a..4ed297a74c 100644
--- a/desktop/src-tauri/.gitignore
+++ b/desktop/src-tauri/.gitignore
@@ -7,4 +7,4 @@
 /gen/schemas
 
 # Sidecar binaries (built by scripts/bundle-sidecars.sh)
-/binaries/
+/binaries
diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock
index 303c5eb1fa..d4f7a4a2d4 100644
--- a/desktop/src-tauri/Cargo.lock
+++ b/desktop/src-tauri/Cargo.lock
@@ -227,6 +227,7 @@ dependencies = [
  "parking_lot",
  "percent-encoding",
  "windows-sys 0.60.2",
+ "wl-clipboard-rs",
  "x11rb",
 ]
 
@@ -990,6 +991,7 @@ dependencies = [
 name = "buzz-core"
 version = "0.1.0"
 dependencies = [
+ "base64 0.22.1",
  "chrono",
  "hex",
  "hmac 0.13.0",
@@ -1008,7 +1010,7 @@ dependencies = [
 
 [[package]]
 name = "buzz-desktop"
-version = "0.4.26"
+version = "0.5.1"
 dependencies = [
  "anyhow",
  "arboard",
@@ -1079,6 +1081,7 @@ dependencies = [
  "tokio-tungstenite 0.29.0",
  "tokio-util",
  "toml 0.8.2",
+ "tracing",
  "url",
  "user-idle",
  "uuid",
@@ -2146,7 +2149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccc2776f0c61eca1ca32528f85548abd1a4be8fb53d1b21c013e4f18da1e7090"
 dependencies = [
  "data-encoding",
- "syn 2.0.118",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2406,6 +2409,12 @@ dependencies = [
  "tendril",
 ]
 
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
 [[package]]
 name = "dpi"
 version = "0.1.2"
@@ -4928,7 +4937,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-api-client"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "hex",
  "mesh-llm-client",
@@ -4938,7 +4947,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-api-server"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "mesh-llm-api-client",
@@ -4949,12 +4958,12 @@ dependencies = [
 [[package]]
 name = "mesh-llm-build-info"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 
 [[package]]
 name = "mesh-llm-client"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4986,7 +4995,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-config"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "dirs",
@@ -5002,7 +5011,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-embedded-runtime"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "mesh-llm-host-runtime",
@@ -5012,7 +5021,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-events"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "clap",
@@ -5024,7 +5033,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-gpu-bench"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "cc",
@@ -5037,7 +5046,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-guardrails"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "serde",
  "serde_json",
@@ -5046,7 +5055,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-hardware-profile"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "mesh-llm-native-runtime",
 ]
@@ -5054,7 +5063,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-host-runtime"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "argon2",
@@ -5147,7 +5156,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-identity"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "argon2",
  "base64 0.22.1",
@@ -5169,7 +5178,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-native-runtime"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "serde",
@@ -5180,7 +5189,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-node"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "mesh-llm-types",
@@ -5194,7 +5203,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-plugin"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5211,7 +5220,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-plugin-manager"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "dirs",
@@ -5229,7 +5238,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-protocol"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "hex",
@@ -5242,7 +5251,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-routing"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "iroh",
 ]
@@ -5250,7 +5259,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-runtime-install"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "dirs",
@@ -5273,7 +5282,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-sdk"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "mesh-llm-api-client",
@@ -5288,7 +5297,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-skills"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "dirs",
@@ -5299,7 +5308,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-system"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "chrono",
@@ -5322,7 +5331,7 @@ dependencies = [
 [[package]]
 name = "mesh-llm-types"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "hex",
  "serde",
@@ -5333,12 +5342,12 @@ dependencies = [
 [[package]]
 name = "mesh-llm-ui"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 
 [[package]]
 name = "mesh-mixture-of-agents"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "async-trait",
  "mesh-llm-guardrails",
@@ -5411,7 +5420,7 @@ dependencies = [
 [[package]]
 name = "model-artifact"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5422,7 +5431,7 @@ dependencies = [
 [[package]]
 name = "model-hf"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5440,7 +5449,7 @@ dependencies = [
 [[package]]
 name = "model-package"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5460,7 +5469,7 @@ dependencies = [
 [[package]]
 name = "model-ref"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "serde",
 ]
@@ -5468,7 +5477,7 @@ dependencies = [
 [[package]]
 name = "model-resolver"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "model-artifact",
@@ -5835,6 +5844,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "noq"
 version = "1.0.1"
@@ -5899,9 +5917,9 @@ dependencies = [
 
 [[package]]
 name = "nostr"
-version = "0.44.4"
+version = "0.44.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cf5d15d70d1f8f4059e5f79923ac15891eb691d2843d01191e0585fb064d70"
+checksum = "e826dd648489de2c5b293920e20b92932ef820302007c1987c758d4d06eeb2cf"
 dependencies = [
  "base64 0.22.1",
  "bech32",
@@ -6488,7 +6506,7 @@ dependencies = [
 [[package]]
 name = "openai-frontend"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "async-trait",
  "axum",
@@ -6674,6 +6692,16 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "os_pipe"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
+dependencies = [
+ "libc",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "os_str_bytes"
 version = "6.6.1"
@@ -9011,7 +9039,7 @@ checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
 [[package]]
 name = "skippy-cache"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "blake3",
@@ -9021,7 +9049,7 @@ dependencies = [
 [[package]]
 name = "skippy-coordinator"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "thiserror 2.0.18",
 ]
@@ -9029,7 +9057,7 @@ dependencies = [
 [[package]]
 name = "skippy-ffi"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "libloading 0.8.9",
 ]
@@ -9037,12 +9065,12 @@ dependencies = [
 [[package]]
 name = "skippy-metrics"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 
 [[package]]
 name = "skippy-protocol"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "prost",
  "prost-build",
@@ -9053,7 +9081,7 @@ dependencies = [
 [[package]]
 name = "skippy-runtime"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "libc",
@@ -9067,7 +9095,7 @@ dependencies = [
 [[package]]
 name = "skippy-server"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -9095,7 +9123,7 @@ dependencies = [
 [[package]]
 name = "skippy-topology"
 version = "0.73.1"
-source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=c441ea7f328692b18b7f49ad819c7b1a603cbdcb#c441ea7f328692b18b7f49ad819c7b1a603cbdcb"
+source = "git+https://github.com/Mesh-LLM/mesh-llm.git?rev=f455d493a2ae82baf2a326e2d0fda351433b4b30#f455d493a2ae82baf2a326e2d0fda351433b4b30"
 dependencies = [
  "serde",
  "serde_json",
@@ -10122,7 +10150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.4.3",
+ "getrandom 0.3.4",
  "once_cell",
  "rustix 1.1.4",
  "windows-sys 0.61.2",
@@ -10157,7 +10185,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662"
 dependencies = [
  "fnv",
- "nom",
+ "nom 7.1.3",
  "phf 0.11.3",
  "phf_codegen 0.11.3",
 ]
@@ -10849,6 +10877,17 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "tree_magic_mini"
+version = "3.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
+dependencies = [
+ "memchr",
+ "nom 8.0.0",
+ "petgraph",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -11403,6 +11442,76 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wayland-backend"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016ccf01d1c58b6f8999612813e17c9b2390f7d70671428869913310f83f54b8"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix 1.1.4",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c36a0f861ad76d0901f2800b46321410d9f73f2ea88aac0650d86c32688073"
+dependencies = [
+ "bitflags 2.13.0",
+ "rustix 1.1.4",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
+dependencies = [
+ "bitflags 2.13.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
+dependencies = [
+ "bitflags 2.13.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
+dependencies = [
+ "proc-macro2",
+ "quick-xml 0.41.0",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
+dependencies = [
+ "pkg-config",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.103"
@@ -12277,6 +12386,24 @@ version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
+[[package]]
+name = "wl-clipboard-rs"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3"
+dependencies = [
+ "libc",
+ "log",
+ "os_pipe",
+ "rustix 1.1.4",
+ "thiserror 2.0.18",
+ "tree_magic_mini",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+]
+
 [[package]]
 name = "wmi"
 version = "0.18.4"
diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml
index 638f0739da..8bb643fea3 100644
--- a/desktop/src-tauri/Cargo.toml
+++ b/desktop/src-tauri/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "buzz-desktop"
-version = "0.4.26"
+version = "0.5.1"
 description = "Buzz desktop app"
 authors = ["you"]
 edition = "2021"
@@ -90,14 +90,14 @@ buzz_persona_pkg = { package = "buzz-persona", path = "../../crates/buzz-persona
 buzz_sdk_pkg = { package = "buzz-sdk", path = "../../crates/buzz-sdk" }
 buzz_agent_pkg = { package = "buzz-agent", path = "../../crates/buzz-agent" }
 iroh = { version = "1.0.2", optional = true }
-mesh-llm-sdk = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "c441ea7f328692b18b7f49ad819c7b1a603cbdcb", package = "mesh-llm-sdk", default-features = false, features = ["client", "serving"], optional = true }
-mesh-llm-host-runtime = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "c441ea7f328692b18b7f49ad819c7b1a603cbdcb", package = "mesh-llm-host-runtime", default-features = false, features = ["dynamic-native-runtime"], optional = true }
+mesh-llm-sdk = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "f455d493a2ae82baf2a326e2d0fda351433b4b30", package = "mesh-llm-sdk", default-features = false, features = ["client", "serving"], optional = true }
+mesh-llm-host-runtime = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "f455d493a2ae82baf2a326e2d0fda351433b4b30", package = "mesh-llm-host-runtime", default-features = false, features = ["dynamic-native-runtime"], optional = true }
 # Model catalog + hardware survey for the Share-compute model picker (same
 # diagnose pattern as mesh-console). Lib name of mesh-llm-client is mesh_client.
-mesh-llm-client = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "c441ea7f328692b18b7f49ad819c7b1a603cbdcb", package = "mesh-llm-client", optional = true }
-mesh-llm-node = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "c441ea7f328692b18b7f49ad819c7b1a603cbdcb", package = "mesh-llm-node", optional = true }
-mesh-llm-system = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "c441ea7f328692b18b7f49ad819c7b1a603cbdcb", package = "mesh-llm-system", optional = true }
-mesh-llm-events = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "c441ea7f328692b18b7f49ad819c7b1a603cbdcb", package = "mesh-llm-events", optional = true }
+mesh-llm-client = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "f455d493a2ae82baf2a326e2d0fda351433b4b30", package = "mesh-llm-client", optional = true }
+mesh-llm-node = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "f455d493a2ae82baf2a326e2d0fda351433b4b30", package = "mesh-llm-node", optional = true }
+mesh-llm-system = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "f455d493a2ae82baf2a326e2d0fda351433b4b30", package = "mesh-llm-system", optional = true }
+mesh-llm-events = { git = "https://github.com/Mesh-LLM/mesh-llm.git", rev = "f455d493a2ae82baf2a326e2d0fda351433b4b30", package = "mesh-llm-events", optional = true }
 base64 = "0.22"
 sha2 = "0.11"
 tar = "0.4"
@@ -107,7 +107,11 @@ tauri-plugin-global-shortcut = "2"
 tauri-plugin-notification = "2.3.3"
 uuid = { version = "1", features = ["v4", "v5"] }
 png = "0.18"
-arboard = "3"
+# wayland-data-control: without it arboard is X11-only on Linux, so copies made
+# in a Wayland session land in XWayland's clipboard where Wayland-native apps
+# never see them (set_text still returns Ok). The backing wl-clipboard-rs dep is
+# target-gated inside arboard; at runtime X11 sessions still fall back to X11.
+arboard = { version = "3", features = ["wayland-data-control"] }
 image = { version = "0.25", default-features = false, features = ["jpeg", "png", "webp", "gif"] }
 zip = "8"
 flate2 = "1"
@@ -121,6 +125,7 @@ rubato = "3.0"
 audioadapter-buffers = "3.0"
 tempfile = "3"
 strip-ansi-escapes = "0.2"
+tracing = "0.1"
 
 [dev-dependencies]
 # `test-util` enables tokio's paused-clock (`start_paused`) so the relay
diff --git a/desktop/src-tauri/src/app_state.rs b/desktop/src-tauri/src/app_state.rs
index 778bd5fb3f..94d162e620 100644
--- a/desktop/src-tauri/src/app_state.rs
+++ b/desktop/src-tauri/src/app_state.rs
@@ -108,6 +108,8 @@ pub struct AppState {
     /// In-process mesh-llm node started by Buzz Desktop.
     #[cfg(feature = "mesh-llm")]
     pub mesh_llm_runtime: AsyncMutex<Option<crate::mesh_llm::DesktopMeshRuntime>>,
+    #[cfg(feature = "mesh-llm")]
+    pub mesh_recovery: crate::mesh_llm::MeshRecoveryState,
     /// Runtime-owned shared-compute coordinator. It publishes member-signed
     /// discovery status and reconciles MeshLLM's admission roster; MeshLLM
     /// itself owns direct QUIC/iroh connection establishment.
@@ -223,6 +225,8 @@ pub fn build_app_state() -> AppState {
         #[cfg(feature = "mesh-llm")]
         mesh_llm_runtime: AsyncMutex::new(None),
         #[cfg(feature = "mesh-llm")]
+        mesh_recovery: crate::mesh_llm::MeshRecoveryState::default(),
+        #[cfg(feature = "mesh-llm")]
         mesh_coordinator: AsyncMutex::new(None),
         pending_owned_channels: Mutex::new(std::collections::HashSet::new()),
     }
diff --git a/desktop/src-tauri/src/archive/mod.rs b/desktop/src-tauri/src/archive/mod.rs
index 551495d8cc..70af528156 100644
--- a/desktop/src-tauri/src/archive/mod.rs
+++ b/desktop/src-tauri/src/archive/mod.rs
@@ -494,21 +494,23 @@ pub async fn list_save_subscriptions(
 /// Does NOT purge already-archived event data — retention is decoupled in v1.
 /// GC of orphaned event rows happens in P4 purge commands, not here.
 #[tauri::command]
-pub fn delete_save_subscription(
+pub async fn delete_save_subscription(
     state: State<'_, AppState>,
     scope_type: ScopeType,
     scope_value: String,
 ) -> Result<bool, String> {
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
-    let conn = open_db()?;
-    store::delete_save_subscription(
-        &conn,
-        &identity_pk,
-        &relay_url,
-        scope_type.as_str(),
-        &scope_value,
-    )
+    run_archive_db_task(move |conn| {
+        store::delete_save_subscription(
+            conn,
+            &identity_pk,
+            &relay_url,
+            scope_type.as_str(),
+            &scope_value,
+        )
+    })
+    .await
 }
 
 // ── read_archived_events ─────────────────────────────────────────────────────
@@ -527,7 +529,7 @@ pub fn delete_save_subscription(
 /// newest-first order. Compound cursor `(before_created_at, before_id)` works
 /// identically to `read_archived_events`.
 #[tauri::command]
-pub fn read_archived_observer_events_for_channel(
+pub async fn read_archived_observer_events_for_channel(
     state: State<'_, AppState>,
     channel_id: String,
     before_created_at: Option<i64>,
@@ -536,16 +538,18 @@ pub fn read_archived_observer_events_for_channel(
 ) -> Result<Vec<String>, String> {
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
-    let conn = open_db()?;
-    store::read_archived_observer_events_for_channel(
-        &conn,
-        &identity_pk,
-        &relay_url,
-        &channel_id,
-        before_created_at,
-        before_id.as_deref(),
-        limit.unwrap_or(DEFAULT_READ_LIMIT),
-    )
+    run_archive_db_task(move |conn| {
+        store::read_archived_observer_events_for_channel(
+            conn,
+            &identity_pk,
+            &relay_url,
+            &channel_id,
+            before_created_at,
+            before_id.as_deref(),
+            limit.unwrap_or(DEFAULT_READ_LIMIT),
+        )
+    })
+    .await
 }
 
 // ── index_observer_channel_id ─────────────────────────────────────────────────
@@ -559,24 +563,26 @@ pub fn read_archived_observer_events_for_channel(
 ///
 /// Idempotent: rows that are already indexed are left unchanged.
 #[tauri::command]
-pub fn index_observer_channel_id(
+pub async fn index_observer_channel_id(
     state: State<'_, AppState>,
     entries: Vec<ObserverChannelIndexEntry>,
 ) -> Result<(), String> {
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
-    let conn = open_db()?;
-    for entry in &entries {
-        store::upsert_observer_channel_index(
-            &conn,
-            &identity_pk,
-            &relay_url,
-            &entry.event_id,
-            entry.channel_id.as_deref(),
-            entry.created_at,
-        )?;
-    }
-    Ok(())
+    run_archive_db_task(move |conn| {
+        for entry in &entries {
+            store::upsert_observer_channel_index(
+                conn,
+                &identity_pk,
+                &relay_url,
+                &entry.event_id,
+                entry.channel_id.as_deref(),
+                entry.created_at,
+            )?;
+        }
+        Ok(())
+    })
+    .await
 }
 
 /// A single (event_id, channel_id?, created_at) record used by
@@ -602,21 +608,23 @@ pub struct ObserverChannelIndexEntry {
 /// Together these constitute the one-shot idempotent backfill required by the
 /// Slice 1 acceptance criteria (Thufir Pass 4).
 #[tauri::command]
-pub fn read_unindexed_observer_rows(
+pub async fn read_unindexed_observer_rows(
     state: State<'_, AppState>,
 ) -> Result<Vec<RawObserverRow>, String> {
     let identity_pk = identity_pubkey(&state)?;
     let relay_url = relay_ws_url_with_override(&state);
-    let conn = open_db()?;
-    let rows = store::read_unindexed_observer_rows(&conn, &identity_pk, &relay_url)?;
-    Ok(rows
-        .into_iter()
-        .map(|(id, raw_json, created_at)| RawObserverRow {
-            id,
-            raw_json,
-            created_at,
-        })
-        .collect())
+    run_archive_db_task(move |conn| {
+        let rows = store::read_unindexed_observer_rows(conn, &identity_pk, &relay_url)?;
+        Ok(rows
+            .into_iter()
+            .map(|(id, raw_json, created_at)| RawObserverRow {
+                id,
+                raw_json,
+                created_at,
+            })
+            .collect())
+    })
+    .await
 }
 
 /// Wire type returned by `read_unindexed_observer_rows`.
diff --git a/desktop/src-tauri/src/commands/agent_config.rs b/desktop/src-tauri/src/commands/agent_config.rs
index f6094ed529..5a26f0f645 100644
--- a/desktop/src-tauri/src/commands/agent_config.rs
+++ b/desktop/src-tauri/src/commands/agent_config.rs
@@ -21,8 +21,7 @@ use crate::{
 
 /// Subset of the goose file config exposed to the frontend for gate evaluation.
 ///
-/// Only the fields the dialog gate needs — not the full `RuntimeConfigSurface`.
-/// The gate uses this to know which requirements are already satisfied in the
+/// Only the fields the dialog gate needs. This tracks which requirements are already satisfied in the
 /// harness config file, so it can show "Set in goose config" rather than
 /// surfacing a false missing-key marker.
 #[derive(Debug, Serialize)]
@@ -39,6 +38,13 @@ pub struct RuntimeFileConfigSubset {
 
 /// Resolve the config surface with persona and global default values applied.
 ///
+/// Linked instances are definition-authoritative: the record's own
+/// system_prompt/model/provider are cleared before applying, so a stale
+/// materialized snapshot can never shadow the persona's current values or a
+/// blank-definition fallthrough to global defaults (mirrors
+/// `effective_config::resolve_linked`). Definition-less instances keep their
+/// own explicit values.
+///
 /// The pipeline: resolve the linked persona's prompt/model/provider, inject
 /// each into the record only where the record lacks its own value, let
 /// `read_config_surface` tag those injected fields `BuzzExplicit`, then re-tag
@@ -59,6 +65,22 @@ fn resolve_config_surface(
     session_cache: Option<&SessionConfigCache>,
     global: &GlobalAgentConfig,
 ) -> RuntimeConfigSurface {
+    // Linked instances are definition-authoritative (mirrors
+    // `effective_config::resolve_linked`): the record's own
+    // system_prompt/model/provider fields are, at best, a stale materialized
+    // snapshot from the last `apply_persona_snapshot` — never a legitimate
+    // live override, since `update_managed_agent` blocks writing these three
+    // fields for linked instances. Clear them before computing `had_*` below
+    // so a stale byte can never masquerade as BuzzExplicit and suppress
+    // definition/global injection. Env var overrides (set via the advanced
+    // env-vars editor) are untouched — those remain a legitimate
+    // per-instance override regardless of link status.
+    if record.persona_id.is_some() {
+        record.system_prompt = None;
+        record.model = None;
+        record.provider = None;
+    }
+
     let had_prompt =
         record.system_prompt.is_some() || record.env_vars.contains_key("BUZZ_ACP_SYSTEM_PROMPT");
     let had_model = record.model.is_some();
@@ -172,22 +194,6 @@ fn resolve_config_surface(
         retag_global_default(&mut surface.normalized.provider);
     }
 
-    // Re-tag persona-snapshotted model from BuzzExplicit to PersonaDefault.
-    // Persona-created agents have record.model set at create time from the
-    // persona snapshot — had_model is true, but the model came from the persona,
-    // not an explicit user choice. Re-tag when the record model matches the
-    // persona model and no live override is active. Only applies when a persona
-    // is actually linked — non-persona agents with an explicit model keep BuzzExplicit.
-    if had_model && !model_overridden && record.persona_id.is_some() {
-        if let (Some(ref record_model), Some(ref persona_model_val)) =
-            (&record.model, &persona_model)
-        {
-            if record_model == persona_model_val {
-                retag_persona_default(&mut surface.normalized.model);
-            }
-        }
-    }
-
     surface
 }
 
@@ -678,8 +684,10 @@ mod tests {
             name_pool: Vec::new(),
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             definition_respond_to: None,
             definition_respond_to_allowlist: Vec::new(),
             definition_parallelism: None,
@@ -702,8 +710,10 @@ mod tests {
             name_pool: Vec::new(),
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             env_vars: Default::default(),
             respond_to: None,
             respond_to_allowlist: Vec::new(),
@@ -728,11 +738,64 @@ mod tests {
         }
     }
 
-    /// A model the user set explicitly in Buzz must never be re-tagged to
-    /// `PersonaDefault`, even when the linked persona also has a model.
+    /// Definition-authoritative: a stale materialized `record.model` on a
+    /// linked instance must never outrank (or even be consulted against) the
+    /// linked persona's model. `update_managed_agent` already blocks writing
+    /// model/provider/prompt for linked instances, so a non-`None` value here
+    /// can only be leftover snapshot bytes from before a persona edit — the
+    /// panel must report the persona's current model, tagged `PersonaDefault`,
+    /// not the stale byte as `BuzzExplicit`.
     #[test]
-    fn explicit_record_model_outranks_persona_and_keeps_buzz_explicit_origin() {
+    fn linked_stale_record_model_never_outranks_persona_model() {
         let mut record = agent_record();
+        record.model = Some("stale-explicit-model".to_string());
+        let personas = vec![persona_with_model("persona-model")];
+
+        let surface = resolve_config_surface(
+            record,
+            &personas,
+            Some(goose_runtime()),
+            None,
+            &Default::default(),
+        );
+
+        let model = surface.normalized.model.as_ref().expect("model resolved");
+        assert_eq!(model.value.as_deref(), Some("persona-model"));
+        assert_eq!(model.origin, ConfigOrigin::PersonaDefault);
+    }
+
+    /// Definition-authoritative, blank-definition case: a linked instance
+    /// whose persona has no model of its own must fall through to the global
+    /// default, tagged `GlobalDefault` — mirroring
+    /// `effective_config::resolve_linked`'s `None => global` arm. A stale
+    /// materialized record model must not shadow this fallthrough either.
+    #[test]
+    fn linked_blank_definition_model_falls_through_to_global_default() {
+        let mut record = agent_record();
+        record.model = Some("stale-explicit-model".to_string());
+        let mut persona = persona_with_model("unused");
+        persona.model = None;
+        let personas = vec![persona];
+        let global = crate::managed_agents::GlobalAgentConfig {
+            model: Some("global-model".to_string()),
+            ..Default::default()
+        };
+
+        let surface =
+            resolve_config_surface(record, &personas, Some(goose_runtime()), None, &global);
+
+        let model = surface.normalized.model.as_ref().expect("model resolved");
+        assert_eq!(model.value.as_deref(), Some("global-model"));
+        assert_eq!(model.origin, ConfigOrigin::GlobalDefault);
+    }
+
+    /// A definition-less (no `persona_id`) instance's own explicit model IS
+    /// authoritative — the stale-record clearing above is scoped to linked
+    /// instances only.
+    #[test]
+    fn definition_less_explicit_record_model_keeps_buzz_explicit_origin() {
+        let mut record = agent_record();
+        record.persona_id = None;
         record.model = Some("explicit-model".to_string());
         let personas = vec![persona_with_model("persona-model")];
 
diff --git a/desktop/src-tauri/src/commands/agent_discovery.rs b/desktop/src-tauri/src/commands/agent_discovery.rs
index e3d9b22189..d6429e0454 100644
--- a/desktop/src-tauri/src/commands/agent_discovery.rs
+++ b/desktop/src-tauri/src/commands/agent_discovery.rs
@@ -1,12 +1,11 @@
-use std::io::Read;
 use tauri::State;
 
 use crate::{
     app_state::AppState,
     managed_agents::{
         command_availability, is_npm_global_install, AcpRuntimeCatalogEntry,
-        DiscoverManagedAgentPrereqsRequest, InstallRuntimeResult, InstallStepResult,
-        ManagedAgentPrereqsInfo, RelayAgentInfo, DEFAULT_ACP_COMMAND,
+        DiscoverManagedAgentPrereqsRequest, InstallRuntimeResult, ManagedAgentPrereqsInfo,
+        RelayAgentInfo, DEFAULT_ACP_COMMAND,
     },
     nostr_convert,
     relay::query_relay,
@@ -26,7 +25,8 @@ fn active_installs() -> &'static std::sync::Mutex<std::collections::HashSet<Stri
 /// `None` if none was found).
 ///
 /// Returns `None` when no install is needed (adapter is present and current).
-/// Returns `Some(cmds)` when the adapter is missing or (for codex) outdated.
+/// Returns `Some(cmds)` when the adapter is missing or (for codex) below its
+/// minimum supported version.
 ///
 /// For the codex **outdated** case the returned sequence is a two-step
 /// reinstall: first uninstall the old `@zed-industries/codex-acp` package
@@ -69,16 +69,161 @@ pub(crate) fn plan_adapter_install<'c>(
 }
 
 #[tauri::command]
-pub async fn discover_acp_providers() -> Result<Vec<AcpRuntimeCatalogEntry>, String> {
-    tokio::task::spawn_blocking(|| {
+pub async fn discover_acp_providers(
+    app: tauri::AppHandle,
+) -> Result<Vec<AcpRuntimeCatalogEntry>, String> {
+    tokio::task::spawn_blocking(move || {
+        use tauri::Manager;
         crate::managed_agents::clear_resolve_cache();
         crate::managed_agents::refresh_login_shell_path();
-        crate::managed_agents::discover_acp_runtimes()
+        let custom_dir = app
+            .path()
+            .app_data_dir()
+            .ok()
+            .map(|d| d.join("custom_harnesses"));
+        crate::managed_agents::discover_acp_runtimes_from(custom_dir.as_deref())
     })
     .await
     .map_err(|e| format!("spawn_blocking failed: {e}"))
 }
 
+/// Write a user-defined harness definition to `<app-data>/custom_harnesses/<id>.json`.
+///
+/// Validates the definition (id regex, builtin-id collision, non-empty command
+/// and label, env well-formedness) before touching the filesystem. Returns the
+/// merged catalog entry so the UI can update the provider list without triggering
+/// a full re-discover.
+///
+/// `original_id` handles the rename case: when the user edits an existing
+/// harness and changes its id, pass the old id here so the old file is removed
+/// atomically as part of the write. If the id is unchanged or this is a new
+/// harness, omit `original_id` (or pass `None`).
+///
+/// The file is written using `atomic-write-file` (unique temp file + commit)
+/// so concurrent saves do not race on a fixed temp path, and a partial write
+/// never produces a corrupted JSON file.
+#[tauri::command]
+pub async fn save_custom_harness(
+    definition: crate::managed_agents::custom_harnesses::HarnessDefinition,
+    original_id: Option<String>,
+    app: tauri::AppHandle,
+) -> Result<AcpRuntimeCatalogEntry, String> {
+    use crate::managed_agents::{
+        custom_harnesses, AcpAvailabilityStatus, AuthStatus, HarnessSource,
+    };
+    use tauri::Manager;
+
+    // ── Phase 1: full validation before touching the filesystem ─────────────
+    // validate_harness_definition_pub now covers: id format, non-empty command/label,
+    // env key well-formedness + reserved-key check + NUL/size limits, and
+    // install_instructions_url scheme.
+    custom_harnesses::validate_harness_definition_pub(&definition)?;
+    custom_harnesses::check_id_collision(&definition.id)?;
+
+    // Validate original_id BEFORE any filesystem mutation (validate-before-mutate).
+    let rename_old_id: Option<String> = original_id.and_then(|oid| {
+        let oid = oid.trim().to_string();
+        if oid.is_empty() || oid == definition.id {
+            None
+        } else {
+            Some(oid)
+        }
+    });
+    if let Some(ref old_id) = rename_old_id {
+        custom_harnesses::check_id_collision(old_id)
+            .map_err(|_| format!("original_id {old_id:?} is a built-in and cannot be deleted"))?;
+        if !custom_harnesses::is_valid_harness_id_pub(old_id) {
+            return Err(format!("invalid original_id {old_id:?}"));
+        }
+    }
+
+    let custom_dir = app
+        .path()
+        .app_data_dir()
+        .map_err(|e| format!("failed to resolve app data dir: {e}"))?
+        .join("custom_harnesses");
+    std::fs::create_dir_all(&custom_dir)
+        .map_err(|e| format!("failed to create custom_harnesses dir: {e}"))?;
+
+    // ── Phase 2+3: backup-swap write + rename (Windows-safe, rollback on failure)
+    // `save_and_warm` holds the persist mutex for the write + registry-warm pair
+    // so concurrent saves never produce a stale registry snapshot (B-6).
+    custom_harnesses::save_and_warm(&custom_dir, &definition, rename_old_id.as_deref())?;
+
+    // Resolve availability for the returned catalog entry.
+    let (availability, command_opt, binary_path) =
+        match crate::managed_agents::find_command(&definition.command) {
+            Some(path) => (
+                AcpAvailabilityStatus::Available,
+                Some(definition.command.clone()),
+                Some(path.display().to_string()),
+            ),
+            None => (AcpAvailabilityStatus::NotInstalled, None, None),
+        };
+
+    let default_args =
+        crate::managed_agents::normalize_agent_args(&definition.command, definition.args.clone());
+
+    Ok(AcpRuntimeCatalogEntry {
+        id: definition.id,
+        label: definition.label,
+        // Security: no user-supplied avatar URL in catalog entries.
+        avatar_url: String::new(),
+        availability,
+        command: command_opt,
+        binary_path,
+        default_args,
+        mcp_command: None,
+        model_env_var: None,
+        provider_env_var: None,
+        thinking_env_var: None,
+        install_hint: definition.install_hint,
+        install_instructions_url: definition.install_instructions_url,
+        can_auto_install: false,
+        requires_external_cli: false,
+        underlying_cli_path: None,
+        node_required: false,
+        auth_status: AuthStatus::NotApplicable,
+        login_hint: None,
+        source: HarnessSource::Custom,
+        // Carry definition env back so the edit form can read and preserve it.
+        definition_env: definition.env,
+    })
+}
+
+/// Remove a user-defined harness definition from `<app-data>/custom_harnesses/`.
+///
+/// Only `source: custom` harnesses may be deleted. Attempting to delete a
+/// built-in id (goose, claude, codex, buzz-agent) returns an error without
+/// touching the filesystem.
+#[tauri::command]
+pub async fn delete_custom_harness(id: String, app: tauri::AppHandle) -> Result<(), String> {
+    use crate::managed_agents::custom_harnesses;
+    use tauri::Manager;
+
+    // Reject built-in ids early — they have no backing file to delete and
+    // must never be removable from the catalog.
+    custom_harnesses::check_id_collision(&id)
+        .map_err(|_| format!("harness {id:?} is a built-in and cannot be deleted"))?;
+
+    // Validate the id so callers cannot use path-traversal tricks.
+    if !custom_harnesses::is_valid_harness_id_pub(&id) {
+        return Err(format!("invalid harness id {id:?}"));
+    }
+
+    let custom_dir = app
+        .path()
+        .app_data_dir()
+        .map_err(|e| format!("failed to resolve app data dir: {e}"))?
+        .join("custom_harnesses");
+
+    // `delete_and_warm` holds the persist mutex for the delete + registry-warm
+    // pair so concurrent save/delete calls never produce a stale snapshot (B-6).
+    custom_harnesses::delete_and_warm(&custom_dir, &id)?;
+
+    Ok(())
+}
+
 #[tauri::command]
 pub async fn install_acp_runtime(
     runtime_id: String,
@@ -547,6 +692,62 @@ fn persist_last_error_on_install(
     save_managed_agents(app, &records)
 }
 
+/// Build the `-l -c` argument list for the install shell.
+///
+/// The body runs under `pipefail`: every CLI install command is a `curl … |
+/// bash` / `| sh` pipe, and without it the pipeline's status is the right-hand
+/// side's — `bash`/`sh` fed an empty stdin exits 0 — so a `curl` that fails (or
+/// isn't on PATH at all) was recorded as a successful `cli` step, leaving the
+/// user an unactionable `verify` error instead of curl's own stderr. Every
+/// install shell supports it; the Windows PowerShell path bypasses this shell.
+/// `SHELLOPTS` is not exported, so the piped-to vendor script keeps its own
+/// defaults.
+///
+/// Off Windows, `composed_path` is passed as a positional and re-exported
+/// *inside* the body, because `-l` sources the user's login startup files after
+/// the process environment is installed: a profile assigning PATH overwrites
+/// `cmd.env("PATH", …)` before the vendor command runs. `export PATH=` empties
+/// it outright; macOS `/etc/zprofile` runs `path_helper`, which reorders it and
+/// costs Buzz's managed Node/npm dirs their precedence. A positional rather than
+/// an interpolated body keeps entries containing spaces or quotes intact.
+///
+/// The prelude is omitted where it would do harm:
+/// - `composed_path` is `None` — `export PATH="$1"` with `$1` unset sets an
+///   *empty* PATH, worse than the ambient one.
+/// - `is_windows` — `join_paths` uses the platform separator, so the positional
+///   would be `;`-joined while bash splits PATH on `:`, collapsing every entry
+///   into one nonsense path; and Windows is where the inherited fallback always
+///   fires (`login_shell_path()` is unconditionally `None` there), so this would
+///   be the steady state. `cmd.env("PATH", …)` already delivers the native form
+///   Git Bash translates on entry, and Windows has no login startup files doing
+///   the clobbering this prelude defends against.
+///
+/// `is_windows` is a parameter rather than a `#[cfg]` so the Windows shape stays
+/// asserted on Unix CI — the same reason `should_skip_claude_executable` takes
+/// one. Extracted from `install_shell_command` for that testability, not because
+/// it has more than one caller.
+fn install_shell_args(
+    command: &str,
+    composed_path: Option<&std::ffi::OsStr>,
+    is_windows: bool,
+) -> Vec<std::ffi::OsString> {
+    let Some(path) = composed_path.filter(|_| !is_windows) else {
+        return vec![
+            "-l".into(),
+            "-c".into(),
+            format!("set -o pipefail; {command}").into(),
+        ];
+    };
+    vec![
+        "-l".into(),
+        "-c".into(),
+        format!("export PATH=\"$1\"; set -o pipefail; {command}").into(),
+        // `$0` is the shell-name slot, so the PATH must be the second positional.
+        "buzz-install".into(),
+        path.to_os_string(),
+    ]
+}
+
 /// Build a login-shell `Command` for `command` with hermit env vars stripped,
 /// Buzz-managed npm locations set, and the user's PATH set. This is the
 /// single source of truth for
@@ -561,7 +762,6 @@ fn install_shell_command(command: &str) -> Result<std::process::Command, String>
     let shell: std::path::PathBuf = resolve_install_shell()?;
 
     let mut cmd = std::process::Command::new(&shell);
-    cmd.args(["-l", "-c", command]);
 
     // Strip hermit vars and set managed npm paths (see apply_npm_env).
     apply_npm_env(&mut cmd);
@@ -569,10 +769,18 @@ fn install_shell_command(command: &str) -> Result<std::process::Command, String>
     // Compose the PATH for the install shell using the same kernel as the
     // runtime/probe path so the two can never drift.  managed entries first
     // (Node/npm bins keep precedence); login-shell entries next; inherited
-    // process PATH appended last on Windows when no login-shell PATH exists
-    // (login_shell_path() always returns None on Windows — Git Bash paths are
-    // POSIX-shaped and poison native children; cmd.env("PATH", …) replaces
-    // rather than extends, so without inherited the install shell loses npm).
+    // process PATH appended last when no login-shell PATH exists — the case
+    // where the composed PATH would otherwise be Buzz's managed Node dirs
+    // alone, with no `curl`/`sh`/`tar` for the vendor install pipes
+    // (cmd.env("PATH", …) replaces rather than extends). On Windows that case
+    // is the steady state: login_shell_path() always returns None there
+    // because Git Bash paths are POSIX-shaped and poison native children.
+    //
+    // The composed PATH is set twice on purpose off Windows: `cmd.env` so the
+    // login startup files themselves run with a usable PATH, and the `$1`
+    // export in `install_shell_args` so their own PATH assignments cannot undo
+    // it. Neither is redundant — see `install_shell_args`, which also explains
+    // why the export is suppressed on Windows.
     let login_path = crate::managed_agents::login_shell_path();
     let had_login = login_path.is_some();
     let managed: Vec<std::path::PathBuf> = [
@@ -589,14 +797,20 @@ fn install_shell_command(command: &str) -> Result<std::process::Command, String>
     let inherited: Vec<std::path::PathBuf> = std::env::var_os("PATH")
         .map(|p| std::env::split_paths(&p).collect())
         .unwrap_or_default();
-    let use_inherited = crate::managed_agents::should_use_inherited(had_login, true, cfg!(windows));
+    let use_inherited = crate::managed_agents::should_use_inherited(had_login, true);
     let path_parts =
         crate::managed_agents::compose_path_entries(managed, login, inherited, use_inherited);
-    if !path_parts.is_empty() {
-        if let Ok(path) = std::env::join_paths(path_parts) {
-            cmd.env("PATH", path);
-        }
+    let composed_path = (!path_parts.is_empty())
+        .then(|| std::env::join_paths(path_parts).ok())
+        .flatten();
+    if let Some(path) = composed_path.as_deref() {
+        cmd.env("PATH", path);
     }
+    cmd.args(install_shell_args(
+        command,
+        composed_path.as_deref(),
+        cfg!(windows),
+    ));
 
     // Detach from the controlling terminal so install scripts that read from
     // /dev/tty (e.g. Codex's "Start Codex now? [y/N]") fall back to stdin
@@ -648,72 +862,6 @@ pub(crate) fn install_shell_from(
     resolved.ok_or_else(|| crate::managed_agents::git_bash::GIT_BASH_INSTALL_HINT.to_string())
 }
 
-/// Maximum number of attempts for a transient-looking install command.
-const INSTALL_MAX_ATTEMPTS: u32 = 3;
-
-/// Run an install command, retrying transient failures with backoff.
-///
-/// Runtime installs pull artifacts over the network — Goose's `curl … | bash`
-/// fetches a native release-asset tarball from GitHub's CDN with no retry of
-/// its own, and the npm adapter installs hit the registry. A single blip there
-/// currently fails onboarding outright. This retries a command that ran to
-/// completion but exited nonzero (the transient-download signature) up to
-/// `INSTALL_MAX_ATTEMPTS` times. Failures with no exit code — a timeout or a
-/// shell that never spawned — are not retried, since re-running them just costs
-/// the user more time without a plausible path to success.
-fn run_install_command_with_retry(step: &str, command: &str) -> InstallStepResult {
-    run_install_with_retry(
-        INSTALL_MAX_ATTEMPTS,
-        |_attempt| run_install_command(step, command),
-        std::thread::sleep,
-    )
-}
-
-/// Core retry loop, decoupled from the real command runner and clock so it can
-/// be unit-tested without spawning shells or sleeping. `run` receives the
-/// 1-based attempt number.
-fn run_install_with_retry(
-    max_attempts: u32,
-    mut run: impl FnMut(u32) -> InstallStepResult,
-    mut sleep: impl FnMut(std::time::Duration),
-) -> InstallStepResult {
-    let mut attempt = 1;
-    loop {
-        let result = run(attempt);
-        if result.success || !install_failure_is_retryable(&result) || attempt >= max_attempts {
-            return if attempt > 1 && !result.success {
-                annotate_retry_attempts(result, attempt)
-            } else {
-                result
-            };
-        }
-        sleep(install_retry_backoff(attempt));
-        attempt += 1;
-    }
-}
-
-/// Only retry commands that actually ran and exited nonzero — the signature of
-/// a transient download failure. A missing exit code means the command timed
-/// out or the shell failed to spawn, neither of which a retry is likely to fix.
-fn install_failure_is_retryable(result: &InstallStepResult) -> bool {
-    !result.success && result.exit_code.is_some()
-}
-
-/// Linear backoff: 3s before attempt 2, 6s before attempt 3.
-fn install_retry_backoff(attempt: u32) -> std::time::Duration {
-    std::time::Duration::from_secs(3 * attempt as u64)
-}
-
-/// Prefix the surfaced error so the UI shows the install was retried rather than
-/// failed on a single unlucky attempt.
-fn annotate_retry_attempts(mut result: InstallStepResult, attempts: u32) -> InstallStepResult {
-    result.stderr = format!(
-        "install failed after {attempts} attempts (retried with backoff)\n{}",
-        result.stderr
-    );
-    result
-}
-
 /// Returns `true` when `command` is a Windows-native PowerShell invocation
 /// (i.e. begins with `powershell.exe`). These commands must NOT be routed
 /// through Git Bash: the Bash login shell prepends POSIX dirs to PATH, so
@@ -867,179 +1015,9 @@ fn build_install_command(command: &str) -> Result<std::process::Command, String>
     install_shell_command(command)
 }
 
-fn run_install_command(step: &str, command: &str) -> InstallStepResult {
-    let mut cmd = match build_install_command(command) {
-        Ok(cmd) => cmd,
-        Err(hint) => {
-            return InstallStepResult {
-                step: step.to_string(),
-                command: command.to_string(),
-                success: false,
-                stdout: String::new(),
-                stderr: "no suitable shell found for install commands".to_string(),
-                exit_code: None,
-                hint: Some(hint),
-            };
-        }
-    };
-
-    let mut child = match cmd
-        .stdin(std::process::Stdio::null())
-        .stdout(std::process::Stdio::piped())
-        .stderr(std::process::Stdio::piped())
-        .spawn()
-    {
-        Ok(child) => child,
-        Err(e) => {
-            return InstallStepResult {
-                step: step.to_string(),
-                command: command.to_string(),
-                success: false,
-                stdout: String::new(),
-                stderr: format!("failed to spawn shell: {e}"),
-                exit_code: None,
-                hint: None,
-            };
-        }
-    };
-
-    // Drain stdout/stderr on background threads to prevent pipe buffer deadlock.
-    let stdout_pipe = child.stdout.take();
-    let stderr_pipe = child.stderr.take();
-
-    let stdout_thread = std::thread::spawn(move || {
-        let mut buf = String::new();
-        if let Some(mut pipe) = stdout_pipe {
-            let _ = pipe.read_to_string(&mut buf);
-        }
-        buf
-    });
-    let stderr_thread = std::thread::spawn(move || {
-        let mut buf = String::new();
-        if let Some(mut pipe) = stderr_pipe {
-            let _ = pipe.read_to_string(&mut buf);
-        }
-        buf
-    });
-
-    // Save the PID before moving `child` into the wait thread so we can
-    // kill the process on timeout.
-    let child_pid = child.id();
-
-    let (tx, rx) = std::sync::mpsc::channel();
-    let wait_thread = std::thread::spawn(move || {
-        let status = child.wait();
-        let _ = tx.send(status);
-    });
-
-    // 5-minute timeout for install commands.
-    let deadline = std::time::Instant::now() + std::time::Duration::from_secs(300);
-    loop {
-        let remaining = deadline.saturating_duration_since(std::time::Instant::now());
-        if remaining.is_zero() {
-            // Timeout: kill the child process via its PID, then join all
-            // threads so nothing leaks.
-            #[cfg(unix)]
-            unsafe {
-                libc::kill(child_pid as i32, libc::SIGTERM);
-            }
-            #[cfg(windows)]
-            {
-                let _ = crate::managed_agents::taskkill_tree(child_pid);
-            }
-            drop(rx);
-            let _ = wait_thread.join();
-            let _ = stdout_thread.join();
-            let _ = stderr_thread.join();
-            return InstallStepResult {
-                step: step.to_string(),
-                command: command.to_string(),
-                success: false,
-                stdout: String::new(),
-                stderr: "install command timed out after 5 minutes".to_string(),
-                exit_code: None,
-                hint: None,
-            };
-        }
-
-        match rx.recv_timeout(std::time::Duration::from_millis(200).min(remaining)) {
-            Ok(Ok(status)) => {
-                let _ = wait_thread.join();
-                let stdout = stdout_thread.join().unwrap_or_default();
-                let stderr_raw = stderr_thread.join().unwrap_or_default();
-                return InstallStepResult {
-                    step: step.to_string(),
-                    command: command.to_string(),
-                    success: status.success(),
-                    stdout: truncate_output(stdout),
-                    stderr: truncate_output(stderr_raw),
-                    exit_code: status.code(),
-                    hint: None,
-                };
-            }
-            Ok(Err(e)) => {
-                let _ = wait_thread.join();
-                let _ = stdout_thread.join();
-                let _ = stderr_thread.join();
-                return InstallStepResult {
-                    step: step.to_string(),
-                    command: command.to_string(),
-                    success: false,
-                    stdout: String::new(),
-                    stderr: format!("failed to check process status: {e}"),
-                    exit_code: None,
-                    hint: None,
-                };
-            }
-            Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
-                // Still running; loop and check deadline again.
-                continue;
-            }
-            Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => {
-                // wait_thread dropped sender without sending — shouldn't happen.
-                let _ = wait_thread.join();
-                let _ = stdout_thread.join();
-                let _ = stderr_thread.join();
-                return InstallStepResult {
-                    step: step.to_string(),
-                    command: command.to_string(),
-                    success: false,
-                    stdout: String::new(),
-                    stderr: "internal error: wait thread disconnected".to_string(),
-                    exit_code: None,
-                    hint: None,
-                };
-            }
-        }
-    }
-}
-
-/// Cap output to head + tail to avoid flooding the UI with large error dumps,
-/// while preserving the most useful parts of the output.
-fn truncate_output(s: String) -> String {
-    const HEAD: usize = 512;
-    const TAIL: usize = 1024;
-    const LIMIT: usize = HEAD + TAIL;
-    if s.len() <= LIMIT {
-        return s;
-    }
-    let head_end = floor_char_boundary(&s, HEAD);
-    let tail_start = floor_char_boundary(&s, s.len().saturating_sub(TAIL));
-    let omitted = tail_start - head_end;
-    format!(
-        "{}\n... ({omitted} bytes omitted) ...\n{}",
-        &s[..head_end],
-        &s[tail_start..]
-    )
-}
-
-fn floor_char_boundary(s: &str, mut index: usize) -> usize {
-    index = index.min(s.len());
-    while index > 0 && !s.is_char_boundary(index) {
-        index -= 1;
-    }
-    index
-}
+// ── install command execution ─────────────────────────────────────────────────
+mod install_exec;
+use install_exec::run_install_command_with_retry;
 
 // ── managed Node/npm runtime ──────────────────────────────────────────────────
 mod managed_node;
@@ -1175,7 +1153,8 @@ mod tests {
     /// plan_adapter_install is the pure install-plan seam used by
     /// install_acp_runtime_blocking. These tests verify:
     ///   - A 0.x binary (AdapterOutdated) → uninstall-then-install sequence returned
-    ///   - A 1.x binary (Available) → None (no reinstall)
+    ///   - A current 1.x binary (Available) → None (no reinstall)
+    ///   - A 1.x binary below the floor → install plan returned
     ///   - Missing binary (None path) → catalog install commands returned
     #[cfg(unix)]
     #[test]
@@ -1215,10 +1194,10 @@ mod tests {
 
         let dir = tempfile::tempdir().unwrap();
         let bin = dir.path().join("codex-acp");
-        // Simulate 1.x adapter: outputs version and exits 0
+        // Simulate the minimum supported adapter version.
         std::fs::write(
             &bin,
-            "#!/bin/sh\necho '@agentclientprotocol/codex-acp 1.1.2'\nexit 0\n",
+            "#!/bin/sh\necho '@agentclientprotocol/codex-acp 1.1.7'\nexit 0\n",
         )
         .expect("write script");
         std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755))
@@ -1229,7 +1208,32 @@ mod tests {
 
         assert!(
             plan.is_none(),
-            "1.x codex adapter must not trigger install plan (no reinstall needed)"
+            "current codex adapter must not trigger install plan (no reinstall needed)"
+        );
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn test_plan_adapter_install_updates_older_1x_codex_binary() {
+        use std::os::unix::fs::PermissionsExt;
+
+        let dir = tempfile::tempdir().unwrap();
+        let bin = dir.path().join("codex-acp");
+        // A 1.x adapter below MIN_CODEX_ACP_VERSION must still be reinstalled.
+        std::fs::write(
+            &bin,
+            "#!/bin/sh\necho '@agentclientprotocol/codex-acp 1.1.5'\nexit 0\n",
+        )
+        .expect("write script");
+        std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755))
+            .expect("chmod script");
+
+        let install_cmds = &["npm install -g @agentclientprotocol/codex-acp"];
+        let plan = plan_adapter_install("codex", Some(&bin), install_cmds, Some("/usr/bin:/bin"));
+
+        assert!(
+            plan.is_some(),
+            "older 1.x codex adapter must trigger update plan"
         );
     }
 
@@ -1408,6 +1412,123 @@ mod tests {
         assert!(result.is_ok(), "install_shell_command must succeed on Unix");
     }
 
+    // ── pipefail: install pipes must not mask a failing left-hand side ────────
+
+    /// The command handed to the install shell must run under `set -o pipefail;`
+    /// with the vendor command preserved verbatim, so `curl … | bash` fails when
+    /// `curl` does. Platform-agnostic: only the PATH prelude differs by OS, and
+    /// `test_install_shell_args_shape_per_platform` pins that.
+    #[test]
+    fn test_install_shell_command_enables_pipefail() {
+        let cmd = super::install_shell_command("curl -fsSL https://example.test/i.sh | bash")
+            .expect("install shell must resolve on a test host");
+        let args: Vec<String> = cmd
+            .get_args()
+            .map(|a| a.to_string_lossy().into_owned())
+            .collect();
+        let body = &args[2];
+        assert!(
+            body.contains("set -o pipefail; "),
+            "the install body must set pipefail; got: {body}"
+        );
+        assert!(
+            body.ends_with("curl -fsSL https://example.test/i.sh | bash"),
+            "the vendor command must be preserved verbatim; got: {body}"
+        );
+    }
+
+    /// The PATH prelude is emitted only where it helps, and the exact argument
+    /// vector is the contract: a stray trailing positional with no `$1` reader,
+    /// or an export whose `$1` the shell cannot split, both corrupt PATH.
+    /// Windows is excluded because `join_paths` is `;`-separated there while bash
+    /// splits PATH on `:` — and it is the platform where the inherited fallback
+    /// always fires. See `install_shell_args` for the full reasoning.
+    #[test]
+    fn test_install_shell_args_shape_per_platform() {
+        let composed = std::ffi::OsString::from("/buzz/node/bin:/usr/bin");
+        let windows_composed = std::ffi::OsString::from(r"C:\buzz\node;C:\Windows\system32");
+        let bare = ["-l", "-c", "set -o pipefail; echo hi"].map(std::ffi::OsString::from);
+
+        assert_eq!(
+            super::install_shell_args("echo hi", Some(&composed), false),
+            [
+                "-l",
+                "-c",
+                "export PATH=\"$1\"; set -o pipefail; echo hi",
+                "buzz-install",
+                "/buzz/node/bin:/usr/bin",
+            ]
+            .map(std::ffi::OsString::from),
+            "Unix must re-export the composed PATH after login init"
+        );
+        assert_eq!(
+            super::install_shell_args("echo hi", Some(&windows_composed), true),
+            bare,
+            "Windows must not re-export a `;`-joined PATH inside bash"
+        );
+        assert_eq!(
+            super::install_shell_args("echo hi", None, false),
+            bare,
+            "no composed PATH must yield the bare pipefail body and no positionals"
+        );
+    }
+
+    /// Regression for the login-startup-file overwrite: `cmd.env("PATH", …)` is
+    /// installed *before* `-l` sources the user's profile, so a profile that
+    /// assigns PATH silently discards the composed one. Uses `/bin/bash`
+    /// explicitly — the planted profile is bash-specific, so resolving the host
+    /// shell (which prefers zsh) would make this vacuous.
+    #[cfg(unix)]
+    #[test]
+    fn test_composed_path_survives_a_profile_that_clears_it() {
+        let home = tempfile::tempdir().expect("temp HOME");
+        std::fs::write(home.path().join(".bash_profile"), "export PATH=\n")
+            .expect("plant a hostile login profile");
+        let composed = std::ffi::OsString::from("/buzz/sentinel/bin:/usr/bin:/bin");
+
+        // `echo` is a shell builtin, so the child needs no PATH to report one.
+        let out = std::process::Command::new("/bin/bash")
+            .args(super::install_shell_args(
+                "echo \"$PATH\"",
+                Some(&composed),
+                false,
+            ))
+            .env("HOME", home.path())
+            .env("PATH", &composed)
+            .stdin(std::process::Stdio::null())
+            .output()
+            .expect("bash must spawn");
+
+        let path = String::from_utf8_lossy(&out.stdout);
+        assert!(
+            path.contains("/buzz/sentinel/bin"),
+            "the composed PATH must survive login init; got: {path:?}"
+        );
+    }
+
+    /// End-to-end on the real resolved install shell (no network): a pipeline
+    /// whose left-hand side fails must exit non-zero, while a fully successful
+    /// pipeline must still succeed. Without `pipefail` the status is the
+    /// right-hand side's and the left-hand failure is invisible.
+    #[cfg(unix)]
+    #[test]
+    fn test_install_shell_pipeline_status_follows_left_side() {
+        for (command, expect_success) in [("false | true", false), ("echo ok | cat", true)] {
+            let status = super::install_shell_command(command)
+                .expect("Unix must always resolve an install shell")
+                .stdin(std::process::Stdio::null())
+                .stdout(std::process::Stdio::null())
+                .stderr(std::process::Stdio::null())
+                .status()
+                .expect("install shell must spawn");
+            assert_eq!(
+                status.success(),
+                expect_success,
+                "`{command}` must report success={expect_success}; got {status:?}"
+            );
+        }
+    }
+
     // ── Phase A: Windows install shell selection ───────────────────────────────
 
     /// On Windows (CI runner has Git pre-installed), resolve_install_shell succeeds.
@@ -1700,128 +1821,6 @@ mod tests {
             "Goose catalog command must dequote with bare $env: (no backslash before $)"
         );
     }
-
-    // ── install retry ─────────────────────────────────────────────────────────
-
-    /// Build an `InstallStepResult` with just the fields the retry loop reads.
-    fn step_result(success: bool, exit_code: Option<i32>, stderr: &str) -> InstallStepResult {
-        InstallStepResult {
-            step: "cli".to_string(),
-            command: "curl … | bash".to_string(),
-            success,
-            stdout: String::new(),
-            stderr: stderr.to_string(),
-            exit_code,
-            hint: None,
-        }
-    }
-
-    #[test]
-    fn test_retryable_only_for_nonzero_exit() {
-        // Ran to completion but exited nonzero — the transient-download signature.
-        assert!(install_failure_is_retryable(&step_result(
-            false,
-            Some(1),
-            ""
-        )));
-        // No exit code — timeout or shell-never-spawned; retry won't help.
-        assert!(!install_failure_is_retryable(&step_result(false, None, "")));
-        // Success is never retryable.
-        assert!(!install_failure_is_retryable(&step_result(
-            true,
-            Some(0),
-            ""
-        )));
-    }
-
-    #[test]
-    fn test_retry_backoff_is_linear() {
-        assert_eq!(install_retry_backoff(1), std::time::Duration::from_secs(3));
-        assert_eq!(install_retry_backoff(2), std::time::Duration::from_secs(6));
-    }
-
-    #[test]
-    fn test_retry_stops_on_first_success() {
-        let mut calls = 0;
-        let mut sleeps = 0;
-        let result = run_install_with_retry(
-            3,
-            |_| {
-                calls += 1;
-                step_result(true, Some(0), "")
-            },
-            |_| sleeps += 1,
-        );
-        assert!(result.success);
-        assert_eq!(calls, 1, "a first-attempt success must not re-run");
-        assert_eq!(sleeps, 0, "no backoff sleep when nothing is retried");
-    }
-
-    #[test]
-    fn test_retry_recovers_after_transient_failure() {
-        let mut calls = 0;
-        let result = run_install_with_retry(
-            3,
-            |attempt| {
-                calls += 1;
-                // Fail the first attempt with a nonzero exit, then succeed.
-                step_result(attempt >= 2, Some(if attempt >= 2 { 0 } else { 1 }), "blip")
-            },
-            |_| {},
-        );
-        assert!(result.success);
-        assert_eq!(calls, 2, "should retry once then succeed");
-        // A recovered install must not carry the retry-failure annotation.
-        assert!(!result.stderr.contains("attempts"));
-    }
-
-    #[test]
-    fn test_retry_does_not_retry_unretryable_failure() {
-        let mut calls = 0;
-        let result = run_install_with_retry(
-            3,
-            |_| {
-                calls += 1;
-                step_result(false, None, "timed out")
-            },
-            |_| {},
-        );
-        assert!(!result.success);
-        assert_eq!(calls, 1, "a failure with no exit code must not be retried");
-        assert_eq!(
-            result.stderr, "timed out",
-            "unretried failure is unannotated"
-        );
-    }
-
-    #[test]
-    fn test_retry_exhausts_attempts_and_annotates() {
-        let mut calls = 0;
-        let mut sleeps = 0;
-        let result = run_install_with_retry(
-            3,
-            |_| {
-                calls += 1;
-                step_result(false, Some(1), "download failed")
-            },
-            |_| sleeps += 1,
-        );
-        assert!(!result.success);
-        assert_eq!(calls, 3, "must try exactly max_attempts times");
-        assert_eq!(
-            sleeps, 2,
-            "backoff sleeps between attempts, not after the last"
-        );
-        assert!(
-            result.stderr.contains("after 3 attempts"),
-            "exhausted retries must surface the attempt count, got: {}",
-            result.stderr
-        );
-        assert!(
-            result.stderr.contains("download failed"),
-            "original stderr must be preserved"
-        );
-    }
 }
 
 /// Returns the Windows-only Git Bash prerequisite used by buzz-agent's shell MCP.
diff --git a/desktop/src-tauri/src/commands/agent_discovery/install_exec.rs b/desktop/src-tauri/src/commands/agent_discovery/install_exec.rs
new file mode 100644
index 0000000000..63163ceadc
--- /dev/null
+++ b/desktop/src-tauri/src/commands/agent_discovery/install_exec.rs
@@ -0,0 +1,457 @@
+//! Execution of runtime install commands: spawning the built command,
+//! draining its output under a timeout, and retrying transient failures.
+//!
+//! Command *construction* stays in the parent module (`install_shell_command`,
+//! `install_powershell_command`, `build_install_command`); this module owns
+//! only what happens once a `Command` exists.
+
+use std::io::Read;
+
+use crate::managed_agents::InstallStepResult;
+
+/// Maximum number of attempts for a transient-looking install command.
+const INSTALL_MAX_ATTEMPTS: u32 = 3;
+
+/// Run an install command, retrying transient failures with backoff.
+///
+/// Runtime installs pull artifacts over the network — Goose's `curl … | bash`
+/// fetches a native release-asset tarball from GitHub's CDN with no retry of
+/// its own, and the npm adapter installs hit the registry. A single blip there
+/// currently fails onboarding outright. This retries a command that ran to
+/// completion but exited nonzero (the transient-download signature) up to
+/// `INSTALL_MAX_ATTEMPTS` times. Failures with no exit code — a timeout or a
+/// shell that never spawned — are not retried, since re-running them just costs
+/// the user more time without a plausible path to success.
+pub(super) fn run_install_command_with_retry(step: &str, command: &str) -> InstallStepResult {
+    run_install_with_retry(
+        INSTALL_MAX_ATTEMPTS,
+        |_attempt| run_install_command(step, command),
+        std::thread::sleep,
+    )
+}
+
+/// Core retry loop, decoupled from the real command runner and clock so it can
+/// be unit-tested without spawning shells or sleeping. `run` receives the
+/// 1-based attempt number.
+fn run_install_with_retry(
+    max_attempts: u32,
+    mut run: impl FnMut(u32) -> InstallStepResult,
+    mut sleep: impl FnMut(std::time::Duration),
+) -> InstallStepResult {
+    let mut attempt = 1;
+    loop {
+        let result = run(attempt);
+        if result.success || !install_failure_is_retryable(&result) || attempt >= max_attempts {
+            return if attempt > 1 && !result.success {
+                annotate_retry_attempts(result, attempt)
+            } else {
+                result
+            };
+        }
+        sleep(install_retry_backoff(attempt));
+        attempt += 1;
+    }
+}
+
+/// Only retry commands that actually ran and exited nonzero — the signature of
+/// a transient download failure. A missing exit code means the command timed
+/// out or the shell failed to spawn, neither of which a retry is likely to fix.
+fn install_failure_is_retryable(result: &InstallStepResult) -> bool {
+    !result.success && result.exit_code.is_some()
+}
+
+/// Linear backoff: 3s before attempt 2, 6s before attempt 3.
+fn install_retry_backoff(attempt: u32) -> std::time::Duration {
+    std::time::Duration::from_secs(3 * attempt as u64)
+}
+
+/// Prefix the surfaced error so the UI shows the install was retried rather than
+/// failed on a single unlucky attempt.
+fn annotate_retry_attempts(mut result: InstallStepResult, attempts: u32) -> InstallStepResult {
+    result.stderr = format!(
+        "install failed after {attempts} attempts (retried with backoff)\n{}",
+        result.stderr
+    );
+    result
+}
+
+/// Build the install command and point it at a writable working directory.
+///
+/// A packaged desktop launch inherits `/` as its working directory, and
+/// installers that write relative to the CWD then fail on a read-only root, so
+/// they run from Buzz's own default workdir instead (#2245).
+///
+/// This is the only command builder [`run_install_command`] calls, so anything
+/// it spawns is guaranteed to carry the workdir — which is what makes the
+/// working directory assertable without spawning a real login shell.
+fn prepare_install_command(command: &str) -> Result<std::process::Command, String> {
+    let mut cmd = super::build_install_command(command)?;
+    if let Some(workdir) = crate::managed_agents::default_agent_workdir() {
+        cmd.current_dir(workdir);
+    }
+    Ok(cmd)
+}
+
+fn run_install_command(step: &str, command: &str) -> InstallStepResult {
+    let mut cmd = match prepare_install_command(command) {
+        Ok(cmd) => cmd,
+        Err(hint) => {
+            return InstallStepResult {
+                step: step.to_string(),
+                command: command.to_string(),
+                success: false,
+                stdout: String::new(),
+                stderr: "no suitable shell found for install commands".to_string(),
+                exit_code: None,
+                hint: Some(hint),
+            };
+        }
+    };
+
+    let mut child = match cmd
+        .stdin(std::process::Stdio::null())
+        .stdout(std::process::Stdio::piped())
+        .stderr(std::process::Stdio::piped())
+        .spawn()
+    {
+        Ok(child) => child,
+        Err(e) => {
+            return InstallStepResult {
+                step: step.to_string(),
+                command: command.to_string(),
+                success: false,
+                stdout: String::new(),
+                stderr: format!("failed to spawn shell: {e}"),
+                exit_code: None,
+                hint: None,
+            };
+        }
+    };
+
+    // Drain stdout/stderr on background threads to prevent pipe buffer deadlock.
+    let stdout_pipe = child.stdout.take();
+    let stderr_pipe = child.stderr.take();
+
+    let stdout_thread = std::thread::spawn(move || {
+        let mut buf = String::new();
+        if let Some(mut pipe) = stdout_pipe {
+            let _ = pipe.read_to_string(&mut buf);
+        }
+        buf
+    });
+    let stderr_thread = std::thread::spawn(move || {
+        let mut buf = String::new();
+        if let Some(mut pipe) = stderr_pipe {
+            let _ = pipe.read_to_string(&mut buf);
+        }
+        buf
+    });
+
+    // Save the PID before moving `child` into the wait thread so we can
+    // kill the process on timeout.
+    let child_pid = child.id();
+
+    let (tx, rx) = std::sync::mpsc::channel();
+    let wait_thread = std::thread::spawn(move || {
+        let status = child.wait();
+        let _ = tx.send(status);
+    });
+
+    // 5-minute timeout for install commands.
+    let deadline = std::time::Instant::now() + std::time::Duration::from_secs(300);
+    loop {
+        let remaining = deadline.saturating_duration_since(std::time::Instant::now());
+        if remaining.is_zero() {
+            // Timeout: kill the child process via its PID, then join all
+            // threads so nothing leaks.
+            #[cfg(unix)]
+            unsafe {
+                libc::kill(child_pid as i32, libc::SIGTERM);
+            }
+            #[cfg(windows)]
+            {
+                let _ = crate::managed_agents::taskkill_tree(child_pid);
+            }
+            drop(rx);
+            let _ = wait_thread.join();
+            let _ = stdout_thread.join();
+            let _ = stderr_thread.join();
+            return InstallStepResult {
+                step: step.to_string(),
+                command: command.to_string(),
+                success: false,
+                stdout: String::new(),
+                stderr: "install command timed out after 5 minutes".to_string(),
+                exit_code: None,
+                hint: None,
+            };
+        }
+
+        match rx.recv_timeout(std::time::Duration::from_millis(200).min(remaining)) {
+            Ok(Ok(status)) => {
+                let _ = wait_thread.join();
+                let stdout = stdout_thread.join().unwrap_or_default();
+                let stderr_raw = stderr_thread.join().unwrap_or_default();
+                return InstallStepResult {
+                    step: step.to_string(),
+                    command: command.to_string(),
+                    success: status.success(),
+                    stdout: truncate_output(stdout),
+                    stderr: truncate_output(stderr_raw),
+                    exit_code: status.code(),
+                    hint: None,
+                };
+            }
+            Ok(Err(e)) => {
+                let _ = wait_thread.join();
+                let _ = stdout_thread.join();
+                let _ = stderr_thread.join();
+                return InstallStepResult {
+                    step: step.to_string(),
+                    command: command.to_string(),
+                    success: false,
+                    stdout: String::new(),
+                    stderr: format!("failed to check process status: {e}"),
+                    exit_code: None,
+                    hint: None,
+                };
+            }
+            Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
+                // Still running; loop and check deadline again.
+                continue;
+            }
+            Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => {
+                // wait_thread dropped sender without sending — shouldn't happen.
+                let _ = wait_thread.join();
+                let _ = stdout_thread.join();
+                let _ = stderr_thread.join();
+                return InstallStepResult {
+                    step: step.to_string(),
+                    command: command.to_string(),
+                    success: false,
+                    stdout: String::new(),
+                    stderr: "internal error: wait thread disconnected".to_string(),
+                    exit_code: None,
+                    hint: None,
+                };
+            }
+        }
+    }
+}
+
+/// Cap output to head + tail to avoid flooding the UI with large error dumps,
+/// while preserving the most useful parts of the output.
+fn truncate_output(s: String) -> String {
+    const HEAD: usize = 512;
+    const TAIL: usize = 1024;
+    const LIMIT: usize = HEAD + TAIL;
+    if s.len() <= LIMIT {
+        return s;
+    }
+    let head_end = floor_char_boundary(&s, HEAD);
+    let tail_start = floor_char_boundary(&s, s.len().saturating_sub(TAIL));
+    let omitted = tail_start - head_end;
+    format!(
+        "{}\n... ({omitted} bytes omitted) ...\n{}",
+        &s[..head_end],
+        &s[tail_start..]
+    )
+}
+
+fn floor_char_boundary(s: &str, mut index: usize) -> usize {
+    index = index.min(s.len());
+    while index > 0 && !s.is_char_boundary(index) {
+        index -= 1;
+    }
+    index
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // ── install retry ─────────────────────────────────────────────────────────
+
+    /// Build an `InstallStepResult` with just the fields the retry loop reads.
+    fn step_result(success: bool, exit_code: Option<i32>, stderr: &str) -> InstallStepResult {
+        InstallStepResult {
+            step: "cli".to_string(),
+            command: "curl … | bash".to_string(),
+            success,
+            stdout: String::new(),
+            stderr: stderr.to_string(),
+            exit_code,
+            hint: None,
+        }
+    }
+
+    #[test]
+    fn test_retryable_only_for_nonzero_exit() {
+        // Ran to completion but exited nonzero — the transient-download signature.
+        assert!(install_failure_is_retryable(&step_result(
+            false,
+            Some(1),
+            ""
+        )));
+        // No exit code — timeout or shell-never-spawned; retry won't help.
+        assert!(!install_failure_is_retryable(&step_result(false, None, "")));
+        // Success is never retryable.
+        assert!(!install_failure_is_retryable(&step_result(
+            true,
+            Some(0),
+            ""
+        )));
+    }
+
+    #[test]
+    fn test_retry_backoff_is_linear() {
+        assert_eq!(install_retry_backoff(1), std::time::Duration::from_secs(3));
+        assert_eq!(install_retry_backoff(2), std::time::Duration::from_secs(6));
+    }
+
+    #[test]
+    fn test_retry_stops_on_first_success() {
+        let mut calls = 0;
+        let mut sleeps = 0;
+        let result = run_install_with_retry(
+            3,
+            |_| {
+                calls += 1;
+                step_result(true, Some(0), "")
+            },
+            |_| sleeps += 1,
+        );
+        assert!(result.success);
+        assert_eq!(calls, 1, "a first-attempt success must not re-run");
+        assert_eq!(sleeps, 0, "no backoff sleep when nothing is retried");
+    }
+
+    #[test]
+    fn test_retry_recovers_after_transient_failure() {
+        let mut calls = 0;
+        let result = run_install_with_retry(
+            3,
+            |attempt| {
+                calls += 1;
+                // Fail the first attempt with a nonzero exit, then succeed.
+                step_result(attempt >= 2, Some(if attempt >= 2 { 0 } else { 1 }), "blip")
+            },
+            |_| {},
+        );
+        assert!(result.success);
+        assert_eq!(calls, 2, "should retry once then succeed");
+        // A recovered install must not carry the retry-failure annotation.
+        assert!(!result.stderr.contains("attempts"));
+    }
+
+    #[test]
+    fn test_retry_does_not_retry_unretryable_failure() {
+        let mut calls = 0;
+        let result = run_install_with_retry(
+            3,
+            |_| {
+                calls += 1;
+                step_result(false, None, "timed out")
+            },
+            |_| {},
+        );
+        assert!(!result.success);
+        assert_eq!(calls, 1, "a failure with no exit code must not be retried");
+        assert_eq!(
+            result.stderr, "timed out",
+            "unretried failure is unannotated"
+        );
+    }
+
+    #[test]
+    fn test_retry_exhausts_attempts_and_annotates() {
+        let mut calls = 0;
+        let mut sleeps = 0;
+        let result = run_install_with_retry(
+            3,
+            |_| {
+                calls += 1;
+                step_result(false, Some(1), "download failed")
+            },
+            |_| sleeps += 1,
+        );
+        assert!(!result.success);
+        assert_eq!(calls, 3, "must try exactly max_attempts times");
+        assert_eq!(
+            sleeps, 2,
+            "backoff sleeps between attempts, not after the last"
+        );
+        assert!(
+            result.stderr.contains("after 3 attempts"),
+            "exhausted retries must surface the attempt count, got: {}",
+            result.stderr
+        );
+        assert!(
+            result.stderr.contains("download failed"),
+            "original stderr must be preserved"
+        );
+    }
+
+    // ── install working directory ─────────────────────────────────────────────
+
+    /// Every install child must run from Buzz's writable default workdir. A
+    /// packaged launch inherits `/`, where installers that write relative to
+    /// the CWD fail on a read-only root (#2245).
+    ///
+    /// Asserts the prepared `Command` rather than spawning one: `run_install_command`
+    /// would start a real login shell, which is neither hermetic nor fast.
+    #[test]
+    fn test_prepared_install_command_uses_default_workdir() {
+        let expected = crate::managed_agents::default_agent_workdir()
+            .expect("a default workdir must resolve on any test host");
+
+        let cmd = prepare_install_command("echo test").expect("install shell must resolve");
+
+        assert_eq!(cmd.get_current_dir(), Some(expected.as_path()));
+    }
+
+    // ── output truncation ─────────────────────────────────────────────────────
+
+    /// Output within the cap is passed through byte-for-byte — no marker, no loss.
+    #[test]
+    fn test_truncate_output_leaves_short_output_untouched() {
+        let short = "a".repeat(1536);
+
+        assert_eq!(truncate_output(short.clone()), short);
+    }
+
+    /// Over the cap, both ends survive and the middle is replaced by a marker
+    /// naming the omitted byte count — the head keeps the command's opening
+    /// context and the tail keeps the error that usually trails.
+    #[test]
+    fn test_truncate_output_keeps_head_and_tail_with_marker() {
+        let input = format!(
+            "{}{}{}",
+            "H".repeat(512),
+            "M".repeat(4000),
+            "T".repeat(1024)
+        );
+
+        let out = truncate_output(input);
+
+        assert!(out.starts_with(&"H".repeat(512)));
+        assert!(out.ends_with(&"T".repeat(1024)));
+        assert!(
+            out.contains("... (4000 bytes omitted) ..."),
+            "marker must name the omitted byte count, got: {out}"
+        );
+    }
+
+    /// Truncation must not split a multi-byte character. Cutting mid-codepoint
+    /// would panic on the slice; the boundary floor prevents it.
+    #[test]
+    fn test_truncate_output_does_not_split_multibyte_characters() {
+        // "é" is 2 bytes, so every candidate cut index lands mid-character.
+        let input = "é".repeat(4000);
+
+        let out = truncate_output(input);
+
+        assert!(out.contains("bytes omitted"), "input must exceed the cap");
+        assert!(!out.contains('\u{fffd}'), "no replacement chars: {out}");
+    }
+}
diff --git a/desktop/src-tauri/src/commands/agent_discovery/managed_node.rs b/desktop/src-tauri/src/commands/agent_discovery/managed_node.rs
index 2d7e13d1d7..72108f0291 100644
--- a/desktop/src-tauri/src/commands/agent_discovery/managed_node.rs
+++ b/desktop/src-tauri/src/commands/agent_discovery/managed_node.rs
@@ -5,7 +5,7 @@ use std::{io::Read, io::Write};
 
 use crate::managed_agents::{is_npm_global_install, InstallStepResult};
 
-const MANAGED_NODE_VERSION: &str = "v24.11.0";
+const MANAGED_NODE_VERSION: &str = "v24.18.0";
 const MANAGED_NODE_MAX_BYTES: u64 = 90 * 1024 * 1024;
 
 #[derive(Debug, Clone, Copy)]
@@ -18,43 +18,43 @@ struct ManagedNodeArtifact {
 #[cfg(all(target_os = "macos", target_arch = "aarch64"))]
 const MANAGED_NODE_ARTIFACT: Option<ManagedNodeArtifact> = Some(ManagedNodeArtifact {
     platform: "darwin-arm64",
-    filename: "node-v24.11.0-darwin-arm64.tar.gz",
-    sha256: "0be2ab2816a4fa02d1acff014a434f29f56d8d956f5af6a98b70ced6c5f4d201",
+    filename: "node-v24.18.0-darwin-arm64.tar.gz",
+    sha256: "e1a97e14c99c803e96c7339403282ea05a499c32f8d83defe9ef5ec66f979ed1",
 });
 
 #[cfg(all(target_os = "macos", target_arch = "x86_64"))]
 const MANAGED_NODE_ARTIFACT: Option<ManagedNodeArtifact> = Some(ManagedNodeArtifact {
     platform: "darwin-x64",
-    filename: "node-v24.11.0-darwin-x64.tar.gz",
-    sha256: "3884671e87f46f773832d98a0a6cabcc5ec4f637084f0f3515b69e66ea27f2f1",
+    filename: "node-v24.18.0-darwin-x64.tar.gz",
+    sha256: "dfd0dbd3e721503434df7b7205e719f61b3a3a31b2bcf9729b8b91fea240f080",
 });
 
 #[cfg(all(target_os = "linux", target_arch = "x86_64"))]
 const MANAGED_NODE_ARTIFACT: Option<ManagedNodeArtifact> = Some(ManagedNodeArtifact {
     platform: "linux-x64",
-    filename: "node-v24.11.0-linux-x64.tar.gz",
-    sha256: "b3c071cdf47aab867c3b2aa287257df12ec5d7c962bf922b32fd33226c4295fd",
+    filename: "node-v24.18.0-linux-x64.tar.gz",
+    sha256: "783130984963db7ba9cbd01089eaf2c2efb055c7c1693c943174b967b3050cb8",
 });
 
 #[cfg(all(target_os = "linux", target_arch = "aarch64"))]
 const MANAGED_NODE_ARTIFACT: Option<ManagedNodeArtifact> = Some(ManagedNodeArtifact {
     platform: "linux-arm64",
-    filename: "node-v24.11.0-linux-arm64.tar.gz",
-    sha256: "4786d00c4d259d3ff0b2328307f764ef3ced65f2d6e9502d433e68d66238509d",
+    filename: "node-v24.18.0-linux-arm64.tar.gz",
+    sha256: "6b4484c2190274175df9aa8f28e2d758a819cb1c1fe6ab481e2f95b463ab8508",
 });
 
 #[cfg(all(target_os = "windows", target_arch = "x86_64"))]
 const MANAGED_NODE_ARTIFACT: Option<ManagedNodeArtifact> = Some(ManagedNodeArtifact {
     platform: "win-x64",
-    filename: "node-v24.11.0-win-x64.zip",
-    sha256: "1054540bce22b54ec7e50ebc078ec5d090700a77657607a58f6a64df21f49fdd",
+    filename: "node-v24.18.0-win-x64.zip",
+    sha256: "0ae68406b42d7725661da979b1403ec9926da205c6770827f33aac9d8f26e821",
 });
 
 #[cfg(all(target_os = "windows", target_arch = "aarch64"))]
 const MANAGED_NODE_ARTIFACT: Option<ManagedNodeArtifact> = Some(ManagedNodeArtifact {
     platform: "win-arm64",
-    filename: "node-v24.11.0-win-arm64.zip",
-    sha256: "12d3b1aa9696b7411e115a4fa2aef57f95560b5ee16bb62cd69843e535ec72be",
+    filename: "node-v24.18.0-win-arm64.zip",
+    sha256: "f274669adb93b1fd0fbf8f21fd078609e9dcc84333d4f2718d2dde3f9a161a01",
 });
 
 #[cfg(not(any(
@@ -615,9 +615,9 @@ mod tests {
     #[test]
     fn test_validate_zip_accepts_normal_entries() {
         let tmp = make_zip_with_entries(&[
-            "node-v24.11.0-win-x64/node.exe",
-            "node-v24.11.0-win-x64/npm.cmd",
-            "node-v24.11.0-win-x64/npm",
+            "node-v24.18.0-win-x64/node.exe",
+            "node-v24.18.0-win-x64/npm.cmd",
+            "node-v24.18.0-win-x64/npm",
         ]);
         let file = std::fs::File::open(tmp.path()).unwrap();
         let archive = zip::ZipArchive::new(file).unwrap();
@@ -677,7 +677,7 @@ mod tests {
     #[test]
     fn test_validate_zip_rejects_backslash_traversal() {
         // Path traversal using Windows separator — must reject on every host.
-        let tmp = make_zip_with_entries(&["node-v24.11.0-win-x64\\..\\..\\evil"]);
+        let tmp = make_zip_with_entries(&["node-v24.18.0-win-x64\\..\\..\\evil"]);
         let file = std::fs::File::open(tmp.path()).unwrap();
         let archive = zip::ZipArchive::new(file).unwrap();
         let err = validate_managed_node_zip_entries(&archive).unwrap_err();
diff --git a/desktop/src-tauri/src/commands/agent_logs.rs b/desktop/src-tauri/src/commands/agent_logs.rs
index 25d3d4d1c4..273654e32a 100644
--- a/desktop/src-tauri/src/commands/agent_logs.rs
+++ b/desktop/src-tauri/src/commands/agent_logs.rs
@@ -3,7 +3,7 @@ use tauri::{AppHandle, Manager};
 use crate::{
     app_state::AppState,
     managed_agents::{
-        load_managed_agents, managed_agent_log_path, read_log_tail, BackendKind,
+        latest_managed_agent_log_path, load_managed_agents, read_log_tail, BackendKind,
         ManagedAgentLogResponse,
     },
 };
@@ -29,7 +29,7 @@ pub async fn get_managed_agent_log(
             return Err("logs are not available for remote agents".to_string());
         }
 
-        let log_path = managed_agent_log_path(&app, &pubkey)?;
+        let log_path = latest_managed_agent_log_path(&app, &pubkey)?;
         Ok(ManagedAgentLogResponse {
             content: read_log_tail(&log_path, line_count.unwrap_or(120) as usize)?,
             log_path: log_path.display().to_string(),
diff --git a/desktop/src-tauri/src/commands/agent_models.rs b/desktop/src-tauri/src/commands/agent_models.rs
index 425eadb5f6..ca1fe9bdf6 100644
--- a/desktop/src-tauri/src/commands/agent_models.rs
+++ b/desktop/src-tauri/src/commands/agent_models.rs
@@ -5,16 +5,23 @@ use serde::Deserialize;
 use tauri::{AppHandle, State};
 
 use super::agent_model_process::run_agent_models_command;
+// The map-only lookup is reached solely from the base-URL helpers that exist for
+// their unit tests; discovery itself always goes through the process-env variant.
+#[cfg(test)]
+use super::agent_models_env::env_value;
+use super::agent_models_env::{
+    effective_discovery_provider, env_or_process_value, redaction_env_with_value, DiscoveryProvider,
+};
 use super::agent_update_rollback::{rollback_failed_agent_update, AgentUpdateRollback};
 
 use crate::{
     app_state::AppState,
     managed_agents::{
         build_managed_agent_summary, current_instance_id, discovery_env_with_baked_floor,
-        find_managed_agent_mut, known_acp_runtime, load_managed_agents, load_personas,
-        managed_agent_avatar_url, missing_command_message, normalize_agent_args, resolve_command,
-        save_managed_agents, sync_managed_agent_processes, try_regenerate_nest, AgentModelInfo,
-        AgentModelsResponse, UpdateManagedAgentRequest, UpdateManagedAgentResponse,
+        find_managed_agent_mut, known_acp_runtime, load_global_agent_config, load_managed_agents,
+        load_personas, managed_agent_avatar_url, missing_command_message, normalize_agent_args,
+        resolve_command, save_managed_agents, sync_managed_agent_processes, try_regenerate_nest,
+        AgentModelInfo, AgentModelsResponse, UpdateManagedAgentRequest, UpdateManagedAgentResponse,
         DEFAULT_ACP_COMMAND,
     },
     relay::{relay_ws_url_with_override, sync_managed_agent_profile},
@@ -31,7 +38,7 @@ pub async fn get_agent_models(
     app: AppHandle,
     state: State<'_, AppState>,
 ) -> Result<AgentModelsResponse, String> {
-    let (resolved_acp, agent_command, agent_args, persisted_model, effective_provider, merged_env) = {
+    let (resolved_acp, agent_command, discovery) = {
         let _store_guard = state
             .managed_agents_store_lock
             .lock()
@@ -62,34 +69,39 @@ pub async fn get_agent_models(
         // so model discovery runs against the persona's current harness, not the
         // frozen record snapshot. An explicit per-agent override wins.
         let personas = load_personas(&app).unwrap_or_default();
-        let effective_command = crate::managed_agents::record_agent_command(record, &personas);
+        let global = load_global_agent_config(&app).unwrap_or_default();
 
-        let args = normalize_agent_args(&effective_command, record.agent_args.clone());
+        // Single pure helper — descriptor + authoritative model/provider
+        // resolver, packaged so the linked-agent regression test binds the
+        // exact values this command consumes. Returns Err on dangling harness
+        // id, propagating it to the caller.
+        let discovery = agent_model_discovery_config(record, &personas, &global)
+            .map_err(|e| model_discovery_error(&pubkey, &e))?;
 
-        let resolved_agent = resolve_command(&effective_command)
+        let resolved_agent = resolve_command(&discovery.command)
             .map(|p| p.display().to_string())
-            .unwrap_or_else(|| effective_command.clone());
+            .unwrap_or_else(|| discovery.command.clone());
 
-        // ModelPicker can persist a selected model but not rewrite the saved
-        // provider/env snapshot, and runtime spawn reads that same snapshot.
-        // Discover models against the record snapshot so an out-of-date persona
-        // cannot offer models for a provider this agent will not launch with.
-        let discovery = saved_agent_model_discovery_config(record, &effective_command);
-
-        (
-            resolved,
-            resolved_agent,
-            args,
-            discovery.model,
-            discovery.provider,
-            discovery.env,
-        )
+        (resolved, resolved_agent, discovery)
     }; // store lock released — subprocess runs without holding the lock
 
+    let AgentModelDiscoveryConfig {
+        args: agent_args,
+        model: persisted_model,
+        provider: saved_provider,
+        provider_env_var,
+        env: merged_env,
+        command: _,
+    } = discovery;
+
     let merged_env = discovery_env_with_baked_floor(merged_env);
+    // Resolve against the baked/process env when the record saved no provider,
+    // so a build-provided provider still gets live discovery.
+    let effective_provider =
+        effective_discovery_provider(saved_provider.as_deref(), provider_env_var, &merged_env);
     if let Some(models) = discover_openai_compatible_models(
         &state.http_client,
-        effective_provider.as_deref(),
+        &effective_provider,
         &merged_env,
         persisted_model.clone(),
     )
@@ -100,7 +112,7 @@ pub async fn get_agent_models(
 
     if let Some(models) = discover_anthropic_models(
         &state.http_client,
-        effective_provider.as_deref(),
+        &effective_provider,
         &merged_env,
         persisted_model.clone(),
     )
@@ -111,7 +123,7 @@ pub async fn get_agent_models(
 
     if let Some(models) = discover_databricks_models(
         &state.http_client,
-        effective_provider.as_deref(),
+        &effective_provider,
         &merged_env,
         persisted_model.clone(),
     )
@@ -130,35 +142,80 @@ pub async fn get_agent_models(
     .await
 }
 
+/// Error copy for a failed harness resolution during model discovery.
+///
+/// Routes through `user_facing_harness_error` so a dangling harness id renders
+/// as a sentence, never as the raw `DANGLING_HARNESS_ID:` sentinel — the same
+/// contract spawn and summary rows honor.
+fn model_discovery_error(pubkey: &str, error: &str) -> String {
+    format!(
+        "cannot discover models for {pubkey}: {}",
+        crate::managed_agents::user_facing_harness_error(error)
+    )
+}
+
+/// Everything `get_agent_models` needs from the record + context, resolved in
+/// one pure step so the linked-agent regression test can bind the exact values
+/// the command consumes.
 #[derive(Debug, PartialEq, Eq)]
-struct SavedAgentModelDiscoveryConfig {
+struct AgentModelDiscoveryConfig {
+    /// Effective harness command (descriptor-resolved), for `resolve_command`.
+    command: String,
+    /// Effective harness args (descriptor-resolved).
+    args: Vec<String>,
+    /// Model from the authoritative resolver spawn uses — linked instances
+    /// read their definition, never stale `record.model` bytes.
     model: Option<String>,
+    /// Provider from the same authoritative resolver — never stale
+    /// `record.provider` bytes for linked instances.
     provider: Option<String>,
+    /// The runtime's provider env var (e.g. `GOOSE_PROVIDER`), so discovery
+    /// can recover the provider from the env when the resolver yields none.
+    /// `None` for runtimes that do not take a provider, or an unknown command.
+    provider_env_var: Option<&'static str>,
+    /// The descriptor's fully layered env (definition/persona/global/agent).
     env: BTreeMap<String, String>,
 }
 
-fn saved_agent_model_discovery_config(
+/// Resolve the model-discovery config for a saved agent — the descriptor-backed
+/// successor to the old `saved_agent_model_discovery_config`.
+///
+/// Command/args/env come from `resolve_effective_harness_descriptor` (the same
+/// resolver as `spawn_agent_child`); model/provider come from
+/// `resolve_effective_model_provider` (#1968's definition-authoritative
+/// contract) — linked instances read their definition, never a stale
+/// materialized `record.model`/`record.provider`, so discovery cannot query a
+/// provider this agent will not actually launch with. Definition-less
+/// instances keep their own record values, matching spawn's
+/// `resolve_definition_less` arm. When the resolver yields no provider,
+/// `effective_discovery_provider` recovers the provider the agent will
+/// actually launch with from the runtime's own provider env var, read out of
+/// the descriptor env (which already layers definition/persona/global values
+/// the same way spawn does).
+///
+/// Returns `Err("DANGLING_HARNESS_ID:<id>")` from the descriptor resolver when
+/// the harness id no longer exists; the caller routes it through
+/// `model_discovery_error`.
+fn agent_model_discovery_config(
     record: &crate::managed_agents::ManagedAgentRecord,
-    agent_command: &str,
-) -> SavedAgentModelDiscoveryConfig {
-    let mut derived_env = BTreeMap::new();
-    if let Some(meta) = known_acp_runtime(agent_command) {
-        for (key, value) in crate::managed_agents::runtime_metadata_env_vars(
-            meta.model_env_var,
-            meta.provider_env_var,
-            meta.provider_locked,
-            record.model.as_deref(),
-            record.provider.as_deref(),
-        ) {
-            derived_env.insert(key.to_string(), value.to_string());
-        }
-    }
+    personas: &[crate::managed_agents::AgentDefinition],
+    global: &crate::managed_agents::GlobalAgentConfig,
+) -> Result<AgentModelDiscoveryConfig, String> {
+    let descriptor =
+        crate::managed_agents::resolve_effective_harness_descriptor(record, personas, global)?;
+    let (model, provider) =
+        crate::managed_agents::resolve_effective_model_provider(record, personas, global);
+    let provider_env_var =
+        known_acp_runtime(&descriptor.command).and_then(|meta| meta.provider_env_var);
 
-    SavedAgentModelDiscoveryConfig {
-        model: record.model.clone(),
-        provider: record.provider.clone(),
-        env: crate::managed_agents::merged_user_env(&derived_env, &record.env_vars),
-    }
+    Ok(AgentModelDiscoveryConfig {
+        command: descriptor.command,
+        args: descriptor.args,
+        model,
+        provider,
+        provider_env_var,
+        env: descriptor.env,
+    })
 }
 
 #[derive(Debug, Deserialize)]
@@ -173,6 +230,10 @@ pub struct DiscoverAgentModelsInput {
     pub provider: Option<String>,
     #[serde(default)]
     pub env_vars: BTreeMap<String, String>,
+    /// Definition-level env from the harness definition (custom/preset).
+    /// Merged below user `env_vars` so user overrides always win.
+    #[serde(default)]
+    pub definition_env: BTreeMap<String, String>,
 }
 
 /// Query available models from an unsaved agent configuration.
@@ -186,6 +247,8 @@ pub async fn discover_agent_models(
     state: State<'_, AppState>,
 ) -> Result<AgentModelsResponse, String> {
     crate::managed_agents::validate_user_env_keys(&input.env_vars)?;
+    // Also validate definition_env (caller-supplied, same trust level as env_vars).
+    crate::managed_agents::validate_user_env_keys(&input.definition_env)?;
 
     let acp_command = input
         .acp_command
@@ -205,8 +268,9 @@ pub async fn discover_agent_models(
         .map(|p| p.display().to_string())
         .unwrap_or_else(|| agent_command.to_string());
 
+    let runtime_meta = known_acp_runtime(agent_command);
     let mut derived_env = BTreeMap::new();
-    if let Some(meta) = known_acp_runtime(agent_command) {
+    if let Some(meta) = runtime_meta {
         let provider = input
             .provider
             .as_deref()
@@ -218,8 +282,26 @@ pub async fn discover_agent_models(
             }
         }
     }
-    let merged_env = crate::managed_agents::merged_user_env(&derived_env, &input.env_vars);
+    // Layer definition_env below user env_vars so user overrides always win.
+    // Reserved keys are stripped, matching the same filter applied at spawn.
+    let mut filtered_definition_env = BTreeMap::new();
+    for (key, value) in &input.definition_env {
+        if !crate::managed_agents::is_reserved_env_key(key) {
+            filtered_definition_env.insert(key.clone(), value.clone());
+        }
+    }
+    // Merge: derived (metadata) → definition env → user env_vars.
+    let merged_with_def =
+        crate::managed_agents::merged_user_env(&derived_env, &filtered_definition_env);
+    let merged_env = crate::managed_agents::merged_user_env(&merged_with_def, &input.env_vars);
     let merged_env = discovery_env_with_baked_floor(merged_env);
+    // Recover a build-provided provider when the form has none, so the create
+    // dialog discovers live models instead of falling through to the subprocess.
+    let effective_provider = effective_discovery_provider(
+        input.provider.as_deref(),
+        runtime_meta.and_then(|meta| meta.provider_env_var),
+        &merged_env,
+    );
 
     // Buzz shared compute discovery must not depend on the local OpenAI ingress: that
     // client endpoint is started only after a live target is selected.
@@ -268,7 +350,7 @@ pub async fn discover_agent_models(
 
     if let Some(models) = discover_openai_compatible_models(
         &state.http_client,
-        input.provider.as_deref(),
+        &effective_provider,
         &merged_env,
         None,
     )
@@ -277,24 +359,16 @@ pub async fn discover_agent_models(
         return Ok(models);
     }
 
-    if let Some(models) = discover_anthropic_models(
-        &state.http_client,
-        input.provider.as_deref(),
-        &merged_env,
-        None,
-    )
-    .await?
+    if let Some(models) =
+        discover_anthropic_models(&state.http_client, &effective_provider, &merged_env, None)
+            .await?
     {
         return Ok(models);
     }
 
-    if let Some(models) = discover_databricks_models(
-        &state.http_client,
-        input.provider.as_deref(),
-        &merged_env,
-        None,
-    )
-    .await?
+    if let Some(models) =
+        discover_databricks_models(&state.http_client, &effective_provider, &merged_env, None)
+            .await?
     {
         return Ok(models);
     }
@@ -337,33 +411,6 @@ fn openai_compatible_models_url_for_discovery(env: &BTreeMap<String, String>) ->
     format!("{}/models", base_url.trim_end_matches('/'))
 }
 
-fn env_value(env: &BTreeMap<String, String>, key: &str) -> Option<String> {
-    env.get(key)
-        .map(String::as_str)
-        .map(str::trim)
-        .filter(|value| !value.is_empty())
-        .map(str::to_string)
-}
-
-fn env_or_process_value(env: &BTreeMap<String, String>, key: &str) -> Option<String> {
-    env_value(env, key).or_else(|| {
-        std::env::var(key)
-            .ok()
-            .map(|value| value.trim().to_string())
-            .filter(|value| !value.is_empty())
-    })
-}
-
-fn redaction_env_with_value(
-    env: &BTreeMap<String, String>,
-    key: &str,
-    value: &str,
-) -> BTreeMap<String, String> {
-    let mut redaction_env = env.clone();
-    redaction_env.insert(key.to_string(), value.to_string());
-    redaction_env
-}
-
 fn is_agent_text_model_id(id: &str) -> bool {
     let lower = id.to_ascii_lowercase();
     if [
@@ -482,20 +529,23 @@ fn normalize_openai_compatible_models(
 
 async fn discover_openai_compatible_models(
     client: &reqwest::Client,
-    provider: Option<&str>,
+    provider: &DiscoveryProvider,
     env: &BTreeMap<String, String>,
     selected_model: Option<String>,
 ) -> Result<Option<AgentModelsResponse>, String> {
-    let relay_mesh = provider.map(str::trim) == Some(crate::managed_agents::RELAY_MESH_PROVIDER_ID);
-    if !relay_mesh && !is_openai_compatible_provider(provider) {
+    let relay_mesh =
+        provider.as_deref().map(str::trim) == Some(crate::managed_agents::RELAY_MESH_PROVIDER_ID);
+    if !relay_mesh && !is_openai_compatible_provider(provider.as_deref()) {
         return Ok(None);
     }
 
     let api_key = if relay_mesh {
         crate::managed_agents::RELAY_MESH_API_KEY_PLACEHOLDER.to_string()
     } else {
-        env_or_process_value(env, "OPENAI_COMPAT_API_KEY")
-            .ok_or_else(|| "config: OPENAI_COMPAT_API_KEY required".to_string())?
+        match provider.required_env(env, "OPENAI_COMPAT_API_KEY")? {
+            Some(api_key) => api_key,
+            None => return Ok(None),
+        }
     };
     let redaction_env = redaction_env_with_value(env, "OPENAI_COMPAT_API_KEY", &api_key);
     let url = if relay_mesh {
@@ -520,13 +570,13 @@ async fn discover_openai_compatible_models(
         .json::<OpenAiModelListResponse>()
         .await
         .map_err(|error| format!("OpenAI model discovery response parse failed: {error}"))?;
-    let models = normalize_openai_compatible_models(response, provider);
+    let models = normalize_openai_compatible_models(response, provider.as_deref());
     if models.is_empty() {
         return Err("OpenAI model discovery returned no compatible text models".to_string());
     }
 
     Ok(Some(AgentModelsResponse {
-        agent_name: provider.unwrap_or("openai").trim().to_string(),
+        agent_name: provider.as_deref().unwrap_or("openai").trim().to_string(),
         agent_version: "models-api".to_string(),
         models,
         agent_default_model: None,
@@ -631,16 +681,18 @@ async fn fetch_anthropic_model_page(
 
 async fn discover_anthropic_models(
     client: &reqwest::Client,
-    provider: Option<&str>,
+    provider: &DiscoveryProvider,
     env: &BTreeMap<String, String>,
     selected_model: Option<String>,
 ) -> Result<Option<AgentModelsResponse>, String> {
-    if !is_anthropic_provider(provider) {
+    if !is_anthropic_provider(provider.as_deref()) {
         return Ok(None);
     }
 
-    let api_key = env_or_process_value(env, "ANTHROPIC_API_KEY")
-        .ok_or_else(|| "config: ANTHROPIC_API_KEY required".to_string())?;
+    let api_key = match provider.required_env(env, "ANTHROPIC_API_KEY")? {
+        Some(api_key) => api_key,
+        None => return Ok(None),
+    };
     let redaction_env = redaction_env_with_value(env, "ANTHROPIC_API_KEY", &api_key);
     let url = anthropic_models_url_for_discovery(env);
     let mut models = Vec::new();
@@ -666,7 +718,11 @@ async fn discover_anthropic_models(
     }
 
     Ok(Some(AgentModelsResponse {
-        agent_name: provider.unwrap_or("anthropic").trim().to_string(),
+        agent_name: provider
+            .as_deref()
+            .unwrap_or("anthropic")
+            .trim()
+            .to_string(),
         agent_version: "models-api".to_string(),
         models,
         agent_default_model: None,
@@ -708,11 +764,11 @@ fn databricks_agent_provider(provider: &str) -> buzz_agent_pkg::config::Provider
 
 async fn discover_databricks_models(
     _client: &reqwest::Client,
-    provider: Option<&str>,
+    provider: &DiscoveryProvider,
     env: &BTreeMap<String, String>,
     selected_model: Option<String>,
 ) -> Result<Option<AgentModelsResponse>, String> {
-    let provider_str = match provider {
+    let provider_str = match provider.as_deref() {
         Some(p) if is_databricks_provider(Some(p)) => p,
         _ => return Ok(None),
     };
@@ -767,6 +823,35 @@ async fn discover_databricks_models(
     }))
 }
 
+/// Apply an `UpdateManagedAgentRequest`'s model/provider/system_prompt patch
+/// to `record`, enforcing the linked-instance write guard: a definition-linked
+/// record's model/provider/prompt are definition-authoritative (see
+/// `effective_config::resolve_linked`), so writes to these three fields are
+/// silently dropped for a linked instance rather than persisting a byte the
+/// resolver will never read. Definition-less instances accept the patch
+/// as-is. Extracted so the guard is exercised by both `update_managed_agent`
+/// and its regression tests — a test that reimplements this check instead of
+/// calling it can go green after the real guard is deleted.
+fn apply_model_provider_prompt_update(
+    record: &mut crate::managed_agents::ManagedAgentRecord,
+    model: Option<Option<String>>,
+    provider: Option<Option<String>>,
+    system_prompt: Option<Option<String>>,
+) {
+    if record.persona_id.is_some() {
+        return;
+    }
+    if let Some(model_update) = model {
+        record.model = model_update;
+    }
+    if let Some(provider_update) = provider {
+        record.provider = provider_update;
+    }
+    if let Some(prompt_update) = system_prompt {
+        record.system_prompt = prompt_update;
+    }
+}
+
 /// Update mutable fields on an existing managed agent record.
 ///
 /// Does NOT auto-restart the agent. Runtime config changes (system prompt,
@@ -806,15 +891,12 @@ pub async fn update_managed_agent(
                 name_changed = true;
             }
         }
-        if let Some(model_update) = input.model {
-            record.model = model_update;
-        }
-        if let Some(provider_update) = input.provider {
-            record.provider = provider_update;
-        }
-        if let Some(prompt_update) = input.system_prompt {
-            record.system_prompt = prompt_update;
-        }
+        apply_model_provider_prompt_update(
+            record,
+            input.model,
+            input.provider,
+            input.system_prompt,
+        );
         if let Some(parallelism) = input.parallelism {
             record.parallelism = parallelism;
         }
@@ -938,7 +1020,13 @@ pub async fn update_managed_agent(
 
         let summary = {
             let personas = load_personas(&app).unwrap_or_default();
-            build_managed_agent_summary(&app, record, &runtimes, &personas)?
+            build_managed_agent_summary(
+                &app,
+                record,
+                &runtimes,
+                &personas,
+                &crate::managed_agents::load_global_agent_config(&app).unwrap_or_default(),
+            )?
         };
         let rollback = name_changed.then(|| AgentUpdateRollback::new(previous_record, record));
         (summary, sync_params, rollback)
diff --git a/desktop/src-tauri/src/commands/agent_models_env.rs b/desktop/src-tauri/src/commands/agent_models_env.rs
new file mode 100644
index 0000000000..0a40b6bd8f
--- /dev/null
+++ b/desktop/src-tauri/src/commands/agent_models_env.rs
@@ -0,0 +1,114 @@
+//! Env lookups shared by the in-process model discovery paths.
+//!
+//! Discovery reads configuration from a merged env map (record/form env over the
+//! runtime-derived env, under the baked build floor) and falls back to the
+//! process env for values a GUI launch never wrote into the map.
+
+use std::collections::BTreeMap;
+
+/// Read a non-blank value from the merged discovery env.
+pub(super) fn env_value(env: &BTreeMap<String, String>, key: &str) -> Option<String> {
+    env.get(key)
+        .map(String::as_str)
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+        .map(str::to_string)
+}
+
+/// Read a non-blank value from the merged discovery env, then the process env.
+pub(super) fn env_or_process_value(env: &BTreeMap<String, String>, key: &str) -> Option<String> {
+    env_value(env, key).or_else(|| {
+        std::env::var(key)
+            .ok()
+            .map(|value| value.trim().to_string())
+            .filter(|value| !value.is_empty())
+    })
+}
+
+/// Clone `env` with `key` set to the value a request actually used, so error
+/// redaction masks the inherited process value and not just the mapped one.
+pub(super) fn redaction_env_with_value(
+    env: &BTreeMap<String, String>,
+    key: &str,
+    value: &str,
+) -> BTreeMap<String, String> {
+    let mut redaction_env = env.clone();
+    redaction_env.insert(key.to_string(), value.to_string());
+    redaction_env
+}
+
+/// A provider resolved for discovery, plus how it was resolved.
+///
+/// The distinction decides what a missing credential means. An explicit provider
+/// is an assertion — the record or the dialog says this agent runs on Anthropic,
+/// so a missing `ANTHROPIC_API_KEY` is a real misconfiguration and the user
+/// should see it. An inferred provider is only a guess read off the environment,
+/// and a wrong guess must not replace a working catalog with an error: a
+/// `GOOSE_PROVIDER=anthropic` export (goose's documented way to pick a provider,
+/// with the key in goose's own keyring rather than Buzz's env) would otherwise
+/// turn the subprocess catalog into `config: ANTHROPIC_API_KEY required`.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(super) struct DiscoveryProvider {
+    value: Option<String>,
+    inferred: bool,
+}
+
+impl DiscoveryProvider {
+    pub(super) fn as_deref(&self) -> Option<&str> {
+        self.value.as_deref()
+    }
+
+    /// Read a credential the provider's discovery cannot run without.
+    ///
+    /// `Ok(None)` means "not configured, and the provider was only inferred" —
+    /// the caller must fall through to the `buzz-acp models` subprocess rather
+    /// than surface an error.
+    pub(super) fn required_env(
+        &self,
+        env: &BTreeMap<String, String>,
+        key: &str,
+    ) -> Result<Option<String>, String> {
+        match env_or_process_value(env, key) {
+            Some(value) => Ok(Some(value)),
+            None if self.inferred => Ok(None),
+            None => Err(format!("config: {key} required")),
+        }
+    }
+}
+
+/// Resolve the provider that live model discovery should run against.
+///
+/// An explicit provider — the agent record's saved provider, or the create/edit
+/// dialog's current form value — always wins. When there is none, fall back to
+/// the provider the agent will actually launch with: the runtime's provider env
+/// var read out of `env`, which by this point already carries the baked build
+/// floor (see `discovery_env_with_baked_floor`) and the process env.
+///
+/// Without this fallback, every provider gate sees `None` for an agent whose
+/// record predates provider persistence, so no in-process discovery runs at all
+/// — even on an internal build that bakes `BUZZ_AGENT_PROVIDER=databricks_v2`
+/// and a `DATABRICKS_HOST`. Discovery then degrades to the `buzz-acp models`
+/// subprocess, which on a Databricks failure path surfaces the small
+/// known-models fallback catalog instead of the live gateway list —
+/// indistinguishable, from the picker's side, from the real thing.
+pub(super) fn effective_discovery_provider(
+    provider: Option<&str>,
+    provider_env_var: Option<&str>,
+    env: &BTreeMap<String, String>,
+) -> DiscoveryProvider {
+    if let Some(explicit) = provider
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+        .map(str::to_string)
+    {
+        return DiscoveryProvider {
+            value: Some(explicit),
+            inferred: false,
+        };
+    }
+
+    DiscoveryProvider {
+        value: provider_env_var.and_then(|key| env_or_process_value(env, key)),
+        inferred: true,
+    }
+}
diff --git a/desktop/src-tauri/src/commands/agent_models_tests.rs b/desktop/src-tauri/src/commands/agent_models_tests.rs
index 0f99927c9e..b65f240900 100644
--- a/desktop/src-tauri/src/commands/agent_models_tests.rs
+++ b/desktop/src-tauri/src/commands/agent_models_tests.rs
@@ -164,7 +164,7 @@ fn redaction_env_records_value_used_for_request() {
 }
 
 #[test]
-fn saved_agent_model_discovery_uses_record_snapshot() {
+fn saved_agent_model_discovery_uses_record_snapshot_for_definition_less_agent() {
     let record: crate::managed_agents::ManagedAgentRecord = serde_json::from_str(
         r#"{
             "pubkey": "abcd1234",
@@ -173,6 +173,7 @@ fn saved_agent_model_discovery_uses_record_snapshot() {
             "relay_url": "wss://localhost:3000",
             "acp_command": "buzz-acp",
             "agent_command": "goose",
+            "agent_command_override": "goose",
             "agent_args": [],
             "mcp_command": "",
             "turn_timeout_seconds": 320,
@@ -193,23 +194,239 @@ fn saved_agent_model_discovery_uses_record_snapshot() {
     )
     .expect("sample managed agent record");
 
-    let config = saved_agent_model_discovery_config(&record, "goose");
+    // agent_model_discovery_config is the single helper get_agent_models
+    // consumes — verify it layers env correctly, strips reserved keys, and
+    // keeps the record's own model/provider for a definition-less instance
+    // (matching spawn's `resolve_definition_less` arm).
+    let discovery = agent_model_discovery_config(&record, &[], &Default::default())
+        .expect("discovery config should resolve for a valid record");
 
-    assert_eq!(config.model.as_deref(), Some("record-model"));
-    assert_eq!(config.provider.as_deref(), Some("databricks"));
+    assert_eq!(discovery.command.as_str(), "goose");
+    assert_eq!(discovery.model.as_deref(), Some("record-model"));
+    assert_eq!(discovery.provider.as_deref(), Some("databricks"));
     assert_eq!(
-        config.env.get("GOOSE_MODEL").map(String::as_str),
+        discovery.env.get("GOOSE_MODEL").map(String::as_str),
         Some("record-model")
     );
     assert_eq!(
-        config.env.get("GOOSE_PROVIDER").map(String::as_str),
+        discovery.env.get("GOOSE_PROVIDER").map(String::as_str),
         Some("databricks")
     );
     assert_eq!(
-        config.env.get("OPENAI_API_KEY").map(String::as_str),
+        discovery.env.get("OPENAI_API_KEY").map(String::as_str),
         Some("record-key")
     );
-    assert!(!config.env.contains_key("BUZZ_PRIVATE_KEY"));
+    // Reserved keys are stripped from the descriptor env.
+    assert!(!discovery.env.contains_key("BUZZ_PRIVATE_KEY"));
+    // The provider env var is recovered from the runtime metadata for the
+    // effective command (the old SavedAgentModelDiscoveryConfig.provider_env_var).
+    assert_eq!(discovery.provider_env_var, Some("GOOSE_PROVIDER"));
+}
+
+// ---------------------------------------------------------------------------
+// Provider resolution for discovery
+// ---------------------------------------------------------------------------
+
+#[test]
+fn effective_discovery_provider_prefers_the_explicit_provider() {
+    let env = BTreeMap::from([(
+        "BUZZ_AGENT_PROVIDER".to_string(),
+        "databricks_v2".to_string(),
+    )]);
+
+    // A saved/selected provider is a deliberate choice and must win over the
+    // build-provided default, so discovery matches what spawn will use.
+    assert_eq!(
+        effective_discovery_provider(Some("anthropic"), Some("BUZZ_AGENT_PROVIDER"), &env)
+            .as_deref(),
+        Some("anthropic")
+    );
+}
+
+#[test]
+fn effective_discovery_provider_recovers_baked_provider_when_record_has_none() {
+    let env = BTreeMap::from([(
+        "BUZZ_AGENT_PROVIDER".to_string(),
+        "databricks_v2".to_string(),
+    )]);
+
+    // The regression this guards: records predating provider persistence carry
+    // `provider: null`, so every discovery gate saw None and no live Databricks
+    // catalog was ever fetched on builds that bake the provider in.
+    for provider in [None, Some(""), Some("   ")] {
+        assert_eq!(
+            effective_discovery_provider(provider, Some("BUZZ_AGENT_PROVIDER"), &env).as_deref(),
+            Some("databricks_v2"),
+            "provider input {provider:?} must fall back to the env value"
+        );
+    }
+}
+
+#[test]
+fn effective_discovery_provider_is_none_without_an_explicit_or_env_provider() {
+    let env = BTreeMap::new();
+    assert_eq!(
+        effective_discovery_provider(None, Some("BUZZ_AGENT_PROVIDER"), &env).as_deref(),
+        None
+    );
+    // A runtime that takes no provider env var has nothing to recover from.
+    assert_eq!(
+        effective_discovery_provider(
+            None,
+            None,
+            &BTreeMap::from([(
+                "BUZZ_AGENT_PROVIDER".to_string(),
+                "databricks_v2".to_string()
+            )])
+        )
+        .as_deref(),
+        None
+    );
+}
+
+/// A credential name no environment sets, so `required_env` is exercised without
+/// depending on what the developer happens to have exported.
+const UNSET_CREDENTIAL: &str = "BUZZ_TEST_UNSET_DISCOVERY_CREDENTIAL";
+
+#[test]
+fn env_derived_provider_falls_through_when_its_credential_is_missing() {
+    let env = BTreeMap::from([("GOOSE_PROVIDER".to_string(), "anthropic".to_string())]);
+    let inferred = effective_discovery_provider(None, Some("GOOSE_PROVIDER"), &env);
+    assert_eq!(inferred.as_deref(), Some("anthropic"));
+
+    // `export GOOSE_PROVIDER=anthropic` is goose's documented way to pick a
+    // provider, and it keeps the API key in its own config/keyring rather than in
+    // Buzz's env — so the provider is visible here and the credential is not.
+    // Erroring would swap the working subprocess catalog for a hard
+    // "config: ... required" on exactly the null-provider records this fallback
+    // exists to serve; the gate has to decline instead.
+    assert_eq!(inferred.required_env(&env, UNSET_CREDENTIAL), Ok(None));
+}
+
+#[test]
+fn explicit_provider_still_reports_a_missing_credential() {
+    // An explicit provider is an assertion about this agent, so a missing
+    // credential is a real misconfiguration and stays user-visible.
+    let env = BTreeMap::new();
+    let explicit = effective_discovery_provider(Some("anthropic"), Some("GOOSE_PROVIDER"), &env);
+    assert_eq!(
+        explicit.required_env(&env, UNSET_CREDENTIAL),
+        Err(format!("config: {UNSET_CREDENTIAL} required"))
+    );
+}
+
+#[test]
+fn required_env_returns_a_configured_credential_however_the_provider_was_resolved() {
+    let env = BTreeMap::from([
+        ("GOOSE_PROVIDER".to_string(), "anthropic".to_string()),
+        (
+            UNSET_CREDENTIAL.to_string(),
+            "  sk-configured  ".to_string(),
+        ),
+    ]);
+    for provider in [Some("anthropic"), None] {
+        let resolved = effective_discovery_provider(provider, Some("GOOSE_PROVIDER"), &env);
+        assert_eq!(
+            resolved.required_env(&env, UNSET_CREDENTIAL),
+            Ok(Some("sk-configured".to_string())),
+            "provider input {provider:?} must read the configured credential"
+        );
+    }
+}
+
+#[test]
+fn effective_discovery_provider_reads_the_runtimes_own_env_var() {
+    // goose keys its provider off GOOSE_PROVIDER, so a BUZZ_AGENT_PROVIDER in
+    // the env must not be mistaken for this runtime's provider.
+    let env = BTreeMap::from([
+        ("GOOSE_PROVIDER".to_string(), "databricks".to_string()),
+        (
+            "BUZZ_AGENT_PROVIDER".to_string(),
+            "databricks_v2".to_string(),
+        ),
+    ]);
+    assert_eq!(
+        effective_discovery_provider(None, Some("GOOSE_PROVIDER"), &env).as_deref(),
+        Some("databricks")
+    );
+}
+
+/// Definition-authoritative: a linked agent's stale materialized
+/// `record.model`/`record.provider` must never drive model discovery — the
+/// linked definition's current model/provider wins, mirroring spawn's
+/// `resolve_effective_model_provider`.
+#[test]
+fn model_discovery_ignores_stale_record_for_linked_agent() {
+    let record: crate::managed_agents::ManagedAgentRecord = serde_json::from_str(
+        r#"{
+            "pubkey": "abcd1234",
+            "name": "test-agent",
+            "persona_id": "persona-1",
+            "private_key_nsec": "nsec1fake",
+            "relay_url": "wss://localhost:3000",
+            "acp_command": "buzz-acp",
+            "agent_command": "goose",
+            "agent_args": [],
+            "mcp_command": "",
+            "turn_timeout_seconds": 320,
+            "system_prompt": null,
+            "model": "stale-record-model",
+            "provider": "stale-record-provider",
+            "env_vars": {},
+            "created_at": "2026-01-01T00:00:00Z",
+            "updated_at": "2026-01-01T00:00:00Z",
+            "last_started_at": null,
+            "last_stopped_at": null,
+            "last_exit_code": null,
+            "last_error": null
+        }"#,
+    )
+    .expect("sample managed agent record");
+
+    let persona = crate::managed_agents::AgentDefinition {
+        id: "persona-1".to_string(),
+        display_name: "Persona".to_string(),
+        avatar_url: None,
+        system_prompt: "You are a persona.".to_string(),
+        runtime: Some("goose".to_string()),
+        model: Some("persona-model".to_string()),
+        provider: Some("anthropic".to_string()),
+        name_pool: Vec::new(),
+        is_builtin: false,
+        is_active: true,
+        shared: false,
+        source_team: None,
+        source_team_persona_slug: None,
+        catalog_source: None,
+        env_vars: BTreeMap::new(),
+        respond_to: None,
+        respond_to_allowlist: Vec::new(),
+        parallelism: None,
+        created_at: "".to_string(),
+        updated_at: "".to_string(),
+    };
+
+    // agent_model_discovery_config is the single helper get_agent_models
+    // consumes — the stale record bytes must lose to the persona's current
+    // model/provider (the same authoritative resolver spawn uses).
+    let personas = [persona];
+    let global = crate::managed_agents::GlobalAgentConfig::default();
+    let discovery = agent_model_discovery_config(&record, &personas, &global)
+        .expect("discovery config should resolve for a linked record");
+    assert_eq!(discovery.model.as_deref(), Some("persona-model"));
+    assert_eq!(discovery.provider.as_deref(), Some("anthropic"));
+
+    // And the discovery env comes from the descriptor, whose layering also
+    // resolves through the definition — the derived model env var must carry
+    // the persona's model, not the stale record snapshot.
+    assert_eq!(
+        discovery.env.get("GOOSE_MODEL").map(String::as_str),
+        Some("persona-model")
+    );
+    assert_eq!(
+        discovery.env.get("GOOSE_PROVIDER").map(String::as_str),
+        Some("anthropic")
+    );
 }
 
 // ---------------------------------------------------------------------------
@@ -252,6 +469,104 @@ fn update_request_turn_timeout_parses_for_wire_compat() {
     assert_eq!(req.turn_timeout_seconds, Some(9999));
 }
 
+// ---------------------------------------------------------------------------
+// Linked-instance write guard (model/provider/prompt)
+// ---------------------------------------------------------------------------
+
+#[test]
+fn linked_instance_ignores_model_provider_prompt_writes() {
+    let mut record: crate::managed_agents::ManagedAgentRecord = serde_json::from_str(
+        r#"{
+            "pubkey": "linked1",
+            "name": "linked-agent",
+            "persona_id": "p1",
+            "private_key_nsec": "nsec1fake",
+            "relay_url": "wss://localhost:3000",
+            "acp_command": "buzz-acp",
+            "agent_command": "goose",
+            "agent_args": [],
+            "mcp_command": "",
+            "turn_timeout_seconds": 320,
+            "system_prompt": null,
+            "model": null,
+            "provider": null,
+            "env_vars": {},
+            "created_at": "2026-01-01T00:00:00Z",
+            "updated_at": "2026-01-01T00:00:00Z",
+            "last_started_at": null,
+            "last_stopped_at": null,
+            "last_exit_code": null,
+            "last_error": null
+        }"#,
+    )
+    .expect("linked agent record");
+
+    let is_linked = record.persona_id.is_some();
+    assert!(is_linked, "test setup: record must be linked");
+
+    crate::commands::agent_models::apply_model_provider_prompt_update(
+        &mut record,
+        Some(Some("explicit-model".to_string())),
+        Some(Some("explicit-prov".to_string())),
+        Some(Some("explicit-prompt".to_string())),
+    );
+
+    assert!(
+        record.model.is_none(),
+        "linked record model must not be updated"
+    );
+    assert!(
+        record.provider.is_none(),
+        "linked record provider must not be updated"
+    );
+    assert!(
+        record.system_prompt.is_none(),
+        "linked record system_prompt must not be updated"
+    );
+}
+
+#[test]
+fn definition_less_instance_accepts_model_provider_prompt_writes() {
+    let mut record: crate::managed_agents::ManagedAgentRecord = serde_json::from_str(
+        r#"{
+            "pubkey": "standalone1",
+            "name": "standalone-agent",
+            "private_key_nsec": "nsec1fake",
+            "relay_url": "wss://localhost:3000",
+            "acp_command": "buzz-acp",
+            "agent_command": "goose",
+            "agent_args": [],
+            "mcp_command": "",
+            "turn_timeout_seconds": 320,
+            "system_prompt": null,
+            "model": null,
+            "provider": null,
+            "env_vars": {},
+            "created_at": "2026-01-01T00:00:00Z",
+            "updated_at": "2026-01-01T00:00:00Z",
+            "last_started_at": null,
+            "last_stopped_at": null,
+            "last_exit_code": null,
+            "last_error": null
+        }"#,
+    )
+    .expect("standalone agent record");
+
+    let is_linked = record.persona_id.is_some();
+    assert!(!is_linked, "test setup: record must not be linked");
+
+    crate::commands::agent_models::apply_model_provider_prompt_update(
+        &mut record,
+        Some(Some("new-model".to_string())),
+        Some(Some("new-prov".to_string())),
+        Some(Some("new-prompt".to_string())),
+    );
+
+    assert_eq!(record.model.as_deref(), Some("new-model"));
+    assert_eq!(record.provider.as_deref(), Some("new-prov"));
+    assert_eq!(record.system_prompt.as_deref(), Some("new-prompt"));
+}
+
 #[test]
 fn is_databricks_provider_matches_both_variants() {
     assert!(is_databricks_provider(Some("databricks")));
@@ -260,3 +575,18 @@ fn is_databricks_provider_matches_both_variants() {
     assert!(!is_databricks_provider(Some("anthropic")));
     assert!(!is_databricks_provider(None));
 }
+
+#[test]
+fn model_discovery_error_converts_dangling_sentinel_to_sentence() {
+    // get_agent_models is a user-facing surface: a dangling harness must
+    // render as a sentence, never as the raw DANGLING_HARNESS_ID: sentinel.
+    let raw = format!("{}doomed", crate::managed_agents::DANGLING_HARNESS_PREFIX);
+    let msg = model_discovery_error("agent-pk", &raw);
+    assert!(msg.contains("cannot discover models for agent-pk"));
+    assert!(msg.contains("\"doomed\"") && msg.contains("deleted"));
+    assert!(!msg.contains(crate::managed_agents::DANGLING_HARNESS_PREFIX));
+
+    // Non-dangling errors pass through untouched.
+    let plain = model_discovery_error("agent-pk", "plain failure");
+    assert_eq!(plain, "cannot discover models for agent-pk: plain failure");
+}
diff --git a/desktop/src-tauri/src/commands/agent_settings.rs b/desktop/src-tauri/src/commands/agent_settings.rs
index 4f043d2403..2317930c1e 100644
--- a/desktop/src-tauri/src/commands/agent_settings.rs
+++ b/desktop/src-tauri/src/commands/agent_settings.rs
@@ -57,7 +57,13 @@ pub async fn set_managed_agent_start_on_app_launch(
             .find(|record| record.pubkey == pubkey)
             .ok_or_else(|| format!("agent {pubkey} not found"))?;
         let personas = load_personas(&app).unwrap_or_default();
-        build_managed_agent_summary(&app, record, &runtimes, &personas)
+        build_managed_agent_summary(
+            &app,
+            record,
+            &runtimes,
+            &personas,
+            &crate::managed_agents::load_global_agent_config(&app).unwrap_or_default(),
+        )
     })
     .await
     .map_err(|e| format!("spawn_blocking failed: {e}"))?
@@ -102,7 +108,13 @@ pub async fn set_managed_agent_auto_restart(
             .find(|record| record.pubkey == pubkey)
             .ok_or_else(|| format!("agent {pubkey} not found"))?;
         let personas = load_personas(&app).unwrap_or_default();
-        build_managed_agent_summary(&app, record, &runtimes, &personas)
+        build_managed_agent_summary(
+            &app,
+            record,
+            &runtimes,
+            &personas,
+            &crate::managed_agents::load_global_agent_config(&app).unwrap_or_default(),
+        )
     })
     .await
     .map_err(|e| format!("spawn_blocking failed: {e}"))?
diff --git a/desktop/src-tauri/src/commands/agents.rs b/desktop/src-tauri/src/commands/agents.rs
index c65900b5de..0758fc3aac 100644
--- a/desktop/src-tauri/src/commands/agents.rs
+++ b/desktop/src-tauri/src/commands/agents.rs
@@ -6,8 +6,8 @@ use crate::{
     managed_agents::{
         build_managed_agent_summary, current_instance_id, discover_provider_candidates,
         ensure_persona_is_active, find_managed_agent_mut, load_managed_agents, load_personas,
-        load_teams, managed_agent_avatar_url, managed_agents_base_dir, normalize_agent_args,
-        provider_deploy, resolve_provider_binary, save_managed_agents, start_managed_agent_process,
+        load_teams, managed_agent_avatar_url, normalize_agent_args, provider_deploy,
+        resolve_provider_binary, save_managed_agents, start_managed_agent_process,
         stop_managed_agent_process, stop_managed_agent_workspace_pair,
         sync_managed_agent_processes, try_regenerate_nest, validate_provider_config, BackendKind,
         CreateManagedAgentRequest, CreateManagedAgentResponse, ManagedAgentRecord,
@@ -18,8 +18,7 @@ use crate::{
     util::now_iso,
 };
 
-/// Read the workspace owner's pubkey hex from app state without holding the
-/// lock for longer than necessary. Used to populate `BUZZ_ACP_AGENT_OWNER`
+/// Read the workspace owner pubkey without holding the lock. Used to populate `BUZZ_ACP_AGENT_OWNER`
 /// as a fallback for legacy agent records that have no NIP-OA `auth_tag`.
 pub(super) fn workspace_owner_hex(state: &AppState) -> Result<String, String> {
     let keys = state.keys.lock().map_err(|e| e.to_string())?;
@@ -45,52 +44,15 @@ pub(super) fn retain_managed_agent_pending(
     state: &AppState,
     record: &ManagedAgentRecord,
 ) {
-    use crate::managed_agents::{
-        agent_events::{agent_event_content, build_agent_event},
-        persona_events::monotonic_created_at,
-        retention::{get_retained_event, open_retention_db, retain_event, RetainedEvent},
-    };
-    use buzz_core_pkg::kind::KIND_MANAGED_AGENT;
-    use nostr::JsonUtil;
+    use crate::managed_agents::{reconcile::retain_agent_record, retention::open_retention_db};
 
     let result = (|| -> Result<(), String> {
-        let conn = open_retention_db(&managed_agents_base_dir(app)?.join("retention.db"))?;
-        // The published content is the opt-IN projection JSON, independent of
-        // signing and created_at. Compute it once to drive the no-republish
-        // guard without signing twice.
-        let content = serde_json::to_string(&agent_event_content(record))
-            .map_err(|e| format!("failed to serialize managed-agent content: {e}"))?;
-        let (owner_pubkey, event) = {
-            let keys = state.signing_keys()?;
-            let owner_pubkey = keys.public_key().to_hex();
-            let existing =
-                get_retained_event(&conn, KIND_MANAGED_AGENT, &owner_pubkey, &record.pubkey)?;
-            // Skip re-publishing when the projection is unchanged: a start/stop
-            // or any edit that touched only excluded runtime/local fields
-            // produces an identical projection, so it is a no-op — operational
-            // churn never re-enqueues a publish.
-            if existing.as_ref().is_some_and(|row| row.content == content) {
-                return Ok(());
-            }
-            // Monotonic created_at: bump past the retained head (NIP-AP step 3).
-            let event = build_agent_event(record)?
-                .custom_created_at(monotonic_created_at(existing.map(|row| row.created_at)))
-                .sign_with_keys(&keys)
-                .map_err(|e| format!("failed to sign managed-agent event: {e}"))?;
-            (owner_pubkey, event)
-        };
-        retain_event(
-            &conn,
-            &RetainedEvent {
-                kind: KIND_MANAGED_AGENT,
-                pubkey: owner_pubkey,
-                d_tag: record.pubkey.clone(),
-                content: event.content.to_string(),
-                created_at: event.created_at.as_secs() as i64,
-                raw_event: event.as_json(),
-                pending_sync: true,
-            },
-        )
+        let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
+        let conn = open_retention_db(&scope.db_path)?;
+        // Shared engine with the boot-time reconcile: projection content diff
+        // (no republish for runtime-only churn) + monotonic created_at bump
+        // past the retained head (NIP-AP step 3).
+        retain_agent_record(&conn, &scope.owner_keys, record).map(|_| ())
     })();
     if let Err(e) = result {
         eprintln!("buzz-desktop: agent-retain: {e}");
@@ -126,15 +88,12 @@ pub(super) fn tombstone_managed_agent_pending(
     const KIND_DELETE: u32 = 5;
 
     let result = (|| -> Result<(), String> {
-        let (owner_pubkey, event) = {
-            let keys = state.signing_keys()?;
-            let owner_pubkey = keys.public_key().to_hex();
-            let event = build_agent_delete(agent_pubkey, &owner_pubkey)?
-                .sign_with_keys(&keys)
-                .map_err(|e| format!("failed to sign managed-agent tombstone: {e}"))?;
-            (owner_pubkey, event)
-        };
-        let conn = open_retention_db(&managed_agents_base_dir(app)?.join("retention.db"))?;
+        let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
+        let owner_pubkey = scope.owner_keys.public_key().to_hex();
+        let event = build_agent_delete(agent_pubkey, &owner_pubkey)?
+            .sign_with_keys(&scope.owner_keys)
+            .map_err(|e| format!("failed to sign managed-agent tombstone: {e}"))?;
+        let conn = open_retention_db(&scope.db_path)?;
         delete_retained_event(&conn, KIND_MANAGED_AGENT, &owner_pubkey, agent_pubkey)?;
         retain_event(
             &conn,
@@ -220,13 +179,10 @@ pub(super) fn archive_managed_agent_pending(app: &AppHandle, state: &AppState, a
     use nostr::JsonUtil;
 
     let result = (|| -> Result<(), String> {
-        let (owner_pubkey, event) = {
-            let keys = state.signing_keys()?;
-            let owner_pubkey = keys.public_key().to_hex();
-            let event = build_agent_archive_request(&keys, agent_pubkey)?;
-            (owner_pubkey, event)
-        };
-        let conn = open_retention_db(&managed_agents_base_dir(app)?.join("retention.db"))?;
+        let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
+        let owner_pubkey = scope.owner_keys.public_key().to_hex();
+        let event = build_agent_archive_request(&scope.owner_keys, agent_pubkey)?;
+        let conn = open_retention_db(&scope.db_path)?;
         retain_event(
             &conn,
             &RetainedEvent {
@@ -293,16 +249,16 @@ fn resolve_created_avatar_url(
 #[cfg(feature = "mesh-llm")]
 async fn ensure_relay_mesh_for_record(
     app: &AppHandle,
-    record: &ManagedAgentRecord,
+    model_id: Option<&str>,
     allow_fresh_create_start: bool,
 ) -> Result<(), String> {
-    crate::commands::ensure_relay_mesh_for_record(app, record, allow_fresh_create_start).await
+    crate::commands::ensure_relay_mesh_for_record(app, model_id, allow_fresh_create_start).await
 }
 
 #[cfg(not(feature = "mesh-llm"))]
 async fn ensure_relay_mesh_for_record(
     _app: &AppHandle,
-    _record: &ManagedAgentRecord,
+    _model_id: Option<&str>,
     _allow_fresh_create_start: bool,
 ) -> Result<(), String> {
     Ok(())
@@ -327,7 +283,16 @@ pub(super) async fn start_local_agent_pairs_with_preflight(
     if record_snapshot.backend != BackendKind::Local {
         return Err(format!("agent {pubkey} is not a local agent"));
     }
-    ensure_relay_mesh_for_record(app, &record_snapshot, false).await?;
+    let personas_for_preflight = load_personas(app).unwrap_or_default();
+    let global_for_preflight =
+        crate::managed_agents::load_global_agent_config(app).unwrap_or_default();
+    let mesh_model_id =
+        crate::managed_agents::effective_config::resolve_effective_relay_mesh_model_id(
+            &record_snapshot,
+            &personas_for_preflight,
+            &global_for_preflight,
+        );
+    ensure_relay_mesh_for_record(app, mesh_model_id.as_deref(), false).await?;
 
     {
         let _store_guard = state
@@ -380,7 +345,13 @@ pub(super) async fn start_local_agent_pairs_with_preflight(
         .iter()
         .find(|record| record.pubkey == pubkey)
         .ok_or_else(|| format!("agent {pubkey} not found"))?;
-    build_managed_agent_summary(app, record, &runtimes, &personas)
+    build_managed_agent_summary(
+        app,
+        record,
+        &runtimes,
+        &personas,
+        &crate::managed_agents::load_global_agent_config(app).unwrap_or_default(),
+    )
 }
 
 pub(super) async fn start_local_agent_with_preflight(
@@ -407,7 +378,22 @@ pub(super) async fn start_local_agent_with_preflight(
         return Err(format!("agent {pubkey} is not a local agent"));
     }
 
-    ensure_relay_mesh_for_record(app, &record_snapshot, allow_fresh_create_start).await?;
+    // Preflight against the same resolution spawn uses — `resolve_effective_config`
+    // (definition → global fallback). A linked instance's own `provider`/`model`/
+    // `relay_mesh` bytes never contribute: this reads the CURRENT definition
+    // directly, so a definition edit that flips `provider` to/from relay-mesh
+    // between saves is reflected here without needing a prospective re-snapshot;
+    // for a global-inherited blank definition, it also folds in the global
+    // default, which record-byte sniffing could never see.
+    let personas = load_personas(app).unwrap_or_default();
+    let global = crate::managed_agents::load_global_agent_config(app).unwrap_or_default();
+    let mesh_model_id =
+        crate::managed_agents::effective_config::resolve_effective_relay_mesh_model_id(
+            &record_snapshot,
+            &personas,
+            &global,
+        );
+    ensure_relay_mesh_for_record(app, mesh_model_id.as_deref(), allow_fresh_create_start).await?;
 
     let _store_guard = state
         .managed_agents_store_lock
@@ -431,9 +417,16 @@ pub(super) async fn start_local_agent_with_preflight(
     // at the end — avoids a second disk read for the same file in the same call.
     let personas = load_personas(app).unwrap_or_default();
     if let Some(persona_id) = record.persona_id.clone() {
-        if let Some(persona) = personas.iter().find(|p| p.id == persona_id) {
-            crate::managed_agents::persona_events::apply_persona_snapshot(record, persona);
-            record.updated_at = crate::util::now_iso();
+        match personas.iter().find(|p| p.id == persona_id) {
+            Some(persona) => {
+                crate::managed_agents::persona_events::apply_persona_snapshot(record, persona);
+                record.updated_at = crate::util::now_iso();
+            }
+            None => {
+                return Err(
+                    crate::managed_agents::effective_config::ORPHANED_INSTANCE_ERROR.to_string(),
+                );
+            }
         }
     }
     start_managed_agent_process(app, record, &mut runtimes, Some(owner_hex))?;
@@ -445,7 +438,13 @@ pub(super) async fn start_local_agent_with_preflight(
         .iter()
         .find(|record| record.pubkey == pubkey)
         .ok_or_else(|| format!("agent {pubkey} not found"))?;
-    build_managed_agent_summary(app, record, &runtimes, &personas)
+    build_managed_agent_summary(
+        app,
+        record,
+        &runtimes,
+        &personas,
+        &crate::managed_agents::load_global_agent_config(app).unwrap_or_default(),
+    )
 }
 
 /// Deploy an agent to a provider backend. Resolves the binary, calls deploy via
@@ -546,9 +545,16 @@ pub async fn list_managed_agents(app: AppHandle) -> Result<Vec<ManagedAgentSumma
         }
 
         let personas = load_personas(&app).unwrap_or_default();
+        // One disk read for the whole list — build_managed_agent_summary takes
+        // the config as a parameter precisely so this poll-every-5s call does
+        // not re-read it per record.
+        let global_config =
+            crate::managed_agents::load_global_agent_config(&app).unwrap_or_default();
         records
             .iter()
-            .map(|record| build_managed_agent_summary(&app, record, &runtimes, &personas))
+            .map(|record| {
+                build_managed_agent_summary(&app, record, &runtimes, &personas, &global_config)
+            })
             .collect()
     })
     .await
@@ -891,8 +897,10 @@ pub async fn create_managed_agent(
             name_pool: Vec::new(),
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             definition_respond_to: None,
             definition_respond_to_allowlist: Vec::new(),
             definition_parallelism: None,
@@ -921,7 +929,13 @@ pub async fn create_managed_agent(
         retain_managed_agent_pending(&app, &state, record);
         let personas = load_personas(&app).unwrap_or_default();
         (
-            build_managed_agent_summary(&app, record, &runtimes, &personas)?,
+            build_managed_agent_summary(
+                &app,
+                record,
+                &runtimes,
+                &personas,
+                &crate::managed_agents::load_global_agent_config(&app).unwrap_or_default(),
+            )?,
             resolved_avatar_url,
         )
     };
@@ -951,7 +965,13 @@ pub async fn create_managed_agent(
                     .find(|record| record.pubkey == pubkey)
                     .ok_or_else(|| "created agent disappeared unexpectedly".to_string())?;
                 let personas = load_personas(&app).unwrap_or_default();
-                build_managed_agent_summary(&app, record, &runtimes, &personas)?
+                build_managed_agent_summary(
+                    &app,
+                    record,
+                    &runtimes,
+                    &personas,
+                    &crate::managed_agents::load_global_agent_config(&app).unwrap_or_default(),
+                )?
             }
         }
     } else {
@@ -1022,7 +1042,13 @@ pub async fn create_managed_agent(
             .find(|r| r.pubkey == pubkey)
             .ok_or_else(|| "agent disappeared".to_string())?;
         let personas = load_personas(&app).unwrap_or_default();
-        build_managed_agent_summary(&app, record, &runtimes, &personas)?
+        build_managed_agent_summary(
+            &app,
+            record,
+            &runtimes,
+            &personas,
+            &crate::managed_agents::load_global_agent_config(&app).unwrap_or_default(),
+        )?
     } else {
         agent
     };
@@ -1144,7 +1170,13 @@ pub async fn start_managed_agent(
                 .find(|r| r.pubkey == pubkey)
                 .ok_or_else(|| format!("agent {pubkey} not found"))?;
             let personas = load_personas(&app).unwrap_or_default();
-            build_managed_agent_summary(&app, record, &runtimes, &personas)
+            build_managed_agent_summary(
+                &app,
+                record,
+                &runtimes,
+                &personas,
+                &crate::managed_agents::load_global_agent_config(&app).unwrap_or_default(),
+            )
         }
         StartTarget::Provider { backend, .. } => Err(format!(
             "agent {pubkey} has unsupported backend kind: {backend:?}"
@@ -1226,7 +1258,13 @@ pub async fn stop_managed_agent(
             .find(|record| record.pubkey == pubkey)
             .ok_or_else(|| format!("agent {pubkey} not found"))?;
         let personas = load_personas(&app).unwrap_or_default();
-        build_managed_agent_summary(&app, record, &runtimes, &personas)
+        build_managed_agent_summary(
+            &app,
+            record,
+            &runtimes,
+            &personas,
+            &crate::managed_agents::load_global_agent_config(&app).unwrap_or_default(),
+        )
     })
     .await
     .map_err(|e| format!("spawn_blocking failed: {e}"))?
diff --git a/desktop/src-tauri/src/commands/agents_deploy.rs b/desktop/src-tauri/src/commands/agents_deploy.rs
index be132225ea..af785711d5 100644
--- a/desktop/src-tauri/src/commands/agents_deploy.rs
+++ b/desktop/src-tauri/src/commands/agents_deploy.rs
@@ -4,42 +4,36 @@
 
 use tauri::AppHandle;
 
+#[cfg(test)]
+use crate::managed_agents::AgentDefinition;
 use crate::{
     app_state::AppState,
-    managed_agents::{load_personas, AgentDefinition, ManagedAgentRecord},
+    managed_agents::{load_personas, ManagedAgentRecord},
     relay::relay_ws_url_with_override,
 };
 
 /// Resolve the deploy-specific structured model/provider for a managed agent.
 ///
-/// Deploy uses **live-persona-first** precedence so remote agents receive
-/// current config after a persona update, without requiring delete+recreate.
-/// Unlike local spawn (which re-snapshots the persona onto `record` at the
-/// start of every spawn), provider start does not re-snapshot — so the
-/// record may hold a stale snapshot while the linked persona has moved on.
+/// Delegates to the single effective-config resolver which enforces
+/// definition-authoritative semantics for linked instances:
+///   - **Linked:** definition → global. Stale record bytes are never consulted.
+///   - **Definition-less:** instance → global.
+///   - **Orphaned:** returns `(None, None)` — spawn is blocked elsewhere.
 ///
-/// Precedence: live-persona → record (snapshot fallback) → global.
-/// Symmetric for both model and provider.
+/// Both local spawn and deploy now use the same resolver, so they can never
+/// disagree on what model/provider an agent runs with.
 ///
 /// Exported `pub(crate)` for unit testing.
-pub(crate) fn resolve_deploy_model_provider<'a>(
-    record: &'a ManagedAgentRecord,
-    personas: &'a [AgentDefinition],
-    global: &'a crate::managed_agents::GlobalAgentConfig,
-) -> (Option<&'a str>, Option<&'a str>) {
-    let live_persona = record
-        .persona_id
-        .as_deref()
-        .and_then(|pid| personas.iter().find(|p| p.id == pid));
-    let model = live_persona
-        .and_then(|p| p.model.as_deref())
-        .or(record.model.as_deref())
-        .or(global.model.as_deref());
-    let provider = live_persona
-        .and_then(|p| p.provider.as_deref())
-        .or(record.provider.as_deref())
-        .or(global.provider.as_deref());
-    (model, provider)
+#[cfg(test)]
+pub(crate) fn resolve_deploy_model_provider(
+    record: &ManagedAgentRecord,
+    personas: &[AgentDefinition],
+    global: &crate::managed_agents::GlobalAgentConfig,
+) -> (Option<String>, Option<String>) {
+    crate::managed_agents::effective_config::resolve_effective_model_provider_pair(
+        record, personas, global,
+    )
+    .unwrap_or((None, None))
 }
 
 /// Build the standard agent JSON payload for provider deploy calls.
@@ -84,15 +78,16 @@ pub(super) fn build_deploy_payload(
     let merged_env =
         crate::managed_agents::merged_user_env(&global_persona_merged, &record.env_vars);
 
-    // Resolve the deploy-specific structured provider/model. Uses the deploy
-    // resolver with live-persona → record → global precedence.
     let personas = load_personas(app).unwrap_or_default();
-    let (effective_model, effective_provider) =
-        resolve_deploy_model_provider(record, &personas, &global_config);
-    let (effective_model, effective_provider) = (
-        effective_model.map(str::to_string),
-        effective_provider.map(str::to_string),
-    );
+    let cfg = crate::managed_agents::effective_config::resolve_effective_config(
+        record,
+        &personas,
+        &global_config,
+    )
+    .require_resolved()?;
+    let effective_model = cfg.model.value;
+    let effective_provider = cfg.provider.value;
+    let effective_prompt = cfg.system_prompt.value;
 
     Ok(deploy_payload_json(
         record,
@@ -102,6 +97,7 @@ pub(super) fn build_deploy_payload(
         ),
         effective_model,
         effective_provider,
+        effective_prompt,
         merged_env,
     ))
 }
@@ -114,36 +110,25 @@ pub(super) fn deploy_payload_json(
     relay_url: String,
     effective_model: Option<String>,
     effective_provider: Option<String>,
+    effective_prompt: Option<String>,
     merged_env: std::collections::BTreeMap<String, String>,
 ) -> serde_json::Value {
     serde_json::json!({
         "name": &record.name,
-        // Resolve the per-agent pin against the active workspace relay here:
-        // this payload crosses the host boundary to a remote provider harness
-        // that has no notion of the desktop's workspace, so the blank→workspace
-        // fallback (otherwise applied at read-time in `effective_agent_relay_url`)
-        // must be materialized into a concrete URL before serializing.
         "relay_url": relay_url,
         "private_key_nsec": &record.private_key_nsec,
         "auth_tag": &record.auth_tag,
         "agent_command": &record.agent_command,
         "agent_args": &record.agent_args,
-        "system_prompt": &record.system_prompt,
+        "system_prompt": effective_prompt,
         "model": effective_model,
-        // Structured provider from the persona record. Providers that don't
-        // yet read this field will fall back to env_vars or their own default
-        // — no protocol break.
         "provider": effective_provider,
         "turn_timeout_seconds": record.turn_timeout_seconds,
         "idle_timeout_seconds": record.idle_timeout_seconds,
         "max_turn_duration_seconds": record.max_turn_duration_seconds,
         "parallelism": record.parallelism,
-        // Inbound author gate. Providers that don't yet read these fall back
-        // to the harness default (`owner-only`) — no protocol break.
         "respond_to": record.respond_to,
         "respond_to_allowlist": &record.respond_to_allowlist,
-        // Merged persona + agent env vars. Providers that don't read this
-        // field will simply ignore it — no protocol break.
         "env_vars": merged_env,
     })
 }
diff --git a/desktop/src-tauri/src/commands/agents_tests.rs b/desktop/src-tauri/src/commands/agents_tests.rs
index 1b2e0ed179..03389d1d18 100644
--- a/desktop/src-tauri/src/commands/agents_tests.rs
+++ b/desktop/src-tauri/src/commands/agents_tests.rs
@@ -53,8 +53,10 @@ fn bare_agent_record(
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         relay_mesh: None,
         auto_restart_on_config_change: false,
         definition_respond_to: None,
@@ -75,8 +77,10 @@ fn persona_record(id: &str, model: Option<&str>, provider: Option<&str>) -> Agen
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: vec![],
@@ -126,57 +130,56 @@ fn build_agent_archive_request_attaches_owner_auth_and_retired_reason() {
     }));
 }
 
-/// Deploy-path regression for Fix 1 of Thufir pass-2: a persona-linked
-/// provider agent with a stale record snapshot must use the live persona
-/// model/provider in the deploy payload, not the stale record values.
-///
-/// Scenario: agent was created with persona at model="old-model"/provider="old-prov".
-/// The persona was subsequently updated to "new-model"/"new-prov" but the record
-/// was NOT re-snapshotted (provider start skips re-snapshot; local spawn does it).
-/// The deploy resolver must use the current persona values.
-///
-/// Fails against `resolve_effective_model_provider` (record-first precedence),
-/// which would return "old-model"/"old-prov" from the stale record.
+/// Deploy resolver uses definition model/provider, ignoring stale record.
 #[test]
-fn deploy_resolver_uses_live_persona_over_stale_record_snapshot() {
-    // Record holds the stale snapshot (created when persona had old values).
+fn deploy_resolver_uses_definition_over_stale_record() {
     let record = bare_agent_record(Some("p1"), Some("old-model"), Some("old-prov"));
-    // Live persona has been updated since the record was snapshotted.
     let personas = vec![persona_record("p1", Some("new-model"), Some("new-prov"))];
     let global = crate::managed_agents::GlobalAgentConfig::default();
 
     let (model, provider) = resolve_deploy_model_provider(&record, &personas, &global);
 
     assert_eq!(
-        model,
+        model.as_deref(),
         Some("new-model"),
-        "deploy must use live persona model, not stale record snapshot"
+        "deploy must use definition model, not stale record snapshot"
     );
     assert_eq!(
-        provider,
+        provider.as_deref(),
         Some("new-prov"),
-        "deploy must use live persona provider, not stale record snapshot"
+        "deploy must use definition provider, not stale record snapshot"
     );
 }
 
-/// Deploy resolver falls back to record when persona has no model/provider
-/// (persona without structured model — fallback to record snapshot).
+/// When a linked definition has blank model/provider (inherit), the deploy
+/// resolver must fall through to global — stale record bytes are inert.
 #[test]
-fn deploy_resolver_falls_back_to_record_when_persona_has_none() {
-    let record = bare_agent_record(Some("p1"), Some("record-model"), Some("record-prov"));
-    // Persona exists but has no model/provider.
+fn deploy_resolver_inherits_global_when_definition_blank() {
+    let record = bare_agent_record(Some("p1"), Some("stale-model"), Some("stale-prov"));
     let personas = vec![persona_record("p1", None, None)];
-    let global = crate::managed_agents::GlobalAgentConfig::default();
+    let global = crate::managed_agents::GlobalAgentConfig {
+        model: Some("global-model".to_string()),
+        provider: Some("global-prov".to_string()),
+        ..Default::default()
+    };
 
     let (model, provider) = resolve_deploy_model_provider(&record, &personas, &global);
 
-    assert_eq!(model, Some("record-model"));
-    assert_eq!(provider, Some("record-prov"));
+    assert_eq!(
+        model.as_deref(),
+        Some("global-model"),
+        "definition blank → global; stale record ignored"
+    );
+    assert_eq!(
+        provider.as_deref(),
+        Some("global-prov"),
+        "definition blank → global; stale record ignored"
+    );
 }
 
-/// Deploy resolver falls back to global when both persona and record have none.
+/// Deploy resolver falls back to global when both definition and record have none.
 #[test]
-fn deploy_resolver_falls_back_to_global_when_persona_and_record_have_none() {
+fn deploy_resolver_falls_back_to_global_when_definition_and_record_have_none() {
     let record = bare_agent_record(Some("p1"), None, None);
     let personas = vec![persona_record("p1", None, None)];
     let global = crate::managed_agents::GlobalAgentConfig {
@@ -187,8 +190,35 @@ fn deploy_resolver_falls_back_to_global_when_persona_and_record_have_none() {
 
     let (model, provider) = resolve_deploy_model_provider(&record, &personas, &global);
 
-    assert_eq!(model, Some("global-model"));
-    assert_eq!(provider, Some("global-prov"));
+    assert_eq!(model.as_deref(), Some("global-model"));
+    assert_eq!(provider.as_deref(), Some("global-prov"));
+}
+
+/// Orphan: linked record with missing definition → the pure model/provider
+/// pair resolver returns `(None, None)`. This is NOT the deploy refusal
+/// boundary — `build_deploy_payload` refuses an orphan outright via
+/// `.require_resolved()?` before this pair is ever computed. This test pins
+/// the resolver's own orphan behavior, which readiness/hash also depend on.
+#[test]
+fn deploy_resolver_returns_none_for_orphaned_instance() {
+    let record = bare_agent_record(Some("missing-def"), Some("stale-model"), Some("stale-prov"));
+    let personas: Vec<AgentDefinition> = vec![];
+    let global = crate::managed_agents::GlobalAgentConfig {
+        model: Some("global-model".to_string()),
+        provider: Some("global-prov".to_string()),
+        ..Default::default()
+    };
+
+    let (model, provider) = resolve_deploy_model_provider(&record, &personas, &global);
+
+    assert!(
+        model.is_none(),
+        "orphaned instance must not resolve to any model"
+    );
+    assert!(
+        provider.is_none(),
+        "orphaned instance must not resolve to any provider"
+    );
 }
 
 #[test]
@@ -404,6 +434,7 @@ fn deploy_payload_carries_the_full_behavioral_quad() {
         "wss://relay.example".to_string(),
         Some("gpt-x".to_string()),
         Some("openai".to_string()),
+        None,
         std::collections::BTreeMap::new(),
     );
 
diff --git a/desktop/src-tauri/src/commands/identity.rs b/desktop/src-tauri/src/commands/identity.rs
index 33783c05a5..2840c0ade6 100644
--- a/desktop/src-tauri/src/commands/identity.rs
+++ b/desktop/src-tauri/src/commands/identity.rs
@@ -135,23 +135,29 @@ pub async fn sign_event(
 }
 
 #[tauri::command]
-pub fn decrypt_observer_event(
+pub async fn decrypt_observer_event(
     event_json: String,
     state: State<'_, AppState>,
 ) -> Result<serde_json::Value, String> {
     let keys = state.signing_keys()?;
-    let event = Event::from_json(event_json).map_err(|error| format!("invalid event: {error}"))?;
 
-    // Defense-in-depth: verify event ID and signature before decrypting.
-    if !event.verify_id() {
-        return Err("observer event has invalid ID".into());
-    }
-    if !event.verify_signature() {
-        return Err("observer event has invalid signature".into());
-    }
+    tauri::async_runtime::spawn_blocking(move || {
+        let event =
+            Event::from_json(event_json).map_err(|error| format!("invalid event: {error}"))?;
 
-    buzz_core_pkg::observer::decrypt_observer_payload(&keys, &event)
-        .map_err(|error| format!("decrypt observer event failed: {error}"))
+        // Defense-in-depth: verify event ID and signature before decrypting.
+        if !event.verify_id() {
+            return Err("observer event has invalid ID".into());
+        }
+        if !event.verify_signature() {
+            return Err("observer event has invalid signature".into());
+        }
+
+        buzz_core_pkg::observer::decrypt_observer_payload(&keys, &event)
+            .map_err(|error| format!("decrypt observer event failed: {error}"))
+    })
+    .await
+    .map_err(|e| format!("spawn_blocking failed: {e}"))?
 }
 
 #[tauri::command]
diff --git a/desktop/src-tauri/src/commands/join_policy.rs b/desktop/src-tauri/src/commands/join_policy.rs
new file mode 100644
index 0000000000..d2a357c4f9
--- /dev/null
+++ b/desktop/src-tauri/src/commands/join_policy.rs
@@ -0,0 +1,193 @@
+use futures_util::StreamExt;
+use serde_json::Value;
+use std::time::Duration;
+use url::Url;
+
+// Each relay policy document is capped at 256 KiB before JSON encoding. Four
+// MiB covers two maximally escaped documents plus the response envelope.
+const MAX_JOIN_POLICY_RESPONSE_BYTES: usize = 4 * 1024 * 1024;
+const JOIN_POLICY_REQUEST_TIMEOUT: Duration = Duration::from_secs(15);
+
+fn join_policy_url(relay_url: &str) -> Result<Url, String> {
+    let mut url = Url::parse(relay_url.trim()).map_err(|_| "invalid relay URL".to_string())?;
+    let http_scheme = match url.scheme() {
+        "wss" => "https",
+        "ws" => "http",
+        _ => return Err("relay URL must use ws:// or wss://".to_string()),
+    };
+    url.set_scheme(http_scheme)
+        .map_err(|_| "invalid relay URL scheme".to_string())?;
+
+    if !url.username().is_empty() || url.password().is_some() {
+        return Err("relay URL must not contain credentials".to_string());
+    }
+
+    let base_path = url.path().trim_end_matches('/');
+    url.set_path(&format!("{base_path}/api/join-policy"));
+    url.set_query(None);
+    url.set_fragment(None);
+    Ok(url)
+}
+
+/// Fetch an arbitrary relay's optional join policy through native networking.
+#[tauri::command]
+pub async fn fetch_join_policy(relay_url: String) -> Result<Option<Value>, String> {
+    let url = join_policy_url(&relay_url)?;
+    let client = reqwest::Client::builder()
+        .redirect(reqwest::redirect::Policy::none())
+        .build()
+        .map_err(|error| format!("failed to build join policy client: {error}"))?;
+    let response = client
+        .get(url)
+        .timeout(JOIN_POLICY_REQUEST_TIMEOUT)
+        .send()
+        .await
+        .map_err(|error| format!("join policy request failed: {error}"))?;
+
+    if response.status() == reqwest::StatusCode::NOT_FOUND {
+        return Ok(None);
+    }
+    if !response.status().is_success() {
+        return Err(format!("HTTP {}", response.status().as_u16()));
+    }
+
+    let body = read_join_policy_json(response).await?;
+    Ok(body
+        .get("policy")
+        .filter(|policy| !policy.is_null())
+        .cloned())
+}
+
+async fn read_join_policy_json(response: reqwest::Response) -> Result<Value, String> {
+    if response
+        .content_length()
+        .is_some_and(|length| length > MAX_JOIN_POLICY_RESPONSE_BYTES as u64)
+    {
+        return Err("relay returned oversized join policy".to_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 join policy failed: {error}"))?;
+        if bytes.len().saturating_add(chunk.len()) > MAX_JOIN_POLICY_RESPONSE_BYTES {
+            return Err("relay returned oversized join policy".to_string());
+        }
+        bytes.extend_from_slice(&chunk);
+    }
+
+    serde_json::from_slice(&bytes).map_err(|_| "relay returned malformed join policy".to_string())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use axum::{
+        body::{Body, Bytes},
+        http::Response,
+        response::Redirect,
+        routing::get,
+        Json, Router,
+    };
+    use std::convert::Infallible;
+
+    async fn test_relay(router: Router) -> String {
+        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();
+        });
+        format!("ws://{address}")
+    }
+
+    #[test]
+    fn converts_relay_urls_to_join_policy_urls() {
+        assert_eq!(
+            join_policy_url("wss://relay.example.com/")
+                .unwrap()
+                .as_str(),
+            "https://relay.example.com/api/join-policy"
+        );
+        assert_eq!(
+            join_policy_url("ws://localhost:3000/base")
+                .unwrap()
+                .as_str(),
+            "http://localhost:3000/base/api/join-policy"
+        );
+    }
+
+    #[test]
+    fn rejects_non_relay_schemes_and_credentials() {
+        assert!(join_policy_url("https://relay.example.com").is_err());
+        assert!(join_policy_url("wss://user:secret@relay.example.com").is_err());
+    }
+
+    #[tokio::test]
+    async fn reads_an_optional_policy_without_webview_cors() {
+        let relay_url = test_relay(Router::new().route(
+            "/api/join-policy",
+            get(|| async {
+                Json(serde_json::json!({
+                    "policy": {
+                        "terms_markdown": "# Terms",
+                        "age_attestation_required": true,
+                        "version": "v1"
+                    }
+                }))
+            }),
+        ))
+        .await;
+
+        let policy = fetch_join_policy(relay_url).await.unwrap().unwrap();
+        assert_eq!(policy["version"], "v1");
+        assert_eq!(policy["age_attestation_required"], true);
+    }
+
+    #[tokio::test]
+    async fn refuses_join_policy_redirects() {
+        let relay_url = test_relay(Router::new().route(
+            "/api/join-policy",
+            get(|| async { Redirect::temporary("http://127.0.0.1:1/private") }),
+        ))
+        .await;
+
+        assert_eq!(fetch_join_policy(relay_url).await.unwrap_err(), "HTTP 307");
+    }
+
+    #[tokio::test]
+    async fn rejects_declared_oversized_join_policy() {
+        let relay_url = test_relay(Router::new().route(
+            "/api/join-policy",
+            get(|| async {
+                Response::builder()
+                    .body(Body::from(vec![b'x'; MAX_JOIN_POLICY_RESPONSE_BYTES + 1]))
+                    .unwrap()
+            }),
+        ))
+        .await;
+
+        assert_eq!(
+            fetch_join_policy(relay_url).await.unwrap_err(),
+            "relay returned oversized join policy"
+        );
+    }
+
+    #[tokio::test]
+    async fn rejects_chunked_oversized_join_policy() {
+        let relay_url = test_relay(Router::new().route(
+            "/api/join-policy",
+            get(|| async {
+                let chunk = Bytes::from(vec![b'x'; MAX_JOIN_POLICY_RESPONSE_BYTES + 1]);
+                Body::from_stream(futures_util::stream::once(async move {
+                    Ok::<_, Infallible>(chunk)
+                }))
+            }),
+        ))
+        .await;
+
+        assert_eq!(
+            fetch_join_policy(relay_url).await.unwrap_err(),
+            "relay returned oversized join policy"
+        );
+    }
+}
diff --git a/desktop/src-tauri/src/commands/media.rs b/desktop/src-tauri/src/commands/media.rs
index bf8692ff70..ed3b340238 100644
--- a/desktop/src-tauri/src/commands/media.rs
+++ b/desktop/src-tauri/src/commands/media.rs
@@ -411,7 +411,7 @@ fn should_retry_legacy_upload(status: reqwest::StatusCode) -> bool {
 }
 
 async fn send_upload_attempt(
-    state: &State<'_, AppState>,
+    state: &AppState,
     url: String,
     auth_header: &str,
     mime: &str,
@@ -455,10 +455,22 @@ async fn send_upload_attempt(
     response.map_err(|error| classify_request_error(&error))
 }
 
+pub(crate) async fn upload_image_bytes(
+    body: Vec<u8>,
+    state: &AppState,
+) -> Result<BlobDescriptor, String> {
+    let mime = detect_and_validate_mime(&body)?;
+    if !mime.starts_with("image/") {
+        return Err("profile avatar must be an image".to_string());
+    }
+    let body = sanitize_image_for_upload(body, &mime)?;
+    do_upload(body, &mime, state, None).await
+}
+
 async fn do_upload(
     body: Vec<u8>,
     mime: &str,
-    state: &State<'_, AppState>,
+    state: &AppState,
     progress: Option<(tauri::AppHandle, String)>,
 ) -> Result<BlobDescriptor, String> {
     let sha256 = hex::encode(Sha256::digest(&body));
@@ -559,7 +571,7 @@ pub async fn upload_media(
 /// files from ever leaving the client on image-only surfaces.
 async fn process_picked_path(
     path: std::path::PathBuf,
-    state: &State<'_, AppState>,
+    state: &AppState,
     images_only: bool,
 ) -> Result<BlobDescriptor, String> {
     // Pin the inode by opening the fd BEFORE spawn_blocking. This prevents a
diff --git a/desktop/src-tauri/src/commands/media_download.rs b/desktop/src-tauri/src/commands/media_download.rs
index 016865878e..d3b1a9499d 100644
--- a/desktop/src-tauri/src/commands/media_download.rs
+++ b/desktop/src-tauri/src/commands/media_download.rs
@@ -610,6 +610,7 @@ mod tests {
             version: FORMAT_VERSION,
             definition: AgentSnapshotDefinition {
                 name: "test".to_string(),
+                source_is_builtin: false,
                 system_prompt: None,
                 runtime: None,
                 model: None,
@@ -659,6 +660,7 @@ mod tests {
             version: FORMAT_VERSION,
             definition: AgentSnapshotDefinition {
                 name: "test".to_string(),
+                source_is_builtin: false,
                 system_prompt: None,
                 runtime: None,
                 model: None,
@@ -704,6 +706,7 @@ mod tests {
             version: FORMAT_VERSION,
             definition: AgentSnapshotDefinition {
                 name: "test".to_string(),
+                source_is_builtin: false,
                 system_prompt: None,
                 runtime: None,
                 model: None,
diff --git a/desktop/src-tauri/src/commands/media_snapshot_png.rs b/desktop/src-tauri/src/commands/media_snapshot_png.rs
index f2593ff9e0..734d8f5dc8 100644
--- a/desktop/src-tauri/src/commands/media_snapshot_png.rs
+++ b/desktop/src-tauri/src/commands/media_snapshot_png.rs
@@ -158,6 +158,7 @@ mod tests {
             version: 1,
             definition: AgentSnapshotDefinition {
                 name: "Tree Trunks".to_string(),
+                source_is_builtin: false,
                 system_prompt: Some("You are a helpful agent.".to_string()),
                 runtime: Some("goose".to_string()),
                 model: None,
diff --git a/desktop/src-tauri/src/commands/mesh_llm.rs b/desktop/src-tauri/src/commands/mesh_llm.rs
index 9a0a3c32eb..305c54a203 100644
--- a/desktop/src-tauri/src/commands/mesh_llm.rs
+++ b/desktop/src-tauri/src/commands/mesh_llm.rs
@@ -1,5 +1,6 @@
 use std::path::PathBuf;
 
+use sha2::{Digest, Sha256};
 use tauri::{AppHandle, Manager, State};
 
 use crate::{app_state::AppState, mesh_llm, relay};
@@ -57,8 +58,85 @@ fn share_stop_should_teardown(mode: mesh_llm::MeshNodeMode) -> bool {
     matches!(mode, mesh_llm::MeshNodeMode::Serve)
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum MeshStartPlan {
+    Start,
+    RestartToReplaceClient,
+    RejectOccupied,
+}
+
+fn mesh_start_plan(
+    requested_mode: mesh_llm::MeshNodeMode,
+    existing_mode: Option<mesh_llm::MeshNodeMode>,
+) -> MeshStartPlan {
+    match (requested_mode, existing_mode) {
+        (_, None) => MeshStartPlan::Start,
+        (mesh_llm::MeshNodeMode::Serve, Some(mesh_llm::MeshNodeMode::Client)) => {
+            MeshStartPlan::RestartToReplaceClient
+        }
+        _ => MeshStartPlan::RejectOccupied,
+    }
+}
+
+fn sharing_config_from_request(
+    request: &mesh_llm::StartMeshNodeRequest,
+) -> CmdResult<MeshSharingConfig> {
+    let model_id = request
+        .model_id
+        .as_deref()
+        .map(str::trim)
+        .filter(|model_id| !model_id.is_empty())
+        .ok_or_else(|| "modelId is required for serve mode".to_string())?;
+    Ok(MeshSharingConfig {
+        enabled: true,
+        model_id: model_id.to_string(),
+        max_vram_gb: request.max_vram_gb,
+    })
+}
+
+fn restarting_share_status(config: &MeshSharingConfig) -> mesh_llm::MeshNodeStatus {
+    mesh_llm::MeshNodeStatus {
+        state: mesh_llm::MeshNodeState::Starting,
+        mode: Some(mesh_llm::MeshNodeMode::Serve),
+        health: mesh_llm::MeshHealth {
+            status: mesh_llm::MeshHealthStatus::Degraded,
+            reason: Some("Buzz is restarting to switch this machine to sharing".to_string()),
+        },
+        api_base_url: None,
+        console_url: None,
+        model_id: Some(config.model_id.clone()),
+        model_name: Some(config.model_id.clone()),
+        invite_token: None,
+        endpoint_id: None,
+        device_id: None,
+        device_name: None,
+    }
+}
+
+fn restart_to_share(
+    app: &AppHandle,
+    config: &MeshSharingConfig,
+) -> CmdResult<mesh_llm::MeshNodeStatus> {
+    save_mesh_sharing_config(app, config)?;
+    let status = restarting_share_status(config);
+    app.request_restart();
+    Ok(status)
+}
+
 pub type CmdResult<T> = Result<T, String>;
 
+fn buzz_mesh_name_for_relay(relay_url: &str) -> String {
+    let normalized = url::Url::parse(relay_url.trim())
+        .map(|url| url.origin().ascii_serialization())
+        .unwrap_or_else(|_| relay_url.trim().trim_end_matches('/').to_ascii_lowercase());
+    let digest = hex::encode(Sha256::digest(normalized.as_bytes()));
+    format!("buzz-community-{}", &digest[..32])
+}
+
+fn buzz_mesh_name(state: &AppState) -> String {
+    buzz_mesh_name_for_relay(&relay::relay_ws_url_with_override(state))
+}
+
 fn advance_mesh_status_cursor(
     filter: &mut serde_json::Value,
     page: &[nostr::Event],
@@ -137,6 +215,81 @@ pub(crate) async fn resolve_trusted_owner_ids_or_self_only(state: &AppState) ->
     }
 }
 
+/// Choose validated live endpoints from other runtimes in this Buzz community.
+/// The stable relay-derived mesh name gives every runtime the same MeshLLM mesh
+/// identity; these endpoints supply transport bootstrap only.
+fn buzz_mesh_join_targets(
+    mut targets: Vec<mesh_llm::MeshServeTarget>,
+    self_owner_id: &str,
+) -> Vec<mesh_llm::MeshServeTarget> {
+    targets.retain(|target| {
+        target.reporter_pubkey.is_some()
+            && target
+                .owner_id
+                .as_deref()
+                .is_some_and(|owner| !owner.eq_ignore_ascii_case(self_owner_id.trim()))
+    });
+    targets.sort_by(|left, right| {
+        left.reporter_pubkey
+            .cmp(&right.reporter_pubkey)
+            .then_with(|| left.owner_id.cmp(&right.owner_id))
+            .then_with(|| left.endpoint_id.cmp(&right.endpoint_id))
+            .then_with(|| left.endpoint_addr.cmp(&right.endpoint_addr))
+            .then_with(|| left.model_id.cmp(&right.model_id))
+    });
+    targets.dedup_by(|left, right| left.endpoint_addr == right.endpoint_addr);
+    targets
+}
+
+/// Resolve the validated member endpoint this runtime should join to enter the
+/// existing Buzz community mesh. `Ok(None)` means this machine is the first
+/// live serving member (or is itself the shared bootstrap contact).
+pub(crate) async fn resolve_buzz_mesh_join_targets(
+    state: &AppState,
+) -> Result<Vec<mesh_llm::MeshServeTarget>, String> {
+    let events = query_mesh_discovery_events(state).await?;
+    let self_owner_id = mesh_llm::ensure_owner_identity()
+        .map_err(|error| format!("failed to load mesh owner identity: {error}"))?
+        .owner_id;
+    Ok(buzz_mesh_join_targets(
+        mesh_llm::availability_from_events(events).serve_targets,
+        &self_owner_id,
+    ))
+}
+
+/// Resolve the initial admission roster and bootstrap endpoint from one relay
+/// snapshot. A node start used to repeat the full membership + status query
+/// for each value, making Share Compute startup both slower and more exposed
+/// to inconsistent snapshots.
+async fn resolve_buzz_mesh_startup(state: &AppState) -> (Vec<String>, Option<String>) {
+    match query_mesh_discovery_events(state).await {
+        Ok(events) => {
+            let trusted_owner_ids = mesh_llm::owner_ids_from_events(&events);
+            let join_token = mesh_llm::ensure_owner_identity()
+                .ok()
+                .and_then(|identity| {
+                    buzz_mesh_join_targets(
+                        mesh_llm::availability_from_events(events).serve_targets,
+                        &identity.owner_id,
+                    )
+                    .into_iter()
+                    .next()
+                })
+                .map(|target| target.endpoint_addr);
+            (trusted_owner_ids, join_token)
+        }
+        Err(error) => {
+            // Initial startup fails closed to this runtime's own owner. Share
+            // Compute must still start for the first member and through a
+            // transient relay outage; the coordinator retries convergence.
+            eprintln!(
+                "buzz-mesh: startup discovery failed; allowing only this node and starting isolated for now: {error}"
+            );
+            (Vec::new(), None)
+        }
+    }
+}
+
 pub(crate) async fn restore_mesh_sharing(app: &AppHandle, state: &AppState) -> CmdResult<()> {
     let Some(config) = load_mesh_sharing_config(app)? else {
         return Ok(());
@@ -144,6 +297,10 @@ pub(crate) async fn restore_mesh_sharing(app: &AppHandle, state: &AppState) -> C
     if !config.enabled || config.model_id.trim().is_empty() {
         return Ok(());
     }
+    if state.mesh_llm_runtime.lock().await.is_some() {
+        return Ok(());
+    }
+    let (trusted_owner_ids, join_token) = resolve_buzz_mesh_startup(state).await;
     let mut runtime = state.mesh_llm_runtime.lock().await;
     if runtime.is_some() {
         return Ok(());
@@ -152,12 +309,13 @@ pub(crate) async fn restore_mesh_sharing(app: &AppHandle, state: &AppState) -> C
         mode: mesh_llm::MeshNodeMode::Serve,
         model_id: Some(config.model_id),
         max_vram_gb: config.max_vram_gb,
-        join_token: None,
-        trusted_owner_ids: Some(resolve_trusted_owner_ids_or_self_only(state).await),
+        join_token,
+        mesh_name: Some(buzz_mesh_name(state)),
+        trusted_owner_ids: Some(trusted_owner_ids),
     };
     let started = mesh_llm::DesktopMeshRuntime::start(request)
         .await
-        .map_err(|error| format!("failed to restore Share Compute: {error}"))?;
+        .map_err(|error| format!("failed to restore Share Compute: {error:#}"))?;
     *runtime = Some(started);
     drop(runtime);
     mesh_llm::publish_current_status_once(app, "restore").await;
@@ -170,37 +328,91 @@ pub async fn mesh_start_node(
     state: State<'_, AppState>,
     mut request: mesh_llm::StartMeshNodeRequest,
 ) -> CmdResult<mesh_llm::MeshNodeStatus> {
-    // Frontend requests never carry a roster; resolve it here so every
-    // UI-started node enforces the member allowlist.
-    if request.trusted_owner_ids.is_none() {
-        request.trusted_owner_ids = Some(resolve_trusted_owner_ids_or_self_only(&state).await);
+    let sharing_config = if request.mode == mesh_llm::MeshNodeMode::Serve {
+        Some(sharing_config_from_request(&request)?)
+    } else {
+        None
+    };
+
+    // Never replace a client runtime in-process. Even a Ready SDK handle can
+    // finish `stop()` while its native listeners are still releasing :9337
+    // and :3131; a pending client has no shutdown handle at all. Persist the
+    // requested serving configuration and switch roles across a controlled
+    // process restart, the only boundary that proves both ports are clean.
+    {
+        let runtime = state.mesh_llm_runtime.lock().await;
+        if let Some(existing) = runtime.as_ref() {
+            let plan = mesh_start_plan(request.mode, Some(existing.mode()));
+            match plan {
+                MeshStartPlan::RestartToReplaceClient => {
+                    let config = sharing_config
+                        .as_ref()
+                        .ok_or_else(|| "serving configuration is unavailable".to_string())?;
+                    drop(runtime);
+                    return restart_to_share(&app, config);
+                }
+                MeshStartPlan::RejectOccupied => {
+                    return Err("mesh node is already running".to_string());
+                }
+                MeshStartPlan::Start => {}
+            }
+        }
     }
+
+    // Frontend requests never carry a roster. Resolve it and the bootstrap
+    // endpoint from one snapshot so UI startup does not repeat relay probes.
+    if request.trusted_owner_ids.is_none() || request.join_token.is_none() {
+        let (trusted_owner_ids, join_token) = resolve_buzz_mesh_startup(&state).await;
+        request.trusted_owner_ids.get_or_insert(trusted_owner_ids);
+        if request.join_token.is_none() {
+            request.join_token = join_token;
+        }
+    }
+    request.mesh_name = Some(buzz_mesh_name(&state));
     let mut runtime = state.mesh_llm_runtime.lock().await;
-    if runtime.is_some() {
+
+    let plan = match runtime.as_ref() {
+        Some(existing) => mesh_start_plan(request.mode, Some(existing.mode())),
+        None => mesh_start_plan(request.mode, None),
+    };
+    if plan == MeshStartPlan::RestartToReplaceClient {
+        let config = sharing_config
+            .as_ref()
+            .ok_or_else(|| "serving configuration is unavailable".to_string())?;
+        drop(runtime);
+        return restart_to_share(&app, config);
+    }
+    if plan == MeshStartPlan::RejectOccupied {
         return Err("mesh node is already running".to_string());
     }
 
-    let saved_request = request.clone();
     let started = mesh_llm::DesktopMeshRuntime::start(request)
         .await
-        .map_err(|error| error.to_string())?;
-    let status = started
-        .status()
-        .await
-        .map_err(|error| format!("mesh node started but status probe failed: {error}"))?;
+        .map_err(|error| format!("{error:#}"))?;
+    let status = match started.status().await {
+        Ok(status) => status,
+        Err(error) => {
+            let cleanup = started.stop().await;
+            if let Err(cleanup_error) = &cleanup {
+                eprintln!(
+                    "buzz-mesh: started node status failed and cleanup was incomplete: {cleanup_error:#}"
+                );
+            }
+            // The handle was never installed into AppState, so shutdown cannot
+            // see it again. Restart even when stop reported success: the
+            // process boundary guarantees native :9337/:3131 listeners cannot
+            // linger behind an untracked runtime.
+            drop(runtime);
+            app.request_restart();
+            return Err(format!(
+                "mesh node started but status probe failed: {error:#}; Buzz is restarting to guarantee cleanup"
+            ));
+        }
+    };
     *runtime = Some(started);
     drop(runtime);
-    if saved_request.mode == mesh_llm::MeshNodeMode::Serve {
-        if let Some(model_id) = saved_request.model_id.as_deref() {
-            save_mesh_sharing_config(
-                &app,
-                &MeshSharingConfig {
-                    enabled: true,
-                    model_id: model_id.to_string(),
-                    max_vram_gb: saved_request.max_vram_gb,
-                },
-            )?;
-        }
+    if let Some(config) = sharing_config.as_ref() {
+        save_mesh_sharing_config(&app, config)?;
     }
     mesh_llm::publish_current_status_once(&app, "start").await;
     Ok(status)
@@ -398,20 +610,29 @@ pub(crate) async fn ensure_client_node_for_model(
         mode: mesh_llm::MeshNodeMode::Client,
         model_id: None,
         max_vram_gb: None,
-        join_token: Some(join_token),
+        join_token: Some(join_token.clone()),
+        mesh_name: Some(buzz_mesh_name(state)),
         trusted_owner_ids: Some(resolve_trusted_owner_ids_or_self_only(state).await),
     };
     let mut runtime = state.mesh_llm_runtime.lock().await;
-    if runtime.is_some() {
-        return Err("mesh node changed while starting Buzz shared compute client".to_string());
+    if let Some(existing) = runtime.as_ref() {
+        // Another GUI agent may have won the startup race while this caller
+        // was resolving membership. The runtime is machine-scoped, not
+        // agent-scoped: join its selected endpoint into the existing node and
+        // let every caller reuse the same local ingress.
+        existing
+            .dial_endpoint_addr(join_token)
+            .await
+            .map_err(|error| format!("mesh dial failed: {error}"))?;
+        return existing.status().await.map_err(|error| error.to_string());
     }
     let started = mesh_llm::DesktopMeshRuntime::start(start)
         .await
-        .map_err(|error| format!("mesh client failed to start: {error}"))?;
+        .map_err(|error| format!("mesh client failed to start: {error:#}"))?;
     let status = started
         .status()
         .await
-        .map_err(|error| format!("mesh client started but status probe failed: {error}"))?;
+        .map_err(|error| format!("mesh client started but status probe failed: {error:#}"))?;
     *runtime = Some(started);
     Ok(status)
 }
@@ -481,20 +702,58 @@ fn pick_serve_target_for_model(
 /// Non relay-mesh records are a no-op.
 pub(crate) async fn ensure_relay_mesh_for_record(
     app: &AppHandle,
-    record: &crate::managed_agents::ManagedAgentRecord,
+    model_id: Option<&str>,
     _allow_fresh_create_start: bool,
 ) -> Result<(), String> {
     let state = app.state::<AppState>();
-    let Some(model_id) = crate::managed_agents::relay_mesh_model_id(record) else {
+    let Some(model_id) = model_id else {
         return Ok(());
     };
     // A local serve/client runtime already owns the OpenAI ingress and its
     // router can resolve both `auto` and explicit remote models. Do not require
-    // a separate relay-advertised target in that case.
+    // a separate relay-advertised target in that case — BUT only trust it when
+    // the ingress is actually alive. A runtime that exited/wedged after launch
+    // leaves `mesh_llm_runtime = Some` pointing at a dead `:9337` ingress, so a
+    // blind `wait_for_mesh_inference` would just time out and the agent would
+    // stay silent (#2062). Probe first; if the ingress is dead, drop the stale
+    // runtime and fall through to re-arm it. The mesh coordinator watchdog also
+    // calls this path after eviction so recovery is not start-only (Brad #2304).
     if state.mesh_llm_runtime.lock().await.is_some() {
-        return wait_for_mesh_inference(&model_id).await;
+        match mesh_llm::recover_stale_mesh_runtime(
+            &state,
+            mesh_llm::MeshRecoveryUrgency::Foreground,
+        )
+        .await
+        {
+            mesh_llm::MeshRuntimeRecovery::Live => {
+                return wait_for_mesh_inference(model_id).await;
+            }
+            mesh_llm::MeshRuntimeRecovery::Evicted | mesh_llm::MeshRuntimeRecovery::Absent => {}
+            mesh_llm::MeshRuntimeRecovery::Debouncing => {
+                return Err(
+                    "Buzz shared compute ingress is temporarily unresponsive; recovery is already scheduled. Try again shortly."
+                        .to_string(),
+                );
+            }
+            mesh_llm::MeshRuntimeRecovery::ReleasePending => {
+                return Err(
+                    "Buzz shared compute is still shutting down its previous local ingress. Try again shortly."
+                        .to_string(),
+                );
+            }
+            mesh_llm::MeshRuntimeRecovery::Replaced => {
+                return wait_for_mesh_inference(model_id).await;
+            }
+            mesh_llm::MeshRuntimeRecovery::RestartRequired => {
+                app.request_restart();
+                return Err(
+                    "Buzz shared compute startup lost its local ingress before shutdown control became available. Buzz is restarting to recover it."
+                        .to_string(),
+                );
+            }
+        }
     }
-    let target = match resolve_mesh_bootstrap_target(&state, &model_id).await {
+    let target = match resolve_mesh_bootstrap_target(&state, model_id).await {
         Ok(Some(target)) => target,
         Ok(None) => {
             return Err(
@@ -509,8 +768,17 @@ pub(crate) async fn ensure_relay_mesh_for_record(
         }
     };
 
-    ensure_client_node_for_model(&state, &model_id, Some(target.endpoint_addr)).await?;
-    wait_for_mesh_inference(&model_id).await
+    // Serve→Client re-arm transition (micspiral review #3, intentional-by-design):
+    // if the dead ingress belonged to a *serve* node with running consumer
+    // agents, this re-arms it as a Client (`MeshNodeMode::Client`). That is the
+    // correct/safe recovery here — config-backed serve restoration is
+    // `restore_mesh_sharing`'s job (`MeshNodeMode::Serve`), and
+    // `ensure_client_node_for_model` reuses any live runtime of *either* mode
+    // (the router resolves per-request), so it only cold-starts a Client when
+    // there is genuinely no runtime. Falling back to Client if a serve node
+    // crashed under local pressure is a desirable fail-safe, not a regression.
+    ensure_client_node_for_model(&state, model_id, Some(target.endpoint_addr)).await?;
+    wait_for_mesh_inference(model_id).await
 }
 
 #[tauri::command]
@@ -597,266 +865,5 @@ pub async fn mesh_model_catalog() -> CmdResult<mesh_llm::MeshModelCatalog> {
 }
 
 #[cfg(all(test, feature = "mesh-llm"))]
-mod tests {
-    use super::*;
-    use crate::app_state::build_app_state;
-
-    fn target(model_id: &str, endpoint_addr: &str) -> mesh_llm::MeshServeTarget {
-        mesh_llm::MeshServeTarget {
-            model_id: model_id.to_string(),
-            model_name: None,
-            endpoint_addr: endpoint_addr.to_string(),
-            node_name: None,
-            capacity: None,
-            endpoint_id: None,
-            device_id: None,
-            device_name: None,
-        }
-    }
-
-    #[test]
-    fn readiness_failure_is_catalog_sync_when_model_never_visible() {
-        assert_eq!(
-            classify_mesh_readiness_failure(false),
-            MeshReadinessFailure::CatalogNeverSynced
-        );
-    }
-
-    #[test]
-    fn readiness_failure_is_routing_when_model_was_visible() {
-        assert_eq!(
-            classify_mesh_readiness_failure(true),
-            MeshReadinessFailure::RoutingNeverCompleted
-        );
-    }
-
-    #[test]
-    fn readiness_messages_are_distinct_and_actionable() {
-        let catalog = mesh_readiness_failure_message(
-            MeshReadinessFailure::CatalogNeverSynced,
-            "auto",
-            "HTTP 429",
-        );
-        let routing = mesh_readiness_failure_message(
-            MeshReadinessFailure::RoutingNeverCompleted,
-            "auto",
-            "HTTP 503",
-        );
-        // Distinct diagnoses, each names the model and carries the raw detail.
-        assert_ne!(catalog, routing);
-        assert!(catalog.contains("network path"));
-        assert!(catalog.contains("HTTP 429"));
-        assert!(routing.contains("did not complete"));
-        assert!(routing.contains("HTTP 503"));
-    }
-
-    #[test]
-    fn mesh_status_cursor_uses_relay_composite_tiebreak() {
-        let event = nostr::EventBuilder::new(nostr::Kind::TextNote, "status")
-            .custom_created_at(nostr::Timestamp::from(1_234))
-            .sign_with_keys(&nostr::Keys::generate())
-            .expect("sign test status");
-        let mut filter = mesh_llm::mesh_status_filter();
-
-        let cursor = advance_mesh_status_cursor(&mut filter, std::slice::from_ref(&event))
-            .expect("advance status cursor");
-
-        assert_eq!(cursor, (1_234, event.id.to_hex()));
-        assert_eq!(filter["until"], serde_json::json!(1_234));
-        assert_eq!(filter["before_id"], serde_json::json!(event.id.to_hex()));
-        assert_eq!(
-            filter["limit"],
-            serde_json::json!(mesh_llm::MESH_STATUS_PAGE_SIZE)
-        );
-    }
-
-    #[test]
-    fn pick_serve_target_returns_first_match_for_model() {
-        let targets = vec![
-            target("model-a", "addr-a"),
-            target("model-b", "addr-b1"),
-            target("model-b", "addr-b2"),
-        ];
-        // Matches by model id and returns the first such target.
-        assert_eq!(
-            pick_serve_target_for_model(targets, "model-b").map(|t| t.endpoint_addr),
-            Some("addr-b1".to_string())
-        );
-    }
-
-    #[test]
-    fn pick_serve_target_normalizes_main_revision() {
-        let targets = vec![target("org/model@main:q4", "addr")];
-        assert_eq!(
-            pick_serve_target_for_model(targets, "org/model:q4").map(|target| target.endpoint_addr),
-            Some("addr".to_string())
-        );
-    }
-
-    #[test]
-    fn pick_serve_target_auto_takes_any_live_target() {
-        let targets = vec![target("model-a", "addr-a"), target("model-b", "addr-b")];
-        // "auto" delegates model choice to the mesh router; any live target
-        // is a valid bootstrap peer (first one wins).
-        assert_eq!(
-            pick_serve_target_for_model(targets, crate::mesh_llm::AUTO_MODEL_ID)
-                .map(|t| t.endpoint_addr),
-            Some("addr-a".to_string())
-        );
-        // But auto with zero live targets still falls closed.
-        assert_eq!(
-            pick_serve_target_for_model(Vec::new(), crate::mesh_llm::AUTO_MODEL_ID),
-            None
-        );
-    }
-
-    #[test]
-    fn pick_serve_target_none_when_model_not_hosted() {
-        let targets = vec![target("model-a", "addr-a")];
-        // No live target serves this model -> caller falls closed.
-        assert_eq!(pick_serve_target_for_model(targets, "model-missing"), None);
-    }
-
-    #[test]
-    fn share_stop_tears_down_serve_but_not_client() {
-        // Stopping "Share compute" tears down a serve node (we were sharing)
-        // but must leave a client node alone (we are consuming a peer). This is
-        // the backend half of the toggle-on regression: a client node occupies
-        // the single slot and reports state:"running", and the stop path must
-        // not kill it.
-        assert!(
-            share_stop_should_teardown(mesh_llm::MeshNodeMode::Serve),
-            "serve node is our sharing runtime; stop must tear it down"
-        );
-        assert!(
-            !share_stop_should_teardown(mesh_llm::MeshNodeMode::Client),
-            "client node is a consume session; stop must NOT tear it down"
-        );
-    }
-
-    #[test]
-    fn client_status_serializes_with_running_state_and_client_mode() {
-        // Contract pin for the TS mock (e2eBridge.ts) and the frontend
-        // predicate: a consuming node serializes as
-        // {"state":"running","mode":"client"}. If serde renaming drifts, the
-        // hand-written mock shape and `deriveMeshShareToggle` would silently
-        // stop matching the real IPC payload.
-        let status = mesh_llm::MeshNodeStatus {
-            state: mesh_llm::MeshNodeState::Running,
-            mode: Some(mesh_llm::MeshNodeMode::Client),
-            // `MeshHealth::ok()` is module-private; build via the public fields.
-            health: mesh_llm::MeshHealth {
-                status: mesh_llm::MeshHealthStatus::Ok,
-                reason: None,
-            },
-            api_base_url: Some("http://127.0.0.1:9337/v1".to_string()),
-            console_url: None,
-            model_id: None,
-            model_name: None,
-            invite_token: None,
-            endpoint_id: None,
-            device_id: None,
-            device_name: None,
-        };
-        let value = serde_json::to_value(&status).expect("serialize mesh status");
-        assert_eq!(value["state"], serde_json::json!("running"));
-        assert_eq!(value["mode"], serde_json::json!("client"));
-    }
-
-    #[tokio::test]
-    async fn cold_client_preflight_requires_explicit_target() {
-        let state = build_app_state();
-        let error = ensure_client_node_for_model(&state, "demo/model", None)
-            .await
-            .expect_err("cold relay-mesh preflight must not auto-pick a target");
-        assert_eq!(error, RELAY_MESH_RUNTIME_NO_TARGET);
-    }
-
-    /// Acceptance-critical regression for dropping the serve-vs-client guard.
-    ///
-    /// Before this change, `ensure_client_node_for_model` hard-errored whenever
-    /// the running runtime was in `Serve` mode ("stop sharing before using
-    /// Buzz shared compute as a client"). That forbade exactly what a user should be
-    /// able to do: host model A while pointing an agent at a different model B
-    /// through the same `9337` ingress.
-    ///
-    /// This test starts a real serve runtime and asserts that a follow-up
-    /// preflight for a *different* model and no explicit target still reuses the
-    /// existing runtime. Cold starts without a target are rejected before mesh-llm
-    /// startup; running runtimes are already joined to whatever target the
-    /// frontend selected earlier.
-    ///
-    /// Hardware-gated (`#[ignore]`): loads a real model. Run with:
-    ///   cargo test -p buzz-desktop --features mesh-llm \
-    ///     ensure_serve_runtime_serves_other_model -- --ignored --nocapture
-    #[test]
-    #[ignore = "loads a real model; run manually with --ignored"]
-    fn ensure_serve_runtime_serves_other_model() {
-        std::thread::Builder::new()
-            .name("mesh-hardware-acceptance".to_string())
-            .stack_size(mesh_llm::MESH_WORKER_STACK_SIZE)
-            .spawn(|| {
-                let runtime = tokio::runtime::Builder::new_multi_thread()
-                    .worker_threads(2)
-                    .thread_stack_size(mesh_llm::MESH_WORKER_STACK_SIZE)
-                    .enable_all()
-                    .build()
-                    .expect("build mesh acceptance runtime");
-                runtime.block_on(async {
-                    const HOSTED_MODEL: &str = "jc-builds/SmolLM2-135M-Instruct-Q4_K_M-GGUF:Q4_K_M";
-                    const OTHER_MODEL: &str = "some/other-model-not-hosted-locally:Q4_K_M";
-
-                    let state = build_app_state();
-
-                    // Start a serve runtime hosting HOSTED_MODEL — this is the "Share
-                    // compute" path.
-                    let serve =
-                        mesh_llm::DesktopMeshRuntime::start(mesh_llm::StartMeshNodeRequest {
-                            mode: mesh_llm::MeshNodeMode::Serve,
-                            model_id: Some(HOSTED_MODEL.to_string()),
-                            max_vram_gb: None,
-                            join_token: None,
-                            trusted_owner_ids: None,
-                        })
-                        .await
-                        .expect("serve runtime should start");
-
-                    let serve_status = serve.status().await.expect("serve status");
-                    let serve_base = serve_status.api_base_url.clone();
-                    assert_eq!(serve_status.mode, Some(mesh_llm::MeshNodeMode::Serve));
-
-                    {
-                        let mut runtime = state.mesh_llm_runtime.lock().await;
-                        *runtime = Some(serve);
-                    }
-
-                    // Preflight for a DIFFERENT model with no explicit target. Old code:
-                    // Err(...sharing compute...). New code: reuse the running ingress.
-                    let status = ensure_client_node_for_model(&state, OTHER_MODEL, None)
-                        .await
-                        .expect("serve runtime must not reject a different-model preflight");
-
-                    // It returns the SAME running node — agents keep using A's 9337, and
-                    // the router decides routability for OTHER_MODEL per request.
-                    assert_eq!(
-                        status.mode,
-                        Some(mesh_llm::MeshNodeMode::Serve),
-                        "preflight should reuse the existing serve runtime, not spin up a client"
-                    );
-                    assert_eq!(
-                        status.api_base_url, serve_base,
-                        "agent must be pointed at the existing serve node's ingress"
-                    );
-
-                    // Clean up the runtime.
-                    let taken = state.mesh_llm_runtime.lock().await.take();
-                    if let Some(runtime) = taken {
-                        let _ = runtime.stop().await;
-                    }
-                });
-            })
-            .expect("spawn mesh acceptance thread")
-            .join()
-            .expect("mesh acceptance thread panicked");
-    }
-}
+#[path = "mesh_llm_tests.rs"]
+mod tests;
diff --git a/desktop/src-tauri/src/commands/mesh_llm_tests.rs b/desktop/src-tauri/src/commands/mesh_llm_tests.rs
new file mode 100644
index 0000000000..ccc5287d62
--- /dev/null
+++ b/desktop/src-tauri/src/commands/mesh_llm_tests.rs
@@ -0,0 +1,499 @@
+use super::*;
+use crate::app_state::build_app_state;
+
+fn target(model_id: &str, endpoint_addr: &str) -> mesh_llm::MeshServeTarget {
+    mesh_llm::MeshServeTarget {
+        model_id: model_id.to_string(),
+        model_name: None,
+        endpoint_addr: endpoint_addr.to_string(),
+        reporter_pubkey: None,
+        owner_id: None,
+        node_name: None,
+        capacity: None,
+        endpoint_id: None,
+        device_id: None,
+        device_name: None,
+    }
+}
+
+fn reported_target(
+    reporter_pubkey: &str,
+    model_id: &str,
+    endpoint_addr: &str,
+) -> mesh_llm::MeshServeTarget {
+    let mut target = target(model_id, endpoint_addr);
+    target.reporter_pubkey = Some(reporter_pubkey.to_string());
+    target.owner_id = Some(reporter_pubkey.to_string());
+    target
+}
+
+#[test]
+fn buzz_mesh_join_uses_the_same_live_member_from_every_other_node() {
+    let targets = vec![
+        reported_target("member-c", "model-c", "addr-c"),
+        reported_target("member-a", "model-a", "addr-a"),
+        reported_target("member-b", "model-b", "addr-b"),
+    ];
+
+    assert_eq!(
+        buzz_mesh_join_targets(targets.clone(), "member-b")
+            .into_iter()
+            .next()
+            .map(|target| target.endpoint_addr),
+        Some("addr-a".to_string())
+    );
+    assert_eq!(
+        buzz_mesh_join_targets(targets, "member-c")
+            .into_iter()
+            .next()
+            .map(|target| target.endpoint_addr),
+        Some("addr-a".to_string())
+    );
+}
+
+#[test]
+fn buzz_mesh_bootstrap_member_does_not_dial_itself() {
+    let targets = vec![
+        reported_target("member-b", "model-b", "addr-b"),
+        reported_target("member-a", "model-a", "addr-a"),
+    ];
+
+    assert_eq!(
+        buzz_mesh_join_targets(targets, "MEMBER-A")
+            .into_iter()
+            .next(),
+        Some(reported_target("member-b", "model-b", "addr-b"))
+    );
+}
+
+#[test]
+fn buzz_mesh_join_ignores_targets_without_a_validated_reporter() {
+    let targets = vec![
+        target("unbound-model", "unbound-addr"),
+        reported_target("member-b", "model-b", "addr-b"),
+    ];
+
+    assert_eq!(
+        buzz_mesh_join_targets(targets, "member-c")
+            .into_iter()
+            .next()
+            .map(|target| target.endpoint_addr),
+        Some("addr-b".to_string())
+    );
+}
+
+#[test]
+fn buzz_mesh_join_keeps_other_device_with_the_same_member_key() {
+    let mut self_target = reported_target("same-member", "model-a", "self-addr");
+    self_target.owner_id = Some("owner-self".to_string());
+    let mut other_device = reported_target("same-member", "model-b", "other-addr");
+    other_device.owner_id = Some("owner-other".to_string());
+
+    assert_eq!(
+        buzz_mesh_join_targets(vec![self_target, other_device], "owner-self")
+            .into_iter()
+            .next()
+            .map(|target| target.endpoint_addr),
+        Some("other-addr".to_string())
+    );
+}
+
+#[test]
+fn buzz_mesh_name_is_stable_and_does_not_expose_the_relay() {
+    let first = buzz_mesh_name_for_relay("WSS://EXAMPLE.COM/");
+    let second = buzz_mesh_name_for_relay("wss://example.com:443/some/path?ignored=yes");
+    let other_relay = buzz_mesh_name_for_relay("wss://other.example.com");
+
+    assert_eq!(first, second);
+    assert_ne!(first, other_relay);
+    assert!(first.starts_with("buzz-community-"));
+    assert!(!first.contains("example"));
+}
+
+#[test]
+fn readiness_failure_is_catalog_sync_when_model_never_visible() {
+    assert_eq!(
+        classify_mesh_readiness_failure(false),
+        MeshReadinessFailure::CatalogNeverSynced
+    );
+}
+
+#[test]
+fn readiness_failure_is_routing_when_model_was_visible() {
+    assert_eq!(
+        classify_mesh_readiness_failure(true),
+        MeshReadinessFailure::RoutingNeverCompleted
+    );
+}
+
+#[test]
+fn readiness_messages_are_distinct_and_actionable() {
+    let catalog = mesh_readiness_failure_message(
+        MeshReadinessFailure::CatalogNeverSynced,
+        "auto",
+        "HTTP 429",
+    );
+    let routing = mesh_readiness_failure_message(
+        MeshReadinessFailure::RoutingNeverCompleted,
+        "auto",
+        "HTTP 503",
+    );
+    // Distinct diagnoses, each names the model and carries the raw detail.
+    assert_ne!(catalog, routing);
+    assert!(catalog.contains("network path"));
+    assert!(catalog.contains("HTTP 429"));
+    assert!(routing.contains("did not complete"));
+    assert!(routing.contains("HTTP 503"));
+}
+
+#[test]
+fn mesh_status_cursor_uses_relay_composite_tiebreak() {
+    let event = nostr::EventBuilder::new(nostr::Kind::TextNote, "status")
+        .custom_created_at(nostr::Timestamp::from(1_234))
+        .sign_with_keys(&nostr::Keys::generate())
+        .expect("sign test status");
+    let mut filter = mesh_llm::mesh_status_filter();
+
+    let cursor = advance_mesh_status_cursor(&mut filter, std::slice::from_ref(&event))
+        .expect("advance status cursor");
+
+    assert_eq!(cursor, (1_234, event.id.to_hex()));
+    assert_eq!(filter["until"], serde_json::json!(1_234));
+    assert_eq!(filter["before_id"], serde_json::json!(event.id.to_hex()));
+    assert_eq!(
+        filter["limit"],
+        serde_json::json!(mesh_llm::MESH_STATUS_PAGE_SIZE)
+    );
+}
+
+#[test]
+fn pick_serve_target_returns_first_match_for_model() {
+    let targets = vec![
+        target("model-a", "addr-a"),
+        target("model-b", "addr-b1"),
+        target("model-b", "addr-b2"),
+    ];
+    // Matches by model id and returns the first such target.
+    assert_eq!(
+        pick_serve_target_for_model(targets, "model-b").map(|t| t.endpoint_addr),
+        Some("addr-b1".to_string())
+    );
+}
+
+#[test]
+fn pick_serve_target_normalizes_main_revision() {
+    let targets = vec![target("org/model@main:q4", "addr")];
+    assert_eq!(
+        pick_serve_target_for_model(targets, "org/model:q4").map(|target| target.endpoint_addr),
+        Some("addr".to_string())
+    );
+}
+
+#[test]
+fn pick_serve_target_auto_takes_any_live_target() {
+    let targets = vec![target("model-a", "addr-a"), target("model-b", "addr-b")];
+    // "auto" delegates model choice to the mesh router; any live target
+    // is a valid bootstrap peer (first one wins).
+    assert_eq!(
+        pick_serve_target_for_model(targets, crate::mesh_llm::AUTO_MODEL_ID)
+            .map(|t| t.endpoint_addr),
+        Some("addr-a".to_string())
+    );
+    // But auto with zero live targets still falls closed.
+    assert_eq!(
+        pick_serve_target_for_model(Vec::new(), crate::mesh_llm::AUTO_MODEL_ID),
+        None
+    );
+}
+
+#[test]
+fn pick_serve_target_none_when_model_not_hosted() {
+    let targets = vec![target("model-a", "addr-a")];
+    // No live target serves this model -> caller falls closed.
+    assert_eq!(pick_serve_target_for_model(targets, "model-missing"), None);
+}
+
+#[test]
+fn share_stop_tears_down_serve_but_not_client() {
+    // Stopping "Share compute" tears down a serve node (we were sharing)
+    // but must leave a client node alone (we are consuming a peer). This is
+    // the backend half of the toggle-on regression: a client node occupies
+    // the single slot and reports state:"running", and the stop path must
+    // not kill it.
+    assert!(
+        share_stop_should_teardown(mesh_llm::MeshNodeMode::Serve),
+        "serve node is our sharing runtime; stop must tear it down"
+    );
+    assert!(
+        !share_stop_should_teardown(mesh_llm::MeshNodeMode::Client),
+        "client node is a consume session; stop must NOT tear it down"
+    );
+}
+
+#[test]
+fn share_start_restarts_to_replace_only_client_runtimes() {
+    assert_eq!(
+        mesh_start_plan(mesh_llm::MeshNodeMode::Serve, None),
+        MeshStartPlan::Start
+    );
+    assert_eq!(
+        mesh_start_plan(
+            mesh_llm::MeshNodeMode::Serve,
+            Some(mesh_llm::MeshNodeMode::Client),
+        ),
+        MeshStartPlan::RestartToReplaceClient
+    );
+    assert_eq!(
+        mesh_start_plan(
+            mesh_llm::MeshNodeMode::Serve,
+            Some(mesh_llm::MeshNodeMode::Serve),
+        ),
+        MeshStartPlan::RejectOccupied
+    );
+    assert_eq!(
+        mesh_start_plan(
+            mesh_llm::MeshNodeMode::Client,
+            Some(mesh_llm::MeshNodeMode::Client),
+        ),
+        MeshStartPlan::RejectOccupied
+    );
+}
+
+#[test]
+fn client_status_serializes_with_running_state_and_client_mode() {
+    // Contract pin for the TS mock (e2eBridge.ts) and the frontend
+    // predicate: a consuming node serializes as
+    // {"state":"running","mode":"client"}. If serde renaming drifts, the
+    // hand-written mock shape and `deriveMeshShareToggle` would silently
+    // stop matching the real IPC payload.
+    let status = mesh_llm::MeshNodeStatus {
+        state: mesh_llm::MeshNodeState::Running,
+        mode: Some(mesh_llm::MeshNodeMode::Client),
+        // `MeshHealth::ok()` is module-private; build via the public fields.
+        health: mesh_llm::MeshHealth {
+            status: mesh_llm::MeshHealthStatus::Ok,
+            reason: None,
+        },
+        api_base_url: Some("http://127.0.0.1:9337/v1".to_string()),
+        console_url: None,
+        model_id: None,
+        model_name: None,
+        invite_token: None,
+        endpoint_id: None,
+        device_id: None,
+        device_name: None,
+    };
+    let value = serde_json::to_value(&status).expect("serialize mesh status");
+    assert_eq!(value["state"], serde_json::json!("running"));
+    assert_eq!(value["mode"], serde_json::json!("client"));
+}
+
+#[tokio::test]
+async fn cold_client_preflight_requires_explicit_target() {
+    let state = build_app_state();
+    let error = ensure_client_node_for_model(&state, "demo/model", None)
+        .await
+        .expect_err("cold relay-mesh preflight must not auto-pick a target");
+    assert_eq!(error, RELAY_MESH_RUNTIME_NO_TARGET);
+}
+
+/// Acceptance-critical regression for dropping the serve-vs-client guard.
+///
+/// Before this change, `ensure_client_node_for_model` hard-errored whenever
+/// the running runtime was in `Serve` mode ("stop sharing before using
+/// Buzz shared compute as a client"). That forbade exactly what a user should be
+/// able to do: host model A while pointing an agent at a different model B
+/// through the same `9337` ingress.
+///
+/// This test starts a real serve runtime and asserts that a follow-up
+/// preflight for a *different* model and no explicit target still reuses the
+/// existing runtime. Cold starts without a target are rejected before mesh-llm
+/// startup; running runtimes are already joined to whatever target the
+/// frontend selected earlier.
+///
+/// Hardware-gated (`#[ignore]`): loads a real model. Run with:
+///   cargo test -p buzz-desktop --features mesh-llm \
+///     ensure_serve_runtime_serves_other_model -- --ignored --nocapture
+#[test]
+#[ignore = "loads a real model; run manually with --ignored"]
+fn ensure_serve_runtime_serves_other_model() {
+    std::thread::Builder::new()
+        .name("mesh-hardware-acceptance".to_string())
+        .stack_size(mesh_llm::MESH_WORKER_STACK_SIZE)
+        .spawn(|| {
+            let runtime = tokio::runtime::Builder::new_multi_thread()
+                .worker_threads(2)
+                .thread_stack_size(mesh_llm::MESH_WORKER_STACK_SIZE)
+                .enable_all()
+                .build()
+                .expect("build mesh acceptance runtime");
+            runtime.block_on(async {
+                const DEFAULT_HOSTED_MODEL: &str =
+                    "jc-builds/SmolLM2-135M-Instruct-Q4_K_M-GGUF:Q4_K_M";
+                const OTHER_MODEL: &str = "some/other-model-not-hosted-locally:Q4_K_M";
+                let hosted_model = std::env::var("BUZZ_MESH_TEST_MODEL")
+                    .unwrap_or_else(|_| DEFAULT_HOSTED_MODEL.to_string());
+
+                let state = build_app_state();
+
+                // Start a serve runtime hosting HOSTED_MODEL — this is the "Share
+                // compute" path.
+                let serve =
+                    mesh_llm::DesktopMeshRuntime::start(mesh_llm::StartMeshNodeRequest {
+                        mode: mesh_llm::MeshNodeMode::Serve,
+                        model_id: Some(hosted_model.clone()),
+                        max_vram_gb: None,
+                        join_token: None,
+                        mesh_name: None,
+                        trusted_owner_ids: None,
+                    })
+                    .await
+                    .expect("serve runtime should start");
+
+                let serve_status = serve.status().await.expect("serve status");
+                let serve_base = serve_status
+                    .api_base_url
+                    .clone()
+                    .expect("serve runtime must expose its local API base");
+                assert_eq!(serve_status.mode, Some(mesh_llm::MeshNodeMode::Serve));
+
+                {
+                    let mut runtime = state.mesh_llm_runtime.lock().await;
+                    *runtime = Some(serve);
+                }
+
+                // Concurrent GUI agent starts all reuse this one machine-scoped
+                // runtime. None may create a per-agent client/serve node.
+                let preflights = tokio::join!(
+                    ensure_client_node_for_model(&state, OTHER_MODEL, None),
+                    ensure_client_node_for_model(&state, OTHER_MODEL, None),
+                    ensure_client_node_for_model(&state, OTHER_MODEL, None),
+                    ensure_client_node_for_model(&state, OTHER_MODEL, None),
+                );
+                let statuses = [
+                    preflights.0,
+                    preflights.1,
+                    preflights.2,
+                    preflights.3,
+                ]
+                .into_iter()
+                    .collect::<Result<Vec<_>, _>>()
+                    .expect("all agent preflights must reuse the serve runtime");
+
+                // It returns the SAME running node — agents keep using A's 9337, and
+                // the router decides routability for OTHER_MODEL per request.
+                for status in statuses {
+                    assert_eq!(
+                        status.mode,
+                        Some(mesh_llm::MeshNodeMode::Serve),
+                        "preflight should reuse the existing serve runtime, not spin up a client"
+                    );
+                    assert_eq!(
+                        status.api_base_url.as_deref(),
+                        Some(serve_base.as_str()),
+                        "every agent must be pointed at the machine's existing ingress"
+                    );
+                }
+
+                // A standalone Share Compute runtime must advertise exactly
+                // one physical model and serve inference through `auto`.
+                let http = reqwest::Client::new();
+                let catalog_deadline =
+                    tokio::time::Instant::now() + std::time::Duration::from_secs(120);
+                let catalog = loop {
+                    let body = http
+                        .get(format!("{serve_base}/models"))
+                        .send()
+                        .await
+                        .expect("query single-node catalog")
+                        .error_for_status()
+                        .expect("single-node catalog status")
+                        .json::<serde_json::Value>()
+                        .await
+                        .expect("parse single-node catalog");
+                    let physical_count = body["data"]
+                        .as_array()
+                        .map(|models| {
+                            models
+                                .iter()
+                                .filter_map(|model| model["id"].as_str())
+                                .filter(|model| *model != "mesh")
+                                .count()
+                        })
+                        .unwrap_or_default();
+                    if physical_count > 0 {
+                        break body;
+                    }
+                    assert!(
+                        tokio::time::Instant::now() < catalog_deadline,
+                        "single Share Compute model never became ready: {body}"
+                    );
+                    tokio::time::sleep(std::time::Duration::from_millis(250)).await;
+                };
+                let physical_models = catalog["data"]
+                    .as_array()
+                    .expect("catalog data")
+                    .iter()
+                    .filter_map(|model| model["id"].as_str())
+                    .filter(|model| *model != "mesh")
+                    .collect::<Vec<_>>();
+                assert_eq!(
+                    physical_models.len(),
+                    1,
+                    "single Share Compute node must advertise one physical model: {catalog}"
+                );
+                assert!(
+                    physical_models[0].contains(hosted_model.split(':').next().unwrap_or("")),
+                    "catalog must contain the hosted model: {catalog}"
+                );
+
+                let inference_deadline =
+                    tokio::time::Instant::now() + std::time::Duration::from_secs(120);
+                let inference = loop {
+                    let response = http
+                        .post(format!("{serve_base}/chat/completions"))
+                        .json(&serde_json::json!({
+                            "model": "auto",
+                            "messages": [{
+                                "role": "user",
+                                "content": "Reply with exactly BUZZ_SINGLE_SHARE_OK and nothing else."
+                            }],
+                            "max_tokens": 512,
+                            "temperature": 0
+                        }))
+                        .send()
+                        .await
+                        .expect("single-node auto inference");
+                    if response.status().is_success() {
+                        break response
+                            .json::<serde_json::Value>()
+                            .await
+                            .expect("parse single-node inference");
+                    }
+                    let status = response.status();
+                    let body = response.text().await.unwrap_or_default();
+                    assert!(
+                        tokio::time::Instant::now() < inference_deadline,
+                        "single-node auto inference never became ready: HTTP {status}: {body}"
+                    );
+                    tokio::time::sleep(std::time::Duration::from_millis(500)).await;
+                };
+                let answer = inference["choices"][0]["message"]["content"]
+                    .as_str()
+                    .unwrap_or_default();
+                assert!(
+                    !answer.trim().is_empty(),
+                    "single-node auto must produce visible output: {inference}"
+                );
+
+                // Clean up the runtime.
+                let taken = state.mesh_llm_runtime.lock().await.take();
+                if let Some(runtime) = taken {
+                    let _ = runtime.stop().await;
+                }
+            });
+        })
+        .expect("spawn mesh acceptance thread")
+        .join()
+        .expect("mesh acceptance thread panicked");
+}
diff --git a/desktop/src-tauri/src/commands/messages.rs b/desktop/src-tauri/src/commands/messages.rs
index 1928d69d23..b7c37bec3d 100644
--- a/desktop/src-tauri/src/commands/messages.rs
+++ b/desktop/src-tauri/src/commands/messages.rs
@@ -68,7 +68,20 @@ pub async fn get_feed(
 
     // Mentions: messages that reference me via #p.
     let mut mention_filter = serde_json::json!({
-        "kinds": [9, 40002, 1, 45001, 45003],
+        "kinds": [
+            9,
+            40002,
+            1,
+            45001,
+            45003,
+            buzz_core_pkg::kind::KIND_GIT_PULL_REQUEST,
+            buzz_core_pkg::kind::KIND_GIT_PR_UPDATE,
+            buzz_core_pkg::kind::KIND_GIT_ISSUE,
+            buzz_core_pkg::kind::KIND_GIT_STATUS_OPEN,
+            buzz_core_pkg::kind::KIND_GIT_STATUS_MERGED,
+            buzz_core_pkg::kind::KIND_GIT_STATUS_CLOSED,
+            buzz_core_pkg::kind::KIND_GIT_STATUS_DRAFT,
+        ],
         "#p": [my_pubkey],
         "limit": cap,
     });
@@ -125,7 +138,14 @@ pub async fn get_feed(
     })
 }
 
-fn build_search_messages_filter(q: &str, cap: u32, channel_id: Option<&str>) -> serde_json::Value {
+fn build_search_messages_filter(
+    q: &str,
+    cap: u32,
+    channel_id: Option<&str>,
+    authors: Option<&[String]>,
+    since: Option<i64>,
+    until: Option<i64>,
+) -> serde_json::Value {
     let mut filter = serde_json::Map::new();
     filter.insert(
         "kinds".to_string(),
@@ -140,6 +160,25 @@ fn build_search_messages_filter(q: &str, cap: u32, channel_id: Option<&str>) ->
     if let Some(cid) = channel_id {
         filter.insert("#h".to_string(), serde_json::json!([cid]));
     }
+    // Optional operators from the desktop search parser (#2853). The relay
+    // already maps authors/since/until onto FTS; search remains never the
+    // access boundary (hits are refetched and re-authorized).
+    if let Some(authors) = authors {
+        let cleaned: Vec<&str> = authors
+            .iter()
+            .map(|a| a.trim())
+            .filter(|a| !a.is_empty())
+            .collect();
+        if !cleaned.is_empty() {
+            filter.insert("authors".to_string(), serde_json::json!(cleaned));
+        }
+    }
+    if let Some(since) = since {
+        filter.insert("since".to_string(), serde_json::json!(since));
+    }
+    if let Some(until) = until {
+        filter.insert("until".to_string(), serde_json::json!(until));
+    }
     serde_json::Value::Object(filter)
 }
 
@@ -148,10 +187,20 @@ pub async fn search_messages(
     q: String,
     limit: Option<u32>,
     channel_id: Option<String>,
+    authors: Option<Vec<String>>,
+    since: Option<i64>,
+    until: Option<i64>,
     state: State<'_, AppState>,
 ) -> Result<SearchResponse, String> {
     let cap = limit.unwrap_or(20).min(100);
-    let filter = build_search_messages_filter(&q, cap, channel_id.as_deref());
+    let filter = build_search_messages_filter(
+        &q,
+        cap,
+        channel_id.as_deref(),
+        authors.as_deref(),
+        since,
+        until,
+    );
 
     let events = query_relay(&state, &[filter]).await?;
     Ok(nostr_convert::search_response_from_events(&events))
diff --git a/desktop/src-tauri/src/commands/messages_tests.rs b/desktop/src-tauri/src/commands/messages_tests.rs
index 3c08f0f113..a907a3dff1 100644
--- a/desktop/src-tauri/src/commands/messages_tests.rs
+++ b/desktop/src-tauri/src/commands/messages_tests.rs
@@ -80,12 +80,38 @@ fn managed_agent_message_builder_rejects_invalid_mentions() {
 }
 #[test]
 fn search_messages_filter_requests_prefix_mode_for_topbar_typeahead() {
-    let filter = build_search_messages_filter("  pro  ", 12, Some("channel-1"));
+    let filter = build_search_messages_filter("  pro  ", 12, Some("channel-1"), None, None, None);
 
     assert_eq!(filter["search"], serde_json::json!("pro"));
     assert_eq!(filter["search_mode"], serde_json::json!("prefix"));
     assert_eq!(filter["limit"], serde_json::json!(12));
     assert_eq!(filter["#h"], serde_json::json!(["channel-1"]));
+    assert!(filter.get("authors").is_none());
+    assert!(filter.get("since").is_none());
+    assert!(filter.get("until").is_none());
+}
+
+#[test]
+fn search_messages_filter_emits_operator_fields() {
+    let authors =
+        vec!["aabbccddeeff00112233445566778899aabbccddeeff00112233445566778899".to_string()];
+    let filter = build_search_messages_filter(
+        "deploy",
+        20,
+        Some("channel-uuid"),
+        Some(&authors),
+        Some(1_700_000_000),
+        Some(1_700_086_400),
+    );
+
+    assert_eq!(filter["search"], serde_json::json!("deploy"));
+    assert_eq!(filter["#h"], serde_json::json!(["channel-uuid"]));
+    assert_eq!(
+        filter["authors"],
+        serde_json::json!(["aabbccddeeff00112233445566778899aabbccddeeff00112233445566778899"])
+    );
+    assert_eq!(filter["since"], serde_json::json!(1_700_000_000));
+    assert_eq!(filter["until"], serde_json::json!(1_700_086_400));
 }
 
 #[test]
diff --git a/desktop/src-tauri/src/commands/mod.rs b/desktop/src-tauri/src/commands/mod.rs
index 7e9d916be6..1c89ee4f77 100644
--- a/desktop/src-tauri/src/commands/mod.rs
+++ b/desktop/src-tauri/src/commands/mod.rs
@@ -5,6 +5,7 @@ mod agent_logs;
 mod agent_metric_archive;
 mod agent_model_process;
 mod agent_models;
+mod agent_models_env;
 mod agent_providers;
 mod agent_settings;
 mod agent_update_rollback;
@@ -20,6 +21,7 @@ mod export_util;
 mod global_agent_config;
 mod identity;
 mod identity_archive;
+mod join_policy;
 mod legacy_storage;
 mod link_preview;
 pub(crate) mod media;
@@ -77,6 +79,7 @@ pub use engrams::*;
 pub use global_agent_config::*;
 pub use identity::*;
 pub use identity_archive::*;
+pub use join_policy::*;
 pub use legacy_storage::*;
 pub use link_preview::*;
 pub use media::*;
diff --git a/desktop/src-tauri/src/commands/pairing.rs b/desktop/src-tauri/src/commands/pairing.rs
index 639ae16da3..fc874a0150 100644
--- a/desktop/src-tauri/src/commands/pairing.rs
+++ b/desktop/src-tauri/src/commands/pairing.rs
@@ -1,3 +1,4 @@
+use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -35,6 +36,7 @@ struct PairingErrorPayload {
 /// Managed Tauri state for an active pairing session.
 pub struct PairingHandle {
     session: Arc<tokio::sync::Mutex<Option<PairingSession>>>,
+    generation: Arc<AtomicU64>,
     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>>>,
@@ -47,6 +49,7 @@ impl PairingHandle {
     pub fn new() -> Self {
         Self {
             session: Arc::new(tokio::sync::Mutex::new(None)),
+            generation: Arc::new(AtomicU64::new(0)),
             cancel: std::sync::Mutex::new(None),
             outbound_tx: std::sync::Mutex::new(None),
             payload: std::sync::Mutex::new(None),
@@ -71,10 +74,18 @@ pub async fn start_pairing(
     state: State<'_, AppState>,
     pairing: State<'_, PairingHandle>,
 ) -> Result<String, String> {
+    let task_generation = pairing
+        .generation
+        .fetch_add(1, Ordering::SeqCst)
+        .wrapping_add(1);
     if let Some(token) = pairing.cancel.lock().map_err(|e| e.to_string())?.take() {
         token.cancel();
     }
     pairing.clear();
+    {
+        let mut session = pairing.session.lock().await;
+        *session = None;
+    }
 
     let keys = state.signing_keys()?;
     let nsec = keys
@@ -117,9 +128,12 @@ pub async fn start_pairing(
     *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,
         cancel,
         outbound_rx,
         app,
@@ -199,6 +213,8 @@ 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();
     }
@@ -215,22 +231,35 @@ 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,
     cancel: CancellationToken,
     mut outbound_rx: mpsc::Receiver<String>,
     app: AppHandle,
 ) {
-    if let Err(e) =
-        pairing_ws_task_inner(&relay_url, &session, &cancel, &mut outbound_rx, &app).await
+    if let Err(e) = pairing_ws_task_inner(
+        &relay_url,
+        &session,
+        &generation,
+        task_generation,
+        &cancel,
+        &mut outbound_rx,
+        &app,
+    )
+    .await
     {
-        let _ = app.emit("pairing-error", PairingErrorPayload { message: e });
+        if pairing_task_is_current(&generation, task_generation) {
+            let _ = app.emit("pairing-error", PairingErrorPayload { message: e });
+        }
     }
-    let mut s = session.lock().await;
-    *s = None;
+    clear_pairing_session_if_current(&session, &generation, task_generation).await;
 }
 
 async fn pairing_ws_task_inner(
     relay_url: &str,
     session: &Arc<tokio::sync::Mutex<Option<PairingSession>>>,
+    generation: &AtomicU64,
+    task_generation: u64,
     cancel: &CancellationToken,
     outbound_rx: &mut mpsc::Receiver<String>,
     app: &AppHandle,
@@ -261,12 +290,18 @@ async fn pairing_ws_task_inner(
     tokio::pin!(hard_timeout);
 
     loop {
+        if !pairing_task_is_current(generation, task_generation) {
+            break;
+        }
+
         tokio::select! {
             _ = cancel.cancelled() => break,
             _ = &mut hard_timeout => {
-                let _ = app.emit("pairing-error", PairingErrorPayload {
-                    message: "Session timed out".into(),
-                });
+                if pairing_task_is_current(generation, task_generation) {
+                    let _ = app.emit("pairing-error", PairingErrorPayload {
+                        message: "Session timed out".into(),
+                    });
+                }
                 break;
             }
             Some(json_msg) = outbound_rx.recv() => {
@@ -282,30 +317,42 @@ 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) {
+                        break;
+                    }
+
                     let mut guard = session.lock().await;
                     let Some(s) = guard.as_mut() else { break };
 
                     if let Ok(reason) = s.handle_abort(&event) {
-                        let _ = app.emit("pairing-aborted", PairingAbortedPayload {
-                            reason: format!("{reason:?}"),
-                        });
+                        if pairing_task_is_current(generation, task_generation) {
+                            let _ = app.emit("pairing-aborted", PairingAbortedPayload {
+                                reason: format!("{reason:?}"),
+                            });
+                        }
                         break;
                     }
 
                     if let Ok(sas) = s.handle_offer(&event) {
-                        let _ = app.emit("pairing-sas-received", PairingSasPayload { sas });
+                        if pairing_task_is_current(generation, task_generation) {
+                            let _ = app.emit("pairing-sas-received", PairingSasPayload { sas });
+                        }
                         continue;
                     }
 
                     match s.handle_complete(&event) {
                         Ok(()) => {
-                            let _ = app.emit("pairing-complete", serde_json::json!({}));
+                            if pairing_task_is_current(generation, task_generation) {
+                                let _ = app.emit("pairing-complete", serde_json::json!({}));
+                            }
                             break;
                         }
                         Err(ref e) if format!("{e}").contains("success=false") => {
-                            let _ = app.emit("pairing-error", PairingErrorPayload {
-                                message: "Mobile device reported failure importing credentials".into(),
-                            });
+                            if pairing_task_is_current(generation, task_generation) {
+                                let _ = app.emit("pairing-error", PairingErrorPayload {
+                                    message: "Mobile device reported failure importing credentials".into(),
+                                });
+                            }
                             break;
                         }
                         Err(_) => {}
@@ -318,6 +365,21 @@ async fn pairing_ws_task_inner(
     Ok(())
 }
 
+fn pairing_task_is_current(generation: &AtomicU64, task_generation: u64) -> bool {
+    generation.load(Ordering::SeqCst) == task_generation
+}
+
+async fn clear_pairing_session_if_current(
+    session: &Arc<tokio::sync::Mutex<Option<PairingSession>>>,
+    generation: &AtomicU64,
+    task_generation: u64,
+) {
+    let mut session = session.lock().await;
+    if pairing_task_is_current(generation, task_generation) {
+        *session = None;
+    }
+}
+
 async fn handle_nip42_auth<R, W>(
     read: &mut R,
     write: &mut W,
@@ -527,6 +589,40 @@ where
     .map_err(|_| "timeout waiting for EOSE".to_string())?
 }
 
+#[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());
+    }
+}
+
 #[cfg(test)]
 mod pairing_relay_tests {
     use super::{
diff --git a/desktop/src-tauri/src/commands/personas/create.rs b/desktop/src-tauri/src/commands/personas/create.rs
new file mode 100644
index 0000000000..c00de1c6da
--- /dev/null
+++ b/desktop/src-tauri/src/commands/personas/create.rs
@@ -0,0 +1,85 @@
+//! The persona creation command surface, split from `mod.rs` (file-size cap)
+//! as the sibling of [`super::update`].
+
+use tauri::AppHandle;
+use uuid::Uuid;
+
+use crate::{
+    app_state::AppState,
+    managed_agents::{
+        apply_persona_behavior, load_personas, save_personas, try_regenerate_nest, AgentDefinition,
+        CatalogSource, CreatePersonaRequest,
+    },
+    util::now_iso,
+};
+
+use super::{pending, retain_persona_pending, trim_optional, trim_required};
+
+#[tauri::command]
+pub async fn create_persona(
+    input: CreatePersonaRequest,
+    app: AppHandle,
+) -> Result<AgentDefinition, String> {
+    use tauri::Manager;
+    tokio::task::spawn_blocking(move || {
+        let state = app.state::<AppState>();
+        let display_name = trim_required(&input.display_name, "Display name")?;
+        // System prompt optional: core memory is auto-injected. Empty is valid.
+        let system_prompt = input.system_prompt.trim().to_string();
+        let avatar_url = trim_optional(input.avatar_url);
+        let runtime = trim_optional(input.runtime);
+        let model = trim_optional(input.model);
+        let provider = trim_optional(input.provider);
+        // Normalized before the store is touched: a coordinate that can't match
+        // a publication is worse than no coordinate, because it silently
+        // re-enables the duplicate add it exists to prevent.
+        let catalog_source = input
+            .catalog_source
+            .map(CatalogSource::normalized)
+            .transpose()?;
+        let now = now_iso();
+        let _store_guard = state
+            .managed_agents_store_lock
+            .lock()
+            .map_err(|error| error.to_string())?;
+        let mut personas = load_personas(&app)?;
+        pending::project_active_persona_sharing(&app, &state, &mut personas);
+        let name_pool: Vec<String> = input
+            .name_pool
+            .into_iter()
+            .map(|s| s.trim().to_string())
+            .filter(|s| !s.is_empty())
+            .collect();
+        crate::managed_agents::validate_user_env_keys(&input.env_vars)?;
+        let mut persona = AgentDefinition {
+            id: Uuid::new_v4().to_string(),
+            display_name,
+            avatar_url,
+            system_prompt,
+            runtime,
+            model,
+            provider,
+            name_pool,
+            is_builtin: false,
+            is_active: true,
+            shared: false,
+            source_team: None,
+            source_team_persona_slug: None,
+            catalog_source,
+            env_vars: input.env_vars,
+            respond_to: None,
+            respond_to_allowlist: Vec::new(),
+            parallelism: None,
+            created_at: now.clone(),
+            updated_at: now,
+        };
+        apply_persona_behavior(&mut persona, input.behavior)?;
+        personas.push(persona.clone());
+        save_personas(&app, &personas)?;
+        retain_persona_pending(&app, &state, &persona);
+        try_regenerate_nest(&app);
+        Ok(persona)
+    })
+    .await
+    .map_err(|e| format!("spawn_blocking failed: {e}"))?
+}
diff --git a/desktop/src-tauri/src/commands/personas/delete_cascade_tests.rs b/desktop/src-tauri/src/commands/personas/delete_cascade_tests.rs
index 316af5f72d..8ff7cfbd9b 100644
--- a/desktop/src-tauri/src/commands/personas/delete_cascade_tests.rs
+++ b/desktop/src-tauri/src/commands/personas/delete_cascade_tests.rs
@@ -61,8 +61,10 @@ fn make_agent(
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         relay_mesh: None,
         auto_restart_on_config_change: false,
         definition_respond_to: None,
diff --git a/desktop/src-tauri/src/commands/personas/inbound.rs b/desktop/src-tauri/src/commands/personas/inbound.rs
new file mode 100644
index 0000000000..d7ffecef2d
--- /dev/null
+++ b/desktop/src-tauri/src/commands/personas/inbound.rs
@@ -0,0 +1,450 @@
+//! Inbound relay → local store reconciliation for persona/team/managed-agent
+//! projections and their NIP-09 tombstones. Extracted from the parent module to
+//! keep it under the file-size cap.
+
+use tauri::{AppHandle, Emitter, Manager};
+
+use crate::{
+    app_state::AppState,
+    managed_agents::{
+        agent_events::ManagedAgentEventContent, load_personas, persona_events::persona_d_tag,
+        save_personas, team_events::TeamEventContent, try_regenerate_nest, AgentDefinition,
+        ManagedAgentRecord, TeamRecord,
+    },
+    util::now_iso,
+};
+
+#[cfg(test)]
+mod inbound_tests;
+
+/// Apply an inbound kind:30175 persona event from the relay onto the local
+/// store. The frontend's live subscription invokes this per event for our own
+/// authored coordinate so Device B inherits Device A's edits.
+///
+/// Retention is a sync channel that writes INTO `personas.json`, never an
+/// authoritative read source — `load_personas` is untouched, so every agent
+/// keeps resolving its persona by UUID and keeps its provider keys.
+///
+/// MATCH KEY (single source of truth, both directions): an inbound event
+/// matches the local record whose `persona_d_tag(record)` equals the event's
+/// d-tag. Reusing the same derivation the outbound path uses guarantees the
+/// inbound key can never drift from the outbound key — in particular, an
+/// in-app persona (`source_team_persona_slug == None`) whose d-tag IS its
+/// `id` matches its existing UUID row instead of minting a duplicate.
+///
+/// On match: patch ONLY the projected fields; preserve local `id`, `env_vars`,
+/// `source_team`, and `created_at`. On no match: insert the parsed record as-is
+/// — `persona_from_event` already sets `id = d_tag`, so an in-app persona reuses
+/// its d-tag as the id and a re-received event stays idempotent (no duplicate).
+///
+/// The retention store decides whether the inbound event wins over a pending
+/// local edit (`retain_inbound_event`): `personas.json` is only patched when the
+/// retain reports [`InboundOutcome::Applied`], so an equal-second collision with
+/// a pending local edit leaves the local record — and its queued publish —
+/// untouched.
+///
+/// `arrival_relay_url` is the relay the calling subscription is bound to. The
+/// retention store this event belongs to is decided by the community that
+/// DELIVERED it, not by whichever community happens to be active when the
+/// reconcile runs — a workspace switch in flight would otherwise file community
+/// A's event into community B's scoped database. An event whose arrival relay is
+/// no longer the active scope is dropped: it was already durable in its own
+/// community's store when it arrived there, and that community's next boot
+/// reconcile refetches it.
+#[tauri::command]
+pub async fn reconcile_inbound_persona_event(
+    event_json: String,
+    arrival_relay_url: String,
+    app: AppHandle,
+) -> Result<(), String> {
+    tokio::task::spawn_blocking(move || {
+        reconcile_inbound_persona_event_blocking(event_json, arrival_relay_url, app)
+    })
+    .await
+    .map_err(|e| format!("spawn_blocking failed: {e}"))?
+}
+
+fn reconcile_inbound_persona_event_blocking(
+    event_json: String,
+    arrival_relay_url: String,
+    app: AppHandle,
+) -> Result<(), String> {
+    use crate::managed_agents::{
+        agent_events::managed_agent_content_from_event,
+        load_managed_agents, load_teams,
+        persona_events::persona_from_event,
+        retention::{open_retention_db, retain_inbound_event, InboundOutcome, RetainedEvent},
+        save_managed_agents, save_teams,
+        team_events::team_content_from_event,
+    };
+    use buzz_core_pkg::kind::{KIND_DELETION, KIND_MANAGED_AGENT, KIND_PERSONA, KIND_TEAM};
+    use nostr::JsonUtil;
+
+    let state = app.state::<AppState>();
+    let event = parse_verified_inbound_event(&event_json)?;
+
+    // The live filter subscribes to 30175/30176/30177 (upserts) plus kind:5
+    // (NIP-09 deletions). d-tags are NOT unique across kinds, so every path
+    // below dispatches on kind FIRST and only ever touches its own store — a
+    // cross-kind d-tag collision can never link a team to a persona or agent.
+    let kind = event.kind.as_u16() as u32;
+
+    // kind:5 deletion: a tombstone removes the local record at the coordinate
+    // in its `a` tag (`<target_kind>:<owner>:<d_tag>`). Handled before the
+    // upsert dispatch because its coordinate and retention key differ.
+    if kind == KIND_DELETION {
+        return reconcile_inbound_tombstone(&event, &arrival_relay_url, &app, &state);
+    }
+
+    if !matches!(kind, KIND_PERSONA | KIND_TEAM | KIND_MANAGED_AGENT) {
+        return Ok(());
+    }
+
+    // The d-tag identifies the record within its kind. Persona derives it from
+    // the parsed record (`persona_d_tag`); team/agent carry it as the event's
+    // d-tag directly. The persona is parsed once here and reused in the apply
+    // branch below — team/agent content is parsed in-branch since their d-tag
+    // comes from the event tag, not the content.
+    let inbound_persona = (kind == KIND_PERSONA)
+        .then(|| persona_from_event(&event))
+        .transpose()?;
+    let d_tag = match &inbound_persona {
+        Some(persona) => persona_d_tag(persona),
+        None => event_d_tag(&event)?,
+    };
+
+    let _store_guard = state
+        .managed_agents_store_lock
+        .lock()
+        .map_err(|error| error.to_string())?;
+
+    // Resolve inbound vs. any pending local edit before touching the store, in
+    // the scope the event ARRIVED on. A workspace switch since arrival leaves
+    // this event to its own community's store — dropping it here is what keeps
+    // community A's head out of community B's database.
+    let Some(scope) = crate::managed_agents::retention::arrival_retention_scope(
+        &app,
+        &state,
+        &arrival_relay_url,
+    )?
+    else {
+        return Ok(());
+    };
+    let conn = open_retention_db(&scope.db_path)?;
+    let outcome = retain_inbound_event(
+        &conn,
+        &RetainedEvent {
+            kind,
+            pubkey: event.pubkey.to_hex(),
+            d_tag: d_tag.clone(),
+            content: event.content.to_string(),
+            created_at: event.created_at.as_secs() as i64,
+            raw_event: event.as_json(),
+            pending_sync: false,
+        },
+    )?;
+    if outcome == InboundOutcome::Skipped {
+        return Ok(());
+    }
+
+    match kind {
+        KIND_PERSONA => {
+            let mut personas = load_personas(&app)?;
+            // `inbound_persona` is `Some` for KIND_PERSONA (set above).
+            apply_inbound_persona(
+                &mut personas,
+                inbound_persona.expect("persona parsed above"),
+            );
+            save_personas(&app, &personas)?;
+        }
+        KIND_TEAM => {
+            let mut teams = load_teams(&app)?;
+            apply_inbound_team(&mut teams, d_tag, team_content_from_event(&event)?);
+            save_teams(&app, &teams)?;
+        }
+        KIND_MANAGED_AGENT => {
+            let mut agents = load_managed_agents(&app)?;
+            apply_inbound_managed_agent(
+                &mut agents,
+                &d_tag,
+                managed_agent_content_from_event(&event)?,
+            );
+            save_managed_agents(&app, &agents)?;
+        }
+        _ => unreachable!("kind gated above"),
+    }
+    try_regenerate_nest(&app);
+
+    // Signal the live UI to refetch agents data — inbound relay events otherwise
+    // land on disk silently, leaving the Agents tab stale until restart.
+    let _ = app.emit("agents-data-changed", ());
+
+    Ok(())
+}
+
+/// Parse an inbound wire event and enforce the signature gate. Everything
+/// downstream trusts `event.pubkey` (ownership routing, tombstone scoping,
+/// behavioral-quad application), so a forged pubkey must die here — the
+/// TS-side owner filter reads the same attacker-controlled field and is no
+/// defense.
+fn parse_verified_inbound_event(event_json: &str) -> Result<nostr::Event, String> {
+    use nostr::JsonUtil;
+    let event = nostr::Event::from_json(event_json)
+        .map_err(|e| format!("failed to parse inbound event: {e}"))?;
+    event
+        .verify()
+        .map_err(|e| format!("inbound event failed signature verification: {e}"))?;
+    Ok(event)
+}
+
+/// Parse a NIP-09 `a`-tag coordinate `<kind>:<owner_pubkey>:<d_tag>` into its
+/// target kind and d-tag. Returns `None` if the tag is absent or malformed, so
+/// the caller no-ops on a tombstone it can't route.
+fn parse_deletion_coordinate(event: &nostr::Event) -> Option<(u32, String)> {
+    event.tags.iter().find_map(|tag| {
+        let values: Vec<&str> = tag.as_slice().iter().map(|s| s.as_str()).collect();
+        if values.first() != Some(&"a") {
+            return None;
+        }
+        let coord = values.get(1)?;
+        // `<kind>:<owner>:<d_tag>` — d_tag may itself contain ':' so split at
+        // most twice and keep the remainder as the d_tag.
+        let mut parts = coord.splitn(3, ':');
+        let kind: u32 = parts.next()?.parse().ok()?;
+        let owner = parts.next()?;
+        // NIP-09 scoping: only the record's author may tombstone it. The
+        // signature gate upstream proves `event.pubkey`; requiring the
+        // coordinate owner to match closes the other half — a validly
+        // signed kind:5 naming ANOTHER owner's coordinate must no-op.
+        if owner != event.pubkey.to_hex() {
+            return None;
+        }
+        let d_tag = parts.next()?;
+        Some((kind, d_tag.to_string()))
+    })
+}
+
+/// Apply an inbound kind:5 NIP-09 deletion: remove the local record at the
+/// tombstone's target coordinate, scoped per-kind. Mirrors the upsert spine —
+/// arrival-scoped retention resolution under the store lock, then a per-kind
+/// store mutation — but removes rather than patches. Unknown/malformed
+/// coordinates no-op, as does a tombstone whose arrival community is no longer
+/// active.
+fn reconcile_inbound_tombstone(
+    event: &nostr::Event,
+    arrival_relay_url: &str,
+    app: &AppHandle,
+    state: &AppState,
+) -> Result<(), String> {
+    use crate::managed_agents::{
+        load_managed_agents, load_teams,
+        retention::{
+            open_retention_db, retain_inbound_event, tombstone_retention_d_tag, InboundOutcome,
+            RetainedEvent,
+        },
+        save_managed_agents, save_teams,
+    };
+    use buzz_core_pkg::kind::{KIND_DELETION, KIND_MANAGED_AGENT, KIND_PERSONA, KIND_TEAM};
+    use nostr::JsonUtil;
+
+    let Some((target_kind, target_d_tag)) = parse_deletion_coordinate(event) else {
+        return Ok(()); // no routable coordinate — nothing to delete
+    };
+    if !matches!(target_kind, KIND_PERSONA | KIND_TEAM | KIND_MANAGED_AGENT) {
+        return Ok(()); // deletion for a kind we don't track locally
+    }
+
+    let _store_guard = state
+        .managed_agents_store_lock
+        .lock()
+        .map_err(|error| error.to_string())?;
+
+    // Resolve against the retained tombstone row (keyed by the target
+    // coordinate, F2c) so a re-received tombstone or one older than a pending
+    // local edit is a no-op. Scoped to the arrival community, so a workspace
+    // switch since arrival drops the tombstone instead of retaining it — and
+    // deleting a record — in the wrong community's store.
+    let Some(scope) =
+        crate::managed_agents::retention::arrival_retention_scope(app, state, arrival_relay_url)?
+    else {
+        return Ok(());
+    };
+    let conn = open_retention_db(&scope.db_path)?;
+    let outcome = retain_inbound_event(
+        &conn,
+        &RetainedEvent {
+            kind: KIND_DELETION,
+            pubkey: event.pubkey.to_hex(),
+            d_tag: tombstone_retention_d_tag(target_kind, &target_d_tag),
+            content: event.content.to_string(),
+            created_at: event.created_at.as_secs() as i64,
+            raw_event: event.as_json(),
+            pending_sync: false,
+        },
+    )?;
+    if outcome == InboundOutcome::Skipped {
+        return Ok(());
+    }
+
+    // Remove the local record using the SAME per-kind match rule the apply fns
+    // use: persona by `persona_d_tag`, team by `id`, managed-agent by `pubkey`.
+    match target_kind {
+        KIND_PERSONA => {
+            let mut personas = load_personas(app)?;
+            personas.retain(|record| persona_d_tag(record) != target_d_tag);
+            save_personas(app, &personas)?;
+        }
+        KIND_TEAM => {
+            let mut teams = load_teams(app)?;
+            teams.retain(|record| record.id != target_d_tag);
+            save_teams(app, &teams)?;
+        }
+        KIND_MANAGED_AGENT => {
+            let mut agents = load_managed_agents(app)?;
+            agents.retain(|record| record.pubkey != target_d_tag);
+            save_managed_agents(app, &agents)?;
+        }
+        _ => unreachable!("target kind gated above"),
+    }
+    try_regenerate_nest(app);
+
+    // Refresh the live UI on inbound deletion — a removal is as user-visible as
+    // an upsert and the Agents tab must drop the tombstoned record without restart.
+    let _ = app.emit("agents-data-changed", ());
+
+    Ok(())
+}
+
+/// Extract the `d` tag value from an event, the match key for team (= team id)
+/// and managed-agent (= agent pubkey) inbound reconcile.
+fn event_d_tag(event: &nostr::Event) -> Result<String, String> {
+    event
+        .tags
+        .iter()
+        .find_map(|tag| {
+            let values: Vec<&str> = tag.as_slice().iter().map(|s| s.as_str()).collect();
+            (values.first() == Some(&"d"))
+                .then(|| values.get(1).map(|s| s.to_string()))
+                .flatten()
+        })
+        .ok_or_else(|| "inbound event missing d-tag".to_string())
+}
+
+/// Merge a parsed inbound persona into the local set: patch the matching record
+/// in place, or push it when none matches.
+///
+/// The match key is `persona_d_tag` — the same derivation the outbound path
+/// uses — so the inbound and outbound keys can never drift. On match, only the
+/// projected fields are overwritten; local `id`, `env_vars`, `source_team`, and
+/// `created_at` survive. On no match, the parsed record is inserted as-is; since
+/// `persona_from_event` sets `id = d_tag`, an in-app persona reuses its d-tag as
+/// the id and a re-received event stays idempotent (no duplicate row).
+fn apply_inbound_persona(personas: &mut Vec<AgentDefinition>, inbound: AgentDefinition) {
+    let d_tag = persona_d_tag(&inbound);
+    match personas
+        .iter_mut()
+        .find(|record| persona_d_tag(record) == d_tag)
+    {
+        Some(local) => {
+            local.display_name = inbound.display_name;
+            local.avatar_url = inbound.avatar_url;
+            local.system_prompt = inbound.system_prompt;
+            local.runtime = inbound.runtime;
+            local.model = inbound.model;
+            local.provider = inbound.provider;
+            local.name_pool = inbound.name_pool;
+            local.respond_to = inbound.respond_to;
+            local.respond_to_allowlist = inbound.respond_to_allowlist;
+            local.parallelism = inbound.parallelism;
+            local.shared = inbound.shared;
+            local.updated_at = inbound.updated_at;
+        }
+        None => personas.push(inbound),
+    }
+}
+
+/// Merge an inbound kind:30177 managed-agent projection into the local set.
+///
+/// Matches the local record whose `pubkey` equals the event's d-tag (the d-tag
+/// IS the agent pubkey — see `build_agent_event`). On match, overwrite ONLY the
+/// 10 projected fields; every secret (`private_key_nsec`, `auth_tag`,
+/// `env_vars`, `backend`), the harness pins (`agent_command`,
+/// `agent_command_override`), and all runtime/local fields are preserved
+/// untouched. The projection type carries none of them, so they cannot be
+/// reached here even if a foreign event tried to inject them.
+///
+/// No match is a no-op: managed agents carry device-local secrets and are never
+/// minted from a relay event — an agent that does not already exist locally has
+/// no secret key to run with, so inserting a secretless shell would be useless
+/// and misleading. This diverges from the persona path, which DOES insert on no
+/// match (personas are secretless definitions). Flagged in the reconcile docs.
+fn apply_inbound_managed_agent(
+    agents: &mut [ManagedAgentRecord],
+    d_tag: &str,
+    inbound: ManagedAgentEventContent,
+) {
+    if let Some(local) = agents.iter_mut().find(|record| record.pubkey == d_tag) {
+        local.name = inbound.name;
+        // Mirror of the slimmed writer (agent_event_content): a
+        // definition-linked event omits the definition quad because those
+        // fields resolve through the kind:30175 definition — absent means
+        // "not carried", never "clear". Definition-less events still carry
+        // the quad and apply it unconditionally (including clears).
+        let definition_linked = inbound.persona_id.is_some();
+        local.persona_id = inbound.persona_id;
+        if !definition_linked {
+            local.system_prompt = inbound.system_prompt;
+            local.model = inbound.model;
+            local.provider = inbound.provider;
+            local.persona_source_version = inbound.persona_source_version;
+        }
+        local.parallelism = inbound.parallelism;
+        local.respond_to = inbound.respond_to;
+        local.respond_to_allowlist = inbound.respond_to_allowlist;
+    }
+}
+
+/// Merge an inbound kind:30176 team projection into the local set.
+///
+/// Matches the local record whose `id` equals the event's d-tag (the d-tag IS
+/// the team id — see `build_team_event`). On match, overwrite ONLY the three
+/// shared fields (`name`, `description`, `persona_ids`); install-specific local
+/// fields (`source_dir`, `is_symlink`, `symlink_target`, `is_builtin`,
+/// `version`, `created_at`) are preserved. On no match, insert a fresh record
+/// reusing the d-tag as the id so a re-received event stays idempotent —
+/// symmetric to the persona path, since a team (like a persona) is a secretless
+/// definition that another device may legitimately learn about from the relay.
+fn apply_inbound_team(teams: &mut Vec<TeamRecord>, d_tag: String, inbound: TeamEventContent) {
+    match teams.iter_mut().find(|record| record.id == d_tag) {
+        Some(local) => {
+            local.name = inbound.name;
+            local.description = inbound.description;
+            // `None` means the event came from a client that predates
+            // always-publish — its true value is unknown, so preserve
+            // local. Only `Some` (including the explicit-clear variants)
+            // overwrites. See `TeamEventContent` for the wire rules.
+            if let Some(instructions) = inbound.instructions {
+                local.instructions = instructions;
+            }
+            if let Some(persona_ids) = inbound.persona_ids {
+                local.persona_ids = persona_ids;
+            }
+        }
+        None => teams.push(TeamRecord {
+            id: d_tag,
+            name: inbound.name,
+            description: inbound.description,
+            // Fresh insert has no local value to preserve; `None` from a
+            // pre-fix client simply means no known value.
+            instructions: inbound.instructions.unwrap_or_default(),
+            persona_ids: inbound.persona_ids.unwrap_or_default(),
+            is_builtin: false,
+            source_dir: None,
+            is_symlink: false,
+            symlink_target: None,
+            version: None,
+            created_at: now_iso(),
+            updated_at: now_iso(),
+        }),
+    }
+}
diff --git a/desktop/src-tauri/src/commands/personas/inbound_tests.rs b/desktop/src-tauri/src/commands/personas/inbound/inbound_tests.rs
similarity index 99%
rename from desktop/src-tauri/src/commands/personas/inbound_tests.rs
rename to desktop/src-tauri/src/commands/personas/inbound/inbound_tests.rs
index 1000e48b70..1005a83432 100644
--- a/desktop/src-tauri/src/commands/personas/inbound_tests.rs
+++ b/desktop/src-tauri/src/commands/personas/inbound/inbound_tests.rs
@@ -20,8 +20,10 @@ fn local_in_app() -> AgentDefinition {
         name_pool: vec!["Local".to_string()],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: Some("team-1".to_string()),
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: BTreeMap::from([("API_KEY".to_string(), "secret".to_string())]),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -45,8 +47,10 @@ fn inbound_for(d_tag: &str, display_name: &str) -> AgentDefinition {
         name_pool: vec!["Remote".to_string()],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: Some(d_tag.to_string()),
+        catalog_source: None,
         env_vars: BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -203,8 +207,10 @@ fn local_agent() -> ManagedAgentRecord {
         name_pool: Vec::new(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         definition_respond_to: None,
         definition_respond_to_allowlist: Vec::new(),
         definition_parallelism: None,
diff --git a/desktop/src-tauri/src/commands/personas/mod.rs b/desktop/src-tauri/src/commands/personas/mod.rs
index 6437d4b1a8..66f7296a25 100644
--- a/desktop/src-tauri/src/commands/personas/mod.rs
+++ b/desktop/src-tauri/src/commands/personas/mod.rs
@@ -1,16 +1,12 @@
-use tauri::{AppHandle, Emitter, Manager};
-use uuid::Uuid;
+use tauri::AppHandle;
 
 use crate::{
     app_state::AppState,
     managed_agents::{
-        agent_events::ManagedAgentEventContent, apply_persona_behavior, current_instance_id,
-        delete_agent_key, effective_agent_command, load_managed_agents, load_personas, load_teams,
-        managed_agent_avatar_url, persona_events::persona_d_tag, save_managed_agents,
-        save_personas, stop_managed_agent_process, sync_managed_agent_processes,
-        team_events::TeamEventContent, try_regenerate_nest, validate_persona_activation_change,
-        validate_persona_deletion, AgentDefinition, CreatePersonaRequest, ManagedAgentRecord,
-        TeamRecord, UpdatePersonaRequest,
+        current_instance_id, delete_agent_key, load_managed_agents, load_personas, load_teams,
+        save_managed_agents, save_personas, stop_managed_agent_process,
+        sync_managed_agent_processes, try_regenerate_nest, validate_persona_activation_change,
+        validate_persona_deletion, AgentDefinition, ManagedAgentRecord,
     },
     util::now_iso,
 };
@@ -33,289 +29,35 @@ fn trim_optional(value: Option<String>) -> Option<String> {
 mod pending;
 pub(in crate::commands) use pending::retain_persona_pending;
 pub(super) use pending::tombstone_persona_pending;
+mod create;
+pub use create::create_persona;
+mod sharing;
+pub use sharing::set_persona_shared;
+pub use sharing::update_persona_and_publish;
+mod update;
+pub use update::update_persona;
+mod inbound;
+pub use inbound::reconcile_inbound_persona_event;
 
 #[tauri::command]
 pub async fn list_personas(app: AppHandle) -> Result<Vec<AgentDefinition>, String> {
     use tauri::Manager;
     tokio::task::spawn_blocking(move || {
         let state = app.state::<AppState>();
-        let _store_guard = state
-            .managed_agents_store_lock
-            .lock()
-            .map_err(|error| error.to_string())?;
-        load_personas(&app)
-    })
-    .await
-    .map_err(|e| format!("spawn_blocking failed: {e}"))?
-}
-
-#[tauri::command]
-pub async fn create_persona(
-    input: CreatePersonaRequest,
-    app: AppHandle,
-) -> Result<AgentDefinition, String> {
-    use tauri::Manager;
-    tokio::task::spawn_blocking(move || {
-        let state = app.state::<AppState>();
-        let display_name = trim_required(&input.display_name, "Display name")?;
-        // System prompt optional: core memory is auto-injected. Empty is valid.
-        let system_prompt = input.system_prompt.trim().to_string();
-        let avatar_url = trim_optional(input.avatar_url);
-        let runtime = trim_optional(input.runtime);
-        let model = trim_optional(input.model);
-        let provider = trim_optional(input.provider);
-        let now = now_iso();
         let _store_guard = state
             .managed_agents_store_lock
             .lock()
             .map_err(|error| error.to_string())?;
         let mut personas = load_personas(&app)?;
-        let name_pool: Vec<String> = input
-            .name_pool
-            .into_iter()
-            .map(|s| s.trim().to_string())
-            .filter(|s| !s.is_empty())
-            .collect();
-        crate::managed_agents::validate_user_env_keys(&input.env_vars)?;
-        let mut persona = AgentDefinition {
-            id: Uuid::new_v4().to_string(),
-            display_name,
-            avatar_url,
-            system_prompt,
-            runtime,
-            model,
-            provider,
-            name_pool,
-            is_builtin: false,
-            is_active: true,
-            source_team: None,
-            source_team_persona_slug: None,
-            env_vars: input.env_vars,
-            respond_to: None,
-            respond_to_allowlist: Vec::new(),
-            parallelism: None,
-            created_at: now.clone(),
-            updated_at: now,
-        };
-        apply_persona_behavior(&mut persona, input.behavior)?;
-        personas.push(persona.clone());
-        save_personas(&app, &personas)?;
-        retain_persona_pending(&app, &state, &persona);
-        try_regenerate_nest(&app);
-        Ok(persona)
+        pending::project_active_persona_sharing(&app, &state, &mut personas);
+        Ok(personas)
     })
     .await
     .map_err(|e| format!("spawn_blocking failed: {e}"))?
 }
 
-/// Return value of the `update_persona` command. Uses flatten so all
-/// `AgentDefinition` fields appear at the top level of the JSON response —
-/// backward-compatible with callers that already destructure a raw persona object.
-#[derive(Debug, serde::Serialize)]
-pub struct UpdatePersonaResult {
-    #[serde(flatten)]
-    persona: AgentDefinition,
-}
-
-/// Propagate a persona definition's display_name rename to linked agent instances.
-/// Only instances whose current `name` equals `old_display_name` are updated;
-/// pool-named instances (e.g. "Birch", "Compass") keep their individualised name.
-/// Updates both `record.name` (relay display name) and `record.display_name`.
-/// Returns the pubkeys of the records that were renamed.
-fn propagate_persona_name_rename(
-    records: &mut [ManagedAgentRecord],
-    persona_id: &str,
-    old_display_name: &str,
-    new_display_name: &str,
-) -> Vec<String> {
-    let mut renamed = Vec::new();
-    for record in records.iter_mut() {
-        if record.persona_id.as_deref() != Some(persona_id) {
-            continue;
-        }
-        if record.name != old_display_name {
-            continue; // pool-named instance — keep its individualised name
-        }
-        record.name = new_display_name.to_string();
-        record.display_name = Some(new_display_name.to_string());
-        renamed.push(record.pubkey.clone());
-    }
-    renamed
-}
-
-#[tauri::command]
-pub async fn update_persona(
-    input: UpdatePersonaRequest,
-    app: AppHandle,
-) -> Result<UpdatePersonaResult, String> {
-    use tauri::Manager;
-
-    /// Profile sync params collected under the store lock for async relay publish.
-    type ProfileSyncParams = Vec<(nostr::Keys, String, String, Option<String>, Option<String>)>;
-
-    // Phase 1: synchronous save (persona record + linked agent avatar updates)
-    let (result, profile_sync_params) = tokio::task::spawn_blocking({
-        let app = app.clone();
-        move || -> Result<(AgentDefinition, ProfileSyncParams), String> {
-            let state = app.state::<AppState>();
-            let display_name = trim_required(&input.display_name, "Display name")?;
-            let system_prompt = input.system_prompt.clone();
-            let avatar_url = trim_optional(input.avatar_url);
-            let runtime = trim_optional(input.runtime);
-            let model = trim_optional(input.model);
-            let provider = trim_optional(input.provider);
-
-            let _store_guard = state
-                .managed_agents_store_lock
-                .lock()
-                .map_err(|error| error.to_string())?;
-            let mut personas = load_personas(&app)?;
-            let persona = personas
-                .iter_mut()
-                .find(|record| record.id == input.id)
-                .ok_or_else(|| format!("agent {} not found", input.id))?;
-
-            // Track what changed so we can propagate to linked agent records.
-            let avatar_changed = persona.avatar_url != avatar_url;
-            let name_changed = persona.display_name != display_name;
-            let old_display_name = persona.display_name.clone();
-
-            persona.display_name = display_name;
-            persona.avatar_url = avatar_url;
-            persona.system_prompt = system_prompt;
-            persona.runtime = runtime;
-            persona.model = model;
-            persona.provider = provider;
-            persona.name_pool = input
-                .name_pool
-                .into_iter()
-                .map(|s| s.trim().to_string())
-                .filter(|s| !s.is_empty())
-                .collect();
-            if let Some(env_vars) = input.env_vars {
-                crate::managed_agents::validate_user_env_keys(&env_vars)?;
-                persona.env_vars = env_vars;
-            }
-            apply_persona_behavior(persona, input.behavior)?;
-            persona.updated_at = now_iso();
-
-            let result = persona.clone();
-            save_personas(&app, &personas)?;
-
-            retain_persona_pending(&app, &state, &result);
-            try_regenerate_nest(&app);
-
-            // If the avatar or display_name changed, propagate to linked agent
-            // records and collect relay profile sync params for the async phase.
-            let sync_params: ProfileSyncParams = if avatar_changed || name_changed {
-                let mut records = load_managed_agents(&app)?;
-                let mut params: ProfileSyncParams = Vec::new();
-                let mut agents_modified = false;
-                let workspace_relay = crate::relay::relay_ws_url_with_override(&state);
-
-                // Propagate the display_name rename to instances that still
-                // carry the old definition display_name (pool-named instances
-                // keep their individualised name) in one pass; the loop below
-                // only decides which records need a relay profile sync.
-                let renamed: Vec<String> = if name_changed {
-                    propagate_persona_name_rename(
-                        &mut records,
-                        &result.id,
-                        &old_display_name,
-                        &result.display_name,
-                    )
-                } else {
-                    Vec::new()
-                };
-
-                for record in records.iter_mut() {
-                    if record.persona_id.as_deref() != Some(&result.id) {
-                        continue;
-                    }
-                    let mut record_changed = renamed.contains(&record.pubkey);
-
-                    if avatar_changed {
-                        // Update the persisted avatar so reconciliation on next
-                        // start agrees with what we're about to publish.
-                        // When the persona avatar is cleared, fall back to the
-                        // command-default icon so the record never stores `None`
-                        // (which reconcile_agent_profile treats as "un-migrated").
-                        let effective_cmd = effective_agent_command(
-                            record.persona_id.as_deref(),
-                            std::slice::from_ref(&result),
-                            record.agent_command_override.as_deref(),
-                        );
-                        record.avatar_url = result
-                            .avatar_url
-                            .clone()
-                            .or_else(|| managed_agent_avatar_url(&effective_cmd));
-                        record_changed = true;
-                    }
-
-                    if record_changed {
-                        agents_modified = true;
-                        if let Ok(agent_keys) = nostr::Keys::parse(&record.private_key_nsec) {
-                            let relay_url = crate::relay::effective_agent_relay_url(
-                                &record.relay_url,
-                                &workspace_relay,
-                            );
-                            params.push((
-                                agent_keys,
-                                relay_url,
-                                record.name.clone(),
-                                record.avatar_url.clone(),
-                                record.auth_tag.clone(),
-                            ));
-                        }
-                    }
-                }
-
-                if agents_modified {
-                    save_managed_agents(&app, &records)?;
-                }
-
-                params
-            } else {
-                Vec::new()
-            };
-
-            Ok((result, sync_params))
-        }
-    })
-    .await
-    .map_err(|e| format!("spawn_blocking failed: {e}"))??;
-
-    // Phase 2: await relay profile sync for linked agents whose avatar or
-    // display_name was just updated. We await (rather than fire-and-forget)
-    // so the frontend cache invalidation that follows the mutation settlement
-    // sees the fresh relay profile. Best-effort — failures are logged, not surfaced.
-    if !profile_sync_params.is_empty() {
-        let state = app.state::<AppState>();
-        for (agent_keys, relay_url, display_name, avatar_url, auth_tag) in profile_sync_params {
-            if let Err(e) = crate::relay::sync_managed_agent_profile(
-                &state,
-                &relay_url,
-                &agent_keys,
-                &display_name,
-                avatar_url.as_deref(),
-                auth_tag.as_deref(),
-            )
-            .await
-            {
-                eprintln!("buzz-desktop: relay profile sync failed after persona update: {e}");
-            }
-        }
-    }
-
-    Ok(UpdatePersonaResult { persona: result })
-}
-
 #[cfg(test)]
 mod delete_cascade_tests;
-#[cfg(test)]
-mod inbound_tests;
-#[cfg(test)]
-mod name_propagation_tests;
 
 /// Return pubkeys of every managed agent whose definition is the given persona.
 ///
@@ -510,403 +252,6 @@ pub async fn delete_persona(id: String, app: AppHandle) -> Result<(), String> {
     .map_err(|e| format!("spawn_blocking failed: {e}"))?
 }
 
-/// Apply an inbound kind:30175 persona event from the relay onto the local
-/// store. The frontend's live subscription invokes this per event for our own
-/// authored coordinate so Device B inherits Device A's edits.
-///
-/// Retention is a sync channel that writes INTO `personas.json`, never an
-/// authoritative read source — `load_personas` is untouched, so every agent
-/// keeps resolving its persona by UUID and keeps its provider keys.
-///
-/// MATCH KEY (single source of truth, both directions): an inbound event
-/// matches the local record whose `persona_d_tag(record)` equals the event's
-/// d-tag. Reusing the same derivation the outbound path uses guarantees the
-/// inbound key can never drift from the outbound key — in particular, an
-/// in-app persona (`source_team_persona_slug == None`) whose d-tag IS its
-/// `id` matches its existing UUID row instead of minting a duplicate.
-///
-/// On match: patch ONLY the projected fields; preserve local `id`, `env_vars`,
-/// `source_team`, and `created_at`. On no match: insert the parsed record as-is
-/// — `persona_from_event` already sets `id = d_tag`, so an in-app persona reuses
-/// its d-tag as the id and a re-received event stays idempotent (no duplicate).
-///
-/// The retention store decides whether the inbound event wins over a pending
-/// local edit (`retain_inbound_event`): `personas.json` is only patched when the
-/// retain reports [`InboundOutcome::Applied`], so an equal-second collision with
-/// a pending local edit leaves the local record — and its queued publish —
-/// untouched.
-#[tauri::command]
-pub async fn reconcile_inbound_persona_event(
-    event_json: String,
-    app: AppHandle,
-) -> Result<(), String> {
-    tokio::task::spawn_blocking(move || reconcile_inbound_persona_event_blocking(event_json, app))
-        .await
-        .map_err(|e| format!("spawn_blocking failed: {e}"))?
-}
-
-fn reconcile_inbound_persona_event_blocking(
-    event_json: String,
-    app: AppHandle,
-) -> Result<(), String> {
-    use crate::managed_agents::{
-        agent_events::managed_agent_content_from_event,
-        load_managed_agents, load_teams, managed_agents_base_dir,
-        persona_events::persona_from_event,
-        retention::{open_retention_db, retain_inbound_event, InboundOutcome, RetainedEvent},
-        save_managed_agents, save_teams,
-        team_events::team_content_from_event,
-    };
-    use buzz_core_pkg::kind::{KIND_DELETION, KIND_MANAGED_AGENT, KIND_PERSONA, KIND_TEAM};
-    use nostr::JsonUtil;
-
-    let state = app.state::<AppState>();
-    let event = parse_verified_inbound_event(&event_json)?;
-
-    // The live filter subscribes to 30175/30176/30177 (upserts) plus kind:5
-    // (NIP-09 deletions). d-tags are NOT unique across kinds, so every path
-    // below dispatches on kind FIRST and only ever touches its own store — a
-    // cross-kind d-tag collision can never link a team to a persona or agent.
-    let kind = event.kind.as_u16() as u32;
-
-    // kind:5 deletion: a tombstone removes the local record at the coordinate
-    // in its `a` tag (`<target_kind>:<owner>:<d_tag>`). Handled before the
-    // upsert dispatch because its coordinate and retention key differ.
-    if kind == KIND_DELETION {
-        return reconcile_inbound_tombstone(&event, &app, &state);
-    }
-
-    if !matches!(kind, KIND_PERSONA | KIND_TEAM | KIND_MANAGED_AGENT) {
-        return Ok(());
-    }
-
-    // The d-tag identifies the record within its kind. Persona derives it from
-    // the parsed record (`persona_d_tag`); team/agent carry it as the event's
-    // d-tag directly. The persona is parsed once here and reused in the apply
-    // branch below — team/agent content is parsed in-branch since their d-tag
-    // comes from the event tag, not the content.
-    let inbound_persona = (kind == KIND_PERSONA)
-        .then(|| persona_from_event(&event))
-        .transpose()?;
-    let d_tag = match &inbound_persona {
-        Some(persona) => persona_d_tag(persona),
-        None => event_d_tag(&event)?,
-    };
-
-    let _store_guard = state
-        .managed_agents_store_lock
-        .lock()
-        .map_err(|error| error.to_string())?;
-
-    // Resolve inbound vs. any pending local edit before touching the store.
-    let conn = open_retention_db(&managed_agents_base_dir(&app)?.join("retention.db"))?;
-    let outcome = retain_inbound_event(
-        &conn,
-        &RetainedEvent {
-            kind,
-            pubkey: event.pubkey.to_hex(),
-            d_tag: d_tag.clone(),
-            content: event.content.to_string(),
-            created_at: event.created_at.as_secs() as i64,
-            raw_event: event.as_json(),
-            pending_sync: false,
-        },
-    )?;
-    if outcome == InboundOutcome::Skipped {
-        return Ok(());
-    }
-
-    match kind {
-        KIND_PERSONA => {
-            let mut personas = load_personas(&app)?;
-            // `inbound_persona` is `Some` for KIND_PERSONA (set above).
-            apply_inbound_persona(
-                &mut personas,
-                inbound_persona.expect("persona parsed above"),
-            );
-            save_personas(&app, &personas)?;
-        }
-        KIND_TEAM => {
-            let mut teams = load_teams(&app)?;
-            apply_inbound_team(&mut teams, d_tag, team_content_from_event(&event)?);
-            save_teams(&app, &teams)?;
-        }
-        KIND_MANAGED_AGENT => {
-            let mut agents = load_managed_agents(&app)?;
-            apply_inbound_managed_agent(
-                &mut agents,
-                &d_tag,
-                managed_agent_content_from_event(&event)?,
-            );
-            save_managed_agents(&app, &agents)?;
-        }
-        _ => unreachable!("kind gated above"),
-    }
-    try_regenerate_nest(&app);
-
-    // Signal the live UI to refetch agents data — inbound relay events otherwise
-    // land on disk silently, leaving the Agents tab stale until restart.
-    let _ = app.emit("agents-data-changed", ());
-
-    Ok(())
-}
-
-/// Parse an inbound wire event and enforce the signature gate. Everything
-/// downstream trusts `event.pubkey` (ownership routing, tombstone scoping,
-/// behavioral-quad application), so a forged pubkey must die here — the
-/// TS-side owner filter reads the same attacker-controlled field and is no
-/// defense.
-fn parse_verified_inbound_event(event_json: &str) -> Result<nostr::Event, String> {
-    use nostr::JsonUtil;
-    let event = nostr::Event::from_json(event_json)
-        .map_err(|e| format!("failed to parse inbound event: {e}"))?;
-    event
-        .verify()
-        .map_err(|e| format!("inbound event failed signature verification: {e}"))?;
-    Ok(event)
-}
-
-/// Parse a NIP-09 `a`-tag coordinate `<kind>:<owner_pubkey>:<d_tag>` into its
-/// target kind and d-tag. Returns `None` if the tag is absent or malformed, so
-/// the caller no-ops on a tombstone it can't route.
-fn parse_deletion_coordinate(event: &nostr::Event) -> Option<(u32, String)> {
-    event.tags.iter().find_map(|tag| {
-        let values: Vec<&str> = tag.as_slice().iter().map(|s| s.as_str()).collect();
-        if values.first() != Some(&"a") {
-            return None;
-        }
-        let coord = values.get(1)?;
-        // `<kind>:<owner>:<d_tag>` — d_tag may itself contain ':' so split at
-        // most twice and keep the remainder as the d_tag.
-        let mut parts = coord.splitn(3, ':');
-        let kind: u32 = parts.next()?.parse().ok()?;
-        let owner = parts.next()?;
-        // NIP-09 scoping: only the record's author may tombstone it. The
-        // signature gate upstream proves `event.pubkey`; requiring the
-        // coordinate owner to match closes the other half — a validly
-        // signed kind:5 naming ANOTHER owner's coordinate must no-op.
-        if owner != event.pubkey.to_hex() {
-            return None;
-        }
-        let d_tag = parts.next()?;
-        Some((kind, d_tag.to_string()))
-    })
-}
-
-/// Apply an inbound kind:5 NIP-09 deletion: remove the local record at the
-/// tombstone's target coordinate, scoped per-kind. Mirrors the upsert spine —
-/// retention resolution under the store lock, then a per-kind store mutation —
-/// but removes rather than patches. Unknown/malformed coordinates no-op.
-fn reconcile_inbound_tombstone(
-    event: &nostr::Event,
-    app: &AppHandle,
-    state: &AppState,
-) -> Result<(), String> {
-    use crate::managed_agents::{
-        load_managed_agents, load_teams, managed_agents_base_dir,
-        retention::{
-            open_retention_db, retain_inbound_event, tombstone_retention_d_tag, InboundOutcome,
-            RetainedEvent,
-        },
-        save_managed_agents, save_teams,
-    };
-    use buzz_core_pkg::kind::{KIND_DELETION, KIND_MANAGED_AGENT, KIND_PERSONA, KIND_TEAM};
-    use nostr::JsonUtil;
-
-    let Some((target_kind, target_d_tag)) = parse_deletion_coordinate(event) else {
-        return Ok(()); // no routable coordinate — nothing to delete
-    };
-    if !matches!(target_kind, KIND_PERSONA | KIND_TEAM | KIND_MANAGED_AGENT) {
-        return Ok(()); // deletion for a kind we don't track locally
-    }
-
-    let _store_guard = state
-        .managed_agents_store_lock
-        .lock()
-        .map_err(|error| error.to_string())?;
-
-    // Resolve against the retained tombstone row (keyed by the target
-    // coordinate, F2c) so a re-received tombstone or one older than a pending
-    // local edit is a no-op.
-    let conn = open_retention_db(&managed_agents_base_dir(app)?.join("retention.db"))?;
-    let outcome = retain_inbound_event(
-        &conn,
-        &RetainedEvent {
-            kind: KIND_DELETION,
-            pubkey: event.pubkey.to_hex(),
-            d_tag: tombstone_retention_d_tag(target_kind, &target_d_tag),
-            content: event.content.to_string(),
-            created_at: event.created_at.as_secs() as i64,
-            raw_event: event.as_json(),
-            pending_sync: false,
-        },
-    )?;
-    if outcome == InboundOutcome::Skipped {
-        return Ok(());
-    }
-
-    // Remove the local record using the SAME per-kind match rule the apply fns
-    // use: persona by `persona_d_tag`, team by `id`, managed-agent by `pubkey`.
-    match target_kind {
-        KIND_PERSONA => {
-            let mut personas = load_personas(app)?;
-            personas.retain(|record| persona_d_tag(record) != target_d_tag);
-            save_personas(app, &personas)?;
-        }
-        KIND_TEAM => {
-            let mut teams = load_teams(app)?;
-            teams.retain(|record| record.id != target_d_tag);
-            save_teams(app, &teams)?;
-        }
-        KIND_MANAGED_AGENT => {
-            let mut agents = load_managed_agents(app)?;
-            agents.retain(|record| record.pubkey != target_d_tag);
-            save_managed_agents(app, &agents)?;
-        }
-        _ => unreachable!("target kind gated above"),
-    }
-    try_regenerate_nest(app);
-
-    // Refresh the live UI on inbound deletion — a removal is as user-visible as
-    // an upsert and the Agents tab must drop the tombstoned record without restart.
-    let _ = app.emit("agents-data-changed", ());
-
-    Ok(())
-}
-
-/// Extract the `d` tag value from an event, the match key for team (= team id)
-/// and managed-agent (= agent pubkey) inbound reconcile.
-fn event_d_tag(event: &nostr::Event) -> Result<String, String> {
-    event
-        .tags
-        .iter()
-        .find_map(|tag| {
-            let values: Vec<&str> = tag.as_slice().iter().map(|s| s.as_str()).collect();
-            (values.first() == Some(&"d"))
-                .then(|| values.get(1).map(|s| s.to_string()))
-                .flatten()
-        })
-        .ok_or_else(|| "inbound event missing d-tag".to_string())
-}
-
-/// Merge a parsed inbound persona into the local set: patch the matching record
-/// in place, or push it when none matches.
-///
-/// The match key is `persona_d_tag` — the same derivation the outbound path
-/// uses — so the inbound and outbound keys can never drift. On match, only the
-/// projected fields are overwritten; local `id`, `env_vars`, `source_team`, and
-/// `created_at` survive. On no match, the parsed record is inserted as-is; since
-/// `persona_from_event` sets `id = d_tag`, an in-app persona reuses its d-tag as
-/// the id and a re-received event stays idempotent (no duplicate row).
-fn apply_inbound_persona(personas: &mut Vec<AgentDefinition>, inbound: AgentDefinition) {
-    let d_tag = persona_d_tag(&inbound);
-    match personas
-        .iter_mut()
-        .find(|record| persona_d_tag(record) == d_tag)
-    {
-        Some(local) => {
-            local.display_name = inbound.display_name;
-            local.avatar_url = inbound.avatar_url;
-            local.system_prompt = inbound.system_prompt;
-            local.runtime = inbound.runtime;
-            local.model = inbound.model;
-            local.provider = inbound.provider;
-            local.name_pool = inbound.name_pool;
-            local.respond_to = inbound.respond_to;
-            local.respond_to_allowlist = inbound.respond_to_allowlist;
-            local.parallelism = inbound.parallelism;
-            local.updated_at = inbound.updated_at;
-        }
-        None => personas.push(inbound),
-    }
-}
-
-/// Merge an inbound kind:30177 managed-agent projection into the local set.
-///
-/// Matches the local record whose `pubkey` equals the event's d-tag (the d-tag
-/// IS the agent pubkey — see `build_agent_event`). On match, overwrite ONLY the
-/// 10 projected fields; every secret (`private_key_nsec`, `auth_tag`,
-/// `env_vars`, `backend`), the harness pins (`agent_command`,
-/// `agent_command_override`), and all runtime/local fields are preserved
-/// untouched. The projection type carries none of them, so they cannot be
-/// reached here even if a foreign event tried to inject them.
-///
-/// No match is a no-op: managed agents carry device-local secrets and are never
-/// minted from a relay event — an agent that does not already exist locally has
-/// no secret key to run with, so inserting a secretless shell would be useless
-/// and misleading. This diverges from the persona path, which DOES insert on no
-/// match (personas are secretless definitions). Flagged in the reconcile docs.
-fn apply_inbound_managed_agent(
-    agents: &mut [ManagedAgentRecord],
-    d_tag: &str,
-    inbound: ManagedAgentEventContent,
-) {
-    if let Some(local) = agents.iter_mut().find(|record| record.pubkey == d_tag) {
-        local.name = inbound.name;
-        // Mirror of the slimmed writer (agent_event_content): a
-        // definition-linked event omits the definition quad because those
-        // fields resolve through the kind:30175 definition — absent means
-        // "not carried", never "clear". Definition-less events still carry
-        // the quad and apply it unconditionally (including clears).
-        let definition_linked = inbound.persona_id.is_some();
-        local.persona_id = inbound.persona_id;
-        if !definition_linked {
-            local.system_prompt = inbound.system_prompt;
-            local.model = inbound.model;
-            local.provider = inbound.provider;
-            local.persona_source_version = inbound.persona_source_version;
-        }
-        local.parallelism = inbound.parallelism;
-        local.respond_to = inbound.respond_to;
-        local.respond_to_allowlist = inbound.respond_to_allowlist;
-    }
-}
-
-/// Merge an inbound kind:30176 team projection into the local set.
-///
-/// Matches the local record whose `id` equals the event's d-tag (the d-tag IS
-/// the team id — see `build_team_event`). On match, overwrite ONLY the three
-/// shared fields (`name`, `description`, `persona_ids`); install-specific local
-/// fields (`source_dir`, `is_symlink`, `symlink_target`, `is_builtin`,
-/// `version`, `created_at`) are preserved. On no match, insert a fresh record
-/// reusing the d-tag as the id so a re-received event stays idempotent —
-/// symmetric to the persona path, since a team (like a persona) is a secretless
-/// definition that another device may legitimately learn about from the relay.
-fn apply_inbound_team(teams: &mut Vec<TeamRecord>, d_tag: String, inbound: TeamEventContent) {
-    match teams.iter_mut().find(|record| record.id == d_tag) {
-        Some(local) => {
-            local.name = inbound.name;
-            local.description = inbound.description;
-            // `None` means the event came from a client that predates
-            // always-publish — its true value is unknown, so preserve
-            // local. Only `Some` (including the explicit-clear variants)
-            // overwrites. See `TeamEventContent` for the wire rules.
-            if let Some(instructions) = inbound.instructions {
-                local.instructions = instructions;
-            }
-            if let Some(persona_ids) = inbound.persona_ids {
-                local.persona_ids = persona_ids;
-            }
-        }
-        None => teams.push(TeamRecord {
-            id: d_tag,
-            name: inbound.name,
-            description: inbound.description,
-            // Fresh insert has no local value to preserve; `None` from a
-            // pre-fix client simply means no known value.
-            instructions: inbound.instructions.unwrap_or_default(),
-            persona_ids: inbound.persona_ids.unwrap_or_default(),
-            is_builtin: false,
-            source_dir: None,
-            is_symlink: false,
-            symlink_target: None,
-            version: None,
-            created_at: now_iso(),
-            updated_at: now_iso(),
-        }),
-    }
-}
-
 #[tauri::command]
 pub async fn set_persona_active(
     id: String,
diff --git a/desktop/src-tauri/src/commands/personas/pending.rs b/desktop/src-tauri/src/commands/personas/pending.rs
index 4d887ca39e..a4003329bc 100644
--- a/desktop/src-tauri/src/commands/personas/pending.rs
+++ b/desktop/src-tauri/src/commands/personas/pending.rs
@@ -5,7 +5,17 @@
 use tauri::AppHandle;
 
 use crate::app_state::AppState;
-use crate::managed_agents::AgentDefinition;
+use crate::managed_agents::{
+    retention::{RetainedEvent, RetentionScope},
+    AgentDefinition,
+};
+
+pub(super) struct PreparedPersonaPublication {
+    pub scope: RetentionScope,
+    pub event: nostr::Event,
+    pub retained: RetainedEvent,
+    pub persona: AgentDefinition,
+}
 
 /// Retain a freshly authored persona event in the local store, flagged for
 /// relay sync. Called inside a command's `managed_agents_store_lock`-held body
@@ -16,58 +26,162 @@ use crate::managed_agents::AgentDefinition;
 /// newer-or-equal guard. `pending_sync = 1` enqueues it for the flush loop,
 /// which is the sole publisher. Best-effort: a failure here is logged and
 /// swallowed so a retention hiccup never blocks the disk-authoritative write.
+/// The explicit catalog toggle uses [`prepare_persona_publication`] directly
+/// so its durable enqueue failure reaches the UI.
 ///
 /// Unlike `retain_managed_agent_pending`, this has no projection-equality
 /// short-circuit: personas have no start/stop runtime churn, so a republish
-/// only happens on a genuine create/update/delete user edit (`set_persona_active`
-/// does not retain, so the local-only `is_active` toggle never republishes, and
-/// a byte-identical user-save republish is harmlessly NIP-33-replaced). The
-/// guard is intentionally omitted.
+/// only happens on a genuine create/update/delete/share user edit
+/// (`set_persona_active` does not retain, so the local-only `is_active` toggle
+/// never republishes, while `set_persona_shared` must retain because the tag is
+/// relay-authoritative). A byte-identical user-save republish is harmlessly
+/// NIP-33-replaced. The guard is intentionally omitted.
 pub(in crate::commands) fn retain_persona_pending(
     app: &AppHandle,
     state: &AppState,
     persona: &AgentDefinition,
 ) {
+    if let Err(e) = prepare_persona_publication(app, state, persona, None) {
+        eprintln!("buzz-desktop: persona-retain: {e}");
+    }
+}
+
+/// Build, sign, and durably retain a persona event in the active relay+owner
+/// scope.
+///
+/// Ordinary definition writes pass `None` and preserve the scoped head's
+/// exact share tag. The explicit share toggle passes `Some(shared)`. Returning
+/// the retained event lets that command immediately await relay acceptance
+/// without rebuilding or re-signing a different NIP-33 head.
+pub(super) fn prepare_persona_publication(
+    app: &AppHandle,
+    state: &AppState,
+    persona: &AgentDefinition,
+    shared_override: Option<bool>,
+) -> Result<PreparedPersonaPublication, String> {
+    let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
+    let (event, retained, persona) = prepare_persona_publication_at(
+        &scope.db_path,
+        &scope.owner_keys,
+        persona,
+        shared_override,
+    )?;
+    Ok(PreparedPersonaPublication {
+        scope,
+        event,
+        retained,
+        persona,
+    })
+}
+
+fn retained_persona_is_shared(row: Option<&RetainedEvent>) -> bool {
+    use buzz_core_pkg::kind::persona_event_is_shared;
+    use nostr::JsonUtil;
+
+    row.and_then(|retained| nostr::Event::from_json(&retained.raw_event).ok())
+        .is_some_and(|event| persona_event_is_shared(&event))
+}
+
+/// Project each persona's catalog visibility from the active relay+owner
+/// scope's retained head.
+///
+/// Infallible by design. The scope needs `signing_keys()`, which fails for the
+/// whole process whenever the identity is lost or the keyring is locked, and a
+/// propagated error there would break listing, creating, and updating EVERY
+/// agent. Share state is a view projection, so an unresolvable scope degrades
+/// to "not shared" — the safe direction: it can under-report visibility but can
+/// never present an unshared persona as published. The durable share state
+/// lives in the retention head, so nothing is lost: the true value reappears
+/// once the identity is signable again.
+pub(super) fn project_active_persona_sharing(
+    app: &AppHandle,
+    state: &AppState,
+    personas: &mut [AgentDefinition],
+) {
+    let scope = crate::managed_agents::retention::active_retention_scope(app, state);
+    project_scoped_persona_sharing(scope, personas);
+}
+
+fn project_scoped_persona_sharing(
+    scope: Result<RetentionScope, String>,
+    personas: &mut [AgentDefinition],
+) {
+    let projected = scope.and_then(|scope| {
+        project_persona_sharing_at(
+            &scope.db_path,
+            &scope.owner_keys.public_key().to_hex(),
+            personas,
+        )
+    });
+    if let Err(error) = projected {
+        eprintln!("buzz-desktop: persona-share-projection unavailable, reporting every agent as unshared: {error}");
+        for persona in personas {
+            persona.shared = false;
+        }
+    }
+}
+
+fn project_persona_sharing_at(
+    db_path: &std::path::Path,
+    owner_pubkey: &str,
+    personas: &mut [AgentDefinition],
+) -> Result<(), String> {
+    use crate::managed_agents::{
+        persona_events::persona_d_tag,
+        retention::{get_retained_event, open_retention_db},
+    };
+    use buzz_core_pkg::kind::KIND_PERSONA;
+
+    let conn = open_retention_db(db_path)?;
+    for persona in personas {
+        if persona.is_builtin {
+            persona.shared = false;
+            continue;
+        }
+        let retained =
+            get_retained_event(&conn, KIND_PERSONA, owner_pubkey, &persona_d_tag(persona))?;
+        persona.shared = retained_persona_is_shared(retained.as_ref());
+    }
+    Ok(())
+}
+
+pub(super) fn prepare_persona_publication_at(
+    db_path: &std::path::Path,
+    keys: &nostr::Keys,
+    persona: &AgentDefinition,
+    shared_override: Option<bool>,
+) -> Result<(nostr::Event, RetainedEvent, AgentDefinition), String> {
     use crate::managed_agents::{
-        managed_agents_base_dir,
         persona_events::{build_persona_event, monotonic_created_at, persona_d_tag},
         retention::{get_retained_event, open_retention_db, retain_event, RetainedEvent},
     };
     use buzz_core_pkg::kind::KIND_PERSONA;
     use nostr::JsonUtil;
 
-    let result = (|| -> Result<(), String> {
-        let d_tag = persona_d_tag(persona);
-        let conn = open_retention_db(&managed_agents_base_dir(app)?.join("retention.db"))?;
-        let (pubkey, event) = {
-            let keys = state.keys.lock().map_err(|e| e.to_string())?;
-            // Monotonic created_at: read the retained head for this coordinate
-            // and bump past it (NIP-AP step 3) so a same-second edit supersedes.
-            let prior =
-                get_retained_event(&conn, KIND_PERSONA, &keys.public_key().to_hex(), &d_tag)?
-                    .map(|row| row.created_at);
-            let event = build_persona_event(persona)?
-                .custom_created_at(monotonic_created_at(prior))
-                .sign_with_keys(&keys)
-                .map_err(|e| format!("failed to sign persona event: {e}"))?;
-            (keys.public_key().to_hex(), event)
-        };
-        retain_event(
-            &conn,
-            &RetainedEvent {
-                kind: KIND_PERSONA,
-                pubkey,
-                d_tag,
-                content: event.content.to_string(),
-                created_at: event.created_at.as_secs() as i64,
-                raw_event: event.as_json(),
-                pending_sync: true,
-            },
-        )
-    })();
-    if let Err(e) = result {
-        eprintln!("buzz-desktop: persona-retain: {e}");
-    }
+    let d_tag = persona_d_tag(persona);
+    let pubkey = keys.public_key().to_hex();
+    let conn = open_retention_db(db_path)?;
+    let existing = get_retained_event(&conn, KIND_PERSONA, &pubkey, &d_tag)?;
+    let mut scoped_persona = persona.clone();
+    scoped_persona.shared =
+        shared_override.unwrap_or_else(|| retained_persona_is_shared(existing.as_ref()));
+    let event = build_persona_event(&scoped_persona)?
+        .custom_created_at(monotonic_created_at(
+            existing.as_ref().map(|row| row.created_at),
+        ))
+        .sign_with_keys(keys)
+        .map_err(|e| format!("failed to sign persona event: {e}"))?;
+    let retained = RetainedEvent {
+        kind: KIND_PERSONA,
+        pubkey,
+        d_tag,
+        content: event.content.to_string(),
+        created_at: event.created_at.as_secs() as i64,
+        raw_event: event.as_json(),
+        pending_sync: true,
+    };
+    retain_event(&conn, &retained)?;
+    Ok((event, retained, scoped_persona))
 }
 
 /// Purge a deleted persona's pending row and enqueue a NIP-09 tombstone, both
@@ -88,7 +202,6 @@ pub(in crate::commands) fn tombstone_persona_pending(
     d_tag: &str,
 ) {
     use crate::managed_agents::{
-        managed_agents_base_dir,
         persona_events::build_persona_delete,
         retention::{
             delete_retained_event, open_retention_db, retain_event, tombstone_retention_d_tag,
@@ -101,15 +214,12 @@ pub(in crate::commands) fn tombstone_persona_pending(
     const KIND_DELETE: u32 = 5;
 
     let result = (|| -> Result<(), String> {
-        let (pubkey, event) = {
-            let keys = state.keys.lock().map_err(|e| e.to_string())?;
-            let pubkey = keys.public_key().to_hex();
-            let event = build_persona_delete(d_tag, &pubkey)?
-                .sign_with_keys(&keys)
-                .map_err(|e| format!("failed to sign persona tombstone: {e}"))?;
-            (pubkey, event)
-        };
-        let conn = open_retention_db(&managed_agents_base_dir(app)?.join("retention.db"))?;
+        let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
+        let pubkey = scope.owner_keys.public_key().to_hex();
+        let event = build_persona_delete(d_tag, &pubkey)?
+            .sign_with_keys(&scope.owner_keys)
+            .map_err(|e| format!("failed to sign persona tombstone: {e}"))?;
+        let conn = open_retention_db(&scope.db_path)?;
         // Purge the persona row first so an unpublished edit can never resurrect
         // it after the tombstone publishes.
         delete_retained_event(&conn, KIND_PERSONA, &pubkey, d_tag)?;
@@ -132,3 +242,158 @@ pub(in crate::commands) fn tombstone_persona_pending(
         eprintln!("buzz-desktop: persona-tombstone: {e}");
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::managed_agents::retention::{
+        get_retained_event, open_retention_db, scoped_retention_db_path,
+    };
+    use buzz_core_pkg::kind::KIND_PERSONA;
+    use std::collections::BTreeMap;
+
+    fn persona() -> AgentDefinition {
+        AgentDefinition {
+            id: "catalog-reviewer".to_string(),
+            display_name: "Catalog Reviewer".to_string(),
+            avatar_url: None,
+            system_prompt: "Review the catalog.".to_string(),
+            runtime: None,
+            model: None,
+            provider: None,
+            name_pool: Vec::new(),
+            is_builtin: false,
+            is_active: true,
+            shared: false,
+            source_team: None,
+            source_team_persona_slug: None,
+            catalog_source: None,
+            env_vars: BTreeMap::new(),
+            respond_to: None,
+            respond_to_allowlist: Vec::new(),
+            parallelism: None,
+            created_at: "2026-07-27T00:00:00Z".to_string(),
+            updated_at: "2026-07-27T00:00:00Z".to_string(),
+        }
+    }
+
+    #[test]
+    fn share_state_and_pending_heads_are_scoped_by_relay_and_owner() {
+        let dir = tempfile::tempdir().unwrap();
+        let keys = nostr::Keys::generate();
+        let owner = keys.public_key().to_hex();
+        let community_a = scoped_retention_db_path(dir.path(), "wss://a.example", &owner);
+        let community_b = scoped_retention_db_path(dir.path(), "wss://b.example", &owner);
+        std::fs::create_dir_all(community_a.parent().unwrap()).unwrap();
+
+        let (_, _, shared_in_a) =
+            prepare_persona_publication_at(&community_a, &keys, &persona(), Some(true)).unwrap();
+        assert!(shared_in_a.shared);
+
+        let (_, _, unshared_in_b) =
+            prepare_persona_publication_at(&community_b, &keys, &persona(), None).unwrap();
+        assert!(!unshared_in_b.shared);
+
+        let mut edited = persona();
+        edited.system_prompt = "Review the latest catalog.".to_string();
+        let (_, _, edited_in_a) =
+            prepare_persona_publication_at(&community_a, &keys, &edited, None).unwrap();
+        assert!(
+            edited_in_a.shared,
+            "ordinary edits preserve only the active scope's share choice"
+        );
+
+        let conn_a = open_retention_db(&community_a).unwrap();
+        let conn_b = open_retention_db(&community_b).unwrap();
+        assert!(retained_persona_is_shared(
+            get_retained_event(&conn_a, KIND_PERSONA, &owner, "catalog-reviewer")
+                .unwrap()
+                .as_ref()
+        ));
+        assert!(!retained_persona_is_shared(
+            get_retained_event(&conn_b, KIND_PERSONA, &owner, "catalog-reviewer")
+                .unwrap()
+                .as_ref()
+        ));
+    }
+
+    /// A `shared = true` persona plus the scope that says so.
+    fn shared_persona_scope(dir: &std::path::Path) -> (RetentionScope, Vec<AgentDefinition>) {
+        let keys = nostr::Keys::generate();
+        let db_path = scoped_retention_db_path(dir, "wss://a.example", &keys.public_key().to_hex());
+        std::fs::create_dir_all(db_path.parent().unwrap()).unwrap();
+        prepare_persona_publication_at(&db_path, &keys, &persona(), Some(true)).unwrap();
+        (
+            RetentionScope {
+                db_path,
+                relay_url: "wss://a.example".to_string(),
+                owner_keys: keys,
+            },
+            vec![persona()],
+        )
+    }
+
+    #[test]
+    fn test_resolvable_scope_projects_the_retained_share_state() {
+        let dir = tempfile::tempdir().unwrap();
+        let (scope, mut personas) = shared_persona_scope(dir.path());
+
+        project_scoped_persona_sharing(Ok(scope), &mut personas);
+
+        assert!(personas[0].shared);
+    }
+
+    #[test]
+    fn test_recovery_mode_identity_projects_unshared_instead_of_failing() {
+        let dir = tempfile::tempdir().unwrap();
+        let (_scope, mut personas) = shared_persona_scope(dir.path());
+        personas[0].shared = true;
+
+        // The real recovery-mode failure: `active_retention_scope` cannot
+        // resolve a scope without signing keys, which is exactly what
+        // `identity_lost` / `keyring_locked` withhold.
+        let state = crate::app_state::build_app_state();
+        state
+            .identity_lost
+            .store(true, std::sync::atomic::Ordering::Release);
+        let error = state
+            .signing_keys()
+            .expect_err("recovery mode must withhold signing keys");
+
+        project_scoped_persona_sharing(Err(error), &mut personas);
+
+        assert!(
+            !personas[0].shared,
+            "an unresolvable scope degrades to unshared so list/create/update keep working"
+        );
+    }
+
+    #[test]
+    fn test_unopenable_retention_db_projects_unshared_instead_of_failing() {
+        let dir = tempfile::tempdir().unwrap();
+        let keys = nostr::Keys::generate();
+        let mut personas = vec![persona()];
+        personas[0].shared = true;
+
+        project_scoped_persona_sharing(
+            Ok(RetentionScope {
+                // A directory cannot be opened as the retention database.
+                db_path: dir.path().to_path_buf(),
+                relay_url: "wss://a.example".to_string(),
+                owner_keys: keys,
+            }),
+            &mut personas,
+        );
+
+        assert!(!personas[0].shared);
+    }
+
+    #[test]
+    fn explicit_share_enqueue_failure_is_returned() {
+        let dir = tempfile::tempdir().unwrap();
+        let keys = nostr::Keys::generate();
+        let error = prepare_persona_publication_at(dir.path(), &keys, &persona(), Some(true))
+            .expect_err("a directory cannot be opened as the retention database");
+        assert!(error.contains("failed to open retention db"));
+    }
+}
diff --git a/desktop/src-tauri/src/commands/personas/sharing.rs b/desktop/src-tauri/src/commands/personas/sharing.rs
new file mode 100644
index 0000000000..914c56252d
--- /dev/null
+++ b/desktop/src-tauri/src/commands/personas/sharing.rs
@@ -0,0 +1,391 @@
+use tauri::{AppHandle, Manager};
+
+use crate::{
+    app_state::AppState,
+    managed_agents::{
+        load_personas,
+        retention::{mark_synced, open_retention_db},
+        AgentDefinition,
+    },
+};
+
+use super::pending::{prepare_persona_publication, PreparedPersonaPublication};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum PersonaSharePublicationStatus {
+    Published,
+    Queued,
+}
+
+#[derive(Debug, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SetPersonaSharedResult {
+    pub persona: AgentDefinition,
+    pub publication_status: PersonaSharePublicationStatus,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub relay_message: Option<String>,
+}
+
+#[tauri::command]
+pub async fn set_persona_shared(
+    id: String,
+    shared: bool,
+    app: AppHandle,
+) -> Result<SetPersonaSharedResult, String> {
+    let prepared = tokio::task::spawn_blocking({
+        let app = app.clone();
+        move || {
+            let state = app.state::<AppState>();
+            let _store_guard = state
+                .managed_agents_store_lock
+                .lock()
+                .map_err(|error| error.to_string())?;
+            let personas = load_personas(&app)?;
+            let persona = personas
+                .iter()
+                .find(|record| record.id == id)
+                .ok_or_else(|| format!("agent {id} not found"))?;
+
+            if persona.is_builtin {
+                return Err("Built-in agents cannot be shared to the catalog.".to_string());
+            }
+
+            // Strict path: unlike ordinary definition saves, an enqueue failure
+            // for this privacy-sensitive toggle must reach the command/UI.
+            prepare_persona_publication(&app, &state, persona, Some(shared))
+        }
+    })
+    .await
+    .map_err(|e| format!("spawn_blocking failed: {e}"))??;
+
+    let state = app.state::<AppState>();
+    publish_prepared_persona(&state, prepared).await
+}
+
+/// Save a persona edit AND publish its catalog head, returning the same
+/// `published | queued` outcome as [`set_persona_shared`].
+///
+/// The "save and publish" affordance in the edit dialog promises the change
+/// reaches the catalog on save. Plain `update_persona` only enqueues
+/// best-effort, so the UI could not report whether the relay accepted it. This
+/// takes the identical input and reuses the strict preparation path, then awaits
+/// the relay exactly like the share toggle does — a rejection or an unreachable
+/// relay stays durably queued for the flush loop and is reported as `queued`.
+#[tauri::command]
+pub async fn update_persona_and_publish(
+    input: crate::managed_agents::UpdatePersonaRequest,
+    app: AppHandle,
+) -> Result<SetPersonaSharedResult, String> {
+    let (_, prepared) =
+        super::update::update_persona_with(input, app.clone(), |app, state, persona| {
+            // Strict path: this command's contract is to report the publication
+            // outcome, so an enqueue failure must reach the UI rather than being
+            // logged and swallowed.
+            prepare_persona_publication(app, state, persona, None)
+        })
+        .await?;
+
+    let state = app.state::<AppState>();
+    publish_prepared_persona(&state, prepared).await
+}
+
+async fn publish_prepared_persona(
+    state: &AppState,
+    prepared: PreparedPersonaPublication,
+) -> Result<SetPersonaSharedResult, String> {
+    let api_base_url = crate::relay::relay_http_base_url(&prepared.scope.relay_url);
+    let publish_result = crate::relay::submit_signed_event_at_with_keys(
+        &prepared.event,
+        state,
+        &api_base_url,
+        &prepared.scope.owner_keys,
+    )
+    .await;
+
+    match publish_result {
+        Ok(_) => {
+            let conn = open_retention_db(&prepared.scope.db_path)?;
+            mark_synced(
+                &conn,
+                prepared.retained.kind,
+                &prepared.retained.pubkey,
+                &prepared.retained.d_tag,
+                prepared.retained.created_at,
+                &prepared.retained.content,
+            )?;
+            Ok(SetPersonaSharedResult {
+                persona: prepared.persona,
+                publication_status: PersonaSharePublicationStatus::Published,
+                relay_message: None,
+            })
+        }
+        Err(error) => Ok(SetPersonaSharedResult {
+            persona: prepared.persona,
+            publication_status: PersonaSharePublicationStatus::Queued,
+            relay_message: Some(error),
+        }),
+    }
+}
+
+#[cfg(all(test, not(target_os = "windows")))]
+mod tests {
+    use super::*;
+    use crate::{
+        app_state::build_app_state,
+        commands::personas::pending::prepare_persona_publication_at,
+        managed_agents::{
+            retention::{get_retained_event, open_retention_db, RetentionScope},
+            AgentDefinition,
+        },
+    };
+    use std::collections::BTreeMap;
+
+    fn persona() -> AgentDefinition {
+        AgentDefinition {
+            id: "catalog-reviewer".to_string(),
+            display_name: "Catalog Reviewer".to_string(),
+            avatar_url: None,
+            system_prompt: "Review the catalog.".to_string(),
+            runtime: None,
+            model: None,
+            provider: None,
+            name_pool: Vec::new(),
+            is_builtin: false,
+            is_active: true,
+            shared: false,
+            source_team: None,
+            source_team_persona_slug: None,
+            catalog_source: None,
+            env_vars: BTreeMap::new(),
+            respond_to: None,
+            respond_to_allowlist: Vec::new(),
+            parallelism: None,
+            created_at: "2026-07-27T00:00:00Z".to_string(),
+            updated_at: "2026-07-27T00:00:00Z".to_string(),
+        }
+    }
+
+    async fn spawn_relay(accepted: bool) -> String {
+        use axum::{routing::post, Router};
+
+        let app = Router::new().route(
+            "/events",
+            post(move |body: String| async move {
+                let event: serde_json::Value = serde_json::from_str(&body).unwrap_or_default();
+                serde_json::json!({
+                    "event_id": event.get("id").and_then(serde_json::Value::as_str).unwrap_or(""),
+                    "accepted": accepted,
+                    "message": if accepted { "" } else { "policy rejection" }
+                })
+                .to_string()
+            }),
+        );
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let addr = listener.local_addr().unwrap();
+        tokio::spawn(async move {
+            axum::serve(listener, app).await.ok();
+        });
+        format!("http://{addr}")
+    }
+
+    fn prepared(
+        db_path: &std::path::Path,
+        relay_url: String,
+        keys: nostr::Keys,
+        shared_override: Option<bool>,
+    ) -> PreparedPersonaPublication {
+        let (event, retained, persona) =
+            prepare_persona_publication_at(db_path, &keys, &persona(), shared_override).unwrap();
+        PreparedPersonaPublication {
+            scope: RetentionScope {
+                db_path: db_path.to_path_buf(),
+                relay_url,
+                owner_keys: keys,
+            },
+            event,
+            retained,
+            persona,
+        }
+    }
+
+    #[tokio::test]
+    async fn relay_rejection_stays_durably_queued() {
+        let dir = tempfile::tempdir().unwrap();
+        let db_path = dir.path().join("retention.db");
+        let keys = nostr::Keys::generate();
+        let owner = keys.public_key().to_hex();
+        let prepared = prepared(&db_path, spawn_relay(false).await, keys, Some(true));
+        let state = build_app_state();
+
+        let result = publish_prepared_persona(&state, prepared).await.unwrap();
+
+        assert_eq!(
+            result.publication_status,
+            PersonaSharePublicationStatus::Queued
+        );
+        assert!(result
+            .relay_message
+            .as_deref()
+            .is_some_and(|message| message.contains("relay rejected event")));
+        assert!(
+            get_retained_event(
+                &open_retention_db(&db_path).unwrap(),
+                buzz_core_pkg::kind::KIND_PERSONA,
+                &owner,
+                "catalog-reviewer"
+            )
+            .unwrap()
+            .unwrap()
+            .pending_sync
+        );
+    }
+
+    #[tokio::test]
+    async fn unavailable_relay_stays_durably_queued() {
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+        let relay_url = format!("http://{}", listener.local_addr().unwrap());
+        drop(listener);
+        let dir = tempfile::tempdir().unwrap();
+        let db_path = dir.path().join("retention.db");
+        let keys = nostr::Keys::generate();
+        let owner = keys.public_key().to_hex();
+        let prepared = prepared(&db_path, relay_url, keys, Some(true));
+        let state = build_app_state();
+
+        let result = publish_prepared_persona(&state, prepared).await.unwrap();
+
+        assert_eq!(
+            result.publication_status,
+            PersonaSharePublicationStatus::Queued
+        );
+        assert!(result
+            .relay_message
+            .as_deref()
+            .is_some_and(|message| message.starts_with("relay unreachable:")));
+        assert!(
+            get_retained_event(
+                &open_retention_db(&db_path).unwrap(),
+                buzz_core_pkg::kind::KIND_PERSONA,
+                &owner,
+                "catalog-reviewer"
+            )
+            .unwrap()
+            .unwrap()
+            .pending_sync
+        );
+    }
+
+    #[tokio::test]
+    async fn relay_acceptance_marks_the_scoped_head_synced() {
+        let dir = tempfile::tempdir().unwrap();
+        let db_path = dir.path().join("retention.db");
+        let keys = nostr::Keys::generate();
+        let owner = keys.public_key().to_hex();
+        let prepared = prepared(&db_path, spawn_relay(true).await, keys, Some(true));
+        let state = build_app_state();
+
+        let result = publish_prepared_persona(&state, prepared).await.unwrap();
+
+        assert_eq!(
+            result.publication_status,
+            PersonaSharePublicationStatus::Published
+        );
+        assert!(
+            !get_retained_event(
+                &open_retention_db(&db_path).unwrap(),
+                buzz_core_pkg::kind::KIND_PERSONA,
+                &owner,
+                "catalog-reviewer"
+            )
+            .unwrap()
+            .unwrap()
+            .pending_sync
+        );
+    }
+
+    /// `update_persona_and_publish` differs from the share toggle in one way:
+    /// it passes no share override, so the edit must keep whatever the scoped
+    /// head already says, and it reports the relay outcome to the caller.
+    #[tokio::test]
+    async fn test_update_and_publish_acceptance_publishes_the_edit_at_the_current_share_state() {
+        let dir = tempfile::tempdir().unwrap();
+        let db_path = dir.path().join("retention.db");
+        let keys = nostr::Keys::generate();
+        let owner = keys.public_key().to_hex();
+        // The persona is already shared in this scope.
+        prepare_persona_publication_at(&db_path, &keys, &persona(), Some(true)).unwrap();
+        let prepared = prepared(&db_path, spawn_relay(true).await, keys, None);
+        let state = build_app_state();
+
+        let result = publish_prepared_persona(&state, prepared).await.unwrap();
+
+        assert_eq!(
+            result.publication_status,
+            PersonaSharePublicationStatus::Published
+        );
+        assert!(
+            result.persona.shared,
+            "an ordinary edit must not silently unshare the persona"
+        );
+        assert!(
+            !get_retained_event(
+                &open_retention_db(&db_path).unwrap(),
+                buzz_core_pkg::kind::KIND_PERSONA,
+                &owner,
+                "catalog-reviewer"
+            )
+            .unwrap()
+            .unwrap()
+            .pending_sync
+        );
+    }
+
+    #[tokio::test]
+    async fn test_update_and_publish_relay_rejection_reports_queued_not_failure() {
+        let dir = tempfile::tempdir().unwrap();
+        let db_path = dir.path().join("retention.db");
+        let keys = nostr::Keys::generate();
+        let owner = keys.public_key().to_hex();
+        prepare_persona_publication_at(&db_path, &keys, &persona(), Some(true)).unwrap();
+        let prepared = prepared(&db_path, spawn_relay(false).await, keys, None);
+        let state = build_app_state();
+
+        let result = publish_prepared_persona(&state, prepared).await.unwrap();
+
+        assert_eq!(
+            result.publication_status,
+            PersonaSharePublicationStatus::Queued
+        );
+        assert!(result
+            .relay_message
+            .as_deref()
+            .is_some_and(|message| message.contains("relay rejected event")));
+        assert!(
+            get_retained_event(
+                &open_retention_db(&db_path).unwrap(),
+                buzz_core_pkg::kind::KIND_PERSONA,
+                &owner,
+                "catalog-reviewer"
+            )
+            .unwrap()
+            .unwrap()
+            .pending_sync,
+            "the edit stays queued for the flush loop"
+        );
+    }
+
+    /// The save path swallows enqueue failures (`retain_persona_pending` logs
+    /// them). This command promises a publication outcome, so the strict
+    /// preparation it uses must surface the failure instead.
+    #[tokio::test]
+    async fn test_update_and_publish_enqueue_failure_is_returned() {
+        let dir = tempfile::tempdir().unwrap();
+        let keys = nostr::Keys::generate();
+
+        let error = prepare_persona_publication_at(dir.path(), &keys, &persona(), None)
+            .expect_err("a directory cannot be opened as the retention database");
+
+        assert!(error.contains("failed to open retention db"));
+    }
+}
diff --git a/desktop/src-tauri/src/commands/personas/snapshot.rs b/desktop/src-tauri/src/commands/personas/snapshot.rs
index e4d8a5d1bc..583296dac0 100644
--- a/desktop/src-tauri/src/commands/personas/snapshot.rs
+++ b/desktop/src-tauri/src/commands/personas/snapshot.rs
@@ -164,6 +164,33 @@ fn parse_format_is_png(s: &str) -> Result<bool, String> {
     }
 }
 
+fn materialize_portable_runtime_defaults(
+    record: &mut ManagedAgentRecord,
+    global: &crate::managed_agents::GlobalAgentConfig,
+) {
+    if record
+        .model
+        .as_deref()
+        .is_none_or(|value| value.trim().is_empty())
+    {
+        record.model = global.model.clone();
+    }
+    if record
+        .provider
+        .as_deref()
+        .is_none_or(|value| value.trim().is_empty())
+    {
+        record.provider = global.provider.clone();
+    }
+    if record
+        .runtime
+        .as_deref()
+        .is_none_or(|value| value.trim().is_empty())
+    {
+        record.runtime = global.preferred_runtime.clone();
+    }
+}
+
 /// Shared production encoding path.
 ///
 /// Resolves the agent definition, validates inputs, fetches optional memory,
@@ -196,6 +223,13 @@ pub(crate) async fn materialize_snapshot_bytes(
         let definitions = load_agent_definitions(&app)?;
         let (def_record, is_definition) = resolve_from_lists(&id, &instances, &definitions)
             .map(|(r, is_def)| (r.clone(), is_def))?;
+        let mut def_record = def_record;
+        // A snapshot is a verbatim portable copy of the effective runtime,
+        // provider, and model configuration, not a pointer to the sender's
+        // machine-wide defaults. This does not translate or substitute values
+        // for a different recipient setup.
+        let global = crate::managed_agents::load_global_agent_config(&app).unwrap_or_default();
+        materialize_portable_runtime_defaults(&mut def_record, &global);
 
         let memory_pubkey = if memory_level != MemoryLevel::None {
             let mpk = memory_source_pubkey.as_deref().unwrap_or("");
@@ -400,6 +434,8 @@ pub async fn encode_agent_snapshot_for_send(
     })
 }
 
+#[cfg(test)]
+mod fidelity_tests;
 #[cfg(test)]
 mod tests;
 
@@ -432,6 +468,7 @@ mod png_body_tests {
             version: crate::managed_agents::agent_snapshot::FORMAT_VERSION,
             definition: crate::managed_agents::agent_snapshot::AgentSnapshotDefinition {
                 name: "Agent".to_string(),
+                source_is_builtin: false,
                 system_prompt: None,
                 runtime: None,
                 model: None,
diff --git a/desktop/src-tauri/src/commands/personas/snapshot/fidelity_tests.rs b/desktop/src-tauri/src/commands/personas/snapshot/fidelity_tests.rs
new file mode 100644
index 0000000000..00a1457393
--- /dev/null
+++ b/desktop/src-tauri/src/commands/personas/snapshot/fidelity_tests.rs
@@ -0,0 +1,210 @@
+use super::import::decode_snapshot_from_bytes;
+use super::*;
+use crate::managed_agents::{
+    agent_snapshot::{
+        AgentSnapshot, AgentSnapshotDefinition, AgentSnapshotMemory, AgentSnapshotProfile,
+        FORMAT_DISCRIMINATOR, FORMAT_VERSION,
+    },
+    BackendKind, ManagedAgentRecord, RespondTo,
+};
+use std::collections::BTreeMap;
+
+fn make_definition(slug: &str) -> ManagedAgentRecord {
+    ManagedAgentRecord {
+        pubkey: String::new(),
+        slug: Some(slug.to_string()),
+        name: slug.to_string(),
+        display_name: None,
+        persona_id: None,
+        private_key_nsec: String::new(),
+        auth_tag: None,
+        relay_url: String::new(),
+        avatar_url: None,
+        acp_command: String::new(),
+        agent_command: String::new(),
+        agent_command_override: None,
+        agent_args: vec![],
+        mcp_command: String::new(),
+        turn_timeout_seconds: 0,
+        idle_timeout_seconds: None,
+        max_turn_duration_seconds: None,
+        parallelism: 1,
+        system_prompt: None,
+        model: None,
+        provider: None,
+        persona_source_version: None,
+        env_vars: BTreeMap::new(),
+        start_on_app_launch: false,
+        auto_restart_on_config_change: false,
+        runtime_pid: None,
+        backend: BackendKind::Local,
+        backend_agent_id: None,
+        provider_binary_path: None,
+        team_id: None,
+        persona_team_dir: None,
+        persona_name_in_team: None,
+        created_at: String::new(),
+        updated_at: String::new(),
+        last_started_at: None,
+        last_stopped_at: None,
+        last_exit_code: None,
+        last_error: None,
+        last_error_code: None,
+        respond_to: RespondTo::default(),
+        respond_to_allowlist: vec![],
+        runtime: None,
+        name_pool: vec![],
+        is_builtin: false,
+        is_active: false,
+        shared: false,
+        source_team: None,
+        source_team_persona_slug: None,
+        catalog_source: None,
+        definition_respond_to: None,
+        definition_respond_to_allowlist: vec![],
+        definition_parallelism: None,
+        relay_mesh: None,
+    }
+}
+
+/// Build a minimal valid AgentSnapshot for import tests.
+fn make_snapshot(
+    memory_level: MemoryLevel,
+    entries: Vec<AgentSnapshotMemoryEntry>,
+) -> AgentSnapshot {
+    AgentSnapshot {
+        format: FORMAT_DISCRIMINATOR.to_string(),
+        version: FORMAT_VERSION,
+        definition: AgentSnapshotDefinition {
+            name: "Test Agent".to_string(),
+            source_is_builtin: false,
+            system_prompt: Some("You are helpful.".to_string()),
+            runtime: None,
+            model: None,
+            provider: None,
+            parallelism: None,
+            respond_to: None,
+            respond_to_allowlist: vec![],
+            name_pool: vec![],
+            idle_timeout_seconds: None,
+            max_turn_duration_seconds: None,
+        },
+        profile: AgentSnapshotProfile {
+            display_name: "Test Agent".to_string(),
+            about: None,
+            avatar_data_url: None,
+            avatar_url: None,
+        },
+        memory: AgentSnapshotMemory {
+            level: memory_level,
+            entries,
+        },
+    }
+}
+
+// ── Portable effective configuration ─────────────────────────────────────
+
+#[test]
+fn inherited_runtime_provider_and_model_are_materialized_for_export() {
+    let mut record = make_definition("wren");
+    let global = crate::managed_agents::GlobalAgentConfig {
+        preferred_runtime: Some("goose".to_string()),
+        provider: Some("databricks_v2".to_string()),
+        model: Some("databricks-gpt-5-6-sol".to_string()),
+        ..Default::default()
+    };
+
+    materialize_portable_runtime_defaults(&mut record, &global);
+
+    assert_eq!(record.runtime.as_deref(), Some("goose"));
+    assert_eq!(record.provider.as_deref(), Some("databricks_v2"));
+    assert_eq!(record.model.as_deref(), Some("databricks-gpt-5-6-sol"));
+}
+
+#[test]
+fn explicit_runtime_provider_and_model_win_over_global_defaults() {
+    let mut record = make_definition("wren");
+    record.runtime = Some("claude".to_string());
+    record.provider = Some("anthropic".to_string());
+    record.model = Some("claude-opus-5".to_string());
+    let global = crate::managed_agents::GlobalAgentConfig {
+        preferred_runtime: Some("goose".to_string()),
+        provider: Some("databricks_v2".to_string()),
+        model: Some("databricks-gpt-5-6-sol".to_string()),
+        ..Default::default()
+    };
+
+    materialize_portable_runtime_defaults(&mut record, &global);
+
+    assert_eq!(record.runtime.as_deref(), Some("claude"));
+    assert_eq!(record.provider.as_deref(), Some("anthropic"));
+    assert_eq!(record.model.as_deref(), Some("claude-opus-5"));
+}
+
+/// PNG image-body avatar overrides manifest avatar fields and all definition
+/// config survives the exact production decoder.
+#[test]
+fn import_png_body_avatar_and_full_model_round_trip() {
+    use crate::managed_agents::agent_snapshot::{decode_avatar_data_url, encode_snapshot_png};
+
+    let mut snapshot = make_snapshot(MemoryLevel::None, vec![]);
+    snapshot.definition.runtime = Some("goose".to_string());
+    snapshot.definition.model = Some("databricks-gpt-5-6-sol".to_string());
+    snapshot.definition.provider = Some("databricks_v2".to_string());
+    snapshot.profile.avatar_data_url = None;
+    snapshot.profile.avatar_url = Some("https://sender.invalid/avatar.png".to_string());
+
+    let avatar = image::DynamicImage::ImageRgba8(image::RgbaImage::from_pixel(
+        4,
+        3,
+        image::Rgba([23, 91, 177, 255]),
+    ));
+    let mut avatar_png = std::io::Cursor::new(Vec::new());
+    avatar
+        .write_to(&mut avatar_png, image::ImageFormat::Png)
+        .unwrap();
+    let png_bytes = encode_snapshot_png(&snapshot, Some(avatar_png.get_ref())).unwrap();
+
+    let decoded = decode_snapshot_from_bytes(&png_bytes).unwrap();
+    assert_eq!(decoded.definition.runtime.as_deref(), Some("goose"));
+    assert_eq!(
+        decoded.definition.model.as_deref(),
+        Some("databricks-gpt-5-6-sol")
+    );
+    assert_eq!(
+        decoded.definition.provider.as_deref(),
+        Some("databricks_v2")
+    );
+    assert_eq!(
+        decoded.profile.avatar_url.as_deref(),
+        Some("https://sender.invalid/avatar.png")
+    );
+
+    let avatar_data_url = decoded
+        .profile
+        .avatar_data_url
+        .as_deref()
+        .expect("PNG image body must become the effective portable avatar");
+    let avatar_bytes = decode_avatar_data_url(avatar_data_url).unwrap();
+    let imported_avatar = image::load_from_memory(&avatar_bytes).unwrap();
+    assert_eq!((imported_avatar.width(), imported_avatar.height()), (4, 3));
+    assert_eq!(
+        imported_avatar.to_rgba8().get_pixel(0, 0).0,
+        [23, 91, 177, 255]
+    );
+}
+
+/// The transparent 1×1 no-avatar card must not override a manifest fallback.
+#[test]
+fn import_png_placeholder_keeps_manifest_avatar_fallback() {
+    use crate::managed_agents::agent_snapshot::encode_snapshot_png;
+
+    let mut snapshot = make_snapshot(MemoryLevel::None, vec![]);
+    snapshot.profile.avatar_data_url = None;
+    snapshot.profile.avatar_url = Some("https://example.com/avatar.png".to_string());
+    let png_bytes = encode_snapshot_png(&snapshot, None).unwrap();
+
+    let decoded = decode_snapshot_from_bytes(&png_bytes).unwrap();
+    assert!(decoded.profile.avatar_data_url.is_none());
+    assert_eq!(decoded.profile.avatar_url, snapshot.profile.avatar_url);
+}
diff --git a/desktop/src-tauri/src/commands/personas/snapshot/import.rs b/desktop/src-tauri/src/commands/personas/snapshot/import.rs
index ac5c0eace6..d23efe7730 100644
--- a/desktop/src-tauri/src/commands/personas/snapshot/import.rs
+++ b/desktop/src-tauri/src/commands/personas/snapshot/import.rs
@@ -13,7 +13,7 @@ use tauri::{AppHandle, Emitter, State};
 use crate::{
     app_state::AppState,
     managed_agents::{
-        agent_snapshot::{decode_snapshot_json, decode_snapshot_png, MemoryLevel},
+        agent_snapshot::{decode_snapshot_json, decode_snapshot_png, AgentSnapshot, MemoryLevel},
         load_managed_agents, load_personas, save_managed_agents, save_personas, AgentDefinition,
         ManagedAgentRecord, RespondTo,
     },
@@ -50,6 +50,13 @@ pub(super) fn reject_legacy_persona_filename(file_name: &str) -> Result<(), Stri
 pub struct AgentSnapshotImportPreview {
     /// Agent display name from the snapshot.
     pub display_name: String,
+    /// Whether the exported source definition was built in. This is display
+    /// metadata only; confirmed imports are always independent custom agents.
+    pub is_builtin: bool,
+    /// Preferred model from the exported definition.
+    pub model: Option<String>,
+    /// Preferred runtime from the exported definition.
+    pub runtime: Option<String>,
     /// System prompt, if any.
     pub system_prompt: Option<String>,
     /// Effective avatar: data URL if present, otherwise the source URL fallback.
@@ -213,7 +220,15 @@ pub(crate) fn decode_snapshot_from_bytes(
                 file_bytes.len() / (1024 * 1024)
             ));
         }
-        let snapshot = decode_snapshot_png(file_bytes)?;
+        let mut snapshot = decode_snapshot_png(file_bytes)?;
+        // The PNG image body is the portable avatar. It deliberately wins over
+        // manifest avatar fields, whose URL may only be reachable by the
+        // sender. A 1×1 export placeholder leaves the manifest fallback intact.
+        if let Some(avatar_data_url) =
+            crate::managed_agents::snapshot_avatar::snapshot_png_avatar_data_url(file_bytes)?
+        {
+            snapshot.profile.avatar_data_url = Some(avatar_data_url);
+        }
         if snapshot.memory.level == MemoryLevel::None && !snapshot.memory.entries.is_empty() {
             return Err(
                 "Snapshot is malformed: memory.level is 'none' but entries are present."
@@ -241,6 +256,24 @@ pub(crate) fn decode_snapshot_from_bytes(
     Ok(snapshot)
 }
 
+async fn materialize_import_avatar<F, Fut>(
+    avatar_data_url: Option<&str>,
+    avatar_url: Option<&str>,
+    upload: F,
+) -> Result<Option<String>, String>
+where
+    F: FnOnce(Vec<u8>) -> Fut,
+    Fut: std::future::Future<Output = Result<String, String>>,
+{
+    let Some(avatar_data_url) = avatar_data_url else {
+        return Ok(avatar_url.map(str::to_string));
+    };
+    let avatar_bytes =
+        crate::managed_agents::agent_snapshot::decode_avatar_data_url(avatar_data_url)
+            .ok_or_else(|| "Snapshot avatar data is malformed.".to_string())?;
+    upload(avatar_bytes).await.map(Some)
+}
+
 // ── `preview_agent_snapshot_import` ──────────────────────────────────────────
 
 /// Decode and validate a snapshot file, returning a preview for the
@@ -262,32 +295,41 @@ pub async fn preview_agent_snapshot_import(
         reject_legacy_persona_filename(&file_name)?;
         let snapshot = decode_snapshot_from_bytes(&file_bytes)?;
 
-        let memory_level = match snapshot.memory.level {
-            MemoryLevel::None => "none",
-            MemoryLevel::Core => "core",
-            MemoryLevel::Everything => "everything",
-        }
-        .to_string();
-
-        Ok(AgentSnapshotImportPreview {
-            display_name: snapshot.profile.display_name.clone(),
-            system_prompt: snapshot.definition.system_prompt.clone(),
-            // Effective avatar: data URL wins; URL fallback if no data URL.
-            avatar_url: snapshot
-                .profile
-                .avatar_data_url
-                .clone()
-                .or_else(|| snapshot.profile.avatar_url.clone()),
-            memory_level,
-            memory_entry_count: snapshot.memory.entries.len(),
-            source_allowlist_count: snapshot.definition.respond_to_allowlist.len(),
-            has_source_allowlist: !snapshot.definition.respond_to_allowlist.is_empty(),
-        })
+        Ok(build_agent_snapshot_import_preview(&snapshot))
     })
     .await
     .map_err(|e| format!("spawn_blocking failed: {e}"))?
 }
 
+pub(crate) fn build_agent_snapshot_import_preview(
+    snapshot: &AgentSnapshot,
+) -> AgentSnapshotImportPreview {
+    let memory_level = match snapshot.memory.level {
+        MemoryLevel::None => "none",
+        MemoryLevel::Core => "core",
+        MemoryLevel::Everything => "everything",
+    }
+    .to_string();
+
+    AgentSnapshotImportPreview {
+        display_name: snapshot.profile.display_name.clone(),
+        is_builtin: snapshot.definition.source_is_builtin,
+        model: snapshot.definition.model.clone(),
+        runtime: snapshot.definition.runtime.clone(),
+        system_prompt: snapshot.definition.system_prompt.clone(),
+        // Effective avatar: data URL wins; URL fallback if no data URL.
+        avatar_url: snapshot
+            .profile
+            .avatar_data_url
+            .clone()
+            .or_else(|| snapshot.profile.avatar_url.clone()),
+        memory_level,
+        memory_entry_count: snapshot.memory.entries.len(),
+        source_allowlist_count: snapshot.definition.respond_to_allowlist.len(),
+        has_source_allowlist: !snapshot.definition.respond_to_allowlist.is_empty(),
+    }
+}
+
 // ── `confirm_agent_snapshot_import` ──────────────────────────────────────────
 
 /// Import a `buzz-agent-snapshot v1` file as a brand-new agent.
@@ -330,12 +372,21 @@ pub async fn confirm_agent_snapshot_import(
     )?;
     let minted_parallelism = minted.parallelism;
 
-    // Effective avatar: data URL wins; URL fallback when data URL is absent.
-    let effective_avatar: Option<String> = snapshot
-        .profile
-        .avatar_data_url
-        .clone()
-        .or_else(|| snapshot.profile.avatar_url.clone());
+    // Profile metadata must contain a hosted URL. Inline avatar data can be far
+    // larger than the relay's kind:0 content limit, so upload imported pixels
+    // before minting or persisting the new agent. Failing here keeps import
+    // atomic instead of creating an agent whose profile can never publish.
+    let effective_avatar = materialize_import_avatar(
+        snapshot.profile.avatar_data_url.as_deref(),
+        snapshot.profile.avatar_url.as_deref(),
+        |avatar_bytes| async {
+            crate::commands::media::upload_image_bytes(avatar_bytes, &state)
+                .await
+                .map(|descriptor| descriptor.url)
+                .map_err(|error| format!("Could not upload the imported avatar: {error}"))
+        },
+    )
+    .await?;
 
     // Wire-format string for the persona definition's respond_to field.
     // Omit when it is the default (owner-only) to keep definitions clean.
@@ -408,8 +459,10 @@ pub async fn confirm_agent_snapshot_import(
             name_pool: snapshot.definition.name_pool.clone(),
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             env_vars: std::collections::BTreeMap::new(),
             respond_to: respond_to_wire.clone(),
             respond_to_allowlist: minted.respond_to_allowlist.clone(),
@@ -476,8 +529,10 @@ pub async fn confirm_agent_snapshot_import(
             respond_to_allowlist: minted.respond_to_allowlist.clone(),
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             definition_respond_to: respond_to_wire.clone(),
             definition_respond_to_allowlist: minted.respond_to_allowlist.clone(),
             definition_parallelism: minted_parallelism,
@@ -585,7 +640,6 @@ pub async fn confirm_agent_snapshot_import(
 fn retain_agent_pending(app: &AppHandle, state: &AppState, record: &ManagedAgentRecord) {
     use crate::managed_agents::{
         agent_events::{agent_event_content, build_agent_event},
-        managed_agents_base_dir,
         persona_events::monotonic_created_at,
         retention::{get_retained_event, open_retention_db, retain_event, RetainedEvent},
     };
@@ -593,11 +647,12 @@ fn retain_agent_pending(app: &AppHandle, state: &AppState, record: &ManagedAgent
     use nostr::JsonUtil;
 
     let result = (|| -> Result<(), String> {
-        let conn = open_retention_db(&managed_agents_base_dir(app)?.join("retention.db"))?;
+        let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
+        let conn = open_retention_db(&scope.db_path)?;
         let content = serde_json::to_string(&agent_event_content(record))
             .map_err(|e| format!("failed to serialize agent content: {e}"))?;
         let (owner_pubkey, event) = {
-            let keys = state.signing_keys()?;
+            let keys = &scope.owner_keys;
             let owner_pubkey = keys.public_key().to_hex();
             let existing =
                 get_retained_event(&conn, KIND_MANAGED_AGENT, &owner_pubkey, &record.pubkey)?;
@@ -606,7 +661,7 @@ fn retain_agent_pending(app: &AppHandle, state: &AppState, record: &ManagedAgent
             }
             let event = build_agent_event(record)?
                 .custom_created_at(monotonic_created_at(existing.map(|row| row.created_at)))
-                .sign_with_keys(&keys)
+                .sign_with_keys(keys)
                 .map_err(|e| format!("failed to sign agent event: {e}"))?;
             (owner_pubkey, event)
         };
@@ -683,3 +738,114 @@ async fn submit_engram_event(
     }
     Ok(())
 }
+
+#[cfg(test)]
+mod import_avatar_tests {
+    use super::materialize_import_avatar;
+    use std::cell::Cell;
+
+    #[tokio::test]
+    async fn inline_avatar_is_uploaded_and_replaced_with_hosted_url() {
+        let uploaded = Cell::new(false);
+        let result = materialize_import_avatar(
+            Some("data:image/png;base64,iVBORw0KGgo="),
+            Some("https://sender.invalid/avatar.png"),
+            |bytes| {
+                uploaded.set(true);
+                async move {
+                    assert_eq!(bytes, b"\x89PNG\r\n\x1a\n");
+                    Ok("https://relay.example/media/avatar.png".to_string())
+                }
+            },
+        )
+        .await
+        .unwrap();
+
+        assert!(uploaded.get());
+        assert_eq!(
+            result.as_deref(),
+            Some("https://relay.example/media/avatar.png")
+        );
+    }
+
+    #[tokio::test]
+    async fn hosted_avatar_skips_upload() {
+        let result =
+            materialize_import_avatar(None, Some("https://sender.example/avatar.png"), |_| async {
+                panic!("hosted avatars must not be uploaded")
+            })
+            .await
+            .unwrap();
+
+        assert_eq!(result.as_deref(), Some("https://sender.example/avatar.png"));
+    }
+
+    #[tokio::test]
+    async fn relay_sized_inline_avatar_becomes_bounded_signed_profile() {
+        use base64::{engine::general_purpose::STANDARD, Engine};
+        use image::ImageEncoder;
+        use nostr::JsonUtil;
+
+        let mut pixels = vec![0_u8; 512 * 512 * 4];
+        let mut seed = 0x1234_5678_u32;
+        for byte in &mut pixels {
+            seed ^= seed << 13;
+            seed ^= seed >> 17;
+            seed ^= seed << 5;
+            *byte = seed as u8;
+        }
+        let mut source = Vec::new();
+        image::codecs::png::PngEncoder::new(&mut source)
+            .write_image(&pixels, 512, 512, image::ExtendedColorType::Rgba8)
+            .unwrap();
+        assert!(source.len() > 256 * 1024);
+        let data_url = format!("data:image/png;base64,{}", STANDARD.encode(&source));
+        assert!(data_url.len() > 256 * 1024);
+
+        let avatar = materialize_import_avatar(Some(&data_url), None, |bytes| async move {
+            let mime = crate::commands::media::detect_and_validate_mime(&bytes)?;
+            assert_eq!(mime, "image/png");
+            let sanitized = crate::commands::media::sanitize_image_for_upload(bytes, &mime)?;
+            image::load_from_memory(&sanitized).map_err(|error| error.to_string())?;
+            Ok("https://relay.example/media/avatar.png".to_string())
+        })
+        .await
+        .unwrap()
+        .unwrap();
+
+        let event =
+            crate::events::build_profile(Some("Imported agent"), None, Some(&avatar), None, None)
+                .unwrap()
+                .sign_with_keys(&nostr::Keys::generate())
+                .unwrap();
+        assert!(event.content.len() < 64 * 1024);
+        assert!(!event.content.contains("data:image/"));
+        assert!(event
+            .content
+            .contains("https://relay.example/media/avatar.png"));
+        assert!(event.as_json().len() < 256 * 1024);
+    }
+
+    #[tokio::test]
+    async fn upload_failure_aborts_avatar_materialization() {
+        let result = materialize_import_avatar(
+            Some("data:image/png;base64,iVBORw0KGgo="),
+            None,
+            |_| async { Err("relay upload failed".to_string()) },
+        )
+        .await;
+
+        assert_eq!(result.unwrap_err(), "relay upload failed");
+    }
+
+    #[tokio::test]
+    async fn malformed_inline_avatar_fails_before_upload() {
+        let result =
+            materialize_import_avatar(Some("data:image/png;base64,not-base64!"), None, |_| async {
+                panic!("malformed avatars must not be uploaded")
+            })
+            .await;
+
+        assert_eq!(result.unwrap_err(), "Snapshot avatar data is malformed.");
+    }
+}
diff --git a/desktop/src-tauri/src/commands/personas/snapshot/tests.rs b/desktop/src-tauri/src/commands/personas/snapshot/tests.rs
index b1d19f06b6..4289310280 100644
--- a/desktop/src-tauri/src/commands/personas/snapshot/tests.rs
+++ b/desktop/src-tauri/src/commands/personas/snapshot/tests.rs
@@ -1,6 +1,7 @@
 use super::import::{
-    decode_snapshot_from_bytes, reject_legacy_persona_filename, resolve_snapshot_import_behavior,
-    AgentSnapshotImportResult, MAX_SNAPSHOT_JSON_BYTES, MAX_SNAPSHOT_PNG_BYTES,
+    build_agent_snapshot_import_preview, decode_snapshot_from_bytes,
+    reject_legacy_persona_filename, resolve_snapshot_import_behavior, AgentSnapshotImportResult,
+    MAX_SNAPSHOT_JSON_BYTES, MAX_SNAPSHOT_PNG_BYTES,
 };
 use super::*;
 use crate::managed_agents::{
@@ -64,8 +65,10 @@ fn make_definition(slug: &str) -> ManagedAgentRecord {
         name_pool: vec![],
         is_builtin: false,
         is_active: false,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         definition_respond_to: None,
         definition_respond_to_allowlist: vec![],
         definition_parallelism: None,
@@ -94,6 +97,7 @@ fn make_snapshot(
         version: FORMAT_VERSION,
         definition: AgentSnapshotDefinition {
             name: "Test Agent".to_string(),
+            source_is_builtin: false,
             system_prompt: Some("You are helpful.".to_string()),
             runtime: None,
             model: None,
@@ -551,6 +555,22 @@ fn import_preview_flags_non_empty_source_allowlist() {
     );
 }
 
+#[test]
+fn import_preview_includes_exported_definition_metadata() {
+    let mut snapshot = make_snapshot(MemoryLevel::None, vec![]);
+    snapshot.definition.source_is_builtin = true;
+    snapshot.definition.model = Some("claude-opus-4-5".to_string());
+    snapshot.definition.runtime = Some("goose".to_string());
+    let bytes = crate::managed_agents::agent_snapshot::encode_snapshot_json(&snapshot).unwrap();
+    let decoded = decode_snapshot_from_bytes(&bytes).unwrap();
+
+    let preview = build_agent_snapshot_import_preview(&decoded);
+
+    assert!(preview.is_builtin);
+    assert_eq!(preview.model.as_deref(), Some("claude-opus-4-5"));
+    assert_eq!(preview.runtime.as_deref(), Some("goose"));
+}
+
 // ── Import: resolve_snapshot_import_behavior — the production selection path
 //
 // All tests below call `resolve_snapshot_import_behavior` directly.  This is
@@ -614,6 +634,14 @@ fn import_non_allowlist_mode_preserved_when_keep_false() {
     );
 }
 
+#[test]
+fn import_catalog_owner_only_without_allowlist_succeeds() {
+    let minted = resolve_snapshot_import_behavior(Some("owner-only"), &[], None, false).unwrap();
+
+    assert_eq!(minted.respond_to, RespondTo::OwnerOnly);
+    assert!(minted.respond_to_allowlist.is_empty());
+}
+
 /// Non-allowlist mode with a non-empty list and keep=true: preserve mode + list.
 /// The toggle WAS shown (list is non-empty) so keep_allowlist applies.
 #[test]
diff --git a/desktop/src-tauri/src/commands/personas/update.rs b/desktop/src-tauri/src/commands/personas/update.rs
new file mode 100644
index 0000000000..ed2472d54e
--- /dev/null
+++ b/desktop/src-tauri/src/commands/personas/update.rs
@@ -0,0 +1,252 @@
+//! The persona edit command surface: `update_persona` (best-effort enqueue)
+//! and the `update_persona_with` seam that `update_persona_and_publish` reuses
+//! to await relay acceptance for the same save.
+
+use tauri::AppHandle;
+
+use crate::{
+    app_state::AppState,
+    managed_agents::{
+        apply_persona_behavior, effective_agent_command, load_managed_agents, load_personas,
+        managed_agent_avatar_url, save_managed_agents, save_personas, try_regenerate_nest,
+        AgentDefinition, ManagedAgentRecord, UpdatePersonaRequest,
+    },
+    util::now_iso,
+};
+
+use super::{pending, retain_persona_pending, trim_optional, trim_required};
+
+#[cfg(test)]
+mod name_propagation_tests;
+
+/// Return value of the `update_persona` command. Uses flatten so all
+/// `AgentDefinition` fields appear at the top level of the JSON response —
+/// backward-compatible with callers that already destructure a raw persona object.
+#[derive(Debug, serde::Serialize)]
+pub struct UpdatePersonaResult {
+    #[serde(flatten)]
+    persona: AgentDefinition,
+}
+
+/// Propagate a persona definition's display_name rename to linked agent instances.
+/// Only instances whose current `name` equals `old_display_name` are updated;
+/// pool-named instances (e.g. "Birch", "Compass") keep their individualised name.
+/// Updates both `record.name` (relay display name) and `record.display_name`.
+/// Returns the pubkeys of the records that were renamed.
+fn propagate_persona_name_rename(
+    records: &mut [ManagedAgentRecord],
+    persona_id: &str,
+    old_display_name: &str,
+    new_display_name: &str,
+) -> Vec<String> {
+    let mut renamed = Vec::new();
+    for record in records.iter_mut() {
+        if record.persona_id.as_deref() != Some(persona_id) {
+            continue;
+        }
+        if record.name != old_display_name {
+            continue; // pool-named instance — keep its individualised name
+        }
+        record.name = new_display_name.to_string();
+        record.display_name = Some(new_display_name.to_string());
+        renamed.push(record.pubkey.clone());
+    }
+    renamed
+}
+
+/// Profile sync params collected under the store lock for async relay publish.
+type ProfileSyncParams = Vec<(nostr::Keys, String, String, Option<String>, Option<String>)>;
+
+#[tauri::command]
+pub async fn update_persona(
+    input: UpdatePersonaRequest,
+    app: AppHandle,
+) -> Result<UpdatePersonaResult, String> {
+    let (persona, ()) = update_persona_with(input, app, |app, state, persona| {
+        retain_persona_pending(app, state, persona);
+        Ok(())
+    })
+    .await?;
+    Ok(UpdatePersonaResult { persona })
+}
+
+/// Save an edited persona, hand the saved record to `retain` while the store
+/// lock is still held, then sync the relay profiles of linked agent instances.
+///
+/// `retain` is the only difference between the two update commands:
+/// [`update_persona`] enqueues best-effort, while
+/// [`sharing::update_persona_and_publish`] prepares a strict publication and
+/// returns the event so the caller can await relay acceptance.
+pub(super) async fn update_persona_with<R: Send + 'static>(
+    input: UpdatePersonaRequest,
+    app: AppHandle,
+    retain: impl FnOnce(&AppHandle, &AppState, &AgentDefinition) -> Result<R, String> + Send + 'static,
+) -> Result<(AgentDefinition, R), String> {
+    use tauri::Manager;
+
+    // Phase 1: synchronous save (persona record + linked agent avatar updates)
+    let (result, retained, profile_sync_params) = tokio::task::spawn_blocking({
+        let app = app.clone();
+        move || -> Result<(AgentDefinition, R, ProfileSyncParams), String> {
+            let state = app.state::<AppState>();
+            let display_name = trim_required(&input.display_name, "Display name")?;
+            let system_prompt = input.system_prompt.clone();
+            let avatar_url = trim_optional(input.avatar_url);
+            let runtime = trim_optional(input.runtime);
+            let model = trim_optional(input.model);
+            let provider = trim_optional(input.provider);
+
+            let _store_guard = state
+                .managed_agents_store_lock
+                .lock()
+                .map_err(|error| error.to_string())?;
+            let mut personas = load_personas(&app)?;
+            pending::project_active_persona_sharing(&app, &state, &mut personas);
+            let persona = personas
+                .iter_mut()
+                .find(|record| record.id == input.id)
+                .ok_or_else(|| format!("agent {} not found", input.id))?;
+
+            // Track what changed so we can propagate to linked agent records.
+            let avatar_changed = persona.avatar_url != avatar_url;
+            let name_changed = persona.display_name != display_name;
+            let old_display_name = persona.display_name.clone();
+
+            persona.display_name = display_name;
+            persona.avatar_url = avatar_url;
+            persona.system_prompt = system_prompt;
+            persona.runtime = runtime;
+            persona.model = model;
+            persona.provider = provider;
+            persona.name_pool = input
+                .name_pool
+                .into_iter()
+                .map(|s| s.trim().to_string())
+                .filter(|s| !s.is_empty())
+                .collect();
+            if let Some(env_vars) = input.env_vars {
+                crate::managed_agents::validate_user_env_keys(&env_vars)?;
+                persona.env_vars = env_vars;
+            }
+            apply_persona_behavior(persona, input.behavior)?;
+            persona.updated_at = now_iso();
+
+            let result = persona.clone();
+            save_personas(&app, &personas)?;
+
+            let retained = retain(&app, &state, &result)?;
+            try_regenerate_nest(&app);
+
+            // If the avatar or display_name changed, propagate to linked agent
+            // records and collect relay profile sync params for the async phase.
+            let sync_params: ProfileSyncParams = if avatar_changed || name_changed {
+                let mut records = load_managed_agents(&app)?;
+                let mut params: ProfileSyncParams = Vec::new();
+                let mut agents_modified = false;
+                let workspace_relay = crate::relay::relay_ws_url_with_override(&state);
+
+                // Propagate the display_name rename to instances that still
+                // carry the old definition display_name (pool-named instances
+                // keep their individualised name) in one pass; the loop below
+                // only decides which records need a relay profile sync.
+                let renamed: Vec<String> = if name_changed {
+                    propagate_persona_name_rename(
+                        &mut records,
+                        &result.id,
+                        &old_display_name,
+                        &result.display_name,
+                    )
+                } else {
+                    Vec::new()
+                };
+
+                for record in records.iter_mut() {
+                    if record.persona_id.as_deref() != Some(&result.id) {
+                        continue;
+                    }
+                    let mut record_changed = renamed.contains(&record.pubkey);
+
+                    if avatar_changed {
+                        // Update the persisted avatar so reconciliation on next
+                        // start agrees with what we're about to publish.
+                        // When the persona avatar is cleared, fall back to the
+                        // command-default icon so the record never stores `None`
+                        // (which reconcile_agent_profile treats as "un-migrated").
+                        let effective_cmd = effective_agent_command(
+                            record.persona_id.as_deref(),
+                            std::slice::from_ref(&result),
+                            record.agent_command_override.as_deref(),
+                        );
+                        record.avatar_url = result
+                            .avatar_url
+                            .clone()
+                            .or_else(|| managed_agent_avatar_url(&effective_cmd));
+                        record_changed = true;
+                    }
+
+                    if record_changed {
+                        agents_modified = true;
+                        if let Ok(agent_keys) = nostr::Keys::parse(&record.private_key_nsec) {
+                            let relay_url = crate::relay::effective_agent_relay_url(
+                                &record.relay_url,
+                                &workspace_relay,
+                            );
+                            params.push((
+                                agent_keys,
+                                relay_url,
+                                record.name.clone(),
+                                record.avatar_url.clone(),
+                                record.auth_tag.clone(),
+                            ));
+                        }
+                    }
+                }
+
+                if agents_modified {
+                    save_managed_agents(&app, &records)?;
+                    // Keep retained kind:30177 identity records in lockstep with
+                    // the rename (#2423): `record.name` is part of the published
+                    // identity projection, so skipping this strands the relay on
+                    // the stale name→pubkey binding until the next boot reconcile.
+                    // Avatar-only edits are excluded — the avatar is not in the
+                    // projection, so retaining would be a guaranteed no-op.
+                    for record in records.iter().filter(|r| renamed.contains(&r.pubkey)) {
+                        crate::commands::agents::retain_managed_agent_pending(&app, &state, record);
+                    }
+                }
+
+                params
+            } else {
+                Vec::new()
+            };
+
+            Ok((result, retained, sync_params))
+        }
+    })
+    .await
+    .map_err(|e| format!("spawn_blocking failed: {e}"))??;
+
+    // Phase 2: await relay profile sync for linked agents whose avatar or
+    // display_name was just updated. We await (rather than fire-and-forget)
+    // so the frontend cache invalidation that follows the mutation settlement
+    // sees the fresh relay profile. Best-effort — failures are logged, not surfaced.
+    if !profile_sync_params.is_empty() {
+        let state = app.state::<AppState>();
+        for (agent_keys, relay_url, display_name, avatar_url, auth_tag) in profile_sync_params {
+            if let Err(e) = crate::relay::sync_managed_agent_profile(
+                &state,
+                &relay_url,
+                &agent_keys,
+                &display_name,
+                avatar_url.as_deref(),
+                auth_tag.as_deref(),
+            )
+            .await
+            {
+                eprintln!("buzz-desktop: relay profile sync failed after persona update: {e}");
+            }
+        }
+    }
+
+    Ok((result, retained))
+}
diff --git a/desktop/src-tauri/src/commands/personas/name_propagation_tests.rs b/desktop/src-tauri/src/commands/personas/update/name_propagation_tests.rs
similarity index 99%
rename from desktop/src-tauri/src/commands/personas/name_propagation_tests.rs
rename to desktop/src-tauri/src/commands/personas/update/name_propagation_tests.rs
index ba855ccbd6..c60215ae4d 100644
--- a/desktop/src-tauri/src/commands/personas/name_propagation_tests.rs
+++ b/desktop/src-tauri/src/commands/personas/update/name_propagation_tests.rs
@@ -50,8 +50,10 @@ fn agent(persona_id: &str, name: &str, display_name: Option<&str>) -> ManagedAge
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         definition_respond_to: None,
         definition_respond_to_allowlist: vec![],
         definition_parallelism: None,
diff --git a/desktop/src-tauri/src/commands/project_git_diff.rs b/desktop/src-tauri/src/commands/project_git_diff.rs
index 0bd07cbffd..400b48eaa5 100644
--- a/desktop/src-tauri/src/commands/project_git_diff.rs
+++ b/desktop/src-tauri/src/commands/project_git_diff.rs
@@ -25,6 +25,7 @@ pub struct ProjectRepoDiffInfo {
     pub files: Vec<ProjectRepoDiffFileInfo>,
     pub additions: usize,
     pub deletions: usize,
+    pub commit_body: Option<String>,
 }
 
 fn clean_target_ref(value: Option<String>) -> Option<String> {
@@ -340,7 +341,25 @@ fn diff_from_repo(
     repo_dir: &std::path::Path,
     auth: &GitAuthConfig,
     range: &str,
+    target_commit: Option<&str>,
 ) -> Result<ProjectRepoDiffInfo, String> {
+    let commit_body = target_commit
+        .map(|commit| {
+            run_git(
+                &[
+                    "show",
+                    "--no-patch",
+                    "--format=%b",
+                    "--end-of-options",
+                    commit,
+                ],
+                Some(repo_dir),
+                auth,
+            )
+            .map(|body| body.trim_end().to_string())
+        })
+        .transpose()?
+        .filter(|body| !body.is_empty());
     let numstat = run_git(&["diff", "--numstat", range], Some(repo_dir), auth)?;
     let files = parse_numstat(&numstat)
         .into_iter()
@@ -375,6 +394,7 @@ fn diff_from_repo(
     Ok(ProjectRepoDiffInfo {
         additions: files.iter().map(|file| file.additions).sum(),
         deletions: files.iter().map(|file| file.deletions).sum(),
+        commit_body,
         files,
     })
 }
@@ -430,7 +450,12 @@ pub async fn get_project_repo_diff(
                 diff_base_ref(&repo_dir, &auth, base_branch.as_deref()),
             ),
         };
-        diff_from_repo(&repo_dir, &auth, &range)
+        let commit_body_ref = if target_ref.is_none() && base_branch.is_none() {
+            target_commit.as_deref()
+        } else {
+            None
+        };
+        diff_from_repo(&repo_dir, &auth, &range, commit_body_ref)
     })
     .await
     .map_err(|error| format!("repo diff task failed: {error}"))?
@@ -468,7 +493,12 @@ pub async fn get_project_local_repo_diff(
             base_commit.as_deref(),
             target_commit.as_deref(),
         );
-        diff_from_repo(&repo_dir, &auth, &range).map(Some)
+        let commit_body_ref = if base_commit.is_none() && base_branch.is_none() {
+            target_commit.as_deref()
+        } else {
+            None
+        };
+        diff_from_repo(&repo_dir, &auth, &range, commit_body_ref).map(Some)
     })
     .await
     .map_err(|error| format!("local repo diff task failed: {error}"))?
diff --git a/desktop/src-tauri/src/commands/project_git_exec.rs b/desktop/src-tauri/src/commands/project_git_exec.rs
index 186c1a1cf6..e4a8ad7b41 100644
--- a/desktop/src-tauri/src/commands/project_git_exec.rs
+++ b/desktop/src-tauri/src/commands/project_git_exec.rs
@@ -173,12 +173,23 @@ fn configure_git_auth(command: &mut Command, auth: &GitAuthConfig, needs_credent
             return apply_git_config(command, &entries);
         };
         command.env("NOSTR_PRIVATE_KEY", &auth.nsec);
-        entries.push(("credential.helper", cred_helper.display().to_string()));
+        entries.push((
+            "credential.helper",
+            credential_helper_config_value(cred_helper),
+        ));
         entries.push(("credential.useHttpPath", "true".to_string()));
     }
     apply_git_config(command, &entries);
 }
 
+/// Format a path for git `credential.helper`.
+///
+/// Git for Windows invokes helpers via MinGW bash, which treats `\` as
+/// escapes. Forward slashes work on every platform git supports.
+fn credential_helper_config_value(path: &std::path::Path) -> String {
+    path.to_string_lossy().replace('\\', "/")
+}
+
 fn apply_git_config(command: &mut Command, entries: &[(&str, String)]) {
     command.env("GIT_CONFIG_COUNT", entries.len().to_string());
     for (index, (key, value)) in entries.iter().enumerate() {
@@ -316,10 +327,20 @@ fn validate_clone_url_against_relay(clone_url: &str, relay_base: &str) -> Result
 #[cfg(test)]
 mod tests {
     use super::{
-        clean_branch, clean_target_ref, git_needs_credentials, git_subcommand, validate_clone_url,
-        validate_clone_url_against_relay,
+        clean_branch, clean_target_ref, credential_helper_config_value, git_needs_credentials,
+        git_subcommand, validate_clone_url, validate_clone_url_against_relay,
     };
 
+    #[test]
+    fn credential_helper_config_value_uses_forward_slashes() {
+        let path =
+            std::path::PathBuf::from(r"C:\Users\x\AppData\Local\Buzz\git-credential-nostr.exe");
+        assert_eq!(
+            credential_helper_config_value(&path),
+            "C:/Users/x/AppData/Local/Buzz/git-credential-nostr.exe",
+        );
+    }
+
     #[test]
     fn git_subcommand_skips_global_config_options() {
         assert_eq!(
diff --git a/desktop/src-tauri/src/commands/team_snapshot.rs b/desktop/src-tauri/src/commands/team_snapshot.rs
index 0476be79a9..91a0126f58 100644
--- a/desktop/src-tauri/src/commands/team_snapshot.rs
+++ b/desktop/src-tauri/src/commands/team_snapshot.rs
@@ -129,8 +129,10 @@ fn definition_from_snapshot(
         name_pool: member.definition.name_pool.clone(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: Default::default(),
         respond_to,
         respond_to_allowlist: behavior.respond_to_allowlist,
@@ -599,8 +601,10 @@ pub async fn confirm_team_snapshot_import(
             respond_to_allowlist: definition.respond_to_allowlist.clone(),
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             definition_respond_to: respond_to_wire.clone(),
             definition_respond_to_allowlist: definition.respond_to_allowlist.clone(),
             definition_parallelism: minted_parallelism,
@@ -846,7 +850,6 @@ pub async fn confirm_team_snapshot_import(
 fn retain_agent_pending(app: &AppHandle, state: &AppState, record: &ManagedAgentRecord) {
     use crate::managed_agents::{
         agent_events::{agent_event_content, build_agent_event},
-        managed_agents_base_dir,
         persona_events::monotonic_created_at,
         retention::{get_retained_event, open_retention_db, retain_event, RetainedEvent},
     };
@@ -854,11 +857,12 @@ fn retain_agent_pending(app: &AppHandle, state: &AppState, record: &ManagedAgent
     use nostr::JsonUtil;
 
     let result = (|| -> Result<(), String> {
-        let conn = open_retention_db(&managed_agents_base_dir(app)?.join("retention.db"))?;
+        let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
+        let conn = open_retention_db(&scope.db_path)?;
         let content = serde_json::to_string(&agent_event_content(record))
             .map_err(|e| format!("failed to serialize agent content: {e}"))?;
         let (owner_pubkey, event) = {
-            let keys = state.signing_keys()?;
+            let keys = &scope.owner_keys;
             let owner_pubkey = keys.public_key().to_hex();
             let existing =
                 get_retained_event(&conn, KIND_MANAGED_AGENT, &owner_pubkey, &record.pubkey)?;
@@ -867,7 +871,7 @@ fn retain_agent_pending(app: &AppHandle, state: &AppState, record: &ManagedAgent
             }
             let event = build_agent_event(record)?
                 .custom_created_at(monotonic_created_at(existing.map(|row| row.created_at)))
-                .sign_with_keys(&keys)
+                .sign_with_keys(keys)
                 .map_err(|e| format!("failed to sign agent event: {e}"))?;
             (owner_pubkey, event)
         };
diff --git a/desktop/src-tauri/src/commands/team_snapshot/tests.rs b/desktop/src-tauri/src/commands/team_snapshot/tests.rs
index ca7dc61830..0616411307 100644
--- a/desktop/src-tauri/src/commands/team_snapshot/tests.rs
+++ b/desktop/src-tauri/src/commands/team_snapshot/tests.rs
@@ -13,6 +13,7 @@ fn member(name: &str) -> AgentSnapshot {
         version: crate::managed_agents::agent_snapshot::FORMAT_VERSION,
         definition: AgentSnapshotDefinition {
             name: name.to_string(),
+            source_is_builtin: false,
             system_prompt: Some(format!("{name} prompt")),
             runtime: Some("goose".to_string()),
             model: None,
@@ -64,8 +65,10 @@ fn team_export_round_trip_preserves_team_and_excludes_member_memory() {
             name_pool: vec![],
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             env_vars: Default::default(),
             respond_to: None,
             respond_to_allowlist: vec![],
@@ -84,8 +87,10 @@ fn team_export_round_trip_preserves_team_and_excludes_member_memory() {
             name_pool: vec![],
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             env_vars: Default::default(),
             respond_to: None,
             respond_to_allowlist: vec![],
@@ -145,8 +150,10 @@ fn team_export_with_instance_and_memory_level_uses_supplied_entries() {
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: Default::default(),
         respond_to: None,
         respond_to_allowlist: vec![],
@@ -214,8 +221,10 @@ fn team_export_with_instance_and_memory_level_uses_supplied_entries() {
         respond_to_allowlist: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         definition_respond_to: None,
         definition_respond_to_allowlist: vec![],
         definition_parallelism: None,
diff --git a/desktop/src-tauri/src/commands/teams.rs b/desktop/src-tauri/src/commands/teams.rs
index ea9a6a4958..4377ddaa43 100644
--- a/desktop/src-tauri/src/commands/teams.rs
+++ b/desktop/src-tauri/src/commands/teams.rs
@@ -39,7 +39,6 @@ fn trim_optional(value: Option<String>) -> Option<String> {
 /// happens on an actual user edit. The guard is intentionally omitted.
 pub(super) fn retain_team_pending(app: &AppHandle, state: &AppState, team: &TeamRecord) {
     use crate::managed_agents::{
-        managed_agents_base_dir,
         persona_events::monotonic_created_at,
         retention::{get_retained_event, open_retention_db, retain_event, RetainedEvent},
         team_events::build_team_event,
@@ -48,19 +47,16 @@ pub(super) fn retain_team_pending(app: &AppHandle, state: &AppState, team: &Team
     use nostr::JsonUtil;
 
     let result = (|| -> Result<(), String> {
-        let conn = open_retention_db(&managed_agents_base_dir(app)?.join("retention.db"))?;
-        let (pubkey, event) = {
-            let keys = state.keys.lock().map_err(|e| e.to_string())?;
-            let pubkey = keys.public_key().to_hex();
-            // Monotonic created_at: bump past the retained head (NIP-AP step 3).
-            let prior =
-                get_retained_event(&conn, KIND_TEAM, &pubkey, &team.id)?.map(|row| row.created_at);
-            let event = build_team_event(team)?
-                .custom_created_at(monotonic_created_at(prior))
-                .sign_with_keys(&keys)
-                .map_err(|e| format!("failed to sign team event: {e}"))?;
-            (pubkey, event)
-        };
+        let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
+        let conn = open_retention_db(&scope.db_path)?;
+        let pubkey = scope.owner_keys.public_key().to_hex();
+        // Monotonic created_at: bump past the retained head (NIP-AP step 3).
+        let prior =
+            get_retained_event(&conn, KIND_TEAM, &pubkey, &team.id)?.map(|row| row.created_at);
+        let event = build_team_event(team)?
+            .custom_created_at(monotonic_created_at(prior))
+            .sign_with_keys(&scope.owner_keys)
+            .map_err(|e| format!("failed to sign team event: {e}"))?;
         retain_event(
             &conn,
             &RetainedEvent {
@@ -90,7 +86,6 @@ pub(super) fn retain_team_pending(app: &AppHandle, state: &AppState, team: &Team
 /// disk-authoritative delete.
 fn tombstone_team_pending(app: &AppHandle, state: &AppState, d_tag: &str) {
     use crate::managed_agents::{
-        managed_agents_base_dir,
         retention::{
             delete_retained_event, open_retention_db, retain_event, tombstone_retention_d_tag,
             RetainedEvent,
@@ -103,15 +98,12 @@ fn tombstone_team_pending(app: &AppHandle, state: &AppState, d_tag: &str) {
     const KIND_DELETE: u32 = 5;
 
     let result = (|| -> Result<(), String> {
-        let (pubkey, event) = {
-            let keys = state.keys.lock().map_err(|e| e.to_string())?;
-            let pubkey = keys.public_key().to_hex();
-            let event = build_team_delete(d_tag, &pubkey)?
-                .sign_with_keys(&keys)
-                .map_err(|e| format!("failed to sign team tombstone: {e}"))?;
-            (pubkey, event)
-        };
-        let conn = open_retention_db(&managed_agents_base_dir(app)?.join("retention.db"))?;
+        let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
+        let pubkey = scope.owner_keys.public_key().to_hex();
+        let event = build_team_delete(d_tag, &pubkey)?
+            .sign_with_keys(&scope.owner_keys)
+            .map_err(|e| format!("failed to sign team tombstone: {e}"))?;
+        let conn = open_retention_db(&scope.db_path)?;
         delete_retained_event(&conn, KIND_TEAM, &pubkey, d_tag)?;
         retain_event(
             &conn,
diff --git a/desktop/src-tauri/src/commands/workspace.rs b/desktop/src-tauri/src/commands/workspace.rs
index 561e901998..731a99d9d9 100644
--- a/desktop/src-tauri/src/commands/workspace.rs
+++ b/desktop/src-tauri/src/commands/workspace.rs
@@ -10,6 +10,31 @@ use crate::managed_agents::{
 };
 use crate::relay;
 
+/// Adopt the pre-scoping global retention database's pending rows into `scope`.
+///
+/// Best-effort: a failure is logged and the boot proceeds. The migration's own
+/// crash-safety guards make the next launch retry safely, and blocking the
+/// workspace apply on it would be worse than a delayed publish.
+fn migrate_legacy_retention_into(
+    app: &AppHandle,
+    scope: &crate::managed_agents::retention::RetentionScope,
+) {
+    let Ok(base_dir) = crate::managed_agents::managed_agents_base_dir(app) else {
+        return;
+    };
+    match crate::managed_agents::retention::migrate_legacy_retention_db(
+        &base_dir,
+        &scope.db_path,
+        &scope.owner_keys.public_key().to_hex(),
+    ) {
+        Ok(0) => {}
+        Ok(copied) => {
+            eprintln!("buzz-desktop: adopted {copied} legacy retained event(s) into this community")
+        }
+        Err(error) => eprintln!("buzz-desktop: legacy retention migration failed: {error}"),
+    }
+}
+
 #[derive(Deserialize)]
 struct RelayInfoIcon {
     #[serde(default)]
@@ -187,6 +212,27 @@ pub async fn apply_workspace(
     .map_err(|e| format!("spawn_blocking failed: {e}"))??;
 
     let state = restore_app.state::<AppState>();
+    // Backfill this exact relay+owner scope only after the workspace has been
+    // applied. Running at process boot would target the fallback relay and
+    // collapse every community into one pending-event store.
+    match crate::managed_agents::retention::active_retention_scope(&restore_app, &state) {
+        Ok(scope) => {
+            // Adopt whatever the pre-scoping release left queued in the global
+            // retention database BEFORE the scoped reconcile and flush run, so
+            // stranded tombstones and archive requests publish on this boot
+            // instead of being abandoned by the storage cutover.
+            migrate_legacy_retention_into(&restore_app, &scope);
+            crate::event_sync::spawn_event_sync(
+                restore_app.clone(),
+                scope.owner_keys,
+                scope.db_path,
+            )
+        }
+        Err(error) => {
+            eprintln!("buzz-desktop: scoped event-sync unavailable after workspace apply: {error}");
+        }
+    }
+
     let restore_pending = state
         .managed_agent_restore_pending
         .swap(false, Ordering::AcqRel);
diff --git a/desktop/src-tauri/src/event_sync.rs b/desktop/src-tauri/src/event_sync.rs
index 2ec5aa1c0e..d9fe6acdb9 100644
--- a/desktop/src-tauri/src/event_sync.rs
+++ b/desktop/src-tauri/src/event_sync.rs
@@ -13,10 +13,10 @@ use std::path::Path;
 /// `sync_team_personas` wrote in [`crate::migration::run_boot_migrations`]
 /// (see its `# Ordering` guard). Event signing needs the resolved owner keys,
 /// so this runs after identity resolution, not in the boot migrations.
-pub fn run_event_sync(app: &tauri::AppHandle, owner_keys: &nostr::Keys) {
-    migrate_personas_to_events(app, owner_keys);
-    migrate_teams_to_events(app, owner_keys);
-    crate::managed_agents::reconcile::reconcile_agents_to_events(app, owner_keys);
+pub fn run_event_sync(app: &tauri::AppHandle, owner_keys: &nostr::Keys, db_path: &Path) {
+    migrate_personas_to_events(app, owner_keys, db_path);
+    migrate_teams_to_events(app, owner_keys, db_path);
+    crate::managed_agents::reconcile::reconcile_agents_to_events(app, owner_keys, db_path);
 }
 
 /// Spawn the best-effort event reconcile off the synchronous Tauri setup path.
@@ -25,10 +25,14 @@ pub fn run_event_sync(app: &tauri::AppHandle, owner_keys: &nostr::Keys) {
 /// `AppState::keys` mutex. The reconcile itself is still synchronous JSON,
 /// SQLite, and signing work, so it runs on the blocking pool rather than an
 /// async worker.
-pub fn spawn_event_sync(app: tauri::AppHandle, owner_keys: nostr::Keys) {
+pub fn spawn_event_sync(
+    app: tauri::AppHandle,
+    owner_keys: nostr::Keys,
+    db_path: std::path::PathBuf,
+) {
     tauri::async_runtime::spawn(async move {
         if let Err(e) = tauri::async_runtime::spawn_blocking(move || {
-            run_event_sync(&app, &owner_keys);
+            run_event_sync(&app, &owner_keys, &db_path);
         })
         .await
         {
@@ -57,14 +61,14 @@ pub fn spawn_event_sync(app: tauri::AppHandle, owner_keys: nostr::Keys) {
 /// `pending_sync = 1` for later relay publish. Migration succeeds on local
 /// write, not relay acknowledgment. Every retained row is a real signed
 /// event — there is no placeholder path.
-pub fn migrate_personas_to_events(app: &tauri::AppHandle, keys: &nostr::Keys) {
+pub fn migrate_personas_to_events(app: &tauri::AppHandle, keys: &nostr::Keys, db_path: &Path) {
     use crate::managed_agents::managed_agents_base_dir;
 
     let Ok(base_dir) = managed_agents_base_dir(app) else {
         return;
     };
 
-    match migrate_personas_in_dir(&base_dir, keys) {
+    match migrate_personas_in_dir_at(&base_dir, keys, db_path) {
         Ok(0) => {}
         Ok(migrated) => {
             eprintln!(
@@ -82,7 +86,16 @@ pub fn migrate_personas_to_events(app: &tauri::AppHandle, keys: &nostr::Keys) {
 /// Returns the number of personas (re)written to the retention store. Returns
 /// `Ok(0)` when every non-builtin persona already has a matching retained row
 /// (or there are none to reconcile).
+#[cfg(test)]
 fn migrate_personas_in_dir(base_dir: &Path, keys: &nostr::Keys) -> Result<u32, String> {
+    migrate_personas_in_dir_at(base_dir, keys, &base_dir.join("retention.db"))
+}
+
+fn migrate_personas_in_dir_at(
+    base_dir: &Path,
+    keys: &nostr::Keys,
+    db_path: &Path,
+) -> Result<u32, String> {
     use crate::managed_agents::{
         persona_events::{build_persona_event, monotonic_created_at, persona_d_tag},
         retention::{get_retained_event, open_retention_db, retain_event, RetainedEvent},
@@ -127,9 +140,8 @@ fn migrate_personas_in_dir(base_dir: &Path, keys: &nostr::Keys) -> Result<u32, S
     }
 
     // Open (or create) the retention database.
-    let db_path = base_dir.join("retention.db");
     let conn =
-        open_retention_db(&db_path).map_err(|e| format!("failed to open retention db: {e}"))?;
+        open_retention_db(db_path).map_err(|e| format!("failed to open retention db: {e}"))?;
 
     let mut migrated = 0u32;
 
@@ -149,7 +161,12 @@ fn migrate_personas_in_dir(base_dir: &Path, keys: &nostr::Keys) -> Result<u32, S
         // bump (F1) so a changed body always lands.
         let existing = get_retained_event(&conn, KIND_PERSONA, &pubkey, &d_tag)?;
 
-        let event = build_persona_event(record)
+        let mut scoped_record = record.clone();
+        scoped_record.shared = existing
+            .as_ref()
+            .and_then(|row| nostr::Event::from_json(&row.raw_event).ok())
+            .is_some_and(|event| buzz_core_pkg::kind::persona_event_is_shared(&event));
+        let event = build_persona_event(&scoped_record)
             .map_err(|e| format!("failed to build event for '{}': {e}", record.display_name))?
             .custom_created_at(monotonic_created_at(
                 existing.as_ref().map(|row| row.created_at),
@@ -202,14 +219,14 @@ fn migrate_personas_in_dir(base_dir: &Path, keys: &nostr::Keys) -> Result<u32, S
 ///
 /// Must run after the persisted identity is resolved (it signs each event with
 /// the owner's keys).
-pub fn migrate_teams_to_events(app: &tauri::AppHandle, keys: &nostr::Keys) {
+pub fn migrate_teams_to_events(app: &tauri::AppHandle, keys: &nostr::Keys, db_path: &Path) {
     use crate::managed_agents::managed_agents_base_dir;
 
     let Ok(base_dir) = managed_agents_base_dir(app) else {
         return;
     };
 
-    match migrate_teams_in_dir(&base_dir, keys) {
+    match migrate_teams_in_dir_at(&base_dir, keys, db_path) {
         Ok(0) => {}
         Ok(migrated) => {
             eprintln!("buzz-desktop: team-event-migration: {migrated} teams migrated to retention");
@@ -225,7 +242,16 @@ pub fn migrate_teams_to_events(app: &tauri::AppHandle, keys: &nostr::Keys) {
 /// Returns the number of teams (re)written to the retention store. The
 /// per-coordinate content compare matches [`migrate_personas_in_dir`]: an
 /// unchanged team is skipped so a launch does not churn `pending_sync`.
+#[cfg(test)]
 fn migrate_teams_in_dir(base_dir: &Path, keys: &nostr::Keys) -> Result<u32, String> {
+    migrate_teams_in_dir_at(base_dir, keys, &base_dir.join("retention.db"))
+}
+
+fn migrate_teams_in_dir_at(
+    base_dir: &Path,
+    keys: &nostr::Keys,
+    db_path: &Path,
+) -> Result<u32, String> {
     use crate::managed_agents::{
         persona_events::monotonic_created_at,
         retention::{get_retained_event, open_retention_db, retain_event, RetainedEvent},
@@ -252,9 +278,8 @@ fn migrate_teams_in_dir(base_dir: &Path, keys: &nostr::Keys) -> Result<u32, Stri
         return Ok(0);
     }
 
-    let db_path = base_dir.join("retention.db");
     let conn =
-        open_retention_db(&db_path).map_err(|e| format!("failed to open retention db: {e}"))?;
+        open_retention_db(db_path).map_err(|e| format!("failed to open retention db: {e}"))?;
 
     let mut migrated = 0u32;
 
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index 3597636cc3..c036613c2b 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -29,6 +29,8 @@ mod secret_store;
 mod shutdown;
 mod templates;
 mod util;
+#[cfg(target_os = "linux")]
+pub mod webkit_rendering;
 use app_state::{build_app_state, resolve_persisted_identity, AppState};
 use builderlab::*;
 use commands::*;
@@ -418,16 +420,6 @@ pub fn run() {
                 .load(std::sync::atomic::Ordering::Acquire);
             let recovery_mode = identity_lost || keyring_locked;
 
-            // Snapshot owner keys after identity resolution; the best-effort
-            // event reconcile itself runs off the synchronous setup path below.
-            let owner_keys = match state.keys.lock() {
-                Ok(k) => k.clone(),
-                Err(e) => {
-                    eprintln!("buzz-desktop: fatal: owner keys lock poisoned: {e}");
-                    std::process::exit(1);
-                }
-            };
-
             // Backfill the pinned persona snapshot for any pre-existing agent
             // that predates the record-authoritative-spawn cutover (persona_id
             // set but no source_version). Must run before
@@ -438,6 +430,21 @@ pub fn run() {
                 eprintln!("buzz-desktop: persona-snapshot backfill failed: {e}");
             }
 
+            // Warm the loaded-harness registry BEFORE restore so cold-launch
+            // agent spawns can resolve custom/preset runtime ids without
+            // waiting for the frontend's discover_acp_providers call.  This is
+            // a pure directory scan — no PATH probing, no async work.
+            {
+                let custom_dir = app_handle
+                    .path()
+                    .app_data_dir()
+                    .ok()
+                    .map(|d| d.join("custom_harnesses"));
+                managed_agents::custom_harnesses::warm_harness_registry_from_dir(
+                    custom_dir.as_deref(),
+                );
+            }
+
             // Store the AppHandle so huddle commands can emit `huddle-state-changed`
             // events via `huddle::emit_huddle_state` without threading the handle
             // through every call site.
@@ -532,15 +539,6 @@ pub fn run() {
 
             try_regenerate_nest(&app_handle);
 
-            // Sync team-dir edits and reconcile persona/team/agent events after
-            // setup can continue. It is best-effort retention backfill, unlike
-            // identity resolution above, so JSON/SQLite/signing work must not
-            // hold the boot path hostage. Skipped in recovery mode — the owner
-            // key is ephemeral.
-            if !recovery_mode {
-                event_sync::spawn_event_sync(app_handle.clone(), owner_keys);
-            }
-
             if let Some(mgr) = huddle::models::global_model_manager() {
                 mgr.start_stt_download(state.http_client.clone());
                 mgr.start_tts_download(state.http_client.clone());
@@ -623,17 +621,13 @@ pub fn run() {
                 tauri::async_runtime::spawn(async move {
                     use std::time::Duration;
                     use tauri::Manager;
-                    let Ok(db_path) = managed_agents::managed_agents_base_dir(&flush_handle)
-                        .map(|d| d.join("retention.db"))
-                    else {
-                        eprintln!("buzz-desktop: event-flush: cannot resolve retention db path");
-                        return;
-                    };
                     loop {
                         let state = flush_handle.state::<AppState>();
-                        if let Err(e) =
-                            managed_agents::persona_events::flush_pending_events(&db_path, &state)
-                                .await
+                        if let Err(e) = managed_agents::persona_events::flush_active_pending_events(
+                            &flush_handle,
+                            &state,
+                        )
+                        .await
                         {
                             eprintln!("buzz-desktop: event-flush: {e}");
                         }
@@ -704,6 +698,8 @@ pub fn run() {
             discover_acp_providers,
             discover_git_bash_prerequisite,
             install_acp_runtime,
+            save_custom_harness,
+            delete_custom_harness,
             connect_acp_runtime,
             discover_managed_agent_prereqs,
             sign_event,
@@ -809,8 +805,10 @@ pub fn run() {
             list_personas,
             create_persona,
             update_persona,
+            update_persona_and_publish,
             delete_persona,
             set_persona_active,
+            set_persona_shared,
             reconcile_inbound_persona_event,
             list_channel_templates,
             create_channel_template,
@@ -878,6 +876,7 @@ pub fn run() {
             validate_repos_dir,
             get_active_workspace,
             fetch_workspace_icon,
+            fetch_join_policy,
             set_prevent_sleep_active,
             get_agent_memory,
             relay_reconnect_hook,
diff --git a/desktop/src-tauri/src/main.rs b/desktop/src-tauri/src/main.rs
index 13cb6c1b70..ebcc127683 100644
--- a/desktop/src-tauri/src/main.rs
+++ b/desktop/src-tauri/src/main.rs
@@ -2,5 +2,15 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 fn main() {
+    // Before anything else: WebKitGTK reads its rendering environment once at
+    // process start, and this is the only point where the process is still
+    // single threaded and no GTK object exists yet, which is what makes
+    // `std::env::set_var` sound.
+    #[cfg(target_os = "linux")]
+    if let Err(diagnostic) = buzz_lib::webkit_rendering::apply() {
+        eprintln!("buzz-desktop: {diagnostic}");
+        std::process::exit(1);
+    }
+
     buzz_lib::run()
 }
diff --git a/desktop/src-tauri/src/managed_agents/agent_events.rs b/desktop/src-tauri/src/managed_agents/agent_events.rs
index ba4407d164..4a7b80079d 100644
--- a/desktop/src-tauri/src/managed_agents/agent_events.rs
+++ b/desktop/src-tauri/src/managed_agents/agent_events.rs
@@ -208,8 +208,10 @@ mod tests {
             name_pool: vec!["poolname".to_string()],
             is_builtin: true,
             is_active: false,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             definition_respond_to: None,
             definition_respond_to_allowlist: Vec::new(),
             definition_parallelism: None,
diff --git a/desktop/src-tauri/src/managed_agents/agent_snapshot.rs b/desktop/src-tauri/src/managed_agents/agent_snapshot.rs
index b0bf8f5991..16a0d35b23 100644
--- a/desktop/src-tauri/src/managed_agents/agent_snapshot.rs
+++ b/desktop/src-tauri/src/managed_agents/agent_snapshot.rs
@@ -31,7 +31,11 @@
 //!   - lineage ids: `persona_id`, `team_id`, `source_team`, `source_team_persona_slug`,
 //!     `persona_source_version`
 //!   - internal bookkeeping: `start_on_app_launch`,
-//!     `auto_restart_on_config_change`, `is_builtin`
+//!     `auto_restart_on_config_change`
+//!
+//! The portable `sourceIsBuiltIn` hint preserves how the exported definition
+//! should be described in an import preview. It never grants built-in status
+//! to the newly imported definition.
 //!
 //! These exclusions are enforced by construction (only explicit fields are
 //! placed into `AgentSnapshotDefinition`) and asserted by unit tests.
@@ -87,6 +91,10 @@ pub enum MemoryLevel {
 #[serde(rename_all = "camelCase")]
 pub struct AgentSnapshotDefinition {
     pub name: String,
+    /// Portable source classification for import-preview metadata. Imported
+    /// definitions are still created as custom agents with fresh identities.
+    #[serde(default)]
+    pub source_is_builtin: bool,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub system_prompt: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -191,6 +199,7 @@ pub fn build_snapshot(
             .display_name
             .clone()
             .unwrap_or_else(|| record.name.clone()),
+        source_is_builtin: record.is_builtin,
         system_prompt: record.system_prompt.clone(),
         runtime: record.runtime.clone(),
         model: record.model.clone(),
@@ -526,9 +535,11 @@ mod tests {
             name_pool: vec!["Alice".to_string(), "Bob".to_string()],
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: Some("team-id-123".to_string()), // MUST NOT appear
             source_team_persona_slug: Some("lep".to_string()), // MUST NOT appear
             definition_respond_to: Some("allowlist".to_string()),
+            catalog_source: None,
             definition_respond_to_allowlist: vec!["abc123def".to_string()],
             definition_parallelism: Some(4),
             relay_mesh: None,
@@ -913,6 +924,7 @@ mod tests {
         let snapshot = build_snapshot(&record, MemoryLevel::None, vec![], None);
 
         assert_eq!(snapshot.definition.name, "Test Agent Display");
+        assert!(!snapshot.definition.source_is_builtin);
         assert_eq!(
             snapshot.definition.system_prompt.as_deref(),
             Some("You are a test agent.")
diff --git a/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs b/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs
index 4c11cd6c49..4ee4ec79c3 100644
--- a/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs
+++ b/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs
@@ -106,8 +106,10 @@ fn test_record() -> ManagedAgentRecord {
         name_pool: Vec::new(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         definition_respond_to: None,
         definition_respond_to_allowlist: Vec::new(),
         definition_parallelism: None,
diff --git a/desktop/src-tauri/src/managed_agents/custom_harnesses.rs b/desktop/src-tauri/src/managed_agents/custom_harnesses.rs
new file mode 100644
index 0000000000..e6bc09496c
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/custom_harnesses.rs
@@ -0,0 +1,1231 @@
+//! Loader for user-defined ACP harness definitions.
+//!
+//! Users drop JSON files into `<app-data>/custom_harnesses/` to register
+//! arbitrary ACP-speaking agents without modifying the app or opening a PR.
+//! Each file describes a single harness; the loader validates, warns on
+//! invalid entries, and never propagates errors to the discovery caller.
+//!
+//! **Security constraint (Will-ratified):** custom definitions carry NO install
+//! shell commands. `can_auto_install` is always `false` for custom entries.
+//! Only tier-1 compiled-in runtimes retain install-script power.
+//!
+//! **Avatar URL security:** custom/preset catalog entries MUST NOT carry
+//! user-supplied avatar URLs. `HarnessDefinition` intentionally omits
+//! `avatar_url` — all icons are bundled assets keyed via `RUNTIME_LOGOS`.
+
+use std::collections::BTreeMap;
+use std::path::Path;
+
+use serde::{Deserialize, Serialize};
+
+/// Regex-equivalent predicate for a valid harness ID.
+///
+/// IDs must match `[a-z0-9_][a-z0-9_-]*` — lowercase alphanumeric plus
+/// hyphens and underscores, starting with an alphanumeric or underscore.
+/// This mirrors goose's `generate_id` validation and is intentionally
+/// more restrictive than the filesystem to prevent path-traversal tricks.
+fn is_valid_harness_id(id: &str) -> bool {
+    let mut chars = id.chars();
+    match chars.next() {
+        Some(c) if c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' => {}
+        _ => return false,
+    }
+    chars.all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '-')
+}
+
+/// Public re-export of `is_valid_harness_id` for callers outside this module
+/// (e.g., the `delete_custom_harness` command that must validate caller-supplied ids).
+pub(crate) fn is_valid_harness_id_pub(id: &str) -> bool {
+    is_valid_harness_id(id)
+}
+
+/// User-supplied harness definition deserialized from a JSON file.
+///
+/// Only the fields a custom harness definition is permitted to carry are
+/// included here — install commands and avatar URLs are intentionally absent
+/// (security line: no remote icon URLs from user-editable config).
+#[derive(Debug, Clone, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct HarnessDefinition {
+    /// Unique identifier, must match `[a-z0-9_][a-z0-9_-]*`.
+    pub id: String,
+    /// Human-readable name shown in the UI.
+    pub label: String,
+    /// Primary executable name or absolute path. May not be empty.
+    pub command: String,
+    /// Default CLI arguments passed to the command (array, not split-string).
+    #[serde(default)]
+    pub args: Vec<String>,
+    /// Environment variables injected at spawn time. Definition env is applied
+    /// first and LOSES on conflict with Buzz-injected vars — `BUZZ_MANAGED_AGENT`
+    /// is always authoritative and cannot be overridden here.
+    #[serde(default)]
+    pub env: BTreeMap<String, String>,
+    /// Link to external docs for manual install/setup instructions.
+    #[serde(default)]
+    pub install_instructions_url: String,
+    /// Human-readable install hint shown in Doctor.
+    #[serde(default)]
+    pub install_hint: String,
+}
+
+/// Scan `dir` for `*.json` files and deserialize each into a `HarnessDefinition`.
+///
+/// Errors per file are logged with `tracing::warn` and skipped — a single
+/// malformed file never fails discovery for the rest.  Returns only
+/// structurally valid, individually validated definitions.
+///
+/// Filtering is applied HERE — at the loader boundary — so every consumer
+/// (discovery Phase 3, `warm_harness_registry_from_dir`, and through it the
+/// spawn/readiness registry) inherits the same guarantees:
+///   * `check_id_collision` — a hand-placed `goose.json` can never shadow a
+///     built-in or preset id, even on the cold-launch warm path;
+///   * duplicate-id dedup within the directory (first file wins).
+///
+/// **Callers must supply a fresh `dir` path on every `discover_acp_runtimes`
+/// call** — this function performs no caching, mirroring goose's
+/// `refresh_custom_providers()` pattern.
+pub(crate) fn load_custom_harnesses(dir: &Path) -> Vec<HarnessDefinition> {
+    let entries = match std::fs::read_dir(dir) {
+        Ok(e) => e,
+        Err(err) if err.kind() == std::io::ErrorKind::NotFound => return vec![],
+        Err(err) => {
+            tracing::warn!(
+                "custom_harnesses: cannot read directory {}: {err}",
+                dir.display()
+            );
+            return vec![];
+        }
+    };
+
+    let mut definitions = Vec::new();
+    let mut seen_ids = std::collections::HashSet::new();
+
+    for entry in entries.flatten() {
+        let path = entry.path();
+        if path.extension().and_then(|e| e.to_str()) != Some("json") {
+            continue;
+        }
+
+        let contents = match std::fs::read_to_string(&path) {
+            Ok(s) => s,
+            Err(err) => {
+                tracing::warn!("custom_harnesses: failed to read {}: {err}", path.display());
+                continue;
+            }
+        };
+
+        let def: HarnessDefinition = match serde_json::from_str(&contents) {
+            Ok(d) => d,
+            Err(err) => {
+                tracing::warn!(
+                    "custom_harnesses: invalid JSON in {}: {err}",
+                    path.display()
+                );
+                continue;
+            }
+        };
+
+        if let Err(reason) = validate_harness_definition(&def) {
+            tracing::warn!("custom_harnesses: skipping {} — {reason}", path.display());
+            continue;
+        }
+
+        // A custom file must never shadow a built-in or preset id — enforced at
+        // the loader so the warm path can't admit what discovery would reject.
+        if let Err(reason) = check_id_collision(&def.id) {
+            tracing::warn!("custom_harnesses: skipping {} — {reason}", path.display());
+            continue;
+        }
+
+        // Dedup within the directory itself (a file's id is taken from its JSON
+        // content, not its filename, so two files can carry the same id).
+        if !seen_ids.insert(def.id.clone()) {
+            tracing::warn!(
+                "custom_harnesses: skipping {} — duplicate id {:?}",
+                path.display(),
+                def.id
+            );
+            continue;
+        }
+
+        definitions.push(def);
+    }
+
+    definitions
+}
+
+/// Validate a deserialized `HarnessDefinition` against the invariants that
+/// the rest of the discovery code depends on.
+fn validate_harness_definition(def: &HarnessDefinition) -> Result<(), String> {
+    if def.id.is_empty() {
+        return Err("id must not be empty".into());
+    }
+    if !is_valid_harness_id(&def.id) {
+        return Err(format!(
+            "id {:?} does not match [a-z0-9_][a-z0-9_-]* — use lowercase letters, digits, hyphens, and underscores only",
+            def.id
+        ));
+    }
+    if def.command.trim().is_empty() {
+        return Err("command must not be empty".into());
+    }
+    if def.label.trim().is_empty() {
+        return Err("label must not be empty".into());
+    }
+    // Args travel to the harness through the comma-delimited
+    // `BUZZ_ACP_AGENT_ARGS` env transport (clap `value_delimiter = ','` on the
+    // buzz-acp side), so a literal comma inside one argument would silently
+    // split into two arguments at runtime. Reject at the validation boundary —
+    // shared by save (UI/Tauri) and load (hand-authored files) — so the
+    // invariant holds regardless of how the definition arrives.
+    if let Some(arg) = def.args.iter().find(|a| a.contains(',')) {
+        return Err(format!(
+            "args: argument {arg:?} contains a comma — arguments are passed via a \
+             comma-delimited transport and would be split at spawn time; \
+             use separate argument entries instead"
+        ));
+    }
+    // Validate env keys through the shared boundary validator.  This closes the
+    // reserved-key bypass exploit (BUZZ_AUTH_TAG=x forgery shape), rejects
+    // NUL bytes that would panic Command::env, and enforces size limits.
+    crate::managed_agents::env_vars::validate_user_env_keys(&def.env)
+        .map_err(|e| format!("env: {e}"))?;
+    // Validate install instructions URL scheme when non-empty.
+    if !def.install_instructions_url.is_empty() {
+        let url = def.install_instructions_url.trim();
+        if !url.starts_with("https://") && !url.starts_with("http://") {
+            return Err(format!(
+                "installInstructionsUrl must start with https:// or http://, got: {:?}",
+                url
+            ));
+        }
+    }
+    Ok(())
+}
+
+/// Public wrapper so the `save_custom_harness` Tauri command can validate
+/// without duplicating the rules.
+pub(crate) fn validate_harness_definition_pub(def: &HarnessDefinition) -> Result<(), String> {
+    validate_harness_definition(def)
+}
+
+// ── Built-in ID set ──────────────────────────────────────────────────────────
+
+/// IDs reserved for the compiled-in catalog. A custom definition whose `id`
+/// collides with a built-in or preset is rejected to prevent shadowing (e.g. a
+/// file called `cursor.json` hiding the pre-existing tier-2 preset).
+///
+/// Derived at compile time from `PRESET_HARNESSES` (tier-2) plus the four
+/// tier-1 runtimes — no hand-maintained copy.  Adding a preset to
+/// `PRESET_HARNESSES` automatically reserves its ID without a separate edit.
+fn builtin_ids() -> impl Iterator<Item = &'static str> {
+    const TIER1: &[&str] = &["goose", "claude", "codex", "buzz-agent"];
+    let tier2 = crate::managed_agents::discovery::preset_harness_ids();
+    TIER1.iter().copied().chain(tier2.iter().copied())
+}
+
+/// Return an error string if `id` conflicts with a built-in harness ID.
+pub(crate) fn check_id_collision(id: &str) -> Result<(), String> {
+    if builtin_ids().any(|reserved| reserved.eq_ignore_ascii_case(id)) {
+        return Err(format!(
+            "id {:?} is reserved for a built-in harness and cannot be overridden",
+            id
+        ));
+    }
+    Ok(())
+}
+
+// ── Loaded harness registry (F2 — spawn resolution for custom/preset) ────────
+//
+// `known_acp_runtime` / `known_acp_runtime_exact` only search the static
+// `KNOWN_ACP_RUNTIMES` table, so custom and preset harnesses were invisible at
+// spawn time, causing silent fallback to buzz-agent.
+//
+// The fix: `discover_acp_runtimes_from` populates this registry with every
+// non-builtin definition after each discovery run. Spawn, readiness, and
+// summary paths query `lookup_loaded_harness` to get the live definition for a
+// given id or command. If a harness id that an agent references is gone from the
+// registry, the caller gets a typed error — never a silent buzz-agent fallback.
+
+use std::sync::{Arc, RwLock};
+
+/// Mutex used by tests to serialize writes to the loaded-harness registry.
+///
+/// The registry is a process-global singleton.  Parallel test execution can
+/// interleave warm → lookup pairs from different tests, causing false failures.
+/// Every test that calls `warm_harness_registry_from_dir` or
+/// `update_loaded_harness_registry` must hold this guard for the lifetime of
+/// its assertion block.
+#[cfg(test)]
+pub(crate) fn registry_test_lock() -> std::sync::MutexGuard<'static, ()> {
+    use std::sync::{Mutex, OnceLock};
+    static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
+    LOCK.get_or_init(|| Mutex::new(()))
+        .lock()
+        .unwrap_or_else(|e| e.into_inner())
+}
+
+/// Thread-safe registry of non-builtin (preset + custom) harness definitions,
+/// populated on every `discover_acp_runtimes_from` call and queried at spawn time.
+fn loaded_harness_registry() -> &'static RwLock<Vec<Arc<HarnessDefinition>>> {
+    use std::sync::OnceLock;
+    static REGISTRY: OnceLock<RwLock<Vec<Arc<HarnessDefinition>>>> = OnceLock::new();
+    REGISTRY.get_or_init(|| RwLock::new(Vec::new()))
+}
+
+/// Replace the registry contents with `definitions`. Called once per
+/// `discover_acp_runtimes_from` run AND on `save_custom_harness` /
+/// `delete_custom_harness` so spawn can always resolve the harness without
+/// waiting for the next full discovery.
+pub(crate) fn update_loaded_harness_registry(definitions: Vec<HarnessDefinition>) {
+    let arcs: Vec<Arc<HarnessDefinition>> = definitions.into_iter().map(Arc::new).collect();
+    // Use `into_inner` to recover from a poisoned lock — the registry is a
+    // plain replaceable Vec with no torn invariant, so poison recovery is safe.
+    let mut guard = match loaded_harness_registry().write() {
+        Ok(g) => g,
+        Err(poisoned) => {
+            tracing::warn!("custom_harnesses: loaded-harness registry was poisoned; recovering");
+            poisoned.into_inner()
+        }
+    };
+    *guard = arcs;
+}
+
+/// Look up a loaded (non-builtin) harness by **id**. Returns `None` when the id
+/// is unknown. Uses `into_inner` to recover from a poisoned lock so a panic in
+/// one thread never permanently blocks all spawn attempts.
+pub(crate) fn lookup_loaded_harness_by_id(id: &str) -> Option<Arc<HarnessDefinition>> {
+    let guard = match loaded_harness_registry().read() {
+        Ok(g) => g,
+        Err(poisoned) => {
+            tracing::warn!(
+                "custom_harnesses: loaded-harness registry read lock was poisoned; recovering"
+            );
+            poisoned.into_inner()
+        }
+    };
+    guard.iter().find(|d| d.id == id).cloned()
+}
+
+/// Warm the loaded-harness registry synchronously from `custom_dir`.
+///
+/// Must be called **before** `restore_managed_agents_on_launch` so that cold
+/// relaunches can resolve custom/preset harness ids without a full discover
+/// round-trip (which is driven by the frontend and arrives later).
+///
+/// This is intentionally lightweight: it only loads the custom JSON files and
+/// the static preset list — no PATH probing, no availability checks.
+pub(crate) fn warm_harness_registry_from_dir(custom_dir: Option<&std::path::Path>) {
+    // Load only the preset list from the discovery module (static, free).
+    let preset_defs = crate::managed_agents::discovery::preset_harness_definitions();
+    let custom_defs = custom_dir.map(load_custom_harnesses).unwrap_or_default();
+    let mut all: Vec<HarnessDefinition> = preset_defs;
+    all.extend(custom_defs);
+    update_loaded_harness_registry(all);
+}
+
+/// Publish the loaded-harness registry from a **fresh** directory read while
+/// holding the persist mutex — the discovery-side counterpart of
+/// `save_and_warm` / `delete_and_warm`.
+///
+/// `discover_acp_runtimes_from` runs slow auth probes between its directory
+/// scan and its registry publish. Publishing the pre-probe snapshot could
+/// clobber a `save_and_warm` that landed in that window, leaving a freshly
+/// saved harness unresolvable at spawn until the next discovery. Re-reading
+/// the directory at publish time, under the same mutex as save/delete, makes
+/// the documented guarantee ("the registry always reflects disk at warm time")
+/// actually hold. Only the publish is locked — never the probes.
+pub(crate) fn warm_harness_registry_locked(custom_dir: Option<&std::path::Path>) {
+    let _guard = persist_mutex().lock().unwrap_or_else(|e| e.into_inner());
+    warm_harness_registry_from_dir(custom_dir);
+}
+
+/// Global mutex that serializes save/delete filesystem mutations and the
+/// subsequent registry warm as a single atomic unit.
+///
+/// Without this lock, two concurrent `save_custom_harness` calls could
+/// interleave: A writes file-A, B writes file-B, B re-warms (sees only B),
+/// A re-warms (sees A + B, wins) — but if timing goes the other way B's warm
+/// wins and misses A. Holding the lock for the write+warm pair guarantees that
+/// the registry always reflects the complete set of files on disk at the time
+/// of the warm.
+fn persist_mutex() -> &'static std::sync::Mutex<()> {
+    use std::sync::{Mutex, OnceLock};
+    static PERSIST: OnceLock<Mutex<()>> = OnceLock::new();
+    PERSIST.get_or_init(|| Mutex::new(()))
+}
+
+/// Write `definition` to `dir`, then atomically warm the loaded-harness
+/// registry.  Callers MUST use this function (not `save_custom_harness_to_dir`
+/// or `warm_harness_registry_from_dir` separately) so that concurrent saves
+/// cannot produce a stale registry snapshot.
+pub(crate) fn save_and_warm(
+    dir: &Path,
+    definition: &HarnessDefinition,
+    rename_old_id: Option<&str>,
+) -> Result<SaveOutcome, String> {
+    let _guard = persist_mutex().lock().unwrap_or_else(|e| e.into_inner());
+    let outcome = save_custom_harness_to_dir(dir, definition, rename_old_id)?;
+    warm_harness_registry_from_dir(Some(dir));
+    Ok(outcome)
+}
+
+/// Delete `id.json` from `dir`, then atomically warm the loaded-harness
+/// registry.  Callers MUST use this function (not `fs::remove_file` +
+/// `warm_harness_registry_from_dir` separately) for the same reason as
+/// `save_and_warm`.
+pub(crate) fn delete_and_warm(dir: &Path, id: &str) -> Result<(), String> {
+    let _guard = persist_mutex().lock().unwrap_or_else(|e| e.into_inner());
+    let target = dir.join(format!("{id}.json"));
+    match std::fs::remove_file(&target) {
+        Ok(()) => {}
+        Err(e) if e.kind() == std::io::ErrorKind::NotFound => {}
+        Err(e) => return Err(format!("failed to delete harness {id:?}: {e}")),
+    }
+    warm_harness_registry_from_dir(Some(dir));
+    Ok(())
+}
+
+/// The outcome of a successful [`save_custom_harness_to_dir`] call.
+#[allow(dead_code)] // Fields consumed by tests; production callers use the Result shape.
+pub(crate) struct SaveOutcome {
+    /// The path of the newly written harness file.
+    pub target_path: std::path::PathBuf,
+    /// The path of the old file that was removed on a rename, if any.
+    /// `None` when the id was unchanged or this was a new harness.
+    pub removed_old_path: Option<std::path::PathBuf>,
+}
+
+/// Write a harness definition to `dir/<id>.json` using a backup-swap strategy
+/// that is safe on all platforms (including Windows where `fs::rename` over an
+/// existing file fails with "access denied"):
+///
+/// 1. Serialize the definition and write it to a unique temp file via
+///    `atomic_write_file`.
+/// 2. If the target already exists, rename it to `<target>.bak` (the backup).
+/// 3. `commit()` the temp file (renames temp → target).
+///    * On success: delete `.bak` (best-effort; a stale `.bak` is harmless).
+///    * On failure: restore `.bak` → target so the original is never lost.
+/// 4. If `rename_old_id` is `Some`, remove `<dir>/<old_id>.json` after the
+///    new file is committed (non-fatal if NotFound).
+///
+/// The caller is responsible for full validation (id, env, etc.) BEFORE
+/// calling this function — no validation is performed here.
+pub(crate) fn save_custom_harness_to_dir(
+    dir: &Path,
+    definition: &HarnessDefinition,
+    rename_old_id: Option<&str>,
+) -> Result<SaveOutcome, String> {
+    use atomic_write_file::AtomicWriteFile;
+    use std::io::Write;
+
+    let json = serde_json::to_string_pretty(definition)
+        .map_err(|e| format!("failed to serialize harness definition: {e}"))?;
+
+    let target_path = dir.join(format!("{}.json", definition.id));
+    let bak_path = dir.join(format!("{}.json.bak", definition.id));
+
+    // Stage write to temp file.
+    let mut file = AtomicWriteFile::open(&target_path)
+        .map_err(|e| format!("failed to open {}: {e}", target_path.display()))?;
+    file.write_all(json.as_bytes())
+        .map_err(|e| format!("failed to write harness definition: {e}"))?;
+
+    // Back up the existing target before committing so we can restore on failure.
+    let had_backup = if target_path.exists() {
+        std::fs::rename(&target_path, &bak_path).map_err(|e| {
+            format!(
+                "failed to back up {} before replace: {e}",
+                target_path.display()
+            )
+        })?;
+        true
+    } else {
+        false
+    };
+
+    // Commit temp → target.  If commit fails and we made a backup, restore it.
+    if let Err(e) = file.commit() {
+        if had_backup {
+            if let Err(restore_err) = std::fs::rename(&bak_path, &target_path) {
+                // Both commit and restore failed — surface both so the user
+                // can recover manually.
+                return Err(format!(
+                    "failed to finalize harness definition: {e}; \
+                     also failed to restore backup: {restore_err} \
+                     (original may be at {})",
+                    bak_path.display()
+                ));
+            }
+        }
+        return Err(format!("failed to finalize harness definition: {e}"));
+    }
+
+    // Commit succeeded — remove the backup (best-effort; stale .bak is harmless).
+    if had_backup {
+        let _ = std::fs::remove_file(&bak_path);
+    }
+
+    // Remove old file on id rename, after the new file is committed.
+    let mut removed_old_path = None;
+    if let Some(old_id) = rename_old_id {
+        let old_path = dir.join(format!("{old_id}.json"));
+        match std::fs::remove_file(&old_path) {
+            Ok(()) => removed_old_path = Some(old_path),
+            Err(e) if e.kind() == std::io::ErrorKind::NotFound => {}
+            Err(e) => {
+                // New file is already committed — log and continue so the
+                // registry re-warm picks up the new id.
+                tracing::warn!(
+                    "save_custom_harness_to_dir: failed to remove old harness {old_id:?}: {e}"
+                );
+            }
+        }
+    }
+
+    Ok(SaveOutcome {
+        target_path,
+        removed_old_path,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::fs;
+
+    // ── ID validation ────────────────────────────────────────────────────────
+
+    #[test]
+    fn valid_id_lowercase_with_hyphen() {
+        assert!(is_valid_harness_id("my-agent"));
+    }
+
+    #[test]
+    fn valid_id_underscore_start() {
+        assert!(is_valid_harness_id("_my_agent"));
+    }
+
+    #[test]
+    fn valid_id_alphanumeric() {
+        assert!(is_valid_harness_id("agent42"));
+    }
+
+    #[test]
+    fn invalid_id_uppercase() {
+        assert!(!is_valid_harness_id("MyAgent"));
+    }
+
+    #[test]
+    fn invalid_id_starts_with_hyphen() {
+        assert!(!is_valid_harness_id("-bad-id"));
+    }
+
+    #[test]
+    fn invalid_id_empty() {
+        assert!(!is_valid_harness_id(""));
+    }
+
+    #[test]
+    fn invalid_id_path_traversal() {
+        assert!(!is_valid_harness_id("../etc/passwd"));
+    }
+
+    // ── Collision check ──────────────────────────────────────────────────────
+
+    #[test]
+    fn builtin_ids_are_rejected() {
+        // Tier-1 hard-coded IDs must always be reserved.
+        for id in &["goose", "claude", "codex", "buzz-agent"] {
+            assert!(check_id_collision(id).is_err(), "{id} should be rejected");
+        }
+        // Tier-2 preset IDs must also be reserved (derived from PRESET_HARNESSES).
+        for id in crate::managed_agents::discovery::preset_harness_ids() {
+            assert!(check_id_collision(id).is_err(), "{id} should be rejected");
+        }
+    }
+
+    #[test]
+    fn unknown_id_passes_collision_check() {
+        assert!(check_id_collision("my-custom-agent").is_ok());
+    }
+
+    // ── File loading ─────────────────────────────────────────────────────────
+
+    #[test]
+    fn load_valid_json_returns_definition() {
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(
+            dir.path().join("my-agent.json"),
+            r#"{"id":"my-agent","label":"My Agent","command":"my-agent-bin"}"#,
+        )
+        .unwrap();
+
+        let defs = load_custom_harnesses(dir.path());
+        assert_eq!(defs.len(), 1);
+        assert_eq!(defs[0].id, "my-agent");
+        assert_eq!(defs[0].label, "My Agent");
+        assert_eq!(defs[0].command, "my-agent-bin");
+    }
+
+    #[test]
+    fn load_skips_non_json_files() {
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(dir.path().join("my-agent.toml"), r#"id = "my-agent""#).unwrap();
+
+        let defs = load_custom_harnesses(dir.path());
+        assert_eq!(defs.len(), 0, "non-JSON file should be ignored");
+    }
+
+    #[test]
+    fn load_skips_invalid_json_without_panicking() {
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(dir.path().join("bad.json"), "{ not valid json").unwrap();
+
+        // Must not panic or propagate an error.
+        let defs = load_custom_harnesses(dir.path());
+        assert_eq!(defs.len(), 0);
+    }
+
+    #[test]
+    fn load_skips_definition_with_invalid_id() {
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(
+            dir.path().join("Bad.json"),
+            r#"{"id":"Bad-Id","label":"Bad","command":"bad"}"#,
+        )
+        .unwrap();
+
+        let defs = load_custom_harnesses(dir.path());
+        assert_eq!(
+            defs.len(),
+            0,
+            "invalid id should cause the entry to be skipped"
+        );
+    }
+
+    #[test]
+    fn load_skips_definition_with_empty_command() {
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(
+            dir.path().join("empty-cmd.json"),
+            r#"{"id":"empty-cmd","label":"Empty","command":""}"#,
+        )
+        .unwrap();
+
+        let defs = load_custom_harnesses(dir.path());
+        assert_eq!(
+            defs.len(),
+            0,
+            "empty command should cause the entry to be skipped"
+        );
+    }
+
+    #[test]
+    fn load_skips_definition_with_non_http_install_url() {
+        // installInstructionsUrl must start with https:// or http://.
+        // A bare path, javascript: URI, or other scheme is rejected.
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(
+            dir.path().join("bad-url.json"),
+            r#"{"id":"bad-url","label":"Bad","command":"bad-bin","installInstructionsUrl":"file:///etc/passwd"}"#,
+        )
+        .unwrap();
+
+        let defs = load_custom_harnesses(dir.path());
+        assert_eq!(
+            defs.len(),
+            0,
+            "non-http install URL should cause the entry to be skipped"
+        );
+    }
+
+    #[test]
+    fn load_accepts_empty_or_https_install_url() {
+        let dir = tempfile::tempdir().unwrap();
+        // Empty URL is fine (optional field).
+        fs::write(
+            dir.path().join("no-url.json"),
+            r#"{"id":"no-url","label":"No URL","command":"no-url-bin"}"#,
+        )
+        .unwrap();
+        // https:// is accepted.
+        fs::write(
+            dir.path().join("good-url.json"),
+            r#"{"id":"good-url","label":"Good URL","command":"good-bin","installInstructionsUrl":"https://example.com/install"}"#,
+        )
+        .unwrap();
+
+        let defs = load_custom_harnesses(dir.path());
+        assert_eq!(
+            defs.len(),
+            2,
+            "empty and https:// URLs must both be accepted"
+        );
+    }
+
+    #[test]
+    fn load_missing_dir_returns_empty_vec() {
+        let dir = tempfile::tempdir().unwrap();
+        let nonexistent = dir.path().join("does_not_exist");
+
+        let defs = load_custom_harnesses(&nonexistent);
+        assert_eq!(defs.len(), 0);
+    }
+
+    #[test]
+    fn load_continues_after_one_bad_entry() {
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(dir.path().join("bad.json"), "!!!").unwrap();
+        fs::write(
+            dir.path().join("good.json"),
+            r#"{"id":"good-one","label":"Good","command":"good-binary"}"#,
+        )
+        .unwrap();
+
+        let defs = load_custom_harnesses(dir.path());
+        assert_eq!(defs.len(), 1, "bad entry skipped, good entry loaded");
+        assert_eq!(defs[0].id, "good-one");
+    }
+
+    #[test]
+    fn load_applies_id_collision_check() {
+        // A custom file whose id shadows a built-in ("goose") must be dropped
+        // BY THE LOADER — `load_custom_harnesses` is the enforcement boundary
+        // shared by both the warm path and discovery. This exercises the real
+        // loader against a real file, not just the helper predicate.
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(
+            dir.path().join("goose.json"),
+            r#"{"id":"goose","label":"Not Goose","command":"goose","args":["--evil"]}"#,
+        )
+        .unwrap();
+        assert!(
+            load_custom_harnesses(dir.path()).is_empty(),
+            "loader must drop a file shadowing a builtin id"
+        );
+        assert!(check_id_collision("goose").is_err());
+        assert!(check_id_collision("custom-goose").is_ok());
+    }
+
+    #[test]
+    fn load_dedups_duplicate_ids_first_file_wins() {
+        // Two files carrying the same custom id: the loader must keep exactly
+        // one definition (directory-order first wins; the duplicate is dropped).
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(
+            dir.path().join("a.json"),
+            r#"{"id":"custom-dup","label":"First","command":"first-cmd"}"#,
+        )
+        .unwrap();
+        fs::write(
+            dir.path().join("b.json"),
+            r#"{"id":"custom-dup","label":"Second","command":"second-cmd"}"#,
+        )
+        .unwrap();
+        let loaded = load_custom_harnesses(dir.path());
+        assert_eq!(
+            loaded.len(),
+            1,
+            "loader must dedup duplicate ids within the directory"
+        );
+        assert_eq!(loaded[0].id, "custom-dup");
+    }
+
+    // ── Round-trip via save_custom_harness_to_dir (B-4) ─────────────────────
+    //
+    // These tests exercise the REAL persistence helper, not raw fs::write.
+    // They prove: create, same-ID edit (backup-swap), rename (old file removed),
+    // backup file cleaned up on success.
+
+    fn make_def(id: &str, label: &str) -> HarnessDefinition {
+        HarnessDefinition {
+            id: id.to_string(),
+            label: label.to_string(),
+            command: format!("{id}-bin"),
+            args: vec![],
+            env: BTreeMap::new(),
+            install_instructions_url: String::new(),
+            install_hint: String::new(),
+        }
+    }
+
+    #[test]
+    fn save_to_dir_create_writes_file_and_loads_back() {
+        let dir = tempfile::tempdir().unwrap();
+        let def = make_def("my-harness", "My Harness");
+
+        let outcome = save_custom_harness_to_dir(dir.path(), &def, None).unwrap();
+
+        assert_eq!(outcome.target_path, dir.path().join("my-harness.json"));
+        assert!(outcome.removed_old_path.is_none(), "no old file on create");
+
+        let loaded = load_custom_harnesses(dir.path());
+        assert_eq!(loaded.len(), 1);
+        assert_eq!(loaded[0].id, "my-harness");
+        assert_eq!(loaded[0].label, "My Harness");
+    }
+
+    #[test]
+    fn save_to_dir_same_id_edit_replaces_content() {
+        let dir = tempfile::tempdir().unwrap();
+        let v1 = make_def("my-harness", "V1 Label");
+        save_custom_harness_to_dir(dir.path(), &v1, None).unwrap();
+
+        // Same-ID edit: label changes.
+        let v2 = make_def("my-harness", "V2 Label");
+        let outcome = save_custom_harness_to_dir(dir.path(), &v2, None).unwrap();
+
+        // No old-path reported (id unchanged).
+        assert!(outcome.removed_old_path.is_none());
+
+        let loaded = load_custom_harnesses(dir.path());
+        assert_eq!(loaded.len(), 1, "same-id edit must not duplicate entries");
+        assert_eq!(loaded[0].label, "V2 Label", "v2 content must be present");
+    }
+
+    #[test]
+    fn save_to_dir_backup_is_cleaned_up_after_same_id_edit() {
+        let dir = tempfile::tempdir().unwrap();
+        let v1 = make_def("my-harness", "V1");
+        save_custom_harness_to_dir(dir.path(), &v1, None).unwrap();
+
+        let v2 = make_def("my-harness", "V2");
+        save_custom_harness_to_dir(dir.path(), &v2, None).unwrap();
+
+        // .bak file must be gone after a successful commit.
+        let bak = dir.path().join("my-harness.json.bak");
+        assert!(
+            !bak.exists(),
+            ".bak file must be removed after successful same-id edit"
+        );
+    }
+
+    #[test]
+    fn save_to_dir_rename_removes_old_file_and_creates_new() {
+        let dir = tempfile::tempdir().unwrap();
+        let old_def = make_def("old-id", "Old");
+        save_custom_harness_to_dir(dir.path(), &old_def, None).unwrap();
+
+        // Rename: new id, old_id supplied.
+        let new_def = make_def("new-id", "New");
+        let outcome = save_custom_harness_to_dir(dir.path(), &new_def, Some("old-id")).unwrap();
+
+        // The outcome carries the old path that was removed.
+        let expected_old = dir.path().join("old-id.json");
+        assert_eq!(
+            outcome.removed_old_path,
+            Some(expected_old.clone()),
+            "removed_old_path must be the old file"
+        );
+
+        // Old file gone, new file present.
+        assert!(!expected_old.exists(), "old-id.json must be removed");
+        let loaded = load_custom_harnesses(dir.path());
+        assert_eq!(loaded.len(), 1);
+        assert_eq!(loaded[0].id, "new-id");
+    }
+
+    #[test]
+    fn save_to_dir_rename_nonexistent_old_id_is_non_fatal() {
+        // rename_old_id pointing to a file that does not exist must succeed
+        // (NotFound is silently ignored by the helper).
+        let dir = tempfile::tempdir().unwrap();
+        let def = make_def("alpha", "Alpha");
+        let outcome = save_custom_harness_to_dir(dir.path(), &def, Some("ghost-id")).unwrap();
+
+        // New file created, no old path removed.
+        assert_eq!(outcome.target_path, dir.path().join("alpha.json"));
+        assert!(
+            outcome.removed_old_path.is_none(),
+            "NotFound old-id must not be reported as removed"
+        );
+        assert!(load_custom_harnesses(dir.path()).len() == 1);
+    }
+
+    #[test]
+    fn save_to_dir_roundtrip_with_env_preserves_values() {
+        let dir = tempfile::tempdir().unwrap();
+        let mut env = BTreeMap::new();
+        env.insert("MY_KEY".to_string(), "my_value".to_string());
+        let def = HarnessDefinition {
+            id: "env-harness".to_string(),
+            label: "Env Harness".to_string(),
+            command: "env-bin".to_string(),
+            args: vec!["--flag".to_string()],
+            env,
+            install_instructions_url: "https://example.com".to_string(),
+            install_hint: "Install from example.com".to_string(),
+        };
+
+        save_custom_harness_to_dir(dir.path(), &def, None).unwrap();
+
+        let loaded = load_custom_harnesses(dir.path());
+        assert_eq!(loaded.len(), 1);
+        assert_eq!(loaded[0].args, vec!["--flag"]);
+        assert_eq!(
+            loaded[0].env.get("MY_KEY").map(String::as_str),
+            Some("my_value"),
+            "env must round-trip through save_custom_harness_to_dir"
+        );
+    }
+
+    // ── B-3: env validation boundary (validate_harness_definition_pub integration) ──
+
+    #[test]
+    fn validate_rejects_malformed_key_with_equals_sign() {
+        // BUZZ_AUTH_TAG=x is the documented reserved-key bypass shape:
+        // the key contains '=' so Command::env would produce
+        // `BUZZ_AUTH_TAG=x=forged` in the child env.
+        let mut env = BTreeMap::new();
+        env.insert("BUZZ_AUTH_TAG=x".to_string(), "forged".to_string());
+        let def = HarnessDefinition {
+            id: "bad-env".to_string(),
+            label: "Bad".to_string(),
+            command: "bad-bin".to_string(),
+            args: vec![],
+            env,
+            install_instructions_url: String::new(),
+            install_hint: String::new(),
+        };
+        let err = validate_harness_definition_pub(&def).unwrap_err();
+        assert!(
+            err.contains("env var keys must match"),
+            "malformed key must be rejected: {err}"
+        );
+        assert!(
+            err.contains("BUZZ_AUTH_TAG"),
+            "error must name the offending key: {err}"
+        );
+    }
+
+    #[test]
+    fn validate_rejects_reserved_key_buzz_managed_agent() {
+        // BUZZ_MANAGED_AGENT and BUZZ_MANAGED_AGENT_START_NONCE are the
+        // ownership markers — supplying them in a definition must be rejected.
+        let mut env = BTreeMap::new();
+        env.insert(
+            "BUZZ_MANAGED_AGENT".to_string(),
+            "fake-instance".to_string(),
+        );
+        let def = HarnessDefinition {
+            id: "bad-marker".to_string(),
+            label: "Bad".to_string(),
+            command: "bad-bin".to_string(),
+            args: vec![],
+            env,
+            install_instructions_url: String::new(),
+            install_hint: String::new(),
+        };
+        let err = validate_harness_definition_pub(&def).unwrap_err();
+        assert!(
+            err.contains("reserved by Buzz"),
+            "ownership marker key must be rejected: {err}"
+        );
+    }
+
+    #[test]
+    fn validate_rejects_reserved_key_case_insensitive() {
+        // BUZZ_PRIVATE_KEY in any casing must be blocked.
+        let mut env = BTreeMap::new();
+        env.insert("buzz_private_key".to_string(), "secret".to_string());
+        let def = HarnessDefinition {
+            id: "ci-marker".to_string(),
+            label: "CI".to_string(),
+            command: "ci-bin".to_string(),
+            args: vec![],
+            env,
+            install_instructions_url: String::new(),
+            install_hint: String::new(),
+        };
+        let err = validate_harness_definition_pub(&def).unwrap_err();
+        assert!(
+            err.contains("reserved by Buzz"),
+            "reserved key must be blocked case-insensitively: {err}"
+        );
+    }
+
+    #[test]
+    fn validate_rejects_nul_byte_in_value() {
+        // A NUL in a value would cause Command::env to panic at spawn time.
+        let mut env = BTreeMap::new();
+        env.insert("MY_KEY".to_string(), "val\x00ue".to_string());
+        let def = HarnessDefinition {
+            id: "nul-val".to_string(),
+            label: "NUL".to_string(),
+            command: "nul-bin".to_string(),
+            args: vec![],
+            env,
+            install_instructions_url: String::new(),
+            install_hint: String::new(),
+        };
+        let err = validate_harness_definition_pub(&def).unwrap_err();
+        assert!(
+            err.contains("NUL bytes"),
+            "NUL value must be rejected at validation: {err}"
+        );
+    }
+
+    #[test]
+    fn validate_rejects_value_over_per_value_size_limit() {
+        use crate::managed_agents::env_vars::MAX_ENV_VALUE_BYTES;
+        let mut env = BTreeMap::new();
+        // One byte over the per-value cap.
+        env.insert("BIG_VAL".to_string(), "x".repeat(MAX_ENV_VALUE_BYTES + 1));
+        let def = HarnessDefinition {
+            id: "big-val".to_string(),
+            label: "Big".to_string(),
+            command: "big-bin".to_string(),
+            args: vec![],
+            env,
+            install_instructions_url: String::new(),
+            install_hint: String::new(),
+        };
+        let err = validate_harness_definition_pub(&def).unwrap_err();
+        assert!(
+            err.contains("per-value limit"),
+            "oversized value must be rejected: {err}"
+        );
+    }
+
+    #[test]
+    fn validate_accepts_well_formed_env() {
+        let mut env = BTreeMap::new();
+        env.insert("ANTHROPIC_API_KEY".to_string(), "sk-test-123".to_string());
+        env.insert("MODEL_VERSION".to_string(), "claude-3".to_string());
+        let def = HarnessDefinition {
+            id: "good-env".to_string(),
+            label: "Good".to_string(),
+            command: "good-bin".to_string(),
+            args: vec![],
+            env,
+            install_instructions_url: String::new(),
+            install_hint: String::new(),
+        };
+        assert!(
+            validate_harness_definition_pub(&def).is_ok(),
+            "well-formed definition must pass validation"
+        );
+    }
+
+    // ── Comma-in-args validation (transport-lossiness guard) ─────────────────
+
+    /// A definition whose args contain a literal comma must be rejected at the
+    /// validation boundary — the comma-delimited `BUZZ_ACP_AGENT_ARGS`
+    /// transport would silently split it into two args at spawn time.
+    #[test]
+    fn validate_rejects_comma_in_args() {
+        let mut def = make_def("comma-args", "Comma");
+        def.args = vec!["--name".to_string(), "a,b".to_string()];
+        let err = validate_harness_definition_pub(&def).unwrap_err();
+        assert!(
+            err.contains("comma"),
+            "error must explain the comma transport limit, got: {err}"
+        );
+    }
+
+    /// Comma-free args pass — including args with spaces and special chars.
+    #[test]
+    fn validate_accepts_comma_free_args() {
+        let mut def = make_def("clean-args", "Clean");
+        def.args = vec!["acp".to_string(), "--flag=x y".to_string()];
+        assert!(validate_harness_definition_pub(&def).is_ok());
+    }
+
+    /// The loader shares the same validator: a hand-authored file with a comma
+    /// in args is skipped, so the invariant holds regardless of how the
+    /// definition arrives (UI save or hand-edited JSON).
+    #[test]
+    fn load_skips_definition_with_comma_in_args() {
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(
+            dir.path().join("comma.json"),
+            r#"{"id":"comma-file","label":"Comma","command":"comma-bin","args":["a,b"]}"#,
+        )
+        .unwrap();
+        assert!(
+            load_custom_harnesses(dir.path()).is_empty(),
+            "comma-in-args definition must be skipped at the loader boundary"
+        );
+    }
+
+    // ── Discovery publish under persist_mutex (stale-snapshot regression) ────
+
+    /// Discovery's registry publish must re-read the directory at publish time
+    /// (under the persist mutex), not push a snapshot taken before the auth
+    /// probes ran. Regression shape: discovery scans dir → user saves harness X
+    /// (save_and_warm warms the registry with X) → discovery finishes. If
+    /// discovery published its pre-save snapshot, X would be on disk but
+    /// unresolvable at spawn until the next discover.
+    ///
+    /// Deterministic interleaving: we simulate it by calling the publish seam
+    /// (`warm_harness_registry_locked`) after a save that happened "during"
+    /// discovery — the fresh-read semantics mean the just-saved definition
+    /// survives the publish.
+    #[test]
+    fn discovery_publish_after_concurrent_save_keeps_saved_harness() {
+        let _lock = registry_test_lock();
+        let dir = tempfile::tempdir().unwrap();
+
+        // Discovery "scans" the dir while it is empty (stale snapshot would be []).
+        let stale_snapshot = load_custom_harnesses(dir.path());
+        assert!(stale_snapshot.is_empty());
+
+        // A save lands mid-discovery (save_and_warm: write + warm).
+        let def = make_def("mid-save", "Mid Save");
+        save_and_warm(dir.path(), &def, None).unwrap();
+        assert!(lookup_loaded_harness_by_id("mid-save").is_some());
+
+        // Discovery publishes — the locked warm re-reads the directory, so the
+        // just-saved harness must survive (a stale-snapshot publish would
+        // clobber it).
+        warm_harness_registry_locked(Some(dir.path()));
+        assert!(
+            lookup_loaded_harness_by_id("mid-save").is_some(),
+            "publish must re-read the directory, not clobber the mid-discovery save"
+        );
+    }
+
+    /// Same shape for delete: a delete landing mid-discovery must not be
+    /// resurrected by the discovery publish.
+    #[test]
+    fn discovery_publish_after_concurrent_delete_keeps_harness_gone() {
+        let _lock = registry_test_lock();
+        let dir = tempfile::tempdir().unwrap();
+
+        let def = make_def("mid-delete", "Mid Delete");
+        save_and_warm(dir.path(), &def, None).unwrap();
+
+        // Discovery "scans" while the file exists (stale snapshot would contain it).
+        let stale_snapshot = load_custom_harnesses(dir.path());
+        assert_eq!(stale_snapshot.len(), 1);
+
+        // Delete lands mid-discovery.
+        delete_and_warm(dir.path(), "mid-delete").unwrap();
+        assert!(lookup_loaded_harness_by_id("mid-delete").is_none());
+
+        // Discovery publishes — fresh read keeps it gone.
+        warm_harness_registry_locked(Some(dir.path()));
+        assert!(
+            lookup_loaded_harness_by_id("mid-delete").is_none(),
+            "publish must not resurrect a harness deleted mid-discovery"
+        );
+    }
+
+    // ── Registry warm path ───────────────────────────────────────────────────
+
+    /// After `warm_harness_registry_from_dir` the registry contains preset +
+    /// custom definitions and `lookup_loaded_harness_by_id` resolves them.
+    #[test]
+    fn warm_registry_then_lookup_finds_custom_and_preset_entries() {
+        let _lock = registry_test_lock();
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(
+            dir.path().join("my-custom.json"),
+            r#"{"id":"my-custom","label":"My Custom","command":"my-custom-bin"}"#,
+        )
+        .unwrap();
+
+        warm_harness_registry_from_dir(Some(dir.path()));
+
+        // Custom entry must be findable.
+        let found = lookup_loaded_harness_by_id("my-custom");
+        assert!(
+            found.is_some(),
+            "warm registry must contain the custom entry"
+        );
+        assert_eq!(found.unwrap().command, "my-custom-bin");
+
+        // At least one preset entry must be in the registry (e.g. "cursor").
+        let preset = lookup_loaded_harness_by_id("cursor");
+        assert!(
+            preset.is_some(),
+            "warm registry must contain preset entries"
+        );
+    }
+
+    /// `warm_harness_registry_from_dir` with `None` still loads presets.
+    #[test]
+    fn warm_registry_with_no_custom_dir_loads_presets_only() {
+        let _lock = registry_test_lock();
+        warm_harness_registry_from_dir(None);
+        // At least the "cursor" preset must be present.
+        assert!(
+            lookup_loaded_harness_by_id("cursor").is_some(),
+            "presets must be reachable even without a custom dir"
+        );
+    }
+
+    /// `warm_harness_registry_from_dir` followed by `update_loaded_harness_registry`
+    /// with an empty slice clears the registry (transactional save/delete contract).
+    #[test]
+    fn warm_then_clear_registry_empties_lookup() {
+        let _lock = registry_test_lock();
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(
+            dir.path().join("tmp-agent.json"),
+            r#"{"id":"tmp-agent","label":"Tmp","command":"tmp-bin"}"#,
+        )
+        .unwrap();
+
+        warm_harness_registry_from_dir(Some(dir.path()));
+        assert!(lookup_loaded_harness_by_id("tmp-agent").is_some());
+
+        // Simulate delete — re-warm with empty dir.
+        let empty_dir = tempfile::tempdir().unwrap();
+        warm_harness_registry_from_dir(Some(empty_dir.path()));
+        assert!(
+            lookup_loaded_harness_by_id("tmp-agent").is_none(),
+            "deleted harness must not appear after re-warm"
+        );
+    }
+
+    // ── Legacy avatarUrl regression (F1) ─────────────────────────────────────
+
+    /// A JSON file that contains a legacy `avatarUrl` field (from pre-BYOH code)
+    /// must still deserialize without error (unknown-field handling) and the
+    /// loaded `HarnessDefinition` must NOT carry the URL — the field is absent
+    /// from the struct so serde drops it.
+    #[test]
+    fn legacy_avatar_url_in_json_is_silently_dropped_on_load() {
+        let dir = tempfile::tempdir().unwrap();
+        fs::write(
+            dir.path().join("legacy.json"),
+            r#"{
+                "id": "legacy-agent",
+                "label": "Legacy Agent",
+                "command": "legacy-bin",
+                "avatarUrl": "https://tracking.example.com/logo.png"
+            }"#,
+        )
+        .unwrap();
+
+        let defs = load_custom_harnesses(dir.path());
+        // The file must deserialize successfully (serde ignores unknown fields).
+        assert_eq!(defs.len(), 1, "legacy file with avatarUrl must still load");
+        assert_eq!(defs[0].id, "legacy-agent");
+        // HarnessDefinition has no avatar_url field — prove the URL cannot
+        // be routed to a catalog entry by serializing back and checking.
+        let json = serde_json::to_string(&defs[0]).unwrap();
+        assert!(
+            !json.contains("https://tracking.example.com"),
+            "serialized HarnessDefinition must not contain the legacy avatar URL"
+        );
+    }
+
+    // ── Preset id reservation ────────────────────────────────────────────────
+
+    /// All preset ids must be blocked by `check_id_collision`.
+    #[test]
+    fn preset_ids_are_reserved_and_cannot_be_used_as_custom_ids() {
+        // Derived from PRESET_HARNESSES — no hard-coded copy here so this test
+        // automatically covers any future preset additions.
+        for id in crate::managed_agents::discovery::preset_harness_ids() {
+            assert!(
+                check_id_collision(id).is_err(),
+                "preset id {id:?} should be rejected by check_id_collision"
+            );
+        }
+    }
+}
diff --git a/desktop/src-tauri/src/managed_agents/discovery.rs b/desktop/src-tauri/src/managed_agents/discovery.rs
index a2e47d1281..eecbf4de3e 100644
--- a/desktop/src-tauri/src/managed_agents/discovery.rs
+++ b/desktop/src-tauri/src/managed_agents/discovery.rs
@@ -7,6 +7,7 @@ use std::time::{Duration, Instant};
 use crate::managed_agents::{
     buzz_managed_command_path, buzz_managed_node_bin_dir, buzz_managed_npm_bin_dir,
     AcpAvailabilityStatus, AcpRuntimeCatalogEntry, AuthStatus, CommandAvailabilityInfo,
+    HarnessSource,
 };
 
 mod runtime_metadata;
@@ -57,6 +58,12 @@ fn common_binary_paths() -> &'static [PathBuf] {
                         .join("bin"),
                 );
             }
+            // Goose's legacy Windows installer (superseded by #2680) unpacked
+            // to %USERPROFILE%\goose\goose.exe, which is on no standard PATH —
+            // without this probe those installs stay permanently undiscovered.
+            if let Some(profile) = std::env::var_os("USERPROFILE") {
+                paths.push(PathBuf::from(profile).join("goose"));
+            }
         }
         paths
     })
@@ -79,7 +86,7 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[
         adapter_install_commands: &[],
         cli_install_instructions_url: "https://goose-docs.ai/docs/getting-started/installation/",
         adapter_install_instructions_url: "",
-        cli_install_hint: "Buzz requires the Goose CLI; the desktop app alone is not enough.",
+        cli_install_hint: "Buzz talks to Goose through the Goose CLI.",
         adapter_install_hint: "",
         skill_dir: Some(".goose/skills"),
         supports_acp_model_switching: false,
@@ -111,8 +118,8 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[
         adapter_install_commands: &["npm install -g @agentclientprotocol/claude-agent-acp"],
         cli_install_instructions_url: "https://code.claude.com/docs/en/getting-started",
         adapter_install_instructions_url: "https://github.com/agentclientprotocol/claude-agent-acp",
-        cli_install_hint: "Buzz requires the Claude Code CLI; the desktop app alone is not enough.",
-        adapter_install_hint: "Install the Claude Code ACP adapter via npm.",
+        cli_install_hint: "Buzz talks to Claude Code through the Claude Code CLI.",
+        adapter_install_hint: "Buzz talks to the Claude Code CLI through an ACP adapter. Install it with: npm install -g @agentclientprotocol/claude-agent-acp.",
         skill_dir: Some(".claude/skills"),
         supports_acp_model_switching: false,
         model_env_var: None,
@@ -143,8 +150,8 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[
         adapter_install_commands: &["npm install -g @agentclientprotocol/codex-acp"],
         cli_install_instructions_url: "https://developers.openai.com/codex/cli/",
         adapter_install_instructions_url: "https://github.com/agentclientprotocol/codex-acp",
-        cli_install_hint: "Buzz requires the Codex CLI; the desktop app alone is not enough.",
-        adapter_install_hint: "Install the Codex ACP adapter via npm.",
+        cli_install_hint: "Buzz talks to Codex through the Codex CLI.",
+        adapter_install_hint: "Buzz talks to the Codex CLI through an ACP adapter. Install it with: npm install -g @agentclientprotocol/codex-acp.",
         skill_dir: Some(".codex/skills"),
         supports_acp_model_switching: false,
         model_env_var: None,
@@ -286,6 +293,7 @@ pub fn default_agent_command() -> String {
 ///   1. explicit override (non-empty) — a deliberate per-instance pin;
 ///   2. the record's own `runtime` id mapped to its primary command —
 ///      records materialize their runtime at create/migration time;
+///      checks both static builtins AND the loaded preset/custom registry;
 ///   3. legacy fallback: the linked persona's `runtime` (records created
 ///      before the unified model carry `persona_id` but no `runtime`);
 ///   4. `default_agent_command()`.
@@ -302,13 +310,17 @@ pub fn record_agent_command(
         return pin.to_string();
     }
 
-    if let Some(command) = record
-        .runtime
-        .as_deref()
-        .and_then(known_acp_runtime_exact)
-        .and_then(|r| r.commands.first().copied())
-    {
-        return command.to_string();
+    if let Some(id) = record.runtime.as_deref() {
+        // Check static builtins first.
+        if let Some(command) = known_acp_runtime_exact(id).and_then(|r| r.commands.first().copied())
+        {
+            return command.to_string();
+        }
+        // Fall back to loaded registry for preset/custom harnesses.
+        if let Some(def) = crate::managed_agents::custom_harnesses::lookup_loaded_harness_by_id(id)
+        {
+            return def.command.clone();
+        }
     }
 
     effective_agent_command(record.persona_id.as_deref(), personas, None)
@@ -320,7 +332,8 @@ pub fn record_agent_command(
 ///
 /// Resolution order:
 ///   1. explicit override (non-empty) — a deliberate per-instance pin;
-///   2. the linked persona's `runtime` id mapped to its primary command;
+///   2. the linked persona's `runtime` id mapped to its primary command
+///      (checks builtins then loaded preset/custom registry);
 ///   3. `default_agent_command()` — no persona/runtime, or persona deleted.
 pub fn effective_agent_command(
     persona_id: Option<&str>,
@@ -334,18 +347,119 @@ pub fn effective_agent_command(
         return pin.to_string();
     }
 
-    persona_id
+    let runtime_id = persona_id
         .and_then(|pid| personas.iter().find(|p| p.id == pid))
-        .and_then(|persona| persona.runtime.as_deref())
-        .and_then(known_acp_runtime_exact)
-        .and_then(|r| r.commands.first().copied())
-        .map(str::to_string)
-        .unwrap_or_else(default_agent_command)
+        .and_then(|persona| persona.runtime.as_deref());
+
+    if let Some(id) = runtime_id {
+        // Check static builtins first.
+        if let Some(command) = known_acp_runtime_exact(id).and_then(|r| r.commands.first().copied())
+        {
+            return command.to_string();
+        }
+        // Check loaded preset/custom registry.
+        if let Some(def) = crate::managed_agents::custom_harnesses::lookup_loaded_harness_by_id(id)
+        {
+            return def.command.clone();
+        }
+    }
+
+    default_agent_command()
 }
 
 mod overrides;
 pub use overrides::{apply_agent_command_update, create_time_agent_command_override};
 
+/// Prefix of the typed dangling-harness error produced by
+/// `try_record_agent_command` / `resolve_effective_harness_descriptor`.
+///
+/// This sentinel is an internal Rust contract: user-facing surfaces must
+/// convert it to a sentence via [`user_facing_harness_error`] (spawn) or to
+/// the missing id via [`dangling_harness_id`] (summary) — never show it raw.
+pub(crate) const DANGLING_HARNESS_PREFIX: &str = "DANGLING_HARNESS_ID:";
+
+/// Extract the missing harness id from a `DANGLING_HARNESS_ID:<id>` error.
+/// Returns `None` for any other error string.
+pub(crate) fn dangling_harness_id(error: &str) -> Option<&str> {
+    error.strip_prefix(DANGLING_HARNESS_PREFIX)
+}
+
+/// Convert a harness-resolution error to a user-facing sentence. Dangling
+/// harness ids become an actionable message; other errors pass through.
+pub(crate) fn user_facing_harness_error(error: &str) -> String {
+    match dangling_harness_id(error) {
+        Some(id) => format!(
+            "harness \"{id}\" was deleted — pick a new harness for this agent or restore the harness definition"
+        ),
+        None => error.to_string(),
+    }
+}
+
+/// Summary-row display for a dangling harness id: shows the *missing* id so
+/// the agent list tells the same story as spawn (which refuses with the
+/// sentence above), rather than silently falling back to the default command
+/// as if the agent were healthy.
+pub(crate) fn dangling_harness_display(id: &str) -> String {
+    format!("harness (deleted): {id}")
+}
+
+/// Spawn-time variant of `record_agent_command` that returns a typed error when
+/// a record's `runtime` id or its persona's `runtime` id is set but cannot be
+/// resolved (i.e. the definition was deleted after the agent was created).
+///
+/// Returns `Err("DANGLING_HARNESS_ID:<id>")` so callers can surface the error
+/// without falling through to `buzz-agent`.  When there is no runtime id at all
+/// the fallback to `default_agent_command()` is intentional (legacy agents
+/// pre-date the unified harness model).
+pub fn try_record_agent_command(
+    record: &crate::managed_agents::types::ManagedAgentRecord,
+    personas: &[crate::managed_agents::types::AgentDefinition],
+) -> Result<String, String> {
+    // Explicit pin always wins — if the user set a raw override, honour it.
+    if let Some(pin) = record
+        .agent_command_override
+        .as_deref()
+        .map(str::trim)
+        .filter(|v| !v.is_empty())
+    {
+        return Ok(pin.to_string());
+    }
+
+    // Record-level runtime id: if set but unresolvable → typed error.
+    if let Some(id) = record.runtime.as_deref() {
+        if let Some(cmd) = known_acp_runtime_exact(id).and_then(|r| r.commands.first().copied()) {
+            return Ok(cmd.to_string());
+        }
+        if let Some(def) = crate::managed_agents::custom_harnesses::lookup_loaded_harness_by_id(id)
+        {
+            return Ok(def.command.clone());
+        }
+        return Err(format!("DANGLING_HARNESS_ID:{id}"));
+    }
+
+    // Persona-level runtime id.
+    if let Some(persona_id) = record.persona_id.as_deref() {
+        if let Some(persona) = personas.iter().find(|p| p.id == persona_id) {
+            if let Some(id) = persona.runtime.as_deref() {
+                if let Some(cmd) =
+                    known_acp_runtime_exact(id).and_then(|r| r.commands.first().copied())
+                {
+                    return Ok(cmd.to_string());
+                }
+                if let Some(def) =
+                    crate::managed_agents::custom_harnesses::lookup_loaded_harness_by_id(id)
+                {
+                    return Ok(def.command.clone());
+                }
+                return Err(format!("DANGLING_HARNESS_ID:{id}"));
+            }
+        }
+    }
+
+    // No runtime id set — legacy agent; use the safe default.
+    Ok(default_agent_command())
+}
+
 fn default_agent_args(command: &str) -> Option<Vec<String>> {
     match normalize_command_identity(command).as_str() {
         "goose" => Some(vec!["acp".to_string()]),
@@ -489,7 +603,7 @@ pub fn clear_resolve_cache() {
 //
 // `build_managed_agent_summary` needs to compare the spawn-time adapter
 // availability against the *current* availability without triggering a live
-// `probe_codex_acp_major_version` subprocess on every poll cycle.  This cache
+// `probe_codex_acp_version` subprocess on every poll cycle.  This cache
 // stores the last availability status of the codex-acp binary at its resolved
 // path.  It is warmed by `discover_acp_runtimes` (which already probes), so
 // the badge path reads warm data, and is invalidated by `clear_resolve_cache`
@@ -1049,15 +1163,30 @@ pub(crate) fn classify_runtime(
     }
 }
 
-/// Probe the major version of a `codex-acp` binary by running `--version`.
+/// The oldest `codex-acp` version supported by Buzz managed agents.
+///
+/// Older 1.x adapters are detected successfully, but can still bundle a Codex runtime
+/// that does not reliably give `buzz` CLI subprocesses outbound relay access.
+///
+/// Bump policy: raise this only when a newer adapter fixes a defect that breaks managed
+/// agents, and only to a version already published on npm — every user below the floor is
+/// offered a reinstall on their next discovery pass.
+pub(crate) const MIN_CODEX_ACP_VERSION: (u64, u64, u64) = (1, 1, 7);
+
+/// Probe the full version of a `codex-acp` binary by running `--version`.
 ///
 /// The 1.x adapter (`@agentclientprotocol/codex-acp`) outputs
 /// `@agentclientprotocol/codex-acp <major>.<minor>.<patch>` on stdout and exits 0.
 /// The old 0.16.x adapter (`@zed-industries/codex-acp`) is a Rust binary that does
 /// not recognise `--version` and exits non-zero.
 ///
-/// Returns the major version on success, `None` on any failure (non-zero exit,
-/// unparseable output, timeout, or missing binary).
+/// Returns the `(major, minor, patch)` triple on success, `None` on any failure
+/// (non-zero exit, unparseable output, timeout, or missing binary).
+///
+/// The parse is deliberately strict: exactly three numeric dot-separated components.
+/// Partial versions (`1.2`) and prerelease tags (`1.2.0-rc1`) return `None` and so
+/// classify as [`AcpAvailabilityStatus::AdapterOutdated`] — failing closed offers a
+/// reinstall rather than running an adapter whose version cannot be compared.
 ///
 /// The probe is bounded by a 5-second deadline. The child is polled with
 /// [`std::process::Child::try_wait`] (the repo's standard deadline pattern) and
@@ -1066,16 +1195,16 @@ pub(crate) fn classify_runtime(
 /// Stdout is redirected to a temporary file rather than a pipe, so forked
 /// descendants cannot hold EOF open. Reads from a regular file return EOF at its
 /// current write position regardless of inherited file descriptors, cross-platform.
-pub(crate) fn probe_codex_acp_major_version(binary_path: &Path) -> Option<u64> {
-    probe_codex_acp_major_version_with_path(
+pub(crate) fn probe_codex_acp_version(binary_path: &Path) -> Option<(u64, u64, u64)> {
+    probe_codex_acp_version_with_path(
         binary_path,
         crate::managed_agents::readiness::cli_probe::augmented_path().as_deref(),
     )
 }
-pub(crate) fn probe_codex_acp_major_version_with_path(
+pub(crate) fn probe_codex_acp_version_with_path(
     binary_path: &Path,
     augmented_path: Option<&str>,
-) -> Option<u64> {
+) -> Option<(u64, u64, u64)> {
     use std::io::{Read as _, Seek as _, SeekFrom};
     use std::time::{Duration, Instant};
     const VERSION_PROBE_TIMEOUT: Duration = Duration::from_secs(5);
@@ -1131,30 +1260,35 @@ pub(crate) fn probe_codex_acp_major_version_with_path(
     let stdout = String::from_utf8_lossy(&buf);
     // Output format: "<package-name> <major>.<minor>.<patch>"
     let version_str = stdout.split_whitespace().last()?;
-    let major_str = version_str.split('.').next()?;
-    major_str.parse::<u64>().ok()
+    let mut components = version_str.split('.');
+    let major = components.next()?.parse::<u64>().ok()?;
+    let minor = components.next()?.parse::<u64>().ok()?;
+    let patch = components.next()?.parse::<u64>().ok()?;
+    if components.next().is_some() {
+        return None;
+    }
+    Some((major, minor, patch))
 }
 
 /// Classifies a resolved codex-acp binary path as [`AcpAvailabilityStatus::Available`]
 /// or [`AcpAvailabilityStatus::AdapterOutdated`].
 ///
 /// The 0.16.x adapter (`@zed-industries/codex-acp`) does not recognise `--version`
-/// and exits non-zero — that probe failure yields `AdapterOutdated`. The 1.x adapter
-/// (`@agentclientprotocol/codex-acp`) prints its version and exits 0; major ≥ 1
-/// yields `Available`.
+/// and exits non-zero — that probe failure yields `AdapterOutdated`. An adapter is
+/// available only when its version is at least [`MIN_CODEX_ACP_VERSION`].
 ///
 /// Used by `discover_acp_runtimes`, `cli_login_requirements`, and
 /// `install_acp_runtime_blocking` so the version-gate logic is not duplicated.
 pub(crate) fn codex_adapter_availability(path: &Path) -> AcpAvailabilityStatus {
-    match probe_codex_acp_major_version(path) {
-        Some(major) if major >= 1 => AcpAvailabilityStatus::Available,
+    match probe_codex_acp_version(path) {
+        Some(version) if version >= MIN_CODEX_ACP_VERSION => AcpAvailabilityStatus::Available,
         _ => AcpAvailabilityStatus::AdapterOutdated,
     }
 }
 
-/// Returns `true` when the codex-acp binary at `path` is outdated (major version < 1)
-/// or cannot be probed using `augmented_path`. Thin wrapper around
-/// [`codex_adapter_is_outdated_with_path`].
+/// Returns `true` when the codex-acp binary at `path` is below
+/// [`MIN_CODEX_ACP_VERSION`] or cannot be probed using `augmented_path`. Thin wrapper
+/// around [`codex_adapter_is_outdated_with_path`].
 #[cfg(test)]
 pub(crate) fn codex_adapter_is_outdated(path: &Path) -> bool {
     codex_adapter_is_outdated_with_path(
@@ -1163,15 +1297,15 @@ pub(crate) fn codex_adapter_is_outdated(path: &Path) -> bool {
     )
 }
 
-/// Returns `true` when the codex-acp binary at `path` is outdated (major version < 1)
-/// or cannot be probed with the supplied PATH.
+/// Returns `true` when the codex-acp binary at `path` is below
+/// [`MIN_CODEX_ACP_VERSION`] or cannot be probed with the supplied PATH.
 pub(crate) fn codex_adapter_is_outdated_with_path(
     path: &Path,
     augmented_path: Option<&str>,
 ) -> bool {
     !matches!(
-        probe_codex_acp_major_version_with_path(path, augmented_path),
-        Some(major) if major >= 1
+        probe_codex_acp_version_with_path(path, augmented_path),
+        Some(version) if version >= MIN_CODEX_ACP_VERSION
     )
 }
 
@@ -1194,9 +1328,8 @@ fn discover_acp_runtime_phase1(runtime: &'static KnownAcpRuntime) -> PartialEntr
     let (mut availability, command, binary_path) =
         classify_runtime(adapter_result, runtime.underlying_cli, underlying_cli_found);
 
-    // For codex-acp: when the adapter resolves as Available, probe the
-    // version. An adapter with major version < 1 is treated as outdated —
-    // the CODEX_CONFIG spawn contract requires 1.x.
+    // For codex-acp: when the adapter resolves as Available, probe its full
+    // version. An adapter below MIN_CODEX_ACP_VERSION is treated as outdated.
     if runtime.id == "codex"
         && availability == AcpAvailabilityStatus::Available
         && command.as_deref() == Some("codex-acp")
@@ -1286,6 +1419,9 @@ fn discover_acp_runtime_phase1(runtime: &'static KnownAcpRuntime) -> PartialEntr
             // Filled in by the auth-probe phase in full catalog discovery.
             auth_status: AuthStatus::Unknown,
             login_hint: None,
+            source: HarnessSource::Builtin,
+            // Builtin entries have no user-editable env; definition_env is empty.
+            definition_env: Default::default(),
         },
     }
 }
@@ -1300,8 +1436,246 @@ pub(crate) fn discover_acp_runtime_availability(runtime_id: &str) -> Option<AcpA
         .map(|partial| partial.entry.availability)
 }
 
-pub fn discover_acp_runtimes() -> Vec<AcpRuntimeCatalogEntry> {
-    // Phase 1: build all entries (fast — no probes yet).
+// ── Tier-2 preset harnesses ────────────────────────────────────────────────
+//
+// Static data for well-known ACP harnesses that have bundled logos and
+// verified command/args. PATH-probed at discovery time (Detected badge);
+// not editable or deletable by users. Logos are bundled assets referenced
+// by id in the frontend `RUNTIME_LOGOS` map.
+
+struct PresetHarness {
+    id: &'static str,
+    label: &'static str,
+    command: &'static str,
+    args: &'static [&'static str],
+    install_instructions_url: &'static str,
+    install_hint: &'static str,
+    /// Vendor CLI the ACP command wraps, when the preset is an adapter
+    /// (e.g. Amp's `amp-acp` wraps the separately-installed `amp` CLI).
+    /// Consulted only when the adapter is absent, so `AdapterMissing`
+    /// replaces the misleading `NotInstalled` when the CLI is present but
+    /// the adapter is not. Deliberately NOT fed through the builtins'
+    /// full `classify_runtime` predicate: that would flip
+    /// adapter-present/CLI-absent from today's `Available` to `CliMissing`
+    /// (unselectable), and presets carry a single flat `install_hint`, so
+    /// the `CliMissing` copy would tell the user to install the adapter
+    /// they already have. `None` when the command IS the vendor CLI.
+    underlying_cli: Option<&'static str>,
+}
+
+/// Build the catalog entry for one preset harness through an injectable
+/// resolver — the seam the preset loop consumes and tests bind.
+///
+/// Availability consumes only the adapter-missing arm of the builtin
+/// predicate: adapter presence alone decides `Available` (exactly today's
+/// behavior — an `amp-acp` without `amp` stays selectable), and
+/// `underlying_cli` is consulted only when the adapter is absent, to
+/// distinguish `AdapterMissing` (vendor CLI present) from `NotInstalled`
+/// (neither found). See the `underlying_cli` field doc for why the full
+/// `classify_runtime` predicate is deliberately not used here.
+fn preset_catalog_entry(
+    def: &PresetHarness,
+    resolve: impl Fn(&str) -> Option<PathBuf>,
+) -> AcpRuntimeCatalogEntry {
+    let (availability, command, binary_path) = match resolve(def.command) {
+        Some(path) => (
+            AcpAvailabilityStatus::Available,
+            Some(def.command.to_string()),
+            Some(path.display().to_string()),
+        ),
+        None => {
+            let underlying_cli_found = def
+                .underlying_cli
+                .map(|cli| resolve(cli).is_some())
+                .unwrap_or(false);
+            if underlying_cli_found {
+                (AcpAvailabilityStatus::AdapterMissing, None, None)
+            } else {
+                (AcpAvailabilityStatus::NotInstalled, None, None)
+            }
+        }
+    };
+    let underlying_cli_path = def
+        .underlying_cli
+        .and_then(resolve)
+        .map(|p| p.display().to_string());
+
+    let default_args = normalize_agent_args(
+        def.command,
+        def.args.iter().map(|s| s.to_string()).collect(),
+    );
+
+    AcpRuntimeCatalogEntry {
+        id: def.id.to_string(),
+        label: def.label.to_string(),
+        // No remote URL — all preset icons are bundled assets.
+        avatar_url: String::new(),
+        availability,
+        command,
+        binary_path,
+        default_args,
+        mcp_command: None,
+        model_env_var: None,
+        provider_env_var: None,
+        thinking_env_var: None,
+        install_hint: def.install_hint.to_string(),
+        install_instructions_url: def.install_instructions_url.to_string(),
+        can_auto_install: false,
+        // Kept false even for adapter presets: presets carry one flat
+        // install_hint (the adapter's), so the requiresExternalCli
+        // "CLI is missing" wording would pair the wrong noun with it.
+        // The builtin path, with per-availability hints, is the only
+        // consumer of the true case.
+        requires_external_cli: false,
+        underlying_cli_path,
+        node_required: false,
+        auth_status: AuthStatus::NotApplicable,
+        login_hint: None,
+        source: HarnessSource::Preset,
+        // Preset entries have static, non-editable env; definition_env is empty.
+        definition_env: Default::default(),
+    }
+}
+
+const PRESET_HARNESSES: &[PresetHarness] = &[
+    PresetHarness {
+        id: "cursor",
+        label: "Cursor",
+        command: "cursor-agent",
+        args: &["acp"],
+        install_instructions_url: "https://cursor.com/downloads",
+        install_hint: "Buzz talks to Cursor through the cursor-agent CLI's ACP mode.",
+        underlying_cli: None,
+    },
+    PresetHarness {
+        id: "omp",
+        label: "Oh My Pi",
+        command: "omp",
+        args: &["acp"],
+        install_instructions_url: "https://github.com/can1357/oh-my-pi",
+        install_hint: "Buzz talks to Oh My Pi through its CLI's ACP mode (omp acp).",
+        underlying_cli: None,
+    },
+    PresetHarness {
+        id: "grok",
+        label: "Grok Build",
+        command: "grok",
+        args: &["agent", "--always-approve", "stdio"],
+        install_instructions_url: "https://build.x.ai/docs",
+        install_hint: "Buzz talks to Grok Build through its CLI's agent stdio mode.",
+        underlying_cli: None,
+    },
+    PresetHarness {
+        id: "opencode",
+        label: "OpenCode",
+        command: "opencode",
+        args: &["acp"],
+        install_instructions_url: "https://opencode.ai/docs",
+        install_hint: "Buzz talks to OpenCode through its CLI's ACP mode (opencode acp).",
+        underlying_cli: None,
+    },
+    PresetHarness {
+        id: "kimi",
+        label: "Kimi Code",
+        command: "kimi",
+        args: &["acp"],
+        install_instructions_url: "https://kimi.ai/download",
+        install_hint: "Buzz talks to Kimi Code through its CLI's ACP mode (kimi acp).",
+        underlying_cli: None,
+    },
+    PresetHarness {
+        id: "amp",
+        label: "Amp",
+        command: "amp-acp",
+        args: &[],
+        install_instructions_url: "https://github.com/tao12345666333/amp-acp",
+        install_hint: "Buzz talks to the Amp CLI through the amp-acp adapter. Follow the setup guide to install the adapter so the amp-acp command is on your PATH.",
+        underlying_cli: Some("amp"),
+    },
+    PresetHarness {
+        id: "hermes",
+        label: "Hermes Agent",
+        command: "hermes-acp",
+        args: &[],
+        install_instructions_url: "https://hermes-agent.nousresearch.com",
+        install_hint: "Buzz talks to Hermes Agent through its hermes-acp command.",
+        underlying_cli: None,
+    },
+    PresetHarness {
+        id: "openclaw",
+        label: "OpenClaw",
+        command: "openclaw",
+        args: &["acp"],
+        install_instructions_url: "https://docs.openclaw.ai/start/getting-started",
+        install_hint: "Buzz talks to OpenClaw through its ACP mode (openclaw acp), which relies on the OpenClaw Gateway daemon. Follow the setup guide to install both.\n\n\
+            ⚠️  Execution-locus note: `openclaw acp` runs tools inside the \
+            OpenClaw Gateway daemon, not in the Desktop process. \
+            Desktop-injected BUZZ_* env vars are visible to the `openclaw` \
+            harness process itself, but do NOT automatically reach the \
+            Gateway's execution environment. If your tools or agent logic \
+            needs BUZZ_* credentials at execution time, set them on the \
+            Gateway's own environment separately.",
+        underlying_cli: None,
+    },
+];
+
+/// Return the static preset harness definitions as `HarnessDefinition` values.
+///
+/// Used by `warm_harness_registry_from_dir` to seed the loaded-harness registry
+/// at startup before the frontend triggers a full discovery run.
+pub(crate) fn preset_harness_definitions(
+) -> Vec<crate::managed_agents::custom_harnesses::HarnessDefinition> {
+    PRESET_HARNESSES
+        .iter()
+        .map(
+            |p| crate::managed_agents::custom_harnesses::HarnessDefinition {
+                id: p.id.to_string(),
+                label: p.label.to_string(),
+                command: p.command.to_string(),
+                args: p.args.iter().map(|s| s.to_string()).collect(),
+                env: std::collections::BTreeMap::new(),
+                install_instructions_url: p.install_instructions_url.to_string(),
+                install_hint: p.install_hint.to_string(),
+            },
+        )
+        .collect()
+}
+
+/// Return the static slice of preset harness IDs.
+///
+/// Used by `check_id_collision` in `custom_harnesses` to derive the reserved-ID
+/// set from the single source of truth (`PRESET_HARNESSES`) rather than a
+/// hand-maintained copy.  Adding a preset automatically reserves its ID.
+pub(crate) fn preset_harness_ids() -> &'static [&'static str] {
+    // `PRESET_HARNESSES` is `'static`; we project its `id` fields.
+    // Computed once via OnceLock to avoid repeated allocations on hot paths.
+    use std::sync::OnceLock;
+    static IDS: OnceLock<Vec<&'static str>> = OnceLock::new();
+    IDS.get_or_init(|| PRESET_HARNESSES.iter().map(|p| p.id).collect())
+        .as_slice()
+}
+
+/// Discover all ACP runtimes, optionally merging user-defined custom harnesses
+/// from `custom_harnesses_dir`.
+///
+/// This is the primary entry point used by the Tauri command layer. It:
+/// 1. Builds entries for all compiled-in (`Builtin`) runtimes.
+/// 2. Runs auth probes in parallel.
+/// 3. Inserts static `Preset` entries (PATH-probed, `source: Preset`).
+/// 4. If `custom_harnesses_dir` is `Some`, loads `*.json` files from that
+///    directory and appends `Custom` entries — no auth probe, command resolved
+///    via PATH, availability is `Available` or `NotInstalled`.
+///
+/// The custom dir is re-scanned on every call (goose `refresh_custom_providers`
+/// pattern) — no caching, no restart needed to pick up new files.
+///
+/// After building the catalog, updates the loaded-harness registry so spawn
+/// and readiness paths can resolve preset/custom harness commands without
+/// re-running discovery.
+pub fn discover_acp_runtimes_from(
+    custom_harnesses_dir: Option<&Path>,
+) -> Vec<AcpRuntimeCatalogEntry> {
+    // Phase 1: build all builtin entries (fast — no probes yet).
     let mut partials: Vec<PartialEntry> = KNOWN_ACP_RUNTIMES
         .iter()
         .map(discover_acp_runtime_phase1)
@@ -1356,7 +1730,124 @@ pub fn discover_acp_runtimes() -> Vec<AcpRuntimeCatalogEntry> {
         }
     }
 
-    partials.into_iter().map(|p| p.entry).collect()
+    let mut entries: Vec<AcpRuntimeCatalogEntry> = partials.into_iter().map(|p| p.entry).collect();
+
+    // Track all ids seen so far (builtins) to prevent preset/custom collisions.
+    let mut seen_ids: std::collections::HashSet<String> =
+        entries.iter().map(|e| e.id.clone()).collect();
+
+    // Phase 2.5: insert static preset entries (PATH-probed, not editable/deletable).
+    for def in PRESET_HARNESSES {
+        if seen_ids.contains(def.id) {
+            // Builtin or earlier preset shadowed this id — skip silently.
+            continue;
+        }
+        seen_ids.insert(def.id.to_string());
+
+        entries.push(preset_catalog_entry(def, find_command));
+    }
+
+    // Phase 3: load and append custom harness definitions.
+    if let Some(dir) = custom_harnesses_dir {
+        // The loader applies collision + duplicate filtering at the boundary,
+        // so anything it returns is safe to surface in the catalog. Builtin
+        // shadowing is impossible here (check_id_collision covers builtins and
+        // presets); `seen_ids` guards only same-run duplicates.
+        for def in crate::managed_agents::custom_harnesses::load_custom_harnesses(dir) {
+            if !seen_ids.insert(def.id.clone()) {
+                tracing::warn!("custom_harnesses: skipping duplicate id {:?}", def.id);
+                continue;
+            }
+
+            // Availability: command on PATH → Available, else NotInstalled.
+            let (availability, command, binary_path) = match find_command(&def.command) {
+                Some(path) => (
+                    AcpAvailabilityStatus::Available,
+                    Some(def.command.clone()),
+                    Some(path.display().to_string()),
+                ),
+                None => (AcpAvailabilityStatus::NotInstalled, None, None),
+            };
+
+            let default_args = normalize_agent_args(&def.command, def.args.clone());
+
+            entries.push(AcpRuntimeCatalogEntry {
+                id: def.id.clone(),
+                label: def.label.clone(),
+                // F1 security fix: never copy user-supplied avatar URL into the catalog.
+                // All icons are bundled assets; customs fall back to TerminalSquare in the UI.
+                avatar_url: String::new(),
+                availability,
+                command,
+                binary_path,
+                default_args,
+                // Custom harnesses are plain ACP — no MCP sidecar, no env-var
+                // model switching, no thinking knobs.
+                mcp_command: None,
+                model_env_var: None,
+                provider_env_var: None,
+                thinking_env_var: None,
+                install_hint: def.install_hint.clone(),
+                install_instructions_url: def.install_instructions_url.clone(),
+                // Security line: custom definitions carry no install scripts.
+                can_auto_install: false,
+                requires_external_cli: false,
+                underlying_cli_path: None,
+                node_required: false,
+                // No auth probe for custom harnesses.
+                auth_status: AuthStatus::NotApplicable,
+                login_hint: None,
+                source: HarnessSource::Custom,
+                // Carry definition env into the catalog so the edit form can
+                // read it back — prevents silently erasing env on save.
+                definition_env: def.env.clone(),
+            });
+        }
+    }
+
+    // Publish the loaded-harness registry from a FRESH directory read under the
+    // persist mutex — never from the snapshot taken before the auth probes ran.
+    // A save/delete landing during Phase 2 already re-warmed the registry; a
+    // stale-snapshot publish here would clobber it (the just-saved harness
+    // would become unresolvable at spawn until the next discovery).
+    //
+    // This exact line is pinned by `discovery_publish_path_survives_mid_flight_save`
+    // / `..._drops_mid_flight_delete` (discovery tests), which land a save/delete
+    // through the pre-publish test hook below and red if this reverts to
+    // publishing a stale snapshot.
+    #[cfg(test)]
+    pre_publish_test_hook::run();
+    crate::managed_agents::custom_harnesses::warm_harness_registry_locked(custom_harnesses_dir);
+
+    entries
+}
+
+/// Test-only seam: a callback invoked between discovery's directory scan and
+/// its registry publish, so tests can land a `save_and_warm`/`delete_and_warm`
+/// in exactly the window the stale-snapshot bug lived in — through the REAL
+/// `discover_acp_runtimes_from` call path, not a hand-called seam.
+#[cfg(test)]
+pub(crate) mod pre_publish_test_hook {
+    use std::sync::{Mutex, OnceLock};
+
+    type Hook = Box<dyn Fn() + Send>;
+
+    fn cell() -> &'static Mutex<Option<Hook>> {
+        static CELL: OnceLock<Mutex<Option<Hook>>> = OnceLock::new();
+        CELL.get_or_init(|| Mutex::new(None))
+    }
+
+    /// Install (or clear, with `None`) the hook. Callers must serialize via
+    /// `registry_test_lock` — the hook is process-global.
+    pub(crate) fn set(hook: Option<Hook>) {
+        *cell().lock().unwrap_or_else(|e| e.into_inner()) = hook;
+    }
+
+    pub(crate) fn run() {
+        if let Some(hook) = cell().lock().unwrap_or_else(|e| e.into_inner()).as_ref() {
+            hook();
+        }
+    }
 }
 
 pub fn managed_agent_avatar_url(command: &str) -> Option<String> {
diff --git a/desktop/src-tauri/src/managed_agents/discovery/runtime_metadata.rs b/desktop/src-tauri/src/managed_agents/discovery/runtime_metadata.rs
index 2fb6a471d4..fdfe9b8be7 100644
--- a/desktop/src-tauri/src/managed_agents/discovery/runtime_metadata.rs
+++ b/desktop/src-tauri/src/managed_agents/discovery/runtime_metadata.rs
@@ -93,7 +93,7 @@ mod tests {
             "https://goose-docs.ai/docs/getting-started/installation/"
         );
         assert!(goose.adapter_install_instructions_url.is_empty());
-        assert!(goose.cli_install_hint.contains("desktop app alone"));
+        assert!(goose.cli_install_hint.contains("Goose CLI"));
         assert!(goose
             .cli_install_commands_windows
             .iter()
@@ -111,7 +111,7 @@ mod tests {
         assert!(claude
             .adapter_install_instructions_url
             .contains("claude-agent-acp"));
-        assert!(claude.cli_install_hint.contains("desktop app alone"));
+        assert!(claude.cli_install_hint.contains("Claude Code CLI"));
 
         let codex = known_acp_runtime_exact("codex").unwrap();
         assert_eq!(
@@ -119,6 +119,6 @@ mod tests {
             "https://developers.openai.com/codex/cli/"
         );
         assert!(codex.adapter_install_instructions_url.contains("codex-acp"));
-        assert!(codex.cli_install_hint.contains("desktop app alone"));
+        assert!(codex.cli_install_hint.contains("Codex CLI"));
     }
 }
diff --git a/desktop/src-tauri/src/managed_agents/discovery/tests.rs b/desktop/src-tauri/src/managed_agents/discovery/tests.rs
index 364caa452b..1b587dca0e 100644
--- a/desktop/src-tauri/src/managed_agents/discovery/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/discovery/tests.rs
@@ -6,9 +6,9 @@ use super::{
     codex_adapter_is_outdated, create_time_agent_command_override, default_agent_command,
     effective_agent_command, find_nvm_default_bin, find_via_login_shell,
     is_login_shell_path_uninit, is_safe_nvm_tag, managed_agent_avatar_url, normalize_agent_args,
-    parse_semver_tag, probe_codex_acp_major_version, record_agent_command,
-    refresh_login_shell_path, BUZZ_AGENT_AVATAR_URL, CLAUDE_CODE_AVATAR_URL, CODEX_AVATAR_URL,
-    GOOSE_AVATAR_URL,
+    parse_semver_tag, preset_catalog_entry, probe_codex_acp_version, record_agent_command,
+    refresh_login_shell_path, try_record_agent_command, PresetHarness, BUZZ_AGENT_AVATAR_URL,
+    CLAUDE_CODE_AVATAR_URL, CODEX_AVATAR_URL, GOOSE_AVATAR_URL,
 };
 use crate::managed_agents::AcpAvailabilityStatus;
 
@@ -46,10 +46,8 @@ fn returns_none_for_unknown_commands() {
 
 #[test]
 fn default_agent_command_resolves_bundled_buzz_agent() {
-    // The create-path default must be the bundled buzz-agent, never the
-    // bare `goose` that isn't on PATH on a stock Windows install.
+    // The default must be bundled buzz-agent, never bare `goose` on a stock Windows install.
     assert_eq!(default_agent_command(), "buzz-agent");
-    // And buzz-agent takes no `acp` arg — confirm no arg leakage from the default.
     assert_eq!(
         normalize_agent_args(&default_agent_command(), vec!["acp".into()]),
         Vec::<String>::new()
@@ -189,6 +187,90 @@ fn classifies_cli_missing_when_adapter_found_but_cli_absent() {
     assert_eq!(path.as_deref(), Some("/opt/homebrew/bin/codex-acp"));
 }
 
+/// Amp-shaped preset: an ACP adapter (`amp-acp`) wrapping a separately
+/// installed vendor CLI (`amp`).
+const ADAPTER_PRESET: PresetHarness = PresetHarness {
+    id: "amp-test",
+    label: "Amp Test",
+    command: "amp-acp",
+    args: &[],
+    install_instructions_url: "https://example.com/install",
+    install_hint: "Install the amp-acp npm adapter.",
+    underlying_cli: Some("amp"),
+};
+
+#[test]
+fn preset_entry_adapter_missing_when_underlying_cli_present() {
+    // Vendor CLI resolves, adapter does not — the state Tyler's Amp
+    // hand-test hit. Must NOT degrade to the misleading NotInstalled.
+    let entry = preset_catalog_entry(&ADAPTER_PRESET, |cmd| {
+        (cmd == "amp").then(|| PathBuf::from("/usr/local/bin/amp"))
+    });
+    assert_eq!(entry.availability, AcpAvailabilityStatus::AdapterMissing);
+    assert!(entry.command.is_none());
+    assert!(entry.binary_path.is_none());
+    assert_eq!(
+        entry.underlying_cli_path.as_deref(),
+        Some("/usr/local/bin/amp")
+    );
+    assert!(!entry.requires_external_cli);
+    assert_eq!(entry.install_hint, "Install the amp-acp npm adapter.");
+}
+
+#[test]
+fn preset_entry_not_installed_when_both_missing() {
+    let entry = preset_catalog_entry(&ADAPTER_PRESET, |_| None);
+    assert_eq!(entry.availability, AcpAvailabilityStatus::NotInstalled);
+    assert!(entry.underlying_cli_path.is_none());
+    assert!(!entry.requires_external_cli);
+}
+
+#[test]
+fn preset_entry_available_when_adapter_and_cli_present() {
+    let entry = preset_catalog_entry(&ADAPTER_PRESET, |cmd| match cmd {
+        "amp-acp" => Some(PathBuf::from("/usr/local/bin/amp-acp")),
+        "amp" => Some(PathBuf::from("/usr/local/bin/amp")),
+        _ => None,
+    });
+    assert_eq!(entry.availability, AcpAvailabilityStatus::Available);
+    assert_eq!(entry.command.as_deref(), Some("amp-acp"));
+    assert_eq!(entry.binary_path.as_deref(), Some("/usr/local/bin/amp-acp"));
+    assert_eq!(
+        entry.underlying_cli_path.as_deref(),
+        Some("/usr/local/bin/amp")
+    );
+}
+
+#[test]
+fn preset_entry_stays_available_when_adapter_present_but_cli_absent() {
+    // Wren's regression guard: today an `amp-acp` install without `amp`
+    // is Available and selectable. Feeding underlying_cli through the
+    // FULL classify_runtime predicate would flip this to CliMissing
+    // (unselectable, with backwards install copy) — the adapter-missing
+    // arm is the only one presets consume.
+    let entry = preset_catalog_entry(&ADAPTER_PRESET, |cmd| {
+        (cmd == "amp-acp").then(|| PathBuf::from("/usr/local/bin/amp-acp"))
+    });
+    assert_eq!(entry.availability, AcpAvailabilityStatus::Available);
+    assert_eq!(entry.command.as_deref(), Some("amp-acp"));
+    assert_eq!(entry.binary_path.as_deref(), Some("/usr/local/bin/amp-acp"));
+    assert!(entry.underlying_cli_path.is_none());
+}
+
+#[test]
+fn preset_entry_without_underlying_cli_stays_simple() {
+    // Most presets: the command IS the vendor CLI. No external-CLI flag,
+    // absent command means plain NotInstalled.
+    let preset = PresetHarness {
+        underlying_cli: None,
+        ..ADAPTER_PRESET
+    };
+    let entry = preset_catalog_entry(&preset, |_| None);
+    assert_eq!(entry.availability, AcpAvailabilityStatus::NotInstalled);
+    assert!(!entry.requires_external_cli);
+    assert!(entry.underlying_cli_path.is_none());
+}
+
 fn persona_with_runtime(id: &str, runtime: Option<&str>) -> crate::managed_agents::AgentDefinition {
     crate::managed_agents::AgentDefinition {
         id: id.to_string(),
@@ -201,8 +283,10 @@ fn persona_with_runtime(id: &str, runtime: Option<&str>) -> crate::managed_agent
         name_pool: Vec::new(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: std::collections::BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -275,8 +359,10 @@ fn record_with(
         name_pool: Vec::new(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         definition_respond_to: None,
         definition_respond_to_allowlist: Vec::new(),
         definition_parallelism: None,
@@ -314,6 +400,64 @@ fn record_agent_command_bare_record_defaults() {
     assert_eq!(record_agent_command(&record, &[]), default_agent_command());
 }
 
+// ── try_record_agent_command ─────────────────────────────────────────────────
+
+/// When the record carries a dangling (unknown) runtime id, `try_record_agent_command`
+/// must return `Err` containing "DANGLING_HARNESS_ID" — NEVER the buzz-agent default.
+/// This test would fail if the function silently fell back to `default_agent_command()`.
+#[test]
+fn try_record_agent_command_dangling_runtime_id_returns_err() {
+    let record = record_with(Some("my-deleted-harness"), None, None);
+    let result = try_record_agent_command(&record, &[]);
+    assert!(
+        result.is_err(),
+        "dangling runtime id must produce Err, got Ok({:?})",
+        result.ok()
+    );
+    assert!(
+        result.unwrap_err().contains("DANGLING_HARNESS_ID"),
+        "error must name the dangling id"
+    );
+}
+
+/// When the persona carries a dangling runtime id, `try_record_agent_command`
+/// must also error — the error must not silently resolve to the default.
+#[test]
+fn try_record_agent_command_dangling_persona_runtime_returns_err() {
+    let personas = vec![persona_with_runtime("p1", Some("ghost-harness"))];
+    let record = record_with(None, Some("p1"), None);
+    let result = try_record_agent_command(&record, &personas);
+    assert!(
+        result.is_err(),
+        "dangling persona runtime id must produce Err"
+    );
+}
+
+/// When neither the record nor persona has any runtime id, `try_record_agent_command`
+/// falls back to `default_agent_command()` — this is the legacy-agent path.
+#[test]
+fn try_record_agent_command_no_runtime_id_defaults_to_buzz_agent() {
+    let record = record_with(None, None, None);
+    let result = try_record_agent_command(&record, &[]);
+    assert_eq!(
+        result,
+        Ok(default_agent_command()),
+        "no runtime id must fall back to the safe default"
+    );
+}
+
+/// An explicit agent_command_override always wins, even for a dangling runtime id.
+#[test]
+fn try_record_agent_command_override_beats_dangling_id() {
+    let record = record_with(Some("gone-harness"), None, Some("cursor-agent"));
+    let result = try_record_agent_command(&record, &[]);
+    assert_eq!(
+        result,
+        Ok("cursor-agent".to_string()),
+        "explicit override must beat a dangling runtime id"
+    );
+}
+
 #[test]
 fn effective_agent_command_inherits_persona_runtime() {
     // No override → persona runtime id maps to its primary command.
@@ -607,37 +751,41 @@ fn apply_agent_command_update_concrete_pin_keeps_materialized_runtime() {
     assert_eq!(record_agent_command(&record, &personas), "codex-acp");
 }
 
-// ── probe_codex_acp_major_version ─────────────────────────────────────────────
+// ── probe_codex_acp_version ───────────────────────────────────────────────────
 
 mod managed_path_resolution;
 
 #[cfg(unix)]
 #[test]
-fn probe_codex_acp_major_version_parses_1x_output() {
+fn probe_codex_acp_version_parses_full_semver_output() {
     use std::os::unix::fs::PermissionsExt;
 
-    // Simulate `@agentclientprotocol/codex-acp 1.1.2` output (1.x adapter)
+    // Simulate a current `@agentclientprotocol/codex-acp` output.
     let dir = std::env::temp_dir().join(format!("buzz-probe-1x-{}", uuid::Uuid::new_v4()));
     std::fs::create_dir_all(&dir).expect("create temp dir");
     let bin = dir.join("codex-acp");
     std::fs::write(
         &bin,
-        "#!/bin/sh\necho '@agentclientprotocol/codex-acp 1.1.2'\nexit 0\n",
+        "#!/bin/sh\necho '@agentclientprotocol/codex-acp 1.1.7'\nexit 0\n",
     )
     .expect("write script");
     std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755)).expect("chmod script");
 
-    let major = probe_codex_acp_major_version(&bin);
+    let version = probe_codex_acp_version(&bin);
     let _ = std::fs::remove_dir_all(dir);
 
-    assert_eq!(major, Some(1), "1.x adapter must return major version 1");
+    assert_eq!(
+        version,
+        Some((1, 1, 7)),
+        "adapter output must parse to its full semantic version"
+    );
 }
 
 mod codex_version;
 
 #[cfg(unix)]
 #[test]
-fn probe_codex_acp_major_version_returns_none_for_nonzero_exit() {
+fn probe_codex_acp_version_returns_none_for_nonzero_exit() {
     use std::os::unix::fs::PermissionsExt;
 
     // Simulate old 0.16.x adapter: `--version` is unrecognised, exits non-zero
@@ -647,21 +795,21 @@ fn probe_codex_acp_major_version_returns_none_for_nonzero_exit() {
     std::fs::write(&bin, "#!/bin/sh\nexit 1\n").expect("write script");
     std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755)).expect("chmod script");
 
-    let major = probe_codex_acp_major_version(&bin);
+    let version = probe_codex_acp_version(&bin);
     let _ = std::fs::remove_dir_all(dir);
 
     assert_eq!(
-        major, None,
+        version, None,
         "old 0.16.x adapter (non-zero exit) must return None"
     );
 }
 
 #[cfg(unix)]
 #[test]
-fn probe_codex_acp_major_version_returns_none_for_missing_binary() {
+fn probe_codex_acp_version_returns_none_for_missing_binary() {
     let path = std::path::Path::new("/nonexistent/path/codex-acp-does-not-exist");
-    let major = probe_codex_acp_major_version(path);
-    assert_eq!(major, None, "missing binary must return None");
+    let version = probe_codex_acp_version(path);
+    assert_eq!(version, None, "missing binary must return None");
 }
 
 // ── codex_adapter_availability / codex_adapter_is_outdated ───────────────────
@@ -671,7 +819,7 @@ fn probe_codex_acp_major_version_returns_none_for_missing_binary() {
 
 #[cfg(unix)]
 #[test]
-fn codex_adapter_availability_available_for_1x_binary() {
+fn codex_adapter_availability_available_for_minimum_supported_binary() {
     use std::os::unix::fs::PermissionsExt;
 
     let dir = std::env::temp_dir().join(format!("buzz-avail-1x-{}", uuid::Uuid::new_v4()));
@@ -679,7 +827,7 @@ fn codex_adapter_availability_available_for_1x_binary() {
     let bin = dir.join("codex-acp");
     std::fs::write(
         &bin,
-        "#!/bin/sh\necho '@agentclientprotocol/codex-acp 1.1.2'\nexit 0\n",
+        "#!/bin/sh\necho '@agentclientprotocol/codex-acp 1.1.7'\nexit 0\n",
     )
     .expect("write script");
     std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755)).expect("chmod script");
@@ -690,7 +838,7 @@ fn codex_adapter_availability_available_for_1x_binary() {
     assert_eq!(
         status,
         AcpAvailabilityStatus::Available,
-        "1.x adapter must classify as Available"
+        "minimum supported adapter must classify as Available"
     );
 }
 
@@ -716,6 +864,53 @@ fn codex_adapter_availability_outdated_for_0x_binary() {
     );
 }
 
+#[cfg(unix)]
+#[test]
+fn codex_adapter_availability_outdated_for_older_1x_binary() {
+    use std::os::unix::fs::PermissionsExt;
+
+    let dir = tempfile::tempdir().expect("temp dir");
+    let bin = dir.path().join("codex-acp");
+    std::fs::write(
+        &bin,
+        "#!/bin/sh\necho '@agentclientprotocol/codex-acp 1.1.5'\nexit 0\n",
+    )
+    .expect("write script");
+    std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755)).expect("chmod script");
+
+    assert_eq!(
+        codex_adapter_availability(&bin),
+        AcpAvailabilityStatus::AdapterOutdated,
+        "a 1.x adapter below the floor must be offered an upgrade"
+    );
+}
+
+/// The strict three-component parse fails closed: a version Buzz cannot compare
+/// against the floor is treated as outdated rather than assumed current.
+#[cfg(unix)]
+#[test]
+fn codex_adapter_availability_outdated_for_uncomparable_version() {
+    use std::os::unix::fs::PermissionsExt;
+
+    for version in ["1.2", "1.2.0-rc1"] {
+        let dir = tempfile::tempdir().expect("temp dir");
+        let bin = dir.path().join("codex-acp");
+        std::fs::write(
+            &bin,
+            format!("#!/bin/sh\necho '@agentclientprotocol/codex-acp {version}'\nexit 0\n"),
+        )
+        .expect("write script");
+        std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755))
+            .expect("chmod script");
+
+        assert_eq!(
+            codex_adapter_availability(&bin),
+            AcpAvailabilityStatus::AdapterOutdated,
+            "version {version} is not comparable to the floor and must fail closed"
+        );
+    }
+}
+
 #[cfg(unix)]
 #[test]
 fn codex_adapter_availability_outdated_for_missing_binary() {
@@ -734,7 +929,7 @@ fn codex_adapter_availability_outdated_for_missing_binary() {
 
 #[cfg(unix)]
 #[test]
-fn probe_codex_acp_major_version_returns_none_for_hung_direct_child() {
+fn probe_codex_acp_version_returns_none_for_hung_direct_child() {
     use std::os::unix::fs::PermissionsExt;
     use std::time::Instant;
 
@@ -752,12 +947,12 @@ fn probe_codex_acp_major_version_returns_none_for_hung_direct_child() {
     std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755)).expect("chmod script");
 
     let start = Instant::now();
-    let major = probe_codex_acp_major_version(&bin);
+    let version = probe_codex_acp_version(&bin);
     let elapsed = start.elapsed();
     let _ = std::fs::remove_dir_all(dir);
 
     assert_eq!(
-        major, None,
+        version, None,
         "hung binary must return None (timeout kills child)"
     );
     // The timeout is 5 s; give a 10 s margin for parallel pre-push suites.
@@ -769,7 +964,7 @@ fn probe_codex_acp_major_version_returns_none_for_hung_direct_child() {
 
 #[cfg(unix)]
 #[test]
-fn probe_codex_acp_major_version_returns_version_when_descendant_holds_pipe_open() {
+fn probe_codex_acp_version_returns_version_when_descendant_holds_pipe_open() {
     use std::os::unix::fs::PermissionsExt;
     use std::time::Instant;
 
@@ -781,20 +976,20 @@ fn probe_codex_acp_major_version_returns_version_when_descendant_holds_pipe_open
     // (the parent closed its write end), read_to_end() returns immediately
     // without waiting for the descendant to close its inherited fd.
     //
-    // `(exec sleep 60 &)` forks a subshell that execs `sleep 60`; the subshell
-    // inherits the parent's stdout fd and keeps it open.
+    // `sleep 60 &` starts a descendant that inherits the parent's stdout fd
+    // without making the direct child wait for a nested subshell to exit.
     let dir = std::env::temp_dir().join(format!("buzz-probe-descendant-{}", uuid::Uuid::new_v4()));
     std::fs::create_dir_all(&dir).expect("create temp dir");
     let bin = dir.join("codex-acp");
     std::fs::write(
         &bin,
-        "#!/bin/sh\necho '@agentclientprotocol/codex-acp 1.1.2'\n(exec sleep 60 &)\nexit 0\n",
+        "#!/bin/sh\necho '@agentclientprotocol/codex-acp 1.1.2'\nsleep 60 &\nexit 0\n",
     )
     .expect("write script");
     std::fs::set_permissions(&bin, std::fs::Permissions::from_mode(0o755)).expect("chmod script");
 
     let start = Instant::now();
-    let major = probe_codex_acp_major_version(&bin);
+    let version = probe_codex_acp_version(&bin);
     let elapsed = start.elapsed();
     let _ = std::fs::remove_dir_all(dir);
 
@@ -805,9 +1000,9 @@ fn probe_codex_acp_major_version_returns_version_when_descendant_holds_pipe_open
         "probe must not block on descendant pipe; elapsed: {elapsed:?}"
     );
     assert_eq!(
-        major,
-        Some(1),
-        "1.x version must be parsed even when descendant holds pipe open"
+        version,
+        Some((1, 1, 2)),
+        "version must be parsed even when descendant holds pipe open"
     );
 }
 
@@ -1269,3 +1464,460 @@ fn test_install_shell_from_some_returns_path() {
         "install_shell_from(Some) must return the path as Ok"
     );
 }
+
+// ── Registry lifecycle (C1) ───────────────────────────────────────────────────
+//
+// These tests verify the "warm → spawn resolves → delete → spawn errors" lifecycle
+// that Paul's C1 ruling requires. They call the production resolution functions
+// directly so they would red if warm_harness_registry_from_dir, save/delete
+// transactional refresh, or try_record_agent_command were reverted.
+
+/// After warm_harness_registry_from_dir, a record with a matching custom runtime
+/// id resolves to the custom command — NOT the buzz-agent default.
+///
+/// This test would fail if warm_harness_registry_from_dir is not called before
+/// try_record_agent_command, or if try_record_agent_command ignores the registry.
+#[test]
+fn registry_warm_then_try_record_resolves_custom_id() {
+    use crate::managed_agents::custom_harnesses::{
+        registry_test_lock, warm_harness_registry_from_dir,
+    };
+    use std::fs;
+    use tempfile::tempdir;
+
+    let _lock = registry_test_lock();
+    let dir = tempdir().unwrap();
+    fs::write(
+        dir.path().join("my-custom-cli.json"),
+        r#"{"id":"my-custom-cli","label":"My CLI","command":"my-custom-bin"}"#,
+    )
+    .unwrap();
+
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    let record = record_with(Some("my-custom-cli"), None, None);
+    let result = try_record_agent_command(&record, &[]);
+    assert_eq!(
+        result,
+        Ok("my-custom-bin".to_string()),
+        "warm registry must make custom id resolvable at spawn time"
+    );
+}
+
+/// After deleting a custom harness and re-warming the registry, a record that
+/// still references the deleted id must produce a DANGLING_HARNESS_ID error —
+/// NOT silently fall back to buzz-agent.
+///
+/// This test would fail if save/delete commands do not call
+/// warm_harness_registry_from_dir transactionally, or if try_record_agent_command
+/// silently falls back to default_agent_command() for dangling ids.
+#[test]
+fn registry_delete_then_try_record_returns_dangling_error() {
+    use crate::managed_agents::custom_harnesses::{
+        registry_test_lock, warm_harness_registry_from_dir,
+    };
+    use std::fs;
+    use tempfile::tempdir;
+
+    let _lock = registry_test_lock();
+    let dir = tempdir().unwrap();
+    let path = dir.path().join("soon-gone.json");
+    fs::write(
+        &path,
+        r#"{"id":"soon-gone","label":"Gone","command":"soon-gone-bin"}"#,
+    )
+    .unwrap();
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    // Verify it resolves before delete.
+    let record = record_with(Some("soon-gone"), None, None);
+    assert!(
+        try_record_agent_command(&record, &[]).is_ok(),
+        "must resolve before delete"
+    );
+
+    // Simulate delete + re-warm (as delete_custom_harness does).
+    fs::remove_file(&path).unwrap();
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    // Now must produce a typed error.
+    let result = try_record_agent_command(&record, &[]);
+    assert!(
+        result.is_err(),
+        "deleted id must produce Err after re-warm, got Ok({:?})",
+        result.ok()
+    );
+    assert!(
+        result.unwrap_err().contains("DANGLING_HARNESS_ID"),
+        "error must contain DANGLING_HARNESS_ID"
+    );
+}
+
+/// After saving (writing) a harness JSON and re-warming, the record resolves
+/// to the new definition — simulating an immediate-save-then-start flow.
+#[test]
+fn registry_save_immediate_start_resolves_new_command() {
+    use crate::managed_agents::custom_harnesses::{
+        registry_test_lock, warm_harness_registry_from_dir,
+    };
+    use std::fs;
+    use tempfile::tempdir;
+
+    let _lock = registry_test_lock();
+    let dir = tempdir().unwrap();
+
+    // Before save: must not resolve.
+    warm_harness_registry_from_dir(Some(dir.path()));
+    let record = record_with(Some("fast-harness"), None, None);
+    assert!(
+        try_record_agent_command(&record, &[]).is_err(),
+        "must not resolve before save"
+    );
+
+    // Simulate save + transactional re-warm.
+    fs::write(
+        dir.path().join("fast-harness.json"),
+        r#"{"id":"fast-harness","label":"Fast","command":"fast-bin"}"#,
+    )
+    .unwrap();
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    let result = try_record_agent_command(&record, &[]);
+    assert_eq!(
+        result,
+        Ok("fast-bin".to_string()),
+        "immediate save+start must resolve without a discover_acp_providers round-trip"
+    );
+}
+
+/// Editing a custom harness (renaming id + updating command) and re-warming the
+/// registry makes both the old id a dangling reference and the new id resolvable.
+#[test]
+fn registry_edit_with_id_rename_old_dangling_new_resolved() {
+    use crate::managed_agents::custom_harnesses::{
+        registry_test_lock, warm_harness_registry_from_dir,
+    };
+    use std::fs;
+    use tempfile::tempdir;
+
+    // Serialize against all other tests that write to the global registry.
+    let _lock = registry_test_lock();
+    let dir = tempdir().unwrap();
+
+    // Create original.
+    fs::write(
+        dir.path().join("original-id.json"),
+        r#"{"id":"original-id","label":"Orig","command":"orig-bin"}"#,
+    )
+    .unwrap();
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    let old_record = record_with(Some("original-id"), None, None);
+    assert!(
+        try_record_agent_command(&old_record, &[]).is_ok(),
+        "original id must resolve"
+    );
+
+    // Simulate rename: write new file, remove old file (same as save_custom_harness
+    // with original_id set), then re-warm.
+    fs::write(
+        dir.path().join("renamed-id.json"),
+        r#"{"id":"renamed-id","label":"Renamed","command":"new-bin"}"#,
+    )
+    .unwrap();
+    fs::remove_file(dir.path().join("original-id.json")).unwrap();
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    // Old id must now be dangling.
+    let result = try_record_agent_command(&old_record, &[]);
+    assert!(
+        result.is_err() && result.unwrap_err().contains("DANGLING_HARNESS_ID"),
+        "original id must be dangling after rename"
+    );
+
+    // New id must resolve.
+    let new_record = record_with(Some("renamed-id"), None, None);
+    assert_eq!(
+        try_record_agent_command(&new_record, &[]),
+        Ok("new-bin".to_string()),
+        "new id must resolve after rename"
+    );
+}
+
+// ── Dangling-harness sentinel → user-facing surfaces ─────────────────────────
+
+/// The internal `DANGLING_HARNESS_ID:<id>` sentinel round-trips through
+/// `dangling_harness_id` and is never confused with other error strings.
+#[test]
+fn dangling_harness_id_extracts_id_and_rejects_other_errors() {
+    use super::{dangling_harness_id, DANGLING_HARNESS_PREFIX};
+    assert_eq!(
+        dangling_harness_id(&format!("{DANGLING_HARNESS_PREFIX}my-harness")),
+        Some("my-harness")
+    );
+    assert_eq!(dangling_harness_id("some other error"), None);
+    assert_eq!(dangling_harness_id(""), None);
+    // Prefix must anchor at the start — a wrapped sentinel is not a sentinel.
+    assert_eq!(
+        dangling_harness_id("cannot spawn: DANGLING_HARNESS_ID:x"),
+        None
+    );
+}
+
+/// Spawn surfaces the sentinel as an actionable sentence naming the id;
+/// non-sentinel errors pass through untouched.
+#[test]
+fn user_facing_harness_error_converts_sentinel_to_sentence() {
+    use super::{user_facing_harness_error, DANGLING_HARNESS_PREFIX};
+    let msg = user_facing_harness_error(&format!("{DANGLING_HARNESS_PREFIX}foo"));
+    assert!(
+        msg.contains("\"foo\"") && msg.contains("deleted"),
+        "sentence must name the missing harness, got: {msg}"
+    );
+    assert!(
+        !msg.contains(DANGLING_HARNESS_PREFIX),
+        "raw sentinel must never reach the user, got: {msg}"
+    );
+    assert_eq!(
+        user_facing_harness_error("plain failure"),
+        "plain failure",
+        "non-sentinel errors pass through"
+    );
+}
+
+/// Composed coherence test (delete → summary display → spawn sentence): after
+/// a harness is deleted, the single resolver errors with the sentinel, the
+/// summary path renders the *missing id* (not a silent buzz-agent fallback),
+/// and the spawn path renders the actionable sentence — both halves tell the
+/// same story from the same error.
+#[test]
+fn deleted_harness_summary_display_and_spawn_sentence_agree() {
+    use crate::managed_agents::custom_harnesses::{
+        delete_and_warm, registry_test_lock, save_and_warm,
+    };
+    use crate::managed_agents::{resolve_effective_harness_descriptor, GlobalAgentConfig};
+
+    let _lock = registry_test_lock();
+    let dir = tempfile::tempdir().unwrap();
+
+    // Save a custom harness and pin a record to it.
+    let def = crate::managed_agents::custom_harnesses::HarnessDefinition {
+        id: "doomed".to_string(),
+        label: "Doomed".to_string(),
+        command: "doomed-bin".to_string(),
+        args: vec![],
+        env: Default::default(),
+        install_instructions_url: String::new(),
+        install_hint: String::new(),
+    };
+    save_and_warm(dir.path(), &def, None).unwrap();
+    let record = record_with(Some("doomed"), None, None);
+    let global = GlobalAgentConfig::default();
+    assert!(
+        resolve_effective_harness_descriptor(&record, &[], &global).is_ok(),
+        "must resolve before delete"
+    );
+
+    // Delete it — the shared resolver used by BOTH spawn and summary errors.
+    delete_and_warm(dir.path(), "doomed").unwrap();
+    let err = resolve_effective_harness_descriptor(&record, &[], &global).unwrap_err();
+
+    // Summary half: renders the missing id, never the default command.
+    let id = super::dangling_harness_id(&err).expect("resolver must emit the typed sentinel");
+    let display = super::dangling_harness_display(id);
+    assert_eq!(display, "harness (deleted): doomed");
+    assert!(!display.contains(&default_agent_command()));
+
+    // Spawn half: renders a sentence naming the same id, no raw sentinel.
+    let sentence = super::user_facing_harness_error(&err);
+    assert!(sentence.contains("\"doomed\"") && sentence.contains("deleted"));
+    assert!(!sentence.contains(super::DANGLING_HARNESS_PREFIX));
+}
+
+// ── I2: custom catalog entry carries definition_env for the edit round-trip ───
+
+/// A custom harness definition that includes env vars must surface those vars
+/// in the `definition_env` field of the resulting `AcpRuntimeCatalogEntry`.
+///
+/// This proves the edit-form round-trip: the backend carries env into the
+/// catalog, the frontend reads it back when opening the edit form, and Save
+/// therefore preserves existing env vars rather than silently erasing them.
+#[test]
+fn custom_catalog_entry_carries_definition_env_for_edit_roundtrip() {
+    use crate::managed_agents::custom_harnesses::registry_test_lock;
+    use crate::managed_agents::discovery::discover_acp_runtimes_from;
+    use std::{collections::BTreeMap, fs};
+    use tempfile::tempdir;
+
+    // Discovery's auth probes read/warm the process-global PATH and
+    // login-shell-PATH caches, and its final step publishes to the global
+    // harness registry — hold both guards so parallel tests (e.g. the
+    // PATH-swapping resolution tests) can't observe or absorb torn state.
+    // Lock order for tests that need both: path lock first, then registry.
+    let _path_guard = crate::managed_agents::lock_path_mutex();
+    let _lock = registry_test_lock();
+    let dir = tempdir().unwrap();
+    // Write a custom definition with two env vars.
+    fs::write(
+        dir.path().join("env-harness.json"),
+        r#"{
+            "id": "env-harness",
+            "label": "Env Harness",
+            "command": "env-harness-bin",
+            "args": [],
+            "env": { "CURSOR_ACP": "1", "MY_TOKEN": "abc" }
+        }"#,
+    )
+    .unwrap();
+
+    let entries = discover_acp_runtimes_from(Some(dir.path()));
+    let entry = entries
+        .iter()
+        .find(|e| e.id == "env-harness")
+        .expect("custom entry must appear in catalog");
+
+    let expected: BTreeMap<String, String> = [
+        ("CURSOR_ACP".to_string(), "1".to_string()),
+        ("MY_TOKEN".to_string(), "abc".to_string()),
+    ]
+    .into_iter()
+    .collect();
+
+    assert_eq!(
+        entry.definition_env, expected,
+        "catalog entry must carry definition env vars so the edit form can read them back"
+    );
+}
+
+/// A builtin catalog entry must have an empty `definition_env` — their env
+/// is handled via the `KnownAcpRuntime` metadata path, not user-editable JSON.
+#[test]
+fn builtin_catalog_entry_has_empty_definition_env() {
+    use crate::managed_agents::custom_harnesses::registry_test_lock;
+    use crate::managed_agents::discovery::discover_acp_runtimes_from;
+
+    // Same guards as above: discovery probes PATH-dependent caches and
+    // publishes to the global registry.
+    let _path_guard = crate::managed_agents::lock_path_mutex();
+    let _lock = registry_test_lock();
+    let entries = discover_acp_runtimes_from(None);
+    // Find any builtin entry (e.g. "goose" or "claude").
+    let builtin = entries
+        .iter()
+        .find(|e| e.source == crate::managed_agents::HarnessSource::Builtin)
+        .expect("at least one builtin must exist");
+
+    assert!(
+        builtin.definition_env.is_empty(),
+        "builtin entry must not carry definition_env, got: {:?}",
+        builtin.definition_env
+    );
+}
+
+// ── Discovery publish via the PRODUCTION call path (stale-snapshot regression) ─
+//
+// These drive `discover_acp_runtimes_from` itself and land a save/delete in
+// the window between its directory scan and its registry publish (via the
+// `pre_publish_test_hook` seam). They red if discovery's final line reverts
+// to publishing its pre-probe `loaded_defs` snapshot — the original bug —
+// unlike the `custom_harnesses` seam tests, which pin only the fresh-read
+// contract of `warm_harness_registry_locked`.
+
+/// RAII guard: installs the pre-publish hook, clears it on drop (even on
+/// panic) so a failing test cannot poison later ones.
+struct PrePublishHookGuard;
+
+impl PrePublishHookGuard {
+    fn install(hook: Box<dyn Fn() + Send>) -> Self {
+        super::pre_publish_test_hook::set(Some(hook));
+        PrePublishHookGuard
+    }
+}
+
+impl Drop for PrePublishHookGuard {
+    fn drop(&mut self) {
+        super::pre_publish_test_hook::set(None);
+    }
+}
+
+fn harness_def(
+    id: &str,
+    label: &str,
+    command: &str,
+) -> crate::managed_agents::custom_harnesses::HarnessDefinition {
+    crate::managed_agents::custom_harnesses::HarnessDefinition {
+        id: id.to_string(),
+        label: label.to_string(),
+        command: command.to_string(),
+        args: vec![],
+        env: Default::default(),
+        install_instructions_url: String::new(),
+        install_hint: String::new(),
+    }
+}
+
+/// A `save_and_warm` landing mid-discovery (after the scan, before the
+/// publish) must survive discovery's registry publish — through the real
+/// `discover_acp_runtimes_from` path.
+#[test]
+fn discovery_publish_path_survives_mid_flight_save() {
+    use crate::managed_agents::custom_harnesses::{
+        lookup_loaded_harness_by_id, registry_test_lock, save_and_warm,
+    };
+    use crate::managed_agents::discovery::discover_acp_runtimes_from;
+
+    // Path lock first, then registry — discovery's probes touch the global
+    // PATH caches (see the definition_env tests above for the full rationale).
+    let _path_guard = crate::managed_agents::lock_path_mutex();
+    let _lock = registry_test_lock();
+    let dir = tempfile::tempdir().unwrap();
+
+    // Discovery scans the dir while it is EMPTY; the save lands in the
+    // pre-publish window. A stale-snapshot publish would clobber it.
+    let hook_dir = dir.path().to_path_buf();
+    let _guard = PrePublishHookGuard::install(Box::new(move || {
+        let def = harness_def("mid-flight-save", "Mid Flight", "mid-flight-bin");
+        save_and_warm(&hook_dir, &def, None).unwrap();
+        assert!(lookup_loaded_harness_by_id("mid-flight-save").is_some());
+    }));
+
+    let _entries = discover_acp_runtimes_from(Some(dir.path()));
+
+    assert!(
+        lookup_loaded_harness_by_id("mid-flight-save").is_some(),
+        "discovery's publish must re-read the directory — a stale-snapshot \
+         publish clobbers a save that landed mid-discovery"
+    );
+}
+
+/// A `delete_and_warm` landing mid-discovery must stay gone after discovery's
+/// publish — a stale snapshot (taken while the file existed) would resurrect it.
+#[test]
+fn discovery_publish_path_drops_mid_flight_delete() {
+    use crate::managed_agents::custom_harnesses::{
+        delete_and_warm, lookup_loaded_harness_by_id, registry_test_lock, save_and_warm,
+    };
+    use crate::managed_agents::discovery::discover_acp_runtimes_from;
+
+    // Path lock first, then registry (same rationale as the sibling test).
+    let _path_guard = crate::managed_agents::lock_path_mutex();
+    let _lock = registry_test_lock();
+    let dir = tempfile::tempdir().unwrap();
+
+    // File exists at scan time — discovery's snapshot would contain it.
+    let def = harness_def("mid-flight-delete", "Mid Flight Del", "mid-flight-del-bin");
+    save_and_warm(dir.path(), &def, None).unwrap();
+
+    let hook_dir = dir.path().to_path_buf();
+    let _guard = PrePublishHookGuard::install(Box::new(move || {
+        delete_and_warm(&hook_dir, "mid-flight-delete").unwrap();
+        assert!(lookup_loaded_harness_by_id("mid-flight-delete").is_none());
+    }));
+
+    let _entries = discover_acp_runtimes_from(Some(dir.path()));
+
+    assert!(
+        lookup_loaded_harness_by_id("mid-flight-delete").is_none(),
+        "discovery's publish must not resurrect a harness deleted mid-discovery"
+    );
+}
diff --git a/desktop/src-tauri/src/managed_agents/discovery/tests/codex_version.rs b/desktop/src-tauri/src/managed_agents/discovery/tests/codex_version.rs
index 5886a43990..82bfd27f32 100644
--- a/desktop/src-tauri/src/managed_agents/discovery/tests/codex_version.rs
+++ b/desktop/src-tauri/src/managed_agents/discovery/tests/codex_version.rs
@@ -1,8 +1,8 @@
-use super::super::probe_codex_acp_major_version_with_path;
+use super::super::probe_codex_acp_version_with_path;
 
 #[cfg(unix)]
 #[test]
-fn probe_codex_acp_major_version_uses_augmented_path_for_env_shebang_interpreter() {
+fn probe_codex_acp_version_uses_augmented_path_for_env_shebang_interpreter() {
     use std::fs;
     use std::os::unix::fs::PermissionsExt;
     let temp = tempfile::tempdir().expect("temp dir");
@@ -31,7 +31,7 @@ fn probe_codex_acp_major_version_uses_augmented_path_for_env_shebang_interpreter
         .to_string_lossy()
         .into_owned();
     assert_eq!(
-        probe_codex_acp_major_version_with_path(&shim_path, Some(&scrubbed_path)),
+        probe_codex_acp_version_with_path(&shim_path, Some(&scrubbed_path)),
         None,
         "with a scrubbed PATH, /usr/bin/env should not find node"
     );
@@ -41,8 +41,8 @@ fn probe_codex_acp_major_version_uses_augmented_path_for_env_shebang_interpreter
         .to_string_lossy()
         .into_owned();
     assert_eq!(
-        probe_codex_acp_major_version_with_path(&shim_path, Some(&augmented_path)),
-        Some(1),
+        probe_codex_acp_version_with_path(&shim_path, Some(&augmented_path)),
+        Some((1, 1, 2)),
         "the injected augmented PATH should allow /usr/bin/env to find node"
     );
 }
diff --git a/desktop/src-tauri/src/managed_agents/discovery/tests/managed_path_resolution.rs b/desktop/src-tauri/src/managed_agents/discovery/tests/managed_path_resolution.rs
index 2f6b038deb..0795bb2345 100644
--- a/desktop/src-tauri/src/managed_agents/discovery/tests/managed_path_resolution.rs
+++ b/desktop/src-tauri/src/managed_agents/discovery/tests/managed_path_resolution.rs
@@ -1,5 +1,31 @@
 use crate::managed_agents::discovery::{clear_resolve_cache, resolve_command};
 
+/// The legacy Goose Windows installer wrote `%USERPROFILE%\goose\goose.exe`,
+/// a directory on no standard PATH. `resolve_command_uncached` finds binaries
+/// outside PATH only by scanning `common_binary_paths()`, so that directory
+/// must appear there or those installs stay undiscovered (#2239 residual).
+///
+/// Asserts the probe list rather than a planted binary: `common_binary_paths`
+/// is a process-lifetime `OnceLock`, so a test cannot re-seed `USERPROFILE`
+/// deterministically, and planting an executable under the real user profile
+/// is not an acceptable test side effect.
+#[cfg(windows)]
+#[test]
+fn common_binary_paths_probes_legacy_goose_install_dir() {
+    use std::path::PathBuf;
+
+    let profile = std::env::var_os("USERPROFILE").expect("USERPROFILE is always set on Windows");
+    let legacy_dir = PathBuf::from(profile).join("goose");
+
+    let probed = super::super::common_binary_paths();
+
+    assert!(
+        probed.contains(&legacy_dir),
+        "legacy Goose install dir {} must be probed, got: {probed:?}",
+        legacy_dir.display()
+    );
+}
+
 #[cfg(unix)]
 #[test]
 fn resolve_command_prefers_buzz_managed_npm_shim_over_path() {
diff --git a/desktop/src-tauri/src/managed_agents/effective_config/mod.rs b/desktop/src-tauri/src/managed_agents/effective_config/mod.rs
new file mode 100644
index 0000000000..e079c76a1d
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/effective_config/mod.rs
@@ -0,0 +1,318 @@
+use std::collections::BTreeMap;
+
+use serde::Serialize;
+
+use super::global_config::GlobalAgentConfig;
+use super::relay_mesh::{
+    RELAY_MESH_API_BASE_URL, RELAY_MESH_API_KEY_PLACEHOLDER, RELAY_MESH_AUTO_MODEL_ID,
+    RELAY_MESH_PROVIDER_ID,
+};
+use super::types::{AgentDefinition, ManagedAgentRecord};
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ConfigSource {
+    Definition,
+    Global,
+    InstanceLegacy,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ResolvedField<T> {
+    pub value: Option<T>,
+    pub source: ConfigSource,
+}
+
+#[derive(Debug, Clone)]
+pub struct EffectiveAgentConfig {
+    pub model: ResolvedField<String>,
+    pub provider: ResolvedField<String>,
+    pub system_prompt: ResolvedField<String>,
+}
+
+impl EffectiveAgentConfig {
+    /// The relay-mesh model id this config resolves to, or `None` when the
+    /// effective provider isn't relay-mesh.
+    ///
+    /// This is the single authoritative mesh decision for this config.  Both
+    /// the mesh preflight (interactive start, restore-on-launch) AND spawn's
+    /// `apply_relay_mesh_env` block MUST derive their mesh gate from this
+    /// method — never from a separate provider comparison — so the two paths
+    /// are guaranteed to agree even when the stored provider string has leading
+    /// or trailing whitespace.  The provider is trimmed before matching;
+    /// a blank effective model falls back to "auto", mirroring
+    /// `apply_relay_mesh_env`'s own rule.
+    pub fn relay_mesh_model_id(&self) -> Option<String> {
+        if self.provider.value.as_deref().map(str::trim) != Some(RELAY_MESH_PROVIDER_ID) {
+            return None;
+        }
+        Some(
+            self.model
+                .value
+                .as_deref()
+                .map(str::trim)
+                .filter(|value| !value.is_empty())
+                .unwrap_or(RELAY_MESH_AUTO_MODEL_ID)
+                .to_string(),
+        )
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum EffectiveConfigResult {
+    Resolved(EffectiveAgentConfig),
+    OrphanedInstance {
+        record_pubkey: String,
+        missing_persona_id: String,
+    },
+}
+
+fn non_blank(v: Option<&str>) -> Option<&str> {
+    v.filter(|s| !s.trim().is_empty())
+}
+
+fn resolve_linked(
+    definition: &AgentDefinition,
+    global: &GlobalAgentConfig,
+) -> EffectiveAgentConfig {
+    let model = match non_blank(definition.model.as_deref()) {
+        Some(m) => ResolvedField {
+            value: Some(m.to_owned()),
+            source: ConfigSource::Definition,
+        },
+        None => ResolvedField {
+            value: global.model.clone(),
+            source: ConfigSource::Global,
+        },
+    };
+
+    let provider = match non_blank(definition.provider.as_deref()) {
+        Some(p) => ResolvedField {
+            value: Some(p.to_owned()),
+            source: ConfigSource::Definition,
+        },
+        None => ResolvedField {
+            value: global.provider.clone(),
+            source: ConfigSource::Global,
+        },
+    };
+
+    let system_prompt = ResolvedField {
+        value: non_blank(Some(definition.system_prompt.as_str())).map(str::to_owned),
+        source: ConfigSource::Definition,
+    };
+
+    EffectiveAgentConfig {
+        model,
+        provider,
+        system_prompt,
+    }
+}
+
+/// The API key value the relay-mesh preset wrote before the Jun-11 rename
+/// window (#960, `8f580f308`) changed `RELAY_MESH_API_KEY_PLACEHOLDER` from
+/// `"sprout-mesh-local"` to its current value. The old string is persisted as a
+/// *value* in `env_vars` on records created before that, and no migration ever
+/// rewrote it.
+const LEGACY_MESH_API_KEY_PLACEHOLDER: &str = "sprout-mesh-local";
+
+/// The provider key the preset wrote before #971 (`8c8312932`) renamed it to
+/// `BUZZ_AGENT_PROVIDER`. That commit changed source literals only — persisted
+/// `env_vars` keys were never migrated.
+const LEGACY_MESH_PROVIDER_ENV_KEY: &str = "SPROUT_AGENT_PROVIDER";
+
+/// The legacy env discriminator: recognizes the relay-mesh preset purely from
+/// the env vars a pre-typed-field record carries, returning its served model id.
+///
+/// All three sentinels must match — the local base URL alone is not enough,
+/// since a user may point their own OpenAI-compatible provider at the same
+/// port. The placeholder API key is what makes this Buzz's own preset.
+///
+/// Two of those sentinels were renamed in the same Jun-11 window, in separate
+/// commits, with neither migrating persisted records: the provider env *key*
+/// (#971) and the API key *value* (#960). Each is therefore accepted under
+/// either spelling, independently — a record straddling the window carries one
+/// old and one new. In both cases the current spelling is authoritative when
+/// present, so a record that has since been rewritten with a non-mesh value is
+/// not resurrected by the stale leftover beside it.
+///
+/// `OPENAI_COMPAT_BASE_URL` and `OPENAI_COMPAT_MODEL` were never renamed.
+/// Nothing beyond these two either/ors is loosened: every sentinel dropped
+/// widens the false-positive surface for a user's own openai-compatible agent.
+fn mesh_preset_env_model_id(env_vars: &BTreeMap<String, String>) -> Option<String> {
+    let base_url = env_vars.get("OPENAI_COMPAT_BASE_URL")?.trim();
+    if base_url.trim_end_matches('/') != RELAY_MESH_API_BASE_URL {
+        return None;
+    }
+    let provider = env_vars
+        .get("BUZZ_AGENT_PROVIDER")
+        .or_else(|| env_vars.get(LEGACY_MESH_PROVIDER_ENV_KEY))?
+        .trim();
+    if provider != "openai" {
+        return None;
+    }
+    let api_key = env_vars.get("OPENAI_COMPAT_API_KEY")?.trim();
+    if api_key != RELAY_MESH_API_KEY_PLACEHOLDER && api_key != LEGACY_MESH_API_KEY_PLACEHOLDER {
+        return None;
+    }
+    non_blank(env_vars.get("OPENAI_COMPAT_MODEL").map(String::as_str)).map(str::to_owned)
+}
+
+/// The mesh model id a definition-less record carries in legacy form, or `None`
+/// when it is not a legacy mesh record.
+///
+/// Two shipped record generations predate `provider: "relay-mesh"` and are
+/// never rewritten on load, so they are still on disk:
+///
+/// - the typed `relay_mesh` marker, added before the record had a `provider`
+///   field at all;
+/// - before that, the mesh preset written straight into `env_vars`.
+///
+/// Consulted only by [`resolve_definition_less`]: a record with no definition
+/// has nothing authoritative to be overridden by, so its own bytes are the
+/// highest-precedence signal it has. A linked instance never reaches here.
+fn legacy_record_mesh_model_id(record: &ManagedAgentRecord) -> Option<String> {
+    match &record.relay_mesh {
+        // The marker itself is the mesh signal; a blank `model_ref` still means
+        // mesh, resolved to the auto model exactly as `apply_relay_mesh_env`
+        // and `relay_mesh_model_id` treat a blank model.
+        Some(config) => Some(
+            non_blank(Some(config.model_ref.as_str()))
+                .unwrap_or(RELAY_MESH_AUTO_MODEL_ID)
+                .to_owned(),
+        ),
+        None => mesh_preset_env_model_id(&record.env_vars),
+    }
+}
+
+fn resolve_definition_less(
+    record: &ManagedAgentRecord,
+    global: &GlobalAgentConfig,
+) -> EffectiveAgentConfig {
+    let model = match non_blank(record.model.as_deref()) {
+        Some(m) => ResolvedField {
+            value: Some(m.to_owned()),
+            source: ConfigSource::InstanceLegacy,
+        },
+        None => ResolvedField {
+            value: global.model.clone(),
+            source: ConfigSource::Global,
+        },
+    };
+
+    let provider = match non_blank(record.provider.as_deref()) {
+        Some(p) => ResolvedField {
+            value: Some(p.to_owned()),
+            source: ConfigSource::InstanceLegacy,
+        },
+        None => ResolvedField {
+            value: global.provider.clone(),
+            source: ConfigSource::Global,
+        },
+    };
+
+    let system_prompt = ResolvedField {
+        value: non_blank(record.system_prompt.as_deref()).map(str::to_owned),
+        source: ConfigSource::InstanceLegacy,
+    };
+
+    let mut config = EffectiveAgentConfig {
+        model,
+        provider,
+        system_prompt,
+    };
+
+    // Legacy mesh compatibility. A record with an explicit `provider` has
+    // already stated its intent — including switching AWAY from mesh, which
+    // leaves the old marker and env bytes behind — so its legacy bytes are
+    // never consulted. Only a record that never carried a provider at all
+    // falls back, and both fields move together so the single mesh gate
+    // (`relay_mesh_model_id`) and the spawned model agree.
+    if non_blank(record.provider.as_deref()).is_none() {
+        if let Some(model_ref) = legacy_record_mesh_model_id(record) {
+            config.provider = ResolvedField {
+                value: Some(RELAY_MESH_PROVIDER_ID.to_owned()),
+                source: ConfigSource::InstanceLegacy,
+            };
+            config.model = ResolvedField {
+                value: Some(model_ref),
+                source: ConfigSource::InstanceLegacy,
+            };
+        }
+    }
+
+    config
+}
+
+pub fn resolve_effective_config(
+    record: &ManagedAgentRecord,
+    definitions: &[AgentDefinition],
+    global: &GlobalAgentConfig,
+) -> EffectiveConfigResult {
+    match &record.persona_id {
+        Some(pid) => match definitions.iter().find(|d| d.id == *pid) {
+            Some(def) => EffectiveConfigResult::Resolved(resolve_linked(def, global)),
+            None => EffectiveConfigResult::OrphanedInstance {
+                record_pubkey: record.pubkey.clone(),
+                missing_persona_id: pid.clone(),
+            },
+        },
+        None => EffectiveConfigResult::Resolved(resolve_definition_less(record, global)),
+    }
+}
+
+pub fn resolve_effective_model_provider_pair(
+    record: &ManagedAgentRecord,
+    definitions: &[AgentDefinition],
+    global: &GlobalAgentConfig,
+) -> Option<(Option<String>, Option<String>)> {
+    match resolve_effective_config(record, definitions, global) {
+        EffectiveConfigResult::Resolved(cfg) => Some((cfg.model.value, cfg.provider.value)),
+        EffectiveConfigResult::OrphanedInstance { .. } => None,
+    }
+}
+
+/// The relay-mesh preflight decision for `record`, resolved the same way
+/// spawn resolves its mesh env: through `resolve_effective_config` (which
+/// folds in the definition → global fallback). A linked instance's own
+/// `provider`/`model`/`relay_mesh` bytes never contribute; a definition-less
+/// legacy record may fall back to them via `legacy_record_mesh_model_id`,
+/// which is confined to `resolve_definition_less`.
+///
+/// `None` covers both "not a mesh agent" and "orphaned instance" — an orphan
+/// never spawns (see `require_resolved`), so it never needs a mesh preflight
+/// either; the caller's own orphan handling downstream is unaffected, this
+/// just avoids tripping mesh bootstrap for a start that will be refused.
+pub fn resolve_effective_relay_mesh_model_id(
+    record: &ManagedAgentRecord,
+    definitions: &[AgentDefinition],
+    global: &GlobalAgentConfig,
+) -> Option<String> {
+    match resolve_effective_config(record, definitions, global) {
+        EffectiveConfigResult::Resolved(cfg) => cfg.relay_mesh_model_id(),
+        EffectiveConfigResult::OrphanedInstance { .. } => None,
+    }
+}
+
+/// The single user-facing message for a linked instance whose definition no
+/// longer exists. Shared by every path that must refuse to act on an orphan:
+/// the spawn boundary (`spawn_agent_child`), the interactive start command,
+/// and provider deploy.
+pub const ORPHANED_INSTANCE_ERROR: &str =
+    "This agent's configuration is missing — it may still be \
+     syncing or was deleted on another device.";
+
+impl EffectiveConfigResult {
+    /// Unwrap into the resolved config, or the shared orphan-refusal error.
+    pub fn require_resolved(self) -> Result<EffectiveAgentConfig, String> {
+        match self {
+            EffectiveConfigResult::Resolved(cfg) => Ok(cfg),
+            EffectiveConfigResult::OrphanedInstance { .. } => {
+                Err(ORPHANED_INSTANCE_ERROR.to_string())
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/desktop/src-tauri/src/managed_agents/effective_config/tests.rs b/desktop/src-tauri/src/managed_agents/effective_config/tests.rs
new file mode 100644
index 0000000000..c8e437809c
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/effective_config/tests.rs
@@ -0,0 +1,876 @@
+use super::*;
+use std::collections::BTreeMap;
+
+fn definition(
+    id: &str,
+    model: Option<&str>,
+    provider: Option<&str>,
+    prompt: &str,
+) -> AgentDefinition {
+    AgentDefinition {
+        id: id.to_string(),
+        display_name: "Test Definition".to_string(),
+        avatar_url: None,
+        system_prompt: prompt.to_string(),
+        runtime: None,
+        model: model.map(str::to_string),
+        provider: provider.map(str::to_string),
+        name_pool: vec![],
+        is_builtin: false,
+        is_active: true,
+        shared: false,
+        source_team: None,
+        source_team_persona_slug: None,
+        catalog_source: None,
+        env_vars: BTreeMap::new(),
+        respond_to: None,
+        respond_to_allowlist: vec![],
+        parallelism: None,
+        created_at: "".to_string(),
+        updated_at: "".to_string(),
+    }
+}
+
+fn record(
+    persona_id: Option<&str>,
+    model: Option<&str>,
+    provider: Option<&str>,
+    prompt: Option<&str>,
+) -> ManagedAgentRecord {
+    use crate::managed_agents::{BackendKind, RespondTo};
+    ManagedAgentRecord {
+        pubkey: "agent-pk".to_string(),
+        name: "Agent".to_string(),
+        persona_id: persona_id.map(str::to_string),
+        private_key_nsec: "".to_string(),
+        auth_tag: None,
+        relay_url: "ws://localhost:3000".to_string(),
+        avatar_url: None,
+        acp_command: "buzz-acp".to_string(),
+        agent_command: "goose".to_string(),
+        agent_command_override: None,
+        agent_args: vec![],
+        mcp_command: "".to_string(),
+        turn_timeout_seconds: 300,
+        idle_timeout_seconds: None,
+        max_turn_duration_seconds: None,
+        parallelism: 1,
+        system_prompt: prompt.map(str::to_string),
+        model: model.map(str::to_string),
+        provider: provider.map(str::to_string),
+        persona_source_version: None,
+        env_vars: BTreeMap::new(),
+        start_on_app_launch: false,
+        runtime_pid: None,
+        backend: BackendKind::Local,
+        backend_agent_id: None,
+        provider_binary_path: None,
+        team_id: None,
+        persona_team_dir: None,
+        persona_name_in_team: None,
+        created_at: "".to_string(),
+        updated_at: "".to_string(),
+        last_started_at: None,
+        last_stopped_at: None,
+        last_exit_code: None,
+        last_error: None,
+        last_error_code: None,
+        respond_to: RespondTo::OwnerOnly,
+        respond_to_allowlist: vec![],
+        display_name: None,
+        slug: None,
+        runtime: None,
+        name_pool: vec![],
+        is_builtin: false,
+        is_active: true,
+        shared: false,
+        source_team: None,
+        source_team_persona_slug: None,
+        catalog_source: None,
+        relay_mesh: None,
+        auto_restart_on_config_change: false,
+        definition_respond_to: None,
+        definition_respond_to_allowlist: vec![],
+        definition_parallelism: None,
+    }
+}
+
+fn global(model: Option<&str>, provider: Option<&str>) -> GlobalAgentConfig {
+    GlobalAgentConfig {
+        model: model.map(str::to_string),
+        provider: provider.map(str::to_string),
+        ..Default::default()
+    }
+}
+
+// ── Linked instance: definition → global, record ignored ──
+
+#[test]
+fn linked_definition_model_wins_over_stale_record() {
+    let rec = record(
+        Some("d1"),
+        Some("stale-model"),
+        Some("stale-prov"),
+        Some("stale prompt"),
+    );
+    let defs = vec![definition(
+        "d1",
+        Some("def-model"),
+        Some("def-prov"),
+        "def prompt",
+    )];
+    let g = global(Some("global-model"), Some("global-prov"));
+
+    let result = resolve_effective_config(&rec, &defs, &g);
+    let cfg = match result {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("expected Resolved, got {:?}", other),
+    };
+
+    assert_eq!(cfg.model.value.as_deref(), Some("def-model"));
+    assert_eq!(cfg.model.source, ConfigSource::Definition);
+    assert_eq!(cfg.provider.value.as_deref(), Some("def-prov"));
+    assert_eq!(cfg.provider.source, ConfigSource::Definition);
+    assert_eq!(cfg.system_prompt.value.as_deref(), Some("def prompt"));
+    assert_eq!(cfg.system_prompt.source, ConfigSource::Definition);
+}
+
+#[test]
+fn linked_inherit_global_when_definition_blank() {
+    let rec = record(
+        Some("d1"),
+        Some("stale-model"),
+        Some("stale-prov"),
+        Some("stale prompt"),
+    );
+    let defs = vec![definition("d1", None, None, "")];
+    let g = global(Some("global-model"), Some("global-prov"));
+
+    let result = resolve_effective_config(&rec, &defs, &g);
+    let cfg = match result {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("expected Resolved, got {:?}", other),
+    };
+
+    assert_eq!(cfg.model.value.as_deref(), Some("global-model"));
+    assert_eq!(cfg.model.source, ConfigSource::Global);
+    assert_eq!(cfg.provider.value.as_deref(), Some("global-prov"));
+    assert_eq!(cfg.provider.source, ConfigSource::Global);
+    assert_eq!(cfg.system_prompt.value, None);
+    assert_eq!(cfg.system_prompt.source, ConfigSource::Definition);
+}
+
+#[test]
+fn linked_stale_record_model_is_inert() {
+    let rec = record(Some("d1"), Some("stale-model"), Some("stale-prov"), None);
+    let defs = vec![definition("d1", None, None, "")];
+    let g = global(None, None);
+
+    let result = resolve_effective_config(&rec, &defs, &g);
+    let cfg = match result {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("expected Resolved, got {:?}", other),
+    };
+
+    assert_eq!(cfg.model.value, None);
+    assert_eq!(cfg.model.source, ConfigSource::Global);
+    assert_eq!(cfg.provider.value, None);
+    assert_eq!(cfg.provider.source, ConfigSource::Global);
+}
+
+#[test]
+fn linked_definition_model_set_provider_inherits() {
+    let rec = record(Some("d1"), None, None, None);
+    let defs = vec![definition("d1", Some("def-model"), None, "prompt")];
+    let g = global(None, Some("global-prov"));
+
+    let result = resolve_effective_config(&rec, &defs, &g);
+    let cfg = match result {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("expected Resolved, got {:?}", other),
+    };
+
+    assert_eq!(cfg.model.value.as_deref(), Some("def-model"));
+    assert_eq!(cfg.model.source, ConfigSource::Definition);
+    assert_eq!(cfg.provider.value.as_deref(), Some("global-prov"));
+    assert_eq!(cfg.provider.source, ConfigSource::Global);
+}
+
+#[test]
+fn linked_blank_prompt_means_no_prompt() {
+    let rec = record(Some("d1"), None, None, Some("stale prompt on record"));
+    let defs = vec![definition("d1", None, None, "")];
+    let g = global(None, None);
+
+    let result = resolve_effective_config(&rec, &defs, &g);
+    let cfg = match result {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("expected Resolved, got {:?}", other),
+    };
+
+    assert_eq!(cfg.system_prompt.value, None);
+    assert_eq!(cfg.system_prompt.source, ConfigSource::Definition);
+}
+
+#[test]
+fn linked_whitespace_only_definition_model_inherits_global() {
+    let rec = record(Some("d1"), Some("stale"), None, None);
+    let defs = vec![definition("d1", Some("  "), Some("  \t"), "")];
+    let g = global(Some("global-model"), Some("global-prov"));
+
+    let result = resolve_effective_config(&rec, &defs, &g);
+    let cfg = match result {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("expected Resolved, got {:?}", other),
+    };
+
+    assert_eq!(cfg.model.value.as_deref(), Some("global-model"));
+    assert_eq!(cfg.model.source, ConfigSource::Global);
+    assert_eq!(cfg.provider.value.as_deref(), Some("global-prov"));
+    assert_eq!(cfg.provider.source, ConfigSource::Global);
+}
+
+// ── Orphaned instance ──
+
+#[test]
+fn orphaned_linked_instance_returns_error() {
+    let rec = record(Some("missing-def"), None, None, None);
+    let defs = vec![];
+    let g = global(Some("global-model"), None);
+
+    let result = resolve_effective_config(&rec, &defs, &g);
+    match result {
+        EffectiveConfigResult::OrphanedInstance {
+            record_pubkey,
+            missing_persona_id,
+        } => {
+            assert_eq!(record_pubkey, "agent-pk");
+            assert_eq!(missing_persona_id, "missing-def");
+        }
+        other => panic!("expected OrphanedInstance, got {:?}", other),
+    }
+}
+
+// ── Definition-less instance: instance → global ──
+
+#[test]
+fn definition_less_uses_own_fields() {
+    let rec = record(None, Some("my-model"), Some("my-prov"), Some("my prompt"));
+    let defs = vec![];
+    let g = global(Some("global-model"), Some("global-prov"));
+
+    let result = resolve_effective_config(&rec, &defs, &g);
+    let cfg = match result {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("expected Resolved, got {:?}", other),
+    };
+
+    assert_eq!(cfg.model.value.as_deref(), Some("my-model"));
+    assert_eq!(cfg.model.source, ConfigSource::InstanceLegacy);
+    assert_eq!(cfg.provider.value.as_deref(), Some("my-prov"));
+    assert_eq!(cfg.provider.source, ConfigSource::InstanceLegacy);
+    assert_eq!(cfg.system_prompt.value.as_deref(), Some("my prompt"));
+    assert_eq!(cfg.system_prompt.source, ConfigSource::InstanceLegacy);
+}
+
+#[test]
+fn definition_less_falls_back_to_global() {
+    let rec = record(None, None, None, None);
+    let defs = vec![];
+    let g = global(Some("global-model"), Some("global-prov"));
+
+    let result = resolve_effective_config(&rec, &defs, &g);
+    let cfg = match result {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("expected Resolved, got {:?}", other),
+    };
+
+    assert_eq!(cfg.model.value.as_deref(), Some("global-model"));
+    assert_eq!(cfg.model.source, ConfigSource::Global);
+    assert_eq!(cfg.provider.value.as_deref(), Some("global-prov"));
+    assert_eq!(cfg.provider.source, ConfigSource::Global);
+}
+
+#[test]
+fn definition_less_blank_record_fields_fall_through() {
+    let rec = record(None, Some("  "), Some(""), Some("  "));
+    let defs = vec![];
+    let g = global(Some("g-model"), None);
+
+    let result = resolve_effective_config(&rec, &defs, &g);
+    let cfg = match result {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("expected Resolved, got {:?}", other),
+    };
+
+    assert_eq!(cfg.model.value.as_deref(), Some("g-model"));
+    assert_eq!(cfg.model.source, ConfigSource::Global);
+    assert_eq!(cfg.provider.value, None);
+    assert_eq!(cfg.provider.source, ConfigSource::Global);
+    assert_eq!(cfg.system_prompt.value, None);
+}
+
+// ── Convenience helper ──
+
+#[test]
+fn model_provider_pair_returns_none_for_orphan() {
+    let rec = record(Some("missing"), None, None, None);
+    assert_eq!(
+        resolve_effective_model_provider_pair(&rec, &[], &global(None, None)),
+        None
+    );
+}
+
+#[test]
+fn model_provider_pair_returns_resolved_values() {
+    let rec = record(Some("d1"), None, None, None);
+    let defs = vec![definition("d1", Some("m"), Some("p"), "")];
+    let g = global(None, None);
+
+    let pair = resolve_effective_model_provider_pair(&rec, &defs, &g);
+    assert_eq!(pair, Some((Some("m".to_string()), Some("p".to_string()))));
+}
+
+// ── require_resolved: the shared orphan-refusal contract used by
+// build_deploy_payload and spawn_agent_child ──
+
+#[test]
+fn require_resolved_returns_shared_error_for_orphan() {
+    let rec = record(Some("missing"), None, None, None);
+    let error = resolve_effective_config(&rec, &[], &global(None, None))
+        .require_resolved()
+        .expect_err("orphan must not resolve");
+    assert_eq!(error, ORPHANED_INSTANCE_ERROR);
+}
+
+#[test]
+fn require_resolved_returns_config_for_resolved() {
+    let rec = record(Some("d1"), None, None, None);
+    let defs = vec![definition("d1", Some("m"), Some("p"), "prompt")];
+    let cfg = resolve_effective_config(&rec, &defs, &global(None, None))
+        .require_resolved()
+        .expect("linked instance with a live definition must resolve");
+    assert_eq!(cfg.model.value.as_deref(), Some("m"));
+}
+
+#[test]
+fn require_resolved_refuses_orphan_only() {
+    let orphan = record(Some("missing"), None, None, None);
+    assert_eq!(
+        resolve_effective_config(&orphan, &[], &global(None, None))
+            .require_resolved()
+            .unwrap_err(),
+        ORPHANED_INSTANCE_ERROR,
+    );
+
+    let linked = record(Some("d1"), None, None, None);
+    let defs = vec![definition("d1", Some("m"), None, "")];
+    assert!(
+        resolve_effective_config(&linked, &defs, &global(None, None))
+            .require_resolved()
+            .is_ok()
+    );
+
+    // Definition-less instances are never orphaned regardless of how bare
+    // their own fields are — orphan status only applies to a dangling link.
+    let bare = record(None, None, None, None);
+    assert!(resolve_effective_config(&bare, &[], &global(None, None))
+        .require_resolved()
+        .is_ok());
+}
+
+// ── Morgan's exact regression sequence ──
+
+#[test]
+fn morgans_sequence_inherit_explicit_inherit() {
+    let g = global(Some("claude-opus-4-6"), Some("anthropic"));
+
+    // Step 1: fresh agent with inherited model → resolves global
+    let rec_step1 = record(Some("d1"), None, None, None);
+    let defs = vec![definition("d1", None, None, "agent prompt")];
+    let cfg1 = match resolve_effective_config(&rec_step1, &defs, &g) {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("step 1: {:?}", other),
+    };
+    assert_eq!(cfg1.model.value.as_deref(), Some("claude-opus-4-6"));
+    assert_eq!(cfg1.model.source, ConfigSource::Global);
+
+    // Step 2: set explicit model on definition
+    let defs_explicit = vec![definition(
+        "d1",
+        Some("goose-gpt-5-6-sol"),
+        Some("databricks"),
+        "agent prompt",
+    )];
+    let cfg2 = match resolve_effective_config(&rec_step1, &defs_explicit, &g) {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("step 2: {:?}", other),
+    };
+    assert_eq!(cfg2.model.value.as_deref(), Some("goose-gpt-5-6-sol"));
+    assert_eq!(cfg2.model.source, ConfigSource::Definition);
+
+    // Step 3: switch back to inherit — even with stale record bytes
+    let rec_stale = record(
+        Some("d1"),
+        Some("goose-gpt-5-6-sol"),
+        Some("databricks"),
+        None,
+    );
+    let defs_inherit = vec![definition("d1", None, None, "agent prompt")];
+    let cfg3 = match resolve_effective_config(&rec_stale, &defs_inherit, &g) {
+        EffectiveConfigResult::Resolved(c) => c,
+        other => panic!("step 3: {:?}", other),
+    };
+    assert_eq!(cfg3.model.value.as_deref(), Some("claude-opus-4-6"));
+    assert_eq!(cfg3.model.source, ConfigSource::Global);
+    assert_eq!(cfg3.provider.value.as_deref(), Some("anthropic"));
+    assert_eq!(cfg3.provider.source, ConfigSource::Global);
+}
+
+// ── relay-mesh preflight resolution (Wes review 2 on #1968) ──
+//
+// Both regressions below reproduce the exact defects: the preflight must
+// key off `resolve_effective_config`'s resolution — the same one spawn's
+// mesh env consults — not the record's own `provider`/`model` bytes.
+
+#[test]
+fn relay_mesh_model_id_none_for_non_mesh_config() {
+    let rec = record(Some("d1"), None, None, None);
+    let defs = vec![definition("d1", Some("m"), Some("anthropic"), "")];
+    let g = global(None, None);
+
+    assert_eq!(resolve_effective_relay_mesh_model_id(&rec, &defs, &g), None);
+}
+
+#[test]
+fn relay_mesh_model_id_defaults_to_auto_when_model_blank() {
+    let rec = record(Some("d1"), None, None, None);
+    let defs = vec![definition("d1", None, Some(RELAY_MESH_PROVIDER_ID), "")];
+    let g = global(None, None);
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &defs, &g).as_deref(),
+        Some(RELAY_MESH_AUTO_MODEL_ID)
+    );
+}
+
+/// Switch-away regression (Wes finding 1): a linked definition that used to
+/// be relay-mesh but was edited to another provider must NOT trigger the mesh
+/// preflight — even though the record's own stale bytes still say
+/// `provider: relay-mesh`. The old `relay_mesh_config(record)` sniff read
+/// those stale record bytes directly and returned Some; the resolver-driven
+/// decision must read the definition's CURRENT provider and return None.
+#[test]
+fn switch_away_from_relay_mesh_clears_preflight_despite_stale_record_bytes() {
+    let rec = record(Some("d1"), Some("auto"), Some(RELAY_MESH_PROVIDER_ID), None);
+    let defs = vec![definition(
+        "d1",
+        Some("claude-opus-4-6"),
+        Some("anthropic"),
+        "",
+    )];
+    let g = global(None, None);
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &defs, &g),
+        None,
+        "definition switched away from relay-mesh — no mesh preflight should fire"
+    );
+}
+
+/// Global-inheritance regression (Wes finding 2): a blank linked definition
+/// falling through to a relay-mesh GLOBAL default must trigger the mesh
+/// preflight, even though the record carries `provider: None` and no legacy
+/// env — all three of the old `relay_mesh_config` branches would miss here.
+#[test]
+fn global_relay_mesh_default_triggers_preflight_for_blank_definition() {
+    let rec = record(Some("d1"), None, None, None);
+    let defs = vec![definition("d1", None, None, "")];
+    let g = global(Some("Qwen3"), Some(RELAY_MESH_PROVIDER_ID));
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &defs, &g).as_deref(),
+        Some("Qwen3"),
+        "global relay-mesh default must trigger the mesh preflight for a blank definition"
+    );
+}
+
+/// Symmetric case: a definition-less (legacy) instance inheriting the global
+/// relay-mesh default must also trigger the preflight.
+#[test]
+fn global_relay_mesh_default_triggers_preflight_for_definition_less_instance() {
+    let rec = record(None, None, None, None);
+    let defs = vec![];
+    let g = global(None, Some(RELAY_MESH_PROVIDER_ID));
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &defs, &g).as_deref(),
+        Some(RELAY_MESH_AUTO_MODEL_ID)
+    );
+}
+
+/// Orphaned instance: no mesh preflight regardless of stale record bytes —
+/// the caller's own orphan refusal is what matters, not a mesh bootstrap for
+/// a start that will never happen.
+#[test]
+fn orphaned_instance_never_triggers_mesh_preflight() {
+    let rec = record(
+        Some("missing-def"),
+        Some("auto"),
+        Some(RELAY_MESH_PROVIDER_ID),
+        None,
+    );
+    let g = global(None, None);
+
+    assert_eq!(resolve_effective_relay_mesh_model_id(&rec, &[], &g), None);
+}
+
+// ── Whitespace-provider parity (trim-mismatch regression, T1) ──
+//
+// The old spawn gate was `effective_provider.as_deref() == Some(RELAY_MESH_PROVIDER_ID)`
+// — an exact compare — while `relay_mesh_model_id()` trims before matching.
+// A stored provider of " relay-mesh " would make preflight fire while spawn
+// skipped the mesh-env block.  After the fix spawn derives its gate from
+// `relay_mesh_model_id()` too, so the trim semantics are identical.
+//
+// These tests verify `relay_mesh_model_id()` returns Some for padded providers
+// on every resolution path, confirming the helper that both callers now use
+// handles whitespace correctly.
+
+/// Definition provider with leading/trailing whitespace — resolver preserves
+/// the raw string, but `relay_mesh_model_id()` trims before matching, so the
+/// mesh preflight fires correctly.
+#[test]
+fn whitespace_provider_in_definition_triggers_mesh_decision() {
+    let rec = record(Some("d1"), None, None, None);
+    let defs = vec![definition("d1", Some("qwen3"), Some(" relay-mesh "), "")];
+    let g = global(None, None);
+
+    let mesh_id = resolve_effective_relay_mesh_model_id(&rec, &defs, &g);
+    assert_eq!(
+        mesh_id.as_deref(),
+        Some("qwen3"),
+        "padded definition provider must be treated as relay-mesh by the shared helper"
+    );
+}
+
+/// Global provider with leading/trailing whitespace — same assertion for the
+/// global-inherit path (blank definition falls through to padded global).
+#[test]
+fn whitespace_provider_in_global_triggers_mesh_decision() {
+    let rec = record(Some("d1"), None, None, None);
+    let defs = vec![definition("d1", None, None, "")];
+    let g = global(Some("qwen3"), Some("\trelay-mesh\t"));
+
+    let mesh_id = resolve_effective_relay_mesh_model_id(&rec, &defs, &g);
+    assert_eq!(
+        mesh_id.as_deref(),
+        Some("qwen3"),
+        "padded global provider must be treated as relay-mesh by the shared helper"
+    );
+}
+
+// ── Legacy relay-mesh record compatibility (Wes review 3 on #1968) ──
+//
+// Two record generations shipped before `provider: "relay-mesh"` existed and
+// are never rewritten on load, so they are still on disk:
+//
+//   Class A (#798) — the four mesh preset env vars in `env_vars`, no typed
+//     field, no `provider` (the record had no `provider` field yet).
+//   Class B (#879) — the typed `relay_mesh` marker, still no `provider` field.
+//
+// Without the fallback both classes resolve to a non-mesh provider while their
+// own stale env bytes still reach the child: a silent misroute, not a clean
+// failure. The fallback lives in `resolve_definition_less` only — a linked
+// instance's definition stays authoritative.
+
+/// Class A: env-only legacy record resolves mesh via the four-env preset.
+#[test]
+fn legacy_record_falls_back_to_env_sniff() {
+    let mut rec = record(None, None, None, None);
+    rec.env_vars = BTreeMap::from([
+        ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
+        (
+            "OPENAI_COMPAT_BASE_URL".to_string(),
+            "http://127.0.0.1:9337/v1/".to_string(),
+        ),
+        ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
+        (
+            "OPENAI_COMPAT_API_KEY".to_string(),
+            RELAY_MESH_API_KEY_PLACEHOLDER.to_string(),
+        ),
+    ]);
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &[], &global(None, None)).as_deref(),
+        Some("Qwen3"),
+        "env-only legacy mesh record must still resolve to its served model"
+    );
+}
+
+/// Class A, oldest shipped record: both renamed sentinels in their original
+/// spelling. The preset first wrote `SPROUT_AGENT_PROVIDER` (#798) and the
+/// api-key value `sprout-mesh-local`; #971 and #960 renamed each in the same
+/// Jun-11 window without migrating persisted `env_vars`, so this exact shape is
+/// still on disk and must resolve mesh.
+#[test]
+fn legacy_record_falls_back_to_env_sniff_with_pre_rename_sentinels() {
+    let mut rec = record(None, None, None, None);
+    rec.env_vars = BTreeMap::from([
+        ("SPROUT_AGENT_PROVIDER".to_string(), "openai".to_string()),
+        (
+            "OPENAI_COMPAT_BASE_URL".to_string(),
+            "http://127.0.0.1:9337/v1".to_string(),
+        ),
+        ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
+        (
+            "OPENAI_COMPAT_API_KEY".to_string(),
+            "sprout-mesh-local".to_string(),
+        ),
+    ]);
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &[], &global(None, None)).as_deref(),
+        Some("Qwen3"),
+        "the oldest shipped mesh record carries both pre-rename sentinels and was never migrated"
+    );
+}
+
+/// Class A straddling the rename window: old provider key with the new api-key
+/// value. Proves the two either/ors are independent rather than one either/or on
+/// a bundled old/new pair.
+#[test]
+fn legacy_record_falls_back_to_env_sniff_with_mixed_rename_sentinels() {
+    let mut rec = record(None, None, None, None);
+    rec.env_vars = BTreeMap::from([
+        ("SPROUT_AGENT_PROVIDER".to_string(), "openai".to_string()),
+        (
+            "OPENAI_COMPAT_BASE_URL".to_string(),
+            "http://127.0.0.1:9337/v1".to_string(),
+        ),
+        ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
+        (
+            "OPENAI_COMPAT_API_KEY".to_string(),
+            RELAY_MESH_API_KEY_PLACEHOLDER.to_string(),
+        ),
+    ]);
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &[], &global(None, None)).as_deref(),
+        Some("Qwen3"),
+        "old provider key with new api key must resolve — the sentinels renamed independently"
+    );
+}
+
+/// The mirrored straddle: new provider key with the old api-key value.
+#[test]
+fn legacy_record_falls_back_to_env_sniff_with_new_provider_and_old_api_key() {
+    let mut rec = record(None, None, None, None);
+    rec.env_vars = BTreeMap::from([
+        ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
+        (
+            "OPENAI_COMPAT_BASE_URL".to_string(),
+            "http://127.0.0.1:9337/v1".to_string(),
+        ),
+        ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
+        (
+            "OPENAI_COMPAT_API_KEY".to_string(),
+            "sprout-mesh-local".to_string(),
+        ),
+    ]);
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &[], &global(None, None)).as_deref(),
+        Some("Qwen3"),
+        "new provider key with old api key must resolve too"
+    );
+}
+
+/// Both spellings present and disagreeing: the renamed key is authoritative,
+/// so a record whose current provider env is non-mesh is not resurrected as
+/// mesh by the stale `SPROUT_` leftover.
+#[test]
+fn legacy_env_sniff_prefers_renamed_provider_key_over_stale_old_key() {
+    let mut rec = record(None, None, None, None);
+    rec.env_vars = BTreeMap::from([
+        ("BUZZ_AGENT_PROVIDER".to_string(), "anthropic".to_string()),
+        ("SPROUT_AGENT_PROVIDER".to_string(), "openai".to_string()),
+        (
+            "OPENAI_COMPAT_BASE_URL".to_string(),
+            "http://127.0.0.1:9337/v1".to_string(),
+        ),
+        ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
+        (
+            "OPENAI_COMPAT_API_KEY".to_string(),
+            RELAY_MESH_API_KEY_PLACEHOLDER.to_string(),
+        ),
+    ]);
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &[], &global(None, None)),
+        None,
+        "the renamed key states current intent — a stale SPROUT_ key must not override it"
+    );
+}
+
+/// Class A negative: a user's own OpenAI-compatible provider on the same local
+/// port is not Buzz's preset — the placeholder API key is the discriminator.
+#[test]
+fn legacy_env_sniff_ignores_user_openai_on_same_local_port() {
+    let mut rec = record(None, None, None, None);
+    rec.env_vars = BTreeMap::from([
+        ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
+        (
+            "OPENAI_COMPAT_BASE_URL".to_string(),
+            "http://127.0.0.1:9337/v1".to_string(),
+        ),
+        ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
+        ("OPENAI_COMPAT_API_KEY".to_string(), "real-key".to_string()),
+    ]);
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &[], &global(None, None)),
+        None,
+        "a real user key on the mesh port must not be mistaken for Buzz's preset"
+    );
+}
+
+/// Class B: typed marker with no `provider` resolves mesh, and its `model_ref`
+/// wins over an unrelated global model so preflight and spawn agree.
+#[test]
+fn legacy_record_falls_back_to_typed_marker_without_provider() {
+    let mut rec = record(None, None, None, None);
+    rec.relay_mesh = Some(crate::managed_agents::RelayMeshConfig {
+        model_ref: "Qwen3".to_string(),
+    });
+
+    let cfg = match resolve_effective_config(&rec, &[], &global(Some("gpt-5"), Some("openai"))) {
+        EffectiveConfigResult::Resolved(cfg) => cfg,
+        EffectiveConfigResult::OrphanedInstance { .. } => {
+            panic!("definition-less is never orphaned")
+        }
+    };
+
+    assert_eq!(cfg.provider.value.as_deref(), Some(RELAY_MESH_PROVIDER_ID));
+    assert_eq!(
+        cfg.relay_mesh_model_id().as_deref(),
+        Some("Qwen3"),
+        "typed marker must resolve mesh even with no provider on the record"
+    );
+}
+
+/// Class B with a blank `model_ref`: the marker is still the mesh signal, and
+/// the model resolves to auto — same rule `apply_relay_mesh_env` applies.
+#[test]
+fn legacy_typed_marker_with_blank_model_resolves_auto() {
+    let mut rec = record(None, None, None, None);
+    rec.relay_mesh = Some(crate::managed_agents::RelayMeshConfig {
+        model_ref: "  ".to_string(),
+    });
+
+    assert_eq!(
+        resolve_effective_relay_mesh_model_id(&rec, &[], &global(None, None)).as_deref(),
+        Some(RELAY_MESH_AUTO_MODEL_ID)
+    );
+}
+
+/// A definition-less record that was switched AWAY from mesh keeps its stale
+/// marker and env bytes on disk. Its explicit `provider` states current intent,
+/// so the legacy fallback must not resurrect mesh.
+#[test]
+fn definition_less_explicit_provider_wins_over_stale_legacy_mesh_bytes() {
+    let mut rec = record(None, Some("claude-opus-4-6"), Some("anthropic"), None);
+    rec.relay_mesh = Some(crate::managed_agents::RelayMeshConfig {
+        model_ref: "Qwen3".to_string(),
+    });
+    rec.env_vars = BTreeMap::from([
+        ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
+        (
+            "OPENAI_COMPAT_BASE_URL".to_string(),
+            "http://127.0.0.1:9337/v1".to_string(),
+        ),
+        ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
+        (
+            "OPENAI_COMPAT_API_KEY".to_string(),
+            RELAY_MESH_API_KEY_PLACEHOLDER.to_string(),
+        ),
+    ]);
+
+    let cfg = match resolve_effective_config(&rec, &[], &global(None, None)) {
+        EffectiveConfigResult::Resolved(cfg) => cfg,
+        EffectiveConfigResult::OrphanedInstance { .. } => {
+            panic!("definition-less is never orphaned")
+        }
+    };
+
+    assert_eq!(cfg.provider.value.as_deref(), Some("anthropic"));
+    assert_eq!(cfg.model.value.as_deref(), Some("claude-opus-4-6"));
+    assert_eq!(
+        cfg.relay_mesh_model_id(),
+        None,
+        "a switched-away legacy record must not be dragged back onto mesh"
+    );
+}
+
+/// The test that proves the fallback did not reintroduce the bug this PR
+/// deletes: a LINKED record carrying both legacy mesh signals resolves purely
+/// from its definition and never trips mesh.
+#[test]
+fn linked_record_ignores_legacy_mesh_marker_and_env() {
+    let mut rec = record(Some("d1"), Some("auto"), None, None);
+    rec.relay_mesh = Some(crate::managed_agents::RelayMeshConfig {
+        model_ref: "Qwen3".to_string(),
+    });
+    rec.env_vars = BTreeMap::from([
+        ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
+        (
+            "OPENAI_COMPAT_BASE_URL".to_string(),
+            "http://127.0.0.1:9337/v1".to_string(),
+        ),
+        ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
+        (
+            "OPENAI_COMPAT_API_KEY".to_string(),
+            RELAY_MESH_API_KEY_PLACEHOLDER.to_string(),
+        ),
+    ]);
+    let defs = vec![definition(
+        "d1",
+        Some("claude-opus-4-6"),
+        Some("anthropic"),
+        "",
+    )];
+
+    let cfg = match resolve_effective_config(&rec, &defs, &global(None, None)) {
+        EffectiveConfigResult::Resolved(cfg) => cfg,
+        EffectiveConfigResult::OrphanedInstance { .. } => panic!("definition exists"),
+    };
+
+    assert_eq!(cfg.provider.value.as_deref(), Some("anthropic"));
+    assert_eq!(cfg.model.value.as_deref(), Some("claude-opus-4-6"));
+    assert_eq!(
+        cfg.relay_mesh_model_id(),
+        None,
+        "legacy record bytes must never influence a linked instance"
+    );
+}
+
+/// A linked instance whose definition inherits a blank provider from a blank
+/// global must NOT pick up the record's legacy mesh bytes either — the linked
+/// path has no legacy fallback at all, by construction.
+#[test]
+fn linked_record_with_legacy_bytes_inherits_global_not_mesh() {
+    let mut rec = record(Some("d1"), None, None, None);
+    rec.relay_mesh = Some(crate::managed_agents::RelayMeshConfig {
+        model_ref: "Qwen3".to_string(),
+    });
+    let defs = vec![definition("d1", None, None, "")];
+
+    let cfg = match resolve_effective_config(&rec, &defs, &global(Some("gpt-5"), Some("openai"))) {
+        EffectiveConfigResult::Resolved(cfg) => cfg,
+        EffectiveConfigResult::OrphanedInstance { .. } => panic!("definition exists"),
+    };
+
+    assert_eq!(cfg.provider.value.as_deref(), Some("openai"));
+    assert_eq!(cfg.model.value.as_deref(), Some("gpt-5"));
+    assert_eq!(cfg.relay_mesh_model_id(), None);
+}
diff --git a/desktop/src-tauri/src/managed_agents/env_vars.rs b/desktop/src-tauri/src/managed_agents/env_vars.rs
index 6318a5c838..592a5cbbd9 100644
--- a/desktop/src-tauri/src/managed_agents/env_vars.rs
+++ b/desktop/src-tauri/src/managed_agents/env_vars.rs
@@ -81,6 +81,12 @@ pub(crate) const RESERVED_ENV_KEYS: &[&str] = &[
     // ambient env var must not be able to forge setup mode (NotReady) on a
     // Ready agent or suppress it (empty/stale payload) on a NotReady one.
     "BUZZ_ACP_SETUP_PAYLOAD",
+    // Desktop ownership markers: these brand every spawned harness with the
+    // launching Desktop instance. A user-supplied override would let a
+    // definition masquerade as a different instance or fake the nonce used
+    // for same-session sweep decisions.
+    "BUZZ_MANAGED_AGENT",
+    "BUZZ_MANAGED_AGENT_START_NONCE",
 ];
 
 pub(crate) fn is_reserved_env_key(key: &str) -> bool {
@@ -285,8 +291,12 @@ pub(crate) fn merged_user_env(
 
 /// Look up the live env map of `persona_id` within an already-loaded persona
 /// slice. Returns an empty map for standalone agents (`None`) and for links
-/// to personas that no longer exist (an orphaned agent spawns from its own
-/// overrides alone — same fallback the prompt/model resolution uses).
+/// to personas that no longer exist. The latter is an orphaned instance,
+/// which `spawn_agent_child` refuses before this is ever read at spawn time
+/// (see `effective_config::resolve_effective_config`'s `OrphanedInstance`
+/// arm via `require_resolved`) — an empty map here only matters for
+/// non-spawn callers like readiness/hash that must still resolve
+/// a slice for a record whose orphan status hasn't been checked yet.
 pub(crate) fn live_persona_env(
     personas: &[super::types::AgentDefinition],
     persona_id: Option<&str>,
diff --git a/desktop/src-tauri/src/managed_agents/global_config/mod.rs b/desktop/src-tauri/src/managed_agents/global_config/mod.rs
index 57993fc040..162f447981 100644
--- a/desktop/src-tauri/src/managed_agents/global_config/mod.rs
+++ b/desktop/src-tauri/src/managed_agents/global_config/mod.rs
@@ -1,13 +1,14 @@
 //! Global agent configuration defaults.
 //!
 //! A single `global-agent-config.json` record that applies to ALL managed
-//! agents. Per-agent config always wins; global provides the lowest
-//! user-settable layer below persona.
+//! agents. For a linked instance, the definition wins over global; for a
+//! definition-less (legacy) instance, the record's own fields win over
+//! global. Global is always the lowest user-settable layer.
 //!
 //! # Precedence (low → high)
 //!
 //! ```text
-//! baked build env  <  GLOBAL  <  persona  <  per-agent  <  Buzz-identity
+//! baked build env  <  GLOBAL  <  definition (linked) / instance (legacy)  <  Buzz-identity
 //! ```
 //!
 //! # Semantics
@@ -38,8 +39,10 @@ use crate::managed_agents::types::{AgentDefinition, ManagedAgentRecord};
 /// so the config vocabulary is consistent across all three tiers.
 ///
 /// `env_vars` is the lowest user-settable env layer — global < persona < agent.
-/// `provider` / `model` are fallback defaults: effective provider/model =
-/// `agent → persona → global → None`.
+/// `provider` / `model` are fallback defaults, resolved via
+/// `effective_config::resolve_effective_config`: for a linked instance,
+/// definition → global (the record's own `provider`/`model` bytes are never
+/// consulted); for a definition-less instance, instance → global.
 #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
 pub struct GlobalAgentConfig {
     /// Global env vars injected into ALL agents unconditionally.
@@ -204,44 +207,28 @@ pub fn save_global_agent_config(app: &AppHandle, config: &GlobalAgentConfig) ->
     atomic_write_json_restricted(&path, &payload)
 }
 
-/// Resolve the effective model and provider for an agent using the
-/// precedence chain: `agent record → linked persona → global defaults → None`.
+/// Resolve the effective model and provider for an agent.
 ///
-/// This is the single source of truth used by readiness evaluation, spawn,
-/// and deploy-payload construction. All three paths must use this function so
-/// they agree on what model/provider the agent will actually run with.
+/// Delegates to `effective_config::resolve_effective_config` which enforces
+/// definition-authoritative semantics for linked instances:
+///   - **Linked:** definition → global. Record bytes are never consulted.
+///   - **Definition-less:** instance → global.
+///   - **Orphaned:** returns `(None, None)`. This function is a display/
+///     readiness/hash convenience, not the spawn gate — an orphan must never
+///     reach a real spawn regardless of what this returns, because
+///     `spawn_agent_child` refuses orphans itself via
+///     `effective_config::resolve_effective_config(...).require_resolved()`
+///     before resolving model/provider/prompt for the process env.
 ///
-/// # Arguments
-/// * `record` — the `ManagedAgentRecord` (may have `None` for model/provider)
-/// * `personas` — all current persona records (looked up by `record.persona_id`)
-/// * `global` — global agent config defaults
-///
-/// # Returns
-/// `(effective_model, effective_provider)` — both `Option<&str>`.
-pub(crate) fn resolve_effective_model_provider<'a>(
-    record: &'a ManagedAgentRecord,
-    personas: &'a [AgentDefinition],
-    global: &'a GlobalAgentConfig,
-) -> (Option<&'a str>, Option<&'a str>) {
-    let (persona_model, persona_provider) = record
-        .persona_id
-        .as_deref()
-        .and_then(|pid| personas.iter().find(|p| p.id == pid))
-        .map(|p| (p.model.as_deref(), p.provider.as_deref()))
-        .unwrap_or((None, None));
-
-    let effective_model = record
-        .model
-        .as_deref()
-        .or(persona_model)
-        .or(global.model.as_deref());
-    let effective_provider = record
-        .provider
-        .as_deref()
-        .or(persona_provider)
-        .or(global.provider.as_deref());
-
-    (effective_model, effective_provider)
+/// Returns owned `String`s because the effective value may come from a
+/// tier that outlives none of the input borrows (e.g. global config).
+pub(crate) fn resolve_effective_model_provider(
+    record: &ManagedAgentRecord,
+    personas: &[AgentDefinition],
+    global: &GlobalAgentConfig,
+) -> (Option<String>, Option<String>) {
+    super::effective_config::resolve_effective_model_provider_pair(record, personas, global)
+        .unwrap_or((None, None))
 }
 
 #[cfg(test)]
diff --git a/desktop/src-tauri/src/managed_agents/global_config/tests.rs b/desktop/src-tauri/src/managed_agents/global_config/tests.rs
index 6eb4338034..553596e226 100644
--- a/desktop/src-tauri/src/managed_agents/global_config/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/global_config/tests.rs
@@ -343,8 +343,10 @@ fn bare_record() -> ManagedAgentRecord {
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         relay_mesh: None,
         auto_restart_on_config_change: false,
         definition_respond_to: None,
@@ -365,8 +367,10 @@ fn persona(id: &str, model: Option<&str>, provider: Option<&str>) -> AgentDefini
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: vec![],
@@ -376,15 +380,14 @@ fn persona(id: &str, model: Option<&str>, provider: Option<&str>) -> AgentDefini
     }
 }
 
-/// Tier 1 — agent record wins: record has explicit model/provider; they must
-/// outrank both the linked persona and the global defaults. Fails against any
-/// implementation that prefers global or persona over the record.
+/// Linked instance: definition (persona) wins — stale record bytes are
+/// ignored. This is the core model-inheritance fix.
 #[test]
-fn resolve_agent_record_wins_over_persona_and_global() {
+fn resolve_definition_wins_over_stale_record_for_linked_instance() {
     let mut record = bare_record();
     record.persona_id = Some("p1".to_string());
-    record.model = Some("record-model".to_string());
-    record.provider = Some("record-provider".to_string());
+    record.model = Some("stale-record-model".to_string());
+    record.provider = Some("stale-record-provider".to_string());
     let personas = vec![persona(
         "p1",
         Some("persona-model"),
@@ -398,11 +401,15 @@ fn resolve_agent_record_wins_over_persona_and_global() {
 
     let (model, provider) = resolve_effective_model_provider(&record, &personas, &global);
 
-    assert_eq!(model, Some("record-model"), "record model must win");
     assert_eq!(
-        provider,
-        Some("record-provider"),
-        "record provider must win"
+        model.as_deref(),
+        Some("persona-model"),
+        "definition model must win over stale record"
+    );
+    assert_eq!(
+        provider.as_deref(),
+        Some("persona-provider"),
+        "definition provider must win over stale record"
     );
 }
 
@@ -428,12 +435,12 @@ fn resolve_persona_fallback_when_record_has_none() {
     let (model, provider) = resolve_effective_model_provider(&record, &personas, &global);
 
     assert_eq!(
-        model,
+        model.as_deref(),
         Some("persona-model"),
         "persona model must be used when record has none"
     );
     assert_eq!(
-        provider,
+        provider.as_deref(),
         Some("persona-provider"),
         "persona provider must be used when record has none"
     );
@@ -458,12 +465,12 @@ fn resolve_global_fallback_when_record_and_persona_have_none() {
     let (model, provider) = resolve_effective_model_provider(&record, &personas, &global);
 
     assert_eq!(
-        model,
+        model.as_deref(),
         Some("global-model"),
         "global model must be used when record and persona have none"
     );
     assert_eq!(
-        provider,
+        provider.as_deref(),
         Some("global-provider"),
         "global provider must be used when record and persona have none"
     );
@@ -519,8 +526,8 @@ fn resolve_global_fallback_when_no_persona_linked() {
 
     let (model, provider) = resolve_effective_model_provider(&record, &personas, &global);
 
-    assert_eq!(model, Some("global-model"));
-    assert_eq!(provider, Some("global-provider"));
+    assert_eq!(model.as_deref(), Some("global-model"));
+    assert_eq!(provider.as_deref(), Some("global-provider"));
 }
 
 /// All-None: no source provides model/provider → both must be None.
@@ -543,18 +550,15 @@ fn resolve_all_none_when_no_source_provides_values() {
     );
 }
 
-/// Partial tier — record has model but not provider; persona has provider but
-/// not model; global has both. Each field resolves independently through the
-/// three-tier chain.
+/// Each field resolves independently: definition model=None → global fills
+/// model; definition has provider → definition wins for provider. Stale
+/// record bytes are ignored for linked instances.
 #[test]
 fn resolve_each_field_resolves_independently_through_tiers() {
     let mut record = bare_record();
     record.persona_id = Some("p1".to_string());
-    record.model = Some("record-model".to_string());
-    // record.provider = None → falls through to persona
+    record.model = Some("stale-record-model".to_string());
     let personas = vec![persona("p1", None, Some("persona-provider"))];
-    // persona.model = None → global fills model if record also had none, but
-    // record has model here so global is not needed for model.
     let global = GlobalAgentConfig {
         model: Some("global-model".to_string()),
         provider: Some("global-provider".to_string()),
@@ -563,11 +567,15 @@ fn resolve_each_field_resolves_independently_through_tiers() {
 
     let (model, provider) = resolve_effective_model_provider(&record, &personas, &global);
 
-    assert_eq!(model, Some("record-model"), "record wins for model");
     assert_eq!(
-        provider,
+        model.as_deref(),
+        Some("global-model"),
+        "definition model=None → global fills model; stale record ignored"
+    );
+    assert_eq!(
+        provider.as_deref(),
         Some("persona-provider"),
-        "persona wins for provider when record has none"
+        "definition provider wins"
     );
 }
 
@@ -620,8 +628,10 @@ fn record_runtime_wins_over_persona_runtime_for_command_resolution() {
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: vec![],
diff --git a/desktop/src-tauri/src/managed_agents/managed_node_paths.rs b/desktop/src-tauri/src/managed_agents/managed_node_paths.rs
index e4b4c36967..ffcdea8181 100644
--- a/desktop/src-tauri/src/managed_agents/managed_node_paths.rs
+++ b/desktop/src-tauri/src/managed_agents/managed_node_paths.rs
@@ -4,7 +4,7 @@ pub(crate) fn buzz_managed_npm_prefix() -> Option<PathBuf> {
     dirs::data_dir().map(|dir| dir.join("Buzz").join("node-tools"))
 }
 
-const BUZZ_MANAGED_NODE_VERSION: &str = "v24.11.0";
+const BUZZ_MANAGED_NODE_VERSION: &str = "v24.18.0";
 
 pub(crate) fn buzz_managed_node_root() -> Option<PathBuf> {
     dirs::data_dir().map(|dir| dir.join("Buzz").join("runtimes").join("node"))
diff --git a/desktop/src-tauri/src/managed_agents/mod.rs b/desktop/src-tauri/src/managed_agents/mod.rs
index 66f3d882b9..be9b07cf11 100644
--- a/desktop/src-tauri/src/managed_agents/mod.rs
+++ b/desktop/src-tauri/src/managed_agents/mod.rs
@@ -7,7 +7,9 @@ pub(crate) use agent_env::{
 };
 mod backend;
 pub(crate) mod config_bridge;
+pub(crate) mod custom_harnesses;
 mod discovery;
+pub(crate) mod effective_config;
 mod env_vars;
 pub(crate) mod git_bash;
 pub(crate) mod global_config;
@@ -27,6 +29,7 @@ pub mod retention;
 mod runtime;
 mod runtime_commands;
 mod runtime_types;
+pub(crate) mod snapshot_avatar;
 pub(crate) mod spawn_hash;
 pub(crate) mod storage;
 pub(crate) mod team_events;
@@ -59,7 +62,8 @@ pub use personas::*;
 #[cfg(windows)]
 pub use process_lifecycle::*;
 pub(crate) use readiness::{
-    agent_readiness, resolve_effective_agent_env, AgentReadiness, Requirement,
+    agent_readiness, resolve_effective_agent_env, resolve_effective_harness_descriptor,
+    AgentReadiness, Requirement,
 };
 pub use relay_mesh::*;
 pub use repos::{
diff --git a/desktop/src-tauri/src/managed_agents/nest.rs b/desktop/src-tauri/src/managed_agents/nest.rs
index e13ab2baad..c8f008836d 100644
--- a/desktop/src-tauri/src/managed_agents/nest.rs
+++ b/desktop/src-tauri/src/managed_agents/nest.rs
@@ -50,7 +50,7 @@ const NEST_AGENTS_VERSION: u32 = 4;
 
 /// Template content version for SKILL.md.
 /// Bump this when changing `nest_skill.md` to trigger refresh on existing installs.
-const NEST_SKILL_VERSION: u32 = 4;
+const NEST_SKILL_VERSION: u32 = 5;
 
 const BEGIN_MARKER: &str = "<!-- BEGIN BUZZ MANAGED";
 const END_MARKER: &str = "<!-- END BUZZ MANAGED -->";
diff --git a/desktop/src-tauri/src/managed_agents/nest/tests.rs b/desktop/src-tauri/src/managed_agents/nest/tests.rs
index a959381603..031b049a49 100644
--- a/desktop/src-tauri/src/managed_agents/nest/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/nest/tests.rs
@@ -29,6 +29,18 @@ fn init_nest_dir_prod_sets_buzz() {
     }
 }
 
+#[test]
+fn nest_skill_contains_safe_mention_workflow() {
+    assert!(BUZZ_CLI_SKILL_MD.contains("--mention <hex-or-npub>"));
+    assert!(BUZZ_CLI_SKILL_MD.contains("every presentation-only name that should notify"));
+    assert!(BUZZ_CLI_SKILL_MD
+        .contains("permits unresolved or ambiguous `@Name` text as presentation-only"));
+    assert!(BUZZ_CLI_SKILL_MD.contains("signed event's `mention_pubkeys`"));
+    assert!(BUZZ_CLI_SKILL_MD.contains("no follow-up verification command is needed"));
+    assert!(BUZZ_CLI_SKILL_MD.contains("Add membership separately only when authorized"));
+    assert!(BUZZ_CLI_SKILL_MD.contains("never changes membership automatically"));
+}
+
 #[test]
 fn ensure_nest_creates_all_dirs_and_agents_md() {
     let tmp = tempfile::tempdir().unwrap();
@@ -422,8 +434,10 @@ fn make_persona(id: &str, display_name: &str) -> AgentDefinition {
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: std::collections::BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -480,8 +494,10 @@ fn make_agent(name: &str, persona_id: Option<&str>) -> ManagedAgentRecord {
         name_pool: Vec::new(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         definition_respond_to: None,
         definition_respond_to_allowlist: Vec::new(),
         definition_parallelism: None,
diff --git a/desktop/src-tauri/src/managed_agents/nest_skill.md b/desktop/src-tauri/src/managed_agents/nest_skill.md
index fefdfa77fa..79a5ea301d 100644
--- a/desktop/src-tauri/src/managed_agents/nest_skill.md
+++ b/desktop/src-tauri/src/managed_agents/nest_skill.md
@@ -87,14 +87,11 @@ Write commands are unaffected. `--format json` (default) returns full fields.
 
 ## Communication Patterns
 
-**Mentions that notify:** Use `@Name` directly in message content — the CLI auto-resolves channel members by name and adds the required p-tags. No `--mention` flag exists or is needed. `nostr:npub1…` inline references are also auto-resolved to p-tags without needing a flag.
+**Mentions that notify:** Keep readable `@Name` text in message content and, when intended pubkeys are known, pass the identities in the same send with repeatable `--mention <hex-or-npub>`. Any explicit identity (`--mention` or `nostr:npub...`) permits unresolved or ambiguous `@Name` text as presentation-only; uniquely resolved member names still add recipients. Include a pubkey for every presentation-only name that should notify. The CLI reports the signed event's `mention_pubkeys`; no follow-up verification command is needed. Without explicit identities, names resolve against current channel members. An unresolved/ambiguous name or non-member target stops before publishing. Add membership separately only when authorized, then retry; sending never changes membership automatically.
 
 ```bash
-# ✅ Correct — notification delivered automatically
-buzz messages send --channel <UUID> --content "@Alice check this"
-
-# Multiple mentions — same pattern
-buzz messages send --channel <UUID> --content "@Alice @Bob review please"
+buzz messages send --channel <UUID> \
+  --content "@Alice check this" --mention <alice-pubkey>
 ```
 
 ## DM Management
diff --git a/desktop/src-tauri/src/managed_agents/persona_events.rs b/desktop/src-tauri/src/managed_agents/persona_events.rs
index 2033003bc8..ea61a811db 100644
--- a/desktop/src-tauri/src/managed_agents/persona_events.rs
+++ b/desktop/src-tauri/src/managed_agents/persona_events.rs
@@ -5,7 +5,7 @@
 
 use std::collections::BTreeMap;
 
-use buzz_core_pkg::kind::KIND_PERSONA;
+use buzz_core_pkg::kind::{persona_event_is_shared, KIND_PERSONA};
 use nostr::{EventBuilder, Kind, Tag};
 use serde::{Deserialize, Serialize};
 
@@ -138,7 +138,11 @@ pub fn build_persona_event(record: &AgentDefinition) -> Result<EventBuilder, Str
         .map_err(|e| format!("failed to serialize persona content: {e}"))?;
 
     let d_tag = persona_d_tag(record);
-    let tags = vec![Tag::parse(["d", d_tag.as_str()]).map_err(|e| format!("invalid d-tag: {e}"))?];
+    let mut tags =
+        vec![Tag::parse(["d", d_tag.as_str()]).map_err(|e| format!("invalid d-tag: {e}"))?];
+    if record.shared {
+        tags.push(Tag::parse(["shared", "true"]).map_err(|e| format!("invalid shared tag: {e}"))?);
+    }
 
     Ok(EventBuilder::new(Kind::Custom(KIND_PERSONA as u16), content_json).tags(tags))
 }
@@ -188,8 +192,10 @@ pub fn persona_from_event(event: &nostr::Event) -> Result<AgentDefinition, Strin
         name_pool: content.name_pool,
         is_builtin: false,
         is_active: true,
+        shared: persona_event_is_shared(event),
         source_team: None,
         source_team_persona_slug: Some(d_tag),
+        catalog_source: None,
         env_vars: BTreeMap::new(),
         respond_to: content.respond_to,
         respond_to_allowlist: content.respond_to_allowlist,
@@ -218,9 +224,34 @@ pub fn persona_from_event(event: &nostr::Event) -> Result<AgentDefinition, Strin
 /// Returns the number of events the relay accepted. Best-effort: a relay
 /// failure on one row leaves it pending for the next sweep and does not abort
 /// the remaining rows.
+#[cfg(test)]
 pub async fn flush_pending_events(
     db_path: &std::path::Path,
     state: &AppState,
+) -> Result<u32, String> {
+    let relay_url = crate::relay::relay_ws_url_with_override(state);
+    let owner_keys = state.signing_keys()?;
+    flush_pending_events_at(db_path, state, &relay_url, &owner_keys).await
+}
+
+/// Resolve and flush only the currently active `(relay, owner)` scope.
+///
+/// The scope snapshots its relay, owner keys, and database path together
+/// before network work starts. Switching communities during the flush cannot
+/// redirect rows from the old scope into the new relay.
+pub async fn flush_active_pending_events(
+    app: &tauri::AppHandle,
+    state: &AppState,
+) -> Result<u32, String> {
+    let scope = crate::managed_agents::retention::active_retention_scope(app, state)?;
+    flush_pending_events_at(&scope.db_path, state, &scope.relay_url, &scope.owner_keys).await
+}
+
+async fn flush_pending_events_at(
+    db_path: &std::path::Path,
+    state: &AppState,
+    relay_url: &str,
+    owner_keys: &nostr::Keys,
 ) -> Result<u32, String> {
     use crate::managed_agents::retention::{
         deferred_behind_failed_tombstone, get_pending_sync, get_retained_event, mark_synced,
@@ -228,6 +259,8 @@ pub async fn flush_pending_events(
     };
     use nostr::JsonUtil;
 
+    let owner_pubkey = owner_keys.public_key().to_hex();
+    let relay_api_base = crate::relay::relay_http_base_url(relay_url);
     let pending = {
         let conn = open_retention_db(db_path)?;
         get_pending_sync(&conn)?
@@ -237,6 +270,9 @@ pub async fn flush_pending_events(
     let mut failed_tombstones: std::collections::HashSet<(String, String)> =
         std::collections::HashSet::new();
     for row in pending {
+        if row.pubkey != owner_pubkey {
+            continue;
+        }
         if deferred_behind_failed_tombstone(row.kind, &row.pubkey, &row.d_tag, &failed_tombstones) {
             continue; // its tombstone failed this sweep; next sweep re-orders them
         }
@@ -270,9 +306,14 @@ pub async fn flush_pending_events(
             event
         };
 
-        if crate::relay::submit_signed_event(&event, state)
-            .await
-            .is_err()
+        if crate::relay::submit_signed_event_at_with_keys(
+            &event,
+            state,
+            &relay_api_base,
+            owner_keys,
+        )
+        .await
+        .is_err()
         {
             if current.kind == 5 {
                 failed_tombstones.insert((current.pubkey.clone(), current.d_tag.clone()));
@@ -359,10 +400,14 @@ pub fn persona_event_content(record: &AgentDefinition) -> PersonaEventContent {
 }
 
 /// A persona's spawn-relevant config, pinned onto a `ManagedAgentRecord` at
-/// create time. After the snapshot, spawn and deploy read these fields off the
-/// record and never the live persona, so an agent stays pinned to the config
-/// it was created with — restart reuses the snapshot, delete+respawn rewrites
-/// it.
+/// create time for display/backward-compat purposes. For a linked instance,
+/// spawn and deploy do NOT read these snapshotted fields — they resolve
+/// model/provider/prompt live from the definition on every spawn (see
+/// `effective_config::resolve_effective_config`), so a definition edit
+/// propagates on the next restart without delete+respawn. The snapshot still
+/// matters for `runtime` (materialized per B5, no live-read path yet) and for
+/// `persona_source_version`, the drift basis the Agents menu compares against
+/// the definition's current content hash.
 pub struct PersonaSnapshot {
     pub system_prompt: Option<String>,
     pub model: Option<String>,
@@ -377,24 +422,6 @@ pub struct PersonaSnapshot {
     pub source_version: String,
 }
 
-/// Apply persona-wins-when-set precedence for a single optional string field.
-///
-/// Returns the persona's value when it is non-`None` and non-whitespace-only;
-/// otherwise falls back to the record's value with the same blank filter applied.
-/// Returns `None` only when both are blank — a genuinely unconfigured field stays
-/// unconfigured.
-///
-/// This is the single source of truth for the precedence rule used by
-/// `persona_snapshot_with_agent_config_fallback`, `build_deploy_payload`, and
-/// `resolve_effective_prompt_model_provider` so the three paths cannot drift.
-pub fn persona_field_with_record_fallback(
-    persona_value: Option<&str>,
-    record_value: Option<&str>,
-) -> Option<String> {
-    let non_blank = |v: Option<&str>| v.filter(|s| !s.trim().is_empty()).map(str::to_owned);
-    non_blank(persona_value).or_else(|| non_blank(record_value))
-}
-
 /// Build the pinned snapshot for an agent created from `persona`.
 ///
 /// The persona's `system_prompt` is always present, so it is wrapped in
@@ -411,51 +438,14 @@ pub fn persona_snapshot(persona: &AgentDefinition) -> PersonaSnapshot {
     }
 }
 
-/// Build the pinned snapshot for an **existing** agent record being re-snapshotted
-/// from its linked persona (on spawn or app-launch restore).
+/// Re-pin `record` to `persona`: build a snapshot via [`persona_snapshot`]
+/// and mirror it onto the record — the definition quad
+/// (`system_prompt`/`model`/`provider`/`runtime`), the env-override
+/// self-heal, and the `persona_source_version` drift basis.
 ///
-/// Precedence rule: when the persona sets `model` or `provider` (non-`None`, non-empty),
-/// the persona wins — this is the expected inheritance. When the persona leaves
-/// these fields blank (`None` or empty string), the agent record's own values are
-/// preserved instead. This prevents a persona with no configured model/provider from
-/// clobbering a value the user already set on the agent, which would trap the agent
-/// in a permanent "needs configuration" loop that users cannot escape.
-///
-/// `source_version` is always updated to the current persona content hash so the
-/// drift badge clears correctly even when model/provider are not touched.
-///
-/// Env vars are not part of the snapshot: `record.env_vars` (agent overrides)
-/// is left untouched and the live persona env is merged underneath at read time.
-///
-/// The two fields (`model`, `provider`) are independent: a persona that sets only
-/// `model` wins on `model` while the agent's `provider` is preserved, and vice versa.
-pub fn persona_snapshot_with_agent_config_fallback(
-    persona: &AgentDefinition,
-    current_agent_model: Option<&str>,
-    current_agent_provider: Option<&str>,
-) -> PersonaSnapshot {
-    // Delegate system_prompt and source_version to persona_snapshot so future
-    // PersonaSnapshot field additions stay automatically consistent.
-    let base = persona_snapshot(persona);
-
-    // Apply the shared precedence rule: persona wins when non-blank, else
-    // the agent record's value is preserved so a configured agent stays configured.
-    let model = persona_field_with_record_fallback(base.model.as_deref(), current_agent_model);
-    let provider =
-        persona_field_with_record_fallback(base.provider.as_deref(), current_agent_provider);
-
-    PersonaSnapshot {
-        model,
-        provider,
-        ..base
-    }
-}
-
-/// Re-pin `record` to `persona`: build the snapshot (via
-/// [`persona_snapshot_with_agent_config_fallback`], so blank persona
-/// `model`/`provider` preserve the record's own values) and mirror it onto the
-/// record — the definition quad (`system_prompt`/`model`/`provider`/`runtime`),
-/// the env-override self-heal, and the `persona_source_version` drift basis.
+/// Definition-authoritative: blank definition model/provider produce `None`
+/// on the record. The effective-config resolver falls through to the global
+/// default at read time; stale materialized record bytes are never preserved.
 ///
 /// This is the single apply used by every snapshot-apply site: the spawn
 /// re-pin (`start_local_agent_with_preflight`), the launch backfill and
@@ -467,11 +457,7 @@ pub fn persona_snapshot_with_agent_config_fallback(
 /// caller's concern, and `spawn_config_hash` (which applies this to a clone)
 /// must stay pure.
 pub fn apply_persona_snapshot(record: &mut ManagedAgentRecord, persona: &AgentDefinition) {
-    let snapshot = persona_snapshot_with_agent_config_fallback(
-        persona,
-        record.model.as_deref(),    // fallback: record.model
-        record.provider.as_deref(), // fallback: record.provider
-    );
+    let snapshot = persona_snapshot(persona);
     if let Some(prompt) = snapshot.system_prompt {
         record.system_prompt = Some(prompt);
     }
@@ -507,5 +493,33 @@ pub fn apply_persona_snapshot(record: &mut ManagedAgentRecord, persona: &AgentDe
         .retain(|k, v| persona.env_vars.get(k) != Some(v));
     record.persona_source_version = Some(snapshot.source_version);
 }
+
+/// Preview what `record` would look like immediately after the start/restore
+/// paths re-pin it to its linked persona, without mutating `record` itself.
+///
+/// Every decision made ahead of the real re-pin — the relay-mesh preflight in
+/// `start_local_agent_with_preflight`, the restart-badge hash in
+/// `spawn_config_hash` — needs to reason about spawn-time state, not
+/// pre-snapshot bytes, so a persona edit that flips a field (e.g. `provider`
+/// to/from relay-mesh) between saves is reflected in the decision instead of
+/// the stale value the real [`apply_persona_snapshot`] is about to overwrite
+/// anyway. Idempotent: applying it to an already-current record is a no-op,
+/// so the spawn-time stamp and later recomputes agree when nothing changed.
+///
+/// Orphaned records (persona deleted) pass through unchanged: the caller's
+/// own orphan handling — refusing to spawn, hashing as `(None, None, None)`
+/// — runs on the real record downstream, not on this preview.
+pub fn preview_prospective_persona_snapshot(
+    record: &ManagedAgentRecord,
+    personas: &[AgentDefinition],
+) -> ManagedAgentRecord {
+    let mut preview = record.clone();
+    if let Some(persona_id) = preview.persona_id.clone() {
+        if let Some(persona) = personas.iter().find(|p| p.id == persona_id) {
+            apply_persona_snapshot(&mut preview, persona);
+        }
+    }
+    preview
+}
 #[cfg(test)]
 mod tests;
diff --git a/desktop/src-tauri/src/managed_agents/persona_events/tests.rs b/desktop/src-tauri/src/managed_agents/persona_events/tests.rs
index d62cc5b4bb..b9542f9a87 100644
--- a/desktop/src-tauri/src/managed_agents/persona_events/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/persona_events/tests.rs
@@ -1,4 +1,143 @@
 use super::*;
+use crate::managed_agents::{BackendKind, ManagedAgentRecord, RespondTo};
+
+/// A linked instance record with no persona-derived fields set yet — the
+/// state right after creation, before any snapshot apply.
+fn sample_record() -> ManagedAgentRecord {
+    ManagedAgentRecord {
+        pubkey: "p".repeat(64),
+        name: "agent".into(),
+        persona_id: Some("test-persona".into()),
+        private_key_nsec: "nsec1fake".into(),
+        auth_tag: None,
+        relay_url: "ws://localhost:3000".into(),
+        avatar_url: None,
+        acp_command: "buzz-acp".into(),
+        agent_command: "goose".into(),
+        agent_command_override: None,
+        agent_args: vec![],
+        mcp_command: String::new(),
+        turn_timeout_seconds: 320,
+        idle_timeout_seconds: None,
+        max_turn_duration_seconds: None,
+        parallelism: 1,
+        system_prompt: None,
+        model: None,
+        provider: None,
+        persona_source_version: None,
+        env_vars: BTreeMap::new(),
+        start_on_app_launch: false,
+        auto_restart_on_config_change: true,
+        runtime_pid: None,
+        backend: BackendKind::Local,
+        backend_agent_id: None,
+        provider_binary_path: None,
+        team_id: None,
+        persona_team_dir: None,
+        persona_name_in_team: None,
+        created_at: "now".into(),
+        updated_at: "now".into(),
+        last_started_at: None,
+        last_stopped_at: None,
+        last_exit_code: None,
+        last_error: None,
+        last_error_code: None,
+        respond_to: RespondTo::OwnerOnly,
+        respond_to_allowlist: vec![],
+        display_name: None,
+        slug: None,
+        runtime: None,
+        name_pool: Vec::new(),
+        is_builtin: false,
+        is_active: true,
+        shared: false,
+        source_team: None,
+        source_team_persona_slug: None,
+        catalog_source: None,
+        definition_respond_to: None,
+        definition_respond_to_allowlist: Vec::new(),
+        definition_parallelism: None,
+        relay_mesh: None,
+    }
+}
+
+// ── preview_prospective_persona_snapshot (Finding 4: relay-mesh preflight
+// ordering) ───────────────────────────────────────────────────────────────
+
+/// Regression for the relay-mesh preflight-ordering defect: the preflight
+/// used to check `ensure_relay_mesh_for_record` against the record's stale
+/// pre-snapshot bytes, so a persona edit that flips `provider` to
+/// `relay-mesh` between saves would not trigger the mesh preflight on the
+/// very next start — only on the restart after that, once the real
+/// `apply_persona_snapshot` had already landed. The preview must reflect the
+/// same prospective re-snapshot the real spawn path applies.
+#[test]
+fn preview_reflects_persona_edit_flipping_provider_into_relay_mesh() {
+    let record = sample_record(); // provider: None (not relay-mesh)
+    let mut persona = sample_persona();
+    persona.id = "test-persona".into();
+    persona.provider = Some("relay-mesh".into());
+    persona.model = Some("auto".into());
+
+    let preview = preview_prospective_persona_snapshot(&record, &[persona]);
+
+    assert_eq!(
+        preview.provider.as_deref(),
+        Some("relay-mesh"),
+        "preview must carry the persona's current provider, not the record's stale None"
+    );
+    assert_eq!(preview.model.as_deref(), Some("auto"));
+}
+
+/// Preview reflects a persona edit flipping AWAY from relay-mesh too —
+/// symmetric with the into-mesh case above.
+#[test]
+fn preview_reflects_persona_edit_flipping_provider_out_of_relay_mesh() {
+    let mut record = sample_record();
+    record.provider = Some("relay-mesh".into());
+    record.model = Some("auto".into());
+    let mut persona = sample_persona();
+    persona.id = "test-persona".into();
+    persona.provider = Some("anthropic".into());
+    persona.model = Some("claude-opus-4".into());
+
+    let preview = preview_prospective_persona_snapshot(&record, &[persona]);
+
+    assert_eq!(preview.provider.as_deref(), Some("anthropic"));
+    assert_eq!(preview.model.as_deref(), Some("claude-opus-4"));
+}
+
+/// The preview must not mutate the record passed in — callers (the mesh
+/// preflight) need the original bytes intact for the real snapshot apply
+/// that follows.
+#[test]
+fn preview_does_not_mutate_input_record() {
+    let record = sample_record();
+    let original = record.clone();
+    let mut persona = sample_persona();
+    persona.id = "test-persona".into();
+    persona.provider = Some("relay-mesh".into());
+
+    let _ = preview_prospective_persona_snapshot(&record, &[persona]);
+
+    assert_eq!(record.provider, original.provider);
+    assert_eq!(record.model, original.model);
+}
+
+/// Orphaned instance (persona deleted): the preview must pass the record
+/// through unchanged so downstream orphan handling (refuse to spawn) sees
+/// the same bytes it always would.
+#[test]
+fn preview_passes_through_unchanged_when_persona_missing() {
+    let mut record = sample_record();
+    record.provider = Some("anthropic".into());
+    record.persona_id = Some("deleted-persona".into());
+
+    let preview = preview_prospective_persona_snapshot(&record, &[]);
+
+    assert_eq!(preview.provider.as_deref(), Some("anthropic"));
+    assert_eq!(preview.persona_id.as_deref(), Some("deleted-persona"));
+}
 
 fn sample_persona() -> AgentDefinition {
     AgentDefinition {
@@ -12,8 +151,10 @@ fn sample_persona() -> AgentDefinition {
         name_pool: vec!["Alpha".to_string(), "Beta".to_string()],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: Some("test-slug".to_string()),
+        catalog_source: None,
         env_vars: BTreeMap::from([("KEY".to_string(), "value".to_string())]),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -113,6 +254,25 @@ fn build_persona_event_produces_correct_kind() {
     assert_eq!(event.kind.as_u16() as u32, KIND_PERSONA);
 }
 
+#[test]
+fn shared_persona_event_has_exact_tag_and_round_trips() {
+    let mut record = sample_persona();
+    record.shared = true;
+    let event = build_persona_event(&record)
+        .unwrap()
+        .sign_with_keys(&nostr::Keys::generate())
+        .unwrap();
+
+    let shared_tags: Vec<Vec<&str>> = event
+        .tags
+        .iter()
+        .filter(|tag| tag.as_slice().first().is_some_and(|part| part == "shared"))
+        .map(|tag| tag.as_slice().iter().map(String::as_str).collect())
+        .collect();
+    assert_eq!(shared_tags, vec![vec!["shared", "true"]]);
+    assert!(persona_from_event(&event).unwrap().shared);
+}
+
 #[test]
 fn round_trip_serialization() {
     let record = sample_persona();
@@ -218,8 +378,10 @@ fn content_matches_nip_ap_vector() {
         name_pool: vec!["Alpha".to_string(), "Beta".to_string()],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -247,8 +409,10 @@ fn round_trip_minimal_persona() {
         name_pool: vec![],
         is_builtin: true,
         is_active: false,
+        shared: false,
         source_team: Some("team-1".to_string()),
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -342,8 +506,10 @@ fn quad_absent_definition_hash_stable_across_activation() {
         name_pool: vec!["nib".to_string()],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -384,8 +550,10 @@ fn persona_from_event_content_for_test(content: PersonaEventContent) -> AgentDef
         name_pool: content.name_pool,
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: BTreeMap::new(),
         respond_to: content.respond_to,
         respond_to_allowlist: content.respond_to_allowlist,
@@ -437,43 +605,6 @@ fn persona_content_hash_changes_on_edit() {
     );
 }
 
-// ── persona_field_with_record_fallback ────────────────────────────────────
-
-#[test]
-fn field_fallback_persona_present_wins() {
-    assert_eq!(
-        persona_field_with_record_fallback(Some("persona-model"), Some("record-model")),
-        Some("persona-model".to_owned()),
-    );
-}
-
-#[test]
-fn field_fallback_persona_blank_uses_record() {
-    assert_eq!(
-        persona_field_with_record_fallback(None, Some("record-model")),
-        Some("record-model".to_owned()),
-    );
-    assert_eq!(
-        persona_field_with_record_fallback(Some("  "), Some("record-model")),
-        Some("record-model".to_owned()),
-    );
-}
-
-#[test]
-fn field_fallback_both_blank_is_none() {
-    assert_eq!(persona_field_with_record_fallback(None, None), None);
-    assert_eq!(persona_field_with_record_fallback(Some(""), Some("")), None);
-}
-
-#[test]
-fn field_fallback_record_blank_is_none() {
-    assert_eq!(
-        persona_field_with_record_fallback(None, Some("  ")),
-        None,
-        "whitespace-only record value must also be treated as blank"
-    );
-}
-
 // ── PersonaSnapshot.runtime ───────────────────────────────────────────────
 
 /// (b) The snapshot carries the persona's runtime VERBATIM — including None,
@@ -484,7 +615,7 @@ fn field_fallback_record_blank_is_none() {
 #[test]
 fn snapshot_runtime_verbatim_from_persona() {
     let persona = sample_persona(); // runtime = Some("goose")
-    let snap = persona_snapshot_with_agent_config_fallback(&persona, Some("gpt-4"), Some("openai"));
+    let snap = persona_snapshot(&persona);
     assert_eq!(
         snap.runtime.as_deref(),
         Some("goose"),
@@ -493,15 +624,14 @@ fn snapshot_runtime_verbatim_from_persona() {
 
     let mut no_runtime = sample_persona();
     no_runtime.runtime = None;
-    let snap =
-        persona_snapshot_with_agent_config_fallback(&no_runtime, Some("gpt-4"), Some("openai"));
+    let snap = persona_snapshot(&no_runtime);
     assert_eq!(
         snap.runtime, None,
         "persona runtime None must produce None snapshot (clears stale materialized value)"
     );
 }
 
-// ── persona_snapshot_with_agent_config_fallback ────────────────────────────
+// ── persona_snapshot (definition-authoritative) ──────────────────────────
 
 /// Helper: a persona with no model/provider configured.
 fn blank_model_persona() -> AgentDefinition {
@@ -512,25 +642,22 @@ fn blank_model_persona() -> AgentDefinition {
     }
 }
 
-/// (a) Persona leaves model/provider blank, agent record has values →
-/// record values preserved AND source_version still updated to current hash.
+/// Definition-authoritative: blank definition model/provider → snapshot is
+/// None. The effective-config resolver handles global fallback at read time.
 #[test]
-fn fallback_preserves_record_values_when_persona_blank() {
+fn blank_definition_clears_model_provider() {
     let persona = blank_model_persona();
     let expected_version = persona_content_hash(&persona_event_content(&persona));
 
-    let snapshot =
-        persona_snapshot_with_agent_config_fallback(&persona, Some("gpt-4o"), Some("openai"));
+    let snapshot = persona_snapshot(&persona);
 
-    assert_eq!(
-        snapshot.model.as_deref(),
-        Some("gpt-4o"),
-        "blank persona model must fall back to agent record value"
+    assert!(
+        snapshot.model.is_none(),
+        "blank definition model must produce None"
     );
-    assert_eq!(
-        snapshot.provider.as_deref(),
-        Some("openai"),
-        "blank persona provider must fall back to agent record value"
+    assert!(
+        snapshot.provider.is_none(),
+        "blank definition provider must produce None"
     );
     assert_eq!(
         snapshot.source_version, expected_version,
@@ -538,124 +665,102 @@ fn fallback_preserves_record_values_when_persona_blank() {
     );
 }
 
-/// (b) Persona has model/provider set → persona wins over agent record.
+/// Persona has model/provider set → snapshot carries them verbatim.
 #[test]
-fn fallback_persona_wins_when_set() {
+fn snapshot_carries_persona_model_provider() {
     let persona = sample_persona(); // has model=Some("claude-opus-4"), provider=Some("anthropic")
 
-    let snapshot = persona_snapshot_with_agent_config_fallback(
-        &persona,
-        Some("gpt-4o"), // agent had a different model
-        Some("openai"), // agent had a different provider
-    );
+    let snapshot = persona_snapshot(&persona);
 
     assert_eq!(
         snapshot.model.as_deref(),
         Some("claude-opus-4"),
-        "persona model must win when persona has a value"
+        "persona model must be carried verbatim"
     );
     assert_eq!(
         snapshot.provider.as_deref(),
         Some("anthropic"),
-        "persona provider must win when persona has a value"
+        "persona provider must be carried verbatim"
     );
 }
 
-/// (c) Both blank → snapshot keeps None; a genuinely unconfigured agent
+/// Both blank → snapshot keeps None; a genuinely unconfigured agent
 /// stays unconfigured (no fabricated values).
 #[test]
-fn fallback_both_blank_stays_none() {
+fn both_blank_stays_none() {
     let persona = blank_model_persona();
 
-    let snapshot = persona_snapshot_with_agent_config_fallback(
-        &persona, None, // agent also has no model
-        None, // agent also has no provider
-    );
+    let snapshot = persona_snapshot(&persona);
 
     assert!(
         snapshot.model.is_none(),
-        "neither persona nor agent has model — snapshot must be None"
+        "blank persona model → snapshot None"
     );
     assert!(
         snapshot.provider.is_none(),
-        "neither persona nor agent has provider — snapshot must be None"
+        "blank persona provider → snapshot None"
     );
 }
 
-/// Whitespace-only values on the persona are treated as blank; agent
-/// fallback applies.
+/// Whitespace-only values on the definition are preserved verbatim in the
+/// snapshot. The effective-config resolver treats whitespace as blank.
 #[test]
-fn fallback_treats_whitespace_only_persona_value_as_blank() {
+fn whitespace_only_definition_preserved_verbatim() {
     let mut persona = sample_persona();
     persona.model = Some("  ".to_string());
     persona.provider = Some("\t".to_string());
 
-    let snapshot = persona_snapshot_with_agent_config_fallback(
-        &persona,
-        Some("claude-opus-4"),
-        Some("anthropic"),
-    );
+    let snapshot = persona_snapshot(&persona);
 
     assert_eq!(
         snapshot.model.as_deref(),
-        Some("claude-opus-4"),
-        "whitespace-only persona model must be treated as blank"
+        Some("  "),
+        "whitespace-only model is preserved verbatim in snapshot"
     );
     assert_eq!(
         snapshot.provider.as_deref(),
-        Some("anthropic"),
-        "whitespace-only persona provider must be treated as blank"
+        Some("\t"),
+        "whitespace-only provider is preserved verbatim in snapshot"
     );
 }
 
-/// Cross-field independence: persona sets model but not provider → model
-/// comes from persona, provider falls back to the record.  This is the
-/// practically common case (model-only personas).
+/// Cross-field independence: definition sets model but not provider → model
+/// comes from definition, provider is None (global fallback at read time).
 #[test]
-fn fallback_persona_model_set_provider_blank_uses_record_provider() {
-    let mut persona = sample_persona(); // model=Some("claude-opus-4"), provider=Some("anthropic")
-    persona.provider = None; // blank provider on persona
+fn definition_model_set_provider_blank_produces_none_provider() {
+    let mut persona = sample_persona();
+    persona.provider = None;
 
-    let snapshot = persona_snapshot_with_agent_config_fallback(
-        &persona,
-        Some("gpt-4o"), // record model (should be overridden by persona)
-        Some("openai"), // record provider (should be preserved)
-    );
+    let snapshot = persona_snapshot(&persona);
 
     assert_eq!(
         snapshot.model.as_deref(),
         Some("claude-opus-4"),
-        "persona model must win when persona has a value"
+        "definition model must be used"
     );
-    assert_eq!(
-        snapshot.provider.as_deref(),
-        Some("openai"),
-        "record provider must be used when persona provider is blank"
+    assert!(
+        snapshot.provider.is_none(),
+        "definition provider=None → snapshot None"
     );
 }
 
-/// Inverse: persona sets provider but not model → provider comes from
-/// persona, model falls back to the record.
+/// Definition provider set, model blank → model=None (global fallback at
+/// read time), provider from definition.
 #[test]
-fn fallback_persona_provider_set_model_blank_uses_record_model() {
-    let mut persona = sample_persona(); // model=Some("claude-opus-4"), provider=Some("anthropic")
-    persona.model = None; // blank model on persona
+fn definition_provider_set_model_blank_produces_none_model() {
+    let mut persona = sample_persona();
+    persona.model = None;
 
-    let snapshot = persona_snapshot_with_agent_config_fallback(
-        &persona,
-        Some("gpt-4o"), // record model (should be preserved)
-        Some("openai"), // record provider (should be overridden by persona)
-    );
+    let snapshot = persona_snapshot(&persona);
 
-    assert_eq!(
-        snapshot.model.as_deref(),
-        Some("gpt-4o"),
-        "record model must be used when persona model is blank"
+    assert!(
+        snapshot.model.is_none(),
+        "definition model=None → snapshot None"
     );
     assert_eq!(
         snapshot.provider.as_deref(),
         Some("anthropic"),
-        "persona provider must win when persona has a value"
+        "definition provider must be used"
     );
 }
 
@@ -806,6 +911,7 @@ mod flush_barrier {
         }
 
         let state = build_app_state();
+        *state.keys.lock().unwrap() = keys;
         *state.relay_url_override.lock().unwrap() = Some(spawn_stub_relay().await);
 
         let flushed = flush_pending_events(&db_path, &state).await.expect("flush");
diff --git a/desktop/src-tauri/src/managed_agents/personas.rs b/desktop/src-tauri/src/managed_agents/personas.rs
index b0d874dc78..9bf7ab74b0 100644
--- a/desktop/src-tauri/src/managed_agents/personas.rs
+++ b/desktop/src-tauri/src/managed_agents/personas.rs
@@ -121,8 +121,10 @@ fn built_in_persona_records(now: &str) -> Vec<AgentDefinition> {
             name_pool: persona.name_pool.iter().map(|s| s.to_string()).collect(),
             is_builtin: true,
             is_active: persona.default_active,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             env_vars: std::collections::BTreeMap::new(),
             respond_to: None,
             respond_to_allowlist: Vec::new(),
@@ -254,10 +256,7 @@ pub fn ensure_persona_is_active(
         .ok_or_else(|| format!("agent {persona_id} not found"))?;
 
     if !persona.is_active {
-        return Err(format!(
-            "{} is not in My Agents. Choose it from Agent Catalog first.",
-            persona.display_name
-        ));
+        return Err(format!("{} is not in My Agents.", persona.display_name));
     }
 
     Ok(())
diff --git a/desktop/src-tauri/src/managed_agents/personas/tests.rs b/desktop/src-tauri/src/managed_agents/personas/tests.rs
index e924345e8b..387b4d72c6 100644
--- a/desktop/src-tauri/src/managed_agents/personas/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/personas/tests.rs
@@ -18,8 +18,10 @@ fn custom_persona(id: &str, display_name: &str) -> AgentDefinition {
         name_pool: Vec::new(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: std::collections::BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -171,10 +173,7 @@ fn ensure_persona_is_active_rejects_inactive_personas() {
 
     let err = ensure_persona_is_active(&[persona], "builtin:fizz").unwrap_err();
 
-    assert_eq!(
-        err,
-        "Fizz is not in My Agents. Choose it from Agent Catalog first."
-    );
+    assert_eq!(err, "Fizz is not in My Agents.");
 }
 
 #[test]
@@ -317,6 +316,7 @@ fn migrate_preserves_customized_personas() {
         system_prompt: "My custom research workflow with special instructions".to_string(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         ..custom_persona("builtin:researcher", "My Researcher")
     }];
 
@@ -350,6 +350,7 @@ fn migrate_is_idempotent() {
         system_prompt: "My custom prompt".to_string(),
         is_builtin: false,
         is_active: false,
+        shared: false,
         ..custom_persona("builtin:researcher", "Researcher (retired)")
     }];
     assert!(
@@ -365,6 +366,7 @@ fn migrate_is_idempotent() {
         system_prompt: "Custom review prompt".to_string(),
         is_builtin: true,
         is_active: true,
+        shared: false,
         ..custom_persona("builtin:reviewer", "Reviewer")
     }];
     assert!(migrate_retired_personas(&mut stored_pre_demotion, now));
diff --git a/desktop/src-tauri/src/managed_agents/readiness.rs b/desktop/src-tauri/src/managed_agents/readiness.rs
index c04dfa88a4..c053d933c5 100644
--- a/desktop/src-tauri/src/managed_agents/readiness.rs
+++ b/desktop/src-tauri/src/managed_agents/readiness.rs
@@ -47,6 +47,7 @@ use crate::managed_agents::{
     discovery::{known_acp_runtime, KnownAcpRuntime},
     env_vars::merged_user_env,
     global_config::GlobalAgentConfig,
+    normalize_agent_args,
     types::{AcpAvailabilityStatus, AgentDefinition, ManagedAgentRecord},
 };
 
@@ -77,6 +78,101 @@ pub(crate) struct EffectiveAgentEnv {
     pub effective_command: String,
 }
 
+// ── Typed effective-harness descriptor ───────────────────────────────────────
+//
+// A single owned type that fully describes what a spawn would run.  Produced
+// by `resolve_effective_harness_descriptor` and consumed by spawn_agent_child,
+// spawn_config_hash, build_managed_agent_summary, get_agent_models, and
+// agent_readiness — so the harness-definition lookup and arg/env resolution
+// happen exactly once, in one place.
+
+/// The complete effective description of a harness spawn: resolved command,
+/// args, and layered env.  This is the single source of truth for what will
+/// actually run — computed once and shared across every consumer that needs
+/// the effective values.
+#[derive(Debug, Clone)]
+pub(crate) struct EffectiveHarnessDescriptor {
+    /// The raw effective command string (e.g. `"buzz-agent"`, `"my-acp-agent"`).
+    /// Used for `known_acp_runtime` lookup and hashing.
+    pub command: String,
+    /// Normalized effective args.  Instance args win when non-empty; otherwise
+    /// the harness definition's args apply.
+    pub args: Vec<String>,
+    /// The full layered process env: baked floor → runtime metadata → definition
+    /// env → global → persona → agent.
+    pub env: BTreeMap<String, String>,
+}
+
+/// Resolve the complete harness descriptor from a record + context — the single
+/// authoritative path for command, args, and env.
+///
+/// This is the only place where harness-definition lookup and arg/env layering
+/// happen; spawn, hash, summary, and both model-probe paths all consume this.
+///
+/// Returns `Err("DANGLING_HARNESS_ID:<id>")` when the record (or its linked
+/// persona) references a runtime id that no longer exists in the registry —
+/// the same typed error produced by `try_record_agent_command`.  Callers that
+/// cannot meaningfully continue with a dangling id (e.g. `spawn_agent_child`)
+/// propagate the error; callers that degrade gracefully may use
+/// `.unwrap_or_else(|_| …)`.
+///
+/// Does NOT require an `AppHandle` so it is fully unit-testable.
+///
+/// # Arguments
+/// * `record` — the managed agent record
+/// * `personas` — all current personas (for command/env resolution)
+/// * `global` — global agent config defaults
+pub(crate) fn resolve_effective_harness_descriptor(
+    record: &ManagedAgentRecord,
+    personas: &[crate::managed_agents::types::AgentDefinition],
+    global: &crate::managed_agents::GlobalAgentConfig,
+) -> Result<EffectiveHarnessDescriptor, String> {
+    let effective_command = crate::managed_agents::try_record_agent_command(record, personas)?;
+    let runtime_meta = known_acp_runtime(&effective_command);
+
+    // Look up the harness definition once — used for both args and env.
+    // Resolution order: record.runtime → persona.runtime → "".
+    let harness_def = {
+        let runtime_id = record
+            .runtime
+            .as_deref()
+            .or_else(|| {
+                record.persona_id.as_deref().and_then(|pid| {
+                    personas
+                        .iter()
+                        .find(|p| p.id == pid)
+                        .and_then(|p| p.runtime.as_deref())
+                })
+            })
+            .unwrap_or("");
+        crate::managed_agents::custom_harnesses::lookup_loaded_harness_by_id(runtime_id)
+    };
+
+    // Args: explicit non-empty instance args win; otherwise use definition args.
+    let args = {
+        let record_args = record.agent_args.clone();
+        let instance_has_args = record_args.iter().any(|a| !a.trim().is_empty());
+        if instance_has_args {
+            normalize_agent_args(&effective_command, record_args)
+        } else if let Some(ref def) = harness_def {
+            normalize_agent_args(&effective_command, def.args.clone())
+        } else {
+            normalize_agent_args(&effective_command, record_args)
+        }
+    };
+
+    // Env: full layered resolution (same as resolve_effective_agent_env).
+    // Pass harness_def directly to avoid a second lookup.
+    let effective_env =
+        resolve_effective_agent_env_with_def(record, personas, runtime_meta, global, harness_def);
+
+    Ok(EffectiveHarnessDescriptor {
+        command: effective_command,
+        args,
+        env: effective_env.env,
+    })
+}
+
 /// Assemble the effective agent env from a record, personas, optional
 /// known-runtime metadata, and the global agent config defaults — without an
 /// `AppHandle` so it is fully unit-testable.
@@ -92,17 +188,44 @@ pub(crate) fn resolve_effective_agent_env(
     personas: &[AgentDefinition],
     runtime: Option<&KnownAcpRuntime>,
     global: &GlobalAgentConfig,
+) -> EffectiveAgentEnv {
+    // Look up the harness definition for definition-level env (preset/custom).
+    // Same resolution logic as spawn_agent_child: record runtime id first, then
+    // persona runtime id, then nothing.
+    let harness_def = {
+        let runtime_id = record
+            .runtime
+            .as_deref()
+            .or_else(|| {
+                record.persona_id.as_deref().and_then(|pid| {
+                    personas
+                        .iter()
+                        .find(|p| p.id == pid)
+                        .and_then(|p| p.runtime.as_deref())
+                })
+            })
+            .unwrap_or("");
+        crate::managed_agents::custom_harnesses::lookup_loaded_harness_by_id(runtime_id)
+    };
+
+    resolve_effective_agent_env_with_def(record, personas, runtime, global, harness_def)
+}
+
+/// Inner implementation that accepts a pre-fetched `harness_def` to avoid a
+/// second registry lookup when the caller (e.g. `resolve_effective_harness_descriptor`)
+/// already has the definition in hand.
+fn resolve_effective_agent_env_with_def(
+    record: &ManagedAgentRecord,
+    personas: &[AgentDefinition],
+    runtime: Option<&KnownAcpRuntime>,
+    global: &GlobalAgentConfig,
+    harness_def: Option<std::sync::Arc<crate::managed_agents::custom_harnesses::HarnessDefinition>>,
 ) -> EffectiveAgentEnv {
     let effective_command = crate::managed_agents::record_agent_command(record, personas);
 
     // Layer 1: baked build defaults (floor — internal builds only; OSS = empty).
     let mut env = baked_build_env();
 
-    // Layer 2: runtime metadata env vars (model / provider keys derived from
-    // the record's structured fields, with global as fallback).
-    //
-    // Uses the shared resolver to guarantee readiness and spawn agree on the
-    // effective model/provider: agent → persona → global → None.
     let (effective_model, effective_provider) =
         super::global_config::resolve_effective_model_provider(record, personas, global);
 
@@ -111,13 +234,24 @@ pub(crate) fn resolve_effective_agent_env(
             rt.model_env_var,
             rt.provider_env_var,
             rt.provider_locked,
-            effective_model,
-            effective_provider,
+            effective_model.as_deref(),
+            effective_provider.as_deref(),
         ) {
             env.insert(key.to_string(), value.to_string());
         }
     }
 
+    // Layer 2b: definition env — the harness author's defaults (e.g. CURSOR_ACP=1).
+    // Applied as a floor below global so user env always wins on collision.
+    // Reserved keys are stripped by the shared `is_reserved_env_key` predicate.
+    if let Some(ref def) = harness_def {
+        for (key, value) in &def.env {
+            if !super::env_vars::is_reserved_env_key(key) {
+                env.insert(key.clone(), value.clone());
+            }
+        }
+    }
+
     // Layer 3a: global env vars — the lowest user-settable layer.
     // Injected before persona/agent so per-agent values win on collision.
     // `merged_user_env` with an empty "lower" map applies reserved/malformed-key
@@ -138,7 +272,11 @@ pub(crate) fn resolve_effective_agent_env(
     // Buzz shared compute is a native Buzz provider. Translate it to buzz-agent's
     // OpenAI-compatible transport only in the effective runtime environment.
     #[cfg(feature = "mesh-llm")]
-    super::apply_relay_mesh_env(&mut env, effective_provider, effective_model);
+    super::apply_relay_mesh_env(
+        &mut env,
+        effective_provider.as_deref(),
+        effective_model.as_deref(),
+    );
 
     EffectiveAgentEnv {
         env,
@@ -196,6 +334,14 @@ pub enum Requirement {
     /// Git for Windows is missing, so buzz-agent cannot launch buzz-dev-mcp's
     /// Bash-based shell tool. Doctor owns installation and re-checking.
     GitBash,
+    /// A custom harness command that cannot be resolved in the current PATH.
+    /// Displayed as a PATH badge in the harness card and a nudge in the agent
+    /// message stream.  No in-app action can fix this — the user must install
+    /// the binary or update their PATH.
+    MissingBinary {
+        /// The command name that was not found (e.g. `\"my-acp-agent\"`).
+        command: String,
+    },
 }
 
 // ── AgentReadiness ────────────────────────────────────────────────────────────
@@ -271,7 +417,13 @@ fn collect_missing_requirements(
     runtime: Option<&KnownAcpRuntime>,
 ) -> Vec<Requirement> {
     let Some(rt) = runtime else {
-        // Unknown/custom command — no requirements to check.
+        // Unknown/custom command — check that the binary is actually resolvable.
+        // No known requirement set beyond the PATH check.
+        if crate::managed_agents::resolve_command(&effective.effective_command).is_none() {
+            return vec![Requirement::MissingBinary {
+                command: effective.effective_command.clone(),
+            }];
+        }
         return vec![];
     };
 
@@ -1207,10 +1359,30 @@ mod tests {
 
     #[test]
     fn unknown_command_is_always_ready() {
-        let env = make_env("my-custom-harness", BTreeMap::new());
+        // Since Phase B-7 (readiness exec-check), unknown/custom commands that are
+        // not resolvable in PATH produce a MissingBinary requirement rather than
+        // being unconditionally Ready.  A command that IS resolvable should be Ready.
+        // Use a known-present binary so the test is not environment-sensitive.
+        let env = make_env("sh", BTreeMap::new());
         assert!(
             agent_readiness(&env).is_ready(),
-            "unknown/custom command should always be Ready (no requirements)"
+            "unknown/custom command present in PATH should be Ready"
+        );
+    }
+
+    #[test]
+    fn unknown_command_missing_from_path_is_not_ready() {
+        let env = make_env("my-custom-harness-that-does-not-exist", BTreeMap::new());
+        let readiness = agent_readiness(&env);
+        assert!(
+            !readiness.is_ready(),
+            "unknown/custom command absent from PATH should be NotReady"
+        );
+        let reqs = readiness.requirements();
+        assert_eq!(reqs.len(), 1);
+        assert!(
+            matches!(&reqs[0], Requirement::MissingBinary { command } if command == "my-custom-harness-that-does-not-exist"),
+            "should surface MissingBinary requirement"
         );
     }
 
@@ -1338,8 +1510,10 @@ mod tests {
             name_pool: Vec::new(),
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             definition_respond_to: None,
             definition_respond_to_allowlist: Vec::new(),
             definition_parallelism: None,
diff --git a/desktop/src-tauri/src/managed_agents/reconcile.rs b/desktop/src-tauri/src/managed_agents/reconcile.rs
index dc73bc9739..90f05c5750 100644
--- a/desktop/src-tauri/src/managed_agents/reconcile.rs
+++ b/desktop/src-tauri/src/managed_agents/reconcile.rs
@@ -32,12 +32,16 @@ use nostr::JsonUtil;
 /// Reconcile `managed-agents.json` into kind:30177 events in the retention
 /// store. Boot-time entry point, called from `event_sync::run_event_sync`
 /// after the persona and team legs.
-pub(crate) fn reconcile_agents_to_events(app: &tauri::AppHandle, keys: &nostr::Keys) {
+pub(crate) fn reconcile_agents_to_events(
+    app: &tauri::AppHandle,
+    keys: &nostr::Keys,
+    db_path: &Path,
+) {
     let Ok(base_dir) = super::managed_agents_base_dir(app) else {
         return;
     };
 
-    match reconcile_agents_in_dir(&base_dir, keys) {
+    match reconcile_agents_in_dir_at(&base_dir, keys, db_path) {
         Ok(0) => {}
         Ok(reconciled) => {
             eprintln!(
@@ -61,7 +65,16 @@ pub(crate) fn reconcile_agents_to_events(app: &tauri::AppHandle, keys: &nostr::K
 /// never churns `pending_sync`.
 ///
 /// Returns the number of agents (re)written to the retention store.
+#[cfg(test)]
 pub(crate) fn reconcile_agents_in_dir(base_dir: &Path, keys: &nostr::Keys) -> Result<u32, String> {
+    reconcile_agents_in_dir_at(base_dir, keys, &base_dir.join("retention.db"))
+}
+
+fn reconcile_agents_in_dir_at(
+    base_dir: &Path,
+    keys: &nostr::Keys,
+    db_path: &Path,
+) -> Result<u32, String> {
     let store_path = base_dir.join("managed-agents.json");
     if !store_path.exists() {
         return Ok(0);
@@ -79,11 +92,8 @@ pub(crate) fn reconcile_agents_in_dir(base_dir: &Path, keys: &nostr::Keys) -> Re
         return Ok(0);
     }
 
-    let owner_pubkey = keys.public_key().to_hex();
-
-    let db_path = base_dir.join("retention.db");
     let conn =
-        open_retention_db(&db_path).map_err(|e| format!("failed to open retention db: {e}"))?;
+        open_retention_db(db_path).map_err(|e| format!("failed to open retention db: {e}"))?;
 
     let mut reconciled = 0u32;
 
@@ -94,46 +104,66 @@ pub(crate) fn reconcile_agents_in_dir(base_dir: &Path, keys: &nostr::Keys) -> Re
             continue;
         }
 
-        let existing =
-            get_retained_event(&conn, KIND_MANAGED_AGENT, &owner_pubkey, &record.pubkey)?;
-
-        // Build the event first and compare ITS content, so the comparison and
-        // the retained row share one serialization of the projection (mirrors
-        // `migrate_personas_in_dir`). Serializing the projection independently
-        // here would silently diverge if `build_agent_event` ever changed how
-        // it serializes — republishing every agent every boot. Content is
-        // timestamp-independent, so the monotonic bump below never forces a
-        // spurious republish; an unchanged agent is still a true no-op.
-        let event = build_agent_event(record)?
-            .custom_created_at(monotonic_created_at(
-                existing.as_ref().map(|row| row.created_at),
-            ))
-            .sign_with_keys(keys)
-            .map_err(|e| format!("failed to sign event for '{}': {e}", record.name))?;
-
-        let content = event.content.clone();
-        if existing.as_ref().is_some_and(|row| row.content == content) {
-            continue;
+        if retain_agent_record(&conn, keys, record)? {
+            reconciled += 1;
         }
-
-        retain_event(
-            &conn,
-            &RetainedEvent {
-                kind: KIND_MANAGED_AGENT,
-                pubkey: owner_pubkey.clone(),
-                d_tag: record.pubkey.clone(),
-                content,
-                created_at: event.created_at.as_secs() as i64,
-                raw_event: event.as_json(),
-                pending_sync: true,
-            },
-        )
-        .map_err(|e| format!("failed to retain '{}': {e}", record.name))?;
-        reconciled += 1;
     }
 
     Ok(reconciled)
 }
 
+/// Retain `record`'s kind:30177 identity record, marking it `pending_sync`
+/// for the flush loop, when its projection differs from the retained head.
+/// Returns `Ok(true)` when a row was (re)written and `Ok(false)` when the
+/// retained content already matches (a true no-op — no `pending_sync` churn).
+///
+/// This is the single content-diff + monotonic-bump engine shared by the
+/// boot-time reconcile above and the interactive edit paths
+/// (`retain_managed_agent_pending`, persona-rename propagation). Every
+/// mutation of an agent's published identity must go through it so the
+/// retained record can never silently drift from `managed-agents.json`.
+pub(crate) fn retain_agent_record(
+    conn: &rusqlite::Connection,
+    keys: &nostr::Keys,
+    record: &ManagedAgentRecord,
+) -> Result<bool, String> {
+    let owner_pubkey = keys.public_key().to_hex();
+    let existing = get_retained_event(conn, KIND_MANAGED_AGENT, &owner_pubkey, &record.pubkey)?;
+
+    // Build the event first and compare ITS content, so the comparison and
+    // the retained row share one serialization of the projection (mirrors
+    // `migrate_personas_in_dir`). Serializing the projection independently
+    // here would silently diverge if `build_agent_event` ever changed how
+    // it serializes — republishing every agent every boot. Content is
+    // timestamp-independent, so the monotonic bump below never forces a
+    // spurious republish; an unchanged agent is still a true no-op.
+    let event = build_agent_event(record)?
+        .custom_created_at(monotonic_created_at(
+            existing.as_ref().map(|row| row.created_at),
+        ))
+        .sign_with_keys(keys)
+        .map_err(|e| format!("failed to sign event for '{}': {e}", record.name))?;
+
+    let content = event.content.clone();
+    if existing.as_ref().is_some_and(|row| row.content == content) {
+        return Ok(false);
+    }
+
+    retain_event(
+        conn,
+        &RetainedEvent {
+            kind: KIND_MANAGED_AGENT,
+            pubkey: owner_pubkey,
+            d_tag: record.pubkey.clone(),
+            content,
+            created_at: event.created_at.as_secs() as i64,
+            raw_event: event.as_json(),
+            pending_sync: true,
+        },
+    )
+    .map_err(|e| format!("failed to retain '{}': {e}", record.name))?;
+    Ok(true)
+}
+
 #[cfg(test)]
 mod tests;
diff --git a/desktop/src-tauri/src/managed_agents/reconcile/tests.rs b/desktop/src-tauri/src/managed_agents/reconcile/tests.rs
index 5af05f99d6..c9269dbf00 100644
--- a/desktop/src-tauri/src/managed_agents/reconcile/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/reconcile/tests.rs
@@ -300,3 +300,103 @@ fn slimming_republish_wave_is_one_time() {
         "second boot must be a no-op (idempotence)"
     );
 }
+
+// ── retain_agent_record (interactive-edit engine) ────────────────────────────
+//
+// #2423: renaming an agent must re-retain its kind:30177 identity record
+// IMMEDIATELY, not at the next boot-time reconcile. These tests pin the shared
+// engine both the boot reconcile and the interactive edit paths
+// (`retain_managed_agent_pending`, persona-rename propagation) run on.
+
+/// A rename re-retains the identity record under the SAME coordinate (the
+/// agent pubkey) with the new name, queued for publish, with a created_at
+/// strictly past the retained head so the relay's replaceable-event rule
+/// accepts it. Without this, the relay keeps the old name→pubkey binding
+/// until the next restart — the identity desync in #2423.
+#[test]
+fn rename_re_retains_identity_record_with_new_name() {
+    let dir = TempDir::new().unwrap();
+    let keys = nostr::Keys::generate();
+    let conn = open_retention_db(&dir.path().join("retention.db")).unwrap();
+    let owner = keys.public_key().to_hex();
+    let pubkey = "9".repeat(64);
+    let mut record = sample_record(&pubkey, "Fizz");
+
+    assert!(retain_agent_record(&conn, &keys, &record).unwrap());
+    let first = get_retained_event(&conn, KIND_MANAGED_AGENT, &owner, &pubkey)
+        .unwrap()
+        .unwrap();
+    // Simulate the flush loop confirming the initial publish.
+    mark_synced(
+        &conn,
+        first.kind,
+        &first.pubkey,
+        &first.d_tag,
+        first.created_at,
+        &first.content,
+    )
+    .unwrap();
+
+    record.name = "Spark".to_string();
+    assert!(
+        retain_agent_record(&conn, &keys, &record).unwrap(),
+        "a renamed record must re-retain its identity record"
+    );
+
+    let row = get_retained_event(&conn, KIND_MANAGED_AGENT, &owner, &pubkey)
+        .unwrap()
+        .unwrap();
+    assert_eq!(row.d_tag, pubkey, "coordinate stays keyed by agent pubkey");
+    assert!(
+        row.content.contains("Spark"),
+        "retained identity record must carry the new name"
+    );
+    assert!(
+        !row.content.contains("Fizz"),
+        "the stale name must not survive the rename"
+    );
+    assert!(row.pending_sync, "a rename must queue a republish");
+    assert!(
+        row.created_at > first.created_at,
+        "created_at must bump past the retained head (replaceable-event rule)"
+    );
+}
+
+/// An unchanged record is a true no-op: no rewrite, no `pending_sync` churn.
+/// This is what lets every edit path call the engine unconditionally.
+#[test]
+fn retain_agent_record_is_noop_when_unchanged() {
+    let dir = TempDir::new().unwrap();
+    let keys = nostr::Keys::generate();
+    let conn = open_retention_db(&dir.path().join("retention.db")).unwrap();
+    let pubkey = "8".repeat(64);
+    let record = sample_record(&pubkey, "steady-agent");
+
+    assert!(retain_agent_record(&conn, &keys, &record).unwrap());
+    let row = get_retained_event(
+        &conn,
+        KIND_MANAGED_AGENT,
+        &keys.public_key().to_hex(),
+        &pubkey,
+    )
+    .unwrap()
+    .unwrap();
+    mark_synced(
+        &conn,
+        row.kind,
+        &row.pubkey,
+        &row.d_tag,
+        row.created_at,
+        &row.content,
+    )
+    .unwrap();
+
+    assert!(
+        !retain_agent_record(&conn, &keys, &record).unwrap(),
+        "an unchanged projection must not re-retain"
+    );
+    assert!(
+        get_pending_sync(&conn).unwrap().is_empty(),
+        "no pending_sync churn for an unchanged record"
+    );
+}
diff --git a/desktop/src-tauri/src/managed_agents/relay_mesh.rs b/desktop/src-tauri/src/managed_agents/relay_mesh.rs
index a47122df80..7a6f5b094a 100644
--- a/desktop/src-tauri/src/managed_agents/relay_mesh.rs
+++ b/desktop/src-tauri/src/managed_agents/relay_mesh.rs
@@ -1,10 +1,9 @@
-#[cfg(feature = "mesh-llm")]
-use super::{ManagedAgentRecord, RelayMeshConfig};
-
 pub const RELAY_MESH_API_BASE_URL: &str = "http://127.0.0.1:9337/v1";
 pub const RELAY_MESH_API_KEY_PLACEHOLDER: &str = "buzz-mesh-local";
 pub const RELAY_MESH_PROVIDER_ID: &str = "relay-mesh";
 pub const RELAY_MESH_AUTO_MODEL_ID: &str = "auto";
+#[cfg(feature = "mesh-llm")]
+pub const RELAY_MESH_PREFER_MESH_FOR_AUTO_ENV: &str = "BUZZ_AGENT_PREFER_MESH_FOR_AUTO";
 
 /// Translate the native Buzz shared compute provider into the OpenAI-compatible
 /// transport understood by buzz-agent. These are derived runtime details, not
@@ -35,6 +34,14 @@ pub fn apply_relay_mesh_env(
         RELAY_MESH_API_KEY_PLACEHOLDER.to_string(),
     );
     env.insert("OPENAI_COMPAT_API".to_string(), "chat".to_string());
+    // Buzz owns the meaning of relay-mesh `auto`: buzz-agent dynamically uses
+    // mesh-llm's virtual Mixture-of-Agents model whenever the live catalog says
+    // at least two distinct models are available, and otherwise keeps the
+    // router's normal single-model `auto` behavior.
+    env.insert(
+        RELAY_MESH_PREFER_MESH_FOR_AUTO_ENV.to_string(),
+        "1".to_string(),
+    );
     // Keep the requested response inside smaller local-model context windows,
     // and spend that budget on an answer/tool call instead of hidden reasoning.
     // Without both settings Qwen3 either fails the router's fit check at the
@@ -46,146 +53,11 @@ pub fn apply_relay_mesh_env(
     env.insert("BUZZ_AGENT_THINKING_EFFORT".to_string(), "none".to_string());
 }
 
-/// Resolve a record's relay-mesh config, typed field first.
-///
-/// Source of truth is the typed `record.relay_mesh` field. For records saved
-/// before that field existed, fall back to detecting the relay-mesh preset
-/// from `env_vars` (the legacy discriminator). New records carry the typed
-/// field and need no env-var sniffing at all.
-#[cfg(feature = "mesh-llm")]
-pub fn relay_mesh_config(record: &ManagedAgentRecord) -> Option<RelayMeshConfig> {
-    if record.provider.as_deref() == Some(RELAY_MESH_PROVIDER_ID) {
-        let model_ref = record
-            .model
-            .as_deref()
-            .map(str::trim)
-            .filter(|value| !value.is_empty())
-            .unwrap_or(RELAY_MESH_AUTO_MODEL_ID)
-            .to_string();
-        return Some(RelayMeshConfig { model_ref });
-    }
-    if let Some(config) = &record.relay_mesh {
-        return Some(config.clone());
-    }
-    relay_mesh_model_id_from_env(record).map(|model_ref| RelayMeshConfig { model_ref })
-}
-
-/// Returns the relay-mesh model id for agents whose provider env points at the
-/// local mesh client endpoint created by Buzz's relay-mesh preset.
-///
-/// Prefer [`relay_mesh_config`]; this remains as a convenience for call sites
-/// that only need the model id.
-#[cfg(feature = "mesh-llm")]
-pub fn relay_mesh_model_id(record: &ManagedAgentRecord) -> Option<String> {
-    relay_mesh_config(record).map(|config| config.model_ref)
-}
-
-/// Legacy env-var discriminator: detects the relay-mesh preset purely from the
-/// four preset env vars. Used as a fallback for records saved before the typed
-/// `relay_mesh` field existed.
-#[cfg(feature = "mesh-llm")]
-fn relay_mesh_model_id_from_env(record: &ManagedAgentRecord) -> Option<String> {
-    let base_url = record.env_vars.get("OPENAI_COMPAT_BASE_URL")?.trim();
-    if base_url.trim_end_matches('/') != RELAY_MESH_API_BASE_URL {
-        return None;
-    }
-    let provider = record.env_vars.get("BUZZ_AGENT_PROVIDER")?.trim();
-    if provider != "openai" {
-        return None;
-    }
-    let api_key = record.env_vars.get("OPENAI_COMPAT_API_KEY")?.trim();
-    if api_key != RELAY_MESH_API_KEY_PLACEHOLDER {
-        return None;
-    }
-    record
-        .env_vars
-        .get("OPENAI_COMPAT_MODEL")
-        .map(|value| value.trim())
-        .filter(|value| !value.is_empty())
-        .map(str::to_string)
-}
-
 #[cfg(all(test, feature = "mesh-llm"))]
 mod tests {
     use std::collections::BTreeMap;
 
     use super::*;
-    use crate::managed_agents::{BackendKind, ManagedAgentRecord, RespondTo};
-
-    fn fixture() -> ManagedAgentRecord {
-        ManagedAgentRecord {
-            pubkey: "p".into(),
-            name: "n".into(),
-            persona_id: None,
-            private_key_nsec: "nsec1fake".into(),
-            auth_tag: Some("tag".into()),
-            relay_url: "ws://localhost:3000".into(),
-            avatar_url: None,
-            acp_command: "buzz-acp".into(),
-            agent_command: "goose".into(),
-            agent_command_override: None,
-            agent_args: vec![],
-            mcp_command: String::new(),
-            turn_timeout_seconds: 320,
-            idle_timeout_seconds: None,
-            max_turn_duration_seconds: None,
-            parallelism: 1,
-            system_prompt: None,
-            model: None,
-            env_vars: BTreeMap::new(),
-            start_on_app_launch: false,
-            auto_restart_on_config_change: true,
-            runtime_pid: None,
-            backend: BackendKind::Local,
-            backend_agent_id: None,
-            provider_binary_path: None,
-            team_id: None,
-            persona_team_dir: None,
-            persona_name_in_team: None,
-            persona_source_version: None,
-            provider: None,
-            created_at: "now".into(),
-            updated_at: "now".into(),
-            last_started_at: None,
-            last_stopped_at: None,
-            last_exit_code: None,
-            last_error: None,
-            last_error_code: None,
-            respond_to: RespondTo::OwnerOnly,
-            respond_to_allowlist: vec![],
-            display_name: None,
-            slug: None,
-            runtime: None,
-            name_pool: Vec::new(),
-            is_builtin: false,
-            is_active: true,
-            source_team: None,
-            source_team_persona_slug: None,
-            definition_respond_to: None,
-            definition_respond_to_allowlist: Vec::new(),
-            definition_parallelism: None,
-            relay_mesh: None,
-        }
-    }
-
-    #[test]
-    fn relay_mesh_model_id_detects_mesh_preset_env() {
-        let mut rec = fixture();
-        rec.env_vars = BTreeMap::from([
-            ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
-            (
-                "OPENAI_COMPAT_BASE_URL".to_string(),
-                "http://127.0.0.1:9337/v1/".to_string(),
-            ),
-            ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
-            (
-                "OPENAI_COMPAT_API_KEY".to_string(),
-                RELAY_MESH_API_KEY_PLACEHOLDER.to_string(),
-            ),
-        ]);
-
-        assert_eq!(relay_mesh_model_id(&rec).as_deref(), Some("Qwen3"));
-    }
 
     #[test]
     fn native_provider_uses_context_safe_non_reasoning_budget() {
@@ -204,96 +76,10 @@ mod tests {
             env.get("BUZZ_AGENT_THINKING_EFFORT").map(String::as_str),
             Some("none")
         );
-    }
-
-    #[test]
-    fn relay_mesh_model_id_ignores_non_mesh_openai_env() {
-        let mut rec = fixture();
-        rec.env_vars = BTreeMap::from([
-            ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
-            (
-                "OPENAI_COMPAT_BASE_URL".to_string(),
-                "https://api.openai.com/v1".to_string(),
-            ),
-            ("OPENAI_COMPAT_MODEL".to_string(), "gpt-5".to_string()),
-        ]);
-
-        assert_eq!(relay_mesh_model_id(&rec), None);
-    }
-
-    #[test]
-    fn relay_mesh_model_id_ignores_user_openai_on_same_local_port() {
-        let mut rec = fixture();
-        rec.env_vars = BTreeMap::from([
-            ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
-            (
-                "OPENAI_COMPAT_BASE_URL".to_string(),
-                "http://127.0.0.1:9337/v1".to_string(),
-            ),
-            ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
-            ("OPENAI_COMPAT_API_KEY".to_string(), "real-key".to_string()),
-        ]);
-
-        assert_eq!(relay_mesh_model_id(&rec), None);
-    }
-
-    #[test]
-    fn native_provider_fields_are_authoritative() {
-        // The whole point: a typed record needs no env-var sniffing to be
-        // recognized as a relay-mesh agent.
-        let mut rec = fixture();
-        rec.provider = Some(RELAY_MESH_PROVIDER_ID.to_string());
-        rec.model = Some("Qwen3".to_string());
-        assert!(rec.env_vars.is_empty());
         assert_eq!(
-            relay_mesh_config(&rec),
-            Some(RelayMeshConfig {
-                model_ref: "Qwen3".to_string()
-            })
+            env.get(RELAY_MESH_PREFER_MESH_FOR_AUTO_ENV)
+                .map(String::as_str),
+            Some("1")
         );
-        assert_eq!(relay_mesh_model_id(&rec).as_deref(), Some("Qwen3"));
-    }
-
-    #[test]
-    fn native_provider_fields_win_over_legacy_config() {
-        let mut rec = fixture();
-        rec.provider = Some(RELAY_MESH_PROVIDER_ID.to_string());
-        rec.model = Some("native-model".to_string());
-        rec.relay_mesh = Some(RelayMeshConfig {
-            model_ref: "typed-model".to_string(),
-        });
-        rec.env_vars = BTreeMap::from([
-            ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
-            (
-                "OPENAI_COMPAT_BASE_URL".to_string(),
-                "http://127.0.0.1:9337/v1".to_string(),
-            ),
-            ("OPENAI_COMPAT_MODEL".to_string(), "env-model".to_string()),
-            (
-                "OPENAI_COMPAT_API_KEY".to_string(),
-                RELAY_MESH_API_KEY_PLACEHOLDER.to_string(),
-            ),
-        ]);
-        assert_eq!(relay_mesh_model_id(&rec).as_deref(), Some("native-model"));
-    }
-
-    #[test]
-    fn legacy_record_falls_back_to_env_sniff() {
-        // Records saved before the typed field still resolve via env vars.
-        let mut rec = fixture();
-        rec.relay_mesh = None;
-        rec.env_vars = BTreeMap::from([
-            ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
-            (
-                "OPENAI_COMPAT_BASE_URL".to_string(),
-                "http://127.0.0.1:9337/v1".to_string(),
-            ),
-            ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
-            (
-                "OPENAI_COMPAT_API_KEY".to_string(),
-                RELAY_MESH_API_KEY_PLACEHOLDER.to_string(),
-            ),
-        ]);
-        assert_eq!(relay_mesh_model_id(&rec).as_deref(), Some("Qwen3"));
     }
 }
diff --git a/desktop/src-tauri/src/managed_agents/restore.rs b/desktop/src-tauri/src/managed_agents/restore.rs
index fab481e12b..1910620159 100644
--- a/desktop/src-tauri/src/managed_agents/restore.rs
+++ b/desktop/src-tauri/src/managed_agents/restore.rs
@@ -1,5 +1,3 @@
-#[cfg(feature = "mesh-llm")]
-use super::relay_mesh_model_id;
 use super::{
     find_managed_agent_mut, kill_stale_tracked_processes, load_managed_agents, load_personas,
     save_managed_agents, spawn_agent_child, sync_managed_agent_processes, BackendKind,
@@ -36,10 +34,9 @@ type AgentSpawnResult = (String, SpawnOutcome);
 /// `model`/`provider` were clobbered by the old unconditional snapshot code before
 /// this fix — are skipped here; they self-heal on the next manual start via the
 /// start-path re-snapshot in `start_local_agent_with_preflight`.
-/// If the linked persona is gone, we log loudly and leave the snapshot empty —
-/// the record's own `system_prompt`/`model` (possibly empty for persona-created
-/// agents) is then all the config that remains, which is the same fallback an
-/// orphaned agent already gets.
+/// If the linked persona is gone, we log loudly and leave the record untouched —
+/// it stays orphaned and `spawn_agent_child` refuses to start it (see
+/// `effective_config::resolve_effective_config`'s `OrphanedInstance` arm).
 pub fn backfill_persona_snapshots(app: &tauri::AppHandle) -> Result<(), String> {
     let state = app.state::<AppState>();
     let _store_guard = state
@@ -66,7 +63,7 @@ pub fn backfill_persona_snapshots(app: &tauri::AppHandle) -> Result<(), String>
         }
         let Some(persona) = personas.iter().find(|p| p.id == persona_id) else {
             eprintln!(
-                "buzz-desktop: persona-snapshot backfill: agent {} links persona {persona_id} which no longer exists; leaving snapshot empty — it will spawn from its record fields",
+                "buzz-desktop: persona-snapshot backfill: agent {} links persona {persona_id} which no longer exists; leaving it orphaned — spawn will refuse it",
                 record.pubkey
             );
             continue;
@@ -206,6 +203,9 @@ pub async fn restore_managed_agents_on_launch(
                 continue;
             };
             let Some(persona) = personas_for_snapshot.iter().find(|p| p.id == persona_id) else {
+                // Orphaned: no current persona to re-snapshot from. Leave the
+                // record as-is — `spawn_agent_child` (Phase B below) refuses to
+                // spawn it and Phase C persists the refusal to `last_error`.
                 continue;
             };
             super::persona_events::apply_persona_snapshot(record, persona);
@@ -240,16 +240,26 @@ pub async fn restore_managed_agents_on_launch(
 
     #[cfg(feature = "mesh-llm")]
     let agents_to_start = {
+        // Preflight against the same resolution spawn uses — `resolve_effective_config`
+        // (definition → global fallback). A linked instance's own `provider`/`model`/
+        // `relay_mesh` bytes never contribute. See `start_local_agent_with_preflight`
+        // in `commands/agents.rs` for the identical rationale on the interactive path.
+        let personas = load_personas(app).unwrap_or_default();
+        let global = super::load_global_agent_config(app).unwrap_or_default();
         let mut mesh_preflight_failures = std::collections::HashSet::new();
         for record in &agents_to_start {
-            if relay_mesh_model_id(record).is_none() {
+            let mesh_model_id = super::effective_config::resolve_effective_relay_mesh_model_id(
+                record, &personas, &global,
+            );
+            if mesh_model_id.is_none() {
                 continue;
             }
             // Auto-start after relaunch: re-resolve a live bootstrap target and
             // dial it. Skip (with an actionable error) only when no live target
             // serves this model right now.
             if let Err(error) =
-                crate::commands::ensure_relay_mesh_for_record(app, record, false).await
+                crate::commands::ensure_relay_mesh_for_record(app, mesh_model_id.as_deref(), false)
+                    .await
             {
                 persist_restore_error(app, &state, &record.pubkey, error)?;
                 mesh_preflight_failures.insert(record.pubkey.clone());
diff --git a/desktop/src-tauri/src/managed_agents/retention.rs b/desktop/src-tauri/src/managed_agents/retention.rs
index 5df566dbbe..7e97fa1f56 100644
--- a/desktop/src-tauri/src/managed_agents/retention.rs
+++ b/desktop/src-tauri/src/managed_agents/retention.rs
@@ -5,10 +5,106 @@
 //! keyed on `(kind, pubkey, d_tag)`, replacing only on a newer-or-equal
 //! `created_at` for NIP-33 latest-wins semantics.
 
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::time::{Duration, Instant};
 
 use rusqlite::{params, Connection, OptionalExtension};
+use sha2::{Digest, Sha256};
+use tauri::AppHandle;
+
+use crate::app_state::AppState;
+
+mod legacy_migration;
+pub use legacy_migration::migrate_legacy_retention_db;
+
+/// Durable event-retention scope for one community relay and owner identity.
+///
+/// Persona, team, and managed-agent definitions are workspace-global, but
+/// their relay heads and pending publications are not. Keeping a separate
+/// database per `(relay_url, owner_pubkey)` prevents a pending write created in
+/// community A from being drained into community B after a workspace switch.
+pub struct RetentionScope {
+    pub db_path: PathBuf,
+    pub relay_url: String,
+    pub owner_keys: nostr::Keys,
+}
+
+/// Decide whether `scope` — the workspace's active retention scope — is the one
+/// that owns an event delivered by `arrival_relay_url`.
+///
+/// Inbound reconcile resolves its retention database when it PROCESSES an event,
+/// while the event belongs to the community that DELIVERED it. `None` means a
+/// workspace switch happened in between and the caller must drop the event
+/// rather than file community A's event into community B's store.
+///
+/// The comparison goes through the same normalization
+/// [`scoped_retention_db_path`] hashes, so "same relay" can never disagree with
+/// "same database".
+pub fn scope_for_arrival(scope: RetentionScope, arrival_relay_url: &str) -> Option<RetentionScope> {
+    let same_scope =
+        normalized_relay_scope(&scope.relay_url) == normalized_relay_scope(arrival_relay_url);
+    same_scope.then_some(scope)
+}
+
+/// Relay-URL form that identifies a retention scope: equivalent workspace URLs
+/// (surrounding space, trailing slash) must resolve to one scope.
+fn normalized_relay_scope(relay_url: &str) -> &str {
+    relay_url.trim().trim_end_matches('/')
+}
+
+/// Resolve the retention database path for a relay + owner pair.
+///
+/// The normalized scope is hashed so relay URLs never become path components.
+/// Trimming a trailing slash keeps equivalent workspace URLs on one scope.
+pub fn scoped_retention_db_path(base_dir: &Path, relay_url: &str, owner_pubkey: &str) -> PathBuf {
+    let normalized_relay = normalized_relay_scope(relay_url);
+    let mut hasher = Sha256::new();
+    hasher.update(owner_pubkey.trim().to_ascii_lowercase().as_bytes());
+    hasher.update(b"\0");
+    hasher.update(normalized_relay.as_bytes());
+    let scope_id = hex::encode(hasher.finalize());
+    base_dir.join("retention").join(format!("{scope_id}.db"))
+}
+
+/// Snapshot the active relay + owner and resolve their durable event store.
+///
+/// Callers keep the returned relay and keys alongside the path whenever work
+/// crosses an `.await`; a later workspace switch cannot retarget that work.
+pub fn active_retention_scope(app: &AppHandle, state: &AppState) -> Result<RetentionScope, String> {
+    let relay_url = crate::relay::relay_ws_url_with_override(state);
+    let owner_keys = state.signing_keys()?;
+    let base_dir = super::managed_agents_base_dir(app)?;
+    let db_path =
+        scoped_retention_db_path(&base_dir, &relay_url, &owner_keys.public_key().to_hex());
+    let parent = db_path
+        .parent()
+        .ok_or_else(|| "retention scope path has no parent".to_string())?;
+    std::fs::create_dir_all(parent)
+        .map_err(|error| format!("failed to create retention scope directory: {error}"))?;
+    Ok(RetentionScope {
+        db_path,
+        relay_url,
+        owner_keys,
+    })
+}
+
+/// Snapshot the active relay + owner, but only when it is the scope that owns
+/// events delivered by `arrival_relay_url`.
+///
+/// Resolving the scope and matching it in one step is what closes the gap: the
+/// returned scope is both the one that will be written to and the one the event
+/// arrived on. `Ok(None)` means the arrival community is no longer active and
+/// the caller must drop the event — see [`scope_for_arrival`].
+pub fn arrival_retention_scope(
+    app: &AppHandle,
+    state: &AppState,
+    arrival_relay_url: &str,
+) -> Result<Option<RetentionScope>, String> {
+    Ok(scope_for_arrival(
+        active_retention_scope(app, state)?,
+        arrival_relay_url,
+    ))
+}
 
 /// A retained persona event row.
 #[derive(Debug, Clone)]
@@ -368,6 +464,64 @@ pub fn get_retained_event(
 mod tests {
     use super::*;
 
+    #[test]
+    fn retention_scope_is_stable_and_separates_relay_and_owner() {
+        let base = Path::new("/tmp/buzz-retention-test");
+        let owner_a = "a".repeat(64);
+        let owner_b = "b".repeat(64);
+        let community_a = scoped_retention_db_path(base, "wss://a.example/", &owner_a);
+        assert_eq!(
+            community_a,
+            scoped_retention_db_path(base, "wss://a.example", &owner_a)
+        );
+        assert_ne!(
+            community_a,
+            scoped_retention_db_path(base, "wss://b.example", &owner_a)
+        );
+        assert_ne!(
+            community_a,
+            scoped_retention_db_path(base, "wss://a.example", &owner_b)
+        );
+    }
+
+    #[test]
+    fn test_arrival_relay_matching_agrees_with_database_identity() {
+        let base = Path::new("/tmp/buzz-retention-test");
+        let keys = nostr::Keys::generate();
+        let owner = keys.public_key().to_hex();
+        let scope = |relay: &str| RetentionScope {
+            db_path: scoped_retention_db_path(base, relay, &owner),
+            relay_url: relay.to_string(),
+            owner_keys: keys.clone(),
+        };
+        let community_a = scoped_retention_db_path(base, "wss://a.example", &owner);
+
+        // "Same relay" and "same database" must never disagree: every URL the
+        // match accepts has to hash to the scope's own db path, and every URL it
+        // rejects has to hash somewhere else.
+        for equivalent in ["wss://a.example", "wss://a.example/", " wss://a.example "] {
+            assert_eq!(
+                scope_for_arrival(scope("wss://a.example"), equivalent).map(|scope| scope.db_path),
+                Some(community_a.clone()),
+                "{equivalent}"
+            );
+            assert_eq!(
+                scoped_retention_db_path(base, equivalent, &owner),
+                community_a,
+                "{equivalent}"
+            );
+        }
+
+        assert!(
+            scope_for_arrival(scope("wss://b.example"), "wss://a.example").is_none(),
+            "an event from community A must not be filed while community B is active"
+        );
+        assert_ne!(
+            scoped_retention_db_path(base, "wss://b.example", &owner),
+            community_a
+        );
+    }
+
     #[test]
     fn concurrent_open_waits_for_initialization_lock() {
         let dir = tempfile::tempdir().unwrap();
diff --git a/desktop/src-tauri/src/managed_agents/retention/legacy_migration.rs b/desktop/src-tauri/src/managed_agents/retention/legacy_migration.rs
new file mode 100644
index 0000000000..1975f5d6df
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/retention/legacy_migration.rs
@@ -0,0 +1,212 @@
+//! One-time migration of the pre-scoping global retention database into the
+//! active relay+owner scope.
+//!
+//! Before community scoping, every durable event lived in one
+//! `<managed-agents-base>/retention.db`. Scoped storage
+//! ([`super::scoped_retention_db_path`]) reads a different file, so an upgrade
+//! would otherwise abandon whatever the previous release left pending —
+//! including signed kind:5 tombstones and NIP-IA archive requests queued while
+//! offline, which no reconcile can reconstruct (boot reconcile rebuilds upserts
+//! from records still on disk, and deletions have no reconcile at all).
+//!
+//! # Crash safety
+//!
+//! Two guards, each written transactionally, make the migration exactly-once
+//! without a completion file:
+//!
+//! 1. A **claim** in the legacy database naming the scope that owns its rows.
+//!    Legacy rows were queued for whichever single relay the old build had
+//!    active, so exactly one scope may take them; every other scope skips. This
+//!    is what keeps the migration from fanning one community's pending events
+//!    out to all of them — the leak class scoping exists to close.
+//! 2. A **marker** in the scoped database, committed in the same transaction as
+//!    the copied rows. A crash mid-copy therefore leaves neither rows nor
+//!    marker, and the next boot copies from scratch; once the marker is there
+//!    the copy never repeats.
+//!
+//! The relay dimension is not recoverable from the legacy file — only the owner
+//! pubkey is — so the claiming scope is the first one this owner activates after
+//! upgrading. That is the workspace the app restores at launch, i.e. the same
+//! relay the stranded rows were queued for in all but a contrived
+//! switch-before-first-flush case.
+
+use std::path::{Path, PathBuf};
+
+use rusqlite::{params, Connection, OptionalExtension};
+
+use super::{open_retention_db, RetainedEvent};
+
+/// Marker/claim identifier for this migration.
+const MIGRATION_NAME: &str = "legacy_global_retention_db";
+
+/// The pre-scoping global retention database path.
+pub fn legacy_retention_db_path(base_dir: &Path) -> PathBuf {
+    base_dir.join("retention.db")
+}
+
+/// Copy the legacy global database's rows for `owner_pubkey` into the scoped
+/// database at `scope_db_path`.
+///
+/// Returns the number of rows copied — `0` both when there is nothing to do and
+/// when another scope already claimed the legacy rows. Best-effort by design:
+/// the caller logs a failure and proceeds, and the guards make a later retry
+/// safe.
+pub fn migrate_legacy_retention_db(
+    base_dir: &Path,
+    scope_db_path: &Path,
+    owner_pubkey: &str,
+) -> Result<usize, String> {
+    let legacy_path = legacy_retention_db_path(base_dir);
+    if !legacy_path.exists() || legacy_path == scope_db_path {
+        return Ok(0);
+    }
+
+    let scope_id = scope_identifier(scope_db_path);
+    let mut scope_conn = open_retention_db(scope_db_path)?;
+    if migration_marker_present(&scope_conn)? {
+        return Ok(0);
+    }
+
+    let legacy_conn = open_retention_db(&legacy_path)?;
+    if !claim_legacy_rows(&legacy_conn, &scope_id)? {
+        return Ok(0); // another scope owns these rows
+    }
+
+    let rows = legacy_rows_for_owner(&legacy_conn, owner_pubkey)?;
+    let copied = rows.len();
+
+    let transaction = scope_conn
+        .transaction()
+        .map_err(|e| format!("failed to open retention migration transaction: {e}"))?;
+    for row in &rows {
+        // The scoped database is authoritative for any coordinate it already
+        // holds: those rows were written after the upgrade, so they are newer
+        // than anything legacy by construction. Legacy rows only fill gaps.
+        transaction
+            .execute(
+                "INSERT INTO persona_events
+                    (kind, pubkey, d_tag, content, created_at, raw_event, pending_sync)
+                 VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)
+                 ON CONFLICT (kind, pubkey, d_tag) DO NOTHING",
+                params![
+                    row.kind,
+                    row.pubkey,
+                    row.d_tag,
+                    row.content,
+                    row.created_at,
+                    row.raw_event,
+                    row.pending_sync as i32,
+                ],
+            )
+            .map_err(|e| format!("failed to copy legacy retained event: {e}"))?;
+    }
+    write_migration_marker(&transaction, &scope_id)?;
+    transaction
+        .commit()
+        .map_err(|e| format!("failed to commit retention migration: {e}"))?;
+
+    Ok(copied)
+}
+
+/// Read every retained row authored by `owner_pubkey` from the legacy database.
+///
+/// Owner-filtered because the flush loop only publishes rows matching the
+/// active owner anyway; a different identity's rows belong to that identity's
+/// scope, not this one.
+fn legacy_rows_for_owner(
+    conn: &Connection,
+    owner_pubkey: &str,
+) -> Result<Vec<RetainedEvent>, String> {
+    let mut stmt = conn
+        .prepare(
+            "SELECT kind, pubkey, d_tag, content, created_at, raw_event, pending_sync
+             FROM persona_events
+             WHERE pubkey = ?1
+             ORDER BY (kind != 5), created_at ASC",
+        )
+        .map_err(|e| format!("failed to prepare legacy retention query: {e}"))?;
+
+    let rows = stmt
+        .query_map(params![owner_pubkey], |row| {
+            Ok(RetainedEvent {
+                kind: row.get(0)?,
+                pubkey: row.get(1)?,
+                d_tag: row.get(2)?,
+                content: row.get(3)?,
+                created_at: row.get(4)?,
+                raw_event: row.get(5)?,
+                pending_sync: row.get::<_, i32>(6)? != 0,
+            })
+        })
+        .map_err(|e| format!("failed to query legacy retained events: {e}"))?;
+
+    rows.collect::<Result<Vec<_>, _>>()
+        .map_err(|e| format!("failed to read legacy retained row: {e}"))
+}
+
+/// Identify a scope by its database file stem — the relay+owner hash
+/// [`super::scoped_retention_db_path`] already computes.
+fn scope_identifier(scope_db_path: &Path) -> String {
+    scope_db_path
+        .file_stem()
+        .map(|stem| stem.to_string_lossy().to_string())
+        .unwrap_or_default()
+}
+
+fn ensure_migration_table(conn: &Connection) -> Result<(), String> {
+    conn.execute_batch(
+        "CREATE TABLE IF NOT EXISTS retention_migrations (
+            name TEXT PRIMARY KEY,
+            scope_id TEXT NOT NULL
+        );",
+    )
+    .map_err(|e| format!("failed to create retention migration table: {e}"))
+}
+
+fn migration_marker_present(conn: &Connection) -> Result<bool, String> {
+    ensure_migration_table(conn)?;
+    conn.query_row(
+        "SELECT EXISTS(SELECT 1 FROM retention_migrations WHERE name = ?1)",
+        params![MIGRATION_NAME],
+        |row| row.get(0),
+    )
+    .map_err(|e| format!("failed to read retention migration marker: {e}"))
+}
+
+fn write_migration_marker(conn: &Connection, scope_id: &str) -> Result<(), String> {
+    ensure_migration_table(conn)?;
+    conn.execute(
+        "INSERT OR REPLACE INTO retention_migrations (name, scope_id) VALUES (?1, ?2)",
+        params![MIGRATION_NAME, scope_id],
+    )
+    .map_err(|e| format!("failed to write retention migration marker: {e}"))?;
+    Ok(())
+}
+
+/// Record `scope_id` as the owner of the legacy rows, or confirm it already is.
+///
+/// `INSERT OR IGNORE` then read-back is atomic enough for this purpose: the
+/// loser of a race reads the winner's scope id and returns `false`.
+fn claim_legacy_rows(legacy_conn: &Connection, scope_id: &str) -> Result<bool, String> {
+    ensure_migration_table(legacy_conn)?;
+    legacy_conn
+        .execute(
+            "INSERT OR IGNORE INTO retention_migrations (name, scope_id) VALUES (?1, ?2)",
+            params![MIGRATION_NAME, scope_id],
+        )
+        .map_err(|e| format!("failed to claim legacy retention rows: {e}"))?;
+
+    let claimed_by: Option<String> = legacy_conn
+        .query_row(
+            "SELECT scope_id FROM retention_migrations WHERE name = ?1",
+            params![MIGRATION_NAME],
+            |row| row.get(0),
+        )
+        .optional()
+        .map_err(|e| format!("failed to read legacy retention claim: {e}"))?;
+
+    Ok(claimed_by.as_deref() == Some(scope_id))
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/desktop/src-tauri/src/managed_agents/retention/legacy_migration/tests.rs b/desktop/src-tauri/src/managed_agents/retention/legacy_migration/tests.rs
new file mode 100644
index 0000000000..75da221320
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/retention/legacy_migration/tests.rs
@@ -0,0 +1,186 @@
+use super::*;
+use crate::managed_agents::retention::{
+    get_pending_sync, get_retained_event, retain_event, scoped_retention_db_path,
+    tombstone_retention_d_tag,
+};
+use buzz_core_pkg::kind::KIND_PERSONA;
+
+const KIND_DELETE: u32 = 5;
+const OWNER: &str = "a1b2c3";
+
+fn pending_tombstone(d_tag: &str) -> RetainedEvent {
+    RetainedEvent {
+        kind: KIND_DELETE,
+        pubkey: OWNER.to_string(),
+        d_tag: tombstone_retention_d_tag(KIND_PERSONA, d_tag),
+        content: String::new(),
+        created_at: 1_700_000_000,
+        raw_event: format!(r#"{{"kind":5,"d":"{d_tag}"}}"#),
+        pending_sync: true,
+    }
+}
+
+fn seed_legacy(base_dir: &Path, events: &[RetainedEvent]) {
+    let conn = open_retention_db(&legacy_retention_db_path(base_dir)).unwrap();
+    for event in events {
+        retain_event(&conn, event).unwrap();
+    }
+}
+
+fn scope_path(base_dir: &Path, relay: &str) -> PathBuf {
+    let path = scoped_retention_db_path(base_dir, relay, OWNER);
+    std::fs::create_dir_all(path.parent().unwrap()).unwrap();
+    path
+}
+
+#[test]
+fn test_pending_legacy_tombstone_migrates_into_the_active_scope_and_stays_pending() {
+    let dir = tempfile::tempdir().unwrap();
+    seed_legacy(dir.path(), &[pending_tombstone("retired-agent")]);
+    let scope = scope_path(dir.path(), "wss://a.example");
+
+    let copied = migrate_legacy_retention_db(dir.path(), &scope, OWNER).unwrap();
+
+    assert_eq!(copied, 1);
+    let conn = open_retention_db(&scope).unwrap();
+    let migrated = get_retained_event(
+        &conn,
+        KIND_DELETE,
+        OWNER,
+        &tombstone_retention_d_tag(KIND_PERSONA, "retired-agent"),
+    )
+    .unwrap()
+    .expect("legacy tombstone lands in the scoped db");
+    assert!(
+        migrated.pending_sync,
+        "the tombstone must still be queued for the flush loop"
+    );
+    assert_eq!(
+        migrated.raw_event,
+        pending_tombstone("retired-agent").raw_event
+    );
+    assert_eq!(get_pending_sync(&conn).unwrap().len(), 1);
+}
+
+#[test]
+fn test_repeat_migration_of_the_same_scope_copies_nothing_further() {
+    let dir = tempfile::tempdir().unwrap();
+    seed_legacy(dir.path(), &[pending_tombstone("retired-agent")]);
+    let scope = scope_path(dir.path(), "wss://a.example");
+
+    assert_eq!(
+        migrate_legacy_retention_db(dir.path(), &scope, OWNER).unwrap(),
+        1
+    );
+
+    // Simulate the flush loop clearing the row, then boot again: the marker
+    // must stop the legacy row from being resurrected as pending.
+    let conn = open_retention_db(&scope).unwrap();
+    conn.execute("UPDATE persona_events SET pending_sync = 0", [])
+        .unwrap();
+    drop(conn);
+
+    assert_eq!(
+        migrate_legacy_retention_db(dir.path(), &scope, OWNER).unwrap(),
+        0
+    );
+    let conn = open_retention_db(&scope).unwrap();
+    assert!(
+        get_pending_sync(&conn).unwrap().is_empty(),
+        "a published row must not be re-queued by a second migration pass"
+    );
+}
+
+#[test]
+fn test_second_community_does_not_receive_another_communitys_legacy_rows() {
+    let dir = tempfile::tempdir().unwrap();
+    seed_legacy(dir.path(), &[pending_tombstone("retired-agent")]);
+    let first = scope_path(dir.path(), "wss://a.example");
+    let second = scope_path(dir.path(), "wss://b.example");
+
+    assert_eq!(
+        migrate_legacy_retention_db(dir.path(), &first, OWNER).unwrap(),
+        1
+    );
+    assert_eq!(
+        migrate_legacy_retention_db(dir.path(), &second, OWNER).unwrap(),
+        0,
+        "legacy rows belong to exactly one relay scope"
+    );
+
+    let conn = open_retention_db(&second).unwrap();
+    assert!(get_pending_sync(&conn).unwrap().is_empty());
+}
+
+#[test]
+fn test_rows_authored_by_another_identity_are_left_behind() {
+    let dir = tempfile::tempdir().unwrap();
+    let mut foreign = pending_tombstone("someone-elses");
+    foreign.pubkey = "ffffff".to_string();
+    seed_legacy(dir.path(), &[pending_tombstone("mine"), foreign]);
+    let scope = scope_path(dir.path(), "wss://a.example");
+
+    assert_eq!(
+        migrate_legacy_retention_db(dir.path(), &scope, OWNER).unwrap(),
+        1
+    );
+
+    let conn = open_retention_db(&scope).unwrap();
+    let pending = get_pending_sync(&conn).unwrap();
+    assert_eq!(pending.len(), 1);
+    assert_eq!(pending[0].pubkey, OWNER);
+}
+
+#[test]
+fn test_post_upgrade_scoped_row_is_not_overwritten_by_its_legacy_ancestor() {
+    let dir = tempfile::tempdir().unwrap();
+    let legacy_head = RetainedEvent {
+        kind: KIND_PERSONA,
+        pubkey: OWNER.to_string(),
+        d_tag: "reviewer".to_string(),
+        content: r#"{"display_name":"Old"}"#.to_string(),
+        created_at: 1_700_000_000,
+        raw_event: r#"{"content":"old"}"#.to_string(),
+        pending_sync: true,
+    };
+    seed_legacy(dir.path(), &[legacy_head]);
+    let scope = scope_path(dir.path(), "wss://a.example");
+
+    // An edit made after the upgrade already occupies the coordinate.
+    let conn = open_retention_db(&scope).unwrap();
+    retain_event(
+        &conn,
+        &RetainedEvent {
+            kind: KIND_PERSONA,
+            pubkey: OWNER.to_string(),
+            d_tag: "reviewer".to_string(),
+            content: r#"{"display_name":"New"}"#.to_string(),
+            created_at: 1_700_000_500,
+            raw_event: r#"{"content":"new"}"#.to_string(),
+            pending_sync: true,
+        },
+    )
+    .unwrap();
+    drop(conn);
+
+    migrate_legacy_retention_db(dir.path(), &scope, OWNER).unwrap();
+
+    let conn = open_retention_db(&scope).unwrap();
+    let row = get_retained_event(&conn, KIND_PERSONA, OWNER, "reviewer")
+        .unwrap()
+        .unwrap();
+    assert_eq!(row.created_at, 1_700_000_500);
+    assert_eq!(row.raw_event, r#"{"content":"new"}"#);
+}
+
+#[test]
+fn test_absent_legacy_database_is_a_no_op() {
+    let dir = tempfile::tempdir().unwrap();
+    let scope = scope_path(dir.path(), "wss://a.example");
+
+    assert_eq!(
+        migrate_legacy_retention_db(dir.path(), &scope, OWNER).unwrap(),
+        0
+    );
+    assert!(!legacy_retention_db_path(dir.path()).exists());
+}
diff --git a/desktop/src-tauri/src/managed_agents/runtime.rs b/desktop/src-tauri/src/managed_agents/runtime.rs
index 6687cbbcf2..f3b4cb67fd 100644
--- a/desktop/src-tauri/src/managed_agents/runtime.rs
+++ b/desktop/src-tauri/src/managed_agents/runtime.rs
@@ -20,6 +20,12 @@ pub(crate) use path::compose_path_entries;
 pub(crate) use path::should_skip_claude_executable;
 pub(crate) use path::should_use_inherited;
 
+mod metadata;
+pub(crate) use metadata::{
+    resolve_effective_prompt_model_provider, resolve_session_title, runtime_metadata_env_vars,
+    SESSION_TITLE_ENV_VAR,
+};
+
 mod stop;
 pub(crate) use stop::managed_agent_runtime_keys;
 pub use stop::{stop_managed_agent_process, stop_managed_agent_workspace_pair};
@@ -29,1287 +35,40 @@ pub(crate) use sweep::sweep_untracked_bundle_harnesses;
 
 type RespondToEnv = (Vec<(&'static str, String)>, Vec<&'static str>);
 
-/// Binary name fragments for all known agent/harness processes that Buzz
-/// may spawn. Used by `process_belongs_to_us()` and the orphan sweep to
-/// identify processes we should clean up. Both hyphenated and underscored
-/// variants are listed because macOS `proc_name()` and Linux `/proc/comm`
-/// may report either form depending on how the binary was built.
-pub(crate) const KNOWN_AGENT_BINARIES: &[&str] = &[
-    "buzz-acp",
-    "buzz_acp",
-    "buzz-agent",
-    "buzz_agent",
-    "claude-agent-acp",
-    "claude_agent_acp",
-    "claude-code-acp",
-    "claude_code_acp",
-    "codex-acp",
-    "codex_acp",
-    "goose",
-    // buzz-dev-mcp's multicall personalities (rg, tree, buzz,
-    // git-credential-nostr, git-sign-nostr) are short-lived per-tool-call
-    // invocations — not listed here.
-    "buzz-dev-mcp",
-    "buzz_dev_mcp",
-];
-
-/// Script interpreters that may host managed agent wrappers (e.g. npm shims).
-/// A process whose name matches here is NOT immediately claimed — it must also
-/// carry `BUZZ_MANAGED_AGENT` in its environment (checked by the caller via
-/// `process_has_buzz_marker()`). This avoids sweeping unrelated node processes.
-pub(crate) const KNOWN_SCRIPT_INTERPRETERS: &[&str] = &["node"];
-
-/// Check if a process name matches any of our known agent binaries.
-/// Uses exact match or prefix-with-separator to avoid false positives
-/// (e.g. `"goose"` must not match `"mongoose"`).
-fn name_matches_known_binary(name: &str) -> bool {
-    KNOWN_AGENT_BINARIES.iter().any(|&binary| {
-        name == binary || {
-            name.starts_with(binary) && {
-                let rest = &name[binary.len()..];
-                rest.starts_with('-') || rest.starts_with('_') || rest.starts_with('.')
-            }
-        }
-    })
-}
-
-/// Check if a process name is a known script interpreter that may be hosting
-/// a managed agent wrapper (e.g. `node` running an npm shim for `codex-acp`).
-/// Callers must additionally verify `BUZZ_MANAGED_AGENT` ownership.
-fn name_matches_interpreter(name: &str) -> bool {
-    KNOWN_SCRIPT_INTERPRETERS.contains(&name)
-}
+mod process;
+#[cfg(test)]
+use process::{
+    buzz_marker_entry, name_matches_interpreter, name_matches_known_binary,
+    terminate_runtime_receipt_with, valid_agent_runtime_receipt_with,
+};
+pub(crate) use process::{
+    current_instance_id, process_belongs_to_us, process_has_buzz_marker, process_is_running,
+    terminate_process, terminate_untracked_pair_runtime, valid_agent_runtime_receipt,
+};
 
+mod orphan_sweep;
+#[cfg(target_os = "macos")]
+use orphan_sweep::proc_pidinfo;
+pub(crate) use orphan_sweep::{
+    sweep_orphaned_agent_processes, sweep_system_agent_processes,
+    sweep_system_agent_processes_with_grace,
+};
+#[cfg(target_os = "macos")]
+use orphan_sweep::{BSDInfo, PROC_PIDTBSDINFO};
 #[cfg(unix)]
-pub(crate) fn process_is_running(pid: u32) -> bool {
-    // Use libc::kill with signal 0 instead of forking a subprocess.
-    // Returns true only if the process exists AND we can signal it.
-    // Returns false for non-existent PIDs (ESRCH) and PIDs owned by
-    // other users (EPERM) — callers should not interact with those.
-    unsafe { libc::kill(pid as i32, 0) == 0 }
-}
+use process::resolve_pgids_and_kill;
 
-#[cfg(not(unix))]
-pub(crate) fn process_is_running(_pid: u32) -> bool {
-    false
-}
-
-/// Check if a PID belongs to a known agent process we spawned.
-/// Returns false for recycled PIDs that now belong to other processes.
-#[cfg(target_os = "macos")]
-pub(crate) fn process_belongs_to_us(pid: u32) -> bool {
-    // Use proc_name() from libproc to get the process name without spawning
-    // a subprocess.
-    extern "C" {
-        fn proc_name(pid: libc::c_int, buffer: *mut libc::c_void, buffersize: u32) -> libc::c_int;
-    }
-    let mut buf = [0u8; 1024];
-    let len = unsafe {
-        proc_name(
-            pid as i32,
-            buf.as_mut_ptr() as *mut libc::c_void,
-            buf.len() as u32,
-        )
-    };
-    if len <= 0 {
-        return false;
-    }
-    let name = String::from_utf8_lossy(&buf[..len as usize]);
-    // Fall through for script interpreters (e.g. `node` hosting an npm shim):
-    // the caller's `process_has_buzz_marker()` check decides true ownership.
-    name_matches_known_binary(&name) || name_matches_interpreter(&name)
-}
-
-#[cfg(all(unix, not(target_os = "macos")))]
-pub(crate) fn process_belongs_to_us(pid: u32) -> bool {
-    // First try /proc/<pid>/comm. Note: comm is truncated to 15 bytes on Linux,
-    // so binaries with names longer than 15 chars (e.g. "claude-agent-acp")
-    // will never match here.
-    if let Ok(name) = std::fs::read_to_string(format!("/proc/{pid}/comm")) {
-        if name_matches_known_binary(name.trim()) {
-            return true;
-        }
-        // Interpreter check: `node` is 4 bytes, never truncated.
-        if name_matches_interpreter(name.trim()) {
-            return true;
-        }
-    }
-
-    // Fallback: read /proc/<pid>/exe which is a symlink to the full binary path.
-    // This is not subject to the 15-byte truncation limit.
-    if let Ok(exe_path) = std::fs::read_link(format!("/proc/{pid}/exe")) {
-        if let Some(basename) = exe_path.file_name().and_then(|n| n.to_str()) {
-            // Fall through for script interpreters — caller checks the marker.
-            return name_matches_known_binary(basename) || name_matches_interpreter(basename);
-        }
-    }
-
-    false
-}
-
-#[cfg(not(unix))]
-pub(crate) fn process_belongs_to_us(_pid: u32) -> bool {
-    false
-}
-
-/// The value stamped into the `BUZZ_MANAGED_AGENT` env var of every agent we
-/// spawn, identifying *which* desktop instance owns it. We use the app's bundle
-/// identifier (`xyz.block.buzz.app` for release, `xyz.block.buzz.app.dev`
-/// for `just dev`) because it is stable across restarts — a relaunched dev
-/// instance still recognizes its own previously-spawned agents as reclaimable,
-/// while never matching another instance's (e.g. a dev build never reaps a DMG
-/// build's agents, and vice versa). This is what lets two Buzzs coexist on
-/// one machine without one's cleanup nuking the other's agents.
-pub(crate) fn current_instance_id(app: &AppHandle) -> String {
-    app.config().identifier.clone()
-}
-
-/// Build the full `BUZZ_MANAGED_AGENT=<instance-id>` env entry we match
-/// against when scanning processes. Kept here so the spawn stamp and the sweep
-/// matcher can never drift apart.
-fn buzz_marker_entry(instance_id: &str) -> Vec<u8> {
-    format!("BUZZ_MANAGED_AGENT={instance_id}").into_bytes()
-}
-
-/// Check if a running process is one of *our* managed agents: it must carry
-/// `BUZZ_MANAGED_AGENT=<instance_id>` in its environment, where `instance_id`
-/// is this desktop instance's id. A process stamped with a *different* instance
-/// id belongs to another live Buzz app and must never be reaped here.
-#[cfg(target_os = "macos")]
-pub(crate) fn process_has_buzz_marker(pid: u32, instance_id: &str) -> bool {
-    let marker = buzz_marker_entry(instance_id);
-    let Some(buf) = sweep::procargs2_buffer(pid) else {
-        return false;
-    };
-
-    // Buffer layout: [i32 argc][exec_path\0][null padding][argv\0...][env\0...]
-    if buf.len() < std::mem::size_of::<libc::c_int>() {
-        return false;
-    }
-    let mut n_args: libc::c_int = 0;
-    unsafe {
-        std::ptr::copy_nonoverlapping(
-            buf.as_ptr(),
-            &mut n_args as *mut libc::c_int as *mut u8,
-            std::mem::size_of::<libc::c_int>(),
-        );
-    }
-    let mut pos = std::mem::size_of::<libc::c_int>();
-
-    // Skip exec path (scan to first null).
-    while pos < buf.len() && buf[pos] != 0 {
-        pos += 1;
-    }
-    // Skip null padding between exec path and argv[0].
-    while pos < buf.len() && buf[pos] == 0 {
-        pos += 1;
-    }
-    // Skip argc argument strings.
-    let mut args_remaining = n_args;
-    while args_remaining > 0 && pos < buf.len() {
-        while pos < buf.len() && buf[pos] != 0 {
-            pos += 1;
-        }
-        while pos < buf.len() && buf[pos] == 0 {
-            pos += 1;
-        }
-        args_remaining -= 1;
-    }
-    // Remaining bytes are null-delimited environment strings.
-    buf[pos..].split(|&b| b == 0).any(|entry| entry == marker)
-}
-
-#[cfg(all(unix, not(target_os = "macos")))]
-pub(crate) fn process_has_buzz_marker(pid: u32, instance_id: &str) -> bool {
-    let marker = buzz_marker_entry(instance_id);
-    let Ok(data) = std::fs::read(format!("/proc/{pid}/environ")) else {
-        return false;
-    };
-    data.split(|&b| b == 0).any(|entry| entry == marker)
-}
-
-#[cfg(not(unix))]
-pub(crate) fn process_has_buzz_marker(_pid: u32, _instance_id: &str) -> bool {
-    false
-}
-
-#[cfg(unix)]
-fn signal_process_group_or_leader(pid: u32, signal: i32, action: &str) -> Result<(), String> {
-    let pgid = -(pid as i32);
-
-    if unsafe { libc::kill(pgid, signal) } == 0 {
-        return Ok(());
-    }
-
-    let group_err = std::io::Error::last_os_error();
-    if !process_is_running(pid) {
-        return Ok(());
-    }
-
-    // Some local agent trees can no longer be signalled as a process group
-    // (for example if the leader changed groups, or macOS returns EPERM for one
-    // descendant). Fall back to the leader PID so stop/delete can still recover.
-    if matches!(
-        group_err.raw_os_error(),
-        Some(libc::EPERM) | Some(libc::ESRCH)
-    ) {
-        if unsafe { libc::kill(pid as i32, signal) } == 0 {
-            return Ok(());
-        }
-
-        let leader_err = std::io::Error::last_os_error();
-        if leader_err.raw_os_error() == Some(libc::ESRCH) || !process_is_running(pid) {
-            return Ok(());
-        }
-
-        return Err(format!("failed to {action} process {pid}: {leader_err}"));
-    }
-
-    Err(format!(
-        "failed to {action} process group {pid}: {group_err}"
-    ))
-}
-
-#[cfg(unix)]
-pub(crate) fn terminate_process(pid: u32) -> Result<(), String> {
-    // Try graceful shutdown first (SIGTERM to the group).
-    signal_process_group_or_leader(pid, libc::SIGTERM, "terminate")?;
-
-    // Wait up to 1s for graceful exit.
-    for _ in 0..10 {
-        if !process_is_running(pid) {
-            return Ok(());
-        }
-        std::thread::sleep(std::time::Duration::from_millis(100));
-    }
-
-    // Escalate to SIGKILL on the entire group.
-    signal_process_group_or_leader(pid, libc::SIGKILL, "kill")?;
-
-    Ok(())
-}
-
-#[cfg(windows)]
-pub(crate) fn terminate_process(pid: u32) -> Result<(), String> {
-    // No job handle is available on this path (e.g. after an app restart, when
-    // we only recovered the PID from the record), so fall back to taskkill on
-    // the whole tree.
-    super::process_lifecycle::taskkill_tree(pid)
-}
-
-#[cfg(not(any(unix, windows)))]
-pub(crate) fn terminate_process(_pid: u32) -> Result<(), String> {
-    Err("managed agent shutdown after app restart is not supported on this platform".to_string())
-}
-
-/// Send SIGTERM to all given PIDs (as process groups), wait, then SIGKILL
-/// any survivors. Uses `-pid` to kill the entire process group — if an
-/// orphaned agent called `setsid()`, it IS the group leader, so this
-/// reaches its children too.
-#[cfg(unix)]
-fn sigterm_then_sigkill(pids: &[i32]) {
-    // Send SIGTERM to each process group. Track whether any signal was
-    // actually delivered so we can skip the sleep when everything is
-    // already gone.
-    let mut any_signalled = false;
-    for &pid in pids {
-        if unsafe { libc::kill(-pid, libc::SIGTERM) } == 0 {
-            any_signalled = true;
-        }
-    }
-
-    if !any_signalled {
-        return;
-    }
-
-    std::thread::sleep(std::time::Duration::from_millis(200));
-
-    for &pid in pids {
-        // Check if the group has any living members, not just the leader.
-        // kill(-pid, 0) returns 0 if ANY member of the group is signalable.
-        if unsafe { libc::kill(-pid, 0) } == 0 {
-            unsafe {
-                libc::kill(-pid, libc::SIGKILL);
-            }
-        }
-    }
-}
-
-/// Resolve orphan candidate PIDs to their actual process group IDs, dedupe,
-/// and signal the groups. An orphaned grandchild (e.g. `goose` or `buzz-dev-mcp`)
-/// whose harness has exited retains the harness's PGID — signaling that PGID
-/// kills the entire orphaned subtree. Falls back to the candidate PID itself
-/// when PGID resolution fails (process may have exited between detection and
-/// kill).
-#[cfg(target_os = "macos")]
-fn resolve_pgids_and_kill(candidate_pids: &[i32]) {
-    let candidate_set: std::collections::HashSet<i32> = candidate_pids.iter().copied().collect();
-    let mut pgids = std::collections::HashSet::new();
-    for &pid in candidate_pids {
-        let pgid = unsafe { libc::getpgid(pid) };
-        if pgid > 0 {
-            pgids.insert(pgid);
-        } else {
-            // Process may have exited; try signaling it directly as a group.
-            pgids.insert(pid);
-        }
-    }
-    // PID-recycling guard: if a resolved PGID is alive but isn't one of our
-    // orphan candidates, the old harness PID was recycled by a new process
-    // that called setsid() — skip it to avoid killing an unrelated group.
-    let candidate_groups = pgids.len();
-    pgids.retain(|&pgid| {
-        if candidate_set.contains(&pgid) {
-            return true;
-        }
-        let alive = unsafe { libc::kill(pgid, 0) } == 0;
-        !alive
-    });
-    if pgids.is_empty() && candidate_groups > 0 {
-        eprintln!(
-            "buzz-desktop: orphan sweep: skipped all {candidate_groups} candidate group(s) (live foreign group leader or candidate already exited); nothing signalled"
-        );
-    }
-    let unique: Vec<i32> = pgids.into_iter().collect();
-    sigterm_then_sigkill(&unique);
-}
-
-/// Resolve orphan candidate PIDs to their actual process group IDs, dedupe,
-/// and signal the groups. Linux variant reads PGID from /proc/<pid>/stat.
-#[cfg(all(unix, not(target_os = "macos")))]
-fn resolve_pgids_and_kill(candidate_pids: &[i32]) {
-    let candidate_set: std::collections::HashSet<i32> = candidate_pids.iter().copied().collect();
-    let mut pgids = std::collections::HashSet::new();
-    for &pid in candidate_pids {
-        if let Some(pgid) = read_pgid_linux(pid as u32) {
-            pgids.insert(pgid as i32);
-        } else {
-            // Process may have exited; try signaling it directly as a group.
-            pgids.insert(pid);
-        }
-    }
-    // PID-recycling guard: if a resolved PGID is alive but isn't one of our
-    // orphan candidates, the old harness PID was recycled by a new process
-    // that called setsid() — skip it to avoid killing an unrelated group.
-    let candidate_groups = pgids.len();
-    pgids.retain(|&pgid| {
-        if candidate_set.contains(&pgid) {
-            return true;
-        }
-        let alive = unsafe { libc::kill(pgid, 0) } == 0;
-        !alive
-    });
-    if pgids.is_empty() && candidate_groups > 0 {
-        eprintln!(
-            "buzz-desktop: orphan sweep: skipped all {candidate_groups} candidate group(s) (live foreign group leader or candidate already exited); nothing signalled"
-        );
-    }
-    let unique: Vec<i32> = pgids.into_iter().collect();
-    sigterm_then_sigkill(&unique);
-}
-
-pub(crate) fn valid_agent_runtime_receipt(
-    path: &std::path::Path,
-    receipt: &super::ManagedAgentRuntimeReceipt,
-    instance_id: &str,
-) -> bool {
-    let Ok(canonical) =
-        ManagedAgentRuntimeKey::new(receipt.key.pubkey.clone(), &receipt.key.relay_url)
-    else {
-        return false;
-    };
-    canonical == receipt.key
-        && path.file_name().and_then(|name| name.to_str())
-            == Some(&format!("{}.json", receipt.key.runtime_id()))
-        && receipt.desktop_instance_id == instance_id
-        && process_is_running(receipt.pid)
-        && process_belongs_to_us(receipt.pid)
-        && process_has_buzz_marker(receipt.pid, &receipt.desktop_instance_id)
-}
-
-fn terminate_runtime_receipt_with(
-    path: &std::path::Path,
-    receipt: &super::ManagedAgentRuntimeReceipt,
-    terminate: impl FnOnce(u32) -> Result<(), String>,
-    mut is_running: impl FnMut(u32) -> bool,
-    remove: impl FnOnce(&std::path::Path),
-) -> Result<(), String> {
-    terminate(receipt.pid)?;
-    for _ in 0..20 {
-        if !is_running(receipt.pid) {
-            remove(path);
-            return Ok(());
-        }
-        std::thread::sleep(std::time::Duration::from_millis(100));
-    }
-    Err(format!(
-        "prior runtime {} for pair {} on {} did not exit",
-        receipt.pid, receipt.key.pubkey, receipt.key.relay_url
-    ))
-}
-
-/// Replace a valid prior-session process before registering a new child for
-/// the same pair. The caller must hold the runtime transition lock so receipt
-/// inspection, termination, spawn, and registration cannot race shutdown or
-/// another start.
-pub(crate) fn terminate_untracked_pair_runtime(
-    app: &AppHandle,
-    key: &ManagedAgentRuntimeKey,
-) -> Result<(), String> {
-    let instance_id = current_instance_id(app);
-    let Some((path, receipt)) = super::read_all_agent_runtime_receipts(app)
-        .into_iter()
-        .find(|(path, receipt)| {
-            receipt.key == *key && valid_agent_runtime_receipt(path, receipt, &instance_id)
-        })
-    else {
-        return Ok(());
-    };
-
-    terminate_runtime_receipt_with(
-        &path,
-        &receipt,
-        terminate_process,
-        process_is_running,
-        super::remove_agent_runtime_receipt_path,
-    )
-}
-
-/// Kill orphaned agent processes using PID file receipts. Reads all files from
-/// `agent-pids/`, verifies each PID still belongs to a known agent binary,
-/// then resolves each candidate's actual PGID and signals the process group.
-/// Deletes the PID file after killing.
-///
-/// `skip_pids` are PIDs already handled by the tracked-agent path.
-#[cfg(unix)]
-pub(crate) fn sweep_orphaned_agent_processes(app: &AppHandle, skip_pids: &[u32]) {
-    let legacy_entries = super::read_all_agent_pid_files(app);
-    let instance_id = current_instance_id(app);
-    let receipt_entries: Vec<_> = super::read_all_agent_runtime_receipts(app)
-        .into_iter()
-        .filter_map(|(path, receipt)| {
-            if valid_agent_runtime_receipt(&path, &receipt, &instance_id) {
-                Some((path, receipt))
-            } else {
-                super::remove_agent_runtime_receipt_path(&path);
-                None
-            }
-        })
-        .collect();
-    // Collect live orphans AND dead-leader groups into a single kill batch.
-    // Dead leaders: PGID may have been recycled, but the window is narrow
-    // (PID files are from this session) and the cost of missing surviving
-    // group members outweighs the recycling risk.
-    let targets: Vec<i32> = legacy_entries
-        .iter()
-        .map(|(_, pid)| *pid)
-        .chain(receipt_entries.iter().map(|(_, receipt)| receipt.pid))
-        .filter(|pid| {
-            if skip_pids.contains(pid) {
-                return false;
-            }
-            (process_is_running(*pid) && process_belongs_to_us(*pid)) || !process_is_running(*pid)
-        })
-        .map(|pid| pid as i32)
-        .collect();
-
-    if !targets.is_empty() {
-        resolve_pgids_and_kill(&targets);
-    }
-
-    // Clean up PID files for processes we just killed or that are already gone.
-    for (pubkey, pid) in &legacy_entries {
-        if skip_pids.contains(pid) {
-            continue;
-        }
-        if !process_is_running(*pid) || !process_belongs_to_us(*pid) {
-            super::remove_agent_pid_file(app, pubkey);
-        }
-    }
-    for (_, receipt) in &receipt_entries {
-        if skip_pids.contains(&receipt.pid) {
-            continue;
-        }
-        if !process_is_running(receipt.pid) || !process_belongs_to_us(receipt.pid) {
-            super::remove_agent_runtime_receipt(app, &receipt.key);
-        }
-    }
-}
-
-#[cfg(not(unix))]
-pub(crate) fn sweep_orphaned_agent_processes(app: &AppHandle, _skip_pids: &[u32]) {
-    let _ = app;
-}
-
-// ── macOS process-info FFI (shared by all sweep/reap functions) ──────────
-//
-// `proc_listallpids` lives in `sweep.rs` (which owns `collect_all_pids`).
-// All callers in this file reach it through `sweep::collect_all_pids()`.
-// `proc_pidinfo` and `BSDInfo` are declared here as `pub(super)` so that
-// `sweep.rs` can call `super::proc_pidinfo` / use `super::BSDInfo` without
-// redefining the struct layout in two places.
-
-#[cfg(target_os = "macos")]
-extern "C" {
-    pub(super) fn proc_pidinfo(
-        pid: libc::c_int,
-        flavor: libc::c_int,
-        arg: u64,
-        buffer: *mut libc::c_void,
-        buffersize: libc::c_int,
-    ) -> libc::c_int;
-}
-
-/// Subset of `struct proc_bsdinfo` from `<sys/proc_info.h>`. Layout verified
-/// against the macOS SDK — total size 136 bytes.
-#[cfg(target_os = "macos")]
-#[repr(C)]
-pub(super) struct BSDInfo {
-    _flags_status_xstatus: [u8; 12], // pbi_flags + pbi_status + pbi_xstatus
-    pub(super) pbi_pid: u32,         // offset 12
-    pub(super) pbi_ppid: u32,        // offset 16
-    pub(super) pbi_uid: u32,         // offset 20
-    _rest: [u8; 112],
-}
-
-#[cfg(target_os = "macos")]
-const _: () = assert!(std::mem::size_of::<BSDInfo>() == 136);
-
-#[cfg(target_os = "macos")]
-pub(super) const PROC_PIDTBSDINFO: libc::c_int = 3;
-
-/// Enumerate all processes on the system owned by the current user and kill any
-/// agent binary stamped with *this* instance's `BUZZ_MANAGED_AGENT` marker
-/// (`instance_id`) that isn't in `skip_pids`. This catches orphans that escaped
-/// PID-file-based cleanup (e.g. agent workers spawned with their own process
-/// group whose parent harness already exited and had its PID file removed),
-/// while leaving another live Buzz instance's agents untouched.
-#[cfg(target_os = "macos")]
-pub(crate) fn sweep_system_agent_processes(instance_id: &str, skip_pids: &[u32]) {
-    let my_uid = unsafe { libc::getuid() };
-    let pids = sweep::collect_all_pids();
-    if pids.is_empty() {
-        return;
-    }
-    let my_pid = std::process::id() as i32;
-    let mut orphans: Vec<i32> = Vec::new();
-
-    for &pid in &pids {
-        if pid <= 0 {
-            continue;
-        }
-        let upid = pid as u32;
-        if skip_pids.contains(&upid) || pid == my_pid {
-            continue;
-        }
-        // Check binary name first (cheap proc_name call) before UID lookup.
-        if !process_belongs_to_us(upid) {
-            continue;
-        }
-        // Verify UID and PPID via proc_pidinfo.
-        let mut info = std::mem::MaybeUninit::<BSDInfo>::zeroed();
-        let ret = unsafe {
-            proc_pidinfo(
-                pid,
-                PROC_PIDTBSDINFO,
-                0,
-                info.as_mut_ptr() as *mut libc::c_void,
-                std::mem::size_of::<BSDInfo>() as libc::c_int,
-            )
-        };
-        if ret <= 0 {
-            continue;
-        }
-        let info = unsafe { info.assume_init() };
-        if info.pbi_uid != my_uid {
-            continue;
-        }
-        if !process_has_buzz_marker(upid, instance_id) {
-            continue;
-        }
-        // Live descendants of a tracked harness are exempt — see sweep::is_live_descendant_*.
-        if sweep::is_live_descendant_macos(upid, info.pbi_ppid, skip_pids) {
-            continue;
-        }
-        orphans.push(pid);
-    }
-
-    if !orphans.is_empty() {
-        eprintln!(
-            "buzz-desktop: system sweep found {} orphaned agent process(es), cleaning up",
-            orphans.len()
-        );
-        resolve_pgids_and_kill(&orphans);
-    }
-}
-
-/// Read the process group ID from /proc/<pid>/stat by delegating to the shared
-/// stat parser in `sweep`. Keeps a single parse site for the `/proc/<pid>/stat`
-/// field layout.
-#[cfg(all(unix, not(target_os = "macos")))]
-fn read_pgid_linux(pid: u32) -> Option<u32> {
-    sweep::proc_stat_ppid_pgid_linux(pid).map(|(_, pgid)| pgid)
-}
-
-#[cfg(all(unix, not(target_os = "macos")))]
-pub(crate) fn sweep_system_agent_processes(instance_id: &str, skip_pids: &[u32]) {
-    let my_uid = unsafe { libc::getuid() };
-    let mut orphans: Vec<i32> = Vec::new();
-    let my_pid = std::process::id() as i32;
-
-    let Ok(entries) = std::fs::read_dir("/proc") else {
-        return;
-    };
-    for entry in entries.flatten() {
-        let name = entry.file_name();
-        let Some(name_str) = name.to_str() else {
-            continue;
-        };
-        let Ok(pid) = name_str.parse::<i32>() else {
-            continue;
-        };
-        if pid <= 0 || pid == my_pid {
-            continue;
-        }
-        let upid = pid as u32;
-        if skip_pids.contains(&upid) {
-            continue;
-        }
-        // Check ownership via /proc/<pid> metadata.
-        let Ok(meta) = entry.metadata() else {
-            continue;
-        };
-        use std::os::unix::fs::MetadataExt;
-        if meta.uid() != my_uid {
-            continue;
-        }
-        if !process_belongs_to_us(upid) || !process_has_buzz_marker(upid, instance_id) {
-            continue;
-        }
-        // Live descendants of a tracked harness are exempt — see sweep::is_live_descendant_*.
-        if sweep::is_live_descendant_linux(upid, skip_pids) {
-            continue;
-        }
-        orphans.push(pid);
-    }
-
-    if !orphans.is_empty() {
-        eprintln!(
-            "buzz-desktop: system sweep found {} orphaned agent process(es), cleaning up",
-            orphans.len()
-        );
-        resolve_pgids_and_kill(&orphans);
-    }
-}
-
-#[cfg(not(unix))]
-pub(crate) fn sweep_system_agent_processes(_instance_id: &str, _skip_pids: &[u32]) {}
-
-/// Periodic-sweep variant with two-tick grace: only reaps same-instance orphans
-/// that were also seen orphaned on the previous tick. This prevents killing a
-/// legitimately-starting agent that spawned between the skip-list snapshot and
-/// the process scan. Returns the current orphan set for use as `prev_orphans`
-/// on the next tick.
-#[cfg(unix)]
-pub(crate) fn sweep_system_agent_processes_with_grace(
-    instance_id: &str,
-    skip_pids: &[u32],
-    prev_orphans: &std::collections::HashSet<u32>,
-) -> std::collections::HashSet<u32> {
-    let current = collect_same_instance_orphans(instance_id, skip_pids);
-    // Only reap PIDs seen orphaned on two consecutive ticks.
-    let confirmed: Vec<i32> = current
-        .iter()
-        .filter(|pid| prev_orphans.contains(pid))
-        .map(|&pid| pid as i32)
-        .collect();
-    if !confirmed.is_empty() {
-        eprintln!(
-            "buzz-desktop: periodic sweep confirmed {} orphaned agent process(es), cleaning up",
-            confirmed.len()
-        );
-        resolve_pgids_and_kill(&confirmed);
-    }
-    current
-}
-
-#[cfg(not(unix))]
-pub(crate) fn sweep_system_agent_processes_with_grace(
-    _instance_id: &str,
-    _skip_pids: &[u32],
-    _prev_orphans: &std::collections::HashSet<u32>,
-) -> std::collections::HashSet<u32> {
-    std::collections::HashSet::new()
-}
-
-/// Collect PIDs of same-instance agent processes that appear orphaned (not in
-/// `skip_pids`). Returns the set for use in two-tick grace logic — does NOT
-/// kill anything.
-#[cfg(target_os = "macos")]
-pub(crate) fn collect_same_instance_orphans(
-    instance_id: &str,
-    skip_pids: &[u32],
-) -> std::collections::HashSet<u32> {
-    let my_uid = unsafe { libc::getuid() };
-    let my_pid = std::process::id() as i32;
-    let mut orphans = std::collections::HashSet::new();
-
-    let pids = sweep::collect_all_pids();
-    if pids.is_empty() {
-        return orphans;
-    }
-
-    for &pid in &pids {
-        if pid <= 0 || pid == my_pid {
-            continue;
-        }
-        let upid = pid as u32;
-        if skip_pids.contains(&upid) {
-            continue;
-        }
-        if !process_belongs_to_us(upid) {
-            continue;
-        }
-        let mut info = std::mem::MaybeUninit::<BSDInfo>::zeroed();
-        let ret = unsafe {
-            proc_pidinfo(
-                pid,
-                PROC_PIDTBSDINFO,
-                0,
-                info.as_mut_ptr() as *mut libc::c_void,
-                std::mem::size_of::<BSDInfo>() as libc::c_int,
-            )
-        };
-        if ret <= 0 {
-            continue;
-        }
-        let info = unsafe { info.assume_init() };
-        if info.pbi_uid != my_uid {
-            continue;
-        }
-        if !process_has_buzz_marker(upid, instance_id) {
-            continue;
-        }
-        // Live descendants of a tracked harness are exempt — see sweep::is_live_descendant_*.
-        if sweep::is_live_descendant_macos(upid, info.pbi_ppid, skip_pids) {
-            continue;
-        }
-        orphans.insert(upid);
-    }
-    orphans
-}
-
-#[cfg(all(unix, not(target_os = "macos")))]
-pub(crate) fn collect_same_instance_orphans(
-    instance_id: &str,
-    skip_pids: &[u32],
-) -> std::collections::HashSet<u32> {
-    let my_uid = unsafe { libc::getuid() };
-    let my_pid = std::process::id() as i32;
-    let mut orphans = std::collections::HashSet::new();
-
-    let Ok(entries) = std::fs::read_dir("/proc") else {
-        return orphans;
-    };
-    for entry in entries.flatten() {
-        let name = entry.file_name();
-        let Some(name_str) = name.to_str() else {
-            continue;
-        };
-        let Ok(pid) = name_str.parse::<i32>() else {
-            continue;
-        };
-        if pid <= 0 || pid == my_pid {
-            continue;
-        }
-        let upid = pid as u32;
-        if skip_pids.contains(&upid) {
-            continue;
-        }
-        let Ok(meta) = entry.metadata() else {
-            continue;
-        };
-        use std::os::unix::fs::MetadataExt;
-        if meta.uid() != my_uid {
-            continue;
-        }
-        if !process_belongs_to_us(upid) || !process_has_buzz_marker(upid, instance_id) {
-            continue;
-        }
-        // Live descendants of a tracked harness are exempt — see sweep::is_live_descendant_*.
-        if sweep::is_live_descendant_linux(upid, skip_pids) {
-            continue;
-        }
-        orphans.insert(upid);
-    }
-    orphans
-}
-
-#[cfg(not(unix))]
-pub(crate) fn collect_same_instance_orphans(
-    _instance_id: &str,
-    _skip_pids: &[u32],
-) -> std::collections::HashSet<u32> {
-    std::collections::HashSet::new()
-}
-
-/// Binary names for the Buzz desktop/Tauri process. Used by dead-instance
-/// detection to confirm the owning desktop is still alive.
-const DESKTOP_BINARY_NAMES: &[&str] = &["Buzz", "buzz-desktop", "buzz_desktop"];
-
-/// Check if a process name matches a known Buzz desktop binary.
-fn is_desktop_binary(name: &str) -> bool {
-    DESKTOP_BINARY_NAMES.contains(&name)
-}
-
-/// Check whether `buf` contains `id` as a complete identifier — not as a
-/// prefix of a longer dotted name. The identifier appears in the Tauri config
-/// JSON as `"identifier":"xyz.block.buzz.app.dev"` and in environment entries
-/// as `KEY=...app.dev\0`, so a valid match is followed by a non-identifier byte
-/// (not `[A-Za-z0-9._-]`) or sits at the end of the buffer. This prevents
-/// `xyz.block.buzz.app` from matching inside `xyz.block.buzz.app.dev`.
-fn buffer_contains_identifier(buf: &[u8], id: &[u8]) -> bool {
-    if id.is_empty() {
-        return false;
-    }
-    buf.windows(id.len()).enumerate().any(|(i, w)| {
-        if w != id {
-            return false;
-        }
-        // Boundary check on the byte immediately after the match: end-of-buffer
-        // or any byte that can't continue a dotted reverse-DNS identifier.
-        match buf.get(i + id.len()) {
-            None => true,
-            Some(&next) => {
-                !next.is_ascii_alphanumeric() && next != b'.' && next != b'_' && next != b'-'
-            }
-        }
-    })
-}
-
-/// Extract the `BUZZ_MANAGED_AGENT` value from a process's environment.
-/// Returns `None` if the process doesn't have the marker or can't be read.
-#[cfg(target_os = "macos")]
-fn extract_buzz_marker_value(pid: u32) -> Option<String> {
-    let prefix = b"BUZZ_MANAGED_AGENT=";
-    let buf = sweep::procargs2_buffer(pid)?;
-
-    if buf.len() < std::mem::size_of::<libc::c_int>() {
-        return None;
-    }
-    let mut n_args: libc::c_int = 0;
-    unsafe {
-        std::ptr::copy_nonoverlapping(
-            buf.as_ptr(),
-            &mut n_args as *mut libc::c_int as *mut u8,
-            std::mem::size_of::<libc::c_int>(),
-        );
-    }
-    let mut pos = std::mem::size_of::<libc::c_int>();
-
-    // Skip exec path.
-    while pos < buf.len() && buf[pos] != 0 {
-        pos += 1;
-    }
-    while pos < buf.len() && buf[pos] == 0 {
-        pos += 1;
-    }
-    // Skip argc argument strings.
-    let mut args_remaining = n_args;
-    while args_remaining > 0 && pos < buf.len() {
-        while pos < buf.len() && buf[pos] != 0 {
-            pos += 1;
-        }
-        while pos < buf.len() && buf[pos] == 0 {
-            pos += 1;
-        }
-        args_remaining -= 1;
-    }
-    // Search environment entries for our marker.
-    for entry in buf[pos..].split(|&b| b == 0) {
-        if entry.starts_with(prefix) {
-            return String::from_utf8(entry[prefix.len()..].to_vec()).ok();
-        }
-    }
-    None
-}
-
-#[cfg(all(unix, not(target_os = "macos")))]
-fn extract_buzz_marker_value(pid: u32) -> Option<String> {
-    let prefix = b"BUZZ_MANAGED_AGENT=";
-    let data = std::fs::read(format!("/proc/{pid}/environ")).ok()?;
-    for entry in data.split(|&b| b == 0) {
-        if entry.starts_with(prefix) {
-            return String::from_utf8(entry[prefix.len()..].to_vec()).ok();
-        }
-    }
-    None
-}
-
-#[cfg(not(unix))]
-fn extract_buzz_marker_value(_pid: u32) -> Option<String> {
-    None
-}
-
-/// Check if a Buzz desktop process is still alive for the given instance ID.
-/// Scans all user-owned processes named "Buzz" or "buzz-desktop" and checks
-/// whether any has the identifier in its command-line args (KERN_PROCARGS2 buffer
-/// includes both argv and environ — the `--config` JSON from `tauri dev` contains
-/// the identifier string).
-#[cfg(target_os = "macos")]
-fn desktop_is_alive_for_instance(instance_id: &str) -> bool {
-    extern "C" {
-        fn proc_name(pid: libc::c_int, buffer: *mut libc::c_void, buffersize: u32) -> libc::c_int;
-    }
-
-    let my_uid = unsafe { libc::getuid() };
-    let identifier_bytes = instance_id.as_bytes();
-
-    let pids = sweep::collect_all_pids();
-    if pids.is_empty() {
-        return false;
-    }
-
-    for &pid in &pids {
-        if pid <= 0 {
-            continue;
-        }
-        // Check binary name — only look at desktop binaries.
-        let mut name_buf = [0u8; 1024];
-        let len = unsafe {
-            proc_name(
-                pid,
-                name_buf.as_mut_ptr() as *mut libc::c_void,
-                name_buf.len() as u32,
-            )
-        };
-        if len <= 0 {
-            continue;
-        }
-        let name = String::from_utf8_lossy(&name_buf[..len as usize]);
-        if !is_desktop_binary(&name) {
-            continue;
-        }
-        // Verify UID.
-        let mut info = std::mem::MaybeUninit::<BSDInfo>::zeroed();
-        let ret = unsafe {
-            proc_pidinfo(
-                pid,
-                PROC_PIDTBSDINFO,
-                0,
-                info.as_mut_ptr() as *mut libc::c_void,
-                std::mem::size_of::<BSDInfo>() as libc::c_int,
-            )
-        };
-        if ret <= 0 {
-            continue;
-        }
-        let info = unsafe { info.assume_init() };
-        if info.pbi_uid != my_uid {
-            continue;
-        }
-        // Check if this desktop process's args/env contain the identifier.
-        // The KERN_PROCARGS2 buffer holds argv + environ as null-delimited strings.
-        let Some(args_buf) = sweep::procargs2_buffer(pid as u32) else {
-            continue;
-        };
-        // Boundary-anchored search: the identifier in the config JSON is
-        // followed by a non-identifier char (typically `"`). A raw substring
-        // match would let `...app` match inside `...app.dev`.
-        if buffer_contains_identifier(&args_buf, identifier_bytes) {
-            return true;
-        }
-    }
-    false
-}
-
-#[cfg(all(unix, not(target_os = "macos")))]
-fn desktop_is_alive_for_instance(instance_id: &str) -> bool {
-    let my_uid = unsafe { libc::getuid() };
-    let Ok(entries) = std::fs::read_dir("/proc") else {
-        return false;
-    };
-    for entry in entries.flatten() {
-        let name = entry.file_name();
-        let Some(name_str) = name.to_str() else {
-            continue;
-        };
-        let Ok(pid) = name_str.parse::<u32>() else {
-            continue;
-        };
-        // Check ownership.
-        let Ok(meta) = entry.metadata() else {
-            continue;
-        };
-        use std::os::unix::fs::MetadataExt;
-        if meta.uid() != my_uid {
-            continue;
-        }
-        // Check binary name via /proc/<pid>/comm.
-        let Ok(comm) = std::fs::read_to_string(format!("/proc/{pid}/comm")) else {
-            continue;
-        };
-        if !is_desktop_binary(comm.trim()) {
-            continue;
-        }
-        // Check cmdline for the identifier with boundary anchoring.
-        let Ok(cmdline) = std::fs::read(format!("/proc/{pid}/cmdline")) else {
-            continue;
-        };
-        if buffer_contains_identifier(&cmdline, instance_id.as_bytes()) {
-            return true;
-        }
-    }
-    false
-}
-
-#[cfg(not(unix))]
-fn desktop_is_alive_for_instance(_instance_id: &str) -> bool {
-    false
-}
-
-/// Reap agent processes belonging to dead Buzz desktop instances.
-///
-/// Scans all user processes for `BUZZ_MANAGED_AGENT=*`, groups them by
-/// instance ID, and for each foreign instance (≠ `our_instance_id`) checks
-/// whether a Buzz desktop binary is still alive for that instance. If not,
-/// all agents from that dead instance are reaped.
-#[cfg(target_os = "macos")]
-pub(crate) fn reap_dead_instance_agents(our_instance_id: &str, skip_pids: &[u32]) {
-    let my_uid = unsafe { libc::getuid() };
-    let my_pid = std::process::id() as i32;
-
-    let pids = sweep::collect_all_pids();
-    if pids.is_empty() {
-        return;
-    }
-
-    // Collect (pid, instance_id) for all foreign agent processes.
-    let mut foreign_agents: HashMap<String, Vec<i32>> = HashMap::new();
-
-    for &pid in &pids {
-        if pid <= 0 || pid == my_pid {
-            continue;
-        }
-        let upid = pid as u32;
-        if skip_pids.contains(&upid) {
-            continue;
-        }
-        if !process_belongs_to_us(upid) {
-            continue;
-        }
-        // Verify UID.
-        let mut info = std::mem::MaybeUninit::<BSDInfo>::zeroed();
-        let ret = unsafe {
-            proc_pidinfo(
-                pid,
-                PROC_PIDTBSDINFO,
-                0,
-                info.as_mut_ptr() as *mut libc::c_void,
-                std::mem::size_of::<BSDInfo>() as libc::c_int,
-            )
-        };
-        if ret <= 0 {
-            continue;
-        }
-        let info = unsafe { info.assume_init() };
-        if info.pbi_uid != my_uid {
-            continue;
-        }
-        // Extract the instance ID from this agent's env.
-        let Some(agent_instance_id) = extract_buzz_marker_value(upid) else {
-            continue;
-        };
-        // Skip agents belonging to our own instance (handled by sweep_system_agent_processes).
-        if agent_instance_id == our_instance_id {
-            continue;
-        }
-        foreign_agents
-            .entry(agent_instance_id)
-            .or_default()
-            .push(pid);
-    }
-
-    // For each foreign instance, check if its desktop is still alive.
-    for (instance_id, agent_pids) in &foreign_agents {
-        if desktop_is_alive_for_instance(instance_id) {
-            continue;
-        }
-        eprintln!(
-            "buzz-desktop: reaping {} orphaned agent(s) from dead instance '{instance_id}'",
-            agent_pids.len()
-        );
-        resolve_pgids_and_kill(agent_pids);
-    }
-}
-
-#[cfg(all(unix, not(target_os = "macos")))]
-pub(crate) fn reap_dead_instance_agents(our_instance_id: &str, skip_pids: &[u32]) {
-    let my_uid = unsafe { libc::getuid() };
-    let my_pid = std::process::id() as i32;
-    let mut foreign_agents: HashMap<String, Vec<i32>> = HashMap::new();
-
-    let Ok(entries) = std::fs::read_dir("/proc") else {
-        return;
-    };
-    for entry in entries.flatten() {
-        let name = entry.file_name();
-        let Some(name_str) = name.to_str() else {
-            continue;
-        };
-        let Ok(pid) = name_str.parse::<i32>() else {
-            continue;
-        };
-        if pid <= 0 || pid == my_pid {
-            continue;
-        }
-        let upid = pid as u32;
-        if skip_pids.contains(&upid) {
-            continue;
-        }
-        let Ok(meta) = entry.metadata() else {
-            continue;
-        };
-        use std::os::unix::fs::MetadataExt;
-        if meta.uid() != my_uid {
-            continue;
-        }
-        if !process_belongs_to_us(upid) {
-            continue;
-        }
-        let Some(agent_instance_id) = extract_buzz_marker_value(upid) else {
-            continue;
-        };
-        if agent_instance_id == our_instance_id {
-            continue;
-        }
-        foreign_agents
-            .entry(agent_instance_id)
-            .or_default()
-            .push(pid);
-    }
-
-    for (instance_id, agent_pids) in &foreign_agents {
-        if desktop_is_alive_for_instance(instance_id) {
-            continue;
-        }
-        eprintln!(
-            "buzz-desktop: reaping {} orphaned agent(s) from dead instance '{instance_id}'",
-            agent_pids.len()
-        );
-        resolve_pgids_and_kill(agent_pids);
-    }
-}
-
-#[cfg(not(unix))]
-pub(crate) fn reap_dead_instance_agents(_our_instance_id: &str, _skip_pids: &[u32]) {}
+mod instance_reaper;
+pub(crate) use instance_reaper::reap_dead_instance_agents;
+#[cfg(test)]
+use instance_reaper::{buffer_contains_identifier, is_desktop_binary};
 
 // Exact-path harness sweep lives in runtime/sweep.rs (re-exported above).
 
-/// Kill stale agent processes from a previous session whose PID is still alive
-/// but not tracked in the current `runtimes` map. Updates the record fields and
-/// returns `true` if any records were modified.
-pub fn kill_stale_tracked_processes(
-    records: &mut [ManagedAgentRecord],
-    runtimes: &HashMap<ManagedAgentRuntimeKey, ManagedAgentPairRuntime>,
-    instance_id: &str,
-) -> bool {
-    use crate::managed_agents::BackendKind;
-
-    let mut changed = false;
-    for record in records.iter_mut() {
-        if record.backend != BackendKind::Local {
-            continue;
-        }
-        let Some(pid) = record.runtime_pid else {
-            continue;
-        };
-        if !runtimes.keys().any(|key| key.pubkey == record.pubkey) {
-            if process_belongs_to_us(pid) && process_has_buzz_marker(pid, instance_id) {
-                let _ = terminate_process(pid);
-            }
-            record.runtime_pid = None;
-            record.last_stopped_at = Some(crate::util::now_iso());
-            record.updated_at = crate::util::now_iso();
-            changed = true;
-        }
-    }
-    changed
-}
-
-pub fn sync_managed_agent_processes(
-    records: &mut [ManagedAgentRecord],
-    runtimes: &mut HashMap<ManagedAgentRuntimeKey, ManagedAgentPairRuntime>,
-    _instance_id: &str,
-) -> (bool, Vec<String>) {
-    let mut changed = false;
-    let mut exited = Vec::new();
-
-    for (key, runtime) in runtimes.iter_mut() {
-        let status = match runtime.child.try_wait() {
-            Ok(status) => status,
-            Err(error) => {
-                if let Some(record) = records
-                    .iter_mut()
-                    .find(|record| record.pubkey == key.pubkey)
-                {
-                    record.updated_at = now_iso();
-                    record.last_error = Some(format!("failed to inspect process state: {error}"));
-                    record.last_error_code = None;
-                }
-                changed = true;
-                exited.push(key.clone());
-                continue;
-            }
-        };
-
-        let Some(status) = status else {
-            continue;
-        };
-
-        if let Some(record) = records
-            .iter_mut()
-            .find(|record| record.pubkey == key.pubkey)
-        {
-            record.updated_at = now_iso();
-            record.last_stopped_at = Some(now_iso());
-            record.last_exit_code = status.code();
-            let log_err = if status.success() {
-                None
-            } else {
-                Some(
-                    super::meaningful_agent_error_from_log(&runtime.log_path).unwrap_or_else(
-                        || super::storage::AgentLogError {
-                            message: format!("harness exited with status {status}"),
-                            code: None,
-                        },
-                    ),
-                )
-            };
-            record.last_error = log_err.as_ref().map(|e| e.message.clone());
-            record.last_error_code = log_err.as_ref().and_then(|e| e.code);
-        }
-
-        changed = true;
-        exited.push(key.clone());
-    }
-
-    let exited_pubkeys: Vec<String> = exited.iter().map(|key| key.pubkey.clone()).collect();
-    for key in exited {
-        runtimes.remove(&key);
-    }
-
-    // `runtime_pid` is legacy bookkeeping. Pair runtimes and receipts are the
-    // authoritative lifecycle source; migration cleanup is handled separately.
-    for record in records.iter_mut() {
-        if record.runtime_pid.take().is_some() {
-            record.updated_at = now_iso();
-            changed = true;
-        }
-    }
-
-    (changed, exited_pubkeys)
-}
+mod lifecycle;
+#[cfg(test)]
+use lifecycle::kill_stale_tracked_processes_with;
+pub use lifecycle::{kill_stale_tracked_processes, sync_managed_agent_processes};
 
 /// Classify an agent's persona against the live catalog for the Agents-menu
 /// drift indicator. Returns `(out_of_date, orphaned)`.
@@ -1376,6 +135,7 @@ pub fn build_managed_agent_summary(
     record: &ManagedAgentRecord,
     runtimes: &HashMap<ManagedAgentRuntimeKey, ManagedAgentPairRuntime>,
     personas: &[crate::managed_agents::types::AgentDefinition],
+    global_config: &crate::managed_agents::GlobalAgentConfig,
 ) -> Result<ManagedAgentSummary, String> {
     use crate::managed_agents::BackendKind;
 
@@ -1435,12 +195,37 @@ pub fn build_managed_agent_summary(
         }
     };
 
-    // Display contract: show the pinned record snapshot — what the agent
-    // actually runs — not the live persona. The drift flags below signal when
-    // the snapshot has fallen behind an edited persona; showing live values
-    // next to an "out of date" badge would contradict it.
     let (persona_out_of_date, persona_orphaned) = persona_drift_state(record, personas);
 
+    let global_for_summary =
+        crate::managed_agents::load_global_agent_config(app).unwrap_or_default();
+    let effective_cfg = crate::managed_agents::effective_config::resolve_effective_config(
+        record,
+        personas,
+        &global_for_summary,
+    );
+    let (effective_model, effective_provider, effective_prompt, model_source) = match effective_cfg
+    {
+        crate::managed_agents::effective_config::EffectiveConfigResult::Resolved(cfg) => {
+            let source = cfg.model.source.clone();
+            (
+                cfg.model.value,
+                cfg.provider.value,
+                cfg.system_prompt.value,
+                Some(source),
+            )
+        }
+        crate::managed_agents::effective_config::EffectiveConfigResult::OrphanedInstance {
+            record_pubkey,
+            missing_persona_id,
+        } => {
+            eprintln!(
+                "orphaned agent instance: pubkey={record_pubkey}, missing_persona_id={missing_persona_id}"
+            );
+            (None, None, None, None)
+        }
+    };
+
     // Restart badge: the running process stamped its effective spawn config
     // at launch; recompute from current disk state and flag drift. Only the
     // tracked live pair for THIS workspace can drift — stopped agents spawn
@@ -1454,12 +239,15 @@ pub fn build_managed_agent_summary(
     // stamped at spawn.  This catches out-of-band adapter changes (manual
     // npm install/downgrade) that Phase-1 auto-restart doesn't cover.  The
     // cache is read-only here — no subprocess is spawned.
+    //
+    // Global config drives both the restart-drift hash and descriptor env
+    // layering below — the caller loads it once and passes it in, so
+    // list-style callers pay one disk read per call rather than one per record.
+
     let needs_restart = pair_key
         .as_ref()
         .and_then(|key| runtimes.get(key).map(|runtime| (key, runtime)))
         .is_some_and(|(key, runtime)| {
-            let global_for_hash =
-                crate::managed_agents::load_global_agent_config(app).unwrap_or_default();
             let teams_for_hash = crate::managed_agents::load_teams(app).unwrap_or_default();
             let hash_drift = runtime.spawn_config_hash
                 != crate::managed_agents::spawn_hash::spawn_config_hash(
@@ -1467,20 +255,44 @@ pub fn build_managed_agent_summary(
                     personas,
                     &teams_for_hash,
                     &key.relay_url,
-                    &global_for_hash,
+                    global_config,
                 );
             let availability_drift = super::availability_drift(
                 runtime.adapter_availability.as_ref(),
                 super::adapter_availability_cached(),
             );
-            hash_drift || availability_drift
+            // An orphan can never be restarted successfully —
+            // `spawn_agent_child` refuses it before any process side effect —
+            // so `needs_restart` must never fire for one regardless of hash or
+            // availability drift. Surfacing "Restart required" here would offer
+            // an action guaranteed to fail; the UI shows `persona_orphaned`
+            // instead (see `ManagedAgentSummary::persona_orphaned`).
+            restart_eligible(persona_orphaned, hash_drift, availability_drift)
         });
 
-    // Resolve the effective harness the same way, then derive args/mcp from it,
-    // so the UI reflects the persona's current harness (or an explicit pin).
-    let effective_command = crate::managed_agents::record_agent_command(record, personas);
-    let effective_args = normalize_agent_args(&effective_command, record.agent_args.clone());
-    let effective_mcp_command = known_acp_runtime(&effective_command)
+    // Resolve the effective harness via the single typed descriptor — same resolver
+    // as spawn, so the UI reflects the persona's current harness (or explicit pin).
+    let descriptor = crate::managed_agents::resolve_effective_harness_descriptor(
+        record,
+        personas,
+        global_config,
+    )
+    .unwrap_or_else(|e| {
+        // Dangling harness — surface the missing id so the UI tells the same
+        // story as spawn (which refuses with a sentence), rather than silently
+        // showing the default-command fallback as if the agent were healthy.
+        let cmd = match crate::managed_agents::dangling_harness_id(&e) {
+            Some(id) => crate::managed_agents::dangling_harness_display(id),
+            None => crate::managed_agents::record_agent_command(record, personas),
+        };
+        let args = normalize_agent_args(&cmd, record.agent_args.clone());
+        crate::managed_agents::readiness::EffectiveHarnessDescriptor {
+            command: cmd,
+            args,
+            env: Default::default(),
+        }
+    });
+    let effective_mcp_command = known_acp_runtime(&descriptor.command)
         .and_then(|r| r.mcp_command)
         .unwrap_or("")
         .to_string();
@@ -1489,21 +301,23 @@ pub fn build_managed_agent_summary(
         pubkey: record.pubkey.clone(),
         name: record.name.clone(),
         persona_id: record.persona_id.clone(),
+        runtime: record.runtime.clone(),
         team_id: record.team_id.clone(),
         relay_url: record.relay_url.clone(),
         acp_command: record.acp_command.clone(),
-        agent_command: effective_command,
+        agent_command: descriptor.command,
         agent_command_override: record.agent_command_override.clone(),
-        agent_args: effective_args,
+        agent_args: descriptor.args,
         mcp_command: effective_mcp_command,
         turn_timeout_seconds: record.turn_timeout_seconds,
         idle_timeout_seconds: record.idle_timeout_seconds,
         max_turn_duration_seconds: record.max_turn_duration_seconds,
         parallelism: record.parallelism,
-        system_prompt: record.system_prompt.clone(),
+        system_prompt: effective_prompt,
         avatar_url: record.avatar_url.clone(),
-        model: record.model.clone(),
-        provider: record.provider.clone(),
+        model: effective_model,
+        model_source,
+        provider: effective_provider,
         persona_out_of_date,
         persona_orphaned,
         needs_restart,
@@ -1527,6 +341,19 @@ pub fn build_managed_agent_summary(
     })
 }
 
+/// Pure predicate: should the "Restart required" badge fire?
+///
+/// An orphaned linked instance (its persona/definition no longer exists)
+/// can never be restarted successfully — `spawn_agent_child` refuses to
+/// spawn it before any process side effect. Surfacing "Restart required"
+/// for one would offer an action guaranteed to fail, so this always
+/// returns `false` for an orphan regardless of drift. Extracted for unit
+/// testing without `AppHandle`/global state, following the
+/// `availability_drift` pattern in `discovery.rs`.
+fn restart_eligible(persona_orphaned: bool, hash_drift: bool, availability_drift: bool) -> bool {
+    !persona_orphaned && (hash_drift || availability_drift)
+}
+
 pub fn find_managed_agent_mut<'a>(
     records: &'a mut [ManagedAgentRecord],
     pubkey: &str,
@@ -1635,6 +462,51 @@ pub fn spawn_agent_child(
         return Err(error);
     }
     let runtime_key = ManagedAgentRuntimeKey::new(record.pubkey.clone(), relay_url)?;
+    // Resolve the effective harness (agent command) from the linked persona, so
+    // persona harness edits propagate on the next spawn; an explicit per-agent
+    // override wins. `agent_args` and `mcp_command` are pure derivations of the
+    // command, so we recompute them from the effective value rather than the
+    // frozen record snapshot. Mirrors the model resolution below.
+    let personas = super::load_personas(app).unwrap_or_default();
+    let teams = super::load_teams(app).unwrap_or_default();
+    // Load global config once; used for runtime_metadata_env_vars (model/provider fallback)
+    // and for the env-var merge at spawn time.
+    let global = crate::managed_agents::load_global_agent_config(app).unwrap_or_default();
+
+    // Resolve model/provider/prompt ONCE, here, at the shared spawn boundary —
+    // the single source both the env writes below and `spawn_config_hash`
+    // read from. Previously prompt was read from the record's own (possibly
+    // stale, Phase-A-snapshot) bytes while model/provider were resolved live
+    // from `personas`; a definition edit landing between a caller's snapshot
+    // apply and this spawn could hand a fresh model/provider to a stale
+    // prompt. This also folds in orphan refusal via `require_resolved`: every
+    // caller (interactive start, launch restore, `start_managed_agent_process`)
+    // inherits it — no caller can bypass this by reaching `spawn_agent_child`
+    // directly. Checked before any side effect (log marker, log file, process
+    // spawn) so a refused spawn leaves no trace.
+    let effective_cfg = crate::managed_agents::effective_config::resolve_effective_config(
+        record, &personas, &global,
+    )
+    .require_resolved()?;
+
+    // Single typed resolver: validates runtime id (dangling harness → Err), resolves
+    // command, args (instance wins over definition default), and the full env layer stack.
+    // This is the sole path for harness-definition lookup — spawn, hash, summary, and
+    // model probes all consume this descriptor rather than assembling values inline.
+    // Like the orphan refusal above, this runs before any side effect so a refused
+    // spawn leaves no trace.
+    let descriptor =
+        crate::managed_agents::resolve_effective_harness_descriptor(record, &personas, &global)
+            .map_err(|e| {
+                format!(
+                    "cannot spawn agent {}: {}",
+                    record.pubkey,
+                    crate::managed_agents::user_facing_harness_error(&e)
+                )
+            })?;
+    let effective_command = &descriptor.command;
+    let agent_args = &descriptor.args;
+
     let log_path = super::managed_agent_runtime_log_path(app, &runtime_key)?;
     append_log_marker(
         &log_path,
@@ -1650,21 +522,9 @@ pub fn spawn_agent_child(
     let stderr = stdout
         .try_clone()
         .map_err(|error| format!("failed to clone log handle: {error}"))?;
-    // Resolve the effective harness (agent command) from the linked persona, so
-    // persona harness edits propagate on the next spawn; an explicit per-agent
-    // override wins. `agent_args` and `mcp_command` are pure derivations of the
-    // command, so we recompute them from the effective value rather than the
-    // frozen record snapshot. Mirrors the model resolution below.
-    let personas = super::load_personas(app).unwrap_or_default();
-    let teams = super::load_teams(app).unwrap_or_default();
-    // Load global config once; used for runtime_metadata_env_vars (model/provider fallback)
-    // and for the env-var merge at spawn time.
-    let global = crate::managed_agents::load_global_agent_config(app).unwrap_or_default();
-    let effective_command = super::record_agent_command(record, &personas);
-    let agent_args = normalize_agent_args(&effective_command, record.agent_args.clone());
     let resolved_acp_command = resolve_command(&record.acp_command)
         .ok_or_else(|| missing_command_message(&record.acp_command, "ACP harness command"))?;
-    let effective_mcp_command = known_acp_runtime(&effective_command)
+    let effective_mcp_command = known_acp_runtime(effective_command)
         .and_then(|r| r.mcp_command)
         .unwrap_or("");
     let resolved_mcp_command: Option<std::path::PathBuf> = if effective_mcp_command.is_empty() {
@@ -1681,7 +541,7 @@ pub fn spawn_agent_child(
         }
     };
     // Resolve agent command to a full path (DMG launches have minimal PATH).
-    let resolved_agent_command = resolve_command(&effective_command)
+    let resolved_agent_command = resolve_command(effective_command)
         .map(|p| p.display().to_string())
         .unwrap_or_else(|| effective_command.clone());
 
@@ -1732,7 +592,7 @@ pub fn spawn_agent_child(
     }
     // Enable MCP hook tools (_Stop, _PostCompact) for agents that need them.
     // Uses "*" because build_mcp_servers() hard-codes the server name to "buzz-mcp".
-    let runtime_meta = known_acp_runtime(&effective_command);
+    let runtime_meta = known_acp_runtime(effective_command);
     if runtime_meta.is_some_and(|r| r.mcp_hooks) {
         command.env("MCP_HOOK_SERVERS", "*");
     }
@@ -1758,11 +618,16 @@ pub fn spawn_agent_child(
     // stuck agents for auto-restart.
     let spawned_setup_mode;
     {
-        use crate::managed_agents::{
-            agent_readiness, resolve_effective_agent_env, AgentReadiness, Requirement,
-        };
+        use crate::managed_agents::readiness::EffectiveAgentEnv;
+        use crate::managed_agents::{agent_readiness, AgentReadiness, Requirement};
 
-        let effective = resolve_effective_agent_env(record, &personas, runtime_meta, &global);
+        // Construct EffectiveAgentEnv from the descriptor computed above — no second
+        // resolver call; the descriptor's env is already the fully layered result.
+        let effective = EffectiveAgentEnv {
+            env: descriptor.env.clone(),
+            config_file_path: runtime_meta.and_then(|r| r.config_file_path),
+            effective_command: descriptor.command.clone(),
+        };
         // Compute the optional payload before touching the command.
         let setup_payload_json =
             if let AgentReadiness::NotReady { requirements } = agent_readiness(&effective) {
@@ -1800,6 +665,10 @@ pub fn spawn_agent_child(
                         Requirement::GitBash => serde_json::json!({
                             "surface": "git_bash",
                         }),
+                        Requirement::MissingBinary { command } => serde_json::json!({
+                            "surface": "missing_binary",
+                            "command": command,
+                        }),
                     })
                     .collect();
                 let payload = serde_json::json!({
@@ -1874,37 +743,49 @@ pub fn spawn_agent_child(
         command.env_remove("BUZZ_ACP_TEAM_INSTRUCTIONS");
     }
 
-    // System prompt via the shared spawn-effective filter — the SAME function the
-    // config hash digests, so env write and badge cannot disagree (see
-    // `effective_spawn_prompt` for the Some("")/None collapse). Model and provider
-    // use the shared
-    // resolver: agent → persona → global → None, so a global-default-only agent
-    // spawns with the correct provider/model env.
-    let effective_prompt = super::spawn_hash::effective_spawn_prompt(record);
-    let (effective_model, effective_provider) =
-        crate::managed_agents::resolve_effective_model_provider(record, &personas, &global);
+    // Prompt, model, and provider all come from the single `effective_cfg`
+    // resolved at the top of this function — the SAME resolve `spawn_config_hash`
+    // performs below, so env write and restart badge cannot disagree. Linked
+    // instances never consult the record's own model/provider/prompt bytes;
+    // definition-less instances fall back to their own fields, then global.
+    //
+    // Derive the mesh decision BEFORE moving fields out — `relay_mesh_model_id`
+    // is the single authoritative gate; the mesh-llm block below MUST use it
+    // rather than re-deriving from `effective_provider` to keep preflight and
+    // spawn semantics in lock-step (see `EffectiveAgentConfig::relay_mesh_model_id`).
+    #[cfg(feature = "mesh-llm")]
+    let mesh_model_id = effective_cfg.relay_mesh_model_id();
+    let effective_prompt = effective_cfg.system_prompt.value;
+    let effective_model = effective_cfg.model.value;
+    let effective_provider = effective_cfg.provider.value;
 
     if let Some(prompt) = &effective_prompt {
         command.env("BUZZ_ACP_SYSTEM_PROMPT", prompt);
     } else {
         command.env_remove("BUZZ_ACP_SYSTEM_PROMPT");
     }
-    if let Some(model) = effective_model {
+    if let Some(model) = effective_model.as_deref() {
         command.env("BUZZ_ACP_MODEL", model);
     } else {
         command.env_remove("BUZZ_ACP_MODEL");
     }
-    // Baked-in provider defaults for internal builds (buzz-releases sets
-    // BUZZ_BUILD_BUZZ_AGENT_* at compile time; OSS builds bake nothing).
-    // Written FIRST so that record/persona metadata env vars below override them.
+    // Session title for the harness to pass out-of-band on `session/new`. The
+    // adapter names the session after it; it never reaches the prompt, so this
+    // is display metadata only. `spawn_config_hash` hashes the same resolve, so
+    // a rename raises the restart badge instead of leaving the process stale.
+    if let Some(title) = resolve_session_title(record.display_name.as_deref(), &record.name) {
+        command.env(SESSION_TITLE_ENV_VAR, title);
+    } else {
+        command.env_remove(SESSION_TITLE_ENV_VAR);
+    }
     build_buzz_agent_provider_defaults(&mut command);
     if let Some(meta) = runtime_meta {
         for (key, value) in runtime_metadata_env_vars(
             meta.model_env_var,
             meta.provider_env_var,
             meta.provider_locked,
-            effective_model,
-            effective_provider,
+            effective_model.as_deref(),
+            effective_provider.as_deref(),
         ) {
             command.env(key, value);
         }
@@ -1954,7 +835,8 @@ pub fn spawn_agent_child(
             "GIT_CONFIG_KEY_0",
             format!("credential.{relay_http_url}/git.helper"),
         );
-        command.env("GIT_CONFIG_VALUE_0", cred_helper.display().to_string());
+        let helper = cred_helper.to_string_lossy().replace('\\', "/");
+        command.env("GIT_CONFIG_VALUE_0", helper);
         command.env(
             "GIT_CONFIG_KEY_1",
             format!("credential.{relay_http_url}/git.useHttpPath"),
@@ -1967,38 +849,32 @@ pub fn spawn_agent_child(
         );
     }
 
-    // ── User env vars: live persona env under agent overrides ──────────
+    // ── User env vars: definition floor + global + live persona + agent overrides ──
     //
-    // The record's `env_vars` holds agent-level overrides only. The linked
-    // persona's env is read live and merged underneath (agent wins on
-    // collision), so persona credential edits reach the agent on the next
-    // spawn — same refresh semantics as prompt/model/provider above and the
-    // provider deploy path. Global env vars are the floor layer below persona.
-    // `merged_user_env` also applies the reserved-key / malformed-key / NUL
-    // filtering. Precedence: baked floor < Buzz-set env above < GLOBAL <
-    // PERSONA < per-agent.
-    //
-    // These writes go LAST so user-provided values win over every Buzz-set env
-    // above — EXCEPT reserved keys (BUZZ_PRIVATE_KEY, NOSTR_PRIVATE_KEY,
-    // BUZZ_AUTH_TAG, BUZZ_API_TOKEN, BUZZ_ACP_PRIVATE_KEY, BUZZ_ACP_API_TOKEN),
-    // which `merged_user_env` strips. Those carry Buzz's identity and must
-    // never be GUI-overridable.
-    // global < live persona < agent (last-wins on collision at each layer).
-    let persona_over_global = super::env_vars::merged_user_env(
-        &global.env_vars,
-        &super::env_vars::live_persona_env(&personas, record.persona_id.as_deref()),
-    );
-    for (key, value) in super::env_vars::merged_user_env(&persona_over_global, &record.env_vars) {
+    // `descriptor.env` is the fully-layered result from `resolve_effective_harness_descriptor`:
+    // baked floor → runtime metadata → definition env (harness author defaults) →
+    // global → live persona → per-agent, with reserved-key and malformed-key filtering
+    // applied. Writing it last lets user-provided values win over every Buzz-set env
+    // written above — reserved keys were already stripped from descriptor.env so they
+    // cannot clobber BUZZ_PRIVATE_KEY, NOSTR_PRIVATE_KEY, etc.
+    for (key, value) in &descriptor.env {
         command.env(key, value);
     }
     configure_runtime_cli(&mut command, runtime_meta);
 
     // Buzz shared compute is stored as a native provider; derive the OpenAI-compatible
     // transport at spawn time and scrub any unrelated ambient OpenAI key.
+    // Gate on `mesh_model_id` (derived from `effective_cfg.relay_mesh_model_id()`
+    // above) — not on `effective_provider` directly — so the mesh gate here
+    // uses the same trim semantics as the preflight callers.
     #[cfg(feature = "mesh-llm")]
-    if effective_provider == Some(super::RELAY_MESH_PROVIDER_ID) {
+    if let Some(ref mesh_model_id) = mesh_model_id {
         let mut mesh_env = std::collections::BTreeMap::new();
-        super::apply_relay_mesh_env(&mut mesh_env, effective_provider, effective_model);
+        super::apply_relay_mesh_env(
+            &mut mesh_env,
+            Some(super::RELAY_MESH_PROVIDER_ID),
+            Some(mesh_model_id.as_str()),
+        );
         command.env_remove("OPENAI_API_KEY");
         for (key, value) in mesh_env {
             command.env(key, value);
@@ -2152,61 +1028,5 @@ pub fn start_managed_agent_process(
     Ok(())
 }
 
-/// Returns the (key, value) env var pairs that should be forwarded to the
-/// agent process for model and provider selection.
-///
-/// Model injection is unconditional — even agents that support ACP model
-/// switching need the initial bootstrap value. Provider injection is skipped
-/// when `provider_locked` is true (e.g. Claude runtimes that only work with
-/// Anthropic).
-pub(crate) fn runtime_metadata_env_vars<'a>(
-    model_env_var: Option<&'a str>,
-    provider_env_var: Option<&'a str>,
-    provider_locked: bool,
-    effective_model: Option<&'a str>,
-    effective_provider: Option<&'a str>,
-) -> Vec<(&'a str, &'a str)> {
-    let mut vars = Vec::new();
-    if let (Some(env_key), Some(model)) = (model_env_var, effective_model) {
-        vars.push((env_key, model));
-    }
-    if !provider_locked {
-        if let (Some(env_key), Some(provider)) = (provider_env_var, effective_provider) {
-            vars.push((env_key, provider));
-        }
-    }
-    vars
-}
-
-/// Resolve the effective (prompt, model, provider) triple for a persona-linked agent.
-///
-/// Given a persona_id, finds the persona in the list and returns its system_prompt,
-/// model, and provider as the authoritative values. When the persona leaves `model`
-/// or `provider` blank (None or whitespace-only), falls back to the record's own
-/// field using the same precedence rule as `persona_snapshot_with_agent_config_fallback`
-/// so the display surface matches spawn behavior. Falls back to the record's own
-/// prompt/model/provider when no persona is linked or found.
-///
-/// Used by `agent_config.rs` to inject persona defaults into the config surface
-/// before running the reader, so BuzzExplicit-tagged fields can be re-tagged to
-/// PersonaDefault for fields the record did not independently set.
-pub(crate) fn resolve_effective_prompt_model_provider(
-    persona_id: Option<&str>,
-    personas: &[crate::managed_agents::types::AgentDefinition],
-    record_prompt: Option<String>,
-    record_model: Option<String>,
-    record_provider: Option<String>,
-) -> (Option<String>, Option<String>, Option<String>) {
-    let fallback = crate::managed_agents::persona_events::persona_field_with_record_fallback;
-    match persona_id.and_then(|pid| personas.iter().find(|p| p.id == pid)) {
-        Some(p) => (
-            Some(p.system_prompt.clone()),
-            fallback(p.model.as_deref(), record_model.as_deref()), // fallback: record.model
-            fallback(p.provider.as_deref(), record_provider.as_deref()), // fallback: record.provider
-        ),
-        None => (record_prompt, record_model, record_provider),
-    }
-}
-
 #[cfg(test)]
 mod tests;
diff --git a/desktop/src-tauri/src/managed_agents/runtime/instance_reaper.rs b/desktop/src-tauri/src/managed_agents/runtime/instance_reaper.rs
new file mode 100644
index 0000000000..dec8565330
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/runtime/instance_reaper.rs
@@ -0,0 +1,359 @@
+use super::*;
+
+/// Binary names for the Buzz desktop/Tauri process. Used by dead-instance
+/// detection to confirm the owning desktop is still alive.
+const DESKTOP_BINARY_NAMES: &[&str] = &[
+    "Buzz",
+    "buzz-desktop",
+    "buzz_desktop",
+    // Linux limits /proc/<pid>/comm to 15 visible bytes, truncating the
+    // AppImage shim's real executable name, `buzz-desktop.bin`.
+    "buzz-desktop.bi",
+];
+
+/// Check if a process name matches a known Buzz desktop binary.
+pub(super) fn is_desktop_binary(name: &str) -> bool {
+    DESKTOP_BINARY_NAMES.contains(&name)
+}
+
+/// Check whether `buf` contains `id` as a complete identifier — not as a
+/// prefix of a longer dotted name. The identifier appears in the Tauri config
+/// JSON as `"identifier":"xyz.block.buzz.app.dev"` and in environment entries
+/// as `KEY=...app.dev\0`, so a valid match is followed by a non-identifier byte
+/// (not `[A-Za-z0-9._-]`) or sits at the end of the buffer. This prevents
+/// `xyz.block.buzz.app` from matching inside `xyz.block.buzz.app.dev`.
+pub(super) fn buffer_contains_identifier(buf: &[u8], id: &[u8]) -> bool {
+    if id.is_empty() {
+        return false;
+    }
+    buf.windows(id.len()).enumerate().any(|(i, w)| {
+        if w != id {
+            return false;
+        }
+        // Boundary check on the byte immediately after the match: end-of-buffer
+        // or any byte that can't continue a dotted reverse-DNS identifier.
+        match buf.get(i + id.len()) {
+            None => true,
+            Some(&next) => {
+                !next.is_ascii_alphanumeric() && next != b'.' && next != b'_' && next != b'-'
+            }
+        }
+    })
+}
+
+/// Extract the `BUZZ_MANAGED_AGENT` value from a process's environment.
+/// Returns `None` if the process doesn't have the marker or can't be read.
+#[cfg(target_os = "macos")]
+fn extract_buzz_marker_value(pid: u32) -> Option<String> {
+    let prefix = b"BUZZ_MANAGED_AGENT=";
+    let buf = sweep::procargs2_buffer(pid)?;
+
+    if buf.len() < std::mem::size_of::<libc::c_int>() {
+        return None;
+    }
+    let mut n_args: libc::c_int = 0;
+    unsafe {
+        std::ptr::copy_nonoverlapping(
+            buf.as_ptr(),
+            &mut n_args as *mut libc::c_int as *mut u8,
+            std::mem::size_of::<libc::c_int>(),
+        );
+    }
+    let mut pos = std::mem::size_of::<libc::c_int>();
+
+    // Skip exec path.
+    while pos < buf.len() && buf[pos] != 0 {
+        pos += 1;
+    }
+    while pos < buf.len() && buf[pos] == 0 {
+        pos += 1;
+    }
+    // Skip argc argument strings.
+    let mut args_remaining = n_args;
+    while args_remaining > 0 && pos < buf.len() {
+        while pos < buf.len() && buf[pos] != 0 {
+            pos += 1;
+        }
+        while pos < buf.len() && buf[pos] == 0 {
+            pos += 1;
+        }
+        args_remaining -= 1;
+    }
+    // Search environment entries for our marker.
+    for entry in buf[pos..].split(|&b| b == 0) {
+        if entry.starts_with(prefix) {
+            return String::from_utf8(entry[prefix.len()..].to_vec()).ok();
+        }
+    }
+    None
+}
+
+#[cfg(all(unix, not(target_os = "macos")))]
+fn extract_buzz_marker_value(pid: u32) -> Option<String> {
+    let prefix = b"BUZZ_MANAGED_AGENT=";
+    let data = std::fs::read(format!("/proc/{pid}/environ")).ok()?;
+    for entry in data.split(|&b| b == 0) {
+        if entry.starts_with(prefix) {
+            return String::from_utf8(entry[prefix.len()..].to_vec()).ok();
+        }
+    }
+    None
+}
+
+#[cfg(not(unix))]
+fn extract_buzz_marker_value(_pid: u32) -> Option<String> {
+    None
+}
+
+/// Check if a Buzz desktop process is still alive for the given instance ID.
+/// Scans all user-owned processes named "Buzz" or "buzz-desktop" and checks
+/// whether any has the identifier in its command-line args (KERN_PROCARGS2 buffer
+/// includes both argv and environ — the `--config` JSON from `tauri dev` contains
+/// the identifier string).
+#[cfg(target_os = "macos")]
+fn desktop_is_alive_for_instance(instance_id: &str) -> bool {
+    extern "C" {
+        fn proc_name(pid: libc::c_int, buffer: *mut libc::c_void, buffersize: u32) -> libc::c_int;
+    }
+
+    let my_uid = unsafe { libc::getuid() };
+    let identifier_bytes = instance_id.as_bytes();
+
+    let pids = sweep::collect_all_pids();
+    if pids.is_empty() {
+        return false;
+    }
+
+    for &pid in &pids {
+        if pid <= 0 {
+            continue;
+        }
+        // Check binary name — only look at desktop binaries.
+        let mut name_buf = [0u8; 1024];
+        let len = unsafe {
+            proc_name(
+                pid,
+                name_buf.as_mut_ptr() as *mut libc::c_void,
+                name_buf.len() as u32,
+            )
+        };
+        if len <= 0 {
+            continue;
+        }
+        let name = String::from_utf8_lossy(&name_buf[..len as usize]);
+        if !is_desktop_binary(&name) {
+            continue;
+        }
+        // Verify UID.
+        let mut info = std::mem::MaybeUninit::<BSDInfo>::zeroed();
+        let ret = unsafe {
+            proc_pidinfo(
+                pid,
+                PROC_PIDTBSDINFO,
+                0,
+                info.as_mut_ptr() as *mut libc::c_void,
+                std::mem::size_of::<BSDInfo>() as libc::c_int,
+            )
+        };
+        if ret <= 0 {
+            continue;
+        }
+        let info = unsafe { info.assume_init() };
+        if info.pbi_uid != my_uid {
+            continue;
+        }
+        // Check if this desktop process's args/env contain the identifier.
+        // The KERN_PROCARGS2 buffer holds argv + environ as null-delimited strings.
+        let Some(args_buf) = sweep::procargs2_buffer(pid as u32) else {
+            continue;
+        };
+        // Boundary-anchored search: the identifier in the config JSON is
+        // followed by a non-identifier char (typically `"`). A raw substring
+        // match would let `...app` match inside `...app.dev`.
+        if buffer_contains_identifier(&args_buf, identifier_bytes) {
+            return true;
+        }
+    }
+    false
+}
+
+#[cfg(all(unix, not(target_os = "macos")))]
+fn desktop_is_alive_for_instance(instance_id: &str) -> bool {
+    let my_uid = unsafe { libc::getuid() };
+    let Ok(entries) = std::fs::read_dir("/proc") else {
+        return false;
+    };
+    for entry in entries.flatten() {
+        let name = entry.file_name();
+        let Some(name_str) = name.to_str() else {
+            continue;
+        };
+        let Ok(pid) = name_str.parse::<u32>() else {
+            continue;
+        };
+        // Check ownership.
+        let Ok(meta) = entry.metadata() else {
+            continue;
+        };
+        use std::os::unix::fs::MetadataExt;
+        if meta.uid() != my_uid {
+            continue;
+        }
+        // Check binary name via /proc/<pid>/comm.
+        let Ok(comm) = std::fs::read_to_string(format!("/proc/{pid}/comm")) else {
+            continue;
+        };
+        if !is_desktop_binary(comm.trim()) {
+            continue;
+        }
+        // Check cmdline for the identifier with boundary anchoring.
+        let Ok(cmdline) = std::fs::read(format!("/proc/{pid}/cmdline")) else {
+            continue;
+        };
+        if buffer_contains_identifier(&cmdline, instance_id.as_bytes()) {
+            return true;
+        }
+    }
+    false
+}
+
+#[cfg(not(unix))]
+fn desktop_is_alive_for_instance(_instance_id: &str) -> bool {
+    false
+}
+
+/// Reap agent processes belonging to dead Buzz desktop instances.
+///
+/// Scans all user processes for `BUZZ_MANAGED_AGENT=*`, groups them by
+/// instance ID, and for each foreign instance (≠ `our_instance_id`) checks
+/// whether a Buzz desktop binary is still alive for that instance. If not,
+/// all agents from that dead instance are reaped.
+#[cfg(target_os = "macos")]
+pub(crate) fn reap_dead_instance_agents(our_instance_id: &str, skip_pids: &[u32]) {
+    let my_uid = unsafe { libc::getuid() };
+    let my_pid = std::process::id() as i32;
+
+    let pids = sweep::collect_all_pids();
+    if pids.is_empty() {
+        return;
+    }
+
+    // Collect (pid, instance_id) for all foreign agent processes.
+    let mut foreign_agents: HashMap<String, Vec<i32>> = HashMap::new();
+
+    for &pid in &pids {
+        if pid <= 0 || pid == my_pid {
+            continue;
+        }
+        let upid = pid as u32;
+        if skip_pids.contains(&upid) {
+            continue;
+        }
+        // Verify UID and PPID via proc_pidinfo before the more expensive env scan.
+        let mut info = std::mem::MaybeUninit::<BSDInfo>::zeroed();
+        let ret = unsafe {
+            proc_pidinfo(
+                pid,
+                PROC_PIDTBSDINFO,
+                0,
+                info.as_mut_ptr() as *mut libc::c_void,
+                std::mem::size_of::<BSDInfo>() as libc::c_int,
+            )
+        };
+        if ret <= 0 {
+            continue;
+        }
+        let info = unsafe { info.assume_init() };
+        if info.pbi_uid != my_uid {
+            continue;
+        }
+        // Extract the instance ID from this agent's env.
+        // Do NOT name-gate via process_belongs_to_us — custom harnesses use
+        // arbitrary binary names and BUZZ_MANAGED_AGENT is the authoritative
+        // ownership proof.
+        let Some(agent_instance_id) = extract_buzz_marker_value(upid) else {
+            continue;
+        };
+        // Skip agents belonging to our own instance (handled by sweep_system_agent_processes).
+        if agent_instance_id == our_instance_id {
+            continue;
+        }
+        foreign_agents
+            .entry(agent_instance_id)
+            .or_default()
+            .push(pid);
+    }
+
+    // For each foreign instance, check if its desktop is still alive.
+    for (instance_id, agent_pids) in &foreign_agents {
+        if desktop_is_alive_for_instance(instance_id) {
+            continue;
+        }
+        eprintln!(
+            "buzz-desktop: reaping {} orphaned agent(s) from dead instance '{instance_id}'",
+            agent_pids.len()
+        );
+        resolve_pgids_and_kill(agent_pids);
+    }
+}
+
+#[cfg(all(unix, not(target_os = "macos")))]
+pub(crate) fn reap_dead_instance_agents(our_instance_id: &str, skip_pids: &[u32]) {
+    let my_uid = unsafe { libc::getuid() };
+    let my_pid = std::process::id() as i32;
+    let mut foreign_agents: HashMap<String, Vec<i32>> = HashMap::new();
+
+    let Ok(entries) = std::fs::read_dir("/proc") else {
+        return;
+    };
+    for entry in entries.flatten() {
+        let name = entry.file_name();
+        let Some(name_str) = name.to_str() else {
+            continue;
+        };
+        let Ok(pid) = name_str.parse::<i32>() else {
+            continue;
+        };
+        if pid <= 0 || pid == my_pid {
+            continue;
+        }
+        let upid = pid as u32;
+        if skip_pids.contains(&upid) {
+            continue;
+        }
+        let Ok(meta) = entry.metadata() else {
+            continue;
+        };
+        use std::os::unix::fs::MetadataExt;
+        if meta.uid() != my_uid {
+            continue;
+        }
+        // Do NOT name-gate via process_belongs_to_us — custom harnesses use
+        // arbitrary binary names and BUZZ_MANAGED_AGENT is the authoritative
+        // ownership proof.
+        let Some(agent_instance_id) = extract_buzz_marker_value(upid) else {
+            continue;
+        };
+        if agent_instance_id == our_instance_id {
+            continue;
+        }
+        foreign_agents
+            .entry(agent_instance_id)
+            .or_default()
+            .push(pid);
+    }
+
+    for (instance_id, agent_pids) in &foreign_agents {
+        if desktop_is_alive_for_instance(instance_id) {
+            continue;
+        }
+        eprintln!(
+            "buzz-desktop: reaping {} orphaned agent(s) from dead instance '{instance_id}'",
+            agent_pids.len()
+        );
+        resolve_pgids_and_kill(agent_pids);
+    }
+}
+
+#[cfg(not(unix))]
+pub(crate) fn reap_dead_instance_agents(_our_instance_id: &str, _skip_pids: &[u32]) {}
diff --git a/desktop/src-tauri/src/managed_agents/runtime/lifecycle.rs b/desktop/src-tauri/src/managed_agents/runtime/lifecycle.rs
new file mode 100644
index 0000000000..6363b15d2a
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/runtime/lifecycle.rs
@@ -0,0 +1,125 @@
+use super::*;
+
+/// Kill stale agent processes from a previous session whose PID is still alive
+/// but not tracked in the current `runtimes` map. Updates the record fields and
+/// returns `true` if any records were modified.
+pub fn kill_stale_tracked_processes(
+    records: &mut [ManagedAgentRecord],
+    runtimes: &HashMap<ManagedAgentRuntimeKey, ManagedAgentPairRuntime>,
+    instance_id: &str,
+) -> bool {
+    kill_stale_tracked_processes_with(
+        records,
+        runtimes,
+        |pid| process_has_buzz_marker(pid, instance_id),
+        terminate_process,
+    )
+}
+
+/// Injectable version of `kill_stale_tracked_processes` for testing.
+/// `has_marker(pid)` returns true when the process carries this instance's
+/// `BUZZ_MANAGED_AGENT` marker; `kill(pid)` performs the termination.
+pub(crate) fn kill_stale_tracked_processes_with(
+    records: &mut [ManagedAgentRecord],
+    runtimes: &HashMap<ManagedAgentRuntimeKey, ManagedAgentPairRuntime>,
+    has_marker: impl Fn(u32) -> bool,
+    mut kill: impl FnMut(u32) -> Result<(), String>,
+) -> bool {
+    use crate::managed_agents::BackendKind;
+
+    let mut changed = false;
+    for record in records.iter_mut() {
+        if record.backend != BackendKind::Local {
+            continue;
+        }
+        let Some(pid) = record.runtime_pid else {
+            continue;
+        };
+        if !runtimes.keys().any(|key| key.pubkey == record.pubkey) {
+            // Name-gate is omitted intentionally: custom harnesses use arbitrary
+            // binary names not in KNOWN_AGENT_BINARIES. BUZZ_MANAGED_AGENT is the
+            // authoritative ownership proof; terminate only if it matches.
+            if has_marker(pid) {
+                let _ = kill(pid);
+            }
+            record.runtime_pid = None;
+            record.last_stopped_at = Some(crate::util::now_iso());
+            record.updated_at = crate::util::now_iso();
+            changed = true;
+        }
+    }
+    changed
+}
+
+pub fn sync_managed_agent_processes(
+    records: &mut [ManagedAgentRecord],
+    runtimes: &mut HashMap<ManagedAgentRuntimeKey, ManagedAgentPairRuntime>,
+    _instance_id: &str,
+) -> (bool, Vec<String>) {
+    let mut changed = false;
+    let mut exited = Vec::new();
+
+    for (key, runtime) in runtimes.iter_mut() {
+        let status = match runtime.child.try_wait() {
+            Ok(status) => status,
+            Err(error) => {
+                if let Some(record) = records
+                    .iter_mut()
+                    .find(|record| record.pubkey == key.pubkey)
+                {
+                    record.updated_at = now_iso();
+                    record.last_error = Some(format!("failed to inspect process state: {error}"));
+                    record.last_error_code = None;
+                }
+                changed = true;
+                exited.push(key.clone());
+                continue;
+            }
+        };
+
+        let Some(status) = status else {
+            continue;
+        };
+
+        if let Some(record) = records
+            .iter_mut()
+            .find(|record| record.pubkey == key.pubkey)
+        {
+            record.updated_at = now_iso();
+            record.last_stopped_at = Some(now_iso());
+            record.last_exit_code = status.code();
+            let log_err = if status.success() {
+                None
+            } else {
+                Some(
+                    super::super::meaningful_agent_error_from_log(&runtime.log_path)
+                        .unwrap_or_else(|| super::super::storage::AgentLogError {
+                            message: format!("harness exited with status {status}"),
+                            code: None,
+                        }),
+                )
+            };
+            record.last_error = log_err.as_ref().map(|e| e.message.clone());
+            record.last_error_code = log_err.as_ref().and_then(|e| e.code);
+        }
+
+        changed = true;
+        exited.push(key.clone());
+    }
+
+    let exited_pubkeys: Vec<String> = exited.iter().map(|key| key.pubkey.clone()).collect();
+    for key in exited {
+        runtimes.remove(&key);
+    }
+
+    // `runtime_pid` is legacy bookkeeping. Pair runtimes and receipts are the
+    // authoritative lifecycle source; migration cleanup is handled separately.
+    for record in records.iter_mut() {
+        if record.runtime_pid.take().is_some() {
+            record.updated_at = now_iso();
+            changed = true;
+        }
+    }
+
+    (changed, exited_pubkeys)
+}
diff --git a/desktop/src-tauri/src/managed_agents/runtime/metadata.rs b/desktop/src-tauri/src/managed_agents/runtime/metadata.rs
new file mode 100644
index 0000000000..288ce06b0a
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/runtime/metadata.rs
@@ -0,0 +1,150 @@
+/// Returns the (key, value) env var pairs that should be forwarded to the
+/// agent process for model and provider selection.
+///
+/// Model injection is unconditional — even agents that support ACP model
+/// switching need the initial bootstrap value. Provider injection is skipped
+/// when `provider_locked` is true (e.g. Claude runtimes that only work with
+/// Anthropic).
+pub(crate) fn runtime_metadata_env_vars<'a>(
+    model_env_var: Option<&'a str>,
+    provider_env_var: Option<&'a str>,
+    provider_locked: bool,
+    effective_model: Option<&'a str>,
+    effective_provider: Option<&'a str>,
+) -> Vec<(&'a str, &'a str)> {
+    let mut vars = Vec::new();
+    if let (Some(env_key), Some(model)) = (model_env_var, effective_model) {
+        vars.push((env_key, model));
+    }
+    if !provider_locked {
+        if let (Some(env_key), Some(provider)) = (provider_env_var, effective_provider) {
+            vars.push((env_key, provider));
+        }
+    }
+    vars
+}
+
+/// Env var carrying the session title to the harness. Shared with
+/// `spawn_hash` so the restart badge hashes the same key the spawn writes.
+pub(crate) const SESSION_TITLE_ENV_VAR: &str = "BUZZ_ACP_SESSION_TITLE";
+
+/// Resolve the session title for an agent: its `display_name` when it has one,
+/// otherwise its unique `name` handle. `None` when both are blank, so the
+/// caller clears the env var rather than exporting an empty title.
+///
+/// Control characters are stripped **here**, not left to the harness: an
+/// interior NUL cannot cross the environment boundary at all, so
+/// `Command::env` fails the whole spawn rather than passing it through (see
+/// the same guard applied to user-supplied env in `env_vars::merged_user_env`).
+/// A display name that is nothing but control characters therefore falls back
+/// to `name` instead of turning display chrome into a spawn failure.
+///
+/// The harness still owns whitespace collapsing, the length cap, and channel
+/// qualification — see `sanitize_session_title` and `compose_session_title` in
+/// `buzz-acp`.
+pub(crate) fn resolve_session_title(display_name: Option<&str>, name: &str) -> Option<String> {
+    [display_name, Some(name)]
+        .into_iter()
+        .flatten()
+        .map(|value| {
+            value
+                .chars()
+                .filter(|c| !c.is_control())
+                .collect::<String>()
+                .trim()
+                .to_string()
+        })
+        .find(|value| !value.is_empty())
+}
+
+/// Resolve effective prompt/model/provider using definition-authoritative
+/// semantics for linked instances.
+///
+/// Used by `agent_config.rs` to inject persona defaults into the config surface
+/// before running the reader.
+pub(crate) fn resolve_effective_prompt_model_provider(
+    persona_id: Option<&str>,
+    personas: &[crate::managed_agents::types::AgentDefinition],
+    record_prompt: Option<String>,
+    record_model: Option<String>,
+    record_provider: Option<String>,
+) -> (Option<String>, Option<String>, Option<String>) {
+    match persona_id.and_then(|pid| personas.iter().find(|p| p.id == pid)) {
+        Some(p) => {
+            fn non_blank(v: Option<&str>) -> Option<String> {
+                v.filter(|s| !s.trim().is_empty()).map(str::to_owned)
+            }
+            let prompt = non_blank(Some(&p.system_prompt));
+            let model = non_blank(p.model.as_deref());
+            let provider = non_blank(p.provider.as_deref());
+            (prompt, model, provider)
+        }
+        None => (record_prompt, record_model, record_provider),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::resolve_session_title;
+
+    #[test]
+    fn resolve_session_title_prefers_display_name() {
+        assert_eq!(
+            resolve_session_title(Some("Fizz"), "fizz-1").as_deref(),
+            Some("Fizz")
+        );
+    }
+
+    #[test]
+    fn resolve_session_title_falls_back_to_name_when_display_name_blank() {
+        assert_eq!(
+            resolve_session_title(None, "fizz-1").as_deref(),
+            Some("fizz-1")
+        );
+        assert_eq!(
+            resolve_session_title(Some("  "), "fizz-1").as_deref(),
+            Some("fizz-1")
+        );
+    }
+
+    #[test]
+    fn resolve_session_title_returns_none_when_both_are_blank() {
+        assert_eq!(resolve_session_title(Some(""), "   "), None);
+    }
+
+    #[test]
+    fn resolve_session_title_trims_surrounding_whitespace() {
+        assert_eq!(
+            resolve_session_title(Some("  Fizz  "), "fizz-1").as_deref(),
+            Some("Fizz")
+        );
+    }
+
+    /// An interior NUL cannot cross the env boundary — `Command::env` returns
+    /// `Err` for the whole spawn. Stripping it here keeps a corrupted record
+    /// from turning display chrome into a spawn failure.
+    #[test]
+    fn resolve_session_title_strips_control_chars_that_would_fail_the_spawn() {
+        let title = resolve_session_title(Some("Fi\u{0}zz\u{7}"), "fizz-1")
+            .expect("a name with strippable controls still yields a title");
+        assert_eq!(title, "Fizz");
+        assert!(!title.contains('\u{0}'));
+    }
+
+    /// A display name that is *only* control characters is not a title, so the
+    /// unique handle takes over rather than exporting an empty value.
+    #[test]
+    fn resolve_session_title_falls_back_to_name_when_display_name_is_all_control_chars() {
+        assert_eq!(
+            resolve_session_title(Some("\u{0}\u{1}"), "fizz-1").as_deref(),
+            Some("fizz-1")
+        );
+    }
+
+    /// Both candidates unusable — the caller clears the env var instead of
+    /// exporting a NUL-bearing or empty title.
+    #[test]
+    fn resolve_session_title_returns_none_when_both_candidates_are_control_chars_only() {
+        assert_eq!(resolve_session_title(Some("\u{0}"), "\u{0}"), None);
+    }
+}
diff --git a/desktop/src-tauri/src/managed_agents/runtime/orphan_sweep.rs b/desktop/src-tauri/src/managed_agents/runtime/orphan_sweep.rs
new file mode 100644
index 0000000000..336bbd55ce
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/runtime/orphan_sweep.rs
@@ -0,0 +1,387 @@
+use super::*;
+
+/// Kill orphaned agent processes using PID file receipts. Reads all files from
+/// `agent-pids/`, verifies each PID still belongs to a known agent binary,
+/// then resolves each candidate's actual PGID and signals the process group.
+/// Deletes the PID file after killing.
+///
+/// `skip_pids` are PIDs already handled by the tracked-agent path.
+#[cfg(unix)]
+pub(crate) fn sweep_orphaned_agent_processes(app: &AppHandle, skip_pids: &[u32]) {
+    let legacy_entries = super::super::read_all_agent_pid_files(app);
+    let instance_id = current_instance_id(app);
+    let receipt_entries: Vec<_> = super::super::read_all_agent_runtime_receipts(app)
+        .into_iter()
+        .filter_map(|(path, receipt)| {
+            if valid_agent_runtime_receipt(&path, &receipt, &instance_id) {
+                Some((path, receipt))
+            } else {
+                super::super::remove_agent_runtime_receipt_path(&path);
+                None
+            }
+        })
+        .collect();
+    // Collect live orphans AND dead-leader groups into a single kill batch.
+    // Dead leaders: PGID may have been recycled, but the window is narrow
+    // (PID files are from this session) and the cost of missing surviving
+    // group members outweighs the recycling risk.
+    let targets: Vec<i32> = legacy_entries
+        .iter()
+        .map(|(_, pid)| *pid)
+        .chain(receipt_entries.iter().map(|(_, receipt)| receipt.pid))
+        .filter(|pid| {
+            if skip_pids.contains(pid) {
+                return false;
+            }
+            // Receipt/PID-file entries were written by this instance at spawn
+            // time — they are Buzz-owned by construction; no name gate needed.
+            // Kill live processes; dead ones fall through to receipt cleanup.
+            (process_is_running(*pid) && process_has_buzz_marker(*pid, &instance_id))
+                || !process_is_running(*pid)
+        })
+        .map(|pid| pid as i32)
+        .collect();
+
+    if !targets.is_empty() {
+        resolve_pgids_and_kill(&targets);
+    }
+
+    // Clean up PID files for processes we just killed or that are already gone.
+    for (pubkey, pid) in &legacy_entries {
+        if skip_pids.contains(pid) {
+            continue;
+        }
+        if !process_is_running(*pid) || !process_has_buzz_marker(*pid, &instance_id) {
+            super::super::remove_agent_pid_file(app, pubkey);
+        }
+    }
+    for (_, receipt) in &receipt_entries {
+        if skip_pids.contains(&receipt.pid) {
+            continue;
+        }
+        if !process_is_running(receipt.pid) || !process_has_buzz_marker(receipt.pid, &instance_id) {
+            super::super::remove_agent_runtime_receipt(app, &receipt.key);
+        }
+    }
+}
+
+#[cfg(not(unix))]
+pub(crate) fn sweep_orphaned_agent_processes(app: &AppHandle, _skip_pids: &[u32]) {
+    let _ = app;
+}
+
+// ── macOS process-info FFI (shared by all sweep/reap functions) ──────────
+//
+// `proc_listallpids` lives in `sweep.rs` (which owns `collect_all_pids`).
+// All callers in this file reach it through `sweep::collect_all_pids()`.
+// `proc_pidinfo` and `BSDInfo` are declared here as `pub(super)` so that
+// `sweep.rs` can call `super::proc_pidinfo` / use `super::BSDInfo` without
+// redefining the struct layout in two places.
+
+#[cfg(target_os = "macos")]
+extern "C" {
+    pub(super) fn proc_pidinfo(
+        pid: libc::c_int,
+        flavor: libc::c_int,
+        arg: u64,
+        buffer: *mut libc::c_void,
+        buffersize: libc::c_int,
+    ) -> libc::c_int;
+}
+
+/// Subset of `struct proc_bsdinfo` from `<sys/proc_info.h>`. Layout verified
+/// against the macOS SDK — total size 136 bytes.
+#[cfg(target_os = "macos")]
+#[repr(C)]
+pub(super) struct BSDInfo {
+    _flags_status_xstatus: [u8; 12], // pbi_flags + pbi_status + pbi_xstatus
+    pub(super) pbi_pid: u32,         // offset 12
+    pub(super) pbi_ppid: u32,        // offset 16
+    pub(super) pbi_uid: u32,         // offset 20
+    _rest: [u8; 112],
+}
+
+#[cfg(target_os = "macos")]
+const _: () = assert!(std::mem::size_of::<BSDInfo>() == 136);
+
+#[cfg(target_os = "macos")]
+pub(super) const PROC_PIDTBSDINFO: libc::c_int = 3;
+
+// ── Sweep ownership rule ──────────────────────────────────────────────────────
+//
+// The `BUZZ_MANAGED_AGENT` env marker is the SOLE authoritative ownership
+// proof for sweep/receipt decisions. Do NOT name-gate via
+// `process_belongs_to_us` here — custom harnesses use arbitrary binary names
+// and a name-gated predicate would silently leak their orphans (the old Linux
+// AND-gate bug). `process_belongs_to_us` remains in use only as a cheap
+// pre-check on paths that already know the binary (see runtime/stop.rs).
+// On Windows no `/proc`-based sweep runs, so `process_has_buzz_marker`
+// always returns `false`.
+
+/// Enumerate all processes on the system owned by the current user and kill any
+/// agent binary stamped with *this* instance's `BUZZ_MANAGED_AGENT` marker
+/// (`instance_id`) that isn't in `skip_pids`. This catches orphans that escaped
+/// PID-file-based cleanup (e.g. agent workers spawned with their own process
+/// group whose parent harness already exited and had its PID file removed),
+/// while leaving another live Buzz instance's agents untouched.
+#[cfg(target_os = "macos")]
+pub(crate) fn sweep_system_agent_processes(instance_id: &str, skip_pids: &[u32]) {
+    let my_uid = unsafe { libc::getuid() };
+    let pids = sweep::collect_all_pids();
+    if pids.is_empty() {
+        return;
+    }
+    let my_pid = std::process::id() as i32;
+    let mut orphans: Vec<i32> = Vec::new();
+
+    for &pid in &pids {
+        if pid <= 0 {
+            continue;
+        }
+        let upid = pid as u32;
+        if skip_pids.contains(&upid) || pid == my_pid {
+            continue;
+        }
+        // Verify UID and PPID via proc_pidinfo before the more expensive env scan.
+        let mut info = std::mem::MaybeUninit::<BSDInfo>::zeroed();
+        let ret = unsafe {
+            proc_pidinfo(
+                pid,
+                PROC_PIDTBSDINFO,
+                0,
+                info.as_mut_ptr() as *mut libc::c_void,
+                std::mem::size_of::<BSDInfo>() as libc::c_int,
+            )
+        };
+        if ret <= 0 {
+            continue;
+        }
+        let info = unsafe { info.assume_init() };
+        if info.pbi_uid != my_uid {
+            continue;
+        }
+        // Custom harnesses don't match KNOWN_AGENT_BINARIES by name; the
+        // BUZZ_MANAGED_AGENT env marker is the authoritative ownership proof.
+        if !process_has_buzz_marker(upid, instance_id) {
+            continue;
+        }
+        // Live descendants of a tracked harness are exempt — see sweep::is_live_descendant_*.
+        if sweep::is_live_descendant_macos(upid, info.pbi_ppid, skip_pids) {
+            continue;
+        }
+        orphans.push(pid);
+    }
+
+    if !orphans.is_empty() {
+        eprintln!(
+            "buzz-desktop: system sweep found {} orphaned agent process(es), cleaning up",
+            orphans.len()
+        );
+        resolve_pgids_and_kill(&orphans);
+    }
+}
+
+#[cfg(all(unix, not(target_os = "macos")))]
+pub(crate) fn sweep_system_agent_processes(instance_id: &str, skip_pids: &[u32]) {
+    let my_uid = unsafe { libc::getuid() };
+    let mut orphans: Vec<i32> = Vec::new();
+    let my_pid = std::process::id() as i32;
+
+    let Ok(entries) = std::fs::read_dir("/proc") else {
+        return;
+    };
+    for entry in entries.flatten() {
+        let name = entry.file_name();
+        let Some(name_str) = name.to_str() else {
+            continue;
+        };
+        let Ok(pid) = name_str.parse::<i32>() else {
+            continue;
+        };
+        if pid <= 0 || pid == my_pid {
+            continue;
+        }
+        let upid = pid as u32;
+        if skip_pids.contains(&upid) {
+            continue;
+        }
+        // Check ownership via /proc/<pid> metadata.
+        let Ok(meta) = entry.metadata() else {
+            continue;
+        };
+        use std::os::unix::fs::MetadataExt;
+        if meta.uid() != my_uid {
+            continue;
+        }
+        // Same ownership rule as macOS: the marker is the authoritative gate.
+        // Fixes custom-harness orphan cleanup on Linux.
+        if !process_has_buzz_marker(upid, instance_id) {
+            continue;
+        }
+        // Live descendants of a tracked harness are exempt — see sweep::is_live_descendant_*.
+        if sweep::is_live_descendant_linux(upid, skip_pids) {
+            continue;
+        }
+        orphans.push(pid);
+    }
+
+    if !orphans.is_empty() {
+        eprintln!(
+            "buzz-desktop: system sweep found {} orphaned agent process(es), cleaning up",
+            orphans.len()
+        );
+        resolve_pgids_and_kill(&orphans);
+    }
+}
+
+#[cfg(not(unix))]
+pub(crate) fn sweep_system_agent_processes(_instance_id: &str, _skip_pids: &[u32]) {}
+
+/// Periodic-sweep variant with two-tick grace: only reaps same-instance orphans
+/// that were also seen orphaned on the previous tick. This prevents killing a
+/// legitimately-starting agent that spawned between the skip-list snapshot and
+/// the process scan. Returns the current orphan set for use as `prev_orphans`
+/// on the next tick.
+#[cfg(unix)]
+pub(crate) fn sweep_system_agent_processes_with_grace(
+    instance_id: &str,
+    skip_pids: &[u32],
+    prev_orphans: &std::collections::HashSet<u32>,
+) -> std::collections::HashSet<u32> {
+    let current = collect_same_instance_orphans(instance_id, skip_pids);
+    // Only reap PIDs seen orphaned on two consecutive ticks.
+    let confirmed: Vec<i32> = current
+        .iter()
+        .filter(|pid| prev_orphans.contains(pid))
+        .map(|&pid| pid as i32)
+        .collect();
+    if !confirmed.is_empty() {
+        eprintln!(
+            "buzz-desktop: periodic sweep confirmed {} orphaned agent process(es), cleaning up",
+            confirmed.len()
+        );
+        resolve_pgids_and_kill(&confirmed);
+    }
+    current
+}
+
+#[cfg(not(unix))]
+pub(crate) fn sweep_system_agent_processes_with_grace(
+    _instance_id: &str,
+    _skip_pids: &[u32],
+    _prev_orphans: &std::collections::HashSet<u32>,
+) -> std::collections::HashSet<u32> {
+    std::collections::HashSet::new()
+}
+
+/// Collect PIDs of same-instance agent processes that appear orphaned (not in
+/// `skip_pids`). Returns the set for use in two-tick grace logic — does NOT
+/// kill anything.
+#[cfg(target_os = "macos")]
+pub(crate) fn collect_same_instance_orphans(
+    instance_id: &str,
+    skip_pids: &[u32],
+) -> std::collections::HashSet<u32> {
+    let my_uid = unsafe { libc::getuid() };
+    let my_pid = std::process::id() as i32;
+    let mut orphans = std::collections::HashSet::new();
+
+    let pids = sweep::collect_all_pids();
+    if pids.is_empty() {
+        return orphans;
+    }
+
+    for &pid in &pids {
+        if pid <= 0 || pid == my_pid {
+            continue;
+        }
+        let upid = pid as u32;
+        if skip_pids.contains(&upid) {
+            continue;
+        }
+        let mut info = std::mem::MaybeUninit::<BSDInfo>::zeroed();
+        let ret = unsafe {
+            proc_pidinfo(
+                pid,
+                PROC_PIDTBSDINFO,
+                0,
+                info.as_mut_ptr() as *mut libc::c_void,
+                std::mem::size_of::<BSDInfo>() as libc::c_int,
+            )
+        };
+        if ret <= 0 {
+            continue;
+        }
+        let info = unsafe { info.assume_init() };
+        if info.pbi_uid != my_uid {
+            continue;
+        }
+        // Custom harnesses don't match KNOWN_AGENT_BINARIES by name; the
+        // BUZZ_MANAGED_AGENT env marker is the authoritative ownership proof.
+        if !process_has_buzz_marker(upid, instance_id) {
+            continue;
+        }
+        // Live descendants of a tracked harness are exempt — see sweep::is_live_descendant_*.
+        if sweep::is_live_descendant_macos(upid, info.pbi_ppid, skip_pids) {
+            continue;
+        }
+        orphans.insert(upid);
+    }
+    orphans
+}
+
+#[cfg(all(unix, not(target_os = "macos")))]
+pub(crate) fn collect_same_instance_orphans(
+    instance_id: &str,
+    skip_pids: &[u32],
+) -> std::collections::HashSet<u32> {
+    let my_uid = unsafe { libc::getuid() };
+    let my_pid = std::process::id() as i32;
+    let mut orphans = std::collections::HashSet::new();
+
+    let Ok(entries) = std::fs::read_dir("/proc") else {
+        return orphans;
+    };
+    for entry in entries.flatten() {
+        let name = entry.file_name();
+        let Some(name_str) = name.to_str() else {
+            continue;
+        };
+        let Ok(pid) = name_str.parse::<i32>() else {
+            continue;
+        };
+        if pid <= 0 || pid == my_pid {
+            continue;
+        }
+        let upid = pid as u32;
+        if skip_pids.contains(&upid) {
+            continue;
+        }
+        let Ok(meta) = entry.metadata() else {
+            continue;
+        };
+        use std::os::unix::fs::MetadataExt;
+        if meta.uid() != my_uid {
+            continue;
+        }
+        // Same ownership rule as macOS: the marker is the authoritative gate.
+        // Fixes custom-harness orphan cleanup on Linux.
+        if !process_has_buzz_marker(upid, instance_id) {
+            continue;
+        }
+        // Live descendants of a tracked harness are exempt — see sweep::is_live_descendant_*.
+        if sweep::is_live_descendant_linux(upid, skip_pids) {
+            continue;
+        }
+        orphans.insert(upid);
+    }
+    orphans
+}
+
+#[cfg(not(unix))]
+pub(crate) fn collect_same_instance_orphans(
+    _instance_id: &str,
+    _skip_pids: &[u32],
+) -> std::collections::HashSet<u32> {
+    std::collections::HashSet::new()
+}
diff --git a/desktop/src-tauri/src/managed_agents/runtime/path.rs b/desktop/src-tauri/src/managed_agents/runtime/path.rs
index cf6950f577..efec0c903e 100644
--- a/desktop/src-tauri/src/managed_agents/runtime/path.rs
+++ b/desktop/src-tauri/src/managed_agents/runtime/path.rs
@@ -30,30 +30,25 @@ pub(crate) fn should_skip_claude_executable(path: &std::path::Path, is_windows:
 /// Decide whether the inherited process PATH should be appended to the
 /// composed PATH.
 ///
-/// On Windows, `login_shell_path()` always returns `None` because Git Bash
-/// returns POSIX colon-delimited paths that poison native children.
-/// `Command::env("PATH", …)` replaces rather than extends, so without the
-/// inherited PATH every child loses node/npm/git.
-///
-/// This pure function takes an explicit `is_windows` flag so it can be
-/// unit-tested cross-host (macOS CI can pass `true` to exercise the Windows
-/// policy without needing the `cfg!(windows)` target).
+/// `Command::env("PATH", …)` replaces rather than extends, so a child whose
+/// composed PATH carries no native entries loses every system binary. On
+/// Windows that is the steady state — `login_shell_path()` always returns
+/// `None` because Git Bash returns POSIX colon-delimited paths that poison
+/// native children. On Unix it is the failure mode: a login shell that exits
+/// non-zero or prints nothing also yields `None`, and the child is then left
+/// with only Buzz's managed Node dirs — no `curl`, `sh`, or `tar`, which
+/// silently breaks every `curl … | bash` install. The inherited PATH is the
+/// floor under both cases, appended last so managed dirs keep precedence.
 ///
 /// Rules:
-/// - Only append when `is_windows` — on Unix the login-shell PATH always covers
-///   the needed runtimes.
 /// - Suppress when `had_shell_path` is `true` — if a login-shell PATH was
 ///   supplied it already carries the user's native entries; appending the
 ///   process PATH would double them.
 /// - Suppress when `has_local_context` is `false` — callers that pass no home
 ///   or exe-parent context must not receive a PATH manufactured from ambient
 ///   process state alone.
-pub(crate) fn should_use_inherited(
-    had_shell_path: bool,
-    has_local_context: bool,
-    is_windows: bool,
-) -> bool {
-    is_windows && !had_shell_path && has_local_context
+pub(crate) fn should_use_inherited(had_shell_path: bool, has_local_context: bool) -> bool {
+    !had_shell_path && has_local_context
 }
 
 /// Pure PATH composition kernel shared by the install shell and the runtime/probe paths.
@@ -91,10 +86,14 @@ pub(crate) fn compose_path_entries(
 ///   4. `nvm_bin` — nvm's default Node.js bin dir (if the user uses nvm)
 ///   5. exe parent dir — DMG sidecars under `Contents/MacOS/`
 ///   6. user's login-shell `PATH` — runtimes like node/python from other managers
-///   7. Windows only: the current process `PATH` (appended when no login-shell
-///      PATH exists, because callers use `Command::env("PATH", …)` which
-///      *replaces* the child's PATH — without this, the child loses node/npm/git
-///      and every npm `.cmd` shim fails with `'node' is not recognized`)
+///   7. the current process `PATH` — appended on every platform when no
+///      login-shell PATH exists, because callers use `Command::env("PATH", …)`
+///      which *replaces* the child's PATH. This is the steady state on Windows,
+///      where `login_shell_path()` always returns `None` and without it the
+///      child loses node/npm/git and every npm `.cmd` shim fails with
+///      `'node' is not recognized`; on Unix it is the login-shell-probe failure
+///      fallback, which keeps `curl`/`sh`/`tar` reachable. See
+///      [`should_use_inherited`] for the suppression rules.
 ///
 /// `shell_path` is the raw colon-delimited string from a login shell, so it is
 /// split into individual entries before joining. Pushing it as a single segment
@@ -145,7 +144,7 @@ pub(in crate::managed_agents) fn build_augmented_path(
     let inherited: Vec<PathBuf> = std::env::var_os("PATH")
         .map(|p| std::env::split_paths(&p).collect())
         .unwrap_or_default();
-    let use_inherited = should_use_inherited(had_shell_path, has_local_context, cfg!(windows));
+    let use_inherited = should_use_inherited(had_shell_path, has_local_context);
 
     let parts = compose_path_entries(managed, login, inherited, use_inherited);
     if parts.is_empty() {
@@ -223,29 +222,86 @@ mod tests {
     #[cfg(unix)]
     #[test]
     fn nvm_bin_none_does_not_add_segment() {
+        let _guard = crate::managed_agents::lock_path_mutex();
+        let previous = std::env::var_os("PATH");
+        // With no shell_path the inherited process PATH is appended last, so
+        // pin it to a sentinel to keep the assertion deterministic.
+        std::env::set_var("PATH", "/sentinel/inherited");
+
         let result = build_augmented_path(
             Some(PathBuf::from("/home/user")),
             Some(PathBuf::from("/usr/local/bin")),
             None,
             None,
         );
+
+        match previous {
+            Some(value) => std::env::set_var("PATH", value),
+            None => std::env::remove_var("PATH"),
+        }
+
         let result = result.expect("path");
         assert!(result.starts_with("/home/user/.local/bin:"), "{result}");
-        assert!(result.ends_with(":/usr/local/bin"), "{result}");
+        assert!(!result.contains(".nvm"), "no nvm segment: {result}");
+        assert!(
+            result.contains(":/usr/local/bin:"),
+            "exe parent must precede the inherited PATH: {result}"
+        );
+        assert!(
+            result.ends_with(":/sentinel/inherited"),
+            "inherited PATH must be appended last when no shell_path: {result}"
+        );
     }
 
-    /// On Unix, supplying a `shell_path` must NOT trigger the Windows process-PATH
-    /// fallback — the output must be byte-identical to what it was before this
-    /// fix.
+    /// On Unix with no login-shell PATH, `build_augmented_path` must fall back to
+    /// the inherited process PATH — otherwise the child gets only Buzz-managed
+    /// dirs and loses every system binary (`curl`, `sh`, `tar`).
     #[cfg(unix)]
     #[test]
-    fn unix_shell_path_output_unchanged_by_windows_fallback_logic() {
+    fn unix_appends_process_path_when_no_shell_path() {
+        let _guard = crate::managed_agents::lock_path_mutex();
+        let previous = std::env::var_os("PATH");
+        std::env::set_var("PATH", "/usr/bin:/bin");
+
+        let result = build_augmented_path(Some(PathBuf::from("/home/user")), None, None, None);
+
+        match previous {
+            Some(value) => std::env::set_var("PATH", value),
+            None => std::env::remove_var("PATH"),
+        }
+
+        let result = result.expect("path must not be None with a home dir");
+        assert!(
+            result.starts_with("/home/user/.local/bin:"),
+            "home/.local/bin must be first: {result}"
+        );
+        assert!(
+            result.ends_with(":/usr/bin:/bin"),
+            "process PATH must be last: {result}"
+        );
+    }
+
+    /// On Unix, supplying a `shell_path` must NOT also append the inherited
+    /// process PATH — the login-shell PATH already carries the native entries.
+    #[cfg(unix)]
+    #[test]
+    fn unix_shell_path_suppresses_inherited_fallback() {
+        let _guard = crate::managed_agents::lock_path_mutex();
+        let previous = std::env::var_os("PATH");
+        std::env::set_var("PATH", "/should/not/appear");
+
         let result = build_augmented_path(
             Some(PathBuf::from("/home/user")),
             None,
             Some("/usr/local/bin:/usr/bin:/bin".to_string()),
             None,
         );
+
+        match previous {
+            Some(value) => std::env::set_var("PATH", value),
+            None => std::env::remove_var("PATH"),
+        }
+
         let result = result.expect("path");
         assert!(
             result.ends_with(":/usr/local/bin:/usr/bin:/bin"),
@@ -334,8 +390,8 @@ mod tests {
 // ── Pure policy and composition tests — run on every host ────────────────────
 //
 // These test `should_use_inherited` and `compose_path_entries` with explicit
-// inputs, so they run on macOS/Linux CI and validate the Windows policy
-// behavior without touching process state or requiring a Windows target.
+// inputs, so they run on macOS/Linux CI and validate the cross-platform
+// fallback policy without touching process state or requiring a Windows target.
 #[cfg(test)]
 mod compose_tests {
     use super::{compose_path_entries, is_batch_shim, should_use_inherited};
@@ -347,43 +403,37 @@ mod compose_tests {
 
     // ── should_use_inherited policy matrix ────────────────────────────────────
 
-    /// Windows + no shell path + has local context → must use inherited.
+    /// No shell path + has local context → must use inherited, on every OS.
+    /// This is the steady state on Windows (login_shell_path() is always None)
+    /// and the failure mode on Unix (login shell exited non-zero or printed
+    /// nothing); in both the child would otherwise get no native PATH entries.
     #[test]
-    fn policy_windows_no_shell_with_context_uses_inherited() {
+    fn policy_no_shell_with_context_uses_inherited() {
         assert!(
-            should_use_inherited(false, true, true),
-            "Windows, no shell path, has context → must append inherited"
+            should_use_inherited(false, true),
+            "no shell path, has context → must append inherited"
         );
     }
 
-    /// Windows + shell path present → must NOT use inherited (login path covers it).
+    /// Shell path present → must NOT use inherited (login path covers it).
     #[test]
-    fn policy_windows_shell_path_present_suppresses_inherited() {
+    fn policy_shell_path_present_suppresses_inherited() {
         assert!(
-            !should_use_inherited(true, true, true),
-            "Windows, shell path present → must not append inherited"
+            !should_use_inherited(true, true),
+            "shell path present → must not append inherited"
         );
     }
 
-    /// Windows + no local context → must NOT use inherited (no ambient state).
+    /// No local context → must NOT use inherited (no ambient state).
     #[test]
-    fn policy_windows_no_local_context_suppresses_inherited() {
+    fn policy_no_local_context_suppresses_inherited() {
         assert!(
-            !should_use_inherited(false, false, true),
-            "Windows, no local context → must not append inherited"
-        );
-    }
-
-    /// Non-Windows → never use inherited, regardless of other flags.
-    #[test]
-    fn policy_non_windows_never_uses_inherited() {
-        assert!(
-            !should_use_inherited(false, true, false),
-            "non-Windows must never append inherited PATH"
+            !should_use_inherited(false, false),
+            "no local context → must not append inherited"
         );
         assert!(
-            !should_use_inherited(false, false, false),
-            "non-Windows + no context must never append inherited PATH"
+            !should_use_inherited(true, false),
+            "no local context → must not append inherited even with a shell path"
         );
     }
 
@@ -498,23 +548,25 @@ mod compose_tests {
     // compute the same `should_use_inherited` decision for equivalent inputs.
     // Tests the policy function directly to confirm the wrappers can't drift.
 
-    /// Exhaustive truth-table for `should_use_inherited` — all four input
-    /// combinations that affect real callers. Confirms the policy is correct
-    /// before either wrapper binds to it.
+    /// Exhaustive truth-table for `should_use_inherited` — every input
+    /// combination. Confirms the policy is correct before either wrapper binds
+    /// to it. The rule is OS-independent: the inherited PATH is the floor
+    /// whenever no login-shell PATH was obtained, because the alternative is a
+    /// child with no native binaries at all.
     #[test]
     fn should_use_inherited_policy_truth_table() {
-        // (had_shell, has_context, is_windows) → expected
+        // (had_shell, has_context) → expected
         let cases = [
-            (false, true, true, true),   // Windows, no shell, context → USE
-            (true, true, true, false),   // Windows, shell present → NO
-            (false, false, true, false), // Windows, no context → NO
-            (false, true, false, false), // non-Windows → NO
+            (false, true, true),   // no shell PATH, context → USE (the floor)
+            (true, true, false),   // shell PATH present → NO (already covered)
+            (false, false, false), // no context → NO (no ambient-only PATH)
+            (true, false, false),  // no context → NO, shell PATH irrelevant
         ];
-        for (had_shell, has_ctx, is_win, expected) in cases {
-            let result = should_use_inherited(had_shell, has_ctx, is_win);
+        for (had_shell, has_ctx, expected) in cases {
+            let result = should_use_inherited(had_shell, has_ctx);
             assert_eq!(
                 result, expected,
-                "policy mismatch: had_shell={had_shell} has_ctx={has_ctx} is_win={is_win}"
+                "policy mismatch: had_shell={had_shell} has_ctx={has_ctx}"
             );
         }
     }
diff --git a/desktop/src-tauri/src/managed_agents/runtime/process.rs b/desktop/src-tauri/src/managed_agents/runtime/process.rs
new file mode 100644
index 0000000000..37eb5659a4
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/runtime/process.rs
@@ -0,0 +1,469 @@
+use super::*;
+
+/// Binary name fragments for all known agent/harness processes that Buzz
+/// may spawn. Used by `process_belongs_to_us()` and the orphan sweep to
+/// identify processes we should clean up. Both hyphenated and underscored
+/// variants are listed because macOS `proc_name()` and Linux `/proc/comm`
+/// may report either form depending on how the binary was built.
+pub(crate) const KNOWN_AGENT_BINARIES: &[&str] = &[
+    "buzz-acp",
+    "buzz_acp",
+    "buzz-agent",
+    "buzz_agent",
+    "claude-agent-acp",
+    "claude_agent_acp",
+    "claude-code-acp",
+    "claude_code_acp",
+    "codex-acp",
+    "codex_acp",
+    "goose",
+    // buzz-dev-mcp's multicall personalities (rg, tree, buzz,
+    // git-credential-nostr, git-sign-nostr) are short-lived per-tool-call
+    // invocations — not listed here.
+    "buzz-dev-mcp",
+    "buzz_dev_mcp",
+];
+
+/// Script interpreters that may host managed agent wrappers (e.g. npm shims).
+/// A process whose name matches here is NOT immediately claimed — it must also
+/// carry `BUZZ_MANAGED_AGENT` in its environment (checked by the caller via
+/// `process_has_buzz_marker()`). This avoids sweeping unrelated node processes.
+pub(crate) const KNOWN_SCRIPT_INTERPRETERS: &[&str] = &["node"];
+
+/// Check if a process name matches any of our known agent binaries.
+/// Uses exact match or prefix-with-separator to avoid false positives
+/// (e.g. `"goose"` must not match `"mongoose"`).
+pub(super) fn name_matches_known_binary(name: &str) -> bool {
+    KNOWN_AGENT_BINARIES.iter().any(|&binary| {
+        name == binary || {
+            name.starts_with(binary) && {
+                let rest = &name[binary.len()..];
+                rest.starts_with('-') || rest.starts_with('_') || rest.starts_with('.')
+            }
+        }
+    })
+}
+
+/// Check if a process name is a known script interpreter that may be hosting
+/// a managed agent wrapper (e.g. `node` running an npm shim for `codex-acp`).
+/// Callers must additionally verify `BUZZ_MANAGED_AGENT` ownership.
+pub(super) fn name_matches_interpreter(name: &str) -> bool {
+    KNOWN_SCRIPT_INTERPRETERS.contains(&name)
+}
+
+#[cfg(unix)]
+pub(crate) fn process_is_running(pid: u32) -> bool {
+    // Use libc::kill with signal 0 instead of forking a subprocess.
+    // Returns true only if the process exists AND we can signal it.
+    // Returns false for non-existent PIDs (ESRCH) and PIDs owned by
+    // other users (EPERM) — callers should not interact with those.
+    unsafe { libc::kill(pid as i32, 0) == 0 }
+}
+
+#[cfg(not(unix))]
+pub(crate) fn process_is_running(_pid: u32) -> bool {
+    false
+}
+
+/// Check if a PID belongs to a known agent process we spawned.
+/// Returns false for recycled PIDs that now belong to other processes.
+#[cfg(target_os = "macos")]
+pub(crate) fn process_belongs_to_us(pid: u32) -> bool {
+    // Use proc_name() from libproc to get the process name without spawning
+    // a subprocess.
+    extern "C" {
+        fn proc_name(pid: libc::c_int, buffer: *mut libc::c_void, buffersize: u32) -> libc::c_int;
+    }
+    let mut buf = [0u8; 1024];
+    let len = unsafe {
+        proc_name(
+            pid as i32,
+            buf.as_mut_ptr() as *mut libc::c_void,
+            buf.len() as u32,
+        )
+    };
+    if len <= 0 {
+        return false;
+    }
+    let name = String::from_utf8_lossy(&buf[..len as usize]);
+    // Fall through for script interpreters (e.g. `node` hosting an npm shim):
+    // the caller's `process_has_buzz_marker()` check decides true ownership.
+    name_matches_known_binary(&name) || name_matches_interpreter(&name)
+}
+
+#[cfg(all(unix, not(target_os = "macos")))]
+pub(crate) fn process_belongs_to_us(pid: u32) -> bool {
+    // First try /proc/<pid>/comm. Note: comm is truncated to 15 bytes on Linux,
+    // so binaries with names longer than 15 chars (e.g. "claude-agent-acp")
+    // will never match here.
+    if let Ok(name) = std::fs::read_to_string(format!("/proc/{pid}/comm")) {
+        if name_matches_known_binary(name.trim()) {
+            return true;
+        }
+        // Interpreter check: `node` is 4 bytes, never truncated.
+        if name_matches_interpreter(name.trim()) {
+            return true;
+        }
+    }
+
+    // Fallback: read /proc/<pid>/exe which is a symlink to the full binary path.
+    // This is not subject to the 15-byte truncation limit.
+    if let Ok(exe_path) = std::fs::read_link(format!("/proc/{pid}/exe")) {
+        if let Some(basename) = exe_path.file_name().and_then(|n| n.to_str()) {
+            // Fall through for script interpreters — caller checks the marker.
+            return name_matches_known_binary(basename) || name_matches_interpreter(basename);
+        }
+    }
+
+    false
+}
+
+#[cfg(not(unix))]
+pub(crate) fn process_belongs_to_us(_pid: u32) -> bool {
+    false
+}
+
+/// The value stamped into the `BUZZ_MANAGED_AGENT` env var of every agent we
+/// spawn, identifying *which* desktop instance owns it. We use the app's bundle
+/// identifier (`xyz.block.buzz.app` for release, `xyz.block.buzz.app.dev`
+/// for `just dev`) because it is stable across restarts — a relaunched dev
+/// instance still recognizes its own previously-spawned agents as reclaimable,
+/// while never matching another instance's (e.g. a dev build never reaps a DMG
+/// build's agents, and vice versa). This is what lets two Buzzs coexist on
+/// one machine without one's cleanup nuking the other's agents.
+pub(crate) fn current_instance_id(app: &AppHandle) -> String {
+    app.config().identifier.clone()
+}
+
+/// Build the full `BUZZ_MANAGED_AGENT=<instance-id>` env entry we match
+/// against when scanning processes. Kept here so the spawn stamp and the sweep
+/// matcher can never drift apart.
+pub(super) fn buzz_marker_entry(instance_id: &str) -> Vec<u8> {
+    format!("BUZZ_MANAGED_AGENT={instance_id}").into_bytes()
+}
+
+/// Check if a running process is one of *our* managed agents: it must carry
+/// `BUZZ_MANAGED_AGENT=<instance_id>` in its environment, where `instance_id`
+/// is this desktop instance's id. A process stamped with a *different* instance
+/// id belongs to another live Buzz app and must never be reaped here.
+#[cfg(target_os = "macos")]
+pub(crate) fn process_has_buzz_marker(pid: u32, instance_id: &str) -> bool {
+    let marker = buzz_marker_entry(instance_id);
+    let Some(buf) = sweep::procargs2_buffer(pid) else {
+        return false;
+    };
+
+    // Buffer layout: [i32 argc][exec_path\0][null padding][argv\0...][env\0...]
+    if buf.len() < std::mem::size_of::<libc::c_int>() {
+        return false;
+    }
+    let mut n_args: libc::c_int = 0;
+    unsafe {
+        std::ptr::copy_nonoverlapping(
+            buf.as_ptr(),
+            &mut n_args as *mut libc::c_int as *mut u8,
+            std::mem::size_of::<libc::c_int>(),
+        );
+    }
+    let mut pos = std::mem::size_of::<libc::c_int>();
+
+    // Skip exec path (scan to first null).
+    while pos < buf.len() && buf[pos] != 0 {
+        pos += 1;
+    }
+    // Skip null padding between exec path and argv[0].
+    while pos < buf.len() && buf[pos] == 0 {
+        pos += 1;
+    }
+    // Skip argc argument strings.
+    let mut args_remaining = n_args;
+    while args_remaining > 0 && pos < buf.len() {
+        while pos < buf.len() && buf[pos] != 0 {
+            pos += 1;
+        }
+        while pos < buf.len() && buf[pos] == 0 {
+            pos += 1;
+        }
+        args_remaining -= 1;
+    }
+    // Remaining bytes are null-delimited environment strings.
+    buf[pos..].split(|&b| b == 0).any(|entry| entry == marker)
+}
+
+#[cfg(all(unix, not(target_os = "macos")))]
+pub(crate) fn process_has_buzz_marker(pid: u32, instance_id: &str) -> bool {
+    let marker = buzz_marker_entry(instance_id);
+    let Ok(data) = std::fs::read(format!("/proc/{pid}/environ")) else {
+        return false;
+    };
+    data.split(|&b| b == 0).any(|entry| entry == marker)
+}
+
+#[cfg(not(unix))]
+pub(crate) fn process_has_buzz_marker(_pid: u32, _instance_id: &str) -> bool {
+    false
+}
+
+#[cfg(unix)]
+fn signal_process_group_or_leader(pid: u32, signal: i32, action: &str) -> Result<(), String> {
+    let pgid = -(pid as i32);
+
+    if unsafe { libc::kill(pgid, signal) } == 0 {
+        return Ok(());
+    }
+
+    let group_err = std::io::Error::last_os_error();
+    if !process_is_running(pid) {
+        return Ok(());
+    }
+
+    // Some local agent trees can no longer be signalled as a process group
+    // (for example if the leader changed groups, or macOS returns EPERM for one
+    // descendant). Fall back to the leader PID so stop/delete can still recover.
+    if matches!(
+        group_err.raw_os_error(),
+        Some(libc::EPERM) | Some(libc::ESRCH)
+    ) {
+        if unsafe { libc::kill(pid as i32, signal) } == 0 {
+            return Ok(());
+        }
+
+        let leader_err = std::io::Error::last_os_error();
+        if leader_err.raw_os_error() == Some(libc::ESRCH) || !process_is_running(pid) {
+            return Ok(());
+        }
+
+        return Err(format!("failed to {action} process {pid}: {leader_err}"));
+    }
+
+    Err(format!(
+        "failed to {action} process group {pid}: {group_err}"
+    ))
+}
+
+#[cfg(unix)]
+pub(crate) fn terminate_process(pid: u32) -> Result<(), String> {
+    // Try graceful shutdown first (SIGTERM to the group).
+    signal_process_group_or_leader(pid, libc::SIGTERM, "terminate")?;
+
+    // Wait up to 1s for graceful exit.
+    for _ in 0..10 {
+        if !process_is_running(pid) {
+            return Ok(());
+        }
+        std::thread::sleep(std::time::Duration::from_millis(100));
+    }
+
+    // Escalate to SIGKILL on the entire group.
+    signal_process_group_or_leader(pid, libc::SIGKILL, "kill")?;
+
+    Ok(())
+}
+
+#[cfg(windows)]
+pub(crate) fn terminate_process(pid: u32) -> Result<(), String> {
+    // No job handle is available on this path (e.g. after an app restart, when
+    // we only recovered the PID from the record), so fall back to taskkill on
+    // the whole tree.
+    super::super::process_lifecycle::taskkill_tree(pid)
+}
+
+#[cfg(not(any(unix, windows)))]
+pub(crate) fn terminate_process(_pid: u32) -> Result<(), String> {
+    Err("managed agent shutdown after app restart is not supported on this platform".to_string())
+}
+
+/// Send SIGTERM to all given PIDs (as process groups), wait, then SIGKILL
+/// any survivors. Uses `-pid` to kill the entire process group — if an
+/// orphaned agent called `setsid()`, it IS the group leader, so this
+/// reaches its children too.
+#[cfg(unix)]
+fn sigterm_then_sigkill(pids: &[i32]) {
+    // Send SIGTERM to each process group. Track whether any signal was
+    // actually delivered so we can skip the sleep when everything is
+    // already gone.
+    let mut any_signalled = false;
+    for &pid in pids {
+        if unsafe { libc::kill(-pid, libc::SIGTERM) } == 0 {
+            any_signalled = true;
+        }
+    }
+
+    if !any_signalled {
+        return;
+    }
+
+    std::thread::sleep(std::time::Duration::from_millis(200));
+
+    for &pid in pids {
+        // Check if the group has any living members, not just the leader.
+        // kill(-pid, 0) returns 0 if ANY member of the group is signalable.
+        if unsafe { libc::kill(-pid, 0) } == 0 {
+            unsafe {
+                libc::kill(-pid, libc::SIGKILL);
+            }
+        }
+    }
+}
+
+/// Resolve orphan candidate PIDs to their actual process group IDs, dedupe,
+/// and signal the groups. An orphaned grandchild (e.g. `goose` or `buzz-dev-mcp`)
+/// whose harness has exited retains the harness's PGID — signaling that PGID
+/// kills the entire orphaned subtree. Falls back to the candidate PID itself
+/// when PGID resolution fails (process may have exited between detection and
+/// kill).
+#[cfg(target_os = "macos")]
+pub(super) fn resolve_pgids_and_kill(candidate_pids: &[i32]) {
+    let candidate_set: std::collections::HashSet<i32> = candidate_pids.iter().copied().collect();
+    let mut pgids = std::collections::HashSet::new();
+    for &pid in candidate_pids {
+        let pgid = unsafe { libc::getpgid(pid) };
+        if pgid > 0 {
+            pgids.insert(pgid);
+        } else {
+            // Process may have exited; try signaling it directly as a group.
+            pgids.insert(pid);
+        }
+    }
+    // PID-recycling guard: if a resolved PGID is alive but isn't one of our
+    // orphan candidates, the old harness PID was recycled by a new process
+    // that called setsid() — skip it to avoid killing an unrelated group.
+    let candidate_groups = pgids.len();
+    pgids.retain(|&pgid| {
+        if candidate_set.contains(&pgid) {
+            return true;
+        }
+        let alive = unsafe { libc::kill(pgid, 0) } == 0;
+        !alive
+    });
+    if pgids.is_empty() && candidate_groups > 0 {
+        eprintln!(
+            "buzz-desktop: orphan sweep: skipped all {candidate_groups} candidate group(s) (live foreign group leader or candidate already exited); nothing signalled"
+        );
+    }
+    let unique: Vec<i32> = pgids.into_iter().collect();
+    sigterm_then_sigkill(&unique);
+}
+
+/// Resolve orphan candidate PIDs to their actual process group IDs, dedupe,
+/// and signal the groups. Linux variant reads PGID from /proc/<pid>/stat.
+#[cfg(all(unix, not(target_os = "macos")))]
+pub(super) fn resolve_pgids_and_kill(candidate_pids: &[i32]) {
+    let candidate_set: std::collections::HashSet<i32> = candidate_pids.iter().copied().collect();
+    let mut pgids = std::collections::HashSet::new();
+    for &pid in candidate_pids {
+        if let Some((_, pgid)) = sweep::proc_stat_ppid_pgid_linux(pid as u32) {
+            pgids.insert(pgid as i32);
+        } else {
+            // Process may have exited; try signaling it directly as a group.
+            pgids.insert(pid);
+        }
+    }
+    // PID-recycling guard: if a resolved PGID is alive but isn't one of our
+    // orphan candidates, the old harness PID was recycled by a new process
+    // that called setsid() — skip it to avoid killing an unrelated group.
+    let candidate_groups = pgids.len();
+    pgids.retain(|&pgid| {
+        if candidate_set.contains(&pgid) {
+            return true;
+        }
+        let alive = unsafe { libc::kill(pgid, 0) } == 0;
+        !alive
+    });
+    if pgids.is_empty() && candidate_groups > 0 {
+        eprintln!(
+            "buzz-desktop: orphan sweep: skipped all {candidate_groups} candidate group(s) (live foreign group leader or candidate already exited); nothing signalled"
+        );
+    }
+    let unique: Vec<i32> = pgids.into_iter().collect();
+    sigterm_then_sigkill(&unique);
+}
+
+pub(crate) fn valid_agent_runtime_receipt(
+    path: &std::path::Path,
+    receipt: &super::super::ManagedAgentRuntimeReceipt,
+    instance_id: &str,
+) -> bool {
+    valid_agent_runtime_receipt_with(
+        path,
+        receipt,
+        instance_id,
+        process_is_running,
+        process_has_buzz_marker,
+    )
+}
+
+/// Injectable version of `valid_agent_runtime_receipt` for testing.
+/// `is_running(pid)` and `has_marker(pid, instance_id)` can be substituted by
+/// test doubles without spawning real processes.
+pub(crate) fn valid_agent_runtime_receipt_with(
+    path: &std::path::Path,
+    receipt: &super::super::ManagedAgentRuntimeReceipt,
+    instance_id: &str,
+    is_running: impl Fn(u32) -> bool,
+    has_marker: impl Fn(u32, &str) -> bool,
+) -> bool {
+    let Ok(canonical) =
+        ManagedAgentRuntimeKey::new(receipt.key.pubkey.clone(), &receipt.key.relay_url)
+    else {
+        return false;
+    };
+    canonical == receipt.key
+        && path.file_name().and_then(|name| name.to_str())
+            == Some(&format!("{}.json", receipt.key.runtime_id()))
+        && receipt.desktop_instance_id == instance_id
+        && is_running(receipt.pid)
+        // Receipts are written by THIS instance at spawn time, so they are
+        // Buzz-owned by construction. Marker-only ownership: custom-harness
+        // binaries (not in KNOWN_AGENT_BINARIES) must not be rejected by a
+        // name gate — see the sweep ownership rule in runtime/orphan_sweep.rs.
+        && has_marker(receipt.pid, &receipt.desktop_instance_id)
+}
+
+pub(super) fn terminate_runtime_receipt_with(
+    path: &std::path::Path,
+    receipt: &super::super::ManagedAgentRuntimeReceipt,
+    terminate: impl FnOnce(u32) -> Result<(), String>,
+    mut is_running: impl FnMut(u32) -> bool,
+    remove: impl FnOnce(&std::path::Path),
+) -> Result<(), String> {
+    terminate(receipt.pid)?;
+    for _ in 0..20 {
+        if !is_running(receipt.pid) {
+            remove(path);
+            return Ok(());
+        }
+        std::thread::sleep(std::time::Duration::from_millis(100));
+    }
+    Err(format!(
+        "prior runtime {} for pair {} on {} did not exit",
+        receipt.pid, receipt.key.pubkey, receipt.key.relay_url
+    ))
+}
+
+/// Replace a valid prior-session process before registering a new child for
+/// the same pair. The caller must hold the runtime transition lock so receipt
+/// inspection, termination, spawn, and registration cannot race shutdown or
+/// another start.
+pub(crate) fn terminate_untracked_pair_runtime(
+    app: &AppHandle,
+    key: &ManagedAgentRuntimeKey,
+) -> Result<(), String> {
+    let instance_id = current_instance_id(app);
+    let Some((path, receipt)) = super::super::read_all_agent_runtime_receipts(app)
+        .into_iter()
+        .find(|(path, receipt)| {
+            receipt.key == *key && valid_agent_runtime_receipt(path, receipt, &instance_id)
+        })
+    else {
+        return Ok(());
+    };
+
+    terminate_runtime_receipt_with(
+        &path,
+        &receipt,
+        terminate_process,
+        process_is_running,
+        super::super::remove_agent_runtime_receipt_path,
+    )
+}
diff --git a/desktop/src-tauri/src/managed_agents/runtime/tests.rs b/desktop/src-tauri/src/managed_agents/runtime/tests.rs
index fd758047c3..3f6ee996f6 100644
--- a/desktop/src-tauri/src/managed_agents/runtime/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/runtime/tests.rs
@@ -1,5 +1,12 @@
 use crate::managed_agents::known_acp_runtime;
 
+// ── desktop binary name tests ───────────────────────────────────────────
+
+#[test]
+fn appimage_binary_matches_truncated_linux_comm_name() {
+    assert!(super::is_desktop_binary("buzz-desktop.bi"));
+}
+
 // ── buffer_contains_identifier tests ────────────────────────────────────
 
 #[test]
@@ -46,8 +53,7 @@ fn identifier_exact_match_at_end_of_buffer() {
 
 #[test]
 fn longer_id_matches_when_short_prefix_also_present() {
-    // Searching for the longer ID finds it even when a shorter prefix token
-    // appears earlier — Thufir's "longer-of-prefix must match" case.
+    // The longer ID still matches when a shorter prefix token appears earlier.
     let mut buf = b"xyz.block.buzz.app".to_vec();
     buf.push(0);
     buf.extend_from_slice(br#""identifier":"xyz.block.buzz.app.dev""#);
@@ -65,8 +71,7 @@ fn identifier_empty_returns_false() {
 
 #[test]
 fn marker_entry_is_namespaced_by_instance_id() {
-    // The spawn stamp and the sweep matcher must produce identical bytes;
-    // both go through buzz_marker_entry, so this pins the on-the-wire
+    // The spawn stamp and sweep matcher both go through buzz_marker_entry, pinning the on-the-wire
     // format and guards against a dev build (`...app.dev`) matching a
     // release build's (`...app`) agents.
     assert_eq!(
@@ -168,8 +173,10 @@ fn fixture(
         name_pool: Vec::new(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         definition_respond_to: None,
         definition_respond_to_allowlist: Vec::new(),
         definition_parallelism: None,
@@ -287,8 +294,10 @@ fn persona_with_provider(
         name_pool: Vec::new(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: std::collections::BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -308,20 +317,16 @@ fn persona_with_provider(
 // that the old create-time env baking silently blocked.
 
 use crate::managed_agents::env_vars::{live_persona_env, merged_user_env};
-use crate::managed_agents::persona_events::persona_snapshot;
 use std::collections::BTreeMap;
 
 /// Apply a persona snapshot onto a record, mirroring `create_managed_agent`:
-/// snapshotted prompt/model/provider/source_version are pinned, with the
-/// system_prompt unwrapped (the persona always carries one). `env_vars` is
-/// deliberately NOT touched — it stays agent overrides only.
+/// links the record to `persona.id`, then delegates the actual snapshot
+/// (prompt/model/provider/runtime/source_version) to the real production
+/// `apply_persona_snapshot` — so a change to that function's behavior is
+/// exercised by these tests instead of silently diverging from it.
 fn pin_persona(record: &mut ManagedAgentRecord, persona: &crate::managed_agents::AgentDefinition) {
-    let snapshot = persona_snapshot(persona);
     record.persona_id = Some(persona.id.clone());
-    record.system_prompt = snapshot.system_prompt;
-    record.model = snapshot.model;
-    record.provider = snapshot.provider;
-    record.persona_source_version = Some(snapshot.source_version);
+    crate::managed_agents::persona_events::apply_persona_snapshot(record, persona);
 }
 
 fn persona_v(
@@ -421,19 +426,31 @@ fn agent_env_overrides_win_over_persona_env_at_spawn() {
 }
 
 #[test]
-fn orphaned_agent_spawns_from_its_own_overrides() {
-    // Persona deleted: the live merge degrades to the record's own overrides.
+fn orphaned_agent_refused_at_spawn_boundary() {
+    // Persona deleted: `spawn_agent_child` must refuse before any process
+    // side effect, not silently degrade to the record's stale overrides.
+    // `require_resolved` on the shared resolver is the pure predicate
+    // `spawn_agent_child` checks first — this pins the contract without
+    // needing a real `AppHandle`.
     let persona = persona_v("p", "prompt", &[("ANTHROPIC_API_KEY", "persona-key")]);
     let mut record = fixture(RespondTo::Anyone, vec![], Some("tag".into()));
     record.env_vars = BTreeMap::from([("EXTRA".to_string(), "agent-value".to_string())]);
     pin_persona(&mut record, &persona);
 
-    let env = spawn_user_env(&record, &[]);
-    assert_eq!(env.get("EXTRA").map(String::as_str), Some("agent-value"));
+    // The persona is absent from the live catalog — same shape restore/start
+    // see when a persona was deleted on another device.
+    let no_personas: &[crate::managed_agents::AgentDefinition] = &[];
+    let error = crate::managed_agents::effective_config::resolve_effective_config(
+        &record,
+        no_personas,
+        &Default::default(),
+    )
+    .require_resolved()
+    .unwrap_err();
     assert_eq!(
-        env.get("ANTHROPIC_API_KEY"),
-        None,
-        "a deleted persona's env must not linger"
+        error,
+        crate::managed_agents::effective_config::ORPHANED_INSTANCE_ERROR.to_string(),
+        "an orphaned linked instance must be refused, not spawned from its own overrides"
     );
 }
 
@@ -693,14 +710,30 @@ fn grandchild_inherits_pgid_of_process_group_leader() {
     // spawns an intermediate child which in turn spawns a grandchild.
     // This mirrors the real tree: buzz-acp → goose → buzz-dev-mcp.
     //
-    // The intermediate `sh` uses exec to replace itself with another sh
-    // that backgrounds the grandchild, so the grandchild's ppid is the
-    // intermediate (not the harness).
+    // The intermediate `sh` backgrounds the grandchild and echoes its PID,
+    // so the grandchild's ppid is the intermediate (not the harness).
+    //
+    // The trailing `sleep 10` keeps the harness (the process group leader)
+    // alive through the assertions below: without it the harness exits as
+    // soon as the intermediate echoes, and under parallel test load it can
+    // be reaped before `getpgid(harness_pid)` runs (observed flake —
+    // getpgid returned -1). The group is killed in cleanup, so the sleep
+    // never runs to term.
+    //
+    // Absolute `/bin/sh` and `/bin/sleep` rather than bare names: parallel
+    // tests holding `lock_path_mutex` legitimately swap PATH to a tempdir,
+    // and this test doesn't need the lock — but a PATH lookup during the
+    // swap window fails with NotFound, and a child spawned during it
+    // inherits the poisoned PATH for its lifetime, so the script's inner
+    // lookups must be absolute too (observed flake).
     let mut harness = {
-        let mut cmd = Command::new("sh");
-        cmd.args(["-c", "sh -c 'sleep 10 & echo $!' & wait $!"])
-            .stdout(std::process::Stdio::piped())
-            .process_group(0);
+        let mut cmd = Command::new("/bin/sh");
+        cmd.args([
+            "-c",
+            "/bin/sh -c '/bin/sleep 10 & echo $!' & wait $!; /bin/sleep 10",
+        ])
+        .stdout(std::process::Stdio::piped())
+        .process_group(0);
         cmd.spawn().expect("spawn harness")
     };
 
@@ -784,9 +817,15 @@ fn own_group_grandchild_detected_by_ancestor_walk() {
     // The test process is the "harness". Spawn an intermediate with its own
     // process group (mirrors the node shim). It backgrounds a grandchild
     // (sleep 30) and prints the grandchild PID so we can inspect it.
+    //
+    // Absolute `/bin/sh` and `/bin/sleep` — no PATH lookups anywhere in this
+    // tree. Parallel tests holding `lock_path_mutex` legitimately swap PATH to
+    // a tempdir; the outer spawn during that window fails with NotFound, and a
+    // child spawned during it inherits the poisoned PATH for its lifetime, so
+    // inner lookups must be absolute too (observed flake).
     let mut intermediate = {
-        let mut cmd = Command::new("sh");
-        cmd.args(["-c", "sleep 30 & echo $!; wait"])
+        let mut cmd = Command::new("/bin/sh");
+        cmd.args(["-c", "/bin/sleep 30 & echo $!; wait"])
             .stdout(std::process::Stdio::piped())
             .process_group(0);
         cmd.spawn().expect("spawn intermediate")
@@ -1003,3 +1042,275 @@ fn invalid_pubkey_resolves_no_pair_key() {
     // the summary must fall back to the stopped/legacy-pid path, not panic.
     assert!(super::resolve_workspace_pair_key("not-a-key", "", "wss://one.example").is_none());
 }
+
+// ── Custom-harness orphan sweep coverage ─────────────────────────────────────
+//
+// The sweep/receipt ownership gate must include any process carrying the
+// `BUZZ_MANAGED_AGENT` env marker, regardless of whether the binary name
+// matches `KNOWN_AGENT_BINARIES`. Custom harnesses use arbitrary binary names
+// so name-match alone would silently leak their orphans on crash.
+//
+// Previously: macOS used a two-check OR+AND pattern (equivalent to just marker),
+//             Linux used an AND-gate (name + marker) — wrong for custom harnesses.
+// Fix: all platforms gate on `process_has_buzz_marker` alone; the receipt path
+//      is verified below via `valid_agent_runtime_receipt_with` (injectable),
+//      which no longer takes a name-check predicate at all — reinstating an
+//      AND-gate would be a signature change these tests would catch.
+
+// ── Collector-discriminating sweep tests (C-9 / Thufir F6) ──────────────────
+//
+// `kill_stale_tracked_processes_with` and `valid_agent_runtime_receipt_with`
+// accept injectable predicates so the sweep logic can be verified without
+// spawning real processes.  These tests drive the injection path directly,
+// discriminating on custom-harness vs known-binary vs marker presence.
+
+#[test]
+fn kill_stale_custom_harness_with_marker_is_terminated() {
+    // A record with a PID not in the live runtime map and with the Buzz marker
+    // should be terminated even though the binary name is not in KNOWN_AGENT_BINARIES.
+    let mut record = minimal_record("pubkey-custom");
+    record.runtime_pid = Some(9001);
+    let mut records = vec![record];
+    let runtimes = std::collections::HashMap::new();
+
+    let mut killed = vec![];
+    let changed = super::kill_stale_tracked_processes_with(
+        &mut records,
+        &runtimes,
+        |_pid| true, // simulate: marker present (custom harness we own)
+        |pid| {
+            killed.push(pid);
+            Ok(())
+        },
+    );
+
+    assert!(changed, "stale record with marker should mark changed");
+    assert_eq!(killed, vec![9001u32], "marked process must be killed");
+    assert!(
+        records[0].runtime_pid.is_none(),
+        "runtime_pid must be cleared"
+    );
+}
+
+#[test]
+fn kill_stale_process_without_marker_is_skipped() {
+    // A record PID without the marker (not our process — e.g. custom binary
+    // from another tool) should be skipped for termination but still cleared.
+    let mut record = minimal_record("pubkey-foreign");
+    record.runtime_pid = Some(9002);
+    let mut records = vec![record];
+    let runtimes = std::collections::HashMap::new();
+
+    let mut killed = vec![];
+    let changed = super::kill_stale_tracked_processes_with(
+        &mut records,
+        &runtimes,
+        |_pid| false, // simulate: no marker (not our process)
+        |pid| {
+            killed.push(pid);
+            Ok(())
+        },
+    );
+
+    assert!(
+        changed,
+        "stale record without marker should still mark changed"
+    );
+    assert!(
+        killed.is_empty(),
+        "process without marker must not be killed"
+    );
+    assert!(
+        records[0].runtime_pid.is_none(),
+        "runtime_pid must be cleared regardless"
+    );
+}
+
+#[test]
+fn kill_stale_live_pair_is_not_touched() {
+    // A record whose PID is in the live runtime map is NOT stale — skip it entirely.
+    use crate::managed_agents::ManagedAgentRuntimeKey;
+    let pubkey = "aa".repeat(32); // 64 hex chars — satisfies ManagedAgentRuntimeKey validation
+    let mut record = minimal_record(&pubkey);
+    record.runtime_pid = Some(9003);
+    let key = ManagedAgentRuntimeKey::new(pubkey, "wss://relay.example").unwrap();
+    let mut runtimes = std::collections::HashMap::new();
+    // Insert a placeholder runtime — value shape doesn't matter for the key lookup.
+    runtimes.insert(key, make_pair_runtime_placeholder());
+    let original_pid = record.runtime_pid;
+    let mut records = vec![record];
+
+    let mut killed = vec![];
+    let changed = super::kill_stale_tracked_processes_with(
+        &mut records,
+        &runtimes,
+        |_pid| true,
+        |pid| {
+            killed.push(pid);
+            Ok(())
+        },
+    );
+
+    assert!(!changed, "live pair must not be marked changed");
+    assert!(killed.is_empty(), "live pair process must not be killed");
+    assert_eq!(
+        records[0].runtime_pid, original_pid,
+        "live pair runtime_pid must not be cleared"
+    );
+}
+
+#[test]
+fn receipt_valid_with_marker_and_running() {
+    // Custom harness receipt: custom binary (not in KNOWN_AGENT_BINARIES), has_marker=true, is_running=true.
+    // Must be valid — marker is the authoritative gate.
+    use crate::managed_agents::ManagedAgentRuntimeKey;
+    let key = ManagedAgentRuntimeKey::new("bb".repeat(32), "wss://relay.example").unwrap();
+    let receipt = receipt_fixture(key.clone());
+    let path = std::path::PathBuf::from(format!("{}.json", key.runtime_id()));
+
+    let valid = super::valid_agent_runtime_receipt_with(
+        &path,
+        &receipt,
+        "test-instance",
+        |_pid| true,       // is_running
+        |_pid, _iid| true, // has_marker: true (custom binary — no name gate)
+    );
+    assert!(
+        valid,
+        "custom harness with marker and running pid must be valid"
+    );
+}
+
+#[test]
+fn receipt_invalid_known_binary_without_marker() {
+    // Known binary name but no marker — stray process, must not be valid.
+    use crate::managed_agents::ManagedAgentRuntimeKey;
+    let key = ManagedAgentRuntimeKey::new("cc".repeat(32), "wss://relay.example").unwrap();
+    let receipt = receipt_fixture(key.clone());
+    let path = std::path::PathBuf::from(format!("{}.json", key.runtime_id()));
+
+    let valid = super::valid_agent_runtime_receipt_with(
+        &path,
+        &receipt,
+        "test-instance",
+        |_pid| true,        // is_running
+        |_pid, _iid| false, // has_marker: false (not our process)
+    );
+    assert!(!valid, "known binary without marker must not be valid");
+}
+
+#[test]
+fn receipt_invalid_when_process_not_running() {
+    // Even with marker, a non-running process must not be valid.
+    use crate::managed_agents::ManagedAgentRuntimeKey;
+    let key = ManagedAgentRuntimeKey::new("dd".repeat(32), "wss://relay.example").unwrap();
+    let receipt = receipt_fixture(key.clone());
+    let path = std::path::PathBuf::from(format!("{}.json", key.runtime_id()));
+
+    let valid = super::valid_agent_runtime_receipt_with(
+        &path,
+        &receipt,
+        "test-instance",
+        |_pid| false,      // is_running: false
+        |_pid, _iid| true, // has_marker
+    );
+    assert!(
+        !valid,
+        "non-running process must not be valid regardless of marker"
+    );
+}
+
+// ── Test helpers ────────────────────────────────────────────────────────────
+
+fn minimal_record(pubkey: &str) -> crate::managed_agents::ManagedAgentRecord {
+    serde_json::from_str(&format!(
+        r#"{{
+            "pubkey": "{pubkey}",
+            "name": "test",
+            "private_key_nsec": "nsec1fake",
+            "relay_url": "",
+            "acp_command": "buzz-acp",
+            "agent_command": "buzz-agent",
+            "agent_args": [],
+            "mcp_command": "",
+            "turn_timeout_seconds": 320,
+            "system_prompt": null,
+            "model": null,
+            "provider": null,
+            "env_vars": {{}},
+            "created_at": "2026-01-01T00:00:00Z",
+            "updated_at": "2026-01-01T00:00:00Z",
+            "last_started_at": null,
+            "last_stopped_at": null,
+            "last_exit_code": null,
+            "last_error": null
+        }}"#
+    ))
+    .expect("minimal_record fixture")
+}
+
+fn make_pair_runtime_placeholder() -> crate::managed_agents::ManagedAgentPairRuntime {
+    use std::process::{Command, Stdio};
+    // Spawn a real child so ManagedAgentProcess's Child field is satisfied.
+    // `true` exits immediately with 0 — just a handle we need for type purposes.
+    //
+    // Absolute `/usr/bin/true` on unix (present on both macOS and Linux):
+    // parallel tests holding `lock_path_mutex` swap PATH to a tempdir, and a
+    // bare `true` lookup during that window fails with NotFound (observed
+    // flake). Windows keeps the PATH lookup — no test there swaps PATH.
+    #[cfg(unix)]
+    let program = "/usr/bin/true";
+    #[cfg(windows)]
+    let program = "true";
+    let child = Command::new(program)
+        .stdin(Stdio::null())
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .spawn()
+        .expect("spawn true for placeholder");
+    let process = crate::managed_agents::ManagedAgentProcess {
+        child,
+        log_path: std::path::PathBuf::new(),
+        spawn_config_hash: 0,
+        setup_mode: false,
+        adapter_availability: None,
+        start_nonce: "test-nonce".to_string(),
+        #[cfg(windows)]
+        job: None,
+    };
+    crate::managed_agents::ManagedAgentPairRuntime::starting(process)
+}
+
+// ── restart_eligible tests ──────────────────────────────────────────────
+
+#[test]
+fn restart_eligible_true_when_non_orphan_has_hash_drift() {
+    assert!(super::restart_eligible(false, true, false));
+}
+
+#[test]
+fn restart_eligible_true_when_non_orphan_has_availability_drift() {
+    assert!(super::restart_eligible(false, false, true));
+}
+
+#[test]
+fn restart_eligible_false_when_orphan_has_hash_drift() {
+    // An orphan can never be restarted successfully — spawn refuses it —
+    // so hash drift alone must not surface "Restart required".
+    assert!(!super::restart_eligible(true, true, false));
+}
+
+#[test]
+fn restart_eligible_false_when_orphan_has_availability_drift() {
+    assert!(!super::restart_eligible(true, false, true));
+}
+
+#[test]
+fn restart_eligible_false_when_orphan_has_no_drift() {
+    assert!(!super::restart_eligible(true, false, false));
+}
+
+#[test]
+fn restart_eligible_false_when_non_orphan_has_no_drift() {
+    assert!(!super::restart_eligible(false, false, false));
+}
diff --git a/desktop/src-tauri/src/managed_agents/snapshot_avatar.rs b/desktop/src-tauri/src/managed_agents/snapshot_avatar.rs
new file mode 100644
index 0000000000..a1044b31f4
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/snapshot_avatar.rs
@@ -0,0 +1,42 @@
+use base64::{engine::general_purpose::STANDARD, Engine as _};
+use image::ImageDecoder;
+use std::io::Cursor;
+
+const MAX_AVATAR_INLINE_BYTES: usize = 2 * 1024 * 1024;
+const MAX_AVATAR_DIMENSION: u32 = 2048;
+const MAX_AVATAR_DECODE_ALLOC: u64 = 32 * 1024 * 1024;
+
+/// Materialize a snapshot PNG's visible pixels as a bounded portable avatar.
+/// The exact transparent 1×1 no-avatar placeholder and images that cannot fit
+/// the persisted inline-avatar budget leave the manifest fallback intact.
+pub(crate) fn snapshot_png_avatar_data_url(png_bytes: &[u8]) -> Result<Option<String>, String> {
+    let reader = image::ImageReader::with_format(Cursor::new(png_bytes), image::ImageFormat::Png);
+    let mut decoder = reader
+        .into_decoder()
+        .map_err(|e| format!("Failed to decode snapshot avatar: {e}"))?;
+    let mut limits = image::Limits::default();
+    limits.max_image_width = Some(MAX_AVATAR_DIMENSION);
+    limits.max_image_height = Some(MAX_AVATAR_DIMENSION);
+    limits.max_alloc = Some(MAX_AVATAR_DECODE_ALLOC);
+    decoder
+        .set_limits(limits)
+        .map_err(|e| format!("Snapshot avatar exceeds safe decoding limits: {e}"))?;
+    let (width, height) = decoder.dimensions();
+    let image = image::DynamicImage::from_decoder(decoder)
+        .map_err(|e| format!("Failed to decode snapshot avatar: {e}"))?;
+    if width == 1 && height == 1 && image.to_rgba8().get_pixel(0, 0).0 == [0, 0, 0, 0] {
+        return Ok(None);
+    }
+
+    let mut clean_png = Vec::new();
+    image
+        .write_to(&mut Cursor::new(&mut clean_png), image::ImageFormat::Png)
+        .map_err(|e| format!("Failed to encode snapshot avatar: {e}"))?;
+    if clean_png.len() > MAX_AVATAR_INLINE_BYTES {
+        return Ok(None);
+    }
+    Ok(Some(format!(
+        "data:image/png;base64,{}",
+        STANDARD.encode(clean_png)
+    )))
+}
diff --git a/desktop/src-tauri/src/managed_agents/spawn_hash.rs b/desktop/src-tauri/src/managed_agents/spawn_hash.rs
index 4d80549288..648cc62bbe 100644
--- a/desktop/src-tauri/src/managed_agents/spawn_hash.rs
+++ b/desktop/src-tauri/src/managed_agents/spawn_hash.rs
@@ -28,24 +28,14 @@
 use std::hash::{DefaultHasher, Hash, Hasher};
 
 use super::{
+    effective_config::{resolve_effective_config, EffectiveConfigResult},
     known_acp_runtime, normalize_agent_args,
-    persona_events::apply_persona_snapshot,
-    resolve_effective_agent_env,
+    persona_events::preview_prospective_persona_snapshot,
+    runtime::{resolve_session_title, SESSION_TITLE_ENV_VAR},
     types::{AgentDefinition, ManagedAgentRecord, TeamRecord},
     GlobalAgentConfig,
 };
 
-/// The prompt a spawn would actually deliver: `Some("")` collapses to `None`
-/// because an empty `BUZZ_ACP_SYSTEM_PROMPT` is no prompt.
-///
-/// The single source of truth for the spawn env write AND the config hash.
-pub(crate) fn effective_spawn_prompt(record: &ManagedAgentRecord) -> Option<String> {
-    record
-        .system_prompt
-        .clone()
-        .filter(|prompt| !prompt.is_empty())
-}
-
 /// Resolve the current instructions for this instance's deployment-time team binding.
 /// A deleted team deliberately degrades to no team section.
 pub(crate) fn effective_team_instructions(
@@ -76,44 +66,75 @@ pub(crate) fn spawn_config_hash(
     // restart would actually run. Idempotent, so the spawn-time stamp
     // (post-snapshot record) and later recomputes (persisted record) agree
     // when nothing changed. The persona env itself reaches the hash through
-    // `resolve_effective_agent_env` below; `persona_source_version` is set on
+    // the descriptor's layered env below; `persona_source_version` is set on
     // the clone but is not a hash input.
-    let mut record = record.clone();
-    if let Some(persona_id) = record.persona_id.clone() {
-        if let Some(persona) = personas.iter().find(|p| p.id == persona_id) {
-            apply_persona_snapshot(&mut record, persona);
-        }
-    }
+    let record = preview_prospective_persona_snapshot(record, personas);
     let record = &record;
 
-    let effective_command = crate::managed_agents::record_agent_command(record, personas);
-    let runtime_meta = known_acp_runtime(&effective_command);
-    let effective = resolve_effective_agent_env(record, personas, runtime_meta, global);
+    // Resolve command, args, and env via the single typed descriptor — same path
+    // as spawn_agent_child.  Dangling harness id falls back to the infallible
+    // record_agent_command (no-op: a dangling harness can't be spawned, so the
+    // hash never matters for that agent).
+    let descriptor =
+        crate::managed_agents::resolve_effective_harness_descriptor(record, personas, global)
+            .unwrap_or_else(|_| {
+                let cmd = crate::managed_agents::record_agent_command(record, personas);
+                let args = normalize_agent_args(&cmd, record.agent_args.clone());
+                crate::managed_agents::readiness::EffectiveHarnessDescriptor {
+                    command: cmd,
+                    args,
+                    env: Default::default(),
+                }
+            });
+    let runtime_meta = known_acp_runtime(&descriptor.command);
 
     let mut hasher = DefaultHasher::new();
 
     // Harness identity and derivations (live-persona-resolved, like spawn).
     record.acp_command.hash(&mut hasher);
-    effective_command.hash(&mut hasher);
-    normalize_agent_args(&effective_command, record.agent_args.clone()).hash(&mut hasher);
+    descriptor.command.hash(&mut hasher);
+    descriptor.args.hash(&mut hasher);
     runtime_meta
         .and_then(|r| r.mcp_command)
         .unwrap_or("")
         .hash(&mut hasher);
 
-    // Effective env layering (baked floor → runtime metadata → user env).
-    // BTreeMap iteration is ordered, so this is deterministic.
-    effective.env.hash(&mut hasher);
+    // Effective env layering (baked floor → runtime metadata → definition env
+    // → global → persona → agent). BTreeMap iteration is ordered, deterministic.
+    descriptor.env.hash(&mut hasher);
 
     // Record fields the spawn env writes read directly. The relay is hashed
     // resolved: every record spawns on the workspace relay (legacy pins
     // ignored), so a workspace relay change must trip the badge.
     crate::relay::effective_agent_relay_url(&record.relay_url, workspace_relay).hash(&mut hasher);
-    // Prompt and runtime-layered team instructions use the same resolver as spawn.
-    effective_spawn_prompt(record).hash(&mut hasher);
+    // Team instructions use the same resolver as spawn.
     effective_team_instructions(record, teams).hash(&mut hasher);
-    record.model.hash(&mut hasher);
-    record.provider.hash(&mut hasher);
+    // Prompt, model, and provider all come from ONE `resolve_effective_config`
+    // call — the SAME resolve `spawn_agent_child` performs for the env write,
+    // so env write and this badge cannot disagree. An orphaned link (missing
+    // definition) hashes as if all three were absent: `spawn_agent_child`
+    // refuses to spawn an orphan regardless, so this is a display-only
+    // convenience, not the spawn gate.
+    let (resolved_prompt, resolved_model, resolved_provider) =
+        match resolve_effective_config(record, personas, global) {
+            EffectiveConfigResult::Resolved(cfg) => {
+                (cfg.system_prompt.value, cfg.model.value, cfg.provider.value)
+            }
+            EffectiveConfigResult::OrphanedInstance { .. } => (None, None, None),
+        };
+    resolved_prompt.hash(&mut hasher);
+    resolved_model.hash(&mut hasher);
+    resolved_provider.hash(&mut hasher);
+    // Session title: the same resolve `spawn_agent_child` performs for its env
+    // write, so a rename raises the restart badge. Skipped when a user env
+    // override shadows it — spawn writes the title BEFORE the user env layer,
+    // so the override is what actually runs, and it already reaches this hash
+    // through `descriptor.env` above. Hashing the record-derived value under an
+    // override would badge a rename that changes nothing.
+    let effective_session_title = (!descriptor.env.contains_key(SESSION_TITLE_ENV_VAR))
+        .then(|| resolve_session_title(record.display_name.as_deref(), &record.name))
+        .flatten();
+    effective_session_title.hash(&mut hasher);
     record.auth_tag.hash(&mut hasher);
     record.respond_to.as_str().hash(&mut hasher);
     // The allowlist is hashed as the env receives it: spawn sets
diff --git a/desktop/src-tauri/src/managed_agents/spawn_hash/tests.rs b/desktop/src-tauri/src/managed_agents/spawn_hash/tests.rs
index 6438b3b37d..f4ad404814 100644
--- a/desktop/src-tauri/src/managed_agents/spawn_hash/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/spawn_hash/tests.rs
@@ -49,8 +49,10 @@ fn record() -> ManagedAgentRecord {
         name_pool: Vec::new(),
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         definition_respond_to: None,
         definition_respond_to_allowlist: Vec::new(),
         definition_parallelism: None,
@@ -70,8 +72,10 @@ fn persona(id: &str, runtime: Option<&str>, prompt: &str) -> AgentDefinition {
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: BTreeMap::new(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -441,18 +445,323 @@ fn missing_definition_leaves_materialized_runtime_in_hash() {
     );
 }
 
+// ── Global default trips hash for linked inherited agents ─────────────────
+
 #[test]
-fn effective_spawn_prompt_matches_hash_semantics() {
-    // The env write and the hash share effective_spawn_prompt — this row
-    // pins the helper's own semantics so a refactor of either caller cannot
-    // silently diverge from the contract.
-    let mut r = record();
-    r.system_prompt = Some(String::new());
-    assert_eq!(
-        effective_spawn_prompt(&r),
-        None,
-        "empty collapses to absent"
+fn global_model_change_trips_hash_for_linked_inherited_agent() {
+    let mut rec = record();
+    rec.persona_id = Some("p1".into());
+    rec.model = Some("stale-record-model".into());
+
+    let personas = vec![persona("p1", Some("goose"), "prompt")];
+
+    let global_a = GlobalAgentConfig {
+        model: Some("model-a".to_string()),
+        provider: Some("prov-a".to_string()),
+        ..Default::default()
+    };
+    let global_b = GlobalAgentConfig {
+        model: Some("model-b".to_string()),
+        provider: Some("prov-b".to_string()),
+        ..Default::default()
+    };
+
+    let hash_a = spawn_config_hash(&rec, &personas, &[], "wss://ws.example", &global_a);
+    let hash_b = spawn_config_hash(&rec, &personas, &[], "wss://ws.example", &global_b);
+
+    assert_ne!(
+        hash_a, hash_b,
+        "changing the global default must trip the hash for a linked inherited agent"
+    );
+}
+
+#[test]
+fn global_model_change_trips_hash_without_model_env_var() {
+    let mut rec = record();
+    rec.persona_id = Some("p1".into());
+    rec.agent_command = "some-harness-without-model-env".into();
+
+    let personas = vec![{
+        let mut p = persona("p1", None, "prompt");
+        p.model = None;
+        p.provider = None;
+        p
+    }];
+
+    let global_a = GlobalAgentConfig {
+        model: Some("model-a".to_string()),
+        ..Default::default()
+    };
+    let global_b = GlobalAgentConfig {
+        model: Some("model-b".to_string()),
+        ..Default::default()
+    };
+
+    let hash_a = spawn_config_hash(&rec, &personas, &[], "wss://ws.example", &global_a);
+    let hash_b = spawn_config_hash(&rec, &personas, &[], "wss://ws.example", &global_b);
+
+    assert_ne!(
+        hash_a, hash_b,
+        "global model change must trip hash even without a model_env_var runtime"
+    );
+}
+
+#[test]
+fn linked_instance_stale_prompt_bytes_are_inert_at_hash_time() {
+    // Regression for the split-resolve defect: prompt used to be read from
+    // the record's own (possibly Phase-A-snapshot-stale) bytes while
+    // model/provider were resolved live from the definition. A definition
+    // edit landing between a caller's snapshot apply and spawn could hand a
+    // fresh model/provider to a stale prompt, and the hash (which already
+    // resolved model/provider live) would silently agree with a spawn that
+    // wrote the stale prompt. Now both come from one `resolve_effective_config`
+    // call, so a record whose own `system_prompt` bytes disagree with the
+    // live definition must hash exactly as if the record carried the
+    // definition's prompt verbatim — the record's prompt bytes are inert for
+    // a linked instance.
+    let mut rec = record();
+    rec.persona_id = Some("p1".into());
+    rec.system_prompt = Some("stale prompt on record".into());
+
+    let mut matching_bytes = rec.clone();
+    matching_bytes.system_prompt = Some("live prompt".into());
+
+    let personas = [persona("p1", Some("goose"), "live prompt")];
+
+    assert_eq!(
+        spawn_config_hash(
+            &rec,
+            &personas,
+            &[],
+            "wss://ws.example",
+            &Default::default()
+        ),
+        spawn_config_hash(
+            &matching_bytes,
+            &personas,
+            &[],
+            "wss://ws.example",
+            &Default::default()
+        ),
+        "record's own system_prompt bytes must not affect the hash of a linked instance"
+    );
+}
+
+#[test]
+fn display_name_edit_changes_hash() {
+    // The spawn writes BUZZ_ACP_SESSION_TITLE from display_name-or-name, so a
+    // rename must trip the badge: the running process keeps the old title
+    // until it restarts, and the operator has to be told that.
+    let rec = record();
+    let mut renamed = record();
+    renamed.display_name = Some("Fizz".into());
+    assert_ne!(
+        spawn_config_hash(&rec, &[], &[], "wss://ws.example", &Default::default()),
+        spawn_config_hash(&renamed, &[], &[], "wss://ws.example", &Default::default()),
+        "a display-name rename changes the spawned session title and must badge"
+    );
+}
+
+#[test]
+fn name_edit_changes_hash_when_display_name_is_absent() {
+    // With no display_name the title falls back to the unique handle, so the
+    // handle is what the env write carries and what must be hashed.
+    let rec = record();
+    let mut renamed = record();
+    renamed.name = "agent-2".into();
+    assert_ne!(
+        spawn_config_hash(&rec, &[], &[], "wss://ws.example", &Default::default()),
+        spawn_config_hash(&renamed, &[], &[], "wss://ws.example", &Default::default()),
+        "the fallback title source must reach the hash too"
+    );
+}
+
+#[test]
+fn display_name_edit_does_not_change_hash_under_an_explicit_title_override() {
+    // User env is written AFTER the Buzz-set title (last-wins), so an explicit
+    // BUZZ_ACP_SESSION_TITLE is what the child actually runs with. Renaming the
+    // record changes nothing about the spawned process, so badging it would be
+    // a false restart prompt. The override itself still reaches the hash
+    // through the effective env.
+    let mut rec = record();
+    rec.env_vars
+        .insert("BUZZ_ACP_SESSION_TITLE".into(), "Pinned Title".into());
+    let mut renamed = rec.clone();
+    renamed.display_name = Some("Fizz".into());
+    assert_eq!(
+        spawn_config_hash(&rec, &[], &[], "wss://ws.example", &Default::default()),
+        spawn_config_hash(&renamed, &[], &[], "wss://ws.example", &Default::default()),
+        "a rename shadowed by an explicit title override must not badge"
+    );
+}
+
+#[test]
+fn title_override_edit_changes_hash() {
+    // Counterpart to the test above: the override is not inert — editing it
+    // changes what the child runs with and must badge.
+    let mut rec = record();
+    rec.env_vars
+        .insert("BUZZ_ACP_SESSION_TITLE".into(), "Pinned Title".into());
+    let mut edited = record();
+    edited
+        .env_vars
+        .insert("BUZZ_ACP_SESSION_TITLE".into(), "Other Title".into());
+    assert_ne!(
+        spawn_config_hash(&rec, &[], &[], "wss://ws.example", &Default::default()),
+        spawn_config_hash(&edited, &[], &[], "wss://ws.example", &Default::default()),
+        "editing an explicit title override must badge"
+    );
+}
+
+#[test]
+fn linked_instance_prompt_model_provider_resolve_from_one_call() {
+    // The prompt for a linked instance must track the definition, exactly
+    // like model/provider — a definition prompt edit trips the hash even
+    // though the record's own (stale) system_prompt bytes are unchanged.
+    let mut rec = record();
+    rec.persona_id = Some("p1".into());
+    rec.system_prompt = Some("stale".into());
+
+    let before = [persona("p1", Some("goose"), "old definition prompt")];
+    let after = [persona("p1", Some("goose"), "new definition prompt")];
+
+    assert_ne!(
+        spawn_config_hash(&rec, &before, &[], "wss://ws.example", &Default::default()),
+        spawn_config_hash(&rec, &after, &[], "wss://ws.example", &Default::default()),
+        "linked instance prompt must resolve from the live definition, not stale record bytes"
+    );
+}
+
+// ── I2: definition args and env reach spawn_config_hash ──────────────────────
+//
+// These tests prove that editing a custom harness definition's args or env
+// changes spawn_config_hash, which trips the "restart required" badge.
+// They would fail if spawn_config_hash used only record.agent_args without
+// falling back to definition args, or if resolve_effective_agent_env did not
+// include definition env.
+
+/// When a record has no instance args but the definition has default args,
+/// changing the definition args changes the spawn hash. This would fail if
+/// spawn_config_hash used only record.agent_args.
+#[test]
+fn spawn_hash_changes_when_definition_default_args_change() {
+    use crate::managed_agents::custom_harnesses::{
+        registry_test_lock, warm_harness_registry_from_dir,
+    };
+    use std::fs;
+    use tempfile::tempdir;
+
+    // The loaded-harness registry is process-global: a parallel test re-warming
+    // it between the two hash computations makes both resolve to no-definition
+    // and h1 == h2 (observed on Windows CI).
+    let _lock = registry_test_lock();
+    let dir = tempdir().unwrap();
+
+    // Write v1 definition (args: ["--mode", "v1"]).
+    fs::write(
+        dir.path().join("my-def.json"),
+        r#"{"id":"my-def","label":"My Def","command":"my-def-bin","args":["--mode","v1"]}"#,
+    )
+    .unwrap();
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    let mut r = record();
+    r.runtime = Some("my-def".into());
+    r.agent_args = vec![]; // no instance args → definition args are used
+
+    let h1 = spawn_config_hash(&r, &[], &[], "ws://relay", &Default::default());
+
+    // Update to v2 args and re-warm (simulating save + transactional refresh).
+    fs::write(
+        dir.path().join("my-def.json"),
+        r#"{"id":"my-def","label":"My Def","command":"my-def-bin","args":["--mode","v2"]}"#,
+    )
+    .unwrap();
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    let h2 = spawn_config_hash(&r, &[], &[], "ws://relay", &Default::default());
+
+    assert_ne!(
+        h1, h2,
+        "changing definition default args must change the spawn hash"
+    );
+}
+
+/// When a definition has env vars, adding them changes the spawn hash. This
+/// proves resolve_effective_agent_env includes definition env in the layering.
+#[test]
+fn spawn_hash_changes_when_definition_env_changes() {
+    use crate::managed_agents::custom_harnesses::{
+        registry_test_lock, warm_harness_registry_from_dir,
+    };
+    use std::fs;
+    use tempfile::tempdir;
+
+    // Serialize against parallel registry re-warms (see the args test above).
+    let _lock = registry_test_lock();
+    let dir = tempdir().unwrap();
+
+    // Write definition without env.
+    fs::write(
+        dir.path().join("env-def.json"),
+        r#"{"id":"env-def","label":"Env Def","command":"env-def-bin"}"#,
+    )
+    .unwrap();
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    let mut r = record();
+    r.runtime = Some("env-def".into());
+
+    let h1 = spawn_config_hash(&r, &[], &[], "ws://relay", &Default::default());
+
+    // Update to include env and re-warm.
+    fs::write(
+        dir.path().join("env-def.json"),
+        r#"{"id":"env-def","label":"Env Def","command":"env-def-bin","env":{"MY_FLAG":"1"}}"#,
+    )
+    .unwrap();
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    let h2 = spawn_config_hash(&r, &[], &[], "ws://relay", &Default::default());
+
+    assert_ne!(h1, h2, "adding definition env must change the spawn hash");
+}
+
+/// Instance-level args win over definition default args (non-empty instance
+/// args must NOT be overridden by the definition). The hash must match a record
+/// that has the same effective args from either source.
+#[test]
+fn spawn_hash_instance_args_win_over_definition_args() {
+    use crate::managed_agents::custom_harnesses::{
+        registry_test_lock, warm_harness_registry_from_dir,
+    };
+    use std::fs;
+    use tempfile::tempdir;
+
+    // Serialize against parallel registry re-warms (see the args test above).
+    let _lock = registry_test_lock();
+    let dir = tempdir().unwrap();
+    fs::write(
+        dir.path().join("arg-def.json"),
+        r#"{"id":"arg-def","label":"Arg Def","command":"arg-def-bin","args":["--def-arg"]}"#,
+    )
+    .unwrap();
+    warm_harness_registry_from_dir(Some(dir.path()));
+
+    let mut r_instance = record();
+    r_instance.runtime = Some("arg-def".into());
+    r_instance.agent_args = vec!["--instance-arg".to_string()];
+
+    let mut r_no_instance = record();
+    r_no_instance.runtime = Some("arg-def".into());
+    r_no_instance.agent_args = vec![];
+
+    let h_instance = spawn_config_hash(&r_instance, &[], &[], "ws://relay", &Default::default());
+    let h_no_instance =
+        spawn_config_hash(&r_no_instance, &[], &[], "ws://relay", &Default::default());
+
+    assert_ne!(
+        h_instance, h_no_instance,
+        "instance args and definition args must produce different hashes"
     );
-    r.system_prompt = Some("real".into());
-    assert_eq!(effective_spawn_prompt(&r).as_deref(), Some("real"));
 }
diff --git a/desktop/src-tauri/src/managed_agents/storage.rs b/desktop/src-tauri/src/managed_agents/storage.rs
index b9c6c7e6cd..f6f89ed898 100644
--- a/desktop/src-tauri/src/managed_agents/storage.rs
+++ b/desktop/src-tauri/src/managed_agents/storage.rs
@@ -65,6 +65,41 @@ pub fn managed_agent_runtime_log_path(
     Ok(managed_agents_logs_dir(app)?.join(format!("{}.log", key.runtime_id())))
 }
 
+/// Log path to surface for an agent whose runtime is not tracked in memory:
+/// the most recently written of its pair-scoped logs, falling back to the
+/// legacy single-runtime path when the agent has not run since harnesses
+/// became per (agent, relay) pair.
+pub fn latest_managed_agent_log_path(app: &AppHandle, pubkey: &str) -> Result<PathBuf, String> {
+    match newest_agent_log_in_dir(&managed_agents_logs_dir(app)?, pubkey) {
+        Some(path) => Ok(path),
+        None => managed_agent_log_path(app, pubkey),
+    }
+}
+
+/// Newest log in `dir` belonging to `pubkey` — either a pair-scoped
+/// `{pubkey}__{relay_hash}.log` or the legacy `{pubkey}.log`. Ties break
+/// toward the higher filename so the choice is deterministic.
+fn newest_agent_log_in_dir(dir: &Path, pubkey: &str) -> Option<PathBuf> {
+    let legacy_name = format!("{pubkey}.log");
+    let pair_prefix = format!("{pubkey}__");
+    fs::read_dir(dir)
+        .ok()?
+        .flatten()
+        .filter_map(|entry| {
+            let name = entry.file_name();
+            let matches = name.to_str().is_some_and(|name| {
+                name == legacy_name || (name.starts_with(&pair_prefix) && name.ends_with(".log"))
+            });
+            if !matches {
+                return None;
+            }
+            let modified = entry.metadata().ok()?.modified().ok()?;
+            Some((modified, name, entry.path()))
+        })
+        .max_by(|left, right| left.0.cmp(&right.0).then_with(|| left.1.cmp(&right.1)))
+        .map(|(_, _, path)| path)
+}
+
 /// The keyring operations the migration chokepoint needs. Abstracted so the
 /// migrate-and-strip decision logic ([`migrate_inline_key`]) can be unit-tested
 /// against a fake without touching the live OS keyring.
@@ -786,597 +821,5 @@ pub fn meaningful_agent_error_from_log(path: &Path) -> Option<AgentLogError> {
 }
 
 #[cfg(test)]
-mod tests {
-    use std::cell::RefCell;
-    use std::collections::HashMap;
-    use std::io::Write as _;
-
-    use tempfile::NamedTempFile;
-
-    use super::{
-        agent_keyring_name, hydrate_keys_with, migrate_inline_key, persist_agent_keys_with,
-        KeyMigration, KeyStore, KeyringProbe, ManagedAgentRecord,
-    };
-
-    /// In-memory [`KeyStore`] for testing the migrate decision without the OS
-    /// keyring. `reachable=false` simulates a backend outage; `fail_verify`
-    /// simulates a write whose read-back does not confirm.
-    struct FakeKeyStore {
-        reachable: bool,
-        fail_verify: bool,
-        stored: RefCell<HashMap<String, String>>,
-        write_count: RefCell<usize>,
-        read_count: RefCell<usize>,
-    }
-
-    impl FakeKeyStore {
-        fn reachable() -> Self {
-            Self {
-                reachable: true,
-                fail_verify: false,
-                stored: RefCell::new(HashMap::new()),
-                write_count: RefCell::new(0),
-                read_count: RefCell::new(0),
-            }
-        }
-        fn unreachable() -> Self {
-            Self {
-                reachable: false,
-                fail_verify: false,
-                stored: RefCell::new(HashMap::new()),
-                write_count: RefCell::new(0),
-                read_count: RefCell::new(0),
-            }
-        }
-        fn verify_fails() -> Self {
-            Self {
-                reachable: true,
-                fail_verify: true,
-                stored: RefCell::new(HashMap::new()),
-                write_count: RefCell::new(0),
-                read_count: RefCell::new(0),
-            }
-        }
-        /// Seed a key as already present in the keyring.
-        fn with_key(self, name: &str, value: &str) -> Self {
-            self.stored
-                .borrow_mut()
-                .insert(name.to_string(), value.to_string());
-            self
-        }
-    }
-
-    impl KeyStore for FakeKeyStore {
-        fn probe(&self, _name: &str) -> KeyringProbe {
-            if self.reachable {
-                KeyringProbe::ReachableButEmpty
-            } else {
-                KeyringProbe::Unreachable
-            }
-        }
-        fn load(&self, name: &str) -> Result<Option<String>, String> {
-            // An unreachable backend errors on read (outage), distinct from a
-            // reachable backend returning `Ok(None)` for an absent entry.
-            if !self.reachable {
-                return Err("keyring backend unreachable".to_string());
-            }
-            *self.read_count.borrow_mut() += 1;
-            Ok(self.stored.borrow().get(name).cloned())
-        }
-        fn load_all_readonly(&self) -> Result<Option<HashMap<String, String>>, String> {
-            if !self.reachable {
-                return Err("keyring backend unreachable".to_string());
-            }
-            *self.read_count.borrow_mut() += 1;
-            let map = self.stored.borrow().clone();
-            // Return None when completely empty (simulates no blob written yet).
-            if map.is_empty() {
-                Ok(None)
-            } else {
-                Ok(Some(map))
-            }
-        }
-        fn write_and_verify(&self, name: &str, value: &str) -> Result<(), String> {
-            if self.fail_verify {
-                return Err("read-back verify failed".to_string());
-            }
-            *self.write_count.borrow_mut() += 1;
-            self.stored
-                .borrow_mut()
-                .insert(name.to_string(), value.to_string());
-            Ok(())
-        }
-        fn store_all(&self, entries: &HashMap<String, String>) -> Result<(), String> {
-            if !self.reachable {
-                return Err("keyring backend unreachable".to_string());
-            }
-            if self.fail_verify {
-                return Err("read-back verify failed".to_string());
-            }
-            *self.write_count.borrow_mut() += 1;
-            let mut stored = self.stored.borrow_mut();
-            for (k, v) in entries {
-                stored.insert(k.clone(), v.clone());
-            }
-            Ok(())
-        }
-    }
-
-    fn record_with_key(nsec: &str) -> ManagedAgentRecord {
-        record_with_pubkey_and_key("agent-pubkey", nsec)
-    }
-
-    fn record_with_pubkey_and_key(pubkey: &str, nsec: &str) -> ManagedAgentRecord {
-        serde_json::from_str(&format!(
-            r#"{{
-                "pubkey": "{pubkey}",
-                "name": "test-agent",
-                "private_key_nsec": "{nsec}",
-                "relay_url": "wss://localhost:3000",
-                "acp_command": "buzz-acp",
-                "agent_command": "goose",
-                "agent_args": [],
-                "mcp_command": "",
-                "turn_timeout_seconds": 320,
-                "created_at": "2026-01-01T00:00:00Z",
-                "updated_at": "2026-01-01T00:00:00Z"
-            }}"#
-        ))
-        .expect("sample record")
-    }
-
-    #[test]
-    fn migrate_persists_and_signals_stripping_when_keyring_reachable() {
-        // Item 2: an inline key (residue from a prior keyring-unreachable save)
-        // is written to the keyring and verified when the backend is reachable,
-        // so the next save can drop it from JSON.
-        let store = FakeKeyStore::reachable();
-        let record = record_with_key("nsec1realkey");
-
-        let outcome = migrate_inline_key(&store, &record);
-
-        assert_eq!(outcome, KeyMigration::Persisted);
-        assert_eq!(
-            store
-                .stored
-                .borrow()
-                .get(&agent_keyring_name("agent-pubkey"))
-                .map(String::as_str),
-            Some("nsec1realkey")
-        );
-    }
-
-    #[test]
-    fn migrate_keeps_inline_when_keyring_unreachable() {
-        // No-resurrection guard: a transient outage must NOT migrate; the key
-        // stays inline (file fallback) so it is not lost.
-        let store = FakeKeyStore::unreachable();
-        let record = record_with_key("nsec1realkey");
-
-        let outcome = migrate_inline_key(&store, &record);
-
-        assert_eq!(outcome, KeyMigration::KeptInline);
-        assert!(store.stored.borrow().is_empty());
-    }
-
-    #[test]
-    fn migrate_keeps_inline_when_verify_fails() {
-        // A write whose read-back does not confirm must keep the key inline —
-        // never drop plaintext on an unverified write.
-        let store = FakeKeyStore::verify_fails();
-        let record = record_with_key("nsec1realkey");
-
-        assert_eq!(
-            migrate_inline_key(&store, &record),
-            KeyMigration::KeptInline
-        );
-    }
-
-    #[test]
-    fn migrate_reports_nothing_for_empty_key() {
-        // A record whose key already lives in the keyring (empty inline) has
-        // nothing to migrate. It must NOT be reported as `Persisted` — an
-        // empty key after a keyring outage means the secret is unavailable,
-        // not verified present (Wes storage.rs:158).
-        let store = FakeKeyStore::reachable();
-        let record = record_with_key("");
-
-        assert_eq!(migrate_inline_key(&store, &record), KeyMigration::Nothing);
-        assert!(store.stored.borrow().is_empty());
-    }
-
-    #[test]
-    fn hydrate_fills_key_from_keyring_when_reachable() {
-        // The normal keyring-backed case: an empty inline key is filled from
-        // the keyring on load.
-        let store =
-            FakeKeyStore::reachable().with_key(&agent_keyring_name("agent-pubkey"), "nsec1stored");
-        let mut records = vec![record_with_key("")];
-
-        hydrate_keys_with(&store, &mut records);
-
-        assert_eq!(records[0].private_key_nsec, "nsec1stored");
-    }
-
-    #[test]
-    fn hydrate_leaves_key_empty_on_keyring_outage() {
-        // Outage edge (Wes storage.rs:158): when the keyring read ERRORS, the
-        // key must be left empty — never silently treated as resolved — so the
-        // spawn path refuses rather than launching the agent with no identity.
-        let store = FakeKeyStore::unreachable();
-        let mut records = vec![record_with_key("")];
-
-        hydrate_keys_with(&store, &mut records);
-
-        assert!(
-            records[0].private_key_nsec.is_empty(),
-            "an unreadable key must stay empty, not be fabricated"
-        );
-    }
-
-    #[test]
-    fn spawn_refused_when_private_key_empty() {
-        // The spawn path MUST refuse a record left empty by an outage/absence
-        // before injecting an empty BUZZ_PRIVATE_KEY / NOSTR_PRIVATE_KEY — never
-        // launch an agent with no identity (Wes storage.rs:158).
-        let record = record_with_key("");
-        assert!(
-            super::spawn_key_refusal(&record).is_some(),
-            "an agent with no private key must be refused"
-        );
-    }
-
-    #[test]
-    fn spawn_allowed_when_private_key_present() {
-        // A record carrying a key must not be blocked by the refusal guard.
-        let record = record_with_key("nsec1realkey");
-        assert!(super::spawn_key_refusal(&record).is_none());
-    }
-
-    #[test]
-    fn persist_agent_keys_issues_zero_writes_when_inline_keys_already_cleared() {
-        // This is the dominant prompt-storm scenario: after the first successful
-        // persist all inline copies are cleared, so subsequent saves (e.g. a
-        // model change) must issue zero keychain writes. `migrate_inline_key`
-        // returns `Nothing` for empty-key records, and `persist_agent_keys_with`
-        // must propagate that guarantee — write_count stays at 0.
-        let store = FakeKeyStore::reachable();
-        // Records whose inline key is already blank (key lives in the keyring).
-        let mut records = vec![record_with_key(""), record_with_key("")];
-
-        persist_agent_keys_with(&store, &mut records);
-
-        assert_eq!(
-            *store.write_count.borrow(),
-            0,
-            "a save with no inline keys must issue zero keychain writes"
-        );
-    }
-
-    #[test]
-    fn persist_agent_keys_writes_once_per_record_with_inline_key() {
-        // A record carrying an inline key (e.g. first save, or keyring-outage
-        // residue) must trigger exactly one write_and_verify per record — and
-        // once persisted the inline copy is cleared so the next save is free.
-        // Records use distinct pubkeys so each maps to a distinct keyring name,
-        // verifying the "per record" behaviour rather than a single-key overwrite.
-        let store = FakeKeyStore::reachable();
-        let mut records = vec![
-            record_with_pubkey_and_key("pubkey-agent-alpha", "nsec1key_a"),
-            record_with_pubkey_and_key("pubkey-agent-beta", "nsec1key_b"),
-        ];
-
-        persist_agent_keys_with(&store, &mut records);
-
-        assert_eq!(
-            *store.write_count.borrow(),
-            2,
-            "each record with an inline key must trigger exactly one write"
-        );
-        // Verify the correct keyring name was used for each agent.
-        assert_eq!(
-            store
-                .stored
-                .borrow()
-                .get(&agent_keyring_name("pubkey-agent-alpha"))
-                .map(String::as_str),
-            Some("nsec1key_a"),
-        );
-        assert_eq!(
-            store
-                .stored
-                .borrow()
-                .get(&agent_keyring_name("pubkey-agent-beta"))
-                .map(String::as_str),
-            Some("nsec1key_b"),
-        );
-        // After persist the inline copies are cleared — next save is zero-write.
-        assert!(records[0].private_key_nsec.is_empty());
-        assert!(records[1].private_key_nsec.is_empty());
-    }
-
-    fn write_log(content: &str) -> NamedTempFile {
-        let mut file = NamedTempFile::new().expect("temp log");
-        file.write_all(content.as_bytes()).expect("write log");
-        file
-    }
-
-    /// The keyringless fallback write must land `0o600` from the write itself —
-    /// not a post-write `chmod` — so a crash in the umask window can never leave
-    /// plaintext agent nsecs world-readable (Wes storage.rs:239, SECURITY.md:90).
-    #[cfg(unix)]
-    #[test]
-    fn restricted_write_lands_owner_only_without_post_write_chmod() {
-        use std::os::unix::fs::PermissionsExt;
-
-        let dir = tempfile::tempdir().expect("temp dir");
-        let path = dir.path().join("managed-agents.json");
-
-        super::atomic_write_json_restricted(&path, br#"[{"private_key_nsec":"nsec1secret"}]"#)
-            .expect("restricted write");
-
-        let mode = std::fs::metadata(&path)
-            .expect("metadata")
-            .permissions()
-            .mode()
-            & 0o777;
-        assert_eq!(mode, 0o600, "secret-bearing write must be owner-only");
-        assert_eq!(
-            std::fs::read_to_string(&path).expect("read back"),
-            r#"[{"private_key_nsec":"nsec1secret"}]"#
-        );
-    }
-
-    #[test]
-    fn meaningful_agent_error_from_log_promotes_wrapped_llm_auth() {
-        let file = write_log(
-            "noise\nAgent reported error (code -32001): llm auth: 401 unauthorized: ...\n",
-        );
-        let result = super::meaningful_agent_error_from_log(file.path()).unwrap();
-        assert!(result.message.contains("llm auth"));
-        assert_eq!(result.code, Some(-32001));
-    }
-
-    #[test]
-    fn meaningful_agent_error_from_log_promotes_unwrapped_llm_auth() {
-        let file = write_log("noise\nllm auth: denied\n");
-        let result = super::meaningful_agent_error_from_log(file.path()).unwrap();
-        assert_eq!(result.message, "Agent reported error: llm auth: denied");
-        assert_eq!(result.code, Some(-32001));
-    }
-
-    #[test]
-    fn meaningful_agent_error_from_log_promotes_bare_model_not_found() {
-        let file = write_log("noise\nllm model not found: (some-model) 404\n");
-        let result = super::meaningful_agent_error_from_log(file.path()).unwrap();
-        assert_eq!(
-            result.message,
-            "Agent reported error: llm model not found: (some-model) 404"
-        );
-        assert_eq!(result.code, Some(-32002));
-    }
-
-    #[test]
-    fn meaningful_agent_error_from_log_promotes_legacy_format() {
-        let file = write_log("noise\nAgent reported error: llm: 500 internal\n");
-        let result = super::meaningful_agent_error_from_log(file.path()).unwrap();
-        assert_eq!(result.message, "Agent reported error: llm: 500 internal");
-        assert_eq!(result.code, None);
-    }
-
-    #[test]
-    fn meaningful_agent_error_from_log_does_not_promote_midline_auth_text() {
-        let file = write_log("noise before llm auth: denied\n");
-        assert!(super::meaningful_agent_error_from_log(file.path()).is_none());
-    }
-
-    #[test]
-    fn strips_ansi_from_typical_tracing_line() {
-        let input = "\x1b[2m2026-05-27T15:16:32\x1b[0m \x1b[32m INFO\x1b[0m \x1b[2mbuzz_acp\x1b[0m\x1b[2m:\x1b[0m starting";
-        assert_eq!(
-            strip_ansi_escapes::strip_str(input),
-            "2026-05-27T15:16:32  INFO buzz_acp: starting"
-        );
-    }
-
-    // ── keyring-dev-migration tests ────────────────────────────────────────
-
-    #[test]
-    fn copy_agent_keys_copies_keys_present_in_src_to_dst() {
-        // Keys in src but not in dst must be copied in a single bulk write,
-        // and the migration-complete marker must be set.
-        let src = FakeKeyStore::reachable()
-            .with_key(&agent_keyring_name("agent-alpha"), "nsec1alpha")
-            .with_key(&agent_keyring_name("agent-beta"), "nsec1beta");
-        let dst = FakeKeyStore::reachable();
-
-        super::copy_agent_keys_between_stores(
-            &["agent-alpha".to_string(), "agent-beta".to_string()],
-            &src,
-            &dst,
-        );
-
-        assert_eq!(
-            dst.stored
-                .borrow()
-                .get(&agent_keyring_name("agent-alpha"))
-                .map(String::as_str),
-            Some("nsec1alpha"),
-            "agent-alpha must be copied from src to dst"
-        );
-        assert_eq!(
-            dst.stored
-                .borrow()
-                .get(&agent_keyring_name("agent-beta"))
-                .map(String::as_str),
-            Some("nsec1beta"),
-            "agent-beta must be copied from src to dst"
-        );
-        assert_eq!(
-            dst.stored
-                .borrow()
-                .get(super::DEV_MIGRATION_MARKER)
-                .map(String::as_str),
-            Some("done"),
-            "migration-complete marker must be set after first migration"
-        );
-        // Bulk write: exactly 1 store_all call.
-        assert_eq!(
-            *dst.write_count.borrow(),
-            1,
-            "must perform exactly one bulk write"
-        );
-        // Src accessed exactly once (bulk blob read).
-        assert_eq!(
-            *src.read_count.borrow(),
-            1,
-            "src must be read exactly once (bulk)"
-        );
-    }
-
-    #[test]
-    fn copy_agent_keys_skips_keys_already_in_dst() {
-        // Idempotency: a key already present in dst must NOT be overwritten
-        // — the agent may have rotated their key in the dev service.
-        let src =
-            FakeKeyStore::reachable().with_key(&agent_keyring_name("agent-alpha"), "nsec1old");
-        let dst =
-            FakeKeyStore::reachable().with_key(&agent_keyring_name("agent-alpha"), "nsec1new");
-
-        super::copy_agent_keys_between_stores(&["agent-alpha".to_string()], &src, &dst);
-
-        // dst value must remain unchanged — src must not overwrite it.
-        assert_eq!(
-            dst.stored
-                .borrow()
-                .get(&agent_keyring_name("agent-alpha"))
-                .map(String::as_str),
-            Some("nsec1new"),
-            "key already in dst must not be overwritten by migration"
-        );
-        // Marker must still be written even though no new keys were copied.
-        assert_eq!(
-            dst.stored
-                .borrow()
-                .get(super::DEV_MIGRATION_MARKER)
-                .map(String::as_str),
-            Some("done"),
-            "marker must be set even when all keys are already present"
-        );
-        assert_eq!(*src.read_count.borrow(), 0);
-    }
-
-    #[test]
-    fn copy_agent_keys_skips_keys_absent_from_src() {
-        // A pubkey with no entry in src (new agent that will mint a fresh key)
-        // must be silently skipped — no agent key written to dst.
-        let src = FakeKeyStore::reachable(); // empty
-        let dst = FakeKeyStore::reachable();
-
-        super::copy_agent_keys_between_stores(&["new-agent".to_string()], &src, &dst);
-
-        assert!(
-            dst.stored
-                .borrow()
-                .get(&agent_keyring_name("new-agent"))
-                .is_none(),
-            "absent src key must produce no agent key write to dst"
-        );
-        // Marker must still be written.
-        assert_eq!(
-            dst.stored
-                .borrow()
-                .get(super::DEV_MIGRATION_MARKER)
-                .map(String::as_str),
-            Some("done"),
-            "marker must be set even when no keys were present in src"
-        );
-    }
-
-    #[test]
-    fn copy_agent_keys_skips_all_when_dst_unreachable() {
-        // When dst keyring is unreachable the migration must be a no-op — never
-        // data-loss (failing to write is fine; the agent will re-mint on next
-        // onboarding run).
-        let src =
-            FakeKeyStore::reachable().with_key(&agent_keyring_name("agent-alpha"), "nsec1alpha");
-        let dst = FakeKeyStore::unreachable();
-
-        super::copy_agent_keys_between_stores(&["agent-alpha".to_string()], &src, &dst);
-
-        // No writes attempted to an unreachable dst.
-        assert_eq!(*dst.write_count.borrow(), 0);
-        // Src must not have been accessed (failed on dst read, returned early).
-        assert_eq!(
-            *src.read_count.borrow(),
-            0,
-            "src must not be accessed when dst is unreachable"
-        );
-    }
-
-    #[test]
-    fn copy_agent_keys_skips_entirely_when_marker_present() {
-        // After the first migration, the marker is in dst. Subsequent calls
-        // must return immediately — the prod keyring (src) must never be read.
-        let src =
-            FakeKeyStore::reachable().with_key(&agent_keyring_name("agent-alpha"), "nsec1alpha");
-        let dst = FakeKeyStore::reachable()
-            .with_key(super::DEV_MIGRATION_MARKER, "done")
-            .with_key(&agent_keyring_name("agent-alpha"), "nsec1dev");
-
-        super::copy_agent_keys_between_stores(&["agent-alpha".to_string()], &src, &dst);
-
-        // Src must not have been accessed at all.
-        assert_eq!(
-            *src.read_count.borrow(),
-            0,
-            "src must not be read when migration-complete marker is present"
-        );
-        // Dst must not have been written.
-        assert_eq!(
-            *dst.write_count.borrow(),
-            0,
-            "dst must not be written when migration-complete marker is present"
-        );
-        // Dev key must remain unchanged.
-        assert_eq!(
-            dst.stored
-                .borrow()
-                .get(&agent_keyring_name("agent-alpha"))
-                .map(String::as_str),
-            Some("nsec1dev"),
-            "dev key must not be overwritten on subsequent boots"
-        );
-    }
-
-    #[test]
-    fn copy_agent_keys_writes_marker_even_with_empty_agent_list() {
-        // An empty pubkey list (no agents yet) must still write the marker so
-        // future boots skip the prod read.
-        let src = FakeKeyStore::reachable();
-        let dst = FakeKeyStore::reachable();
-
-        super::copy_agent_keys_between_stores(&[], &src, &dst);
-
-        assert_eq!(
-            dst.stored
-                .borrow()
-                .get(super::DEV_MIGRATION_MARKER)
-                .map(String::as_str),
-            Some("done"),
-            "marker must be set even when pubkey list is empty"
-        );
-        assert_eq!(*src.read_count.borrow(), 0);
-    }
-
-    #[test]
-    fn try_delete_agent_key_returns_result() {
-        // Verify the result-returning seam exists and has the correct signature.
-        // We cannot call it in default builds (system-keyring feature is on,
-        // which accesses the real OS keychain and blocks in headless/CI). The
-        // real keychain paths are integration-tested through the #[ignore]
-        // tests in secret_store.rs; the rollback aggregation is tested in
-        // team_snapshot::tests::rollback_aggregates_multiple_errors.
-        let _: fn(&str) -> Result<(), String> = super::try_delete_agent_key;
-    }
-}
+#[path = "storage_tests.rs"]
+mod tests;
diff --git a/desktop/src-tauri/src/managed_agents/storage_tests.rs b/desktop/src-tauri/src/managed_agents/storage_tests.rs
new file mode 100644
index 0000000000..73567bb915
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/storage_tests.rs
@@ -0,0 +1,700 @@
+//! Unit tests for `managed_agents/storage.rs`.
+//!
+//! Kept in a sibling file so `storage.rs` stays closer to the 1000-line gate;
+//! `#[path]`-included from there.
+
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::fs::File;
+use std::io::Write as _;
+use std::path::Path;
+
+use tempfile::NamedTempFile;
+
+use super::{
+    agent_keyring_name, hydrate_keys_with, migrate_inline_key, persist_agent_keys_with,
+    KeyMigration, KeyStore, KeyringProbe, ManagedAgentRecord,
+};
+
+/// In-memory [`KeyStore`] for testing the migrate decision without the OS
+/// keyring. `reachable=false` simulates a backend outage; `fail_verify`
+/// simulates a write whose read-back does not confirm.
+struct FakeKeyStore {
+    reachable: bool,
+    fail_verify: bool,
+    stored: RefCell<HashMap<String, String>>,
+    write_count: RefCell<usize>,
+    read_count: RefCell<usize>,
+}
+
+impl FakeKeyStore {
+    fn reachable() -> Self {
+        Self {
+            reachable: true,
+            fail_verify: false,
+            stored: RefCell::new(HashMap::new()),
+            write_count: RefCell::new(0),
+            read_count: RefCell::new(0),
+        }
+    }
+    fn unreachable() -> Self {
+        Self {
+            reachable: false,
+            fail_verify: false,
+            stored: RefCell::new(HashMap::new()),
+            write_count: RefCell::new(0),
+            read_count: RefCell::new(0),
+        }
+    }
+    fn verify_fails() -> Self {
+        Self {
+            reachable: true,
+            fail_verify: true,
+            stored: RefCell::new(HashMap::new()),
+            write_count: RefCell::new(0),
+            read_count: RefCell::new(0),
+        }
+    }
+    /// Seed a key as already present in the keyring.
+    fn with_key(self, name: &str, value: &str) -> Self {
+        self.stored
+            .borrow_mut()
+            .insert(name.to_string(), value.to_string());
+        self
+    }
+}
+
+impl KeyStore for FakeKeyStore {
+    fn probe(&self, _name: &str) -> KeyringProbe {
+        if self.reachable {
+            KeyringProbe::ReachableButEmpty
+        } else {
+            KeyringProbe::Unreachable
+        }
+    }
+    fn load(&self, name: &str) -> Result<Option<String>, String> {
+        // An unreachable backend errors on read (outage), distinct from a
+        // reachable backend returning `Ok(None)` for an absent entry.
+        if !self.reachable {
+            return Err("keyring backend unreachable".to_string());
+        }
+        *self.read_count.borrow_mut() += 1;
+        Ok(self.stored.borrow().get(name).cloned())
+    }
+    fn load_all_readonly(&self) -> Result<Option<HashMap<String, String>>, String> {
+        if !self.reachable {
+            return Err("keyring backend unreachable".to_string());
+        }
+        *self.read_count.borrow_mut() += 1;
+        let map = self.stored.borrow().clone();
+        // Return None when completely empty (simulates no blob written yet).
+        if map.is_empty() {
+            Ok(None)
+        } else {
+            Ok(Some(map))
+        }
+    }
+    fn write_and_verify(&self, name: &str, value: &str) -> Result<(), String> {
+        if self.fail_verify {
+            return Err("read-back verify failed".to_string());
+        }
+        *self.write_count.borrow_mut() += 1;
+        self.stored
+            .borrow_mut()
+            .insert(name.to_string(), value.to_string());
+        Ok(())
+    }
+    fn store_all(&self, entries: &HashMap<String, String>) -> Result<(), String> {
+        if !self.reachable {
+            return Err("keyring backend unreachable".to_string());
+        }
+        if self.fail_verify {
+            return Err("read-back verify failed".to_string());
+        }
+        *self.write_count.borrow_mut() += 1;
+        let mut stored = self.stored.borrow_mut();
+        for (k, v) in entries {
+            stored.insert(k.clone(), v.clone());
+        }
+        Ok(())
+    }
+}
+
+fn record_with_key(nsec: &str) -> ManagedAgentRecord {
+    record_with_pubkey_and_key("agent-pubkey", nsec)
+}
+
+fn record_with_pubkey_and_key(pubkey: &str, nsec: &str) -> ManagedAgentRecord {
+    serde_json::from_str(&format!(
+        r#"{{
+            "pubkey": "{pubkey}",
+            "name": "test-agent",
+            "private_key_nsec": "{nsec}",
+            "relay_url": "wss://localhost:3000",
+            "acp_command": "buzz-acp",
+            "agent_command": "goose",
+            "agent_args": [],
+            "mcp_command": "",
+            "turn_timeout_seconds": 320,
+            "created_at": "2026-01-01T00:00:00Z",
+            "updated_at": "2026-01-01T00:00:00Z"
+        }}"#
+    ))
+    .expect("sample record")
+}
+
+#[test]
+fn migrate_persists_and_signals_stripping_when_keyring_reachable() {
+    // Item 2: an inline key (residue from a prior keyring-unreachable save)
+    // is written to the keyring and verified when the backend is reachable,
+    // so the next save can drop it from JSON.
+    let store = FakeKeyStore::reachable();
+    let record = record_with_key("nsec1realkey");
+
+    let outcome = migrate_inline_key(&store, &record);
+
+    assert_eq!(outcome, KeyMigration::Persisted);
+    assert_eq!(
+        store
+            .stored
+            .borrow()
+            .get(&agent_keyring_name("agent-pubkey"))
+            .map(String::as_str),
+        Some("nsec1realkey")
+    );
+}
+
+#[test]
+fn migrate_keeps_inline_when_keyring_unreachable() {
+    // No-resurrection guard: a transient outage must NOT migrate; the key
+    // stays inline (file fallback) so it is not lost.
+    let store = FakeKeyStore::unreachable();
+    let record = record_with_key("nsec1realkey");
+
+    let outcome = migrate_inline_key(&store, &record);
+
+    assert_eq!(outcome, KeyMigration::KeptInline);
+    assert!(store.stored.borrow().is_empty());
+}
+
+#[test]
+fn migrate_keeps_inline_when_verify_fails() {
+    // A write whose read-back does not confirm must keep the key inline —
+    // never drop plaintext on an unverified write.
+    let store = FakeKeyStore::verify_fails();
+    let record = record_with_key("nsec1realkey");
+
+    assert_eq!(
+        migrate_inline_key(&store, &record),
+        KeyMigration::KeptInline
+    );
+}
+
+#[test]
+fn migrate_reports_nothing_for_empty_key() {
+    // A record whose key already lives in the keyring (empty inline) has
+    // nothing to migrate. It must NOT be reported as `Persisted` — an
+    // empty key after a keyring outage means the secret is unavailable,
+    // not verified present (Wes storage.rs:158).
+    let store = FakeKeyStore::reachable();
+    let record = record_with_key("");
+
+    assert_eq!(migrate_inline_key(&store, &record), KeyMigration::Nothing);
+    assert!(store.stored.borrow().is_empty());
+}
+
+#[test]
+fn hydrate_fills_key_from_keyring_when_reachable() {
+    // The normal keyring-backed case: an empty inline key is filled from
+    // the keyring on load.
+    let store =
+        FakeKeyStore::reachable().with_key(&agent_keyring_name("agent-pubkey"), "nsec1stored");
+    let mut records = vec![record_with_key("")];
+
+    hydrate_keys_with(&store, &mut records);
+
+    assert_eq!(records[0].private_key_nsec, "nsec1stored");
+}
+
+#[test]
+fn hydrate_leaves_key_empty_on_keyring_outage() {
+    // Outage edge (Wes storage.rs:158): when the keyring read ERRORS, the
+    // key must be left empty — never silently treated as resolved — so the
+    // spawn path refuses rather than launching the agent with no identity.
+    let store = FakeKeyStore::unreachable();
+    let mut records = vec![record_with_key("")];
+
+    hydrate_keys_with(&store, &mut records);
+
+    assert!(
+        records[0].private_key_nsec.is_empty(),
+        "an unreadable key must stay empty, not be fabricated"
+    );
+}
+
+#[test]
+fn spawn_refused_when_private_key_empty() {
+    // The spawn path MUST refuse a record left empty by an outage/absence
+    // before injecting an empty BUZZ_PRIVATE_KEY / NOSTR_PRIVATE_KEY — never
+    // launch an agent with no identity (Wes storage.rs:158).
+    let record = record_with_key("");
+    assert!(
+        super::spawn_key_refusal(&record).is_some(),
+        "an agent with no private key must be refused"
+    );
+}
+
+#[test]
+fn spawn_allowed_when_private_key_present() {
+    // A record carrying a key must not be blocked by the refusal guard.
+    let record = record_with_key("nsec1realkey");
+    assert!(super::spawn_key_refusal(&record).is_none());
+}
+
+#[test]
+fn persist_agent_keys_issues_zero_writes_when_inline_keys_already_cleared() {
+    // This is the dominant prompt-storm scenario: after the first successful
+    // persist all inline copies are cleared, so subsequent saves (e.g. a
+    // model change) must issue zero keychain writes. `migrate_inline_key`
+    // returns `Nothing` for empty-key records, and `persist_agent_keys_with`
+    // must propagate that guarantee — write_count stays at 0.
+    let store = FakeKeyStore::reachable();
+    // Records whose inline key is already blank (key lives in the keyring).
+    let mut records = vec![record_with_key(""), record_with_key("")];
+
+    persist_agent_keys_with(&store, &mut records);
+
+    assert_eq!(
+        *store.write_count.borrow(),
+        0,
+        "a save with no inline keys must issue zero keychain writes"
+    );
+}
+
+#[test]
+fn persist_agent_keys_writes_once_per_record_with_inline_key() {
+    // A record carrying an inline key (e.g. first save, or keyring-outage
+    // residue) must trigger exactly one write_and_verify per record — and
+    // once persisted the inline copy is cleared so the next save is free.
+    // Records use distinct pubkeys so each maps to a distinct keyring name,
+    // verifying the "per record" behaviour rather than a single-key overwrite.
+    let store = FakeKeyStore::reachable();
+    let mut records = vec![
+        record_with_pubkey_and_key("pubkey-agent-alpha", "nsec1key_a"),
+        record_with_pubkey_and_key("pubkey-agent-beta", "nsec1key_b"),
+    ];
+
+    persist_agent_keys_with(&store, &mut records);
+
+    assert_eq!(
+        *store.write_count.borrow(),
+        2,
+        "each record with an inline key must trigger exactly one write"
+    );
+    // Verify the correct keyring name was used for each agent.
+    assert_eq!(
+        store
+            .stored
+            .borrow()
+            .get(&agent_keyring_name("pubkey-agent-alpha"))
+            .map(String::as_str),
+        Some("nsec1key_a"),
+    );
+    assert_eq!(
+        store
+            .stored
+            .borrow()
+            .get(&agent_keyring_name("pubkey-agent-beta"))
+            .map(String::as_str),
+        Some("nsec1key_b"),
+    );
+    // After persist the inline copies are cleared — next save is zero-write.
+    assert!(records[0].private_key_nsec.is_empty());
+    assert!(records[1].private_key_nsec.is_empty());
+}
+
+fn write_log(content: &str) -> NamedTempFile {
+    let mut file = NamedTempFile::new().expect("temp log");
+    file.write_all(content.as_bytes()).expect("write log");
+    file
+}
+
+/// The keyringless fallback write must land `0o600` from the write itself —
+/// not a post-write `chmod` — so a crash in the umask window can never leave
+/// plaintext agent nsecs world-readable (Wes storage.rs:239, SECURITY.md:90).
+#[cfg(unix)]
+#[test]
+fn restricted_write_lands_owner_only_without_post_write_chmod() {
+    use std::os::unix::fs::PermissionsExt;
+
+    let dir = tempfile::tempdir().expect("temp dir");
+    let path = dir.path().join("managed-agents.json");
+
+    super::atomic_write_json_restricted(&path, br#"[{"private_key_nsec":"nsec1secret"}]"#)
+        .expect("restricted write");
+
+    let mode = std::fs::metadata(&path)
+        .expect("metadata")
+        .permissions()
+        .mode()
+        & 0o777;
+    assert_eq!(mode, 0o600, "secret-bearing write must be owner-only");
+    assert_eq!(
+        std::fs::read_to_string(&path).expect("read back"),
+        r#"[{"private_key_nsec":"nsec1secret"}]"#
+    );
+}
+
+#[test]
+fn meaningful_agent_error_from_log_promotes_wrapped_llm_auth() {
+    let file =
+        write_log("noise\nAgent reported error (code -32001): llm auth: 401 unauthorized: ...\n");
+    let result = super::meaningful_agent_error_from_log(file.path()).unwrap();
+    assert!(result.message.contains("llm auth"));
+    assert_eq!(result.code, Some(-32001));
+}
+
+#[test]
+fn meaningful_agent_error_from_log_promotes_unwrapped_llm_auth() {
+    let file = write_log("noise\nllm auth: denied\n");
+    let result = super::meaningful_agent_error_from_log(file.path()).unwrap();
+    assert_eq!(result.message, "Agent reported error: llm auth: denied");
+    assert_eq!(result.code, Some(-32001));
+}
+
+#[test]
+fn meaningful_agent_error_from_log_promotes_bare_model_not_found() {
+    let file = write_log("noise\nllm model not found: (some-model) 404\n");
+    let result = super::meaningful_agent_error_from_log(file.path()).unwrap();
+    assert_eq!(
+        result.message,
+        "Agent reported error: llm model not found: (some-model) 404"
+    );
+    assert_eq!(result.code, Some(-32002));
+}
+
+#[test]
+fn meaningful_agent_error_from_log_promotes_legacy_format() {
+    let file = write_log("noise\nAgent reported error: llm: 500 internal\n");
+    let result = super::meaningful_agent_error_from_log(file.path()).unwrap();
+    assert_eq!(result.message, "Agent reported error: llm: 500 internal");
+    assert_eq!(result.code, None);
+}
+
+#[test]
+fn meaningful_agent_error_from_log_does_not_promote_midline_auth_text() {
+    let file = write_log("noise before llm auth: denied\n");
+    assert!(super::meaningful_agent_error_from_log(file.path()).is_none());
+}
+
+#[test]
+fn strips_ansi_from_typical_tracing_line() {
+    let input = "\x1b[2m2026-05-27T15:16:32\x1b[0m \x1b[32m INFO\x1b[0m \x1b[2mbuzz_acp\x1b[0m\x1b[2m:\x1b[0m starting";
+    assert_eq!(
+        strip_ansi_escapes::strip_str(input),
+        "2026-05-27T15:16:32  INFO buzz_acp: starting"
+    );
+}
+
+// ── harness-log selection tests ────────────────────────────────────────
+
+const PUBKEY_A: &str = "aa11223344556677889900aabbccddeeff00112233445566778899aabbccddee";
+const PUBKEY_B: &str = "bb11223344556677889900aabbccddeeff00112233445566778899aabbccddee";
+
+/// Write `name` into `dir` and stamp it `age_secs` before now, so selection
+/// order is asserted against explicit mtimes rather than write order.
+fn write_log_in(dir: &Path, name: &str, age_secs: u64) {
+    let path = dir.join(name);
+    let file = File::create(&path).expect("create log");
+    file.set_modified(std::time::SystemTime::now() - std::time::Duration::from_secs(age_secs))
+        .expect("stamp mtime");
+}
+
+#[test]
+fn newest_agent_log_prefers_pair_scoped_when_it_is_freshest() {
+    let dir = tempfile::tempdir().expect("temp dir");
+    write_log_in(dir.path(), &format!("{PUBKEY_A}.log"), 600);
+    write_log_in(dir.path(), &format!("{PUBKEY_A}__cafe.log"), 5);
+
+    assert_eq!(
+        super::newest_agent_log_in_dir(dir.path(), PUBKEY_A),
+        Some(dir.path().join(format!("{PUBKEY_A}__cafe.log")))
+    );
+}
+
+#[test]
+fn newest_agent_log_prefers_legacy_when_it_is_freshest() {
+    let dir = tempfile::tempdir().expect("temp dir");
+    write_log_in(dir.path(), &format!("{PUBKEY_A}.log"), 5);
+    write_log_in(dir.path(), &format!("{PUBKEY_A}__cafe.log"), 600);
+
+    assert_eq!(
+        super::newest_agent_log_in_dir(dir.path(), PUBKEY_A),
+        Some(dir.path().join(format!("{PUBKEY_A}.log"))),
+        "mtime decides, not the filename shape"
+    );
+}
+
+#[test]
+fn newest_agent_log_finds_sole_pair_scoped_log() {
+    let dir = tempfile::tempdir().expect("temp dir");
+    write_log_in(dir.path(), &format!("{PUBKEY_A}__cafe.log"), 5);
+
+    assert_eq!(
+        super::newest_agent_log_in_dir(dir.path(), PUBKEY_A),
+        Some(dir.path().join(format!("{PUBKEY_A}__cafe.log")))
+    );
+}
+
+#[test]
+fn newest_agent_log_picks_freshest_of_several_relays() {
+    let dir = tempfile::tempdir().expect("temp dir");
+    write_log_in(dir.path(), &format!("{PUBKEY_A}__aaa.log"), 900);
+    write_log_in(dir.path(), &format!("{PUBKEY_A}__bbb.log"), 5);
+    write_log_in(dir.path(), &format!("{PUBKEY_A}__ccc.log"), 300);
+
+    assert_eq!(
+        super::newest_agent_log_in_dir(dir.path(), PUBKEY_A),
+        Some(dir.path().join(format!("{PUBKEY_A}__bbb.log")))
+    );
+}
+
+#[test]
+fn newest_agent_log_ignores_other_agents_and_non_log_files() {
+    let dir = tempfile::tempdir().expect("temp dir");
+    write_log_in(dir.path(), &format!("{PUBKEY_B}__cafe.log"), 1);
+    write_log_in(dir.path(), &format!("{PUBKEY_A}__cafe.log.gz"), 2);
+    write_log_in(dir.path(), &format!("{PUBKEY_A}__cafe.log"), 600);
+
+    assert_eq!(
+        super::newest_agent_log_in_dir(dir.path(), PUBKEY_A),
+        Some(dir.path().join(format!("{PUBKEY_A}__cafe.log"))),
+        "a fresher log belonging to another agent must never be selected"
+    );
+}
+
+#[test]
+fn newest_agent_log_is_none_when_agent_has_no_logs() {
+    let dir = tempfile::tempdir().expect("temp dir");
+    write_log_in(dir.path(), &format!("{PUBKEY_B}.log"), 1);
+
+    assert_eq!(super::newest_agent_log_in_dir(dir.path(), PUBKEY_A), None);
+}
+
+#[test]
+fn newest_agent_log_is_none_when_dir_is_missing() {
+    let dir = tempfile::tempdir().expect("temp dir");
+    let missing = dir.path().join("absent");
+
+    assert_eq!(super::newest_agent_log_in_dir(&missing, PUBKEY_A), None);
+}
+
+#[test]
+fn newest_agent_log_breaks_mtime_ties_deterministically() {
+    let dir = tempfile::tempdir().expect("temp dir");
+    write_log_in(dir.path(), &format!("{PUBKEY_A}__aaa.log"), 60);
+    write_log_in(dir.path(), &format!("{PUBKEY_A}__bbb.log"), 60);
+
+    assert_eq!(
+        super::newest_agent_log_in_dir(dir.path(), PUBKEY_A),
+        Some(dir.path().join(format!("{PUBKEY_A}__bbb.log"))),
+        "equal mtimes must resolve to the same file on every read_dir order"
+    );
+}
+
+// ── keyring-dev-migration tests ────────────────────────────────────────
+
+#[test]
+fn copy_agent_keys_copies_keys_present_in_src_to_dst() {
+    // Keys in src but not in dst must be copied in a single bulk write,
+    // and the migration-complete marker must be set.
+    let src = FakeKeyStore::reachable()
+        .with_key(&agent_keyring_name("agent-alpha"), "nsec1alpha")
+        .with_key(&agent_keyring_name("agent-beta"), "nsec1beta");
+    let dst = FakeKeyStore::reachable();
+
+    super::copy_agent_keys_between_stores(
+        &["agent-alpha".to_string(), "agent-beta".to_string()],
+        &src,
+        &dst,
+    );
+
+    assert_eq!(
+        dst.stored
+            .borrow()
+            .get(&agent_keyring_name("agent-alpha"))
+            .map(String::as_str),
+        Some("nsec1alpha"),
+        "agent-alpha must be copied from src to dst"
+    );
+    assert_eq!(
+        dst.stored
+            .borrow()
+            .get(&agent_keyring_name("agent-beta"))
+            .map(String::as_str),
+        Some("nsec1beta"),
+        "agent-beta must be copied from src to dst"
+    );
+    assert_eq!(
+        dst.stored
+            .borrow()
+            .get(super::DEV_MIGRATION_MARKER)
+            .map(String::as_str),
+        Some("done"),
+        "migration-complete marker must be set after first migration"
+    );
+    // Bulk write: exactly 1 store_all call.
+    assert_eq!(
+        *dst.write_count.borrow(),
+        1,
+        "must perform exactly one bulk write"
+    );
+    // Src accessed exactly once (bulk blob read).
+    assert_eq!(
+        *src.read_count.borrow(),
+        1,
+        "src must be read exactly once (bulk)"
+    );
+}
+
+#[test]
+fn copy_agent_keys_skips_keys_already_in_dst() {
+    // Idempotency: a key already present in dst must NOT be overwritten
+    // — the agent may have rotated their key in the dev service.
+    let src = FakeKeyStore::reachable().with_key(&agent_keyring_name("agent-alpha"), "nsec1old");
+    let dst = FakeKeyStore::reachable().with_key(&agent_keyring_name("agent-alpha"), "nsec1new");
+
+    super::copy_agent_keys_between_stores(&["agent-alpha".to_string()], &src, &dst);
+
+    // dst value must remain unchanged — src must not overwrite it.
+    assert_eq!(
+        dst.stored
+            .borrow()
+            .get(&agent_keyring_name("agent-alpha"))
+            .map(String::as_str),
+        Some("nsec1new"),
+        "key already in dst must not be overwritten by migration"
+    );
+    // Marker must still be written even though no new keys were copied.
+    assert_eq!(
+        dst.stored
+            .borrow()
+            .get(super::DEV_MIGRATION_MARKER)
+            .map(String::as_str),
+        Some("done"),
+        "marker must be set even when all keys are already present"
+    );
+    assert_eq!(*src.read_count.borrow(), 0);
+}
+
+#[test]
+fn copy_agent_keys_skips_keys_absent_from_src() {
+    // A pubkey with no entry in src (new agent that will mint a fresh key)
+    // must be silently skipped — no agent key written to dst.
+    let src = FakeKeyStore::reachable(); // empty
+    let dst = FakeKeyStore::reachable();
+
+    super::copy_agent_keys_between_stores(&["new-agent".to_string()], &src, &dst);
+
+    assert!(
+        dst.stored
+            .borrow()
+            .get(&agent_keyring_name("new-agent"))
+            .is_none(),
+        "absent src key must produce no agent key write to dst"
+    );
+    // Marker must still be written.
+    assert_eq!(
+        dst.stored
+            .borrow()
+            .get(super::DEV_MIGRATION_MARKER)
+            .map(String::as_str),
+        Some("done"),
+        "marker must be set even when no keys were present in src"
+    );
+}
+
+#[test]
+fn copy_agent_keys_skips_all_when_dst_unreachable() {
+    // When dst keyring is unreachable the migration must be a no-op — never
+    // data-loss (failing to write is fine; the agent will re-mint on next
+    // onboarding run).
+    let src = FakeKeyStore::reachable().with_key(&agent_keyring_name("agent-alpha"), "nsec1alpha");
+    let dst = FakeKeyStore::unreachable();
+
+    super::copy_agent_keys_between_stores(&["agent-alpha".to_string()], &src, &dst);
+
+    // No writes attempted to an unreachable dst.
+    assert_eq!(*dst.write_count.borrow(), 0);
+    // Src must not have been accessed (failed on dst read, returned early).
+    assert_eq!(
+        *src.read_count.borrow(),
+        0,
+        "src must not be accessed when dst is unreachable"
+    );
+}
+
+#[test]
+fn copy_agent_keys_skips_entirely_when_marker_present() {
+    // After the first migration, the marker is in dst. Subsequent calls
+    // must return immediately — the prod keyring (src) must never be read.
+    let src = FakeKeyStore::reachable().with_key(&agent_keyring_name("agent-alpha"), "nsec1alpha");
+    let dst = FakeKeyStore::reachable()
+        .with_key(super::DEV_MIGRATION_MARKER, "done")
+        .with_key(&agent_keyring_name("agent-alpha"), "nsec1dev");
+
+    super::copy_agent_keys_between_stores(&["agent-alpha".to_string()], &src, &dst);
+
+    // Src must not have been accessed at all.
+    assert_eq!(
+        *src.read_count.borrow(),
+        0,
+        "src must not be read when migration-complete marker is present"
+    );
+    // Dst must not have been written.
+    assert_eq!(
+        *dst.write_count.borrow(),
+        0,
+        "dst must not be written when migration-complete marker is present"
+    );
+    // Dev key must remain unchanged.
+    assert_eq!(
+        dst.stored
+            .borrow()
+            .get(&agent_keyring_name("agent-alpha"))
+            .map(String::as_str),
+        Some("nsec1dev"),
+        "dev key must not be overwritten on subsequent boots"
+    );
+}
+
+#[test]
+fn copy_agent_keys_writes_marker_even_with_empty_agent_list() {
+    // An empty pubkey list (no agents yet) must still write the marker so
+    // future boots skip the prod read.
+    let src = FakeKeyStore::reachable();
+    let dst = FakeKeyStore::reachable();
+
+    super::copy_agent_keys_between_stores(&[], &src, &dst);
+
+    assert_eq!(
+        dst.stored
+            .borrow()
+            .get(super::DEV_MIGRATION_MARKER)
+            .map(String::as_str),
+        Some("done"),
+        "marker must be set even when pubkey list is empty"
+    );
+    assert_eq!(*src.read_count.borrow(), 0);
+}
+
+#[test]
+fn try_delete_agent_key_returns_result() {
+    // Verify the result-returning seam exists and has the correct signature.
+    // We cannot call it in default builds (system-keyring feature is on,
+    // which accesses the real OS keychain and blocks in headless/CI). The
+    // real keychain paths are integration-tested through the #[ignore]
+    // tests in secret_store.rs; the rollback aggregation is tested in
+    // team_snapshot::tests::rollback_aggregates_multiple_errors.
+    let _: fn(&str) -> Result<(), String> = super::try_delete_agent_key;
+}
diff --git a/desktop/src-tauri/src/managed_agents/team_snapshot.rs b/desktop/src-tauri/src/managed_agents/team_snapshot.rs
index d88a362723..96082acc76 100644
--- a/desktop/src-tauri/src/managed_agents/team_snapshot.rs
+++ b/desktop/src-tauri/src/managed_agents/team_snapshot.rs
@@ -301,9 +301,11 @@ mod tests {
             name_pool: vec![],
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: Some("SENTINEL_SOURCE_TEAM".to_string()), // MUST NOT appear
             source_team_persona_slug: Some("SENTINEL_SLUG".to_string()), // MUST NOT appear
             definition_respond_to: None,
+            catalog_source: None,
             definition_respond_to_allowlist: vec![],
             definition_parallelism: None,
             relay_mesh: None,
diff --git a/desktop/src-tauri/src/managed_agents/teams_tests.rs b/desktop/src-tauri/src/managed_agents/teams_tests.rs
index 140ac3cab9..1ffa60eda9 100644
--- a/desktop/src-tauri/src/managed_agents/teams_tests.rs
+++ b/desktop/src-tauri/src/managed_agents/teams_tests.rs
@@ -208,8 +208,10 @@ fn managed_agent(name: &str) -> ManagedAgentRecord {
         name_pool: vec![],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         relay_mesh: None,
         definition_respond_to: None,
         definition_respond_to_allowlist: vec![],
diff --git a/desktop/src-tauri/src/managed_agents/types.rs b/desktop/src-tauri/src/managed_agents/types.rs
index af4908911b..3d8e0ed02b 100644
--- a/desktop/src-tauri/src/managed_agents/types.rs
+++ b/desktop/src-tauri/src/managed_agents/types.rs
@@ -40,6 +40,13 @@ pub struct AgentDefinition {
     pub is_builtin: bool,
     #[serde(default = "default_record_active")]
     pub is_active: bool,
+    /// Whether this persona is discoverable in the currently active community.
+    ///
+    /// This is a command/view projection only. Durable share state lives in
+    /// the relay+owner-scoped retention head so one workspace's choice cannot
+    /// leak into another workspace's definition record.
+    #[serde(default)]
+    pub shared: bool,
     /// Team ID if this persona was imported from a team directory.
     /// Team personas are non-editable (system_prompt, model locked).
     #[serde(
@@ -57,6 +64,13 @@ pub struct AgentDefinition {
         alias = "source_pack_persona_slug"
     )]
     pub source_team_persona_slug: Option<String>,
+    /// Provenance of a persona copied from another owner's shared catalog.
+    ///
+    /// Set only on the copy, never on the original. It is what makes
+    /// "already added" answerable for a foreign catalog entry: the copy carries
+    /// a new local id, so the only link back to the publication is this pair.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub catalog_source: Option<CatalogSource>,
     /// Harness-level configuration passed to the agent subprocess as environment variables.
     /// Opaque to Buzz — keys and values are runtime-specific.
     ///
@@ -130,8 +144,11 @@ impl AgentDefinition {
             name_pool: self.name_pool,
             is_builtin: self.is_builtin,
             is_active: self.is_active,
+            // Catalog visibility is relay+owner scoped, not definition-global.
+            shared: false,
             source_team: self.source_team,
             source_team_persona_slug: self.source_team_persona_slug,
+            catalog_source: self.catalog_source,
             definition_respond_to: self.respond_to,
             definition_respond_to_allowlist: self.respond_to_allowlist,
             definition_parallelism: self.parallelism,
@@ -161,8 +178,11 @@ impl ManagedAgentRecord {
             name_pool: self.name_pool.clone(),
             is_builtin: self.is_builtin,
             is_active: self.is_active,
+            // Projected by `list_personas` from the active retention scope.
+            shared: false,
             source_team: self.source_team.clone(),
             source_team_persona_slug: self.source_team_persona_slug.clone(),
+            catalog_source: self.catalog_source.clone(),
             env_vars: self.env_vars.clone(),
             respond_to: self.definition_respond_to.clone(),
             respond_to_allowlist: self.definition_respond_to_allowlist.clone(),
@@ -259,13 +279,19 @@ pub struct ManagedAgentRecord {
     /// Desired LLM model ID. Matches AgentModelInfo.id from discovery.
     /// The harness re-discovers the correct ACP switching metadata at session
     /// creation by matching this ID against the fresh session/new response.
+    /// For a linked instance this is a legacy/display snapshot only — spawn
+    /// and deploy resolve the effective model from the definition, never
+    /// from this field (see `effective_config::resolve_effective_config`).
+    /// For a definition-less instance this field is authoritative.
     #[serde(default)]
     pub model: Option<String>,
-    /// LLM inference provider snapshotted from the persona at create time
-    /// (e.g. 'databricks', 'anthropic'). Spawn and deploy read this, never the
-    /// live persona — so the agent stays pinned to the provider it was created
-    /// with across restarts. `#[serde(default)]` so pre-existing records
-    /// deserialize as `None` and get backfilled on first load.
+    /// LLM inference provider. For a linked instance this is a legacy/display
+    /// snapshot only — spawn and deploy resolve the effective provider from
+    /// the definition, never from this field (see
+    /// `effective_config::resolve_effective_config`). For a definition-less
+    /// instance this field is authoritative. `#[serde(default)]` so
+    /// pre-existing records deserialize as `None` and get backfilled on
+    /// first load.
     #[serde(default)]
     pub provider: Option<String>,
     /// Content hash of the persona at the time this agent was created — the
@@ -362,6 +388,13 @@ pub struct ManagedAgentRecord {
     /// definition hidden from pickers. Defaults `true` for existing records.
     #[serde(default = "default_record_active")]
     pub is_active: bool,
+    /// Legacy process-global catalog visibility field.
+    ///
+    /// New writes omit it and definition views ignore it. It remains
+    /// deserializable for branch-era stores, but active visibility is projected
+    /// from the relay+owner-scoped retention database instead.
+    #[serde(default, skip_serializing)]
+    pub shared: bool,
     /// Absorbed from `AgentDefinition.source_team` — team ID when this
     /// definition was imported from a team directory (team definitions are
     /// non-editable). Distinct from `persona_team_dir`/`persona_name_in_team`,
@@ -372,6 +405,10 @@ pub struct ManagedAgentRecord {
     /// definition's slug within its source team.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub source_team_persona_slug: Option<String>,
+    /// Absorbed from `AgentDefinition.catalog_source` — the publication this
+    /// definition was copied from, when it came from another owner's catalog.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub catalog_source: Option<CatalogSource>,
     /// NIP-AP definition-level behavioral defaults, absorbed from
     /// `AgentDefinition` in WIRE shape (kebab-case string / optional u32),
     /// distinct from the instance-side `respond_to`/`respond_to_allowlist`/
@@ -390,12 +427,15 @@ pub struct ManagedAgentRecord {
     /// inference through Buzz's relay-mesh local endpoint; the `model_ref` is
     /// the served model id to route to. `None` is a normal agent.
     ///
-    /// This is the source of truth for "is this a mesh agent + which model" —
-    /// replacing the old practice of sniffing it back out of `env_vars`
-    /// (`relay_mesh_config`). Spawn-time env vars are *derived from* this, not
-    /// the other way around. `#[serde(default)]` so pre-existing saved records
-    /// deserialize as `None` and are resolved via the env-var fallback until
-    /// they are rewritten with this field.
+    /// Not the source of truth. `provider == "relay-mesh"` is, resolved through
+    /// `effective_config::resolve_effective_config`; spawn-time env vars are
+    /// derived from that resolution. This field is retained solely as a
+    /// backward-compatibility signal for records written before the record had
+    /// a `provider` field, and is consulted only for definition-less records
+    /// that carry no provider — after which the env-var preset is the last
+    /// fallback. A linked instance's marker is never read: its definition is
+    /// authoritative. `#[serde(default)]` so records predating the field
+    /// deserialize as `None`.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub relay_mesh: Option<RelayMeshConfig>,
 }
@@ -456,6 +496,10 @@ pub struct ManagedAgentSummary {
     pub pubkey: String,
     pub name: String,
     pub persona_id: Option<String>,
+    /// The record's harness/runtime id (mirror of `ManagedAgentRecord.runtime`).
+    /// Lets the UI count agents referencing a harness definition (e.g. in the
+    /// delete-confirmation flow). `None` = inherit from the linked persona.
+    pub runtime: Option<String>,
     pub team_id: Option<String>,
     pub relay_url: String,
     pub acp_command: String,
@@ -478,7 +522,11 @@ pub struct ManagedAgentSummary {
     pub system_prompt: Option<String>,
     pub avatar_url: Option<String>,
     pub model: Option<String>,
-    /// LLM inference provider, from the agent's pinned record snapshot.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_source: Option<super::effective_config::ConfigSource>,
+    /// LLM inference provider, resolved the same way as `model`/`model_source`
+    /// (definition → global for linked instances; instance → global for
+    /// definition-less instances). `None` for an orphaned instance.
     pub provider: Option<String>,
     /// `true` when the linked persona has been edited since this agent was
     /// created — the running agent uses the older pinned snapshot. The UI
@@ -487,9 +535,11 @@ pub struct ManagedAgentSummary {
     /// persona is gone, so there is nothing newer to drift toward).
     pub persona_out_of_date: bool,
     /// `true` when the agent was created from a persona that no longer exists.
-    /// Distinct from out-of-date: there is no current persona to respawn into,
-    /// so the UI should not prompt a respawn — the pinned snapshot is all the
-    /// config that remains.
+    /// Distinct from out-of-date: there is no current persona to respawn into.
+    /// An orphaned agent also cannot be (re)started — `spawn_agent_child`
+    /// refuses it (see `effective_config::resolve_effective_config`'s
+    /// `OrphanedInstance` arm via `require_resolved`) — so the UI
+    /// should surface that it's stuck, not merely stale.
     pub persona_orphaned: bool,
     /// `true` when the running process was spawned with a config that no
     /// longer matches what a spawn would use today — a plain restart would
@@ -565,6 +615,19 @@ pub enum AuthStatus {
     Unknown,
 }
 
+/// Origin of an ACP runtime catalog entry. Serializes as a lowercase string
+/// so the TypeScript consumer can switch on it without numeric comparisons.
+#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum HarnessSource {
+    /// Compiled into the app — one of the four first-class runtimes.
+    Builtin,
+    /// Static preset entry with bundled logo, PATH-probed, not editable/deletable.
+    Preset,
+    /// Loaded at runtime from the user's `custom_harnesses/` directory.
+    Custom,
+}
+
 #[derive(Debug, Clone, Serialize)]
 pub struct AcpRuntimeCatalogEntry {
     pub id: String,
@@ -596,6 +659,19 @@ pub struct AcpRuntimeCatalogEntry {
     /// Hint for completing authentication, shown when `auth_status` is not `logged_in`.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub login_hint: Option<String>,
+    /// Whether this entry came from the compiled-in catalog or a user-supplied
+    /// JSON file in `custom_harnesses/`. The UI uses this to decide editability.
+    pub source: HarnessSource,
+    /// Definition-level environment variables for `source: custom` entries.
+    ///
+    /// Populated from `HarnessDefinition.env` so the edit form can read them
+    /// back and the user doesn't silently lose env vars when saving.  Always
+    /// empty for `builtin` and `preset` entries (those env values come from the
+    /// runtime metadata path, not user-editable JSON).
+    ///
+    /// Skipped in serialization when empty to keep the catalog payload compact.
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub definition_env: BTreeMap<String, String>,
 }
 
 /// Result of a single install step (CLI or adapter).
@@ -730,7 +806,7 @@ pub struct UpdateTeamRequest {
 pub const DEFAULT_ACP_COMMAND: &str = "buzz-acp";
 /// ~5 min (320s) — matches the CLI harness default (BUZZ_ACP_IDLE_TIMEOUT).
 pub const DEFAULT_AGENT_TURN_TIMEOUT_SECONDS: u64 = 320;
-pub const DEFAULT_AGENT_PARALLELISM: u32 = 24;
+pub const DEFAULT_AGENT_PARALLELISM: u32 = 10;
 
 fn default_agent_parallelism() -> u32 {
     DEFAULT_AGENT_PARALLELISM
@@ -909,6 +985,8 @@ pub fn resolve_mint_behavioral_defaults(
     })
 }
 
+mod catalog_source;
+pub use catalog_source::CatalogSource;
 mod requests;
 pub use requests::*;
 
diff --git a/desktop/src-tauri/src/managed_agents/types/catalog_source.rs b/desktop/src-tauri/src/managed_agents/types/catalog_source.rs
new file mode 100644
index 0000000000..237ffbbfe9
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/types/catalog_source.rs
@@ -0,0 +1,52 @@
+//! The catalog-provenance coordinate carried on a copied persona
+//! definition, split from `types.rs` (file-size cap).
+
+use serde::{Deserialize, Serialize};
+
+/// Where a persona copy came from in another owner's shared catalog.
+///
+/// The pair is the publication's NIP-AP coordinate minus the kind: the owner
+/// who published it and the `d`-tag identifying the persona within that
+/// owner's catalog. A copy carries a fresh local `id`, so this pair is the
+/// only thing that can answer "is this catalog entry already added".
+///
+/// Field casing follows [`super::RelayMeshConfig`]: persisted records use snake_case
+/// and the camelCase `alias`es accept the create payload the frontend sends
+/// (`rename_all` on the request does not recurse into nested structs).
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct CatalogSource {
+    #[serde(alias = "ownerPubkey")]
+    pub owner_pubkey: String,
+    #[serde(alias = "personaId")]
+    pub persona_id: String,
+}
+
+impl CatalogSource {
+    /// Normalize a coordinate arriving from the frontend.
+    ///
+    /// "Already added" is decided by comparing this pair against a
+    /// publication's author and `d`-tag, so an un-normalized value silently
+    /// fails to match and mints another copy — the exact duplicate the field
+    /// exists to prevent. Owner pubkey: 64 hex, any case in, lowercase out
+    /// (same contract as [`super::validate_respond_to_allowlist`]). Persona id: the
+    /// publication's `d`-tag, trimmed and required.
+    pub fn normalized(self) -> Result<Self, String> {
+        let owner_pubkey = self.owner_pubkey.trim().to_ascii_lowercase();
+        if owner_pubkey.len() != 64 || !owner_pubkey.chars().all(|c| c.is_ascii_hexdigit()) {
+            return Err(format!(
+                "invalid catalog source owner pubkey: '{owner_pubkey}' (must be 64 hex chars)"
+            ));
+        }
+        let persona_id = self.persona_id.trim().to_string();
+        if persona_id.is_empty() {
+            return Err("catalog source persona id is required".to_string());
+        }
+        Ok(Self {
+            owner_pubkey,
+            persona_id,
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/desktop/src-tauri/src/managed_agents/types/catalog_source/tests.rs b/desktop/src-tauri/src/managed_agents/types/catalog_source/tests.rs
new file mode 100644
index 0000000000..1cdb891c0a
--- /dev/null
+++ b/desktop/src-tauri/src/managed_agents/types/catalog_source/tests.rs
@@ -0,0 +1,62 @@
+use super::CatalogSource;
+
+fn source(owner_pubkey: &str, persona_id: &str) -> CatalogSource {
+    CatalogSource {
+        owner_pubkey: owner_pubkey.to_string(),
+        persona_id: persona_id.to_string(),
+    }
+}
+
+#[test]
+fn normalized_lowercases_and_trims_the_owner_pubkey() {
+    // "Already added" compares this against a publication's author hex, which
+    // is always lowercase — a mixed-case value from the UI must not miss.
+    let normalized = source(&format!("  {}  ", "A".repeat(64)), " helper ")
+        .normalized()
+        .expect("64 hex chars with surrounding space is valid");
+    assert_eq!(normalized.owner_pubkey, "a".repeat(64));
+    assert_eq!(normalized.persona_id, "helper");
+}
+
+#[test]
+fn normalized_rejects_a_short_owner_pubkey() {
+    let err = source("abc123", "helper").normalized().unwrap_err();
+    assert!(err.contains("64 hex"), "error must name the rule: {err}");
+}
+
+#[test]
+fn normalized_rejects_a_non_hex_owner_pubkey() {
+    let err = source(&"z".repeat(64), "helper").normalized().unwrap_err();
+    assert!(err.contains("64 hex"), "error must name the rule: {err}");
+}
+
+#[test]
+fn normalized_rejects_a_blank_persona_id() {
+    let err = source(&"a".repeat(64), "   ").normalized().unwrap_err();
+    assert!(
+        err.contains("persona id"),
+        "error must name the field: {err}"
+    );
+}
+
+#[test]
+fn deserializes_the_camel_case_payload_the_frontend_sends() {
+    // `rename_all` on CreatePersonaRequest does not recurse into this struct,
+    // so without the aliases the copy request fails at the Tauri boundary.
+    let parsed: CatalogSource =
+        serde_json::from_str(r#"{"ownerPubkey":"abc","personaId":"helper"}"#)
+            .expect("camelCase payload from TS should deserialize");
+    assert_eq!(parsed, source("abc", "helper"));
+}
+
+#[test]
+fn round_trips_persisted_snake_case() {
+    let value = source(&"a".repeat(64), "helper");
+    let json = serde_json::to_string(&value).unwrap();
+    assert!(json.contains("owner_pubkey"), "persisted shape: {json}");
+    assert_eq!(
+        serde_json::from_str::<CatalogSource>(&json).unwrap(),
+        value,
+        "the camelCase alias must not break the stored-record round trip"
+    );
+}
diff --git a/desktop/src-tauri/src/managed_agents/types/requests.rs b/desktop/src-tauri/src/managed_agents/types/requests.rs
index 58d60218a1..e28b0bd461 100644
--- a/desktop/src-tauri/src/managed_agents/types/requests.rs
+++ b/desktop/src-tauri/src/managed_agents/types/requests.rs
@@ -7,7 +7,7 @@ use serde::Deserialize;
 
 use super::{
     default_start_on_app_launch, validate_respond_to_allowlist, AgentDefinition, BackendKind,
-    RelayMeshConfig, RespondTo,
+    CatalogSource, RelayMeshConfig, RespondTo,
 };
 
 /// The NIP-AP behavioral group as one grouped request field.
@@ -91,6 +91,10 @@ pub struct CreatePersonaRequest {
     /// NIP-AP behavioral group. Absent = behavior group stays unset.
     #[serde(default)]
     pub behavior: Option<PersonaBehaviorRequest>,
+    /// Set when this persona is a copy of another owner's shared catalog entry,
+    /// so the catalog can tell an already-added foreign persona from a new one.
+    #[serde(default)]
+    pub catalog_source: Option<CatalogSource>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -275,8 +279,10 @@ mod tests {
             name_pool: Vec::new(),
             is_builtin: false,
             is_active: true,
+            shared: false,
             source_team: None,
             source_team_persona_slug: None,
+            catalog_source: None,
             env_vars: BTreeMap::new(),
             respond_to: None,
             respond_to_allowlist: Vec::new(),
@@ -428,4 +434,37 @@ mod tests {
         .unwrap();
         assert_eq!(record.parallelism, Some(8));
     }
+
+    /// The catalog copy path is the only caller that sends this field, and it
+    /// sends camelCase from TS. Without it deserializing, the copy silently
+    /// lands with no provenance and duplicate-add returns.
+    #[test]
+    fn create_request_deserializes_camel_case_catalog_source() {
+        let request: CreatePersonaRequest = serde_json::from_str(
+            r#"{
+                "displayName": "Copy",
+                "avatarUrl": null,
+                "systemPrompt": "Prompt",
+                "catalogSource": { "ownerPubkey": "abc", "personaId": "helper" }
+            }"#,
+        )
+        .expect("camelCase catalogSource payload from TS should deserialize");
+        assert_eq!(
+            request.catalog_source,
+            Some(CatalogSource {
+                owner_pubkey: "abc".to_string(),
+                persona_id: "helper".to_string(),
+            })
+        );
+    }
+
+    /// Ordinary agent creation never sends the field.
+    #[test]
+    fn create_request_without_catalog_source_is_not_a_catalog_copy() {
+        let request: CreatePersonaRequest = serde_json::from_str(
+            r#"{ "displayName": "Fresh", "avatarUrl": null, "systemPrompt": "Prompt" }"#,
+        )
+        .expect("a create payload without provenance should deserialize");
+        assert_eq!(request.catalog_source, None);
+    }
 }
diff --git a/desktop/src-tauri/src/managed_agents/types/tests.rs b/desktop/src-tauri/src/managed_agents/types/tests.rs
index 667a41a538..96ed556068 100644
--- a/desktop/src-tauri/src/managed_agents/types/tests.rs
+++ b/desktop/src-tauri/src/managed_agents/types/tests.rs
@@ -1,4 +1,4 @@
-use super::{AgentDefinition, ManagedAgentRecord};
+use super::{AgentDefinition, CatalogSource, ManagedAgentRecord};
 use std::path::PathBuf;
 
 #[test]
@@ -482,8 +482,10 @@ fn sample_persona() -> AgentDefinition {
         name_pool: vec!["Nimble".to_string()],
         is_builtin: false,
         is_active: true,
+        shared: false,
         source_team: Some("team-1".to_string()),
         source_team_persona_slug: Some("helper".to_string()),
+        catalog_source: None,
         env_vars: [("K".to_string(), "v".to_string())].into_iter().collect(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
@@ -493,6 +495,49 @@ fn sample_persona() -> AgentDefinition {
     }
 }
 
+#[test]
+fn persona_record_without_catalog_source_deserializes_and_omits_it() {
+    // Every persona already on disk predates the field — an old record must
+    // load as "not a catalog copy" and must not gain a null key on save.
+    let record: AgentDefinition = serde_json::from_str(
+        r#"{
+            "id": "persona-1",
+            "display_name": "Test",
+            "avatar_url": null,
+            "system_prompt": "Prompt",
+            "created_at": "2026-01-01T00:00:00Z",
+            "updated_at": "2026-01-01T00:00:00Z"
+        }"#,
+    )
+    .expect("pre-catalog-source persona should deserialize");
+
+    assert_eq!(record.catalog_source, None);
+    let json = serde_json::to_string(&record).unwrap();
+    assert!(
+        !json.contains("catalog_source"),
+        "absent provenance must stay absent on disk: {json}"
+    );
+}
+
+#[test]
+fn persona_catalog_source_survives_the_agent_store_fold() {
+    // Provenance is only useful if it is still there on the next launch, and
+    // `save_personas` funnels every definition through `into_agent_record`.
+    let mut persona = sample_persona();
+    persona.catalog_source = Some(CatalogSource {
+        owner_pubkey: "a".repeat(64),
+        persona_id: "helper".to_string(),
+    });
+
+    let view = persona
+        .clone()
+        .into_agent_record()
+        .to_definition_view()
+        .expect("slugged record must present a persona view");
+
+    assert_eq!(view.catalog_source, persona.catalog_source);
+}
+
 #[test]
 fn persona_into_agent_record_is_keyless_and_slugged() {
     let record = sample_persona().into_agent_record();
diff --git a/desktop/src-tauri/src/mesh_llm/coordinator.rs b/desktop/src-tauri/src/mesh_llm/coordinator.rs
index e83bf8b280..1e279353b6 100644
--- a/desktop/src-tauri/src/mesh_llm/coordinator.rs
+++ b/desktop/src-tauri/src/mesh_llm/coordinator.rs
@@ -22,10 +22,22 @@ const STATUS_D_TAG_PREFIX: &str = "buzz-mesh-member-status";
 const ROSTER_POLL_INTERVAL: Duration = Duration::from_secs(60);
 const STATUS_PUBLISH_INTERVAL: Duration = Duration::from_secs(45);
 const STATUS_PUBLISH_TIMEOUT: Duration = Duration::from_secs(10);
+/// Post-launch ingress liveness / re-arm for #2062. Bounded backoff: base 15s,
+/// doubles after consecutive failures up to 120s so a sticky offline peer does
+/// not hammer discovery every tick, but a recovered peer is noticed quickly.
+const INGRESS_WATCHDOG_BASE: Duration = Duration::from_secs(15);
+const INGRESS_WATCHDOG_MAX: Duration = Duration::from_secs(120);
+/// A Share Compute node may start before another member's signed status reaches
+/// the relay. Recheck promptly so simultaneous starts converge into one Buzz
+/// mesh instead of remaining independent islands.
+const MESH_JOIN_POLL_INTERVAL: Duration = Duration::from_secs(15);
+const MESH_JOIN_RETRY_MAX: Duration = Duration::from_secs(120);
 
 pub struct MeshCoordinator {
     _status_publisher: tokio::task::JoinHandle<()>,
     _roster_watcher: tokio::task::JoinHandle<()>,
+    _ingress_watchdog: tokio::task::JoinHandle<()>,
+    _mesh_join_watcher: tokio::task::JoinHandle<()>,
 }
 
 /// Start the runtime-owned status publisher and admission-roster watcher.
@@ -56,12 +68,47 @@ pub async fn start_coordinator(app: AppHandle) {
         let mut pending_shrink: Option<Vec<String>> = None;
         loop {
             tokio::time::sleep(ROSTER_POLL_INTERVAL).await;
-            let state = roster_app.state::<AppState>();
-            if let Err(error) = reconcile_roster(&state, &mut pending_shrink).await {
+            if let Err(error) = reconcile_roster(&roster_app, &mut pending_shrink).await {
                 eprintln!("buzz-mesh: roster reconcile failed: {error}");
             }
         }
     });
+    let join_app = app.clone();
+    let mesh_join_watcher = tokio::spawn(async move {
+        let mut sleep_for = MESH_JOIN_POLL_INTERVAL;
+        loop {
+            tokio::time::sleep(sleep_for).await;
+            match reconcile_buzz_mesh_join(&join_app).await {
+                Ok(()) => sleep_for = MESH_JOIN_POLL_INTERVAL,
+                Err(error) => {
+                    eprintln!("buzz-mesh: community mesh join reconcile failed: {error}");
+                    sleep_for = (sleep_for * 2).min(MESH_JOIN_RETRY_MAX);
+                }
+            }
+        }
+    });
+
+    // Brad #2304 / #2062: ensure_relay_mesh_for_record only runs on explicit
+    // start + launch restore. After launch, local buzz-agent processes talk
+    // directly to :9337; there is no desktop "turn dispatch" hook. This
+    // watchdog is the post-launch seam: probe ingress, drop a zombie handle,
+    // re-arm via ensure_relay_mesh_for_record, surface last_error on failure.
+    let ingress_app = app.clone();
+    let ingress_watchdog = tokio::spawn(async move {
+        let mut sleep_for = INGRESS_WATCHDOG_BASE;
+        loop {
+            tokio::time::sleep(sleep_for).await;
+            match crate::mesh_llm::rearm_relay_mesh_for_running_agents(&ingress_app).await {
+                Ok(()) => {
+                    sleep_for = INGRESS_WATCHDOG_BASE;
+                }
+                Err(error) => {
+                    eprintln!("buzz-mesh: ingress re-arm watchdog: {error}");
+                    sleep_for = (sleep_for * 2).min(INGRESS_WATCHDOG_MAX);
+                }
+            }
+        }
+    });
 
     let state = app.state::<AppState>();
     let mut guard = state.mesh_coordinator.lock().await;
@@ -69,13 +116,86 @@ pub async fn start_coordinator(app: AppHandle) {
         *guard = Some(MeshCoordinator {
             _status_publisher: status_publisher,
             _roster_watcher: roster_watcher,
+            _ingress_watchdog: ingress_watchdog,
+            _mesh_join_watcher: mesh_join_watcher,
         });
     } else {
         status_publisher.abort();
         roster_watcher.abort();
+        ingress_watchdog.abort();
+        mesh_join_watcher.abort();
     }
 }
 
+/// Join an isolated runtime to the existing Buzz community mesh. The relay is
+/// discovery only: the selected endpoint is member-signed and validated, then
+/// MeshLLM establishes the encrypted peer transport itself.
+async fn reconcile_buzz_mesh_join(app: &AppHandle) -> Result<(), String> {
+    let state = app.state::<AppState>();
+    let peer_ids = {
+        let runtime = state.mesh_llm_runtime.lock().await;
+        let Some(runtime) = runtime.as_ref() else {
+            return Ok(());
+        };
+        let payload = runtime
+            .status_report_payload()
+            .await
+            .map_err(|error| error.to_string())?;
+        visible_peer_ids(&payload)
+    };
+
+    let targets = crate::commands::mesh_llm::resolve_buzz_mesh_join_targets(&state).await?;
+    let Some(target) = targets
+        .into_iter()
+        .find(|target| !target_is_visible(target, &peer_ids))
+    else {
+        return Ok(());
+    };
+
+    let runtime = state.mesh_llm_runtime.lock().await;
+    let Some(runtime) = runtime.as_ref() else {
+        return Ok(());
+    };
+    let payload = runtime
+        .status_report_payload()
+        .await
+        .map_err(|error| error.to_string())?;
+    if target_is_visible(&target, &visible_peer_ids(&payload)) {
+        return Ok(());
+    }
+    runtime
+        .dial_endpoint_addr(target.endpoint_addr)
+        .await
+        .map_err(|error| format!("mesh join failed: {error:#}"))
+}
+
+fn visible_peer_ids(payload: &serde_json::Value) -> Vec<String> {
+    payload
+        .get("peers")
+        .and_then(serde_json::Value::as_array)
+        .into_iter()
+        .flatten()
+        .filter_map(|peer| peer.get("id").and_then(serde_json::Value::as_str))
+        .map(|id| id.trim().to_ascii_lowercase())
+        .filter(|id| !id.is_empty())
+        .collect()
+}
+
+fn target_is_visible(target: &crate::mesh_llm::MeshServeTarget, peer_ids: &[String]) -> bool {
+    let Some(endpoint_id) = target.endpoint_id.as_deref() else {
+        return false;
+    };
+    let endpoint_id = endpoint_id.trim().to_ascii_lowercase();
+    if endpoint_id.is_empty() {
+        return false;
+    }
+    peer_ids.iter().any(|peer_id| {
+        let peer_id = peer_id.trim().to_ascii_lowercase();
+        !peer_id.is_empty()
+            && (endpoint_id.starts_with(&peer_id) || peer_id.starts_with(&endpoint_id))
+    })
+}
+
 /// Outcome of a roster reconcile decision.
 #[derive(Debug, PartialEq, Eq)]
 enum RosterReconcileAction {
@@ -140,9 +260,10 @@ fn roster_reconcile_action(
 }
 
 async fn reconcile_roster(
-    state: &AppState,
+    app: &AppHandle,
     pending_shrink: &mut Option<Vec<String>>,
 ) -> Result<(), String> {
+    let state = app.state::<AppState>();
     let current_request = {
         let runtime = state.mesh_llm_runtime.lock().await;
         match runtime.as_ref() {
@@ -162,7 +283,7 @@ async fn reconcile_roster(
     // other member on a transient relay blip (the flapping restart loop). Keep
     // the current allowlist and try again on the next poll. A shrink is held
     // for one extra poll (hysteresis) so a single short-read never tears down.
-    let query = crate::commands::mesh_llm::resolve_trusted_owner_ids(state).await;
+    let query = crate::commands::mesh_llm::resolve_trusted_owner_ids(&state).await;
     let fresh = match roster_reconcile_action(current_owners, pending_shrink.as_deref(), query) {
         RosterReconcileAction::Keep => {
             *pending_shrink = None;
@@ -179,19 +300,65 @@ async fn reconcile_roster(
         }
     };
 
-    let mut request = current_request;
+    let mut request = current_request.clone();
     request.trusted_owner_ids = Some(fresh);
+    // Bootstrap endpoints are live device state, not configuration. The
+    // endpoint used at the previous start may belong to the member that just
+    // left or to a device whose iroh identity rotated while offline. Resolve a
+    // fresh validated peer for this restart; starting isolated is safe because
+    // the join watcher will converge it when a member next publishes.
+    request.join_token = match crate::commands::mesh_llm::resolve_buzz_mesh_join_targets(&state)
+        .await
+    {
+        Ok(targets) => targets
+            .into_iter()
+            .next()
+            .map(|target| target.endpoint_addr),
+        Err(error) => {
+            eprintln!(
+                "buzz-mesh: could not refresh bootstrap endpoint for roster restart; starting isolated: {error}"
+            );
+            None
+        }
+    };
     let mut guard = state.mesh_llm_runtime.lock().await;
+    let startup_pending = match guard.as_ref() {
+        Some(runtime) => runtime.is_starting().await,
+        None => false,
+    };
+    if startup_pending {
+        eprintln!(
+            "buzz-mesh: membership roster changed while client management startup is pending; deferring restart"
+        );
+        return Ok(());
+    }
+    if guard
+        .as_ref()
+        .is_some_and(|runtime| runtime.start_request() != &current_request)
+    {
+        // The runtime changed while relay discovery was in flight. Its own
+        // request is now authoritative; the next poll will reconcile that
+        // runtime instead of tearing down a fresh replacement from this stale
+        // snapshot.
+        return Ok(());
+    }
     let Some(running) = guard.take() else {
         return Ok(());
     };
     eprintln!("buzz-mesh: membership roster changed; restarting mesh node with fresh allowlist");
     if let Err(error) = running.stop().await {
-        eprintln!("buzz-mesh: stopping mesh node for roster restart failed: {error}");
+        drop(guard);
+        eprintln!(
+            "buzz-mesh: stopping mesh node for roster restart failed; restarting Buzz instead of racing the occupied ingress: {error}"
+        );
+        app.request_restart();
+        return Err(format!(
+            "mesh node shutdown failed during roster change: {error}"
+        ));
     }
     let replacement = crate::mesh_llm::DesktopMeshRuntime::start(request)
         .await
-        .map_err(|error| format!("mesh node restart after roster change failed: {error}"))?;
+        .map_err(|error| format!("mesh node restart after roster change failed: {error:#}"))?;
     *guard = Some(replacement);
     Ok(())
 }
@@ -317,6 +484,51 @@ mod tests {
 
     use super::*;
 
+    fn join_target(endpoint_id: Option<&str>) -> crate::mesh_llm::MeshServeTarget {
+        crate::mesh_llm::MeshServeTarget {
+            model_id: "model".to_string(),
+            model_name: None,
+            endpoint_addr: "iroh://example".to_string(),
+            reporter_pubkey: Some("member".to_string()),
+            owner_id: Some("owner".to_string()),
+            node_name: None,
+            capacity: None,
+            endpoint_id: endpoint_id.map(str::to_string),
+            device_id: None,
+            device_name: None,
+        }
+    }
+
+    #[test]
+    fn visible_peer_ids_reads_the_sdk_status_shape() {
+        assert_eq!(
+            visible_peer_ids(&serde_json::json!({
+                "peers": [{"id": " ABC123 "}, {"id": "def456"}, {"name": "ignored"}]
+            })),
+            vec!["abc123".to_string(), "def456".to_string()]
+        );
+    }
+
+    #[test]
+    fn target_visibility_accepts_sdk_short_endpoint_ids() {
+        let target = join_target(Some("ABC1234567890"));
+
+        assert!(target_is_visible(&target, &["abc123".to_string()]));
+        assert!(!target_is_visible(&target, &["def456".to_string()]));
+    }
+
+    #[test]
+    fn target_without_an_endpoint_id_is_never_treated_as_connected() {
+        assert!(!target_is_visible(
+            &join_target(None),
+            &["abc123".to_string()]
+        ));
+        assert!(!target_is_visible(
+            &join_target(Some("  ")),
+            &["abc123".to_string()]
+        ));
+    }
+
     // Regression: a transient roster-query failure must never restart the node
     // down to self-only. Before the fix, `resolve_trusted_owner_ids` returned
     // an empty Vec on error, which `reconcile_roster` read as "roster changed
diff --git a/desktop/src-tauri/src/mesh_llm/discovery.rs b/desktop/src-tauri/src/mesh_llm/discovery.rs
index d7dca6b11b..2df4a7f8c5 100644
--- a/desktop/src-tauri/src/mesh_llm/discovery.rs
+++ b/desktop/src-tauri/src/mesh_llm/discovery.rs
@@ -5,9 +5,10 @@ use sha2::{Digest, Sha256};
 
 use super::{dedupe_models, MeshAvailability, MeshModelOption, MeshServeTarget, MESH_STATUS_KIND};
 
-/// Running-node status notes are refreshed every 45 seconds. Ignore notes older
-/// than two minutes so crashed/offline devices stop contributing compute or
-/// admission identities without requiring a relay-side cleanup job.
+/// Running-node status notes are refreshed every 45 seconds. Routing ignores
+/// notes older than two minutes so crashed/offline devices stop contributing
+/// compute without a relay-side cleanup job. Admission intentionally does not:
+/// Buzz membership, rather than device liveness, is the trust boundary.
 pub(super) const STATUS_FRESHNESS_SECS: u64 = 120;
 pub(crate) const MESH_STATUS_PAGE_SIZE: usize = 100;
 
@@ -199,13 +200,14 @@ pub fn availability_from_events(events: Vec<nostr::Event>) -> MeshAvailability {
         let Ok(content) = serde_json::from_str::<serde_json::Value>(&event.content) else {
             continue;
         };
-        if owner_id_from_status_event(&event).is_none() {
+        let Some(owner_id) = owner_id_from_status_event(&event) else {
             continue;
-        }
+        };
         if !endpoint_binding_is_valid(&event, &content) {
             continue;
         }
         saw_valid_status = true;
+        let reporter_pubkey = event.pubkey.to_hex().to_ascii_lowercase();
         let mut serve_targets = content
             .get("serveTargets")
             .or_else(|| content.get("serve_targets"))
@@ -218,6 +220,8 @@ pub fn availability_from_events(events: Vec<nostr::Event>) -> MeshAvailability {
                     super::transport_policy::validate_advertised_endpoint(&target.endpoint_addr)
                         .ok()?;
                 target.endpoint_addr = validated.join_token;
+                target.reporter_pubkey = Some(reporter_pubkey.clone());
+                target.owner_id = Some(owner_id.clone());
                 if target.endpoint_id.is_none() {
                     target.endpoint_id = Some(validated.endpoint_id);
                 }
diff --git a/desktop/src-tauri/src/mesh_llm/mod.rs b/desktop/src-tauri/src/mesh_llm/mod.rs
index acece498c0..6e3ab4b28b 100644
--- a/desktop/src-tauri/src/mesh_llm/mod.rs
+++ b/desktop/src-tauri/src/mesh_llm/mod.rs
@@ -22,6 +22,16 @@ pub use identity::ensure_owner_identity;
 mod progress;
 pub use progress::install_progress_sink;
 
+mod recovery;
+pub use recovery::MeshRecoveryState;
+pub(crate) use recovery::{
+    rearm_relay_mesh_for_running_agents, recover_stale_mesh_runtime, MeshRecoveryUrgency,
+    MeshRuntimeRecovery,
+};
+
+mod usage;
+pub use usage::{serving_usage_from_payload, MeshServingUsage};
+
 mod transport_policy;
 #[cfg(test)]
 use transport_policy::iroh_relay_mode_from;
@@ -48,6 +58,17 @@ const MESH_IROH_RELAYS_ENV: &str = "BUZZ_MESH_IROH_RELAYS";
 /// First model load can include a multi-GB download plus Metal warmup; the
 /// SDK default (30s) times out long before that. Matches mesh-console.
 const MESH_STARTUP_TIMEOUT: Duration = Duration::from_secs(180);
+/// The pinned SDK defines startup readiness as the management API on `:3131`.
+/// Buzz defines client readiness by the OpenAI ingress agents consume on
+/// `:9337`, so it supervises client startup independently and gives the SDK a
+/// long management deadline. A live ingress is therefore not torn down merely
+/// because the optional management API is delayed; Buzz's ingress watchdog is
+/// responsible for aborting and re-arming genuinely dead attempts.
+const MESH_CLIENT_MANAGEMENT_TIMEOUT: Duration = Duration::from_secs(365 * 24 * 60 * 60);
+/// Bound explicit and watchdog-driven shutdowns. `EmbeddedNodeHandle::stop`
+/// sends the shutdown signal before awaiting the runtime thread, so dropping
+/// that wait after the deadline still leaves a graceful shutdown in flight.
+const MESH_STOP_TIMEOUT: Duration = Duration::from_secs(12);
 /// Sentinel model id meaning "let the mesh router pick". mesh-llm's OpenAI
 /// ingress auto-routes `"model": "auto"` to a context-compatible live target
 /// (`resolve_auto_routed_model`), so agents don't have to name a model and
@@ -66,6 +87,15 @@ pub struct MeshServeTarget {
     pub model_id: String,
     pub model_name: Option<String>,
     pub endpoint_addr: String,
+    /// Buzz member that signed the discovery note containing this target.
+    /// Populated after signature/membership validation; never trusted from the
+    /// note payload itself.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub reporter_pubkey: Option<String>,
+    /// Per-runtime MeshLLM owner identity verified by the signed Buzz status.
+    /// Distinguishes two devices logged into the same Buzz member account.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub owner_id: Option<String>,
     pub node_name: Option<String>,
     pub capacity: Option<MeshTargetCapacity>,
     #[serde(default)]
@@ -166,6 +196,10 @@ pub struct StartMeshNodeRequest {
     pub max_vram_gb: Option<u64>,
     #[serde(default)]
     pub join_token: Option<String>,
+    /// Stable, relay-scoped mesh name injected by the Buzz backend. It is not
+    /// accepted from the frontend and contains no relay address.
+    #[serde(default, skip_deserializing)]
+    pub mesh_name: Option<String>,
     /// Mesh owner ids admitted to this node (the member roster from
     /// member-signed discovery notes). `None` = caller did not resolve a roster
     /// (tests, direct invocations): the node runs without allowlist
@@ -196,80 +230,6 @@ pub struct MeshNodeStatus {
     pub device_name: Option<String>,
 }
 
-/// Host-side "who is using the compute I'm sharing" snapshot.
-///
-/// Read-only projection of the serving node's own runtime metrics (the same
-/// `routing_metrics` / `inflight_requests` the SDK already exposes on the local
-/// console). No new trust surface: it reads the node's own status payload.
-///
-/// The local/remote/endpoint attempt split is what distinguishes *my own*
-/// agent (local) from *another member consuming my compute* (remote/endpoint).
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-#[serde(rename_all = "camelCase")]
-pub struct MeshServingUsage {
-    /// Requests being served right now.
-    pub inflight: u64,
-    /// Highest concurrent in-flight seen this session.
-    pub peak_inflight: u64,
-    /// Total requests routed through this node.
-    pub requests_served: u64,
-    /// Completion tokens produced.
-    pub tokens_served: u64,
-    /// Recent decode throughput.
-    pub tokens_per_second: f64,
-    /// Requests served for this machine's own agents.
-    pub local_attempts: u64,
-    /// Requests served for a remote peer (someone else consuming my compute).
-    pub remote_attempts: u64,
-    /// Requests served via an advertised endpoint (also a remote consumer).
-    pub endpoint_attempts: u64,
-    /// Other nodes currently visible as peers.
-    pub peers: u64,
-}
-
-impl MeshServingUsage {
-    /// True when at least one request has been served for a non-local consumer.
-    pub fn has_remote_consumers(&self) -> bool {
-        self.remote_attempts > 0 || self.endpoint_attempts > 0
-    }
-}
-
-/// Pure extractor: project a raw SDK status payload into [`MeshServingUsage`].
-///
-/// Every field is read defensively (missing → 0) so an SDK shape change
-/// degrades to "no usage shown" rather than an error. Kept pure so it can be
-/// unit-tested against a captured payload without a live runtime.
-pub fn serving_usage_from_payload(payload: &serde_json::Value) -> MeshServingUsage {
-    let u64_at = |v: &serde_json::Value| v.as_u64().unwrap_or(0);
-    let rm = payload.get("routing_metrics");
-    let local = rm.and_then(|m| m.get("local_node"));
-    let get_u64 = |obj: Option<&serde_json::Value>, key: &str| {
-        obj.and_then(|o| o.get(key)).map(u64_at).unwrap_or(0)
-    };
-    MeshServingUsage {
-        inflight: local
-            .and_then(|l| l.get("current_inflight_requests"))
-            .map(u64_at)
-            .or_else(|| payload.get("inflight_requests").map(u64_at))
-            .unwrap_or(0),
-        peak_inflight: get_u64(local, "peak_inflight_requests"),
-        requests_served: get_u64(rm, "request_count"),
-        tokens_served: get_u64(rm, "completion_tokens_observed"),
-        tokens_per_second: rm
-            .and_then(|m| m.get("avg_tokens_per_second"))
-            .and_then(serde_json::Value::as_f64)
-            .unwrap_or(0.0),
-        local_attempts: get_u64(local, "local_attempt_count"),
-        remote_attempts: get_u64(local, "remote_attempt_count"),
-        endpoint_attempts: get_u64(local, "endpoint_attempt_count"),
-        peers: payload
-            .get("peers")
-            .and_then(serde_json::Value::as_array)
-            .map(|a| a.len() as u64)
-            .unwrap_or(0),
-    }
-}
-
 pub fn stopped_status() -> MeshNodeStatus {
     MeshNodeStatus {
         state: MeshNodeState::Off,
@@ -286,9 +246,31 @@ pub fn stopped_status() -> MeshNodeStatus {
     }
 }
 
+/// Monotonic id source so callers can compare runtime *identity* across an
+/// `.await` point. The re-arm watchdog must not evict a fresh replacement that
+/// a concurrent stop/start swapped in while the ingress probe was in flight
+/// (Brad #2304 race), so it captures the id before probing and only evicts if
+/// the same handle is still installed on lock reacquire.
+static MESH_RUNTIME_ID_SEQ: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
+
+enum DesktopMeshHandle {
+    /// The pinned SDK does not return its handle until `:3131/api/status` is
+    /// available. Keep that wait off the agent-save path while Buzz supervises
+    /// the real `:9337` ingress independently.
+    Starting {
+        task: tokio::task::JoinHandle<anyhow::Result<EmbeddedNodeHandle>>,
+        queued_join_tokens: Vec<String>,
+    },
+    Ready(EmbeddedNodeHandle),
+    Failed(String),
+}
+
 pub struct DesktopMeshRuntime {
-    handle: EmbeddedNodeHandle,
+    id: u64,
+    handle: tokio::sync::Mutex<DesktopMeshHandle>,
     mode: MeshNodeMode,
+    api_base_url: String,
+    console_url: String,
     model_id: Option<String>,
     model_name: Option<String>,
     /// The request this node was started with. Kept so the coordinator can
@@ -362,6 +344,8 @@ impl DesktopMeshRuntime {
                 ensure_model_downloaded(model).await?;
             }
         }
+        let api_port = mesh_api_port()?;
+        let console_port = mesh_console_port()?;
         let handle = match request.mode {
             MeshNodeMode::Serve => {
                 let model = model_id
@@ -369,8 +353,8 @@ impl DesktopMeshRuntime {
                     .ok_or_else(|| anyhow::anyhow!("modelId is required for serve mode"))?;
                 let mut builder = serve::EmbeddedServeConfig::builder()
                     .model(model)
-                    .api_port(mesh_api_port()?)
-                    .console_port(mesh_console_port()?)
+                    .api_port(api_port)
+                    .console_port(console_port)
                     // No-leak invariants: never publish mesh presence, never
                     // auto-discover other meshes, no public Nostr relays.
                     // Iroh relays are transport-only and enabled by default
@@ -380,6 +364,9 @@ impl DesktopMeshRuntime {
                     .discovery_mode(MeshDiscoveryMode::Nostr)
                     .startup_timeout(MESH_STARTUP_TIMEOUT)
                     .console_ui(true);
+                if let Some(mesh_name) = request.mesh_name.as_deref() {
+                    builder = builder.mesh_name(mesh_name);
+                }
                 builder = match iroh_relay_mode()? {
                     IrohRelayMode::Disabled => builder.disable_iroh_relays(true),
                     IrohRelayMode::Default => builder.disable_iroh_relays(false),
@@ -405,18 +392,21 @@ impl DesktopMeshRuntime {
                         .trust_policy(TrustPolicy::Allowlist)
                         .trust_owners(owners);
                 }
-                serve::start(builder.build()).await?
+                DesktopMeshHandle::Ready(serve::start(builder.build()).await?)
             }
             MeshNodeMode::Client => {
                 let mut builder = client::EmbeddedClientConfig::builder()
-                    .api_port(mesh_api_port()?)
-                    .console_port(mesh_console_port()?)
+                    .api_port(api_port)
+                    .console_port(console_port)
                     // Same no-leak invariants as serve mode above.
                     .publish(false)
                     .auto_join(false)
                     .discovery_mode(MeshDiscoveryMode::Nostr)
-                    .startup_timeout(MESH_STARTUP_TIMEOUT)
+                    .startup_timeout(MESH_CLIENT_MANAGEMENT_TIMEOUT)
                     .console_ui(true);
+                if let Some(mesh_name) = request.mesh_name.as_deref() {
+                    builder = builder.mesh_name(mesh_name);
+                }
                 builder = match iroh_relay_mode()? {
                     IrohRelayMode::Disabled => builder.disable_iroh_relays(true),
                     IrohRelayMode::Default => builder.disable_iroh_relays(false),
@@ -437,19 +427,33 @@ impl DesktopMeshRuntime {
                         .trust_policy(TrustPolicy::Allowlist)
                         .trust_owners(owners);
                 }
-                client::start(builder.build()).await?
+                let config = builder.build();
+                DesktopMeshHandle::Starting {
+                    task: tokio::spawn(async move { client::start(config).await }),
+                    queued_join_tokens: Vec::new(),
+                }
             }
         };
 
         Ok(Self {
-            handle,
+            id: MESH_RUNTIME_ID_SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
+            handle: tokio::sync::Mutex::new(handle),
             mode: request.mode,
+            api_base_url: format!("http://127.0.0.1:{api_port}/v1"),
+            console_url: format!("http://127.0.0.1:{console_port}"),
             model_id,
             model_name,
             start_request: request,
         })
     }
 
+    /// Process-unique identity for this runtime instance. Used by the re-arm
+    /// watchdog to detect a concurrent handle swap across the ingress probe
+    /// `.await` so it never evicts a fresh replacement runtime (Brad #2304).
+    pub fn id(&self) -> u64 {
+        self.id
+    }
+
     /// The request this node was started with (roster drift detection).
     pub fn start_request(&self) -> &StartMeshNodeRequest {
         &self.start_request
@@ -463,13 +467,117 @@ impl DesktopMeshRuntime {
         self.mode
     }
 
+    async fn promote_finished_startup(handle: &mut DesktopMeshHandle) {
+        let startup_finished = matches!(
+            handle,
+            DesktopMeshHandle::Starting { task, .. } if task.is_finished()
+        );
+        if !startup_finished {
+            return;
+        }
+
+        let previous = std::mem::replace(
+            handle,
+            DesktopMeshHandle::Failed("mesh client startup state was unavailable".to_string()),
+        );
+        let (task, queued_join_tokens) = match previous {
+            DesktopMeshHandle::Starting {
+                task,
+                queued_join_tokens,
+            } => (task, queued_join_tokens),
+            other => {
+                *handle = other;
+                return;
+            }
+        };
+        *handle = match task.await {
+            Ok(Ok(ready)) => {
+                for token in queued_join_tokens {
+                    if let Err(error) = ready.join_token(token).await {
+                        eprintln!(
+                            "buzz-mesh: failed to apply a dial request queued during startup: {error:#}"
+                        );
+                    }
+                }
+                DesktopMeshHandle::Ready(ready)
+            }
+            Ok(Err(error)) => {
+                DesktopMeshHandle::Failed(format!("embedded mesh client startup failed: {error:#}"))
+            }
+            Err(error) if error.is_cancelled() => {
+                DesktopMeshHandle::Failed("embedded mesh client startup was cancelled".to_string())
+            }
+            Err(error) => DesktopMeshHandle::Failed(format!(
+                "embedded mesh client startup task failed: {error}"
+            )),
+        };
+    }
+
+    pub async fn is_starting(&self) -> bool {
+        let mut handle = self.handle.lock().await;
+        Self::promote_finished_startup(&mut handle).await;
+        matches!(*handle, DesktopMeshHandle::Starting { .. })
+    }
+
     pub async fn status(&self) -> anyhow::Result<MeshNodeStatus> {
-        let status = self.handle.status().await?;
-        self.status_from_sdk(status)
+        let mut handle = self.handle.lock().await;
+        Self::promote_finished_startup(&mut handle).await;
+        match &*handle {
+            DesktopMeshHandle::Ready(ready) => {
+                let status = ready.status().await;
+                drop(handle);
+                match status {
+                    Ok(status) => self.status_from_sdk(status),
+                    Err(error)
+                        if self.mode == MeshNodeMode::Client
+                            && recovery::mesh_ingress_is_live_at(&self.api_base_url).await =>
+                    {
+                        Ok(self.ingress_only_client_status(&format!(
+                            "management status is unavailable: {error:#}"
+                        )))
+                    }
+                    Err(error) => Err(error),
+                }
+            }
+            DesktopMeshHandle::Starting { .. } => {
+                drop(handle);
+                if recovery::mesh_ingress_is_live_at(&self.api_base_url).await {
+                    Ok(self.ingress_only_client_status("management status is still starting"))
+                } else {
+                    Ok(self.starting_client_status())
+                }
+            }
+            DesktopMeshHandle::Failed(error) => {
+                let error = error.clone();
+                Err(anyhow::anyhow!(error))
+            }
+        }
     }
 
     pub async fn status_report_payload(&self) -> anyhow::Result<serde_json::Value> {
-        let status = self.handle.status().await?;
+        let mut handle = self.handle.lock().await;
+        Self::promote_finished_startup(&mut handle).await;
+        let ready = match &*handle {
+            DesktopMeshHandle::Ready(ready) => ready,
+            DesktopMeshHandle::Starting { .. } if self.mode == MeshNodeMode::Client => {
+                // Consumer identities must keep publishing owner bindings while
+                // the SDK is still waiting for its management API. Serving
+                // peers derive their admission roster from these fresh member
+                // notes; withholding heartbeats here would make an otherwise
+                // working `:9337` client age out of the host's allowlist.
+                return Ok(serde_json::json!({
+                    "serveTargets": [],
+                    "models": [],
+                }));
+            }
+            DesktopMeshHandle::Starting { .. } => {
+                anyhow::bail!("mesh management status is not ready")
+            }
+            DesktopMeshHandle::Failed(error) => {
+                anyhow::bail!("mesh runtime failed: {error}")
+            }
+        };
+        let status = ready.status().await?;
         let mut payload = status.payload;
         enrich_status_payload_identity(&mut payload, status.invite_token.as_deref());
         if let Ok(identity) = ensure_owner_identity() {
@@ -485,6 +593,8 @@ impl DesktopMeshRuntime {
                     model_id: model.id,
                     model_name: model.name,
                     endpoint_addr: endpoint_addr.clone(),
+                    reporter_pubkey: None,
+                    owner_id: None,
                     node_name: payload
                         .get("node_id")
                         .and_then(serde_json::Value::as_str)
@@ -504,18 +614,43 @@ impl DesktopMeshRuntime {
 
     /// Read-only host-side usage snapshot from the node's own runtime metrics.
     pub async fn serving_usage(&self) -> anyhow::Result<MeshServingUsage> {
-        let status = self.handle.status().await?;
+        let mut handle = self.handle.lock().await;
+        Self::promote_finished_startup(&mut handle).await;
+        let DesktopMeshHandle::Ready(ready) = &*handle else {
+            anyhow::bail!("mesh management status is not ready");
+        };
+        let status = ready.status().await?;
         Ok(serving_usage_from_payload(&status.payload))
     }
 
     pub async fn dial_endpoint_addr(&self, endpoint_addr: impl Into<String>) -> anyhow::Result<()> {
         let endpoint_addr = endpoint_addr.into();
         let validated = validate_advertised_endpoint(&endpoint_addr)?;
-        self.handle.join_token(validated.join_token).await
+        let mut handle = self.handle.lock().await;
+        Self::promote_finished_startup(&mut handle).await;
+        match &mut *handle {
+            DesktopMeshHandle::Ready(ready) => ready.join_token(validated.join_token).await,
+            DesktopMeshHandle::Starting {
+                queued_join_tokens, ..
+            } => {
+                if !queued_join_tokens.contains(&validated.join_token) {
+                    queued_join_tokens.push(validated.join_token);
+                }
+                Ok(())
+            }
+            DesktopMeshHandle::Failed(error) => {
+                anyhow::bail!("cannot dial from failed mesh client: {error}")
+            }
+        }
     }
 
     pub async fn installed_models(&self) -> anyhow::Result<Vec<MeshModelOption>> {
-        let status = self.handle.status().await?;
+        let mut handle = self.handle.lock().await;
+        Self::promote_finished_startup(&mut handle).await;
+        let DesktopMeshHandle::Ready(ready) = &*handle else {
+            anyhow::bail!("mesh management status is not ready");
+        };
+        let status = ready.status().await?;
         Ok(models_from_status_payload(Some(&status.payload)))
     }
 
@@ -543,8 +678,60 @@ impl DesktopMeshRuntime {
         })
     }
 
+    fn ingress_only_client_status(&self, reason: &str) -> MeshNodeStatus {
+        MeshNodeStatus {
+            state: MeshNodeState::Running,
+            mode: Some(MeshNodeMode::Client),
+            health: MeshHealth::degraded(format!("OpenAI ingress is live; {reason}")),
+            api_base_url: Some(self.api_base_url.clone()),
+            console_url: Some(self.console_url.clone()),
+            model_id: self.model_id.clone(),
+            model_name: self.model_name.clone(),
+            invite_token: None,
+            endpoint_id: None,
+            device_id: None,
+            device_name: None,
+        }
+    }
+
+    fn starting_client_status(&self) -> MeshNodeStatus {
+        MeshNodeStatus {
+            state: MeshNodeState::Starting,
+            mode: Some(MeshNodeMode::Client),
+            health: MeshHealth::degraded("OpenAI ingress and management status are still starting"),
+            api_base_url: Some(self.api_base_url.clone()),
+            console_url: Some(self.console_url.clone()),
+            model_id: self.model_id.clone(),
+            model_name: self.model_name.clone(),
+            invite_token: None,
+            endpoint_id: None,
+            device_id: None,
+            device_name: None,
+        }
+    }
+
     pub async fn stop(self) -> anyhow::Result<()> {
-        self.handle.stop().await
+        match self.handle.into_inner() {
+            DesktopMeshHandle::Ready(ready) => {
+                match tokio::time::timeout(MESH_STOP_TIMEOUT, ready.stop()).await {
+                    Ok(result) => result,
+                    Err(_) => anyhow::bail!(
+                        "timed out after {}s waiting for embedded mesh runtime to stop",
+                        MESH_STOP_TIMEOUT.as_secs()
+                    ),
+                }
+            }
+            DesktopMeshHandle::Starting { task, .. } => {
+                // The pinned SDK has not exposed its shutdown handle yet.
+                // Abort only the Buzz-side waiter; normal callers never replace
+                // a pending runtime, and app shutdown/restart then terminates
+                // the process-owned embedded thread. Recovery requests that
+                // controlled restart instead of racing a second runtime.
+                task.abort();
+                Ok(())
+            }
+            DesktopMeshHandle::Failed(_) => Ok(()),
+        }
     }
 }
 
diff --git a/desktop/src-tauri/src/mesh_llm/mod_tests.rs b/desktop/src-tauri/src/mesh_llm/mod_tests.rs
index a8b78bc190..0b726c264f 100644
--- a/desktop/src-tauri/src/mesh_llm/mod_tests.rs
+++ b/desktop/src-tauri/src/mesh_llm/mod_tests.rs
@@ -3,6 +3,72 @@
 use super::find_progressish_reason;
 use serde_json::json;
 
+fn pending_client_runtime(
+    task: tokio::task::JoinHandle<anyhow::Result<mesh_llm_sdk::EmbeddedNodeHandle>>,
+) -> super::DesktopMeshRuntime {
+    let request = super::StartMeshNodeRequest {
+        mode: super::MeshNodeMode::Client,
+        model_id: None,
+        max_vram_gb: None,
+        join_token: Some("initial-token".to_string()),
+        mesh_name: None,
+        trusted_owner_ids: None,
+    };
+    super::DesktopMeshRuntime {
+        id: 7,
+        handle: tokio::sync::Mutex::new(super::DesktopMeshHandle::Starting {
+            task,
+            queued_join_tokens: Vec::new(),
+        }),
+        mode: super::MeshNodeMode::Client,
+        api_base_url: "http://127.0.0.1:1/v1".to_string(),
+        console_url: "http://127.0.0.1:2".to_string(),
+        model_id: None,
+        model_name: None,
+        start_request: request,
+    }
+}
+
+#[tokio::test]
+async fn pending_client_status_does_not_wait_for_management_timeout() {
+    let task = tokio::spawn(async {
+        std::future::pending::<anyhow::Result<mesh_llm_sdk::EmbeddedNodeHandle>>().await
+    });
+    let runtime = pending_client_runtime(task);
+
+    let status = tokio::time::timeout(std::time::Duration::from_secs(1), runtime.status())
+        .await
+        .expect("status should not wait for the SDK management probe")
+        .expect("pending client should have a synthetic status");
+    assert_eq!(status.state, super::MeshNodeState::Starting);
+    assert_eq!(status.mode, Some(super::MeshNodeMode::Client));
+    let report = runtime
+        .status_report_payload()
+        .await
+        .expect("pending clients must keep publishing admission identity heartbeats");
+    assert_eq!(report["serveTargets"], json!([]));
+    assert_eq!(report["models"], json!([]));
+
+    tokio::time::timeout(std::time::Duration::from_secs(1), runtime.stop())
+        .await
+        .expect("stopping a pending client should abort its SDK task")
+        .expect("pending client stop should succeed");
+}
+
+#[tokio::test]
+async fn failed_client_startup_is_promoted_without_losing_the_runtime_slot() {
+    let task = tokio::spawn(async { anyhow::bail!("controlled startup failure") });
+    let runtime = pending_client_runtime(task);
+    tokio::task::yield_now().await;
+
+    let error = runtime
+        .status()
+        .await
+        .expect_err("finished failed startup should be surfaced");
+    assert!(error.to_string().contains("controlled startup failure"));
+    assert!(!runtime.is_starting().await);
+}
+
 #[test]
 fn progressish_reads_typed_phase_not_whole_tree() {
     assert_eq!(
@@ -627,10 +693,7 @@ fn serving_usage_extracts_local_and_remote_attempts() {
     assert_eq!(usage.local_attempts, 4);
     assert_eq!(usage.remote_attempts, 0);
     assert_eq!(usage.endpoint_attempts, 0);
-    assert!(
-        !usage.has_remote_consumers(),
-        "all-local traffic is not a remote consumer"
-    );
+    assert_eq!(usage.remote_attempts + usage.endpoint_attempts, 0);
 }
 
 #[test]
@@ -650,10 +713,7 @@ fn serving_usage_flags_remote_consumer() {
     assert_eq!(usage.remote_attempts, 6);
     assert_eq!(usage.endpoint_attempts, 1);
     assert_eq!(usage.peers, 2);
-    assert!(
-        usage.has_remote_consumers(),
-        "remote/endpoint attempts mean someone else is using my compute"
-    );
+    assert!(usage.remote_attempts + usage.endpoint_attempts > 0);
 }
 
 #[test]
@@ -661,5 +721,5 @@ fn serving_usage_defaults_to_zero_on_missing_fields() {
     // SDK shape drift must degrade to "no usage" not panic.
     let usage = super::serving_usage_from_payload(&json!({}));
     assert_eq!(usage, super::MeshServingUsage::default());
-    assert!(!usage.has_remote_consumers());
+    assert_eq!(usage.remote_attempts + usage.endpoint_attempts, 0);
 }
diff --git a/desktop/src-tauri/src/mesh_llm/recovery.rs b/desktop/src-tauri/src/mesh_llm/recovery.rs
new file mode 100644
index 0000000000..809fab8993
--- /dev/null
+++ b/desktop/src-tauri/src/mesh_llm/recovery.rs
@@ -0,0 +1,534 @@
+use std::collections::HashSet;
+use std::sync::atomic::{AtomicU32, AtomicU64, Ordering};
+use std::time::Duration;
+
+use tauri::{AppHandle, Manager};
+
+use crate::app_state::AppState;
+
+const INGRESS_PROBE_TIMEOUT: Duration = Duration::from_secs(3);
+const INGRESS_CONNECT_TIMEOUT: Duration = Duration::from_millis(300);
+const INGRESS_RELEASE_TIMEOUT: Duration = Duration::from_secs(3);
+const STALE_STOP_TIMEOUT: Duration = Duration::from_secs(12);
+const DEAD_PROBE_EVICT_THRESHOLD: u32 = 2;
+
+/// Sentinel prefix on errors owned by this recovery path. Recovery clears only
+/// these errors and never an unrelated agent failure.
+pub(crate) const MESH_REARM_ERROR_SENTINEL: &str = "[buzz-mesh-rearm] ";
+
+/// App-scoped recovery coordination. The runtime id binds a dead-probe streak
+/// to one specific handle, while `rearm_lock` prevents overlapping watchdog
+/// passes from starting competing replacements.
+pub struct MeshRecoveryState {
+    probe_runtime_id: AtomicU64,
+    dead_probes: AtomicU32,
+    rearm_lock: tokio::sync::Mutex<()>,
+}
+
+impl Default for MeshRecoveryState {
+    fn default() -> Self {
+        Self {
+            probe_runtime_id: AtomicU64::new(0),
+            dead_probes: AtomicU32::new(0),
+            rearm_lock: tokio::sync::Mutex::new(()),
+        }
+    }
+}
+
+impl MeshRecoveryState {
+    fn reset_probe_streak(&self) {
+        self.probe_runtime_id.store(0, Ordering::Relaxed);
+        self.dead_probes.store(0, Ordering::Relaxed);
+    }
+
+    fn record_dead_probe(&self, runtime_id: u64) -> u32 {
+        if self.probe_runtime_id.swap(runtime_id, Ordering::Relaxed) != runtime_id {
+            self.dead_probes.store(1, Ordering::Relaxed);
+            return 1;
+        }
+        self.dead_probes.fetch_add(1, Ordering::Relaxed) + 1
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum MeshIngressProbe {
+    Live,
+    PortClosed,
+    Unhealthy,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum MeshRecoveryUrgency {
+    Foreground,
+    Watchdog,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) enum MeshRuntimeRecovery {
+    Absent,
+    Live,
+    Debouncing,
+    Evicted,
+    ReleasePending,
+    Replaced,
+    RestartRequired,
+}
+
+/// Probe the contract agents actually consume. A successful `/v1/models`
+/// response proves the local OpenAI ingress is accepting requests; the
+/// management console on `:3131` is intentionally not part of this health
+/// decision.
+pub(crate) async fn probe_mesh_ingress() -> MeshIngressProbe {
+    probe_mesh_ingress_at(crate::managed_agents::RELAY_MESH_API_BASE_URL).await
+}
+
+pub(crate) async fn mesh_ingress_is_live_at(api_base_url: &str) -> bool {
+    probe_mesh_ingress_at(api_base_url).await == MeshIngressProbe::Live
+}
+
+pub(crate) async fn probe_mesh_ingress_at(api_base_url: &str) -> MeshIngressProbe {
+    let base = api_base_url.trim_end_matches('/');
+    let client = match reqwest::Client::builder()
+        .timeout(INGRESS_PROBE_TIMEOUT)
+        .build()
+    {
+        Ok(client) => client,
+        Err(_) => return MeshIngressProbe::Unhealthy,
+    };
+    if client
+        .get(format!("{base}/models"))
+        .bearer_auth(crate::managed_agents::RELAY_MESH_API_KEY_PLACEHOLDER)
+        .send()
+        .await
+        .is_ok_and(|response| response.status().is_success())
+    {
+        return MeshIngressProbe::Live;
+    }
+    if ingress_port_is_bound(api_base_url).await {
+        MeshIngressProbe::Unhealthy
+    } else {
+        MeshIngressProbe::PortClosed
+    }
+}
+
+async fn ingress_port_is_bound(api_base_url: &str) -> bool {
+    let Ok(url) = url::Url::parse(api_base_url) else {
+        return false;
+    };
+    let Some(host) = url.host_str() else {
+        return false;
+    };
+    let Some(port) = url.port_or_known_default() else {
+        return false;
+    };
+    matches!(
+        tokio::time::timeout(
+            INGRESS_CONNECT_TIMEOUT,
+            tokio::net::TcpStream::connect((host, port)),
+        )
+        .await,
+        Ok(Ok(_))
+    )
+}
+
+async fn wait_for_ingress_release() -> bool {
+    let deadline = tokio::time::Instant::now() + INGRESS_RELEASE_TIMEOUT;
+    loop {
+        if !ingress_port_is_bound(crate::managed_agents::RELAY_MESH_API_BASE_URL).await {
+            return true;
+        }
+        if tokio::time::Instant::now() >= deadline {
+            return false;
+        }
+        tokio::time::sleep(Duration::from_millis(100)).await;
+    }
+}
+
+fn should_evict_after_probe(
+    urgency: MeshRecoveryUrgency,
+    probe: MeshIngressProbe,
+    consecutive: u32,
+) -> bool {
+    urgency == MeshRecoveryUrgency::Foreground && probe == MeshIngressProbe::PortClosed
+        || consecutive >= DEAD_PROBE_EVICT_THRESHOLD
+}
+
+/// Probe and, when justified, remove one stale runtime. A closed port is
+/// decisive for a foreground agent start; watchdog and ambiguous/unhealthy
+/// ports require consecutive failures to avoid restarting on a transient load
+/// spike.
+pub(crate) async fn recover_stale_mesh_runtime(
+    state: &AppState,
+    urgency: MeshRecoveryUrgency,
+) -> MeshRuntimeRecovery {
+    let (candidate_id, startup_in_progress) = match state.mesh_llm_runtime.lock().await.as_ref() {
+        Some(runtime) => (runtime.id(), runtime.is_starting().await),
+        None => {
+            state.mesh_recovery.reset_probe_streak();
+            // A cancelled SDK startup can outlive its Buzz-side task briefly
+            // because the embedded runtime runs on its own thread. Never start
+            // a replacement merely because the tracked handle is gone: first
+            // prove the old ingress is either still useful or has released the
+            // port. This closes the port-conflict loop in #2304.
+            return match probe_mesh_ingress().await {
+                MeshIngressProbe::Live => MeshRuntimeRecovery::Live,
+                MeshIngressProbe::PortClosed => MeshRuntimeRecovery::Absent,
+                MeshIngressProbe::Unhealthy => MeshRuntimeRecovery::ReleasePending,
+            };
+        }
+    };
+    let probe = probe_mesh_ingress().await;
+    if probe == MeshIngressProbe::Live {
+        state.mesh_recovery.reset_probe_streak();
+        return MeshRuntimeRecovery::Live;
+    }
+    let consecutive = state.mesh_recovery.record_dead_probe(candidate_id);
+    if startup_in_progress && consecutive < DEAD_PROBE_EVICT_THRESHOLD {
+        eprintln!(
+            "buzz-mesh: ingress is not live on the first startup probe; allowing the supervised SDK task one watchdog interval"
+        );
+        return MeshRuntimeRecovery::Debouncing;
+    }
+    if !should_evict_after_probe(urgency, probe, consecutive) {
+        eprintln!(
+            "buzz-mesh: ingress probe {probe:?} ({consecutive}/{DEAD_PROBE_EVICT_THRESHOLD}); debouncing"
+        );
+        return MeshRuntimeRecovery::Debouncing;
+    }
+
+    // The pinned SDK does not yield its control handle until the management
+    // API is ready. Dropping its still-pending start future would detach the
+    // embedded runtime thread without sending a shutdown request, so Buzz must
+    // not evict it and race a replacement onto the same ports. A controlled
+    // app relaunch is the only process-owned cleanup boundary in this state.
+    if startup_in_progress {
+        state.mesh_recovery.reset_probe_streak();
+        return MeshRuntimeRecovery::RestartRequired;
+    }
+
+    let stale = {
+        let mut guard = state.mesh_llm_runtime.lock().await;
+        if guard.as_ref().map(|runtime| runtime.id()) != Some(candidate_id) {
+            state.mesh_recovery.reset_probe_streak();
+            return MeshRuntimeRecovery::Replaced;
+        }
+        guard.take()
+    };
+    let Some(stale) = stale else {
+        return MeshRuntimeRecovery::Replaced;
+    };
+    state.mesh_recovery.reset_probe_streak();
+
+    match tokio::time::timeout(STALE_STOP_TIMEOUT, stale.stop()).await {
+        Ok(Ok(())) => {}
+        Ok(Err(error)) => eprintln!("buzz-mesh: stale runtime stop failed: {error:#}"),
+        Err(_) => eprintln!(
+            "buzz-mesh: stale runtime stop exceeded {}s; waiting for port release",
+            STALE_STOP_TIMEOUT.as_secs()
+        ),
+    }
+    if wait_for_ingress_release().await {
+        MeshRuntimeRecovery::Evicted
+    } else {
+        eprintln!(
+            "buzz-mesh: old runtime still owns the local ingress; deferring replacement to avoid a port-conflict loop"
+        );
+        MeshRuntimeRecovery::ReleasePending
+    }
+}
+
+/// Post-launch recovery for actively running relay-mesh agents.
+pub(crate) async fn rearm_relay_mesh_for_running_agents(app: &AppHandle) -> Result<(), String> {
+    let state = app.state::<AppState>();
+    let _rearm_guard = state.mesh_recovery.rearm_lock.lock().await;
+    let recovery = recover_stale_mesh_runtime(&state, MeshRecoveryUrgency::Watchdog).await;
+    let active_pubkeys = active_managed_agent_pubkeys(&state);
+    // Mesh participation is resolved through the same definition-authoritative
+    // path as spawn/restore (#1968): definition → global fallback. A linked
+    // instance's own bytes never contribute.
+    let personas = crate::managed_agents::load_personas(app).unwrap_or_default();
+    let global = crate::managed_agents::load_global_agent_config(app).unwrap_or_default();
+
+    match recovery {
+        MeshRuntimeRecovery::Live
+        | MeshRuntimeRecovery::Debouncing
+        | MeshRuntimeRecovery::Replaced => return Ok(()),
+        MeshRuntimeRecovery::RestartRequired => {
+            let records = crate::managed_agents::load_managed_agents(app).unwrap_or_default();
+            if !records.iter().any(|record| {
+                running_relay_mesh_model_id(record, &active_pubkeys, &personas, &global).is_some()
+            }) {
+                // A foreground save may still be bringing up its first ingress.
+                // Only an already-running consumer justifies an automatic app
+                // relaunch from the background watchdog.
+                return Ok(());
+            }
+            eprintln!(
+                "buzz-mesh: supervised client startup lost its ingress before the SDK exposed a shutdown handle; restarting Buzz"
+            );
+            app.request_restart();
+            return Ok(());
+        }
+        MeshRuntimeRecovery::ReleasePending => {
+            return Err(format!(
+                "{MESH_REARM_ERROR_SENTINEL}old local mesh ingress is still shutting down"
+            ));
+        }
+        MeshRuntimeRecovery::Absent => {
+            let records = crate::managed_agents::load_managed_agents(app).unwrap_or_default();
+            if !records.iter().any(|record| {
+                running_relay_mesh_model_id(record, &active_pubkeys, &personas, &global).is_some()
+            }) {
+                return Ok(());
+            }
+        }
+        MeshRuntimeRecovery::Evicted => {}
+    }
+
+    let records = crate::managed_agents::load_managed_agents(app).unwrap_or_default();
+    let mesh_records: Vec<_> = records
+        .into_iter()
+        .filter_map(|record| {
+            running_relay_mesh_model_id(&record, &active_pubkeys, &personas, &global)
+                .map(|mesh_model_id| (record, mesh_model_id))
+        })
+        .collect();
+    let mut first_error = None;
+    for (record, mesh_model_id) in &mesh_records {
+        match crate::commands::mesh_llm::ensure_relay_mesh_for_record(
+            app,
+            Some(mesh_model_id.as_str()),
+            false,
+        )
+        .await
+        {
+            Ok(()) => {
+                if let Err(error) = clear_mesh_last_error_if_set(app, &record.pubkey) {
+                    eprintln!("buzz-mesh: failed to clear recovery error: {error}");
+                }
+            }
+            Err(error) => {
+                let message = format!(
+                    "{MESH_REARM_ERROR_SENTINEL}Buzz shared compute offline — failed to re-arm local ingress for this agent: {error}"
+                );
+                if let Err(persist_error) = persist_mesh_last_error(app, &record.pubkey, &message) {
+                    eprintln!("buzz-mesh: failed to persist recovery error: {persist_error}");
+                }
+                first_error.get_or_insert(message);
+            }
+        }
+    }
+    first_error.map_or(Ok(()), Err)
+}
+
+fn active_managed_agent_pubkeys(state: &AppState) -> HashSet<String> {
+    state
+        .managed_agent_processes
+        .lock()
+        .map(|guard| {
+            guard
+                .keys()
+                .map(|key| key.pubkey.to_ascii_lowercase())
+                .collect()
+        })
+        .unwrap_or_default()
+}
+
+/// Effective mesh model for a record that is actively running, or `None`
+/// when the record is not a running relay-mesh consumer. Resolution goes
+/// through `resolve_effective_relay_mesh_model_id` (definition → global
+/// fallback, #1968) so the watchdog agrees with spawn/restore about which
+/// agents are mesh-backed.
+fn running_relay_mesh_model_id(
+    record: &crate::managed_agents::ManagedAgentRecord,
+    active_pubkeys: &HashSet<String>,
+    personas: &[crate::managed_agents::AgentDefinition],
+    global: &crate::managed_agents::GlobalAgentConfig,
+) -> Option<String> {
+    let running = record.backend == crate::managed_agents::BackendKind::Local
+        && active_pubkeys.contains(&record.pubkey.to_ascii_lowercase())
+        && record
+            .runtime_pid
+            .is_none_or(crate::managed_agents::process_is_running);
+    if !running {
+        return None;
+    }
+    crate::managed_agents::effective_config::resolve_effective_relay_mesh_model_id(
+        record, personas, global,
+    )
+}
+
+fn persist_mesh_last_error(app: &AppHandle, pubkey: &str, error: &str) -> Result<(), String> {
+    let state = app.state::<AppState>();
+    let _store_guard = state
+        .managed_agents_store_lock
+        .lock()
+        .map_err(|e| format!("failed to acquire managed agents store lock: {e}"))?;
+    let mut records = crate::managed_agents::load_managed_agents(app)?;
+    let record = crate::managed_agents::find_managed_agent_mut(&mut records, pubkey)?;
+    record.last_error = Some(error.to_string());
+    record.updated_at = crate::util::now_iso();
+    crate::managed_agents::save_managed_agents(app, &records)
+}
+
+fn clear_mesh_last_error_if_set(app: &AppHandle, pubkey: &str) -> Result<(), String> {
+    let state = app.state::<AppState>();
+    let _store_guard = state
+        .managed_agents_store_lock
+        .lock()
+        .map_err(|e| format!("failed to acquire managed agents store lock: {e}"))?;
+    let mut records = crate::managed_agents::load_managed_agents(app)?;
+    let record = crate::managed_agents::find_managed_agent_mut(&mut records, pubkey)?;
+    if !record
+        .last_error
+        .as_deref()
+        .is_some_and(|error| error.starts_with(MESH_REARM_ERROR_SENTINEL))
+    {
+        return Ok(());
+    }
+    record.last_error = None;
+    record.updated_at = crate::util::now_iso();
+    crate::managed_agents::save_managed_agents(app, &records)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn mesh_record(
+        pubkey: &str,
+        runtime_pid: Option<u32>,
+    ) -> crate::managed_agents::ManagedAgentRecord {
+        let mut record = crate::managed_agents::AgentDefinition {
+            id: pubkey.to_string(),
+            display_name: pubkey.to_string(),
+            avatar_url: None,
+            system_prompt: String::new(),
+            runtime: None,
+            model: None,
+            provider: None,
+            name_pool: Vec::new(),
+            is_builtin: false,
+            is_active: true,
+            source_team: None,
+            source_team_persona_slug: None,
+            catalog_source: None,
+            env_vars: std::collections::BTreeMap::from([
+                ("BUZZ_AGENT_PROVIDER".to_string(), "openai".to_string()),
+                (
+                    "OPENAI_COMPAT_BASE_URL".to_string(),
+                    "http://127.0.0.1:9337/v1/".to_string(),
+                ),
+                ("OPENAI_COMPAT_MODEL".to_string(), "Qwen3".to_string()),
+                (
+                    "OPENAI_COMPAT_API_KEY".to_string(),
+                    crate::managed_agents::RELAY_MESH_API_KEY_PLACEHOLDER.to_string(),
+                ),
+            ]),
+            respond_to: None,
+            respond_to_allowlist: Vec::new(),
+            parallelism: None,
+            created_at: "2026-01-01T00:00:00Z".to_string(),
+            updated_at: "2026-01-01T00:00:00Z".to_string(),
+        }
+        .into_agent_record();
+        record.pubkey = pubkey.to_string();
+        record.backend = crate::managed_agents::BackendKind::Local;
+        record.runtime_pid = runtime_pid;
+        record
+    }
+
+    fn active_set(pubkeys: &[&str]) -> HashSet<String> {
+        pubkeys
+            .iter()
+            .map(|pubkey| pubkey.to_ascii_lowercase())
+            .collect()
+    }
+
+    #[tokio::test]
+    async fn closed_port_is_distinct_from_unhealthy_bound_port() {
+        assert_eq!(
+            probe_mesh_ingress_at("http://127.0.0.1:1/v1").await,
+            MeshIngressProbe::PortClosed
+        );
+    }
+
+    #[test]
+    fn foreground_closed_port_evicts_without_debounce() {
+        assert!(should_evict_after_probe(
+            MeshRecoveryUrgency::Foreground,
+            MeshIngressProbe::PortClosed,
+            1
+        ));
+        assert!(!should_evict_after_probe(
+            MeshRecoveryUrgency::Watchdog,
+            MeshIngressProbe::PortClosed,
+            1
+        ));
+    }
+
+    #[test]
+    fn probe_streak_is_scoped_to_runtime_identity() {
+        let state = MeshRecoveryState::default();
+        assert_eq!(state.record_dead_probe(7), 1);
+        assert_eq!(state.record_dead_probe(7), 2);
+        assert_eq!(state.record_dead_probe(8), 1);
+    }
+
+    #[test]
+    fn explicit_stop_budget_accommodates_sdk_forced_shutdown() {
+        assert!(STALE_STOP_TIMEOUT >= Duration::from_secs(10));
+        assert!(STALE_STOP_TIMEOUT <= Duration::from_secs(15));
+    }
+
+    #[test]
+    fn only_running_relay_mesh_agents_trigger_rearm() {
+        let personas: Vec<crate::managed_agents::AgentDefinition> = Vec::new();
+        let global = crate::managed_agents::GlobalAgentConfig::default();
+
+        let empty = active_set(&[]);
+        assert!(running_relay_mesh_model_id(
+            &mesh_record("stopped", Some(std::process::id())),
+            &empty,
+            &personas,
+            &global,
+        )
+        .is_none());
+
+        let active = active_set(&["live"]);
+        assert_eq!(
+            running_relay_mesh_model_id(
+                &mesh_record("live", Some(std::process::id())),
+                &active,
+                &personas,
+                &global,
+            )
+            .as_deref(),
+            Some("Qwen3")
+        );
+        assert_eq!(
+            running_relay_mesh_model_id(&mesh_record("live", None), &active, &personas, &global)
+                .as_deref(),
+            Some("Qwen3")
+        );
+
+        let mut non_mesh = mesh_record("plain", Some(std::process::id()));
+        non_mesh.env_vars.clear();
+        non_mesh.relay_mesh = None;
+        assert!(running_relay_mesh_model_id(
+            &non_mesh,
+            &active_set(&["plain"]),
+            &personas,
+            &global,
+        )
+        .is_none());
+    }
+
+    #[test]
+    fn recovery_error_sentinel_does_not_match_unrelated_errors() {
+        assert!(
+            format!("{MESH_REARM_ERROR_SENTINEL}offline").starts_with(MESH_REARM_ERROR_SENTINEL)
+        );
+        assert!(!"user note: shared compute config".starts_with(MESH_REARM_ERROR_SENTINEL));
+    }
+}
diff --git a/desktop/src-tauri/src/mesh_llm/usage.rs b/desktop/src-tauri/src/mesh_llm/usage.rs
new file mode 100644
index 0000000000..830f224ef5
--- /dev/null
+++ b/desktop/src-tauri/src/mesh_llm/usage.rs
@@ -0,0 +1,68 @@
+use serde::{Deserialize, Serialize};
+
+/// Host-side "who is using the compute I'm sharing" snapshot.
+///
+/// Read-only projection of the serving node's own runtime metrics (the same
+/// `routing_metrics` / `inflight_requests` the SDK already exposes on the local
+/// console). No new trust surface: it reads the node's own status payload.
+///
+/// The local/remote/endpoint attempt split is what distinguishes *my own*
+/// agent (local) from *another member consuming my compute* (remote/endpoint).
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct MeshServingUsage {
+    /// Requests being served right now.
+    pub inflight: u64,
+    /// Highest concurrent in-flight seen this session.
+    pub peak_inflight: u64,
+    /// Total requests routed through this node.
+    pub requests_served: u64,
+    /// Completion tokens produced.
+    pub tokens_served: u64,
+    /// Recent decode throughput.
+    pub tokens_per_second: f64,
+    /// Requests served for this machine's own agents.
+    pub local_attempts: u64,
+    /// Requests served for a remote peer (someone else consuming my compute).
+    pub remote_attempts: u64,
+    /// Requests served via an advertised endpoint (also a remote consumer).
+    pub endpoint_attempts: u64,
+    /// Other nodes currently visible as peers.
+    pub peers: u64,
+}
+
+/// Pure extractor: project a raw SDK status payload into [`MeshServingUsage`].
+///
+/// Every field is read defensively (missing → 0) so an SDK shape change
+/// degrades to "no usage shown" rather than an error. Kept pure so it can be
+/// unit-tested against a captured payload without a live runtime.
+pub fn serving_usage_from_payload(payload: &serde_json::Value) -> MeshServingUsage {
+    let u64_at = |v: &serde_json::Value| v.as_u64().unwrap_or(0);
+    let rm = payload.get("routing_metrics");
+    let local = rm.and_then(|m| m.get("local_node"));
+    let get_u64 = |obj: Option<&serde_json::Value>, key: &str| {
+        obj.and_then(|o| o.get(key)).map(u64_at).unwrap_or(0)
+    };
+    MeshServingUsage {
+        inflight: local
+            .and_then(|l| l.get("current_inflight_requests"))
+            .map(u64_at)
+            .or_else(|| payload.get("inflight_requests").map(u64_at))
+            .unwrap_or(0),
+        peak_inflight: get_u64(local, "peak_inflight_requests"),
+        requests_served: get_u64(rm, "request_count"),
+        tokens_served: get_u64(rm, "completion_tokens_observed"),
+        tokens_per_second: rm
+            .and_then(|m| m.get("avg_tokens_per_second"))
+            .and_then(serde_json::Value::as_f64)
+            .unwrap_or(0.0),
+        local_attempts: get_u64(local, "local_attempt_count"),
+        remote_attempts: get_u64(local, "remote_attempt_count"),
+        endpoint_attempts: get_u64(local, "endpoint_attempt_count"),
+        peers: payload
+            .get("peers")
+            .and_then(serde_json::Value::as_array)
+            .map(|a| a.len() as u64)
+            .unwrap_or(0),
+    }
+}
diff --git a/desktop/src-tauri/src/migration.rs b/desktop/src-tauri/src/migration.rs
index 0de8ea0a82..b3e613621e 100644
--- a/desktop/src-tauri/src/migration.rs
+++ b/desktop/src-tauri/src/migration.rs
@@ -176,6 +176,11 @@ fn run_boot_migrations_inner(app: &tauri::AppHandle, reset_completed: bool) {
     // Post-fold readers of the runtime map (`load_persona_runtimes`) fall
     // back to the unified store's definitions.
     fold_personas_into_agent_store(app);
+    // Clean the legacy baked team-instructions suffix out of stored prompts
+    // AFTER the fold (so definitions lifted out of personas.json are cleaned in
+    // the same boot) and BEFORE backfill_standalone_agents (so a manufactured
+    // definition never snapshots a suffix this strips).
+    strip_baked_team_instructions(app);
     refresh_builtin_agent_avatars(app);
     // B5: manufacture definitions for standalone agents AFTER the fold (so
     // pre-existing definition slugs are present for collision checks) and
@@ -1362,7 +1367,6 @@ pub fn migrate_persona_provider_to_runtime(app: &tauri::AppHandle) {
     }
     rename_provider_to_runtime_in_personas(&path);
 }
-
 mod materialize;
 pub use materialize::materialize_agent_runtimes;
 mod fold;
@@ -1372,6 +1376,8 @@ mod backfill;
 pub use backfill::backfill_standalone_agents;
 mod detach;
 pub use detach::detach_directory_backed_teams;
+mod team_suffix;
+pub use team_suffix::strip_baked_team_instructions;
 
 #[cfg(test)]
 #[path = "migration_test_support.rs"]
diff --git a/desktop/src-tauri/src/migration/backfill.rs b/desktop/src-tauri/src/migration/backfill.rs
index b7f85df138..cd62f63bbb 100644
--- a/desktop/src-tauri/src/migration/backfill.rs
+++ b/desktop/src-tauri/src/migration/backfill.rs
@@ -65,12 +65,13 @@ fn backfill_standalone_agents_in_dir(base_dir: &Path) -> Result<usize, String> {
     }
 
     // Pre-migration backup, taken ONCE: a re-run after a partial failure must
-    // not overwrite the pristine backup with a half-migrated snapshot.
-    let bak_path = base_dir.join("managed-agents.json.pre-backfill.bak");
-    if !bak_path.exists() {
-        std::fs::write(&bak_path, &content)
-            .map_err(|e| format!("failed to write pre-backfill backup: {e}"))?;
-    }
+    // not overwrite the pristine backup with a half-migrated snapshot. Owner-only
+    // from the initial open, and sited next to the resolved store — see
+    // `create_restricted_backup_once` and `resolved_backup_path`.
+    let bak_path =
+        crate::util::resolved_backup_path(&agents_path, "managed-agents.json.pre-backfill.bak");
+    crate::util::create_restricted_backup_once(&bak_path, content.as_bytes())
+        .map_err(|e| format!("failed to write pre-backfill backup: {e}"))?;
 
     let existing_slugs: std::collections::HashSet<String> =
         all.iter().filter_map(|r| r.slug.clone()).collect();
diff --git a/desktop/src-tauri/src/migration/backfill_tests.rs b/desktop/src-tauri/src/migration/backfill_tests.rs
index 9d2731d241..5d52d56678 100644
--- a/desktop/src-tauri/src/migration/backfill_tests.rs
+++ b/desktop/src-tauri/src/migration/backfill_tests.rs
@@ -299,3 +299,34 @@ fn slug_collision_fails_loudly_per_record_and_continues() {
     let clean_rec = records.iter().find(|r| r.pubkey == clean).unwrap();
     assert_eq!(clean_rec.persona_id.as_deref(), Some(clean.as_str()));
 }
+
+#[cfg(unix)]
+#[test]
+fn backfill_creates_the_backup_owner_only() {
+    // Same contract as the live store writer: this backup is a verbatim copy of
+    // a file that carries plaintext agent nsecs when the keyring is unreachable,
+    // so it is owner-only from the initial open rather than via a post-write
+    // chmod that would leave a umask window.
+    use std::os::unix::fs::PermissionsExt;
+
+    let dir = tempfile::tempdir().unwrap();
+    let pubkey = "e".repeat(64);
+    let mut record = standalone_agent_json("Solo", &pubkey, Some("P"));
+    record["private_key_nsec"] = serde_json::json!("nsec1exampleplaintextkey");
+    write_agents_json(dir.path(), &serde_json::json!([record]));
+
+    assert_eq!(
+        backfill_standalone_agents_in_dir(&base(dir.path())).unwrap(),
+        1
+    );
+
+    let bak = base(dir.path()).join("managed-agents.json.pre-backfill.bak");
+    let mode = std::fs::metadata(&bak).unwrap().permissions().mode() & 0o777;
+    assert_eq!(mode, 0o600, "backup of an inline nsec must be owner-only");
+    assert!(
+        std::fs::read_to_string(&bak)
+            .unwrap()
+            .contains("nsec1exampleplaintextkey"),
+        "the fixture really did carry an inline key"
+    );
+}
diff --git a/desktop/src-tauri/src/migration/team_suffix.rs b/desktop/src-tauri/src/migration/team_suffix.rs
new file mode 100644
index 0000000000..d65113fb83
--- /dev/null
+++ b/desktop/src-tauri/src/migration/team_suffix.rs
@@ -0,0 +1,182 @@
+//! Strip the legacy baked team-instructions suffix from stored prompts.
+//!
+//! Records written before the runtime team framing landed have their team
+//! instructions BAKED into `system_prompt` by the now-removed
+//! `compose_prompt()` in buzz-persona:
+//!
+//! ```text
+//! {persona_prompt}\n\n---\n# Team Instructions\n{instructions}
+//! ```
+//!
+//! `with_team()` in `buzz-acp/src/pool.rs` now appends the LIVE
+//! `[Team Instructions]` section on top of that stored value, so an affected
+//! agent receives two team-instruction blocks per turn — the frozen copy first,
+//! the live one second — and the observer feed renders two Team Instructions
+//! cards. The frozen copy is not merely redundant: it carries whatever the team
+//! roster said the day it was written, so the agent is fed a stale roster ahead
+//! of the current one.
+//!
+//! The fix has to happen at rest. Suppressing the duplicate in the observer
+//! parser would hide the symptom while the agent kept receiving the stale bytes.
+//!
+//! Stripping a definition's prompt also changes its `persona_content_hash`, the
+//! drift basis behind the Agents-menu "out of date" badge, so the migration
+//! advances the pin of instances that were current before the strip (see
+//! [`repin_current_instances`]).
+
+use std::collections::HashMap;
+use std::path::Path;
+
+use crate::managed_agents::{
+    persona_events::{persona_content_hash, persona_event_content},
+    ManagedAgentRecord,
+};
+
+/// The exact producer boundary emitted by the removed `compose_prompt()`.
+/// Matched byte-for-byte: a bare `---`, a `# Team Instructions` heading at a
+/// different position, or a single preceding newline are author content, not a
+/// producer boundary, and are left alone.
+const TEAM_DELIMITER: &str = "\n\n---\n# Team Instructions\n";
+
+/// Strip the baked team-instructions suffix from every stored `system_prompt`.
+///
+/// Ordering (see `run_boot_migrations`): runs AFTER
+/// `fold_personas_into_agent_store` so definitions folded out of the legacy
+/// `personas.json` are cleaned in the same boot, and BEFORE
+/// `backfill_standalone_agents` so a manufactured definition never snapshots
+/// a suffix this migration is about to remove.
+pub fn strip_baked_team_instructions(app: &tauri::AppHandle) {
+    let Ok(base_dir) = crate::managed_agents::managed_agents_base_dir(app) else {
+        return;
+    };
+    match strip_baked_team_instructions_in_dir(&base_dir) {
+        Ok(0) => {}
+        Ok(stripped) => eprintln!(
+            "buzz-desktop: team-suffix-strip: removed the baked team-instructions suffix from \
+             {stripped} record(s)"
+        ),
+        Err(e) => eprintln!("buzz-desktop: team-suffix-strip: {e}"),
+    }
+}
+
+/// Core logic, decoupled from the Tauri `AppHandle` for testing.
+///
+/// `base_dir` is the managed-agents base directory (`<AppDataDir>/agents/`).
+/// Returns the number of records changed; `Ok(0)` means nothing to do and
+/// nothing was written, so a second boot is a clean no-op.
+pub(super) fn strip_baked_team_instructions_in_dir(base_dir: &Path) -> Result<usize, String> {
+    let agents_path = base_dir.join("managed-agents.json");
+    if !agents_path.exists() {
+        return Ok(0);
+    }
+    let content = std::fs::read_to_string(&agents_path)
+        .map_err(|e| format!("failed to read managed-agents.json: {e}"))?;
+    let mut all: Vec<ManagedAgentRecord> = serde_json::from_str(&content)
+        .map_err(|e| format!("failed to parse managed-agents.json: {e}"))?;
+
+    // Definition hashes BEFORE the strip: stripping a definition's
+    // `system_prompt` changes its `persona_content_hash`, which is the drift
+    // basis the Agents menu compares each linked instance's pinned
+    // `persona_source_version` against. Captured here so instances that were
+    // current before the strip can be re-pinned after it.
+    let pre_strip_hashes = definition_hashes(&all);
+
+    // Applies to every record: the definition records carry the suffix as
+    // surely as the instances minted from them, and neither `team_id` nor
+    // `persona_id` nor a key is evidence either way.
+    let mut stripped = 0usize;
+    for record in all.iter_mut() {
+        let Some(prompt) = record.system_prompt.as_deref() else {
+            continue;
+        };
+        // Last occurrence only, mirroring the observer parser's own
+        // `lastIndexOf` guard (`agentSessionTranscriptHelpers.ts`): a persona
+        // body may legitimately quote a delimiter-shaped passage, and only the
+        // final one is the boundary `compose_prompt()` appended.
+        let Some(at) = prompt.rfind(TEAM_DELIMITER) else {
+            continue;
+        };
+        let head = &prompt[..at];
+        // An empty head means the record held nothing but the baked suffix.
+        // Store `None` rather than `Some("")`, matching the empty-prompt
+        // convention in `AgentDefinition::into_agent_record`, so no phantom
+        // empty prompt is left behind.
+        record.system_prompt = (!head.is_empty()).then(|| head.to_string());
+        stripped += 1;
+    }
+
+    if stripped == 0 {
+        return Ok(0);
+    }
+
+    repin_current_instances(&mut all, &pre_strip_hashes);
+
+    // Pre-migration backup, taken ONCE (same contract as the B5 backfill): a
+    // re-run after a partial failure must not replace the pristine backup with
+    // a half-migrated snapshot. Owner-only from the initial open, and sited next
+    // to the resolved store — see `create_restricted_backup_once` and
+    // `resolved_backup_path`.
+    let bak_path = crate::util::resolved_backup_path(
+        &agents_path,
+        "managed-agents.json.pre-team-suffix-strip.bak",
+    );
+    crate::util::create_restricted_backup_once(&bak_path, content.as_bytes())
+        .map_err(|e| format!("failed to write pre-strip backup: {e}"))?;
+
+    let payload = serde_json::to_vec_pretty(&all)
+        .map_err(|e| format!("failed to serialize managed-agents.json: {e}"))?;
+    crate::managed_agents::atomic_write_json_restricted(&agents_path, &payload)?;
+    Ok(stripped)
+}
+
+/// `slug → persona_content_hash` for every definition record, computed through
+/// the same projection the drift indicator uses (`persona_drift_state` in
+/// `managed_agents/runtime.rs`).
+fn definition_hashes(records: &[ManagedAgentRecord]) -> HashMap<String, String> {
+    records
+        .iter()
+        .filter(|record| record.pubkey.is_empty())
+        .filter_map(|record| {
+            let definition = record.to_definition_view()?;
+            let hash = persona_content_hash(&persona_event_content(&definition));
+            Some((definition.id, hash))
+        })
+        .collect()
+}
+
+/// Advance the drift pin of instances that were current before the strip.
+///
+/// Stripping a definition's prompt changes its `persona_content_hash`, so every
+/// linked instance would otherwise light up "out of date" in the Agents menu
+/// for a change the user never made — a badge that only clears on the next
+/// start, when `apply_persona_snapshot` re-pins. Same conditional as
+/// `refresh_builtin_agent_avatars`: move the pin only when it still equals the
+/// definition's PRE-strip hash. An instance that had genuinely drifted keeps
+/// its stale pin, and its badge.
+fn repin_current_instances(
+    records: &mut [ManagedAgentRecord],
+    pre_strip_hashes: &HashMap<String, String>,
+) {
+    let post_strip_hashes = definition_hashes(records);
+    for record in records.iter_mut() {
+        if record.pubkey.is_empty() {
+            continue;
+        }
+        let Some(persona_id) = record.persona_id.as_deref() else {
+            continue;
+        };
+        let (Some(old), Some(new)) = (
+            pre_strip_hashes.get(persona_id),
+            post_strip_hashes.get(persona_id),
+        ) else {
+            continue;
+        };
+        if old != new && record.persona_source_version.as_deref() == Some(old.as_str()) {
+            record.persona_source_version = Some(new.clone());
+        }
+    }
+}
+
+#[cfg(test)]
+#[path = "team_suffix_tests.rs"]
+mod tests;
diff --git a/desktop/src-tauri/src/migration/team_suffix_tests.rs b/desktop/src-tauri/src/migration/team_suffix_tests.rs
new file mode 100644
index 0000000000..34d240d6bc
--- /dev/null
+++ b/desktop/src-tauri/src/migration/team_suffix_tests.rs
@@ -0,0 +1,449 @@
+use super::strip_baked_team_instructions_in_dir;
+use crate::migration::test_support::{read_agents_json, write_agents_json};
+use std::path::{Path, PathBuf};
+
+const DELIMITER: &str = "\n\n---\n# Team Instructions\n";
+
+fn base(dir: &Path) -> PathBuf {
+    dir.join("agents")
+}
+
+fn agent_json(name: &str, prompt: Option<&str>) -> serde_json::Value {
+    serde_json::json!({
+        "name": name,
+        "pubkey": "",
+        "relay_url": "ws://localhost:3000",
+        "acp_command": "buzz-acp",
+        "agent_command": "goose",
+        "agent_args": [],
+        "mcp_command": "",
+        "turn_timeout_seconds": 320,
+        "parallelism": 4,
+        "system_prompt": prompt,
+        "model": "gpt-x",
+        "provider": "openai",
+        "env_vars": { "API_KEY": "secret" },
+        "start_on_app_launch": true,
+        "created_at": "2026-01-01T00:00:00Z",
+        "updated_at": "2026-01-01T00:00:00Z",
+        "last_started_at": null,
+        "last_stopped_at": null,
+        "last_exit_code": null,
+        "last_error": null
+    })
+}
+
+fn prompt_of(dir: &Path, name: &str) -> Option<String> {
+    read_agents_json(dir)
+        .into_iter()
+        .find(|r| r["name"] == name)
+        .and_then(|r| r["system_prompt"].as_str().map(str::to_string))
+}
+
+/// Live `persona_content_hash` of the definition with `slug`, computed off the
+/// store on disk through the same projection the drift badge uses.
+fn definition_hash(dir: &Path, slug: &str) -> String {
+    let records: Vec<crate::managed_agents::ManagedAgentRecord> =
+        serde_json::from_value(serde_json::Value::Array(read_agents_json(dir))).unwrap();
+    super::definition_hashes(&records)
+        .remove(slug)
+        .expect("definition present")
+}
+
+fn definition_json(slug: &str, prompt: &str) -> serde_json::Value {
+    let mut record = agent_json(slug, Some(prompt));
+    record["slug"] = serde_json::json!(slug);
+    record["display_name"] = serde_json::json!("Paul");
+    record
+}
+
+fn instance_json(slug: &str, prompt: &str, pinned: &str) -> serde_json::Value {
+    let mut record = agent_json("Paul", Some(prompt));
+    record["pubkey"] = serde_json::json!("p".repeat(64));
+    record["persona_id"] = serde_json::json!(slug);
+    record["persona_source_version"] = serde_json::json!(pinned);
+    record
+}
+
+#[test]
+fn strip_removes_the_baked_suffix_and_keeps_the_persona_body() {
+    let dir = tempfile::tempdir().unwrap();
+    write_agents_json(
+        dir.path(),
+        &serde_json::json!([agent_json(
+            "Paul",
+            Some(&format!("You are Paul.{DELIMITER}| Agent | Role |"))
+        )]),
+    );
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        1
+    );
+    assert_eq!(
+        prompt_of(dir.path(), "Paul").as_deref(),
+        Some("You are Paul.")
+    );
+}
+
+#[test]
+fn strip_splits_on_the_last_delimiter_occurrence() {
+    // A persona body may quote a delimiter-shaped passage; only the final
+    // occurrence is the boundary the removed compose_prompt() appended.
+    let dir = tempfile::tempdir().unwrap();
+    let quoted = format!("Header.{DELIMITER}quoted example");
+    write_agents_json(
+        dir.path(),
+        &serde_json::json!([agent_json(
+            "Duncan",
+            Some(&format!("{quoted}{DELIMITER}live roster"))
+        )]),
+    );
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        1
+    );
+    assert_eq!(prompt_of(dir.path(), "Duncan").as_deref(), Some(&*quoted));
+}
+
+#[test]
+fn strip_leaves_near_miss_lookalikes_untouched() {
+    // Each variant differs from the producer boundary by exactly one detail:
+    // no heading, heading on a different line, a single preceding newline,
+    // and a trailing-space heading.
+    let dir = tempfile::tempdir().unwrap();
+    let lookalikes = [
+        ("bare-rule", "Body.\n\n---\nMore body."),
+        ("heading-inline", "Body.\n\n--- # Team Instructions\nMore."),
+        ("single-newline", "Body.\n---\n# Team Instructions\nMore."),
+        ("heading-only", "Body.\n\n# Team Instructions\nMore."),
+        (
+            "trailing-space",
+            "Body.\n\n---\n# Team Instructions \nMore.",
+        ),
+    ];
+    let records: Vec<serde_json::Value> = lookalikes
+        .iter()
+        .map(|(name, prompt)| agent_json(name, Some(prompt)))
+        .collect();
+    write_agents_json(dir.path(), &serde_json::Value::Array(records));
+    let before = std::fs::read_to_string(base(dir.path()).join("managed-agents.json")).unwrap();
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        0
+    );
+    let after = std::fs::read_to_string(base(dir.path()).join("managed-agents.json")).unwrap();
+    assert_eq!(before, after, "no lookalike may be rewritten");
+    for (name, prompt) in lookalikes {
+        assert_eq!(prompt_of(dir.path(), name).as_deref(), Some(prompt));
+    }
+}
+
+#[test]
+fn strip_is_a_no_op_on_the_second_run() {
+    let dir = tempfile::tempdir().unwrap();
+    write_agents_json(
+        dir.path(),
+        &serde_json::json!([agent_json(
+            "Paul",
+            Some(&format!("You are Paul.{DELIMITER}roster"))
+        )]),
+    );
+    let path = base(dir.path()).join("managed-agents.json");
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        1
+    );
+    let after_first = std::fs::read_to_string(&path).unwrap();
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        0,
+        "second run finds nothing to strip"
+    );
+    assert_eq!(
+        std::fs::read_to_string(&path).unwrap(),
+        after_first,
+        "second run must not write"
+    );
+}
+
+#[test]
+fn strip_preserves_every_other_field() {
+    let dir = tempfile::tempdir().unwrap();
+    let mut record = agent_json("Thufir", Some(&format!("Prompt.{DELIMITER}roster")));
+    record["pubkey"] = serde_json::json!("t".repeat(64));
+    record["persona_id"] = serde_json::json!("sietch-tabr:thufir");
+    record["team_id"] = serde_json::json!("team-uuid");
+    record["persona_source_version"] = serde_json::json!("a".repeat(64));
+    record["auth_tag"] = serde_json::json!("{\"tag\":\"value\"}");
+    write_agents_json(dir.path(), &serde_json::json!([record]));
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        1
+    );
+    let stored = read_agents_json(dir.path()).remove(0);
+    assert_eq!(stored["system_prompt"], "Prompt.");
+    assert_eq!(stored["pubkey"], "t".repeat(64));
+    assert_eq!(stored["persona_id"], "sietch-tabr:thufir");
+    assert_eq!(stored["team_id"], "team-uuid");
+    assert_eq!(stored["persona_source_version"], "a".repeat(64));
+    assert_eq!(stored["auth_tag"], "{\"tag\":\"value\"}");
+    assert_eq!(stored["env_vars"]["API_KEY"], "secret");
+    assert_eq!(stored["model"], "gpt-x");
+    assert_eq!(stored["provider"], "openai");
+    assert_eq!(stored["parallelism"], 4);
+    assert_eq!(stored["created_at"], "2026-01-01T00:00:00Z");
+}
+
+#[test]
+fn strip_writes_a_backup_once_and_never_clobbers_it() {
+    let dir = tempfile::tempdir().unwrap();
+    let original = format!("Alia prompt.{DELIMITER}roster");
+    write_agents_json(
+        dir.path(),
+        &serde_json::json!([agent_json("Alia", Some(&original))]),
+    );
+    let bak = base(dir.path()).join("managed-agents.json.pre-team-suffix-strip.bak");
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        1
+    );
+    let bak_content = std::fs::read_to_string(&bak).unwrap();
+    assert!(
+        bak_content.contains("---\\n# Team Instructions"),
+        "backup holds the pre-migration bytes"
+    );
+
+    // A later record acquiring the suffix must not replace the pristine backup.
+    write_agents_json(
+        dir.path(),
+        &serde_json::json!([agent_json("Alia", Some(&format!("Edited.{DELIMITER}new")))]),
+    );
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        1
+    );
+    assert_eq!(
+        std::fs::read_to_string(&bak).unwrap(),
+        bak_content,
+        "the first backup is never clobbered"
+    );
+}
+
+#[test]
+fn strip_nulls_a_prompt_that_was_only_the_baked_suffix() {
+    // Head is empty: the record held nothing but the delimiter and the frozen
+    // instructions. Storing Some("") would leave a phantom empty prompt that
+    // reads as "the author wrote a blank prompt"; None is the absent-prompt
+    // spelling the rest of the store uses.
+    let dir = tempfile::tempdir().unwrap();
+    write_agents_json(
+        dir.path(),
+        &serde_json::json!([agent_json("Ghost", Some(&format!("{DELIMITER}roster")))]),
+    );
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        1
+    );
+    assert!(
+        read_agents_json(dir.path())[0]["system_prompt"].is_null(),
+        "no phantom empty prompt"
+    );
+}
+
+#[test]
+fn strip_skips_records_without_a_prompt() {
+    let dir = tempfile::tempdir().unwrap();
+    write_agents_json(
+        dir.path(),
+        &serde_json::json!([agent_json("Promptless", None)]),
+    );
+    let before = std::fs::read_to_string(base(dir.path()).join("managed-agents.json")).unwrap();
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        0
+    );
+    assert_eq!(
+        std::fs::read_to_string(base(dir.path()).join("managed-agents.json")).unwrap(),
+        before
+    );
+}
+
+#[test]
+fn strip_on_a_missing_store_is_a_no_op() {
+    let dir = tempfile::tempdir().unwrap();
+    std::fs::create_dir_all(base(dir.path())).unwrap();
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        0
+    );
+}
+
+#[test]
+fn strip_on_an_unparseable_store_errors_without_writing() {
+    let dir = tempfile::tempdir().unwrap();
+    std::fs::create_dir_all(base(dir.path())).unwrap();
+    let path = base(dir.path()).join("managed-agents.json");
+    std::fs::write(&path, "{ not json").unwrap();
+
+    let err = strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap_err();
+    assert!(err.contains("failed to parse"), "unexpected error: {err}");
+    assert_eq!(
+        std::fs::read_to_string(&path).unwrap(),
+        "{ not json",
+        "a corrupt store is left for manual recovery"
+    );
+    assert!(
+        !base(dir.path())
+            .join("managed-agents.json.pre-team-suffix-strip.bak")
+            .exists(),
+        "no backup is taken when nothing can be migrated"
+    );
+}
+
+#[test]
+fn strip_repins_an_instance_that_was_current_before_the_strip() {
+    // The definition's content hash changes when its prompt is stripped. An
+    // instance pinned to the pre-strip hash was current, so it must stay
+    // current — the user changed nothing and must not see a drift badge.
+    let dir = tempfile::tempdir().unwrap();
+    let baked = format!("You are Paul.{DELIMITER}frozen roster");
+    write_agents_json(
+        dir.path(),
+        &serde_json::json!([definition_json("sietch-tabr:paul", &baked)]),
+    );
+    let pre_hash = definition_hash(dir.path(), "sietch-tabr:paul");
+    write_agents_json(
+        dir.path(),
+        &serde_json::json!([
+            definition_json("sietch-tabr:paul", &baked),
+            instance_json("sietch-tabr:paul", &baked, &pre_hash),
+        ]),
+    );
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        2
+    );
+
+    let post_hash = definition_hash(dir.path(), "sietch-tabr:paul");
+    assert_ne!(pre_hash, post_hash, "stripping must change the drift basis");
+    let instance = read_agents_json(dir.path())
+        .into_iter()
+        .find(|r| r["pubkey"].as_str() == Some(&"p".repeat(64)))
+        .unwrap();
+    assert_eq!(
+        instance["persona_source_version"].as_str(),
+        Some(post_hash.as_str()),
+        "a previously-current instance must not start showing drift"
+    );
+}
+
+#[test]
+fn strip_leaves_an_already_drifted_instance_pin_alone() {
+    // An instance pinned to something other than the definition's pre-strip
+    // hash had genuinely drifted. Silently re-pinning it would erase a real
+    // signal, so its stale pin — and its badge — survive.
+    let dir = tempfile::tempdir().unwrap();
+    let baked = format!("You are Paul.{DELIMITER}frozen roster");
+    let stale = "d".repeat(64);
+    write_agents_json(
+        dir.path(),
+        &serde_json::json!([
+            definition_json("sietch-tabr:paul", &baked),
+            instance_json("sietch-tabr:paul", &baked, &stale),
+        ]),
+    );
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        2
+    );
+
+    let instance = read_agents_json(dir.path())
+        .into_iter()
+        .find(|r| r["pubkey"].as_str() == Some(&"p".repeat(64)))
+        .unwrap();
+    assert_eq!(
+        instance["persona_source_version"].as_str(),
+        Some(stale.as_str()),
+        "real drift must keep its signal"
+    );
+}
+
+#[cfg(unix)]
+#[test]
+fn strip_creates_the_backup_owner_only() {
+    // The backup is a verbatim copy of a store that carries plaintext agent
+    // nsecs whenever the keyring is unreachable, so it must be owner-only from
+    // the initial open — a post-write chmod would leave a umask window in which
+    // the secret is world-readable.
+    use std::os::unix::fs::PermissionsExt;
+
+    let dir = tempfile::tempdir().unwrap();
+    let mut record = agent_json("Alia", Some(&format!("Alia prompt.{DELIMITER}roster")));
+    record["private_key_nsec"] = serde_json::json!("nsec1exampleplaintextkey");
+    write_agents_json(dir.path(), &serde_json::json!([record]));
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(dir.path())).unwrap(),
+        1
+    );
+
+    let bak = base(dir.path()).join("managed-agents.json.pre-team-suffix-strip.bak");
+    let mode = std::fs::metadata(&bak).unwrap().permissions().mode() & 0o777;
+    assert_eq!(mode, 0o600, "backup of an inline nsec must be owner-only");
+    assert!(
+        std::fs::read_to_string(&bak)
+            .unwrap()
+            .contains("nsec1exampleplaintextkey"),
+        "the fixture really did carry an inline key"
+    );
+}
+
+#[cfg(unix)]
+#[test]
+fn strip_backs_up_beside_the_symlink_target() {
+    // Dev worktrees symlink `agents/managed-agents.json` to a shared data dir
+    // (`sync_shared_agent_data`). The sole recovery copy must land next to the
+    // real data, not in whichever worktree booted first.
+    let shared = tempfile::tempdir().unwrap();
+    let worktree = tempfile::tempdir().unwrap();
+    write_agents_json(
+        shared.path(),
+        &serde_json::json!([agent_json("Alia", Some(&format!("Alia.{DELIMITER}roster")))]),
+    );
+    std::fs::create_dir_all(base(worktree.path())).unwrap();
+    std::os::unix::fs::symlink(
+        base(shared.path()).join("managed-agents.json"),
+        base(worktree.path()).join("managed-agents.json"),
+    )
+    .unwrap();
+
+    assert_eq!(
+        strip_baked_team_instructions_in_dir(&base(worktree.path())).unwrap(),
+        1
+    );
+
+    assert!(
+        base(shared.path())
+            .join("managed-agents.json.pre-team-suffix-strip.bak")
+            .exists(),
+        "backup belongs beside the shared store"
+    );
+    assert!(
+        !base(worktree.path())
+            .join("managed-agents.json.pre-team-suffix-strip.bak")
+            .exists(),
+        "no orphan backup in the worktree data dir"
+    );
+    assert_eq!(prompt_of(shared.path(), "Alia").as_deref(), Some("Alia."));
+}
diff --git a/desktop/src-tauri/src/migration_avatar_tests.rs b/desktop/src-tauri/src/migration_avatar_tests.rs
index 2a93c00185..39dfc988dd 100644
--- a/desktop/src-tauri/src/migration_avatar_tests.rs
+++ b/desktop/src-tauri/src/migration_avatar_tests.rs
@@ -35,8 +35,10 @@ fn refresh_builtin_agent_avatars_updates_seeded_values_and_preserves_customizati
         name_pool: vec!["Fizzy".to_string()],
         is_builtin: true,
         is_active: true,
+        shared: false,
         source_team: None,
         source_team_persona_slug: None,
+        catalog_source: None,
         env_vars: Default::default(),
         respond_to: None,
         respond_to_allowlist: Vec::new(),
diff --git a/desktop/src-tauri/src/relay.rs b/desktop/src-tauri/src/relay.rs
index 1c9ba0095a..f896695624 100644
--- a/desktop/src-tauri/src/relay.rs
+++ b/desktop/src-tauri/src/relay.rs
@@ -532,49 +532,9 @@ pub struct AgentProfileInfo {
 // ── Signed-event submission ─────────────────────────────────────────────────
 
 mod submit;
-pub use submit::{submit_event, submit_event_at_with_keys, SubmitEventResponse};
-
-/// POST an already-signed event to `/events` with NIP-98 auth.
-///
-/// The persona flush loop drains pre-signed events from the retention store,
-/// so it must publish them verbatim — re-signing through `submit_event` would
-/// mint a new `created_at`/signature and break the compare-and-clear that
-/// `mark_synced` relies on. Only the NIP-98 request auth is signed here (with
-/// the owner keys), and that lock is dropped before the `.await`.
-pub async fn submit_signed_event(
-    event: &nostr::Event,
-    state: &AppState,
-) -> Result<SubmitEventResponse, String> {
-    crate::relay_admission::wait_for_rate_limit().await;
-    let url = format!("{}/events", relay_api_base_url_with_override(state));
-    let body_bytes = event.as_json().into_bytes();
-    let auth_header = {
-        let keys = state.signing_keys()?;
-        build_nip98_auth_header_for_keys(&keys, &Method::POST, &url, &body_bytes)?
-    }; // keys dropped here
-
-    let response = state
-        .http_client
-        .post(&url)
-        .header("Authorization", auth_header)
-        .header("Content-Type", "application/json")
-        .body(body_bytes)
-        .send()
-        .await
-        .map_err(|e| classify_request_error(&e))?;
-
-    if !response.status().is_success() {
-        return Err(relay_error_message(response).await);
-    }
-
-    let result: SubmitEventResponse = parse_json_response(response).await?;
-
-    if !result.accepted {
-        return Err(format!("relay rejected event: {}", result.message));
-    }
-
-    Ok(result)
-}
+pub use submit::{
+    submit_event, submit_event_at_with_keys, submit_signed_event_at_with_keys, SubmitEventResponse,
+};
 
 /// Sign an event with explicit keys and POST it to `/events` with NIP-98 auth.
 ///
diff --git a/desktop/src-tauri/src/relay/submit.rs b/desktop/src-tauri/src/relay/submit.rs
index 7fb3f94041..2a42d86c2b 100644
--- a/desktop/src-tauri/src/relay/submit.rs
+++ b/desktop/src-tauri/src/relay/submit.rs
@@ -8,22 +8,22 @@ pub struct SubmitEventResponse {
     pub message: String,
 }
 
-/// Sign with an explicit identity and POST the event to an explicit relay.
+/// POST an already-signed event to an explicit relay with an explicit owner.
 ///
-/// The caller owns the signer lifetime. This is important for deferred work:
-/// an in-process identity swap cannot retarget the event or its NIP-98 auth
-/// after the caller has validated which identity the operation belongs to.
-pub async fn submit_event_at_with_keys(
-    builder: nostr::EventBuilder,
+/// Deferred/scoped publication uses this form so a workspace or identity
+/// switch cannot retarget either the event or its NIP-98 authentication after
+/// the operation captured its `(relay, owner)` scope.
+pub async fn submit_signed_event_at_with_keys(
+    event: &nostr::Event,
     state: &AppState,
     api_base_url: &str,
     keys: &nostr::Keys,
 ) -> Result<SubmitEventResponse, String> {
+    if event.pubkey != keys.public_key() {
+        return Err("signed event does not match the publishing identity".to_string());
+    }
     crate::relay_admission::wait_for_rate_limit().await;
     let url = format!("{}/events", api_base_url.trim_end_matches('/'));
-    let event = builder
-        .sign_with_keys(keys)
-        .map_err(|e| format!("failed to sign event: {e}"))?;
     let body_bytes = event.as_json().into_bytes();
     let auth_header = build_nip98_auth_header_for_keys(keys, &Method::POST, &url, &body_bytes)?;
 
@@ -49,6 +49,23 @@ pub async fn submit_event_at_with_keys(
     Ok(result)
 }
 
+/// Sign with an explicit identity and POST the event to an explicit relay.
+///
+/// The caller owns the signer lifetime. This is important for deferred work:
+/// an in-process identity swap cannot retarget the event or its NIP-98 auth
+/// after the caller has validated which identity the operation belongs to.
+pub async fn submit_event_at_with_keys(
+    builder: nostr::EventBuilder,
+    state: &AppState,
+    api_base_url: &str,
+    keys: &nostr::Keys,
+) -> Result<SubmitEventResponse, String> {
+    let event = builder
+        .sign_with_keys(keys)
+        .map_err(|e| format!("failed to sign event: {e}"))?;
+    submit_signed_event_at_with_keys(&event, state, api_base_url, keys).await
+}
+
 /// Build and submit an event to the currently active workspace relay.
 pub async fn submit_event(
     builder: nostr::EventBuilder,
diff --git a/desktop/src-tauri/src/util.rs b/desktop/src-tauri/src/util.rs
index 204cba6dbb..7fa4dc6768 100644
--- a/desktop/src-tauri/src/util.rs
+++ b/desktop/src-tauri/src/util.rs
@@ -220,6 +220,67 @@ pub(crate) fn configure_no_window(command: &mut std::process::Command) {
     let _ = command;
 }
 
+/// Copy `source_bytes` to `path` owner-only, exactly once.
+///
+/// For the pre-migration backups taken by the migrations in `crate::migration` before they
+/// rewrite `managed-agents.json`. That store carries plaintext agent nsecs
+/// whenever the keyring is unreachable (`SECURITY.md`), so the backup must be
+/// owner-only from the initial open — `fs::write` then `set_permissions` leaves
+/// exactly the umask window that [`atomic_write_json_restricted`] sets the mode
+/// on the handle to close.
+///
+/// `create_new` also subsumes the create-if-absent check: `AlreadyExists` is the
+/// idempotent success case, so a re-run after a partial failure cannot replace a
+/// pristine backup with a half-migrated snapshot, and there is no exists-then-
+/// write window between the two. `Ok(false)` means a backup was already there
+/// and was left untouched. Every other error propagates, so a caller that fails
+/// to back up never proceeds to the live write.
+///
+/// Non-Unix platforms get `create_new` alone.
+///
+/// [`atomic_write_json_restricted`]: crate::managed_agents::atomic_write_json_restricted
+pub(crate) fn create_restricted_backup_once(
+    path: &std::path::Path,
+    source_bytes: &[u8],
+) -> Result<bool, String> {
+    use std::io::Write as _;
+
+    let mut options = std::fs::OpenOptions::new();
+    options.write(true).create_new(true);
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::OpenOptionsExt;
+        options.mode(0o600);
+    }
+    let mut file = match options.open(path) {
+        Ok(file) => file,
+        Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => return Ok(false),
+        Err(e) => return Err(format!("create {}: {e}", path.display())),
+    };
+    file.write_all(source_bytes)
+        .map_err(|e| format!("write {}: {e}", path.display()))?;
+    Ok(true)
+}
+
+/// Derive the sibling backup path for a store, resolving symlinks first.
+///
+/// Dev worktrees symlink `agents/managed-agents.json` into the shared canonical
+/// dev data dir (`sync_shared_agent_data`). [`atomic_write_json_restricted`]
+/// canonicalizes before writing, so without the same resolution here the sole
+/// recovery copy would land beside the symlink while the data it protects lives
+/// elsewhere. Falls back to the given path when `canonicalize` fails — the store
+/// may legitimately not exist yet.
+///
+/// [`atomic_write_json_restricted`]: crate::managed_agents::atomic_write_json_restricted
+pub(crate) fn resolved_backup_path(
+    store_path: &std::path::Path,
+    backup_name: &str,
+) -> std::path::PathBuf {
+    std::fs::canonicalize(store_path)
+        .unwrap_or_else(|_| store_path.to_path_buf())
+        .with_file_name(backup_name)
+}
+
 #[cfg(test)]
 mod tests {
     use super::slugify;
diff --git a/desktop/src-tauri/src/webkit_rendering.rs b/desktop/src-tauri/src/webkit_rendering.rs
new file mode 100644
index 0000000000..905da5eeed
--- /dev/null
+++ b/desktop/src-tauri/src/webkit_rendering.rs
@@ -0,0 +1,208 @@
+//! WebKit rendering workarounds for Linux, applied before WebKit initializes.
+//!
+//! 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.
+//!
+//! 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
+//! no second chance later in the same process. This module therefore decides
+//! from cheap preflight signals instead of reacting to a crash:
+//!
+//! * an NVIDIA GPU, the driver family behind most upstream reports; and
+//! * AppImage packaging, where linuxdeploy's AppRun hook pins `GDK_BACKEND=x11`
+//!   and the dmabuf renderer buys nothing on that XWayland path (#2338).
+//!
+//! `--safe-rendering` is the manual escape hatch for a machine neither signal
+//! recognises; it also disables accelerated compositing, for that launch only.
+//!
+//! 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.
+
+use std::ffi::{OsStr, OsString};
+use std::path::Path;
+
+/// Force the safest rendering configuration for this launch.
+const SAFE_RENDERING: &str = "--safe-rendering";
+
+/// PCI vendor ID reported by NVIDIA devices under `/sys/class/drm`.
+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.
+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 `--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];
+
+/// Reads one environment variable. Injected so the decision is testable without
+/// mutating the process environment. `OsString` rather than `String` because
+/// presence is the test — a non-UTF-8 assignment is still the user's.
+type EnvLookup<'a> = &'a dyn Fn(&str) -> Option<OsString>;
+
+/// What this launch should do about its rendering environment.
+#[derive(Debug, PartialEq, Eq)]
+enum Plan {
+    /// Set each of these to `1`, then report `why`.
+    Apply {
+        vars: &'static [&'static str],
+        why: String,
+    },
+    /// Change nothing, and report `why`.
+    Leave { why: String },
+    /// The request cannot be delivered. Report it and exit non-zero rather than
+    /// starting an app that silently ignores what the user asked for.
+    Fatal { diagnostic: String },
+}
+
+/// Applies the workaround for this launch.
+///
+/// Must be called from `main()` before `crate::run()`: WebKit memoizes these
+/// variables at process start, and `std::env::set_var` is only sound while the
+/// process is still single threaded, which it is nowhere else in Buzz.
+///
+/// `Err` carries a user-facing diagnostic; the caller reports it and exits.
+pub fn apply() -> Result<(), String> {
+    match plan(
+        std::env::args_os(),
+        &|key| std::env::var_os(key),
+        Path::new(DRM_ROOT),
+    ) {
+        Plan::Apply { vars, why } => {
+            for var in vars {
+                // Safe here and only here — see the doc comment above.
+                std::env::set_var(var, "1");
+            }
+            let applied: Vec<String> = vars.iter().map(|var| format!("{var}=1")).collect();
+            eprintln!("buzz-desktop: {} — {why}", applied.join(" "));
+            Ok(())
+        }
+        Plan::Leave { why } => {
+            eprintln!("buzz-desktop: WebKit rendering left as-is — {why}");
+            Ok(())
+        }
+        Plan::Fatal { diagnostic } => Err(diagnostic),
+    }
+}
+
+/// The whole decision, as a pure function of argv, the environment, and the DRM
+/// device tree.
+fn plan(
+    args: impl IntoIterator<Item = impl AsRef<OsStr>>,
+    env: EnvLookup<'_>,
+    drm_root: &Path,
+) -> Plan {
+    let safe_rendering = args
+        .into_iter()
+        .any(|arg| arg.as_ref() == OsStr::new(SAFE_RENDERING));
+    let user_set = user_set(env);
+
+    if !user_set.is_empty() {
+        // A user who has assigned one of these has taken over the decision, so
+        // the heuristic stands down wholesale — writing the *other* variable
+        // behind their back would be exactly the surprise they opted out of.
+        return match safe_rendering {
+            // Two incompatible answers to one question, and no basis for
+            // picking: honouring the flag would overwrite configuration the
+            // user typed, honouring the environment would silently ignore a
+            // rescue flag from a user whose app does not start.
+            true => Plan::Fatal {
+                diagnostic: conflict(&user_set),
+            },
+            false => Plan::Leave {
+                why: format!("{} set in the environment", describe(&user_set)),
+            },
+        };
+    }
+
+    if safe_rendering {
+        return Plan::Apply {
+            vars: &OWNED,
+            why: format!("{SAFE_RENDERING} requested, this launch only"),
+        };
+    }
+
+    let signals = [
+        (nvidia_gpu(drm_root), "NVIDIA GPU"),
+        (env("APPIMAGE").is_some(), "AppImage"),
+    ];
+    let hits: Vec<&str> = signals
+        .iter()
+        .filter_map(|(hit, label)| hit.then_some(*label))
+        .collect();
+
+    match hits.is_empty() {
+        true => Plan::Leave {
+            why: "no NVIDIA GPU and not an AppImage".to_string(),
+        },
+        false => Plan::Apply {
+            vars: &HEURISTIC,
+            why: hits.join(", "),
+        },
+    }
+}
+
+/// Owned variables the environment already carries, keyed by name.
+///
+/// Presence is the test, not truthiness: `VAR=0` and `VAR=` are both genuine
+/// user assignments, and both take the decision away from this module.
+fn user_set(env: EnvLookup<'_>) -> Vec<(&'static str, OsString)> {
+    OWNED
+        .iter()
+        .filter_map(|key| env(key).map(|value| (*key, value)))
+        .collect()
+}
+
+/// User assignments rendered as `KEY=value`, for a log line or a diagnostic.
+fn describe(user_set: &[(&str, OsString)]) -> String {
+    let shown: Vec<String> = user_set
+        .iter()
+        .map(|(key, value)| format!("{key}={}", value.to_string_lossy()))
+        .collect();
+    shown.join(", ")
+}
+
+/// Whether any DRM device reports NVIDIA's PCI vendor ID. An unreadable device
+/// tree is not a hit — the workaround has a real cost, so it needs evidence.
+fn nvidia_gpu(drm_root: &Path) -> bool {
+    let Ok(entries) = std::fs::read_dir(drm_root) else {
+        return false;
+    };
+    entries.flatten().any(|entry| {
+        std::fs::read_to_string(entry.path().join("device/vendor"))
+            .is_ok_and(|vendor| vendor.trim().eq_ignore_ascii_case(NVIDIA_PCI_VENDOR))
+    })
+}
+
+/// The diagnostic for `--safe-rendering` against a user-set owned variable.
+///
+/// The message both shows what is set and names the keys to unset — the two
+/// things a user whose app will not start needs in order to act on it.
+fn conflict(user_set: &[(&str, OsString)]) -> String {
+    let keys: Vec<&str> = user_set.iter().map(|(key, _)| *key).collect();
+    format!(
+        "{SAFE_RENDERING} cannot be applied: {} already set in the environment. \
+         Either unset {} and run {SAFE_RENDERING} again, or keep that \
+         environment and drop the flag.",
+        describe(user_set),
+        keys.join(", "),
+    )
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/desktop/src-tauri/src/webkit_rendering/tests.rs b/desktop/src-tauri/src/webkit_rendering/tests.rs
new file mode 100644
index 0000000000..5be1612b21
--- /dev/null
+++ b/desktop/src-tauri/src/webkit_rendering/tests.rs
@@ -0,0 +1,250 @@
+//! Behaviour of the preflight decision.
+//!
+//! Every case goes through `plan`, which takes argv, the environment, and the
+//! DRM root as arguments — so nothing here mutates the process environment and
+//! the tests are order-independent.
+
+use super::*;
+
+const NO_ARGS: [&str; 0] = [];
+
+/// A `/sys/class/drm` stand-in. `vendors` are written as `card<n>/device/vendor`
+/// with the trailing newline the kernel emits.
+fn drm(vendors: &[&str]) -> tempfile::TempDir {
+    let root = tempfile::tempdir().expect("tempdir");
+    for (index, vendor) in vendors.iter().enumerate() {
+        let device = root.path().join(format!("card{index}")).join("device");
+        std::fs::create_dir_all(&device).expect("device dir");
+        std::fs::write(device.join("vendor"), format!("{vendor}\n")).expect("vendor");
+    }
+    root
+}
+
+fn env_from(pairs: &[(&str, &str)]) -> impl Fn(&str) -> Option<OsString> {
+    let owned: Vec<(String, OsString)> = pairs
+        .iter()
+        .map(|(key, value)| (key.to_string(), OsString::from(value)))
+        .collect();
+    move |key| {
+        owned
+            .iter()
+            .find(|(candidate, _)| candidate == key)
+            .map(|(_, value)| value.clone())
+    }
+}
+
+/// The variables a plan would set, or `None` for a plan that sets nothing.
+fn applied(plan: &Plan) -> Option<&[&str]> {
+    match plan {
+        Plan::Apply { vars, .. } => Some(vars),
+        _ => None,
+    }
+}
+
+// ── Detection ───────────────────────────────────────────────────────────────
+
+#[test]
+fn test_nvidia_gpu_disables_the_dmabuf_renderer() {
+    let drm = drm(&["0x10de"]);
+    let plan = plan(NO_ARGS, &env_from(&[]), drm.path());
+
+    assert_eq!(
+        applied(&plan),
+        Some(&["WEBKIT_DISABLE_DMABUF_RENDERER"][..])
+    );
+    let Plan::Apply { why, .. } = &plan else {
+        unreachable!()
+    };
+    assert!(why.contains("NVIDIA"), "{why}");
+}
+
+#[test]
+fn test_an_nvidia_gpu_alongside_another_vendor_still_counts() {
+    // Hybrid graphics: the integrated GPU enumerates first, and WebKit may
+    // still land on the discrete one.
+    let drm = drm(&["0x8086", "0x10de"]);
+
+    assert_eq!(
+        applied(&plan(NO_ARGS, &env_from(&[]), drm.path())),
+        Some(&["WEBKIT_DISABLE_DMABUF_RENDERER"][..])
+    );
+}
+
+#[test]
+fn test_the_vendor_id_match_ignores_case() {
+    let drm = drm(&["0x10DE"]);
+
+    assert_eq!(
+        applied(&plan(NO_ARGS, &env_from(&[]), drm.path())),
+        Some(&["WEBKIT_DISABLE_DMABUF_RENDERER"][..])
+    );
+}
+
+#[test]
+fn test_an_appimage_launch_disables_the_dmabuf_renderer() {
+    // 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"]);
+    let env = env_from(&[("APPIMAGE", "/home/u/Buzz.AppImage")]);
+    let plan = plan(NO_ARGS, &env, drm.path());
+
+    assert_eq!(
+        applied(&plan),
+        Some(&["WEBKIT_DISABLE_DMABUF_RENDERER"][..])
+    );
+    let Plan::Apply { why, .. } = &plan else {
+        unreachable!()
+    };
+    assert!(why.contains("AppImage"), "{why}");
+}
+
+#[test]
+fn test_a_plain_non_nvidia_launch_changes_nothing() {
+    let drm = drm(&["0x8086", "0x1002"]);
+
+    assert!(matches!(
+        plan(NO_ARGS, &env_from(&[]), drm.path()),
+        Plan::Leave { .. }
+    ));
+}
+
+#[test]
+fn test_an_unreadable_drm_tree_is_not_treated_as_a_hit() {
+    // Containers and hardened kernels can hide `/sys/class/drm` entirely. The
+    // workaround costs real rendering performance, so absent evidence is not
+    // evidence — this must not become an unconditional export.
+    let missing = std::path::Path::new("/nonexistent/class/drm");
+
+    assert!(matches!(
+        plan(NO_ARGS, &env_from(&[]), missing),
+        Plan::Leave { .. }
+    ));
+}
+
+#[test]
+fn test_a_device_without_a_vendor_file_is_skipped_not_fatal() {
+    // `/sys/class/drm` also contains connector entries (`card0-HDMI-A-1`) and
+    // `renderD*` nodes, which have no `device/vendor` under them.
+    let root = tempfile::tempdir().expect("tempdir");
+    std::fs::create_dir_all(root.path().join("card0-HDMI-A-1")).expect("connector");
+    let device = root.path().join("card1").join("device");
+    std::fs::create_dir_all(&device).expect("device dir");
+    std::fs::write(device.join("vendor"), "0x10de\n").expect("vendor");
+
+    assert_eq!(
+        applied(&plan(NO_ARGS, &env_from(&[]), root.path())),
+        Some(&["WEBKIT_DISABLE_DMABUF_RENDERER"][..])
+    );
+}
+
+// ── User environment ────────────────────────────────────────────────────────
+
+#[test]
+fn test_a_user_set_variable_disables_the_heuristic_wholesale() {
+    // `0` is the value a truthiness check would drop: the user is asking for the
+    // dmabuf renderer *on*, on a machine the heuristic would have opted out.
+    let drm = drm(&["0x10de"]);
+    let env = env_from(&[(DISABLE_DMABUF, "0")]);
+    let plan = plan(NO_ARGS, &env, drm.path());
+
+    let Plan::Leave { why } = &plan else {
+        panic!("a user assignment must not be overwritten: {plan:?}");
+    };
+    assert!(why.contains("WEBKIT_DISABLE_DMABUF_RENDERER=0"), "{why}");
+}
+
+#[test]
+fn test_an_empty_assignment_is_still_a_user_assignment() {
+    let drm = drm(&["0x10de"]);
+    let env = env_from(&[(DISABLE_DMABUF, "")]);
+
+    assert!(matches!(
+        plan(NO_ARGS, &env, drm.path()),
+        Plan::Leave { .. }
+    ));
+}
+
+#[test]
+fn test_a_user_set_compositing_variable_also_stands_the_heuristic_down() {
+    // The heuristic never sets this one, but it is still ours to set under
+    // `--safe-rendering`, so a user value takes the whole decision away rather
+    // than leaving us free to write the sibling variable.
+    let drm = drm(&["0x10de"]);
+    let env = env_from(&[(DISABLE_COMPOSITING, "1")]);
+
+    assert!(matches!(
+        plan(NO_ARGS, &env, drm.path()),
+        Plan::Leave { .. }
+    ));
+}
+
+// ── --safe-rendering ────────────────────────────────────────────────────────
+
+#[test]
+fn test_safe_rendering_applies_the_safest_set_without_any_hardware_signal() {
+    // The escape hatch exists for the machine neither signal recognises, so it
+    // must not depend on either one.
+    let drm = drm(&["0x8086"]);
+    let args = ["buzz://channel/1", SAFE_RENDERING];
+    let plan = plan(args, &env_from(&[]), drm.path());
+
+    assert_eq!(
+        applied(&plan),
+        Some(
+            &[
+                "WEBKIT_DISABLE_DMABUF_RENDERER",
+                "WEBKIT_DISABLE_COMPOSITING_MODE"
+            ][..]
+        )
+    );
+}
+
+#[test]
+fn test_an_unrelated_flag_is_not_mistaken_for_safe_rendering() {
+    let drm = drm(&["0x8086"]);
+
+    assert!(matches!(
+        plan(["--safe-renderingX"], &env_from(&[]), drm.path()),
+        Plan::Leave { .. }
+    ));
+}
+
+#[test]
+fn test_safe_rendering_against_a_user_set_variable_is_fatal_not_guessed() {
+    let drm = drm(&["0x8086"]);
+    let env = env_from(&[(DISABLE_DMABUF, "0")]);
+    let plan = plan([SAFE_RENDERING], &env, drm.path());
+
+    let Plan::Fatal { diagnostic } = &plan else {
+        panic!("the flag and the environment disagree; neither may be guessed: {plan:?}");
+    };
+    // The message has to name what is set and what to unset, or the user whose
+    // app will not start cannot act on it.
+    assert!(diagnostic.contains(SAFE_RENDERING), "{diagnostic}");
+    assert!(
+        diagnostic.contains("WEBKIT_DISABLE_DMABUF_RENDERER=0"),
+        "{diagnostic}"
+    );
+}
+
+#[test]
+fn test_a_non_utf8_user_assignment_is_reported_not_ignored() {
+    // Presence is the test, so this still stands the heuristic down; the
+    // diagnostic must name the key rather than dropping the whole entry.
+    #[cfg(unix)]
+    {
+        use std::os::unix::ffi::OsStringExt;
+
+        let drm = drm(&["0x10de"]);
+        let invalid = OsString::from_vec(vec![0xff, 0xfe]);
+        let env = |key: &str| match key == DISABLE_DMABUF {
+            true => Some(invalid.clone()),
+            false => None,
+        };
+
+        let Plan::Fatal { diagnostic } = plan([SAFE_RENDERING], &env, drm.path()) else {
+            panic!("a non-UTF-8 assignment is still a user assignment");
+        };
+        assert!(diagnostic.contains(DISABLE_DMABUF), "{diagnostic}");
+    }
+}
diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json
index 07b7216346..85ad5c0b2d 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.4.26",
+  "version": "0.5.1",
   "identifier": "xyz.block.buzz.app",
   "build": {
     "beforeDevCommand": {
diff --git a/desktop/src/app/App.tsx b/desktop/src/app/App.tsx
index 9561b2138c..90b5bf5ebc 100644
--- a/desktop/src/app/App.tsx
+++ b/desktop/src/app/App.tsx
@@ -33,6 +33,7 @@ import { CommunityOnboardingFlow } from "@/features/onboarding/ui/CommunityOnboa
 import {
   MachineOnboardingFlow,
   type MachineOnboardingPage,
+  type PostOnboardingNavigation,
 } from "@/features/onboarding/ui/MachineOnboardingFlow";
 import { OnboardingFlow } from "@/features/onboarding/ui/OnboardingFlow";
 import { PendingInviteGate } from "@/features/onboarding/ui/PendingInviteGate";
@@ -592,6 +593,8 @@ function MachineBootstrap({ sharedIdentity }: { sharedIdentity: boolean }) {
   });
   const [machineInitialPage, setMachineInitialPage] =
     useState<MachineOnboardingPage>();
+  const [postOnboardingNav, setPostOnboardingNav] =
+    useState<PostOnboardingNavigation | null>(null);
 
   const reopenMachineConfig = useCallback(() => {
     setMachineInitialPage("config");
@@ -606,6 +609,27 @@ function MachineBootstrap({ sharedIdentity }: { sharedIdentity: boolean }) {
     [machine.complete],
   );
 
+  const navigateAfterOnboarding = useCallback(
+    (nav: PostOnboardingNavigation) => {
+      setPostOnboardingNav(nav);
+    },
+    [],
+  );
+
+  // Execute the pending navigation once the RouterProvider is mounted (i.e.
+  // machine.stage transitions to "ready").  We wait for the ready stage rather
+  // than using setTimeout(0) so the router is guaranteed to exist before we call
+  // router.navigate().
+  useEffect(() => {
+    if (machine.stage === "ready" && postOnboardingNav) {
+      void router.navigate({
+        to: postOnboardingNav.to,
+        search: postOnboardingNav.search ?? {},
+      });
+      setPostOnboardingNav(null);
+    }
+  }, [machine.stage, postOnboardingNav]);
+
   const openAddCommunity = useCallback(
     (payload: AddCommunityDeepLinkPayload & { requestId: string }) =>
       activeCommunity
@@ -664,6 +688,7 @@ function MachineBootstrap({ sharedIdentity }: { sharedIdentity: boolean }) {
         continueWithIdentity={machine.continueWithIdentity}
         identityLost={machine.identityLost}
         initialPage={machineInitialPage}
+        navigateAfterComplete={navigateAfterOnboarding}
         queryClient={machine.queryClient}
       />
       {shouldAcknowledgeDeepLink ? <PendingInviteGate /> : null}
diff --git a/desktop/src/app/AppShell.tsx b/desktop/src/app/AppShell.tsx
index 7ed9fa9348..abbbf29610 100644
--- a/desktop/src/app/AppShell.tsx
+++ b/desktop/src/app/AppShell.tsx
@@ -96,6 +96,7 @@ import { useMessageDeepLinks } from "@/shared/useMessageDeepLinks";
 import { SidebarInset, SidebarProvider } from "@/shared/ui/sidebar";
 import { RelayConnectionOverlay } from "@/app/RelayConnectionOverlay";
 import { useSidebarRelayConnectionCard } from "@/features/sidebar/ui/useSidebarRelayConnectionCard";
+
 const LazySettingsScreen = React.lazy(async () => {
   const module = await import("@/features/settings/ui/SettingsScreen");
   return { default: module.SettingsScreen };
@@ -105,7 +106,6 @@ export function AppShell() {
   useWebviewZoomShortcuts();
   useTauriWindowDrag();
   useWebviewScrollBoundaryLock();
-
   const communitiesHook = useCommunities();
   const hasCommunityRail = communitiesHook.communities.length > 1;
   const addCommunityDialog = useAddCommunityDialogState();
@@ -167,7 +167,10 @@ export function AppShell() {
   const { starredChannelIds, starChannel, unstarChannel } = useChannelStars(
     identityQuery.data?.pubkey,
   );
-  usePersonaSync(identityQuery.data?.pubkey);
+  usePersonaSync(
+    identityQuery.data?.pubkey,
+    communitiesHook.activeCommunity?.relayUrl,
+  );
   useAgentsDataRefresh();
   // Chunk F: auto-restart drifted idle agents (per-agent opt-out, default ON).
   useAutoRestartPolicy();
@@ -228,6 +231,7 @@ export function AppShell() {
   const relayConnectionCard = useSidebarRelayConnectionCard(
     channelsErrorMessage,
     communitiesHook.activeCommunity?.relayUrl,
+    `${communitiesHook.activeCommunity?.id ?? "none"}-${communitiesHook.reinitKey}`,
   );
   const memberChannels = React.useMemo(
     () => channels.filter((channel) => channel.isMember),
diff --git a/desktop/src/app/RelayConnectionOverlay.tsx b/desktop/src/app/RelayConnectionOverlay.tsx
index faf28ee51e..07c6933d04 100644
--- a/desktop/src/app/RelayConnectionOverlay.tsx
+++ b/desktop/src/app/RelayConnectionOverlay.tsx
@@ -60,7 +60,7 @@ export function RelayConnectionOverlay({
           animate={{ opacity: 1, y: 0 }}
           className={cn(
             "pointer-events-none fixed z-50 w-[284px]",
-            hasCommunityRail ? "left-[60px]" : "left-3",
+            hasCommunityRail ? "left-[68px]" : "left-3",
             isHuddleDrawerOpen
               ? "bottom-[calc(var(--buzz-huddle-drawer-height,0px)+12px)]"
               : "bottom-3",
@@ -86,7 +86,7 @@ export function RelayConnectionOverlay({
           animate={{ opacity: 1, y: 0 }}
           className={cn(
             "pointer-events-none fixed z-50 w-[284px]",
-            hasCommunityRail ? "left-[60px]" : "left-3",
+            hasCommunityRail ? "left-[68px]" : "left-3",
             isHuddleDrawerOpen
               ? "bottom-[calc(var(--buzz-huddle-drawer-height,0px)+12px)]"
               : "bottom-3",
diff --git a/desktop/src/app/postOnboardingNav.test.mjs b/desktop/src/app/postOnboardingNav.test.mjs
new file mode 100644
index 0000000000..2be2eab95f
--- /dev/null
+++ b/desktop/src/app/postOnboardingNav.test.mjs
@@ -0,0 +1,123 @@
+/**
+ * Tests for the post-onboarding navigation contract (Thufir F8).
+ *
+ * When the user clicks "Set up agents" during machine onboarding,
+ * MachineOnboardingFlow calls complete() then navigateAfterComplete({to, search}).
+ * App.tsx records the pending nav and fires it only when machine.stage === "ready"
+ * (i.e. once RouterProvider is mounted), never before.
+ *
+ * These are pure-logic tests — they simulate the App.tsx useEffect predicate
+ * directly. No React rendering needed; the behavior under test is:
+ *   pendingNav × stage → navigate() call count.
+ */
+import assert from "node:assert/strict";
+import test from "node:test";
+
+// ── Simulate the App.tsx postOnboardingNav useEffect logic ──────────────────
+//
+// The production code:
+//   useEffect(() => {
+//     if (machine.stage === "ready" && postOnboardingNav) {
+//       void router.navigate({ to: postOnboardingNav.to, search: ... });
+//       setPostOnboardingNav(null);
+//     }
+//   }, [machine.stage, postOnboardingNav]);
+//
+// We simulate this as a pure function and drive it through stage transitions.
+
+function runEffect(stage, nav, navigate) {
+  if (stage === "ready" && nav !== null) {
+    navigate({ to: nav.to, search: nav.search ?? {} });
+    return null; // cleared
+  }
+  return nav; // unchanged
+}
+
+test("navigate does not fire before stage reaches ready", () => {
+  const calls = [];
+  const navigate = (args) => calls.push(args);
+
+  const nav = { to: "/settings", search: { section: "agents" } };
+
+  // Drive through non-ready stages — navigate must not fire.
+  for (const stage of ["loading", "onboarding", "blocking"]) {
+    runEffect(stage, nav, navigate);
+  }
+
+  assert.equal(calls.length, 0, "navigate must not be called before ready");
+});
+
+test("navigate fires exactly once when stage transitions to ready", () => {
+  const calls = [];
+  const navigate = (args) => calls.push(args);
+
+  const nav = { to: "/settings", search: { section: "agents" } };
+
+  // Pre-ready stages — no call.
+  let pending = nav;
+  pending = runEffect("onboarding", pending, navigate);
+
+  // Stage reaches ready — navigate fires once.
+  pending = runEffect("ready", pending, navigate);
+
+  assert.equal(calls.length, 1, "navigate must fire exactly once on ready");
+  assert.equal(calls[0].to, "/settings");
+  assert.deepStrictEqual(calls[0].search, { section: "agents" });
+});
+
+test("navigate does not fire again after nav is cleared", () => {
+  const calls = [];
+  const navigate = (args) => calls.push(args);
+
+  const nav = { to: "/settings", search: { section: "agents" } };
+  let pending = nav;
+
+  // First ready transition fires and clears.
+  pending = runEffect("ready", pending, navigate);
+  assert.equal(calls.length, 1);
+  assert.equal(pending, null, "pending nav must be cleared after firing");
+
+  // Re-running the effect with null nav must not fire again.
+  pending = runEffect("ready", pending, navigate);
+  assert.equal(
+    calls.length,
+    1,
+    "navigate must not fire again after being cleared",
+  );
+});
+
+test("navigate fires immediately if nav is set while already ready", () => {
+  // Edge case: nav arrives after the machine is already ready (e.g. hot reload).
+  const calls = [];
+  const navigate = (args) => calls.push(args);
+
+  const nav = { to: "/settings", search: { section: "agents" } };
+
+  // Start with no pending nav while ready.
+  let pending = runEffect("ready", null, navigate);
+  assert.equal(calls.length, 0, "no nav pending → no call");
+
+  // Nav arrives (complete() called while already ready).
+  pending = runEffect("ready", nav, navigate);
+  assert.equal(calls.length, 1, "nav must fire immediately when already ready");
+  assert.equal(pending, null);
+});
+
+test("navigate intent carries exact to and search from navigateToAgentSettings", () => {
+  // Verifies the specific shape emitted by MachineOnboardingFlow's
+  // navigateToAgentSettings action: { to: '/settings', search: { section: 'agents' } }
+  const calls = [];
+  const navigate = (args) => calls.push(args);
+
+  // Simulate MachineOnboardingFlow calling navigateAfterComplete.
+  const nav = { to: "/settings", search: { section: "agents" } };
+  runEffect("ready", nav, navigate);
+
+  assert.equal(calls.length, 1);
+  assert.equal(calls[0].to, "/settings", "must navigate to /settings");
+  assert.equal(
+    calls[0].search.section,
+    "agents",
+    "must include section=agents",
+  );
+});
diff --git a/desktop/src/app/useThreadActivityFeedItems.test.mjs b/desktop/src/app/useThreadActivityFeedItems.test.mjs
index 6c017028ca..54d36dc1e8 100644
--- a/desktop/src/app/useThreadActivityFeedItems.test.mjs
+++ b/desktop/src/app/useThreadActivityFeedItems.test.mjs
@@ -113,3 +113,18 @@ test("channel-presence fence applies before mute filter — unknown channel + mu
 
   assert.deepEqual(items, []);
 });
+
+test("top-level DM activity is included in Activity", () => {
+  const dmItem = threadActivityItem({
+    id: "agent-dm-reply",
+    tags: [["h", CHANNEL_ID]],
+  });
+  const channels = [{ id: CHANNEL_ID, name: "Agent DM", channelType: "dm" }];
+
+  assert.deepEqual(
+    buildThreadActivityFeedItems([dmItem], new Set(), channels).map(
+      (item) => item.id,
+    ),
+    ["agent-dm-reply"],
+  );
+});
diff --git a/desktop/src/app/useThreadActivityFeedItems.ts b/desktop/src/app/useThreadActivityFeedItems.ts
index af0c50ce48..b14eb51327 100644
--- a/desktop/src/app/useThreadActivityFeedItems.ts
+++ b/desktop/src/app/useThreadActivityFeedItems.ts
@@ -17,7 +17,8 @@ export function buildThreadActivityFeedItems(
       // is present in the active community's channel set. Rows persisted under
       // a different relay's scope key should never reach this function, but
       // this filter is the last line of defense against cross-community leaks.
-      if (channelById.get(item.channelId) === undefined) return false;
+      const channel = channelById.get(item.channelId);
+      if (channel === undefined) return false;
       const rootId = getThreadReference(item.tags).rootId;
       return !rootId || !mutedRootIds.has(rootId);
     })
diff --git a/desktop/src/features/agents/AGENTS.md b/desktop/src/features/agents/AGENTS.md
index 2af9ddb98c..35ad4a63af 100644
--- a/desktop/src/features/agents/AGENTS.md
+++ b/desktop/src/features/agents/AGENTS.md
@@ -67,7 +67,11 @@ with a TypeScript lookup table or an id comparison in a component.
 7. **Onboarding setup detects readiness; it does not select defaults.** The
    setup page derives visible and ready harnesses from the runtime catalog and
    only offers install or sign-in actions. The following defaults page is the
-   sole onboarding surface that chooses and persists `preferred_runtime`.
+   sole onboarding surface that chooses and persists `preferred_runtime`, and
+   its Finish gate consumes the shared renderer's `onValidityChange` signal —
+   a harness selection alone does not complete onboarding when the harness
+   requires provider/model/credential config (e.g. buzz-agent with no
+   provider). Baked build env and runtime-file config satisfy the gate.
    `onboarding-agent-defaults.spec.ts` is the acceptance gate for anything
    touching this flow or the shared renderer.
 8. **Omit the Model control only after a confirmed successful empty
@@ -102,6 +106,14 @@ with a TypeScript lookup table or an id comparison in a component.
    Edit. In Edit,
    selecting Custom command keeps its required command field beside the harness
    picker rather than hiding it in Advanced.
+10. **Catalog visibility is community-scoped relay state, never a global
+    definition field.** `AgentDefinition.shared` is only the active
+    relay+owner projection returned to the UI. Durable heads and pending
+    publications live in the scoped retention database, and explicit share
+    toggles await relay acceptance before the UI claims that an agent was
+    published or removed. A queued update must stay visibly queued, and the
+    catalog itself must render only relay-confirmed publications — never an
+    optimistic local persona.
 
 ## The tests that enforce this
 
@@ -120,6 +132,8 @@ with a TypeScript lookup table or an id comparison in a component.
   acceptance coverage for readiness, failure states, defaults, navigation,
   successful-empty vs failed optional-model discovery, and persistence races.
 - Rust: `runtime_metadata_env_vars` tests pin spawn-time key application.
+- Rust: persona sharing/retention tests pin relay+owner scoping, durable
+  enqueue errors, relay rejection/unavailability, and accepted publication.
 
 ## Keep this file true
 
diff --git a/desktop/src/features/agents/activeAgentTurnsStore.test.mjs b/desktop/src/features/agents/activeAgentTurnsStore.test.mjs
index f182b7b5f7..d78d1d21af 100644
--- a/desktop/src/features/agents/activeAgentTurnsStore.test.mjs
+++ b/desktop/src/features/agents/activeAgentTurnsStore.test.mjs
@@ -154,25 +154,91 @@ describe("activeAgentTurnsStore", () => {
   });
 
   describe("eviction at MAX_TURNS_PER_AGENT", () => {
-    it("evicts oldest turn when exceeding 4 concurrent turns", () => {
+    // Mirrors the store's private cap: the harness's hard upper bound on
+    // parallel agent subprocesses (`--agents` accepts 1..=32).
+    const CAP = 32;
+    /** Desktop's former default harness parallelism; still a legitimate
+     * per-agent turn count (any value up to the harness cap of 32 is valid,
+     * regardless of DEFAULT_AGENT_PARALLELISM). */
+    const DEFAULT_PARALLELISM = 24;
+    const EPOCH = Date.parse("2024-01-01T00:00:00Z");
+    const at = (ms) => new Date(EPOCH + ms).toISOString();
+
+    /** One turn_started per channel, minute apart so start order is unambiguous. */
+    function startTurns(count, firstSeq = 1) {
       const events = [];
-      for (let i = 1; i <= 5; i++) {
+      for (let i = 1; i <= count; i++) {
         events.push(
           makeEvent({
-            seq: i,
+            seq: firstSeq + i - 1,
             turnId: `t${i}`,
             channelId: `c${i}`,
-            timestamp: `2024-01-01T00:0${i}:00Z`,
+            timestamp: at(i * 60_000),
           }),
         );
       }
-      syncAgentTurnsFromEvents(AGENT, events);
+      return events;
+    }
+
+    it("evicts oldest turn when exceeding the cap", () => {
+      syncAgentTurnsFromEvents(AGENT, startTurns(CAP + 1));
       const channels = channelIdsOf(getActiveTurnsForAgent(AGENT));
-      // Should have evicted c1 (oldest) to make room for c5
-      assert.equal(channels.size, 4);
+      // c1 (oldest) evicted to make room for the 33rd turn.
+      assert.equal(channels.size, CAP);
       assert.ok(!channels.has("c1"), "oldest turn should be evicted");
       assert.ok(channels.has("c2"));
-      assert.ok(channels.has("c5"));
+      assert.ok(channels.has(`c${CAP + 1}`));
+    });
+
+    it("tracks every turn of a high-parallelism agent working in 24 channels", () => {
+      // Parallelism up to the harness cap (32) is user-configurable, so a
+      // single agent can legitimately run 24 concurrent turns. Every one
+      // must keep its working badge.
+      syncAgentTurnsFromEvents(AGENT, startTurns(DEFAULT_PARALLELISM));
+      const channels = channelIdsOf(getActiveTurnsForAgent(AGENT));
+      assert.equal(
+        channels.size,
+        DEFAULT_PARALLELISM,
+        "all 24 concurrently-worked channels must be tracked",
+      );
+      for (let i = 1; i <= DEFAULT_PARALLELISM; i++) {
+        assert.ok(channels.has(`c${i}`), `c${i} must be tracked`);
+      }
+    });
+
+    it("keeps the tracked channel set stable as liveness arrives for every turn", () => {
+      // The flicker: with the cap below real parallelism, turns above it are
+      // evicted while still alive, and their 10s turn_liveness frames land on
+      // resurrectTurn — which evicts one of the survivors to make room. The set
+      // then rotates forever. Under a cap at the harness maximum, liveness for
+      // any live turn is a plain refresh and the set never moves.
+      const TURNS = 6;
+      syncAgentTurnsFromEvents(AGENT, startTurns(TURNS));
+      const expected = channelIdsOf(getActiveTurnsForAgent(AGENT));
+
+      // Liveness for the two earliest-started turns — the first to be evicted
+      // under the old cap, hence the first to trigger a resurrection swap.
+      for (const [i, turnId] of ["t1", "t2"].entries()) {
+        syncAgentTurnsFromEvents(AGENT, [
+          makeEvent({
+            seq: TURNS + i + 1,
+            kind: "turn_liveness",
+            turnId,
+            channelId: turnId.replace("t", "c"),
+            timestamp: at((TURNS + i + 1) * 60_000),
+          }),
+        ]);
+        assert.deepEqual(
+          [...channelIdsOf(getActiveTurnsForAgent(AGENT))].sort(),
+          [...expected].sort(),
+          `liveness for ${turnId} must not change the tracked channel set`,
+        );
+      }
+      assert.equal(
+        expected.size,
+        TURNS,
+        "all six live turns must be tracked, not a rotating subset",
+      );
     });
   });
 
@@ -1343,16 +1409,17 @@ describe("activeAgentTurnsStore", () => {
     });
 
     it("evicts the oldest tombstone once past the cap so the map stays bounded", () => {
-      // The tombstone map is capped at MAX_TERMINAL_TOMBSTONES (16). Complete
-      // 18 distinct turns so eviction fires twice, dropping the two oldest by
-      // insertion order (t0, t1). Probe via the ONE behavior a tombstone gates
-      // that a strictly-newer frame cannot mask: an EQUAL-timestamp liveness
-      // (frameAt == terminalAt). All completions share timestamp T with rising
-      // seq, so the probe clears the per-agent watermark on the seq tiebreak
-      // (compareObserverEvents is timestamp-primary, seq-secondary) yet stays
-      // equal to the recorded terminal — reaching resurrectTurn's tombstone
-      // check rather than being shadowed by the watermark.
-      const CAP = 16;
+      // The tombstone map is capped at MAX_TERMINAL_TOMBSTONES (MAX_TURNS_PER_AGENT
+      // * 4 = 128). Complete 130 distinct turns so eviction fires twice, dropping
+      // the two oldest by insertion order (t0, t1). Probe via the ONE behavior a
+      // tombstone gates that a strictly-newer frame cannot mask: an
+      // EQUAL-timestamp liveness (frameAt == terminalAt). All completions share
+      // timestamp T with rising seq, so the probe clears the per-agent watermark
+      // on the seq tiebreak (compareObserverEvents is timestamp-primary,
+      // seq-secondary) yet stays equal to the recorded terminal — reaching
+      // resurrectTurn's tombstone check rather than being shadowed by the
+      // watermark.
+      const CAP = 128;
       const TOTAL = CAP + 2;
       const T = at(0);
       const completions = [];
diff --git a/desktop/src/features/agents/activeAgentTurnsStore.ts b/desktop/src/features/agents/activeAgentTurnsStore.ts
index b281929503..3af41ae078 100644
--- a/desktop/src/features/agents/activeAgentTurnsStore.ts
+++ b/desktop/src/features/agents/activeAgentTurnsStore.ts
@@ -23,8 +23,12 @@ const REMOVE_AFTER_MS = LIVENESS_INTERVAL_MS * 2.5;
 const FRAME_GAP_PAUSE_MS = LIVENESS_INTERVAL_MS * 2;
 /** A silent agent is treated as dead after this bounded prune pause. */
 const PRUNE_PAUSE_MAX_MS = 3 * 60_000;
-/** Maximum concurrent active turns tracked per agent (matches pool size). */
-const MAX_TURNS_PER_AGENT = 4;
+/** Maximum concurrent active turns tracked per agent. Purely an unbounded-growth
+ * guard, so it sits at the harness's hard upper bound for parallel agent
+ * subprocesses (`--agents` / `BUZZ_ACP_AGENTS` accepts `1..=32`) rather than the
+ * Desktop default of 24 — any lower value silently evicts a live turn, dropping
+ * its working badge. */
+const MAX_TURNS_PER_AGENT = 32;
 /** Cap on per-agent terminal tombstones (A's resurrection guard). Only the
  * most recently completed turns can be raced by a late liveness frame; older
  * ones are already below the watermark, so a small multiple of the live cap is
diff --git a/desktop/src/features/agents/assets/agent-outline.svg b/desktop/src/features/agents/assets/agent-outline.svg
new file mode 100644
index 0000000000..b89f4c61c9
--- /dev/null
+++ b/desktop/src/features/agents/assets/agent-outline.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 360">
+  <defs>
+    <filter id="white-to-mask" color-interpolation-filters="sRGB">
+      <feComponentTransfer>
+        <feFuncR type="linear" slope="-6.7" intercept="6.7"/>
+        <feFuncG type="linear" slope="-6.7" intercept="6.7"/>
+        <feFuncB type="linear" slope="-6.7" intercept="6.7"/>
+      </feComponentTransfer>
+    </filter>
+    <mask id="agent-shape" maskUnits="userSpaceOnUse" x="0" y="0" width="360" height="360" style="mask-type:luminance">
+      <image width="360" height="360" filter="url(#white-to-mask)" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAAFoCAYAAAB65WHVAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAARGVYSWZNTQAqAAAACAABh2kABAAAAAEAAAAaAAAAAAADoAEAAwAAAAEAAQAAoAIABAAAAAEAAAFooAMABAAAAAEAAAFoAAAAAFtdPlUAAAGdaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA2LjAuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjUxMjwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWURpbWVuc2lvbj41MTI8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KuC9IVwAAMDdJREFUeAHtnQvXmzYWRb88mlc7//9/TtLm1Xam2zMnUYiNsS1AEltrEYEA6WpfcbgIPufZf/5JTyYJSEACEmiOwPPmLNIgCUhAAhI4EVCgHQgSkIAEGiWgQDfqGM2SgAQkoEA7BiQgAQk0SuBlo3Zp1gMEpu99nz179kBtnnorgfAnz3rqwBdZUmYugUsEFOhLZDosjyD8/fffTyzPnz8/LemKQh0S6+b4Af5fvnw5LaxThj9evXp1Wl6+fHkS6nUtsfbeCSjQvXvw//ZHnL9+/fr08ePHpz///PPpxYsXTwjB69evT7kCvb6z8QPs8QELIo1Ak+CPL969e/f09u1bfbK+O7pvQYHu3oX/6wDC8Pnz56c//vjj6cOHD09//fXXSRAQaASBBXHw8Xo9h0ec4f/777//IM5pFfFmwQ/4hKjaG2fomE8JKNBTIh1uIwwI8qdPn04CTRRNGYly1hEBxJrFVJ9AfJCbZCLn+CEtZuoDH7GOQJskcImAo+MSmY7Kc9HnkRpRyJJ9RNYsKe+oe92Yiji/f//+9CSTG+PUePjjE6JocpME5ggYTs3R6WQfFz0R2aWLHiFAPPKSiqkOko/WdRwMf55emNbgJok4X0v4hPNMEpgjYAQ9R6ejfVzsueCTl+YjCDx2E0UvEZDyXNcvE4B1boCINOtLkjfHJZQ8RoEeZAxcu+AREiJsRCTzo4N0fdduwJWnF7hmXnmJQTzNOP+8hNSxj1GgB/A/4rzkgkdMEGcewxFrtk33E4BfmC4VZ3zFi9pffvlFgb4f/WHOVKAHcTXfPCPSc5E0YpKpDgW6juPhmfn/JTXiI/5YJQI9568l9XnM2AQU6AH8y0WfP0q5dsFHoHkkv/SlwQBINukCNzxudJkyYnsu4RuEme+fEelrvpqry33HIKBAD+LnPDYjAHMXfkSl/CRvEASbd4Mb3C1zz/jmt99+Owk0/prz0+adscEmCSjQTbrlNqO40FkQgCV/iBKRJvJzquM21jkahgh0GKb8Up6pDT5x5GnHJIElBBToJZQ6OCYCzaMzYjCXIi58G838qel2ArnJ5eUg25dSfMPvb8Q/lJkkcI3A/JV87Wz3N0OAC57oGQFY8vjMXDQCnfnTZjrSgSGIcebylzyBEDETOSPQrCvOHTi5ERMV6EYc8agZXPREzojz0mkOHtFv+QLhURtHOj9fb5BfS0w9IdBLbpzX6nL/sQgo0AP5G5HO1xxLupUomhddc4/oS+o60jGwyvwz+Rw7bppEziysGz0faaQ83lcF+nGGTdWACFz7kiMG5zHdT+5CZFnOtMYSZogxU05Ez/gE35gkcAsBR8wttDo4FhEgil4arRH9ITgspusEptHztTMQaMX5GiX3XyKgQF8i02E5ERsLgrB0vjOCw1z03KN6hzhWMTk3tCUvV/NycMk7gVWMtdLuCSjQ3bvwxw4g0AjC0jnPCDSCw7oi/SPP6RZPGvn2eY4VTzBEzyxLn2ambbktAQV6wDFA5IYwLI2imYtGeJZ8kTAgrpu6BKd8+3zpxDzJ3OKDS3VZfmwCCvRg/kcciNh4McWCWF9LCDOis+Sx/VpdI+8nYubbcZa5mxk+QJzzad3ITOzbugQU6HX57lY789C//vrrSSgQjGsJgc7/BjL36H6tnlH3wyQ3smuf1vHkwg8ivXnzxumNUQfERv1SoDcCvWUzecRGpJd8QRDxcZpj3kvcxJZMb2SKacnTy3yL7j06AQV60BGASCMQecy+FkUnOsw0h1H094EBC5bMP8+x8eXgd26uPU5AgX6cYZM1IMilWFwTaDqBAPEHGOSmHwks+cvB3BSZ2lj6gvbHVtySwI8EFOgfeQy1FcFALBDruURUiAjxCE9u+k5gafQMb1gzrcQ6i0kCjxCYv2ofqdlzdycQgeaLgojGnFGZ5rg2zzpXx4j7lgp05p6XsB6Rk32qT0CBrs+0qRoRaQRjqWgg0nxGxjTH3FxrU51c0Zg8WTA3z41rjgnRs19urOiMA1atQA/u9ETRRHfXpjlAgUAv+Uu5wbF9614E+toNK5yde/6GzpUKBBToChBbr+KWR28EGjFCpI8+F404s8CCBTaXEsLsXw5eomP5vQQU6HvJdXIekR2Rc/6ykO1rCWHO/7Zy7djR98MCcZ6b3oApU0gINDfDJYxH52b/6hBQoOtwbLoWBAPhQESWTnMgSBGluXnXpjv+oHHl9AbR8xwH+CrODwL39J8IKNA/IRmvIAK99GsOhAhxJnI86jfREWe+C+dpYk6c4csUh/PP4107e/dIgd7bAxu1HxFhqmNpFI1AR5zmBGqjLmzaDBEzNyl+nyRPEucMyM2PpxMiaJMEahJQoGvSbLwuhDnTHAjLXEKQ87Jw7uXYXB297kv0vPRzw3J64xrXXplo9z4EFOh9uO/SagSaqY5rUXREiiiaF2VHiaDpJwtRM9Mb5HMJQeam5/TGHCX33UtAgb6XXGfnISQRaKY5ljyOI1RE0XOP+J1hWGRu2e9rTw9h6gvCRWg96EYCCvSNwHo/HEEh2rsWQdNPhAqBOlIETb/T52vinJue4gw10xoEXq5RqXW2SyARXx7JEeG5hDgTQSNW146dq+favhbmbukfS54arvUZm+FY3vBSx9L+ttDva7a6fz8CCvR+7G9u+dzFTxlp6YXOcXmphVgjwJcSdbOfl2UsnLu0nXM2xdayvVvqK897ZJ02z9lCGeL8xx9/nOaf59ik/TDiJgZPtllKcWeblL5yXLlQniX1mksAAgp0B+OgvOgRkFzwKT/XhfKCjzCQc84tL/5y/IcPH07nRYRS57TtaXm5HbvLc7I/efZNt1NOnnrKY1KW49hX7i/Xc8z0HEQVNkt/E5vzEebff//92w2MMpYIdLZpMzaQE3Xn5SJ5+XVNjoud5scl8OyfATT/jHtcNk30PBc7ooF4RFwxrrz42ebCpiwX+KU8j/Cl2HP+pUQ9CPOSF4tp81Jdl8qvncf+W4dqWWe5Hhum9bFN1MzC+nR/zitz6i0X9uXcufMTQcMUcc6f4ucF7jl7y3ZdPwYBBbphP3OBI6JEaESwmQsmOku6JALnLvCURUBSh/m+BPBLImr+o18WRDv+2tc6W9+TgFMce9KfaRsRJZIjYs6c6C3Cek64z5XNmOCujQjgF27E+BtRRpyJrImyFemNnNBoMwp0g47hguVi5c+M379/fxLoMmpu0GRNepAAPmfhZhxh9sf/H4Q6wOl+B92gE7lQiZyZ2mDuWXFu0EkrmYTv8Tk3Z6Jq07EJKNCN+T+RFPPNmXNuzETNWZkAN+RMeTAeTMcloEA36HumNyLQXqANOmhlkxBoxgAirf9Xht149Qp0Yw7iguTizOd0XqCNOWgjcxgDLPjfMbAR9AabUaAbdAoXpvPODTpmI5Miysk3atZmGiSgQDfkFC7IzD/6eNuQY3Yyxch5J/ANNatAN+QMTIlAE0WbjkuAcWAEfVz/p+d+Bx0SC/K5iKbWHxRwYebiXGCShwxKIE9Tc2Nu0K7brYLAoQX63OA/VwYvyrMvOeUIc8R5mrM/KfuyfSlPO2Ubl461fGwC5VhYOn4gcm3sXNu/pK0lx4ztnW16N7RAnxuIKSNPtJoc5KyT2F8uiWqTs49BypK//Cp/AId1/lx3eky2T41M/inbm+xy82AEGAtLXxZzLCnjh/WM6XK8lvuzTs6YTMpYZjtjdZrnmPK8cj11nSvLPvNlBLoXaAbYNJWDL+scw2AlUZbBT1nWKc8xHFcO7nK9rJNBmAEbUSbPj7izniW/r5CcNqaDOLawz3RcAoy3LBlvGStsJ2XM5tgyz1jKMTmPvFxSL3m50Ea5nXGcvNx3aT11lDnrpmUEuhDoDKyyS+UAK9cZoAzMDM7k5cAt13MudZ9rZ668tIcBmpT1ctAyqBFt/sNWfmOBPEKd42nfvyALxWPnjIWM44xL8iwZ5+T8Zwp8N5+xk/GdYyGZOqbr5yhnPGZftpMzllkvhTrreWokL5fsTx3TPG2Z/0igWYHOgGKwZaCVAy+Dl7JyYLJenpN6kqf70+2U35uX9ZXr1JfByF8H8jsL/CAOv/sbsUa4GczYnj9QudcOzxuHQMY2OQJHzhhijCDKjJcsGfP0fjr+biUyPX+6zbVHyrgu608Z9rJOzq/zsTDOs0Swc1zOS17WeeT1pgQ6AyGDjW0GIIMyA5Gc8jIyxoGcQ0od0/XTzp3+iU3kDMCIMBcZfUtETd9y4e1kqs02RCCCzBjJuOFHlLjJU8Y1UI6trU1P22W7KUvOPmyNEBOIINIR7TxJUk4fy6Ws96jru/9gfxxJzoA7J8ilGHPcVIxTR09OzEBkYGaQ0i8uvvLC66lP2lqXAGOEJ613796dBI2xkZs6Y6W3cZ8xPxVrthFtroNE2jmGc0jJ6xJuv7bdBJrBxRJRZvBlHg2RjihnECZvH+ntFjL4GJCkHi+823vsGUsJMC64iZNzTYx28y5Fmz4i1PQ3Qh3RZl+OPZJYbyrQEWVEiAUhZkGYW3lsW3rh1D4ug27kG1FtZkepL2OD/o48PkoBzlw1Ap3/pxHhprwU69HHwOoCHVEm5+7PfBRLRBmBTtQ48uAbfSDZPwnUJpAbE4KcqcC3b9+epkIi4Owj5djaNuxd32oCHWEuRZkomYWyiDIAFOa9h4HtS6BtAhHgRNFMgfCf606nQNruxe3WrSLQCG6mMHipwWdlmV+OMCvKtzvLMyRwdAKZBiFyRqSJqPkKqvz/GyPmI7Cq/pldxDn/EzXCzJKXGwrzCMPGPkhgHwLoRxaCPXQFfWHaFLFGtDNHvY+FdVutFkFHmAHGf3b64cOHEzQj5roOszYJSOA7gUTUzEnzMpFIOp8lZt/3o/tbqxJBR5z5iL6c0og494dFiyUggR4IJJomgkZv8tFBXiYyZ93zlMfDAh1xRpiJmnkJGEg9OFgbJSCB/gmgQ9GdTH0QSSPUPU95PCTQQGFKA3H+97///UQEnbnm/l1uDyQggd4IIM5550VOYtqj10j6of/yCoEmYmbOWXHubShrrwTGJFAGju/fv/8m2JT3lu6OoHOn4msNxJntHgH05jDtlYAErhNAi9AkAkimODLd0VskfZdA03Em5ZnWIHpmWoMykwQkIIFWCCDSzEujUeQkhLqnOembpzjS6UTOinMrw1E7JCCBKQH0Ku/JEOr8JTPlPaSbI2g6RvTMtAZ3pV462oMztFECEqhPICKNZhE9k/i6o4fP724S6LKjvCF13rn+YLJGCUigPgG0i4CSJ38iaoSaP2yJYNdvsU6NNwk0TdJJPqujk0bPdZxgLRKQwPoEItK0hFDz14eklkX6pjloIub83bsvBU++9R8JSKAjAuhWImnmo1ufBVgs0JneyEfgHflEUyUgAQl8I4Aol3/53HKwuVig6R3TGgg0Yu30xjd/uyIBCXRGAP1CpFufrl0s0HSIRwMWxbmz0ai5EpDADwTQsAScLWvaYoGOOPty8Ac/uyEBCXRKIFMdRNGtzkUvFmiEOT/p16k/NFsCEpDANwJE0QgzwWer89CLBDqPA0bP33zrigQkMACBCHSr0xyLBTpTHM4/DzAq7YIEJHAigJ4xM9Bq8HlVoOkACwJNJ0wSkIAERiJAFB2Bbi0AvSrQOCIdaHWeZqTBYl8kIIHtCCDIiHOrAegigaYTiLMCvd3AsSUJSGAbAuga0xwsraVFAq04t+Y27ZGABGoSIIpGoLud4kCkWzO+poOsSwISOC6BVoPQqxE0osz8DB0wSUACEhiNQDmF21oQOivQMZbw3wh6tGFpfyQggRCISGe7lXxWoDESw/MJSitGa4cEJCCBmgTQuQSkNet9tK5FAm30/Chmz5eABFomkEC0Na1bJNAt3lladra2SUACfRFA4xBnlpbSVYGOsYp0SJhLQAKjEYhAM53bUroq0DG8JaO1RQISkEBtAkTPrX0LfVWgWwz7azvG+iQggWMTIBBtMRidFegYnfzYLrT3EpDA6ARa+2JtVqBHd4b9k4AEJBAC3UXQGG70HPeZS0ACIxOIQLekeRcjaIwktWTsyIPDvklAAvsSQOvyV9P7WvK99YsCzSEYzEvCiPX301yTgAQkMBaBZ8+enTrUUlA6K9Bj4bc3EpCABOYJvHjx4un58+dPEev5o9ffe1GgMbAVI9fHYAsSkMDRCaB3L1++PAl0KywuCnQMVKhDwlwCEhiZAFqX6LmV4PSqQGOwSQISkMARCLQizGF9VX1zV8kJ5hKQgARGJJCvOHxJOKJ37ZMEJNA9gda+WrsaQXdP3A5IQAISWECgjKAXHL7JIVcFmimO1uZlNiFjIxKQwKEIIND8/6st/R7HVYE+lIfsrAQkcGgCiHNLPzk6K9CJnpMf2nN2XgISGJpAXg4yD01ie+80K9B7G2f7EpCABLYkgCi39KJwkUA7B73lELEtCUhgLwIIdFdz0IrzXkPFdiUgga0JGEFvTdz2JCABCdxAIFMcXcxBG0Hf4FkPlYAEuieAMLcgzoBcPAetUHc/7uyABCTQGYGrAo0wK86deVVzJSCBuwkYQd+NzhMlIAEJrEcg4px8vZaW1bwogvYnR5fB9CgJSEACNQlcFWgac5qjJnLrkoAEJLCMwFWBVpyXgfQoCUhgHAKtvHe7KtAgV6THGXj2RAISuE6gq8/srnfHIyQgAQlIoDYBI+jaRK1PAhLomgB/SZjf49g7kl4s0BBvZV6ma+9rvAQk0DQBRDl/7r23obMCrSDv7R7bl4AEtiQQce5CoBPe+5JwyyFiWxKQwN4EWhHol3MgjKDn6LhPAhKQwLoEZqc40rRCHRLmEpCABLYjsFigFentnGJLEpCABCCwSKA5UIGGgkkCEjgCgVb0bpFAx9jkR3CQfZSABI5HIBpHnvU9KSwSaH7NjqUFg/eEZdsSkMD4BNC6Fy9eNKF3CvT4480eSkACNxCIQJPvnRZZgKEvX7483VX2Ntj2JSABCaxFgFmCaF0L0xw3C7TTHGsNDeuVgAT2JoC+Mb1BUNqC1l0V6BiJ0SwmCUhAAhLYhsBVgcaM1u4q26CxFQlIQAL7Elgk0JgYkU5Eva/Zti4BCUhgHQL5DaJ1ar+t1kUCHXFuaW7mtm56tAQkIIHlBBDpFoR6kUDTLUSaifMWPj1ZjtkjJSABCSwnEGFuQZyxerFAI8yJoJd31yMlIAEJ9EMgU7jJ97Z8sUBjcKLoVozfG57tS0ACYxFA2/gOupvP7Er8TnGUNFyXgARGIpAgNALdQt9uiqAzzWEE3YLrtEECEqhNAHH+5ZdfTrMFLejcYoEGBAYn9G/B+NrOsT4JSOC4BNC2V69eNfUHeYsFOuLM3cW/KDzuILbnEhiRQPTt9evXpznoVgLQxQKNU7jD8AjQ0hzNiIPFPklAAvsQaG2G4CaBBlk+tWvlDrOPG21VAhKQwPoEbhJoRDmPAgr0+s6xBQlIYFsCrfyBSnp9k0BzUinQinQwmktAAhKoT+AmgUaQWTLNUd8ca5SABCSwDwHmn1laSjdbQwf4koMXhUbQLblSWyQggXsJoGsEnvkG+t56ap93t0C39jlKbTDWJwEJHIMAgSYBJ5rWvUDjMjrDB91G0ccYwPZSAqMTaDF6hvnNETR3Gx4HEOj81Y1THaMPX/sngXEJlHrWmpbdLNC4qXwk4M7TWqfGHUr2TAISqEkA7cp7NaY3Wkt3CzQd82Vha+7UHglI4FYCCHSW1oLNuwQaABFo56JvHQ4eLwEJtEQg4tySTbHlboGmAqY3ePPJ0tqdJx00l4AEJDBHAO3KMnfcHvvuFuh0iGkOFuei93CfbUpAAiMTuFugA6X85C5l5hKQgAR6IJBAk7zF9JBA06m8AWWag/VWO9oifG2SgAT2JzDsHDRoEWSmN3xZuP9A0wIJSOB2AgksWwwuH4qgQRGBzstC56JvHyCeIQEJbE8A7Ur0TN5iqmIVHSWCfvfu3dPbt2/9E/AWPa1NEpDADwQi0LxHa1WgX/5g8Z0b6ShR9N9///309evXp7/++uuptR+/vrN7niYBCQxIAN3KV2hDC3R8l++iEeg///zzJNCKdOiYS0ACrRBAnKfvzihrLVWJoOlUOkzONMeXL19OAm0k3ZrLtUcCEkCniJ7fvHlzylsUZ7xUZQ66dDePCsxH03FyXxqWdFyXgAT2JoAYR6cQ6VanN+BULYKmMjrOlAaT7rwwZJvl8+fPp7lp5qdNEpCABPYiEE1K9IxWtZyqWxcA+cOVRNBMeTgv3fJQ0DYJjE0AbUKPEOfffvvtNBUbfWq159UFOh0FBiCSAPHp06fTFx6U+fIwZMwlIIEtCKBJTLvyjown/JanNsJjVYGmER4hEk0D5OPHj6dImukOpzziBnMJSGAtAghz5pwR5vLFIPtaTs/+iWT/s6aBVM+S76MRaCJppzzWpG7dEpAABBBggsRMayDQbPcQPWP/ahE0lZMANF2Aw4JQ8xke4r3yfeJ/xvivBCRwGAIRZ6Y0iJojzpT3klYX6IAACqLMnSzr5Imk8720Qh1i5hKQwD0E0JVoDMLMC0HmnnuKnNPv1ac40lDyCDBRM5/fIdDJ+cqDchZSjs255hKQgATmCESYEWTeff3rX//69j8+sa+3tFkEHTCBRDQNQO5qWRBqIukINQKdJeebS0ACEpgSQFdKcc7LQIQ6+6bn9LC9uUAHSmAGHp/hIdQINFF1fnAp89OlUBtZh6K5BI5NIPpBwJdAjzlnFqZTKeeYXtPmUxznQEV8M71BBJ0fXCqFunyhGJFOTr3l+rl2LJOABMYgEGEmsGPJT0sgykTNlOWYnnvchEADMOJKzoJYI8iZ8sh68oh5jp/mcQrlJglIoH8CiYQjvETMTJOyINBsEzH3HjWXnmpGoEujSlEthTjinDz7knMe61OxLrfTTtlGypLP7csx5hKQwPoEIsbkCC+RcUSYSBlhRqATMWNRhHx969ZvoUmBLrs9FcuILUJMYrsU6GwnR8yzP+LNeeV66kx92U5OeRJlW6UMtC3b3KpvtiOBSwRKUUZ4mbYgOk5OWbnk+Ev19VzevECXcC8JVcqTcw7rWSLGyVNOPi1jOwvinmOnx1Gedk4rFf/JgMujGvPwJgmMSiCBSMY9eV74JUpmG1HONQGL8rxR2ez2Fcc9QOOQS+ee2z8V0rntUowj0snZl6mVfAYY0caeS/VesnVaHtvJGYQZoBxHe6l/ep7bEuiBQMY3tmadPEumLRIZEy1n4Vo4J8w99PtRG7sS6EudjcPP7Z/bd070UkY+XUeQEWkEkyXTJxwXIS+j7px/zi7KStsyUBmgDMy89CB65vdLqNckgV4IZGxnXJNHhJMnIi63I9DlvtTVS99r2jmEQN8L5JzjKUNYz+2jvBTjRNApQ0TLJcdj37Q+BmXKWWc/OQOTiAGRzjmUK9AnXIf+J+MBCIyt1lLsIy8FNmOaPOXlMayX1wD9KutqrZ9b2nNogb4EOoNjup9yLgwGU5lysZRRNIJ6SaCpp1wyOCnLeuovB3TayT7zYxHgps34YBxkmm2PMcE4LVPGMrZFhDNFx3bW2V+O79STPHVOt1N+xFyBvtHr5wZPysgZkFxIj6TUh+CTGNSmYxNgTORX2RgXTHvlpxHKQKAGpYy/1MV2FsqyTh7RJWfc81IvT4ARY46bpnNl02Pc3uDnRo8EuRx0XDRz20u5lHUsPcfjxiPAOEAAeTfBeiJVRJr3FBHpeyLqjLEIauhRnrZKIT63HnsQ55xX1pN189sIGEHfxmvx0Rn0OWG6nfK5POcknzvWfeMTYBwgjoghQp2nNUQ6Ux6ZZotQJ4dOOY5Yz3YEF3FlPfvI2aactlI+PSblZT6+N7bpoQK9Dee7W8mgv7sCTxyGQMYCOdE0wsmUAlMf+aqIPGKNOCPYEWnOixgjuCTKWKeuCHTK014E+XTC/885t54y83oEFOh6LK1JApsRQDxJEdaIcb4iijCnnGMjtBHp1JHt7OfYSynnXNpveV0CCnRdntVr84KojrTLChkH07Ew3SYSTmRMJxM5J6fsXD2Uk6b1/a/Uf/ckoEDvSX9h2144C0Ed4LBLY+Fcecoi0Nk+AKZhuqhAN+5KLioePU3HJsA4uFdg7z3v2MTb6L1Xfht+mLXCC2wWjzslMCwBBXpY19qxkQg8EkGPxOFofVGgO/C4F2cHTlrRxPjfJ6kVITdatQLdqGNiVi7ObJsfk0DE2fFwLP8r0B34OxdnB6Zq4ooEHAcrwm20agW6UceUZnlhljSOue4YOKbfFehj+t1ed0YAgVakO3NaBXMV6AoQ167CC3Ntwu3Xnz82ad9SLaxJQIGuSdO6JLASAQRakV4JbsPVKtANOwfTfLRt3EGaJ4EVCSjQK8K1agnUIuA0Vy2SfdWjQHfgLy/ODpy0gYmOgw0gN9aEAt2YQ0pzvCBLGq5L4HgEFOgOfK5Qd+CklU10DKwMuNHqFehGHVOa5cVZ0jjmOmMgyzEJHLPXCvQx/W6vOyKgMHfkrMqmKtCVga5VnVH0WmT7qFeR7sNPta1UoGsTtT4JSEAClQgo0JVArlmN0fOadPuo2zHQh59qW6lA1yZqfRKQgAQqEVCgK4Fcqxojp7XIWq8E2iegQLfvIy2UgJ/YHXQMKNAdON4ougMnaaIEViCgQK8AtXaVCHSW2nVbnwQk0C4BBbpd3/xgmVH0DzjckMAhCCjQHbjZ6LkDJ61soj/WvzLgRqtXoBt1TGnW8+fPneIogbgugYMQUKAbd3SiZ0TaJAEJHIuAV/2x/G1vOybgNEfHzrvTdAX6TnBbnuYLwi1p25YE2iGgQLfji4uWGDldRHOYHY6Bw7j6h44q0D/gaHfDC7Rd32xhGf53DGxBuq02FOi2/HHWmr///tuL8yyZYxSW4qxIH8Pn6aUCHRKN5lyQCLQi3aiDNjIrY2Cj5mymEQIKdCOOuGRGBNrI6RKhY5Tj/4yB5Mfo+bF7qUB34P9Ez16YHThrJRPj++QrNWO1jRFQoBtzSGlOLsbk5T7Xj0fAcXA8nyvQx/O5Pe6QAOKsQHfouAdNVqAfBLjF6V6YW1C2DQm0R0CBbs8nP1nkXxL+hMQCCRyCgALdgZsV6A6ctKKJ5fSGT1Mrgm6wagW6QafEpAizPzcaIuYSOBYBBbpxfyPSL168ePLnRht31IrmMQbKZcWmrLoxAgp0Yw6ZmhOBfvnypSI9hXOg7dykGQ+m4xBQoDvwNdGzAt2Bo1YyEVHG/4h0IumVmrLaxggo0I05ZGoOFyQC/fr1628X6PQYt8clgP8R5vh/3J7as3MEFOhzVBor4yLlAn316pUi3Zhv1jYH3xM943vfQ6xNu736Fej2fPKTRVykv/zyy9ObN2++XaiUmcYmEHHm5oz/2dbvY/t82ruX0wK32yPARclj7tu3b0/Gsf3ly5enP//80z//bc9dVSyKz7kpv3v37hRFK85V0HZViQLdibt4vC2jqE+fPj2xfP369STS/gFDJ468YmaEmWkNIudff/319OSUF4RXTnf3YASe/XNh/2ewPg3dHX569K+//jpF0Aj0x48fTyJNGa7UnW25H8EtI9+sT/2U47gR86SUdw6+d2jLn1tbYwS9NfEH2+MC5mImoiLKIqpmuiNTHhFqhJy0pmhHbJI/2LVvQlbWFyEry8r1JW1eOz5t5H8tyfaSuueOwVf4CR/Fbzl+2gY25tjMOSdqvmZ/6jQfj4ARdMc+5SJHVJiLZqqDBYFmoazMp4LwaLcRjblvc2nvnLBM7eCYHBcRy3Z5bI5Lfsn+8hyOSV3JL50HR25ynz9/PnGb1nPpvEvltIcwEw2zRGzL48s2OJ7+l0zLY10/JgEj6I79nosaIcicJUJTijRTICyU1Uq0S3u8vCo//6I8aSo+lKcsOWWcUy6I1LmUunPsuWMoK+vOMeW5KStzzoEbU0asJy+PuXWdfuAXGPGiD4Fekq71b0kdHjMOAQW6c1/mgkZYEAVyhIE8X3kQGdYWaISZF1g8jseGEiXtkyKO2ZfybE+PmR5fHvfo+rm6Yw95RPrccfe0jSgnIr5047mnXs85DgEFehBfR1SSIziIA0vKanWV+qgXkb63fuyrbdc9/YsNiHPW76lneg79YzFJ4BEC558nH6nRc5sjUFN46Bz1Zbm3s7VtuteO6Xk17VKkp3TdvpWAAn0rsc6Oj+Akr2E+dfnIfp2kEfR1Rh4xT0CBnufT/V7EtLY4R6AV6cvDI9GzIn2ZkXuuE1CgrzPq8ojawlxCyMuvmsJf1r/XekS1VvupT5GuRfR49SjQg/ucKPfcN7j3dpv6+EqEZc2bwL32PXIeQsrLwlqprE+RrkX1WPUo0AP7GwFNtEv+aCrrQ6BHS7VFFLGnztr1jsbd/lwmoEBfZjPEHiJePoWrFUVTH8to0xu1nR1hrhmR17bR+tonoEC376OHLERIEWhEtUZCcLLUqK+lOmBV88ZjBN2Sd/u0pc5V22ffD2F1RKeG8BAV5vc9+CvF0VJNVrCBV0R6NFb2ZxsCCvQ2nIdpBcHJDzEN06n/dyTTN7X6lWmOWvVZz/EIKNCD+3yNKA6RJpIeSYASPWd+vcYTB0NrJEaDXypNdk+BbtIt9YyKQNd81C4Fup6l+9eUCLrWfD09ivDv3zst6JGAAt2j126wGYGuOSWRiLCm4N/QndUPrRU5Y6jivLq7hm9AgR7exU/VX1QhzqMKdM3hEIGuKfo17bOu9gko0O37qIqFRL61UjltUqvOluqpySoi3VL/tKUfAgp0P766y9KaYlMaQL1r1V22s+V6It3kNdquWVcNe6yjLwIKdF/+utlaRJTpiJqJl2j8ZWLNl2k17XukrpqCWrOuR/rkuf0SUKD79d1VyxPlJr96woIDEJ38byqjCnQtYc3NsfYNcoGbPGQQAgr0II681I3aL/MQL6JnfiwJga4lZpfs37KcvpTLo20j0Ple/NG6PP+YBBToQf2eqBmBri3SCPNo4swwqCnO1BcfkJskcA8BBfoeah2dE5GoZXIi5uS16m2lHvpVc+qm9s2xFU7asQ0BBXobzru1Ujt6S33Jd+tY5YZzw5nmtZoZjVctLtYzT0CBnufT/d4ITs2OZNqkZp171xUBJc+yt022LwEFeuAxEKGJ+NToKnXlJ0dHe3znT+K/fPny9PXr1yrfeGe6hHyNG2UNf1pH2wQU6Lb987B1a4g0wjzS1wlhRJ8Q55o3nhFfpj48KK1gMQEFejGqvg5EdNYQ0rXq3ZsurBI9s14jjfq1Sw021rGMgAK9jFNXRyGiJCJCllqCEwgR6bST8p5z+gIrpjlq9CvTGkbQPY+K/W1XoPf3wSoWREQRnRqCs4qRB6g0Qn2ArtrFFQgo0CtAbaFKRDm/A11ToBEc/pKw5n9E2wKvCGmtiDecav1v6i0w0obtCSjQ2zPfpEWmNbLUFmj+zPv169fD/TUholoz5QelIv4167auYxBQoAf2MwJdU5xBRYSZCLq2oO3tippCmrpGY7S3j47WvgI9qMcR5triHNFBoFlGSvSt1lcX4ZR8JE72ZVsCCvS2vDdrDXHOFMdmjXbaUIS0fDKgzCSBvQko0Ht7YMX2a0fQmLpGZL4igpuqzpMBkbRJAi0QcCS24IUObVhD/PfEkCi61lcc8DEK39OjY7StQI/hx596gTjUEptUPpoop19lvsa0kEJdEnb9FgIK9C20Oju2tkAnykzeGY6L5mbaJn91me2LJ9ywQ3G+AZaH/kRAgf4JyRgFCENtgYYMdTJXSz5SQpT5oaT8WFKtvtUU+1o2WU8/BMa6yvrhvrqliXJrR3AI82jijDOY2iCCrvmn8YizSQKPEFCgH6HX8LllBF1bpBvu9t2mJdKtIaqpI3XebZQnHp6AAn34IXAbACJMfuODiHO0VFNQqauMyCPaozGzP+sSUKDX5btb7UTNteeKIzr53eSagrYbqP83TF+46dQU0tzMMm1Ss+69edn+NgQU6G0479IKIp2llgGIGC/SPn/+PEwUnRtNTQGlLljlZhaRruUH6zkGgZfH6OYxe1lTcEKQOpni+PTp09ObN2++vTDsdZ47jMjLJf19JEeg4QQbBJpfAOSXAGvfNB+x0XPbJqBAt+2fJq1LZIj4MI2C6PSeIs70AwGNcN/br9SXz/bIubFxU3v16tXpxjbi1zD38vK88wQU6PNchihdK1JDfIgIeXwnKuTH+2mr10R/uOlEVMlrpdRLzpKpDrit5Z9atlvP/gQU6P19sIoFXPxEaGuJAGLDPDTinCg6Ip18lY5VrDSCTF8S4Vas/ltVuQHAC4Gmrbdv3z69e/fOKY9vlFw5R0CBPkel8zIEsmYUeA5HRO33338/tYXgMNUx/XKkdbFGMD9+/HiaK2YKYi1uuRkgzrRJW+SINFMecGud1blxYNm6BBTodfnuUnvEAAFASNcSnYj0H3/8cWoHgc6S/7OQtlsUnjBCMIlsma6B11qsMhCoH260lxspZaVIt8gr9ptvS0CB3pb36q1FABAdIkMEaC3Rod6IGhEhUSDCjNiwINbka0613AMUu1lgw4tOFuzfKqX9THnQNk8g4WY0vZUn2m/n2T+Dpd4bkfb7O6yFuJHIDMGMOEegKV87JeojR2BYEOhff/319OVCXiTmuLXtuVR/hjuciPzfv39/4pUbzaXz1ioPr9zYfvvtt5NY56a2VrvW2wcBI+g+/DRrZcQ5ESHzwjxCE5lFkGYrqLAz7ZCz0Hai0ojQ3uKcbmJfpjbIuYHF/hyzVU673Bxyc4VRxLoVXluxsJ2fCSjQPzPpqiRiSLRMRIgwtyA6QER4mD4gGmThhdieCVYsPGHAKlMblO2Z0n6iegSalOmhPW2z7X0JKND78n+odS5sxJiIOVHzXo/q5zqCfRHpRIXke0aGRPW5mcEOGyOQ5/qwVVnsIOfmAafMRe/Ja6v+2855Av4Wx3kuzZdyISM2Eee8cGpBbEp42INIJ7Jnew8b0y6iDKu9nzJKRuU6duJXbCTfg1Vpj+v7ElCg9+V/V+tctIgekeCHDx9OF/Oe86jXOoFtiE0i1mvHr7UfZggfS8u8ckNr3c61/GS93wko0N9ZdLXGRZw555bFJpErNmIz+R4JO2ibG0V4tRqdYlduaHvx2sNHtvkzAQX6ZybNl3ABI3Z7R6RLQDF/yoLNWZact8Yxab8H0cNGfMyC3aZjElCgO/N7LlbyHoQmeCPU2d46p/18TcJ66yn+Lf3dus3aV5+AAl2f6eo1ctEiMvwhSKtiUwoidvIzm/yCG18m7JVoO19H7GXD0nbjV3wdkV56rseNQ8DP7DrzJRcuC0LDnwdz8TLVUc7v7nVBxzbyRKvYyfe85e8g74E8tmELNwzmeEl7sbrEIHbCjxsKOWWmYxJQoDv0OxcswsefUZPnE7Z8OhaxPic+58puRVAKBusRkVKUE60ihizYmei5PP/Wth85nnYRaP5gBg5wgxWpBpdHbOPcsIQXTxvcgOFG+V7MHu2T5z9GwN/ieIzfrmcjKggMCxHhdGE/89TkWWIw22WabrOvFIWsRyzII8yJ9CLKydnPenlO2eYe6/BAmPmEjb8kZB1ulGdO/xyLNWwtueTmhjgjzAg062G7RvvW2T4BBbp9H81aGOFNjshEtLMe8SHPcak0YpRyRCMp66WQsB4xiXgkT3l5PHWlntS7Z55+wognDoQ6TyCUhVW4xNbpNuXnynL8pT6X5eFFlJynDISZKD9My+NTt/lxCCjQg/i6FAvWs531Mk+Xy2NSNs0RiIjEufVpWXl+zivLWlgv+52bWJ5CcnOLWIcbxyWljO3UVe5Lv8+xoQxhRoATISePYJOTUk/qNj8eAQV6YJ9PxWPa1Wv7c/w1obi2P/W0mIcBOUv5lBFRzr7k9KNcT78oK1MptGFEzhKRznq5v6zD9WMTUKCP7f9vvZ+KCzsiGt8OGnjlXP/pblme9eTT/dkuubE+3ea4c2WUmyRQElCgSxquS+ACgVKULxyyqLgU5kUneNChCfiZ3aHdb+eXElBYl5LyuJoE/EvCmjStSwISkEBFAgp0RZhWJQEJSKAmAQW6Jk3rkoAEJFCRgAJdEaZVSUACEqhJQIGuSdO6JCABCVQkoEBXhGlVEpCABGoSUKBr0rQuCUhAAhUJKNAVYVqVBCQggZoEFOiaNK1LAhKQQEUCCnRFmFYlAQlIoCYBBbomTeuSgAQkUJGAAl0RplVJQAISqElAga5J07okIAEJVCSgQFeEaVUSkIAEahJQoGvStC4JSEACFQko0BVhWpUEJCCBmgQU6Jo0rUsCEpBARQIKdEWYViUBCUigJgEFuiZN65KABCRQkYACXRGmVUlAAhKoSUCBrknTuiQgAQlUJKBAV4RpVRKQgARqElCga9K0LglIQAIVCSjQFWFalQQkIIGaBBTomjStSwISkEBFAgp0RZhWJQEJSKAmAQW6Jk3rkoAEJFCRwH8B9uC5+Ly6DkQAAAAASUVORK5CYII="/>
+    </mask>
+  </defs>
+  <rect width="360" height="360" fill="#D9D9D9" mask="url(#agent-shape)"/>
+</svg>
diff --git a/desktop/src/features/agents/channelAgents.ts b/desktop/src/features/agents/channelAgents.ts
index edbb106817..70a431a1e5 100644
--- a/desktop/src/features/agents/channelAgents.ts
+++ b/desktop/src/features/agents/channelAgents.ts
@@ -233,7 +233,9 @@ export async function ensureChannelAgentPresetInChannel(
     name: expectedName,
     acpCommand: "buzz-acp",
     agentCommand: input.runtime.command,
-    agentArgs: input.runtime.defaultArgs,
+    // Do NOT seed agentArgs from runtime.defaultArgs (see instanceInputForDefinition.ts
+    // for the rationale — empty args let spawn resolve definition args live).
+    agentArgs: [],
     mcpCommand: input.runtime.mcpCommand ?? "",
     spawnAfterCreate: false,
   });
@@ -354,7 +356,9 @@ export async function provisionChannelManagedAgent(
     acpCommand: "buzz-acp",
     agentCommand: input.runtime.command,
     harnessOverride: input.harnessOverride ?? false,
-    agentArgs: input.runtime.defaultArgs,
+    // Do NOT seed agentArgs from runtime.defaultArgs (see instanceInputForDefinition.ts
+    // for the rationale — empty args let spawn resolve definition args live).
+    agentArgs: [],
     mcpCommand: input.runtime.mcpCommand ?? "",
     personaId: input.personaId ?? undefined,
     teamId: input.teamId ?? undefined,
diff --git a/desktop/src/features/agents/hooks.ts b/desktop/src/features/agents/hooks.ts
index 128ae9083b..122c872e54 100644
--- a/desktop/src/features/agents/hooks.ts
+++ b/desktop/src/features/agents/hooks.ts
@@ -21,6 +21,7 @@ import { evictUsersBatchEntries } from "@/features/profile/hooks";
 import {
   createManagedAgent,
   deleteManagedAgent,
+  deleteCustomHarness,
   discoverAcpRuntimes,
   discoverBackendProviders,
   discoverGitBashPrerequisite,
@@ -34,8 +35,10 @@ import {
   installAcpRuntime,
   listManagedAgents,
   listRelayAgents,
+  saveCustomHarness,
   updateManagedAgent,
 } from "@/shared/api/tauri";
+import type { HarnessDefinitionInput } from "@/shared/api/tauri";
 import {
   setManagedAgentAutoRestart,
   setManagedAgentStartOnAppLaunch,
@@ -237,6 +240,32 @@ export function useInstallAcpRuntimeMutation() {
   });
 }
 
+export function useSaveCustomHarnessMutation() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: ({
+      definition,
+      originalId,
+    }: {
+      definition: HarnessDefinitionInput;
+      originalId?: string;
+    }) => saveCustomHarness(definition, originalId),
+    onSettled: () => {
+      void queryClient.invalidateQueries({ queryKey: acpRuntimesQueryKey });
+    },
+  });
+}
+
+export function useDeleteCustomHarnessMutation() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (id: string) => deleteCustomHarness(id),
+    onSettled: () => {
+      void queryClient.invalidateQueries({ queryKey: acpRuntimesQueryKey });
+    },
+  });
+}
+
 export function useGitBashPrerequisiteQuery() {
   return useQuery({
     queryKey: gitBashPrerequisiteQueryKey,
@@ -254,8 +283,9 @@ export function useBackendProvidersQuery(options?: { enabled?: boolean }) {
   });
 }
 
-export function usePersonasQuery() {
+export function usePersonasQuery(options?: { enabled?: boolean }) {
   return useQuery({
+    enabled: options?.enabled ?? true,
     queryKey: personasQueryKey,
     queryFn: listPersonas,
     staleTime: 30_000,
diff --git a/desktop/src/features/agents/knownAgentPubkeys.test.mjs b/desktop/src/features/agents/knownAgentPubkeys.test.mjs
index 2b7b3e18af..d58b7f5dab 100644
--- a/desktop/src/features/agents/knownAgentPubkeys.test.mjs
+++ b/desktop/src/features/agents/knownAgentPubkeys.test.mjs
@@ -1,7 +1,10 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { mergeKnownAgentPubkeys } from "./knownAgentPubkeys.ts";
+import {
+  mergeKnownAgentPubkeys,
+  mergeOwnedAgentPubkeys,
+} from "./knownAgentPubkeys.ts";
 
 const MANAGED =
   "1111111111111111111111111111111111111111111111111111111111111111";
@@ -34,3 +37,26 @@ test("normalisesCaseAndWhitespace_dedupingAcrossSources", () => {
 
   assert.deepEqual([...merged], [MANAGED]);
 });
+
+test("owned agents include managed and profile-declared agents", () => {
+  const merged = mergeOwnedAgentPubkeys(
+    [{ pubkey: MANAGED }],
+    {
+      [RELAY]: { ownerPubkey: " owner " },
+      other: { ownerPubkey: "somebody-else" },
+    },
+    "OWNER",
+  );
+
+  assert.deepEqual([...merged].sort(), [MANAGED, RELAY].sort());
+});
+
+test("owned agents exclude agents controlled by somebody else", () => {
+  const merged = mergeOwnedAgentPubkeys(
+    undefined,
+    { [RELAY]: { ownerPubkey: "somebody-else" } },
+    "owner",
+  );
+
+  assert.equal(merged.size, 0);
+});
diff --git a/desktop/src/features/agents/knownAgentPubkeys.ts b/desktop/src/features/agents/knownAgentPubkeys.ts
index 978509af09..70cbac68fd 100644
--- a/desktop/src/features/agents/knownAgentPubkeys.ts
+++ b/desktop/src/features/agents/knownAgentPubkeys.ts
@@ -22,6 +22,34 @@ export function mergeKnownAgentPubkeys(
   return pubkeys;
 }
 
+/** Agent identities controlled by the current user. */
+export function mergeOwnedAgentPubkeys(
+  managedAgents: readonly { pubkey: string }[] | undefined,
+  profiles:
+    | Readonly<Record<string, { ownerPubkey?: string | null }>>
+    | undefined,
+  currentPubkey: string | null | undefined,
+): ReadonlySet<string> {
+  const pubkeys = new Set<string>();
+  for (const agent of managedAgents ?? []) {
+    pubkeys.add(normalizePubkey(agent.pubkey));
+  }
+
+  if (!currentPubkey) return pubkeys;
+
+  const ownerPubkey = normalizePubkey(currentPubkey);
+  for (const [pubkey, profile] of Object.entries(profiles ?? {})) {
+    if (
+      profile.ownerPubkey &&
+      normalizePubkey(profile.ownerPubkey) === ownerPubkey
+    ) {
+      pubkeys.add(normalizePubkey(pubkey));
+    }
+  }
+
+  return pubkeys;
+}
+
 /**
  * Channel-scoped variant: the managed ∪ relay baseline plus this channel's
  * bot members (role `bot` or `isAgent`), so member-only agents are included.
diff --git a/desktop/src/features/agents/lib/agentCardModelLabel.test.mjs b/desktop/src/features/agents/lib/agentCardModelLabel.test.mjs
new file mode 100644
index 0000000000..696a055d20
--- /dev/null
+++ b/desktop/src/features/agents/lib/agentCardModelLabel.test.mjs
@@ -0,0 +1,58 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { resolveAgentCardModelLabel } from "./agentCardModelLabel.ts";
+
+test("resolveAgentCardModelLabel — unspawned definition with explicit model renders the model, not inherited", () => {
+  const label = resolveAgentCardModelLabel({
+    agent: undefined,
+    personaModel: "gpt-5",
+    defaultModel: "claude-sonnet",
+  });
+  assert.equal(label, "gpt-5");
+});
+
+test("resolveAgentCardModelLabel — unspawned definition with no model renders the default", () => {
+  const label = resolveAgentCardModelLabel({
+    agent: undefined,
+    personaModel: null,
+    defaultModel: "claude-sonnet",
+  });
+  assert.equal(label, "Default model (claude-sonnet)");
+});
+
+test("resolveAgentCardModelLabel — linked instance inheriting the global default ignores stale persona.model", () => {
+  const label = resolveAgentCardModelLabel({
+    agent: { modelSource: "global", model: "stale-model" },
+    personaModel: "gpt-5",
+    defaultModel: "claude-sonnet",
+  });
+  assert.equal(label, "Default model (claude-sonnet)");
+});
+
+test("resolveAgentCardModelLabel — linked instance with no modelSource (legacy/unset) is treated as inherited", () => {
+  const label = resolveAgentCardModelLabel({
+    agent: { modelSource: null, model: "stale-model" },
+    personaModel: "gpt-5",
+    defaultModel: "claude-sonnet",
+  });
+  assert.equal(label, "Default model (claude-sonnet)");
+});
+
+test("resolveAgentCardModelLabel — linked instance with an explicit resolved model renders that model", () => {
+  const label = resolveAgentCardModelLabel({
+    agent: { modelSource: "definition", model: "gpt-5" },
+    personaModel: "should-not-be-used",
+    defaultModel: "claude-sonnet",
+  });
+  assert.equal(label, "gpt-5");
+});
+
+test("resolveAgentCardModelLabel — non-inherited agent with a blank resolved model falls back to the default", () => {
+  const label = resolveAgentCardModelLabel({
+    agent: { modelSource: "instance_legacy", model: "  " },
+    personaModel: null,
+    defaultModel: "claude-sonnet",
+  });
+  assert.equal(label, "Default model (claude-sonnet)");
+});
diff --git a/desktop/src/features/agents/lib/agentCardModelLabel.ts b/desktop/src/features/agents/lib/agentCardModelLabel.ts
new file mode 100644
index 0000000000..4ec06f10c5
--- /dev/null
+++ b/desktop/src/features/agents/lib/agentCardModelLabel.ts
@@ -0,0 +1,44 @@
+import { formatAgentModelLabel } from "./formatAgentModelLabel";
+import type { ManagedAgent } from "@/shared/api/types";
+
+/**
+ * Model label for the Agents-page card, shared by the definition-grouped
+ * card (`AgentPersonaCard`) and the standalone/legacy card
+ * (`StandaloneAgentCard`).
+ *
+ * A materialized `agent` is authoritative once it exists: its `modelSource`
+ * says whether the *effective* config (from `resolve_effective_config` on
+ * the backend) came from the global default or from an explicit
+ * definition/instance value, so the card never has to re-derive that from
+ * raw model bytes. Absent or `"global"` renders the default-model label;
+ * anything else renders the agent's own resolved model.
+ *
+ * With NO materialized instance yet (a definition that has never been
+ * started), there is no `modelSource` to read — the definition itself is
+ * authoritative, so an explicit `personaModel` must render directly rather
+ * than falling through to "inherited" for lack of an instance.
+ */
+export function resolveAgentCardModelLabel(input: {
+  agent: Pick<ManagedAgent, "modelSource" | "model"> | undefined;
+  personaModel: string | null | undefined;
+  defaultModel: string;
+}): string {
+  if (input.agent) {
+    const isInherited =
+      !input.agent.modelSource || input.agent.modelSource === "global";
+    if (isInherited) {
+      return formatDefaultModelLabel(input.defaultModel);
+    }
+    return input.agent.model?.trim()
+      ? formatAgentModelLabel(input.agent.model)
+      : formatDefaultModelLabel(input.defaultModel);
+  }
+  return input.personaModel?.trim()
+    ? formatAgentModelLabel(input.personaModel)
+    : formatDefaultModelLabel(input.defaultModel);
+}
+
+export function formatDefaultModelLabel(defaultModel: string) {
+  const model = defaultModel.trim();
+  return model ? `Default model (${model})` : "Default model";
+}
diff --git a/desktop/src/features/agents/lib/catalog.test.mjs b/desktop/src/features/agents/lib/catalog.test.mjs
index 7fa72f4f3e..62e809bdb5 100644
--- a/desktop/src/features/agents/lib/catalog.test.mjs
+++ b/desktop/src/features/agents/lib/catalog.test.mjs
@@ -2,11 +2,8 @@ import assert from "node:assert/strict";
 import test from "node:test";
 
 import {
-  getCatalogPersonas,
-  getCatalogSelectionState,
   getLibraryPersonas,
   getPersonaLabelsById,
-  getPersonaLibraryState,
   isCatalogPersonaSelected,
 } from "./catalog.ts";
 
@@ -25,62 +22,6 @@ function createPersona(id, displayName, overrides = {}) {
   };
 }
 
-test("getCatalogPersonas keeps built-ins visible whether selected or not", () => {
-  const personas = [
-    createPersona("builtin:fizz", "Fizz", { isBuiltIn: true, isActive: false }),
-    createPersona("custom:builder", "Builder"),
-  ];
-
-  assert.deepEqual(
-    getCatalogPersonas(personas).map((persona) => persona.id),
-    ["builtin:fizz"],
-  );
-});
-
-test("getCatalogSelectionState keeps built-in selection rules in one place", () => {
-  const personas = [
-    createPersona("builtin:fizz", "Fizz", { isBuiltIn: true, isActive: true }),
-    createPersona("custom:builder", "Builder"),
-  ];
-
-  const state = getCatalogSelectionState(personas);
-
-  assert.deepEqual(
-    state.catalogPersonas.map((persona) => persona.id),
-    ["builtin:fizz"],
-  );
-  assert.deepEqual(
-    state.selectedCatalogPersonas.map((persona) => persona.id),
-    ["builtin:fizz"],
-  );
-  assert.deepEqual(
-    state.unselectedCatalogPersonas.map((persona) => persona.id),
-    [],
-  );
-});
-
-test("getCatalogPersonas keeps chooser order stable when selection changes", () => {
-  const inactive = [
-    createPersona("builtin:fizz", "Fizz", { isBuiltIn: true, isActive: false }),
-    createPersona("builtin:reviewer", "Reviewer", {
-      isBuiltIn: true,
-      isActive: true,
-    }),
-  ];
-  const active = [
-    createPersona("builtin:fizz", "Fizz", { isBuiltIn: true, isActive: true }),
-    createPersona("builtin:reviewer", "Reviewer", {
-      isBuiltIn: true,
-      isActive: false,
-    }),
-  ];
-
-  assert.deepEqual(
-    getCatalogPersonas(inactive).map((persona) => persona.id),
-    getCatalogPersonas(active).map((persona) => persona.id),
-  );
-});
-
 test("isCatalogPersonaSelected treats active catalog personas as selected", () => {
   assert.equal(
     isCatalogPersonaSelected(
@@ -118,25 +59,6 @@ test("getPersonaLabelsById keeps every returned persona addressable", () => {
   });
 });
 
-test("getPersonaLibraryState keeps the working library and full catalog in one place", () => {
-  const personas = [
-    createPersona("builtin:fizz", "Fizz", { isBuiltIn: true, isActive: true }),
-    createPersona("custom:builder", "Builder"),
-  ];
-
-  const state = getPersonaLibraryState(personas);
-
-  assert.deepEqual(
-    state.libraryPersonas.map((persona) => persona.id),
-    ["builtin:fizz", "custom:builder"],
-  );
-  assert.deepEqual(
-    state.catalogPersonas.map((persona) => persona.id),
-    ["builtin:fizz"],
-  );
-  assert.equal(state.personaLabelsById["builtin:fizz"], "Fizz");
-});
-
 test("getLibraryPersonas keeps active custom personas even when catalog entries are similar", () => {
   const avatarUrl = "https://example.test/coordinator.png";
   const personas = [
diff --git a/desktop/src/features/agents/lib/catalog.ts b/desktop/src/features/agents/lib/catalog.ts
index 226aafca5e..fabc0af87e 100644
--- a/desktop/src/features/agents/lib/catalog.ts
+++ b/desktop/src/features/agents/lib/catalog.ts
@@ -1,17 +1,5 @@
 import type { AgentPersona } from "@/shared/api/types";
 
-export type CatalogSelectionState = {
-  catalogPersonas: AgentPersona[];
-  selectedCatalogPersonas: AgentPersona[];
-  unselectedCatalogPersonas: AgentPersona[];
-};
-
-export type PersonaLibraryState = {
-  catalogPersonas: AgentPersona[];
-  libraryPersonas: AgentPersona[];
-  personaLabelsById: Record<string, string>;
-};
-
 export function isPersonaActive(persona: AgentPersona) {
   return persona.isActive;
 }
@@ -24,62 +12,12 @@ export function getLibraryPersonas(personas: readonly AgentPersona[]) {
   return getActivePersonas(personas);
 }
 
-export function isPersonaVisibleInCatalog(
-  persona: AgentPersona,
-  sharedCatalogPersonaIds: ReadonlySet<string> = new Set(),
-) {
-  return persona.isBuiltIn || sharedCatalogPersonaIds.has(persona.id);
-}
-
-export function getCatalogPersonas(
-  personas: readonly AgentPersona[],
-  sharedCatalogPersonaIds: ReadonlySet<string> = new Set(),
-) {
-  return personas
-    .filter((persona) =>
-      isPersonaVisibleInCatalog(persona, sharedCatalogPersonaIds),
-    )
-    .sort((left, right) => left.displayName.localeCompare(right.displayName));
-}
-
 export function isCatalogPersonaSelected(persona: AgentPersona) {
   return persona.isActive;
 }
 
-export function getCatalogSelectionState(
-  personas: readonly AgentPersona[],
-  sharedCatalogPersonaIds: ReadonlySet<string> = new Set(),
-): CatalogSelectionState {
-  const catalogPersonas = getCatalogPersonas(personas, sharedCatalogPersonaIds);
-
-  return {
-    catalogPersonas,
-    selectedCatalogPersonas: catalogPersonas.filter(isCatalogPersonaSelected),
-    unselectedCatalogPersonas: catalogPersonas.filter(
-      (persona) => !isCatalogPersonaSelected(persona),
-    ),
-  };
-}
-
 export function getPersonaLabelsById(personas: readonly AgentPersona[]) {
   return Object.fromEntries(
     personas.map((persona) => [persona.id, persona.displayName]),
   );
 }
-
-export function getPersonaLibraryState(
-  personas: readonly AgentPersona[],
-  sharedCatalogPersonaIds: ReadonlySet<string> = new Set(),
-): PersonaLibraryState {
-  const libraryPersonas = getLibraryPersonas(personas);
-  const { catalogPersonas } = getCatalogSelectionState(
-    personas,
-    sharedCatalogPersonaIds,
-  );
-
-  return {
-    catalogPersonas,
-    libraryPersonas,
-    personaLabelsById: getPersonaLabelsById(personas),
-  };
-}
diff --git a/desktop/src/features/agents/lib/instanceInputForDefinition.test.mjs b/desktop/src/features/agents/lib/instanceInputForDefinition.test.mjs
index d4ba32e603..d79c7abcf8 100644
--- a/desktop/src/features/agents/lib/instanceInputForDefinition.test.mjs
+++ b/desktop/src/features/agents/lib/instanceInputForDefinition.test.mjs
@@ -142,7 +142,11 @@ test("mapping carries the runtime and definition fields", async () => {
   assert.equal(input.name, "Test Agent");
   assert.equal(input.acpCommand, "buzz-acp");
   assert.equal(input.agentCommand, "goose-cmd");
-  assert.deepEqual(input.agentArgs, ["--acp"]);
+  // B-5: agentArgs is intentionally empty at create time — spawn reads args
+  // live from the definition on every start so definition edits take effect
+  // without recreating the agent. Seeding from runtime.defaultArgs here would
+  // freeze args at create-time and silently ignore later definition edits.
+  assert.deepEqual(input.agentArgs, []);
   assert.equal(input.mcpCommand, "goose-mcp");
   assert.equal(input.personaId, "p-1");
   assert.equal(input.systemPrompt, "prompt");
@@ -156,6 +160,8 @@ test("mapping carries the runtime and definition fields", async () => {
 test("no backend intent is byte-identical to the pre-intent mapping", async () => {
   // The 3 pre-B5 call sites (useManagedAgentActions, usePersonaActions,
   // UserProfilePanel) pass no intent; their output must not move.
+  // B-5: agentArgs is [] — args are NOT seeded from the definition at create
+  // time. Spawn reads live args from the definition on every start.
   const input = await buildInstanceInputForDefinition(persona(), gooseRuntime);
   assert.deepEqual(input, {
     name: "Test Agent",
@@ -164,7 +170,7 @@ test("no backend intent is byte-identical to the pre-intent mapping", async () =
     avatarUrl: "https://example.com/a.png",
     acpCommand: "buzz-acp",
     agentCommand: "goose-cmd",
-    agentArgs: ["--acp"],
+    agentArgs: [],
     mcpCommand: "goose-mcp",
     harnessOverride: true,
     model: undefined,
diff --git a/desktop/src/features/agents/lib/instanceInputForDefinition.ts b/desktop/src/features/agents/lib/instanceInputForDefinition.ts
index 7db36b7241..5919309224 100644
--- a/desktop/src/features/agents/lib/instanceInputForDefinition.ts
+++ b/desktop/src/features/agents/lib/instanceInputForDefinition.ts
@@ -143,7 +143,13 @@ export async function buildInstanceInputForDefinition(
     ...base,
     acpCommand: "buzz-acp",
     agentCommand: runtime.command,
-    agentArgs: runtime.defaultArgs,
+    // Do NOT seed agentArgs from runtime.defaultArgs: record.agent_args must
+    // remain empty so spawn resolves args live from the definition on every
+    // start.  Seeding here would freeze the args at create-time, silently
+    // ignoring any later definition-arg edits (Thufir F5 / phase B-5).
+    // envVars are intentionally never seeded for the same reason (see comment
+    // at top of this function).
+    agentArgs: [],
     mcpCommand: runtime.mcpCommand ?? "",
     harnessOverride: !persona.runtime || persona.runtime === runtime.id,
     model: persona.model ?? undefined,
diff --git a/desktop/src/features/agents/lib/legacyPersonaCatalogVisibility.test.mjs b/desktop/src/features/agents/lib/legacyPersonaCatalogVisibility.test.mjs
deleted file mode 100644
index 9439d4a36e..0000000000
--- a/desktop/src/features/agents/lib/legacyPersonaCatalogVisibility.test.mjs
+++ /dev/null
@@ -1,27 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-
-import { clearLegacyPersonaCatalogVisibility } from "./legacyPersonaCatalogVisibility.ts";
-
-test("clearLegacyPersonaCatalogVisibility removes the retired preference", () => {
-  const removedKeys = [];
-
-  clearLegacyPersonaCatalogVisibility({
-    removeItem(key) {
-      removedKeys.push(key);
-    },
-  });
-
-  assert.deepEqual(removedKeys, ["buzz-persona-catalog-visibility-v1"]);
-});
-
-test("clearLegacyPersonaCatalogVisibility ignores unavailable storage", () => {
-  assert.doesNotThrow(() => clearLegacyPersonaCatalogVisibility(null));
-  assert.doesNotThrow(() =>
-    clearLegacyPersonaCatalogVisibility({
-      removeItem() {
-        throw new Error("storage unavailable");
-      },
-    }),
-  );
-});
diff --git a/desktop/src/features/agents/lib/legacyPersonaCatalogVisibility.ts b/desktop/src/features/agents/lib/legacyPersonaCatalogVisibility.ts
deleted file mode 100644
index 38b2d5d974..0000000000
--- a/desktop/src/features/agents/lib/legacyPersonaCatalogVisibility.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-const LEGACY_PERSONA_CATALOG_VISIBILITY_STORAGE_KEY =
-  "buzz-persona-catalog-visibility-v1";
-
-/**
- * Removes the retired custom-persona catalog preference so it cannot resurface
- * agents after the visibility control has been removed.
- */
-export function clearLegacyPersonaCatalogVisibility(
-  storage?: Pick<Storage, "removeItem"> | null,
-) {
-  let targetStorage = storage;
-  if (targetStorage === undefined) {
-    if (typeof window === "undefined") return;
-
-    try {
-      targetStorage = window.localStorage;
-    } catch {
-      return;
-    }
-  }
-  if (!targetStorage) return;
-
-  try {
-    targetStorage.removeItem(LEGACY_PERSONA_CATALOG_VISIBILITY_STORAGE_KEY);
-  } catch {
-    // Catalog cleanup is best-effort and should not block the agents view.
-  }
-}
diff --git a/desktop/src/features/agents/lib/personaCatalogRelay.test.mjs b/desktop/src/features/agents/lib/personaCatalogRelay.test.mjs
new file mode 100644
index 0000000000..fbaf1f5274
--- /dev/null
+++ b/desktop/src/features/agents/lib/personaCatalogRelay.test.mjs
@@ -0,0 +1,484 @@
+import assert from "node:assert/strict";
+import test, { mock } from "node:test";
+
+import { relayClient } from "@/shared/api/relayClient";
+import { emojiAvatarDataUrl } from "@/features/profile/ui/ProfileAvatarEditor.utils.ts";
+import {
+  catalogPersonasFromPublications,
+  catalogPublicationsFromEvents,
+  fetchPersonaCatalogPublications,
+  personaEventIsShared,
+} from "./personaCatalogRelay.ts";
+
+const ALICE = "a".repeat(64);
+const BOB = "b".repeat(64);
+
+function personaEvent({
+  createdAt,
+  id,
+  owner = ALICE,
+  sourcePersonaId = "reviewer",
+  shared = true,
+  avatarUrl = null,
+  respondTo = null,
+  sharedTag,
+}) {
+  return {
+    id,
+    pubkey: owner,
+    created_at: createdAt,
+    kind: 30175,
+    tags: [
+      ["d", sourcePersonaId],
+      ...(shared
+        ? [sharedTag ?? ["shared", "true"]]
+        : sharedTag
+          ? [sharedTag]
+          : []),
+    ],
+    content: JSON.stringify({
+      display_name: "Relay Reviewer",
+      system_prompt: "Review changes.",
+      avatar_url: avatarUrl,
+      runtime: "goose",
+      model: "claude",
+      provider: null,
+      name_pool: ["Reviewer"],
+      respond_to: respondTo,
+      respond_to_allowlist: respondTo === "allowlist" ? [BOB] : undefined,
+      parallelism: 4,
+    }),
+    sig: "sig",
+  };
+}
+
+test("a shared kind 30175 persona from Alice is discoverable by Bob", () => {
+  const publications = catalogPublicationsFromEvents([
+    personaEvent({ createdAt: 1, id: "alice-reviewer" }),
+  ]);
+  const personas = catalogPersonasFromPublications(publications, [], BOB);
+
+  assert.equal(personas.length, 1);
+  assert.equal(personas[0].displayName, "Relay Reviewer");
+  assert.equal(personas[0].isActive, false);
+  assert.equal(personas[0].shared, true);
+  assert.equal(personas[0].catalogSource.ownerPubkey, ALICE);
+  assert.equal(personas[0].catalogSource.isOwn, false);
+});
+
+test("a newer unshared head hides the older shared head", () => {
+  const publications = catalogPublicationsFromEvents([
+    personaEvent({ createdAt: 1, id: "shared" }),
+    personaEvent({ createdAt: 2, id: "unshared", shared: false }),
+  ]);
+
+  assert.deepEqual(publications, []);
+});
+
+test("persona coordinates remain independent across authors", () => {
+  const publications = catalogPublicationsFromEvents([
+    personaEvent({ createdAt: 1, id: "alice", owner: ALICE }),
+    personaEvent({ createdAt: 1, id: "bob", owner: BOB }),
+  ]);
+
+  assert.equal(publications.length, 2);
+  assert.equal(
+    catalogPersonasFromPublications(publications, [], BOB).length,
+    2,
+  );
+});
+
+test("equal-second persona heads use the relay lowest-id tie-break", () => {
+  const publications = catalogPublicationsFromEvents([
+    personaEvent({
+      createdAt: 1,
+      id: "b".repeat(64),
+      shared: true,
+    }),
+    personaEvent({
+      createdAt: 1,
+      id: "a".repeat(64),
+      shared: false,
+    }),
+  ]);
+
+  assert.deepEqual(publications, []);
+});
+
+test("an invalid canonical head does not resurrect an older shared persona", () => {
+  const invalidHead = {
+    ...personaEvent({ createdAt: 2, id: "a".repeat(64) }),
+    content: "{}",
+  };
+  const publications = catalogPublicationsFromEvents([
+    personaEvent({ createdAt: 1, id: "older-valid" }),
+    invalidHead,
+  ]);
+
+  assert.deepEqual(publications, []);
+});
+
+test("only an exact shared true tag opts a persona into discovery", () => {
+  assert.equal(
+    personaEventIsShared(personaEvent({ createdAt: 1, id: "exact-shared" })),
+    true,
+  );
+  for (const [index, sharedTag] of [
+    ["shared"],
+    ["shared", "false"],
+    ["shared", "true", "extra"],
+  ].entries()) {
+    const event = personaEvent({
+      createdAt: index + 2,
+      id: `malformed-${index}`,
+      shared: false,
+      sharedTag,
+    });
+    assert.equal(personaEventIsShared(event), false);
+    assert.deepEqual(catalogPublicationsFromEvents([event]), []);
+  }
+  const duplicate = personaEvent({
+    createdAt: 5,
+    id: "duplicate",
+  });
+  duplicate.tags.push(["shared", "true"]);
+  assert.equal(personaEventIsShared(duplicate), false);
+});
+
+test("catalog avatars keep bounded http URLs and drop unsafe schemes", () => {
+  const safe = catalogPersonasFromPublications(
+    catalogPublicationsFromEvents([
+      personaEvent({
+        createdAt: 1,
+        id: "safe-avatar",
+        avatarUrl: "https://relay.example/avatar.png",
+      }),
+    ]),
+    [],
+    BOB,
+  );
+  assert.equal(safe[0].avatarUrl, "https://relay.example/avatar.png");
+
+  const unsafe = catalogPersonasFromPublications(
+    catalogPublicationsFromEvents([
+      personaEvent({
+        createdAt: 1,
+        id: "unsafe-avatar",
+        avatarUrl: "javascript:alert(1)",
+      }),
+    ]),
+    [],
+    BOB,
+  );
+  assert.equal(unsafe[0].avatarUrl, null);
+});
+
+/** The avatar a catalog entry projects for `avatarUrl`, or null if dropped. */
+function catalogAvatarUrl(avatarUrl) {
+  const personas = catalogPersonasFromPublications(
+    catalogPublicationsFromEvents([
+      personaEvent({ createdAt: 1, id: "avatar-vector", avatarUrl }),
+    ]),
+    [],
+    BOB,
+  );
+  return personas[0].avatarUrl;
+}
+
+// An emoji avatar is self-contained, so it is the one `data:` avatar that can
+// render on another member's machine. Dropping it left shared agents looking
+// avatar-less in the catalog.
+test("test_percent_encoded_emoji_svg_avatar_survives_the_catalog", () => {
+  const emojiAvatar = emojiAvatarDataUrl("🐝", "#FFCC00");
+
+  assert.equal(catalogAvatarUrl(emojiAvatar), emojiAvatar);
+});
+
+test("test_base64_svg_avatar_is_rejected", () => {
+  assert.equal(
+    catalogAvatarUrl(`data:image/svg+xml;base64,${btoa("<svg/>")}`),
+    null,
+  );
+});
+
+test("test_non_svg_data_avatar_is_rejected", () => {
+  assert.equal(catalogAvatarUrl("data:image/png,%89PNG"), null);
+});
+
+test("test_legacy_inline_raster_avatar_survives_the_catalog", () => {
+  for (const mime of ["png", "jpeg", "gif", "webp"]) {
+    const avatar = `data:image/${mime};base64,iVBORw0KGgo=`;
+    assert.equal(catalogAvatarUrl(avatar), avatar);
+  }
+});
+
+test("test_inline_raster_avatar_rejects_unbounded_or_malformed_payloads", () => {
+  const prefix = "data:image/png;base64,";
+  const payloadLength = 256 * 1_024 - prefix.length;
+  const validPayloadLength = payloadLength - (payloadLength % 4);
+  const withinCap = `${prefix}${"a".repeat(validPayloadLength - 2)}==`;
+  assert.ok(withinCap.length <= 256 * 1_024);
+  assert.equal(catalogAvatarUrl(withinCap), withinCap);
+  assert.equal(
+    catalogAvatarUrl(
+      `${withinCap}${"a".repeat(256 * 1_024 - withinCap.length + 1)}`,
+    ),
+    null,
+  );
+  assert.equal(catalogAvatarUrl("data:image/png;base64,not base64"), null);
+  assert.equal(catalogAvatarUrl("data:image/bmp;base64,aA=="), null);
+});
+
+test("test_oversized_inline_svg_avatar_is_rejected", () => {
+  const withinCap = `data:image/svg+xml,${"a".repeat(8_192 - "data:image/svg+xml,".length)}`;
+  assert.equal(withinCap.length, 8_192);
+  assert.equal(catalogAvatarUrl(withinCap), withinCap);
+  assert.equal(catalogAvatarUrl(`${withinCap}a`), null);
+});
+
+// Catalog avatars render through `<img src>` (ProfileAvatar → AvatarImage),
+// where an SVG document is never scripted, so a script-bearing avatar is
+// accepted and inert rather than filtered — the projection must not silently
+// start sanitizing markup it does not render.
+test("test_script_bearing_inline_svg_avatar_is_accepted_and_rendered_inert", () => {
+  const scripted = `data:image/svg+xml,${encodeURIComponent(
+    '<svg xmlns="http://www.w3.org/2000/svg"><script>alert(1)</script></svg>',
+  )}`;
+
+  assert.equal(catalogAvatarUrl(scripted), scripted);
+});
+
+test("foreign allowlist behavior imports as owner-only", () => {
+  const personas = catalogPersonasFromPublications(
+    catalogPublicationsFromEvents([
+      personaEvent({
+        createdAt: 1,
+        id: "allowlist",
+        respondTo: "allowlist",
+      }),
+    ]),
+    [],
+    BOB,
+  );
+
+  assert.equal(personas[0].respondTo, "owner-only");
+  assert.deepEqual(personas[0].respondToAllowlist, []);
+});
+
+test("a pending local share does not appear before relay confirmation", () => {
+  const localPersona = {
+    id: "local-reviewer",
+    displayName: "Local Reviewer",
+    avatarUrl: null,
+    systemPrompt: "Review local changes.",
+    runtime: null,
+    model: null,
+    provider: null,
+    namePool: [],
+    isBuiltIn: false,
+    isActive: true,
+    shared: true,
+    sourceTeam: null,
+    envVars: {},
+    respondTo: null,
+    respondToAllowlist: [],
+    parallelism: null,
+    createdAt: "2026-07-26T00:00:00.000Z",
+    updatedAt: "2026-07-26T00:00:00.000Z",
+  };
+
+  const personas = catalogPersonasFromPublications([], [localPersona], ALICE);
+  assert.deepEqual(personas, []);
+});
+
+function localPersona(overrides = {}) {
+  return {
+    id: "local-1",
+    displayName: "Relay Reviewer",
+    avatarUrl: null,
+    systemPrompt: "Review changes.",
+    runtime: null,
+    model: null,
+    provider: null,
+    namePool: [],
+    isBuiltIn: false,
+    isActive: true,
+    shared: false,
+    sourceTeam: null,
+    catalogSource: null,
+    envVars: {},
+    respondTo: null,
+    respondToAllowlist: [],
+    parallelism: null,
+    createdAt: "2026-07-26T00:00:00.000Z",
+    updatedAt: "2026-07-26T00:00:00.000Z",
+    ...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", () => {
+  const publications = catalogPublicationsFromEvents([
+    personaEvent({ createdAt: 1, id: "alice-reviewer" }),
+  ]);
+  const copy = localPersona({
+    id: "a-fresh-uuid",
+    catalogSource: { ownerPubkey: ALICE, personaId: "reviewer" },
+  });
+
+  const personas = catalogPersonasFromPublications(publications, [copy], BOB);
+
+  assert.equal(personas.length, 1);
+  assert.equal(
+    personas[0].id,
+    "a-fresh-uuid",
+    "the projection must resolve to the existing local copy, not a synthetic id",
+  );
+  assert.equal(
+    personas[0].isActive,
+    true,
+    "an added foreign entry must read as already selected",
+  );
+});
+
+test("test_foreign_entry_with_no_local_copy_stays_unselected", () => {
+  const publications = catalogPublicationsFromEvents([
+    personaEvent({ createdAt: 1, id: "alice-reviewer" }),
+  ]);
+  // A same-named local persona with no provenance is a different agent.
+  const unrelated = localPersona({ id: "unrelated" });
+
+  const personas = catalogPersonasFromPublications(
+    publications,
+    [unrelated],
+    BOB,
+  );
+
+  assert.equal(personas[0].id, "catalog:" + ALICE + ":reviewer");
+  assert.equal(personas[0].isActive, false);
+});
+
+// Provenance is per-owner: the same d-tag under a different publisher is a
+// different agent, so a copy of Alice's must not mask Bob's entry.
+test("test_catalog_source_match_is_scoped_to_the_publishing_owner", () => {
+  const publications = catalogPublicationsFromEvents([
+    personaEvent({ createdAt: 1, id: "bob-reviewer", owner: BOB }),
+  ]);
+  const copyOfAlices = localPersona({
+    id: "copy-of-alices",
+    catalogSource: { ownerPubkey: ALICE, personaId: "reviewer" },
+  });
+
+  const personas = catalogPersonasFromPublications(
+    publications,
+    [copyOfAlices],
+    ALICE,
+  );
+
+  assert.equal(personas[0].id, "catalog:" + BOB + ":reviewer");
+  assert.equal(personas[0].isActive, false);
+});
+
+test("test_own_publication_still_resolves_by_local_id", () => {
+  const publications = catalogPublicationsFromEvents([
+    personaEvent({ createdAt: 1, id: "alice-reviewer" }),
+  ]);
+  const own = localPersona({ id: "reviewer", shared: true });
+
+  const personas = catalogPersonasFromPublications(publications, [own], ALICE);
+
+  assert.equal(personas[0].id, "reviewer");
+  assert.equal(personas[0].catalogSource.isOwn, true);
+});
+
+function pageOfEvents(count, startId, createdAt) {
+  return Array.from({ length: count }, (_, index) =>
+    personaEvent({
+      createdAt: typeof createdAt === "function" ? createdAt(index) : createdAt,
+      id: `event-${startId + index}`,
+      sourcePersonaId: `persona-${startId + index}`,
+    }),
+  );
+}
+
+function stubPagedRelay(pages) {
+  const filters = [];
+  mock.method(relayClient, "fetchEvents", (filter) => {
+    filters.push(filter);
+    return Promise.resolve(pages[filters.length - 1] ?? []);
+  });
+  return filters;
+}
+
+// A single limit-capped fetch drops every entry past the relay's clamp, making
+// those agents undiscoverable. The walk must keep going while pages come back
+// full, and must carry an `until` cursor derived from the oldest event seen.
+test("test_full_page_is_followed_by_a_cursored_request_for_older_events", async (t) => {
+  t.after(() => mock.restoreAll());
+  const filters = stubPagedRelay([
+    pageOfEvents(500, 0, (index) => 10_000 - index),
+    pageOfEvents(3, 500, 9_000),
+  ]);
+
+  const publications = await fetchPersonaCatalogPublications();
+
+  assert.equal(filters.length, 2, "a full page must be followed by another");
+  assert.equal(filters[0].until, undefined, "the first page has no cursor");
+  assert.equal(
+    filters[1].until,
+    10_000 - 499,
+    "the cursor must be the oldest created_at from the previous page",
+  );
+  assert.equal(
+    publications.length,
+    503,
+    "entries past the first page must still be discoverable",
+  );
+});
+
+test("test_short_first_page_does_not_issue_a_second_request", async (t) => {
+  t.after(() => mock.restoreAll());
+  const filters = stubPagedRelay([pageOfEvents(2, 0, 10_000)]);
+
+  const publications = await fetchPersonaCatalogPublications();
+
+  assert.equal(filters.length, 1);
+  assert.equal(publications.length, 2);
+});
+
+// `until` is inclusive on the relay, so consecutive pages overlap on the
+// boundary timestamp. Without id dedupe the repeats would be counted twice.
+test("test_overlapping_pages_are_deduped_by_event_id", async (t) => {
+  t.after(() => mock.restoreAll());
+  const firstPage = pageOfEvents(500, 0, (index) => 10_000 - index);
+  const secondPage = [
+    // The boundary event repeats because `until` includes its timestamp.
+    firstPage[firstPage.length - 1],
+    ...pageOfEvents(2, 500, 9_000),
+  ];
+  stubPagedRelay([firstPage, secondPage]);
+
+  const publications = await fetchPersonaCatalogPublications();
+
+  assert.equal(publications.length, 502, "the repeated event must count once");
+});
+
+// The stop-on-no-progress guard: a full page whose events all share one
+// created_at cannot advance the cursor, so paging must terminate instead of
+// re-requesting the same page forever.
+test("test_full_page_of_tied_timestamps_terminates_the_walk", async (t) => {
+  t.after(() => mock.restoreAll());
+  const tiedPage = pageOfEvents(500, 0, 10_000);
+  const filters = stubPagedRelay([tiedPage, tiedPage, tiedPage, tiedPage]);
+
+  const publications = await fetchPersonaCatalogPublications();
+
+  assert.equal(
+    filters.length,
+    2,
+    "the walk must stop once a page contributes nothing new",
+  );
+  assert.equal(publications.length, 500);
+});
diff --git a/desktop/src/features/agents/lib/personaCatalogRelay.ts b/desktop/src/features/agents/lib/personaCatalogRelay.ts
new file mode 100644
index 0000000000..02c3f8e202
--- /dev/null
+++ b/desktop/src/features/agents/lib/personaCatalogRelay.ts
@@ -0,0 +1,382 @@
+import { relayClient } from "@/shared/api/relayClient";
+import type {
+  AgentPersona,
+  CatalogSourceCoordinate,
+  RelayEvent,
+  RespondToMode,
+} from "@/shared/api/types";
+import { KIND_PERSONA } from "@/shared/constants/kinds";
+
+export type CatalogPersonaShareLevel = "not-shared" | "none";
+
+type CatalogAgentProjection = {
+  displayName: string;
+  avatarUrl: string | null;
+  systemPrompt: string;
+  runtime: string | null;
+  model: string | null;
+  provider: string | null;
+  namePool: string[];
+  respondTo: RespondToMode | null;
+  parallelism: number | null;
+};
+
+export type PersonaCatalogPublication = {
+  eventId: string;
+  ownerPubkey: string;
+  sourcePersonaId: string;
+  createdAt: number;
+  agent: CatalogAgentProjection;
+};
+
+export type CatalogPersona = AgentPersona & {
+  catalogSource: CatalogSourceCoordinate & {
+    /** The publication event this projection was built from. */
+    eventId: string;
+    /** Whether the current identity published it. */
+    isOwn: boolean;
+  };
+};
+
+type JsonObject = Record<string, unknown>;
+
+function isObject(value: unknown): value is JsonObject {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function extractTag(event: RelayEvent, name: string): string | null {
+  const matches = event.tags.filter(
+    (tag) => tag.length >= 2 && tag[0] === name && typeof tag[1] === "string",
+  );
+  return matches.length === 1 ? (matches[0]?.[1] ?? null) : null;
+}
+
+export function personaEventIsShared(event: RelayEvent): boolean {
+  const sharedTags = event.tags.filter((tag) => tag[0] === "shared");
+  return (
+    sharedTags.length === 1 &&
+    sharedTags[0]?.length === 2 &&
+    sharedTags[0]?.[1] === "true"
+  );
+}
+
+function isSafeHttpUrl(value: unknown): value is string {
+  if (
+    typeof value !== "string" ||
+    value.length === 0 ||
+    value.length > 2_048 ||
+    /[\s()]/u.test(value)
+  ) {
+    return false;
+  }
+  try {
+    const parsed = new URL(value);
+    return parsed.protocol === "https:" || parsed.protocol === "http:";
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Emoji avatars are the one `data:` avatar a catalog entry keeps.
+ *
+ * They persist as inline, percent-encoded SVG (`emojiAvatarDataUrl` in
+ * `ProfileAvatarEditor.utils.ts`), so they are self-contained and render on
+ * any member's machine — unlike a bundled runtime-default avatar, whose local
+ * asset path means nothing to another install. The accepted shape is exactly
+ * that prefix: the trailing comma is what rejects `;base64` payloads, and
+ * every other `data:` MIME stays rejected. Catalog avatars render through
+ * `<img src>` (`ProfileAvatar` → `AvatarImage`), where SVG script never
+ * executes, so bounding the length is the remaining concern — 8 KiB is an
+ * order of magnitude above the ~700 characters an emoji avatar encodes to.
+ */
+const INLINE_SVG_AVATAR_PREFIX = "data:image/svg+xml,";
+const MAX_INLINE_SVG_AVATAR_LENGTH = 8_192;
+
+/**
+ * Shared persona heads can carry an uploaded avatar as an inline raster. Keep
+ * those self-contained images renderable without accepting arbitrary `data:`
+ * URLs: only the raster MIME types browsers decode in `<img>`, strict base64
+ * shape, and a bound no larger than the relay's event-content ceiling.
+ */
+const MAX_INLINE_RASTER_AVATAR_LENGTH = 256 * 1_024;
+const INLINE_RASTER_AVATAR_RE =
+  /^data:image\/(?:png|jpeg|gif|webp);base64,([A-Za-z0-9+/]+={0,2})$/u;
+
+function isInlineSvgAvatar(value: unknown): value is string {
+  return (
+    typeof value === "string" &&
+    value.startsWith(INLINE_SVG_AVATAR_PREFIX) &&
+    value.length <= MAX_INLINE_SVG_AVATAR_LENGTH
+  );
+}
+
+function isInlineRasterAvatar(value: unknown): value is string {
+  if (
+    typeof value !== "string" ||
+    value.length > MAX_INLINE_RASTER_AVATAR_LENGTH
+  ) {
+    return false;
+  }
+  const match = INLINE_RASTER_AVATAR_RE.exec(value);
+  return match !== null && (match[1]?.length ?? 0) % 4 === 0;
+}
+
+function optionalString(value: unknown): string | null {
+  return typeof value === "string" && value.trim().length > 0 ? value : null;
+}
+
+function parsePersonaContent(event: RelayEvent): CatalogAgentProjection | null {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(event.content);
+  } catch {
+    return null;
+  }
+  if (
+    !isObject(parsed) ||
+    typeof parsed.display_name !== "string" ||
+    parsed.display_name.trim().length === 0
+  ) {
+    return null;
+  }
+
+  const avatarUrl =
+    isSafeHttpUrl(parsed.avatar_url) ||
+    isInlineSvgAvatar(parsed.avatar_url) ||
+    isInlineRasterAvatar(parsed.avatar_url)
+      ? parsed.avatar_url
+      : null;
+  const namePool = Array.isArray(parsed.name_pool)
+    ? parsed.name_pool.filter(
+        (candidate): candidate is string => typeof candidate === "string",
+      )
+    : [];
+  const respondTo =
+    parsed.respond_to === "allowlist"
+      ? "owner-only"
+      : parsed.respond_to === "owner-only" || parsed.respond_to === "anyone"
+        ? parsed.respond_to
+        : null;
+  const parallelism =
+    typeof parsed.parallelism === "number" &&
+    Number.isInteger(parsed.parallelism) &&
+    parsed.parallelism >= 1 &&
+    parsed.parallelism <= 32
+      ? parsed.parallelism
+      : null;
+
+  return {
+    displayName: parsed.display_name,
+    avatarUrl,
+    systemPrompt:
+      typeof parsed.system_prompt === "string" ? parsed.system_prompt : "",
+    runtime: optionalString(parsed.runtime),
+    model: optionalString(parsed.model),
+    provider: optionalString(parsed.provider),
+    namePool,
+    respondTo,
+    parallelism,
+  };
+}
+
+/**
+ * Collapse relay results to the canonical NIP-33 head for each persona
+ * coordinate, then keep only exact `["shared", "true"]` heads.
+ *
+ * The relay normally returns one replaceable head. The client-side collapse is
+ * defense in depth for older relays and fixtures, and deliberately claims the
+ * coordinate before parsing so an invalid or unshared newest head cannot
+ * resurrect an older shared definition.
+ */
+export function catalogPublicationsFromEvents(
+  events: readonly RelayEvent[],
+): PersonaCatalogPublication[] {
+  const sorted = [...events].sort(
+    (left, right) =>
+      right.created_at - left.created_at || left.id.localeCompare(right.id),
+  );
+  const seenCoordinates = new Set<string>();
+  const publications: PersonaCatalogPublication[] = [];
+
+  for (const event of sorted) {
+    if (event.kind !== KIND_PERSONA) continue;
+    const sourcePersonaId = extractTag(event, "d");
+    if (!sourcePersonaId) continue;
+    const ownerPubkey = event.pubkey.toLowerCase();
+    const coordinate = `${ownerPubkey}:${sourcePersonaId}`;
+    if (seenCoordinates.has(coordinate)) continue;
+    seenCoordinates.add(coordinate);
+
+    if (!personaEventIsShared(event)) continue;
+    const agent = parsePersonaContent(event);
+    if (!agent) continue;
+    publications.push({
+      eventId: event.id,
+      ownerPubkey,
+      sourcePersonaId,
+      createdAt: event.created_at,
+      agent,
+    });
+  }
+
+  return publications;
+}
+
+/**
+ * Events per catalog page.
+ *
+ * Kept well under the relay's 1,000-row `query_events` clamp so a page that
+ * comes back full is a reliable "there may be more" signal rather than a
+ * silently truncated result.
+ */
+const CATALOG_PAGE_SIZE = 500;
+
+/**
+ * Hard bound on pages walked, so a relay that keeps returning full pages can
+ * never spin this forever.
+ */
+const MAX_CATALOG_PAGES = 40;
+
+/**
+ * Read every shared persona event, page by page.
+ *
+ * A single `limit`-capped fetch silently truncates once a community publishes
+ * more agents than the relay's clamp, and the entries that fall off are simply
+ * undiscoverable. Paging walks backwards through `created_at` using the only
+ * cursor a WS `REQ` filter carries — `until` — which the relay treats as
+ * *inclusive*, so consecutive pages overlap on tied timestamps. Two things
+ * follow, and both are load-bearing:
+ *
+ * - dedupe by event id, because the boundary events repeat; and
+ * - stop when a page contributes nothing new, because a page whose events all
+ *   share one `created_at` would otherwise be requested forever.
+ */
+export async function fetchPersonaCatalogPublications(): Promise<
+  PersonaCatalogPublication[]
+> {
+  const byId = new Map<string, RelayEvent>();
+  let until: number | undefined;
+
+  for (let page = 0; page < MAX_CATALOG_PAGES; page += 1) {
+    const events = await relayClient.fetchEvents({
+      kinds: [KIND_PERSONA],
+      limit: CATALOG_PAGE_SIZE,
+      ...(until === undefined ? {} : { until }),
+    });
+
+    const sizeBefore = byId.size;
+    let oldestCreatedAt = Number.POSITIVE_INFINITY;
+    for (const event of events) {
+      byId.set(event.id, event);
+      oldestCreatedAt = Math.min(oldestCreatedAt, event.created_at);
+    }
+
+    // A short page is the end of the catalog; a page of only-repeats means the
+    // cursor cannot advance past a run of tied timestamps.
+    if (events.length < CATALOG_PAGE_SIZE || byId.size === sizeBefore) {
+      break;
+    }
+    until = oldestCreatedAt;
+  }
+
+  return catalogPublicationsFromEvents([...byId.values()]);
+}
+
+function publicationToPersona(
+  publication: PersonaCatalogPublication,
+  localPersona: AgentPersona | undefined,
+  isOwn: boolean,
+): CatalogPersona {
+  const timestamp = new Date(publication.createdAt * 1_000).toISOString();
+  const basePersona: AgentPersona = localPersona ?? {
+    id: `catalog:${publication.ownerPubkey}:${publication.sourcePersonaId}`,
+    displayName: publication.agent.displayName,
+    avatarUrl: publication.agent.avatarUrl,
+    systemPrompt: publication.agent.systemPrompt,
+    runtime: publication.agent.runtime,
+    model: publication.agent.model,
+    provider: publication.agent.provider,
+    namePool: publication.agent.namePool,
+    isBuiltIn: false,
+    isActive: false,
+    shared: true,
+    sourceTeam: null,
+    envVars: {},
+    respondTo: publication.agent.respondTo,
+    respondToAllowlist: [],
+    parallelism: publication.agent.parallelism,
+    createdAt: timestamp,
+    updatedAt: timestamp,
+  };
+
+  return {
+    ...basePersona,
+    // Catalog membership is relay-confirmed by the shared event itself. Do not
+    // let a local pending toggle override this projection.
+    shared: true,
+    catalogSource: {
+      eventId: publication.eventId,
+      ownerPubkey: publication.ownerPubkey,
+      isOwn,
+      personaId: publication.sourcePersonaId,
+    },
+  };
+}
+
+export function catalogPersonasFromPublications(
+  publications: readonly PersonaCatalogPublication[],
+  localPersonas: readonly AgentPersona[],
+  currentPubkey: string | null | undefined,
+): CatalogPersona[] {
+  const normalizedCurrentPubkey = currentPubkey?.toLowerCase() ?? null;
+  const personas: CatalogPersona[] = [];
+
+  for (const publication of publications) {
+    const isOwn = publication.ownerPubkey === normalizedCurrentPubkey;
+    personas.push(
+      publicationToPersona(
+        publication,
+        findLocalPersonaForCatalogEntry(localPersonas, {
+          ownerPubkey: publication.ownerPubkey,
+          personaId: publication.sourcePersonaId,
+          isOwn,
+        }),
+        isOwn,
+      ),
+    );
+  }
+
+  return personas.sort((left, right) =>
+    left.displayName.localeCompare(right.displayName),
+  );
+}
+
+/**
+ * The local persona backing a catalog entry, if the user already has it.
+ *
+ * An own publication is found by id — its `d`-tag *is* the local persona id. A
+ * copy of another owner's entry carries a fresh local id instead, so the only
+ * link back is the `catalogSource` coordinate stored on the copy. Matching on
+ * that coordinate is what stops the catalog from offering "Add" for an entry
+ * the user already added, which would mint a second copy.
+ */
+export function findLocalPersonaForCatalogEntry(
+  localPersonas: readonly AgentPersona[],
+  source: CatalogSourceCoordinate & { isOwn: boolean },
+): AgentPersona | undefined {
+  if (source.isOwn) {
+    return localPersonas.find((persona) => persona.id === source.personaId);
+  }
+  return localPersonas.find(
+    (persona) =>
+      persona.catalogSource?.ownerPubkey === source.ownerPubkey &&
+      persona.catalogSource?.personaId === source.personaId,
+  );
+}
+
+export function isCatalogPersona(
+  persona: AgentPersona,
+): persona is CatalogPersona {
+  return "catalogSource" in persona && isObject(persona.catalogSource);
+}
diff --git a/desktop/src/features/agents/lib/personaEditCaches.ts b/desktop/src/features/agents/lib/personaEditCaches.ts
new file mode 100644
index 0000000000..c5071d1246
--- /dev/null
+++ b/desktop/src/features/agents/lib/personaEditCaches.ts
@@ -0,0 +1,42 @@
+import type { QueryClient } from "@tanstack/react-query";
+
+import { evictUsersBatchEntries } from "@/features/profile/hooks";
+import type { ManagedAgent } from "@/shared/api/types";
+
+/**
+ * Refresh every cache a saved persona edit can invalidate.
+ *
+ * Shared by the plain edit mutation and the publish-on-save edit mutation so
+ * the two cannot drift on what a saved edit refreshes.
+ */
+export async function invalidatePersonaEditCaches(
+  queryClient: QueryClient,
+  personaId: string,
+): Promise<void> {
+  // Evict per-pubkey users-batch-entry caches for agents linked to this
+  // persona so the batch invalidation below refetches fresh profiles instead
+  // of re-reading stale entries (mirrors useUpdateManagedAgentMutation).
+  const agents = queryClient.getQueryData<ManagedAgent[]>(["managed-agents"]);
+  if (agents) {
+    evictUsersBatchEntries(
+      queryClient,
+      agents
+        .filter((agent) => agent.personaId === personaId)
+        .map((agent) => agent.pubkey.toLowerCase()),
+    );
+  }
+
+  await Promise.all([
+    queryClient.invalidateQueries({ queryKey: ["personas"] }),
+    queryClient.invalidateQueries({ queryKey: ["managed-agents"] }),
+    // Persona avatar changes re-sync linked agents' relay profiles;
+    // invalidate cached user-profile and users-batch queries so the UI picks
+    // up the updated kind:0 picture without waiting for staleTime expiry —
+    // covers agent cards, message timelines, and member lists.
+    queryClient.invalidateQueries({
+      predicate: (query) =>
+        query.queryKey[0] === "user-profile" ||
+        query.queryKey[0] === "users-batch",
+    }),
+  ]);
+}
diff --git a/desktop/src/features/agents/lib/personaSaveNotice.test.mjs b/desktop/src/features/agents/lib/personaSaveNotice.test.mjs
new file mode 100644
index 0000000000..36f3fcdc8a
--- /dev/null
+++ b/desktop/src/features/agents/lib/personaSaveNotice.test.mjs
@@ -0,0 +1,29 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { personaSaveNotice } from "./personaSaveNotice.ts";
+
+test("test_plain_save_notice_says_nothing_about_the_catalog", () => {
+  const notice = personaSaveNotice("Helper", null);
+  assert.equal(notice, "Updated Helper.");
+  assert.ok(!/catalog/i.test(notice));
+});
+
+test("test_accepted_publish_notice_claims_the_catalog_has_the_edit", () => {
+  assert.match(
+    personaSaveNotice("Helper", "published"),
+    /published it to the community catalog/,
+  );
+});
+
+// The whole point of routing "Save and publish" through the strict command is
+// that a queued edit must NOT be reported as published — the relay hasn't taken
+// it yet, so the catalog still shows the old definition.
+test("test_queued_publish_notice_does_not_claim_the_edit_is_published", () => {
+  const notice = personaSaveNotice("Helper", "queued");
+  assert.match(notice, /queued/);
+  assert.ok(
+    !/\bpublished\b/.test(notice),
+    "a queued edit must not be described as published",
+  );
+});
diff --git a/desktop/src/features/agents/lib/personaSaveNotice.ts b/desktop/src/features/agents/lib/personaSaveNotice.ts
new file mode 100644
index 0000000000..f75f0e1c68
--- /dev/null
+++ b/desktop/src/features/agents/lib/personaSaveNotice.ts
@@ -0,0 +1,24 @@
+import type { PersonaSharePublicationResult } from "@/shared/api/tauriPersonas";
+
+/**
+ * The confirmation shown after a persona edit is saved.
+ *
+ * `publicationStatus` is null when the edit did not promise publication, so
+ * the copy stays silent about the catalog. When it did, the copy must
+ * distinguish a relay-accepted publish from a queued one — a "published"
+ * message for an edit still sitting in the outbox is the promise the
+ * "Save and publish" button was making falsely.
+ */
+export function personaSaveNotice(
+  displayName: string,
+  publicationStatus: PersonaSharePublicationResult["publicationStatus"] | null,
+): string {
+  switch (publicationStatus) {
+    case "published":
+      return `Updated ${displayName} and published it to the community catalog.`;
+    case "queued":
+      return `Updated ${displayName}. Publishing to the community catalog is queued and will appear after the relay accepts the update.`;
+    default:
+      return `Updated ${displayName}.`;
+  }
+}
diff --git a/desktop/src/features/agents/lib/usePersonaCatalogRelay.ts b/desktop/src/features/agents/lib/usePersonaCatalogRelay.ts
new file mode 100644
index 0000000000..c7835f9373
--- /dev/null
+++ b/desktop/src/features/agents/lib/usePersonaCatalogRelay.ts
@@ -0,0 +1,115 @@
+import * as React from "react";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+
+import {
+  fetchPersonaCatalogPublications,
+  type PersonaCatalogPublication,
+} from "@/features/agents/lib/personaCatalogRelay";
+import { invalidatePersonaEditCaches } from "@/features/agents/lib/personaEditCaches";
+import { relayClient } from "@/shared/api/relayClient";
+import {
+  setPersonaShared,
+  updatePersonaAndPublish,
+} from "@/shared/api/tauriPersonas";
+import type { AgentPersona, UpdatePersonaInput } from "@/shared/api/types";
+import { KIND_PERSONA } from "@/shared/constants/kinds";
+
+export function personaCatalogQueryKey(communityId: string | null) {
+  return ["persona-catalog", communityId] as const;
+}
+
+export function usePersonaCatalogQuery(communityId: string | null) {
+  return useQuery<PersonaCatalogPublication[]>({
+    enabled: communityId !== null,
+    queryKey: personaCatalogQueryKey(communityId),
+    queryFn: fetchPersonaCatalogPublications,
+    staleTime: 30_000,
+    refetchInterval: 120_000,
+  });
+}
+
+export function usePersonaCatalogLiveUpdates(communityId: string | null): void {
+  const queryClient = useQueryClient();
+
+  React.useEffect(() => {
+    if (!communityId) return;
+    let disposed = false;
+    let dispose: (() => Promise<void>) | null = null;
+
+    void relayClient
+      .subscribeLive({ kinds: [KIND_PERSONA], limit: 0 }, () => {
+        void queryClient.invalidateQueries({
+          queryKey: personaCatalogQueryKey(communityId),
+        });
+      })
+      .then((unsubscribe) => {
+        if (disposed) {
+          void unsubscribe();
+        } else {
+          dispose = unsubscribe;
+        }
+      })
+      .catch((error) => {
+        console.error(
+          "Couldn’t subscribe to the community agent catalog",
+          error,
+        );
+      });
+
+    const unsubscribeReconnect = relayClient.subscribeToReconnects(() => {
+      void queryClient.invalidateQueries({
+        queryKey: personaCatalogQueryKey(communityId),
+      });
+    });
+
+    return () => {
+      disposed = true;
+      unsubscribeReconnect();
+      if (dispose) void dispose();
+    };
+  }, [communityId, queryClient]);
+}
+
+export function useSetPersonaCatalogSharedMutation(communityId: string | null) {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: ({ id, shared }: { id: string; shared: boolean }) =>
+      setPersonaShared(id, shared),
+    onSuccess: (result) => {
+      queryClient.setQueryData<AgentPersona[]>(
+        ["personas"],
+        (current) =>
+          current?.map((persona) =>
+            persona.id === result.persona.id ? result.persona : persona,
+          ) ?? [result.persona],
+      );
+      void queryClient.invalidateQueries({
+        queryKey: personaCatalogQueryKey(communityId),
+      });
+    },
+  });
+}
+
+/**
+ * Save a persona edit and publish its catalog head, reporting the relay's
+ * verdict.
+ *
+ * The plain edit mutation only enqueues the head best-effort, so it cannot back
+ * the "Save and publish" promise. This awaits the relay and additionally
+ * refreshes the catalog query, since the published edit changes what the
+ * catalog shows.
+ */
+export function useUpdatePersonaAndPublishMutation(communityId: string | null) {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (input: UpdatePersonaInput) => updatePersonaAndPublish(input),
+    onSettled: async (_data, _error, variables) => {
+      await Promise.all([
+        invalidatePersonaEditCaches(queryClient, variables.id),
+        queryClient.invalidateQueries({
+          queryKey: personaCatalogQueryKey(communityId),
+        }),
+      ]);
+    },
+  });
+}
diff --git a/desktop/src/features/agents/lib/usePersonaSync.test.mjs b/desktop/src/features/agents/lib/usePersonaSync.test.mjs
index a1cbbf93fe..0dc12ddfd1 100644
--- a/desktop/src/features/agents/lib/usePersonaSync.test.mjs
+++ b/desktop/src/features/agents/lib/usePersonaSync.test.mjs
@@ -35,7 +35,7 @@ test("startPersonaSync backfills history including the deletion kind", () => {
     return Promise.resolve(() => Promise.resolve());
   });
 
-  startPersonaSync("owner-pubkey", () => false);
+  startPersonaSync("owner-pubkey", "wss://relay.example", () => false);
 
   assert.equal(fetchCalls.length, 1, "must do exactly one backfill fetch");
   assert.deepEqual(
@@ -58,3 +58,53 @@ test("startPersonaSync backfills history including the deletion kind", () => {
 
   mock.reset();
 });
+
+// Regression guard for the arrival-scope fix (F6): the reconcile must carry the
+// relay this subscription was opened on, NOT whichever community happens to be
+// active when the reconcile runs. Without the forwarded URL the backend falls
+// back to the active workspace and an in-flight event lands in the wrong
+// community's scoped retention store on a mid-flight switch.
+test("startPersonaSync forwards its own relay as the event arrival relay", async () => {
+  const invokes = [];
+  // @tauri-apps/api/core reads `window.__TAURI_INTERNALS__.invoke`.
+  globalThis.window = {
+    __TAURI_INTERNALS__: {
+      invoke: (cmd, args) => {
+        invokes.push({ cmd, args });
+        return Promise.resolve();
+      },
+    },
+  };
+
+  const ownEvent = { id: "e1", pubkey: "owner-pubkey", kind: KIND_PERSONA };
+  const foreignEvent = { id: "e2", pubkey: "someone-else", kind: KIND_PERSONA };
+
+  mock.method(relayClient, "fetchEvents", () =>
+    Promise.resolve([ownEvent, foreignEvent]),
+  );
+  mock.method(relayClient, "subscribeLive", () =>
+    Promise.resolve(() => Promise.resolve()),
+  );
+
+  startPersonaSync("owner-pubkey", "wss://community-a.example", () => false);
+  // Let the backfill promise chain and the reconcile invoke settle.
+  await new Promise((resolve) => setImmediate(resolve));
+
+  const reconciles = invokes.filter(
+    (call) => call.cmd === "reconcile_inbound_persona_event",
+  );
+  assert.equal(
+    reconciles.length,
+    1,
+    "only the subscribed author's event reconciles",
+  );
+  assert.equal(
+    reconciles[0].args.arrivalRelayUrl,
+    "wss://community-a.example",
+    "reconcile must carry the subscription's relay as the arrival relay",
+  );
+  assert.equal(JSON.parse(reconciles[0].args.eventJson).id, "e1");
+
+  mock.reset();
+  delete globalThis.window;
+});
diff --git a/desktop/src/features/agents/lib/usePersonaSync.ts b/desktop/src/features/agents/lib/usePersonaSync.ts
index e713ed71d1..f18194c5c6 100644
--- a/desktop/src/features/agents/lib/usePersonaSync.ts
+++ b/desktop/src/features/agents/lib/usePersonaSync.ts
@@ -20,19 +20,28 @@ const PERSONA_SYNC_KINDS = [
   KIND_DELETION,
 ];
 
-// Start the persona/team/agent/deletion sync for `pubkey`: one-shot backfill
-// of existing heads + tombstones, then a live subscription. Returns a disposer
-// that closes the live subscription. Extracted from the hook so the wiring is
-// unit-testable without a React renderer (see `usePersonaSync.test.mjs`).
+// Start the persona/team/agent/deletion sync for `pubkey` on `relayUrl`:
+// one-shot backfill of existing heads + tombstones, then a live subscription.
+// Returns a disposer that closes the live subscription. Extracted from the hook
+// so the wiring is unit-testable without a React renderer (see
+// `usePersonaSync.test.mjs`).
+//
+// `relayUrl` is the community this subscription is bound to, and every reconcile
+// carries it as the event's arrival relay. Capturing it here — rather than
+// letting the backend read whichever workspace is active when the reconcile runs
+// — is what keeps an in-flight event out of the next community's scoped store.
 export function startPersonaSync(
   pubkey: string,
+  relayUrl: string,
   onCancelled: () => boolean,
 ): () => Promise<void> {
   const reconcile = (event: RelayEvent) => {
     if (event.pubkey !== pubkey) return;
-    void reconcileInboundPersonaEvent(JSON.stringify(event)).catch((error) => {
-      console.warn("[usePersonaSync] reconcile failed:", error);
-    });
+    void reconcileInboundPersonaEvent(JSON.stringify(event), relayUrl).catch(
+      (error) => {
+        console.warn("[usePersonaSync] reconcile failed:", error);
+      },
+    );
   };
 
   // One-shot backfill of existing heads + tombstones (closes the fresh-start
@@ -68,23 +77,27 @@ export function startPersonaSync(
 
 // Subscribes to this device's own persona/team/agent projection + deletion
 // events and patches each into the local store. The subscription is keyed on
-// the active pubkey: an identity switch re-runs the effect, whose cleanup
-// closes the old subscription before a new one opens on the new pubkey's
-// filter — so no stale-coordinate subscription survives.
+// the active pubkey and relay: an identity or community switch re-runs the
+// effect, whose cleanup closes the old subscription before a new one opens on
+// the new filter — so no stale-coordinate subscription survives, and every
+// reconcile is attributed to the community it was subscribed to.
 //
 // A fresh device that comes online AFTER another already published gets no
 // history from a live-only subscription: relayClient's replayLiveSubscriptions
 // only replays from a since-cursor that is undefined until the first live
 // event arrives. So `startPersonaSync` does an explicit one-shot history fetch
 // up front and feeds each event through the same reconcile path.
-export function usePersonaSync(pubkey: string | undefined): void {
+export function usePersonaSync(
+  pubkey: string | undefined,
+  relayUrl: string | undefined,
+): void {
   React.useEffect(() => {
-    if (!pubkey) return;
+    if (!pubkey || !relayUrl) return;
     let cancelled = false;
-    const dispose = startPersonaSync(pubkey, () => cancelled);
+    const dispose = startPersonaSync(pubkey, relayUrl, () => cancelled);
     return () => {
       cancelled = true;
       void dispose();
     };
-  }, [pubkey]);
+  }, [pubkey, relayUrl]);
 }
diff --git a/desktop/src/features/agents/ui/AddCustomHarnessDialog.tsx b/desktop/src/features/agents/ui/AddCustomHarnessDialog.tsx
new file mode 100644
index 0000000000..0c84e99275
--- /dev/null
+++ b/desktop/src/features/agents/ui/AddCustomHarnessDialog.tsx
@@ -0,0 +1,47 @@
+import { CustomHarnessForm } from "@/features/settings/ui/CustomHarnessForm";
+import { ChooserDialogContent } from "@/shared/ui/chooser-dialog-content";
+import { Dialog } from "@/shared/ui/dialog";
+
+/**
+ * Registers a custom ACP harness from inside an agent dialog, so "New agent"
+ * is a complete entry point and not a dead end that sends the user to
+ * Settings. Hosts the same `CustomHarnessForm` the harness catalog uses.
+ */
+export function AddCustomHarnessDialog({
+  onOpenChange,
+  onSaved,
+  open,
+}: {
+  onOpenChange: (open: boolean) => void;
+  /** Called with the id of the harness that was just registered. */
+  onSaved: (id: string) => void;
+  open: boolean;
+}) {
+  return (
+    <Dialog onOpenChange={onOpenChange} open={open}>
+      <ChooserDialogContent
+        className="h-[42rem] max-w-2xl"
+        contentClassName="flex min-h-0 flex-1 p-0"
+        data-testid="add-custom-harness-dialog"
+        scrollAreaClassName="flex min-h-0 overflow-hidden px-0"
+        title="Add custom harness"
+      >
+        <CustomHarnessForm
+          chromeless
+          header={
+            <p className="text-sm text-muted-foreground">
+              Register any ACP-speaking agent tool as a selectable harness.
+            </p>
+          }
+          onCancel={() => onOpenChange(false)}
+          onSaved={(id) => {
+            // Dismiss on save as well as cancel — both exits belong to this
+            // dialog, so callers only handle the resulting selection.
+            onOpenChange(false);
+            onSaved(id);
+          }}
+        />
+      </ChooserDialogContent>
+    </Dialog>
+  );
+}
diff --git a/desktop/src/features/agents/ui/AgentCreationPreview.tsx b/desktop/src/features/agents/ui/AgentCreationPreview.tsx
index 1bdd93673b..e7a68211dc 100644
--- a/desktop/src/features/agents/ui/AgentCreationPreview.tsx
+++ b/desktop/src/features/agents/ui/AgentCreationPreview.tsx
@@ -133,6 +133,32 @@ export function AgentCreationPreview({
     isAvatarMenuOpen && activeTab === "emoji",
   );
 
+  // Emoji Mart mounts its search input inside a shadow root. Wait for it
+  // before focusing so the surrounding Radix popover cannot win the race.
+  React.useEffect(() => {
+    if (!isAvatarMenuOpen || activeTab !== "emoji") {
+      return;
+    }
+
+    let animationFrame = 0;
+    const focusSearchInput = () => {
+      const searchInput =
+        emojiPickerContainerRef.current
+          ?.querySelector("em-emoji-picker")
+          ?.shadowRoot?.querySelector<HTMLInputElement>(
+            'input[type="search"]',
+          ) ?? null;
+      if (!searchInput) {
+        animationFrame = window.requestAnimationFrame(focusSearchInput);
+        return;
+      }
+      searchInput.focus();
+    };
+
+    animationFrame = window.requestAnimationFrame(focusSearchInput);
+    return () => window.cancelAnimationFrame(animationFrame);
+  }, [activeTab, isAvatarMenuOpen]);
+
   const customColorDraft = React.useMemo(
     () => hsvToHex(customHue, customSaturation, customValue),
     [customHue, customSaturation, customValue],
@@ -550,6 +576,7 @@ export function AgentCreationPreview({
               style={emojiMartThemeVars}
             >
               <Picker
+                autoFocus
                 categories={EMOJI_MART_CATEGORIES}
                 data={emojiData}
                 dynamicWidth
@@ -577,7 +604,7 @@ export function AgentCreationPreview({
                   applyEmojiAvatar(emoji.native, nextColor);
                 }}
                 previewPosition="none"
-                searchPosition="none"
+                searchPosition="sticky"
                 set="native"
                 skinTonePosition="none"
                 theme="auto"
diff --git a/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx b/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx
index 5263920854..5425131448 100644
--- a/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx
+++ b/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx
@@ -8,7 +8,6 @@ import type {
   UpdatePersonaInput,
 } from "@/shared/api/types";
 import { cn } from "@/shared/lib/cn";
-import { Button } from "@/shared/ui/button";
 import { ChooserDialogContent } from "@/shared/ui/chooser-dialog-content";
 import { Dialog } from "@/shared/ui/dialog";
 import { Input } from "@/shared/ui/input";
@@ -18,6 +17,7 @@ import { PersonaDropdownField } from "./PersonaDropdownField";
 import type { EnvVarsValue } from "./EnvVarsEditor";
 import { PersonaAdvancedFields } from "./PersonaAdvancedFields";
 import { PersonaModelField } from "./PersonaModelField";
+import { runtimeAvailabilityWarning } from "./runtimeAvailabilityWarning";
 import { PersonaProviderApiKeyField } from "./PersonaProviderApiKeyField";
 import {
   canSubmitPersonaDialog,
@@ -35,6 +35,7 @@ import {
   AUTO_MODEL_DROPDOWN_VALUE,
   AUTO_PROVIDER_DROPDOWN_VALUE,
   BLOCK_BUILD_HIDDEN_PROVIDER_IDS,
+  buildPersonaRuntimeDropdownOptions,
   CUSTOM_PROVIDER_DROPDOWN_VALUE,
   computeLocalModeGate,
   formatRuntimeOptionLabel,
@@ -49,7 +50,6 @@ import {
   PERSONA_FIELD_SHELL_CLASS,
   PERSONA_LABEL_OPTIONAL_CLASS,
   shouldClearKnownModelForSelectionScope,
-  sortPersonaRuntimes,
 } from "./agentConfigOptions";
 import { RequiredFieldLabel } from "./agentConfigControls";
 import {
@@ -82,6 +82,13 @@ import {
 } from "./agentAiConfigurationPolicy";
 import { useProviderApiKeyFieldState } from "./providerApiKeyFieldState";
 import { buildRuntimeModelProviderPayload } from "./agentDefinitionSubmitPayload";
+import { AgentDefinitionDialogFooter } from "./AgentDefinitionDialogFooter";
+import { AddCustomHarnessDialog } from "./AddCustomHarnessDialog";
+import {
+  ADD_CUSTOM_HARNESS_OPTION,
+  runtimeDropdownAction,
+  usePendingHarnessSelection,
+} from "./addCustomHarness";
 
 type AgentDefinitionDialogProps = {
   open: boolean;
@@ -96,13 +103,20 @@ type AgentDefinitionDialogProps = {
   onOpenChange: (open: boolean) => void;
   onSubmit: (
     input: CreatePersonaInput | UpdatePersonaInput,
+    options: AgentDefinitionSubmitOptions,
   ) => 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;
 };
 
+export type AgentDefinitionSubmitOptions = {
+  publishCatalogUpdates: boolean;
+};
+
 const ADVANCED_FIELDS_MOTION_TRANSITION = {
   duration: 0.18,
   ease: [0.23, 1, 0.32, 1],
@@ -120,6 +134,7 @@ export function AgentDefinitionDialog({
   runtimesLoading = false,
   onOpenChange,
   onSubmit,
+  publishCatalogUpdatesOnSave = false,
   createRunSection,
   createSubmitBlocked = false,
 }: AgentDefinitionDialogProps) {
@@ -157,6 +172,8 @@ export function AgentDefinitionDialog({
   const [showAdvancedFields, setShowAdvancedFields] = React.useState(false);
   const [isAvatarUploadPending, setIsAvatarUploadPending] =
     React.useState(false);
+  const [hasUserChanges, setHasUserChanges] = React.useState(false);
+  const [isAddHarnessOpen, setIsAddHarnessOpen] = React.useState(false);
   const {
     globalConfig,
     inheritedDefaults: {
@@ -211,6 +228,7 @@ export function AgentDefinitionDialog({
     // Advanced always starts collapsed and only changes from its toggle.
     setShowAdvancedFields(false);
     setIsAvatarUploadPending(false);
+    setHasUserChanges(false);
     isRuntimeAutoSeededRef.current = false;
     hasSeededForOpenRef.current = false;
   }, [initialValues, open]);
@@ -296,6 +314,8 @@ export function AgentDefinitionDialog({
       behaviorSeedRef.current = emptyPersonaBehaviorDraft;
       setShowAdvancedFields(false);
       setIsAvatarUploadPending(false);
+      setHasUserChanges(false);
+      setIsAddHarnessOpen(false);
       // isRuntimeAutoSeededRef and hasSeededForOpenRef are NOT reset here — the
       // [initialValues, open] effect resets both when the dialog re-opens.
     }
@@ -347,14 +367,19 @@ export function AgentDefinitionDialog({
     };
 
     if ("id" in initialValues) {
-      await onSubmit({
-        id: initialValues.id,
-        ...baseInput,
-      });
+      await onSubmit(
+        {
+          id: initialValues.id,
+          ...baseInput,
+        },
+        {
+          publishCatalogUpdates: publishCatalogUpdatesOnSave && hasUserChanges,
+        },
+      );
       return;
     }
 
-    await onSubmit(baseInput);
+    await onSubmit(baseInput, { publishCatalogUpdates: false });
   }
 
   function handleSubmitForm(event: React.FormEvent<HTMLFormElement>) {
@@ -381,6 +406,7 @@ export function AgentDefinitionDialog({
     enabled: open,
   });
   function handleAiConfigurationModeChange(nextMode: AgentAiConfigurationMode) {
+    setHasUserChanges(true);
     setAiConfigurationMode(nextMode);
     setIsCustomProviderEditing(false);
     setIsCustomModelEditing(false);
@@ -552,44 +578,15 @@ export function AgentDefinitionDialog({
   const showCustomProviderInput =
     llmProviderFieldVisible && isCustomProviderEditing;
   const runtimeDropdownValue = runtime.trim() || NO_RUNTIME_DROPDOWN_VALUE;
-  const sortedRuntimes = React.useMemo(
-    () => sortPersonaRuntimes(runtimes),
-    [runtimes],
-  );
-  const blankRuntimeOptionLabel = runtimesLoading
-    ? "Loading harnesses..."
-    : isCreateMode
-      ? "Choose a harness"
-      : "No preference (use app default)";
-  const runtimeDropdownOptions: PersonaDropdownOption[] = [
-    ...(!isCreateMode
-      ? [
-          {
-            label: blankRuntimeOptionLabel,
-            value: NO_RUNTIME_DROPDOWN_VALUE,
-          },
-        ]
-      : []),
-    ...sortedRuntimes.map((candidate) => ({
-      disabled:
-        isCreateMode &&
-        defaultRuntime !== null &&
-        candidate.availability !== "available",
-      label: `${formatRuntimeOptionLabel(candidate)}${
-        isCreateMode && candidate.id === defaultRuntime?.id ? " (default)" : ""
-      }`,
-      value: candidate.id,
-    })),
-  ];
-  if (
-    runtime.trim().length > 0 &&
-    !runtimeDropdownOptions.some((option) => option.value === runtime)
-  ) {
-    runtimeDropdownOptions.push({
-      label: `${runtime.trim()} (current)`,
-      value: runtime.trim(),
+  const { blankRuntimeOptionLabel, runtimeDropdownOptions } =
+    buildPersonaRuntimeDropdownOptions({
+      defaultRuntimeId: defaultRuntime?.id,
+      isCreateMode,
+      runtime,
+      runtimes,
+      runtimesLoading,
     });
-  }
+  runtimeDropdownOptions.push(ADD_CUSTOM_HARNESS_OPTION);
   const runtimeSummaryLabel = selectedRuntime
     ? formatRuntimeOptionLabel(selectedRuntime)
     : runtime.trim() || "Not configured";
@@ -620,19 +617,14 @@ export function AgentDefinitionDialog({
       );
   const previewLabel = displayName.trim() || "Agent name";
   const previewAvatarUrl = avatarUrl.trim() || null;
-  const runtimeWarning =
-    selectedRuntime && selectedRuntime.availability !== "available" ? (
-      <p className="text-xs text-warning">
-        {selectedRuntime.availability === "adapter_missing"
-          ? `${selectedRuntime.label} CLI is installed but the ACP adapter is missing.`
-          : selectedRuntime.availability === "adapter_outdated"
-            ? `${selectedRuntime.label} ACP adapter is outdated — reinstall to continue.`
-            : selectedRuntime.requiresExternalCli
-              ? `${selectedRuntime.label} CLI is missing. ${selectedRuntime.installHint}`
-              : `${selectedRuntime.label} is not installed.`}{" "}
-        Visit Settings &gt; Agents to set it up.
-      </p>
-    ) : null;
+  const runtimeWarningText = selectedRuntime
+    ? runtimeAvailabilityWarning(selectedRuntime)
+    : null;
+  const runtimeWarning = runtimeWarningText ? (
+    <p className="text-xs text-warning">
+      {runtimeWarningText} Visit Settings &gt; Agents to set it up.
+    </p>
+  ) : null;
   const advancedFieldsTransition = shouldReduceMotion
     ? { duration: 0 }
     : ADVANCED_FIELDS_MOTION_TRANSITION;
@@ -679,8 +671,13 @@ export function AgentDefinitionDialog({
   }
 
   function handleRuntimeDropdownChange(nextValue: string) {
-    const nextRuntime =
-      nextValue === NO_RUNTIME_DROPDOWN_VALUE ? "" : nextValue;
+    const action = runtimeDropdownAction(nextValue);
+    if (action.kind === "add-custom-harness") {
+      setIsAddHarnessOpen(true);
+      return;
+    }
+    setHasUserChanges(true);
+    const nextRuntime = action.runtimeId;
     // The user made an explicit choice — no longer auto-seeded.
     isRuntimeAutoSeededRef.current = false;
     setRuntime(nextRuntime);
@@ -696,7 +693,17 @@ export function AgentDefinitionDialog({
     );
   }
 
+  // Routed through the normal change handler so a harness registered inline
+  // resets model/provider exactly as a hand-picked one would. Scoped to `open`
+  // so a pending id can't outlive the dialog that started the registration.
+  const selectSavedHarness = usePendingHarnessSelection(
+    runtimes,
+    handleRuntimeDropdownChange,
+    open,
+  );
+
   function handleProviderDropdownChange(nextValue: string) {
+    setHasUserChanges(true);
     const nextProvider =
       nextValue === AUTO_PROVIDER_DROPDOWN_VALUE ? "" : nextValue;
     if (nextProvider === "relay-mesh" && runtime !== "buzz-agent") {
@@ -714,6 +721,7 @@ export function AgentDefinitionDialog({
   }
 
   function handleModelDropdownChange(nextValue: string) {
+    setHasUserChanges(true);
     applySelection(
       selectionOnModelDropdownChange(selection, {
         nextValue,
@@ -740,42 +748,38 @@ export function AgentDefinitionDialog({
         headerClassName="pb-2"
         title={title}
         footer={
-          <div className="flex w-full items-center justify-end gap-2">
-            <Button
-              disabled={isPending || isAvatarUploadPending}
-              onClick={() => handleOpenChange(false)}
-              type="button"
-              variant="outline"
-            >
-              Cancel
-            </Button>
-            <Button
-              data-testid="persona-dialog-submit"
-              disabled={!canSubmit}
-              form="persona-dialog-form"
-              type="submit"
-            >
-              {isPending
-                ? "Saving..."
-                : isAvatarUploadPending
-                  ? "Uploading..."
-                  : submitLabel}
-            </Button>
-          </div>
+          <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={() => setAvatarUrl("")}
+            onClearAvatar={() => {
+              setHasUserChanges(true);
+              setAvatarUrl("");
+            }}
             onUploadPendingChange={setIsAvatarUploadPending}
-            onSelectAvatar={setAvatarUrl}
+            onSelectAvatar={(nextAvatarUrl) => {
+              setHasUserChanges(true);
+              setAvatarUrl(nextAvatarUrl);
+            }}
           />
 
           <div className="space-y-5">
@@ -962,6 +966,12 @@ export function AgentDefinitionDialog({
               returnFocusRef={aiDefaultsTriggerRef}
             />
 
+            <AddCustomHarnessDialog
+              onOpenChange={setIsAddHarnessOpen}
+              onSaved={selectSavedHarness}
+              open={isAddHarnessOpen}
+            />
+
             {isCreateMode ? createRunSection : null}
 
             <div className="space-y-3">
@@ -1012,7 +1022,10 @@ export function AgentDefinitionDialog({
                       model={model}
                       modelTuningRuntimeId={runtime}
                       namePoolText={namePoolText}
-                      onBehaviorDraftChange={setBehaviorDraft}
+                      onBehaviorDraftChange={(nextBehaviorDraft) => {
+                        setHasUserChanges(true);
+                        setBehaviorDraft(nextBehaviorDraft);
+                      }}
                       onEnvVarsChange={setEnvVars}
                       onNamePoolTextChange={setNamePoolText}
                       provider={effectiveProvider}
diff --git a/desktop/src/features/agents/ui/AgentDefinitionDialogFooter.tsx b/desktop/src/features/agents/ui/AgentDefinitionDialogFooter.tsx
new file mode 100644
index 0000000000..92428ad95c
--- /dev/null
+++ b/desktop/src/features/agents/ui/AgentDefinitionDialogFooter.tsx
@@ -0,0 +1,70 @@
+import { Button } from "@/shared/ui/button";
+
+type AgentDefinitionDialogFooterProps = {
+  canSubmit: boolean;
+  isAvatarUploadPending: boolean;
+  isPending: boolean;
+  onCancel: () => void;
+  publishesCatalogUpdates: boolean;
+  submitBlockReason: string | null;
+  submitLabel: string;
+};
+
+export function AgentDefinitionDialogFooter({
+  canSubmit,
+  isAvatarUploadPending,
+  isPending,
+  onCancel,
+  publishesCatalogUpdates,
+  submitBlockReason,
+  submitLabel,
+}: AgentDefinitionDialogFooterProps) {
+  return (
+    <div className="flex w-full flex-wrap items-center justify-between gap-3">
+      <div className="flex min-h-9 min-w-0 flex-wrap items-center gap-3">
+        {submitBlockReason ? (
+          <p
+            className="text-2xs text-muted-foreground"
+            data-testid="persona-dialog-submit-reason"
+          >
+            {submitBlockReason}
+          </p>
+        ) : null}
+        {publishesCatalogUpdates ? (
+          <p
+            className="max-w-sm text-xs text-muted-foreground"
+            data-testid="persona-dialog-catalog-publish-notice"
+          >
+            This agent is in the community catalog. Your changes will be
+            published when you save.
+          </p>
+        ) : null}
+      </div>
+
+      <div className="flex items-center gap-2">
+        <Button
+          disabled={isPending || isAvatarUploadPending}
+          onClick={onCancel}
+          type="button"
+          variant="outline"
+        >
+          Cancel
+        </Button>
+        <Button
+          data-testid="persona-dialog-submit"
+          disabled={!canSubmit}
+          form="persona-dialog-form"
+          type="submit"
+        >
+          {isPending
+            ? "Saving..."
+            : isAvatarUploadPending
+              ? "Uploading..."
+              : publishesCatalogUpdates
+                ? "Save and publish"
+                : submitLabel}
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/desktop/src/features/agents/ui/AgentDefinitionMetadata.tsx b/desktop/src/features/agents/ui/AgentDefinitionMetadata.tsx
new file mode 100644
index 0000000000..50109143cd
--- /dev/null
+++ b/desktop/src/features/agents/ui/AgentDefinitionMetadata.tsx
@@ -0,0 +1,55 @@
+import { cn } from "@/shared/lib/cn";
+
+export function AgentDefinitionMetadata({
+  className,
+  isBuiltIn,
+  model,
+  runtime,
+}: {
+  className?: string;
+  isBuiltIn: boolean;
+  model: string | null;
+  runtime: string | null;
+}) {
+  const items = [
+    {
+      label: "Type",
+      value: isBuiltIn ? "Built-in agent" : "Custom agent",
+    },
+    {
+      label: "Preferred model",
+      value: model ?? "Use app default",
+    },
+    {
+      label: "Preferred runtime",
+      value: runtime ?? "Use app default",
+    },
+  ];
+
+  return (
+    <div
+      className={cn("rounded-lg border border-border/70 bg-card/70", className)}
+      data-testid="agent-definition-metadata"
+    >
+      <div className="grid sm:grid-cols-3">
+        {items.map((item, index) => (
+          <div
+            className={cn(
+              "relative px-4 py-3",
+              index > 0 &&
+                "border-t border-border/60 sm:border-t-0 sm:before:absolute sm:before:bottom-3 sm:before:left-0 sm:before:top-3 sm:before:w-px sm:before:bg-border/70",
+            )}
+            key={item.label}
+          >
+            <p className="text-xs font-semibold text-muted-foreground">
+              {item.label}
+            </p>
+            <p className="mt-2 text-sm font-medium text-foreground">
+              {item.value}
+            </p>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}
diff --git a/desktop/src/features/agents/ui/AgentDialog.tsx b/desktop/src/features/agents/ui/AgentDialog.tsx
index 02a6d0e64a..f5be3cc7e8 100644
--- a/desktop/src/features/agents/ui/AgentDialog.tsx
+++ b/desktop/src/features/agents/ui/AgentDialog.tsx
@@ -11,7 +11,10 @@ import type { AgentCreateIntent } from "./agentCreateIntent";
 import type { EditAgentFocusTarget } from "@/features/agents/openEditAgentEvent";
 import { AgentInstanceEditDialog } from "./AgentInstanceEditDialog";
 import { createPersonaDialogState } from "./personaDialogState";
-import { AgentDefinitionDialog } from "./AgentDefinitionDialog";
+import {
+  AgentDefinitionDialog,
+  type AgentDefinitionSubmitOptions,
+} from "./AgentDefinitionDialog";
 import { WhereToRunSection } from "./WhereToRunSection";
 import {
   canSubmitWhereToRun,
@@ -64,7 +67,9 @@ type AgentDialogDefinitionEditProps = {
   onOpenChange: (open: boolean) => void;
   onSubmit: (
     input: CreatePersonaInput | UpdatePersonaInput,
+    options: AgentDefinitionSubmitOptions,
   ) => Promise<unknown>;
+  publishCatalogUpdatesOnSave?: boolean;
 };
 
 type AgentDialogProps =
diff --git a/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx b/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx
index 86a70c3db6..f3c410e2ff 100644
--- a/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx
+++ b/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx
@@ -83,6 +83,12 @@ import { useProviderApiKeyFieldState } from "./providerApiKeyFieldState";
 import { resolveModelFieldStatusMessage } from "./agentConfigControls";
 import { AdvancedRequiredBadge } from "./AdvancedRequiredBadge";
 import { showAgentProfileSyncWarning } from "./agentProfileSyncWarning";
+import { AddCustomHarnessDialog } from "./AddCustomHarnessDialog";
+import {
+  ADD_CUSTOM_HARNESS_OPTION,
+  runtimeDropdownAction,
+  usePendingHarnessSelection,
+} from "./addCustomHarness";
 
 const ADVANCED_FIELDS_MOTION_TRANSITION = {
   duration: 0.18,
@@ -157,6 +163,7 @@ export function AgentInstanceEditDialog({
   const [avatarUrl, setAvatarUrl] = React.useState(agent.avatarUrl ?? "");
   const [isAvatarUploadPending, setIsAvatarUploadPending] =
     React.useState(false);
+  const [isAddHarnessOpen, setIsAddHarnessOpen] = React.useState(false);
   const shouldReduceMotion = useReducedMotion();
 
   // Runtime selector: defaults to "custom" until the dialog opens and the
@@ -191,6 +198,7 @@ export function AgentInstanceEditDialog({
       setAvatarUrl(agent.avatarUrl ?? "");
       setShowAdvancedFields(false);
       setIsAvatarUploadPending(false);
+      setIsAddHarnessOpen(false);
       runtimeTouched.current = false;
       const matched =
         runtimes.find((r) => r.command?.trim() === agent.agentCommand.trim()) ??
@@ -244,6 +252,7 @@ export function AgentInstanceEditDialog({
         value: selectedRuntimeId,
       });
     }
+    options.push(ADD_CUSTOM_HARNESS_OPTION);
     return options;
   }, [sortedRuntimes, selectedRuntimeId]);
 
@@ -484,8 +493,12 @@ export function AgentInstanceEditDialog({
   }
 
   function handleRuntimeDropdownChange(nextValue: string) {
-    const nextRuntimeId =
-      nextValue === NO_RUNTIME_DROPDOWN_VALUE ? "" : nextValue;
+    const action = runtimeDropdownAction(nextValue);
+    if (action.kind === "add-custom-harness") {
+      setIsAddHarnessOpen(true);
+      return;
+    }
+    const nextRuntimeId = action.runtimeId;
     const previousRuntimeId = selectedRuntimeId;
     const nextRuntime = runtimes.find((r) => r.id === nextRuntimeId);
 
@@ -532,6 +545,16 @@ export function AgentInstanceEditDialog({
     );
   }
 
+  // Routed through the normal change handler so a harness registered inline
+  // pins its command and resets model/provider like a hand-picked one. Scoped
+  // to `open` so a pending id can't outlive the dialog that started the
+  // registration.
+  const selectSavedHarness = usePendingHarnessSelection(
+    runtimes,
+    handleRuntimeDropdownChange,
+    open,
+  );
+
   function handleProviderDropdownChange(nextValue: string) {
     const nextProvider =
       nextValue === AUTO_PROVIDER_DROPDOWN_VALUE ? "" : nextValue;
@@ -655,30 +678,36 @@ export function AgentInstanceEditDialog({
           parsedParallelism > 0 && parsedParallelism !== agent.parallelism
             ? parsedParallelism
             : undefined,
-        // Use tri-state: send null to clear, value to set, omit if unchanged.
+        // Linked instances defer model/provider/systemPrompt to the definition.
         systemPrompt:
-          (systemPrompt.trim() || null) !== agent.systemPrompt
-            ? systemPrompt.trim() || null
-            : undefined,
+          linkedPersona != null
+            ? undefined
+            : (systemPrompt.trim() || null) !== agent.systemPrompt
+              ? systemPrompt.trim() || null
+              : undefined,
         model:
-          normalizedModel !== (agent.model ?? null)
-            ? normalizedModel
-            : undefined,
+          linkedPersona != null
+            ? undefined
+            : normalizedModel !== (agent.model ?? null)
+              ? normalizedModel
+              : undefined,
         // Tri-state provider persistence keyed on providerRuntimeCapability:
         //   "capable"  → persist: value if changed, omit if unchanged.
         //   "locked"   → clear: send null if provider was set, else omit.
         //   "unknown"  → omit always (never send null for a transient state).
         // llmProviderFieldVisible is for UX visibility only; not used here.
         provider:
-          providerRuntimeCapability === "capable"
-            ? normalizedSubmitProvider !== (agent.provider ?? null)
-              ? normalizedSubmitProvider
-              : undefined
-            : providerRuntimeCapability === "locked"
-              ? (agent.provider ?? null) !== null
-                ? null
+          linkedPersona != null
+            ? undefined
+            : providerRuntimeCapability === "capable"
+              ? normalizedSubmitProvider !== (agent.provider ?? null)
+                ? normalizedSubmitProvider
                 : undefined
-              : undefined, // "unknown" → omit always
+              : providerRuntimeCapability === "locked"
+                ? (agent.provider ?? null) !== null
+                  ? null
+                  : undefined
+                : undefined, // "unknown" → omit always
         envVars: envVarsEqual(submitEnvVars, agent.envVars)
           ? undefined
           : submitEnvVars,
@@ -943,6 +972,11 @@ export function AgentInstanceEditDialog({
                   </span>
                 </p>
               ) : null}
+              <AddCustomHarnessDialog
+                onOpenChange={setIsAddHarnessOpen}
+                onSaved={selectSavedHarness}
+                open={isAddHarnessOpen}
+              />
             </div>
             {selectedRuntimeId === "custom" && !inheritHarness ? (
               <div className="space-y-1.5">
diff --git a/desktop/src/features/agents/ui/AgentSnapshotImportDialog.tsx b/desktop/src/features/agents/ui/AgentSnapshotImportDialog.tsx
index ad1219310d..4a9584dfb9 100644
--- a/desktop/src/features/agents/ui/AgentSnapshotImportDialog.tsx
+++ b/desktop/src/features/agents/ui/AgentSnapshotImportDialog.tsx
@@ -15,6 +15,8 @@ import {
 } from "@/shared/ui/dialog";
 import { Separator } from "@/shared/ui/separator";
 
+import { AgentDefinitionMetadata } from "./AgentDefinitionMetadata";
+
 // ── Types ─────────────────────────────────────────────────────────────────────
 
 type ImportPhase = "preview" | "confirming" | "result";
@@ -164,6 +166,12 @@ function PreviewBody({
         ) : null}
       </div>
 
+      <AgentDefinitionMetadata
+        isBuiltIn={preview.isBuiltIn}
+        model={preview.model}
+        runtime={preview.runtime}
+      />
+
       <p className="text-sm text-muted-foreground">
         A new agent will be created with a fresh keypair. The imported agent is
         independent of the source — identity never travels.
diff --git a/desktop/src/features/agents/ui/AgentsView.tsx b/desktop/src/features/agents/ui/AgentsView.tsx
index 34d40ee809..ce463a4d9b 100644
--- a/desktop/src/features/agents/ui/AgentsView.tsx
+++ b/desktop/src/features/agents/ui/AgentsView.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { OctagonX } from "lucide-react";
+import { OctagonX, Settings2 } from "lucide-react";
 import {
   consumePendingSnapshotImport,
   subscribeSnapshotImport,
@@ -17,12 +17,14 @@ import { AgentSnapshotImportDialog } from "./AgentSnapshotImportDialog";
 import { TeamSnapshotExportDialog } from "./TeamSnapshotExportDialog";
 import { TeamSnapshotImportDialog } from "./TeamSnapshotImportDialog";
 import { TeamShareDialog } from "./TeamShareDialog";
-import { RelayDirectorySection } from "./RelayDirectorySection";
 import { SecretRevealDialog } from "./SecretRevealDialog";
 import { TeamDeleteDialog } from "./TeamDeleteDialog";
 import { TeamDialog } from "./TeamDialog";
 import { TeamsSection } from "./TeamsSection";
-import { UnifiedAgentsSection } from "./UnifiedAgentsSection";
+import {
+  AGENT_CARD_GRID_COLUMNS_CLASS,
+  UnifiedAgentsSection,
+} from "./UnifiedAgentsSection";
 import { useManagedAgentActions } from "./useManagedAgentActions";
 import { usePersonaActions } from "./usePersonaActions";
 import { useTeamActions } from "./useTeamActions";
@@ -72,11 +74,14 @@ export function AgentsView() {
   const runningAgentCount = agents.managedAgents.filter((agent) =>
     isManagedAgentActive(agent),
   ).length;
-  // Show the resolved effective model, not just the structured `model` field:
-  // most providers persist the model as a provider env var (e.g. DATABRICKS_MODEL)
-  // or inherit a baked build default, leaving `globalConfig.model` null.
-  const configuredGlobalModel = inheritedDefaults.model.value;
-
+  const hasSavedAgentDefaults = Boolean(
+    globalConfig.preferred_runtime?.trim() ||
+      globalConfig.provider?.trim() ||
+      globalConfig.model?.trim() ||
+      Object.values(globalConfig.env_vars).some(
+        (value) => value.trim().length > 0,
+      ),
+  );
   // biome-ignore lint/correctness/useExhaustiveDependencies: mount-only; personas.handleImportSnapshotFile and teamActions.handleImportTeamSnapshotFile are stable
   React.useEffect(() => {
     // Consume a snapshot import that was enqueued before navigation (e.g. from
@@ -108,18 +113,23 @@ export function AgentsView() {
   return (
     <>
       <div className="flex-1 overflow-y-auto overflow-x-hidden overscroll-contain px-4 py-7 sm:px-6 sm:py-8">
-        <div className="mx-auto flex w-full max-w-6xl flex-col gap-8">
+        <div
+          className={`mx-auto grid w-full max-w-6xl ${AGENT_CARD_GRID_COLUMNS_CLASS} justify-start gap-x-3 gap-y-8`}
+        >
           <PageHeader
+            className="col-[1/-1]"
             action={
               <div className="flex flex-wrap justify-end gap-2">
                 <Button
-                  onClick={() => setIsAiDefaultsOpen(true)}
+                  data-testid="agent-defaults-button"
                   ref={aiDefaultsTriggerRef}
+                  onClick={() => setIsAiDefaultsOpen(true)}
                   size="sm"
                   variant="outline"
                 >
-                  {configuredGlobalModel
-                    ? `Default model: ${configuredGlobalModel}`
+                  <Settings2 />
+                  {hasSavedAgentDefaults
+                    ? "Agent defaults"
                     : "Set agent defaults"}
                 </Button>
                 {runningAgentCount > 0 ? (
@@ -137,11 +147,10 @@ export function AgentsView() {
                 ) : null}
               </div>
             }
-            className="mx-auto w-full max-w-[996px]"
             description="Set up and manage your agents."
             title="Agents"
           />
-          <div className="flex flex-col gap-8">
+          <div className="col-[1/-1] flex flex-col gap-8">
             <UnifiedAgentsSection
               defaultModel={inheritedDefaults.model.value}
               actionErrorMessage={agents.actionErrorMessage}
@@ -169,7 +178,6 @@ export function AgentsView() {
                 void agents.handleStartPersona(persona);
               }}
               // Persona props
-              canChooseCatalog={personas.catalogPersonas.length > 0}
               personas={personas.libraryPersonas}
               personasError={
                 personas.personasQuery.error instanceof Error
@@ -188,10 +196,8 @@ export function AgentsView() {
               }
               isPersonasLoading={personas.personasQuery.isLoading}
               isPersonasPending={personas.isPending}
-              onCreatePersona={() => {
-                openUnifiedCreate();
-              }}
-              onChooseCatalog={personas.openCatalog}
+              onCreatePersona={openUnifiedCreate}
+              onDiscoverPersonas={personas.openCatalog}
               onDuplicatePersona={personas.openDuplicate}
               onEditPersona={personas.openEdit}
               onSharePersona={personas.openShare}
@@ -234,17 +240,6 @@ export function AgentsView() {
               personas={personas.libraryPersonas}
               teams={teamActions.teams}
             />
-
-            <RelayDirectorySection
-              error={
-                agents.relayAgentsQuery.error instanceof Error
-                  ? agents.relayAgentsQuery.error
-                  : null
-              }
-              isLoading={agents.relayAgentsQuery.isLoading}
-              managedPubkeys={agents.managedPubkeys}
-              relayAgents={agents.relayAgentsQuery.data ?? []}
-            />
           </div>
         </div>
       </div>
@@ -308,9 +303,11 @@ export function AgentsView() {
           error={
             personas.updatePersonaMutation.error instanceof Error
               ? personas.updatePersonaMutation.error
-              : personas.createPersonaMutation.error instanceof Error
-                ? personas.createPersonaMutation.error
-                : null
+              : personas.updatePersonaAndPublishMutation.error instanceof Error
+                ? personas.updatePersonaAndPublishMutation.error
+                : personas.createPersonaMutation.error instanceof Error
+                  ? personas.createPersonaMutation.error
+                  : null
           }
           initialValues={personas.personaDialogState.initialValues}
           isPending={personas.isPending}
@@ -322,8 +319,22 @@ export function AgentsView() {
               personas.setPersonaDialogState(null);
             }
           }}
-          onSubmit={personas.handleSubmit}
+          onSubmit={(input, options) =>
+            personas.handleSubmit(
+              input,
+              undefined,
+              undefined,
+              undefined,
+              options,
+            )
+          }
           open={personas.personaDialogState !== null}
+          publishCatalogUpdatesOnSave={
+            "id" in personas.personaDialogState.initialValues &&
+            personas.sharedCatalogPersonaIdSet.has(
+              personas.personaDialogState.initialValues.id,
+            )
+          }
           submitLabel={personas.personaDialogState.submitLabel}
           title={personas.personaDialogState.title}
         />
@@ -349,8 +360,20 @@ export function AgentsView() {
       ) : null}
       {personas.personaToShare ? (
         <PersonaShareDialog
+          catalogShareLevel={personas.getPersonaCatalogShareLevel(
+            personas.personaToShare.persona,
+          )}
           isPending={personas.isPending}
           linkedAgentPubkey={personas.personaToShare.linkedAgentPubkey}
+          effectiveAvatarUrl={personas.personaToShare.effectiveAvatarUrl}
+          onCatalogShareLevelChange={(shareLevel) => {
+            const shareTarget = personas.personaToShare;
+            if (!shareTarget) return;
+            void personas.setPersonaCatalogShareLevel(
+              shareTarget.persona,
+              shareLevel,
+            );
+          }}
           onExport={() => {
             const shareTarget = personas.personaToShare;
             if (!shareTarget) return;
@@ -377,6 +400,7 @@ export function AgentsView() {
               personas.handleExportSnapshot(
                 personas.personaToExportSnapshot.persona,
                 personas.personaToExportSnapshot.linkedAgentPubkey,
+                personas.personaToExportSnapshot.effectiveAvatarUrl,
                 memoryLevel,
                 format,
               );
@@ -409,8 +433,8 @@ export function AgentsView() {
       {personas.isCatalogDialogOpen ? (
         <PersonaCatalogDialog
           error={
-            personas.personasQuery.error instanceof Error
-              ? personas.personasQuery.error
+            personas.catalogQuery.error instanceof Error
+              ? personas.catalogQuery.error
               : null
           }
           feedbackErrorMessage={
@@ -423,8 +447,8 @@ export function AgentsView() {
               ? personas.personaNoticeMessage
               : null
           }
-          isLoading={personas.personasQuery.isLoading}
-          isPending={personas.setPersonaActiveMutation.isPending}
+          isLoading={personas.catalogQuery.isLoading}
+          isPending={personas.isPending}
           onClearFeedback={() => {
             personas.clearFeedback("catalog");
           }}
diff --git a/desktop/src/features/agents/ui/CreateIdentityCard.tsx b/desktop/src/features/agents/ui/CreateIdentityCard.tsx
index 70d063098b..4fdd6db26f 100644
--- a/desktop/src/features/agents/ui/CreateIdentityCard.tsx
+++ b/desktop/src/features/agents/ui/CreateIdentityCard.tsx
@@ -6,7 +6,7 @@ import { cn } from "@/shared/lib/cn";
 type CreateIdentityCardProps = React.ButtonHTMLAttributes<HTMLButtonElement> & {
   ariaLabel: string;
   dataTestId: string;
-  label: string;
+  label?: string;
 };
 
 export const CreateIdentityCard = React.forwardRef<
@@ -30,7 +30,9 @@ export const CreateIdentityCard = React.forwardRef<
     >
       <span className="flex flex-col items-center justify-center gap-2 text-center">
         <Plus className="h-7 w-7 transition-colors" />
-        <span className="text-sm font-medium leading-5">{label}</span>
+        {label ? (
+          <span className="text-sm font-medium leading-5">{label}</span>
+        ) : null}
       </span>
     </button>
   );
diff --git a/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx b/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx
index 35de0d983d..8412792a2c 100644
--- a/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx
+++ b/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx
@@ -211,29 +211,32 @@ export function EditAgentAdvancedFields({
         </div>
       </div>
 
-      {/* System prompt override */}
-      <div className="space-y-1.5">
-        <label
-          className="text-sm font-medium text-foreground"
-          htmlFor="edit-agent-system-prompt"
-        >
-          System prompt override
-          <span className={PERSONA_LABEL_OPTIONAL_CLASS}>Optional</span>
-        </label>
-        <div className={PERSONA_FIELD_SHELL_CLASS}>
-          <Textarea
-            className={cn(
-              "min-h-24 resize-y px-3 py-3 leading-5",
-              PERSONA_FIELD_CONTROL_CLASS,
-            )}
-            disabled={disabled}
-            id="edit-agent-system-prompt"
-            onChange={(event) => onSystemPromptChange(event.target.value)}
-            placeholder="Leave blank to send no ACP system prompt"
-            value={systemPrompt}
-          />
+      {/* System prompt override — hidden for linked instances; the persona
+          definition is authoritative and the backend will reject any override. */}
+      {linkedPersona == null && (
+        <div className="space-y-1.5">
+          <label
+            className="text-sm font-medium text-foreground"
+            htmlFor="edit-agent-system-prompt"
+          >
+            System prompt override
+            <span className={PERSONA_LABEL_OPTIONAL_CLASS}>Optional</span>
+          </label>
+          <div className={PERSONA_FIELD_SHELL_CLASS}>
+            <Textarea
+              className={cn(
+                "min-h-24 resize-y px-3 py-3 leading-5",
+                PERSONA_FIELD_CONTROL_CLASS,
+              )}
+              disabled={disabled}
+              id="edit-agent-system-prompt"
+              onChange={(event) => onSystemPromptChange(event.target.value)}
+              placeholder="Leave blank to send no ACP system prompt"
+              value={systemPrompt}
+            />
+          </div>
         </div>
-      </div>
+      )}
 
       {/* Env vars */}
       <EnvVarsEditor
diff --git a/desktop/src/features/agents/ui/ManagedAgentRow.tsx b/desktop/src/features/agents/ui/ManagedAgentRow.tsx
index f39d96fd26..606d2b7883 100644
--- a/desktop/src/features/agents/ui/ManagedAgentRow.tsx
+++ b/desktop/src/features/agents/ui/ManagedAgentRow.tsx
@@ -238,7 +238,12 @@ function AgentSummary({
               <Badge variant="secondary">{personaLabel}</Badge>
             ) : null}
             <AgentOriginBadge agent={agent} />
-            {agent.needsRestart ? (
+            {agent.personaOrphaned ? (
+              <Badge className="gap-1" variant="warning">
+                <AlertTriangle className="h-3 w-3" />
+                Configuration missing
+              </Badge>
+            ) : agent.needsRestart ? (
               <Badge className="gap-1" variant="warning">
                 <RefreshCw className="h-3 w-3" />
                 Restart required
@@ -261,7 +266,12 @@ function AgentSummary({
               <span>Remote deployment</span>
             )}
           </div>
-          {agent.needsRestart ? (
+          {agent.personaOrphaned ? (
+            <p className="mt-1.5 text-xs text-amber-600 dark:text-amber-400">
+              This agent's configuration is missing — it may still be syncing or
+              was deleted on another device.
+            </p>
+          ) : agent.needsRestart ? (
             <p className="mt-1.5 text-xs text-amber-600 dark:text-amber-400">
               Configuration changed since this agent started. Restart to apply
               it.
diff --git a/desktop/src/features/agents/ui/PersonaAddedBy.tsx b/desktop/src/features/agents/ui/PersonaAddedBy.tsx
index 66e5ee31f9..3cdec29104 100644
--- a/desktop/src/features/agents/ui/PersonaAddedBy.tsx
+++ b/desktop/src/features/agents/ui/PersonaAddedBy.tsx
@@ -2,13 +2,17 @@ import { cn } from "@/shared/lib/cn";
 
 type PersonaAddedByProps = {
   className?: string;
+  label?: string;
 };
 
-export function PersonaAddedBy({ className }: PersonaAddedByProps) {
+export function PersonaAddedBy({
+  className,
+  label = "You",
+}: PersonaAddedByProps) {
   return (
     <p className={cn("truncate text-xs leading-tight", className)}>
       <span className="text-muted-foreground/55">Added by</span>{" "}
-      <span className="text-muted-foreground">You</span>
+      <span className="text-muted-foreground">{label}</span>
     </p>
   );
 }
diff --git a/desktop/src/features/agents/ui/PersonaCatalogDetailsSheet.tsx b/desktop/src/features/agents/ui/PersonaCatalogDetailsSheet.tsx
deleted file mode 100644
index 6aab3096cb..0000000000
--- a/desktop/src/features/agents/ui/PersonaCatalogDetailsSheet.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-import { isCatalogPersonaSelected } from "@/features/agents/lib/catalog";
-import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
-import type { AgentPersona } from "@/shared/api/types";
-import { cn } from "@/shared/lib/cn";
-import { promptPreview } from "@/shared/lib/promptPreview";
-import {
-  Sheet,
-  SheetContent,
-  SheetDescription,
-  SheetHeader,
-  SheetTitle,
-} from "@/shared/ui/sheet";
-
-import { PersonaCatalogSelectionBadge } from "./PersonaCatalogSelectionBadge";
-import {
-  getPersonaCatalogDetailSelectionCopy,
-  getPersonaCatalogSelectionAriaLabel,
-} from "./personaLibraryCopy";
-
-type PersonaCatalogDetailsSheetProps = {
-  feedbackErrorMessage: string | null;
-  feedbackNoticeMessage: string | null;
-  isPending: boolean;
-  onOpenChange: (open: boolean) => void;
-  onTogglePersona: (persona: AgentPersona) => void;
-  open: boolean;
-  persona: AgentPersona | null;
-};
-
-export function PersonaCatalogDetailsSheet({
-  feedbackErrorMessage,
-  feedbackNoticeMessage,
-  isPending,
-  onOpenChange,
-  onTogglePersona,
-  open,
-  persona,
-}: PersonaCatalogDetailsSheetProps) {
-  const preview = persona ? promptPreview(persona.systemPrompt) : "";
-  const isSelected = persona ? isCatalogPersonaSelected(persona) : false;
-  const selectionCopy = getPersonaCatalogDetailSelectionCopy(isSelected);
-
-  return (
-    <Sheet onOpenChange={onOpenChange} open={open}>
-      <SheetContent
-        className="flex w-full flex-col gap-0 overflow-hidden bg-background p-0 sm:max-w-xl"
-        data-testid="persona-catalog-details-sheet"
-      >
-        {persona ? (
-          <>
-            <SheetHeader className="relative z-10 space-y-4 bg-background/25 px-6 py-6 pr-16 text-left shadow-[0_4px_24px_rgba(0,0,0,0.06)] backdrop-blur-xl supports-[backdrop-filter]:bg-background/20 dark:shadow-[0_4px_24px_rgba(0,0,0,0.25)]">
-              <div className="flex items-start gap-3">
-                <ProfileAvatar
-                  avatarUrl={persona.avatarUrl}
-                  className="h-12 w-12 text-sm"
-                  label={persona.displayName}
-                />
-                <div className="min-w-0 flex-1">
-                  <div className="flex flex-wrap items-center gap-2">
-                    <SheetTitle className="truncate text-xl">
-                      {persona.displayName}
-                    </SheetTitle>
-                    <PersonaCatalogSelectionBadge isActive={isSelected} />
-                  </div>
-                  <SheetDescription className="mt-2">
-                    {preview || "No summary available."}
-                  </SheetDescription>
-                </div>
-              </div>
-            </SheetHeader>
-            <div className="flex-1 space-y-6 overflow-y-auto px-6 py-6">
-              <button
-                aria-label={getPersonaCatalogSelectionAriaLabel(
-                  persona.displayName,
-                  isSelected,
-                )}
-                aria-pressed={isSelected}
-                className={cn(
-                  "w-full rounded-xl border p-4 text-left transition-[background-color,border-color,box-shadow] focus:outline-hidden focus-visible:ring-2 focus-visible:ring-primary/40 focus-visible:ring-offset-2",
-                  isSelected
-                    ? "border-primary bg-primary/10 text-foreground"
-                    : "border-border/80 bg-background/60 text-muted-foreground hover:bg-accent hover:text-accent-foreground",
-                  isPending && "cursor-not-allowed opacity-70",
-                )}
-                data-state={isSelected ? "selected" : "available"}
-                data-testid={`persona-catalog-detail-selection-target-${persona.id}`}
-                disabled={isPending}
-                onClick={() => {
-                  onTogglePersona(persona);
-                }}
-                type="button"
-              >
-                <div className="flex items-start justify-between gap-4">
-                  <div>
-                    <p
-                      className="text-sm font-semibold tracking-tight"
-                      data-testid="persona-catalog-detail-selection-title"
-                    >
-                      {selectionCopy.title}
-                    </p>
-                    <p
-                      className="mt-1 text-sm text-muted-foreground"
-                      data-testid="persona-catalog-detail-selection-description"
-                    >
-                      {selectionCopy.description}
-                    </p>
-                  </div>
-                  <PersonaCatalogSelectionBadge isActive={isSelected} />
-                </div>
-              </button>
-
-              {feedbackNoticeMessage ? (
-                <p className="rounded-2xl border border-primary/20 bg-primary/10 px-4 py-3 text-sm text-primary">
-                  {feedbackNoticeMessage}
-                </p>
-              ) : null}
-
-              {feedbackErrorMessage ? (
-                <p className="rounded-2xl border border-destructive/30 bg-destructive/10 px-4 py-3 text-sm text-destructive">
-                  {feedbackErrorMessage}
-                </p>
-              ) : null}
-
-              <div className="grid gap-3 sm:grid-cols-2">
-                <div className="rounded-xl border border-border/70 bg-card/70 p-4">
-                  <p className="text-2xs font-semibold uppercase tracking-wide text-muted-foreground">
-                    Type
-                  </p>
-                  <p className="mt-2 text-sm font-medium">Built-in agent</p>
-                </div>
-                <div className="rounded-xl border border-border/70 bg-card/70 p-4">
-                  <p className="text-2xs font-semibold uppercase tracking-wide text-muted-foreground">
-                    Preferred model
-                  </p>
-                  <p className="mt-2 text-sm font-medium">
-                    {persona.model ?? "Use app default"}
-                  </p>
-                </div>
-                <div className="rounded-xl border border-border/70 bg-card/70 p-4 sm:col-span-2">
-                  <p className="text-2xs font-semibold uppercase tracking-wide text-muted-foreground">
-                    Preferred runtime
-                  </p>
-                  <p className="mt-2 text-sm font-medium">
-                    {persona.runtime ?? "Use app default"}
-                  </p>
-                </div>
-              </div>
-
-              <div className="rounded-xl border border-border/70 bg-card/70 p-4">
-                <p className="text-2xs font-semibold uppercase tracking-wide text-muted-foreground">
-                  System prompt
-                </p>
-                <pre className="mt-3 whitespace-pre-wrap break-words font-sans text-sm leading-6 text-foreground">
-                  {persona.systemPrompt}
-                </pre>
-              </div>
-            </div>
-          </>
-        ) : null}
-      </SheetContent>
-    </Sheet>
-  );
-}
diff --git a/desktop/src/features/agents/ui/PersonaCatalogDialog.tsx b/desktop/src/features/agents/ui/PersonaCatalogDialog.tsx
index 0d6b5583ff..ba76d6e4ed 100644
--- a/desktop/src/features/agents/ui/PersonaCatalogDialog.tsx
+++ b/desktop/src/features/agents/ui/PersonaCatalogDialog.tsx
@@ -1,6 +1,7 @@
 import * as React from "react";
 
 import { isCatalogPersonaSelected } from "@/features/agents/lib/catalog";
+import { isCatalogPersona } from "@/features/agents/lib/personaCatalogRelay";
 import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
 import type { AgentPersona } from "@/shared/api/types";
 import { useFeedbackToasts } from "@/shared/hooks/useToastEffect";
@@ -11,6 +12,8 @@ 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";
 
@@ -28,7 +31,7 @@ type PersonaCatalogDialogProps = {
 };
 
 const agentInstructionMarkdownClassName = [
-  "mt-3 leading-6 text-muted-foreground [&_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",
+  "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",
   "[&>h2]:!text-sm [&>h2]:!font-semibold [&>h2]:!leading-6 [&>h2]:!tracking-normal [&>h2]:!text-foreground",
   "[&>h3]:!text-sm [&>h3]:!font-semibold [&>h3]:!leading-6 [&>h3]:!tracking-normal [&>h3]:!text-foreground",
@@ -100,7 +103,7 @@ export function PersonaCatalogDialog({
     <Dialog onOpenChange={onOpenChange} open={open}>
       <ChooserDialogContent
         className="h-[42rem] max-w-4xl"
-        contentClassName="flex min-h-0 flex-1 p-0"
+        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"
@@ -154,6 +157,31 @@ function PersonaCatalogChooser({
   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}
+          </p>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div className="flex min-h-0 flex-1 flex-col overflow-hidden bg-sidebar sm:flex-row">
       <div className="flex max-h-56 min-h-0 flex-col sm:max-h-none sm:w-56">
@@ -200,9 +228,9 @@ function PersonaCatalogChooser({
         </div>
       </div>
 
-      <div className="relative z-10 ml-px flex min-h-0 flex-1 flex-col overflow-hidden rounded-tl-xl bg-background shadow-[-1px_0_0_0_hsl(var(--sidebar-border)/0.45)]">
+      <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 flex-1 overflow-y-auto px-5 pb-24 pt-5"
+          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}
@@ -211,19 +239,6 @@ function PersonaCatalogChooser({
             <PersonaCatalogDetail persona={selectedPersona} />
           ) : null}
 
-          {!isLoading && personas.length === 0 && !error ? (
-            <div className="flex min-h-80 items-center justify-center rounded-lg border border-dashed border-border/70 px-6 text-center">
-              <div>
-                <p className="text-sm font-semibold">
-                  {personaCatalogCopy.emptyCatalogTitle}
-                </p>
-                <p className="mt-2 max-w-sm text-sm text-muted-foreground">
-                  {personaCatalogCopy.emptyCatalogDescription}
-                </p>
-              </div>
-            </div>
-          ) : null}
-
           {error ? (
             <p className="rounded-lg border border-destructive/30 bg-destructive/10 px-4 py-3 text-sm text-destructive">
               {error.message}
@@ -263,7 +278,7 @@ function PersonaCatalogChooser({
 
 function PersonaCatalogDetail({ persona }: { persona: AgentPersona }) {
   return (
-    <div className="space-y-6">
+    <div className="w-full min-w-0 max-w-full space-y-6 overflow-x-hidden">
       <div className="flex items-center gap-3">
         <ProfileAvatar
           avatarUrl={persona.avatarUrl}
@@ -274,28 +289,26 @@ function PersonaCatalogDetail({ persona }: { persona: AgentPersona }) {
           <h3 className="truncate text-xl font-semibold leading-snug">
             {persona.displayName}
           </h3>
-          {persona.isBuiltIn ? null : <PersonaAddedBy className="mt-0.5" />}
+          {persona.isBuiltIn ? null : (
+            <PersonaAddedBy
+              className="mt-0.5"
+              label={
+                isCatalogPersona(persona) && !persona.catalogSource.isOwn
+                  ? "Community member"
+                  : "You"
+              }
+            />
+          )}
         </div>
       </div>
 
-      <PersonaCatalogMetaGroup
-        items={[
-          {
-            label: "Type",
-            value: persona.isBuiltIn ? "Built-in agent" : "Custom agent",
-          },
-          {
-            label: "Preferred model",
-            value: persona.model ?? "Use app default",
-          },
-          {
-            label: "Preferred runtime",
-            value: persona.runtime ?? "Use app default",
-          },
-        ]}
+      <AgentDefinitionMetadata
+        isBuiltIn={persona.isBuiltIn}
+        model={persona.model}
+        runtime={persona.runtime}
       />
 
-      <div className="pt-3">
+      <div className="min-w-0 max-w-full pt-3">
         <p className="text-base font-semibold text-foreground">
           Agent instruction
         </p>
@@ -309,36 +322,6 @@ function PersonaCatalogDetail({ persona }: { persona: AgentPersona }) {
   );
 }
 
-function PersonaCatalogMetaGroup({
-  items,
-}: {
-  items: { label: string; value: string }[];
-}) {
-  return (
-    <div className="rounded-lg border border-border/70 bg-card/70">
-      <div className="grid sm:grid-cols-3">
-        {items.map((item, index) => (
-          <div
-            className={cn(
-              "relative px-4 py-3",
-              index > 0 &&
-                "border-t border-border/60 sm:border-t-0 sm:before:absolute sm:before:bottom-3 sm:before:left-0 sm:before:top-3 sm:before:w-px sm:before:bg-border/70",
-            )}
-            key={item.label}
-          >
-            <p className="text-xs font-semibold text-muted-foreground">
-              {item.label}
-            </p>
-            <p className="mt-2 text-sm font-medium text-foreground">
-              {item.value}
-            </p>
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-}
-
 function PersonaCatalogListSkeleton() {
   return (
     <div className="space-y-2">
diff --git a/desktop/src/features/agents/ui/PersonaCatalogSection.tsx b/desktop/src/features/agents/ui/PersonaCatalogSection.tsx
deleted file mode 100644
index 25cc9e4751..0000000000
--- a/desktop/src/features/agents/ui/PersonaCatalogSection.tsx
+++ /dev/null
@@ -1,166 +0,0 @@
-import { isCatalogPersonaSelected } from "@/features/agents/lib/catalog";
-import type { AgentPersona } from "@/shared/api/types";
-import { promptPreview } from "@/shared/lib/promptPreview";
-import { cn } from "@/shared/lib/cn";
-import { Button } from "@/shared/ui/button";
-import { Card } from "@/shared/ui/card";
-import { Skeleton } from "@/shared/ui/skeleton";
-import { PersonaCatalogSelectionBadge } from "./PersonaCatalogSelectionBadge";
-import { PersonaIdentity } from "./PersonaIdentity";
-import {
-  getPersonaCatalogSelectionActionCopy,
-  getPersonaCatalogSelectionAriaLabel,
-  personaCatalogCopy,
-} from "./personaLibraryCopy";
-
-type PersonaCatalogSectionProps = {
-  emptyDescription?: string;
-  emptyTitle?: string;
-  error: Error | null;
-  isLoading: boolean;
-  isPending: boolean;
-  onTogglePersona: (persona: AgentPersona) => void;
-  onViewDetails: (persona: AgentPersona) => void;
-  personas: AgentPersona[];
-  showHeader?: boolean;
-};
-
-export function PersonaCatalogSection({
-  emptyDescription = personaCatalogCopy.emptyCatalogDescription,
-  emptyTitle = personaCatalogCopy.emptyCatalogTitle,
-  error,
-  isLoading,
-  isPending,
-  onTogglePersona,
-  onViewDetails,
-  personas,
-  showHeader = true,
-}: PersonaCatalogSectionProps) {
-  return (
-    <section className="space-y-4" data-testid="agents-persona-catalog">
-      {showHeader ? (
-        <div>
-          <h3 className="text-sm font-semibold tracking-tight">
-            {personaCatalogCopy.title}
-          </h3>
-          <p className="text-sm text-muted-foreground">
-            {personaCatalogCopy.description}
-          </p>
-        </div>
-      ) : null}
-
-      {isLoading ? (
-        <div className="grid gap-3 md:grid-cols-3 xl:grid-cols-4">
-          {["first", "second", "third", "fourth"].map((key) => (
-            <Card className="p-3" key={key}>
-              <div className="flex items-center gap-2.5">
-                <Skeleton className="h-8 w-8 rounded-lg" />
-                <div className="space-y-2">
-                  <Skeleton className="h-4 w-24" />
-                  <Skeleton className="h-3 w-20" />
-                </div>
-              </div>
-            </Card>
-          ))}
-        </div>
-      ) : null}
-
-      {!isLoading && personas.length > 0 ? (
-        <div className="grid gap-3 md:grid-cols-3 xl:grid-cols-4">
-          {personas.map((persona) => {
-            const preview = promptPreview(persona.systemPrompt);
-            const isSelected = isCatalogPersonaSelected(persona);
-
-            return (
-              <div
-                className={cn(
-                  "group relative flex flex-col gap-4 rounded-xl border p-3 shadow-xs transition-[background-color,border-color,box-shadow]",
-                  isPending
-                    ? "cursor-not-allowed opacity-70"
-                    : "cursor-pointer",
-                  isSelected
-                    ? "border-primary bg-primary/10 text-foreground"
-                    : "border-border/80 bg-background/60 hover:bg-accent hover:text-accent-foreground",
-                )}
-                data-testid={`persona-catalog-card-${persona.id}`}
-                data-state={isSelected ? "selected" : "available"}
-                key={persona.id}
-              >
-                <button
-                  aria-label={getPersonaCatalogSelectionAriaLabel(
-                    persona.displayName,
-                    isSelected,
-                  )}
-                  aria-pressed={isSelected}
-                  className="absolute inset-0 z-0 rounded-xl focus:outline-hidden focus-visible:ring-2 focus-visible:ring-primary/40 focus-visible:ring-offset-2"
-                  data-testid={`persona-catalog-card-target-${persona.id}`}
-                  disabled={isPending}
-                  onClick={() => {
-                    onTogglePersona(persona);
-                  }}
-                  type="button"
-                />
-
-                <div className="pointer-events-none relative z-10 flex h-full flex-col gap-4">
-                  <div className="flex items-start justify-between gap-3">
-                    <PersonaIdentity
-                      className="min-w-0 flex-1"
-                      persona={persona}
-                      showBuiltInBadge={false}
-                      showPromptTooltip={false}
-                    />
-
-                    <PersonaCatalogSelectionBadge isActive={isSelected} />
-                  </div>
-
-                  <p className="min-h-12 text-xs leading-5 text-muted-foreground">
-                    {preview}
-                  </p>
-
-                  <div
-                    className={cn(
-                      "mt-auto flex items-center justify-between gap-3 border-t pt-3",
-                      isSelected ? "border-primary/20" : "border-border/60",
-                    )}
-                  >
-                    <Button
-                      className="pointer-events-auto"
-                      data-testid={`persona-catalog-details-${persona.id}`}
-                      onClick={() => {
-                        onViewDetails(persona);
-                      }}
-                      size="sm"
-                      type="button"
-                      variant="ghost"
-                    >
-                      {personaCatalogCopy.detailsAction}
-                    </Button>
-
-                    <span className="text-xs font-medium text-muted-foreground">
-                      {getPersonaCatalogSelectionActionCopy(isSelected)}
-                    </span>
-                  </div>
-                </div>
-              </div>
-            );
-          })}
-        </div>
-      ) : null}
-
-      {!isLoading && personas.length === 0 ? (
-        <div className="rounded-xl border border-dashed border-border/70 px-6 py-10 text-center">
-          <p className="text-sm font-semibold tracking-tight">{emptyTitle}</p>
-          <p className="mt-2 text-sm text-muted-foreground">
-            {emptyDescription}
-          </p>
-        </div>
-      ) : null}
-
-      {error ? (
-        <p className="rounded-2xl border border-destructive/30 bg-destructive/10 px-4 py-3 text-sm text-destructive">
-          {error.message}
-        </p>
-      ) : null}
-    </section>
-  );
-}
diff --git a/desktop/src/features/agents/ui/PersonaCatalogSelectionBadge.tsx b/desktop/src/features/agents/ui/PersonaCatalogSelectionBadge.tsx
deleted file mode 100644
index 75837d0f94..0000000000
--- a/desktop/src/features/agents/ui/PersonaCatalogSelectionBadge.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Check } from "lucide-react";
-
-import { cn } from "@/shared/lib/cn";
-
-import { personaCatalogCopy } from "./personaLibraryCopy";
-
-type PersonaCatalogSelectionBadgeProps = {
-  isActive: boolean;
-};
-
-export function PersonaCatalogSelectionBadge({
-  isActive,
-}: PersonaCatalogSelectionBadgeProps) {
-  return (
-    <span
-      className={cn(
-        "inline-flex items-center gap-1 whitespace-nowrap rounded-full px-2.5 py-1 text-2xs font-semibold uppercase tracking-[0.14em]",
-        isActive
-          ? "bg-primary text-primary-foreground shadow-xs"
-          : "border border-border/70 bg-background/85 text-muted-foreground",
-      )}
-    >
-      {isActive ? <Check className="h-4 w-4" /> : null}
-      {isActive
-        ? personaCatalogCopy.selectedState
-        : personaCatalogCopy.availableState}
-    </span>
-  );
-}
diff --git a/desktop/src/features/agents/ui/PersonaCatalogSurface.tsx b/desktop/src/features/agents/ui/PersonaCatalogSurface.tsx
deleted file mode 100644
index 159025f7b9..0000000000
--- a/desktop/src/features/agents/ui/PersonaCatalogSurface.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import * as React from "react";
-
-import { isCatalogPersonaSelected } from "@/features/agents/lib/catalog";
-import type { AgentPersona } from "@/shared/api/types";
-import { useFeedbackToasts } from "@/shared/hooks/useToastEffect";
-
-import { PersonaCatalogDetailsSheet } from "./PersonaCatalogDetailsSheet";
-import { PersonaCatalogSection } from "./PersonaCatalogSection";
-
-type PersonaCatalogSurfaceProps = {
-  error: Error | null;
-  feedbackErrorMessage: string | null;
-  feedbackNoticeMessage: string | null;
-  isLoading: boolean;
-  isPending: boolean;
-  onClearFeedback: () => void;
-  onSelectPersona: (persona: AgentPersona, active: boolean) => void;
-  personas: AgentPersona[];
-  showHeader?: boolean;
-};
-
-export function PersonaCatalogSurface({
-  error,
-  feedbackErrorMessage,
-  feedbackNoticeMessage,
-  isLoading,
-  isPending,
-  onClearFeedback,
-  onSelectPersona,
-  personas,
-  showHeader = true,
-}: PersonaCatalogSurfaceProps) {
-  const [detailPersonaId, setDetailPersonaId] = React.useState<string | null>(
-    null,
-  );
-  const detailPersona = React.useMemo(
-    () =>
-      detailPersonaId
-        ? (personas.find((persona) => persona.id === detailPersonaId) ?? null)
-        : null,
-    [detailPersonaId, personas],
-  );
-  const handleTogglePersona = (persona: AgentPersona) => {
-    onSelectPersona(persona, !isCatalogPersonaSelected(persona));
-  };
-
-  useFeedbackToasts(feedbackNoticeMessage, feedbackErrorMessage);
-
-  return (
-    <>
-      <PersonaCatalogSection
-        error={error}
-        isLoading={isLoading}
-        isPending={isPending}
-        onTogglePersona={handleTogglePersona}
-        onViewDetails={(persona) => {
-          onClearFeedback();
-          setDetailPersonaId(persona.id);
-        }}
-        personas={personas}
-        showHeader={showHeader}
-      />
-
-      <PersonaCatalogDetailsSheet
-        feedbackErrorMessage={feedbackErrorMessage}
-        feedbackNoticeMessage={feedbackNoticeMessage}
-        isPending={isPending}
-        onOpenChange={(open) => {
-          if (!open) {
-            setDetailPersonaId(null);
-          }
-        }}
-        onTogglePersona={handleTogglePersona}
-        open={detailPersonaId !== null}
-        persona={detailPersona}
-      />
-    </>
-  );
-}
diff --git a/desktop/src/features/agents/ui/PersonaIdentity.tsx b/desktop/src/features/agents/ui/PersonaIdentity.tsx
deleted file mode 100644
index eb2c5c0253..0000000000
--- a/desktop/src/features/agents/ui/PersonaIdentity.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Info } from "lucide-react";
-
-import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
-import type { AgentPersona } from "@/shared/api/types";
-import { cn } from "@/shared/lib/cn";
-import { promptPreview } from "@/shared/lib/promptPreview";
-import { Badge } from "@/shared/ui/badge";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/shared/ui/tooltip";
-
-type PersonaIdentityProps = {
-  className?: string;
-  persona: AgentPersona;
-  showBuiltInBadge?: boolean;
-  showPromptTooltip?: boolean;
-};
-
-export function PersonaIdentity({
-  className,
-  persona,
-  showBuiltInBadge = persona.isBuiltIn,
-  showPromptTooltip = true,
-}: PersonaIdentityProps) {
-  const preview = promptPreview(persona.systemPrompt);
-
-  return (
-    <div className={cn("min-w-0 flex-1", className)}>
-      <div className="flex min-w-0 items-center gap-2.5">
-        <ProfileAvatar
-          avatarUrl={persona.avatarUrl}
-          className="h-8 w-8 rounded-lg text-xs"
-          label={persona.displayName}
-        />
-        <div className="min-w-0">
-          <div className="flex min-w-0 items-center gap-2">
-            <p className="truncate text-sm font-semibold tracking-tight">
-              {persona.displayName}
-            </p>
-            {showBuiltInBadge ? (
-              <Badge variant="secondary">Built-in</Badge>
-            ) : null}
-            {showPromptTooltip && preview ? (
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    aria-label="View system prompt"
-                    className="flex h-4 w-4 shrink-0 items-center justify-center text-muted-foreground transition-colors hover:text-foreground"
-                    type="button"
-                  >
-                    <Info className="h-4 w-4" />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="bottom" className="max-w-xs">
-                  <p>{preview}</p>
-                </TooltipContent>
-              </Tooltip>
-            ) : null}
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/desktop/src/features/agents/ui/PersonaLibraryEntryPoints.tsx b/desktop/src/features/agents/ui/PersonaLibraryEntryPoints.tsx
deleted file mode 100644
index 113d38b898..0000000000
--- a/desktop/src/features/agents/ui/PersonaLibraryEntryPoints.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Upload } from "lucide-react";
-
-import { Button } from "@/shared/ui/button";
-
-import { CreateNewButton } from "./CreateNewButton";
-import { personaLibraryCopy } from "./personaLibraryCopy";
-
-type PersonaLibraryEntryPointsProps = {
-  canChooseCatalog?: boolean;
-  isPending: boolean;
-  layout: "header" | "empty";
-  onCreate: () => void;
-  onChooseCatalog?: () => void;
-  onImport?: () => void;
-};
-
-export function PersonaLibraryEntryPoints({
-  canChooseCatalog = false,
-  isPending,
-  layout,
-  onCreate,
-  onChooseCatalog,
-  onImport,
-}: PersonaLibraryEntryPointsProps) {
-  const isHeader = layout === "header";
-  const chooseVariant = isHeader ? "outline" : "default";
-  const createVariant = isHeader ? "default" : "outline";
-
-  return (
-    <>
-      {canChooseCatalog && onChooseCatalog ? (
-        <Button
-          data-testid="open-persona-catalog"
-          disabled={isPending}
-          onClick={onChooseCatalog}
-          size="sm"
-          type="button"
-          variant={chooseVariant}
-        >
-          {personaLibraryCopy.chooseFromCatalog}
-        </Button>
-      ) : null}
-      <CreateNewButton
-        disabled={isPending}
-        label={personaLibraryCopy.createNew}
-        onClick={onCreate}
-        variant={createVariant}
-      />
-      {!isHeader && onImport ? (
-        <Button onClick={onImport} size="sm" type="button" variant="outline">
-          <Upload className="h-4 w-4" />
-          {personaLibraryCopy.import}
-        </Button>
-      ) : null}
-    </>
-  );
-}
diff --git a/desktop/src/features/agents/ui/PersonaModelField.tsx b/desktop/src/features/agents/ui/PersonaModelField.tsx
index bfbdb2c83d..79e3cb7bac 100644
--- a/desktop/src/features/agents/ui/PersonaModelField.tsx
+++ b/desktop/src/features/agents/ui/PersonaModelField.tsx
@@ -92,7 +92,8 @@ export function PersonaModelField({
         ) : null}
         {showSharedComputeAutoHint ? (
           <p className="text-xs text-muted-foreground">
-            Buzz will choose an available shared model when the agent starts.
+            Auto uses Mesh collective intelligence when two or more models stay
+            available, otherwise it chooses one available model.
           </p>
         ) : null}
         {modelDiscoveryStatus ? (
diff --git a/desktop/src/features/agents/ui/PersonaShareDialog.tsx b/desktop/src/features/agents/ui/PersonaShareDialog.tsx
index b6d3fafd3c..c641de9c70 100644
--- a/desktop/src/features/agents/ui/PersonaShareDialog.tsx
+++ b/desktop/src/features/agents/ui/PersonaShareDialog.tsx
@@ -1,6 +1,7 @@
 import * as React from "react";
 import {
   AlertCircle,
+  BookUser,
   Check,
   ChevronRight,
   Download,
@@ -11,6 +12,7 @@ import { AnimatePresence, motion, useReducedMotion } from "motion/react";
 import { toast } from "sonner";
 
 import { useEncodeAgentSnapshotForSendMutation } from "@/features/agents/hooks";
+import type { CatalogPersonaShareLevel } from "@/features/agents/lib/personaCatalogRelay";
 import {
   useOpenDmMutation,
   useUpsertCachedChannel,
@@ -20,7 +22,6 @@ import { uploadMediaBytes, type BlobDescriptor } from "@/shared/api/tauri";
 import { copyTextToSystemClipboard } from "@/shared/api/tauriMedia";
 import type { SnapshotMemoryLevel } from "@/shared/api/tauriPersonas";
 import type { AgentPersona, UserSearchResult } from "@/shared/api/types";
-import { cn } from "@/shared/lib/cn";
 import {
   AlertDialog,
   AlertDialogAction,
@@ -39,7 +40,6 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/shared/ui/dialog";
-import { Separator } from "@/shared/ui/separator";
 import { Spinner } from "@/shared/ui/spinner";
 
 import {
@@ -51,8 +51,11 @@ import { resolveSnapshotAvatarPng } from "./snapshotAvatarPng";
 import { useSnapshotSendController } from "./useSnapshotSendController";
 
 type PersonaShareDialogProps = {
+  catalogShareLevel: CatalogPersonaShareLevel;
   isPending: boolean;
   linkedAgentPubkey: string | null;
+  effectiveAvatarUrl: string | null;
+  onCatalogShareLevelChange: (shareLevel: CatalogPersonaShareLevel) => void;
   onExport: () => void;
   onOpenChange: (open: boolean) => void;
   open: boolean;
@@ -60,6 +63,7 @@ type PersonaShareDialogProps = {
 };
 
 type SnapshotShareDialogProps = {
+  afterLink?: React.ReactNode;
   displayName: string;
   encodeSnapshot: (
     memoryLevel: SnapshotMemoryLevel,
@@ -109,6 +113,20 @@ type PendingMemoryShare = {
   recipientNames?: string[];
 };
 
+function buildSnapshotShareLevels(itemLabel: "Agent" | "Team") {
+  return [
+    { value: "none" as const, label: `${itemLabel} only` },
+    {
+      value: "core" as const,
+      label: `${itemLabel} + core memory`,
+    },
+    {
+      value: "everything" as const,
+      label: `${itemLabel} + all memories`,
+    },
+  ];
+}
+
 function formatRecipientAudience(names: readonly string[]): string {
   if (names.length === 0) return "The people you selected";
   if (names.length === 1) return names[0] ?? "The person you selected";
@@ -179,39 +197,32 @@ function MemoryShareConfirmation({
 
 function ShareLevelControl({
   ariaLabel,
-  className,
   disabled,
   hasMemoryOptions,
-  onOpenChange,
-  staticClassName,
-  staticLabel,
   testId,
   value,
   options,
   onChange,
 }: {
   ariaLabel: string;
-  className?: string;
   disabled: boolean;
   hasMemoryOptions: boolean;
-  onOpenChange?: (open: boolean) => void;
-  staticClassName?: string;
-  staticLabel: string;
   testId: string;
   value: SnapshotMemoryLevel;
   options: { value: SnapshotMemoryLevel; label: string }[];
   onChange: (level: SnapshotMemoryLevel) => void;
 }) {
   if (!hasMemoryOptions) {
+    // Nothing to choose from, so there is no dropdown to open. State the
+    // outcome rather than naming the sole option: the memory-level labels
+    // ("Agent only", "+ core memory", …) are comparative and only make sense
+    // when the alternatives are actually offered.
     return (
       <span
-        className={cn(
-          "inline-flex h-8 w-auto shrink-0 items-center justify-end px-2 text-sm text-muted-foreground",
-          staticClassName,
-        )}
+        className="inline-flex h-8 w-auto shrink-0 items-center justify-end px-2 text-sm text-muted-foreground"
         data-testid={testId}
       >
-        {staticLabel}
+        No memories included
       </span>
     );
   }
@@ -219,9 +230,7 @@ function ShareLevelControl({
   return (
     <SnapshotOptionMenu
       ariaLabel={ariaLabel}
-      className={className}
       disabled={disabled}
-      onOpenChange={onOpenChange}
       onValueChange={(nextValue) => onChange(nextValue as SnapshotMemoryLevel)}
       options={options}
       testId={testId}
@@ -231,6 +240,7 @@ function ShareLevelControl({
 }
 
 export function SnapshotShareDialog({
+  afterLink,
   displayName,
   encodeSnapshot,
   hasMemoryOptions,
@@ -252,9 +262,7 @@ export function SnapshotShareDialog({
   const [copyStatus, setCopyStatus] = React.useState<CopyStatus>("idle");
   const [pendingMemoryShare, setPendingMemoryShare] =
     React.useState<PendingMemoryShare | null>(null);
-  const [linkShareLevel, setLinkShareLevel] =
-    React.useState<SnapshotMemoryLevel>("none");
-  const [recipientShareLevel, setRecipientShareLevel] =
+  const [shareLevel, setShareLevel] =
     React.useState<SnapshotMemoryLevel>("none");
   const encodedSnapshotCacheRef = React.useRef(
     new Map<SnapshotMemoryLevel, Promise<EncodedSnapshot>>(),
@@ -273,9 +281,7 @@ export function SnapshotShareDialog({
   const isActionPending = isPending || isCopying || isSending;
   const isInterfacePending = isPending || isSending;
   const hasSelectedRecipients = selectedRecipients.length > 0;
-  const showMemoryWarning =
-    linkShareLevel !== "none" ||
-    (hasSelectedRecipients && recipientShareLevel !== "none");
+  const showMemoryWarning = shareLevel !== "none";
   const recipientActionTransition = shouldReduceMotion
     ? { duration: 0 }
     : RECIPIENT_ACTION_TRANSITION;
@@ -298,17 +304,7 @@ export function SnapshotShareDialog({
   const itemLabel = snapshotKind === "team" ? "team" : "agent";
   const itemLabelTitle = snapshotKind === "team" ? "Team" : "Agent";
   const shareLevels = React.useMemo(
-    () => [
-      { value: "none" as const, label: `${itemLabelTitle} only` },
-      {
-        value: "core" as const,
-        label: `${itemLabelTitle} + core memory`,
-      },
-      {
-        value: "everything" as const,
-        label: `${itemLabelTitle} + all memories`,
-      },
-    ],
+    () => buildSnapshotShareLevels(itemLabelTitle),
     [itemLabelTitle],
   );
   const getEncodedSnapshot = React.useCallback(
@@ -337,8 +333,7 @@ export function SnapshotShareDialog({
       setSelectedRecipients([]);
       setCopyStatus("idle");
       setPendingMemoryShare(null);
-      setLinkShareLevel("none");
-      setRecipientShareLevel("none");
+      setShareLevel("none");
       onReset?.();
       snapshotSendController.reset();
     }
@@ -495,21 +490,6 @@ export function SnapshotShareDialog({
                     excludedPubkeys={excludedRecipientPubkeys}
                     onSelectionChange={setSelectedRecipients}
                     open={open}
-                    renderEndControl={(handleAccessOpenChange) => (
-                      <ShareLevelControl
-                        ariaLabel="What to include"
-                        className="-mr-2 h-7"
-                        disabled={isInterfacePending}
-                        hasMemoryOptions={hasMemoryOptions}
-                        onChange={setRecipientShareLevel}
-                        onOpenChange={handleAccessOpenChange}
-                        options={shareLevels}
-                        staticLabel={`${itemLabelTitle} only`}
-                        staticClassName="-mr-2 h-7 w-auto"
-                        testId={`${testIdPrefix}-recipient-access`}
-                        value={recipientShareLevel}
-                      />
-                    )}
                     selectedUsers={selectedRecipients}
                     testIdPrefix={testIdPrefix}
                   />
@@ -532,9 +512,7 @@ export function SnapshotShareDialog({
                           isActionPending ||
                           !snapshotSendController.isDmSafetyReady
                         }
-                        onClick={() =>
-                          requestMemoryShare("send", recipientShareLevel)
-                        }
+                        onClick={() => requestMemoryShare("send", shareLevel)}
                         type="button"
                       >
                         {isSending ? "Sending…" : "Send"}
@@ -552,6 +530,116 @@ export function SnapshotShareDialog({
               </p>
             </div>
 
+            <div
+              className="flex items-center gap-3 pt-2"
+              data-testid={`${testIdPrefix}-link-row`}
+            >
+              <span
+                className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-muted text-muted-foreground"
+                data-testid={`${testIdPrefix}-link-icon`}
+              >
+                <Link2 className="h-4 w-4" />
+              </span>
+              <div
+                className="min-w-0 flex-1"
+                data-testid={`${testIdPrefix}-link-copy`}
+              >
+                <h3 className="text-sm font-medium">Share with a link</h3>
+                <p className="text-xs text-secondary-foreground/75">
+                  Anyone with the link can add and use a copy.
+                </p>
+              </div>
+              <Button
+                asChild
+                className="shrink-0 border-border shadow-none disabled:opacity-100"
+                data-copy-status={copyStatus}
+                data-testid={`${testIdPrefix}-copy-link`}
+                disabled={isActionPending}
+                onClick={() => requestMemoryShare("copy", shareLevel)}
+                size="sm"
+                type="button"
+                variant="outline"
+              >
+                <motion.button
+                  layout={!shouldReduceMotion}
+                  layoutDependency={copyStatus}
+                  style={{ transformOrigin: "100% 50%" }}
+                  transition={copyButtonLayoutTransition}
+                >
+                  <span aria-live="polite" className="sr-only">
+                    {copyStatusLabel}
+                  </span>
+                  <span
+                    aria-hidden="true"
+                    className="relative grid place-items-center"
+                    data-testid={`${testIdPrefix}-copy-link-stage`}
+                  >
+                    <AnimatePresence initial={false} mode="popLayout">
+                      <motion.span
+                        animate={{
+                          filter: "blur(0px)",
+                          opacity: 1,
+                          transform: "scale(1)",
+                        }}
+                        className="col-start-1 row-start-1 flex items-center justify-center gap-1.5 [transform-origin:50%_50%] will-change-[transform,opacity,filter]"
+                        data-testid={`${testIdPrefix}-copy-link-state`}
+                        exit={
+                          shouldReduceMotion
+                            ? { opacity: 0 }
+                            : {
+                                filter: "blur(2px)",
+                                opacity: 0,
+                                transform: "scale(0.97)",
+                              }
+                        }
+                        initial={
+                          shouldReduceMotion
+                            ? false
+                            : {
+                                filter: "blur(2px)",
+                                opacity: 0,
+                                transform: "scale(0.97)",
+                              }
+                        }
+                        key={copyStatus}
+                        transition={copyFeedbackTransition}
+                      >
+                        {copyStatus === "copying" ? (
+                          <Spinner
+                            aria-hidden="true"
+                            className="h-4 w-4 border-2"
+                          />
+                        ) : copyStatus === "copied" ? (
+                          <Check aria-hidden="true" className="h-4 w-4" />
+                        ) : (
+                          <Link2 aria-hidden="true" className="h-4 w-4" />
+                        )}
+                        <span>{copyStatusLabel}</span>
+                      </motion.span>
+                    </AnimatePresence>
+                  </span>
+                </motion.button>
+              </Button>
+            </div>
+
+            <div
+              className="flex items-center gap-3"
+              data-testid={`${testIdPrefix}-share-level-row`}
+            >
+              <h3 className="min-w-0 flex-1 text-sm font-medium">
+                What’s included
+              </h3>
+              <ShareLevelControl
+                ariaLabel="What to include"
+                disabled={isInterfacePending}
+                hasMemoryOptions={hasMemoryOptions}
+                onChange={setShareLevel}
+                options={shareLevels}
+                testId={`${testIdPrefix}-share-level`}
+                value={shareLevel}
+              />
+            </div>
+
             <AnimatePresence initial={false}>
               {showMemoryWarning ? (
                 <motion.div
@@ -577,118 +665,7 @@ export function SnapshotShareDialog({
               ) : null}
             </AnimatePresence>
 
-            <section
-              className="pt-6"
-              data-testid={`${testIdPrefix}-copy-link-footer`}
-            >
-              <div
-                className="flex items-center gap-3"
-                data-testid={`${testIdPrefix}-link-row`}
-              >
-                <span
-                  className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-muted text-muted-foreground"
-                  data-testid={`${testIdPrefix}-link-icon`}
-                >
-                  <Link2 className="h-4 w-4" />
-                </span>
-                <div
-                  className="min-w-0 flex-1"
-                  data-testid={`${testIdPrefix}-link-copy`}
-                >
-                  <h3 className="text-sm font-medium">Share with a link</h3>
-                  <p className="text-xs text-secondary-foreground/75">
-                    Anyone with the link can add and use a copy.
-                  </p>
-                </div>
-                <ShareLevelControl
-                  ariaLabel="What to include in the link"
-                  disabled={isInterfacePending}
-                  hasMemoryOptions={hasMemoryOptions}
-                  onChange={setLinkShareLevel}
-                  options={shareLevels}
-                  staticLabel={`${itemLabelTitle} only`}
-                  testId={`${testIdPrefix}-link-access`}
-                  value={linkShareLevel}
-                />
-              </div>
-              <Separator
-                className="my-4 bg-input/40"
-                data-testid={`${testIdPrefix}-link-divider`}
-              />
-              <div className="flex justify-end">
-                <Button
-                  asChild
-                  className="shrink-0 border-border shadow-none disabled:opacity-100"
-                  data-copy-status={copyStatus}
-                  data-testid={`${testIdPrefix}-copy-link`}
-                  disabled={isActionPending}
-                  onClick={() => requestMemoryShare("copy", linkShareLevel)}
-                  size="sm"
-                  type="button"
-                  variant="outline"
-                >
-                  <motion.button
-                    layout={!shouldReduceMotion}
-                    layoutDependency={copyStatus}
-                    style={{ transformOrigin: "100% 50%" }}
-                    transition={copyButtonLayoutTransition}
-                  >
-                    <span aria-live="polite" className="sr-only">
-                      {copyStatusLabel}
-                    </span>
-                    <span
-                      aria-hidden="true"
-                      className="relative grid place-items-center"
-                      data-testid={`${testIdPrefix}-copy-link-stage`}
-                    >
-                      <AnimatePresence initial={false} mode="popLayout">
-                        <motion.span
-                          animate={{
-                            filter: "blur(0px)",
-                            opacity: 1,
-                            transform: "scale(1)",
-                          }}
-                          className="col-start-1 row-start-1 flex items-center justify-center gap-1.5 [transform-origin:50%_50%] will-change-[transform,opacity,filter]"
-                          data-testid={`${testIdPrefix}-copy-link-state`}
-                          exit={
-                            shouldReduceMotion
-                              ? { opacity: 0 }
-                              : {
-                                  filter: "blur(2px)",
-                                  opacity: 0,
-                                  transform: "scale(0.97)",
-                                }
-                          }
-                          initial={
-                            shouldReduceMotion
-                              ? false
-                              : {
-                                  filter: "blur(2px)",
-                                  opacity: 0,
-                                  transform: "scale(0.97)",
-                                }
-                          }
-                          key={copyStatus}
-                          transition={copyFeedbackTransition}
-                        >
-                          {copyStatus === "copying" ? (
-                            <Spinner
-                              aria-hidden="true"
-                              className="h-4 w-4 border-2"
-                            />
-                          ) : copyStatus === "copied" ? (
-                            <Check aria-hidden="true" className="h-4 w-4" />
-                          ) : (
-                            <Link2 aria-hidden="true" className="h-4 w-4" />
-                          )}
-                          <span>{copyStatusLabel}</span>
-                        </motion.span>
-                      </AnimatePresence>
-                    </span>
-                  </motion.button>
-                </Button>
-              </div>
-            </section>
+            {afterLink}
           </div>
         </div>
         <button
@@ -715,14 +692,24 @@ export function SnapshotShareDialog({
 }
 
 export function PersonaShareDialog({
+  catalogShareLevel,
   isPending,
   linkedAgentPubkey,
+  effectiveAvatarUrl,
+  onCatalogShareLevelChange,
   onExport,
   onOpenChange,
   open,
   persona,
 }: PersonaShareDialogProps) {
   const encodeSnapshotMutation = useEncodeAgentSnapshotForSendMutation();
+  const catalogShareLevels = React.useMemo(
+    () => [
+      { value: "not-shared", label: "Not shared" },
+      { value: "none", label: "Shared" },
+    ],
+    [],
+  );
   const encodeSnapshot = React.useCallback(
     async (memoryLevel: SnapshotMemoryLevel) =>
       encodeSnapshotMutation.mutateAsync({
@@ -730,18 +717,52 @@ export function PersonaShareDialog({
         memoryLevel: linkedAgentPubkey ? memoryLevel : "none",
         format: "png",
         memorySourcePubkey: linkedAgentPubkey,
-        avatarPngDataUrl: await resolveSnapshotAvatarPng(persona.avatarUrl),
+        avatarPngDataUrl: await resolveSnapshotAvatarPng(effectiveAvatarUrl),
       }),
     [
       encodeSnapshotMutation.mutateAsync,
+      effectiveAvatarUrl,
       linkedAgentPubkey,
-      persona.avatarUrl,
       persona.id,
     ],
   );
 
   return (
     <SnapshotShareDialog
+      afterLink={
+        persona.isBuiltIn ? null : (
+          <section
+            className="flex min-h-16 w-full items-center gap-3"
+            data-testid="persona-share-catalog"
+          >
+            <span className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-muted text-muted-foreground">
+              <BookUser className="h-4 w-4" />
+            </span>
+            <div className="min-w-0 flex-1">
+              <h3 className="text-sm font-medium">Share to catalog</h3>
+              <p className="text-xs text-secondary-foreground/75">
+                Anyone in this community can find and use a copy. Your agent
+                instruction is shared as plaintext. Memories and secrets aren’t
+                included.
+              </p>
+            </div>
+            <div className="flex shrink-0 items-center">
+              <SnapshotOptionMenu
+                ariaLabel="What to share in the catalog"
+                disabled={isPending}
+                onValueChange={(nextValue) =>
+                  onCatalogShareLevelChange(
+                    nextValue as CatalogPersonaShareLevel,
+                  )
+                }
+                options={catalogShareLevels}
+                testId="persona-share-catalog-access"
+                value={catalogShareLevel}
+              />
+            </div>
+          </section>
+        )
+      }
       displayName={persona.displayName}
       encodeSnapshot={encodeSnapshot}
       hasMemoryOptions={linkedAgentPubkey !== null}
diff --git a/desktop/src/features/agents/ui/PersonaShareRecipients.tsx b/desktop/src/features/agents/ui/PersonaShareRecipients.tsx
index 4f8874914d..7db7c32bfa 100644
--- a/desktop/src/features/agents/ui/PersonaShareRecipients.tsx
+++ b/desktop/src/features/agents/ui/PersonaShareRecipients.tsx
@@ -34,7 +34,6 @@ export function PersonaShareRecipients({
   excludedPubkeys = [],
   onSelectionChange,
   open,
-  renderEndControl,
   selectedUsers,
   testIdPrefix = "persona-share",
 }: {
@@ -42,7 +41,6 @@ export function PersonaShareRecipients({
   excludedPubkeys?: readonly string[];
   onSelectionChange: (users: UserSearchResult[]) => void;
   open: boolean;
-  renderEndControl?: (onOpenChange: (open: boolean) => void) => React.ReactNode;
   selectedUsers: UserSearchResult[];
   testIdPrefix?: string;
 }) {
@@ -228,11 +226,6 @@ export function PersonaShareRecipients({
                 value={searchQuery}
               />
             </div>
-            {selectedUsers.length > 0 && renderEndControl
-              ? renderEndControl((controlOpen) => {
-                  if (controlOpen) setIsPickerOpen(false);
-                })
-              : null}
           </div>
         </PopoverAnchor>
         <PopoverContent
diff --git a/desktop/src/features/agents/ui/RelayDirectorySection.tsx b/desktop/src/features/agents/ui/RelayDirectorySection.tsx
deleted file mode 100644
index ca4fe58030..0000000000
--- a/desktop/src/features/agents/ui/RelayDirectorySection.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import * as React from "react";
-import { ChevronDown, ChevronRight, Search } from "lucide-react";
-
-import type { RelayAgent } from "@/shared/api/types";
-import { PresenceBadge } from "@/features/presence/ui/PresenceBadge";
-import { Card } from "@/shared/ui/card";
-import { Input } from "@/shared/ui/input";
-import { truncatePubkey } from "@/shared/lib/pubkey";
-
-export function RelayDirectorySection({
-  error,
-  isLoading,
-  managedPubkeys,
-  relayAgents,
-}: {
-  error: Error | null;
-  isLoading: boolean;
-  managedPubkeys: Set<string>;
-  relayAgents: RelayAgent[];
-}) {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const [searchQuery, setSearchQuery] = React.useState("");
-
-  // Only show agents that are NOT managed locally — those are already in the
-  // managed agents section above.
-  const otherAgents = React.useMemo(
-    () => relayAgents.filter((agent) => !managedPubkeys.has(agent.pubkey)),
-    [relayAgents, managedPubkeys],
-  );
-
-  const filteredAgents = React.useMemo(() => {
-    if (!searchQuery.trim()) return otherAgents;
-    const query = searchQuery.toLowerCase();
-    return otherAgents.filter(
-      (agent) =>
-        agent.name.toLowerCase().includes(query) ||
-        agent.agentType.toLowerCase().includes(query) ||
-        agent.channels.some((ch) => ch.toLowerCase().includes(query)),
-    );
-  }, [otherAgents, searchQuery]);
-
-  const sortedAgents = React.useMemo(
-    () =>
-      [...filteredAgents].sort((left, right) =>
-        left.name.localeCompare(right.name),
-      ),
-    [filteredAgents],
-  );
-
-  if (isLoading || otherAgents.length === 0) return null;
-
-  return (
-    <section className="space-y-3">
-      <div className="space-y-1">
-        <button
-          className="flex w-full items-center gap-2 text-left"
-          onClick={() => setIsExpanded((prev) => !prev)}
-          type="button"
-        >
-          {isExpanded ? (
-            <ChevronDown className="h-4 w-4 shrink-0 text-muted-foreground" />
-          ) : (
-            <ChevronRight className="h-4 w-4 shrink-0 text-muted-foreground" />
-          )}
-          <h2 className="text-lg font-semibold tracking-tight">
-            Agent directory
-          </h2>
-          <span className="text-sm text-muted-foreground">
-            ({otherAgents.length})
-          </span>
-        </button>
-        <p className="pl-6 text-sm text-muted-foreground">
-          View agents other members have shared in this community.
-        </p>
-      </div>
-
-      {isExpanded ? (
-        <>
-          <div className="relative">
-            <Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-            <Input
-              className="pl-9"
-              onChange={(event) => setSearchQuery(event.target.value)}
-              placeholder="Search by name, type, or channel..."
-              value={searchQuery}
-            />
-          </div>
-
-          {sortedAgents.length === 0 ? (
-            <p className="px-1 py-3 text-sm text-muted-foreground">
-              {searchQuery.trim()
-                ? "No agents match your search."
-                : "No other agents in this community."}
-            </p>
-          ) : (
-            <Card className="overflow-hidden">
-              <div className="overflow-x-auto">
-                <table
-                  className="w-full border-collapse text-left text-sm"
-                  data-testid="relay-directory-table"
-                >
-                  <thead className="bg-muted/35 text-2xs font-semibold uppercase tracking-wide text-muted-foreground">
-                    <tr>
-                      <th className="px-4 py-3">Agent</th>
-                      <th className="px-4 py-3">Status</th>
-                      <th className="px-4 py-3">Type</th>
-                      <th className="px-4 py-3">Channels</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    {sortedAgents.map((agent) => (
-                      <tr
-                        className="border-b border-border/60 last:border-b-0"
-                        key={agent.pubkey}
-                      >
-                        <td className="min-w-[16rem] px-4 py-3 align-top">
-                          <div className="min-w-0">
-                            <p className="truncate font-medium text-foreground">
-                              {agent.name}
-                            </p>
-                            <p className="mt-1 text-xs text-muted-foreground">
-                              {truncatePubkey(agent.pubkey)}
-                            </p>
-                          </div>
-                        </td>
-                        <td className="px-4 py-3 align-top">
-                          <PresenceBadge
-                            className="px-2.5 py-0.5 text-2xs"
-                            status={agent.status}
-                          />
-                        </td>
-                        <td className="px-4 py-3 align-top text-muted-foreground">
-                          {agent.agentType || "Unknown"}
-                        </td>
-                        <td className="max-w-[20rem] px-4 py-3 align-top text-muted-foreground">
-                          <span className="block truncate">
-                            {agent.channels.length > 0
-                              ? agent.channels.join(", ")
-                              : "No visible channel memberships"}
-                          </span>
-                        </td>
-                      </tr>
-                    ))}
-                  </tbody>
-                </table>
-              </div>
-            </Card>
-          )}
-        </>
-      ) : null}
-
-      {error ? (
-        <p className="rounded-2xl border border-destructive/30 bg-destructive/10 px-4 py-3 text-sm text-destructive">
-          {error.message}
-        </p>
-      ) : null}
-    </section>
-  );
-}
diff --git a/desktop/src/features/agents/ui/TeamIdentityCard.tsx b/desktop/src/features/agents/ui/TeamIdentityCard.tsx
index 824b206604..19596b76d6 100644
--- a/desktop/src/features/agents/ui/TeamIdentityCard.tsx
+++ b/desktop/src/features/agents/ui/TeamIdentityCard.tsx
@@ -115,6 +115,7 @@ function TeamAvatarRow({
 }) {
   const visiblePersonas = personas.slice(0, MAX_VISIBLE_MEMBER_AVATARS);
   const overflowCount = Math.max(0, memberCount - visiblePersonas.length);
+  const stackItemCount = visiblePersonas.length + (overflowCount > 0 ? 1 : 0);
 
   if (visiblePersonas.length === 0 && overflowCount === 0) {
     return (
@@ -130,16 +131,26 @@ function TeamAvatarRow({
     <div className="absolute inset-x-0 top-0 bottom-12 flex items-center justify-center">
       <div
         aria-label={`${teamName} member avatars`}
-        className="flex max-w-full items-center justify-center gap-2 px-4"
+        className="flex max-w-full items-center justify-center px-4"
         role="img"
       >
         {visiblePersonas.map((persona, index) => (
-          <TeamAvatarItem index={index} key={persona.id} persona={persona} />
+          <TeamAvatarItem
+            index={index}
+            isFollowedByAnother={index < stackItemCount - 1}
+            key={persona.id}
+            persona={persona}
+          />
         ))}
         {overflowCount > 0 ? (
-          <span className="flex h-14 w-14 items-center justify-center rounded-full border-[3px] border-background bg-card text-sm font-semibold text-muted-foreground shadow-sm">
-            +{overflowCount}
-          </span>
+          <div
+            className={visiblePersonas.length > 0 ? "-ml-5" : ""}
+            style={{ zIndex: stackItemCount }}
+          >
+            <span className="flex h-14 w-14 items-center justify-center rounded-full bg-card text-sm font-semibold text-muted-foreground">
+              +{overflowCount}
+            </span>
+          </div>
         ) : null}
       </div>
     </div>
@@ -148,25 +159,39 @@ function TeamAvatarRow({
 
 function TeamAvatarItem({
   index,
+  isFollowedByAnother,
   persona,
 }: {
   index: number;
+  isFollowedByAnother: boolean;
   persona: AgentPersona;
 }) {
   const avatarUrl = persona.avatarUrl?.trim() ?? null;
 
   return (
-    <div className="h-14 w-14" data-team-member-avatar="avatar">
+    <div
+      className={`h-14 w-14 ${index > 0 ? "-ml-5" : ""}`}
+      data-team-member-avatar="avatar"
+      style={{
+        zIndex: index + 1,
+        ...(isFollowedByAnother && {
+          mask: "radial-gradient(circle 32px at calc(100% + 8px) 50%, transparent 99%, #fff 100%)",
+          WebkitMask:
+            "radial-gradient(circle 32px at calc(100% + 8px) 50%, transparent 99%, #fff 100%)",
+        }),
+      }}
+    >
       {avatarUrl ? (
         <ProfileAvatar
           avatarUrl={avatarUrl}
-          className="h-full w-full border-[3px] border-background bg-muted shadow-sm"
+          className="h-full w-full bg-muted shadow-none"
           iconClassName="h-6 w-6"
           label={persona.displayName}
           testId={`team-member-avatar-${persona.id}`}
         />
       ) : (
         <IdentityInitialsAvatar
+          className="border-0 shadow-none"
           colorIndex={index}
           label={persona.displayName}
           size={56}
diff --git a/desktop/src/features/agents/ui/TeamsSection.tsx b/desktop/src/features/agents/ui/TeamsSection.tsx
index daf4419592..f974081b7d 100644
--- a/desktop/src/features/agents/ui/TeamsSection.tsx
+++ b/desktop/src/features/agents/ui/TeamsSection.tsx
@@ -5,7 +5,6 @@ import {
   Rocket,
   Share2,
   Trash2,
-  Upload,
 } from "lucide-react";
 
 import { resolveTeamPersonas } from "@/features/agents/lib/teamPersonas";
@@ -201,11 +200,7 @@ function NewTeamCard({
   return (
     <DropdownMenu modal={false}>
       <DropdownMenuTrigger asChild>
-        <CreateIdentityCard
-          ariaLabel="New team"
-          dataTestId="new-team-card"
-          label="New team"
-        />
+        <CreateIdentityCard ariaLabel="New team" dataTestId="new-team-card" />
       </DropdownMenuTrigger>
       <DropdownMenuContent
         align="start"
@@ -215,8 +210,7 @@ function NewTeamCard({
           Create team
         </DropdownMenuItem>
         <DropdownMenuItem disabled={isPending} onClick={onImport}>
-          <Upload className="h-4 w-4" />
-          Import team snapshot
+          Import
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
diff --git a/desktop/src/features/agents/ui/UnifiedAgentsSection.tsx b/desktop/src/features/agents/ui/UnifiedAgentsSection.tsx
index fe792b0c39..9bbe3feef7 100644
--- a/desktop/src/features/agents/ui/UnifiedAgentsSection.tsx
+++ b/desktop/src/features/agents/ui/UnifiedAgentsSection.tsx
@@ -1,7 +1,12 @@
 import * as React from "react";
-import { ChevronDown, ChevronRight, RefreshCw } from "lucide-react";
+import {
+  AlertTriangle,
+  ChevronDown,
+  ChevronRight,
+  RefreshCw,
+} from "lucide-react";
 
-import { formatAgentModelLabel } from "@/features/agents/lib/formatAgentModelLabel";
+import { resolveAgentCardModelLabel } from "@/features/agents/lib/agentCardModelLabel";
 import { friendlyAgentLastError } from "@/features/agents/lib/friendlyAgentLastError";
 import { isManagedAgentActive } from "@/features/agents/lib/managedAgentControlActions";
 import { useUserProfileQuery } from "@/features/profile/hooks";
@@ -40,7 +45,6 @@ type UnifiedAgentsSectionProps = {
   onOpenPersonaProfile: (persona: AgentPersona) => void;
   onStartAgent: (pubkey: string) => void;
   onStartPersona: (persona: AgentPersona) => void;
-  canChooseCatalog: boolean;
   personas: AgentPersona[];
   personasError: Error | null;
   personaFeedbackErrorMessage: string | null;
@@ -48,12 +52,13 @@ type UnifiedAgentsSectionProps = {
   isPersonasLoading: boolean;
   isPersonasPending: boolean;
   onCreatePersona: () => void;
-  onChooseCatalog: () => void;
+  onDiscoverPersonas: () => void;
   onDuplicatePersona: (persona: AgentPersona) => void;
   onEditPersona: (persona: AgentPersona) => void;
   onSharePersona: (
     persona: AgentPersona,
     linkedAgent: ManagedAgent | undefined,
+    effectiveAvatarUrl: string | null,
   ) => void;
   onDeactivatePersona: (persona: AgentPersona) => void;
   onDeletePersona: (persona: AgentPersona) => void;
@@ -61,7 +66,9 @@ type UnifiedAgentsSectionProps = {
 };
 
 const AGENT_CARD_COLUMN_CLASS = "w-full";
-const AGENT_CARD_GRID_CLASS = `${AGENT_CARD_COLUMN_CLASS} mx-auto grid max-w-[996px] grid-cols-[repeat(auto-fill,minmax(220px,240px))] justify-center gap-3`;
+export const AGENT_CARD_GRID_COLUMNS_CLASS =
+  "grid-cols-[repeat(auto-fill,minmax(220px,240px))]";
+const AGENT_CARD_GRID_CLASS = `${AGENT_CARD_COLUMN_CLASS} ${AGENT_CARD_GRID_COLUMNS_CLASS} grid justify-start gap-3`;
 
 export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
   const {
@@ -78,7 +85,6 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
     onOpenPersonaProfile,
     onStartAgent,
     onStartPersona,
-    canChooseCatalog,
     personas,
     personasError,
     personaFeedbackErrorMessage,
@@ -86,7 +92,7 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
     isPersonasLoading,
     isPersonasPending,
     onCreatePersona,
-    onChooseCatalog,
+    onDiscoverPersonas,
     onDuplicatePersona,
     onEditPersona,
     onSharePersona,
@@ -152,9 +158,11 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
               const profileAgent = pickProfileAgent(group.agents);
               return (
                 <AgentPersonaCard
-                  actions={
+                  actions={(effectiveAvatarUrl, isEffectiveAvatarLoading) => (
                     <PersonaActionsMenu
-                      isActionPending={isActionPending}
+                      isActionPending={
+                        isActionPending || isEffectiveAvatarLoading
+                      }
                       isPending={isPersonasPending}
                       persona={group.persona}
                       linkedAgent={profileAgent}
@@ -162,9 +170,11 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
                       onDelete={onDeletePersona}
                       onDuplicate={onDuplicatePersona}
                       onEdit={onEditPersona}
-                      onShare={onSharePersona}
+                      onShare={(persona, linkedAgent) =>
+                        onSharePersona(persona, linkedAgent, effectiveAvatarUrl)
+                      }
                     />
-                  }
+                  )}
                   agent={profileAgent}
                   defaultModel={defaultModel}
                   key={group.persona.id}
@@ -179,11 +189,10 @@ export function UnifiedAgentsSection(props: UnifiedAgentsSectionProps) {
               );
             })}
             <NewAgentCard
-              canChooseCatalog={canChooseCatalog}
-              isPersonasPending={isPersonasPending}
-              openFilePicker={openFilePicker}
-              onChooseCatalog={onChooseCatalog}
-              onCreatePersona={onCreatePersona}
+              isPending={isPersonasPending}
+              onCreate={onCreatePersona}
+              onDiscover={onDiscoverPersonas}
+              onImport={openFilePicker}
             />
           </div>
 
@@ -246,7 +255,10 @@ function AgentPersonaCard({
   onStartAgent,
   onStartPersona,
 }: {
-  actions?: React.ReactNode;
+  actions?: (
+    effectiveAvatarUrl: string | null,
+    isEffectiveAvatarLoading: boolean,
+  ) => React.ReactNode;
   agent: ManagedAgent | undefined;
   defaultModel: string;
   persona: AgentPersona;
@@ -261,10 +273,11 @@ function AgentPersonaCard({
   onStartPersona: (persona: AgentPersona) => void;
 }) {
   const title = persona.displayName;
-  const explicitModel = agent?.model ?? persona.model;
-  const modelLabel = explicitModel?.trim()
-    ? formatAgentModelLabel(explicitModel)
-    : formatDefaultModelLabel(defaultModel);
+  const modelLabel = resolveAgentCardModelLabel({
+    agent,
+    personaModel: persona.model,
+    defaultModel,
+  });
   const isActive = agent ? isManagedAgentActive(agent) : false;
   const profileQuery = useUserProfileQuery(agent?.pubkey);
   const avatarUrl = agent
@@ -277,7 +290,10 @@ function AgentPersonaCard({
 
   return (
     <AgentIdentityCard
-      actions={actions}
+      actions={actions?.(
+        avatarUrl,
+        Boolean(agent && !persona.avatarUrl && profileQuery.isPending),
+      )}
       ariaLabel={`${title} agent profile`}
       avatar={
         agent ? (
@@ -322,7 +338,12 @@ function AgentPersonaCard({
         onOpenPersonaProfile(persona);
       }}
       statusBadge={
-        agent?.needsRestart ? (
+        agent?.personaOrphaned ? (
+          <Badge className="gap-1" variant="warning">
+            <AlertTriangle className="h-3 w-3" />
+            Configuration missing
+          </Badge>
+        ) : agent?.needsRestart ? (
           <Badge className="gap-1" variant="warning">
             <RefreshCw className="h-3 w-3" />
             Restart required
@@ -380,11 +401,11 @@ function StandaloneAgentCard({
       avatarUrl={profileQuery.data?.avatarUrl}
       dataTestId={`managed-agent-${agent.pubkey}`}
       label={title}
-      modelLabel={
-        agent.model?.trim()
-          ? formatAgentModelLabel(agent.model)
-          : formatDefaultModelLabel(defaultModel)
-      }
+      modelLabel={resolveAgentCardModelLabel({
+        agent,
+        personaModel: null,
+        defaultModel,
+      })}
       onClick={() => {
         onOpenAgentProfile(
           agent.pubkey,
@@ -392,7 +413,12 @@ function StandaloneAgentCard({
         );
       }}
       statusBadge={
-        agent.needsRestart ? (
+        agent.personaOrphaned ? (
+          <Badge className="gap-1" variant="warning">
+            <AlertTriangle className="h-3 w-3" />
+            Configuration missing
+          </Badge>
+        ) : agent.needsRestart ? (
           <Badge className="gap-1" variant="warning">
             <RefreshCw className="h-3 w-3" />
             Restart required
@@ -403,11 +429,6 @@ function StandaloneAgentCard({
   );
 }
 
-function formatDefaultModelLabel(defaultModel: string) {
-  const model = defaultModel.trim();
-  return model ? `Default model (${model})` : "Default model";
-}
-
 function firstAvatarUrl(
   ...candidates: Array<string | null | undefined>
 ): string | null {
@@ -419,50 +440,37 @@ function firstAvatarUrl(
 }
 
 function NewAgentCard({
-  canChooseCatalog,
-  isPersonasPending,
-  openFilePicker,
-  onChooseCatalog,
-  onCreatePersona,
+  isPending,
+  onCreate,
+  onDiscover,
+  onImport,
 }: {
-  canChooseCatalog: boolean;
-  isPersonasPending: boolean;
-  openFilePicker: () => void;
-  onChooseCatalog: () => void;
-  onCreatePersona: () => void;
+  isPending: boolean;
+  onCreate: () => void;
+  onDiscover: () => void;
+  onImport: () => void;
 }) {
   return (
     <DropdownMenu modal={false}>
       <DropdownMenuTrigger asChild>
-        <CreateIdentityCard
-          ariaLabel="New agent"
-          dataTestId="new-agent-card"
-          label="New agent"
-        />
+        <CreateIdentityCard ariaLabel="New agent" dataTestId="new-agent-card" />
       </DropdownMenuTrigger>
       <DropdownMenuContent
         align="start"
         onCloseAutoFocus={(event) => event.preventDefault()}
       >
-        <DropdownMenuItem
-          disabled={isPersonasPending}
-          onClick={onCreatePersona}
-        >
-          Create from scratch
+        <DropdownMenuItem disabled={isPending} onClick={onCreate}>
+          Create agent
+        </DropdownMenuItem>
+        <DropdownMenuItem disabled={isPending} onClick={onDiscover}>
+          Discover agents
         </DropdownMenuItem>
-        {canChooseCatalog ? (
-          <DropdownMenuItem
-            disabled={isPersonasPending}
-            onClick={onChooseCatalog}
-          >
-            Choose from catalog
-          </DropdownMenuItem>
-        ) : null}
         <DropdownMenuItem
           data-testid="import-agent-snapshot-menu-item"
-          onClick={openFilePicker}
+          disabled={isPending}
+          onClick={onImport}
         >
-          Import agent snapshot
+          Import
         </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
diff --git a/desktop/src/features/agents/ui/addCustomHarness.test.mjs b/desktop/src/features/agents/ui/addCustomHarness.test.mjs
new file mode 100644
index 0000000000..6c0aa32daf
--- /dev/null
+++ b/desktop/src/features/agents/ui/addCustomHarness.test.mjs
@@ -0,0 +1,344 @@
+/**
+ * Behavior tests for the inline "Add custom harness…" dropdown entry shared by
+ * AgentDefinitionDialog and AgentInstanceEditDialog.
+ *
+ * Two seams carry the feature, and both are pinned here:
+ *
+ *   1. ROUTING (`runtimeDropdownAction`) — the sentinel must resolve to "open
+ *      the form", never to a selection. If it ever resolved to a selection the
+ *      dialogs would write "\u0000add-custom-harness" into `runtime` and try to
+ *      spawn an agent on a harness that does not exist.
+ *   2. DEFERRED SELECTION (`usePendingHarnessSelection`) — saving only writes
+ *      the definition file; the harness becomes a catalog entry when the
+ *      invalidated discovery query refetches. Selecting on save would pick an
+ *      id no entry backs. The hook must wait for the catalog, fire exactly
+ *      once, stay silent when the user cancels, and drop the pending id when
+ *      its dialog closes — the host dialogs stay mounted, so a stale id would
+ *      otherwise select into reset form state on a later publish.
+ *
+ * The hook is mounted for real (react-dom/client + act) rather than simulated,
+ * so its effect wiring — including the guard that survives the dialogs'
+ * non-memoized change handlers — is what gets tested.
+ */
+
+import assert from "node:assert/strict";
+import test from "node:test";
+
+// ── Minimal DOM shim ─────────────────────────────────────────────────────────
+// react-dom/client needs a container element and a document; node has neither.
+// The harness renders null, so no real node operations are exercised.
+
+class ElementShim {
+  constructor() {
+    this.children = [];
+    this.childNodes = [];
+    this.nodeType = 1;
+    this.nodeName = "DIV";
+    this.tagName = "DIV";
+    this.namespaceURI = "http://www.w3.org/1999/xhtml";
+  }
+  get ownerDocument() {
+    return globalThis.document;
+  }
+  addEventListener() {}
+  removeEventListener() {}
+  appendChild(child) {
+    this.children.push(child);
+    this.childNodes.push(child);
+    return child;
+  }
+  removeChild(child) {
+    this.children = this.children.filter((current) => current !== child);
+    this.childNodes = this.childNodes.filter((current) => current !== child);
+    return child;
+  }
+  insertBefore(child) {
+    return this.appendChild(child);
+  }
+  contains(target) {
+    return this === target;
+  }
+}
+
+globalThis.document = {
+  activeElement: null,
+  addEventListener() {},
+  createElement: () => new ElementShim(),
+  get defaultView() {
+    return globalThis.window;
+  },
+  nodeType: 9,
+  removeEventListener() {},
+};
+// react-dom derives update priority from window.event and walks iframe
+// boundaries via window.HTMLIFrameElement during commit.
+Object.defineProperty(globalThis, "window", {
+  configurable: true,
+  value: {
+    addEventListener() {},
+    document: globalThis.document,
+    event: undefined,
+    HTMLIFrameElement: ElementShim,
+    removeEventListener() {},
+  },
+});
+globalThis.HTMLElement = ElementShim;
+globalThis.Node = ElementShim;
+globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+
+import React from "react";
+import { act } from "react";
+import { createRoot } from "react-dom/client";
+
+import { NO_RUNTIME_DROPDOWN_VALUE } from "./agentConfigOptions.tsx";
+import {
+  ADD_CUSTOM_HARNESS_OPTION,
+  ADD_CUSTOM_HARNESS_VALUE,
+  readyHarnessId,
+  runtimeDropdownAction,
+  usePendingHarnessSelection,
+} from "./addCustomHarness.ts";
+
+// ── Routing: the sentinel opens the form, it is never a selection ────────────
+
+test("selecting the add-custom entry requests the form and yields no runtime id", () => {
+  const action = runtimeDropdownAction(ADD_CUSTOM_HARNESS_VALUE);
+  assert.equal(action.kind, "add-custom-harness");
+  // The dialogs read `action.runtimeId` on the select branch; the sentinel
+  // must not carry one, or it could leak into form state.
+  assert.equal("runtimeId" in action, false);
+});
+
+test("selecting a harness yields that harness id", () => {
+  assert.deepEqual(runtimeDropdownAction("my-harness"), {
+    kind: "select",
+    runtimeId: "my-harness",
+  });
+});
+
+test("selecting the no-runtime entry yields the empty id", () => {
+  assert.deepEqual(runtimeDropdownAction(NO_RUNTIME_DROPDOWN_VALUE), {
+    kind: "select",
+    runtimeId: "",
+  });
+});
+
+test("the add-custom sentinel cannot collide with a backend-valid harness id", () => {
+  // Backend ids match [a-z0-9_][a-z0-9_-]* (custom_harnesses.rs), so a
+  // NUL-prefixed value is unreachable as a real id.
+  assert.equal(ADD_CUSTOM_HARNESS_VALUE.startsWith("\u0000"), true);
+  assert.equal(ADD_CUSTOM_HARNESS_OPTION.value, ADD_CUSTOM_HARNESS_VALUE);
+  assert.equal(ADD_CUSTOM_HARNESS_OPTION.label, "Add custom harness…");
+});
+
+// ── Readiness: an id is selectable only once the catalog publishes it ────────
+
+test("a pending id absent from the catalog is not ready", () => {
+  assert.equal(readyHarnessId([{ id: "claude" }], "my-harness"), null);
+});
+
+test("a pending id present in the catalog is ready", () => {
+  assert.equal(
+    readyHarnessId([{ id: "claude" }, { id: "my-harness" }], "my-harness"),
+    "my-harness",
+  );
+});
+
+test("no pending id is never ready even against a populated catalog", () => {
+  assert.equal(readyHarnessId([{ id: "claude" }], null), null);
+});
+
+// ── Deferred selection: mounted hook ─────────────────────────────────────────
+
+/**
+ * Mount the real hook over a mutable catalog. Returns the setter the dialogs
+ * call on save, a `setRuntimes` to simulate the discovery refetch, a `setOpen`
+ * to simulate the owning dialog closing and reopening, and the log of ids the
+ * hook handed back for selection.
+ */
+async function mountPendingSelection(initialRuntimes = []) {
+  const selected = [];
+  const control = {};
+
+  function Harness() {
+    const [runtimes, setRuntimes] = React.useState(initialRuntimes);
+    const [open, setOpen] = React.useState(true);
+    // Deliberately NOT memoized: both dialogs pass a plain function
+    // declaration, so `onReady` has a fresh identity on every render.
+    const onReady = (id) => selected.push(id);
+    control.save = usePendingHarnessSelection(runtimes, onReady, open);
+    control.setRuntimes = setRuntimes;
+    control.setOpen = setOpen;
+    return null;
+  }
+
+  const root = createRoot(new ElementShim());
+  await act(async () => {
+    root.render(React.createElement(Harness));
+  });
+  return { control, root, selected };
+}
+
+test("saving a harness selects it only once the catalog publishes it", async () => {
+  const { control, root, selected } = await mountPendingSelection([
+    { id: "claude" },
+  ]);
+
+  // Save returns before discovery refetches — nothing to select yet.
+  await act(async () => control.save("my-harness"));
+  assert.deepEqual(selected, []);
+
+  // The invalidated discovery query resolves with the new entry.
+  await act(async () =>
+    control.setRuntimes([{ id: "claude" }, { id: "my-harness" }]),
+  );
+  assert.deepEqual(selected, ["my-harness"]);
+
+  await act(async () => root.unmount());
+});
+
+test("a published harness is selected exactly once across later catalog updates", async () => {
+  const { control, root, selected } = await mountPendingSelection([
+    { id: "claude" },
+  ]);
+
+  await act(async () => control.save("my-harness"));
+  await act(async () =>
+    control.setRuntimes([{ id: "claude" }, { id: "my-harness" }]),
+  );
+  assert.deepEqual(selected, ["my-harness"]);
+
+  // Any later refetch re-renders with a new array identity and a new onReady
+  // identity. Re-firing here would clobber a selection the user made in
+  // between, so the pending id must have been cleared.
+  await act(async () =>
+    control.setRuntimes([
+      { id: "claude" },
+      { id: "my-harness" },
+      { id: "codex" },
+    ]),
+  );
+  assert.deepEqual(selected, ["my-harness"]);
+
+  await act(async () => root.unmount());
+});
+
+test("cancelling the form leaves the current selection untouched", async () => {
+  const { control, root, selected } = await mountPendingSelection([
+    { id: "claude" },
+  ]);
+
+  // Cancel never reports a saved id, so no selection is ever requested — even
+  // as the catalog keeps refreshing underneath.
+  await act(async () =>
+    control.setRuntimes([{ id: "claude" }, { id: "codex" }]),
+  );
+  assert.deepEqual(selected, []);
+
+  await act(async () => root.unmount());
+});
+
+test("a saved harness discovery never publishes is never selected", async () => {
+  const { control, root, selected } = await mountPendingSelection([
+    { id: "claude" },
+  ]);
+
+  // e.g. the definition file was written but the entry failed to load. The
+  // hook must stall rather than select an id no catalog entry backs.
+  await act(async () => control.save("ghost-harness"));
+  await act(async () =>
+    control.setRuntimes([{ id: "claude" }, { id: "codex" }]),
+  );
+  assert.deepEqual(selected, []);
+
+  await act(async () => root.unmount());
+});
+
+test("two harnesses registered in a row are each selected when published", async () => {
+  const { control, root, selected } = await mountPendingSelection([
+    { id: "claude" },
+  ]);
+
+  await act(async () => control.save("first"));
+  await act(async () =>
+    control.setRuntimes([{ id: "claude" }, { id: "first" }]),
+  );
+  await act(async () => control.save("second"));
+  await act(async () =>
+    control.setRuntimes([{ id: "claude" }, { id: "first" }, { id: "second" }]),
+  );
+  assert.deepEqual(selected, ["first", "second"]);
+
+  await act(async () => root.unmount());
+});
+
+test("a second save before the first publishes selects only the later harness", async () => {
+  const { control, root, selected } = await mountPendingSelection([
+    { id: "claude" },
+  ]);
+
+  // The dropdown holds one harness, so the latest registration wins: the
+  // first id is dropped rather than queued behind the second.
+  await act(async () => control.save("first"));
+  await act(async () => control.save("second"));
+  await act(async () =>
+    control.setRuntimes([{ id: "claude" }, { id: "first" }, { id: "second" }]),
+  );
+  assert.deepEqual(selected, ["second"]);
+
+  await act(async () => root.unmount());
+});
+
+// ── Lifecycle: a pending id never outlives the dialog that created it ────────
+
+test("a harness published after its dialog closed is never selected", async () => {
+  const { control, root, selected } = await mountPendingSelection([
+    { id: "claude" },
+  ]);
+
+  // Both host dialogs stay mounted when closed, so the hook keeps running.
+  await act(async () => control.save("my-harness"));
+  await act(async () => control.setOpen(false));
+  await act(async () =>
+    control.setRuntimes([{ id: "claude" }, { id: "my-harness" }]),
+  );
+
+  // Selecting here would write into form state the close already reset.
+  assert.deepEqual(selected, []);
+
+  await act(async () => root.unmount());
+});
+
+test("reopening after closing mid-registration does not select the abandoned harness", async () => {
+  const { control, root, selected } = await mountPendingSelection([
+    { id: "claude" },
+  ]);
+
+  await act(async () => control.save("my-harness"));
+  await act(async () => control.setOpen(false));
+  await act(async () =>
+    control.setRuntimes([{ id: "claude" }, { id: "my-harness" }]),
+  );
+  // The reopened dialog seeds from its own initial values; a stale pending id
+  // must not overwrite them.
+  await act(async () => control.setOpen(true));
+  assert.deepEqual(selected, []);
+
+  await act(async () => root.unmount());
+});
+
+test("a harness saved after reopening is still selected when published", async () => {
+  const { control, root, selected } = await mountPendingSelection([
+    { id: "claude" },
+  ]);
+
+  await act(async () => control.setOpen(false));
+  await act(async () => control.setOpen(true));
+  await act(async () => control.save("my-harness"));
+  await act(async () =>
+    control.setRuntimes([{ id: "claude" }, { id: "my-harness" }]),
+  );
+  assert.deepEqual(selected, ["my-harness"]);
+
+  await act(async () => root.unmount());
+});
diff --git a/desktop/src/features/agents/ui/addCustomHarness.ts b/desktop/src/features/agents/ui/addCustomHarness.ts
new file mode 100644
index 0000000000..f9c2143530
--- /dev/null
+++ b/desktop/src/features/agents/ui/addCustomHarness.ts
@@ -0,0 +1,104 @@
+/**
+ * Shared pieces of the inline "Add custom harness…" entry the agent dialogs
+ * append to their harness dropdown.
+ *
+ * Registering a custom harness used to be reachable only from Settings, so
+ * anyone whose first stop was "New agent" never learned the path existed.
+ * These helpers keep the entry identical across the dropdowns, keep its
+ * sentinel value out of form state, and defer selecting a freshly registered
+ * harness until discovery has actually published it.
+ */
+
+import * as React from "react";
+
+import {
+  NO_RUNTIME_DROPDOWN_VALUE,
+  type PersonaDropdownOption,
+} from "./agentConfigOptions";
+
+/**
+ * Dropdown value for the add-custom-harness entry. NUL-prefixed so it can
+ * never collide with a harness id (`[a-z0-9_][a-z0-9_-]*`) — same trick as the
+ * harness catalog's `CUSTOM_ENTRY_ID`.
+ */
+export const ADD_CUSTOM_HARNESS_VALUE = "\u0000add-custom-harness";
+
+export const ADD_CUSTOM_HARNESS_OPTION: PersonaDropdownOption = {
+  label: "Add custom harness…",
+  value: ADD_CUSTOM_HARNESS_VALUE,
+};
+
+export type RuntimeDropdownAction =
+  | { kind: "add-custom-harness" }
+  | { kind: "select"; runtimeId: string };
+
+/**
+ * Route a harness-dropdown change. The add-custom entry only opens the
+ * registration form — it is never a selection, so its sentinel can't reach
+ * form state. Every other value selects, with the no-runtime sentinel
+ * normalized to the empty id.
+ */
+export function runtimeDropdownAction(value: string): RuntimeDropdownAction {
+  if (value === ADD_CUSTOM_HARNESS_VALUE) {
+    return { kind: "add-custom-harness" };
+  }
+  return {
+    kind: "select",
+    runtimeId: value === NO_RUNTIME_DROPDOWN_VALUE ? "" : value,
+  };
+}
+
+/**
+ * The pending harness id once discovery has published it, else `null`.
+ *
+ * Saving only writes the definition file — the harness becomes a catalog entry
+ * when the invalidated discovery query refetches. Selecting before then would
+ * pick an id no entry backs: the create dialog would block Save on an unknown
+ * availability, and the instance dialog could not read the command to pin.
+ */
+export function readyHarnessId(
+  runtimes: ReadonlyArray<{ id: string }>,
+  pendingId: string | null,
+): string | null {
+  return runtimes.some((runtime) => runtime.id === pendingId)
+    ? pendingId
+    : null;
+}
+
+/**
+ * Selects a newly registered custom harness once discovery publishes it.
+ *
+ * Returns the setter to hand the saved id; `onReady` then fires with it, so
+ * callers reuse their normal dropdown-change path instead of growing a second
+ * selection code path.
+ *
+ * `active` is the owning dialog's open state. The wait is only meaningful
+ * while that dialog is open: both host dialogs stay mounted across closes, so
+ * a pending id would otherwise survive the close and select into reset — or
+ * hidden — form state whenever discovery caught up. Going inactive both blocks
+ * `onReady` and drops the pending id, so a later publish is a no-op and
+ * reopening starts clean. A second save before the first publishes replaces
+ * it: the field holds one harness, so the latest save wins.
+ */
+export function usePendingHarnessSelection(
+  runtimes: ReadonlyArray<{ id: string }>,
+  onReady: (id: string) => void,
+  active: boolean,
+): (id: string) => void {
+  const [pendingId, setPendingId] = React.useState<string | null>(null);
+  // Gated at render, not just in the effect, so a catalog update landing in
+  // the same commit as the close cannot slip a selection through.
+  const readyId = active ? readyHarnessId(runtimes, pendingId) : null;
+
+  React.useEffect(() => {
+    if (!active) {
+      setPendingId(null);
+      return;
+    }
+    if (readyId === null) return;
+    setPendingId(null);
+    onReady(readyId);
+  }, [active, onReady, readyId]);
+
+  return setPendingId;
+}
diff --git a/desktop/src/features/agents/ui/agentConfigControls.test.mjs b/desktop/src/features/agents/ui/agentConfigControls.test.mjs
index 5f3ef718bc..6d0cc0be19 100644
--- a/desktop/src/features/agents/ui/agentConfigControls.test.mjs
+++ b/desktop/src/features/agents/ui/agentConfigControls.test.mjs
@@ -44,6 +44,16 @@ test("an explicit inherited default label wins over harness discovery", () => {
   );
 });
 
+test("shared compute describes Auto's collective behavior", () => {
+  assert.equal(
+    resolveDefaultModelLabel({
+      discoveredModelOptions: null,
+      isSharedCompute: true,
+    }),
+    "Auto (collective when available)",
+  );
+});
+
 // ── appendNoModelsSentinel ─────────────────────────────────────────────────────
 
 test("appendNoModelsSentinel_emptyOptionsDiscoveryFinished_addsDisabledRow", () => {
diff --git a/desktop/src/features/agents/ui/agentConfigControls.tsx b/desktop/src/features/agents/ui/agentConfigControls.tsx
index 8c2f5b6744..1a431d1f91 100644
--- a/desktop/src/features/agents/ui/agentConfigControls.tsx
+++ b/desktop/src/features/agents/ui/agentConfigControls.tsx
@@ -326,7 +326,9 @@ export function resolveDefaultModelLabel({
   return (
     defaultModelLabel ??
     discoveredModelOptions?.find((option) => option.id.trim() === "")?.label ??
-    (isSharedCompute ? "Default (auto)" : getDefaultLlmModelLabel(globalModel))
+    (isSharedCompute
+      ? "Auto (collective when available)"
+      : getDefaultLlmModelLabel(globalModel))
   );
 }
 
diff --git a/desktop/src/features/agents/ui/agentConfigOptions.tsx b/desktop/src/features/agents/ui/agentConfigOptions.tsx
index 6ae81ff6cb..1313d2cec4 100644
--- a/desktop/src/features/agents/ui/agentConfigOptions.tsx
+++ b/desktop/src/features/agents/ui/agentConfigOptions.tsx
@@ -426,6 +426,60 @@ export function formatRuntimeOptionLabel(runtime: AcpRuntimeCatalogEntry) {
   return `${runtime.label}${suffix}`;
 }
 
+export function buildPersonaRuntimeDropdownOptions({
+  defaultRuntimeId,
+  isCreateMode,
+  runtime,
+  runtimes,
+  runtimesLoading,
+}: {
+  defaultRuntimeId?: string;
+  isCreateMode: boolean;
+  runtime: string;
+  runtimes: AcpRuntimeCatalogEntry[];
+  runtimesLoading: boolean;
+}): {
+  blankRuntimeOptionLabel: string;
+  runtimeDropdownOptions: PersonaDropdownOption[];
+} {
+  const blankRuntimeOptionLabel = runtimesLoading
+    ? "Loading harnesses..."
+    : isCreateMode
+      ? "Choose a harness"
+      : "No preference (use app default)";
+  const runtimeDropdownOptions: PersonaDropdownOption[] = [
+    ...(!isCreateMode
+      ? [
+          {
+            label: blankRuntimeOptionLabel,
+            value: NO_RUNTIME_DROPDOWN_VALUE,
+          },
+        ]
+      : []),
+    ...sortPersonaRuntimes(runtimes).map((candidate) => ({
+      disabled:
+        isCreateMode &&
+        defaultRuntimeId !== undefined &&
+        candidate.availability !== "available",
+      label: `${formatRuntimeOptionLabel(candidate)}${
+        isCreateMode && candidate.id === defaultRuntimeId ? " (default)" : ""
+      }`,
+      value: candidate.id,
+    })),
+  ];
+  const currentRuntime = runtime.trim();
+  if (
+    currentRuntime.length > 0 &&
+    !runtimeDropdownOptions.some((option) => option.value === currentRuntime)
+  ) {
+    runtimeDropdownOptions.push({
+      label: `${currentRuntime} (current)`,
+      value: currentRuntime,
+    });
+  }
+  return { blankRuntimeOptionLabel, runtimeDropdownOptions };
+}
+
 function runtimeAvailabilitySortRank(
   availability: AcpRuntimeCatalogEntry["availability"],
 ) {
diff --git a/desktop/src/features/agents/ui/effortTable.fixture.json b/desktop/src/features/agents/ui/effortTable.fixture.json
index ed44c7581b..defb1f86de 100644
--- a/desktop/src/features/agents/ui/effortTable.fixture.json
+++ b/desktop/src/features/agents/ui/effortTable.fixture.json
@@ -41,6 +41,13 @@
     "validValues": ["low", "medium", "high", "xhigh", "max"],
     "defaultValue": "high"
   },
+  {
+    "note": "Anthropic adaptive xhigh-capable: claude-opus-5",
+    "provider": "anthropic",
+    "model": "claude-opus-5",
+    "validValues": ["low", "medium", "high", "xhigh", "max"],
+    "defaultValue": "high"
+  },
   {
     "note": "Anthropic adaptive xhigh-capable: claude-mythos-5",
     "provider": "anthropic",
diff --git a/desktop/src/features/agents/ui/personaLibraryCopy.ts b/desktop/src/features/agents/ui/personaLibraryCopy.ts
index 53c5e7a16f..79ddad1c3c 100644
--- a/desktop/src/features/agents/ui/personaLibraryCopy.ts
+++ b/desktop/src/features/agents/ui/personaLibraryCopy.ts
@@ -14,14 +14,13 @@ export const personaLibraryCopy = {
 
 export const personaCatalogCopy = {
   title: "Agent Catalog",
-  description: "Browse built-in agents and add them to My Agents.",
+  description: "Browse agents shared to this relay.",
   dialogTitle: "Agent Catalog",
-  dialogDescription: "Browse built-in agents and add them to My Agents.",
+  dialogDescription: "Browse agents shared to this relay.",
   emptyTitle: "You're all set",
   emptyDescription: "Everything in Agent Catalog is already in My Agents.",
-  emptyCatalogDescription:
-    "New agents will show up here when the app ships more options.",
-  emptyCatalogTitle: "No agents in the catalog yet",
+  emptyCatalogDescription: "Shared agents will appear here.",
+  emptyCatalogTitle: "No agents are being shared",
   detailsAction: "View details",
   selectAction: "Choose",
   deselectAction: "Deselect",
diff --git a/desktop/src/features/agents/ui/personaModelDiscoveryStatus.test.mjs b/desktop/src/features/agents/ui/personaModelDiscoveryStatus.test.mjs
index bf21bc92ff..23d79aaf7f 100644
--- a/desktop/src/features/agents/ui/personaModelDiscoveryStatus.test.mjs
+++ b/desktop/src/features/agents/ui/personaModelDiscoveryStatus.test.mjs
@@ -67,3 +67,46 @@ test("model discovery status stays quiet for missing Databricks defaults", () =>
 
   assert.equal(status, null);
 });
+
+test("auth-required errors name the agent and ask for sign-in", () => {
+  // Real shape from run_agent_models_command wrapping buzz-acp stderr when
+  // cursor-agent is signed out (spec ErrorCode::AuthRequired text).
+  const status = formatModelDiscoveryErrorStatus(
+    new Error(
+      "buzz-acp models failed (exit 1): agent communication failed: Agent reported error (code -32000): Authentication required",
+    ),
+    "",
+    "Cursor",
+  );
+
+  assert.equal(status?.tone, "warning");
+  assert.match(status?.message ?? "", /Cursor requires sign-in/);
+  assert.match(status?.message ?? "", /Sign in with the Cursor CLI/);
+});
+
+test("auth-required copy degrades gracefully without an agent label", () => {
+  const status = formatModelDiscoveryErrorStatus(
+    new Error("Agent reported error (code -32000): Authentication required"),
+    "",
+  );
+
+  assert.equal(status?.tone, "warning");
+  assert.match(status?.message ?? "", /This agent requires sign-in/);
+});
+
+test("non-auth -32000 errors do NOT get the sign-in copy", () => {
+  // -32000 is the catch-all fallback code for unclassified agent errors
+  // (agent_error_from_json unwrap_or(-32000)); only the spec-reserved
+  // "Authentication required" text may route to the sign-in message.
+  const status = formatModelDiscoveryErrorStatus(
+    new Error(
+      "buzz-acp models failed (exit 1): Agent reported error (code -32000): model catalog fetch timed out",
+    ),
+    "anthropic",
+    "Cursor",
+  );
+
+  assert.equal(status?.tone, "warning");
+  assert.doesNotMatch(status?.message ?? "", /sign-in/i);
+  assert.match(status?.message ?? "", /Using built-in model options/);
+});
diff --git a/desktop/src/features/agents/ui/personaModelDiscoveryStatus.ts b/desktop/src/features/agents/ui/personaModelDiscoveryStatus.ts
index 38138429f8..c6991fdd01 100644
--- a/desktop/src/features/agents/ui/personaModelDiscoveryStatus.ts
+++ b/desktop/src/features/agents/ui/personaModelDiscoveryStatus.ts
@@ -44,6 +44,7 @@ function isEmptySharedComputeError(message: string): boolean {
 export function formatModelDiscoveryErrorStatus(
   error: unknown,
   provider: string,
+  agentLabel?: string,
 ): PersonaModelDiscoveryStatus | null {
   const message = errorMessage(error);
 
@@ -87,6 +88,19 @@ export function formatModelDiscoveryErrorStatus(
     };
   }
 
+  // Spec-reserved auth error text (agent-client-protocol ErrorCode::AuthRequired),
+  // surfaced verbatim through buzz-acp's stderr — generic across conformant
+  // harnesses (e.g. cursor-agent when not signed in). Match the message text,
+  // NOT code -32000: that code is also the catch-all fallback for unclassified
+  // errors, so matching it would swallow unrelated failures into "sign in".
+  if (message.toLowerCase().includes("authentication required")) {
+    const label = agentLabel?.trim();
+    return {
+      message: `${label || "This agent"} requires sign-in before models can load. Sign in with the ${label || "agent's"} CLI in a terminal, then try again.`,
+      tone: "warning",
+    };
+  }
+
   if (message.includes("ANTHROPIC_API_KEY required")) {
     return {
       message: "Enter an Anthropic API key to load Anthropic models.",
diff --git a/desktop/src/features/agents/ui/personaRuntimeModel.ts b/desktop/src/features/agents/ui/personaRuntimeModel.ts
index d138296b5c..20d789c4eb 100644
--- a/desktop/src/features/agents/ui/personaRuntimeModel.ts
+++ b/desktop/src/features/agents/ui/personaRuntimeModel.ts
@@ -109,24 +109,27 @@ export function hasMissingRequiredEnvKey(
 /**
  * Resolve the provider and env-vars to PERSIST on Save.
  *
- * The spawn path reads ONLY the record snapshot (`record.provider`/
- * `record.env_vars`), never the live persona, and the record is authoritative:
- * `env_vars` is the complete pinned map (persona env snapshotted at create,
- * already merged UNDER the agent's own overrides), and the provider field is
- * user-editable in the dialog even while inheriting. So the local edit state IS
- * the record's own value and is honored verbatim in the normal case.
+ * This dialog edits an agent INSTANCE's own fields (`record.provider`/
+ * `record.env_vars`), which remain the source of truth for a definition-less
+ * (legacy) instance and for any local/display state before the next resolve.
+ * For a LINKED instance, spawn/deploy resolve the effective provider/model
+ * from the definition, never from the record's own `provider`/`model` bytes
+ * (see `effective_config::resolve_effective_config` on the desktop backend) —
+ * so persisting `record.provider` here only matters for definition-less
+ * instances and for keeping the record's display/legacy fields consistent;
+ * it does not change what a linked instance spawns with.
  *
- * The ONE exception is the inherit-TRANSITION-from-a-harness-pin: a previously
- * harness-pinned agent (e.g. Claude — `agent.agentCommandOverride != null` at
- * dialog open) has its `provider` cleared and carries no persona credential,
- * then the user checks "Inherit runtime from template" for a provider-backed
- * persona (e.g. buzz-agent/Anthropic). Persisting the local (empty) provider +
- * credential-less env would save an agent that fails readiness on next start.
+ * The one case this function still has to handle carefully is the
+ * inherit-TRANSITION-from-a-harness-pin: a previously harness-pinned agent
+ * (e.g. Claude — `agent.agentCommandOverride != null` at dialog open) has its
+ * `provider` cleared and carries no persona credential, then the user checks
+ * "Inherit runtime from template" for a provider-backed persona (e.g.
+ * buzz-agent/Anthropic). Persisting the local (empty) provider + credential-
+ * less env would leave a definition-less instance's record fields blank.
  * Only in that case — inheriting AND the local provider is empty AND the agent
  * was harness-pinned at open — do we substitute the persona snapshot: the
  * persona's provider and the persona-layered env (`{ ...personaEnv,
- * ...agentEnv }`, agent layer wins to mirror spawn-time layering), matching
- * create-time record pinning.
+ * ...agentEnv }`, agent layer wins to mirror spawn-time layering).
  *
  * A NON-empty local provider while inheriting (e.g. an Anthropic-persona agent
  * the user re-points to Databricks) is a deliberate edit and passes through
@@ -135,11 +138,11 @@ export function hasMissingRequiredEnvKey(
  * MODEL follows the same transition rule. buzz-agent/goose readiness requires a
  * model, but a Claude-pinned agent's record often carries no model (Claude
  * resolves its own). On the inherit-transition to a provider-backed persona with
- * a set `persona.model`, persisting the empty local model would save an agent
- * that inherits the provider + credentials but no model and fails readiness on
- * next start — so we substitute `personaModel` in that same case. A non-empty
- * local model (deliberate pick) always passes through; an empty local model in
- * steady state stays empty (runtime default), same authoritative logic.
+ * a set `persona.model`, persisting the empty local model would save a
+ * record-level model gap — so we substitute `personaModel` in that same case. A
+ * non-empty local model (deliberate pick) always passes through; an empty local
+ * model in steady state stays empty (runtime default), same authoritative
+ * logic.
  *
  * An EMPTY local provider while inheriting on an agent that was ALREADY
  * inheriting at open (`agentWasHarnessPinned` false) is ALSO authoritative: the
@@ -148,8 +151,6 @@ export function hasMissingRequiredEnvKey(
  * resurrect the persona provider — otherwise the Default option could never
  * actually clear an inherited agent's provider override.
  *
- * The result is the SAME effective value the required-credential gate
- * validates, so the gate, the submitted record, and the spawn snapshot agree.
  * Provider is normalized: trimmed, empty → `null`.
  */
 export function resolveInheritedRuntimeSubmission(input: {
diff --git a/desktop/src/features/agents/ui/relayMeshModelPicker.test.mjs b/desktop/src/features/agents/ui/relayMeshModelPicker.test.mjs
index 3dd1b7c7b3..ce002dfe61 100644
--- a/desktop/src/features/agents/ui/relayMeshModelPicker.test.mjs
+++ b/desktop/src/features/agents/ui/relayMeshModelPicker.test.mjs
@@ -9,7 +9,7 @@ import { AUTO_MODEL_DROPDOWN_VALUE } from "./agentConfigOptions.tsx";
 
 const fallback = [{ id: "", label: "Default model" }];
 const live = [
-  { id: "", label: "Default (auto)" },
+  { id: "", label: "Auto (collective when available)" },
   { id: "mesh/model", label: "mesh/model" },
 ];
 
@@ -35,7 +35,9 @@ test("Buzz shared compute fallback is Default auto while normal providers remain
     model: "",
     provider: "relay-mesh",
   });
-  assert.deepEqual(mesh.options, [{ id: "", label: "Default (auto)" }]);
+  assert.deepEqual(mesh.options, [
+    { id: "", label: "Auto (collective when available)" },
+  ]);
 
   const openai = relayMeshModelPickerState({
     discoveredOptions: null,
@@ -57,7 +59,9 @@ test("Buzz shared compute keeps Default auto when discovery is empty", () => {
     provider: "relay-mesh",
   });
 
-  assert.deepEqual(state.options, [{ id: "", label: "Default (auto)" }]);
+  assert.deepEqual(state.options, [
+    { id: "", label: "Auto (collective when available)" },
+  ]);
   assert.equal(state.selectValue, AUTO_MODEL_DROPDOWN_VALUE);
   assert.equal(state.showCustomInput, false);
 });
@@ -71,6 +75,6 @@ test("Buzz shared compute dropdown contains Default plus live models and no cust
   });
   assert.deepEqual(
     options.map((option) => option.label),
-    ["Default (auto)", "mesh/model"],
+    ["Auto (collective when available)", "mesh/model"],
   );
 });
diff --git a/desktop/src/features/agents/ui/relayMeshModelPicker.ts b/desktop/src/features/agents/ui/relayMeshModelPicker.ts
index 2e3cd93eb2..dee401824a 100644
--- a/desktop/src/features/agents/ui/relayMeshModelPicker.ts
+++ b/desktop/src/features/agents/ui/relayMeshModelPicker.ts
@@ -12,7 +12,10 @@ function withSharedComputeAutoOption(
   options: readonly PersonaModelOption[],
 ): readonly PersonaModelOption[] {
   const modelOptions = options.filter((option) => option.id.trim() !== "");
-  return [{ id: "", label: "Default (auto)" }, ...modelOptions];
+  return [
+    { id: "", label: "Auto (collective when available)" },
+    ...modelOptions,
+  ];
 }
 
 export function relayMeshModelPickerState({
diff --git a/desktop/src/features/agents/ui/runtimeAvailabilityWarning.test.mjs b/desktop/src/features/agents/ui/runtimeAvailabilityWarning.test.mjs
new file mode 100644
index 0000000000..3506714309
--- /dev/null
+++ b/desktop/src/features/agents/ui/runtimeAvailabilityWarning.test.mjs
@@ -0,0 +1,89 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { runtimeAvailabilityWarning } from "./runtimeAvailabilityWarning.ts";
+
+function entry(overrides) {
+  return {
+    id: "amp",
+    label: "Amp",
+    avatarUrl: "",
+    availability: "not_installed",
+    command: null,
+    binaryPath: null,
+    defaultArgs: [],
+    mcpCommand: null,
+    modelEnvVar: null,
+    providerEnvVar: null,
+    thinkingEnvVar: null,
+    installHint:
+      "Buzz talks to the Amp CLI through the amp-acp adapter. Follow the setup guide to install the adapter so the amp-acp command is on your PATH.",
+    installInstructionsUrl: "https://example.com",
+    canAutoInstall: false,
+    requiresExternalCli: false,
+    underlyingCliPath: null,
+    nodeRequired: false,
+    authStatus: "not_applicable",
+    loginHint: null,
+    source: "preset",
+    definitionEnv: {},
+    ...overrides,
+  };
+}
+
+test("available runtimes produce no warning", () => {
+  assert.equal(
+    runtimeAvailabilityWarning(entry({ availability: "available" })),
+    null,
+  );
+});
+
+test("not-installed warning includes the install hint", () => {
+  // Tyler's Amp hand-test: the hint was carried by the entry but the old
+  // render gate (requiresExternalCli, hardcoded false for presets) hid it.
+  const warning = runtimeAvailabilityWarning(entry({}));
+  assert.equal(
+    warning,
+    "Amp is not installed. Buzz talks to the Amp CLI through the amp-acp adapter. Follow the setup guide to install the adapter so the amp-acp command is on your PATH.",
+  );
+});
+
+test("empty install hint leaves no trailing space", () => {
+  // Custom harnesses default installHint to "" — an unguarded template
+  // would render "Amp is not installed. ".
+  const warning = runtimeAvailabilityWarning(entry({ installHint: "" }));
+  assert.equal(warning, "Amp is not installed.");
+});
+
+test("adapter-missing warning names the adapter and includes the hint", () => {
+  const warning = runtimeAvailabilityWarning(
+    entry({ availability: "adapter_missing" }),
+  );
+  assert.match(
+    warning ?? "",
+    /CLI is installed but the ACP adapter is missing/,
+  );
+  assert.match(warning ?? "", /amp-acp command is on your PATH/);
+});
+
+test("cli-missing external-CLI warning keeps the hint", () => {
+  const warning = runtimeAvailabilityWarning(
+    entry({
+      availability: "cli_missing",
+      requiresExternalCli: true,
+      installHint: "Install Codex from example.com.",
+      label: "Codex",
+    }),
+  );
+  assert.equal(
+    warning,
+    "Codex CLI is missing. Install Codex from example.com.",
+  );
+});
+
+test("adapter-outdated warning stays hint-free reinstall copy", () => {
+  const warning = runtimeAvailabilityWarning(
+    entry({ availability: "adapter_outdated" }),
+  );
+  assert.equal(warning, "Amp ACP adapter is outdated — reinstall to continue.");
+});
diff --git a/desktop/src/features/agents/ui/runtimeAvailabilityWarning.ts b/desktop/src/features/agents/ui/runtimeAvailabilityWarning.ts
new file mode 100644
index 0000000000..6f6a033005
--- /dev/null
+++ b/desktop/src/features/agents/ui/runtimeAvailabilityWarning.ts
@@ -0,0 +1,32 @@
+import type { AcpRuntimeCatalogEntry } from "@/shared/api/types";
+
+/**
+ * Availability warning sentence for the agent-definition dialog.
+ * Returns null when the runtime is available (no warning to show).
+ *
+ * Non-empty install hints are appended so a not-installed or
+ * adapter-missing runtime tells the user the actual next step (presets
+ * always carry one; custom harnesses may leave it empty — guard on the
+ * trimmed value to avoid a dangling "X is not installed. ").
+ */
+export function runtimeAvailabilityWarning(
+  runtime: AcpRuntimeCatalogEntry,
+): string | null {
+  if (runtime.availability === "available") {
+    return null;
+  }
+  const hint = runtime.installHint.trim();
+  const withHint = (base: string) => (hint ? `${base} ${hint}` : base);
+  switch (runtime.availability) {
+    case "adapter_missing":
+      return withHint(
+        `${runtime.label} CLI is installed but the ACP adapter is missing.`,
+      );
+    case "adapter_outdated":
+      return `${runtime.label} ACP adapter is outdated — reinstall to continue.`;
+    default:
+      return runtime.requiresExternalCli
+        ? withHint(`${runtime.label} CLI is missing.`)
+        : withHint(`${runtime.label} is not installed.`);
+  }
+}
diff --git a/desktop/src/features/agents/ui/usePersonaActions.ts b/desktop/src/features/agents/ui/usePersonaActions.ts
index 54535d121c..2c7668969a 100644
--- a/desktop/src/features/agents/ui/usePersonaActions.ts
+++ b/desktop/src/features/agents/ui/usePersonaActions.ts
@@ -17,9 +17,26 @@ import {
   type AgentSnapshotImportPreview,
   type AgentSnapshotImportResult,
 } from "@/features/agents/hooks";
-import { getPersonaLibraryState } from "@/features/agents/lib/catalog";
-import { clearLegacyPersonaCatalogVisibility } from "@/features/agents/lib/legacyPersonaCatalogVisibility";
+import {
+  getLibraryPersonas,
+  getPersonaLabelsById,
+} from "@/features/agents/lib/catalog";
+import {
+  type CatalogPersonaShareLevel,
+  catalogPersonasFromPublications,
+  findLocalPersonaForCatalogEntry,
+  isCatalogPersona,
+} from "@/features/agents/lib/personaCatalogRelay";
+import {
+  usePersonaCatalogLiveUpdates,
+  usePersonaCatalogQuery,
+  useSetPersonaCatalogSharedMutation,
+  useUpdatePersonaAndPublishMutation,
+} from "@/features/agents/lib/usePersonaCatalogRelay";
+import { personaSaveNotice } from "@/features/agents/lib/personaSaveNotice";
 import { useCreatedAgentChannelAttachment } from "@/features/agents/useCreatedAgentChannelAttachment";
+import { useCommunities } from "@/features/communities/useCommunities";
+import { useIdentityQuery } from "@/shared/api/hooks";
 import type {
   SnapshotFormat,
   SnapshotMemoryLevel,
@@ -51,7 +68,14 @@ type PersonaFeedbackSurface = "catalog" | "library";
 
 export function usePersonaActions() {
   const queryClient = useQueryClient();
+  const { activeCommunity } = useCommunities();
+  const identityQuery = useIdentityQuery();
+  const communityId = activeCommunity?.id ?? null;
   const personasQuery = usePersonasQuery();
+  const catalogQuery = usePersonaCatalogQuery(communityId);
+  usePersonaCatalogLiveUpdates(communityId);
+  const setCatalogSharedMutation =
+    useSetPersonaCatalogSharedMutation(communityId);
   const [shouldLoadAcpRuntimes, setShouldLoadAcpRuntimes] =
     React.useState(false);
   const acpRuntimesQuery = useAcpRuntimesQuery({
@@ -60,6 +84,8 @@ export function usePersonaActions() {
   const createAgentMutation = useCreateManagedAgentMutation();
   const createPersonaMutation = useCreatePersonaMutation();
   const updatePersonaMutation = useUpdatePersonaMutation();
+  const updatePersonaAndPublishMutation =
+    useUpdatePersonaAndPublishMutation(communityId);
   const deletePersonaMutation = useDeletePersonaMutation();
   const setPersonaActiveMutation = useSetPersonaActiveMutation();
   const exportAgentSnapshotMutation = useExportAgentSnapshotMutation();
@@ -73,10 +99,12 @@ export function usePersonaActions() {
   const [personaToShare, setPersonaToShare] = React.useState<{
     persona: AgentPersona;
     linkedAgentPubkey: string | null;
+    effectiveAvatarUrl: string | null;
   } | null>(null);
   const [personaToExportSnapshot, setPersonaToExportSnapshot] = React.useState<{
     persona: AgentPersona;
     linkedAgentPubkey: string | null;
+    effectiveAvatarUrl: string | null;
   } | null>(null);
   const [snapshotImportState, setSnapshotImportState] = React.useState<{
     fileBytes: number[];
@@ -101,9 +129,15 @@ export function usePersonaActions() {
     React.useState(false);
 
   const personas = personasQuery.data ?? [];
-  React.useEffect(() => {
-    clearLegacyPersonaCatalogVisibility();
-  }, []);
+  const publications = catalogQuery.data ?? [];
+  const sharedCatalogPersonaIdSet = React.useMemo(() => {
+    const currentPubkey = identityQuery.data?.pubkey.toLowerCase();
+    return new Set(
+      publications
+        .filter((publication) => publication.ownerPubkey === currentPubkey)
+        .map((publication) => publication.sourcePersonaId),
+    );
+  }, [identityQuery.data?.pubkey, publications]);
   const availableRuntimes = React.useMemo(
     () =>
       (acpRuntimesQuery.data ?? []).filter(
@@ -112,8 +146,21 @@ export function usePersonaActions() {
       ),
     [acpRuntimesQuery.data],
   );
-  const { catalogPersonas, libraryPersonas, personaLabelsById } = React.useMemo(
-    () => getPersonaLibraryState(personas),
+  const catalogPersonas = React.useMemo(
+    () =>
+      catalogPersonasFromPublications(
+        publications,
+        personas,
+        identityQuery.data?.pubkey,
+      ),
+    [identityQuery.data?.pubkey, personas, publications],
+  );
+  const libraryPersonas = React.useMemo(
+    () => getLibraryPersonas(personas),
+    [personas],
+  );
+  const personaLabelsById = React.useMemo(
+    () => getPersonaLabelsById(personas),
     [personas],
   );
 
@@ -130,6 +177,7 @@ export function usePersonaActions() {
     intent?: AgentCreateIntent,
     backendIntent?: BackendIntent | null,
     targetChannel?: Pick<Channel, "id" | "name"> | null,
+    options?: { publishCatalogUpdates?: boolean },
   ): Promise<boolean> {
     if (isPersonaSubmitPending) {
       return false;
@@ -139,8 +187,24 @@ export function usePersonaActions() {
     setIsPersonaSubmitPending(true);
     try {
       if ("id" in input) {
-        await updatePersonaMutation.mutateAsync(input);
-        setPersonaNoticeMessage(`Updated ${input.displayName}.`);
+        // "Save and publish" promises the community catalog sees this edit, so
+        // it must use the command that awaits the relay. A plain save only
+        // enqueues the head and cannot report the outcome.
+        if (options?.publishCatalogUpdates) {
+          const result =
+            await updatePersonaAndPublishMutation.mutateAsync(input);
+          if (result.publicationStatus === "queued" && result.relayMessage) {
+            console.warn(
+              `[updatePersonaAndPublish] relay publication queued: ${result.relayMessage}`,
+            );
+          }
+          setPersonaNoticeMessage(
+            personaSaveNotice(input.displayName, result.publicationStatus),
+          );
+        } else {
+          await updatePersonaMutation.mutateAsync(input);
+          setPersonaNoticeMessage(personaSaveNotice(input.displayName, null));
+        }
       } else {
         const runtime = availableRuntimes.find(
           (candidate) => candidate.id === input.runtime,
@@ -240,7 +304,46 @@ export function usePersonaActions() {
   ) {
     clearFeedback(surface);
     try {
-      await setPersonaActiveMutation.mutateAsync({ id: persona.id, active });
+      if (active && isCatalogPersona(persona)) {
+        const localPersona = findLocalPersonaForCatalogEntry(
+          personas,
+          persona.catalogSource,
+        );
+
+        if (localPersona) {
+          if (!localPersona.isActive) {
+            await setPersonaActiveMutation.mutateAsync({
+              id: localPersona.id,
+              active: true,
+            });
+          }
+        } else {
+          await createPersonaMutation.mutateAsync({
+            displayName: persona.displayName,
+            avatarUrl: persona.avatarUrl ?? undefined,
+            systemPrompt: persona.systemPrompt,
+            runtime: persona.runtime ?? undefined,
+            model: persona.model ?? undefined,
+            provider: persona.provider ?? undefined,
+            namePool: persona.namePool,
+            behavior: {
+              respondTo:
+                persona.respondTo === "anyone" ? "anyone" : "owner-only",
+              parallelism: persona.parallelism ?? undefined,
+            },
+            // Provenance on the copy: without it the copy's fresh local id is
+            // the only identifier, and the catalog offers "Add" again.
+            catalogSource: persona.catalogSource.isOwn
+              ? undefined
+              : {
+                  ownerPubkey: persona.catalogSource.ownerPubkey,
+                  personaId: persona.catalogSource.personaId,
+                },
+          });
+        }
+      } else {
+        await setPersonaActiveMutation.mutateAsync({ id: persona.id, active });
+      }
       setPersonaNoticeMessage(
         active
           ? `Selected ${persona.displayName} for My Agents.`
@@ -334,6 +437,7 @@ export function usePersonaActions() {
 
   function openCatalog() {
     clearFeedback("catalog");
+    void catalogQuery.refetch();
     setIsCatalogDialogOpen(true);
   }
 
@@ -345,17 +449,20 @@ export function usePersonaActions() {
   function openShare(
     persona: AgentPersona,
     linkedAgent: ManagedAgent | undefined,
+    effectiveAvatarUrl: string | null,
   ) {
     clearFeedback("library");
     setPersonaToShare({
       persona,
       linkedAgentPubkey: linkedAgent?.pubkey ?? null,
+      effectiveAvatarUrl,
     });
   }
 
   function handleExportSnapshot(
     persona: AgentPersona,
     linkedAgentPubkey: string | null,
+    effectiveAvatarUrl: string | null,
     memoryLevel: SnapshotMemoryLevel,
     format: SnapshotFormat,
   ) {
@@ -367,7 +474,7 @@ export function usePersonaActions() {
         memoryLevel,
         format,
         memorySourcePubkey: linkedAgentPubkey,
-        avatarUrl: persona.avatarUrl,
+        avatarUrl: effectiveAvatarUrl,
       },
       {
         onSuccess: (saved) => {
@@ -386,22 +493,83 @@ export function usePersonaActions() {
     );
   }
 
+  function getPersonaCatalogShareLevel(
+    persona: AgentPersona,
+  ): CatalogPersonaShareLevel {
+    return persona.shared ? "none" : "not-shared";
+  }
+
+  async function setPersonaCatalogShareLevel(
+    persona: AgentPersona,
+    shareLevel: CatalogPersonaShareLevel,
+  ): Promise<void> {
+    if (persona.isBuiltIn) return;
+
+    clearFeedback("library");
+    try {
+      const shared = shareLevel !== "not-shared";
+      const result = await setCatalogSharedMutation.mutateAsync({
+        id: persona.id,
+        shared,
+      });
+      setPersonaToShare((current) =>
+        current?.persona.id === result.persona.id
+          ? { ...current, persona: result.persona }
+          : current,
+      );
+      if (result.publicationStatus === "queued") {
+        if (shared) {
+          setPersonaNoticeMessage(
+            `Sharing ${persona.displayName} is queued. It will appear after the relay accepts the update.`,
+          );
+        } else {
+          setPersonaNoticeMessage(
+            `Removing ${persona.displayName} is queued. It may remain discoverable until the relay accepts the update.`,
+          );
+        }
+        if (result.relayMessage) {
+          console.warn(
+            `[setPersonaShared] relay publication queued: ${result.relayMessage}`,
+          );
+        }
+      } else if (!shared) {
+        setPersonaNoticeMessage(
+          `${persona.displayName} is no longer discoverable in the community catalog.`,
+        );
+      } else {
+        setPersonaNoticeMessage(
+          `Published ${persona.displayName} to the community catalog.`,
+        );
+      }
+    } catch (error) {
+      setPersonaErrorMessage(
+        error instanceof Error
+          ? error.message
+          : "Failed to update catalog sharing.",
+      );
+    }
+  }
+
   const isPending =
     isPersonaSubmitPending ||
     createPersonaMutation.isPending ||
     createAgentMutation.isPending ||
     updatePersonaMutation.isPending ||
+    updatePersonaAndPublishMutation.isPending ||
     deletePersonaMutation.isPending ||
     setPersonaActiveMutation.isPending ||
     exportAgentSnapshotMutation.isPending ||
     previewSnapshotImportMutation.isPending ||
-    confirmSnapshotImportMutation.isPending;
+    confirmSnapshotImportMutation.isPending ||
+    setCatalogSharedMutation.isPending;
 
   return {
     personasQuery,
+    catalogQuery,
     acpRuntimesQuery,
     createPersonaMutation,
     updatePersonaMutation,
+    updatePersonaAndPublishMutation,
     setPersonaActiveMutation,
     catalogPersonas,
     libraryPersonas,
@@ -431,6 +599,9 @@ export function usePersonaActions() {
     personaToExportSnapshot,
     setPersonaToExportSnapshot,
     handleExportSnapshot,
+    getPersonaCatalogShareLevel,
+    setPersonaCatalogShareLevel,
+    sharedCatalogPersonaIdSet,
     clearFeedback,
     snapshotImportState,
     snapshotImportResult,
diff --git a/desktop/src/features/agents/ui/usePersonaModelDiscovery.ts b/desktop/src/features/agents/ui/usePersonaModelDiscovery.ts
index b0ab0f8379..e7b434288f 100644
--- a/desktop/src/features/agents/ui/usePersonaModelDiscovery.ts
+++ b/desktop/src/features/agents/ui/usePersonaModelDiscovery.ts
@@ -203,7 +203,9 @@ export function usePersonaModelDiscovery({
   // reference from a React Query refetch (same data, unstable ref) does not
   // abandon and re-issue an in-flight discovery IPC call.
   const selectedRuntimeAvailability = selectedRuntime?.availability;
+  const selectedRuntimeLabel = selectedRuntime?.label;
   const selectedRuntimeDefaultArgs = selectedRuntime?.defaultArgs;
+  const selectedRuntimeDefinitionEnv = selectedRuntime?.definitionEnv;
   const canDiscoverModelOptions =
     open &&
     modelFieldVisible &&
@@ -251,6 +253,7 @@ export function usePersonaModelDiscovery({
           formatModelDiscoveryErrorStatus(
             new Error(`Runtime not available: ${selectedRuntimeAvailability}`),
             trimmedProvider,
+            selectedRuntimeLabel,
           ),
         );
         setModelDiscoveryStatusKey(null);
@@ -289,6 +292,7 @@ export function usePersonaModelDiscovery({
         agentArgs: selectedRuntimeDefaultArgs ?? [],
         provider: trimmedProvider || undefined,
         envVars,
+        definitionEnv: selectedRuntimeDefinitionEnv ?? {},
       })
         .then((response) => {
           if (modelDiscoveryRequestRef.current !== requestId) {
@@ -318,7 +322,11 @@ export function usePersonaModelDiscovery({
           setModelDiscoveryData(null);
           setModelDiscoveryDataKey(null);
           setModelDiscoveryStatus(
-            formatModelDiscoveryErrorStatus(error, trimmedProvider),
+            formatModelDiscoveryErrorStatus(
+              error,
+              trimmedProvider,
+              selectedRuntimeLabel,
+            ),
           );
           setModelDiscoveryStatusKey(activeModelDiscoveryKey);
         })
@@ -352,6 +360,8 @@ export function usePersonaModelDiscovery({
     modelDiscoveryKey,
     selectedRuntimeAvailability,
     selectedRuntimeDefaultArgs,
+    selectedRuntimeDefinitionEnv,
+    selectedRuntimeLabel,
     shouldDebounceModelDiscovery,
     trimmedProvider,
   ]);
diff --git a/desktop/src/features/channels/channelSnapshot.test.mjs b/desktop/src/features/channels/channelSnapshot.test.mjs
index 37b69f1eb2..5355bfe6f1 100644
--- a/desktop/src/features/channels/channelSnapshot.test.mjs
+++ b/desktop/src/features/channels/channelSnapshot.test.mjs
@@ -87,6 +87,36 @@ test("remove clears the snapshot for that relay", () => {
   assert.equal(readChannelSnapshot(RELAY), null);
 });
 
+test("cache write evicts disposable entries and retries at quota", () => {
+  const original = window.localStorage;
+  const storage = new Map([
+    ["buzz-channel-messages.v1:relay:old", "big"],
+    ["buzz-timeline-skeleton-shape.v1:old", "small"],
+  ]);
+  window.localStorage = {
+    get length() {
+      return storage.size;
+    },
+    key: (index) => [...storage.keys()][index] ?? null,
+    getItem: (key) => storage.get(key) ?? null,
+    setItem(key, value) {
+      if (!storage.has(key) && storage.size >= 2) {
+        throw new Error("quota exceeded");
+      }
+      storage.set(key, value);
+    },
+    removeItem: (key) => storage.delete(key),
+  };
+  try {
+    writeChannelSnapshot(RELAY, [makeChannel()]);
+    assert.deepEqual(readChannelSnapshot(RELAY), [makeChannel()]);
+    assert.equal(storage.has("buzz-channel-messages.v1:relay:old"), false);
+    assert.equal(storage.has("buzz-timeline-skeleton-shape.v1:old"), false);
+  } finally {
+    window.localStorage = original;
+  }
+});
+
 test("write is tolerant of storage failures", () => {
   const original = window.localStorage.setItem;
   window.localStorage.setItem = () => {
diff --git a/desktop/src/features/channels/channelSnapshot.ts b/desktop/src/features/channels/channelSnapshot.ts
index 404377eee3..265b675790 100644
--- a/desktop/src/features/channels/channelSnapshot.ts
+++ b/desktop/src/features/channels/channelSnapshot.ts
@@ -13,6 +13,7 @@
 
 import type { Channel } from "@/shared/api/types";
 import { normalizeRelayUrl } from "@/features/profile/lib/selfProfileStorage";
+import { setLocalStorageItemWithRecovery } from "@/shared/lib/localStorageQuota";
 
 const STORAGE_KEY_PREFIX = "buzz-channels.v1";
 
@@ -51,9 +52,22 @@ export function writeChannelSnapshot(
 ): void {
   try {
     const key = channelSnapshotKey(relayUrl);
-    const serialized = JSON.stringify({ version: 1, channels });
-    if (window.localStorage.getItem(key) === serialized) return;
-    window.localStorage.setItem(key, serialized);
+    const previous = window.localStorage.getItem(key);
+    if (previous) {
+      try {
+        const parsed = parseChannelSnapshot(JSON.parse(previous));
+        if (parsed && JSON.stringify(parsed) === JSON.stringify(channels))
+          return;
+      } catch {
+        // Malformed snapshots are replaced below.
+      }
+    }
+    const serialized = JSON.stringify({
+      version: 1,
+      updatedAt: Date.now(),
+      channels,
+    });
+    setLocalStorageItemWithRecovery(key, serialized);
   } catch {
     // Storage access failures are non-fatal.
   }
diff --git a/desktop/src/features/channels/ui/BotActivityBar.tsx b/desktop/src/features/channels/ui/BotActivityBar.tsx
index 21ab04f8d6..d685a96103 100644
--- a/desktop/src/features/channels/ui/BotActivityBar.tsx
+++ b/desktop/src/features/channels/ui/BotActivityBar.tsx
@@ -164,7 +164,7 @@ export function BotActivityComposerAction({
           className={cn(
             "inline-flex items-center justify-center rounded-full border border-border/60 bg-background font-medium text-muted-foreground transition-colors hover:border-primary/30 hover:bg-primary/5 hover:text-foreground focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring data-[state=open]:border-primary/40 data-[state=open]:bg-primary/10 data-[state=open]:text-primary",
             isInline
-              ? "h-7 min-w-0 gap-2 overflow-visible border-transparent bg-transparent px-0 text-xs font-semibold leading-none shadow-none hover:border-transparent hover:bg-transparent data-[state=open]:border-transparent data-[state=open]:bg-transparent"
+              ? "min-w-0 gap-1.5 overflow-visible border-transparent bg-transparent px-0 text-xs font-normal leading-normal shadow-none hover:border-transparent hover:bg-transparent data-[state=open]:border-transparent data-[state=open]:bg-transparent"
               : "h-9 min-w-9 gap-1.5 px-2 text-xs",
           )}
           data-testid="bot-activity-composer-trigger"
@@ -178,17 +178,16 @@ export function BotActivityComposerAction({
           onMouseLeave={closeWithDelay}
           type="button"
         >
-          <span className="flex items-center overflow-visible py-px -space-x-1">
+          <span className="flex h-4.5 items-center overflow-visible -space-x-1">
             {workingAgents.slice(0, 2).map((agent) => (
               <UserAvatar
                 avatarUrl={agentAvatarUrl(agent)}
                 className={cn(
                   "border border-background",
-                  isInline
-                    ? "!h-[18px] !w-[18px] shadow-xs ring-1 ring-primary/25 text-3xs"
-                    : "shrink-0",
+                  isInline ? "!h-4.5 !w-4.5 text-3xs" : "shrink-0",
                 )}
                 displayName={agent.name}
+                fallbackDelayMs={isInline ? 0 : undefined}
                 key={agent.pubkey}
                 size="xs"
               />
@@ -201,11 +200,15 @@ export function BotActivityComposerAction({
           ) : null}
           <span
             className={cn(
-              isInline ? "min-w-0 flex-1 overflow-hidden" : "sr-only",
+              isInline
+                ? "flex h-4.5 min-w-0 flex-1 items-center overflow-visible leading-none"
+                : "sr-only",
             )}
           >
             {isInline ? (
-              <Shimmer className="block truncate">{visibleStatusLabel}</Shimmer>
+              <Shimmer className="-my-px truncate py-px">
+                {visibleStatusLabel}
+              </Shimmer>
             ) : (
               "working"
             )}
diff --git a/desktop/src/features/channels/ui/ChannelComposerActivityAccessory.tsx b/desktop/src/features/channels/ui/ChannelComposerActivityAccessory.tsx
new file mode 100644
index 0000000000..216b205fcc
--- /dev/null
+++ b/desktop/src/features/channels/ui/ChannelComposerActivityAccessory.tsx
@@ -0,0 +1,66 @@
+import type { ComponentProps } from "react";
+
+import { BotActivityComposerAction } from "@/features/channels/ui/BotActivityBar";
+import { ComposerActivityAccessory } from "@/features/messages/ui/ComposerActivityAccessory";
+import { TypingIndicatorRow } from "@/features/messages/ui/TypingIndicatorRow";
+
+type ChannelComposerActivityAccessoryProps = {
+  agents: ComponentProps<typeof BotActivityComposerAction>["agents"];
+  channel: ComponentProps<typeof TypingIndicatorRow>["channel"];
+  currentPubkey: ComponentProps<typeof TypingIndicatorRow>["currentPubkey"];
+  onOpenAgentSession: ComponentProps<
+    typeof BotActivityComposerAction
+  >["onOpenAgentSession"];
+  openAgentSessionPubkey: ComponentProps<
+    typeof BotActivityComposerAction
+  >["openAgentSessionPubkey"];
+  profiles: ComponentProps<typeof BotActivityComposerAction>["profiles"];
+  typingPubkeys: string[];
+  visible: boolean;
+  workingBotPubkeys: string[];
+};
+
+export function ChannelComposerActivityAccessory({
+  agents,
+  channel,
+  currentPubkey,
+  onOpenAgentSession,
+  openAgentSessionPubkey,
+  profiles,
+  typingPubkeys,
+  visible,
+  workingBotPubkeys,
+}: ChannelComposerActivityAccessoryProps) {
+  return (
+    <ComposerActivityAccessory
+      className="px-5"
+      testId="channel-composer-activity-row"
+      visible={visible}
+    >
+      <div className="flex w-full items-center gap-2 overflow-visible pl-2">
+        {workingBotPubkeys.length > 0 ? (
+          <div className="flex min-w-0 flex-1 overflow-visible">
+            <BotActivityComposerAction
+              agents={agents}
+              channelId={channel?.id ?? null}
+              onOpenAgentSession={onOpenAgentSession}
+              openAgentSessionPubkey={openAgentSessionPubkey}
+              profiles={profiles}
+              workingBotPubkeys={workingBotPubkeys}
+              variant="inline"
+            />
+          </div>
+        ) : null}
+        {typingPubkeys.length > 0 ? (
+          <TypingIndicatorRow
+            channel={channel}
+            className="min-w-0 flex-1 py-0 pl-[calc(0.75rem+1px)] pr-0 sm:pl-[calc(1rem+1px)]"
+            currentPubkey={currentPubkey}
+            profiles={profiles}
+            typingPubkeys={typingPubkeys}
+          />
+        ) : null}
+      </div>
+    </ComposerActivityAccessory>
+  );
+}
diff --git a/desktop/src/features/channels/ui/ChannelPane.tsx b/desktop/src/features/channels/ui/ChannelPane.tsx
index dbce0b6f5e..92fa172ff5 100644
--- a/desktop/src/features/channels/ui/ChannelPane.tsx
+++ b/desktop/src/features/channels/ui/ChannelPane.tsx
@@ -3,6 +3,7 @@ import { Hash, LogIn } from "lucide-react";
 import { AnimatePresence } from "motion/react";
 import { useAppNavigation } from "@/app/navigation/useAppNavigation";
 import { useMediaUpload } from "@/features/messages/lib/useMediaUpload";
+import { ComposerDockBackdrop } from "@/features/messages/ui/ComposerDockBackdrop";
 import { MessageComposer } from "@/features/messages/ui/MessageComposer";
 import { ComposerTimeoutBanner } from "@/features/moderation/ui/ComposerTimeoutBanner";
 import { useTimeoutState } from "@/features/moderation/lib/timeoutStore";
@@ -25,7 +26,6 @@ import {
   buildVideoReviewContextForMessage,
 } from "@/features/messages/lib/videoReviewContext";
 import { useComposerHeightPadding } from "@/features/messages/ui/useComposerHeightPadding";
-import { TypingIndicatorRow } from "@/features/messages/ui/TypingIndicatorRow";
 import { UserProfilePanel } from "@/features/profile/ui/UserProfilePanel";
 import { ChannelFindBar } from "@/features/search/ui/ChannelFindBar";
 import { AgentSessionThreadPanel } from "@/features/channels/ui/AgentSessionThreadPanel";
@@ -40,6 +40,7 @@ import { useThreadViewModeSwitch } from "@/features/channels/ui/useThreadViewMod
 import { useFocusDrawerPresence } from "@/features/channels/ui/useFocusDrawerPresence";
 import { useChannelWorkingAgentPubkeys } from "@/features/agents/agentWorkingSignal";
 import { BotActivityComposerAction } from "@/features/channels/ui/BotActivityBar";
+import { ChannelComposerActivityAccessory } from "@/features/channels/ui/ChannelComposerActivityAccessory";
 import {
   containsWelcomePersonaMention,
   WelcomeComposerBanner,
@@ -218,6 +219,7 @@ export const ChannelPane = React.memo(function ChannelPane({
     composerWrapperRef,
     `${activeChannelId}:${isSinglePanelView}:${hasMainComposerOverlay}`,
     "css-variable",
+    () => messageTimelineRef.current?.settleAtBottom() ?? false,
   );
   const clearWelcomeComposerDismissTimer = React.useCallback(() => {
     if (welcomeComposerDismissTimerRef.current !== null) {
@@ -408,26 +410,18 @@ export const ChannelPane = React.memo(function ChannelPane({
     activeChannel?.id ?? null,
   );
   const hasComposerBotActivity = composerWorkingBotPubkeys.length > 0;
+  const hasComposerBottomActivity = hasComposerBotActivity || hasTypingActivity;
   const threadComposerBotTypingPubkeys = React.useMemo(() => {
-    if (!openThreadHeadId) {
-      return [];
-    }
-
-    const pubkeys: string[] = [];
-    for (const entry of botTypingEntries) {
-      if (entry.threadHeadId !== openThreadHeadId) {
-        continue;
-      }
-
-      if (
-        !pubkeys.some(
-          (pubkey) => pubkey.toLowerCase() === entry.pubkey.toLowerCase(),
-        )
-      ) {
-        pubkeys.push(entry.pubkey);
-      }
-    }
-    return pubkeys;
+    if (!openThreadHeadId) return [];
+    return botTypingEntries
+      .filter((entry) => entry.threadHeadId === openThreadHeadId)
+      .map((entry) => entry.pubkey)
+      .filter(
+        (pubkey, index, all) =>
+          all.findIndex(
+            (candidate) => candidate.toLowerCase() === pubkey.toLowerCase(),
+          ) === index,
+      );
   }, [botTypingEntries, openThreadHeadId]);
   const hasThreadComposerBotActivity =
     threadComposerBotTypingPubkeys.length > 0;
@@ -514,8 +508,6 @@ export const ChannelPane = React.memo(function ChannelPane({
   const isOverlay = useIsThreadPanelOverlay();
   const useSplitAuxiliaryPane = !isSinglePanelView && !isOverlay;
   const threadViewMode = useThreadViewMode();
-  // Focus mode only replaces the wide split thread pane; narrow threads and
-  // other auxiliary panels keep their existing presentation.
   const useFocusThreadDrawer =
     threadViewMode === "focus" &&
     useSplitAuxiliaryPane &&
@@ -526,6 +518,7 @@ export const ChannelPane = React.memo(function ChannelPane({
   );
   const { changeThreadViewMode, layoutScrollTargetId, resolveScrollTarget } =
     useThreadViewModeSwitch({
+      activeThreadHeadId: threadHeadMessage?.id ?? null,
       externalScrollTargetId: threadScrollTargetId,
       onExternalTargetResolved: onThreadScrollTargetResolved,
       onModeChange: markExitComplete,
@@ -734,7 +727,12 @@ export const ChannelPane = React.memo(function ChannelPane({
               data-testid="channel-composer-overlay"
               ref={composerWrapperRef}
             >
-              <div className="composer-overlay-corner-masks pointer-events-auto">
+              <div
+                className={cn(
+                  "composer-dock composer-overlay-corner-masks relative pointer-events-auto",
+                  hasComposerBottomActivity && "composer-dock--with-activity",
+                )}
+              >
                 {timeoutState.active ? (
                   <ComposerTimeoutBanner
                     expiresAtMs={timeoutState.expiresAtMs}
@@ -748,11 +746,13 @@ export const ChannelPane = React.memo(function ChannelPane({
                     />
                   </div>
                 ) : null}
+                <ComposerDockBackdrop gutterClassName="inset-x-5" />
                 <MessageComposer
                   channelId={activeChannel?.id ?? null}
                   channelName={activeChannel?.name ?? "channel"}
                   channelType={activeChannel?.channelType ?? null}
-                  containerClassName="px-5"
+                  containerClassName="px-5 pb-0"
+                  layoutMode="dock"
                   disabled={isComposerDisabled}
                   editTarget={mainEditTarget}
                   autoSubmitDraftKey={autoSendDraftKey}
@@ -787,40 +787,26 @@ export const ChannelPane = React.memo(function ChannelPane({
                   }
                   showTopBorder={false}
                 />
-                <div
-                  className="min-h-8 overflow-visible bg-background px-5 pb-1.5 pt-0"
-                  data-testid="channel-composer-activity-row"
-                >
-                  <div className="flex h-full w-full items-center gap-2 overflow-visible">
-                    {hasComposerBotActivity ? (
-                      <div className="flex min-w-0 flex-1 overflow-visible">
-                        <BotActivityComposerAction
-                          agents={activityAgents}
-                          channelId={activeChannel?.id ?? null}
-                          onOpenAgentSession={onOpenAgentSession}
-                          openAgentSessionPubkey={openAgentSessionPubkey}
-                          profiles={profiles}
-                          workingBotPubkeys={composerWorkingBotPubkeys}
-                          variant="inline"
-                        />
-                      </div>
-                    ) : null}
-                    {hasTypingActivity ? (
-                      <TypingIndicatorRow
-                        channel={activeChannel}
-                        className="min-w-0 flex-1 py-0 pl-[calc(0.75rem+1px)] pr-0 sm:pl-[calc(1rem+1px)]"
-                        currentPubkey={currentPubkey}
-                        profiles={profiles}
-                        typingPubkeys={typingPubkeys}
-                      />
-                    ) : null}
-                  </div>
-                </div>
+                {/* The activity accessory is anchored in the dock's reserved
+                    bottom rail, so fading it cannot change the observed
+                    overlay height or move the conversation. Its natural
+                    content height remains responsive. */}
+                <ChannelComposerActivityAccessory
+                  agents={activityAgents}
+                  channel={activeChannel}
+                  currentPubkey={currentPubkey}
+                  onOpenAgentSession={onOpenAgentSession}
+                  openAgentSessionPubkey={openAgentSessionPubkey}
+                  profiles={profiles}
+                  typingPubkeys={typingPubkeys}
+                  visible={hasComposerBottomActivity}
+                  workingBotPubkeys={composerWorkingBotPubkeys}
+                />
               </div>
             </div>
           )}
           {canDropInMainColumn && mainComposerMedia.isDragOver ? (
-            <DropZoneOverlay className="z-30 rounded-none" />
+            <DropZoneOverlay className="z-50 rounded-2xl bg-primary/20 backdrop-blur-sm" />
           ) : null}
         </section>
       ) : null}
@@ -881,7 +867,8 @@ export const ChannelPane = React.memo(function ChannelPane({
                 onExpandReplies={onExpandThreadReplies}
                 onSelectReplyTarget={onSelectThreadReplyTarget}
                 onSend={onSendThreadReply}
-                onScrollTargetResolved={resolveScrollTarget}
+                onScrollTargetResolved={() => resolveScrollTarget()}
+                onScrollTargetSettled={resolveScrollTarget}
                 onToggleReaction={onToggleReaction}
                 onUnfollowThread={onUnfollowThread}
                 profiles={profiles}
@@ -898,7 +885,8 @@ export const ChannelPane = React.memo(function ChannelPane({
                 )}
                 threadReplyUnreadCounts={threadReplyUnreadCounts}
                 threadTypingPubkeys={threadTypingPubkeys}
-                toolbarExtraActions={
+                activityAccessoryVisible={hasThreadComposerBotActivity}
+                activityAccessoryContent={
                   hasThreadComposerBotActivity ? (
                     <BotActivityComposerAction
                       agents={activityAgents}
diff --git a/desktop/src/features/channels/ui/useThreadViewModeSwitch.test.mjs b/desktop/src/features/channels/ui/useThreadViewModeSwitch.test.mjs
index 255492bf49..9f40a00fbc 100644
--- a/desktop/src/features/channels/ui/useThreadViewModeSwitch.test.mjs
+++ b/desktop/src/features/channels/ui/useThreadViewModeSwitch.test.mjs
@@ -4,6 +4,7 @@ import test from "node:test";
 import {
   findTopVisibleThreadMessageId,
   getResolvedThreadTargets,
+  getScopedLayoutScrollTargetId,
 } from "./useThreadViewModeSwitch.ts";
 
 function row(id, top, bottom) {
@@ -44,6 +45,55 @@ test("resolves both sources when a layout anchor matches the external target", (
   );
 });
 
+test("does not resolve a layout target that was never captured", () => {
+  assert.deepEqual(
+    getResolvedThreadTargets({
+      externalTargetId: "reply-b",
+      layoutTargetId: null,
+    }),
+    { resolveExternal: true, resolveLayout: false },
+  );
+  assert.deepEqual(
+    getResolvedThreadTargets({
+      externalTargetId: null,
+      layoutTargetId: null,
+    }),
+    { resolveExternal: true, resolveLayout: false },
+  );
+});
+
+test("drops a captured layout target when the active thread closes or changes", () => {
+  const captured = { messageId: "reply-a", threadHeadId: "thread-a" };
+
+  assert.equal(
+    getScopedLayoutScrollTargetId({
+      activeThreadHeadId: "thread-a",
+      layoutTarget: captured,
+    }),
+    "reply-a",
+  );
+  assert.equal(
+    getScopedLayoutScrollTargetId({
+      activeThreadHeadId: null,
+      layoutTarget: captured,
+    }),
+    null,
+  );
+  const replacementLayoutTargetId = getScopedLayoutScrollTargetId({
+    activeThreadHeadId: "thread-b",
+    layoutTarget: captured,
+  });
+  assert.equal(replacementLayoutTargetId, null);
+  assert.deepEqual(
+    getResolvedThreadTargets({
+      externalTargetId: "reply-b",
+      layoutTargetId: replacementLayoutTargetId,
+    }),
+    { resolveExternal: true, resolveLayout: false },
+    "the stale anchor does not mask the replacement thread target",
+  );
+});
+
 test("returns null without a mounted thread body or visible message", () => {
   assert.equal(findTopVisibleThreadMessageId(null), null);
   assert.equal(
diff --git a/desktop/src/features/channels/ui/useThreadViewModeSwitch.ts b/desktop/src/features/channels/ui/useThreadViewModeSwitch.ts
index 5493eada50..8dd41cfc51 100644
--- a/desktop/src/features/channels/ui/useThreadViewModeSwitch.ts
+++ b/desktop/src/features/channels/ui/useThreadViewModeSwitch.ts
@@ -31,7 +31,25 @@ export function getResolvedThreadTargets({
   };
 }
 
+type LayoutScrollTarget = {
+  messageId: string;
+  threadHeadId: string;
+};
+
+export function getScopedLayoutScrollTargetId({
+  activeThreadHeadId,
+  layoutTarget,
+}: {
+  activeThreadHeadId: string | null;
+  layoutTarget: LayoutScrollTarget | null;
+}): string | null {
+  return layoutTarget?.threadHeadId === activeThreadHeadId
+    ? layoutTarget.messageId
+    : null;
+}
+
 type ThreadViewModeSwitchOptions = {
+  activeThreadHeadId: string | null;
   externalScrollTargetId: string | null;
   onExternalTargetResolved: () => void;
   onModeChange?: (mode: ThreadViewMode) => void;
@@ -39,13 +57,23 @@ type ThreadViewModeSwitchOptions = {
 
 /** Preserves the reply being read while the thread changes presentation. */
 export function useThreadViewModeSwitch({
+  activeThreadHeadId,
   externalScrollTargetId,
   onExternalTargetResolved,
   onModeChange,
 }: ThreadViewModeSwitchOptions) {
-  const [layoutScrollTargetId, setLayoutScrollTargetId] = React.useState<
-    string | null
-  >(null);
+  const [layoutScrollTarget, setLayoutScrollTarget] =
+    React.useState<LayoutScrollTarget | null>(null);
+  const layoutScrollTargetId = getScopedLayoutScrollTargetId({
+    activeThreadHeadId,
+    layoutTarget: layoutScrollTarget,
+  });
+
+  React.useEffect(() => {
+    setLayoutScrollTarget((current) =>
+      current?.threadHeadId === activeThreadHeadId ? current : null,
+    );
+  }, [activeThreadHeadId]);
 
   const changeThreadViewMode = React.useCallback(
     (mode: ThreadViewMode, restoreFocus: boolean) => {
@@ -54,7 +82,11 @@ export function useThreadViewModeSwitch({
       );
       const anchorId = findTopVisibleThreadMessageId(body);
 
-      setLayoutScrollTargetId(anchorId);
+      setLayoutScrollTarget(
+        anchorId && activeThreadHeadId
+          ? { messageId: anchorId, threadHeadId: activeThreadHeadId }
+          : null,
+      );
       onModeChange?.(mode);
       setThreadViewMode(mode);
       requestAnimationFrame(() => {
@@ -69,17 +101,32 @@ export function useThreadViewModeSwitch({
         });
       });
     },
-    [onModeChange],
+    [activeThreadHeadId, onModeChange],
   );
 
-  const resolveScrollTarget = React.useCallback(() => {
-    const resolution = getResolvedThreadTargets({
-      externalTargetId: externalScrollTargetId,
-      layoutTargetId: layoutScrollTargetId,
-    });
-    if (resolution.resolveLayout) setLayoutScrollTargetId(null);
-    if (resolution.resolveExternal) onExternalTargetResolved();
-  }, [externalScrollTargetId, layoutScrollTargetId, onExternalTargetResolved]);
+  const resolveScrollTarget = React.useCallback(
+    (settledMessageId?: string) => {
+      const resolution = getResolvedThreadTargets({
+        externalTargetId: externalScrollTargetId,
+        layoutTargetId: layoutScrollTargetId,
+      });
+      if (resolution.resolveExternal) onExternalTargetResolved();
+      if (settledMessageId) {
+        setLayoutScrollTarget((current) =>
+          current?.threadHeadId === activeThreadHeadId &&
+          current.messageId === settledMessageId
+            ? null
+            : current,
+        );
+      }
+    },
+    [
+      activeThreadHeadId,
+      externalScrollTargetId,
+      layoutScrollTargetId,
+      onExternalTargetResolved,
+    ],
+  );
 
   return {
     changeThreadViewMode,
diff --git a/desktop/src/features/channels/useLiveChannelUpdates.ts b/desktop/src/features/channels/useLiveChannelUpdates.ts
index f8db0af5e2..aeb3abb905 100644
--- a/desktop/src/features/channels/useLiveChannelUpdates.ts
+++ b/desktop/src/features/channels/useLiveChannelUpdates.ts
@@ -88,6 +88,13 @@ export function isChannelUnreadTriggerKind(kind: number, isDmChannel: boolean) {
     : UNREAD_TRIGGER_KINDS.has(kind);
 }
 
+export function isHomeActivityEvent(
+  isDmChannel: boolean,
+  isThreadedReply: boolean,
+) {
+  return isThreadedReply || isDmChannel;
+}
+
 export function withChannelTagFallback(
   event: RelayEvent,
   channelId: string,
@@ -278,7 +285,7 @@ export function useLiveChannelUpdates(
         }
       } else {
         options.onChannelMessage?.(channelId, event);
-        if (isThreadedReply) {
+        if (isHomeActivityEvent(isDmChannel, isThreadedReply)) {
           options.onThreadReplyNotification?.(channelId, event);
         }
       }
diff --git a/desktop/src/features/communities/ui/CommunityEditForm.tsx b/desktop/src/features/communities/ui/CommunityEditForm.tsx
index 4c94acf102..76837b65aa 100644
--- a/desktop/src/features/communities/ui/CommunityEditForm.tsx
+++ b/desktop/src/features/communities/ui/CommunityEditForm.tsx
@@ -68,7 +68,7 @@ export function CommunityEditForm({
 
     let cancelled = false;
     const timeoutId = window.setTimeout(() => {
-      void getJoinPolicy(normalizedUrl)
+      void getJoinPolicy(normalizedUrl, "native")
         .then((policy) => {
           if (cancelled || !policy) return;
           setJoinPolicy(policy);
@@ -105,7 +105,7 @@ export function CommunityEditForm({
 
       if (joinPolicyRequired) {
         try {
-          const policy = await getJoinPolicy(normalizedUrl);
+          const policy = await getJoinPolicy(normalizedUrl, "native");
           if (!policy) {
             onSubmit(trimmedName, normalizedUrl);
             return;
diff --git a/desktop/src/features/community-members/ui/CommunityInviteDialog.tsx b/desktop/src/features/community-members/ui/CommunityInviteDialog.tsx
index bd23e2bbec..9daca590f4 100644
--- a/desktop/src/features/community-members/ui/CommunityInviteDialog.tsx
+++ b/desktop/src/features/community-members/ui/CommunityInviteDialog.tsx
@@ -3,6 +3,7 @@ import * as React from "react";
 import {
   Dialog,
   DialogContent,
+  DialogDescription,
   DialogHeader,
   DialogTitle,
 } from "@/shared/ui/dialog";
@@ -29,12 +30,14 @@ export function CommunityInviteDialog({
   return (
     <Dialog onOpenChange={onOpenChange} open={open}>
       <DialogContent
-        aria-describedby={undefined}
         className="max-h-[85vh] max-w-xl overflow-y-auto"
         data-testid="community-invite-dialog"
       >
-        <DialogHeader className="space-y-0">
+        <DialogHeader>
           <DialogTitle>Invite to community</DialogTitle>
+          <DialogDescription>
+            Anyone with this link can join this community.
+          </DialogDescription>
         </DialogHeader>
 
         <InviteLinkSection onTtlSecsChange={setTtlSecs} ttlSecs={ttlSecs} />
diff --git a/desktop/src/features/community-members/ui/InviteLinkSection.tsx b/desktop/src/features/community-members/ui/InviteLinkSection.tsx
index 76c0262ea5..dc0735c85e 100644
--- a/desktop/src/features/community-members/ui/InviteLinkSection.tsx
+++ b/desktop/src/features/community-members/ui/InviteLinkSection.tsx
@@ -8,10 +8,8 @@ import { Button } from "@/shared/ui/button";
 import {
   DropdownMenu,
   DropdownMenuContent,
-  DropdownMenuLabel,
   DropdownMenuRadioGroup,
   DropdownMenuRadioItem,
-  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/shared/ui/dropdown-menu";
 import { Separator } from "@/shared/ui/separator";
@@ -24,6 +22,15 @@ const TTL_OPTIONS: { label: string; value: number }[] = [
   { label: "30 days", value: 30 * 24 * 60 * 60 },
 ];
 
+const MAX_USE_OPTIONS: { label: string; value: number | null }[] = [
+  { label: "No limit", value: null },
+  { label: "1 use", value: 1 },
+  { label: "3 uses", value: 3 },
+  { label: "5 uses", value: 5 },
+  { label: "10 uses", value: 10 },
+  { label: "25 uses", value: 25 },
+];
+
 export const DEFAULT_INVITE_TTL_SECS = TTL_OPTIONS[1].value;
 
 type CopyStatus = "idle" | "copying" | "copied";
@@ -31,8 +38,9 @@ type CopyStatus = "idle" | "copying" | "copied";
 /**
  * Share-with-link footer for the community invite dialog.
  *
- * Each copy action mints a fresh stateless invite code and places its
- * shareable landing-page URL on the clipboard.
+ * Each copy action mints a fresh database-backed invite code and places its
+ * shareable landing-page URL on the clipboard. Invites may be unlimited or
+ * capped to a caller-selected number of successful joins.
  */
 export function InviteLinkSection({
   onTtlSecsChange,
@@ -42,8 +50,12 @@ export function InviteLinkSection({
   ttlSecs: number;
 }) {
   const [copyStatus, setCopyStatus] = React.useState<CopyStatus>("idle");
+  const [maxUses, setMaxUses] = React.useState<number | null>(null);
   const ttlLabel =
     TTL_OPTIONS.find((option) => option.value === ttlSecs)?.label ?? "3 days";
+  const maxUsesLabel =
+    MAX_USE_OPTIONS.find((option) => option.value === maxUses)?.label ??
+    "No limit";
   const copyLabel =
     copyStatus === "copying"
       ? "Copying…"
@@ -61,7 +73,7 @@ export function InviteLinkSection({
     if (copyStatus === "copying") return;
     setCopyStatus("copying");
     try {
-      const invite = await mintInvite(ttlSecs);
+      const invite = await mintInvite({ ttlSecs, maxUses });
       await writeTextToClipboard(invite.url);
       setCopyStatus("copied");
       toast.success("Invite link copied");
@@ -73,50 +85,79 @@ export function InviteLinkSection({
 
   return (
     <section className="pt-2" data-testid="community-invite-link-section">
-      <div className="flex items-center gap-3">
-        <span className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-muted text-muted-foreground">
-          <Link2 aria-hidden="true" className="h-4 w-4" />
-        </span>
-        <div className="min-w-0 flex-1">
-          <h3 className="text-sm font-medium">Share with a link</h3>
-          <p className="text-xs text-secondary-foreground/75">
-            Anyone with the link can join this community.
-          </p>
+      <div className="space-y-5">
+        <div className="flex items-center justify-between gap-4">
+          <span className="text-sm font-medium">Expires after</span>
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button
+                aria-label="Choose invite expiry"
+                className="h-8 shrink-0 gap-1.5 px-2 text-sm text-muted-foreground"
+                data-testid="invite-link-ttl-trigger"
+                disabled={copyStatus === "copying"}
+                size="sm"
+                type="button"
+                variant="ghost"
+              >
+                {ttlLabel}
+                <ChevronDown aria-hidden="true" className="h-3.5 w-3.5" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end" className="w-40">
+              <DropdownMenuRadioGroup
+                onValueChange={(value) => onTtlSecsChange(Number(value))}
+                value={String(ttlSecs)}
+              >
+                {TTL_OPTIONS.map((option) => (
+                  <DropdownMenuRadioItem
+                    data-testid={`invite-link-ttl-${option.value}`}
+                    key={option.value}
+                    value={String(option.value)}
+                  >
+                    {option.label}
+                  </DropdownMenuRadioItem>
+                ))}
+              </DropdownMenuRadioGroup>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
+        <div className="flex items-center justify-between gap-4">
+          <span className="text-sm font-medium">Limit number of uses</span>
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button
+                aria-label="Choose maximum invite uses"
+                className="h-8 shrink-0 gap-1.5 px-2 text-sm text-muted-foreground"
+                data-testid="invite-link-max-uses-trigger"
+                disabled={copyStatus === "copying"}
+                size="sm"
+                type="button"
+                variant="ghost"
+              >
+                {maxUsesLabel}
+                <ChevronDown aria-hidden="true" className="h-3.5 w-3.5" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end" className="w-40">
+              <DropdownMenuRadioGroup
+                onValueChange={(value) =>
+                  setMaxUses(value === "no-limit" ? null : Number(value))
+                }
+                value={String(maxUses ?? "no-limit")}
+              >
+                {MAX_USE_OPTIONS.map((option) => (
+                  <DropdownMenuRadioItem
+                    data-testid={`invite-link-max-uses-${option.value ?? "no-limit"}`}
+                    key={option.value ?? "no-limit"}
+                    value={String(option.value ?? "no-limit")}
+                  >
+                    {option.label}
+                  </DropdownMenuRadioItem>
+                ))}
+              </DropdownMenuRadioGroup>
+            </DropdownMenuContent>
+          </DropdownMenu>
         </div>
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <Button
-              aria-label="Choose invite expiry"
-              className="h-8 shrink-0 gap-1.5 px-2 text-muted-foreground"
-              data-testid="invite-link-ttl-trigger"
-              disabled={copyStatus === "copying"}
-              size="sm"
-              type="button"
-              variant="ghost"
-            >
-              {ttlLabel}
-              <ChevronDown aria-hidden="true" className="h-3.5 w-3.5" />
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent align="end" className="w-40">
-            <DropdownMenuLabel>Expires after</DropdownMenuLabel>
-            <DropdownMenuSeparator />
-            <DropdownMenuRadioGroup
-              onValueChange={(value) => onTtlSecsChange(Number(value))}
-              value={String(ttlSecs)}
-            >
-              {TTL_OPTIONS.map((option) => (
-                <DropdownMenuRadioItem
-                  data-testid={`invite-link-ttl-${option.value}`}
-                  key={option.value}
-                  value={String(option.value)}
-                >
-                  {option.label}
-                </DropdownMenuRadioItem>
-              ))}
-            </DropdownMenuRadioGroup>
-          </DropdownMenuContent>
-        </DropdownMenu>
       </div>
       <Separator className="my-4 bg-input/40" />
       <div className="flex justify-end">
diff --git a/desktop/src/features/forum/ui/ForumPostCard.tsx b/desktop/src/features/forum/ui/ForumPostCard.tsx
index 311df0f97f..1fb3c35cc4 100644
--- a/desktop/src/features/forum/ui/ForumPostCard.tsx
+++ b/desktop/src/features/forum/ui/ForumPostCard.tsx
@@ -9,9 +9,9 @@ import { UserProfilePopover } from "@/features/profile/ui/UserProfilePopover";
 import { UserAvatar } from "@/shared/ui/UserAvatar";
 import type { ForumPost } from "@/shared/api/types";
 import { cn } from "@/shared/lib/cn";
-import { parseImetaTags } from "@/features/messages/lib/parseImeta";
 import { resolveMentionProps } from "@/shared/lib/resolveMentionNames";
 import { Markdown } from "@/shared/ui/markdown";
+import { parseImetaTags } from "@/shared/ui/markdown/parseImeta";
 
 import { formatRelativeTime } from "../lib/time";
 import { DeleteActionMenu } from "./DeleteActionMenu";
diff --git a/desktop/src/features/forum/ui/ForumThreadPanel.tsx b/desktop/src/features/forum/ui/ForumThreadPanel.tsx
index 2d32e073da..c6f1bfa6c1 100644
--- a/desktop/src/features/forum/ui/ForumThreadPanel.tsx
+++ b/desktop/src/features/forum/ui/ForumThreadPanel.tsx
@@ -11,9 +11,9 @@ import type { ForumThreadResponse, ThreadReply } from "@/shared/api/types";
 import { channelChrome } from "@/shared/layout/chromeLayout";
 import { cn } from "@/shared/lib/cn";
 import { useChannelNavigation } from "@/shared/context/ChannelNavigationContext";
-import { parseImetaTags } from "@/features/messages/lib/parseImeta";
 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 { Skeleton } from "@/shared/ui/skeleton";
 
diff --git a/desktop/src/features/home/lib/homeMessageCapabilities.ts b/desktop/src/features/home/lib/homeMessageCapabilities.ts
new file mode 100644
index 0000000000..effd96e934
--- /dev/null
+++ b/desktop/src/features/home/lib/homeMessageCapabilities.ts
@@ -0,0 +1,31 @@
+import type { InboxItem } from "@/features/home/lib/inbox";
+
+export function getHomeMessageCapabilities(
+  item: InboxItem | null,
+  currentPubkey: string | undefined,
+  availableChannelIds: ReadonlySet<string>,
+) {
+  const canReact = Boolean(
+    item?.item.channelId && availableChannelIds.has(item.item.channelId),
+  );
+  const canReply =
+    canReact && item?.item.kind !== 45001 && item?.item.kind !== 45003;
+  const disabledReplyReason =
+    canReply || !item
+      ? null
+      : item.item.channelId
+        ? availableChannelIds.has(item.item.channelId)
+          ? "This item does not support inline replies yet."
+          : "Open the linked channel to reply."
+        : "This inbox item does not have a reply target.";
+
+  return {
+    canDelete:
+      item !== null &&
+      currentPubkey?.trim().toLowerCase() ===
+        item.item.pubkey.trim().toLowerCase(),
+    canReact,
+    canReply,
+    disabledReplyReason,
+  };
+}
diff --git a/desktop/src/features/home/lib/homePaneLayout.ts b/desktop/src/features/home/lib/homePaneLayout.ts
new file mode 100644
index 0000000000..dd4871c888
--- /dev/null
+++ b/desktop/src/features/home/lib/homePaneLayout.ts
@@ -0,0 +1,72 @@
+import { INBOX_COLUMN_MIN_WIDTH_PX } from "@/features/home/useResizableInboxListWidth";
+
+type HomePaneLayoutOptions = {
+  hasAuxiliaryPane: boolean;
+  homeWidthPx: number;
+  inboxListWidthPx: number;
+  isDrafts: boolean;
+  isMessagesMode: boolean;
+  isNarrow: boolean;
+  isReminders: boolean;
+  isSinglePanelAuxiliaryView: boolean;
+  selectedDraft: boolean;
+  selectedEvent: boolean;
+  selectedReminder: boolean;
+  threadPanelWidthPx: number;
+};
+
+export function getHomePaneLayout(options: HomePaneLayoutOptions) {
+  const singleMessage =
+    options.isMessagesMode &&
+    options.isNarrow &&
+    options.selectedEvent &&
+    !options.isSinglePanelAuxiliaryView;
+  const singleDraft =
+    options.isDrafts &&
+    options.isNarrow &&
+    options.selectedDraft &&
+    !options.isSinglePanelAuxiliaryView;
+  const singleReminder =
+    options.isReminders &&
+    options.isNarrow &&
+    options.selectedReminder &&
+    !options.isSinglePanelAuxiliaryView;
+  const showList =
+    !singleMessage &&
+    !singleDraft &&
+    !singleReminder &&
+    !options.isSinglePanelAuxiliaryView;
+  const showDetail =
+    !options.isSinglePanelAuxiliaryView &&
+    ((options.isMessagesMode && (!options.isNarrow || singleMessage)) ||
+      (options.isDrafts && (!options.isNarrow || singleDraft)) ||
+      (options.isReminders && (!options.isNarrow || singleReminder)));
+  const auxiliaryWidth = options.isSinglePanelAuxiliaryView
+    ? options.homeWidthPx
+    : options.threadPanelWidthPx;
+  const maxListWidth =
+    options.homeWidthPx > 0
+      ? Math.max(
+          INBOX_COLUMN_MIN_WIDTH_PX,
+          options.homeWidthPx -
+            INBOX_COLUMN_MIN_WIDTH_PX -
+            (options.hasAuxiliaryPane ? auxiliaryWidth : 0),
+        )
+      : undefined;
+
+  return {
+    auxiliaryPaneWidthPx: auxiliaryWidth,
+    effectiveInboxListWidthPx:
+      options.homeWidthPx > 0
+        ? Math.min(
+            options.inboxListWidthPx,
+            maxListWidth ?? options.inboxListWidthPx,
+          )
+        : options.inboxListWidthPx,
+    isSinglePanelDetailView: singleMessage,
+    isSinglePanelDraftDetailView: singleDraft,
+    isSinglePanelReminderDetailView: singleReminder,
+    showDetailPane: showDetail,
+    showListPane: showList,
+  };
+}
diff --git a/desktop/src/features/home/lib/inbox.test.mjs b/desktop/src/features/home/lib/inbox.test.mjs
index 457e8ecdec..cd2f78c80c 100644
--- a/desktop/src/features/home/lib/inbox.test.mjs
+++ b/desktop/src/features/home/lib/inbox.test.mjs
@@ -3,11 +3,13 @@ import test from "node:test";
 
 import {
   buildInboxItems,
+  findInboxItemByEventId,
   getInboxConversationId,
   getInboxTypeLabel,
 } from "./inbox.ts";
 
 const CHANNEL_ID = "9a1657ac-f7aa-5db0-b632-d8bbeb6dfb50";
+const DM_CHANNEL_ID = "8ad375a7-6990-4b22-985f-e3fd34f634d7";
 
 const channels = [
   {
@@ -15,6 +17,11 @@ const channels = [
     name: "buzz-bugs",
     channelType: "stream",
   },
+  {
+    id: DM_CHANNEL_ID,
+    name: "dm-alice",
+    channelType: "dm",
+  },
 ];
 
 function feedWith(overrides) {
@@ -161,6 +168,197 @@ test("thread groups use the latest row label even when the root was a mention",
   });
 });
 
+test("thread groups resume at the oldest unread reply", () => {
+  const [inboxItem] = buildInboxItems({
+    channels,
+    feed: feedWith({
+      activity: [
+        item({
+          id: "reply-1",
+          category: "activity",
+          content: "Already read reply",
+          createdAt: 1,
+          tags: [
+            ["h", CHANNEL_ID],
+            ["e", "root-event", "", "root"],
+            ["e", "root-event", "", "reply"],
+          ],
+        }),
+        item({
+          id: "reply-2",
+          category: "activity",
+          content: "First unread reply",
+          createdAt: 2,
+          tags: [
+            ["h", CHANNEL_ID],
+            ["e", "root-event", "", "root"],
+            ["e", "reply-1", "", "reply"],
+          ],
+        }),
+        item({
+          id: "reply-3",
+          category: "activity",
+          content: "Newest unread reply",
+          createdAt: 3,
+          tags: [
+            ["h", CHANNEL_ID],
+            ["e", "root-event", "", "root"],
+            ["e", "reply-2", "", "reply"],
+          ],
+        }),
+      ],
+    }),
+    getThreadReadAt: (rootId) => (rootId === "root-event" ? 1 : null),
+  });
+
+  assert.equal(inboxItem.id, "reply-2");
+  assert.equal(inboxItem.preview, "First unread reply");
+  assert.equal(inboxItem.latestActivityAt, 3);
+  assert.equal(inboxItem.unreadCount, 2);
+});
+
+test("thread groups skip an individually read reply when choosing the resume point", () => {
+  const [inboxItem] = buildInboxItems({
+    channels,
+    feed: feedWith({
+      activity: [
+        item({
+          id: "reply-1",
+          createdAt: 1,
+          tags: [
+            ["h", CHANNEL_ID],
+            ["e", "root-event", "", "root"],
+            ["e", "root-event", "", "reply"],
+          ],
+        }),
+        item({
+          id: "reply-2",
+          createdAt: 2,
+          tags: [
+            ["h", CHANNEL_ID],
+            ["e", "root-event", "", "root"],
+            ["e", "reply-1", "", "reply"],
+          ],
+        }),
+      ],
+    }),
+    getMessageReadAt: (messageId) => (messageId === "reply-1" ? 1 : null),
+    getThreadReadAt: () => null,
+  });
+
+  assert.equal(inboxItem.id, "reply-2");
+  assert.equal(inboxItem.unreadCount, 1);
+});
+
+test("thread groups follow per-message unread state when the aggregate thread marker is newer", () => {
+  const [inboxItem] = buildInboxItems({
+    channels,
+    feed: feedWith({
+      activity: [
+        item({
+          id: "reply-1",
+          createdAt: 1,
+          tags: [
+            ["h", CHANNEL_ID],
+            ["e", "root-event", "", "root"],
+            ["e", "root-event", "", "reply"],
+          ],
+        }),
+        item({
+          id: "reply-2",
+          createdAt: 2,
+          tags: [
+            ["h", CHANNEL_ID],
+            ["e", "root-event", "", "root"],
+            ["e", "reply-1", "", "reply"],
+          ],
+        }),
+      ],
+    }),
+    getMessageReadAt: (messageId) => (messageId === "reply-1" ? 1 : null),
+    getThreadReadAt: () => 2,
+  });
+
+  assert.equal(inboxItem.id, "reply-2");
+  assert.equal(inboxItem.unreadCount, 1);
+});
+
+test("DMs are grouped by channel and represented by the first unread message", () => {
+  const inboxItems = buildInboxItems({
+    channels,
+    feed: feedWith({
+      activity: [
+        item({
+          id: "dm-1",
+          channelId: DM_CHANNEL_ID,
+          channelType: undefined,
+          content: "Already read",
+          createdAt: 1,
+          tags: [["h", DM_CHANNEL_ID]],
+        }),
+        item({
+          id: "dm-2",
+          channelId: DM_CHANNEL_ID,
+          channelType: undefined,
+          content: "First unread",
+          createdAt: 2,
+          tags: [["h", DM_CHANNEL_ID]],
+        }),
+        item({
+          id: "dm-3",
+          channelId: DM_CHANNEL_ID,
+          channelType: undefined,
+          content: "Newest unread",
+          createdAt: 3,
+          tags: [["h", DM_CHANNEL_ID]],
+        }),
+      ],
+    }),
+    getChannelReadAt: (channelId) => (channelId === DM_CHANNEL_ID ? 1 : null),
+  });
+
+  assert.equal(inboxItems.length, 1);
+  assert.equal(inboxItems[0].conversationId, `dm:${DM_CHANNEL_ID}`);
+  assert.equal(inboxItems[0].id, "dm-2");
+  assert.equal(inboxItems[0].preview, "First unread");
+  assert.equal(inboxItems[0].latestActivityAt, 3);
+  assert.equal(inboxItems[0].unreadCount, 2);
+  assert.deepEqual(
+    inboxItems[0].groupItems.map((groupItem) => groupItem.id),
+    ["dm-1", "dm-2", "dm-3"],
+  );
+  assert.equal(findInboxItemByEventId(inboxItems, "dm-3"), inboxItems[0]);
+});
+
+test("a fully read DM conversation falls back to its latest message", () => {
+  const [inboxItem] = buildInboxItems({
+    channels,
+    feed: feedWith({
+      activity: [
+        item({
+          id: "dm-1",
+          channelId: DM_CHANNEL_ID,
+          content: "Older",
+          createdAt: 1,
+          tags: [["h", DM_CHANNEL_ID]],
+        }),
+        item({
+          id: "dm-2",
+          channelId: DM_CHANNEL_ID,
+          content: "Latest",
+          createdAt: 2,
+          tags: [["h", DM_CHANNEL_ID]],
+        }),
+      ],
+    }),
+    getChannelReadAt: () => 2,
+  });
+
+  assert.equal(inboxItem.id, "dm-2");
+  assert.equal(inboxItem.preview, "Latest");
+  assert.equal(inboxItem.unreadCount, 0);
+});
+
 // ── conversationId stability tests ──────────────────────────────────────────
 
 test("conversationId is stable when a live reply advances the representative", () => {
@@ -272,6 +470,18 @@ test("getInboxConversationId falls back to eventId when no root tag", () => {
   );
 });
 
+test("getInboxConversationId groups direct messages by channel", () => {
+  assert.equal(
+    getInboxConversationId(
+      [["h", DM_CHANNEL_ID]],
+      "dm-event",
+      DM_CHANNEL_ID,
+      "dm",
+    ),
+    `dm:${DM_CHANNEL_ID}`,
+  );
+});
+
 test("old event still resolves to its conversation row via groupItems", () => {
   // Demonstrates that findItemByEventId searching groupItems works: the old
   // root event id is still present in groupItems even when a newer reply
diff --git a/desktop/src/features/home/lib/inbox.ts b/desktop/src/features/home/lib/inbox.ts
index b4c05ef809..e34fa0c200 100644
--- a/desktop/src/features/home/lib/inbox.ts
+++ b/desktop/src/features/home/lib/inbox.ts
@@ -6,6 +6,10 @@ import {
   getThreadReference,
   isBroadcastReply,
 } from "@/features/messages/lib/threading";
+import {
+  getProjectInboxReference,
+  isProjectInboxItem,
+} from "@/features/home/lib/projectInbox";
 import type { TimelineReaction } from "@/features/messages/types";
 import type {
   Channel,
@@ -18,10 +22,10 @@ import { resolveMentionProps } from "@/shared/lib/resolveMentionNames";
 
 export type InboxFilter =
   | "all"
+  | "project"
   | "mention"
   | "thread"
   | "needs_action"
-  | "activity"
   | "agent_activity"
   | "reminders"
   | "drafts";
@@ -29,10 +33,10 @@ export type InboxFilter =
 export type InboxItem = {
   avatarUrl: string | null;
   /**
-   * Stable conversation identity: `rootId ?? parentId ?? event.id` for the
-   * thread group. Does NOT change when a new reply advances the representative
-   * latest event. Use this for lifecycle continuity: scroll gating, draft
-   * keys, local-reply storage, and selection identity.
+   * Stable conversation identity: the NIP-10 root for messages, or a
+   * repository-scoped root for Buzz Git work. Does NOT change when a new reply
+   * advances the representative latest event. Use this for lifecycle
+   * continuity: scroll gating, draft keys, local-reply storage, and selection.
    */
   conversationId: string;
   id: string;
@@ -50,6 +54,7 @@ export type InboxItem = {
   senderLabel: string;
   subject: string;
   timestampLabel: string;
+  unreadCount: number;
 };
 
 export type InboxTypeLabel = {
@@ -136,7 +141,33 @@ function diffInDays(from: Date, to: Date) {
   );
 }
 
-function feedHeadline(item: FeedItem) {
+function tagValue(item: FeedItem, name: string) {
+  return item.tags.find((tag) => tag[0] === name)?.[1]?.trim() || null;
+}
+
+function projectRootItem(item: FeedItem, groupItems: readonly FeedItem[]) {
+  return (
+    groupItems.find(
+      (candidate) => candidate.kind === 1618 || candidate.kind === 1621,
+    ) ?? item
+  );
+}
+
+function projectTypeLabel(item: FeedItem) {
+  if (item.kind === 1618) return "Pull request";
+  if (item.kind === 1621) return "Issue";
+  return "Project update";
+}
+
+function feedHeadline(item: FeedItem, groupItems: readonly FeedItem[] = []) {
+  if (isProjectInboxItem(item)) {
+    const root = projectRootItem(item, groupItems);
+    return (
+      (tagValue(root, "subject") ?? root.content.trim().split("\n")[0]) ||
+      projectTypeLabel(root)
+    );
+  }
+
   switch (item.kind) {
     case 40007:
       return "Reminder";
@@ -207,6 +238,29 @@ export function isThreadActivityItem(item: FeedItem) {
   return thread.parentId !== null && !isBroadcastReply(item.tags);
 }
 
+function isThreadReplyItem(item: FeedItem) {
+  const thread = getThreadReference(item.tags);
+  return thread.parentId !== null && !isBroadcastReply(item.tags);
+}
+
+function uniqueItemsById(items: readonly FeedItem[]) {
+  const seen = new Set<string>();
+  return items.filter((item) => {
+    if (seen.has(item.id)) return false;
+    seen.add(item.id);
+    return true;
+  });
+}
+
+function isItemUnread(
+  item: FeedItem,
+  readAt: number | null,
+  getMessageReadAt?: (messageId: string) => number | null,
+) {
+  const messageReadAt = getMessageReadAt?.(item.id) ?? null;
+  return item.createdAt > Math.max(readAt ?? 0, messageReadAt ?? 0);
+}
+
 function activityHeadline(item: FeedItem) {
   return feedHeadline(item);
 }
@@ -242,6 +296,14 @@ function resolveGroupChannel(
 export function getInboxTypeLabel(item: InboxItem): InboxTypeLabel {
   const channelName = item.channelLabel;
 
+  if (item.groupItems.some(isProjectInboxItem)) {
+    const root = projectRootItem(item.item, item.groupItems);
+    return {
+      text: projectTypeLabel(root),
+      channelLabel: null,
+    };
+  }
+
   if (item.item.channelType === "dm") {
     return {
       text: item.senderLabel ? `DM from ${item.senderLabel}` : "DM",
@@ -299,24 +361,89 @@ function categoryPriority(category: FeedItemCategory) {
   }
 }
 
-function getInboxThreadKey(item: FeedItem) {
-  const thread = getThreadReference(item.tags);
-  return thread.rootId ?? thread.parentId ?? item.id;
+function getInboxThreadKey(
+  item: FeedItem,
+  channelById: ReadonlyMap<string, InboxChannel>,
+) {
+  const projectReference = getProjectInboxReference(item);
+  if (projectReference) {
+    return `project:${projectReference.repoAddress}:${projectReference.rootId}`;
+  }
+
+  const channelType = resolveItemChannel(item, channelById).type;
+  return getInboxConversationId(
+    item.tags,
+    item.id,
+    item.channelId,
+    channelType,
+    item.kind,
+  );
+}
+
+function getStableConversationId(
+  item: FeedItem,
+  channelById: ReadonlyMap<string, InboxChannel>,
+) {
+  return getInboxThreadKey(item, channelById);
 }
 
 /**
- * Returns the stable conversation ID for any FeedItem or relay event: the
- * NIP-10 root tag id, falling back to parent-reply tag id, then event id.
+ * Returns the stable conversation ID for any FeedItem or relay event. Buzz Git
+ * roots include their repository coordinate; messages use the NIP-10 root,
+ * parent-reply tag, then event id.
  * This is the same derivation used by `buildInboxItems` for `conversationId`.
  */
 export function getInboxConversationId(
   tags: string[][],
   eventId: string,
+  channelId?: string | null,
+  channelType?: string,
+  kind?: number,
 ): string {
+  if (kind !== undefined) {
+    const projectReference = getProjectInboxReference({
+      id: eventId,
+      kind,
+      tags,
+    });
+    if (projectReference) {
+      return `project:${projectReference.repoAddress}:${projectReference.rootId}`;
+    }
+  }
+
+  if (channelType === "dm" && channelId) {
+    return `dm:${channelId}`;
+  }
+
   const thread = getThreadReference(tags);
   return thread.rootId ?? thread.parentId ?? eventId;
 }
 
+/** Returns the stable conversation identity for a complete Inbox feed item. */
+export function getInboxItemConversationId(item: FeedItem) {
+  return getInboxConversationId(
+    item.tags,
+    item.id,
+    item.channelId,
+    item.channelType,
+    item.kind,
+  );
+}
+
+/** Finds the Inbox row containing an event, including grouped events. */
+export function findInboxItemByEventId(
+  items: readonly InboxItem[],
+  eventId: string,
+): InboxItem | null {
+  return (
+    items.find((item) => item.id === eventId) ??
+    items.find((item) =>
+      item.groupItems.some((groupItem) => groupItem.id === eventId),
+    ) ??
+    null
+  );
+}
+
 function formatInboxTimestamp(unixSeconds: number) {
   const date = new Date(unixSeconds * 1_000);
   const now = new Date();
@@ -384,11 +511,20 @@ export function buildInboxItems({
   channels,
   currentPubkey,
   feed,
+  getChannelReadAt,
+  getMessageReadAt,
+  getThreadReadAt,
   profiles,
 }: {
   channels?: InboxChannel[];
   currentPubkey?: string;
   feed?: HomeFeedResponse;
+  getChannelReadAt?: (channelId: string) => number | null;
+  getMessageReadAt?: (messageId: string) => number | null;
+  getThreadReadAt?: (
+    rootId: string,
+    channelId?: string | null,
+  ) => number | null;
   profiles?: UserProfileLookup;
 }): InboxItem[] {
   if (!feed) {
@@ -427,7 +563,7 @@ export function buildInboxItems({
   >();
 
   for (const item of feedItems) {
-    const threadKey = getInboxThreadKey(item);
+    const threadKey = getInboxThreadKey(item, channelById);
     const group = threadGroups.get(threadKey) ?? {
       items: [],
       latestActivityAt: 0,
@@ -436,7 +572,7 @@ export function buildInboxItems({
 
     group.items.push(item);
     group.latestActivityAt = Math.max(group.latestActivityAt, item.createdAt);
-    if (item.id === threadKey) {
+    if (item.id === getStableConversationId(item, channelById)) {
       group.rootItem = item;
     }
 
@@ -447,11 +583,50 @@ export function buildInboxItems({
     .sort(
       ([, left], [, right]) => right.latestActivityAt - left.latestActivityAt,
     )
-    .map(([conversationId, group]) => {
+    .map(([, group]) => {
+      const conversationId = getStableConversationId(
+        group.items[0],
+        channelById,
+      );
       const latestItem = group.items.reduce((latest, current) =>
         current.createdAt > latest.createdAt ? current : latest,
       );
-      const item = latestItem;
+      const groupChannel = resolveGroupChannel(
+        latestItem,
+        group.items,
+        channelById,
+      );
+      const groupChannelId = group.items.find(
+        (candidate) => candidate.channelId,
+      )?.channelId;
+      const channelReadAt =
+        groupChannel.type === "dm" && groupChannelId && getChannelReadAt
+          ? getChannelReadAt(groupChannelId)
+          : undefined;
+      const uniqueGroupItems = uniqueItemsById(group.items);
+      const threadReplyItems = uniqueGroupItems.filter(isThreadReplyItem);
+      const threadReadAt =
+        groupChannel.type !== "dm" &&
+        threadReplyItems.length > 0 &&
+        getThreadReadAt
+          ? getThreadReadAt(conversationId, groupChannelId)
+          : undefined;
+      const unreadItems = (
+        channelReadAt !== undefined
+          ? uniqueGroupItems.filter((candidate) =>
+              isItemUnread(candidate, channelReadAt),
+            )
+          : threadReplyItems.length > 0 && getMessageReadAt
+            ? threadReplyItems.filter((candidate) =>
+                isItemUnread(candidate, null, getMessageReadAt),
+              )
+            : threadReadAt !== undefined
+              ? threadReplyItems.filter((candidate) =>
+                  isItemUnread(candidate, threadReadAt),
+                )
+              : []
+      ).sort((left, right) => left.createdAt - right.createdAt);
+      const item = unreadItems[0] ?? latestItem;
       const categories = [
         ...new Set(group.items.map((groupItem) => groupItem.category)),
       ].sort((left, right) => categoryPriority(left) - categoryPriority(right));
@@ -461,13 +636,12 @@ export function buildInboxItems({
         profiles,
         preferResolvedSelfLabel: true,
       });
-      const subject = feedHeadline(item);
+      const subject = feedHeadline(item, group.items);
       const preview = feedPreview(item);
       const { mentionNames, mentionPubkeysByName } = resolveMentionProps(
         item.tags,
         profiles,
       );
-      const groupChannel = resolveGroupChannel(item, group.items, channelById);
       const channelLabel = groupChannel.name;
       const displayItem: FeedItem = {
         ...item,
@@ -494,6 +668,7 @@ export function buildInboxItems({
         senderLabel,
         subject,
         timestampLabel: formatInboxTimestamp(group.latestActivityAt),
+        unreadCount: unreadItems.length,
       };
     });
 }
diff --git a/desktop/src/features/home/lib/inboxListRows.test.mjs b/desktop/src/features/home/lib/inboxListRows.test.mjs
new file mode 100644
index 0000000000..b0a093de1b
--- /dev/null
+++ b/desktop/src/features/home/lib/inboxListRows.test.mjs
@@ -0,0 +1,106 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { buildInboxListRows } from "./inboxListRows.ts";
+
+function inboxItem(
+  id,
+  latestActivityAt,
+  conversationId = `conversation:${id}`,
+) {
+  return {
+    conversationId,
+    groupItems: [],
+    id,
+    item: { id },
+    latestActivityAt,
+  };
+}
+
+function reminder(
+  id,
+  createdAt,
+  status = "pending",
+  { eventId, notBefore } = {},
+) {
+  return {
+    id,
+    createdAt,
+    notBefore,
+    content: {
+      status,
+      target: eventId ? { eventId } : undefined,
+    },
+  };
+}
+
+test("Inbox All combines rows in latest-first order", () => {
+  const rows = buildInboxListRows({
+    items: [inboxItem("message", 1_753_099_300)],
+    reminders: [reminder("reminder", 1_753_099_100)],
+  });
+
+  assert.deepEqual(
+    rows.map((row) => row.kind),
+    ["inbox", "reminder"],
+  );
+});
+
+test("Inbox All excludes completed reminders", () => {
+  const rows = buildInboxListRows({
+    items: [],
+    reminders: [reminder("done", 1_753_099_100, "done")],
+  });
+
+  assert.deepEqual(rows, []);
+});
+
+test("Inbox conversation keys stay stable when the representative changes", () => {
+  const first = buildInboxListRows({
+    items: [inboxItem("reply-1", 1, "thread-root")],
+    reminders: [],
+  });
+  const second = buildInboxListRows({
+    items: [inboxItem("reply-2", 2, "thread-root")],
+    reminders: [],
+  });
+
+  assert.equal(first[0].key, "inbox:thread-root");
+  assert.equal(second[0].key, first[0].key);
+});
+
+test("due reminder enriches its existing conversation instead of duplicating it", () => {
+  const item = inboxItem("message", 100);
+  item.groupItems = [{ id: "reminded-reply" }];
+  const rows = buildInboxListRows({
+    items: [item],
+    reminders: [
+      reminder("reminder", 50, "pending", {
+        eventId: "reminded-reply",
+        notBefore: 200,
+      }),
+    ],
+  });
+
+  assert.equal(rows.length, 1);
+  assert.equal(rows[0].kind, "inbox");
+  assert.equal(rows[0].dueReminder?.id, "reminder");
+  assert.equal(rows[0].sortAt, 200);
+});
+
+test("due reminder without a represented conversation sorts at trigger time", () => {
+  const rows = buildInboxListRows({
+    items: [inboxItem("newer-than-creation", 150)],
+    reminders: [
+      reminder("reminder", 50, "pending", {
+        eventId: "not-in-feed",
+        notBefore: 200,
+      }),
+    ],
+  });
+
+  assert.deepEqual(
+    rows.map((row) => row.kind),
+    ["reminder", "inbox"],
+  );
+});
diff --git a/desktop/src/features/home/lib/inboxListRows.ts b/desktop/src/features/home/lib/inboxListRows.ts
new file mode 100644
index 0000000000..70311a0d13
--- /dev/null
+++ b/desktop/src/features/home/lib/inboxListRows.ts
@@ -0,0 +1,82 @@
+import type { InboxItem } from "@/features/home/lib/inbox";
+import type { Reminder } from "@/features/reminders/lib/reminderTypes";
+
+export type InboxListRow =
+  | {
+      key: string;
+      kind: "inbox";
+      item: InboxItem;
+      dueReminder?: Reminder;
+      sortAt: number;
+    }
+  | {
+      key: string;
+      kind: "reminder";
+      reminder: Reminder;
+      sortAt: number;
+    };
+
+export function buildInboxListRows({
+  items,
+  reminders,
+}: {
+  items: readonly InboxItem[];
+  reminders: readonly Reminder[];
+}): InboxListRow[] {
+  const consumedReminderIds = new Set<string>();
+  const inboxRows = items.map((item): InboxListRow => {
+    const eventIds = new Set([
+      item.id,
+      item.item.id,
+      ...item.groupItems.map((groupItem) => groupItem.id),
+    ]);
+    const matchingReminders = reminders
+      .filter(
+        (reminder) =>
+          reminder.content.status === "pending" &&
+          Boolean(
+            reminder.content.target?.eventId &&
+              eventIds.has(reminder.content.target.eventId),
+          ),
+      )
+      .sort(
+        (left, right) =>
+          (right.notBefore ?? right.createdAt) -
+          (left.notBefore ?? left.createdAt),
+      );
+    const dueReminder = matchingReminders[0];
+
+    for (const reminder of matchingReminders) {
+      consumedReminderIds.add(reminder.id);
+    }
+
+    return {
+      key: `inbox:${item.conversationId}`,
+      kind: "inbox",
+      item,
+      dueReminder,
+      sortAt: Math.max(
+        item.latestActivityAt,
+        dueReminder?.notBefore ?? dueReminder?.createdAt ?? 0,
+      ),
+    };
+  });
+
+  return [
+    ...inboxRows,
+    ...reminders
+      .filter(
+        (reminder) =>
+          reminder.content.status === "pending" &&
+          !consumedReminderIds.has(reminder.id),
+      )
+      .map(
+        (reminder): InboxListRow => ({
+          key: `reminder:${reminder.id}`,
+          kind: "reminder",
+          reminder,
+          sortAt: reminder.notBefore ?? reminder.createdAt,
+        }),
+      ),
+  ].sort((left, right) => right.sortAt - left.sortAt);
+}
diff --git a/desktop/src/features/home/lib/inboxSelection.test.mjs b/desktop/src/features/home/lib/inboxSelection.test.mjs
new file mode 100644
index 0000000000..84088f743a
--- /dev/null
+++ b/desktop/src/features/home/lib/inboxSelection.test.mjs
@@ -0,0 +1,53 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { resolveInboxFilterSelection } from "./inboxSelection.ts";
+
+const items = [
+  { conversationId: "first-conversation", id: "first-event" },
+  { conversationId: "second-conversation", id: "second-event" },
+];
+
+test("filter selection preserves a conversation that remains visible", () => {
+  assert.deepEqual(
+    resolveInboxFilterSelection({
+      isNarrow: false,
+      items,
+      selectedConversationId: "second-conversation",
+    }),
+    { autoSelectedEventId: null, preserveSelection: true },
+  );
+});
+
+test("wide filter selection immediately selects the first valid row", () => {
+  assert.deepEqual(
+    resolveInboxFilterSelection({
+      isNarrow: false,
+      items,
+      selectedConversationId: "filtered-out-conversation",
+    }),
+    { autoSelectedEventId: "first-event", preserveSelection: false },
+  );
+});
+
+test("narrow filter selection returns to the list when selection is invalid", () => {
+  assert.deepEqual(
+    resolveInboxFilterSelection({
+      isNarrow: true,
+      items,
+      selectedConversationId: "filtered-out-conversation",
+    }),
+    { autoSelectedEventId: null, preserveSelection: false },
+  );
+});
+
+test("empty filter selection clears detail at every width", () => {
+  assert.deepEqual(
+    resolveInboxFilterSelection({
+      isNarrow: false,
+      items: [],
+      selectedConversationId: "filtered-out-conversation",
+    }),
+    { autoSelectedEventId: null, preserveSelection: false },
+  );
+});
diff --git a/desktop/src/features/home/lib/inboxSelection.ts b/desktop/src/features/home/lib/inboxSelection.ts
new file mode 100644
index 0000000000..c7c6217a2f
--- /dev/null
+++ b/desktop/src/features/home/lib/inboxSelection.ts
@@ -0,0 +1,21 @@
+import type { InboxItem } from "@/features/home/lib/inbox";
+
+export function resolveInboxFilterSelection({
+  isNarrow,
+  items,
+  selectedConversationId,
+}: {
+  isNarrow: boolean;
+  items: readonly Pick<InboxItem, "conversationId" | "id">[];
+  selectedConversationId: string | null;
+}) {
+  const preserveSelection =
+    selectedConversationId !== null &&
+    items.some((item) => item.conversationId === selectedConversationId);
+
+  return {
+    autoSelectedEventId:
+      preserveSelection || isNarrow ? null : (items[0]?.id ?? null),
+    preserveSelection,
+  };
+}
diff --git a/desktop/src/features/home/lib/inboxViewHelpers.test.mjs b/desktop/src/features/home/lib/inboxViewHelpers.test.mjs
index e76b551239..2cd6424ab5 100644
--- a/desktop/src/features/home/lib/inboxViewHelpers.test.mjs
+++ b/desktop/src/features/home/lib/inboxViewHelpers.test.mjs
@@ -4,14 +4,67 @@ import test from "node:test";
 import { formatTimelineMessages } from "../../messages/lib/formatTimelineMessages.ts";
 import { getConfigNudgeAuthorPubkey } from "../../messages/ui/configNudgeAuthPubkey.ts";
 import {
+  filterInboxItems,
   getContextMessageDepth,
   getReactionTargetId,
+  hasInboxThreadContext,
   isInboxThreadContextEvent,
+  matchesInboxAllView,
   matchesInboxFilter,
   toInboxContextMessage,
   toTimelineMessage,
 } from "./inboxViewHelpers.ts";
 
+test("Inbox uses the dedicated reminder list instead of feed reminder rows", () => {
+  const message = { item: { kind: 9 } };
+  const reminder = { item: { kind: 40007 } };
+  const items = [message, reminder];
+
+  assert.deepEqual(filterInboxItems(items), [message]);
+});
+
+test("hasInboxThreadContext finds replies in the grouped row or loaded context", () => {
+  const root = { tags: [["h", "channel"]] };
+  const reply = {
+    tags: [
+      ["h", "channel"],
+      ["e", "root", "", "reply"],
+    ],
+  };
+
+  assert.equal(
+    hasInboxThreadContext({ item: root, groupItems: [root, reply] }),
+    true,
+  );
+  assert.equal(
+    hasInboxThreadContext({ item: root, groupItems: [root] }, [reply]),
+    true,
+  );
+});
+
+test("hasInboxThreadContext keeps standalone and broadcast activity unthreaded", () => {
+  const root = { tags: [["h", "channel"]] };
+  const broadcastReply = {
+    tags: [
+      ["h", "channel"],
+      ["e", "root", "", "reply"],
+      ["broadcast", "1"],
+    ],
+  };
+
+  assert.equal(
+    hasInboxThreadContext({ item: root, groupItems: [root] }),
+    false,
+  );
+  assert.equal(
+    hasInboxThreadContext({
+      item: broadcastReply,
+      groupItems: [broadcastReply],
+    }),
+    false,
+  );
+});
+
 // --- matchesInboxFilter ---
 
 test("matchesInboxFilter returns true for the 'all' filter regardless of categories", () => {
@@ -19,6 +72,85 @@ test("matchesInboxFilter returns true for the 'all' filter regardless of categor
   assert.equal(matchesInboxFilter({ categories: ["mentions"] }, "all"), true);
 });
 
+test("Inbox All excludes generic top-level channel traffic", () => {
+  const owned = new Set(["owned-agent"]);
+  assert.equal(
+    matchesInboxAllView(
+      {
+        categories: ["activity"],
+        item: {
+          channelType: "stream",
+          pubkey: "human",
+          tags: [["h", "channel"]],
+        },
+      },
+      owned,
+    ),
+    false,
+  );
+});
+
+test("Inbox All includes each personally relevant message source", () => {
+  const owned = new Set(["owned-agent"]);
+  const cases = [
+    {
+      categories: ["activity"],
+      item: { channelType: "dm", pubkey: "human", tags: [] },
+    },
+    {
+      categories: ["mention"],
+      item: { channelType: "stream", pubkey: "human", tags: [] },
+    },
+    {
+      categories: ["needs_action"],
+      item: { channelType: "stream", pubkey: "human", tags: [] },
+    },
+    {
+      categories: ["activity"],
+      item: {
+        channelType: "stream",
+        pubkey: "human",
+        tags: [["e", "root", "", "reply"]],
+      },
+    },
+    {
+      categories: ["activity"],
+      item: { channelType: "stream", pubkey: "OWNED-AGENT", tags: [] },
+    },
+    {
+      categories: ["activity"],
+      item: {
+        channelType: null,
+        id: "project-pull-request",
+        kind: 1618,
+        pubkey: "human",
+        tags: [["a", `30617:${"a".repeat(64)}:buzz`]],
+      },
+    },
+  ];
+
+  for (const item of cases) {
+    assert.equal(matchesInboxAllView(item, owned), true);
+  }
+});
+
+test("Inbox All excludes generic updates from agents the user does not own", () => {
+  assert.equal(
+    matchesInboxAllView(
+      {
+        categories: ["agent_activity"],
+        item: {
+          channelType: "stream",
+          pubkey: "somebody-elses-agent",
+          tags: [],
+        },
+      },
+      new Set(["owned-agent"]),
+    ),
+    false,
+  );
+});
+
 test("matchesInboxFilter matches when the category is present", () => {
   assert.equal(
     matchesInboxFilter({ categories: ["mentions", "activity"] }, "mentions"),
@@ -34,6 +166,32 @@ test("matchesInboxFilter is false when the category is absent", () => {
   assert.equal(matchesInboxFilter({ categories: [] }, "mentions"), false);
 });
 
+test("owned-agent filtering uses the representative event author", () => {
+  const owned = new Set(["owned-agent"]);
+  assert.equal(
+    matchesInboxFilter(
+      {
+        categories: ["activity"],
+        item: { pubkey: "OWNED-AGENT" },
+      },
+      "agent_activity",
+      owned,
+    ),
+    true,
+  );
+  assert.equal(
+    matchesInboxFilter(
+      {
+        categories: ["agent_activity"],
+        item: { pubkey: "somebody-elses-agent" },
+      },
+      "agent_activity",
+      owned,
+    ),
+    false,
+  );
+});
+
 test("matchesInboxFilter matches thread rows by thread tags", () => {
   const replyItem = {
     id: "reply",
diff --git a/desktop/src/features/home/lib/inboxViewHelpers.ts b/desktop/src/features/home/lib/inboxViewHelpers.ts
index e87671b9fa..42ed8e1a5a 100644
--- a/desktop/src/features/home/lib/inboxViewHelpers.ts
+++ b/desktop/src/features/home/lib/inboxViewHelpers.ts
@@ -2,7 +2,9 @@ import {
   formatInboxFullTimestamp,
   type InboxContextMessage,
   type InboxFilter,
+  type InboxItem,
 } from "@/features/home/lib/inbox";
+import { isProjectInboxItem } from "@/features/home/lib/projectInbox";
 import {
   getChannelIdFromTags,
   getThreadReference,
@@ -14,6 +16,8 @@ import type {
   RelayEvent,
   UserProfileSummary,
 } from "@/shared/api/types";
+import { KIND_REMINDER } from "@/shared/constants/kinds";
+import { normalizePubkey } from "@/shared/lib/pubkey";
 import { resolveMentionProps } from "@/shared/lib/resolveMentionNames";
 
 function hasThreadReplyTags(tags: string[][]) {
@@ -21,6 +25,19 @@ function hasThreadReplyTags(tags: string[][]) {
   return thread.parentId !== null && !isBroadcastReply(tags);
 }
 
+export function filterInboxItems(items: InboxItem[]) {
+  return items.filter((item) => item.item.kind !== KIND_REMINDER);
+}
+
+export function hasInboxThreadContext(
+  item: Pick<InboxItem, "groupItems" | "item">,
+  contextMessages: readonly Pick<InboxContextMessage, "tags">[] = [],
+) {
+  return [item.item, ...item.groupItems, ...contextMessages].some((event) =>
+    hasThreadReplyTags(event.tags ?? []),
+  );
+}
+
 export function matchesInboxFilter(
   item: {
     categories: readonly string[];
@@ -28,9 +45,12 @@ export function matchesInboxFilter(
     item?: FeedItem;
   },
   filter: InboxFilter,
+  ownedAgentPubkeys?: ReadonlySet<string>,
 ) {
   if (filter === "all") {
-    return true;
+    return ownedAgentPubkeys
+      ? matchesInboxAllView(item, ownedAgentPubkeys)
+      : true;
   }
 
   if (filter === "thread") {
@@ -39,9 +59,48 @@ export function matchesInboxFilter(
     );
   }
 
+  if (filter === "project") {
+    return [item.item, ...(item.groupItems ?? [])].some(
+      (groupItem) => groupItem && isProjectInboxItem(groupItem),
+    );
+  }
+
+  if (filter === "agent_activity" && ownedAgentPubkeys) {
+    const representative = item.item ?? item.groupItems?.at(-1);
+    return representative
+      ? ownedAgentPubkeys.has(normalizePubkey(representative.pubkey))
+      : false;
+  }
+
   return item.categories.includes(filter);
 }
 
+export function matchesInboxAllView(
+  item: {
+    categories: readonly string[];
+    groupItems?: readonly FeedItem[];
+    item?: FeedItem;
+  },
+  ownedAgentPubkeys: ReadonlySet<string>,
+): boolean {
+  const representative = item.item ?? item.groupItems?.at(-1);
+  return (
+    representative?.channelType === "dm" ||
+    item.categories.includes("mention") ||
+    [item.item, ...(item.groupItems ?? [])].some((groupItem) =>
+      groupItem ? hasThreadReplyTags(groupItem.tags) : false,
+    ) ||
+    [item.item, ...(item.groupItems ?? [])].some(
+      (groupItem) => groupItem && isProjectInboxItem(groupItem),
+    ) ||
+    item.categories.includes("needs_action") ||
+    Boolean(
+      representative &&
+        ownedAgentPubkeys.has(normalizePubkey(representative.pubkey)),
+    )
+  );
+}
+
 export function getContextMessageDepth(
   event: RelayEvent,
   eventById: ReadonlyMap<string, RelayEvent>,
diff --git a/desktop/src/features/home/lib/projectInbox.test.mjs b/desktop/src/features/home/lib/projectInbox.test.mjs
new file mode 100644
index 0000000000..040f54e847
--- /dev/null
+++ b/desktop/src/features/home/lib/projectInbox.test.mjs
@@ -0,0 +1,235 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { buildInboxItems, getInboxTypeLabel } from "./inbox.ts";
+import { matchesInboxFilter } from "./inboxViewHelpers.ts";
+import {
+  getProjectInboxReference,
+  isProjectInboxItem,
+  resolveProjectInboxWorkItem,
+} from "./projectInbox.ts";
+
+const OWNER = "a".repeat(64);
+const REVIEWER = "b".repeat(64);
+const REPO_ADDRESS = `30617:${OWNER}:buzz`;
+const PR_ID = "c".repeat(64);
+const ISSUE_ID = "d".repeat(64);
+
+function feedItem(overrides = {}) {
+  return {
+    id: PR_ID,
+    kind: 1618,
+    pubkey: OWNER,
+    content: "Inbox support",
+    createdAt: 1_700_000_000,
+    channelId: null,
+    channelName: "",
+    tags: [
+      ["a", REPO_ADDRESS],
+      ["p", REVIEWER],
+      ["subject", "Add project work items to Inbox"],
+    ],
+    category: "mention",
+    ...overrides,
+  };
+}
+
+const project = {
+  id: "buzz",
+  name: "Buzz",
+  owner: OWNER,
+  repoAddress: REPO_ADDRESS,
+};
+
+const pullRequest = {
+  id: PR_ID,
+  author: OWNER,
+  title: "Add project work items to Inbox",
+};
+
+const issue = {
+  id: ISSUE_ID,
+  author: REVIEWER,
+  title: "Inbox issue",
+};
+
+test("recognizes project roots and project thread activity", () => {
+  assert.equal(isProjectInboxItem(feedItem()), true);
+  assert.equal(
+    isProjectInboxItem(
+      feedItem({
+        id: "e".repeat(64),
+        kind: 1,
+        tags: [
+          ["a", REPO_ADDRESS],
+          ["e", PR_ID, "", "root"],
+          ["p", REVIEWER],
+        ],
+      }),
+    ),
+    true,
+  );
+  assert.equal(
+    isProjectInboxItem(
+      feedItem({
+        kind: 9,
+        tags: [
+          ["a", REPO_ADDRESS],
+          ["e", PR_ID, "", "root"],
+        ],
+      }),
+    ),
+    false,
+  );
+});
+
+test("resolves the canonical project root from status and comment events", () => {
+  assert.deepEqual(getProjectInboxReference(feedItem()), {
+    repoAddress: REPO_ADDRESS,
+    rootId: PR_ID,
+  });
+  assert.deepEqual(
+    getProjectInboxReference(
+      feedItem({
+        id: "f".repeat(64),
+        kind: 1631,
+        tags: [
+          ["a", REPO_ADDRESS],
+          ["e", PR_ID, "", "root"],
+        ],
+      }),
+    ),
+    {
+      repoAddress: REPO_ADDRESS,
+      rootId: PR_ID,
+    },
+  );
+});
+
+test("matches a selected inbox event to its canonical pull request or issue", () => {
+  const workItems = {
+    pullRequests: {
+      items: [{ project, pullRequest }],
+      failedSections: [],
+    },
+    issues: {
+      items: [{ project, issue }],
+      failedSections: [],
+    },
+  };
+
+  assert.deepEqual(resolveProjectInboxWorkItem(feedItem(), workItems), {
+    type: "pull-request",
+    project,
+    pullRequest,
+  });
+  assert.deepEqual(
+    resolveProjectInboxWorkItem(
+      feedItem({
+        id: ISSUE_ID,
+        kind: 1621,
+        tags: [
+          ["a", REPO_ADDRESS],
+          ["p", OWNER],
+          ["subject", "Inbox issue"],
+        ],
+      }),
+      workItems,
+    ),
+    {
+      type: "issue",
+      project,
+      issue,
+    },
+  );
+});
+
+test("presents project work with its canonical subject and project filter", () => {
+  const [item] = buildInboxItems({
+    feed: {
+      feed: {
+        mentions: [feedItem()],
+        needsAction: [],
+        activity: [],
+        agentActivity: [],
+      },
+      meta: { since: 0, total: 1, generatedAt: 1_700_000_000 },
+    },
+  });
+
+  assert.equal(item.subject, "Add project work items to Inbox");
+  assert.deepEqual(getInboxTypeLabel(item), {
+    text: "Pull request",
+    channelLabel: null,
+  });
+  assert.equal(matchesInboxFilter(item, "project"), true);
+  assert.equal(
+    matchesInboxFilter(
+      {
+        ...item,
+        item: feedItem({ kind: 9, tags: [["h", "channel-id"]] }),
+        groupItems: [feedItem({ kind: 9, tags: [["h", "channel-id"]] })],
+      },
+      "project",
+    ),
+    false,
+  );
+});
+
+test("groups uppercase NIP-34 pull request updates with their root", () => {
+  const update = feedItem({
+    id: "f".repeat(64),
+    kind: 1619,
+    createdAt: 1_700_000_100,
+    content: "Pushed another commit",
+    tags: [
+      ["a", REPO_ADDRESS],
+      ["E", PR_ID],
+      ["p", REVIEWER],
+    ],
+  });
+  const items = buildInboxItems({
+    feed: {
+      feed: {
+        mentions: [feedItem(), update],
+        needsAction: [],
+        activity: [],
+        agentActivity: [],
+      },
+      meta: { since: 0, total: 2, generatedAt: 1_700_000_100 },
+    },
+  });
+
+  assert.equal(items.length, 1);
+  assert.equal(items[0].id, update.id);
+  assert.equal(items[0].subject, "Add project work items to Inbox");
+});
+
+test("does not group project events from different repositories", () => {
+  const otherRepoAddress = `30617:${"e".repeat(64)}:other`;
+  const items = buildInboxItems({
+    feed: {
+      feed: {
+        mentions: [
+          feedItem(),
+          feedItem({
+            id: "f".repeat(64),
+            kind: 1619,
+            tags: [
+              ["a", otherRepoAddress],
+              ["E", PR_ID],
+              ["p", REVIEWER],
+            ],
+          }),
+        ],
+        needsAction: [],
+        activity: [],
+        agentActivity: [],
+      },
+      meta: { since: 0, total: 2, generatedAt: 1_700_000_100 },
+    },
+  });
+
+  assert.equal(items.length, 2);
+  assert.notEqual(items[0].conversationId, items[1].conversationId);
+});
diff --git a/desktop/src/features/home/lib/projectInbox.ts b/desktop/src/features/home/lib/projectInbox.ts
new file mode 100644
index 0000000000..a22b355214
--- /dev/null
+++ b/desktop/src/features/home/lib/projectInbox.ts
@@ -0,0 +1,99 @@
+import type {
+  Project,
+  ProjectIssue,
+  ProjectPullRequest,
+} from "@/features/projects/hooks";
+import type { ProjectsWorkItemsResult } from "@/features/projects/projectWorkItems";
+import type { FeedItem } from "@/shared/api/types";
+import {
+  KIND_GIT_ISSUE,
+  KIND_GIT_PR_UPDATE,
+  KIND_GIT_PULL_REQUEST,
+  KIND_GIT_STATUS_CLOSED,
+  KIND_GIT_STATUS_DRAFT,
+  KIND_GIT_STATUS_MERGED,
+  KIND_GIT_STATUS_OPEN,
+  KIND_TEXT_NOTE,
+} from "@/shared/constants/kinds";
+
+const PROJECT_ROOT_KINDS = new Set([KIND_GIT_PULL_REQUEST, KIND_GIT_ISSUE]);
+const PROJECT_ACTIVITY_KINDS = new Set([
+  KIND_TEXT_NOTE,
+  KIND_GIT_PR_UPDATE,
+  KIND_GIT_STATUS_OPEN,
+  KIND_GIT_STATUS_MERGED,
+  KIND_GIT_STATUS_CLOSED,
+  KIND_GIT_STATUS_DRAFT,
+]);
+const REPO_ADDRESS_PATTERN = /^30617:[0-9a-f]{64}:.+$/i;
+
+export type ProjectInboxWorkItem =
+  | {
+      type: "pull-request";
+      project: Project;
+      pullRequest: ProjectPullRequest;
+    }
+  | {
+      type: "issue";
+      project: Project;
+      issue: ProjectIssue;
+    };
+
+function tagValue(item: Pick<FeedItem, "tags">, name: string) {
+  return item.tags.find(
+    (tag) => tag[0] === name && typeof tag[1] === "string" && tag[1].length > 0,
+  )?.[1];
+}
+
+/** Returns the canonical Buzz Git repository and root event for an Inbox row. */
+export function getProjectInboxReference(
+  item: Pick<FeedItem, "id" | "kind" | "tags">,
+): { repoAddress: string; rootId: string } | null {
+  const repoAddress = tagValue(item, "a");
+  if (!repoAddress || !REPO_ADDRESS_PATTERN.test(repoAddress)) {
+    return null;
+  }
+
+  if (PROJECT_ROOT_KINDS.has(item.kind)) {
+    return { repoAddress, rootId: item.id };
+  }
+
+  if (!PROJECT_ACTIVITY_KINDS.has(item.kind)) {
+    return null;
+  }
+
+  const rootId = tagValue(item, "e") ?? tagValue(item, "E");
+  return rootId ? { repoAddress, rootId } : null;
+}
+
+/** Whether a feed event belongs to a Buzz Git pull request or issue thread. */
+export function isProjectInboxItem(item: FeedItem) {
+  return getProjectInboxReference(item) !== null;
+}
+
+/** Resolves an Inbox event to the current canonical Buzz Git work item. */
+export function resolveProjectInboxWorkItem(
+  item: FeedItem,
+  workItems: ProjectsWorkItemsResult<Project> | undefined,
+): ProjectInboxWorkItem | null {
+  const reference = getProjectInboxReference(item);
+  if (!reference || !workItems) {
+    return null;
+  }
+
+  const pullRequestEntry = workItems.pullRequests.items.find(
+    ({ project, pullRequest }) =>
+      project.repoAddress === reference.repoAddress &&
+      pullRequest.id === reference.rootId,
+  );
+  if (pullRequestEntry) {
+    return { type: "pull-request", ...pullRequestEntry };
+  }
+
+  const issueEntry = workItems.issues.items.find(
+    ({ issue, project }) =>
+      project.repoAddress === reference.repoAddress &&
+      issue.id === reference.rootId,
+  );
+  return issueEntry ? { type: "issue", ...issueEntry } : null;
+}
diff --git a/desktop/src/features/home/ui/HomePersonalInboxDetail.tsx b/desktop/src/features/home/ui/HomePersonalInboxDetail.tsx
new file mode 100644
index 0000000000..044c768961
--- /dev/null
+++ b/desktop/src/features/home/ui/HomePersonalInboxDetail.tsx
@@ -0,0 +1,45 @@
+import type { DraftViewItem } from "@/features/messages/ui/DraftsPanel";
+import { DraftDetailPane } from "@/features/messages/ui/DraftDetailPane";
+import type { Reminder } from "@/features/reminders/lib/reminderTypes";
+import { ReminderDetailPane } from "@/features/reminders/ui/RemindersPanel";
+
+type HomePersonalInboxDetailProps = {
+  currentPubkey?: string;
+  draftItem: DraftViewItem | null;
+  mode: "drafts" | "reminders";
+  onBack?: () => void;
+  onDeleteDraft: (draftKey: string) => void;
+  reminder: Reminder | null;
+};
+
+export function HomePersonalInboxDetail({
+  currentPubkey,
+  draftItem,
+  mode,
+  onBack,
+  onDeleteDraft,
+  reminder,
+}: HomePersonalInboxDetailProps) {
+  if (mode === "drafts") {
+    return (
+      <DraftDetailPane
+        item={draftItem}
+        key={draftItem?.entry.key ?? "empty"}
+        onBack={onBack}
+        onDelete={onDeleteDraft}
+      />
+    );
+  }
+
+  if (mode === "reminders") {
+    return (
+      <ReminderDetailPane
+        onBack={onBack}
+        pubkey={currentPubkey ?? ""}
+        reminder={reminder}
+      />
+    );
+  }
+
+  return null;
+}
diff --git a/desktop/src/features/home/ui/HomeView.tsx b/desktop/src/features/home/ui/HomeView.tsx
index 992702f431..0f7c851643 100644
--- a/desktop/src/features/home/ui/HomeView.tsx
+++ b/desktop/src/features/home/ui/HomeView.tsx
@@ -9,21 +9,23 @@ import { RightAuxiliaryPane } from "@/features/channels/ui/RightAuxiliaryPane";
 import { ChannelManagementSheet } from "@/features/channels/ui/ChannelManagementSheet";
 import {
   type InboxFilter,
-  type InboxContextMessage,
-  type InboxItem,
   type InboxReply,
   buildInboxItems,
+  findInboxItemByEventId,
   formatInboxFullTimestamp,
-  getInboxConversationId,
+  getInboxItemConversationId,
 } from "@/features/home/lib/inbox";
 import { useInboxSelectionAnchor } from "@/features/home/useInboxSelectionAnchor";
+import { useOwnedAgentPubkeys } from "@/features/home/useOwnedAgentPubkeys";
 import {
-  getReactionTargetId,
+  filterInboxItems,
   matchesInboxFilter,
-  toInboxContextMessage,
 } from "@/features/home/lib/inboxViewHelpers";
+import { resolveInboxFilterSelection } from "@/features/home/lib/inboxSelection";
 import { useHomeInboxReadState } from "@/features/home/useHomeInboxReadState";
-import { useHomeDrafts } from "@/features/home/useHomeDrafts";
+import { useHomeInboxAutoSelection } from "@/features/home/useHomeInboxAutoSelection";
+import { useHomeInboxContextMessages } from "@/features/home/useHomeInboxContextMessages";
+import { useHomePersonalInbox } from "@/features/home/useHomePersonalInbox";
 import { useInboxThreadContext } from "@/features/home/useInboxThreadContext";
 import {
   type ProfilePanelTab,
@@ -35,32 +37,26 @@ import {
   profilePanelViewFromSearch,
 } from "@/features/profile/ui/UserProfilePanelUtils";
 import {
-  INBOX_COLUMN_MIN_WIDTH_PX,
   INBOX_SINGLE_COLUMN_BREAKPOINT_PX,
   useResizableInboxListWidth,
 } from "@/features/home/useResizableInboxListWidth";
+import { getHomePaneLayout } from "@/features/home/lib/homePaneLayout";
+import { getHomeMessageCapabilities } from "@/features/home/lib/homeMessageCapabilities";
 import { HomeLoadingState } from "@/features/home/ui/HomeLoadingState";
 import { InboxDetailPane } from "@/features/home/ui/InboxDetailPane";
 import { InboxListPane } from "@/features/home/ui/InboxListPane";
-import { DraftDetailPane } from "@/features/messages/ui/DraftDetailPane";
+import { HomePersonalInboxDetail } from "@/features/home/ui/HomePersonalInboxDetail";
 import {
   useChannelMessagesQuery,
   useToggleReactionMutation,
 } from "@/features/messages/hooks";
-import {
-  collectMessageMentionPubkeys,
-  formatTimelineMessages,
-} from "@/features/messages/lib/formatTimelineMessages";
+import { collectMessageMentionPubkeys } from "@/features/messages/lib/formatTimelineMessages";
 import { formatTime } from "@/features/messages/lib/dateFormatters";
 import { splitOutgoingTags } from "@/features/messages/lib/imetaMediaMarkdown";
 import { getThreadReference } from "@/features/messages/lib/threading";
 import { useUsersBatchQuery } from "@/features/profile/hooks";
 import { useRelaySelfQuery } from "@/features/moderation/hooks";
 import { resolveUserLabel } from "@/features/profile/lib/identity";
-import {
-  countDueReminders,
-  useRemindersQuery,
-} from "@/features/reminders/hooks";
 import { useRemindLater } from "@/features/reminders/ui/RemindMeLaterProvider";
 import { deleteMessage, sendChannelMessage } from "@/shared/api/tauri";
 import type { HomeFeedResponse } from "@/shared/api/types";
@@ -82,27 +78,6 @@ const INBOX_SEARCH_KEYS = [
   "profileView",
 ] as const;
 
-/**
- * Finds the InboxItem whose stable conversation contains the given event ID.
- * Checks `item.id` (the current representative/latest event) first, then
- * falls back to `item.groupItems` so that a deep-linked or URL-anchored event
- * that is no longer the representative still resolves to its row.
- */
-function findItemByEventId(
-  items: readonly InboxItem[],
-  eventId: string,
-): InboxItem | null {
-  // Fast path: representative event matches (the common case).
-  const direct = items.find((item) => item.id === eventId);
-  if (direct) return direct;
-  // Slow path: event is a non-representative group member (e.g. original
-  // mention that was later superseded by a newer reply as the representative).
-  return (
-    items.find((item) => item.groupItems.some((gi) => gi.id === eventId)) ??
-    null
-  );
-}
-
 type HomeViewProps = {
   feed?: HomeFeedResponse;
   isLoading?: boolean;
@@ -142,18 +117,29 @@ export function HomeView({
   const isReminders = filter === "reminders";
   const isDrafts = filter === "drafts";
   const isMessagesMode = !isReminders && !isDrafts;
-  const remindersQuery = useRemindersQuery(currentPubkey);
-  const dueReminderCount = countDueReminders(remindersQuery.data ?? []);
+  const allowMixedPersonalSelection = filter === "all";
   const {
-    activeCount: activeDraftCount,
-    deleteDraft: handleDeleteDraft,
-    items: draftItems,
-    selectedItem: selectedDraftItem,
-    selectedKey: selectedDraftKey,
-    selectDraft: setSelectedDraftKey,
-  } = useHomeDrafts({
+    drafts: {
+      activeCount: activeDraftCount,
+      deleteDraft: handleDeleteDraft,
+      items: draftItems,
+      selectedItem: selectedDraftItem,
+      selectedKey: selectedDraftKey,
+      selectDraft: setSelectedDraftKey,
+    },
+    dueReminderCount,
+    pendingReminders,
+    reminders: {
+      selectedId: selectedReminderId,
+      selectedItem: selectedReminder,
+      select: setSelectedReminderId,
+    },
+  } = useHomePersonalInbox({
+    allowMixedSelection: allowMixedPersonalSelection,
+    currentPubkey,
     isDrafts,
     isNarrowHomeViewport,
+    isReminders,
     viewportWidthPx: homeInboxWidthPx,
   });
   // `?item=` is Messages-mode-only machinery: a reminder never enters the
@@ -167,37 +153,23 @@ export function HomeView({
   const profilePanelView = profilePanelViewFromSearch(
     inboxSearchValues.profileView,
   );
-  // Selection state — two-tier design so explicit and automatic selections
-  // have distinct ownership:
-  //
-  //   urlSelectedItemId  — explicit/user anchor, URL-authoritative.  Written
-  //     only by handleUserSelectItem (via applyInboxSearchPatch) and by
-  //     back/forward navigation.  Never touched by background data loads.
-  //
-  //   autoSelectedEventId — default desktop selection when the URL carries no
-  //     explicit anchor.  Written only by the auto-selection effect.  Never
-  //     triggers a history push.
-  //
-  //   selectedEventId — the effective anchor used everywhere below: the URL
-  //     anchor when present, otherwise the auto-selected fallback.  Derived
-  //     synchronously, no separate state — so there is no mirror-revert race.
+  // Explicit selection is URL-owned; automatic desktop selection stays local.
   const [autoSelectedEventId, setAutoSelectedEventId] = React.useState<
     string | null
   >(null);
+  const [unreadBoundary, setUnreadBoundary] = React.useState<{
+    conversationId: string;
+    eventId: string;
+  } | null>(null);
   const selectedEventId = urlSelectedItemId ?? autoSelectedEventId;
   const [managedChannelId, setManagedChannelId] = React.useState<string | null>(
     null,
   );
   const { goChannel } = useAppNavigation();
   const openDmMutation = useOpenDmMutation();
-  // handleUserSelectItem: explicit selection — only patches the URL.
-  // No local setSelectedEventId call; the URL patch triggers a TanStack Router
-  // navigation which updates urlSelectedItemId, which becomes selectedEventId
-  // on the next render.  This avoids the mirror-revert race where
-  // useEffect([urlSelectedItemId]) would fire before navigation commits and
-  // overwrite the optimistically-set local state with the stale URL null.
   const handleUserSelectItem = React.useCallback(
     (itemId: string | null) => {
+      setAutoSelectedEventId(null);
       applyInboxSearchPatch({ item: itemId });
     },
     [applyInboxSearchPatch],
@@ -267,6 +239,7 @@ export function HomeView({
     getMessageReadAt,
     feedItemState,
     markChannelRead,
+    markMessageRead,
     markThreadRead,
     readStateVersion,
   } = useAppShell();
@@ -290,7 +263,6 @@ export function HomeView({
       ? (getThreadReference(activeLatchedItem.tags).parentId ??
         activeLatchedItem.id)
       : null;
-
   const channelsQuery = useChannelsQuery();
   const channels = channelsQuery.data;
   const selectedChannelIdCandidate = React.useMemo(() => {
@@ -321,6 +293,13 @@ export function HomeView({
   const threadContext = useInboxThreadContext(
     threadContextFeedItem,
     channelMessages,
+    {
+      fullChannel:
+        selectedChannel?.channelType === "dm" ||
+        threadContextFeedItem?.channelType === "dm",
+      hasChannelLoadError: channelMessagesQuery.isError,
+      isChannelLoading: channelMessagesQuery.isPending,
+    },
   );
 
   const feedProfilePubkeys = React.useMemo(
@@ -342,6 +321,11 @@ export function HomeView({
     enabled: feedProfilePubkeys.length > 0,
   });
   const feedProfiles = feedProfilesQuery.data?.profiles;
+  const ownedAgentPubkeys = useOwnedAgentPubkeys(
+    true,
+    feedProfiles,
+    currentPubkey,
+  );
   const feedOwnerPubkeys = React.useMemo(
     () => [
       ...new Set(
@@ -356,8 +340,6 @@ export function HomeView({
     enabled: feedOwnerPubkeys.length > 0,
   });
   const feedOwnerProfiles = feedOwnerProfilesQuery.data?.profiles;
-  // Agent set for the inbox list/detail bot badges: the community-scoped
-  // baseline widened with this surface's profile lookup.
   const communityAgentPubkeys = useKnownAgentPubkeys();
   const inboxAgentPubkeys = React.useMemo(() => {
     const pubkeys = new Set(communityAgentPubkeys);
@@ -370,16 +352,28 @@ export function HomeView({
 
     return pubkeys;
   }, [feedProfiles, communityAgentPubkeys]);
-  const inboxItems = React.useMemo(
-    () =>
-      buildInboxItems({
-        channels,
-        currentPubkey,
-        feed,
-        profiles: feedProfiles,
-      }),
-    [channels, currentPubkey, feed, feedProfiles],
-  );
+  // biome-ignore lint/correctness/useExhaustiveDependencies: readStateVersion invalidates the stable getChannelReadAt callback
+  const inboxItems = React.useMemo(() => {
+    const items = buildInboxItems({
+      channels,
+      currentPubkey,
+      feed,
+      getChannelReadAt,
+      getMessageReadAt,
+      getThreadReadAt,
+      profiles: feedProfiles,
+    });
+    return filterInboxItems(items);
+  }, [
+    channels,
+    currentPubkey,
+    feed,
+    feedProfiles,
+    getChannelReadAt,
+    getMessageReadAt,
+    getThreadReadAt,
+    readStateVersion,
+  ]);
   const { effectiveDoneSet, markItemRead, markItemUnread } =
     useHomeInboxReadState({
       items: inboxItems,
@@ -390,20 +384,18 @@ export function HomeView({
       localDoneSet: doneSet,
       localUnreadSet: unreadSet,
       markChannelRead,
+      markMessageRead,
       markThreadRead,
       markDoneLocal: markDone,
       markUnreadLocal: markUnread,
       undoDoneLocal: undoDone,
       undoUnreadLocal: undoUnread,
     });
-  // Resolve the selected row and stable conversation ID from inboxItems
-  // (unfiltered). We need conversationId before filtering so we can keep the
-  // selected item visible when unreadOnly is on. The event anchor may point to
-  // any event in the group (representative or older member), so search both.
+  // Resolve selection before filtering so unread-only can retain its active row.
   const selectedItemFromAll = React.useMemo(
     () =>
       selectedEventId
-        ? (findItemByEventId(inboxItems, selectedEventId) ?? null)
+        ? findInboxItemByEventId(inboxItems, selectedEventId)
         : null,
     [inboxItems, selectedEventId],
   );
@@ -413,7 +405,7 @@ export function HomeView({
   // correct row selected (by conversationId) even after the anchor event has
   // been displaced from groupItems by a newer representative.
   const latchedConversationId = activeLatchedItem
-    ? getInboxConversationId(activeLatchedItem.tags, activeLatchedItem.id)
+    ? getInboxItemConversationId(activeLatchedItem)
     : null;
   const selectedConversationId =
     selectedItemFromAll?.conversationId ?? latchedConversationId;
@@ -421,7 +413,7 @@ export function HomeView({
   const filteredItems = React.useMemo(() => {
     return inboxItems.filter(
       (item) =>
-        matchesInboxFilter(item, filter) &&
+        matchesInboxFilter(item, filter, ownedAgentPubkeys) &&
         (!unreadOnly ||
           !effectiveDoneSet.has(item.id) ||
           item.conversationId === selectedConversationId),
@@ -430,99 +422,45 @@ export function HomeView({
     effectiveDoneSet,
     filter,
     inboxItems,
+    ownedAgentPubkeys,
     selectedConversationId,
     unreadOnly,
   ]);
-  // Prefer the filtered view for the selected item so that filter/unread
-  // changes can still dismiss it, but fall back to the unfiltered row so a
-  // live representative-event change (which keeps the conversation in the
-  // filter) does not make selectedItem go null mid-session.
+  // A filter change may only retain detail for a conversation that remains
+  // visible. The filter handler selects the next valid row in the same update,
+  // so the detail pane never renders a stale conversation between states.
   const selectedItem = React.useMemo(() => {
     if (!selectedEventId) return null;
-    // Primary: find by event anchor in the filtered view.
-    const fromFiltered = findItemByEventId(filteredItems, selectedEventId);
+    const fromFiltered = findInboxItemByEventId(filteredItems, selectedEventId);
     if (fromFiltered) return fromFiltered;
-    // Secondary: event anchor is in an unfiltered row (e.g., dismissed item).
-    if (selectedItemFromAll) return selectedItemFromAll;
-    // Tertiary: anchor has been displaced from all groupItems (e.g., a very old
-    // event that fell off the feed window). Resolve by conversationId so the
-    // correct row stays selected and the auto-selection effect doesn't replace
-    // the anchor with a different conversation.
     if (selectedConversationId) {
       return (
         filteredItems.find(
           (item) => item.conversationId === selectedConversationId,
-        ) ??
-        inboxItems.find(
-          (item) => item.conversationId === selectedConversationId,
-        ) ??
-        null
+        ) ?? null
       );
     }
     return null;
-  }, [
-    filteredItems,
-    inboxItems,
-    selectedConversationId,
-    selectedEventId,
-    selectedItemFromAll,
-  ]);
-  const contextMessages = React.useMemo<InboxContextMessage[]>(() => {
-    if (!selectedItem) {
-      return [];
+  }, [filteredItems, selectedConversationId, selectedEventId]);
+  const unreadBoundaryEventId = React.useMemo(() => {
+    if (!selectedItem) return null;
+    if (unreadBoundary?.conversationId === selectedItem.conversationId) {
+      return unreadBoundary.eventId;
     }
-
-    const eventById = new Map(
-      threadContext.events.map((event) => [event.id, event]),
-    );
-    const contextEventIds = new Set(eventById.keys());
-    const reactionEvents = [
-      ...(channelMessages ?? []),
-      ...threadContext.reactionEvents,
-    ].filter((event) => {
-      if (event.kind !== KIND_REACTION) {
-        return false;
-      }
-
-      const targetId = getReactionTargetId(event.tags);
-      return Boolean(targetId && contextEventIds.has(targetId));
-    });
-    const currentUserAvatarUrl = currentPubkey
-      ? (feedProfiles?.[currentPubkey.toLowerCase()]?.avatarUrl ?? null)
-      : null;
-    const timelineMessages = formatTimelineMessages(
-      [...threadContext.events, ...reactionEvents],
-      selectedChannel,
-      currentPubkey,
-      currentUserAvatarUrl,
-      feedProfiles,
-      undefined,
-      undefined,
-      undefined,
-      relaySelfPubkey,
-      feedOwnerProfiles,
-    );
-
-    return timelineMessages.map((message) =>
-      toInboxContextMessage(message, {
-        eventById,
-        fallbackAuthorPubkey: selectedItem.item.pubkey,
-        profiles: feedProfiles,
-        selectedItemId: selectedEventId ?? selectedItem.id,
-      }),
-    );
-  }, [
+    return effectiveDoneSet.has(selectedItem.id) ? null : selectedItem.id;
+  }, [effectiveDoneSet, selectedItem, unreadBoundary]);
+  const contextMessages = useHomeInboxContextMessages({
     channelMessages,
     currentPubkey,
-    feedProfiles,
-    feedOwnerProfiles,
+    events: threadContext.events,
+    ownerProfiles: feedOwnerProfiles,
+    profiles: feedProfiles,
+    reactionEvents: threadContext.reactionEvents,
     relaySelfPubkey,
     selectedChannel,
     selectedEventId,
     selectedItem,
-    threadContext.events,
-    threadContext.reactionEvents,
-  ]);
+  });
   const selectedItemReplies = React.useMemo<InboxReply[]>(() => {
     if (!selectedItem) return [];
     const localReplies =
@@ -530,73 +468,20 @@ export function HomeView({
     const contextIds = new Set(contextMessages.map((message) => message.id));
     return localReplies.filter((reply) => !contextIds.has(reply.id));
   }, [contextMessages, localRepliesByItemId, selectedItem]);
-  React.useEffect(() => {
-    // Auto-selection is Messages-mode-only: in Reminders mode no FeedItem is
-    // ever selected, so default-selecting one behind the reminders list would
-    // be wasted work and could drive narrow-viewport detail off a stale feed
-    // selection.
-    if (!isMessagesMode) {
-      return;
-    }
-
-    // The URL carries an explicit anchor — auto-selection must not overwrite
-    // it. Clear any stale auto fallback so it cannot reappear if back later
-    // returns to a no-item entry.
-    if (urlSelectedItemId !== null) {
-      setAutoSelectedEventId(null);
-      return;
-    }
-
-    // While the feed is loading (e.g. a reload restoring `?item=` from the
-    // URL) the selected item simply hasn't arrived yet — don't clobber it.
-    if (isLoading || !feed) {
-      return;
-    }
-
-    if (filteredItems.length === 0) {
-      setAutoSelectedEventId(null);
-      return;
-    }
-
-    // Don't default-select before the width is measured: at width 0
-    // isNarrowHomeViewport is false, so narrow Home would cold-load into detail.
-    if (homeInboxWidthPx === 0) {
-      return;
-    }
-
-    // The event anchor is still valid if the conversation it belongs to is
-    // still present in the filtered list. A live representative-event change
-    // does NOT invalidate the anchor (the same conversationId is still there).
-    if (
-      selectedConversationId !== null &&
-      filteredItems.some(
-        (item) => item.conversationId === selectedConversationId,
-      )
-    ) {
-      return;
-    }
-
-    // A cold URL anchor is being resolved via getEventById — the user navigated
-    // to a specific event that is not yet in the inbox list. Do not overwrite
-    // selectedEventId; wait for cold recovery to commit before auto-selecting.
-    if (coldResolutionPending) {
-      return;
-    }
-
-    setAutoSelectedEventId(
-      isNarrowHomeViewport ? null : (filteredItems[0]?.id ?? null),
-    );
-  }, [
+  useHomeInboxAutoSelection({
     coldResolutionPending,
-    feed,
     filteredItems,
+    hasFeed: Boolean(feed),
+    hasPersonalSelection:
+      selectedDraftItem !== null || selectedReminder !== null,
     homeInboxWidthPx,
     isLoading,
     isMessagesMode,
     isNarrowHomeViewport,
     selectedConversationId,
+    setAutoSelectedEventId,
     urlSelectedItemId,
-  ]);
+  });
 
   React.useEffect(() => {
     void selectedConversationId;
@@ -604,6 +489,54 @@ export function HomeView({
     setIsSendingReply(false);
   }, [selectedConversationId]);
 
+  const handleFilterChange = React.useCallback(
+    (nextFilter: InboxFilter) => {
+      const nextItems = inboxItems.filter(
+        (item) =>
+          matchesInboxFilter(item, nextFilter, ownedAgentPubkeys) &&
+          (!unreadOnly ||
+            !effectiveDoneSet.has(item.id) ||
+            item.conversationId === selectedConversationId),
+      );
+      const selection = resolveInboxFilterSelection({
+        isNarrow: isNarrowHomeViewport,
+        items: nextItems,
+        selectedConversationId,
+      });
+
+      setUnreadBoundary(null);
+      setSelectedDraftKey(null);
+      setSelectedReminderId(null);
+      setFilter(nextFilter);
+
+      if (
+        nextFilter === "reminders" ||
+        nextFilter === "drafts" ||
+        selection.preserveSelection
+      ) {
+        if (nextFilter === "reminders" || nextFilter === "drafts") {
+          setAutoSelectedEventId(null);
+          applyInboxSearchPatch({ item: null });
+        }
+        return;
+      }
+
+      applyInboxSearchPatch({ item: null });
+      setAutoSelectedEventId(selection.autoSelectedEventId);
+    },
+    [
+      applyInboxSearchPatch,
+      effectiveDoneSet,
+      inboxItems,
+      isNarrowHomeViewport,
+      ownedAgentPubkeys,
+      selectedConversationId,
+      setSelectedDraftKey,
+      setSelectedReminderId,
+      unreadOnly,
+    ],
+  );
+
   if (isLoading && !feed) {
     return <HomeLoadingState />;
   }
@@ -629,63 +562,43 @@ export function HomeView({
     );
   }
 
-  const canReact =
-    selectedItem !== null &&
-    selectedItem.item.channelId !== null &&
-    availableChannelIds.has(selectedItem.item.channelId);
-  const canReply =
-    canReact &&
-    selectedItem.item.kind !== 45001 &&
-    selectedItem.item.kind !== 45003;
-  const disabledReplyReason =
-    canReply || !selectedItem
-      ? null
-      : selectedItem.item.channelId
-        ? availableChannelIds.has(selectedItem.item.channelId)
-          ? "This item does not support inline replies yet."
-          : "Open the linked channel to reply."
-        : "This inbox item does not have a reply target.";
-  const canDelete =
-    selectedItem !== null &&
-    currentPubkey?.trim().toLowerCase() ===
-      selectedItem.item.pubkey.trim().toLowerCase();
-  const isSinglePanelDetailView =
-    isMessagesMode &&
-    isNarrowHomeViewport &&
-    selectedEventId !== null &&
-    !isSinglePanelAuxiliaryView;
-  const isSinglePanelDraftDetailView =
-    isDrafts &&
-    isNarrowHomeViewport &&
-    selectedDraftItem !== null &&
-    !isSinglePanelAuxiliaryView;
-  const showListPane =
-    !isSinglePanelDetailView &&
-    !isSinglePanelDraftDetailView &&
-    !isSinglePanelAuxiliaryView;
-  const showDetailPane =
-    !isSinglePanelAuxiliaryView &&
-    ((isMessagesMode && (!isNarrowHomeViewport || isSinglePanelDetailView)) ||
-      (isDrafts && (!isNarrowHomeViewport || isSinglePanelDraftDetailView)));
-  const auxiliaryPaneWidthPx = isSinglePanelAuxiliaryView
-    ? homeInboxWidthPx
-    : threadPanelWidthPx;
-  const maxEffectiveInboxListWidthPx =
-    homeInboxWidthPx > 0
-      ? Math.max(
-          INBOX_COLUMN_MIN_WIDTH_PX,
-          homeInboxWidthPx -
-            INBOX_COLUMN_MIN_WIDTH_PX -
-            (hasAuxiliaryPane ? auxiliaryPaneWidthPx : 0),
-        )
-      : undefined;
-  const effectiveInboxListWidthPx =
-    homeInboxWidthPx > 0
-      ? Math.min(
-          inboxListWidthPx,
-          maxEffectiveInboxListWidthPx ?? inboxListWidthPx,
-        )
-      : inboxListWidthPx;
+  const { canDelete, canReact, canReply, disabledReplyReason } =
+    getHomeMessageCapabilities(
+      selectedItem,
+      currentPubkey,
+      availableChannelIds,
+    );
+  const detailMode = isDrafts
+    ? "drafts"
+    : isReminders
+      ? "reminders"
+      : selectedDraftItem
+        ? "drafts"
+        : selectedReminder
+          ? "reminders"
+          : "messages";
+  const {
+    auxiliaryPaneWidthPx,
+    effectiveInboxListWidthPx,
+    isSinglePanelDetailView,
+    isSinglePanelDraftDetailView,
+    isSinglePanelReminderDetailView,
+    showDetailPane,
+    showListPane,
+  } = getHomePaneLayout({
+    hasAuxiliaryPane,
+    homeWidthPx: homeInboxWidthPx,
+    inboxListWidthPx,
+    isDrafts: detailMode === "drafts",
+    isMessagesMode: detailMode === "messages",
+    isNarrow: isNarrowHomeViewport,
+    isReminders: detailMode === "reminders",
+    isSinglePanelAuxiliaryView,
+    selectedDraft: selectedDraftItem !== null,
+    selectedEvent: selectedEventId !== null,
+    selectedReminder: selectedReminder !== null,
+    threadPanelWidthPx,
+  });
 
   return (
     <ProfilePanelProvider onOpenProfilePanel={handleOpenProfilePanel}>
@@ -731,7 +644,7 @@ export function HomeView({
               filter={filter}
               items={filteredItems}
               onDeleteDraft={handleDeleteDraft}
-              onFilterChange={setFilter}
+              onFilterChange={handleFilterChange}
               onMarkRead={markItemRead}
               onMarkUnread={markItemUnread}
               onOpenDirect={(item) => {
@@ -758,14 +671,38 @@ export function HomeView({
                 });
               }}
               onSelect={(itemId) => {
+                const item = findInboxItemByEventId(inboxItems, itemId);
+                setUnreadBoundary(
+                  item && !effectiveDoneSet.has(item.id)
+                    ? {
+                        conversationId: item.conversationId,
+                        eventId: item.id,
+                      }
+                    : null,
+                );
+                setSelectedDraftKey(null);
+                setSelectedReminderId(null);
                 handleUserSelectItem(itemId);
                 markItemRead(itemId);
               }}
-              onSelectDraft={setSelectedDraftKey}
+              onSelectDraft={(draftKey) => {
+                setUnreadBoundary(null);
+                setSelectedReminderId(null);
+                handleUserSelectItem(null);
+                setSelectedDraftKey(draftKey);
+              }}
+              onSelectReminder={(reminderId) => {
+                setUnreadBoundary(null);
+                setSelectedDraftKey(null);
+                handleUserSelectItem(null);
+                setSelectedReminderId(reminderId);
+              }}
               onUnreadOnlyChange={setUnreadOnly}
               reminderPubkey={currentPubkey}
+              reminders={pendingReminders}
               selectedConversationId={selectedConversationId}
               selectedDraftKey={selectedDraftKey}
+              selectedReminderId={selectedReminderId}
               showRightDivider={showListPane && showDetailPane}
               unreadOnly={unreadOnly}
             />
@@ -794,7 +731,7 @@ export function HomeView({
             <span className="absolute bottom-0 left-1/2 top-0 w-px -translate-x-1/2 bg-transparent transition-colors group-hover:bg-border/80 group-focus-visible:bg-border/80" />
           </button>
 
-          {showDetailPane && isMessagesMode ? (
+          {showDetailPane && detailMode === "messages" ? (
             <InboxDetailPane
               agentPubkeys={inboxAgentPubkeys}
               canDelete={canDelete}
@@ -810,12 +747,14 @@ export function HomeView({
               isDeletingMessage={isDeletingMessage}
               isSendingReply={isSendingReply}
               isSinglePanelView={isSinglePanelDetailView}
+              hasThreadContextLoadError={threadContext.hasLoadError}
               isThreadContextLoading={threadContext.isLoading}
               item={selectedItem}
               latchedDefaultParentId={latchedDefaultParentId}
               messages={contextMessages}
               profiles={feedProfiles}
               selectedEventId={selectedEventId}
+              unreadBoundaryEventId={unreadBoundaryEventId}
               onBack={
                 isSinglePanelDetailView
                   ? () => {
@@ -931,16 +870,20 @@ export function HomeView({
               replies={selectedItemReplies}
             />
           ) : null}
-          {showDetailPane && isDrafts ? (
-            <DraftDetailPane
-              item={selectedDraftItem}
-              key={selectedDraftItem?.entry.key ?? "empty"}
+          {showDetailPane && detailMode !== "messages" ? (
+            <HomePersonalInboxDetail
+              currentPubkey={currentPubkey}
+              draftItem={selectedDraftItem}
+              mode={detailMode}
               onBack={
                 isSinglePanelDraftDetailView
                   ? () => setSelectedDraftKey(null)
-                  : undefined
+                  : isSinglePanelReminderDetailView
+                    ? () => setSelectedReminderId(null)
+                    : undefined
               }
-              onDelete={handleDeleteDraft}
+              onDeleteDraft={handleDeleteDraft}
+              reminder={selectedReminder}
             />
           ) : null}
           {profilePanelPubkey ? (
diff --git a/desktop/src/features/home/ui/InboxDetailPane.tsx b/desktop/src/features/home/ui/InboxDetailPane.tsx
index 23a1748225..9b6ff57e17 100644
--- a/desktop/src/features/home/ui/InboxDetailPane.tsx
+++ b/desktop/src/features/home/ui/InboxDetailPane.tsx
@@ -1,4 +1,12 @@
-import { ArrowLeft, Hash, Mail, MoreHorizontal, Trash2 } from "lucide-react";
+import {
+  AlertCircle,
+  ArrowLeft,
+  ExternalLink,
+  LoaderCircle,
+  Mail,
+  MoreHorizontal,
+  Trash2,
+} from "lucide-react";
 import * as React from "react";
 
 import type {
@@ -6,9 +14,12 @@ import type {
   InboxItem,
   InboxReply,
 } from "@/features/home/lib/inbox";
+import { getProjectInboxReference } from "@/features/home/lib/projectInbox";
+import { ProjectInboxDetail } from "@/features/home/ui/ProjectInboxDetail";
 import { ChannelMembersBar } from "@/features/channels/ui/ChannelMembersBar";
 import { useCommunities } from "@/features/communities/useCommunities";
 import { formatInboxTypeLabel } from "@/features/home/lib/inbox";
+import { hasInboxThreadContext } from "@/features/home/lib/inboxViewHelpers";
 import {
   type InboxDisplayMessage,
   InboxMessageRow,
@@ -58,6 +69,7 @@ type InboxDetailPaneProps = {
   isDeletingMessage?: boolean;
   isSendingReply?: boolean;
   isSinglePanelView?: boolean;
+  hasThreadContextLoadError?: boolean;
   isThreadContextLoading?: boolean;
   item: InboxItem | null;
   messages?: InboxContextMessage[];
@@ -73,6 +85,7 @@ type InboxDetailPaneProps = {
    * representative `item.id`.
    */
   selectedEventId: string | null;
+  unreadBoundaryEventId?: string | null;
   /**
    * The default reply-parent event ID derived from the latched anchor's tags
    * in HomeView (`parentId ?? anchor.id`). Populated once the anchor is found
@@ -93,7 +106,7 @@ type InboxDetailPaneProps = {
     content: string;
     mediaTags?: string[][];
     mentionPubkeys: string[];
-    parentEventId: string;
+    parentEventId: string | null;
   }) => Promise<void>;
   onToggleReaction?: (
     message: TimelineMessage,
@@ -102,7 +115,23 @@ type InboxDetailPaneProps = {
   ) => Promise<void>;
 };
 
-export function InboxDetailPane({
+/** Routes Inbox selections to their canonical message or Buzz Git detail. */
+export function InboxDetailPane(props: InboxDetailPaneProps) {
+  if (props.item && getProjectInboxReference(props.item.item)) {
+    return (
+      <ProjectInboxDetail
+        isSinglePanelView={props.isSinglePanelView}
+        item={props.item}
+        onBack={props.onBack}
+        profiles={props.profiles}
+      />
+    );
+  }
+
+  return <InboxMessageDetailPane {...props} />;
+}
+
+function InboxMessageDetailPane({
   agentPubkeys,
   canDelete,
   canOpenChannel,
@@ -111,6 +140,7 @@ export function InboxDetailPane({
   isDeletingMessage = false,
   isSendingReply = false,
   isSinglePanelView = false,
+  hasThreadContextLoadError = false,
   isThreadContextLoading = false,
   item,
   messages = [],
@@ -120,6 +150,7 @@ export function InboxDetailPane({
   contextChannelName = null,
   currentPubkey,
   selectedEventId,
+  unreadBoundaryEventId = null,
   latchedDefaultParentId = null,
   onBack,
   onDelete,
@@ -143,6 +174,7 @@ export function InboxDetailPane({
   // scroll centering) key on this.
   const conversationId = item?.conversationId ?? null;
   const selectedChannelId = item?.item.channelId ?? null;
+  const isDirectMessage = item?.item.channelType === "dm";
   // Build the plain, non-virtualized timeline the shared hook anchors against.
   // Live arrivals rerun its layout compensation without changing the target.
 
@@ -354,7 +386,8 @@ export function InboxDetailPane({
   // (derived from the selected-event anchor at conversation entry), which does
   // not change when a live incoming message advances the representative item.
   const composerParentEventId =
-    replyTarget?.id ?? capturedDefaultParentId ?? item.id;
+    replyTarget?.id ??
+    (isDirectMessage ? null : (capturedDefaultParentId ?? item.id));
   const composerReplyTarget =
     replyTarget && replyTarget.id !== item.id
       ? {
@@ -370,10 +403,27 @@ export function InboxDetailPane({
     item.item.channelType === "forum"
       ? item.item.channelType
       : null;
-  const contextLabel = channelContextName ?? formatInboxTypeLabel(item);
-  const hasChannelContext = Boolean(channelContextName);
+  const isThreadContext =
+    !isDirectMessage && hasInboxThreadContext(item, messages);
+  const contextLabel = isThreadContext
+    ? isDirectMessage
+      ? `Thread with ${item.senderLabel}`
+      : channelContextName
+        ? `Thread in #${channelContextName}`
+        : "Thread"
+    : isDirectMessage
+      ? `DM with ${item.senderLabel}`
+      : channelContextName
+        ? `Message in #${channelContextName}`
+        : formatInboxTypeLabel(item);
   const contextChannelId = item.item.channelId;
-  const contextThreadRootId = getThreadReference(item.item.tags).rootId;
+  const sourceEventId = selectedEventId ?? item.id;
+  const contextThreadRootId = isThreadContext ? item.conversationId : null;
+  const openContextLabel = isThreadContext
+    ? "Open full thread"
+    : isDirectMessage
+      ? "Open conversation"
+      : "Open in channel";
 
   const handleSelectReplyTarget = (message: InboxDisplayMessage) => {
     setReplyTargetId((currentReplyTargetId) =>
@@ -412,34 +462,31 @@ export function InboxDetailPane({
                 ) : null}
                 <div className="min-w-0">
                   {canOpenChannel && contextChannelId ? (
-                    <button
-                      className="flex min-w-0 items-center gap-[4px] text-left text-sm font-semibold leading-5 tracking-tight text-foreground hover:underline focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-                      onClick={() =>
-                        onOpenContext(
-                          contextChannelId,
-                          item.id,
-                          contextThreadRootId,
-                        )
-                      }
-                      title={item.fullTimestampLabel}
-                      type="button"
-                    >
-                      {hasChannelContext ? (
-                        <Hash className="h-4 w-4 shrink-0" color="gray" />
-                      ) : null}
-                      <span className="min-w-0 translate-y-px truncate">
-                        {contextLabel}
-                      </span>
-                    </button>
+                    <h2 className="min-w-0">
+                      <button
+                        className="block min-w-0 text-left text-sm font-semibold leading-5 tracking-tight text-foreground hover:underline focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+                        data-testid="home-inbox-context-title"
+                        onClick={() =>
+                          onOpenContext(
+                            contextChannelId,
+                            sourceEventId,
+                            contextThreadRootId,
+                          )
+                        }
+                        title={openContextLabel}
+                        type="button"
+                      >
+                        <span className="block min-w-0 translate-y-px truncate">
+                          {contextLabel}
+                        </span>
+                      </button>
+                    </h2>
                   ) : (
                     <h2
-                      className="flex min-w-0 items-center gap-[4px] text-sm font-semibold leading-5 tracking-tight text-foreground"
+                      className="min-w-0 text-sm font-semibold leading-5 tracking-tight text-foreground"
                       title={item.fullTimestampLabel}
                     >
-                      {hasChannelContext ? (
-                        <Hash className="h-4 w-4 shrink-0" color="gray" />
-                      ) : null}
-                      <span className="min-w-0 translate-y-px truncate">
+                      <span className="block min-w-0 translate-y-px truncate">
                         {contextLabel}
                       </span>
                     </h2>
@@ -450,6 +497,30 @@ export function InboxDetailPane({
               <TooltipProvider delayDuration={200}>
                 <div className="flex shrink-0 items-center gap-1">
                   <UpdateIndicator />
+                  {canOpenChannel && contextChannelId ? (
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <Button
+                          aria-label={openContextLabel}
+                          className="rounded-full text-muted-foreground"
+                          data-testid="home-inbox-open-context"
+                          onClick={() =>
+                            onOpenContext(
+                              contextChannelId,
+                              sourceEventId,
+                              contextThreadRootId,
+                            )
+                          }
+                          size="icon"
+                          type="button"
+                          variant="ghost"
+                        >
+                          <ExternalLink />
+                        </Button>
+                      </TooltipTrigger>
+                      <TooltipContent>{openContextLabel}</TooltipContent>
+                    </Tooltip>
+                  ) : null}
                   {channel ? (
                     <ChannelMembersBar
                       channel={channel}
@@ -484,8 +555,27 @@ export function InboxDetailPane({
           ref={scrollContainerRef}
         >
           <div ref={contentRef}>
+            {isThreadContextLoading && displayMessages.length <= 1 ? (
+              <div
+                className="mx-4 mb-2 flex items-center gap-2 rounded-md bg-muted/50 px-3 py-2 text-sm text-muted-foreground"
+                data-testid="home-inbox-context-loading"
+              >
+                <LoaderCircle className="h-4 w-4 shrink-0 animate-spin" />
+                <span>Loading surrounding context...</span>
+              </div>
+            ) : null}
+            {hasThreadContextLoadError ? (
+              <div
+                className="mx-4 mb-2 flex items-center gap-2 rounded-md bg-destructive/10 px-3 py-2 text-sm text-destructive"
+                data-testid="home-inbox-context-error"
+              >
+                <AlertCircle className="h-4 w-4 shrink-0" />
+                <span>Some message context could not be loaded.</span>
+              </div>
+            ) : null}
             {displayMessages.map((message, index) => {
-              const isAfterSeparator = index === 1;
+              const hasUnreadBoundary = message.id === unreadBoundaryEventId;
+              const isAfterSeparator = index === 1 || hasUnreadBoundary;
               const previousMessage = displayMessages[index - 1];
               const isContinuation =
                 !isAfterSeparator &&
@@ -510,6 +600,7 @@ export function InboxDetailPane({
                   message={message}
                   onSelectReplyTarget={handleSelectReplyTarget}
                   onToggleReaction={onToggleReaction}
+                  showUnreadBoundary={hasUnreadBoundary}
                 />
               );
             })}
@@ -543,17 +634,25 @@ export function InboxDetailPane({
           />
           <div className="pointer-events-auto">
             <MessageComposer
-              audienceContext={{
-                type: "thread",
-                threadRootId: item.conversationId,
-                initialAgentPubkeys,
-              }}
+              audienceContext={
+                isDirectMessage
+                  ? null
+                  : {
+                      type: "thread",
+                      threadRootId: item.conversationId,
+                      initialAgentPubkeys,
+                    }
+              }
               channelId={item.item.channelId}
               channelName={item.channelLabel ?? "channel"}
               channelType={composerChannelType}
               containerClassName="px-4 pb-4 sm:px-4"
               disabled={!canReply}
-              draftKey={`thread:${item.conversationId}`}
+              draftKey={
+                isDirectMessage
+                  ? (item.item.channelId ?? item.conversationId)
+                  : `thread:${item.conversationId}`
+              }
               isSending={isSendingReply}
               onCancelReply={
                 composerReplyTarget ? () => setReplyTargetId(null) : undefined
@@ -568,7 +667,9 @@ export function InboxDetailPane({
               }
               placeholder={
                 canReply
-                  ? `Send reply to ${item.channelLabel ? `#${item.channelLabel} thread` : "channel thread"}`
+                  ? isDirectMessage
+                    ? `Message ${item.senderLabel}`
+                    : `Send reply to ${item.channelLabel ? `#${item.channelLabel} thread` : "channel thread"}`
                   : (disabledReplyReason ??
                     "Replies are not available for this item.")
               }
diff --git a/desktop/src/features/home/ui/InboxFilterMenu.tsx b/desktop/src/features/home/ui/InboxFilterMenu.tsx
new file mode 100644
index 0000000000..6fcc759731
--- /dev/null
+++ b/desktop/src/features/home/ui/InboxFilterMenu.tsx
@@ -0,0 +1,107 @@
+import { ChevronDown } from "lucide-react";
+
+import type { InboxFilter } from "@/features/home/lib/inbox";
+import { cn } from "@/shared/lib/cn";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from "@/shared/ui/dropdown-menu";
+
+const INBOX_FILTER_OPTIONS: Array<{
+  label: string;
+  value: InboxFilter;
+}> = [
+  { value: "all", label: "All" },
+  { value: "project", label: "Projects" },
+  { value: "mention", label: "Mentions" },
+  { value: "thread", label: "Threads" },
+  { value: "needs_action", label: "Needs action" },
+  { value: "agent_activity", label: "Agents" },
+  { value: "reminders", label: "Reminders" },
+  { value: "drafts", label: "Drafts" },
+];
+
+const TRIGGER_CLASS =
+  "inline-flex h-8 shrink-0 items-center justify-center rounded-lg text-muted-foreground transition-colors hover:bg-muted/70 hover:text-foreground focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring data-[state=open]:bg-muted/70 data-[state=open]:text-foreground disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 relative -ml-2 w-auto gap-1 px-2 text-sm font-medium text-foreground";
+
+type InboxFilterMenuProps = {
+  activeDraftCount: number;
+  dueReminderCount: number;
+  filter: InboxFilter;
+  onFilterChange: (value: InboxFilter) => void;
+  reminderCount: number;
+};
+
+export function InboxFilterMenu({
+  activeDraftCount,
+  dueReminderCount,
+  filter,
+  onFilterChange,
+  reminderCount,
+}: InboxFilterMenuProps) {
+  const activeFilter = INBOX_FILTER_OPTIONS.find(
+    (option) => option.value === filter,
+  );
+  const statusLabel =
+    dueReminderCount > 0
+      ? `${dueReminderCount} due reminder${dueReminderCount === 1 ? "" : "s"}`
+      : activeDraftCount > 0
+        ? `${activeDraftCount} active draft${activeDraftCount === 1 ? "" : "s"}`
+        : null;
+
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>
+        <button
+          aria-label={`Filter inbox: ${activeFilter?.label ?? "All"}${statusLabel ? `. ${statusLabel}` : ""}`}
+          className={cn(TRIGGER_CLASS)}
+          data-testid="inbox-filter-trigger"
+          type="button"
+        >
+          <span>{activeFilter?.label ?? "All"}</span>
+          <ChevronDown className="text-muted-foreground" />
+        </button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="start" className="w-52">
+        <DropdownMenuRadioGroup
+          onValueChange={(value) => onFilterChange(value as InboxFilter)}
+          value={filter}
+        >
+          {INBOX_FILTER_OPTIONS.map((option) => (
+            <div key={option.value}>
+              {option.value === "reminders" ? (
+                <DropdownMenuSeparator className="my-2 bg-border/60" />
+              ) : null}
+              <DropdownMenuRadioItem value={option.value}>
+                <span className="flex flex-1 items-center gap-2">
+                  <span>{option.label}</span>
+                  <span className="ml-auto flex items-center gap-1.5">
+                    {option.value === "reminders" && reminderCount > 0 ? (
+                      <span
+                        className="inline-flex h-4 min-w-4 items-center justify-center rounded-full bg-primary px-1 text-2xs font-semibold leading-none text-primary-foreground"
+                        data-testid="inbox-reminder-badge-option"
+                      >
+                        {reminderCount}
+                      </span>
+                    ) : option.value === "drafts" && activeDraftCount > 0 ? (
+                      <span
+                        className="inline-flex h-4 min-w-4 items-center justify-center rounded-full bg-primary px-1 text-2xs font-semibold leading-none text-primary-foreground"
+                        data-testid="inbox-draft-badge-option"
+                      >
+                        {activeDraftCount}
+                      </span>
+                    ) : null}
+                  </span>
+                </span>
+              </DropdownMenuRadioItem>
+            </div>
+          ))}
+        </DropdownMenuRadioGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
diff --git a/desktop/src/features/home/ui/InboxListPane.tsx b/desktop/src/features/home/ui/InboxListPane.tsx
index b92008e7a2..fa214dc730 100644
--- a/desktop/src/features/home/ui/InboxListPane.tsx
+++ b/desktop/src/features/home/ui/InboxListPane.tsx
@@ -1,10 +1,4 @@
-import {
-  ChevronDown,
-  Clock,
-  Ellipsis,
-  ExternalLink,
-  MailOpen,
-} from "lucide-react";
+import { Bell, Clock, Ellipsis, ExternalLink, MailOpen } from "lucide-react";
 import * as React from "react";
 
 import {
@@ -13,12 +7,19 @@ import {
   type InboxItem,
   type InboxTypeLabel,
 } from "@/features/home/lib/inbox";
+import { buildInboxListRows } from "@/features/home/lib/inboxListRows";
+import { InboxFilterMenu } from "@/features/home/ui/InboxFilterMenu";
 import {
   DraftsPanel,
   type DraftViewItem,
 } from "@/features/messages/ui/DraftsPanel";
 import { UserProfilePopover } from "@/features/profile/ui/UserProfilePopover";
-import { RemindersPanel } from "@/features/reminders/ui/RemindersPanel";
+import type { Reminder } from "@/features/reminders/lib/reminderTypes";
+import { isDue } from "@/features/reminders/lib/reminderFilters";
+import {
+  RemindersPanel,
+  useReminderSources,
+} from "@/features/reminders/ui/RemindersPanel";
 import { TopChromeInsetHeader } from "@/shared/layout/TopChromeInsetHeader";
 import { cn } from "@/shared/lib/cn";
 import { normalizePubkey } from "@/shared/lib/pubkey";
@@ -34,13 +35,6 @@ import {
   MENTION_CHIP_BASE_CLASSES,
   MESSAGE_MARKDOWN_CLASS,
 } from "@/shared/ui/mentionChip";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
-  DropdownMenuTrigger,
-} from "@/shared/ui/dropdown-menu";
 import { Popover, PopoverContent, PopoverTrigger } from "@/shared/ui/popover";
 import { Separator } from "@/shared/ui/separator";
 import { Switch } from "@/shared/ui/switch";
@@ -48,23 +42,34 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/shared/ui/tooltip";
 import { UserAvatar } from "@/shared/ui/UserAvatar";
 import { VirtualizedList } from "@/shared/ui/VirtualizedList";
 
-const FILTER_OPTIONS: Array<{ label: string; value: InboxFilter }> = [
-  { value: "all", label: "All" },
-  { value: "mention", label: "Mentions" },
-  { value: "thread", label: "Threads" },
-  { value: "needs_action", label: "Needs Action" },
-  { value: "activity", label: "Activity" },
-  { value: "agent_activity", label: "Agents" },
-  { value: "reminders", label: "Reminders" },
-  { value: "drafts", label: "Drafts" },
-];
+const INBOX_EMPTY_STATE_TITLES: Record<InboxFilter, string> = {
+  all: "No activity yet",
+  project: "No project work found",
+  mention: "No mentions found",
+  thread: "No threads found",
+  needs_action: "Nothing needs action",
+  agent_activity: "No agent updates found",
+  reminders: "No reminders",
+  drafts: "No drafts",
+};
+
+const INBOX_UNREAD_EMPTY_STATE_TITLES: Record<InboxFilter, string> = {
+  all: "No unread activity",
+  project: "No unread project work",
+  mention: "No unread mentions",
+  thread: "No unread threads",
+  needs_action: "No unread items needing action",
+  agent_activity: "No unread agent updates",
+  reminders: "No unread reminders",
+  drafts: "No unread drafts",
+};
 
 const INBOX_HEADER_ICON_BUTTON_CLASS =
   "inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-lg text-muted-foreground transition-colors hover:bg-muted/70 hover:text-foreground focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring data-[state=open]:bg-muted/70 data-[state=open]:text-foreground disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0";
 const INBOX_PANE_RIGHT_DIVIDER_CLASS =
   "after:pointer-events-none after:absolute after:inset-y-0 after:right-0 after:z-40 after:w-px after:bg-border/35 after:content-['']";
 
-function ActivityLabel({
+function InboxLabel({
   isDone,
   isActionRequired,
   label,
@@ -101,6 +106,71 @@ function ActivityLabel({
   );
 }
 
+function formatReminderStatus(notBefore: number | undefined) {
+  if (notBefore === undefined) return "Pending";
+  const secondsUntil = notBefore - Math.floor(Date.now() / 1_000);
+  if (secondsUntil <= 0) return "Reminder due";
+  if (secondsUntil < 60) return "Reminder in less than a minute";
+  if (secondsUntil < 3_600) {
+    return `Reminder in ${Math.floor(secondsUntil / 60)}m`;
+  }
+  if (secondsUntil < 86_400) {
+    return `Reminder in ${Math.floor(secondsUntil / 3_600)}h`;
+  }
+  return `Reminder in ${Math.floor(secondsUntil / 86_400)}d`;
+}
+
+function PersonalItemRow({
+  id,
+  location,
+  onClick,
+  preview,
+  selected,
+  status,
+}: {
+  id: string;
+  location: InboxTypeLabel | null;
+  onClick: () => void;
+  preview: string;
+  selected: boolean;
+  status: string;
+}) {
+  return (
+    <button
+      aria-current={selected ? "true" : undefined}
+      className={cn(
+        "flex w-full items-center gap-3 border-b border-border/45 px-4 py-3 text-left transition-colors hover:bg-muted/40 focus-visible:bg-muted/40 focus-visible:outline-hidden",
+        selected && "bg-muted/40",
+      )}
+      data-testid={`home-all-reminders-${id}`}
+      onClick={onClick}
+      type="button"
+    >
+      <span className="flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-muted text-muted-foreground">
+        <Bell className="h-4 w-4" />
+      </span>
+      <span className="min-w-0 flex-1">
+        <span className="block text-sm font-semibold text-foreground">
+          Reminder
+        </span>
+        {location ? (
+          <InboxLabel
+            isActionRequired={false}
+            isDone={false}
+            label={location}
+          />
+        ) : null}
+        <span className="block truncate text-sm text-muted-foreground">
+          {preview}
+        </span>
+      </span>
+      <span className="shrink-0 text-xs font-medium text-muted-foreground">
+        {status}
+      </span>
+    </button>
+  );
+}
+
 type InboxListPaneProps = {
   activeReminderEventIds?: ReadonlySet<string>;
   agentPubkeys?: ReadonlySet<string>;
@@ -117,12 +187,15 @@ type InboxListPaneProps = {
   onRemindLater: (item: InboxItem) => void;
   onSelect: (itemId: string) => void;
   onSelectDraft: (draftKey: string) => void;
+  onSelectReminder: (reminderId: string) => void;
   onUnreadOnlyChange: (checked: boolean) => void;
   selectedConversationId: string | null;
   selectedDraftKey: string | null;
   showRightDivider?: boolean;
   dueReminderCount: number;
   reminderPubkey?: string;
+  reminders: readonly Reminder[];
+  selectedReminderId: string | null;
   unreadOnly: boolean;
 };
 
@@ -142,24 +215,41 @@ export function InboxListPane({
   onRemindLater,
   onSelect,
   onSelectDraft,
+  onSelectReminder,
   onUnreadOnlyChange,
   selectedConversationId,
   selectedDraftKey,
   showRightDivider = false,
   dueReminderCount,
   reminderPubkey,
+  reminders,
+  selectedReminderId,
   unreadOnly,
 }: InboxListPaneProps) {
-  const activeFilter = FILTER_OPTIONS.find((option) => option.value === filter);
   const isReminders = filter === "reminders";
   const isDrafts = filter === "drafts";
-  const inboxStatusLabel =
-    dueReminderCount > 0
-      ? `${dueReminderCount} due reminder${dueReminderCount === 1 ? "" : "s"}`
-      : activeDraftCount > 0
-        ? `${activeDraftCount} active draft${activeDraftCount === 1 ? "" : "s"}`
-        : null;
+  const isMixedInboxView = filter === "all";
   const scrollRef = React.useRef<HTMLDivElement>(null);
+  const inboxRows = React.useMemo(
+    () =>
+      buildInboxListRows({
+        items,
+        reminders: unreadOnly
+          ? []
+          : reminders.filter((reminder) =>
+              isDue(reminder, Math.floor(Date.now() / 1_000)),
+            ),
+      }),
+    [items, reminders, unreadOnly],
+  );
+  const visibleInboxRows = React.useMemo(
+    () =>
+      isMixedInboxView
+        ? inboxRows
+        : inboxRows.filter((row) => row.kind === "inbox"),
+    [inboxRows, isMixedInboxView],
+  );
+  const reminderSources = useReminderSources(reminders);
   const unreadVisibleItemCount = React.useMemo(
     () =>
       items.reduce((count, item) => count + (doneSet.has(item.id) ? 0 : 1), 0),
@@ -173,10 +263,14 @@ export function InboxListPane({
     }
   }, [doneSet, items, onMarkRead]);
 
-  const renderItem = (item: InboxItem) => {
+  const renderItem = (item: InboxItem, dueReminder?: Reminder) => {
     const isSelected = item.conversationId === selectedConversationId;
     const isDone = doneSet.has(item.id);
-    const hasActiveReminder = activeReminderEventIds?.has(item.id) ?? false;
+    const hasActiveReminder =
+      dueReminder !== undefined ||
+      [item.id, ...item.groupItems.map((groupItem) => groupItem.id)].some(
+        (eventId) => activeReminderEventIds?.has(eventId) ?? false,
+      );
     const hasChannelTarget = Boolean(item.item.channelId);
     const typeLabel = getInboxTypeLabel(item);
     const isSenderAgent =
@@ -282,14 +376,28 @@ export function InboxListPane({
                       className="h-1.5 w-1.5 rounded-full bg-primary"
                     />
                   ) : null}
+                  {item.unreadCount > 1 ? (
+                    <span data-testid="home-inbox-unread-count">
+                      {item.unreadCount} unread
+                    </span>
+                  ) : null}
                   {item.timestampLabel}
                 </span>
               </div>
-              <ActivityLabel
+              <InboxLabel
                 isActionRequired={item.isActionRequired}
                 isDone={isDone}
                 label={typeLabel}
               />
+              {dueReminder ? (
+                <div
+                  className="mt-1 flex items-center gap-1 text-2xs font-medium text-amber-600/80 dark:text-amber-300/80"
+                  data-testid="home-inbox-reminder-due"
+                >
+                  <Bell className="h-3 w-3" />
+                  Reminder due
+                </div>
+              ) : null}
 
               <div
                 className={cn(
@@ -427,7 +535,7 @@ export function InboxListPane({
                       className="text-sm font-medium text-foreground"
                       htmlFor="inbox-unread-only-switch"
                     >
-                      Show unread
+                      Show unread only
                     </label>
                     <Switch
                       checked={unreadOnly}
@@ -456,71 +564,13 @@ export function InboxListPane({
               </Popover>
             </div>
             <div className="order-1 flex shrink-0 items-center justify-start">
-              <DropdownMenu>
-                <DropdownMenuTrigger asChild>
-                  <button
-                    aria-label={`Filter inbox: ${activeFilter?.label ?? "All"}${inboxStatusLabel ? `. ${inboxStatusLabel}` : ""}`}
-                    className={cn(
-                      INBOX_HEADER_ICON_BUTTON_CLASS,
-                      "relative -ml-2 w-auto gap-1 px-2 text-sm font-medium text-foreground",
-                    )}
-                    data-testid="inbox-filter-trigger"
-                    type="button"
-                  >
-                    <span>{activeFilter?.label ?? "All"}</span>
-                    <ChevronDown className="h-4 w-4 text-muted-foreground" />
-                    {dueReminderCount > 0 ? (
-                      <span
-                        aria-hidden="true"
-                        className="absolute right-1.5 top-0 h-1.5 w-1.5 rounded-full bg-primary ring-2 ring-background"
-                        data-testid="inbox-reminder-badge"
-                      />
-                    ) : activeDraftCount > 0 ? (
-                      <span
-                        aria-hidden="true"
-                        className="absolute right-1.5 top-0 h-1.5 w-1.5 rounded-full bg-primary ring-2 ring-background"
-                        data-testid="inbox-draft-badge"
-                      />
-                    ) : null}
-                  </button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent align="start" className="w-48">
-                  <DropdownMenuRadioGroup
-                    onValueChange={(value) =>
-                      onFilterChange(value as InboxFilter)
-                    }
-                    value={filter}
-                  >
-                    {FILTER_OPTIONS.map((option) => (
-                      <DropdownMenuRadioItem
-                        key={option.value}
-                        value={option.value}
-                      >
-                        <span className="flex flex-1 items-center justify-between gap-2">
-                          {option.label}
-                          {option.value === "reminders" &&
-                          dueReminderCount > 0 ? (
-                            <span
-                              className="inline-flex h-4 min-w-4 items-center justify-center rounded-full bg-primary px-1 text-2xs font-semibold leading-none text-primary-foreground"
-                              data-testid="inbox-reminder-badge-option"
-                            >
-                              {dueReminderCount}
-                            </span>
-                          ) : option.value === "drafts" &&
-                            activeDraftCount > 0 ? (
-                            <span
-                              className="inline-flex h-4 min-w-4 items-center justify-center rounded-full bg-primary px-1 text-2xs font-semibold leading-none text-primary-foreground"
-                              data-testid="inbox-draft-badge-option"
-                            >
-                              {activeDraftCount}
-                            </span>
-                          ) : null}
-                        </span>
-                      </DropdownMenuRadioItem>
-                    ))}
-                  </DropdownMenuRadioGroup>
-                </DropdownMenuContent>
-              </DropdownMenu>
+              <InboxFilterMenu
+                activeDraftCount={activeDraftCount}
+                dueReminderCount={dueReminderCount}
+                filter={filter}
+                onFilterChange={onFilterChange}
+                reminderCount={reminders.length}
+              />
             </div>
           </div>
         </div>
@@ -532,7 +582,12 @@ export function InboxListPane({
           data-testid="home-inbox-reminders"
         >
           {reminderPubkey ? (
-            <RemindersPanel includeDone pubkey={reminderPubkey} />
+            <RemindersPanel
+              onSelectReminder={onSelectReminder}
+              presentation="inbox-list"
+              pubkey={reminderPubkey}
+              selectedReminderId={selectedReminderId}
+            />
           ) : null}
         </div>
       ) : isDrafts ? (
@@ -553,27 +608,62 @@ export function InboxListPane({
           data-testid="home-inbox-list"
           ref={scrollRef}
         >
-          {items.length === 0 ? (
+          {visibleInboxRows.length > 0 ? (
+            <VirtualizedList
+              estimateSize={96}
+              getItemKey={(row) => row.key}
+              items={visibleInboxRows}
+              renderItem={(row) => {
+                if (row.kind === "inbox") {
+                  return renderItem(row.item, row.dueReminder);
+                }
+
+                const source = reminderSources.get(row.reminder.id);
+                return (
+                  <PersonalItemRow
+                    id={row.reminder.id}
+                    location={
+                      source?.channel
+                        ? source.channel.channelType === "dm"
+                          ? {
+                              text: `In DM with ${source.channelLabel}`,
+                              channelLabel: null,
+                            }
+                          : { text: "In", channelLabel: source.channelLabel }
+                        : null
+                    }
+                    onClick={() => {
+                      onSelectReminder(row.reminder.id);
+                    }}
+                    preview={
+                      row.reminder.content.target?.preview ||
+                      row.reminder.content.note ||
+                      "Reminder"
+                    }
+                    selected={selectedReminderId === row.reminder.id}
+                    status={formatReminderStatus(row.reminder.notBefore)}
+                  />
+                );
+              }}
+              scrollRef={scrollRef}
+            />
+          ) : (
             <div className="flex h-full min-h-64 items-center justify-center px-6 text-center">
               <div>
                 <p className="text-sm font-medium text-foreground">
-                  {unreadOnly ? "No unread messages" : "No messages found"}
+                  {unreadOnly
+                    ? INBOX_UNREAD_EMPTY_STATE_TITLES[filter]
+                    : INBOX_EMPTY_STATE_TITLES[filter]}
                 </p>
                 <p className="mt-1 text-sm text-muted-foreground">
                   {unreadOnly
-                    ? "Turn off the unread filter to see read messages."
-                    : "Switch back to all mail to see more messages."}
+                    ? "Turn off Show unread only to see read activity."
+                    : filter === "all"
+                      ? "New activity will appear here."
+                      : "Switch back to All to see other activity."}
                 </p>
               </div>
             </div>
-          ) : (
-            <VirtualizedList
-              estimateSize={96}
-              getItemKey={(item) => item.id}
-              items={items}
-              renderItem={renderItem}
-              scrollRef={scrollRef}
-            />
           )}
         </div>
       )}
diff --git a/desktop/src/features/home/ui/InboxMessageRow.tsx b/desktop/src/features/home/ui/InboxMessageRow.tsx
index aaad2bcbd9..04deafb3ff 100644
--- a/desktop/src/features/home/ui/InboxMessageRow.tsx
+++ b/desktop/src/features/home/ui/InboxMessageRow.tsx
@@ -9,6 +9,7 @@ import { getConfigNudgeAuthorPubkey } from "@/features/messages/ui/configNudgeAu
 import { MessageActionBar } from "@/features/messages/ui/MessageActionBar";
 import { MessageAgentOwner } from "@/features/messages/ui/MessageAgentOwner";
 import { MessageReactions } from "@/features/messages/ui/MessageReactions";
+import { UnreadDivider } from "@/features/messages/ui/UnreadDivider";
 import { useReactionHandler } from "@/features/messages/ui/useReactionHandler";
 import { useMessageEmoji } from "@/features/messages/lib/useMessageEmoji";
 import { UserProfilePopover } from "@/features/profile/ui/UserProfilePopover";
@@ -36,6 +37,7 @@ type InboxMessageRowProps = {
     emoji: string,
     remove: boolean,
   ) => Promise<void>;
+  showUnreadBoundary?: boolean;
 };
 
 export function InboxMessageRow({
@@ -48,6 +50,7 @@ export function InboxMessageRow({
   message,
   onSelectReplyTarget,
   onToggleReaction,
+  showUnreadBoundary = false,
 }: InboxMessageRowProps) {
   const timelineMessage = React.useMemo(
     () => toTimelineMessage(message),
@@ -89,6 +92,7 @@ export function InboxMessageRow({
 
   return (
     <div className="relative px-2">
+      {showUnreadBoundary ? <UnreadDivider /> : null}
       {message.isSelected ? (
         <div
           aria-hidden="true"
diff --git a/desktop/src/features/home/ui/ProjectInboxDetail.tsx b/desktop/src/features/home/ui/ProjectInboxDetail.tsx
new file mode 100644
index 0000000000..c3d17e687e
--- /dev/null
+++ b/desktop/src/features/home/ui/ProjectInboxDetail.tsx
@@ -0,0 +1,129 @@
+import { ArrowLeft } from "lucide-react";
+
+import { useAppNavigation } from "@/app/navigation/useAppNavigation";
+import type { InboxItem } from "@/features/home/lib/inbox";
+import { resolveProjectInboxWorkItem } from "@/features/home/lib/projectInbox";
+import { ProjectInboxDetailPane } from "@/features/home/ui/ProjectInboxDetailPane";
+import {
+  useProjectsQuery,
+  useProjectsWorkItemsQuery,
+} from "@/features/projects/hooks";
+import type { UserProfileLookup } from "@/features/profile/lib/identity";
+import { Button } from "@/shared/ui/button";
+
+type ProjectInboxDetailProps = {
+  isSinglePanelView?: boolean;
+  item: InboxItem;
+  onBack?: () => void;
+  profiles?: UserProfileLookup;
+};
+
+function ProjectInboxStatus({
+  message,
+  onBack,
+  onRetry,
+}: {
+  message: string;
+  onBack?: () => void;
+  onRetry?: () => void;
+}) {
+  return (
+    <section className="flex min-h-0 min-w-0 flex-col bg-background/60">
+      {onBack ? (
+        <div className="flex min-h-13 items-center px-5 py-2">
+          <Button
+            aria-label="Back to Inbox"
+            onClick={onBack}
+            size="icon"
+            type="button"
+            variant="ghost"
+          >
+            <ArrowLeft className="h-4 w-4" />
+          </Button>
+        </div>
+      ) : null}
+      <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 p-6 text-center">
+        <p className="text-sm text-muted-foreground">{message}</p>
+        {onRetry ? (
+          <Button onClick={onRetry} size="sm" type="button" variant="outline">
+            Retry
+          </Button>
+        ) : null}
+      </div>
+    </section>
+  );
+}
+
+/** Resolves and renders the live Buzz Git object selected from Inbox. */
+export function ProjectInboxDetail({
+  isSinglePanelView = false,
+  item,
+  onBack,
+  profiles,
+}: ProjectInboxDetailProps) {
+  const { goProject } = useAppNavigation();
+  const projectsQuery = useProjectsQuery();
+  const projectsWorkItemsQuery = useProjectsWorkItemsQuery(
+    projectsQuery.data ?? [],
+  );
+  const workItem = resolveProjectInboxWorkItem(
+    item.item,
+    projectsWorkItemsQuery.data,
+  );
+
+  if (!workItem) {
+    const error = projectsQuery.error ?? projectsWorkItemsQuery.error;
+    const isLoading =
+      projectsQuery.isLoading || projectsWorkItemsQuery.isLoading;
+    return (
+      <ProjectInboxStatus
+        message={
+          error
+            ? "Could not load this project item."
+            : isLoading
+              ? "Loading project item…"
+              : "This project item could not be found."
+        }
+        onBack={onBack}
+        onRetry={
+          error
+            ? () => {
+                void projectsQuery.refetch();
+                void projectsWorkItemsQuery.refetch();
+              }
+            : undefined
+        }
+      />
+    );
+  }
+
+  const failedSections =
+    workItem.type === "pull-request"
+      ? projectsWorkItemsQuery.data?.pullRequests.failedSections
+      : projectsWorkItemsQuery.data?.issues.failedSections;
+  if (failedSections && failedSections.length > 0) {
+    return (
+      <ProjectInboxStatus
+        message="Some project activity could not be loaded. Actions are unavailable until the item is current."
+        onBack={onBack}
+        onRetry={() => void projectsWorkItemsQuery.refetch()}
+      />
+    );
+  }
+
+  return (
+    <ProjectInboxDetailPane
+      isSinglePanelView={isSinglePanelView}
+      onBack={onBack}
+      onOpenProject={() => {
+        const workItemId =
+          workItem.type === "pull-request"
+            ? { pullRequestId: workItem.pullRequest.id }
+            : { issueId: workItem.issue.id };
+        void goProject(workItem.project.id, workItemId);
+      }}
+      profiles={profiles}
+      workItem={workItem}
+    />
+  );
+}
diff --git a/desktop/src/features/home/ui/ProjectInboxDetailPane.tsx b/desktop/src/features/home/ui/ProjectInboxDetailPane.tsx
new file mode 100644
index 0000000000..5b80c13cb9
--- /dev/null
+++ b/desktop/src/features/home/ui/ProjectInboxDetailPane.tsx
@@ -0,0 +1,178 @@
+import { ArrowLeft, ExternalLink } from "lucide-react";
+import * as React from "react";
+
+import { useCommunities } from "@/features/communities/useCommunities";
+import type { ProjectInboxWorkItem } from "@/features/home/lib/projectInbox";
+import { ProjectIssueDetail } from "@/features/projects/ui/ProjectIssuesPanel";
+import {
+  ProjectPullRequestDetail,
+  PullRequestDetailHeader,
+  PullRequestMetaRail,
+} from "@/features/projects/ui/ProjectPullRequestsPanel";
+import {
+  resolveUserLabel,
+  type UserProfileLookup,
+} from "@/features/profile/lib/identity";
+import { openProjectMergeRecoveryTerminal } from "@/shared/api/projectGit";
+import { useElementWidth } from "@/shared/hooks/use-mobile";
+import { TopChromeInsetHeader } from "@/shared/layout/TopChromeInsetHeader";
+import { cn } from "@/shared/lib/cn";
+import { normalizePubkey } from "@/shared/lib/pubkey";
+import { Button } from "@/shared/ui/button";
+import { UserAvatar } from "@/shared/ui/UserAvatar";
+
+type ProjectInboxDetailPaneProps = {
+  isSinglePanelView?: boolean;
+  onBack?: () => void;
+  onOpenProject: () => void;
+  profiles?: UserProfileLookup;
+  workItem: ProjectInboxWorkItem;
+};
+
+/** Renders a canonical Buzz Git work item with its existing project actions. */
+export function ProjectInboxDetailPane({
+  isSinglePanelView = false,
+  onBack,
+  onOpenProject,
+  profiles,
+  workItem,
+}: ProjectInboxDetailPaneProps) {
+  const { activeCommunity } = useCommunities();
+  const [detailContentRef, detailContentWidth] =
+    useElementWidth<HTMLDivElement>();
+  const showSideRail = detailContentWidth >= 760;
+  const authorPubkey =
+    workItem.type === "pull-request"
+      ? workItem.pullRequest.author
+      : workItem.issue.author;
+  const authorLabel = resolveUserLabel({ profiles, pubkey: authorPubkey });
+  const authorAvatarUrl =
+    profiles?.[normalizePubkey(authorPubkey)]?.avatarUrl ?? null;
+  const inboxTitle = `${authorLabel} sent you ${
+    workItem.type === "pull-request" ? "a pull request" : "an issue"
+  }`;
+  const handleOpenMergeRecoveryTerminal = React.useCallback(
+    async (input: {
+      expectedCommit: string;
+      sourceBranch: string;
+      sourceCloneUrl: string;
+      targetBranch: string;
+    }) => {
+      if (workItem.type !== "pull-request") {
+        throw new Error("Merge recovery is only available for pull requests.");
+      }
+      const targetCloneUrl = workItem.project.cloneUrls[0];
+      if (!targetCloneUrl) {
+        throw new Error("This project has no clone URL.");
+      }
+      return openProjectMergeRecoveryTerminal({
+        ...input,
+        projectDtag: workItem.project.dtag,
+        reposDir: activeCommunity?.reposDir,
+        targetCloneUrl,
+      });
+    },
+    [activeCommunity?.reposDir, workItem],
+  );
+
+  return (
+    <section
+      className="flex min-h-0 min-w-0 flex-col overflow-hidden bg-background/60"
+      data-testid="home-project-inbox-detail"
+    >
+      <TopChromeInsetHeader flush transparent>
+        <div className="px-5 py-2">
+          <div className="flex min-h-9 min-w-0 items-center justify-between gap-3">
+            <div className="flex min-w-0 items-center gap-1">
+              {isSinglePanelView && onBack ? (
+                <Button
+                  aria-label="Back to Inbox"
+                  onClick={onBack}
+                  size="icon"
+                  type="button"
+                  variant="ghost"
+                >
+                  <ArrowLeft className="h-4 w-4" />
+                </Button>
+              ) : null}
+              <UserAvatar
+                avatarUrl={authorAvatarUrl}
+                className="shrink-0"
+                displayName={authorLabel}
+                size="sm"
+                testId="project-inbox-author-avatar"
+              />
+              <h2
+                className="min-w-0 translate-y-px truncate text-sm font-semibold leading-5 tracking-tight text-foreground"
+                title={`${inboxTitle} · ${workItem.project.name}`}
+              >
+                {inboxTitle}
+              </h2>
+            </div>
+            <Button
+              aria-label="Open project"
+              className="shrink-0"
+              onClick={onOpenProject}
+              size={showSideRail ? "sm" : "icon"}
+              title="Open project"
+              type="button"
+              variant="ghost"
+            >
+              <ExternalLink className="h-4 w-4" />
+              {showSideRail ? "Open project" : null}
+            </Button>
+          </div>
+        </div>
+      </TopChromeInsetHeader>
+
+      <div
+        className="min-h-0 flex-1 overflow-y-auto overscroll-contain"
+        ref={detailContentRef}
+      >
+        <div className="p-3">
+          <div
+            className="overflow-hidden rounded-xl border border-border/60 bg-card"
+            data-testid="project-inbox-work-item-card"
+          >
+            {workItem.type === "pull-request" ? (
+              <div
+                className={cn(
+                  "grid",
+                  showSideRail && "grid-cols-[minmax(0,1fr)_18rem]",
+                )}
+                data-testid="project-inbox-work-item-layout"
+              >
+                <div className="min-w-0">
+                  <PullRequestDetailHeader
+                    profiles={profiles}
+                    pullRequest={workItem.pullRequest}
+                  />
+                  <ProjectPullRequestDetail
+                    mode="conversation"
+                    onOpenTerminal={handleOpenMergeRecoveryTerminal}
+                    profiles={profiles}
+                    project={workItem.project}
+                    pullRequest={workItem.pullRequest}
+                  />
+                </div>
+                <PullRequestMetaRail
+                  profiles={profiles}
+                  project={workItem.project}
+                  pullRequest={workItem.pullRequest}
+                  stacked={!showSideRail}
+                />
+              </div>
+            ) : (
+              <ProjectIssueDetail
+                issue={workItem.issue}
+                profiles={profiles}
+                project={workItem.project}
+                stackMetaRail={!showSideRail}
+              />
+            )}
+          </div>
+        </div>
+      </div>
+    </section>
+  );
+}
diff --git a/desktop/src/features/home/useHomeDrafts.ts b/desktop/src/features/home/useHomeDrafts.ts
index faf646d54f..8d9accda61 100644
--- a/desktop/src/features/home/useHomeDrafts.ts
+++ b/desktop/src/features/home/useHomeDrafts.ts
@@ -7,19 +7,21 @@ import {
 } from "@/features/messages/ui/DraftsPanel";
 
 type UseHomeDraftsOptions = {
-  isDrafts: boolean;
+  autoSelect: boolean;
   isNarrowHomeViewport: boolean;
+  selectionEnabled: boolean;
   viewportWidthPx: number;
 };
 
 export function useHomeDrafts({
-  isDrafts,
+  autoSelect,
   isNarrowHomeViewport,
+  selectionEnabled,
   viewportWidthPx,
 }: UseHomeDraftsOptions) {
-  const items = useDraftViewItems(isDrafts);
+  const items = useDraftViewItems(selectionEnabled);
   const optimisticActiveCount = useActiveDraftCount(new Map());
-  const activeCount = isDrafts
+  const activeCount = selectionEnabled
     ? items.filter((item) => item.rootStatus !== "deleted").length
     : optimisticActiveCount;
   const [selectedKey, setSelectedKey] = React.useState<string | null>(null);
@@ -27,10 +29,18 @@ export function useHomeDrafts({
     items.find((item) => item.entry.key === selectedKey) ?? null;
 
   React.useEffect(() => {
-    if (!isDrafts) {
+    if (!selectionEnabled) {
       setSelectedKey(null);
       return;
     }
+    if (
+      selectedKey !== null &&
+      !items.some((item) => item.entry.key === selectedKey)
+    ) {
+      setSelectedKey(null);
+      return;
+    }
+    if (!autoSelect) return;
     if (viewportWidthPx === 0) {
       return;
     }
@@ -41,7 +51,14 @@ export function useHomeDrafts({
       return;
     }
     setSelectedKey(isNarrowHomeViewport ? null : (items[0]?.entry.key ?? null));
-  }, [isDrafts, isNarrowHomeViewport, items, selectedKey, viewportWidthPx]);
+  }, [
+    autoSelect,
+    isNarrowHomeViewport,
+    items,
+    selectedKey,
+    selectionEnabled,
+    viewportWidthPx,
+  ]);
 
   const deleteDraft = React.useCallback(
     (draftKey: string) => {
diff --git a/desktop/src/features/home/useHomeInboxAutoSelection.ts b/desktop/src/features/home/useHomeInboxAutoSelection.ts
new file mode 100644
index 0000000000..1cd738c64c
--- /dev/null
+++ b/desktop/src/features/home/useHomeInboxAutoSelection.ts
@@ -0,0 +1,73 @@
+import * as React from "react";
+
+import type { InboxItem } from "@/features/home/lib/inbox";
+
+type UseHomeInboxAutoSelectionOptions = {
+  coldResolutionPending: boolean;
+  filteredItems: readonly Pick<InboxItem, "conversationId" | "id">[];
+  hasFeed: boolean;
+  hasPersonalSelection: boolean;
+  homeInboxWidthPx: number;
+  isLoading: boolean;
+  isMessagesMode: boolean;
+  isNarrowHomeViewport: boolean;
+  selectedConversationId: string | null;
+  setAutoSelectedEventId: React.Dispatch<React.SetStateAction<string | null>>;
+  urlSelectedItemId: string | null;
+};
+
+export function useHomeInboxAutoSelection({
+  coldResolutionPending,
+  filteredItems,
+  hasFeed,
+  hasPersonalSelection,
+  homeInboxWidthPx,
+  isLoading,
+  isMessagesMode,
+  isNarrowHomeViewport,
+  selectedConversationId,
+  setAutoSelectedEventId,
+  urlSelectedItemId,
+}: UseHomeInboxAutoSelectionOptions) {
+  React.useEffect(() => {
+    if (!isMessagesMode) return;
+
+    if (hasPersonalSelection || urlSelectedItemId !== null) {
+      setAutoSelectedEventId(null);
+      return;
+    }
+
+    if (isLoading || !hasFeed) return;
+
+    if (filteredItems.length === 0) {
+      setAutoSelectedEventId(null);
+      return;
+    }
+
+    // Wait for the width measurement so narrow Home does not cold-load detail.
+    if (homeInboxWidthPx === 0) return;
+
+    const selectedConversationIsVisible =
+      selectedConversationId !== null &&
+      filteredItems.some(
+        (item) => item.conversationId === selectedConversationId,
+      );
+    if (selectedConversationIsVisible || coldResolutionPending) return;
+
+    setAutoSelectedEventId(
+      isNarrowHomeViewport ? null : (filteredItems[0]?.id ?? null),
+    );
+  }, [
+    coldResolutionPending,
+    filteredItems,
+    hasFeed,
+    hasPersonalSelection,
+    homeInboxWidthPx,
+    isLoading,
+    isMessagesMode,
+    isNarrowHomeViewport,
+    selectedConversationId,
+    setAutoSelectedEventId,
+    urlSelectedItemId,
+  ]);
+}
diff --git a/desktop/src/features/home/useHomeInboxContextMessages.ts b/desktop/src/features/home/useHomeInboxContextMessages.ts
new file mode 100644
index 0000000000..b8693c6941
--- /dev/null
+++ b/desktop/src/features/home/useHomeInboxContextMessages.ts
@@ -0,0 +1,87 @@
+import * as React from "react";
+
+import type { InboxContextMessage, InboxItem } from "@/features/home/lib/inbox";
+import {
+  getReactionTargetId,
+  toInboxContextMessage,
+} from "@/features/home/lib/inboxViewHelpers";
+import { formatTimelineMessages } from "@/features/messages/lib/formatTimelineMessages";
+import type { UserProfileLookup } from "@/features/profile/lib/identity";
+import type { Channel, RelayEvent } from "@/shared/api/types";
+import { KIND_REACTION } from "@/shared/constants/kinds";
+
+type UseHomeInboxContextMessagesOptions = {
+  channelMessages?: RelayEvent[];
+  currentPubkey?: string;
+  events: RelayEvent[];
+  ownerProfiles?: UserProfileLookup;
+  profiles?: UserProfileLookup;
+  reactionEvents: RelayEvent[];
+  relaySelfPubkey?: string | null;
+  selectedChannel: Channel | null;
+  selectedEventId: string | null;
+  selectedItem: InboxItem | null;
+};
+
+export function useHomeInboxContextMessages({
+  channelMessages,
+  currentPubkey,
+  events,
+  ownerProfiles,
+  profiles,
+  reactionEvents,
+  relaySelfPubkey,
+  selectedChannel,
+  selectedEventId,
+  selectedItem,
+}: UseHomeInboxContextMessagesOptions): InboxContextMessage[] {
+  return React.useMemo(() => {
+    if (!selectedItem) return [];
+
+    const eventById = new Map(events.map((event) => [event.id, event]));
+    const contextEventIds = new Set(eventById.keys());
+    const contextReactions = [
+      ...(channelMessages ?? []),
+      ...reactionEvents,
+    ].filter((event) => {
+      if (event.kind !== KIND_REACTION) return false;
+      const targetId = getReactionTargetId(event.tags);
+      return Boolean(targetId && contextEventIds.has(targetId));
+    });
+    const currentUserAvatarUrl = currentPubkey
+      ? (profiles?.[currentPubkey.toLowerCase()]?.avatarUrl ?? null)
+      : null;
+    const timelineMessages = formatTimelineMessages(
+      [...events, ...contextReactions],
+      selectedChannel,
+      currentPubkey,
+      currentUserAvatarUrl,
+      profiles,
+      undefined,
+      undefined,
+      undefined,
+      relaySelfPubkey,
+      ownerProfiles,
+    );
+
+    return timelineMessages.map((message) =>
+      toInboxContextMessage(message, {
+        eventById,
+        fallbackAuthorPubkey: selectedItem.item.pubkey,
+        profiles,
+        selectedItemId: selectedEventId ?? selectedItem.id,
+      }),
+    );
+  }, [
+    channelMessages,
+    currentPubkey,
+    events,
+    ownerProfiles,
+    profiles,
+    reactionEvents,
+    relaySelfPubkey,
+    selectedChannel,
+    selectedEventId,
+    selectedItem,
+  ]);
+}
diff --git a/desktop/src/features/home/useHomeInboxReadState.test.mjs b/desktop/src/features/home/useHomeInboxReadState.test.mjs
index a6f4c90bcc..4af181379a 100644
--- a/desktop/src/features/home/useHomeInboxReadState.test.mjs
+++ b/desktop/src/features/home/useHomeInboxReadState.test.mjs
@@ -168,7 +168,7 @@ test("thread inbox row read state includes per-message marker", () => {
   );
 });
 
-test("thread inbox row read state uses newest thread or message marker", () => {
+test("thread inbox row read state follows the per-message marker", () => {
   const replyItem = feedItem({
     id: "reply-event",
     createdAt: 200,
@@ -185,6 +185,30 @@ test("thread inbox row read state uses newest thread or message marker", () => {
       getThreadReadAt: () => 250,
       getMessageReadAt: () => 200,
     }),
-    250,
+    200,
   );
 });
+
+test("parent-only replies use their parent as the thread read context", () => {
+  const replyItem = feedItem({
+    id: "reply-event",
+    createdAt: 200,
+    tags: [
+      ["h", CHANNEL_ID],
+      ["e", "parent-event", "", "reply"],
+    ],
+  });
+  let resolvedRootId = null;
+
+  assert.equal(
+    resolveInboxItemReadAt(inboxItem([replyItem]), {
+      getChannelReadAt: () => 100,
+      getThreadReadAt: (rootId) => {
+        resolvedRootId = rootId;
+        return 150;
+      },
+    }),
+    150,
+  );
+  assert.equal(resolvedRootId, "parent-event");
+});
diff --git a/desktop/src/features/home/useHomeInboxReadState.ts b/desktop/src/features/home/useHomeInboxReadState.ts
index 167c87337a..624e72a0f5 100644
--- a/desktop/src/features/home/useHomeInboxReadState.ts
+++ b/desktop/src/features/home/useHomeInboxReadState.ts
@@ -1,7 +1,6 @@
 import * as React from "react";
 
 import type { InboxItem } from "@/features/home/lib/inbox";
-import { maxReadAt } from "@/features/channels/readState/readStateFormat";
 import {
   getThreadReference,
   isThreadReply,
@@ -29,6 +28,8 @@ type UseHomeInboxReadStateOptions = {
   ) => void;
   /** Advance the thread read marker to the given unix-seconds timestamp. */
   markThreadRead: (rootId: string, timestamp: number) => void;
+  /** Advance a reply's per-message read marker to the given unix-seconds timestamp. */
+  markMessageRead: (messageId: string, timestamp: number) => void;
   /** Local fallback: mark a non-channel item done. */
   markDoneLocal: (id: string) => void;
   /** Local inbox row override: mark an item unread without touching the channel. */
@@ -46,7 +47,8 @@ function getInboxThreadRootId(item: InboxItem): string | null {
     return null;
   }
 
-  return getThreadReference(item.item.tags).rootId;
+  const thread = getThreadReference(item.item.tags);
+  return thread.rootId ?? thread.parentId;
 }
 
 export function getGroupedChannelReadTimestamp(
@@ -95,10 +97,10 @@ export function resolveInboxItemReadAt(
   const channelId = item.item.channelId;
   const threadRootId = getInboxThreadRootId(item);
   if (threadRootId) {
-    return maxReadAt(
-      options.getThreadReadAt(threadRootId, channelId),
-      options.getMessageReadAt?.(item.item.id) ?? null,
-    );
+    if (options.getMessageReadAt) {
+      return options.getMessageReadAt(item.item.id);
+    }
+    return options.getThreadReadAt(threadRootId, channelId);
   }
 
   return channelId ? options.getChannelReadAt(channelId) : null;
@@ -110,9 +112,10 @@ export function resolveInboxItemReadAt(
  * belong to a channel (reminders etc.).
  *
  * "Mark as read" on channel-backed items is routed through `markChannelRead`;
- * thread rows use their own `thread:<root>` marker so they do not affect the
- * sidebar channel dot. "Mark unread" is item-local: it only reopens the
- * specific inbox row and must not light up the channel.
+ * thread rows advance the same per-message markers as the channel thread
+ * panel, plus the aggregate `thread:<root>` marker for compatibility. "Mark
+ * unread" is item-local: it only reopens the specific inbox row and must not
+ * light up the channel.
  */
 export function useHomeInboxReadState({
   items,
@@ -124,6 +127,7 @@ export function useHomeInboxReadState({
   localUnreadSet = EMPTY_ITEM_SET,
   markChannelRead,
   markThreadRead,
+  markMessageRead,
   markDoneLocal,
   markUnreadLocal,
   undoDoneLocal,
@@ -183,6 +187,14 @@ export function useHomeInboxReadState({
       }
       const threadRootId = item ? getInboxThreadRootId(item) : null;
       if (item && threadRootId) {
+        const markedReplyIds = new Set<string>();
+        for (const reply of [item.item, ...item.groupItems]) {
+          if (!isThreadReply(reply.tags) || markedReplyIds.has(reply.id)) {
+            continue;
+          }
+          markedReplyIds.add(reply.id);
+          markMessageRead(reply.id, reply.createdAt);
+        }
         markThreadRead(threadRootId, item.latestActivityAt);
         const groupedChannelRead = getGroupedChannelReadTimestamp(item);
         if (groupedChannelRead) {
@@ -204,7 +216,14 @@ export function useHomeInboxReadState({
       }
       markDoneLocal(itemId);
     },
-    [itemById, markChannelRead, markDoneLocal, markThreadRead, undoUnreadLocal],
+    [
+      itemById,
+      markChannelRead,
+      markDoneLocal,
+      markMessageRead,
+      markThreadRead,
+      undoUnreadLocal,
+    ],
   );
 
   const markItemUnread = React.useCallback(
diff --git a/desktop/src/features/home/useHomePersonalInbox.ts b/desktop/src/features/home/useHomePersonalInbox.ts
new file mode 100644
index 0000000000..5c4fd6037d
--- /dev/null
+++ b/desktop/src/features/home/useHomePersonalInbox.ts
@@ -0,0 +1,90 @@
+import * as React from "react";
+
+import { useHomeDrafts } from "@/features/home/useHomeDrafts";
+import {
+  countDueReminders,
+  useRemindersQuery,
+} from "@/features/reminders/hooks";
+import { groupReminders } from "@/features/reminders/lib/reminderFilters";
+
+type UseHomePersonalInboxOptions = {
+  allowMixedSelection: boolean;
+  currentPubkey?: string;
+  isDrafts: boolean;
+  isNarrowHomeViewport: boolean;
+  isReminders: boolean;
+  viewportWidthPx: number;
+};
+
+export function useHomePersonalInbox({
+  allowMixedSelection,
+  currentPubkey,
+  isDrafts,
+  isNarrowHomeViewport,
+  isReminders,
+  viewportWidthPx,
+}: UseHomePersonalInboxOptions) {
+  const remindersQuery = useRemindersQuery(currentPubkey);
+  const dueReminderCount = countDueReminders(remindersQuery.data ?? []);
+  const pendingReminders = React.useMemo(
+    () =>
+      groupReminders(remindersQuery.data ?? []).flatMap(
+        (group) => group.reminders,
+      ),
+    [remindersQuery.data],
+  );
+  const [selectedReminderId, selectReminder] = React.useState<string | null>(
+    null,
+  );
+  const selectedReminder =
+    pendingReminders.find((reminder) => reminder.id === selectedReminderId) ??
+    null;
+
+  React.useEffect(() => {
+    const selectionEnabled = isReminders || allowMixedSelection;
+    if (!selectionEnabled) {
+      selectReminder(null);
+      return;
+    }
+    if (
+      selectedReminderId !== null &&
+      !pendingReminders.some((reminder) => reminder.id === selectedReminderId)
+    ) {
+      selectReminder(null);
+      return;
+    }
+    if (!isReminders) return;
+    if (viewportWidthPx === 0 || selectedReminder !== null) return;
+    selectReminder(
+      isNarrowHomeViewport ? null : (pendingReminders[0]?.id ?? null),
+    );
+  }, [
+    allowMixedSelection,
+    isNarrowHomeViewport,
+    isReminders,
+    pendingReminders,
+    selectedReminderId,
+    selectedReminder,
+    viewportWidthPx,
+  ]);
+
+  // Drafts are only listed (and selectable) under the dedicated Drafts
+  // filter — they never appear in the mixed All view.
+  const drafts = useHomeDrafts({
+    autoSelect: isDrafts,
+    isNarrowHomeViewport,
+    selectionEnabled: isDrafts,
+    viewportWidthPx,
+  });
+
+  return {
+    drafts,
+    dueReminderCount,
+    pendingReminders,
+    reminders: {
+      selectedId: selectedReminderId,
+      selectedItem: selectedReminder,
+      select: selectReminder,
+    },
+  };
+}
diff --git a/desktop/src/features/home/useInboxThreadContext.ts b/desktop/src/features/home/useInboxThreadContext.ts
index b3c1da9485..67a46957f9 100644
--- a/desktop/src/features/home/useInboxThreadContext.ts
+++ b/desktop/src/features/home/useInboxThreadContext.ts
@@ -7,10 +7,14 @@ import { relayClient } from "@/shared/api/relayClient";
 import { buildChannelReactionAuxFilter } from "@/shared/api/relayChannelFilters";
 import { getEventById } from "@/shared/api/tauri";
 import type { FeedItem, RelayEvent } from "@/shared/api/types";
-import { HOME_MENTION_EVENT_KINDS } from "@/shared/constants/kinds";
+import {
+  CHANNEL_TIMELINE_CONTENT_KINDS,
+  HOME_MENTION_EVENT_KINDS,
+} from "@/shared/constants/kinds";
 
 type InboxThreadContextResult = {
   events: RelayEvent[];
+  hasLoadError: boolean;
   isLoading: boolean;
   /** kind:7 events referencing the context messages, fetched by `#e`. */
   reactionEvents: RelayEvent[];
@@ -19,6 +23,10 @@ type InboxThreadContextResult = {
 };
 
 const THREAD_CONTEXT_LIMIT = 100;
+const MAX_ANCESTOR_HOPS = 50;
+const CHANNEL_CONTEXT_EVENT_KINDS = new Set<number>(
+  CHANNEL_TIMELINE_CONTENT_KINDS,
+);
 
 function dedupeEvents(events: RelayEvent[]): RelayEvent[] {
   const eventsById = new Map<string, RelayEvent>();
@@ -36,8 +44,14 @@ function getThreadRootId(event: RelayEvent): string {
 export function useInboxThreadContext(
   item: FeedItem | null,
   channelMessages: RelayEvent[] | undefined,
+  options: {
+    fullChannel?: boolean;
+    hasChannelLoadError?: boolean;
+    isChannelLoading?: boolean;
+  } = {},
 ): InboxThreadContextResult {
   const [fetchedEvents, setFetchedEvents] = React.useState<RelayEvent[]>([]);
+  const [hasLoadError, setHasLoadError] = React.useState(false);
   const [isLoading, setIsLoading] = React.useState(false);
 
   const selectedEvent = React.useMemo(
@@ -52,12 +66,14 @@ export function useInboxThreadContext(
     ? getThreadReference(selectedEvent.tags).parentId
     : null;
   const selectedChannelId = item?.channelId ?? null;
+  const fullChannel = options.fullChannel === true;
 
   React.useEffect(() => {
     let isCancelled = false;
 
-    if (!selectedEvent || !selectedThreadRootId) {
+    if (fullChannel || !selectedEvent || !selectedThreadRootId) {
       setFetchedEvents([]);
+      setHasLoadError(false);
       setIsLoading(false);
       return () => {
         isCancelled = true;
@@ -72,6 +88,7 @@ export function useInboxThreadContext(
       }
 
       setIsLoading(true);
+      setHasLoadError(false);
 
       try {
         const selection = {
@@ -80,22 +97,48 @@ export function useInboxThreadContext(
           selectedParentId,
           selectedThreadRootId: threadRootId,
         };
-        const eventIds = new Set<string>([threadRootId]);
-        if (selectedParentId) {
-          eventIds.add(selectedParentId);
-        }
+        const ancestorEventsPromise = (async () => {
+          const eventsById = new Map<string, RelayEvent>();
+          let failed = false;
 
-        const ancestorEventsPromise = Promise.all(
-          [...eventIds]
-            .filter((eventId) => eventId !== targetEvent.id)
-            .map(async (eventId) => {
-              try {
-                return await getEventById(eventId);
-              } catch {
-                return null;
-              }
-            }),
-        );
+          const fetchEvent = async (eventId: string) => {
+            if (eventId === targetEvent.id || eventsById.has(eventId)) {
+              return eventsById.get(eventId) ?? targetEvent;
+            }
+
+            try {
+              const event = await getEventById(eventId);
+              eventsById.set(event.id, event);
+              return event;
+            } catch {
+              failed = true;
+              return null;
+            }
+          };
+
+          if (threadRootId !== targetEvent.id) {
+            await fetchEvent(threadRootId);
+          }
+
+          let ancestorId = selectedParentId;
+          const seen = new Set<string>([targetEvent.id]);
+          let hops = 0;
+          while (
+            ancestorId &&
+            !seen.has(ancestorId) &&
+            hops < MAX_ANCESTOR_HOPS
+          ) {
+            seen.add(ancestorId);
+            const ancestor = await fetchEvent(ancestorId);
+            if (!ancestor || ancestorId === threadRootId) {
+              break;
+            }
+            ancestorId = getThreadReference(ancestor.tags).parentId;
+            hops += 1;
+          }
+
+          return { events: [...eventsById.values()], failed };
+        })();
 
         const descendantEventsPromise =
           selectedChannelId && threadRootId
@@ -106,9 +149,18 @@ export function useInboxThreadContext(
                   kinds: [...HOME_MENTION_EVENT_KINDS],
                   limit: THREAD_CONTEXT_LIMIT,
                 })
-                .catch(() => [])
-            : Promise.resolve([]);
-        const [ancestorEvents, descendantEvents] = await Promise.all([
+                .then((events) => ({ events, failed: false }))
+                .catch((error) => {
+                  console.error(
+                    "Failed to hydrate Inbox thread context",
+                    selectedChannelId,
+                    threadRootId,
+                    error,
+                  );
+                  return { events: [] as RelayEvent[], failed: true };
+                })
+            : Promise.resolve({ events: [] as RelayEvent[], failed: false });
+        const [ancestorResult, descendantResult] = await Promise.all([
           ancestorEventsPromise,
           descendantEventsPromise,
         ]);
@@ -117,14 +169,20 @@ export function useInboxThreadContext(
           return;
         }
 
+        setHasLoadError(ancestorResult.failed || descendantResult.failed);
         setFetchedEvents(
           dedupeEvents(
-            [...ancestorEvents, ...descendantEvents].filter(
+            [...ancestorResult.events, ...descendantResult.events].filter(
               (event): event is RelayEvent =>
                 event !== null && isInboxThreadContextEvent(event, selection),
             ),
           ),
         );
+      } catch (error) {
+        if (!isCancelled) {
+          console.error("Failed to load Inbox message context", error);
+          setHasLoadError(true);
+        }
       } finally {
         if (!isCancelled) {
           setIsLoading(false);
@@ -142,6 +200,7 @@ export function useInboxThreadContext(
     selectedEvent,
     selectedParentId,
     selectedThreadRootId,
+    fullChannel,
   ]);
 
   const events = React.useMemo(() => {
@@ -149,6 +208,15 @@ export function useInboxThreadContext(
       return [];
     }
 
+    if (fullChannel) {
+      return dedupeEvents([
+        selectedEvent,
+        ...(channelMessages ?? []).filter((event) =>
+          CHANNEL_CONTEXT_EVENT_KINDS.has(event.kind),
+        ),
+      ]);
+    }
+
     const localContext = (channelMessages ?? []).filter((event) => {
       return isInboxThreadContextEvent(event, {
         selectedChannelId,
@@ -175,6 +243,7 @@ export function useInboxThreadContext(
   }, [
     channelMessages,
     fetchedEvents,
+    fullChannel,
     selectedChannelId,
     selectedEvent,
     selectedParentId,
@@ -240,7 +309,10 @@ export function useInboxThreadContext(
 
   return {
     events,
-    isLoading,
+    hasLoadError: fullChannel
+      ? options.hasChannelLoadError === true
+      : hasLoadError,
+    isLoading: fullChannel ? options.isChannelLoading === true : isLoading,
     reactionEvents,
     refreshReactions,
   };
diff --git a/desktop/src/features/home/useOwnedAgentPubkeys.ts b/desktop/src/features/home/useOwnedAgentPubkeys.ts
new file mode 100644
index 0000000000..8fe614156d
--- /dev/null
+++ b/desktop/src/features/home/useOwnedAgentPubkeys.ts
@@ -0,0 +1,17 @@
+import * as React from "react";
+
+import { useManagedAgentsQuery } from "@/features/agents/hooks";
+import { mergeOwnedAgentPubkeys } from "@/features/agents/knownAgentPubkeys";
+import type { UserProfileLookup } from "@/features/profile/lib/identity";
+
+export function useOwnedAgentPubkeys(
+  enabled: boolean,
+  profiles: UserProfileLookup | undefined,
+  currentPubkey: string | undefined,
+) {
+  const managedAgents = useManagedAgentsQuery({ enabled }).data;
+  return React.useMemo(
+    () => mergeOwnedAgentPubkeys(managedAgents, profiles, currentPubkey),
+    [currentPubkey, managedAgents, profiles],
+  );
+}
diff --git a/desktop/src/features/mesh-compute/shareToggleState.ts b/desktop/src/features/mesh-compute/shareToggleState.ts
index e0a9b1fc44..58c81139a1 100644
--- a/desktop/src/features/mesh-compute/shareToggleState.ts
+++ b/desktop/src/features/mesh-compute/shareToggleState.ts
@@ -21,13 +21,14 @@ export type MeshShareToggleModel = {
   isSharing: boolean;
   /**
    * A client-mode runtime occupies the single slot (this machine is consuming
-   * a peer's compute). The Share switch must read off + disabled while true.
+   * a peer's compute). The Share switch reads off while true, but the member
+   * may replace this client with a serve runtime by turning sharing on.
    */
   isConsuming: boolean;
   /**
    * ANY runtime occupies the single slot (serve or client, healthy or failed).
-   * A fresh `mesh_start_node` fails with "already running" while true, so the
-   * switch must not offer a start — only a stop of an existing serve node.
+   * This remains useful for disabling edits around an existing serve runtime;
+   * the backend supports the intentional client-to-serve replacement.
    */
   slotOccupied: boolean;
 };
diff --git a/desktop/src/features/mesh-compute/ui/MeshComputeSettingsCard.tsx b/desktop/src/features/mesh-compute/ui/MeshComputeSettingsCard.tsx
index 30c543e245..76f86f8054 100644
--- a/desktop/src/features/mesh-compute/ui/MeshComputeSettingsCard.tsx
+++ b/desktop/src/features/mesh-compute/ui/MeshComputeSettingsCard.tsx
@@ -124,22 +124,21 @@ export function MeshComputeSettingsCard() {
     };
   }, []);
 
-  // Mirror the running node's modelId back into the field so the card shows
-  // what's ACTUALLY being served — not just on a fresh load (empty field) but
-  // whenever the served model differs from the field (e.g. the member switched
-  // models and the node restarted on the new one). This is safe from clobbering
-  // a mid-edit because the field is disabled whenever the slot is occupied
-  // (`controlsDisabled`), so the user can't be typing while a node is running.
+  // Mirror only a SERVE runtime's model into the field. A client reports the
+  // remote model it is consuming; copying that value here both loses the
+  // member's local sharing choice and can cause this machine to download the
+  // remote member's much larger model when sharing is enabled.
   React.useEffect(() => {
     if (
       status?.state === "running" &&
+      status.mode === "serve" &&
       status.modelId &&
       status.modelId !== modelInput
     ) {
       setModelInput(status.modelId);
       writeDraft(MODEL_DRAFT_STORAGE_KEY, status.modelId);
     }
-  }, [status?.state, status?.modelId, modelInput]);
+  }, [status?.state, status?.mode, status?.modelId, modelInput]);
 
   // The Share toggle reflects ONLY serve-mode occupancy. A client-mode runtime
   // (this machine consuming a peer's compute) shares the single runtime slot
@@ -151,14 +150,12 @@ export function MeshComputeSettingsCard() {
   // actively sharing (serve mode). Read-only; reads the node's own metrics.
   const servingUsage = useMeshServingUsage(isSharing);
   const servingIndicator = deriveServingIndicator(servingUsage, isSharing);
-  // Any occupying runtime (serve or client, healthy or failed) locks the model
-  // inputs and blocks a fresh start — stop it before reconfiguring.
-  const controlsDisabled = slotOccupied || actionInFlight;
+  // A consuming client may be intentionally replaced by a serve runtime, so
+  // keep the local model controls available in client mode. Serve and unknown
+  // occupants remain locked until stopped/recovered.
+  const controlsDisabled = actionInFlight || (slotOccupied && !isConsuming);
   const refClass = classifyModelRef(modelInput);
-  const canStart =
-    refClass.kind !== "unknown" &&
-    !actionInFlight &&
-    status?.state !== "starting";
+  const canStart = refClass.kind !== "unknown" && !actionInFlight;
 
   async function handleToggle(next: boolean) {
     // Never let the Share switch tear down a consume session. The switch is
@@ -260,13 +257,15 @@ export function MeshComputeSettingsCard() {
             checked={isSharing}
             data-testid="mesh-share-compute-toggle"
             disabled={
-              // When the slot is occupied, the switch is only actionable if
-              // WE are sharing (so it can stop a serve node — even a failed
-              // one). Any other occupant (consuming, or an unexpected
-              // modeless-running node) would make a fresh start throw "already
-              // running", so keep it disabled. When the slot is empty, gate on
-              // a valid model ref.
-              actionInFlight || (slotOccupied ? !isSharing : !canStart)
+              // A serve node can always be stopped. An off node or consuming
+              // client can start sharing once a valid local model is selected.
+              // Unknown occupants remain protected from replacement.
+              actionInFlight ||
+              (isSharing
+                ? false
+                : slotOccupied && !isConsuming
+                  ? true
+                  : !canStart)
             }
             id="mesh-share-compute-toggle"
             onCheckedChange={handleToggle}
@@ -563,14 +562,13 @@ function StatusLine({
     return <p className="text-sm text-muted-foreground">Stopping…</p>;
   }
   // A client-mode runtime owns the single slot: this machine is consuming a
-  // peer's compute, not sharing. Explain why Share is off + disabled instead
-  // of showing the misleading "Sharing … with relay members" serve copy. The
-  // client node is app-session-lived infra with no user stop control, so the
-  // copy states the fact rather than promising an action that doesn't exist.
+  // peer's compute, not sharing. The switch stays off, but remains available
+  // so the member can replace the client with a serving runtime.
   if (isConsuming) {
     return (
       <p className="text-sm text-muted-foreground">
-        This machine is currently using another member's shared compute.
+        This machine is currently using another member's shared compute. Turn on
+        sharing to switch to the selected local model; Buzz may briefly restart.
       </p>
     );
   }
diff --git a/desktop/src/features/messages/lib/imetaMediaMarkdown.ts b/desktop/src/features/messages/lib/imetaMediaMarkdown.ts
index d988db9dd5..3e16cb332d 100644
--- a/desktop/src/features/messages/lib/imetaMediaMarkdown.ts
+++ b/desktop/src/features/messages/lib/imetaMediaMarkdown.ts
@@ -26,7 +26,7 @@
  */
 
 import type { BlobDescriptor } from "@/shared/api/tauri";
-import { parseImetaTags } from "./parseImeta";
+import { parseImetaTags } from "@/shared/ui/markdown/parseImeta";
 
 export type ImetaMedia = BlobDescriptor & {
   /** Composer-only label used for attachment links; not emitted in imeta. */
diff --git a/desktop/src/features/messages/lib/messageSnapshot.ts b/desktop/src/features/messages/lib/messageSnapshot.ts
index a62d877b04..d4a183c2ff 100644
--- a/desktop/src/features/messages/lib/messageSnapshot.ts
+++ b/desktop/src/features/messages/lib/messageSnapshot.ts
@@ -17,6 +17,7 @@
 import { mergeTimelineHistoryMessages } from "@/features/messages/lib/messageQueryKeys";
 import { normalizeRelayUrl } from "@/features/profile/lib/selfProfileStorage";
 import type { RelayEvent } from "@/shared/api/types";
+import { setLocalStorageItemWithRecovery } from "@/shared/lib/localStorageQuota";
 
 const STORAGE_KEY_PREFIX = "buzz-channel-messages.v1";
 
@@ -147,7 +148,7 @@ export function writeMessageSnapshot(
     }
 
     evictOldestSnapshots(relayPrefix(relayUrl), key);
-    window.localStorage.setItem(
+    setLocalStorageItemWithRecovery(
       key,
       JSON.stringify({
         version: 1,
diff --git a/desktop/src/features/messages/lib/rowHeightEstimate.ts b/desktop/src/features/messages/lib/rowHeightEstimate.ts
index 56dd018275..f2fb268167 100644
--- a/desktop/src/features/messages/lib/rowHeightEstimate.ts
+++ b/desktop/src/features/messages/lib/rowHeightEstimate.ts
@@ -3,7 +3,7 @@ import type * as React from "react";
 import { dimensionsFromDim } from "@/shared/ui/markdown/utils";
 import type { TimelineItem } from "./timelineItems";
 import type { TimelineMessage } from "../types";
-import { parseImetaTags } from "./parseImeta";
+import { parseImetaTags } from "@/shared/ui/markdown/parseImeta";
 
 /**
  * Estimate a timeline row's rendered height so its `content-visibility`
diff --git a/desktop/src/features/messages/lib/selectionBlockFormatting.test.mjs b/desktop/src/features/messages/lib/selectionBlockFormatting.test.mjs
new file mode 100644
index 0000000000..75d04cdde3
--- /dev/null
+++ b/desktop/src/features/messages/lib/selectionBlockFormatting.test.mjs
@@ -0,0 +1,230 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { getSchema, Node } from "@tiptap/core";
+import StarterKit from "@tiptap/starter-kit";
+import { EditorState, TextSelection } from "@tiptap/pm/state";
+
+import { CustomEmojiNode } from "./customEmojiNode.ts";
+
+import {
+  isolateSelectionForBlockFormatting,
+  mergeSelectedTextblocksIntoCodeBlock,
+  splitSelectedLinesForListFormatting,
+} from "./selectionBlockFormatting.ts";
+
+// Matching useRichTextEditor's StarterKit configuration (minus things
+// irrelevant to block isolation).
+const MentionNode = Node.create({
+  name: "mention",
+  group: "inline",
+  inline: true,
+  atom: true,
+  addAttributes: () => ({ label: { default: "" } }),
+});
+const UnknownLeaf = Node.create({
+  name: "unknownLeaf",
+  group: "inline",
+  inline: true,
+  atom: true,
+  addAttributes: () => ({ internalId: { default: "secret" } }),
+});
+
+const schema = getSchema([
+  StarterKit.configure({
+    hardBreak: { keepMarks: true },
+    heading: false,
+    trailingNode: false,
+    link: false,
+  }),
+  MentionNode,
+  CustomEmojiNode.configure({
+    resolveUrl: () => undefined,
+    shortcodes: () => [],
+  }),
+  UnknownLeaf,
+]);
+
+const para = (...content) => schema.nodes.paragraph.create(null, content);
+const br = () => schema.nodes.hardBreak.create();
+const t = (text) => schema.text(text);
+
+function doc(...content) {
+  return schema.nodes.doc.create(null, content);
+}
+
+function stateWithCaret(documentNode, caret) {
+  return EditorState.create({
+    doc: documentNode,
+    selection: TextSelection.create(documentNode, caret),
+  });
+}
+
+function paragraphTexts(documentNode) {
+  const texts = [];
+  documentNode.forEach((node) => {
+    texts.push(node.textContent);
+  });
+  return texts;
+}
+
+test("caret between hard breaks isolates only its line", () => {
+  // <p>before␍target␍after</p> with the caret inside "target".
+  const state = stateWithCaret(
+    doc(para(t("before"), br(), t("target"), br(), t("after"))),
+    10,
+  );
+
+  const transaction = state.tr;
+  assert.equal(isolateSelectionForBlockFormatting(transaction), true);
+
+  const next = state.apply(transaction);
+  assert.deepEqual(paragraphTexts(next.doc), ["before", "target", "after"]);
+  assert.equal(next.selection.empty, true);
+  assert.equal(next.selection.$from.parent.textContent, "target");
+});
+
+test("caret on an empty trailing line isolates an empty paragraph", () => {
+  // "before" + Shift+Enter, caret at the end — the reported bug shape.
+  const state = stateWithCaret(doc(para(t("before"), br())), 8);
+
+  const transaction = state.tr;
+  assert.equal(isolateSelectionForBlockFormatting(transaction), true);
+
+  const next = state.apply(transaction);
+  assert.deepEqual(paragraphTexts(next.doc), ["before", ""]);
+  assert.equal(next.selection.empty, true);
+  assert.equal(next.selection.$from.parent.textContent, "");
+});
+
+test("caret on the first line splits only after that line", () => {
+  const state = stateWithCaret(doc(para(t("first"), br(), t("rest"))), 3);
+
+  const transaction = state.tr;
+  assert.equal(isolateSelectionForBlockFormatting(transaction), true);
+
+  const next = state.apply(transaction);
+  assert.deepEqual(paragraphTexts(next.doc), ["first", "rest"]);
+  assert.equal(next.selection.$from.parent.textContent, "first");
+});
+
+test("caret on the last line splits only before that line", () => {
+  const state = stateWithCaret(doc(para(t("rest"), br(), t("last"))), 8);
+
+  const transaction = state.tr;
+  assert.equal(isolateSelectionForBlockFormatting(transaction), true);
+
+  const next = state.apply(transaction);
+  assert.deepEqual(paragraphTexts(next.doc), ["rest", "last"]);
+  assert.equal(next.selection.$from.parent.textContent, "last");
+});
+
+test("caret in a single-line paragraph is a no-op", () => {
+  const state = stateWithCaret(doc(para(t("only line"))), 4);
+
+  const transaction = state.tr;
+  assert.equal(isolateSelectionForBlockFormatting(transaction), false);
+  assert.equal(transaction.steps.length, 0);
+});
+
+test("exact block-boundary selection excludes endpoint paragraphs", () => {
+  const documentNode = doc(para(t("alpha")), para(t("beta")), para(t("gamma")));
+  for (const backward of [false, true]) {
+    const state = EditorState.create({
+      doc: documentNode,
+      selection: TextSelection.create(
+        documentNode,
+        backward ? 14 : 6,
+        backward ? 6 : 14,
+      ),
+    });
+    const transaction = state.tr;
+    isolateSelectionForBlockFormatting(transaction);
+    assert.equal(mergeSelectedTextblocksIntoCodeBlock(transaction), true);
+    const next = state.apply(transaction);
+    assert.deepEqual(
+      next.doc.toJSON(),
+      doc(
+        para(t("alpha")),
+        schema.nodes.codeBlock.create(null, t("beta")),
+        para(t("gamma")),
+      ).toJSON(),
+    );
+  }
+});
+
+test("selection isolation still splits around the selected text", () => {
+  const documentNode = doc(para(t("before selected after")));
+  const state = EditorState.create({
+    doc: documentNode,
+    // "selected" spans positions 8..16.
+    selection: TextSelection.create(documentNode, 8, 16),
+  });
+
+  const transaction = state.tr;
+  assert.equal(isolateSelectionForBlockFormatting(transaction), true);
+
+  const next = state.apply(transaction);
+  assert.deepEqual(paragraphTexts(next.doc), ["before ", "selected", " after"]);
+  assert.equal(
+    next.doc.textBetween(next.selection.from, next.selection.to),
+    "selected",
+  );
+});
+
+test("list splitting turns selected hard breaks into separate textblocks", () => {
+  const documentNode = doc(para(t("one"), br(), t("two"), br(), t("three")));
+  const state = EditorState.create({
+    doc: documentNode,
+    selection: TextSelection.create(documentNode, 1, 14),
+  });
+
+  const transaction = state.tr;
+  assert.equal(splitSelectedLinesForListFormatting(transaction), true);
+  const next = state.apply(transaction);
+  assert.deepEqual(paragraphTexts(next.doc), ["one", "two", "three"]);
+});
+
+test("code merge preserves hard breaks", () => {
+  const documentNode = doc(para(t("one"), br(), t("two")), para(t("three")));
+  const state = EditorState.create({
+    doc: documentNode,
+    selection: TextSelection.create(
+      documentNode,
+      1,
+      documentNode.content.size - 1,
+    ),
+  });
+
+  const transaction = state.tr;
+  assert.equal(mergeSelectedTextblocksIntoCodeBlock(transaction), true);
+  const next = state.apply(transaction);
+  assert.equal(next.doc.firstChild.type.name, "codeBlock");
+  assert.equal(next.doc.firstChild.textContent, "one\ntwo\nthree");
+});
+
+test("code merge preserves meaningful inline atoms and drops unknown leaves", () => {
+  const documentNode = doc(
+    para(
+      t("hello "),
+      schema.nodes.mention.create({ label: "@Taylor Ho" }),
+      t(" "),
+      schema.nodes.customEmoji.create({ shortcode: "party" }),
+      schema.nodes.unknownLeaf.create(),
+    ),
+  );
+  const state = EditorState.create({
+    doc: documentNode,
+    selection: TextSelection.create(
+      documentNode,
+      1,
+      documentNode.content.size - 1,
+    ),
+  });
+
+  const transaction = state.tr;
+  assert.equal(mergeSelectedTextblocksIntoCodeBlock(transaction), true);
+  const next = state.apply(transaction);
+  assert.equal(next.doc.firstChild.textContent, "hello @Taylor Ho :party:");
+  assert.equal(next.doc.firstChild.textContent.includes("secret"), false);
+});
diff --git a/desktop/src/features/messages/lib/selectionBlockFormatting.ts b/desktop/src/features/messages/lib/selectionBlockFormatting.ts
new file mode 100644
index 0000000000..9d9792ad04
--- /dev/null
+++ b/desktop/src/features/messages/lib/selectionBlockFormatting.ts
@@ -0,0 +1,341 @@
+import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
+import { TextSelection, type Transaction } from "@tiptap/pm/state";
+import { canSplit } from "@tiptap/pm/transform";
+
+function canSplitInsideTextblock(
+  transaction: Transaction,
+  position: number,
+): boolean {
+  const $position = transaction.doc.resolve(position);
+  return (
+    $position.parent.inlineContent &&
+    $position.parentOffset > 0 &&
+    $position.parentOffset < $position.parent.content.size &&
+    canSplit(transaction.doc, position)
+  );
+}
+
+function mapRangeThroughLatestStep(
+  transaction: Transaction,
+  from: number,
+  to: number,
+): { from: number; to: number } {
+  const stepMap = transaction.steps.at(-1)?.getMap();
+  return stepMap
+    ? {
+        from: stepMap.map(from, 1),
+        to: stepMap.map(to, -1),
+      }
+    : { from, to };
+}
+
+/**
+ * Isolate the hard-break-delimited line under a collapsed caret.
+ *
+ * The composer represents Shift+Enter lines as `hardBreak` nodes inside one
+ * paragraph, so a block toggle at a collapsed caret otherwise reformats every
+ * line of the draft. Replacing the line's bordering hard breaks with block
+ * splits gives the caret's line its own textblock, which scopes the following
+ * block toggle to just that line.
+ */
+function isolateCaretLineForBlockFormatting(transaction: Transaction): boolean {
+  const { $from } = transaction.selection;
+  if (!$from.parent.isTextblock || !$from.parent.inlineContent) return false;
+
+  const blockStart = $from.start();
+  const blockEnd = $from.end();
+  let caret = transaction.selection.from;
+
+  let lineFrom = blockStart;
+  let lineTo = blockEnd;
+  $from.parent.forEach((child, offset) => {
+    if (child.type.name !== "hardBreak") return;
+    const breakFrom = blockStart + offset;
+    const breakTo = breakFrom + child.nodeSize;
+    if (breakTo <= caret) lineFrom = breakTo;
+    if (breakFrom >= caret) lineTo = Math.min(lineTo, breakFrom);
+  });
+
+  // No hard breaks around the caret — the line already is the whole
+  // textblock, so the block toggle is correctly scoped as-is.
+  if (lineFrom === blockStart && lineTo === blockEnd) return false;
+
+  const nodeAfterLine = transaction.doc.resolve(lineTo).nodeAfter;
+  if (nodeAfterLine?.type.name === "hardBreak") {
+    transaction.delete(lineTo, lineTo + nodeAfterLine.nodeSize);
+    if (canSplit(transaction.doc, lineTo)) {
+      transaction.split(lineTo);
+      const stepMap = transaction.steps.at(-1)?.getMap();
+      if (stepMap) {
+        caret = stepMap.map(caret, -1);
+        lineFrom = stepMap.map(lineFrom, -1);
+      }
+    }
+  }
+
+  const nodeBeforeLine = transaction.doc.resolve(lineFrom).nodeBefore;
+  if (nodeBeforeLine?.type.name === "hardBreak") {
+    transaction.delete(lineFrom - nodeBeforeLine.nodeSize, lineFrom);
+    let stepMap = transaction.steps.at(-1)?.getMap();
+    if (stepMap) {
+      caret = stepMap.map(caret, 1);
+      lineFrom = stepMap.map(lineFrom, -1);
+    }
+    if (canSplit(transaction.doc, lineFrom)) {
+      transaction.split(lineFrom);
+      stepMap = transaction.steps.at(-1)?.getMap();
+      if (stepMap) caret = stepMap.map(caret, 1);
+    }
+  }
+
+  transaction.setSelection(TextSelection.create(transaction.doc, caret));
+  return true;
+}
+
+function listItemTextRange(
+  $position: Transaction["selection"]["$from"],
+): { from: number; to: number } | null {
+  let itemDepth = -1;
+  for (let depth = $position.depth; depth > 0; depth -= 1) {
+    if ($position.node(depth).type.name === "listItem") {
+      itemDepth = depth;
+      break;
+    }
+  }
+  if (itemDepth < 0) return null;
+
+  const item = $position.node(itemDepth);
+  const itemPosition = $position.before(itemDepth);
+  let from: number | null = null;
+  let to: number | null = null;
+  item.descendants((node, relativePosition) => {
+    if (!node.isTextblock) return true;
+    const position = itemPosition + 1 + relativePosition;
+    from ??= position + 1;
+    to = position + node.nodeSize - 1;
+    return false;
+  });
+  return from === null || to === null ? null : { from, to };
+}
+
+/** Expand partial list endpoint selections to whole list-item textblocks. */
+function expandSelectionToListItems(transaction: Transaction): boolean {
+  const selection = transaction.selection;
+  if (!(selection instanceof TextSelection) || selection.empty) return false;
+
+  const startItem = listItemTextRange(selection.$from);
+  const endItem = listItemTextRange(selection.$to);
+  if (!(startItem || endItem)) return false;
+
+  const isBackward = selection.anchor > selection.head;
+  const from = startItem?.from ?? selection.from;
+  const to = endItem?.to ?? selection.to;
+  transaction.setSelection(
+    TextSelection.create(
+      transaction.doc,
+      isBackward ? to : from,
+      isBackward ? from : to,
+    ),
+  );
+  return true;
+}
+
+export function selectionIncludesList(transaction: Transaction): boolean {
+  const { from, to } = transaction.selection;
+  let includesList = false;
+  transaction.doc.nodesBetween(from, to, (node) => {
+    if (node.type.name === "listItem") {
+      includesList = true;
+      return false;
+    }
+    return !includesList;
+  });
+  return includesList;
+}
+
+function normalizeSelectionBlockBoundaries(transaction: Transaction): boolean {
+  const selection = transaction.selection;
+  if (!(selection instanceof TextSelection) || selection.empty) return false;
+
+  const isBackward = selection.anchor > selection.head;
+  let { from, to } = selection;
+  if (
+    selection.$from.parent.isTextblock &&
+    selection.$from.parentOffset === selection.$from.parent.content.size &&
+    selection.$from.depth > 0
+  ) {
+    from = selection.$from.after();
+  }
+  if (
+    selection.$to.parent.isTextblock &&
+    selection.$to.parentOffset === 0 &&
+    selection.$to.depth > 0
+  ) {
+    to = selection.$to.before();
+  }
+  if (from >= to) return false;
+
+  transaction.setSelection(
+    TextSelection.create(
+      transaction.doc,
+      isBackward ? to : from,
+      isBackward ? from : to,
+    ),
+  );
+  return from !== selection.from || to !== selection.to;
+}
+
+/**
+ * Isolate the current text selection at exact block boundaries.
+ *
+ * ProseMirror's block commands operate on whole textblocks. The composer can
+ * hold an entire draft in one paragraph, so toggling a list or code block for
+ * a substring otherwise formats the whole draft. Splitting at the selection
+ * end and start first gives the selected text its own block while preserving
+ * the surrounding content as sibling paragraphs. A collapsed caret isolates
+ * its hard-break-delimited line so the block format starts at that line.
+ *
+ * This mutates the transaction supplied by a Tiptap command chain so the
+ * isolation and the following block toggle remain one undoable edit.
+ */
+export function isolateSelectionForBlockFormatting(
+  transaction: Transaction,
+): boolean {
+  if (!(transaction.selection instanceof TextSelection)) {
+    return false;
+  }
+
+  if (transaction.selection.empty) {
+    return isolateCaretLineForBlockFormatting(transaction);
+  }
+
+  expandSelectionToListItems(transaction);
+  normalizeSelectionBlockBoundaries(transaction);
+  const isBackward = transaction.selection.anchor > transaction.selection.head;
+  let { from, to } = transaction.selection;
+
+  const nodeAfterSelection = transaction.doc.resolve(to).nodeAfter;
+  if (nodeAfterSelection?.type.name === "hardBreak") {
+    transaction.delete(to, to + nodeAfterSelection.nodeSize);
+    ({ from, to } = mapRangeThroughLatestStep(transaction, from, to));
+  }
+
+  const nodeBeforeSelection = transaction.doc.resolve(from).nodeBefore;
+  if (nodeBeforeSelection?.type.name === "hardBreak") {
+    transaction.delete(from - nodeBeforeSelection.nodeSize, from);
+    ({ from, to } = mapRangeThroughLatestStep(transaction, from, to));
+  }
+
+  if (canSplitInsideTextblock(transaction, to)) {
+    transaction.split(to);
+    ({ from, to } = mapRangeThroughLatestStep(transaction, from, to));
+  }
+
+  if (canSplitInsideTextblock(transaction, from)) {
+    transaction.split(from);
+    ({ from, to } = mapRangeThroughLatestStep(transaction, from, to));
+  }
+
+  transaction.setSelection(
+    TextSelection.create(
+      transaction.doc,
+      isBackward ? to : from,
+      isBackward ? from : to,
+    ),
+  );
+  return true;
+}
+
+/** Split each selected hard-break line into a textblock before list wrapping. */
+export function splitSelectedLinesForListFormatting(
+  transaction: Transaction,
+): boolean {
+  if (!(transaction.selection instanceof TextSelection)) return false;
+  if (transaction.selection.empty) {
+    return isolateCaretLineForBlockFormatting(transaction);
+  }
+
+  const isBackward = transaction.selection.anchor > transaction.selection.head;
+  isolateSelectionForBlockFormatting(transaction);
+  let { from, to } = transaction.selection;
+  const breakPositions: number[] = [];
+
+  transaction.doc.nodesBetween(from, to, (node, position) => {
+    if (node.type.name === "hardBreak") breakPositions.push(position);
+  });
+
+  for (const position of breakPositions.reverse()) {
+    transaction.delete(position, position + 1);
+    ({ from, to } = mapRangeThroughLatestStep(transaction, from, to));
+    if (!canSplit(transaction.doc, position)) continue;
+    transaction.split(position);
+    ({ from, to } = mapRangeThroughLatestStep(transaction, from, to));
+  }
+
+  transaction.setSelection(
+    TextSelection.create(
+      transaction.doc,
+      isBackward ? to : from,
+      isBackward ? from : to,
+    ),
+  );
+  return true;
+}
+
+function selectedTextblocks(
+  transaction: Transaction,
+): Array<{ node: ProseMirrorNode; position: number }> {
+  const blocks: Array<{ node: ProseMirrorNode; position: number }> = [];
+  const { from, to } = transaction.selection;
+  transaction.doc.nodesBetween(from, to, (node, position) => {
+    if (node.isTextblock) {
+      blocks.push({ node, position });
+      return false;
+    }
+    return true;
+  });
+  return blocks;
+}
+
+function leafTextForCode(leaf: ProseMirrorNode): string {
+  if (leaf.type.name === "hardBreak") return "\n";
+
+  const schemaText = leaf.type.spec.leafText?.(leaf);
+  if (schemaText !== undefined) return schemaText;
+
+  // Inline atoms should survive conversion whenever they expose a meaningful
+  // textual identity. Unknown leaves intentionally fall back to an empty
+  // string rather than leaking implementation attributes into user content.
+  const attrs = leaf.attrs as Record<string, unknown>;
+  if (typeof attrs.label === "string") return attrs.label;
+  if (typeof attrs.shortcode === "string") return `:${attrs.shortcode}:`;
+  return "";
+}
+
+function textblockTextForCode(node: ProseMirrorNode): string {
+  return node.textBetween(0, node.content.size, "\n", leafTextForCode);
+}
+
+/** Replace selected textblocks with one newline-joined code block. */
+export function mergeSelectedTextblocksIntoCodeBlock(
+  transaction: Transaction,
+): boolean {
+  if (!(transaction.selection instanceof TextSelection)) return false;
+  if (transaction.selection.empty) return false;
+
+  const blocks = selectedTextblocks(transaction);
+  const codeBlock = transaction.doc.type.schema.nodes.codeBlock;
+  const first = blocks[0];
+  const last = blocks.at(-1);
+  if (!(codeBlock && first && last)) return false;
+
+  const text = blocks.map(({ node }) => textblockTextForCode(node)).join("\n");
+  const from = first.position;
+  const to = last.position + last.node.nodeSize;
+  const content = text ? transaction.doc.type.schema.text(text) : undefined;
+  transaction.replaceWith(from, to, codeBlock.create(null, content));
+  transaction.setSelection(
+    TextSelection.create(transaction.doc, from + 1, from + 1 + text.length),
+  );
+  return true;
+}
diff --git a/desktop/src/features/messages/lib/timelineImagePreload.ts b/desktop/src/features/messages/lib/timelineImagePreload.ts
index 77320e765a..41d5b57324 100644
--- a/desktop/src/features/messages/lib/timelineImagePreload.ts
+++ b/desktop/src/features/messages/lib/timelineImagePreload.ts
@@ -1,6 +1,6 @@
 import { rewriteRelayUrl } from "@/shared/lib/mediaUrl";
+import { parseImetaTags } from "@/shared/ui/markdown/parseImeta";
 import type { TimelineMessage } from "../types";
-import { parseImetaTags } from "./parseImeta";
 
 /**
  * Return non-message-media image URLs worth warming before a virtualized row
diff --git a/desktop/src/features/messages/lib/useEmojiAutocomplete.ts b/desktop/src/features/messages/lib/useEmojiAutocomplete.ts
index 53ef44b28d..57e458bc91 100644
--- a/desktop/src/features/messages/lib/useEmojiAutocomplete.ts
+++ b/desktop/src/features/messages/lib/useEmojiAutocomplete.ts
@@ -4,7 +4,11 @@ import { init, SearchIndex } from "emoji-mart";
 import data from "@emoji-mart/data";
 
 import type { CustomEmoji } from "@/shared/lib/remarkCustomEmoji";
-import { fuzzyStandardEmoji, rankByShortcode } from "@/shared/lib/emojiSearch";
+import {
+  fuzzyStandardEmoji,
+  rankByShortcode,
+  rankShortcodeMatchesFirst,
+} from "@/shared/lib/emojiSearch";
 import { rewriteRelayUrl } from "@/shared/lib/mediaUrl";
 import type { AutocompleteEdit } from "./useRichTextEditor";
 
@@ -18,7 +22,7 @@ export type EmojiSuggestion = {
 
 const EMOJI_DEBOUNCE_MS = 120;
 const MIN_QUERY_LENGTH = 2;
-const MAX_RESULTS = 8;
+const UNLIMITED_RESULTS = Number.POSITIVE_INFINITY;
 
 init({ data });
 
@@ -81,7 +85,7 @@ export function useEmojiAutocomplete(customEmoji: CustomEmoji[] = []) {
       emojiQuery,
       customEmojiRef.current,
       (e) => e.shortcode,
-      MAX_RESULTS,
+      UNLIMITED_RESULTS,
     ).map((e) => ({
       id: e.shortcode,
       name: e.shortcode,
@@ -89,7 +93,10 @@ export function useEmojiAutocomplete(customEmoji: CustomEmoji[] = []) {
       url: rewriteRelayUrl(e.url),
     }));
 
-    SearchIndex.search(emojiQuery)
+    SearchIndex.search(emojiQuery, {
+      caller: "useEmojiAutocomplete",
+      maxResults: UNLIMITED_RESULTS,
+    })
       .then(
         (
           results: Array<{
@@ -106,23 +113,28 @@ export function useEmojiAutocomplete(customEmoji: CustomEmoji[] = []) {
               native: emoji.skins[0]?.native ?? "",
             }))
             .filter((e) => e.native !== "");
-          // Top up remaining slots with fuzzy shortcode matches emoji-mart
-          // missed — its token-prefix search can't cross `_` (so `pointup`
-          // finds nothing). Skip ids already shown to avoid duplicates.
+          // Add fuzzy shortcode matches emoji-mart missed — its token-prefix
+          // search can't cross `_` (so `pointup` finds nothing). Skip ids
+          // already shown to avoid duplicates.
           const shown = new Set<string>(
             [...customMatches, ...standard].map((e) => e.id),
           );
           const fuzzy: EmojiSuggestion[] = fuzzyStandardEmoji(
             emojiQuery,
-            MAX_RESULTS - customMatches.length - standard.length,
+            UNLIMITED_RESULTS,
             shown,
           ).map((e) => ({ id: e.id, name: e.name, native: e.native }));
-          // Custom emoji first (community-specific), then standard, then fuzzy.
-          const merged = [...customMatches, ...standard, ...fuzzy].slice(
-            0,
-            MAX_RESULTS,
+          // Rank exact/prefix shortcode matches across custom and standard emoji
+          // before semantic and weaker matches (for example, `joy` before
+          // `bufo_joy`). Keep emoji-mart's name/keyword results ahead of loose
+          // substring and subsequence matches.
+          setSuggestions(
+            rankShortcodeMatchesFirst(
+              emojiQuery,
+              [...standard, ...customMatches, ...fuzzy],
+              (emoji) => emoji.id,
+            ),
           );
-          setSuggestions(merged);
           setEmojiSelectedIndex(0);
         },
       )
diff --git a/desktop/src/features/messages/ui/ComposerActivityAccessory.tsx b/desktop/src/features/messages/ui/ComposerActivityAccessory.tsx
new file mode 100644
index 0000000000..69889001ef
--- /dev/null
+++ b/desktop/src/features/messages/ui/ComposerActivityAccessory.tsx
@@ -0,0 +1,47 @@
+import type { ReactNode } from "react";
+import { AnimatePresence, motion, useReducedMotion } from "motion/react";
+
+import { cn } from "@/shared/lib/cn";
+
+type ComposerActivityAccessoryProps = {
+  children: ReactNode;
+  className?: string;
+  testId?: string;
+  visible: boolean;
+};
+
+/**
+ * Fades activity content into the composer dock's reserved bottom rail without
+ * changing layout height. This keeps timeline scroll padding stable.
+ */
+export function ComposerActivityAccessory({
+  children,
+  className,
+  testId,
+  visible,
+}: ComposerActivityAccessoryProps) {
+  const prefersReducedMotion = useReducedMotion();
+
+  return (
+    <AnimatePresence initial={false}>
+      {visible ? (
+        <motion.div
+          animate={{ opacity: 1 }}
+          className={cn(
+            "composer-dock-activity absolute inset-x-0 z-10 bg-background",
+            className,
+          )}
+          data-testid={testId}
+          exit={{ opacity: 0 }}
+          initial={{ opacity: 0 }}
+          transition={{
+            duration: prefersReducedMotion ? 0 : 0.2,
+            ease: [0.23, 1, 0.32, 1],
+          }}
+        >
+          {children}
+        </motion.div>
+      ) : null}
+    </AnimatePresence>
+  );
+}
diff --git a/desktop/src/features/messages/ui/ComposerAttachments.tsx b/desktop/src/features/messages/ui/ComposerAttachments.tsx
index 6a14aa498a..bee38e321c 100644
--- a/desktop/src/features/messages/ui/ComposerAttachments.tsx
+++ b/desktop/src/features/messages/ui/ComposerAttachments.tsx
@@ -7,6 +7,7 @@ import {
   HatGlasses,
   Pencil,
   Play,
+  UploadCloud,
   Users,
   X,
 } from "lucide-react";
@@ -39,13 +40,18 @@ import { ComposerImageEditor } from "./ComposerImageEditor";
 export function DropZoneOverlay({ className }: { className?: string }) {
   return (
     <div
+      data-testid="drop-zone-overlay"
       className={cn(
         "pointer-events-none absolute inset-0 z-10 flex items-center justify-center rounded-2xl border-2 border-dashed border-primary bg-primary/10",
         className,
       )}
     >
-      <span className="text-sm font-medium text-primary">
-        Drop files to upload
+      <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"
+        data-testid="drop-zone-label"
+      >
+        <UploadCloud aria-hidden="true" className="size-4" />
+        <span>Drop files to upload</span>
       </span>
     </div>
   );
diff --git a/desktop/src/features/messages/ui/ComposerDockBackdrop.tsx b/desktop/src/features/messages/ui/ComposerDockBackdrop.tsx
new file mode 100644
index 0000000000..840be49bea
--- /dev/null
+++ b/desktop/src/features/messages/ui/ComposerDockBackdrop.tsx
@@ -0,0 +1,33 @@
+import { cn } from "@/shared/lib/cn";
+
+type ComposerDockBackdropProps = {
+  gutterClassName: string;
+};
+
+/**
+ * Owns the dock's stable backdrop blur separately from the resizing composer.
+ * An opaque rail mask covers the portion released for activity content.
+ */
+export function ComposerDockBackdrop({
+  gutterClassName,
+}: ComposerDockBackdropProps) {
+  return (
+    <>
+      <div
+        aria-hidden="true"
+        className={cn(
+          "pointer-events-none absolute inset-y-0 z-0",
+          gutterClassName,
+        )}
+        data-testid="composer-dock-backdrop"
+      >
+        <div className="h-full w-full rounded-2xl backdrop-blur-md dark:backdrop-blur-xl" />
+      </div>
+      <div
+        aria-hidden="true"
+        className="composer-dock-rail-mask pointer-events-none absolute inset-x-0 bottom-0 z-[5] bg-background"
+        data-testid="composer-dock-rail-mask"
+      />
+    </>
+  );
+}
diff --git a/desktop/src/features/messages/ui/ComposerDockToolbar.tsx b/desktop/src/features/messages/ui/ComposerDockToolbar.tsx
new file mode 100644
index 0000000000..6e62076d12
--- /dev/null
+++ b/desktop/src/features/messages/ui/ComposerDockToolbar.tsx
@@ -0,0 +1,30 @@
+import type { ComponentProps } from "react";
+
+import { MessageComposerToolbar } from "@/features/messages/ui/MessageComposerToolbar";
+
+type ComposerDockToolbarProps = ComponentProps<
+  typeof MessageComposerToolbar
+> & {
+  layoutMode: "dock" | "standalone";
+};
+
+/**
+ * Keeps the composer dock's total height stable by trading a quiet-state spacer
+ * for the equal-height activity rail outside the composer.
+ */
+export function ComposerDockToolbar({
+  layoutMode,
+  ...toolbarProps
+}: ComposerDockToolbarProps) {
+  return (
+    <>
+      {layoutMode === "dock" ? (
+        <div
+          aria-hidden="true"
+          className="composer-dock-quiet-spacer shrink-0"
+        />
+      ) : null}
+      <MessageComposerToolbar {...toolbarProps} />
+    </>
+  );
+}
diff --git a/desktop/src/features/messages/ui/EmojiAutocomplete.tsx b/desktop/src/features/messages/ui/EmojiAutocomplete.tsx
index 3b6fa3a2d2..d44933aef1 100644
--- a/desktop/src/features/messages/ui/EmojiAutocomplete.tsx
+++ b/desktop/src/features/messages/ui/EmojiAutocomplete.tsx
@@ -2,6 +2,10 @@ import * as React from "react";
 
 import type { EmojiSuggestion } from "@/features/messages/lib/useEmojiAutocomplete";
 import { cn } from "@/shared/lib/cn";
+import {
+  type ListVirtualizer,
+  VirtualizedList,
+} from "@/shared/ui/VirtualizedList";
 import {
   POPOVER_CUSTOM_ENTER_MOTION_CLASS,
   POPOVER_SHADOW_STYLE,
@@ -21,15 +25,21 @@ export const EmojiAutocomplete = React.memo(function EmojiAutocomplete({
   onSelect,
   position = "above",
 }: EmojiAutocompleteProps) {
-  const listRef = React.useRef<HTMLDivElement>(null);
+  const listVirtualizerRef = React.useRef<ListVirtualizer | null>(null);
 
   React.useEffect(() => {
-    const activeItem = listRef.current?.children[selectedIndex] as
-      | HTMLElement
-      | undefined;
-    activeItem?.scrollIntoView({ block: "nearest" });
+    listVirtualizerRef.current?.scrollToIndex(selectedIndex, {
+      align: "auto",
+    });
   }, [selectedIndex]);
 
+  const handleVirtualizer = React.useCallback(
+    (virtualizer: ListVirtualizer) => {
+      listVirtualizerRef.current = virtualizer;
+    },
+    [],
+  );
+
   if (suggestions.length === 0) {
     return null;
   }
@@ -43,47 +53,55 @@ export const EmojiAutocomplete = React.memo(function EmojiAutocomplete({
     >
       <div
         className={cn(
-          "max-h-48 overflow-y-auto rounded-xl p-1",
+          "rounded-xl p-1",
           POPOVER_CUSTOM_ENTER_MOTION_CLASS,
           position === "below"
             ? "origin-top slide-in-from-top-1"
             : "origin-bottom slide-in-from-bottom-1",
           POPOVER_SURFACE_CLASS,
         )}
-        ref={listRef}
+        data-testid="emoji-autocomplete"
         style={POPOVER_SHADOW_STYLE}
       >
-        {suggestions.map((suggestion, index) => (
-          <button
-            className={cn(
-              "flex w-full cursor-pointer items-center gap-2 rounded-lg px-3 py-1.5 text-left text-sm",
-              index === selectedIndex
-                ? "bg-accent text-accent-foreground"
-                : "text-popover-foreground hover:bg-accent/50",
-            )}
-            key={suggestion.id}
-            onMouseDown={(event) => {
-              event.preventDefault();
-              onSelect(suggestion);
-            }}
-            tabIndex={-1}
-            type="button"
-          >
-            {suggestion.url ? (
-              <img
-                alt={`:${suggestion.id}:`}
-                src={suggestion.url}
-                className="h-5 w-5 object-contain"
-                draggable={false}
-              />
-            ) : (
-              <span className="text-lg leading-none">{suggestion.native}</span>
-            )}
-            <span className="truncate text-muted-foreground">
-              :{suggestion.id}:
-            </span>
-          </button>
-        ))}
+        <VirtualizedList
+          className="max-h-48"
+          estimateSize={36}
+          getItemKey={(suggestion) => suggestion.id}
+          items={suggestions}
+          onVirtualizer={handleVirtualizer}
+          renderItem={(suggestion, index) => (
+            <button
+              className={cn(
+                "flex w-full cursor-pointer items-center gap-2 rounded-lg px-3 py-1.5 text-left text-sm",
+                index === selectedIndex
+                  ? "bg-accent text-accent-foreground"
+                  : "text-popover-foreground hover:bg-accent/50",
+              )}
+              onMouseDown={(event) => {
+                event.preventDefault();
+                onSelect(suggestion);
+              }}
+              tabIndex={-1}
+              type="button"
+            >
+              {suggestion.url ? (
+                <img
+                  alt={`:${suggestion.id}:`}
+                  src={suggestion.url}
+                  className="h-5 w-5 object-contain"
+                  draggable={false}
+                />
+              ) : (
+                <span className="text-lg leading-none">
+                  {suggestion.native}
+                </span>
+              )}
+              <span className="truncate text-muted-foreground">
+                :{suggestion.id}:
+              </span>
+            </button>
+          )}
+        />
       </div>
     </div>
   );
diff --git a/desktop/src/features/messages/ui/FormattingToolbar.tsx b/desktop/src/features/messages/ui/FormattingToolbar.tsx
index a605b3dcd9..afe2cb22a5 100644
--- a/desktop/src/features/messages/ui/FormattingToolbar.tsx
+++ b/desktop/src/features/messages/ui/FormattingToolbar.tsx
@@ -1,4 +1,5 @@
 import * as React from "react";
+import { TextSelection } from "@tiptap/pm/state";
 import type { Editor } from "@tiptap/react";
 import {
   Bold,
@@ -15,6 +16,12 @@ import {
 
 import { cn } from "@/shared/lib/cn";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/shared/ui/tooltip";
+import {
+  isolateSelectionForBlockFormatting,
+  mergeSelectedTextblocksIntoCodeBlock,
+  selectionIncludesList,
+  splitSelectedLinesForListFormatting,
+} from "@/features/messages/lib/selectionBlockFormatting";
 import { getEditorSpoilerRangeState } from "@/features/messages/lib/spoilerFormatting";
 import { SPOILER_MARK_NAME } from "@/features/messages/lib/spoilerMark";
 
@@ -29,6 +36,11 @@ type FormattingToolbarProps = {
   onLinkButton?: () => void;
 };
 
+type FormattingSelectionRange = {
+  anchor: number;
+  head: number;
+};
+
 type ActiveStates = {
   bold: boolean;
   italic: boolean;
@@ -117,6 +129,9 @@ export const FormattingToolbar = React.memo(function FormattingToolbar({
   disabled = false,
   onLinkButton,
 }: FormattingToolbarProps) {
+  const pendingSelectionRef = React.useRef<FormattingSelectionRange | null>(
+    null,
+  );
   const [activeStates, setActiveStates] = React.useState<ActiveStates | null>(
     () => (editor ? getActiveStates(editor) : null),
   );
@@ -137,36 +152,97 @@ export const FormattingToolbar = React.memo(function FormattingToolbar({
     };
   }, [editor]);
 
-  const toggleBold = React.useCallback(() => {
-    editor?.chain().focus().toggleBold().run();
+  const captureSelection = React.useCallback(() => {
+    if (!editor || editor.state.selection.empty) {
+      pendingSelectionRef.current = null;
+      return;
+    }
+
+    const { anchor, head } = editor.state.selection;
+    pendingSelectionRef.current = { anchor, head };
   }, [editor]);
 
+  const formattingChain = React.useCallback(() => {
+    if (!editor) return null;
+
+    const range = pendingSelectionRef.current;
+    pendingSelectionRef.current = null;
+    const chain = editor.chain();
+
+    if (
+      range &&
+      range.anchor !== range.head &&
+      range.anchor <= editor.state.doc.content.size &&
+      range.head <= editor.state.doc.content.size
+    ) {
+      chain.command(({ tr }) => {
+        tr.setSelection(TextSelection.create(tr.doc, range.anchor, range.head));
+        return true;
+      });
+    }
+
+    return chain.focus();
+  }, [editor]);
+
+  const toggleBold = React.useCallback(() => {
+    formattingChain()?.toggleBold().run();
+  }, [formattingChain]);
+
   const toggleItalic = React.useCallback(() => {
-    editor?.chain().focus().toggleItalic().run();
-  }, [editor]);
+    formattingChain()?.toggleItalic().run();
+  }, [formattingChain]);
 
   const toggleStrike = React.useCallback(() => {
-    editor?.chain().focus().toggleStrike().run();
-  }, [editor]);
+    formattingChain()?.toggleStrike().run();
+  }, [formattingChain]);
 
   const toggleCode = React.useCallback(() => {
-    editor?.chain().focus().toggleCode().run();
-  }, [editor]);
+    formattingChain()?.toggleCode().run();
+  }, [formattingChain]);
 
   const toggleCodeBlock = React.useCallback(() => {
-    editor?.chain().focus().toggleCodeBlock().run();
-  }, [editor]);
+    const chain = formattingChain();
+    if (!chain) return;
+    chain
+      .command(({ tr, chain: currentChain }) => {
+        if (tr.selection.empty) {
+          isolateSelectionForBlockFormatting(tr);
+          return currentChain().toggleCodeBlock().run();
+        }
+
+        isolateSelectionForBlockFormatting(tr);
+        if (selectionIncludesList(tr)) {
+          return currentChain()
+            .liftListItem("listItem")
+            .command(({ tr: currentTransaction }) =>
+              mergeSelectedTextblocksIntoCodeBlock(currentTransaction),
+            )
+            .run();
+        }
+        return mergeSelectedTextblocksIntoCodeBlock(tr);
+      })
+      .run();
+  }, [formattingChain]);
+
+  const restorePendingSelection = React.useCallback(() => {
+    formattingChain()?.run();
+  }, [formattingChain]);
 
   const toggleLink = React.useCallback(() => {
     if (!editor) return;
 
-    // Preferred path: open the link-edit modal, which handles add, edit, and
-    // remove with proper display-text + URL fields.
+    // Restore the range captured on pointer-down before opening the modal.
+    // WKWebView may otherwise collapse it as focus moves to the toolbar.
     if (onLinkButton) {
+      restorePendingSelection();
       onLinkButton();
       return;
     }
 
+    const chain = formattingChain();
+    if (!chain) return;
+    chain.run();
+
     // Legacy fallback (no modal wired): the native prompts below are a no-op
     // in the Tauri WebView, so this path effectively does nothing there.
     if (editor.isActive("link")) {
@@ -189,24 +265,55 @@ export const FormattingToolbar = React.memo(function FormattingToolbar({
         editor.chain().focus().insertContent(`[${label}](${url})`).run();
       }
     }
-  }, [editor, onLinkButton]);
+  }, [editor, formattingChain, onLinkButton, restorePendingSelection]);
 
   const toggleBulletList = React.useCallback(() => {
-    editor?.chain().focus().toggleBulletList().run();
-  }, [editor]);
+    formattingChain()
+      ?.command(({ tr }) => {
+        splitSelectedLinesForListFormatting(tr);
+        return true;
+      })
+      .command(({ tr, chain: currentChain }) => {
+        if (!selectionIncludesList(tr)) return true;
+        return currentChain().liftListItem("listItem").run();
+      })
+      .toggleBulletList()
+      .run();
+  }, [formattingChain]);
 
   const toggleOrderedList = React.useCallback(() => {
-    editor?.chain().focus().toggleOrderedList().run();
-  }, [editor]);
+    formattingChain()
+      ?.command(({ tr }) => {
+        splitSelectedLinesForListFormatting(tr);
+        return true;
+      })
+      .command(({ tr, chain: currentChain }) => {
+        if (!selectionIncludesList(tr)) return true;
+        return currentChain().liftListItem("listItem").run();
+      })
+      .toggleOrderedList()
+      .run();
+  }, [formattingChain]);
 
   const toggleBlockquote = React.useCallback(() => {
-    editor?.chain().focus().toggleBlockquote().run();
-  }, [editor]);
+    formattingChain()
+      ?.command(({ tr }) => {
+        isolateSelectionForBlockFormatting(tr);
+        return true;
+      })
+      .command(({ tr, chain: currentChain }) => {
+        if (!selectionIncludesList(tr)) return true;
+        return currentChain().liftListItem("listItem").run();
+      })
+      .toggleBlockquote()
+      .run();
+  }, [formattingChain]);
 
   const toggleSpoiler = React.useCallback(() => {
     if (!editor) return;
+    restorePendingSelection();
     toggleSpoilerFormatting(editor);
-  }, [editor]);
+  }, [editor, restorePendingSelection]);
 
   if (!editor || !activeStates) return null;
 
@@ -289,6 +396,7 @@ export const FormattingToolbar = React.memo(function FormattingToolbar({
               aria-pressed={item.active}
               disabled={disabled}
               onClick={() => item.action()}
+              onMouseDown={captureSelection}
               className={cn(
                 "inline-flex h-7 w-7 min-w-7 items-center justify-center rounded-md text-sm font-medium transition-colors",
                 "hover:bg-muted hover:text-foreground",
diff --git a/desktop/src/features/messages/ui/MessageComposer.tsx b/desktop/src/features/messages/ui/MessageComposer.tsx
index 8c0c574049..df3a734cee 100644
--- a/desktop/src/features/messages/ui/MessageComposer.tsx
+++ b/desktop/src/features/messages/ui/MessageComposer.tsx
@@ -21,15 +21,11 @@ import {
 } from "@/features/messages/lib/imetaMediaMarkdown";
 
 import { useAttachmentEditing } from "@/features/messages/lib/useAttachmentEditing";
-import {
-  type MediaUploadController,
-  useMediaUpload,
-} from "@/features/messages/lib/useMediaUpload";
+import { useMediaUpload } from "@/features/messages/lib/useMediaUpload";
 import { useMentions } from "@/features/messages/lib/useMentions";
 import { diffAddedMentionPubkeys } from "@/features/messages/lib/threading";
 import { getPersistentAgentAudienceScope } from "@/features/messages/lib/persistentAgentAudience";
 import { useIdentityQuery } from "@/shared/api/hooks";
-import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import {
   hasMentionClipboardHtml,
   normalizeMentionClipboardHtml,
@@ -45,7 +41,6 @@ import { useComposerSpoilerParticles } from "@/features/messages/lib/useComposer
 import { useTypingBroadcast } from "@/features/messages/useTypingBroadcast";
 import { getBuzzCodeBlockClipboardText } from "@/shared/lib/codeBlockClipboard";
 import { cn } from "@/shared/lib/cn";
-import type { ChannelType } from "@/shared/api/types";
 import { ChannelAutocomplete } from "./ChannelAutocomplete";
 import { ComposerReplyEditBanner } from "./ComposerReplyEditBanner";
 import { ComposerAttachments, DropZoneOverlay } from "./ComposerAttachments";
@@ -54,101 +49,14 @@ import {
   MentionAutocomplete,
   type MentionSuggestion,
 } from "./MentionAutocomplete";
-import { MessageComposerToolbar } from "./MessageComposerToolbar";
+import { ComposerDockToolbar } from "./ComposerDockToolbar";
 import { NonMemberMentionDialog } from "./NonMemberMentionDialog";
 import { useMentionSendFlow } from "./useMentionSendFlow";
 import { usePersistentAgentMentionHydration } from "./usePersistentAgentMentionHydration";
 import { useComposerContentState } from "./useComposerContentState";
 import { useDraftPersistLifecycle } from "./useDraftPersistSnapshot";
 
-type MessageComposerAudienceContext = {
-  type: "thread";
-  threadRootId: string;
-  initialAgentPubkeys?: readonly string[];
-};
-type MessageComposerProps = {
-  audienceContext?: MessageComposerAudienceContext | null;
-  channelId?: string | null;
-  channelName: string;
-  channelType?: ChannelType | null;
-  containerClassName?: string;
-  disabled?: boolean;
-  draftKey?: string;
-  /**
-   * When provided, the composer fires `submitMessage` once on mount after
-   * the draft matching this key has been loaded into the editor. This powers
-   * the "Send message" confirm-dialog flow in the Drafts panel. The callback
-   * `onAutoSubmitComplete` must clear the trigger (e.g. remove `?autoSend`
-   * from the URL) — it is called synchronously before `submitMessage` fires
-   * so the param is gone before any navigation the send might cause.
-   *
-   * Fires at most once per mount: a stable key value that persists across
-   * re-renders does NOT re-fire.
-   */
-  autoSubmitDraftKey?: string | null;
-  /** Called when the auto-submit fires so the parent can clear the trigger. */
-  onAutoSubmitComplete?: () => void;
-  editTarget?: {
-    author: string;
-    body: string;
-    id: string;
-    /**
-     * NIP-92 imeta attachments on the original event, in tag order. Loaded
-     * into the composer's pending-imeta state on edit-open so the user sees
-     * them as removable thumbnails (just like the send path) and can add
-     * more. The submit path emits a fresh full imeta tag set on the edit
-     * event; the receiver overlays it.
-     */
-    imetaMedia?: ImetaMedia[];
-  } | null;
-  isSending?: boolean;
-  mediaController?: MediaUploadController;
-  onCancelEdit?: () => void;
-  onCancelReply?: () => void;
-  /**
-   * Invoked when the user presses ↑ in an empty composer that is not already
-   * in edit mode. The owner should locate the most recent message authored by
-   * the current user within this composer's scope (main timeline, DM, or
-   * thread) and enter edit mode for it. Return `true` if a target was found
-   * and edit mode was entered, so the composer can swallow the keystroke;
-   * return `false` to let the arrow key fall through normally.
-   */
-  onEditLastOwnMessage?: () => boolean;
-  onEditSave?: (
-    content: string,
-    mediaTags?: string[][],
-    mentionPubkeys?: string[],
-  ) => Promise<void>;
-  /** Captures send context synchronously before awaits can change navigation. */
-  onCaptureSendContext?: () => {
-    parentEventId: string | null;
-    threadHeadId: string | null;
-  } | null;
-  /** Resolves the channel required to prepare mentions before sending. */
-  onPrepareSendChannel?: (pubkeys?: string[]) => Promise<string | null>;
-  onPreparingMentionSendChange?: (isPreparing: boolean) => void;
-  onSend: (
-    content: string,
-    mentionPubkeys: string[],
-    mediaTags?: string[][],
-    channelId?: string | null,
-    threadContext?: {
-      parentEventId: string | null;
-      threadHeadId: string | null;
-    } | null,
-  ) => Promise<void>;
-  placeholder?: string;
-  profiles?: UserProfileLookup;
-  replyTarget?: {
-    author: string;
-    body: string;
-    id: string;
-  } | null;
-  showTopBorder?: boolean;
-  toolbarExtraActions?: React.ReactNode;
-  typingParentEventId?: string | null;
-  typingRootEventId?: string | null;
-};
+import type { MessageComposerProps } from "./MessageComposer.types";
 
 function MessageComposerImpl({
   audienceContext = null,
@@ -156,6 +64,7 @@ function MessageComposerImpl({
   channelName,
   channelType = null,
   containerClassName,
+  layoutMode = "standalone",
   disabled = false,
   draftKey,
   autoSubmitDraftKey = null,
@@ -990,7 +899,11 @@ function MessageComposerImpl({
             onCancelReply={onCancelReply}
           />
           <form
-            className="relative z-10 isolate rounded-2xl border border-border/50 bg-background/80 px-3 pb-2 pt-3 shadow-none backdrop-blur-md supports-[backdrop-filter]:bg-background/70 dark:bg-background/70 dark:backdrop-blur-xl dark:supports-[backdrop-filter]:bg-background/55 sm:px-4"
+            className={cn(
+              "relative z-10 isolate rounded-2xl border border-border/50 bg-background/80 px-3 pb-2 pt-3 shadow-none supports-[backdrop-filter]:bg-background/70 dark:bg-background/70 dark:supports-[backdrop-filter]:bg-background/55 sm:px-4",
+              layoutMode === "standalone" &&
+                "backdrop-blur-md dark:backdrop-blur-xl",
+            )}
             data-testid="message-composer"
             onDragEnter={ownsDropZone ? media.handleDragEnter : undefined}
             onDragLeave={ownsDropZone ? media.handleDragLeave : undefined}
@@ -1072,7 +985,8 @@ function MessageComposerImpl({
               <EditorContent editor={richText.editor} />
             </div>
 
-            <MessageComposerToolbar
+            <ComposerDockToolbar
+              layoutMode={layoutMode}
               composerDisabled={disabled}
               editor={richText.editor}
               extraActions={toolbarExtraActions}
diff --git a/desktop/src/features/messages/ui/MessageComposer.types.ts b/desktop/src/features/messages/ui/MessageComposer.types.ts
new file mode 100644
index 0000000000..800474c3dd
--- /dev/null
+++ b/desktop/src/features/messages/ui/MessageComposer.types.ts
@@ -0,0 +1,98 @@
+import type { ReactNode } from "react";
+
+import type { ImetaMedia } from "@/features/messages/lib/imetaMediaMarkdown";
+import type { MediaUploadController } from "@/features/messages/lib/useMediaUpload";
+import type { UserProfileLookup } from "@/features/profile/lib/identity";
+import type { ChannelType } from "@/shared/api/types";
+
+export type MessageComposerProps = {
+  audienceContext?: {
+    type: "thread";
+    threadRootId: string;
+    initialAgentPubkeys?: readonly string[];
+  } | null;
+  channelId?: string | null;
+  channelName: string;
+  channelType?: ChannelType | null;
+  containerClassName?: string;
+  /**
+   * `dock` delegates backdrop blur and bottom-rail geometry to a surrounding
+   * composer dock. `standalone` keeps both concerns inside this component.
+   */
+  layoutMode?: "dock" | "standalone";
+  disabled?: boolean;
+  draftKey?: string;
+  /**
+   * When provided, the composer fires `submitMessage` once on mount after
+   * the draft matching this key has been loaded into the editor. This powers
+   * the "Send message" confirm-dialog flow in the Drafts panel. The callback
+   * `onAutoSubmitComplete` must clear the trigger (e.g. remove `?autoSend`
+   * from the URL) — it is called synchronously before `submitMessage` fires
+   * so the param is gone before any navigation the send might cause.
+   *
+   * Fires at most once per mount: a stable key value that persists across
+   * re-renders does NOT re-fire.
+   */
+  autoSubmitDraftKey?: string | null;
+  /** Called when the auto-submit fires so the parent can clear the trigger. */
+  onAutoSubmitComplete?: () => void;
+  editTarget?: {
+    author: string;
+    body: string;
+    id: string;
+    /**
+     * NIP-92 imeta attachments on the original event, in tag order. Loaded
+     * into the composer's pending-imeta state on edit-open so the user sees
+     * them as removable thumbnails (just like the send path) and can add
+     * more. The submit path emits a fresh full imeta tag set on the edit
+     * event; the receiver overlays it.
+     */
+    imetaMedia?: ImetaMedia[];
+  } | null;
+  isSending?: boolean;
+  mediaController?: MediaUploadController;
+  onCancelEdit?: () => void;
+  onCancelReply?: () => void;
+  /**
+   * Invoked when the user presses ↑ in an empty composer that is not already
+   * in edit mode. The owner should locate the most recent message authored by
+   * the current user within this composer's scope (main timeline, DM, or
+   * thread) and enter edit mode for it. Return `true` if a target was found
+   * and edit mode was entered, so the composer can swallow the keystroke;
+   * return `false` to let the arrow key fall through normally.
+   */
+  onEditLastOwnMessage?: () => boolean;
+  onEditSave?: (
+    content: string,
+    mediaTags?: string[][],
+    mentionPubkeys?: string[],
+  ) => Promise<void>;
+  /** Captures send context synchronously before awaits can change navigation. */
+  onCaptureSendContext?: () => {
+    parentEventId: string | null;
+    threadHeadId: string | null;
+  } | null;
+  onPrepareSendChannel?: (pubkeys?: string[]) => Promise<string | null>;
+  onPreparingMentionSendChange?: (isPreparing: boolean) => void;
+  onSend: (
+    content: string,
+    mentionPubkeys: string[],
+    mediaTags?: string[][],
+    channelId?: string | null,
+    threadContext?: {
+      parentEventId: string | null;
+      threadHeadId: string | null;
+    } | null,
+  ) => Promise<void>;
+  placeholder?: string;
+  profiles?: UserProfileLookup;
+  replyTarget?: {
+    author: string;
+    body: string;
+    id: string;
+  } | null;
+  showTopBorder?: boolean;
+  toolbarExtraActions?: ReactNode;
+  typingParentEventId?: string | null;
+  typingRootEventId?: string | null;
+};
diff --git a/desktop/src/features/messages/ui/MessageRow.tsx b/desktop/src/features/messages/ui/MessageRow.tsx
index a57bf93e40..afcb3e863c 100644
--- a/desktop/src/features/messages/ui/MessageRow.tsx
+++ b/desktop/src/features/messages/ui/MessageRow.tsx
@@ -32,7 +32,7 @@ import { cn } from "@/shared/lib/cn";
 import { normalizePubkey } from "@/shared/lib/pubkey";
 import { UserAvatar } from "@/shared/ui/UserAvatar";
 import { useChannelNavigation } from "@/shared/context/ChannelNavigationContext";
-import { parseImetaTags } from "@/features/messages/lib/parseImeta";
+import { parseImetaTags } from "@/shared/ui/markdown/parseImeta";
 import { useMessageEmoji } from "@/features/messages/lib/useMessageEmoji";
 import { parseWaveMessageContent } from "@/features/messages/lib/waveMessage";
 import { resolveSnapshotSharedBy } from "@/features/messages/lib/snapshotSharedBy";
@@ -505,9 +505,7 @@ export const MessageRow = React.memo(
       message.pending || message.edited ? (
         <>
           {message.pending ? (
-            <p className="font-medium uppercase tracking-[0.14em] text-primary/80">
-              Sending
-            </p>
+            <p className="font-medium text-primary/80">Sending</p>
           ) : null}
           {message.edited ? (
             <Tooltip>
diff --git a/desktop/src/features/messages/ui/MessageThreadPanel.tsx b/desktop/src/features/messages/ui/MessageThreadPanel.tsx
index 0cd4d67238..08a57fa4c6 100644
--- a/desktop/src/features/messages/ui/MessageThreadPanel.tsx
+++ b/desktop/src/features/messages/ui/MessageThreadPanel.tsx
@@ -38,6 +38,8 @@ import {
 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";
 import { ThreadMessageSkeleton } from "./MessageThreadPanelSkeleton";
 import { MessageRow, type ThreadDepthGuideAction } from "./MessageRow";
@@ -79,6 +81,7 @@ type MessageThreadPanelProps = ThreadPanelLayoutProps & {
   onMarkRead?: (message: TimelineMessage) => void;
   onExpandReplies: (message: TimelineMessage) => void;
   onScrollTargetResolved: () => void;
+  onScrollTargetSettled?: (messageId: string) => void;
   scrollTargetHighlights?: boolean;
   onSelectReplyTarget: (message: TimelineMessage) => void;
   onSend: (
@@ -106,7 +109,8 @@ type MessageThreadPanelProps = ThreadPanelLayoutProps & {
   threadReplyUnreadCounts?: ReadonlyMap<string, number>;
   threadTypingPubkeys: string[];
   threadHeadVideoReviewContext?: VideoReviewContext;
-  toolbarExtraActions?: React.ReactNode;
+  activityAccessoryContent?: React.ReactNode;
+  activityAccessoryVisible: boolean;
   widthPx: number;
   isFollowingThread?: boolean;
   isMessageUnreadById?: (messageId: string) => boolean;
@@ -207,6 +211,7 @@ export function MessageThreadPanel({
   onMarkRead,
   onExpandReplies,
   onScrollTargetResolved,
+  onScrollTargetSettled,
   onSelectReplyTarget,
   onSend,
   onToggleReaction,
@@ -222,7 +227,8 @@ export function MessageThreadPanel({
   threadUnreadCount,
   threadReplyUnreadCounts,
   threadTypingPubkeys,
-  toolbarExtraActions,
+  activityAccessoryContent,
+  activityAccessoryVisible,
   widthPx,
   transparentChrome = false,
   autoSendDraftKey = null,
@@ -241,11 +247,10 @@ export function MessageThreadPanel({
   const threadHeadId = threadHead?.id ?? null;
   useEscapeKey(onClose, isOverlay || isSinglePanelView || isFocusMode);
   const hasConstrainedColumn = columnMaxWidthPx != null;
-  useComposerHeightPadding(
-    threadBodyRef,
-    threadComposerWrapperRef,
-    isSinglePanelView,
-  );
+  // Whether the composer dock trades its quiet-state spacer for the
+  // conditional activity accessory (agent working and/or someone typing).
+  const hasComposerBottomActivity =
+    activityAccessoryVisible || threadTypingPubkeys.length > 0;
 
   // Live ref so onCaptureSendContext can read reply state at submit time
   // (before any async mention-flow awaits change navigation state).
@@ -480,17 +485,31 @@ export function MessageThreadPanel({
     threadHead,
   ]);
 
-  const { isAtBottom, newMessageCount, onScroll, scrollToBottom } =
-    useAnchoredScroll({
-      channelId: threadHeadId,
-      contentRef: threadContentRef,
-      isLoading: threadRepliesPending || repliesRenderState === "pending",
-      messages: threadMessages,
-      highlightTargetMessage: scrollTargetHighlights,
-      onTargetReached: onScrollTargetResolved,
-      scrollContainerRef: threadBodyRef,
-      targetMessageId: scrollTargetId,
-    });
+  const {
+    isAtBottom,
+    newMessageCount,
+    onScroll,
+    scrollToBottom,
+    settleAtBottomAfterLayout,
+  } = useAnchoredScroll({
+    channelId: threadHeadId,
+    contentRef: threadContentRef,
+    isLoading: threadRepliesPending || repliesRenderState === "pending",
+    messages: threadMessages,
+    highlightTargetMessage: scrollTargetHighlights,
+    onTargetReached: onScrollTargetResolved,
+    onTargetSettled: onScrollTargetSettled,
+    pinTargetCentered: !scrollTargetHighlights,
+    scrollContainerRef: threadBodyRef,
+    targetMessageId: scrollTargetId,
+  });
+  useComposerHeightPadding(
+    threadBodyRef,
+    threadComposerWrapperRef,
+    isSinglePanelView,
+    "padding",
+    settleAtBottomAfterLayout,
+  );
 
   const knownAgentPubkeys = useKnownAgentPubkeys();
   const initialAgentPubkeys = React.useMemo(() => {
@@ -816,65 +835,75 @@ export function MessageThreadPanel({
         ref={threadComposerWrapperRef}
       >
         <div
-          className={cn(
-            "composer-overlay-corner-masks pointer-events-auto",
-            hasConstrainedColumn && THREAD_PANEL_COLUMN_CLASS,
-          )}
+          className={cn(hasConstrainedColumn && THREAD_PANEL_COLUMN_CLASS)}
           style={
             hasConstrainedColumn ? { maxWidth: columnMaxWidthPx } : undefined
           }
         >
-          <MessageComposer
-            audienceContext={{
-              type: "thread",
-              threadRootId: threadHead.id,
-              initialAgentPubkeys,
-            }}
-            channelId={channelId}
-            channelName={channelName}
-            channelType={channel?.channelType ?? null}
-            containerClassName={THREAD_PANEL_COMPOSER_GUTTER_CLASS}
-            disabled={disabled || isSending || !channelId}
-            draftKey={`thread:${threadHead.id}`}
-            autoSubmitDraftKey={autoSendDraftKey}
-            onAutoSubmitComplete={onAutoSubmitComplete}
-            editTarget={editTarget}
-            isSending={isSending}
-            onCancelEdit={onCancelEdit}
-            onCancelReply={composerReplyTarget ? onCancelReply : undefined}
-            onCaptureSendContext={onCaptureSendContext}
-            onEditLastOwnMessage={onEditLastOwnMessage}
-            onEditSave={onEditSave}
-            onSend={onSend}
-            placeholder={`Reply in thread to ${threadHead.author}`}
-            profiles={profiles}
-            replyTarget={composerReplyTarget}
-            typingParentEventId={threadHead.id}
-            typingRootEventId={threadHead.rootId}
-          />
           <div
             className={cn(
-              "min-h-8 bg-background pb-1.5 pt-0",
-              THREAD_PANEL_COMPOSER_GUTTER_CLASS,
+              "composer-dock composer-overlay-corner-masks relative pointer-events-auto",
+              hasComposerBottomActivity && "composer-dock--with-activity",
             )}
           >
-            <div className="mx-auto flex h-full w-full max-w-4xl items-center gap-2 overflow-visible">
-              {toolbarExtraActions ? (
-                <div className="flex min-w-0 flex-1 overflow-visible">
-                  {toolbarExtraActions}
-                </div>
-              ) : null}
-              {threadTypingPubkeys.length > 0 ? (
-                <TypingIndicatorRow
-                  channel={channel}
-                  className="min-w-0 flex-1 py-0 pl-[calc(0.75rem+1px)] pr-0 sm:pl-[calc(1rem+1px)]"
-                  currentPubkey={currentPubkey}
-                  profiles={profiles}
-                  typingPubkeys={threadTypingPubkeys}
-                  variant="activity"
-                />
-              ) : null}
-            </div>
+            <ComposerDockBackdrop gutterClassName="inset-x-5" />
+            <MessageComposer
+              audienceContext={{
+                type: "thread",
+                threadRootId: threadHead.id,
+                initialAgentPubkeys,
+              }}
+              channelId={channelId}
+              channelName={channelName}
+              channelType={channel?.channelType ?? null}
+              containerClassName={cn(
+                THREAD_PANEL_COMPOSER_GUTTER_CLASS,
+                "pb-0",
+              )}
+              layoutMode="dock"
+              disabled={disabled || isSending || !channelId}
+              draftKey={`thread:${threadHead.id}`}
+              autoSubmitDraftKey={autoSendDraftKey}
+              onAutoSubmitComplete={onAutoSubmitComplete}
+              editTarget={editTarget}
+              isSending={isSending}
+              onCancelEdit={onCancelEdit}
+              onCancelReply={composerReplyTarget ? onCancelReply : undefined}
+              onCaptureSendContext={onCaptureSendContext}
+              onEditLastOwnMessage={onEditLastOwnMessage}
+              onEditSave={onEditSave}
+              onSend={onSend}
+              placeholder={`Reply in thread to ${threadHead.author}`}
+              profiles={profiles}
+              replyTarget={composerReplyTarget}
+              typingParentEventId={threadHead.id}
+              typingRootEventId={threadHead.rootId}
+            />
+            {/* The activity accessory is anchored in the dock's reserved bottom
+              rail, so fading it cannot change the observed overlay height or
+              move the conversation. Its natural content height remains responsive. */}
+            <ComposerActivityAccessory
+              className={THREAD_PANEL_COMPOSER_GUTTER_CLASS}
+              visible={hasComposerBottomActivity}
+            >
+              <div className="mx-auto flex w-full max-w-4xl items-center gap-2 overflow-visible pl-2">
+                {activityAccessoryVisible && activityAccessoryContent ? (
+                  <div className="flex min-w-0 flex-1 overflow-visible">
+                    {activityAccessoryContent}
+                  </div>
+                ) : null}
+                {threadTypingPubkeys.length > 0 ? (
+                  <TypingIndicatorRow
+                    channel={channel}
+                    className="min-w-0 flex-1 py-0 pl-[calc(0.75rem+1px)] pr-0 sm:pl-[calc(1rem+1px)]"
+                    currentPubkey={currentPubkey}
+                    profiles={profiles}
+                    typingPubkeys={threadTypingPubkeys}
+                    variant="activity"
+                  />
+                ) : null}
+              </div>
+            </ComposerActivityAccessory>
           </div>
         </div>
       </div>
diff --git a/desktop/src/features/messages/ui/MessageTimeline.tsx b/desktop/src/features/messages/ui/MessageTimeline.tsx
index b66c97619e..cc5fb1e3dc 100644
--- a/desktop/src/features/messages/ui/MessageTimeline.tsx
+++ b/desktop/src/features/messages/ui/MessageTimeline.tsx
@@ -32,6 +32,7 @@ import { useSettleGatedPrependMessages } from "./useSettleGatedPrependMessages";
 
 export type MessageTimelineHandle = {
   scrollToBottomOnNextUpdate: () => void;
+  settleAtBottom: () => boolean;
 };
 
 type MessageTimelineProps = {
@@ -335,6 +336,7 @@ const MessageTimelineBase = React.forwardRef<
     scrollContainerRef: activeScrollContainerRef,
     splitPanelOpen: splitThreadPanelOpen,
     targetMessageId,
+    virtualCancelBottomIntent: timelineVirtualizerApi?.cancelBottomIntent,
     virtualScrollToMessage: timelineVirtualizerApi?.scrollToMessage,
     virtualScrollToBottom: timelineVirtualizerApi?.scrollToBottom,
     virtualSettleAtBottom: timelineVirtualizerApi?.settleAtBottom,
@@ -432,8 +434,13 @@ const MessageTimelineBase = React.forwardRef<
     ref,
     () => ({
       scrollToBottomOnNextUpdate: prepareForOwnMessage,
+      settleAtBottom: () => {
+        if (!timelineVirtualizerApi) return false;
+        scrollToBottom("auto");
+        return true;
+      },
     }),
-    [prepareForOwnMessage],
+    [prepareForOwnMessage, scrollToBottom, timelineVirtualizerApi],
   );
 
   // Jump-to-message is purely DOM-based now: all loaded rows are mounted, so
diff --git a/desktop/src/features/messages/ui/SelectionFormattingTray.tsx b/desktop/src/features/messages/ui/SelectionFormattingTray.tsx
index e7e29cab35..9eb24a970c 100644
--- a/desktop/src/features/messages/ui/SelectionFormattingTray.tsx
+++ b/desktop/src/features/messages/ui/SelectionFormattingTray.tsx
@@ -195,6 +195,7 @@ export function SelectionFormattingTray({
           ? "-translate-x-1/2 -translate-y-full"
           : "-translate-x-1/2",
       )}
+      data-buzz-selection-formatting-tray
       data-testid="selection-formatting-tray"
       onMouseDown={(event) => event.preventDefault()}
       role="toolbar"
diff --git a/desktop/src/features/messages/ui/TimelineMessageList.tsx b/desktop/src/features/messages/ui/TimelineMessageList.tsx
index 5d3cf8fd5d..3c35cb6d43 100644
--- a/desktop/src/features/messages/ui/TimelineMessageList.tsx
+++ b/desktop/src/features/messages/ui/TimelineMessageList.tsx
@@ -42,6 +42,7 @@ import { useUpwardPaginationWheel } from "./useUpwardPaginationWheel";
 import { useVirtualizedBottomSettle } from "./useVirtualizedBottomSettle";
 
 export type TimelineVirtualizerApi = {
+  cancelBottomIntent: () => void;
   scrollToBottom: (behavior?: ScrollBehavior) => void;
   settleAtBottom: () => void;
   scrollToMessage: (
@@ -454,145 +455,39 @@ function VirtualizedTimelineRows({
   const keys = React.useMemo(() => items.map(virtualizedItemKey), [items]);
   itemsLengthRef.current = items.length;
   const previousKeysRef = React.useRef<readonly string[]>([]);
-  const prependAnchorRef = React.useRef<{
-    itemKey: string;
-    top: number;
-  } | null>(null);
-  const prependWatcherFrameRef = React.useRef<number | null>(null);
   const [prependShiftEpoch, clearPrependShift] = React.useReducer(
     (version: number) => version + 1,
     0,
   );
-  // Virtua's `shift` is a one-render instruction, not a persistent mode. If it
-  // stays true after a prepend, later measurement changes can keep anchoring
-  // from the end and leave a stale blank range until the next scroll event.
+  const { cancel: cancelBottomSettle, settle: settleAtBottom } =
+    useVirtualizedBottomSettle(hostRef, listRef, itemsLengthRef);
+  const { arm: armUpwardMomentum } = useUpwardPaginationWheel(
+    hostRef,
+    cancelBottomSettle,
+  );
+
+  React.useEffect(
+    () => () => {
+      cancelBottomSettle();
+    },
+    [cancelBottomSettle],
+  );
+
   const isPrepend = React.useMemo(() => {
     void prependShiftEpoch;
     return didPrependVirtualizedTimeline(previousKeysRef.current, keys);
   }, [keys, prependShiftEpoch]);
 
-  const retirePrependAnchor = React.useCallback(() => {
-    if (prependWatcherFrameRef.current !== null) {
-      cancelAnimationFrame(prependWatcherFrameRef.current);
-    }
-    prependWatcherFrameRef.current = null;
-    prependAnchorRef.current = null;
-  }, []);
-  const { cancel: cancelBottomSettle, settle: settleAtBottom } =
-    useVirtualizedBottomSettle(hostRef, listRef, itemsLengthRef);
-  const retireTimelineSettle = React.useCallback(() => {
-    retirePrependAnchor();
-    cancelBottomSettle();
-  }, [cancelBottomSettle, retirePrependAnchor]);
-  const { arm: armUpwardMomentum, clear: clearUpwardMomentum } =
-    useUpwardPaginationWheel(hostRef, retireTimelineSettle);
-
-  const capturePrependAnchor = React.useCallback(() => {
-    // Keep the pending capture current while the fetch is in flight. Once the
-    // prepend commits and the watcher starts, its baseline is frozen.
-    if (prependWatcherFrameRef.current !== null) return;
-    const scroller = hostRef.current?.firstElementChild;
-    if (!(scroller instanceof HTMLDivElement)) return;
-    const scrollerTop = scroller.getBoundingClientRect().top;
-    const row = Array.from(
-      scroller.querySelectorAll<HTMLElement>("[data-timeline-item-key]"),
-    ).find(
-      (candidate) => candidate.getBoundingClientRect().top >= scrollerTop - 1,
-    );
-    const itemKey = row?.dataset.timelineItemKey;
-    if (!row || !itemKey) return;
-    prependAnchorRef.current = {
-      itemKey,
-      top: row.getBoundingClientRect().top - scrollerTop,
-    };
-  }, []);
-
-  React.useLayoutEffect(() => {
-    if (!isPrepend || !prependAnchorRef.current) return;
-    // Virtua's shift mode correctly absorbs prepended measurements, but
-    // estimated offsets can misclassify late row growth deep in history. Keep
-    // the semantic row identity as a short-lived, deviation-gated backstop.
-    // Do not correct in this commit: Virtua has shifted its estimate but has not
-    // applied its ResizeObserver batch yet, so that delta is transient and its
-    // subsequent absolute correction would overwrite our relative write.
-    // This watcher deliberately survives a temporary row unmount and waits for
-    // stable geometry so Virtua remains the primary scroll owner.
-    if (prependWatcherFrameRef.current !== null) {
-      cancelAnimationFrame(prependWatcherFrameRef.current);
-    }
-    const anchor = prependAnchorRef.current;
-    const deadline = performance.now() + 3_000;
-    let previousScrollTop: number | null = null;
-    let settledFrames = 0;
-
-    const watch = () => {
-      const scroller = hostRef.current?.firstElementChild;
-      if (!(scroller instanceof HTMLDivElement)) {
-        prependWatcherFrameRef.current = null;
-        prependAnchorRef.current = null;
-        return;
-      }
-      const atBottom =
-        scroller.scrollHeight - scroller.clientHeight - scroller.scrollTop <=
-        32;
-      const row = Array.from(
-        scroller.querySelectorAll<HTMLElement>("[data-timeline-item-key]"),
-      ).find(
-        (candidate) => candidate.dataset.timelineItemKey === anchor.itemKey,
-      );
-      const top = row
-        ? row.getBoundingClientRect().top - scroller.getBoundingClientRect().top
-        : null;
-      const scrollTop = scroller.scrollTop;
-      settledFrames =
-        previousScrollTop !== null &&
-        Math.abs(scrollTop - previousScrollTop) < 0.5
-          ? settledFrames + 1
-          : 0;
-      previousScrollTop = scrollTop;
-
-      if (row && top !== null && settledFrames >= 2) {
-        const delta = top - anchor.top;
-        if (Math.abs(delta) > 4) {
-          scroller.scrollBy({ top: delta });
-          settledFrames = 0;
-          previousScrollTop = null;
-        }
-      }
-
-      const retired =
-        performance.now() >= deadline ||
-        atBottom ||
-        (top !== null && top > scroller.clientHeight * 2);
-      if (retired) {
-        retirePrependAnchor();
-        return;
-      }
-      prependWatcherFrameRef.current = requestAnimationFrame(watch);
-    };
-    prependWatcherFrameRef.current = requestAnimationFrame(watch);
-    clearUpwardMomentum();
-  }, [clearUpwardMomentum, isPrepend, retirePrependAnchor]);
-
-  React.useEffect(
-    () => () => {
-      retirePrependAnchor();
-      cancelBottomSettle();
-    },
-    [cancelBottomSettle, retirePrependAnchor],
-  );
-
   React.useLayoutEffect(() => {
     previousKeysRef.current = keys;
     if (isPrepend) {
-      cancelBottomSettle();
       clearPrependShift();
     }
     if (!hasInitialPositionedRef.current && items.length > 0) {
       hasInitialPositionedRef.current = true;
       settleAtBottom();
     }
-  }, [cancelBottomSettle, isPrepend, items.length, keys, settleAtBottom]);
+  }, [isPrepend, items.length, keys, settleAtBottom]);
 
   const messageItemIndexById = React.useMemo(() => {
     const byId = new Map<string, number>();
@@ -622,16 +517,13 @@ function VirtualizedTimelineRows({
   React.useLayoutEffect(() => {
     if (!onVirtualizerApiChange) return;
     const api: TimelineVirtualizerApi = {
+      cancelBottomIntent: cancelBottomSettle,
       scrollToBottom() {
-        retireTimelineSettle();
-        const lastIndex = itemsLengthRef.current - 1;
-        if (lastIndex >= 0) {
-          listRef.current?.scrollToIndex(lastIndex, { align: "end" });
-        }
+        settleAtBottom();
       },
       settleAtBottom,
       scrollToMessage(messageId) {
-        retireTimelineSettle();
+        cancelBottomSettle();
         const index = messageItemIndexByIdRef.current.get(messageId);
         if (index === undefined) return false;
         listRef.current?.scrollToIndex(index, { align: "center" });
@@ -640,7 +532,7 @@ function VirtualizedTimelineRows({
     };
     onVirtualizerApiChange(api);
     return () => onVirtualizerApiChange(null);
-  }, [onVirtualizerApiChange, retireTimelineSettle, settleAtBottom]);
+  }, [cancelBottomSettle, onVirtualizerApiChange, settleAtBottom]);
 
   React.useLayoutEffect(() => {
     const host = hostRef.current;
@@ -670,15 +562,13 @@ function VirtualizedTimelineRows({
       if (!list || !(scroller instanceof HTMLDivElement)) return;
       onVirtualizerRangeChanged?.();
       const distanceFromBottom = list.scrollSize - list.viewportSize - offset;
-      if (distanceFromBottom > 32) cancelBottomSettle();
+      // Do not infer reader intent from an intermediate virtualizer offset.
+      // Initial channel positioning deliberately chases the floor while rows
+      // are measured; those measurements can briefly report a large gap and
+      // emit `onScroll` without any user input. Cancelling here strands the
+      // channel above its newest message. The settle hook's wheel, pointer,
+      // touch, and key listeners are the authoritative user-interaction gate.
       onAtBottomStateChange?.(distanceFromBottom <= 32);
-      if (
-        prependAnchorRef.current !== null ||
-        offset <= 200 ||
-        prependWatcherFrameRef.current === null
-      ) {
-        capturePrependAnchor();
-      }
       if (offset <= 200) {
         // Layout scrolls near the top must not poison the reader's next input.
         armUpwardMomentum(onStartReached?.() ?? false);
@@ -686,8 +576,6 @@ function VirtualizedTimelineRows({
     },
     [
       armUpwardMomentum,
-      cancelBottomSettle,
-      capturePrependAnchor,
       onAtBottomStateChange,
       onStartReached,
       onVirtualizerRangeChanged,
diff --git a/desktop/src/features/messages/ui/TimelineSkeleton.tsx b/desktop/src/features/messages/ui/TimelineSkeleton.tsx
index 143fb1d71e..7d290be6e6 100644
--- a/desktop/src/features/messages/ui/TimelineSkeleton.tsx
+++ b/desktop/src/features/messages/ui/TimelineSkeleton.tsx
@@ -2,6 +2,7 @@ import * as React from "react";
 
 import type { TimelineMessage } from "@/features/messages/types";
 import { cn } from "@/shared/lib/cn";
+import { setLocalStorageItemWithRecovery } from "@/shared/lib/localStorageQuota";
 import { Skeleton } from "@/shared/ui/skeleton";
 
 const TIMELINE_SKELETON_CACHE_PREFIX = "buzz-timeline-skeleton-shape.v1";
@@ -35,6 +36,7 @@ export type TimelineSkeletonRowShape = {
 
 type TimelineSkeletonCachePayload = {
   rows: TimelineSkeletonRowShape[];
+  updatedAt: number;
   version: 1;
 };
 
@@ -133,11 +135,12 @@ function writeTimelineSkeletonRows(
 
   const payload: TimelineSkeletonCachePayload = {
     rows: rows.slice(0, 4),
+    updatedAt: Date.now(),
     version: 1,
   };
 
   try {
-    window.localStorage.setItem(cacheKey, JSON.stringify(payload));
+    setLocalStorageItemWithRecovery(cacheKey, JSON.stringify(payload));
   } catch {
     // localStorage can be unavailable or full in embedded webviews.
   }
diff --git a/desktop/src/features/messages/ui/TypingIndicatorRow.tsx b/desktop/src/features/messages/ui/TypingIndicatorRow.tsx
index efb5b9ef09..ef9a8f1846 100644
--- a/desktop/src/features/messages/ui/TypingIndicatorRow.tsx
+++ b/desktop/src/features/messages/ui/TypingIndicatorRow.tsx
@@ -79,9 +79,7 @@ export function TypingIndicatorRow({
       aria-live="polite"
       className={cn(
         "shrink-0 bg-transparent",
-        isActivityVariant
-          ? "flex h-7 items-center px-0 py-0"
-          : "px-4 py-2 sm:px-6",
+        isActivityVariant ? "flex items-center px-0 py-0" : "px-4 py-2 sm:px-6",
         className,
       )}
       {...(labels.length > 0
diff --git a/desktop/src/features/messages/ui/anchoredScrollPolicy.ts b/desktop/src/features/messages/ui/anchoredScrollPolicy.ts
new file mode 100644
index 0000000000..5dfec80b83
--- /dev/null
+++ b/desktop/src/features/messages/ui/anchoredScrollPolicy.ts
@@ -0,0 +1,71 @@
+import type { TimelineMessageDelta } from "@/features/messages/lib/timelineSnapshot";
+
+export function getPinnedCenterDrift({
+  contentTop,
+  currentContentTop,
+}: {
+  contentTop: number;
+  currentContentTop: number;
+}): number | null {
+  const drift = currentContentTop - contentTop;
+  return Math.abs(drift) > 0.5 ? drift : null;
+}
+
+export function shouldIgnorePinnedCenterScroll({
+  currentScrollTop,
+  expectedScrollTop,
+  isWritingScroll,
+}: {
+  currentScrollTop: number;
+  expectedScrollTop: number | null;
+  isWritingScroll: boolean;
+}): boolean {
+  return isWritingScroll || expectedScrollTop === currentScrollTop;
+}
+
+// Programmatic bottom pins require the physical floor, not merely the looser
+// UI at-bottom threshold used for unread affordances.
+const TRUE_BOTTOM_THRESHOLD_PX = 1;
+
+type BottomSettleContainer = Pick<
+  HTMLDivElement,
+  "scrollHeight" | "clientHeight" | "scrollTop" | "scrollTo"
+>;
+
+export function settleProgrammaticBottomPin(
+  container: BottomSettleContainer,
+): boolean {
+  container.scrollTo({ top: container.scrollHeight, behavior: "auto" });
+  return (
+    container.scrollHeight - container.clientHeight - container.scrollTop <=
+    TRUE_BOTTOM_THRESHOLD_PX
+  );
+}
+
+export function shouldSettleForSplitPanel({
+  isAtBottom,
+  splitPanelOpen,
+}: {
+  isAtBottom: boolean;
+  splitPanelOpen: boolean;
+}): boolean {
+  return isAtBottom && splitPanelOpen;
+}
+
+export function shouldSettleVirtualizedBottom({
+  isAtBottom,
+  messageDelta,
+  messagesArrived,
+  messagesChanged,
+}: {
+  isAtBottom: boolean;
+  messageDelta: TimelineMessageDelta;
+  messagesArrived: number;
+  messagesChanged: boolean;
+}): boolean {
+  return (
+    isAtBottom &&
+    messageDelta !== "prepend" &&
+    (messagesArrived > 0 || messagesChanged)
+  );
+}
diff --git a/desktop/src/features/messages/ui/useAnchoredScroll.lifecycle.test.mjs b/desktop/src/features/messages/ui/useAnchoredScroll.lifecycle.test.mjs
index 44854c0d58..ee3fec1a98 100644
--- a/desktop/src/features/messages/ui/useAnchoredScroll.lifecycle.test.mjs
+++ b/desktop/src/features/messages/ui/useAnchoredScroll.lifecycle.test.mjs
@@ -48,6 +48,10 @@ function installDOMShim() {
       return this.children[0] ?? null;
     }
 
+    get firstElementChild() {
+      return this.children[0] ?? null;
+    }
+
     get lastChild() {
       return this.children.at(-1) ?? null;
     }
@@ -122,8 +126,16 @@ function installDOMShim() {
   }
 
   globalThis.document = new DocumentShim();
+  const windowEvents = new EventTargetShim();
+  globalThis.addEventListener =
+    windowEvents.addEventListener.bind(windowEvents);
+  globalThis.removeEventListener =
+    windowEvents.removeEventListener.bind(windowEvents);
+  globalThis.dispatchEvent = windowEvents.dispatchEvent.bind(windowEvents);
   globalThis.HTMLIFrameElement = NodeShim;
+  globalThis.HTMLDivElement = NodeShim;
   globalThis.HTMLElement = NodeShim;
+  globalThis.Node = NodeShim;
   globalThis.IS_REACT_ACT_ENVIRONMENT = true;
   process.env.IS_REACT_ACT_ENVIRONMENT = "true";
   Object.defineProperty(globalThis, "window", {
@@ -142,6 +154,7 @@ import { act } from "react";
 import { createRoot } from "react-dom/client";
 
 import { useAnchoredScroll } from "./useAnchoredScroll.ts";
+import { useVirtualizedBottomSettle } from "./useVirtualizedBottomSettle.ts";
 
 function makePinnedCenterNodes() {
   const resizeObservers = [];
@@ -160,7 +173,7 @@ function makePinnedCenterNodes() {
         listener(event);
     },
     getBoundingClientRect() {
-      return { top: 0 };
+      return { bottom: this.clientHeight, top: 0 };
     },
     querySelector() {
       return row;
@@ -205,7 +218,8 @@ function makePinnedCenterNodes() {
     disconnect() {}
 
     observe(target) {
-      this.target = target;
+      this.targets ??= [];
+      this.targets.push(target);
     }
   };
 
@@ -219,12 +233,13 @@ function makePinnedCenterNodes() {
   };
 }
 
-function Harness({ channelId, refs }) {
+function Harness({ channelId, onTargetSettled, refs }) {
   useAnchoredScroll({
     channelId,
     contentRef: refs.content,
     isLoading: false,
     messages: [{ id: "selected" }],
+    onTargetSettled,
     pinTargetCentered: true,
     scrollContainerRef: refs.container,
     targetMessageId: "selected",
@@ -232,6 +247,51 @@ function Harness({ channelId, refs }) {
   return null;
 }
 
+function BottomStateHarness({
+  messages,
+  onState,
+  refs,
+  targetMessageId = null,
+}) {
+  const anchored = useAnchoredScroll({
+    channelId: "conversation",
+    contentRef: refs.content,
+    isLoading: false,
+    messages,
+    pinTargetCentered: targetMessageId !== null,
+    scrollContainerRef: refs.container,
+    targetMessageId,
+  });
+  onState(anchored);
+  return null;
+}
+
+function VirtualTargetHarness({ refs }) {
+  const didRun = React.useRef(false);
+  const bottomApi = useVirtualizedBottomSettle(
+    refs.host,
+    refs.list,
+    refs.itemsLength,
+  );
+  const anchored = useAnchoredScroll({
+    channelId: "conversation",
+    contentRef: refs.content,
+    isLoading: false,
+    messages: Array.from({ length: 5 }, (_, index) => ({ id: String(index) })),
+    scrollContainerRef: refs.scroller,
+    virtualCancelBottomIntent: bottomApi.cancel,
+    virtualizerOwnsPrependAnchoring: true,
+    virtualScrollToMessage: () => true,
+  });
+  React.useLayoutEffect(() => {
+    if (didRun.current) return;
+    didRun.current = true;
+    bottomApi.settle();
+    refs.targetResult.current = anchored.scrollToMessage("selected");
+  }, [anchored.scrollToMessage, bottomApi.settle, refs.targetResult]);
+  return null;
+}
+
 test("channel change attaches pinned-center observers after refs mount", async () => {
   const refs = {
     container: { current: null },
@@ -254,7 +314,10 @@ test("channel change attaches pinned-center observers after refs mount", async (
   });
 
   assert.equal(nodes.resizeObservers.length, 1);
-  assert.equal(nodes.resizeObservers[0].target, nodes.content);
+  assert.deepEqual(nodes.resizeObservers[0].targets, [
+    nodes.content,
+    nodes.container,
+  ]);
   assert.equal(nodes.container.listeners.get("wheel")?.length, 1);
 
   await act(async () => {
@@ -272,3 +335,265 @@ test("channel change attaches pinned-center observers after refs mount", async (
     root.unmount();
   });
 });
+
+test("arrival at the physical floor does not preserve a stale unread state", async () => {
+  const refs = {
+    container: { current: null },
+    content: { current: null },
+  };
+  const root = createRoot(document.createElement("div"));
+  const nodes = makePinnedCenterNodes();
+  refs.container.current = nodes.container;
+  refs.content.current = nodes.content;
+  let state = null;
+  const render = (messages) =>
+    root.render(
+      React.createElement(BottomStateHarness, {
+        messages,
+        onState: (nextState) => {
+          state = nextState;
+        },
+        refs,
+      }),
+    );
+
+  await act(async () => render([{ id: "first" }]));
+  await act(async () => new Promise((resolve) => setTimeout(resolve, 0)));
+  nodes.container.scrollTop = 100;
+  await act(async () => state.onScroll());
+  nodes.container.scrollTop = 100;
+  await act(async () => state.onScroll());
+  assert.equal(state.isAtBottom, false);
+
+  // Native anchoring can return the viewport to the floor without a scroll or
+  // resize callback, leaving only the hook's cached message anchor stale.
+  nodes.container.scrollTop =
+    nodes.container.scrollHeight - nodes.container.clientHeight;
+  await act(async () => render([{ id: "first" }, { id: "second" }]));
+
+  assert.equal(state.isAtBottom, true);
+  assert.equal(state.newMessageCount, 0);
+  await act(async () => root.unmount());
+});
+
+test("arrival does not steal an active layout target during floor-like reflow", async () => {
+  const refs = {
+    container: { current: null },
+    content: { current: null },
+  };
+  const root = createRoot(document.createElement("div"));
+  const nodes = makePinnedCenterNodes();
+  refs.container.current = nodes.container;
+  refs.content.current = nodes.content;
+  let state = null;
+  const render = (messages, targetMessageId = null) =>
+    root.render(
+      React.createElement(BottomStateHarness, {
+        messages,
+        onState: (nextState) => {
+          state = nextState;
+        },
+        refs,
+        targetMessageId,
+      }),
+    );
+
+  await act(async () => render([{ id: "selected" }]));
+  await act(async () => new Promise((resolve) => setTimeout(resolve, 0)));
+  nodes.container.scrollTop = 100;
+  await act(async () => state.onScroll());
+  nodes.container.scrollTop = 100;
+  await act(async () => state.onScroll());
+  assert.equal(state.isAtBottom, false);
+
+  // A focus/split presentation switch can commit fresh replies while the old
+  // container geometry momentarily reads as the physical floor. The explicit
+  // layout target must win so the reading row is restored after reflow.
+  nodes.container.scrollTop =
+    nodes.container.scrollHeight - nodes.container.clientHeight;
+  await act(async () =>
+    render([{ id: "selected" }, { id: "second" }], "selected"),
+  );
+
+  assert.equal(state.isAtBottom, false);
+  assert.equal(state.newMessageCount, 1);
+  await act(async () => root.unmount());
+});
+
+test("container resize clears a stale new-message state at the physical floor", async () => {
+  const refs = {
+    container: { current: null },
+    content: { current: null },
+  };
+  const root = createRoot(document.createElement("div"));
+  const nodes = makePinnedCenterNodes();
+  refs.container.current = nodes.container;
+  refs.content.current = nodes.content;
+  let state = null;
+  const render = (messages) =>
+    root.render(
+      React.createElement(BottomStateHarness, {
+        messages,
+        onState: (nextState) => {
+          state = nextState;
+        },
+        refs,
+      }),
+    );
+
+  await act(async () => render([{ id: "first" }]));
+  await act(async () => new Promise((resolve) => setTimeout(resolve, 0)));
+  nodes.container.scrollTop = 100;
+  await act(async () => state.onScroll());
+  nodes.container.scrollTop = 100;
+  await act(async () => state.onScroll());
+  await act(async () => render([{ id: "first" }, { id: "second" }]));
+  assert.equal(state.isAtBottom, false);
+  assert.equal(state.newMessageCount, 1);
+
+  // A taller viewport reaches the floor without producing a native scroll.
+  nodes.container.clientHeight = 900;
+  await act(async () => nodes.resizeObservers[0].callback());
+
+  assert.equal(state.isAtBottom, true);
+  assert.equal(state.newMessageCount, 0);
+  await act(async () => root.unmount());
+});
+
+test("pinned target resize reconciles bottom state before retiring", async () => {
+  const refs = {
+    container: { current: null },
+    content: { current: null },
+  };
+  const root = createRoot(document.createElement("div"));
+  const settled = [];
+  const nodes = makePinnedCenterNodes();
+  refs.container.current = nodes.container;
+  refs.content.current = nodes.content;
+
+  await act(async () => {
+    root.render(
+      React.createElement(Harness, {
+        channelId: "conversation",
+        onTargetSettled: (messageId) => settled.push(messageId),
+        refs,
+      }),
+    );
+  });
+
+  assert.deepEqual(settled, [], "initial target reach is not settled");
+  nodes.moveSelectedRowBy(96);
+  nodes.resizeObservers[0].callback();
+  assert.deepEqual(settled, [], "resize callback waits for the paint frame");
+  await act(async () => new Promise((resolve) => setTimeout(resolve, 0)));
+
+  assert.deepEqual(settled, ["selected"]);
+  assert.deepEqual(nodes.container.scrollWrites, [96]);
+  await act(async () => root.unmount());
+});
+
+test("user interaction releases and retires a pending pinned target", async () => {
+  const refs = {
+    container: { current: null },
+    content: { current: null },
+  };
+  const root = createRoot(document.createElement("div"));
+  const settled = [];
+  const nodes = makePinnedCenterNodes();
+  refs.container.current = nodes.container;
+  refs.content.current = nodes.content;
+
+  await act(async () => {
+    root.render(
+      React.createElement(Harness, {
+        channelId: "conversation",
+        onTargetSettled: (messageId) => settled.push(messageId),
+        refs,
+      }),
+    );
+  });
+  await act(async () => nodes.container.dispatchEvent({ type: "wheel" }));
+  nodes.moveSelectedRowBy(96);
+  nodes.resizeObservers[0].callback();
+  await act(async () => new Promise((resolve) => setTimeout(resolve, 0)));
+
+  assert.deepEqual(settled, ["selected"]);
+  assert.deepEqual(nodes.container.scrollWrites, []);
+  await act(async () => root.unmount());
+});
+
+test("mounted virtual target retires bottom intent before direct centering", async () => {
+  const resizeObservers = [];
+  globalThis.ResizeObserver = class {
+    constructor(callback) {
+      this.callback = callback;
+      this.targets = [];
+      resizeObservers.push(this);
+    }
+    disconnect() {}
+    observe(target) {
+      this.targets.push(target);
+    }
+  };
+
+  const content = document.createElement("div");
+  const scroller = document.createElement("div");
+  const host = document.createElement("div");
+  scroller.appendChild(content);
+  host.appendChild(scroller);
+  scroller.clientHeight = 400;
+  scroller.scrollHeight = 1_000;
+  scroller.scrollTop = 0;
+  scroller.getBoundingClientRect = () => ({ bottom: 400, top: 0 });
+  const targetContentTop = 250;
+  const row = {
+    getBoundingClientRect: () => ({
+      bottom: targetContentTop - scroller.scrollTop + 40,
+      height: 40,
+      top: targetContentTop - scroller.scrollTop,
+    }),
+  };
+  scroller.querySelector = () => row;
+  scroller.querySelectorAll = () => [];
+  scroller.scrollTo = ({ top }) => {
+    scroller.scrollTop = top;
+  };
+
+  const bottomWrites = [];
+  const refs = {
+    content: { current: content },
+    host: { current: host },
+    itemsLength: { current: 5 },
+    list: {
+      current: {
+        scrollToIndex: (index, options) =>
+          bottomWrites.push({ index, options }),
+      },
+    },
+    scroller: { current: scroller },
+    targetResult: { current: null },
+  };
+  const root = createRoot(document.createElement("div"));
+  await act(async () => {
+    root.render(React.createElement(VirtualTargetHarness, { refs }));
+  });
+
+  assert.deepEqual(bottomWrites, [{ index: 4, options: { align: "end" } }]);
+  assert.equal(refs.targetResult.current, true);
+  assert.equal(row.getBoundingClientRect().top, 180);
+  const bottomGeometryObserver = resizeObservers.find(
+    (observer) =>
+      observer.targets.includes(content) && observer.targets.includes(scroller),
+  );
+  assert.ok(bottomGeometryObserver);
+  bottomGeometryObserver.callback();
+  await act(async () => new Promise((resolve) => setTimeout(resolve, 0)));
+
+  assert.equal(
+    row.getBoundingClientRect().top,
+    180,
+    "target remains centered after later virtual geometry activity",
+  );
+  assert.equal(bottomWrites.length, 1, "geometry cannot re-pin to bottom");
+  await act(async () => root.unmount());
+});
diff --git a/desktop/src/features/messages/ui/useAnchoredScroll.test.mjs b/desktop/src/features/messages/ui/useAnchoredScroll.test.mjs
index ba1acb7aa6..28273f08bb 100644
--- a/desktop/src/features/messages/ui/useAnchoredScroll.test.mjs
+++ b/desktop/src/features/messages/ui/useAnchoredScroll.test.mjs
@@ -7,7 +7,7 @@ import {
   shouldIgnorePinnedCenterScroll,
   shouldSettleForSplitPanel,
   shouldSettleVirtualizedBottom,
-} from "./useAnchoredScroll.ts";
+} from "./anchoredScrollPolicy.ts";
 
 function fakeContainer({ clientHeight, scrollHeight, scrollTop }) {
   const writes = [];
diff --git a/desktop/src/features/messages/ui/useAnchoredScroll.ts b/desktop/src/features/messages/ui/useAnchoredScroll.ts
index b865260de0..0bfcb3b3e2 100644
--- a/desktop/src/features/messages/ui/useAnchoredScroll.ts
+++ b/desktop/src/features/messages/ui/useAnchoredScroll.ts
@@ -1,9 +1,14 @@
 import * as React from "react";
 
+import { classifyTimelineMessageDelta } from "@/features/messages/lib/timelineSnapshot";
 import {
-  classifyTimelineMessageDelta,
-  type TimelineMessageDelta,
-} from "@/features/messages/lib/timelineSnapshot";
+  getPinnedCenterDrift,
+  settleProgrammaticBottomPin,
+  shouldIgnorePinnedCenterScroll,
+  shouldSettleForSplitPanel,
+  shouldSettleVirtualizedBottom,
+} from "./anchoredScrollPolicy";
+import { useVirtualizedViewportResize } from "./useVirtualizedViewportResize";
 
 /**
  * Distance (in CSS pixels) below which we consider the scroll position
@@ -12,81 +17,12 @@ import {
  * rounding from the layout engine.
  */
 const AT_BOTTOM_THRESHOLD_PX = 32;
-// Tests and user-visible "pinned" affordances need the view at the physical
-// floor, not merely within the looser UI at-bottom threshold. The loose
-// threshold decides whether the user is close enough to count as reading the
-// latest message; this strict threshold decides when a programmatic bottom pin
-// has actually finished settling.
-const TRUE_BOTTOM_THRESHOLD_PX = 1;
 
 type AnchorState =
   | { kind: "at-bottom" }
   | { kind: "message"; messageId: string; topOffset: number }
   | { kind: "pinned-center"; messageId: string; contentTop: number };
 
-export function getPinnedCenterDrift({
-  contentTop,
-  currentContentTop,
-}: {
-  contentTop: number;
-  currentContentTop: number;
-}): number | null {
-  const drift = currentContentTop - contentTop;
-  return Math.abs(drift) > 0.5 ? drift : null;
-}
-
-export function shouldIgnorePinnedCenterScroll({
-  currentScrollTop,
-  expectedScrollTop,
-  isWritingScroll,
-}: {
-  currentScrollTop: number;
-  expectedScrollTop: number | null;
-  isWritingScroll: boolean;
-}): boolean {
-  return isWritingScroll || expectedScrollTop === currentScrollTop;
-}
-
-type BottomSettleContainer = Pick<
-  HTMLDivElement,
-  "scrollHeight" | "clientHeight" | "scrollTop" | "scrollTo"
->;
-
-export function settleProgrammaticBottomPin(
-  container: BottomSettleContainer,
-): boolean {
-  container.scrollTo({ top: container.scrollHeight, behavior: "auto" });
-  return isAtTrueBottom(container);
-}
-
-export function shouldSettleForSplitPanel({
-  isAtBottom,
-  splitPanelOpen,
-}: {
-  isAtBottom: boolean;
-  splitPanelOpen: boolean;
-}): boolean {
-  return isAtBottom && splitPanelOpen;
-}
-
-export function shouldSettleVirtualizedBottom({
-  isAtBottom,
-  messageDelta,
-  messagesArrived,
-  messagesChanged,
-}: {
-  isAtBottom: boolean;
-  messageDelta: TimelineMessageDelta;
-  messagesArrived: number;
-  messagesChanged: boolean;
-}): boolean {
-  return (
-    isAtBottom &&
-    messageDelta !== "prepend" &&
-    (messagesArrived > 0 || messagesChanged)
-  );
-}
-
 type UseAnchoredScrollOptions = {
   /** Scroll container. Owned by the parent so external refs still compose. */
   scrollContainerRef: React.RefObject<HTMLDivElement | null>;
@@ -109,6 +45,9 @@ type UseAnchoredScrollOptions = {
   /** Keeps a targeted message centered until the user deliberately scrolls. */
   pinTargetCentered?: boolean;
   onTargetReached?: (messageId: string) => void;
+  /** Reports a pinned target after resize correction and one paint frame. */
+  onTargetSettled?: (messageId: string) => void;
+  virtualCancelBottomIntent?: () => void;
   virtualScrollToMessage?: (
     messageId: string,
     options?: { behavior?: ScrollBehavior },
@@ -134,6 +73,9 @@ type UseAnchoredScrollResult = {
   highlightedMessageId: string | null;
   /** Imperative: scroll to bottom. */
   scrollToBottom: (behavior?: ScrollBehavior) => void;
+  /** Re-pins after a layout owner changes trailing geometry. Returns true when
+   *  the hook handled the settlement, including a preserved pinned target. */
+  settleAtBottomAfterLayout: () => boolean;
   /** Arm a one-shot scroll-to-bottom that fires on the next appended message
    *  (used by the composer's send flow). */
   scrollToBottomOnNextUpdate: () => void;
@@ -159,18 +101,6 @@ function isAtBottomNow(
   );
 }
 
-function isAtTrueBottom(
-  container: Pick<
-    HTMLDivElement,
-    "scrollHeight" | "clientHeight" | "scrollTop"
-  >,
-) {
-  return (
-    container.scrollHeight - container.clientHeight - container.scrollTop <=
-    TRUE_BOTTOM_THRESHOLD_PX
-  );
-}
-
 /**
  * Pick an anchor for the current scroll position.
  *
@@ -229,6 +159,8 @@ export function useAnchoredScroll({
   highlightTargetMessage = true,
   pinTargetCentered = false,
   onTargetReached,
+  onTargetSettled,
+  virtualCancelBottomIntent,
   virtualScrollToMessage,
   virtualScrollToBottom,
   virtualSettleAtBottom,
@@ -276,6 +208,7 @@ export function useAnchoredScroll({
   const programmaticScrollTopRef = React.useRef<number | null>(null);
   const isWritingScrollRef = React.useRef(false);
   const programmaticScrollRafRef = React.useRef<number | null>(null);
+  const targetSettleRafRef = React.useRef<number | null>(null);
 
   // Reset everything when the channel changes — the layout effect that runs
   // immediately after this reset is responsible for either jumping to bottom
@@ -301,6 +234,10 @@ export function useAnchoredScroll({
       cancelAnimationFrame(programmaticScrollRafRef.current);
       programmaticScrollRafRef.current = null;
     }
+    if (targetSettleRafRef.current !== null) {
+      cancelAnimationFrame(targetSettleRafRef.current);
+      targetSettleRafRef.current = null;
+    }
     if (highlightTimeoutRef.current !== null) {
       window.clearTimeout(highlightTimeoutRef.current);
       highlightTimeoutRef.current = null;
@@ -380,6 +317,40 @@ export function useAnchoredScroll({
     if (atBottom) setNewMessageCount(0);
   }, [scrollContainerRef]);
 
+  const schedulePinnedTargetSettle = React.useCallback(
+    (messageId: string) => {
+      if (!onTargetSettled) return;
+      if (targetSettleRafRef.current !== null) {
+        cancelAnimationFrame(targetSettleRafRef.current);
+      }
+      targetSettleRafRef.current = requestAnimationFrame(() => {
+        targetSettleRafRef.current = null;
+        const container = scrollContainerRef.current;
+        const anchor = anchorRef.current;
+        if (
+          !container ||
+          anchor.kind !== "pinned-center" ||
+          anchor.messageId !== messageId
+        ) {
+          return;
+        }
+        const row = container.querySelector<HTMLElement>(
+          `[data-message-id="${CSS.escape(messageId)}"]`,
+        );
+        if (!row) return;
+        const rowRect = row.getBoundingClientRect();
+        const containerRect = container.getBoundingClientRect();
+        if (
+          rowRect.bottom > containerRect.top &&
+          rowRect.top < containerRect.bottom
+        ) {
+          onTargetSettled(messageId);
+        }
+      });
+    },
+    [onTargetSettled, scrollContainerRef],
+  );
+
   const scrollToBottomImperative = React.useCallback(
     (behavior: ScrollBehavior = "auto") => {
       const container = scrollContainerRef.current;
@@ -415,6 +386,35 @@ export function useAnchoredScroll({
     forceBottomOnNextAppendRef.current = true;
   }, []);
 
+  const settleAtBottomAfterLayout = React.useCallback(() => {
+    const container = scrollContainerRef.current;
+    if (!container) return false;
+    if (anchorRef.current.kind === "pinned-center") {
+      repinPinnedCenter();
+      const atBottom = isAtBottomNow(container);
+      setIsAtBottom((previous) =>
+        previous === atBottom ? previous : atBottom,
+      );
+      if (atBottom) setNewMessageCount(0);
+      schedulePinnedTargetSettle(anchorRef.current.messageId);
+      return true;
+    }
+    if (!isAtBottomNow(container)) return false;
+
+    anchorRef.current = { kind: "at-bottom" };
+    setIsAtBottom(true);
+    setNewMessageCount(0);
+    if (!virtualizerOwnsPrependAnchoring) {
+      container.scrollTo({ top: container.scrollHeight, behavior: "auto" });
+    }
+    return true;
+  }, [
+    repinPinnedCenter,
+    schedulePinnedTargetSettle,
+    scrollContainerRef,
+    virtualizerOwnsPrependAnchoring,
+  ]);
+
   const highlightMessage = React.useCallback((messageId: string) => {
     if (highlightTimeoutRef.current !== null) {
       window.clearTimeout(highlightTimeoutRef.current);
@@ -439,6 +439,10 @@ export function useAnchoredScroll({
         `[data-message-id="${messageId}"]`,
       );
       if (virtualizerOwnsPrependAnchoring && virtualScrollToMessage) {
+        // Target navigation owns the viewport before any movement strategy is
+        // chosen. The already-mounted fast path centers the DOM node directly
+        // and would otherwise leave durable bottom intent armed.
+        virtualCancelBottomIntent?.();
         if (el) {
           const rect = el.getBoundingClientRect();
           const containerRect = container.getBoundingClientRect();
@@ -534,6 +538,7 @@ export function useAnchoredScroll({
       highlightMessage,
       pinTargetCentered,
       scrollContainerRef,
+      virtualCancelBottomIntent,
       virtualizerOwnsPrependAnchoring,
       writePinnedCenterScroll,
       virtualScrollToMessage,
@@ -607,6 +612,11 @@ export function useAnchoredScroll({
     // to the requested target message, or to the bottom by default.
     if (!hasInitializedRef.current) {
       if (isLoading) return;
+      // The virtualized list owns the actual scroll node. Its API registers in
+      // a child layout effect, after this parent hook's first pass; treating
+      // that API-less pass as initialized writes to the inert outer wrapper
+      // and permanently consumes the channel's initial bottom pin.
+      if (virtualizerOwnsPrependAnchoring && !virtualScrollToBottom) return;
       // Establish the initial position before the browser paints. The follow-up
       // frame is a settling pass for content whose measurements land with the
       // commit (fonts, deferred rows, media), not the first bottom pin. Keeping
@@ -704,6 +714,22 @@ export function useAnchoredScroll({
         container.scrollTo({ top: container.scrollHeight, behavior: "auto" });
       }
       if (newLatestArrived) setNewMessageCount(0);
+    } else if (
+      messagesArrived > 0 &&
+      !targetMessageId &&
+      !virtualizerOwnsPrependAnchoring &&
+      isAtBottomNow(container)
+    ) {
+      // A native scroll/layout callback may not have reconciled a stale
+      // message anchor before this append commits. If the rendered result is
+      // still physically at the floor (common in short threads), do not turn
+      // that stale anchor into a visible unread affordance. Active navigation
+      // targets own the viewport and must be preserved across presentation
+      // reflow even when the old geometry momentarily reads as the floor.
+      anchorRef.current = { kind: "at-bottom" };
+      container.scrollTo({ top: container.scrollHeight, behavior: "auto" });
+      setIsAtBottom(true);
+      setNewMessageCount(0);
     } else if (messagesArrived > 0 && !virtualizerOwnsPrependAnchoring) {
       // Anchored mid-history. An older-history prepend grows the content above
       // the reading row; the browser's native scroll anchoring does NOT correct
@@ -740,11 +766,11 @@ export function useAnchoredScroll({
     isLoading,
     messages,
     onTargetReached,
+    repinPinnedCenter,
     scrollContainerRef,
     scrollToBottomImperative,
     scrollToMessageImperative,
     targetMessageId,
-    repinPinnedCenter,
     virtualScrollToBottom,
     virtualSettleAtBottom,
     virtualizerOwnsPrependAnchoring,
@@ -765,9 +791,8 @@ export function useAnchoredScroll({
     const observer = new ResizeObserver(() => {
       const container = scrollContainerRef.current;
       if (!container) return;
-      if (anchorRef.current.kind === "pinned-center") {
-        repinPinnedCenter();
-      } else if (
+      if (settleAtBottomAfterLayout()) return;
+      if (
         anchorRef.current.kind === "at-bottom" &&
         !virtualizerOwnsPrependAnchoring
       ) {
@@ -775,24 +800,50 @@ export function useAnchoredScroll({
       }
     });
     observer.observe(content);
-    return () => observer.disconnect();
+    const container = scrollContainerRef.current;
+    if (container && container !== content) observer.observe(container);
+    return () => {
+      observer.disconnect();
+      if (targetSettleRafRef.current !== null) {
+        cancelAnimationFrame(targetSettleRafRef.current);
+        targetSettleRafRef.current = null;
+      }
+    };
   }, [
     channelId,
     contentRef,
-    repinPinnedCenter,
     scrollContainerRef,
+    settleAtBottomAfterLayout,
     virtualizerOwnsPrependAnchoring,
   ]);
 
+  useVirtualizedViewportResize(
+    scrollContainerRef,
+    virtualizerAtBottomRef,
+    virtualizerOwnsPrependAnchoring ? virtualSettleAtBottom : undefined,
+  );
+
   // Pinned centers survive our own corrections but release as soon as the
-  // reader deliberately takes control of the scroll position.
+  // reader deliberately takes control of the scroll position or the caller
+  // retires the temporary target after layout settlement.
+  React.useEffect(() => {
+    if (!pinTargetCentered) releasePinnedCenter();
+  }, [pinTargetCentered, releasePinnedCenter]);
+
   // biome-ignore lint/correctness/useExhaustiveDependencies: channelId deliberately re-subscribes after a keyed or conditional scroll-container mount replaces ref.current.
   React.useEffect(() => {
     if (!pinTargetCentered) return;
     const container = scrollContainerRef.current;
     if (!container) return;
 
-    const handleUserInteraction = () => releasePinnedCenter();
+    const handleUserInteraction = () => {
+      const pinnedMessageId =
+        anchorRef.current.kind === "pinned-center"
+          ? anchorRef.current.messageId
+          : null;
+      releasePinnedCenter();
+      if (pinnedMessageId) onTargetSettled?.(pinnedMessageId);
+    };
     container.addEventListener("wheel", handleUserInteraction, {
       passive: true,
     });
@@ -805,7 +856,13 @@ export function useAnchoredScroll({
       container.removeEventListener("touchstart", handleUserInteraction);
       container.removeEventListener("keydown", handleUserInteraction);
     };
-  }, [channelId, pinTargetCentered, releasePinnedCenter, scrollContainerRef]);
+  }, [
+    channelId,
+    onTargetSettled,
+    pinTargetCentered,
+    releasePinnedCenter,
+    scrollContainerRef,
+  ]);
 
   // ---------------------------------------------------------------------------
   // Target message handling (deep link, jump-to-reply, etc.). Distinct from
@@ -884,6 +941,9 @@ export function useAnchoredScroll({
       if (programmaticScrollRafRef.current !== null) {
         cancelAnimationFrame(programmaticScrollRafRef.current);
       }
+      if (targetSettleRafRef.current !== null) {
+        cancelAnimationFrame(targetSettleRafRef.current);
+      }
     };
   }, []);
 
@@ -906,6 +966,7 @@ export function useAnchoredScroll({
     newMessageCount,
     highlightedMessageId,
     scrollToBottom: scrollToBottomImperative,
+    settleAtBottomAfterLayout,
     scrollToBottomOnNextUpdate,
     scrollToMessage: scrollToMessageImperative,
     onVirtualizerAtBottomStateChange,
diff --git a/desktop/src/features/messages/ui/useComposerHeightPadding.test.mjs b/desktop/src/features/messages/ui/useComposerHeightPadding.test.mjs
new file mode 100644
index 0000000000..23bfa90153
--- /dev/null
+++ b/desktop/src/features/messages/ui/useComposerHeightPadding.test.mjs
@@ -0,0 +1,31 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { shouldUseComposerPaddingFallback } from "./useComposerHeightPadding.ts";
+
+test("composer padding fallback follows initial measurement and growth", () => {
+  assert.equal(
+    shouldUseComposerPaddingFallback({
+      nextPadding: 100,
+      previousPadding: null,
+    }),
+    true,
+  );
+  assert.equal(
+    shouldUseComposerPaddingFallback({
+      nextPadding: 120,
+      previousPadding: 100,
+    }),
+    true,
+  );
+});
+
+test("composer padding fallback does not force-scroll on shrink", () => {
+  assert.equal(
+    shouldUseComposerPaddingFallback({
+      nextPadding: 100,
+      previousPadding: 120,
+    }),
+    false,
+  );
+});
diff --git a/desktop/src/features/messages/ui/useComposerHeightPadding.ts b/desktop/src/features/messages/ui/useComposerHeightPadding.ts
index c4f9beb3ec..9990ce5066 100644
--- a/desktop/src/features/messages/ui/useComposerHeightPadding.ts
+++ b/desktop/src/features/messages/ui/useComposerHeightPadding.ts
@@ -2,20 +2,35 @@ import * as React from "react";
 
 import { observeElementBlockSize } from "@/shared/layout/observeElementBlockSize";
 
+export function shouldUseComposerPaddingFallback({
+  nextPadding,
+  previousPadding,
+}: {
+  nextPadding: number;
+  previousPadding: number | null;
+}): boolean {
+  return previousPadding === null || nextPadding > previousPadding;
+}
+
 /**
  * Observes the height of the composer overlay and sets the scroll
  * container's `paddingBottom` to match, so content is never hidden
  * behind the absolutely-positioned composer.
  *
- * If the user is already scrolled to the bottom when padding increases,
- * auto-scrolls to keep them at the bottom (no visible gap).
+ * If the reader is already near the bottom, the legacy fallback follows only
+ * initial measurement and growth. Consumers with semantic bottom ownership may
+ * provide `settleAtBottom` to handle both growth and shrink safely.
  */
 export function useComposerHeightPadding(
   scrollContainerRef: React.RefObject<HTMLElement | null>,
   composerRef: React.RefObject<HTMLElement | null>,
   resetKey?: unknown,
   mode: "padding" | "css-variable" = "padding",
+  settleAtBottom?: () => boolean,
 ) {
+  const settleAtBottomRef = React.useRef(settleAtBottom);
+  settleAtBottomRef.current = settleAtBottom;
+
   React.useEffect(() => {
     void resetKey;
     const scrollEl = scrollContainerRef.current;
@@ -70,10 +85,18 @@ export function useComposerHeightPadding(
       }
       lastPadding = padding;
 
-      if (
-        wasAtBottom &&
-        (previousPadding === null || padding > previousPadding)
-      ) {
+      if (wasAtBottom && previousPadding !== padding) {
+        if (settleAtBottomRef.current?.()) {
+          return;
+        }
+        if (
+          !shouldUseComposerPaddingFallback({
+            nextPadding: padding,
+            previousPadding,
+          })
+        ) {
+          return;
+        }
         followBottom();
         if (followBottomFrame !== null) {
           cancelAnimationFrame(followBottomFrame);
diff --git a/desktop/src/features/messages/ui/useSettleGatedPrependMessages.ts b/desktop/src/features/messages/ui/useSettleGatedPrependMessages.ts
index 84663e5da3..bad8d0f04a 100644
--- a/desktop/src/features/messages/ui/useSettleGatedPrependMessages.ts
+++ b/desktop/src/features/messages/ui/useSettleGatedPrependMessages.ts
@@ -4,13 +4,13 @@ import * as React from "react";
  * Holds an older-history prepend out of the rendered timeline until the
  * scroller is genuinely at rest, then admits it atomically.
  *
- * Why: every prepend-compensation mechanism in this design — Virtua's shift
- * correction, the pre-paint scrollBy, the semantic-anchor watcher — is a
- * scrollTop write. On macOS WKWebView those writes can be dropped or
- * overridden while trackpad momentum owns the committed offset, so a page
- * commit that lands mid-fling displaces the viewport by the full prepended
- * height with no reliable way to correct it. Committing only at rest keeps
- * all three writers operating in the regime where they are exact.
+ * Why: Virtua reconciles an active prepend by correcting scrollTop as the
+ * inserted rows are measured. On macOS WKWebView those corrections can be
+ * dropped or overridden while trackpad momentum owns the committed offset, so
+ * a page admitted mid-fling can displace the viewport by the full prepended
+ * height. Admitting only at rest gives Virtua a stable geometry window in
+ * which to complete that reconciliation exactly; subsequent reader wheel input
+ * then retires it.
  *
  * The fetched store stays authoritative and fetches still start immediately;
  * this hook only delays when the fetched page joins the rendered snapshot.
diff --git a/desktop/src/features/messages/ui/useUpwardPaginationWheel.ts b/desktop/src/features/messages/ui/useUpwardPaginationWheel.ts
index 5c3c4fb22c..910b251ac4 100644
--- a/desktop/src/features/messages/ui/useUpwardPaginationWheel.ts
+++ b/desktop/src/features/messages/ui/useUpwardPaginationWheel.ts
@@ -15,6 +15,9 @@ export function useUpwardPaginationWheel(
     if (!(scroller instanceof HTMLDivElement)) return;
     let releaseTimer: number | null = null;
     const handleWheel = (event: WheelEvent) => {
+      // Ctrl+wheel belongs to browser zoom. It must not retire bottom intent or
+      // arm upward-pagination momentum because it does not move the reader.
+      if (event.ctrlKey) return;
       onWheel();
       if (event.deltaY >= 0) {
         clear();
diff --git a/desktop/src/features/messages/ui/useVirtualizedBottomSettle.test.mjs b/desktop/src/features/messages/ui/useVirtualizedBottomSettle.test.mjs
new file mode 100644
index 0000000000..bc0aebe917
--- /dev/null
+++ b/desktop/src/features/messages/ui/useVirtualizedBottomSettle.test.mjs
@@ -0,0 +1,280 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+class EventTargetShim {
+  listeners = new Map();
+  addEventListener(type, listener) {
+    this.listeners.set(type, [...(this.listeners.get(type) ?? []), listener]);
+  }
+  removeEventListener(type, listener) {
+    this.listeners.set(
+      type,
+      (this.listeners.get(type) ?? []).filter(
+        (current) => current !== listener,
+      ),
+    );
+  }
+  dispatchEvent(event) {
+    for (const listener of this.listeners.get(event.type) ?? [])
+      listener(event);
+    return true;
+  }
+}
+
+class ElementShim extends EventTargetShim {
+  constructor(firstElementChild = null) {
+    super();
+    this.firstElementChild = firstElementChild;
+    this.children = [];
+    this.childNodes = [];
+    this.isContentEditable = false;
+    this.nodeName = "DIV";
+    this.tagName = "DIV";
+    this.nodeType = 1;
+    this.namespaceURI = "http://www.w3.org/1999/xhtml";
+  }
+  get ownerDocument() {
+    return globalThis.document;
+  }
+  appendChild(child) {
+    this.children.push(child);
+    this.childNodes.push(child);
+    return child;
+  }
+  removeChild(child) {
+    this.children = this.children.filter((current) => current !== child);
+    this.childNodes = this.childNodes.filter((current) => current !== child);
+    return child;
+  }
+  insertBefore(child, reference) {
+    const index = this.children.indexOf(reference);
+    if (index < 0) return this.appendChild(child);
+    this.children.splice(index, 0, child);
+    this.childNodes.splice(index, 0, child);
+    return child;
+  }
+  closest() {
+    return null;
+  }
+  contains(target) {
+    return this === target || this.firstElementChild?.contains(target) === true;
+  }
+}
+
+globalThis.document = {
+  addEventListener() {},
+  createElement: () => new ElementShim(),
+  get defaultView() {
+    return globalThis.window;
+  },
+  nodeType: 9,
+  removeEventListener() {},
+};
+
+const animationFrames = new Map();
+let nextAnimationFrameId = 1;
+globalThis.requestAnimationFrame = (callback) => {
+  const id = nextAnimationFrameId++;
+  animationFrames.set(id, callback);
+  return id;
+};
+globalThis.cancelAnimationFrame = (id) => animationFrames.delete(id);
+globalThis.HTMLElement = ElementShim;
+globalThis.HTMLDivElement = ElementShim;
+globalThis.Node = ElementShim;
+globalThis.IS_REACT_ACT_ENVIRONMENT = true;
+process.env.IS_REACT_ACT_ENVIRONMENT = "true";
+Object.defineProperty(globalThis, "window", {
+  configurable: true,
+  value: new EventTargetShim(),
+});
+globalThis.window.HTMLIFrameElement = ElementShim;
+
+const resizeObservers = [];
+globalThis.ResizeObserver = class {
+  constructor(callback) {
+    this.callback = callback;
+    resizeObservers.push(this);
+  }
+  disconnect() {}
+  observe(target) {
+    this.targets = [...(this.targets ?? []), target];
+  }
+};
+
+import React from "react";
+import { act } from "react";
+import { createRoot } from "react-dom/client";
+import { useVirtualizedBottomSettle } from "./useVirtualizedBottomSettle.ts";
+
+function flushAnimationFrames() {
+  const callbacks = [...animationFrames.values()];
+  animationFrames.clear();
+  for (const callback of callbacks) callback(performance.now());
+}
+
+function Harness({ apiRef, hostRef, itemsLengthRef, listRef }) {
+  apiRef.current = useVirtualizedBottomSettle(hostRef, listRef, itemsLengthRef);
+  return null;
+}
+
+async function mountHarness() {
+  animationFrames.clear();
+  resizeObservers.length = 0;
+  const content = new ElementShim();
+  const scroller = new ElementShim(content);
+  const host = new ElementShim(scroller);
+  const writes = [];
+  const refs = {
+    api: { current: null },
+    host: { current: host },
+    itemsLength: { current: 5 },
+    list: {
+      current: {
+        scrollToIndex(index, options) {
+          writes.push({ index, options });
+        },
+      },
+    },
+  };
+  const root = createRoot(new ElementShim());
+  await act(async () => {
+    root.render(
+      React.createElement(Harness, {
+        apiRef: refs.api,
+        hostRef: refs.host,
+        itemsLengthRef: refs.itemsLength,
+        listRef: refs.list,
+      }),
+    );
+  });
+  return { content, refs, root, scroller, writes };
+}
+
+test("bottom intent follows arbitrarily late virtual geometry changes", async () => {
+  const { content, refs, root, scroller, writes } = await mountHarness();
+  refs.api.current.settle();
+  assert.deepEqual(writes, [{ index: 4, options: { align: "end" } }]);
+
+  const geometryObserver = resizeObservers.find((observer) =>
+    observer.targets?.includes(content),
+  );
+  assert.ok(geometryObserver);
+  geometryObserver.callback();
+  flushAnimationFrames();
+  assert.equal(writes.length, 2);
+
+  // There is no deadline: another geometry change much later still re-pins.
+  geometryObserver.callback();
+  flushAnimationFrames();
+  assert.equal(writes.length, 3);
+
+  // Viewport changes also move the physical floor without resizing content.
+  assert.ok(geometryObserver.targets.includes(scroller));
+  geometryObserver.callback();
+  flushAnimationFrames();
+  assert.equal(writes.length, 4);
+  await act(async () => root.unmount());
+});
+
+for (const eventType of ["pointerdown", "touchmove", "wheel", "keydown"]) {
+  test(`${eventType} transfers ownership away from bottom intent`, async () => {
+    const { content, refs, root, scroller, writes } = await mountHarness();
+    refs.api.current.settle();
+    const target = eventType === "keydown" ? window : scroller;
+    target.dispatchEvent({
+      altKey: false,
+      ctrlKey: false,
+      key: eventType === "keydown" ? "PageUp" : undefined,
+      metaKey: false,
+      target:
+        eventType === "keydown"
+          ? scroller
+          : eventType === "pointerdown"
+            ? scroller
+            : undefined,
+      type: eventType,
+    });
+
+    resizeObservers
+      .find((observer) => observer.targets?.includes(content))
+      .callback();
+    flushAnimationFrames();
+    assert.equal(writes.length, 1);
+    await act(async () => root.unmount());
+    assert.equal(
+      scroller.listeners.get(eventType)?.length ?? 0,
+      0,
+      `${eventType} listener is removed on unmount`,
+    );
+  });
+}
+
+test("descendant interaction and outside navigation preserve bottom intent", async () => {
+  const { content, refs, root, scroller, writes } = await mountHarness();
+  refs.api.current.settle();
+  const rowControl = new ElementShim();
+  scroller.firstElementChild.firstElementChild = rowControl;
+
+  scroller.dispatchEvent({ target: rowControl, type: "pointerdown" });
+  window.dispatchEvent({
+    altKey: false,
+    ctrlKey: false,
+    key: "PageUp",
+    metaKey: false,
+    target: new ElementShim(),
+    type: "keydown",
+  });
+  resizeObservers
+    .find((observer) => observer.targets?.includes(content))
+    .callback();
+  flushAnimationFrames();
+
+  assert.equal(writes.length, 2);
+  await act(async () => root.unmount());
+});
+
+test("Ctrl+wheel zoom preserves bottom intent through geometry reflow", async () => {
+  const { content, refs, root, scroller, writes } = await mountHarness();
+  refs.api.current.settle();
+
+  scroller.dispatchEvent({ ctrlKey: true, deltaY: -100, type: "wheel" });
+  resizeObservers
+    .find((observer) => observer.targets?.includes(content))
+    .callback();
+  flushAnimationFrames();
+
+  assert.equal(writes.length, 2);
+  await act(async () => root.unmount());
+});
+
+test("typing and editable navigation keys preserve bottom intent", async () => {
+  const { content, refs, root, writes } = await mountHarness();
+  refs.api.current.settle();
+
+  window.dispatchEvent({
+    altKey: false,
+    ctrlKey: false,
+    key: "a",
+    metaKey: false,
+    target: null,
+    type: "keydown",
+  });
+  const editable = new ElementShim();
+  editable.isContentEditable = true;
+  window.dispatchEvent({
+    altKey: false,
+    ctrlKey: false,
+    key: "ArrowUp",
+    metaKey: false,
+    target: editable,
+    type: "keydown",
+  });
+
+  resizeObservers
+    .find((observer) => observer.targets?.includes(content))
+    .callback();
+  flushAnimationFrames();
+  assert.equal(writes.length, 2);
+  await act(async () => root.unmount());
+});
diff --git a/desktop/src/features/messages/ui/useVirtualizedBottomSettle.ts b/desktop/src/features/messages/ui/useVirtualizedBottomSettle.ts
index 2ff91de99f..8c0535779f 100644
--- a/desktop/src/features/messages/ui/useVirtualizedBottomSettle.ts
+++ b/desktop/src/features/messages/ui/useVirtualizedBottomSettle.ts
@@ -1,67 +1,129 @@
 import * as React from "react";
 import type { VListHandle } from "virtua";
 
-const BOTTOM_EPSILON_PX = 1;
-const SETTLE_DEADLINE_MS = 250;
+const SCROLL_INTENT_KEYS = new Set([
+  "ArrowDown",
+  "ArrowUp",
+  "End",
+  "Home",
+  "PageDown",
+  "PageUp",
+  " ",
+]);
+
+function isEditableKeyboardTarget(target: EventTarget | null) {
+  if (!(target instanceof HTMLElement)) return false;
+  if (target.isContentEditable) return true;
+  return (
+    target.closest("input, textarea, select, [contenteditable='true']") !== null
+  );
+}
 
 export function useVirtualizedBottomSettle(
   hostRef: React.RefObject<HTMLDivElement | null>,
   listRef: React.RefObject<VListHandle | null>,
   itemsLengthRef: React.RefObject<number>,
 ) {
+  const bottomIntentRef = React.useRef(false);
   const frameRef = React.useRef<number | null>(null);
-  const cancel = React.useCallback(() => {
+
+  const cancelFrame = React.useCallback(() => {
     if (frameRef.current !== null) {
       cancelAnimationFrame(frameRef.current);
       frameRef.current = null;
     }
   }, []);
 
+  const cancel = React.useCallback(() => {
+    bottomIntentRef.current = false;
+    cancelFrame();
+  }, [cancelFrame]);
+
+  const pinToBottom = React.useCallback(() => {
+    if (!bottomIntentRef.current) return;
+    const scroller = hostRef.current?.firstElementChild;
+    const lastIndex = itemsLengthRef.current - 1;
+    if (!(scroller instanceof HTMLDivElement) || lastIndex < 0) return;
+    listRef.current?.scrollToIndex(lastIndex, { align: "end" });
+  }, [hostRef, itemsLengthRef, listRef]);
+
+  const schedulePinToBottom = React.useCallback(() => {
+    if (!bottomIntentRef.current || frameRef.current !== null) return;
+    frameRef.current = requestAnimationFrame(() => {
+      frameRef.current = null;
+      pinToBottom();
+    });
+  }, [pinToBottom]);
+
   React.useLayoutEffect(() => {
     const scroller = hostRef.current?.firstElementChild;
     if (!(scroller instanceof HTMLDivElement)) return;
     const retire = () => cancel();
-    scroller.addEventListener("pointerdown", retire, { passive: true });
-    scroller.addEventListener("touchstart", retire, { passive: true });
-    scroller.addEventListener("wheel", retire, { passive: true });
-    window.addEventListener("keydown", retire, true);
+    const retireForPointer = (event: PointerEvent) => {
+      // A descendant pointerdown is ordinary row interaction (link, reaction,
+      // thread action), not evidence that the reader took scroll ownership.
+      // Direct scroller hits cover scrollbar/background drag initiation.
+      if (event.target === scroller) cancel();
+    };
+    const retireForWheel = (event: WheelEvent) => {
+      // Ctrl+wheel is browser zoom, not reader navigation. Keep bottom intent
+      // armed so the resulting viewport/content reflow can settle at the new
+      // physical floor.
+      if (!event.ctrlKey) cancel();
+    };
+    const retireForScrollKey = (event: KeyboardEvent) => {
+      if (
+        !event.altKey &&
+        !event.ctrlKey &&
+        !event.metaKey &&
+        event.target instanceof Node &&
+        scroller.contains(event.target) &&
+        !isEditableKeyboardTarget(event.target) &&
+        SCROLL_INTENT_KEYS.has(event.key)
+      ) {
+        cancel();
+      }
+    };
+    scroller.addEventListener("pointerdown", retireForPointer, {
+      passive: true,
+    });
+    scroller.addEventListener("touchmove", retire, { passive: true });
+    scroller.addEventListener("wheel", retireForWheel, { passive: true });
+    window.addEventListener("keydown", retireForScrollKey, true);
     return () => {
-      scroller.removeEventListener("pointerdown", retire);
-      scroller.removeEventListener("touchstart", retire);
-      scroller.removeEventListener("wheel", retire);
-      window.removeEventListener("keydown", retire, true);
+      scroller.removeEventListener("pointerdown", retireForPointer);
+      scroller.removeEventListener("touchmove", retire);
+      scroller.removeEventListener("wheel", retireForWheel);
+      window.removeEventListener("keydown", retireForScrollKey, true);
     };
   }, [cancel, hostRef]);
 
+  React.useLayoutEffect(() => {
+    const scroller = hostRef.current?.firstElementChild;
+    if (!(scroller instanceof HTMLDivElement)) return;
+    const content = scroller.firstElementChild;
+    if (
+      !(content instanceof HTMLElement) ||
+      typeof ResizeObserver === "undefined"
+    ) {
+      return;
+    }
+    // Virtua updates this inner element's extent whenever measured row geometry
+    // changes. Bottom intent therefore follows the physical floor for as long
+    // as it remains active, rather than guessing that layout is done after an
+    // arbitrary timeout. Reader input and explicit target/prepend navigation
+    // retire the intent through `cancel`.
+    const observer = new ResizeObserver(schedulePinToBottom);
+    observer.observe(content);
+    observer.observe(scroller);
+    return () => observer.disconnect();
+  }, [hostRef, schedulePinToBottom]);
+
   const settle = React.useCallback(() => {
-    cancel();
-    const deadline = performance.now() + SETTLE_DEADLINE_MS;
-    let settledFrames = 0;
-    let previousHeight = -1;
-    const next = () => {
-      const scroller = hostRef.current?.firstElementChild;
-      const lastIndex = itemsLengthRef.current - 1;
-      if (!(scroller instanceof HTMLDivElement) || lastIndex < 0) {
-        cancel();
-        return;
-      }
-      listRef.current?.scrollToIndex(lastIndex, { align: "end" });
-      const atBottom =
-        scroller.scrollHeight - scroller.clientHeight - scroller.scrollTop <=
-        BOTTOM_EPSILON_PX;
-      settledFrames =
-        atBottom && scroller.scrollHeight === previousHeight
-          ? settledFrames + 1
-          : 0;
-      previousHeight = scroller.scrollHeight;
-      if (settledFrames >= 2 || performance.now() >= deadline) {
-        frameRef.current = null;
-        return;
-      }
-      frameRef.current = requestAnimationFrame(next);
-    };
-    next();
-  }, [cancel, hostRef, itemsLengthRef, listRef]);
+    bottomIntentRef.current = true;
+    cancelFrame();
+    pinToBottom();
+  }, [cancelFrame, pinToBottom]);
 
   React.useEffect(() => cancel, [cancel]);
   return { cancel, settle };
diff --git a/desktop/src/features/messages/ui/useVirtualizedViewportResize.test.mjs b/desktop/src/features/messages/ui/useVirtualizedViewportResize.test.mjs
new file mode 100644
index 0000000000..e284460c17
--- /dev/null
+++ b/desktop/src/features/messages/ui/useVirtualizedViewportResize.test.mjs
@@ -0,0 +1,15 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { shouldSettleVirtualizedViewportResize } from "./useVirtualizedViewportResize.ts";
+
+test("viewport resize follows the virtualizer's explicit bottom state", () => {
+  assert.equal(
+    shouldSettleVirtualizedViewportResize({ virtualizerAtBottom: true }),
+    true,
+  );
+  assert.equal(
+    shouldSettleVirtualizedViewportResize({ virtualizerAtBottom: false }),
+    false,
+  );
+});
diff --git a/desktop/src/features/messages/ui/useVirtualizedViewportResize.ts b/desktop/src/features/messages/ui/useVirtualizedViewportResize.ts
new file mode 100644
index 0000000000..d3273a09b6
--- /dev/null
+++ b/desktop/src/features/messages/ui/useVirtualizedViewportResize.ts
@@ -0,0 +1,39 @@
+import * as React from "react";
+
+export function shouldSettleVirtualizedViewportResize({
+  virtualizerAtBottom,
+}: {
+  virtualizerAtBottom: boolean;
+}): boolean {
+  return virtualizerAtBottom;
+}
+
+/** Re-settles a bottom-pinned virtualized timeline after viewport reflow. */
+export function useVirtualizedViewportResize(
+  scrollContainerRef: React.RefObject<HTMLDivElement | null>,
+  virtualizerAtBottomRef: React.RefObject<boolean>,
+  settleAtBottom?: () => void,
+) {
+  React.useEffect(() => {
+    const container = scrollContainerRef.current;
+    if (
+      !container ||
+      !settleAtBottom ||
+      typeof ResizeObserver === "undefined"
+    ) {
+      return;
+    }
+
+    const observer = new ResizeObserver(() => {
+      if (
+        shouldSettleVirtualizedViewportResize({
+          virtualizerAtBottom: virtualizerAtBottomRef.current,
+        })
+      ) {
+        settleAtBottom();
+      }
+    });
+    observer.observe(container);
+    return () => observer.disconnect();
+  }, [scrollContainerRef, settleAtBottom, virtualizerAtBottomRef]);
+}
diff --git a/desktop/src/features/messages/ui/virtuaWheelModePatch.test.mjs b/desktop/src/features/messages/ui/virtuaWheelModePatch.test.mjs
new file mode 100644
index 0000000000..9dcb07d121
--- /dev/null
+++ b/desktop/src/features/messages/ui/virtuaWheelModePatch.test.mjs
@@ -0,0 +1,37 @@
+import assert from "node:assert/strict";
+import { readFile } from "node:fs/promises";
+import test from "node:test";
+
+const patch = await readFile(
+  new URL("../../../../../patches/virtua@0.49.3.patch", import.meta.url),
+  "utf8",
+);
+
+test("reader wheel retires Virtua shift mode without publishing scroll end", () => {
+  // Virtua 0.49.3 has no public transition for leaving SCROLL_BY_SHIFT.
+  // Keep the CJS and ESM patch paths symmetric and deliberately narrower than
+  // ACTION_SCROLL_END (2), which also idles direction, clears frozen range,
+  // flushes pending jumps, and emits UPDATE_SCROLL_END_EVENT.
+  const addedActionBodies = [
+    ...patch.matchAll(/\+\s+case 9:\n((?:\+.*\n)+?)(?=\s*})/g),
+  ].map(([, body]) =>
+    body
+      .split("\n")
+      .map((line) => line.replace(/^\+\s*/, "").trim())
+      .filter(Boolean),
+  );
+  assert.deepEqual(addedActionBodies, [["I = 0;"], ["w = 0;"]]);
+  assert.match(
+    patch,
+    /if \(!e\.M\(\) \|\| t\.ctrlKey\) return;\n\+\s+e\.q\(9\);\n\+\s+if \(f\) return;/,
+  );
+  assert.match(
+    patch,
+    /if \(!e\.M\(\) \|\| t\.ctrlKey\) return;\n\+\s+e\.B\(9\);\n\+\s+if \(c\) return;/,
+  );
+  assert.doesNotMatch(
+    patch,
+    /\+\s+if \((?:f|c) \|\| !e\.M\(\) \|\| t\.ctrlKey\) return;/,
+  );
+  assert.doesNotMatch(patch, /\+\s+e\.(?:q|B)\(2\);/);
+});
diff --git a/desktop/src/features/onboarding/assets/harness-logos/chatgpt.png b/desktop/src/features/onboarding/assets/harness-logos/chatgpt.png
deleted file mode 100644
index 3a339cc0fe..0000000000
Binary files a/desktop/src/features/onboarding/assets/harness-logos/chatgpt.png and /dev/null differ
diff --git a/desktop/src/features/onboarding/assets/harness-logos/goose.png b/desktop/src/features/onboarding/assets/harness-logos/goose.png
deleted file mode 100644
index 3fd794bd15..0000000000
Binary files a/desktop/src/features/onboarding/assets/harness-logos/goose.png and /dev/null differ
diff --git a/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx b/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx
index 90f8b22d62..50887f08aa 100644
--- a/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx
+++ b/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx
@@ -68,6 +68,7 @@ function AgentDefaultsSection({
     cancel: () => void;
   } | null>(null);
   const [isSaving, setIsSaving] = React.useState(false);
+  const [configIsValid, setConfigIsValid] = React.useState(false);
 
   React.useEffect(() => {
     let unmounted = false;
@@ -187,10 +188,19 @@ function AgentDefaultsSection({
   );
   React.useEffect(() => {
     onPersistenceStateChange({
-      canComplete: selectedRuntimeId.length > 0 && !isSaving,
+      // configIsValid comes from AgentConfigFields' onValidityChange and
+      // covers model + provider credentials — a harness selection alone is
+      // not a working default (e.g. buzz-agent with no provider configured).
+      canComplete: selectedRuntimeId.length > 0 && configIsValid && !isSaving,
       flush: flushPersistence,
     });
-  }, [flushPersistence, isSaving, onPersistenceStateChange, selectedRuntimeId]);
+  }, [
+    configIsValid,
+    flushPersistence,
+    isSaving,
+    onPersistenceStateChange,
+    selectedRuntimeId,
+  ]);
 
   return (
     <section className="w-full space-y-4 text-left text-sm">
@@ -239,6 +249,7 @@ function AgentDefaultsSection({
             }}
             onCustomModelEditingChange={setIsCustomModelEditing}
             onIsCustomProviderChange={setIsCustomProvider}
+            onValidityChange={setConfigIsValid}
             placeholderClassName="text-foreground/70"
             runtimeFileConfig={runtimeFileConfig}
             selectClassName="h-12 rounded-2xl border-foreground/15 bg-white px-4 py-2 text-sm shadow-none hover:bg-white/95"
diff --git a/desktop/src/features/onboarding/ui/HarnessMarks.tsx b/desktop/src/features/onboarding/ui/HarnessMarks.tsx
new file mode 100644
index 0000000000..48d2da4404
--- /dev/null
+++ b/desktop/src/features/onboarding/ui/HarnessMarks.tsx
@@ -0,0 +1,49 @@
+import type * as React from "react";
+
+// Monochrome brand marks rendered inline with `currentColor` so they adapt to
+// dark/light themes without the brightness/invert filter the old PNG pipeline
+// needed. Provenance for each path is recorded in
+// desktop/public/harness-logos/CREDITS.md.
+
+type MarkProps = { className?: string };
+
+/// Goose mark from Block's own goose repo (Apache-2.0).
+function GooseMark({ className }: MarkProps) {
+  return (
+    <svg
+      aria-hidden="true"
+      className={className}
+      fill="currentColor"
+      role="img"
+      viewBox="0 0 45 45"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path d="M43.2098 39.2492L39.8118 36.4522C37.9646 34.9318 36.3923 33.1051 35.1631 31.0529C33.4647 28.2172 31.1178 25.8243 28.3164 24.071L26.9482 23.2744C26.4794 22.9485 26.1525 22.4405 26.106 21.8675C26.0762 21.4981 26.1647 21.1678 26.3712 20.8771C27.0837 19.873 30.9617 15.6995 31.6365 15.1411C32.5056 14.4228 33.4739 13.8253 34.3724 13.1412C34.5001 13.0438 34.6283 12.9469 34.7545 12.8481C34.7589 12.8437 34.7653 12.8403 34.7692 12.8363C35.0574 12.6088 35.3295 12.3671 35.5458 12.0803C36.5993 10.8604 36.5783 9.82938 36.5783 9.82938C36.5783 9.82938 36.5793 9.8284 36.5798 9.82791C36.4677 9.5534 36.0645 8.69902 35.2449 8.29825C35.9696 8.28406 36.7872 8.55564 37.1582 8.91873C37.6039 8.21947 37.8922 7.76585 38.3404 7.00347C38.4471 6.82241 38.5038 6.48771 38.2998 6.30029C38.2998 6.30029 38.2988 6.30029 38.2978 6.30029C38.2978 6.30029 38.2978 6.29931 38.2978 6.29833C38.2939 6.29442 38.289 6.29148 38.2851 6.28757C38.2812 6.28365 38.2787 6.27925 38.2743 6.27485C38.2743 6.27485 38.2734 6.27485 38.2724 6.27485C38.2724 6.27485 38.2724 6.27387 38.2724 6.27289C38.2641 6.26457 38.2548 6.25821 38.246 6.25038C38.2406 6.245 38.2362 6.23864 38.2313 6.23276C38.2254 6.22787 38.219 6.22347 38.2137 6.21808C38.2053 6.20977 38.2 6.19949 38.1911 6.19166C38.1911 6.19166 38.1897 6.19117 38.1892 6.19166C38.1892 6.19166 38.1892 6.19068 38.1892 6.1897C38.1853 6.18579 38.1804 6.18285 38.1765 6.17894C38.1726 6.17502 38.1696 6.17013 38.1657 6.16621C38.1657 6.16621 38.1642 6.16572 38.1637 6.16621C38.1637 6.16621 38.1637 6.16524 38.1637 6.16426C37.9763 5.9602 37.6416 6.01697 37.4606 6.12364C36.4692 6.70693 35.5047 7.33475 34.6351 7.88525C34.6351 7.88525 33.6046 7.86372 32.3842 8.91775C32.097 9.13452 31.8552 9.4066 31.6282 9.69433C31.6238 9.69873 31.6199 9.7046 31.6164 9.70901C31.5171 9.83476 31.4202 9.96297 31.3233 10.0912C30.6387 10.9901 30.0417 11.958 29.3234 12.8271C28.7656 13.5023 24.5915 17.3798 23.5874 18.0923C23.2967 18.2988 22.9669 18.3879 22.597 18.3575C22.0245 18.3115 21.5161 17.9842 21.1902 17.5154L20.3935 16.1472C18.6402 13.3448 16.2474 10.9989 13.4117 9.30041C11.3594 8.0712 9.5332 6.49847 8.01234 4.65172L5.2153 1.25377C5.0773 1.08642 4.81306 1.11382 4.71422 1.30662C4.39615 1.92612 3.78888 3.23411 3.32353 4.99327C3.31227 5.03487 3.32206 5.07891 3.34946 5.11218C3.92786 5.81095 5.26717 7.35089 6.8624 8.65351C6.97348 8.74403 6.88246 8.92313 6.74447 8.88496C5.36846 8.51013 4.03062 7.90825 3.02944 7.39542C2.94772 7.35383 2.84887 7.4057 2.83713 7.49672C2.68152 8.74354 2.64139 10.1127 2.80581 11.5562C2.8107 11.6032 2.84055 11.6438 2.8841 11.6629C4.02572 12.1596 5.85143 12.8804 7.76816 13.3389C7.90713 13.3722 7.90273 13.5723 7.76229 13.5992C6.26982 13.8801 4.70688 13.9427 3.43656 13.9261C3.3475 13.9251 3.28193 14.0093 3.30591 14.0949C3.56085 14.9958 3.90632 15.9118 4.3619 16.8342C4.55029 17.2487 4.75532 17.6553 4.97504 18.0532C5.01271 18.1212 5.08562 18.1618 5.16343 18.1584C6.21207 18.107 7.47946 17.9964 8.75369 17.7713C8.97095 17.7331 9.08741 18.0189 8.90391 18.1417C8.03877 18.7201 7.11588 19.2183 6.25758 19.6283C6.14259 19.6836 6.1054 19.8304 6.18125 19.9327C6.69114 20.6236 7.25191 21.2774 7.86114 21.8866C7.86114 21.8866 10.8608 24.9763 10.9425 25.2185C12.6928 23.4261 15.5701 21.4394 18.7474 19.7047C14.4921 23.1672 12.1198 25.7235 10.9258 27.1758L10.0935 28.3439C9.66091 28.9507 9.2856 29.5951 8.97193 30.2709C7.92231 32.5292 6.19201 37.0966 6.19201 37.0966C6.0594 37.4543 6.16755 37.8072 6.39753 38.0371C6.40292 38.0425 6.4083 38.0479 6.41417 38.0528C6.41955 38.0582 6.42445 38.0641 6.42983 38.0694C6.66031 38.2999 7.01263 38.4076 7.37033 38.275C7.37033 38.275 11.9368 36.5447 14.1961 35.495C14.8719 35.1814 15.5168 34.8056 16.1231 34.3735L17.4095 33.457C18.0907 32.9715 19.0234 33.0489 19.615 33.6405L22.5804 36.6058C23.1896 37.2151 23.8433 37.7758 24.5343 38.2857C24.637 38.3611 24.7833 38.3244 24.8386 38.2094C25.2492 37.3516 25.7473 36.4277 26.3252 35.5631C26.4481 35.3796 26.7343 35.4965 26.6957 35.7133C26.4701 36.988 26.3605 38.2554 26.3086 39.3035C26.3047 39.3809 26.3458 39.4543 26.4138 39.4919C26.8112 39.7121 27.2178 39.9172 27.6327 40.1051C28.5551 40.5606 29.4717 40.9066 30.3721 41.1611C30.4577 41.185 30.5419 41.1195 30.5409 41.0304C30.5237 39.7596 30.5864 38.1967 30.8677 36.7047C30.8942 36.5638 31.0943 36.5593 31.1281 36.6988C31.5861 38.616 32.3069 40.4417 32.8041 41.5829C32.8231 41.6264 32.8633 41.6558 32.9107 41.6612C34.3543 41.8256 35.7234 41.7855 36.9703 41.6298C37.0618 41.6186 37.1136 41.5197 37.0715 41.4375C36.5587 40.4364 35.9568 39.0975 35.582 37.7225C35.5443 37.584 35.7229 37.4935 35.8135 37.6046C37.1161 39.1998 38.656 40.5391 39.3548 41.1175C39.3881 41.1449 39.4326 41.1542 39.4737 41.1434C41.2333 40.6786 42.5413 40.0713 43.1604 39.7528C43.3532 39.6539 43.3806 39.3897 43.2132 39.2517L43.2098 39.2492Z" />
+    </svg>
+  );
+}
+
+/// Cursor mark (simple-icons, CC0).
+function CursorMark({ className }: MarkProps) {
+  return (
+    <svg
+      aria-hidden="true"
+      className={className}
+      fill="currentColor"
+      role="img"
+      viewBox="0 0 24 24"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path d="M11.503.131 1.891 5.678a.84.84 0 0 0-.42.726v11.188c0 .3.162.575.42.724l9.609 5.55a1 1 0 0 0 .998 0l9.61-5.55a.84.84 0 0 0 .42-.724V6.404a.84.84 0 0 0-.42-.726L12.497.131a1.01 1.01 0 0 0-.996 0M2.657 6.338h18.55c.263 0 .43.287.297.515L12.23 22.918c-.062.107-.229.064-.229-.06V12.335a.59.59 0 0 0-.295-.51l-9.11-5.257c-.109-.063-.064-.23.061-.23" />
+    </svg>
+  );
+}
+
+/// Theme-adaptive inline marks, keyed by runtime/preset id. Consulted before
+/// the bitmap logo maps in `RuntimeIcon`. Codex deliberately has no entry:
+/// the OpenAI blossom was removed from simple-icons v16 at the vendor's
+/// request, so Codex renders RuntimeIcon's neutral terminal-glyph fallback.
+export const RUNTIME_MARKS: Record<string, React.FC<MarkProps>> = {
+  cursor: CursorMark,
+  goose: GooseMark,
+};
diff --git a/desktop/src/features/onboarding/ui/IdentityKeyHelpDialog.tsx b/desktop/src/features/onboarding/ui/IdentityKeyHelpDialog.tsx
index e597dfdbd1..0abcd77cb0 100644
--- a/desktop/src/features/onboarding/ui/IdentityKeyHelpDialog.tsx
+++ b/desktop/src/features/onboarding/ui/IdentityKeyHelpDialog.tsx
@@ -67,6 +67,7 @@ export function IdentityKeyHelpDialog() {
       <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="identity-key-help-dialog"
         overlayVariant="transparent"
         surface="textured"
diff --git a/desktop/src/features/onboarding/ui/InviteRedeemForm.tsx b/desktop/src/features/onboarding/ui/InviteRedeemForm.tsx
index 78929cde16..fa50552ba2 100644
--- a/desktop/src/features/onboarding/ui/InviteRedeemForm.tsx
+++ b/desktop/src/features/onboarding/ui/InviteRedeemForm.tsx
@@ -118,7 +118,7 @@ export function InviteRedeemForm({
     const code = parsedInvite?.code;
     let cancelled = false;
     const timeoutId = window.setTimeout(() => {
-      void getJoinPolicy(relayWsUrl)
+      void getJoinPolicy(relayWsUrl, code ? "webview" : "native")
         .then((policy) => {
           if (cancelled || !policy) return;
           setJoinPolicy(policy);
@@ -156,7 +156,7 @@ export function InviteRedeemForm({
         setPolicyError(null);
         setIsLoadingPolicy(true);
         try {
-          const policy = await getJoinPolicy(normalizedRelayUrl);
+          const policy = await getJoinPolicy(normalizedRelayUrl, "native");
           if (!policy) {
             onConnect?.(normalizedRelayUrl, apiToken.trim() || undefined);
             return;
@@ -205,7 +205,7 @@ export function InviteRedeemForm({
       setPolicyError(null);
       setIsLoadingPolicy(true);
       try {
-        const policy = await getJoinPolicy(relayWsUrl);
+        const policy = await getJoinPolicy(relayWsUrl, "webview");
         if (!policy) {
           onRedeem(relayWsUrl, parsedInvite.code);
           return;
diff --git a/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx b/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx
index e400d07a91..ca87c76636 100644
--- a/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx
+++ b/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx
@@ -28,18 +28,32 @@ export type MachineOnboardingPage =
   | "setup"
   | "config";
 
+/** A pending navigation the parent should execute after RouterProvider mounts. */
+export type PostOnboardingNavigation = {
+  to: string;
+  search?: Record<string, string>;
+};
+
 export function MachineOnboardingFlow({
   complete,
   continueWithIdentity,
   identityLost,
   initialPage,
   queryClient,
+  navigateAfterComplete,
 }: {
   complete: (pubkey?: string) => void;
   continueWithIdentity: (pubkey: string) => void;
   identityLost: boolean;
   initialPage?: MachineOnboardingPage;
   queryClient: QueryClient;
+  /**
+   * Called when the user finishes onboarding and requests navigation to a
+   * specific route (e.g. Settings → Agents). The parent owns the RouterProvider,
+   * so navigation must be deferred to it — calling router.navigate() here races
+   * with RouterProvider mounting.
+   */
+  navigateAfterComplete?: (nav: PostOnboardingNavigation) => void;
 }) {
   const [page, setPage] = React.useState<MachineOnboardingPage>(
     identityLost ? "key-import" : (initialPage ?? "identity"),
@@ -157,7 +171,11 @@ export function MachineOnboardingFlow({
                   onClick={() => void loadFreshIdentity()}
                   type="button"
                 >
-                  {isPending ? "Saving identity…" : "Create a new identity key"}
+                  {isPending
+                    ? "Loading identity…"
+                    : selectedPubkey
+                      ? "Continue setup"
+                      : "Create a new identity key"}
                 </Button>
                 <Button
                   className="h-9 rounded-full bg-foreground/10 px-5 hover:bg-foreground/15"
@@ -166,7 +184,9 @@ export function MachineOnboardingFlow({
                   type="button"
                   variant="ghost"
                 >
-                  Use an existing key
+                  {selectedPubkey
+                    ? "Use a different key instead"
+                    : "Use an existing key"}
                 </Button>
               </div>
               <IdentityKeyHelpDialog />
@@ -225,6 +245,17 @@ export function MachineOnboardingFlow({
                   }
                   setPage("config");
                 },
+                navigateToAgentSettings: () => {
+                  // Complete onboarding first, then delegate the Settings → Agents
+                  // navigation to the parent.  The parent owns RouterProvider, so
+                  // navigation from within the onboarding flow races with the
+                  // router mounting — calling router.navigate() here is unsafe.
+                  complete(selectedPubkey ?? undefined);
+                  navigateAfterComplete?.({
+                    to: "/settings",
+                    search: { section: "agents" },
+                  });
+                },
               }}
               direction="forward"
               onReadyRuntimeIdsChange={handleReadyRuntimeIdsChange}
diff --git a/desktop/src/features/onboarding/ui/RuntimeIcon.tsx b/desktop/src/features/onboarding/ui/RuntimeIcon.tsx
index a410914377..f9c201d115 100644
--- a/desktop/src/features/onboarding/ui/RuntimeIcon.tsx
+++ b/desktop/src/features/onboarding/ui/RuntimeIcon.tsx
@@ -3,16 +3,27 @@ import { TerminalSquare } from "lucide-react";
 
 import type { AcpRuntimeCatalogEntry } from "@/shared/api/types";
 import { cn } from "@/shared/lib/cn";
-import { useTheme } from "@/shared/theme/ThemeProvider";
 import { BuzzMark } from "@/shared/ui/buzz-logo/BuzzMark";
-import chatgptLogoUrl from "../assets/harness-logos/chatgpt.png?inline";
 import claudeLogoUrl from "../assets/harness-logos/claude.png?inline";
-import gooseLogoUrl from "../assets/harness-logos/goose.png?inline";
+import { RUNTIME_MARKS } from "./HarnessMarks";
 
+// Bundled logos for compiled-in runtimes (inline base64, no network fetch).
+// Monochrome marks live in RUNTIME_MARKS instead — inline SVGs that follow
+// `currentColor`, so they adapt to dark/light without bitmap filters.
 const RUNTIME_LOGOS: Record<string, string> = {
   claude: claudeLogoUrl,
-  codex: chatgptLogoUrl,
-  goose: gooseLogoUrl,
+};
+
+// Public-path logos for bundled presets. Served from /harness-logos/ at runtime.
+// Keys match the preset `id` values emitted by the backend PRESET_HARNESSES.
+export const PRESET_LOGOS: Record<string, string> = {
+  omp: "/harness-logos/omp.svg",
+  grok: "/harness-logos/grok.svg",
+  opencode: "/harness-logos/opencode.svg",
+  kimi: "/harness-logos/kimi.png",
+  amp: "/harness-logos/amp.png",
+  hermes: "/harness-logos/hermes.png",
+  openclaw: "/harness-logos/openclaw.svg",
 };
 
 function isBuzzRuntime(runtime: AcpRuntimeCatalogEntry): boolean {
@@ -26,7 +37,8 @@ export function getRuntimeDisplayLabel(
 }
 
 function getRuntimeLogoUrl(runtime: AcpRuntimeCatalogEntry): string | null {
-  return RUNTIME_LOGOS[runtime.id.trim().toLowerCase()] ?? null;
+  const id = runtime.id.trim().toLowerCase();
+  return RUNTIME_LOGOS[id] ?? PRESET_LOGOS[id] ?? null;
 }
 
 export function RuntimeIcon({
@@ -37,13 +49,20 @@ export function RuntimeIcon({
   runtime: AcpRuntimeCatalogEntry;
 }) {
   const [imageFailed, setImageFailed] = React.useState(false);
-  const { isDark } = useTheme();
-  const runtimeLogoUrl = getRuntimeLogoUrl(runtime);
-  const imageUrl = runtimeLogoUrl ?? runtime.avatarUrl;
-  const shouldForceForegroundColor = !runtimeLogoUrl && runtime.id === "goose";
+  // Only use bundled logo maps — never render user-supplied avatar URLs for
+  // custom/preset entries (tracking pixel / spoofing vector, security line).
+  const id = runtime.id.trim().toLowerCase();
+  const imageUrl = getRuntimeLogoUrl(runtime);
+  const Mark = RUNTIME_MARKS[id];
 
   if (isBuzzRuntime(runtime)) {
-    return <BuzzMark className="h-7 w-10 text-foreground" />;
+    // The mark's wide viewBox letterboxes inside a square box, so honoring
+    // the caller's size keeps it optically in line with the square logos.
+    return <BuzzMark className={cn(className, "text-foreground")} />;
+  }
+
+  if (Mark) {
+    return <Mark className={cn(className, "p-0.5 text-foreground")} />;
   }
 
   if (imageUrl && !imageFailed) {
@@ -53,8 +72,8 @@ export function RuntimeIcon({
         className={cn(
           "rounded-md object-contain",
           className,
-          shouldForceForegroundColor &&
-            (isDark ? "brightness-0 invert" : "brightness-0"),
+          id === "omp" && "bg-[#0d0d0d] p-1",
+          id === "grok" && "bg-white p-1",
         )}
         onError={() => setImageFailed(true)}
         src={imageUrl}
diff --git a/desktop/src/features/onboarding/ui/SetupStep.tsx b/desktop/src/features/onboarding/ui/SetupStep.tsx
index 288ca30259..843206aa70 100644
--- a/desktop/src/features/onboarding/ui/SetupStep.tsx
+++ b/desktop/src/features/onboarding/ui/SetupStep.tsx
@@ -388,7 +388,7 @@ function runtimeDetailText(runtime: AcpRuntimeCatalogEntry): string {
     runtime.availability === "cli_missing" ||
     runtime.availability === "not_installed"
   ) {
-    return "CLI not detected; the desktop app alone isn’t enough.";
+    return "CLI not detected.";
   }
   return "";
 }
@@ -615,7 +615,7 @@ function RuntimeProvidersSection({
 
       <div className="flex w-full flex-1 flex-col items-center justify-center gap-8 py-10">
         {orderedItems.length > 0 ? (
-          <div className="grid min-w-0 w-full max-w-[592px] grid-cols-1 gap-4 md:grid-cols-2">
+          <div className="grid min-w-0 w-full max-w-[1200px] grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-4">
             {orderedItems.map((runtime) => (
               <RuntimeCard
                 installResults={installResults}
@@ -714,6 +714,23 @@ function SetupStepContent({
         >
           Back
         </Button>
+
+        <p className="text-xs text-foreground/50">
+          More harnesses (Cursor, Grok, Amp&hellip;){" "}
+          {actions.navigateToAgentSettings ? (
+            <button
+              className="text-foreground/70 underline underline-offset-2 hover:text-foreground"
+              data-testid="onboarding-setup-more-harnesses"
+              onClick={actions.navigateToAgentSettings}
+              type="button"
+            >
+              Settings → Agents
+            </button>
+          ) : (
+            <span className="text-foreground/70">Settings → Agents</span>
+          )}{" "}
+          after setup.
+        </p>
       </OnboardingFooter>
     </OnboardingSlideTransition>
   );
diff --git a/desktop/src/features/onboarding/ui/onboardingRuntimeSelection.test.mjs b/desktop/src/features/onboarding/ui/onboardingRuntimeSelection.test.mjs
index b10aa19154..221702ebb2 100644
--- a/desktop/src/features/onboarding/ui/onboardingRuntimeSelection.test.mjs
+++ b/desktop/src/features/onboarding/ui/onboardingRuntimeSelection.test.mjs
@@ -12,11 +12,11 @@ function runtime(id, availability, status) {
   return { id, availability, authStatus: { status } };
 }
 
-test("only Claude Code and Codex are visible in onboarding", () => {
+test("all bundled harnesses are visible in onboarding", () => {
   assert.equal(runtimeIsVisibleInOnboarding("claude"), true);
   assert.equal(runtimeIsVisibleInOnboarding("codex"), true);
-  assert.equal(runtimeIsVisibleInOnboarding("goose"), false);
-  assert.equal(runtimeIsVisibleInOnboarding("buzz-agent"), false);
+  assert.equal(runtimeIsVisibleInOnboarding("goose"), true);
+  assert.equal(runtimeIsVisibleInOnboarding("buzz-agent"), true);
   assert.equal(runtimeIsVisibleInOnboarding("custom"), false);
 });
 
@@ -30,7 +30,7 @@ test("visible onboarding runtimes use the product order", () => {
 
   assert.deepEqual(
     getVisibleOnboardingRuntimes(runtimes).map(({ id }) => id),
-    ["claude", "codex"],
+    ["claude", "codex", "goose", "buzz-agent"],
   );
 });
 
@@ -55,16 +55,17 @@ test("readiness requires an available and authenticated runtime", () => {
   );
 });
 
-test("ready onboarding runtimes exclude hidden ready harnesses", () => {
+test("ready onboarding runtimes exclude unknown and non-ready harnesses", () => {
   const runtimes = [
     runtime("goose", "available", "not_applicable"),
     runtime("codex", "available", "logged_out"),
     runtime("buzz-agent", "available", "not_applicable"),
     runtime("claude", "available", "logged_in"),
+    runtime("custom", "available", "not_applicable"),
   ];
 
   assert.deepEqual(
     getReadyOnboardingRuntimes(runtimes).map(({ id }) => id),
-    ["claude"],
+    ["claude", "goose", "buzz-agent"],
   );
 });
diff --git a/desktop/src/features/onboarding/ui/onboardingRuntimeSelection.ts b/desktop/src/features/onboarding/ui/onboardingRuntimeSelection.ts
index 51339e2afe..cd491dfcc5 100644
--- a/desktop/src/features/onboarding/ui/onboardingRuntimeSelection.ts
+++ b/desktop/src/features/onboarding/ui/onboardingRuntimeSelection.ts
@@ -1,6 +1,11 @@
 import type { AcpRuntimeCatalogEntry } from "@/shared/api/types";
 
-export const ONBOARDING_RUNTIME_ORDER = ["claude", "codex"];
+export const ONBOARDING_RUNTIME_ORDER = [
+  "claude",
+  "codex",
+  "goose",
+  "buzz-agent",
+];
 
 const VISIBLE_ONBOARDING_RUNTIME_IDS = new Set<string>(
   ONBOARDING_RUNTIME_ORDER,
diff --git a/desktop/src/features/onboarding/ui/presetLogos.test.mjs b/desktop/src/features/onboarding/ui/presetLogos.test.mjs
new file mode 100644
index 0000000000..0ff2193155
--- /dev/null
+++ b/desktop/src/features/onboarding/ui/presetLogos.test.mjs
@@ -0,0 +1,98 @@
+/**
+ * Preset-logo coverage guard.
+ *
+ * Every tier-2 preset the backend emits must have a bundled logo, or it renders
+ * as the generic TerminalSquare fallback next to siblings that show real marks.
+ * The two sides live in different languages — Rust `PRESET_HARNESSES` vs the TS
+ * `PRESET_LOGOS` record — so no compiler catches drift, and `RuntimeIcon`'s
+ * `onError` fallback hides a missing file at runtime. This test reads the Rust
+ * source as text (the same trick `motion.test.mjs` uses for CSS) and asserts
+ * both directions plus on-disk existence of every mapped file.
+ */
+
+import assert from "node:assert/strict";
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
+import test from "node:test";
+import { fileURLToPath } from "node:url";
+
+import { RUNTIME_MARKS } from "./HarnessMarks.tsx";
+import { PRESET_LOGOS } from "./RuntimeIcon.tsx";
+
+const desktopRoot = path.resolve(
+  path.dirname(fileURLToPath(import.meta.url)),
+  "../../../..",
+);
+
+const discoveryRs = readFileSync(
+  path.join(desktopRoot, "src-tauri/src/managed_agents/discovery.rs"),
+  "utf8",
+);
+
+const presetBlock = discoveryRs.match(
+  /const PRESET_HARNESSES: &\[PresetHarness\] = &\[([\s\S]*?)\n\];/,
+);
+assert.ok(presetBlock, "could not locate PRESET_HARNESSES in discovery.rs");
+
+const presetIds = [...presetBlock[1].matchAll(/^\s{8}id: "([^"]+)",$/gm)].map(
+  (match) => match[1],
+);
+
+test("PRESET_HARNESSES parse found the preset ids", () => {
+  // Guards the regex itself: a struct-field rename would otherwise silently
+  // yield zero ids and make every assertion below vacuously pass.
+  assert.ok(
+    presetIds.length >= 8,
+    `expected at least 8 preset ids, parsed ${presetIds.length}`,
+  );
+});
+
+for (const id of presetIds) {
+  test(`preset "${id}" has a bundled logo or inline mark`, () => {
+    // Inline SVG marks (RUNTIME_MARKS) take precedence over bitmap logos —
+    // e.g. Cursor's mark ships as an inline CC0 simple-icons path, not a
+    // file under desktop/public.
+    if (RUNTIME_MARKS[id]) {
+      return;
+    }
+    const logoPath = PRESET_LOGOS[id];
+    assert.ok(
+      logoPath,
+      `preset "${id}" has no RUNTIME_MARKS or PRESET_LOGOS entry — it renders ` +
+        `the generic TerminalSquare fallback. Add desktop/public${logoPath ?? `/harness-logos/${id}.png`} ` +
+        `and map it in RuntimeIcon.tsx.`,
+    );
+    assert.ok(
+      existsSync(path.join(desktopRoot, "public", logoPath)),
+      `PRESET_LOGOS["${id}"] points at ${logoPath}, which is missing from ` +
+        `desktop/public — RuntimeIcon's onError would silently fall back.`,
+    );
+  });
+}
+
+test("PRESET_LOGOS has no entries for unknown presets", () => {
+  const unknown = Object.keys(PRESET_LOGOS).filter(
+    (id) => !presetIds.includes(id),
+  );
+  assert.deepEqual(
+    unknown,
+    [],
+    `PRESET_LOGOS maps ids the backend does not emit as presets: ${unknown.join(", ")}`,
+  );
+});
+
+test("codex ships no bundled mark or logo (vendor-removed OpenAI blossom)", () => {
+  // The OpenAI blossom was removed from simple-icons v16 at the vendor's
+  // request — Codex must render RuntimeIcon's neutral terminal-glyph
+  // fallback, not a re-bundled copy of the withdrawn mark.
+  assert.equal(
+    RUNTIME_MARKS.codex,
+    undefined,
+    "codex has a RUNTIME_MARKS entry — the OpenAI blossom must not ship without explicit approval",
+  );
+  assert.equal(
+    PRESET_LOGOS.codex,
+    undefined,
+    "codex has a PRESET_LOGOS entry — no bundled Codex logo is approved",
+  );
+});
diff --git a/desktop/src/features/onboarding/ui/types.ts b/desktop/src/features/onboarding/ui/types.ts
index 9b2c4be8d2..443a1f3f4e 100644
--- a/desktop/src/features/onboarding/ui/types.ts
+++ b/desktop/src/features/onboarding/ui/types.ts
@@ -59,6 +59,7 @@ export type ProfileStepActions = {
 export type SetupStepActions = {
   back: () => void;
   next: (readyRuntimeIds: readonly string[]) => void;
+  navigateToAgentSettings?: () => void;
 };
 
 export type DefaultConfigStepActions = {
diff --git a/desktop/src/features/onboarding/useClaimInvite.ts b/desktop/src/features/onboarding/useClaimInvite.ts
index 56ca185a26..3134953617 100644
--- a/desktop/src/features/onboarding/useClaimInvite.ts
+++ b/desktop/src/features/onboarding/useClaimInvite.ts
@@ -3,6 +3,7 @@ import * as React from "react";
 import { useCommunityOnboarding } from "@/features/onboarding/communityOnboarding";
 import {
   inviteErrorMessage,
+  isInviteExhaustedError,
   isInviteExpiredError,
 } from "@/shared/api/inviteHelpers";
 import { claimInvite } from "@/shared/api/invites";
@@ -39,7 +40,9 @@ export function useClaimInvite() {
           {
             error: isInviteExpiredError(error)
               ? "This invite code has expired — ask for a new one."
-              : inviteErrorMessage(error),
+              : isInviteExhaustedError(error)
+                ? "This invite has reached its use limit. Ask for a new invite."
+                : inviteErrorMessage(error),
           },
           transaction.id,
         ),
diff --git a/desktop/src/features/projects/projectIssues.d.mts b/desktop/src/features/projects/projectIssues.d.mts
index b720e90265..b31dc3c1ff 100644
--- a/desktop/src/features/projects/projectIssues.d.mts
+++ b/desktop/src/features/projects/projectIssues.d.mts
@@ -11,6 +11,7 @@ export type ProjectIssueStatus =
 export type ProjectIssueComment = {
   id: string;
   content: string;
+  tags: string[][];
   author: string;
   createdAt: number;
 };
@@ -19,6 +20,7 @@ export type ProjectIssue = {
   id: string;
   title: string;
   content: string;
+  tags: string[][];
   author: string;
   createdAt: number;
   repoAddress: string | null;
@@ -41,6 +43,7 @@ export const PROJECT_ISSUE_STATUS: {
 
 export function getTag(event: RelayEvent, name: string): string | undefined;
 export function getAllTags(event: RelayEvent, name: string): string[];
+export function getImetaTags(event: RelayEvent): string[][];
 export function eventToProjectIssue(
   issue: RelayEvent,
   statusEvents?: RelayEvent[],
diff --git a/desktop/src/features/projects/projectIssues.mjs b/desktop/src/features/projects/projectIssues.mjs
index 2140050db5..0655245866 100644
--- a/desktop/src/features/projects/projectIssues.mjs
+++ b/desktop/src/features/projects/projectIssues.mjs
@@ -22,6 +22,10 @@ export function getAllTags(event, name) {
     .map((tag) => tag[1]);
 }
 
+export function getImetaTags(event) {
+  return event.tags.filter((tag) => tag[0] === "imeta");
+}
+
 function repoOwnerFromAddress(repoAddress) {
   const owner = (repoAddress ?? "").split(":")[1] ?? "";
   return /^[a-fA-F0-9]{64}$/.test(owner) ? owner.toLowerCase() : null;
@@ -80,6 +84,7 @@ function commentsForIssue(issueId, commentEvents) {
     .map((event) => ({
       id: event.id,
       content: event.content,
+      tags: getImetaTags(event),
       author: event.pubkey,
       createdAt: event.created_at,
     }));
@@ -101,6 +106,7 @@ export function eventToProjectIssue(
     id: issue.id,
     title,
     content: issue.content,
+    tags: getImetaTags(issue),
     author: issue.pubkey,
     createdAt: issue.created_at,
     repoAddress: getTag(issue, "a") ?? null,
diff --git a/desktop/src/features/projects/projectIssues.test.mjs b/desktop/src/features/projects/projectIssues.test.mjs
index b6fa6a901f..2d0fb5fb45 100644
--- a/desktop/src/features/projects/projectIssues.test.mjs
+++ b/desktop/src/features/projects/projectIssues.test.mjs
@@ -99,6 +99,32 @@ test("tag helpers drop malformed value-less tags", () => {
   assert.equal(issue.title, "Something is broken");
 });
 
+test("preserves root and comment tags for rich content rendering", () => {
+  const root = issueEvent({
+    tags: [
+      ["a", REPO_ADDRESS],
+      ["subject", "Something is broken"],
+      ["imeta", "url https://relay.example/media/root.png", "m image/png"],
+    ],
+  });
+  const comment = {
+    id: "comment-rich-content",
+    kind: 1,
+    pubkey: ATTACKER,
+    created_at: 200,
+    content: "![Screenshot](https://relay.example/media/comment.png)",
+    tags: [
+      ["e", root.id, "", "root"],
+      ["imeta", "url https://relay.example/media/comment.png", "m image/png"],
+    ],
+  };
+
+  const issue = eventToProjectIssue(root, [], [comment]);
+
+  assert.deepEqual(issue.tags, [root.tags[2]]);
+  assert.deepEqual(issue.comments[0].tags, [comment.tags[1]]);
+});
+
 test("builds repository-scoped issue creation tags", () => {
   assert.deepEqual(
     buildGitIssueTags({
diff --git a/desktop/src/features/projects/projectPullRequests.d.mts b/desktop/src/features/projects/projectPullRequests.d.mts
index f4d6e0a27d..af865d2433 100644
--- a/desktop/src/features/projects/projectPullRequests.d.mts
+++ b/desktop/src/features/projects/projectPullRequests.d.mts
@@ -3,6 +3,7 @@ import type { RelayEvent } from "@/shared/api/types";
 export type ProjectPullRequestUpdate = {
   id: string;
   content: string;
+  tags: string[][];
   author: string;
   createdAt: number;
   commit: string | null;
@@ -12,6 +13,7 @@ export type ProjectPullRequestUpdate = {
 export type ProjectPullRequestComment = {
   id: string;
   content: string;
+  tags: string[][];
   author: string;
   createdAt: number;
   commit: string | null;
@@ -70,6 +72,7 @@ export type ProjectPullRequest = {
   id: string;
   title: string;
   content: string;
+  tags: string[][];
   author: string;
   createdAt: number;
   repoAddress: string | null;
diff --git a/desktop/src/features/projects/projectPullRequests.mjs b/desktop/src/features/projects/projectPullRequests.mjs
index a5e9b927b7..3eebaa74f0 100644
--- a/desktop/src/features/projects/projectPullRequests.mjs
+++ b/desktop/src/features/projects/projectPullRequests.mjs
@@ -1,4 +1,9 @@
-import { allowedActorsForRoot, getAllTags, getTag } from "./projectIssues.mjs";
+import {
+  allowedActorsForRoot,
+  getAllTags,
+  getImetaTags,
+  getTag,
+} from "./projectIssues.mjs";
 
 // Updates and status changes rewrite the PR's tip commit, clone URLs, and
 // lifecycle state, so they are only honored when signed by the PR author or
@@ -135,6 +140,7 @@ function eventToPullRequestUpdate(event) {
   return {
     id: event.id,
     content: event.content,
+    tags: getImetaTags(event),
     author: event.pubkey,
     createdAt: event.created_at,
     commit: getTag(event, "c") ?? null,
@@ -190,6 +196,7 @@ function eventToPullRequestComment(event) {
   return {
     id: event.id,
     content: event.content,
+    tags: getImetaTags(event),
     author: event.pubkey,
     createdAt: event.created_at,
     commit: getTag(event, "c") ?? null,
@@ -352,6 +359,7 @@ export function eventToProjectPullRequest(
     id: pullRequest.id,
     title,
     content: pullRequest.content,
+    tags: getImetaTags(pullRequest),
     author: pullRequest.pubkey,
     createdAt: pullRequest.created_at,
     repoAddress: getTag(pullRequest, "a") ?? null,
diff --git a/desktop/src/features/projects/projectPullRequests.test.mjs b/desktop/src/features/projects/projectPullRequests.test.mjs
index b9f2cf98c7..9374604818 100644
--- a/desktop/src/features/projects/projectPullRequests.test.mjs
+++ b/desktop/src/features/projects/projectPullRequests.test.mjs
@@ -96,6 +96,44 @@ test("accepts updates signed by the PR author", () => {
   assert.equal(pullRequest.updateCount, 1);
 });
 
+test("preserves root, update, and comment tags for rich content rendering", () => {
+  const root = pullRequestEvent({
+    tags: [
+      ["a", REPO_ADDRESS],
+      ["subject", "Add feature"],
+      ["c", "1111111111111111111111111111111111111111"],
+      ["imeta", "url https://relay.example/media/root.png", "m image/png"],
+    ],
+  });
+  const update = updateEvent({
+    pubkey: AUTHOR,
+    createdAt: 200,
+    commit: "2222222222222222222222222222222222222222",
+  });
+  update.tags.push([
+    "imeta",
+    "url https://relay.example/media/update.mp4",
+    "m video/mp4",
+  ]);
+  const comment = {
+    id: "comment-rich-content",
+    kind: 1,
+    pubkey: ATTACKER,
+    created_at: 250,
+    content: "[Demo](https://relay.example/media/comment.png)",
+    tags: [
+      ["e", root.id, "", "root"],
+      ["imeta", "url https://relay.example/media/comment.png", "m image/png"],
+    ],
+  };
+
+  const pullRequest = eventToProjectPullRequest(root, [update], [comment]);
+
+  assert.deepEqual(pullRequest.tags, [root.tags[3]]);
+  assert.deepEqual(pullRequest.updates[0].tags, [update.tags[3]]);
+  assert.deepEqual(pullRequest.comments[0].tags, [comment.tags[1]]);
+});
+
 test("accepts updates signed by the repo owner", () => {
   const update = updateEvent({
     pubkey: OWNER,
diff --git a/desktop/src/features/projects/ui/ProjectCommitDetailPanel.tsx b/desktop/src/features/projects/ui/ProjectCommitDetailPanel.tsx
index e20ebe4ecc..c6122dcfe4 100644
--- a/desktop/src/features/projects/ui/ProjectCommitDetailPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectCommitDetailPanel.tsx
@@ -12,6 +12,7 @@ import type { ProjectRepoCommit, ProjectRepoDiff } from "@/shared/api/types";
 import { CopyCommitHashButton } from "./ProjectCommitCopyButton";
 import { ProfileIdentityButton } from "./ProjectProfileIdentity";
 import { ProjectDiffFilesPanel } from "./ProjectPullRequestFilesChangedPanel";
+import { ProjectRichContent } from "./ProjectRichContent";
 
 function commitDateLabel(timestamp: number) {
   return new Date(timestamp * 1_000).toLocaleString(undefined, {
@@ -98,6 +99,9 @@ export function ProjectCommitDetailPanel({
             </div>
           </div>
         </div>
+        {diff?.commitBody ? (
+          <ProjectRichContent content={diff.commitBody} />
+        ) : null}
       </header>
 
       <ProjectDiffFilesPanel
diff --git a/desktop/src/features/projects/ui/ProjectFeedRow.tsx b/desktop/src/features/projects/ui/ProjectFeedRow.tsx
index ae5a47798f..4747d03519 100644
--- a/desktop/src/features/projects/ui/ProjectFeedRow.tsx
+++ b/desktop/src/features/projects/ui/ProjectFeedRow.tsx
@@ -7,6 +7,7 @@ import type * as React from "react";
  * trailing cluster (hash, id, comment count) on the right.
  */
 export function ProjectFeedRow({
+  eventId,
   meta,
   onOpen,
   statusIcon,
@@ -14,6 +15,7 @@ export function ProjectFeedRow({
   title,
   trailing,
 }: {
+  eventId?: string;
   meta: React.ReactNode;
   onOpen?: () => void;
   statusIcon?: React.ReactNode;
@@ -24,6 +26,7 @@ export function ProjectFeedRow({
   return (
     <article
       className="group/feed-item flex min-w-0 items-center justify-between gap-3 p-3 transition-colors hover:bg-muted/35"
+      data-project-event-id={eventId}
       data-testid={testId}
     >
       <div className="min-w-0 flex-1 space-y-1">
diff --git a/desktop/src/features/projects/ui/ProjectIssuesPanel.tsx b/desktop/src/features/projects/ui/ProjectIssuesPanel.tsx
index eb6cfbfd96..104000e553 100644
--- a/desktop/src/features/projects/ui/ProjectIssuesPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectIssuesPanel.tsx
@@ -15,8 +15,8 @@ import {
 } from "@/features/profile/lib/identity";
 import { relativeTime } from "@/features/projects/lib/projectsViewHelpers";
 import type { ChannelMember } from "@/shared/api/types";
+import { cn } from "@/shared/lib/cn";
 import { normalizePubkey } from "@/shared/lib/pubkey";
-import { Markdown } from "@/shared/ui/markdown";
 import {
   ProjectFeedRow,
   ProjectFeedRowCluster,
@@ -24,6 +24,7 @@ import {
 } from "./ProjectFeedRow";
 import { OverviewRailSection } from "./ProjectOverviewPanel";
 import { ProfileIdentityButton } from "./ProjectProfileIdentity";
+import { ProjectRichContent } from "./ProjectRichContent";
 
 export function issueStatusClassName(status: ProjectIssue["status"]) {
   if (status === "Done") return "text-purple-400";
@@ -158,14 +159,17 @@ function IssueRow({
   );
 }
 
-function IssueDetail({
+/** Full issue conversation and comment composer. */
+export function ProjectIssueDetail({
   issue,
   profiles,
   project,
+  stackMetaRail = false,
 }: {
   issue: ProjectIssue;
   profiles?: UserProfileLookup;
   project: Project;
+  stackMetaRail?: boolean;
 }) {
   const commentMutation = useCreateProjectIssueCommentMutation(project);
   const authorLabel = resolveUserLabel({ profiles, pubkey: issue.author });
@@ -198,7 +202,12 @@ function IssueDetail({
   );
 
   return (
-    <div className="grid xl:grid-cols-[minmax(0,1fr)_18rem]">
+    <div
+      className={cn(
+        "grid",
+        !stackMetaRail && "xl:grid-cols-[minmax(0,1fr)_18rem]",
+      )}
+    >
       <div className="min-w-0 divide-y divide-border/50">
         <header className="space-y-3 p-4">
           <div className="min-w-0">
@@ -214,11 +223,7 @@ function IssueDetail({
             </h3>
           </div>
           {issue.content ? (
-            <Markdown
-              className="text-sm"
-              content={issue.content}
-              interactive={false}
-            />
+            <ProjectRichContent content={issue.content} tags={issue.tags} />
           ) : null}
         </header>
 
@@ -238,11 +243,7 @@ function IssueDetail({
                       role={relativeTime(item.createdAt)}
                     />
                   </div>
-                  <Markdown
-                    className="text-sm"
-                    content={item.content}
-                    interactive={false}
-                  />
+                  <ProjectRichContent content={item.content} tags={item.tags} />
                 </article>
               ))}
             </div>
@@ -261,7 +262,11 @@ function IssueDetail({
         </section>
       </div>
 
-      <IssueMetaRail issue={issue} profiles={profiles} />
+      <IssueMetaRail
+        issue={issue}
+        profiles={profiles}
+        stacked={stackMetaRail}
+      />
     </div>
   );
 }
@@ -271,16 +276,23 @@ function IssueDetail({
 function IssueMetaRail({
   issue,
   profiles,
+  stacked = false,
 }: {
   issue: ProjectIssue;
   profiles?: UserProfileLookup;
+  stacked?: boolean;
 }) {
   const authorProfile = profiles?.[normalizePubkey(issue.author)];
   const authorLabel = resolveUserLabel({ profiles, pubkey: issue.author });
   const status = issueStatusVisual(issue.status);
 
   return (
-    <aside className="space-y-6 border-t border-border/60 p-4 xl:border-l xl:border-t-0">
+    <aside
+      className={cn(
+        "space-y-6 border-border/60 p-4",
+        stacked ? "border-t" : "border-t xl:border-l xl:border-t-0",
+      )}
+    >
       <OverviewRailSection title="Status">
         <span
           className={`inline-flex items-center gap-1.5 rounded-md border border-border/60 px-2.5 py-1 text-xs font-medium ${status.className}`}
@@ -365,7 +377,7 @@ export function ProjectIssuesPanel({
 
   if (selectedIssue) {
     return (
-      <IssueDetail
+      <ProjectIssueDetail
         issue={selectedIssue}
         profiles={profiles}
         project={project}
diff --git a/desktop/src/features/projects/ui/ProjectPullRequestInlineComments.tsx b/desktop/src/features/projects/ui/ProjectPullRequestInlineComments.tsx
index e3170b3605..281aefe71b 100644
--- a/desktop/src/features/projects/ui/ProjectPullRequestInlineComments.tsx
+++ b/desktop/src/features/projects/ui/ProjectPullRequestInlineComments.tsx
@@ -8,7 +8,7 @@ import type {
 import { relativeTime } from "@/features/projects/lib/projectsViewHelpers";
 import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import { normalizePubkey, truncatePubkey } from "@/shared/lib/pubkey";
-import { Markdown } from "@/shared/ui/markdown";
+import { ProjectRichContent } from "./ProjectRichContent";
 
 function commentAuthor(
   pubkey: string,
@@ -68,10 +68,9 @@ export function ProjectPullRequestInlineCommentThread({
                   {relativeTime(comment.createdAt)}
                 </span>
               </div>
-              <Markdown
-                className="text-sm"
+              <ProjectRichContent
                 content={comment.content}
-                interactive={false}
+                tags={comment.tags}
               />
             </article>
           ))}
diff --git a/desktop/src/features/projects/ui/ProjectPullRequestsPanel.tsx b/desktop/src/features/projects/ui/ProjectPullRequestsPanel.tsx
index bc07969d74..c93691a924 100644
--- a/desktop/src/features/projects/ui/ProjectPullRequestsPanel.tsx
+++ b/desktop/src/features/projects/ui/ProjectPullRequestsPanel.tsx
@@ -35,8 +35,8 @@ import { canReviewProjectPullRequest } from "@/features/projects/pullRequestRevi
 import type { UserProfileLookup } from "@/features/profile/lib/identity";
 import { useIdentityQuery } from "@/shared/api/hooks";
 import type { ChannelMember } from "@/shared/api/types";
+import { cn } from "@/shared/lib/cn";
 import { normalizePubkey, truncatePubkey } from "@/shared/lib/pubkey";
-import { Markdown } from "@/shared/ui/markdown";
 import {
   ProjectFeedRow,
   ProjectFeedRowCluster,
@@ -49,6 +49,7 @@ import {
   ProfileAuthorName,
   ProfileIdentityButton,
 } from "./ProjectProfileIdentity";
+import { ProjectRichContent } from "./ProjectRichContent";
 import { PullRequestReviewersRow } from "./PullRequestReviewersRow";
 import { PullRequestReviewCard } from "./PullRequestReviewCard";
 
@@ -252,6 +253,7 @@ function PullRequestRow({
 
   return (
     <ProjectFeedRow
+      eventId={pullRequest.id}
       meta={
         <>
           <ProfileIdentityButton
@@ -393,10 +395,12 @@ export function PullRequestMetaRail({
   profiles,
   project,
   pullRequest,
+  stacked = false,
 }: {
   profiles?: UserProfileLookup;
   project: Project;
   pullRequest: ProjectPullRequest;
+  stacked?: boolean;
 }) {
   const identityQuery = useIdentityQuery();
   const authorProfile = profileForPubkey(pullRequest.author, profiles);
@@ -414,7 +418,12 @@ export function PullRequestMetaRail({
     Boolean(viewer) && (isAuthor || isOwner || isManagedAgentOwner);
 
   return (
-    <aside className="min-w-0 space-y-6 border-t border-border/60 p-4 xl:border-l xl:border-t-0">
+    <aside
+      className={cn(
+        "min-w-0 space-y-6 border-border/60 p-4",
+        stacked ? "border-t" : "border-t xl:border-l xl:border-t-0",
+      )}
+    >
       <OverviewRailSection title="Status">
         <span
           className={`inline-flex items-center gap-1.5 rounded-md px-2.5 py-1 text-xs font-medium text-white ${pullRequestStatusBadgeClassName(pullRequest.status)}`}
@@ -488,7 +497,8 @@ export function PullRequestMetaRail({
   );
 }
 
-function PullRequestDetail({
+/** Full pull-request conversation, review actions, and comment composer. */
+export function ProjectPullRequestDetail({
   mode,
   onOpenInlineComment,
   onOpenCommit,
@@ -639,10 +649,9 @@ function PullRequestDetail({
     <div>
       {pullRequest.content ? (
         <header className="p-4">
-          <Markdown
-            className="text-sm"
+          <ProjectRichContent
             content={pullRequest.content}
-            interactive={false}
+            tags={pullRequest.tags}
           />
         </header>
       ) : null}
@@ -670,9 +679,11 @@ function PullRequestDetail({
                 ) : null}
               </div>
               {update.content ? (
-                <p className="text-sm text-muted-foreground">
-                  {update.content}
-                </p>
+                <ProjectRichContent
+                  className="text-sm text-muted-foreground"
+                  content={update.content}
+                  tags={update.tags}
+                />
               ) : null}
             </article>
           ))}
@@ -829,10 +840,10 @@ function PullRequestDetail({
                     </span>
                   </div>
                   {activityContent ? (
-                    <Markdown
+                    <ProjectRichContent
                       className="mt-1 text-sm text-foreground/90"
                       content={activityContent}
-                      interactive={false}
+                      tags={item.tags}
                     />
                   ) : null}
                   {item.anchor ? (
@@ -950,7 +961,7 @@ export function PullRequestsPanel({
 
   if (selectedPullRequest) {
     return (
-      <PullRequestDetail
+      <ProjectPullRequestDetail
         mode={mode}
         onOpenInlineComment={onOpenInlineComment}
         onOpenCommit={onOpenCommit}
diff --git a/desktop/src/features/projects/ui/ProjectRichContent.tsx b/desktop/src/features/projects/ui/ProjectRichContent.tsx
new file mode 100644
index 0000000000..d6e61b4d56
--- /dev/null
+++ b/desktop/src/features/projects/ui/ProjectRichContent.tsx
@@ -0,0 +1,27 @@
+import * as React from "react";
+
+import { Markdown } from "@/shared/ui/markdown";
+import { parseImetaTags } from "@/shared/ui/markdown/parseImeta";
+
+/**
+ * Renders project event content with the same link and media support as
+ * messages while retaining NIP-92 attachment metadata from the source event.
+ */
+export function ProjectRichContent({
+  className = "text-sm",
+  content,
+  tags,
+}: {
+  className?: string;
+  content: string;
+  tags?: string[][];
+}) {
+  const imetaByUrl = React.useMemo(
+    () => (tags ? parseImetaTags(tags) : undefined),
+    [tags],
+  );
+
+  return (
+    <Markdown className={className} content={content} imetaByUrl={imetaByUrl} />
+  );
+}
diff --git a/desktop/src/features/reminders/ui/RemindersPanel.tsx b/desktop/src/features/reminders/ui/RemindersPanel.tsx
index 651768a251..a96d167756 100644
--- a/desktop/src/features/reminders/ui/RemindersPanel.tsx
+++ b/desktop/src/features/reminders/ui/RemindersPanel.tsx
@@ -1,4 +1,4 @@
-import { Bell, Check, Clock, X } from "lucide-react";
+import { ArrowLeft, Bell, Check, Clock, ExternalLink, X } from "lucide-react";
 import * as React from "react";
 import { toast } from "sonner";
 
@@ -22,6 +22,9 @@ import type { Reminder } from "@/features/reminders/lib/reminderTypes";
 import { SnoozeMenu } from "@/features/reminders/ui/SnoozeMenu";
 import { resolveChannelDisplayLabel } from "@/features/sidebar/lib/channelLabels";
 import { useIdentityQuery } from "@/shared/api/hooks";
+import type { Channel } from "@/shared/api/types";
+import { TopChromeInsetHeader } from "@/shared/layout/TopChromeInsetHeader";
+import { cn } from "@/shared/lib/cn";
 import { normalizePubkey } from "@/shared/lib/pubkey";
 import { Button } from "@/shared/ui/button";
 import { UserAvatar } from "@/shared/ui/UserAvatar";
@@ -29,12 +32,56 @@ import { UserAvatar } from "@/shared/ui/UserAvatar";
 const UNKNOWN_CHANNEL_LABEL = "Unknown channel";
 
 /** Author identity + source channel resolved for a reminder's target. */
-type ReminderSource = {
+export type ReminderSource = {
   authorLabel: string;
   avatarUrl: string | null;
+  channel: Channel | null;
   channelLabel: string;
 };
 
+export function useReminderSources(reminders: readonly Reminder[]) {
+  const identityQuery = useIdentityQuery();
+  const currentPubkey = identityQuery.data?.pubkey;
+  const channelsQuery = useChannelsQuery();
+  const channels = channelsQuery.data;
+  const authorPubkeys = React.useMemo(
+    () =>
+      reminders
+        .map((reminder) => reminder.content.target?.authorPubkey)
+        .filter((authorPubkey): authorPubkey is string => !!authorPubkey),
+    [reminders],
+  );
+  const usersBatchQuery = useUsersBatchQuery(authorPubkeys);
+  const profiles: UserProfileLookup | undefined =
+    usersBatchQuery.data?.profiles;
+
+  return React.useMemo(() => {
+    const channelsById = new Map(
+      (channels ?? []).map((channel) => [channel.id, channel]),
+    );
+    const map = new Map<string, ReminderSource>();
+    for (const reminder of reminders) {
+      const target = reminder.content.target;
+      if (!hasNavigableTarget(target)) continue;
+      const channel = channelsById.get(target.channelId);
+      map.set(reminder.id, {
+        authorLabel: resolveUserLabel({
+          currentPubkey,
+          profiles,
+          pubkey: target.authorPubkey,
+        }),
+        avatarUrl:
+          profiles?.[normalizePubkey(target.authorPubkey)]?.avatarUrl ?? null,
+        channel: channel ?? null,
+        channelLabel: channel
+          ? resolveChannelDisplayLabel(channel, currentPubkey, profiles)
+          : UNKNOWN_CHANNEL_LABEL,
+      });
+    }
+    return map;
+  }, [channels, currentPubkey, profiles, reminders]);
+}
+
 function formatRelativeTime(timestamp: number): string {
   const now = Math.floor(Date.now() / 1_000);
   const diff = timestamp - now;
@@ -53,16 +100,29 @@ function formatRelativeTime(timestamp: number): string {
   return `in ${Math.floor(diff / 86400)}d`;
 }
 
+function formatReminderSourceLocation(source: ReminderSource): string {
+  if (!source.channel) return source.channelLabel;
+  return source.channel.channelType === "dm"
+    ? `DM with ${source.channelLabel}`
+    : `#${source.channelLabel}`;
+}
+
 function ReminderRow({
+  isSelected = false,
+  presentation = "card",
   reminder,
   pubkey,
   source,
   onNavigate,
+  onSelect,
 }: {
+  isSelected?: boolean;
+  presentation?: "inbox-list" | "card";
   reminder: Reminder;
   pubkey: string;
   source: ReminderSource | null;
   onNavigate: (reminder: Reminder) => void;
+  onSelect?: (reminder: Reminder) => void;
 }) {
   const { complete, snooze, cancel } = useReminderMutations(pubkey);
   const isDone = reminder.content.status === "done";
@@ -97,13 +157,31 @@ function ReminderRow({
     !isDone && reminder.notBefore
       ? reminder.notBefore <= Math.floor(Date.now() / 1_000)
       : false;
+  const isInboxList = presentation === "inbox-list";
 
   return (
-    <div className="flex items-start gap-3 rounded-md border p-3">
+    <div
+      className={cn(
+        "flex items-start gap-3 transition-colors",
+        isInboxList
+          ? "border-b border-border/45 px-4 py-4 hover:bg-muted/40 focus-within:bg-muted/40"
+          : "rounded-md border p-3",
+        isInboxList && isSelected && "bg-muted/40",
+      )}
+      data-testid={`home-reminder-item-${reminder.id}`}
+    >
+      {isInboxList ? (
+        <span className="flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-muted text-muted-foreground">
+          <Bell className="h-4 w-4" />
+        </span>
+      ) : null}
       <button
         className="flex min-w-0 flex-1 flex-col items-start gap-1 text-left enabled:hover:opacity-80 disabled:cursor-default"
-        disabled={!isNavigable}
-        onClick={isNavigable ? () => onNavigate(reminder) : undefined}
+        disabled={!isInboxList && !isNavigable}
+        onClick={() => {
+          if (isInboxList) onSelect?.(reminder);
+          else if (isNavigable) onNavigate(reminder);
+        }}
         type="button"
       >
         {source ? (
@@ -118,7 +196,9 @@ function ReminderRow({
               {source.authorLabel}
             </span>
             <span className="shrink-0">in</span>
-            <span className="truncate">{source.channelLabel}</span>
+            <span className="truncate">
+              {formatReminderSourceLocation(source)}
+            </span>
           </div>
         ) : null}
         <p className="max-w-full truncate text-sm font-medium">
@@ -140,7 +220,7 @@ function ReminderRow({
           </p>
         ) : null}
       </button>
-      {isDone ? null : (
+      {isDone || isInboxList ? null : (
         <div className="flex shrink-0 items-center gap-1">
           <Button
             className="h-7 w-7 p-0"
@@ -178,59 +258,20 @@ function ReminderRow({
 export function RemindersPanel({
   pubkey,
   includeDone = false,
+  onSelectReminder,
+  presentation = "card",
+  selectedReminderId,
 }: {
   pubkey: string;
   includeDone?: boolean;
+  onSelectReminder?: (reminderId: string) => void;
+  presentation?: "inbox-list" | "card";
+  selectedReminderId?: string | null;
 }) {
   const remindersQuery = useRemindersQuery(pubkey);
   const reminders = remindersQuery.data;
   const { goChannel } = useAppNavigation();
-  const identityQuery = useIdentityQuery();
-  const currentPubkey = identityQuery.data?.pubkey;
-  const channelsQuery = useChannelsQuery();
-  const channels = channelsQuery.data;
-
-  const authorPubkeys = React.useMemo(
-    () =>
-      (reminders ?? [])
-        .map((reminder) => reminder.content.target?.authorPubkey)
-        .filter((authorPubkey): authorPubkey is string => !!authorPubkey),
-    [reminders],
-  );
-  const usersBatchQuery = useUsersBatchQuery(authorPubkeys);
-  const profiles: UserProfileLookup | undefined =
-    usersBatchQuery.data?.profiles;
-
-  // Look up each reminder's author + source channel from the live profile and
-  // channel queries. Channels/profiles can be missing — reminders outlive the
-  // context they were set in (left/archived channel, hidden DM) — so fall back
-  // to a resolved-or-truncated author label and a neutral channel label.
-  const sources = React.useMemo(() => {
-    const channelsById = new Map(
-      (channels ?? []).map((channel) => [channel.id, channel]),
-    );
-    const map = new Map<string, ReminderSource>();
-    for (const reminder of reminders ?? []) {
-      const target = reminder.content.target;
-      if (!hasNavigableTarget(target)) {
-        continue;
-      }
-      const channel = channelsById.get(target.channelId);
-      map.set(reminder.id, {
-        authorLabel: resolveUserLabel({
-          currentPubkey,
-          profiles,
-          pubkey: target.authorPubkey,
-        }),
-        avatarUrl:
-          profiles?.[normalizePubkey(target.authorPubkey)]?.avatarUrl ?? null,
-        channelLabel: channel
-          ? resolveChannelDisplayLabel(channel, currentPubkey, profiles)
-          : UNKNOWN_CHANNEL_LABEL,
-      });
-    }
-    return map;
-  }, [reminders, channels, profiles, currentPubkey]);
+  const sources = useReminderSources(reminders ?? []);
 
   const handleNavigate = React.useCallback(
     async (reminder: Reminder) => {
@@ -252,6 +293,10 @@ export function RemindersPanel({
     () => groupReminders(reminders ?? [], includeDone),
     [reminders, includeDone],
   );
+  const inboxReminders = React.useMemo(
+    () => groups.flatMap((group) => group.reminders),
+    [groups],
+  );
 
   if (remindersQuery.isLoading) {
     return (
@@ -273,6 +318,25 @@ export function RemindersPanel({
     );
   }
 
+  if (presentation === "inbox-list") {
+    return (
+      <div className="min-h-0 flex-1 overflow-y-auto">
+        {inboxReminders.map((reminder) => (
+          <ReminderRow
+            isSelected={reminder.id === selectedReminderId}
+            key={reminder.id}
+            onNavigate={handleNavigate}
+            onSelect={(selected) => onSelectReminder?.(selected.id)}
+            presentation="inbox-list"
+            pubkey={pubkey}
+            reminder={reminder}
+            source={sources.get(reminder.id) ?? null}
+          />
+        ))}
+      </div>
+    );
+  }
+
   return (
     <div className="flex-1 space-y-4 overflow-y-auto p-4">
       {groups.map((group) => (
@@ -294,3 +358,178 @@ export function RemindersPanel({
     </div>
   );
 }
+
+export function ReminderDetailPane({
+  onBack,
+  pubkey,
+  reminder,
+}: {
+  onBack?: () => void;
+  pubkey: string;
+  reminder: Reminder | null;
+}) {
+  const { goChannel } = useAppNavigation();
+  const reminderList = React.useMemo(
+    () => (reminder ? [reminder] : []),
+    [reminder],
+  );
+  const sources = useReminderSources(reminderList);
+  const { complete, snooze, cancel } = useReminderMutations(pubkey);
+
+  if (!reminder) {
+    return (
+      <section className="flex min-h-0 min-w-0 flex-col bg-background">
+        <TopChromeInsetHeader flush>
+          <div className="flex min-h-9 items-center px-4 py-2">
+            <span className="text-sm font-semibold">Reminder</span>
+          </div>
+        </TopChromeInsetHeader>
+        <div className="flex flex-1 items-center justify-center p-8 text-sm text-muted-foreground">
+          Select a reminder
+        </div>
+      </section>
+    );
+  }
+
+  const source = sources.get(reminder.id) ?? null;
+  const isDone = reminder.content.status === "done";
+  const isActing = complete.isPending || snooze.isPending || cancel.isPending;
+  const isNavigable = hasNavigableTarget(reminder.content.target);
+  const preview =
+    reminder.content.target?.preview || reminder.content.note || "Reminder";
+
+  const handleNavigate = async () => {
+    const destination = await resolveReminderDestination(
+      reminder.content.target,
+    );
+    if (!destination) return;
+    void goChannel(destination.channelId, {
+      messageId: destination.messageId,
+      threadRootId: destination.threadRootId,
+    });
+  };
+
+  return (
+    <section
+      className="flex min-h-0 min-w-0 flex-col bg-background"
+      data-testid="home-reminder-detail"
+    >
+      <TopChromeInsetHeader flush>
+        <div className="flex min-h-9 items-center gap-2 px-4 py-2">
+          {onBack ? (
+            <Button
+              aria-label="Back to reminders"
+              className="h-8 w-8 p-0"
+              onClick={onBack}
+              size="icon"
+              type="button"
+              variant="ghost"
+            >
+              <ArrowLeft className="h-4 w-4" />
+            </Button>
+          ) : null}
+          <span className="text-sm font-semibold">Reminder</span>
+        </div>
+      </TopChromeInsetHeader>
+
+      <div className="min-h-0 flex-1 overflow-y-auto px-6 py-8">
+        <div className="mx-auto max-w-2xl">
+          {source ? (
+            <div className="flex items-center gap-2 text-sm text-muted-foreground">
+              <UserAvatar
+                avatarUrl={source.avatarUrl}
+                className="h-6 w-6"
+                displayName={source.authorLabel}
+                size="sm"
+              />
+              <span className="font-medium text-foreground">
+                {source.authorLabel}
+              </span>
+              <span>in</span>
+              <span>{formatReminderSourceLocation(source)}</span>
+            </div>
+          ) : null}
+
+          <p className="mt-5 whitespace-pre-wrap text-base leading-6 text-foreground">
+            {preview}
+          </p>
+          {reminder.content.target && reminder.content.note ? (
+            <div className="mt-5 border-l-2 border-border pl-4">
+              <p className="text-xs font-medium uppercase text-muted-foreground">
+                Note
+              </p>
+              <p className="mt-1 whitespace-pre-wrap text-sm text-foreground">
+                {reminder.content.note}
+              </p>
+            </div>
+          ) : null}
+
+          {reminder.notBefore ? (
+            <div className="mt-6 flex items-center gap-2 text-sm text-muted-foreground">
+              <Clock className="h-4 w-4" />
+              <span>{formatRelativeTime(reminder.notBefore)}</span>
+            </div>
+          ) : null}
+
+          <div className="mt-8 flex flex-wrap items-center gap-2">
+            <Button
+              disabled={!isNavigable}
+              onClick={() => void handleNavigate()}
+              size="sm"
+              type="button"
+              variant="outline"
+            >
+              <ExternalLink className="h-4 w-4" />
+              Open message
+            </Button>
+            {isDone ? null : (
+              <>
+                <Button
+                  disabled={isActing}
+                  onClick={() =>
+                    complete.mutate(reminder, {
+                      onSuccess: () => toast.success("Reminder completed"),
+                      onError: () => toast.error("Failed to complete reminder"),
+                    })
+                  }
+                  size="sm"
+                  type="button"
+                >
+                  <Check className="h-4 w-4" />
+                  Complete
+                </Button>
+                <SnoozeMenu
+                  disabled={isActing}
+                  onSnooze={(notBefore) =>
+                    snooze.mutate(
+                      { reminder, notBefore },
+                      {
+                        onSuccess: () => toast.success("Reminder snoozed"),
+                        onError: () => toast.error("Failed to snooze reminder"),
+                      },
+                    )
+                  }
+                />
+                <Button
+                  disabled={isActing}
+                  onClick={() =>
+                    cancel.mutate(reminder, {
+                      onSuccess: () => toast.success("Reminder cancelled"),
+                      onError: () => toast.error("Failed to cancel reminder"),
+                    })
+                  }
+                  size="sm"
+                  type="button"
+                  variant="ghost"
+                >
+                  <X className="h-4 w-4" />
+                  Cancel
+                </Button>
+              </>
+            )}
+          </div>
+        </div>
+      </div>
+    </section>
+  );
+}
diff --git a/desktop/src/features/search/hooks.ts b/desktop/src/features/search/hooks.ts
index 038c6511f6..a2db8deeb9 100644
--- a/desktop/src/features/search/hooks.ts
+++ b/desktop/src/features/search/hooks.ts
@@ -6,23 +6,45 @@ export function useSearchMessagesQuery(
   query: string,
   options?: {
     channelId?: string;
+    authors?: string[];
+    since?: number | null;
+    until?: number | null;
     enabled?: boolean;
     limit?: number;
+    unresolvedOperator?: boolean;
   },
 ) {
   const trimmedQuery = query.trim();
   const enabled = options?.enabled ?? true;
   const limit = options?.limit ?? 12;
   const channelId = options?.channelId;
+  const authors = options?.authors;
+  const since = options?.since ?? null;
+  const until = options?.until ?? null;
+  const unresolvedOperator = options?.unresolvedOperator ?? false;
 
   return useQuery({
-    queryKey: ["search-messages", trimmedQuery, limit, channelId ?? null],
+    queryKey: [
+      "search-messages",
+      trimmedQuery,
+      limit,
+      channelId ?? null,
+      authors ?? null,
+      since,
+      until,
+      unresolvedOperator,
+    ],
     queryFn: () =>
       searchMessages({
         q: trimmedQuery,
         limit,
         channelId,
+        authors,
+        since: since ?? undefined,
+        until: until ?? undefined,
       }),
+    // Call sites own the "when to search" floor (FTS length / unresolved
+    // operators). Keep a single threshold here so it cannot drift.
     enabled: enabled && trimmedQuery.length >= 2,
     staleTime: 30_000,
     gcTime: 5 * 60 * 1_000,
diff --git a/desktop/src/features/search/lib/parseSearchOperators.test.mjs b/desktop/src/features/search/lib/parseSearchOperators.test.mjs
new file mode 100644
index 0000000000..a528073edc
--- /dev/null
+++ b/desktop/src/features/search/lib/parseSearchOperators.test.mjs
@@ -0,0 +1,118 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  isChannelUuid,
+  isHexPubkey,
+  normalizeFromHandle,
+  normalizeInChannel,
+  parseSearchOperators,
+} from "./parseSearchOperators.ts";
+
+test("leaves plain text unchanged", () => {
+  assert.deepEqual(parseSearchOperators("  deploy  "), {
+    text: "deploy",
+    from: null,
+    in: null,
+    since: null,
+    until: null,
+  });
+});
+
+test("extracts from / in / after / before and keeps remaining FTS text", () => {
+  const parsed = parseSearchOperators(
+    "deploy from:deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef in:#general after:2024-01-15 before:2024-02-01 status",
+  );
+  assert.equal(parsed.text, "deploy status");
+  assert.equal(
+    parsed.from,
+    "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
+  );
+  assert.equal(parsed.in, "#general");
+  assert.equal(
+    parsed.since,
+    Math.floor(new Date(2024, 0, 15).getTime() / 1000),
+  );
+  assert.equal(
+    parsed.until,
+    Math.floor(new Date(2024, 1, 1).getTime() / 1000) - 1,
+  );
+});
+
+test("before: excludes the named day's exact local midnight", () => {
+  const localMidnight = Math.floor(new Date(2024, 1, 1).getTime() / 1000);
+  const parsed = parseSearchOperators("deploy before:2024-02-01");
+
+  assert.equal(parsed.until, localMidnight - 1);
+  // The relay keeps events where `created_at <= until`, so a message stamped
+  // exactly at midnight must fail that predicate.
+  assert.equal(localMidnight <= parsed.until, false);
+});
+
+test("keeps invalid date operators in the FTS text", () => {
+  const parsed = parseSearchOperators("notes after:yesterday before:soon");
+  assert.equal(parsed.text, "notes after:yesterday before:soon");
+  assert.equal(parsed.since, null);
+  assert.equal(parsed.until, null);
+});
+
+test("later operators of the same kind win", () => {
+  const parsed = parseSearchOperators(
+    "from:@alice from:@bob in:one in:two after:2024-01-01 after:2024-03-01",
+  );
+  assert.equal(parsed.from, "@bob");
+  assert.equal(parsed.in, "two");
+  assert.equal(parsed.since, Math.floor(new Date(2024, 2, 1).getTime() / 1000));
+  assert.equal(parsed.text, "");
+});
+
+test("rejects impossible calendar dates", () => {
+  const parsed = parseSearchOperators("x after:2024-02-30");
+  assert.equal(parsed.since, null);
+  assert.equal(parsed.text, "x after:2024-02-30");
+});
+
+test("does not treat hyphen or slash adjacent tokens as operators", () => {
+  assert.deepEqual(parseSearchOperators("built-in:react hooks"), {
+    text: "built-in:react hooks",
+    from: null,
+    in: null,
+    since: null,
+    until: null,
+  });
+  assert.deepEqual(parseSearchOperators("sign-in:flow broken"), {
+    text: "sign-in:flow broken",
+    from: null,
+    in: null,
+    since: null,
+    until: null,
+  });
+  assert.deepEqual(parseSearchOperators("https://x.com/in:foo"), {
+    text: "https://x.com/in:foo",
+    from: null,
+    in: null,
+    since: null,
+    until: null,
+  });
+});
+
+test("strips trailing punctuation from operator values", () => {
+  const parsed = parseSearchOperators("deploy in:general, from:@alice.");
+  assert.equal(parsed.in, "#general".replace("#", "") || "general");
+  assert.equal(parsed.in, "general");
+  assert.equal(parsed.from, "@alice");
+  assert.equal(parsed.text, "deploy");
+});
+
+test("helpers recognize hex pubkeys and channel uuids", () => {
+  assert.equal(
+    isHexPubkey(
+      "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
+    ),
+    true,
+  );
+  assert.equal(isHexPubkey("npub1abc"), false);
+  assert.equal(isChannelUuid("11111111-1111-1111-1111-111111111111"), true);
+  assert.equal(normalizeFromHandle("@alice"), "alice");
+  assert.equal(normalizeInChannel("#general"), "general");
+});
diff --git a/desktop/src/features/search/lib/parseSearchOperators.ts b/desktop/src/features/search/lib/parseSearchOperators.ts
new file mode 100644
index 0000000000..ffa56b28f6
--- /dev/null
+++ b/desktop/src/features/search/lib/parseSearchOperators.ts
@@ -0,0 +1,168 @@
+/**
+ * Parse Slack-style search operators out of a free-text query.
+ *
+ * Remaining text is the FTS / prefix query. Invalid operator tokens (for example
+ * `after:yesterday`) are left in the text so they still participate in FTS.
+ *
+ * Name resolution for `from:` / `in:` happens at the call site (autocomplete or
+ * local channel/user lists). This module only splits syntax.
+ *
+ * Operators must start at a token boundary (start of string or whitespace). A
+ * word-boundary `\b` is intentionally avoided: it also matches after `-` / `/`,
+ * which would turn `built-in:react` or `https://x.com/in:foo` into operators.
+ */
+
+export type ParsedSearchOperators = {
+  /** FTS / prefix query with operators removed. */
+  text: string;
+  /** Raw `from:` value (pubkey hex, npub, @name, …), if present. */
+  from: string | null;
+  /** Raw `in:` value (channel uuid, #name, …), if present. */
+  in: string | null;
+  /**
+   * `after:YYYY-MM-DD` → unix seconds at local start of that day (inclusive).
+   * Messages at or after this timestamp match.
+   */
+  since: number | null;
+  /**
+   * `before:YYYY-MM-DD` → one second before local start of that day, because
+   * NIP-01 `until` is an *inclusive* upper bound. Messages strictly before
+   * local midnight match, so the named calendar day itself is not included
+   * (Slack-compatible).
+   */
+  until: number | null;
+};
+
+/** Token-start only — not `\b`, which fires after hyphens and slashes. */
+const OPERATOR_RE = /(?:^|\s)(from|in|after|before):(\S+)/gi;
+
+function parseLocalDayStart(value: string): number | null {
+  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
+  if (!match) {
+    return null;
+  }
+
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const day = Number(match[3]);
+  if (month < 1 || month > 12 || day < 1 || day > 31) {
+    return null;
+  }
+
+  const date = new Date(year, month - 1, day);
+  if (
+    date.getFullYear() !== year ||
+    date.getMonth() !== month - 1 ||
+    date.getDate() !== day
+  ) {
+    return null;
+  }
+
+  return Math.floor(date.getTime() / 1000);
+}
+
+/** Drop trailing punctuation so `in:general,` still resolves to `general`. */
+function cleanOperatorValue(value: string): string {
+  return value.replace(/[.,;:!?]+$/g, "");
+}
+
+/**
+ * Extract `from:` / `in:` / `after:` / `before:` operators from `raw`.
+ *
+ * Later occurrences of the same operator win. Date operators that are not
+ * `YYYY-MM-DD` stay in the returned `text`.
+ *
+ * Multi-word handles (`from:@Will Pfleger`) are a known limitation of part 1:
+ * only the first whitespace-delimited token is captured.
+ */
+export function parseSearchOperators(raw: string): ParsedSearchOperators {
+  let from: string | null = null;
+  let inValue: string | null = null;
+  let since: number | null = null;
+  let until: number | null = null;
+
+  const kept: string[] = [];
+  let lastIndex = 0;
+
+  for (const match of raw.matchAll(OPERATOR_RE)) {
+    const index = match.index ?? 0;
+    kept.push(raw.slice(lastIndex, index));
+    lastIndex = index + match[0].length;
+
+    const kind = match[1].toLowerCase();
+    const value = cleanOperatorValue(match[2]);
+
+    if (kind === "from") {
+      from = value;
+      continue;
+    }
+    if (kind === "in") {
+      inValue = value;
+      continue;
+    }
+    if (kind === "after") {
+      const parsed = parseLocalDayStart(value);
+      if (parsed === null) {
+        kept.push(match[0]);
+      } else {
+        since = parsed;
+      }
+      continue;
+    }
+    if (kind === "before") {
+      const parsed = parseLocalDayStart(value);
+      if (parsed === null) {
+        kept.push(match[0]);
+      } else {
+        // NIP-01 `until` is inclusive, so step back one second to keep
+        // `before:` exclusive of the named day's midnight.
+        until = parsed - 1;
+      }
+    }
+  }
+
+  kept.push(raw.slice(lastIndex));
+
+  return {
+    text: kept.join("").replace(/\s+/g, " ").trim(),
+    from,
+    in: inValue,
+    since,
+    until,
+  };
+}
+
+const HEX_PUBKEY_RE = /^[0-9a-f]{64}$/i;
+const UUID_RE =
+  /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+/** True when `value` is a 64-char hex pubkey (optional `0x` rejected). */
+export function isHexPubkey(value: string): boolean {
+  return HEX_PUBKEY_RE.test(value);
+}
+
+/** Strip a leading `@` from a `from:` value. */
+export function normalizeFromHandle(value: string): string {
+  return value.startsWith("@") ? value.slice(1) : value;
+}
+
+/** Strip a leading `#` from an `in:` value. */
+export function normalizeInChannel(value: string): string {
+  return value.startsWith("#") ? value.slice(1) : value;
+}
+
+/** True when `value` is a channel UUID. */
+export function isChannelUuid(value: string): boolean {
+  return UUID_RE.test(value);
+}
+
+/**
+ * Result of resolving a `from:` / `in:` operator against local candidates.
+ *
+ * Distinguishes "no operator" from "operator present but unmatched" so callers
+ * never silently widen the search when resolution fails.
+ */
+export type OperatorResolveResult<T> =
+  | { status: "none" }
+  | { status: "resolved"; value: T }
+  | { status: "unresolved" };
diff --git a/desktop/src/features/search/ui/TopbarSearch.tsx b/desktop/src/features/search/ui/TopbarSearch.tsx
index aae242fb53..67c4abb6e9 100644
--- a/desktop/src/features/search/ui/TopbarSearch.tsx
+++ b/desktop/src/features/search/ui/TopbarSearch.tsx
@@ -409,6 +409,7 @@ export function TopbarSearch({
   const {
     channelLookup,
     debouncedQuery,
+    isWaitingOnFromResolution,
     query,
     resultProfiles,
     results,
@@ -487,7 +488,10 @@ export function TopbarSearch({
   const activeResults = isShowingSuggestions
     ? suggestionResults
     : groupedSearchResults;
-  const isSearchLoading = searchQuery.isLoading || userSearchQuery.isLoading;
+  const isSearchLoading =
+    isWaitingOnFromResolution ||
+    searchQuery.isLoading ||
+    userSearchQuery.isLoading;
 
   const openSearchDialog = React.useCallback(() => {
     setSelectedMenuIndex(0);
diff --git a/desktop/src/features/search/useSearchResults.ts b/desktop/src/features/search/useSearchResults.ts
index e90c5c5f8f..b31d69a954 100644
--- a/desktop/src/features/search/useSearchResults.ts
+++ b/desktop/src/features/search/useSearchResults.ts
@@ -11,6 +11,14 @@ import {
 } from "@/features/profile/hooks";
 import { rankUserCandidatesBySearch } from "@/features/profile/lib/userCandidateSearch";
 import { useSearchMessagesQuery } from "@/features/search/hooks";
+import {
+  isChannelUuid,
+  isHexPubkey,
+  normalizeFromHandle,
+  normalizeInChannel,
+  parseSearchOperators,
+  type OperatorResolveResult,
+} from "@/features/search/lib/parseSearchOperators";
 import type { SearchResult } from "@/features/search/ui/SearchResultItem";
 import type { Channel, SearchHit, UserSearchResult } from "@/shared/api/types";
 import { normalizePubkey } from "@/shared/lib/pubkey";
@@ -34,6 +42,56 @@ function dedupeSearchHits(hits: SearchHit[]) {
   });
 }
 
+function resolveChannelIdFromOperator(
+  raw: string | null,
+  channels: Channel[],
+  channelLabels?: Record<string, string>,
+): OperatorResolveResult<string> {
+  if (!raw) {
+    return { status: "none" };
+  }
+  const value = normalizeInChannel(raw);
+  if (!value) {
+    return { status: "none" };
+  }
+  if (isChannelUuid(value)) {
+    return { status: "resolved", value };
+  }
+  const needle = value.toLowerCase();
+  const match = channels.find((channel) => {
+    const label = channelLabels?.[channel.id]?.trim() || channel.name;
+    return (
+      channel.name.toLowerCase() === needle || label.toLowerCase() === needle
+    );
+  });
+  return match
+    ? { status: "resolved", value: match.id }
+    : { status: "unresolved" };
+}
+
+function resolveAuthorFromOperator(
+  raw: string | null,
+  candidates: Array<{ pubkey: string; displayName?: string | null }>,
+): OperatorResolveResult<string> {
+  if (!raw) {
+    return { status: "none" };
+  }
+  if (isHexPubkey(raw)) {
+    return { status: "resolved", value: normalizePubkey(raw) };
+  }
+  const handle = normalizeFromHandle(raw).toLowerCase();
+  if (!handle) {
+    return { status: "unresolved" };
+  }
+  const match = candidates.find((candidate) => {
+    const name = candidate.displayName?.trim().toLowerCase();
+    return name === handle || normalizePubkey(candidate.pubkey) === handle;
+  });
+  return match
+    ? { status: "resolved", value: normalizePubkey(match.pubkey) }
+    : { status: "unresolved" };
+}
+
 export function useSearchResults({
   channelLabels,
   channels,
@@ -55,21 +113,128 @@ export function useSearchResults({
     [channels],
   );
 
-  const searchQuery = useSearchMessagesQuery(debouncedQuery, {
-    enabled,
+  const parsedQuery = React.useMemo(
+    () => parseSearchOperators(debouncedQuery),
+    [debouncedQuery],
+  );
+
+  const channelResolution = React.useMemo(
+    () => resolveChannelIdFromOperator(parsedQuery.in, channels, channelLabels),
+    [parsedQuery.in, channels, channelLabels],
+  );
+
+  const ftsQuery = parsedQuery.text;
+
+  const hasSearchQuery =
+    debouncedQuery.trim().length >= MIN_SEARCH_QUERY_LENGTH ||
+    parsedQuery.since !== null ||
+    parsedQuery.until !== null ||
+    parsedQuery.from !== null ||
+    parsedQuery.in !== null;
+
+  const searchBackedQueriesEnabled = enabled && hasSearchQuery;
+
+  const fromHandleForLookup =
+    parsedQuery.from && !isHexPubkey(parsedQuery.from)
+      ? normalizeFromHandle(parsedQuery.from)
+      : "";
+
+  const managedAgentsQuery = useManagedAgentsQuery({
+    enabled: searchBackedQueriesEnabled,
+  });
+  const relayAgentsQuery = useRelayAgentsQuery({
+    enabled: searchBackedQueriesEnabled,
+  });
+  // Resolve `from:@name` against people, not only agents.
+  const fromUserSearchQuery = useUserSearchQuery(fromHandleForLookup, {
+    enabled: searchBackedQueriesEnabled && fromHandleForLookup.length >= 1,
+    limit,
+  });
+  const userSearchQuery = useUserSearchQuery(ftsQuery, {
+    enabled: searchBackedQueriesEnabled,
     limit,
   });
 
-  const messageResults = React.useMemo(
-    () => dedupeSearchHits(searchQuery.data?.hits ?? []),
-    [searchQuery.data?.hits],
+  const authorCandidateSeed = React.useMemo(() => {
+    const candidates: Array<{ pubkey: string; displayName?: string | null }> =
+      [];
+    const seen = new Set<string>();
+    const push = (pubkey: string, displayName?: string | null) => {
+      const key = normalizePubkey(pubkey);
+      if (seen.has(key)) {
+        return;
+      }
+      seen.add(key);
+      candidates.push({ pubkey: key, displayName });
+    };
+    for (const agent of managedAgentsQuery.data ?? []) {
+      push(agent.pubkey, agent.name);
+    }
+    for (const agent of relayAgentsQuery.data ?? []) {
+      push(agent.pubkey, agent.name);
+    }
+    for (const user of fromUserSearchQuery.data ?? []) {
+      push(user.pubkey, user.displayName);
+    }
+    for (const user of userSearchQuery.data ?? []) {
+      push(user.pubkey, user.displayName);
+    }
+    return candidates;
+  }, [
+    managedAgentsQuery.data,
+    relayAgentsQuery.data,
+    fromUserSearchQuery.data,
+    userSearchQuery.data,
+  ]);
+
+  const authorResolution = React.useMemo(
+    () => resolveAuthorFromOperator(parsedQuery.from, authorCandidateSeed),
+    [parsedQuery.from, authorCandidateSeed],
   );
+
+  const hasUnresolvedOperator =
+    authorResolution.status === "unresolved" ||
+    channelResolution.status === "unresolved";
+
+  // While `from:@name` user search is still loading, hold off so we do not
+  // flash an unresolved empty state before candidates arrive.
+  const waitingOnFromResolution =
+    Boolean(fromHandleForLookup) &&
+    fromUserSearchQuery.isLoading &&
+    authorResolution.status === "unresolved";
+
+  const searchQuery = useSearchMessagesQuery(ftsQuery, {
+    enabled:
+      enabled &&
+      !hasUnresolvedOperator &&
+      !waitingOnFromResolution &&
+      ftsQuery.length >= MIN_SEARCH_QUERY_LENGTH,
+    limit,
+    channelId:
+      channelResolution.status === "resolved"
+        ? channelResolution.value
+        : undefined,
+    authors:
+      authorResolution.status === "resolved"
+        ? [authorResolution.value]
+        : undefined,
+    since: parsedQuery.since,
+    until: parsedQuery.until,
+    unresolvedOperator: hasUnresolvedOperator,
+  });
+
+  const messageResults = React.useMemo(() => {
+    if (hasUnresolvedOperator) {
+      return [];
+    }
+    return dedupeSearchHits(searchQuery.data?.hits ?? []);
+  }, [hasUnresolvedOperator, searchQuery.data?.hits]);
   const channelResults = React.useMemo(() => {
-    if (debouncedQuery.length < MIN_SEARCH_QUERY_LENGTH) {
+    if (ftsQuery.length < MIN_SEARCH_QUERY_LENGTH) {
       return [];
     }
 
-    const normalizedQuery = debouncedQuery.toLowerCase();
+    const normalizedQuery = ftsQuery.toLowerCase();
 
     return channels
       .filter(
@@ -100,21 +265,7 @@ export function useSearchResults({
         return aDisplayName.localeCompare(bDisplayName);
       })
       .slice(0, 5);
-  }, [channelLabels, channels, debouncedQuery]);
-
-  const hasSearchQuery = debouncedQuery.length >= MIN_SEARCH_QUERY_LENGTH;
-  const searchBackedQueriesEnabled = enabled && hasSearchQuery;
-
-  const userSearchQuery = useUserSearchQuery(debouncedQuery, {
-    enabled: searchBackedQueriesEnabled,
-    limit,
-  });
-  const managedAgentsQuery = useManagedAgentsQuery({
-    enabled: searchBackedQueriesEnabled,
-  });
-  const relayAgentsQuery = useRelayAgentsQuery({
-    enabled: searchBackedQueriesEnabled,
-  });
+  }, [channelLabels, channels, ftsQuery]);
   const managedAgentPubkeys = React.useMemo(
     () =>
       new Set(
@@ -145,11 +296,11 @@ export function useSearchResults({
     return pubkeys;
   }, [managedAgentPubkeys, relayAgentsQuery.data]);
   const userResults = React.useMemo<UserSearchResult[]>(() => {
-    if (debouncedQuery.length < MIN_SEARCH_QUERY_LENGTH) {
+    if (ftsQuery.length < MIN_SEARCH_QUERY_LENGTH) {
       return [];
     }
 
-    const normalizedQuery = debouncedQuery.toLowerCase();
+    const normalizedQuery = ftsQuery.toLowerCase();
     const candidatesByPubkey = new Map<string, UserSearchResult>();
 
     const matchesQuery = (candidate: UserSearchResult) =>
@@ -241,11 +392,11 @@ export function useSearchResults({
       candidates: [...candidatesByPubkey.values()],
       getLabel: formatUserResultName,
       limit,
-      query: debouncedQuery,
+      query: ftsQuery,
     });
   }, [
-    debouncedQuery,
     eligibleAgentPubkeys,
+    ftsQuery,
     isArchivedDiscovery,
     limit,
     managedAgentPubkeys,
@@ -318,6 +469,7 @@ export function useSearchResults({
     channelLookup,
     channelResults,
     debouncedQuery,
+    isWaitingOnFromResolution: waitingOnFromResolution,
     messageResults,
     query,
     resultProfiles: resultProfilesQuery.data?.profiles,
diff --git a/desktop/src/features/settings/ui/ActiveAgentCommunitiesSettingsCard.tsx b/desktop/src/features/settings/ui/ActiveAgentCommunitiesSettingsCard.tsx
deleted file mode 100644
index 268bd863f2..0000000000
--- a/desktop/src/features/settings/ui/ActiveAgentCommunitiesSettingsCard.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import * as React from "react";
-
-import { useManagedAgentsQuery } from "@/features/agents/hooks";
-import {
-  useManagedAgentRuntimeAction,
-  useManagedAgentRuntimesQuery,
-} from "@/features/agents/managedAgentRuntimeHooks";
-import {
-  agentCommunityAvailability,
-  agentCommunityStatusDetail,
-  managedAgentRuntimeKey,
-} from "@/features/agents/managedAgentRuntimeStatus";
-import type { ManagedAgentRuntimeStatus } from "@/shared/api/types";
-import { Button } from "@/shared/ui/button";
-import { Badge } from "@/shared/ui/badge";
-import { truncatePubkey } from "@/shared/lib/pubkey";
-import { SettingsSectionHeader } from "./SettingsSectionHeader";
-
-export function ActiveAgentCommunitiesSettingsCard() {
-  const agentsQuery = useManagedAgentsQuery();
-  const runtimesQuery = useManagedAgentRuntimesQuery();
-  const action = useManagedAgentRuntimeAction();
-  const [pendingRuntimeKey, setPendingRuntimeKey] = React.useState<
-    string | null
-  >(null);
-
-  const agentNames = React.useMemo(
-    () =>
-      new Map(
-        (agentsQuery.data ?? []).map((agent) => [
-          agent.pubkey.toLowerCase(),
-          agent.name,
-        ]),
-      ),
-    [agentsQuery.data],
-  );
-  const runtimes = runtimesQuery.data ?? [];
-
-  async function runAction(runtime: ManagedAgentRuntimeStatus) {
-    setPendingRuntimeKey(managedAgentRuntimeKey(runtime));
-    try {
-      await action.mutateAsync({
-        action:
-          runtime.lifecycle === "starting" ||
-          runtime.lifecycle === "listening" ||
-          runtime.lifecycle === "waking" ||
-          runtime.lifecycle === "ready"
-            ? "stop"
-            : runtime.lifecycle === "stopped"
-              ? "start"
-              : "restart",
-        pubkey: runtime.pubkey,
-        relayUrl: runtime.relayUrl,
-      });
-    } finally {
-      setPendingRuntimeKey(null);
-    }
-  }
-
-  return (
-    <section className="min-w-0" data-testid="active-agent-communities">
-      <SettingsSectionHeader
-        title="Active in communities"
-        description="See and control each community where this device runs your agents."
-      />
-      <div className="overflow-hidden rounded-xl border border-border/60">
-        {runtimesQuery.isPending ? (
-          <p className="px-4 py-3 text-sm text-muted-foreground">Loading…</p>
-        ) : runtimes.length === 0 ? (
-          <p className="px-4 py-3 text-sm text-muted-foreground">
-            No agent community runtimes found.
-          </p>
-        ) : (
-          runtimes.map((runtime) => {
-            const status = agentCommunityAvailability(runtime);
-            const detail = agentCommunityStatusDetail(runtime);
-            const runtimeKey = managedAgentRuntimeKey(runtime);
-            const pending = pendingRuntimeKey === runtimeKey;
-            return (
-              <div
-                className="flex items-center gap-3 border-b border-border/60 px-4 py-3 last:border-b-0"
-                data-pubkey={runtime.pubkey}
-                data-relay-url={runtime.relayUrl}
-                data-testid="agent-community-runtime"
-                key={runtimeKey}
-              >
-                <div className="min-w-0 flex-1">
-                  <div className="flex flex-wrap items-center gap-2">
-                    <p className="text-sm font-medium">
-                      {agentNames.get(runtime.pubkey.toLowerCase()) ??
-                        truncatePubkey(runtime.pubkey)}
-                    </p>
-                    <Badge
-                      variant={status === "Here" ? "default" : "secondary"}
-                    >
-                      {status}
-                    </Badge>
-                  </div>
-                  <p className="truncate text-xs text-muted-foreground">
-                    {runtime.relayUrl}
-                  </p>
-                  {detail ? (
-                    <p className="text-xs text-muted-foreground">{detail}</p>
-                  ) : null}
-                </div>
-                {runtime.localSetup ? (
-                  <Button
-                    disabled={pending}
-                    onClick={() => void runAction(runtime)}
-                    size="sm"
-                    type="button"
-                    variant="outline"
-                  >
-                    {pending
-                      ? "Working…"
-                      : runtime.lifecycle === "stopped"
-                        ? "Start"
-                        : runtime.lifecycle === "failed"
-                          ? "Restart"
-                          : "Stop"}
-                  </Button>
-                ) : null}
-              </div>
-            );
-          })
-        )}
-      </div>
-      {action.error instanceof Error ? (
-        <p className="mt-2 text-sm text-destructive">{action.error.message}</p>
-      ) : null}
-    </section>
-  );
-}
diff --git a/desktop/src/features/settings/ui/CustomHarnessForm.tsx b/desktop/src/features/settings/ui/CustomHarnessForm.tsx
new file mode 100644
index 0000000000..52e7906265
--- /dev/null
+++ b/desktop/src/features/settings/ui/CustomHarnessForm.tsx
@@ -0,0 +1,471 @@
+import * as React from "react";
+import { Plus, X } from "lucide-react";
+
+import {
+  useManagedAgentPrereqsQuery,
+  useSaveCustomHarnessMutation,
+} from "@/features/agents/hooks";
+import {
+  PERSONA_FIELD_CONTROL_CLASS,
+  PERSONA_FIELD_SHELL_CLASS,
+  PERSONA_LABEL_OPTIONAL_CLASS,
+} from "@/features/agents/ui/agentConfigOptions";
+import { cn } from "@/shared/lib/cn";
+import { Button } from "@/shared/ui/button";
+import { Input } from "@/shared/ui/input";
+import { Spinner } from "@/shared/ui/spinner";
+
+import {
+  commaArgError,
+  type CustomFormValues,
+  definitionFromFormValues,
+  idFromLabel,
+} from "./harnessFormLogic";
+
+// ── Shared empty state ────────────────────────────────────────────────────────
+
+export const EMPTY_CUSTOM_FORM: CustomFormValues = {
+  id: "",
+  label: "",
+  command: "",
+  args: [],
+  env: [],
+  installInstructionsUrl: "",
+  installHint: "",
+};
+
+// ── Inline command validation ─────────────────────────────────────────────────
+
+function CommandAvailabilityBadge({ command }: { command: string }) {
+  const trimmed = command.trim();
+  const prereqs = useManagedAgentPrereqsQuery(trimmed, "", {
+    enabled: trimmed.length > 0,
+  });
+
+  if (!trimmed || prereqs.isLoading) return null;
+
+  const available = prereqs.data?.acp.available;
+  if (available === undefined) return null;
+
+  return (
+    <span
+      className={cn(
+        "inline-flex items-center rounded-md px-2 py-0.5 text-xs font-medium",
+        available
+          ? "bg-emerald-500/15 text-emerald-600 dark:text-emerald-400"
+          : "bg-amber-500/15 text-amber-600 dark:text-amber-400",
+      )}
+    >
+      {available ? "Found on PATH" : "Not found on PATH"}
+    </span>
+  );
+}
+
+// ── Shared field chrome (matches the Create agent dialog) ────────────────────
+
+function FieldShell({
+  children,
+  className,
+}: {
+  children: React.ReactNode;
+  className?: string;
+}) {
+  return (
+    <div
+      className={cn(
+        "flex min-h-11 items-center px-3",
+        PERSONA_FIELD_SHELL_CLASS,
+        className,
+      )}
+    >
+      {children}
+    </div>
+  );
+}
+
+const FIELD_INPUT_CLASS = cn(
+  "h-8 px-0 py-0 leading-6",
+  PERSONA_FIELD_CONTROL_CLASS,
+);
+
+// ── Args / env editors ────────────────────────────────────────────────────────
+
+function ArgsEditor({
+  args,
+  onChange,
+}: {
+  args: string[];
+  onChange: (next: string[]) => void;
+}) {
+  function set(index: number, value: string) {
+    const next = [...args];
+    next[index] = value;
+    onChange(next);
+  }
+
+  return (
+    <div className="space-y-2">
+      {args.map((arg, i) => (
+        // biome-ignore lint/suspicious/noArrayIndexKey: positional arg list
+        <div className="flex items-center gap-2" key={i}>
+          <FieldShell className="flex-1">
+            <Input
+              className={cn(FIELD_INPUT_CLASS, "font-mono")}
+              onChange={(e) => set(i, e.target.value)}
+              placeholder={`arg ${i + 1}`}
+              value={arg}
+            />
+          </FieldShell>
+          <Button
+            aria-label="Remove argument"
+            onClick={() => onChange(args.filter((_, idx) => idx !== i))}
+            size="icon"
+            type="button"
+            variant="ghost"
+          >
+            <X className="h-4 w-4" />
+          </Button>
+        </div>
+      ))}
+      <Button
+        onClick={() => onChange([...args, ""])}
+        size="sm"
+        type="button"
+        variant="outline"
+      >
+        <Plus className="mr-1 h-4 w-4" />
+        Add argument
+      </Button>
+    </div>
+  );
+}
+
+function EnvEditor({
+  env,
+  onChange,
+}: {
+  env: Array<{ key: string; value: string }>;
+  onChange: (next: Array<{ key: string; value: string }>) => void;
+}) {
+  function set(index: number, field: "key" | "value", value: string) {
+    onChange(env.map((e, i) => (i === index ? { ...e, [field]: value } : e)));
+  }
+
+  return (
+    <div className="space-y-2">
+      {env.map((pair, i) => (
+        // biome-ignore lint/suspicious/noArrayIndexKey: positional env list
+        <div className="flex items-center gap-2" key={i}>
+          <FieldShell className="flex-1">
+            <Input
+              className={cn(FIELD_INPUT_CLASS, "font-mono")}
+              onChange={(e) => set(i, "key", e.target.value)}
+              placeholder="KEY"
+              value={pair.key}
+            />
+          </FieldShell>
+          <FieldShell className="flex-2">
+            <Input
+              className={cn(FIELD_INPUT_CLASS, "font-mono")}
+              onChange={(e) => set(i, "value", e.target.value)}
+              placeholder="value"
+              value={pair.value}
+            />
+          </FieldShell>
+          <Button
+            aria-label="Remove env var"
+            onClick={() => onChange(env.filter((_, idx) => idx !== i))}
+            size="icon"
+            type="button"
+            variant="ghost"
+          >
+            <X className="h-4 w-4" />
+          </Button>
+        </div>
+      ))}
+      <Button
+        onClick={() => onChange([...env, { key: "", value: "" }])}
+        size="sm"
+        type="button"
+        variant="outline"
+      >
+        <Plus className="mr-1 h-4 w-4" />
+        Add env var
+      </Button>
+    </div>
+  );
+}
+
+// ── Custom harness form ───────────────────────────────────────────────────────
+
+/**
+ * Create/edit form for a custom harness. Name and Command are the only
+ * required fields — that's all a working ACP harness needs. ID (auto-derived
+ * from name), arguments, env vars, docs URL, and install hint follow inline.
+ */
+export function CustomHarnessForm({
+  initial,
+  originalId,
+  onCancel,
+  onSaved,
+  chromeless = false,
+  header,
+}: {
+  initial?: Partial<CustomFormValues>;
+  /** Id of the harness being edited, if this is an edit (not new). Used to
+   * delete the old file when the id changes. */
+  originalId?: string;
+  onCancel: () => void;
+  /** Receives the id the harness was saved under (the form may rewrite it). */
+  onSaved: (id: string) => void;
+  /** Render without the bordered card chrome (for embedding in the catalog
+   * dialog detail pane). */
+  chromeless?: boolean;
+  /** Optional intro block rendered at the top of the scrollable body
+   * (chromeless mode) so it scrolls with the fields. */
+  header?: React.ReactNode;
+}) {
+  const [form, setForm] = React.useState<CustomFormValues>({
+    ...EMPTY_CUSTOM_FORM,
+    ...initial,
+  });
+  const [error, setError] = React.useState<string | null>(null);
+  const save = useSaveCustomHarnessMutation();
+
+  // Save stays disabled until every required field is satisfied: the three
+  // required text fields are non-blank and no args/env row is left empty.
+  const requiredFieldsSatisfied =
+    form.label.trim().length > 0 &&
+    form.command.trim().length > 0 &&
+    form.id.trim().length > 0 &&
+    form.args.every((arg) => arg.trim().length > 0) &&
+    form.env.every((pair) => pair.key.trim().length > 0);
+
+  function field(
+    key: keyof Pick<
+      CustomFormValues,
+      "id" | "label" | "command" | "installInstructionsUrl" | "installHint"
+    >,
+  ) {
+    return (e: React.ChangeEvent<HTMLInputElement>) => {
+      const value = e.target.value;
+      setForm((prev) => {
+        const next = { ...prev, [key]: value };
+        // Auto-derive id from label when id is empty or was auto-derived.
+        if (
+          key === "label" &&
+          (!prev.id || prev.id === idFromLabel(prev.label))
+        ) {
+          next.id = idFromLabel(value);
+        }
+        return next;
+      });
+    };
+  }
+
+  async function handleSubmit(e: React.FormEvent) {
+    e.preventDefault();
+    setError(null);
+    // Mirror the backend comma-in-args rejection so the user gets an inline
+    // error naming the offending argument before the round-trip.
+    const commaError = commaArgError(form.args);
+    if (commaError) {
+      setError(commaError);
+      return;
+    }
+    try {
+      const definition = definitionFromFormValues(form);
+      await save.mutateAsync({ definition, originalId });
+      onSaved(definition.id);
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+    }
+  }
+
+  return (
+    <form
+      className={cn(
+        chromeless
+          ? "flex min-h-0 flex-1 flex-col"
+          : "space-y-5 rounded-2xl border border-border/60 bg-muted/10 px-4 py-4",
+      )}
+      data-testid="custom-harness-form"
+      onSubmit={(e) => void handleSubmit(e)}
+    >
+      {chromeless ? null : (
+        <div className="flex items-center justify-between">
+          <p className="text-sm font-medium">
+            {originalId ? "Edit harness" : "Add custom harness"}
+          </p>
+          <button
+            aria-label="Cancel"
+            className="rounded-md p-1 text-muted-foreground hover:bg-muted hover:text-foreground"
+            onClick={onCancel}
+            type="button"
+          >
+            <X className="h-4 w-4" />
+          </button>
+        </div>
+      )}
+
+      <div
+        className={cn(
+          "space-y-5",
+          chromeless && "min-h-0 flex-1 overflow-y-auto px-5 py-5",
+        )}
+      >
+        {header}
+
+        <div className="flex gap-3">
+          <div className="flex-1 space-y-1.5">
+            <label
+              className="text-sm font-medium text-foreground"
+              htmlFor="ch-label"
+            >
+              Name
+            </label>
+            <FieldShell>
+              <Input
+                className={FIELD_INPUT_CLASS}
+                id="ch-label"
+                onChange={field("label")}
+                placeholder="My Runtime"
+                required
+                value={form.label}
+              />
+            </FieldShell>
+          </div>
+
+          <div className="flex-1 space-y-1.5">
+            <label
+              className="text-sm font-medium text-foreground"
+              htmlFor="ch-id"
+            >
+              ID
+              <span className={PERSONA_LABEL_OPTIONAL_CLASS}>
+                (auto-derived)
+              </span>
+            </label>
+            <FieldShell>
+              <Input
+                className={cn(FIELD_INPUT_CLASS, "font-mono")}
+                id="ch-id"
+                onChange={field("id")}
+                placeholder="my-runtime"
+                required
+                value={form.id}
+              />
+            </FieldShell>
+          </div>
+        </div>
+
+        <div className="space-y-1.5">
+          <div className="flex items-center gap-2">
+            <label
+              className="text-sm font-medium text-foreground"
+              htmlFor="ch-command"
+            >
+              Command
+            </label>
+            <CommandAvailabilityBadge command={form.command} />
+          </div>
+          <FieldShell>
+            <Input
+              className={cn(FIELD_INPUT_CLASS, "font-mono")}
+              id="ch-command"
+              onChange={field("command")}
+              placeholder="my-agent-bin"
+              required
+              value={form.command}
+            />
+          </FieldShell>
+          <p className="text-xs text-muted-foreground">
+            Any command that speaks ACP over stdio works.
+          </p>
+        </div>
+
+        <div className="space-y-1.5">
+          <p className="text-sm font-medium text-foreground">Arguments</p>
+          <ArgsEditor
+            args={form.args}
+            onChange={(args) => setForm((p) => ({ ...p, args }))}
+          />
+        </div>
+
+        <div className="space-y-1.5">
+          <p className="text-sm font-medium text-foreground">
+            Env vars
+            <span className={PERSONA_LABEL_OPTIONAL_CLASS}>
+              (override at spawn time; Buzz-managed vars always win)
+            </span>
+          </p>
+          <EnvEditor
+            env={form.env}
+            onChange={(env) => setForm((p) => ({ ...p, env }))}
+          />
+        </div>
+
+        <div className="space-y-1.5">
+          <label
+            className="text-sm font-medium text-foreground"
+            htmlFor="ch-docs-url"
+          >
+            Docs URL
+            <span className={PERSONA_LABEL_OPTIONAL_CLASS}>(optional)</span>
+          </label>
+          <FieldShell>
+            <Input
+              className={FIELD_INPUT_CLASS}
+              id="ch-docs-url"
+              onChange={field("installInstructionsUrl")}
+              placeholder="https://example.com/docs"
+              value={form.installInstructionsUrl}
+            />
+          </FieldShell>
+        </div>
+
+        <div className="space-y-1.5">
+          <label
+            className="text-sm font-medium text-foreground"
+            htmlFor="ch-install-hint"
+          >
+            Install hint
+            <span className={PERSONA_LABEL_OPTIONAL_CLASS}>(optional)</span>
+          </label>
+          <FieldShell>
+            <Input
+              className={FIELD_INPUT_CLASS}
+              id="ch-install-hint"
+              onChange={field("installHint")}
+              placeholder="npm install -g my-harness"
+              value={form.installHint}
+            />
+          </FieldShell>
+        </div>
+
+        {error ? (
+          <p className="rounded-lg border border-destructive/30 bg-destructive/10 px-3 py-1.5 text-sm text-destructive">
+            {error}
+          </p>
+        ) : null}
+      </div>
+
+      <div
+        className={cn(
+          "flex justify-end gap-2",
+          chromeless
+            ? "shrink-0 border-t border-border/60 bg-background px-5 py-3"
+            : "pt-1",
+        )}
+      >
+        <Button
+          disabled={save.isPending || !requiredFieldsSatisfied}
+          type="submit"
+        >
+          {save.isPending ? <Spinner className="mr-2 h-3.5 w-3.5" /> : null}
+          Save
+        </Button>
+      </div>
+    </form>
+  );
+}
diff --git a/desktop/src/features/settings/ui/HarnessCatalogDialog.tsx b/desktop/src/features/settings/ui/HarnessCatalogDialog.tsx
new file mode 100644
index 0000000000..2bc689e9e8
--- /dev/null
+++ b/desktop/src/features/settings/ui/HarnessCatalogDialog.tsx
@@ -0,0 +1,612 @@
+import * as React from "react";
+import { ChevronRight, ExternalLink, Plus, Search } from "lucide-react";
+import { openUrl } from "@tauri-apps/plugin-opener";
+
+import {
+  useAcpRuntimesQuery,
+  useInstallAcpRuntimeMutation,
+} from "@/features/agents/hooks";
+import {
+  getRuntimeDisplayLabel,
+  RuntimeIcon,
+} from "@/features/onboarding/ui/RuntimeIcon";
+import type { AcpRuntimeCatalogEntry } from "@/shared/api/types";
+import { getInstallErrorMessage } from "@/shared/lib/installError";
+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 { ChooserDialogContent } from "@/shared/ui/chooser-dialog-content";
+import { Dialog } from "@/shared/ui/dialog";
+import { Input } from "@/shared/ui/input";
+import { Skeleton } from "@/shared/ui/skeleton";
+import { Spinner } from "@/shared/ui/spinner";
+
+import { CustomHarnessForm } from "./CustomHarnessForm";
+import { harnessDescription } from "./harnessCatalogCopy";
+import {
+  adapterUpdateWarning,
+  catalogDialogEntries,
+  catalogPrimaryAction,
+  entryStatusLabel,
+  filterCatalogEntries,
+  groupCatalogEntries,
+  installLinkLabel,
+} from "./harnessCatalogLogic";
+
+/** Sentinel list selection for the "+ Custom harness" entry. */
+const CUSTOM_ENTRY_ID = "\u0000custom";
+
+/**
+ * "Add runtimes" — master-detail catalog dialog, modeled on the Agent
+ * Catalog (PersonaCatalogDialog): searchable left chooser, right detail pane
+ * with one neutral vendor-sourced sentence, operational setup state, and
+ * technical details, plus a primary Install / setup-guide CTA pinned in a
+ * bottom action bar (same position as the custom-harness Save button).
+ * "+ Custom harness" opens the progressive-disclosure form in the same pane.
+ */
+export function HarnessCatalogDialog({
+  onOpenChange,
+  open,
+}: {
+  onOpenChange: (open: boolean) => void;
+  open: boolean;
+}) {
+  const contentRef = React.useRef<HTMLDivElement | null>(null);
+  const runtimesQuery = useAcpRuntimesQuery();
+  const isLoading = runtimesQuery.isLoading;
+  const entries = React.useMemo(
+    () => catalogDialogEntries(runtimesQuery.data ?? []),
+    [runtimesQuery.data],
+  );
+  const [query, setQuery] = React.useState("");
+  const filtered = React.useMemo(
+    () => filterCatalogEntries(entries, query),
+    [entries, query],
+  );
+  const [selectedId, setSelectedId] = React.useState<string | null>(null);
+  const groups = React.useMemo(() => groupCatalogEntries(filtered), [filtered]);
+  // "Installed" is collapsed by default — the dialog exists to set up new
+  // runtimes. Searching force-expands it (VS Code-style) so matches are never
+  // hidden; likewise when there is nothing left to set up.
+  const [setupOpen, setSetupOpen] = React.useState(true);
+  const [installedOpen, setInstalledOpen] = React.useState(false);
+  const isSearching = query.trim().length > 0;
+  const setupExpanded = setupOpen || isSearching;
+  const installedExpanded =
+    installedOpen || isSearching || groups.setup.length === 0;
+
+  // Keep a valid selection: default to the first visible entry; hold on to
+  // the custom-form selection regardless of the filter.
+  React.useEffect(() => {
+    if (!open) return;
+    setSelectedId((current) => {
+      if (current === CUSTOM_ENTRY_ID) return current;
+      if (current && filtered.some((e) => e.id === current)) return current;
+      return filtered[0]?.id ?? null;
+    });
+  }, [open, filtered]);
+
+  // Reset transient state when the dialog closes.
+  React.useEffect(() => {
+    if (!open) {
+      setQuery("");
+      setSelectedId(null);
+      setSetupOpen(true);
+      setInstalledOpen(false);
+    }
+  }, [open]);
+
+  const selectedEntry =
+    selectedId === CUSTOM_ENTRY_ID
+      ? null
+      : (filtered.find((e) => e.id === selectedId) ?? null);
+
+  return (
+    <Dialog onOpenChange={onOpenChange} open={open}>
+      <ChooserDialogContent
+        className="h-[42rem] max-w-4xl"
+        contentClassName="flex min-h-0 flex-1 p-0"
+        data-testid="harness-catalog-dialog"
+        headerClassName="bg-sidebar pb-3 text-sidebar-foreground"
+        headerTestId="harness-catalog-dialog-header"
+        onOpenAutoFocus={(event) => {
+          event.preventDefault();
+          contentRef.current?.focus();
+        }}
+        ref={contentRef}
+        scrollAreaClassName="flex min-h-0 overflow-hidden px-0"
+        scrollAreaTestId="harness-catalog-dialog-body"
+        tabIndex={-1}
+        title="Add runtimes"
+      >
+        <div className="flex min-h-0 flex-1 flex-col overflow-hidden bg-sidebar sm:flex-row">
+          {/* Left: search + chooser list */}
+          <div className="flex max-h-56 min-h-0 flex-col sm:max-h-none sm:w-56">
+            <div className="px-3 pt-3">
+              <div className="relative">
+                <Search className="pointer-events-none absolute left-2.5 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-sidebar-foreground/50" />
+                <Input
+                  aria-label="Search runtimes"
+                  className="h-8 border-sidebar-border bg-sidebar-accent/40 pl-8 text-sm"
+                  data-testid="harness-catalog-search"
+                  onChange={(e) => setQuery(e.target.value)}
+                  placeholder="Search runtimes…"
+                  value={query}
+                />
+              </div>
+            </div>
+            <div
+              className="min-h-0 flex-1 overflow-y-auto px-2 py-3"
+              data-testid="harness-catalog-list"
+            >
+              <div className="space-y-1">
+                {isLoading ? (
+                  <CatalogListSkeleton />
+                ) : filtered.length === 0 ? (
+                  <p className="px-4 py-2 text-sm text-sidebar-foreground/60">
+                    No runtimes match.
+                  </p>
+                ) : (
+                  <>
+                    {groups.setup.length > 0 ? (
+                      <CatalogSection
+                        count={groups.setup.length}
+                        label="Setup"
+                        onToggle={() => setSetupOpen((v) => !v)}
+                        open={setupExpanded}
+                        testId="harness-catalog-section-setup"
+                      >
+                        {groups.setup.map((entry) => (
+                          <CatalogListItem
+                            entry={entry}
+                            isCurrent={entry.id === selectedId}
+                            key={entry.id}
+                            onSelect={() => setSelectedId(entry.id)}
+                          />
+                        ))}
+                      </CatalogSection>
+                    ) : null}
+                    {groups.installed.length > 0 ? (
+                      <CatalogSection
+                        count={groups.installed.length}
+                        label="Installed"
+                        onToggle={() => setInstalledOpen((v) => !v)}
+                        open={installedExpanded}
+                        testId="harness-catalog-section-installed"
+                      >
+                        {groups.installed.map((entry) => (
+                          <CatalogListItem
+                            entry={entry}
+                            isCurrent={entry.id === selectedId}
+                            key={entry.id}
+                            onSelect={() => setSelectedId(entry.id)}
+                          />
+                        ))}
+                      </CatalogSection>
+                    ) : null}
+                  </>
+                )}
+              </div>
+              <div className="my-2 border-t border-sidebar-border/60" />
+              <button
+                aria-current={
+                  selectedId === CUSTOM_ENTRY_ID ? "true" : undefined
+                }
+                className={cn(
+                  "flex w-full items-center gap-2 rounded-lg px-4 py-1.5 text-left 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",
+                  selectedId === CUSTOM_ENTRY_ID
+                    ? "bg-sidebar-active text-sidebar-active-foreground"
+                    : "text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground",
+                )}
+                data-testid="harness-catalog-list-item-custom"
+                onClick={() => setSelectedId(CUSTOM_ENTRY_ID)}
+                type="button"
+              >
+                <Plus className="h-4 w-4 shrink-0" />
+                <span className="min-w-0 flex-1 truncate text-sm font-medium">
+                  Custom harness
+                </span>
+              </button>
+            </div>
+          </div>
+
+          {/* Right: detail pane */}
+          <div className="relative z-10 ml-px flex min-h-0 flex-1 flex-col overflow-hidden rounded-tl-xl bg-background shadow-[-1px_0_0_0_hsl(var(--sidebar-border)/0.45)]">
+            <div
+              className="flex min-h-0 flex-1 flex-col overflow-hidden"
+              data-testid="harness-catalog-detail-pane"
+            >
+              {selectedId === CUSTOM_ENTRY_ID ? (
+                <CustomHarnessDetail onDone={() => onOpenChange(false)} />
+              ) : selectedEntry ? (
+                <CatalogDetail entry={selectedEntry} key={selectedEntry.id} />
+              ) : isLoading ? (
+                <div className="min-h-0 flex-1 overflow-y-auto px-5 py-5">
+                  <CatalogDetailSkeleton />
+                </div>
+              ) : (
+                <div className="min-h-0 flex-1 overflow-y-auto px-5 py-5">
+                  <div className="flex min-h-80 items-center justify-center rounded-lg border border-dashed border-border/70 px-6 text-center">
+                    <p className="max-w-sm text-sm text-muted-foreground">
+                      Select a runtime on the left, or add a custom one.
+                    </p>
+                  </div>
+                </div>
+              )}
+            </div>
+          </div>
+        </div>
+      </ChooserDialogContent>
+    </Dialog>
+  );
+}
+
+/**
+ * VS Code-style collapsible list section: chevron + uppercase label +
+ * trailing count badge. The header is a plain toggle — selection lives on
+ * the rows inside.
+ */
+function CatalogSection({
+  children,
+  count,
+  label,
+  onToggle,
+  open,
+  testId,
+}: {
+  children: React.ReactNode;
+  count: number;
+  label: string;
+  onToggle: () => void;
+  open: boolean;
+  testId: string;
+}) {
+  return (
+    <div>
+      <button
+        aria-expanded={open}
+        className="flex w-full items-center gap-1 rounded-md px-2 py-1 text-left text-2xs font-semibold uppercase tracking-wider text-sidebar-foreground/60 transition-colors hover:text-sidebar-foreground focus:outline-hidden focus-visible:ring-2 focus-visible:ring-sidebar-ring/50"
+        data-testid={testId}
+        onClick={onToggle}
+        type="button"
+      >
+        <ChevronRight
+          aria-hidden
+          className={cn(
+            "h-3 w-3 shrink-0 transition-transform",
+            open && "rotate-90",
+          )}
+        />
+        <span className="min-w-0 flex-1 truncate">{label}</span>
+        <span
+          className="ml-auto shrink-0 rounded-full bg-sidebar-accent px-1.5 py-px font-medium normal-case tracking-normal text-sidebar-foreground/70"
+          data-testid={`${testId}-count`}
+        >
+          {count}
+        </span>
+      </button>
+      {open ? <div className="space-y-1 pt-0.5">{children}</div> : null}
+    </div>
+  );
+}
+
+/** Pulsing placeholder rows shown while harness discovery is running. */
+function CatalogListSkeleton() {
+  const widths = ["w-24", "w-32", "w-20", "w-28", "w-24", "w-16"];
+  return (
+    <div
+      aria-label="Loading runtimes"
+      className="space-y-1"
+      data-testid="harness-catalog-list-skeleton"
+      role="status"
+    >
+      {widths.map((width, index) => (
+        <div
+          className="flex w-full items-center gap-2 rounded-lg px-4 py-1.5"
+          // Static placeholder list — order never changes.
+          // biome-ignore lint/suspicious/noArrayIndexKey: static skeleton rows
+          key={index}
+        >
+          <Skeleton className="h-6 w-6 shrink-0 rounded-md" />
+          <Skeleton className={cn("h-3.5 rounded", width)} />
+        </div>
+      ))}
+    </div>
+  );
+}
+
+/** Pulsing placeholder mirroring the detail-pane layout while loading. */
+function CatalogDetailSkeleton() {
+  return (
+    <div
+      aria-label="Loading runtime details"
+      className="flex min-h-full flex-col gap-6"
+      data-testid="harness-catalog-detail-skeleton"
+      role="status"
+    >
+      <div className="flex items-center gap-4">
+        <Skeleton className="h-16 w-16 rounded-xl" />
+        <div className="min-w-0 space-y-2">
+          <Skeleton className="h-5 w-40 rounded" />
+          <Skeleton className="h-4 w-16 rounded" />
+          <Skeleton className="h-7 w-24 rounded-md" />
+        </div>
+      </div>
+      <div className="space-y-2">
+        <Skeleton className="h-3.5 w-full rounded" />
+        <Skeleton className="h-3.5 w-11/12 rounded" />
+        <Skeleton className="h-3.5 w-2/3 rounded" />
+      </div>
+      <Skeleton className="h-28 w-full rounded-lg" />
+    </div>
+  );
+}
+
+function CatalogListItem({
+  entry,
+  isCurrent,
+  onSelect,
+}: {
+  entry: AcpRuntimeCatalogEntry;
+  isCurrent: boolean;
+  onSelect: () => void;
+}) {
+  const isReady = entry.availability === "available";
+
+  return (
+    <button
+      aria-current={isCurrent ? "true" : undefined}
+      className={cn(
+        "flex w-full items-center gap-2 rounded-lg px-4 py-1.5 text-left 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={`harness-catalog-list-item-${entry.id}`}
+      onClick={onSelect}
+      type="button"
+    >
+      <RuntimeIcon className="h-6 w-6" runtime={entry} />
+      <span className="min-w-0 flex-1 truncate text-sm font-medium">
+        {getRuntimeDisplayLabel(entry)}
+      </span>
+      {isReady ? (
+        <span
+          aria-label={`${entry.label} is ready`}
+          className="h-1.5 w-1.5 shrink-0 rounded-full bg-emerald-500"
+          role="img"
+        />
+      ) : null}
+    </button>
+  );
+}
+
+function CatalogDetail({ entry }: { entry: AcpRuntimeCatalogEntry }) {
+  const install = useInstallAcpRuntimeMutation();
+  const [installError, setInstallError] = React.useState<string | null>(null);
+  const [isUpdateWarningOpen, setIsUpdateWarningOpen] = React.useState(false);
+  const action = catalogPrimaryAction(entry);
+  const statusLabel = entryStatusLabel(entry);
+  const description = harnessDescription(entry.id);
+  const isReady = entry.availability === "available";
+  const docsUrl = entry.installInstructionsUrl.trim();
+
+  function handleInstall() {
+    setInstallError(null);
+    install.mutate(entry.id, {
+      onSuccess: (result) => {
+        if (!result.success) {
+          setInstallError(getInstallErrorMessage(result.steps));
+        }
+      },
+      onError: (error) => {
+        setInstallError(
+          error instanceof Error ? error.message : "Install failed.",
+        );
+      },
+    });
+  }
+
+  // Replacing an outdated adapter is a machine-wide mutation — gate it behind
+  // the same confirmation the runtime row shows (adapterUpdateWarning is the
+  // shared copy source). Fresh installs stay one-click.
+  function handlePrimaryClick() {
+    if (entry.availability === "adapter_outdated") {
+      setIsUpdateWarningOpen(true);
+      return;
+    }
+    handleInstall();
+  }
+
+  // The outline docs button only shows when the entry needs no setup action
+  // (already ready) — pair it with a hint so the muted styling reads as
+  // "nothing to do here" rather than a broken primary button.
+  const isSecondaryCta = action.kind !== "install" && action.kind !== "docs";
+
+  const primaryCta =
+    action.kind === "install" ? (
+      <Button
+        data-testid={`harness-catalog-install-${entry.id}`}
+        disabled={install.isPending}
+        onClick={handlePrimaryClick}
+        type="button"
+      >
+        {install.isPending ? <Spinner className="mr-2 h-3.5 w-3.5" /> : null}
+        {action.label}
+      </Button>
+    ) : docsUrl ? (
+      <Button
+        data-testid={
+          action.kind === "docs"
+            ? `harness-catalog-setup-${entry.id}`
+            : `harness-catalog-docs-${entry.id}`
+        }
+        onClick={() => void openUrl(docsUrl)}
+        type="button"
+        variant={action.kind === "docs" ? "default" : "outline"}
+      >
+        <ExternalLink className="mr-1 h-3.5 w-3.5" />
+        {action.kind === "docs" ? action.label : installLinkLabel(entry)}
+      </Button>
+    ) : null;
+
+  return (
+    <div className="flex min-h-0 flex-1 flex-col">
+      <div className="min-h-0 flex-1 space-y-6 overflow-y-auto px-5 py-5">
+        <div className="flex items-center gap-4">
+          <RuntimeIcon className="h-16 w-16" runtime={entry} />
+          <div className="min-w-0">
+            <h3 className="truncate text-xl font-semibold leading-snug">
+              {getRuntimeDisplayLabel(entry)}
+            </h3>
+            {statusLabel ? (
+              // entryStatusLabel is the single availability→label source
+              // shared with the row chip — when it has something to say
+              // (setup needed, sign-in needed, config error) it outranks the
+              // green Ready chip even for available entries.
+              <span
+                className="mt-1 inline-flex items-center rounded-md bg-muted px-2 py-0.5 text-xs font-medium text-muted-foreground"
+                data-testid={`harness-catalog-status-${entry.id}`}
+              >
+                {statusLabel}
+              </span>
+            ) : isReady ? (
+              <span className="mt-1 inline-flex items-center rounded-md bg-emerald-500/15 px-2 py-0.5 text-xs font-medium text-emerald-600 dark:text-emerald-400">
+                Ready
+              </span>
+            ) : null}
+          </div>
+        </div>
+
+        {description ? (
+          <p className="text-sm leading-6 text-muted-foreground">
+            {description}
+          </p>
+        ) : null}
+
+        {entry.installHint ? (
+          <div className="space-y-1">
+            <p className="text-xs font-semibold text-muted-foreground">Setup</p>
+            <p className="whitespace-pre-line text-sm leading-6 text-foreground">
+              {entry.installHint}
+            </p>
+          </div>
+        ) : null}
+
+        {installError ? (
+          <p className="whitespace-pre-line rounded-lg border border-destructive/30 bg-destructive/10 px-3 py-1.5 text-sm text-destructive">
+            {installError}
+          </p>
+        ) : null}
+
+        <TechnicalDetails entry={entry} />
+      </div>
+
+      {primaryCta ? (
+        <div className="flex shrink-0 items-center justify-end gap-3 border-t border-border/60 bg-background px-5 py-3">
+          {isSecondaryCta ? (
+            <p
+              className="text-xs text-muted-foreground/80"
+              data-testid={`harness-catalog-ready-hint-${entry.id}`}
+            >
+              Already set up
+            </p>
+          ) : null}
+          {primaryCta}
+        </div>
+      ) : null}
+      <AlertDialog
+        onOpenChange={setIsUpdateWarningOpen}
+        open={isUpdateWarningOpen}
+      >
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>Update {entry.label} adapter?</AlertDialogTitle>
+            <AlertDialogDescription>
+              {adapterUpdateWarning(entry)}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel>Cancel</AlertDialogCancel>
+            <AlertDialogAction
+              data-testid={`harness-catalog-confirm-update-${entry.id}`}
+              onClick={handleInstall}
+            >
+              Update
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </div>
+  );
+}
+
+function TechnicalDetails({ entry }: { entry: AcpRuntimeCatalogEntry }) {
+  const rows: Array<{ label: string; value: string }> = [
+    { label: "ID", value: entry.id },
+    ...(entry.command ? [{ label: "Command", value: entry.command }] : []),
+    ...(entry.defaultArgs.length > 0
+      ? [{ label: "Arguments", value: entry.defaultArgs.join(" ") }]
+      : []),
+    ...(entry.underlyingCliPath
+      ? [{ label: "Underlying CLI", value: entry.underlyingCliPath }]
+      : []),
+    ...(entry.binaryPath ? [{ label: "Path", value: entry.binaryPath }] : []),
+    {
+      label: "Source",
+      value: entry.source === "builtin" ? "Built-in" : "Bundled preset",
+    },
+  ];
+
+  return (
+    <dl
+      className="space-y-1.5 rounded-lg border border-border/70 bg-card/70 px-4 py-3"
+      data-testid={`harness-catalog-technical-${entry.id}`}
+    >
+      {rows.map((row) => (
+        <div className="flex gap-3 text-sm" key={row.label}>
+          <dt className="w-28 shrink-0 text-xs font-semibold leading-5 text-muted-foreground">
+            {row.label}
+          </dt>
+          <dd className="min-w-0 break-all font-mono text-xs leading-5">
+            {row.value}
+          </dd>
+        </div>
+      ))}
+    </dl>
+  );
+}
+
+function CustomHarnessDetail({ onDone }: { onDone: () => void }) {
+  return (
+    <div
+      className="flex min-h-0 flex-1 flex-col"
+      data-testid="harness-catalog-custom-detail"
+    >
+      <CustomHarnessForm
+        chromeless
+        header={
+          <div>
+            <h3 className="text-xl font-semibold leading-snug">
+              Custom harness
+            </h3>
+            <p className="mt-1 text-sm text-muted-foreground">
+              Register any ACP-speaking agent tool as a selectable runtime.
+            </p>
+          </div>
+        }
+        onCancel={onDone}
+        onSaved={onDone}
+      />
+    </div>
+  );
+}
diff --git a/desktop/src/features/settings/ui/DoctorSettingsPanel.tsx b/desktop/src/features/settings/ui/HarnessRow.tsx
similarity index 54%
rename from desktop/src/features/settings/ui/DoctorSettingsPanel.tsx
rename to desktop/src/features/settings/ui/HarnessRow.tsx
index 894d88bd22..de6666b8c3 100644
--- a/desktop/src/features/settings/ui/DoctorSettingsPanel.tsx
+++ b/desktop/src/features/settings/ui/HarnessRow.tsx
@@ -1,15 +1,16 @@
 import * as React from "react";
-import { EllipsisVertical, ExternalLink, RefreshCw } from "lucide-react";
+import { EllipsisVertical, ExternalLink } from "lucide-react";
 import { openUrl } from "@tauri-apps/plugin-opener";
 
 import {
   useAcpAuthMethodsQuery,
-  useAcpRuntimesQuery,
   useConnectAcpRuntimeMutation,
-  useGitBashPrerequisiteQuery,
+  useDeleteCustomHarnessMutation,
   useInstallAcpRuntimeMutation,
+  useManagedAgentsQuery,
+  usePersonasQuery,
 } from "@/features/agents/hooks";
-import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
+import { RuntimeIcon } from "@/features/onboarding/ui/RuntimeIcon";
 import type { AcpAuthMethod, AcpRuntimeCatalogEntry } from "@/shared/api/types";
 import { getInstallErrorMessage } from "@/shared/lib/installError";
 import { cn } from "@/shared/lib/cn";
@@ -30,47 +31,45 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/shared/ui/dropdown-menu";
-import { SectionHeader } from "@/shared/ui/PageHeader";
 import { Spinner } from "@/shared/ui/spinner";
-import { Switch } from "@/shared/ui/switch";
 
-const RUNTIME_LOGO_URLS: Record<string, string> = {
-  "buzz-agent": "/app-icon@2x.png",
-  claude: "/runtime-icons/claude.png",
-  codex: "/runtime-icons/codex.png",
-  goose: "/runtime-icons/goose.svg",
-};
-
-const RUNTIME_LOGO_SCALE: Record<string, string> = {
-  "buzz-agent": "scale-110",
-  claude: "scale-110",
-  codex: "scale-110",
-  goose: "scale-125",
-};
-
-const RUNTIME_SORT_PRIORITY: Record<string, number> = {
-  "buzz-agent": 0,
-  goose: 1,
-};
+import { CustomHarnessForm } from "./CustomHarnessForm";
+import {
+  adapterUpdateWarning,
+  entryStatusLabel,
+  isDownloadPageUrl,
+} from "./harnessCatalogLogic";
+import { formValuesFromCatalogEntry } from "./harnessFormLogic";
+import { deleteConfirmState } from "./harnessGalleryLogic";
 
+/** Link label for the row's install-instructions URL. Distinct from the
+ * catalog's `installLinkLabel` — rows spell out what the guide covers
+ * (adapter vs CLI) because the row lacks the catalog's setup context. */
 function runtimeInstallGuideLabel(runtime: AcpRuntimeCatalogEntry) {
-  return runtime.availability === "adapter_missing" ||
+  if (
+    runtime.availability === "adapter_missing" ||
     runtime.availability === "adapter_outdated"
-    ? "Adapter install guide"
+  ) {
+    return "Adapter install guide";
+  }
+  return isDownloadPageUrl(runtime.installInstructionsUrl)
+    ? "Download page"
     : "CLI setup guide";
 }
 
 function RuntimeLogo({ runtime }: { runtime: AcpRuntimeCatalogEntry }) {
-  const avatarUrl = RUNTIME_LOGO_URLS[runtime.id] ?? runtime.avatarUrl;
-
+  // Single logo pipeline: RuntimeIcon owns every runtime asset — the
+  // theme-adaptive RUNTIME_MARKS, the BuzzMark, the bundled bitmap maps
+  // (RUNTIME_LOGOS / PRESET_LOGOS), and the terminal-glyph fallback. It never
+  // renders remote or user-supplied avatar URLs (security line), so the row
+  // and the catalog cannot drift apart.
   return (
-    <ProfileAvatar
-      avatarUrl={avatarUrl}
-      className="h-9 w-9 rounded-xl bg-background shadow-none"
-      imageClassName={RUNTIME_LOGO_SCALE[runtime.id]}
-      label={runtime.label}
-      testId={`doctor-runtime-logo-${runtime.id}`}
-    />
+    <span
+      className="flex h-9 w-9 shrink-0 items-center justify-center"
+      data-testid={`doctor-runtime-logo-${runtime.id}`}
+    >
+      <RuntimeIcon className="h-9 w-9" runtime={runtime} />
+    </span>
   );
 }
 
@@ -79,12 +78,16 @@ function RuntimeOverflowMenu({
   connectingMethodId,
   isConnecting,
   onConnect,
+  onDelete,
+  onEdit,
   runtime,
 }: {
   authMethods: AcpAuthMethod[];
   connectingMethodId: string | null;
   isConnecting: boolean;
   onConnect: (method: AcpAuthMethod) => void;
+  onDelete?: () => void;
+  onEdit?: () => void;
   runtime: AcpRuntimeCatalogEntry;
 }) {
   const hasInstructions =
@@ -93,7 +96,11 @@ function RuntimeOverflowMenu({
       runtime.authStatus.status === "logged_out" ||
       runtime.authStatus.status === "config_invalid");
   const hasActions =
-    runtime.nodeRequired || hasInstructions || authMethods.length > 0;
+    runtime.nodeRequired ||
+    hasInstructions ||
+    authMethods.length > 0 ||
+    Boolean(onEdit) ||
+    Boolean(onDelete);
 
   if (!hasActions) {
     return null;
@@ -141,6 +148,23 @@ function RuntimeOverflowMenu({
             {runtimeInstallGuideLabel(runtime)}
           </DropdownMenuItem>
         ) : null}
+        {onEdit ? (
+          <DropdownMenuItem
+            data-testid={`custom-harness-edit-${runtime.id}`}
+            onSelect={onEdit}
+          >
+            Edit
+          </DropdownMenuItem>
+        ) : null}
+        {onDelete ? (
+          <DropdownMenuItem
+            className="text-destructive focus:text-destructive"
+            data-testid={`custom-harness-delete-${runtime.id}`}
+            onSelect={onDelete}
+          >
+            Delete
+          </DropdownMenuItem>
+        ) : null}
       </DropdownMenuContent>
     </DropdownMenu>
   );
@@ -152,6 +176,8 @@ function RuntimeActions({
   isConnecting,
   isInstalling,
   onConnect,
+  onDelete,
+  onEdit,
   onInstall,
   runtime,
 }: {
@@ -160,10 +186,17 @@ function RuntimeActions({
   isConnecting: boolean;
   isInstalling: boolean;
   onConnect: (method: AcpAuthMethod) => void;
+  onDelete?: () => void;
+  onEdit?: () => void;
   onInstall: () => void;
   runtime: AcpRuntimeCatalogEntry;
 }) {
   const isAvailable = runtime.availability === "available";
+  // Signed-out rows carry the amber "Sign-in needed" status chip instead of a
+  // green Ready chip — auth-required is an explicit row-face state, and Ready
+  // must not claim otherwise.
+  const isAuthNeeded =
+    isAvailable && runtime.authStatus.status === "logged_out";
   const canInstall = runtime.canAutoInstall && !runtime.nodeRequired;
   const isWorking = isInstalling || isConnecting;
 
@@ -174,52 +207,62 @@ function RuntimeActions({
         connectingMethodId={connectingMethodId}
         isConnecting={isConnecting}
         onConnect={onConnect}
+        onDelete={onDelete}
+        onEdit={onEdit}
         runtime={runtime}
       />
       {isWorking ? (
-        <div className="flex h-5 w-9 items-center justify-center text-muted-foreground">
+        <div className="flex h-7 w-9 items-center justify-center text-muted-foreground">
           <Spinner
             aria-label={`${runtime.label} ${isInstalling ? "installing" : "connecting"}`}
             className="h-4 w-4 border-2"
             data-testid={`doctor-runtime-loading-${runtime.id}`}
           />
         </div>
-      ) : (
-        <Switch
-          aria-label={`${runtime.label} availability`}
-          checked={isAvailable}
-          className="disabled:cursor-default disabled:opacity-100"
-          data-testid={`doctor-runtime-toggle-${runtime.id}`}
-          disabled={isAvailable || !canInstall}
-          onCheckedChange={(checked) => {
-            if (checked) {
-              onInstall();
-            }
-          }}
-        />
-      )}
+      ) : isAvailable ? (
+        isAuthNeeded ? null : ( // Signed-out rows carry the amber status chip instead; never Install.
+          <span
+            className="inline-flex shrink-0 items-center rounded-md bg-emerald-500/15 px-2 py-0.5 text-xs font-medium text-emerald-600 dark:text-emerald-400"
+            data-testid={`doctor-runtime-ready-${runtime.id}`}
+          >
+            Ready
+          </span>
+        )
+      ) : canInstall ? (
+        // Rows needing multi-step setup render no action here — setup lives in
+        // the Add-runtimes catalog. Custom rows keep their ••• menu instead.
+        <Button
+          aria-label={`Install ${runtime.label}`}
+          className="h-7 px-3 text-xs"
+          data-testid={`doctor-runtime-install-${runtime.id}`}
+          onClick={onInstall}
+          size="sm"
+          type="button"
+          variant="outline"
+        >
+          {runtime.availability === "adapter_outdated" ? "Update" : "Install"}
+        </Button>
+      ) : null}
     </div>
   );
 }
 
 function RuntimeStatusChip({ runtime }: { runtime: AcpRuntimeCatalogEntry }) {
-  const label =
-    runtime.authStatus.status === "config_invalid"
-      ? "Config error"
-      : runtime.availability === "adapter_missing"
-        ? "Adapter needed"
-        : runtime.availability === "adapter_outdated"
-          ? "Update needed"
-          : runtime.availability === "cli_missing" ||
-              runtime.availability === "not_installed"
-            ? "CLI needed"
-            : null;
+  // Single availability→label source: entryStatusLabel drives this row chip
+  // AND the catalog detail chip, so the two surfaces cannot drift. That
+  // includes "Sign-in needed" for installed-but-signed-out runtimes — an
+  // explicit auth-required state on the row face, not just a ••• menu item.
+  const label = entryStatusLabel(runtime);
 
   if (!label) {
     return null;
   }
 
   const isConfigError = runtime.authStatus.status === "config_invalid";
+  const isAuthNeeded =
+    !isConfigError &&
+    runtime.availability === "available" &&
+    runtime.authStatus.status === "logged_out";
 
   return (
     <>
@@ -231,7 +274,9 @@ function RuntimeStatusChip({ runtime }: { runtime: AcpRuntimeCatalogEntry }) {
           "inline-flex shrink-0 items-center rounded-md px-2 py-0.5 text-xs font-medium",
           isConfigError
             ? "bg-destructive/10 text-destructive"
-            : "bg-muted text-muted-foreground",
+            : isAuthNeeded
+              ? "bg-amber-500/15 text-amber-600 dark:text-amber-400"
+              : "bg-muted text-muted-foreground",
         )}
         data-testid={`doctor-runtime-status-${runtime.id}`}
       >
@@ -241,56 +286,28 @@ function RuntimeStatusChip({ runtime }: { runtime: AcpRuntimeCatalogEntry }) {
   );
 }
 
-function RuntimeHeader({
-  authMethods,
-  connectingMethodId,
-  isConnecting,
-  isInstalling,
-  onConnect,
-  onInstall,
-  runtime,
-}: {
-  authMethods: AcpAuthMethod[];
-  connectingMethodId: string | null;
-  isConnecting: boolean;
-  isInstalling: boolean;
-  onConnect: (method: AcpAuthMethod) => void;
-  onInstall: () => void;
-  runtime: AcpRuntimeCatalogEntry;
-}) {
-  return (
-    <div className="flex items-center justify-between gap-4">
-      <div className="flex min-w-0 items-center gap-3">
-        <RuntimeLogo runtime={runtime} />
-        <div className="flex min-w-0 flex-wrap items-center gap-2">
-          <p className="min-w-0 text-sm font-medium">{runtime.label}</p>
-          <RuntimeStatusChip runtime={runtime} />
-        </div>
-      </div>
-      <RuntimeActions
-        authMethods={authMethods}
-        connectingMethodId={connectingMethodId}
-        isConnecting={isConnecting}
-        isInstalling={isInstalling}
-        onConnect={onConnect}
-        onInstall={onInstall}
-        runtime={runtime}
-      />
-    </div>
-  );
-}
-
-function RuntimeRow({
+/**
+ * One row in "Your runtimes".
+ *
+ * Carries the full operational surface for a ready (or one-click-ready)
+ * harness: logo, status chip, auth/overflow menu, install/connect flows, and
+ * — for custom harnesses — edit and delete with the blast-radius guard.
+ */
+export function HarnessRow({
   resetEpoch,
   runtime,
 }: {
   resetEpoch: number;
   runtime: AcpRuntimeCatalogEntry;
 }) {
+  const isCustom = runtime.source === "custom";
   const [terminalLaunchMethodId, setTerminalLaunchMethodId] = React.useState<
     string | null
   >(null);
   const [isUpdateWarningOpen, setIsUpdateWarningOpen] = React.useState(false);
+  const [editing, setEditing] = React.useState(false);
+  const [confirmingDelete, setConfirmingDelete] = React.useState(false);
+  const [deleteError, setDeleteError] = React.useState<string | null>(null);
   // Each row owns its mutation instance so concurrent installs each track
   // their own isPending / result state independently.
   const installMutation = useInstallAcpRuntimeMutation();
@@ -308,6 +325,20 @@ function RuntimeRow({
   const isInstalling = installMutation.isPending;
   const installError = installResult?.error ?? null;
 
+  const del = useDeleteCustomHarnessMutation();
+  // Blast-radius data for the delete confirmation — only fetched while the
+  // confirmation is open, so the row list doesn't poll agents. Confirm stays
+  // disabled until both queries settle (deleteConfirmState) so a quick click
+  // can't beat the "N agents will stop launching" warning.
+  const agentsQuery = useManagedAgentsQuery({ enabled: confirmingDelete });
+  const personasQuery = usePersonasQuery({ enabled: confirmingDelete });
+  const confirmState = deleteConfirmState(
+    runtime.id,
+    runtime.label,
+    agentsQuery,
+    personasQuery,
+  );
+
   function handleInstall() {
     setInstallResult(null);
     installMutation.mutate(runtime.id, {
@@ -354,42 +385,71 @@ function RuntimeRow({
         }`
       : null;
 
+  if (editing) {
+    return (
+      <CustomHarnessForm
+        initial={formValuesFromCatalogEntry(runtime)}
+        originalId={runtime.id}
+        onCancel={() => setEditing(false)}
+        onSaved={() => setEditing(false)}
+      />
+    );
+  }
+
   return (
     <div
       className="min-h-16 rounded-2xl border border-border/60 bg-muted/20 px-4 py-3.5 text-sm"
       data-testid={`doctor-runtime-${runtime.id}`}
     >
       <div className="min-w-0">
-        <RuntimeHeader
-          authMethods={authMethods}
-          connectingMethodId={connectMutation.variables?.methodId ?? null}
-          isConnecting={connectMutation.isPending}
-          isInstalling={isInstalling}
-          onConnect={(method) => {
-            setTerminalLaunchMethodId(null);
-            connectMutation.mutate(
-              {
-                runtimeId: runtime.id,
-                methodId: method.id,
-              },
-              {
-                onSuccess: (result) => {
-                  if (result.launched && method.type === "terminal") {
-                    setTerminalLaunchMethodId(method.id);
-                  }
+        <div className="flex items-center justify-between gap-4">
+          <div className="flex min-w-0 items-center gap-3">
+            <RuntimeLogo runtime={runtime} />
+            <div className="flex min-w-0 flex-wrap items-center gap-2">
+              <p className="min-w-0 text-sm font-medium">{runtime.label}</p>
+              <RuntimeStatusChip runtime={runtime} />
+            </div>
+          </div>
+          <RuntimeActions
+            authMethods={authMethods}
+            connectingMethodId={connectMutation.variables?.methodId ?? null}
+            isConnecting={connectMutation.isPending}
+            isInstalling={isInstalling}
+            onConnect={(method) => {
+              setTerminalLaunchMethodId(null);
+              connectMutation.mutate(
+                {
+                  runtimeId: runtime.id,
+                  methodId: method.id,
                 },
-              },
-            );
-          }}
-          onInstall={() => {
-            if (runtime.availability === "adapter_outdated") {
-              setIsUpdateWarningOpen(true);
-              return;
+                {
+                  onSuccess: (result) => {
+                    if (result.launched && method.type === "terminal") {
+                      setTerminalLaunchMethodId(method.id);
+                    }
+                  },
+                },
+              );
+            }}
+            onDelete={
+              isCustom
+                ? () => {
+                    setDeleteError(null);
+                    setConfirmingDelete(true);
+                  }
+                : undefined
             }
-            handleInstall();
-          }}
-          runtime={runtime}
-        />
+            onEdit={isCustom ? () => setEditing(true) : undefined}
+            onInstall={() => {
+              if (runtime.availability === "adapter_outdated") {
+                setIsUpdateWarningOpen(true);
+                return;
+              }
+              handleInstall();
+            }}
+            runtime={runtime}
+          />
+        </div>
 
         {runtime.availability !== "available" ? (
           <div
@@ -444,6 +504,57 @@ function RuntimeRow({
             to re-check {runtime.label}.
           </p>
         ) : null}
+        {confirmingDelete ? (
+          <div className="mt-2 space-y-2">
+            <p
+              className="rounded-lg border border-amber-500/30 bg-amber-500/10 px-3 py-1.5 text-sm text-amber-600 dark:text-amber-400"
+              data-testid={`custom-harness-delete-warning-${runtime.id}`}
+            >
+              {confirmState.message}
+            </p>
+            <div className="flex justify-end gap-2">
+              <Button
+                className="h-7 px-3 text-xs"
+                onClick={() => {
+                  setConfirmingDelete(false);
+                  setDeleteError(null);
+                }}
+                size="sm"
+                type="button"
+                variant="ghost"
+              >
+                Cancel
+              </Button>
+              <Button
+                className="h-7 px-3 text-xs"
+                data-testid={`custom-harness-delete-confirm-${runtime.id}`}
+                disabled={del.isPending || !confirmState.canConfirm}
+                onClick={() => {
+                  setDeleteError(null);
+                  del.mutate(runtime.id, {
+                    onSuccess: () => setConfirmingDelete(false),
+                    onError: (err) => {
+                      setDeleteError(
+                        err instanceof Error ? err.message : String(err),
+                      );
+                      // Keep confirmation open so user sees the error.
+                    },
+                  });
+                }}
+                size="sm"
+                type="button"
+                variant="destructive"
+              >
+                {del.isPending ? <Spinner className="h-3.5 w-3.5" /> : "Delete"}
+              </Button>
+            </div>
+          </div>
+        ) : null}
+        {deleteError ? (
+          <p className="mt-2 rounded-lg border border-destructive/30 bg-destructive/10 px-3 py-1.5 text-sm text-destructive">
+            {deleteError}
+          </p>
+        ) : null}
       </div>
       <AlertDialog
         onOpenChange={setIsUpdateWarningOpen}
@@ -453,9 +564,7 @@ function RuntimeRow({
           <AlertDialogHeader>
             <AlertDialogTitle>Update {runtime.label} adapter?</AlertDialogTitle>
             <AlertDialogDescription>
-              This replaces the machine-wide codex-acp adapter. Older Buzz
-              releases using the legacy adapter may lose community access until
-              @zed-industries/codex-acp@0.16.0 is restored.
+              {adapterUpdateWarning(runtime)}
             </AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
@@ -472,152 +581,3 @@ function RuntimeRow({
     </div>
   );
 }
-
-function GitBashCard({
-  prerequisite,
-}: {
-  prerequisite: NonNullable<
-    ReturnType<typeof useGitBashPrerequisiteQuery>["data"]
-  >;
-}) {
-  return (
-    <div
-      className={cn(
-        "min-h-16 rounded-2xl border px-4 py-4 text-sm",
-        prerequisite.available
-          ? "border-border/60 bg-muted/20"
-          : "border-amber-500/20 bg-amber-500/5",
-      )}
-      data-testid="doctor-git-bash"
-    >
-      <div className="min-w-0">
-        <div className="flex flex-wrap items-center justify-between gap-4">
-          <div className="flex min-w-0 flex-wrap items-center gap-2">
-            <p className="text-sm font-medium">Git Bash</p>
-            <span aria-hidden="true" className="text-muted-foreground/50">
-              ·
-            </span>
-            <span
-              className={cn(
-                "inline-flex shrink-0 items-center rounded-md px-2 py-0.5 text-xs font-medium",
-                prerequisite.available
-                  ? "bg-emerald-500/15 text-emerald-600 dark:text-emerald-400"
-                  : "bg-amber-500/15 text-amber-600 dark:text-amber-400",
-              )}
-            >
-              {prerequisite.available ? "Available" : "Action needed"}
-            </span>
-          </div>
-          {!prerequisite.available ? (
-            <button
-              className="inline-flex shrink-0 items-center gap-1 text-xs text-muted-foreground underline-offset-2 hover:text-foreground hover:underline"
-              onClick={() => void openUrl(prerequisite.installInstructionsUrl)}
-              type="button"
-            >
-              <ExternalLink className="h-4 w-4" /> Install Git for Windows
-            </button>
-          ) : null}
-        </div>
-        {!prerequisite.available ? (
-          <div className="mt-3 space-y-1 text-sm text-muted-foreground">
-            <p>Required for buzz-agent shell tools on Windows.</p>
-            <p>{prerequisite.installHint}</p>
-          </div>
-        ) : null}
-      </div>
-    </div>
-  );
-}
-
-export function DoctorSettingsPanel() {
-  const runtimesQuery = useAcpRuntimesQuery();
-  const gitBashQuery = useGitBashPrerequisiteQuery();
-  const runtimes = React.useMemo(
-    () =>
-      [...(runtimesQuery.data ?? [])].sort(
-        (left, right) =>
-          (RUNTIME_SORT_PRIORITY[left.id] ?? Number.MAX_SAFE_INTEGER) -
-          (RUNTIME_SORT_PRIORITY[right.id] ?? Number.MAX_SAFE_INTEGER),
-      ),
-    [runtimesQuery.data],
-  );
-  const isRefreshing = runtimesQuery.isFetching;
-  // Incremented each time the user clicks "Check again" so RuntimeRow
-  // useEffect clears stale install results from before the refresh.
-  const [resetEpoch, setResetEpoch] = React.useState(0);
-
-  return (
-    <section
-      className="min-w-0 space-y-4"
-      data-testid="settings-agent-runtimes"
-    >
-      <SectionHeader
-        className="items-center"
-        title="Agent runtimes"
-        description="Choose which agent tools Buzz can use on this device."
-        action={
-          <Button
-            disabled={isRefreshing}
-            onClick={() => {
-              setResetEpoch((e) => e + 1);
-              void runtimesQuery.refetch();
-              void gitBashQuery.refetch();
-            }}
-            size="sm"
-            type="button"
-            variant="outline"
-          >
-            <RefreshCw
-              className={cn("h-4 w-4", isRefreshing && "animate-spin")}
-            />
-            Check again
-          </Button>
-        }
-      />
-
-      <div className="space-y-8">
-        {gitBashQuery.data ? (
-          <section>
-            <div className="mb-3 text-sm">
-              <h2 className="text-lg font-semibold tracking-tight">
-                System prerequisites
-              </h2>
-              <p className="mt-1 text-sm font-normal text-muted-foreground">
-                Windows tools required by supported agents.
-              </p>
-            </div>
-            <GitBashCard prerequisite={gitBashQuery.data} />
-          </section>
-        ) : null}
-
-        <section aria-label="Supported agent runtimes">
-          {runtimesQuery.isLoading ? (
-            <div className="rounded-2xl bg-muted/20 px-4 py-4 text-sm font-normal text-muted-foreground">
-              Checking agent runtimes...
-            </div>
-          ) : runtimes.length > 0 ? (
-            <div className="space-y-3" data-testid="doctor-runtime-list">
-              {runtimes.map((runtime) => (
-                <RuntimeRow
-                  key={runtime.id}
-                  resetEpoch={resetEpoch}
-                  runtime={runtime}
-                />
-              ))}
-            </div>
-          ) : (
-            <div className="rounded-2xl bg-amber-500/10 px-4 py-4 text-sm text-warning">
-              No supported agent runtimes found.
-            </div>
-          )}
-
-          {runtimesQuery.error instanceof Error ? (
-            <p className="mt-3 rounded-2xl bg-destructive/10 px-4 py-4 text-sm text-destructive">
-              {runtimesQuery.error.message}
-            </p>
-          ) : null}
-        </section>
-      </div>
-    </section>
-  );
-}
diff --git a/desktop/src/features/settings/ui/HarnessesSettingsPanel.tsx b/desktop/src/features/settings/ui/HarnessesSettingsPanel.tsx
new file mode 100644
index 0000000000..10ca2a377f
--- /dev/null
+++ b/desktop/src/features/settings/ui/HarnessesSettingsPanel.tsx
@@ -0,0 +1,211 @@
+import * as React from "react";
+import { ExternalLink, Plus, RefreshCw } from "lucide-react";
+import { openUrl } from "@tauri-apps/plugin-opener";
+
+import {
+  useAcpRuntimesQuery,
+  useGitBashPrerequisiteQuery,
+} from "@/features/agents/hooks";
+import type { AcpRuntimeCatalogEntry } from "@/shared/api/types";
+import { cn } from "@/shared/lib/cn";
+import { Button } from "@/shared/ui/button";
+import { SectionHeader } from "@/shared/ui/PageHeader";
+
+import { HarnessCatalogDialog } from "./HarnessCatalogDialog";
+import { HarnessRow } from "./HarnessRow";
+import { stableRowOrder, yourHarnessEntries } from "./harnessCatalogLogic";
+
+function GitBashCard({
+  prerequisite,
+}: {
+  prerequisite: NonNullable<
+    ReturnType<typeof useGitBashPrerequisiteQuery>["data"]
+  >;
+}) {
+  return (
+    <div
+      className={cn(
+        "min-h-16 rounded-2xl border px-4 py-4 text-sm",
+        prerequisite.available
+          ? "border-border/60 bg-muted/20"
+          : "border-amber-500/20 bg-amber-500/5",
+      )}
+      data-testid="doctor-git-bash"
+    >
+      <div className="min-w-0">
+        <div className="flex flex-wrap items-center justify-between gap-4">
+          <div className="flex min-w-0 flex-wrap items-center gap-2">
+            <p className="text-sm font-medium">Git Bash</p>
+            <span aria-hidden="true" className="text-muted-foreground/50">
+              ·
+            </span>
+            <span
+              className={cn(
+                "inline-flex shrink-0 items-center rounded-md px-2 py-0.5 text-xs font-medium",
+                prerequisite.available
+                  ? "bg-emerald-500/15 text-emerald-600 dark:text-emerald-400"
+                  : "bg-amber-500/15 text-amber-600 dark:text-amber-400",
+              )}
+            >
+              {prerequisite.available ? "Available" : "Action needed"}
+            </span>
+          </div>
+          {!prerequisite.available ? (
+            <button
+              className="inline-flex shrink-0 items-center gap-1 text-xs text-muted-foreground underline-offset-2 hover:text-foreground hover:underline"
+              onClick={() => void openUrl(prerequisite.installInstructionsUrl)}
+              type="button"
+            >
+              <ExternalLink className="h-4 w-4" /> Install Git for Windows
+            </button>
+          ) : null}
+        </div>
+        {!prerequisite.available ? (
+          <div className="mt-3 space-y-1 text-sm text-muted-foreground">
+            <p>Required for buzz-agent shell tools on Windows.</p>
+            <p>{prerequisite.installHint}</p>
+          </div>
+        ) : null}
+      </div>
+    </div>
+  );
+}
+
+/**
+ * Consolidated "Agent runtimes" surface for Settings → Agents.
+ *
+ * Replaces the old "Agent runtimes" (DoctorSettingsPanel) + "Bring your own
+ * harness" (HarnessManagementCard) pair with one operational area:
+ *
+ * - **Your runtimes** — stable rows for ready (or one-click-ready) runtimes
+ *   and everything the user authored. Row order never changes when a runtime
+ *   installs (stableRowOrder), so the page doesn't jump under the pointer.
+ * - **Add runtimes** — a master-detail catalog dialog for everything that
+ *   needs multi-step setup, plus the custom-harness form.
+ */
+export function HarnessesSettingsPanel() {
+  const runtimesQuery = useAcpRuntimesQuery();
+  const gitBashQuery = useGitBashPrerequisiteQuery();
+  const [catalogOpen, setCatalogOpen] = React.useState(false);
+  // Incremented each time the user clicks "Check again" so HarnessRow
+  // useEffect clears stale install results from before the refresh.
+  const [resetEpoch, setResetEpoch] = React.useState(0);
+
+  const entries = React.useMemo(
+    () => yourHarnessEntries(runtimesQuery.data ?? []),
+    [runtimesQuery.data],
+  );
+
+  // Sticky row order: initial sort once, then preserve relative order across
+  // refetches/toggles so enabling a harness never reorders the list.
+  const orderRef = React.useRef<string[]>([]);
+  const rows = React.useMemo(() => {
+    orderRef.current = stableRowOrder(orderRef.current, entries);
+    const byId = new Map(entries.map((e) => [e.id, e]));
+    return orderRef.current
+      .map((id) => byId.get(id))
+      .filter((e): e is AcpRuntimeCatalogEntry => e !== undefined);
+  }, [entries]);
+
+  const isRefreshing = runtimesQuery.isFetching;
+
+  return (
+    <section className="min-w-0 space-y-4" data-testid="settings-harnesses">
+      <SectionHeader
+        className="items-center"
+        title="Agent runtimes"
+        description="Choose which agent tools Buzz can use on this device."
+        action={
+          <Button
+            disabled={isRefreshing}
+            onClick={() => {
+              setResetEpoch((e) => e + 1);
+              void runtimesQuery.refetch();
+              void gitBashQuery.refetch();
+            }}
+            size="sm"
+            type="button"
+            variant="outline"
+          >
+            <RefreshCw
+              className={cn("h-4 w-4", isRefreshing && "animate-spin")}
+            />
+            Check again
+          </Button>
+        }
+      />
+
+      <div className="space-y-8">
+        {gitBashQuery.data ? (
+          <section>
+            <div className="mb-3 text-sm">
+              <h2 className="text-lg font-semibold tracking-tight">
+                System prerequisites
+              </h2>
+              <p className="mt-1 text-sm font-normal text-muted-foreground">
+                Windows tools required by supported agents.
+              </p>
+            </div>
+            <GitBashCard prerequisite={gitBashQuery.data} />
+          </section>
+        ) : null}
+
+        <section aria-label="Your runtimes">
+          {/* The sub-header only earns its keep when another section (System
+              prerequisites, Windows-only) shares the page; otherwise it just
+              restates the page header. */}
+          {gitBashQuery.data ? (
+            <div className="mb-3 text-sm">
+              <h2 className="text-lg font-semibold tracking-tight">
+                Your runtimes
+              </h2>
+              <p className="mt-1 text-sm font-normal text-muted-foreground">
+                Ready to use, or one click from installed.
+              </p>
+            </div>
+          ) : null}
+
+          {runtimesQuery.isLoading ? (
+            <div className="rounded-2xl bg-muted/20 px-4 py-4 text-sm font-normal text-muted-foreground">
+              Checking agent runtimes...
+            </div>
+          ) : rows.length > 0 ? (
+            <div className="space-y-3" data-testid="doctor-runtime-list">
+              {rows.map((runtime) => (
+                <HarnessRow
+                  key={runtime.id}
+                  resetEpoch={resetEpoch}
+                  runtime={runtime}
+                />
+              ))}
+            </div>
+          ) : (
+            <div className="rounded-2xl bg-amber-500/10 px-4 py-4 text-sm text-warning">
+              No agent runtimes ready yet — add one below.
+            </div>
+          )}
+
+          {runtimesQuery.error instanceof Error ? (
+            <p className="mt-3 rounded-2xl bg-destructive/10 px-4 py-4 text-sm text-destructive">
+              {runtimesQuery.error.message}
+            </p>
+          ) : null}
+
+          <Button
+            className="mt-3 gap-2"
+            data-testid="harness-add-button"
+            onClick={() => setCatalogOpen(true)}
+            size="sm"
+            type="button"
+            variant="outline"
+          >
+            <Plus className="h-4 w-4" />
+            Add runtimes
+          </Button>
+        </section>
+      </div>
+
+      <HarnessCatalogDialog onOpenChange={setCatalogOpen} open={catalogOpen} />
+    </section>
+  );
+}
diff --git a/desktop/src/features/settings/ui/MobilePairingCard.tsx b/desktop/src/features/settings/ui/MobilePairingCard.tsx
index 2013d17de3..e15f54316b 100644
--- a/desktop/src/features/settings/ui/MobilePairingCard.tsx
+++ b/desktop/src/features/settings/ui/MobilePairingCard.tsx
@@ -2,16 +2,15 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import {
   Check,
   Copy,
+  LoaderCircle,
+  RefreshCw,
   ShieldCheck,
-  Smartphone,
   TriangleAlert,
   X,
 } from "lucide-react";
 import { listen } from "@tauri-apps/api/event";
 import { toast } from "sonner";
 
-import { Spinner } from "@/shared/ui/spinner";
-
 import {
   cancelPairing,
   confirmPairingSas,
@@ -31,206 +30,74 @@ import { SettingsSectionHeader } from "./SettingsSectionHeader";
 import { writeTextToClipboard } from "@/shared/lib/clipboard";
 
 type PairingStep =
+  | "idle"
   | "generating"
   | "qr"
+  | "expired"
   | "sas"
   | "transferring"
   | "done"
   | "error";
 
-function PairingDialog({
-  open,
-  onOpenChange,
+function pairingErrorMessage(error: unknown) {
+  const message =
+    error instanceof Error
+      ? error.message
+      : typeof error === "string"
+        ? error
+        : "";
+
+  if (message.toLowerCase().includes("timeout waiting for eose")) {
+    return "Pairing took too long. Try again.";
+  }
+
+  return message || "We couldn't start pairing. Try again.";
+}
+
+function isPairingSessionTimeout(message: string) {
+  return message.toLowerCase().includes("session timed out");
+}
+
+function PairingStatusDialog({
+  onClose,
+  onConfirm,
+  onDeny,
+  sasCode,
+  step,
 }: {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
+  onClose: () => void;
+  onConfirm: () => void;
+  onDeny: () => void;
+  sasCode: string | null;
+  step: PairingStep;
 }) {
-  const [step, setStep] = useState<PairingStep>("generating");
-  const [qrUri, setQrUri] = useState<string | null>(null);
-  const [sasCode, setSasCode] = useState<string | null>(null);
-  const [error, setError] = useState<string | null>(null);
-  const stepRef = useRef(step);
-  stepRef.current = step;
-
-  // Start pairing when dialog opens.
-  useEffect(() => {
-    if (!open) return;
-
-    setStep("generating");
-    setQrUri(null);
-    setSasCode(null);
-    setError(null);
-    let cancelled = false;
-
-    startPairing().then(
-      (uri) => {
-        if (!cancelled) {
-          setQrUri(uri);
-          setStep("qr");
-        }
-      },
-      (err) => {
-        if (!cancelled) {
-          setError(
-            err instanceof Error
-              ? err.message
-              : "Failed to start pairing session",
-          );
-          setStep("error");
-        }
-      },
-    );
-
-    return () => {
-      cancelled = true;
-    };
-  }, [open]);
-
-  // Listen for Tauri events from the pairing backend.
-  useEffect(() => {
-    if (!open) return;
-
-    let cancelled = false;
-    const unlisteners: (() => void)[] = [];
-
-    listen<{ sas: string }>("pairing-sas-received", (event) => {
-      if (!cancelled) {
-        setSasCode(event.payload.sas);
-        setStep("sas");
-      }
-    }).then((fn) => {
-      if (cancelled) fn();
-      else unlisteners.push(fn);
-    });
-
-    listen("pairing-complete", () => {
-      if (!cancelled) {
-        setStep("done");
-      }
-    }).then((fn) => {
-      if (cancelled) fn();
-      else unlisteners.push(fn);
-    });
-
-    listen<{ reason: string }>("pairing-aborted", (event) => {
-      if (!cancelled) {
-        setError(`Pairing aborted: ${event.payload.reason}`);
-        setStep("error");
-      }
-    }).then((fn) => {
-      if (cancelled) fn();
-      else unlisteners.push(fn);
-    });
-
-    listen<{ message: string }>("pairing-error", (event) => {
-      if (!cancelled) {
-        setError(event.payload.message);
-        setStep("error");
-      }
-    }).then((fn) => {
-      if (cancelled) fn();
-      else unlisteners.push(fn);
-    });
-
-    return () => {
-      cancelled = true;
-      for (const fn of unlisteners) fn();
-    };
-  }, [open]);
-
-  // Cancel pairing when dialog closes before completion.
-  const handleOpenChange = useCallback(
-    (nextOpen: boolean) => {
-      if (!nextOpen && stepRef.current !== "done") {
-        cancelPairing().catch(() => {});
-      }
-      onOpenChange(nextOpen);
-    },
-    [onOpenChange],
-  );
-
-  async function handleConfirmSas() {
-    setStep("transferring");
-    try {
-      await confirmPairingSas();
-    } catch (err) {
-      setError(
-        err instanceof Error ? err.message : "Failed to send credentials",
-      );
-      setStep("error");
-    }
-  }
-
-  function handleDenySas() {
-    cancelPairing().catch(() => {});
-    setError("SAS code mismatch — pairing cancelled for security.");
-    setStep("error");
-  }
-
-  async function handleCopy() {
-    if (!qrUri) return;
-    await writeTextToClipboard(qrUri);
-    toast.success("Copied to clipboard");
-  }
+  const open = step === "sas" || step === "transferring" || step === "done";
 
   return (
-    <Dialog onOpenChange={handleOpenChange} open={open}>
+    <Dialog
+      onOpenChange={(nextOpen) => {
+        if (!nextOpen) onClose();
+      }}
+      open={open}
+    >
       <DialogContent
         className="max-w-md gap-0 overflow-hidden border-0 px-6 pb-6 pt-6"
         data-testid="mobile-pairing-dialog"
       >
         <div className="flex max-h-[85vh] flex-col">
           <DialogHeader className="shrink-0 pb-5 pr-8">
-            <DialogTitle>Pair Mobile Device</DialogTitle>
+            <DialogTitle>Pair mobile device</DialogTitle>
             <DialogDescription>
               {step === "sas"
                 ? "Verify the security code matches your mobile device."
                 : step === "done"
                   ? "Your mobile device is now paired."
-                  : "Scan this QR code with the Buzz mobile app to securely pair."}
+                  : "Securely sending your identity to the mobile app."}
             </DialogDescription>
           </DialogHeader>
 
           <div className="min-h-0 flex-1 overflow-y-auto pt-4">
-            {step === "error" && error ? (
-              <div className="flex items-start gap-2 rounded-lg border border-destructive/30 bg-destructive/10 px-3 py-2 text-sm text-destructive">
-                <TriangleAlert className="mt-0.5 h-4 w-4 shrink-0" />
-                <span>{error}</span>
-              </div>
-            ) : step === "generating" ? (
-              <div className="flex flex-col items-center justify-center gap-3 py-8">
-                <Spinner className="h-6 w-6 text-muted-foreground" />
-                <p className="text-sm text-muted-foreground">
-                  Preparing secure pairing session...
-                </p>
-              </div>
-            ) : step === "qr" && qrUri ? (
-              <div className="mx-auto grid w-fit gap-4">
-                <div
-                  className="rounded-lg border border-border/70 bg-white p-3"
-                  data-testid="mobile-pairing-qr-container"
-                >
-                  <StyledQrCode
-                    centerImageSrc="/app-icon@2x.png"
-                    data-testid="mobile-pairing-qr"
-                    size={240}
-                    title="Mobile pairing QR code"
-                    value={qrUri}
-                  />
-                </div>
-
-                <Button
-                  className="w-full"
-                  data-testid="copy-pairing-code"
-                  onClick={handleCopy}
-                  type="button"
-                  variant="outline"
-                >
-                  <Copy className="mr-1.5 h-4 w-4" />
-                  Copy pairing code
-                </Button>
-              </div>
-            ) : step === "sas" && sasCode ? (
+            {step === "sas" && sasCode ? (
               <div className="space-y-4">
                 <div className="flex flex-col items-center gap-3 py-4">
                   <ShieldCheck className="h-10 w-10 text-primary" />
@@ -255,7 +122,7 @@ function PairingDialog({
                   <Button
                     className="flex-1"
                     data-testid="deny-sas"
-                    onClick={handleDenySas}
+                    onClick={onDeny}
                     variant="outline"
                   >
                     <X className="mr-1.5 h-4 w-4" />
@@ -264,28 +131,32 @@ function PairingDialog({
                   <Button
                     className="flex-1"
                     data-testid="confirm-sas"
-                    onClick={handleConfirmSas}
+                    onClick={onConfirm}
                   >
                     <Check className="mr-1.5 h-4 w-4" />
-                    Codes Match
+                    Codes match
                   </Button>
                 </div>
               </div>
             ) : step === "transferring" ? (
               <div className="flex flex-col items-center justify-center gap-3 py-8">
-                <Spinner className="h-6 w-6 text-muted-foreground" />
+                <LoaderCircle
+                  aria-hidden="true"
+                  className="h-6 w-6 animate-spin text-muted-foreground"
+                />
                 <p className="text-sm text-muted-foreground">
                   Sending identity to mobile device...
                 </p>
               </div>
             ) : step === "done" ? (
-              <div className="flex flex-col items-center justify-center gap-3 py-8">
+              <div
+                className="flex flex-col items-center justify-center gap-3 py-8"
+                data-testid="mobile-pairing-done"
+              >
                 <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">
-                  Mobile device paired successfully
-                </p>
+                <p className="text-sm font-medium">Mobile device paired</p>
                 <p className="text-center text-xs text-muted-foreground">
                   Your mobile app is now connected to this relay.
                 </p>
@@ -303,7 +174,158 @@ export function MobilePairingCard({
 }: {
   currentPubkey?: string;
 }) {
-  const [dialogOpen, setDialogOpen] = useState(false);
+  const [step, setStep] = useState<PairingStep>("idle");
+  const [qrUri, setQrUri] = useState<string | null>(null);
+  const [sasCode, setSasCode] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const requestIdRef = useRef(0);
+  const pairingActiveRef = useRef(false);
+  const stepRef = useRef(step);
+  stepRef.current = step;
+
+  const beginPairing = useCallback(() => {
+    const requestId = ++requestIdRef.current;
+    pairingActiveRef.current = true;
+    setStep("generating");
+    setQrUri(null);
+    setSasCode(null);
+    setError(null);
+
+    startPairing().then(
+      (uri) => {
+        if (requestId === requestIdRef.current) {
+          setQrUri(uri);
+          setStep("qr");
+        }
+      },
+      (err) => {
+        if (requestId === requestIdRef.current) {
+          pairingActiveRef.current = false;
+          setError(pairingErrorMessage(err));
+          setStep("error");
+        }
+      },
+    );
+  }, []);
+
+  useEffect(() => {
+    ++requestIdRef.current;
+    pairingActiveRef.current = false;
+    setStep("idle");
+    setQrUri(null);
+    setSasCode(null);
+    setError(null);
+
+    if (!currentPubkey) {
+      return;
+    }
+
+    let cancelled = false;
+    const unlisteners: (() => void)[] = [];
+
+    listen<{ sas: string }>("pairing-sas-received", (event) => {
+      if (!cancelled && pairingActiveRef.current) {
+        setSasCode(event.payload.sas);
+        setStep("sas");
+      }
+    }).then((fn) => {
+      if (cancelled) fn();
+      else unlisteners.push(fn);
+    });
+
+    listen("pairing-complete", () => {
+      if (!cancelled && pairingActiveRef.current) {
+        pairingActiveRef.current = false;
+        setStep("done");
+      }
+    }).then((fn) => {
+      if (cancelled) fn();
+      else unlisteners.push(fn);
+    });
+
+    listen<{ reason: string }>("pairing-aborted", (event) => {
+      if (!cancelled && pairingActiveRef.current) {
+        pairingActiveRef.current = false;
+        setError(`Pairing stopped: ${event.payload.reason}`);
+        setStep("error");
+      }
+    }).then((fn) => {
+      if (cancelled) fn();
+      else unlisteners.push(fn);
+    });
+
+    listen<{ message: string }>("pairing-error", (event) => {
+      if (!cancelled && pairingActiveRef.current) {
+        pairingActiveRef.current = false;
+        if (isPairingSessionTimeout(event.payload.message)) {
+          setQrUri(null);
+          setSasCode(null);
+          setError(null);
+          setStep("expired");
+          return;
+        }
+
+        setError(pairingErrorMessage(event.payload.message));
+        setStep("error");
+      }
+    }).then((fn) => {
+      if (cancelled) fn();
+      else unlisteners.push(fn);
+    });
+
+    return () => {
+      cancelled = true;
+      ++requestIdRef.current;
+      pairingActiveRef.current = false;
+      for (const fn of unlisteners) fn();
+      if (stepRef.current !== "idle" && stepRef.current !== "done") {
+        cancelPairing().catch(() => {});
+      }
+    };
+  }, [currentPubkey]);
+
+  async function handleCopy() {
+    if (!qrUri) return;
+    await writeTextToClipboard(qrUri);
+    toast.success("Copied to clipboard");
+  }
+
+  async function handleConfirmSas() {
+    setStep("transferring");
+    try {
+      await confirmPairingSas();
+    } catch (err) {
+      setError(
+        err instanceof Error
+          ? err.message
+          : "We couldn't send your identity. Try again.",
+      );
+      pairingActiveRef.current = false;
+      setStep("error");
+    }
+  }
+
+  function handleDenySas() {
+    pairingActiveRef.current = false;
+    cancelPairing().catch(() => {});
+    setError("The codes didn't match. Pairing was canceled.");
+    setStep("error");
+  }
+
+  function handleStatusDialogClose() {
+    pairingActiveRef.current = false;
+    if (stepRef.current === "done") {
+      setStep("idle");
+      setQrUri(null);
+      setSasCode(null);
+      setError(null);
+      return;
+    }
+
+    cancelPairing().catch(() => {});
+    setError("Pairing was canceled.");
+    setStep("error");
+  }
 
   return (
     <section className="min-w-0" data-testid="settings-mobile">
@@ -318,29 +340,106 @@ export function MobilePairingCard({
         }
       />
 
-      <SettingsOptionGroup>
-        <SettingsOptionRow className="gap-3">
-          <Smartphone className="h-4 w-4 shrink-0 text-muted-foreground" />
-          <div className="min-w-0 flex-1">
-            <p className="text-sm font-medium">Pair Mobile Device</p>
-            <p className="text-sm font-normal text-muted-foreground">
-              Securely transfer your identity via NIP-AB protocol
-            </p>
-          </div>
-          <Button
-            data-testid="pair-mobile-button"
-            disabled={!currentPubkey}
-            onClick={() => setDialogOpen(true)}
-            size="sm"
+      <SettingsOptionGroup
+        className="mx-auto w-fit max-w-full"
+        data-testid="mobile-pairing-card"
+      >
+        <SettingsOptionRow className="flex-col items-stretch justify-start gap-3 p-4">
+          <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="mobile-pairing-qr-container"
           >
-            Pair
-          </Button>
+            {step === "qr" && qrUri ? (
+              <StyledQrCode
+                animate
+                centerImageSrc="/app-icon@2x.png"
+                data-testid="mobile-pairing-qr"
+                size={240}
+                title="Mobile pairing QR code"
+                value={qrUri}
+              />
+            ) : step === "expired" ? (
+              <div className="flex max-w-52 origin-center animate-in flex-col items-center gap-3 text-center fade-in-0 zoom-in-95 duration-[250ms] ease-[cubic-bezier(0.23,1,0.32,1)] motion-reduce:animate-none">
+                <p className="text-sm text-muted-foreground">
+                  Pairing code expired.
+                </p>
+                <Button
+                  data-testid="regenerate-pairing-button"
+                  onClick={beginPairing}
+                  size="sm"
+                  type="button"
+                  variant="outline"
+                >
+                  <RefreshCw className="mr-1.5 h-4 w-4" />
+                  Generate new pairing code
+                </Button>
+              </div>
+            ) : step === "error" ? (
+              <div className="flex max-w-52 flex-col items-center gap-3 text-center">
+                <TriangleAlert className="h-6 w-6 text-destructive" />
+                <p className="text-sm text-destructive">
+                  {error ?? "Pairing session ended."}
+                </p>
+                <Button
+                  data-testid="retry-pairing-button"
+                  onClick={beginPairing}
+                  size="sm"
+                  variant="outline"
+                >
+                  Try again
+                </Button>
+              </div>
+            ) : step === "idle" ? (
+              currentPubkey ? (
+                <Button
+                  data-testid="start-pairing-button"
+                  onClick={beginPairing}
+                  type="button"
+                >
+                  Start pairing
+                </Button>
+              ) : (
+                <p className="max-w-44 text-center text-sm text-muted-foreground">
+                  Sign in to generate a mobile pairing code.
+                </p>
+              )
+            ) : (
+              <div className="flex flex-col items-center justify-center gap-3">
+                <LoaderCircle
+                  aria-hidden="true"
+                  className="h-6 w-6 animate-spin text-muted-foreground"
+                  data-testid="pairing-loading-spinner"
+                />
+                <p className="text-sm text-muted-foreground">
+                  Starting pairing...
+                </p>
+              </div>
+            )}
+          </div>
+
+          {step === "qr" && qrUri ? (
+            <Button
+              className="w-full origin-top animate-in fade-in-0 zoom-in-95 duration-[250ms] ease-[cubic-bezier(0.23,1,0.32,1)] motion-reduce:animate-none"
+              data-testid="copy-pairing-code"
+              onClick={handleCopy}
+              size="sm"
+              type="button"
+              variant="outline"
+            >
+              <Copy className="mr-1.5 h-4 w-4" />
+              Copy pairing code
+            </Button>
+          ) : null}
         </SettingsOptionRow>
       </SettingsOptionGroup>
 
-      {currentPubkey && (
-        <PairingDialog onOpenChange={setDialogOpen} open={dialogOpen} />
-      )}
+      <PairingStatusDialog
+        onClose={handleStatusDialogClose}
+        onConfirm={() => void handleConfirmSas()}
+        onDeny={handleDenySas}
+        sasCode={sasCode}
+        step={step}
+      />
     </section>
   );
 }
diff --git a/desktop/src/features/settings/ui/SettingsPanels.tsx b/desktop/src/features/settings/ui/SettingsPanels.tsx
index e2b95f249a..e74d1f3837 100644
--- a/desktop/src/features/settings/ui/SettingsPanels.tsx
+++ b/desktop/src/features/settings/ui/SettingsPanels.tsx
@@ -69,7 +69,7 @@ import {
   withAccentPreviewVars,
 } from "@/shared/theme/useThemePreviewVars";
 import { ChannelTemplatesSettingsCard } from "./ChannelTemplatesSettingsCard";
-import { DoctorSettingsPanel } from "./DoctorSettingsPanel";
+import { HarnessesSettingsPanel } from "./HarnessesSettingsPanel";
 import { ExperimentalFeaturesCard } from "./ExperimentalFeaturesCard";
 import { KeyboardShortcutsCard } from "./KeyboardShortcutsCard";
 import { MeshComputeSettingsCard } from "@/features/mesh-compute/ui/MeshComputeSettingsCard";
@@ -77,7 +77,6 @@ import { MobilePairingCard } from "./MobilePairingCard";
 import { ModerationQueueCard } from "./ModerationQueueCard";
 import { NotificationSettingsCard } from "./NotificationSettingsCard";
 import { PreventSleepSettingsCard } from "./PreventSleepSettingsCard";
-import { ActiveAgentCommunitiesSettingsCard } from "./ActiveAgentCommunitiesSettingsCard";
 import { AgentDefaultsSettingsCard } from "./AgentDefaultsSettingsCard";
 import { HostedCommunitiesSettingsCard } from "./HostedCommunitiesSettingsCard";
 import { SettingsOptionGroup, SettingsOptionRow } from "./SettingsOptionGroup";
@@ -814,8 +813,7 @@ export function renderSettingsSection(
       return (
         <div className="space-y-12">
           <PreventSleepSettingsCard />
-          <DoctorSettingsPanel />
-          <ActiveAgentCommunitiesSettingsCard />
+          <HarnessesSettingsPanel />
           <AgentDefaultsSettingsCard />
         </div>
       );
diff --git a/desktop/src/features/settings/ui/harnessCatalogCopy.ts b/desktop/src/features/settings/ui/harnessCatalogCopy.ts
new file mode 100644
index 0000000000..79c55f0148
--- /dev/null
+++ b/desktop/src/features/settings/ui/harnessCatalogCopy.ts
@@ -0,0 +1,55 @@
+/**
+ * Curated one-line descriptions for harness catalog entries.
+ *
+ * Content policy (agreed in the BYOH UX thread): exactly ONE neutral,
+ * vendor-sourced category sentence per entry — what kind of tool it is —
+ * with provenance cited inline. No feature inventories, no marketing
+ * superlatives, no volatile model/provider claims. Operational setup copy
+ * (status, hints) stays generated from runtime state, never hand-authored
+ * here. Research: ~/.buzz/RESEARCH/BYOH_CATALOG_IA.md.
+ */
+
+const HARNESS_DESCRIPTIONS: Record<string, string> = {
+  // Built-in runtimes.
+  "buzz-agent": "Buzz's built-in agent runtime, bundled with the app.",
+  // Source: https://code.claude.com/docs/en/overview — "Claude Code is an
+  // agentic coding tool" that lives in the terminal.
+  claude: "Anthropic's agentic coding tool that runs in the terminal.",
+  // Source: https://developers.openai.com/codex — "Codex is OpenAI's coding
+  // agent".
+  codex: "OpenAI's coding agent, connected through the codex-acp adapter.",
+  // Source: https://block.github.io/goose/ — "an open source, extensible AI
+  // agent".
+  goose: "Block's open-source, extensible AI agent.",
+
+  // Bundled presets — sources per RESEARCH/BYOH_CATALOG_IA.md.
+  // Source: https://cursor.com/docs/cli/acp
+  cursor: "Cursor's coding agent, connected to Buzz through its ACP server.",
+  // Source: https://github.com/can1357/oh-my-pi
+  omp: "A terminal coding agent with integrated development tools.",
+  // Source: https://build.x.ai (docs unavailable during research; kept
+  // deliberately conservative).
+  grok: "xAI's coding agent, connected to Buzz through its ACP entrypoint.",
+  // Source: https://github.com/anomalyco/opencode
+  opencode: "An open-source coding agent.",
+  // Sources: https://github.com/MoonshotAI/kimi-cli,
+  // https://moonshotai.github.io/kimi-cli/en/
+  kimi: "A terminal coding agent for software development and command-line tasks.",
+  // Sources: https://ampcode.com, https://ampcode.com/manual
+  amp: "A coding agent from Sourcegraph.",
+  // Sources: https://github.com/NousResearch/hermes-agent,
+  // https://hermes-agent.nousresearch.com/docs/
+  hermes: "A general-purpose AI agent from Nous Research.",
+  // Sources: https://github.com/openclaw/openclaw,
+  // https://docs.openclaw.ai/start/getting-started
+  openclaw: "A personal AI assistant that runs on your own devices.",
+};
+
+/**
+ * One neutral sentence describing the harness, or null for entries we don't
+ * curate (customs, unknown ids). Callers must render nothing rather than
+ * invent copy.
+ */
+export function harnessDescription(id: string): string | null {
+  return HARNESS_DESCRIPTIONS[id.trim().toLowerCase()] ?? null;
+}
diff --git a/desktop/src/features/settings/ui/harnessCatalogLogic.test.mjs b/desktop/src/features/settings/ui/harnessCatalogLogic.test.mjs
new file mode 100644
index 0000000000..28843bdfd2
--- /dev/null
+++ b/desktop/src/features/settings/ui/harnessCatalogLogic.test.mjs
@@ -0,0 +1,400 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+
+import {
+  adapterUpdateWarning,
+  catalogDialogEntries,
+  catalogPrimaryAction,
+  entryStatusLabel,
+  filterCatalogEntries,
+  groupCatalogEntries,
+  isYourHarnessEntry,
+  stableRowOrder,
+  yourHarnessEntries,
+} from "./harnessCatalogLogic.ts";
+
+// ── Minimal catalog entry factory ────────────────────────────────────────────
+
+function entry(overrides = {}) {
+  return {
+    id: "test-id",
+    label: "Test",
+    source: "preset",
+    availability: "not_installed",
+    avatarUrl: "",
+    command: null,
+    binaryPath: null,
+    defaultArgs: [],
+    mcpCommand: null,
+    modelEnvVar: null,
+    providerEnvVar: null,
+    thinkingEnvVar: null,
+    installHint: "",
+    installInstructionsUrl: "",
+    canAutoInstall: false,
+    requiresExternalCli: false,
+    underlyingCliPath: null,
+    nodeRequired: false,
+    authStatus: { status: "not_applicable" },
+    loginHint: null,
+    ...overrides,
+  };
+}
+
+// ── isYourHarnessEntry / yourHarnessEntries ──────────────────────────────────
+
+describe("isYourHarnessEntry", () => {
+  it("includes available entries", () => {
+    assert.equal(
+      isYourHarnessEntry(entry({ availability: "available" })),
+      true,
+    );
+  });
+
+  it("includes one-click installable entries (auto-install, no node gate)", () => {
+    assert.equal(
+      isYourHarnessEntry(entry({ canAutoInstall: true, nodeRequired: false })),
+      true,
+    );
+  });
+
+  it("excludes auto-installable entries blocked on Node.js", () => {
+    assert.equal(
+      isYourHarnessEntry(entry({ canAutoInstall: true, nodeRequired: true })),
+      false,
+    );
+  });
+
+  it("excludes presets needing manual setup", () => {
+    assert.equal(
+      isYourHarnessEntry(
+        entry({ availability: "cli_missing", canAutoInstall: false }),
+      ),
+      false,
+    );
+  });
+
+  it("always includes custom entries regardless of readiness", () => {
+    assert.equal(
+      isYourHarnessEntry(
+        entry({ source: "custom", availability: "not_installed" }),
+      ),
+      true,
+    );
+  });
+});
+
+describe("yourHarnessEntries", () => {
+  it("filters to owned/ready rows only", () => {
+    const catalog = [
+      entry({ id: "ready", availability: "available" }),
+      entry({ id: "needs-setup", availability: "cli_missing" }),
+      entry({ id: "mine", source: "custom" }),
+    ];
+    assert.deepEqual(
+      yourHarnessEntries(catalog).map((e) => e.id),
+      ["ready", "mine"],
+    );
+  });
+});
+
+// ── catalogDialogEntries ─────────────────────────────────────────────────────
+
+describe("catalogDialogEntries", () => {
+  it("excludes custom entries and sorts needs-setup first, alpha within group", () => {
+    const catalog = [
+      entry({ id: "zed", label: "Zed", availability: "available" }),
+      entry({ id: "mine", label: "Mine", source: "custom" }),
+      entry({ id: "beta", label: "Beta", availability: "cli_missing" }),
+      entry({ id: "alpha", label: "Alpha", availability: "not_installed" }),
+    ];
+    assert.deepEqual(
+      catalogDialogEntries(catalog).map((e) => e.id),
+      ["alpha", "beta", "zed"],
+    );
+  });
+});
+
+// ── groupCatalogEntries ──────────────────────────────────────────────────────
+
+describe("groupCatalogEntries", () => {
+  it("splits ready entries into installed, everything else into setup", () => {
+    const entries = [
+      entry({ id: "needs-cli", availability: "cli_missing" }),
+      entry({ id: "ready", availability: "available" }),
+      entry({ id: "needs-adapter", availability: "adapter_missing" }),
+    ];
+    const groups = groupCatalogEntries(entries);
+    assert.deepEqual(
+      groups.setup.map((e) => e.id),
+      ["needs-cli", "needs-adapter"],
+    );
+    assert.deepEqual(
+      groups.installed.map((e) => e.id),
+      ["ready"],
+    );
+  });
+
+  it("preserves input order within each group", () => {
+    const entries = [
+      entry({ id: "b", availability: "available" }),
+      entry({ id: "a", availability: "available" }),
+    ];
+    assert.deepEqual(
+      groupCatalogEntries(entries).installed.map((e) => e.id),
+      ["b", "a"],
+    );
+  });
+
+  it("handles empty input", () => {
+    assert.deepEqual(groupCatalogEntries([]), { setup: [], installed: [] });
+  });
+});
+
+// ── filterCatalogEntries ─────────────────────────────────────────────────────
+
+describe("filterCatalogEntries", () => {
+  const entries = [
+    entry({ id: "kimi", label: "Kimi Code", command: "kimi" }),
+    entry({ id: "amp", label: "Amp", command: "amp" }),
+    entry({ id: "omp", label: "Oh My Pi", command: "omp" }),
+  ];
+
+  it("returns everything for a blank query", () => {
+    assert.equal(filterCatalogEntries(entries, "  ").length, 3);
+  });
+
+  it("matches label case-insensitively", () => {
+    assert.deepEqual(
+      filterCatalogEntries(entries, "kIMi").map((e) => e.id),
+      ["kimi"],
+    );
+  });
+
+  it("matches command", () => {
+    assert.deepEqual(
+      filterCatalogEntries(entries, "omp").map((e) => e.id),
+      ["omp"],
+    );
+  });
+
+  it("returns empty for no match", () => {
+    assert.equal(filterCatalogEntries(entries, "zzz").length, 0);
+  });
+});
+
+// ── stableRowOrder ───────────────────────────────────────────────────────────
+
+describe("stableRowOrder", () => {
+  it("initial order: priority builtins, then ready, then alpha", () => {
+    const entries = [
+      entry({ id: "zeta", label: "Zeta", availability: "available" }),
+      entry({
+        id: "goose",
+        label: "goose",
+        availability: "available",
+        source: "builtin",
+      }),
+      entry({ id: "off", label: "Aardvark", canAutoInstall: true }),
+      entry({
+        id: "buzz-agent",
+        label: "Buzz",
+        availability: "available",
+        source: "builtin",
+      }),
+    ];
+    assert.deepEqual(stableRowOrder([], entries), [
+      "buzz-agent",
+      "goose",
+      "zeta",
+      "off",
+    ]);
+  });
+
+  it("keeps previous relative order when availability changes (no reorder on install)", () => {
+    const before = ["buzz-agent", "zeta", "off"];
+    const entries = [
+      entry({ id: "off", label: "Aardvark", availability: "available" }), // just installed
+      entry({ id: "zeta", label: "Zeta", availability: "available" }),
+      entry({
+        id: "buzz-agent",
+        label: "Buzz",
+        availability: "available",
+        source: "builtin",
+      }),
+    ];
+    assert.deepEqual(stableRowOrder(before, entries), [
+      "buzz-agent",
+      "zeta",
+      "off",
+    ]);
+  });
+
+  it("drops removed ids and appends newcomers at the end", () => {
+    const before = ["buzz-agent", "deleted", "zeta"];
+    const entries = [
+      entry({ id: "zeta", label: "Zeta", availability: "available" }),
+      entry({ id: "buzz-agent", label: "Buzz", availability: "available" }),
+      entry({ id: "new-one", label: "New One", availability: "available" }),
+    ];
+    assert.deepEqual(stableRowOrder(before, entries), [
+      "buzz-agent",
+      "zeta",
+      "new-one",
+    ]);
+  });
+});
+
+// ── entryStatusLabel ─────────────────────────────────────────────────────────
+
+describe("entryStatusLabel", () => {
+  it("config error wins over availability", () => {
+    assert.equal(
+      entryStatusLabel(
+        entry({
+          availability: "available",
+          authStatus: { status: "config_invalid", diagnostic: "boom" },
+        }),
+      ),
+      "Config error",
+    );
+  });
+
+  it("maps availability states", () => {
+    assert.equal(
+      entryStatusLabel(entry({ availability: "adapter_missing" })),
+      "Adapter needed",
+    );
+    assert.equal(
+      entryStatusLabel(entry({ availability: "adapter_outdated" })),
+      "Update needed",
+    );
+    assert.equal(
+      entryStatusLabel(entry({ availability: "cli_missing" })),
+      "CLI needed",
+    );
+    assert.equal(
+      entryStatusLabel(entry({ availability: "not_installed" })),
+      "CLI needed",
+    );
+  });
+
+  it("flags sign-in for available-but-logged-out", () => {
+    assert.equal(
+      entryStatusLabel(
+        entry({
+          availability: "available",
+          authStatus: { status: "logged_out" },
+        }),
+      ),
+      "Sign-in needed",
+    );
+  });
+
+  it("is silent for ready + logged in", () => {
+    assert.equal(
+      entryStatusLabel(
+        entry({
+          availability: "available",
+          authStatus: { status: "logged_in" },
+        }),
+      ),
+      null,
+    );
+  });
+});
+
+// ── adapterUpdateWarning ─────────────────────────────────────────────────────
+
+describe("adapterUpdateWarning", () => {
+  it("keeps the codex-specific machine-wide caveat for codex", () => {
+    const copy = adapterUpdateWarning(
+      entry({ id: "codex", label: "Codex", command: "codex-acp" }),
+    );
+    assert.match(copy, /codex-acp/);
+    assert.match(copy, /@zed-industries\/codex-acp@0\.16\.0/);
+  });
+
+  it("never leaks codex package copy into other runtimes", () => {
+    const copy = adapterUpdateWarning(
+      entry({
+        id: "claude",
+        label: "Claude Code",
+        command: "claude-agent-acp",
+      }),
+    );
+    assert.match(copy, /claude-agent-acp/);
+    assert.doesNotMatch(copy, /codex/i);
+    assert.doesNotMatch(copy, /zed-industries/);
+  });
+
+  it("falls back to the label when the command is missing", () => {
+    const copy = adapterUpdateWarning(
+      entry({ id: "mystery", label: "Mystery Harness", command: null }),
+    );
+    assert.match(copy, /Mystery Harness/);
+    assert.doesNotMatch(copy, /codex/i);
+  });
+});
+
+// ── catalogPrimaryAction ─────────────────────────────────────────────────────
+
+describe("catalogPrimaryAction", () => {
+  it("no action for ready entries", () => {
+    assert.deepEqual(
+      catalogPrimaryAction(entry({ availability: "available" })),
+      { kind: "none" },
+    );
+  });
+
+  it("install for one-click installable", () => {
+    assert.deepEqual(catalogPrimaryAction(entry({ canAutoInstall: true })), {
+      kind: "install",
+      label: "Install",
+    });
+  });
+
+  it("update label for outdated adapters", () => {
+    assert.deepEqual(
+      catalogPrimaryAction(
+        entry({ availability: "adapter_outdated", canAutoInstall: true }),
+      ),
+      { kind: "install", label: "Update" },
+    );
+  });
+
+  it("docs fallback when auto-install is unavailable", () => {
+    assert.deepEqual(
+      catalogPrimaryAction(
+        entry({ installInstructionsUrl: "https://example.com" }),
+      ),
+      { kind: "docs", label: "Setup guide" },
+    );
+  });
+
+  it("docs fallback labels download pages honestly", () => {
+    assert.deepEqual(
+      catalogPrimaryAction(
+        entry({ installInstructionsUrl: "https://cursor.com/downloads" }),
+      ),
+      { kind: "docs", label: "Download page" },
+    );
+  });
+
+  it("node-gated installs fall back to docs", () => {
+    assert.deepEqual(
+      catalogPrimaryAction(
+        entry({
+          canAutoInstall: true,
+          nodeRequired: true,
+          installInstructionsUrl: "https://example.com",
+        }),
+      ),
+      { kind: "docs", label: "Setup guide" },
+    );
+  });
+
+  it("none when nothing is actionable", () => {
+    assert.deepEqual(catalogPrimaryAction(entry({})), { kind: "none" });
+  });
+});
diff --git a/desktop/src/features/settings/ui/harnessCatalogLogic.ts b/desktop/src/features/settings/ui/harnessCatalogLogic.ts
new file mode 100644
index 0000000000..2627135a77
--- /dev/null
+++ b/desktop/src/features/settings/ui/harnessCatalogLogic.ts
@@ -0,0 +1,226 @@
+/**
+ * Pure logic for the consolidated Harnesses settings surface and the
+ * Add-runtimes catalog dialog.
+ *
+ * Extracted for deterministic unit-testing — no React, no Tauri, no network.
+ */
+
+import type { AcpRuntimeCatalogEntry } from "@/shared/api/types";
+
+// Builtins that anchor the top of "Your runtimes" — mirrors the old
+// DoctorSettingsPanel RUNTIME_SORT_PRIORITY so the Buzz + Goose rows stay
+// where users learned to find them.
+const ROW_SORT_PRIORITY: Record<string, number> = {
+  "buzz-agent": 0,
+  goose: 1,
+};
+
+/**
+ * True when the entry earns a row in "Your runtimes":
+ *
+ * - it is ready (`availability === "available"`), or
+ * - one click of the Install button makes it ready (auto-install works), or
+ * - the user authored it (`source === "custom"` — owner rows keep their
+ *   edit/delete affordances regardless of readiness).
+ *
+ * Everything else needs multi-step setup and belongs in the Add-runtimes
+ * catalog with a real setup action — NOT an inert row control.
+ */
+export function isYourHarnessEntry(entry: AcpRuntimeCatalogEntry): boolean {
+  if (entry.source === "custom") return true;
+  if (entry.availability === "available") return true;
+  return entry.canAutoInstall && !entry.nodeRequired;
+}
+
+/** Entries that render as rows in "Your runtimes". */
+export function yourHarnessEntries(
+  catalog: readonly AcpRuntimeCatalogEntry[],
+): AcpRuntimeCatalogEntry[] {
+  return catalog.filter(isYourHarnessEntry);
+}
+
+/**
+ * Entries offered in the Add-runtimes catalog: every non-custom entry.
+ * Ready ones still show (marked as such) so the catalog doubles as a
+ * browsable inventory, like the Agent Catalog.
+ */
+export function catalogDialogEntries(
+  catalog: readonly AcpRuntimeCatalogEntry[],
+): AcpRuntimeCatalogEntry[] {
+  return catalog
+    .filter((e) => e.source !== "custom")
+    .sort(compareCatalogEntries);
+}
+
+/** Needs-setup entries first (that's why the user opened the dialog), then
+ * ready ones; alphabetical within each group. */
+function compareCatalogEntries(
+  a: AcpRuntimeCatalogEntry,
+  b: AcpRuntimeCatalogEntry,
+): number {
+  const aReady = a.availability === "available" ? 1 : 0;
+  const bReady = b.availability === "available" ? 1 : 0;
+  if (aReady !== bReady) return aReady - bReady;
+  return a.label.localeCompare(b.label);
+}
+
+/**
+ * Splits catalog entries into the two accordion sections of the Add-runtimes
+ * list: "Setup" (needs action — the reason the user opened the dialog) and
+ * "Installed" (already ready, collapsed by default). Relative order within
+ * each group is preserved from the input.
+ */
+export function groupCatalogEntries(
+  entries: readonly AcpRuntimeCatalogEntry[],
+): {
+  setup: AcpRuntimeCatalogEntry[];
+  installed: AcpRuntimeCatalogEntry[];
+} {
+  return {
+    setup: entries.filter((e) => e.availability !== "available"),
+    installed: entries.filter((e) => e.availability === "available"),
+  };
+}
+
+/** Case-insensitive catalog search across label, id, and command. */
+export function filterCatalogEntries(
+  entries: readonly AcpRuntimeCatalogEntry[],
+  query: string,
+): AcpRuntimeCatalogEntry[] {
+  const q = query.trim().toLowerCase();
+  if (!q) return [...entries];
+  return entries.filter(
+    (e) =>
+      e.label.toLowerCase().includes(q) ||
+      e.id.toLowerCase().includes(q) ||
+      (e.command ?? "").toLowerCase().includes(q),
+  );
+}
+
+function compareInitialRows(
+  a: AcpRuntimeCatalogEntry,
+  b: AcpRuntimeCatalogEntry,
+): number {
+  const aPriority = ROW_SORT_PRIORITY[a.id] ?? Number.MAX_SAFE_INTEGER;
+  const bPriority = ROW_SORT_PRIORITY[b.id] ?? Number.MAX_SAFE_INTEGER;
+  if (aPriority !== bPriority) return aPriority - bPriority;
+  const aOn = a.availability === "available" ? 0 : 1;
+  const bOn = b.availability === "available" ? 0 : 1;
+  if (aOn !== bOn) return aOn - bOn;
+  return a.label.localeCompare(b.label);
+}
+
+/**
+ * Stable row ordering for "Your runtimes".
+ *
+ * First render sorts priority builtins first, then ready-before-needs-setup,
+ * then alphabetically. Subsequent renders KEEP the previous relative order
+ * for ids that are still present — a row that just finished installing must
+ * not jump around under the pointer — and append newcomers (e.g. a harness
+ * just added from the catalog) using the initial comparator.
+ *
+ * Returns the ordered id list; callers map ids back to entries.
+ */
+export function stableRowOrder(
+  previousOrder: readonly string[],
+  entries: readonly AcpRuntimeCatalogEntry[],
+): string[] {
+  const present = new Set(entries.map((e) => e.id));
+  const kept = previousOrder.filter((id) => present.has(id));
+  const keptSet = new Set(kept);
+  const appended = entries
+    .filter((e) => !keptSet.has(e.id))
+    .sort(compareInitialRows)
+    .map((e) => e.id);
+  return [...kept, ...appended];
+}
+
+/** Human status label for a catalog entry; null when nothing needs saying. */
+export function entryStatusLabel(entry: AcpRuntimeCatalogEntry): string | null {
+  if (entry.authStatus.status === "config_invalid") return "Config error";
+  switch (entry.availability) {
+    case "adapter_missing":
+      return "Adapter needed";
+    case "adapter_outdated":
+      return "Update needed";
+    case "cli_missing":
+    case "not_installed":
+      return "CLI needed";
+    case "available":
+      return entry.authStatus.status === "logged_out" ? "Sign-in needed" : null;
+    default:
+      return null;
+  }
+}
+
+/**
+ * Body copy for the confirmation dialog shown before replacing an
+ * already-installed (but outdated) adapter.
+ *
+ * Codex carries a specific machine-wide caveat about the legacy Zed adapter
+ * contract; every other runtime gets generic, runtime-derived copy — Codex
+ * package names must never appear for another runtime.
+ */
+export function adapterUpdateWarning(entry: AcpRuntimeCatalogEntry): string {
+  if (entry.id === "codex") {
+    return (
+      "This replaces the machine-wide codex-acp adapter. Older Buzz " +
+      "releases using the legacy adapter may lose community access until " +
+      "@zed-industries/codex-acp@0.16.0 is restored."
+    );
+  }
+  const adapter = entry.command?.trim() || entry.label;
+  return (
+    `This replaces the machine-wide ${adapter} adapter. Other tools using ` +
+    "the currently installed adapter will switch to the updated version."
+  );
+}
+
+export type CatalogPrimaryAction =
+  | { kind: "install"; label: string }
+  | { kind: "docs"; label: string }
+  | { kind: "none" };
+
+/**
+ * True when the vendor's install link is a plain download page (e.g.
+ * cursor.com/downloads, kimi.ai/download) rather than written setup docs —
+ * "Setup guide" would over-promise for those.
+ */
+export function isDownloadPageUrl(url: string): boolean {
+  try {
+    return /download/i.test(new URL(url.trim()).pathname);
+  } catch {
+    return false;
+  }
+}
+
+/** Label for a link that opens `installInstructionsUrl`. */
+export function installLinkLabel(entry: AcpRuntimeCatalogEntry): string {
+  return isDownloadPageUrl(entry.installInstructionsUrl)
+    ? "Download page"
+    : "Setup guide";
+}
+
+/**
+ * Primary action for the catalog detail pane.
+ *
+ * - Ready → no action (the entry already has a row in Your runtimes).
+ * - One-click installable → Install.
+ * - Otherwise → open the vendor's setup guide or download page, when one
+ *   exists.
+ */
+export function catalogPrimaryAction(
+  entry: AcpRuntimeCatalogEntry,
+): CatalogPrimaryAction {
+  if (entry.availability === "available") return { kind: "none" };
+  if (entry.canAutoInstall && !entry.nodeRequired) {
+    return {
+      kind: "install",
+      label: entry.availability === "adapter_outdated" ? "Update" : "Install",
+    };
+  }
+  if (entry.installInstructionsUrl.trim().length > 0) {
+    return { kind: "docs", label: installLinkLabel(entry) };
+  }
+  return { kind: "none" };
+}
diff --git a/desktop/src/features/settings/ui/harnessFormLogic.test.mjs b/desktop/src/features/settings/ui/harnessFormLogic.test.mjs
new file mode 100644
index 0000000000..d236f827e1
--- /dev/null
+++ b/desktop/src/features/settings/ui/harnessFormLogic.test.mjs
@@ -0,0 +1,291 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  idFromLabel,
+  buildEnvRecord,
+  filterArgs,
+  envPairsFromRecord,
+  formValuesFromCatalogEntry,
+  definitionFromFormValues,
+  commaArgError,
+} from "./harnessFormLogic.ts";
+
+// ── idFromLabel ──────────────────────────────────────────────────────────────
+
+test("idFromLabel_typicalName_producesHyphenated", () => {
+  assert.equal(idFromLabel("My Runtime"), "my-runtime");
+});
+
+test("idFromLabel_alreadyLowercase_returnsUnchanged", () => {
+  assert.equal(idFromLabel("cursor"), "cursor");
+});
+
+test("idFromLabel_specialChars_replacedWithHyphens", () => {
+  assert.equal(idFromLabel("Foo Bar!Baz"), "foo-bar-baz");
+});
+
+test("idFromLabel_consecutiveSpecialChars_collapsedToOneHyphen", () => {
+  assert.equal(idFromLabel("foo   bar"), "foo-bar");
+});
+
+test("idFromLabel_trailingSpecialChars_stripped", () => {
+  assert.equal(idFromLabel("my-runtime--"), "my-runtime");
+});
+
+test("idFromLabel_leadingHyphen_stripped", () => {
+  // A label starting with a non-[a-z0-9_] char produces a leading hyphen;
+  // the regex strips it so the id stays valid.
+  assert.equal(idFromLabel("-bad"), "bad");
+});
+
+test("idFromLabel_underscorePreserved", () => {
+  assert.equal(idFromLabel("my_agent"), "my_agent");
+});
+
+test("idFromLabel_emptyString_returnsEmpty", () => {
+  assert.equal(idFromLabel(""), "");
+});
+
+test("idFromLabel_uppercaseOnly_lowercased", () => {
+  assert.equal(idFromLabel("CURSOR"), "cursor");
+});
+
+// ── buildEnvRecord ───────────────────────────────────────────────────────────
+
+test("buildEnvRecord_twoValidPairs_returnsBothEntries", () => {
+  assert.deepEqual(
+    buildEnvRecord([
+      { key: "FOO", value: "bar" },
+      { key: "BAZ", value: "qux" },
+    ]),
+    { FOO: "bar", BAZ: "qux" },
+  );
+});
+
+test("buildEnvRecord_emptyKey_skipped", () => {
+  assert.deepEqual(
+    buildEnvRecord([
+      { key: "", value: "orphaned-value" },
+      { key: "KEEP", value: "yes" },
+    ]),
+    { KEEP: "yes" },
+  );
+});
+
+test("buildEnvRecord_whitespaceOnlyKey_skipped", () => {
+  assert.deepEqual(buildEnvRecord([{ key: "   ", value: "x" }]), {});
+});
+
+test("buildEnvRecord_keyWithLeadingTrailingSpaces_trimmed", () => {
+  // Key is trimmed; value is preserved verbatim.
+  assert.deepEqual(buildEnvRecord([{ key: "  MY_VAR  ", value: " val " }]), {
+    MY_VAR: " val ",
+  });
+});
+
+test("buildEnvRecord_emptyPairs_returnsEmptyObject", () => {
+  assert.deepEqual(buildEnvRecord([]), {});
+});
+
+test("buildEnvRecord_duplicateKeys_lastValueWins", () => {
+  assert.deepEqual(
+    buildEnvRecord([
+      { key: "X", value: "first" },
+      { key: "X", value: "second" },
+    ]),
+    { X: "second" },
+  );
+});
+
+// ── filterArgs ───────────────────────────────────────────────────────────────
+
+test("filterArgs_normalArgs_allPreserved", () => {
+  assert.deepEqual(filterArgs(["--flag", "--output", "file.txt"]), [
+    "--flag",
+    "--output",
+    "file.txt",
+  ]);
+});
+
+test("filterArgs_emptyString_removed", () => {
+  assert.deepEqual(filterArgs([""]), []);
+});
+
+test("filterArgs_whitespaceOnlyArg_removed", () => {
+  assert.deepEqual(filterArgs(["  "]), []);
+});
+
+test("filterArgs_mixedEmptyAndReal_onlyRealKept", () => {
+  assert.deepEqual(filterArgs(["acp", "", "--verbose", "   "]), [
+    "acp",
+    "--verbose",
+  ]);
+});
+
+test("filterArgs_argWithInternalSpaces_preserved", () => {
+  // An arg with leading/trailing spaces but non-whitespace content is kept
+  // (trim only tests emptiness, not the full value).
+  assert.deepEqual(filterArgs(["--name", "hello world"]), [
+    "--name",
+    "hello world",
+  ]);
+});
+
+test("filterArgs_emptyArray_returnsEmpty", () => {
+  assert.deepEqual(filterArgs([]), []);
+});
+
+// ── envPairsFromRecord ────────────────────────────────────────────────────────
+
+test("envPairsFromRecord_undefinedRecord_returnsEmptyArray", () => {
+  assert.deepEqual(envPairsFromRecord(undefined), []);
+});
+
+test("envPairsFromRecord_emptyRecord_returnsEmptyArray", () => {
+  assert.deepEqual(envPairsFromRecord({}), []);
+});
+
+test("envPairsFromRecord_singleEntry_returnsSinglePair", () => {
+  assert.deepEqual(envPairsFromRecord({ FOO: "bar" }), [
+    { key: "FOO", value: "bar" },
+  ]);
+});
+
+test("envPairsFromRecord_multipleEntries_returnsAllPairs", () => {
+  const result = envPairsFromRecord({ ALPHA: "1", BETA: "2" });
+  // BTreeMap serializes in sorted key order; verify both pairs are present.
+  assert.equal(result.length, 2);
+  assert.ok(result.some((p) => p.key === "ALPHA" && p.value === "1"));
+  assert.ok(result.some((p) => p.key === "BETA" && p.value === "2"));
+});
+
+test("envPairsFromRecord_valueCanBeEmptyString", () => {
+  assert.deepEqual(envPairsFromRecord({ EMPTY_VAL: "" }), [
+    { key: "EMPTY_VAL", value: "" },
+  ]);
+});
+
+test("envPairsFromRecord_roundTrip_buildEnvRecord_restoresOriginal", () => {
+  // Proves the edit round-trip: catalog env → pairs → save payload → same map.
+  const original = { FOO: "bar", BAZ: "qux" };
+  const pairs = envPairsFromRecord(original);
+  const restored = buildEnvRecord(pairs);
+  assert.deepEqual(restored, original);
+});
+
+// ── edit round-trip (entry → form → definition) ──────────────────────────────
+
+/** A fully-populated definition as it appears on a catalog entry. */
+const FULL_ENTRY = {
+  id: "my-harness",
+  label: "My Harness",
+  command: "my-harness",
+  defaultArgs: ["acp", "--verbose"],
+  definitionEnv: { FOO: "bar", BAZ: "qux" },
+  installInstructionsUrl: "https://example.com/docs",
+  installHint: "npm install -g my-harness",
+};
+
+test("formValuesFromCatalogEntry_fullEntry_populatesEveryField", () => {
+  const form = formValuesFromCatalogEntry(FULL_ENTRY);
+  assert.equal(form.id, "my-harness");
+  assert.equal(form.label, "My Harness");
+  assert.equal(form.command, "my-harness");
+  assert.deepEqual(form.args, ["acp", "--verbose"]);
+  assert.deepEqual(form.env, [
+    { key: "FOO", value: "bar" },
+    { key: "BAZ", value: "qux" },
+  ]);
+  assert.equal(form.installInstructionsUrl, "https://example.com/docs");
+  assert.equal(form.installHint, "npm install -g my-harness");
+});
+
+test("editRoundTrip_openThenSaveWithoutChanges_losesNothing", () => {
+  // Regression for the installHint edit-loss bug: opening the edit form and
+  // immediately saving must reproduce the original definition verbatim.
+  const definition = definitionFromFormValues(
+    formValuesFromCatalogEntry(FULL_ENTRY),
+  );
+  assert.deepEqual(definition, {
+    id: FULL_ENTRY.id,
+    label: FULL_ENTRY.label,
+    command: FULL_ENTRY.command,
+    args: FULL_ENTRY.defaultArgs,
+    env: FULL_ENTRY.definitionEnv,
+    installInstructionsUrl: FULL_ENTRY.installInstructionsUrl,
+    installHint: FULL_ENTRY.installHint,
+  });
+});
+
+test("editRoundTrip_definitionKeys_matchFormSeedFields", () => {
+  // Structural guard: any user-editable field added to the save payload must
+  // also be seeded on edit, or open-edit-then-save silently erases it (the
+  // installHint bug). `args`/`env` map to `defaultArgs`/`definitionEnv`.
+  const seeded = new Set(Object.keys(formValuesFromCatalogEntry(FULL_ENTRY)));
+  const saved = Object.keys(
+    definitionFromFormValues(formValuesFromCatalogEntry(FULL_ENTRY)),
+  );
+  for (const key of saved) {
+    assert.ok(
+      seeded.has(key),
+      `save payload field "${key}" not seeded on edit`,
+    );
+  }
+});
+
+test("formValuesFromCatalogEntry_nullishOptionalFields_defaultsSafely", () => {
+  const form = formValuesFromCatalogEntry({
+    id: "min",
+    label: "Min",
+    command: null,
+    defaultArgs: undefined,
+    definitionEnv: undefined,
+    installInstructionsUrl: "",
+    installHint: "",
+  });
+  assert.equal(form.command, "");
+  assert.deepEqual(form.args, []);
+  assert.deepEqual(form.env, []);
+});
+
+test("definitionFromFormValues_trimsScalarFields", () => {
+  const definition = definitionFromFormValues({
+    id: " my-id ",
+    label: " Label ",
+    command: " cmd ",
+    args: ["keep", "  "],
+    env: [{ key: " K ", value: "v" }],
+    installInstructionsUrl: " https://x ",
+    installHint: " hint ",
+  });
+  assert.equal(definition.id, "my-id");
+  assert.equal(definition.label, "Label");
+  assert.equal(definition.command, "cmd");
+  assert.deepEqual(definition.args, ["keep"]);
+  assert.deepEqual(definition.env, { K: "v" });
+  assert.equal(definition.installInstructionsUrl, "https://x");
+  assert.equal(definition.installHint, "hint");
+});
+
+// ── commaArgError ─────────────────────────────────────────────────────────────
+
+test("commaArgError_noCommas_returnsNull", () => {
+  assert.equal(commaArgError(["acp", "--verbose", "--name", "x y"]), null);
+});
+
+test("commaArgError_emptyArgs_returnsNull", () => {
+  assert.equal(commaArgError([]), null);
+});
+
+test("commaArgError_commaInArg_namesOffender", () => {
+  const err = commaArgError(["--models", "a,b"]);
+  assert.ok(err !== null);
+  assert.ok(err.includes('"a,b"'), "error must name the offending argument");
+  assert.ok(err.includes("comma"), "error must name the transport limit");
+});
+
+test("commaArgError_firstOffenderReported", () => {
+  const err = commaArgError(["x,y", "p,q"]);
+  assert.ok(err?.includes('"x,y"'));
+});
diff --git a/desktop/src/features/settings/ui/harnessFormLogic.ts b/desktop/src/features/settings/ui/harnessFormLogic.ts
new file mode 100644
index 0000000000..8332f8ae71
--- /dev/null
+++ b/desktop/src/features/settings/ui/harnessFormLogic.ts
@@ -0,0 +1,158 @@
+/**
+ * Pure logic helpers for the custom-harness form.
+ *
+ * Extracted so they can be tested independently from the React layer.
+ */
+
+/**
+ * Derive a valid harness ID from a human-readable display name.
+ *
+ * Rules match the backend `is_valid_harness_id` predicate:
+ *   [a-z0-9_][a-z0-9_-]*
+ *
+ * The transform:
+ *   1. Lowercase the label.
+ *   2. Replace any character outside [a-z0-9_-] with a hyphen.
+ *   3. Strip a leading character that isn't [a-z0-9_] (covers e.g. "-foo").
+ *   4. Collapse runs of hyphens.
+ *   5. Strip trailing hyphens.
+ */
+export function idFromLabel(label: string): string {
+  return label
+    .toLowerCase()
+    .replace(/[^a-z0-9_-]/g, "-")
+    .replace(/^[^a-z0-9_]/, "")
+    .replace(/-{2,}/g, "-")
+    .replace(/-+$/, "");
+}
+
+/**
+ * Build the env-variable record that goes into the save payload.
+ *
+ * Pairs with empty keys are silently skipped — they represent blank
+ * rows the user hasn't filled in yet.
+ */
+export function buildEnvRecord(
+  pairs: ReadonlyArray<{ key: string; value: string }>,
+): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const { key, value } of pairs) {
+    const k = key.trim();
+    if (k) out[k] = value;
+  }
+  return out;
+}
+
+/**
+ * Convert a `Record<string, string>` env map (as stored on a catalog entry or
+ * harness definition) into the array of `{ key, value }` pairs that
+ * `CustomHarnessForm` and `EnvEditor` work with.
+ *
+ * Used when opening the edit form for an existing custom harness so that
+ * existing env vars are pre-filled instead of silently reset to empty.
+ */
+export function envPairsFromRecord(
+  record: Record<string, string> | undefined,
+): Array<{ key: string; value: string }> {
+  if (!record) return [];
+  return Object.entries(record).map(([key, value]) => ({ key, value }));
+}
+
+/**
+ * Remove empty/whitespace-only argument rows from the args list before
+ * sending to the backend.  Preserves legitimate blank-string args only
+ * when they contain non-whitespace content so quoted/complex args are
+ * never silently dropped.
+ */
+export function filterArgs(args: ReadonlyArray<string>): string[] {
+  return args.filter((a) => a.trim() !== "");
+}
+
+/** Form state for the custom-harness create/edit form. */
+export interface CustomFormValues {
+  id: string;
+  label: string;
+  command: string;
+  /** Each element is one argument; no space-splitting round-trip. */
+  args: string[];
+  /** KEY=VALUE pairs for env injection at spawn time. */
+  env: Array<{ key: string; value: string }>;
+  installInstructionsUrl: string;
+  installHint: string;
+}
+
+/** The subset of a catalog entry that seeds the edit form. */
+export interface EditableCatalogEntry {
+  id: string;
+  label: string;
+  command: string | null;
+  defaultArgs: string[] | undefined;
+  definitionEnv?: Record<string, string>;
+  installInstructionsUrl: string;
+  installHint: string;
+}
+
+/** Definition payload sent to `save_custom_harness`. */
+export interface HarnessDefinitionPayload {
+  id: string;
+  label: string;
+  command: string;
+  args: string[];
+  env: Record<string, string>;
+  installInstructionsUrl: string;
+  installHint: string;
+}
+
+/**
+ * Seed form values from an existing catalog entry (edit flow).
+ *
+ * This is the single source of truth for edit initialization: every
+ * user-editable definition field must appear here, or an open-edit-then-save
+ * silently erases it. `formValuesRoundTrip` in the tests proves the
+ * entry → form → save-payload loop is lossless.
+ */
+export function formValuesFromCatalogEntry(
+  entry: EditableCatalogEntry,
+): CustomFormValues {
+  return {
+    id: entry.id,
+    label: entry.label,
+    command: entry.command ?? "",
+    args: entry.defaultArgs ?? [],
+    env: envPairsFromRecord(entry.definitionEnv),
+    installInstructionsUrl: entry.installInstructionsUrl,
+    installHint: entry.installHint,
+  };
+}
+
+/** Build the `save_custom_harness` definition payload from form values. */
+export function definitionFromFormValues(
+  form: CustomFormValues,
+): HarnessDefinitionPayload {
+  return {
+    id: form.id.trim(),
+    label: form.label.trim(),
+    command: form.command.trim(),
+    args: filterArgs(form.args),
+    env: buildEnvRecord(form.env),
+    installInstructionsUrl: form.installInstructionsUrl.trim(),
+    installHint: form.installHint.trim(),
+  };
+}
+
+/**
+ * Client-side mirror of the backend comma-in-args rejection.
+ *
+ * Args travel to the harness through the comma-delimited
+ * `BUZZ_ACP_AGENT_ARGS` env transport (clap `value_delimiter = ','` on the
+ * buzz-acp side), so a literal comma inside one argument would silently split
+ * into two at spawn time. The backend validator rejects it; this mirror gives
+ * the user an inline error naming the offending argument before the round-trip.
+ *
+ * Returns the error message, or `null` when all args are comma-free.
+ */
+export function commaArgError(args: ReadonlyArray<string>): string | null {
+  const offender = args.find((a) => a.includes(","));
+  if (offender === undefined) return null;
+  return `Argument "${offender}" contains a comma — arguments are passed via a comma-delimited transport and would be split at spawn time. Use separate argument entries instead.`;
+}
diff --git a/desktop/src/features/settings/ui/harnessGalleryLogic.test.mjs b/desktop/src/features/settings/ui/harnessGalleryLogic.test.mjs
new file mode 100644
index 0000000000..cbf8b6d353
--- /dev/null
+++ b/desktop/src/features/settings/ui/harnessGalleryLogic.test.mjs
@@ -0,0 +1,181 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+
+import {
+  isEditableEntry,
+  countAgentsReferencingHarness,
+  deleteHarnessConfirmMessage,
+  deleteConfirmState,
+} from "./harnessGalleryLogic.ts";
+
+// ── Minimal catalog entry factory ────────────────────────────────────────────
+
+function entry(overrides = {}) {
+  return {
+    id: overrides.id ?? "test-id",
+    label: overrides.label ?? "Test",
+    source: overrides.source ?? "custom",
+    availability: overrides.availability ?? "not_installed",
+    avatarUrl: "",
+    command: overrides.command ?? null,
+    binaryPath: null,
+    defaultArgs: [],
+    mcpCommand: null,
+    modelEnvVar: null,
+    providerEnvVar: null,
+    thinkingEnvVar: null,
+    installHint: "",
+    installInstructionsUrl: "",
+    canAutoInstall: false,
+    underlyingCliPath: null,
+    nodeRequired: false,
+    authStatus: { status: "not_applicable" },
+    loginHint: null,
+  };
+}
+
+// ── isEditableEntry ───────────────────────────────────────────────────────────
+
+describe("isEditableEntry", () => {
+  it("returns true for custom entries", () => {
+    assert.ok(isEditableEntry(entry({ source: "custom" })));
+  });
+
+  it("returns false for preset entries", () => {
+    assert.ok(!isEditableEntry(entry({ source: "preset" })));
+  });
+
+  it("returns false for builtin entries", () => {
+    assert.ok(!isEditableEntry(entry({ source: "builtin" })));
+  });
+});
+
+// ── countAgentsReferencingHarness ─────────────────────────────────────────────
+
+describe("countAgentsReferencingHarness", () => {
+  it("counts direct record-level runtime pins", () => {
+    const agents = [
+      { runtime: "my-harness", personaId: null },
+      { runtime: "other", personaId: null },
+      { runtime: "my-harness", personaId: "p1" },
+    ];
+    assert.equal(countAgentsReferencingHarness("my-harness", agents, []), 2);
+  });
+
+  it("counts persona-inherited references when record runtime is null", () => {
+    const agents = [{ runtime: null, personaId: "p1" }];
+    const personas = [{ id: "p1", runtime: "my-harness" }];
+    assert.equal(
+      countAgentsReferencingHarness("my-harness", agents, personas),
+      1,
+    );
+  });
+
+  it("record-level pin shadows persona runtime (no double counting, pin wins)", () => {
+    // Agent pinned to "other" whose persona uses "my-harness" does NOT count:
+    // the effective harness is the pin.
+    const agents = [{ runtime: "other", personaId: "p1" }];
+    const personas = [{ id: "p1", runtime: "my-harness" }];
+    assert.equal(
+      countAgentsReferencingHarness("my-harness", agents, personas),
+      0,
+    );
+  });
+
+  it("agents with no runtime and no persona do not count", () => {
+    const agents = [{ runtime: null, personaId: null }];
+    assert.equal(countAgentsReferencingHarness("my-harness", agents, []), 0);
+  });
+
+  it("persona reference to a different harness does not count", () => {
+    const agents = [{ runtime: null, personaId: "p1" }];
+    const personas = [{ id: "p1", runtime: "other" }];
+    assert.equal(
+      countAgentsReferencingHarness("my-harness", agents, personas),
+      0,
+    );
+  });
+});
+
+// ── deleteHarnessConfirmMessage ───────────────────────────────────────────────
+
+describe("deleteHarnessConfirmMessage", () => {
+  it("plain confirmation when nothing references the harness", () => {
+    assert.equal(
+      deleteHarnessConfirmMessage("My Harness", 0),
+      "Delete My Harness?",
+    );
+  });
+
+  it("singular copy for one referencing agent", () => {
+    assert.equal(
+      deleteHarnessConfirmMessage("My Harness", 1),
+      "1 agent uses this harness and will stop launching. Delete My Harness?",
+    );
+  });
+
+  it("plural copy for multiple referencing agents", () => {
+    assert.equal(
+      deleteHarnessConfirmMessage("My Harness", 3),
+      "3 agents use this harness and will stop launching. Delete My Harness?",
+    );
+  });
+});
+
+// ── deleteConfirmState ────────────────────────────────────────────────────────
+
+describe("deleteConfirmState", () => {
+  const settled = (data) => ({ isPending: false, isError: false, data });
+  const pending = { isPending: true, isError: false, data: undefined };
+  const failed = { isPending: false, isError: true, data: undefined };
+
+  it("disables confirm while agents query is still loading", () => {
+    const state = deleteConfirmState("h1", "My Harness", pending, settled([]));
+    assert.equal(state.canConfirm, false);
+    assert.match(state.message, /Checking which agents/);
+  });
+
+  it("disables confirm while personas query is still loading", () => {
+    const state = deleteConfirmState("h1", "My Harness", settled([]), pending);
+    assert.equal(state.canConfirm, false);
+    assert.match(state.message, /Checking which agents/);
+  });
+
+  it("query failure does not claim zero dependents", () => {
+    const state = deleteConfirmState("h1", "My Harness", failed, settled([]));
+    assert.equal(state.canConfirm, true);
+    assert.match(state.message, /Couldn't check/);
+    assert.doesNotMatch(state.message, /^Delete My Harness\?$/);
+  });
+
+  it("persona query failure also reports unknown blast radius", () => {
+    const state = deleteConfirmState("h1", "My Harness", settled([]), failed);
+    assert.equal(state.canConfirm, true);
+    assert.match(state.message, /Couldn't check/);
+  });
+
+  it("settled queries produce the counted warning and enable confirm", () => {
+    const agents = settled([
+      { runtime: "h1", personaId: null },
+      { runtime: null, personaId: "p1" },
+    ]);
+    const personas = settled([{ id: "p1", runtime: "h1" }]);
+    const state = deleteConfirmState("h1", "My Harness", agents, personas);
+    assert.equal(state.canConfirm, true);
+    assert.equal(
+      state.message,
+      "2 agents use this harness and will stop launching. Delete My Harness?",
+    );
+  });
+
+  it("settled queries with zero dependents use the plain confirmation", () => {
+    const state = deleteConfirmState(
+      "h1",
+      "My Harness",
+      settled([]),
+      settled([]),
+    );
+    assert.equal(state.canConfirm, true);
+    assert.equal(state.message, "Delete My Harness?");
+  });
+});
diff --git a/desktop/src/features/settings/ui/harnessGalleryLogic.ts b/desktop/src/features/settings/ui/harnessGalleryLogic.ts
new file mode 100644
index 0000000000..0c67ebf65d
--- /dev/null
+++ b/desktop/src/features/settings/ui/harnessGalleryLogic.ts
@@ -0,0 +1,109 @@
+/**
+ * Pure logic helpers for custom-harness deletion (blast-radius confirmation).
+ *
+ * Extracted for deterministic unit-testing — no React, no Tauri, no network.
+ */
+
+import type { AcpRuntimeCatalogEntry } from "@/shared/api/types";
+
+/**
+ * Returns true iff the given catalog entry is editable by the user.
+ * Only `source === "custom"` entries are editable/deletable.
+ */
+export function isEditableEntry(entry: AcpRuntimeCatalogEntry): boolean {
+  return entry.source === "custom";
+}
+
+/**
+ * Count managed agents whose effective harness is the given definition id —
+ * either a direct record-level `runtime` pin, or inheritance from a linked
+ * persona whose `runtime` is that id.
+ *
+ * Drives the delete-confirmation copy: deleting a harness that agents still
+ * reference is allowed (blocking would turn cleanup into dependency
+ * untangling), but the user is told those agents will stop launching.
+ */
+export function countAgentsReferencingHarness(
+  harnessId: string,
+  agents: ReadonlyArray<{ runtime: string | null; personaId: string | null }>,
+  personas: ReadonlyArray<{ id: string; runtime: string | null }>,
+): number {
+  const personaRuntime = new Map(personas.map((p) => [p.id, p.runtime]));
+  return agents.filter((agent) => {
+    if (agent.runtime !== null) return agent.runtime === harnessId;
+    if (agent.personaId === null) return false;
+    return personaRuntime.get(agent.personaId) === harnessId;
+  }).length;
+}
+
+/**
+ * Confirmation copy for deleting a custom harness. Names the blast radius
+ * when agents still reference the definition; stays quiet when none do.
+ */
+export function deleteHarnessConfirmMessage(
+  label: string,
+  referencingAgents: number,
+): string {
+  if (referencingAgents === 0) return `Delete ${label}?`;
+  const noun = referencingAgents === 1 ? "agent uses" : "agents use";
+  return `${referencingAgents} ${noun} this harness and will stop launching. Delete ${label}?`;
+}
+
+/** Minimal query-state shape consumed by `deleteConfirmState` — matches the
+ * relevant subset of a TanStack `useQuery` result so the logic stays pure. */
+export type BlastRadiusQuery<T> = {
+  /** True during the initial fetch (no data yet). */
+  isPending: boolean;
+  isError: boolean;
+  data: T | undefined;
+};
+
+export type DeleteConfirmState = {
+  /** False while the blast radius is still unknown — the destructive button
+   * must be disabled so a quick click can't beat the warning. */
+  canConfirm: boolean;
+  message: string;
+};
+
+/**
+ * Drive the delete-confirmation UI from the two blast-radius queries.
+ *
+ * - While either query is initial-loading, confirmation is DISABLED and the
+ *   copy says so: the promised "N agents will stop launching" warning must
+ *   render before the destructive action is clickable.
+ * - On query failure, deletion stays possible (blocking cleanup on a failed
+ *   read would be worse) but the copy states the count is unknown — it never
+ *   silently claims zero dependents.
+ */
+export function deleteConfirmState(
+  harnessId: string,
+  label: string,
+  agents: BlastRadiusQuery<
+    ReadonlyArray<{ runtime: string | null; personaId: string | null }>
+  >,
+  personas: BlastRadiusQuery<
+    ReadonlyArray<{ id: string; runtime: string | null }>
+  >,
+): DeleteConfirmState {
+  if (agents.isPending || personas.isPending) {
+    return {
+      canConfirm: false,
+      message: "Checking which agents use this harness…",
+    };
+  }
+  if (agents.isError || personas.isError) {
+    return {
+      canConfirm: true,
+      message: `Couldn't check which agents use this harness — some agents may stop launching. Delete ${label}?`,
+    };
+  }
+  const count = countAgentsReferencingHarness(
+    harnessId,
+    agents.data ?? [],
+    personas.data ?? [],
+  );
+  return {
+    canConfirm: true,
+    message: deleteHarnessConfirmMessage(label, count),
+  };
+}
diff --git a/desktop/src/features/sidebar/ui/AppSidebar.tsx b/desktop/src/features/sidebar/ui/AppSidebar.tsx
index b40f56b042..55f467f215 100644
--- a/desktop/src/features/sidebar/ui/AppSidebar.tsx
+++ b/desktop/src/features/sidebar/ui/AppSidebar.tsx
@@ -562,7 +562,9 @@ export function AppSidebar({
       variant="sidebar"
     >
       <div
-        className="relative flex min-h-0 flex-1 flex-col overflow-hidden"
+        className={`relative flex min-h-0 flex-1 flex-col overflow-hidden ${
+          communities.length > 1 ? "md:-ml-[11px] md:w-[calc(100%+11px)]" : ""
+        }`}
         data-sidebar-background
         data-testid="app-sidebar-scroll-anchor"
       >
diff --git a/desktop/src/features/sidebar/ui/AppSidebarPinnedHeader.tsx b/desktop/src/features/sidebar/ui/AppSidebarPinnedHeader.tsx
index 50298a92d1..a673492ef1 100644
--- a/desktop/src/features/sidebar/ui/AppSidebarPinnedHeader.tsx
+++ b/desktop/src/features/sidebar/ui/AppSidebarPinnedHeader.tsx
@@ -91,7 +91,7 @@ export function AppSidebarPrimaryMenu({
 }: AppSidebarPrimaryMenuProps) {
   return (
     <SidebarHeader
-      className="cursor-default select-none px-2 pb-0 pt-0"
+      className="relative z-40 cursor-default select-none px-2 pb-0 pt-0"
       data-tauri-drag-region
       data-testid="sidebar-primary-menu"
     >
diff --git a/desktop/src/features/sidebar/ui/CommunityRail.tsx b/desktop/src/features/sidebar/ui/CommunityRail.tsx
index 86d632398b..386ee20691 100644
--- a/desktop/src/features/sidebar/ui/CommunityRail.tsx
+++ b/desktop/src/features/sidebar/ui/CommunityRail.tsx
@@ -37,8 +37,6 @@ import {
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/shared/ui/tooltip";
 import { cn } from "@/shared/lib/cn";
 import { getInitials } from "@/shared/lib/initials";
-import { isMacPlatform } from "@/shared/lib/platform";
-import { useIsFullscreen } from "@/shared/lib/useIsFullscreen";
 import { writeTextToClipboard } from "@/shared/lib/clipboard";
 
 type CommunityRailProps = {
@@ -315,7 +313,6 @@ export function CommunityRail({
     activeCommunityId,
   );
   const iconsByCommunity = useCommunityIcons(communities);
-  const isFullscreen = useIsFullscreen();
   const { markAllChannelsRead, onOpenSettings } = useAppShell();
   const myMembershipQuery = useMyRelayMembershipLookupQuery();
   const activeRole = myMembershipQuery.data?.membership?.role;
@@ -370,19 +367,10 @@ export function CommunityRail({
     });
   };
 
-  // macOS traffic lights overlay the top-left, so start buttons below them (they hide in fullscreen).
-  const topPaddingClass =
-    isMacPlatform() && !isFullscreen
-      ? "pt-(--buzz-top-chrome-height,40px)"
-      : "pt-3";
-
   return (
     <nav
       aria-label="Communities"
-      className={cn(
-        "flex w-12 shrink-0 flex-col items-center gap-2 overflow-y-auto bg-sidebar pb-3",
-        topPaddingClass,
-      )}
+      className="relative z-20 flex w-14 shrink-0 flex-col items-center gap-2 overflow-y-auto bg-sidebar px-2.5 pb-5 pt-[calc(var(--buzz-top-chrome-height,40px)+7px)]"
       data-testid="community-rail"
     >
       <DndContext
diff --git a/desktop/src/features/sidebar/ui/sidebarLoadingSkeleton.tsx b/desktop/src/features/sidebar/ui/sidebarLoadingSkeleton.tsx
index 8db31bf044..53222b32d3 100644
--- a/desktop/src/features/sidebar/ui/sidebarLoadingSkeleton.tsx
+++ b/desktop/src/features/sidebar/ui/sidebarLoadingSkeleton.tsx
@@ -2,6 +2,7 @@ import * as React from "react";
 
 import type { Channel } from "@/shared/api/types";
 import { cn } from "@/shared/lib/cn";
+import { setLocalStorageItemWithRecovery } from "@/shared/lib/localStorageQuota";
 import {
   SidebarGroup,
   SidebarGroupContent,
@@ -36,6 +37,7 @@ type SidebarLoadingShape = {
 };
 
 type SidebarLoadingCachePayload = SidebarLoadingShape & {
+  updatedAt: number;
   version: 1;
 };
 
@@ -130,11 +132,12 @@ function writeSidebarLoadingShape(
   const payload: SidebarLoadingCachePayload = {
     channels: shape.channels.slice(0, 3),
     directMessages: shape.directMessages.slice(0, 2),
+    updatedAt: Date.now(),
     version: 1,
   };
 
   try {
-    window.localStorage.setItem(cacheKey, JSON.stringify(payload));
+    setLocalStorageItemWithRecovery(cacheKey, JSON.stringify(payload));
   } catch {
     // localStorage can be unavailable or full in embedded webviews.
   }
diff --git a/desktop/src/features/sidebar/ui/useSidebarRelayConnectionCard.ts b/desktop/src/features/sidebar/ui/useSidebarRelayConnectionCard.ts
index f92e1a02e8..11f2bd1064 100644
--- a/desktop/src/features/sidebar/ui/useSidebarRelayConnectionCard.ts
+++ b/desktop/src/features/sidebar/ui/useSidebarRelayConnectionCard.ts
@@ -63,6 +63,7 @@ function isDocumentVisible() {
 export function useSidebarRelayConnectionCard(
   errorMessage?: string,
   relayUrl?: string | null,
+  relayLifecycleKey = relaySuccessKey(relayUrl),
 ) {
   const relayConnectionState = useRelayConnection();
   const hasRelayUnreachableError = errorMessage
@@ -79,7 +80,6 @@ export function useSidebarRelayConnectionCard(
     relayConnectionState === "stalled" ||
     (relayConnectionState === "disconnected" && !hasNonUnreachableError);
   const isRelayConnectionConnected = relayConnectionState === "connected";
-  const isRelayConnectionDisconnected = relayConnectionState === "disconnected";
   const [isDismissed, setIsDismissed] = React.useState(false);
   const hasSuccess = React.useSyncExternalStore(
     subscribeRelayConnectivitySuccess,
@@ -95,6 +95,8 @@ export function useSidebarRelayConnectionCard(
   const isRelayConnectionSuccess = hasSuccess && isRelayConnectionConnected;
   const canShow = isRelayConnectionActuallyDegraded || isRelayConnectionSuccess;
   const show = canShow && !isDismissed;
+  const outageActiveRef = React.useRef(false);
+  const outageRelayLifecycleKeyRef = React.useRef(relayLifecycleKey);
   const wasProblemCardVisibleRef = React.useRef(false);
   const {
     isPending: isReconnectPending,
@@ -111,30 +113,41 @@ export function useSidebarRelayConnectionCard(
     isReconnectPending || connectivityAction === "relay-connection";
 
   React.useEffect(() => {
-    if (!isRelayConnectionActuallyDegraded && !isRelayConnectionSuccess) {
+    if (outageRelayLifecycleKeyRef.current !== relayLifecycleKey) {
+      outageRelayLifecycleKeyRef.current = relayLifecycleKey;
+      outageActiveRef.current = false;
+      wasProblemCardVisibleRef.current = false;
       setIsDismissed(false);
     }
-  }, [isRelayConnectionSuccess, isRelayConnectionActuallyDegraded]);
 
-  React.useEffect(() => {
-    if (isRelayConnectionStateDegraded || isRelayConnectionDisconnected) {
-      setRelayConnectivitySuccess(relayUrl, false);
+    if (relayConnectionState === "idle") {
+      outageActiveRef.current = false;
+      wasProblemCardVisibleRef.current = false;
       setIsDismissed(false);
+      return;
     }
-  }, [isRelayConnectionDisconnected, isRelayConnectionStateDegraded, relayUrl]);
 
-  React.useEffect(() => {
     if (isRelayConnectionActuallyDegraded) {
+      if (!outageActiveRef.current) {
+        outageActiveRef.current = true;
+        setRelayConnectivitySuccess(relayUrl, false);
+        setIsDismissed(false);
+      }
       wasProblemCardVisibleRef.current = show && !isRelayConnectionSuccess;
       return;
     }
 
-    if (wasProblemCardVisibleRef.current && isRelayConnectionConnected) {
-      wasProblemCardVisibleRef.current = false;
-      setRelayConnectivitySuccess(relayUrl, true);
+    if (outageActiveRef.current && isRelayConnectionConnected) {
+      outageActiveRef.current = false;
+      if (wasProblemCardVisibleRef.current) {
+        wasProblemCardVisibleRef.current = false;
+        setRelayConnectivitySuccess(relayUrl, true);
+      }
     }
   }, [
     isRelayConnectionSuccess,
+    relayLifecycleKey,
+    relayConnectionState,
     relayUrl,
     show,
     isRelayConnectionActuallyDegraded,
diff --git a/desktop/src/main.tsx b/desktop/src/main.tsx
index abc9916b3b..890ef72226 100644
--- a/desktop/src/main.tsx
+++ b/desktop/src/main.tsx
@@ -13,6 +13,7 @@ import { EmojiBurstProvider } from "@/shared/ui/EmojiBurstProvider";
 import { PoofBurstProvider } from "@/shared/ui/PoofBurstProvider";
 import { Toaster } from "@/shared/ui/sonner";
 import { TooltipProvider } from "@/shared/ui/tooltip";
+import { recoverLocalStorageQuotaOnStartup } from "@/shared/lib/localStorageQuota";
 
 type E2eWindow = Window & {
   __BUZZ_E2E__?: unknown;
@@ -110,6 +111,7 @@ async function installE2eBridgeIfConfigured() {
 async function bootstrap() {
   resetDevWebviewStateFromUrl();
   configureDevE2eBridgeFromUrl();
+  recoverLocalStorageQuotaOnStartup();
   await installE2eBridgeIfConfigured();
   await migrateLegacyCommunityStorageBeforeRender();
   renderApp();
diff --git a/desktop/src/shared/api/agentModels.ts b/desktop/src/shared/api/agentModels.ts
index 892d2314f0..b59a958617 100644
--- a/desktop/src/shared/api/agentModels.ts
+++ b/desktop/src/shared/api/agentModels.ts
@@ -7,6 +7,8 @@ export type DiscoverAgentModelsInput = {
   agentArgs?: string[];
   provider?: string;
   envVars?: Record<string, string>;
+  /** Definition-level env from the harness definition (custom/preset). Merged below user envVars. */
+  definitionEnv?: Record<string, string>;
 };
 
 export async function discoverAgentModels(input: DiscoverAgentModelsInput) {
diff --git a/desktop/src/shared/api/inviteHelpers.test.mjs b/desktop/src/shared/api/inviteHelpers.test.mjs
index bdb62aa3a2..895abfbb7d 100644
--- a/desktop/src/shared/api/inviteHelpers.test.mjs
+++ b/desktop/src/shared/api/inviteHelpers.test.mjs
@@ -3,6 +3,7 @@ import test from "node:test";
 
 import {
   inviteErrorMessage,
+  isInviteExhaustedError,
   isInviteExpiredError,
   relayHttpFromWs,
 } from "./inviteHelpers.ts";
@@ -34,3 +35,9 @@ test("invite expiry sentinel is recognized without hiding other errors", () => {
     "network unavailable",
   );
 });
+
+test("invite exhaustion sentinel is recognized distinctly from expiry", () => {
+  assert.equal(isInviteExhaustedError(new Error("invite_exhausted")), true);
+  assert.equal(isInviteExhaustedError(new Error("invite_expired")), false);
+  assert.equal(isInviteExhaustedError(new Error("invite_invalid")), false);
+});
diff --git a/desktop/src/shared/api/inviteHelpers.ts b/desktop/src/shared/api/inviteHelpers.ts
index 11ea60cc7e..2b5efe4e94 100644
--- a/desktop/src/shared/api/inviteHelpers.ts
+++ b/desktop/src/shared/api/inviteHelpers.ts
@@ -1,4 +1,5 @@
 export const INVITE_EXPIRED_ERROR = "invite_expired";
+export const INVITE_EXHAUSTED_ERROR = "invite_exhausted";
 
 /**
  * Parsed invite — either a full (relay + code) or bare-code form.
@@ -89,3 +90,7 @@ export function inviteErrorMessage(error: unknown): string {
 export function isInviteExpiredError(error: unknown): boolean {
   return inviteErrorMessage(error) === INVITE_EXPIRED_ERROR;
 }
+
+export function isInviteExhaustedError(error: unknown): boolean {
+  return inviteErrorMessage(error) === INVITE_EXHAUSTED_ERROR;
+}
diff --git a/desktop/src/shared/api/invites.test.mjs b/desktop/src/shared/api/invites.test.mjs
index eb4ca3dad1..eb3754435e 100644
--- a/desktop/src/shared/api/invites.test.mjs
+++ b/desktop/src/shared/api/invites.test.mjs
@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { getJoinPolicy } from "./invites.ts";
+import { getJoinPolicy, mintInvite } from "./invites.ts";
 
 function withFetch(response, run) {
   const originalFetch = globalThis.fetch;
@@ -28,7 +28,7 @@ test("getJoinPolicy maps relay-hosted Markdown and age requirements", async () =
       { status: 200 },
     ),
     async () => {
-      assert.deepEqual(await getJoinPolicy("wss://relay.example"), {
+      assert.deepEqual(await getJoinPolicy("wss://relay.example", "webview"), {
         termsMarkdown: "# Terms",
         privacyMarkdown: "# Privacy",
         ageAttestationRequired: true,
@@ -40,15 +40,172 @@ test("getJoinPolicy maps relay-hosted Markdown and age requirements", async () =
 
 test("getJoinPolicy preserves opt-in behavior for unconfigured and older relays", async () => {
   await withFetch(new Response(JSON.stringify({}), { status: 200 }), async () =>
-    assert.equal(await getJoinPolicy("wss://relay.example"), null),
+    assert.equal(await getJoinPolicy("wss://relay.example", "webview"), null),
   );
   await withFetch(new Response(null, { status: 404 }), async () =>
-    assert.equal(await getJoinPolicy("wss://relay.example"), null),
+    assert.equal(await getJoinPolicy("wss://relay.example", "webview"), null),
   );
 });
 
 test("getJoinPolicy fails closed on a policy endpoint error", async () => {
   await withFetch(new Response(null, { status: 503 }), async () =>
-    assert.rejects(getJoinPolicy("wss://relay.example"), /HTTP 503/),
+    assert.rejects(getJoinPolicy("wss://relay.example", "webview"), /HTTP 503/),
   );
 });
+
+test("getJoinPolicy maps the native command response", async () => {
+  const previousWindow = globalThis.window;
+  globalThis.window = {
+    __TAURI_INTERNALS__: {
+      invoke(command, args) {
+        assert.equal(command, "fetch_join_policy");
+        assert.deepEqual(args, { relayUrl: "wss://relay.example" });
+        return Promise.resolve({
+          terms_markdown: "# Terms",
+          privacy_markdown: "# Privacy",
+          age_attestation_required: true,
+          version: "policy-v1",
+        });
+      },
+    },
+  };
+
+  try {
+    assert.deepEqual(await getJoinPolicy("wss://relay.example", "native"), {
+      termsMarkdown: "# Terms",
+      privacyMarkdown: "# Privacy",
+      ageAttestationRequired: true,
+      version: "policy-v1",
+    });
+  } finally {
+    globalThis.window = previousWindow;
+  }
+});
+
+// --- mintInvite serialization ---
+
+// The test-loader transpiles TS imports. tauri.ts imports `invoke` from
+// @tauri-apps/api/core, which calls `window.__TAURI_INTERNALS__.invoke`.
+// We stub that here so getRelayHttpUrl() and signRelayEvent() work in node.
+
+function setupTauriStubs(
+  httpBase,
+  authEvent = {
+    id: "x",
+    sig: "y",
+    pubkey: "z",
+    kind: 27235,
+    created_at: 1,
+    tags: [],
+  },
+) {
+  const calls = { invokeArgs: [] };
+  globalThis.window = globalThis.window ?? {};
+  globalThis.window.__TAURI_INTERNALS__ = {
+    invoke: async (command, args) => {
+      calls.invokeArgs.push({ command, args });
+      if (command === "get_relay_http_url") return httpBase;
+      if (command === "sign_event") return JSON.stringify(authEvent);
+      throw new Error(`Unexpected Tauri command: ${command}`);
+    },
+  };
+  return calls;
+}
+
+function teardownTauriStubs() {
+  delete globalThis.window.__TAURI_INTERNALS__;
+}
+
+test("mintInvite serializes bounded max_uses in the request body", async () => {
+  setupTauriStubs("https://relay.example");
+  try {
+    const originalFetch = globalThis.fetch;
+    let capturedBody;
+    globalThis.fetch = async (_url, init) => {
+      capturedBody = JSON.parse(init.body);
+      return new Response(
+        JSON.stringify({
+          code: "v2.abc123",
+          expires_at: 1785100000,
+          url: "https://relay.example/invite/v2.abc123",
+          max_uses: 10,
+          uses_remaining: 10,
+        }),
+      );
+    };
+    try {
+      const result = await mintInvite({ ttlSecs: 259200, maxUses: 10 });
+      assert.equal(capturedBody.ttl_secs, 259200);
+      assert.equal(capturedBody.max_uses, 10);
+      assert.equal(result.code, "v2.abc123");
+      assert.equal(result.maxUses, 10);
+      assert.equal(result.usesRemaining, 10);
+      assert.equal(result.expiresAt, 1785100000);
+      assert.equal(result.url, "https://relay.example/invite/v2.abc123");
+    } finally {
+      globalThis.fetch = originalFetch;
+    }
+  } finally {
+    teardownTauriStubs();
+  }
+});
+
+test("mintInvite omits max_uses when null (unlimited)", async () => {
+  setupTauriStubs("https://relay.example");
+  try {
+    const originalFetch = globalThis.fetch;
+    let capturedBody;
+    globalThis.fetch = async (_url, init) => {
+      capturedBody = JSON.parse(init.body);
+      return new Response(
+        JSON.stringify({
+          code: "v2.abc123",
+          expires_at: 1785100000,
+          url: "https://relay.example/invite/v2.abc123",
+          max_uses: null,
+          uses_remaining: null,
+        }),
+      );
+    };
+    try {
+      const result = await mintInvite({ ttlSecs: 259200, maxUses: null });
+      assert.equal(capturedBody.ttl_secs, 259200);
+      assert.equal(Object.hasOwn(capturedBody, "max_uses"), false);
+      assert.equal(result.maxUses, null);
+      assert.equal(result.usesRemaining, null);
+    } finally {
+      globalThis.fetch = originalFetch;
+    }
+  } finally {
+    teardownTauriStubs();
+  }
+});
+
+test("mintInvite omits max_uses when not provided (unlimited default)", async () => {
+  setupTauriStubs("https://relay.example");
+  try {
+    const originalFetch = globalThis.fetch;
+    let capturedBody;
+    globalThis.fetch = async (_url, init) => {
+      capturedBody = JSON.parse(init.body);
+      return new Response(
+        JSON.stringify({
+          code: "v2.abc123",
+          expires_at: 1785100000,
+          url: "https://relay.example/invite/v2.abc123",
+          max_uses: null,
+          uses_remaining: null,
+        }),
+      );
+    };
+    try {
+      await mintInvite({ ttlSecs: 86400 });
+      assert.equal(capturedBody.ttl_secs, 86400);
+      assert.equal(Object.hasOwn(capturedBody, "max_uses"), false);
+    } finally {
+      globalThis.fetch = originalFetch;
+    }
+  } finally {
+    teardownTauriStubs();
+  }
+});
diff --git a/desktop/src/shared/api/invites.ts b/desktop/src/shared/api/invites.ts
index ae03c71ada..d0a3c2ed2c 100644
--- a/desktop/src/shared/api/invites.ts
+++ b/desktop/src/shared/api/invites.ts
@@ -1,5 +1,9 @@
 import { relayHttpFromWs } from "@/shared/api/inviteHelpers";
-import { getRelayHttpUrl, signRelayEvent } from "@/shared/api/tauri";
+import {
+  getRelayHttpUrl,
+  invokeTauri,
+  signRelayEvent,
+} from "@/shared/api/tauri";
 
 // Relay invite data layer. Both endpoints are NIP-98-authed HTTP POSTs
 // (mirrors the read path in moderation.ts, plus the payload tag the relay
@@ -21,6 +25,8 @@ export type MintedInvite = {
   code: string;
   expiresAt: number;
   url: string;
+  maxUses: number | null;
+  usesRemaining: number | null;
 };
 
 export type JoinPolicy = {
@@ -124,26 +130,38 @@ export function isJoinPolicyDiscoveryCandidate(relayWsUrl: string): boolean {
 /** Fetch relay-hosted policy content for any join surface. */
 export async function getJoinPolicy(
   relayWsUrl: string,
+  transport: "native" | "webview",
 ): Promise<JoinPolicy | null> {
-  const base = relayHttpFromWs(relayWsUrl);
-  const response = await fetch(`${base.replace(/\/+$/, "")}/api/join-policy`);
-  // Relays predating join-policy support have no configured policy.
-  if (response.status === 404) return null;
-  if (!response.ok) throw new Error(`HTTP ${response.status}`);
-  const raw = (await response.json()) as {
-    policy?: {
-      terms_markdown?: string;
-      privacy_markdown?: string;
-      age_attestation_required: boolean;
-      version: string;
-    };
+  type RawJoinPolicy = {
+    terms_markdown?: string;
+    privacy_markdown?: string;
+    age_attestation_required: boolean;
+    version: string;
   };
-  return raw.policy
+  let raw: RawJoinPolicy | null;
+  if (transport === "native") {
+    raw = await invokeTauri<RawJoinPolicy | null>("fetch_join_policy", {
+      relayUrl: relayWsUrl,
+    });
+  } else {
+    const base = relayHttpFromWs(relayWsUrl);
+    const response = await fetch(`${base.replace(/\/+$/, "")}/api/join-policy`);
+    // Relays predating join-policy support have no configured policy.
+    if (response.status === 404) return null;
+    if (!response.ok) throw new Error(`HTTP ${response.status}`);
+    raw =
+      (
+        (await response.json()) as {
+          policy?: RawJoinPolicy;
+        }
+      ).policy ?? null;
+  }
+  return raw
     ? {
-        termsMarkdown: raw.policy.terms_markdown,
-        privacyMarkdown: raw.policy.privacy_markdown,
-        ageAttestationRequired: raw.policy.age_attestation_required,
-        version: raw.policy.version,
+        termsMarkdown: raw.terms_markdown,
+        privacyMarkdown: raw.privacy_markdown,
+        ageAttestationRequired: raw.age_attestation_required,
+        version: raw.version,
       }
     : null;
 }
@@ -173,15 +191,29 @@ export async function acceptJoinPolicy(
 }
 
 /** Mint an invite code on the active community's relay (owner/admin only). */
-export async function mintInvite(ttlSecs?: number): Promise<MintedInvite> {
+export async function mintInvite(options?: {
+  ttlSecs?: number;
+  maxUses?: number | null;
+}): Promise<MintedInvite> {
   const base = await getRelayHttpUrl();
-  const body = JSON.stringify(ttlSecs ? { ttl_secs: ttlSecs } : {});
+  const payload: Record<string, unknown> = {};
+  if (options?.ttlSecs != null) payload.ttl_secs = options.ttlSecs;
+  if (options?.maxUses != null) payload.max_uses = options.maxUses;
+  const body = JSON.stringify(payload);
   const raw = await invitePost<{
     code: string;
     expires_at: number;
     url: string;
+    max_uses: number | null;
+    uses_remaining: number | null;
   }>(base, "/api/invites", body);
-  return { code: raw.code, expiresAt: raw.expires_at, url: raw.url };
+  return {
+    code: raw.code,
+    expiresAt: raw.expires_at,
+    url: raw.url,
+    maxUses: raw.max_uses,
+    usesRemaining: raw.uses_remaining,
+  };
 }
 
 /**
diff --git a/desktop/src/shared/api/projectGit.ts b/desktop/src/shared/api/projectGit.ts
index db5f31c458..7293db1938 100644
--- a/desktop/src/shared/api/projectGit.ts
+++ b/desktop/src/shared/api/projectGit.ts
@@ -116,6 +116,7 @@ type RawProjectRepoDiff = {
   files: RawProjectRepoDiffFile[];
   additions: number;
   deletions: number;
+  commit_body: string | null;
 };
 
 function fromRawProjectRepoSnapshot(
@@ -192,6 +193,7 @@ export async function getProjectRepoDiff(input: {
   return {
     additions: diff.additions,
     deletions: diff.deletions,
+    commitBody: diff.commit_body,
     files: diff.files.map((file) => ({
       path: file.path,
       additions: file.additions,
@@ -227,6 +229,7 @@ export async function getProjectLocalRepoDiff(input: {
   return {
     additions: diff.additions,
     deletions: diff.deletions,
+    commitBody: diff.commit_body,
     files: diff.files.map((file) => ({
       path: file.path,
       additions: file.additions,
diff --git a/desktop/src/shared/api/projectGitTypes.ts b/desktop/src/shared/api/projectGitTypes.ts
index 44567e99e4..46854eb33e 100644
--- a/desktop/src/shared/api/projectGitTypes.ts
+++ b/desktop/src/shared/api/projectGitTypes.ts
@@ -43,6 +43,7 @@ export type ProjectRepoDiff = {
   files: ProjectRepoDiffFile[];
   additions: number;
   deletions: number;
+  commitBody: string | null;
 };
 
 export type ProjectLocalRepoSnapshot = {
diff --git a/desktop/src/shared/api/relayClientSession.ts b/desktop/src/shared/api/relayClientSession.ts
index b8c861af96..84ee10b68d 100644
--- a/desktop/src/shared/api/relayClientSession.ts
+++ b/desktop/src/shared/api/relayClientSession.ts
@@ -20,14 +20,12 @@ import {
   type RelaySubscriptionFilter,
 } from "@/shared/api/relayClientShared";
 import {
-  AUX_BACKFILL_CHUNK_SIZE,
   buildChannelAuxDeletionFilter,
   buildChannelFilter,
   buildChannelHistoryFilter,
   buildChannelMentionFilter,
   buildGlobalStreamFilter,
 } from "@/shared/api/relayChannelFilters";
-import { collectWithConcurrency } from "@/shared/api/concurrency";
 import {
   clearClosedRetry,
   handleRelayClosed,
@@ -40,7 +38,11 @@ import {
   parseRateLimitHint,
   waitForRateLimit,
 } from "@/shared/api/relayRateLimitGate";
-import { requestHistoryGated } from "@/shared/api/relayGateBoundary";
+import {
+  fetchChunkedHistory,
+  requestFirstEventGated,
+  requestHistoryGated,
+} from "@/shared/api/relayGateBoundary";
 import { RelayConnectionStateEmitter } from "@/shared/api/relayConnectionStateEmitter";
 import {
   isServiceRestartClose,
@@ -53,8 +55,7 @@ import { closeWebSocket } from "@/shared/api/relayWebSocketClose";
 import { buildThreadReferenceTags } from "@/features/messages/lib/threading";
 const RECONNECT_BASE_DELAY_MS = 1_000,
   RECONNECT_MAX_DELAY_MS = 30_000,
-  EVENT_BATCH_MS = 16,
-  AUX_BACKFILL_CONCURRENCY = 4;
+  EVENT_BATCH_MS = 16;
 
 /**
  * Op-level timeout constants. Raised from 8 s to 25 s to survive degraded
@@ -176,7 +177,7 @@ export class RelayClient {
     }
 
     for (const [subId, sub] of this.subscriptions) {
-      if (sub.mode === "history") {
+      if (sub.mode !== "live") {
         window.clearTimeout(sub.timeout);
         sub.reject(error);
       } else {
@@ -224,10 +225,10 @@ export class RelayClient {
       eventIds: string[],
     ) => RelaySubscriptionFilter,
   ) {
-    return this.fetchChunkedAuxEvents(
-      channelId,
+    return fetchChunkedHistory(
       referencedEventIds,
-      buildFilter,
+      (eventIds) => buildFilter(channelId, eventIds),
+      (filter) => this.fetchHistory(filter),
     );
   }
 
@@ -235,10 +236,10 @@ export class RelayClient {
     channelId: string,
     auxEventIds: string[],
   ): Promise<RelayEvent[]> {
-    return this.fetchChunkedAuxEvents(
-      channelId,
+    return fetchChunkedHistory(
       auxEventIds,
-      buildChannelAuxDeletionFilter,
+      (eventIds) => buildChannelAuxDeletionFilter(channelId, eventIds),
+      (filter) => this.fetchHistory(filter),
     );
   }
 
@@ -246,32 +247,21 @@ export class RelayClient {
     return this.fetchHistory(filter);
   }
 
-  private async fetchChunkedAuxEvents(
-    channelId: string,
-    eventIds: string[],
-    buildFilter: (
-      channelId: string,
-      eventIds: string[],
-    ) => RelaySubscriptionFilter,
-  ): Promise<RelayEvent[]> {
-    if (eventIds.length === 0) {
-      return [];
-    }
-
+  /**
+   * Return the first event matching `filter` as soon as it arrives, without
+   * waiting for EOSE. Resolves to `null` when EOSE arrives before any event.
+   */
+  async fetchFirstEvent(
+    filter: RelaySubscriptionFilter,
+  ): Promise<RelayEvent | null> {
     await this.ensureConnected();
-
-    const chunks: string[][] = [];
-    for (let i = 0; i < eventIds.length; i += AUX_BACKFILL_CHUNK_SIZE) {
-      chunks.push(eventIds.slice(i, i + AUX_BACKFILL_CHUNK_SIZE));
-    }
-
-    const batches = await collectWithConcurrency(
-      chunks,
-      AUX_BACKFILL_CONCURRENCY,
-      (ids) => this.requestHistory(buildFilter(channelId, ids)),
+    return requestFirstEventGated(
+      this.subscriptions,
+      (payload) => this.sendRaw(payload),
+      (subId) => this.closeSubscription(subId),
+      filter,
+      HISTORY_TIMEOUT_MS,
     );
-
-    return batches.flat();
   }
 
   private async fetchHistory(filter: RelaySubscriptionFilter) {
@@ -877,6 +867,11 @@ export class RelayClient {
       return;
     }
 
+    if (subscription.mode === "first") {
+      subscription.onEvent(event);
+      return;
+    }
+
     if (!prepareSubscriptionEvent(subscription, event)) return;
     this.eventBuffer.push({ subId, event });
     this.flushTimeout ??= window.setTimeout(
@@ -1068,7 +1063,7 @@ export class RelayClient {
     }
 
     for (const [subId, subscription] of this.subscriptions) {
-      if (subscription.mode === "history") {
+      if (subscription.mode !== "live") {
         window.clearTimeout(subscription.timeout);
         subscription.reject(error);
         this.subscriptions.delete(subId);
diff --git a/desktop/src/shared/api/relayClientShared.ts b/desktop/src/shared/api/relayClientShared.ts
index 596bdde34e..9108f7b6d7 100644
--- a/desktop/src/shared/api/relayClientShared.ts
+++ b/desktop/src/shared/api/relayClientShared.ts
@@ -46,6 +46,14 @@ type HistorySubscription = {
   timeout: number;
 };
 
+type FirstEventSubscription = {
+  mode: "first";
+  onEvent: (event: RelayEvent) => void;
+  resolve: (event: RelayEvent | null) => void;
+  reject: (error: Error) => void;
+  timeout: number;
+};
+
 type LiveSubscription = {
   mode: "live";
   filter: RelaySubscriptionFilter;
@@ -63,7 +71,10 @@ export type PendingEvent = {
   timeout: number;
 };
 
-export type RelaySubscription = HistorySubscription | LiveSubscription;
+export type RelaySubscription =
+  | HistorySubscription
+  | FirstEventSubscription
+  | LiveSubscription;
 
 export function sortEvents(events: RelayEvent[]) {
   return [...events].sort((left, right) => {
diff --git a/desktop/src/shared/api/relayClosedRecovery.test.mjs b/desktop/src/shared/api/relayClosedRecovery.test.mjs
index 90acd6cb2f..c1f7bd98c4 100644
--- a/desktop/src/shared/api/relayClosedRecovery.test.mjs
+++ b/desktop/src/shared/api/relayClosedRecovery.test.mjs
@@ -1,8 +1,14 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { handleRelayClosed } from "./relayClosedRecovery.ts";
-import { requestHistoryGated } from "./relayGateBoundary.ts";
+import {
+  handleRelayClosed,
+  handleSubscriptionEose,
+} from "./relayClosedRecovery.ts";
+import {
+  requestFirstEventGated,
+  requestHistoryGated,
+} from "./relayGateBoundary.ts";
 
 // ── Fake-timer setup ──────────────────────────────────────────────────────────
 // The rate-limit gate and closed-retry logic use window.setTimeout/clearTimeout.
@@ -227,6 +233,33 @@ test("gate armed by rate-limited history CLOSED defers the next REQ until expiry
   assert.ok(sentAt[0] >= 5_001, "REQ must fire only after gate expiry");
 });
 
+test("first-event request resolves null when EOSE arrives without an event", async () => {
+  resetAll(0);
+  const subscriptions = new Map();
+  let requestedSubId = "";
+  const firstEventPromise = requestFirstEventGated(
+    subscriptions,
+    async (payload) => {
+      requestedSubId = payload[1];
+    },
+    async () => {},
+    { kinds: [13_534], limit: 1 },
+    25_000,
+  );
+
+  await Promise.resolve();
+  assert.match(requestedSubId, /^first-/);
+
+  handleSubscriptionEose({
+    subscriptions,
+    subId: requestedSubId,
+    closeSubscription: async () => {},
+  });
+
+  assert.equal(await firstEventPromise, null);
+  assert.equal(subscriptions.has(requestedSubId), false);
+});
+
 test("production CLOSED handler removes terminal live subscriptions", () => {
   let readyCalls = 0;
   const subscriptions = new Map([
diff --git a/desktop/src/shared/api/relayClosedRecovery.ts b/desktop/src/shared/api/relayClosedRecovery.ts
index 7206014eef..fd366671fd 100644
--- a/desktop/src/shared/api/relayClosedRecovery.ts
+++ b/desktop/src/shared/api/relayClosedRecovery.ts
@@ -35,7 +35,7 @@ export function handleRelayClosed({
 }) {
   const subscription = subscriptions.get(subId);
   if (!subscription) return;
-  if (subscription.mode === "history") {
+  if (subscription.mode !== "live") {
     // Classify before rejecting so a `rate-limited:` history CLOSED arms the
     // gate for concurrent ops. A history sub can't be retried (the caller holds
     // the promise), so we still reject immediately after arming.
@@ -133,6 +133,9 @@ export function prepareSubscriptionEvent(
     subscription.events.push(event);
     return false;
   }
+  if (subscription.mode === "first") {
+    return false;
+  }
   subscription.closedRetryAttempt = 0;
   clearClosedRetry(subscription);
   subscription.lastSeenCreatedAt = Math.max(
@@ -163,5 +166,9 @@ export function handleSubscriptionEose({
   window.clearTimeout(subscription.timeout);
   subscriptions.delete(subId);
   void closeSubscription(subId);
-  subscription.resolve(sortEvents(subscription.events));
+  if (subscription.mode === "first") {
+    subscription.resolve(null);
+  } else {
+    subscription.resolve(sortEvents(subscription.events));
+  }
 }
diff --git a/desktop/src/shared/api/relayGateBoundary.ts b/desktop/src/shared/api/relayGateBoundary.ts
index 99782358f2..6cb9c189a8 100644
--- a/desktop/src/shared/api/relayGateBoundary.ts
+++ b/desktop/src/shared/api/relayGateBoundary.ts
@@ -5,6 +5,8 @@
  * the gate-await + op-timeout pattern lives in one place and the op timeout
  * budget starts only after the rate-limit window has cleared.
  */
+import { collectWithConcurrency } from "@/shared/api/concurrency";
+import { AUX_BACKFILL_CHUNK_SIZE } from "@/shared/api/relayChannelFilters";
 import { waitForRateLimit } from "@/shared/api/relayRateLimitGate";
 import type {
   RelaySubscription,
@@ -12,6 +14,8 @@ import type {
 } from "@/shared/api/relayClientShared";
 import type { RelayEvent } from "@/shared/api/types";
 
+const AUX_BACKFILL_CONCURRENCY = 4;
+
 /**
  * Issue a history REQ on `filter`, waiting for any active rate-limit gate
  * before starting the subscription so the op timeout begins only after
@@ -54,3 +58,75 @@ export async function requestHistoryGated(
     });
   });
 }
+
+/**
+ * Issue a REQ that resolves as soon as its first matching event arrives.
+ *
+ * This keeps single-event lookups from waiting for EOSE while still resolving
+ * `null` when the relay completes an empty result set.
+ */
+export async function requestFirstEventGated(
+  subscriptions: Map<string, RelaySubscription>,
+  sendRaw: (payload: unknown[]) => Promise<void>,
+  closeSubscription: (subId: string) => Promise<void>,
+  filter: RelaySubscriptionFilter,
+  historyTimeoutMs: number,
+): Promise<RelayEvent | null> {
+  await waitForRateLimit();
+
+  return new Promise<RelayEvent | null>((resolve, reject) => {
+    const subId = `first-${crypto.randomUUID()}`;
+    const timeout = window.setTimeout(() => {
+      subscriptions.delete(subId);
+      void closeSubscription(subId);
+      reject(new Error("Timed out while loading relay event."));
+    }, historyTimeoutMs);
+
+    subscriptions.set(subId, {
+      mode: "first",
+      onEvent: (event) => {
+        window.clearTimeout(timeout);
+        subscriptions.delete(subId);
+        void closeSubscription(subId);
+        resolve(event);
+      },
+      resolve,
+      reject,
+      timeout,
+    });
+
+    void sendRaw(["REQ", subId, filter]).catch((error) => {
+      window.clearTimeout(timeout);
+      subscriptions.delete(subId);
+      reject(
+        error instanceof Error
+          ? error
+          : new Error("Failed to request relay event."),
+      );
+    });
+  });
+}
+
+/**
+ * Fetch relay history for event IDs in bounded, concurrent chunks and flatten
+ * the responses into one list. Returns an empty list without issuing a request
+ * when `eventIds` is empty.
+ */
+export async function fetchChunkedHistory(
+  eventIds: string[],
+  buildFilter: (eventIds: string[]) => RelaySubscriptionFilter,
+  fetchHistory: (filter: RelaySubscriptionFilter) => Promise<RelayEvent[]>,
+): Promise<RelayEvent[]> {
+  if (eventIds.length === 0) return [];
+
+  const chunks: string[][] = [];
+  for (let i = 0; i < eventIds.length; i += AUX_BACKFILL_CHUNK_SIZE) {
+    chunks.push(eventIds.slice(i, i + AUX_BACKFILL_CHUNK_SIZE));
+  }
+  const batches = await collectWithConcurrency(
+    chunks,
+    AUX_BACKFILL_CONCURRENCY,
+    (ids) => fetchHistory(buildFilter(ids)),
+  );
+  return batches.flat();
+}
diff --git a/desktop/src/shared/api/relayMembers.ts b/desktop/src/shared/api/relayMembers.ts
index e88d84488c..62cae9005a 100644
--- a/desktop/src/shared/api/relayMembers.ts
+++ b/desktop/src/shared/api/relayMembers.ts
@@ -104,12 +104,10 @@ export function relayMembershipLookupFromEvent(
 }
 
 async function fetchMembershipListEvent(): Promise<RelayEvent | null> {
-  const events = await relayClient.fetchEvents({
+  return relayClient.fetchFirstEvent({
     kinds: [KIND_NIP43_MEMBERSHIP_LIST],
     limit: 1,
   });
-
-  return events[events.length - 1] ?? null;
 }
 
 /** Loads the NIP-43 snapshot only when the relay advertises membership support. */
diff --git a/desktop/src/shared/api/searchTypes.ts b/desktop/src/shared/api/searchTypes.ts
new file mode 100644
index 0000000000..cf6c531ac6
--- /dev/null
+++ b/desktop/src/shared/api/searchTypes.ts
@@ -0,0 +1,28 @@
+export type SearchMessagesInput = {
+  q: string;
+  limit?: number;
+  channelId?: string;
+  /** Hex pubkeys for `from:` operator. */
+  authors?: string[];
+  /** Unix seconds (`after:YYYY-MM-DD`). */
+  since?: number;
+  /** Unix seconds (`before:YYYY-MM-DD`). */
+  until?: number;
+};
+
+export type SearchHit = {
+  eventId: string;
+  content: string;
+  kind: number;
+  pubkey: string;
+  channelId: string | null;
+  channelName: string | null;
+  createdAt: number;
+  score: number;
+  threadRootId?: string | null;
+};
+
+export type SearchMessagesResponse = {
+  hits: SearchHit[];
+  found: number;
+};
diff --git a/desktop/src/shared/api/tauri.test.mjs b/desktop/src/shared/api/tauri.test.mjs
index 68205d7298..f4692a7d2a 100644
--- a/desktop/src/shared/api/tauri.test.mjs
+++ b/desktop/src/shared/api/tauri.test.mjs
@@ -112,6 +112,105 @@ test("relay rate-limited: prefix check is case-sensitive (Rust always emits lowe
   );
 });
 
+// ── fromRawAcpRuntimeCatalogEntry: custom row API-boundary (B-2) ─────────────
+//
+// These tests feed real raw custom catalog rows through fromRawAcpRuntimeCatalogEntry
+// and verify the Rust→TypeScript mapping boundary: definition_env (snake_case)
+// arrives as definitionEnv (camelCase), source "custom" is preserved, and the
+// env round-trips end-to-end so a save-then-edit cycle cannot erase env.
+
+const { fromRawAcpRuntimeCatalogEntry } = await import("./tauri.ts");
+
+test("fromRawAcpRuntimeCatalogEntry maps definition_env to definitionEnv", () => {
+  const raw = {
+    id: "my-harness",
+    label: "My Harness",
+    availability: "available",
+    command: "my-bin",
+    source: "custom",
+    definition_env: { ANTHROPIC_API_KEY: "sk-test", MODEL: "claude-3" },
+    default_args: [],
+    can_auto_install: false,
+    requires_external_cli: false,
+    install_hint: "",
+    install_instructions_url: "",
+  };
+  const entry = fromRawAcpRuntimeCatalogEntry(raw);
+  assert.deepStrictEqual(entry.definitionEnv, {
+    ANTHROPIC_API_KEY: "sk-test",
+    MODEL: "claude-3",
+  });
+  assert.equal(entry.source, "custom");
+});
+
+test("fromRawAcpRuntimeCatalogEntry defaults definitionEnv to {} when absent", () => {
+  // Rust serialization skips empty BTreeMap, so definition_env will be absent
+  // for harnesses with no env defined — the mapper must default to {}.
+  const raw = {
+    id: "no-env-harness",
+    label: "No Env",
+    availability: "available",
+    command: "no-env-bin",
+    source: "custom",
+    default_args: [],
+    can_auto_install: false,
+    requires_external_cli: false,
+    install_hint: "",
+    install_instructions_url: "",
+  };
+  const entry = fromRawAcpRuntimeCatalogEntry(raw);
+  assert.deepStrictEqual(
+    entry.definitionEnv,
+    {},
+    "absent definition_env must map to empty object, not undefined",
+  );
+});
+
+test("fromRawAcpRuntimeCatalogEntry preserves source preset", () => {
+  const raw = {
+    id: "cursor",
+    label: "Cursor",
+    availability: "available",
+    command: "cursor",
+    source: "preset",
+    default_args: [],
+    can_auto_install: false,
+    requires_external_cli: false,
+    install_hint: "",
+    install_instructions_url: "",
+  };
+  const entry = fromRawAcpRuntimeCatalogEntry(raw);
+  assert.equal(entry.source, "preset");
+  assert.deepStrictEqual(entry.definitionEnv, {});
+});
+
+test("fromRawAcpRuntimeCatalogEntry env round-trips through edit payload shape", () => {
+  // Simulate the full save → re-open cycle: raw entry comes back from Rust
+  // with definition_env populated; the edit form reads entry.definitionEnv.
+  // Verify the env values are identical before and after the mapper.
+  const envValues = { OPENAI_API_KEY: "sk-live-abc", REGION: "us-east-1" };
+  const raw = {
+    id: "openai-harness",
+    label: "OpenAI",
+    availability: "not_installed",
+    command: "openai-agent",
+    source: "custom",
+    definition_env: envValues,
+    default_args: ["--acp"],
+    can_auto_install: false,
+    requires_external_cli: true,
+    install_hint: "Install the OpenAI CLI",
+    install_instructions_url: "https://platform.openai.com/docs",
+  };
+  const entry = fromRawAcpRuntimeCatalogEntry(raw);
+  // The edit form reads entry.definitionEnv; it must equal the original env.
+  assert.deepStrictEqual(
+    entry.definitionEnv,
+    envValues,
+    "env must round-trip: edit form must see the same values that Rust serialized",
+  );
+});
+
 // ── Teardown ──────────────────────────────────────────────────────────────────
 
 test("teardown — restore Date.now", () => {
diff --git a/desktop/src/shared/api/tauri.ts b/desktop/src/shared/api/tauri.ts
index 5406cf820d..c57525480e 100644
--- a/desktop/src/shared/api/tauri.ts
+++ b/desktop/src/shared/api/tauri.ts
@@ -118,6 +118,8 @@ export type RawManagedAgent = {
   pubkey: string;
   name: string;
   persona_id: string | null;
+  // Optional: pre-feature fixtures may omit it. The record's harness/runtime id.
+  runtime?: string | null;
   team_id?: string | null;
   relay_url: string;
   acp_command: string;
@@ -132,6 +134,7 @@ export type RawManagedAgent = {
   system_prompt: string | null;
   avatar_url?: string | null;
   model: string | null;
+  model_source?: ManagedAgent["modelSource"];
   provider: string | null;
   persona_out_of_date: boolean;
   persona_orphaned: boolean;
@@ -191,6 +194,12 @@ export type RawAcpRuntimeCatalogEntry = {
   /** Tagged union with snake_case status values — same shape as `AuthStatus`. */
   auth_status: AuthStatus;
   login_hint?: string;
+  source: "builtin" | "preset" | "custom";
+  /**
+   * Definition-level env vars for `source: custom` entries.
+   * Omitted/absent for builtin and preset — skipped in Rust serialization when empty.
+   */
+  definition_env?: Record<string, string>;
 };
 
 export type RawInstallStepResult = {
@@ -460,6 +469,9 @@ export async function searchMessages(
     q: input.q,
     limit: input.limit,
     channelId: input.channelId,
+    authors: input.authors,
+    since: input.since,
+    until: input.until,
   });
 
   return {
@@ -687,6 +699,7 @@ export function fromRawManagedAgent(agent: RawManagedAgent): ManagedAgent {
     pubkey: agent.pubkey,
     name: agent.name,
     personaId: agent.persona_id,
+    runtime: agent.runtime ?? null,
     teamId: agent.team_id ?? null,
     relayUrl: agent.relay_url,
     acpCommand: agent.acp_command,
@@ -701,6 +714,8 @@ export function fromRawManagedAgent(agent: RawManagedAgent): ManagedAgent {
     systemPrompt: agent.system_prompt,
     avatarUrl: agent.avatar_url ?? null,
     model: agent.model,
+    modelSource: agent.model_source ?? null,
+    // Fallbacks for pre-feature mocks/fixtures. Real records always carry them.
     provider: agent.provider ?? null,
     personaOutOfDate: agent.persona_out_of_date ?? false,
     personaOrphaned: agent.persona_orphaned ?? false,
@@ -727,7 +742,7 @@ export function fromRawManagedAgent(agent: RawManagedAgent): ManagedAgent {
   };
 }
 
-function fromRawAcpRuntimeCatalogEntry(
+export function fromRawAcpRuntimeCatalogEntry(
   entry: RawAcpRuntimeCatalogEntry,
 ): AcpRuntimeCatalogEntry {
   return {
@@ -750,6 +765,10 @@ function fromRawAcpRuntimeCatalogEntry(
     nodeRequired: entry.node_required,
     authStatus: entry.auth_status,
     loginHint: entry.login_hint ?? null,
+    source: entry.source,
+    // Map definition_env (snake_case from Rust) to definitionEnv (camelCase).
+    // Absent when empty (Rust serialization skips empty BTreeMap) — default to {}.
+    definitionEnv: entry.definition_env ?? {},
   };
 }
 
@@ -931,6 +950,45 @@ export async function discoverAcpRuntimes(): Promise<AcpRuntimeCatalogEntry[]> {
   ).map(fromRawAcpRuntimeCatalogEntry);
 }
 
+/** Input shape for creating or updating a custom harness. */
+export type HarnessDefinitionInput = {
+  id: string;
+  label: string;
+  command: string;
+  args?: string[];
+  env?: Record<string, string>;
+  installInstructionsUrl?: string;
+  installHint?: string;
+};
+
+/** Save (create or overwrite) a custom harness definition. Returns the catalog entry. */
+export async function saveCustomHarness(
+  definition: HarnessDefinitionInput,
+  originalId?: string,
+): Promise<AcpRuntimeCatalogEntry> {
+  const raw = await invokeTauri<RawAcpRuntimeCatalogEntry>(
+    "save_custom_harness",
+    {
+      definition: {
+        id: definition.id,
+        label: definition.label,
+        command: definition.command,
+        args: definition.args ?? [],
+        env: definition.env ?? {},
+        installInstructionsUrl: definition.installInstructionsUrl ?? "",
+        installHint: definition.installHint ?? "",
+      },
+      originalId: originalId ?? null,
+    },
+  );
+  return fromRawAcpRuntimeCatalogEntry(raw);
+}
+
+/** Delete a custom harness definition by id. No-op if already gone. */
+export async function deleteCustomHarness(id: string): Promise<void> {
+  await invokeTauri<void>("delete_custom_harness", { id });
+}
+
 export async function installAcpRuntime(
   runtimeId: string,
 ): Promise<InstallRuntimeResult> {
diff --git a/desktop/src/shared/api/tauriPersonas.snapshotImport.test.mjs b/desktop/src/shared/api/tauriPersonas.snapshotImport.test.mjs
index 8503a79349..d4e0b1d5f3 100644
--- a/desktop/src/shared/api/tauriPersonas.snapshotImport.test.mjs
+++ b/desktop/src/shared/api/tauriPersonas.snapshotImport.test.mjs
@@ -12,6 +12,9 @@ import test from "node:test";
 function makePreview(overrides = {}) {
   return {
     displayName: "Test Agent",
+    isBuiltIn: false,
+    model: null,
+    runtime: null,
     systemPrompt: "You are helpful.",
     avatarUrl: null,
     memoryLevel: "none",
diff --git a/desktop/src/shared/api/tauriPersonas.ts b/desktop/src/shared/api/tauriPersonas.ts
index bd3be92407..66e07f5e88 100644
--- a/desktop/src/shared/api/tauriPersonas.ts
+++ b/desktop/src/shared/api/tauriPersonas.ts
@@ -17,7 +17,14 @@ export type RawPersona = {
   name_pool?: string[];
   is_builtin: boolean;
   is_active?: boolean;
+  shared?: boolean;
   source_team?: string | null;
+  /**
+   * Provenance of a local copy of another owner's catalog entry. Serialized by
+   * the backend `CatalogSource` in snake_case; the create payload sends the
+   * camelCase aliases it accepts.
+   */
+  catalog_source?: { owner_pubkey: string; persona_id: string } | null;
   env_vars?: Record<string, string>;
   respond_to?: string | null;
   respond_to_allowlist?: string[];
@@ -40,7 +47,14 @@ export function fromRawPersona(persona: RawPersona): AgentPersona {
     namePool: persona.name_pool ?? [],
     isBuiltIn: persona.is_builtin,
     isActive: persona.is_active ?? true,
+    shared: persona.shared ?? false,
     sourceTeam: persona.source_team ?? null,
+    catalogSource: persona.catalog_source
+      ? {
+          ownerPubkey: persona.catalog_source.owner_pubkey,
+          personaId: persona.catalog_source.persona_id,
+        }
+      : null,
     envVars: persona.env_vars ?? {},
     respondTo: (persona.respond_to as RespondToMode | undefined) ?? null,
     respondToAllowlist: persona.respond_to_allowlist ?? [],
@@ -69,31 +83,37 @@ export async function createPersona(
         namePool: input.namePool ?? [],
         envVars: input.envVars ?? {},
         behavior: input.behavior,
+        catalogSource: input.catalogSource,
       },
     }),
   );
 }
 
+/** The `UpdatePersonaRequest` payload shared by both edit commands. */
+function updatePersonaPayload(input: UpdatePersonaInput) {
+  return {
+    id: input.id,
+    displayName: input.displayName,
+    avatarUrl: input.avatarUrl,
+    systemPrompt: input.systemPrompt,
+    runtime: input.runtime,
+    model: input.model,
+    provider: input.provider,
+    namePool: input.namePool ?? [],
+    // Send envVars only when caller explicitly provided it; omitting
+    // tells the backend "don't touch the stored env vars" so editing
+    // unrelated fields can't silently wipe saved credentials.
+    envVars: input.envVars,
+    // Same absent-vs-present contract as envVars for the behavioral quad.
+    behavior: input.behavior,
+  };
+}
+
 export async function updatePersona(
   input: UpdatePersonaInput,
 ): Promise<AgentPersona> {
   const raw = await invokeTauri<RawPersona>("update_persona", {
-    input: {
-      id: input.id,
-      displayName: input.displayName,
-      avatarUrl: input.avatarUrl,
-      systemPrompt: input.systemPrompt,
-      runtime: input.runtime,
-      model: input.model,
-      provider: input.provider,
-      namePool: input.namePool ?? [],
-      // Send envVars only when caller explicitly provided it; omitting
-      // tells the backend "don't touch the stored env vars" so editing
-      // unrelated fields can't silently wipe saved credentials.
-      envVars: input.envVars,
-      // Same absent-vs-present contract as envVars for the behavioral quad.
-      behavior: input.behavior,
-    },
+    input: updatePersonaPayload(input),
   });
   if (raw.writeback_warning) {
     console.warn(
@@ -103,6 +123,41 @@ export async function updatePersona(
   return fromRawPersona(raw);
 }
 
+/**
+ * Save an edit AND publish the persona's catalog head, reporting whether the
+ * relay accepted it.
+ *
+ * `updatePersona` only enqueues the head best-effort, so it cannot tell the UI
+ * whether the community catalog actually received the change. Use this for the
+ * "Save and publish" affordance, which promises exactly that.
+ */
+export async function updatePersonaAndPublish(
+  input: UpdatePersonaInput,
+): Promise<PersonaSharePublicationResult> {
+  return fromRawPublicationResult(
+    await invokeTauri<RawPersonaSharePublicationResult>(
+      "update_persona_and_publish",
+      { input: updatePersonaPayload(input) },
+    ),
+  );
+}
+
+type RawPersonaSharePublicationResult = {
+  persona: RawPersona;
+  publicationStatus: "published" | "queued";
+  relayMessage?: string;
+};
+
+function fromRawPublicationResult(
+  raw: RawPersonaSharePublicationResult,
+): PersonaSharePublicationResult {
+  return {
+    persona: fromRawPersona(raw.persona),
+    publicationStatus: raw.publicationStatus,
+    relayMessage: raw.relayMessage ?? null,
+  };
+}
+
 export async function deletePersona(id: string): Promise<void> {
   await invokeTauri("delete_persona", { id });
 }
@@ -116,6 +171,24 @@ export async function setPersonaActive(
   );
 }
 
+export async function setPersonaShared(
+  id: string,
+  shared: boolean,
+): Promise<PersonaSharePublicationResult> {
+  return fromRawPublicationResult(
+    await invokeTauri<RawPersonaSharePublicationResult>("set_persona_shared", {
+      id,
+      shared,
+    }),
+  );
+}
+
+export type PersonaSharePublicationResult = {
+  persona: AgentPersona;
+  publicationStatus: "published" | "queued";
+  relayMessage: string | null;
+};
+
 export type SnapshotMemoryLevel = "none" | "core" | "everything";
 export type SnapshotFormat = "json" | "png";
 
@@ -172,6 +245,10 @@ export async function encodeAgentSnapshotForSend(
 /** Preview returned by `preview_agent_snapshot_import` before any write. */
 export type AgentSnapshotImportPreview = {
   displayName: string;
+  /** Source classification shown in the preview; imports remain custom. */
+  isBuiltIn: boolean;
+  model: string | null;
+  runtime: string | null;
   systemPrompt: string | null;
   /** Effective avatar: data URL if present, source URL fallback otherwise. */
   avatarUrl: string | null;
@@ -235,9 +312,15 @@ export async function confirmAgentSnapshotImport(
 
 // Patches a single inbound persona/team/agent projection event into the local
 // store (personas.json). The backend resolves the match key and the
-// pending-edit race; the frontend only forwards the raw Nostr event JSON.
+// pending-edit race; the frontend forwards the raw Nostr event JSON plus the
+// relay it arrived on, so a workspace switch mid-flight cannot retain the event
+// into the newly active community's scoped store.
 export async function reconcileInboundPersonaEvent(
   eventJson: string,
+  arrivalRelayUrl: string,
 ): Promise<void> {
-  await invokeTauri("reconcile_inbound_persona_event", { eventJson });
+  await invokeTauri("reconcile_inbound_persona_event", {
+    eventJson,
+    arrivalRelayUrl,
+  });
 }
diff --git a/desktop/src/shared/api/types.ts b/desktop/src/shared/api/types.ts
index a82f766b63..689c400b03 100644
--- a/desktop/src/shared/api/types.ts
+++ b/desktop/src/shared/api/types.ts
@@ -268,28 +268,11 @@ export type GetHomeFeedInput = {
   types?: string;
 };
 
-export type SearchMessagesInput = {
-  q: string;
-  limit?: number;
-  channelId?: string;
-};
-
-export type SearchHit = {
-  eventId: string;
-  content: string;
-  kind: number;
-  pubkey: string;
-  channelId: string | null;
-  channelName: string | null;
-  createdAt: number;
-  score: number;
-  threadRootId?: string | null;
-};
-
-export type SearchMessagesResponse = {
-  hits: SearchHit[];
-  found: number;
-};
+export type {
+  SearchHit,
+  SearchMessagesInput,
+  SearchMessagesResponse,
+} from "./searchTypes";
 
 // ── Relay Members ────────────────────────────────────────────────────────────
 
@@ -343,6 +326,12 @@ export type ManagedAgent = {
   pubkey: string;
   name: string;
   personaId: string | null;
+  /**
+   * The record's harness/runtime id (e.g. "goose", "my-custom-harness").
+   * `null` means the agent inherits its harness from the linked persona.
+   * Used to count agents referencing a harness definition (delete confirm).
+   */
+  runtime: string | null;
   teamId?: string | null;
   relayUrl: string;
   acpCommand: string;
@@ -363,6 +352,7 @@ export type ManagedAgent = {
   systemPrompt: string | null;
   avatarUrl: string | null;
   model: string | null;
+  modelSource: "definition" | "global" | "instance_legacy" | null;
   /** LLM inference provider, from the agent's pinned record snapshot. */
   provider: string | null;
   /**
@@ -557,6 +547,21 @@ export type AcpRuntimeCatalogEntry = {
   authStatus: AuthStatus;
   /** Hint for completing authentication; null when not applicable or already logged in. */
   loginHint: string | null;
+  /**
+   * Whether this entry is compiled into the app ("builtin"), a bundled preset
+   * ("preset" — PATH-probed, not editable/deletable), or loaded from a user
+   * JSON file in `custom_harnesses/` ("custom"). Controls editability in the
+   * UI — only "custom" entries can be edited or deleted.
+   */
+  source: "builtin" | "preset" | "custom";
+  /**
+   * Definition-level environment variables for `source: custom` entries.
+   *
+   * Populated by the backend from `HarnessDefinition.env` so the edit form can
+   * read them back without losing existing env vars on save. Always absent/empty
+   * for `builtin` and `preset` entries.
+   */
+  definitionEnv?: Record<string, string>;
 };
 
 /** An AcpRuntimeCatalogEntry that is confirmed available — command and binaryPath are non-null. */
@@ -748,10 +753,17 @@ export type AgentPersona = {
   namePool: string[];
   isBuiltIn: boolean;
   isActive: boolean;
+  /** Whether this persona is discoverable in the active community catalog. */
+  shared: boolean;
   /** Team ID if this persona was imported from a team directory. Team personas are non-editable. */
   sourceTeam?: string | null;
-  /** Environment variables injected for agents created from this persona.
-   * Layered as: desktop parent env < persona envVars < agent envVars. */
+  /**
+   * Set only on a local copy of another owner's shared catalog entry. A copy
+   * carries a fresh local `id`, so this coordinate is the only thing that can
+   * answer "is this catalog entry already added" without minting a duplicate.
+   */
+  catalogSource?: CatalogSourceCoordinate | null;
+  /** Agent environment variables, layered after desktop parent and persona values. */
   envVars: Record<string, string>;
   /** NIP-AP behavioral defaults (wire shape). Null/empty = unset. */
   respondTo: RespondToMode | null;
@@ -762,9 +774,18 @@ export type AgentPersona = {
 };
 
 /**
- * NIP-AP behavioral group for a definition, sent as one group: absent = don't
- * touch the stored behavior group (legacy callers), present = replace the fields as a
- * unit. Mirrors `PersonaBehaviorRequest`.
+ * A catalog publication's coordinate: the owner who published it and the
+ * `d`-tag identifying the persona within that owner's catalog. Mirrors the
+ * backend `CatalogSource`.
+ */
+export type CatalogSourceCoordinate = {
+  ownerPubkey: string;
+  personaId: string;
+};
+
+/**
+ * NIP-AP behavioral group for a definition: absent preserves the stored group
+ * for legacy callers; present replaces it as a unit. Mirrors `PersonaBehaviorRequest`.
  */
 export type PersonaBehaviorInput = {
   respondTo?: RespondToMode;
@@ -782,6 +803,11 @@ export type CreatePersonaInput = {
   namePool?: string[];
   envVars?: Record<string, string>;
   behavior?: PersonaBehaviorInput;
+  /**
+   * Set when this persona is a copy of another owner's shared catalog entry,
+   * so the catalog can tell an already-added foreign entry from a new one.
+   */
+  catalogSource?: CatalogSourceCoordinate;
 };
 
 export type UpdatePersonaInput = {
diff --git a/desktop/src/shared/lib/configNudge.ts b/desktop/src/shared/lib/configNudge.ts
index 7893236c28..82ed8f306a 100644
--- a/desktop/src/shared/lib/configNudge.ts
+++ b/desktop/src/shared/lib/configNudge.ts
@@ -50,7 +50,17 @@ export type ConfigNudgeRequirement =
       /** One-line stderr excerpt from the CLI's parse error. */
       diagnostic: string;
     }
-  | { surface: "git_bash" };
+  | { surface: "git_bash" }
+  | {
+      /**
+       * A custom harness command that cannot be resolved in the current PATH.
+       * No in-app action can fix this — the user must install the binary or
+       * update their PATH.
+       */
+      surface: "missing_binary";
+      /** The command name that was not found (e.g. "my-acp-agent"). */
+      command: string;
+    };
 
 /**
  * The structured payload embedded in the `buzz:config-nudge` sentinel block.
@@ -155,6 +165,8 @@ function isConfigNudgeRequirement(v: unknown): v is ConfigNudgeRequirement {
         typeof r.setup_copy === "string" &&
         typeof r.diagnostic === "string"
       );
+    case "missing_binary":
+      return typeof r.command === "string";
     default:
       return false;
   }
diff --git a/desktop/src/shared/lib/emojiSearch.test.mjs b/desktop/src/shared/lib/emojiSearch.test.mjs
index 93cb1e286a..01a52293f5 100644
--- a/desktop/src/shared/lib/emojiSearch.test.mjs
+++ b/desktop/src/shared/lib/emojiSearch.test.mjs
@@ -5,6 +5,7 @@ import {
   fuzzyStandardEmoji,
   normalizeShortcode,
   rankByShortcode,
+  rankShortcodeMatchesFirst,
   scoreShortcodeMatch,
 } from "./emojiSearch.ts";
 
@@ -77,6 +78,35 @@ test("rankByShortcode respects the limit", () => {
   assert.equal(ranked.length, 2);
 });
 
+test("exact shortcode matches rank ahead of weaker custom shortcode matches", () => {
+  const items = [
+    { code: "bufo_joy", source: "custom" },
+    { code: "joy", source: "standard" },
+    { code: "joy_cat", source: "custom" },
+    { code: "face_with_tears_of_joy", source: "standard" },
+  ];
+  const ranked = rankShortcodeMatchesFirst("joy", items, (item) => item.code);
+
+  assert.deepEqual(
+    ranked.map((item) => item.code),
+    ["joy", "joy_cat", "bufo_joy", "face_with_tears_of_joy"],
+  );
+});
+
+test("semantic results stay ahead of loose shortcode matches", () => {
+  const items = [
+    { code: "frowning_face", source: "semantic" },
+    { code: "sandwich", source: "custom" },
+    { code: "sad", source: "standard" },
+  ];
+  const ranked = rankShortcodeMatchesFirst("sad", items, (item) => item.code);
+
+  assert.deepEqual(
+    ranked.map((item) => item.code),
+    ["sad", "frowning_face", "sandwich"],
+  );
+});
+
 test("fuzzyStandardEmoji surfaces point_up for `pointup`", () => {
   const hits = fuzzyStandardEmoji("pointup", 8, new Set());
   const ids = hits.map((e) => e.id);
diff --git a/desktop/src/shared/lib/emojiSearch.ts b/desktop/src/shared/lib/emojiSearch.ts
index 2a0d74b9bb..ec4ea529b5 100644
--- a/desktop/src/shared/lib/emojiSearch.ts
+++ b/desktop/src/shared/lib/emojiSearch.ts
@@ -114,6 +114,33 @@ export function rankByShortcode<T>(
   return scored.slice(0, limit).map((s) => s.item);
 }
 
+/**
+ * Place exact and prefix shortcode matches ahead of items that only matched an
+ * emoji name or keyword. This lets an exact standard emoji like `joy` beat a
+ * weaker custom shortcode match such as `bufo_joy`, while retaining emoji-mart's
+ * order for name- and keyword-only results ahead of loose shortcode matches.
+ */
+export function rankShortcodeMatchesFirst<T>(
+  query: string,
+  items: readonly T[],
+  shortcodeOf: (item: T) => string,
+): T[] {
+  const strongShortcodeMatches = rankByShortcode(
+    query,
+    items,
+    shortcodeOf,
+    Number.POSITIVE_INFINITY,
+  ).filter((item) => {
+    const match = scoreShortcodeMatch(query, shortcodeOf(item));
+    return match !== null && match.tier <= TIER_PREFIX;
+  });
+  const matchedItems = new Set(strongShortcodeMatches);
+  return [
+    ...strongShortcodeMatches,
+    ...items.filter((item) => !matchedItems.has(item)),
+  ];
+}
+
 export interface StandardEmoji {
   id: string;
   name: string;
diff --git a/desktop/src/shared/lib/localStorageQuota.test.mjs b/desktop/src/shared/lib/localStorageQuota.test.mjs
index ae84cae15d..64e351113a 100644
--- a/desktop/src/shared/lib/localStorageQuota.test.mjs
+++ b/desktop/src/shared/lib/localStorageQuota.test.mjs
@@ -1,7 +1,10 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { setLocalStorageItemWithRecovery } from "./localStorageQuota.ts";
+import {
+  recoverLocalStorageQuotaOnStartup,
+  setLocalStorageItemWithRecovery,
+} from "./localStorageQuota.ts";
 
 function makeQuotaLocalStorage({ maxEntries }) {
   const store = new Map();
@@ -30,6 +33,144 @@ function install(ls) {
   globalThis.localStorage = ls;
 }
 
+test("startup recovery removes disposable caches but preserves user state", () => {
+  const ls = makeQuotaLocalStorage({ maxEntries: 5 });
+  install(ls);
+  ls.store.set("buzz-channel-messages.v1:relay:chan", "big");
+  ls.store.set("buzz-channels.v1:relay", "big");
+  ls.store.set("buzz-timeline-skeleton-shape.v1:chan", "small");
+  ls.store.set("buzz-sidebar-skeleton-shape.v1:community:user", "small");
+  ls.store.set("buzz-communities", "keep");
+
+  recoverLocalStorageQuotaOnStartup();
+
+  assert.equal(ls.getItem("buzz-channel-messages.v1:relay:chan"), null);
+  assert.equal(ls.getItem("buzz-channels.v1:relay"), null);
+  assert.equal(ls.getItem("buzz-timeline-skeleton-shape.v1:chan"), null);
+  assert.equal(
+    ls.getItem("buzz-sidebar-skeleton-shape.v1:community:user"),
+    null,
+  );
+  assert.equal(ls.getItem("buzz-communities"), "keep");
+  assert.equal(ls.getItem("buzz-local-storage-quota-recovery.v1"), "1");
+});
+
+test("healthy startup preserves disposable caches", () => {
+  const ls = makeQuotaLocalStorage({ maxEntries: 10 });
+  install(ls);
+  ls.store.set("buzz-channel-messages.v1:relay:new", "snapshot");
+
+  recoverLocalStorageQuotaOnStartup();
+
+  assert.equal(ls.getItem("buzz-channel-messages.v1:relay:new"), "snapshot");
+  assert.equal(ls.getItem("buzz-local-storage-quota-recovery.v1"), "1");
+});
+
+test("startup recovery does not remove namespace near misses", () => {
+  const ls = makeQuotaLocalStorage({ maxEntries: 2 });
+  install(ls);
+  ls.store.set("buzz-channels.v10:durable", "keep");
+  ls.store.set("buzz-channel-messages.v1-durable", "keep");
+
+  recoverLocalStorageQuotaOnStartup();
+
+  assert.equal(ls.getItem("buzz-channels.v10:durable"), "keep");
+  assert.equal(ls.getItem("buzz-channel-messages.v1-durable"), "keep");
+  assert.equal(ls.getItem("buzz-local-storage-quota-recovery.v1"), null);
+});
+
+test("startup recovery runs only once", () => {
+  const ls = makeQuotaLocalStorage({ maxEntries: 10 });
+  install(ls);
+
+  recoverLocalStorageQuotaOnStartup();
+  ls.store.set("buzz-channel-messages.v1:relay:new", "new snapshot");
+  recoverLocalStorageQuotaOnStartup();
+
+  assert.equal(
+    ls.getItem("buzz-channel-messages.v1:relay:new"),
+    "new snapshot",
+  );
+});
+
+test("startup recovery retries after marker write fails", () => {
+  const ls = makeQuotaLocalStorage({ maxEntries: 1 });
+  install(ls);
+  ls.store.set("buzz-communities", "keep");
+
+  recoverLocalStorageQuotaOnStartup();
+  assert.equal(ls.getItem("buzz-local-storage-quota-recovery.v1"), null);
+
+  ls.store.delete("buzz-communities");
+  ls.store.set("buzz-channel-messages.v1:relay:chan", "big");
+  recoverLocalStorageQuotaOnStartup();
+
+  assert.equal(ls.getItem("buzz-channel-messages.v1:relay:chan"), null);
+  assert.equal(ls.getItem("buzz-local-storage-quota-recovery.v1"), "1");
+});
+
+test("global cache byte budget evicts only oldest entries needed", () => {
+  const ls = makeQuotaLocalStorage({ maxEntries: 20 });
+  install(ls);
+  ls.store.set("buzz-communities", "keep");
+  const snapshot = (updatedAt) =>
+    JSON.stringify({ updatedAt, payload: "x".repeat(400_000) });
+  const oldestKey = "buzz-channel-messages.v1:relay:oldest";
+  const newerKey = "buzz-channels.v1:relay-newer";
+  const newestKey = "buzz-channel-messages.v1:relay:newest";
+
+  assert.equal(setLocalStorageItemWithRecovery(oldestKey, snapshot(1)), true);
+  assert.equal(setLocalStorageItemWithRecovery(newerKey, snapshot(2)), true);
+  assert.equal(setLocalStorageItemWithRecovery(newestKey, snapshot(3)), true);
+
+  assert.equal(ls.getItem(oldestKey), null);
+  assert.notEqual(ls.getItem(newerKey), null);
+  assert.notEqual(ls.getItem(newestKey), null);
+  assert.equal(ls.getItem("buzz-communities"), "keep");
+});
+
+test("global cache byte budget spans relays and preserves durable state", () => {
+  const ls = makeQuotaLocalStorage({ maxEntries: 20 });
+  install(ls);
+  ls.store.set("buzz-communities", "keep");
+  const largeSnapshot = "x".repeat(600_000);
+
+  assert.equal(
+    setLocalStorageItemWithRecovery(
+      "buzz-channel-messages.v1:relay-one:chan",
+      largeSnapshot,
+    ),
+    true,
+  );
+  assert.equal(
+    setLocalStorageItemWithRecovery(
+      "buzz-channel-messages.v1:relay-two:chan",
+      largeSnapshot,
+    ),
+    true,
+  );
+
+  assert.equal(ls.getItem("buzz-channel-messages.v1:relay-one:chan"), null);
+  assert.equal(
+    ls.getItem("buzz-channel-messages.v1:relay-two:chan"),
+    largeSnapshot,
+  );
+  assert.equal(ls.getItem("buzz-communities"), "keep");
+});
+
+test("rejects a single cache entry larger than the global byte budget", () => {
+  const ls = makeQuotaLocalStorage({ maxEntries: 10 });
+  install(ls);
+  const key = "buzz-channel-messages.v1:relay:oversized";
+  ls.store.set(key, "previous snapshot");
+
+  assert.equal(
+    setLocalStorageItemWithRecovery(key, "x".repeat(1_100_000)),
+    false,
+  );
+  assert.equal(ls.getItem(key), null);
+});
+
 test("writes normally when under quota", () => {
   const ls = makeQuotaLocalStorage({ maxEntries: 10 });
   install(ls);
diff --git a/desktop/src/shared/lib/localStorageQuota.ts b/desktop/src/shared/lib/localStorageQuota.ts
index bf194a6cc8..538003ef6f 100644
--- a/desktop/src/shared/lib/localStorageQuota.ts
+++ b/desktop/src/shared/lib/localStorageQuota.ts
@@ -8,19 +8,32 @@
  */
 
 const PURE_CACHE_KEY_PREFIXES = [
-  "buzz-channel-messages.v1",
-  "buzz-channels.v1",
-  "buzz-timeline-skeleton-shape.v1",
+  "buzz-channel-messages.v1:",
+  "buzz-channels.v1:",
+  "buzz-sidebar-skeleton-shape.v1:",
+  "buzz-timeline-skeleton-shape.v1:",
 ];
 
+const QUOTA_RECOVERY_MARKER_KEY = "buzz-local-storage-quota-recovery.v1";
+
+// Keep disposable snapshots below 2 MiB, leaving roughly 3 MiB of WebKit's
+// observed ~5 MiB origin quota for identities, communities, preferences, and
+// read state. localStorage strings are UTF-16, so count two bytes per code unit.
+const PURE_CACHE_BYTE_BUDGET = 2 * 1024 * 1024;
+
+function isPureCacheKey(key: string): boolean {
+  return PURE_CACHE_KEY_PREFIXES.some((prefix) => key.startsWith(prefix));
+}
+
+function storageEntryBytes(key: string, value: string): number {
+  return (key.length + value.length) * 2;
+}
+
 function evictPureCacheEntries(): number {
   const toRemove: string[] = [];
   for (let i = 0; i < window.localStorage.length; i++) {
     const key = window.localStorage.key(i);
-    if (
-      key !== null &&
-      PURE_CACHE_KEY_PREFIXES.some((prefix) => key.startsWith(prefix))
-    ) {
+    if (key !== null && isPureCacheKey(key)) {
       toRemove.push(key);
     }
   }
@@ -30,6 +43,83 @@ function evictPureCacheEntries(): number {
   return toRemove.length;
 }
 
+function pureCacheEntriesExcluding(excludedKey: string): Array<{
+  bytes: number;
+  key: string;
+  updatedAt: number;
+}> {
+  const entries: Array<{ bytes: number; key: string; updatedAt: number }> = [];
+  for (let i = 0; i < window.localStorage.length; i++) {
+    const key = window.localStorage.key(i);
+    if (key === null || key === excludedKey || !isPureCacheKey(key)) continue;
+    const value = window.localStorage.getItem(key);
+    if (value === null) continue;
+
+    let updatedAt = 0;
+    try {
+      const parsed = JSON.parse(value) as { updatedAt?: unknown };
+      if (
+        typeof parsed.updatedAt === "number" &&
+        Number.isFinite(parsed.updatedAt)
+      ) {
+        updatedAt = parsed.updatedAt;
+      }
+    } catch {
+      // Legacy or malformed cache entries are safe to evict first.
+    }
+    entries.push({ bytes: storageEntryBytes(key, value), key, updatedAt });
+  }
+  return entries;
+}
+
+function trimPureCacheForWrite(key: string, writeBytes: number): void {
+  const entries = pureCacheEntriesExcluding(key);
+  let totalBytes = entries.reduce((total, entry) => total + entry.bytes, 0);
+  if (totalBytes + writeBytes <= PURE_CACHE_BYTE_BUDGET) return;
+
+  entries.sort((a, b) => a.updatedAt - b.updatedAt);
+  for (const entry of entries) {
+    window.localStorage.removeItem(entry.key);
+    totalBytes -= entry.bytes;
+    if (totalBytes + writeBytes <= PURE_CACHE_BYTE_BUDGET) return;
+  }
+}
+
+function preparePureCacheWrite(key: string, value: string): boolean {
+  if (!isPureCacheKey(key)) return true;
+
+  const writeBytes = storageEntryBytes(key, value);
+  if (writeBytes > PURE_CACHE_BYTE_BUDGET) {
+    window.localStorage.removeItem(key);
+    return false;
+  }
+
+  trimPureCacheForWrite(key, writeBytes);
+  return true;
+}
+
+/**
+ * Probes storage once at startup so installs that already filled WebKit
+ * localStorage recover before app initialization. Healthy installs keep their
+ * caches; only a failed marker write triggers disposable-cache eviction. The
+ * marker is written after recovery, so an interrupted/unavailable backend
+ * retries on the next launch. Load-bearing state is never touched.
+ */
+export function recoverLocalStorageQuotaOnStartup(): void {
+  try {
+    if (window.localStorage.getItem(QUOTA_RECOVERY_MARKER_KEY) === "1") return;
+    try {
+      window.localStorage.setItem(QUOTA_RECOVERY_MARKER_KEY, "1");
+      return;
+    } catch {
+      evictPureCacheEntries();
+    }
+    window.localStorage.setItem(QUOTA_RECOVERY_MARKER_KEY, "1");
+  } catch (error) {
+    console.warn("[localStorageQuota] startup cache cleanup failed:", error);
+  }
+}
+
 let warnedPersistentFailure = false;
 
 function notifyStorageFull(): void {
@@ -56,6 +146,7 @@ export function setLocalStorageItemWithRecovery(
   value: string,
 ): boolean {
   try {
+    if (!preparePureCacheWrite(key, value)) return false;
     window.localStorage.setItem(key, value);
     return true;
   } catch (error) {
diff --git a/desktop/src/shared/lib/remarkSpoilers.test.mjs b/desktop/src/shared/lib/remarkSpoilers.test.mjs
index 5ac848a1bb..4fb1248357 100644
--- a/desktop/src/shared/lib/remarkSpoilers.test.mjs
+++ b/desktop/src/shared/lib/remarkSpoilers.test.mjs
@@ -137,6 +137,24 @@ test("remarkSpoilers: groups block nodes between delimiter paragraphs", () => {
   assert.equal(tree.children[1].children[0].children[0].type, "image");
 });
 
+test("remarkSpoilers: leaves collapsed GFM table separators as text", () => {
+  const value =
+    "| Time | Purpose ||---:|---|| 0:00 | Frame strategy || 3:30 | Orient the board |";
+  const tree = runPlugin({
+    type: "root",
+    children: [{ type: "paragraph", children: [{ type: "text", value }] }],
+  });
+
+  assert.equal(
+    tree.children[0].children.some((child) => child.type === "spoiler"),
+    false,
+  );
+  assert.equal(
+    tree.children[0].children.map((child) => child.value ?? "").join(""),
+    value,
+  );
+});
+
 test("remarkSpoilers: leaves unmatched delimiters as text", () => {
   const tree = runPlugin({
     type: "root",
diff --git a/desktop/src/shared/lib/remarkSpoilers.ts b/desktop/src/shared/lib/remarkSpoilers.ts
index 501d7c2d16..5b81d0f8cc 100644
--- a/desktop/src/shared/lib/remarkSpoilers.ts
+++ b/desktop/src/shared/lib/remarkSpoilers.ts
@@ -37,17 +37,29 @@ function transformNode(node: Node) {
     transformNode(child);
   }
 
-  node.children = groupBlockSpoilers(groupSpoilers(node.children));
+  node.children = groupBlockSpoilers(
+    groupSpoilers(node.children, node.type === "paragraph"),
+  );
 }
 
-function groupSpoilers(children: Node[]): Node[] {
+function groupSpoilers(
+  children: Node[],
+  rejectTableDelimiterRow: boolean,
+): Node[] {
   const output: Node[] = [];
   let spoilerBuffer: Node[] | null = null;
 
   for (const part of splitDelimiterParts(children)) {
     if (part.type === "delimiter") {
       if (spoilerBuffer) {
-        output.push(buildSpoilerNode(spoilerBuffer));
+        if (rejectTableDelimiterRow && isTableDelimiterRow(spoilerBuffer)) {
+          output.push({ type: "text", value: "||" }, ...spoilerBuffer, {
+            type: "text",
+            value: "||",
+          });
+        } else {
+          output.push(buildSpoilerNode(spoilerBuffer));
+        }
         spoilerBuffer = null;
       } else {
         spoilerBuffer = [];
@@ -100,6 +112,13 @@ function splitDelimiterParts(children: Node[]): Part[] {
   return parts;
 }
 
+function isTableDelimiterRow(children: Node[]): boolean {
+  if (children.some((child) => child.type !== "text")) return false;
+
+  const value = children.map((child) => String(child.value ?? "")).join("");
+  return /^\s*:?-{3,}:?(?:\s*\|\s*:?-{3,}:?)+\s*$/.test(value);
+}
+
 function buildSpoilerNode(
   children: Node[],
   options: { block?: boolean } = {},
diff --git a/desktop/src/shared/styles/globals/animations.css b/desktop/src/shared/styles/globals/animations.css
index 918993dacf..77ae157373 100644
--- a/desktop/src/shared/styles/globals/animations.css
+++ b/desktop/src/shared/styles/globals/animations.css
@@ -2,6 +2,69 @@
   animation: sprout-arc-spinner-spin 500ms linear infinite;
 }
 
+@keyframes buzz-qr-cell-reveal {
+  0% {
+    opacity: 0;
+    transform: scale(0);
+  }
+
+  27% {
+    opacity: 0.27;
+    transform: scale(0);
+  }
+
+  30% {
+    opacity: 0.3;
+    transform: scale(0.043);
+  }
+
+  35% {
+    opacity: 0.35;
+    transform: scale(0.167);
+  }
+
+  40% {
+    opacity: 0.4;
+    transform: scale(0.358);
+  }
+
+  45% {
+    opacity: 0.45;
+    transform: scale(0.632);
+  }
+
+  49% {
+    opacity: 0.49;
+    transform: scale(0.918);
+  }
+
+  50% {
+    opacity: 0.5;
+    transform: scale(1.1);
+  }
+
+  100% {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+.buzz-qr-cell-reveal {
+  opacity: 0;
+  transform-box: fill-box;
+  transform-origin: center;
+  animation: buzz-qr-cell-reveal 58ms linear var(--buzz-qr-reveal-delay, 0ms)
+    forwards;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .buzz-qr-cell-reveal {
+    opacity: 1;
+    transform: none;
+    animation: none;
+  }
+}
+
 @keyframes sprout-arc-spinner-spin {
   to {
     transform: rotate(360deg);
@@ -124,54 +187,58 @@
 }
 
 .buzz-shimmer {
-  --buzz-shimmer-duration: 2000ms;
-  --buzz-shimmer-band: 400%;
+  --buzz-shimmer-duration: 2600ms;
+  --buzz-shimmer-band: 250%;
   --buzz-shimmer-highlight: color-mix(
     in srgb,
-    hsl(var(--foreground)) 82%,
-    hsl(var(--muted-foreground)) 18%
+    hsl(var(--background)) 60%,
+    hsl(var(--muted-foreground)) 40%
   );
+  --buzz-shimmer-spread: 2rem;
 
-  color: hsl(var(--muted-foreground));
-  display: inline-block;
-  position: relative;
-}
-
-.buzz-shimmer::before {
   animation: buzz-shimmer var(--buzz-shimmer-duration) linear infinite;
   background-clip: text;
-  background-image: linear-gradient(
-    90deg,
-    transparent 0%,
-    transparent 40%,
-    var(--buzz-shimmer-highlight) 50%,
-    transparent 60%,
-    transparent 100%
-  );
+  background-image:
+    linear-gradient(
+      90deg,
+      transparent calc(50% - var(--buzz-shimmer-spread)),
+      var(--buzz-shimmer-highlight) 50%,
+      transparent calc(50% + var(--buzz-shimmer-spread))
+    ),
+    linear-gradient(hsl(var(--muted-foreground)), hsl(var(--muted-foreground)));
+  background-position:
+    100% 0,
+    0 0;
   background-repeat: no-repeat;
-  background-size: var(--buzz-shimmer-band) 100%;
+  background-size:
+    var(--buzz-shimmer-band) 100%,
+    100% 100%;
   color: transparent;
-  content: attr(data-shimmer-text);
-  inset: 0;
-  pointer-events: none;
-  position: absolute;
+  display: inline-block;
   -webkit-background-clip: text;
   -webkit-text-fill-color: transparent;
 }
 
 @keyframes buzz-shimmer {
   0% {
-    background-position: 100% 0;
+    background-position:
+      100% 0,
+      0 0;
   }
 
   100% {
-    background-position: 0% 0;
+    background-position:
+      0 0,
+      0 0;
   }
 }
 
 @media (prefers-reduced-motion: reduce) {
-  .buzz-shimmer::before {
+  .buzz-shimmer {
     animation: none;
+    background: none;
+    color: hsl(var(--muted-foreground));
+    -webkit-text-fill-color: currentcolor;
   }
 }
 
diff --git a/desktop/src/shared/styles/globals/composer.css b/desktop/src/shared/styles/globals/composer.css
index 912ed1c799..0af4a59b4f 100644
--- a/desktop/src/shared/styles/globals/composer.css
+++ b/desktop/src/shared/styles/globals/composer.css
@@ -1,12 +1,67 @@
+.composer-dock {
+  --composer-dock-active-rail: 2.125rem;
+  --composer-dock-activity-bottom: 0.5rem;
+  --composer-dock-quiet-inset: 1.25rem;
+  --composer-dock-release: calc(
+    var(--composer-dock-active-rail) -
+    var(--composer-dock-quiet-inset)
+  );
+
+  padding-bottom: var(--composer-dock-quiet-inset);
+  transition: padding-bottom 200ms cubic-bezier(0.23, 1, 0.32, 1);
+}
+
+.composer-dock--with-activity {
+  padding-bottom: var(--composer-dock-active-rail);
+}
+
+.composer-dock-quiet-spacer {
+  height: var(--composer-dock-release);
+  transition: height 200ms cubic-bezier(0.23, 1, 0.32, 1);
+}
+
+.composer-dock--with-activity .composer-dock-quiet-spacer {
+  height: 0;
+}
+
+.composer-dock-rail-mask {
+  height: var(--composer-dock-quiet-inset);
+  transition: height 200ms cubic-bezier(0.23, 1, 0.32, 1);
+}
+
+.composer-dock--with-activity .composer-dock-rail-mask {
+  height: var(--composer-dock-active-rail);
+}
+
+.composer-dock-activity {
+  bottom: var(--composer-dock-activity-bottom);
+}
+
 .composer-overlay-corner-masks::before,
 .composer-overlay-corner-masks::after {
   position: absolute;
-  bottom: 2.5rem;
+  bottom: var(--composer-dock-quiet-inset);
   z-index: 0;
   width: 1rem;
   height: 1rem;
   background: hsl(var(--background));
   content: "";
+  transition: bottom 200ms cubic-bezier(0.23, 1, 0.32, 1);
+}
+
+.composer-dock--with-activity.composer-overlay-corner-masks::before,
+.composer-dock--with-activity.composer-overlay-corner-masks::after {
+  bottom: var(--composer-dock-active-rail);
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .composer-dock,
+  .composer-dock-quiet-spacer,
+  .composer-dock-rail-mask,
+  .composer-overlay-corner-masks::before,
+  .composer-overlay-corner-masks::after {
+    transition: none;
+  }
 }
 
 .composer-overlay-corner-masks::before {
diff --git a/desktop/src/shared/styles/globals/markdown.css b/desktop/src/shared/styles/globals/markdown.css
index fdc25d2873..6148ffeb7e 100644
--- a/desktop/src/shared/styles/globals/markdown.css
+++ b/desktop/src/shared/styles/globals/markdown.css
@@ -118,6 +118,10 @@
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
+  font-size: inherit;
+  font-weight: inherit;
+  letter-spacing: inherit;
+  line-height: inherit;
   overflow: hidden;
 }
 
diff --git a/desktop/src/shared/styles/globals/theme.css b/desktop/src/shared/styles/globals/theme.css
index 634dc78ffa..0810a15f0a 100644
--- a/desktop/src/shared/styles/globals/theme.css
+++ b/desktop/src/shared/styles/globals/theme.css
@@ -245,6 +245,28 @@
   --buzz-active-foreground: 0 0% 100%;
 }
 
+/*
+ * Use the Buzz primary color for the floating selection-formatting tray.
+ * Other themes retain the standard popover treatment.
+ */
+:root[data-buzz-sidebar] [data-buzz-selection-formatting-tray] {
+  border-color: hsl(var(--primary-foreground) / 0.18);
+  background-color: hsl(var(--primary));
+  color: hsl(var(--primary-foreground));
+}
+
+:root[data-buzz-sidebar] [data-buzz-selection-formatting-tray] button {
+  color: hsl(var(--primary-foreground));
+}
+
+:root[data-buzz-sidebar] [data-buzz-selection-formatting-tray] button:hover,
+:root[data-buzz-sidebar]
+  [data-buzz-selection-formatting-tray]
+  button[aria-pressed="true"] {
+  background-color: hsl(var(--primary-foreground) / 0.16);
+  color: hsl(var(--primary-foreground));
+}
+
 /* Keep the subtle content-card lift in Buzz Light only. */
 :root[data-buzz-sidebar]:not(.dark) [data-buzz-content-surface] {
   box-shadow:
diff --git a/desktop/src/shared/ui/Shimmer.tsx b/desktop/src/shared/ui/Shimmer.tsx
index f9b543ef09..0b26ed032f 100644
--- a/desktop/src/shared/ui/Shimmer.tsx
+++ b/desktop/src/shared/ui/Shimmer.tsx
@@ -1,3 +1,5 @@
+import type { CSSProperties } from "react";
+
 import { cn } from "@/shared/lib/cn";
 
 type ShimmerProps = {
@@ -9,7 +11,9 @@ export function Shimmer({ children, className }: ShimmerProps) {
   return (
     <span
       className={cn("buzz-shimmer", className)}
-      data-shimmer-text={children}
+      style={
+        { "--buzz-shimmer-spread": `${children.length * 2}px` } as CSSProperties
+      }
     >
       {children}
     </span>
diff --git a/desktop/src/shared/ui/UserAvatar.tsx b/desktop/src/shared/ui/UserAvatar.tsx
index 1ef1a9b815..dbe5eef27e 100644
--- a/desktop/src/shared/ui/UserAvatar.tsx
+++ b/desktop/src/shared/ui/UserAvatar.tsx
@@ -20,6 +20,7 @@ type UserAvatarProps = {
   size?: UserAvatarSize;
   accent?: boolean;
   className?: string;
+  fallbackDelayMs?: number;
   testId?: string;
 };
 
@@ -29,6 +30,7 @@ export function UserAvatar({
   size = "md",
   accent = false,
   className,
+  fallbackDelayMs = 200,
   testId,
 }: UserAvatarProps) {
   const initials = getInitials(displayName);
@@ -67,7 +69,7 @@ export function UserAvatar({
             : "bg-secondary text-secondary-foreground",
         )}
         data-testid={testId ? `${testId}-fallback` : undefined}
-        delayMs={200}
+        delayMs={fallbackDelayMs}
       >
         {initials}
       </AvatarFallback>
diff --git a/desktop/src/shared/ui/config-nudge-attachment.tsx b/desktop/src/shared/ui/config-nudge-attachment.tsx
index e1294b7dde..cc5931e23e 100644
--- a/desktop/src/shared/ui/config-nudge-attachment.tsx
+++ b/desktop/src/shared/ui/config-nudge-attachment.tsx
@@ -37,6 +37,8 @@ function requirementKey(
       return `cli_config_invalid:${req.probe_args.join(",")}:${index}`;
     case "git_bash":
       return `git_bash:${index}`;
+    case "missing_binary":
+      return `missing_binary:${req.command}:${index}`;
   }
 }
 
@@ -280,7 +282,7 @@ export function ConfigNudgeCard({
         <AttachmentTrigger
           aria-label={
             opensDoctor
-              ? `Open Agent runtimes settings for ${nudge.agent_name}`
+              ? `Open Agent runtimes for ${nudge.agent_name}`
               : `Open Edit Agent for ${nudge.agent_name}`
           }
           onClick={handleOpen}
@@ -381,6 +383,20 @@ function RequirementRow({
           </span>
         </div>
       );
+    case "missing_binary": {
+      // Missing-binary rows are purely informational — the user must install the
+      // binary or update their PATH. No in-app action can fix this.
+      return (
+        <div className="flex items-center gap-2 text-xs leading-4 text-muted-foreground">
+          <span className="flex-1 [overflow-wrap:anywhere]">
+            <code className="rounded bg-muted px-1 py-0.5 font-mono text-xs text-foreground">
+              {requirement.command}
+            </code>{" "}
+            not found in PATH — install it or check your PATH settings
+          </span>
+        </div>
+      );
+    }
     case "cli_config_invalid": {
       // Config-invalid rows are purely informational — the user must edit an
       // external file. No Agent runtimes CTA (Buzz can't repair ~/.codex/config.toml)
diff --git a/desktop/src/features/messages/lib/parseImeta.ts b/desktop/src/shared/ui/markdown/parseImeta.ts
similarity index 77%
rename from desktop/src/features/messages/lib/parseImeta.ts
rename to desktop/src/shared/ui/markdown/parseImeta.ts
index 72d28fccc2..9be060f7ae 100644
--- a/desktop/src/features/messages/lib/parseImeta.ts
+++ b/desktop/src/shared/ui/markdown/parseImeta.ts
@@ -1,22 +1,21 @@
-export type ImetaEntry = {
+import type { ImetaEntry } from "./types";
+
+export type ParsedImetaEntry = ImetaEntry & {
   url: string;
   m: string;
   x: string;
   size: number;
-  dim?: string;
   blurhash?: string;
   alt?: string;
-  thumb?: string;
-  duration?: number;
-  image?: string;
-  filename?: string;
 };
 
-export function parseImetaTags(tags: string[][]): Map<string, ImetaEntry> {
-  const map = new Map<string, ImetaEntry>();
+export function parseImetaTags(
+  tags: string[][],
+): Map<string, ParsedImetaEntry> {
+  const map = new Map<string, ParsedImetaEntry>();
   for (const tag of tags) {
     if (tag[0] !== "imeta") continue;
-    const entry: Partial<ImetaEntry> = {};
+    const entry: Partial<ParsedImetaEntry> = {};
     for (const part of tag.slice(1)) {
       const spaceIdx = part.indexOf(" ");
       if (spaceIdx === -1) continue;
@@ -58,7 +57,7 @@ export function parseImetaTags(tags: string[][]): Map<string, ImetaEntry> {
           break;
       }
     }
-    if (entry.url) map.set(entry.url, entry as ImetaEntry);
+    if (entry.url) map.set(entry.url, entry as ParsedImetaEntry);
   }
   return map;
 }
diff --git a/desktop/src/shared/ui/styled-qr-code.test.mjs b/desktop/src/shared/ui/styled-qr-code.test.mjs
index 9eb84d10c7..c782436213 100644
--- a/desktop/src/shared/ui/styled-qr-code.test.mjs
+++ b/desktop/src/shared/ui/styled-qr-code.test.mjs
@@ -37,3 +37,18 @@ test("uses a deterministic lower-density matrix for the same payload", () => {
 
   assert.equal(first, second);
 });
+
+test("adds the row-based reveal motion when requested", () => {
+  const html = renderToStaticMarkup(
+    React.createElement(StyledQrCode, {
+      animate: true,
+      value: TEST_PAIRING_URI,
+    }),
+  );
+
+  assert.match(html, /class="buzz-qr-cell-reveal"/);
+  assert.match(html, /data-qr-cell-row="0"/);
+  assert.match(html, /--buzz-qr-reveal-delay:0ms/);
+  assert.match(html, /data-qr-cell-row="56"/);
+  assert.match(html, /--buzz-qr-reveal-delay:189ms/);
+});
diff --git a/desktop/src/shared/ui/styled-qr-code.tsx b/desktop/src/shared/ui/styled-qr-code.tsx
index f2e1c60bb9..57c5d66926 100644
--- a/desktop/src/shared/ui/styled-qr-code.tsx
+++ b/desktop/src/shared/ui/styled-qr-code.tsx
@@ -1,4 +1,10 @@
-import { useId, useMemo, type ReactNode, type SVGProps } from "react";
+import {
+  useId,
+  useMemo,
+  type CSSProperties,
+  type ReactNode,
+  type SVGProps,
+} from "react";
 import { create } from "qrcode";
 
 const CELL_SPACING_RATIO = 0.2;
@@ -6,11 +12,16 @@ const FINDER_PATTERN_SIZE = 7;
 const QUIET_ZONE_SIZE = 4;
 const MAX_CENTER_OBSCURED_RATIO = 0.1;
 const CENTER_ICON_SIZE_RATIO = 0.8;
+const QR_REVEAL_DURATION_MS = 250;
+const QR_REVEAL_WAVE_SPREAD = 0.3;
+const QR_REVEAL_ROW_TRAVEL_MS =
+  QR_REVEAL_DURATION_MS / (1 + QR_REVEAL_WAVE_SPREAD);
 
 type StyledQrCodeProps = Omit<
   SVGProps<SVGSVGElement>,
   "children" | "height" | "title" | "width"
 > & {
+  animate?: boolean;
   backgroundColor?: string;
   centerImageSrc?: string;
   foregroundColor?: string;
@@ -76,6 +87,7 @@ function FinderPattern({
 }
 
 export function StyledQrCode({
+  animate = false,
   backgroundColor = "#ffffff",
   centerImageSrc,
   foregroundColor = "#000000",
@@ -118,11 +130,22 @@ export function StyledQrCode({
 
       cells.push(
         <circle
+          className={animate ? "buzz-qr-cell-reveal" : undefined}
           cx={column + 0.5}
           cy={row + 0.5}
+          data-qr-cell-row={row}
           fill={foregroundColor}
           key={`${row}-${column}`}
           r={dataCellRadius}
+          style={
+            animate
+              ? ({
+                  "--buzz-qr-reveal-delay": `${Math.round(
+                    (row / Math.max(matrix.size, 1)) * QR_REVEAL_ROW_TRAVEL_MS,
+                  )}ms`,
+                } as CSSProperties)
+              : undefined
+          }
         />,
       );
     }
diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts
index 6d2f613e2d..8a01e0840a 100644
--- a/desktop/src/testing/e2eBridge.ts
+++ b/desktop/src/testing/e2eBridge.ts
@@ -3,6 +3,11 @@ import { mockIPC, mockWindows } from "@tauri-apps/api/mocks";
 import { decode } from "nostr-tools/nip19";
 import { finalizeEvent, getPublicKey } from "nostr-tools/pure";
 import { parse as yamlParse } from "yaml";
+import {
+  mergeMockCustomHarnesses,
+  handleSaveCustomHarness,
+  handleDeleteCustomHarness,
+} from "./e2eBridgeCustomHarnesses.ts";
 
 import { relayClient } from "@/shared/api/relayClient";
 import type { ConnectionState } from "@/shared/api/relayClientShared";
@@ -35,6 +40,7 @@ import {
   KIND_HUDDLE_STARTED,
   KIND_MEMBER_ADDED_NOTIFICATION,
   KIND_MEMBER_REMOVED_NOTIFICATION,
+  KIND_PERSONA,
   KIND_REPO_ANNOUNCEMENT,
   KIND_REPO_STATE,
   KIND_STREAM_MESSAGE_EDIT,
@@ -70,6 +76,8 @@ type MockManagedAgentSeed = {
   name: string;
   avatarUrl?: string | null;
   personaId?: string | null;
+  /** Harness/runtime id pin; `null` = inherit from persona (native default). */
+  runtime?: string | null;
   status?: RawManagedAgent["status"];
   channelNames?: string[];
   channelIds?: string[];
@@ -105,13 +113,17 @@ type MockPersonaSeed = {
   displayName: string;
   avatarUrl?: string | null;
   systemPrompt: string;
+  updatedAt?: string;
   isActive?: boolean;
+  shared?: boolean;
   sourceTeam?: string | null;
   envVars?: Record<string, string>;
   runtime?: string | null;
   model?: string | null;
   provider?: string | null;
   namePool?: string[];
+  respondTo?: "owner-only" | "allowlist" | "anyone";
+  respondToAllowlist?: string[];
 };
 
 type MockTeamSeed = {
@@ -214,6 +226,13 @@ type E2eConfig = {
       name?: string;
       expiresAt: string;
     } | null;
+    /** Optional policy returned by the native join-policy discovery command. */
+    joinPolicy?: {
+      terms_markdown?: string;
+      privacy_markdown?: string;
+      age_attestation_required: boolean;
+      version: string;
+    } | null;
     /** Delay Builderlab login completion so cancellation/retry UI can be tested. */
     builderlabLoginDelayMs?: number;
     /** Bound Builderlab Nostr identity. Null/omitted = not linked yet. */
@@ -247,9 +266,13 @@ type E2eConfig = {
     acpAuthMethods?: Record<string, RawAcpAuthMethodsResult>;
     acpAuthMethodsErrors?: Record<string, string>;
     acpAuthMethodsError?: string;
+    /** When set, the `delete_custom_harness` mock command throws with this message. */
+    deleteCustomHarnessError?: string;
     connectAcpRuntimeResult?: RawConnectAcpRuntimeResult;
     connectAcpRuntimeDelayMs?: number;
     connectAcpRuntimeError?: string;
+    /** Catalog returned after a successful mocked connect (sign-in). */
+    acpRuntimesCatalogAfterConnect?: RawAcpRuntimeCatalogEntry[];
     activePersonaIds?: string[];
     installAcpRuntimeDelayMs?: number;
     installAcpRuntimeResult?: RawInstallRuntimeResult;
@@ -278,6 +301,10 @@ type E2eConfig = {
      *  (`list/start/stop/restart_managed_agent_runtime`). */
     managedAgentRuntimes?: MockManagedAgentRuntimeSeed[];
     personas?: MockPersonaSeed[];
+    /** Community catalog replaceable-event heads returned by relay queries. */
+    personaCatalogEvents?: RelayEvent[];
+    /** Outcomes for successive explicit persona share publications. */
+    personaSharePublicationStatuses?: Array<"published" | "queued">;
     teams?: MockTeamSeed[];
     relayAgents?: MockRelayAgentSeed[];
     agentListDelayMs?: number;
@@ -356,6 +383,8 @@ type E2eConfig = {
     oaOwnerIsMe?: boolean;
     /** Whether the mock relay advertises NIP-43 membership support. Defaults to false. */
     relayRequiresMembership?: boolean;
+    /** Delay EOSE for membership snapshots after delivering the event. */
+    relayMembershipEoseDelayMs?: number;
     relayRole?: "owner" | "admin" | "member" | null;
     // Descriptors returned by the mocked `pick_and_upload_media` /
     // `upload_media_bytes` commands. Lets a spec drive the attachment flow
@@ -368,6 +397,8 @@ type E2eConfig = {
     /** Delay (ms) applied to `get_relay_self` so E2E tests can prove the
      *  fail-closed race: DMs are withheld while classification is unresolved. */
     relaySelfDelayMs?: number;
+    /** Delay (ms) applied to `start_pairing` so pairing loading UI is observable. */
+    pairingStartDelayMs?: number;
     /**
      * Sequenced results for `confirm_team_snapshot_import`. String = throw
      * with that message; null = succeed. Call N uses results[N]; last entry
@@ -790,6 +821,8 @@ type RawManagedAgent = {
   pubkey: string;
   name: string;
   persona_id: string | null;
+  /** Record-level harness/runtime pin (`null` when inheriting from the persona). */
+  runtime: string | null;
   relay_url: string;
   acp_command: string;
   agent_command: string;
@@ -874,7 +907,9 @@ type RawPersona = {
   name_pool?: string[];
   is_builtin: boolean;
   is_active: boolean;
+  shared: boolean;
   source_team?: string | null;
+  catalog_source?: { owner_pubkey: string; persona_id: string } | null;
   env_vars?: Record<string, string>;
   respond_to?: string | null;
   respond_to_allowlist?: string[];
@@ -967,8 +1002,8 @@ function createMockRelayMembershipEvent(): RelayEvent {
  * sets from distinct pubkeys so the e2e exercises the union/collapse path, not
  * a single relay-owned set. `:buzz:` is the stable shortcode exercised by
  * custom-emoji.spec.ts (claimed by BOTH members with different URLs, so the
- * palette must collapse it to one deterministic winner); `:narf:` proves a
- * second member's distinct emoji unions in.
+ * palette must collapse it to one deterministic winner); `:narf:` and
+ * `:bufo_joy:` prove a second member's distinct emoji unions in.
  */
 function createMockCustomEmojiSetEvents(): RelayEvent[] {
   return [
@@ -995,6 +1030,7 @@ function createMockCustomEmojiSetEvents(): RelayEvent[] {
         // member B claims :buzz: with a DIFFERENT url — unionCustomEmoji must
         // collapse it to one deterministic winner, never expose two URLs.
         ["emoji", "buzz", "https://example.com/e2e/buzz-b.png"],
+        ["emoji", "bufo_joy", "https://example.com/e2e/bufo-joy.png"],
       ],
       "b".repeat(64),
     ),
@@ -1087,7 +1123,9 @@ declare global {
     }) => RelayEvent[];
     __BUZZ_E2E_EMIT_MOCK_TYPING__?: (input: {
       channelName: string;
+      createdAt?: number;
       pubkey?: string;
+      threadHeadId?: string;
     }) => RelayEvent;
     __BUZZ_E2E_INVOKE_MOCK_COMMAND__?: (
       command: string,
@@ -1541,6 +1579,7 @@ function cloneManagedAgent(agent: MockManagedAgent): RawManagedAgent {
     pubkey: agent.pubkey,
     name: agent.name,
     persona_id: agent.persona_id,
+    runtime: agent.runtime ?? null,
     relay_url: agent.relay_url,
     acp_command: agent.acp_command,
     agent_command: agent.agent_command,
@@ -2074,6 +2113,9 @@ function buildSeededManagedAgent(seed: MockManagedAgentSeed): MockManagedAgent {
     pubkey: seed.pubkey,
     name: seed.name,
     persona_id: seed.personaId ?? null,
+    // Native serde always emits this key (`null` when unpinned) — the bridge
+    // must mirror the wire shape, not omit the key.
+    runtime: seed.runtime ?? null,
     relay_url: DEFAULT_RELAY_WS_URL,
     acp_command: "buzz-acp",
     agent_command: "goose",
@@ -2230,6 +2272,7 @@ function resetMockPersonas(config?: E2eConfig) {
     name_pool: [],
     is_builtin: true,
     is_active: activePersonaIds.has(persona.id),
+    shared: false,
     source_team: null,
     created_at: now,
     updated_at: now,
@@ -2245,12 +2288,18 @@ function resetMockPersonas(config?: E2eConfig) {
       model: persona.model ?? null,
       provider: persona.provider ?? null,
       name_pool: persona.namePool ?? [],
+      respond_to: persona.respondTo ?? null,
+      respond_to_allowlist:
+        persona.respondTo === "allowlist"
+          ? [...(persona.respondToAllowlist ?? [])]
+          : [],
       is_builtin: false,
       is_active: persona.isActive ?? true,
+      shared: persona.shared ?? false,
       source_team: persona.sourceTeam ?? null,
       env_vars: { ...(persona.envVars ?? {}) },
       created_at: now,
-      updated_at: now,
+      updated_at: persona.updatedAt ?? now,
     });
   }
 }
@@ -2845,6 +2894,7 @@ const mockChannels: MockChannel[] = [
 const mockMessages = new Map<string, RelayEvent[]>();
 const mockUserStatuses: RelayEvent[] = [];
 const mockReminderEvents: RelayEvent[] = [];
+const mockPersonaEvents: RelayEvent[] = [];
 let mockRelayMembers: RawRelayMember[] = [];
 const mockSockets = new Map<number, MockSocket>();
 let mockWebsocketSendMutexWedged = false;
@@ -2875,6 +2925,16 @@ function resetMockSaveSubscriptions(config: E2eConfig | undefined) {
   }));
 }
 
+function resetMockPersonaCatalogEvents(config: E2eConfig | undefined) {
+  mockPersonaEvents.length = 0;
+  for (const event of config?.mock?.personaCatalogEvents ?? []) {
+    mockPersonaEvents.push({
+      ...event,
+      tags: event.tags.map((tag) => [...tag]),
+    });
+  }
+}
+
 // Mesh-compute mock state — TEST-ONLY.
 //
 // This entire module (e2eBridge.ts) is loaded only when `window.__BUZZ_E2E__`
@@ -3905,6 +3965,13 @@ function emitMockLiveEvent(channelId: string, event: RelayEvent) {
 }
 
 function emitMockGlobalEvent(event: RelayEvent) {
+  if (
+    event.kind === KIND_PERSONA &&
+    event.pubkey.toLowerCase() !== MOCK_IDENTITY_PUBKEY.toLowerCase() &&
+    !personaHasExactSharedTag(event)
+  ) {
+    return;
+  }
   for (const socket of mockSockets.values()) {
     for (const [subId, subscription] of socket.subscriptions) {
       if (subscription.kinds && !subscription.kinds.includes(event.kind)) {
@@ -4091,13 +4158,21 @@ function emitMockChannelMessage(
   return event;
 }
 
-function emitMockTypingIndicator(channelId: string, pubkey: string) {
+function emitMockTypingIndicator(
+  channelId: string,
+  pubkey: string,
+  threadHeadId?: string,
+  createdAt?: number,
+) {
   const event: RelayEvent = {
     id: crypto.randomUUID().replace(/-/g, ""),
     pubkey,
-    created_at: Math.floor(Date.now() / 1000),
+    created_at: createdAt ?? Math.floor(Date.now() / 1000),
     kind: 20002,
-    tags: [["h", channelId]],
+    tags: [
+      ["h", channelId],
+      ...(threadHeadId ? [["e", threadHeadId, "", "reply"]] : []),
+    ],
     content: "",
     sig: "mocksig".repeat(20).slice(0, 128),
   };
@@ -6893,7 +6968,24 @@ async function handleGetFeed(
   // For e2e, return a minimal feed structure with mentions.
   const limit = args.limit ?? 50;
   const mentionEvents = await relayQuery(config, [
-    { kinds: [9, 40002, 45001, 45003], "#p": [identity.pubkey], limit },
+    {
+      kinds: [
+        9,
+        40002,
+        1,
+        45001,
+        45003,
+        KIND_GIT_PULL_REQUEST,
+        KIND_GIT_PR_UPDATE,
+        KIND_GIT_ISSUE,
+        KIND_GIT_STATUS_OPEN,
+        KIND_GIT_STATUS_MERGED,
+        KIND_GIT_STATUS_CLOSED,
+        KIND_GIT_STATUS_DRAFT,
+      ],
+      "#p": [identity.pubkey],
+      limit,
+    },
   ]);
 
   // Look up channel names for feed items
@@ -7013,6 +7105,7 @@ function withMockRuntimeConfigMetadata(
 
 let runtimeCatalogDiscoveryCount = 0;
 let mockInstallCompleted = false;
+let mockConnectCompleted = false;
 
 async function handleDiscoverAcpRuntimes(
   config: E2eConfig | undefined,
@@ -7038,6 +7131,10 @@ async function handleDiscoverAcpRuntimes(
   if (mockInstallCompleted && afterInstall) {
     return afterInstall.map(withMockRuntimeConfigMetadata);
   }
+  const afterConnect = config?.mock?.acpRuntimesCatalogAfterConnect;
+  if (mockConnectCompleted && afterConnect) {
+    return afterConnect.map(withMockRuntimeConfigMetadata);
+  }
   const sequence = config?.mock?.acpRuntimesCatalogSequence;
   if (sequence && sequence.length > 0) {
     const index = Math.min(runtimeCatalogDiscoveryCount, sequence.length - 1);
@@ -7046,7 +7143,9 @@ async function handleDiscoverAcpRuntimes(
   }
   const configured = config?.mock?.acpRuntimesCatalog;
   if (configured) {
-    return configured.map(withMockRuntimeConfigMetadata);
+    return mergeMockCustomHarnesses(
+      configured.map(withMockRuntimeConfigMetadata),
+    );
   }
   const defaultCatalog: RawAcpRuntimeCatalogEntry[] = [
     {
@@ -7065,6 +7164,7 @@ async function handleDiscoverAcpRuntimes(
       underlying_cli_path: null,
       node_required: false,
       auth_status: { status: "not_applicable" },
+      source: "builtin",
       login_hint: undefined,
     },
     {
@@ -7084,6 +7184,7 @@ async function handleDiscoverAcpRuntimes(
       underlying_cli_path: "/usr/local/bin/claude",
       node_required: false,
       auth_status: { status: "unknown" },
+      source: "builtin",
       login_hint: undefined,
     },
     {
@@ -7103,6 +7204,7 @@ async function handleDiscoverAcpRuntimes(
       underlying_cli_path: null,
       node_required: false,
       auth_status: { status: "unknown" },
+      source: "builtin",
       login_hint: undefined,
     },
     {
@@ -7121,10 +7223,13 @@ async function handleDiscoverAcpRuntimes(
       underlying_cli_path: null,
       node_required: false,
       auth_status: { status: "not_applicable" },
+      source: "builtin",
       login_hint: undefined,
     },
   ];
-  return defaultCatalog.map(withMockRuntimeConfigMetadata);
+  return mergeMockCustomHarnesses(
+    defaultCatalog.map(withMockRuntimeConfigMetadata),
+  );
 }
 
 async function handleDiscoverAcpAuthMethods(
@@ -7159,6 +7264,7 @@ async function handleConnectAcpRuntime(
   if (delayMs > 0) {
     await new Promise((resolve) => window.setTimeout(resolve, delayMs));
   }
+  mockConnectCompleted = true;
   return config?.mock?.connectAcpRuntimeResult ?? { launched: true };
 }
 
@@ -7179,6 +7285,9 @@ let mockGlobalAgentConfig: {
 // Per-page get_nsec call counter for sequenced error testing.
 let nsecCallCount = 0;
 
+// Per-page explicit catalog publication outcomes.
+let personaSharePublicationCallCount = 0;
+
 // Per-page confirm_team_snapshot_import call counter for sequenced error testing.
 let teamSnapshotConfirmCallCount = 0;
 
@@ -7372,6 +7481,7 @@ async function handleCreatePersona(args: {
     provider?: string;
     envVars?: Record<string, string>;
     behavior?: PersonaBehaviorInput;
+    catalogSource?: { ownerPubkey: string; personaId: string };
   };
 }): Promise<RawPersona> {
   const now = new Date().toISOString();
@@ -7385,49 +7495,78 @@ async function handleCreatePersona(args: {
     provider: args.input.provider?.trim() || null,
     is_builtin: false,
     is_active: true,
+    shared: false,
     source_team: null,
+    // Mirrors `CatalogSource::normalized`: the coordinate a catalog copy keeps
+    // so the catalog can tell an already-added foreign entry from a new one.
+    catalog_source: args.input.catalogSource
+      ? {
+          owner_pubkey: args.input.catalogSource.ownerPubkey
+            .trim()
+            .toLowerCase(),
+          persona_id: args.input.catalogSource.personaId.trim(),
+        }
+      : null,
     env_vars: { ...(args.input.envVars ?? {}) },
     created_at: now,
     updated_at: now,
   };
   applyMockPersonaBehavior(persona, args.input.behavior);
   mockPersonas.push(persona);
+  upsertMockPersonaEvent(persona);
   return { ...persona };
 }
 
+type MockUpdatePersonaInput = {
+  id: string;
+  displayName: string;
+  avatarUrl?: string;
+  systemPrompt: string;
+  runtime?: string;
+  model?: string;
+  provider?: string;
+  envVars?: Record<string, string>;
+  behavior?: PersonaBehaviorInput;
+};
+
 async function handleUpdatePersona(args: {
-  input: {
-    id: string;
-    displayName: string;
-    avatarUrl?: string;
-    systemPrompt: string;
-    runtime?: string;
-    model?: string;
-    provider?: string;
-    envVars?: Record<string, string>;
-    behavior?: PersonaBehaviorInput;
-  };
+  input: MockUpdatePersonaInput;
 }): Promise<RawPersona> {
-  const persona = mockPersonas.find(
-    (candidate) => candidate.id === args.input.id,
-  );
+  return { ...applyMockPersonaUpdate(args.input) };
+}
+
+/**
+ * Save an edit to the mock persona store, exactly like `update_persona_with`,
+ * and return the live record so a caller can publish it.
+ *
+ * Deliberately does NOT publish a catalog event: the real `update_persona`
+ * only enqueues a pending head for the out-of-band flush loop, so nothing has
+ * reached the relay by the time the command returns. Publishing here would
+ * make a UI that never calls `update_persona_and_publish` look like it kept
+ * the "Save and publish" promise.
+ */
+function applyMockPersonaUpdate(input: MockUpdatePersonaInput): RawPersona {
+  const persona = mockPersonas.find((candidate) => candidate.id === input.id);
   if (!persona) {
-    throw new Error(`agent ${args.input.id} not found`);
+    throw new Error(`agent ${input.id} not found`);
   }
-  persona.display_name = args.input.displayName.trim();
-  persona.avatar_url = args.input.avatarUrl?.trim() || null;
-  persona.system_prompt = args.input.systemPrompt.trim();
-  persona.runtime = args.input.runtime?.trim() || null;
-  persona.model = args.input.model?.trim() || null;
-  persona.provider = args.input.provider?.trim() || null;
-  if (args.input.envVars !== undefined) {
+  persona.display_name = input.displayName.trim();
+  persona.avatar_url = input.avatarUrl?.trim() || null;
+  persona.system_prompt = input.systemPrompt.trim();
+  persona.runtime = input.runtime?.trim() || null;
+  persona.model = input.model?.trim() || null;
+  persona.provider = input.provider?.trim() || null;
+  if (input.envVars !== undefined) {
     // Absent = preserve; present = replace entirely (matches Rust handler).
-    persona.env_vars = { ...args.input.envVars };
+    persona.env_vars = { ...input.envVars };
   }
-  applyMockPersonaBehavior(persona, args.input.behavior);
+  applyMockPersonaBehavior(persona, input.behavior);
   persona.updated_at = new Date().toISOString();
 
-  return { ...persona };
+  for (const callback of tauriEventListeners.get("agents-data-changed") ?? []) {
+    callback();
+  }
+  return persona;
 }
 
 async function handleDeletePersona(args: { id: string }): Promise<void> {
@@ -7489,15 +7628,115 @@ async function handleSetPersonaActive(args: {
   return { ...persona };
 }
 
+function personaHasExactSharedTag(event: RelayEvent): boolean {
+  const tags = event.tags.filter((tag) => tag[0] === "shared");
+  return tags.length === 1 && tags[0]?.length === 2 && tags[0]?.[1] === "true";
+}
+
+function upsertMockPersonaRelayEvent(event: RelayEvent): void {
+  const sourceId = event.tags.find((tag) => tag[0] === "d")?.[1];
+  if (!sourceId) return;
+  const existingIndex = mockPersonaEvents.findIndex(
+    (candidate) =>
+      candidate.pubkey.toLowerCase() === event.pubkey.toLowerCase() &&
+      candidate.tags.some((tag) => tag[0] === "d" && tag[1] === sourceId),
+  );
+  if (existingIndex >= 0) {
+    mockPersonaEvents.splice(existingIndex, 1);
+  }
+  mockPersonaEvents.push(event);
+}
+
+function upsertMockPersonaEvent(persona: RawPersona): void {
+  const event: RelayEvent = {
+    id: mockEventId(),
+    pubkey: MOCK_IDENTITY_PUBKEY,
+    created_at: Math.floor(Date.now() / 1_000),
+    kind: KIND_PERSONA,
+    tags: [["d", persona.id], ...(persona.shared ? [["shared", "true"]] : [])],
+    content: JSON.stringify({
+      display_name: persona.display_name,
+      system_prompt: persona.system_prompt,
+      avatar_url: persona.avatar_url,
+      runtime: persona.runtime ?? null,
+      model: persona.model ?? null,
+      provider: persona.provider ?? null,
+      name_pool: persona.name_pool ?? [],
+      respond_to: persona.respond_to ?? null,
+      respond_to_allowlist: persona.respond_to_allowlist ?? [],
+      parallelism: persona.parallelism ?? null,
+    }),
+    sig: "0".repeat(128),
+  };
+  upsertMockPersonaRelayEvent(event);
+  emitMockGlobalEvent(event);
+}
+
+type MockPersonaPublicationResult = {
+  persona: RawPersona;
+  publicationStatus: "published" | "queued";
+  relayMessage?: string;
+};
+
+/**
+ * Publish a persona's catalog head and report the relay outcome, like
+ * `publish_prepared_persona`. A `queued` outcome must NOT make the event
+ * visible to catalog readers — that is the whole distinction the UI reports.
+ */
+function publishMockPersonaHead(
+  persona: RawPersona,
+  config: E2eConfig | undefined,
+): MockPersonaPublicationResult {
+  const publicationStatus =
+    config?.mock?.personaSharePublicationStatuses?.[
+      personaSharePublicationCallCount++
+    ] ?? "published";
+  if (publicationStatus === "published") {
+    upsertMockPersonaEvent(persona);
+  }
+  return {
+    persona: { ...persona },
+    publicationStatus,
+    ...(publicationStatus === "queued"
+      ? { relayMessage: "relay unreachable: could not connect to relay" }
+      : {}),
+  };
+}
+
+async function handleSetPersonaShared(
+  args: {
+    id: string;
+    shared: boolean;
+  },
+  config?: E2eConfig,
+): Promise<MockPersonaPublicationResult> {
+  const persona = mockPersonas.find((candidate) => candidate.id === args.id);
+  if (!persona) {
+    throw new Error(`agent ${args.id} not found`);
+  }
+  if (persona.is_builtin) {
+    throw new Error("Built-in agents cannot be shared to the catalog.");
+  }
+  persona.shared = args.shared;
+  persona.updated_at = new Date().toISOString();
+  return publishMockPersonaHead(persona, config);
+}
+
+/** Mirrors `update_persona_and_publish`: save the edit, then await the relay. */
+async function handleUpdatePersonaAndPublish(
+  args: { input: MockUpdatePersonaInput },
+  config?: E2eConfig,
+): Promise<MockPersonaPublicationResult> {
+  return publishMockPersonaHead(applyMockPersonaUpdate(args.input), config);
+}
+
 function ensureMockPersonaIsActive(personaId: string) {
   const persona = mockPersonas.find((candidate) => candidate.id === personaId);
   if (!persona) {
     throw new Error(`agent ${personaId} not found`);
   }
   if (!persona.is_active) {
-    throw new Error(
-      `${persona.display_name} is not in My Agents. Choose it from Agent Catalog first.`,
-    );
+    throw new Error(`${persona.display_name} is not in My Agents.`);
   }
 }
 
@@ -7728,6 +7967,8 @@ async function handleCreateManagedAgent(
     pubkey,
     name,
     persona_id: args.input.personaId ?? null,
+    // Create never pins a harness id — the record inherits from the persona.
+    runtime: null,
     relay_url: args.input.relayUrl ?? DEFAULT_RELAY_WS_URL,
     acp_command: args.input.acpCommand ?? "buzz-acp",
     agent_command: agentCommand,
@@ -8029,10 +8270,60 @@ async function handleUpdateManagedAgent(args: {
   return { agent: cloneManagedAgent(agent), profile_sync_error: null };
 }
 
+/**
+ * Mock-mode `search_messages` predicate, mirroring the relay's filter contract.
+ *
+ * `since`/`until` are NIP-01 bounds and both inclusive — the relay keeps events
+ * where `since <= created_at <= until` (`crates/buzz-core/src/filter.rs`). The
+ * `before:` operator's exclusivity is encoded upstream in
+ * `parseSearchOperators`, which subtracts a second; the mock must not subtract
+ * it a second time.
+ *
+ * Exported so the boundary behavior is unit-testable without a browser.
+ */
+export function mockSearchHitMatches(
+  hit: Pick<
+    RawSearchHit,
+    "channel_id" | "pubkey" | "created_at" | "content" | "channel_name"
+  >,
+  filters: {
+    /** Lowercased FTS query; empty matches everything. */
+    query: string;
+    channelId?: string;
+    authorSet: Set<string> | null;
+    since?: number;
+    until?: number;
+  },
+): boolean {
+  if (filters.channelId && hit.channel_id !== filters.channelId) {
+    return false;
+  }
+  if (filters.authorSet && !filters.authorSet.has(hit.pubkey.toLowerCase())) {
+    return false;
+  }
+  if (filters.since != null && hit.created_at < filters.since) {
+    return false;
+  }
+  if (filters.until != null && hit.created_at > filters.until) {
+    return false;
+  }
+  if (!filters.query) {
+    return true;
+  }
+  return (
+    hit.content.toLowerCase().includes(filters.query) ||
+    (hit.channel_name?.toLowerCase().includes(filters.query) ?? false)
+  );
+}
+
 async function handleSearchMessages(
   args: {
     q: string;
     limit?: number;
+    channelId?: string;
+    authors?: string[];
+    since?: number;
+    until?: number;
   },
   config: E2eConfig | undefined,
 ): Promise<RawSearchResponse> {
@@ -8115,17 +8406,20 @@ async function handleSearchMessages(
       }
     }
 
-    const hits = mockHits
-      .filter((hit) => {
-        if (!query) {
-          return true;
-        }
+    const authorSet = args.authors?.length
+      ? new Set(args.authors.map((author) => author.toLowerCase()))
+      : null;
 
-        return (
-          hit.content.toLowerCase().includes(query) ||
-          (hit.channel_name?.toLowerCase().includes(query) ?? false)
-        );
-      })
+    const hits = mockHits
+      .filter((hit) =>
+        mockSearchHitMatches(hit, {
+          query,
+          channelId: args.channelId,
+          authorSet,
+          since: args.since,
+          until: args.until,
+        }),
+      )
       .slice(0, limit);
 
     return {
@@ -8134,11 +8428,26 @@ async function handleSearchMessages(
     };
   }
 
-  // NIP-50 search via POST /query
+  // NIP-50 search via POST /query — forward operator pushdown fields.
   const limit = args.limit ?? 20;
-  const events = await relayQuery(config, [
-    { kinds: [9, 40002], search: args.q, limit },
-  ]);
+  const filter: Record<string, unknown> = {
+    kinds: [9, 40002, 45001, 45003],
+    search: args.q,
+    limit,
+  };
+  if (args.channelId) {
+    filter["#h"] = [args.channelId];
+  }
+  if (args.authors?.length) {
+    filter.authors = args.authors;
+  }
+  if (args.since != null) {
+    filter.since = args.since;
+  }
+  if (args.until != null) {
+    filter.until = args.until;
+  }
+  const events = await relayQuery(config, [filter]);
   const hits = events.map((ev) => ({
     event_id: ev.id ?? "",
     pubkey: ev.pubkey ?? "",
@@ -8186,6 +8495,35 @@ async function resolveMockUploadDescriptors(
   ];
 }
 
+async function resolveMockUploadDescriptorForBytes(
+  args: { data: number[]; filename?: string | null },
+  config: E2eConfig | undefined,
+): Promise<RawBlobDescriptor> {
+  const configured = config?.mock?.uploadDescriptors;
+  if (configured !== undefined) {
+    const descriptors = await resolveMockUploadDescriptors(config);
+    const descriptor = descriptors[0];
+    if (!descriptor) throw new Error("mock upload returned no descriptor");
+    return descriptor;
+  }
+
+  const bytes = Uint8Array.from(args.data);
+  const digest = await crypto.subtle.digest("SHA-256", bytes);
+  const sha256 = Array.from(new Uint8Array(digest), (value) =>
+    value.toString(16).padStart(2, "0"),
+  ).join("");
+  const filename = args.filename ?? "upload.bin";
+  const isAgentJson = filename.toLowerCase().endsWith(".agent.json");
+  return {
+    url: `https://mock.relay/media/${sha256}${isAgentJson ? ".json" : ".bin"}`,
+    sha256,
+    size: bytes.length,
+    type: isAgentJson ? "application/json" : "application/octet-stream",
+    uploaded: Math.floor(Date.now() / 1000),
+    filename,
+  };
+}
+
 async function handleSendChannelMessage(
   args: {
     channelId: string;
@@ -8836,7 +9174,15 @@ function sendToMockSocket(args: {
         subId,
         createMockRelayMembershipEvent(),
       ]);
-      sendWsText(socket.handler, ["EOSE", subId]);
+      const eoseDelayMs = getConfig()?.mock?.relayMembershipEoseDelayMs ?? 0;
+      if (eoseDelayMs > 0) {
+        window.setTimeout(
+          () => sendWsText(socket.handler, ["EOSE", subId]),
+          eoseDelayMs,
+        );
+      } else {
+        sendWsText(socket.handler, ["EOSE", subId]);
+      }
       return;
     }
 
@@ -8873,6 +9219,25 @@ function sendToMockSocket(args: {
       return;
     }
 
+    if (filter.kinds?.includes(KIND_PERSONA)) {
+      const authors = filter.authors?.map((author) => author.toLowerCase());
+      const sourceIds = filter["#d"];
+      for (const event of mockPersonaEvents) {
+        if (authors && !authors.includes(event.pubkey.toLowerCase())) continue;
+        if (
+          event.pubkey.toLowerCase() !== MOCK_IDENTITY_PUBKEY.toLowerCase() &&
+          !personaHasExactSharedTag(event)
+        ) {
+          continue;
+        }
+        const sourceId = event.tags.find((tag) => tag[0] === "d")?.[1];
+        if (sourceIds && (!sourceId || !sourceIds.includes(sourceId))) continue;
+        sendWsText(socket.handler, ["EVENT", subId, event]);
+      }
+      sendWsText(socket.handler, ["EOSE", subId]);
+      return;
+    }
+
     // Project queries: NIP-34 kinds, or kind:1 comments scoped by repo `a`
     // tag (PR/issue discussions, approvals, review requests).
     if (
@@ -8974,6 +9339,36 @@ function sendToMockSocket(args: {
       return;
     }
 
+    if (event.kind === KIND_PERSONA) {
+      const sourceId = event.tags.find((tag) => tag[0] === "d")?.[1];
+      if (!sourceId) {
+        sendWsText(socket.handler, [
+          "OK",
+          event.id,
+          false,
+          "invalid: persona event missing d tag.",
+        ]);
+        return;
+      }
+      const sharedTags = event.tags.filter((tag) => tag[0] === "shared");
+      if (
+        sharedTags.length > 1 ||
+        (sharedTags.length === 1 && !personaHasExactSharedTag(event))
+      ) {
+        sendWsText(socket.handler, [
+          "OK",
+          event.id,
+          false,
+          'invalid: shared tag must be exactly ["shared","true"].',
+        ]);
+        return;
+      }
+      upsertMockPersonaRelayEvent(event);
+      emitMockGlobalEvent(event);
+      sendWsText(socket.handler, ["OK", event.id, true, ""]);
+      return;
+    }
+
     if (event.kind === 20001) {
       const status = event.content;
       if (status === "online" || status === "away" || status === "offline") {
@@ -9092,6 +9487,7 @@ export function maybeInstallE2eTauriMocks() {
   resetMockWorkflows();
   resetMockMesh();
   resetMockUserStatuses();
+  resetMockPersonaCatalogEvents(config);
   resetMockSaveSubscriptions(config);
   resetMockPendingCommunityDeepLinks(config);
   mockWebsocketSendMutexWedged = false;
@@ -9132,7 +9528,12 @@ export function maybeInstallE2eTauriMocks() {
     );
   };
   window.__BUZZ_E2E_PREPEND_MOCK_HISTORY__ = prependMockHistory;
-  window.__BUZZ_E2E_EMIT_MOCK_TYPING__ = ({ channelName, pubkey }) => {
+  window.__BUZZ_E2E_EMIT_MOCK_TYPING__ = ({
+    channelName,
+    createdAt,
+    pubkey,
+    threadHeadId,
+  }) => {
     const channel = mockChannels.find(
       (candidate) => candidate.name === channelName,
     );
@@ -9140,7 +9541,12 @@ export function maybeInstallE2eTauriMocks() {
       throw new Error(`Mock channel ${channelName} not found.`);
     }
 
-    return emitMockTypingIndicator(channel.id, pubkey ?? CHARLIE_PUBKEY);
+    return emitMockTypingIndicator(
+      channel.id,
+      pubkey ?? CHARLIE_PUBKEY,
+      threadHeadId,
+      createdAt,
+    );
   };
   window.__BUZZ_E2E_HAS_MOCK_LIVE_SUBSCRIPTION__ = ({ channelName, kind }) => {
     const channel = mockChannels.find(
@@ -9539,6 +9945,8 @@ export function maybeInstallE2eTauriMocks() {
         // seeded empty/default path as valid so Add Community can continue to
         // relay-policy discovery.
         return;
+      case "fetch_join_policy":
+        return activeConfig?.mock?.joinPolicy ?? null;
       case "apply_workspace": {
         const applyDelayMs = activeConfig?.mock?.applyCommunityDelayMs ?? 0;
         if (applyDelayMs > 0) {
@@ -9713,6 +10121,13 @@ export function maybeInstallE2eTauriMocks() {
         return {
           additions: 27,
           deletions: 4,
+          commit_body: [
+            "See the [project guide](https://example.com/project-guide).",
+            "",
+            "![Architecture](/buzz.svg)",
+            "",
+            "![Demo](https://example.com/project-demo.mp4)",
+          ].join("\n"),
           files: [
             {
               path: "desktop/src/features/projects/ui/ProjectDetailScreen.tsx",
@@ -10094,6 +10509,15 @@ export function maybeInstallE2eTauriMocks() {
         return activeConfig?.mock?.relayRequiresMembership ?? false;
       case "discover_acp_providers":
         return handleDiscoverAcpRuntimes(activeConfig);
+      case "save_custom_harness":
+        return handleSaveCustomHarness(
+          payload as Parameters<typeof handleSaveCustomHarness>[0],
+        );
+      case "delete_custom_harness":
+        return handleDeleteCustomHarness(
+          payload as Parameters<typeof handleDeleteCustomHarness>[0],
+          activeConfig,
+        );
       case "discover_acp_auth_methods":
         return handleDiscoverAcpAuthMethods(
           payload as { runtimeId?: string },
@@ -10137,6 +10561,11 @@ export function maybeInstallE2eTauriMocks() {
         return handleUpdatePersona(
           payload as Parameters<typeof handleUpdatePersona>[0],
         );
+      case "update_persona_and_publish":
+        return handleUpdatePersonaAndPublish(
+          payload as Parameters<typeof handleUpdatePersonaAndPublish>[0],
+          activeConfig,
+        );
       case "delete_persona":
         return handleDeletePersona(
           payload as Parameters<typeof handleDeletePersona>[0],
@@ -10160,11 +10589,16 @@ export function maybeInstallE2eTauriMocks() {
             };
             const now = new Date().toISOString();
             const existing = mockPersonas.find((p) => p.id === dTag);
+            const shared = nostrEvent.tags.some(
+              (tag) =>
+                tag.length === 2 && tag[0] === "shared" && tag[1] === "true",
+            );
             if (existing) {
               existing.display_name =
                 content.display_name ?? existing.display_name;
               existing.system_prompt =
                 content.system_prompt ?? existing.system_prompt;
+              existing.shared = shared;
               existing.updated_at = now;
             } else {
               mockPersonas.push({
@@ -10174,6 +10608,7 @@ export function maybeInstallE2eTauriMocks() {
                 system_prompt: content.system_prompt ?? "",
                 is_builtin: false,
                 is_active: true,
+                shared,
                 env_vars: {},
                 created_at: now,
                 updated_at: now,
@@ -10200,6 +10635,11 @@ export function maybeInstallE2eTauriMocks() {
         return handleSetPersonaActive(
           payload as Parameters<typeof handleSetPersonaActive>[0],
         );
+      case "set_persona_shared":
+        return handleSetPersonaShared(
+          payload as Parameters<typeof handleSetPersonaShared>[0],
+          activeConfig,
+        );
       case "list_teams":
         return handleListTeams();
       case "list_channel_templates":
@@ -10246,8 +10686,8 @@ export function maybeInstallE2eTauriMocks() {
         // Specs assert invocation via __BUZZ_E2E_COMMANDS__.
         return true;
       case "encode_agent_snapshot_for_send": {
-        // Return a minimal PNG-shaped payload so the send flow can proceed
-        // through upload_media_bytes without a real Rust encode step.
+        // Return the requested wire format so both message sharing (PNG) and
+        // community catalog publication (JSON) exercise their real branches.
         // Optional encodeDelayMs lets specs observe the "preparing" phase before
         // the upload begins.
         const encodeDelayMs = activeConfig?.mock?.encodeDelayMs ?? 0;
@@ -10256,6 +10696,46 @@ export function maybeInstallE2eTauriMocks() {
             window.setTimeout(resolve, encodeDelayMs),
           );
         }
+        const input = payload as {
+          id: string;
+          memoryLevel: "none" | "core" | "everything";
+          format: "json" | "png";
+        };
+        if (input.format === "json") {
+          const persona = mockPersonas.find(
+            (candidate) => candidate.id === input.id,
+          );
+          const snapshot = {
+            format: "buzz-agent-snapshot",
+            version: 1,
+            definition: {
+              name: persona?.display_name ?? "E2E Agent",
+              sourceIsBuiltIn: persona?.is_builtin ?? false,
+              systemPrompt: persona?.system_prompt ?? "",
+              runtime: persona?.runtime ?? null,
+              model: persona?.model ?? null,
+              provider: persona?.provider ?? null,
+              respondTo: persona?.respond_to ?? null,
+              respondToAllowlist: persona?.respond_to_allowlist ?? [],
+              namePool: persona?.name_pool ?? [],
+            },
+            profile: {
+              displayName: persona?.display_name ?? "E2E Agent",
+              avatarUrl: persona?.avatar_url ?? null,
+            },
+            memory: {
+              level: input.memoryLevel,
+              entries: [],
+            },
+          };
+          const fileBytes = Array.from(
+            new TextEncoder().encode(JSON.stringify(snapshot)),
+          );
+          return {
+            fileBytes,
+            fileName: "e2e-agent.agent.json",
+          };
+        }
         return {
           fileBytes: [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a],
           fileName: "e2e-agent.agent.png",
@@ -10265,6 +10745,9 @@ export function maybeInstallE2eTauriMocks() {
         // Return a minimal preview — no writes performed.
         return {
           displayName: "Imported Agent",
+          isBuiltIn: true,
+          model: "claude-opus-4-5",
+          runtime: "goose",
           systemPrompt: null,
           avatarUrl: null,
           memoryLevel: "none",
@@ -10776,7 +11259,10 @@ export function maybeInstallE2eTauriMocks() {
       case "pick_and_upload_image":
         return (await resolveMockUploadDescriptors(activeConfig))[0] ?? null;
       case "upload_media_bytes":
-        return (await resolveMockUploadDescriptors(activeConfig))[0];
+        return resolveMockUploadDescriptorForBytes(
+          payload as { data: number[]; filename?: string | null },
+          activeConfig,
+        );
       case "fetch_media_bytes": {
         // The real command fetches relay media through Rust reqwest and
         // replies with raw bytes (`tauri::ipc::Response` → ArrayBuffer). In
@@ -10992,8 +11478,13 @@ export function maybeInstallE2eTauriMocks() {
       case "plugin:event|listen":
         // Tauri event system (pairing, huddle) — no-op in e2e, return unlisten fn ID
         return Math.floor(Math.random() * 1_000_000);
-      case "start_pairing":
+      case "start_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";
+      }
       case "cancel_pairing":
       case "confirm_pairing_sas":
         return null;
diff --git a/desktop/src/testing/e2eBridgeCustomHarnesses.test.mjs b/desktop/src/testing/e2eBridgeCustomHarnesses.test.mjs
new file mode 100644
index 0000000000..0a0fb36a92
--- /dev/null
+++ b/desktop/src/testing/e2eBridgeCustomHarnesses.test.mjs
@@ -0,0 +1,246 @@
+/**
+ * Unit tests for the e2eBridge custom harness handlers (C-10).
+ *
+ * Tests are imported directly from the extracted e2eBridgeCustomHarnesses.ts
+ * module — no Tauri mock or browser environment needed — to prove:
+ *
+ *  1. save returns a catalog entry with source "custom" and correct fields
+ *  2. definition_env is preserved through save (non-empty env)
+ *  3. empty env produces absent definition_env (mirrors Rust BTreeMap serialization)
+ *  4. same-ID edit replaces the existing entry in the store (no duplicates)
+ *  5. rename (originalId ≠ id) removes the old key and inserts the new one
+ *  6. delete removes the entry from the store
+ *  7. delete is idempotent (not-found does not throw)
+ *  8. discover integration: saved harness appears in the discover result set
+ *     alongside the default catalog (verifies the Map is shared by reference)
+ */
+import assert from "node:assert/strict";
+import { beforeEach, describe, it } from "node:test";
+
+import {
+  mockCustomHarnesses,
+  mergeMockCustomHarnesses,
+  resetMockCustomHarnesses,
+  handleSaveCustomHarness,
+  handleDeleteCustomHarness,
+} from "./e2eBridgeCustomHarnesses.ts";
+
+function makeArgs(overrides = {}) {
+  return {
+    definition: {
+      id: overrides.id ?? "test-harness",
+      label: overrides.label ?? "Test Harness",
+      command: overrides.command ?? "test-bin",
+      args: overrides.args ?? [],
+      env: overrides.env ?? {},
+      installInstructionsUrl: overrides.installInstructionsUrl ?? "",
+      installHint: overrides.installHint ?? "",
+    },
+    originalId: overrides.originalId ?? null,
+  };
+}
+
+// Reset the store before every test so tests are independent.
+beforeEach(() => resetMockCustomHarnesses());
+
+// ── save_custom_harness ───────────────────────────────────────────────────────
+
+describe("handleSaveCustomHarness", () => {
+  it("returns a catalog entry with source 'custom'", () => {
+    const entry = handleSaveCustomHarness(
+      makeArgs({ id: "my-rt", label: "My RT" }),
+    );
+    assert.equal(entry.id, "my-rt");
+    assert.equal(entry.label, "My RT");
+    assert.equal(entry.source, "custom");
+  });
+
+  it("stores the entry in mockCustomHarnesses", () => {
+    handleSaveCustomHarness(makeArgs({ id: "stored" }));
+    assert.ok(
+      mockCustomHarnesses.has("stored"),
+      "store must contain the saved id",
+    );
+  });
+
+  it("preserves non-empty definition_env", () => {
+    const env = { ANTHROPIC_API_KEY: "sk-test", MODEL: "claude-3" };
+    const entry = handleSaveCustomHarness(makeArgs({ id: "env-rt", env }));
+    assert.deepStrictEqual(entry.definition_env, env);
+    assert.deepStrictEqual(
+      mockCustomHarnesses.get("env-rt")?.definition_env,
+      env,
+    );
+  });
+
+  it("produces absent definition_env for empty env (mirrors Rust BTreeMap skip)", () => {
+    const entry = handleSaveCustomHarness(makeArgs({ id: "no-env", env: {} }));
+    assert.ok(
+      entry.definition_env === undefined || entry.definition_env === null,
+      "empty env must yield absent definition_env",
+    );
+  });
+
+  it("same-ID edit replaces entry — no duplicates in the store", () => {
+    handleSaveCustomHarness(makeArgs({ id: "dup", label: "V1" }));
+    handleSaveCustomHarness(
+      makeArgs({ id: "dup", label: "V2", originalId: "dup" }),
+    );
+    assert.equal(
+      mockCustomHarnesses.size,
+      1,
+      "same-ID edit must not duplicate store entries",
+    );
+    assert.equal(mockCustomHarnesses.get("dup")?.label, "V2");
+  });
+
+  it("rename removes old key and inserts new key", () => {
+    handleSaveCustomHarness(makeArgs({ id: "old-rt", label: "Old" }));
+    handleSaveCustomHarness(
+      makeArgs({ id: "new-rt", label: "New", originalId: "old-rt" }),
+    );
+    assert.ok(
+      !mockCustomHarnesses.has("old-rt"),
+      "old key must be removed on rename",
+    );
+    assert.ok(
+      mockCustomHarnesses.has("new-rt"),
+      "new key must be present after rename",
+    );
+    assert.equal(mockCustomHarnesses.get("new-rt")?.label, "New");
+  });
+});
+
+// ── delete_custom_harness ────────────────────────────────────────────────────
+
+describe("handleDeleteCustomHarness", () => {
+  it("removes an existing entry from the store", () => {
+    handleSaveCustomHarness(makeArgs({ id: "to-delete" }));
+    assert.ok(mockCustomHarnesses.has("to-delete"));
+
+    handleDeleteCustomHarness({ id: "to-delete" });
+    assert.ok(
+      !mockCustomHarnesses.has("to-delete"),
+      "entry must be removed after delete",
+    );
+  });
+
+  it("is idempotent — deleting non-existent id does not throw", () => {
+    assert.doesNotThrow(
+      () => handleDeleteCustomHarness({ id: "never-existed" }),
+      "delete of non-existent id must not throw",
+    );
+  });
+
+  it("throws when deleteCustomHarnessError knob is set", () => {
+    handleSaveCustomHarness(makeArgs({ id: "keep-alive" }));
+    const config = { mock: { deleteCustomHarnessError: "permission denied" } };
+    assert.throws(
+      () => handleDeleteCustomHarness({ id: "keep-alive" }, config),
+      /permission denied/,
+      "must throw the injected error message",
+    );
+    // Entry must remain in store — the error means delete did not complete.
+    assert.ok(
+      mockCustomHarnesses.has("keep-alive"),
+      "entry must remain when delete throws",
+    );
+  });
+});
+
+// ── discover integration: store is shared by reference ───────────────────────
+
+describe("mergeMockCustomHarnesses", () => {
+  const seeded = (id, label = id) => ({ id, label, source: "custom" });
+
+  it("appends a newly saved harness that is not in the seeded catalog", () => {
+    handleSaveCustomHarness(makeArgs({ id: "added", label: "Added" }));
+    const merged = mergeMockCustomHarnesses([seeded("preset-a")]);
+    assert.deepEqual(
+      merged.map((e) => e.id),
+      ["preset-a", "added"],
+    );
+  });
+
+  it("replaces a seeded entry in place on same-id save — no duplicate row", () => {
+    handleSaveCustomHarness(makeArgs({ id: "seeded-one", label: "V2" }));
+    const merged = mergeMockCustomHarnesses([
+      seeded("preset-a"),
+      seeded("seeded-one", "V1"),
+    ]);
+    assert.deepEqual(
+      merged.map((e) => e.id),
+      ["preset-a", "seeded-one"],
+      "must not duplicate the id",
+    );
+    assert.equal(
+      merged.find((e) => e.id === "seeded-one").label,
+      "V2",
+      "saved entry must win over the seed",
+    );
+  });
+
+  it("drops a deleted seeded entry (tombstone, not just store removal)", () => {
+    // The regression: a seeded row has no store entry to delete, so without a
+    // tombstone the row survived the delete and the spec failed.
+    handleDeleteCustomHarness({ id: "seeded-one" });
+    const merged = mergeMockCustomHarnesses([
+      seeded("preset-a"),
+      seeded("seeded-one"),
+    ]);
+    assert.deepEqual(
+      merged.map((e) => e.id),
+      ["preset-a"],
+    );
+  });
+
+  it("drops the vacated old id after a rename and surfaces the new one", () => {
+    handleSaveCustomHarness(
+      makeArgs({ id: "new-id", label: "New", originalId: "old-id" }),
+    );
+    const merged = mergeMockCustomHarnesses([seeded("old-id", "Old")]);
+    assert.deepEqual(
+      merged.map((e) => e.id),
+      ["new-id"],
+    );
+  });
+
+  it("re-saving a deleted id resurrects it", () => {
+    handleDeleteCustomHarness({ id: "seeded-one" });
+    handleSaveCustomHarness(makeArgs({ id: "seeded-one", label: "Back" }));
+    const merged = mergeMockCustomHarnesses([seeded("seeded-one", "Original")]);
+    assert.deepEqual(
+      merged.map((e) => e.id),
+      ["seeded-one"],
+    );
+    assert.equal(merged[0].label, "Back");
+  });
+
+  it("leaves a seeded catalog untouched when nothing has been mutated", () => {
+    const base = [seeded("preset-a"), seeded("preset-b")];
+    assert.deepEqual(
+      mergeMockCustomHarnesses(base).map((e) => e.id),
+      ["preset-a", "preset-b"],
+    );
+  });
+});
+
+describe("mockCustomHarnesses Map reference", () => {
+  it("handler writes are immediately visible to callers that read the exported Map", () => {
+    // handleDiscoverAcpRuntimes merges this store into the catalog it returns.
+    // The exported Map is the same object by reference, so writes via the
+    // handler are visible to any reader of the Map.
+    assert.equal(
+      mockCustomHarnesses.size,
+      0,
+      "store must be empty after reset",
+    );
+
+    handleSaveCustomHarness(makeArgs({ id: "visible", label: "Visible" }));
+    assert.equal(mockCustomHarnesses.size, 1);
+
+    const [entry] = Array.from(mockCustomHarnesses.values());
+    assert.equal(entry.id, "visible");
+    assert.equal(entry.source, "custom");
+  });
+});
diff --git a/desktop/src/testing/e2eBridgeCustomHarnesses.ts b/desktop/src/testing/e2eBridgeCustomHarnesses.ts
new file mode 100644
index 0000000000..b72ecadd34
--- /dev/null
+++ b/desktop/src/testing/e2eBridgeCustomHarnesses.ts
@@ -0,0 +1,127 @@
+/**
+ * In-memory custom harness store for the e2e bridge.
+ *
+ * Extracted as a separate module so the handler logic can be unit-tested
+ * independently of the full e2eBridge.ts context (which requires a browser
+ * environment and full Playwright setup).
+ */
+import type { RawAcpRuntimeCatalogEntry } from "../shared/api/tauri.ts";
+
+/** In-memory store for custom harnesses saved via `save_custom_harness`. */
+export const mockCustomHarnesses = new Map<string, RawAcpRuntimeCatalogEntry>();
+
+/**
+ * Ids removed via `delete_custom_harness` (or vacated by a rename).
+ *
+ * Needed because a test's `acpRuntimesCatalog` seed is static config, not the
+ * mutation store: deleting a seeded row leaves nothing to remove from
+ * `mockCustomHarnesses`, so without a tombstone the row would survive the
+ * delete and the mock would report success while the UI still shows it.
+ */
+export const mockDeletedCustomHarnesses = new Set<string>();
+
+/** Reset the store between tests. */
+export function resetMockCustomHarnesses(): void {
+  mockCustomHarnesses.clear();
+  mockDeletedCustomHarnesses.clear();
+}
+
+/**
+ * Overlay the mutation store onto a seeded catalog.
+ *
+ * Deleted ids drop out, saved ids replace their seeded entry in place (so a
+ * same-id edit updates rather than duplicates), and newly added ids append.
+ */
+export function mergeMockCustomHarnesses(
+  base: RawAcpRuntimeCatalogEntry[],
+): RawAcpRuntimeCatalogEntry[] {
+  const merged = base.filter(
+    (entry) => !mockDeletedCustomHarnesses.has(entry.id),
+  );
+  for (const entry of mockCustomHarnesses.values()) {
+    const index = merged.findIndex((existing) => existing.id === entry.id);
+    if (index === -1) {
+      merged.push(entry);
+    } else {
+      merged[index] = entry;
+    }
+  }
+  return merged;
+}
+
+/**
+ * Handle `save_custom_harness`.
+ *
+ * Persists the definition into `mockCustomHarnesses` so that the next
+ * `discover_acp_providers` call includes it. Mirrors the Rust command's
+ * return shape: an `AcpRuntimeCatalogEntry` for the saved harness.
+ */
+export function handleSaveCustomHarness(args: {
+  definition?: {
+    id?: string;
+    label?: string;
+    command?: string;
+    args?: string[];
+    env?: Record<string, string>;
+    installInstructionsUrl?: string;
+    installHint?: string;
+  };
+  originalId?: string | null;
+}): RawAcpRuntimeCatalogEntry {
+  const def = args.definition ?? {};
+  const id = def.id ?? "";
+  const originalId = args.originalId ?? null;
+
+  // On rename: remove the old entry so the old id is no longer in the catalog.
+  if (originalId && originalId !== id) {
+    mockCustomHarnesses.delete(originalId);
+    mockDeletedCustomHarnesses.add(originalId);
+  }
+  // A save resurrects an id that an earlier test step deleted.
+  mockDeletedCustomHarnesses.delete(id);
+
+  const entry: RawAcpRuntimeCatalogEntry = {
+    id,
+    label: def.label ?? id,
+    avatar_url: "",
+    availability: "not_installed", // PATH not probed in e2e mock
+    command: def.command ?? null,
+    binary_path: null,
+    default_args: def.args ?? [],
+    mcp_command: null,
+    install_hint: def.installHint ?? "",
+    install_instructions_url: def.installInstructionsUrl ?? "",
+    can_auto_install: false,
+    requires_external_cli: true,
+    underlying_cli_path: null,
+    node_required: false,
+    auth_status: { status: "not_applicable" },
+    source: "custom",
+    // Omit definition_env when the env map is empty — mirrors Rust's BTreeMap
+    // serialization which skips empty maps so the field is absent on the wire.
+    definition_env:
+      def.env && Object.keys(def.env).length > 0 ? def.env : undefined,
+    login_hint: undefined,
+  };
+  mockCustomHarnesses.set(id, entry);
+  return entry;
+}
+
+/**
+ * Handle `delete_custom_harness`.
+ * Removes the harness from the in-memory store. Idempotent (not-found is OK).
+ * When `config?.mock?.deleteCustomHarnessError` is set, throws with that message
+ * to exercise the UI's inline error path.
+ */
+export function handleDeleteCustomHarness(
+  args: { id?: string },
+  config?: { mock?: { deleteCustomHarnessError?: string } } | undefined,
+): void {
+  const errorMsg = config?.mock?.deleteCustomHarnessError;
+  if (errorMsg) {
+    throw new Error(errorMsg);
+  }
+  const id = args.id ?? "";
+  mockCustomHarnesses.delete(id);
+  mockDeletedCustomHarnesses.add(id);
+}
diff --git a/desktop/src/testing/e2eBridgeSearch.test.mjs b/desktop/src/testing/e2eBridgeSearch.test.mjs
new file mode 100644
index 0000000000..21c1a83bbc
--- /dev/null
+++ b/desktop/src/testing/e2eBridgeSearch.test.mjs
@@ -0,0 +1,81 @@
+/**
+ * Unit tests for the e2e bridge's mock `search_messages` predicate.
+ *
+ * The mock stands in for the relay in identity-less E2E runs, so its `since` /
+ * `until` comparators must match the relay's inclusive NIP-01 bounds
+ * (`crates/buzz-core/src/filter.rs` keeps `since <= created_at <= until`).
+ * `before:YYYY-MM-DD` gets its exclusivity from `parseSearchOperators`, which
+ * emits `localMidnight - 1`; a mock that also excluded its own bound would
+ * drop the last second of the range that production returns.
+ */
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { mockSearchHitMatches } from "./e2eBridge.ts";
+
+const NO_FILTERS = { query: "", authorSet: null };
+
+function hitAt(created_at) {
+  return {
+    event_id: "hit",
+    content: "deploy notes",
+    kind: 9,
+    pubkey: "a".repeat(64),
+    channel_id: "9a1657ac-f7aa-5db0-b632-d8bbeb6dfb50",
+    channel_name: "general",
+    created_at,
+    score: 1,
+  };
+}
+
+test("until is inclusive, so a before: bound keeps its own second", () => {
+  const localMidnight = Math.floor(new Date(2024, 1, 1).getTime() / 1000);
+  // What parseSearchOperators emits for `before:2024-02-01`.
+  const until = localMidnight - 1;
+
+  assert.equal(
+    mockSearchHitMatches(hitAt(until), { ...NO_FILTERS, until }),
+    true,
+  );
+  assert.equal(
+    mockSearchHitMatches(hitAt(localMidnight), { ...NO_FILTERS, until }),
+    false,
+  );
+});
+
+test("since is inclusive and excludes only earlier timestamps", () => {
+  const since = Math.floor(new Date(2024, 0, 15).getTime() / 1000);
+
+  assert.equal(
+    mockSearchHitMatches(hitAt(since), { ...NO_FILTERS, since }),
+    true,
+  );
+  assert.equal(
+    mockSearchHitMatches(hitAt(since - 1), { ...NO_FILTERS, since }),
+    false,
+  );
+});
+
+test("channel, author, and text filters still narrow results", () => {
+  const hit = hitAt(1_700_000_000);
+
+  assert.equal(
+    mockSearchHitMatches(hit, { ...NO_FILTERS, channelId: "other-channel" }),
+    false,
+  );
+  assert.equal(
+    mockSearchHitMatches(hit, {
+      ...NO_FILTERS,
+      authorSet: new Set(["b".repeat(64)]),
+    }),
+    false,
+  );
+  assert.equal(
+    mockSearchHitMatches(hit, { query: "zzz", authorSet: null }),
+    false,
+  );
+  assert.equal(
+    mockSearchHitMatches(hit, { query: "deploy", authorSet: null }),
+    true,
+  );
+});
diff --git a/desktop/test-loader-hooks.mjs b/desktop/test-loader-hooks.mjs
index c71cc18599..0cc99158ac 100644
--- a/desktop/test-loader-hooks.mjs
+++ b/desktop/test-loader-hooks.mjs
@@ -1,4 +1,4 @@
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import fs from "node:fs";
 import path from "node:path";
 import ts from "typescript";
@@ -13,6 +13,17 @@ const repoRoot = path.resolve(
   "..",
 );
 
+// `nextResolve` requires specifiers to be URLs or relative paths. Passing an
+// absolute filesystem path happens to work on POSIX (node coerces it), but on
+// Windows an absolute path like `C:\...` parses as a URL with protocol `c:`
+// and every test run dies with ERR_UNSUPPORTED_ESM_URL_SCHEME. Hand absolute
+// paths to node as proper file:// URLs on all platforms.
+function toFileSpecifier(candidatePath) {
+  return path.isAbsolute(candidatePath)
+    ? pathToFileURL(candidatePath).href
+    : candidatePath;
+}
+
 function resolveSourcePath(basePath) {
   // Existence decides, not path.extname — a dotted basename like
   // `ProfileAvatarEditor.utils` (→ .utils.ts on disk) looks like an
@@ -54,7 +65,20 @@ const stubModules = new Map([
 
 const STUB_URL_PREFIX = "buzz-test-stub:";
 
+// Vite resolves asset imports (`./logo.png`, `./logo.png?inline`) to a URL or
+// base64 string at bundle time; node's ESM resolver has no such loader and
+// throws on the query suffix. Serve an inert string so components that embed
+// assets stay unit-testable.
+const ASSET_SPECIFIER = /\.(?:png|jpe?g|gif|svg|webp|avif|ico)(?:\?[^/]*)?$/;
+const ASSET_URL_PREFIX = "buzz-test-asset:";
+
 export function resolve(specifier, context, nextResolve) {
+  if (ASSET_SPECIFIER.test(specifier)) {
+    return {
+      shortCircuit: true,
+      url: `${ASSET_URL_PREFIX}${specifier}`,
+    };
+  }
   if (stubModules.has(specifier)) {
     return {
       shortCircuit: true,
@@ -63,7 +87,7 @@ export function resolve(specifier, context, nextResolve) {
   }
   if (specifier === "@features-manifest") {
     const resolved = path.join(repoRoot, "preview-features.json");
-    return nextResolve(resolved, context);
+    return nextResolve(toFileSpecifier(resolved), context);
   }
   if (specifier.startsWith("@/")) {
     const stripped = specifier.slice(2);
@@ -73,7 +97,10 @@ export function resolve(specifier, context, nextResolve) {
     // Otherwise paths like `@/.../foo.mjs` would be coerced into `foo.mjs.ts`
     // and fail to resolve.
     const resolved = resolveSourcePath(`${srcRoot}/${stripped}`);
-    return nextResolve(resolved ?? `${srcRoot}/${stripped}`, context);
+    return nextResolve(
+      toFileSpecifier(resolved ?? `${srcRoot}/${stripped}`),
+      context,
+    );
   }
   // Resolve extensionless relative TS imports (e.g. `./parseImeta`) — the app's
   // bundler adds the extension, but node's ESM resolver does not. Without this,
@@ -90,7 +117,7 @@ export function resolve(specifier, context, nextResolve) {
       path.resolve(path.dirname(parentPath), specifier),
     );
     if (resolved) {
-      return nextResolve(resolved, context);
+      return nextResolve(toFileSpecifier(resolved), context);
     }
     return nextResolve(specifier, context);
   }
@@ -98,6 +125,14 @@ export function resolve(specifier, context, nextResolve) {
 }
 
 export async function load(url, context, nextLoad) {
+  if (url.startsWith(ASSET_URL_PREFIX)) {
+    return {
+      format: "module",
+      shortCircuit: true,
+      source: 'export default "test-asset";\n',
+    };
+  }
+
   if (url.startsWith(STUB_URL_PREFIX)) {
     return {
       format: "module",
diff --git a/desktop/tests/e2e/agent-readiness-screenshots.spec.ts b/desktop/tests/e2e/agent-readiness-screenshots.spec.ts
index 8f4c7d1478..a92efcd40a 100644
--- a/desktop/tests/e2e/agent-readiness-screenshots.spec.ts
+++ b/desktop/tests/e2e/agent-readiness-screenshots.spec.ts
@@ -18,7 +18,7 @@ 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 from scratch" }).click();
+  await page.getByRole("menuitem", { name: "Create agent" }).click();
   await page.locator("#persona-display-name").fill("Test Agent");
 }
 
diff --git a/desktop/tests/e2e/agent-snapshot-recipient.spec.ts b/desktop/tests/e2e/agent-snapshot-recipient.spec.ts
index a20c649df4..9ce80593f1 100644
--- a/desktop/tests/e2e/agent-snapshot-recipient.spec.ts
+++ b/desktop/tests/e2e/agent-snapshot-recipient.spec.ts
@@ -271,6 +271,13 @@ test("recipient_import_navigates_to_agents_and_opens_preview", async ({
 
   // Decoded display name must appear.
   await expect(dialog).toContainText("Imported Agent");
+  const metadata = dialog.getByTestId("agent-definition-metadata");
+  await expect(metadata).toContainText("Type");
+  await expect(metadata).toContainText("Built-in agent");
+  await expect(metadata).toContainText("Preferred model");
+  await expect(metadata).toContainText("claude-opus-4-5");
+  await expect(metadata).toContainText("Preferred runtime");
+  await expect(metadata).toContainText("goose");
 });
 
 // ── Confirm imports the agent ─────────────────────────────────────────────────
diff --git a/desktop/tests/e2e/agents.spec.ts b/desktop/tests/e2e/agents.spec.ts
index 3c0c60d935..13eda788b1 100644
--- a/desktop/tests/e2e/agents.spec.ts
+++ b/desktop/tests/e2e/agents.spec.ts
@@ -1,8 +1,43 @@
 import { expect, test } from "@playwright/test";
 
+import type { RelayEvent } from "@/shared/api/types";
+
+import { emojiAvatarDataUrl } from "@/features/profile/ui/ProfileAvatarEditor.utils";
+
 import { waitForAnimations } from "../helpers/animations";
 import { installMockBridge, TEST_IDENTITIES } from "../helpers/bridge";
 
+function createCatalogEvent(input: {
+  ownerPubkey: string;
+  sourcePersonaId: string;
+  displayName: string;
+  systemPrompt: string;
+  createdAt?: number;
+  shared?: boolean;
+  avatarUrl?: string;
+}): RelayEvent {
+  return {
+    id: "1".repeat(64),
+    pubkey: input.ownerPubkey,
+    created_at: input.createdAt ?? 1_721_750_400,
+    kind: 30175,
+    tags: [
+      ["d", input.sourcePersonaId],
+      ...(input.shared === false ? [] : [["shared", "true"]]),
+    ],
+    content: JSON.stringify({
+      display_name: input.displayName,
+      system_prompt: input.systemPrompt,
+      avatar_url: input.avatarUrl ?? null,
+      runtime: null,
+      model: null,
+      provider: null,
+      name_pool: [],
+    }),
+    sig: "2".repeat(128),
+  };
+}
+
 test.beforeEach(async ({ page }) => {
   await installMockBridge(page);
 });
@@ -32,7 +67,9 @@ 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", { name: "Choose from catalog" }).click();
+  await page
+    .getByRole("menuitem", { exact: true, name: "Discover agents" })
+    .click();
 }
 
 async function getCatalogOrder(page: import("@playwright/test").Page) {
@@ -50,12 +87,19 @@ async function selectCatalogPersona(
   await page.getByTestId(`persona-catalog-list-item-${personaId}`).click();
 }
 
-async function useCatalogPersona(
+async function sharePersonaToCatalog(
   page: import("@playwright/test").Page,
-  personaId: string,
+  displayName: string,
 ) {
+  await page.getByLabel(`Open actions for ${displayName}`).click();
+  await page.getByRole("menuitem", { name: "Share" }).click();
+  await page.getByTestId("persona-share-catalog-access").click();
   await page
-    .getByTestId(`persona-catalog-use-agent-target-${personaId}`)
+    .getByRole("menuitemradio", { name: "Shared", exact: true })
+    .click();
+  await page
+    .getByTestId("persona-share-dialog")
+    .getByRole("button", { name: "Close" })
     .click();
 }
 
@@ -154,78 +198,86 @@ async function invokeTauriExpectError(
   );
 }
 
-test("built-in personas are used from the catalog dialog", async ({ page }) => {
+async function countCommandInvocations(
+  page: import("@playwright/test").Page,
+  command: string,
+): Promise<number> {
+  return page.evaluate(
+    (targetCommand) =>
+      (
+        window as Window & {
+          __BUZZ_E2E_COMMANDS__?: string[];
+        }
+      ).__BUZZ_E2E_COMMANDS__?.filter((invoked) => invoked === targetCommand)
+        .length ?? 0,
+    command,
+  );
+}
+
+test("catalog hides built-ins and shows the shared-agent empty state", async ({
+  page,
+}) => {
   await page.setViewportSize({ width: 1280, height: 420 });
+  await installMockBridge(page, {
+    activePersonaIds: ["builtin:fizz", "builtin:honey", "builtin:bumble"],
+  });
   await gotoApp(page);
   await page.getByTestId("open-agents-view").click();
 
   await expect(page.getByTestId("agents-library-personas")).toBeVisible();
-  await openPersonaCatalog(page);
-  await expect(page.getByTestId("persona-catalog-dialog")).toContainText(
-    "Fizz",
-  );
   for (const personaName of ["Fizz", "Honey", "Bumble"]) {
-    await expect(page.getByTestId("persona-catalog-dialog")).toContainText(
+    await expect(page.getByTestId("agents-library-personas")).toContainText(
       personaName,
     );
   }
-  for (const retiredPersonaName of [
-    "Product Strategist",
-    "Implementation Partner",
-    "QA Reviewer",
-    "Work Coordinator",
-    "Support Guide",
-    "Experiment Designer",
-  ]) {
+
+  await openPersonaCatalog(page);
+  for (const personaName of ["Fizz", "Honey", "Bumble"]) {
     await expect(page.getByTestId("persona-catalog-dialog")).not.toContainText(
-      retiredPersonaName,
+      personaName,
     );
   }
   await expect(page.getByTestId("persona-catalog-dialog-header")).toBeVisible();
-  await expect(
-    page.getByTestId("persona-catalog-dialog-scroll-area"),
-  ).toBeVisible();
-  await expect(
-    page.getByTestId("persona-catalog-dialog-scroll-area"),
-  ).toHaveCSS("overflow-y", "auto");
-  const catalogScrollAreaMetrics = await page
-    .getByTestId("persona-catalog-dialog-scroll-area")
-    .evaluate((element) => ({
-      clientHeight: element.clientHeight,
-      scrollHeight: element.scrollHeight,
-    }));
-  expect(catalogScrollAreaMetrics.clientHeight).toBeGreaterThan(0);
-  expect(catalogScrollAreaMetrics.scrollHeight).toBeGreaterThanOrEqual(
-    catalogScrollAreaMetrics.clientHeight,
-  );
   await expect(page.getByTestId("persona-catalog-dialog-body")).toBeVisible();
-  await expect(page.getByTestId("persona-catalog-dialog")).not.toContainText(
-    "Done",
-  );
-  await expect(page.getByRole("tooltip")).toHaveCount(0);
-  const initialCatalogOrder = await getCatalogOrder(page);
-
-  await selectCatalogPersona(page, "builtin:fizz");
-  await useCatalogPersona(page, "builtin:fizz");
+  const emptyState = page.getByTestId("persona-catalog-empty-state");
+  await expect(emptyState).toContainText("No agents are being shared");
   await expect(
-    page
-      .locator("[data-sonner-toast]")
-      .filter({ hasText: "Selected Fizz for My Agents." }),
+    emptyState.getByTestId("persona-catalog-empty-agent-artwork"),
   ).toBeVisible();
+  await expect(
+    page.locator('[data-testid^="persona-catalog-list-item-"]'),
+  ).toHaveCount(0);
+  await expect(
+    page.getByTestId("persona-catalog-use-agent-target"),
+  ).toHaveCount(0);
 
-  await expect(page.getByTestId("agents-library-personas")).toContainText(
-    "Fizz",
+  await page
+    .getByTestId("persona-catalog-dialog")
+    .getByRole("button", { name: "Close" })
+    .click();
+  await page.getByLabel("Open actions for Fizz").click();
+  await page.getByRole("menuitem", { name: "Share" }).click();
+  await expect(page.getByTestId("persona-share-catalog")).toHaveCount(0);
+  await expect(page.getByTestId("persona-share-catalog-access")).toHaveCount(0);
+});
+
+test("catalog empty state remains available after reopening", async ({
+  page,
+}) => {
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+  await openPersonaCatalog(page);
+  await expect(page.getByTestId("persona-catalog-empty-state")).toBeVisible();
+
+  await page
+    .getByTestId("persona-catalog-dialog")
+    .getByRole("button", { name: "Close" })
+    .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.getByTestId("persona-catalog-use-agent-target-builtin:fizz"),
-  ).toHaveText("Added to My Agents");
-  await expect(
-    page.getByTestId("persona-catalog-use-agent-target-builtin:fizz"),
-  ).toBeDisabled();
-  await expect(page.getByTestId("persona-catalog-dialog")).not.toContainText(
-    "Delete",
-  );
-  await expect.poll(() => getCatalogOrder(page)).toEqual(initialCatalogOrder);
 });
 
 test("built-in persona edits persist", async ({ page }) => {
@@ -263,13 +315,40 @@ test("built-in persona edits persist", async ({ page }) => {
   });
 });
 
+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();
+  await page.getByRole("tab", { name: "Emoji" }).click();
+
+  const picker = page.locator("em-emoji-picker");
+  const searchInput = picker.locator("input[type='search']");
+  await expect(searchInput).toBeVisible();
+  await expect(searchInput).toBeFocused();
+
+  await searchInput.fill("rocket");
+  await picker.locator("button[aria-label='🚀']").first().click();
+
+  await expect(page.getByRole("img", { name: "Agent name avatar" })).toHaveText(
+    "🚀",
+  );
+});
+
 test("agent avatar emoji picker scrolls inside its popover", async ({
   page,
 }) => {
   await gotoApp(page);
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create from scratch" }).click();
+  await page
+    .getByRole("menuitem", { exact: true, name: "Create agent" })
+    .click();
 
   await expect(page.getByTestId("persona-dialog")).toBeVisible();
   await page.getByLabel("Add avatar").click();
@@ -306,70 +385,315 @@ test("agent avatar emoji picker scrolls inside its popover", async ({
     .toBeGreaterThan(before);
 });
 
-test("agent catalog can reopen from the populated library header", async ({
+test("the new agent card offers create, discover, and import", async ({
   page,
 }) => {
+  await installMockBridge(page, {
+    activePersonaIds: ["builtin:fizz", "builtin:honey", "builtin:bumble"],
+    personas: [
+      {
+        id: "custom:code-reviewer",
+        displayName: "Code Reviewer",
+        systemPrompt: "Review code changes.",
+      },
+    ],
+  });
   await gotoApp(page);
   await page.getByTestId("open-agents-view").click();
-  await openPersonaCatalog(page);
 
-  await selectCatalogPersona(page, "builtin:fizz");
-  await useCatalogPersona(page, "builtin:fizz");
-  await expect(page.getByTestId("agents-library-personas")).toContainText(
-    "Fizz",
+  const newAgentCard = page.getByTestId("new-agent-card");
+  await expect(newAgentCard).toHaveText("");
+  await expect(newAgentCard.locator(".lucide-plus")).toBeVisible();
+
+  const agentCards = page.locator(
+    '[data-testid^="persona-agent-row-"], [data-testid="new-agent-card"]',
   );
+  await expect(agentCards.first()).toBeVisible();
+  const headerBox = await page
+    .getByRole("heading", { level: 1, name: "Agents" })
+    .locator("../..")
+    .boundingBox();
+  const cardBoxes = await agentCards.evaluateAll((cards) =>
+    cards.map((card) => {
+      const box = card.getBoundingClientRect();
+      return { right: box.right, top: box.top };
+    }),
+  );
+  const firstRowTop = Math.min(...cardBoxes.map(({ top }) => top));
+  const rightmostFirstRowCard = Math.max(
+    ...cardBoxes
+      .filter(({ top }) => Math.abs(top - firstRowTop) < 1)
+      .map(({ right }) => right),
+  );
+  expect(headerBox).not.toBeNull();
+  expect(
+    Math.abs(
+      (headerBox?.x ?? 0) + (headerBox?.width ?? 0) - rightmostFirstRowCard,
+    ),
+  ).toBeLessThan(1);
 
-  await page.keyboard.press("Escape");
-  await openPersonaCatalog(page);
-
-  await expect(page.getByTestId("persona-catalog-dialog")).toBeVisible();
-  await selectCatalogPersona(page, "builtin:fizz");
+  await newAgentCard.click();
   await expect(
-    page.getByTestId("persona-catalog-use-agent-target-builtin:fizz"),
-  ).toBeDisabled();
+    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 dialog = page.getByTestId("persona-dialog");
+  await expect(dialog).toBeVisible();
+  await expect(
+    dialog.getByTestId("import-agent-snapshot-dialog-action"),
+  ).toHaveCount(0);
+  await expect(dialog).not.toContainText("Enter a name for this agent.");
+
+  await dialog.getByRole("button", { name: "Cancel" }).click();
+  await newAgentCard.click();
+  const fileChooserPromise = page.waitForEvent("filechooser");
+  await page.getByRole("menuitem", { exact: true, name: "Import" }).click();
+  const fileChooser = await fileChooserPromise;
+  await fileChooser.setFiles({
+    buffer: Buffer.from("{}"),
+    mimeType: "application/json",
+    name: "imported.agent.json",
+  });
+  await expect(page.getByTestId("agent-snapshot-import-dialog")).toBeVisible();
+});
+
+test("the new team card offers create and import", async ({ page }) => {
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+
+  const newTeamCard = page.getByTestId("new-team-card");
+  await expect(newTeamCard).toHaveText("");
+  await expect(newTeamCard.locator(".lucide-plus")).toBeVisible();
+
+  await newTeamCard.click();
+  await expect(
+    page.getByRole("menuitem", { exact: true, name: "Create team" }),
+  ).toBeVisible();
+  await expect(
+    page.getByRole("menuitem", { exact: true, name: "Import" }),
+  ).toBeVisible();
+});
+
+test("team cards use the thread-style overlapping avatar stack", async ({
+  page,
+}) => {
+  const personaIds = ["custom:design", "custom:build", "custom:ship"];
+  await installMockBridge(page, {
+    personas: [
+      {
+        avatarUrl: "/onboarding/starter-team/fizz.png",
+        id: personaIds[0],
+        displayName: "Design",
+        systemPrompt: "You design interfaces.",
+      },
+      {
+        id: personaIds[1],
+        displayName: "Build",
+        systemPrompt: "You build interfaces.",
+      },
+      {
+        id: personaIds[2],
+        displayName: "Ship",
+        systemPrompt: "You ship interfaces.",
+      },
+    ],
+    teams: [
+      {
+        name: "Product crew",
+        personaIds,
+      },
+    ],
+  });
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+
+  const stack = page.getByLabel("Product crew member avatars");
+  const avatars = stack.locator('[data-team-member-avatar="avatar"]');
+  await expect(avatars).toHaveCount(3);
+  await expect(avatars.nth(1)).toHaveClass(/-ml-5/);
+  await expect(avatars.nth(2)).toHaveClass(/-ml-5/);
+
+  const boxes = await avatars.evaluateAll((elements) =>
+    elements.map((element) => {
+      const box = element.getBoundingClientRect();
+      return { left: box.left, right: box.right };
+    }),
+  );
+  expect(boxes[1]?.left).toBeLessThan(boxes[0]?.right ?? 0);
+  expect(boxes[2]?.left).toBeLessThan(boxes[1]?.right ?? 0);
+  await expect(avatars.first()).not.toHaveCSS("mask-image", "none");
+  await expect(avatars.last()).toHaveCSS("mask-image", "none");
+  const avatarSurfaceStyles = await avatars
+    .locator(":scope > *")
+    .evaluateAll((elements) =>
+      elements.map((element) => {
+        const styles = getComputedStyle(element);
+        const hasVisibleShadow = [
+          ...styles.boxShadow.matchAll(/rgba?\(([^)]+)\)/g),
+        ].some((match) => {
+          if (match[0].startsWith("rgb(")) return true;
+          const channels = match[1]?.split(/[\s,/]+/).filter(Boolean) ?? [];
+          return Number(channels.at(-1)) > 0;
+        });
+        return {
+          borderWidth: styles.borderTopWidth,
+          hasVisibleShadow,
+        };
+      }),
+    );
+  expect(avatarSurfaceStyles).toEqual([
+    { borderWidth: "0px", hasVisibleShadow: false },
+    { borderWidth: "0px", hasVisibleShadow: false },
+    { borderWidth: "0px", hasVisibleShadow: false },
+  ]);
+});
+
+test("agent defaults stays in the header without an actions menu", async ({
+  page,
+}) => {
+  await installMockBridge(page, {
+    acpRuntimesCatalog: [
+      {
+        auth_status: { status: "logged_in" },
+        availability: "available",
+        avatar_url: "",
+        binary_path: "/usr/local/bin/codex",
+        can_auto_install: false,
+        command: "codex",
+        default_args: [],
+        id: "codex",
+        install_hint: "",
+        install_instructions_url: "https://example.com",
+        label: "Codex",
+        login_hint: null,
+        mcp_command: null,
+        node_required: false,
+        underlying_cli_path: null,
+      },
+    ],
+    globalAgentConfig: {
+      env_vars: {},
+      model: "gpt-5.5[high]",
+      preferred_runtime: "codex",
+      provider: null,
+    },
+  });
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+
+  await expect(page.getByTestId("agent-header-actions-button")).toHaveCount(0);
+  await expect(
+    page.getByRole("menuitem", { name: "Import agent" }),
+  ).toHaveCount(0);
+
+  const defaultsButton = page.getByTestId("agent-defaults-button");
+  await expect(defaultsButton).toHaveText("Agent defaults");
+  await defaultsButton.click();
+  const defaultsDialog = page.getByTestId("agent-ai-defaults-dialog");
+  await expect(defaultsDialog).toBeVisible();
+  await expect(
+    defaultsDialog.getByTestId("global-agent-default-harness"),
+  ).toHaveAttribute("data-value", "codex");
+  await expect(
+    defaultsDialog.getByTestId("global-agent-default-harness"),
+  ).toContainText("Codex");
+  await expect(
+    defaultsDialog.getByTestId("global-agent-model"),
+  ).toHaveAttribute("data-value", "gpt-5.5[high]");
+  await expect(defaultsDialog.getByTestId("global-agent-model")).toContainText(
+    "gpt-5.5[high]",
+  );
+  await page.keyboard.press("Escape");
+  await expect(defaultsDialog).toHaveCount(0);
+});
+
+test("unconfigured agent defaults use the setup label", async ({ page }) => {
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+
+  await expect(page.getByTestId("agent-defaults-button")).toHaveText(
+    "Set agent defaults",
+  );
 });
 
 test("agent catalog chooser order stays stable when selection changes", async ({
   page,
 }) => {
+  await installMockBridge(page, {
+    personas: [
+      {
+        id: "custom:builder",
+        displayName: "Builder",
+        systemPrompt: "Build the requested change.",
+      },
+      {
+        id: "custom:reviewer",
+        displayName: "Reviewer",
+        systemPrompt: "Review the requested change.",
+      },
+    ],
+  });
   await gotoApp(page);
   await page.getByTestId("open-agents-view").click();
+  await sharePersonaToCatalog(page, "Builder");
+  await sharePersonaToCatalog(page, "Reviewer");
   await openPersonaCatalog(page);
 
   const before = await getCatalogOrder(page);
-
-  await selectCatalogPersona(page, "builtin:fizz");
-  await useCatalogPersona(page, "builtin:fizz");
-  await expect(
-    page
-      .locator("[data-sonner-toast]")
-      .filter({ hasText: "Selected Fizz for My Agents." }),
-  ).toBeVisible();
-
+  await selectCatalogPersona(page, "custom:reviewer");
   expect(await getCatalogOrder(page)).toEqual(before);
 });
 
 test("catalog detail pane shows the full persona details", async ({ page }) => {
+  const personaId = "custom:researcher";
+  await installMockBridge(page, {
+    personas: [
+      {
+        id: personaId,
+        displayName: "Researcher",
+        systemPrompt: "Research the question and cite the evidence.",
+      },
+    ],
+  });
   await gotoApp(page);
   await page.getByTestId("open-agents-view").click();
+  await sharePersonaToCatalog(page, "Researcher");
   await openPersonaCatalog(page);
 
-  await selectCatalogPersona(page, "builtin:fizz");
+  await selectCatalogPersona(page, personaId);
   const useAgentTarget = page.getByTestId(
-    "persona-catalog-use-agent-target-builtin:fizz",
+    `persona-catalog-use-agent-target-${personaId}`,
   );
 
   await expect(page.getByTestId("persona-catalog-detail-pane")).toContainText(
-    "Fizz",
-  );
-  await expect(
-    page.getByTestId("persona-catalog-detail-pane"),
-  ).not.toContainText("Added by You");
-  await expect(page.getByTestId("persona-catalog-detail-pane")).toContainText(
-    "You are Fizz.",
+    "Researcher",
   );
   await expect(page.getByTestId("persona-catalog-detail-pane")).toContainText(
-    "Built-in agent",
+    "Added by You",
+  );
+  await expect(page.getByTestId("persona-catalog-detail-pane")).toContainText(
+    "Research the question and cite the evidence.",
+  );
+  await expect(page.getByTestId("persona-catalog-detail-pane")).toContainText(
+    "Custom agent",
   );
   await expect(page.getByTestId("persona-catalog-detail-pane")).toContainText(
     "Preferred model",
@@ -382,14 +706,10 @@ test("catalog detail pane shows the full persona details", async ({ page }) => {
   );
   await expect(useAgentTarget).toHaveAttribute(
     "aria-label",
-    "Add Fizz from Agent Catalog",
-  );
-  await expect(useAgentTarget).toHaveText("Add agent");
-
-  await useAgentTarget.click();
-  await expect(page.getByTestId("agents-library-personas")).toContainText(
-    "Fizz",
+    "Researcher is already in My Agents",
   );
+  await expect(useAgentTarget).toHaveText("Added to My Agents");
+  await expect(useAgentTarget).toBeDisabled();
 });
 
 type AgentShareCommand = { command: string; payload: unknown };
@@ -563,43 +883,80 @@ test("custom personas share with people and keep export separate", async ({
   ).toHaveCount(0);
   await expect(shareDialog.getByText("Owner", { exact: true })).toHaveCount(0);
   await expect(shareDialog.getByText("(You)", { exact: true })).toHaveCount(0);
-  const copyLinkFooter = page.getByTestId("persona-share-copy-link-footer");
+  const linkRow = page.getByTestId("persona-share-link-row");
   await expect(
-    copyLinkFooter.getByRole("heading", { name: "Share with a link" }),
+    linkRow.getByRole("heading", { name: "Share with a link" }),
   ).toBeVisible();
   await expect(
-    copyLinkFooter.getByText("Anyone with the link can add and use a copy."),
+    linkRow.getByText("Anyone with the link can add and use a copy."),
   ).toHaveClass(/text-xs.*text-secondary-foreground\/75/);
   await expect(page.getByTestId("persona-share-send")).toHaveCount(0);
   const copyLinkButton = page.getByTestId("persona-share-copy-link");
-  const linkRow = page.getByTestId("persona-share-link-row");
   const linkIcon = page.getByTestId("persona-share-link-icon");
   const linkCopy = page.getByTestId("persona-share-link-copy");
-  const linkDivider = page.getByTestId("persona-share-link-divider");
-  const staticLinkAccess = page.getByTestId("persona-share-link-access");
+  const catalogSection = page.getByTestId("persona-share-catalog");
+  const staticShareLevel = page.getByTestId("persona-share-share-level");
+  const shareLevelRow = page.getByTestId("persona-share-share-level-row");
   await waitForAnimations(page);
   const [
     linkRowBox,
     initialCopyLinkButtonBox,
     linkIconBox,
     linkCopyBox,
-    linkDividerBox,
-    staticLinkAccessBox,
+    catalogSectionBox,
+    staticShareLevelBox,
+    shareLevelRowBox,
   ] = await Promise.all([
     linkRow.boundingBox(),
     copyLinkButton.boundingBox(),
     linkIcon.boundingBox(),
     linkCopy.boundingBox(),
-    linkDivider.boundingBox(),
-    staticLinkAccess.boundingBox(),
+    catalogSection.boundingBox(),
+    staticShareLevel.boundingBox(),
+    shareLevelRow.boundingBox(),
   ]);
   const sendDescriptionBox = await sendDescription.boundingBox();
-  expect((linkRowBox?.y ?? 0) - (sendDescriptionBox?.y ?? 0)).toBeGreaterThan(
-    (sendDescriptionBox?.height ?? 0) + 30,
+  const recipientFieldBox = await page
+    .getByTestId("persona-share-recipient-field")
+    .boundingBox();
+  // Reading order: who → how it goes out → what's included → catalog.
+  expect(sendDescriptionBox?.y ?? 0).toBeGreaterThanOrEqual(
+    (recipientFieldBox?.y ?? 0) + (recipientFieldBox?.height ?? 0),
   );
+  expect(linkRowBox?.y ?? 0).toBeGreaterThanOrEqual(
+    (sendDescriptionBox?.y ?? 0) + (sendDescriptionBox?.height ?? 0),
+  );
+  expect(shareLevelRowBox?.y ?? 0).toBeGreaterThanOrEqual(
+    (linkRowBox?.y ?? 0) + (linkRowBox?.height ?? 0),
+  );
+  expect(catalogSectionBox?.y ?? 0).toBeGreaterThanOrEqual(
+    (shareLevelRowBox?.y ?? 0) + (shareLevelRowBox?.height ?? 0),
+  );
+  // Copy link is the link row's own action, not a stranded footer button, so
+  // it rides on that row, vertically centred with the link icon and flush to
+  // the row's right edge.
   expect(initialCopyLinkButtonBox?.y ?? 0).toBeGreaterThanOrEqual(
-    (linkRowBox?.y ?? 0) + (linkRowBox?.height ?? 0) + 23,
+    linkRowBox?.y ?? 0,
   );
+  expect(
+    (initialCopyLinkButtonBox?.y ?? 0) +
+      (initialCopyLinkButtonBox?.height ?? 0),
+  ).toBeLessThanOrEqual((linkRowBox?.y ?? 0) + (linkRowBox?.height ?? 0) + 1);
+  expect(
+    Math.abs(
+      (initialCopyLinkButtonBox?.y ?? 0) +
+        (initialCopyLinkButtonBox?.height ?? 0) / 2 -
+        ((linkIconBox?.y ?? 0) + (linkIconBox?.height ?? 0) / 2),
+    ),
+  ).toBeLessThanOrEqual(1);
+  expect(
+    Math.abs(
+      (linkRowBox?.x ?? 0) +
+        (linkRowBox?.width ?? 0) -
+        ((initialCopyLinkButtonBox?.x ?? 0) +
+          (initialCopyLinkButtonBox?.width ?? 0)),
+    ),
+  ).toBeLessThanOrEqual(1);
   expect(
     Math.abs(
       (linkCopyBox?.y ?? 0) +
@@ -607,36 +964,18 @@ test("custom personas share with people and keep export separate", async ({
         ((linkIconBox?.y ?? 0) + (linkIconBox?.height ?? 0) / 2),
     ),
   ).toBeLessThanOrEqual(1);
-  expect(linkDividerBox?.y ?? 0).toBeGreaterThan(
-    (linkRowBox?.y ?? 0) + (linkRowBox?.height ?? 0),
+  await expect(page.getByTestId("persona-share-link-divider")).toHaveCount(0);
+  await expect(page.getByTestId("persona-share-copy-link-footer")).toHaveCount(
+    0,
   );
-  expect(linkDividerBox?.y ?? 0).toBeLessThan(initialCopyLinkButtonBox?.y ?? 0);
-  expect(
-    Math.abs((linkDividerBox?.width ?? 0) - (linkRowBox?.width ?? 0)),
-  ).toBeLessThanOrEqual(1);
-  await expect(linkDivider).toHaveClass(/my-4.*bg-input\/40/);
   expect(
     Math.abs(
-      (linkCopyBox?.y ?? 0) +
-        (linkCopyBox?.height ?? 0) / 2 -
-        ((staticLinkAccessBox?.y ?? 0) +
-          (staticLinkAccessBox?.height ?? 0) / 2),
+      (shareLevelRowBox?.y ?? 0) +
+        (shareLevelRowBox?.height ?? 0) / 2 -
+        ((staticShareLevelBox?.y ?? 0) +
+          (staticShareLevelBox?.height ?? 0) / 2),
     ),
   ).toBeLessThanOrEqual(1);
-  const shareMainCardForLinkSpacing = page.getByTestId(
-    "persona-share-main-card",
-  );
-  const shareMainCardForLinkSpacingBox =
-    await shareMainCardForLinkSpacing.boundingBox();
-  const gapAboveCopyLink =
-    (initialCopyLinkButtonBox?.y ?? 0) -
-    ((linkDividerBox?.y ?? 0) + (linkDividerBox?.height ?? 0));
-  const gapBelowCopyLink =
-    (shareMainCardForLinkSpacingBox?.y ?? 0) +
-    (shareMainCardForLinkSpacingBox?.height ?? 0) -
-    ((initialCopyLinkButtonBox?.y ?? 0) +
-      (initialCopyLinkButtonBox?.height ?? 0));
-  expect(Math.abs(gapAboveCopyLink - gapBelowCopyLink)).toBeLessThanOrEqual(1);
   await expect(copyLinkButton).toHaveClass(
     /border.*bg-background.*border-border/,
   );
@@ -653,21 +992,28 @@ test("custom personas share with people and keep export separate", async ({
   await expect.poll(copyLinkHasVisibleShadow).toBe(false);
   await copyLinkButton.hover();
   await expect.poll(copyLinkHasVisibleShadow).toBe(false);
-  await expect(page.getByTestId("persona-share-link-access")).toHaveText(
-    "Agent only",
+  await expect(page.getByTestId("persona-share-share-level")).toHaveText(
+    "No memories included",
   );
+  await expect(
+    shareDialog.getByText("No memories included", { exact: true }),
+  ).toHaveCount(1);
   await expect(page.getByTestId("persona-share-recipient-access")).toHaveCount(
     0,
   );
+  await expect(page.getByTestId("persona-share-link-access")).toHaveCount(0);
   await expect(
     shareDialog.getByLabel("What to include in the link"),
   ).toHaveCount(0);
   await expect(
     shareDialog.getByLabel("What to include", { exact: true }),
   ).toHaveCount(0);
-  await expect(shareDialog.getByText("Memories")).toHaveCount(0);
-  await expect(shareDialog.getByText("File format")).toHaveCount(0);
-  await expect(page.getByText("Show in my catalog")).toHaveCount(0);
+  await expect(shareDialog.getByText("Memories", { exact: true })).toHaveCount(
+    0,
+  );
+  await expect(
+    shareDialog.getByText("File format", { exact: true }),
+  ).toHaveCount(0);
   const shareMainCard = page.getByTestId("persona-share-main-card");
   const exportAgentRow = page.getByTestId("persona-share-export");
   await expect(exportAgentRow).toHaveText("Export agent");
@@ -700,6 +1046,9 @@ test("custom personas share with people and keep export separate", async ({
   expect(exportAgentRowShadow).toBe(shareMainCardShadow);
   expect(exportAgentRowShadow).not.toBe("none");
   await expect(exportAgentRow).toHaveCSS("position", "relative");
+  expect(exportAgentRowBox?.y ?? 0).toBeGreaterThanOrEqual(
+    (shareMainCardBox?.y ?? 0) + (shareMainCardBox?.height ?? 0) + 12,
+  );
   await expect(page.getByTestId("agent-snapshot-export-dialog")).toHaveCount(0);
 
   await exportAgentRow.click();
@@ -911,29 +1260,7 @@ test("custom personas share with people and keep export separate", async ({
     page
       .getByTestId("persona-share-recipient-field")
       .getByTestId("persona-share-recipient-access"),
-  ).toHaveText("Agent only");
-  const staticRecipientAccess = page.getByTestId(
-    "persona-share-recipient-access",
-  );
-  const [
-    staticRecipientAccessBox,
-    recipientAccessPaddingRight,
-    recipientFieldBox,
-  ] = await Promise.all([
-    staticRecipientAccess.boundingBox(),
-    staticRecipientAccess.evaluate((element) =>
-      Number.parseFloat(getComputedStyle(element).paddingRight),
-    ),
-    recipientField.boundingBox(),
-  ]);
-  const staticRecipientTextInset =
-    (recipientFieldBox?.x ?? 0) +
-    (recipientFieldBox?.width ?? 0) -
-    ((staticRecipientAccessBox?.x ?? 0) +
-      (staticRecipientAccessBox?.width ?? 0) -
-      recipientAccessPaddingRight);
-  expect(staticRecipientTextInset).toBeGreaterThanOrEqual(8);
-  expect(staticRecipientTextInset).toBeLessThanOrEqual(10);
+  ).toHaveCount(0);
   await expect(page.getByTestId("persona-share-send")).toBeVisible();
 
   await recipientSearch.fill("bob");
@@ -1034,11 +1361,392 @@ test("custom personas share with people and keep export separate", async ({
   await expect(shareDialog).toHaveCount(0);
 });
 
-test("share access controls include the selected memories", async ({
+test("custom personas can be shared to the relay catalog", async ({ page }) => {
+  const personaId = "custom:catalog-analyst";
+  await installMockBridge(page, {
+    globalAgentConfig: {
+      env_vars: { ANTHROPIC_API_KEY: "sk-ant-test" },
+      provider: "anthropic",
+      model: "claude-opus-4-5",
+    },
+    personas: [
+      {
+        id: personaId,
+        displayName: "Catalog Analyst",
+        respondTo: "allowlist",
+        respondToAllowlist: [TEST_IDENTITIES.alice.pubkey],
+        systemPrompt: `## Design System And Styling
+
+- For design-system changes, check the local guidance in \`DESIGN.md\`, \`docs/color-token-mapping.md\`, \`src/shared/ui/AGENTS.md\`, and \`src/features/design-system/AGENTS.md\` before judging the implementation.
+- Check every changed visual surface in both light and dark mode. Missing dark-mode support is a review issue, not visual polish.
+- Review the selected changes and explain whether \`git diff --cached --name-only --some-extremely-long-inline-option-that-must-wrap\` stays inside the catalog detail column.
+
+\`\`\`text
+This deliberately long fenced-code example must not establish the minimum width of the full custom-agent instruction document or force earlier prose outside the catalog detail pane.
+\`\`\`
+
+| Before | After | Why |
+| --- | --- | --- |
+| \`transition: all 300ms\` | \`transition: transform 200ms ease-out\` | Specify exact properties so a wide instruction table stays independently scrollable without expanding the full catalog detail pane. |
+| \`transform: scale(0)\` | \`transform: scale(0.95); opacity: 0\` | Preserve physicality while keeping the shared agent instructions inside their container. |`,
+      },
+    ],
+  });
+  await gotoApp(page);
+  await page.evaluate(() => {
+    document.documentElement.style.fontSize = "24px";
+  });
+
+  await page.getByTestId("open-agents-view").click();
+  await openPersonaCatalog(page);
+  await expect(
+    page.getByTestId(`persona-catalog-list-item-${personaId}`),
+  ).toHaveCount(0);
+  await page.keyboard.press("Escape");
+
+  await page.getByLabel("Open actions for Catalog Analyst").click();
+  await page.getByRole("menuitem", { name: "Share" }).click();
+  const catalogAccess = page.getByTestId("persona-share-catalog-access");
+  const shareDialog = page.getByTestId("persona-share-dialog");
+  const shareMainCard = shareDialog.getByTestId("persona-share-main-card");
+  const copyLinkButton = shareDialog.getByTestId("persona-share-copy-link");
+  const catalogSection = shareDialog.getByTestId("persona-share-catalog");
+  await expect(
+    shareMainCard.getByTestId("persona-share-catalog"),
+  ).toBeVisible();
+  await expect(catalogSection).toContainText("Share to catalog");
+  await expect(catalogSection).toContainText(
+    "Anyone in this community can find and use a copy.",
+  );
+  await expect(catalogSection).toContainText(
+    "Your agent instruction is shared as plaintext. Memories and secrets aren’t included.",
+  );
+  const [copyLinkButtonBox, catalogSectionBox, shareMainCardBox] =
+    await Promise.all([
+      copyLinkButton.boundingBox(),
+      catalogSection.boundingBox(),
+      shareMainCard.boundingBox(),
+    ]);
+  // Copy link belongs to the link row above, so the catalog is the section
+  // that closes the card rather than trailing an orphaned button.
+  expect(
+    (copyLinkButtonBox?.y ?? 0) + (copyLinkButtonBox?.height ?? 0),
+  ).toBeLessThanOrEqual(catalogSectionBox?.y ?? 0);
+  expect(
+    (catalogSectionBox?.y ?? 0) + (catalogSectionBox?.height ?? 0),
+  ).toBeLessThanOrEqual(
+    (shareMainCardBox?.y ?? 0) + (shareMainCardBox?.height ?? 0),
+  );
+  await expect(catalogAccess).toHaveText("Not shared");
+  await catalogAccess.click();
+  await expect(page.getByRole("menuitemradio")).toHaveText([
+    "Not shared",
+    "Shared",
+  ]);
+  await page
+    .getByRole("menuitemradio", { name: "Shared", exact: true })
+    .click();
+  await expect(catalogAccess).toHaveText("Shared");
+  const storedPersonas = await invokeTauri<
+    Array<{ id: string; shared: boolean }>
+  >(page, "list_personas");
+  expect(
+    storedPersonas.find((persona) => persona.id === personaId)?.shared,
+  ).toBe(true);
+  await page
+    .getByTestId("persona-share-dialog")
+    .getByRole("button", { name: "Close" })
+    .click();
+
+  await openPersonaCatalog(page);
+  await expect(
+    page.getByTestId(`persona-catalog-list-item-${personaId}`),
+  ).toContainText("Catalog Analyst");
+  await selectCatalogPersona(page, personaId);
+  const catalogDialog = page.getByTestId("persona-catalog-dialog");
+  const catalogDetailPane = page.getByTestId("persona-catalog-detail-pane");
+  await expect(catalogDetailPane).toContainText("Design System And Styling");
+  await expect(catalogDialog).toBeVisible();
+  await expect(catalogDetailPane).toBeVisible();
+  await waitForAnimations(page);
+  const [catalogDialogRight, catalogDetailPaneRight] = await Promise.all([
+    catalogDialog.evaluate((element) => element.getBoundingClientRect().right),
+    catalogDetailPane.evaluate(
+      (element) => element.getBoundingClientRect().right,
+    ),
+  ]);
+  expect(catalogDetailPaneRight).toBeLessThanOrEqual(catalogDialogRight);
+  expect(
+    await catalogDetailPane.evaluate(
+      (element) => element.scrollWidth - element.clientWidth,
+    ),
+  ).toBeLessThanOrEqual(1);
+  const catalogInstruction = catalogDetailPane.locator(".message-markdown");
+  expect(
+    await catalogInstruction.evaluate(
+      (element) => element.scrollWidth - element.clientWidth,
+    ),
+  ).toBeLessThanOrEqual(1);
+  await page.keyboard.press("Escape");
+
+  await page.getByLabel("Open actions for Catalog Analyst").click();
+  await page.getByRole("menuitem", { name: "Edit" }).click();
+  const editDialog = page.getByTestId("persona-dialog");
+  const catalogPublishNotice = editDialog.getByTestId(
+    "persona-dialog-catalog-publish-notice",
+  );
+  await expect(catalogPublishNotice).toHaveCount(0);
+  await expect(
+    editDialog.getByRole("button", { name: "Save and publish" }),
+  ).toHaveCount(0);
+  await expect(
+    editDialog.getByRole("button", { name: "Save changes" }),
+  ).toBeVisible();
+  await editDialog
+    .getByLabel("Agent instructions")
+    .fill("Review the latest catalog changes.");
+  await expect(catalogPublishNotice).toHaveText(
+    "This agent is in the community catalog. Your changes will be published when you save.",
+  );
+  await expect(
+    editDialog.getByRole("button", { name: "Save changes" }),
+  ).toHaveCount(0);
+  await editDialog.getByRole("button", { name: "Save and publish" }).click();
+  await expect(editDialog).toHaveCount(0);
+  // The promise in the button label is only kept by the command that awaits the
+  // relay; a plain `update_persona` merely enqueues a head best-effort.
+  await expect
+    .poll(() => countCommandInvocations(page, "update_persona_and_publish"))
+    .toBe(1);
+  expect(await countCommandInvocations(page, "update_persona")).toBe(0);
+  await expect(
+    page.getByText(
+      "Updated Catalog Analyst and published it to the community catalog.",
+    ),
+  ).toBeVisible();
+
+  await openPersonaCatalog(page);
+  await selectCatalogPersona(page, personaId);
+  await expect(page.getByTestId("persona-catalog-detail-pane")).toContainText(
+    "Review the latest catalog changes.",
+  );
+  await page.keyboard.press("Escape");
+
+  await page.getByLabel("Open actions for Catalog Analyst").click();
+  await page.getByRole("menuitem", { name: "Share" }).click();
+  await expect(catalogAccess).toHaveText("Shared");
+  await catalogAccess.click();
+  await page
+    .getByRole("menuitemradio", { name: "Not shared", exact: true })
+    .click();
+  await page
+    .getByTestId("persona-share-dialog")
+    .getByRole("button", { name: "Close" })
+    .click();
+
+  await openPersonaCatalog(page);
+  await expect(
+    page.getByTestId(`persona-catalog-list-item-${personaId}`),
+  ).toHaveCount(0);
+});
+
+test("a queued catalog share is not presented as relay-published", async ({
+  page,
+}) => {
+  const personaId = "custom:queued-catalog-agent";
+  await installMockBridge(page, {
+    personas: [
+      {
+        id: personaId,
+        displayName: "Queued Catalog Agent",
+        systemPrompt: "Wait for relay acceptance.",
+      },
+    ],
+    personaSharePublicationStatuses: ["queued"],
+  });
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+
+  await page.getByLabel("Open actions for Queued Catalog Agent").click();
+  await page.getByRole("menuitem", { name: "Share" }).click();
+  await page.getByTestId("persona-share-catalog-access").click();
+  await page
+    .getByRole("menuitemradio", { name: "Shared", exact: true })
+    .click();
+
+  await expect(
+    page.getByText(
+      "Sharing Queued Catalog Agent is queued. It will appear after the relay accepts the update.",
+    ),
+  ).toBeVisible();
+  await page
+    .getByTestId("persona-share-dialog")
+    .getByRole("button", { name: "Close" })
+    .click();
+
+  await openPersonaCatalog(page);
+  await expect(
+    page.getByTestId(`persona-catalog-list-item-${personaId}`),
+  ).toHaveCount(0);
+});
+
+test("a foreign reader does not receive an unshared kind 30175 persona", async ({
+  page,
+}) => {
+  const personaId = "private-reviewer";
+  const remoteCatalogId = `catalog:${TEST_IDENTITIES.alice.pubkey}:${personaId}`;
+  await installMockBridge(page, {
+    personaCatalogEvents: [
+      createCatalogEvent({
+        ownerPubkey: TEST_IDENTITIES.alice.pubkey,
+        sourcePersonaId: personaId,
+        displayName: "Alice’s Private Reviewer",
+        systemPrompt: "This instruction must remain private.",
+        shared: false,
+      }),
+    ],
+  });
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+  await openPersonaCatalog(page);
+
+  await expect(
+    page.getByTestId(`persona-catalog-list-item-${remoteCatalogId}`),
+  ).toHaveCount(0);
+  await expect(page.getByTestId("persona-catalog-empty-state")).toBeVisible();
+});
+
+test("a catalog entry keeps the owner's emoji avatar", async ({ page }) => {
+  const personaId = "emoji-reviewer";
+  const remoteCatalogId = `catalog:${TEST_IDENTITIES.alice.pubkey}:${personaId}`;
+  // Emoji avatars persist as inline percent-encoded SVG rather than a hosted
+  // URL, so build the value with the same producer the editor uses — a
+  // hand-rolled data URL would pass even if the real shape stopped matching.
+  const avatarUrl = emojiAvatarDataUrl("🐝", "#FFCC00");
+  await installMockBridge(page, {
+    personaCatalogEvents: [
+      createCatalogEvent({
+        avatarUrl,
+        ownerPubkey: TEST_IDENTITIES.alice.pubkey,
+        sourcePersonaId: personaId,
+        displayName: "Alice’s Reviewer",
+        systemPrompt: "Review changes for the whole community.",
+      }),
+    ],
+  });
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+  await openPersonaCatalog(page);
+
+  // An `<img>` carrying the avatar — not the initials fallback — in both the
+  // list row and the detail header is what proves the projection kept it.
+  const remoteEntry = page.getByTestId(
+    `persona-catalog-list-item-${remoteCatalogId}`,
+  );
+  await expect(remoteEntry.locator("img")).toHaveAttribute("src", avatarUrl);
+  await remoteEntry.click();
+  await expect(
+    page.getByTestId("persona-catalog-detail-pane").locator("img").first(),
+  ).toHaveAttribute("src", avatarUrl);
+});
+
+test("a community member can discover and add another member's catalog agent", async ({
+  page,
+}) => {
+  const personaId = "shared-reviewer";
+  const remoteCatalogId = `catalog:${TEST_IDENTITIES.alice.pubkey}:${personaId}`;
+  await installMockBridge(page, {
+    personaCatalogEvents: [
+      createCatalogEvent({
+        ownerPubkey: TEST_IDENTITIES.alice.pubkey,
+        sourcePersonaId: personaId,
+        displayName: "Alice’s Reviewer",
+        systemPrompt: "Review changes for the whole community.",
+      }),
+    ],
+  });
+  await gotoApp(page);
+  await page.getByTestId("open-agents-view").click();
+  await openPersonaCatalog(page);
+
+  const remoteEntry = page.getByTestId(
+    `persona-catalog-list-item-${remoteCatalogId}`,
+  );
+  await expect(remoteEntry).toContainText("Alice’s Reviewer");
+  await remoteEntry.click();
+  await expect(page.getByTestId("persona-catalog-detail-pane")).toContainText(
+    "Added by Community member",
+  );
+
+  await page
+    .getByRole("button", {
+      name: "Add Alice’s Reviewer from Agent Catalog",
+    })
+    .click();
+  await expect
+    .poll(() => countCommandInvocations(page, "create_persona"))
+    .toBe(1);
+  const imported = await invokeTauri<
+    Array<{
+      display_name: string;
+      system_prompt: string;
+      shared: boolean;
+      catalog_source: { owner_pubkey: string; persona_id: string } | null;
+    }>
+  >(page, "list_personas");
+  expect(
+    imported.find((persona) => persona.display_name === "Alice’s Reviewer"),
+  ).toMatchObject({
+    system_prompt: "Review changes for the whole community.",
+    shared: false,
+    // Provenance is what lets the catalog recognise the copy on the next open.
+    catalog_source: {
+      owner_pubkey: TEST_IDENTITIES.alice.pubkey,
+      persona_id: personaId,
+    },
+  });
+
+  // Reopening must offer the entry as already added rather than minting a
+  // second copy — the copy has a fresh local id, so only the stored
+  // coordinate can link it back to Alice's publication.
+  await page.keyboard.press("Escape");
+  await openPersonaCatalog(page);
+  // The entry now projects onto the local copy, so its list-item testid is the
+  // local persona id rather than the catalog coordinate.
+  await expect(
+    page.getByTestId(`persona-catalog-list-item-${remoteCatalogId}`),
+  ).toHaveCount(0);
+  await page
+    .locator('[data-testid^="persona-catalog-list-item-"]')
+    .filter({ hasText: "Alice’s Reviewer" })
+    .click();
+  const addedTarget = page.getByRole("button", {
+    name: "Alice’s Reviewer is already in My Agents",
+  });
+  await expect(addedTarget).toBeDisabled();
+  await expect(addedTarget).toHaveText("Added to My Agents");
+  expect(await countCommandInvocations(page, "create_persona")).toBe(1);
+});
+
+test("one share level selector drives both the link and send paths", async ({
   page,
 }) => {
   await page.emulateMedia({ reducedMotion: "no-preference" });
   const linkedAgentPubkey = TEST_IDENTITIES.alice.pubkey;
+  const profileAvatarUrl = "https://mock.relay/media/profile-only-avatar.png";
+  const profileAvatarBytes = Uint8Array.from(
+    atob(
+      "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=",
+    ),
+    (character) => character.charCodeAt(0),
+  );
+  await page.route(profileAvatarUrl, async (route) => {
+    await route.fulfill({
+      body: Buffer.from(profileAvatarBytes),
+      contentType: "image/png",
+      status: 200,
+    });
+  });
   await page.context().grantPermissions(["clipboard-read", "clipboard-write"]);
   await installMockBridge(page, {
     personas: [
@@ -1057,6 +1765,12 @@ test("share access controls include the selected memories", async ({
       },
     ],
     searchProfiles: [
+      {
+        pubkey: linkedAgentPubkey,
+        displayName: "Animation Auditor",
+        avatarUrl: profileAvatarUrl,
+        isAgent: true,
+      },
       {
         pubkey: TEST_IDENTITIES.charlie.pubkey,
         displayName: "Charlie",
@@ -1084,34 +1798,60 @@ test("share access controls include the selected memories", async ({
   const initialShareCardHeight = await shareMainCard.evaluate(
     (element) => element.getBoundingClientRect().height,
   );
-  const linkAccess = shareDialog.getByLabel("What to include in the link");
+  const shareLevel = shareDialog.getByLabel("What to include", {
+    exact: true,
+  });
+  const catalogAccess = shareDialog.getByLabel("What to share in the catalog");
   const recipientField = page.getByTestId("persona-share-recipient-field");
   const emptyRecipientFieldBox = await recipientField.boundingBox();
   await expect(shareDialog.getByTestId("persona-share-send")).toHaveCount(0);
-  await expect(linkAccess).toHaveText("Agent only");
-  expect((await linkAccess.boundingBox())?.width).toBeLessThan(120);
-  expect(await linkAccess.evaluate((element) => element.tagName)).toBe(
+  await expect(shareLevel).toHaveText("Agent only");
+  expect((await shareLevel.boundingBox())?.width).toBeLessThan(140);
+  expect(await shareLevel.evaluate((element) => element.tagName)).toBe(
     "BUTTON",
   );
-  await expect(linkAccess).toHaveCSS("text-decoration-line", "none");
-  await expect(linkAccess).toHaveCSS("padding-left", "8px");
-  await expect(linkAccess).toHaveCSS("padding-right", "8px");
-  const copyLinkButton = shareDialog.getByTestId("persona-share-copy-link");
-  const [linkAccessBox, copyLinkButtonBox] = await Promise.all([
-    linkAccess.boundingBox(),
-    copyLinkButton.boundingBox(),
+  await expect(shareLevel).toHaveCSS("text-decoration-line", "none");
+  await expect(shareLevel).toHaveCSS("padding-left", "8px");
+  await expect(shareLevel).toHaveCSS("padding-right", "8px");
+  await expect(catalogAccess).toHaveText("Not shared");
+  await catalogAccess.click();
+  await expect(page.getByRole("menuitemradio")).toHaveText([
+    "Not shared",
+    "Shared",
   ]);
+  await page.keyboard.press("Escape");
+  const copyLinkButton = shareDialog.getByTestId("persona-share-copy-link");
+  const recipientFieldBox = await recipientField.boundingBox();
+  const [shareLevelBox, copyLinkButtonBox, catalogAccessBox] =
+    await Promise.all([
+      shareLevel.boundingBox(),
+      copyLinkButton.boundingBox(),
+      catalogAccess.boundingBox(),
+    ]);
+  // Reading order: who → how it goes out → what's included → catalog.
   expect(copyLinkButtonBox?.y ?? 0).toBeGreaterThanOrEqual(
-    (linkAccessBox?.y ?? 0) + (linkAccessBox?.height ?? 0) + 8,
+    (recipientFieldBox?.y ?? 0) + (recipientFieldBox?.height ?? 0),
   );
+  expect(shareLevelBox?.y ?? 0).toBeGreaterThanOrEqual(
+    (copyLinkButtonBox?.y ?? 0) + (copyLinkButtonBox?.height ?? 0),
+  );
+  expect(catalogAccessBox?.y ?? 0).toBeGreaterThanOrEqual(
+    (shareLevelBox?.y ?? 0) + (shareLevelBox?.height ?? 0),
+  );
+  // The memory choice is stated once, governing both delivery actions —
+  // neither the recipients row nor the link row carries its own copy.
   await expect(
-    shareDialog.getByLabel("What to include", { exact: true }),
+    shareDialog.getByTestId("persona-share-recipient-access"),
   ).toHaveCount(0);
+  await expect(
+    shareDialog.getByTestId("persona-share-link-access"),
+  ).toHaveCount(0);
+  await expect(shareLevel).toHaveCount(1);
   await expect(
     shareDialog.getByTestId("persona-share-memory-warning"),
   ).toHaveCount(0);
 
-  await linkAccess.click();
+  await shareLevel.click();
   await expect(page.getByRole("menuitemradio")).toHaveText([
     "Agent only",
     "Agent + core memory",
@@ -1120,7 +1860,7 @@ test("share access controls include the selected memories", async ({
   await page
     .getByRole("menuitemradio", { name: "Agent + core memory" })
     .click();
-  await expect(linkAccess).toHaveText("Agent + core memory");
+  await expect(shareLevel).toHaveText("Agent + core memory");
   await waitForAnimations(page);
   const expandedShareCardHeight = await shareMainCard.evaluate(
     (element) => element.getBoundingClientRect().height,
@@ -1128,6 +1868,9 @@ test("share access controls include the selected memories", async ({
   const inlineMemoryWarning = shareDialog.getByTestId(
     "persona-share-memory-warning",
   );
+  // No recipient is selected yet: the warning tracks the chosen contents, not
+  // whichever delivery button might be pressed.
+  await expect(shareDialog.getByTestId("persona-share-send")).toHaveCount(0);
   await expect(inlineMemoryWarning).toBeVisible();
   await expect(inlineMemoryWarning).toContainText(
     "Memory is stored as plaintext in the snapshot.",
@@ -1170,11 +1913,11 @@ test("share access controls include the selected memories", async ({
   await expect(page.getByTestId("persona-share-copy-link")).toContainText(
     "Copied",
   );
-  await linkAccess.click();
+  await shareLevel.click();
   await page
     .getByRole("menuitemradio", { name: "Agent only", exact: true })
     .click();
-  await expect(linkAccess).toHaveText("Agent only");
+  await expect(shareLevel).toHaveText("Agent only");
   await expect(inlineMemoryWarning).toHaveCount(0);
 
   const recipientSearch = page.getByTestId("persona-share-recipient-search");
@@ -1187,11 +1930,6 @@ test("share access controls include the selected memories", async ({
   const recipientInputRegion = recipientField.getByTestId(
     "persona-share-recipient-input-region",
   );
-  const recipientAccess = recipientField.getByLabel("What to include", {
-    exact: true,
-  });
-  await expect(recipientAccess).toHaveText("Agent only");
-  expect((await recipientAccess.boundingBox())?.width).toBeLessThan(140);
   await expect(recipientField).toHaveCSS("column-gap", "12px");
   await expect(recipientInputRegion).toHaveCSS("flex-wrap", "wrap");
   const sendButton = shareDialog.getByTestId("persona-share-send");
@@ -1215,42 +1953,17 @@ test("share access controls include the selected memories", async ({
       );
     })
     .toBeLessThanOrEqual(1);
-  const recipientInputRegionBox = await recipientInputRegion.boundingBox();
-  const recipientAccessBox = await recipientAccess.boundingBox();
-  expect(
-    (recipientAccessBox?.x ?? 0) -
-      ((recipientInputRegionBox?.x ?? 0) +
-        (recipientInputRegionBox?.width ?? 0)),
-  ).toBeGreaterThanOrEqual(12);
-  const recipientAccessRightEdge =
-    (recipientAccessBox?.x ?? 0) + (recipientAccessBox?.width ?? 0);
-  expect(
-    Math.abs(
-      (resizedRecipientFieldBox?.x ?? 0) +
-        (resizedRecipientFieldBox?.width ?? 0) -
-        8 -
-        recipientAccessRightEdge,
-    ),
-  ).toBeLessThanOrEqual(8);
-  await recipientAccess.click();
+  // Same single selector now drives the send path; picking a level here is
+  // what the send confirmation must report.
+  await shareLevel.click();
   await page
     .getByRole("menuitemradio", { name: "Agent + all memories" })
     .click();
-  await expect(recipientAccess).toHaveText("Agent + all memories");
+  await expect(shareLevel).toHaveText("Agent + all memories");
   await expect(inlineMemoryWarning).toBeVisible();
   await waitForAnimations(page);
-  await expect
-    .poll(async () => {
-      const expandedRecipientAccessBox = await recipientAccess.boundingBox();
-      return Math.abs(
-        (expandedRecipientAccessBox?.x ?? 0) +
-          (expandedRecipientAccessBox?.width ?? 0) -
-          recipientAccessRightEdge,
-      );
-    })
-    .toBeLessThanOrEqual(1);
   expect(
-    await recipientAccess
+    await shareLevel
       .locator("span")
       .evaluate((element) => element.scrollWidth <= element.clientWidth),
   ).toBe(true);
@@ -1306,6 +2019,9 @@ test("share access controls include the selected memories", async ({
       expect.objectContaining({
         memoryLevel: "core",
         memorySourcePubkey: linkedAgentPubkey,
+        avatarPngDataUrl: `data:image/png;base64,${Buffer.from(
+          profileAvatarBytes,
+        ).toString("base64")}`,
       }),
       expect.objectContaining({
         memoryLevel: "everything",
@@ -1571,19 +2287,16 @@ test("inactive built-ins cannot be used to create teams", async ({ page }) => {
     },
   });
 
-  expect(error).toBe(
-    "Honey is not in My Agents. Choose it from Agent Catalog first.",
-  );
+  expect(error).toBe("Honey is not in My Agents.");
 });
 
 test("built-in removal failures show up from My Agents", async ({ page }) => {
+  await installMockBridge(page, {
+    activePersonaIds: ["builtin:honey"],
+  });
   await gotoApp(page);
 
   await page.getByTestId("open-agents-view").click();
-  await openPersonaCatalog(page);
-  await selectCatalogPersona(page, "builtin:honey");
-  await useCatalogPersona(page, "builtin:honey");
-
   await invokeTauri(page, "create_team", {
     input: {
       name: "Honeys",
@@ -1591,7 +2304,6 @@ test("built-in removal failures show up from My Agents", async ({ page }) => {
     },
   });
 
-  await page.keyboard.press("Escape");
   await page.getByLabel("Open actions for Honey").click();
   await page.getByRole("menuitem", { name: "Delete" }).click();
 
diff --git a/desktop/tests/e2e/channel-composer-overflow.spec.ts b/desktop/tests/e2e/channel-composer-overflow.spec.ts
index 149a4247a6..6ba13532a9 100644
--- a/desktop/tests/e2e/channel-composer-overflow.spec.ts
+++ b/desktop/tests/e2e/channel-composer-overflow.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from "@playwright/test";
 
 import { waitForAnimations } from "../helpers/animations";
-import { installMockBridge } from "../helpers/bridge";
+import { installMockBridge, TEST_IDENTITIES } from "../helpers/bridge";
 
 // The channel and thread composers float over their conversation scrollers.
 // When the conversation is scrolled up, later rows pass underneath the
@@ -10,19 +10,22 @@ import { installMockBridge } from "../helpers/bridge";
 // letting them bleed out below the composer box.
 
 const CHANNEL = "general";
+const TYPING_KIND = 20002;
 
 async function waitForMockLiveSubscription(
   page: import("@playwright/test").Page,
   channelName: string,
+  kind?: number,
 ) {
   await expect
     .poll(() =>
       page.evaluate(
-        (ch) =>
+        ({ channelName, kind }) =>
           window.__BUZZ_E2E_HAS_MOCK_LIVE_SUBSCRIPTION__?.({
-            channelName: ch,
+            channelName,
+            kind,
           }) ?? false,
-        channelName,
+        { channelName, kind },
       ),
     )
     .toBe(true);
@@ -43,7 +46,38 @@ async function emit(
     { channel: CHANNEL, content, parentEventId },
   );
   if (!event) throw new Error("mock message emitter is not installed");
-  return event as { id: string };
+  return event as { created_at: number; id: string };
+}
+
+type ComposerDockGeometry = {
+  composerBottom: number;
+  composerLeft: number;
+  composerRight: number;
+  composerTop: number;
+  dockHeight: number;
+  dockTop: number;
+};
+
+async function composerDockGeometry(
+  overlay: import("@playwright/test").Locator,
+): Promise<ComposerDockGeometry> {
+  return overlay.evaluate((element) => {
+    const composer = element.querySelector<HTMLElement>(
+      '[data-testid="message-composer"]',
+    );
+    const dock = element.querySelector<HTMLElement>(".composer-dock");
+    if (!composer || !dock) throw new Error("Missing composer dock geometry");
+    const composerRect = composer.getBoundingClientRect();
+    const dockRect = dock.getBoundingClientRect();
+    return {
+      composerBottom: composerRect.bottom,
+      composerLeft: composerRect.left,
+      composerRight: composerRect.right,
+      composerTop: composerRect.top,
+      dockHeight: dockRect.height,
+      dockTop: dockRect.top,
+    };
+  });
 }
 
 async function expectOverlayBottomMask(
@@ -130,6 +164,119 @@ test.describe("composer overlays mask scrolled content", () => {
     await expectOverlayBottomMask(page.getByTestId("channel-composer-overlay"));
   });
 
+  test("activity trades composer height without moving the dock", async ({
+    page,
+  }) => {
+    await installMockBridge(page);
+    await page.goto("/");
+    await page.getByTestId(`channel-${CHANNEL}`).click();
+    await waitForMockLiveSubscription(page, CHANNEL);
+    await waitForMockLiveSubscription(page, CHANNEL, TYPING_KIND);
+
+    const overlay = page.getByTestId("channel-composer-overlay");
+    const input = overlay.getByTestId("message-input");
+    await input.fill(
+      "A multiline draft that grows the composer.\nSecond line keeps the natural-height path active.",
+    );
+    await waitForAnimations(page);
+    const quiet = await composerDockGeometry(overlay);
+
+    await page.evaluate((channelName) => {
+      window.__BUZZ_E2E_EMIT_MOCK_TYPING__?.({ channelName });
+    }, CHANNEL);
+    await expect(
+      overlay.getByTestId("channel-composer-activity-row"),
+    ).toBeVisible();
+    await waitForAnimations(page);
+    const active = await composerDockGeometry(overlay);
+
+    expect(Math.abs(active.dockTop - quiet.dockTop)).toBeLessThanOrEqual(0.5);
+    expect(Math.abs(active.dockHeight - quiet.dockHeight)).toBeLessThanOrEqual(
+      0.5,
+    );
+    expect(
+      Math.abs(active.composerTop - quiet.composerTop),
+    ).toBeLessThanOrEqual(0.5);
+    expect(active.composerBottom).toBeLessThan(quiet.composerBottom - 8);
+  });
+
+  test("reduced motion removes dock geometry transitions", async ({ page }) => {
+    await page.emulateMedia({ reducedMotion: "reduce" });
+    await installMockBridge(page);
+    await page.goto("/");
+    await page.getByTestId(`channel-${CHANNEL}`).click();
+
+    const dock = page
+      .getByTestId("channel-composer-overlay")
+      .locator(".composer-dock");
+    const spacer = dock.locator(".composer-dock-quiet-spacer");
+    await expect(dock).toHaveCSS("transition-duration", "0s");
+    await expect(spacer).toHaveCSS("transition-duration", "0s");
+  });
+
+  test("bottom-pinned messages clear a growing composer", async ({ page }) => {
+    await installMockBridge(page);
+    await page.goto("/");
+    await page.getByTestId(`channel-${CHANNEL}`).click();
+    await expect(page.getByTestId("message-timeline")).toBeVisible();
+    await waitForMockLiveSubscription(page, CHANNEL);
+
+    let newestMessageId = "";
+    for (let i = 0; i < 20; i++) {
+      newestMessageId = (await emit(page, `Bottom-clearance message ${i}`)).id;
+    }
+    await page.waitForTimeout(300);
+    await page.evaluate(() => {
+      const scroller = document.querySelector<HTMLElement>(
+        '[data-buzz-conversation-scroll="true"]',
+      );
+      if (!scroller) throw new Error("Missing conversation scroll container");
+      scroller.scrollTop = scroller.scrollHeight;
+    });
+
+    await page
+      .getByTestId("message-input")
+      .fill(
+        "A long draft grows the composer and must keep the newest message above it.\nSecond line.\nThird line.",
+      );
+    await waitForAnimations(page);
+
+    const clearsComposer = await page.evaluate((messageId) => {
+      const composer = document.querySelector<HTMLElement>(
+        '[data-testid="channel-composer-overlay"] [data-testid="message-composer"]',
+      );
+      const newestRow = document.querySelector<HTMLElement>(
+        `[data-message-id="${CSS.escape(messageId)}"]`,
+      );
+      if (!composer || !newestRow) return false;
+      return (
+        newestRow.getBoundingClientRect().bottom <=
+        composer.getBoundingClientRect().top
+      );
+    }, newestMessageId);
+    expect(clearsComposer).toBe(true);
+
+    await page.setViewportSize({ width: 1280, height: 620 });
+    await expect
+      .poll(() =>
+        page.evaluate((messageId) => {
+          const composer = document.querySelector<HTMLElement>(
+            '[data-testid="channel-composer-overlay"] [data-testid="message-composer"]',
+          );
+          const newestRow = document.querySelector<HTMLElement>(
+            `[data-message-id="${CSS.escape(messageId)}"]`,
+          );
+          return Boolean(
+            composer &&
+              newestRow &&
+              newestRow.getBoundingClientRect().bottom <=
+                composer.getBoundingClientRect().top,
+          );
+        }, newestMessageId),
+      )
+      .toBe(true);
+  });
+
   test("thread panel replies fade out behind the reply composer", async ({
     page,
   }) => {
@@ -178,5 +325,41 @@ test.describe("composer overlays mask scrolled content", () => {
     });
 
     await expectOverlayBottomMask(page.getByTestId("thread-composer-overlay"));
+
+    await waitForMockLiveSubscription(page, CHANNEL, TYPING_KIND);
+    await page.evaluate(
+      ({ channelName, createdAt, pubkey, threadHeadId }) => {
+        window.__BUZZ_E2E_EMIT_MOCK_TYPING__?.({
+          channelName,
+          createdAt,
+          pubkey,
+          threadHeadId,
+        });
+      },
+      {
+        channelName: CHANNEL,
+        createdAt: root.created_at + 1,
+        pubkey: TEST_IDENTITIES.bob.pubkey,
+        threadHeadId: root.id,
+      },
+    );
+    const threadOverlay = page.getByTestId("thread-composer-overlay");
+    const activityRow = threadOverlay.getByTestId("message-typing-indicator");
+    await expect(activityRow).toBeVisible();
+    await waitForAnimations(page);
+    const [composerBounds, activityBounds] = await Promise.all([
+      threadOverlay.getByTestId("message-composer").boundingBox(),
+      activityRow.boundingBox(),
+    ]);
+    expect(composerBounds).not.toBeNull();
+    expect(activityBounds).not.toBeNull();
+    expect(activityBounds?.x ?? 0).toBeGreaterThanOrEqual(
+      (composerBounds?.x ?? 0) - 0.5,
+    );
+    expect(
+      (activityBounds?.x ?? 0) + (activityBounds?.width ?? 0),
+    ).toBeLessThanOrEqual(
+      (composerBounds?.x ?? 0) + (composerBounds?.width ?? 0) + 0.5,
+    );
   });
 });
diff --git a/desktop/tests/e2e/channels.spec.ts b/desktop/tests/e2e/channels.spec.ts
index c7dc7ecb5a..9da4022420 100644
--- a/desktop/tests/e2e/channels.spec.ts
+++ b/desktop/tests/e2e/channels.spec.ts
@@ -26,6 +26,21 @@ const DM_RELAY_AGENT_PUBKEY =
   "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 
 type MockFeedWindow = Window & {
+  __BUZZ_E2E_EMIT_MOCK_MESSAGE__?: (input: {
+    channelName: string;
+    content: string;
+    createdAt?: number;
+    id?: string;
+    parentEventId?: string;
+    pubkey?: string;
+  }) => {
+    content: string;
+    created_at: number;
+    id: string;
+    kind: number;
+    pubkey: string;
+    tags: string[][];
+  };
   __BUZZ_E2E_SEED_ACTIVE_TURNS__?: (input: {
     agentPubkey: string;
     channelId: string;
@@ -36,6 +51,7 @@ type MockFeedWindow = Window & {
     category: "mention" | "needs_action" | "activity" | "agent_activity";
     channel_id: string | null;
     channel_name: string;
+    channel_type?: string | null;
     content: string;
     created_at: number;
     id: string;
@@ -696,7 +712,6 @@ test("creates the DM before preparing a persona mention", async ({ page }) => {
     page.getByTestId(`new-dm-selected-${TEST_IDENTITIES.charlie.pubkey}`),
   ).toBeDisabled();
   await expect(page.getByTestId("new-dm-search")).toBeDisabled();
-  await expect(page.getByTestId("new-message-recipient-popover")).toBeHidden();
   await expect
     .poll(async () =>
       commandCount(await readCommandLog(page), "create_managed_agent"),
@@ -704,6 +719,9 @@ test("creates the DM before preparing a persona mention", async ({ page }) => {
     .toBeGreaterThan(baselineCreateCount);
   await expect(page.getByTestId("chat-title")).toContainText("charlie");
   await expect(page.getByTestId("chat-title")).toContainText("Fizz");
+  // Assert popover hidden after chat-title settles — by this point the send
+  // flow has completed and the UI has fully transitioned away from the popover.
+  await expect(page.getByTestId("new-message-recipient-popover")).toBeHidden();
 
   const sendCommands = (await readCommandLog(page)).slice(
     baselineCommands.length,
@@ -766,8 +784,11 @@ test("creates the DM before preparing a persona mention", async ({ page }) => {
 test("routes an agent mention from an existing DM to the expanded conversation", async ({
   page,
 }) => {
+  // Delay persona provisioning so the follow-up expanded-DM open/start sequence
+  // cannot collapse into the same fast CI tick before assertions observe it.
   await installMockBridge(page, {
     activePersonaIds: ["builtin:fizz"],
+    createManagedAgentDelayMs: 100,
   });
   await page.goto("/");
 
@@ -821,7 +842,10 @@ test("routes an agent mention from an existing DM to the expanded conversation",
 test("routes a managed relay-agent mention from an existing DM to the expanded conversation", async ({
   page,
 }) => {
+  // Delay the expanded open_dm call so routing/navigation settles
+  // deterministically under fast CI execution.
   await installMockBridge(page, {
+    openDmDelayMs: 100,
     managedAgents: [
       {
         pubkey: DM_RELAY_AGENT_PUBKEY,
@@ -951,8 +975,11 @@ test("does not reroute an expanded DM after the channel pane unmounts", async ({
 test("drops an expanded DM after the first message fails", async ({ page }) => {
   const retryMessage = "Retry without the agent";
   const sendError = "Mock first DM send failed.";
+  // Delay persona provisioning so the follow-up expanded-DM open/start sequence
+  // cannot collapse into the same fast CI tick before assertions observe it.
   await installMockBridge(page, {
     activePersonaIds: ["builtin:fizz"],
+    createManagedAgentDelayMs: 100,
     sendMessageErrors: [sendError],
   });
   await page.goto("/");
@@ -1803,15 +1830,18 @@ test("channel date divider keeps the date sticky while the separator rule scroll
     "background-color",
     "rgba(0, 0, 0, 0)",
   );
-  await expect(composerOverlay.getByTestId("message-composer")).not.toHaveCSS(
+  await expect(composerOverlay.getByTestId("message-composer")).toHaveCSS(
     "backdrop-filter",
     "none",
   );
-  const composerActivityRow = composerOverlay.getByTestId(
-    "channel-composer-activity-row",
+  await expect(
+    composerOverlay.getByTestId("composer-dock-backdrop").locator("div"),
+  ).not.toHaveCSS("backdrop-filter", "none");
+  const composerRailMask = composerOverlay.getByTestId(
+    "composer-dock-rail-mask",
   );
-  await expect(composerActivityRow).toHaveCSS("backdrop-filter", "none");
-  await expect(composerActivityRow).not.toHaveCSS(
+  await expect(composerRailMask).toHaveCSS("backdrop-filter", "none");
+  await expect(composerRailMask).not.toHaveCSS(
     "background-color",
     "rgba(0, 0, 0, 0)",
   );
@@ -2557,15 +2587,369 @@ async function seedHomeInboxMention(
   await page.getByTestId(`home-inbox-item-${itemId}`).click();
 }
 
-test("home inbox channel label navigates to the channel message", async ({
+test("Inbox All excludes generic channel traffic", async ({ page }) => {
+  await page.goto("/");
+  await page.waitForFunction(() => {
+    const win = window as MockFeedWindow;
+    return typeof win.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__ === "function";
+  });
+
+  await page.evaluate(
+    ({ channelId, currentPubkey, senderPubkey }) => {
+      const pushFeedItem = (window as MockFeedWindow)
+        .__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__;
+      if (!pushFeedItem) throw new Error("Mock feed helper is not installed.");
+      const now = Math.floor(Date.now() / 1000);
+      pushFeedItem({
+        category: "activity",
+        channel_id: channelId,
+        channel_name: "general",
+        channel_type: "stream",
+        content: "Ordinary channel traffic",
+        created_at: now,
+        id: "inbox-generic-channel-message",
+        kind: 9,
+        pubkey: senderPubkey,
+        tags: [["h", channelId]],
+      });
+      pushFeedItem({
+        category: "mention",
+        channel_id: channelId,
+        channel_name: "general",
+        channel_type: "stream",
+        content: "A message that needs my attention",
+        created_at: now + 1,
+        id: "inbox-personal-mention",
+        kind: 9,
+        pubkey: senderPubkey,
+        tags: [
+          ["h", channelId],
+          ["p", currentPubkey],
+        ],
+      });
+    },
+    {
+      channelId: GENERAL_CHANNEL_ID,
+      currentPubkey: TEST_IDENTITIES.tyler.pubkey,
+      senderPubkey: TEST_IDENTITIES.alice.pubkey,
+    },
+  );
+
+  await expect(
+    page.getByTestId("home-inbox-item-inbox-personal-mention"),
+  ).toBeVisible();
+  await expect(
+    page.getByTestId("home-inbox-item-inbox-generic-channel-message"),
+  ).toHaveCount(0);
+});
+
+test("Inbox All never lists drafts and unread-only hides reminders", async ({
+  page,
+}) => {
+  const draftKey = `channel:${GENERAL_CHANNEL_ID}`;
+  await page.addInitScript(
+    ({ draftStoreKey, draftStorageKey }) => {
+      const timestamp = new Date().toISOString();
+      window.localStorage.setItem(
+        draftStoreKey,
+        JSON.stringify({
+          [draftStorageKey]: {
+            channelId: "9a1657ac-f7aa-5db0-b632-d8bbeb6dfb50",
+            content: "Finish the mixed Inbox test",
+            createdAt: timestamp,
+            pendingImeta: [],
+            selectionEnd: 30,
+            selectionStart: 30,
+            spoileredAttachmentUrls: [],
+            status: "active",
+            updatedAt: timestamp,
+          },
+        }),
+      );
+    },
+    {
+      draftStorageKey: draftKey,
+      draftStoreKey: `buzz-drafts.v2:ws://localhost:3000:${MOCK_IDENTITY_PUBKEY}`,
+    },
+  );
+  await page.goto("/");
+  await page.waitForFunction(() => {
+    const win = window as MockFeedWindow;
+    return typeof win.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__ === "function";
+  });
+
+  const reminderId = "inbox-unread-only-reminder";
+  const messageId = "inbox-unread-only-message";
+  await page.evaluate(
+    async ({
+      channelId,
+      currentPubkey,
+      messageId,
+      reminderId,
+      senderPubkey,
+    }) => {
+      const now = Math.floor(Date.now() / 1_000);
+      window.__BUZZ_E2E_SEED_MOCK_REMINDERS__?.([
+        {
+          id: reminderId,
+          pubkey: currentPubkey,
+          created_at: now - 120,
+          kind: 30300,
+          tags: [
+            ["d", reminderId],
+            ["not_before", String(now - 60)],
+          ],
+          content: JSON.stringify({
+            target: {
+              eventId: "mock-general-alice",
+              channelId,
+              preview: "Due reminder in mixed Inbox",
+              authorPubkey: senderPubkey,
+            },
+            status: "pending",
+          }),
+          sig: "mocksig".repeat(20).slice(0, 128),
+        },
+      ]);
+      await window.__BUZZ_E2E_QUERY_CLIENT__?.invalidateQueries({
+        queryKey: ["reminders"],
+      });
+
+      const pushFeedItem = (window as MockFeedWindow)
+        .__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__;
+      if (!pushFeedItem) throw new Error("Mock feed helper is not installed.");
+      pushFeedItem({
+        category: "mention",
+        channel_id: channelId,
+        channel_name: "general",
+        channel_type: "stream",
+        content: "Unread message in mixed Inbox",
+        created_at: now,
+        id: messageId,
+        kind: 9,
+        pubkey: senderPubkey,
+        tags: [
+          ["h", channelId],
+          ["p", currentPubkey],
+        ],
+      });
+    },
+    {
+      channelId: GENERAL_CHANNEL_ID,
+      currentPubkey: MOCK_IDENTITY_PUBKEY,
+      messageId,
+      reminderId,
+      senderPubkey: TEST_IDENTITIES.alice.pubkey,
+    },
+  );
+
+  const messageRow = page.getByTestId(`home-inbox-item-${messageId}`);
+  const reminderRow = page.getByTestId(`home-all-reminders-${reminderId}`);
+  const draftRow = page.getByTestId(`home-all-drafts-${draftKey}`);
+  await expect(messageRow).toBeVisible();
+  await expect(reminderRow).toBeVisible();
+  // Drafts belong to the dedicated Drafts filter — never the mixed All view.
+  await expect(draftRow).toHaveCount(0);
+
+  await page.getByTestId("inbox-options-trigger").click();
+  await page.getByRole("switch", { name: "Show unread only" }).click();
+
+  await expect(messageRow).toBeVisible();
+  await expect(reminderRow).toHaveCount(0);
+  await expect(draftRow).toHaveCount(0);
+
+  // The draft is still reachable under the Drafts filter.
+  await page.keyboard.press("Escape");
+  await page.getByTestId("inbox-filter-trigger").click();
+  await page.getByRole("menuitemradio", { name: "Drafts" }).click();
+  await expect(page.getByTestId("home-inbox-drafts")).toBeVisible();
+});
+
+test("Inbox merges a due reminder into its represented conversation", async ({
+  page,
+}) => {
+  const messageId = "inbox-reminder-merge-message";
+  const reminderId = "inbox-reminder-merge";
+  await seedHomeInboxMention(page, messageId);
+
+  await page.evaluate(
+    async ({
+      authorPubkey,
+      channelId,
+      messageId: targetEventId,
+      pubkey,
+      reminderId: id,
+    }) => {
+      const now = Math.floor(Date.now() / 1_000);
+      window.__BUZZ_E2E_SEED_MOCK_REMINDERS__?.([
+        {
+          id,
+          pubkey,
+          created_at: now - 600,
+          kind: 30300,
+          tags: [
+            ["d", id],
+            ["not_before", String(now - 60)],
+          ],
+          content: JSON.stringify({
+            target: {
+              eventId: targetEventId,
+              channelId,
+              preview: "Please review the home panel routing.",
+              authorPubkey,
+            },
+            status: "pending",
+          }),
+          sig: "mocksig".repeat(20).slice(0, 128),
+        },
+      ]);
+      await window.__BUZZ_E2E_QUERY_CLIENT__?.invalidateQueries({
+        queryKey: ["reminders"],
+      });
+    },
+    {
+      authorPubkey: TEST_IDENTITIES.alice.pubkey,
+      channelId: GENERAL_CHANNEL_ID,
+      messageId,
+      pubkey: MOCK_IDENTITY_PUBKEY,
+      reminderId,
+    },
+  );
+
+  const conversationRow = page.getByTestId(`home-inbox-item-${messageId}`);
+  await expect(conversationRow.getByText("Reminder due")).toBeVisible();
+  await expect(
+    page.getByTestId(`home-all-reminders-${reminderId}`),
+  ).toHaveCount(0);
+
+  await page.getByTestId("inbox-filter-trigger").click();
+  await page.getByRole("menuitemradio", { name: "Mentions" }).click();
+  await expect(conversationRow.getByText("Reminder due")).toBeVisible();
+});
+
+test("Inbox All keeps its filter when opening a due reminder", async ({
+  page,
+}) => {
+  await page.goto("/");
+  await expect(page.getByTestId("home-inbox")).toBeVisible();
+
+  const reminderId = "inbox-stable-reminder";
+  await page.evaluate(
+    async ({ channelId, id, pubkey }) => {
+      const now = Math.floor(Date.now() / 1000);
+      window.__BUZZ_E2E_SEED_MOCK_REMINDERS__?.([
+        {
+          id,
+          pubkey,
+          created_at: now - 300,
+          kind: 30300,
+          tags: [
+            ["d", id],
+            ["not_before", String(now - 60)],
+          ],
+          content: JSON.stringify({
+            target: {
+              eventId: "mock-general-alice",
+              channelId,
+              preview: "Review the Inbox behavior",
+              authorPubkey: pubkey,
+            },
+            status: "pending",
+          }),
+          sig: "mocksig".repeat(20).slice(0, 128),
+        },
+      ]);
+      await window.__BUZZ_E2E_QUERY_CLIENT__?.invalidateQueries({
+        queryKey: ["reminders"],
+      });
+    },
+    {
+      channelId: GENERAL_CHANNEL_ID,
+      id: reminderId,
+      pubkey: MOCK_IDENTITY_PUBKEY,
+    },
+  );
+
+  const reminderRow = page.getByTestId(`home-all-reminders-${reminderId}`);
+  await expect(reminderRow).toBeVisible();
+  await reminderRow.click();
+
+  await expect(page.getByTestId("inbox-filter-trigger")).toContainText("All");
+  await expect(page.getByTestId("home-reminder-detail")).toBeVisible();
+  await expect(page.getByTestId("home-inbox-list")).toBeVisible();
+});
+
+test("Inbox reminder rows and detail identify DM context", async ({ page }) => {
+  await page.goto("/");
+  await expect(page.getByTestId("home-inbox")).toBeVisible();
+
+  const reminderId = "inbox-dm-reminder";
+  const dmChannelId = "f48efb06-0c93-5025-aac9-2e646bb6bfa8";
+  await page.evaluate(
+    async ({ authorPubkey, channelId, currentPubkey, reminderId }) => {
+      const now = Math.floor(Date.now() / 1_000);
+      window.__BUZZ_E2E_SEED_MOCK_REMINDERS__?.([
+        {
+          id: reminderId,
+          pubkey: currentPubkey,
+          created_at: now - 300,
+          kind: 30300,
+          tags: [
+            ["d", reminderId],
+            ["not_before", String(now - 60)],
+          ],
+          content: JSON.stringify({
+            target: {
+              eventId: "mock-dm-alice",
+              channelId,
+              preview: "Follow up with Alice",
+              authorPubkey,
+            },
+            status: "pending",
+          }),
+          sig: "mocksig".repeat(20).slice(0, 128),
+        },
+      ]);
+      await window.__BUZZ_E2E_QUERY_CLIENT__?.invalidateQueries({
+        queryKey: ["reminders"],
+      });
+    },
+    {
+      authorPubkey: TEST_IDENTITIES.alice.pubkey,
+      channelId: dmChannelId,
+      currentPubkey: MOCK_IDENTITY_PUBKEY,
+      reminderId,
+    },
+  );
+
+  await page.getByTestId("inbox-filter-trigger").click();
+  await page.getByRole("menuitemradio", { name: "Reminders" }).click();
+  const reminderRow = page.getByTestId(`home-reminder-item-${reminderId}`);
+  await expect(
+    reminderRow.getByText("DM with alice-tyler", { exact: true }),
+  ).toBeVisible();
+  await reminderRow.getByRole("button").click();
+
+  const detail = page.getByTestId("home-reminder-detail");
+  await expect(
+    detail.getByText("DM with alice-tyler", { exact: true }),
+  ).toBeVisible();
+  await expect(detail.getByText("#alice-tyler", { exact: true })).toHaveCount(
+    0,
+  );
+});
+
+test("Inbox detail title and source action navigate to the conversation", async ({
   page,
 }) => {
   await seedHomeInboxMention(page, "mock-feed-home-channel-navigate");
 
-  await page
-    .getByTestId("home-inbox-detail")
-    .getByRole("button", { exact: true, name: "general" })
-    .click();
+  const detail = page.getByTestId("home-inbox-detail");
+  await expect(detail.getByRole("heading")).toHaveText("Message in #general");
+  await expect(
+    detail.getByRole("button", { name: "Open in channel" }),
+  ).toBeVisible();
+  await detail.getByTestId("home-inbox-context-title").click();
 
   await expect(page).toHaveURL(
     new RegExp(`#/channels/${GENERAL_CHANNEL_ID}\\?`),
@@ -2586,10 +2970,10 @@ test("home inbox thread reply mention carries threadRootId to the channel", asyn
     ["p", TEST_IDENTITIES.tyler.pubkey],
   ]);
 
-  await page
-    .getByTestId("home-inbox-detail")
-    .getByRole("button", { exact: true, name: "general" })
-    .click();
+  const detail = page.getByTestId("home-inbox-detail");
+  await expect(detail.getByRole("heading")).toHaveText("Thread in #general");
+  await expect(detail.getByTestId("message-unread-divider")).toBeVisible();
+  await detail.getByRole("button", { name: "Open full thread" }).click();
 
   await expect(page).toHaveURL(
     new RegExp(`#/channels/${GENERAL_CHANNEL_ID}\\?`),
@@ -2600,6 +2984,236 @@ test("home inbox thread reply mention carries threadRootId to the channel", asyn
   await expect(page.getByTestId("home-inbox-list")).toHaveCount(0);
 });
 
+test("Inbox filter changes preserve valid detail and directly select a replacement", async ({
+  page,
+}) => {
+  const threadItemId = "inbox-filter-thread";
+  const actionItemId = "inbox-filter-action";
+  await seedHomeInboxMention(page, threadItemId, [
+    ["e", "inbox-filter-root", "", "root"],
+    ["e", "inbox-filter-parent", "", "reply"],
+    ["p", TEST_IDENTITIES.tyler.pubkey],
+  ]);
+
+  await page.evaluate(
+    ({ actionId, channelId, senderPubkey }) => {
+      const pushFeedItem = (window as MockFeedWindow)
+        .__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__;
+      if (!pushFeedItem) throw new Error("Mock feed helper is not installed.");
+      pushFeedItem({
+        category: "needs_action",
+        channel_id: channelId,
+        channel_name: "general",
+        channel_type: "stream",
+        content: "Approve the replacement selection",
+        created_at: Math.floor(Date.now() / 1_000) + 120,
+        id: actionId,
+        kind: 46010,
+        pubkey: senderPubkey,
+        tags: [["h", channelId]],
+      });
+    },
+    {
+      actionId: actionItemId,
+      channelId: GENERAL_CHANNEL_ID,
+      senderPubkey: TEST_IDENTITIES.alice.pubkey,
+    },
+  );
+
+  await page.getByTestId("inbox-filter-trigger").click();
+  await page.getByRole("menuitemradio", { name: "Threads" }).click();
+  await expect(
+    page.getByTestId(`home-inbox-item-${threadItemId}`),
+  ).toHaveAttribute("aria-current", "true");
+  await expect(page.getByTestId("home-inbox-detail")).toContainText(
+    "Please review the home panel routing.",
+  );
+
+  await expect(
+    page.getByRole("menuitemradio", { name: "Threads" }),
+  ).toHaveCount(0);
+  await page.getByTestId("inbox-filter-trigger").click();
+  await page.getByRole("menuitemradio", { name: "Needs action" }).click();
+  await expect(
+    page.getByTestId(`home-inbox-item-${actionItemId}`),
+  ).toHaveAttribute("aria-current", "true");
+  await expect(page.getByTestId("home-inbox-detail")).toContainText(
+    "Approve the replacement selection",
+  );
+});
+
+test("Inbox keeps the unread boundary for replies from multiple agents", async ({
+  page,
+}) => {
+  await page.goto("/");
+  await expect(page.getByTestId("home-inbox-list")).toBeVisible();
+  await page.waitForFunction(() => {
+    const win = window as MockFeedWindow;
+    return (
+      typeof win.__BUZZ_E2E_EMIT_MOCK_MESSAGE__ === "function" &&
+      typeof win.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__ === "function"
+    );
+  });
+
+  const replyIds = [
+    "inbox-agent-reply-first",
+    "inbox-agent-reply-second",
+    "inbox-agent-reply-third",
+  ];
+  await page.evaluate(
+    ({ agentPubkeys, channelId, currentPubkey, ids }) => {
+      const win = window as MockFeedWindow;
+      const emitMessage = win.__BUZZ_E2E_EMIT_MOCK_MESSAGE__;
+      const pushFeedItem = win.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__;
+      if (!emitMessage || !pushFeedItem) {
+        throw new Error("Mock bridge helpers are not installed.");
+      }
+
+      const createdAt = Math.floor(Date.now() / 1000) + 60;
+      const root = emitMessage({
+        channelName: "general",
+        content: "Agent collaboration thread",
+        createdAt: createdAt - 10,
+        id: "inbox-agent-thread-root",
+        pubkey: currentPubkey,
+      });
+      const contents = [
+        "First unread agent reply",
+        "Second unread agent reply",
+        "Third unread agent reply",
+      ];
+
+      contents.forEach((content, index) => {
+        const event = emitMessage({
+          channelName: "general",
+          content,
+          createdAt: createdAt + index,
+          id: ids[index],
+          parentEventId: root.id,
+          pubkey: agentPubkeys[index % agentPubkeys.length],
+        });
+        pushFeedItem({
+          category: "activity",
+          channel_id: channelId,
+          channel_name: "general",
+          channel_type: "stream",
+          content: event.content,
+          created_at: event.created_at,
+          id: event.id,
+          kind: event.kind,
+          pubkey: event.pubkey,
+          tags: event.tags,
+        });
+      });
+    },
+    {
+      agentPubkeys: [
+        TEST_IDENTITIES.alice.pubkey,
+        TEST_IDENTITIES.charlie.pubkey,
+      ],
+      channelId: GENERAL_CHANNEL_ID,
+      currentPubkey: MOCK_IDENTITY_PUBKEY,
+      ids: replyIds,
+    },
+  );
+
+  const firstUnreadRow = page.getByTestId(`home-inbox-item-${replyIds[0]}`);
+  await expect(firstUnreadRow).toBeVisible();
+  await firstUnreadRow.click();
+
+  const detail = page.getByTestId("home-inbox-detail");
+  await expect(detail).toContainText("Agent collaboration thread");
+  await expect(detail).toContainText("First unread agent reply");
+  await expect(detail).toContainText("Second unread agent reply");
+  await expect(detail).toContainText("Third unread agent reply");
+  await expect(detail.getByTestId("message-unread-divider")).toBeVisible();
+  await expect(page.getByTestId("home-inbox-selected-message")).toContainText(
+    "First unread agent reply",
+  );
+});
+
+test("home inbox groups consecutive DMs and opens the full conversation", async ({
+  page,
+}) => {
+  const dmChannelId = "f48efb06-0c93-5025-aac9-2e646bb6bfa8";
+  const dmIds = ["inbox-dm-first", "inbox-dm-second", "inbox-dm-third"];
+
+  await page.goto("/");
+  await expect(page.getByTestId("home-inbox-list")).toBeVisible();
+  await page.waitForFunction(() => {
+    const win = window as MockFeedWindow;
+    return (
+      typeof win.__BUZZ_E2E_EMIT_MOCK_MESSAGE__ === "function" &&
+      typeof win.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__ === "function"
+    );
+  });
+
+  await page.evaluate(
+    ({ channelId, createdAt, ids, senderPubkey }) => {
+      const win = window as MockFeedWindow;
+      const emitMessage = win.__BUZZ_E2E_EMIT_MOCK_MESSAGE__;
+      const pushFeedItem = win.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__;
+      if (!emitMessage || !pushFeedItem) {
+        throw new Error("Mock bridge helpers are not installed.");
+      }
+
+      ["First unread DM", "Second unread DM", "Third unread DM"].forEach(
+        (content, index) => {
+          const event = emitMessage({
+            channelName: "alice-tyler",
+            content,
+            createdAt: createdAt + index,
+            id: ids[index],
+            pubkey: senderPubkey,
+          });
+          pushFeedItem({
+            category: "activity",
+            channel_id: channelId,
+            channel_name: "alice-tyler",
+            channel_type: null,
+            content: event.content,
+            created_at: event.created_at,
+            id: event.id,
+            kind: event.kind,
+            pubkey: event.pubkey,
+            tags: event.tags,
+          });
+        },
+      );
+    },
+    {
+      channelId: dmChannelId,
+      createdAt: Math.floor(Date.now() / 1000),
+      ids: dmIds,
+      senderPubkey: TEST_IDENTITIES.alice.pubkey,
+    },
+  );
+
+  const firstDmRow = page.getByTestId(`home-inbox-item-${dmIds[0]}`);
+  await expect(firstDmRow).toBeVisible();
+  await expect(page.getByTestId(`home-inbox-item-${dmIds[1]}`)).toHaveCount(0);
+  await expect(page.getByTestId(`home-inbox-item-${dmIds[2]}`)).toHaveCount(0);
+  await expect(firstDmRow.getByTestId("home-inbox-unread-count")).toHaveText(
+    "3 unread",
+  );
+
+  await firstDmRow.click();
+  const detail = page.getByTestId("home-inbox-detail");
+  await expect(detail.getByRole("heading")).toHaveText("DM with alice");
+  await expect(detail).toContainText("First unread DM");
+  await expect(detail).toContainText("Second unread DM");
+  await expect(detail).toContainText("Third unread DM");
+  await expect(page.getByTestId("home-inbox-selected-message")).toContainText(
+    "First unread DM",
+  );
+  const unreadBoundary = page.getByTestId("message-unread-divider");
+  await expect(unreadBoundary).toBeVisible();
+  await expect(unreadBoundary).toContainText("New");
+  await expect(
+    detail.getByRole("button", { name: "Open conversation" }),
+  ).toBeVisible();
+});
+
 test("home inbox manage affordance opens management without leaving home", async ({
   page,
 }) => {
diff --git a/desktop/tests/e2e/community-rail.spec.ts b/desktop/tests/e2e/community-rail.spec.ts
index 0d54efb092..0c78108190 100644
--- a/desktop/tests/e2e/community-rail.spec.ts
+++ b/desktop/tests/e2e/community-rail.spec.ts
@@ -182,6 +182,7 @@ test.describe("community rail", () => {
     await installMockBridge(
       page,
       {
+        relayMembershipEoseDelayMs: 30_000,
         relayRequiresMembership: true,
         relayRole: "admin",
       },
@@ -215,7 +216,7 @@ test.describe("community rail", () => {
     ).not.toBeFocused();
     await expect(
       menu.getByRole("menuitem", { name: "Invite to community" }),
-    ).toBeVisible();
+    ).toBeVisible({ timeout: 1_000 });
     await expect(
       menu.getByRole("menuitem", { name: "Community settings" }),
     ).toBeVisible();
@@ -658,9 +659,46 @@ test.describe("community rail", () => {
       `community-rail-button-${COMMUNITY_A.id}`,
     );
     await expect(firstButton).toBeVisible();
-    const box = await firstButton.boundingBox();
-    expect(box).not.toBeNull();
-    expect(box?.y ?? 0).toBeGreaterThanOrEqual(32);
+    const buttonBox = await firstButton.boundingBox();
+    const railBox = await page.getByTestId("community-rail").boundingBox();
+    const searchBox = await page.getByTestId("open-search").boundingBox();
+    const appSurfaceBox = await page
+      .locator(".buzz-huddle-app-surface")
+      .boundingBox();
+    const contentBox = await page
+      .locator("[data-buzz-content-surface]")
+      .first()
+      .boundingBox();
+    expect(buttonBox).not.toBeNull();
+    expect(railBox).not.toBeNull();
+    expect(searchBox).not.toBeNull();
+    expect(appSurfaceBox).not.toBeNull();
+    expect(contentBox).not.toBeNull();
+    expect(buttonBox?.y ?? 0).toBeGreaterThanOrEqual(32);
+    expect(
+      Math.abs((buttonBox?.y ?? 0) - (contentBox?.y ?? 0) - 6),
+    ).toBeLessThan(0.5);
+    expect(Math.abs((railBox?.y ?? 0) - (appSurfaceBox?.y ?? 0))).toBeLessThan(
+      0.5,
+    );
+    expect(
+      Math.abs(
+        (railBox?.y ?? 0) +
+          (railBox?.height ?? 0) -
+          ((appSurfaceBox?.y ?? 0) + (appSurfaceBox?.height ?? 0)),
+      ),
+    ).toBeLessThan(0.5);
+
+    const leftInset = (buttonBox?.x ?? 0) - (railBox?.x ?? 0);
+    const rightInset =
+      (railBox?.x ?? 0) +
+      (railBox?.width ?? 0) -
+      ((buttonBox?.x ?? 0) + (buttonBox?.width ?? 0));
+    expect(Math.abs(leftInset - 10)).toBeLessThan(0.5);
+    expect(Math.abs(leftInset - rightInset)).toBeLessThan(0.5);
+    const visibleRightGap =
+      (searchBox?.x ?? 0) - ((buttonBox?.x ?? 0) + (buttonBox?.width ?? 0));
+    expect(Math.abs(leftInset - visibleRightGap)).toBeLessThan(0.5);
 
     // With the rail visible, the top-chrome controls (sidebar toggle, back/
     // forward) sit just past the traffic lights near the rail edge — not
diff --git a/desktop/tests/e2e/composer-selection-formatting.spec.ts b/desktop/tests/e2e/composer-selection-formatting.spec.ts
new file mode 100644
index 0000000000..b8ab46503d
--- /dev/null
+++ b/desktop/tests/e2e/composer-selection-formatting.spec.ts
@@ -0,0 +1,592 @@
+import { expect, test, type Locator, type Page } from "@playwright/test";
+
+import { installMockBridge } from "../helpers/bridge";
+
+async function openGeneral(page: Page) {
+  await page.goto("/");
+  await page.getByTestId("channel-general").click();
+  await expect(page.getByTestId("chat-title")).toHaveText("general");
+}
+
+async function selectText(input: Locator, selectedText: string) {
+  await input.evaluate((element, text) => {
+    const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
+    let offset = 0;
+
+    while (walker.nextNode()) {
+      const node = walker.currentNode;
+      const value = node.textContent ?? "";
+      const index = value.indexOf(text);
+      if (index >= 0) {
+        const range = document.createRange();
+        range.setStart(node, index);
+        range.setEnd(node, index + text.length);
+
+        const selection = window.getSelection();
+        selection?.removeAllRanges();
+        selection?.addRange(range);
+        (element as HTMLElement).focus();
+        document.dispatchEvent(new Event("selectionchange"));
+        return;
+      }
+      offset += value.length;
+    }
+
+    throw new Error(
+      `Could not select "${text}" in composer after ${offset} characters`,
+    );
+  }, selectedText);
+}
+
+async function selectTextRange(
+  input: Locator,
+  firstText: string,
+  lastText: string,
+) {
+  await input.evaluate(
+    (element, texts) => {
+      const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
+      let first: Text | null = null;
+      let last: Text | null = null;
+      while (walker.nextNode()) {
+        const node = walker.currentNode as Text;
+        if (!first && node.data.includes(texts.firstText)) first = node;
+        if (node.data.includes(texts.lastText)) last = node;
+      }
+      if (!(first && last))
+        throw new Error("Could not find selection endpoints");
+      const range = document.createRange();
+      range.setStart(first, first.data.indexOf(texts.firstText));
+      range.setEnd(
+        last,
+        last.data.indexOf(texts.lastText) + texts.lastText.length,
+      );
+      const selection = window.getSelection();
+      selection?.removeAllRanges();
+      selection?.addRange(range);
+      (element as HTMLElement).focus();
+      document.dispatchEvent(new Event("selectionchange"));
+    },
+    { firstText, lastText },
+  );
+}
+
+async function dragSelectText(
+  page: Page,
+  input: Locator,
+  selectedText: string,
+  backward = false,
+) {
+  const points = await input.evaluate((element, text) => {
+    const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
+
+    while (walker.nextNode()) {
+      const node = walker.currentNode;
+      const value = node.textContent ?? "";
+      const index = value.indexOf(text);
+      if (index < 0) continue;
+
+      const startRange = document.createRange();
+      startRange.setStart(node, index);
+      startRange.setEnd(node, index + 1);
+      const startRect = startRange.getBoundingClientRect();
+
+      const endRange = document.createRange();
+      endRange.setStart(node, index + text.length - 1);
+      endRange.setEnd(node, index + text.length);
+      const endRect = endRange.getBoundingClientRect();
+
+      return {
+        start: {
+          x: startRect.left + 1,
+          y: startRect.top + startRect.height / 2,
+        },
+        end: {
+          x: endRect.right - 1,
+          y: endRect.top + endRect.height / 2,
+        },
+      };
+    }
+
+    throw new Error(`Could not locate "${text}" for mouse selection`);
+  }, selectedText);
+
+  const dragStart = backward ? points.end : points.start;
+  const dragEnd = backward ? points.start : points.end;
+  await page.mouse.move(dragStart.x, dragStart.y);
+  await page.mouse.down();
+  await page.mouse.move(dragEnd.x, dragEnd.y, { steps: 12 });
+  await page.mouse.up();
+
+  await expect
+    .poll(() => page.evaluate(() => window.getSelection()?.toString()))
+    .toBe(selectedText);
+}
+
+async function applySelectionFormat(
+  page: Page,
+  input: Locator,
+  label: "Bullet list" | "Code block" | "Ordered list" | "Quote",
+  collapseAfterMouseDown = false,
+  useMouseSelection = false,
+) {
+  if (useMouseSelection) {
+    await dragSelectText(page, input, "selected");
+  } else {
+    await selectText(input, "selected");
+  }
+  const tray = page.getByTestId("selection-formatting-tray");
+  await expect(tray).toBeVisible();
+  const button = tray.getByRole("button", { name: label });
+
+  if (collapseAfterMouseDown) {
+    await button.evaluate((element, inputTestId) => {
+      element.addEventListener(
+        "mouseup",
+        () => {
+          const input = document.querySelector(
+            `[data-testid="${inputTestId}"]`,
+          );
+          if (!input) throw new Error("Composer input not found");
+
+          const range = document.createRange();
+          range.selectNodeContents(input);
+          range.collapse(false);
+          const selection = window.getSelection();
+          selection?.removeAllRanges();
+          selection?.addRange(range);
+          document.dispatchEvent(new Event("selectionchange"));
+        },
+        { once: true },
+      );
+    }, "message-input");
+  }
+
+  await button.click();
+}
+
+test.beforeEach(async ({ page }) => {
+  await installMockBridge(page);
+});
+
+async function applyCaretFormat(
+  page: Page,
+  label: "Bullet list" | "Code block" | "Ordered list" | "Quote",
+) {
+  await page.getByRole("button", { name: "Toggle formatting" }).first().click();
+  await page.getByRole("button", { name: label, exact: true }).click();
+}
+
+for (const format of [
+  { label: "Code block", selector: "pre" },
+  { label: "Bullet list", selector: "ul" },
+  { label: "Ordered list", selector: "ol" },
+  { label: "Quote", selector: "blockquote" },
+] as const) {
+  test(`${format.label} applies only to the selected composer text`, async ({
+    page,
+  }) => {
+    await openGeneral(page);
+
+    const input = page.getByTestId("message-input");
+    await input.fill("before selected after");
+    await applySelectionFormat(page, input, format.label);
+
+    await expect(input.locator(":scope > p").first()).toHaveText("before ");
+    await expect(input.locator(`:scope > ${format.selector}`)).toHaveText(
+      "selected",
+    );
+    await expect(input.locator(":scope > p").last()).toHaveText(" after");
+    await expect(input).toHaveText("before selected after");
+  });
+
+  test(`${format.label} starts at a collapsed caret on a new line`, async ({
+    page,
+  }) => {
+    await openGeneral(page);
+
+    const input = page.getByTestId("message-input");
+    await input.click();
+    await input.pressSequentially("before");
+    await input.press("Shift+Enter");
+    await applyCaretFormat(page, format.label);
+    await input.pressSequentially("inside");
+
+    await expect(input.locator(":scope > p").first()).toHaveText("before");
+    await expect(input.locator(`:scope > ${format.selector}`)).toHaveText(
+      "inside",
+    );
+  });
+
+  test(`${format.label} at a collapsed caret formats only the caret's line`, async ({
+    page,
+  }) => {
+    await openGeneral(page);
+
+    const input = page.getByTestId("message-input");
+    await input.click();
+    await input.pressSequentially("before");
+    await input.press("Shift+Enter");
+    await input.pressSequentially("target");
+    await input.press("Shift+Enter");
+    await input.pressSequentially("after");
+    // Collapse the caret into the middle line.
+    await selectText(input, "target");
+    await input.press("ArrowRight");
+    await applyCaretFormat(page, format.label);
+
+    await expect(input.locator(":scope > p").first()).toHaveText("before");
+    await expect(input.locator(`:scope > ${format.selector}`)).toHaveText(
+      "target",
+    );
+    await expect(input.locator(":scope > p").last()).toHaveText("after");
+  });
+}
+
+test("Code block uses the restored multiline selection after mouseup collapse", async ({
+  page,
+}) => {
+  await openGeneral(page);
+
+  const input = page.getByTestId("message-input");
+  await input.click();
+  await input.pressSequentially("before");
+  await input.press("Shift+Enter");
+  await input.pressSequentially("selected");
+  await input.press("Shift+Enter");
+  await input.pressSequentially("after");
+  await applySelectionFormat(page, input, "Code block", true);
+
+  await expect(input.locator(":scope > p").first()).toHaveText("before");
+  await expect(input.locator(":scope > pre")).toHaveText("selected");
+  await expect(input.locator(":scope > p").last()).toHaveText("after");
+});
+
+for (const list of [
+  { label: "Bullet list", selector: "ul" },
+  { label: "Ordered list", selector: "ol" },
+] as const) {
+  test(`selected hard-break lines become separate ${list.label.toLowerCase()} items`, async ({
+    page,
+  }) => {
+    await openGeneral(page);
+    const input = page.getByTestId("message-input");
+    await input.click();
+    await input.pressSequentially("one");
+    await input.press("Shift+Enter");
+    await input.pressSequentially("two");
+    await input.press("Shift+Enter");
+    await input.pressSequentially("three");
+    await selectTextRange(input, "one", "three");
+    await page
+      .getByTestId("selection-formatting-tray")
+      .getByRole("button", { name: list.label })
+      .click();
+
+    const items = input.locator(`:scope > ${list.selector} > li`);
+    await expect(items).toHaveCount(3);
+    await expect(items).toHaveText(["one", "two", "three"]);
+  });
+}
+
+test("partial list-item selections snap to whole items for block formats", async ({
+  page,
+}) => {
+  for (const format of [
+    "Code block",
+    "Bullet list",
+    "Ordered list",
+    "Quote",
+  ] as const) {
+    await openGeneral(page);
+    const input = page.getByTestId("message-input");
+    await input.click();
+    await input.pressSequentially("before");
+    await input.press("Shift+Enter");
+    await input.pressSequentially("first");
+    await input.press("Shift+Enter");
+    await input.pressSequentially("second");
+    await input.press("Shift+Enter");
+    await input.pressSequentially("after");
+    await selectTextRange(input, "before", "after");
+    await page
+      .getByTestId("selection-formatting-tray")
+      .getByRole("button", { name: "Bullet list" })
+      .click();
+
+    await selectTextRange(input, "irst", "seco");
+    await page
+      .getByTestId("selection-formatting-tray")
+      .getByRole("button", { name: format })
+      .click();
+
+    const structure = await input.locator(":scope > *").evaluateAll((nodes) =>
+      nodes.map((node) => ({
+        tag: node.tagName.toLowerCase(),
+        text: node.textContent,
+        items: Array.from(
+          node.querySelectorAll(":scope > li"),
+          (item) => item.textContent,
+        ),
+      })),
+    );
+    const expected = {
+      "Code block": [
+        { tag: "ul", text: "before", items: ["before"] },
+        { tag: "pre", text: "first\nsecond", items: [] },
+        { tag: "ul", text: "after", items: ["after"] },
+      ],
+      "Bullet list": [
+        {
+          tag: "ul",
+          text: "beforefirstsecondafter",
+          items: ["before", "first", "second", "after"],
+        },
+      ],
+      "Ordered list": [
+        { tag: "ul", text: "before", items: ["before"] },
+        { tag: "ol", text: "firstsecond", items: ["first", "second"] },
+        { tag: "ul", text: "after", items: ["after"] },
+      ],
+      Quote: [
+        { tag: "ul", text: "before", items: ["before"] },
+        { tag: "blockquote", text: "firstsecond", items: [] },
+        { tag: "ul", text: "after", items: ["after"] },
+      ],
+    }[format];
+    expect(structure).toEqual(expected);
+    await page.reload();
+  }
+});
+
+test("selected hard-break lines stay newline-separated in one code block", async ({
+  page,
+}) => {
+  await openGeneral(page);
+  const input = page.getByTestId("message-input");
+  await input.click();
+  await input.pressSequentially("one");
+  await input.press("Shift+Enter");
+  await input.pressSequentially("two");
+  await input.press("Shift+Enter");
+  await input.pressSequentially("three");
+  await selectTextRange(input, "one", "three");
+  await page
+    .getByTestId("selection-formatting-tray")
+    .getByRole("button", { name: "Code block" })
+    .click();
+
+  await expect(input.locator(":scope > pre")).toHaveCount(1);
+  await expect(input.locator(":scope > pre")).toHaveText("one\ntwo\nthree");
+
+  await page.getByTestId("send-message").click();
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (
+            window as Window & {
+              __BUZZ_E2E_SIGNED_EVENTS__?: Array<{ content: string }>;
+            }
+          ).__BUZZ_E2E_SIGNED_EVENTS__?.at(-1)?.content,
+      ),
+    )
+    .toBe("```\none\ntwo\nthree\n```");
+});
+
+test("selected list items become one multiline code block and keep neighbors", async ({
+  page,
+}) => {
+  await openGeneral(page);
+  const input = page.getByTestId("message-input");
+  await input.click();
+  await input.pressSequentially("before");
+  await input.press("Shift+Enter");
+  await input.pressSequentially("one");
+  await input.press("Shift+Enter");
+  await input.pressSequentially("two");
+  await input.press("Shift+Enter");
+  await input.pressSequentially("after");
+  await selectTextRange(input, "before", "after");
+  await page
+    .getByTestId("selection-formatting-tray")
+    .getByRole("button", { name: "Bullet list" })
+    .click();
+  await selectTextRange(input, "one", "two");
+  await page
+    .getByTestId("selection-formatting-tray")
+    .getByRole("button", { name: "Code block" })
+    .click();
+
+  await expect(input.locator(":scope > pre")).toHaveCount(1);
+  await expect(input.locator(":scope > pre")).toHaveText("one\ntwo");
+  await expect(input.locator(":scope > ul li")).toHaveText(["before", "after"]);
+
+  await page.getByTestId("send-message").click();
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (
+            window as Window & {
+              __BUZZ_E2E_SIGNED_EVENTS__?: Array<{ content: string }>;
+            }
+          ).__BUZZ_E2E_SIGNED_EVENTS__?.at(-1)?.content,
+      ),
+    )
+    .toBe("- before\n\n```\none\ntwo\n```\n\n- after");
+});
+
+test("caret-only block formatting serializes the prior draft unchanged", async ({
+  page,
+}) => {
+  await openGeneral(page);
+
+  const input = page.getByTestId("message-input");
+  await input.click();
+  await input.pressSequentially("before");
+  await input.press("Shift+Enter");
+  await applyCaretFormat(page, "Bullet list");
+  await input.pressSequentially("item");
+
+  await page.getByTestId("send-message").click();
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (
+            window as Window & {
+              __BUZZ_E2E_SIGNED_EVENTS__?: Array<{ content: string }>;
+            }
+          ).__BUZZ_E2E_SIGNED_EVENTS__?.at(-1)?.content,
+      ),
+    )
+    .toBe("before\n\n- item");
+});
+
+test("block formatting preserves the lines around a selected composer line", async ({
+  page,
+}) => {
+  await openGeneral(page);
+
+  const input = page.getByTestId("message-input");
+  await input.click();
+  await input.pressSequentially("before");
+  await input.press("Shift+Enter");
+  await input.pressSequentially("selected");
+  await input.press("Shift+Enter");
+  await input.pressSequentially("after");
+  await applySelectionFormat(page, input, "Bullet list");
+
+  await expect(input.locator(":scope > p").first()).toHaveText("before");
+  await expect(input.locator(":scope > ul")).toHaveText("selected");
+  await expect(input.locator(":scope > p").last()).toHaveText("after");
+
+  await page.getByTestId("send-message").click();
+  await expect
+    .poll(() =>
+      page.evaluate(
+        () =>
+          (
+            window as Window & {
+              __BUZZ_E2E_SIGNED_EVENTS__?: Array<{ content: string }>;
+            }
+          ).__BUZZ_E2E_SIGNED_EVENTS__?.at(-1)?.content,
+      ),
+    )
+    .toBe("before\n\n- selected\n\nafter");
+});
+
+test("block formatting restores a selection collapsed by the toolbar interaction", async ({
+  page,
+}) => {
+  await openGeneral(page);
+
+  const input = page.getByTestId("message-input");
+  await input.fill("before selected after");
+  await applySelectionFormat(page, input, "Bullet list", true);
+
+  await expect(input.locator(":scope > p").first()).toHaveText("before ");
+  await expect(input.locator(":scope > ul")).toHaveText("selected");
+  await expect(input.locator(":scope > p").last()).toHaveText(" after");
+});
+
+test("block formatting only changes text selected with a native mouse drag", async ({
+  page,
+}) => {
+  await openGeneral(page);
+
+  const input = page.getByTestId("message-input");
+  await input.fill("before selected after");
+  await applySelectionFormat(page, input, "Bullet list", false, true);
+
+  await expect(input.locator(":scope > p").first()).toHaveText("before ");
+  await expect(input.locator(":scope > ul")).toHaveText("selected");
+  await expect(input.locator(":scope > p").last()).toHaveText(" after");
+});
+
+test("block formatting preserves a backward native selection", async ({
+  page,
+}) => {
+  await openGeneral(page);
+
+  const input = page.getByTestId("message-input");
+  await input.fill("before selected after");
+  await dragSelectText(page, input, "selected", true);
+
+  const tray = page.getByTestId("selection-formatting-tray");
+  await expect(tray).toBeVisible();
+  await tray.getByRole("button", { name: "Bullet list" }).click();
+
+  await expect(input.locator(":scope > ul")).toHaveText("selected");
+  await expect
+    .poll(() =>
+      page.evaluate(() => {
+        const selection = window.getSelection();
+        if (!(selection?.anchorNode && selection.focusNode)) return false;
+        const anchorRange = document.createRange();
+        anchorRange.setStart(selection.anchorNode, selection.anchorOffset);
+        anchorRange.collapse(true);
+        const focusRange = document.createRange();
+        focusRange.setStart(selection.focusNode, selection.focusOffset);
+        focusRange.collapse(true);
+        return (
+          anchorRange.compareBoundaryPoints(Range.START_TO_START, focusRange) >
+          0
+        );
+      }),
+    )
+    .toBe(true);
+});
+
+test("Buzz theme uses the primary color for the selection formatter", async ({
+  page,
+}) => {
+  await openGeneral(page);
+
+  const input = page.getByTestId("message-input");
+  await input.fill("before selected after");
+  await selectText(input, "selected");
+  const tray = page.getByTestId("selection-formatting-tray");
+  await expect(tray).toBeVisible();
+
+  const colors = await tray.evaluate((element) => {
+    const probe = document.createElement("span");
+    probe.style.backgroundColor = "hsl(var(--primary))";
+    probe.style.color = "hsl(var(--primary-foreground))";
+    document.body.appendChild(probe);
+    const probeStyles = getComputedStyle(probe);
+    const trayStyles = getComputedStyle(element);
+    const result = {
+      primaryBackground: probeStyles.backgroundColor,
+      primaryForeground: probeStyles.color,
+      trayBackground: trayStyles.backgroundColor,
+      trayForeground: trayStyles.color,
+    };
+    probe.remove();
+    return result;
+  });
+
+  expect(colors.trayBackground).toBe(colors.primaryBackground);
+  expect(colors.trayForeground).toBe(colors.primaryForeground);
+});
diff --git a/desktop/tests/e2e/custom-emoji.spec.ts b/desktop/tests/e2e/custom-emoji.spec.ts
index aa345570f9..ae20aaef25 100644
--- a/desktop/tests/e2e/custom-emoji.spec.ts
+++ b/desktop/tests/e2e/custom-emoji.spec.ts
@@ -1,6 +1,9 @@
 import { expect, test } from "@playwright/test";
+import * as fs from "node:fs";
+import * as path from "node:path";
 
 import { installMockBridge } from "../helpers/bridge";
+import { waitForAnimations } from "../helpers/animations";
 
 // Custom-emoji end-to-end guard.
 //
@@ -77,6 +80,55 @@ test("typing a known :shortcode: renders an inline emoji node in the composer",
   await expect(input).not.toContainText(`:${SHORTCODE}:`);
 });
 
+test("emoji autocomplete ranks an exact standard shortcode before a custom substring", async ({
+  page,
+}, testInfo) => {
+  await openGeneral(page);
+
+  const input = page.getByTestId("message-input");
+  await input.click();
+  await input.pressSequentially(":joy");
+
+  const autocomplete = page.getByTestId("emoji-autocomplete");
+  await expect(autocomplete).toBeVisible();
+  const labels = await autocomplete.locator("button").allTextContents();
+  expect(labels[0]).toContain(":joy:");
+  expect(
+    labels.findIndex((label) => label.includes(":bufo_joy:")),
+  ).toBeGreaterThan(0);
+
+  const screenshotDir = path.resolve(
+    "test-results/emoji-autocomplete-screenshots",
+  );
+  fs.mkdirSync(screenshotDir, { recursive: true });
+  const screenshotPath = path.join(
+    screenshotDir,
+    "joy-exact-before-custom-substring.png",
+  );
+  await waitForAnimations(page);
+  await autocomplete.screenshot({ path: screenshotPath });
+  await testInfo.attach("joy-exact-before-custom-substring", {
+    path: screenshotPath,
+    contentType: "image/png",
+  });
+});
+
+test("emoji autocomplete keeps semantic matches ahead of loose shortcode fallbacks", async ({
+  page,
+}) => {
+  await openGeneral(page);
+
+  const input = page.getByTestId("message-input");
+  await input.click();
+  await input.pressSequentially(":sad");
+
+  const autocomplete = page.getByTestId("emoji-autocomplete");
+  await expect(autocomplete).toBeVisible();
+  await expect(autocomplete.locator("button").first()).not.toContainText(
+    ":sandwich:",
+  );
+});
+
 test("custom emoji deletes as a single unit (like a built-in emoji)", async ({
   page,
 }) => {
diff --git a/desktop/tests/e2e/doctor-states.spec.ts b/desktop/tests/e2e/doctor-states.spec.ts
index 0f356fd9ba..77d0fbcb45 100644
--- a/desktop/tests/e2e/doctor-states.spec.ts
+++ b/desktop/tests/e2e/doctor-states.spec.ts
@@ -83,8 +83,7 @@ const CODEX_NOT_INSTALLED = {
   binary_path: null,
   default_args: [],
   mcp_command: null,
-  install_hint:
-    "Buzz requires the Codex CLI; the desktop app alone is not enough.",
+  install_hint: "Buzz talks to Codex through the Codex CLI.",
   install_instructions_url: "https://developers.openai.com/codex/cli/",
   can_auto_install: true,
   underlying_cli_path: null,
@@ -177,7 +176,7 @@ test.describe("Doctor panel state screenshots", () => {
     expect(codexColors).toEqual(gooseColors);
     await expect(
       page
-        .getByRole("heading", { name: "Agent runtimes" })
+        .getByRole("heading", { name: "Agent runtimes", exact: true })
         .locator("..")
         .locator(".."),
     ).toHaveCSS("align-items", "center");
@@ -186,15 +185,9 @@ test.describe("Doctor panel state screenshots", () => {
         page.getByTestId(`doctor-runtime-menu-${runtimeId}`),
       ).toHaveCount(0);
     }
-    await expect(
-      page.getByTestId("doctor-runtime-toggle-codex"),
-    ).not.toBeChecked();
-    await expect(page.getByTestId("doctor-runtime-toggle-codex")).toBeEnabled();
-    for (const runtimeId of ["goose", "codex"]) {
-      const toggle = page.getByTestId(`doctor-runtime-toggle-${runtimeId}`);
-      await expect(toggle).toHaveClass(/shadow-none/);
-      await expect(toggle.locator("span")).toHaveClass(/shadow-none/);
-    }
+    const codexInstallButton = page.getByTestId("doctor-runtime-install-codex");
+    await expect(codexInstallButton).toBeEnabled();
+    await expect(codexInstallButton).toHaveText("Install");
     await expect(
       page.getByRole("menuitem", { name: "CLI setup guide" }),
     ).toHaveCount(0);
@@ -207,10 +200,12 @@ test.describe("Doctor panel state screenshots", () => {
       path: `${SHOTS}/00-runtime-overflow-menu.png`,
     });
     await page.keyboard.press("Escape");
-    await expect(page.getByTestId("doctor-runtime-toggle-goose")).toBeChecked();
-    await expect(
-      page.getByTestId("doctor-runtime-toggle-goose"),
-    ).toBeDisabled();
+    await expect(page.getByTestId("doctor-runtime-ready-goose")).toHaveText(
+      "Ready",
+    );
+    await expect(page.getByTestId("doctor-runtime-install-goose")).toHaveCount(
+      0,
+    );
     await expect(page.getByTestId("doctor-runtime-codex")).not.toContainText(
       "Not installed",
     );
@@ -219,7 +214,7 @@ test.describe("Doctor panel state screenshots", () => {
     );
     await expect(
       page.getByTestId("doctor-runtime-guidance-codex"),
-    ).toContainText("desktop app alone is not enough");
+    ).toContainText("Buzz talks to Codex through the Codex CLI.");
     await expect(
       page
         .getByTestId("doctor-runtime-guidance-codex")
@@ -249,9 +244,9 @@ test.describe("Doctor panel state screenshots", () => {
 
     const row = page.getByTestId("doctor-runtime-claude");
     await expect(row).toBeVisible({ timeout: 10_000 });
-    await expect(
-      page.getByTestId("doctor-runtime-toggle-claude"),
-    ).toBeChecked();
+    await expect(page.getByTestId("doctor-runtime-ready-claude")).toHaveText(
+      "Ready",
+    );
     await expect(row).not.toContainText("Authenticated");
     await expect(row).not.toContainText("Available");
     await expect(row).not.toContainText("claude-agent-acp");
@@ -264,8 +259,10 @@ test.describe("Doctor panel state screenshots", () => {
   });
 
   /**
-   * 02 — an available runtime that needs authentication stays the same height
-   * as the others and moves setup instructions into its overflow menu.
+   * 02 — an available runtime that needs authentication shows an explicit
+   * "Sign-in needed" chip on the row face (never a green Ready chip), stays
+   * the same height as the others, and keeps setup instructions in its
+   * overflow menu.
    */
   test("02-auth-logged-out", async ({ page }) => {
     await installMockBridge(page, {
@@ -290,6 +287,12 @@ test.describe("Doctor panel state screenshots", () => {
 
     const row = page.getByTestId("doctor-runtime-codex");
     await expect(row).toBeVisible({ timeout: 10_000 });
+    // Auth-required is an explicit row-face state: amber "Sign-in needed"
+    // chip (single source: entryStatusLabel), no green Ready chip.
+    await expect(page.getByTestId("doctor-runtime-status-codex")).toHaveText(
+      "Sign-in needed",
+    );
+    await expect(page.getByTestId("doctor-runtime-ready-codex")).toHaveCount(0);
     await expect(row).not.toContainText("Not authenticated");
     await expect(row).not.toContainText("Run `codex login` to authenticate.");
     await expect(row).toHaveCSS(
@@ -354,8 +357,10 @@ test.describe("Doctor panel state screenshots", () => {
   });
 
   /**
-   * 04 — adapter_missing runtime with node_required: true: the off toggle is
-   * disabled, and the Node.js action moves into the overflow menu.
+   * 04 — adapter_missing runtime with node_required: true is NOT a
+   * one-click-ready row: it must be catalog-only (no Install button), and its
+   * catalog detail must offer the setup guide instead of a one-click Install
+   * that would fail without Node.
    */
   test("04-node-required", async ({ page }) => {
     await installMockBridge(page, {
@@ -378,44 +383,50 @@ test.describe("Doctor panel state screenshots", () => {
     await page.goto("/", { waitUntil: "domcontentloaded" });
     await openSettings(page, "agents");
 
-    const row = page.getByTestId("doctor-runtime-codex");
-    await expect(row).toBeVisible({ timeout: 10_000 });
-    const toggle = page.getByTestId("doctor-runtime-toggle-codex");
-    await expect(toggle).not.toBeChecked();
-    await expect(toggle).toBeDisabled();
-    await expect(page.getByTestId("doctor-runtime-status-codex")).toHaveText(
+    // Node-gated entries never get a Your-harnesses row (and thus never an
+    // Install button) — setup happens in the catalog.
+    await expect(page.getByTestId("doctor-runtime-goose")).toBeVisible({
+      timeout: 10_000,
+    });
+    await expect(page.getByTestId("doctor-runtime-codex")).toHaveCount(0);
+    await expect(page.getByTestId("doctor-runtime-install-codex")).toHaveCount(
+      0,
+    );
+    await expect(page.getByTestId("doctor-runtime-ready-codex")).toHaveCount(0);
+
+    await page.getByTestId("harness-add-button").click();
+    await expect(page.getByTestId("harness-catalog-dialog")).toBeVisible();
+    await page.getByTestId("harness-catalog-list-item-codex").click();
+    await expect(page.getByTestId("harness-catalog-status-codex")).toHaveText(
       "Adapter needed",
     );
-    await expect(row).not.toContainText("Node.js is required");
-    expect(
-      await row.evaluate((element) => element.getBoundingClientRect().height),
-    ).toBeGreaterThan(
-      await page
-        .getByTestId("doctor-runtime-goose")
-        .evaluate((element) => element.getBoundingClientRect().height),
+    // Node gate blocks one-click install; the primary action is the vendor
+    // setup guide instead — a single pinned bottom-bar CTA
+    // (harness-catalog-setup-*), not a separate docs button.
+    await expect(page.getByTestId("harness-catalog-install-codex")).toHaveCount(
+      0,
     );
-    await page.getByTestId("doctor-runtime-menu-codex").click();
-    await expect(
-      page.getByRole("menuitem", { name: "Install Node.js" }),
-    ).toBeVisible();
-    await expect(
-      page.getByRole("menuitem", { name: "Adapter install guide" }),
-    ).toBeVisible();
-    await page.keyboard.press("Escape");
+    await expect(page.getByTestId("harness-catalog-setup-codex")).toBeVisible();
+    await expect(page.getByTestId("harness-catalog-setup-codex")).toHaveText(
+      /Setup guide/,
+    );
+    await expect(page.getByTestId("harness-catalog-docs-codex")).toHaveCount(0);
 
-    await row.scrollIntoViewIfNeeded();
+    const detail = page.getByTestId("harness-catalog-detail-pane");
+    await expect(detail).toContainText("Install the Codex ACP adapter");
     await waitForAnimations(page);
-    await row.screenshot({ path: `${SHOTS}/04-node-required.png` });
+    await detail.screenshot({ path: `${SHOTS}/04-node-required.png` });
   });
 
   /**
-   * 05 — a failed toggle install returns to off; toggling again retries.
+   * 05 — a failed install brings the Install button back; clicking it again
+   * retries.
    *
    * The mock is configured with a two-call sequence:
    *   call 1 → failure (E404)
    *   call 2 → installer exit 0, but post-install discovery still cannot find
    *            the runtime
-   * This exercises the full retry path: fail state → toggle on again →
+   * This exercises the full retry path: fail state → Install again →
    * verified failure without a false installed state.
    */
   test("05-retry-after-failure", async ({ page }) => {
@@ -479,19 +490,19 @@ test.describe("Doctor panel state screenshots", () => {
     await expect(row).not.toContainText("Not installed");
 
     // Trigger the first install — the mock returns a failure.
-    const toggle = page.getByTestId("doctor-runtime-toggle-codex");
-    await expect(toggle).not.toBeChecked();
-    await expect(toggle).toBeEnabled();
-    await toggle.click();
+    const installButton = page.getByTestId("doctor-runtime-install-codex");
+    await expect(installButton).toBeEnabled();
+    await expect(installButton).toHaveText("Install");
+    await installButton.click();
     const loading = page.getByTestId("doctor-runtime-loading-codex");
     await expect(loading).toBeVisible();
     await expect(loading).toContainText("Codex installing");
-    await expect(toggle).toHaveCount(0);
+    await expect(installButton).toHaveCount(0);
 
-    // After failure: the toggle returns to off and the error is visible.
+    // After failure: the Install button returns and the error is visible.
     await expect(loading).toHaveCount(0, { timeout: 5_000 });
-    await expect(toggle).not.toBeChecked({ timeout: 5_000 });
-    await expect(toggle).toBeEnabled();
+    await expect(installButton).toBeVisible({ timeout: 5_000 });
+    await expect(installButton).toBeEnabled();
     await expect(row).toContainText("Step");
     await expect(row).toContainText("failed");
 
@@ -499,18 +510,18 @@ test.describe("Doctor panel state screenshots", () => {
     await waitForAnimations(page);
     await row.screenshot({ path: `${SHOTS}/05-retry-after-failure.png` });
 
-    // Toggle on again — the install command exits 0, but verification fails.
-    await toggle.click();
+    // Install again — the install command exits 0, but verification fails.
+    await installButton.click();
     await expect(loading).toBeVisible();
-    await expect(toggle).toHaveCount(0);
+    await expect(installButton).toHaveCount(0);
 
     // The runtime remains retryable and never renders a false success state.
     await expect(loading).toHaveCount(0, { timeout: 5_000 });
     await expect(row).toContainText("desktop app", { timeout: 5_000 });
     await expect(row).toContainText('Step "verify" failed');
     await expect(row.getByText(/installed\. Checking/)).toHaveCount(0);
-    await expect(toggle).not.toBeChecked();
-    await expect(toggle).toBeEnabled();
+    await expect(installButton).toBeVisible();
+    await expect(installButton).toBeEnabled();
 
     await row.scrollIntoViewIfNeeded();
     await waitForAnimations(page);
@@ -556,11 +567,13 @@ test.describe("Doctor panel state screenshots", () => {
     await page.goto("/", { waitUntil: "domcontentloaded" });
     await openSettings(page, "agents");
 
-    const toggle = page.getByTestId("doctor-runtime-toggle-codex");
-    await expect(toggle).toBeEnabled();
-    await toggle.click();
-    await expect(toggle).toBeChecked({ timeout: 5_000 });
-    await expect(toggle).toBeDisabled();
+    const installButton = page.getByTestId("doctor-runtime-install-codex");
+    await expect(installButton).toBeEnabled();
+    await installButton.click();
+    await expect(page.getByTestId("doctor-runtime-ready-codex")).toBeVisible({
+      timeout: 5_000,
+    });
+    await expect(installButton).toHaveCount(0);
     await expect(page.getByTestId("doctor-runtime-guidance-codex")).toHaveCount(
       0,
     );
@@ -568,7 +581,9 @@ test.describe("Doctor panel state screenshots", () => {
 
   /**
    * 06 — adapter-provided account methods appear in the overflow menu and
-   * launch the vendor-owned flow without expanding the runtime row.
+   * launch the vendor-owned flow without expanding the runtime row. The
+   * row face flips "Sign-in needed" → Ready once the connect settles and
+   * discovery reports logged_in.
    */
   test("06-connect-account-methods", async ({ page }) => {
     await installMockBridge(page, {
@@ -586,6 +601,21 @@ test.describe("Doctor panel state screenshots", () => {
         },
         BUZZ_AGENT_AVAILABLE,
       ],
+      // After the mocked connect succeeds, discovery reports logged_in so
+      // the row face can flip from "Sign-in needed" to Ready.
+      acpRuntimesCatalogAfterConnect: [
+        GOOSE_AVAILABLE,
+        CLAUDE_AVAILABLE_LOGGED_IN,
+        {
+          ...CODEX_NOT_INSTALLED,
+          availability: "available",
+          command: "codex-acp",
+          binary_path: "/usr/local/bin/codex-acp",
+          underlying_cli_path: "/usr/local/bin/codex",
+          auth_status: { status: "logged_in" },
+        },
+        BUZZ_AGENT_AVAILABLE,
+      ],
       connectAcpRuntimeDelayMs: 250,
       acpAuthMethods: {
         codex: {
@@ -606,6 +636,11 @@ test.describe("Doctor panel state screenshots", () => {
 
     const row = page.getByTestId("doctor-runtime-codex");
     await expect(row).toBeVisible({ timeout: 10_000 });
+    // Signed-out row face: explicit auth chip, no green Ready chip.
+    await expect(page.getByTestId("doctor-runtime-status-codex")).toHaveText(
+      "Sign-in needed",
+    );
+    await expect(page.getByTestId("doctor-runtime-ready-codex")).toHaveCount(0);
     await expect(row).not.toContainText("Not authenticated");
     await expect(row).toHaveCSS(
       "height",
@@ -623,11 +658,14 @@ test.describe("Doctor panel state screenshots", () => {
     const loading = page.getByTestId("doctor-runtime-loading-codex");
     await expect(loading).toBeVisible();
     await expect(loading).toContainText("Codex connecting");
-    await expect(page.getByTestId("doctor-runtime-toggle-codex")).toHaveCount(
+    await expect(page.getByTestId("doctor-runtime-ready-codex")).toHaveCount(0);
+    await expect(loading).toHaveCount(0, { timeout: 5_000 });
+    // Connect settled and discovery reports logged_in — sign-in chip gone,
+    // Ready chip on.
+    await expect(page.getByTestId("doctor-runtime-ready-codex")).toBeVisible();
+    await expect(page.getByTestId("doctor-runtime-status-codex")).toHaveCount(
       0,
     );
-    await expect(loading).toHaveCount(0, { timeout: 5_000 });
-    await expect(page.getByTestId("doctor-runtime-toggle-codex")).toBeChecked();
   });
 
   /**
@@ -794,7 +832,9 @@ test.describe("Doctor panel state screenshots", () => {
     await expect(page.getByTestId("doctor-runtime-status-codex")).toHaveText(
       "Update needed",
     );
-    await page.getByTestId("doctor-runtime-toggle-codex").click();
+    const updateButton = page.getByTestId("doctor-runtime-install-codex");
+    await expect(updateButton).toHaveText("Update");
+    await updateButton.click();
 
     const dialog = page.getByRole("alertdialog");
     await expect(dialog).toContainText("Update Codex adapter?");
@@ -903,35 +943,39 @@ test.describe("Doctor panel state screenshots", () => {
     await expect(claudeRow).toBeVisible({ timeout: 10_000 });
     await expect(codexRow).toBeVisible();
 
-    const claudeToggle = page.getByTestId("doctor-runtime-toggle-claude");
-    const codexToggle = page.getByTestId("doctor-runtime-toggle-codex");
+    const claudeInstallButton = page.getByTestId(
+      "doctor-runtime-install-claude",
+    );
+    const codexInstallButton = page.getByTestId("doctor-runtime-install-codex");
+    const codexReadyChip = page.getByTestId("doctor-runtime-ready-codex");
 
     // Start both installs before either settles.
-    await claudeToggle.click();
-    await codexToggle.click();
+    await claudeInstallButton.click();
+    await codexInstallButton.click();
 
-    // Codex settles first (shorter delay): toggle flips on, no error on codex.
-    // The catalog refresh triggered by codex's success immediately returns
-    // availability === "available", so the transient "installed. Checking..."
-    // banner is replaced by the stable isOn state — assert the toggle instead.
-    await expect(codexToggle).toBeChecked({ timeout: 3_000 });
+    // Codex settles first (shorter delay): Ready chip appears, no error on
+    // codex. The catalog refresh triggered by codex's success immediately
+    // returns availability === "available", so the transient "installed.
+    // Checking..." banner is replaced by the stable ready state — assert the
+    // Ready chip instead.
+    await expect(codexReadyChip).toBeVisible({ timeout: 3_000 });
     await expect(
       page.getByTestId("doctor-runtime-install-error-codex"),
     ).toHaveCount(0);
 
     // Claude settles (after its longer delay): failure error visible with
-    // multiline stderr. Codex toggle must still be on — unaffected by claude.
+    // multiline stderr. Codex must still be ready — unaffected by claude.
     const claudeError = page.getByTestId("doctor-runtime-install-error-claude");
     await expect(claudeError).toBeVisible({ timeout: 3_000 });
     await expect(claudeError).toContainText("npm ERR!");
-    await expect(codexToggle).toBeChecked();
+    await expect(codexReadyChip).toBeVisible();
 
     // Click Check again — epoch increments, RuntimeRow useEffect clears
     // local installResult state, so the stale claude error disappears.
     await page.getByRole("button", { name: "Check again" }).click();
     await expect(claudeError).toHaveCount(0, { timeout: 5_000 });
-    // Codex toggle stays on (catalog still reports available after refresh).
-    await expect(codexToggle).toBeChecked({ timeout: 5_000 });
+    // Codex stays ready (catalog still reports available after refresh).
+    await expect(codexReadyChip).toBeVisible({ timeout: 5_000 });
 
     await claudeRow.scrollIntoViewIfNeeded();
     await waitForAnimations(page);
diff --git a/desktop/tests/e2e/drafts-all-fix-screenshots.spec.ts b/desktop/tests/e2e/drafts-all-fix-screenshots.spec.ts
new file mode 100644
index 0000000000..82a7df1cc1
--- /dev/null
+++ b/desktop/tests/e2e/drafts-all-fix-screenshots.spec.ts
@@ -0,0 +1,105 @@
+import { expect, test } from "@playwright/test";
+
+import { waitForAnimations } from "../helpers/animations";
+import { TEST_IDENTITIES, installMockBridge } from "../helpers/bridge";
+
+const SHOTS = "test-results/drafts-all-fix";
+
+const GENERAL_CHANNEL_ID = "9a1657ac-f7aa-5db0-b632-d8bbeb6dfb50";
+const MOCK_IDENTITY_PUBKEY = "deadbeef".repeat(8);
+
+type MockFeedWindow = Window & {
+  __BUZZ_E2E_PUSH_MOCK_FEED_ITEM__?: (item: Record<string, unknown>) => void;
+};
+
+test.use({ viewport: { width: 1280, height: 720 } });
+
+test("Inbox All hides drafts while the Drafts filter keeps them", async ({
+  page,
+}) => {
+  const draftKey = `channel:${GENERAL_CHANNEL_ID}`;
+  await page.addInitScript(
+    ({ draftStoreKey, draftStorageKey, channelId }) => {
+      const timestamp = new Date().toISOString();
+      window.localStorage.setItem(
+        draftStoreKey,
+        JSON.stringify({
+          [draftStorageKey]: {
+            channelId,
+            content: "Draft that must stay out of the All view",
+            createdAt: timestamp,
+            pendingImeta: [],
+            selectionEnd: 41,
+            selectionStart: 41,
+            spoileredAttachmentUrls: [],
+            status: "active",
+            updatedAt: timestamp,
+          },
+        }),
+      );
+    },
+    {
+      channelId: GENERAL_CHANNEL_ID,
+      draftStorageKey: draftKey,
+      draftStoreKey: `buzz-drafts.v2:ws://localhost:3000:${MOCK_IDENTITY_PUBKEY}`,
+    },
+  );
+  await installMockBridge(page);
+  await page.goto("/");
+  await page.waitForFunction(() => {
+    const win = window as MockFeedWindow;
+    return typeof win.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__ === "function";
+  });
+
+  const messageId = "drafts-all-fix-message";
+  await page.evaluate(
+    ({ channelId, currentPubkey, messageId: id, senderPubkey }) => {
+      const pushFeedItem = (window as MockFeedWindow)
+        .__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__;
+      if (!pushFeedItem) throw new Error("Mock feed helper is not installed.");
+      pushFeedItem({
+        category: "mention",
+        channel_id: channelId,
+        channel_name: "general",
+        channel_type: "stream",
+        content: "Regular message that belongs in All",
+        created_at: Math.floor(Date.now() / 1_000),
+        id,
+        kind: 9,
+        pubkey: senderPubkey,
+        tags: [
+          ["h", channelId],
+          ["p", currentPubkey],
+        ],
+      });
+    },
+    {
+      channelId: GENERAL_CHANNEL_ID,
+      currentPubkey: MOCK_IDENTITY_PUBKEY,
+      messageId,
+      senderPubkey: TEST_IDENTITIES.alice.pubkey,
+    },
+  );
+
+  // All view: the message is present, the draft row is not.
+  await expect(page.getByTestId(`home-inbox-item-${messageId}`)).toBeVisible();
+  await expect(page.getByTestId(`home-all-drafts-${draftKey}`)).toHaveCount(0);
+  await waitForAnimations(page);
+  await page
+    .getByTestId("home-inbox")
+    .screenshot({ path: `${SHOTS}/01-all-view-no-drafts.png` });
+
+  // Drafts filter: the draft is still listed.
+  await page.getByTestId("inbox-filter-trigger").click();
+  await page.getByRole("menuitemradio", { name: "Drafts" }).click();
+  await page.keyboard.press("Escape");
+  const panel = page.getByTestId("home-inbox-drafts");
+  await expect(panel).toBeVisible();
+  await expect(
+    panel.getByText("Draft that must stay out of the All view"),
+  ).toBeVisible();
+  await waitForAnimations(page);
+  await page
+    .getByTestId("home-inbox")
+    .screenshot({ path: `${SHOTS}/02-drafts-filter-still-lists.png` });
+});
diff --git a/desktop/tests/e2e/drafts-screenshots.spec.ts b/desktop/tests/e2e/drafts-screenshots.spec.ts
index ccf8dc35cb..a3fb2ce195 100644
--- a/desktop/tests/e2e/drafts-screenshots.spec.ts
+++ b/desktop/tests/e2e/drafts-screenshots.spec.ts
@@ -345,13 +345,11 @@ test.describe("drafts screenshots", () => {
     );
   });
 
-  test("06 — active-draft badge on inbox trigger and filter option", async ({
+  test("06 — active-draft count appears only on the Drafts filter", async ({
     page,
   }) => {
-    // Captures both badge placements for the PR screenshot:
-    //   1. The status dot on the inbox filter trigger button.
-    //   2. The badge next to "Drafts" in the filter dropdown.
-    // Two active drafts are seeded so the count is 2.
+    // Draft counts stay beside the Drafts option instead of decorating the
+    // overall Inbox filter trigger. Two drafts make the count explicit.
     await installMockBridge(page);
     await patchCommunityPubkey(page);
     await seedDraftStore(page, ACTIVE_DRAFTS);
@@ -361,10 +359,7 @@ test.describe("drafts screenshots", () => {
       timeout: 10_000,
     });
 
-    // The trigger uses a compact dot while retaining the count accessibly.
-    const triggerBadge = page.getByTestId("inbox-draft-badge");
-    await expect(triggerBadge).toBeVisible({ timeout: 6_000 });
-    await expect(triggerBadge).toBeEmpty();
+    await expect(page.getByTestId("inbox-draft-badge")).toHaveCount(0);
     await expect(page.getByTestId("inbox-filter-trigger")).toHaveAttribute(
       "aria-label",
       "Filter inbox: All. 2 active drafts",
@@ -378,7 +373,7 @@ test.describe("drafts screenshots", () => {
 
     await waitForAnimations(page);
 
-    // Capture the full inbox header area including the open dropdown.
+    // Capture the Inbox header and the dropdown-only count.
     await page.getByTestId("home-inbox").screenshot({
       path: `${SHOTS}/06-draft-badge.png`,
     });
diff --git a/desktop/tests/e2e/file-attachment.spec.ts b/desktop/tests/e2e/file-attachment.spec.ts
index 41eb55e521..403d26c136 100644
--- a/desktop/tests/e2e/file-attachment.spec.ts
+++ b/desktop/tests/e2e/file-attachment.spec.ts
@@ -82,7 +82,53 @@ test("dropping a file on the channel column attaches it to the composer", async
 
   const dropZone = page.getByTestId("channel-drop-zone");
   await dropZone.dispatchEvent("dragenter", { dataTransfer });
-  await expect(dropZone.getByText("Drop files to upload")).toBeVisible();
+  const overlay = dropZone.getByTestId("drop-zone-overlay");
+  const label = dropZone.getByTestId("drop-zone-label");
+  await expect(overlay).toBeVisible();
+  await expect(label).toContainText("Drop files to upload");
+
+  const [dropZoneBox, overlayBox, overlayStyles, stacking] = await Promise.all([
+    dropZone.boundingBox(),
+    overlay.boundingBox(),
+    page.evaluate(() => {
+      const overlayElement = document.querySelector<HTMLElement>(
+        '[data-testid="drop-zone-overlay"]',
+      );
+      const contentSurface = document.querySelector<HTMLElement>(
+        "[data-buzz-content-surface]",
+      );
+      if (!(overlayElement && contentSurface)) return null;
+      const overlayStyle = getComputedStyle(overlayElement);
+      return {
+        backdropFilter: overlayStyle.backdropFilter,
+        containerRadius: getComputedStyle(contentSurface).borderRadius,
+        overlayRadius: overlayStyle.borderRadius,
+      };
+    }),
+    page.evaluate(() => {
+      const overlayElement = document.querySelector<HTMLElement>(
+        '[data-testid="drop-zone-overlay"]',
+      );
+      const composerOverlayElement = document.querySelector<HTMLElement>(
+        '[data-testid="channel-composer-overlay"]',
+      );
+      if (!(overlayElement && composerOverlayElement)) return null;
+      return {
+        composer: Number.parseInt(
+          getComputedStyle(composerOverlayElement).zIndex,
+          10,
+        ),
+        dropZone: Number.parseInt(getComputedStyle(overlayElement).zIndex, 10),
+      };
+    }),
+  ]);
+
+  expect(overlayBox).toEqual(dropZoneBox);
+  expect(overlayStyles).not.toBeNull();
+  expect(overlayStyles?.overlayRadius).toBe(overlayStyles?.containerRadius);
+  expect(overlayStyles?.backdropFilter).toContain("blur");
+  expect(stacking).not.toBeNull();
+  expect(stacking?.dropZone).toBeGreaterThan(stacking?.composer ?? 0);
 
   await dropZone.dispatchEvent("drop", { dataTransfer });
   await expect(page.getByTestId("message-composer")).toContainText(
@@ -90,6 +136,60 @@ test("dropping a file on the channel column attaches it to the composer", async
   );
 });
 
+for (const theme of ["buzz", "buzz-dark", "github-light", "github-dark"]) {
+  test(`drop prompt has accessible text contrast in ${theme}`, async ({
+    page,
+  }) => {
+    await page.goto("/");
+    await page.evaluate((selectedTheme) => {
+      window.localStorage.setItem("buzz-theme", selectedTheme);
+    }, theme);
+    await page.reload();
+    await page.getByTestId("channel-general").click();
+
+    const dataTransfer = await page.evaluateHandle(() => {
+      const transfer = new DataTransfer();
+      transfer.items.add(
+        new File(["contrast check"], "contrast-check.txt", {
+          type: "text/plain",
+        }),
+      );
+      return transfer;
+    });
+    const dropZone = page.getByTestId("channel-drop-zone");
+    await dropZone.dispatchEvent("dragenter", { dataTransfer });
+
+    const contrastRatio = await dropZone
+      .getByTestId("drop-zone-label")
+      .evaluate((element) => {
+        const parseRgb = (value: string) =>
+          (value.match(/[\d.]+/g) ?? []).slice(0, 3).map(Number);
+        const luminance = (color: number[]) =>
+          color
+            .map((channel) => {
+              const value = channel / 255;
+              return value <= 0.04045
+                ? value / 12.92
+                : ((value + 0.055) / 1.055) ** 2.4;
+            })
+            .reduce(
+              (sum, channel, index) =>
+                sum + channel * [0.2126, 0.7152, 0.0722][index],
+              0,
+            );
+        const style = getComputedStyle(element);
+        const foreground = luminance(parseRgb(style.color));
+        const background = luminance(parseRgb(style.backgroundColor));
+        return (
+          (Math.max(foreground, background) + 0.05) /
+          (Math.min(foreground, background) + 0.05)
+        );
+      });
+
+    expect(contrastRatio).toBeGreaterThanOrEqual(4.5);
+  });
+}
+
 test("forum posts emit a FileCard for generic attachments, not a broken image", async ({
   page,
 }) => {
diff --git a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts
index d9b3214e64..7ec1daa236 100644
--- a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts
+++ b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts
@@ -32,7 +32,7 @@ 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 from scratch" }).click();
+  await page.getByRole("menuitem", { name: "Create agent" }).click();
   await page.locator("#persona-display-name").fill("Test Agent");
 }
 
@@ -701,7 +701,7 @@ test.describe("global agent config screenshots", () => {
         .locator("p")
         .filter({ hasText: "Buzz Agent is not installed." }),
     ).toContainText(
-      "Buzz Agent is not installed. Visit Settings > Agents to set it up.",
+      "Buzz Agent is not installed. Ships with the Buzz desktop app. Visit Settings > Agents to set it up.",
     );
     await expect(page.getByTestId("persona-dialog-submit")).toBeDisabled();
   });
@@ -712,7 +712,7 @@ 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 from scratch" }).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/harness-catalog-screenshots.spec.ts b/desktop/tests/e2e/harness-catalog-screenshots.spec.ts
new file mode 100644
index 0000000000..c5613f41f2
--- /dev/null
+++ b/desktop/tests/e2e/harness-catalog-screenshots.spec.ts
@@ -0,0 +1,179 @@
+import { test, expect } from "@playwright/test";
+
+import { installMockBridge } from "../helpers/bridge";
+import { openSettings } from "../helpers/settings";
+
+const SHOTS = "test-results/byoh-after";
+
+/**
+ * AFTER screenshots for the consolidated Harnesses surface — same catalog
+ * fixture as byoh-before-screenshots.spec.ts so the before/after pair is a
+ * true apples-to-apples comparison.
+ */
+const CATALOG = [
+  {
+    id: "buzz-agent",
+    label: "Buzz Agent",
+    avatar_url: "",
+    availability: "available",
+    command: "buzz-agent",
+    binary_path: "/usr/local/bin/buzz-agent",
+    default_args: [],
+    mcp_command: "buzz-dev-mcp",
+    install_hint: "",
+    install_instructions_url: "https://github.com/block/buzz",
+    can_auto_install: false,
+    underlying_cli_path: null,
+    node_required: false,
+    auth_status: { status: "not_applicable" },
+  },
+  {
+    id: "claude",
+    label: "Claude Code",
+    avatar_url: "",
+    availability: "available",
+    command: "claude-agent-acp",
+    binary_path: "/usr/local/bin/claude-agent-acp",
+    default_args: [],
+    mcp_command: null,
+    install_hint: "",
+    install_instructions_url:
+      "https://github.com/agentclientprotocol/claude-agent-acp",
+    can_auto_install: true,
+    underlying_cli_path: "/usr/local/bin/claude",
+    node_required: false,
+    auth_status: { status: "logged_in" },
+  },
+  {
+    id: "codex",
+    label: "Codex",
+    avatar_url: "",
+    availability: "adapter_missing",
+    command: null,
+    binary_path: null,
+    default_args: [],
+    mcp_command: null,
+    install_hint: "Install the Codex ACP adapter via npm.",
+    install_instructions_url:
+      "https://github.com/agentclientprotocol/codex-acp",
+    can_auto_install: true,
+    underlying_cli_path: "/usr/local/bin/codex",
+    node_required: false,
+    auth_status: { status: "unknown" },
+  },
+  {
+    id: "cursor",
+    label: "Cursor",
+    avatar_url: "",
+    availability: "available",
+    command: "cursor-agent",
+    binary_path: "/usr/local/bin/cursor-agent",
+    default_args: ["acp"],
+    mcp_command: null,
+    install_hint:
+      "Buzz talks to Cursor through the cursor-agent CLI's ACP mode.",
+    install_instructions_url: "https://cursor.com/downloads",
+    can_auto_install: false,
+    underlying_cli_path: null,
+    node_required: false,
+    auth_status: { status: "not_applicable" },
+    source: "preset",
+  },
+  {
+    id: "omp",
+    label: "Oh My Pi",
+    avatar_url: "",
+    availability: "not_installed",
+    command: null,
+    binary_path: null,
+    default_args: ["acp"],
+    mcp_command: null,
+    install_hint:
+      "Buzz talks to Oh My Pi through its CLI's ACP mode (omp acp).",
+    install_instructions_url: "https://github.com/can1357/oh-my-pi",
+    can_auto_install: false,
+    underlying_cli_path: null,
+    node_required: false,
+    auth_status: { status: "not_applicable" },
+    source: "preset",
+  },
+  {
+    id: "opencode",
+    label: "OpenCode",
+    avatar_url: "",
+    availability: "not_installed",
+    command: null,
+    binary_path: null,
+    default_args: ["acp"],
+    mcp_command: null,
+    install_hint:
+      "Buzz talks to OpenCode through its CLI's ACP mode (opencode acp).",
+    install_instructions_url: "https://opencode.ai/docs",
+    can_auto_install: false,
+    underlying_cli_path: null,
+    node_required: false,
+    auth_status: { status: "not_applicable" },
+    source: "preset",
+  },
+  {
+    id: "my-custom",
+    label: "My Custom Harness",
+    avatar_url: "",
+    availability: "available",
+    command: "my-acp",
+    binary_path: "/usr/local/bin/my-acp",
+    default_args: [],
+    mcp_command: null,
+    install_hint: "",
+    install_instructions_url: "",
+    can_auto_install: false,
+    underlying_cli_path: null,
+    node_required: false,
+    auth_status: { status: "not_applicable" },
+    source: "custom",
+  },
+];
+
+test("after: consolidated harnesses panel + catalog dialog", async ({
+  page,
+}) => {
+  test.setTimeout(60_000);
+  await page.setViewportSize({ width: 1280, height: 2400 });
+  await installMockBridge(page, { acpRuntimesCatalog: CATALOG });
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await openSettings(page, "agents");
+  await expect(page.getByTestId("settings-harnesses")).toBeVisible({
+    timeout: 10_000,
+  });
+  await page.waitForTimeout(700);
+
+  // 1. The consolidated panel — ready rows only, no inert controls.
+  await page.getByTestId("settings-harnesses").screenshot({
+    path: `${SHOTS}/after-harnesses-panel.png`,
+  });
+
+  // 2. Add-harnesses catalog — needs-setup entry auto-selected in detail.
+  await page.getByTestId("harness-add-button").click();
+  await expect(page.getByTestId("harness-catalog-dialog")).toBeVisible();
+  await page.waitForTimeout(500);
+  await page.getByTestId("harness-catalog-dialog").screenshot({
+    path: `${SHOTS}/after-catalog-needs-setup.png`,
+  });
+
+  // 3. Ready entry detail (Ready state, no install action). Ready entries
+  // sit in the "Installed" accordion, collapsed by default — expand it.
+  await page.getByTestId("harness-catalog-section-installed").click();
+  await page.getByTestId("harness-catalog-list-item-claude").click();
+  await page.waitForTimeout(300);
+  await page.getByTestId("harness-catalog-dialog").screenshot({
+    path: `${SHOTS}/after-catalog-ready-detail.png`,
+  });
+
+  // 4. Custom harness form — all fields inline.
+  await page.getByTestId("harness-catalog-list-item-custom").click();
+  await expect(page.getByTestId("custom-harness-form")).toBeVisible();
+  await page.waitForTimeout(300);
+  await page.getByTestId("harness-catalog-dialog").screenshot({
+    path: `${SHOTS}/after-catalog-custom-form.png`,
+  });
+});
diff --git a/desktop/tests/e2e/harness-management.spec.ts b/desktop/tests/e2e/harness-management.spec.ts
new file mode 100644
index 0000000000..50047f8f81
--- /dev/null
+++ b/desktop/tests/e2e/harness-management.spec.ts
@@ -0,0 +1,691 @@
+/**
+ * E2E spec for the consolidated Harnesses settings surface + Add-harnesses
+ * catalog dialog.
+ *
+ * Covers:
+ *  - Ready preset gets a row in "Your harnesses"; needs-setup preset does NOT
+ *  - Needs-setup preset appears in the Add-harnesses catalog with status,
+ *    curated description, docs link, and setup action
+ *  - Catalog search filters the list
+ *  - Toggling install does not reorder rows (stable order)
+ *  - Add custom harness via catalog (name+command → save → row appears)
+ *  - Advanced disclosure hides ID/args/env/docs/hint until opened
+ *  - Edit preserves env vars (round-trip through definitionEnv boundary)
+ *  - Same-ID edit replaces entry (no duplicate row)
+ *  - Rename removes old row and shows new row
+ *  - Delete success removes row; delete failure shows inline error
+ *  - PATH badge: custom harness row shows Detected when available
+ *  - Preset rows render bundled logos, never initials
+ *  - Onboarding navigate: setup-page "More harnesses" click → Settings → Agents (F8)
+ */
+import { expect, test } from "@playwright/test";
+
+import { installMockBridge } from "../helpers/bridge";
+
+// ── Shared catalog fixtures ───────────────────────────────────────────────────
+
+/** Hermes preset with availability "available" — earns a Your-harnesses row. */
+const HERMES_AVAILABLE = {
+  id: "hermes",
+  label: "Hermes",
+  avatar_url: "",
+  availability: "available",
+  command: "hermes-acp",
+  binary_path: "/usr/local/bin/hermes-acp",
+  default_args: [],
+  mcp_command: null,
+  install_hint: "Buzz talks to Hermes Agent through its hermes-acp command.",
+  install_instructions_url: "https://hermes-agent.nousresearch.com",
+  can_auto_install: false,
+  requires_external_cli: true,
+  underlying_cli_path: null,
+  node_required: false,
+  auth_status: { status: "unknown" },
+  source: "preset",
+} as const;
+
+/** OpenClaw preset "not_installed" + no auto-install — catalog-only. */
+const OPENCLAW_NOT_INSTALLED = {
+  id: "openclaw",
+  label: "OpenClaw",
+  avatar_url: "",
+  availability: "not_installed",
+  command: "openclaw",
+  binary_path: null,
+  default_args: ["acp"],
+  mcp_command: null,
+  install_hint:
+    "Buzz talks to OpenClaw through its ACP mode (openclaw acp), which relies on the OpenClaw Gateway daemon. Follow the setup guide to install both.",
+  install_instructions_url: "https://docs.openclaw.ai/start/getting-started",
+  can_auto_install: false,
+  requires_external_cli: true,
+  underlying_cli_path: null,
+  node_required: false,
+  auth_status: { status: "unknown" },
+  source: "preset",
+} as const;
+
+/** Cursor preset — deliberately has NO bundled logo (brand assets not
+ * licensed for redistribution). Must render the terminal glyph, never
+ * initials. */
+const CURSOR_AVAILABLE = {
+  id: "cursor",
+  label: "Cursor",
+  avatar_url: "",
+  availability: "available",
+  command: "cursor-agent",
+  binary_path: "/usr/local/bin/cursor-agent",
+  default_args: [],
+  mcp_command: null,
+  install_hint: "Buzz talks to Cursor through the cursor-agent CLI's ACP mode.",
+  install_instructions_url: "https://cursor.com/cli",
+  can_auto_install: false,
+  requires_external_cli: true,
+  underlying_cli_path: null,
+  node_required: false,
+  auth_status: { status: "unknown" },
+  source: "preset",
+} as const;
+
+/** Custom harness entry already persisted — always gets a row. */
+function makeCustomEntry(
+  overrides: {
+    id?: string;
+    label?: string;
+    command?: string;
+    availability?: "available" | "not_installed";
+    definition_env?: Record<string, string>;
+  } = {},
+) {
+  return {
+    id: overrides.id ?? "my-custom-agent",
+    label: overrides.label ?? "My Custom Agent",
+    avatar_url: "",
+    availability: overrides.availability ?? "not_installed",
+    command: overrides.command ?? "my-custom-acp",
+    binary_path:
+      overrides.availability === "available"
+        ? "/usr/local/bin/my-custom-acp"
+        : null,
+    default_args: [],
+    mcp_command: null,
+    install_hint: "",
+    install_instructions_url: "",
+    can_auto_install: false,
+    requires_external_cli: true,
+    underlying_cli_path: null,
+    node_required: false,
+    auth_status: { status: "unknown" },
+    source: "custom",
+    definition_env: overrides.definition_env,
+  };
+}
+
+// ── Navigation helpers ────────────────────────────────────────────────────────
+
+/**
+ * Open Settings → Agents through the normal UI path.
+ * CI serves the app as a static SPA; direct navigation to /settings 404s
+ * before the client router starts.
+ */
+async function openHarnessSettings(page: import("@playwright/test").Page) {
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.getByTestId("open-settings").click();
+  await page.getByTestId("profile-popover-settings").click();
+  await expect(page.getByTestId("settings-view")).toBeVisible();
+  await page.getByTestId("settings-nav-agents").click();
+  await expect(page.getByTestId("settings-harnesses")).toBeVisible({
+    timeout: 10_000,
+  });
+}
+
+/** Open the Add-harnesses catalog dialog from the settings surface. */
+async function openCatalog(page: import("@playwright/test").Page) {
+  await page.getByTestId("harness-add-button").click();
+  await expect(page.getByTestId("harness-catalog-dialog")).toBeVisible();
+}
+
+/** Fill the custom harness form (all fields render inline). */
+async function fillHarnessForm(
+  page: import("@playwright/test").Page,
+  values: {
+    label: string;
+    id?: string;
+    command: string;
+    env?: Array<{ key: string; value: string }>;
+  },
+) {
+  await page.fill("#ch-label", values.label);
+  await page.fill("#ch-command", values.command);
+  if (values.id !== undefined) {
+    await page.fill("#ch-id", values.id);
+  }
+  for (const pair of values.env ?? []) {
+    await page.getByRole("button", { name: "Add env var" }).click();
+    // Fill last appended row.
+    const keyInputs = page.locator('input[placeholder="KEY"]');
+    const valInputs = page.locator('input[placeholder="value"]');
+    await keyInputs.last().fill(pair.key);
+    await valInputs.last().fill(pair.value);
+  }
+}
+
+// ── Your harnesses vs catalog split ──────────────────────────────────────────
+
+test.describe("your harnesses split", () => {
+  test("ready preset gets a row; needs-setup preset is catalog-only", async ({
+    page,
+  }) => {
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [HERMES_AVAILABLE, OPENCLAW_NOT_INSTALLED],
+    });
+    await openHarnessSettings(page);
+
+    // Ready preset row with a Ready status chip.
+    const hermesRow = page.getByTestId("doctor-runtime-hermes");
+    await expect(hermesRow).toBeVisible();
+    await expect(page.getByTestId("doctor-runtime-ready-hermes")).toHaveText(
+      "Ready",
+    );
+
+    // Needs-setup preset must NOT render a row (and thus no Install button).
+    await expect(page.getByTestId("doctor-runtime-openclaw")).toHaveCount(0);
+    await expect(
+      page.getByTestId("doctor-runtime-install-openclaw"),
+    ).toHaveCount(0);
+  });
+
+  test("needs-setup preset appears in catalog with status, description, docs and setup action", async ({
+    page,
+  }) => {
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [HERMES_AVAILABLE, OPENCLAW_NOT_INSTALLED],
+    });
+    await openHarnessSettings(page);
+    await openCatalog(page);
+
+    // Needs-setup entries sort first, so OpenClaw is auto-selected.
+    await expect(
+      page.getByTestId("harness-catalog-list-item-openclaw"),
+    ).toBeVisible();
+    const detail = page.getByTestId("harness-catalog-detail-pane");
+    await expect(detail).toContainText("OpenClaw");
+    // Status chip.
+    await expect(
+      page.getByTestId("harness-catalog-status-openclaw"),
+    ).toHaveText("CLI needed");
+    // Curated one-liner (first-party-sourced category sentence).
+    await expect(detail).toContainText(
+      "A personal AI assistant that runs on your own devices.",
+    );
+    // Operational setup hint from runtime state.
+    await expect(detail).toContainText("OpenClaw Gateway daemon");
+    // Primary setup action under the header (no auto-install → setup guide).
+    await expect(
+      page.getByTestId("harness-catalog-setup-openclaw"),
+    ).toBeVisible();
+
+    // Technical details are visible by default.
+    const technical = page.getByTestId("harness-catalog-technical-openclaw");
+    await expect(technical).toBeVisible();
+    await expect(technical).toContainText("openclaw");
+    await expect(technical).toContainText("acp");
+  });
+
+  test("ready preset shows in catalog as Ready with no install action", async ({
+    page,
+  }) => {
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [HERMES_AVAILABLE, OPENCLAW_NOT_INSTALLED],
+    });
+    await openHarnessSettings(page);
+    await openCatalog(page);
+
+    // Ready entries live in the "Installed" accordion, collapsed by default.
+    await expect(
+      page.getByTestId("harness-catalog-list-item-hermes"),
+    ).toHaveCount(0);
+    await expect(
+      page.getByTestId("harness-catalog-section-installed-count"),
+    ).toHaveText("1");
+    await page.getByTestId("harness-catalog-section-installed").click();
+
+    await page.getByTestId("harness-catalog-list-item-hermes").click();
+    const detail = page.getByTestId("harness-catalog-detail-pane");
+    await expect(detail).toContainText("Ready");
+    await expect(
+      page.getByTestId("harness-catalog-install-hermes"),
+    ).toHaveCount(0);
+    await expect(page.getByTestId("harness-catalog-setup-hermes")).toHaveCount(
+      0,
+    );
+  });
+
+  test("catalog Update for an outdated adapter requires confirmation before installing", async ({
+    page,
+  }) => {
+    // Wes's review blocker: Add runtimes → Setup → Update must honor the
+    // same machine-wide replacement confirmation the runtime row shows —
+    // never mutate straight from the catalog CTA.
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [
+        HERMES_AVAILABLE,
+        {
+          ...OPENCLAW_NOT_INSTALLED,
+          availability: "adapter_outdated",
+          binary_path: "/usr/local/bin/openclaw",
+          can_auto_install: true,
+        },
+      ],
+    });
+    await openHarnessSettings(page);
+    await openCatalog(page);
+
+    const installCalls = () =>
+      page.evaluate(
+        () =>
+          (
+            (window as Window & { __BUZZ_E2E_COMMANDS__?: string[] })
+              .__BUZZ_E2E_COMMANDS__ ?? []
+          ).filter((command) => command === "install_acp_runtime").length,
+      );
+
+    await page.getByTestId("harness-catalog-list-item-openclaw").click();
+    await expect(
+      page.getByTestId("harness-catalog-status-openclaw"),
+    ).toHaveText("Update needed");
+    const updateButton = page.getByTestId("harness-catalog-install-openclaw");
+    await expect(updateButton).toHaveText("Update");
+
+    // Cancel path: clicking Update opens the warning, no mutation fires.
+    await updateButton.click();
+    const dialog = page.getByRole("alertdialog");
+    await expect(dialog).toContainText("Update OpenClaw adapter?");
+    await expect(dialog).toContainText(
+      "This replaces the machine-wide openclaw adapter.",
+    );
+    // Generic runtimes must never get Codex's package copy.
+    await expect(dialog).not.toContainText("codex-acp");
+    expect(await installCalls()).toBe(0);
+    await dialog.getByRole("button", { name: "Cancel" }).click();
+    await expect(dialog).toHaveCount(0);
+    expect(await installCalls()).toBe(0);
+
+    // Confirm path: exactly one install fires after confirmation.
+    await updateButton.click();
+    await page.getByTestId("harness-catalog-confirm-update-openclaw").click();
+    await expect(page.getByRole("alertdialog")).toHaveCount(0);
+    await expect.poll(installCalls).toBe(1);
+    // No duplicate mutation after the flow settles.
+    expect(await installCalls()).toBe(1);
+  });
+
+  test("catalog search filters the list", async ({ page }) => {
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [
+        HERMES_AVAILABLE,
+        OPENCLAW_NOT_INSTALLED,
+        CURSOR_AVAILABLE,
+      ],
+    });
+    await openHarnessSettings(page);
+    await openCatalog(page);
+
+    await page.getByTestId("harness-catalog-search").fill("claw");
+    await expect(
+      page.getByTestId("harness-catalog-list-item-openclaw"),
+    ).toBeVisible();
+    await expect(
+      page.getByTestId("harness-catalog-list-item-hermes"),
+    ).toHaveCount(0);
+    await expect(
+      page.getByTestId("harness-catalog-list-item-cursor"),
+    ).toHaveCount(0);
+    // The custom-harness entry stays available regardless of the filter.
+    await expect(
+      page.getByTestId("harness-catalog-list-item-custom"),
+    ).toBeVisible();
+  });
+});
+
+// ── Preset logos in Your harnesses rows ──────────────────────────────────────
+
+test("harness rows render bundled preset logos, not initials", async ({
+  page,
+}) => {
+  await installMockBridge(page, {
+    acpRuntimesCatalog: [HERMES_AVAILABLE, CURSOR_AVAILABLE],
+  });
+  await openHarnessSettings(page);
+
+  // Preset rows must show the same bundled logo the catalog uses
+  // (PRESET_LOGOS via RuntimeIcon), even though presets emit an empty
+  // avatar_url (the no-remote-icon security line).
+  const hermesLogo = page.getByTestId("doctor-runtime-logo-hermes");
+  await expect(hermesLogo).toBeVisible();
+  await expect(hermesLogo.locator("img")).toHaveAttribute(
+    "src",
+    "/harness-logos/hermes.png",
+  );
+
+  // Cursor renders its inline SVG mark (RUNTIME_MARKS, CC0 simple-icons
+  // path) — an svg, never an img or initials.
+  const cursorLogo = page.getByTestId("doctor-runtime-logo-cursor");
+  await expect(cursorLogo).toBeVisible();
+  await expect(cursorLogo.locator("svg")).toBeVisible();
+  await expect(cursorLogo.locator("img")).not.toBeVisible();
+  await expect(cursorLogo).not.toContainText("C");
+});
+
+// ── Custom harness add (via catalog) ─────────────────────────────────────────
+
+test.describe("add custom harness", () => {
+  test("catalog custom form saves and row appears in Your harnesses", async ({
+    page,
+  }) => {
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [HERMES_AVAILABLE, OPENCLAW_NOT_INSTALLED],
+    });
+    await openHarnessSettings(page);
+
+    // No custom rows yet.
+    await expect(
+      page.getByTestId("doctor-runtime-my-custom-agent"),
+    ).not.toBeVisible();
+
+    await openCatalog(page);
+    await page.getByTestId("harness-catalog-list-item-custom").click();
+    await expect(page.getByTestId("custom-harness-form")).toBeVisible();
+
+    // All fields render inline.
+    await expect(page.locator("#ch-label")).toBeVisible();
+    await expect(page.locator("#ch-command")).toBeVisible();
+    await expect(page.locator("#ch-id")).toBeVisible();
+
+    await fillHarnessForm(page, {
+      label: "My Custom Agent",
+      command: "my-custom-acp",
+    });
+
+    // ID auto-derives from the label.
+    await expect(page.locator("#ch-id")).toHaveValue("my-custom-agent");
+
+    await page
+      .getByTestId("custom-harness-form")
+      .getByRole("button", { name: "Save", exact: true })
+      .click();
+
+    // Dialog closes; row appears in Your harnesses.
+    await expect(page.getByTestId("harness-catalog-dialog")).not.toBeVisible();
+    await expect(
+      page.getByTestId("doctor-runtime-my-custom-agent"),
+    ).toBeVisible({ timeout: 5_000 });
+  });
+
+  test("edit preserves env vars (definitionEnv round-trip)", async ({
+    page,
+  }) => {
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [
+        HERMES_AVAILABLE,
+        OPENCLAW_NOT_INSTALLED,
+        makeCustomEntry({ definition_env: { MY_API_KEY: "sk-test" } }),
+      ],
+    });
+    await openHarnessSettings(page);
+
+    // Open edit form for the existing custom entry via the ••• menu.
+    await expect(
+      page.getByTestId("doctor-runtime-my-custom-agent"),
+    ).toBeVisible();
+    await page.getByTestId("doctor-runtime-menu-my-custom-agent").click();
+    await page.getByTestId("custom-harness-edit-my-custom-agent").click();
+    await expect(page.getByTestId("custom-harness-form")).toBeVisible();
+
+    // Existing env vars must be pre-populated.
+    await expect(page.locator('input[placeholder="KEY"]').first()).toHaveValue(
+      "MY_API_KEY",
+    );
+    await expect(
+      page.locator('input[placeholder="value"]').first(),
+    ).toHaveValue("sk-test");
+  });
+
+  test("same-ID edit replaces row — no duplicate", async ({ page }) => {
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [
+        HERMES_AVAILABLE,
+        OPENCLAW_NOT_INSTALLED,
+        makeCustomEntry({ label: "V1 Label" }),
+      ],
+    });
+    await openHarnessSettings(page);
+
+    // Edit, keep same ID, change label.
+    await page.getByTestId("doctor-runtime-menu-my-custom-agent").click();
+    await page.getByTestId("custom-harness-edit-my-custom-agent").click();
+    await expect(page.getByTestId("custom-harness-form")).toBeVisible();
+    await page.fill("#ch-label", "V2 Label");
+    await page
+      .getByTestId("custom-harness-form")
+      .getByRole("button", { name: "Save", exact: true })
+      .click();
+
+    // Exactly one row with the same ID; label updated.
+    const rows = page.locator('[data-testid="doctor-runtime-my-custom-agent"]');
+    await expect(rows).toHaveCount(1);
+    await expect(rows.first()).toContainText("V2 Label");
+  });
+
+  test("rename removes old row and inserts new row", async ({ page }) => {
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [
+        HERMES_AVAILABLE,
+        OPENCLAW_NOT_INSTALLED,
+        makeCustomEntry({ id: "old-harness", label: "Old" }),
+      ],
+    });
+    await openHarnessSettings(page);
+
+    await page.getByTestId("doctor-runtime-menu-old-harness").click();
+    await page.getByTestId("custom-harness-edit-old-harness").click();
+    await expect(page.getByTestId("custom-harness-form")).toBeVisible();
+    await fillHarnessForm(page, {
+      label: "New Harness",
+      id: "new-harness",
+      command: "my-custom-acp",
+    });
+    await page
+      .getByTestId("custom-harness-form")
+      .getByRole("button", { name: "Save", exact: true })
+      .click();
+
+    // Old row gone; new row present.
+    await expect(
+      page.getByTestId("doctor-runtime-old-harness"),
+    ).not.toBeVisible({ timeout: 5_000 });
+    await expect(page.getByTestId("doctor-runtime-new-harness")).toBeVisible({
+      timeout: 5_000,
+    });
+  });
+});
+
+// ── Delete flow ───────────────────────────────────────────────────────────────
+
+test.describe("delete custom harness", () => {
+  test("delete success removes the row", async ({ page }) => {
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [
+        HERMES_AVAILABLE,
+        OPENCLAW_NOT_INSTALLED,
+        makeCustomEntry(),
+      ],
+    });
+    await openHarnessSettings(page);
+
+    // Enter confirm-delete mode via the ••• menu.
+    await page.getByTestId("doctor-runtime-menu-my-custom-agent").click();
+    await page.getByTestId("custom-harness-delete-my-custom-agent").click();
+    // Blast-radius warning + confirm button must appear.
+    await expect(
+      page.getByTestId("custom-harness-delete-warning-my-custom-agent"),
+    ).toBeVisible();
+    await expect(
+      page.getByTestId("custom-harness-delete-confirm-my-custom-agent"),
+    ).toBeVisible();
+    await page
+      .getByTestId("custom-harness-delete-confirm-my-custom-agent")
+      .click();
+
+    // Row disappears after successful delete.
+    await expect(
+      page.getByTestId("doctor-runtime-my-custom-agent"),
+    ).not.toBeVisible({ timeout: 5_000 });
+  });
+
+  test("delete failure shows inline error and keeps the row", async ({
+    page,
+  }) => {
+    await installMockBridge(page, {
+      acpRuntimesCatalog: [
+        HERMES_AVAILABLE,
+        OPENCLAW_NOT_INSTALLED,
+        makeCustomEntry(),
+      ],
+      deleteCustomHarnessError: "permission denied: could not remove file",
+    });
+    await openHarnessSettings(page);
+
+    await page.getByTestId("doctor-runtime-menu-my-custom-agent").click();
+    await page.getByTestId("custom-harness-delete-my-custom-agent").click();
+    await page
+      .getByTestId("custom-harness-delete-confirm-my-custom-agent")
+      .click();
+
+    // Error text visible; row still present.
+    await expect(
+      page.getByText("permission denied: could not remove file"),
+    ).toBeVisible({ timeout: 5_000 });
+    await expect(
+      page.getByTestId("doctor-runtime-my-custom-agent"),
+    ).toBeVisible();
+  });
+});
+
+// ── Custom harness row readiness ─────────────────────────────────────────────
+
+test("available custom harness row shows a Ready chip", async ({ page }) => {
+  await installMockBridge(page, {
+    acpRuntimesCatalog: [
+      HERMES_AVAILABLE,
+      OPENCLAW_NOT_INSTALLED,
+      makeCustomEntry({ availability: "available" }),
+    ],
+  });
+  await openHarnessSettings(page);
+
+  const row = page.getByTestId("doctor-runtime-my-custom-agent");
+  await expect(row).toBeVisible();
+  await expect(
+    page.getByTestId("doctor-runtime-ready-my-custom-agent"),
+  ).toHaveText("Ready");
+});
+
+test("not-ready custom harness row shows status, no install action", async ({
+  page,
+}) => {
+  await installMockBridge(page, {
+    acpRuntimesCatalog: [
+      HERMES_AVAILABLE,
+      OPENCLAW_NOT_INSTALLED,
+      makeCustomEntry(),
+    ],
+  });
+  await openHarnessSettings(page);
+
+  const row = page.getByTestId("doctor-runtime-my-custom-agent");
+  await expect(row).toBeVisible();
+  await expect(
+    page.getByTestId("doctor-runtime-status-my-custom-agent"),
+  ).toHaveText("CLI needed");
+  // A row that setup can't fix with one click renders no Install button (and
+  // is not ready).
+  await expect(
+    page.getByTestId("doctor-runtime-install-my-custom-agent"),
+  ).toHaveCount(0);
+  await expect(
+    page.getByTestId("doctor-runtime-ready-my-custom-agent"),
+  ).toHaveCount(0);
+});
+
+// ── F8: onboarding navigate-after-complete ────────────────────────────────────
+//
+// Verifies the parent-owned route intent introduced in B-8:
+//   1. User reaches the machine-onboarding setup page.
+//   2. Clicks "More harnesses" (onboarding-setup-more-harnesses).
+//   3. App completes onboarding and immediately navigates to Settings → Agents.
+//
+// This test exercises the real App.tsx effect that gates router.navigate() on
+// machine.stage === "ready", which the pure-logic tests in
+// postOnboardingNav.test.mjs cannot cover (they simulate the predicate, not
+// the real render path).
+
+test("onboarding setup More-harnesses click navigates to Settings → Agents", async ({
+  page,
+}) => {
+  // Start with a fresh machine (no machine-onboarding-complete flag).
+  // skipCommunitySeed: true so the user goes through machine onboarding.
+  // skipOnboardingSeed: true so the community/identity banner doesn't appear.
+  await installMockBridge(page, undefined, {
+    skipCommunitySeed: true,
+    skipOnboardingSeed: true,
+  });
+  // Seed a community stamped with a *foreign* pubkey. This is the only shape
+  // that satisfies both preconditions of this test at once:
+  //   - machine onboarding must still run, so the community must NOT vouch for
+  //     the active identity (migrateMachineOnboardingCompletion only accepts a
+  //     community whose recorded pubkey matches — see machineOnboarding.ts:70).
+  //   - after onboarding completes, useCommunityInit must NOT report
+  //     needsSetup, or App.tsx:499 renders WelcomeSetup instead of the router
+  //     and the navigation lands on a screen that has no settings tree.
+  // The default seed vouches (it uses the active pubkey) and skipping it
+  // entirely leaves zero communities, so neither default gets there.
+  await page.addInitScript(() => {
+    const communityId = "e2e-default-community";
+    window.localStorage.setItem(
+      "buzz-communities",
+      JSON.stringify([
+        {
+          id: communityId,
+          name: "E2E Test",
+          relayUrl: "ws://127.0.0.1:7777",
+          pubkey: "f".repeat(64),
+          addedAt: new Date().toISOString(),
+        },
+      ]),
+    );
+    window.localStorage.setItem("buzz-active-community-id", communityId);
+  });
+  await page.goto("/");
+
+  // Reach the setup page: create a new identity key → skip backup step.
+  await page.getByRole("button", { name: "Create a new identity key" }).click();
+  await expect(page.getByTestId("onboarding-page-backup")).toBeVisible({
+    timeout: 10_000,
+  });
+  await page.getByTestId("onboarding-next").click();
+
+  // Now on the setup page.
+  await expect(
+    page.getByRole("heading", { name: "Set up your agent harnesses" }),
+  ).toBeVisible({ timeout: 10_000 });
+
+  // Click the "More harnesses" link — fires navigateToAgentSettings.
+  await page.getByTestId("onboarding-setup-more-harnesses").click();
+
+  // After onboarding completes + router mounts, the app must land on
+  // Settings → Agents (consolidated harnesses section visible).
+  await expect(page.getByTestId("settings-harnesses")).toBeVisible({
+    timeout: 15_000,
+  });
+});
diff --git a/desktop/tests/e2e/identity-key-help.spec.ts b/desktop/tests/e2e/identity-key-help.spec.ts
index 2e8967a43b..d204d55604 100644
--- a/desktop/tests/e2e/identity-key-help.spec.ts
+++ b/desktop/tests/e2e/identity-key-help.spec.ts
@@ -56,3 +56,38 @@ test("identity key help explains the first-run choice", async ({ page }) => {
     "1",
   );
 });
+
+test("identity key help stays readable when the app resolves dark mode", async ({
+  page,
+}) => {
+  await page.emulateMedia({ colorScheme: "dark" });
+  await installMockBridge(page, undefined, {
+    skipCommunitySeed: true,
+    skipOnboardingSeed: true,
+  });
+  await page.goto("/");
+
+  // Fresh profiles follow the system scheme, so the emulated dark scheme is
+  // the first-run repro: the app resolves the dark theme while onboarding.
+  await expect
+    .poll(() =>
+      page.evaluate(() => document.documentElement.classList.contains("dark")),
+    )
+    .toBe(true);
+
+  const trigger = page.getByTestId("identity-key-help-trigger");
+  await expect(trigger).toHaveCSS("opacity", "1", { timeout: 5000 });
+  await trigger.click();
+
+  const dialog = page.getByTestId("identity-key-help-dialog");
+  await expect(dialog).toBeVisible();
+  await waitForAnimations(page);
+
+  // The textured powder card is baked light in both themes, so the dialog pins
+  // the neutral onboarding theme to its light variant. Without the pin the
+  // dark theme flips --foreground to near-white and the title disappears
+  // against the white card.
+  await expect(
+    dialog.getByRole("heading", { name: "What’s an identity key?" }),
+  ).toHaveCSS("color", "rgb(23, 23, 23)");
+});
diff --git a/desktop/tests/e2e/inbox-refactor-screenshots.spec.ts b/desktop/tests/e2e/inbox-refactor-screenshots.spec.ts
new file mode 100644
index 0000000000..15a804d71f
--- /dev/null
+++ b/desktop/tests/e2e/inbox-refactor-screenshots.spec.ts
@@ -0,0 +1,359 @@
+/**
+ * Screenshots documenting the focused Inbox behavior for PR #2045.
+ *
+ * These replace the hand-generated shots posted earlier in that PR, which went
+ * stale twice: once when the surface was briefly renamed to "Activity", and
+ * again when the Projects filter landed. Keeping them in a spec means the next
+ * round regenerates instead of drifting.
+ *
+ * Run: pnpm build:e2e && pnpm exec playwright test --project=smoke \
+ *        tests/e2e/inbox-refactor-screenshots.spec.ts
+ * Output: test-results/inbox-refactor/
+ */
+import { expect, test } from "@playwright/test";
+
+import { waitForAnimations } from "../helpers/animations";
+import { installMockBridge, TEST_IDENTITIES } from "../helpers/bridge";
+
+const SHOTS = "test-results/inbox-refactor";
+
+const GENERAL_CHANNEL_ID = "9a1657ac-f7aa-5db0-b632-d8bbeb6dfb50";
+const AGENTS_CHANNEL_ID = "94a444a4-c0a3-5966-ab05-530c6ddc2301";
+const DM_CHANNEL_ID = "f48efb06-0c93-5025-aac9-2e646bb6bfa8";
+
+// Mock bridge default pubkey — must match DEFAULT_MOCK_PUBKEY in bridge.ts.
+const MOCK_PUBKEY = "deadbeef".repeat(8);
+const DRAFT_STORE_KEY = `buzz-drafts.v1:${MOCK_PUBKEY}`;
+
+// Fixed timestamps so draft ordering renders deterministically.
+const DRAFT_CREATED_AT_1 = "2026-07-01T10:00:00.000Z";
+const DRAFT_CREATED_AT_2 = "2026-07-02T14:30:00.000Z";
+
+type MockFeedWindow = Window & {
+  __BUZZ_E2E_EMIT_MOCK_MESSAGE__?: (input: {
+    channelName: string;
+    content: string;
+    createdAt?: number;
+    id?: string;
+    parentEventId?: string;
+    pubkey?: string;
+  }) => {
+    content: string;
+    created_at: number;
+    id: string;
+    kind: number;
+    pubkey: string;
+    tags: string[][];
+  };
+  __BUZZ_E2E_PUSH_MOCK_FEED_ITEM__?: (item: {
+    category: "mention" | "needs_action" | "activity" | "agent_activity";
+    channel_id: string | null;
+    channel_name: string;
+    channel_type?: string | null;
+    content: string;
+    created_at: number;
+    id: string;
+    kind: number;
+    pubkey: string;
+    tags: string[][];
+  }) => void;
+};
+
+/**
+ * The mock community is seeded without a pubkey, which initDraftStore needs on
+ * startup. Init scripts run in registration order, so this patches the seed
+ * installMockBridge already wrote.
+ */
+async function patchCommunityPubkey(page: import("@playwright/test").Page) {
+  await page.addInitScript(
+    ({ pubkey }) => {
+      const raw = window.localStorage.getItem("buzz-communities");
+      const communities = raw
+        ? (JSON.parse(raw) as Array<Record<string, unknown>>)
+        : [];
+      if (communities[0]) {
+        communities[0].pubkey = pubkey;
+        window.localStorage.setItem(
+          "buzz-communities",
+          JSON.stringify(communities),
+        );
+      }
+    },
+    { pubkey: MOCK_PUBKEY },
+  );
+}
+
+/** Two active drafts so the Drafts filter renders its count badge. */
+async function seedTwoDrafts(page: import("@playwright/test").Page) {
+  await page.addInitScript(
+    ({ storeKey, channelId, agentsChannelId, createdAt1, createdAt2 }) => {
+      const draft = (content: string, channel: string, timestamp: string) => ({
+        content,
+        selectionStart: content.length,
+        selectionEnd: content.length,
+        channelId: channel,
+        createdAt: timestamp,
+        updatedAt: timestamp,
+        pendingImeta: [],
+        spoileredAttachmentUrls: [],
+        status: "active" as const,
+      });
+
+      window.localStorage.setItem(
+        storeKey,
+        JSON.stringify({
+          [`channel:${channelId}`]: draft(
+            "Drafting the release notes — will post once the checklist is signed off.",
+            channelId,
+            createdAt1,
+          ),
+          [`channel:${agentsChannelId}`]: draft(
+            "Following up on the harness rollout.",
+            agentsChannelId,
+            createdAt2,
+          ),
+        }),
+      );
+    },
+    {
+      storeKey: DRAFT_STORE_KEY,
+      channelId: GENERAL_CHANNEL_ID,
+      agentsChannelId: AGENTS_CHANNEL_ID,
+      createdAt1: DRAFT_CREATED_AT_1,
+      createdAt2: DRAFT_CREATED_AT_2,
+    },
+  );
+}
+
+/** Wait for the live mock-feed helpers the seeding below depends on. */
+async function waitForMockFeedHelpers(page: import("@playwright/test").Page) {
+  await expect(page.getByTestId("home-inbox-list")).toBeVisible({
+    timeout: 10_000,
+  });
+  await page.waitForFunction(() => {
+    const win = window as MockFeedWindow;
+    return (
+      typeof win.__BUZZ_E2E_EMIT_MOCK_MESSAGE__ === "function" &&
+      typeof win.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__ === "function"
+    );
+  });
+}
+
+test.describe("inbox refactor screenshots", () => {
+  test.use({ viewport: { width: 1280, height: 900 } });
+
+  test.beforeEach(async ({ page }) => {
+    page.on("pageerror", (err) => console.error("PAGE ERROR:", err.message));
+    page.on("console", (msg) => {
+      if (msg.type() === "error") {
+        console.error("CONSOLE ERROR:", msg.text().slice(0, 300));
+      }
+    });
+  });
+
+  test("01 — filter menu with Reminders/Drafts divider and counts", async ({
+    page,
+  }) => {
+    await patchCommunityPubkey(page);
+    await seedTwoDrafts(page);
+    await installMockBridge(page, { mode: "mock" });
+
+    await page.goto("/", { waitUntil: "domcontentloaded" });
+    await expect(page.getByTestId("home-inbox")).toBeVisible({
+      timeout: 10_000,
+    });
+
+    await page.getByTestId("inbox-filter-trigger").click();
+    const menu = page.getByRole("menu");
+    await expect(menu).toBeVisible();
+    await expect(
+      menu.getByRole("menuitemradio", { name: "Projects" }),
+    ).toBeVisible();
+    await waitForAnimations(page);
+
+    await page.screenshot({ path: `${SHOTS}/01-current-filters.png` });
+  });
+
+  test("02 — Inbox label, inbox icon, and overflow controls", async ({
+    page,
+  }) => {
+    await installMockBridge(page, { mode: "mock" });
+
+    await page.goto("/", { waitUntil: "domcontentloaded" });
+    await expect(page.getByTestId("home-inbox")).toBeVisible({
+      timeout: 10_000,
+    });
+
+    // The sidebar must be in frame — the label is the point of this shot.
+    const inboxButton = page
+      .getByTestId("sidebar-primary-menu")
+      .getByRole("button", { name: "Inbox", exact: true });
+    await expect(inboxButton).toBeVisible();
+    // Inbox is a destination, not a notification tray, so it carries the inbox
+    // glyph rather than a bell. Asserted because nothing else pins the icon.
+    await expect(inboxButton.locator("svg.lucide-inbox")).toHaveCount(1);
+
+    await page.getByTestId("inbox-options-trigger").click();
+    await expect(page.getByText("Show unread only")).toBeVisible();
+    await expect(page.getByText("Mark all as read")).toBeVisible();
+    await waitForAnimations(page);
+
+    await page.screenshot({ path: `${SHOTS}/02-current-controls.png` });
+  });
+
+  test("03 — consecutive DMs group into one conversation row", async ({
+    page,
+  }) => {
+    await installMockBridge(page, { mode: "mock" });
+
+    await page.goto("/", { waitUntil: "domcontentloaded" });
+    await waitForMockFeedHelpers(page);
+
+    const dmIds = ["shot-dm-first", "shot-dm-second", "shot-dm-third"];
+    await page.evaluate(
+      ({ channelId, createdAt, ids, senderPubkey }) => {
+        const win = window as MockFeedWindow;
+        const emitMessage = win.__BUZZ_E2E_EMIT_MOCK_MESSAGE__;
+        const pushFeedItem = win.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__;
+        if (!emitMessage || !pushFeedItem) {
+          throw new Error("Mock bridge helpers are not installed.");
+        }
+
+        [
+          "Quick update: the staging deploy is ready.",
+          "I ran the smoke tests and everything passed.",
+          "Can you take a final look before we release?",
+        ].forEach((content, index) => {
+          const event = emitMessage({
+            channelName: "alice-tyler",
+            content,
+            createdAt: createdAt + index,
+            id: ids[index],
+            pubkey: senderPubkey,
+          });
+          pushFeedItem({
+            category: "activity",
+            channel_id: channelId,
+            channel_name: "alice-tyler",
+            channel_type: null,
+            content: event.content,
+            created_at: event.created_at,
+            id: event.id,
+            kind: event.kind,
+            pubkey: event.pubkey,
+            tags: event.tags,
+          });
+        });
+      },
+      {
+        channelId: DM_CHANNEL_ID,
+        createdAt: Math.floor(Date.now() / 1000),
+        ids: dmIds,
+        senderPubkey: TEST_IDENTITIES.alice.pubkey,
+      },
+    );
+
+    const firstDmRow = page.getByTestId(`home-inbox-item-${dmIds[0]}`);
+    await expect(firstDmRow).toBeVisible();
+    // The grouping claim: three DMs, one row.
+    await expect(page.getByTestId(`home-inbox-item-${dmIds[1]}`)).toHaveCount(
+      0,
+    );
+    await expect(page.getByTestId(`home-inbox-item-${dmIds[2]}`)).toHaveCount(
+      0,
+    );
+
+    await firstDmRow.click();
+    const detail = page.getByTestId("home-inbox-detail");
+    await expect(detail.getByRole("heading")).toHaveText("DM with alice");
+    await expect(detail.getByTestId("message-unread-divider")).toBeVisible();
+    await waitForAnimations(page);
+
+    await page.screenshot({ path: `${SHOTS}/03-grouped-dms.png` });
+  });
+
+  test("04 — thread opens at the oldest unread reply", async ({ page }) => {
+    await installMockBridge(page, { mode: "mock" });
+
+    await page.goto("/", { waitUntil: "domcontentloaded" });
+    await waitForMockFeedHelpers(page);
+
+    const replyIds = [
+      "shot-reply-first",
+      "shot-reply-second",
+      "shot-reply-third",
+    ];
+    await page.evaluate(
+      ({ agentPubkeys, channelId, currentPubkey, ids }) => {
+        const win = window as MockFeedWindow;
+        const emitMessage = win.__BUZZ_E2E_EMIT_MOCK_MESSAGE__;
+        const pushFeedItem = win.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__;
+        if (!emitMessage || !pushFeedItem) {
+          throw new Error("Mock bridge helpers are not installed.");
+        }
+
+        const createdAt = Math.floor(Date.now() / 1000) + 60;
+        const root = emitMessage({
+          channelName: "general",
+          content: "Release checklist for the desktop build",
+          createdAt: createdAt - 10,
+          id: "shot-thread-root",
+          pubkey: currentPubkey,
+        });
+
+        [
+          "Started on the changelog — first pass is up.",
+          "Verified the signed build on macOS.",
+          "One open question on the version suffix.",
+        ].forEach((content, index) => {
+          const event = emitMessage({
+            channelName: "general",
+            content,
+            createdAt: createdAt + index,
+            id: ids[index],
+            parentEventId: root.id,
+            pubkey: agentPubkeys[index % agentPubkeys.length],
+          });
+          pushFeedItem({
+            category: "activity",
+            channel_id: channelId,
+            channel_name: "general",
+            channel_type: "stream",
+            content: event.content,
+            created_at: event.created_at,
+            id: event.id,
+            kind: event.kind,
+            pubkey: event.pubkey,
+            tags: event.tags,
+          });
+        });
+      },
+      {
+        agentPubkeys: [
+          TEST_IDENTITIES.alice.pubkey,
+          TEST_IDENTITIES.charlie.pubkey,
+        ],
+        channelId: GENERAL_CHANNEL_ID,
+        currentPubkey: MOCK_PUBKEY,
+        ids: replyIds,
+      },
+    );
+
+    const firstUnreadRow = page.getByTestId(`home-inbox-item-${replyIds[0]}`);
+    await expect(firstUnreadRow).toBeVisible();
+    await firstUnreadRow.click();
+
+    const detail = page.getByTestId("home-inbox-detail");
+    // The anchoring claim: full thread present, selection on the oldest unread.
+    await expect(detail).toContainText(
+      "Release checklist for the desktop build",
+    );
+    await expect(detail.getByTestId("message-unread-divider")).toBeVisible();
+    await expect(page.getByTestId("home-inbox-selected-message")).toContainText(
+      "Started on the changelog — first pass is up.",
+    );
+    await waitForAnimations(page);
+
+    await page.screenshot({ path: `${SHOTS}/04-thread-context.png` });
+  });
+});
diff --git a/desktop/tests/e2e/inline-custom-harness.spec.ts b/desktop/tests/e2e/inline-custom-harness.spec.ts
new file mode 100644
index 0000000000..6b3845d65a
--- /dev/null
+++ b/desktop/tests/e2e/inline-custom-harness.spec.ts
@@ -0,0 +1,194 @@
+/**
+ * E2E spec for the inline "Add custom harness…" entry in the agent dialogs.
+ *
+ * Registering a custom harness used to be reachable only from Settings →
+ * Agents, so anyone whose first touchpoint was "New agent" never learned the
+ * path existed. The harness dropdowns now carry the entry directly.
+ *
+ * Covers, on all three surfaces (create, edit definition, edit instance):
+ *  - choosing the entry opens the registration form
+ *  - saving registers the harness and selects it in the dropdown
+ *
+ * Create and instance edit additionally assert the sentinel never becomes the
+ * selection; create alone covers dismissing the form leaving the previous
+ * selection untouched. The three surfaces share the same routing, so those
+ * checks are not repeated on every one.
+ */
+import { expect, test } from "@playwright/test";
+
+import { installMockBridge } from "../helpers/bridge";
+
+const ADD_ENTRY = "Add custom harness…";
+const HARNESS_LABEL = "My Weird Agent";
+const HARNESS_COMMAND = "my-weird-acp";
+
+type Page = import("@playwright/test").Page;
+type Locator = import("@playwright/test").Locator;
+
+/** Open a PersonaDropdownField (button trigger + menuitemradio options). */
+async function openDropdown(trigger: Locator) {
+  await expect(trigger).toBeVisible({ timeout: 10_000 });
+  await trigger.click();
+}
+
+/** Register a harness through the inline form and wait for it to close. */
+async function registerHarness(page: Page) {
+  const form = page.getByTestId("custom-harness-form");
+  await expect(form).toBeVisible({ timeout: 8_000 });
+  await page.fill("#ch-label", HARNESS_LABEL);
+  await page.fill("#ch-command", HARNESS_COMMAND);
+  // The id auto-derives from the label; it is what the dropdown selects on.
+  await expect(page.locator("#ch-id")).toHaveValue("my-weird-agent");
+  await form.getByRole("button", { name: "Save", exact: true }).click();
+  await expect(page.getByTestId("add-custom-harness-dialog")).not.toBeVisible({
+    timeout: 8_000,
+  });
+}
+
+/** Open the create-agent dialog (AgentDefinitionDialog, create mode). */
+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();
+  return dialog;
+}
+
+/** Open the edit dialog for a saved definition (same dialog, edit mode). */
+async function openDefinitionEditDialog(page: Page, name: string) {
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.getByTestId("open-agents-view").click();
+  await expect(page.getByTestId("agents-library-personas")).toBeVisible({
+    timeout: 10_000,
+  });
+  await page.getByRole("button", { name: `Open actions for ${name}` }).click();
+  await page.getByRole("menuitem", { name: "Edit" }).click();
+  const dialog = page.getByTestId("persona-dialog");
+  await expect(dialog).toBeVisible({ timeout: 10_000 });
+  await dialog.getByRole("tab", { name: "Customize for this agent" }).click();
+  return dialog;
+}
+
+test.describe("inline add custom harness", () => {
+  test("create dialog registers a harness inline and selects it", async ({
+    page,
+  }) => {
+    await installMockBridge(page);
+    const dialog = await openCreateDialog(page);
+
+    const harness = dialog.locator("#persona-runtime");
+    await openDropdown(harness);
+    await page.getByRole("menuitemradio", { name: ADD_ENTRY }).click();
+
+    // The sentinel opens the form; it must never become the selection.
+    await expect(page.getByTestId("add-custom-harness-dialog")).toBeVisible({
+      timeout: 8_000,
+    });
+    await expect(harness).not.toContainText(ADD_ENTRY);
+
+    await registerHarness(page);
+
+    // The saved harness is now the selected harness.
+    await expect(harness).toContainText(HARNESS_LABEL, { timeout: 8_000 });
+  });
+
+  test("dismissing the form leaves the create dialog's harness unchanged", async ({
+    page,
+  }) => {
+    await installMockBridge(page);
+    const dialog = await openCreateDialog(page);
+
+    const harness = dialog.locator("#persona-runtime");
+    await expect(harness).toBeVisible({ timeout: 10_000 });
+    const before = await harness.textContent();
+
+    await openDropdown(harness);
+    await page.getByRole("menuitemradio", { name: ADD_ENTRY }).click();
+    await expect(page.getByTestId("add-custom-harness-dialog")).toBeVisible({
+      timeout: 8_000,
+    });
+
+    await page.keyboard.press("Escape");
+    await expect(
+      page.getByTestId("add-custom-harness-dialog"),
+    ).not.toBeVisible();
+
+    // No harness was registered, so the prior selection must survive.
+    await expect(harness).toHaveText(before ?? "");
+  });
+
+  test("definition edit dialog registers a harness inline and selects it", async ({
+    page,
+  }) => {
+    await installMockBridge(page, {
+      personas: [
+        {
+          displayName: "Editable Agent",
+          systemPrompt: "An agent whose harness gets replaced.",
+        },
+      ],
+    });
+    const dialog = await openDefinitionEditDialog(page, "Editable Agent");
+
+    const harness = dialog.locator("#persona-runtime");
+    await openDropdown(harness);
+    await page.getByRole("menuitemradio", { name: ADD_ENTRY }).click();
+    await expect(page.getByTestId("add-custom-harness-dialog")).toBeVisible({
+      timeout: 8_000,
+    });
+
+    await registerHarness(page);
+
+    await expect(harness).toContainText(HARNESS_LABEL, { timeout: 8_000 });
+  });
+
+  test("instance edit dialog registers a harness inline and keeps Custom command", async ({
+    page,
+  }) => {
+    await installMockBridge(page, {
+      managedAgents: [
+        {
+          pubkey:
+            "npub1e2e00000000000000000000000000000000000000000000000000000000",
+          name: "Instance Agent",
+          status: "stopped",
+          channelNames: ["agents"],
+        },
+      ],
+    });
+
+    await page.goto("/", { waitUntil: "domcontentloaded" });
+    await page.getByTestId("open-agents-view").click();
+    await page
+      .getByRole("button", { name: "Instance Agent agent profile" })
+      .click();
+    await expect(page.getByTestId("user-profile-panel")).toBeVisible({
+      timeout: 10_000,
+    });
+    await page.getByTestId("user-profile-edit-agent").click();
+    await expect(page.getByTestId("edit-agent-dialog")).toBeVisible({
+      timeout: 10_000,
+    });
+
+    const provider = page.locator("#edit-agent-runtime");
+    await openDropdown(provider);
+
+    // "Custom command" is a different feature (ad-hoc command override) and
+    // must survive alongside the new entry.
+    await expect(
+      page.getByRole("menuitemradio", { name: "Custom command" }),
+    ).toBeVisible();
+    await page.getByRole("menuitemradio", { name: ADD_ENTRY }).click();
+    await expect(page.getByTestId("add-custom-harness-dialog")).toBeVisible({
+      timeout: 8_000,
+    });
+    await expect(provider).not.toContainText(ADD_ENTRY);
+
+    await registerHarness(page);
+
+    await expect(provider).toContainText(HARNESS_LABEL, { timeout: 8_000 });
+  });
+});
diff --git a/desktop/tests/e2e/integration.spec.ts b/desktop/tests/e2e/integration.spec.ts
index b0ee57e02d..a2a92a8d39 100644
--- a/desktop/tests/e2e/integration.spec.ts
+++ b/desktop/tests/e2e/integration.spec.ts
@@ -303,11 +303,11 @@ test("live mentions refetch the home feed without waiting for polling", async ({
       },
     ]);
 
-    // The inbox feed should have been refetched live (the original purpose
+    // The Inbox feed should have been refetched live (the original purpose
     // of this test). The home badge stays at 0 while the user is actively
     // reading #general — reading in-channel advances the NIP-RS marker past
     // the new mention — so the assertion that the refetch happened is the
-    // inbox-list content, not the badge.
+    // Inbox-list content, not the badge.
     await targetPage
       .getByTestId("app-sidebar")
       .getByRole("button", { name: "Inbox" })
diff --git a/desktop/tests/e2e/invite-link-copy.spec.ts b/desktop/tests/e2e/invite-link-copy.spec.ts
index 94bc8e26b0..015abd848f 100644
--- a/desktop/tests/e2e/invite-link-copy.spec.ts
+++ b/desktop/tests/e2e/invite-link-copy.spec.ts
@@ -3,7 +3,10 @@ import { expect, test } from "@playwright/test";
 import { installMockBridge } from "../helpers/bridge";
 import { openSettings } from "../helpers/settings";
 
+let invitePayloads: Record<string, unknown>[];
+
 test.beforeEach(async ({ page }) => {
+  invitePayloads = [];
   await page.context().grantPermissions(["clipboard-read", "clipboard-write"], {
     origin: "http://127.0.0.1:4173",
   });
@@ -11,6 +14,7 @@ test.beforeEach(async ({ page }) => {
     relayRequiresMembership: true,
   });
   await page.route("**/api/invites", async (route) => {
+    invitePayloads.push(route.request().postDataJSON());
     await route.fulfill({
       contentType: "application/json",
       json: {
@@ -33,8 +37,12 @@ test("copies a freshly minted invite link without showing a URL or QR code", asy
   await page.getByTestId("community-invite-dialog-trigger").click();
   await expect(page.getByTestId("invite-link-url")).toHaveCount(0);
   await expect(page.getByTestId("invite-link-qr-code")).toHaveCount(0);
+  await expect(page.getByTestId("invite-link-max-uses-trigger")).toHaveText(
+    "No limit",
+  );
   await page.getByTestId("copy-invite-link").click();
   await expect(page.getByTestId("copy-invite-link")).toContainText("Copied");
+  expect(invitePayloads).toEqual([{ ttl_secs: 3 * 24 * 60 * 60 }]);
 
   const payload = await page.evaluate(() => {
     const log = (
@@ -53,3 +61,25 @@ test("copies a freshly minted invite link without showing a URL or QR code", asy
     text: "buzz://join?relay=wss%3A%2F%2Frelay.example.com&code=qr-download-test",
   });
 });
+
+test("sets a selected invite-use limit", async ({ page }) => {
+  await page.goto("/");
+  await openSettings(page, "community-members");
+  await page.getByTestId("community-invite-dialog-trigger").click();
+
+  const maxUsesTrigger = page.getByTestId("invite-link-max-uses-trigger");
+  await maxUsesTrigger.click();
+  await expect(
+    page.getByRole("menuitemradio", { name: "No limit" }),
+  ).toBeVisible();
+  await expect(
+    page.getByRole("menuitemradio", { name: "25 uses" }),
+  ).toBeVisible();
+  await page.getByTestId("invite-link-max-uses-10").click();
+  await expect(maxUsesTrigger).toHaveText("10 uses");
+  await page.getByTestId("copy-invite-link").click();
+  await expect(page.getByTestId("copy-invite-link")).toContainText("Copied");
+  expect(invitePayloads).toEqual([
+    { max_uses: 10, ttl_secs: 3 * 24 * 60 * 60 },
+  ]);
+});
diff --git a/desktop/tests/e2e/invites-settings-screenshots.spec.ts b/desktop/tests/e2e/invites-settings-screenshots.spec.ts
index 654aec56fe..c56e33bcd5 100644
--- a/desktop/tests/e2e/invites-settings-screenshots.spec.ts
+++ b/desktop/tests/e2e/invites-settings-screenshots.spec.ts
@@ -78,15 +78,25 @@ test("capture: share-style community invite dialog", async ({ page }) => {
   await expect(page.getByTestId("community-invite-email-field")).toHaveCount(0);
   await expect(page.getByPlaceholder("Type an email address")).toHaveCount(0);
   await expect(
-    dialog.getByRole("heading", { name: "Share with a link" }),
+    dialog.getByText("Anyone with this link can join this community."),
   ).toBeVisible();
+  await expect(dialog.getByText("Expires after")).toBeVisible();
+  await expect(dialog.getByText("Limit number of uses")).toBeVisible();
+  await expect(page.getByTestId("invite-link-max-uses-trigger")).toHaveText(
+    "No limit",
+  );
   await expect(page.getByTestId("copy-invite-link")).toHaveText("Copy link");
   await expect(page.getByTestId("invite-link-qr-code")).toHaveCount(0);
   await expect(page.getByTestId("invite-link-url")).toHaveCount(0);
 
   const expiryTrigger = page.getByTestId("invite-link-ttl-trigger");
   await expect(expiryTrigger).toHaveText("3 days");
+  await expect(expiryTrigger).toHaveCSS("font-size", "14px");
+  await expect(
+    dialog.getByText("Limit number of uses", { exact: true }),
+  ).toHaveCSS("font-size", "14px");
   await expiryTrigger.click();
+  await expect(page.getByRole("menu")).not.toContainText("Expires after");
   await expect(
     page.getByRole("menuitemradio", { name: "1 day" }),
   ).toBeVisible();
diff --git a/desktop/tests/e2e/mesh-compute.spec.ts b/desktop/tests/e2e/mesh-compute.spec.ts
index 28c4ee488a..7c360368a2 100644
--- a/desktop/tests/e2e/mesh-compute.spec.ts
+++ b/desktop/tests/e2e/mesh-compute.spec.ts
@@ -5,19 +5,20 @@ import { openSettings } from "../helpers/settings";
 
 type E2eWindow = Window & {
   __BUZZ_E2E_COMMANDS__?: string[];
+  __BUZZ_E2E_COMMAND_PAYLOADS__?: Array<{
+    command: string;
+    payload: { request?: { mode?: string; modelId?: string } } | null;
+  }>;
   __BUZZ_E2E_SET_MESH__?: (mesh: {
     nodeState?: "off" | "running";
     nodeMode?: "serve" | "client" | null;
   }) => void;
 };
 
-test.beforeEach(async ({ page }) => {
-  await installMockBridge(page);
-});
-
 test("Share compute has a clear empty state and starts and stops sharing", async ({
   page,
 }) => {
+  await installMockBridge(page);
   await page.goto("/");
   await openSettings(page, "compute");
 
@@ -56,14 +57,20 @@ test("Share compute has a clear empty state and starts and stops sharing", async
     .toContain("mesh_stop_node");
 });
 
-test("consuming a peer's compute does NOT light the Share toggle", async ({
+test("a consuming client can switch to sharing its saved local model", async ({
   page,
 }) => {
   // Regression: consuming someone else's shared compute starts a client-mode
   // node in the single runtime slot, which reports state:"running". The Share
-  // toggle keyed off state alone and lit up — and clicking it would have torn
-  // down the unrelated consume session. It must stay off + disabled, explain
-  // why, and issue no stop command.
+  // toggle keyed off state alone and lit up. A later guard overcorrected by
+  // disabling the switch and copying the remote model over the local sharing
+  // choice. Keep the switch off, preserve the local model, then replace the
+  // client with one serve start (never a stop command).
+  const localModel = "hf://demo/local-small-model:Q4_K_M";
+  await page.addInitScript((model) => {
+    window.localStorage.setItem("buzz.mesh-compute.share.model.v1", model);
+  }, localModel);
+  await installMockBridge(page);
   await page.goto("/");
   // The mesh seed hook is installed when the mock bridge boots; calling it
   // before then silently no-ops (optional chaining) and the seed is lost.
@@ -80,19 +87,26 @@ test("consuming a peer's compute does NOT light the Share toggle", async ({
 
   const card = page.getByTestId("settings-mesh-share-compute");
   const toggle = page.getByTestId("mesh-share-compute-toggle");
+  const model = page.getByTestId("mesh-share-compute-model");
 
   await expect(card).toContainText(
     "This machine is currently using another member's shared compute",
   );
+  await expect(card).toContainText("Buzz may briefly restart");
   await expect(toggle).not.toBeChecked();
-  await expect(toggle).toBeDisabled();
+  await expect(model).toBeEnabled();
+  await expect(model).toHaveValue(localModel);
+  await expect(toggle).toBeEnabled();
+  await toggle.click();
+  await expect(toggle).toBeChecked();
 
-  // The switch is disabled, so a click can't fire onCheckedChange — but assert
-  // the destructive command never went out regardless.
-  const stopIssued = await page.evaluate(() =>
-    ((window as E2eWindow).__BUZZ_E2E_COMMANDS__ ?? []).includes(
-      "mesh_stop_node",
-    ),
-  );
-  expect(stopIssued).toBe(false);
+  const commands = await page.evaluate(() => ({
+    names: (window as E2eWindow).__BUZZ_E2E_COMMANDS__ ?? [],
+    payloads: (window as E2eWindow).__BUZZ_E2E_COMMAND_PAYLOADS__ ?? [],
+  }));
+  expect(commands.names).not.toContain("mesh_stop_node");
+  expect(commands.payloads).toContainEqual({
+    command: "mesh_start_node",
+    payload: { request: { mode: "serve", modelId: localModel } },
+  });
 });
diff --git a/desktop/tests/e2e/mobile-pairing-qr.spec.ts b/desktop/tests/e2e/mobile-pairing-qr.spec.ts
index 710dbcec2f..606777545f 100644
--- a/desktop/tests/e2e/mobile-pairing-qr.spec.ts
+++ b/desktop/tests/e2e/mobile-pairing-qr.spec.ts
@@ -1,4 +1,4 @@
-import { expect, test } from "@playwright/test";
+import { expect, test, type Page } from "@playwright/test";
 import { mkdirSync } from "node:fs";
 
 import { installMockBridge } from "../helpers/bridge";
@@ -7,52 +7,179 @@ import { waitForAnimations } from "../helpers/animations";
 const SCREENSHOT_DIR = "test-results/mobile-pairing-qr";
 
 test.beforeEach(async ({ page }) => {
-  await installMockBridge(page);
+  await installMockBridge(page, { pairingStartDelayMs: 300 });
 });
 
-test("mobile pairing uses the local Wallet-style QR renderer", async ({
+async function emitPairingEvent(page: Page, event: string, payload?: unknown) {
+  await page.evaluate(
+    async ({ eventName, eventPayload }) => {
+      const internals = (
+        window as Window & {
+          __TAURI_INTERNALS__?: {
+            invoke?: (
+              command: string,
+              args: Record<string, unknown>,
+            ) => Promise<unknown>;
+          };
+        }
+      ).__TAURI_INTERNALS__;
+      if (!internals?.invoke) {
+        throw new Error("Tauri E2E event bridge is unavailable");
+      }
+      await internals.invoke("plugin:event|emit", {
+        event: eventName,
+        payload: eventPayload,
+      });
+    },
+    { eventName: event, eventPayload: payload },
+  );
+}
+
+test("mobile pairing starts on demand and reveals the QR code", async ({
   page,
 }) => {
   await page.goto("/");
   await page.getByTestId("open-settings").click();
   await page.getByTestId("profile-popover-settings").click();
   await page.getByTestId("settings-nav-mobile").click();
-  await page.getByTestId("pair-mobile-button").click();
 
-  const dialog = page.getByTestId("mobile-pairing-dialog");
-  const qrCode = page.getByTestId("mobile-pairing-qr");
+  mkdirSync(SCREENSHOT_DIR, { recursive: true });
+
+  const section = page.getByTestId("settings-mobile");
+  const card = page.getByTestId("mobile-pairing-card");
   const qrContainer = page.getByTestId("mobile-pairing-qr-container");
-  const copyButton = dialog.getByTestId("copy-pairing-code");
-  await expect(dialog).toBeVisible();
+  const startButton = card.getByTestId("start-pairing-button");
+  await expect(card).toBeVisible();
+  await expect(startButton).toHaveText("Start pairing");
+  await expect(page.getByTestId("mobile-pairing-qr")).toHaveCount(0);
+  await expect(page.getByTestId("copy-pairing-code")).toHaveCount(0);
+  expect(
+    await page.evaluate(
+      () =>
+        (window.__BUZZ_E2E_COMMAND_LOG__ ?? []).filter(
+          (entry) => entry.command === "start_pairing",
+        ).length,
+    ),
+  ).toBe(0);
+
+  const sectionBox = await section.boundingBox();
+  const cardBox = await card.boundingBox();
+  expect(sectionBox).not.toBeNull();
+  expect(cardBox).not.toBeNull();
+  const sectionCenter = (sectionBox?.x ?? 0) + (sectionBox?.width ?? 0) / 2;
+  const cardCenter = (cardBox?.x ?? 0) + (cardBox?.width ?? 0) / 2;
+  expect(Math.abs(sectionCenter - cardCenter)).toBeLessThan(0.5);
+  await waitForAnimations(page);
+  await card.screenshot({ path: `${SCREENSHOT_DIR}/pairing-start.png` });
+
+  await startButton.click();
+
+  const loadingSpinner = card.getByTestId("pairing-loading-spinner");
+  await expect(loadingSpinner).toBeVisible();
+  await expect(loadingSpinner).toHaveCSS("animation-name", "spin");
+
+  const qrCode = page.getByTestId("mobile-pairing-qr");
+  const copyButton = card.getByTestId("copy-pairing-code");
   await expect(qrCode).toBeVisible();
   await expect(copyButton).toHaveText("Copy pairing code");
-  await expect(dialog).toHaveCSS("border-radius", "16px");
-  await expect(dialog).toHaveCSS("border-left-width", "0px");
-  await expect(dialog).toHaveCSS("padding-left", "24px");
-  await expect(dialog).toHaveCSS("padding-right", "24px");
-  await expect(dialog).toHaveCSS("padding-top", "24px");
-  await expect(dialog.getByTestId("mobile-pairing-done")).toHaveCount(0);
+  await expect(startButton).toHaveCount(0);
+  await expect(card.getByText("Pair mobile device")).toHaveCount(0);
+  await expect(page.getByTestId("mobile-pairing-dialog")).toHaveCount(0);
   await expect(
-    dialog.getByRole("button", { name: "Close", exact: true }),
-  ).toHaveCount(1);
-  await expect(
-    dialog.getByText("Waiting for mobile device to scan..."),
+    page.getByText("Securely transfer your identity via NIP-AB protocol"),
   ).toHaveCount(0);
-  await expect(dialog.locator("code")).toHaveCount(0);
   await expect(qrCode).toHaveAttribute("data-qr-matrix-size", "57");
   await expect(qrCode.locator("[data-qr-finder-pattern]")).toHaveCount(3);
   expect(await qrCode.locator("circle").count()).toBeGreaterThan(100);
+  expect(await qrCode.locator(".buzz-qr-cell-reveal").count()).toBeGreaterThan(
+    100,
+  );
+  await expect(qrCode.locator(".buzz-qr-cell-reveal").first()).toHaveCSS(
+    "animation-name",
+    "buzz-qr-cell-reveal",
+  );
+  await expect(qrCode.locator(".buzz-qr-cell-reveal").first()).toHaveCSS(
+    "animation-duration",
+    "0.058s",
+  );
+  await expect(qrCode.locator(".buzz-qr-cell-reveal").first()).toHaveCSS(
+    "animation-timing-function",
+    "linear",
+  );
+  await expect(
+    qrCode.locator('[data-qr-cell-row="56"].buzz-qr-cell-reveal').first(),
+  ).toHaveCSS("animation-delay", "0.189s");
+  await expect(copyButton).toHaveCSS("animation-name", "enter");
+  await expect(copyButton).toHaveCSS("animation-duration", "0.25s");
   await expect(qrCode.locator("image")).toHaveAttribute(
     "href",
     "/app-icon@2x.png",
   );
   await waitForAnimations(page);
-  const qrContainerWidth = await qrContainer.evaluate(
-    (element) => getComputedStyle(element).width,
+  const qrBox = await qrContainer.boundingBox();
+  const copyBox = await copyButton.boundingBox();
+  expect(qrBox).not.toBeNull();
+  expect(copyBox).not.toBeNull();
+  expect(copyBox?.y ?? 0).toBeGreaterThan(
+    (qrBox?.y ?? 0) + (qrBox?.height ?? 0),
+  );
+  expect(Math.abs((copyBox?.x ?? 0) - (qrBox?.x ?? 0))).toBeLessThan(0.5);
+  expect(Math.abs((copyBox?.width ?? 0) - (qrBox?.width ?? 0))).toBeLessThan(
+    0.5,
   );
-  await expect(copyButton).toHaveCSS("width", qrContainerWidth);
 
-  mkdirSync(SCREENSHOT_DIR, { recursive: true });
-  await dialog.screenshot({ path: `${SCREENSHOT_DIR}/pairing-dialog.png` });
+  await emitPairingEvent(page, "pairing-error", {
+    message: "Session timed out",
+  });
+
+  await expect(qrCode).toHaveCount(0);
+  await expect(copyButton).toHaveCount(0);
+  await expect(card.getByText("Pairing code expired.")).toBeVisible();
+
+  const regenerateButton = card.getByTestId("regenerate-pairing-button");
+  await expect(regenerateButton).toHaveText("Generate new pairing code");
+  await waitForAnimations(page);
+  await card.screenshot({ path: `${SCREENSHOT_DIR}/pairing-expired.png` });
+  await regenerateButton.click();
+  await expect(loadingSpinner).toBeVisible();
+  await expect(qrCode).toBeVisible();
+  await expect(copyButton).toBeVisible();
+  expect(
+    await page.evaluate(
+      () =>
+        (window.__BUZZ_E2E_COMMAND_LOG__ ?? []).filter(
+          (entry) => entry.command === "start_pairing",
+        ).length,
+    ),
+  ).toBe(2);
+
+  await waitForAnimations(page);
+  await card.screenshot({ path: `${SCREENSHOT_DIR}/pairing-card.png` });
   await qrCode.screenshot({ path: `${SCREENSHOT_DIR}/pairing-qr.png` });
 });
+
+test("late pairing events are ignored after canceling", async ({ page }) => {
+  await page.goto("/");
+  await page.getByTestId("open-settings").click();
+  await page.getByTestId("profile-popover-settings").click();
+  await page.getByTestId("settings-nav-mobile").click();
+
+  const card = page.getByTestId("mobile-pairing-card");
+  await card.getByTestId("start-pairing-button").click();
+  await expect(page.getByTestId("mobile-pairing-qr")).toBeVisible();
+
+  await emitPairingEvent(page, "pairing-sas-received", { sas: "123456" });
+  const dialog = page.getByTestId("mobile-pairing-dialog");
+  await expect(dialog).toBeVisible();
+  await dialog.getByRole("button", { name: "Close" }).click();
+
+  await expect(dialog).toHaveCount(0);
+  await expect(card.getByText("Pairing was canceled.")).toBeVisible();
+
+  await emitPairingEvent(page, "pairing-complete");
+  await emitPairingEvent(page, "pairing-sas-received", { sas: "654321" });
+
+  await expect(dialog).toHaveCount(0);
+  await expect(page.getByTestId("mobile-pairing-done")).toHaveCount(0);
+  await expect(card.getByText("Pairing was canceled.")).toBeVisible();
+});
diff --git a/desktop/tests/e2e/navigation.spec.ts b/desktop/tests/e2e/navigation.spec.ts
index 57d8c5f3b2..f7a96cd568 100644
--- a/desktop/tests/e2e/navigation.spec.ts
+++ b/desktop/tests/e2e/navigation.spec.ts
@@ -210,21 +210,21 @@ test("home inbox selection survives reload and back restores it", async ({
   expect(page.url()).not.toContain("item=");
   const defaultUrl = page.url();
 
-  const secondItem = items.nth(1);
-  const secondTestId = await secondItem.getAttribute("data-testid");
-  const secondItemId = secondTestId?.replace("home-inbox-item-", "");
-  expect(secondItemId).toBeTruthy();
-  await secondItem.click();
+  const selectedItem = items.first();
+  const selectedTestId = await selectedItem.getAttribute("data-testid");
+  const selectedItemId = selectedTestId?.replace("home-inbox-item-", "");
+  expect(selectedItemId).toBeTruthy();
+  await selectedItem.click();
   await expect
     .poll(() => page.url())
-    .toContain(`item=${encodeURIComponent(secondItemId ?? "")}`);
+    .toContain(`item=${encodeURIComponent(selectedItemId ?? "")}`);
 
   await page.reload();
 
   await expect(inboxList).toBeVisible();
   await expect(page.getByTestId("home-inbox-detail")).toBeVisible();
   expect(page.url()).toContain(
-    `item=${encodeURIComponent(secondItemId ?? "")}`,
+    `item=${encodeURIComponent(selectedItemId ?? "")}`,
   );
 
   await page.getByTestId("global-back").click();
diff --git a/desktop/tests/e2e/onboarding-agent-defaults.spec.ts b/desktop/tests/e2e/onboarding-agent-defaults.spec.ts
index d007bd6118..dbd726d179 100644
--- a/desktop/tests/e2e/onboarding-agent-defaults.spec.ts
+++ b/desktop/tests/e2e/onboarding-agent-defaults.spec.ts
@@ -57,9 +57,7 @@ async function readSavedRuntime(page: Parameters<typeof installMockBridge>[0]) {
   });
 }
 
-test("setup shows only Claude Code and Codex as detected harnesses", async ({
-  page,
-}) => {
+test("setup shows all bundled harnesses as detected", async ({ page }) => {
   await installMockBridge(
     page,
     {
@@ -77,10 +75,8 @@ test("setup shows only Claude Code and Codex as detected harnesses", async ({
 
   await expect(page.getByTestId("onboarding-runtime-claude")).toBeVisible();
   await expect(page.getByTestId("onboarding-runtime-codex")).toBeVisible();
-  await expect(page.getByTestId("onboarding-runtime-goose")).toHaveCount(0);
-  await expect(page.getByTestId("onboarding-runtime-buzz-agent")).toHaveCount(
-    0,
-  );
+  await expect(page.getByTestId("onboarding-runtime-goose")).toBeVisible();
+  await expect(page.getByTestId("onboarding-runtime-buzz-agent")).toBeVisible();
   await expect(page.getByRole("checkbox")).toHaveCount(0);
 });
 
@@ -96,8 +92,7 @@ test("setup distinguishes a missing CLI from an installed desktop app", async ({
           "not_installed",
           { status: "unknown" },
           {
-            install_hint:
-              "Buzz requires the Codex CLI; the desktop app alone is not enough.",
+            install_hint: "Buzz talks to Codex through the Codex CLI.",
             install_instructions_url:
               "https://developers.openai.com/codex/cli/",
           },
@@ -110,9 +105,7 @@ test("setup distinguishes a missing CLI from an installed desktop app", async ({
   await navigateToSetupPage(page);
 
   const card = page.getByTestId("onboarding-runtime-codex");
-  await expect(card).toContainText(
-    "CLI not detected; the desktop app alone isn’t enough.",
-  );
+  await expect(card).toContainText("CLI not detected.");
   await expect(card.getByTestId("onboarding-runtime-install-codex")).toHaveText(
     "INSTALL",
   );
@@ -559,8 +552,8 @@ test("defaults auto-selects the only ready visible harness", async ({
     page,
     {
       acpRuntimesCatalog: [
-        runtime("buzz-agent", "available", { status: "not_applicable" }),
-        runtime("goose", "available", { status: "not_applicable" }),
+        runtime("buzz-agent", "not_installed", { status: "not_applicable" }),
+        runtime("goose", "not_installed", { status: "not_applicable" }),
         runtime("claude", "available", { status: "logged_in" }),
         runtime("codex", "available", { status: "logged_out" }),
       ],
@@ -660,10 +653,10 @@ test("defaults requires a choice when multiple visible harnesses are ready", asy
   ).toBeVisible();
   await expect(
     page.getByTestId("global-agent-default-harness-option-goose"),
-  ).toHaveCount(0);
+  ).toBeVisible();
   await expect(
     page.getByTestId("global-agent-default-harness-option-buzz-agent"),
-  ).toHaveCount(0);
+  ).toBeVisible();
   await page.getByTestId("global-agent-default-harness-option-codex").click();
   await expect(harness).toHaveText("Codex");
   await expect(page.getByTestId("onboarding-finish")).toBeEnabled();
@@ -836,3 +829,89 @@ test("concurrent installs each keep their own state — one fails, one succeeds"
   });
   expect(hasHorizontalOverflow).toBe(false);
 });
+
+test("Finish stays disabled until a provider-required harness is fully configured", async ({
+  page,
+}) => {
+  await installMockBridge(
+    page,
+    {
+      acpRuntimesCatalog: [
+        runtime("buzz-agent", "available", { status: "not_applicable" }),
+      ],
+      discoverAgentModels: {
+        models: [{ id: "claude-sonnet-4", name: "Claude Sonnet 4" }],
+        supportsSwitching: true,
+      },
+      globalAgentConfig: {
+        env_vars: {},
+        provider: null,
+        model: null,
+        preferred_runtime: null,
+      },
+    },
+    { skipCommunitySeed: true, skipOnboardingSeed: true },
+  );
+  await page.goto("/");
+  await navigateToSetupPage(page);
+  await page.getByTestId("onboarding-setup-next").click();
+  await expect(page.getByTestId("onboarding-page-config")).toBeVisible();
+
+  // buzz-agent auto-selects as the only ready harness, but with no provider
+  // configured the default is not launchable — Finish must be gated.
+  await expect(page.getByTestId("global-agent-default-harness")).toHaveText(
+    "Buzz",
+  );
+  const finish = page.getByTestId("onboarding-finish");
+  await expect(finish).toBeDisabled();
+
+  // Configure provider + credential; model resolves via discovery/fallback.
+  await page.getByTestId("global-agent-provider").click();
+  await page.getByTestId("global-agent-provider-option-anthropic").click();
+  await page.getByTestId("persona-provider-api-key").fill("sk-test-key");
+
+  await expect(finish).toBeEnabled();
+  await finish.click();
+  await expect(page.getByText("Join or create a community")).toBeVisible();
+  expect(await readSavedRuntime(page)).toBe("buzz-agent");
+});
+
+test("baked build config keeps Finish enabled without manual provider setup", async ({
+  page,
+}) => {
+  await installMockBridge(
+    page,
+    {
+      acpRuntimesCatalog: [
+        runtime("buzz-agent", "available", { status: "not_applicable" }),
+      ],
+      bakedBuildEnv: [
+        { key: "BUZZ_AGENT_PROVIDER", masked: false, value: "databricks_v2" },
+        {
+          key: "DATABRICKS_HOST",
+          masked: false,
+          value: "https://example.cloud.databricks.com",
+        },
+        { key: "DATABRICKS_MODEL", masked: false, value: "baked-model" },
+      ],
+      globalAgentConfig: {
+        env_vars: {},
+        provider: null,
+        model: null,
+        preferred_runtime: null,
+      },
+    },
+    { skipCommunitySeed: true, skipOnboardingSeed: true },
+  );
+  await page.goto("/");
+  await navigateToSetupPage(page);
+  await page.getByTestId("onboarding-setup-next").click();
+  await expect(page.getByTestId("onboarding-page-config")).toBeVisible();
+
+  // Internal builds bake provider/model/credentials — the gate must treat
+  // baked config as complete and never block Finish.
+  await expect(page.getByTestId("global-agent-default-harness")).toHaveText(
+    "Buzz",
+  );
+  await expect(page.getByTestId("onboarding-finish")).toBeEnabled();
+});
diff --git a/desktop/tests/e2e/onboarding-backup.spec.ts b/desktop/tests/e2e/onboarding-backup.spec.ts
index 14f50e924f..9b49f8bf18 100644
--- a/desktop/tests/e2e/onboarding-backup.spec.ts
+++ b/desktop/tests/e2e/onboarding-backup.spec.ts
@@ -85,8 +85,13 @@ test("backup step back button returns to machine identity choice", async ({
   await expect(page.getByTestId("onboarding-page-backup")).toBeVisible();
   await page.getByTestId("onboarding-back").click();
 
+  // Backing out preserves the loaded key — primary CTA continues setup rather
+  // than minting another identity (#2318).
   await expect(
-    page.getByRole("button", { name: "Create a new identity key" }),
+    page.getByRole("button", { name: "Continue setup" }),
+  ).toBeVisible();
+  await expect(
+    page.getByRole("button", { name: "Use a different key instead" }),
   ).toBeVisible();
 });
 
diff --git a/desktop/tests/e2e/onboarding.spec.ts b/desktop/tests/e2e/onboarding.spec.ts
index bfbfc6f063..0c4d630994 100644
--- a/desktop/tests/e2e/onboarding.spec.ts
+++ b/desktop/tests/e2e/onboarding.spec.ts
@@ -1231,12 +1231,6 @@ test("first-community shows the scenario cards for localhost", async ({
 });
 
 test("first-community direct join reaches profile", async ({ page }) => {
-  await page.route(
-    "https://onboarding.communities.buzz.xyz/api/join-policy",
-    async (route) => {
-      await route.fulfill({ status: 404 });
-    },
-  );
   await seedActiveIdentity(page, BLANK_TYLER_IDENTITY);
   await page.addInitScript((pubkey) => {
     window.localStorage.setItem(
@@ -1289,12 +1283,6 @@ test("first-community direct join reaches profile", async ({ page }) => {
 test("first-community direct join cancel returns to request access", async ({
   page,
 }) => {
-  await page.route(
-    "https://onboarding.communities.buzz.xyz/api/join-policy",
-    async (route) => {
-      await route.fulfill({ status: 404 });
-    },
-  );
   await seedActiveIdentity(page, BLANK_TYLER_IDENTITY);
   await page.addInitScript((pubkey) => {
     window.localStorage.setItem(
diff --git a/desktop/tests/e2e/persona-env-vars.spec.ts b/desktop/tests/e2e/persona-env-vars.spec.ts
index 53efa09a0e..1e9b077a82 100644
--- a/desktop/tests/e2e/persona-env-vars.spec.ts
+++ b/desktop/tests/e2e/persona-env-vars.spec.ts
@@ -267,10 +267,10 @@ test("env vars editor renders in PersonaDialog new-persona form", async ({
 }) => {
   await gotoApp(page);
 
-  // Open the Agents view, click New > New agent to open the persona dialog.
+  // Open the Agents view, then choose Create agent from the new-agent menu.
   await page.getByTestId("open-agents-view").click();
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create from scratch" }).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 +315,7 @@ 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 from scratch" }).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 38d1df0914..508b123d7f 100644
--- a/desktop/tests/e2e/persona-model-combobox-screenshots.spec.ts
+++ b/desktop/tests/e2e/persona-model-combobox-screenshots.spec.ts
@@ -36,7 +36,7 @@ async function openNewPersonaDialog(page: import("@playwright/test").Page) {
   });
 
   await page.getByTestId("new-agent-card").click();
-  await page.getByRole("menuitem", { name: "Create from scratch" }).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/persona-sync.spec.ts b/desktop/tests/e2e/persona-sync.spec.ts
index 5dfa7e1a16..84b24f7eb7 100644
--- a/desktop/tests/e2e/persona-sync.spec.ts
+++ b/desktop/tests/e2e/persona-sync.spec.ts
@@ -14,6 +14,10 @@ const TYLER_PUBKEY =
 const D_TAG = "sync-test-persona";
 const KIND_PERSONA = 30175;
 const KIND_DELETION = 5;
+// The command scopes an inbound event to the community it arrived on. Under the
+// mock bridge the app subscribes on e2eBridge's DEFAULT_RELAY_WS_URL, so that is
+// the arrival relay these direct invocations stand in for.
+const ARRIVAL_RELAY_URL = "ws://localhost:3000";
 
 test.beforeEach(async ({ page }) => {
   await installMockBridge(page);
@@ -139,6 +143,7 @@ test("upsert round-trip: reconcile_inbound_persona_event writes record and emits
   // Drive the inbound reconcile path.
   await invokeTauri(page, "reconcile_inbound_persona_event", {
     eventJson: JSON.stringify(personaEvent),
+    arrivalRelayUrl: ARRIVAL_RELAY_URL,
   });
 
   // Assert the record landed on disk.
@@ -176,6 +181,7 @@ test("tombstone round-trip: reconcile_inbound_persona_event removes record and e
 
   await invokeTauri(page, "reconcile_inbound_persona_event", {
     eventJson: JSON.stringify(personaEvent),
+    arrivalRelayUrl: ARRIVAL_RELAY_URL,
   });
 
   // Step 2: confirm it landed.
@@ -202,6 +208,7 @@ test("tombstone round-trip: reconcile_inbound_persona_event removes record and e
 
   await invokeTauri(page, "reconcile_inbound_persona_event", {
     eventJson: JSON.stringify(tombstoneEvent),
+    arrivalRelayUrl: ARRIVAL_RELAY_URL,
   });
 
   // Step 4: assert the record is gone.
diff --git a/desktop/tests/e2e/profile.spec.ts b/desktop/tests/e2e/profile.spec.ts
index a945d159b2..596f9b0d40 100644
--- a/desktop/tests/e2e/profile.spec.ts
+++ b/desktop/tests/e2e/profile.spec.ts
@@ -936,10 +936,10 @@ test("renders agent profile ingress subviews from the Playwright mock bridge", a
   await expect(page.getByTestId("agent-memory-list")).toContainText("orphan");
 });
 
-test("restored activity deep link hides the back arrow", async ({ page }) => {
+test("restored Inbox deep link hides the back arrow", async ({ page }) => {
   // Charlie is a `bot` member of #agents and authors a seeded message there;
   // seeding a managed agent with the same pubkey makes that message's avatar
-  // open a managed-agent profile panel with the Activity ingress. Unlike an
+  // open a managed-agent profile panel with the Inbox ingress. Unlike an
   // agent created at runtime through the bridge, this seed survives
   // `page.reload()` because init scripts re-run on navigation.
   const agentPubkey = TEST_IDENTITIES.charlie.pubkey;
@@ -1542,6 +1542,6 @@ test("shows agent runtimes in agent settings", async ({ page }) => {
 
   await openSettings(page, "agents");
 
-  await expect(page.getByTestId("settings-agent-runtimes")).toBeVisible();
+  await expect(page.getByTestId("settings-harnesses")).toBeVisible();
   await expect(page.getByTestId("doctor-runtime-goose")).toContainText("Goose");
 });
diff --git a/desktop/tests/e2e/project-commit-detail.spec.ts b/desktop/tests/e2e/project-commit-detail.spec.ts
index 52c886a0d1..32cd807552 100644
--- a/desktop/tests/e2e/project-commit-detail.spec.ts
+++ b/desktop/tests/e2e/project-commit-detail.spec.ts
@@ -187,6 +187,16 @@ test("commit detail opens from the commits feed with a diff", async ({
   await expect(
     page.getByRole("button", { name: "Copy commit hash" }),
   ).toBeVisible();
+  await expect(
+    page.getByRole("link", { name: "project guide" }),
+  ).toHaveAttribute("href", "https://example.com/project-guide");
+  await expect(
+    page.getByRole("button", { name: "Architecture" }),
+  ).toBeVisible();
+  await expect(page.locator("video")).toHaveAttribute(
+    "src",
+    "https://example.com/project-demo.mp4",
+  );
 
   // Diff from the mocked get_project_repo_diff renders changed files.
   await expect(page.getByText("2 changed files")).toBeVisible({
diff --git a/desktop/tests/e2e/project-inbox.spec.ts b/desktop/tests/e2e/project-inbox.spec.ts
new file mode 100644
index 0000000000..bab417af6e
--- /dev/null
+++ b/desktop/tests/e2e/project-inbox.spec.ts
@@ -0,0 +1,146 @@
+import { expect, test } from "@playwright/test";
+
+import { waitForAnimations } from "../helpers/animations";
+import { installMockBridge, TEST_IDENTITIES } from "../helpers/bridge";
+
+const DEFAULT_MOCK_PUBKEY = "deadbeef".repeat(8);
+const BUZZ_REPO_ADDRESS = `30617:${DEFAULT_MOCK_PUBKEY}:buzz`;
+
+test("Buzz Git pull request renders and stays actionable in Inbox", async ({
+  page,
+}) => {
+  await page.addInitScript(() => {
+    window.localStorage.setItem(
+      "buzz-feature-overrides-v1",
+      JSON.stringify({ projects: true }),
+    );
+  });
+  await installMockBridge(page);
+  await page.setViewportSize({ width: 1024, height: 720 });
+
+  await page.goto("/", { waitUntil: "domcontentloaded" });
+  await page.getByTestId("open-projects-view").click();
+  await page.getByRole("button", { name: "Repositories", exact: true }).click();
+  await page
+    .locator(
+      '[data-testid="project-card-buzz"], [data-testid="project-row-buzz"]',
+    )
+    .first()
+    .click();
+  await page.getByRole("tab", { name: "Pull Request" }).click();
+
+  const alicePullRequest = page
+    .getByTestId("project-pull-request-row")
+    .filter({ hasText: "alice" })
+    .first();
+  await expect(alicePullRequest).toBeVisible({ timeout: 10_000 });
+  const pullRequestId = await alicePullRequest.getAttribute(
+    "data-project-event-id",
+  );
+  expect(pullRequestId).toBeTruthy();
+
+  await page.getByRole("button", { name: "Inbox", exact: true }).click();
+  await page.evaluate(
+    ({ author, id, repoAddress, viewer }) => {
+      window.__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__?.({
+        id,
+        kind: 1618,
+        pubkey: author,
+        content: "# Inbox rendering verification",
+        created_at: Math.floor(Date.now() / 1000) + 1,
+        channel_id: null,
+        channel_name: "",
+        channel_type: null,
+        tags: [
+          ["a", repoAddress],
+          ["p", viewer],
+          ["subject", "Inbox rendering verification"],
+        ],
+        category: "mention",
+      });
+    },
+    {
+      author: TEST_IDENTITIES.alice.pubkey,
+      id: pullRequestId as string,
+      repoAddress: BUZZ_REPO_ADDRESS,
+      viewer: DEFAULT_MOCK_PUBKEY,
+    },
+  );
+
+  const inboxRow = page.getByTestId(`home-inbox-item-${pullRequestId}`);
+  await expect(inboxRow).toBeVisible({ timeout: 10_000 });
+  const previewTypography = await inboxRow
+    .locator(".inbox-preview-markdown")
+    .evaluate((preview) => {
+      const firstBlock = preview.firstElementChild;
+      if (!firstBlock) {
+        throw new Error("Expected the Inbox preview to render a first block.");
+      }
+      const previewStyle = getComputedStyle(preview);
+      const firstBlockStyle = getComputedStyle(firstBlock);
+      return {
+        firstBlockTag: firstBlock.tagName,
+        fontSizeMatches: firstBlockStyle.fontSize === previewStyle.fontSize,
+        fontWeightMatches:
+          firstBlockStyle.fontWeight === previewStyle.fontWeight,
+        letterSpacingMatches:
+          firstBlockStyle.letterSpacing === previewStyle.letterSpacing,
+        lineHeightMatches:
+          firstBlockStyle.lineHeight === previewStyle.lineHeight,
+        lineClamp: firstBlockStyle.webkitLineClamp,
+      };
+    });
+  expect(previewTypography).toEqual({
+    firstBlockTag: "H1",
+    fontSizeMatches: true,
+    fontWeightMatches: true,
+    letterSpacingMatches: true,
+    lineHeightMatches: true,
+    lineClamp: "2",
+  });
+  await inboxRow.locator(":scope > div").first().click();
+
+  const detail = page.getByTestId("home-project-inbox-detail");
+  const card = page.getByTestId("project-inbox-work-item-card");
+  const layout = page.getByTestId("project-inbox-work-item-layout");
+  await expect(detail).toBeVisible();
+  await expect(card).toBeVisible();
+  await expect(
+    detail.locator('[data-testid^="project-inbox-author-avatar-"]'),
+  ).toBeVisible();
+  await expect(
+    detail.getByRole("heading", {
+      name: "alice sent you a pull request",
+      exact: true,
+    }),
+  ).toBeVisible();
+  await expect(page.getByText("Inbox rendering verification")).toBeVisible();
+  await expect(
+    page.getByRole("button", { name: "Approve", exact: true }),
+  ).toBeVisible();
+  const commentComposer = page.getByTestId(
+    "project-pull-request-comment-composer",
+  );
+  await commentComposer
+    .getByRole("button", { name: "Comment", exact: true })
+    .click();
+  await expect(
+    page.getByRole("menuitemradio", { name: "Request changes" }),
+  ).toBeVisible();
+  await page.keyboard.press("Escape");
+  await expect(
+    page.getByRole("button", { name: "Merge", exact: true }),
+  ).toBeVisible();
+
+  const columnCount = await layout.evaluate(
+    (element) =>
+      getComputedStyle(element).gridTemplateColumns.split(" ").filter(Boolean)
+        .length,
+  );
+  expect(columnCount).toBe(1);
+
+  await waitForAnimations(page);
+  await detail.screenshot({
+    path: "test-results/project-inbox/01-pull-request-detail.png",
+  });
+});
diff --git a/desktop/tests/e2e/reminders.spec.ts b/desktop/tests/e2e/reminders.spec.ts
index e6a5a55744..f60e224389 100644
--- a/desktop/tests/e2e/reminders.spec.ts
+++ b/desktop/tests/e2e/reminders.spec.ts
@@ -162,7 +162,11 @@ test.describe("reminders", () => {
     ]);
 
     await openRemindersFilter(page);
-    await expect(page.getByText("Follow up on this message")).toBeVisible();
+    await expect(
+      page
+        .getByTestId("home-reminder-item-rem-active-01")
+        .getByText("Follow up on this message"),
+    ).toBeVisible();
     await waitForAnimations(page);
   });
 
@@ -211,8 +215,16 @@ test.describe("reminders", () => {
     ]);
 
     await openRemindersFilter(page);
-    await expect(page.getByText("Reply to Alice")).toBeVisible();
-    await expect(page.getByRole("heading", { name: "Overdue" })).toBeVisible();
+    await expect(
+      page
+        .getByTestId("home-reminder-item-rem-overdue-01")
+        .getByText("Reply to Alice"),
+    ).toBeVisible();
+    await expect(
+      page
+        .getByTestId("home-reminder-item-rem-overdue-01")
+        .getByText("2h overdue"),
+    ).toBeVisible();
     await waitForAnimations(page);
   });
 });
@@ -306,7 +318,7 @@ test.describe("reminders phase 2 — author, source, navigation", () => {
       remindersPanel.getByText("alice", { exact: true }),
     ).toBeVisible();
     await expect(
-      remindersPanel.getByText("general", { exact: true }),
+      remindersPanel.getByText("#general", { exact: true }),
     ).toBeVisible();
     await expect(remindersPanel.getByText("Reply to Alice")).toBeVisible();
     await waitForAnimations(page);
@@ -328,9 +340,17 @@ test.describe("reminders phase 2 — author, source, navigation", () => {
     ]);
 
     await openRemindersFilter(page);
-    // The reminder row body is a button whose preview text is the target
-    // message preview; clicking it navigates to the message in its channel.
-    await page.getByText("Reply to Alice").click();
+    // Selecting a reminder keeps the list visible and opens its detail pane.
+    // Navigation is an explicit action from that detail.
+    await page
+      .getByTestId("home-reminder-item-rem-phase2-nav-01")
+      .getByRole("button")
+      .first()
+      .click();
+    await page
+      .getByTestId("home-reminder-detail")
+      .getByRole("button", { name: "Open message" })
+      .click();
 
     // Lands in the #general chat view with the target message in context.
     await expect(page.getByTestId("chat-title")).toHaveText("general");
diff --git a/desktop/tests/e2e/scroll-history.spec.ts b/desktop/tests/e2e/scroll-history.spec.ts
index 515669407e..5d7bb6e5bc 100644
--- a/desktop/tests/e2e/scroll-history.spec.ts
+++ b/desktop/tests/e2e/scroll-history.spec.ts
@@ -68,6 +68,61 @@ async function getMessagePosition(
   }, messageId);
 }
 
+test("channel switch settles at the newest message after virtualized rows measure", async ({
+  page,
+}) => {
+  await installMockBridge(page);
+  await page.goto("/");
+  await page.waitForFunction(
+    () => typeof window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__ === "function",
+  );
+
+  await page.evaluate(() => {
+    const base = Math.floor(Date.now() / 1000);
+    for (let index = 0; index < 80; index += 1) {
+      window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({
+        channelName: "general",
+        content: `switch-bottom ${index} ${"variable-height ".repeat(
+          index % 7,
+        )}`,
+        createdAt: base + index,
+      });
+    }
+  });
+
+  // Open another channel first so this exercises a real channel switch, where
+  // the virtualizer API is temporarily null while the keyed list remounts.
+  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 timeline = page.getByTestId("message-timeline");
+  await expect(timeline).toContainText("switch-bottom 79");
+  // Reflow a rendered row well after the removed 250ms settle deadline. The
+  // geometry-driven bottom intent must still chase the new physical floor.
+  await timeline.evaluate((element) => {
+    window.setTimeout(() => {
+      const row = element.querySelector<HTMLElement>("[data-message-id]");
+      if (row) {
+        row.style.minHeight = `${row.getBoundingClientRect().height + 240}px`;
+      }
+      element.dataset.delayedBottomReflow = "complete";
+    }, 600);
+  });
+  await expect(timeline).toHaveAttribute(
+    "data-delayed-bottom-reflow",
+    "complete",
+  );
+  await expect
+    .poll(async () => {
+      const metrics = await getTimelineMetrics(page);
+      return metrics.scrollHeight - metrics.clientHeight - metrics.scrollTop;
+    })
+    .toBeLessThanOrEqual(1);
+  await expect(page.getByTestId("message-scroll-to-latest")).toHaveCount(0);
+});
+
 test("first channel load paints the first window without waiting for the row-floor top-up", async ({
   page,
 }) => {
@@ -168,6 +223,7 @@ test("preserves user scroll while older channel history loads", async ({
   const scrollToTop = async () =>
     timeline.evaluate((element) => {
       const container = element as HTMLDivElement;
+      container.dispatchEvent(new WheelEvent("wheel", { deltaY: -1 }));
       container.scrollTop = 0;
       container.dispatchEvent(new Event("scroll", { bubbles: true }));
     });
@@ -454,11 +510,20 @@ test("does not teleport upward when user abandons fetch by jumping to bottom", a
     )
     .toBe("resolved");
 
-  const afterPrepend = await getTimelineMetrics(page);
-  // (a) Geometry: timeline still pinned to bottom.
-  expect(
-    afterPrepend.scrollTop + afterPrepend.clientHeight,
-  ).toBeGreaterThanOrEqual(afterPrepend.scrollHeight - 2);
+  // (a) Geometry: timeline settles back to bottom. The durable bottom owner
+  // batches ResizeObserver-driven geometry correction into requestAnimationFrame,
+  // so scrollHeight growth and the physical-floor write need not share a turn.
+  await expect
+    .poll(
+      async () => {
+        const metrics = await getTimelineMetrics(page);
+        return (
+          metrics.scrollTop + metrics.clientHeight >= metrics.scrollHeight - 2
+        );
+      },
+      { timeout: 2_000 },
+    )
+    .toBe(true);
 
   // (b) DOM: the last rendered [data-message-id] sits within 2px of the
   // timeline's bottom edge. This catches a class of bugs where the geometry
@@ -1641,6 +1706,7 @@ test("channel intro stays hidden while paginating past the timeline cap", async
   const scrollToTop = async () =>
     timeline.evaluate((element) => {
       const container = element as HTMLDivElement;
+      container.dispatchEvent(new WheelEvent("wheel", { deltaY: -1 }));
       container.scrollTop = 0;
       container.dispatchEvent(new Event("scroll", { bubbles: true }));
     });
diff --git a/desktop/tests/e2e/sidebar-relay-card.spec.ts b/desktop/tests/e2e/sidebar-relay-card.spec.ts
index 9505c0f10f..b9903614d2 100644
--- a/desktop/tests/e2e/sidebar-relay-card.spec.ts
+++ b/desktop/tests/e2e/sidebar-relay-card.spec.ts
@@ -84,6 +84,25 @@ async function setRelayConnectionState(
   }, state);
 }
 
+async function emitRelayConnectionState(
+  page: Page,
+  state: RelayConnectionState,
+) {
+  await page.evaluate((nextState) => {
+    const setConnectionState = (
+      window as Window & {
+        __BUZZ_E2E_SET_RELAY_CONNECTION_STATE__?: (
+          state: RelayConnectionState,
+        ) => void;
+      }
+    ).__BUZZ_E2E_SET_RELAY_CONNECTION_STATE__;
+    if (!setConnectionState) {
+      throw new Error("Mock relay connection state helper is not installed.");
+    }
+    setConnectionState(nextState);
+  }, state);
+}
+
 async function expectGenericReconnectCard(page: Page) {
   const card = page.getByTestId("sidebar-relay-unreachable");
   await expect(card).toBeVisible();
@@ -109,6 +128,55 @@ test("sidebar generic relay failures use the reconnect card", async ({
   await expectGenericReconnectCard(page);
 });
 
+test("relay outage notification stays dismissed through retries and re-arms after recovery", async ({
+  page,
+}) => {
+  await installMockBridge(page, { channelsReadError: CONNECT_ERROR });
+  await page.goto("/");
+  await setRelayConnectionState(page, "disconnected");
+
+  const card = await expectGenericReconnectCard(page);
+  await card
+    .getByRole("button", { name: "Dismiss relay notification" })
+    .click({ force: true });
+  await expect(card).toBeHidden();
+
+  // Retry churn is still the same outage: no successful connection occurred.
+  await emitRelayConnectionState(page, "connecting");
+  await emitRelayConnectionState(page, "disconnected");
+  await emitRelayConnectionState(page, "reconnecting");
+  await page.waitForTimeout(2_100);
+  await expect(card).toBeHidden();
+
+  // A successful connection ends the episode and re-arms the next outage.
+  await setChannelsReadError(page, null);
+  await emitRelayConnectionState(page, "connected");
+  await setChannelsReadError(page, CONNECT_ERROR);
+  await emitRelayConnectionState(page, "disconnected");
+  await expectGenericReconnectCard(page);
+});
+
+test("relay outage notification re-arms after same-URL lifecycle teardown", async ({
+  page,
+}) => {
+  await installMockBridge(page, { channelsReadError: CONNECT_ERROR });
+  await page.goto("/");
+  await setRelayConnectionState(page, "disconnected");
+
+  const card = await expectGenericReconnectCard(page);
+  await card
+    .getByRole("button", { name: "Dismiss relay notification" })
+    .click({ force: true });
+  await expect(card).toBeHidden();
+
+  // Community switches and reconnectCommunity() tear down the singleton to
+  // idle before applying the next lifecycle. The next lifecycle may reuse the
+  // same relay URL, so URL identity alone must not preserve the old dismissal.
+  await emitRelayConnectionState(page, "idle");
+  await emitRelayConnectionState(page, "disconnected");
+  await expectGenericReconnectCard(page);
+});
+
 test("sidebar proxy sign-in failures use the reconnect card", async ({
   page,
 }) => {
diff --git a/desktop/tests/e2e/sidebar.spec.ts b/desktop/tests/e2e/sidebar.spec.ts
index 6ff62a214a..f56c9575b7 100644
--- a/desktop/tests/e2e/sidebar.spec.ts
+++ b/desktop/tests/e2e/sidebar.spec.ts
@@ -111,24 +111,15 @@ test("add community starts with create and join choices", async ({ page }) => {
 test("automatically shows community join requirements near the community URL", async ({
   page,
 }) => {
-  await installMockBridge(page, { applyCommunityDelayMs: 1_000 });
-  await page.route(
-    "https://policy.example.com/api/join-policy",
-    async (route) => {
-      await route.fulfill({
-        status: 200,
-        contentType: "application/json",
-        body: JSON.stringify({
-          policy: {
-            terms_markdown: "# Terms",
-            privacy_markdown: "# Privacy",
-            age_attestation_required: true,
-            version: "policy-v1",
-          },
-        }),
-      });
+  await installMockBridge(page, {
+    applyCommunityDelayMs: 1_000,
+    joinPolicy: {
+      terms_markdown: "# Terms",
+      privacy_markdown: "# Privacy",
+      age_attestation_required: true,
+      version: "policy-v1",
     },
-  );
+  });
   await page.goto("/");
 
   await openAddCommunityDialog(page);
@@ -180,12 +171,6 @@ test("supports API tokens without cluttering the default join form", async ({
   page,
 }) => {
   await installMockBridge(page, { applyCommunityDelayMs: 1_000 });
-  await page.route(
-    "https://token.example.com/api/join-policy",
-    async (route) => {
-      await route.fulfill({ status: 404 });
-    },
-  );
   await page.goto("/");
 
   await openAddCommunityDialog(page);
diff --git a/desktop/tests/e2e/smoke.spec.ts b/desktop/tests/e2e/smoke.spec.ts
index d5ae2046db..0f61de0f7c 100644
--- a/desktop/tests/e2e/smoke.spec.ts
+++ b/desktop/tests/e2e/smoke.spec.ts
@@ -2,9 +2,6 @@ import { expect, test } from "@playwright/test";
 
 import { installMockBridge, openCreateChannelDialog } from "../helpers/bridge";
 
-const DEFAULT_AGENT_ACTIVITY_PUBKEY =
-  "db0b028cd36f4d3e36c8300cce87252c1f7fc9495ffecc53f393fcac341ffd36";
-
 async function getTimelineMetrics(page: import("@playwright/test").Page) {
   return page.getByTestId("message-timeline").evaluate((element) => {
     const timeline = element as HTMLDivElement;
@@ -72,7 +69,7 @@ async function expectHomeView(page: import("@playwright/test").Page) {
 
 async function selectHomeInboxFilter(
   page: import("@playwright/test").Page,
-  label: "Activity" | "Agents",
+  label: "Agents",
 ) {
   await page
     .getByTestId("home-inbox")
@@ -141,7 +138,7 @@ 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 from scratch" }).click();
+  await page.getByRole("menuitem", { name: "Create agent" }).click();
   await chooseSharedComputeProvider(page);
 
   await expect
@@ -156,7 +153,7 @@ test("Buzz shared compute explains automatic model selection", async ({
   await expect(page.locator("#persona-model")).toContainText("Automatic");
   await expect(
     page.getByText(
-      "Buzz will choose an available shared model when the agent starts.",
+      "Auto uses Mesh collective intelligence when two or more models stay available, otherwise it chooses one available model.",
     ),
   ).toBeVisible();
   await expect(page.locator("#persona-custom-model")).toHaveCount(0);
@@ -170,7 +167,7 @@ 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 from scratch" }).click();
+  await page.getByRole("menuitem", { name: "Create agent" }).click();
   await page.locator("#persona-display-name").fill(agentName);
 
   await chooseSharedComputeProvider(page);
@@ -214,7 +211,7 @@ 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 from scratch" }).click();
+  await page.getByRole("menuitem", { name: "Create agent" }).click();
 
   await page.locator("#persona-display-name").fill(agentName);
   await page
@@ -298,77 +295,23 @@ test("opens a mocked channel from the inbox feed", async ({ page }) => {
   await expect(page.getByTestId("chat-title")).toHaveText("general");
 });
 
-test("inbox feed shows channel and agent activity sections", async ({
+test("Inbox excludes generic channel and unowned agent traffic", async ({
   page,
 }) => {
   const inboxList = page.getByTestId("home-inbox-list");
 
   await page.goto("/");
+  await expectHomeView(page);
 
-  await selectHomeInboxFilter(page, "Activity");
-  await expect(inboxList).toContainText(
+  await expect(inboxList).not.toContainText(
     "Engineering shipped the desktop build.",
   );
+  await expect(inboxList).not.toContainText(
+    "Agent progress: channel index complete.",
+  );
 
   await selectHomeInboxFilter(page, "Agents");
-  await expect(inboxList).toContainText(
-    "Agent progress: channel index complete.",
-  );
-  await inboxList.getByText("Agent progress: channel index complete.").click();
-  await expect(page.getByTestId("home-inbox-detail")).toContainText(
-    "Agent progress: channel index complete.",
-  );
-});
-
-test("inbox agent hover hides actions without agent access", async ({
-  page,
-}) => {
-  await page.goto("/");
-
-  await selectHomeInboxFilter(page, "Agents");
-  const agentRow = page.getByTestId("home-inbox-item-mock-feed-agent");
-  await expect(agentRow).toContainText(
-    "Agent progress: channel index complete.",
-  );
-
-  await agentRow.getByTestId("home-inbox-avatar-mock-feed-agent").hover();
-  const profilePopover = page.locator(
-    '[data-testid="user-profile-popover"][data-state="open"]',
-  );
-  await expect(profilePopover).toBeVisible();
-  await expect(
-    profilePopover.getByTestId(
-      `user-profile-popover-message-${DEFAULT_AGENT_ACTIVITY_PUBKEY}`,
-    ),
-  ).toHaveCount(0);
-  await expect(
-    profilePopover.getByTestId(
-      `user-profile-popover-wave-${DEFAULT_AGENT_ACTIVITY_PUBKEY}`,
-    ),
-  ).toHaveCount(0);
-  await expect(
-    profilePopover.getByTestId(
-      `user-profile-popover-huddle-${DEFAULT_AGENT_ACTIVITY_PUBKEY}`,
-    ),
-  ).toHaveCount(0);
-});
-
-test("opens a mocked forum activity item from the inbox feed", async ({
-  page,
-}) => {
-  await page.goto("/");
-
-  await selectHomeInboxFilter(page, "Activity");
-  await expect(page.getByTestId("home-inbox-list")).toContainText(
-    "Engineering shipped the desktop build.",
-  );
-  await page
-    .getByTestId("home-inbox-list")
-    .getByText("Engineering shipped the desktop build.")
-    .click();
-  await expect(page.getByTestId("home-inbox-detail")).toContainText(
-    "Engineering shipped the desktop build.",
-  );
+  await expect(inboxList).toContainText("No agent updates found");
 });
 
 test("inbox feed renders resolved author labels", async ({ page }) => {
@@ -634,6 +577,9 @@ test("does not shift the timeline when the composer grows", async ({
   await page.waitForTimeout(400);
   await page.getByTestId("message-timeline").evaluate((element) => {
     const timeline = element as HTMLDivElement;
+    // The raw position assignment sets up detached history, while wheel is the
+    // same ownership signal a real reader produces before composer reflow.
+    timeline.dispatchEvent(new WheelEvent("wheel", { deltaY: -100 }));
     timeline.scrollTop = 0;
     timeline.dispatchEvent(new Event("scroll"));
   });
diff --git a/desktop/tests/e2e/team-snapshot.spec.ts b/desktop/tests/e2e/team-snapshot.spec.ts
index c04a040047..6246c7ac8c 100644
--- a/desktop/tests/e2e/team-snapshot.spec.ts
+++ b/desktop/tests/e2e/team-snapshot.spec.ts
@@ -271,7 +271,7 @@ test("team sharing uses the people picker and gates memory before sending", asyn
       `team-share-recipient-option-${TEST_IDENTITIES.charlie.pubkey}`,
     )
     .click();
-  await shareDialog.getByTestId("team-share-recipient-access").click();
+  await shareDialog.getByTestId("team-share-share-level").click();
   await page.getByRole("menuitemradio", { name: "Team + core memory" }).click();
   await shareDialog.getByTestId("team-share-send").click();
 
@@ -311,6 +311,73 @@ test("team sharing uses the people picker and gates memory before sending", asyn
   expect(sendPayload?.content).not.toContain("![image](");
 });
 
+test("team share level carries memories onto the link path too", async ({
+  page,
+}) => {
+  await page.context().grantPermissions(["clipboard-read", "clipboard-write"]);
+  await installMockBridge(page, {
+    personas: [
+      {
+        id: ANALYST_PERSONA_ID,
+        displayName: "Analyst",
+        systemPrompt: "You are an analyst.",
+      },
+    ],
+    managedAgents: [
+      {
+        pubkey: ANALYST_PUBKEY,
+        name: "Analyst",
+        personaId: ANALYST_PERSONA_ID,
+        status: "running",
+      },
+    ],
+    agentMemory: createMockAgentMemoryListing(),
+    uploadDescriptors: [MOCK_UPLOAD_DESCRIPTOR],
+  });
+  await gotoAgentsPage(page);
+
+  await page.getByLabel("Engineering team actions").click();
+  await page.getByRole("menuitem", { name: "Share" }).click();
+  const shareDialog = page.getByTestId("team-share-dialog");
+  await expect(shareDialog).toBeVisible();
+
+  // No recipient selected — the copy-link path alone must still honour the
+  // shared selector and gate plaintext memories behind the confirmation.
+  await shareDialog.getByTestId("team-share-share-level").click();
+  await page.getByRole("menuitemradio", { name: "Team + core memory" }).click();
+  await expect(
+    shareDialog.getByTestId("team-share-memory-warning"),
+  ).toBeVisible();
+  await shareDialog.getByTestId("team-share-copy-link").click();
+
+  const memoryConfirmation = page.getByTestId("team-share-memory-confirmation");
+  await expect(memoryConfirmation).toBeVisible();
+  await expect(memoryConfirmation).toContainText("plaintext core memory");
+  await expect(memoryConfirmation).toContainText(
+    "Anyone with the link can view it.",
+  );
+  const encodeLevelsBeforeConfirmation = (await readCommandLog(page))
+    .filter((entry) => entry.command === "encode_team_snapshot_for_send")
+    .map(
+      (entry) =>
+        (entry.payload as { memoryLevel?: string } | undefined)?.memoryLevel,
+    );
+  expect(encodeLevelsBeforeConfirmation).toEqual([]);
+
+  await memoryConfirmation.getByTestId("team-share-memory-confirm").click();
+  await expect(shareDialog.getByTestId("team-share-copy-link")).toContainText(
+    "Copied",
+  );
+  expect(
+    (await readCommandLog(page)).filter(
+      (entry) =>
+        entry.command === "encode_team_snapshot_for_send" &&
+        (entry.payload as { memoryLevel?: string } | undefined)?.memoryLevel ===
+          "core",
+    ),
+  ).toHaveLength(1);
+});
+
 test("team sharing keeps link copy and export in the shared surface", async ({
   page,
 }) => {
@@ -343,7 +410,7 @@ test("team sharing keeps link copy and export in the shared surface", async ({
   await menu.getByRole("menuitem", { name: "Share" }).click();
 
   const shareDialog = page.getByTestId("team-share-dialog");
-  await expect(shareDialog.getByTestId("team-share-link-access")).toHaveText(
+  await expect(shareDialog.getByTestId("team-share-share-level")).toHaveText(
     "Team only",
   );
   const exportTeamRow = shareDialog.getByTestId("team-share-export");
@@ -351,7 +418,7 @@ test("team sharing keeps link copy and export in the shared surface", async ({
   const recipientSearch = shareDialog.getByTestId(
     "team-share-recipient-search",
   );
-  const linkAccess = shareDialog.getByTestId("team-share-link-access");
+  const shareLevel = shareDialog.getByTestId("team-share-share-level");
   const closeButton = shareDialog.getByRole("button", { name: "Close" });
   await waitForAnimations(page);
   await expect(
@@ -363,7 +430,7 @@ test("team sharing keeps link copy and export in the shared surface", async ({
   await expect(copyLinkButton).toContainText("Copying…");
   await expect(copyLinkButton).toHaveCSS("opacity", "1");
   await expect(recipientSearch).toBeEnabled();
-  await expect(linkAccess).toBeEnabled();
+  await expect(shareLevel).toBeEnabled();
   await expect(closeButton).toBeDisabled();
   await expect(exportTeamRow).toBeDisabled();
   await expect(exportTeamRow).toHaveCSS("opacity", "1");
diff --git a/desktop/tests/e2e/timeline-no-shift.spec.ts b/desktop/tests/e2e/timeline-no-shift.spec.ts
index b123a67418..7065d29378 100644
--- a/desktop/tests/e2e/timeline-no-shift.spec.ts
+++ b/desktop/tests/e2e/timeline-no-shift.spec.ts
@@ -481,6 +481,7 @@ test("timeline prepend plus late row reflow keeps the reading row stable", async
   await page.waitForTimeout(100);
   await timeline.evaluate((element) => {
     const scroller = element as HTMLDivElement;
+    scroller.dispatchEvent(new WheelEvent("wheel", { deltaY: -1 }));
     scroller.scrollTop = 150;
     scroller.dispatchEvent(new Event("scroll", { bubbles: true }));
   });
diff --git a/desktop/tests/e2e/virtualization.spec.ts b/desktop/tests/e2e/virtualization.spec.ts
index 31800ae7e5..61a2753baa 100644
--- a/desktop/tests/e2e/virtualization.spec.ts
+++ b/desktop/tests/e2e/virtualization.spec.ts
@@ -252,6 +252,29 @@ test.describe("list virtualization", () => {
       });
       await page.waitForTimeout(150);
       const before = await sampleVisibleAnchor();
+      const ctrlWheelPromise =
+        pageIndex === 0
+          ? timeline.evaluate(
+              (scroller) =>
+                new Promise<boolean>((resolve) => {
+                  const s = scroller as HTMLElement;
+                  const observer = new MutationObserver(() => {
+                    observer.disconnect();
+                    // Ctrl+wheel is browser zoom, not reader scroll intent. Fire
+                    // it synchronously with the prepend DOM commit, before the
+                    // ResizeObserver measurement batch reconciles estimated rows.
+                    s.dispatchEvent(
+                      new WheelEvent("wheel", { ctrlKey: true, deltaY: -100 }),
+                    );
+                    resolve(true);
+                  });
+                  observer.observe(s.firstElementChild ?? s, {
+                    childList: true,
+                    subtree: true,
+                  });
+                }),
+            )
+          : Promise.resolve(false);
       const wheelTracePromise = timeline.evaluate(async (scroller) => {
         const s = scroller as HTMLElement;
         let previousScrollTop = s.scrollTop;
@@ -335,6 +358,7 @@ test.describe("list virtualization", () => {
         },
       );
       expect(motion.sawPrepend).toBe(true);
+      if (pageIndex === 0) expect(await ctrlWheelPromise).toBe(true);
       expect(motion.maxDrift).toBeLessThan(5);
 
       await expect
@@ -357,11 +381,10 @@ test.describe("list virtualization", () => {
         await timeline.evaluate((element) => element.clientHeight),
       );
 
-      // Leave the boundary with real downward wheel input while this prepend's
-      // three-second semantic-anchor watcher is still alive. The watcher belongs
-      // only to the completed prepend: it must not reinterpret this deliberate
-      // reader movement as row drift and pull the viewport back toward its stale
-      // baseline before the next upward load.
+      // Leave the boundary with real downward wheel input after this prepend.
+      // That reader intent retires Virtua's active prepend reconciliation, so
+      // later row measurements must not pull the viewport back toward the
+      // completed prepend before the next upward load.
       const exitTracePromise = timeline.evaluate(async (scroller) => {
         const s = scroller as HTMLElement;
         const startScrollTop = s.scrollTop;
@@ -667,6 +690,10 @@ test("offscreen rich-row resize preserves the viewport-center anchor", async ({
 
   const result = await timeline.evaluate(async (element) => {
     const scroller = element as HTMLDivElement;
+    // Retire bottom-follow intent the same way real reader input does before
+    // moving into detached history. A raw scrollTop assignment alone is not
+    // user intent and would correctly leave bottom following armed.
+    scroller.dispatchEvent(new WheelEvent("wheel", { deltaY: -1 }));
     scroller.scrollTop = scroller.scrollHeight / 2;
     scroller.dispatchEvent(new Event("scroll", { bubbles: true }));
     await new Promise((resolve) => setTimeout(resolve, 250));
diff --git a/desktop/tests/helpers/bridge.ts b/desktop/tests/helpers/bridge.ts
index bd2a567e4c..ec2345ff56 100644
--- a/desktop/tests/helpers/bridge.ts
+++ b/desktop/tests/helpers/bridge.ts
@@ -1,5 +1,5 @@
 import type { Page } from "@playwright/test";
-import type { ChannelTemplate } from "../../src/shared/api/types";
+import type { ChannelTemplate, RelayEvent } from "../../src/shared/api/types";
 import { FEATURE_OVERRIDES_STORAGE_KEY, PREVIEW_FEATURE_IDS } from "./features";
 
 export const TEST_IDENTITIES = {
@@ -88,7 +88,9 @@ type MockPersonaSeed = {
   displayName: string;
   avatarUrl?: string | null;
   systemPrompt: string;
+  updatedAt?: string;
   isActive?: boolean;
+  shared?: boolean;
   sourceTeam?: string | null;
   envVars?: Record<string, string>;
   /**
@@ -103,6 +105,8 @@ type MockPersonaSeed = {
   /** Provider pinned on the persona. Leave empty for Codex/Claude runtimes. */
   provider?: string | null;
   namePool?: string[];
+  respondTo?: "owner-only" | "allowlist" | "anyone";
+  respondToAllowlist?: string[];
 };
 
 type MockTeamSeed = {
@@ -190,6 +194,13 @@ type MockBridgeOptions = {
   relaySelf?: string | null;
   /** Builderlab account returned by hosted-community onboarding. Null/omitted = signed out. */
   builderlabAuth?: { email?: string; name?: string; expiresAt: string } | null;
+  /** Optional policy returned by the native join-policy discovery command. */
+  joinPolicy?: {
+    terms_markdown?: string;
+    privacy_markdown?: string;
+    age_attestation_required: boolean;
+    version: string;
+  } | null;
   /** Bound Builderlab Nostr identity. Null/omitted = not linked yet. */
   builderlabIdentity?: { npub?: string; pubkey_hex?: string } | null;
   /** Communities owned by the mocked Builderlab account. */
@@ -210,6 +221,8 @@ type MockBridgeOptions = {
   acpRuntimesDelayMs?: number;
   acpAuthMethods?: Record<string, { methods: Record<string, unknown>[] }>;
   acpAuthMethodsError?: string;
+  /** When set, the `delete_custom_harness` mock command throws with this message. */
+  deleteCustomHarnessError?: string;
   connectAcpRuntimeResult?: { launched: boolean };
   connectAcpRuntimeDelayMs?: number;
   connectAcpRuntimeError?: string;
@@ -267,6 +280,10 @@ type MockBridgeOptions = {
       | "stopped";
   }>;
   personas?: MockPersonaSeed[];
+  /** Community catalog replaceable-event heads returned by relay queries. */
+  personaCatalogEvents?: RelayEvent[];
+  /** Outcomes for successive explicit persona share publications. */
+  personaSharePublicationStatuses?: Array<"published" | "queued">;
   teams?: MockTeamSeed[];
   relayAgents?: MockRelayAgentSeed[];
   agentListDelayMs?: number;
@@ -371,6 +388,8 @@ type MockBridgeOptions = {
   oaOwnerIsMe?: boolean;
   /** Whether the mock relay advertises NIP-43 membership support. Defaults to false. */
   relayRequiresMembership?: boolean;
+  /** Delay EOSE for membership snapshots after delivering the event. */
+  relayMembershipEoseDelayMs?: number;
   /**
    * Active identity's role in the seeded `mockRelayMembers`. `null` removes
    * the active identity from the membership list entirely (admin-path branch
@@ -390,6 +409,8 @@ type MockBridgeOptions = {
   /** Delay (ms) applied to `get_relay_self` so E2E tests can prove the
    *  fail-closed race: DMs are withheld while classification is unresolved. */
   relaySelfDelayMs?: number;
+  /** Delay (ms) applied to `start_pairing` so pairing loading UI is observable. */
+  pairingStartDelayMs?: number;
   /**
    * Sequenced results for `confirm_team_snapshot_import`. String = throw
    * with that message; null = succeed. Call N uses results[N]; last entry
diff --git a/lefthook.yml b/lefthook.yml
index 2d3e921278..75d205722f 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -9,6 +9,9 @@
 #   drops deleted paths from push-file discovery (`extractFiles` existence
 #   check, repository.go). CI's dorny/paths-filter catches deletions.
 #   Deliberate — accepted, not worked around.
+# - `commit-msg` has no glob: it rewrites the commit message, not files. Note
+#   Git only runs it for `git commit` and `git merge` — other flows need their own
+#   flag: `git rebase --signoff`, `git cherry-pick -s`.
 pre-commit:
   parallel: true
   commands:
@@ -34,6 +37,14 @@ pre-commit:
       run: just mobile-fix
       stage_fixed: true
 
+# Appends the DCO Signed-off-by trailer the required "DCO Check" enforces.
+# `--if-exists doNothing` makes it idempotent and preserves an existing
+# sign-off (including `git commit -s` and a different signer's trailer).
+commit-msg:
+  commands:
+    signoff:
+      run: 'git interpret-trailers --if-exists doNothing --trailer "Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed ''s/ [0-9]* [+-][0-9]*$//'')" --in-place {1}'
+
 pre-push:
   parallel: true
   commands:
@@ -50,12 +61,12 @@ pre-push:
       glob: ["desktop/**", "pnpm-lock.yaml"]
       exclude: ["desktop/src-tauri/**"]
       run: just desktop-test
-    desktop-tauri-test:
-      # ci.yml:113 — Desktop Core triggers on `rust` OR `desktop-rust`;
-      # desktop/src-tauri path-depends on crates/buzz-core, buzz-persona,
-      # buzz-sdk, buzz-agent (desktop/src-tauri/Cargo.toml:88-91).
+    desktop-tauri-checks:
+      # Keep local lint parity with Desktop Core CI for every path that can
+      # affect the Tauri crate or its path dependencies. Run clippy and tests
+      # serially so parallel pre-push hooks do not contend for Cargo's lock.
       glob: ["desktop/src-tauri/**", "crates/**", "migrations/**", "schema/**", "Cargo.toml", "Cargo.lock", "rust-toolchain.toml", "deny.toml", "scripts/run-tests.sh", "justfile"]
-      run: just desktop-tauri-test
+      run: just desktop-tauri-clippy && just desktop-tauri-test
     mobile-test:
       glob: ["mobile/**"]
       run: just mobile-test
diff --git a/migrations/0025_relay_invites.sql b/migrations/0025_relay_invites.sql
new file mode 100644
index 0000000000..618c0c84d3
--- /dev/null
+++ b/migrations/0025_relay_invites.sql
@@ -0,0 +1,33 @@
+-- Use-limited invite links: durable invite records for atomic redemption.
+--
+-- Stateless HMAC bearer tokens (v1) cannot enforce use limits: their signed
+-- payload is immutable and no invite row exists to record consumption. This
+-- migration introduces a durable `relay_invites` table that stores only the
+-- SHA-256 hash of an opaque v2 code, never the reusable bearer secret itself.
+--
+-- Every lookup binds both (community_id, token_hash) so a code presented on
+-- the wrong tenant host returns Invalid — there is no cross-tenant lookup by
+-- hash alone. `FOR UPDATE` during claim serializes concurrent claims for one
+-- invite across relay processes; membership insertion, join-policy evidence,
+-- and use_count increment share a single commit so exactly one claimant can
+-- win the final slot.
+--
+-- max_uses is optional: NULL means unlimited (preserving current behavior).
+-- use_count is always incremented for new members, even when unlimited, for
+-- observability. role is pinned to 'member' — invite links never grant admin.
+CREATE TABLE relay_invites (
+    community_id  UUID        NOT NULL REFERENCES communities(id),
+    id           UUID        NOT NULL DEFAULT gen_random_uuid(),
+    token_hash   BYTEA       NOT NULL CHECK (length(token_hash) = 32),
+    role         TEXT        NOT NULL DEFAULT 'member' CHECK (role = 'member'),
+    max_uses     INTEGER     CHECK (max_uses BETWEEN 1 AND 10000),
+    use_count    INTEGER     NOT NULL DEFAULT 0 CHECK (use_count >= 0),
+    expires_at   TIMESTAMPTZ NOT NULL,
+    created_by   TEXT        NOT NULL,
+    created_at   TIMESTAMPTZ NOT NULL DEFAULT now(),
+    PRIMARY KEY (community_id, id),
+    UNIQUE (community_id, token_hash),
+    CHECK (max_uses IS NULL OR use_count <= max_uses)
+);
+
+CREATE INDEX relay_invites_expires_at_idx ON relay_invites (expires_at);
diff --git a/mobile/README.md b/mobile/README.md
index d96c0b1a14..ada0568e28 100644
--- a/mobile/README.md
+++ b/mobile/README.md
@@ -19,6 +19,40 @@ just mobile-dev
 cd mobile && flutter run
 ```
 
+### Worktree-aware debug identity
+
+Debug builds produced from a git worktree get a unique app identifier keyed
+to the **worktree directory name** (`com.buzz.buzzMobile.<slug>` on iOS,
+`xyz.block.buzz.mobile.<slug>` on Android) plus a display-only branch label
+in the app name (`Buzz (my-branch)`, or a short SHA when the worktree is
+detached). Because the identifier follows the directory rather than the
+branch, one worktree keeps exactly one installed app — and its login state —
+across branch switches, and builds from multiple worktrees install side by
+side, mirroring the desktop dev experience. Release and profile builds
+always keep the production identity and name.
+
+`just mobile-dev` and `just mobile-build-android` apply this automatically by
+running `scripts/mobile-worktree-overrides.sh`, which writes two gitignored
+files:
+
+- `mobile/ios/Flutter/WorktreeOverrides.xcconfig` (included by Debug builds
+  only; a developer's `AppOverrides.xcconfig` is included after it, so
+  app-specific overrides like a personal `BUNDLE_IDENTIFIER` for device
+  signing always win)
+- `mobile/android/worktree.properties` (read by the debug build type only)
+
+For direct Xcode / Android Studio / `flutter run` development, run
+`./scripts/mobile-worktree-overrides.sh` from the repo root once per branch
+switch to refresh the display label (the install identity never changes);
+the persisted files are then picked up by any subsequent build. In the main
+checkout the script is a no-op that removes stale override files, restoring
+the plain `Buzz` identity.
+
+To remove leftover worktree-suffixed installs from booted iOS simulators and
+connected Android emulators, run `just mobile-clean` (add `--dry-run` via
+`./scripts/mobile-worktree-clean.sh --dry-run` to preview). Production
+installs are never touched.
+
 ## Checks
 
 ```bash
diff --git a/mobile/android/.gitignore b/mobile/android/.gitignore
index be3943c96d..32f598b0fe 100644
--- a/mobile/android/.gitignore
+++ b/mobile/android/.gitignore
@@ -6,6 +6,7 @@ gradle-wrapper.jar
 /local.properties
 GeneratedPluginRegistrant.java
 .cxx/
+/worktree.properties
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/to/reference-keystore
diff --git a/mobile/android/app/build.gradle.kts b/mobile/android/app/build.gradle.kts
index b3de0e9e77..501a31c46f 100644
--- a/mobile/android/app/build.gradle.kts
+++ b/mobile/android/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -19,6 +21,31 @@ val uploadSigningValues =
 val missingUploadSigningValues = uploadSigningValues.filterValues { it.isNullOrBlank() }.keys
 val hasUploadSigning = missingUploadSigningValues.isEmpty()
 
+// Worktree-aware debug identity (gitignored, written by
+// scripts/mobile-worktree-overrides.sh): debug builds from a git worktree get a
+// branch-labelled app name and a unique applicationId suffix so builds from
+// multiple worktrees install side by side. Release builds never read this.
+val worktreePropsFile = rootProject.file("worktree.properties")
+val worktreeProps =
+    Properties().apply {
+        if (worktreePropsFile.isFile) worktreePropsFile.inputStream().use { load(it) }
+    }
+val worktreeLabel = worktreeProps.getProperty("label")?.takeIf { it.isNotBlank() }
+if (worktreeLabel != null && !worktreeLabel.matches(Regex("""[A-Za-z0-9._-]+"""))) {
+    throw GradleException(
+        "worktree.properties label must match [A-Za-z0-9._-]+ (safe for string " +
+            "resources), got: " + worktreeLabel,
+    )
+}
+val worktreeIdSuffix =
+    worktreeProps.getProperty("applicationIdSuffix")?.takeIf { it.isNotBlank() }
+if (worktreeIdSuffix != null && !worktreeIdSuffix.matches(Regex("""\.[a-z][a-z0-9_]*"""))) {
+    throw GradleException(
+        "worktree.properties applicationIdSuffix must match \\.[a-z][a-z0-9_]*, got: " +
+            worktreeIdSuffix,
+    )
+}
+
 // Release signing modes:
 //   - "upload-keystore" (default): sign with the CI-vended upload keystore;
 //     release builds fail loudly when any credential is missing.
@@ -64,6 +91,7 @@ android {
         versionCode = flutter.versionCode
         versionName = flutter.versionName
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        resValue("string", "app_name", "Buzz")
     }
 
     signingConfigs {
@@ -78,6 +106,16 @@ android {
     }
 
     buildTypes {
+        debug {
+            // Only debug builds take the worktree identity; release/profile
+            // keep the production applicationId and label.
+            if (worktreeIdSuffix != null) {
+                applicationIdSuffix = worktreeIdSuffix
+            }
+            if (worktreeLabel != null) {
+                resValue("string", "app_name", "Buzz ($worktreeLabel)")
+            }
+        }
         release {
             if (hasUploadSigning) {
                 signingConfig = signingConfigs.getByName("upload")
diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index 93c3f12831..5e607ad2ea 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -1,8 +1,20 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32"
+        tools:replace="android:maxSdkVersion" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
     <application
-        android:label="Buzz"
+        android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/mobile/android/app/src/main/kotlin/xyz/block/buzz/mobile/MainActivity.kt b/mobile/android/app/src/main/kotlin/xyz/block/buzz/mobile/MainActivity.kt
index 47582fc08c..8718ffd8e2 100644
--- a/mobile/android/app/src/main/kotlin/xyz/block/buzz/mobile/MainActivity.kt
+++ b/mobile/android/app/src/main/kotlin/xyz/block/buzz/mobile/MainActivity.kt
@@ -97,6 +97,9 @@ class MainActivity : FlutterActivity() {
                     TRANSCODE_VIDEO_TO_MP4_METHOD -> {
                         handleTranscodeVideoToMp4(call.arguments, result)
                     }
+                    REQUIRES_LEGACY_MEDIA_STORAGE_PERMISSION_METHOD -> {
+                        result.success(Build.VERSION.SDK_INT <= Build.VERSION_CODES.P)
+                    }
                     else -> result.notImplemented()
                 }
             }
@@ -284,5 +287,7 @@ class MainActivity : FlutterActivity() {
         private const val SANITIZE_IMAGE_FOR_UPLOAD_METHOD = "sanitizeImageForUpload"
         private const val TRANSCODE_IMAGE_TO_JPEG_METHOD = "transcodeImageToJpeg"
         private const val TRANSCODE_VIDEO_TO_MP4_METHOD = "transcodeVideoToMp4"
+        private const val REQUIRES_LEGACY_MEDIA_STORAGE_PERMISSION_METHOD =
+            "requiresLegacyMediaStoragePermission"
     }
 }
diff --git a/mobile/android/app/src/main/res/drawable/ic_launcher_foreground_inset.xml b/mobile/android/app/src/main/res/drawable/ic_launcher_foreground_inset.xml
new file mode 100644
index 0000000000..498331a328
--- /dev/null
+++ b/mobile/android/app/src/main/res/drawable/ic_launcher_foreground_inset.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@mipmap/ic_launcher_foreground"
+    android:inset="10%" />
diff --git a/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 2ffbf24b68..1166cab22d 100644
--- a/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground_inset"/>
   <background android:drawable="@color/ic_launcher_background"/>
-</adaptive-icon>
\ No newline at end of file
+</adaptive-icon>
diff --git a/mobile/android/settings.gradle.kts b/mobile/android/settings.gradle.kts
index 1047f1a60e..6d15bcfeea 100644
--- a/mobile/android/settings.gradle.kts
+++ b/mobile/android/settings.gradle.kts
@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
     id("com.android.application") version "8.11.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
 }
 
 include(":app")
diff --git a/mobile/ios/.gitignore b/mobile/ios/.gitignore
index 6547384f35..950d73854f 100644
--- a/mobile/ios/.gitignore
+++ b/mobile/ios/.gitignore
@@ -17,6 +17,7 @@ xcuserdata
 **/.generated/
 Flutter/App.framework
 Flutter/AppOverrides.xcconfig
+Flutter/WorktreeOverrides.xcconfig
 Flutter/Flutter.framework
 Flutter/Flutter.podspec
 Flutter/Generated.xcconfig
diff --git a/mobile/ios/Flutter/Debug.xcconfig b/mobile/ios/Flutter/Debug.xcconfig
index 70d2be7ce4..1f35905051 100644
--- a/mobile/ios/Flutter/Debug.xcconfig
+++ b/mobile/ios/Flutter/Debug.xcconfig
@@ -6,4 +6,16 @@
 // `mobile/ios/Flutter/AppOverrides.xcconfig` containing
 // `BUNDLE_IDENTIFIER = your.app.id` (gitignored).
 BUNDLE_IDENTIFIER = com.buzz.buzzMobile
+APP_DISPLAY_NAME = Buzz
+
+// Worktree-aware debug identity (gitignored, written by
+// scripts/mobile-worktree-overrides.sh): a per-worktree bundle identifier
+// and a branch-labelled display name so debug builds from multiple worktrees
+// install side by side. Release and Profile builds never include it.
+#include? "WorktreeOverrides.xcconfig"
+
+// Developer app-specific overrides are included last: xcconfig
+// later-include-wins is per variable, so a personal BUNDLE_IDENTIFIER for
+// device signing beats the worktree default while unset variables still
+// fall through to the worktree values.
 #include? "AppOverrides.xcconfig"
diff --git a/mobile/ios/Flutter/Release.xcconfig b/mobile/ios/Flutter/Release.xcconfig
index 616df87624..d287c5fb43 100644
--- a/mobile/ios/Flutter/Release.xcconfig
+++ b/mobile/ios/Flutter/Release.xcconfig
@@ -5,6 +5,7 @@
 // enterprise-signed distribution) override these without patching tracked
 // files by writing `mobile/ios/Flutter/AppOverrides.xcconfig` (gitignored).
 BUNDLE_IDENTIFIER = com.buzz.buzzMobile
+APP_DISPLAY_NAME = Buzz
 CODE_SIGN_STYLE = Automatic
 CODE_SIGN_IDENTITY = iPhone Developer
 #include? "AppOverrides.xcconfig"
diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index ba8c828d25..c1a2b9e13c 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -22,6 +22,11 @@ PODS:
     - Flutter
   - package_info_plus (0.4.5):
     - Flutter
+  - photo_manager (3.11.0):
+    - Flutter
+    - FlutterMacOS
+  - share_plus (0.0.1):
+    - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -43,6 +48,8 @@ DEPENDENCIES:
   - mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`)
   - open_filex (from `.symlinks/plugins/open_filex/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - photo_manager (from `.symlinks/plugins/photo_manager/darwin`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
@@ -70,6 +77,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/open_filex/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
+  photo_manager:
+    :path: ".symlinks/plugins/photo_manager/darwin"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   url_launcher_ios:
@@ -89,6 +100,8 @@ SPEC CHECKSUMS:
   mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
   open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  photo_manager: 6ab48c2ce7ec21aa06d59e6cc049f0b6d9ba7f94
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
   shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
   url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
   video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index 46c61ce2fc..d965f44699 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -10,6 +10,9 @@
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		331C809B294A63AB00263BE5 /* MediaSanitizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C809A294A618700263BE5 /* MediaSanitizer.swift */; };
+		4A71C0012F40100100A17E01 /* InlinePhotoPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A71C0022F40100100A17E01 /* InlinePhotoPicker.swift */; };
+		4A71C0032F40200100A17E01 /* NativeAttachmentPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A71C0042F40200100A17E01 /* NativeAttachmentPopover.swift */; };
+		4A71C0052F40300100A17E01 /* NativeAttachmentPopoverCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A71C0062F40300100A17E01 /* NativeAttachmentPopoverCoordinator.swift */; };
 		331C809D294A63AB00263BE5 /* UIKitEncoded.png in Resources */ = {isa = PBXBuildFile; fileRef = 331C809C294A618700263BE5 /* UIKitEncoded.png */; };
 		331C809F294A63AB00263BE5 /* UIKitEncoded.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 331C809E294A618700263BE5 /* UIKitEncoded.jpg */; };
 		33ADD70AB275E0EC81295559 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8906419FB4E98B4B12B7A56F /* Pods_Runner.framework */; };
@@ -51,6 +54,9 @@
 		30CE81D3D1E0B195EF2A6390 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C809A294A618700263BE5 /* MediaSanitizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaSanitizer.swift; sourceTree = "<group>"; };
+		4A71C0022F40100100A17E01 /* InlinePhotoPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlinePhotoPicker.swift; sourceTree = "<group>"; };
+		4A71C0042F40200100A17E01 /* NativeAttachmentPopover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeAttachmentPopover.swift; sourceTree = "<group>"; };
+		4A71C0062F40300100A17E01 /* NativeAttachmentPopoverCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeAttachmentPopoverCoordinator.swift; sourceTree = "<group>"; };
 		331C809C294A618700263BE5 /* UIKitEncoded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = UIKitEncoded.png; sourceTree = "<group>"; };
 		331C809E294A618700263BE5 /* UIKitEncoded.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = UIKitEncoded.jpg; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -170,6 +176,9 @@
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
 				331C809A294A618700263BE5 /* MediaSanitizer.swift */,
+				4A71C0022F40100100A17E01 /* InlinePhotoPicker.swift */,
+				4A71C0042F40200100A17E01 /* NativeAttachmentPopover.swift */,
+				4A71C0062F40300100A17E01 /* NativeAttachmentPopoverCoordinator.swift */,
 				7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */,
 				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
 			);
@@ -401,6 +410,9 @@
 			files = (
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
 				331C809B294A63AB00263BE5 /* MediaSanitizer.swift in Sources */,
+				4A71C0012F40100100A17E01 /* InlinePhotoPicker.swift in Sources */,
+				4A71C0032F40200100A17E01 /* NativeAttachmentPopover.swift in Sources */,
+				4A71C0052F40300100A17E01 /* NativeAttachmentPopoverCoordinator.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 				7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */,
 			);
diff --git a/mobile/ios/Runner/AppDelegate.swift b/mobile/ios/Runner/AppDelegate.swift
index 5edb4b6aaf..f6fe3aaf48 100644
--- a/mobile/ios/Runner/AppDelegate.swift
+++ b/mobile/ios/Runner/AppDelegate.swift
@@ -7,6 +7,8 @@ import UserNotifications
 @objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
   private var mediaUploadChannel: FlutterMethodChannel?
   private var qrScannerChannel: FlutterMethodChannel?
+  private var inlinePhotoPickerSupportChannel: FlutterMethodChannel?
+  private var nativeAttachmentPopoverCoordinator: NativeAttachmentPopoverCoordinator?
 
   override func application(
     _ application: UIApplication,
@@ -18,20 +20,56 @@ import UserNotifications
 
   func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
     GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+    let messenger = engineBridge.applicationRegistrar.messenger()
     mediaUploadChannel = FlutterMethodChannel(
       name: "buzz/media_upload",
-      binaryMessenger: engineBridge.applicationRegistrar.messenger()
+      binaryMessenger: messenger
     )
     mediaUploadChannel?.setMethodCallHandler { [weak self] call, result in
       self?.handleMediaUploadMethodCall(call, result: result)
     }
     qrScannerChannel = FlutterMethodChannel(
       name: "buzz/qr_scanner",
-      binaryMessenger: engineBridge.applicationRegistrar.messenger()
+      binaryMessenger: messenger
     )
     qrScannerChannel?.setMethodCallHandler { call, result in
       Self.handleQrScannerMethodCall(call, result: result)
     }
+    inlinePhotoPickerSupportChannel = FlutterMethodChannel(
+      name: "buzz/inline_photo_picker",
+      binaryMessenger: messenger
+    )
+    inlinePhotoPickerSupportChannel?.setMethodCallHandler { call, result in
+      guard call.method == "isSupported" else {
+        result(FlutterMethodNotImplemented)
+        return
+      }
+      if #available(iOS 17.0, *) {
+        result(true)
+      } else {
+        result(false)
+      }
+    }
+
+    if let inlinePhotoPickerRegistrar = engineBridge.pluginRegistry.registrar(
+      forPlugin: "BuzzInlinePhotoPicker"
+    ) {
+      inlinePhotoPickerRegistrar.register(
+        InlinePhotoPickerFactory(
+          messenger: messenger,
+          parentViewController: inlinePhotoPickerRegistrar.viewController
+        ),
+        withId: "buzz/inline_photo_picker"
+      )
+    }
+
+    let nativeAttachmentRegistrar = engineBridge.pluginRegistry.registrar(
+      forPlugin: "BuzzNativeAttachmentPopover"
+    )
+    nativeAttachmentPopoverCoordinator = NativeAttachmentPopoverCoordinator(
+      messenger: messenger,
+      parentViewController: nativeAttachmentRegistrar?.viewController
+    )
   }
 
   private static func handleQrScannerMethodCall(
@@ -231,10 +269,12 @@ import UserNotifications
     let sourceURL = URL(fileURLWithPath: sourcePath)
     let asset = AVURLAsset(url: sourceURL)
 
-    guard let exportSession = AVAssetExportSession(
-      asset: asset,
-      presetName: AVAssetExportPresetPassthrough
-    ) else {
+    guard
+      let exportSession = AVAssetExportSession(
+        asset: asset,
+        presetName: AVAssetExportPresetPassthrough
+      )
+    else {
       result(
         FlutterError(
           code: "transcode_failed",
@@ -259,7 +299,8 @@ import UserNotifications
       case .completed:
         result(outputURL.path)
       default:
-        let errorMessage = exportSession.error?.localizedDescription
+        let errorMessage =
+          exportSession.error?.localizedDescription
           ?? "Video transcoding failed with status \(exportSession.status.rawValue)."
         result(
           FlutterError(
diff --git a/mobile/ios/Runner/Info.plist b/mobile/ios/Runner/Info.plist
index 4aa9fcb7d5..81227c202b 100644
--- a/mobile/ios/Runner/Info.plist
+++ b/mobile/ios/Runner/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Buzz</string>
+	<string>$(APP_DISPLAY_NAME)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -47,6 +47,10 @@
 	<string>Buzz needs camera access so you can take photos to attach to messages and scan QR codes for device pairing.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Buzz needs photo library access so you can attach images to messages.</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>Buzz needs permission to save images to your photo library.</string>
+	<key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key>
+	<true/>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
diff --git a/mobile/ios/Runner/InlinePhotoPicker.swift b/mobile/ios/Runner/InlinePhotoPicker.swift
new file mode 100644
index 0000000000..05a576323f
--- /dev/null
+++ b/mobile/ios/Runner/InlinePhotoPicker.swift
@@ -0,0 +1,248 @@
+import Flutter
+import PhotosUI
+import UIKit
+import UniformTypeIdentifiers
+
+enum EmbeddedPhotoPickerLayout {
+  static func applyPreferredScale(_ zoomIn: () -> Void) {
+    UIView.performWithoutAnimation {
+      zoomIn()
+    }
+  }
+}
+
+final class InlinePhotoPickerFactory: NSObject, FlutterPlatformViewFactory {
+  private let messenger: FlutterBinaryMessenger
+  private weak var parentViewController: UIViewController?
+
+  init(
+    messenger: FlutterBinaryMessenger,
+    parentViewController: UIViewController?
+  ) {
+    self.messenger = messenger
+    self.parentViewController = parentViewController
+    super.init()
+  }
+
+  func create(
+    withFrame frame: CGRect,
+    viewIdentifier viewId: Int64,
+    arguments args: Any?
+  ) -> FlutterPlatformView {
+    InlinePhotoPickerPlatformView(
+      frame: frame,
+      viewIdentifier: viewId,
+      messenger: messenger,
+      parentViewController: parentViewController
+    )
+  }
+}
+
+final class InlinePhotoPickerPlatformView: NSObject, FlutterPlatformView {
+  private let containerView: UIView
+  private let channel: FlutterMethodChannel
+  private weak var parentViewController: UIViewController?
+  private var pickerViewController: PHPickerViewController?
+  private var selectionGeneration = 0
+  private var selectionTask: Task<Void, Never>?
+  private var selectedTemporaryPaths: [String] = []
+
+  init(
+    frame: CGRect,
+    viewIdentifier viewId: Int64,
+    messenger: FlutterBinaryMessenger,
+    parentViewController: UIViewController?
+  ) {
+    containerView = UIView(frame: frame)
+    channel = FlutterMethodChannel(
+      name: "buzz/inline_photo_picker/\(viewId)",
+      binaryMessenger: messenger
+    )
+    self.parentViewController = parentViewController
+    super.init()
+
+    channel.setMethodCallHandler { [weak self] call, result in
+      guard call.method == "claimSelection" else {
+        result(FlutterMethodNotImplemented)
+        return
+      }
+      let paths = call.arguments as? [String] ?? []
+      guard let self, paths == self.selectedTemporaryPaths else {
+        result(false)
+        return
+      }
+      self.selectedTemporaryPaths = []
+      result(true)
+    }
+
+    containerView.backgroundColor = .clear
+    containerView.clipsToBounds = true
+    if #available(iOS 17.0, *) {
+      installPicker()
+    }
+  }
+
+  deinit {
+    selectionTask?.cancel()
+    Self.removeTemporaryFiles(selectedTemporaryPaths)
+    channel.setMethodCallHandler(nil)
+    pickerViewController?.willMove(toParent: nil)
+    pickerViewController?.view.removeFromSuperview()
+    pickerViewController?.removeFromParent()
+  }
+
+  func view() -> UIView {
+    containerView
+  }
+
+  @available(iOS 17.0, *)
+  private func installPicker() {
+    var configuration = PHPickerConfiguration(photoLibrary: .shared())
+    configuration.filter = .images
+    configuration.selectionLimit = 0
+    configuration.selection = .continuousAndOrdered
+    configuration.preferredAssetRepresentationMode = .compatible
+    configuration.disabledCapabilities = [
+      .search,
+      .stagingArea,
+      .collectionNavigation,
+      .selectionActions,
+    ]
+    configuration.edgesWithoutContentMargins = .all
+
+    let picker = PHPickerViewController(configuration: configuration)
+    picker.delegate = self
+    picker.view.backgroundColor = .clear
+    picker.view.translatesAutoresizingMaskIntoConstraints = false
+
+    if let parentViewController {
+      parentViewController.addChild(picker)
+    }
+    containerView.addSubview(picker.view)
+    NSLayoutConstraint.activate([
+      picker.view.leadingAnchor.constraint(equalTo: containerView.leadingAnchor),
+      picker.view.trailingAnchor.constraint(equalTo: containerView.trailingAnchor),
+      picker.view.topAnchor.constraint(equalTo: containerView.topAnchor),
+      picker.view.bottomAnchor.constraint(equalTo: containerView.bottomAnchor),
+    ])
+    if parentViewController != nil {
+      picker.didMove(toParent: parentViewController)
+    }
+    pickerViewController = picker
+    containerView.layoutIfNeeded()
+    EmbeddedPhotoPickerLayout.applyPreferredScale {
+      picker.zoomIn()
+    }
+  }
+
+  private func exportPickerResult(_ result: PHPickerResult) async throws -> String {
+    let provider = result.itemProvider
+    guard
+      let typeIdentifier = provider.registeredTypeIdentifiers.first(where: {
+        guard let type = UTType($0) else { return false }
+        return type.conforms(to: .image)
+      })
+    else {
+      throw InlinePhotoPickerError.unsupportedImage
+    }
+
+    return try await withCheckedThrowingContinuation { continuation in
+      provider.loadFileRepresentation(forTypeIdentifier: typeIdentifier) {
+        sourceURL,
+        error in
+        if let error {
+          continuation.resume(throwing: error)
+          return
+        }
+        guard let sourceURL else {
+          continuation.resume(throwing: InlinePhotoPickerError.missingFile)
+          return
+        }
+
+        do {
+          let fileExtension =
+            sourceURL.pathExtension.isEmpty
+            ? (UTType(typeIdentifier)?.preferredFilenameExtension ?? "jpg")
+            : sourceURL.pathExtension
+          let destinationURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent(UUID().uuidString)
+            .appendingPathExtension(fileExtension)
+          try FileManager.default.copyItem(
+            at: sourceURL,
+            to: destinationURL
+          )
+          continuation.resume(returning: destinationURL.path)
+        } catch {
+          continuation.resume(throwing: error)
+        }
+      }
+    }
+  }
+
+  private static func removeTemporaryFiles(_ paths: [String]) {
+    for path in paths where !path.isEmpty {
+      try? FileManager.default.removeItem(atPath: path)
+    }
+  }
+}
+
+extension InlinePhotoPickerPlatformView: PHPickerViewControllerDelegate {
+  func picker(
+    _ picker: PHPickerViewController,
+    didFinishPicking results: [PHPickerResult]
+  ) {
+    selectionGeneration += 1
+    let generation = selectionGeneration
+    selectionTask?.cancel()
+    selectionTask = nil
+    Self.removeTemporaryFiles(selectedTemporaryPaths)
+    selectedTemporaryPaths = []
+    channel.invokeMethod(
+      "selectionCountChanged",
+      arguments: results.count
+    )
+
+    guard !results.isEmpty else {
+      channel.invokeMethod("selectionDidChange", arguments: [String]())
+      return
+    }
+
+    selectionTask = Task { [weak self] in
+      guard let self else { return }
+      var paths: [String] = []
+      do {
+        for result in results {
+          try Task.checkCancellation()
+          paths.append(try await self.exportPickerResult(result))
+        }
+        try Task.checkCancellation()
+        await MainActor.run {
+          guard generation == self.selectionGeneration else {
+            Self.removeTemporaryFiles(paths)
+            return
+          }
+          self.selectedTemporaryPaths = paths
+          self.selectionTask = nil
+          self.channel.invokeMethod("selectionDidChange", arguments: paths)
+        }
+      } catch is CancellationError {
+        Self.removeTemporaryFiles(paths)
+      } catch {
+        Self.removeTemporaryFiles(paths)
+        await MainActor.run {
+          guard generation == self.selectionGeneration else { return }
+          self.selectionTask = nil
+          self.channel.invokeMethod(
+            "didFail",
+            arguments: "Unable to prepare the selected photos."
+          )
+        }
+      }
+    }
+  }
+}
+
+private enum InlinePhotoPickerError: Error {
+  case missingFile
+  case unsupportedImage
+}
diff --git a/mobile/ios/Runner/NativeAttachmentPopover.swift b/mobile/ios/Runner/NativeAttachmentPopover.swift
new file mode 100644
index 0000000000..f2f6c01df8
--- /dev/null
+++ b/mobile/ios/Runner/NativeAttachmentPopover.swift
@@ -0,0 +1,1089 @@
+import AVFoundation
+import Flutter
+import PhotosUI
+import UIKit
+import UniformTypeIdentifiers
+
+@available(iOS 26.0, *)
+final class NativeAttachmentPopoverViewController:
+  UIViewController,
+  PHPickerViewControllerDelegate,
+  UIPopoverPresentationControllerDelegate,
+  AVCapturePhotoCaptureDelegate
+{
+  private enum Surface {
+    case menu
+    case photos
+    case camera
+  }
+
+  private typealias ContentPreparation = (@escaping () -> Void) -> Void
+
+  private let channel: FlutterMethodChannel
+  private let expandedWidth: CGFloat
+  private let maximumMenuHeight: CGFloat
+  private let expandedHeight = NativeAttachmentMenuLayout.maximumHeight
+  private let contentHost = UIView()
+  private let cameraSession = AVCaptureSession()
+  private let cameraOutput = AVCapturePhotoOutput()
+  private let cameraQueue = DispatchQueue(
+    label: "buzz.native-attachment-camera"
+  )
+
+  private var surface = Surface.menu
+  private var visibleContentView: UIView?
+  private var photoPickerViewController: PHPickerViewController?
+  private var cameraPreviewLayer: AVCaptureVideoPreviewLayer?
+  private weak var cameraPreviewView: UIView?
+  private weak var photoActionButton: UIButton?
+  private weak var cameraCaptureButton: UIButton?
+  private var cameraDevice: AVCaptureDevice?
+  private var cameraRotationCoordinator: AVCaptureDevice.RotationCoordinator?
+  private var cameraRotationObservation: NSKeyValueObservation?
+  private var selectionGeneration = 0
+  private var selectionTask: Task<Void, Never>?
+  private var selectedPhotoPaths: [String] = []
+  private var cameraConfigured = false
+  private var cameraIsStarting = false
+  private var cameraStartupGeneration = 0
+  private var cameraIsCapturing = false
+  private var activeCameraCaptureID: Int64?
+  private var isFinishing = false
+  private var didNotifyDismissal = false
+  private var keyboardDismissalOffset: CGFloat = 0
+  private var menuStackHeightConstraint: NSLayoutConstraint?
+
+  var onDismiss: (() -> Void)?
+
+  private var menuSize: CGSize {
+    NativeAttachmentMenuLayout.size(
+      compatibleWith: traitCollection,
+      maximumHeight: maximumMenuHeight
+    )
+  }
+
+  init(
+    channel: FlutterMethodChannel,
+    expandedWidth: CGFloat,
+    maximumMenuHeight: CGFloat = NativeAttachmentMenuLayout.maximumHeight
+  ) {
+    self.channel = channel
+    self.expandedWidth = expandedWidth
+    self.maximumMenuHeight = maximumMenuHeight
+    super.init(nibName: nil, bundle: nil)
+    preferredContentSize = NativeAttachmentMenuLayout.size(
+      compatibleWith: .current,
+      maximumHeight: maximumMenuHeight
+    )
+  }
+
+  @available(*, unavailable)
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+    view.backgroundColor = .clear
+    view.layer.cornerRadius = 22
+    view.layer.cornerCurve = .continuous
+    view.clipsToBounds = true
+
+    let glassEffect = UIGlassEffect(style: .regular)
+    glassEffect.isInteractive = true
+    let glassView = UIVisualEffectView(effect: glassEffect)
+    glassView.translatesAutoresizingMaskIntoConstraints = false
+    view.addSubview(glassView)
+
+    contentHost.translatesAutoresizingMaskIntoConstraints = false
+    view.addSubview(contentHost)
+    NSLayoutConstraint.activate([
+      glassView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+      glassView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+      glassView.topAnchor.constraint(equalTo: view.topAnchor),
+      glassView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+      contentHost.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+      contentHost.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+      contentHost.topAnchor.constraint(equalTo: view.topAnchor),
+      contentHost.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+    ])
+
+    let menu = makeMenuView()
+    installContent(menu)
+  }
+
+  override func viewDidLayoutSubviews() {
+    super.viewDidLayoutSubviews()
+    cameraPreviewLayer?.frame = cameraPreviewView?.bounds ?? .zero
+  }
+
+  override func viewWillDisappear(_ animated: Bool) {
+    super.viewWillDisappear(animated)
+    invalidateCameraCapture()
+    stopCamera()
+  }
+
+  override func traitCollectionDidChange(
+    _ previousTraitCollection: UITraitCollection?
+  ) {
+    super.traitCollectionDidChange(previousTraitCollection)
+    guard
+      previousTraitCollection?.preferredContentSizeCategory
+        != traitCollection.preferredContentSizeCategory
+    else {
+      return
+    }
+
+    updateMenuLayout()
+  }
+
+  func adaptivePresentationStyle(
+    for controller: UIPresentationController
+  ) -> UIModalPresentationStyle {
+    .none
+  }
+
+  func presentationControllerDidDismiss(
+    _ presentationController: UIPresentationController
+  ) {
+    notifyDismissalIfNeeded()
+  }
+
+  private func makeMenuView() -> UIView {
+    let container = UIView()
+    container.translatesAutoresizingMaskIntoConstraints = false
+
+    let scrollView = UIScrollView()
+    scrollView.alwaysBounceVertical = false
+    scrollView.translatesAutoresizingMaskIntoConstraints = false
+    container.addSubview(scrollView)
+
+    let stack = UIStackView()
+    stack.axis = .vertical
+    stack.distribution = .fillEqually
+    stack.spacing = NativeAttachmentMenuLayout.itemSpacing
+    stack.translatesAutoresizingMaskIntoConstraints = false
+    scrollView.addSubview(stack)
+    let stackHeightConstraint = stack.heightAnchor.constraint(
+      equalToConstant: NativeAttachmentMenuLayout.itemsHeight(
+        compatibleWith: traitCollection
+      )
+    )
+    menuStackHeightConstraint = stackHeightConstraint
+    NSLayoutConstraint.activate([
+      scrollView.leadingAnchor.constraint(equalTo: container.leadingAnchor),
+      scrollView.trailingAnchor.constraint(equalTo: container.trailingAnchor),
+      scrollView.topAnchor.constraint(equalTo: container.topAnchor),
+      scrollView.bottomAnchor.constraint(equalTo: container.bottomAnchor),
+      stack.leadingAnchor.constraint(
+        equalTo: scrollView.frameLayoutGuide.leadingAnchor,
+        constant: NativeAttachmentMenuLayout.contentPadding
+      ),
+      stack.trailingAnchor.constraint(
+        equalTo: scrollView.frameLayoutGuide.trailingAnchor,
+        constant: -NativeAttachmentMenuLayout.contentPadding
+      ),
+      stack.topAnchor.constraint(
+        equalTo: scrollView.contentLayoutGuide.topAnchor,
+        constant: NativeAttachmentMenuLayout.contentPadding
+      ),
+      stack.bottomAnchor.constraint(
+        equalTo: scrollView.contentLayoutGuide.bottomAnchor,
+        constant: -NativeAttachmentMenuLayout.contentPadding
+      ),
+      stackHeightConstraint,
+    ])
+
+    stack.addArrangedSubview(
+      makeNativeAttachmentMenuButton(
+        title: "Camera",
+        symbol: "camera",
+        action: UIAction { [weak self] _ in self?.showCamera() }
+      )
+    )
+    stack.addArrangedSubview(
+      makeNativeAttachmentMenuButton(
+        title: "Photos",
+        symbol: "photo.on.rectangle.angled",
+        action: UIAction { [weak self] _ in self?.showPhotos() }
+      )
+    )
+    stack.addArrangedSubview(
+      makeNativeAttachmentMenuButton(
+        title: "Video",
+        symbol: "video",
+        action: UIAction { [weak self] _ in
+          self?.finish(method: "pickVideo")
+        }
+      )
+    )
+    stack.addArrangedSubview(
+      makeNativeAttachmentMenuButton(
+        title: "Files",
+        symbol: "doc",
+        action: UIAction { [weak self] _ in
+          self?.finish(method: "pickFiles")
+        }
+      )
+    )
+    return container
+  }
+
+  private func updateMenuLayout() {
+    menuStackHeightConstraint?.constant =
+      NativeAttachmentMenuLayout.itemsHeight(
+        compatibleWith: traitCollection
+      )
+    if surface == .menu {
+      preferredContentSize = menuSize
+    }
+  }
+
+  private func showPhotos() {
+    guard surface != .photos else { return }
+    prepareForExpandedSurface()
+    stopCamera()
+
+    var configuration = PHPickerConfiguration(photoLibrary: .shared())
+    configuration.filter = .images
+    configuration.selectionLimit = 0
+    configuration.selection = .continuousAndOrdered
+    configuration.preferredAssetRepresentationMode = .compatible
+    configuration.disabledCapabilities = [
+      .search,
+      .stagingArea,
+      .collectionNavigation,
+      .selectionActions,
+    ]
+    configuration.edgesWithoutContentMargins = .all
+
+    let picker = PHPickerViewController(configuration: configuration)
+    picker.delegate = self
+    picker.view.backgroundColor = .clear
+
+    let container = UIView()
+    container.backgroundColor = .clear
+    container.clipsToBounds = true
+    addChild(picker)
+    picker.view.translatesAutoresizingMaskIntoConstraints = false
+    container.addSubview(picker.view)
+    NSLayoutConstraint.activate([
+      picker.view.leadingAnchor.constraint(equalTo: container.leadingAnchor),
+      picker.view.trailingAnchor.constraint(equalTo: container.trailingAnchor),
+      picker.view.topAnchor.constraint(equalTo: container.topAnchor),
+      picker.view.bottomAnchor.constraint(equalTo: container.bottomAnchor),
+    ])
+    picker.didMove(toParent: self)
+    photoPickerViewController = picker
+
+    let backButton = makeGlassControl(
+      title: nil,
+      symbol: "chevron.left",
+      accessibilityLabel: "Back to attachment options",
+      action: UIAction { [weak self] _ in self?.showMenu() }
+    )
+    let actionButton = makeGlassControl(
+      title: "All Photos",
+      symbol: nil,
+      accessibilityLabel: "All Photos",
+      prominent: true,
+      action: UIAction { [weak self] _ in self?.performPhotoAction() }
+    )
+    photoActionButton = actionButton
+    addBottomControls(
+      to: container,
+      leading: backButton,
+      trailing: actionButton
+    )
+
+    transition(
+      to: .photos,
+      content: container,
+      preparation: { [weak picker] reveal in
+        guard let picker else {
+          reveal()
+          return
+        }
+        // PHPicker ignores scale changes while its remote grid is still
+        // adapting to the compact menu bounds. Give it one main-loop turn at
+        // the final popover size, apply the scale offscreen, then reveal it.
+        DispatchQueue.main.async {
+          picker.view.layoutIfNeeded()
+          EmbeddedPhotoPickerLayout.applyPreferredScale {
+            picker.zoomIn()
+            picker.view.layoutIfNeeded()
+          }
+          DispatchQueue.main.async(execute: reveal)
+        }
+      }
+    )
+  }
+
+  private func showCamera() {
+    guard surface != .camera else { return }
+    prepareForExpandedSurface()
+    removePhotoPicker()
+
+    let container = UIView()
+    container.backgroundColor = .black
+    let preview = UIView()
+    preview.backgroundColor = .black
+    preview.translatesAutoresizingMaskIntoConstraints = false
+    container.addSubview(preview)
+    NSLayoutConstraint.activate([
+      preview.leadingAnchor.constraint(equalTo: container.leadingAnchor),
+      preview.trailingAnchor.constraint(equalTo: container.trailingAnchor),
+      preview.topAnchor.constraint(equalTo: container.topAnchor),
+      preview.bottomAnchor.constraint(equalTo: container.bottomAnchor),
+    ])
+    cameraPreviewView = preview
+
+    let placeholder = UIActivityIndicatorView(style: .large)
+    placeholder.color = .white
+    placeholder.startAnimating()
+    placeholder.translatesAutoresizingMaskIntoConstraints = false
+    preview.addSubview(placeholder)
+    NSLayoutConstraint.activate([
+      placeholder.centerXAnchor.constraint(equalTo: preview.centerXAnchor),
+      placeholder.centerYAnchor.constraint(equalTo: preview.centerYAnchor),
+    ])
+    placeholder.tag = 7001
+
+    let backButton = makeGlassControl(
+      title: nil,
+      symbol: "chevron.left",
+      accessibilityLabel: "Back to attachment options",
+      action: UIAction { [weak self] _ in self?.showMenu() }
+    )
+    let captureButton = makeCameraCaptureButton()
+    cameraCaptureButton = captureButton
+    addBottomControls(
+      to: container,
+      leading: backButton,
+      center: captureButton
+    )
+
+    transition(to: .camera, content: container)
+    startCamera()
+  }
+
+  private func showMenu() {
+    guard surface != .menu else { return }
+    invalidateCameraCapture()
+    selectionGeneration += 1
+    selectionTask?.cancel()
+    selectionTask = nil
+    Self.removeTemporaryFiles(selectedPhotoPaths)
+    selectedPhotoPaths = []
+    stopCamera()
+
+    let menu = makeMenuView()
+    transition(
+      to: .menu,
+      content: menu,
+      completion: { [weak self] in
+        self?.removePhotoPicker()
+      }
+    )
+  }
+
+  private func prepareForExpandedSurface() {
+    if let sourceHost = popoverPresentationController?.sourceView?.superview {
+      keyboardDismissalOffset = max(
+        keyboardDismissalOffset,
+        NativeAttachmentExpandedSurfaceBehavior.keyboardOverlap(
+          containerBounds: sourceHost.bounds,
+          keyboardLayoutFrame: sourceHost.keyboardLayoutGuide.layoutFrame
+        )
+      )
+    }
+    NativeAttachmentExpandedSurfaceBehavior.dismissKeyboard(in: view.window)
+  }
+
+  private func installContent(_ content: UIView) {
+    content.translatesAutoresizingMaskIntoConstraints = false
+    contentHost.addSubview(content)
+    NSLayoutConstraint.activate([
+      content.leadingAnchor.constraint(equalTo: contentHost.leadingAnchor),
+      content.trailingAnchor.constraint(equalTo: contentHost.trailingAnchor),
+      content.topAnchor.constraint(equalTo: contentHost.topAnchor),
+      content.bottomAnchor.constraint(equalTo: contentHost.bottomAnchor),
+    ])
+    visibleContentView = content
+  }
+
+  private func transition(
+    to nextSurface: Surface,
+    content nextView: UIView,
+    preparation: ContentPreparation? = nil,
+    completion: (() -> Void)? = nil
+  ) {
+    let previousView = visibleContentView
+    let isExpanding = nextSurface != .menu
+    let targetSize =
+      isExpanding
+      ? CGSize(width: expandedWidth, height: expandedHeight)
+      : menuSize
+
+    nextView.translatesAutoresizingMaskIntoConstraints = false
+    contentHost.addSubview(nextView)
+    NSLayoutConstraint.activate([
+      nextView.leadingAnchor.constraint(equalTo: contentHost.leadingAnchor),
+      nextView.trailingAnchor.constraint(equalTo: contentHost.trailingAnchor),
+      nextView.topAnchor.constraint(equalTo: contentHost.topAnchor),
+      nextView.bottomAnchor.constraint(equalTo: contentHost.bottomAnchor),
+    ])
+    contentHost.layoutIfNeeded()
+
+    let shouldAnimate = !UIAccessibility.isReduceMotionEnabled
+    // Do not expose embedded surfaces while the popover changes size. In
+    // particular, PHPicker visibly reflows its grid from the compact menu
+    // width to the expanded width if it is allowed to paint during this step.
+    nextView.alpha = 0
+    visibleContentView = nextView
+    surface = nextSurface
+
+    let duration = shouldAnimate ? (isExpanding ? 0.24 : 0.2) : 0
+    UIView.animate(
+      withDuration: duration,
+      delay: 0,
+      options: [
+        .beginFromCurrentState,
+        .allowUserInteraction,
+        .curveEaseInOut,
+      ]
+    ) {
+      self.preferredContentSize = targetSize
+      if let popover = self.popoverPresentationController,
+        let sourceView = popover.sourceView
+      {
+        popover.sourceRect = NativeAttachmentPopoverAnchorLayout.sourceRect(
+          anchorBounds: sourceView.bounds,
+          keyboardDismissalOffset: self.keyboardDismissalOffset,
+          isExpanded: isExpanding
+        )
+      }
+      previousView?.alpha = 0
+      self.view.layoutIfNeeded()
+    } completion: { _ in
+      previousView?.removeFromSuperview()
+      self.view.layoutIfNeeded()
+
+      let reveal = {
+        UIView.animate(
+          withDuration: shouldAnimate ? 0.14 : 0,
+          delay: 0,
+          options: [
+            .beginFromCurrentState,
+            .allowUserInteraction,
+            .curveEaseOut,
+          ]
+        ) {
+          nextView.alpha = 1
+        } completion: { _ in
+          completion?()
+        }
+      }
+
+      if let preparation {
+        preparation(reveal)
+      } else {
+        reveal()
+      }
+    }
+  }
+
+  private func makeGlassControl(
+    title: String?,
+    symbol: String?,
+    accessibilityLabel: String,
+    prominent: Bool = false,
+    action: UIAction
+  ) -> UIButton {
+    var configuration =
+      prominent
+      ? UIButton.Configuration.prominentGlass()
+      : UIButton.Configuration.glass()
+    configuration.title = title
+    if prominent {
+      configuration.baseBackgroundColor = .black
+    }
+    if let symbol {
+      configuration.image = UIImage(systemName: symbol)
+    }
+    configuration.imagePadding = 8
+    configuration.baseForegroundColor = .white
+    configuration.contentInsets = NSDirectionalEdgeInsets(
+      top: 11,
+      leading: 15,
+      bottom: 11,
+      trailing: 15
+    )
+    let button = UIButton(configuration: configuration, primaryAction: action)
+    button.accessibilityLabel = accessibilityLabel
+    return button
+  }
+
+  private func makeCameraCaptureButton() -> UIButton {
+    let button = UIButton(
+      primaryAction: UIAction { [weak self] _ in self?.capturePhoto() }
+    )
+    button.accessibilityLabel = "Take photo"
+    button.translatesAutoresizingMaskIntoConstraints = false
+    button.backgroundColor = UIColor.white.withAlphaComponent(0.22)
+    button.layer.cornerRadius = 34
+    button.layer.borderColor = UIColor.white.cgColor
+    button.layer.borderWidth = 3
+    let inner = UIView()
+    inner.isUserInteractionEnabled = false
+    inner.translatesAutoresizingMaskIntoConstraints = false
+    inner.backgroundColor = .white
+    inner.layer.cornerRadius = 25
+    button.addSubview(inner)
+    NSLayoutConstraint.activate([
+      button.widthAnchor.constraint(equalToConstant: 68),
+      button.heightAnchor.constraint(equalToConstant: 68),
+      inner.widthAnchor.constraint(equalToConstant: 50),
+      inner.heightAnchor.constraint(equalToConstant: 50),
+      inner.centerXAnchor.constraint(equalTo: button.centerXAnchor),
+      inner.centerYAnchor.constraint(equalTo: button.centerYAnchor),
+    ])
+    return button
+  }
+
+  private func addBottomControls(
+    to container: UIView,
+    leading: UIButton,
+    center: UIButton? = nil,
+    trailing: UIButton? = nil
+  ) {
+    leading.translatesAutoresizingMaskIntoConstraints = false
+    container.addSubview(leading)
+    var constraints = [
+      leading.leadingAnchor.constraint(
+        equalTo: container.leadingAnchor,
+        constant: 12
+      ),
+      leading.bottomAnchor.constraint(
+        equalTo: container.bottomAnchor,
+        constant: -12
+      ),
+      leading.heightAnchor.constraint(greaterThanOrEqualToConstant: 44),
+    ]
+
+    if let center {
+      center.translatesAutoresizingMaskIntoConstraints = false
+      container.addSubview(center)
+      constraints.append(
+        center.centerXAnchor.constraint(equalTo: container.centerXAnchor)
+      )
+      constraints.append(
+        center.bottomAnchor.constraint(
+          equalTo: container.bottomAnchor,
+          constant: -12
+        )
+      )
+    }
+    if let trailing {
+      trailing.translatesAutoresizingMaskIntoConstraints = false
+      container.addSubview(trailing)
+      constraints.append(
+        trailing.trailingAnchor.constraint(
+          equalTo: container.trailingAnchor,
+          constant: -12
+        )
+      )
+      constraints.append(
+        trailing.bottomAnchor.constraint(
+          equalTo: container.bottomAnchor,
+          constant: -12
+        )
+      )
+      constraints.append(
+        trailing.heightAnchor.constraint(greaterThanOrEqualToConstant: 44)
+      )
+    }
+    NSLayoutConstraint.activate(constraints)
+  }
+
+  func picker(
+    _ picker: PHPickerViewController,
+    didFinishPicking results: [PHPickerResult]
+  ) {
+    selectionGeneration += 1
+    let generation = selectionGeneration
+    selectionTask?.cancel()
+    selectionTask = nil
+    Self.removeTemporaryFiles(selectedPhotoPaths)
+    selectedPhotoPaths = []
+    updatePhotoAction(count: results.count, preparing: !results.isEmpty)
+
+    guard !results.isEmpty else { return }
+    selectionTask = Task { [weak self] in
+      guard let self else { return }
+      var paths: [String] = []
+      do {
+        for result in results {
+          try Task.checkCancellation()
+          paths.append(try await self.exportPickerResult(result))
+        }
+        try Task.checkCancellation()
+        await MainActor.run {
+          guard generation == self.selectionGeneration else {
+            Self.removeTemporaryFiles(paths)
+            return
+          }
+          self.selectedPhotoPaths = paths
+          self.selectionTask = nil
+          self.updatePhotoAction(count: paths.count, preparing: false)
+        }
+      } catch is CancellationError {
+        Self.removeTemporaryFiles(paths)
+      } catch {
+        Self.removeTemporaryFiles(paths)
+        await MainActor.run {
+          guard generation == self.selectionGeneration else { return }
+          self.selectionTask = nil
+          self.selectedPhotoPaths = []
+          self.updatePhotoAction(count: 0, preparing: false)
+          self.showError("Unable to prepare the selected photos.")
+        }
+      }
+    }
+  }
+
+  private func updatePhotoAction(count: Int, preparing: Bool) {
+    let title: String
+    if preparing {
+      title = "Preparing…"
+    } else if count == 0 {
+      title = "All Photos"
+    } else {
+      title = "Add \(count) \(count == 1 ? "photo" : "photos")"
+    }
+    guard let button = photoActionButton else { return }
+    let canInteract = !preparing
+    button.configuration?.title = title
+    button.accessibilityLabel = title
+    button.isUserInteractionEnabled = canInteract
+    if canInteract {
+      button.accessibilityTraits.remove(.notEnabled)
+    } else {
+      button.accessibilityTraits.insert(.notEnabled)
+    }
+  }
+
+  private func performPhotoAction() {
+    if selectedPhotoPaths.isEmpty {
+      finish(method: "pickAllPhotos")
+    } else {
+      let paths = selectedPhotoPaths
+      selectedPhotoPaths = []
+      finish(
+        method: "photosSelected",
+        arguments: paths,
+        temporaryPaths: paths
+      )
+    }
+  }
+
+  private func exportPickerResult(_ result: PHPickerResult) async throws
+    -> String
+  {
+    let provider = result.itemProvider
+    guard
+      let typeIdentifier = provider.registeredTypeIdentifiers.first(where: {
+        guard let type = UTType($0) else { return false }
+        return type.conforms(to: .image)
+      })
+    else {
+      throw NativeAttachmentPopoverError.unsupportedImage
+    }
+
+    return try await withCheckedThrowingContinuation { continuation in
+      provider.loadFileRepresentation(forTypeIdentifier: typeIdentifier) {
+        sourceURL,
+        error in
+        if let error {
+          continuation.resume(throwing: error)
+          return
+        }
+        guard let sourceURL else {
+          continuation.resume(
+            throwing: NativeAttachmentPopoverError.missingFile
+          )
+          return
+        }
+
+        do {
+          let fileExtension =
+            sourceURL.pathExtension.isEmpty
+            ? (UTType(typeIdentifier)?.preferredFilenameExtension ?? "jpg")
+            : sourceURL.pathExtension
+          let destinationURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent(UUID().uuidString)
+            .appendingPathExtension(fileExtension)
+          try FileManager.default.copyItem(
+            at: sourceURL,
+            to: destinationURL
+          )
+          continuation.resume(returning: destinationURL.path)
+        } catch {
+          continuation.resume(throwing: error)
+        }
+      }
+    }
+  }
+
+  private static func removeTemporaryFiles(_ paths: [String]) {
+    for path in paths where !path.isEmpty {
+      try? FileManager.default.removeItem(atPath: path)
+    }
+  }
+
+  private func startCamera() {
+    guard !cameraIsStarting else { return }
+    cameraIsStarting = true
+    cameraStartupGeneration += 1
+    let startupGeneration = cameraStartupGeneration
+
+    switch AVCaptureDevice.authorizationStatus(for: .video) {
+    case .authorized:
+      configureAndStartCamera(startupGeneration: startupGeneration)
+    case .notDetermined:
+      AVCaptureDevice.requestAccess(for: .video) { [weak self] granted in
+        DispatchQueue.main.async {
+          guard
+            let self,
+            self.cameraStartupIsCurrent(startupGeneration)
+          else { return }
+          if granted {
+            self.configureAndStartCamera(
+              startupGeneration: startupGeneration
+            )
+          } else {
+            self.cameraIsStarting = false
+            self.showCameraUnavailable(
+              "Camera access is needed to take a photo."
+            )
+          }
+        }
+      }
+    default:
+      cameraIsStarting = false
+      showCameraUnavailable("Camera access is needed to take a photo.")
+    }
+  }
+
+  private func configureAndStartCamera(startupGeneration: Int) {
+    cameraQueue.async { [weak self] in
+      guard let self else { return }
+      do {
+        if !self.cameraConfigured {
+          self.cameraSession.beginConfiguration()
+          defer { self.cameraSession.commitConfiguration() }
+          self.cameraSession.sessionPreset = .photo
+          guard
+            let device = AVCaptureDevice.default(
+              .builtInWideAngleCamera,
+              for: .video,
+              position: .back
+            )
+          else {
+            throw NativeAttachmentPopoverError.cameraUnavailable
+          }
+          let input = try AVCaptureDeviceInput(device: device)
+          guard self.cameraSession.canAddInput(input) else {
+            throw NativeAttachmentPopoverError.cameraUnavailable
+          }
+          self.cameraSession.addInput(input)
+          self.cameraDevice = device
+          guard self.cameraSession.canAddOutput(self.cameraOutput) else {
+            throw NativeAttachmentPopoverError.cameraUnavailable
+          }
+          self.cameraSession.addOutput(self.cameraOutput)
+          self.cameraConfigured = true
+        }
+
+        if !self.cameraSession.isRunning {
+          self.cameraSession.startRunning()
+        }
+        DispatchQueue.main.async { [weak self] in
+          guard
+            let self,
+            self.cameraStartupIsCurrent(startupGeneration)
+          else { return }
+          self.cameraIsStarting = false
+          self.installCameraPreview()
+        }
+      } catch {
+        if self.cameraSession.isRunning {
+          self.cameraSession.stopRunning()
+        }
+        DispatchQueue.main.async { [weak self] in
+          guard
+            let self,
+            self.cameraStartupIsCurrent(startupGeneration)
+          else { return }
+          self.cameraIsStarting = false
+          self.showCameraUnavailable("Camera isn’t available here.")
+        }
+      }
+    }
+  }
+
+  private func cameraStartupIsCurrent(_ generation: Int) -> Bool {
+    generation == cameraStartupGeneration && surface == .camera && !isFinishing
+  }
+
+  private func installCameraPreview() {
+    guard surface == .camera, let previewView = cameraPreviewView else { return }
+    previewView.viewWithTag(7001)?.removeFromSuperview()
+    cameraPreviewLayer?.removeFromSuperlayer()
+
+    let layer = AVCaptureVideoPreviewLayer(session: cameraSession)
+    layer.videoGravity = .resizeAspectFill
+    layer.frame = previewView.bounds
+    previewView.layer.insertSublayer(layer, at: 0)
+    cameraPreviewLayer = layer
+
+    if let cameraDevice {
+      let coordinator = AVCaptureDevice.RotationCoordinator(
+        device: cameraDevice,
+        previewLayer: layer
+      )
+      cameraRotationCoordinator = coordinator
+      cameraRotationObservation = coordinator.observe(
+        \.videoRotationAngleForHorizonLevelPreview,
+        options: [.initial, .new]
+      ) { [weak layer] coordinator, _ in
+        guard let connection = layer?.connection else { return }
+        let angle = coordinator.videoRotationAngleForHorizonLevelPreview
+        guard connection.isVideoRotationAngleSupported(angle) else { return }
+        connection.videoRotationAngle = angle
+      }
+    }
+  }
+
+  private func stopCamera() {
+    cameraStartupGeneration += 1
+    cameraIsStarting = false
+    cameraRotationObservation?.invalidate()
+    cameraRotationObservation = nil
+    cameraRotationCoordinator = nil
+    cameraPreviewLayer?.removeFromSuperlayer()
+    cameraPreviewLayer = nil
+    cameraQueue.async { [weak self] in
+      guard let self, self.cameraSession.isRunning else { return }
+      self.cameraSession.stopRunning()
+    }
+  }
+
+  private func capturePhoto() {
+    guard !cameraIsCapturing, cameraSession.isRunning else { return }
+    cameraIsCapturing = true
+    cameraCaptureButton?.isEnabled = false
+    cameraCaptureButton?.transform = CGAffineTransform(
+      scaleX: 0.92,
+      y: 0.92
+    )
+    UIView.animate(
+      withDuration: 0.12,
+      delay: 0,
+      options: [.beginFromCurrentState, .allowUserInteraction]
+    ) {
+      self.cameraCaptureButton?.transform = .identity
+    }
+    if let connection = cameraOutput.connection(with: .video),
+      let cameraRotationCoordinator
+    {
+      let angle =
+        cameraRotationCoordinator.videoRotationAngleForHorizonLevelCapture
+      if connection.isVideoRotationAngleSupported(angle) {
+        connection.videoRotationAngle = angle
+      }
+    }
+    let settings = AVCapturePhotoSettings()
+    activeCameraCaptureID = settings.uniqueID
+    cameraOutput.capturePhoto(with: settings, delegate: self)
+  }
+
+  func photoOutput(
+    _ output: AVCapturePhotoOutput,
+    didFinishProcessingPhoto photo: AVCapturePhoto,
+    error: Error?
+  ) {
+    guard error == nil, let data = photo.fileDataRepresentation() else {
+      DispatchQueue.main.async { [weak self] in
+        self?.completeCameraCapture(
+          captureID: photo.resolvedSettings.uniqueID,
+          path: nil,
+          errorMessage: "Unable to capture the photo."
+        )
+      }
+      return
+    }
+
+    DispatchQueue.global(qos: .userInitiated).async {
+      do {
+        let destinationURL = FileManager.default.temporaryDirectory
+          .appendingPathComponent(UUID().uuidString)
+          .appendingPathExtension("jpg")
+        try data.write(to: destinationURL, options: .atomic)
+        DispatchQueue.main.async { [weak self] in
+          guard let self else {
+            Self.removeTemporaryFiles([destinationURL.path])
+            return
+          }
+          self.completeCameraCapture(
+            captureID: photo.resolvedSettings.uniqueID,
+            path: destinationURL.path,
+            errorMessage: nil
+          )
+        }
+      } catch {
+        DispatchQueue.main.async { [weak self] in
+          self?.completeCameraCapture(
+            captureID: photo.resolvedSettings.uniqueID,
+            path: nil,
+            errorMessage: "Unable to prepare the captured photo."
+          )
+        }
+      }
+    }
+  }
+
+  @MainActor
+  private func completeCameraCapture(
+    captureID: Int64,
+    path: String?,
+    errorMessage: String?
+  ) {
+    guard
+      captureID == activeCameraCaptureID, surface == .camera, !isFinishing
+    else {
+      if let path { Self.removeTemporaryFiles([path]) }
+      return
+    }
+    activeCameraCaptureID = nil
+    cameraIsCapturing = false
+    cameraCaptureButton?.isEnabled = true
+    if let path {
+      finish(
+        method: "cameraCaptured",
+        arguments: path,
+        temporaryPaths: [path]
+      )
+    } else if !isFinishing, let errorMessage {
+      showError(errorMessage)
+    }
+  }
+
+  private func invalidateCameraCapture() {
+    activeCameraCaptureID = nil
+    cameraIsCapturing = false
+    cameraCaptureButton?.isEnabled = true
+  }
+
+  private func showCameraUnavailable(_ message: String) {
+    guard let previewView = cameraPreviewView else { return }
+    previewView.viewWithTag(7001)?.removeFromSuperview()
+    let label = UILabel()
+    label.text = message
+    label.textColor = .white
+    label.textAlignment = .center
+    label.numberOfLines = 0
+    label.translatesAutoresizingMaskIntoConstraints = false
+    previewView.addSubview(label)
+    NSLayoutConstraint.activate([
+      label.centerXAnchor.constraint(equalTo: previewView.centerXAnchor),
+      label.centerYAnchor.constraint(equalTo: previewView.centerYAnchor),
+      label.leadingAnchor.constraint(
+        greaterThanOrEqualTo: previewView.leadingAnchor,
+        constant: 28
+      ),
+      label.trailingAnchor.constraint(
+        lessThanOrEqualTo: previewView.trailingAnchor,
+        constant: -28
+      ),
+    ])
+  }
+
+  private func showError(_ message: String) {
+    let alert = UIAlertController(
+      title: nil,
+      message: message,
+      preferredStyle: .alert
+    )
+    alert.addAction(UIAlertAction(title: "OK", style: .default))
+    present(alert, animated: true)
+  }
+
+  private func removePhotoPicker() {
+    guard let picker = photoPickerViewController else { return }
+    picker.willMove(toParent: nil)
+    picker.view.removeFromSuperview()
+    picker.removeFromParent()
+    photoPickerViewController = nil
+  }
+
+  private func finish(
+    method: String,
+    arguments: Any? = nil,
+    temporaryPaths: [String] = []
+  ) {
+    guard !isFinishing else {
+      Self.removeTemporaryFiles(temporaryPaths)
+      return
+    }
+    NativeAttachmentExpandedSurfaceBehavior.dismissKeyboard(in: view.window)
+    isFinishing = true
+    view.isUserInteractionEnabled = false
+    selectionGeneration += 1
+    selectionTask?.cancel()
+    selectionTask = nil
+    stopCamera()
+    dismiss(animated: true) { [weak self] in
+      guard let self else {
+        Self.removeTemporaryFiles(temporaryPaths)
+        return
+      }
+      self.channel.invokeMethod(method, arguments: arguments) { _ in
+        Self.removeTemporaryFiles(temporaryPaths)
+      }
+      self.notifyDismissalIfNeeded()
+    }
+  }
+
+  func dismissAndNotify() {
+    guard !isFinishing else { return }
+    isFinishing = true
+    view.isUserInteractionEnabled = false
+    selectionGeneration += 1
+    selectionTask?.cancel()
+    selectionTask = nil
+    Self.removeTemporaryFiles(selectedPhotoPaths)
+    selectedPhotoPaths = []
+    stopCamera()
+    dismiss(animated: true) { [weak self] in
+      self?.notifyDismissalIfNeeded()
+    }
+  }
+
+  private func notifyDismissalIfNeeded() {
+    selectionGeneration += 1
+    selectionTask?.cancel()
+    selectionTask = nil
+    Self.removeTemporaryFiles(selectedPhotoPaths)
+    selectedPhotoPaths = []
+    guard !didNotifyDismissal else { return }
+    didNotifyDismissal = true
+    onDismiss?()
+  }
+}
+
+private enum NativeAttachmentPopoverError: Error {
+  case cameraUnavailable
+  case missingFile
+  case unsupportedImage
+}
diff --git a/mobile/ios/Runner/NativeAttachmentPopoverCoordinator.swift b/mobile/ios/Runner/NativeAttachmentPopoverCoordinator.swift
new file mode 100644
index 0000000000..73559d7c2b
--- /dev/null
+++ b/mobile/ios/Runner/NativeAttachmentPopoverCoordinator.swift
@@ -0,0 +1,371 @@
+import Flutter
+import UIKit
+
+enum NativeAttachmentExpandedSurfaceBehavior {
+  @MainActor
+  static func dismissKeyboard(in window: UIWindow?) {
+    window?.endEditing(true)
+  }
+
+  static func keyboardOverlap(
+    containerBounds: CGRect,
+    keyboardLayoutFrame: CGRect
+  ) -> CGFloat {
+    guard
+      !keyboardLayoutFrame.isNull,
+      !keyboardLayoutFrame.isInfinite,
+      keyboardLayoutFrame.minY < containerBounds.maxY
+    else {
+      return 0
+    }
+    return max(0, containerBounds.maxY - keyboardLayoutFrame.minY)
+  }
+}
+
+enum NativeAttachmentPopoverAnchorLayout {
+  static let expandedVerticalOffset: CGFloat = 40
+
+  static func sourceRect(
+    anchorBounds: CGRect,
+    keyboardDismissalOffset: CGFloat,
+    isExpanded: Bool
+  ) -> CGRect {
+    anchorBounds.offsetBy(
+      dx: 0,
+      dy: keyboardDismissalOffset
+        + (isExpanded ? expandedVerticalOffset : 0)
+    )
+  }
+}
+
+enum NativeAttachmentPopoverPresentationLayout {
+  static func keyboardDismissalOffset(
+    sourceRect: CGRect,
+    containerBounds: CGRect,
+    safeAreaInsets: UIEdgeInsets,
+    keyboardLayoutFrame: CGRect,
+    menuHeight: CGFloat
+  ) -> CGFloat {
+    let keyboardOverlap =
+      NativeAttachmentExpandedSurfaceBehavior.keyboardOverlap(
+        containerBounds: containerBounds,
+        keyboardLayoutFrame: keyboardLayoutFrame
+      )
+    guard keyboardOverlap > 0 else { return 0 }
+
+    let availableHeight =
+      sourceRect.minY - (containerBounds.minY + safeAreaInsets.top)
+    return availableHeight >= menuHeight ? 0 : keyboardOverlap
+  }
+
+  static func sourceRect(
+    _ sourceRect: CGRect,
+    keyboardDismissalOffset: CGFloat
+  ) -> CGRect {
+    sourceRect.offsetBy(dx: 0, dy: keyboardDismissalOffset)
+  }
+}
+
+final class NativeAttachmentPopoverCoordinator: NSObject {
+  private let channel: FlutterMethodChannel
+  private weak var parentViewController: UIViewController?
+  private weak var presentedController: UIViewController?
+  private weak var sourceAnchorView: UIView?
+
+  init(
+    messenger: FlutterBinaryMessenger,
+    parentViewController: UIViewController?
+  ) {
+    channel = FlutterMethodChannel(
+      name: "buzz/native_attachment_popover",
+      binaryMessenger: messenger
+    )
+    self.parentViewController = parentViewController
+    super.init()
+
+    channel.setMethodCallHandler { [weak self] call, result in
+      self?.handle(call, result: result)
+    }
+  }
+
+  private func handle(
+    _ call: FlutterMethodCall,
+    result: @escaping FlutterResult
+  ) {
+    switch call.method {
+    case "isSupported":
+      if #available(iOS 26.0, *) {
+        result(true)
+      } else {
+        result(false)
+      }
+    case "present":
+      guard
+        let arguments = call.arguments as? [String: Any],
+        let x = arguments["x"] as? NSNumber,
+        let y = arguments["y"] as? NSNumber,
+        let width = arguments["width"] as? NSNumber,
+        let height = arguments["height"] as? NSNumber
+      else {
+        result(
+          FlutterError(
+            code: "invalid_arguments",
+            message: "Expected the attachment trigger bounds.",
+            details: nil
+          )
+        )
+        return
+      }
+
+      let sourceRect = CGRect(
+        x: CGFloat(truncating: x),
+        y: CGFloat(truncating: y),
+        width: CGFloat(truncating: width),
+        height: CGFloat(truncating: height)
+      )
+      DispatchQueue.main.async { [weak self] in
+        result(self?.presentPopover(sourceRect: sourceRect) ?? false)
+      }
+    case "dismiss":
+      DispatchQueue.main.async { [weak self] in
+        if #available(iOS 26.0, *),
+          let controller =
+            self?.presentedController
+            as? NativeAttachmentPopoverViewController
+        {
+          controller.dismissAndNotify()
+        } else {
+          self?.presentedController?.dismiss(animated: true)
+        }
+        result(nil)
+      }
+    default:
+      result(FlutterMethodNotImplemented)
+    }
+  }
+
+  @MainActor
+  private func presentPopover(sourceRect: CGRect) -> Bool {
+    guard #available(iOS 26.0, *) else { return false }
+    guard presentedController == nil else { return true }
+    let rootViewController =
+      parentViewController ?? activeWindowRootViewController()
+    guard let presenter = topViewController(from: rootViewController) else {
+      return false
+    }
+
+    let sourceView = presenter.view
+    var convertedRect: CGRect
+    if let window = sourceView?.window {
+      convertedRect = sourceView?.convert(sourceRect, from: window) ?? sourceRect
+    } else {
+      convertedRect = sourceRect
+    }
+
+    if let sourceView {
+      let keyboardDismissalOffset =
+        NativeAttachmentPopoverPresentationLayout.keyboardDismissalOffset(
+          sourceRect: convertedRect,
+          containerBounds: sourceView.bounds,
+          safeAreaInsets: sourceView.safeAreaInsets,
+          keyboardLayoutFrame: sourceView.keyboardLayoutGuide.layoutFrame,
+          menuHeight: NativeAttachmentMenuLayout.size(
+            compatibleWith: sourceView.traitCollection
+          ).height
+        )
+      if keyboardDismissalOffset > 0 {
+        NativeAttachmentExpandedSurfaceBehavior.dismissKeyboard(
+          in: sourceView.window
+        )
+        convertedRect =
+          NativeAttachmentPopoverPresentationLayout.sourceRect(
+            convertedRect,
+            keyboardDismissalOffset: keyboardDismissalOffset
+          )
+      }
+    }
+
+    let anchorView = makeSourceAnchor(frame: convertedRect)
+    sourceView?.addSubview(anchorView)
+    sourceAnchorView = anchorView
+
+    let availableWidth = max(
+      320,
+      min(
+        (sourceView?.bounds.width ?? UIScreen.main.bounds.width) - 24,
+        430
+      )
+    )
+    let controller = NativeAttachmentPopoverViewController(
+      channel: channel,
+      expandedWidth: availableWidth
+    )
+    controller.modalPresentationStyle = .popover
+    controller.preferredTransition = .zoom { [weak anchorView] _ in
+      anchorView
+    }
+    controller.onDismiss = { [weak self] in
+      self?.presentedController = nil
+      self?.sourceAnchorView?.removeFromSuperview()
+      self?.channel.invokeMethod("dismissed", arguments: nil)
+    }
+
+    guard let popover = controller.popoverPresentationController else {
+      anchorView.removeFromSuperview()
+      return false
+    }
+    popover.sourceView = anchorView
+    popover.sourceRect = anchorView.bounds
+    popover.permittedArrowDirections = [.down]
+    popover.backgroundColor = .clear
+    popover.delegate = controller
+
+    presentedController = controller
+    presenter.present(controller, animated: true)
+    return true
+  }
+
+  @MainActor
+  private func makeSourceAnchor(frame: CGRect) -> UIView {
+    let anchor = UIView(frame: frame)
+    anchor.isUserInteractionEnabled = false
+    anchor.accessibilityElementsHidden = true
+    anchor.backgroundColor = .clear
+    anchor.layer.cornerRadius = min(frame.width, frame.height) / 2
+    anchor.layer.cornerCurve = .continuous
+    return anchor
+  }
+
+  @MainActor
+  private func activeWindowRootViewController() -> UIViewController? {
+    UIApplication.shared.connectedScenes
+      .compactMap { $0 as? UIWindowScene }
+      .filter { $0.activationState == .foregroundActive }
+      .flatMap(\.windows)
+      .first(where: \.isKeyWindow)?
+      .rootViewController
+  }
+
+  @MainActor
+  private func topViewController(
+    from viewController: UIViewController?
+  ) -> UIViewController? {
+    if let presented = viewController?.presentedViewController {
+      return topViewController(from: presented)
+    }
+    if let navigation = viewController as? UINavigationController {
+      return topViewController(from: navigation.visibleViewController)
+    }
+    if let tab = viewController as? UITabBarController {
+      return topViewController(from: tab.selectedViewController)
+    }
+    return viewController
+  }
+}
+
+enum NativeAttachmentMenuLayout {
+  static let itemCount: CGFloat = 4
+  static let contentPadding: CGFloat = 16
+  static let minimumItemHeight: CGFloat = 52
+  static let itemSpacing: CGFloat = 8
+  static let itemVerticalPadding: CGFloat = 8
+  static let maximumHeight: CGFloat = 372
+  static let width: CGFloat = 216
+  static let labelTextStyle: UIFont.TextStyle = .title3
+
+  static func itemHeight(
+    compatibleWith traitCollection: UITraitCollection
+  ) -> CGFloat {
+    let labelHeight = UIFont.preferredFont(
+      forTextStyle: labelTextStyle,
+      compatibleWith: traitCollection
+    ).lineHeight
+    return max(
+      minimumItemHeight,
+      ceil(labelHeight + (itemVerticalPadding * 2))
+    )
+  }
+
+  static func itemsHeight(
+    compatibleWith traitCollection: UITraitCollection
+  ) -> CGFloat {
+    (itemHeight(compatibleWith: traitCollection) * itemCount)
+      + (itemSpacing * (itemCount - 1))
+  }
+
+  static func contentHeight(
+    compatibleWith traitCollection: UITraitCollection
+  ) -> CGFloat {
+    (contentPadding * 2) + itemsHeight(compatibleWith: traitCollection)
+  }
+
+  static func size(
+    compatibleWith traitCollection: UITraitCollection,
+    maximumHeight: CGFloat = NativeAttachmentMenuLayout.maximumHeight
+  ) -> CGSize {
+    CGSize(
+      width: width,
+      height: min(
+        contentHeight(compatibleWith: traitCollection),
+        maximumHeight
+      )
+    )
+  }
+}
+
+func makeNativeAttachmentMenuButton(
+  title: String,
+  symbol: String,
+  action: UIAction
+) -> UIButton {
+  let button = UIButton(primaryAction: action)
+  button.accessibilityLabel = title
+
+  let symbolConfiguration = UIImage.SymbolConfiguration(
+    pointSize: 18,
+    weight: .regular
+  )
+  let iconView = UIImageView(
+    image: UIImage(
+      systemName: symbol,
+      withConfiguration: symbolConfiguration
+    )
+  )
+  iconView.tintColor = .label
+  iconView.contentMode = .center
+  iconView.translatesAutoresizingMaskIntoConstraints = false
+
+  let titleLabel = UILabel()
+  titleLabel.text = title
+  titleLabel.textColor = .label
+  titleLabel.font = .preferredFont(
+    forTextStyle: NativeAttachmentMenuLayout.labelTextStyle
+  )
+  titleLabel.adjustsFontForContentSizeCategory = true
+  titleLabel.textAlignment = .left
+  titleLabel.translatesAutoresizingMaskIntoConstraints = false
+
+  button.addSubview(iconView)
+  button.addSubview(titleLabel)
+  NSLayoutConstraint.activate([
+    iconView.leadingAnchor.constraint(
+      equalTo: button.leadingAnchor,
+      constant: 8
+    ),
+    iconView.centerYAnchor.constraint(equalTo: button.centerYAnchor),
+    iconView.widthAnchor.constraint(equalToConstant: 26),
+    titleLabel.leadingAnchor.constraint(
+      equalTo: iconView.trailingAnchor,
+      constant: 12
+    ),
+    titleLabel.trailingAnchor.constraint(
+      equalTo: button.trailingAnchor,
+      constant: -8
+    ),
+    titleLabel.centerYAnchor.constraint(equalTo: button.centerYAnchor),
+  ])
+  button.configurationUpdateHandler = { button in
+    button.alpha = button.isHighlighted ? 0.62 : 1
+  }
+  return button
+}
diff --git a/mobile/ios/RunnerTests/RunnerTests.swift b/mobile/ios/RunnerTests/RunnerTests.swift
index a174c78684..c5333cfdf2 100644
--- a/mobile/ios/RunnerTests/RunnerTests.swift
+++ b/mobile/ios/RunnerTests/RunnerTests.swift
@@ -6,6 +6,179 @@ import XCTest
 
 class RunnerTests: XCTestCase {
 
+  @MainActor
+  func testExpandedAttachmentSurfaceDismissesKeyboard() {
+    let window = KeyboardDismissalSpyWindow()
+
+    NativeAttachmentExpandedSurfaceBehavior.dismissKeyboard(in: window)
+
+    XCTAssertTrue(window.didForceEndEditing)
+  }
+
+  func testExpandedAttachmentSurfaceMeasuresKeyboardOverlap() {
+    XCTAssertEqual(
+      NativeAttachmentExpandedSurfaceBehavior.keyboardOverlap(
+        containerBounds: CGRect(x: 0, y: 0, width: 390, height: 844),
+        keyboardLayoutFrame: CGRect(
+          x: 0,
+          y: 544,
+          width: 390,
+          height: 300
+        )
+      ),
+      300
+    )
+    XCTAssertEqual(
+      NativeAttachmentExpandedSurfaceBehavior.keyboardOverlap(
+        containerBounds: CGRect(x: 0, y: 0, width: 390, height: 844),
+        keyboardLayoutFrame: CGRect(x: 0, y: 844, width: 390, height: 0)
+      ),
+      0
+    )
+  }
+
+  func testAttachmentMenuReturnsToKeyboardDismissedAnchor() {
+    let anchorBounds = CGRect(x: 0, y: 0, width: 44, height: 44)
+
+    XCTAssertEqual(
+      NativeAttachmentPopoverAnchorLayout.sourceRect(
+        anchorBounds: anchorBounds,
+        keyboardDismissalOffset: 300,
+        isExpanded: true
+      ),
+      anchorBounds.offsetBy(dx: 0, dy: 340)
+    )
+    XCTAssertEqual(
+      NativeAttachmentPopoverAnchorLayout.sourceRect(
+        anchorBounds: anchorBounds,
+        keyboardDismissalOffset: 300,
+        isExpanded: false
+      ),
+      anchorBounds.offsetBy(dx: 0, dy: 300)
+    )
+  }
+
+  func testAttachmentMenuKeepsKeyboardWhenMenuFitsAboveTrigger() {
+    XCTAssertEqual(
+      NativeAttachmentPopoverPresentationLayout.keyboardDismissalOffset(
+        sourceRect: CGRect(x: 320, y: 480, width: 44, height: 44),
+        containerBounds: CGRect(x: 0, y: 0, width: 390, height: 844),
+        safeAreaInsets: UIEdgeInsets(top: 59, left: 0, bottom: 34, right: 0),
+        keyboardLayoutFrame: CGRect(
+          x: 0,
+          y: 544,
+          width: 390,
+          height: 300
+        ),
+        menuHeight: NativeAttachmentMenuLayout.size(
+          compatibleWith: UITraitCollection(
+            preferredContentSizeCategory: .large
+          )
+        ).height
+      ),
+      0
+    )
+  }
+
+  func testAttachmentMenuDismissesKeyboardAndRepositionsInCompactHeight() {
+    let sourceRect = CGRect(x: 760, y: 168, width: 44, height: 44)
+    let keyboardDismissalOffset =
+      NativeAttachmentPopoverPresentationLayout.keyboardDismissalOffset(
+        sourceRect: sourceRect,
+        containerBounds: CGRect(x: 0, y: 0, width: 844, height: 390),
+        safeAreaInsets: UIEdgeInsets(top: 0, left: 59, bottom: 21, right: 59),
+        keyboardLayoutFrame: CGRect(
+          x: 0,
+          y: 228,
+          width: 844,
+          height: 162
+        ),
+        menuHeight: NativeAttachmentMenuLayout.size(
+          compatibleWith: UITraitCollection(
+            preferredContentSizeCategory: .large
+          )
+        ).height
+      )
+
+    XCTAssertEqual(keyboardDismissalOffset, 162)
+    XCTAssertEqual(
+      NativeAttachmentPopoverPresentationLayout.sourceRect(
+        sourceRect,
+        keyboardDismissalOffset: keyboardDismissalOffset
+      ),
+      sourceRect.offsetBy(dx: 0, dy: 162)
+    )
+  }
+
+  func testAttachmentMenuDoesNotMoveWithoutSoftwareKeyboard() {
+    XCTAssertEqual(
+      NativeAttachmentPopoverPresentationLayout.keyboardDismissalOffset(
+        sourceRect: CGRect(x: 760, y: 168, width: 44, height: 44),
+        containerBounds: CGRect(x: 0, y: 0, width: 844, height: 390),
+        safeAreaInsets: UIEdgeInsets(top: 0, left: 59, bottom: 21, right: 59),
+        keyboardLayoutFrame: CGRect(x: 0, y: 390, width: 844, height: 0),
+        menuHeight: NativeAttachmentMenuLayout.size(
+          compatibleWith: UITraitCollection(
+            preferredContentSizeCategory: .large
+          )
+        ).height
+      ),
+      0
+    )
+  }
+
+  func testEmbeddedPhotoPickerAppliesOneZoomInStepWithoutAnimation() {
+    var zoomInCalls = 0
+    var animationsWereEnabled = true
+
+    EmbeddedPhotoPickerLayout.applyPreferredScale {
+      zoomInCalls += 1
+      animationsWereEnabled = UIView.areAnimationsEnabled
+    }
+
+    XCTAssertEqual(zoomInCalls, 1)
+    XCTAssertFalse(animationsWereEnabled)
+  }
+
+  func testNativeAttachmentMenuUsesRoomyRowsAndInsets() {
+    let traits = UITraitCollection(preferredContentSizeCategory: .large)
+    let size = NativeAttachmentMenuLayout.size(compatibleWith: traits)
+
+    XCTAssertEqual(size.width, 216)
+    XCTAssertEqual(size.height, 264)
+    XCTAssertEqual(NativeAttachmentMenuLayout.contentPadding, 16)
+    XCTAssertEqual(
+      NativeAttachmentMenuLayout.itemHeight(compatibleWith: traits),
+      52
+    )
+    XCTAssertEqual(NativeAttachmentMenuLayout.itemSpacing, 8)
+    XCTAssertEqual(NativeAttachmentMenuLayout.labelTextStyle, .title3)
+  }
+
+  func testNativeAttachmentMenuGrowsAndScrollsForAccessibilityText() {
+    let traits = UITraitCollection(
+      preferredContentSizeCategory: .accessibilityExtraExtraExtraLarge
+    )
+    let itemHeight = NativeAttachmentMenuLayout.itemHeight(
+      compatibleWith: traits
+    )
+    let contentHeight = NativeAttachmentMenuLayout.contentHeight(
+      compatibleWith: traits
+    )
+    let size = NativeAttachmentMenuLayout.size(compatibleWith: traits)
+
+    XCTAssertGreaterThan(itemHeight, 52)
+    XCTAssertGreaterThan(contentHeight, 264)
+    XCTAssertEqual(
+      size.height,
+      min(contentHeight, NativeAttachmentMenuLayout.maximumHeight)
+    )
+    XCTAssertLessThanOrEqual(
+      size.height,
+      NativeAttachmentMenuLayout.maximumHeight
+    )
+  }
+
   func testDynamicIslandQrScannerRecognizesTallSafeAreas() {
     for safeAreaTopInset in [51, 59, 62] {
       XCTAssertTrue(
@@ -228,6 +401,15 @@ class RunnerTests: XCTestCase {
   }
 }
 
+private final class KeyboardDismissalSpyWindow: UIWindow {
+  private(set) var didForceEndEditing = false
+
+  override func endEditing(_ force: Bool) -> Bool {
+    didForceEndEditing = force
+    return true
+  }
+}
+
 private enum RelayImagePolicyError: Error {
   case invalidPng
   case invalidJpeg
diff --git a/mobile/lib/app.dart b/mobile/lib/app.dart
index 38a7e60aee..5b266c93f9 100644
--- a/mobile/lib/app.dart
+++ b/mobile/lib/app.dart
@@ -10,10 +10,13 @@ import 'features/pairing/pairing_page.dart';
 import 'features/channels/agent_activity/observer_subscription.dart';
 import 'features/channels/deep_link_dispatcher.dart';
 import 'features/profile/user_status_cache_provider.dart';
+import 'features/profile/settings_profile_header.dart';
+import 'features/settings/settings_page.dart';
 import 'shared/auth/auth.dart';
 import 'shared/deeplink/pending_deep_link_provider.dart';
 import 'shared/relay/relay.dart';
 import 'shared/theme/theme.dart';
+import 'shared/widgets/buzz_loading_indicator.dart';
 
 class App extends HookConsumerWidget {
   const App({super.key});
@@ -25,13 +28,25 @@ class App extends HookConsumerWidget {
     final schemeName = ref.watch(schemeProvider);
     final authState = ref.watch(authProvider);
 
-    final resolved = resolveSchemes(schemeName);
+    final resolved = resolveSchemes(schemeName, themeMode);
     final lightScheme = applyAccent(resolved.light, accentIndex);
     final darkScheme = applyAccent(resolved.dark, accentIndex);
-    // Default and named schemes can force light or dark mode; otherwise
-    // respect the user's ThemeMode preference.
+    // Light/Dark modes pin the brightness; System leaves it null so Flutter
+    // follows the OS across the selected theme and its pair.
     final effectiveMode = resolved.forcedMode ?? themeMode;
 
+    // Derive the gradient from the themes that produced each color scheme.
+    // This keeps fallbacks and pinned brightness changes aligned with the
+    // rendered palette rather than the raw persisted selection.
+    final buzzLightGradient = buzzTopSectionGradient(
+      resolved.lightTheme?.name ?? '',
+      lightScheme.brightness,
+    );
+    final buzzDarkGradient = buzzTopSectionGradient(
+      resolved.darkTheme?.name ?? '',
+      darkScheme.brightness,
+    );
+
     // Eagerly initialize websocket session and lifecycle observer when
     // authenticated. These providers connect and manage the websocket.
     if (authState.value?.status == AuthStatus.authenticated) {
@@ -65,15 +80,21 @@ class App extends HookConsumerWidget {
 
     return MaterialApp(
       title: 'Buzz',
-      theme: AppTheme.light(colorScheme: lightScheme),
-      darkTheme: AppTheme.dark(colorScheme: darkScheme),
+      theme: AppTheme.light(
+        colorScheme: lightScheme,
+        topSectionGradient: buzzLightGradient,
+      ),
+      darkTheme: AppTheme.dark(
+        colorScheme: darkScheme,
+        topSectionGradient: buzzDarkGradient,
+      ),
       themeMode: effectiveMode,
       home: authState.when(
         loading: () => const _SplashScreen(),
         error: (_, _) => const PairingPage(),
         data: (state) => switch (state.status) {
           AuthStatus.authenticated => const DeepLinkDispatcher(
-            child: HomePage(),
+            child: HomePage(settingsPageBuilder: _buildSettingsPage),
           ),
           _ => const DeepLinkDispatcher(
             dispatchMessageLinks: false,
@@ -85,11 +106,18 @@ class App extends HookConsumerWidget {
   }
 }
 
+Widget _buildSettingsPage(BuildContext context) =>
+    const SettingsPage(profileHeader: SettingsProfileHeader());
+
 class _SplashScreen extends StatelessWidget {
   const _SplashScreen();
 
   @override
   Widget build(BuildContext context) {
-    return const Scaffold(body: Center(child: CircularProgressIndicator()));
+    return const Scaffold(
+      body: Center(
+        child: BuzzLoadingIndicator(size: 56, semanticLabel: 'Starting Buzz'),
+      ),
+    );
   }
 }
diff --git a/mobile/lib/features/activity/activity_page.dart b/mobile/lib/features/activity/activity_page.dart
index 9e72340687..db39850481 100644
--- a/mobile/lib/features/activity/activity_page.dart
+++ b/mobile/lib/features/activity/activity_page.dart
@@ -1,23 +1,48 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 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/utils/string_utils.dart';
+import '../../shared/widgets/avatar_image.dart';
+import '../../shared/widgets/anchored_popover_menu.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
+import '../../shared/widgets/message_author_meta.dart';
 import '../channels/channel.dart';
 import '../channels/channel_detail_page.dart';
-import '../channels/message_content.dart';
 import '../channels/channels_provider.dart';
-import '../channels/small_avatar.dart';
+import '../channels/dm_channel_labels.dart';
+import '../channels/message_content.dart';
+import '../channels/read_state/read_state_format.dart';
+import '../channels/read_state/read_state_provider.dart';
 import '../profile/user_cache_provider.dart';
+import '../profile/user_profile.dart';
 import 'activity_provider.dart';
-import 'feed_item.dart';
+import 'compose_drafts_provider.dart';
+import 'inbox_item.dart';
+import 'inbox_local_state_provider.dart';
+import 'inbox_read_state.dart';
+import 'reminders_provider.dart';
 
-enum _Filter { all, mentions, needsAction, activity, agents }
+part 'activity_page/header_actions.dart';
+part 'activity_page/inbox_row.dart';
+part 'activity_page/lists.dart';
+part 'activity_page/status_views.dart';
 
+/// Conversation-oriented Activity inbox.
+///
+/// Matches desktop's Home inbox item design and semantics (see
+/// `desktop/src/features/home/ui/InboxListPane.tsx`): full sender avatar +
+/// name, contextual "Mentioned in #channel"-style label, unread dot + time,
+/// message preview — while keeping mobile's list → canonical destination
+/// navigation. Row taps deep-link to the represented message (oldest unread
+/// for grouped conversations) rather than just opening the channel.
 class ActivityPage extends HookConsumerWidget {
   const ActivityPage({super.key});
 
@@ -25,392 +50,272 @@ class ActivityPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final feedAsync = ref.watch(activityProvider);
     final channelsAsync = ref.watch(channelsProvider);
-    final filter = useState(_Filter.all);
+    final filter = useState(InboxFilter.all);
+    final unreadOnly = useState(false);
+    final headerTitleStyle = context.textTheme.titleMedium?.copyWith(
+      fontSize: 22,
+      fontWeight: FontWeight.w600,
+    );
 
-    // Cache last successful feed so the UI doesn't flash on rebuild.
-    final cachedFeed = useRef<HomeFeedResponse?>(null);
-    if (feedAsync.asData?.value case final data?) {
-      cachedFeed.value = data;
+    final readState = ref.watch(readStateProvider);
+    final localState = ref.watch(inboxLocalStateProvider);
+    final drafts = ref.watch(composeDraftsProvider);
+    final dueReminderCount = ref.watch(dueReminderCountProvider);
+    final allItems = ref.watch(inboxItemsProvider);
+    final myPk = ref.watch(myPubkeyProvider);
+
+    // Cache the last non-empty feed so the UI doesn't flash on rebuild.
+    final hasLoadedOnce = useRef(false);
+    if (feedAsync.hasValue) hasLoadedOnce.value = true;
+
+    final channels = channelsAsync.asData?.value ?? const <Channel>[];
+    final channelById = {for (final c in channels) c.id: c};
+
+    int? markerOf(String contextId) => readState.effectiveTimestamp(contextId);
+    bool isDone(InboxItem item) => isInboxItemDone(
+      item,
+      markerOf: markerOf,
+      localUnreadOverrides: localState.unreadIds,
+      localDoneSet: localState.doneIds,
+    );
+
+    final visibleItems = [
+      for (final item in allItems)
+        if (matchesInboxFilter(item, filter.value) &&
+            (!unreadOnly.value || !isDone(item)))
+          item,
+    ];
+
+    // Preload sender profiles for visible rows.
+    final pubkeys = visibleItems.map((i) => i.item.pubkey).toSet().toList();
+    ref.read(userCacheProvider.notifier).preload(pubkeys);
+
+    final unreadVisibleCount = visibleItems.where((i) => !isDone(i)).length;
+
+    void markItemRead(InboxItem item) {
+      final notifier = ref.read(readStateProvider.notifier);
+      ref
+          .read(inboxLocalStateProvider.notifier)
+          .clearUnread(groupedInboxItemIds(item));
+      final threadRootId = item.threadRootId;
+      if (threadRootId != null) {
+        notifier.markContextRead(
+          threadContextKey(threadRootId),
+          item.latestActivityAt,
+        );
+        final channelRead = groupedChannelReadTimestamp(item);
+        if (channelRead != null) {
+          notifier.markContextRead(
+            channelRead.channelId,
+            channelRead.timestamp,
+          );
+        }
+        return;
+      }
+      final channelId = item.item.channelId;
+      if (channelId != null) {
+        notifier.markContextRead(channelId, item.latestActivityAt);
+        ref
+            .read(channelsProvider.notifier)
+            .clearObservedUnreadCoveredByRead(channelId, item.latestActivityAt);
+        return;
+      }
+      ref.read(inboxLocalStateProvider.notifier).markDone(item.id);
+    }
+
+    void markItemUnread(InboxItem item) {
+      ref
+          .read(inboxLocalStateProvider.notifier)
+          .markUnread(groupedInboxItemIds(item));
+    }
+
+    void openItem(InboxItem item) {
+      final channelId = item.item.channelId;
+      if (channelId == null) {
+        ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+          const SnackBar(content: Text("This item isn't linked to a channel.")),
+        );
+        return;
+      }
+      final channel = channelById[channelId];
+      if (channel == null) {
+        ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+          const SnackBar(content: Text('Channel not found in this workspace.')),
+        );
+        return;
+      }
+
+      // Deep-link to the represented message: oldest unread in the group,
+      // falling back to the latest event.
+      final readAt = resolveInboxItemReadAt(item, markerOf: markerOf);
+      final target = item.deepLinkTarget(readAt);
+      final thread = threadReferenceOf(target.tags);
+      final threadRootId = isBroadcastReply(target.tags)
+          ? null
+          : thread.parentId;
+
+      Navigator.of(context).push(
+        MaterialPageRoute<void>(
+          builder: (_) => ChannelDetailPage(
+            channel: channel,
+            initialMessageId: target.id,
+            initialThreadRootId: threadRootId,
+          ),
+        ),
+      );
+    }
+
+    void openDraft(ComposeDraft draft) {
+      final channel = channelById[draft.channelId];
+      if (channel == null) {
+        ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+          const SnackBar(
+            content: Text('Channel for this draft is no longer available.'),
+          ),
+        );
+        return;
+      }
+      Navigator.of(context).push(
+        MaterialPageRoute<void>(
+          builder: (_) => ChannelDetailPage(
+            channel: channel,
+            initialThreadRootId: draft.threadHeadId,
+          ),
+        ),
+      );
+    }
+
+    void openReminder(Reminder reminder) {
+      final target = reminder.target;
+      if (target == null) {
+        ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+          const SnackBar(
+            content: Text("This reminder isn't linked to a message."),
+          ),
+        );
+        return;
+      }
+      final channel = channelById[target.channelId];
+      if (channel == null) {
+        ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+          const SnackBar(
+            content: Text('Channel for this reminder is no longer available.'),
+          ),
+        );
+        return;
+      }
+      Navigator.of(context).push(
+        MaterialPageRoute<void>(
+          builder: (_) => ChannelDetailPage(
+            channel: channel,
+            initialMessageId: target.eventId,
+          ),
+        ),
+      );
+    }
+
+    Future<void> refresh() async {
+      await Future.wait([
+        ref.read(activityProvider.notifier).refresh(),
+        ref.read(remindersProvider.notifier).refresh(),
+      ]);
     }
-    final feed = cachedFeed.value;
 
     final Widget body;
-    if (feed != null && !feed.isEmpty) {
-      final items = _filteredItems(feed, filter.value);
-      final channels = channelsAsync.asData?.value ?? [];
-
-      // Preload user profiles for visible feed items.
-      final pubkeys = items.map((i) => i.pubkey).toSet().toList();
-      ref.read(userCacheProvider.notifier).preload(pubkeys);
-
-      body = Column(
-        children: [
-          FilterChipBar<_Filter>(
-            selected: filter.value,
-            onSelected: (f) => filter.value = f,
-            items: [
-              const FilterChipItem(id: _Filter.all, label: 'All'),
-              FilterChipItem(
-                id: _Filter.mentions,
-                label: 'Mentions',
-                icon: LucideIcons.atSign,
-                count: feed.mentions.length,
-              ),
-              FilterChipItem(
-                id: _Filter.needsAction,
-                label: 'Action',
-                icon: LucideIcons.circleAlert,
-                count: feed.needsAction.length,
-              ),
-              FilterChipItem(
-                id: _Filter.activity,
-                label: 'Activity',
-                icon: LucideIcons.activity,
-                count: feed.activity.length,
-              ),
-              FilterChipItem(
-                id: _Filter.agents,
-                label: 'Agents',
-                icon: LucideIcons.bot,
-                count: feed.agentActivity.length,
-              ),
-            ],
-          ),
-          Expanded(
-            child: items.isEmpty
-                ? _EmptyFilterState(filter: filter.value)
-                : RefreshIndicator(
-                    onRefresh: () =>
-                        ref.read(activityProvider.notifier).refresh(),
-                    child: ListView.separated(
-                      padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
-                      itemCount: items.length,
-                      separatorBuilder: (_, _) =>
-                          const SizedBox(height: Grid.half),
-                      itemBuilder: (context, index) {
-                        final item = items[index];
-                        return _FeedItemTile(
-                          item: item,
-                          onTap: () => _openItem(context, item, channels),
-                        );
-                      },
-                    ),
-                  ),
-          ),
-        ],
+    if (filter.value == InboxFilter.reminders) {
+      body = _RemindersList(onOpen: openReminder, onRefresh: refresh);
+    } else if (filter.value == InboxFilter.drafts) {
+      body = _DraftsList(
+        drafts: drafts,
+        channelById: channelById,
+        myPubkey: myPk,
+        onOpen: openDraft,
+        onDelete: (draft) =>
+            ref.read(composeDraftsProvider.notifier).remove(draft.key),
       );
-    } else if (feedAsync.hasError) {
-      body = _ErrorView(
-        onRetry: () => ref.read(activityProvider.notifier).refresh(),
-      );
-    } else if (feedAsync.hasValue) {
-      body = const _EmptyState();
-    } else {
+    } else if (feedAsync.hasError && allItems.isEmpty) {
+      body = _ErrorView(onRetry: refresh);
+    } else if (!hasLoadedOnce.value && allItems.isEmpty) {
       body = const _LoadingSkeleton();
+    } else if (visibleItems.isEmpty) {
+      body = _EmptyFilterState(
+        filter: filter.value,
+        unreadOnly: unreadOnly.value,
+      );
+    } else {
+      // Compute the "New" boundary: index of the first unread row when the
+      // rows above it are read (list is newest-first, so unread rows sit on
+      // top; the divider marks where the unread block ends).
+      final firstReadIndex = visibleItems.indexWhere(isDone);
+      final newBoundaryIndex = !unreadOnly.value && firstReadIndex > 0
+          ? firstReadIndex
+          : -1;
+
+      body = RefreshIndicator(
+        onRefresh: refresh,
+        child: ListView.builder(
+          padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
+          itemCount: visibleItems.length,
+          itemBuilder: (context, index) {
+            final item = visibleItems[index];
+            final channel = item.item.channelId != null
+                ? channelById[item.item.channelId]
+                : null;
+            return Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                if (index == newBoundaryIndex) const _NewBoundaryDivider(),
+                _InboxRow(
+                  item: item,
+                  channel: channel,
+                  currentPubkey: myPk,
+                  isDone: isDone(item),
+                  onTap: () => openItem(item),
+                  onMarkRead: () => markItemRead(item),
+                  onMarkUnread: () => markItemUnread(item),
+                ),
+              ],
+            );
+          },
+        ),
+      );
     }
 
     return FrostedScaffold(
-      appBar: const FrostedAppBar(title: Text('Activity')),
+      backgroundColor: Colors.transparent,
+      appBar: FrostedAppBar(
+        gradient: context.appColors.topSectionGradient,
+        automaticallyImplyLeading: false,
+        title: const Text('Activity'),
+        titleStyle: headerTitleStyle,
+        actions: [
+          _FilterMenuButton(
+            filter: filter.value,
+            dueReminderCount: dueReminderCount,
+            draftCount: drafts.length,
+            onChanged: (f) => filter.value = f,
+          ),
+          _InboxOptionsButton(
+            unreadOnly: unreadOnly.value,
+            unreadCount: unreadVisibleCount,
+            onUnreadOnlyChanged: (v) => unreadOnly.value = v,
+            onMarkAllRead: () {
+              for (final item in visibleItems) {
+                if (!isDone(item)) markItemRead(item);
+              }
+            },
+          ),
+        ],
+      ),
       body: SafeArea(
         top: false,
         child: Padding(
-          padding: EdgeInsets.only(top: frostedAppBarHeight(context)),
+          padding: EdgeInsets.only(
+            top: frostedAppBarHeight(context, titleStyle: headerTitleStyle),
+          ),
           child: body,
         ),
       ),
     );
   }
-
-  List<FeedItem> _filteredItems(HomeFeedResponse feed, _Filter filter) {
-    return switch (filter) {
-      _Filter.all => feed.all,
-      _Filter.mentions => feed.mentions,
-      _Filter.needsAction => feed.needsAction,
-      _Filter.activity => feed.activity,
-      _Filter.agents => feed.agentActivity,
-    };
-  }
-
-  void _openItem(BuildContext context, FeedItem item, List<Channel> channels) {
-    if (item.channelId == null) return;
-    final channel = channels
-        .where((c) => c.id == item.channelId)
-        .cast<Channel?>()
-        .firstOrNull;
-    if (channel == null) return;
-    Navigator.of(context).push(
-      MaterialPageRoute<void>(
-        builder: (_) => ChannelDetailPage(channel: channel),
-      ),
-    );
-  }
-}
-
-class _FeedItemTile extends ConsumerWidget {
-  final FeedItem item;
-  final VoidCallback onTap;
-
-  const _FeedItemTile({required this.item, required this.onTap});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final userCache = ref.watch(userCacheProvider);
-    final profile = userCache[item.pubkey.toLowerCase()];
-    final authorLabel = profile?.label ?? _shortPubkey(item.pubkey);
-
-    return InkWell(
-      onTap: item.channelId != null ? onTap : null,
-      child: Padding(
-        padding: const EdgeInsets.symmetric(
-          horizontal: Grid.gutter,
-          vertical: Grid.twelve,
-        ),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            // Header row: icon + headline + author + channel + time
-            Row(
-              children: [
-                Expanded(
-                  child: Row(
-                    children: [
-                      Icon(
-                        _categoryIcon(item.category),
-                        size: 14,
-                        color: context.colors.primary,
-                      ),
-                      const SizedBox(width: Grid.half),
-                      Text(
-                        item.headline,
-                        style: context.textTheme.labelMedium?.copyWith(
-                          fontWeight: FontWeight.w600,
-                        ),
-                      ),
-                      const SizedBox(width: Grid.xxs),
-                      SmallAvatar(pubkey: item.pubkey, userCache: userCache),
-                      const SizedBox(width: Grid.quarter),
-                      Flexible(
-                        child: Text(
-                          authorLabel,
-                          style: context.textTheme.labelSmall?.copyWith(
-                            color: context.colors.onSurfaceVariant,
-                          ),
-                          overflow: TextOverflow.ellipsis,
-                        ),
-                      ),
-                      if (item.channelName.isNotEmpty) ...[
-                        const SizedBox(width: Grid.half),
-                        Flexible(
-                          child: Text(
-                            '#${item.channelName}',
-                            style: context.textTheme.labelSmall?.copyWith(
-                              color: context.colors.primary.withValues(
-                                alpha: 0.8,
-                              ),
-                            ),
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ),
-                      ],
-                    ],
-                  ),
-                ),
-                const SizedBox(width: Grid.xxs),
-                Text(
-                  _relativeTime(item.createdAt),
-                  style: context.textTheme.labelSmall?.copyWith(
-                    color: context.colors.onSurfaceVariant,
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: Grid.half),
-            // Content preview (max 2 lines)
-            MessageContent(
-              content: item.displayContent,
-              tags: item.tags,
-              maxLines: 2,
-              baseStyle: context.textTheme.bodySmall?.copyWith(
-                color: context.colors.onSurfaceVariant,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  static IconData _categoryIcon(String category) {
-    return switch (category) {
-      'mention' => LucideIcons.atSign,
-      'needs_action' => LucideIcons.circleAlert,
-      'agent_activity' => LucideIcons.bot,
-      _ => LucideIcons.activity,
-    };
-  }
-
-  static String _shortPubkey(String pk) =>
-      pk.length >= 8 ? '${pk.substring(0, 8)}...' : pk;
-
-  static String _relativeTime(int unixSeconds) {
-    final now = DateTime.now().millisecondsSinceEpoch ~/ 1000;
-    final diff = now - unixSeconds;
-
-    if (diff < 60) return 'now';
-    if (diff < 3600) return '${diff ~/ 60}m';
-    if (diff < 86400) return '${diff ~/ 3600}h';
-    if (diff < 604800) return '${diff ~/ 86400}d';
-    final date = DateTime.fromMillisecondsSinceEpoch(unixSeconds * 1000);
-    return '${date.month}/${date.day}';
-  }
-}
-
-class _LoadingSkeleton extends StatelessWidget {
-  const _LoadingSkeleton();
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView.separated(
-      padding: const EdgeInsets.all(Grid.xs),
-      itemCount: 8,
-      separatorBuilder: (_, _) => const SizedBox(height: Grid.xs),
-      itemBuilder: (context, _) => Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Container(
-            width: 180,
-            height: 12,
-            decoration: BoxDecoration(
-              color: context.colors.outlineVariant.withValues(alpha: 0.4),
-              borderRadius: BorderRadius.circular(4),
-            ),
-          ),
-          const SizedBox(height: Grid.xxs),
-          Container(
-            width: double.infinity,
-            height: 10,
-            decoration: BoxDecoration(
-              color: context.colors.outlineVariant.withValues(alpha: 0.3),
-              borderRadius: BorderRadius.circular(4),
-            ),
-          ),
-          const SizedBox(height: Grid.half),
-          Container(
-            width: 240,
-            height: 10,
-            decoration: BoxDecoration(
-              color: context.colors.outlineVariant.withValues(alpha: 0.2),
-              borderRadius: BorderRadius.circular(4),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class _EmptyState extends StatelessWidget {
-  const _EmptyState();
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Icon(
-            LucideIcons.bell,
-            size: Grid.xl,
-            color: context.colors.onSurfaceVariant,
-          ),
-          const SizedBox(height: Grid.xs),
-          Text(
-            'No activity yet',
-            style: context.textTheme.bodyLarge?.copyWith(
-              color: context.colors.onSurfaceVariant,
-            ),
-          ),
-          const SizedBox(height: Grid.half),
-          Text(
-            'Mentions, replies, and reactions will show up here.',
-            style: context.textTheme.bodySmall?.copyWith(
-              color: context.colors.onSurfaceVariant,
-            ),
-            textAlign: TextAlign.center,
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class _EmptyFilterState extends StatelessWidget {
-  final _Filter filter;
-
-  const _EmptyFilterState({required this.filter});
-
-  @override
-  Widget build(BuildContext context) {
-    final (icon, message) = switch (filter) {
-      _Filter.mentions => (LucideIcons.atSign, 'No mentions yet'),
-      _Filter.needsAction => (
-        LucideIcons.circleAlert,
-        'Nothing needs your action',
-      ),
-      _Filter.activity => (LucideIcons.activity, 'No recent channel activity'),
-      _Filter.agents => (LucideIcons.bot, 'No agent updates'),
-      _Filter.all => (LucideIcons.bell, 'No activity yet'),
-    };
-
-    return Center(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Icon(icon, size: Grid.lg, color: context.colors.onSurfaceVariant),
-          const SizedBox(height: Grid.xxs),
-          Text(
-            message,
-            style: context.textTheme.bodyMedium?.copyWith(
-              color: context.colors.onSurfaceVariant,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class _ErrorView extends StatelessWidget {
-  final VoidCallback onRetry;
-
-  const _ErrorView({required this.onRetry});
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Icon(
-            LucideIcons.triangleAlert,
-            size: Grid.lg,
-            color: context.colors.error,
-          ),
-          const SizedBox(height: Grid.xxs),
-          Text(
-            'Failed to load activity',
-            style: context.textTheme.bodyMedium?.copyWith(
-              color: context.colors.onSurfaceVariant,
-            ),
-          ),
-          const SizedBox(height: Grid.xs),
-          FilledButton.icon(
-            onPressed: onRetry,
-            icon: const Icon(LucideIcons.refreshCcw, size: 16),
-            label: const Text('Retry'),
-          ),
-        ],
-      ),
-    );
-  }
 }
diff --git a/mobile/lib/features/activity/activity_page/header_actions.dart b/mobile/lib/features/activity/activity_page/header_actions.dart
new file mode 100644
index 0000000000..56592e2e69
--- /dev/null
+++ b/mobile/lib/features/activity/activity_page/header_actions.dart
@@ -0,0 +1,236 @@
+part of '../activity_page.dart';
+
+const _filterLabels = <InboxFilter, String>{
+  InboxFilter.all: 'All',
+  InboxFilter.mention: 'Mentions',
+  InboxFilter.thread: 'Threads',
+  InboxFilter.needsAction: 'Needs Action',
+  InboxFilter.activity: 'Activity',
+  InboxFilter.agentActivity: 'Agents',
+  InboxFilter.reminders: 'Reminders',
+  InboxFilter.drafts: 'Drafts',
+};
+
+/// Compact filter dropdown replacing the old chip rail — mirrors desktop's
+/// inbox filter menu (`FILTER_OPTIONS`).
+class _FilterMenuButton extends StatelessWidget {
+  final InboxFilter filter;
+  final int dueReminderCount;
+  final int draftCount;
+  final ValueChanged<InboxFilter> onChanged;
+
+  const _FilterMenuButton({
+    required this.filter,
+    required this.dueReminderCount,
+    required this.draftCount,
+    required this.onChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Builder(
+      builder: (buttonContext) => InkWell(
+        key: const ValueKey('activity-filter-menu'),
+        borderRadius: BorderRadius.circular(Radii.md),
+        onTap: () async {
+          final selected = await showAnchoredPopover<InboxFilter>(
+            context: buttonContext,
+            width: 240,
+            alignment: AnchoredPopoverAlignment.start,
+            offset: const Offset(0, Grid.half),
+            menuPadding: const EdgeInsets.symmetric(vertical: Grid.half),
+            color: context.colors.surface.withValues(alpha: 0.98),
+            elevation: 8,
+            shadowColor: context.colors.shadow.withValues(alpha: 0.18),
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(Radii.card),
+              side: BorderSide(
+                color: context.colors.outlineVariant.withValues(alpha: 0.45),
+              ),
+            ),
+            surfaceKey: const ValueKey('activity-filter-popover'),
+            items: [
+              for (final entry in _filterLabels.entries)
+                PopupMenuItem(
+                  value: entry.key,
+                  height: Grid.xl,
+                  padding: const EdgeInsets.symmetric(horizontal: Grid.twelve),
+                  child: Row(
+                    children: [
+                      SizedBox(
+                        width: Grid.sm,
+                        child: entry.key == filter
+                            ? Icon(
+                                LucideIcons.check,
+                                size: 16,
+                                color: context.colors.primary,
+                              )
+                            : null,
+                      ),
+                      Expanded(
+                        child: Text(
+                          entry.value,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                          style: context.textTheme.labelLarge?.copyWith(
+                            color: context.colors.onSurface,
+                          ),
+                        ),
+                      ),
+                      if (entry.key == InboxFilter.reminders &&
+                          dueReminderCount > 0)
+                        _CountBadge(count: dueReminderCount)
+                      else if (entry.key == InboxFilter.drafts &&
+                          draftCount > 0)
+                        _CountBadge(count: draftCount),
+                    ],
+                  ),
+                ),
+            ],
+          );
+          if (buttonContext.mounted && selected != null) onChanged(selected);
+        },
+        child: ConstrainedBox(
+          constraints: const BoxConstraints(minHeight: Grid.xl),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: Grid.xxs),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(
+                  _filterLabels[filter]!,
+                  style: context.textTheme.labelLarge?.copyWith(
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(width: Grid.quarter),
+                Icon(
+                  LucideIcons.chevronDown,
+                  size: 16,
+                  color: context.colors.onSurfaceVariant,
+                ),
+                if (dueReminderCount > 0 || draftCount > 0) ...[
+                  const SizedBox(width: Grid.quarter),
+                  Container(
+                    width: 6,
+                    height: 6,
+                    decoration: BoxDecoration(
+                      shape: BoxShape.circle,
+                      color: context.colors.primary,
+                    ),
+                  ),
+                ],
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _CountBadge extends StatelessWidget {
+  final int count;
+
+  const _CountBadge({required this.count});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(
+        horizontal: Grid.half + Grid.quarter,
+        vertical: Grid.quarter,
+      ),
+      decoration: BoxDecoration(
+        color: context.colors.primary,
+        borderRadius: BorderRadius.circular(Grid.xxs),
+      ),
+      child: Text(
+        '$count',
+        style: context.textTheme.labelSmall?.copyWith(
+          color: context.colors.onPrimary,
+          fontWeight: FontWeight.w600,
+        ),
+      ),
+    );
+  }
+}
+
+/// Overflow menu with the unread-only toggle and mark-all-read, mirroring
+/// desktop's inbox options popover.
+class _InboxOptionsButton extends StatelessWidget {
+  final bool unreadOnly;
+  final int unreadCount;
+  final ValueChanged<bool> onUnreadOnlyChanged;
+  final VoidCallback onMarkAllRead;
+
+  const _InboxOptionsButton({
+    required this.unreadOnly,
+    required this.unreadCount,
+    required this.onUnreadOnlyChanged,
+    required this.onMarkAllRead,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Builder(
+      builder: (buttonContext) => IconButton(
+        key: const ValueKey('activity-options-menu'),
+        tooltip: 'Activity options',
+        icon: const Icon(LucideIcons.ellipsis, size: 20),
+        onPressed: () async {
+          final selected = await showAnchoredPopover<String>(
+            context: buttonContext,
+            width: 216,
+            alignment: AnchoredPopoverAlignment.end,
+            color: context.colors.surface,
+            elevation: 4,
+            shadowColor: context.colors.shadow.withValues(alpha: 0.18),
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(Radii.md),
+              side: BorderSide(color: context.colors.outline),
+            ),
+            surfaceKey: const ValueKey('activity-options-popover'),
+            items: [
+              PopupMenuItem(
+                value: 'unread-only',
+                child: Row(
+                  children: [
+                    Expanded(
+                      child: Text(unreadOnly ? 'Show all' : 'Show unread'),
+                    ),
+                    if (unreadOnly)
+                      Icon(
+                        LucideIcons.check,
+                        size: 16,
+                        color: context.colors.primary,
+                      ),
+                  ],
+                ),
+              ),
+              PopupMenuItem(
+                value: 'mark-all-read',
+                enabled: unreadCount > 0,
+                child: Row(
+                  children: [
+                    const Expanded(child: Text('Mark all as read')),
+                    if (unreadCount > 0)
+                      Text(
+                        '$unreadCount',
+                        style: context.textTheme.labelSmall?.copyWith(
+                          color: context.colors.onSurfaceVariant,
+                        ),
+                      ),
+                  ],
+                ),
+              ),
+            ],
+          );
+          if (!buttonContext.mounted || selected == null) return;
+          if (selected == 'unread-only') onUnreadOnlyChanged(!unreadOnly);
+          if (selected == 'mark-all-read') onMarkAllRead();
+        },
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/activity/activity_page/inbox_row.dart b/mobile/lib/features/activity/activity_page/inbox_row.dart
new file mode 100644
index 0000000000..fb267c03be
--- /dev/null
+++ b/mobile/lib/features/activity/activity_page/inbox_row.dart
@@ -0,0 +1,247 @@
+part of '../activity_page.dart';
+
+/// "New" boundary between unread and previously read rows.
+class _NewBoundaryDivider extends StatelessWidget {
+  const _NewBoundaryDivider();
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(
+        horizontal: Grid.gutter,
+        vertical: Grid.half,
+      ),
+      child: Row(
+        children: [
+          Expanded(
+            child: Divider(color: context.colors.error.withValues(alpha: 0.5)),
+          ),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: Grid.xxs),
+            child: Text(
+              'New',
+              style: context.textTheme.labelSmall?.copyWith(
+                color: context.colors.error,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+          ),
+          Expanded(
+            child: Divider(color: context.colors.error.withValues(alpha: 0.5)),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// One conversation row, matching desktop's inbox item hierarchy:
+/// avatar | sender + unread dot + time | contextual label | preview.
+class _InboxRow extends ConsumerWidget {
+  final InboxItem item;
+  final Channel? channel;
+  final String? currentPubkey;
+  final bool isDone;
+  final VoidCallback onTap;
+  final VoidCallback onMarkRead;
+  final VoidCallback onMarkUnread;
+
+  const _InboxRow({
+    required this.item,
+    required this.channel,
+    required this.currentPubkey,
+    required this.isDone,
+    required this.onTap,
+    required this.onMarkRead,
+    required this.onMarkUnread,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final userCache = ref.watch(userCacheProvider);
+    final profile = userCache[item.item.pubkey.toLowerCase()];
+    final senderLabel = profile?.displayName ?? shortPubkey(item.item.pubkey);
+
+    final isDm = channel?.isDm ?? false;
+    final channelName = channel != null && !isDm
+        ? (channel!.name.isNotEmpty ? channel!.name : null)
+        : null;
+    final label = inboxTypeLabel(
+      item,
+      channelName: channelName,
+      isDm: isDm,
+      senderLabel: senderLabel,
+    );
+
+    final mutedColor = context.colors.onSurfaceVariant;
+    final labelColor = item.isActionRequired && !isDone
+        ? context.colors.tertiary
+        : mutedColor;
+
+    return InkWell(
+      key: ValueKey('inbox-row-${item.id}'),
+      onTap: onTap,
+      onLongPress: () => _showRowActions(context),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: Grid.gutter,
+          vertical: Grid.twelve,
+        ),
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _RowAvatar(pubkey: item.item.pubkey, profile: profile),
+            const SizedBox(width: messageAvatarContentGap),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  // Sender + unread dot + timestamp.
+                  Row(
+                    children: [
+                      Expanded(
+                        child: MessageAuthorMeta(
+                          displayName: senderLabel,
+                          username: messageUsernameLabel(profile),
+                          timestamp: _inboxTimestamp(item.latestActivityAt),
+                          nameColor: context.colors.onSurface,
+                          metadataColor: mutedColor,
+                          nameStyle: activityUsernameTextStyle,
+                          metadataStyle: activityTimestampTextStyle,
+                          displayNameKey: ValueKey(
+                            'activity-author-${item.id}',
+                          ),
+                          usernameKey: ValueKey('activity-username-${item.id}'),
+                          timestampKey: ValueKey(
+                            'activity-timestamp-${item.id}',
+                          ),
+                        ),
+                      ),
+                      if (!isDone) ...[
+                        const SizedBox(width: Grid.xxs),
+                        Container(
+                          key: ValueKey('inbox-unread-dot-${item.id}'),
+                          width: 6,
+                          height: 6,
+                          decoration: BoxDecoration(
+                            shape: BoxShape.circle,
+                            color: context.colors.primary,
+                          ),
+                        ),
+                      ],
+                    ],
+                  ),
+                  const SizedBox(height: Grid.quarter),
+                  // Contextual label: "Mentioned in #channel" etc.
+                  Row(
+                    children: [
+                      Flexible(
+                        child: Text(
+                          label.text,
+                          style: activityContextTextStyle.copyWith(
+                            color: labelColor,
+                          ),
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                      ),
+                      if (label.channelLabel != null) ...[
+                        const SizedBox(width: Grid.half),
+                        Flexible(
+                          child: Container(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: Grid.half + Grid.quarter,
+                              vertical: Grid.quarter / 2,
+                            ),
+                            decoration: BoxDecoration(
+                              color: context.colors.surfaceContainerHighest,
+                              borderRadius: BorderRadius.circular(Grid.half),
+                            ),
+                            child: Text(
+                              '#${label.channelLabel}',
+                              style: activityContextTextStyle.copyWith(
+                                color: mutedColor,
+                              ),
+                              overflow: TextOverflow.ellipsis,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ],
+                  ),
+                  const SizedBox(height: Grid.half),
+                  // Message preview.
+                  MessageContent(
+                    content: item.item.displayContent,
+                    tags: item.item.tags,
+                    maxLines: 2,
+                    baseStyle: activityPreviewTextStyle.copyWith(
+                      color: context.colors.onSurface,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void _showRowActions(BuildContext context) {
+    showModalBottomSheet<void>(
+      context: context,
+      builder: (sheetContext) => SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            ListTile(
+              leading: Icon(
+                isDone ? LucideIcons.mail : LucideIcons.mailOpen,
+                size: 20,
+              ),
+              title: Text(isDone ? 'Mark unread' : 'Mark as read'),
+              onTap: () {
+                Navigator.of(sheetContext).pop();
+                isDone ? onMarkUnread() : onMarkRead();
+              },
+            ),
+            ListTile(
+              leading: const Icon(LucideIcons.externalLink, size: 20),
+              title: const Text('Open conversation'),
+              onTap: () {
+                Navigator.of(sheetContext).pop();
+                onTap();
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _RowAvatar extends StatelessWidget {
+  final String pubkey;
+  final UserProfile? profile;
+
+  const _RowAvatar({required this.pubkey, required this.profile});
+
+  @override
+  Widget build(BuildContext context) {
+    final initial =
+        profile?.initial ?? (pubkey.isNotEmpty ? pubkey[0].toUpperCase() : '?');
+    return AvatarImage(
+      imageUrl: profile?.avatarUrl,
+      radius: activityAvatarSize / 2,
+      backgroundColor: context.colors.primaryContainer,
+      fallback: Text(
+        initial,
+        style: TextStyle(
+          fontSize: 14,
+          fontWeight: FontWeight.w600,
+          color: context.colors.onPrimaryContainer,
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/activity/activity_page/lists.dart b/mobile/lib/features/activity/activity_page/lists.dart
new file mode 100644
index 0000000000..37311c9287
--- /dev/null
+++ b/mobile/lib/features/activity/activity_page/lists.dart
@@ -0,0 +1,165 @@
+part of '../activity_page.dart';
+
+/// Reminders surface for the Reminders filter — due/pending NIP-ER
+/// reminders that deep-link to their target message.
+class _RemindersList extends ConsumerWidget {
+  final void Function(Reminder reminder) onOpen;
+  final Future<void> Function() onRefresh;
+
+  const _RemindersList({required this.onOpen, required this.onRefresh});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final remindersAsync = ref.watch(remindersProvider);
+    final reminders = [
+      for (final r in remindersAsync.value ?? const <Reminder>[])
+        if (r.status == 'pending') r,
+    ];
+
+    if (remindersAsync.isLoading && reminders.isEmpty) {
+      return const Center(
+        child: BuzzLoadingIndicator(
+          size: 44,
+          semanticLabel: 'Loading reminders',
+        ),
+      );
+    }
+    if (reminders.isEmpty) {
+      return const _EmptySurface(
+        icon: LucideIcons.clock,
+        message: 'No reminders',
+        detail: 'Reminders you set will show up here.',
+      );
+    }
+
+    final now = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+    return RefreshIndicator(
+      onRefresh: onRefresh,
+      child: ListView.builder(
+        padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
+        itemCount: reminders.length,
+        itemBuilder: (context, index) {
+          final reminder = reminders[index];
+          final due = reminder.isDue(now);
+          final title = reminder.note?.trim().isNotEmpty == true
+              ? reminder.note!.trim()
+              : reminder.target?.preview ?? 'Reminder';
+          return ListTile(
+            key: ValueKey('reminder-row-${reminder.id}'),
+            leading: Icon(
+              due ? LucideIcons.bellRing : LucideIcons.clock,
+              size: 20,
+              color: due
+                  ? context.colors.primary
+                  : context.colors.onSurfaceVariant,
+            ),
+            title: Text(title, maxLines: 2, overflow: TextOverflow.ellipsis),
+            subtitle: reminder.notBefore != null
+                ? Text(
+                    due
+                        ? 'Due now'
+                        : 'Due ${_inboxTimestamp(reminder.notBefore!)}',
+                  )
+                : null,
+            onTap: () => onOpen(reminder),
+          );
+        },
+      ),
+    );
+  }
+}
+
+/// Drafts surface for the Drafts filter — locally saved unsent composer
+/// text that reopens the target composer.
+class _DraftsList extends StatelessWidget {
+  final List<ComposeDraft> drafts;
+  final Map<String, Channel> channelById;
+  final String? myPubkey;
+  final void Function(ComposeDraft draft) onOpen;
+  final void Function(ComposeDraft draft) onDelete;
+
+  const _DraftsList({
+    required this.drafts,
+    required this.channelById,
+    required this.myPubkey,
+    required this.onOpen,
+    required this.onDelete,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (drafts.isEmpty) {
+      return const _EmptySurface(
+        icon: LucideIcons.filePen,
+        message: 'No drafts',
+        detail: 'Unsent messages you start composing will show up here.',
+      );
+    }
+
+    return ListView.builder(
+      padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
+      itemCount: drafts.length,
+      itemBuilder: (context, index) {
+        final draft = drafts[index];
+        final channel = channelById[draft.channelId];
+        final destination = channel == null
+            ? 'Unavailable channel'
+            : channel.isDm
+            ? resolveDmChannelDisplayLabel(channel, currentPubkey: myPubkey)
+            : '#${channel.name}';
+        return ListTile(
+          key: ValueKey('draft-row-${draft.key}'),
+          leading: Icon(
+            LucideIcons.filePen,
+            size: 20,
+            color: context.colors.onSurfaceVariant,
+          ),
+          title: Text(draft.text, maxLines: 2, overflow: TextOverflow.ellipsis),
+          subtitle: Text(
+            draft.threadHeadId != null ? 'Thread in $destination' : destination,
+          ),
+          trailing: IconButton(
+            icon: const Icon(LucideIcons.trash2, size: 18),
+            tooltip: 'Delete draft',
+            onPressed: () => onDelete(draft),
+          ),
+          onTap: () => onOpen(draft),
+        );
+      },
+    );
+  }
+}
+
+/// Inbox list timestamp — desktop's `formatInboxTimestamp`:
+/// time today, "Yesterday", short date this year, dated otherwise.
+String _inboxTimestamp(int unixSeconds, {DateTime? now}) {
+  final current = now ?? DateTime.now();
+  final date = DateTime.fromMillisecondsSinceEpoch(unixSeconds * 1000);
+  final today = DateTime(current.year, current.month, current.day);
+  final day = DateTime(date.year, date.month, date.day);
+  final dayDiff = today.difference(day).inDays;
+
+  if (dayDiff == 0) {
+    final hour = date.hour % 12 == 0 ? 12 : date.hour % 12;
+    final minute = date.minute.toString().padLeft(2, '0');
+    return '$hour:$minute ${date.hour < 12 ? 'AM' : 'PM'}';
+  }
+  if (dayDiff == 1) return 'Yesterday';
+
+  const months = [
+    'Jan',
+    'Feb',
+    'Mar',
+    'Apr',
+    'May',
+    'Jun',
+    'Jul',
+    'Aug',
+    'Sep',
+    'Oct',
+    'Nov',
+    'Dec',
+  ];
+  final label = '${months[date.month - 1]} ${date.day}';
+  return date.year == current.year ? label : '$label, ${date.year}';
+}
diff --git a/mobile/lib/features/activity/activity_page/status_views.dart b/mobile/lib/features/activity/activity_page/status_views.dart
new file mode 100644
index 0000000000..11115d9dc8
--- /dev/null
+++ b/mobile/lib/features/activity/activity_page/status_views.dart
@@ -0,0 +1,172 @@
+part of '../activity_page.dart';
+
+class _LoadingSkeleton extends StatelessWidget {
+  const _LoadingSkeleton();
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.separated(
+      padding: const EdgeInsets.all(Grid.gutter),
+      itemCount: 8,
+      separatorBuilder: (_, _) => const SizedBox(height: Grid.xs),
+      itemBuilder: (context, _) => Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Container(
+            width: 36,
+            height: 36,
+            decoration: BoxDecoration(
+              shape: BoxShape.circle,
+              color: context.colors.outlineVariant.withValues(alpha: 0.4),
+            ),
+          ),
+          const SizedBox(width: Grid.twelve),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Container(
+                  width: 140,
+                  height: 12,
+                  decoration: BoxDecoration(
+                    color: context.colors.outlineVariant.withValues(alpha: 0.4),
+                    borderRadius: BorderRadius.circular(4),
+                  ),
+                ),
+                const SizedBox(height: Grid.xxs),
+                Container(
+                  width: double.infinity,
+                  height: 10,
+                  decoration: BoxDecoration(
+                    color: context.colors.outlineVariant.withValues(alpha: 0.3),
+                    borderRadius: BorderRadius.circular(4),
+                  ),
+                ),
+                const SizedBox(height: Grid.half),
+                Container(
+                  width: 220,
+                  height: 10,
+                  decoration: BoxDecoration(
+                    color: context.colors.outlineVariant.withValues(alpha: 0.2),
+                    borderRadius: BorderRadius.circular(4),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _EmptySurface extends StatelessWidget {
+  final IconData icon;
+  final String message;
+  final String? detail;
+
+  const _EmptySurface({required this.icon, required this.message, this.detail});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: Grid.gutter),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(icon, size: Grid.lg, color: context.colors.onSurfaceVariant),
+            const SizedBox(height: Grid.xxs),
+            Text(
+              message,
+              style: context.textTheme.bodyMedium?.copyWith(
+                color: context.colors.onSurfaceVariant,
+              ),
+            ),
+            if (detail != null) ...[
+              const SizedBox(height: Grid.half),
+              Text(
+                detail!,
+                style: context.textTheme.bodySmall?.copyWith(
+                  color: context.colors.onSurfaceVariant,
+                ),
+                textAlign: TextAlign.center,
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _EmptyFilterState extends StatelessWidget {
+  final InboxFilter filter;
+  final bool unreadOnly;
+
+  const _EmptyFilterState({required this.filter, required this.unreadOnly});
+
+  @override
+  Widget build(BuildContext context) {
+    if (unreadOnly) {
+      return const _EmptySurface(
+        icon: LucideIcons.mailOpen,
+        message: 'No unread messages',
+        detail: 'Turn off the unread filter to see read messages.',
+      );
+    }
+    final (icon, message) = switch (filter) {
+      InboxFilter.mention => (LucideIcons.atSign, 'No mentions yet'),
+      InboxFilter.thread => (
+        LucideIcons.messageSquare,
+        'No thread replies yet',
+      ),
+      InboxFilter.needsAction => (
+        LucideIcons.circleAlert,
+        'Nothing needs your action',
+      ),
+      InboxFilter.activity => (
+        LucideIcons.activity,
+        'No recent channel activity',
+      ),
+      InboxFilter.agentActivity => (LucideIcons.bot, 'No agent updates'),
+      _ => (LucideIcons.bell, 'No activity yet'),
+    };
+    return _EmptySurface(icon: icon, message: message);
+  }
+}
+
+class _ErrorView extends StatelessWidget {
+  final Future<void> Function() onRetry;
+
+  const _ErrorView({required this.onRetry});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(
+            LucideIcons.triangleAlert,
+            size: Grid.lg,
+            color: context.colors.error,
+          ),
+          const SizedBox(height: Grid.xxs),
+          Text(
+            'Failed to load activity',
+            style: context.textTheme.bodyMedium?.copyWith(
+              color: context.colors.onSurfaceVariant,
+            ),
+          ),
+          const SizedBox(height: Grid.xs),
+          FilledButton.icon(
+            onPressed: () => unawaited(onRetry()),
+            icon: const Icon(LucideIcons.refreshCcw, size: 16),
+            label: const Text('Retry'),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/activity/activity_provider.dart b/mobile/lib/features/activity/activity_provider.dart
index be6cfd9a59..87f00bf2bb 100644
--- a/mobile/lib/features/activity/activity_provider.dart
+++ b/mobile/lib/features/activity/activity_provider.dart
@@ -1,19 +1,45 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../shared/relay/relay.dart';
+import '../channels/channel.dart';
+import '../channels/channels_provider.dart';
 import 'feed_item.dart';
+import 'inbox_item.dart';
 
-/// Builds the home activity feed by issuing two parallel REQs over the relay
-/// websocket: one for mentions of me on user-visible channel kinds, and one
-/// for agent-activity / approval kinds addressed to me.
+/// Builds the Activity inbox feed over the relay websocket.
+///
+/// Sources mirror desktop's Home inbox (`useHomeFeedQuery` + `get_feed`):
+/// - mentions of me on user-visible channel kinds (also yields thread
+///   replies, which the thread filter classifies from NIP-10 tags)
+/// - workflow approvals / needs-action events addressed to me
+/// - agent job lifecycle events addressed to me (kinds 43001-43006)
+/// - recent DM messages from others (desktop surfaces DMs through p-tags;
+///   mobile queries DM channels directly so untagged DM sends still appear)
 class ActivityNotifier extends AsyncNotifier<HomeFeedResponse> {
   @override
   Future<HomeFeedResponse> build() {
     ref.watch(relayConfigProvider);
     ref.watch(relaySessionProvider);
+    // React to the DM channel set (loading → data, membership changes) so a
+    // cold start where channels resolve after the first fetch still surfaces
+    // DMs without a manual refresh.
+    ref.watch(channelsProvider.select(_dmChannelKey));
     return _fetch();
   }
 
+  /// Stable identity for the joined DM channel set: null while channels are
+  /// loading, otherwise the sorted member-DM ids. Keeps unrelated channel
+  /// updates from refetching the feed.
+  static String? _dmChannelKey(AsyncValue<List<Channel>> channels) {
+    final value = channels.asData?.value;
+    if (value == null) return null;
+    final ids = [
+      for (final channel in value)
+        if (channel.isDm && channel.isMember) channel.id,
+    ]..sort();
+    return ids.join(',');
+  }
+
   Future<HomeFeedResponse> _fetch() async {
     final myPk = ref.read(myPubkeyProvider);
     if (myPk == null) {
@@ -27,6 +53,15 @@ class ActivityNotifier extends AsyncNotifier<HomeFeedResponse> {
 
     final session = ref.read(relaySessionProvider.notifier);
 
+    // DM channels come from the channel list; while it is still loading the
+    // DM source is skipped, and build() rebuilds when it resolves (see the
+    // channelsProvider watch above).
+    final dmChannelIds = [
+      for (final channel
+          in ref.read(channelsProvider).asData?.value ?? const <Channel>[])
+        if (channel.isDm && channel.isMember) channel.id,
+    ];
+
     final results = await Future.wait([
       // Mentions of me on user-visible channel content.
       session.fetchHistory(
@@ -38,7 +73,7 @@ class ActivityNotifier extends AsyncNotifier<HomeFeedResponse> {
           limit: 50,
         ),
       ),
-      // Agent activity and approvals addressed to me.
+      // Workflow approvals addressed to me.
       session.fetchHistory(
         NostrFilter(
           kinds: const [46010, 46011, 46012],
@@ -48,24 +83,67 @@ class ActivityNotifier extends AsyncNotifier<HomeFeedResponse> {
           limit: 20,
         ),
       ),
+      // Agent job lifecycle events addressed to me.
+      session.fetchHistory(
+        NostrFilter(
+          kinds: const [43001, 43002, 43003, 43004, 43005, 43006],
+          tags: {
+            '#p': [myPk],
+          },
+          limit: 20,
+        ),
+      ),
+      // Recent DM traffic (filtered to other senders below).
+      if (dmChannelIds.isEmpty)
+        Future.value(const <NostrEvent>[])
+      else
+        session.fetchHistory(
+          NostrFilter(kinds: const [9], tags: {'#h': dmChannelIds}, limit: 30),
+        ),
     ]);
 
-    final mentions = results[0]
-        .where((e) => e.pubkey.toLowerCase() != myPk.toLowerCase())
-        .map((e) => _feedItem(e, category: 'mention'))
-        .toList();
-    final approvals = results[1]
-        .map((e) => _feedItem(e, category: 'needs_action'))
-        .toList();
+    bool isFromOther(NostrEvent e) =>
+        e.pubkey.toLowerCase() != myPk.toLowerCase();
 
-    mentions.sort((a, b) => b.createdAt.compareTo(a.createdAt));
-    approvals.sort((a, b) => b.createdAt.compareTo(a.createdAt));
+    // Dedupe across sources by event id, keeping the higher-priority
+    // category (needs_action > mention > agent_activity > activity).
+    final byId = <String, FeedItem>{};
+    void add(Iterable<NostrEvent> events, String category) {
+      for (final event in events) {
+        final existing = byId[event.id];
+        if (existing != null &&
+            categoryPriority(existing.category) <= categoryPriority(category)) {
+          continue;
+        }
+        byId[event.id] = _feedItem(event, category: category);
+      }
+    }
+
+    add(results[1], 'needs_action');
+    add(results[0].where(isFromOther), 'mention');
+    add(results[2], 'agent_activity');
+    add(results[3].where(isFromOther), 'activity');
+
+    final items = byId.values.toList()
+      ..sort((a, b) => b.createdAt.compareTo(a.createdAt));
 
     return HomeFeedResponse(
-      mentions: mentions,
-      needsAction: approvals,
-      activity: const [],
-      agentActivity: const [],
+      mentions: [
+        for (final i in items)
+          if (i.category == 'mention') i,
+      ],
+      needsAction: [
+        for (final i in items)
+          if (i.category == 'needs_action') i,
+      ],
+      activity: [
+        for (final i in items)
+          if (i.category == 'activity') i,
+      ],
+      agentActivity: [
+        for (final i in items)
+          if (i.category == 'agent_activity') i,
+      ],
     );
   }
 
@@ -92,3 +170,16 @@ final activityProvider =
     AsyncNotifierProvider<ActivityNotifier, HomeFeedResponse>(
       ActivityNotifier.new,
     );
+
+/// Conversation-grouped inbox rows derived from the raw feed. DM messages
+/// group by DM channel so one conversation renders as one row.
+final inboxItemsProvider = Provider<List<InboxItem>>((ref) {
+  final feed = ref.watch(activityProvider).value;
+  if (feed == null) return const [];
+  final dmChannelIds = {
+    for (final channel
+        in ref.watch(channelsProvider).asData?.value ?? const <Channel>[])
+      if (channel.isDm) channel.id,
+  };
+  return buildInboxItems(feed.all, isDmChannel: dmChannelIds.contains);
+});
diff --git a/mobile/lib/features/activity/compose_drafts_provider.dart b/mobile/lib/features/activity/compose_drafts_provider.dart
new file mode 100644
index 0000000000..b5755f19c8
--- /dev/null
+++ b/mobile/lib/features/activity/compose_drafts_provider.dart
@@ -0,0 +1,150 @@
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../../shared/relay/relay.dart';
+import '../../shared/theme/theme_provider.dart';
+
+const _draftsPrefsKey = 'compose_drafts_v1';
+const _maxDrafts = 50;
+
+/// A locally persisted, unsent composer draft.
+///
+/// Mobile has no durable relay-backed draft store (desktop keeps drafts
+/// locally too), so drafts are device-local by design: the inbox Drafts
+/// filter reflects what this device's composer has in flight.
+@immutable
+class ComposeDraft {
+  /// `<channelId>` for channel composers, `<channelId>:<threadHeadId>` for
+  /// thread composers.
+  final String key;
+  final String channelId;
+  final String? threadHeadId;
+  final String text;
+  final int updatedAt; // unix seconds
+
+  const ComposeDraft({
+    required this.key,
+    required this.channelId,
+    required this.threadHeadId,
+    required this.text,
+    required this.updatedAt,
+  });
+
+  Map<String, dynamic> toJson() => {
+    'key': key,
+    'channel_id': channelId,
+    if (threadHeadId != null) 'thread_head_id': threadHeadId,
+    'text': text,
+    'updated_at': updatedAt,
+  };
+
+  static ComposeDraft? fromJson(Object? raw) {
+    if (raw is! Map<String, dynamic>) return null;
+    final key = raw['key'];
+    final channelId = raw['channel_id'];
+    final text = raw['text'];
+    final updatedAt = raw['updated_at'];
+    if (key is! String || channelId is! String || text is! String) return null;
+    if (text.trim().isEmpty) return null;
+    return ComposeDraft(
+      key: key,
+      channelId: channelId,
+      threadHeadId: raw['thread_head_id'] as String?,
+      text: text,
+      updatedAt: updatedAt is int ? updatedAt : 0,
+    );
+  }
+}
+
+String composeDraftKey(String channelId, {String? threadHeadId}) =>
+    threadHeadId == null ? channelId : '$channelId:$threadHeadId';
+
+/// SharedPreferences-backed store of unsent composer drafts, newest first.
+///
+/// Drafts are plaintext, so persistence is namespaced by community (relay)
+/// and account pubkey: switching community or account rebuilds this provider
+/// against that identity's own store and can never surface another
+/// identity's draft text.
+class ComposeDraftsNotifier extends Notifier<List<ComposeDraft>> {
+  late String _prefsKey;
+
+  @override
+  List<ComposeDraft> build() {
+    // Rebuild (and re-read the identity-scoped store) whenever the active
+    // community or the derived account pubkey changes.
+    final config = ref.watch(relayConfigProvider);
+    final pubkey = ref.watch(myPubkeyProvider) ?? 'anon';
+    _prefsKey = '$_draftsPrefsKey:${config.baseUrl}:$pubkey';
+
+    final prefs = ref.read(savedPrefsProvider);
+    final raw = readMigratedPref<String>(
+      prefs,
+      canonicalKey: _prefsKey,
+      legacyKey: '$_draftsPrefsKey:${config.storedOrigin}:$pubkey',
+      read: prefs.getString,
+      write: prefs.setString,
+    );
+    if (raw == null) return const [];
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! List) return const [];
+      final drafts = decoded
+          .map(ComposeDraft.fromJson)
+          .whereType<ComposeDraft>()
+          .toList();
+      drafts.sort((a, b) => b.updatedAt.compareTo(a.updatedAt));
+      return drafts;
+    } catch (_) {
+      return const [];
+    }
+  }
+
+  /// Persist [text] for the composer identified by [key]. Empty text removes
+  /// the draft.
+  void save({
+    required String key,
+    required String channelId,
+    String? threadHeadId,
+    required String text,
+  }) {
+    if (text.trim().isEmpty) {
+      remove(key);
+      return;
+    }
+    final existing = state.where((d) => d.key == key).firstOrNull;
+    if (existing?.text == text) return;
+    final draft = ComposeDraft(
+      key: key,
+      channelId: channelId,
+      threadHeadId: threadHeadId,
+      text: text,
+      updatedAt: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+    );
+    final next = [draft, ...state.where((d) => d.key != key)];
+    _persist(next.length > _maxDrafts ? next.sublist(0, _maxDrafts) : next);
+  }
+
+  void remove(String key) {
+    if (!state.any((d) => d.key == key)) return;
+    _persist([...state.where((d) => d.key != key)]);
+  }
+
+  String? textFor(String key) =>
+      state.where((d) => d.key == key).firstOrNull?.text;
+
+  void _persist(List<ComposeDraft> drafts) {
+    state = List.unmodifiable(drafts);
+    final prefs = ref.read(savedPrefsProvider);
+    prefs.setString(
+      _prefsKey,
+      jsonEncode([for (final d in drafts) d.toJson()]),
+    );
+  }
+}
+
+final composeDraftsProvider =
+    NotifierProvider<ComposeDraftsNotifier, List<ComposeDraft>>(
+      ComposeDraftsNotifier.new,
+    );
diff --git a/mobile/lib/features/activity/feed_item.dart b/mobile/lib/features/activity/feed_item.dart
index 5d3d1012fc..84aa1eba49 100644
--- a/mobile/lib/features/activity/feed_item.dart
+++ b/mobile/lib/features/activity/feed_item.dart
@@ -41,6 +41,17 @@ class FeedItem {
     category: json['category'] as String,
   );
 
+  /// The message whose thread directly contains this item, when this event is
+  /// a reply. For nested replies this is the direct parent, not the outer root.
+  String? get threadHeadId {
+    for (final tag in tags) {
+      if (tag.length >= 4 && tag[0] == 'e' && tag[3] == 'reply') {
+        return tag[1];
+      }
+    }
+    return null;
+  }
+
   /// Human-readable headline based on event kind and category.
   String get headline {
     switch (kind) {
diff --git a/mobile/lib/features/activity/inbox_item.dart b/mobile/lib/features/activity/inbox_item.dart
new file mode 100644
index 0000000000..3fe618fc54
--- /dev/null
+++ b/mobile/lib/features/activity/inbox_item.dart
@@ -0,0 +1,284 @@
+import 'package:flutter/foundation.dart';
+
+import 'feed_item.dart';
+
+/// Inbox filters, mirroring desktop's `InboxFilter` in
+/// `desktop/src/features/home/lib/inbox.ts`.
+enum InboxFilter {
+  all,
+  mention,
+  thread,
+  needsAction,
+  activity,
+  agentActivity,
+  reminders,
+  drafts,
+}
+
+/// Category ordering used to pick the label for a grouped conversation.
+/// Mirrors desktop's `categoryPriority`.
+int categoryPriority(String category) {
+  return switch (category) {
+    'needs_action' => 0,
+    'mention' => 1,
+    'agent_activity' => 2,
+    _ => 3,
+  };
+}
+
+/// Thread reference from NIP-10 tags — desktop's `getThreadReference`.
+({String? parentId, String? rootId}) threadReferenceOf(
+  List<List<String>> tags,
+) {
+  List<String>? rootTag;
+  List<String>? replyTag;
+  for (final tag in tags) {
+    if (tag.length >= 4 && tag[0] == 'e') {
+      if (tag[3] == 'root') rootTag = tag;
+      if (tag[3] == 'reply') replyTag = tag;
+    }
+  }
+  if (replyTag == null) return (parentId: null, rootId: null);
+  final parentId = replyTag[1];
+  return (parentId: parentId, rootId: rootTag?[1] ?? parentId);
+}
+
+/// Broadcast replies surface at the channel top level — desktop's
+/// `isBroadcastReply`.
+bool isBroadcastReply(List<List<String>> tags) {
+  return tags.any(
+    (tag) => tag.length >= 2 && tag[0] == 'broadcast' && tag[1] == '1',
+  );
+}
+
+/// A thread reply that is not broadcast — desktop's `isThreadReply`.
+bool isThreadReply(List<List<String>> tags) {
+  return threadReferenceOf(tags).parentId != null && !isBroadcastReply(tags);
+}
+
+/// Stable conversation identity: `rootId ?? parentId ?? event.id`, except
+/// ordinary (non-thread) DM messages, which group by DM channel identity so
+/// one DM conversation renders as one row. Mirrors desktop's
+/// `getInboxConversationId`.
+String inboxConversationId(
+  List<List<String>> tags,
+  String eventId, {
+  String? dmChannelId,
+}) {
+  final thread = threadReferenceOf(tags);
+  final threadId = thread.rootId ?? thread.parentId;
+  if (threadId != null) return threadId;
+  if (dmChannelId != null) return 'dm:$dmChannelId';
+  return eventId;
+}
+
+/// One conversation-grouped inbox row. Mirrors desktop's `InboxItem`.
+@immutable
+class InboxItem {
+  /// Stable conversation identity for the thread group.
+  final String conversationId;
+
+  /// Representative (latest) event id.
+  final String id;
+
+  /// Representative (latest) feed item.
+  final FeedItem item;
+
+  /// All events grouped into this conversation, unordered.
+  final List<FeedItem> groupItems;
+
+  /// Distinct categories present in the group, priority-sorted.
+  final List<String> categories;
+
+  final bool isActionRequired;
+  final int latestActivityAt;
+
+  const InboxItem({
+    required this.conversationId,
+    required this.id,
+    required this.item,
+    required this.groupItems,
+    required this.categories,
+    required this.isActionRequired,
+    required this.latestActivityAt,
+  });
+
+  /// Root id if any grouped event carries thread-reply tags.
+  String? get threadRootId {
+    for (final candidate in [item, ...groupItems]) {
+      if (isThreadReply(candidate.tags)) {
+        return threadReferenceOf(candidate.tags).rootId;
+      }
+    }
+    return null;
+  }
+
+  /// The event the row should deep-link to: the oldest event in the group
+  /// newer than [readAt] (oldest unread), falling back to the latest event.
+  FeedItem deepLinkTarget(int? readAt) {
+    if (readAt != null) {
+      FeedItem? oldestUnread;
+      for (final candidate in groupItems) {
+        if (candidate.createdAt <= readAt) continue;
+        if (oldestUnread == null ||
+            candidate.createdAt < oldestUnread.createdAt) {
+          oldestUnread = candidate;
+        }
+      }
+      if (oldestUnread != null) return oldestUnread;
+    }
+    return item;
+  }
+}
+
+/// Contextual row label — desktop's `getInboxTypeLabel`:
+/// "DM from X" / "Mentioned in" / "Needs action in" / "Thread in" / "... in".
+({String text, String? channelLabel}) inboxTypeLabel(
+  InboxItem item, {
+  required String? channelName,
+  required bool isDm,
+  required String senderLabel,
+}) {
+  if (isDm) {
+    return (
+      text: senderLabel.isNotEmpty ? 'DM from $senderLabel' : 'DM',
+      channelLabel: null,
+    );
+  }
+
+  final category = item.categories.firstOrNull ?? item.item.category;
+  if (category == 'mention') {
+    return (
+      text: channelName != null ? 'Mentioned in' : 'Mentioned',
+      channelLabel: channelName,
+    );
+  }
+  if (category == 'needs_action') {
+    return (
+      text: channelName != null ? 'Needs action in' : 'Needs action',
+      channelLabel: channelName,
+    );
+  }
+  if (item.threadRootId != null) {
+    return (
+      text: channelName != null ? 'Thread in' : 'Thread',
+      channelLabel: channelName,
+    );
+  }
+
+  final headline = item.item.headline;
+  return (
+    text: channelName != null ? '$headline in' : headline,
+    channelLabel: channelName,
+  );
+}
+
+/// Whether [item] matches [filter] — desktop's `matchesInboxFilter`.
+/// `reminders` and `drafts` are separate surfaces and never match here.
+bool matchesInboxFilter(InboxItem item, InboxFilter filter) {
+  return switch (filter) {
+    InboxFilter.all => true,
+    InboxFilter.thread => [
+      item.item,
+      ...item.groupItems,
+    ].any((i) => isThreadReply(i.tags)),
+    InboxFilter.mention => item.categories.contains('mention'),
+    InboxFilter.needsAction => item.categories.contains('needs_action'),
+    InboxFilter.activity => item.categories.contains('activity'),
+    InboxFilter.agentActivity => item.categories.contains('agent_activity'),
+    InboxFilter.reminders || InboxFilter.drafts => false,
+  };
+}
+
+/// Group raw feed items into conversation rows sorted by latest activity.
+/// [isDmChannel] identifies DM channels so their ordinary top-level messages
+/// collapse into one row per DM conversation. Mirrors desktop's
+/// `buildInboxItems`.
+List<InboxItem> buildInboxItems(
+  Iterable<FeedItem> feedItems, {
+  bool Function(String channelId)? isDmChannel,
+}) {
+  final groups = <String, List<FeedItem>>{};
+  for (final item in feedItems) {
+    final channelId = item.channelId;
+    final dmChannelId =
+        channelId != null && (isDmChannel?.call(channelId) ?? false)
+        ? channelId
+        : null;
+    final key = inboxConversationId(
+      item.tags,
+      item.id,
+      dmChannelId: dmChannelId,
+    );
+    groups.putIfAbsent(key, () => []).add(item);
+  }
+
+  final rows = <InboxItem>[];
+  for (final entry in groups.entries) {
+    final items = entry.value;
+    var latest = items.first;
+    var latestActivityAt = 0;
+    for (final item in items) {
+      if (item.createdAt > latest.createdAt) latest = item;
+      if (item.createdAt > latestActivityAt) latestActivityAt = item.createdAt;
+    }
+    final categories = items.map((i) => i.category).toSet().toList()
+      ..sort((a, b) => categoryPriority(a).compareTo(categoryPriority(b)));
+
+    rows.add(
+      InboxItem(
+        conversationId: entry.key,
+        id: latest.id,
+        item: latest,
+        groupItems: List.unmodifiable(items),
+        categories: List.unmodifiable(categories),
+        isActionRequired: categories.contains('needs_action'),
+        latestActivityAt: latestActivityAt,
+      ),
+    );
+  }
+
+  rows.sort((a, b) => b.latestActivityAt.compareTo(a.latestActivityAt));
+  return rows;
+}
+
+/// Date-bucket label for section headers — desktop's `groupInboxItems`:
+/// Today / Yesterday / weekday (within 7 days) / short date.
+String inboxDayLabel(int unixSeconds, {DateTime? now}) {
+  final current = now ?? DateTime.now();
+  final date = DateTime.fromMillisecondsSinceEpoch(unixSeconds * 1000);
+  final today = DateTime(current.year, current.month, current.day);
+  final day = DateTime(date.year, date.month, date.day);
+  final dayDiff = today.difference(day).inDays;
+
+  if (dayDiff == 0) return 'Today';
+  if (dayDiff == 1) return 'Yesterday';
+  if (dayDiff < 7 && dayDiff > 0) {
+    const weekdays = [
+      'Monday',
+      'Tuesday',
+      'Wednesday',
+      'Thursday',
+      'Friday',
+      'Saturday',
+      'Sunday',
+    ];
+    return weekdays[date.weekday - 1];
+  }
+  const months = [
+    'Jan',
+    'Feb',
+    'Mar',
+    'Apr',
+    'May',
+    'Jun',
+    'Jul',
+    'Aug',
+    'Sep',
+    'Oct',
+    'Nov',
+    'Dec',
+  ];
+  final label = '${months[date.month - 1]} ${date.day}';
+  return date.year == current.year ? label : '$label, ${date.year}';
+}
diff --git a/mobile/lib/features/activity/inbox_local_state_provider.dart b/mobile/lib/features/activity/inbox_local_state_provider.dart
new file mode 100644
index 0000000000..ace1e9cb84
--- /dev/null
+++ b/mobile/lib/features/activity/inbox_local_state_provider.dart
@@ -0,0 +1,93 @@
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../../shared/theme/theme_provider.dart';
+
+const _localStateKey = 'activity_inbox_local_state_v1';
+const _maxTrackedIds = 500;
+
+/// Local, per-device inbox row overrides — mirrors desktop's
+/// `useFeedItemState`:
+/// - [doneIds] marks channel-less rows (e.g. approvals without an `h` tag)
+///   as read, since they have no NIP-RS context to advance.
+/// - [unreadIds] is the per-row "mark unread" override that reopens a row
+///   without rewinding the shared channel/thread read marker.
+@immutable
+class InboxLocalState {
+  final Set<String> doneIds;
+  final Set<String> unreadIds;
+
+  const InboxLocalState({required this.doneIds, required this.unreadIds});
+
+  const InboxLocalState.empty() : doneIds = const {}, unreadIds = const {};
+}
+
+class InboxLocalStateNotifier extends Notifier<InboxLocalState> {
+  @override
+  InboxLocalState build() {
+    final prefs = ref.read(savedPrefsProvider);
+    final raw = prefs.getString(_localStateKey);
+    if (raw == null) return const InboxLocalState.empty();
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! Map<String, dynamic>) {
+        return const InboxLocalState.empty();
+      }
+      Set<String> readIds(Object? value) =>
+          value is List ? value.whereType<String>().toSet() : const <String>{};
+      return InboxLocalState(
+        doneIds: readIds(decoded['done']),
+        unreadIds: readIds(decoded['unread']),
+      );
+    } catch (_) {
+      return const InboxLocalState.empty();
+    }
+  }
+
+  void markDone(String id) {
+    _update(
+      doneIds: {...state.doneIds, id},
+      unreadIds: {...state.unreadIds}..remove(id),
+    );
+  }
+
+  void markUnread(Iterable<String> ids) {
+    _update(
+      doneIds: {...state.doneIds}..removeAll(ids),
+      unreadIds: {...state.unreadIds, ...ids},
+    );
+  }
+
+  void clearUnread(Iterable<String> ids) {
+    if (!ids.any(state.unreadIds.contains)) return;
+    _update(
+      doneIds: state.doneIds,
+      unreadIds: {...state.unreadIds}..removeAll(ids),
+    );
+  }
+
+  void _update({required Set<String> doneIds, required Set<String> unreadIds}) {
+    Set<String> capped(Set<String> ids) => ids.length <= _maxTrackedIds
+        ? ids
+        : ids.skip(ids.length - _maxTrackedIds).toSet();
+    state = InboxLocalState(
+      doneIds: capped(doneIds),
+      unreadIds: capped(unreadIds),
+    );
+    final prefs = ref.read(savedPrefsProvider);
+    prefs.setString(
+      _localStateKey,
+      jsonEncode({
+        'done': state.doneIds.toList(),
+        'unread': state.unreadIds.toList(),
+      }),
+    );
+  }
+}
+
+final inboxLocalStateProvider =
+    NotifierProvider<InboxLocalStateNotifier, InboxLocalState>(
+      InboxLocalStateNotifier.new,
+    );
diff --git a/mobile/lib/features/activity/inbox_read_state.dart b/mobile/lib/features/activity/inbox_read_state.dart
new file mode 100644
index 0000000000..130562072c
--- /dev/null
+++ b/mobile/lib/features/activity/inbox_read_state.dart
@@ -0,0 +1,71 @@
+import '../channels/read_state/read_state_format.dart';
+import 'inbox_item.dart';
+
+/// Resolves the effective NIP-RS read marker for one inbox row, mirroring
+/// desktop's `resolveInboxItemReadAt`:
+/// - thread rows use `max(thread:<root>, msg:<id>)`
+/// - channel rows use the channel context marker
+/// - rows with no channel have no marker (caller falls back to local state)
+int? resolveInboxItemReadAt(
+  InboxItem item, {
+  required int? Function(String contextId) markerOf,
+}) {
+  final channelId = item.item.channelId;
+  final threadRootId = item.threadRootId;
+  if (threadRootId != null) {
+    return maxReadAt([
+      markerOf(threadContextKey(threadRootId)),
+      markerOf(msgContextKey(item.item.id)),
+    ]);
+  }
+  return channelId == null ? null : markerOf(channelId);
+}
+
+/// Whether the row is read ("done"), mirroring desktop's
+/// `useHomeInboxReadState` projection: a local unread override always wins;
+/// otherwise the row is done when no grouped activity is newer than the
+/// shared read marker; channel-less rows fall back to the local done set.
+bool isInboxItemDone(
+  InboxItem item, {
+  required int? Function(String contextId) markerOf,
+  required Set<String> localUnreadOverrides,
+  required Set<String> localDoneSet,
+}) {
+  final ids = groupedInboxItemIds(item);
+  if (ids.any(localUnreadOverrides.contains)) return false;
+
+  final readAt = resolveInboxItemReadAt(item, markerOf: markerOf);
+  if (readAt != null) return item.latestActivityAt <= readAt;
+
+  if (item.threadRootId != null || item.item.channelId != null) return false;
+  return localDoneSet.contains(item.id);
+}
+
+/// All event ids identified with the row — desktop's `getGroupedInboxItemIds`.
+List<String> groupedInboxItemIds(InboxItem item) {
+  return {item.id, item.item.id, ...item.groupItems.map((i) => i.id)}.toList();
+}
+
+/// The channel-level timestamp that marking a thread row read should also
+/// advance — desktop's `getGroupedChannelReadTimestamp`. Only top-level
+/// (non-thread-reply) grouped events count, so marking a thread read cannot
+/// swallow unrelated channel messages.
+({String channelId, int timestamp})? groupedChannelReadTimestamp(
+  InboxItem item,
+) {
+  final channelId = item.item.channelId;
+  if (channelId == null) return null;
+
+  int? timestamp;
+  for (final groupItem in item.groupItems) {
+    if (groupItem.channelId != channelId || isThreadReply(groupItem.tags)) {
+      continue;
+    }
+    if (timestamp == null || groupItem.createdAt > timestamp) {
+      timestamp = groupItem.createdAt;
+    }
+  }
+  return timestamp == null
+      ? null
+      : (channelId: channelId, timestamp: timestamp);
+}
diff --git a/mobile/lib/features/activity/reminders_provider.dart b/mobile/lib/features/activity/reminders_provider.dart
new file mode 100644
index 0000000000..333d8e10b2
--- /dev/null
+++ b/mobile/lib/features/activity/reminders_provider.dart
@@ -0,0 +1,224 @@
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:nostr/nostr.dart' as nostr;
+
+import '../../shared/crypto/nip44.dart';
+import '../../shared/relay/relay.dart';
+
+/// NIP-ER event reminder kind — matches desktop's `KIND_EVENT_REMINDER`.
+const kindEventReminder = 30300;
+
+/// Message a reminder points at. Mirrors desktop's `ReminderTarget`.
+@immutable
+class ReminderTarget {
+  final String eventId;
+  final String channelId;
+  final String preview;
+  final String authorPubkey;
+
+  const ReminderTarget({
+    required this.eventId,
+    required this.channelId,
+    required this.preview,
+    required this.authorPubkey,
+  });
+}
+
+/// A decrypted NIP-ER reminder. Mirrors desktop's `Reminder`.
+@immutable
+class Reminder {
+  /// The `d`-tag (unique reminder identity).
+  final String id;
+
+  /// Unix seconds when due; null for done/cancelled reminders.
+  final int? notBefore;
+
+  final String status; // "pending" | "done" | "cancelled"
+  final ReminderTarget? target;
+  final String? note;
+  final int createdAt;
+  final String eventId;
+
+  const Reminder({
+    required this.id,
+    required this.notBefore,
+    required this.status,
+    required this.target,
+    required this.note,
+    required this.createdAt,
+    required this.eventId,
+  });
+
+  bool isDue(int nowUnixSeconds) =>
+      status == 'pending' && notBefore != null && notBefore! <= nowUnixSeconds;
+}
+
+/// Parse NIP-ER `not_before`: ASCII digits, no leading zero except "0".
+/// Mirrors desktop's `parseNotBefore` strictness.
+int? parseNotBefore(String raw) {
+  if (!RegExp(r'^(0|[1-9][0-9]*)$').hasMatch(raw)) return null;
+  return int.tryParse(raw);
+}
+
+/// Validate decrypted reminder plaintext — desktop's `parseReminderContent`.
+/// Off-shape content fails closed (returns null).
+({String status, ReminderTarget? target, String? note})? parseReminderContent(
+  String plaintext,
+) {
+  final Object? parsed;
+  try {
+    parsed = jsonDecode(plaintext);
+  } catch (_) {
+    return null;
+  }
+  if (parsed is! Map<String, dynamic>) return null;
+
+  final status = parsed['status'];
+  if (status != 'pending' && status != 'done' && status != 'cancelled') {
+    return null;
+  }
+  final note = parsed['note'];
+  if (note != null && note is! String) return null;
+
+  ReminderTarget? target;
+  final rawTarget = parsed['target'];
+  if (rawTarget != null) {
+    if (rawTarget is! Map<String, dynamic>) return null;
+    final eventId = rawTarget['eventId'];
+    final channelId = rawTarget['channelId'];
+    final preview = rawTarget['preview'];
+    final authorPubkey = rawTarget['authorPubkey'];
+    if (eventId is! String ||
+        channelId is! String ||
+        preview is! String ||
+        authorPubkey is! String) {
+      return null;
+    }
+    target = ReminderTarget(
+      eventId: eventId,
+      channelId: channelId,
+      preview: preview,
+      authorPubkey: authorPubkey,
+    );
+  }
+
+  final noteText = note as String?;
+  if (target == null && (noteText == null || noteText.isEmpty)) return null;
+
+  return (status: status as String, target: target, note: noteText);
+}
+
+/// Decode one kind:30300 event into a [Reminder], or null when malformed.
+Reminder? decodeReminderEvent(
+  NostrEvent event, {
+  required String Function(String ciphertext) decrypt,
+}) {
+  String? dTag;
+  int? notBefore;
+  for (final tag in event.tags) {
+    if (tag.length >= 2 && tag[0] == 'd') dTag ??= tag[1];
+    if (tag.length >= 2 && tag[0] == 'not_before') {
+      notBefore ??= parseNotBefore(tag[1]);
+    }
+  }
+  if (dTag == null) return null;
+
+  final String plaintext;
+  try {
+    plaintext = decrypt(event.content);
+  } catch (_) {
+    return null;
+  }
+  final content = parseReminderContent(plaintext);
+  if (content == null) return null;
+
+  return Reminder(
+    id: dTag,
+    notBefore: notBefore,
+    status: content.status,
+    target: content.target,
+    note: content.note,
+    createdAt: event.createdAt,
+    eventId: event.id,
+  );
+}
+
+/// Fetches the user's NIP-ER reminders (kind 30300, self-encrypted). These
+/// are the same relay events Buzz Desktop reads and writes, so reminders
+/// created on Desktop appear here and vice versa.
+class RemindersNotifier extends AsyncNotifier<List<Reminder>> {
+  @override
+  Future<List<Reminder>> build() {
+    ref.watch(relayConfigProvider);
+    ref.watch(relaySessionProvider);
+    return _fetch();
+  }
+
+  Future<List<Reminder>> _fetch() async {
+    final config = ref.read(relayConfigProvider);
+    final myPk = ref.read(myPubkeyProvider);
+    final nsec = config.nsec?.trim();
+    if (myPk == null || nsec == null || nsec.isEmpty) return const [];
+
+    final String privkeyHex;
+    try {
+      privkeyHex = nostr.Nip19.decode(payload: nsec).data;
+    } catch (_) {
+      return const [];
+    }
+    if (privkeyHex.isEmpty) return const [];
+    final conversationKey = getConversationKey(privkeyHex, myPk);
+
+    final session = ref.read(relaySessionProvider.notifier);
+    final events = await session.fetchHistory(
+      NostrFilter(
+        kinds: const [kindEventReminder],
+        authors: [myPk],
+        limit: 200,
+      ),
+    );
+
+    // Parameterized-replaceable: keep only the newest event per d-tag.
+    final newestByDTag = <String, NostrEvent>{};
+    for (final event in events) {
+      final dTag = event.getTagValue('d');
+      if (dTag == null) continue;
+      final existing = newestByDTag[dTag];
+      if (existing == null || event.createdAt > existing.createdAt) {
+        newestByDTag[dTag] = event;
+      }
+    }
+
+    final reminders = <Reminder>[];
+    for (final event in newestByDTag.values) {
+      final reminder = decodeReminderEvent(
+        event,
+        decrypt: (ciphertext) => nip44Decrypt(conversationKey, ciphertext),
+      );
+      if (reminder != null) reminders.add(reminder);
+    }
+    reminders.sort(
+      (a, b) =>
+          (a.notBefore ?? a.createdAt).compareTo(b.notBefore ?? b.createdAt),
+    );
+    return reminders;
+  }
+
+  Future<void> refresh() async {
+    state = await AsyncValue.guard(_fetch);
+  }
+}
+
+final remindersProvider =
+    AsyncNotifierProvider<RemindersNotifier, List<Reminder>>(
+      RemindersNotifier.new,
+    );
+
+/// Count of due pending reminders — powers the filter badge.
+final dueReminderCountProvider = Provider<int>((ref) {
+  final reminders = ref.watch(remindersProvider).value ?? const <Reminder>[];
+  final now = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+  return reminders.where((r) => r.isDue(now)).length;
+});
diff --git a/mobile/lib/features/channels/agent_activity/agent_activity_sheet.dart b/mobile/lib/features/channels/agent_activity/agent_activity_sheet.dart
index c0c7640617..26a53f8903 100644
--- a/mobile/lib/features/channels/agent_activity/agent_activity_sheet.dart
+++ b/mobile/lib/features/channels/agent_activity/agent_activity_sheet.dart
@@ -4,6 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../../../shared/theme/theme.dart';
+import '../../../shared/widgets/buzz_loading_indicator.dart';
 import '../../profile/user_cache_provider.dart';
 import '../date_formatters.dart';
 import 'observer_models.dart';
@@ -189,13 +190,10 @@ class _EmptyState extends StatelessWidget {
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          SizedBox(
-            width: 24,
-            height: 24,
-            child: CircularProgressIndicator(
-              strokeWidth: 2,
-              color: context.colors.onSurfaceVariant,
-            ),
+          BuzzLoadingIndicator(
+            size: 28,
+            color: context.colors.onSurfaceVariant,
+            semanticLabel: 'Waiting for agent activity',
           ),
           const SizedBox(height: Grid.xxs),
           Text(
diff --git a/mobile/lib/features/channels/camera_capture_cleanup.dart b/mobile/lib/features/channels/camera_capture_cleanup.dart
index 6937218c9e..469a150e13 100644
--- a/mobile/lib/features/channels/camera_capture_cleanup.dart
+++ b/mobile/lib/features/channels/camera_capture_cleanup.dart
@@ -5,16 +5,26 @@ import 'package:image_picker/image_picker.dart';
 Future<void> processCapturedImage(
   XFile image,
   Future<void> Function(XFile image) onCapture,
+) async {
+  await processTemporaryImages([image], (images) => onCapture(images.single));
+}
+
+/// Processes native-owned [images], then removes their temporary files.
+Future<void> processTemporaryImages(
+  List<XFile> images,
+  Future<void> Function(List<XFile> images) process,
 ) async {
   try {
-    await onCapture(image);
+    await process(images);
   } finally {
-    final path = image.path;
-    if (path.isNotEmpty) {
-      try {
-        await File(path).delete();
-      } on FileSystemException {
-        // The camera plugin may already have removed its temporary file.
+    for (final image in images) {
+      final path = image.path;
+      if (path.isNotEmpty) {
+        try {
+          await File(path).delete();
+        } on FileSystemException {
+          // The native picker may already have removed its temporary file.
+        }
       }
     }
   }
diff --git a/mobile/lib/features/channels/channel_detail_page.dart b/mobile/lib/features/channels/channel_detail_page.dart
index 8a44b499b5..4304705f90 100644
--- a/mobile/lib/features/channels/channel_detail_page.dart
+++ b/mobile/lib/features/channels/channel_detail_page.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
+import 'dart:math' show min;
 
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart' show ScrollDirection;
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
@@ -9,8 +11,11 @@ import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 import '../../shared/relay/relay.dart';
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
+import '../../shared/widgets/message_author_meta.dart';
+import '../../shared/widgets/skeleton.dart';
 import '../profile/presence_cache_provider.dart';
 import '../profile/profile_provider.dart';
 import '../profile/user_cache_provider.dart';
@@ -22,6 +27,7 @@ import 'agent_activity/working_bots_provider.dart';
 import 'channel_management_provider.dart';
 import 'channel_messages_provider.dart';
 import 'channel_typing_provider.dart';
+import 'channel_typing_indicator.dart';
 import 'channels_provider.dart';
 import 'compose_bar.dart';
 import 'date_formatters.dart';
@@ -121,6 +127,7 @@ class ChannelDetailPage extends HookConsumerWidget {
     final detailsAsync = ref.watch(channelDetailsProvider(channel.id));
     final channelsAsync = ref.watch(channelsProvider);
     final messagesState = ref.watch(channelMessagesProvider(channel.id));
+    final sessionStatus = ref.watch(relaySessionProvider).status;
     final readState = ref.watch(readStateProvider);
     final currentPubkey = ref
         .watch(profileProvider)
@@ -148,6 +155,33 @@ class ChannelDetailPage extends HookConsumerWidget {
         channel;
     final resolvedChannel =
         detailsAsync.whenData(baseChannel.mergeDetails).value ?? baseChannel;
+    final messagesNotifier = ref.read(
+      channelMessagesProvider(channel.id).notifier,
+    );
+    final isConnectionInProgress =
+        sessionStatus == SessionStatus.connecting ||
+        sessionStatus == SessionStatus.reconnecting;
+    final showConnectionSkeleton = useState(false);
+    final shouldDebounceConnectionSkeleton =
+        isConnectionInProgress &&
+        (resolvedChannel.isForum || messagesNotifier.hasLoadedMessages);
+    useEffect(() {
+      if (!shouldDebounceConnectionSkeleton) {
+        showConnectionSkeleton.value = false;
+        return null;
+      }
+      final timer = Timer(const Duration(seconds: 2), () {
+        showConnectionSkeleton.value = true;
+      });
+      return timer.cancel;
+    }, [shouldDebounceConnectionSkeleton]);
+    final showInitialConnectionSkeleton =
+        !resolvedChannel.isForum &&
+        isConnectionInProgress &&
+        !messagesNotifier.hasLoadedMessages;
+    final appBarTitleContentHeight = resolvedChannel.isDm
+        ? _dmAppBarTitleContentHeight(context)
+        : 0.0;
     final readTimestamp = _channelReadTimestamp(
       channel: resolvedChannel,
       messagesState: messagesState,
@@ -185,6 +219,8 @@ class ChannelDetailPage extends HookConsumerWidget {
     return FrostedScaffold(
       appBar: FrostedAppBar(
         iconColor: context.colors.primary,
+        titleContentHeight: appBarTitleContentHeight,
+        titleStyle: channelTitleTextStyle,
         title: resolvedChannel.isDm
             ? _DmAppBarTitle(
                 channel: resolvedChannel,
@@ -255,60 +291,95 @@ class ChannelDetailPage extends HookConsumerWidget {
         children: [
           Expanded(
             child: resolvedChannel.isForum
-                ? ForumPostsView(
-                    channel: resolvedChannel,
-                    currentPubkey: currentPubkey,
+                ? Stack(
+                    fit: StackFit.expand,
+                    children: [
+                      ForumPostsView(
+                        channel: resolvedChannel,
+                        currentPubkey: currentPubkey,
+                      ),
+                      if (showConnectionSkeleton.value)
+                        Positioned(
+                          top:
+                              frostedAppBarHeight(
+                                context,
+                                titleContentHeight: appBarTitleContentHeight,
+                              ) +
+                              Grid.xs,
+                          left: Grid.gutter,
+                          right: Grid.gutter,
+                          child: _ForumConnectionSkeleton(
+                            status: sessionStatus,
+                          ),
+                        ),
+                    ],
                   )
-                : messagesState.when(
-                    loading: () => Padding(
-                      padding: EdgeInsets.only(
-                        top: frostedAppBarHeight(context),
-                      ),
-                      child: const Center(child: CircularProgressIndicator()),
+                : SkeletonReveal(
+                    loading:
+                        showInitialConnectionSkeleton ||
+                        showConnectionSkeleton.value ||
+                        messagesState.isLoading,
+                    shimmerEnabled: sessionStatus != SessionStatus.disconnected,
+                    skeleton: _MessageTimelineSkeleton(
+                      appBarTitleContentHeight: appBarTitleContentHeight,
+                      status: sessionStatus,
                     ),
-                    error: (e, _) => Padding(
-                      padding: EdgeInsets.only(
-                        top: frostedAppBarHeight(context),
-                      ),
-                      child: Center(
-                        child: Text(
-                          'Failed to load messages',
-                          style: context.textTheme.bodyMedium?.copyWith(
-                            color: context.colors.error,
+                    content: messagesState.when(
+                      loading: SizedBox.shrink,
+                      error: (e, _) => Padding(
+                        padding: EdgeInsets.only(
+                          top: frostedAppBarHeight(
+                            context,
+                            titleContentHeight: appBarTitleContentHeight,
+                          ),
+                        ),
+                        child: Center(
+                          child: Text(
+                            'Failed to load messages',
+                            style: context.textTheme.bodyMedium?.copyWith(
+                              color: context.colors.error,
+                            ),
                           ),
                         ),
                       ),
+                      data: (events) {
+                        final messages = formatTimeline(
+                          events,
+                          currentPubkey: currentPubkey,
+                        );
+                        final summaries = ref
+                            .read(channelMessagesProvider(channel.id).notifier)
+                            .threadSummaries;
+                        final entries = buildMainTimelineEntries(
+                          messages,
+                          relaySummaries: summaries,
+                        );
+                        return _MessageList(
+                          entries: entries,
+                          allMessages: messages,
+                          initialMessageId: initialMessageId,
+                          initialThreadRootId: initialThreadRootId,
+                          channelId: channel.id,
+                          currentPubkey: currentPubkey,
+                          isMember: resolvedChannel.isMember,
+                          isArchived: resolvedChannel.isArchived,
+                          appBarTitleContentHeight: appBarTitleContentHeight,
+                        );
+                      },
                     ),
-                    data: (events) {
-                      final messages = formatTimeline(
-                        events,
-                        currentPubkey: currentPubkey,
-                      );
-                      final summaries = ref
-                          .read(channelMessagesProvider(channel.id).notifier)
-                          .threadSummaries;
-                      final entries = buildMainTimelineEntries(
-                        messages,
-                        relaySummaries: summaries,
-                      );
-                      return _MessageList(
-                        entries: entries,
-                        allMessages: messages,
-                        initialMessageId: initialMessageId,
-                        initialThreadRootId: initialThreadRootId,
-                        channelId: channel.id,
-                        currentPubkey: currentPubkey,
-                        isMember: resolvedChannel.isMember,
-                        isArchived: resolvedChannel.isArchived,
-                      );
-                    },
                   ),
           ),
-          _DetailConnectionBanner(
-            status: ref.watch(relaySessionProvider).status,
-          ),
-          if (!resolvedChannel.isForum && typingEntries.isNotEmpty)
-            _TypingIndicator(entries: typingEntries),
+          if (!resolvedChannel.isForum)
+            AnimatedSize(
+              duration: MediaQuery.disableAnimationsOf(context)
+                  ? Duration.zero
+                  : const Duration(milliseconds: 180),
+              curve: Curves.easeOutCubic,
+              alignment: Alignment.bottomCenter,
+              child: typingEntries.isEmpty
+                  ? const SizedBox.shrink()
+                  : ChannelTypingIndicator(entries: typingEntries),
+            ),
           if (!resolvedChannel.isForum &&
               resolvedChannel.isMember &&
               !resolvedChannel.isArchived)
diff --git a/mobile/lib/features/channels/channel_detail_page/app_bar.dart b/mobile/lib/features/channels/channel_detail_page/app_bar.dart
index de1dd56da8..406d68b4f5 100644
--- a/mobile/lib/features/channels/channel_detail_page/app_bar.dart
+++ b/mobile/lib/features/channels/channel_detail_page/app_bar.dart
@@ -1,67 +1,22 @@
 part of '../channel_detail_page.dart';
 
-class _TypingIndicator extends ConsumerWidget {
-  final List<TypingEntry> entries;
+double _scaledTextHeight(BuildContext context, TextStyle style) {
+  final scaledFontSize = MediaQuery.textScalerOf(
+    context,
+  ).scale(style.fontSize ?? 0);
+  return scaledFontSize * (style.height ?? 1);
+}
 
-  const _TypingIndicator({required this.entries});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final userCache = ref.watch(userCacheProvider);
-    final names = entries.map((e) {
-      final profile =
-          userCache[e.pubkey.toLowerCase()] ??
-          ref.read(userCacheProvider.notifier).get(e.pubkey.toLowerCase());
-      return profile?.label ?? shortPubkey(e.pubkey);
-    }).toList();
-    final text = switch (names.length) {
-      1 => '${names[0]} is typing…',
-      2 => '${names[0]} and ${names[1]} are typing…',
-      _ => '${names[0]} and ${names.length - 1} others are typing…',
-    };
-
-    final visibleEntries = entries.take(3).toList();
-    final avatarCount = visibleEntries.length;
-
-    return Container(
-      width: double.infinity,
-      padding: const EdgeInsets.symmetric(
-        horizontal: Grid.gutter,
-        vertical: Grid.quarter + 2,
-      ),
-      child: Row(
-        children: [
-          SizedBox(
-            width: 20.0 + (avatarCount - 1) * 12.0,
-            height: 20,
-            child: Stack(
-              children: [
-                for (var i = 0; i < avatarCount; i++)
-                  Positioned(
-                    left: i * 12.0,
-                    child: SmallAvatar(
-                      pubkey: visibleEntries[i].pubkey,
-                      userCache: userCache,
-                    ),
-                  ),
-              ],
-            ),
-          ),
-          const SizedBox(width: Grid.xxs),
-          Flexible(
-            child: Text(
-              text,
-              style: context.textTheme.labelSmall?.copyWith(
-                color: context.colors.outline,
-                fontStyle: FontStyle.italic,
-              ),
-              overflow: TextOverflow.ellipsis,
-            ),
-          ),
-        ],
-      ),
-    );
+double _dmAppBarTitleContentHeight(BuildContext context) {
+  const titleStyle = channelTitleTextStyle;
+  final presenceStyle = context.textTheme.bodySmall;
+  if (presenceStyle == null) {
+    return 30;
   }
+  final textHeight =
+      _scaledTextHeight(context, titleStyle) +
+      _scaledTextHeight(context, presenceStyle);
+  return textHeight > 30 ? textHeight : 30;
 }
 
 class _MembersButton extends ConsumerWidget {
@@ -221,7 +176,7 @@ class _DmAppBarTitle extends ConsumerWidget {
                       ),
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
-                      style: context.textTheme.titleSmall,
+                      style: channelTitleTextStyle,
                     ),
                   ),
                   if (channel.isEphemeral) ...[
diff --git a/mobile/lib/features/channels/channel_detail_page/banners.dart b/mobile/lib/features/channels/channel_detail_page/banners.dart
index d94fe5e5b5..2ed9c23a5f 100644
--- a/mobile/lib/features/channels/channel_detail_page/banners.dart
+++ b/mobile/lib/features/channels/channel_detail_page/banners.dart
@@ -54,44 +54,160 @@ class _HeaderEphemeralBadge extends StatelessWidget {
   }
 }
 
-class _DetailConnectionBanner extends StatelessWidget {
+class _MessageTimelineSkeleton extends StatelessWidget {
+  final double appBarTitleContentHeight;
   final SessionStatus status;
 
-  const _DetailConnectionBanner({required this.status});
+  const _MessageTimelineSkeleton({
+    required this.appBarTitleContentHeight,
+    required this.status,
+  });
 
   @override
   Widget build(BuildContext context) {
-    if (status == SessionStatus.connected ||
-        status == SessionStatus.disconnected) {
-      return const SizedBox.shrink();
-    }
-
-    return Container(
-      width: double.infinity,
-      padding: const EdgeInsets.symmetric(
-        horizontal: Grid.gutter,
-        vertical: Grid.quarter + 2,
-      ),
-      color: context.colors.surfaceContainerHighest,
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          SizedBox(
-            width: 12,
-            height: 12,
-            child: CircularProgressIndicator(
-              strokeWidth: 2,
-              color: context.colors.onSurfaceVariant,
-            ),
+    final semanticsLabel = switch (status) {
+      SessionStatus.connecting => 'Connecting',
+      SessionStatus.reconnecting => 'Reconnecting',
+      SessionStatus.connected || SessionStatus.disconnected => 'Loading',
+    };
+    return Semantics(
+      key: const Key('channel-detail-connection-skeleton'),
+      liveRegion: true,
+      label: semanticsLabel,
+      child: ExcludeSemantics(
+        child: ListView.separated(
+          physics: const NeverScrollableScrollPhysics(),
+          padding: EdgeInsets.fromLTRB(
+            Grid.gutter,
+            frostedAppBarHeight(
+                  context,
+                  titleContentHeight: appBarTitleContentHeight,
+                ) +
+                Grid.xs,
+            Grid.gutter,
+            Grid.xs,
           ),
-          const SizedBox(width: Grid.xxs),
-          Text(
-            'Reconnecting…',
-            style: context.textTheme.labelSmall?.copyWith(
-              color: context.colors.onSurfaceVariant,
-            ),
-          ),
-        ],
+          itemCount: 4,
+          separatorBuilder: (_, _) => const SizedBox(height: Grid.xs),
+          itemBuilder: (_, index) => _MessageSkeletonRow(index: index),
+        ),
+      ),
+    );
+  }
+}
+
+class _MessageSkeletonRow extends StatelessWidget {
+  final int index;
+
+  const _MessageSkeletonRow({required this.index});
+
+  @override
+  Widget build(BuildContext context) {
+    const authorWidths = <double>[112, 96, 128, 80];
+    const lineWidths = <List<double>>[
+      [280, 224],
+      [272, 184],
+      [232],
+      [288, 216],
+    ];
+    final availableWidth = MediaQuery.sizeOf(context).width - 88;
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SkeletonBar(
+          width: 36,
+          height: 36,
+          borderRadius: BorderRadius.circular(Radii.full),
+        ),
+        const SizedBox(width: Grid.xxs),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  SkeletonBar(width: authorWidths[index], height: 15),
+                  const SizedBox(width: Grid.xxs),
+                  const SkeletonBar(width: 40, height: 12),
+                ],
+              ),
+              const SizedBox(height: Grid.half),
+              for (final width in lineWidths[index]) ...[
+                SkeletonBar(width: min(width, availableWidth), height: 16),
+                const SizedBox(height: Grid.half),
+              ],
+              const Row(
+                children: [
+                  SkeletonBar(width: 32, height: 16),
+                  SizedBox(width: Grid.xs),
+                  SkeletonBar(width: 32, height: 16),
+                  SizedBox(width: Grid.xs),
+                  SkeletonBar(width: 32, height: 16),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _ForumConnectionSkeleton extends StatelessWidget {
+  final SessionStatus status;
+
+  const _ForumConnectionSkeleton({required this.status});
+
+  @override
+  Widget build(BuildContext context) {
+    final semanticsLabel = switch (status) {
+      SessionStatus.connecting => 'Connecting',
+      SessionStatus.reconnecting => 'Reconnecting',
+      SessionStatus.connected || SessionStatus.disconnected => 'Loading',
+    };
+    return Semantics(
+      key: const Key('forum-connection-skeleton'),
+      liveRegion: true,
+      label: semanticsLabel,
+      child: ExcludeSemantics(
+        child: IgnorePointer(
+          child: ExcludeFocus(
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                color: context.colors.surface,
+                borderRadius: BorderRadius.circular(Radii.lg),
+                border: Border.all(color: context.colors.outlineVariant),
+              ),
+              child: Padding(
+                padding: const EdgeInsets.all(Grid.twelve),
+                child: SkeletonShimmer(
+                  child: const Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Row(
+                        children: [
+                          SkeletonBar(
+                            width: 28,
+                            height: 28,
+                            borderRadius: BorderRadius.all(
+                              Radius.circular(Radii.full),
+                            ),
+                          ),
+                          SizedBox(width: Grid.xxs),
+                          SkeletonBar(width: 112, height: 14),
+                        ],
+                      ),
+                      SizedBox(height: Grid.xxs),
+                      SkeletonBar(width: 240, height: 14),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
       ),
     );
   }
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 453e788271..5c428fc67b 100644
--- a/mobile/lib/features/channels/channel_detail_page/message_bubble.dart
+++ b/mobile/lib/features/channels/channel_detail_page/message_bubble.dart
@@ -29,6 +29,10 @@ class _MessageBubble extends ConsumerWidget {
         ref.watch(userCacheProvider.select((cache) => cache[pk])) ??
         ref.read(userCacheProvider.notifier).get(pk);
     final displayName = profile?.label ?? shortPubkey(message.pubkey);
+    final canManageMessage =
+        currentPubkey?.toLowerCase() == pk ||
+        (profile?.ownerPubkey != null &&
+            profile?.ownerPubkey == currentPubkey?.toLowerCase());
 
     // Build mention names map from event p-tags.
     final userCache = ref.watch(userCacheProvider);
@@ -48,118 +52,184 @@ class _MessageBubble extends ConsumerWidget {
       }
     }
 
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onLongPress: () => showMessageActions(
-        context: context,
-        ref: ref,
-        message: message,
-        channelId: currentChannelId,
-        canManageMessage:
-            currentPubkey?.toLowerCase() == pk ||
-            (profile?.ownerPubkey != null &&
-                profile?.ownerPubkey == currentPubkey?.toLowerCase()),
-        allMessages: allMessages,
-        currentPubkey: currentPubkey,
-        isMember: isMember,
-        isArchived: isArchived,
-      ),
-      child: Padding(
-        padding: EdgeInsets.only(top: showAuthor ? Grid.xs : Grid.half),
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (showAuthor)
-              GestureDetector(
-                onTap: () => showUserProfileSheet(context, message.pubkey),
-                child: _UserAvatar(profile: profile, pubkey: message.pubkey),
-              )
-            else
-              const SizedBox(width: 36),
-            const SizedBox(width: Grid.xxs),
-            Expanded(
-              child: Transform.translate(
-                offset: Offset(0, showAuthor ? -Grid.quarter : 0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    if (showAuthor)
-                      Padding(
-                        padding: const EdgeInsets.only(bottom: Grid.quarter),
-                        child: Row(
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: [
-                            GestureDetector(
-                              onTap: () =>
-                                  showUserProfileSheet(context, message.pubkey),
-                              child: Text(
-                                displayName,
-                                style: context.textTheme.titleSmall?.copyWith(
-                                  fontWeight: FontWeight.w600,
-                                  color: context.colors.onSurface,
-                                ),
-                              ),
-                            ),
-                            const SizedBox(width: Grid.xxs),
-                            _messageTimestamp(context, message.createdAt),
-                            if (message.edited) ...[
-                              const SizedBox(width: Grid.half),
-                              Text(
-                                '(edited)',
-                                style: context.textTheme.labelSmall?.copyWith(
-                                  color: context.colors.onSurfaceVariant,
-                                  fontStyle: FontStyle.italic,
-                                ),
-                              ),
-                            ],
-                          ],
-                        ),
-                      ),
-                    MessageContent(
-                      content: message.content,
-                      mentionNames: mentionNames,
-                      agentMentionPubkeys: agentMentionPubkeys,
-                      channelNames: channelNames,
-                      tags: message.tags,
-                      baseStyle: context.textTheme.bodyLarge?.copyWith(
-                        color: context.colors.onSurface,
-                      ),
-                      onChannelTap: (channelId) {
-                        openChannelLink(
-                          context: context,
-                          ref: ref,
-                          channelId: channelId,
-                          currentChannelId: currentChannelId,
-                        );
-                      },
-                      onMentionTap: (pubkey) =>
-                          showUserProfileSheet(context, pubkey),
-                    ),
-                    if (message.reactions.isNotEmpty)
-                      ReactionRow(
-                        reactions: message.reactions,
-                        onToggle: (emoji) =>
-                            toggleReaction(ref, message, emoji),
-                      ),
-                  ],
-                ),
-              ),
+    return Padding(
+      padding: EdgeInsets.only(top: showAuthor ? Grid.xs : 0),
+      child: Material(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(Radii.md),
+        // The media carousel intentionally continues through the list's trailing
+        // gutter. InkWell still clips its ink to [borderRadius], while leaving
+        // overflowing message content visible.
+        clipBehavior: Clip.none,
+        child: InkWell(
+          key: ValueKey('message-row-${message.id}'),
+          borderRadius: BorderRadius.circular(Radii.md),
+          highlightColor: context.colors.primary.withValues(alpha: 0.1),
+          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,
+              bottom: showAuthor ? 0 : Grid.xxs,
             ),
-          ],
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (showAuthor)
+                  GestureDetector(
+                    onTap: () => showUserProfileSheet(context, message.pubkey),
+                    child: _UserAvatar(
+                      profile: profile,
+                      pubkey: message.pubkey,
+                    ),
+                  )
+                else
+                  const SizedBox(width: messageAvatarSize),
+                const SizedBox(width: messageAvatarContentGap),
+                Expanded(
+                  child: Padding(
+                    padding: EdgeInsets.only(top: showAuthor ? Grid.half : 0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        if (showAuthor)
+                          Padding(
+                            padding: const EdgeInsets.only(
+                              bottom: Grid.quarter,
+                            ),
+                            child: Row(
+                              children: [
+                                Expanded(
+                                  child: MessageAuthorMeta(
+                                    displayName: displayName,
+                                    username: messageUsernameLabel(profile),
+                                    timestamp: formatMessageTime(
+                                      message.createdAt,
+                                    ),
+                                    nameColor: context.colors.onSurface,
+                                    metadataColor:
+                                        context.colors.onSurfaceVariant,
+                                    onAuthorTap: () => showUserProfileSheet(
+                                      context,
+                                      message.pubkey,
+                                    ),
+                                    displayNameKey: ValueKey(
+                                      'message-author-${message.id}',
+                                    ),
+                                    usernameKey: ValueKey(
+                                      'message-username-${message.id}',
+                                    ),
+                                    timestampKey: ValueKey(
+                                      'message-timestamp-${message.id}',
+                                    ),
+                                  ),
+                                ),
+                                if (message.edited) ...[
+                                  const SizedBox(width: Grid.half),
+                                  Text(
+                                    '(edited)',
+                                    style: context.textTheme.labelSmall
+                                        ?.copyWith(
+                                          color:
+                                              context.colors.onSurfaceVariant,
+                                          fontStyle: FontStyle.italic,
+                                        ),
+                                  ),
+                                ],
+                              ],
+                            ),
+                          ),
+                        MessageContent(
+                          content: message.content,
+                          mentionNames: mentionNames,
+                          agentMentionPubkeys: agentMentionPubkeys,
+                          channelNames: channelNames,
+                          tags: message.tags,
+                          baseStyle: messageBodyTextStyle.copyWith(
+                            color: context.colors.onSurface,
+                          ),
+                          mediaCarouselTrailingOverflow: Grid.gutter,
+                          onMediaReply: allMessages == null
+                              ? null
+                              : () {
+                                  if (!context.mounted) return;
+                                  Navigator.of(context).push(
+                                    MaterialPageRoute<void>(
+                                      builder: (_) => ThreadDetailPage(
+                                        threadHead: message,
+                                        allMessages: allMessages!,
+                                        channelId: currentChannelId,
+                                        currentPubkey: currentPubkey,
+                                        isMember: isMember,
+                                        isArchived: isArchived,
+                                      ),
+                                    ),
+                                  );
+                                },
+                          onMediaMore: (viewerContext, imageUrl) =>
+                              showImageActions(
+                                context: viewerContext,
+                                ref: ref,
+                                message: message,
+                                channelId: currentChannelId,
+                                imageUrl: imageUrl,
+                                canManageMessage: canManageMessage,
+                                onDeleted: () {
+                                  if (viewerContext.mounted) {
+                                    Navigator.of(viewerContext).maybePop();
+                                  }
+                                },
+                              ),
+                          onChannelTap: (channelId) {
+                            openChannelLink(
+                              context: context,
+                              ref: ref,
+                              channelId: channelId,
+                              currentChannelId: currentChannelId,
+                            );
+                          },
+                          onMentionTap: (pubkey) =>
+                              showUserProfileSheet(context, pubkey),
+                        ),
+                        if (message.reactions.isNotEmpty)
+                          ReactionRow(
+                            reactions: message.reactions,
+                            onToggle: (emoji) =>
+                                toggleReaction(ref, message, emoji),
+                          ),
+                      ],
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
         ),
       ),
     );
   }
 }
 
-Widget _messageTimestamp(BuildContext context, int createdAt) {
-  return Text(
-    formatMessageTime(createdAt),
-    style: context.textTheme.labelSmall?.copyWith(
-      fontSize: 14,
-      height: 22 / 14,
-      letterSpacing: context.textTheme.titleSmall?.letterSpacing,
-      color: context.colors.onSurfaceVariant,
+Widget _messageTimestamp(BuildContext context, int createdAt, {Key? key}) {
+  return ConstrainedBox(
+    constraints: const BoxConstraints(maxWidth: Grid.xxl),
+    child: Text(
+      key: key,
+      formatMessageTime(createdAt),
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+      style: messageTimestampTextStyle.copyWith(
+        color: context.colors.onSurfaceVariant,
+      ),
     ),
   );
 }
@@ -172,7 +242,7 @@ class _UserAvatar extends StatelessWidget {
   const _UserAvatar({
     required this.profile,
     required this.pubkey,
-    this.size = 36,
+    this.size = messageAvatarSize,
   });
 
   @override
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 5f64687203..6a77069bea 100644
--- a/mobile/lib/features/channels/channel_detail_page/message_list.dart
+++ b/mobile/lib/features/channels/channel_detail_page/message_list.dart
@@ -9,6 +9,7 @@ class _MessageList extends HookConsumerWidget {
   final String? currentPubkey;
   final bool isMember;
   final bool isArchived;
+  final double appBarTitleContentHeight;
 
   const _MessageList({
     required this.entries,
@@ -19,6 +20,7 @@ class _MessageList extends HookConsumerWidget {
     required this.currentPubkey,
     required this.isMember,
     required this.isArchived,
+    required this.appBarTitleContentHeight,
   });
 
   @override
@@ -29,6 +31,11 @@ class _MessageList extends HookConsumerWidget {
     final isLoadingOlder = useState(false);
     final isAtLatest = useState(true);
     final hasUserScrolled = useState(false);
+    final followsLatest = useRef(
+      initialMessageId == null && initialThreadRootId == null,
+    );
+    final isAutoScrolling = useRef(false);
+    final autoScrollScheduled = useRef(false);
     final latestEntryId = entries.isEmpty ? null : entries.last.message.id;
     final previousLatestEntryId = useRef<String?>(null);
     final didOpenInitialThread = useRef(false);
@@ -45,24 +52,57 @@ class _MessageList extends HookConsumerWidget {
     }
 
     Future<void> scrollToLatest() async {
-      if (!itemScrollController.isAttached) return;
-      await itemScrollController.scrollTo(
-        index: 0,
-        duration: const Duration(milliseconds: 220),
-        curve: Curves.easeOutCubic,
+      if (!itemScrollController.isAttached || isAutoScrolling.value) return;
+      followsLatest.value = true;
+      hasUserScrolled.value = false;
+      isAutoScrolling.value = true;
+      try {
+        await itemScrollController.scrollTo(
+          index: 0,
+          duration: const Duration(milliseconds: 220),
+          curve: Curves.easeOutCubic,
+        );
+        if (context.mounted && !hasUserScrolled.value) {
+          isAtLatest.value = true;
+        }
+      } finally {
+        isAutoScrolling.value = false;
+      }
+    }
+
+    void scheduleAutoScrollToLatest() {
+      if (autoScrollScheduled.value || isAutoScrolling.value) return;
+      autoScrollScheduled.value = true;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        autoScrollScheduled.value = false;
+        if (!context.mounted || !followsLatest.value || hasUserScrolled.value) {
+          return;
+        }
+        scrollToLatest();
+      });
+    }
+
+    bool latestIsAtBoundary() {
+      // In this reversed list, item 0's leading edge is the bottom boundary.
+      return itemPositionsListener.itemPositions.value.any(
+        (position) => position.index == 0 && position.itemLeadingEdge >= 0,
       );
-      if (context.mounted) isAtLatest.value = true;
     }
 
     useEffect(() {
       void onPositionsChanged() {
         final positions = itemPositionsListener.itemPositions.value;
         if (positions.isEmpty) return;
-        final nextIsAtLatest = positions.any(
-          (position) => position.index == 0 && position.itemLeadingEdge < 1,
-        );
-        if (isAtLatest.value != nextIsAtLatest) {
-          isAtLatest.value = nextIsAtLatest;
+        final nextIsAtLatest = latestIsAtBoundary();
+        if (nextIsAtLatest) {
+          if (!isAtLatest.value) isAtLatest.value = true;
+        } else if (followsLatest.value && !hasUserScrolled.value) {
+          // The viewport can shrink when the composer or keyboard opens.
+          // Preserve auto-follow until the user scrolls the timeline.
+          if (!isAtLatest.value) isAtLatest.value = true;
+          scheduleAutoScrollToLatest();
+        } else if (isAtLatest.value) {
+          isAtLatest.value = false;
         }
 
         final oldestVisible = positions
@@ -122,8 +162,11 @@ class _MessageList extends HookConsumerWidget {
       }
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (!context.mounted || !itemScrollController.isAttached) return;
-        itemScrollController.jumpTo(index: targetIndex, alignment: 0.35);
         didJumpToInitialMessage.value = true;
+        followsLatest.value = false;
+        hasUserScrolled.value = false;
+        isAtLatest.value = false;
+        itemScrollController.jumpTo(index: targetIndex, alignment: 0.35);
       });
       return null;
     }, [initialMessageId, initialThreadRootId, entries.length]);
@@ -185,9 +228,18 @@ class _MessageList extends HookConsumerWidget {
       children: [
         NotificationListener<ScrollNotification>(
           onNotification: (notification) {
-            if (notification is ScrollStartNotification &&
-                notification.dragDetails != null) {
+            if (notification is UserScrollNotification &&
+                notification.direction != ScrollDirection.idle) {
               hasUserScrolled.value = true;
+              followsLatest.value = false;
+            } else if (notification is ScrollEndNotification &&
+                hasUserScrolled.value) {
+              WidgetsBinding.instance.addPostFrameCallback((_) {
+                if (!context.mounted || !latestIsAtBoundary()) return;
+                hasUserScrolled.value = false;
+                followsLatest.value = true;
+                if (!isAtLatest.value) isAtLatest.value = true;
+              });
             }
             return false;
           },
@@ -199,8 +251,11 @@ class _MessageList extends HookConsumerWidget {
             padding: EdgeInsets.only(
               left: Grid.gutter,
               right: Grid.gutter,
-              top: frostedAppBarHeight(context),
-              bottom: Grid.xxs,
+              top: frostedAppBarHeight(
+                context,
+                titleContentHeight: appBarTitleContentHeight,
+              ),
+              bottom: 0,
             ),
             itemCount: displayEntries.length + (isLoadingOlder.value ? 1 : 0),
             itemBuilder: (context, index) {
@@ -209,10 +264,9 @@ class _MessageList extends HookConsumerWidget {
                 return const Padding(
                   padding: EdgeInsets.symmetric(vertical: Grid.xs),
                   child: Center(
-                    child: SizedBox(
-                      width: 20,
-                      height: 20,
-                      child: CircularProgressIndicator(strokeWidth: 2),
+                    child: BuzzLoadingIndicator(
+                      size: 24,
+                      semanticLabel: 'Loading older messages',
                     ),
                   ),
                 );
@@ -235,53 +289,58 @@ class _MessageList extends HookConsumerWidget {
 
               final showAuthor =
                   !message.isSystem &&
-                  (prevMessage == null ||
+                  (message.hasAttachments ||
+                      prevMessage == null ||
                       prevMessage.isSystem ||
                       showDayDivider ||
                       prevMessage.pubkey.toLowerCase() !=
                           message.pubkey.toLowerCase() ||
                       (message.createdAt - prevMessage.createdAt) > 300);
 
-              return Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  if (showDayDivider)
-                    DayDivider(label: formatDayHeading(message.createdAt)),
-                  if (message.isSystem)
-                    _SystemMessageRow(
-                      message: message,
-                      groupedMessages: entryGroup.length > 1
-                          ? entryGroup.map((entry) => entry.message).toList()
-                          : null,
-                      channelId: channelId,
-                      currentPubkey: currentPubkey,
-                      allMessages: null,
-                      isMember: isMember,
-                      isArchived: isArchived,
-                    )
-                  else ...[
-                    _MessageBubble(
-                      message: message,
-                      showAuthor: showAuthor,
-                      channelNames: channelNamesMap,
-                      currentChannelId: channelId,
-                      currentPubkey: currentPubkey,
-                      allMessages: allMessages,
-                      isMember: isMember,
-                      isArchived: isArchived,
-                    ),
-                    if (entry.summary != null)
-                      _ThreadSummaryRow(
-                        summary: entry.summary!,
+              return Padding(
+                key: ValueKey('channel-message-group-${message.id}'),
+                padding: EdgeInsets.only(bottom: index == 0 ? Grid.xs : 0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    if (showDayDivider)
+                      DayDivider(label: formatDayHeading(message.createdAt)),
+                    if (message.isSystem)
+                      _SystemMessageRow(
                         message: message,
-                        allMessages: allMessages,
+                        groupedMessages: entryGroup.length > 1
+                            ? entryGroup.map((entry) => entry.message).toList()
+                            : null,
                         channelId: channelId,
                         currentPubkey: currentPubkey,
+                        allMessages: null,
+                        isMember: isMember,
+                        isArchived: isArchived,
+                      )
+                    else ...[
+                      _MessageBubble(
+                        message: message,
+                        showAuthor: showAuthor,
+                        channelNames: channelNamesMap,
+                        currentChannelId: channelId,
+                        currentPubkey: currentPubkey,
+                        allMessages: allMessages,
                         isMember: isMember,
                         isArchived: isArchived,
                       ),
+                      if (entry.summary != null)
+                        _ThreadSummaryRow(
+                          summary: entry.summary!,
+                          message: message,
+                          allMessages: allMessages,
+                          channelId: channelId,
+                          currentPubkey: currentPubkey,
+                          isMember: isMember,
+                          isArchived: isArchived,
+                        ),
+                    ],
                   ],
-                ],
+                ),
               );
             },
           ),
diff --git a/mobile/lib/features/channels/channel_detail_page/system_rows.dart b/mobile/lib/features/channels/channel_detail_page/system_rows.dart
index 8ff09b4e5c..f6019febab 100644
--- a/mobile/lib/features/channels/channel_detail_page/system_rows.dart
+++ b/mobile/lib/features/channels/channel_detail_page/system_rows.dart
@@ -30,6 +30,9 @@ class _SystemMessageRow extends ConsumerWidget {
     final channelCreator = systemEvent.type == SystemEventType.channelCreated
         ? systemEvent.actorPubkey?.trim()
         : null;
+    final usesMessageStyleLayout =
+        groupedMembership != null ||
+        (channelCreator != null && channelCreator.isNotEmpty);
 
     String resolveLabel(String? pubkey) {
       if (pubkey == null) return 'Someone';
@@ -68,66 +71,83 @@ class _SystemMessageRow extends ConsumerWidget {
       }
     }
 
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onLongPress: () => showMessageActions(
-        context: context,
-        ref: ref,
-        message: message,
-        channelId: channelId,
-        canManageMessage: false,
-        allMessages: null,
-        currentPubkey: currentPubkey,
-        isMember: isMember,
-        isArchived: isArchived,
-      ),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (groupedMembership != null)
-              _MembershipSystemMessageContent(
-                event: groupedMembership,
-                createdAt: message.createdAt,
-                resolveLabel: resolveLabel,
-                userCache: userCache,
-              )
-            else if (channelCreator != null && channelCreator.isNotEmpty)
-              _MessageStyleSystemMessageContent(
-                displayPubkey: channelCreator,
-                createdAt: message.createdAt,
-                resolveLabel: resolveLabel,
-                userCache: userCache,
-                actionSpans: const [TextSpan(text: 'created this channel')],
-              )
-            else
-              Row(
-                children: [
-                  _systemEventAvatar(context, systemEvent, userCache),
-                  const SizedBox(width: Grid.xxs),
-                  Expanded(
-                    child: Text(
-                      systemEvent.describe(resolveLabel),
-                      style: context.textTheme.bodyLarge?.copyWith(
-                        color: context.colors.onSurfaceVariant,
+    return Material(
+      color: Colors.transparent,
+      borderRadius: BorderRadius.circular(Radii.md),
+      clipBehavior: Clip.antiAlias,
+      child: InkWell(
+        key: ValueKey('system-message-row-${message.id}'),
+        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: const EdgeInsets.symmetric(vertical: Grid.xxs),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              if (groupedMembership != null)
+                _MembershipSystemMessageContent(
+                  event: groupedMembership,
+                  createdAt: message.createdAt,
+                  resolveLabel: resolveLabel,
+                  userCache: userCache,
+                )
+              else if (channelCreator != null && channelCreator.isNotEmpty)
+                _MessageStyleSystemMessageContent(
+                  displayPubkey: channelCreator,
+                  createdAt: message.createdAt,
+                  resolveLabel: resolveLabel,
+                  userCache: userCache,
+                  actionSpans: const [TextSpan(text: 'created this channel')],
+                )
+              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,
+                        ),
                       ),
                     ),
-                  ),
-                  _messageTimestamp(context, message.createdAt),
-                ],
-              ),
-            if (reactions.isNotEmpty)
-              Padding(
-                padding: const EdgeInsets.only(left: 36 + Grid.xxs),
-                child: ReactionRow(
-                  reactions: reactions,
-                  onToggle: groupedMessages == null
-                      ? (emoji) => toggleReaction(ref, message, emoji)
-                      : toggleGroupedReaction,
+                    _messageTimestamp(
+                      context,
+                      message.createdAt,
+                      key: ValueKey('system-message-timestamp-${message.id}'),
+                    ),
+                  ],
                 ),
-              ),
-          ],
+              if (reactions.isNotEmpty)
+                Padding(
+                  padding: EdgeInsets.only(
+                    left:
+                        (usesMessageStyleLayout ? messageAvatarSize : 36) +
+                        (usesMessageStyleLayout
+                            ? messageAvatarContentGap
+                            : Grid.xxs),
+                  ),
+                  child: ReactionRow(
+                    reactions: reactions,
+                    onToggle: groupedMessages == null
+                        ? (emoji) => toggleReaction(ref, message, emoji)
+                        : toggleGroupedReaction,
+                  ),
+                ),
+            ],
+          ),
         ),
       ),
     );
@@ -282,7 +302,7 @@ class _MembershipSystemMessageContent extends StatelessWidget {
 }
 
 TextStyle? _systemActionTextStyle(BuildContext context) {
-  return context.textTheme.bodyLarge?.copyWith(
+  return systemMessageBodyTextStyle.copyWith(
     color: context.colors.onSurfaceVariant,
   );
 }
@@ -310,28 +330,33 @@ class _MessageStyleSystemMessageContent extends StatelessWidget {
         _UserAvatar(
           profile: userCache[displayPubkey.toLowerCase()],
           pubkey: displayPubkey,
-          size: 36,
+          size: messageAvatarSize,
         ),
-        const SizedBox(width: Grid.xxs),
+        const SizedBox(width: messageAvatarContentGap),
         Expanded(
           child: Transform.translate(
             offset: const Offset(0, -Grid.quarter),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Row(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Text(
-                      resolveLabel(displayPubkey),
-                      style: context.textTheme.titleSmall?.copyWith(
-                        color: context.colors.onSurface,
-                        fontWeight: FontWeight.w600,
-                      ),
-                    ),
-                    const SizedBox(width: Grid.xxs),
-                    _messageTimestamp(context, createdAt),
-                  ],
+                MessageAuthorMeta(
+                  displayName: resolveLabel(displayPubkey),
+                  username: messageUsernameLabel(
+                    userCache[displayPubkey.toLowerCase()],
+                  ),
+                  timestamp: formatMessageTime(createdAt),
+                  nameColor: context.colors.onSurface,
+                  metadataColor: context.colors.onSurfaceVariant,
+                  nameStyle: systemMessageHeadingTextStyle,
+                  displayNameKey: ValueKey(
+                    'system-message-author-$displayPubkey',
+                  ),
+                  usernameKey: ValueKey(
+                    'system-message-username-$displayPubkey',
+                  ),
+                  timestampKey: ValueKey(
+                    'system-message-timestamp-$displayPubkey',
+                  ),
                 ),
                 Text.rich(
                   TextSpan(
@@ -482,10 +507,11 @@ class _ThreadSummaryRow extends ConsumerWidget {
         );
       },
       child: Padding(
+        key: ValueKey('thread-summary-${message.id}'),
         padding: const EdgeInsets.only(
-          left: 36 + Grid.xxs,
+          left: messageAvatarSize + messageAvatarContentGap,
           top: Grid.half,
-          bottom: Grid.half,
+          bottom: Grid.xs,
         ),
         child: Row(
           mainAxisSize: MainAxisSize.min,
@@ -509,36 +535,38 @@ class _ThreadSummaryRow extends ConsumerWidget {
               ),
             ),
             const SizedBox(width: Grid.xxs),
-            Text.rich(
-              TextSpan(
-                children: [
-                  TextSpan(
-                    text:
-                        '${summary.replyCount} ${summary.replyCount == 1 ? 'reply' : 'replies'}',
-                    style: context.textTheme.labelMedium?.copyWith(
-                      color: context.colors.primary,
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
-                  if (summary.lastReplyAt case final lastReplyAt?) ...[
-                    TextSpan(
-                      text: ' · ',
-                      style: context.textTheme.labelMedium?.copyWith(
-                        color: context.colors.onSurfaceVariant.withValues(
-                          alpha: 0.5,
-                        ),
-                      ),
-                    ),
+            Flexible(
+              child: Text.rich(
+                TextSpan(
+                  children: [
                     TextSpan(
                       text:
-                          'last reply ${formatThreadSummaryLastReplyTime(lastReplyAt)}',
-                      style: context.textTheme.labelMedium?.copyWith(
-                        color: context.colors.onSurfaceVariant,
-                        fontWeight: FontWeight.w400,
+                          '${summary.replyCount} ${summary.replyCount == 1 ? 'reply' : 'replies'}',
+                      style: replyPreviewTextStyle.copyWith(
+                        color: context.colors.primary,
                       ),
                     ),
+                    if (summary.lastReplyAt case final lastReplyAt?) ...[
+                      TextSpan(
+                        text: ' · ',
+                        style: replyPreviewTextStyle.copyWith(
+                          color: context.colors.onSurfaceVariant.withValues(
+                            alpha: 0.5,
+                          ),
+                        ),
+                      ),
+                      TextSpan(
+                        text:
+                            'last reply ${formatThreadSummaryLastReplyTime(lastReplyAt)}',
+                        style: replyPreviewTextStyle.copyWith(
+                          color: context.colors.onSurfaceVariant,
+                        ),
+                      ),
+                    ],
                   ],
-                ],
+                ),
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
               ),
             ),
           ],
diff --git a/mobile/lib/features/channels/channel_management_provider.dart b/mobile/lib/features/channels/channel_management_provider.dart
index d88de261c3..9a72054a2b 100644
--- a/mobile/lib/features/channels/channel_management_provider.dart
+++ b/mobile/lib/features/channels/channel_management_provider.dart
@@ -5,10 +5,10 @@ import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../shared/auth/auth.dart';
+import '../../shared/custom_emoji/custom_emoji.dart';
+import '../../shared/custom_emoji/custom_emoji_provider.dart';
 import '../../shared/relay/relay.dart';
 import '../profile/profile_provider.dart';
-import '../custom_emoji/custom_emoji.dart';
-import '../custom_emoji/custom_emoji_provider.dart';
 import 'channel.dart';
 import 'channels_provider.dart';
 
diff --git a/mobile/lib/features/channels/channel_messages_provider.dart b/mobile/lib/features/channels/channel_messages_provider.dart
index 5d1964f814..7f657f4b7c 100644
--- a/mobile/lib/features/channels/channel_messages_provider.dart
+++ b/mobile/lib/features/channels/channel_messages_provider.dart
@@ -3,6 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../shared/relay/relay.dart';
 import 'channel_management_provider.dart';
+import 'pending_local_messages_provider.dart';
 import 'channel_window.dart';
 import 'thread_replies_provider.dart';
 
@@ -27,6 +28,12 @@ class ChannelMessagesNotifier extends Notifier<AsyncValue<List<NostrEvent>>> {
   /// UI can show stale data instead of a blank loading spinner.
   List<NostrEvent>? _lastKnownMessages;
 
+  /// Whether this channel has completed at least one message history load.
+  ///
+  /// This distinguishes a genuinely loaded empty channel from the synthetic
+  /// empty value returned while the relay is not yet connected.
+  bool get hasLoadedMessages => _lastKnownMessages != null;
+
   Map<String, ChannelWindowThreadSummary> get threadSummaries =>
       channelWindowThreadSummaries(_windowStore);
 
@@ -87,6 +94,7 @@ class ChannelMessagesNotifier extends Notifier<AsyncValue<List<NostrEvent>>> {
 
       final history = await _fetchNewestHistory(session);
       if (!_isCurrentInit(initVersion)) return;
+      _confirmLocalMessages(history.map((event) => event.id));
 
       final existing = state.value ?? const <NostrEvent>[];
       final existingIds = existing.map((event) => event.id).toSet();
@@ -159,7 +167,13 @@ class ChannelMessagesNotifier extends Notifier<AsyncValue<List<NostrEvent>>> {
     },
   );
 
-  void _handleLiveEvent(NostrEvent event) {
+  void _handleLiveEvent(NostrEvent event, {bool authoritative = true}) {
+    // Reply ownership and its thread-local overlay must transition together.
+    // The authoritative thread query performs both confirmations after it
+    // contains the reply; a live echo only triggers that query below.
+    if (authoritative && event.threadReference.parentId == null) {
+      _confirmLocalMessages([event.id]);
+    }
     if (_usingChannelWindow) {
       _handleWindowLiveEvent(event);
     } else {
@@ -223,19 +237,108 @@ class ChannelMessagesNotifier extends Notifier<AsyncValue<List<NostrEvent>>> {
     return true;
   }
 
+  void _confirmLocalMessages(Iterable<String> eventIds) {
+    ref
+        .read(pendingLocalMessagesProvider(channelId).notifier)
+        .confirm(eventIds);
+  }
+
   static bool _isMembershipEvent(String content) {
     return content.contains('member_joined') ||
         content.contains('member_left') ||
         content.contains('member_removed');
   }
 
+  /// Adds a just-signed outgoing message before the relay acknowledges it.
+  /// The live relay echo is deduplicated by event id.
+  void addLocalMessage(NostrEvent event) {
+    ref.read(pendingLocalMessagesProvider(channelId).notifier).add(event);
+    final thread = event.threadReference;
+    if (thread.parentId != null) {
+      final rootId = thread.rootId;
+      if (rootId == null) {
+        throw StateError('Reply ${event.id} has a parent but no thread root.');
+      }
+      ref
+          .read(
+            threadLocalRepliesProvider(
+              ThreadRepliesArgs(channelId: channelId, rootId: rootId),
+            ).notifier,
+          )
+          .add(event);
+      return;
+    }
+
+    final isTimelineRow = EventKind.channelTimelineContentKinds.contains(
+      event.kind,
+    );
+    if (!_usingChannelWindow && isTimelineRow) {
+      _windowStore = mergeLiveChannelWindowEvent(
+        _windowStore,
+        event,
+        isTimelineRow: true,
+      );
+    }
+    _handleLiveEvent(event, authoritative: false);
+  }
+
+  /// Releases rollback ownership after the publish future succeeds. The
+  /// optimistic row (and any thread overlay) remains visible until relay data
+  /// replaces it, because OK and EVENT delivery are unordered.
+  void completeLocalMessage(String eventId) {
+    _confirmLocalMessages([eventId]);
+  }
+
+  /// Rolls back a local message when its publish is rejected or times out.
+  void removeLocalMessage(String eventId) {
+    final pending = ref
+        .read(pendingLocalMessagesProvider(channelId).notifier)
+        .take(eventId);
+    if (pending == null) return;
+
+    final thread = pending.threadReference;
+    if (thread.parentId != null) {
+      final rootId = thread.rootId;
+      if (rootId == null) {
+        throw StateError('Reply $eventId has a parent but no thread root.');
+      }
+      ref
+          .read(
+            threadLocalRepliesProvider(
+              ThreadRepliesArgs(channelId: channelId, rootId: rootId),
+            ).notifier,
+          )
+          .remove(eventId);
+      return;
+    }
+
+    final nextOverlay = _windowStore.liveOverlay
+        .where((event) => event.id != eventId)
+        .toList();
+    if (nextOverlay.length != _windowStore.liveOverlay.length) {
+      _windowStore = ChannelWindowStore(
+        pages: _windowStore.pages,
+        liveOverlay: nextOverlay,
+        liveAux: _windowStore.liveAux,
+      );
+    }
+
+    final current = state.value ?? _lastKnownMessages ?? const <NostrEvent>[];
+    final next = current.where((event) => event.id != eventId).toList();
+    _lastKnownMessages = next;
+    state = AsyncData(next);
+  }
+
   static List<NostrEvent> _mergeEvent(
     List<NostrEvent> current,
     NostrEvent incoming,
   ) {
     if (current.any((e) => e.id == incoming.id)) return current;
     final updated = [...current, incoming];
-    updated.sort((a, b) => a.createdAt.compareTo(b.createdAt));
+    updated.sort((a, b) {
+      final createdAt = a.createdAt.compareTo(b.createdAt);
+      return createdAt != 0 ? createdAt : a.id.compareTo(b.id);
+    });
     return updated;
   }
 
diff --git a/mobile/lib/features/channels/channel_sections/channel_sections_manager.dart b/mobile/lib/features/channels/channel_sections/channel_sections_manager.dart
index 13bd5d63d8..1d103755ba 100644
--- a/mobile/lib/features/channels/channel_sections/channel_sections_manager.dart
+++ b/mobile/lib/features/channels/channel_sections/channel_sections_manager.dart
@@ -48,6 +48,12 @@ class ChannelSectionsManager {
   void Function()? _unsubscribe;
   bool _disposed = false;
 
+  /// Base delay for the startup-sync retry backoff. Overridable in tests.
+  final Duration _startupRetryBaseDelay;
+  Timer? _startupRetryTimer;
+  int _startupRetryAttempt = 0;
+  bool _startupFetchSucceeded = false;
+
   ChannelSectionsManager({
     required this.pubkey,
     required SharedPreferences prefs,
@@ -56,12 +62,15 @@ class ChannelSectionsManager {
     required SignedEventRelay? signedEventRelay,
     required bool remoteEnabled,
     required VoidCallback onChanged,
+    @visibleForTesting
+    Duration startupRetryBaseDelay = const Duration(seconds: 2),
   }) : _storage = ChannelSectionsStorage(prefs),
        _crypto = crypto,
        _relaySession = relaySession,
        _signedEventRelay = signedEventRelay,
        _remoteEnabled = remoteEnabled,
        _onChanged = onChanged,
+       _startupRetryBaseDelay = startupRetryBaseDelay,
        _store = ChannelSectionsStorage(prefs).read(pubkey);
 
   ChannelSectionStore get store => _store;
@@ -74,15 +83,73 @@ class ChannelSectionsManager {
       return;
     }
 
-    await _fetchAndMerge();
-    await _startLiveSubscription();
+    await _syncWithRelay();
     _onChanged();
   }
 
+  /// One startup-sync attempt: fetch the remote blob, then start the live
+  /// subscription. Either step can lose a transient race on cold start (the
+  /// relay rate-limits the burst of per-channel subscriptions and rejects
+  /// with `rate-limited: quota exceeded`) — retry with backoff instead of
+  /// silently giving up, which left desktop-created groups invisible until
+  /// an unrelated refetch.
+  ///
+  /// Retries are intentionally unbounded for the manager's lifetime: this
+  /// sync must eventually land for groups to appear at all, and at the 30s
+  /// delay ceiling a persistent retry is cheap. Do not "fix" this into a
+  /// bounded loop — giving up permanently is the exact bug this replaces.
+  Future<void> _syncWithRelay() async {
+    if (!_startupFetchSucceeded) {
+      _startupFetchSucceeded = await _fetchAndMerge();
+    }
+
+    final subscribed = _unsubscribe != null || await _startLiveSubscription();
+
+    if (!_startupFetchSucceeded || !subscribed) {
+      _scheduleStartupRetry();
+    } else {
+      // Fully recovered — later transient failures (e.g. a late relay
+      // CLOSED) start backing off from the base delay again instead of the
+      // ceiling the cold start climbed to.
+      _startupRetryAttempt = 0;
+    }
+  }
+
+  void _scheduleStartupRetry() {
+    if (_disposed) return;
+    _startupRetryTimer?.cancel();
+    // The inner shift cap is overflow protection, not the delay policy: the
+    // consecutive-failure counter is unbounded, and an unchecked `<<`
+    // past 62 wraps negative, which would make the Timer fire immediately in
+    // a hot loop. At the default 2s base the outer 30s clamp is what callers
+    // actually observe (2s, 4s, …, 30s); the shift cap only bites for the
+    // tiny injected bases used in tests.
+    final delayMs = min(
+      _startupRetryBaseDelay.inMilliseconds << min(_startupRetryAttempt, 5),
+      30000,
+    );
+    _startupRetryAttempt++;
+    debugPrint(
+      '[ChannelSectionsManager] startup sync incomplete; '
+      'retrying in ${delayMs}ms (attempt $_startupRetryAttempt)',
+    );
+    _startupRetryTimer = Timer(Duration(milliseconds: delayMs), () {
+      _startupRetryTimer = null;
+      unawaited(
+        _syncWithRelay().then((_) {
+          if (!_disposed) _onChanged();
+        }),
+      );
+    });
+  }
+
   void dispose({bool flushPending = true}) {
     if (_disposed) return;
     _disposed = true;
 
+    _startupRetryTimer?.cancel();
+    _startupRetryTimer = null;
+
     final hadPending = _publishDebounce != null;
     _publishDebounce?.cancel();
     _publishDebounce = null;
@@ -201,8 +268,10 @@ class ChannelSectionsManager {
     });
   }
 
-  Future<void> _fetchAndMerge() async {
-    if (_relaySession == null) return;
+  /// Returns whether the fetch reached the relay (regardless of whether a
+  /// remote blob exists).
+  Future<bool> _fetchAndMerge() async {
+    if (_relaySession == null) return false;
     try {
       final events = await _relaySession.fetchHistory(
         NostrFilter(
@@ -217,13 +286,17 @@ class ChannelSectionsManager {
       _mergeEvents(events);
       _persist();
       if (!_disposed) _onChanged();
-    } catch (_) {
+      return true;
+    } catch (error) {
+      debugPrint('[ChannelSectionsManager] fetch failed: $error');
       // Local state remains usable when relay is unavailable.
+      return false;
     }
   }
 
-  Future<void> _startLiveSubscription() async {
-    if (_relaySession == null) return;
+  /// Returns whether the live subscription was established.
+  Future<bool> _startLiveSubscription() async {
+    if (_relaySession == null) return false;
     try {
       _unsubscribe = await _relaySession.subscribe(
         NostrFilter(
@@ -235,12 +308,31 @@ class ChannelSectionsManager {
           limit: 1,
         ),
         _handleIncomingEvent,
+        onClosed: _handleSubscriptionClosed,
       );
-    } catch (_) {
-      // Non-fatal — local state and history still work.
+      return true;
+    } catch (error) {
+      debugPrint('[ChannelSectionsManager] live subscription failed: $error');
+      // Non-fatal — local state and history still work; retried by the
+      // startup-sync backoff.
+      return false;
     }
   }
 
+  /// A relay `CLOSED` can arrive after `subscribe()` already reported
+  /// success: the 500ms readiness wait times out silently under load, and
+  /// the rate-limit rejection lands later. Without this handler the manager
+  /// would keep a dead subscription and never retry — the exact
+  /// load-correlated cold-start failure this retry exists for.
+  void _handleSubscriptionClosed(String message) {
+    if (_disposed) return;
+    debugPrint(
+      '[ChannelSectionsManager] live subscription closed by relay: $message',
+    );
+    _unsubscribe = null;
+    _scheduleStartupRetry();
+  }
+
   void _mergeEvents(List<NostrEvent> events) {
     for (final event in events) {
       if (event.pubkey != pubkey) continue;
diff --git a/mobile/lib/features/channels/channel_typing_indicator.dart b/mobile/lib/features/channels/channel_typing_indicator.dart
new file mode 100644
index 0000000000..d021b9e287
--- /dev/null
+++ b/mobile/lib/features/channels/channel_typing_indicator.dart
@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../../shared/theme/theme.dart';
+import '../../shared/utils/string_utils.dart';
+import '../profile/user_cache_provider.dart';
+import 'channel_typing_provider.dart';
+import 'small_avatar.dart';
+
+/// Composer-adjacent status for people currently typing in a channel or thread.
+class ChannelTypingIndicator extends ConsumerWidget {
+  final List<TypingEntry> entries;
+
+  const ChannelTypingIndicator({super.key, required this.entries});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final userCache = ref.watch(userCacheProvider);
+    final names = entries.map((entry) {
+      final profile =
+          userCache[entry.pubkey.toLowerCase()] ??
+          ref.read(userCacheProvider.notifier).get(entry.pubkey.toLowerCase());
+      return profile?.label ?? shortPubkey(entry.pubkey);
+    }).toList();
+    final text = switch (names.length) {
+      1 => '${names[0]} is typing…',
+      2 => '${names[0]} and ${names[1]} are typing…',
+      _ => '${names[0]} and ${names.length - 1} others are typing…',
+    };
+    final visibleEntries = entries.take(3).toList();
+    final avatarCount = visibleEntries.length;
+
+    return Padding(
+      padding: const EdgeInsets.only(
+        left: Grid.twelve,
+        right: Grid.twelve,
+        bottom: Grid.xxs,
+      ),
+      child: Container(
+        key: const ValueKey('channel-typing-indicator'),
+        width: double.infinity,
+        padding: const EdgeInsets.symmetric(
+          horizontal: Grid.xxs,
+          vertical: Grid.xxs,
+        ),
+        decoration: BoxDecoration(
+          color: context.colors.surfaceContainerHighest,
+          borderRadius: BorderRadius.circular(Radii.dialog),
+          border: Border.all(
+            color: Colors.black.withValues(alpha: 0.04),
+            width: 1,
+          ),
+        ),
+        child: Row(
+          children: [
+            SizedBox(
+              width: 24.0 + (avatarCount - 1) * 14.0,
+              height: 24,
+              child: Stack(
+                children: [
+                  for (var i = 0; i < avatarCount; i++)
+                    Positioned(
+                      left: i * 14.0,
+                      child: SmallAvatar(
+                        pubkey: visibleEntries[i].pubkey,
+                        userCache: userCache,
+                        size: 24,
+                      ),
+                    ),
+                ],
+              ),
+            ),
+            const SizedBox(width: Grid.xxs),
+            Flexible(
+              child: Text(
+                text,
+                style: context.textTheme.labelSmall?.copyWith(
+                  color: context.colors.primary,
+                  fontStyle: FontStyle.italic,
+                ),
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/channels/channels_page.dart b/mobile/lib/features/channels/channels_page.dart
index 674a498af8..ba5d4ebf9d 100644
--- a/mobile/lib/features/channels/channels_page.dart
+++ b/mobile/lib/features/channels/channels_page.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:math' show pi;
+import 'dart:math' show max, min, pi;
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
@@ -10,17 +10,20 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../../shared/auth/auth.dart';
+import '../../shared/community/community_icon_provider.dart';
 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/buzz_loading_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
-import '../custom_emoji/custom_emoji.dart';
-import '../custom_emoji/custom_emoji_provider.dart';
-import '../custom_emoji/custom_emoji_render.dart';
+import '../../shared/widgets/skeleton.dart';
+import '../../shared/custom_emoji/custom_emoji.dart';
+import '../../shared/custom_emoji/custom_emoji_provider.dart';
+import '../../shared/custom_emoji/custom_emoji_render.dart';
 import '../profile/profile_avatar.dart';
 import '../profile/profile_provider.dart';
-import '../settings/settings_page.dart';
 import '../profile/presence_cache_provider.dart';
 import '../profile/user_cache_provider.dart';
 import '../pairing/pairing_page.dart';
@@ -46,15 +49,13 @@ part 'channels_page/sections.dart';
 part 'channels_page/channel_tile.dart';
 part 'channels_page/sheets.dart';
 part 'channels_page/badges.dart';
+part 'channels_page/skeleton.dart';
 part 'channels_page/community.dart';
 part 'channels_page/quick_actions.dart';
 part 'channels_page/quick_actions_launcher.dart';
 
 enum _QuickAction { createChannel, newDm }
 
-/// Height of the [_ConnectionBanner]: vertical padding (Grid.quarter + 2) × 2
-/// plus the ~16px row content (12px spinner / labelSmall text).
-const double _kBannerHeight = 24.0;
 const double _kChannelSectionInset = Grid.gutter;
 const double _kChannelLeadingWidth = 22.0;
 const double _kChannelIconSize = 18.0;
@@ -62,6 +63,24 @@ const double _kChannelLabelGap = Grid.xxs;
 const double _kChannelRowVerticalPadding = Grid.xxs + Grid.quarter;
 const double _kChannelLabelInset =
     _kChannelSectionInset + _kChannelLeadingWidth + _kChannelLabelGap;
+
+/// DM avatars are circles, so they fill their box edge to edge where a channel
+/// glyph leaves 4dp of slack inside the same 22dp leading column. Sizing them to
+/// the glyph's ink width keeps the icon-to-label distance identical across both
+/// sections while the labels stay on [_kChannelLabelInset].
+const double _kDmAvatarSize = _kChannelIconSize;
+
+const double _kTopSectionAvatarSize = 32.0;
+
+/// The top section's avatars are 32dp circles, which fill their box edge to
+/// edge; the channel rows below lead with an 18dp glyph left-aligned in a 22dp
+/// box at [_kChannelSectionInset]. Edge-aligning the two leaves the circles
+/// looking pushed outward, so the bar is pulled in to sit the avatar's centre
+/// on the channel-icon column (12 + 16 = 28dp against the glyph's ~29dp). Its
+/// label gap is derived separately so both labels land on the same 50dp column.
+const double _kTopSectionInset = Grid.twelve;
+const double _kTopSectionLabelGap =
+    _kChannelLabelInset - _kTopSectionInset - _kTopSectionAvatarSize;
 const Duration _kSectionExpandDuration = Duration(milliseconds: 220);
 const Duration _kSectionCollapseDuration = Duration(milliseconds: 170);
 const Curve _kSectionExpandCurve = Cubic(0.23, 1, 0.32, 1);
@@ -129,7 +148,9 @@ _UnreadChannelState _computeUnreadChannelState({
 }
 
 class ChannelsPage extends HookConsumerWidget {
-  const ChannelsPage({super.key});
+  const ChannelsPage({required this.settingsPageBuilder, super.key});
+
+  final WidgetBuilder settingsPageBuilder;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -187,41 +208,48 @@ class ChannelsPage extends HookConsumerWidget {
       return timer.cancel;
     }, [canSurfaceError]);
 
-    // Match desktop's degraded-state debounce: cached content remains steady
-    // through brief socket flaps, and the banner appears only for a sustained
-    // reconnect.
-    final showConnectionBanner = useState(false);
+    // Keep cached content steady through brief socket flaps. A sustained
+    // reconnect swaps to element-shaped skeletons that match desktop.
+    final showConnectionSkeleton = useState(false);
     final isReconnectingWithContent =
         channels != null &&
         (sessionState.status == SessionStatus.connecting ||
             sessionState.status == SessionStatus.reconnecting);
     useEffect(() {
       if (!isReconnectingWithContent) {
-        showConnectionBanner.value = false;
+        showConnectionSkeleton.value = false;
         return null;
       }
       final timer = Timer(const Duration(seconds: 2), () {
-        showConnectionBanner.value = true;
+        showConnectionSkeleton.value = true;
       });
       return timer.cancel;
     }, [isReconnectingWithContent]);
 
     return FrostedScaffold(
+      backgroundColor: Colors.transparent,
       appBar: FrostedAppBar(
-        horizontalInset: _kChannelSectionInset,
+        horizontalInset: _kTopSectionInset,
+        // Under a Buzz theme the community + account avatar strip carries the
+        // branded gradient, the way desktop paints it across the sidebar. Null
+        // under every other theme, leaving the default frosted fill.
+        gradient: context.appColors.topSectionGradient,
         leading: _CommunityIndicator(
-          onTap: () => showModalBottomSheet<void>(
-            context: context,
-            showDragHandle: true,
-            builder: (_) => const _CommunitySwitcherSheet(),
-          ),
+          onTap: () {
+            ref.invalidate(communityIconProvider);
+            showModalBottomSheet<void>(
+              context: context,
+              showDragHandle: true,
+              builder: (_) => const _CommunitySwitcherSheet(),
+            );
+          },
         ),
         title: const SizedBox.shrink(),
         actions: [
           ProfileAvatar(
-            onTap: () => Navigator.of(context).push(
-              MaterialPageRoute<void>(builder: (_) => const SettingsPage()),
-            ),
+            onTap: () => Navigator.of(
+              context,
+            ).push(MaterialPageRoute<void>(builder: settingsPageBuilder)),
           ),
         ],
       ),
@@ -230,7 +258,7 @@ class ChannelsPage extends HookConsumerWidget {
         channelsAsync: channelsAsync,
         showError: showError.value,
         sessionStatus: sessionState.status,
-        showConnectionBanner: showConnectionBanner.value,
+        showConnectionSkeleton: showConnectionSkeleton.value,
         currentPubkey: currentPubkey,
         onRefresh: () => ref.read(channelsProvider.notifier).refresh(),
         onSelectChannel: openChannel,
diff --git a/mobile/lib/features/channels/channels_page/badges.dart b/mobile/lib/features/channels/channels_page/badges.dart
index 9d697000c8..164d17171a 100644
--- a/mobile/lib/features/channels/channels_page/badges.dart
+++ b/mobile/lib/features/channels/channels_page/badges.dart
@@ -73,52 +73,6 @@ class _EphemeralBadge extends StatelessWidget {
   }
 }
 
-class _ConnectionBanner extends StatelessWidget {
-  final SessionStatus status;
-
-  const _ConnectionBanner({required this.status});
-
-  @override
-  Widget build(BuildContext context) {
-    if (status == SessionStatus.connected ||
-        status == SessionStatus.disconnected) {
-      return const SizedBox.shrink();
-    }
-
-    final isConnecting = status == SessionStatus.connecting;
-    final message = isConnecting ? 'Connecting…' : 'Reconnecting…';
-
-    return Container(
-      width: double.infinity,
-      padding: const EdgeInsets.symmetric(
-        horizontal: Grid.gutter,
-        vertical: Grid.quarter + 2,
-      ),
-      color: context.colors.surfaceContainerHighest,
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          SizedBox(
-            width: 12,
-            height: 12,
-            child: CircularProgressIndicator(
-              strokeWidth: 2,
-              color: context.colors.onSurfaceVariant,
-            ),
-          ),
-          const SizedBox(width: Grid.xxs),
-          Text(
-            message,
-            style: context.textTheme.labelSmall?.copyWith(
-              color: context.colors.onSurfaceVariant,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
 class _ErrorView extends StatelessWidget {
   final Object error;
   final VoidCallback onRetry;
diff --git a/mobile/lib/features/channels/channels_page/body.dart b/mobile/lib/features/channels/channels_page/body.dart
index 0639a13c26..9f0b1dd4a7 100644
--- a/mobile/lib/features/channels/channels_page/body.dart
+++ b/mobile/lib/features/channels/channels_page/body.dart
@@ -5,7 +5,7 @@ class _ChannelsBody extends StatelessWidget {
   final AsyncValue<List<Channel>> channelsAsync;
   final bool showError;
   final SessionStatus sessionStatus;
-  final bool showConnectionBanner;
+  final bool showConnectionSkeleton;
   final String? currentPubkey;
   final Future<void> Function() onRefresh;
   final Future<void> Function(Channel channel) onSelectChannel;
@@ -15,7 +15,7 @@ class _ChannelsBody extends StatelessWidget {
     required this.channelsAsync,
     required this.showError,
     required this.sessionStatus,
-    required this.showConnectionBanner,
+    required this.showConnectionSkeleton,
     required this.currentPubkey,
     required this.onRefresh,
     required this.onSelectChannel,
@@ -24,59 +24,40 @@ class _ChannelsBody extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final barHeight = frostedAppBarHeight(context);
-
-    if (channels != null) {
-      return Stack(
-        children: [
-          RefreshIndicator(
+    final loadedChannels = channels;
+    final loading =
+        showConnectionSkeleton || (loadedChannels == null && !showError);
+    final content = showError && channelsAsync.hasError
+        ? Padding(
+            padding: EdgeInsets.only(top: barHeight),
+            child: _ErrorView(error: channelsAsync.error!, onRetry: onRefresh),
+          )
+        : loadedChannels == null
+        ? const SizedBox.shrink()
+        : RefreshIndicator(
             edgeOffset: barHeight,
             onRefresh: onRefresh,
             child: CustomScrollView(
               slivers: [
                 SliverToBoxAdapter(child: SizedBox(height: barHeight)),
-                // Extra space for the connection banner when visible.
-                if (showConnectionBanner)
-                  const SliverToBoxAdapter(
-                    child: SizedBox(height: _kBannerHeight),
-                  ),
                 _SliverChannelsList(
-                  channels: channels!,
+                  channels: loadedChannels,
                   currentPubkey: currentPubkey,
                   onSelectChannel: onSelectChannel,
                 ),
               ],
             ),
-          ),
-          Positioned(
-            top: barHeight,
-            left: 0,
-            right: 0,
-            child: showConnectionBanner
-                ? _ConnectionBanner(status: sessionStatus)
-                : const SizedBox.shrink(),
-          ),
-        ],
-      );
-    }
+          );
 
-    // The error view is gated on a grace timer in the parent — see the
-    // useEffect in ChannelsPage. While the grace window is in flight we fall
-    // through to the connection banner so transient relay-cancellation errors
-    // don't flash the error UI.
-    if (showError && channelsAsync.hasError) {
-      return Padding(
-        padding: EdgeInsets.only(top: barHeight),
-        child: _ErrorView(error: channelsAsync.error!, onRetry: onRefresh),
-      );
-    }
-
-    return Padding(
-      padding: EdgeInsets.only(top: barHeight),
-      child: _ConnectionBanner(
-        status: sessionStatus == SessionStatus.connected
-            ? SessionStatus.connecting
-            : sessionStatus,
+    return SkeletonReveal(
+      loading: loading,
+      shimmerEnabled: sessionStatus != SessionStatus.disconnected,
+      skeleton: _ChannelsSkeleton(
+        channels: loadedChannels,
+        topInset: barHeight,
+        status: sessionStatus,
       ),
+      content: content,
     );
   }
 }
@@ -208,7 +189,10 @@ class _SliverChannelsList extends HookConsumerWidget {
     }
 
     return SliverPadding(
-      padding: const EdgeInsets.only(top: Grid.xxs, bottom: 80),
+      padding: EdgeInsets.only(
+        top: Grid.xxs,
+        bottom: MediaQuery.paddingOf(context).bottom,
+      ),
       sliver: SliverList.list(
         children: [
           if (visibleChannels.isEmpty)
@@ -308,7 +292,11 @@ class _SliverChannelsList extends HookConsumerWidget {
                   if (ts != null) {
                     ref
                         .read(readStateProvider.notifier)
-                        .markContextRead(channel.id, ts);
+                        .markContextRead(
+                          channel.id,
+                          ts,
+                          clearForcedMessages: true,
+                        );
                     ref
                         .read(channelsProvider.notifier)
                         .clearObservedUnreadCoveredByRead(channel.id, ts);
diff --git a/mobile/lib/features/channels/channels_page/channel_tile.dart b/mobile/lib/features/channels/channels_page/channel_tile.dart
index 2d730a34d2..551e3f8dd6 100644
--- a/mobile/lib/features/channels/channels_page/channel_tile.dart
+++ b/mobile/lib/features/channels/channels_page/channel_tile.dart
@@ -41,20 +41,19 @@ class _ChannelTile extends ConsumerWidget {
         ),
         child: Row(
           children: [
-            if (channel.isDm)
-              _DmAvatar(channel: channel, currentPubkey: currentPubkey)
-            else
-              SizedBox(
-                width: _kChannelLeadingWidth,
-                child: Align(
-                  alignment: Alignment.centerLeft,
-                  child: Icon(
-                    channelIcon(channel),
-                    size: _kChannelIconSize,
-                    color: context.colors.onSurface,
-                  ),
-                ),
+            SizedBox(
+              width: _kChannelLeadingWidth,
+              child: Align(
+                alignment: Alignment.centerLeft,
+                child: channel.isDm
+                    ? _DmAvatar(channel: channel, currentPubkey: currentPubkey)
+                    : Icon(
+                        channelIcon(channel),
+                        size: _kChannelIconSize,
+                        color: context.colors.onSurface,
+                      ),
               ),
+            ),
             const SizedBox(width: _kChannelLabelGap),
             Expanded(
               child: Column(
@@ -67,7 +66,7 @@ class _ChannelTile extends ConsumerWidget {
                     ),
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
-                    style: context.textTheme.bodyLarge?.copyWith(
+                    style: contentListTitleTextStyle.copyWith(
                       color: context.colors.onSurface,
                       fontWeight: isUnread ? FontWeight.w700 : FontWeight.w400,
                     ),
@@ -201,14 +200,21 @@ class _ChannelTile extends ConsumerWidget {
                         onMarkRead?.call();
                         ref
                             .read(readStateProvider.notifier)
-                            .markContextRead(channel.id, ts);
+                            .markContextRead(
+                              channel.id,
+                              ts,
+                              clearForcedMessages: true,
+                            );
                         ref
                             .read(channelsProvider.notifier)
                             .clearObservedUnreadCoveredByRead(channel.id, ts);
                       } else {
                         ref
                             .read(readStateProvider.notifier)
-                            .markContextUnread(channel.id);
+                            .markContextUnread(
+                              channel.id,
+                              channelId: channel.id,
+                            );
                       }
                     }
                   },
@@ -343,8 +349,8 @@ class _DmAvatar extends ConsumerWidget {
 
     if (visiblePubkeys.length > 1) {
       return Container(
-        width: 22,
-        height: 22,
+        width: _kDmAvatarSize,
+        height: _kDmAvatarSize,
         alignment: Alignment.center,
         decoration: BoxDecoration(
           color: context.colors.surfaceContainerHighest,
@@ -354,7 +360,7 @@ class _DmAvatar extends ConsumerWidget {
         child: Text(
           '${visiblePubkeys.length}',
           style: context.textTheme.labelSmall?.copyWith(
-            fontSize: 10,
+            fontSize: 9,
             color: context.colors.onSurface,
             fontWeight: FontWeight.w600,
             height: 1,
@@ -385,14 +391,14 @@ class _DmAvatar extends ConsumerWidget {
         : 'offline';
 
     return SizedBox(
-      width: 22,
-      height: 22,
+      width: _kDmAvatarSize,
+      height: _kDmAvatarSize,
       child: Stack(
         clipBehavior: Clip.none,
         children: [
           AvatarImage(
             imageUrl: avatarUrl,
-            radius: 10,
+            radius: _kDmAvatarSize / 2,
             backgroundColor: context.colors.primaryContainer,
             fallback: Text(
               initial,
@@ -407,8 +413,8 @@ class _DmAvatar extends ConsumerWidget {
             right: -1,
             bottom: -1,
             child: Container(
-              width: 9,
-              height: 9,
+              width: 8,
+              height: 8,
               decoration: BoxDecoration(
                 color: _presenceColor(context, presence),
                 shape: BoxShape.circle,
diff --git a/mobile/lib/features/channels/channels_page/community.dart b/mobile/lib/features/channels/channels_page/community.dart
index 733d2dd6ad..73935f4631 100644
--- a/mobile/lib/features/channels/channels_page/community.dart
+++ b/mobile/lib/features/channels/channels_page/community.dart
@@ -1,134 +1,192 @@
 part of '../channels_page.dart';
 
-class _CommunitySwitcherSheet extends ConsumerWidget {
+class _CommunitySwitcherSheet extends HookConsumerWidget {
   const _CommunitySwitcherSheet();
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final communitiesAsync = ref.watch(communityListProvider);
     final activeAsync = ref.watch(activeCommunityProvider);
-    final sessionState = ref.watch(relaySessionProvider);
+    final isEditing = useState(false);
 
     return SafeArea(
-      child: communitiesAsync.when(
-        loading: () => const SizedBox(
-          height: 120,
-          child: Center(child: CircularProgressIndicator()),
-        ),
-        error: (e, _) => Padding(
-          padding: const EdgeInsets.all(Grid.xs),
-          child: Text('Error loading communities: $e'),
-        ),
-        data: (communities) {
-          final activeId = activeAsync.value?.id;
-          return Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              for (final community in communities)
-                _CommunitySwitcherTile(
-                  community: community,
-                  isActive: community.id == activeId,
-                  sessionStatus: community.id == activeId
-                      ? sessionState.status
-                      : null,
-                  onTap: () async {
-                    if (community.id != activeId) {
-                      await ref
-                          .read(communityListProvider.notifier)
-                          .switchCommunity(community.id);
-                    }
-                    if (context.mounted) Navigator.of(context).pop();
-                  },
-                  onRename: () async {
-                    final nav = Navigator.of(context, rootNavigator: true);
-                    final notifier = ref.read(communityListProvider.notifier);
-                    Navigator.of(context).pop();
-                    final name = await showDialog<String>(
-                      context: nav.context,
-                      useRootNavigator: true,
-                      builder: (_) =>
-                          _RenameCommunityDialog(currentName: community.name),
-                    );
-                    if (name != null && name.isNotEmpty) {
-                      await notifier.renameCommunity(community.id, name);
-                    }
-                  },
-                  onRemove: () async {
-                    final confirmed = await showDialog<bool>(
-                      context: context,
-                      builder: (dialogContext) => AlertDialog(
-                        title: const Text('Remove Community'),
-                        content: Text(
-                          'Remove "${community.name}"? You can re-pair later.',
-                        ),
-                        actions: [
-                          TextButton(
-                            onPressed: () =>
-                                Navigator.of(dialogContext).pop(false),
-                            child: const Text('Cancel'),
+      child: Column(
+        key: const Key('community-switcher-sheet'),
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(
+              Grid.gutter,
+              Grid.xxs,
+              Grid.gutter,
+              Grid.xxs,
+            ),
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(minHeight: 32),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Text(
+                      'Switch Community',
+                      key: const Key('community-switcher-title'),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: context.textTheme.titleLarge?.copyWith(
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.only(right: Grid.half),
+                    child: ConstrainedBox(
+                      key: const Key('community-switcher-edit'),
+                      constraints: const BoxConstraints(
+                        minWidth: 48,
+                        minHeight: 32,
+                      ),
+                      child: TextButton(
+                        onPressed: () => isEditing.value = !isEditing.value,
+                        style: TextButton.styleFrom(
+                          minimumSize: Size.zero,
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: Grid.half,
                           ),
-                          TextButton(
-                            onPressed: () =>
-                                Navigator.of(dialogContext).pop(true),
-                            child: const Text('Remove'),
+                          tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                        ),
+                        child: Text(isEditing.value ? 'Done' : 'Edit'),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          Flexible(
+            child: communitiesAsync.when(
+              loading: () => const SizedBox(
+                height: 120,
+                child: Center(
+                  child: BuzzLoadingIndicator(
+                    size: 40,
+                    semanticLabel: 'Loading communities',
+                  ),
+                ),
+              ),
+              error: (e, _) => Padding(
+                padding: const EdgeInsets.all(Grid.xs),
+                child: Text('Error loading communities: $e'),
+              ),
+              data: (communities) {
+                final activeId = activeAsync.value?.id;
+                return SingleChildScrollView(
+                  padding: const EdgeInsets.only(bottom: Grid.xs),
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: Grid.gutter,
+                    ),
+                    child: Material(
+                      key: const Key('community-switcher-options'),
+                      color: context.colors.surfaceContainerHighest,
+                      borderRadius: BorderRadius.circular(Radii.card),
+                      clipBehavior: Clip.antiAlias,
+                      child: Column(
+                        children: [
+                          for (
+                            var index = 0;
+                            index < communities.length;
+                            index++
+                          ) ...[
+                            if (index > 0) const _CommunitySwitcherDivider(),
+                            _CommunitySwitcherTile(
+                              community: communities[index],
+                              isActive: communities[index].id == activeId,
+                              isEditing: isEditing.value,
+                              onTap: isEditing.value
+                                  ? null
+                                  : () async {
+                                      final community = communities[index];
+                                      if (community.id != activeId) {
+                                        await ref
+                                            .read(
+                                              communityListProvider.notifier,
+                                            )
+                                            .switchCommunity(community.id);
+                                      }
+                                      if (context.mounted) {
+                                        Navigator.of(context).pop();
+                                      }
+                                    },
+                              onRemove: () => _confirmRemoveCommunity(
+                                context,
+                                ref,
+                                communities[index],
+                                closeSheetAfterRemoval:
+                                    communities[index].id == activeId,
+                              ),
+                            ),
+                          ],
+                          if (communities.isNotEmpty)
+                            const _CommunitySwitcherDivider(),
+                          _AddCommunityTile(
+                            onTap: () {
+                              final nav = Navigator.of(
+                                context,
+                                rootNavigator: true,
+                              );
+                              ref.read(pairingProvider.notifier).reset();
+                              Navigator.of(context).pop();
+                              nav.push(
+                                MaterialPageRoute<void>(
+                                  builder: (_) =>
+                                      const PairingPage(addingCommunity: true),
+                                ),
+                              );
+                            },
                           ),
                         ],
                       ),
-                    );
-                    if (confirmed == true && context.mounted) {
-                      final messenger = ScaffoldMessenger.of(context);
-                      try {
-                        await ref
-                            .read(communityListProvider.notifier)
-                            .removeCommunity(community.id);
-                        if (context.mounted) Navigator.of(context).pop();
-                      } catch (e) {
-                        messenger.showSnackBar(
-                          SnackBar(
-                            content: Text('Failed to remove community: $e'),
-                          ),
-                        );
-                      }
-                    }
-                  },
-                ),
-              const Divider(height: 1),
-              ListTile(
-                leading: const Icon(LucideIcons.plus),
-                title: const Text('Add Community'),
-                onTap: () {
-                  final nav = Navigator.of(context, rootNavigator: true);
-                  ref.read(pairingProvider.notifier).reset();
-                  Navigator.of(context).pop();
-                  nav.push(
-                    MaterialPageRoute<void>(
-                      builder: (_) => const PairingPage(addingCommunity: true),
                     ),
-                  );
-                },
-              ),
-            ],
-          );
-        },
+                  ),
+                );
+              },
+            ),
+          ),
+        ],
       ),
     );
   }
 }
 
+const double _communitySwitcherAvatarSize = 36;
+
+class _CommunitySwitcherDivider extends StatelessWidget {
+  const _CommunitySwitcherDivider();
+
+  @override
+  Widget build(BuildContext context) {
+    return Divider(
+      height: 1,
+      thickness: 1,
+      indent: Grid.xs + _communitySwitcherAvatarSize + Grid.xs,
+      endIndent: 0,
+      color: context.colors.onSurface.withValues(alpha: 0.12),
+    );
+  }
+}
+
 class _CommunitySwitcherTile extends StatelessWidget {
   final Community community;
   final bool isActive;
-  final SessionStatus? sessionStatus;
-  final VoidCallback onTap;
-  final VoidCallback onRename;
+  final bool isEditing;
+  final VoidCallback? onTap;
   final VoidCallback onRemove;
 
   const _CommunitySwitcherTile({
     required this.community,
     required this.isActive,
-    required this.sessionStatus,
+    required this.isEditing,
     required this.onTap,
-    required this.onRename,
     required this.onRemove,
   });
 
@@ -136,111 +194,269 @@ class _CommunitySwitcherTile extends StatelessWidget {
   Widget build(BuildContext context) {
     final host = Uri.tryParse(community.relayUrl)?.host ?? community.relayUrl;
 
-    return ListTile(
-      leading: _StatusDot(isActive: isActive, sessionStatus: sessionStatus),
-      title: Text(
-        community.name,
-        style: context.textTheme.bodyLarge?.copyWith(
-          fontWeight: isActive ? FontWeight.w600 : FontWeight.normal,
-        ),
-      ),
-      subtitle: Text(
-        host,
-        style: context.textTheme.bodySmall?.copyWith(
-          color: context.colors.onSurfaceVariant,
-        ),
-      ),
-      trailing: PopupMenuButton<String>(
-        icon: Icon(
-          LucideIcons.ellipsisVertical,
-          size: 18,
-          color: context.colors.onSurfaceVariant,
-        ),
-        onSelected: (value) {
-          switch (value) {
-            case 'rename':
-              onRename();
-            case 'remove':
-              onRemove();
-          }
-        },
-        itemBuilder: (_) => [
-          const PopupMenuItem(value: 'rename', child: Text('Rename')),
-          const PopupMenuItem(value: 'remove', child: Text('Remove')),
-        ],
-      ),
+    return InkWell(
+      key: Key('community-switcher-row-${community.id}'),
       onTap: onTap,
-    );
-  }
-}
-
-class _StatusDot extends StatelessWidget {
-  final bool isActive;
-  final SessionStatus? sessionStatus;
-
-  const _StatusDot({required this.isActive, required this.sessionStatus});
-
-  @override
-  Widget build(BuildContext context) {
-    if (!isActive) {
-      return Container(
-        width: 10,
-        height: 10,
-        decoration: BoxDecoration(
-          shape: BoxShape.circle,
-          color: context.colors.outline.withValues(alpha: 0.3),
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(
+          Grid.xs,
+          Grid.twelve,
+          Grid.xxs,
+          Grid.twelve,
         ),
-      );
-    }
-
-    final color = switch (sessionStatus) {
-      SessionStatus.connected => context.appColors.success,
-      SessionStatus.connecting ||
-      SessionStatus.reconnecting => context.appColors.warning,
-      _ => context.colors.outline,
-    };
-
-    return Container(
-      width: 10,
-      height: 10,
-      decoration: BoxDecoration(shape: BoxShape.circle, color: color),
+        child: Row(
+          children: [
+            _CommunityAvatar(
+              key: Key('community-switcher-avatar-${community.id}'),
+              name: community.name,
+              relayUrl: community.relayUrl,
+              size: _communitySwitcherAvatarSize,
+            ),
+            const SizedBox(width: Grid.xs),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text(
+                    community.name,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: context.textTheme.bodyLarge?.copyWith(
+                      fontWeight: isActive
+                          ? FontWeight.w600
+                          : FontWeight.normal,
+                    ),
+                  ),
+                  const SizedBox(height: Grid.quarter),
+                  Text(
+                    host,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: context.textTheme.bodySmall?.copyWith(
+                      color: context.colors.onSurfaceVariant,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            const SizedBox(width: Grid.xxs),
+            _CommunityActionSwap(
+              key: Key('community-switcher-action-${community.id}'),
+              communityId: community.id,
+              communityName: community.name,
+              isActive: isActive,
+              isEditing: isEditing,
+              onRemove: onRemove,
+            ),
+          ],
+        ),
+      ),
     );
   }
 }
 
-class _RenameCommunityDialog extends HookWidget {
-  final String currentName;
+const _communityActionSwapDuration = Duration(milliseconds: 250);
+const double _communityActionSwapBlur = 2;
+const double _communityActionSwapStartScale = 0.25;
 
-  const _RenameCommunityDialog({required this.currentName});
+class _CommunityActionSwap extends StatelessWidget {
+  const _CommunityActionSwap({
+    super.key,
+    required this.communityId,
+    required this.communityName,
+    required this.isActive,
+    required this.isEditing,
+    required this.onRemove,
+  });
+
+  final String communityId;
+  final String communityName;
+  final bool isActive;
+  final bool isEditing;
+  final VoidCallback onRemove;
 
   @override
   Widget build(BuildContext context) {
-    final controller = useTextEditingController(text: currentName);
+    final reduceMotion =
+        MediaQuery.maybeOf(context)?.disableAnimations ?? false;
 
-    return AlertDialog(
-      title: const Text('Rename Community'),
-      content: TextField(
-        controller: controller,
-        autofocus: true,
-        decoration: const InputDecoration(labelText: 'Name'),
-        onSubmitted: (value) {
-          final name = value.trim();
-          if (name.isNotEmpty) Navigator.of(context).pop(name);
+    return SizedBox.square(
+      dimension: 40,
+      child: AnimatedSwitcher(
+        duration: reduceMotion ? Duration.zero : _communityActionSwapDuration,
+        reverseDuration: reduceMotion
+            ? Duration.zero
+            : _communityActionSwapDuration,
+        transitionBuilder: (child, animation) {
+          final eased = CurvedAnimation(
+            parent: animation,
+            curve: Curves.easeInOut,
+          );
+          return AnimatedBuilder(
+            animation: eased,
+            child: child,
+            builder: (context, child) {
+              final progress = eased.value;
+              final blur = _communityActionSwapBlur * (1 - progress);
+              final scale =
+                  _communityActionSwapStartScale +
+                  ((1 - _communityActionSwapStartScale) * progress);
+              return Opacity(
+                opacity: progress,
+                child: ImageFiltered(
+                  enabled: blur > 0.01,
+                  imageFilter: ImageFilter.blur(sigmaX: blur, sigmaY: blur),
+                  child: Transform.scale(scale: scale, child: child),
+                ),
+              );
+            },
+          );
         },
+        child: isEditing
+            ? IconButton(
+                key: ValueKey('community-switcher-remove-$communityId'),
+                tooltip: 'Remove $communityName',
+                visualDensity: VisualDensity.compact,
+                onPressed: onRemove,
+                icon: Icon(
+                  LucideIcons.trash2,
+                  size: 18,
+                  color: context.colors.error,
+                ),
+              )
+            : Center(
+                key: ValueKey('community-switcher-selection-$communityId'),
+                child: _CommunitySelectionIndicator(
+                  key: ValueKey('community-switcher-circle-$communityId'),
+                  communityName: communityName,
+                  isActive: isActive,
+                ),
+              ),
+      ),
+    );
+  }
+}
+
+class _CommunitySelectionIndicator extends StatelessWidget {
+  const _CommunitySelectionIndicator({
+    super.key,
+    required this.communityName,
+    required this.isActive,
+  });
+
+  final String communityName;
+  final bool isActive;
+
+  @override
+  Widget build(BuildContext context) {
+    return Semantics(
+      label: isActive
+          ? '$communityName is the current community'
+          : 'Switch to $communityName',
+      child: Container(
+        width: 24,
+        height: 24,
+        decoration: BoxDecoration(
+          color: isActive ? context.appColors.success : Colors.transparent,
+          border: isActive
+              ? null
+              : Border.all(color: context.colors.outlineVariant, width: 2),
+          shape: BoxShape.circle,
+        ),
+        child: isActive
+            ? const Icon(LucideIcons.check, color: Colors.white, size: 16)
+            : null,
+      ),
+    );
+  }
+}
+
+class _AddCommunityTile extends StatelessWidget {
+  const _AddCommunityTile({required this.onTap});
+
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      key: const Key('community-switcher-add'),
+      onTap: onTap,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: Grid.xs,
+          vertical: Grid.twelve,
+        ),
+        child: Row(
+          children: [
+            Container(
+              width: _communitySwitcherAvatarSize,
+              height: _communitySwitcherAvatarSize,
+              decoration: BoxDecoration(
+                color: context.colors.primaryContainer,
+                shape: BoxShape.circle,
+              ),
+              child: Icon(
+                LucideIcons.plus,
+                size: 18,
+                color: context.colors.onPrimaryContainer,
+              ),
+            ),
+            const SizedBox(width: Grid.xs),
+            Text(
+              'Add Community',
+              style: context.textTheme.bodyLarge?.copyWith(
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+Future<void> _confirmRemoveCommunity(
+  BuildContext context,
+  WidgetRef ref,
+  Community community, {
+  required bool closeSheetAfterRemoval,
+}) async {
+  final confirmed = await showDialog<bool>(
+    context: context,
+    builder: (dialogContext) => AlertDialog.adaptive(
+      title: const Text('Remove community?'),
+      content: Text(
+        'Are you sure you want to remove “${community.name}”? '
+        'You can pair with it again later.',
       ),
       actions: [
         TextButton(
-          onPressed: () => Navigator.of(context).pop(),
+          onPressed: () => Navigator.of(dialogContext).pop(false),
           child: const Text('Cancel'),
         ),
-        TextButton(
-          onPressed: () {
-            final name = controller.text.trim();
-            if (name.isNotEmpty) Navigator.of(context).pop(name);
-          },
-          child: const Text('Rename'),
+        FilledButton(
+          onPressed: () => Navigator.of(dialogContext).pop(true),
+          style: FilledButton.styleFrom(backgroundColor: context.colors.error),
+          child: const Text('Remove'),
         ),
       ],
+    ),
+  );
+
+  if (confirmed != true || !context.mounted) return;
+
+  final messenger = ScaffoldMessenger.of(context);
+  try {
+    await ref
+        .read(communityListProvider.notifier)
+        .removeCommunity(community.id);
+    if (closeSheetAfterRemoval && context.mounted) {
+      Navigator.of(context).pop();
+    }
+  } catch (e) {
+    messenger.showSnackBar(
+      SnackBar(content: Text('Failed to remove community: $e')),
     );
   }
 }
@@ -254,7 +470,8 @@ class _CommunityIndicator extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final activeAsync = ref.watch(activeCommunityProvider);
 
-    final name = activeAsync.value?.name;
+    final activeCommunity = activeAsync.value;
+    final name = activeCommunity?.name;
 
     return GestureDetector(
       onTap: onTap,
@@ -262,8 +479,8 @@ class _CommunityIndicator extends ConsumerWidget {
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          _CommunityAvatar(name: name),
-          const SizedBox(width: Grid.xxs),
+          _CommunityAvatar(name: name, relayUrl: activeCommunity?.relayUrl),
+          const SizedBox(width: _kTopSectionLabelGap),
           if (name != null)
             Flexible(
               child: Text(
@@ -290,22 +507,34 @@ class _CommunityIndicator extends ConsumerWidget {
   }
 }
 
-class _CommunityAvatar extends StatelessWidget {
+class _CommunityAvatar extends ConsumerWidget {
   final String? name;
+  final String? relayUrl;
+  final double size;
 
-  const _CommunityAvatar({required this.name});
+  const _CommunityAvatar({
+    super.key,
+    required this.name,
+    this.relayUrl,
+    this.size = _kTopSectionAvatarSize,
+  });
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final trimmedName = name?.trim();
     final initial = trimmedName != null && trimmedName.isNotEmpty
         ? trimmedName.substring(0, 1).toUpperCase()
         : '?';
+    final relay = relayUrl;
+    final iconUrl = relay == null
+        ? null
+        : ref.watch(communityIconProvider(relay)).value;
 
-    return CircleAvatar(
-      radius: 16,
+    return AvatarImage(
+      imageUrl: iconUrl,
+      radius: size / 2,
       backgroundColor: context.colors.primaryContainer,
-      child: Text(
+      fallback: Text(
         initial,
         style: context.textTheme.labelMedium?.copyWith(
           color: context.colors.onPrimaryContainer,
diff --git a/mobile/lib/features/channels/channels_page/sections.dart b/mobile/lib/features/channels/channels_page/sections.dart
index 394f68f6f7..f9fe5453d7 100644
--- a/mobile/lib/features/channels/channels_page/sections.dart
+++ b/mobile/lib/features/channels/channels_page/sections.dart
@@ -152,56 +152,72 @@ class _CustomSectionHeader extends ConsumerWidget {
               ),
             ),
             const SizedBox(width: _kChannelLabelGap),
-            Text(
-              section.name,
-              style: context.textTheme.bodyLarge?.copyWith(
-                color: sectionColor,
-                fontWeight: FontWeight.w600,
+            Expanded(
+              child: Text(
+                section.name,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: contentListTitleTextStyle.copyWith(
+                  color: sectionColor,
+                  fontWeight: FontWeight.w600,
+                ),
               ),
             ),
-            const Spacer(),
-            GestureDetector(
-              onTapUp: (details) async {
-                final overlay =
-                    Overlay.of(context).context.findRenderObject()!
-                        as RenderBox;
-                final position = RelativeRect.fromRect(
-                  details.globalPosition & Size.zero,
-                  Offset.zero & overlay.size,
-                );
-                final value = await showMenu<String>(
-                  context: context,
-                  position: position,
-                  items: [
-                    const PopupMenuItem(value: 'rename', child: Text('Rename')),
-                    PopupMenuItem(
-                      value: 'move_up',
-                      enabled: !isFirst,
-                      child: const Text('Move Up'),
+            Builder(
+              builder: (buttonContext) => IconButton(
+                key: ValueKey('section-menu-${section.id}'),
+                tooltip: '${section.name} options',
+                visualDensity: VisualDensity.compact,
+                icon: Icon(
+                  LucideIcons.ellipsisVertical,
+                  size: _kChannelIconSize,
+                  color: sectionColor,
+                ),
+                onPressed: () async {
+                  final value = await showAnchoredPopover<String>(
+                    context: buttonContext,
+                    width: 216,
+                    alignment: AnchoredPopoverAlignment.end,
+                    color: context.colors.surface,
+                    elevation: 4,
+                    shadowColor: context.colors.shadow.withValues(alpha: 0.18),
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(Radii.md),
+                      side: BorderSide(color: context.colors.outline),
                     ),
-                    PopupMenuItem(
-                      value: 'move_down',
-                      enabled: !isLast,
-                      child: const Text('Move Down'),
-                    ),
-                    const PopupMenuItem(value: 'delete', child: Text('Delete')),
-                  ],
-                );
-                switch (value) {
-                  case 'rename':
-                    onRename();
-                  case 'move_up':
-                    onMoveUp();
-                  case 'move_down':
-                    onMoveDown();
-                  case 'delete':
-                    onDelete();
-                }
-              },
-              child: Icon(
-                LucideIcons.ellipsisVertical,
-                size: _kChannelIconSize,
-                color: sectionColor,
+                    surfaceKey: ValueKey('section-popover-${section.id}'),
+                    items: [
+                      const PopupMenuItem(
+                        value: 'rename',
+                        child: Text('Rename'),
+                      ),
+                      PopupMenuItem(
+                        value: 'move_up',
+                        enabled: !isFirst,
+                        child: const Text('Move Up'),
+                      ),
+                      PopupMenuItem(
+                        value: 'move_down',
+                        enabled: !isLast,
+                        child: const Text('Move Down'),
+                      ),
+                      const PopupMenuItem(
+                        value: 'delete',
+                        child: Text('Delete'),
+                      ),
+                    ],
+                  );
+                  switch (value) {
+                    case 'rename':
+                      onRename();
+                    case 'move_up':
+                      onMoveUp();
+                    case 'move_down':
+                      onMoveDown();
+                    case 'delete':
+                      onDelete();
+                  }
+                },
               ),
             ),
             const SizedBox(width: Grid.quarter),
@@ -318,7 +334,7 @@ class _ChannelSection extends StatelessWidget {
                   ),
                   child: Text(
                     emptyLabel,
-                    style: context.textTheme.bodySmall?.copyWith(
+                    style: contentListBodyTextStyle.copyWith(
                       color: context.colors.onSurfaceVariant,
                     ),
                   ),
@@ -430,7 +446,7 @@ class _SectionHeader extends StatelessWidget {
             const SizedBox(width: _kChannelLabelGap),
             Text(
               label,
-              style: context.textTheme.bodyLarge?.copyWith(
+              style: contentListTitleTextStyle.copyWith(
                 color: sectionColor,
                 fontWeight: FontWeight.w600,
               ),
diff --git a/mobile/lib/features/channels/channels_page/sheets.dart b/mobile/lib/features/channels/channels_page/sheets.dart
index 51aead28c7..2738be0aa9 100644
--- a/mobile/lib/features/channels/channels_page/sheets.dart
+++ b/mobile/lib/features/channels/channels_page/sheets.dart
@@ -642,10 +642,11 @@ class _NewDirectMessageSheet extends HookConsumerWidget {
                                               ),
                                               child: SizedBox.square(
                                                 dimension: 16,
-                                                child:
-                                                    CircularProgressIndicator(
-                                                      strokeWidth: 2,
-                                                    ),
+                                                child: BuzzLoadingIndicator(
+                                                  size: 16,
+                                                  semanticLabel:
+                                                      'Creating conversation',
+                                                ),
                                               ),
                                             )
                                           : null,
@@ -686,7 +687,12 @@ class _NewDirectMessageSheet extends HookConsumerWidget {
                       isSearchTransitionPending) {
                     return const SizedBox(
                       height: 280,
-                      child: Center(child: CircularProgressIndicator()),
+                      child: Center(
+                        child: BuzzLoadingIndicator(
+                          size: 44,
+                          semanticLabel: 'Loading people',
+                        ),
+                      ),
                     );
                   }
                   if (directoryAsync.hasError) {
diff --git a/mobile/lib/features/channels/channels_page/skeleton.dart b/mobile/lib/features/channels/channels_page/skeleton.dart
new file mode 100644
index 0000000000..75d3fc1a87
--- /dev/null
+++ b/mobile/lib/features/channels/channels_page/skeleton.dart
@@ -0,0 +1,136 @@
+part of '../channels_page.dart';
+
+class _ChannelsSkeleton extends StatelessWidget {
+  final List<Channel>? channels;
+  final double topInset;
+  final SessionStatus status;
+
+  const _ChannelsSkeleton({
+    required this.channels,
+    required this.topInset,
+    required this.status,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final visibleChannels =
+        channels
+            ?.where((channel) => channel.isMember && !channel.isArchived)
+            .take(8)
+            .toList() ??
+        const <Channel>[];
+    final widths = visibleChannels
+        .map(
+          (channel) => min(
+            240,
+            max(
+              88,
+              24 +
+                  (resolveDmChannelDisplayLabel(
+                        channel,
+                        currentPubkey: null,
+                      ).length *
+                      8),
+            ),
+          ).toDouble(),
+        )
+        .toList();
+    const fallbackWidths = <double>[136, 184, 112, 160, 208, 128];
+    while (widths.length < 6) {
+      widths.add(fallbackWidths[widths.length % fallbackWidths.length]);
+    }
+    final splitAt = min(4, widths.length);
+    final firstSection = widths.take(splitAt).toList();
+    final secondSection = widths.skip(splitAt).toList();
+
+    final semanticsLabel = switch (status) {
+      SessionStatus.connecting => 'Connecting',
+      SessionStatus.reconnecting => 'Reconnecting',
+      SessionStatus.connected || SessionStatus.disconnected => 'Loading',
+    };
+    return Semantics(
+      key: const Key('channels-connection-skeleton'),
+      liveRegion: true,
+      label: semanticsLabel,
+      child: ExcludeSemantics(
+        child: ListView(
+          physics: const NeverScrollableScrollPhysics(),
+          padding: EdgeInsets.fromLTRB(
+            Grid.gutter,
+            topInset + Grid.twelve,
+            Grid.gutter,
+            80,
+          ),
+          children: [
+            _ChannelSkeletonSection(widths: firstSection),
+            const SizedBox(height: Grid.xs),
+            _ChannelSkeletonSection(widths: secondSection),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _ChannelSkeletonSection extends StatelessWidget {
+  final List<double> widths;
+
+  const _ChannelSkeletonSection({required this.widths});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        const Padding(
+          padding: EdgeInsets.symmetric(vertical: Grid.half),
+          child: Row(
+            children: [
+              SizedBox(
+                width: _kChannelLeadingWidth,
+                child: Align(
+                  alignment: Alignment.centerLeft,
+                  child: SkeletonBar(width: 18, height: 18),
+                ),
+              ),
+              SizedBox(width: Grid.xxs),
+              SkeletonBar(
+                key: Key('channels-skeleton-section-label'),
+                width: 88,
+                height: 16,
+              ),
+            ],
+          ),
+        ),
+        for (var index = 0; index < widths.length; index++)
+          Padding(
+            padding: const EdgeInsets.symmetric(
+              vertical: _kChannelRowVerticalPadding,
+            ),
+            child: Row(
+              children: [
+                SizedBox(
+                  width: _kChannelLeadingWidth,
+                  child: Align(
+                    alignment: Alignment.centerLeft,
+                    child: SkeletonBar(
+                      width: _kChannelIconSize,
+                      height: _kChannelIconSize,
+                      borderRadius: BorderRadius.circular(
+                        index.isEven ? Radii.xs : Radii.full,
+                      ),
+                    ),
+                  ),
+                ),
+                const SizedBox(width: _kChannelLabelGap),
+                SkeletonBar(
+                  key: Key('channels-skeleton-row-label-$index'),
+                  width: widths[index],
+                  height: 16,
+                ),
+              ],
+            ),
+          ),
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/features/channels/channels_provider.dart b/mobile/lib/features/channels/channels_provider.dart
index 74bbe640bd..614ab054c3 100644
--- a/mobile/lib/features/channels/channels_provider.dart
+++ b/mobile/lib/features/channels/channels_provider.dart
@@ -12,6 +12,7 @@ import 'channel.dart';
 import 'channel_management_provider.dart' show channelDetailsProvider;
 import 'channel_mutes/channel_mutes_provider.dart';
 import 'read_state/read_state_provider.dart';
+import 'thread_follows/thread_follows_provider.dart';
 import 'unread_badge/is_high_priority_event.dart';
 import 'unread_badge/observed_unread_event.dart';
 import 'unread_badge/should_notify_for_event.dart';
@@ -545,6 +546,7 @@ class ChannelsNotifier extends AsyncNotifier<List<Channel>> {
           event,
           myPk,
           participatedRootIds: _participatedRootIds,
+          followedRootIds: _followedRootIds(),
           authoredRootIds: _authoredRootIds,
           mutedChannelIds: mutedChannelIds,
           channelId: channel.id,
@@ -585,6 +587,7 @@ class ChannelsNotifier extends AsyncNotifier<List<Channel>> {
             event,
             myPk,
             participatedRootIds: _participatedRootIds,
+            followedRootIds: _followedRootIds(),
             authoredRootIds: _authoredRootIds,
             mutedChannelIds: mutedChannelIds,
             channelId: channel.id,
@@ -609,6 +612,9 @@ class ChannelsNotifier extends AsyncNotifier<List<Channel>> {
       if (entry.value.muted) entry.key,
   };
 
+  Set<String> _followedRootIds() =>
+      ref.read(threadFollowsProvider).followedRootIds;
+
   void _loadThreadInterestStores(String pubkey) {
     final normalizedPubkey = pubkey.toLowerCase();
     if (_threadInterestPubkey == normalizedPubkey) return;
diff --git a/mobile/lib/features/channels/compose_bar.dart b/mobile/lib/features/channels/compose_bar.dart
index 8711ff7b3a..6c44285a4e 100644
--- a/mobile/lib/features/channels/compose_bar.dart
+++ b/mobile/lib/features/channels/compose_bar.dart
@@ -1,10 +1,12 @@
 import 'dart:async';
 import 'dart:collection';
+import 'dart:math' as math;
 
 import 'package:camera/camera.dart' as camera;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/physics.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
@@ -15,10 +17,12 @@ import 'package:nostr/nostr.dart' as nostr;
 import '../../shared/relay/relay.dart';
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../profile/user_cache_provider.dart';
 import '../profile/user_profile.dart';
-import '../custom_emoji/custom_emoji.dart';
-import '../custom_emoji/custom_emoji_provider.dart';
+import '../../shared/custom_emoji/custom_emoji.dart';
+import '../../shared/custom_emoji/custom_emoji_provider.dart';
+import '../activity/compose_drafts_provider.dart';
 import 'camera_capture_cleanup.dart';
 import 'channel.dart';
 import 'channel_management_provider.dart';
@@ -27,21 +31,21 @@ import 'emoji_picker.dart';
 import 'mentions/mention_candidates.dart';
 import 'mentions/mention_candidates_provider.dart';
 import 'mentions/mention_ranking.dart';
+import 'photo_library.dart';
 
 part 'compose_bar/helpers.dart';
 part 'compose_bar/markdown_editing_controller.dart';
 part 'compose_bar/suggestions.dart';
 part 'compose_bar/formatting_toolbar.dart';
 part 'compose_bar/attachments.dart';
+part 'compose_bar/photo_gallery_picker.dart';
+part 'compose_bar/ios_photo_picker.dart';
+part 'compose_bar/ios_attachment_popover.dart';
 part 'compose_bar/camera_preview.dart';
 part 'compose_bar/send_button.dart';
+part 'compose_bar/layout.dart';
 
-const _pastedImageMimeTypes = <String>[
-  'image/jpeg',
-  'image/jpg',
-  'image/png',
-  'image/webp',
-];
+const _maxConcurrentImageUploads = 3;
 
 /// Rich compose bar with @mention autocomplete and a markdown formatting
 /// toolbar. Used in both channel and thread views — the caller provides an
@@ -77,10 +81,57 @@ class ComposeBar extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final controller = useMemoized(_MarkdownEditingController.new);
     useEffect(() => controller.dispose, [controller]);
+
+    // Restore and persist unsent text as a local draft so the Activity
+    // inbox Drafts filter reflects real composer state.
+    //
+    // The effect is additionally keyed on the active relay + pubkey identity:
+    // provider-level namespacing alone cannot protect a composer that stays
+    // mounted through an in-place community/account switch — the controller
+    // would retain the old identity's text and the next edit would persist it
+    // into the new identity's store. On identity change we replace the
+    // controller content with the new identity's own saved draft (or clear).
+    final draftKey = composeDraftKey(channelId, threadHeadId: threadHeadId);
+    final draftIdentity =
+        '${ref.watch(relayConfigProvider).baseUrl}'
+        ':${ref.watch(myPubkeyProvider) ?? 'anon'}';
+    final lastDraftIdentity = useRef<String?>(null);
+    useEffect(() {
+      final identityChanged =
+          lastDraftIdentity.value != null &&
+          lastDraftIdentity.value != draftIdentity;
+      lastDraftIdentity.value = draftIdentity;
+      final saved = ref.read(composeDraftsProvider.notifier).textFor(draftKey);
+      if (identityChanged) {
+        controller.text = saved ?? '';
+      } else if (saved != null && controller.text.isEmpty) {
+        controller.text = saved;
+      }
+      void persistDraft() {
+        ref
+            .read(composeDraftsProvider.notifier)
+            .save(
+              key: draftKey,
+              channelId: channelId,
+              threadHeadId: threadHeadId,
+              text: controller.text,
+            );
+      }
+
+      controller.addListener(persistDraft);
+      return () => controller.removeListener(persistDraft);
+    }, [controller, draftKey, draftIdentity]);
     final focusNode = useFocusNode();
     final isComposerExpanded = useState(false);
-    final showAttachments = useState(false);
-    final showCamera = useState(false);
+    final attachmentSurface = useState(_AttachmentSurface.closed);
+    final iosAttachmentPopover = useMemoized(
+      _IOSAttachmentPopoverController.new,
+    );
+    useEffect(
+      () =>
+          () => unawaited(iosAttachmentPopover.dispose()),
+      [iosAttachmentPopover],
+    );
     final isSending = useState(false);
     final showFormatting = useState(false);
     final attachments = useState<List<BlobDescriptor>>([]);
@@ -348,8 +399,7 @@ class ComposeBar extends HookConsumerWidget {
       mentionMap.value.clear();
       mentionQuery.value = null;
       channelQuery.value = null;
-      showAttachments.value = false;
-      showCamera.value = false;
+      attachmentSurface.value = _AttachmentSurface.closed;
       showFormatting.value = false;
       uploadError.value = null;
       focusNode.requestFocus();
@@ -492,6 +542,80 @@ class ComposeBar extends HookConsumerWidget {
       }
     }
 
+    Future<void> pickThenUpload({
+      required Future<XFile?> Function() pick,
+      required Future<BlobDescriptor> Function(XFile file) upload,
+    }) async {
+      uploadError.value = null;
+      try {
+        final picked = await pick();
+        if (picked == null || !context.mounted) return;
+        await pickAndUpload(() => upload(picked));
+      } catch (error) {
+        if (context.mounted) {
+          uploadError.value = _formatUploadError(error);
+        }
+      }
+    }
+
+    Future<void> uploadImages(List<XFile> images) async {
+      if (images.isEmpty) return;
+      uploadError.value = null;
+      uploadingCount.value += images.length;
+      try {
+        Future<({BlobDescriptor? uploaded, Object? error})> uploadImage(
+          XFile image,
+        ) async {
+          try {
+            final uploaded = await ref
+                .read(mediaUploadServiceProvider)
+                .uploadImage(image);
+            return (uploaded: uploaded, error: null);
+          } catch (error) {
+            return (uploaded: null, error: error);
+          }
+        }
+
+        final results = <({BlobDescriptor? uploaded, Object? error})>[];
+        for (
+          var start = 0;
+          start < images.length;
+          start += _maxConcurrentImageUploads
+        ) {
+          final end = math.min(
+            start + _maxConcurrentImageUploads,
+            images.length,
+          );
+          results.addAll(
+            await Future.wait([
+              for (final image in images.sublist(start, end))
+                uploadImage(image),
+            ]),
+          );
+        }
+        if (!context.mounted) return;
+
+        final uploaded = [for (final result in results) ?result.uploaded];
+        if (uploaded.isNotEmpty) {
+          attachments.value = [...attachments.value, ...uploaded];
+        }
+        final firstError = results
+            .map((result) => result.error)
+            .whereType<Object>()
+            .firstOrNull;
+        if (firstError != null) {
+          uploadError.value = _formatUploadError(firstError);
+        }
+      } finally {
+        if (context.mounted) {
+          uploadingCount.value = math.max(
+            0,
+            uploadingCount.value - images.length,
+          );
+        }
+      }
+    }
+
     Widget buildContextMenu(
       BuildContext context,
       EditableTextState editableTextState,
@@ -580,31 +704,90 @@ class ComposeBar extends HookConsumerWidget {
 
     // ----- Widget tree ----------------------------------------------------
 
-    void chooseAttachment(Future<BlobDescriptor?> Function() pick) {
-      showAttachments.value = false;
-      showCamera.value = false;
-      pickAndUpload(pick);
+    void chooseAttachment(
+      Future<void> Function() choose, {
+      String? errorMessage,
+    }) {
+      attachmentSurface.value = _AttachmentSurface.closed;
+      unawaited(() async {
+        try {
+          await choose();
+        } catch (error) {
+          if (context.mounted) {
+            uploadError.value = errorMessage ?? _formatUploadError(error);
+          }
+        }
+      }());
     }
 
     void toggleAttachments() {
-      if (showCamera.value) {
-        showCamera.value = false;
-        showAttachments.value = false;
+      attachmentSurface.value = switch (attachmentSurface.value) {
+        _AttachmentSurface.closed => _AttachmentSurface.menu,
+        _AttachmentSurface.menu => _AttachmentSurface.closed,
+        _AttachmentSurface.camera ||
+        _AttachmentSurface.photos => _AttachmentSurface.menu,
+      };
+    }
+
+    void handleAttachmentTap(BuildContext triggerContext) {
+      if (defaultTargetPlatform != TargetPlatform.iOS ||
+          attachmentSurface.value != _AttachmentSurface.closed) {
+        toggleAttachments();
         return;
       }
-      showCamera.value = false;
-      showAttachments.value = !showAttachments.value;
+
+      unawaited(
+        iosAttachmentPopover
+            .present(
+              sourceContext: triggerContext,
+              onCapture: (image) => pickAndUpload(
+                () => ref.read(mediaUploadServiceProvider).uploadImage(image),
+              ),
+              onChoosePhotos: uploadImages,
+              onAllPhotos: () => chooseAttachment(() async {
+                final photos = await ref
+                    .read(mediaUploadServiceProvider)
+                    .pickGalleryImages();
+                await uploadImages(photos);
+              }, errorMessage: 'Unable to open your photo library.'),
+              onVideo: () => chooseAttachment(() {
+                final service = ref.read(mediaUploadServiceProvider);
+                return pickThenUpload(
+                  pick: service.pickGalleryVideo,
+                  upload: service.uploadVideo,
+                );
+              }),
+              onFiles: () => chooseAttachment(() {
+                final service = ref.read(mediaUploadServiceProvider);
+                return pickThenUpload(
+                  pick: service.pickAttachmentFile,
+                  upload: service.uploadFile,
+                );
+              }),
+            )
+            .then((didPresent) {
+              if (!didPresent && context.mounted) {
+                focusNode.unfocus();
+                toggleAttachments();
+              }
+            }),
+      );
     }
 
     void openCamera() {
       focusNode.unfocus();
-      showAttachments.value = false;
-      showCamera.value = true;
+      attachmentSurface.value = _AttachmentSurface.camera;
     }
 
     final motionDuration = reducedMotion
         ? Duration.zero
-        : const Duration(milliseconds: 180);
+        : Duration(
+            milliseconds:
+                attachmentSurface.value == _AttachmentSurface.camera ||
+                    attachmentSurface.value == _AttachmentSurface.photos
+                ? 320
+                : 250,
+          );
     final suggestionOverlayController = useMemoized(
       OverlayPortalController.new,
     );
@@ -618,8 +801,7 @@ class ComposeBar extends HookConsumerWidget {
 
     void expandComposer() {
       if (isComposerExpanded.value) return;
-      showAttachments.value = false;
-      showCamera.value = false;
+      attachmentSurface.value = _AttachmentSurface.closed;
       isComposerExpanded.value = true;
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (context.mounted) focusNode.requestFocus();
@@ -646,40 +828,48 @@ class ComposeBar extends HookConsumerWidget {
             ),
           )
         : const SizedBox.shrink(key: ValueKey('no-suggestions'));
-    final overlayPanel = showCamera.value
-        ? KeyedSubtree(
-            key: const ValueKey('camera-preview'),
-            child: _InlineCameraPreview(
-              onClose: () => showCamera.value = false,
-              onCapture: (image) async {
-                showCamera.value = false;
-                await pickAndUpload(
-                  () => ref.read(mediaUploadServiceProvider).uploadImage(image),
-                );
-              },
-            ),
-          )
-        : showAttachments.value
-        ? KeyedSubtree(
-            key: const ValueKey('attachment-menu'),
-            child: Align(
-              alignment: Alignment.bottomLeft,
-              heightFactor: 1,
-              child: _AttachmentMenu(
-                onCamera: openCamera,
-                onPhotos: () => chooseAttachment(
-                  ref.read(mediaUploadServiceProvider).pickAndUploadImage,
-                ),
-                onVideo: () => chooseAttachment(
-                  ref.read(mediaUploadServiceProvider).pickAndUploadVideo,
-                ),
-                onFiles: () => chooseAttachment(
-                  ref.read(mediaUploadServiceProvider).pickAndUploadFile,
-                ),
-              ),
-            ),
-          )
-        : suggestionPanel;
+    Widget buildOverlayPanel(_AttachmentSurface surface) {
+      return _AttachmentSurfacePanel(
+        key: ValueKey(
+          surface == _AttachmentSurface.closed
+              ? 'composer-suggestions'
+              : 'attachment-surface',
+        ),
+        surface: surface,
+        suggestionPanel: suggestionPanel,
+        onBack: () => attachmentSurface.value = _AttachmentSurface.menu,
+        onCamera: openCamera,
+        onPhotos: () {
+          focusNode.unfocus();
+          attachmentSurface.value = _AttachmentSurface.photos;
+        },
+        onVideo: () => chooseAttachment(() {
+          final service = ref.read(mediaUploadServiceProvider);
+          return pickThenUpload(
+            pick: service.pickGalleryVideo,
+            upload: service.uploadVideo,
+          );
+        }),
+        onFiles: () => chooseAttachment(() {
+          final service = ref.read(mediaUploadServiceProvider);
+          return pickThenUpload(
+            pick: service.pickAttachmentFile,
+            upload: service.uploadFile,
+          );
+        }),
+        onCapture: (image) async {
+          attachmentSurface.value = _AttachmentSurface.closed;
+          await pickAndUpload(
+            () => ref.read(mediaUploadServiceProvider).uploadImage(image),
+          );
+        },
+        onPickAllPhotos: ref.read(mediaUploadServiceProvider).pickGalleryImages,
+        onChoosePhotos: (photos) async {
+          attachmentSurface.value = _AttachmentSurface.closed;
+          await uploadImages(photos);
+        },
+      );
+    }
 
     // Suggestions and attachments live in the overlay so showing them cannot
     // reflow the composer. Both stay anchored just above the capsule.
@@ -696,233 +886,91 @@ class ComposeBar extends HookConsumerWidget {
             layoutInfo.childPaintTransform,
             Offset.zero,
           );
-          return Positioned(
-            left: composerOrigin.dx,
-            bottom: layoutInfo.overlaySize.height - composerOrigin.dy,
-            width: layoutInfo.childSize.width,
-            child: ClipRect(
-              child: Padding(
-                padding: const EdgeInsets.only(bottom: Grid.xxs),
-                child: _SuggestionPanelMotion(
-                  duration: motionDuration,
-                  child: overlayPanel,
+          return ValueListenableBuilder<_AttachmentSurface>(
+            valueListenable: attachmentSurface,
+            builder: (context, surface, _) {
+              final surfaceDuration = reducedMotion
+                  ? Duration.zero
+                  : Duration(
+                      milliseconds:
+                          surface == _AttachmentSurface.camera ||
+                              surface == _AttachmentSurface.photos
+                          ? 320
+                          : 250,
+                    );
+              final expandedSurfaceCoversComposer =
+                  surface == _AttachmentSurface.camera ||
+                  surface == _AttachmentSurface.photos;
+              final overlayAnchorY =
+                  composerOrigin.dy +
+                  (expandedSurfaceCoversComposer
+                      ? layoutInfo.childSize.height + Grid.twelve
+                      : 0);
+              return AnimatedPositioned(
+                duration: surfaceDuration,
+                curve:
+                    surface == _AttachmentSurface.camera ||
+                        surface == _AttachmentSurface.photos
+                    ? const Cubic(0.34, 1.25, 0.64, 1)
+                    : const Cubic(0.22, 1, 0.36, 1),
+                left: composerOrigin.dx,
+                bottom: layoutInfo.overlaySize.height - overlayAnchorY,
+                width: layoutInfo.childSize.width,
+                child: ClipRect(
+                  child: Padding(
+                    padding: const EdgeInsets.only(bottom: Grid.xxs),
+                    child: surface == _AttachmentSurface.closed
+                        ? _SuggestionPanelMotion(
+                            duration: surfaceDuration,
+                            alignment: Alignment.bottomLeft,
+                            child: buildOverlayPanel(surface),
+                          )
+                        : buildOverlayPanel(surface),
+                  ),
                 ),
-              ),
-            ),
+              );
+            },
           );
         },
-        child: Container(
-          decoration: BoxDecoration(
-            color: context.colors.surfaceContainerHighest,
-            borderRadius: BorderRadius.circular(Radii.dialog),
-            border: Border.all(
-              color: Colors.black.withValues(alpha: 0.04),
-              width: 1,
-            ),
-          ),
-          padding: const EdgeInsets.all(Grid.xxs),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              if (hasAttachments || hasPendingUploads) ...[
-                _AttachmentStrip(
-                  attachments: attachments.value,
-                  uploadingCount: uploadingCount.value,
-                  onRemove: removeAttachment,
-                ),
-                const SizedBox(height: Grid.xxs),
-              ],
-
-              if (uploadError.value case final error?) ...[
-                Align(
-                  alignment: Alignment.centerLeft,
-                  child: Text(
-                    error,
-                    style: context.textTheme.bodySmall?.copyWith(
-                      color: context.colors.error,
-                    ),
-                  ),
-                ),
-                const SizedBox(height: Grid.xxs),
-              ],
-
-              // Keep the default state out of the focus system entirely so
-              // restored native focus cannot expand a newly opened channel.
-              if (isComposerExpanded.value)
-                TextField(
-                  controller: controller,
-                  focusNode: focusNode,
-                  textInputAction: TextInputAction.send,
-                  contextMenuBuilder: buildContextMenu,
-                  contentInsertionConfiguration: ContentInsertionConfiguration(
-                    allowedMimeTypes: _pastedImageMimeTypes,
-                    onContentInserted: uploadPastedImage,
-                  ),
-                  onSubmitted: (_) => send(),
-                  minLines: 1,
-                  maxLines: 5,
-                  style: context.textTheme.bodyLarge,
-                  decoration: InputDecoration(
-                    hintText: resolvedHint,
-                    hintStyle: context.textTheme.bodyLarge?.copyWith(
-                      color: context.colors.onSurfaceVariant,
-                    ),
-                    border: InputBorder.none,
-                    enabledBorder: InputBorder.none,
-                    focusedBorder: InputBorder.none,
-                    contentPadding: const EdgeInsets.symmetric(
-                      horizontal: Grid.half,
-                      vertical: Grid.half,
-                    ),
-                    isDense: true,
-                  ),
-                )
-              else
-                Row(
-                  children: [
-                    _AttachmentTrigger(
-                      open: showAttachments.value || showCamera.value,
-                      onTap: toggleAttachments,
-                    ),
-                    const SizedBox(width: Grid.xxs),
-                    Expanded(
-                      child: Semantics(
-                        button: true,
-                        label: resolvedHint,
-                        child: GestureDetector(
-                          behavior: HitTestBehavior.opaque,
-                          onTap: expandComposer,
-                          child: Padding(
-                            padding: const EdgeInsets.symmetric(
-                              vertical: Grid.half,
-                            ),
-                            child: Align(
-                              alignment: Alignment.centerLeft,
-                              child: Text(
-                                resolvedHint,
-                                style: context.textTheme.bodyLarge?.copyWith(
-                                  color: context.colors.onSurfaceVariant,
-                                ),
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-
-              ClipRect(
-                child: Align(
-                  alignment: Alignment.topCenter,
-                  heightFactor: composerExpansionValue,
-                  child: IgnorePointer(
-                    ignoring: composerExpansionValue < 0.98,
-                    child: Opacity(
-                      opacity: composerExpansionProgress,
-                      child: Transform.translate(
-                        offset: Offset(
-                          0,
-                          Grid.xxs * (1 - composerExpansionProgress),
-                        ),
-                        child: Column(
-                          children: [
-                            const SizedBox(height: Grid.xxs),
-                            Row(
-                              children: [
-                                _AttachmentTrigger(
-                                  open:
-                                      showAttachments.value ||
-                                      showCamera.value ||
-                                      showFormatting.value,
-                                  onTap: () {
-                                    if (showFormatting.value) {
-                                      showFormatting.value = false;
-                                    } else {
-                                      toggleAttachments();
-                                    }
-                                  },
-                                ),
-                                const SizedBox(width: Grid.half),
-                                Expanded(
-                                  child: AnimatedSwitcher(
-                                    duration: motionDuration,
-                                    switchInCurve: Curves.easeOutCubic,
-                                    switchOutCurve: Curves.easeInCubic,
-                                    layoutBuilder:
-                                        (currentChild, previousChildren) =>
-                                            Stack(
-                                              alignment: Alignment.centerLeft,
-                                              children: [
-                                                ...previousChildren,
-                                                ?currentChild,
-                                              ],
-                                            ),
-                                    child: showFormatting.value
-                                        ? _FormattingToolbar(
-                                            onFormat: applyFormat,
-                                          )
-                                        : Row(
-                                            key: const ValueKey(
-                                              'standard-actions',
-                                            ),
-                                            children: [
-                                              _ComposeAction(
-                                                icon: LucideIcons.atSign,
-                                                onTap: () {
-                                                  showAttachments.value = false;
-                                                  showCamera.value = false;
-                                                  triggerMention();
-                                                },
-                                              ),
-                                              _ComposeAction(
-                                                icon: LucideIcons.hash,
-                                                onTap: () {
-                                                  showAttachments.value = false;
-                                                  showCamera.value = false;
-                                                  triggerChannel();
-                                                },
-                                              ),
-                                              _ComposeAction(
-                                                icon: LucideIcons.smilePlus,
-                                                onTap: () {
-                                                  showAttachments.value = false;
-                                                  showCamera.value = false;
-                                                  showEmojiPicker(
-                                                    context: context,
-                                                    onSelect: insertEmoji,
-                                                  );
-                                                },
-                                              ),
-                                              _ComposeAction(
-                                                icon: LucideIcons.aLargeSmall,
-                                                onTap: () {
-                                                  showAttachments.value = false;
-                                                  showCamera.value = false;
-                                                  showFormatting.value = true;
-                                                },
-                                              ),
-                                              const Spacer(),
-                                              _SendButton(
-                                                isDisabled: hasPendingUploads,
-                                                isSending: isSending.value,
-                                                onTap: send,
-                                              ),
-                                            ],
-                                          ),
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
+        child: _ComposeBarLayout(
+          attachments: attachments.value,
+          uploadingCount: uploadingCount.value,
+          onRemoveAttachment: removeAttachment,
+          uploadError: uploadError.value,
+          isExpanded: isComposerExpanded.value,
+          controller: controller,
+          focusNode: focusNode,
+          contextMenuBuilder: buildContextMenu,
+          onContentInserted: uploadPastedImage,
+          onSend: () => unawaited(send()),
+          resolvedHint: resolvedHint,
+          attachmentSurface: attachmentSurface.value,
+          onAttachmentTap: handleAttachmentTap,
+          onExpand: expandComposer,
+          expansionValue: composerExpansionValue,
+          expansionProgress: composerExpansionProgress,
+          formattingOpen: showFormatting.value,
+          onCloseFormatting: () => showFormatting.value = false,
+          motionDuration: motionDuration,
+          onFormat: applyFormat,
+          onMention: () {
+            attachmentSurface.value = _AttachmentSurface.closed;
+            triggerMention();
+          },
+          onChannel: () {
+            attachmentSurface.value = _AttachmentSurface.closed;
+            triggerChannel();
+          },
+          onEmoji: () {
+            attachmentSurface.value = _AttachmentSurface.closed;
+            showEmojiPicker(context: context, onSelect: insertEmoji);
+          },
+          onOpenFormatting: () {
+            attachmentSurface.value = _AttachmentSurface.closed;
+            showFormatting.value = true;
+          },
+          hasPendingUploads: hasPendingUploads,
+          isSending: isSending.value,
         ),
       ),
     );
diff --git a/mobile/lib/features/channels/compose_bar/attachments.dart b/mobile/lib/features/channels/compose_bar/attachments.dart
index 1d342cd15c..7c53ae1098 100644
--- a/mobile/lib/features/channels/compose_bar/attachments.dart
+++ b/mobile/lib/features/channels/compose_bar/attachments.dart
@@ -1,5 +1,254 @@
 part of '../compose_bar.dart';
 
+enum _AttachmentSurface { closed, menu, camera, photos }
+
+const _attachmentMenuWidth = 216.0;
+const _attachmentMenuPadding = Grid.xs;
+const _attachmentMenuItemHeight = 52.0;
+const _attachmentMenuItemSpacing = Grid.xxs;
+const _attachmentMenuIconSize = 24.0;
+const _attachmentMenuIconSlotWidth = 28.0;
+const _attachmentExpandedHeight = 372.0;
+
+@immutable
+class _AttachmentMenuLayout {
+  final double itemHeight;
+  final double contentHeight;
+  final double height;
+
+  const _AttachmentMenuLayout({
+    required this.itemHeight,
+    required this.contentHeight,
+    required this.height,
+  });
+
+  factory _AttachmentMenuLayout.from(BuildContext context) {
+    final textPainter = TextPainter(
+      text: TextSpan(text: 'Camera', style: context.textTheme.titleMedium),
+      textDirection: Directionality.of(context),
+      textScaler: MediaQuery.textScalerOf(context),
+      maxLines: 1,
+    )..layout();
+    final itemHeight = math.max(
+      _attachmentMenuItemHeight,
+      textPainter.height + (Grid.xxs * 2),
+    );
+    textPainter.dispose();
+    final contentHeight =
+        (_attachmentMenuPadding * 2) +
+        (itemHeight * 4) +
+        (_attachmentMenuItemSpacing * 3);
+
+    return _AttachmentMenuLayout(
+      itemHeight: itemHeight,
+      contentHeight: contentHeight,
+      height: math.min(contentHeight, _attachmentExpandedHeight),
+    );
+  }
+
+  bool get isScrollable => contentHeight > height;
+}
+
+class _AttachmentSurfacePanel extends HookWidget {
+  final _AttachmentSurface surface;
+  final Widget suggestionPanel;
+  final VoidCallback onBack;
+  final VoidCallback onCamera;
+  final VoidCallback onPhotos;
+  final VoidCallback onVideo;
+  final VoidCallback onFiles;
+  final Future<void> Function(XFile image) onCapture;
+  final Future<List<XFile>> Function() onPickAllPhotos;
+  final Future<void> Function(List<XFile> photos) onChoosePhotos;
+
+  const _AttachmentSurfacePanel({
+    super.key,
+    required this.surface,
+    required this.suggestionPanel,
+    required this.onBack,
+    required this.onCamera,
+    required this.onPhotos,
+    required this.onVideo,
+    required this.onFiles,
+    required this.onCapture,
+    required this.onPickAllPhotos,
+    required this.onChoosePhotos,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (surface == _AttachmentSurface.closed) return suggestionPanel;
+
+    final menuLayout = _AttachmentMenuLayout.from(context);
+    final reducedMotion = MediaQuery.disableAnimationsOf(context);
+    final isExpanded =
+        surface == _AttachmentSurface.camera ||
+        surface == _AttachmentSurface.photos;
+    final morphController = useAnimationController(
+      initialValue: isExpanded ? 1 : 0,
+      duration: reducedMotion
+          ? Duration.zero
+          : const Duration(milliseconds: 320),
+      reverseDuration: reducedMotion
+          ? Duration.zero
+          : const Duration(milliseconds: 250),
+    );
+    final rawProgress = useAnimation(morphController);
+    final renderedExpandedSurface = useState<_AttachmentSurface?>(
+      isExpanded ? surface : null,
+    );
+    final latestSurface = useRef(surface);
+    latestSurface.value = surface;
+
+    useEffect(() {
+      void disposeCollapsedContent(AnimationStatus status) {
+        if (status == AnimationStatus.dismissed &&
+            latestSurface.value == _AttachmentSurface.menu) {
+          renderedExpandedSurface.value = null;
+        }
+      }
+
+      morphController.addStatusListener(disposeCollapsedContent);
+      return () =>
+          morphController.removeStatusListener(disposeCollapsedContent);
+    }, [morphController]);
+
+    useEffect(() {
+      if (isExpanded) {
+        renderedExpandedSurface.value = surface;
+        morphController.forward();
+      } else {
+        morphController.reverse();
+      }
+      return null;
+    }, [isExpanded, morphController, surface]);
+
+    final visibleExpandedSurface =
+        renderedExpandedSurface.value ?? (isExpanded ? surface : null);
+    final cameraInitializationReady =
+        reducedMotion ||
+        (surface == _AttachmentSurface.camera && rawProgress >= 1);
+    final expandedContent = switch (visibleExpandedSurface) {
+      _AttachmentSurface.camera => KeyedSubtree(
+        key: const ValueKey('camera-preview'),
+        child: KeyedSubtree(
+          key: ValueKey(
+            cameraInitializationReady
+                ? 'camera-initialization-ready'
+                : 'camera-initialization-deferred',
+          ),
+          child: _InlineCameraPreview(
+            initializeCamera: cameraInitializationReady,
+            onClose: onBack,
+            onCapture: onCapture,
+          ),
+        ),
+      ),
+      _AttachmentSurface.photos => KeyedSubtree(
+        key: const ValueKey('photo-gallery'),
+        child: _PhotoGalleryPicker(
+          onBack: onBack,
+          onPickAllPhotos: onPickAllPhotos,
+          onChoosePhotos: onChoosePhotos,
+        ),
+      ),
+      _AttachmentSurface.closed ||
+      _AttachmentSurface.menu ||
+      null => const SizedBox.shrink(),
+    };
+
+    double interval(double value, double begin, double end) {
+      return ((value - begin) / (end - begin)).clamp(0.0, 1.0);
+    }
+
+    final menuOpacity = 1 - interval(rawProgress, 0.12, 0.38);
+    final expandedOpacity = interval(rawProgress, 0.28, 0.65);
+    final sizeProgress = morphController.status == AnimationStatus.reverse
+        ? const Cubic(0.22, 1, 0.36, 1).transform(rawProgress)
+        : Curves.easeInOutCubic.transform(rawProgress);
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final expandedWidth = constraints.maxWidth;
+        const expandedHeight = _attachmentExpandedHeight;
+        final width =
+            _attachmentMenuWidth +
+            ((expandedWidth - _attachmentMenuWidth) * sizeProgress);
+        final height =
+            menuLayout.height +
+            ((expandedHeight - menuLayout.height) * sizeProgress);
+        final baseColor = context.colors.surfaceContainerHighest;
+        final expandedColor =
+            visibleExpandedSurface == _AttachmentSurface.camera
+            ? Colors.black
+            : baseColor;
+
+        return Align(
+          alignment: Alignment.topLeft,
+          heightFactor: 1,
+          child: SizedBox(
+            width: width,
+            height: height,
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                color: Color.lerp(baseColor, expandedColor, sizeProgress),
+                borderRadius: BorderRadius.circular(Radii.dialog),
+                border: Border.all(
+                  color: Colors.black.withValues(alpha: 0.04),
+                  width: 1,
+                ),
+              ),
+              child: ClipRRect(
+                borderRadius: BorderRadius.circular(Radii.dialog),
+                child: Material(
+                  type: MaterialType.transparency,
+                  child: Stack(
+                    clipBehavior: Clip.hardEdge,
+                    children: [
+                      Positioned(
+                        left: 0,
+                        top: 0,
+                        width: _attachmentMenuWidth,
+                        height: menuLayout.height,
+                        child: IgnorePointer(
+                          ignoring: surface != _AttachmentSurface.menu,
+                          child: Opacity(
+                            opacity: menuOpacity,
+                            child: _AttachmentMenu(
+                              layout: menuLayout,
+                              onCamera: onCamera,
+                              onPhotos: onPhotos,
+                              onVideo: onVideo,
+                              onFiles: onFiles,
+                            ),
+                          ),
+                        ),
+                      ),
+                      Positioned(
+                        left: 0,
+                        top: 0,
+                        width: expandedWidth,
+                        height: expandedHeight,
+                        child: IgnorePointer(
+                          ignoring: !isExpanded,
+                          child: Opacity(
+                            opacity: expandedOpacity,
+                            child: expandedContent,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
+
 @immutable
 class _ComposeDraftPayload {
   final String content;
@@ -24,16 +273,21 @@ class _ComposeDraftPayload {
 }
 
 class _AttachmentTrigger extends StatelessWidget {
-  final bool open;
-  final VoidCallback onTap;
+  final _AttachmentSurface surface;
+  final bool formattingOpen;
+  final ValueChanged<BuildContext> onTap;
 
-  const _AttachmentTrigger({required this.open, required this.onTap});
+  const _AttachmentTrigger({
+    required this.surface,
+    required this.formattingOpen,
+    required this.onTap,
+  });
 
   @override
   Widget build(BuildContext context) {
     final duration = MediaQuery.disableAnimationsOf(context)
         ? Duration.zero
-        : const Duration(milliseconds: 180);
+        : const Duration(milliseconds: 240);
 
     return SizedBox.square(
       dimension: 36,
@@ -47,18 +301,44 @@ class _AttachmentTrigger extends StatelessWidget {
           ),
         ),
         child: IconButton(
-          tooltip: open ? 'Close attachments' : 'Add attachment',
-          onPressed: onTap,
+          tooltip: switch (surface) {
+            _AttachmentSurface.closed =>
+              formattingOpen ? 'Close formatting' : 'Add attachment',
+            _AttachmentSurface.menu => 'Close attachments',
+            _AttachmentSurface.camera ||
+            _AttachmentSurface.photos => 'Back to attachment options',
+          },
+          onPressed: () => onTap(context),
           padding: EdgeInsets.zero,
           visualDensity: VisualDensity.compact,
           icon: AnimatedRotation(
             duration: duration,
-            curve: Curves.easeInOutCubic,
-            turns: open ? 0.125 : 0,
-            child: Icon(
-              LucideIcons.plus,
-              size: 20,
-              color: context.colors.onSurfaceVariant,
+            curve: Curves.easeOutBack,
+            turns: surface == _AttachmentSurface.menu || formattingOpen
+                ? 0.125
+                : 0,
+            child: AnimatedSwitcher(
+              duration: duration,
+              switchInCurve: Curves.easeOutBack,
+              switchOutCurve: Curves.easeInOutCubic,
+              transitionBuilder: (child, animation) => FadeTransition(
+                opacity: animation,
+                child: ScaleTransition(
+                  scale: Tween<double>(begin: 0.92, end: 1).animate(animation),
+                  child: child,
+                ),
+              ),
+              child: Icon(
+                switch (surface) {
+                  _AttachmentSurface.camera => LucideIcons.camera,
+                  _AttachmentSurface.photos => LucideIcons.images,
+                  _AttachmentSurface.closed ||
+                  _AttachmentSurface.menu => LucideIcons.plus,
+                },
+                key: ValueKey('attachment-trigger-${surface.name}'),
+                size: 20,
+                color: context.colors.onSurfaceVariant,
+              ),
             ),
           ),
         ),
@@ -68,12 +348,14 @@ class _AttachmentTrigger extends StatelessWidget {
 }
 
 class _AttachmentMenu extends StatelessWidget {
+  final _AttachmentMenuLayout layout;
   final VoidCallback onCamera;
   final VoidCallback onPhotos;
   final VoidCallback onVideo;
   final VoidCallback onFiles;
 
   const _AttachmentMenu({
+    required this.layout,
     required this.onCamera,
     required this.onPhotos,
     required this.onVideo,
@@ -82,53 +364,46 @@ class _AttachmentMenu extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      width: 176,
-      clipBehavior: Clip.antiAlias,
-      decoration: BoxDecoration(
-        color: context.colors.surfaceContainerHighest,
-        borderRadius: BorderRadius.circular(Radii.dialog),
-        border: Border.all(
-          color: Colors.black.withValues(alpha: 0.04),
-          width: 1,
-        ),
-      ),
-      padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          _AttachmentMenuItem(
-            icon: LucideIcons.camera,
-            label: 'Camera',
-            onTap: onCamera,
-          ),
-          _AttachmentMenuItem(
-            icon: LucideIcons.images,
-            label: 'Photos',
-            onTap: onPhotos,
-          ),
-          _AttachmentMenuItem(
-            icon: LucideIcons.video,
-            label: 'Video',
-            onTap: onVideo,
-          ),
-          _AttachmentMenuItem(
-            icon: LucideIcons.file,
-            label: 'Files',
-            onTap: onFiles,
-          ),
-        ],
+    return SizedBox(
+      key: const ValueKey('attachment-menu'),
+      width: _attachmentMenuWidth,
+      height: layout.height,
+      child: ListView.separated(
+        key: const ValueKey('attachment-menu-scroll'),
+        padding: const EdgeInsets.all(_attachmentMenuPadding),
+        physics: layout.isScrollable
+            ? null
+            : const NeverScrollableScrollPhysics(),
+        itemCount: 4,
+        separatorBuilder: (_, _) =>
+            const SizedBox(height: _attachmentMenuItemSpacing),
+        itemBuilder: (context, index) {
+          final (icon, label, onTap) = switch (index) {
+            0 => (LucideIcons.camera, 'Camera', onCamera),
+            1 => (LucideIcons.images, 'Photos', onPhotos),
+            2 => (LucideIcons.video, 'Video', onVideo),
+            _ => (LucideIcons.file, 'Files', onFiles),
+          };
+          return _AttachmentMenuItem(
+            height: layout.itemHeight,
+            icon: icon,
+            label: label,
+            onTap: onTap,
+          );
+        },
       ),
     );
   }
 }
 
 class _AttachmentMenuItem extends StatelessWidget {
+  final double height;
   final IconData icon;
   final String label;
   final VoidCallback onTap;
 
   const _AttachmentMenuItem({
+    required this.height,
     required this.icon,
     required this.label,
     required this.onTap,
@@ -137,21 +412,40 @@ class _AttachmentMenuItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-      height: 48,
+      key: ValueKey('attachment-menu-item-${label.toLowerCase()}'),
+      height: height,
       child: Tooltip(
         message: label,
         child: InkWell(
           onTap: onTap,
           child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: Grid.twelve),
+            padding: const EdgeInsets.symmetric(horizontal: Grid.xxs),
             child: Row(
               children: [
-                Icon(icon, size: 20, color: context.colors.onSurfaceVariant),
+                SizedBox(
+                  key: ValueKey('attachment-menu-icon-${label.toLowerCase()}'),
+                  width: _attachmentMenuIconSlotWidth,
+                  child: Center(
+                    child: Icon(
+                      icon,
+                      size: _attachmentMenuIconSize,
+                      color: context.colors.onSurfaceVariant,
+                    ),
+                  ),
+                ),
                 const SizedBox(width: Grid.xxs),
-                Text(
-                  label,
-                  style: context.textTheme.bodyLarge?.copyWith(
-                    color: context.colors.onSurface,
+                Expanded(
+                  child: Text(
+                    label,
+                    key: ValueKey(
+                      'attachment-menu-label-${label.toLowerCase()}',
+                    ),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: context.textTheme.titleMedium?.copyWith(
+                      color: context.colors.onSurface,
+                      fontWeight: FontWeight.w400,
+                    ),
                   ),
                 ),
               ],
@@ -201,38 +495,50 @@ class _AttachmentStrip extends StatelessWidget {
                 ? 'Uploading attachment…'
                 : 'Uploading $uploadingCount attachments…';
             return Semantics(
+              excludeSemantics: true,
               liveRegion: true,
               label: label,
               child: Container(
                 key: const ValueKey('compose-upload-progress'),
-                width: 128,
+                width: thumbWidth,
                 decoration: BoxDecoration(
                   color: context.colors.surface,
                   borderRadius: BorderRadius.circular(Radii.md),
                   border: Border.all(color: context.colors.outlineVariant),
                 ),
-                padding: const EdgeInsets.symmetric(horizontal: Grid.xxs),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
+                child: Stack(
+                  alignment: Alignment.center,
                   children: [
-                    SizedBox.square(
-                      dimension: 18,
-                      child: CircularProgressIndicator(
-                        strokeWidth: 2,
-                        color: context.colors.primary,
-                      ),
+                    BuzzLoadingIndicator(
+                      size: 34,
+                      color: context.colors.primary,
+                      semanticLabel: label,
                     ),
-                    const SizedBox(width: Grid.half),
-                    Flexible(
-                      child: Text(
-                        label,
-                        maxLines: 2,
-                        overflow: TextOverflow.ellipsis,
-                        style: context.textTheme.labelSmall?.copyWith(
-                          color: context.colors.onSurfaceVariant,
+                    if (uploadingCount > 1)
+                      PositionedDirectional(
+                        top: Grid.quarter,
+                        end: Grid.quarter,
+                        child: Container(
+                          key: const ValueKey('compose-upload-count'),
+                          constraints: const BoxConstraints(
+                            minWidth: 22,
+                            minHeight: 22,
+                          ),
+                          alignment: Alignment.center,
+                          decoration: BoxDecoration(
+                            color: context.colors.primary,
+                            shape: BoxShape.circle,
+                          ),
+                          padding: const EdgeInsets.all(3),
+                          child: Text(
+                            '$uploadingCount',
+                            style: context.textTheme.labelSmall?.copyWith(
+                              color: context.colors.onPrimary,
+                              fontWeight: FontWeight.w700,
+                            ),
+                          ),
                         ),
                       ),
-                    ),
                   ],
                 ),
               ),
diff --git a/mobile/lib/features/channels/compose_bar/camera_preview.dart b/mobile/lib/features/channels/compose_bar/camera_preview.dart
index df16827ba5..e51c2d16aa 100644
--- a/mobile/lib/features/channels/compose_bar/camera_preview.dart
+++ b/mobile/lib/features/channels/compose_bar/camera_preview.dart
@@ -1,10 +1,15 @@
 part of '../compose_bar.dart';
 
 class _InlineCameraPreview extends HookConsumerWidget {
+  final bool initializeCamera;
   final Future<void> Function(XFile image) onCapture;
   final VoidCallback onClose;
 
-  const _InlineCameraPreview({required this.onCapture, required this.onClose});
+  const _InlineCameraPreview({
+    required this.initializeCamera,
+    required this.onCapture,
+    required this.onClose,
+  });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -15,6 +20,8 @@ class _InlineCameraPreview extends HookConsumerWidget {
     final error = useState<String?>(null);
 
     useEffect(() {
+      if (!initializeCamera) return null;
+
       var disposed = false;
       var generation = 0;
 
@@ -76,7 +83,9 @@ class _InlineCameraPreview extends HookConsumerWidget {
         onInactive: () => unawaited(disposeCurrent()),
         onResume: () => unawaited(initialize()),
       );
-      unawaited(initialize());
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (!disposed) unawaited(initialize());
+      });
 
       return () {
         disposed = true;
@@ -86,7 +95,7 @@ class _InlineCameraPreview extends HookConsumerWidget {
         controllerRef.value = null;
         unawaited(current?.dispose() ?? Future<void>.value());
       };
-    }, const []);
+    }, [initializeCamera]);
 
     Future<void> capture() async {
       final activeController = controller.value;
@@ -115,50 +124,44 @@ class _InlineCameraPreview extends HookConsumerWidget {
     }
 
     final activeController = controller.value;
-    return Container(
-      width: double.infinity,
-      clipBehavior: Clip.antiAlias,
-      decoration: BoxDecoration(
-        color: Colors.black,
-        borderRadius: BorderRadius.circular(Radii.dialog),
-      ),
-      foregroundDecoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(Radii.dialog),
-        border: Border.all(
-          color: Colors.black.withValues(alpha: 0.04),
-          width: 1,
-        ),
-      ),
-      child: AspectRatio(
-        aspectRatio: 4 / 3,
-        child: Stack(
-          fit: StackFit.expand,
-          children: [
-            if (activeController case final initialized?)
-              _CameraFeed(controller: initialized)
-            else
-              _CameraPlaceholder(
-                isInitializing: isInitializing.value,
-                message: error.value,
-              ),
-            if (activeController != null)
-              Align(
-                alignment: Alignment.bottomCenter,
-                child: Padding(
-                  padding: const EdgeInsets.all(Grid.twelve),
-                  child: _CameraCaptureButton(
-                    isPressed: isCapturing.value,
-                    onTap: capture,
-                  ),
+    final usesAndroidCameraLayout =
+        defaultTargetPlatform == TargetPlatform.android;
+    return ColoredBox(
+      color: Colors.black,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          if (activeController case final initialized?)
+            _CameraFeed(controller: initialized)
+          else
+            _CameraPlaceholder(
+              isInitializing: isInitializing.value,
+              message: error.value,
+            ),
+          if (activeController != null)
+            Align(
+              alignment: Alignment.bottomCenter,
+              child: Padding(
+                padding: const EdgeInsets.all(Grid.twelve),
+                child: _CameraCaptureButton(
+                  isPressed: isCapturing.value,
+                  onTap: capture,
                 ),
               ),
-            Positioned(
-              top: Grid.xxs,
-              right: Grid.xxs,
-              child: _CameraCloseButton(onTap: onClose),
             ),
-          ],
-        ),
+          Positioned(
+            top: usesAndroidCameraLayout ? null : Grid.xxs,
+            left: usesAndroidCameraLayout ? Grid.twelve : null,
+            right: usesAndroidCameraLayout ? null : Grid.xxs,
+            bottom: usesAndroidCameraLayout
+                ? Grid.twelve + ((_cameraCaptureSize - _cameraBackSize) / 2)
+                : null,
+            child: _CameraCloseButton(
+              onTap: onClose,
+              emphasized: usesAndroidCameraLayout,
+            ),
+          ),
+        ],
       ),
     );
   }
@@ -204,9 +207,10 @@ class _CameraPlaceholder extends StatelessWidget {
         child: Padding(
           padding: const EdgeInsets.all(Grid.sm),
           child: isInitializing
-              ? const CircularProgressIndicator(
+              ? const BuzzLoadingIndicator(
+                  size: 44,
                   color: Colors.white,
-                  strokeWidth: 2,
+                  semanticLabel: 'Starting camera',
                 )
               : Column(
                   mainAxisSize: MainAxisSize.min,
@@ -254,8 +258,8 @@ class _CameraCaptureButton extends StatelessWidget {
           duration: duration,
           curve: Curves.easeOutCubic,
           child: Container(
-            width: 64,
-            height: 64,
+            width: _cameraCaptureSize,
+            height: _cameraCaptureSize,
             decoration: BoxDecoration(
               color: Colors.white.withValues(alpha: 0.24),
               shape: BoxShape.circle,
@@ -277,27 +281,33 @@ class _CameraCaptureButton extends StatelessWidget {
 
 class _CameraCloseButton extends StatelessWidget {
   final VoidCallback onTap;
+  final bool emphasized;
 
-  const _CameraCloseButton({required this.onTap});
+  const _CameraCloseButton({required this.onTap, required this.emphasized});
 
   @override
   Widget build(BuildContext context) {
     return SizedBox.square(
-      dimension: 36,
+      dimension: emphasized ? _cameraBackSize : 36,
       child: IconButton(
         onPressed: onTap,
-        tooltip: 'Close camera',
+        tooltip: 'Back to attachment options',
         padding: EdgeInsets.zero,
         style: IconButton.styleFrom(
-          backgroundColor: Colors.black.withValues(alpha: 0.56),
+          backgroundColor: Colors.black.withValues(
+            alpha: emphasized ? 0.68 : 0.56,
+          ),
           foregroundColor: Colors.white,
         ),
-        icon: const Icon(LucideIcons.x, size: 18),
+        icon: Icon(LucideIcons.arrowLeft, size: emphasized ? 24 : 18),
       ),
     );
   }
 }
 
+const _cameraCaptureSize = 64.0;
+const _cameraBackSize = 44.0;
+
 String _cameraErrorMessage(Object error) {
   if (error is camera.CameraException) {
     return switch (error.code) {
diff --git a/mobile/lib/features/channels/compose_bar/helpers.dart b/mobile/lib/features/channels/compose_bar/helpers.dart
index 983aa27066..145d28fb44 100644
--- a/mobile/lib/features/channels/compose_bar/helpers.dart
+++ b/mobile/lib/features/channels/compose_bar/helpers.dart
@@ -1,6 +1,12 @@
 part of '../compose_bar.dart';
 
 const _typingThrottleMs = 3000;
+const _pastedImageMimeTypes = <String>[
+  'image/jpeg',
+  'image/jpg',
+  'image/png',
+  'image/webp',
+];
 
 /// Cap on ranked mention suggestions shown — matches desktop's
 /// `MENTION_SUGGESTION_LIMIT`.
diff --git a/mobile/lib/features/channels/compose_bar/ios_attachment_popover.dart b/mobile/lib/features/channels/compose_bar/ios_attachment_popover.dart
new file mode 100644
index 0000000000..0a0c4f1a99
--- /dev/null
+++ b/mobile/lib/features/channels/compose_bar/ios_attachment_popover.dart
@@ -0,0 +1,199 @@
+part of '../compose_bar.dart';
+
+const _nativeAttachmentPopoverChannel = MethodChannel(
+  'buzz/native_attachment_popover',
+);
+
+final _iosAttachmentPopoverCoordinator = _IOSAttachmentPopoverCoordinator(
+  _nativeAttachmentPopoverChannel,
+);
+
+class _IOSAttachmentPopoverCallbacks {
+  final Future<void> Function(XFile image) onCapture;
+  final Future<void> Function(List<XFile> photos) onChoosePhotos;
+  final VoidCallback onAllPhotos;
+  final VoidCallback onVideo;
+  final VoidCallback onFiles;
+
+  const _IOSAttachmentPopoverCallbacks({
+    required this.onCapture,
+    required this.onChoosePhotos,
+    required this.onAllPhotos,
+    required this.onVideo,
+    required this.onFiles,
+  });
+}
+
+class _IOSAttachmentPopoverCoordinator {
+  static final Object _cancelledSupportCheck = Object();
+
+  final MethodChannel _channel;
+
+  Object? _activeOwner;
+  _IOSAttachmentPopoverCallbacks? _callbacks;
+  Completer<void>? _pendingSupportCancellation;
+  bool _didPresent = false;
+  bool _handlerInstalled = false;
+
+  _IOSAttachmentPopoverCoordinator(this._channel);
+
+  Future<bool> present({
+    required Object owner,
+    required BuildContext sourceContext,
+    required Future<void> Function(XFile image) onCapture,
+    required Future<void> Function(List<XFile> photos) onChoosePhotos,
+    required VoidCallback onAllPhotos,
+    required VoidCallback onVideo,
+    required VoidCallback onFiles,
+  }) async {
+    if (defaultTargetPlatform != TargetPlatform.iOS) return false;
+    if (_activeOwner case final activeOwner?) {
+      if (identical(activeOwner, owner)) return true;
+      if (!_didPresent) _clearOwner(activeOwner);
+      return _didPresent;
+    }
+
+    final supportCancellation = Completer<void>();
+    _activeOwner = owner;
+    _pendingSupportCancellation = supportCancellation;
+    _callbacks = _IOSAttachmentPopoverCallbacks(
+      onCapture: onCapture,
+      onChoosePhotos: onChoosePhotos,
+      onAllPhotos: onAllPhotos,
+      onVideo: onVideo,
+      onFiles: onFiles,
+    );
+    _ensureHandler();
+
+    try {
+      final supportResult = await Future.any<Object?>([
+        _channel.invokeMethod<bool>('isSupported'),
+        supportCancellation.future.then<Object?>((_) => _cancelledSupportCheck),
+      ]);
+      if (identical(supportResult, _cancelledSupportCheck)) return true;
+      if (identical(_pendingSupportCancellation, supportCancellation)) {
+        _pendingSupportCancellation = null;
+      }
+      if (!identical(_activeOwner, owner)) return false;
+      final supported = supportResult == true;
+      if (!supported || !sourceContext.mounted) {
+        _clearOwner(owner);
+        return false;
+      }
+
+      final renderObject = sourceContext.findRenderObject();
+      if (renderObject is! RenderBox || !renderObject.hasSize) {
+        _clearOwner(owner);
+        return false;
+      }
+      final origin = renderObject.localToGlobal(Offset.zero);
+
+      _didPresent = true;
+      final didPresent =
+          await _channel.invokeMethod<bool>('present', {
+            'x': origin.dx,
+            'y': origin.dy,
+            'width': renderObject.size.width,
+            'height': renderObject.size.height,
+          }) ??
+          false;
+      if (!identical(_activeOwner, owner)) return false;
+      if (!didPresent) _clearOwner(owner);
+      return didPresent;
+    } on PlatformException {
+      _clearOwner(owner);
+      return false;
+    }
+  }
+
+  Future<void> disposeOwner(Object owner) async {
+    if (!identical(_activeOwner, owner)) return;
+
+    _callbacks = null;
+    if (!_didPresent) {
+      _clearOwner(owner);
+      return;
+    }
+
+    try {
+      await _channel.invokeMethod<void>('dismiss');
+    } on PlatformException {
+      // The native bridge is unavailable, so there is nothing left to dismiss.
+    } on MissingPluginException {
+      // The native bridge is unavailable, so there is nothing left to dismiss.
+    } finally {
+      _clearOwner(owner);
+    }
+  }
+
+  void _ensureHandler() {
+    if (_handlerInstalled) return;
+    _handlerInstalled = true;
+    _channel.setMethodCallHandler(_handleMethodCall);
+  }
+
+  Future<void> _handleMethodCall(MethodCall call) async {
+    final callbacks = _callbacks;
+    switch (call.method) {
+      case 'cameraCaptured':
+        if (call.arguments case final String path) {
+          final activeCallbacks = callbacks;
+          if (activeCallbacks != null) {
+            await processCapturedImage(XFile(path), activeCallbacks.onCapture);
+          }
+        }
+      case 'photosSelected':
+        final paths = (call.arguments as List<Object?>? ?? const [])
+            .whereType<String>()
+            .toList();
+        if (callbacks != null && paths.isNotEmpty) {
+          await processTemporaryImages([
+            for (final path in paths) XFile(path),
+          ], callbacks.onChoosePhotos);
+        }
+      case 'pickAllPhotos':
+        callbacks?.onAllPhotos();
+      case 'pickVideo':
+        callbacks?.onVideo();
+      case 'pickFiles':
+        callbacks?.onFiles();
+      case 'dismissed':
+        _activeOwner = null;
+        _callbacks = null;
+        _didPresent = false;
+    }
+  }
+
+  void _clearOwner(Object owner) {
+    if (!identical(_activeOwner, owner)) return;
+    final supportCancellation = _pendingSupportCancellation;
+    _pendingSupportCancellation = null;
+    if (supportCancellation != null && !supportCancellation.isCompleted) {
+      supportCancellation.complete();
+    }
+    _activeOwner = null;
+    _callbacks = null;
+    _didPresent = false;
+  }
+}
+
+class _IOSAttachmentPopoverController {
+  Future<bool> present({
+    required BuildContext sourceContext,
+    required Future<void> Function(XFile image) onCapture,
+    required Future<void> Function(List<XFile> photos) onChoosePhotos,
+    required VoidCallback onAllPhotos,
+    required VoidCallback onVideo,
+    required VoidCallback onFiles,
+  }) => _iosAttachmentPopoverCoordinator.present(
+    owner: this,
+    sourceContext: sourceContext,
+    onCapture: onCapture,
+    onChoosePhotos: onChoosePhotos,
+    onAllPhotos: onAllPhotos,
+    onVideo: onVideo,
+    onFiles: onFiles,
+  );
+
+  Future<void> dispose() => _iosAttachmentPopoverCoordinator.disposeOwner(this);
+}
diff --git a/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart b/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart
new file mode 100644
index 0000000000..039b5160a3
--- /dev/null
+++ b/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart
@@ -0,0 +1,232 @@
+part of '../compose_bar.dart';
+
+const _inlinePhotoPickerViewType = 'buzz/inline_photo_picker';
+const _inlinePhotoPickerSupportChannel = MethodChannel(
+  'buzz/inline_photo_picker',
+);
+
+class _IOSInlinePhotoPicker extends HookWidget {
+  final VoidCallback onBack;
+  final Future<List<XFile>> Function() onPickAllPhotos;
+  final Future<void> Function(List<XFile> photos) onChoosePhotos;
+  final Widget fallback;
+
+  const _IOSInlinePhotoPicker({
+    required this.onBack,
+    required this.onPickAllPhotos,
+    required this.onChoosePhotos,
+    required this.fallback,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final supportFuture = useMemoized(
+      () async =>
+          await _inlinePhotoPickerSupportChannel.invokeMethod<bool>(
+            'isSupported',
+          ) ??
+          false,
+    );
+    final support = useFuture(supportFuture);
+    final pickerChannel = useState<MethodChannel?>(null);
+    final selectedCount = useState(0);
+    final selectedPaths = useState<List<String>>(const []);
+    final isPreparingSelection = useState(false);
+    final isProcessing = useState(false);
+
+    useEffect(() {
+      final channel = pickerChannel.value;
+      if (channel == null) return null;
+
+      channel.setMethodCallHandler((call) async {
+        switch (call.method) {
+          case 'selectionCountChanged':
+            selectedCount.value = call.arguments as int? ?? 0;
+            selectedPaths.value = const [];
+            isPreparingSelection.value = selectedCount.value > 0;
+          case 'selectionDidChange':
+            final paths = (call.arguments as List<Object?>? ?? const [])
+                .whereType<String>()
+                .toList();
+            selectedPaths.value = paths;
+            isPreparingSelection.value = false;
+          case 'didFail':
+            isPreparingSelection.value = false;
+            if (!context.mounted) return;
+            ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+              SnackBar(
+                content: Text(
+                  call.arguments as String? ??
+                      'Unable to prepare the selected photos.',
+                ),
+              ),
+            );
+        }
+      });
+      return () => channel.setMethodCallHandler(null);
+    }, [pickerChannel.value]);
+
+    final canSelect =
+        selectedCount.value > 0 &&
+        selectedPaths.value.length == selectedCount.value &&
+        !isPreparingSelection.value &&
+        !isProcessing.value;
+
+    Future<void> submitSelection() async {
+      if (!canSelect) return;
+      isProcessing.value = true;
+      try {
+        final paths = List<String>.from(selectedPaths.value);
+        final claimed =
+            await pickerChannel.value?.invokeMethod<bool>(
+              'claimSelection',
+              paths,
+            ) ??
+            false;
+        if (!claimed) return;
+        final photos = [for (final path in paths) XFile(path)];
+        await processTemporaryImages(photos, onChoosePhotos);
+      } finally {
+        if (context.mounted) isProcessing.value = false;
+      }
+    }
+
+    Future<void> openAllPhotos() async {
+      if (isPreparingSelection.value || isProcessing.value) return;
+      isProcessing.value = true;
+      try {
+        final photos = await onPickAllPhotos();
+        if (photos.isNotEmpty) {
+          await onChoosePhotos(photos);
+        }
+      } catch (_) {
+        if (context.mounted) {
+          ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+            const SnackBar(content: Text('Unable to open your photo library.')),
+          );
+        }
+      } finally {
+        if (context.mounted) isProcessing.value = false;
+      }
+    }
+
+    if (support.connectionState != ConnectionState.done) {
+      return const _NativePhotoPickerLoading();
+    }
+    if (support.hasError || support.data != true) return fallback;
+
+    return SizedBox(
+      key: const ValueKey('ios-inline-photo-picker'),
+      height: _attachmentExpandedHeight,
+      width: double.infinity,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          UiKitView(
+            viewType: _inlinePhotoPickerViewType,
+            creationParamsCodec: const StandardMessageCodec(),
+            onPlatformViewCreated: (viewId) {
+              pickerChannel.value = MethodChannel(
+                'buzz/inline_photo_picker/$viewId',
+              );
+            },
+          ),
+          PositionedDirectional(
+            start: Grid.twelve,
+            bottom: Grid.twelve,
+            child: SafeArea(
+              top: false,
+              child: DecoratedBox(
+                decoration: BoxDecoration(
+                  color: Colors.black.withValues(alpha: 0.62),
+                  shape: BoxShape.circle,
+                  border: Border.all(
+                    color: Colors.white.withValues(alpha: 0.28),
+                  ),
+                ),
+                child: IconButton(
+                  key: const ValueKey('ios-inline-photo-picker-back'),
+                  onPressed: isProcessing.value ? null : onBack,
+                  tooltip: 'Back to attachment options',
+                  icon: const Icon(
+                    LucideIcons.chevronLeft,
+                    color: Colors.white,
+                  ),
+                ),
+              ),
+            ),
+          ),
+          PositionedDirectional(
+            end: Grid.twelve,
+            bottom: Grid.twelve,
+            child: SafeArea(
+              top: false,
+              child: FilledButton(
+                key: const ValueKey('ios-inline-photo-picker-select'),
+                onPressed: canSelect
+                    ? submitSelection
+                    : selectedCount.value == 0 &&
+                          !isPreparingSelection.value &&
+                          !isProcessing.value
+                    ? openAllPhotos
+                    : null,
+                style: FilledButton.styleFrom(
+                  backgroundColor: Colors.black.withValues(alpha: 0.76),
+                  disabledBackgroundColor: Colors.black.withValues(alpha: 0.32),
+                  foregroundColor: Colors.white,
+                  disabledForegroundColor: Colors.white70,
+                  minimumSize: const Size(0, 48),
+                  padding: const EdgeInsets.symmetric(horizontal: Grid.twelve),
+                  shape: const StadiumBorder(),
+                  side: BorderSide(color: Colors.white.withValues(alpha: 0.28)),
+                ),
+                child: isPreparingSelection.value
+                    ? const SizedBox.square(
+                        dimension: 20,
+                        child: BuzzLoadingIndicator(
+                          size: 20,
+                          color: Colors.white,
+                          semanticLabel: 'Preparing selected photos',
+                        ),
+                      )
+                    : Text(
+                        selectedCount.value == 0
+                            ? 'All Photos'
+                            : 'Add ${selectedCount.value} '
+                                  '${selectedCount.value == 1 ? 'photo' : 'photos'}',
+                      ),
+              ),
+            ),
+          ),
+          if (isProcessing.value)
+            const ColoredBox(
+              color: Color.fromRGBO(0, 0, 0, 0.28),
+              child: Center(
+                child: BuzzLoadingIndicator(
+                  size: 44,
+                  color: Colors.white,
+                  semanticLabel: 'Preparing selected photos',
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+class _NativePhotoPickerLoading extends StatelessWidget {
+  const _NativePhotoPickerLoading();
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      key: const ValueKey('ios-inline-photo-picker-loading'),
+      height: _attachmentExpandedHeight,
+      width: double.infinity,
+      child: const Center(
+        child: BuzzLoadingIndicator(size: 44, semanticLabel: 'Opening Photos'),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/channels/compose_bar/layout.dart b/mobile/lib/features/channels/compose_bar/layout.dart
new file mode 100644
index 0000000000..2d62db836d
--- /dev/null
+++ b/mobile/lib/features/channels/compose_bar/layout.dart
@@ -0,0 +1,245 @@
+part of '../compose_bar.dart';
+
+class _ComposeBarLayout extends StatelessWidget {
+  final List<BlobDescriptor> attachments;
+  final int uploadingCount;
+  final ValueChanged<String> onRemoveAttachment;
+  final String? uploadError;
+  final bool isExpanded;
+  final TextEditingController controller;
+  final FocusNode focusNode;
+  final EditableTextContextMenuBuilder contextMenuBuilder;
+  final ValueChanged<KeyboardInsertedContent> onContentInserted;
+  final VoidCallback onSend;
+  final String resolvedHint;
+  final _AttachmentSurface attachmentSurface;
+  final ValueChanged<BuildContext> onAttachmentTap;
+  final VoidCallback onExpand;
+  final double expansionValue;
+  final double expansionProgress;
+  final bool formattingOpen;
+  final VoidCallback onCloseFormatting;
+  final Duration motionDuration;
+  final void Function(String prefix, [String? suffix]) onFormat;
+  final VoidCallback onMention;
+  final VoidCallback onChannel;
+  final VoidCallback onEmoji;
+  final VoidCallback onOpenFormatting;
+  final bool hasPendingUploads;
+  final bool isSending;
+
+  const _ComposeBarLayout({
+    required this.attachments,
+    required this.uploadingCount,
+    required this.onRemoveAttachment,
+    required this.uploadError,
+    required this.isExpanded,
+    required this.controller,
+    required this.focusNode,
+    required this.contextMenuBuilder,
+    required this.onContentInserted,
+    required this.onSend,
+    required this.resolvedHint,
+    required this.attachmentSurface,
+    required this.onAttachmentTap,
+    required this.onExpand,
+    required this.expansionValue,
+    required this.expansionProgress,
+    required this.formattingOpen,
+    required this.onCloseFormatting,
+    required this.motionDuration,
+    required this.onFormat,
+    required this.onMention,
+    required this.onChannel,
+    required this.onEmoji,
+    required this.onOpenFormatting,
+    required this.hasPendingUploads,
+    required this.isSending,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: context.colors.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(Radii.dialog),
+        border: Border.all(
+          color: Colors.black.withValues(alpha: 0.04),
+          width: 1,
+        ),
+      ),
+      padding: const EdgeInsets.all(Grid.xxs),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          if (attachments.isNotEmpty || hasPendingUploads) ...[
+            _AttachmentStrip(
+              attachments: attachments,
+              uploadingCount: uploadingCount,
+              onRemove: onRemoveAttachment,
+            ),
+            const SizedBox(height: Grid.xxs),
+          ],
+          if (uploadError case final error?) ...[
+            Align(
+              alignment: Alignment.centerLeft,
+              child: Text(
+                error,
+                style: context.textTheme.bodySmall?.copyWith(
+                  color: context.colors.error,
+                ),
+              ),
+            ),
+            const SizedBox(height: Grid.xxs),
+          ],
+          // Keep the default state out of the focus system entirely so
+          // restored native focus cannot expand a newly opened channel.
+          if (isExpanded)
+            TextField(
+              controller: controller,
+              focusNode: focusNode,
+              textInputAction: TextInputAction.send,
+              contextMenuBuilder: contextMenuBuilder,
+              contentInsertionConfiguration: ContentInsertionConfiguration(
+                allowedMimeTypes: _pastedImageMimeTypes,
+                onContentInserted: onContentInserted,
+              ),
+              onSubmitted: (_) => onSend(),
+              minLines: 1,
+              maxLines: 5,
+              style: context.textTheme.bodyLarge,
+              decoration: InputDecoration(
+                hintText: resolvedHint,
+                hintStyle: context.textTheme.bodyLarge?.copyWith(
+                  color: context.colors.onSurfaceVariant,
+                ),
+                border: InputBorder.none,
+                enabledBorder: InputBorder.none,
+                focusedBorder: InputBorder.none,
+                contentPadding: const EdgeInsets.symmetric(
+                  horizontal: Grid.half,
+                  vertical: Grid.half,
+                ),
+                isDense: true,
+              ),
+            )
+          else
+            Row(
+              children: [
+                _AttachmentTrigger(
+                  surface: attachmentSurface,
+                  formattingOpen: false,
+                  onTap: onAttachmentTap,
+                ),
+                const SizedBox(width: Grid.xxs),
+                Expanded(
+                  child: Semantics(
+                    button: true,
+                    label: resolvedHint,
+                    child: GestureDetector(
+                      behavior: HitTestBehavior.opaque,
+                      onTap: onExpand,
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(
+                          vertical: Grid.half,
+                        ),
+                        child: Align(
+                          alignment: Alignment.centerLeft,
+                          child: Text(
+                            resolvedHint,
+                            style: context.textTheme.bodyLarge?.copyWith(
+                              color: context.colors.onSurfaceVariant,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ClipRect(
+            child: Align(
+              alignment: Alignment.topCenter,
+              heightFactor: expansionValue,
+              child: IgnorePointer(
+                ignoring: expansionValue < 0.98,
+                child: Opacity(
+                  opacity: expansionProgress,
+                  child: Transform.translate(
+                    offset: Offset(0, Grid.xxs * (1 - expansionProgress)),
+                    child: Column(
+                      children: [
+                        const SizedBox(height: Grid.xxs),
+                        Row(
+                          children: [
+                            _AttachmentTrigger(
+                              surface: attachmentSurface,
+                              formattingOpen: formattingOpen,
+                              onTap: (triggerContext) {
+                                if (formattingOpen) {
+                                  onCloseFormatting();
+                                } else {
+                                  onAttachmentTap(triggerContext);
+                                }
+                              },
+                            ),
+                            const SizedBox(width: Grid.half),
+                            Expanded(
+                              child: AnimatedSwitcher(
+                                duration: motionDuration,
+                                switchInCurve: Curves.easeOutCubic,
+                                switchOutCurve: Curves.easeInCubic,
+                                layoutBuilder:
+                                    (currentChild, previousChildren) => Stack(
+                                      alignment: Alignment.centerLeft,
+                                      children: [
+                                        ...previousChildren,
+                                        ?currentChild,
+                                      ],
+                                    ),
+                                child: formattingOpen
+                                    ? _FormattingToolbar(onFormat: onFormat)
+                                    : Row(
+                                        key: const ValueKey('standard-actions'),
+                                        children: [
+                                          _ComposeAction(
+                                            icon: LucideIcons.atSign,
+                                            onTap: onMention,
+                                          ),
+                                          _ComposeAction(
+                                            icon: LucideIcons.hash,
+                                            onTap: onChannel,
+                                          ),
+                                          _ComposeAction(
+                                            icon: LucideIcons.smilePlus,
+                                            onTap: onEmoji,
+                                          ),
+                                          _ComposeAction(
+                                            icon: LucideIcons.aLargeSmall,
+                                            onTap: onOpenFormatting,
+                                          ),
+                                          const Spacer(),
+                                          _SendButton(
+                                            isDisabled: hasPendingUploads,
+                                            isSending: isSending,
+                                            onTap: onSend,
+                                          ),
+                                        ],
+                                      ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart b/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart
new file mode 100644
index 0000000000..8b19b74aa2
--- /dev/null
+++ b/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart
@@ -0,0 +1,382 @@
+part of '../compose_bar.dart';
+
+class _PhotoGalleryPicker extends StatelessWidget {
+  final VoidCallback onBack;
+  final Future<List<XFile>> Function() onPickAllPhotos;
+  final Future<void> Function(List<XFile> photos) onChoosePhotos;
+
+  const _PhotoGalleryPicker({
+    required this.onBack,
+    required this.onPickAllPhotos,
+    required this.onChoosePhotos,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final fallback = _RecentPhotoGalleryPicker(
+      onBack: onBack,
+      onPickAllPhotos: onPickAllPhotos,
+      onChoosePhotos: onChoosePhotos,
+    );
+    if (defaultTargetPlatform != TargetPlatform.iOS) return fallback;
+    return _IOSInlinePhotoPicker(
+      onBack: onBack,
+      onPickAllPhotos: onPickAllPhotos,
+      onChoosePhotos: onChoosePhotos,
+      fallback: fallback,
+    );
+  }
+}
+
+class _RecentPhotoGalleryPicker extends HookConsumerWidget {
+  final VoidCallback onBack;
+  final Future<List<XFile>> Function() onPickAllPhotos;
+  final Future<void> Function(List<XFile> photos) onChoosePhotos;
+
+  const _RecentPhotoGalleryPicker({
+    required this.onBack,
+    required this.onPickAllPhotos,
+    required this.onChoosePhotos,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final recentPhotos = useMemoized(
+      ref.read(photoLibraryProvider).loadRecentPhotos,
+    );
+    final recentSnapshot = useFuture(recentPhotos);
+    final selection = useState<List<RecentPhoto>>([]);
+    final isResolving = useState(false);
+    final actionError = useState<String?>(null);
+    final reducedMotion = MediaQuery.disableAnimationsOf(context);
+
+    void togglePhoto(RecentPhoto photo) {
+      if (isResolving.value) return;
+      final current = selection.value;
+      final existingIndex = current.indexWhere((item) => item.id == photo.id);
+      selection.value = existingIndex < 0
+          ? [...current, photo]
+          : [
+              ...current.take(existingIndex),
+              ...current.skip(existingIndex + 1),
+            ];
+    }
+
+    Future<void> choosePhotos() async {
+      if (isResolving.value) return;
+      isResolving.value = true;
+      actionError.value = null;
+      try {
+        final photos = selection.value.isEmpty
+            ? await onPickAllPhotos()
+            : await ref
+                  .read(photoLibraryProvider)
+                  .resolveSelectedPhotos(selection.value);
+        if (photos.isNotEmpty && context.mounted) {
+          await onChoosePhotos(photos);
+        }
+      } catch (_) {
+        if (context.mounted) {
+          actionError.value = selection.value.isEmpty
+              ? 'Unable to open your photo library.'
+              : 'Unable to prepare the selected photos.';
+        }
+      } finally {
+        if (context.mounted) isResolving.value = false;
+      }
+    }
+
+    final selectedCount = selection.value.length;
+    final actionLabel = selectedCount == 0
+        ? 'All photos'
+        : selectedCount == 1
+        ? 'Add 1 photo'
+        : 'Add $selectedCount photos';
+
+    Widget buildGalleryBody() {
+      if (recentSnapshot.connectionState != ConnectionState.done) {
+        return const Center(
+          child: BuzzLoadingIndicator(
+            size: 44,
+            semanticLabel: 'Loading recent photos',
+          ),
+        );
+      }
+      if (recentSnapshot.hasError) {
+        return const _PhotoGalleryMessage(
+          icon: LucideIcons.images,
+          title: 'Recent photos aren’t available',
+          message: 'Use All photos to choose with the system photo picker.',
+        );
+      }
+
+      final photos = recentSnapshot.data ?? const <RecentPhoto>[];
+      if (photos.isEmpty) {
+        return const _PhotoGalleryMessage(
+          icon: LucideIcons.images,
+          title: 'No recent photos',
+          message: 'Use All photos to browse your photo library.',
+        );
+      }
+      return GridView.builder(
+        key: const ValueKey('recent-photo-grid'),
+        padding: EdgeInsets.zero,
+        gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+          crossAxisCount: 4,
+          crossAxisSpacing: Grid.quarter,
+          mainAxisSpacing: Grid.quarter,
+        ),
+        itemCount: photos.length,
+        itemBuilder: (context, index) {
+          final photo = photos[index];
+          final selectionIndex = selection.value.indexWhere(
+            (item) => item.id == photo.id,
+          );
+          return _RecentPhotoTile(
+            photo: photo,
+            selectionIndex: selectionIndex,
+            reducedMotion: reducedMotion,
+            onTap: () => togglePhoto(photo),
+          );
+        },
+      );
+    }
+
+    return Padding(
+      key: const ValueKey('photo-gallery-picker'),
+      padding: const EdgeInsets.all(Grid.xxs),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          SizedBox(
+            height: 40,
+            child: Row(
+              children: [
+                IconButton(
+                  key: const ValueKey('photo-gallery-back'),
+                  onPressed: isResolving.value ? null : onBack,
+                  tooltip: 'Back to attachment options',
+                  visualDensity: VisualDensity.compact,
+                  icon: const Icon(LucideIcons.arrowLeft, size: 20),
+                ),
+                const SizedBox(width: Grid.quarter),
+                Expanded(
+                  child: Text(
+                    'Recent photos',
+                    style: context.textTheme.titleSmall?.copyWith(
+                      color: context.colors.onSurface,
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                ),
+                if (selectedCount > 0)
+                  Padding(
+                    padding: const EdgeInsets.only(right: Grid.half),
+                    child: Text(
+                      '$selectedCount selected',
+                      style: context.textTheme.labelMedium?.copyWith(
+                        color: context.colors.onSurfaceVariant,
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+          const SizedBox(height: Grid.half),
+          Expanded(
+            child: Column(
+              children: [
+                Expanded(child: buildGalleryBody()),
+                if (actionError.value case final error?) ...[
+                  const SizedBox(height: Grid.half),
+                  ConstrainedBox(
+                    constraints: const BoxConstraints(maxHeight: 72),
+                    child: SingleChildScrollView(
+                      child: Text(
+                        error,
+                        key: const ValueKey('photo-gallery-error'),
+                        style: context.textTheme.bodySmall?.copyWith(
+                          color: context.colors.error,
+                        ),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                  ),
+                ],
+              ],
+            ),
+          ),
+          const SizedBox(height: Grid.xxs),
+          SizedBox(
+            width: double.infinity,
+            child: selectedCount == 0
+                ? OutlinedButton.icon(
+                    key: const ValueKey('photo-gallery-action'),
+                    onPressed: isResolving.value ? null : choosePhotos,
+                    icon: isResolving.value
+                        ? BuzzLoadingIndicator(
+                            size: 22,
+                            color: context.colors.primary,
+                            semanticLabel: 'Opening all photos',
+                          )
+                        : const Icon(LucideIcons.images, size: 18),
+                    label: Text(actionLabel),
+                  )
+                : FilledButton.icon(
+                    key: const ValueKey('photo-gallery-action'),
+                    onPressed: isResolving.value ? null : choosePhotos,
+                    icon: isResolving.value
+                        ? const BuzzLoadingIndicator(
+                            size: 22,
+                            color: Colors.white,
+                            semanticLabel: 'Preparing selected photos',
+                          )
+                        : const Icon(LucideIcons.plus, size: 18),
+                    label: Text(actionLabel),
+                  ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _RecentPhotoTile extends StatelessWidget {
+  final RecentPhoto photo;
+  final int selectionIndex;
+  final bool reducedMotion;
+  final VoidCallback onTap;
+
+  const _RecentPhotoTile({
+    required this.photo,
+    required this.selectionIndex,
+    required this.reducedMotion,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final isSelected = selectionIndex >= 0;
+    return Semantics(
+      button: true,
+      selected: isSelected,
+      label: isSelected
+          ? 'Photo ${selectionIndex + 1} selected'
+          : 'Select photo',
+      child: GestureDetector(
+        key: ValueKey('recent-photo-${photo.id}'),
+        behavior: HitTestBehavior.opaque,
+        onTap: onTap,
+        child: Stack(
+          fit: StackFit.expand,
+          children: [
+            ClipRRect(
+              borderRadius: BorderRadius.circular(Radii.sm),
+              child: Image.memory(
+                photo.thumbnailBytes,
+                fit: BoxFit.cover,
+                gaplessPlayback: true,
+              ),
+            ),
+            AnimatedContainer(
+              duration: reducedMotion
+                  ? Duration.zero
+                  : const Duration(milliseconds: 140),
+              curve: Curves.easeOutCubic,
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(Radii.sm),
+                border: Border.all(
+                  color: isSelected
+                      ? context.colors.primary
+                      : Colors.transparent,
+                  width: isSelected ? 3 : 0,
+                ),
+                color: isSelected
+                    ? Colors.black.withValues(alpha: 0.08)
+                    : Colors.transparent,
+              ),
+            ),
+            PositionedDirectional(
+              top: Grid.half,
+              end: Grid.half,
+              child: AnimatedScale(
+                scale: isSelected ? 1 : 0.8,
+                duration: reducedMotion
+                    ? Duration.zero
+                    : const Duration(milliseconds: 140),
+                curve: Curves.easeOutCubic,
+                child: AnimatedOpacity(
+                  opacity: isSelected ? 1 : 0,
+                  duration: reducedMotion
+                      ? Duration.zero
+                      : const Duration(milliseconds: 100),
+                  child: Container(
+                    key: ValueKey('photo-selection-index-${photo.id}'),
+                    width: 24,
+                    height: 24,
+                    alignment: Alignment.center,
+                    decoration: BoxDecoration(
+                      color: context.colors.primary,
+                      shape: BoxShape.circle,
+                      border: Border.all(color: Colors.white, width: 1.5),
+                    ),
+                    child: Text(
+                      '${selectionIndex + 1}',
+                      style: context.textTheme.labelSmall?.copyWith(
+                        color: context.colors.onPrimary,
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _PhotoGalleryMessage extends StatelessWidget {
+  final IconData icon;
+  final String title;
+  final String message;
+
+  const _PhotoGalleryMessage({
+    required this.icon,
+    required this.title,
+    required this.message,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Padding(
+        padding: const EdgeInsets.all(Grid.sm),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(icon, size: 32, color: context.colors.onSurfaceVariant),
+            const SizedBox(height: Grid.xxs),
+            Text(
+              title,
+              style: context.textTheme.titleSmall?.copyWith(
+                color: context.colors.onSurface,
+              ),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: Grid.quarter),
+            Text(
+              message,
+              style: context.textTheme.bodySmall?.copyWith(
+                color: context.colors.onSurfaceVariant,
+              ),
+              textAlign: TextAlign.center,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/channels/compose_bar/send_button.dart b/mobile/lib/features/channels/compose_bar/send_button.dart
index 45bd1df9c2..54060ae948 100644
--- a/mobile/lib/features/channels/compose_bar/send_button.dart
+++ b/mobile/lib/features/channels/compose_bar/send_button.dart
@@ -27,13 +27,10 @@ class _SendButton extends StatelessWidget {
         ),
         padding: EdgeInsets.zero,
         icon: isSending
-            ? SizedBox(
-                width: 16,
-                height: 16,
-                child: CircularProgressIndicator(
-                  strokeWidth: 2,
-                  color: context.colors.onPrimary,
-                ),
+            ? BuzzLoadingIndicator(
+                size: 18,
+                color: context.colors.onPrimary,
+                semanticLabel: 'Sending message',
               )
             : Icon(
                 LucideIcons.arrowUp,
diff --git a/mobile/lib/features/channels/compose_bar/suggestions.dart b/mobile/lib/features/channels/compose_bar/suggestions.dart
index f1deefcdaf..ed97284d46 100644
--- a/mobile/lib/features/channels/compose_bar/suggestions.dart
+++ b/mobile/lib/features/channels/compose_bar/suggestions.dart
@@ -1,44 +1,95 @@
 part of '../compose_bar.dart';
 
-class _SuggestionPanelMotion extends StatelessWidget {
+class _SuggestionPanelMotion extends HookWidget {
   final Duration duration;
+  final Alignment alignment;
   final Widget child;
 
-  const _SuggestionPanelMotion({required this.duration, required this.child});
+  const _SuggestionPanelMotion({
+    required this.duration,
+    required this.alignment,
+    required this.child,
+  });
 
   @override
   Widget build(BuildContext context) {
-    return AnimatedSwitcher(
-      duration: duration,
-      reverseDuration: duration,
-      layoutBuilder: (currentChild, previousChildren) => Stack(
-        alignment: Alignment.bottomLeft,
-        clipBehavior: Clip.none,
-        children: [...previousChildren, ?currentChild],
-      ),
-      transitionBuilder: (child, animation) {
-        final curvedAnimation = CurvedAnimation(
-          parent: animation,
-          curve: Curves.easeOutCubic,
-          reverseCurve: Curves.easeInCubic,
-        );
+    final reducedMotion = MediaQuery.disableAnimationsOf(context);
+    final springController = useAnimationController(
+      initialValue: 1,
+      upperBound: 1.08,
+    );
+    final springValue = useAnimation(springController);
+    final previousChildKey = useRef<Key?>(child.key);
 
-        return AnimatedBuilder(
-          animation: curvedAnimation,
-          child: child,
-          builder: (context, child) => IgnorePointer(
-            ignoring: animation.status == AnimationStatus.reverse,
-            child: Opacity(
-              opacity: curvedAnimation.value,
-              child: Transform.translate(
-                offset: Offset(0, Grid.xs * (1 - curvedAnimation.value)),
-                child: child,
+    useEffect(() {
+      if (previousChildKey.value == child.key) return null;
+      previousChildKey.value = child.key;
+      if (reducedMotion) {
+        springController.value = 1;
+      } else {
+        springController
+          ..stop()
+          ..value = 0.9
+          ..animateWith(
+            SpringSimulation(
+              SpringDescription.withDurationAndBounce(
+                duration: const Duration(milliseconds: 320),
+                bounce: 0.18,
               ),
+              0.9,
+              1,
+              0,
+              snapToEnd: true,
             ),
+          );
+      }
+      return null;
+    }, [child.key, reducedMotion]);
+
+    return Transform.scale(
+      scale: springValue,
+      alignment: alignment,
+      child: AnimatedSize(
+        duration: duration,
+        curve: Curves.easeInOutCubic,
+        alignment: alignment,
+        child: AnimatedSwitcher(
+          duration: duration,
+          reverseDuration: duration,
+          layoutBuilder: (currentChild, previousChildren) => Stack(
+            alignment: alignment,
+            clipBehavior: Clip.none,
+            children: [...previousChildren, ?currentChild],
           ),
-        );
-      },
-      child: child,
+          transitionBuilder: (child, animation) {
+            final curvedAnimation = CurvedAnimation(
+              parent: animation,
+              curve: Curves.easeOutBack,
+              reverseCurve: Curves.easeInOutCubic,
+            );
+
+            return AnimatedBuilder(
+              animation: curvedAnimation,
+              child: child,
+              builder: (context, child) => IgnorePointer(
+                ignoring: animation.status == AnimationStatus.reverse,
+                child: Opacity(
+                  opacity: animation.value.clamp(0.0, 1.0),
+                  child: Transform.translate(
+                    offset: Offset(0, Grid.xs * (1 - animation.value)),
+                    child: Transform.scale(
+                      scale: 0.92 + (0.08 * curvedAnimation.value),
+                      alignment: alignment,
+                      child: child,
+                    ),
+                  ),
+                ),
+              ),
+            );
+          },
+          child: child,
+        ),
+      ),
     );
   }
 }
diff --git a/mobile/lib/features/channels/emoji_picker.dart b/mobile/lib/features/channels/emoji_picker.dart
index b43a57b410..c961966531 100644
--- a/mobile/lib/features/channels/emoji_picker.dart
+++ b/mobile/lib/features/channels/emoji_picker.dart
@@ -3,9 +3,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../../shared/theme/theme.dart';
-import '../custom_emoji/custom_emoji.dart';
-import '../custom_emoji/custom_emoji_provider.dart';
-import '../custom_emoji/custom_emoji_render.dart';
+import '../../shared/custom_emoji/custom_emoji.dart';
+import '../../shared/custom_emoji/custom_emoji_provider.dart';
+import '../../shared/custom_emoji/custom_emoji_render.dart';
 
 /// Opens the full emoji picker as a modal bottom sheet.
 void showEmojiPicker({
diff --git a/mobile/lib/features/channels/manage_channel_sheet.dart b/mobile/lib/features/channels/manage_channel_sheet.dart
index d1f0c231ae..15ad07b0cd 100644
--- a/mobile/lib/features/channels/manage_channel_sheet.dart
+++ b/mobile/lib/features/channels/manage_channel_sheet.dart
@@ -4,6 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../../shared/theme/theme.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
 import 'channel.dart';
 import 'channel_management_provider.dart';
 import 'channel_mutes/channel_mutes_provider.dart';
@@ -272,7 +273,12 @@ class ManageChannelSheet extends HookConsumerWidget {
                     ],
                   );
                 },
-                loading: () => const Center(child: CircularProgressIndicator()),
+                loading: () => const Center(
+                  child: BuzzLoadingIndicator(
+                    size: 40,
+                    semanticLabel: 'Loading channel details',
+                  ),
+                ),
                 error: (error, _) => Text(
                   error.toString(),
                   style: context.textTheme.bodySmall?.copyWith(
diff --git a/mobile/lib/features/channels/media_viewer_hero.dart b/mobile/lib/features/channels/media_viewer_hero.dart
new file mode 100644
index 0000000000..00be663a6f
--- /dev/null
+++ b/mobile/lib/features/channels/media_viewer_hero.dart
@@ -0,0 +1,72 @@
+import 'package:flutter/material.dart';
+
+/// Keeps image-viewer shared-element motion consistent at every source.
+class MediaViewerHero extends StatelessWidget {
+  /// The identity shared by the inline image and full-screen image.
+  final Object tag;
+
+  /// The image rendered during and after the shared-element transition.
+  final Widget child;
+
+  /// Creates an image-viewer shared element.
+  const MediaViewerHero({super.key, required this.tag, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    return Hero(
+      tag: tag,
+      createRectTween: (begin, end) => RectTween(begin: begin, end: end),
+      flightShuttleBuilder:
+          (
+            flightContext,
+            animation,
+            flightDirection,
+            fromHeroContext,
+            toHeroContext,
+          ) {
+            final sourceHero = fromHeroContext.widget;
+            final destinationHero = toHeroContext.widget;
+            final sourceChild = sourceHero is Hero ? sourceHero.child : child;
+            final destinationChild = destinationHero is Hero
+                ? destinationHero.child
+                : child;
+            return _MediaViewerHeroFlight(
+              animation: animation,
+              sourceChild: sourceChild,
+              destinationChild: destinationChild,
+            );
+          },
+      child: child,
+    );
+  }
+}
+
+class _MediaViewerHeroFlight extends StatelessWidget {
+  final Animation<double> animation;
+  final Widget sourceChild;
+  final Widget destinationChild;
+
+  const _MediaViewerHeroFlight({
+    required this.animation,
+    required this.sourceChild,
+    required this.destinationChild,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final destinationOpacity = CurvedAnimation(
+      parent: animation,
+      curve: const Interval(0.18, 0.82, curve: Curves.easeInOutCubic),
+    );
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        FadeTransition(
+          opacity: ReverseAnimation(destinationOpacity),
+          child: sourceChild,
+        ),
+        FadeTransition(opacity: destinationOpacity, child: destinationChild),
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/features/channels/media_viewer_page.dart b/mobile/lib/features/channels/media_viewer_page.dart
index 1c4052e1b8..f7e1af9211 100644
--- a/mobile/lib/features/channels/media_viewer_page.dart
+++ b/mobile/lib/features/channels/media_viewer_page.dart
@@ -1,34 +1,106 @@
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/physics.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 import 'package:video_player/video_player.dart';
 
 import '../../shared/relay/relay.dart';
 import '../../shared/theme/theme.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
+import 'media_viewer_hero.dart';
 
-const _imageViewerPushDuration = Duration(milliseconds: 280);
-const _imageViewerPopDuration = Duration(milliseconds: 220);
-const _imageViewerTransitionOffset = Offset(0, 0.08);
+export 'media_viewer_hero.dart';
+
+part 'media_viewer_page/image_controls.dart';
+part 'media_viewer_page/route_transition.dart';
+
+const _imageViewerPushDuration = Duration(milliseconds: 260);
+const _imageViewerPopDuration = Duration(milliseconds: 170);
 const _identityTransformEpsilon = 0.0001;
 final List<double> _identityTransformStorage = List<double>.unmodifiable(
   Matrix4.identity().storage,
 );
 
+/// Opens message-specific actions for the currently visible image.
+typedef MediaViewerMoreAction =
+    void Function(BuildContext context, String imageUrl);
+
+/// An image and its source Hero tag in a full-screen media gallery.
+@immutable
+class MediaViewerImage {
+  /// The image URL.
+  final String url;
+
+  /// The shared-element transition tag for the source thumbnail.
+  final Object heroTag;
+
+  /// The accessible image description.
+  final String? semanticLabel;
+
+  /// The logical decode width already cached by the source thumbnail.
+  final double? previewDecodeWidth;
+
+  /// The image's intrinsic width-to-height ratio, when provided by metadata.
+  final double? aspectRatio;
+
+  /// A display-sized provider that can be warmed before this page is shown.
+  final ImageProvider<Object>? preloadProvider;
+
+  /// Creates a media-viewer image.
+  const MediaViewerImage({
+    required this.url,
+    required this.heroTag,
+    this.semanticLabel,
+    this.previewDecodeWidth,
+    this.aspectRatio,
+    this.preloadProvider,
+  });
+}
+
 PageRoute<void> buildImageViewerRoute({
   required String imageUrl,
   required Object heroTag,
   String? semanticLabel,
+  double? previewDecodeWidth,
+  double? aspectRatio,
+  List<MediaViewerImage>? galleryItems,
+  int initialIndex = 0,
+  VoidCallback? onReply,
+  MediaViewerMoreAction? onMore,
+  bool disableAnimations = false,
 }) {
+  final images =
+      galleryItems ??
+      [
+        MediaViewerImage(
+          url: imageUrl,
+          heroTag: heroTag,
+          semanticLabel: semanticLabel,
+          previewDecodeWidth: previewDecodeWidth,
+          aspectRatio: aspectRatio,
+        ),
+      ];
+  final safeInitialIndex = initialIndex.clamp(0, images.length - 1).toInt();
   return PageRouteBuilder<void>(
-    transitionDuration: _imageViewerPushDuration,
-    reverseTransitionDuration: _imageViewerPopDuration,
+    transitionDuration: disableAnimations
+        ? Duration.zero
+        : _imageViewerPushDuration,
+    reverseTransitionDuration: disableAnimations
+        ? Duration.zero
+        : _imageViewerPopDuration,
     pageBuilder: (context, animation, secondaryAnimation) =>
         MediaImageViewerPage(
           imageUrl: imageUrl,
           heroTag: heroTag,
           semanticLabel: semanticLabel,
+          galleryItems: images,
+          initialIndex: safeInitialIndex,
+          onReply: onReply,
+          onMore: onMore,
         ),
     transitionsBuilder: (context, animation, secondaryAnimation, child) =>
         _MediaViewerRouteTransition(animation: animation, child: child),
@@ -40,12 +112,25 @@ void openImageViewer(
   required String imageUrl,
   required Object heroTag,
   String? semanticLabel,
+  double? previewDecodeWidth,
+  double? aspectRatio,
+  List<MediaViewerImage>? galleryItems,
+  int initialIndex = 0,
+  VoidCallback? onReply,
+  MediaViewerMoreAction? onMore,
 }) {
   Navigator.of(context).push(
     buildImageViewerRoute(
       imageUrl: imageUrl,
       heroTag: heroTag,
       semanticLabel: semanticLabel,
+      previewDecodeWidth: previewDecodeWidth,
+      aspectRatio: aspectRatio,
+      galleryItems: galleryItems,
+      initialIndex: initialIndex,
+      onReply: onReply,
+      onMore: onMore,
+      disableAnimations: MediaQuery.disableAnimationsOf(context),
     ),
   );
 }
@@ -57,8 +142,12 @@ void openVideoViewer(
 }) {
   Navigator.of(context).push(
     PageRouteBuilder<void>(
-      transitionDuration: _imageViewerPushDuration,
-      reverseTransitionDuration: _imageViewerPopDuration,
+      transitionDuration: MediaQuery.disableAnimationsOf(context)
+          ? Duration.zero
+          : _imageViewerPushDuration,
+      reverseTransitionDuration: MediaQuery.disableAnimationsOf(context)
+          ? Duration.zero
+          : _imageViewerPopDuration,
       pageBuilder: (context, animation, secondaryAnimation) =>
           MediaVideoViewerPage(videoUrl: videoUrl, posterUrl: posterUrl),
       transitionsBuilder: (context, animation, secondaryAnimation, child) =>
@@ -67,189 +156,345 @@ void openVideoViewer(
   );
 }
 
-class _MediaViewerRouteTransition extends StatelessWidget {
-  final Animation<double> animation;
-  final Widget child;
-
-  const _MediaViewerRouteTransition({
-    required this.animation,
-    required this.child,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final fade = CurvedAnimation(
-      parent: animation,
-      curve: Curves.easeOut,
-      reverseCurve: Curves.easeIn,
-    );
-    final slide = CurvedAnimation(
-      parent: animation,
-      curve: Curves.easeOutCubic,
-      reverseCurve: Curves.easeInCubic,
-    );
-
-    return FadeTransition(
-      opacity: fade,
-      child: SlideTransition(
-        position: Tween<Offset>(
-          begin: _imageViewerTransitionOffset,
-          end: Offset.zero,
-        ).animate(slide),
-        child: child,
-      ),
-    );
-  }
-}
-
-// StatefulWidget retained: imperative gesture/animation controllers with
-// listener lifecycle don't map cleanly to hooks (allowed exception).
-class MediaImageViewerPage extends StatefulWidget {
+class MediaImageViewerPage extends HookConsumerWidget {
   final String imageUrl;
   final Object heroTag;
   final String? semanticLabel;
+  final List<MediaViewerImage>? galleryItems;
+  final int initialIndex;
+  final VoidCallback? onReply;
+  final MediaViewerMoreAction? onMore;
 
   const MediaImageViewerPage({
     super.key,
     required this.imageUrl,
     required this.heroTag,
     this.semanticLabel,
+    this.galleryItems,
+    this.initialIndex = 0,
+    this.onReply,
+    this.onMore,
   });
 
-  @override
-  State<MediaImageViewerPage> createState() => _MediaImageViewerPageState();
-}
-
-class _MediaImageViewerPageState extends State<MediaImageViewerPage>
-    with SingleTickerProviderStateMixin {
-  late final TransformationController _transformationController;
-  late final AnimationController _snapBackController;
-  bool _isTransformed = false;
-  bool _disableHeroOnDismiss = false;
-  double _dragOffset = 0;
-  bool _isDragging = false;
-
   static const _dismissThreshold = 100.0;
+  static const _dismissVelocity = 700.0;
   static const _backgroundFadeDivisor = 300.0;
+  static const _filmstripScrubExtent = 44.0;
 
   @override
-  void initState() {
-    super.initState();
-    _transformationController = TransformationController();
-    _transformationController.addListener(_handleTransformChanged);
-    _snapBackController = AnimationController(
-      vsync: this,
+  Widget build(BuildContext context, WidgetRef ref) {
+    final images = useMemoized(
+      () =>
+          galleryItems ??
+          [
+            MediaViewerImage(
+              url: imageUrl,
+              heroTag: heroTag,
+              semanticLabel: semanticLabel,
+            ),
+          ],
+      [galleryItems, imageUrl, heroTag, semanticLabel],
+    );
+    final safeInitialIndex = initialIndex.clamp(0, images.length - 1).toInt();
+    final currentIndex = useState(safeInitialIndex);
+    final pageController = usePageController(initialPage: safeInitialIndex);
+    final pagePosition = useState(safeInitialIndex.toDouble());
+    final transformationControllers = useMemoized(
+      () => [
+        for (var index = 0; index < images.length; index++)
+          TransformationController(),
+      ],
+      [images],
+    );
+    final snapBackController = useAnimationController(
       duration: const Duration(milliseconds: 200),
     );
-  }
-
-  @override
-  void dispose() {
-    _transformationController.removeListener(_handleTransformChanged);
-    _transformationController.dispose();
-    _snapBackController.dispose();
-    super.dispose();
-  }
-
-  void _handleTransformChanged() {
-    final isTransformed = _hasImageTransform(_transformationController.value);
-    if (isTransformed == _isTransformed) {
-      return;
-    }
-
-    setState(() {
-      _isTransformed = isTransformed;
-      // If the user zooms in while dragging, cancel the drag.
-      if (_isTransformed && _isDragging) {
-        _isDragging = false;
-        _dragOffset = 0;
-      }
-    });
-  }
-
-  void _onInteractionStart(ScaleStartDetails details) {
-    if (!_isTransformed && details.pointerCount == 1) {
-      _isDragging = true;
-    }
-  }
-
-  void _onInteractionUpdate(ScaleUpdateDetails details) {
-    if (_isDragging && !_isTransformed) {
-      setState(() {
-        _dragOffset += details.focalPointDelta.dy;
-      });
-    }
-  }
-
-  void _onInteractionEnd(ScaleEndDetails details) {
-    if (!_isDragging) return;
-    _isDragging = false;
-
-    if (_dragOffset.abs() > _dismissThreshold) {
-      _dismiss();
-    } else {
-      _animateSnapBack();
-    }
-  }
-
-  void _animateSnapBack() {
-    final startOffset = _dragOffset;
-    final tween = Tween<double>(begin: startOffset, end: 0);
-    final curved = CurvedAnimation(
-      parent: _snapBackController,
-      curve: Curves.easeOut,
+    final zoomResetController = useAnimationController(
+      duration: const Duration(milliseconds: 180),
     );
+    final zoomResetListener = useRef<VoidCallback?>(null);
+    final fullResolutionIndices = useState<Set<int>>(<int>{});
+    final isTransformed = useState(false);
+    final disableHeroOnDismiss = useState(false);
+    final dragOffset = useState(0.0);
+    final isDragging = useState(false);
 
-    void listener() {
-      setState(() {
-        _dragOffset = tween.evaluate(curved);
+    void handlePagePositionChanged() {
+      if (!pageController.hasClients) return;
+      final nextPosition = pageController.page;
+      if (nextPosition == null ||
+          (nextPosition - pagePosition.value).abs() < 0.0001) {
+        return;
+      }
+      pagePosition.value = nextPosition;
+    }
+
+    void handleTransformChanged(int index) {
+      if (index != currentIndex.value) return;
+      final nextIsTransformed = _hasImageTransform(
+        transformationControllers[index].value,
+      );
+      if (nextIsTransformed == isTransformed.value) {
+        return;
+      }
+
+      isTransformed.value = nextIsTransformed;
+      if (nextIsTransformed && isDragging.value) {
+        isDragging.value = false;
+        dragOffset.value = 0;
+      }
+    }
+
+    useEffect(() {
+      pageController.addListener(handlePagePositionChanged);
+      return () => pageController.removeListener(handlePagePositionChanged);
+    }, [pageController]);
+
+    useEffect(() {
+      final listeners = <VoidCallback>[];
+      for (var index = 0; index < transformationControllers.length; index++) {
+        final controllerIndex = index;
+        void listener() => handleTransformChanged(controllerIndex);
+        listeners.add(listener);
+        transformationControllers[index].addListener(listener);
+      }
+      return () {
+        for (var index = 0; index < transformationControllers.length; index++) {
+          transformationControllers[index]
+            ..removeListener(listeners[index])
+            ..dispose();
+        }
+      };
+    }, [transformationControllers]);
+
+    useEffect(() {
+      var cancelled = false;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (!cancelled && context.mounted) {
+          _precacheViewerImages(context, images, currentIndex.value);
+        }
       });
+      return () => cancelled = true;
+    }, [images]);
+
+    useEffect(() {
+      return () {
+        final listener = zoomResetListener.value;
+        if (listener != null) {
+          zoomResetController.removeListener(listener);
+        }
+      };
+    }, [zoomResetController]);
+
+    void onPageChanged(int index) {
+      _precacheViewerImages(context, images, index);
+      currentIndex.value = index;
+      isTransformed.value = _hasImageTransform(
+        transformationControllers[index].value,
+      );
+      disableHeroOnDismiss.value = index != safeInitialIndex;
+      dragOffset.value = 0;
+      isDragging.value = false;
     }
 
-    _snapBackController
-      ..reset()
-      ..addListener(listener);
-    _snapBackController.forward().whenCompleteOrCancel(() {
-      _snapBackController.removeListener(listener);
-    });
-  }
-
-  bool get _canDismissWithHero => !_isTransformed || _disableHeroOnDismiss;
-
-  Future<void> _prepareHeroFallbackDismiss() async {
-    if (_canDismissWithHero) {
-      return;
+    void onFilmstripScrubUpdate(double delta) {
+      if (isTransformed.value || !pageController.hasClients) return;
+      final position = pageController.position;
+      final viewport = position.viewportDimension;
+      if (viewport <= 0) return;
+      final target =
+          (pageController.offset - ((delta / _filmstripScrubExtent) * viewport))
+              .clamp(position.minScrollExtent, position.maxScrollExtent)
+              .toDouble();
+      pageController.jumpTo(target);
     }
 
-    setState(() {
-      _disableHeroOnDismiss = true;
-    });
-
-    await WidgetsBinding.instance.endOfFrame;
-  }
-
-  Future<void> _dismiss() async {
-    await _prepareHeroFallbackDismiss();
-    if (!mounted) {
-      return;
+    void onFilmstripScrubEnd() {
+      if (!pageController.hasClients) return;
+      final targetPage = (pageController.page ?? currentIndex.value.toDouble())
+          .round()
+          .clamp(0, images.length - 1);
+      if (MediaQuery.disableAnimationsOf(context)) {
+        pageController.jumpToPage(targetPage);
+        return;
+      }
+      pageController.animateToPage(
+        targetPage,
+        duration: const Duration(milliseconds: 180),
+        curve: Curves.easeOutCubic,
+      );
     }
-    Navigator.of(context).maybePop();
-  }
 
-  @override
-  Widget build(BuildContext context) {
+    void upgradeToFullResolution(int index) {
+      if (images[index].previewDecodeWidth == null ||
+          fullResolutionIndices.value.contains(index)) {
+        return;
+      }
+      fullResolutionIndices.value = {...fullResolutionIndices.value, index};
+    }
+
+    void onImageInteractionStart(int index, ScaleStartDetails details) {
+      if (details.pointerCount > 1) {
+        upgradeToFullResolution(index);
+      }
+      if (details.pointerCount == 1 && !isTransformed.value) {
+        isDragging.value = true;
+      }
+    }
+
+    void onImageInteractionUpdate(int index, ScaleUpdateDetails details) {
+      if (details.pointerCount > 1 || details.scale != 1) {
+        final needsFullResolution =
+            images[index].previewDecodeWidth != null &&
+            !fullResolutionIndices.value.contains(index);
+        if (isDragging.value || needsFullResolution) {
+          if (needsFullResolution) {
+            fullResolutionIndices.value = {
+              ...fullResolutionIndices.value,
+              index,
+            };
+          }
+          isDragging.value = false;
+          dragOffset.value = 0;
+        }
+        return;
+      }
+
+      if (!isDragging.value || isTransformed.value) return;
+      dragOffset.value = (dragOffset.value + details.focalPointDelta.dy).clamp(
+        0.0,
+        MediaQuery.sizeOf(context).height,
+      );
+    }
+
+    void resetImageTransform(int index) {
+      final controller = transformationControllers[index];
+      if (!_hasImageTransform(controller.value)) {
+        return;
+      }
+
+      final previousListener = zoomResetListener.value;
+      if (previousListener != null) {
+        zoomResetController.removeListener(previousListener);
+      }
+      zoomResetController.stop();
+
+      if (MediaQuery.disableAnimationsOf(context)) {
+        controller.value = Matrix4.identity();
+        zoomResetListener.value = null;
+        return;
+      }
+
+      final animation =
+          Matrix4Tween(
+            begin: Matrix4.copy(controller.value),
+            end: Matrix4.identity(),
+          ).animate(
+            CurvedAnimation(
+              parent: zoomResetController,
+              curve: Curves.easeOutCubic,
+            ),
+          );
+      void listener() => controller.value = animation.value;
+      zoomResetListener.value = listener;
+      zoomResetController
+        ..reset()
+        ..addListener(listener)
+        ..forward();
+    }
+
+    bool canDismissWithHero() =>
+        !isTransformed.value || disableHeroOnDismiss.value;
+
+    Future<void> prepareHeroFallbackDismiss() async {
+      if (canDismissWithHero()) {
+        return;
+      }
+      disableHeroOnDismiss.value = true;
+      await WidgetsBinding.instance.endOfFrame;
+    }
+
+    Future<void> dismiss() async {
+      await prepareHeroFallbackDismiss();
+      if (!context.mounted) {
+        return;
+      }
+      Navigator.of(context).maybePop();
+    }
+
+    void animateSnapBack() {
+      final tween = Tween<double>(begin: dragOffset.value, end: 0);
+
+      void listener() {
+        dragOffset.value = tween.evaluate(snapBackController);
+      }
+
+      snapBackController
+        ..stop()
+        ..reset()
+        ..addListener(listener);
+      snapBackController
+          .animateWith(
+            SpringSimulation(
+              SpringDescription.withDurationAndBounce(
+                duration: const Duration(milliseconds: 260),
+                bounce: 0.14,
+              ),
+              0,
+              1,
+              0,
+              snapToEnd: true,
+            ),
+          )
+          .whenCompleteOrCancel(() {
+            snapBackController.removeListener(listener);
+          });
+    }
+
+    void finishVerticalDismiss(double velocity) {
+      isDragging.value = false;
+      if (dragOffset.value > _dismissThreshold || velocity > _dismissVelocity) {
+        unawaited(dismiss());
+      } else {
+        animateSnapBack();
+      }
+    }
+
+    void onImageInteractionEnd(ScaleEndDetails details) {
+      if (!isDragging.value) return;
+      finishVerticalDismiss(details.velocity.pixelsPerSecond.dy);
+    }
+
+    Future<void> replyInThread() async {
+      final callback = onReply;
+      if (callback == null) return;
+      final route = ModalRoute.of(context);
+      await dismiss();
+      await route?.completed;
+      callback();
+    }
+
+    void showMoreActions() {
+      onMore?.call(context, images[currentIndex.value].url);
+    }
+
+    final viewportHeight = MediaQuery.sizeOf(context).height;
+    final dragProgress = (dragOffset.value / viewportHeight).clamp(0.0, 1.0);
+    final imageScale = 1 - (dragProgress * 0.1);
+    final chromeOpacity = (1 - (dragOffset.value / 160)).clamp(0.0, 1.0);
+
     return PopScope<void>(
-      canPop: _canDismissWithHero,
+      canPop: canDismissWithHero(),
       onPopInvokedWithResult: (didPop, result) {
         if (didPop) {
           return;
         }
-        unawaited(_dismiss());
+        unawaited(dismiss());
       },
       child: Scaffold(
         key: const ValueKey('message-media-image-viewer'),
         backgroundColor: Colors.black.withValues(
-          alpha: (1 - (_dragOffset.abs() / _backgroundFadeDivisor)).clamp(
+          alpha: (1 - (dragOffset.value.abs() / _backgroundFadeDivisor)).clamp(
             0.3,
             1.0,
           ),
@@ -258,52 +503,146 @@ class _MediaImageViewerPageState extends State<MediaImageViewerPage>
           children: [
             Positioned.fill(
               child: Transform.translate(
-                offset: Offset(0, _dragOffset),
-                child: InteractiveViewer(
-                  transformationController: _transformationController,
-                  onInteractionStart: _onInteractionStart,
-                  onInteractionUpdate: _onInteractionUpdate,
-                  onInteractionEnd: _onInteractionEnd,
-                  minScale: 1,
-                  maxScale: 4,
-                  child: Center(
-                    child: HeroMode(
-                      key: const ValueKey(
-                        'message-media-image-viewer-hero-mode',
-                      ),
-                      enabled: !_disableHeroOnDismiss,
-                      child: Hero(
-                        tag: widget.heroTag,
-                        child: MediaImage(
-                          url: widget.imageUrl,
-                          boundDecodeToLayout: false,
-                          fit: BoxFit.contain,
-                          semanticLabel: widget.semanticLabel,
-                          errorBuilder: (_, _, _) => const _MediaLoadFailure(
-                            message: 'Failed to load image',
-                            icon: LucideIcons.imageOff,
-                          ),
+                offset: Offset(0, dragOffset.value),
+                child: Transform.scale(
+                  scale: imageScale,
+                  child: PageView.builder(
+                    key: const ValueKey('message-media-image-viewer-pages'),
+                    controller: pageController,
+                    physics: isTransformed.value
+                        ? const NeverScrollableScrollPhysics()
+                        : const PageScrollPhysics(),
+                    itemCount: images.length,
+                    onPageChanged: onPageChanged,
+                    itemBuilder: (context, index) {
+                      final image = images[index];
+                      final viewPadding = MediaQuery.viewPaddingOf(context);
+                      return Padding(
+                        padding: EdgeInsets.only(
+                          top: viewPadding.top + 48 + Grid.xxs,
+                          bottom: viewPadding.bottom + 56 + (Grid.xxs * 2),
                         ),
-                      ),
-                    ),
+                        child: LayoutBuilder(
+                          builder: (context, constraints) {
+                            final viewerSize = _imageViewerSize(
+                              Size(constraints.maxWidth, constraints.maxHeight),
+                              image.aspectRatio,
+                            );
+                            return GestureDetector(
+                              key: ValueKey(
+                                'message-media-image-viewer-gesture:$index',
+                              ),
+                              behavior: HitTestBehavior.opaque,
+                              onDoubleTap: () => resetImageTransform(index),
+                              child: InteractiveViewer(
+                                transformationController:
+                                    transformationControllers[index],
+                                onInteractionStart: (details) =>
+                                    onImageInteractionStart(index, details),
+                                onInteractionUpdate: (details) =>
+                                    onImageInteractionUpdate(index, details),
+                                onInteractionEnd: onImageInteractionEnd,
+                                panEnabled: isTransformed.value,
+                                scaleEnabled: true,
+                                minScale: 1,
+                                maxScale: 4,
+                                boundaryMargin: const EdgeInsets.all(Grid.xxl),
+                                clipBehavior: Clip.none,
+                                child: Align(
+                                  alignment: Alignment.center,
+                                  child: SizedBox(
+                                    width: viewerSize.width,
+                                    height: viewerSize.height,
+                                    child: HeroMode(
+                                      key: index == safeInitialIndex
+                                          ? const ValueKey(
+                                              'message-media-image-viewer-hero-mode',
+                                            )
+                                          : ValueKey(
+                                              'message-media-image-viewer-hero-mode-$index',
+                                            ),
+                                      enabled:
+                                          !disableHeroOnDismiss.value &&
+                                          index == safeInitialIndex,
+                                      child: MediaViewerHero(
+                                        tag: image.heroTag,
+                                        child: MediaImage(
+                                          key: ValueKey(
+                                            'message-media-image-viewer-image:$index',
+                                          ),
+                                          url: image.url,
+                                          decodeWidth:
+                                              fullResolutionIndices.value
+                                                  .contains(index)
+                                              ? null
+                                              : image.previewDecodeWidth,
+                                          boundDecodeToLayout: false,
+                                          fit: BoxFit.contain,
+                                          semanticLabel: image.semanticLabel,
+                                          errorBuilder: (_, _, _) =>
+                                              const _MediaLoadFailure(
+                                                message: 'Failed to load image',
+                                                icon: LucideIcons.imageOff,
+                                              ),
+                                        ),
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            );
+                          },
+                        ),
+                      );
+                    },
                   ),
                 ),
               ),
             ),
             PositionedDirectional(
-              top: Grid.sm,
-              end: Grid.sm,
-              child: SafeArea(
-                child: DecoratedBox(
-                  decoration: const BoxDecoration(
-                    color: Color.fromRGBO(0, 0, 0, 0.56),
-                    shape: BoxShape.circle,
+              bottom: 0,
+              start: 0,
+              end: 0,
+              child: Opacity(
+                opacity: chromeOpacity,
+                child: SafeArea(
+                  child: _MediaViewerBottomControls(
+                    images: images,
+                    currentIndex: currentIndex.value,
+                    pagePosition: pagePosition,
+                    onScrubUpdate: onFilmstripScrubUpdate,
+                    onScrubEnd: onFilmstripScrubEnd,
+                    onSelect: (index) {
+                      if (index == currentIndex.value) return;
+                      if (MediaQuery.disableAnimationsOf(context)) {
+                        pageController.jumpToPage(index);
+                        return;
+                      }
+                      pageController.animateToPage(
+                        index,
+                        duration: const Duration(milliseconds: 220),
+                        curve: Curves.easeOutCubic,
+                      );
+                    },
+                    onReply: onReply == null
+                        ? null
+                        : () => unawaited(replyInThread()),
+                    onMore: onMore == null ? null : showMoreActions,
                   ),
-                  child: IconButton(
+                ),
+              ),
+            ),
+            PositionedDirectional(
+              top: 0,
+              end: Grid.sm,
+              child: Opacity(
+                opacity: chromeOpacity,
+                child: SafeArea(
+                  child: _MediaViewerCircleButton(
                     key: const ValueKey('message-media-image-viewer-close'),
-                    onPressed: _dismiss,
+                    icon: LucideIcons.x,
                     tooltip: 'Close image viewer',
-                    icon: const Icon(LucideIcons.x, color: Colors.white),
+                    onPressed: () => unawaited(dismiss()),
                   ),
                 ),
               ),
@@ -315,17 +654,6 @@ class _MediaImageViewerPageState extends State<MediaImageViewerPage>
   }
 }
 
-bool _hasImageTransform(Matrix4 transform) {
-  final storage = transform.storage;
-  for (var index = 0; index < storage.length; index++) {
-    if ((storage[index] - _identityTransformStorage[index]).abs() >
-        _identityTransformEpsilon) {
-      return true;
-    }
-  }
-  return false;
-}
-
 // StatefulWidget retained: owns a VideoPlayerController with async init and
 // disposal — kept imperative deliberately (allowed exception).
 class MediaVideoViewerPage extends StatefulWidget {
@@ -462,7 +790,13 @@ class _VideoLoadingPoster extends StatelessWidget {
           else
             _videoPlaceholder(context),
           const ColoredBox(color: Color.fromRGBO(0, 0, 0, 0.24)),
-          const Center(child: CircularProgressIndicator()),
+          const Center(
+            child: BuzzLoadingIndicator(
+              size: 44,
+              color: Colors.white,
+              semanticLabel: 'Loading video',
+            ),
+          ),
         ],
       ),
     );
diff --git a/mobile/lib/features/channels/media_viewer_page/image_controls.dart b/mobile/lib/features/channels/media_viewer_page/image_controls.dart
new file mode 100644
index 0000000000..7736167611
--- /dev/null
+++ b/mobile/lib/features/channels/media_viewer_page/image_controls.dart
@@ -0,0 +1,300 @@
+part of '../media_viewer_page.dart';
+
+class _MediaViewerBottomControls extends StatelessWidget {
+  final List<MediaViewerImage> images;
+  final int currentIndex;
+  final ValueListenable<double> pagePosition;
+  final ValueChanged<double> onScrubUpdate;
+  final VoidCallback onScrubEnd;
+  final ValueChanged<int> onSelect;
+  final VoidCallback? onReply;
+  final VoidCallback? onMore;
+
+  const _MediaViewerBottomControls({
+    required this.images,
+    required this.currentIndex,
+    required this.pagePosition,
+    required this.onScrubUpdate,
+    required this.onScrubEnd,
+    required this.onSelect,
+    required this.onReply,
+    required this.onMore,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(Grid.sm, Grid.xxs, Grid.sm, 0),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          _MediaViewerCircleButton(
+            key: const ValueKey('message-media-image-viewer-reply-thread'),
+            icon: LucideIcons.messageSquareReply,
+            tooltip: 'Reply in thread',
+            onPressed: onReply,
+          ),
+          const SizedBox(width: Grid.xxs),
+          Expanded(
+            child: images.length > 1
+                ? _MediaViewerFilmstrip(
+                    key: const ValueKey('message-media-image-viewer-filmstrip'),
+                    images: images,
+                    currentIndex: currentIndex,
+                    pagePosition: pagePosition,
+                    onScrubUpdate: onScrubUpdate,
+                    onScrubEnd: onScrubEnd,
+                    onSelect: onSelect,
+                  )
+                : const SizedBox(height: 56),
+          ),
+          const SizedBox(width: Grid.xxs),
+          _MediaViewerCircleButton(
+            key: const ValueKey('message-media-image-viewer-more-actions'),
+            icon: LucideIcons.ellipsis,
+            tooltip: 'More image actions',
+            onPressed: onMore,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _MediaViewerFilmstrip extends StatelessWidget {
+  final List<MediaViewerImage> images;
+  final int currentIndex;
+  final ValueListenable<double> pagePosition;
+  final ValueChanged<double> onScrubUpdate;
+  final VoidCallback onScrubEnd;
+  final ValueChanged<int> onSelect;
+
+  const _MediaViewerFilmstrip({
+    super.key,
+    required this.images,
+    required this.currentIndex,
+    required this.pagePosition,
+    required this.onScrubUpdate,
+    required this.onScrubEnd,
+    required this.onSelect,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 56,
+      child: RepaintBoundary(
+        child: GestureDetector(
+          behavior: HitTestBehavior.opaque,
+          onHorizontalDragUpdate: (details) =>
+              onScrubUpdate(details.primaryDelta ?? 0),
+          onHorizontalDragEnd: (_) => onScrubEnd(),
+          child: ValueListenableBuilder<double>(
+            valueListenable: pagePosition,
+            builder: (context, position, _) {
+              return LayoutBuilder(
+                builder: (context, constraints) {
+                  const compactWidth = 40.0;
+                  const focusedWidth = 72.0;
+                  const itemHeight = 52.0;
+                  const spacing = Grid.half;
+                  final clampedPosition = position
+                      .clamp(0.0, images.length - 1.0)
+                      .toDouble();
+                  final widths = <double>[];
+                  final proximities = <double>[];
+                  final centers = <double>[];
+                  var cursor = 0.0;
+
+                  for (var index = 0; index < images.length; index++) {
+                    final proximity = (1 - (index - clampedPosition).abs())
+                        .clamp(0.0, 1.0)
+                        .toDouble();
+                    final width =
+                        compactWidth +
+                        ((focusedWidth - compactWidth) * proximity);
+                    widths.add(width);
+                    proximities.add(proximity);
+                    centers.add(cursor + (width / 2));
+                    cursor += width + spacing;
+                  }
+
+                  final lowerIndex = clampedPosition.floor();
+                  final upperIndex = clampedPosition.ceil();
+                  final fraction = clampedPosition - lowerIndex;
+                  final lowerCenter = centers[lowerIndex];
+                  final upperCenter = centers[upperIndex];
+                  final focusCenter =
+                      lowerCenter + ((upperCenter - lowerCenter) * fraction);
+                  final viewportCenter = constraints.maxWidth / 2;
+
+                  return Stack(
+                    clipBehavior: Clip.hardEdge,
+                    children: [
+                      for (var index = 0; index < images.length; index++)
+                        Positioned(
+                          left:
+                              viewportCenter +
+                              centers[index] -
+                              focusCenter -
+                              (widths[index] / 2),
+                          top: Grid.quarter,
+                          width: widths[index],
+                          height: itemHeight,
+                          child: _MediaViewerFilmstripImage(
+                            image: images[index],
+                            index: index,
+                            proximity: proximities[index],
+                            selected: index == currentIndex,
+                            onSelect: onSelect,
+                          ),
+                        ),
+                    ],
+                  );
+                },
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _MediaViewerFilmstripImage extends StatelessWidget {
+  final MediaViewerImage image;
+  final int index;
+  final double proximity;
+  final bool selected;
+  final ValueChanged<int> onSelect;
+
+  const _MediaViewerFilmstripImage({
+    required this.image,
+    required this.index,
+    required this.proximity,
+    required this.selected,
+    required this.onSelect,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final borderWidth = 1 + (1.5 * proximity);
+    return Semantics(
+      button: true,
+      selected: selected,
+      label: selected
+          ? 'Image ${index + 1}, selected'
+          : 'Show image ${index + 1}',
+      child: GestureDetector(
+        key: ValueKey('message-media-image-viewer-thumbnail:$index'),
+        onTap: () => onSelect(index),
+        child: Container(
+          height: 52,
+          padding: EdgeInsets.all(borderWidth),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(Radii.sm),
+            border: Border.all(
+              color: Colors.white.withValues(alpha: 0.28 + (0.72 * proximity)),
+              width: borderWidth,
+            ),
+          ),
+          child: ClipRRect(
+            key: ValueKey('message-media-image-viewer-thumbnail-clip:$index'),
+            borderRadius: BorderRadius.circular(Radii.sm - borderWidth),
+            clipBehavior: Clip.antiAlias,
+            child: Opacity(
+              opacity: 0.62 + (0.38 * proximity),
+              child: MediaImage(
+                url: image.url,
+                decodeWidth: 72,
+                fit: BoxFit.cover,
+                semanticLabel: image.semanticLabel,
+                errorBuilder: (_, _, _) => const ColoredBox(
+                  color: Color.fromRGBO(255, 255, 255, 0.12),
+                  child: Icon(
+                    LucideIcons.imageOff,
+                    color: Colors.white70,
+                    size: 18,
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _MediaViewerCircleButton extends StatelessWidget {
+  final IconData icon;
+  final String tooltip;
+  final VoidCallback? onPressed;
+
+  const _MediaViewerCircleButton({
+    super.key,
+    required this.icon,
+    required this.tooltip,
+    required this.onPressed,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox.square(
+      dimension: 48,
+      child: onPressed == null
+          ? const SizedBox.shrink()
+          : DecoratedBox(
+              decoration: BoxDecoration(
+                color: Colors.white.withValues(alpha: 0.16),
+                shape: BoxShape.circle,
+              ),
+              child: IconButton(
+                onPressed: onPressed,
+                tooltip: tooltip,
+                icon: Icon(icon, color: Colors.white, size: 20),
+              ),
+            ),
+    );
+  }
+}
+
+Size _imageViewerSize(Size viewport, double? aspectRatio) {
+  if (aspectRatio == null || aspectRatio <= 0) {
+    return viewport;
+  }
+
+  final safeAspectRatio = aspectRatio.clamp(0.05, 20.0).toDouble();
+  if (viewport.aspectRatio > safeAspectRatio) {
+    return Size(viewport.height * safeAspectRatio, viewport.height);
+  }
+  return Size(viewport.width, viewport.width / safeAspectRatio);
+}
+
+void _precacheViewerImages(
+  BuildContext context,
+  List<MediaViewerImage> images,
+  int focusedIndex,
+) {
+  for (var index = focusedIndex - 2; index <= focusedIndex + 2; index++) {
+    if (index < 0 || index >= images.length) {
+      continue;
+    }
+    final provider = images[index].preloadProvider;
+    if (provider == null) {
+      continue;
+    }
+    unawaited(precacheImage(provider, context, onError: (_, _) {}));
+  }
+}
+
+bool _hasImageTransform(Matrix4 transform) {
+  final storage = transform.storage;
+  for (var index = 0; index < storage.length; index++) {
+    if ((storage[index] - _identityTransformStorage[index]).abs() >
+        _identityTransformEpsilon) {
+      return true;
+    }
+  }
+  return false;
+}
diff --git a/mobile/lib/features/channels/media_viewer_page/route_transition.dart b/mobile/lib/features/channels/media_viewer_page/route_transition.dart
new file mode 100644
index 0000000000..5ebed62a95
--- /dev/null
+++ b/mobile/lib/features/channels/media_viewer_page/route_transition.dart
@@ -0,0 +1,22 @@
+part of '../media_viewer_page.dart';
+
+class _MediaViewerRouteTransition extends StatelessWidget {
+  final Animation<double> animation;
+  final Widget child;
+
+  const _MediaViewerRouteTransition({
+    required this.animation,
+    required this.child,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final fade = CurvedAnimation(
+      parent: animation,
+      curve: Curves.easeOutCubic,
+      reverseCurve: Curves.easeInOutCubic,
+    );
+
+    return FadeTransition(opacity: fade, child: child);
+  }
+}
diff --git a/mobile/lib/features/channels/members_sheet.dart b/mobile/lib/features/channels/members_sheet.dart
index b17d9f4823..e1c79164ee 100644
--- a/mobile/lib/features/channels/members_sheet.dart
+++ b/mobile/lib/features/channels/members_sheet.dart
@@ -5,6 +5,7 @@ import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../profile/user_cache_provider.dart';
 import '../profile/user_profile.dart';
 import '../profile/user_status.dart';
@@ -150,7 +151,12 @@ class MembersSheet extends HookConsumerWidget {
                       ),
                   ],
                 ),
-                loading: () => const Center(child: CircularProgressIndicator()),
+                loading: () => const Center(
+                  child: BuzzLoadingIndicator(
+                    size: 44,
+                    semanticLabel: 'Loading members',
+                  ),
+                ),
                 error: (error, _) => Center(
                   child: Text(
                     error.toString(),
@@ -240,13 +246,10 @@ class _MemberTile extends ConsumerWidget {
           ? Row(
               mainAxisSize: MainAxisSize.min,
               children: [
-                SizedBox(
-                  width: 10,
-                  height: 10,
-                  child: CircularProgressIndicator(
-                    strokeWidth: 1.5,
-                    color: context.appColors.success,
-                  ),
+                BuzzLoadingIndicator(
+                  size: 14,
+                  color: context.appColors.success,
+                  semanticLabel: 'Agent working',
                 ),
                 const SizedBox(width: Grid.half),
                 Text(
diff --git a/mobile/lib/features/channels/message_actions.dart b/mobile/lib/features/channels/message_actions.dart
index fe03bcb65e..c4cc5e2a0e 100644
--- a/mobile/lib/features/channels/message_actions.dart
+++ b/mobile/lib/features/channels/message_actions.dart
@@ -1,24 +1,38 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:photo_manager/photo_manager.dart';
+import 'package:share_plus/share_plus.dart';
 
+import '../../shared/clipboard_utils.dart';
+import '../../shared/deeplink/deep_link.dart';
+import '../../shared/relay/relay.dart';
 import '../../shared/theme/theme.dart';
-import '../custom_emoji/custom_emoji.dart';
-import '../custom_emoji/custom_emoji_provider.dart';
+import '../../shared/custom_emoji/custom_emoji.dart';
+import '../../shared/custom_emoji/custom_emoji_provider.dart';
+import '../../shared/widgets/sheet_divider.dart';
+import '../../shared/reminders/remind_me_later_sheet.dart';
+import '../../shared/reminders/reminder_service.dart';
 import 'channel_management_provider.dart';
 import 'emoji_picker.dart';
+import 'read_state/message_read_state.dart';
+import 'read_state/read_state_format.dart';
+import 'read_state/read_state_provider.dart';
 import 'thread_detail_page.dart';
+import 'thread_follows/thread_follows_provider.dart';
 import 'timeline_message.dart';
 
-const quickEmojis = [
-  '\u{1F44D}',
-  '\u{2764}\u{FE0F}',
-  '\u{1F602}',
-  '\u{1F389}',
-  '\u{1F440}',
-  '\u{1F64F}',
-];
+const quickEmojis = ['\u{1F44D}', '\u{2764}\u{FE0F}', '\u{1F602}', '\u{1F389}'];
+
+/// Preview length for reminder targets — matches desktop's
+/// `msg.body.slice(0, 100)`.
+const _reminderPreviewLength = 100;
 
 void showMessageActions({
   required BuildContext context,
@@ -30,6 +44,146 @@ void showMessageActions({
   String? currentPubkey,
   bool isMember = false,
   bool isArchived = false,
+}) {
+  showModalBottomSheet<void>(
+    context: context,
+    isScrollControlled: true,
+    showDragHandle: true,
+    builder: (sheetContext) => SafeArea(
+      child: ConstrainedBox(
+        constraints: BoxConstraints(
+          maxHeight: MediaQuery.sizeOf(sheetContext).height * 0.7,
+        ),
+        child: SingleChildScrollView(
+          child: Padding(
+            padding: const EdgeInsets.fromLTRB(
+              Grid.gutter,
+              0,
+              Grid.gutter,
+              Grid.xs,
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                // Quick emoji row
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    for (final emoji in quickEmojis)
+                      _QuickReactionCircle(
+                        onTap: () {
+                          Navigator.of(sheetContext).pop();
+                          ref
+                              .read(channelActionsProvider)
+                              .addReaction(message.id, emoji);
+                        },
+                        child: Text(
+                          emoji,
+                          style: const TextStyle(fontSize: 24),
+                        ),
+                      ),
+                    _QuickReactionCircle(
+                      onTap: () {
+                        Navigator.of(sheetContext).pop();
+                        showEmojiPicker(
+                          context: context,
+                          onSelect: (emoji) {
+                            ref
+                                .read(channelActionsProvider)
+                                .addReaction(message.id, emoji);
+                          },
+                        );
+                      },
+                      child: Icon(
+                        LucideIcons.plus,
+                        size: 24,
+                        color: sheetContext.colors.onSurfaceVariant,
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: Grid.xs),
+                if (!message.isSystem) ...[
+                  // Fast actions: respond now, hand off context, defer.
+                  _FastActionsRow(
+                    message: message,
+                    channelId: channelId,
+                    allMessages: allMessages,
+                    currentPubkey: currentPubkey,
+                    isMember: isMember,
+                    isArchived: isArchived,
+                    pageContext: context,
+                  ),
+                  const SizedBox(height: Grid.xs),
+                  // Triage: come back to this message later.
+                  _MarkReadUnreadTile(message: message, channelId: channelId),
+                  _FollowThreadTile(message: message),
+                  const SheetDivider(),
+                  // Export: take the content out of the conversation.
+                  ListTile(
+                    leading: const Icon(LucideIcons.copy),
+                    title: const Text('Copy text'),
+                    onTap: () {
+                      Navigator.of(sheetContext).pop();
+                      // Copy to clipboard
+                      final data = ClipboardData(text: message.content);
+                      Clipboard.setData(data);
+                    },
+                  ),
+                ],
+                if (canManageMessage) ...[
+                  if (!message.isSystem) const SheetDivider(),
+                  ListTile(
+                    leading: const Icon(LucideIcons.pencil),
+                    title: const Text('Edit message'),
+                    onTap: () {
+                      Navigator.of(sheetContext).pop();
+                      _showEditSheet(
+                        context: context,
+                        ref: ref,
+                        message: message,
+                        channelId: channelId,
+                      );
+                    },
+                  ),
+                  ListTile(
+                    leading: Icon(
+                      LucideIcons.trash2,
+                      color: sheetContext.colors.error,
+                    ),
+                    title: Text(
+                      'Delete message',
+                      style: TextStyle(color: sheetContext.colors.error),
+                    ),
+                    onTap: () {
+                      Navigator.of(sheetContext).pop();
+                      _confirmDelete(
+                        context: context,
+                        ref: ref,
+                        channelId: channelId,
+                        messageId: message.id,
+                      );
+                    },
+                  ),
+                ],
+              ],
+            ),
+          ),
+        ),
+      ),
+    ),
+  );
+}
+
+/// Image-focused actions shown from the full-screen viewer.
+void showImageActions({
+  required BuildContext context,
+  required WidgetRef ref,
+  required TimelineMessage message,
+  required String channelId,
+  required String imageUrl,
+  required bool canManageMessage,
+  VoidCallback? onDeleted,
 }) {
   showModalBottomSheet<void>(
     context: context,
@@ -45,104 +199,42 @@ void showMessageActions({
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            // Quick emoji row
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-              children: [
-                for (final emoji in quickEmojis)
-                  GestureDetector(
-                    onTap: () {
-                      Navigator.of(sheetContext).pop();
-                      ref
-                          .read(channelActionsProvider)
-                          .addReaction(message.id, emoji);
-                    },
-                    child: Container(
-                      width: 44,
-                      height: 44,
-                      alignment: Alignment.center,
-                      decoration: BoxDecoration(
-                        color: sheetContext.colors.surfaceContainerHighest,
-                        shape: BoxShape.circle,
-                      ),
-                      child: Text(emoji, style: const TextStyle(fontSize: 20)),
-                    ),
-                  ),
-                GestureDetector(
-                  onTap: () {
-                    Navigator.of(sheetContext).pop();
-                    showEmojiPicker(
-                      context: context,
-                      onSelect: (emoji) {
-                        ref
-                            .read(channelActionsProvider)
-                            .addReaction(message.id, emoji);
-                      },
-                    );
-                  },
-                  child: Container(
-                    width: 44,
-                    height: 44,
-                    alignment: Alignment.center,
-                    decoration: BoxDecoration(
-                      color: sheetContext.colors.surfaceContainerHighest,
-                      shape: BoxShape.circle,
-                    ),
-                    child: Icon(
-                      LucideIcons.plus,
-                      size: 20,
-                      color: sheetContext.colors.onSurfaceVariant,
-                    ),
-                  ),
-                ),
-              ],
+            ListTile(
+              leading: const Icon(LucideIcons.download),
+              title: const Text('Save image'),
+              onTap: () {
+                Navigator.of(sheetContext).pop();
+                unawaited(_saveImage(context, ref, imageUrl));
+              },
+            ),
+            ListTile(
+              leading: const Icon(LucideIcons.share2),
+              title: const Text('Share image'),
+              onTap: () {
+                final renderBox = context.findRenderObject() as RenderBox?;
+                final shareOrigin = renderBox == null
+                    ? null
+                    : renderBox.localToGlobal(Offset.zero) & renderBox.size;
+                Navigator.of(sheetContext).pop();
+                unawaited(
+                  _shareImage(context, ref, imageUrl, shareOrigin: shareOrigin),
+                );
+              },
+            ),
+            ListTile(
+              leading: const Icon(LucideIcons.link2),
+              title: const Text('Copy image link'),
+              onTap: () {
+                Navigator.of(sheetContext).pop();
+                copyToClipboard(
+                  context,
+                  imageUrl,
+                  message: 'Image link copied',
+                );
+              },
             ),
-            const SizedBox(height: Grid.xs),
-            if (allMessages != null && !message.isSystem)
-              ListTile(
-                leading: const Icon(LucideIcons.messageSquareReply),
-                title: const Text('Reply in thread'),
-                onTap: () {
-                  Navigator.of(sheetContext).pop();
-                  Navigator.of(context).push(
-                    MaterialPageRoute<void>(
-                      builder: (_) => ThreadDetailPage(
-                        threadHead: message,
-                        allMessages: allMessages,
-                        channelId: channelId,
-                        currentPubkey: currentPubkey,
-                        isMember: isMember,
-                        isArchived: isArchived,
-                      ),
-                    ),
-                  );
-                },
-              ),
-            if (!message.isSystem)
-              ListTile(
-                leading: const Icon(LucideIcons.copy),
-                title: const Text('Copy text'),
-                onTap: () {
-                  Navigator.of(sheetContext).pop();
-                  // Copy to clipboard
-                  final data = ClipboardData(text: message.content);
-                  Clipboard.setData(data);
-                },
-              ),
             if (canManageMessage) ...[
-              ListTile(
-                leading: const Icon(LucideIcons.pencil),
-                title: const Text('Edit message'),
-                onTap: () {
-                  Navigator.of(sheetContext).pop();
-                  _showEditSheet(
-                    context: context,
-                    ref: ref,
-                    message: message,
-                    channelId: channelId,
-                  );
-                },
-              ),
+              const SheetDivider(),
               ListTile(
                 leading: Icon(
                   LucideIcons.trash2,
@@ -159,6 +251,7 @@ void showMessageActions({
                     ref: ref,
                     channelId: channelId,
                     messageId: message.id,
+                    onDeleted: onDeleted,
                   );
                 },
               ),
@@ -170,6 +263,383 @@ void showMessageActions({
   );
 }
 
+@immutable
+class _DownloadedImage {
+  final Uint8List bytes;
+  final String filename;
+
+  const _DownloadedImage({required this.bytes, required this.filename});
+}
+
+Future<_DownloadedImage> _downloadImage(WidgetRef ref, String imageUrl) async {
+  final response = await ref
+      .read(mediaHttpClientProvider)
+      .get(
+        Uri.parse(imageUrl),
+        headers: ref.read(mediaGetAuthServiceProvider).headersFor(imageUrl),
+      );
+  if (response.statusCode < 200 || response.statusCode >= 300) {
+    throw HttpException(
+      'Image download failed (${response.statusCode})',
+      uri: Uri.parse(imageUrl),
+    );
+  }
+  return _DownloadedImage(
+    bytes: response.bodyBytes,
+    filename: downloadedImageFilename(
+      imageUrl,
+      response.headers['content-type'],
+    ),
+  );
+}
+
+/// Returns a safe image filename while preserving supported image formats.
+@visibleForTesting
+String downloadedImageFilename(String imageUrl, String? contentType) {
+  final pathSegments = Uri.tryParse(imageUrl)?.pathSegments;
+  final rawName = pathSegments == null || pathSegments.isEmpty
+      ? ''
+      : pathSegments.last;
+  final safeName = rawName
+      .replaceAll(RegExp(r'[^A-Za-z0-9._-]'), '-')
+      .replaceAll(RegExp(r'-+'), '-');
+  if (RegExp(
+    r'\.(avif|bmp|gif|heic|heif|jpe?g|png|webp)$',
+    caseSensitive: false,
+  ).hasMatch(safeName)) {
+    return safeName;
+  }
+  final extension = switch (contentType?.split(';').first.trim()) {
+    'image/avif' => '.avif',
+    'image/gif' => '.gif',
+    'image/heic' => '.heic',
+    'image/heif' => '.heif',
+    'image/png' => '.png',
+    'image/webp' => '.webp',
+    _ => '.jpg',
+  };
+  return 'buzz-${DateTime.now().millisecondsSinceEpoch}$extension';
+}
+
+Future<void> _saveImage(
+  BuildContext context,
+  WidgetRef ref,
+  String imageUrl,
+) async {
+  final messenger = ScaffoldMessenger.maybeOf(context);
+  try {
+    final needsPhotoLibraryPermission =
+        defaultTargetPlatform == TargetPlatform.iOS ||
+        await requiresLegacyMediaStoragePermission();
+    if (needsPhotoLibraryPermission) {
+      final permission = await PhotoManager.requestPermissionExtend(
+        requestOption: const PermissionRequestOption(
+          iosAccessLevel: IosAccessLevel.addOnly,
+          androidPermission: AndroidPermission(
+            type: RequestType.image,
+            mediaLocation: false,
+          ),
+        ),
+      );
+      if (!permission.isAuth) {
+        throw const FileSystemException(
+          'Photo library permission was not granted.',
+        );
+      }
+    }
+    final image = await _downloadImage(ref, imageUrl);
+    await PhotoManager.editor.saveImage(image.bytes, filename: image.filename);
+    messenger?.showSnackBar(
+      const SnackBar(content: Text('Image saved to Photos')),
+    );
+  } catch (_) {
+    messenger?.showSnackBar(
+      const SnackBar(content: Text('Could not save image')),
+    );
+  }
+}
+
+Future<void> _shareImage(
+  BuildContext context,
+  WidgetRef ref,
+  String imageUrl, {
+  Rect? shareOrigin,
+}) async {
+  final messenger = ScaffoldMessenger.maybeOf(context);
+  try {
+    final image = await _downloadImage(ref, imageUrl);
+    final directory = await getTemporaryDirectory();
+    final file = File(
+      '${directory.path}${Platform.pathSeparator}${image.filename}',
+    );
+    await file.writeAsBytes(image.bytes, flush: true);
+    await SharePlus.instance.share(
+      ShareParams(files: [XFile(file.path)], sharePositionOrigin: shareOrigin),
+    );
+  } catch (_) {
+    messenger?.showSnackBar(
+      const SnackBar(content: Text('Could not share image')),
+    );
+  }
+}
+
+/// Canonical `buzz://message` link for a timeline message, including thread
+/// context when the message is a reply.
+String messageLinkFor({
+  required TimelineMessage message,
+  required String channelId,
+}) {
+  return buildMessageLink(
+    channelId: channelId,
+    messageId: message.id,
+    threadRootId: message.rootId,
+  );
+}
+
+class _MarkReadUnreadTile extends ConsumerWidget {
+  final TimelineMessage message;
+  final String channelId;
+
+  const _MarkReadUnreadTile({required this.message, required this.channelId});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final readState = ref.watch(readStateProvider);
+    if (!readState.isReady) return const SizedBox.shrink();
+
+    final unread = isMessageUnread(
+      readState,
+      channelId: channelId,
+      messageId: message.id,
+      createdAt: message.createdAt,
+      threadRootId: message.rootId,
+    );
+
+    return ListTile(
+      leading: Icon(unread ? LucideIcons.mailCheck : LucideIcons.mailOpen),
+      title: Text(unread ? 'Mark read' : 'Mark unread'),
+      onTap: () {
+        Navigator.of(context).pop();
+        final notifier = ref.read(readStateProvider.notifier);
+        if (unread) {
+          // Advances the `msg:` marker and clears this message's own forced
+          // flag — a channel-level forced unread (channel tile) is a separate
+          // choice and stays untouched.
+          notifier.markContextRead(
+            msgContextKey(message.id),
+            message.createdAt,
+          );
+        } else {
+          // Read markers are monotonic and cannot move backward, so mark
+          // unread forces this message unread locally (session-local, does
+          // not survive relaunch). The channel surfaces it as unread too.
+          notifier.markContextUnread(
+            msgContextKey(message.id),
+            channelId: channelId,
+          );
+        }
+      },
+    );
+  }
+}
+
+class _FollowThreadTile extends ConsumerWidget {
+  final TimelineMessage message;
+
+  const _FollowThreadTile({required this.message});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final follows = ref.watch(threadFollowsProvider);
+    // Follow acts on the effective thread root: the root for replies, the
+    // message itself for potential thread heads (matches desktop).
+    final rootId = message.rootId ?? message.id;
+    final following = follows.isFollowing(rootId);
+
+    return ListTile(
+      leading: Icon(following ? LucideIcons.bellOff : LucideIcons.bellRing),
+      title: Text(following ? 'Unfollow thread' : 'Follow thread'),
+      onTap: () {
+        Navigator.of(context).pop();
+        final notifier = ref.read(threadFollowsProvider.notifier);
+        if (following) {
+          notifier.unfollowThread(rootId);
+        } else {
+          notifier.followThread(rootId);
+        }
+      },
+    );
+  }
+}
+
+/// Promoted actions for the three dominant mobile jobs: respond now (Reply),
+/// hand off context (Copy link — the `buzz://message` link is the workspace's
+/// context-transfer primitive), and defer (Remind me).
+class _FastActionsRow extends ConsumerWidget {
+  final TimelineMessage message;
+  final String channelId;
+  final List<TimelineMessage>? allMessages;
+  final String? currentPubkey;
+  final bool isMember;
+  final bool isArchived;
+
+  /// The long-pressed message's page context — survives the sheet pop, used
+  /// for the thread push and the copy-link snackbar.
+  final BuildContext pageContext;
+
+  const _FastActionsRow({
+    required this.message,
+    required this.channelId,
+    required this.allMessages,
+    required this.currentPubkey,
+    required this.isMember,
+    required this.isArchived,
+    required this.pageContext,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final messages = allMessages;
+    final canRemind = ref.watch(reminderServiceProvider) != null;
+
+    final tiles = <Widget>[
+      if (messages != null)
+        _FastActionTile(
+          icon: LucideIcons.messageSquareReply,
+          label: 'Reply',
+          onTap: () {
+            Navigator.of(context).pop();
+            Navigator.of(pageContext).push(
+              MaterialPageRoute<void>(
+                builder: (_) => ThreadDetailPage(
+                  threadHead: message,
+                  allMessages: messages,
+                  channelId: channelId,
+                  currentPubkey: currentPubkey,
+                  isMember: isMember,
+                  isArchived: isArchived,
+                ),
+              ),
+            );
+          },
+        ),
+      _FastActionTile(
+        icon: LucideIcons.link2,
+        label: 'Copy link',
+        onTap: () {
+          Navigator.of(context).pop();
+          copyToClipboard(
+            pageContext,
+            messageLinkFor(message: message, channelId: channelId),
+            message: 'Message link copied',
+          );
+        },
+      ),
+      if (canRemind)
+        _FastActionTile(
+          icon: LucideIcons.clock,
+          label: 'Remind me',
+          onTap: () {
+            final rootContext = Navigator.of(
+              context,
+              rootNavigator: true,
+            ).context;
+            Navigator.of(context).pop();
+            showRemindMeLaterSheet(
+              context: rootContext,
+              ref: ref,
+              target: ReminderTarget(
+                eventId: message.id,
+                channelId: channelId,
+                preview: message.content.characters
+                    .take(_reminderPreviewLength)
+                    .toString(),
+                authorPubkey: message.pubkey,
+              ),
+            );
+          },
+        ),
+    ];
+
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      children: tiles,
+    );
+  }
+}
+
+class _FastActionTile extends StatelessWidget {
+  final IconData icon;
+  final String label;
+  final VoidCallback onTap;
+
+  const _FastActionTile({
+    required this.icon,
+    required this.label,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onTap,
+      behavior: HitTestBehavior.opaque,
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          // Pill-shaped icon container with the caption below the fill,
+          // matching the emoji circles' fill and tap treatment.
+          Container(
+            width: 76,
+            height: 56,
+            alignment: Alignment.center,
+            decoration: BoxDecoration(
+              color: context.colors.surfaceContainerHighest,
+              borderRadius: BorderRadius.circular(Radii.dialog),
+            ),
+            child: Icon(icon, size: 24, color: context.colors.onSurface),
+          ),
+          const SizedBox(height: Grid.xxs),
+          Text(
+            label,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: context.textTheme.labelMedium?.copyWith(
+              color: context.colors.onSurface,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// Circular filled tap target shared by the quick-reaction emojis and the
+/// "+" emoji-picker tile — one treatment, one place to change it.
+class _QuickReactionCircle extends StatelessWidget {
+  final VoidCallback onTap;
+  final Widget child;
+
+  const _QuickReactionCircle({required this.onTap, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onTap,
+      child: Container(
+        width: 52,
+        height: 52,
+        alignment: Alignment.center,
+        decoration: BoxDecoration(
+          color: context.colors.surfaceContainerHighest,
+          shape: BoxShape.circle,
+        ),
+        child: child,
+      ),
+    );
+  }
+}
+
 void _showEditSheet({
   required BuildContext context,
   required WidgetRef ref,
@@ -242,6 +712,7 @@ void _confirmDelete({
   required WidgetRef ref,
   required String channelId,
   required String messageId,
+  VoidCallback? onDeleted,
 }) {
   showDialog<void>(
     context: context,
@@ -254,17 +725,19 @@ void _confirmDelete({
           child: const Text('Cancel'),
         ),
         FilledButton(
-          onPressed: () {
+          onPressed: () async {
             Navigator.of(dialogContext).pop();
             final messenger = ScaffoldMessenger.of(context);
-            ref
-                .read(channelActionsProvider)
-                .deleteMessage(channelId: channelId, eventId: messageId)
-                .catchError((Object error) {
-                  messenger.showSnackBar(
-                    SnackBar(content: Text('Failed to delete message: $error')),
-                  );
-                });
+            try {
+              await ref
+                  .read(channelActionsProvider)
+                  .deleteMessage(channelId: channelId, eventId: messageId);
+              onDeleted?.call();
+            } catch (error) {
+              messenger.showSnackBar(
+                SnackBar(content: Text('Failed to delete message: $error')),
+              );
+            }
           },
           style: FilledButton.styleFrom(
             backgroundColor: dialogContext.colors.error,
diff --git a/mobile/lib/features/channels/message_content.dart b/mobile/lib/features/channels/message_content.dart
index 1dc892acfd..664594ade7 100644
--- a/mobile/lib/features/channels/message_content.dart
+++ b/mobile/lib/features/channels/message_content.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 import 'dart:math' as math;
 
@@ -15,12 +16,14 @@ import '../../shared/clipboard_utils.dart';
 import '../../shared/relay/relay.dart';
 import '../../shared/syntax_highlight.dart';
 import '../../shared/theme/theme.dart';
-import '../custom_emoji/custom_emoji.dart';
-import '../custom_emoji/custom_emoji_provider.dart';
-import '../custom_emoji/custom_emoji_render.dart';
+import '../../shared/custom_emoji/custom_emoji.dart';
+import '../../shared/custom_emoji/custom_emoji_provider.dart';
+import '../../shared/custom_emoji/custom_emoji_render.dart';
 import 'media_viewer_page.dart';
 import 'message_media.dart';
 
+part 'message_content/media_carousel.dart';
+
 const _messageMediaMaxInlineWidth = 320.0;
 const _messageMediaMaxImageHeight = 240.0;
 
@@ -92,10 +95,25 @@ class MessageContent extends HookConsumerWidget {
   /// mentioned user's pubkey.
   final void Function(String pubkey)? onMentionTap;
 
+  /// Opens the message's thread from the full-screen image viewer.
+  final VoidCallback? onMediaReply;
+
+  /// Opens message-specific actions for an image in the full-screen viewer.
+  final MediaViewerMoreAction? onMediaMore;
+
   final TextStyle? baseStyle;
 
   final int? maxLines;
 
+  /// Allows a multi-image carousel to reclaim leading space reserved by the
+  /// surrounding message layout, while keeping its image count aligned with
+  /// the message body.
+  final double mediaCarouselLeadingOverflow;
+
+  /// Allows a multi-image carousel to continue through the trailing page
+  /// gutter while keeping its first image and count aligned with the body.
+  final double mediaCarouselTrailingOverflow;
+
   const MessageContent({
     super.key,
     required this.content,
@@ -105,8 +123,12 @@ class MessageContent extends HookConsumerWidget {
     this.tags = const [],
     this.onChannelTap,
     this.onMentionTap,
+    this.onMediaReply,
+    this.onMediaMore,
     this.baseStyle,
     this.maxLines,
+    this.mediaCarouselLeadingOverflow = 0,
+    this.mediaCarouselTrailingOverflow = 0,
   });
 
   @override
@@ -115,6 +137,10 @@ class MessageContent extends HookConsumerWidget {
         baseStyle ??
         context.textTheme.bodyMedium?.copyWith(color: context.colors.onSurface);
     final imetaByUrl = parseImetaTags(tags);
+    final trailingGallery = maxLines == null
+        ? _extractTrailingImageGallery(content, imetaByUrl)
+        : null;
+    final markdownContent = trailingGallery?.content ?? content;
     final customEmoji = _mergeCustomEmoji(
       customEmojiFromTags(tags),
       ref.watch(customEmojiListProvider),
@@ -124,7 +150,7 @@ class MessageContent extends HookConsumerWidget {
       // Convert autolinks and bare URLs to standard markdown links,
       // but skip content inside backticks (inline code / fenced blocks).
       final buffer = StringBuffer();
-      final parts = content.split('`');
+      final parts = markdownContent.split('`');
       for (var i = 0; i < parts.length; i++) {
         if (i.isOdd) {
           // Inside backticks — preserve as-is.
@@ -186,9 +212,9 @@ class MessageContent extends HookConsumerWidget {
         result = '\u200B$result';
       }
       return result;
-    }, [content, mentionNames]);
+    }, [markdownContent, mentionNames]);
 
-    return GptMarkdown(
+    final markdown = GptMarkdown(
       finalContent,
       style: style,
       followLinkColor: false,
@@ -210,6 +236,25 @@ class MessageContent extends HookConsumerWidget {
         ...MarkdownComponent.inlineComponents,
       ],
     );
+    if (trailingGallery == null) return markdown;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        if (trailingGallery.content.trim().isNotEmpty) markdown,
+        _MessageImageCarousel(
+          key: ValueKey(
+            trailingGallery.items.map((item) => item.url).join('\u0000'),
+          ),
+          items: trailingGallery.items,
+          leadingOverflow: mediaCarouselLeadingOverflow,
+          trailingOverflow: mediaCarouselTrailingOverflow,
+          onReply: onMediaReply,
+          onMore: onMediaMore,
+        ),
+      ],
+    );
   }
 
   Widget _buildMedia(BuildContext context, String imageUrl, ImetaEntry? imeta) {
@@ -221,6 +266,8 @@ class MessageContent extends HookConsumerWidget {
       url: imageUrl,
       imeta: imeta,
       semanticLabel: imeta?.alt ?? 'Message image',
+      onReply: onMediaReply,
+      onMore: onMediaMore,
     );
   }
 
@@ -298,17 +345,22 @@ class _MessageImagePreview extends HookConsumerWidget {
   final String url;
   final ImetaEntry? imeta;
   final String semanticLabel;
+  final VoidCallback? onReply;
+  final MediaViewerMoreAction? onMore;
 
   const _MessageImagePreview({
     required this.url,
     required this.imeta,
     required this.semanticLabel,
+    required this.onReply,
+    required this.onMore,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final heroTag = useMemoized(() => Object());
     final layout = _resolveImagePreviewLayout(context, imeta?.aspectRatio);
+    final previewDecodeWidth = layout.width ?? _messageMediaMaxWidth(context);
 
     return Padding(
       padding: const EdgeInsets.only(top: Grid.half),
@@ -318,6 +370,10 @@ class _MessageImagePreview extends HookConsumerWidget {
           imageUrl: url,
           heroTag: heroTag,
           semanticLabel: semanticLabel,
+          previewDecodeWidth: previewDecodeWidth,
+          aspectRatio: imeta?.aspectRatio,
+          onReply: onReply,
+          onMore: onMore,
         ),
         child: _MessageMediaPreviewFrame(
           previewKey: ValueKey('message-media-image-preview:$url'),
@@ -325,15 +381,19 @@ class _MessageImagePreview extends HookConsumerWidget {
           width: layout.width,
           height: layout.height,
           constraints: layout.constraints,
-          child: Hero(
+          child: MediaViewerHero(
             tag: heroTag,
-            child: MediaImage(
-              url: url,
-              fit: layout.fit,
-              semanticLabel: semanticLabel,
-              errorBuilder: (_, _, _) => _MediaPreviewFallback(
-                icon: LucideIcons.imageOff,
-                label: 'Image unavailable',
+            child: ClipRRect(
+              borderRadius: BorderRadius.circular(Radii.md),
+              child: MediaImage(
+                url: url,
+                decodeWidth: previewDecodeWidth,
+                fit: layout.fit,
+                semanticLabel: semanticLabel,
+                errorBuilder: (_, _, _) => _MediaPreviewFallback(
+                  icon: LucideIcons.imageOff,
+                  label: 'Image unavailable',
+                ),
               ),
             ),
           ),
diff --git a/mobile/lib/features/channels/message_content/media_carousel.dart b/mobile/lib/features/channels/message_content/media_carousel.dart
new file mode 100644
index 0000000000..545adba36c
--- /dev/null
+++ b/mobile/lib/features/channels/message_content/media_carousel.dart
@@ -0,0 +1,302 @@
+part of '../message_content.dart';
+
+const _messageMediaCarouselHeight = 220.0;
+
+@immutable
+class _MessageGalleryItem {
+  final String url;
+  final String semanticLabel;
+  final double? aspectRatio;
+
+  const _MessageGalleryItem({
+    required this.url,
+    required this.semanticLabel,
+    required this.aspectRatio,
+  });
+}
+
+@immutable
+class _TrailingImageGallery {
+  final String content;
+  final List<_MessageGalleryItem> items;
+
+  const _TrailingImageGallery({required this.content, required this.items});
+}
+
+class _MessageGalleryPrecache extends HookWidget {
+  final List<ImageProvider<Object>> providers;
+  final int focusedIndex;
+
+  const _MessageGalleryPrecache({
+    required this.providers,
+    required this.focusedIndex,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final providerSignature = Object.hashAll(providers);
+    useEffect(() {
+      var cancelled = false;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (cancelled || !context.mounted) {
+          return;
+        }
+        for (var index = focusedIndex - 2; index <= focusedIndex + 2; index++) {
+          if (index < 0 || index >= providers.length) {
+            continue;
+          }
+          unawaited(
+            precacheImage(providers[index], context, onError: (_, _) {}),
+          );
+        }
+      });
+      return () => cancelled = true;
+    }, [focusedIndex, providerSignature]);
+    return const SizedBox.shrink();
+  }
+}
+
+_TrailingImageGallery? _extractTrailingImageGallery(
+  String content,
+  Map<String, ImetaEntry> imetaByUrl,
+) {
+  final lines = content.split('\n');
+  var cursor = lines.length - 1;
+  while (cursor >= 0 && lines[cursor].trim().isEmpty) {
+    cursor -= 1;
+  }
+
+  final items = <_MessageGalleryItem>[];
+  final imagePattern = RegExp(r'^!\[([^\]]*)\]\((https?://[^)\s]+)\)$');
+  while (cursor >= 0) {
+    final match = imagePattern.firstMatch(lines[cursor].trim());
+    if (match == null) break;
+    final url = match.group(2)!;
+    final imeta = imetaByUrl[url];
+    if (classifyMediaUrl(url, imeta: imeta) == MessageMediaKind.video) {
+      break;
+    }
+    final markdownLabel = match.group(1)?.trim();
+    items.insert(
+      0,
+      _MessageGalleryItem(
+        url: url,
+        semanticLabel:
+            imeta?.alt ??
+            (markdownLabel?.isNotEmpty == true
+                ? markdownLabel!
+                : 'Message image'),
+        aspectRatio: imeta?.aspectRatio,
+      ),
+    );
+    cursor -= 1;
+  }
+
+  if (items.length < 2) return null;
+  return _TrailingImageGallery(
+    content: lines.take(cursor + 1).join('\n').trimRight(),
+    items: items,
+  );
+}
+
+class _MessageImageCarousel extends HookConsumerWidget {
+  final List<_MessageGalleryItem> items;
+  final double leadingOverflow;
+  final double trailingOverflow;
+  final VoidCallback? onReply;
+  final MediaViewerMoreAction? onMore;
+
+  const _MessageImageCarousel({
+    super.key,
+    required this.items,
+    required this.leadingOverflow,
+    required this.trailingOverflow,
+    required this.onReply,
+    required this.onMore,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final itemSignature = items.map((item) => item.url).join('\u0000');
+    final heroTags = useMemoized(
+      () => [for (var index = 0; index < items.length; index++) Object()],
+      [itemSignature],
+    );
+    final controller = usePageController(viewportFraction: 0.9);
+    final currentIndex = useState(0);
+    final mediaAuth = ref.watch(mediaGetAuthServiceProvider);
+    final mediaClient = ref.watch(mediaHttpClientProvider);
+
+    return Padding(
+      padding: const EdgeInsets.only(top: Grid.half),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(
+            '${items.length} images',
+            key: const ValueKey('message-media-carousel-count'),
+            style: context.textTheme.labelMedium?.copyWith(
+              color: context.colors.onSurfaceVariant,
+              fontWeight: FontWeight.w400,
+            ),
+          ),
+          const SizedBox(height: Grid.half + Grid.quarter),
+          LayoutBuilder(
+            builder: (context, constraints) {
+              final contentWidth = constraints.hasBoundedWidth
+                  ? constraints.maxWidth
+                  : _messageMediaMaxWidth(context);
+              final carouselWidth =
+                  contentWidth + leadingOverflow + trailingOverflow;
+              final leadingExtent = leadingOverflow;
+              final isLeftToRight =
+                  Directionality.of(context) == TextDirection.ltr;
+              final itemTrailingPaddings = [
+                for (var index = 0; index < items.length; index++)
+                  index == items.length - 1 ? Grid.gutter : Grid.half,
+              ];
+              final previewDecodeWidths = [
+                for (var index = 0; index < items.length; index++)
+                  math.max(
+                    1.0,
+                    carouselWidth * controller.viewportFraction -
+                        itemTrailingPaddings[index],
+                  ),
+              ];
+              final devicePixelRatio = MediaQuery.devicePixelRatioOf(context);
+              final previewProviders = [
+                for (var index = 0; index < items.length; index++)
+                  ResizeImage.resizeIfNeeded(
+                    (previewDecodeWidths[index] * devicePixelRatio).ceil(),
+                    null,
+                    MediaImageProvider(
+                      url: items[index].url,
+                      auth: mediaAuth,
+                      client: mediaClient,
+                    ),
+                  ),
+              ];
+              final viewerItems = [
+                for (var index = 0; index < items.length; index++)
+                  MediaViewerImage(
+                    url: items[index].url,
+                    heroTag: heroTags[index],
+                    semanticLabel: items[index].semanticLabel,
+                    previewDecodeWidth: previewDecodeWidths[index],
+                    aspectRatio: items[index].aspectRatio,
+                    preloadProvider: previewProviders[index],
+                  ),
+              ];
+              final carousel = SizedBox(
+                key: const ValueKey('message-media-carousel'),
+                width: carouselWidth,
+                height: _messageMediaCarouselHeight,
+                child: PageView.builder(
+                  controller: controller,
+                  allowImplicitScrolling: true,
+                  // Keep the first image aligned with the message body, but
+                  // allow later pages to paint through the avatar gutter as
+                  // the row scrolls.
+                  clipBehavior: Clip.none,
+                  padEnds: false,
+                  itemCount: items.length,
+                  onPageChanged: (index) => currentIndex.value = index,
+                  itemBuilder: (context, index) {
+                    final item = items[index];
+                    return Padding(
+                      key: ValueKey('message-media-carousel-page:${item.url}'),
+                      padding: EdgeInsetsDirectional.only(
+                        end: itemTrailingPaddings[index],
+                      ),
+                      child: Semantics(
+                        button: true,
+                        excludeSemantics: true,
+                        label: 'Open ${item.semanticLabel}',
+                        child: GestureDetector(
+                          key: ValueKey(
+                            'message-media-carousel-item:${item.url}',
+                          ),
+                          onTap: () => openImageViewer(
+                            context,
+                            imageUrl: item.url,
+                            heroTag: heroTags[index],
+                            semanticLabel: item.semanticLabel,
+                            previewDecodeWidth: previewDecodeWidths[index],
+                            aspectRatio: item.aspectRatio,
+                            galleryItems: viewerItems,
+                            initialIndex: index,
+                            onReply: onReply,
+                            onMore: onMore,
+                          ),
+                          child: Container(
+                            clipBehavior: Clip.antiAlias,
+                            decoration: BoxDecoration(
+                              color: context.colors.surfaceContainerHighest,
+                              borderRadius: BorderRadius.circular(Radii.md),
+                              border: Border.all(
+                                color: context.colors.outlineVariant,
+                              ),
+                            ),
+                            child: MediaViewerHero(
+                              tag: heroTags[index],
+                              child: ClipRRect(
+                                borderRadius: BorderRadius.circular(Radii.md),
+                                child: MediaImage(
+                                  url: item.url,
+                                  decodeWidth: previewDecodeWidths[index],
+                                  fit: BoxFit.cover,
+                                  semanticLabel: item.semanticLabel,
+                                  errorBuilder: (_, _, _) =>
+                                      const _MediaPreviewFallback(
+                                        icon: LucideIcons.imageOff,
+                                        label: 'Image unavailable',
+                                      ),
+                                ),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    );
+                  },
+                ),
+              );
+
+              final carouselSurface = Stack(
+                clipBehavior: Clip.none,
+                children: [
+                  carousel,
+                  _MessageGalleryPrecache(
+                    providers: previewProviders,
+                    focusedIndex: currentIndex.value,
+                  ),
+                ],
+              );
+
+              if (leadingExtent <= 0 && trailingOverflow <= 0) {
+                return carouselSurface;
+              }
+              return SizedBox(
+                width: contentWidth,
+                height: _messageMediaCarouselHeight,
+                child: OverflowBox(
+                  alignment: AlignmentDirectional.centerStart,
+                  minWidth: carouselWidth,
+                  maxWidth: carouselWidth,
+                  child: Transform.translate(
+                    offset: Offset(
+                      isLeftToRight ? -leadingExtent : leadingExtent,
+                      0,
+                    ),
+                    child: carouselSurface,
+                  ),
+                ),
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/channels/pending_local_messages_provider.dart b/mobile/lib/features/channels/pending_local_messages_provider.dart
new file mode 100644
index 0000000000..064b862022
--- /dev/null
+++ b/mobile/lib/features/channels/pending_local_messages_provider.dart
@@ -0,0 +1,42 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../../shared/relay/relay.dart';
+
+/// Signed local messages whose publish has not yet been corroborated by an
+/// authoritative relay EVENT or query result.
+class PendingLocalMessagesNotifier extends Notifier<Map<String, NostrEvent>> {
+  final String channelId;
+
+  PendingLocalMessagesNotifier(this.channelId);
+
+  @override
+  Map<String, NostrEvent> build() => const {};
+
+  void add(NostrEvent event) {
+    state = {...state, event.id: event};
+  }
+
+  NostrEvent? take(String eventId) {
+    final event = state[eventId];
+    if (event == null) return null;
+    final next = {...state}..remove(eventId);
+    state = next;
+    return event;
+  }
+
+  void confirm(Iterable<String> eventIds) {
+    final confirmed = eventIds.toSet();
+    if (!state.keys.any(confirmed.contains)) return;
+    state = {
+      for (final entry in state.entries)
+        if (!confirmed.contains(entry.key)) entry.key: entry.value,
+    };
+  }
+}
+
+final pendingLocalMessagesProvider =
+    NotifierProvider.family<
+      PendingLocalMessagesNotifier,
+      Map<String, NostrEvent>,
+      String
+    >(PendingLocalMessagesNotifier.new);
diff --git a/mobile/lib/features/channels/photo_library.dart b/mobile/lib/features/channels/photo_library.dart
new file mode 100644
index 0000000000..8a01de01e0
--- /dev/null
+++ b/mobile/lib/features/channels/photo_library.dart
@@ -0,0 +1,104 @@
+import 'package:flutter/foundation.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:photo_manager/photo_manager.dart';
+
+const _recentPhotoCount = 30;
+const _photoPermissionRequest = PermissionRequestOption(
+  androidPermission: AndroidPermission(
+    type: RequestType.image,
+    mediaLocation: false,
+  ),
+);
+
+/// A recent photo exposed to Buzz's compact in-composer gallery.
+@immutable
+class RecentPhoto {
+  /// The platform photo-library identifier.
+  final String id;
+
+  /// Thumbnail bytes sized for the compact picker grid.
+  final Uint8List thumbnailBytes;
+
+  /// Creates a recent photo value.
+  const RecentPhoto({required this.id, required this.thumbnailBytes});
+}
+
+/// Reads recent photos and resolves selected library assets to uploadable files.
+abstract interface class PhotoLibrary {
+  /// Requests access when needed and returns the newest visible photos.
+  Future<List<RecentPhoto>> loadRecentPhotos();
+
+  /// Resolves selected photos in the supplied selection order.
+  Future<List<XFile>> resolveSelectedPhotos(List<RecentPhoto> photos);
+}
+
+/// Indicates that the compact gallery cannot read the device photo library.
+class PhotoLibraryAccessException implements Exception {
+  /// Creates a photo-library access error.
+  const PhotoLibraryAccessException();
+
+  @override
+  String toString() => 'Photo access is turned off for Buzz.';
+}
+
+/// Provides the device photo library. Tests can override this with fixtures.
+final photoLibraryProvider = Provider<PhotoLibrary>(
+  (ref) => const DevicePhotoLibrary(),
+);
+
+/// The device-backed implementation of [PhotoLibrary].
+class DevicePhotoLibrary implements PhotoLibrary {
+  /// Creates the device photo library.
+  const DevicePhotoLibrary();
+
+  @override
+  Future<List<RecentPhoto>> loadRecentPhotos() async {
+    final permission = await PhotoManager.requestPermissionExtend(
+      requestOption: _photoPermissionRequest,
+    );
+    if (!permission.hasAccess) {
+      throw const PhotoLibraryAccessException();
+    }
+
+    final assets = await PhotoManager.getAssetListPaged(
+      page: 0,
+      pageCount: _recentPhotoCount,
+      type: RequestType.image,
+      filterOption: FilterOptionGroup(
+        imageOption: const FilterOption(needTitle: true),
+        orders: const [
+          OrderOption(type: OrderOptionType.createDate, asc: false),
+        ],
+      ),
+    );
+
+    final loaded = await Future.wait([
+      for (final asset in assets) _loadRecentPhoto(asset),
+    ]);
+    return [for (final photo in loaded) ?photo];
+  }
+
+  Future<RecentPhoto?> _loadRecentPhoto(AssetEntity asset) async {
+    final bytes = await asset.thumbnailDataWithSize(
+      const ThumbnailSize.square(256),
+      quality: 84,
+    );
+    if (bytes == null || bytes.isEmpty) return null;
+    return RecentPhoto(id: asset.id, thumbnailBytes: bytes);
+  }
+
+  @override
+  Future<List<XFile>> resolveSelectedPhotos(List<RecentPhoto> photos) async {
+    final resolved = <XFile>[];
+    for (final photo in photos) {
+      final asset = await AssetEntity.fromId(photo.id);
+      final file = await asset?.file;
+      if (file == null) {
+        throw const PhotoLibraryAccessException();
+      }
+      resolved.add(XFile(file.path, name: asset?.title));
+    }
+    return resolved;
+  }
+}
diff --git a/mobile/lib/features/channels/reaction_row.dart b/mobile/lib/features/channels/reaction_row.dart
index a721ef1988..2f2404ccf7 100644
--- a/mobile/lib/features/channels/reaction_row.dart
+++ b/mobile/lib/features/channels/reaction_row.dart
@@ -4,7 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
-import '../custom_emoji/custom_emoji_render.dart';
+import '../../shared/custom_emoji/custom_emoji_render.dart';
 import '../profile/user_cache_provider.dart';
 import '../profile/user_profile.dart';
 import 'channel_management_provider.dart';
@@ -75,11 +75,10 @@ class ReactionRow extends StatelessWidget {
                       const SizedBox(width: Grid.quarter),
                       Text(
                         '${reaction.count}',
-                        style: context.textTheme.labelSmall?.copyWith(
+                        style: reactionCountTextStyle.copyWith(
                           color: reaction.reactedByCurrentUser
                               ? context.colors.primary
                               : context.colors.onSurfaceVariant,
-                          fontWeight: FontWeight.w600,
                         ),
                       ),
                     ],
diff --git a/mobile/lib/features/channels/read_state/message_read_state.dart b/mobile/lib/features/channels/read_state/message_read_state.dart
new file mode 100644
index 0000000000..7eaecabe60
--- /dev/null
+++ b/mobile/lib/features/channels/read_state/message_read_state.dart
@@ -0,0 +1,44 @@
+import 'read_state_format.dart';
+import 'read_state_provider.dart';
+
+/// Effective read timestamp for a single message: the newest of the channel
+/// marker, the message's own `msg:` marker, and (for thread replies) the
+/// thread's `thread:` marker — the same precedence the unread badge uses via
+/// `observedUnreadEventReadAt`.
+int? effectiveMessageReadAt(
+  ReadStateState readState, {
+  required String channelId,
+  required String messageId,
+  String? threadRootId,
+}) {
+  return maxReadAt([
+    readState.effectiveTimestamp(channelId),
+    readState.effectiveTimestamp(msgContextKey(messageId)),
+    if (threadRootId != null)
+      readState.effectiveTimestamp(threadContextKey(threadRootId)),
+  ]);
+}
+
+/// Whether a message should currently show as unread in the actions menu.
+///
+/// A message-level forced unread (from this menu) wins; otherwise the
+/// timestamp precedence decides. A channel-level forced unread (from the
+/// channel tile) is deliberately not consulted: it is a channel-scoped
+/// choice, and letting it leak in here would make the message-level toggle
+/// unable to round-trip without clearing the channel-level choice.
+bool isMessageUnread(
+  ReadStateState readState, {
+  required String channelId,
+  required String messageId,
+  required int createdAt,
+  String? threadRootId,
+}) {
+  if (readState.isForcedUnread(msgContextKey(messageId))) return true;
+  final readAt = effectiveMessageReadAt(
+    readState,
+    channelId: channelId,
+    messageId: messageId,
+    threadRootId: threadRootId,
+  );
+  return readAt == null || createdAt > readAt;
+}
diff --git a/mobile/lib/features/channels/read_state/read_state_provider.dart b/mobile/lib/features/channels/read_state/read_state_provider.dart
index 07ffc9044a..b82f1af5fd 100644
--- a/mobile/lib/features/channels/read_state/read_state_provider.dart
+++ b/mobile/lib/features/channels/read_state/read_state_provider.dart
@@ -13,14 +13,19 @@ class ReadStateState {
   final String? pubkey;
   final Map<String, int> contexts;
   final int version;
-  final Set<String> locallyForcedChannelIds;
+
+  /// Session-local forced-unread flags, keyed by the forced context id
+  /// (a channel id from the channel tile, or a `msg:` key from the message
+  /// actions sheet), each mapped to the channel it belongs to so channel
+  /// tiles and badges can surface message-level forces.
+  final Map<String, String> forcedUnreadContexts;
 
   const ReadStateState({
     required this.isReady,
     required this.pubkey,
     required this.contexts,
     required this.version,
-    this.locallyForcedChannelIds = const {},
+    this.forcedUnreadContexts = const {},
   });
 
   const ReadStateState.inert()
@@ -28,7 +33,16 @@ class ReadStateState {
       pubkey = null,
       contexts = const {},
       version = 0,
-      locallyForcedChannelIds = const {};
+      forcedUnreadContexts = const {};
+
+  /// Channels that should surface as unread because of a forced-unread flag —
+  /// either forced directly, or containing a forced message.
+  Set<String> get locallyForcedChannelIds =>
+      forcedUnreadContexts.values.toSet();
+
+  /// Whether this exact context (channel id or `msg:` key) is forced unread.
+  bool isForcedUnread(String contextId) =>
+      forcedUnreadContexts.containsKey(contextId);
 
   int? effectiveTimestamp(String contextId) => contexts[contextId];
 
@@ -43,7 +57,7 @@ class ReadStateState {
       pubkey: pubkey,
       contexts: Map.unmodifiable({...contexts, contextId: timestamp}),
       version: version + 1,
-      locallyForcedChannelIds: locallyForcedChannelIds,
+      forcedUnreadContexts: forcedUnreadContexts,
     );
   }
 }
@@ -51,14 +65,14 @@ class ReadStateState {
 class ReadStateNotifier extends Notifier<ReadStateState> {
   ReadStateManager? _manager;
   bool _isInitialized = false;
-  final Set<String> _locallyForcedChannelIds = {};
+  final Map<String, String> _forcedUnreadContexts = {};
 
   @override
   ReadStateState build() {
     _manager?.dispose(flushPending: false);
     _manager = null;
     _isInitialized = false;
-    _locallyForcedChannelIds.clear();
+    _forcedUnreadContexts.clear();
 
     final relayConfig = ref.watch(relayConfigProvider);
     ref.watch(relaySessionProvider);
@@ -130,15 +144,45 @@ class ReadStateNotifier extends Notifier<ReadStateState> {
     return _stateFromManager(manager, isReady: false);
   }
 
-  void markContextRead(String contextId, int unixTimestamp) {
-    _locallyForcedChannelIds.remove(contextId);
+  /// Advance a context's read marker. Clears the forced-unread flag for
+  /// exactly this context, if any. An explicit channel-level "Mark read"
+  /// (channel tile/menu) should pass [clearForcedMessages] so message-level
+  /// forces inside the channel are released too; the automatic read on
+  /// channel open must not, so a message deliberately marked unread stays
+  /// unread until acted on.
+  void markContextRead(
+    String contextId,
+    int unixTimestamp, {
+    bool clearForcedMessages = false,
+  }) {
+    var removed = _forcedUnreadContexts.remove(contextId) != null;
+    if (clearForcedMessages) {
+      final before = _forcedUnreadContexts.length;
+      _forcedUnreadContexts.removeWhere(
+        (_, channelId) => channelId == contextId,
+      );
+      removed = removed || _forcedUnreadContexts.length != before;
+    }
     _manager?.markContextRead(contextId, unixTimestamp);
+    if (removed) {
+      _refreshForcedState();
+    }
   }
 
-  void markContextUnread(String contextId) {
+  /// Force a context unread for the rest of the session. [contextId] is a
+  /// channel id (channel-tile action) or a `msg:` key (message actions
+  /// sheet); [channelId] is the channel the context belongs to, so tiles and
+  /// badges can surface message-level forces. Read markers are monotonic,
+  /// so this is the only way to move a context back to unread.
+  void markContextUnread(String contextId, {required String channelId}) {
+    if (_manager == null) return;
+    _forcedUnreadContexts[contextId] = channelId;
+    _refreshForcedState();
+  }
+
+  void _refreshForcedState() {
     final manager = _manager;
     if (manager == null) return;
-    _locallyForcedChannelIds.add(contextId);
     state = _stateFromManager(
       manager,
       isReady: _isInitialized,
@@ -153,7 +197,9 @@ class ReadStateNotifier extends Notifier<ReadStateState> {
   void _emitManagerState(ReadStateManager manager) {
     if (_manager != manager) return;
     final advances = manager.drainSyncedAdvances();
-    _locallyForcedChannelIds.removeAll(advances);
+    for (final contextId in advances) {
+      _forcedUnreadContexts.remove(contextId);
+    }
     state = _stateFromManager(
       manager,
       isReady: _isInitialized,
@@ -171,8 +217,8 @@ class ReadStateNotifier extends Notifier<ReadStateState> {
       pubkey: manager.pubkey,
       contexts: manager.effectiveContexts,
       version: (previousVersion ?? 0) + 1,
-      locallyForcedChannelIds: Set.unmodifiable(
-        Set<String>.from(_locallyForcedChannelIds),
+      forcedUnreadContexts: Map.unmodifiable(
+        Map<String, String>.from(_forcedUnreadContexts),
       ),
     );
   }
diff --git a/mobile/lib/features/channels/send_message_provider.dart b/mobile/lib/features/channels/send_message_provider.dart
index 1771b05f12..3659bda4bf 100644
--- a/mobile/lib/features/channels/send_message_provider.dart
+++ b/mobile/lib/features/channels/send_message_provider.dart
@@ -4,6 +4,7 @@ import '../../shared/relay/relay.dart';
 import '../channels/channel_management_provider.dart';
 import '../profile/user_cache_provider.dart';
 import '../profile/user_profile.dart';
+import 'channel_messages_provider.dart';
 
 /// Sends messages by signing an event with the user's nsec and publishing it
 /// over the relay's NIP-42-authenticated WebSocket session.
@@ -11,15 +12,25 @@ class SendMessage {
   final SignedEventRelay _signedEventRelay;
   final Future<List<ChannelMember>> Function(String channelId) _fetchMembers;
   final Map<String, UserProfile> Function() _readUserCache;
+  final void Function(String channelId, NostrEvent event) _addLocalMessage;
+  final void Function(String channelId, String eventId) _completeLocalMessage;
+  final void Function(String channelId, String eventId) _removeLocalMessage;
 
   SendMessage({
     required SignedEventRelay signedEventRelay,
     required Future<List<ChannelMember>> Function(String channelId)
     fetchMembers,
     required Map<String, UserProfile> Function() readUserCache,
+    required void Function(String channelId, NostrEvent event) addLocalMessage,
+    required void Function(String channelId, String eventId)
+    completeLocalMessage,
+    required void Function(String channelId, String eventId) removeLocalMessage,
   }) : _signedEventRelay = signedEventRelay,
        _fetchMembers = fetchMembers,
-       _readUserCache = readUserCache;
+       _readUserCache = readUserCache,
+       _addLocalMessage = addLocalMessage,
+       _completeLocalMessage = completeLocalMessage,
+       _removeLocalMessage = removeLocalMessage;
 
   /// Send a text message to a channel.
   ///
@@ -58,11 +69,24 @@ class SendMessage {
       ...mediaTags,
     ];
 
-    await _signedEventRelay.submit(
-      kind: EventKind.streamMessage,
-      content: content,
-      tags: tags,
-    );
+    NostrEvent? localMessage;
+    try {
+      await _signedEventRelay.submit(
+        kind: EventKind.streamMessage,
+        content: content,
+        tags: tags,
+        onSigned: (event) {
+          localMessage = event;
+          _addLocalMessage(channelId, event);
+        },
+      );
+      final event = localMessage;
+      if (event != null) _completeLocalMessage(channelId, event.id);
+    } catch (_) {
+      final event = localMessage;
+      if (event != null) _removeLocalMessage(channelId, event.id);
+      rethrow;
+    }
   }
 
   /// Resolve @mentions to pubkeys, scoped to channel members.
@@ -146,5 +170,14 @@ final sendMessageProvider = Provider<SendMessage>((ref) {
     fetchMembers: (channelId) =>
         ref.read(channelMembersProvider(channelId).future),
     readUserCache: () => ref.read(userCacheProvider),
+    addLocalMessage: (channelId, event) => ref
+        .read(channelMessagesProvider(channelId).notifier)
+        .addLocalMessage(event),
+    completeLocalMessage: (channelId, eventId) => ref
+        .read(channelMessagesProvider(channelId).notifier)
+        .completeLocalMessage(eventId),
+    removeLocalMessage: (channelId, eventId) => ref
+        .read(channelMessagesProvider(channelId).notifier)
+        .removeLocalMessage(eventId),
   );
 });
diff --git a/mobile/lib/features/channels/thread_detail_page.dart b/mobile/lib/features/channels/thread_detail_page.dart
index 94e95b8fe5..e8081f42fe 100644
--- a/mobile/lib/features/channels/thread_detail_page.dart
+++ b/mobile/lib/features/channels/thread_detail_page.dart
@@ -7,10 +7,12 @@ import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
+import '../../shared/widgets/message_author_meta.dart';
 import '../profile/user_cache_provider.dart';
 import '../profile/user_profile.dart';
 import 'channel_link_navigation.dart';
 import 'channel_typing_provider.dart';
+import 'channel_typing_indicator.dart';
 import 'thread_replies_provider.dart';
 import 'channels_provider.dart';
 import 'compose_bar.dart';
@@ -53,9 +55,13 @@ class ThreadDetailPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    // Relay thread queries are keyed by the outermost root, even when this
+    // page displays a nested branch. Query that root, then select this head's
+    // direct children from the returned subtree below.
+    final queryRootId = threadHead.rootId ?? threadHead.id;
     final repliesState = ref.watch(
-      threadRepliesProvider(
-        ThreadRepliesArgs(channelId: channelId, rootId: threadHead.id),
+      threadRepliesWithLocalProvider(
+        ThreadRepliesArgs(channelId: channelId, rootId: queryRootId),
       ),
     );
     final replyMessages = repliesState.whenData((events) {
@@ -65,7 +71,10 @@ class ThreadDetailPage extends HookConsumerWidget {
     final fetchedReplies = replyMessages.value;
     final allMsgs = fetchedReplies == null
         ? allMessages
-        : [threadHead, ...fetchedReplies];
+        : [
+            threadHead,
+            ...fetchedReplies.where((message) => message.id != threadHead.id),
+          ];
 
     // Index all messages by parentId so we can find direct children of any
     // message and compute thread summaries for nested threads.
@@ -146,11 +155,15 @@ class ThreadDetailPage extends HookConsumerWidget {
     });
 
     return FrostedScaffold(
-      appBar: const FrostedAppBar(title: Text('Thread')),
+      appBar: const FrostedAppBar(
+        title: Text('Thread'),
+        titleStyle: channelTitleTextStyle,
+      ),
       body: Column(
         children: [
           Expanded(
             child: ScrollablePositionedList.builder(
+              key: const ValueKey('thread-message-list'),
               itemScrollController: itemScrollController,
               // Reversed so the list opens pinned to the newest reply,
               // matching the channel message list.
@@ -159,47 +172,54 @@ class ThreadDetailPage extends HookConsumerWidget {
                 left: Grid.gutter,
                 right: Grid.gutter,
                 top: frostedAppBarHeight(context),
-                bottom: Grid.xxs,
+                bottom: 0,
               ),
               itemCount: replies.length + 1, // +1 for thread head
               itemBuilder: (context, index) {
                 if (index == replies.length) {
                   // Thread head.
-                  return Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      DayDivider(label: formatDayHeading(liveHead.createdAt)),
-                      _ThreadMessage(
-                        message: liveHead,
-                        channelNames: channelNamesMap,
-                        channelId: channelId,
-                        currentPubkey: currentPubkey,
-                        showAuthor: true,
-                        allMessages: allMsgs,
-                        isMember: isMember,
-                        isArchived: isArchived,
-                      ),
-                      Padding(
-                        padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
-                        child: Row(
-                          children: [
-                            Text(
-                              '${replies.length} ${replies.length == 1 ? 'reply' : 'replies'}',
-                              style: context.textTheme.labelMedium?.copyWith(
-                                color: context.colors.onSurfaceVariant,
-                                fontWeight: FontWeight.w600,
-                              ),
-                            ),
-                            const SizedBox(width: Grid.xxs),
-                            Expanded(
-                              child: Divider(
-                                color: context.colors.outlineVariant,
-                              ),
-                            ),
-                          ],
+                  return Padding(
+                    key: ValueKey('thread-message-group-${liveHead.id}'),
+                    padding: EdgeInsets.only(bottom: index == 0 ? Grid.xs : 0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        DayDivider(label: formatDayHeading(liveHead.createdAt)),
+                        _ThreadMessage(
+                          message: liveHead,
+                          channelNames: channelNamesMap,
+                          channelId: channelId,
+                          currentPubkey: currentPubkey,
+                          showAuthor: true,
+                          isHighlighted: liveHead.id == initialMessageId,
+                          allMessages: allMsgs,
+                          isMember: isMember,
+                          isArchived: isArchived,
                         ),
-                      ),
-                    ],
+                        Padding(
+                          padding: const EdgeInsets.symmetric(
+                            vertical: Grid.xxs,
+                          ),
+                          child: Row(
+                            children: [
+                              Text(
+                                '${replies.length} ${replies.length == 1 ? 'reply' : 'replies'}',
+                                style: context.textTheme.labelMedium?.copyWith(
+                                  color: context.colors.onSurfaceVariant,
+                                  fontWeight: FontWeight.w600,
+                                ),
+                              ),
+                              const SizedBox(width: Grid.xxs),
+                              Expanded(
+                                child: Divider(
+                                  color: context.colors.outlineVariant,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ],
+                    ),
                   );
                 }
 
@@ -226,38 +246,51 @@ class ThreadDetailPage extends HookConsumerWidget {
                     ? _buildNestedSummary(reply.id, nestedChildren)
                     : null;
 
-                return Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    if (showDayDivider)
-                      DayDivider(label: formatDayHeading(reply.createdAt)),
-                    _ThreadMessage(
-                      message: reply,
-                      channelNames: channelNamesMap,
-                      channelId: channelId,
-                      currentPubkey: currentPubkey,
-                      showAuthor: showAuthor,
-                      allMessages: allMsgs,
-                      isMember: isMember,
-                      isArchived: isArchived,
-                    ),
-                    if (nestedSummary != null)
-                      _NestedThreadSummaryRow(
-                        summary: nestedSummary,
-                        replyMessage: reply,
-                        allMessages: allMsgs,
+                return Padding(
+                  key: ValueKey('thread-message-group-${reply.id}'),
+                  padding: EdgeInsets.only(bottom: index == 0 ? Grid.xs : 0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      if (showDayDivider)
+                        DayDivider(label: formatDayHeading(reply.createdAt)),
+                      _ThreadMessage(
+                        message: reply,
+                        channelNames: channelNamesMap,
                         channelId: channelId,
                         currentPubkey: currentPubkey,
+                        showAuthor: showAuthor,
+                        isHighlighted: reply.id == initialMessageId,
+                        allMessages: allMsgs,
                         isMember: isMember,
                         isArchived: isArchived,
                       ),
-                  ],
+                      if (nestedSummary != null)
+                        _NestedThreadSummaryRow(
+                          summary: nestedSummary,
+                          replyMessage: reply,
+                          allMessages: allMsgs,
+                          channelId: channelId,
+                          currentPubkey: currentPubkey,
+                          isMember: isMember,
+                          isArchived: isArchived,
+                        ),
+                    ],
+                  ),
                 );
               },
             ),
           ),
-          if (threadTyping.isNotEmpty)
-            _ThreadTypingIndicator(entries: threadTyping),
+          AnimatedSize(
+            duration: MediaQuery.disableAnimationsOf(context)
+                ? Duration.zero
+                : const Duration(milliseconds: 180),
+            curve: Curves.easeOutCubic,
+            alignment: Alignment.bottomCenter,
+            child: threadTyping.isEmpty
+                ? const SizedBox.shrink()
+                : ChannelTypingIndicator(entries: threadTyping),
+          ),
           if (isMember && !isArchived)
             ComposeBar(
               channelId: channelId,
@@ -348,10 +381,11 @@ class _NestedThreadSummaryRow extends ConsumerWidget {
         );
       },
       child: Padding(
+        key: ValueKey('nested-thread-summary-${replyMessage.id}'),
         padding: const EdgeInsets.only(
-          left: 36 + Grid.xxs,
+          left: messageAvatarSize + messageAvatarContentGap,
           top: Grid.half,
-          bottom: Grid.half,
+          bottom: Grid.xs,
         ),
         child: Row(
           mainAxisSize: MainAxisSize.min,
@@ -377,36 +411,38 @@ class _NestedThreadSummaryRow extends ConsumerWidget {
               ),
             ),
             const SizedBox(width: Grid.xxs),
-            Text.rich(
-              TextSpan(
-                children: [
-                  TextSpan(
-                    text:
-                        '${summary.replyCount} ${summary.replyCount == 1 ? 'reply' : 'replies'}',
-                    style: context.textTheme.labelMedium?.copyWith(
-                      color: context.colors.primary,
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
-                  if (summary.lastReplyAt case final lastReplyAt?) ...[
-                    TextSpan(
-                      text: ' · ',
-                      style: context.textTheme.labelMedium?.copyWith(
-                        color: context.colors.onSurfaceVariant.withValues(
-                          alpha: 0.5,
-                        ),
-                      ),
-                    ),
+            Flexible(
+              child: Text.rich(
+                TextSpan(
+                  children: [
                     TextSpan(
                       text:
-                          'last reply ${formatThreadSummaryLastReplyTime(lastReplyAt)}',
-                      style: context.textTheme.labelMedium?.copyWith(
-                        color: context.colors.onSurfaceVariant,
-                        fontWeight: FontWeight.w400,
+                          '${summary.replyCount} ${summary.replyCount == 1 ? 'reply' : 'replies'}',
+                      style: replyPreviewTextStyle.copyWith(
+                        color: context.colors.primary,
                       ),
                     ),
+                    if (summary.lastReplyAt case final lastReplyAt?) ...[
+                      TextSpan(
+                        text: ' · ',
+                        style: replyPreviewTextStyle.copyWith(
+                          color: context.colors.onSurfaceVariant.withValues(
+                            alpha: 0.5,
+                          ),
+                        ),
+                      ),
+                      TextSpan(
+                        text:
+                            'last reply ${formatThreadSummaryLastReplyTime(lastReplyAt)}',
+                        style: replyPreviewTextStyle.copyWith(
+                          color: context.colors.onSurfaceVariant,
+                        ),
+                      ),
+                    ],
                   ],
-                ],
+                ),
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
               ),
             ),
           ],
@@ -422,6 +458,7 @@ class _ThreadMessage extends ConsumerWidget {
   final String channelId;
   final String? currentPubkey;
   final bool showAuthor;
+  final bool isHighlighted;
   final List<TimelineMessage>? allMessages;
   final bool isMember;
   final bool isArchived;
@@ -432,6 +469,7 @@ class _ThreadMessage extends ConsumerWidget {
     required this.channelId,
     required this.currentPubkey,
     required this.showAuthor,
+    this.isHighlighted = false,
     this.allMessages,
     this.isMember = false,
     this.isArchived = false,
@@ -444,6 +482,10 @@ class _ThreadMessage extends ConsumerWidget {
         ref.watch(userCacheProvider.select((cache) => cache[pk])) ??
         ref.read(userCacheProvider.notifier).get(pk);
     final displayName = profile?.label ?? shortPubkey(message.pubkey);
+    final canManageMessage =
+        currentPubkey?.toLowerCase() == pk ||
+        (profile?.ownerPubkey != null &&
+            profile?.ownerPubkey == currentPubkey?.toLowerCase());
 
     final userCache = ref.watch(userCacheProvider);
     final knownAgentPubkeys = ref.watch(mentionAgentPubkeysProvider(channelId));
@@ -460,178 +502,175 @@ class _ThreadMessage extends ConsumerWidget {
       }
     }
 
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onLongPress: () => showMessageActions(
-        context: context,
-        ref: ref,
-        message: message,
-        channelId: channelId,
-        canManageMessage:
-            currentPubkey?.toLowerCase() == pk ||
-            (profile?.ownerPubkey != null &&
-                profile?.ownerPubkey == currentPubkey?.toLowerCase()),
-        allMessages: allMessages,
-        currentPubkey: currentPubkey,
-        isMember: isMember,
-        isArchived: isArchived,
-      ),
-      child: Padding(
-        padding: EdgeInsets.only(top: showAuthor ? Grid.xs : Grid.quarter),
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (showAuthor)
-              GestureDetector(
-                onTap: () => showUserProfileSheet(context, message.pubkey),
-                child: _Avatar(profile: profile, pubkey: message.pubkey),
-              )
-            else
-              const SizedBox(width: 36),
-            const SizedBox(width: Grid.xxs),
-            Expanded(
-              child: Transform.translate(
-                offset: Offset(0, showAuthor ? -Grid.quarter : 0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    if (showAuthor)
-                      Padding(
-                        padding: const EdgeInsets.only(bottom: Grid.quarter),
-                        child: Row(
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: [
-                            GestureDetector(
-                              onTap: () =>
-                                  showUserProfileSheet(context, message.pubkey),
-                              child: Text(
-                                displayName,
-                                style: context.textTheme.titleSmall?.copyWith(
-                                  fontWeight: FontWeight.w600,
-                                  color: context.colors.onSurface,
-                                ),
-                              ),
-                            ),
-                            const SizedBox(width: Grid.xxs),
-                            Text(
-                              formatMessageTime(message.createdAt),
-                              style: context.textTheme.labelSmall?.copyWith(
-                                fontSize: 14,
-                                height: 22 / 14,
-                                letterSpacing:
-                                    context.textTheme.titleSmall?.letterSpacing,
-                                color: context.colors.onSurfaceVariant,
-                              ),
-                            ),
-                            if (message.edited) ...[
-                              const SizedBox(width: Grid.half),
-                              Text(
-                                '(edited)',
-                                style: context.textTheme.labelSmall?.copyWith(
-                                  color: context.colors.onSurfaceVariant,
-                                  fontStyle: FontStyle.italic,
-                                ),
-                              ),
-                            ],
-                          ],
-                        ),
-                      ),
-                    MessageContent(
-                      content: message.content,
-                      mentionNames: mentionNames,
-                      agentMentionPubkeys: agentMentionPubkeys,
-                      channelNames: channelNames,
-                      tags: message.tags,
-                      baseStyle: context.textTheme.bodyLarge?.copyWith(
-                        color: context.colors.onSurface,
-                      ),
-                      onChannelTap: (targetChannelId) {
-                        openChannelLink(
-                          context: context,
-                          ref: ref,
-                          channelId: targetChannelId,
-                          currentChannelId: channelId,
-                        );
-                      },
-                      onMentionTap: (pubkey) =>
-                          showUserProfileSheet(context, pubkey),
-                    ),
-                    if (message.reactions.isNotEmpty)
-                      ReactionRow(
-                        reactions: message.reactions,
-                        onToggle: (emoji) =>
-                            toggleReaction(ref, message, emoji),
-                      ),
-                  ],
-                ),
-              ),
-            ),
-          ],
+    return Padding(
+      padding: EdgeInsets.only(top: showAuthor ? Grid.xs : 0),
+      child: DecoratedBox(
+        key: ValueKey('thread-message-${message.id}'),
+        decoration: BoxDecoration(
+          color: isHighlighted
+              ? context.colors.primary.withValues(alpha: 0.12)
+              : Colors.transparent,
+          borderRadius: BorderRadius.circular(Radii.md),
         ),
-      ),
-    );
-  }
-}
-
-class _ThreadTypingIndicator extends ConsumerWidget {
-  final List<TypingEntry> entries;
-
-  const _ThreadTypingIndicator({required this.entries});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final userCache = ref.watch(userCacheProvider);
-    final names = entries.map((e) {
-      final profile =
-          userCache[e.pubkey.toLowerCase()] ??
-          ref.read(userCacheProvider.notifier).get(e.pubkey.toLowerCase());
-      return profile?.label ?? shortPubkey(e.pubkey);
-    }).toList();
-    final text = switch (names.length) {
-      1 => '${names[0]} is typing...',
-      2 => '${names[0]} and ${names[1]} are typing...',
-      _ => '${names[0]} and ${names.length - 1} others are typing...',
-    };
-
-    final visibleEntries = entries.take(3).toList();
-    final avatarCount = visibleEntries.length;
-
-    return Container(
-      width: double.infinity,
-      padding: const EdgeInsets.symmetric(
-        horizontal: Grid.gutter,
-        vertical: Grid.quarter + 2,
-      ),
-      child: Row(
-        children: [
-          SizedBox(
-            width: 20.0 + (avatarCount - 1) * 12.0,
-            height: 20,
-            child: Stack(
-              children: [
-                for (var i = 0; i < avatarCount; i++)
-                  Positioned(
-                    left: i * 12.0,
-                    child: SmallAvatar(
-                      pubkey: visibleEntries[i].pubkey,
-                      userCache: userCache,
+        child: Material(
+          color: Colors.transparent,
+          borderRadius: BorderRadius.circular(Radii.md),
+          // The media carousel intentionally continues through the list's
+          // trailing gutter. InkWell still clips its ink to [borderRadius],
+          // while leaving overflowing message content visible.
+          clipBehavior: Clip.none,
+          child: InkWell(
+            key: ValueKey('thread-message-row-${message.id}'),
+            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,
+                bottom: showAuthor ? 0 : Grid.xxs,
+              ),
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  if (showAuthor)
+                    GestureDetector(
+                      onTap: () =>
+                          showUserProfileSheet(context, message.pubkey),
+                      child: _Avatar(profile: profile, pubkey: message.pubkey),
+                    )
+                  else
+                    const SizedBox(width: messageAvatarSize),
+                  const SizedBox(width: messageAvatarContentGap),
+                  Expanded(
+                    child: Padding(
+                      padding: EdgeInsets.only(top: showAuthor ? Grid.half : 0),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          if (showAuthor)
+                            Padding(
+                              padding: const EdgeInsets.only(
+                                bottom: Grid.quarter,
+                              ),
+                              child: Row(
+                                children: [
+                                  Expanded(
+                                    child: MessageAuthorMeta(
+                                      displayName: displayName,
+                                      username: messageUsernameLabel(profile),
+                                      timestamp: formatMessageTime(
+                                        message.createdAt,
+                                      ),
+                                      nameColor: context.colors.onSurface,
+                                      metadataColor:
+                                          context.colors.onSurfaceVariant,
+                                      onAuthorTap: () => showUserProfileSheet(
+                                        context,
+                                        message.pubkey,
+                                      ),
+                                      displayNameKey: ValueKey(
+                                        'thread-message-author-${message.id}',
+                                      ),
+                                      usernameKey: ValueKey(
+                                        'thread-message-username-${message.id}',
+                                      ),
+                                      timestampKey: ValueKey(
+                                        'thread-message-timestamp-${message.id}',
+                                      ),
+                                    ),
+                                  ),
+                                  if (message.edited) ...[
+                                    const SizedBox(width: Grid.half),
+                                    Text(
+                                      '(edited)',
+                                      style: context.textTheme.labelSmall
+                                          ?.copyWith(
+                                            color:
+                                                context.colors.onSurfaceVariant,
+                                            fontStyle: FontStyle.italic,
+                                          ),
+                                    ),
+                                  ],
+                                ],
+                              ),
+                            ),
+                          MessageContent(
+                            content: message.content,
+                            mentionNames: mentionNames,
+                            agentMentionPubkeys: agentMentionPubkeys,
+                            channelNames: channelNames,
+                            tags: message.tags,
+                            baseStyle: messageBodyTextStyle.copyWith(
+                              color: context.colors.onSurface,
+                            ),
+                            mediaCarouselTrailingOverflow: Grid.gutter,
+                            onMediaReply: allMessages == null
+                                ? null
+                                : () {
+                                    if (!context.mounted) return;
+                                    Navigator.of(context).push(
+                                      MaterialPageRoute<void>(
+                                        builder: (_) => ThreadDetailPage(
+                                          threadHead: message,
+                                          allMessages: allMessages!,
+                                          channelId: channelId,
+                                          currentPubkey: currentPubkey,
+                                          isMember: isMember,
+                                          isArchived: isArchived,
+                                        ),
+                                      ),
+                                    );
+                                  },
+                            onMediaMore: (viewerContext, imageUrl) =>
+                                showImageActions(
+                                  context: viewerContext,
+                                  ref: ref,
+                                  message: message,
+                                  channelId: channelId,
+                                  imageUrl: imageUrl,
+                                  canManageMessage: canManageMessage,
+                                  onDeleted: () {
+                                    if (viewerContext.mounted) {
+                                      Navigator.of(viewerContext).maybePop();
+                                    }
+                                  },
+                                ),
+                            onChannelTap: (targetChannelId) {
+                              openChannelLink(
+                                context: context,
+                                ref: ref,
+                                channelId: targetChannelId,
+                                currentChannelId: channelId,
+                              );
+                            },
+                            onMentionTap: (pubkey) =>
+                                showUserProfileSheet(context, pubkey),
+                          ),
+                          if (message.reactions.isNotEmpty)
+                            ReactionRow(
+                              reactions: message.reactions,
+                              onToggle: (emoji) =>
+                                  toggleReaction(ref, message, emoji),
+                            ),
+                        ],
+                      ),
                     ),
                   ),
-              ],
-            ),
-          ),
-          const SizedBox(width: Grid.xxs),
-          Flexible(
-            child: Text(
-              text,
-              style: context.textTheme.labelSmall?.copyWith(
-                color: context.colors.outline,
-                fontStyle: FontStyle.italic,
+                ],
               ),
-              overflow: TextOverflow.ellipsis,
             ),
           ),
-        ],
+        ),
       ),
     );
   }
@@ -651,7 +690,7 @@ class _Avatar extends StatelessWidget {
 
     return AvatarImage(
       imageUrl: avatarUrl,
-      radius: 18,
+      radius: messageAvatarSize / 2,
       backgroundColor: context.colors.primaryContainer,
       fallback: Text(
         initial,
diff --git a/mobile/lib/features/channels/thread_follows/thread_follows_provider.dart b/mobile/lib/features/channels/thread_follows/thread_follows_provider.dart
new file mode 100644
index 0000000000..b3b09cf7e7
--- /dev/null
+++ b/mobile/lib/features/channels/thread_follows/thread_follows_provider.dart
@@ -0,0 +1,83 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../../../shared/relay/relay.dart';
+import '../../../shared/theme/theme_provider.dart';
+import '../read_state/read_state_time.dart';
+import 'thread_follows_storage.dart';
+
+class ThreadFollowsState {
+  final Set<String> followedRootIds;
+
+  const ThreadFollowsState({this.followedRootIds = const {}});
+
+  bool isFollowing(String rootId) => followedRootIds.contains(rootId);
+}
+
+/// Followed thread roots for the signed-in identity. Follows feed the unread
+/// pipeline (`shouldNotifyForEvent`'s `followedRootIds`), so replies in a
+/// followed thread badge the channel even without participation.
+class ThreadFollowsNotifier extends Notifier<ThreadFollowsState> {
+  List<ThreadFollowEntry> _entries = const [];
+  String? _pubkey;
+
+  @override
+  ThreadFollowsState build() {
+    final pubkey = ref.watch(myPubkeyProvider)?.trim().toLowerCase();
+    _pubkey = pubkey;
+    if (pubkey == null || pubkey.isEmpty) {
+      _entries = const [];
+      return const ThreadFollowsState();
+    }
+
+    try {
+      _entries = ThreadFollowsStorage(
+        ref.read(savedPrefsProvider),
+      ).read(pubkey);
+    } catch (_) {
+      _entries = const [];
+    }
+    return _stateFromEntries();
+  }
+
+  void followThread(String rootId) {
+    if (rootId.isEmpty || _entries.any((e) => e.rootId == rootId)) return;
+    _entries = capThreadFollowEntries([
+      ..._entries,
+      ThreadFollowEntry(rootId: rootId, followedAt: currentUnixSeconds()),
+    ]);
+    _persist();
+    state = _stateFromEntries();
+  }
+
+  void unfollowThread(String rootId) {
+    final next = [
+      for (final entry in _entries)
+        if (entry.rootId != rootId) entry,
+    ];
+    if (next.length == _entries.length) return;
+    _entries = next;
+    _persist();
+    state = _stateFromEntries();
+  }
+
+  void _persist() {
+    final pubkey = _pubkey;
+    if (pubkey == null || pubkey.isEmpty) return;
+    try {
+      ThreadFollowsStorage(
+        ref.read(savedPrefsProvider),
+      ).write(pubkey, _entries);
+    } catch (_) {
+      // In-memory state still works this session.
+    }
+  }
+
+  ThreadFollowsState _stateFromEntries() => ThreadFollowsState(
+    followedRootIds: Set.unmodifiable({for (final e in _entries) e.rootId}),
+  );
+}
+
+final threadFollowsProvider =
+    NotifierProvider<ThreadFollowsNotifier, ThreadFollowsState>(
+      ThreadFollowsNotifier.new,
+    );
diff --git a/mobile/lib/features/channels/thread_follows/thread_follows_storage.dart b/mobile/lib/features/channels/thread_follows/thread_follows_storage.dart
new file mode 100644
index 0000000000..6538af3e77
--- /dev/null
+++ b/mobile/lib/features/channels/thread_follows/thread_follows_storage.dart
@@ -0,0 +1,68 @@
+import 'dart:convert';
+
+import 'package:shared_preferences/shared_preferences.dart';
+
+/// Persistence for followed thread root IDs.
+///
+/// Mirrors the desktop store (`useThreadFollows.ts`): per-pubkey entries of
+/// `{rootId, followedAt}`, capped at the oldest-out limit. Desktop keeps this
+/// client-local (localStorage), so mobile does the same with
+/// SharedPreferences — following on one device intentionally does not sync.
+const threadFollowsMaxEntries = 500;
+
+String threadFollowsKey(String pubkey) => 'buzz-thread-follows.v1:$pubkey';
+
+class ThreadFollowEntry {
+  final String rootId;
+  final int followedAt;
+
+  const ThreadFollowEntry({required this.rootId, required this.followedAt});
+
+  Map<String, dynamic> toJson() => {'rootId': rootId, 'followedAt': followedAt};
+}
+
+class ThreadFollowsStorage {
+  final SharedPreferences _prefs;
+
+  ThreadFollowsStorage(this._prefs);
+
+  List<ThreadFollowEntry> read(String pubkey) {
+    final raw = _prefs.getString(threadFollowsKey(pubkey));
+    if (raw == null || raw.isEmpty) return const [];
+
+    try {
+      final parsed = jsonDecode(raw);
+      if (parsed is! List) return const [];
+      return [
+        for (final entry in parsed)
+          if (entry is Map &&
+              entry['rootId'] is String &&
+              entry['followedAt'] is int)
+            ThreadFollowEntry(
+              rootId: entry['rootId'] as String,
+              followedAt: entry['followedAt'] as int,
+            ),
+      ];
+    } catch (_) {
+      return const [];
+    }
+  }
+
+  void write(String pubkey, List<ThreadFollowEntry> entries) {
+    _prefs.setString(
+      threadFollowsKey(pubkey),
+      jsonEncode([for (final entry in entries) entry.toJson()]),
+    );
+  }
+}
+
+/// Cap entries at [threadFollowsMaxEntries], evicting the oldest follows
+/// first — same policy as desktop's `capEntries`.
+List<ThreadFollowEntry> capThreadFollowEntries(
+  List<ThreadFollowEntry> entries,
+) {
+  if (entries.length <= threadFollowsMaxEntries) return entries;
+  final sorted = [...entries]
+    ..sort((a, b) => a.followedAt.compareTo(b.followedAt));
+  return sorted.sublist(sorted.length - threadFollowsMaxEntries);
+}
diff --git a/mobile/lib/features/channels/thread_replies_provider.dart b/mobile/lib/features/channels/thread_replies_provider.dart
index 0fa2b15bd1..6904ba8c5e 100644
--- a/mobile/lib/features/channels/thread_replies_provider.dart
+++ b/mobile/lib/features/channels/thread_replies_provider.dart
@@ -1,6 +1,9 @@
+import 'dart:async';
+
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../shared/relay/relay.dart';
+import 'pending_local_messages_provider.dart';
 
 class ThreadRepliesArgs {
   final String channelId;
@@ -64,3 +67,77 @@ NostrFilter _threadRepliesFilter(
     },
   );
 }
+
+class ThreadLocalRepliesNotifier extends Notifier<List<NostrEvent>> {
+  final ThreadRepliesArgs args;
+
+  ThreadLocalRepliesNotifier(this.args);
+
+  @override
+  List<NostrEvent> build() => const [];
+
+  void add(NostrEvent event) {
+    state = _mergeReplies(state, [event]);
+  }
+
+  void remove(String eventId) {
+    state = state.where((event) => event.id != eventId).toList();
+  }
+
+  void confirm(Set<String> eventIds) {
+    if (!state.any((event) => eventIds.contains(event.id))) return;
+    state = state.where((event) => !eventIds.contains(event.id)).toList();
+  }
+}
+
+final threadLocalRepliesProvider =
+    NotifierProvider.family<
+      ThreadLocalRepliesNotifier,
+      List<NostrEvent>,
+      ThreadRepliesArgs
+    >(ThreadLocalRepliesNotifier.new);
+
+/// Relay-backed replies merged with signed local replies that are still
+/// waiting for acknowledgement.
+final threadRepliesWithLocalProvider =
+    Provider.family<AsyncValue<List<NostrEvent>>, ThreadRepliesArgs>((
+      ref,
+      args,
+    ) {
+      final relayReplies = ref.watch(threadRepliesProvider(args));
+      final localReplies = ref.watch(threadLocalRepliesProvider(args));
+      final authoritative = relayReplies.value;
+      if (authoritative != null && localReplies.isNotEmpty) {
+        final authoritativeIds = authoritative.map((event) => event.id).toSet();
+        if (localReplies.any((event) => authoritativeIds.contains(event.id))) {
+          Future.microtask(() {
+            ref
+                .read(threadLocalRepliesProvider(args).notifier)
+                .confirm(authoritativeIds);
+            ref
+                .read(pendingLocalMessagesProvider(args.channelId).notifier)
+                .confirm(authoritativeIds);
+          });
+        }
+      }
+      if (localReplies.isEmpty) return relayReplies;
+      return relayReplies.when(
+        data: (events) => AsyncData(_mergeReplies(events, localReplies)),
+        loading: () => AsyncData(localReplies),
+        error: (error, stackTrace) => AsyncData(localReplies),
+      );
+    });
+
+List<NostrEvent> _mergeReplies(
+  Iterable<NostrEvent> first,
+  Iterable<NostrEvent> second,
+) {
+  final byId = <String, NostrEvent>{};
+  for (final event in [...first, ...second]) {
+    byId[event.id] = event;
+  }
+  return byId.values.toList()..sort((a, b) {
+    final createdAt = a.createdAt.compareTo(b.createdAt);
+    return createdAt != 0 ? createdAt : a.id.compareTo(b.id);
+  });
+}
diff --git a/mobile/lib/features/channels/timeline_message.dart b/mobile/lib/features/channels/timeline_message.dart
index 496060e50b..253c949703 100644
--- a/mobile/lib/features/channels/timeline_message.dart
+++ b/mobile/lib/features/channels/timeline_message.dart
@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 
 import '../../shared/relay/relay.dart';
-import '../custom_emoji/custom_emoji.dart';
+import '../../shared/custom_emoji/custom_emoji.dart';
 import 'channel_window.dart';
 
 enum SystemEventType {
@@ -171,6 +171,11 @@ class TimelineMessage {
     this.parentId,
     this.rootId,
   });
+
+  /// Attachment messages stay visually distinct from surrounding messages,
+  /// even when several are sent by the same author in quick succession.
+  bool get hasAttachments =>
+      tags.any((tag) => tag.isNotEmpty && tag.first == 'imeta');
 }
 
 @immutable
diff --git a/mobile/lib/features/forum/forum_post_card.dart b/mobile/lib/features/forum/forum_post_card.dart
index 7c1851ba54..8666919a4a 100644
--- a/mobile/lib/features/forum/forum_post_card.dart
+++ b/mobile/lib/features/forum/forum_post_card.dart
@@ -77,17 +77,22 @@ class ForumPostCard extends ConsumerWidget {
                     onTap: () => showUserProfileSheet(context, post.pubkey),
                     child: Text(
                       displayName,
-                      style: context.textTheme.labelMedium?.copyWith(
-                        fontWeight: FontWeight.w600,
-                      ),
+                      maxLines: 1,
+                      style: messageUsernameTextStyle,
                       overflow: TextOverflow.ellipsis,
                     ),
                   ),
                 ),
-                Text(
-                  formatRelativeTime(post.createdAt),
-                  style: context.textTheme.labelSmall?.copyWith(
-                    color: context.colors.onSurfaceVariant,
+                const SizedBox(width: Grid.xxs),
+                ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: Grid.xxl),
+                  child: Text(
+                    formatRelativeTime(post.createdAt),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: messageTimestampTextStyle.copyWith(
+                      color: context.colors.onSurfaceVariant,
+                    ),
                   ),
                 ),
                 const SizedBox(width: Grid.half),
@@ -124,6 +129,9 @@ class ForumPostCard extends ConsumerWidget {
                     content: preview,
                     mentionNames: mentionNames,
                     tags: post.tags,
+                    baseStyle: messageBodyTextStyle.copyWith(
+                      color: context.colors.onSurface,
+                    ),
                   ),
                 ),
               ),
diff --git a/mobile/lib/features/forum/forum_posts_view.dart b/mobile/lib/features/forum/forum_posts_view.dart
index 4d7482bfdd..e3eed1f96c 100644
--- a/mobile/lib/features/forum/forum_posts_view.dart
+++ b/mobile/lib/features/forum/forum_posts_view.dart
@@ -6,6 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 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 '../channels/channel.dart';
 import '../channels/compose_bar.dart';
@@ -61,7 +62,12 @@ class ForumPostsView extends HookConsumerWidget {
             body: postsAsync.when(
               loading: () => Padding(
                 padding: EdgeInsets.only(top: frostedAppBarHeight(context)),
-                child: const Center(child: CircularProgressIndicator()),
+                child: const Center(
+                  child: BuzzLoadingIndicator(
+                    size: 44,
+                    semanticLabel: 'Loading posts',
+                  ),
+                ),
               ),
               error: (e, _) => Padding(
                 padding: EdgeInsets.only(top: frostedAppBarHeight(context)),
diff --git a/mobile/lib/features/forum/forum_provider.dart b/mobile/lib/features/forum/forum_provider.dart
index 8ff2c335c4..710e16aa34 100644
--- a/mobile/lib/features/forum/forum_provider.dart
+++ b/mobile/lib/features/forum/forum_provider.dart
@@ -2,8 +2,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../shared/relay/relay.dart';
 import '../channels/channel_management_provider.dart';
-import '../custom_emoji/custom_emoji.dart';
-import '../custom_emoji/custom_emoji_provider.dart';
+import '../../shared/custom_emoji/custom_emoji.dart';
+import '../../shared/custom_emoji/custom_emoji_provider.dart';
 import 'forum_models.dart';
 
 /// Fetches forum posts (kind:45001) for a channel from the relay.
diff --git a/mobile/lib/features/forum/forum_thread_page.dart b/mobile/lib/features/forum/forum_thread_page.dart
index 4a4c0d0ab8..d2e8490d61 100644
--- a/mobile/lib/features/forum/forum_thread_page.dart
+++ b/mobile/lib/features/forum/forum_thread_page.dart
@@ -8,6 +8,7 @@ import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
 import '../channels/compose_bar.dart';
@@ -77,7 +78,12 @@ class ForumThreadPage extends HookConsumerWidget {
       body: threadAsync.when(
         loading: () => Padding(
           padding: EdgeInsets.only(top: frostedAppBarHeight(context)),
-          child: const Center(child: CircularProgressIndicator()),
+          child: const Center(
+            child: BuzzLoadingIndicator(
+              size: 44,
+              semanticLabel: 'Loading thread',
+            ),
+          ),
         ),
         error: (e, _) => Padding(
           padding: EdgeInsets.only(top: frostedAppBarHeight(context)),
@@ -335,22 +341,29 @@ class _OriginalPost extends ConsumerWidget {
               ),
               const SizedBox(width: Grid.xxs),
               Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                child: Row(
                   children: [
-                    GestureDetector(
-                      onTap: () => showUserProfileSheet(context, post.pubkey),
-                      child: Text(
-                        displayName,
-                        style: context.textTheme.labelMedium?.copyWith(
-                          fontWeight: FontWeight.w600,
+                    Expanded(
+                      child: GestureDetector(
+                        onTap: () => showUserProfileSheet(context, post.pubkey),
+                        child: Text(
+                          displayName,
+                          maxLines: 1,
+                          style: messageUsernameTextStyle,
+                          overflow: TextOverflow.ellipsis,
                         ),
                       ),
                     ),
-                    Text(
-                      formatRelativeTime(post.createdAt),
-                      style: context.textTheme.labelSmall?.copyWith(
-                        color: context.colors.onSurfaceVariant,
+                    const SizedBox(width: Grid.xxs),
+                    ConstrainedBox(
+                      constraints: const BoxConstraints(maxWidth: Grid.xxl),
+                      child: Text(
+                        formatRelativeTime(post.createdAt),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: messageTimestampTextStyle.copyWith(
+                          color: context.colors.onSurfaceVariant,
+                        ),
                       ),
                     ),
                   ],
@@ -363,6 +376,9 @@ class _OriginalPost extends ConsumerWidget {
             content: post.content,
             mentionNames: mentionNames,
             tags: post.tags,
+            baseStyle: messageBodyTextStyle.copyWith(
+              color: context.colors.onSurface,
+            ),
             onMentionTap: (pubkey) => showUserProfileSheet(context, pubkey),
           ),
         ],
@@ -417,20 +433,28 @@ class _ReplyRow extends ConsumerWidget {
               Expanded(
                 child: Row(
                   children: [
-                    GestureDetector(
-                      onTap: () => showUserProfileSheet(context, reply.pubkey),
-                      child: Text(
-                        displayName,
-                        style: context.textTheme.labelMedium?.copyWith(
-                          fontWeight: FontWeight.w600,
+                    Expanded(
+                      child: GestureDetector(
+                        onTap: () =>
+                            showUserProfileSheet(context, reply.pubkey),
+                        child: Text(
+                          displayName,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                          style: messageUsernameTextStyle,
                         ),
                       ),
                     ),
                     const SizedBox(width: Grid.xxs),
-                    Text(
-                      formatRelativeTime(reply.createdAt),
-                      style: context.textTheme.labelSmall?.copyWith(
-                        color: context.colors.onSurfaceVariant,
+                    ConstrainedBox(
+                      constraints: const BoxConstraints(maxWidth: Grid.xxl),
+                      child: Text(
+                        formatRelativeTime(reply.createdAt),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: messageTimestampTextStyle.copyWith(
+                          color: context.colors.onSurfaceVariant,
+                        ),
                       ),
                     ),
                   ],
@@ -458,6 +482,9 @@ class _ReplyRow extends ConsumerWidget {
               content: reply.content,
               mentionNames: mentionNames,
               tags: reply.tags,
+              baseStyle: messageBodyTextStyle.copyWith(
+                color: context.colors.onSurface,
+              ),
               onMentionTap: (pubkey) => showUserProfileSheet(context, pubkey),
             ),
           ),
diff --git a/mobile/lib/features/home/home_page.dart b/mobile/lib/features/home/home_page.dart
index e76d739ab2..a40e317469 100644
--- a/mobile/lib/features/home/home_page.dart
+++ b/mobile/lib/features/home/home_page.dart
@@ -8,19 +8,22 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../../shared/theme/theme.dart';
+import '../../shared/widgets/mobile_tab_footer_backdrop.dart';
 import '../activity/activity_page.dart';
 import '../channels/channels_page.dart';
 import '../search/search_page.dart';
 
 class HomePage extends HookConsumerWidget {
-  const HomePage({super.key});
+  const HomePage({required this.settingsPageBuilder, super.key});
 
-  static const double _tabBarHeight = 56;
+  final WidgetBuilder settingsPageBuilder;
+
+  static const double _tabBarHeight = mobileTabBarHeight;
   static const double _tabBarRadius = _tabBarHeight / 2;
   static const double _tabBarInnerInset = Grid.half;
   static const double _selectedTabRadius =
       (_tabBarHeight - (_tabBarInnerInset * 2)) / 2;
-  static const double _tabBarBottomGap = Grid.twelve;
+  static const double _tabBarBottomGap = mobileTabBarBottomGap;
   static const double _tabBarHorizontalMargin = Grid.gutter;
   static const double _tabDestinationHorizontalPadding = Grid.sm;
   static const double _tabIconSize = 22;
@@ -54,14 +57,23 @@ class HomePage extends HookConsumerWidget {
       _destinations.length,
     );
 
-    const pages = [ChannelsPage(), ActivityPage(), SearchPage()];
+    final pages = [
+      ChannelsPage(settingsPageBuilder: settingsPageBuilder),
+      const ActivityPage(),
+      const SearchPage(),
+    ];
 
     return Scaffold(
+      backgroundColor: Colors.transparent,
+      // Keep the floating navigation and Home quick actions anchored while the
+      // keyboard is visible on any tab.
+      resizeToAvoidBottomInset: false,
       extendBody: true,
       body: SizedBox.expand(
         child: Stack(
           fit: StackFit.expand,
           children: [
+            Positioned.fill(child: ColoredBox(color: context.colors.surface)),
             Positioned.fill(
               child: MediaQuery(
                 data: _mediaQueryWithFloatingTabBarClearance(
@@ -71,6 +83,14 @@ class HomePage extends HookConsumerWidget {
                 child: IndexedStack(index: tabIndex.value, children: pages),
               ),
             ),
+            Align(
+              alignment: Alignment.bottomCenter,
+              child: IgnorePointer(
+                child: MobileTabFooterBackdrop(
+                  height: mobileTabFooterBackdropHeight(context),
+                ),
+              ),
+            ),
             Positioned.fill(
               child: ChannelQuickActionsLauncher(
                 visible: tabIndex.value == 0,
diff --git a/mobile/lib/features/invites/invite_join_provider.dart b/mobile/lib/features/invites/invite_join_provider.dart
index 0cd58d47a7..b1d2680c93 100644
--- a/mobile/lib/features/invites/invite_join_provider.dart
+++ b/mobile/lib/features/invites/invite_join_provider.dart
@@ -7,6 +7,7 @@ import 'package:nostr/nostr.dart' as nostr;
 import '../../shared/auth/auth.dart';
 import '../../shared/deeplink/deep_link.dart';
 import '../../shared/relay/relay_session.dart';
+import '../../shared/relay/relay_validation.dart';
 
 final inviteJoinHttpClientProvider = Provider<http.Client>((ref) {
   final client = http.Client();
@@ -68,6 +69,7 @@ class InviteJoinNotifier extends Notifier<InviteJoinState> {
   InviteJoinState build() => const InviteJoinState();
 
   Future<void> prepare(InviteDeepLink invite) async {
+    validateInviteRelayUri(Uri.parse(invite.relayUrl));
     final communities = await ref.read(communityListProvider.future);
     final existing = _existingCommunity(communities, invite.relayUrl);
     if (existing != null) {
@@ -121,22 +123,25 @@ class InviteJoinNotifier extends Notifier<InviteJoinState> {
         if (invite.policyReceipt != null)
           'policy_receipt': invite.policyReceipt,
       });
+      final relayUri = Uri.parse(invite.relayUrl);
+      validateInviteRelayUri(relayUri);
       final url = _claimUrlFromRelay(invite.relayUrl);
-      final response = await ref
+      final request = http.Request('POST', Uri.parse(url))
+        ..followRedirects = false
+        ..headers.addAll({
+          'Authorization': buildNip98AuthHeader(
+            method: 'POST',
+            url: url,
+            bodyBytes: utf8.encode(body),
+            nsec: keys.nsec,
+          ),
+          'Content-Type': 'application/json',
+        })
+        ..body = body;
+      final streamedResponse = await ref
           .read(inviteJoinHttpClientProvider)
-          .post(
-            Uri.parse(url),
-            headers: {
-              'Authorization': buildNip98AuthHeader(
-                method: 'POST',
-                url: url,
-                bodyBytes: utf8.encode(body),
-                nsec: keys.nsec,
-              ),
-              'Content-Type': 'application/json',
-            },
-            body: body,
-          );
+          .send(request);
+      final response = await http.Response.fromStream(streamedResponse);
       final decoded = jsonDecode(response.body.isEmpty ? '{}' : response.body);
       if (response.statusCode < 200 || response.statusCode >= 300) {
         final message = decoded is Map && decoded['error'] is String
@@ -256,12 +261,17 @@ String _communityNameFromClaim(Map<String, dynamic> claim, String relayUrl) {
 }
 
 bool _requiresFreshInvite(Object error) {
-  return error.toString().contains('join_policy_required');
+  final message = error.toString();
+  return message.contains('join_policy_required') ||
+      message.contains('invite_exhausted');
 }
 
 String _friendlyInviteError(Object error) {
   final message = error.toString();
   if (message.contains('invite_expired')) return 'This invite has expired.';
+  if (message.contains('invite_exhausted')) {
+    return 'This invite has reached its use limit. Ask for a new invite.';
+  }
   if (message.contains('invite_invalid')) return 'This invite is not valid.';
   if (message.contains('join_policy_required')) {
     return 'This invite approval has expired. Re-open the invite link to try again.';
diff --git a/mobile/lib/features/invites/invite_join_sheet.dart b/mobile/lib/features/invites/invite_join_sheet.dart
index 58221158e5..a88d38ac16 100644
--- a/mobile/lib/features/invites/invite_join_sheet.dart
+++ b/mobile/lib/features/invites/invite_join_sheet.dart
@@ -3,6 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../../shared/theme/theme.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../pairing/pairing_page.dart';
 import 'invite_join_provider.dart';
 
@@ -113,10 +114,13 @@ class InviteJoinSheet extends ConsumerWidget {
                               .read(inviteJoinProvider.notifier)
                               .confirmJoin(),
                     icon: isClaiming
-                        ? const SizedBox(
+                        ? SizedBox(
                             width: 16,
                             height: 16,
-                            child: CircularProgressIndicator(strokeWidth: 2),
+                            child: BuzzLoadingIndicator(
+                              size: 16,
+                              semanticLabel: 'Joining community',
+                            ),
                           )
                         : const Icon(LucideIcons.check),
                     label: Text(isClaiming ? 'Joining…' : 'Join'),
diff --git a/mobile/lib/features/pairing/pairing_page.dart b/mobile/lib/features/pairing/pairing_page.dart
index 70514f274d..85b781052d 100644
--- a/mobile/lib/features/pairing/pairing_page.dart
+++ b/mobile/lib/features/pairing/pairing_page.dart
@@ -1,14 +1,26 @@
 import 'dart:async';
 
 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 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../../shared/theme/theme.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
+import '../../shared/widgets/tappable_flapping_bee.dart';
 import 'pairing_provider.dart';
 import 'pairing_qr_scanner.dart';
 
+part 'pairing_page/onboarding_background.dart';
+part 'pairing_page/pairing_welcome_view.dart';
+
+const _onboardingChartreuse = Color(0xFFD7D72E);
+const _onboardingShellBottom = Color(0xFFD7E7F6);
+const _onboardingCtaLabel = Color(0xFFD7E6F0);
+const _onboardingInk = Color(0xFF111111);
+const _onboardingMutedInk = Color(0xB3111111);
+
 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).
@@ -21,6 +33,7 @@ class PairingPage extends HookConsumerWidget {
     final pairingState = ref.watch(pairingProvider);
     final codeController = useTextEditingController();
     final fallbackScannerVisible = useState(false);
+    final pairingCodeExpanded = useState(false);
     final isBusy =
         pairingState.status == PairingStatus.connecting ||
         pairingState.status == PairingStatus.transferring ||
@@ -57,168 +70,98 @@ class PairingPage extends HookConsumerWidget {
       await handleScannerResult(code);
     }
 
+    final isVerifyingSas = pairingState.status == PairingStatus.confirmingSas;
+    final themedSystemOverlayStyle =
+        (context.theme.brightness == Brightness.dark
+                ? SystemUiOverlayStyle.light
+                : SystemUiOverlayStyle.dark)
+            .copyWith(statusBarColor: Colors.transparent);
+    final pairingAppBar = addingCommunity
+        ? AppBar(
+            foregroundColor: isVerifyingSas
+                ? context.colors.onSurface
+                : _onboardingInk,
+            systemOverlayStyle: isVerifyingSas
+                ? themedSystemOverlayStyle
+                : SystemUiOverlayStyle.dark.copyWith(
+                    statusBarColor: Colors.transparent,
+                  ),
+            leading: IconButton(
+              icon: const Icon(LucideIcons.arrowLeft),
+              onPressed: () => Navigator.of(context).pop(),
+            ),
+            title: Text(
+              'Add Community',
+              style: isVerifyingSas
+                  ? null
+                  : context.textTheme.titleMedium?.copyWith(
+                      color: _onboardingInk,
+                    ),
+            ),
+          )
+        : null;
+
+    final pairingScaffold = isVerifyingSas
+        ? AnnotatedRegion<SystemUiOverlayStyle>(
+            key: const Key('pairing-sas-system-overlay'),
+            value: themedSystemOverlayStyle,
+            child: Scaffold(
+              backgroundColor: context.colors.surface,
+              appBar: pairingAppBar,
+              body: SafeArea(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: Grid.sm),
+                  child: _SasVerificationView(
+                    sasCode: pairingState.sasCode ?? '------',
+                    confirmed: pairingState.userConfirmedSas,
+                    onConfirm: () =>
+                        ref.read(pairingProvider.notifier).confirmSas(),
+                    onDeny: () => ref.read(pairingProvider.notifier).denySas(),
+                  ),
+                ),
+              ),
+            ),
+          )
+        : AnnotatedRegion<SystemUiOverlayStyle>(
+            key: const Key('pairing-onboarding-system-overlay'),
+            value: SystemUiOverlayStyle.dark.copyWith(
+              statusBarColor: Colors.transparent,
+            ),
+            child: _OnboardingBackground(
+              child: Scaffold(
+                backgroundColor: Colors.transparent,
+                appBar: pairingAppBar,
+                body: SafeArea(
+                  child: _PairingWelcomeView(
+                    codeController: codeController,
+                    isBusy: isBusy,
+                    pairingCodeExpanded: pairingCodeExpanded.value,
+                    errorMessage: pairingState.status == PairingStatus.error
+                        ? pairingState.errorMessage
+                        : null,
+                    onScan: openScanner,
+                    onTogglePairingCode: () {
+                      pairingCodeExpanded.value = !pairingCodeExpanded.value;
+                    },
+                    onConnect: () {
+                      final code = codeController.text.trim();
+                      if (code.isNotEmpty) {
+                        ref.read(pairingProvider.notifier).pair(code);
+                      }
+                    },
+                  ),
+                ),
+              ),
+            ),
+          );
+
     final appSurface = PopScope(
       onPopInvokedWithResult: (didPop, _) {
         if (didPop) {
           ref.read(pairingProvider.notifier).reset();
         }
       },
-      child: Scaffold(
-        appBar: addingCommunity
-            ? AppBar(
-                leading: IconButton(
-                  icon: const Icon(LucideIcons.arrowLeft),
-                  onPressed: () => Navigator.of(context).pop(),
-                ),
-                title: const Text('Add Community'),
-              )
-            : null,
-        body: SafeArea(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: Grid.sm),
-            child: pairingState.status == PairingStatus.confirmingSas
-                ? _SasVerificationView(
-                    sasCode: pairingState.sasCode ?? '------',
-                    confirmed: pairingState.userConfirmedSas,
-                    onConfirm: () =>
-                        ref.read(pairingProvider.notifier).confirmSas(),
-                    onDeny: () => ref.read(pairingProvider.notifier).denySas(),
-                  )
-                : Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const Spacer(flex: 2),
-
-                      Image.asset('assets/images/buzz-icon.png', height: 64),
-                      const SizedBox(height: Grid.xs),
-                      Text(
-                        'Welcome to Buzz',
-                        style: context.textTheme.headlineSmall,
-                      ),
-                      const SizedBox(height: Grid.xxs),
-                      Text(
-                        'Scan the QR code from your desktop app\nor paste a pairing code to connect.',
-                        textAlign: TextAlign.center,
-                        style: context.textTheme.bodyMedium?.copyWith(
-                          color: context.colors.onSurfaceVariant,
-                        ),
-                      ),
-
-                      const SizedBox(height: Grid.lg),
-
-                      // Scan QR button
-                      FilledButton.icon(
-                        onPressed: isBusy ? null : openScanner,
-                        icon: const Icon(LucideIcons.scanLine),
-                        label: const Text('Scan QR Code'),
-                      ),
-
-                      const SizedBox(height: Grid.sm),
-
-                      Row(
-                        children: [
-                          const Expanded(child: Divider()),
-                          Padding(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: Grid.twelve,
-                            ),
-                            child: Text(
-                              'or paste pairing code',
-                              style: context.textTheme.bodySmall?.copyWith(
-                                color: context.colors.onSurfaceVariant,
-                              ),
-                            ),
-                          ),
-                          const Expanded(child: Divider()),
-                        ],
-                      ),
-
-                      const SizedBox(height: Grid.sm),
-
-                      // Paste field
-                      TextField(
-                        controller: codeController,
-                        decoration: const InputDecoration(
-                          hintText: 'nostrpair://... or buzz://...',
-                          prefixIcon: Icon(LucideIcons.link),
-                          isDense: true,
-                        ),
-                        autocorrect: false,
-                        enableSuggestions: false,
-                        enabled: !isBusy,
-                        contextMenuBuilder: (context, editableTextState) {
-                          return AdaptiveTextSelectionToolbar.editableText(
-                            editableTextState: editableTextState,
-                          );
-                        },
-                      ),
-
-                      const SizedBox(height: Grid.twelve),
-
-                      // Connect button
-                      SizedBox(
-                        width: double.infinity,
-                        child: FilledButton(
-                          onPressed: isBusy
-                              ? null
-                              : () {
-                                  final code = codeController.text.trim();
-                                  if (code.isNotEmpty) {
-                                    ref
-                                        .read(pairingProvider.notifier)
-                                        .pair(code);
-                                  }
-                                },
-                          child: isBusy
-                              ? const SizedBox(
-                                  width: 20,
-                                  height: 20,
-                                  child: CircularProgressIndicator(
-                                    strokeWidth: 2,
-                                    color: Colors.white,
-                                  ),
-                                )
-                              : const Text('Connect'),
-                        ),
-                      ),
-
-                      // Error message
-                      if (pairingState.status == PairingStatus.error &&
-                          pairingState.errorMessage != null) ...[
-                        const SizedBox(height: Grid.twelve),
-                        Container(
-                          padding: const EdgeInsets.all(Grid.twelve),
-                          decoration: BoxDecoration(
-                            color: context.colors.errorContainer,
-                            borderRadius: BorderRadius.circular(8),
-                          ),
-                          child: Row(
-                            children: [
-                              Icon(
-                                LucideIcons.triangleAlert,
-                                size: 16,
-                                color: context.colors.onErrorContainer,
-                              ),
-                              const SizedBox(width: Grid.xxs),
-                              Expanded(
-                                child: Text(
-                                  pairingState.errorMessage!,
-                                  style: context.textTheme.bodySmall?.copyWith(
-                                    color: context.colors.onErrorContainer,
-                                  ),
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ],
-
-                      const Spacer(flex: 3),
-                    ],
-                  ),
-          ),
-        ),
-      ),
+      child: pairingScaffold,
     );
 
     if (!fallbackScannerVisible.value) {
@@ -313,13 +256,10 @@ class _SasVerificationView extends StatelessWidget {
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              SizedBox(
-                width: 20,
-                height: 20,
-                child: CircularProgressIndicator(
-                  strokeWidth: 2,
-                  color: context.colors.primary,
-                ),
+              BuzzLoadingIndicator(
+                size: 24,
+                color: context.colors.primary,
+                semanticLabel: 'Connecting',
               ),
               const SizedBox(width: Grid.twelve),
               Text(
diff --git a/mobile/lib/features/pairing/pairing_page/onboarding_background.dart b/mobile/lib/features/pairing/pairing_page/onboarding_background.dart
new file mode 100644
index 0000000000..7ad89477fc
--- /dev/null
+++ b/mobile/lib/features/pairing/pairing_page/onboarding_background.dart
@@ -0,0 +1,41 @@
+part of '../pairing_page.dart';
+
+class _OnboardingBackground extends StatelessWidget {
+  final Widget child;
+
+  const _OnboardingBackground({required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    return DecoratedBox(
+      key: const Key('pairing-onboarding-background'),
+      decoration: const BoxDecoration(
+        gradient: LinearGradient(
+          begin: Alignment.topCenter,
+          end: Alignment.bottomCenter,
+          colors: [_onboardingChartreuse, _onboardingShellBottom],
+        ),
+      ),
+      child: CustomPaint(painter: const _DotGridPainter(), child: child),
+    );
+  }
+}
+
+class _DotGridPainter extends CustomPainter {
+  const _DotGridPainter();
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final dotPaint = Paint()..color = _onboardingInk.withValues(alpha: 0.08);
+    const spacing = 24.0;
+
+    for (var x = 0.0; x <= size.width; x += spacing) {
+      for (var y = 0.0; y <= size.height; y += spacing) {
+        canvas.drawCircle(Offset(x, y), 1, dotPaint);
+      }
+    }
+  }
+
+  @override
+  bool shouldRepaint(_DotGridPainter oldDelegate) => false;
+}
diff --git a/mobile/lib/features/pairing/pairing_page/pairing_welcome_view.dart b/mobile/lib/features/pairing/pairing_page/pairing_welcome_view.dart
new file mode 100644
index 0000000000..49fc185133
--- /dev/null
+++ b/mobile/lib/features/pairing/pairing_page/pairing_welcome_view.dart
@@ -0,0 +1,261 @@
+part of '../pairing_page.dart';
+
+class _PairingWelcomeView extends StatelessWidget {
+  final TextEditingController codeController;
+  final bool isBusy;
+  final bool pairingCodeExpanded;
+  final String? errorMessage;
+  final VoidCallback onScan;
+  final VoidCallback onTogglePairingCode;
+  final VoidCallback onConnect;
+
+  const _PairingWelcomeView({
+    required this.codeController,
+    required this.isBusy,
+    required this.pairingCodeExpanded,
+    required this.errorMessage,
+    required this.onScan,
+    required this.onTogglePairingCode,
+    required this.onConnect,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final reducedMotion = MediaQuery.disableAnimationsOf(context);
+    final revealDuration = reducedMotion
+        ? Duration.zero
+        : const Duration(milliseconds: 220);
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        return SingleChildScrollView(
+          padding: const EdgeInsets.fromLTRB(
+            Grid.gutter,
+            Grid.sm,
+            Grid.gutter,
+            Grid.sm,
+          ),
+          child: ConstrainedBox(
+            constraints: BoxConstraints(
+              minHeight: constraints.maxHeight - (Grid.sm * 2),
+            ),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Container(
+                  width: 136,
+                  height: 136,
+                  alignment: Alignment.center,
+                  decoration: const BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: Color(0x4DFFFFFF),
+                  ),
+                  child: const TappableFlappingBee(
+                    width: 76,
+                    color: _onboardingInk,
+                  ),
+                ),
+                const SizedBox(height: Grid.sm),
+                Text(
+                  'Welcome to Buzz',
+                  textAlign: TextAlign.center,
+                  style: context.textTheme.headlineSmall?.copyWith(
+                    color: _onboardingInk,
+                    fontWeight: FontWeight.w600,
+                    letterSpacing: -0.4,
+                  ),
+                ),
+                const SizedBox(height: Grid.xxs),
+                Text(
+                  'Scan the QR code from your desktop app\nor paste a pairing code to connect.',
+                  textAlign: TextAlign.center,
+                  style: context.textTheme.bodyMedium?.copyWith(
+                    color: _onboardingMutedInk,
+                  ),
+                ),
+                const SizedBox(height: Grid.md),
+                ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 440),
+                  child: SizedBox(
+                    width: double.infinity,
+                    child: Column(
+                      children: [
+                        FilledButton(
+                          style: _onboardingButtonStyle,
+                          onPressed: isBusy ? null : onScan,
+                          child: isBusy && !pairingCodeExpanded
+                              ? const SizedBox(
+                                  width: 20,
+                                  height: 20,
+                                  child: BuzzLoadingIndicator(
+                                    size: 20,
+                                    color: _onboardingCtaLabel,
+                                    semanticLabel: 'Opening scanner',
+                                  ),
+                                )
+                              : const Text('Scan a QR code'),
+                        ),
+                        const SizedBox(height: Grid.xxs),
+                        TextButton(
+                          style: _onboardingSecondaryButtonStyle,
+                          onPressed: isBusy ? null : onTogglePairingCode,
+                          child: Text(
+                            pairingCodeExpanded
+                                ? 'Hide pairing code'
+                                : 'Use pairing code',
+                          ),
+                        ),
+                        AnimatedSwitcher(
+                          duration: revealDuration,
+                          switchInCurve: Curves.easeOutCubic,
+                          switchOutCurve: Curves.easeInCubic,
+                          transitionBuilder: (child, animation) {
+                            return SizeTransition(
+                              sizeFactor: animation,
+                              axisAlignment: -1,
+                              child: FadeTransition(
+                                opacity: animation,
+                                child: child,
+                              ),
+                            );
+                          },
+                          child: pairingCodeExpanded
+                              ? Column(
+                                  key: const ValueKey('pairing-code-fields'),
+                                  children: [
+                                    const SizedBox(height: Grid.twelve),
+                                    TextField(
+                                      controller: codeController,
+                                      style: context.textTheme.bodyMedium
+                                          ?.copyWith(color: _onboardingInk),
+                                      cursorColor: _onboardingInk,
+                                      decoration: InputDecoration(
+                                        filled: true,
+                                        fillColor: Colors.white.withValues(
+                                          alpha: 0.7,
+                                        ),
+                                        hintText:
+                                            'nostrpair://... or buzz://...',
+                                        hintStyle: context.textTheme.bodyMedium
+                                            ?.copyWith(
+                                              color: _onboardingMutedInk,
+                                            ),
+                                        prefixIcon: const Icon(
+                                          LucideIcons.link,
+                                          color: _onboardingInk,
+                                        ),
+                                        enabledBorder: _inputBorder,
+                                        disabledBorder: _inputBorder,
+                                        focusedBorder: _inputBorder.copyWith(
+                                          borderSide: const BorderSide(
+                                            color: _onboardingInk,
+                                          ),
+                                        ),
+                                        isDense: true,
+                                      ),
+                                      autocorrect: false,
+                                      enableSuggestions: false,
+                                      enabled: !isBusy,
+                                      contextMenuBuilder:
+                                          (context, editableTextState) {
+                                            return AdaptiveTextSelectionToolbar.editableText(
+                                              editableTextState:
+                                                  editableTextState,
+                                            );
+                                          },
+                                    ),
+                                    const SizedBox(height: Grid.twelve),
+                                    SizedBox(
+                                      width: double.infinity,
+                                      child: FilledButton(
+                                        style: _onboardingButtonStyle,
+                                        onPressed: isBusy ? null : onConnect,
+                                        child: isBusy
+                                            ? const SizedBox(
+                                                width: 20,
+                                                height: 20,
+                                                child: BuzzLoadingIndicator(
+                                                  size: 20,
+                                                  color: _onboardingCtaLabel,
+                                                  semanticLabel: 'Connecting',
+                                                ),
+                                              )
+                                            : const Text('Connect'),
+                                      ),
+                                    ),
+                                  ],
+                                )
+                              : const SizedBox(
+                                  key: ValueKey('pairing-code-fields-hidden'),
+                                ),
+                        ),
+                        if (errorMessage != null) ...[
+                          const SizedBox(height: Grid.twelve),
+                          Container(
+                            padding: const EdgeInsets.all(Grid.twelve),
+                            decoration: BoxDecoration(
+                              color: context.colors.errorContainer,
+                              borderRadius: BorderRadius.circular(Radii.md),
+                            ),
+                            child: Row(
+                              children: [
+                                Icon(
+                                  LucideIcons.triangleAlert,
+                                  size: 16,
+                                  color: context.colors.onErrorContainer,
+                                ),
+                                const SizedBox(width: Grid.xxs),
+                                Expanded(
+                                  child: Text(
+                                    errorMessage!,
+                                    style: context.textTheme.bodySmall
+                                        ?.copyWith(
+                                          color:
+                                              context.colors.onErrorContainer,
+                                        ),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ],
+                      ],
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
+
+final _inputBorder = OutlineInputBorder(
+  borderRadius: BorderRadius.circular(Radii.md),
+  borderSide: BorderSide(color: _onboardingInk.withValues(alpha: 0.18)),
+);
+
+final _onboardingButtonStyle = FilledButton.styleFrom(
+  minimumSize: const Size(0, 48),
+  padding: const EdgeInsets.symmetric(
+    horizontal: Grid.lg,
+    vertical: Grid.twelve,
+  ),
+  backgroundColor: _onboardingInk,
+  foregroundColor: _onboardingCtaLabel,
+  disabledBackgroundColor: _onboardingInk.withValues(alpha: 0.38),
+  disabledForegroundColor: _onboardingCtaLabel.withValues(alpha: 0.7),
+  shape: const StadiumBorder(),
+);
+
+final _onboardingSecondaryButtonStyle = TextButton.styleFrom(
+  minimumSize: const Size(0, 44),
+  padding: const EdgeInsets.symmetric(horizontal: Grid.md, vertical: Grid.xxs),
+  backgroundColor: _onboardingInk.withValues(alpha: 0.1),
+  foregroundColor: _onboardingInk,
+  disabledBackgroundColor: _onboardingInk.withValues(alpha: 0.05),
+  disabledForegroundColor: _onboardingInk.withValues(alpha: 0.45),
+  shape: const StadiumBorder(),
+);
diff --git a/mobile/lib/features/profile/profile_avatar.dart b/mobile/lib/features/profile/profile_avatar.dart
index 38cc3e6138..fb60fae125 100644
--- a/mobile/lib/features/profile/profile_avatar.dart
+++ b/mobile/lib/features/profile/profile_avatar.dart
@@ -3,10 +3,23 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
+import '../../shared/widgets/masked_avatar_badge.dart';
 import 'profile_provider.dart';
 import 'user_profile.dart';
 
+/// Matches desktop's sidebar profile card, whose avatar is 32px.
+const _avatarSize = 32.0;
+
+/// The visible dot is smaller than the notch it sits in, so a ring of
+/// background separates it from the avatar. Desktop's `h-2 w-2` dot inside a
+/// `h-3.5 w-3.5` badge frame.
+const _presenceDotRatio = 8 / 14;
+
 /// User avatar with a presence dot indicator, for use in the app bar.
+///
+/// The dot sits in a notch masked out of the avatar rather than overlapping it,
+/// the same treatment desktop's `SidebarProfileCard` uses — so it needs no
+/// background-coloured ring, and reads correctly over the themed top section.
 class ProfileAvatar extends ConsumerWidget {
   final VoidCallback? onTap;
   final bool showPresence;
@@ -32,7 +45,7 @@ class ProfileAvatar extends ConsumerWidget {
 
   Widget _buildPlaceholder(BuildContext context) {
     return CircleAvatar(
-      radius: 16,
+      radius: _avatarSize / 2,
       backgroundColor: context.colors.primaryContainer,
     );
   }
@@ -44,37 +57,37 @@ class ProfileAvatar extends ConsumerWidget {
   ) {
     return GestureDetector(
       onTap: onTap,
-      child: Stack(
-        children: [
-          AvatarImage(
-            imageUrl: profile?.avatarUrl,
-            radius: 16,
-            backgroundColor: context.colors.primaryContainer,
-            fallback: Text(
-              profile?.initial ?? '?',
-              style: context.textTheme.labelMedium?.copyWith(
-                color: context.colors.onPrimaryContainer,
-              ),
-            ),
-          ),
-          if (showPresence)
-            Positioned(
-              right: 0,
-              bottom: 0,
-              child: Container(
-                width: 10,
-                height: 10,
-                decoration: BoxDecoration(
-                  color: _presenceColor(context, presence),
-                  shape: BoxShape.circle,
-                  border: Border.all(
-                    color: context.theme.scaffoldBackgroundColor,
-                    width: 1.5,
-                  ),
+      child: MaskedAvatarBadge(
+        size: _avatarSize,
+        geometry: AvatarBadgeMaskGeometry.presenceDot,
+        avatar: ClipOval(
+          child: ColoredBox(
+            color: context.colors.primaryContainer,
+            child: AvatarImageContent(
+              imageUrl: profile?.avatarUrl,
+              fallback: Text(
+                profile?.initial ?? '?',
+                style: context.textTheme.labelMedium?.copyWith(
+                  color: context.colors.onPrimaryContainer,
                 ),
               ),
             ),
-        ],
+          ),
+        ),
+        badge: showPresence
+            ? Center(
+                child: FractionallySizedBox(
+                  widthFactor: _presenceDotRatio,
+                  heightFactor: _presenceDotRatio,
+                  child: DecoratedBox(
+                    decoration: BoxDecoration(
+                      color: _presenceColor(context, presence),
+                      shape: BoxShape.circle,
+                    ),
+                  ),
+                ),
+              )
+            : null,
       ),
     );
   }
diff --git a/mobile/lib/features/profile/set_status_sheet.dart b/mobile/lib/features/profile/set_status_sheet.dart
index 2249a0d6f8..2e03e4c110 100644
--- a/mobile/lib/features/profile/set_status_sheet.dart
+++ b/mobile/lib/features/profile/set_status_sheet.dart
@@ -1,33 +1,24 @@
+import 'dart:math' as math;
+
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
 
+import '../../shared/custom_emoji/custom_emoji.dart';
+import '../../shared/custom_emoji/custom_emoji_provider.dart';
+import '../../shared/custom_emoji/custom_emoji_render.dart';
 import '../../shared/theme/theme.dart';
-import '../custom_emoji/custom_emoji.dart';
-import '../custom_emoji/custom_emoji_provider.dart';
-import '../custom_emoji/custom_emoji_render.dart';
 import '../channels/emoji_picker.dart';
 import 'user_status.dart';
 import 'user_status_provider.dart';
 
-const _emojiOptions = [
-  (emoji: '\u{1F5E3}\u{FE0F}', label: 'In a meeting'),
-  (emoji: '\u{1F68C}', label: 'Commuting'),
-  (emoji: '\u{1F912}', label: 'Out sick'),
-  (emoji: '\u{1F3D6}\u{FE0F}', label: 'Vacationing'),
-  (emoji: '\u{1F3E0}', label: 'Working remotely'),
-  (emoji: '\u{1F354}', label: 'Lunch'),
-  (emoji: '\u{1F3AF}', label: 'Focus'),
-  (emoji: '\u{1F4AA}', label: 'Exercising'),
-];
-
-const _presets = [
-  (text: 'In a meeting', emoji: '\u{1F5E3}\u{FE0F}'),
-  (text: 'Commuting', emoji: '\u{1F68C}'),
-  (text: 'Out sick', emoji: '\u{1F912}'),
-  (text: 'Vacationing', emoji: '\u{1F3D6}\u{FE0F}'),
-  (text: 'Working remotely', emoji: '\u{1F3E0}'),
-];
+/// The emoji well and the text field are sized to be the two things you reach
+/// for, so they carry no borders — the sheet has no other controls to compete
+/// with them.
+const _emojiWellSize = 56.0;
+const _emojiGlyphSize = 32.0;
+const _saveButtonHeight = 52.0;
 
 void showSetStatusSheet(BuildContext context, {UserStatus? currentStatus}) {
   showModalBottomSheet<void>(
@@ -51,7 +42,6 @@ class _SetStatusSheet extends HookConsumerWidget {
     final emoji = useState(currentStatus?.emoji ?? '');
     final text = useState(currentStatus?.text ?? '');
     final isSaving = useState(false);
-    final customEmoji = ref.watch(customEmojiListProvider);
 
     useEffect(() {
       void listener() => text.value = textController.text;
@@ -91,7 +81,13 @@ class _SetStatusSheet extends HookConsumerWidget {
         Grid.gutter,
         0,
         Grid.gutter,
-        MediaQuery.viewInsetsOf(context).bottom,
+        // The sheet ends in the Save button, so it owns its own breathing room
+        // above whichever is taller: the keyboard, or the home indicator.
+        Grid.gutter +
+            math.max(
+              MediaQuery.viewInsetsOf(context).bottom,
+              MediaQuery.viewPaddingOf(context).bottom,
+            ),
       ),
       child: Column(
         mainAxisSize: MainAxisSize.min,
@@ -107,31 +103,77 @@ class _SetStatusSheet extends HookConsumerWidget {
           ),
           const SizedBox(height: Grid.twelve),
 
-          // Text input with emoji preview
+          // The emoji well doubles as the picker's entry point, which is why
+          // there is no separate row of emoji suggestions below.
           Row(
             children: [
-              Container(
-                width: 40,
-                height: 40,
-                alignment: Alignment.center,
-                decoration: BoxDecoration(
-                  border: Border.all(color: context.colors.outlineVariant),
-                  borderRadius: BorderRadius.circular(Radii.md),
-                ),
-                child: _StatusEmojiPreview(emoji: emoji.value),
+              Stack(
+                clipBehavior: Clip.none,
+                children: [
+                  Semantics(
+                    button: true,
+                    label: 'Choose a status emoji',
+                    child: InkWell(
+                      borderRadius: BorderRadius.circular(Radii.lg),
+                      onTap: () => showEmojiPicker(
+                        context: context,
+                        onSelect: (value) => emoji.value = value,
+                      ),
+                      child: SizedBox.square(
+                        dimension: _emojiWellSize,
+                        child: Center(
+                          child: _StatusEmojiPreview(emoji: emoji.value),
+                        ),
+                      ),
+                    ),
+                  ),
+                  if (emoji.value.isNotEmpty)
+                    Positioned(
+                      top: -Grid.quarter,
+                      right: -Grid.quarter,
+                      child: SizedBox.square(
+                        dimension: Grid.sm,
+                        child: IconButton(
+                          onPressed: isSaving.value
+                              ? null
+                              : () => emoji.value = '',
+                          tooltip: 'Remove status emoji',
+                          visualDensity: VisualDensity.compact,
+                          style: IconButton.styleFrom(
+                            backgroundColor: context.colors.surface,
+                            minimumSize: const Size.square(Grid.sm),
+                            maximumSize: const Size.square(Grid.sm),
+                            padding: EdgeInsets.zero,
+                            tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                          ),
+                          icon: Icon(
+                            LucideIcons.x,
+                            size: 14,
+                            color: context.colors.onSurface,
+                          ),
+                        ),
+                      ),
+                    ),
+                ],
               ),
-              const SizedBox(width: Grid.xxs),
+              const SizedBox(width: Grid.half),
               Expanded(
                 child: TextField(
                   controller: textController,
                   autofocus: true,
-                  decoration: const InputDecoration(
+                  style: context.textTheme.titleMedium,
+                  decoration: InputDecoration(
                     hintText: 'What\u2019s your status?',
-                    border: OutlineInputBorder(),
-                    contentPadding: EdgeInsets.symmetric(
-                      horizontal: Grid.twelve,
-                      vertical: Grid.xxs,
+                    hintStyle: context.textTheme.titleMedium?.copyWith(
+                      color: context.colors.onSurfaceVariant,
                     ),
+                    // The theme outlines inputs; this one is the sheet's whole
+                    // content, so every border state is cleared explicitly.
+                    border: InputBorder.none,
+                    enabledBorder: InputBorder.none,
+                    focusedBorder: InputBorder.none,
+                    isDense: false,
+                    contentPadding: EdgeInsets.zero,
                   ),
                   textInputAction: TextInputAction.done,
                   onSubmitted: (_) {
@@ -141,74 +183,28 @@ class _SetStatusSheet extends HookConsumerWidget {
               ),
             ],
           ),
-          const SizedBox(height: Grid.twelve),
+          const SizedBox(height: Grid.gutter),
 
-          Wrap(
-            spacing: Grid.half,
-            runSpacing: Grid.half,
-            children: [
-              for (final option in _emojiOptions)
-                _EmojiButton(
-                  emoji: option.emoji,
-                  label: option.label,
-                  selected: emoji.value == option.emoji,
-                  onTap: () {
-                    emoji.value = emoji.value == option.emoji
-                        ? ''
-                        : option.emoji;
-                  },
-                ),
-              if (customEmoji.isNotEmpty)
-                _PickCustomEmojiButton(
-                  selected: emoji.value.startsWith(':'),
-                  onTap: () => showEmojiPicker(
-                    context: context,
-                    onSelect: (value) => emoji.value = value,
-                  ),
-                ),
-            ],
+          SizedBox(
+            width: double.infinity,
+            height: _saveButtonHeight,
+            child: FilledButton(
+              onPressed: hasContent && !isSaving.value ? handleSave : null,
+              child: const Text('Save'),
+            ),
           ),
-          const SizedBox(height: Grid.twelve),
-
-          // Presets
-          Wrap(
-            spacing: Grid.half,
-            runSpacing: Grid.half,
-            children: [
-              for (final preset in _presets)
-                ActionChip(
-                  label: Text('${preset.emoji} ${preset.text}'),
-                  labelStyle: context.textTheme.labelSmall,
-                  onPressed: () {
-                    textController.text = preset.text;
-                    emoji.value = preset.emoji;
-                  },
-                ),
-            ],
-          ),
-          const SizedBox(height: Grid.xs),
-
-          Row(
-            children: [
-              if (hasExistingStatus)
-                TextButton(
+          // No Cancel \u2014 the sheet dismisses by swiping down.
+          if (hasExistingStatus)
+            Padding(
+              padding: const EdgeInsets.only(top: Grid.half),
+              child: SizedBox(
+                width: double.infinity,
+                child: TextButton(
                   onPressed: isSaving.value ? null : handleClear,
                   child: const Text('Clear status'),
                 ),
-              const Spacer(),
-              TextButton(
-                onPressed: isSaving.value
-                    ? null
-                    : () => Navigator.of(context).pop(),
-                child: const Text('Cancel'),
               ),
-              const SizedBox(width: Grid.xxs),
-              FilledButton(
-                onPressed: hasContent && !isSaving.value ? handleSave : null,
-                child: const Text('Save'),
-              ),
-            ],
-          ),
+            ),
         ],
       ),
     );
@@ -223,7 +219,11 @@ class _StatusEmojiPreview extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     if (emoji.isEmpty) {
-      return const Text('\u{1F4AC}', style: TextStyle(fontSize: 18));
+      return Icon(
+        LucideIcons.smilePlus,
+        size: _emojiGlyphSize,
+        color: context.colors.onSurfaceVariant,
+      );
     }
     final palette = ref.watch(customEmojiListProvider);
     final shortcode = normalizeShortcode(emoji);
@@ -233,84 +233,11 @@ class _StatusEmojiPreview extends ConsumerWidget {
           return CustomEmojiImage(
             shortcode: shortcode,
             url: entry.url,
-            size: 22,
+            size: _emojiGlyphSize,
           );
         }
       }
     }
-    return Text(emoji, style: const TextStyle(fontSize: 18));
-  }
-}
-
-class _PickCustomEmojiButton extends StatelessWidget {
-  final bool selected;
-  final VoidCallback onTap;
-
-  const _PickCustomEmojiButton({required this.selected, required this.onTap});
-
-  @override
-  Widget build(BuildContext context) {
-    return Tooltip(
-      message: 'Custom emoji',
-      child: InkWell(
-        borderRadius: BorderRadius.circular(Radii.md),
-        onTap: onTap,
-        child: Container(
-          width: 36,
-          height: 36,
-          alignment: Alignment.center,
-          decoration: BoxDecoration(
-            color: selected
-                ? context.colors.secondaryContainer
-                : Colors.transparent,
-            borderRadius: BorderRadius.circular(Radii.md),
-            border: selected ? Border.all(color: context.colors.outline) : null,
-          ),
-          child: Icon(
-            Icons.add_reaction_outlined,
-            size: 18,
-            color: context.colors.onSurfaceVariant,
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _EmojiButton extends StatelessWidget {
-  final String emoji;
-  final String label;
-  final bool selected;
-  final VoidCallback onTap;
-
-  const _EmojiButton({
-    required this.emoji,
-    required this.label,
-    required this.selected,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Tooltip(
-      message: label,
-      child: InkWell(
-        borderRadius: BorderRadius.circular(Radii.md),
-        onTap: onTap,
-        child: Container(
-          width: 36,
-          height: 36,
-          alignment: Alignment.center,
-          decoration: BoxDecoration(
-            color: selected
-                ? context.colors.secondaryContainer
-                : Colors.transparent,
-            borderRadius: BorderRadius.circular(Radii.md),
-            border: selected ? Border.all(color: context.colors.outline) : null,
-          ),
-          child: Text(emoji, style: const TextStyle(fontSize: 18)),
-        ),
-      ),
-    );
+    return Text(emoji, style: const TextStyle(fontSize: _emojiGlyphSize));
   }
 }
diff --git a/mobile/lib/features/profile/settings_profile_header.dart b/mobile/lib/features/profile/settings_profile_header.dart
new file mode 100644
index 0000000000..23816ccaa9
--- /dev/null
+++ b/mobile/lib/features/profile/settings_profile_header.dart
@@ -0,0 +1,157 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
+
+import '../../shared/custom_emoji/custom_emoji_provider.dart';
+import '../../shared/custom_emoji/custom_emoji_render.dart';
+import '../../shared/theme/theme.dart';
+import '../../shared/widgets/avatar_image.dart';
+import '../../shared/widgets/masked_avatar_badge.dart';
+import 'profile_provider.dart';
+import 'set_status_sheet.dart';
+import 'user_status_provider.dart';
+
+/// Desktop's settings-avatar treatment (`ProfileSettingsCard`): a large centred
+/// avatar with a circular badge notched out of its bottom-right corner. Desktop
+/// puts an edit-photo pencil in that badge; here it carries the status glyph and
+/// opens the status sheet instead. The notch shape — including the fillets where
+/// it meets the avatar's edge — comes from [AvatarBadgeMaskGeometry.badge].
+class SettingsProfileHeader extends ConsumerWidget {
+  const SettingsProfileHeader({super.key});
+
+  static const _avatarSize = 128.0;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final profile = ref.watch(profileProvider).asData?.value;
+    final status = ref.watch(userStatusProvider).asData?.value;
+    final hasStatus = status != null && !status.isEmpty;
+
+    void openStatusSheet() =>
+        showSetStatusSheet(context, currentStatus: status);
+
+    return Padding(
+      padding: const EdgeInsets.only(top: Grid.xxs, bottom: Grid.sm),
+      child: Column(
+        children: [
+          MaskedAvatarBadge(
+            size: _avatarSize,
+            avatar: ColoredBox(
+              color: context.colors.primaryContainer,
+              child: AvatarImageContent(
+                imageUrl: profile?.avatarUrl,
+                fallback: Text(
+                  profile?.initial ?? '?',
+                  style: context.textTheme.displaySmall?.copyWith(
+                    color: context.colors.onPrimaryContainer,
+                  ),
+                ),
+              ),
+            ),
+            badge: _StatusBadge(
+              emoji: status?.emoji ?? '',
+              onTap: openStatusSheet,
+            ),
+          ),
+          const SizedBox(height: Grid.twelve),
+          Text(
+            profile?.label ?? 'Your profile',
+            style: context.textTheme.titleMedium,
+            textAlign: TextAlign.center,
+          ),
+          // No placeholder copy — the badge is the affordance, so this line
+          // appears only once there is an actual status to show.
+          if (hasStatus)
+            GestureDetector(
+              onTap: openStatusSheet,
+              child: Padding(
+                padding: const EdgeInsets.only(
+                  top: Grid.quarter,
+                  left: Grid.gutter,
+                  right: Grid.gutter,
+                  bottom: Grid.half,
+                ),
+                child: Text(
+                  status.text.isNotEmpty ? status.text : status.emoji,
+                  style: context.textTheme.bodySmall?.copyWith(
+                    color: context.colors.onSurfaceVariant,
+                  ),
+                  textAlign: TextAlign.center,
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+/// Fills the notch left by [MaskedAvatarBadge], so its size comes from the mask
+/// geometry rather than being set here.
+class _StatusBadge extends StatelessWidget {
+  const _StatusBadge({required this.emoji, required this.onTap});
+
+  final String emoji;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return Semantics(
+      button: true,
+      label: 'Set a status',
+      child: GestureDetector(
+        onTap: onTap,
+        child: DecoratedBox(
+          decoration: BoxDecoration(
+            color: context.colors.surfaceContainerHighest,
+            shape: BoxShape.circle,
+          ),
+          child: Center(child: _StatusGlyph(emoji: emoji)),
+        ),
+      ),
+    );
+  }
+}
+
+/// The status emoji, resolving `:shortcode:` values against the community's
+/// custom emoji. Falls back to the add-status icon when no status is set.
+class _StatusGlyph extends ConsumerWidget {
+  const _StatusGlyph({required this.emoji});
+
+  final String emoji;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    if (emoji.isEmpty) {
+      return Icon(
+        LucideIcons.smilePlus,
+        size: 20,
+        color: context.colors.onSurfaceVariant,
+      );
+    }
+
+    final shortcode = emoji.startsWith(':') && emoji.endsWith(':')
+        ? emoji.substring(1, emoji.length - 1).toLowerCase()
+        : null;
+    if (shortcode != null) {
+      for (final entry in ref.watch(customEmojiListProvider)) {
+        if (entry.shortcode == shortcode) {
+          return CustomEmojiImage(
+            shortcode: shortcode,
+            url: entry.url,
+            size: 22,
+          );
+        }
+      }
+      return Icon(
+        LucideIcons.smile,
+        size: 20,
+        color: context.colors.onSurfaceVariant,
+      );
+    }
+
+    return Text(emoji, style: const TextStyle(fontSize: 20));
+  }
+}
diff --git a/mobile/lib/features/profile/user_profile.dart b/mobile/lib/features/profile/user_profile.dart
index 4e74159016..de58d955e3 100644
--- a/mobile/lib/features/profile/user_profile.dart
+++ b/mobile/lib/features/profile/user_profile.dart
@@ -39,3 +39,10 @@ class UserProfile {
       (displayName?.isNotEmpty == true ? displayName! : pubkey)[0]
           .toUpperCase();
 }
+
+/// Optional profile handle shown beside a message author's display name.
+String? messageUsernameLabel(UserProfile? profile) {
+  final handle = profile?.nip05Handle?.trim();
+  if (handle != null && handle.isNotEmpty) return handle;
+  return null;
+}
diff --git a/mobile/lib/features/pulse/compose_note_page.dart b/mobile/lib/features/pulse/compose_note_page.dart
index 2c514d6a71..d3df98ee89 100644
--- a/mobile/lib/features/pulse/compose_note_page.dart
+++ b/mobile/lib/features/pulse/compose_note_page.dart
@@ -4,6 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
 import '../channels/message_content.dart';
@@ -76,10 +77,15 @@ class ComposeNotePage extends HookConsumerWidget {
                 shape: const StadiumBorder(),
               ),
               child: isSending.value
-                  ? const SizedBox(
+                  ? SizedBox(
                       width: 16,
                       height: 16,
-                      child: CircularProgressIndicator(strokeWidth: 2),
+                      child: BuzzLoadingIndicator(
+                        size: 16,
+                        semanticLabel: _isReply
+                            ? 'Sending reply'
+                            : 'Publishing post',
+                      ),
                     )
                   : Text(_isReply ? 'Reply' : 'Post'),
             ),
@@ -198,20 +204,24 @@ class _ReplyContext extends ConsumerWidget {
                   children: [
                     Row(
                       children: [
-                        Flexible(
+                        Expanded(
                           child: Text(
                             displayName,
-                            style: context.textTheme.labelMedium?.copyWith(
-                              fontWeight: FontWeight.w700,
-                            ),
+                            maxLines: 1,
+                            style: messageUsernameTextStyle,
                             overflow: TextOverflow.ellipsis,
                           ),
                         ),
                         const SizedBox(width: Grid.half),
-                        Text(
-                          formatPulseRelativeTime(note.createdAt),
-                          style: context.textTheme.labelSmall?.copyWith(
-                            color: context.colors.onSurfaceVariant,
+                        ConstrainedBox(
+                          constraints: const BoxConstraints(maxWidth: Grid.xxl),
+                          child: Text(
+                            formatPulseRelativeTime(note.createdAt),
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: messageTimestampTextStyle.copyWith(
+                              color: context.colors.onSurfaceVariant,
+                            ),
                           ),
                         ),
                       ],
@@ -229,6 +239,9 @@ class _ReplyContext extends ConsumerWidget {
                           child: MessageContent(
                             content: note.content,
                             tags: note.tags,
+                            baseStyle: messageBodyTextStyle.copyWith(
+                              color: context.colors.onSurface,
+                            ),
                           ),
                         ),
                       ),
diff --git a/mobile/lib/features/pulse/note_card.dart b/mobile/lib/features/pulse/note_card.dart
index c843de7010..d99e3ada4b 100644
--- a/mobile/lib/features/pulse/note_card.dart
+++ b/mobile/lib/features/pulse/note_card.dart
@@ -89,33 +89,47 @@ class NoteCard extends HookConsumerWidget {
                         onTap: () => showUserProfileSheet(context, note.pubkey),
                         child: Row(
                           children: [
-                            Flexible(
-                              child: Text(
-                                displayName,
-                                style: context.textTheme.labelMedium?.copyWith(
-                                  fontWeight: FontWeight.w700,
-                                ),
-                                overflow: TextOverflow.ellipsis,
+                            Expanded(
+                              child: Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  Flexible(
+                                    child: Text(
+                                      displayName,
+                                      maxLines: 1,
+                                      style: messageUsernameTextStyle,
+                                      overflow: TextOverflow.ellipsis,
+                                    ),
+                                  ),
+                                  if (isAgent) ...[
+                                    const SizedBox(width: Grid.half),
+                                    Icon(
+                                      LucideIcons.bot,
+                                      size: 13,
+                                      color: context.colors.primary,
+                                    ),
+                                  ],
+                                ],
                               ),
                             ),
-                            if (isAgent) ...[
-                              const SizedBox(width: Grid.half),
-                              Icon(
-                                LucideIcons.bot,
-                                size: 13,
-                                color: context.colors.primary,
+                            const SizedBox(width: Grid.xxs),
+                            ConstrainedBox(
+                              constraints: const BoxConstraints(
+                                maxWidth: Grid.xl,
                               ),
-                            ],
+                              child: Text(
+                                formatPulseRelativeTime(note.createdAt),
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                                style: messageTimestampTextStyle.copyWith(
+                                  color: context.colors.onSurfaceVariant,
+                                ),
+                              ),
+                            ),
                           ],
                         ),
                       ),
                     ),
-                    Text(
-                      formatPulseRelativeTime(note.createdAt),
-                      style: context.textTheme.labelSmall?.copyWith(
-                        color: context.colors.onSurfaceVariant,
-                      ),
-                    ),
                     if (canFollow) ...[
                       const SizedBox(width: Grid.half),
                       _FollowButton(
@@ -142,14 +156,20 @@ class NoteCard extends HookConsumerWidget {
                   ),
                 ],
                 const SizedBox(height: Grid.half),
-                MessageContent(content: note.content, tags: note.tags),
+                MessageContent(
+                  content: note.content,
+                  tags: note.tags,
+                  baseStyle: messageBodyTextStyle.copyWith(
+                    color: context.colors.onSurface,
+                  ),
+                ),
                 const SizedBox(height: Grid.xxs),
                 Row(
                   children: [
                     _ActionButton(
                       icon: effectiveUpvoted
                           ? Icons.favorite
-                          : Icons.favorite_border,
+                          : LucideIcons.heart,
                       label: effectiveCount > 0 ? '$effectiveCount' : null,
                       color: effectiveUpvoted ? Colors.redAccent : null,
                       onTap: () async {
diff --git a/mobile/lib/features/pulse/pulse_actions.dart b/mobile/lib/features/pulse/pulse_actions.dart
index f1657abd13..13b5dee667 100644
--- a/mobile/lib/features/pulse/pulse_actions.dart
+++ b/mobile/lib/features/pulse/pulse_actions.dart
@@ -2,8 +2,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../shared/relay/relay.dart';
 import '../channels/channel_management_provider.dart';
-import '../custom_emoji/custom_emoji.dart';
-import '../custom_emoji/custom_emoji_provider.dart';
+import '../../shared/custom_emoji/custom_emoji.dart';
+import '../../shared/custom_emoji/custom_emoji_provider.dart';
 import 'pulse_models.dart';
 import 'pulse_provider.dart';
 
diff --git a/mobile/lib/features/search/recent_searches_provider.dart b/mobile/lib/features/search/recent_searches_provider.dart
new file mode 100644
index 0000000000..2fad17832e
--- /dev/null
+++ b/mobile/lib/features/search/recent_searches_provider.dart
@@ -0,0 +1,72 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../../shared/relay/relay.dart';
+import '../../shared/theme/theme_provider.dart';
+
+const _recentSearchesPrefsKey = 'recent_searches_v1';
+const _maxRecentSearches = 6;
+
+/// Device-local history of explicitly submitted searches, newest first.
+///
+/// Queries are scoped by community and account so searches from one identity
+/// cannot appear after switching to another.
+class RecentSearchesNotifier extends Notifier<List<String>> {
+  late String _prefsKey;
+
+  @override
+  List<String> build() {
+    final config = ref.watch(relayConfigProvider);
+    final pubkey = ref.watch(myPubkeyProvider) ?? 'anon';
+    _prefsKey = '$_recentSearchesPrefsKey:${config.baseUrl}:$pubkey';
+
+    final prefs = ref.read(savedPrefsProvider);
+    final stored =
+        readMigratedPref<List<String>>(
+          prefs,
+          canonicalKey: _prefsKey,
+          legacyKey: '$_recentSearchesPrefsKey:${config.storedOrigin}:$pubkey',
+          read: prefs.getStringList,
+          write: prefs.setStringList,
+        ) ??
+        const [];
+    return List.unmodifiable(
+      stored
+          .map((query) => query.trim())
+          .where((query) => query.isNotEmpty)
+          .take(_maxRecentSearches),
+    );
+  }
+
+  /// Records [query] as the most recent search after trimming whitespace.
+  ///
+  /// Empty queries are ignored. Existing matches are deduplicated
+  /// case-insensitively, the newest spelling is retained, the history is capped
+  /// at six entries, and the result is persisted for the current community and
+  /// account.
+  void record(String query) {
+    final trimmed = query.trim();
+    if (trimmed.isEmpty) return;
+
+    final normalized = trimmed.toLowerCase();
+    final next = [
+      trimmed,
+      ...state.where((item) => item.toLowerCase() != normalized),
+    ].take(_maxRecentSearches).toList(growable: false);
+    _persist(next);
+  }
+
+  /// Clears the current community and account's history and persists it empty.
+  void clear() => _persist(const []);
+
+  void _persist(List<String> searches) {
+    state = List.unmodifiable(searches);
+    ref.read(savedPrefsProvider).setStringList(_prefsKey, searches);
+  }
+}
+
+/// Provides device-local recent searches scoped to the active community and
+/// account.
+final recentSearchesProvider =
+    NotifierProvider<RecentSearchesNotifier, List<String>>(
+      RecentSearchesNotifier.new,
+    );
diff --git a/mobile/lib/features/search/search_page.dart b/mobile/lib/features/search/search_page.dart
index b7040ed1c8..b608b65aef 100644
--- a/mobile/lib/features/search/search_page.dart
+++ b/mobile/lib/features/search/search_page.dart
@@ -5,9 +5,11 @@ import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/avatar_image.dart';
+import '../../shared/widgets/buzz_loading_indicator.dart';
 import '../../shared/widgets/filter_chip_bar.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
+import '../../shared/widgets/message_author_meta.dart';
 import '../channels/channel.dart';
 import '../channels/channel_detail_page.dart';
 import '../channels/channel_management_provider.dart';
@@ -19,10 +21,29 @@ import '../forum/forum_thread_page.dart';
 import '../profile/profile_provider.dart';
 import '../profile/user_cache_provider.dart';
 import '../profile/user_profile.dart';
+import 'recent_searches_provider.dart';
 import 'search_provider.dart';
 
 enum _SearchFilter { all, messages, channels, people }
 
+const _searchFieldMinHeight = 36.0;
+const _searchFieldVerticalPadding = Grid.xxs;
+const _searchFieldHint = 'Search messages, channels, people\u2026';
+const _searchCancelEnterDuration = Duration(milliseconds: 160);
+const _searchCancelExitDuration = Duration(milliseconds: 120);
+
+double _searchFieldHeight(BuildContext context) {
+  const style = searchInputTextStyle;
+  final scaledFontSize = MediaQuery.textScalerOf(
+    context,
+  ).scale(style.fontSize ?? 15);
+  final contentHeight =
+      scaledFontSize * (style.height ?? 1) + _searchFieldVerticalPadding * 2;
+  return contentHeight > _searchFieldMinHeight
+      ? contentHeight
+      : _searchFieldMinHeight;
+}
+
 class SearchPage extends HookConsumerWidget {
   const SearchPage({super.key});
 
@@ -35,56 +56,190 @@ class SearchPage extends HookConsumerWidget {
         .value;
     final activeFilter = useState(_SearchFilter.all);
     final textController = useTextEditingController();
-    final hasText = useListenableSelector(
-      textController,
-      () => textController.text.isNotEmpty,
+    final focusNode = useFocusNode();
+    final isSearchFocused = useListenableSelector(
+      focusNode,
+      () => focusNode.hasFocus,
     );
+    final reduceMotion = MediaQuery.disableAnimationsOf(context);
+    final isBuzzTheme = context.appColors.topSectionGradient != null;
+    final buzzSearchColor = context.theme.brightness == Brightness.dark
+        ? Colors.white
+        : Colors.black;
+    final searchSurfaceColor = isBuzzTheme
+        ? buzzSearchColor.withValues(alpha: 0.04)
+        : context.colors.surfaceContainerHighest;
+    final searchMutedColor = isBuzzTheme
+        ? buzzSearchColor.withValues(alpha: 0.4)
+        : context.colors.onSurfaceVariant;
+    final headerTitleStyle = context.textTheme.titleMedium?.copyWith(
+      fontSize: 22,
+      fontWeight: FontWeight.w600,
+    );
+    final searchFieldHeight = _searchFieldHeight(context);
+    final searchControlHeight = searchFieldHeight > Grid.xl
+        ? searchFieldHeight
+        : Grid.xl;
+    final searchHeaderBottomHeight = searchControlHeight + Grid.twelve;
+
+    void runRecentSearch(String query) {
+      textController.value = TextEditingValue(
+        text: query,
+        selection: TextSelection.collapsed(offset: query.length),
+      );
+      focusNode.requestFocus();
+      ref.read(recentSearchesProvider.notifier).record(query);
+      ref.read(searchProvider.notifier).search(query);
+    }
 
     return FrostedScaffold(
-      resizeToAvoidBottomInset: true,
+      backgroundColor: Colors.transparent,
+      // Keep the empty state centered in the page rather than the portion left
+      // above the keyboard.
+      resizeToAvoidBottomInset: false,
       appBar: FrostedAppBar(
-        title: Container(
-          height: 36,
-          padding: const EdgeInsets.symmetric(horizontal: Grid.half),
-          decoration: BoxDecoration(
-            color: context.colors.surfaceContainerHighest,
-            borderRadius: BorderRadius.circular(Radii.lg),
+        automaticallyImplyLeading: false,
+        gradient: context.appColors.topSectionGradient,
+        title: const Text('Search'),
+        titleStyle: headerTitleStyle,
+        bottomHeight: searchHeaderBottomHeight,
+        bottom: Padding(
+          padding: const EdgeInsets.fromLTRB(
+            Grid.gutter,
+            0,
+            Grid.gutter,
+            Grid.twelve,
           ),
-          child: TextField(
-            controller: textController,
-            decoration: InputDecoration(
-              hintText: 'Search messages, channels, people\u2026',
-              hintStyle: context.textTheme.bodyMedium?.copyWith(
-                color: context.colors.onSurfaceVariant,
+          child: Row(
+            children: [
+              Expanded(
+                child: Container(
+                  key: const Key('search-field-container'),
+                  height: searchFieldHeight,
+                  padding: const EdgeInsets.symmetric(horizontal: Grid.half),
+                  decoration: BoxDecoration(
+                    color: searchSurfaceColor,
+                    borderRadius: BorderRadius.circular(Radii.lg),
+                  ),
+                  child: TextField(
+                    key: const Key('search-field'),
+                    controller: textController,
+                    focusNode: focusNode,
+                    decoration: InputDecoration(
+                      hintText: isSearchFocused ? null : _searchFieldHint,
+                      hintStyle: searchInputTextStyle.copyWith(
+                        color: searchMutedColor,
+                      ),
+                      prefixIcon: Icon(
+                        LucideIcons.search,
+                        size: 16,
+                        color: searchMutedColor,
+                      ),
+                      prefixIconConstraints: const BoxConstraints(minWidth: 32),
+                      border: InputBorder.none,
+                      enabledBorder: InputBorder.none,
+                      focusedBorder: InputBorder.none,
+                      isDense: true,
+                      contentPadding: const EdgeInsets.symmetric(
+                        vertical: _searchFieldVerticalPadding,
+                      ),
+                    ),
+                    style: searchInputTextStyle.copyWith(
+                      color: context.colors.onSurface,
+                    ),
+                    textInputAction: TextInputAction.search,
+                    onChanged: (value) =>
+                        ref.read(searchProvider.notifier).search(value),
+                    onSubmitted: (value) {
+                      final query = value.trim();
+                      if (query.isEmpty) return;
+                      ref.read(recentSearchesProvider.notifier).record(query);
+                    },
+                  ),
+                ),
               ),
-              prefixIcon: const Icon(LucideIcons.search, size: 16),
-              prefixIconConstraints: const BoxConstraints(minWidth: 32),
-              border: InputBorder.none,
-              enabledBorder: InputBorder.none,
-              focusedBorder: InputBorder.none,
-              isDense: true,
-              contentPadding: const EdgeInsets.symmetric(vertical: Grid.xxs),
-            ),
-            style: context.textTheme.bodyMedium,
-            onChanged: (value) =>
-                ref.read(searchProvider.notifier).search(value),
+              AnimatedSwitcher(
+                duration: reduceMotion
+                    ? Duration.zero
+                    : _searchCancelEnterDuration,
+                reverseDuration: reduceMotion
+                    ? Duration.zero
+                    : _searchCancelExitDuration,
+                transitionBuilder: (child, animation) {
+                  final curvedAnimation = CurvedAnimation(
+                    parent: animation,
+                    curve: Curves.easeOutCubic,
+                    reverseCurve: Curves.easeInCubic,
+                  );
+                  return SizeTransition(
+                    sizeFactor: curvedAnimation,
+                    axis: Axis.horizontal,
+                    axisAlignment: 1,
+                    child: FadeTransition(
+                      opacity: curvedAnimation,
+                      child: SlideTransition(
+                        position: Tween<Offset>(
+                          begin: const Offset(0.35, 0),
+                          end: Offset.zero,
+                        ).animate(curvedAnimation),
+                        child: child,
+                      ),
+                    ),
+                  );
+                },
+                child: isSearchFocused
+                    ? Padding(
+                        key: const ValueKey('search-cancel-visible'),
+                        padding: const EdgeInsets.only(left: Grid.xxs),
+                        child: TextButton(
+                          key: const Key('search-cancel'),
+                          onPressed: () {
+                            textController.clear();
+                            ref.read(searchProvider.notifier).clear();
+                            focusNode.unfocus();
+                          },
+                          style: TextButton.styleFrom(
+                            foregroundColor: context.colors.primary,
+                            minimumSize: Size(0, searchControlHeight),
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: Grid.half,
+                              vertical: Grid.xxs,
+                            ),
+                            tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                          ),
+                          child: Text(
+                            'Cancel',
+                            style: filterChipTextStyle.copyWith(
+                              color: context.colors.primary,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                      )
+                    : const SizedBox.shrink(
+                        key: ValueKey('search-cancel-hidden'),
+                      ),
+              ),
+            ],
           ),
         ),
-        actions: [
-          if (hasText)
-            IconButton(
-              icon: const Icon(LucideIcons.x, size: 20),
-              onPressed: () {
-                textController.clear();
-                ref.read(searchProvider.notifier).clear();
-              },
-            ),
-        ],
+        actions: const [],
       ),
       body: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
-          SizedBox(height: frostedAppBarHeight(context)),
+          SizedBox(
+            height: frostedAppBarHeight(
+              context,
+              bottomHeight: searchHeaderBottomHeight,
+              titleStyle: headerTitleStyle,
+            ),
+          ),
           FilterChipBar<_SearchFilter>(
+            expandItems: true,
+            visualDensity: const VisualDensity(horizontal: -2),
+            chipVerticalPadding: Grid.xxs,
+            barVerticalPadding: Grid.twelve,
             selected: activeFilter.value,
             onSelected: (f) => activeFilter.value = f,
             items: [
@@ -97,6 +252,7 @@ class SearchPage extends HookConsumerWidget {
               state: searchState,
               filter: activeFilter.value,
               currentPubkey: currentPubkey,
+              onRecentSearchSelected: runRecentSearch,
             ),
           ),
         ],
@@ -109,21 +265,48 @@ class _SearchBody extends ConsumerWidget {
   final SearchState state;
   final _SearchFilter filter;
   final String? currentPubkey;
+  final ValueChanged<String> onRecentSearchSelected;
 
   const _SearchBody({
     required this.state,
     required this.filter,
     required this.currentPubkey,
+    required this.onRecentSearchSelected,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     if (state.query.isEmpty) {
+      final recentSearches = ref.watch(recentSearchesProvider);
+      if (recentSearches.isNotEmpty) {
+        return _RecentSearches(
+          searches: recentSearches,
+          onSelected: onRecentSearchSelected,
+          onClear: ref.read(recentSearchesProvider.notifier).clear,
+        );
+      }
+
       return Center(
-        child: Text(
-          'Search messages, channels, and people',
-          style: context.textTheme.bodyMedium?.copyWith(
-            color: context.colors.onSurfaceVariant,
+        child: Padding(
+          key: const Key('search-empty-state'),
+          padding: const EdgeInsets.symmetric(horizontal: Grid.gutter),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Icon(
+                LucideIcons.search,
+                size: 64,
+                color: context.colors.onSurfaceVariant,
+              ),
+              const SizedBox(height: Grid.xs),
+              Text(
+                'Search messages, channels, and people',
+                textAlign: TextAlign.center,
+                style: context.textTheme.bodyMedium?.copyWith(
+                  color: context.colors.onSurfaceVariant,
+                ),
+              ),
+            ],
           ),
         ),
       );
@@ -140,34 +323,155 @@ class _SearchBody extends ConsumerWidget {
         state.channelResults.isNotEmpty ||
         state.userResults.isNotEmpty ||
         state.messageResults.isNotEmpty;
+    void recordResultSelection() =>
+        ref.read(recentSearchesProvider.notifier).record(state.query);
 
     if (!state.isLoading && !hasAnyResults) {
-      return Center(
-        child: Text(
-          "No results for '${state.query}'",
-          style: context.textTheme.bodyMedium?.copyWith(
-            color: context.colors.onSurfaceVariant,
+      return Padding(
+        key: const Key('search-no-results-state'),
+        padding: EdgeInsets.only(
+          bottom: MediaQuery.viewInsetsOf(context).bottom,
+        ),
+        child: Center(
+          child: Text(
+            "No results for '${state.query}'",
+            style: context.textTheme.bodyMedium?.copyWith(
+              color: context.colors.onSurfaceVariant,
+            ),
           ),
         ),
       );
     }
 
     return ListView(
-      padding: const EdgeInsets.only(bottom: Grid.xl),
+      key: const Key('search-results-list'),
+      padding: EdgeInsets.only(
+        bottom:
+            Grid.xl +
+            MediaQuery.paddingOf(context).bottom +
+            MediaQuery.viewInsetsOf(context).bottom,
+      ),
       children: [
         if (showChannels && state.channelResults.isNotEmpty)
-          _ChannelsSection(channels: state.channelResults),
+          _ChannelsSection(
+            channels: state.channelResults,
+            onResultSelected: recordResultSelection,
+          ),
         if (showPeople && state.userResults.isNotEmpty)
-          _PeopleSection(users: state.userResults),
+          _PeopleSection(
+            users: state.userResults,
+            onResultSelected: recordResultSelection,
+          ),
         if (showMessages && state.messageResults.isNotEmpty)
           _MessagesSection(
             hits: state.messageResults,
             currentPubkey: currentPubkey,
+            onResultSelected: recordResultSelection,
           ),
         if (state.isLoading)
           const Padding(
             padding: EdgeInsets.all(Grid.sm),
-            child: Center(child: CircularProgressIndicator()),
+            child: Center(
+              child: BuzzLoadingIndicator(
+                size: 36,
+                semanticLabel: 'Loading more search results',
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+}
+
+class _RecentSearches extends StatelessWidget {
+  final List<String> searches;
+  final ValueChanged<String> onSelected;
+  final VoidCallback onClear;
+
+  const _RecentSearches({
+    required this.searches,
+    required this.onSelected,
+    required this.onClear,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      key: const Key('recent-searches-list'),
+      padding: EdgeInsets.only(
+        bottom:
+            Grid.xl +
+            MediaQuery.paddingOf(context).bottom +
+            MediaQuery.viewInsetsOf(context).bottom,
+      ),
+      children: [
+        Padding(
+          padding: const EdgeInsets.fromLTRB(
+            Grid.gutter,
+            Grid.xs,
+            Grid.xxs,
+            Grid.half,
+          ),
+          child: Row(
+            children: [
+              Expanded(
+                child: Text(
+                  'Recent searches',
+                  key: const Key('recent-searches-heading'),
+                  style: activityContextTextStyle.copyWith(
+                    color: context.colors.onSurfaceVariant,
+                  ),
+                ),
+              ),
+              TextButton(
+                key: const Key('clear-recent-searches'),
+                onPressed: onClear,
+                child: Text(
+                  'Clear',
+                  style: activityContextTextStyle.copyWith(
+                    color: context.colors.primary,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+        for (var index = 0; index < searches.length; index++)
+          InkWell(
+            key: ValueKey('recent-search-$index'),
+            onTap: () => onSelected(searches[index]),
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(minHeight: Grid.xl),
+              child: Padding(
+                padding: const EdgeInsets.symmetric(
+                  horizontal: Grid.gutter,
+                  vertical: Grid.twelve,
+                ),
+                child: Row(
+                  children: [
+                    Icon(
+                      LucideIcons.clock,
+                      size: 18,
+                      color: context.colors.onSurfaceVariant,
+                    ),
+                    const SizedBox(width: Grid.twelve),
+                    Expanded(
+                      child: Text(
+                        searches[index],
+                        style: contentListTitleTextStyle.copyWith(
+                          color: context.colors.onSurface,
+                        ),
+                      ),
+                    ),
+                    Icon(
+                      LucideIcons.chevronRight,
+                      size: 16,
+                      color: context.colors.onSurfaceVariant,
+                    ),
+                  ],
+                ),
+              ),
+            ),
           ),
       ],
     );
@@ -176,8 +480,12 @@ class _SearchBody extends ConsumerWidget {
 
 class _ChannelsSection extends StatelessWidget {
   final List<Channel> channels;
+  final VoidCallback onResultSelected;
 
-  const _ChannelsSection({required this.channels});
+  const _ChannelsSection({
+    required this.channels,
+    required this.onResultSelected,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -187,11 +495,21 @@ class _ChannelsSection extends StatelessWidget {
         _SectionLabel(label: 'Channels'),
         for (final channel in channels)
           ListTile(
-            leading: Icon(channelIcon(channel), size: 20),
-            title: Text(channel.name),
+            key: ValueKey('search-channel-row-${channel.id}'),
+            contentPadding: const EdgeInsets.symmetric(horizontal: Grid.gutter),
+            leading: Icon(
+              channelIcon(channel),
+              key: ValueKey('search-channel-leading-${channel.id}'),
+              size: 20,
+            ),
+            title: Text(
+              channel.name,
+              key: ValueKey('search-channel-title-${channel.id}'),
+              style: contentListTitleTextStyle,
+            ),
             subtitle: Text(
               '${channel.memberCount} member${channel.memberCount == 1 ? '' : 's'}',
-              style: context.textTheme.bodySmall?.copyWith(
+              style: contentListBodyTextStyle.copyWith(
                 color: context.colors.onSurfaceVariant,
               ),
             ),
@@ -214,11 +532,14 @@ class _ChannelsSection extends StatelessWidget {
                     ),
                   )
                 : null,
-            onTap: () => Navigator.of(context).push(
-              MaterialPageRoute<void>(
-                builder: (_) => ChannelDetailPage(channel: channel),
-              ),
-            ),
+            onTap: () {
+              onResultSelected();
+              Navigator.of(context).push(
+                MaterialPageRoute<void>(
+                  builder: (_) => ChannelDetailPage(channel: channel),
+                ),
+              );
+            },
           ),
       ],
     );
@@ -227,8 +548,9 @@ class _ChannelsSection extends StatelessWidget {
 
 class _PeopleSection extends ConsumerWidget {
   final List<DirectoryUser> users;
+  final VoidCallback onResultSelected;
 
-  const _PeopleSection({required this.users});
+  const _PeopleSection({required this.users, required this.onResultSelected});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -238,19 +560,27 @@ class _PeopleSection extends ConsumerWidget {
         _SectionLabel(label: 'People'),
         for (final user in users)
           ListTile(
+            key: ValueKey('search-person-row-${user.pubkey}'),
+            contentPadding: const EdgeInsets.symmetric(horizontal: Grid.gutter),
             leading: AvatarImage(
+              key: ValueKey('search-person-leading-${user.pubkey}'),
               imageUrl: user.avatarUrl,
               radius: 20,
               fallback: Text(user.label.substring(0, 1).toUpperCase()),
             ),
-            title: Text(user.label),
+            title: Text(
+              user.label,
+              key: ValueKey('search-person-title-${user.pubkey}'),
+              style: contentListTitleTextStyle,
+            ),
             subtitle: Text(
               user.secondaryLabel,
-              style: context.textTheme.bodySmall?.copyWith(
+              style: contentListBodyTextStyle.copyWith(
                 color: context.colors.onSurfaceVariant,
               ),
             ),
             onTap: () async {
+              onResultSelected();
               final channel = await ref
                   .read(channelActionsProvider)
                   .openDm(pubkeys: [user.pubkey]);
@@ -270,8 +600,13 @@ class _PeopleSection extends ConsumerWidget {
 class _MessagesSection extends ConsumerWidget {
   final List<SearchHit> hits;
   final String? currentPubkey;
+  final VoidCallback onResultSelected;
 
-  const _MessagesSection({required this.hits, required this.currentPubkey});
+  const _MessagesSection({
+    required this.hits,
+    required this.currentPubkey,
+    required this.onResultSelected,
+  });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -293,6 +628,7 @@ class _MessagesSection extends ConsumerWidget {
             userCache: profiles,
             channel: channels.where((c) => c.id == hit.channelId).firstOrNull,
             currentPubkey: currentPubkey,
+            onResultSelected: onResultSelected,
           ),
       ],
     );
@@ -305,6 +641,7 @@ class _MessageTile extends StatelessWidget {
   final Map<String, UserProfile> userCache;
   final Channel? channel;
   final String? currentPubkey;
+  final VoidCallback onResultSelected;
 
   const _MessageTile({
     required this.hit,
@@ -312,68 +649,99 @@ class _MessageTile extends StatelessWidget {
     required this.userCache,
     required this.channel,
     required this.currentPubkey,
+    required this.onResultSelected,
   });
 
   @override
   Widget build(BuildContext context) {
     final authorName = authorProfile?.label ?? shortPubkey(hit.pubkey);
     final timeAgo = relativeTime(hit.createdAt);
+    final channelName = hit.channelName?.trim().replaceFirst(RegExp(r'^#'), '');
+    final hasChannelName = channelName != null && channelName.isNotEmpty;
+    final isDm = channel?.isDm ?? false;
 
     return ListTile(
-      leading: SmallAvatar(pubkey: hit.pubkey, userCache: userCache),
-      title: Row(
-        children: [
-          Expanded(
-            child: Text(
-              authorName,
-              maxLines: 1,
-              overflow: TextOverflow.ellipsis,
-              style: context.textTheme.bodyMedium?.copyWith(
-                fontWeight: FontWeight.w600,
-              ),
-            ),
-          ),
-          if (hit.channelName != null) ...[
-            const SizedBox(width: Grid.half),
-            Container(
-              padding: const EdgeInsets.symmetric(
-                horizontal: Grid.half,
-                vertical: 2,
-              ),
-              decoration: BoxDecoration(
-                color: context.colors.surfaceContainerHighest,
-                borderRadius: BorderRadius.circular(Radii.sm),
-              ),
-              child: Text(
-                hit.channelName!,
-                style: context.textTheme.labelSmall?.copyWith(
-                  color: context.colors.onSurfaceVariant,
-                ),
-              ),
-            ),
-          ],
-        ],
+      key: ValueKey('search-message-row-${hit.eventId}'),
+      contentPadding: const EdgeInsets.symmetric(horizontal: Grid.gutter),
+      titleAlignment: ListTileTitleAlignment.top,
+      horizontalTitleGap: messageAvatarContentGap,
+      leading: SmallAvatar(
+        key: ValueKey('search-message-avatar-${hit.eventId}'),
+        pubkey: hit.pubkey,
+        userCache: userCache,
+        size: compactMessageAvatarSize,
+      ),
+      title: MessageAuthorMeta(
+        displayName: authorName,
+        username: messageUsernameLabel(authorProfile),
+        timestamp: timeAgo,
+        nameColor: context.colors.onSurface,
+        metadataColor: context.colors.onSurfaceVariant,
+        displayNameKey: ValueKey('search-message-author-${hit.eventId}'),
+        usernameKey: ValueKey('search-message-username-${hit.eventId}'),
+        timestampKey: ValueKey('search-message-timestamp-${hit.eventId}'),
       ),
       subtitle: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           const SizedBox(height: 2),
+          Row(
+            key: ValueKey('search-message-context-${hit.eventId}'),
+            children: [
+              Flexible(
+                child: Text(
+                  isDm
+                      ? 'Direct message'
+                      : hasChannelName
+                      ? 'Message in'
+                      : 'Message',
+                  style: activityContextTextStyle.copyWith(
+                    color: context.colors.onSurfaceVariant,
+                  ),
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ),
+              if (!isDm && hasChannelName) ...[
+                const SizedBox(width: Grid.half),
+                Flexible(
+                  child: Container(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: Grid.half + Grid.quarter,
+                      vertical: Grid.quarter / 2,
+                    ),
+                    decoration: BoxDecoration(
+                      color: context.colors.surfaceContainerHighest,
+                      borderRadius: BorderRadius.circular(Radii.xs),
+                    ),
+                    child: Text(
+                      '#$channelName',
+                      key: ValueKey('search-message-channel-${hit.eventId}'),
+                      style: activityContextTextStyle.copyWith(
+                        color: context.colors.onSurfaceVariant,
+                      ),
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                ),
+              ],
+            ],
+          ),
+          const SizedBox(height: Grid.half),
           MessageContent(
+            key: ValueKey('search-message-body-${hit.eventId}'),
             content: hit.content,
             tags: hit.tags,
             maxLines: 2,
-            baseStyle: context.textTheme.bodyMedium,
-          ),
-          const SizedBox(height: 2),
-          Text(
-            timeAgo,
-            style: context.textTheme.labelSmall?.copyWith(
-              color: context.colors.onSurfaceVariant,
+            baseStyle: activityPreviewTextStyle.copyWith(
+              color: context.colors.onSurface,
             ),
           ),
         ],
       ),
-      onTap: () => _navigateToHit(context, hit, channel),
+      onTap: () {
+        onResultSelected();
+        _navigateToHit(context, hit, channel);
+      },
     );
   }
 
@@ -417,11 +785,10 @@ class _SectionLabel extends StatelessWidget {
         Grid.half,
       ),
       child: Text(
-        label.toUpperCase(),
-        style: context.textTheme.labelSmall?.copyWith(
+        label,
+        key: ValueKey('search-section-${label.toLowerCase()}'),
+        style: activityContextTextStyle.copyWith(
           color: context.colors.onSurfaceVariant,
-          fontWeight: FontWeight.w600,
-          letterSpacing: 0.8,
         ),
       ),
     );
diff --git a/mobile/lib/features/settings/accent_picker_page.dart b/mobile/lib/features/settings/accent_picker_page.dart
new file mode 100644
index 0000000000..6f174df741
--- /dev/null
+++ b/mobile/lib/features/settings/accent_picker_page.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
+
+import '../../shared/theme/theme.dart';
+import '../../shared/widgets/frosted_app_bar.dart';
+import '../../shared/widgets/frosted_scaffold.dart';
+
+/// Accent colors as a list of rows, matching the theme picker's shape. The
+/// swatches used to live inline on the settings page as a wrap of tappable
+/// circles; a row per color keeps the settings page to plain rows and gives each
+/// accent a readable name.
+class AccentPickerPage extends ConsumerWidget {
+  const AccentPickerPage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final selected = ref.watch(accentProvider);
+    final colorScheme = context.colors;
+
+    return FrostedScaffold(
+      appBar: const FrostedAppBar(title: Text('Accent Color')),
+      body: ListView(
+        padding: EdgeInsets.only(
+          top: frostedAppBarHeight(context),
+          bottom: Grid.xs,
+        ),
+        children: [
+          for (var i = 0; i < accentColors.length; i++)
+            _AccentRow(
+              color: accentColorForScheme(colorScheme, i),
+              label: accentColors[i].name,
+              selected: selected == i,
+              onTap: () => ref.read(accentProvider.notifier).setAccent(i),
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+class _AccentRow extends StatelessWidget {
+  const _AccentRow({
+    required this.color,
+    required this.label,
+    required this.selected,
+    required this.onTap,
+  });
+
+  final Color color;
+  final String label;
+  final bool selected;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: Container(
+        width: 28,
+        height: 28,
+        decoration: BoxDecoration(
+          color: color,
+          shape: BoxShape.circle,
+          border: Border.all(color: context.colors.outlineVariant),
+        ),
+      ),
+      title: Text(label),
+      trailing: selected
+          ? Icon(LucideIcons.check, size: 18, color: context.colors.primary)
+          : null,
+      onTap: onTap,
+    );
+  }
+}
diff --git a/mobile/lib/features/settings/settings_page.dart b/mobile/lib/features/settings/settings_page.dart
index 214360f9eb..f089f63915 100644
--- a/mobile/lib/features/settings/settings_page.dart
+++ b/mobile/lib/features/settings/settings_page.dart
@@ -10,23 +10,22 @@ import '../../shared/clipboard_utils.dart';
 import '../../shared/relay/relay.dart';
 import '../../shared/theme/theme.dart';
 import '../../shared/widgets/app_list.dart';
+import '../../shared/widgets/app_list_card.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
-import '../profile/set_status_sheet.dart';
-import '../profile/user_status_provider.dart';
-import '../custom_emoji/custom_emoji_provider.dart';
-import '../custom_emoji/custom_emoji_render.dart';
+import 'accent_picker_page.dart';
 import 'theme_picker_page.dart';
 
+part 'settings_page/appearance_section.dart';
+part 'settings_page/connection_section.dart';
+
 class SettingsPage extends HookConsumerWidget {
-  const SettingsPage({super.key});
+  const SettingsPage({super.key, required this.profileHeader});
+
+  final Widget profileHeader;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final config = ref.watch(relayConfigProvider);
-    final selectedAccent = ref.watch(accentProvider);
-    final selectedScheme = ref.watch(schemeProvider);
-    final colorScheme = context.colors;
     final packageInfoFuture = useMemoized(() => PackageInfo.fromPlatform());
     final packageInfo = useFuture(packageInfoFuture);
 
@@ -41,283 +40,55 @@ class SettingsPage extends HookConsumerWidget {
                 bottom: Grid.xs,
               ),
               children: [
-                const SizedBox(height: Grid.xxs),
-
-                // Status — flush header row, like Slack's profile/status block.
-                _StatusRow(),
-
-                // Appearance
-                AppListSection(
-                  label: 'Appearance',
-                  children: [
-                    AppListRow(
-                      icon: LucideIcons.palette,
-                      title: 'Color Scheme',
-                      subtitle: selectedScheme == null
-                          ? 'Default ($defaultSchemeDisplayName)'
-                          : findTheme(selectedScheme)?.displayName ??
-                                selectedScheme,
-                      trailing: Icon(
-                        LucideIcons.chevronRight,
-                        size: 18,
-                        color: context.colors.onSurfaceVariant,
-                      ),
-                      onTap: () => Navigator.of(context).push(
-                        MaterialPageRoute<void>(
-                          builder: (_) => const ThemePickerPage(),
-                        ),
-                      ),
-                    ),
-                    Padding(
-                      padding: const EdgeInsets.fromLTRB(
-                        Grid.gutter,
-                        Grid.xxs,
-                        Grid.gutter,
-                        Grid.twelve,
-                      ),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            'Accent Color',
-                            style: context.textTheme.bodyMedium?.copyWith(
-                              color: context.colors.onSurfaceVariant,
-                            ),
-                          ),
-                          const SizedBox(height: Grid.twelve),
-                          Wrap(
-                            spacing: Grid.xxs,
-                            runSpacing: Grid.xxs,
-                            children: [
-                              for (var i = 0; i < accentColors.length; i++)
-                                _AccentSwatch(
-                                  color: accentColorForScheme(colorScheme, i),
-                                  label: accentColors[i].name,
-                                  selected: selectedAccent == i,
-                                  onTap: () => ref
-                                      .read(accentProvider.notifier)
-                                      .setAccent(i),
-                                ),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
-                  ],
-                ),
-
-                // Connection
-                AppListSection(
-                  label: 'Connection',
-                  children: [
-                    AppListRow(
-                      icon: LucideIcons.server,
-                      title: 'Connected to',
-                      subtitle: config.baseUrl,
-                    ),
-                    if (config.nsec != null && config.nsec!.isNotEmpty)
-                      Builder(
-                        builder: (context) {
-                          final privHex = nostr.Nip19.decode(
-                            payload: config.nsec!,
-                          ).data;
-                          final pubkey = privHex.isNotEmpty
-                              ? nostr.Keys(privHex).public
-                              : 'unknown';
-                          return AppListRow(
-                            icon: LucideIcons.key,
-                            title: 'Identity (pubkey)',
-                            subtitle: pubkey,
-                            subtitleStyle: context.textTheme.bodySmall
-                                ?.copyWith(
-                                  color: context.colors.onSurfaceVariant,
-                                  fontFamily: 'GeistMono',
-                                  fontSize: 11,
-                                ),
-                            subtitleMaxLines: 2,
-                            trailing: IconButton(
-                              icon: const Icon(LucideIcons.copy, size: 16),
-                              onPressed: () async {
-                                await copyToClipboard(
-                                  context,
-                                  pubkey,
-                                  message: 'Pubkey copied',
-                                );
-                              },
-                            ),
-                          );
-                        },
-                      ),
-                    Padding(
-                      padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
-                      child: Center(
-                        child: TextButton.icon(
-                          onPressed: () => _confirmSignOut(context, ref),
-                          icon: const Icon(LucideIcons.logOut, size: 18),
-                          label: const Text('Remove Community'),
-                          style: TextButton.styleFrom(
-                            foregroundColor: context.colors.error,
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
+                profileHeader,
+                const _AppearanceSection(),
+                const _ConnectionSection(),
+                const _RemoveCommunitySection(),
               ],
             ),
           ),
           if (packageInfo.hasData)
-            SafeArea(
-              top: false,
-              child: Padding(
-                padding: const EdgeInsets.only(bottom: Grid.xs, top: Grid.xxs),
-                child: Center(
-                  child: Text(
-                    'v${packageInfo.data!.version}',
-                    style: context.textTheme.bodySmall?.copyWith(
-                      color: context.colors.onSurfaceVariant.withValues(
-                        alpha: 0.6,
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            ),
-        ],
-      ),
-    );
-  }
-
-  void _confirmSignOut(BuildContext context, WidgetRef ref) {
-    showDialog<void>(
-      context: context,
-      builder: (ctx) => AlertDialog(
-        title: const Text('Remove Community'),
-        content: const Text(
-          'This will disconnect this community. You will need '
-          'to scan a new pairing code to reconnect.',
-        ),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.of(ctx).pop(),
-            child: const Text('Cancel'),
-          ),
-          FilledButton(
-            onPressed: () {
-              Navigator.of(ctx).pop(); // close dialog
-              // Pop all pushed routes back to root so MaterialApp.home
-              // rebuilds to PairingPage when auth state changes.
-              Navigator.of(context).popUntil((route) => route.isFirst);
-              ref.read(authProvider.notifier).signOut();
-            },
-            style: FilledButton.styleFrom(backgroundColor: ctx.colors.error),
-            child: const Text('Remove'),
-          ),
+            _VersionFooter(version: packageInfo.data!.version),
         ],
       ),
     );
   }
 }
 
-class _StatusRow extends ConsumerWidget {
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final statusAsync = ref.watch(userStatusProvider);
-    final status = statusAsync.asData?.value;
-    final hasStatus = status != null && !status.isEmpty;
+class _VersionFooter extends StatelessWidget {
+  const _VersionFooter({required this.version});
 
-    return AppListRowRaw(
-      leading: _StatusEmojiIcon(emoji: status?.emoji ?? ''),
-      title: Text(
-        hasStatus
-            ? (status.text.isNotEmpty ? status.text : status.emoji)
-            : 'Set a status',
-        style: hasStatus
-            ? context.textTheme.bodyLarge
-            : context.textTheme.bodyLarge?.copyWith(
-                color: context.colors.onSurfaceVariant,
-              ),
-      ),
-      subtitle: hasStatus
-          ? Text(
-              'Tap to update',
-              style: context.textTheme.bodySmall?.copyWith(
-                color: context.colors.onSurfaceVariant,
-              ),
-            )
-          : null,
-      onTap: () => showSetStatusSheet(context, currentStatus: status),
-    );
-  }
-}
-
-class _StatusEmojiIcon extends ConsumerWidget {
-  final String emoji;
-
-  const _StatusEmojiIcon({required this.emoji});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    if (emoji.isEmpty) {
-      return const Text('\u{1F4AC}', style: TextStyle(fontSize: 20));
-    }
-    final shortcode = emoji.startsWith(':') && emoji.endsWith(':')
-        ? emoji.substring(1, emoji.length - 1).toLowerCase()
-        : null;
-    if (shortcode != null) {
-      for (final entry in ref.watch(customEmojiListProvider)) {
-        if (entry.shortcode == shortcode) {
-          return CustomEmojiImage(
-            shortcode: shortcode,
-            url: entry.url,
-            size: 24,
-          );
-        }
-      }
-    }
-    return Text(emoji, style: const TextStyle(fontSize: 20));
-  }
-}
-
-class _AccentSwatch extends StatelessWidget {
-  const _AccentSwatch({
-    required this.color,
-    required this.label,
-    required this.selected,
-    required this.onTap,
-  });
-
-  final Color color;
-  final String label;
-  final bool selected;
-  final VoidCallback onTap;
+  final String version;
 
   @override
   Widget build(BuildContext context) {
-    return Tooltip(
-      message: label,
-      child: GestureDetector(
-        onTap: onTap,
-        child: AnimatedContainer(
-          duration: const Duration(milliseconds: 150),
-          width: 36,
-          height: 36,
-          decoration: BoxDecoration(
-            color: color,
-            borderRadius: BorderRadius.circular(Radii.md),
-            border: selected
-                ? Border.all(color: context.colors.onSurface, width: 2.5)
-                : Border.all(color: color.withValues(alpha: 0.4), width: 1),
+    return SafeArea(
+      top: false,
+      child: Padding(
+        padding: const EdgeInsets.only(bottom: Grid.xs, top: Grid.xxs),
+        child: Center(
+          child: Text(
+            'v$version',
+            style: context.textTheme.bodySmall?.copyWith(
+              color: context.colors.onSurfaceVariant.withValues(alpha: 0.6),
+            ),
           ),
-          child: selected
-              ? Icon(
-                  LucideIcons.check,
-                  size: 16,
-                  color: contrastForeground(color),
-                )
-              : null,
         ),
       ),
     );
   }
 }
+
+/// Trailing affordance shared by the rows that push a picker page.
+class _RowChevron extends StatelessWidget {
+  const _RowChevron();
+
+  @override
+  Widget build(BuildContext context) {
+    return Icon(
+      LucideIcons.chevronRight,
+      size: 18,
+      color: context.colors.onSurfaceVariant,
+    );
+  }
+}
diff --git a/mobile/lib/features/settings/settings_page/appearance_section.dart b/mobile/lib/features/settings/settings_page/appearance_section.dart
new file mode 100644
index 0000000000..26c9d20fe1
--- /dev/null
+++ b/mobile/lib/features/settings/settings_page/appearance_section.dart
@@ -0,0 +1,138 @@
+part of '../settings_page.dart';
+
+/// System / Light / Dark, mirroring desktop's appearance-mode selector.
+const _modeOptions = <({ThemeMode mode, String label, IconData icon})>[
+  (mode: ThemeMode.system, label: 'System', icon: LucideIcons.sunMoon),
+  (mode: ThemeMode.light, label: 'Light', icon: LucideIcons.sun),
+  (mode: ThemeMode.dark, label: 'Dark', icon: LucideIcons.moon),
+];
+
+String _modeLabel(ThemeMode mode) =>
+    _modeOptions.firstWhere((option) => option.mode == mode).label;
+
+class _AppearanceSection extends ConsumerWidget {
+  const _AppearanceSection();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final mode = ref.watch(themeProvider);
+    final schemeName = ref.watch(schemeProvider);
+    final accentIndex = ref.watch(accentProvider);
+
+    return AppListCard(
+      label: 'Style',
+      children: [
+        AppListRow(
+          icon: LucideIcons.sunMoon,
+          title: 'Appearance',
+          value: _modeLabel(mode),
+          trailing: const _RowChevron(),
+          onTap: () => _showAppearanceModeSheet(context),
+        ),
+        AppListRow(
+          icon: LucideIcons.palette,
+          title: 'Theme',
+          value: themeSelectionLabel(schemeName, mode),
+          trailing: const _RowChevron(),
+          onTap: () => Navigator.of(context).push(
+            MaterialPageRoute<void>(builder: (_) => const ThemePickerPage()),
+          ),
+        ),
+        AppListRow(
+          icon: LucideIcons.droplet,
+          title: 'Accent color',
+          // The swatch *is* the value — naming the color as well would say the
+          // same thing twice, so it takes the chevron's place.
+          trailing: _AccentSwatch(accentIndex: accentIndex),
+          onTap: () => Navigator.of(context).push(
+            MaterialPageRoute<void>(builder: (_) => const AccentPickerPage()),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+void _showAppearanceModeSheet(BuildContext context) {
+  showModalBottomSheet<void>(
+    context: context,
+    showDragHandle: true,
+    builder: (_) => const _AppearanceModeSheet(),
+  );
+}
+
+/// Three choices is too few to warrant a page, so the appearance row opens a
+/// sheet rather than pushing a route.
+class _AppearanceModeSheet extends ConsumerWidget {
+  const _AppearanceModeSheet();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final mode = ref.watch(themeProvider);
+
+    return SafeArea(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(
+              Grid.gutter,
+              0,
+              Grid.gutter,
+              Grid.xxs,
+            ),
+            child: Text('Appearance', style: context.textTheme.titleMedium),
+          ),
+          for (final option in _modeOptions)
+            AppListRow(
+              icon: option.icon,
+              title: option.label,
+              trailing: option.mode == mode
+                  ? Icon(
+                      LucideIcons.check,
+                      size: 18,
+                      color: context.colors.primary,
+                    )
+                  : null,
+              onTap: () {
+                final schemeName = ref.read(schemeProvider);
+                final compatibleScheme = schemeForAppearanceMode(
+                  schemeName,
+                  option.mode,
+                );
+                if (compatibleScheme != schemeName) {
+                  ref.read(schemeProvider.notifier).setScheme(compatibleScheme);
+                }
+                ref.read(themeProvider.notifier).setMode(option.mode);
+                Navigator.of(context).pop();
+              },
+            ),
+          const SizedBox(height: Grid.xxs),
+        ],
+      ),
+    );
+  }
+}
+
+/// The selected accent, shown where a row would otherwise carry a chevron.
+class _AccentSwatch extends StatelessWidget {
+  const _AccentSwatch({required this.accentIndex});
+
+  static const _size = 22.0;
+
+  final int accentIndex;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: _size,
+      height: _size,
+      decoration: BoxDecoration(
+        color: accentColorForScheme(context.colors, accentIndex),
+        shape: BoxShape.circle,
+        border: Border.all(color: context.colors.outlineVariant),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/features/settings/settings_page/connection_section.dart b/mobile/lib/features/settings/settings_page/connection_section.dart
new file mode 100644
index 0000000000..f34e88f26e
--- /dev/null
+++ b/mobile/lib/features/settings/settings_page/connection_section.dart
@@ -0,0 +1,103 @@
+part of '../settings_page.dart';
+
+class _ConnectionSection extends ConsumerWidget {
+  const _ConnectionSection();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final config = ref.watch(relayConfigProvider);
+    final nsec = config.nsec;
+
+    return AppListCard(
+      label: 'Connection',
+      children: [
+        AppListRow(
+          icon: LucideIcons.server,
+          title: 'Connected to',
+          subtitle: config.baseUrl,
+        ),
+        if (nsec != null && nsec.isNotEmpty) _IdentityRow(nsec: nsec),
+      ],
+    );
+  }
+}
+
+/// Destructive, so it gets a container of its own rather than sitting at the
+/// bottom of the connection group.
+class _RemoveCommunitySection extends ConsumerWidget {
+  const _RemoveCommunitySection();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return AppListCard(
+      children: [
+        AppListRow(
+          icon: LucideIcons.logOut,
+          title: 'Remove community',
+          titleColor: context.colors.error,
+          onTap: () => _confirmRemoveCommunity(context, ref),
+        ),
+      ],
+    );
+  }
+}
+
+class _IdentityRow extends StatelessWidget {
+  const _IdentityRow({required this.nsec});
+
+  final String nsec;
+
+  @override
+  Widget build(BuildContext context) {
+    final privHex = nostr.Nip19.decode(payload: nsec).data;
+    final pubkey = privHex.isNotEmpty ? nostr.Keys(privHex).public : 'unknown';
+
+    return AppListRow(
+      icon: LucideIcons.key,
+      title: 'Identity (pubkey)',
+      subtitle: pubkey,
+      subtitleStyle: context.textTheme.bodySmall?.copyWith(
+        color: context.colors.onSurfaceVariant,
+        fontFamily: 'GeistMono',
+        fontSize: 11,
+      ),
+      subtitleMaxLines: 2,
+      trailing: IconButton(
+        icon: const Icon(LucideIcons.copy, size: 16),
+        onPressed: () async {
+          await copyToClipboard(context, pubkey, message: 'Pubkey copied');
+        },
+      ),
+    );
+  }
+}
+
+void _confirmRemoveCommunity(BuildContext context, WidgetRef ref) {
+  showDialog<void>(
+    context: context,
+    builder: (ctx) => AlertDialog(
+      title: const Text('Remove Community'),
+      content: const Text(
+        'This will disconnect this community. You will need '
+        'to scan a new pairing code to reconnect.',
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(ctx).pop(),
+          child: const Text('Cancel'),
+        ),
+        FilledButton(
+          onPressed: () {
+            Navigator.of(ctx).pop(); // close dialog
+            // Pop all pushed routes back to root so MaterialApp.home rebuilds
+            // to PairingPage when auth state changes.
+            Navigator.of(context).popUntil((route) => route.isFirst);
+            ref.read(authProvider.notifier).signOut();
+          },
+          style: FilledButton.styleFrom(backgroundColor: ctx.colors.error),
+          child: const Text('Remove'),
+        ),
+      ],
+    ),
+  );
+}
diff --git a/mobile/lib/features/settings/theme_picker_page.dart b/mobile/lib/features/settings/theme_picker_page.dart
index f9bbc8ea1d..aba6579148 100644
--- a/mobile/lib/features/settings/theme_picker_page.dart
+++ b/mobile/lib/features/settings/theme_picker_page.dart
@@ -7,6 +7,9 @@ import '../../shared/theme/theme.dart';
 import '../../shared/widgets/frosted_app_bar.dart';
 import '../../shared/widgets/frosted_scaffold.dart';
 
+/// Themes for the current appearance mode, organised the way desktop does it:
+/// System offers the light/dark pairs as single entries, while Light and Dark
+/// each list every theme of that brightness.
 class ThemePickerPage extends HookConsumerWidget {
   const ThemePickerPage({super.key});
 
@@ -15,41 +18,47 @@ class ThemePickerPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final mode = ref.watch(themeProvider);
     final selectedScheme = ref.watch(schemeProvider);
     final searchQuery = useState('');
     final searchController = useTextEditingController();
     final scrollController = useScrollController();
 
-    // Flat alphabetical list by display name
-    final sorted = List<ThemeColors>.from(themeCatalog)
-      ..sort((a, b) => a.displayName.compareTo(b.displayName));
+    final groups = themeGroups();
+    final entries = switch (mode) {
+      ThemeMode.system => groups.paired,
+      ThemeMode.light => groups.light,
+      ThemeMode.dark => groups.dark,
+    };
+    final isSystem = mode == ThemeMode.system;
+
+    String labelFor(ThemeColors theme) =>
+        isSystem ? pairedThemeLabel(theme.name) : theme.displayName;
 
     final query = searchQuery.value.toLowerCase();
-    final defaultLabel = 'Default ($defaultSchemeDisplayName)';
     final filtered = query.isEmpty
-        ? sorted
-        : sorted
-              .where((t) => t.displayName.toLowerCase().contains(query))
+        ? entries
+        : entries
+              .where((t) => labelFor(t).toLowerCase().contains(query))
               .toList();
-    final showDefault =
-        query.isEmpty ||
-        'default'.contains(query) ||
-        defaultLabel.toLowerCase().contains(query);
 
-    // Default entry colors.
-    final defaultTheme = findTheme(defaultSchemeName);
-    final defaultBg = defaultTheme?.bg ?? lightColorScheme.surface;
-    final defaultFg = defaultTheme?.fg ?? lightColorScheme.onSurface;
-    final defaultComment =
-        defaultTheme?.comment ?? lightColorScheme.onSurfaceVariant;
+    // In System mode either half of a pair counts as the selection; in the
+    // pinned modes the effective theme already accounts for coercion, so the
+    // checkmark always names what is actually rendered.
+    final active = effectiveTheme(selectedScheme, mode);
+    bool isSelected(ThemeColors theme) {
+      if (active == null) return false;
+      if (!isSystem) return active.name == theme.name;
+      return active.name == theme.name ||
+          themePairFor(theme.name) == active.name;
+    }
 
-    // Auto-scroll to the selected theme on first build (no search active)
+    // Auto-scroll to the selected theme on first build (no search active).
     useEffect(() {
-      if (selectedScheme == null || query.isNotEmpty) return null;
-      final idx = sorted.indexWhere((t) => t.name == selectedScheme);
+      if (query.isNotEmpty) return null;
+      final idx = filtered.indexWhere(isSelected);
       if (idx < 0) return null;
-      // +1 to account for the Default entry at the top
-      final offset = (idx + 1) * _itemHeight;
+      final offset = idx * _itemHeight;
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (scrollController.hasClients) {
           scrollController.animateTo(
@@ -63,98 +72,22 @@ class ThemePickerPage extends HookConsumerWidget {
     }, const []);
 
     return FrostedScaffold(
-      appBar: const FrostedAppBar(title: Text('Color Scheme')),
+      appBar: const FrostedAppBar(title: Text('Theme')),
       body: Column(
         children: [
           SizedBox(height: frostedAppBarHeight(context)),
-          // Always-visible search bar
-          Padding(
-            padding: const EdgeInsets.symmetric(
-              horizontal: Grid.gutter,
-              vertical: Grid.xxs,
-            ),
-            child: Container(
-              height: 36,
-              padding: const EdgeInsets.symmetric(horizontal: Grid.twelve),
-              decoration: BoxDecoration(
-                color: context.colors.surfaceContainerHighest,
-                borderRadius: BorderRadius.circular(Radii.lg),
-                border: Border.all(color: context.colors.outlineVariant),
-              ),
-              child: Row(
-                children: [
-                  Icon(
-                    LucideIcons.search,
-                    size: 16,
-                    color: context.colors.onSurfaceVariant,
-                  ),
-                  const SizedBox(width: Grid.xxs),
-                  Expanded(
-                    child: TextField(
-                      controller: searchController,
-                      decoration: InputDecoration(
-                        hintText: 'Search themes...',
-                        hintStyle: context.textTheme.bodyMedium?.copyWith(
-                          color: context.colors.onSurfaceVariant,
-                        ),
-                        border: InputBorder.none,
-                        enabledBorder: InputBorder.none,
-                        focusedBorder: InputBorder.none,
-                        isDense: true,
-                        contentPadding: EdgeInsets.zero,
-                      ),
-                      style: context.textTheme.bodyMedium,
-                      onChanged: (v) => searchQuery.value = v,
-                    ),
-                  ),
-                  if (searchQuery.value.isNotEmpty)
-                    GestureDetector(
-                      onTap: () {
-                        searchController.clear();
-                        searchQuery.value = '';
-                      },
-                      child: Icon(
-                        LucideIcons.x,
-                        size: 16,
-                        color: context.colors.onSurfaceVariant,
-                      ),
-                    ),
-                ],
-              ),
-            ),
+          _SearchField(
+            controller: searchController,
+            query: searchQuery.value,
+            onChanged: (v) => searchQuery.value = v,
+            onClear: () {
+              searchController.clear();
+              searchQuery.value = '';
+            },
           ),
-
-          // Theme list
           Expanded(
-            child: ListView(
-              controller: scrollController,
-              children: [
-                // Default entry
-                if (showDefault)
-                  _ThemeRow(
-                    bg: defaultBg,
-                    fg: defaultFg,
-                    comment: defaultComment,
-                    label: defaultLabel,
-                    selected: selectedScheme == null,
-                    onTap: () =>
-                        ref.read(schemeProvider.notifier).setScheme(null),
-                  ),
-
-                // All themes, flat alphabetical
-                for (final theme in filtered)
-                  _ThemeRow(
-                    bg: theme.bg,
-                    fg: theme.fg,
-                    comment: theme.comment,
-                    label: theme.displayName,
-                    selected: selectedScheme == theme.name,
-                    onTap: () =>
-                        ref.read(schemeProvider.notifier).setScheme(theme.name),
-                  ),
-
-                if (!showDefault && filtered.isEmpty)
-                  Padding(
+            child: filtered.isEmpty
+                ? Padding(
                     padding: const EdgeInsets.all(Grid.sm),
                     child: Center(
                       child: Text(
@@ -164,9 +97,26 @@ class ThemePickerPage extends HookConsumerWidget {
                         ),
                       ),
                     ),
+                  )
+                : ListView.builder(
+                    controller: scrollController,
+                    itemCount: filtered.length,
+                    itemBuilder: (_, i) {
+                      final theme = filtered[i];
+                      final pairName = isSystem
+                          ? themePairFor(theme.name)
+                          : null;
+                      return _ThemeRow(
+                        theme: theme,
+                        pair: pairName == null ? null : findTheme(pairName),
+                        label: labelFor(theme),
+                        selected: isSelected(theme),
+                        onTap: () => ref
+                            .read(schemeProvider.notifier)
+                            .setScheme(theme.name),
+                      );
+                    },
                   ),
-              ],
-            ),
           ),
         ],
       ),
@@ -174,50 +124,118 @@ class ThemePickerPage extends HookConsumerWidget {
   }
 }
 
-/// A row showing a 3-stripe color bar (bg/fg/comment) + theme name + checkmark.
+class _SearchField extends StatelessWidget {
+  const _SearchField({
+    required this.controller,
+    required this.query,
+    required this.onChanged,
+    required this.onClear,
+  });
+
+  final TextEditingController controller;
+  final String query;
+  final ValueChanged<String> onChanged;
+  final VoidCallback onClear;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(
+        horizontal: Grid.gutter,
+        vertical: Grid.xxs,
+      ),
+      child: Container(
+        height: 36,
+        padding: const EdgeInsets.symmetric(horizontal: Grid.twelve),
+        decoration: BoxDecoration(
+          color: context.colors.surfaceContainerHighest,
+          borderRadius: BorderRadius.circular(Radii.lg),
+          border: Border.all(color: context.colors.outlineVariant),
+        ),
+        child: Row(
+          children: [
+            Icon(
+              LucideIcons.search,
+              size: 16,
+              color: context.colors.onSurfaceVariant,
+            ),
+            const SizedBox(width: Grid.xxs),
+            Expanded(
+              child: TextField(
+                controller: controller,
+                decoration: InputDecoration(
+                  hintText: 'Search themes...',
+                  hintStyle: context.textTheme.bodyMedium?.copyWith(
+                    color: context.colors.onSurfaceVariant,
+                  ),
+                  border: InputBorder.none,
+                  enabledBorder: InputBorder.none,
+                  focusedBorder: InputBorder.none,
+                  isDense: true,
+                  contentPadding: EdgeInsets.zero,
+                ),
+                style: context.textTheme.bodyMedium,
+                onChanged: onChanged,
+              ),
+            ),
+            if (query.isNotEmpty)
+              GestureDetector(
+                onTap: onClear,
+                child: Icon(
+                  LucideIcons.x,
+                  size: 16,
+                  color: context.colors.onSurfaceVariant,
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// A theme row with a colour bar + name + checkmark. When [pair] is supplied the
+/// bar is split down the middle — light stripes on the left, dark on the right —
+/// standing in for desktop's split light/dark preview tile.
 class _ThemeRow extends StatelessWidget {
   const _ThemeRow({
-    required this.bg,
-    required this.fg,
-    required this.comment,
+    required this.theme,
+    required this.pair,
     required this.label,
     required this.selected,
     required this.onTap,
   });
 
-  final Color bg;
-  final Color fg;
-  final Color comment;
+  final ThemeColors theme;
+  final ThemeColors? pair;
   final String label;
   final bool selected;
   final VoidCallback onTap;
 
   @override
   Widget build(BuildContext context) {
+    final swatch = pair == null ? [theme] : [theme, pair!];
+
     return ListTile(
       leading: Container(
         width: 56,
         height: 28,
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(Radii.sm),
-          border: Border.all(color: context.colors.outlineVariant, width: 1),
+          border: Border.all(color: context.colors.outlineVariant),
         ),
         child: ClipRRect(
           borderRadius: BorderRadius.circular(Radii.sm - 1),
           child: Row(
             children: [
-              Expanded(
-                child: ColoredBox(color: bg, child: const SizedBox.expand()),
-              ),
-              Expanded(
-                child: ColoredBox(color: fg, child: const SizedBox.expand()),
-              ),
-              Expanded(
-                child: ColoredBox(
-                  color: comment,
-                  child: const SizedBox.expand(),
-                ),
-              ),
+              for (final t in swatch)
+                for (final color in [t.bg, t.fg, t.comment])
+                  Expanded(
+                    child: ColoredBox(
+                      color: color,
+                      child: const SizedBox.expand(),
+                    ),
+                  ),
             ],
           ),
         ),
diff --git a/mobile/lib/shared/community/community_icon_provider.dart b/mobile/lib/shared/community/community_icon_provider.dart
new file mode 100644
index 0000000000..9e5ed8433a
--- /dev/null
+++ b/mobile/lib/shared/community/community_icon_provider.dart
@@ -0,0 +1,59 @@
+import 'dart:convert';
+
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:http/http.dart' as http;
+
+/// Supplies the HTTP client used for NIP-11 community icon lookups.
+///
+/// Tests can override this provider to return deterministic relay responses.
+final communityIconHttpClientProvider = Provider<http.Client>((ref) {
+  final client = http.Client();
+  ref.onDispose(client.close);
+  return client;
+});
+
+/// Reads a community's icon from its public NIP-11 relay information document.
+///
+/// The lookup does not depend on the active relay session, so icons can render
+/// for every paired community in the switcher. Callers explicitly invalidate
+/// this family when opening the switcher so transient failures and relay
+/// metadata updates can be retried without background polling.
+final communityIconProvider = FutureProvider.autoDispose
+    .family<String?, String>((ref, relayUrl) async {
+      final uri = _relayInfoUri(relayUrl);
+      if (uri == null) return null;
+
+      try {
+        final response = await ref
+            .read(communityIconHttpClientProvider)
+            .get(uri, headers: const {'Accept': 'application/nostr+json'})
+            .timeout(const Duration(seconds: 5));
+        if (response.statusCode < 200 || response.statusCode >= 300) {
+          return null;
+        }
+
+        final document = jsonDecode(response.body);
+        if (document is! Map<String, dynamic>) return null;
+
+        final icon = document['icon'];
+        if (icon is! String || icon.trim().isEmpty) return null;
+        return icon.trim();
+      } catch (_) {
+        return null;
+      }
+    });
+
+Uri? _relayInfoUri(String relayUrl) {
+  try {
+    final uri = Uri.parse(relayUrl.trim());
+    final scheme = switch (uri.scheme) {
+      'wss' => 'https',
+      'ws' => 'http',
+      'https' || 'http' => uri.scheme,
+      _ => null,
+    };
+    return scheme == null ? null : uri.replace(scheme: scheme);
+  } on FormatException {
+    return null;
+  }
+}
diff --git a/mobile/lib/features/custom_emoji/custom_emoji.dart b/mobile/lib/shared/custom_emoji/custom_emoji.dart
similarity index 99%
rename from mobile/lib/features/custom_emoji/custom_emoji.dart
rename to mobile/lib/shared/custom_emoji/custom_emoji.dart
index 5fe51151af..da2e2d2909 100644
--- a/mobile/lib/features/custom_emoji/custom_emoji.dart
+++ b/mobile/lib/shared/custom_emoji/custom_emoji.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 
-import '../../shared/relay/nostr_models.dart';
+import '../relay/nostr_models.dart';
 
 /// A community custom emoji: a `:shortcode:` mapped to an image URL.
 ///
diff --git a/mobile/lib/features/custom_emoji/custom_emoji_provider.dart b/mobile/lib/shared/custom_emoji/custom_emoji_provider.dart
similarity index 98%
rename from mobile/lib/features/custom_emoji/custom_emoji_provider.dart
rename to mobile/lib/shared/custom_emoji/custom_emoji_provider.dart
index be866e17c4..1779678a0d 100644
--- a/mobile/lib/features/custom_emoji/custom_emoji_provider.dart
+++ b/mobile/lib/shared/custom_emoji/custom_emoji_provider.dart
@@ -1,6 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-import '../../shared/relay/relay.dart';
+import '../relay/relay.dart';
 import 'custom_emoji.dart';
 
 /// Community custom-emoji palette (NIP-30, per-user kind:30030 sets unioned).
diff --git a/mobile/lib/features/custom_emoji/custom_emoji_render.dart b/mobile/lib/shared/custom_emoji/custom_emoji_render.dart
similarity index 98%
rename from mobile/lib/features/custom_emoji/custom_emoji_render.dart
rename to mobile/lib/shared/custom_emoji/custom_emoji_render.dart
index 549babe608..e4af0cc43f 100644
--- a/mobile/lib/features/custom_emoji/custom_emoji_render.dart
+++ b/mobile/lib/shared/custom_emoji/custom_emoji_render.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:gpt_markdown/gpt_markdown.dart';
 import 'package:gpt_markdown/custom_widgets/markdown_config.dart';
 
-import '../../shared/relay/relay.dart';
+import '../relay/relay.dart';
 
 import 'custom_emoji.dart';
 
diff --git a/mobile/lib/shared/deeplink/deep_link.dart b/mobile/lib/shared/deeplink/deep_link.dart
index b2e57b8b00..0ef7b8e596 100644
--- a/mobile/lib/shared/deeplink/deep_link.dart
+++ b/mobile/lib/shared/deeplink/deep_link.dart
@@ -7,6 +7,8 @@
 /// half-formed target.
 library;
 
+import '../relay/relay_validation.dart';
+
 /// A parsed deep link supported by the app.
 sealed class BuzzDeepLink {
   const BuzzDeepLink();
@@ -81,6 +83,38 @@ class MessageDeepLink extends BuzzDeepLink {
       'thread: $threadRootId)';
 }
 
+/// Build a canonical `buzz://message` link for a channel message.
+///
+/// Mirrors `desktop/src/features/messages/lib/messageLink.ts` so links copied
+/// or shared from mobile round-trip through every client's parser:
+/// `buzz://message?channel=<uuid>&id=<eventId>[&thread=<rootId>]`.
+///
+/// An empty [threadRootId] is treated as "no thread" so callers can pass
+/// through a nullable thread reference without extra checks.
+String buildMessageLink({
+  required String channelId,
+  required String messageId,
+  String? threadRootId,
+}) {
+  if (channelId.isEmpty) {
+    throw ArgumentError('buildMessageLink: channelId is required');
+  }
+  if (messageId.isEmpty) {
+    throw ArgumentError('buildMessageLink: messageId is required');
+  }
+
+  final params = <String, String>{
+    'channel': channelId,
+    'id': messageId,
+    if (threadRootId != null && threadRootId.isNotEmpty) 'thread': threadRootId,
+  };
+  return Uri(
+    scheme: 'buzz',
+    host: 'message',
+    queryParameters: params,
+  ).toString();
+}
+
 /// Parse a `buzz://message?…` URI into a [MessageDeepLink].
 ///
 /// Returns `null` for non-`buzz` schemes, non-`message` hosts (e.g.
@@ -107,8 +141,9 @@ MessageDeepLink? parseMessageDeepLink(Uri uri) {
 ///
 /// Accepted forms:
 /// - `https://<relay>/invite/<code>` -> `wss://<relay>` + code
-/// - `http://<relay>/invite/<code>` -> `ws://<relay>` + code
-/// - `buzz://join?relay=<ws(s)://relay>&code=<code>` -> relay + code
+/// - `http://localhost/invite/<code>` -> `ws://localhost` + code in debug builds
+/// - `buzz://join?relay=<wss://relay>&code=<code>` -> relay + code
+/// - `buzz://join?relay=<ws://localhost>&code=<code>` -> local relay in debug
 ///
 /// Rejects credentials, fragments, missing params, nested relay credentials, and
 /// non-invite paths so scanners do not accidentally treat arbitrary URLs as
@@ -131,6 +166,11 @@ InviteDeepLink? parseInviteDeepLink(Uri uri) {
         relayUri.hasFragment) {
       return null;
     }
+    try {
+      validateInviteRelayUri(relayUri);
+    } on FormatException {
+      return null;
+    }
     final normalizedRelay = Uri(
       scheme: relayUri.scheme,
       host: relayUri.host,
@@ -155,6 +195,16 @@ InviteDeepLink? parseInviteDeepLink(Uri uri) {
       return null;
     }
     final relayScheme = uri.scheme == 'https' ? 'wss' : 'ws';
+    final relayUri = Uri(
+      scheme: relayScheme,
+      host: uri.host,
+      port: uri.hasPort ? uri.port : null,
+    );
+    try {
+      validateInviteRelayUri(relayUri);
+    } on FormatException {
+      return null;
+    }
     final relay = Uri(
       scheme: relayScheme,
       host: uri.host,
diff --git a/mobile/lib/shared/relay/identity_scoped_prefs.dart b/mobile/lib/shared/relay/identity_scoped_prefs.dart
new file mode 100644
index 0000000000..e080b1ca8c
--- /dev/null
+++ b/mobile/lib/shared/relay/identity_scoped_prefs.dart
@@ -0,0 +1,50 @@
+import 'dart:async';
+
+import 'package:shared_preferences/shared_preferences.dart';
+
+/// Reads an identity-scoped preference, migrating values left under a
+/// pre-canonicalization relay origin.
+///
+/// Identity-scoped keys embed the relay origin, and that origin used to be
+/// whatever scheme the onboarding flow happened to persist — `wss://` for an
+/// invite join, `https://` for device pairing. Now that [RelayConfig.baseUrl]
+/// canonicalizes the scheme, an install that joined by invite would compute a
+/// different key than the one its data was written under, leaving that data on
+/// disk but unreachable.
+///
+/// The value under [canonicalKey] wins. Otherwise a value under [legacyKey] is
+/// returned straight away and promoted onto the canonical key in the
+/// background. The legacy entry is removed only once the copy reports success,
+/// so a migration interrupted mid-flight leaves the original readable and the
+/// next read simply retries.
+///
+/// Pass matching accessors for the stored type — `getString`/`setString`, or
+/// `getStringList`/`setStringList`.
+T? readMigratedPref<T>(
+  SharedPreferences prefs, {
+  required String canonicalKey,
+  required String legacyKey,
+  required T? Function(String key) read,
+  required Future<bool> Function(String key, T value) write,
+}) {
+  final canonical = read(canonicalKey);
+  if (canonical != null) return canonical;
+
+  // Pairing-created communities already store an HTTP origin, so the two keys
+  // coincide and there is nothing to migrate.
+  if (canonicalKey == legacyKey) return null;
+
+  final legacy = read(legacyKey);
+  if (legacy == null) return null;
+
+  unawaited(_promote(prefs, legacyKey, write(canonicalKey, legacy)));
+  return legacy;
+}
+
+Future<void> _promote(
+  SharedPreferences prefs,
+  String legacyKey,
+  Future<bool> copy,
+) async {
+  if (await copy) await prefs.remove(legacyKey);
+}
diff --git a/mobile/lib/shared/relay/media_upload.dart b/mobile/lib/shared/relay/media_upload.dart
index 93c53e9743..58c93979d7 100644
--- a/mobile/lib/shared/relay/media_upload.dart
+++ b/mobile/lib/shared/relay/media_upload.dart
@@ -21,6 +21,8 @@ const _mediaUploadPlatformChannelName = 'buzz/media_upload';
 const _sanitizeImageForUploadMethod = 'sanitizeImageForUpload';
 const _transcodeVideoToMp4Method = 'transcodeVideoToMp4';
 const _transcodeImageToJpegMethod = 'transcodeImageToJpeg';
+const _requiresLegacyMediaStoragePermissionMethod =
+    'requiresLegacyMediaStoragePermission';
 const _readClipboardImageMethod = 'readClipboardImage';
 const _clipboardHasImageMethod = 'clipboardHasImage';
 const _uploadAuthKind = 24242;
@@ -39,6 +41,17 @@ final _mediaUploadPlatformChannel = MethodChannel(
   _mediaUploadPlatformChannelName,
 );
 
+/// Whether saving media needs Android's pre-scoped-storage runtime permission.
+Future<bool> requiresLegacyMediaStoragePermission() async {
+  if (defaultTargetPlatform != TargetPlatform.android) {
+    return false;
+  }
+  return await _mediaUploadPlatformChannel.invokeMethod<bool>(
+        _requiresLegacyMediaStoragePermissionMethod,
+      ) ??
+      false;
+}
+
 const _allowedImageMimeTypes = {
   'image/jpeg',
   'image/png',
@@ -51,6 +64,9 @@ const _maxFileSizeBytes = 100 * 1024 * 1024; // 100MB
 const _mediaPolicyUploadMessage = "We couldn't prepare this image for upload.";
 
 typedef PickGalleryImage = Future<XFile?> Function();
+
+/// Selects multiple gallery images for upload in picker order.
+typedef PickGalleryImages = Future<List<XFile>> Function();
 typedef PickGalleryVideo = Future<XFile?> Function();
 typedef PickAttachmentFile = Future<XFile?> Function();
 typedef SanitizeImageBytes =
@@ -159,6 +175,7 @@ class MediaUploadService {
   final String _baseUrl;
   final String? _nsec;
   final PickGalleryImage _pickGalleryImage;
+  final PickGalleryImages _pickGalleryImages;
   final PickGalleryVideo _pickGalleryVideo;
   final PickAttachmentFile? _pickAttachmentFile;
   final SanitizeImageBytes _sanitizeImageBytes;
@@ -173,6 +190,7 @@ class MediaUploadService {
     required String baseUrl,
     required String? nsec,
     required PickGalleryImage pickGalleryImage,
+    PickGalleryImages? pickGalleryImages,
     required PickGalleryVideo pickGalleryVideo,
     PickAttachmentFile? pickAttachmentFile,
     SanitizeImageBytes? sanitizeImageBytes,
@@ -184,6 +202,12 @@ class MediaUploadService {
   }) : _baseUrl = baseUrl,
        _nsec = nsec,
        _pickGalleryImage = pickGalleryImage,
+       _pickGalleryImages =
+           pickGalleryImages ??
+           (() async {
+             final image = await pickGalleryImage();
+             return image == null ? const <XFile>[] : [image];
+           }),
        _pickGalleryVideo = pickGalleryVideo,
        _pickAttachmentFile = pickAttachmentFile,
        _sanitizeImageBytes = sanitizeImageBytes ?? _sanitizePickedImageBytes,
@@ -207,6 +231,9 @@ class MediaUploadService {
     return uploadImage(pickedImage);
   }
 
+  /// Opens the system picker with multi-selection enabled.
+  Future<List<XFile>> pickGalleryImages() => _pickGalleryImages();
+
   Future<BlobDescriptor> uploadImage(XFile image) async {
     final preparedImage = await _prepareUploadImage(image);
     return _uploadPreparedBytes(
@@ -230,9 +257,11 @@ class MediaUploadService {
     return uploadImage(XFile.fromData(bytes));
   }
 
-  Future<BlobDescriptor?> pickAndUploadVideo() async {
-    final pickedVideo = await _pickGalleryVideo();
-    if (pickedVideo == null) return null;
+  /// Opens the system gallery video picker.
+  Future<XFile?> pickGalleryVideo() => _pickGalleryVideo();
+
+  /// Sanitizes and uploads [pickedVideo] as an MP4 attachment.
+  Future<BlobDescriptor> uploadVideo(XFile pickedVideo) async {
     final length = await pickedVideo.length();
     if (length > _maxVideoSizeBytes) {
       throw Exception(
@@ -265,14 +294,23 @@ class MediaUploadService {
     }
   }
 
-  Future<BlobDescriptor?> pickAndUploadFile() async {
+  Future<BlobDescriptor?> pickAndUploadVideo() async {
+    final pickedVideo = await pickGalleryVideo();
+    if (pickedVideo == null) return null;
+    return uploadVideo(pickedVideo);
+  }
+
+  /// Opens the system document picker for a generic file attachment.
+  Future<XFile?> pickAttachmentFile() async {
     final pickAttachmentFile = _pickAttachmentFile;
     if (pickAttachmentFile == null) {
       throw Exception("File attachments aren't available on this device.");
     }
-    final pickedFile = await pickAttachmentFile();
-    if (pickedFile == null) return null;
+    return pickAttachmentFile();
+  }
 
+  /// Uploads [pickedFile] as a size-limited generic attachment.
+  Future<BlobDescriptor> uploadFile(XFile pickedFile) async {
     final length = await pickedFile.length();
     if (length == 0) {
       throw Exception('File is empty.');
@@ -291,6 +329,12 @@ class MediaUploadService {
     return descriptor.withFilename(_safeAttachmentFilename(pickedFile.name));
   }
 
+  Future<BlobDescriptor?> pickAndUploadFile() async {
+    final pickedFile = await pickAttachmentFile();
+    if (pickedFile == null) return null;
+    return uploadFile(pickedFile);
+  }
+
   Future<BlobDescriptor> uploadBytes(
     Uint8List bytes, {
     required String mimeType,
@@ -768,6 +812,7 @@ final mediaUploadServiceProvider = Provider<MediaUploadService>((ref) {
       source: ImageSource.gallery,
       requestFullMetadata: false,
     ),
+    pickGalleryImages: () => picker.pickMultiImage(requestFullMetadata: false),
     pickGalleryVideo: () => picker.pickVideo(source: ImageSource.gallery),
     pickAttachmentFile: file_selector.openFile,
   );
diff --git a/mobile/lib/shared/relay/nostr_models.dart b/mobile/lib/shared/relay/nostr_models.dart
index 3505483591..820fee4ed6 100644
--- a/mobile/lib/shared/relay/nostr_models.dart
+++ b/mobile/lib/shared/relay/nostr_models.dart
@@ -18,6 +18,7 @@ abstract final class EventKind {
   static const agentObserverFrame = 24200;
   static const huddleReaction = 24810;
   static const readState = 30078;
+  static const eventReminder = 30300;
   static const userStatus = 30315;
   static const dmVisibility = 30622;
   static const streamMessageV2 = 40002;
diff --git a/mobile/lib/shared/relay/relay.dart b/mobile/lib/shared/relay/relay.dart
index d168b9a097..bc11325414 100644
--- a/mobile/lib/shared/relay/relay.dart
+++ b/mobile/lib/shared/relay/relay.dart
@@ -1,4 +1,5 @@
 export 'app_lifecycle_provider.dart';
+export 'identity_scoped_prefs.dart';
 export 'media_auth.dart';
 export 'media_image.dart';
 export 'media_upload.dart';
diff --git a/mobile/lib/shared/relay/relay_provider.dart b/mobile/lib/shared/relay/relay_provider.dart
index 97b88dd3df..061dd6cb38 100644
--- a/mobile/lib/shared/relay/relay_provider.dart
+++ b/mobile/lib/shared/relay/relay_provider.dart
@@ -10,12 +10,46 @@ import 'relay_client.dart';
 ///   - `baseUrl` — where the relay lives (used for WS + media upload)
 ///   - `nsec`    — the user's signing key (drives NIP-42 AUTH and event sigs)
 class RelayConfig {
-  final String baseUrl;
+  const RelayConfig({required String baseUrl, this.nsec}) : _baseUrl = baseUrl;
+
+  /// Relay origin exactly as the active community stored it.
+  final String _baseUrl;
 
   /// Nostr secret key (bech32 nsec) for signing events and NIP-42 AUTH.
   final String? nsec;
 
-  const RelayConfig({required this.baseUrl, this.nsec});
+  /// The origin as persisted, before scheme canonicalization.
+  ///
+  /// Exists solely so identity-scoped storage keys written before [baseUrl]
+  /// was canonicalized stay reachable — see [readMigratedPref]. Never use it
+  /// for network I/O; [baseUrl] and [wsUrl] are the addresses to connect to.
+  String get storedOrigin => _baseUrl;
+
+  /// Relay origin as an HTTP(S) URL.
+  ///
+  /// Communities are persisted with whichever scheme their onboarding flow
+  /// used: device pairing stores `https://` (it rejects anything else), while
+  /// an invite join stores the `wss://` relay URL carried by the invite link.
+  /// Every consumer treats this as an HTTP origin — [wsUrl], the `/query`
+  /// endpoint, media upload and Blossom auth — so a `wss://` base silently
+  /// degrades all of them. Folding the websocket schemes back here keeps both
+  /// onboarding paths equivalent, including for already-persisted communities.
+  ///
+  /// Derived rather than normalized in the constructor so that the constructor
+  /// stays `const`: the compile-time fallback below relies on canonicalization
+  /// to keep its identity stable across rebuilds, and Riverpod's default
+  /// `updateShouldNotify` is `previous != next`, which falls back to identity
+  /// here. A fresh instance per rebuild would resubscribe every listener.
+  String get baseUrl {
+    final uri = Uri.tryParse(_baseUrl);
+    if (uri == null) return _baseUrl;
+    final scheme = switch (uri.scheme) {
+      'wss' => 'https',
+      'ws' => 'http',
+      _ => null,
+    };
+    return scheme == null ? _baseUrl : uri.replace(scheme: scheme).toString();
+  }
 
   /// Derive the websocket URL from the HTTP base URL.
   String get wsUrl {
diff --git a/mobile/lib/shared/relay/relay_validation.dart b/mobile/lib/shared/relay/relay_validation.dart
new file mode 100644
index 0000000000..eccbadf974
--- /dev/null
+++ b/mobile/lib/shared/relay/relay_validation.dart
@@ -0,0 +1,164 @@
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+
+/// Validates an untrusted relay origin before the mobile app connects to it.
+///
+/// Production relay URLs must use TLS and may not contain local or otherwise
+/// non-public IP literals. Debug builds retain plaintext localhost support for
+/// local development, but other non-public destinations remain blocked.
+void validateInviteRelayUri(
+  Uri uri, {
+  bool allowInsecureLocalhost = kDebugMode,
+}) {
+  if (uri.host.isEmpty ||
+      uri.userInfo.isNotEmpty ||
+      uri.hasFragment ||
+      (uri.path.isNotEmpty && uri.path != '/') ||
+      uri.hasQuery) {
+    throw const FormatException('Relay URL must be an origin');
+  }
+
+  if (uri.scheme != 'ws' && uri.scheme != 'wss') {
+    throw FormatException('Invalid relay URL scheme: ${uri.scheme}');
+  }
+
+  final host = uri.host.toLowerCase();
+  final isLocalhost = host == 'localhost' || host.endsWith('.localhost');
+  if (uri.scheme != 'wss' && !(allowInsecureLocalhost && isLocalhost)) {
+    throw const FormatException('Relay URL must use WSS');
+  }
+  if (isLocalhost) {
+    if (!allowInsecureLocalhost) {
+      throw const FormatException('Relay URL cannot target localhost');
+    }
+    return;
+  }
+
+  final address = InternetAddress.tryParse(host);
+  if (_looksLikeNumericAddress(host)) {
+    // Only canonical dotted-decimal IPv4 is accepted. Ambiguous legacy forms
+    // such as a single integer, hexadecimal, shortened components, or leading
+    // zeroes have varied interpretation across URI/network stacks.
+    final ipv4Parts = host.split('.');
+    final hasLeadingZero = ipv4Parts.any(
+      (part) => part.length > 1 && part.startsWith('0'),
+    );
+    if (address == null ||
+        address.type != InternetAddressType.IPv4 ||
+        address.address != host ||
+        ipv4Parts.length != 4 ||
+        hasLeadingZero) {
+      throw const FormatException('Relay URL contains an invalid IP address');
+    }
+  }
+  if (address != null) {
+    if (!_isPublicAddress(address)) {
+      throw const FormatException(
+        'Relay URL cannot target non-public network addresses',
+      );
+    }
+    return;
+  }
+
+  // DNS hostnames are allowed here. Preventing a hostname from resolving or
+  // rebinding to a non-public address requires connect-time resolution and
+  // address pinning in the networking layer.
+}
+
+bool _looksLikeNumericAddress(String host) {
+  if (RegExp(r'^\d+$').hasMatch(host) ||
+      RegExp(r'^0x[0-9a-f]+$', caseSensitive: false).hasMatch(host)) {
+    return true;
+  }
+  final parts = host.split('.');
+  return parts.length > 1 &&
+      parts.every(
+        (part) =>
+            RegExp(r'^\d+$').hasMatch(part) ||
+            RegExp(r'^0x[0-9a-f]+$', caseSensitive: false).hasMatch(part),
+      );
+}
+
+bool _isPublicAddress(InternetAddress address) {
+  final bytes = address.rawAddress;
+  if (address.type == InternetAddressType.IPv4) {
+    return !_isNonPublicIpv4(bytes);
+  }
+  if (address.type != InternetAddressType.IPv6 || bytes.length != 16) {
+    return false;
+  }
+
+  // IPv4-compatible and IPv4-mapped IPv6 addresses inherit the embedded
+  // IPv4 address's classification.
+  final firstTenZero = bytes.take(10).every((byte) => byte == 0);
+  if (firstTenZero &&
+      ((bytes[10] == 0 && bytes[11] == 0) ||
+          (bytes[10] == 0xff && bytes[11] == 0xff))) {
+    return !_isNonPublicIpv4(bytes.sublist(12));
+  }
+
+  // Accept only globally reachable IPv6 literals. Global unicast space is
+  // 2000::/3, with special-purpose exclusions and narrow globally reachable
+  // exceptions tracked by IANA (reconciled 2026-07-26):
+  // https://www.iana.org/assignments/iana-ipv6-special-registry/
+  if (!_hasPrefix(bytes, [0x20], 3)) return false;
+
+  // 2001::/23 is reserved for IETF protocol assignments. Only these entries
+  // are currently classified by IANA as globally reachable.
+  if (_hasPrefix(bytes, [0x20, 0x01, 0x00], 23) &&
+      !_isGloballyReachableIetfAssignment(bytes)) {
+    return false;
+  }
+
+  // Documentation and transition prefixes are not public relay destinations.
+  if (_hasPrefix(bytes, [0x20, 0x01, 0x0d, 0xb8], 32)) return false;
+  if (_hasPrefix(bytes, [0x20, 0x02], 16)) return false;
+  if (_hasPrefix(bytes, [0x3f, 0xff, 0x00], 20)) return false;
+  return true;
+}
+
+bool _isGloballyReachableIetfAssignment(List<int> bytes) {
+  final isGlobalAnycast =
+      _hasPrefix(bytes, [0x20, 0x01, 0x00, 0x01, 0, 0, 0, 0], 64) &&
+      bytes.sublist(8, 15).every((byte) => byte == 0) &&
+      bytes[15] >= 1 &&
+      bytes[15] <= 3;
+  return isGlobalAnycast ||
+      _hasPrefix(bytes, [0x20, 0x01, 0x00, 0x03], 32) ||
+      _hasPrefix(bytes, [0x20, 0x01, 0x00, 0x04, 0x01, 0x12], 48) ||
+      _hasPrefix(bytes, [0x20, 0x01, 0x00, 0x20], 28) ||
+      _hasPrefix(bytes, [0x20, 0x01, 0x00, 0x30], 28);
+}
+
+bool _hasPrefix(List<int> address, List<int> prefix, int prefixLength) {
+  final wholeBytes = prefixLength ~/ 8;
+  for (var i = 0; i < wholeBytes; i++) {
+    if (address[i] != prefix[i]) return false;
+  }
+  final remainingBits = prefixLength % 8;
+  if (remainingBits == 0) return true;
+  final mask = (0xff << (8 - remainingBits)) & 0xff;
+  return (address[wholeBytes] & mask) == (prefix[wholeBytes] & mask);
+}
+
+bool _isNonPublicIpv4(List<int> bytes) {
+  if (bytes.length != 4) return true;
+  final a = bytes[0];
+  final b = bytes[1];
+  final c = bytes[2];
+
+  return a == 0 ||
+      a == 10 ||
+      a == 127 ||
+      (a == 100 && b >= 64 && b <= 127) ||
+      (a == 169 && b == 254) ||
+      (a == 172 && b >= 16 && b <= 31) ||
+      (a == 192 && b == 0 && c == 0) ||
+      (a == 192 && b == 0 && c == 2) ||
+      (a == 192 && b == 168) ||
+      (a == 198 && (b == 18 || b == 19)) ||
+      (a == 198 && b == 51 && c == 100) ||
+      (a == 203 && b == 0 && c == 113) ||
+      a >= 224;
+}
diff --git a/mobile/lib/shared/relay/signed_event_relay.dart b/mobile/lib/shared/relay/signed_event_relay.dart
index 7300095223..a739b76594 100644
--- a/mobile/lib/shared/relay/signed_event_relay.dart
+++ b/mobile/lib/shared/relay/signed_event_relay.dart
@@ -31,6 +31,7 @@ class SignedEventRelay {
     required String content,
     required List<List<String>> tags,
     int? createdAt,
+    void Function(NostrEvent event)? onSigned,
   }) async {
     final nsec = _nsec;
     if (nsec == null || nsec.isEmpty) {
@@ -52,6 +53,7 @@ class SignedEventRelay {
     );
 
     final nostrEvent = NostrEvent.fromJson(event.toMap());
+    onSigned?.call(nostrEvent);
     return _session.publish(nostrEvent);
   }
 }
diff --git a/mobile/lib/shared/reminders/remind_me_later_sheet.dart b/mobile/lib/shared/reminders/remind_me_later_sheet.dart
new file mode 100644
index 0000000000..8d02a57609
--- /dev/null
+++ b/mobile/lib/shared/reminders/remind_me_later_sheet.dart
@@ -0,0 +1,122 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
+
+import '../theme/theme.dart';
+import '../widgets/sheet_divider.dart';
+import 'reminder_service.dart';
+import 'reminder_time_presets.dart';
+
+/// Bottom sheet for "Remind me later": desktop-parity presets plus a native
+/// date/time picker, publishing the same author-private kind-30300 reminder
+/// events desktop reads.
+void showRemindMeLaterSheet({
+  required BuildContext context,
+  required WidgetRef ref,
+  required ReminderTarget target,
+}) {
+  final service = ref.read(reminderServiceProvider);
+  final messenger = ScaffoldMessenger.of(context);
+  if (service == null) {
+    messenger.showSnackBar(
+      const SnackBar(content: Text('Sign in to set reminders')),
+    );
+    return;
+  }
+
+  Future<void> submit(int notBefore) async {
+    try {
+      await service.createReminder(target: target, notBefore: notBefore);
+      messenger.showSnackBar(const SnackBar(content: Text('Reminder set')));
+    } catch (error) {
+      // Stable user-facing copy; the relay/crypto detail goes to the log.
+      debugPrint('[RemindMeLater] createReminder failed: $error');
+      messenger.showSnackBar(
+        const SnackBar(content: Text('Couldn’t set reminder. Try again.')),
+      );
+    }
+  }
+
+  showModalBottomSheet<void>(
+    context: context,
+    showDragHandle: true,
+    builder: (sheetContext) => SafeArea(
+      child: SingleChildScrollView(
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(
+            Grid.gutter,
+            0,
+            Grid.gutter,
+            Grid.xs,
+          ),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: Grid.half,
+                  bottom: Grid.xxs,
+                ),
+                child: Text(
+                  'Remind me about this message',
+                  style: Theme.of(sheetContext).textTheme.titleSmall,
+                ),
+              ),
+              for (final preset in reminderTimePresets)
+                ListTile(
+                  leading: const Icon(LucideIcons.clock),
+                  title: Text(preset.label),
+                  onTap: () {
+                    Navigator.of(sheetContext).pop();
+                    submit(preset.getTimestamp());
+                  },
+                ),
+              const SheetDivider(),
+              ListTile(
+                leading: const Icon(LucideIcons.calendarClock),
+                title: const Text('Pick a date & time'),
+                onTap: () async {
+                  final navigator = Navigator.of(sheetContext);
+                  final timestamp = await _pickCustomDateTime(context);
+                  // Cancelled or not-in-the-future: keep the preset sheet
+                  // open so retrying doesn't mean long-pressing again.
+                  if (timestamp == null) return;
+                  if (navigator.mounted) navigator.pop();
+                  await submit(timestamp);
+                },
+              ),
+            ],
+          ),
+        ),
+      ),
+    ),
+  );
+}
+
+/// Native date + time pickers chained together. Returns a future Unix
+/// timestamp in seconds, or null when cancelled or not in the future.
+Future<int?> _pickCustomDateTime(BuildContext context) async {
+  final now = DateTime.now();
+  final date = await showDatePicker(
+    context: context,
+    initialDate: now,
+    firstDate: DateTime(now.year, now.month, now.day),
+    lastDate: now.add(const Duration(days: 365 * 2)),
+  );
+  if (date == null || !context.mounted) return null;
+
+  final time = await showTimePicker(
+    context: context,
+    initialTime: const TimeOfDay(hour: 9, minute: 0),
+  );
+  if (time == null) return null;
+
+  final timestamp = combineCustomDateTime(date, time.hour, time.minute);
+  if (timestamp == null && context.mounted) {
+    ScaffoldMessenger.of(
+      context,
+    ).showSnackBar(const SnackBar(content: Text('Pick a time in the future')));
+  }
+  return timestamp;
+}
diff --git a/mobile/lib/shared/reminders/reminder_service.dart b/mobile/lib/shared/reminders/reminder_service.dart
new file mode 100644
index 0000000000..08704541e6
--- /dev/null
+++ b/mobile/lib/shared/reminders/reminder_service.dart
@@ -0,0 +1,149 @@
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:nostr/nostr.dart' as nostr;
+
+import '../crypto/ecdh.dart';
+import '../crypto/nip44.dart';
+import '../relay/relay.dart';
+
+/// The message a reminder points back to. Mirrors the desktop
+/// `ReminderTarget` shape (`desktop/src/features/reminders/lib/reminderTypes.ts`)
+/// so reminders created on mobile are readable by desktop and vice versa.
+class ReminderTarget {
+  /// Event ID of the target message.
+  final String eventId;
+
+  /// Channel ID where the message lives.
+  final String channelId;
+
+  /// Preview text of the target message (truncated).
+  final String preview;
+
+  /// Author pubkey of the target message.
+  final String authorPubkey;
+
+  const ReminderTarget({
+    required this.eventId,
+    required this.channelId,
+    required this.preview,
+    required this.authorPubkey,
+  });
+
+  Map<String, dynamic> toJson() => {
+    'eventId': eventId,
+    'channelId': channelId,
+    'preview': preview,
+    'authorPubkey': authorPubkey,
+  };
+}
+
+/// Build the NIP-ER reminder plaintext for a new pending reminder.
+///
+/// Matches the JSON desktop writes in `reminderService.ts#createReminder`:
+/// `{"target": {...}, "note": <optional>, "status": "pending"}`. `note` is
+/// omitted entirely when absent so both clients parse each other's payloads.
+String buildReminderPlaintext({required ReminderTarget target, String? note}) {
+  return jsonEncode({
+    'target': target.toJson(),
+    if (note != null && note.isNotEmpty) 'note': note,
+    'status': 'pending',
+  });
+}
+
+/// Generate a reminder `d`-tag with 128 bits of entropy (NIP-ER MUST).
+String randomReminderDTag() {
+  final bytes = secureRandomBytes(16);
+  return bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join();
+}
+
+/// Tags for a new pending reminder event: `d` plus strict-decimal
+/// `not_before`, exactly as the relay's NIP-ER validator expects.
+List<List<String>> buildReminderTags({
+  required String dTag,
+  required int notBefore,
+}) {
+  if (notBefore < 0) {
+    throw ArgumentError('notBefore must be a non-negative Unix timestamp');
+  }
+  return [
+    ['d', dTag],
+    ['not_before', '$notBefore'],
+  ];
+}
+
+/// NIP-44 self-encryption for author-private reminder payloads. Derives the
+/// conversation key to the author's own pubkey, matching the desktop's
+/// `nip44_encrypt_to_self` Tauri command.
+class ReminderCrypto {
+  final Uint8List _conversationKey;
+
+  ReminderCrypto(String nsec, String pubkey)
+    : _conversationKey = _deriveKey(nsec, pubkey);
+
+  static Uint8List _deriveKey(String nsec, String pubkey) {
+    final privkeyHex = nostr.Nip19.decode(payload: nsec).data;
+    return getConversationKey(privkeyHex, pubkey);
+  }
+
+  String encrypt(String plaintext) => nip44Encrypt(_conversationKey, plaintext);
+
+  String decrypt(String ciphertext) =>
+      nip44Decrypt(_conversationKey, ciphertext);
+}
+
+/// Creates author-private kind-30300 reminders on the relay.
+class ReminderService {
+  final SignedEventRelay _signedEventRelay;
+  final ReminderCrypto _crypto;
+
+  ReminderService({
+    required SignedEventRelay signedEventRelay,
+    required ReminderCrypto crypto,
+  }) : _signedEventRelay = signedEventRelay,
+       _crypto = crypto;
+
+  /// Encrypt, sign, and publish a new pending reminder. [notBefore] is a Unix
+  /// timestamp in seconds after which clients surface the reminder.
+  Future<void> createReminder({
+    required ReminderTarget target,
+    required int notBefore,
+    String? note,
+  }) async {
+    final plaintext = buildReminderPlaintext(target: target, note: note);
+    final ciphertext = _crypto.encrypt(plaintext);
+    await _signedEventRelay.submit(
+      kind: EventKind.eventReminder,
+      content: ciphertext,
+      tags: buildReminderTags(dTag: randomReminderDTag(), notBefore: notBefore),
+    );
+  }
+}
+
+/// Provides a [ReminderService], or null when no signing identity is
+/// available (signed out).
+final reminderServiceProvider = Provider<ReminderService?>((ref) {
+  final relayConfig = ref.watch(relayConfigProvider);
+  final pubkey = ref.watch(myPubkeyProvider);
+
+  final nsec = relayConfig.nsec?.trim();
+  if (nsec == null || nsec.isEmpty || pubkey == null || pubkey.isEmpty) {
+    return null;
+  }
+
+  final ReminderCrypto crypto;
+  try {
+    crypto = ReminderCrypto(nsec, pubkey);
+  } catch (_) {
+    return null;
+  }
+
+  return ReminderService(
+    signedEventRelay: SignedEventRelay(
+      session: ref.read(relaySessionProvider.notifier),
+      nsec: nsec,
+    ),
+    crypto: crypto,
+  );
+});
diff --git a/mobile/lib/shared/reminders/reminder_time_presets.dart b/mobile/lib/shared/reminders/reminder_time_presets.dart
new file mode 100644
index 0000000000..bf563ab628
--- /dev/null
+++ b/mobile/lib/shared/reminders/reminder_time_presets.dart
@@ -0,0 +1,70 @@
+/// Reminder time presets shared by the "Remind me later" sheet.
+///
+/// Mirrors `desktop/src/features/reminders/lib/timePresets.ts` — same labels,
+/// same "always strictly in the future" guarantee.
+library;
+
+class ReminderTimePreset {
+  final String label;
+  final int Function() getTimestamp;
+
+  const ReminderTimePreset({required this.label, required this.getTimestamp});
+}
+
+int _nowSeconds() => DateTime.now().millisecondsSinceEpoch ~/ 1000;
+
+/// Next occurrence of [dayOffset] days from now at 9am local time. If that
+/// instant is already past, roll to the following day so the result is
+/// always in the future.
+int nextDayAt9am(int dayOffset, {DateTime? now}) {
+  final current = now ?? DateTime.now();
+  var target = DateTime(
+    current.year,
+    current.month,
+    current.day + dayOffset,
+    9,
+  );
+  if (!target.isAfter(current)) {
+    target = DateTime(target.year, target.month, target.day + 1, 9);
+  }
+  return target.millisecondsSinceEpoch ~/ 1000;
+}
+
+/// Days until next Monday (1-7), matching the desktop preset semantics.
+int daysUntilNextMonday(DateTime now) {
+  final days = (DateTime.monday - now.weekday) % 7;
+  return days == 0 ? 7 : days;
+}
+
+final List<ReminderTimePreset> reminderTimePresets = [
+  ReminderTimePreset(
+    label: 'In 30 minutes',
+    getTimestamp: () => _nowSeconds() + 30 * 60,
+  ),
+  ReminderTimePreset(
+    label: 'In 1 hour',
+    getTimestamp: () => _nowSeconds() + 60 * 60,
+  ),
+  ReminderTimePreset(
+    label: 'In 3 hours',
+    getTimestamp: () => _nowSeconds() + 3 * 60 * 60,
+  ),
+  ReminderTimePreset(
+    label: 'Tomorrow at 9am',
+    getTimestamp: () => nextDayAt9am(1),
+  ),
+  ReminderTimePreset(
+    label: 'Next Monday at 9am',
+    getTimestamp: () => nextDayAt9am(daysUntilNextMonday(DateTime.now())),
+  ),
+];
+
+/// Combine a picked date and time into a future Unix timestamp (seconds), or
+/// null when the instant is not strictly in the future — the shared guard for
+/// the custom picker so a past time never fires immediately.
+int? combineCustomDateTime(DateTime date, int hour, int minute) {
+  final target = DateTime(date.year, date.month, date.day, hour, minute);
+  final timestamp = target.millisecondsSinceEpoch ~/ 1000;
+  if (timestamp <= _nowSeconds()) return null;
+  return timestamp;
+}
diff --git a/mobile/lib/shared/theme/app_colors.dart b/mobile/lib/shared/theme/app_colors.dart
index 21c47eb0d1..2a937ec6b6 100644
--- a/mobile/lib/shared/theme/app_colors.dart
+++ b/mobile/lib/shared/theme/app_colors.dart
@@ -6,19 +6,31 @@ class AppColors extends ThemeExtension<AppColors> {
   final Color warning;
   final Color accent;
 
+  /// Gradient for the app's top section, non-null only under the Buzz themes.
+  /// Carried on the theme rather than read from a provider so any surface can
+  /// opt in via `context.appColors.topSectionGradient` — see
+  /// `buzzTopSectionGradient`.
+  final Gradient? topSectionGradient;
+
   const AppColors({
     required this.success,
     required this.warning,
     required this.accent,
+    this.topSectionGradient,
   });
 
   @override
-  AppColors copyWith({Color? success, Color? warning, Color? accent}) =>
-      AppColors(
-        success: success ?? this.success,
-        warning: warning ?? this.warning,
-        accent: accent ?? this.accent,
-      );
+  AppColors copyWith({
+    Color? success,
+    Color? warning,
+    Color? accent,
+    Gradient? topSectionGradient,
+  }) => AppColors(
+    success: success ?? this.success,
+    warning: warning ?? this.warning,
+    accent: accent ?? this.accent,
+    topSectionGradient: topSectionGradient ?? this.topSectionGradient,
+  );
 
   @override
   AppColors lerp(ThemeExtension<AppColors>? other, double t) {
@@ -27,6 +39,11 @@ class AppColors extends ThemeExtension<AppColors> {
       success: Color.lerp(success, other.success, t)!,
       warning: Color.lerp(warning, other.warning, t)!,
       accent: Color.lerp(accent, other.accent, t)!,
+      topSectionGradient: Gradient.lerp(
+        topSectionGradient,
+        other.topSectionGradient,
+        t,
+      ),
     );
   }
 }
diff --git a/mobile/lib/shared/theme/app_theme.dart b/mobile/lib/shared/theme/app_theme.dart
index f05c579a32..f8000d79e2 100644
--- a/mobile/lib/shared/theme/app_theme.dart
+++ b/mobile/lib/shared/theme/app_theme.dart
@@ -10,19 +10,29 @@ import 'text_theme.dart';
 /// Desktop uses --radius: 0.625rem (10px) as base:
 ///   lg = 10px, md = 8px, sm = 6px
 class Radii {
+  /// Small radius for compact UI elements.
+  static const double xs = 4.0;
   static const double lg = 10.0;
   static const double md = 8.0;
   static const double sm = 6.0;
+  static const double card = 12.0; // grouped settings cards
   static const double dialog = 24.0; // desktop uses rounded-3xl for dialogs
+
+  /// Fully rounds pills, circles, and other capsule shapes.
+  static const double full = 999.0;
 }
 
 class AppTheme {
-  static ThemeData light({ColorScheme? colorScheme}) {
+  static ThemeData light({
+    ColorScheme? colorScheme,
+    Gradient? topSectionGradient,
+  }) {
     final scheme = colorScheme ?? lightColorScheme;
     final appColors = AppColors(
       success: const Color(0xFF40A02B), // Catppuccin Latte Green — universal
       warning: const Color(0xFFDF8E1D), // Latte Yellow
       accent: scheme.tertiary,
+      topSectionGradient: topSectionGradient,
     );
 
     return _buildTheme(
@@ -34,7 +44,10 @@ class AppTheme {
     );
   }
 
-  static ThemeData dark({ColorScheme? colorScheme}) {
+  static ThemeData dark({
+    ColorScheme? colorScheme,
+    Gradient? topSectionGradient,
+  }) {
     final scheme = colorScheme ?? darkColorScheme;
     final appColors = AppColors(
       success: const Color(
@@ -42,6 +55,7 @@ class AppTheme {
       ), // Catppuccin Macchiato Green — universal
       warning: const Color(0xFFEED49F), // Macchiato Yellow
       accent: scheme.tertiary,
+      topSectionGradient: topSectionGradient,
     );
 
     return _buildTheme(
diff --git a/mobile/lib/shared/theme/buzz_theme.dart b/mobile/lib/shared/theme/buzz_theme.dart
new file mode 100644
index 0000000000..1214b97790
--- /dev/null
+++ b/mobile/lib/shared/theme/buzz_theme.dart
@@ -0,0 +1,49 @@
+import 'package:flutter/material.dart';
+
+/// Name of the first-party Buzz theme. Buzz reuses the GitHub Light palette for
+/// every base color; the one thing that sets it apart is a branded gradient
+/// painted across the app's top section. Mirrors desktop, where the same
+/// gradient fills the sidebar canvas — see `data-buzz-sidebar` in
+/// `desktop/src/shared/styles/globals/theme.css`.
+const buzzThemeName = 'buzz';
+
+/// Name of the dark counterpart, which reuses the GitHub Dark palette and the
+/// dark-tuned gradient stops. Paired with [buzzThemeName] in `themePairs`, so
+/// the two behave as a single "Buzz" choice under System mode.
+const buzzDarkThemeName = 'buzz-dark';
+
+/// Whether [themeName] is either half of the Buzz pair. Both halves enable the
+/// gradient so System mode keeps it on across an OS light/dark switch.
+bool isBuzzTheme(String themeName) =>
+    themeName == buzzThemeName || themeName == buzzDarkThemeName;
+
+/// Gradient stops, matching desktop's `--buzz-gradient-*` custom properties.
+const _lightTop = Color(0xFFE6E6B6);
+const _lightBottom = Color(0xFFC4D0DA);
+const _darkTop = Color(0xFF4A4616);
+const _darkBottom = Color(0xFF0A1423);
+
+/// The Buzz gradient for the app's top section, or null when [themeName] is not
+/// a Buzz theme — in which case the section keeps its default frosted fill.
+///
+/// The stops are fully opaque: under Buzz the color replaces the frosted
+/// treatment rather than tinting it, matching desktop's solid sidebar canvas.
+///
+/// [brightness] comes from the applied color scheme rather than the theme name,
+/// so System mode picks the right stops as the OS switches.
+LinearGradient? buzzTopSectionGradient(
+  String themeName,
+  Brightness brightness,
+) {
+  if (!isBuzzTheme(themeName)) return null;
+
+  final isDark = brightness == Brightness.dark;
+  return LinearGradient(
+    begin: Alignment.topCenter,
+    end: Alignment.bottomCenter,
+    colors: [
+      isDark ? _darkTop : _lightTop,
+      isDark ? _darkBottom : _lightBottom,
+    ],
+  );
+}
diff --git a/mobile/lib/shared/theme/message_typography.dart b/mobile/lib/shared/theme/message_typography.dart
new file mode 100644
index 0000000000..1073626390
--- /dev/null
+++ b/mobile/lib/shared/theme/message_typography.dart
@@ -0,0 +1,131 @@
+import 'package:flutter/material.dart';
+
+import 'grid.dart';
+
+const _fontFamily = 'Inter';
+
+/// Avatar size for full channel and thread messages.
+const messageAvatarSize = 42.0;
+
+/// Avatar size for conversation-oriented Activity rows.
+const activityAvatarSize = messageAvatarSize;
+
+/// Avatar size for compact message-result rows.
+const compactMessageAvatarSize = messageAvatarSize;
+
+/// Horizontal space between a message avatar and its content.
+const messageAvatarContentGap = Grid.twelve;
+
+/// Primary message copy: 15sp regular on a 20sp line height.
+const messageBodyTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 15,
+  fontWeight: FontWeight.w400,
+  height: 20 / 15,
+  letterSpacing: 0,
+);
+
+/// Message author names: 15sp semibold on a 17sp line height.
+const messageUsernameTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 15,
+  fontWeight: FontWeight.w600,
+  height: 17 / 15,
+  letterSpacing: 0,
+);
+
+/// Secondary author metadata: 15sp regular on a tight 17sp line height.
+const messageMetadataTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 15,
+  fontWeight: FontWeight.w400,
+  height: 17 / 15,
+  letterSpacing: 0,
+);
+
+/// Message timestamps share the secondary author metadata style.
+const messageTimestampTextStyle = messageMetadataTextStyle;
+
+/// Compact reply previews: 13.1sp regular on a 17sp line height.
+const replyPreviewTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 13.1,
+  fontWeight: FontWeight.w400,
+  height: 17 / 13.1,
+  letterSpacing: 0,
+);
+
+/// Reaction counts: 13.1sp medium on a 17sp line height.
+const reactionCountTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 13.1,
+  fontWeight: FontWeight.w500,
+  height: 17 / 13.1,
+  letterSpacing: 0,
+);
+
+/// Channel and thread titles: 20sp bold on a 24sp line height.
+const channelTitleTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 20,
+  fontWeight: FontWeight.w700,
+  height: 24 / 20,
+  letterSpacing: 0,
+);
+
+/// Primary labels in compact content lists.
+const contentListTitleTextStyle = messageUsernameTextStyle;
+
+/// Secondary copy in compact content lists.
+const contentListBodyTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 13.1,
+  fontWeight: FontWeight.w400,
+  height: 17 / 13.1,
+  letterSpacing: 0,
+);
+
+/// Timestamps in compact content lists.
+const contentListTimestampTextStyle = messageMetadataTextStyle;
+
+/// Filter chip labels use the compact 15sp type ramp.
+const filterChipTextStyle = messageMetadataTextStyle;
+
+/// Search fields use the primary 15sp body treatment.
+const searchInputTextStyle = messageBodyTextStyle;
+
+/// System message actor names: 15sp semibold on a 17sp line height.
+const systemMessageHeadingTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 15,
+  fontWeight: FontWeight.w600,
+  height: 17 / 15,
+  letterSpacing: 0,
+);
+
+/// System message copy: 15sp regular on a 20sp line height.
+const systemMessageBodyTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 15,
+  fontWeight: FontWeight.w400,
+  height: 20 / 15,
+  letterSpacing: 0,
+);
+
+/// Activity sender names share the primary author style.
+const activityUsernameTextStyle = messageUsernameTextStyle;
+
+/// Activity timestamps share the secondary author metadata style.
+const activityTimestampTextStyle = messageMetadataTextStyle;
+
+/// Activity context labels: 13.1sp medium on a 17sp line height.
+const activityContextTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 13.1,
+  fontWeight: FontWeight.w500,
+  height: 17 / 13.1,
+  letterSpacing: 0,
+);
+
+/// Activity message previews use the primary message copy style.
+const activityPreviewTextStyle = messageBodyTextStyle;
diff --git a/mobile/lib/shared/theme/text_theme.dart b/mobile/lib/shared/theme/text_theme.dart
index 693b50d0bc..6bfa242e1a 100644
--- a/mobile/lib/shared/theme/text_theme.dart
+++ b/mobile/lib/shared/theme/text_theme.dart
@@ -3,6 +3,15 @@ import 'package:flutter/material.dart';
 const _fontFamily = 'Inter';
 const _chatLineHeight = 22 / 16;
 
+/// Optional 12sp body style for compact secondary metadata.
+const bodyExtraSmallTextStyle = TextStyle(
+  fontFamily: _fontFamily,
+  fontSize: 12,
+  fontWeight: FontWeight.w400,
+  height: 1.25,
+  letterSpacing: 0,
+);
+
 const textTheme = TextTheme(
   displayLarge: TextStyle(
     fontFamily: _fontFamily,
@@ -104,7 +113,7 @@ const textTheme = TextTheme(
   ),
   bodySmall: TextStyle(
     fontFamily: _fontFamily,
-    fontSize: 12,
+    fontSize: 14,
     fontWeight: FontWeight.w400,
     height: 1.25,
     letterSpacing: 0,
diff --git a/mobile/lib/shared/theme/theme.dart b/mobile/lib/shared/theme/theme.dart
index e8a956661c..862534b4f7 100644
--- a/mobile/lib/shared/theme/theme.dart
+++ b/mobile/lib/shared/theme/theme.dart
@@ -2,8 +2,12 @@ export 'accent_colors.dart';
 export 'adaptive_theme.dart';
 export 'app_colors.dart';
 export 'app_theme.dart';
+export 'buzz_theme.dart';
 export 'color_scheme.dart';
 export 'grid.dart';
+export 'message_typography.dart';
 export 'theme_catalog.dart';
 export 'theme_extensions.dart';
+export 'theme_pairs.dart';
 export 'theme_provider.dart';
+export 'text_theme.dart' show bodyExtraSmallTextStyle;
diff --git a/mobile/lib/shared/theme/theme_catalog.dart b/mobile/lib/shared/theme/theme_catalog.dart
index 3a9780f201..9e00cfc811 100644
--- a/mobile/lib/shared/theme/theme_catalog.dart
+++ b/mobile/lib/shared/theme/theme_catalog.dart
@@ -33,6 +33,7 @@ class ThemeColors {
 
 /// Known light theme names — used to show sun/moon icons before loading.
 const lightThemeNames = <String>{
+  'buzz',
   'catppuccin-latte',
   'everforest-light',
   'github-light',
@@ -79,6 +80,25 @@ const themeCatalog = <ThemeColors>[
     added: Color(0xFF70BF56),
     deleted: Color(0xFFF26D78),
   ),
+  // Buzz and Buzz Dark are first-party: they borrow the GitHub Light / GitHub
+  // Dark palettes wholesale and are distinguished only by the branded gradient
+  // painted across the app's top section (see buzz_theme.dart).
+  ThemeColors(
+    name: 'buzz',
+    bg: Color(0xFFFFFFFF),
+    fg: Color(0xFF24292E),
+    comment: Color(0xFF6A737D),
+    added: Color(0xFF28A745),
+    deleted: Color(0xFFD73A49),
+  ),
+  ThemeColors(
+    name: 'buzz-dark',
+    bg: Color(0xFF24292E),
+    fg: Color(0xFFE1E4E8),
+    comment: Color(0xFF6A737D),
+    added: Color(0xFF34D058),
+    deleted: Color(0xFFEA4A5A),
+  ),
   ThemeColors(
     name: 'catppuccin-frappe',
     bg: Color(0xFF303446),
diff --git a/mobile/lib/shared/theme/theme_pairs.dart b/mobile/lib/shared/theme/theme_pairs.dart
new file mode 100644
index 0000000000..cfbf6a53a8
--- /dev/null
+++ b/mobile/lib/shared/theme/theme_pairs.dart
@@ -0,0 +1,115 @@
+import 'theme_catalog.dart';
+
+/// Light → dark theme counterparts, ported from the desktop app's `THEME_PAIRS`
+/// (`desktop/src/shared/theme/theme-loader.ts`) so both clients offer the same
+/// System-mode pairings.
+///
+/// Buzz leads the map the way it leads desktop's, so the first-party pair sorts
+/// ahead of the borrowed syntax themes wherever insertion order is preserved.
+const themePairs = <String, String>{
+  'buzz': 'buzz-dark',
+  'catppuccin-latte': 'catppuccin-mocha',
+  'everforest-light': 'everforest-dark',
+  'github-light': 'github-dark',
+  'github-light-default': 'github-dark-default',
+  'github-light-high-contrast': 'github-dark-high-contrast',
+  'gruvbox-light-hard': 'gruvbox-dark-hard',
+  'gruvbox-light-medium': 'gruvbox-dark-medium',
+  'gruvbox-light-soft': 'gruvbox-dark-soft',
+  'kanagawa-lotus': 'kanagawa-wave',
+  'light-plus': 'dark-plus',
+  'material-theme-lighter': 'material-theme',
+  'min-light': 'min-dark',
+  'one-light': 'one-dark-pro',
+  'rose-pine-dawn': 'rose-pine',
+  'slack-ochin': 'slack-dark',
+  'solarized-light': 'solarized-dark',
+  'vitesse-light': 'vitesse-dark',
+};
+
+final Map<String, String> _darkToLight = {
+  for (final entry in themePairs.entries) entry.value: entry.key,
+};
+
+/// The counterpart of [name] in the opposite brightness, or null when the theme
+/// has no pair. Resolves in both directions.
+String? themePairFor(String name) => themePairs[name] ?? _darkToLight[name];
+
+/// Whether [name] participates in a light/dark pair, and so can follow the OS.
+bool isPairedTheme(String name) => themePairFor(name) != null;
+
+/// [themeCatalog] partitioned the way the appearance picker offers it.
+class ThemeGroups {
+  /// Light members of light/dark pairs — the System-mode options. Each stands
+  /// in for both halves of its pair.
+  final List<ThemeColors> paired;
+
+  /// Every light theme, paired or not — the Light-mode options.
+  final List<ThemeColors> light;
+
+  /// Every dark theme, paired or not — the Dark-mode options.
+  final List<ThemeColors> dark;
+
+  const ThemeGroups({
+    required this.paired,
+    required this.light,
+    required this.dark,
+  });
+}
+
+ThemeGroups? _groups;
+
+/// [themeCatalog] grouped for the appearance picker, each list sorted by
+/// display name. Computed once — the catalog is a compile-time constant.
+ThemeGroups themeGroups() {
+  final cached = _groups;
+  if (cached != null) return cached;
+
+  final paired = <ThemeColors>[];
+  final light = <ThemeColors>[];
+  final dark = <ThemeColors>[];
+
+  for (final theme in themeCatalog) {
+    if (theme.isDark) {
+      dark.add(theme);
+      continue;
+    }
+    light.add(theme);
+    if (themePairs.containsKey(theme.name)) paired.add(theme);
+  }
+
+  int byDisplayName(ThemeColors a, ThemeColors b) =>
+      a.displayName.compareTo(b.displayName);
+  paired.sort(byDisplayName);
+  light.sort(byDisplayName);
+  dark.sort(byDisplayName);
+
+  return _groups = ThemeGroups(paired: paired, light: light, dark: dark);
+}
+
+/// Tokens that only describe a theme's brightness, stripped from paired labels.
+const _modeTokens = <String>{
+  'light',
+  'latte',
+  'dawn',
+  'lotus',
+  'ochin',
+  'lighter',
+  'plus',
+};
+
+/// Display label for a pair, derived from its light member: strips the
+/// mode-specific tokens so `github-light` reads as "Github" and stands for both
+/// halves. Mirrors desktop's `pairedThemeLabel`.
+String pairedThemeLabel(String lightName) {
+  final stripped = lightName
+      .split('-')
+      .where((token) => !_modeTokens.contains(token))
+      .toList();
+  // Stripping can remove everything (e.g. "light-plus") — fall back to the raw
+  // name so the row is never blank.
+  final parts = stripped.isEmpty ? lightName.split('-') : stripped;
+  return parts
+      .map((w) => w.isEmpty ? w : '${w[0].toUpperCase()}${w.substring(1)}')
+      .join(' ');
+}
diff --git a/mobile/lib/shared/theme/theme_provider.dart b/mobile/lib/shared/theme/theme_provider.dart
index 79f47dcab4..908134ebf7 100644
--- a/mobile/lib/shared/theme/theme_provider.dart
+++ b/mobile/lib/shared/theme/theme_provider.dart
@@ -4,21 +4,26 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 import 'accent_colors.dart';
 import 'adaptive_theme.dart';
+import 'buzz_theme.dart';
 import 'color_scheme.dart';
 import 'theme_catalog.dart';
+import 'theme_pairs.dart';
 
 const _themeModeKey = 'buzz_theme_mode';
 const _accentKey = 'buzz_accent_color';
 const _schemeKey = 'buzz_color_scheme';
 
-const defaultSchemeName = 'github-light';
-const defaultSchemeDisplayName = 'GitHub Light';
+/// Buzz ships as the default: the first-party pair, so a fresh install gets the
+/// branded top-section gradient without picking a theme first.
+const defaultSchemeName = buzzThemeName;
+const defaultSchemeDisplayName = 'Buzz';
 
 /// Pre-loaded SharedPreferences instance, overridden in main().
 final savedPrefsProvider = Provider<SharedPreferences>(
   (_) => throw UnimplementedError('Must be overridden'),
 );
 
+/// Tracks the appearance mode: follow the OS, or pin light/dark.
 class ThemeNotifier extends Notifier<ThemeMode> {
   @override
   ThemeMode build() {
@@ -30,6 +35,11 @@ class ThemeNotifier extends Notifier<ThemeMode> {
     }
     return ThemeMode.system;
   }
+
+  void setMode(ThemeMode mode) {
+    state = mode;
+    ref.read(savedPrefsProvider).setString(_themeModeKey, mode.name);
+  }
 }
 
 final themeProvider = NotifierProvider<ThemeNotifier, ThemeMode>(
@@ -68,19 +78,21 @@ class SchemeNotifier extends Notifier<String?> {
   @override
   String? build() {
     final prefs = ref.read(savedPrefsProvider);
-    final scheme = prefs.getString(_schemeKey);
+    final stored = prefs.getString(_schemeKey);
+    final compatible = schemeForAppearanceMode(
+      stored,
+      ref.watch(themeProvider),
+    );
 
-    // One-time migration: if no scheme has been chosen and the user had a
-    // non-system themeMode persisted (from the old Light/System/Dark toggle),
-    // reset it because default schemes now control their own brightness.
-    if (scheme == null) {
-      final storedMode = prefs.getString(_themeModeKey);
-      if (storedMode != null && storedMode != ThemeMode.system.name) {
-        prefs.setString(_themeModeKey, ThemeMode.system.name);
+    if (compatible != stored) {
+      if (compatible == null) {
+        prefs.remove(_schemeKey);
+      } else {
+        prefs.setString(_schemeKey, compatible);
       }
     }
 
-    return scheme;
+    return compatible;
   }
 
   void setScheme(String? name) {
@@ -98,25 +110,160 @@ final schemeProvider = NotifierProvider<SchemeNotifier, String?>(
   SchemeNotifier.new,
 );
 
-/// Resolves the current scheme selection into light and dark [ColorScheme]s.
-/// When a named scheme is selected, generates it via the adaptive engine.
-/// When null (default), resolves to [defaultSchemeName].
-({ColorScheme light, ColorScheme dark, ThemeMode? forcedMode}) resolveSchemes(
-  String? schemeName,
-) {
-  final theme =
+/// Returns a scheme that can honor [mode] without silently pinning brightness.
+///
+/// System mode only offers paired themes because they have both light and dark
+/// variants. Switching to it from an unpaired or unknown selection therefore
+/// falls back to the first paired theme, matching the picker ordering.
+String? schemeForAppearanceMode(String? schemeName, ThemeMode mode) {
+  if (mode != ThemeMode.system) return schemeName;
+
+  final selected = findTheme(schemeName ?? defaultSchemeName);
+  if (selected != null && isPairedTheme(selected.name)) return schemeName;
+
+  return themeGroups().paired.firstOrNull?.name ?? schemeName;
+}
+
+/// Resolves the selected scheme and appearance [mode] into light and dark
+/// [ColorScheme]s, mirroring desktop's System / Light / Dark behaviour.
+///
+/// In [ThemeMode.system] a paired theme is rendered with its pair
+/// ([themePairFor]) so Flutter swaps them with the OS. An unpaired theme is
+/// pinned to its own brightness. In [ThemeMode.light] and [ThemeMode.dark] the
+/// theme is coerced to that brightness and the mode is forced, so the OS setting
+/// is ignored.
+({
+  ColorScheme light,
+  ColorScheme dark,
+  ThemeColors? lightTheme,
+  ThemeColors? darkTheme,
+  ThemeMode? forcedMode,
+})
+resolveSchemes(String? schemeName, ThemeMode mode) {
+  final selected =
       findTheme(schemeName ?? defaultSchemeName) ??
       findTheme(defaultSchemeName);
-  if (theme == null) {
-    return (light: lightColorScheme, dark: darkColorScheme, forcedMode: null);
+  if (selected == null) {
+    return (
+      light: lightColorScheme,
+      dark: darkColorScheme,
+      lightTheme: null,
+      darkTheme: null,
+      forcedMode: null,
+    );
   }
 
-  final scheme = generateColorScheme(theme);
-
-  // A named scheme is inherently light or dark — force the mode.
-  return (
-    light: scheme,
-    dark: scheme,
-    forcedMode: theme.isDark ? ThemeMode.dark : ThemeMode.light,
-  );
+  switch (mode) {
+    case ThemeMode.system:
+      final pairName = themePairFor(selected.name);
+      if (pairName == null) {
+        final scheme = generateColorScheme(selected);
+        return (
+          light: scheme,
+          dark: scheme,
+          lightTheme: selected,
+          darkTheme: selected,
+          forcedMode: selected.isDark ? ThemeMode.dark : ThemeMode.light,
+        );
+      }
+      final counterpart = findTheme(pairName) ?? selected;
+      final lightTheme = selected.isDark ? counterpart : selected;
+      final darkTheme = selected.isDark ? selected : counterpart;
+      return (
+        light: generateColorScheme(lightTheme),
+        dark: generateColorScheme(darkTheme),
+        lightTheme: lightTheme,
+        darkTheme: darkTheme,
+        forcedMode: null,
+      );
+    case ThemeMode.light:
+      final theme = _themeForBrightness(selected, wantDark: false);
+      final scheme = generateColorScheme(theme);
+      return (
+        light: scheme,
+        dark: scheme,
+        lightTheme: theme,
+        darkTheme: theme,
+        forcedMode: ThemeMode.light,
+      );
+    case ThemeMode.dark:
+      final theme = _themeForBrightness(selected, wantDark: true);
+      final scheme = generateColorScheme(theme);
+      return (
+        light: scheme,
+        dark: scheme,
+        lightTheme: theme,
+        darkTheme: theme,
+        forcedMode: ThemeMode.dark,
+      );
+  }
+}
+
+/// The theme whose colors are actually applied for [schemeName] under [mode].
+///
+/// In [ThemeMode.system] that is the selected theme itself — its pair covers the
+/// other brightness. In the pinned modes it is the theme coerced to the pinned
+/// brightness, which is what the picker highlights so the checkmark always
+/// tracks what is on screen.
+ThemeColors? effectiveTheme(String? schemeName, ThemeMode mode) {
+  final selected =
+      findTheme(schemeName ?? defaultSchemeName) ??
+      findTheme(defaultSchemeName);
+  if (selected == null) return null;
+
+  return switch (mode) {
+    ThemeMode.system => selected,
+    ThemeMode.light => _themeForBrightness(selected, wantDark: false),
+    ThemeMode.dark => _themeForBrightness(selected, wantDark: true),
+  };
+}
+
+/// Label for the current theme selection. System mode names the pair as a whole
+/// ("Github" rather than "Github Light"), since both halves are in play.
+String themeSelectionLabel(String? schemeName, ThemeMode mode) {
+  final theme = effectiveTheme(schemeName, mode);
+  if (theme == null) return defaultSchemeDisplayName;
+  if (mode != ThemeMode.system) return theme.displayName;
+
+  final lightMember = themePairs.containsKey(theme.name)
+      ? theme.name
+      : themePairFor(theme.name);
+  return lightMember == null
+      ? theme.displayName
+      : pairedThemeLabel(lightMember);
+}
+
+/// Coerces [selected] to the requested brightness: itself when it already
+/// matches, otherwise its pair, otherwise the first catalog theme of that
+/// brightness. Keeps a stored light theme usable after switching to Dark mode
+/// without rewriting the user's saved selection.
+ThemeColors _themeForBrightness(
+  ThemeColors selected, {
+  required bool wantDark,
+}) {
+  if (selected.isDark == wantDark) return selected;
+
+  final pairName = themePairFor(selected.name);
+  final paired = pairName == null ? null : findTheme(pairName);
+  if (paired != null && paired.isDark == wantDark) return paired;
+
+  // Match desktop's paired-first picker ordering: an unpaired selection falls
+  // back through the first-party default pair, not whichever borrowed theme
+  // sorts first in the full brightness group.
+  final defaultTheme = findTheme(defaultSchemeName);
+  if (defaultTheme != null) {
+    if (defaultTheme.isDark == wantDark) return defaultTheme;
+
+    final defaultPairName = themePairFor(defaultTheme.name);
+    final defaultPair = defaultPairName == null
+        ? null
+        : findTheme(defaultPairName);
+    if (defaultPair != null && defaultPair.isDark == wantDark) {
+      return defaultPair;
+    }
+  }
+
+  final groups = themeGroups();
+  final fallback = wantDark ? groups.dark : groups.light;
+  return fallback.isEmpty ? selected : fallback.first;
 }
diff --git a/mobile/lib/shared/widgets/anchored_popover_menu.dart b/mobile/lib/shared/widgets/anchored_popover_menu.dart
new file mode 100644
index 0000000000..46b50b6b00
--- /dev/null
+++ b/mobile/lib/shared/widgets/anchored_popover_menu.dart
@@ -0,0 +1,245 @@
+import 'dart:math' as math;
+import 'dart:ui' show SemanticsRole;
+
+import 'package:flutter/material.dart';
+
+import '../theme/theme.dart';
+
+const _popoverEnterDuration = Duration(milliseconds: 150);
+const _popoverExitDuration = Duration(milliseconds: 110);
+const _popoverStartScale = 0.96;
+
+/// The horizontal edge a popover aligns to on its triggering control.
+enum AnchoredPopoverAlignment {
+  /// Aligns the popover's leading edge with the trigger's leading edge.
+  start,
+
+  /// Aligns the popover's trailing edge with the trigger's trailing edge.
+  end,
+}
+
+/// Shows an anchored, cross-platform popup menu with the Activity controls'
+/// sizing, motion, and safe-area placement.
+Future<T?> showAnchoredPopover<T>({
+  required BuildContext context,
+  required List<PopupMenuEntry<T>> items,
+  required double width,
+  required AnchoredPopoverAlignment alignment,
+  required Color color,
+  required ShapeBorder shape,
+  required double elevation,
+  required Color shadowColor,
+  Offset offset = Offset.zero,
+  EdgeInsetsGeometry menuPadding = EdgeInsets.zero,
+  Clip clipBehavior = Clip.antiAlias,
+  Key? surfaceKey,
+}) {
+  final navigator = Navigator.of(context);
+  final overlay = navigator.overlay;
+  final triggerRenderObject = context.findRenderObject();
+  final overlayRenderObject = overlay?.context.findRenderObject();
+  if (triggerRenderObject is! RenderBox || overlayRenderObject is! RenderBox) {
+    return Future<T?>.value();
+  }
+
+  final triggerRect = MatrixUtils.transformRect(
+    triggerRenderObject.getTransformTo(overlayRenderObject),
+    Offset.zero & triggerRenderObject.size,
+  );
+  final overlayRect = Offset.zero & overlayRenderObject.size;
+  final mediaQuery = MediaQuery.of(context);
+
+  return navigator.push<T>(
+    _AnchoredPopoverRoute<T>(
+      position: RelativeRect.fromRect(triggerRect, overlayRect),
+      items: items,
+      width: width,
+      alignment: alignment,
+      offset: offset,
+      color: color,
+      shape: shape,
+      elevation: elevation,
+      shadowColor: shadowColor,
+      menuPadding: menuPadding,
+      clipBehavior: clipBehavior,
+      surfaceKey: surfaceKey,
+      screenPadding: EdgeInsets.fromLTRB(
+        math.max(Grid.xxs, mediaQuery.padding.left),
+        math.max(Grid.xxs, mediaQuery.padding.top),
+        math.max(Grid.xxs, mediaQuery.padding.right),
+        math.max(Grid.xxs, mediaQuery.padding.bottom),
+      ),
+      reducedMotion: mediaQuery.disableAnimations,
+      barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
+    ),
+  );
+}
+
+class _AnchoredPopoverRoute<T> extends PopupRoute<T> {
+  final RelativeRect position;
+  final List<PopupMenuEntry<T>> items;
+  final double width;
+  final AnchoredPopoverAlignment alignment;
+  final Offset offset;
+  final Color color;
+  final ShapeBorder shape;
+  final double elevation;
+  final Color shadowColor;
+  final EdgeInsetsGeometry menuPadding;
+  final Clip clipBehavior;
+  final Key? surfaceKey;
+  final EdgeInsets screenPadding;
+  final bool reducedMotion;
+  final String _barrierLabel;
+
+  _AnchoredPopoverRoute({
+    required this.position,
+    required this.items,
+    required this.width,
+    required this.alignment,
+    required this.offset,
+    required this.color,
+    required this.shape,
+    required this.elevation,
+    required this.shadowColor,
+    required this.menuPadding,
+    required this.clipBehavior,
+    required this.surfaceKey,
+    required this.screenPadding,
+    required this.reducedMotion,
+    required String barrierLabel,
+  }) : _barrierLabel = barrierLabel;
+
+  @override
+  Color? get barrierColor => null;
+
+  @override
+  bool get barrierDismissible => true;
+
+  @override
+  String? get barrierLabel => _barrierLabel;
+
+  @override
+  Duration get transitionDuration =>
+      reducedMotion ? Duration.zero : _popoverEnterDuration;
+
+  @override
+  Duration get reverseTransitionDuration =>
+      reducedMotion ? Duration.zero : _popoverExitDuration;
+
+  @override
+  Widget buildPage(
+    BuildContext context,
+    Animation<double> animation,
+    Animation<double> secondaryAnimation,
+  ) {
+    final curvedAnimation = animation.drive(
+      CurveTween(curve: Curves.easeOutCubic),
+    );
+    final scaleAnimation = Tween<double>(
+      begin: _popoverStartScale,
+      end: 1,
+    ).animate(curvedAnimation);
+    final transformOrigin = switch (alignment) {
+      AnchoredPopoverAlignment.start => Alignment.topLeft,
+      AnchoredPopoverAlignment.end => Alignment.topRight,
+    };
+
+    return CustomSingleChildLayout(
+      delegate: _AnchoredPopoverLayoutDelegate(
+        position: position,
+        alignment: alignment,
+        offset: offset,
+        screenPadding: screenPadding,
+      ),
+      child: FadeTransition(
+        key: const ValueKey('activity-popover-fade'),
+        opacity: curvedAnimation,
+        child: ScaleTransition(
+          key: const ValueKey('activity-popover-scale'),
+          scale: scaleAnimation,
+          alignment: transformOrigin,
+          child: Material(
+            key: surfaceKey,
+            type: MaterialType.card,
+            color: color,
+            surfaceTintColor: Colors.transparent,
+            elevation: elevation,
+            shadowColor: shadowColor,
+            shape: shape,
+            clipBehavior: clipBehavior,
+            child: SizedBox(
+              width: width,
+              child: Semantics(
+                role: SemanticsRole.menu,
+                scopesRoute: true,
+                namesRoute: true,
+                explicitChildNodes: true,
+                child: SingleChildScrollView(
+                  padding: menuPadding,
+                  child: ListBody(children: items),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _AnchoredPopoverLayoutDelegate extends SingleChildLayoutDelegate {
+  final RelativeRect position;
+  final AnchoredPopoverAlignment alignment;
+  final Offset offset;
+  final EdgeInsets screenPadding;
+
+  const _AnchoredPopoverLayoutDelegate({
+    required this.position,
+    required this.alignment,
+    required this.offset,
+    required this.screenPadding,
+  });
+
+  @override
+  BoxConstraints getConstraintsForChild(BoxConstraints constraints) {
+    return BoxConstraints.loose(
+      Size(
+        constraints.maxWidth - screenPadding.horizontal,
+        constraints.maxHeight - screenPadding.vertical,
+      ),
+    );
+  }
+
+  @override
+  Offset getPositionForChild(Size size, Size childSize) {
+    final anchorBottom = size.height - position.bottom;
+    final desiredX = switch (alignment) {
+      AnchoredPopoverAlignment.start => position.left + offset.dx,
+      AnchoredPopoverAlignment.end =>
+        size.width - position.right - childSize.width + offset.dx,
+    };
+    final minX = screenPadding.left;
+    final maxX = size.width - screenPadding.right - childSize.width;
+    final x = desiredX.clamp(minX, maxX).toDouble();
+
+    final belowY = anchorBottom + offset.dy;
+    final aboveY = position.top - childSize.height - offset.dy;
+    final maxY = size.height - screenPadding.bottom - childSize.height;
+    final desiredY =
+        belowY + childSize.height <= size.height - screenPadding.bottom
+        ? belowY
+        : aboveY;
+    final y = desiredY.clamp(screenPadding.top, maxY).toDouble();
+
+    return Offset(x, y);
+  }
+
+  @override
+  bool shouldRelayout(_AnchoredPopoverLayoutDelegate oldDelegate) {
+    return position != oldDelegate.position ||
+        alignment != oldDelegate.alignment ||
+        offset != oldDelegate.offset ||
+        screenPadding != oldDelegate.screenPadding;
+  }
+}
diff --git a/mobile/lib/shared/widgets/app_list.dart b/mobile/lib/shared/widgets/app_list.dart
index 53557925a0..393b1d70ba 100644
--- a/mobile/lib/shared/widgets/app_list.dart
+++ b/mobile/lib/shared/widgets/app_list.dart
@@ -1,10 +1,19 @@
 import 'package:flutter/material.dart';
 
 import '../theme/theme.dart';
+import 'app_list_inset.dart';
+
+/// Widest an inline [AppListRow.value] may grow before it ellipsises, leaving
+/// room for a reasonable title beside it.
+const double _maxValueWidth = 180.0;
+
+/// Row height comes entirely from this padding — rows carry a single line of
+/// text most of the time, so it sets how airy a card reads.
+const double _rowVerticalPadding = Grid.xs;
 
 /// A flush, borderless settings/list row: leading icon, title, optional
-/// subtitle and trailing widget. No card, no background — groups are
-/// separated by [AppListSection] dividers instead.
+/// subtitle and trailing widget. Its own background comes from whatever
+/// contains it — a grouped card, or the page itself.
 class AppListRow extends StatelessWidget {
   const AppListRow({
     super.key,
@@ -13,6 +22,7 @@ class AppListRow extends StatelessWidget {
     this.subtitle,
     this.subtitleStyle,
     this.subtitleMaxLines,
+    this.value,
     this.trailing,
     this.titleColor,
     this.onTap,
@@ -23,6 +33,11 @@ class AppListRow extends StatelessWidget {
   final String? subtitle;
   final TextStyle? subtitleStyle;
   final int? subtitleMaxLines;
+
+  /// The row's current setting, shown muted on the trailing side next to
+  /// [trailing] — for rows whose value is short enough to sit inline.
+  final String? value;
+
   final Widget? trailing;
   final Color? titleColor;
   final VoidCallback? onTap;
@@ -30,21 +45,20 @@ class AppListRow extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final row = Padding(
-      padding: const EdgeInsets.symmetric(
-        horizontal: Grid.gutter,
-        vertical: Grid.twelve,
+      padding: EdgeInsets.symmetric(
+        horizontal: AppListInset.of(context),
+        vertical: _rowVerticalPadding,
       ),
       child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
+        // Centred rather than baseline-aligned to the title: on a two-line row
+        // the icon and trailing control read as belonging to the row, not to
+        // its first line.
         children: [
           if (icon != null) ...[
-            Padding(
-              padding: const EdgeInsets.only(top: 1),
-              child: Icon(
-                icon,
-                size: 22,
-                color: titleColor ?? context.colors.onSurfaceVariant,
-              ),
+            Icon(
+              icon,
+              size: 22,
+              color: titleColor ?? context.colors.onSurfaceVariant,
             ),
             const SizedBox(width: Grid.xs),
           ],
@@ -77,6 +91,24 @@ class AppListRow extends StatelessWidget {
               ],
             ),
           ),
+          if (value != null) ...[
+            const SizedBox(width: Grid.xxs),
+            // Inflexible, so the title's Expanded absorbs the slack and the
+            // value stays flush against the trailing edge; capped instead of
+            // flexed so a long value ellipsises rather than overflowing.
+            ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: _maxValueWidth),
+              child: Text(
+                value!,
+                style: context.textTheme.bodyMedium?.copyWith(
+                  color: context.colors.onSurfaceVariant,
+                ),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                textAlign: TextAlign.right,
+              ),
+            ),
+          ],
           if (trailing != null) ...[const SizedBox(width: Grid.xxs), trailing!],
         ],
       ),
@@ -108,9 +140,9 @@ class AppListRowRaw extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final row = Padding(
-      padding: const EdgeInsets.symmetric(
-        horizontal: Grid.gutter,
-        vertical: Grid.twelve,
+      padding: EdgeInsets.symmetric(
+        horizontal: AppListInset.of(context),
+        vertical: _rowVerticalPadding,
       ),
       child: Row(
         children: [
@@ -138,51 +170,3 @@ class AppListRowRaw extends StatelessWidget {
     return InkWell(onTap: onTap, child: row);
   }
 }
-
-/// A group of list rows separated from the previous group by a hairline
-/// divider with breathing room, Slack-style. An optional [label] renders a
-/// small muted header above the rows.
-class AppListSection extends StatelessWidget {
-  const AppListSection({
-    super.key,
-    this.label,
-    required this.children,
-    this.showDivider = true,
-  });
-
-  final String? label;
-  final List<Widget> children;
-  final bool showDivider;
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        if (showDivider)
-          Padding(
-            padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
-            child: Divider(height: 1, color: context.colors.outlineVariant),
-          ),
-        if (label != null)
-          Padding(
-            padding: const EdgeInsets.fromLTRB(
-              Grid.gutter,
-              Grid.xxs,
-              Grid.gutter,
-              Grid.quarter,
-            ),
-            child: Text(
-              label!.toUpperCase(),
-              style: context.textTheme.labelMedium?.copyWith(
-                color: context.colors.onSurfaceVariant,
-                fontWeight: FontWeight.w600,
-                letterSpacing: 0.6,
-              ),
-            ),
-          ),
-        ...children,
-      ],
-    );
-  }
-}
diff --git a/mobile/lib/shared/widgets/app_list_card.dart b/mobile/lib/shared/widgets/app_list_card.dart
new file mode 100644
index 0000000000..20a569e2e3
--- /dev/null
+++ b/mobile/lib/shared/widgets/app_list_card.dart
@@ -0,0 +1,85 @@
+import 'package:flutter/material.dart';
+
+import '../theme/theme.dart';
+import 'app_list_inset.dart';
+
+/// A group of list rows in a rounded container, with an optional [label] above
+/// it. Rows inside are hairline-separated and inset to the card rather than the
+/// page, via [AppListInset].
+class AppListCard extends StatelessWidget {
+  const AppListCard({super.key, this.label, required this.children});
+
+  /// Rendered above the card in sentence case, as written — no uppercasing.
+  final String? label;
+
+  final List<Widget> children;
+
+  static const _inset = Grid.xs;
+
+  /// Separators start at the label column, clearing the leading icon.
+  static const _dividerIndent = _inset + _iconColumnWidth;
+  static const _iconColumnWidth = 22.0 + Grid.xs;
+
+  @override
+  Widget build(BuildContext context) {
+    final separated = <Widget>[];
+    for (var index = 0; index < children.length; index++) {
+      if (index > 0) {
+        separated.add(
+          Divider(
+            height: 1,
+            thickness: 1,
+            indent: _dividerIndent,
+            endIndent: _inset,
+            // The scheme's own border tokens are derived from the page surface,
+            // which lands them within a few levels of the card fill — invisible.
+            // Tinting with the text color instead keeps the hairline readable on
+            // the card in both brightnesses.
+            color: context.colors.onSurface.withValues(alpha: 0.12),
+          ),
+        );
+      }
+      separated.add(children[index]);
+    }
+
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(
+        Grid.gutter,
+        Grid.xxs,
+        Grid.gutter,
+        Grid.xxs,
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          if (label != null)
+            Padding(
+              padding: const EdgeInsets.only(left: Grid.half, bottom: Grid.xxs),
+              child: Text(
+                label!,
+                style: context.textTheme.labelMedium?.copyWith(
+                  color: context.colors.onSurfaceVariant,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+            ),
+          Material(
+            // The softest step on the elevation ramp — a rung below the home tab
+            // bar's active pill (primaryContainer, see PR #2810), since a
+            // full-width card at the pill's contrast reads heavier than the pill
+            // does. The dividers carry the group structure, so the fill only has
+            // to separate the card from the page.
+            color: context.colors.surfaceContainerHighest,
+            borderRadius: BorderRadius.circular(Radii.card),
+            // Keeps row ripples inside the rounded corners.
+            clipBehavior: Clip.antiAlias,
+            child: AppListInset(
+              horizontal: _inset,
+              child: Column(children: separated),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/shared/widgets/app_list_inset.dart b/mobile/lib/shared/widgets/app_list_inset.dart
new file mode 100644
index 0000000000..122894e4f6
--- /dev/null
+++ b/mobile/lib/shared/widgets/app_list_inset.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+
+import '../theme/theme.dart';
+
+/// The horizontal padding list rows use, allowing grouped containers to replace
+/// the page-level inset without changing each row.
+class AppListInset extends InheritedWidget {
+  const AppListInset({
+    super.key,
+    required this.horizontal,
+    required super.child,
+  });
+
+  final double horizontal;
+
+  static double of(BuildContext context) =>
+      context.dependOnInheritedWidgetOfExactType<AppListInset>()?.horizontal ??
+      Grid.gutter;
+
+  @override
+  bool updateShouldNotify(AppListInset oldWidget) =>
+      oldWidget.horizontal != horizontal;
+}
diff --git a/mobile/lib/shared/widgets/buzz_loading_indicator.dart b/mobile/lib/shared/widgets/buzz_loading_indicator.dart
new file mode 100644
index 0000000000..6d0471ce64
--- /dev/null
+++ b/mobile/lib/shared/widgets/buzz_loading_indicator.dart
@@ -0,0 +1,98 @@
+import 'dart:math' show pi;
+
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../theme/theme.dart';
+
+/// The shared mobile loading indicator, matching the desktop arc spinner.
+class BuzzLoadingIndicator extends HookConsumerWidget {
+  /// The spinner diameter.
+  final double size;
+
+  /// An optional spinner color. Defaults to the active accent color.
+  final Color? color;
+
+  /// The accessibility announcement for this loading state.
+  final String semanticLabel;
+
+  /// Creates a looping arc loading indicator.
+  const BuzzLoadingIndicator({
+    this.size = 40,
+    this.color,
+    this.semanticLabel = 'Loading',
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final reducedMotion = MediaQuery.disableAnimationsOf(context);
+    final animation = useAnimationController(
+      duration: const Duration(milliseconds: 500),
+    );
+
+    useEffect(() {
+      if (reducedMotion) {
+        animation
+          ..stop()
+          ..value = 0;
+      } else {
+        animation.repeat();
+      }
+      return animation.stop;
+    }, [animation, reducedMotion]);
+
+    final spinnerColor = color ?? context.colors.primary;
+    final strokeWidth = (size / 6).clamp(2.0, 4.0);
+
+    return Semantics(
+      liveRegion: true,
+      label: semanticLabel,
+      child: ExcludeSemantics(
+        child: RotationTransition(
+          key: const ValueKey('buzz-loading-indicator-spinner'),
+          turns: animation,
+          child: CustomPaint(
+            size: Size.square(size),
+            painter: _ArcSpinnerPainter(
+              color: spinnerColor,
+              strokeWidth: strokeWidth,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _ArcSpinnerPainter extends CustomPainter {
+  final Color color;
+  final double strokeWidth;
+
+  const _ArcSpinnerPainter({required this.color, required this.strokeWidth});
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final center = size.center(Offset.zero);
+    final radius = (size.shortestSide - strokeWidth) / 2;
+    final bounds = Rect.fromCircle(center: center, radius: radius);
+    final trackPaint = Paint()
+      ..color = color.withValues(alpha: color.a * 0.1)
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = strokeWidth;
+    final arcPaint = Paint()
+      ..color = color
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = strokeWidth;
+
+    canvas
+      ..drawCircle(center, radius, trackPaint)
+      ..drawArc(bounds, -pi / 2, pi / 2, false, arcPaint);
+  }
+
+  @override
+  bool shouldRepaint(_ArcSpinnerPainter oldDelegate) {
+    return color != oldDelegate.color || strokeWidth != oldDelegate.strokeWidth;
+  }
+}
diff --git a/mobile/lib/shared/widgets/filter_chip_bar.dart b/mobile/lib/shared/widgets/filter_chip_bar.dart
index ef5c5a031a..1fe55712a5 100644
--- a/mobile/lib/shared/widgets/filter_chip_bar.dart
+++ b/mobile/lib/shared/widgets/filter_chip_bar.dart
@@ -34,33 +34,66 @@ class FilterChipBar<T> extends StatelessWidget {
   final T selected;
   final ValueChanged<T> onSelected;
 
+  /// When enabled, every chip shares the width rather than scrolling.
+  final bool expandItems;
+
+  /// Material density applied to each chip.
+  final VisualDensity visualDensity;
+
+  /// Vertical padding around the content inside each chip.
+  final double chipVerticalPadding;
+
+  /// Vertical spacing around the chip row.
+  final double barVerticalPadding;
+
   const FilterChipBar({
     super.key,
     required this.items,
     required this.selected,
     required this.onSelected,
+    this.expandItems = false,
+    this.visualDensity = VisualDensity.compact,
+    this.chipVerticalPadding = Grid.quarter,
+    this.barVerticalPadding = Grid.xxs,
   });
 
   @override
   Widget build(BuildContext context) {
+    final chips = [
+      for (var index = 0; index < items.length; index++) ...[
+        if (index > 0) const SizedBox(width: Grid.xxs),
+        if (expandItems)
+          Expanded(child: _chip(context, items[index], fillWidth: true))
+        else
+          _chip(context, items[index]),
+      ],
+    ];
+
+    if (expandItems) {
+      return Padding(
+        padding: EdgeInsets.symmetric(
+          horizontal: Grid.gutter,
+          vertical: barVerticalPadding,
+        ),
+        child: Row(children: chips),
+      );
+    }
+
     return SingleChildScrollView(
       scrollDirection: Axis.horizontal,
-      padding: const EdgeInsets.symmetric(
+      padding: EdgeInsets.symmetric(
         horizontal: Grid.gutter,
-        vertical: Grid.xxs,
-      ),
-      child: Row(
-        children: [
-          for (final item in items) ...[
-            if (item != items.first) const SizedBox(width: Grid.xxs),
-            _chip(context, item),
-          ],
-        ],
+        vertical: barVerticalPadding,
       ),
+      child: Row(children: chips),
     );
   }
 
-  Widget _chip(BuildContext context, FilterChipItem<T> item) {
+  Widget _chip(
+    BuildContext context,
+    FilterChipItem<T> item, {
+    bool fillWidth = false,
+  }) {
     final isSelected = selected == item.id;
     final text = item.count != null
         ? '${item.label} (${item.count})'
@@ -68,23 +101,52 @@ class FilterChipBar<T> extends StatelessWidget {
     final fg = isSelected
         ? context.colors.onPrimary
         : context.colors.onSurfaceVariant;
-    final labelStyle = context.textTheme.labelSmall?.copyWith(color: fg);
-    return FilterChip(
+    final labelStyle = filterChipTextStyle.copyWith(
+      color: fg,
+      fontWeight: isSelected ? FontWeight.w500 : FontWeight.w400,
+    );
+    final label = item.icon != null
+        ? Row(
+            mainAxisSize: fillWidth ? MainAxisSize.max : MainAxisSize.min,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Icon(item.icon, size: 14, color: fg),
+              const SizedBox(width: Grid.half),
+              if (fillWidth)
+                Flexible(
+                  child: Text(
+                    text,
+                    textAlign: TextAlign.center,
+                    style: labelStyle,
+                  ),
+                )
+              else
+                Text(text, style: labelStyle),
+            ],
+          )
+        : Text(
+            text,
+            textAlign: fillWidth ? TextAlign.center : TextAlign.start,
+            style: labelStyle,
+          );
+    final chip = FilterChip(
       selected: isSelected,
       showCheckmark: false,
-      label: item.icon != null
-          ? Row(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(item.icon, size: 14, color: fg),
-                const SizedBox(width: Grid.half),
-                Text(text, style: labelStyle),
-              ],
+      label: fillWidth
+          ? SizedBox(
+              width: double.infinity,
+              child: Center(child: label),
             )
-          : Text(text, style: labelStyle),
+          : label,
       onSelected: (_) => onSelected(item.id),
-      visualDensity: VisualDensity.compact,
+      padding: EdgeInsets.symmetric(
+        horizontal: fillWidth ? Grid.quarter : Grid.twelve,
+        vertical: chipVerticalPadding,
+      ),
+      visualDensity: visualDensity,
       materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
     );
+
+    return fillWidth ? SizedBox(width: double.infinity, child: chip) : chip;
   }
 }
diff --git a/mobile/lib/shared/widgets/frosted_app_bar.dart b/mobile/lib/shared/widgets/frosted_app_bar.dart
index 34a2da8970..6a0bd2729d 100644
--- a/mobile/lib/shared/widgets/frosted_app_bar.dart
+++ b/mobile/lib/shared/widgets/frosted_app_bar.dart
@@ -5,14 +5,51 @@ import 'package:lucide_icons_flutter/lucide_icons.dart';
 
 import '../theme/theme.dart';
 
-/// Height of the frosted app bar content area below the safe area.
-const _kBarContentHeight = Grid.xxs + 32 + Grid.xxs; // 48
+/// Minimum height of the frosted app bar content area below the safe area.
+const _kBarContentMinHeight = Grid.xxs + 32 + Grid.xxs; // 48
+const _kBottomBorderWidth = 1.0;
+
+TextStyle _effectiveTitleStyle(BuildContext context, TextStyle? titleStyle) {
+  final baseStyle =
+      context.textTheme.titleMedium ??
+      const TextStyle(fontSize: 20, height: 1.3);
+  return baseStyle.copyWith(fontWeight: FontWeight.w600).merge(titleStyle);
+}
+
+double _barContentHeight(
+  BuildContext context,
+  TextStyle? titleStyle,
+  double titleContentHeight,
+) {
+  final style = _effectiveTitleStyle(context, titleStyle);
+  final scaledFontSize = MediaQuery.textScalerOf(
+    context,
+  ).scale(style.fontSize ?? 20);
+  final scaledTitleHeight = scaledFontSize * (style.height ?? 1);
+  final effectiveTitleHeight = titleContentHeight > scaledTitleHeight
+      ? titleContentHeight
+      : scaledTitleHeight;
+  final accessibleHeight = Grid.xxs + effectiveTitleHeight + Grid.xxs;
+  return accessibleHeight > _kBarContentMinHeight
+      ? accessibleHeight
+      : _kBarContentMinHeight;
+}
 
 /// Returns the total height of the [FrostedAppBar] including safe area padding.
 ///
 /// Use this to add top spacing to body content so it starts below the bar.
-double frostedAppBarHeight(BuildContext context) {
-  return MediaQuery.paddingOf(context).top + _kBarContentHeight;
+/// Pass the same [titleStyle] and [titleContentHeight] to the bar and this
+/// helper when customizing them.
+double frostedAppBarHeight(
+  BuildContext context, {
+  double bottomHeight = 0,
+  TextStyle? titleStyle,
+  double titleContentHeight = 0,
+}) {
+  return MediaQuery.paddingOf(context).top +
+      _barContentHeight(context, titleStyle, titleContentHeight) +
+      bottomHeight +
+      _kBottomBorderWidth;
 }
 
 /// A frosted-glass floating app bar designed to sit inside a [Stack].
@@ -24,9 +61,26 @@ class FrostedAppBar extends StatelessWidget {
   /// can pop, a back button is shown automatically.
   final Widget? leading;
 
+  /// Whether to infer a back button from the current navigator.
+  final bool automaticallyImplyLeading;
+
   /// Widget displayed in the center/title area.
   final Widget? title;
 
+  /// Optional style merged over the default title style.
+  final TextStyle? titleStyle;
+
+  /// Scaled height needed by a custom title with multiple text lines.
+  ///
+  /// Pass the same value to [frostedAppBarHeight] when spacing body content.
+  final double titleContentHeight;
+
+  /// Optional content displayed below the title row in the same surface.
+  final Widget? bottom;
+
+  /// Height reserved for [bottom].
+  final double bottomHeight;
+
   /// Widgets displayed on the trailing (right) side.
   final List<Widget> actions;
 
@@ -36,23 +90,40 @@ class FrostedAppBar extends StatelessWidget {
   /// Color applied to icons in the app bar.
   final Color? iconColor;
 
+  /// Paints over the frosted fill instead of the default translucent surface.
+  /// Used by the Buzz themes to carry their branded gradient across the app's
+  /// top section — see [buzzTopSectionGradient].
+  final Gradient? gradient;
+
   const FrostedAppBar({
     super.key,
     this.leading,
+    this.automaticallyImplyLeading = true,
     this.title,
+    this.titleStyle,
+    this.titleContentHeight = 0,
+    this.bottom,
+    this.bottomHeight = 0,
     this.actions = const [],
     this.horizontalInset = Grid.quarter,
     this.iconColor,
-  });
+    this.gradient,
+  }) : assert(bottom == null || bottomHeight > 0);
 
   @override
   Widget build(BuildContext context) {
     final topPadding = MediaQuery.paddingOf(context).top;
     final canPop = Navigator.canPop(context);
+    final effectiveTitleStyle = _effectiveTitleStyle(context, titleStyle);
+    final barContentHeight = _barContentHeight(
+      context,
+      titleStyle,
+      titleContentHeight,
+    );
 
     final effectiveLeading =
         leading ??
-        (canPop
+        (automaticallyImplyLeading && canPop
             ? SizedBox(
                 width: 48,
                 height: 48,
@@ -75,50 +146,61 @@ class FrostedAppBar extends StatelessWidget {
           child: Container(
             padding: EdgeInsets.only(top: topPadding),
             decoration: BoxDecoration(
-              color: context.colors.surface.withValues(alpha: 0.5),
+              // A gradient and a color cannot both paint, so the gradient
+              // replaces the frosted surface fill when one is supplied.
+              color: gradient == null
+                  ? context.colors.surface.withValues(alpha: 0.5)
+                  : null,
+              gradient: gradient,
               border: Border(
                 bottom: BorderSide(
                   color: context.colors.outlineVariant.withValues(alpha: 0.3),
+                  width: _kBottomBorderWidth,
                 ),
               ),
             ),
-            child: SizedBox(
-              height: _kBarContentHeight,
-              child: Padding(
-                padding: EdgeInsets.symmetric(horizontal: horizontalInset),
-                child: IconTheme.merge(
-                  data: IconThemeData(color: iconColor),
-                  child: Row(
-                    children: [
-                      ?effectiveLeading,
-                      if (title != null)
-                        Expanded(
-                          child: Padding(
-                            padding: EdgeInsets.only(
-                              left: effectiveLeading != null
-                                  ? 0
-                                  : Grid.gutter - Grid.quarter,
-                              right: actions.isEmpty
-                                  ? Grid.gutter - Grid.quarter
-                                  : 0,
-                            ),
-                            child: DefaultTextStyle.merge(
-                              style: context.textTheme.titleMedium?.copyWith(
-                                fontWeight: FontWeight.w600,
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                SizedBox(
+                  height: barContentHeight,
+                  child: Padding(
+                    padding: EdgeInsets.symmetric(horizontal: horizontalInset),
+                    child: IconTheme.merge(
+                      data: IconThemeData(color: iconColor),
+                      child: Row(
+                        children: [
+                          ?effectiveLeading,
+                          if (title != null)
+                            Expanded(
+                              child: Padding(
+                                padding: EdgeInsets.only(
+                                  left: effectiveLeading != null
+                                      ? 0
+                                      : Grid.gutter - Grid.quarter,
+                                  right: actions.isEmpty
+                                      ? Grid.gutter - Grid.quarter
+                                      : 0,
+                                ),
+                                child: DefaultTextStyle.merge(
+                                  style: effectiveTitleStyle,
+                                  overflow: TextOverflow.ellipsis,
+                                  maxLines: 1,
+                                  child: title!,
+                                ),
                               ),
-                              overflow: TextOverflow.ellipsis,
-                              maxLines: 1,
-                              child: title!,
-                            ),
-                          ),
-                        )
-                      else
-                        const Spacer(),
-                      ...actions,
-                    ],
+                            )
+                          else
+                            const Spacer(),
+                          ...actions,
+                        ],
+                      ),
+                    ),
                   ),
                 ),
-              ),
+                if (bottom != null)
+                  SizedBox(height: bottomHeight, child: bottom),
+              ],
             ),
           ),
         ),
diff --git a/mobile/lib/shared/widgets/frosted_scaffold.dart b/mobile/lib/shared/widgets/frosted_scaffold.dart
index 6b7e39fd75..fc0e2fe506 100644
--- a/mobile/lib/shared/widgets/frosted_scaffold.dart
+++ b/mobile/lib/shared/widgets/frosted_scaffold.dart
@@ -21,17 +21,23 @@ class FrostedScaffold extends StatelessWidget {
   /// Whether the body should resize when the on-screen keyboard appears.
   final bool? resizeToAvoidBottomInset;
 
+  /// Optional scaffold background, useful when a parent supplies a shared
+  /// surface behind this page.
+  final Color? backgroundColor;
+
   const FrostedScaffold({
     super.key,
     required this.appBar,
     required this.body,
     this.floatingActionButton,
     this.resizeToAvoidBottomInset,
+    this.backgroundColor,
   });
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: backgroundColor,
       resizeToAvoidBottomInset: resizeToAvoidBottomInset,
       floatingActionButton: floatingActionButton,
       body: Stack(children: [body, appBar]),
diff --git a/mobile/lib/shared/widgets/masked_avatar_badge.dart b/mobile/lib/shared/widgets/masked_avatar_badge.dart
new file mode 100644
index 0000000000..4d476abfd4
--- /dev/null
+++ b/mobile/lib/shared/widgets/masked_avatar_badge.dart
@@ -0,0 +1,356 @@
+import 'dart:math' as math;
+
+import 'package:flutter/widgets.dart';
+
+/// Avatar-with-badge geometry ported from desktop's `MaskedAvatarBadgeFrame`
+/// (`desktop/src/features/profile/ui/MaskedAvatarBadgeFrame.tsx`).
+///
+/// A badge (presence dot, status glyph) sits in a notch cut out of the avatar
+/// rather than on top of it. The notch is not a plain circular subtraction: the
+/// two edges are joined by cubic fillets so the avatar's outline flows into the
+/// cutout instead of meeting it at a cusp. That fillet is the whole visual
+/// signature, which is why the curve constants are ported verbatim.
+@immutable
+class AvatarBadgeCurve {
+  const AvatarBadgeCurve({
+    this.avatarRoundingAngle = 0.075,
+    this.cutoutRoundingLength = 5.5,
+    this.cutoutRoundingMinAngle = 0.22,
+    this.cutoutRoundingMaxAngle = 0.38,
+    this.handleDistanceRatio = 0.42,
+    this.handleLengthRatio = 0.14,
+  });
+
+  /// Radians the avatar's edge pulls back from the intersection before the
+  /// fillet starts.
+  final double avatarRoundingAngle;
+
+  /// Fillet length along the cutout, converted to an angle by dividing by the
+  /// cutout radius and clamped between the two angle bounds below.
+  final double cutoutRoundingLength;
+  final double cutoutRoundingMinAngle;
+  final double cutoutRoundingMaxAngle;
+
+  /// Bezier handle length, as a fraction of the gap between the two fillet
+  /// endpoints and of the cutout radius — whichever is shorter wins.
+  final double handleDistanceRatio;
+  final double handleLengthRatio;
+
+  /// Desktop's `DEFAULT_AVATAR_BADGE_CURVE`, used for large badges.
+  static const standard = AvatarBadgeCurve();
+
+  /// Desktop's `STATUS_DOT_MASK_CURVE` — a rounder, softer notch that reads
+  /// correctly at presence-dot sizes.
+  static const statusDot = AvatarBadgeCurve(
+    avatarRoundingAngle: 0.11,
+    cutoutRoundingLength: 6.5,
+    cutoutRoundingMinAngle: 0.28,
+    cutoutRoundingMaxAngle: 0.44,
+    handleDistanceRatio: 0.5,
+    handleLengthRatio: 0.2,
+  );
+
+  @override
+  bool operator ==(Object other) =>
+      other is AvatarBadgeCurve &&
+      other.avatarRoundingAngle == avatarRoundingAngle &&
+      other.cutoutRoundingLength == cutoutRoundingLength &&
+      other.cutoutRoundingMinAngle == cutoutRoundingMinAngle &&
+      other.cutoutRoundingMaxAngle == cutoutRoundingMaxAngle &&
+      other.handleDistanceRatio == handleDistanceRatio &&
+      other.handleLengthRatio == handleLengthRatio;
+
+  @override
+  int get hashCode => Object.hash(
+    avatarRoundingAngle,
+    cutoutRoundingLength,
+    cutoutRoundingMinAngle,
+    cutoutRoundingMaxAngle,
+    handleDistanceRatio,
+    handleLengthRatio,
+  );
+}
+
+/// Where the notch sits and how big the badge in it is, as fractions of the
+/// avatar box so one constant covers every avatar size.
+@immutable
+class AvatarBadgeMaskGeometry {
+  const AvatarBadgeMaskGeometry({
+    required this.cutoutCenterRatio,
+    required this.cutoutRadiusRatio,
+    required this.badgeSizeRatio,
+    required this.curve,
+  });
+
+  /// Distance of the notch centre from the top-left, on both axes.
+  final double cutoutCenterRatio;
+  final double cutoutRadiusRatio;
+
+  /// The badge is centred on the notch and is deliberately smaller than it, so
+  /// a ring of background shows between badge and avatar.
+  final double badgeSizeRatio;
+
+  final AvatarBadgeCurve curve;
+
+  /// Desktop's settings-card treatment: a 192px avatar with a 54px badge notched
+  /// in at (165, 165) with radius 30.
+  static const badge = AvatarBadgeMaskGeometry(
+    cutoutCenterRatio: 165 / 192,
+    cutoutRadiusRatio: 30 / 192,
+    badgeSizeRatio: 54 / 192,
+    curve: AvatarBadgeCurve.standard,
+  );
+
+  /// Desktop's sidebar presence treatment: a 32px avatar with a 14px dot frame
+  /// notched in at (28, 28) with radius 7.5.
+  static const presenceDot = AvatarBadgeMaskGeometry(
+    cutoutCenterRatio: 28 / 32,
+    cutoutRadiusRatio: 7.5 / 32,
+    badgeSizeRatio: 14 / 32,
+    curve: AvatarBadgeCurve.statusDot,
+  );
+
+  Offset cutoutCenter(double size) =>
+      Offset(size * cutoutCenterRatio, size * cutoutCenterRatio);
+
+  double cutoutRadius(double size) => size * cutoutRadiusRatio;
+
+  double badgeSize(double size) => size * badgeSizeRatio;
+
+  @override
+  bool operator ==(Object other) =>
+      other is AvatarBadgeMaskGeometry &&
+      other.cutoutCenterRatio == cutoutCenterRatio &&
+      other.cutoutRadiusRatio == cutoutRadiusRatio &&
+      other.badgeSizeRatio == badgeSizeRatio &&
+      other.curve == curve;
+
+  @override
+  int get hashCode =>
+      Object.hash(cutoutCenterRatio, cutoutRadiusRatio, badgeSizeRatio, curve);
+}
+
+double _angleTo(Offset center, Offset point) =>
+    math.atan2(point.dy - center.dy, point.dx - center.dx);
+
+Offset _pointOn(Offset center, double radius, double angle) =>
+    center + Offset(math.cos(angle), math.sin(angle)) * radius;
+
+/// Unit tangent at [angle]; [clockwise] picks which way around the circle.
+Offset _tangent(double angle, {required bool clockwise}) => clockwise
+    ? Offset(-math.sin(angle), math.cos(angle))
+    : Offset(math.sin(angle), -math.cos(angle));
+
+/// Signed sweep from [startAngle] to [endAngle], ported from desktop's
+/// `getArcSweep`. Flutter shares SVG's angle convention (y grows downward, so a
+/// positive sweep runs clockwise on screen), which is why the port is direct.
+double _arcSweep(
+  double startAngle,
+  double endAngle, {
+  required bool clockwise,
+  required bool largeArc,
+}) {
+  const fullTurn = math.pi * 2;
+  var sweep = clockwise ? endAngle - startAngle : startAngle - endAngle;
+  while (sweep < 0) {
+    sweep += fullTurn;
+  }
+  if (largeArc && sweep < math.pi) sweep += fullTurn;
+  if (!largeArc && sweep > math.pi) sweep -= fullTurn;
+  return clockwise ? sweep : -sweep;
+}
+
+/// The avatar outline with [geometry]'s notch cut out of its bottom-right.
+///
+/// Falls back to a plain circle when the notch does not actually cross the
+/// avatar's edge — there is nothing to fillet in that case.
+Path avatarBadgeMaskPath({
+  required double size,
+  required AvatarBadgeMaskGeometry geometry,
+}) {
+  final avatarRadius = size / 2;
+  final avatarCenter = Offset(avatarRadius, avatarRadius);
+  final avatarRect = Rect.fromCircle(
+    center: avatarCenter,
+    radius: avatarRadius,
+  );
+  final cutoutCenter = geometry.cutoutCenter(size);
+  final cutoutRadius = geometry.cutoutRadius(size);
+  final curve = geometry.curve;
+
+  final span = cutoutCenter - avatarCenter;
+  final distance = span.distance;
+  if (distance >= avatarRadius + cutoutRadius ||
+      distance <= (avatarRadius - cutoutRadius).abs()) {
+    return Path()..addOval(avatarRect);
+  }
+
+  // Chord where the two circles cross, split into the upper and lower crossing.
+  final distanceToMidpoint =
+      (avatarRadius * avatarRadius -
+          cutoutRadius * cutoutRadius +
+          distance * distance) /
+      (2 * distance);
+  final halfChord = math.sqrt(
+    math.max(
+      0,
+      avatarRadius * avatarRadius - distanceToMidpoint * distanceToMidpoint,
+    ),
+  );
+  final unit = span / distance;
+  final midpoint = avatarCenter + unit * distanceToMidpoint;
+  final perpendicular = Offset(-unit.dy, unit.dx);
+  final first = midpoint + perpendicular * halfChord;
+  final second = midpoint - perpendicular * halfChord;
+  final upperCrossing = first.dy < second.dy ? first : second;
+  final lowerCrossing = first.dy < second.dy ? second : first;
+
+  final cutoutRoundingAngle = math.min(
+    curve.cutoutRoundingMaxAngle,
+    math.max(
+      curve.cutoutRoundingMinAngle,
+      curve.cutoutRoundingLength / cutoutRadius,
+    ),
+  );
+
+  // Pull each edge back from its crossing; the gap left behind is the fillet.
+  final avatarUpperAngle =
+      _angleTo(avatarCenter, upperCrossing) - curve.avatarRoundingAngle;
+  final avatarLowerAngle =
+      _angleTo(avatarCenter, lowerCrossing) + curve.avatarRoundingAngle;
+  final cutoutUpperAngle =
+      _angleTo(cutoutCenter, upperCrossing) - cutoutRoundingAngle;
+  final cutoutLowerAngle =
+      _angleTo(cutoutCenter, lowerCrossing) + cutoutRoundingAngle;
+
+  final avatarUpper = _pointOn(avatarCenter, avatarRadius, avatarUpperAngle);
+  final avatarLower = _pointOn(avatarCenter, avatarRadius, avatarLowerAngle);
+  final cutoutUpper = _pointOn(cutoutCenter, cutoutRadius, cutoutUpperAngle);
+  final cutoutLower = _pointOn(cutoutCenter, cutoutRadius, cutoutLowerAngle);
+
+  final upperHandle = math.min(
+    cutoutRadius * curve.handleLengthRatio,
+    (cutoutUpper - avatarUpper).distance * curve.handleDistanceRatio,
+  );
+  final lowerHandle = math.min(
+    cutoutRadius * curve.handleLengthRatio,
+    (avatarLower - cutoutLower).distance * curve.handleDistanceRatio,
+  );
+
+  final upperFromCutout =
+      cutoutUpper + _tangent(cutoutUpperAngle, clockwise: true) * upperHandle;
+  final upperIntoAvatar =
+      avatarUpper - _tangent(avatarUpperAngle, clockwise: false) * upperHandle;
+  final lowerFromAvatar =
+      avatarLower + _tangent(avatarLowerAngle, clockwise: false) * lowerHandle;
+  final lowerIntoCutout =
+      cutoutLower - _tangent(cutoutLowerAngle, clockwise: true) * lowerHandle;
+
+  return Path()
+    ..moveTo(cutoutUpper.dx, cutoutUpper.dy)
+    ..cubicTo(
+      upperFromCutout.dx,
+      upperFromCutout.dy,
+      upperIntoAvatar.dx,
+      upperIntoAvatar.dy,
+      avatarUpper.dx,
+      avatarUpper.dy,
+    )
+    // The long way round the avatar, back to the other side of the notch.
+    ..arcTo(
+      avatarRect,
+      avatarUpperAngle,
+      _arcSweep(
+        avatarUpperAngle,
+        avatarLowerAngle,
+        clockwise: false,
+        largeArc: true,
+      ),
+      false,
+    )
+    ..cubicTo(
+      lowerFromAvatar.dx,
+      lowerFromAvatar.dy,
+      lowerIntoCutout.dx,
+      lowerIntoCutout.dy,
+      cutoutLower.dx,
+      cutoutLower.dy,
+    )
+    // Back across the notch itself, which bites into the avatar.
+    ..arcTo(
+      Rect.fromCircle(center: cutoutCenter, radius: cutoutRadius),
+      cutoutLowerAngle,
+      _arcSweep(
+        cutoutLowerAngle,
+        cutoutUpperAngle,
+        clockwise: true,
+        largeArc: false,
+      ),
+      false,
+    )
+    ..close();
+}
+
+/// Clips an avatar to the rounded badge-notch path described by [geometry].
+class AvatarBadgeMaskClipper extends CustomClipper<Path> {
+  const AvatarBadgeMaskClipper({required this.geometry});
+
+  final AvatarBadgeMaskGeometry geometry;
+
+  @override
+  Path getClip(Size size) =>
+      avatarBadgeMaskPath(size: size.shortestSide, geometry: geometry);
+
+  @override
+  bool shouldReclip(covariant AvatarBadgeMaskClipper oldClipper) =>
+      oldClipper.geometry != geometry;
+}
+
+/// A square [avatar] with [badge] seated in a notch cut out of its bottom-right
+/// corner. With no [badge] the avatar is left whole — there is nothing to make
+/// room for.
+class MaskedAvatarBadge extends StatelessWidget {
+  const MaskedAvatarBadge({
+    super.key,
+    required this.size,
+    required this.avatar,
+    this.geometry = AvatarBadgeMaskGeometry.badge,
+    this.badge,
+  });
+
+  final double size;
+  final Widget avatar;
+  final AvatarBadgeMaskGeometry geometry;
+  final Widget? badge;
+
+  @override
+  Widget build(BuildContext context) {
+    if (badge == null) {
+      return SizedBox.square(dimension: size, child: avatar);
+    }
+
+    final badgeSize = geometry.badgeSize(size);
+    final center = geometry.cutoutCenter(size);
+
+    return SizedBox.square(
+      dimension: size,
+      child: Stack(
+        // The notch reaches past the avatar box, so the badge does too.
+        clipBehavior: Clip.none,
+        children: [
+          ClipPath(
+            clipper: AvatarBadgeMaskClipper(geometry: geometry),
+            child: SizedBox.square(dimension: size, child: avatar),
+          ),
+          Positioned(
+            left: center.dx - badgeSize / 2,
+            top: center.dy - badgeSize / 2,
+            width: badgeSize,
+            height: badgeSize,
+            child: badge!,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/shared/widgets/message_author_meta.dart b/mobile/lib/shared/widgets/message_author_meta.dart
new file mode 100644
index 0000000000..c7aff7df82
--- /dev/null
+++ b/mobile/lib/shared/widgets/message_author_meta.dart
@@ -0,0 +1,118 @@
+import 'package:flutter/material.dart';
+
+import '../theme/theme.dart';
+
+/// A consistent inline author row for message-oriented surfaces.
+class MessageAuthorMeta extends StatelessWidget {
+  /// Primary author name shown at the start of the row.
+  final String displayName;
+
+  /// Optional secondary username, hidden when blank or equal to [displayName].
+  final String? username;
+
+  /// Timestamp label shown after the author metadata.
+  final String timestamp;
+
+  /// Color applied to [displayName].
+  final Color nameColor;
+
+  /// Color applied to the username, separator, and [timestamp].
+  final Color metadataColor;
+
+  /// Optional callback invoked when [displayName] is tapped.
+  final VoidCallback? onAuthorTap;
+
+  /// Optional key assigned to the display-name text.
+  final Key? displayNameKey;
+
+  /// Optional key assigned to the username text.
+  final Key? usernameKey;
+
+  /// Optional key assigned to the timestamp text.
+  final Key? timestampKey;
+
+  /// Base text style for [displayName], with [nameColor] applied.
+  final TextStyle nameStyle;
+
+  /// Base text style for secondary metadata, with [metadataColor] applied.
+  final TextStyle metadataStyle;
+
+  /// Creates an inline author row with optional username and tap handling.
+  const MessageAuthorMeta({
+    super.key,
+    required this.displayName,
+    required this.timestamp,
+    required this.nameColor,
+    required this.metadataColor,
+    this.username,
+    this.onAuthorTap,
+    this.displayNameKey,
+    this.usernameKey,
+    this.timestampKey,
+    this.nameStyle = messageUsernameTextStyle,
+    this.metadataStyle = messageMetadataTextStyle,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final normalizedUsername = username?.trim();
+    final showUsername =
+        normalizedUsername != null &&
+        normalizedUsername.isNotEmpty &&
+        normalizedUsername != displayName.trim();
+    final resolvedNameStyle = nameStyle.copyWith(color: nameColor);
+    final resolvedMetadataStyle = metadataStyle.copyWith(color: metadataColor);
+
+    Widget authorName = Text(
+      displayName,
+      key: displayNameKey,
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+      style: resolvedNameStyle,
+    );
+    if (onAuthorTap != null) {
+      authorName = GestureDetector(onTap: onAuthorTap, child: authorName);
+    }
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final metadataMaxWidth = constraints.hasBoundedWidth
+            ? constraints.maxWidth / (showUsername ? 3 : 2)
+            : double.infinity;
+
+        return Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Flexible(child: authorName),
+            if (showUsername) ...[
+              const SizedBox(width: Grid.half),
+              ConstrainedBox(
+                constraints: BoxConstraints(maxWidth: metadataMaxWidth),
+                child: Text(
+                  normalizedUsername,
+                  key: usernameKey,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: resolvedMetadataStyle,
+                ),
+              ),
+            ],
+            const SizedBox(width: Grid.half),
+            Text('·', style: resolvedMetadataStyle),
+            const SizedBox(width: Grid.half),
+            ConstrainedBox(
+              constraints: BoxConstraints(maxWidth: metadataMaxWidth),
+              child: Text(
+                timestamp,
+                key: timestampKey,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: resolvedMetadataStyle,
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
diff --git a/mobile/lib/shared/widgets/mobile_tab_footer_backdrop.dart b/mobile/lib/shared/widgets/mobile_tab_footer_backdrop.dart
new file mode 100644
index 0000000000..687880acb1
--- /dev/null
+++ b/mobile/lib/shared/widgets/mobile_tab_footer_backdrop.dart
@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+
+import '../theme/theme.dart';
+
+/// Height of the floating mobile tab bar, excluding its bottom clearance.
+const mobileTabBarHeight = 56.0;
+
+/// Gap between the floating mobile tab bar and the bottom safe area.
+const mobileTabBarBottomGap = Grid.twelve;
+
+/// Returns the shared footer backdrop height, including the logical safe area.
+double mobileTabFooterBackdropHeight(BuildContext context) =>
+    mobileTabBarHeight +
+    mobileTabBarBottomGap +
+    MediaQuery.paddingOf(context).bottom +
+    Grid.xl +
+    Grid.gutter;
+
+/// Shared fade behind the floating mobile tab bar.
+class MobileTabFooterBackdrop extends StatelessWidget {
+  /// Vertical extent of the backdrop in logical pixels.
+  final double height;
+
+  /// Gradient stop positions, from the transparent top to the opaque bottom.
+  final List<double> stops;
+
+  /// Surface-color alpha values paired with [stops].
+  final List<double> opacities;
+
+  /// Creates a footer backdrop with the required [height].
+  ///
+  /// Override [stops] and [opacities] together to customize the gradient.
+  const MobileTabFooterBackdrop({
+    super.key,
+    required this.height,
+    this.stops = const [0, 0.5, 1],
+    this.opacities = const [0, 0.75, 1],
+  }) : assert(stops.length == opacities.length);
+
+  @override
+  Widget build(BuildContext context) {
+    final surface = context.colors.surface;
+    return SizedBox(
+      height: height,
+      width: double.infinity,
+      child: DecoratedBox(
+        decoration: BoxDecoration(
+          gradient: LinearGradient(
+            begin: Alignment.topCenter,
+            end: Alignment.bottomCenter,
+            stops: stops,
+            colors: [
+              for (final opacity in opacities)
+                surface.withValues(alpha: opacity),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/shared/widgets/sheet_divider.dart b/mobile/lib/shared/widgets/sheet_divider.dart
new file mode 100644
index 0000000000..1bedbb3c66
--- /dev/null
+++ b/mobile/lib/shared/widgets/sheet_divider.dart
@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+
+import '../theme/theme.dart';
+
+/// Hairline divider between action groups in a bottom sheet, matching the
+/// `AppListSection` divider convention.
+class SheetDivider extends StatelessWidget {
+  const SheetDivider({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: Grid.xxs),
+      child: Divider(height: 1, color: context.colors.outlineVariant),
+    );
+  }
+}
diff --git a/mobile/lib/shared/widgets/skeleton.dart b/mobile/lib/shared/widgets/skeleton.dart
new file mode 100644
index 0000000000..3fd61c1fa8
--- /dev/null
+++ b/mobile/lib/shared/widgets/skeleton.dart
@@ -0,0 +1,17 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+
+import '../theme/theme.dart';
+
+part 'skeleton_bar.dart';
+part 'skeleton_mask.dart';
+part 'skeleton_reveal.dart';
+part 'skeleton_shimmer.dart';
+
+const _shimmerDuration = Duration(milliseconds: 2000);
+const _skeletonOpacity = 0.1;
+const _shimmerMinOpacity = 0.5;
+const _revealDuration = Duration(milliseconds: 400);
+const _revealBlur = 2.0;
diff --git a/mobile/lib/shared/widgets/skeleton_bar.dart b/mobile/lib/shared/widgets/skeleton_bar.dart
new file mode 100644
index 0000000000..ec7bb82158
--- /dev/null
+++ b/mobile/lib/shared/widgets/skeleton_bar.dart
@@ -0,0 +1,33 @@
+part of 'skeleton.dart';
+
+/// A single rounded placeholder within a [SkeletonShimmer].
+class SkeletonBar extends StatelessWidget {
+  final double width;
+  final double height;
+  final BorderRadius? borderRadius;
+
+  const SkeletonBar({
+    required this.width,
+    required this.height,
+    this.borderRadius,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ExcludeSemantics(
+      child: SizedBox(
+        width: width,
+        height: height,
+        child: DecoratedBox(
+          decoration: BoxDecoration(
+            color: _SkeletonMask.isActive(context)
+                ? Colors.white
+                : context.colors.primary.withValues(alpha: _skeletonOpacity),
+            borderRadius: borderRadius ?? BorderRadius.circular(Radii.sm),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/shared/widgets/skeleton_mask.dart b/mobile/lib/shared/widgets/skeleton_mask.dart
new file mode 100644
index 0000000000..5c3b9fbec9
--- /dev/null
+++ b/mobile/lib/shared/widgets/skeleton_mask.dart
@@ -0,0 +1,11 @@
+part of 'skeleton.dart';
+
+class _SkeletonMask extends InheritedWidget {
+  const _SkeletonMask({required super.child});
+
+  static bool isActive(BuildContext context) =>
+      context.dependOnInheritedWidgetOfExactType<_SkeletonMask>() != null;
+
+  @override
+  bool updateShouldNotify(_SkeletonMask oldWidget) => false;
+}
diff --git a/mobile/lib/shared/widgets/skeleton_reveal.dart b/mobile/lib/shared/widgets/skeleton_reveal.dart
new file mode 100644
index 0000000000..cb0d523dbe
--- /dev/null
+++ b/mobile/lib/shared/widgets/skeleton_reveal.dart
@@ -0,0 +1,103 @@
+part of 'skeleton.dart';
+
+/// Stacks a skeleton and its content in the same slot, then reveals the content.
+///
+/// Entering the loading state is intentionally instant so reconnects do not
+/// animate backwards. Leaving it cross-fades both layers while the skeleton
+/// blurs out and the content sharpens over 400ms.
+class SkeletonReveal extends HookWidget {
+  final bool loading;
+  final Widget skeleton;
+  final Widget content;
+  final bool shimmerEnabled;
+
+  const SkeletonReveal({
+    required this.loading,
+    required this.skeleton,
+    required this.content,
+    this.shimmerEnabled = true,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final reducedMotion = MediaQuery.disableAnimationsOf(context);
+    final reveal = useAnimationController(
+      duration: _revealDuration,
+      initialValue: loading ? 0 : 1,
+    );
+    final previousLoading = usePrevious(loading);
+
+    useEffect(() {
+      if (reducedMotion || previousLoading == null) {
+        reveal
+          ..stop()
+          ..value = loading ? 0 : 1;
+      } else if (loading) {
+        // Reset directly to the loading state. Only the reveal animates.
+        reveal
+          ..stop()
+          ..value = 0;
+      } else if (previousLoading) {
+        reveal.forward(from: 0);
+      }
+      return null;
+    }, [loading, reducedMotion]);
+
+    return AnimatedBuilder(
+      animation: reveal,
+      builder: (context, _) {
+        final progress = reveal.value;
+        final skeletonBlur = reducedMotion ? 0.0 : _revealBlur * progress;
+        final contentBlur = reducedMotion ? 0.0 : _revealBlur * (1 - progress);
+
+        return Stack(
+          fit: StackFit.expand,
+          children: [
+            Opacity(
+              key: const Key('skeleton-reveal-content'),
+              opacity: progress,
+              child: ImageFiltered(
+                enabled: contentBlur > 0.01,
+                imageFilter: ImageFilter.blur(
+                  sigmaX: contentBlur,
+                  sigmaY: contentBlur,
+                ),
+                child: IgnorePointer(
+                  ignoring: loading || progress < 1,
+                  child: ExcludeFocus(
+                    excluding: loading || progress < 1,
+                    child: ExcludeSemantics(
+                      excluding: loading || progress < 1,
+                      child: content,
+                    ),
+                  ),
+                ),
+              ),
+            ),
+            Opacity(
+              key: const Key('skeleton-reveal-placeholder'),
+              opacity: 1 - progress,
+              child: ImageFiltered(
+                enabled: skeletonBlur > 0.01,
+                imageFilter: ImageFilter.blur(
+                  sigmaX: skeletonBlur,
+                  sigmaY: skeletonBlur,
+                ),
+                child: IgnorePointer(
+                  child: ExcludeSemantics(
+                    excluding: !loading,
+                    child: SkeletonShimmer(
+                      enabled: loading && shimmerEnabled,
+                      child: skeleton,
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
diff --git a/mobile/lib/shared/widgets/skeleton_shimmer.dart b/mobile/lib/shared/widgets/skeleton_shimmer.dart
new file mode 100644
index 0000000000..18e6635de5
--- /dev/null
+++ b/mobile/lib/shared/widgets/skeleton_shimmer.dart
@@ -0,0 +1,71 @@
+part of 'skeleton.dart';
+
+/// Sweeps one shared highlight across a group of skeleton elements.
+///
+/// This mirrors desktop's two-second linear shimmer. Reduced-motion users see
+/// the same element shapes without the moving highlight.
+class SkeletonShimmer extends HookWidget {
+  final Widget child;
+  final bool enabled;
+
+  const SkeletonShimmer({required this.child, this.enabled = true, super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final animation = useAnimationController(duration: _shimmerDuration);
+    final reducedMotion = MediaQuery.disableAnimationsOf(context);
+    final colors = context.colors;
+    final baseColor = colors.primary.withValues(alpha: _skeletonOpacity);
+    final highlightColor = colors.primary.withValues(
+      alpha: _skeletonOpacity * _shimmerMinOpacity,
+    );
+
+    useEffect(() {
+      if (reducedMotion || !enabled) {
+        animation
+          ..stop()
+          ..value = 0;
+      } else {
+        animation.repeat();
+      }
+      return animation.stop;
+    }, [animation, enabled, reducedMotion]);
+
+    if (reducedMotion || !enabled) {
+      return _SkeletonMask(
+        child: ColorFiltered(
+          colorFilter: ColorFilter.mode(baseColor, BlendMode.srcIn),
+          child: child,
+        ),
+      );
+    }
+
+    return _SkeletonMask(
+      child: RepaintBoundary(
+        child: AnimatedBuilder(
+          animation: animation,
+          child: child,
+          builder: (context, child) {
+            final center = -1.5 + (animation.value * 3);
+            return ShaderMask(
+              blendMode: BlendMode.srcIn,
+              shaderCallback: (bounds) => LinearGradient(
+                begin: Alignment(center - 1, 0),
+                end: Alignment(center + 1, 0),
+                colors: [
+                  baseColor,
+                  baseColor,
+                  highlightColor,
+                  baseColor,
+                  baseColor,
+                ],
+                stops: const [0, 0.34, 0.5, 0.66, 1],
+              ).createShader(bounds),
+              child: child,
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/shared/widgets/tappable_flapping_bee.dart b/mobile/lib/shared/widgets/tappable_flapping_bee.dart
new file mode 100644
index 0000000000..5796e9749b
--- /dev/null
+++ b/mobile/lib/shared/widgets/tappable_flapping_bee.dart
@@ -0,0 +1,149 @@
+import 'dart:math' show cos, min, pi;
+
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.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
+/// motion is enabled, the mark stays static.
+class TappableFlappingBee extends HookConsumerWidget {
+  /// The rendered width of the complete bee mark.
+  final double width;
+
+  /// The color used for the bee silhouette.
+  final Color color;
+
+  const TappableFlappingBee({
+    required this.width,
+    required this.color,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final animation = useAnimationController(
+      duration: const Duration(milliseconds: 480),
+    );
+    final reducedMotion = MediaQuery.disableAnimationsOf(context);
+
+    void flutterWings() {
+      if (reducedMotion) return;
+      animation.forward(from: 0);
+    }
+
+    return Semantics(
+      button: true,
+      label: 'Buzz bee',
+      hint: 'Tap to make its wings flutter',
+      onTap: flutterWings,
+      child: GestureDetector(
+        behavior: HitTestBehavior.opaque,
+        excludeFromSemantics: true,
+        onTap: flutterWings,
+        child: RepaintBoundary(
+          child: AnimatedBuilder(
+            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,
+                ),
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+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/pubspec.lock b/mobile/pubspec.lock
index 55185fc9c6..61d7fd58e4 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -1000,6 +1000,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.2"
+  photo_manager:
+    dependency: "direct main"
+    description:
+      name: photo_manager
+      sha256: "4f7de6c9778993c5c54cf1fb2eaa8d5c27c0771dc24a4dfca341aa81aef13fe1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.11.0"
   platform:
     dependency: transitive
     description:
@@ -1096,6 +1104,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.8"
+  share_plus:
+    dependency: "direct main"
+    description:
+      name: share_plus
+      sha256: "34f00f9becd2743c1fb05363d624f9f70d37f7ccdcdda47450bc0b8c9d327b8c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.3.0"
+  share_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: share_plus_platform_interface
+      sha256: "365ef7379fc22507256adda3385152942ffce08935452bc972c2e52a0bebae41"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.2.0"
   shared_preferences:
     dependency: "direct main"
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index b90f50c25a..b525926288 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -29,6 +29,7 @@ dependencies:
   file_selector: ^1.1.0
   camera: ^0.12.0+2
   image_picker: ^1.1.2
+  photo_manager: ^3.11.0
   video_player: ^2.10.1
   package_info_plus: ^10.0.0
   app_badge_plus: ^1.2.10
@@ -36,6 +37,7 @@ dependencies:
   scrollable_positioned_list: ^0.3.8
   open_filex: ^4.7.0
   path_provider: ^2.1.6
+  share_plus: ^13.3.0
 
 dev_dependencies:
   flutter_test:
diff --git a/mobile/scripts/check-file-sizes.mjs b/mobile/scripts/check-file-sizes.mjs
index a3af9c054b..765cd8edcf 100644
--- a/mobile/scripts/check-file-sizes.mjs
+++ b/mobile/scripts/check-file-sizes.mjs
@@ -15,16 +15,8 @@ const rules = [
   },
 ];
 
-// TEMP — these files exceed the 1000-line limit and are queued to be split.
-// Do not add to this list; split the file instead. Remove each entry as its
-// file is broken up.
-const overrides = new Map([
-]);
-
 await runFileSizeCheck({
   projectRoot,
   rules,
-  overrides,
   label: "Mobile",
-  scriptPath: "mobile/scripts/check-file-sizes.mjs",
 });
diff --git a/mobile/test/features/activity/activity_page_test.dart b/mobile/test/features/activity/activity_page_test.dart
index f79076272b..a0293455f2 100644
--- a/mobile/test/features/activity/activity_page_test.dart
+++ b/mobile/test/features/activity/activity_page_test.dart
@@ -1,47 +1,52 @@
 import 'dart:async';
 
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:hooks_riverpod/misc.dart';
 import 'package:buzz/features/activity/activity_page.dart';
 import 'package:buzz/features/activity/activity_provider.dart';
 import 'package:buzz/features/activity/feed_item.dart';
+import 'package:buzz/features/activity/inbox_item.dart';
+import 'package:buzz/features/activity/reminders_provider.dart';
 import 'package:buzz/features/channels/channel.dart';
+import 'package:buzz/features/channels/channel_detail_page.dart';
+import 'package:buzz/features/channels/message_content.dart';
 import 'package:buzz/features/channels/channels_provider.dart';
+import 'package:buzz/features/channels/read_state/read_state_provider.dart';
 import 'package:buzz/features/profile/user_cache_provider.dart';
 import 'package:buzz/features/profile/user_profile.dart';
 import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/frosted_app_bar.dart';
+import 'package:buzz/shared/widgets/avatar_image.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 void main() {
-  Widget buildTestable({required List<Override> overrides}) {
-    return ProviderScope(
-      overrides: overrides,
-      child: MaterialApp(theme: AppTheme.light(), home: const ActivityPage()),
-    );
-  }
+  final now = DateTime.now().millisecondsSinceEpoch ~/ 1000;
 
   final testMention = FeedItem(
     id: 'm1',
     kind: 9,
     pubkey: 'alice_pk',
     content: 'Hey check this out',
-    createdAt: DateTime.now().millisecondsSinceEpoch ~/ 1000 - 120,
+    createdAt: now - 120,
     channelId: 'ch1',
     channelName: 'general',
     tags: const [],
     category: 'mention',
   );
 
-  final testActivity = FeedItem(
+  final testThreadReply = FeedItem(
     id: 'a1',
     kind: 9,
     pubkey: 'bob_pk',
     content: 'Deployed the fix',
-    createdAt: DateTime.now().millisecondsSinceEpoch ~/ 1000 - 3600,
+    createdAt: now - 3600,
     channelId: 'ch2',
     channelName: 'engineering',
-    tags: const [],
+    tags: const [
+      ['e', 'root1', '', 'root'],
+      ['e', 'root1', '', 'reply'],
+    ],
     category: 'activity',
   );
 
@@ -50,7 +55,7 @@ void main() {
     kind: 43004,
     pubkey: 'agent_pk',
     content: 'Job completed successfully',
-    createdAt: DateTime.now().millisecondsSinceEpoch ~/ 1000 - 60,
+    createdAt: now - 60,
     channelId: 'ch1',
     channelName: 'general',
     tags: const [],
@@ -60,7 +65,7 @@ void main() {
   final testFeed = HomeFeedResponse(
     mentions: [testMention],
     needsAction: const [],
-    activity: [testActivity],
+    activity: [testThreadReply],
     agentActivity: [testAgent],
   );
 
@@ -90,73 +95,108 @@ void main() {
   ];
 
   final testUsers = <String, UserProfile>{
-    'alice_pk': const UserProfile(pubkey: 'alice_pk', displayName: 'Alice'),
+    'alice_pk': const UserProfile(
+      pubkey: 'alice_pk',
+      displayName: 'Alice',
+      nip05Handle: 'alice@example.com',
+    ),
     'bob_pk': const UserProfile(pubkey: 'bob_pk', displayName: 'Bob'),
     'agent_pk': const UserProfile(pubkey: 'agent_pk', displayName: 'Scout'),
   };
 
-  final emptyUsers = <String, UserProfile>{};
-
-  List<Override> defaultOverrides({HomeFeedResponse? feed}) => [
-    activityProvider.overrideWith(
-      () => _FakeActivityNotifier(feed ?? testFeed),
-    ),
-    channelsProvider.overrideWith(() => _FakeChannelsNotifier(testChannels)),
-    userCacheProvider.overrideWith(() => _FakeUserCacheNotifier(testUsers)),
-  ];
+  Future<Widget> buildTestable({
+    HomeFeedResponse? feed,
+    ActivityNotifier Function()? activityNotifier,
+    Map<String, UserProfile>? users,
+    Map<String, int> readContexts = const {},
+    List<Channel>? channels,
+    TextScaler? textScaler,
+  }) async {
+    SharedPreferences.setMockInitialValues({});
+    final prefs = await SharedPreferences.getInstance();
+    return ProviderScope(
+      overrides: [
+        savedPrefsProvider.overrideWithValue(prefs),
+        activityProvider.overrideWith(
+          activityNotifier ?? () => _FakeActivityNotifier(feed ?? testFeed),
+        ),
+        channelsProvider.overrideWith(
+          () => _FakeChannelsNotifier(channels ?? testChannels),
+        ),
+        userCacheProvider.overrideWith(
+          () => _FakeUserCacheNotifier(users ?? testUsers),
+        ),
+        readStateProvider.overrideWith(
+          () => _FakeReadStateNotifier(readContexts),
+        ),
+        remindersProvider.overrideWith(() => _FakeRemindersNotifier(const [])),
+      ],
+      child: MaterialApp(
+        theme: AppTheme.light(),
+        builder: textScaler == null
+            ? null
+            : (context, child) => MediaQuery(
+                data: MediaQuery.of(context).copyWith(textScaler: textScaler),
+                child: child!,
+              ),
+        home: const ActivityPage(),
+      ),
+    );
+  }
 
   testWidgets('shows loading skeleton while feed loads', (tester) async {
     await tester.pumpWidget(
-      buildTestable(
-        overrides: [
-          activityProvider.overrideWith(() => _PendingActivityNotifier()),
-          channelsProvider.overrideWith(() => _FakeChannelsNotifier([])),
-          userCacheProvider.overrideWith(
-            () => _FakeUserCacheNotifier(emptyUsers),
-          ),
-        ],
-      ),
+      await buildTestable(activityNotifier: _PendingActivityNotifier.new),
     );
     // Single pump - don't settle, the future never completes.
     await tester.pump();
 
-    // Skeleton containers should be present (loading state).
     expect(find.byType(Container), findsWidgets);
-    // No feed content visible.
-    expect(find.text('Mention'), findsNothing);
+    expect(find.text('Hey check this out'), findsNothing);
   });
 
   testWidgets('shows empty state when feed is empty', (tester) async {
-    final emptyFeed = HomeFeedResponse(
-      mentions: [],
-      needsAction: [],
-      activity: [],
-      agentActivity: [],
-    );
-
     await tester.pumpWidget(
-      buildTestable(overrides: defaultOverrides(feed: emptyFeed)),
+      await buildTestable(
+        feed: HomeFeedResponse(
+          mentions: const [],
+          needsAction: const [],
+          activity: const [],
+          agentActivity: const [],
+        ),
+      ),
     );
     await tester.pumpAndSettle();
 
     expect(find.text('No activity yet'), findsOneWidget);
-    expect(
-      find.text('Mentions, replies, and reactions will show up here.'),
-      findsOneWidget,
-    );
+  });
+
+  testWidgets('does not imply a back button for the top-level Activity tab', (
+    tester,
+  ) async {
+    await tester.pumpWidget(await buildTestable());
+    await tester.pumpAndSettle();
+
+    final appBar = tester.widget<FrostedAppBar>(find.byType(FrostedAppBar));
+    expect(appBar.automaticallyImplyLeading, isFalse);
+    expect(find.byTooltip('Back'), findsNothing);
+  });
+
+  testWidgets('keeps bottom clearance for the floating tab bar', (
+    tester,
+  ) async {
+    await tester.pumpWidget(await buildTestable());
+    await tester.pumpAndSettle();
+
+    final safeAreas = tester.widgetList<SafeArea>(find.byType(SafeArea));
+    expect(safeAreas, hasLength(1));
+    expect(safeAreas.single.top, isFalse);
+    expect(safeAreas.single.bottom, isTrue);
   });
 
   testWidgets('shows error view with retry button', (tester) async {
     await tester.pumpWidget(
-      buildTestable(
-        overrides: [
-          activityProvider.overrideWith(() => _ErrorActivityNotifier()),
-          channelsProvider.overrideWith(() => _FakeChannelsNotifier([])),
-          userCacheProvider.overrideWith(
-            () => _FakeUserCacheNotifier(emptyUsers),
-          ),
-        ],
-      ),
+      await buildTestable(activityNotifier: _ErrorActivityNotifier.new),
     );
     await tester.pumpAndSettle();
 
@@ -164,108 +204,401 @@ void main() {
     expect(find.text('Retry'), findsOneWidget);
   });
 
-  testWidgets('shows feed items with correct content', (tester) async {
-    await tester.pumpWidget(buildTestable(overrides: defaultOverrides()));
+  testWidgets('activity popovers use fixed-layout scale and opacity motion', (
+    tester,
+  ) async {
+    await tester.pumpWidget(await buildTestable());
     await tester.pumpAndSettle();
 
-    // All three items visible in "All" filter.
-    expect(find.text('Hey check this out'), findsOneWidget);
-    expect(find.text('Deployed the fix'), findsOneWidget);
-    expect(find.text('Job completed successfully'), findsOneWidget);
+    final filterTrigger = find.byKey(const ValueKey('activity-filter-menu'));
+    expect(
+      tester.getSize(filterTrigger).height,
+      greaterThanOrEqualTo(Grid.xl),
+      reason: 'The Activity filter trigger must keep a 48dp touch target.',
+    );
 
-    // Author names resolved from user cache.
+    await tester.tap(filterTrigger);
+    await tester.pump();
+
+    final surface = find.byKey(const ValueKey('activity-filter-popover'));
+    final fade = find.byKey(const ValueKey('activity-popover-fade'));
+    final scale = find.byKey(const ValueKey('activity-popover-scale'));
+    expect(surface, findsOneWidget);
+    expect(fade, findsOneWidget);
+    expect(scale, findsOneWidget);
+
+    final initialSize = tester.getSize(surface);
+    final initialFade = tester.widget<FadeTransition>(fade);
+    final initialScale = tester.widget<ScaleTransition>(scale);
+    expect(initialSize.width, 240);
+    expect(initialFade.opacity.value, lessThan(1));
+    expect(initialScale.scale.value, greaterThanOrEqualTo(0.96));
+    expect(initialScale.scale.value, lessThan(1));
+    expect(initialScale.alignment, Alignment.topLeft);
+
+    await tester.pump(const Duration(milliseconds: 75));
+
+    final movingFade = tester.widget<FadeTransition>(fade);
+    final movingScale = tester.widget<ScaleTransition>(scale);
+    expect(movingFade.opacity.value, greaterThan(0));
+    expect(movingFade.opacity.value, lessThan(1));
+    expect(movingScale.scale.value, greaterThan(0.96));
+    expect(movingScale.scale.value, lessThan(1));
+    expect(tester.getSize(surface), initialSize);
+
+    await tester.pump(const Duration(milliseconds: 75));
+    expect(tester.widget<FadeTransition>(fade).opacity.value, 1);
+    expect(tester.widget<ScaleTransition>(scale).scale.value, 1);
+    expect(tester.getSize(surface), initialSize);
+
+    final material = tester.widget<Material>(surface);
+    final shape = material.shape! as RoundedRectangleBorder;
+    expect(shape.borderRadius, BorderRadius.circular(Radii.card));
+    expect(material.surfaceTintColor, Colors.transparent);
+    expect(material.clipBehavior, Clip.antiAlias);
+
+    final items = tester.widgetList<PopupMenuItem<InboxFilter>>(
+      find.byType(PopupMenuItem<InboxFilter>),
+    );
+    expect(items, hasLength(InboxFilter.values.length));
+    expect(
+      items.every((item) => item.height >= Grid.xl),
+      isTrue,
+      reason: 'Activity filter choices must keep 48dp touch targets.',
+    );
+
+    await tester.tap(find.descendant(of: surface, matching: find.text('All')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const ValueKey('activity-options-menu')));
+    await tester.pump();
+
+    final optionsSurface = find.byKey(
+      const ValueKey('activity-options-popover'),
+    );
+    expect(tester.getSize(optionsSurface).width, 216);
+    expect(
+      tester
+          .widget<ScaleTransition>(
+            find.byKey(const ValueKey('activity-popover-scale')),
+          )
+          .alignment,
+      Alignment.topRight,
+    );
+  });
+
+  testWidgets('rows lead with sender, contextual label, and preview', (
+    tester,
+  ) async {
+    await tester.pumpWidget(await buildTestable());
+    await tester.pumpAndSettle();
+
+    // Sender names resolved from the user cache.
     expect(find.text('Alice'), findsOneWidget);
+    expect(find.text('alice@example.com'), findsOneWidget);
     expect(find.text('Bob'), findsOneWidget);
     expect(find.text('Scout'), findsOneWidget);
 
-    // Channel names visible.
+    // Contextual labels + channel chips.
+    expect(find.text('Mentioned in'), findsOneWidget);
+    expect(find.text('Thread in'), findsOneWidget);
     expect(find.text('#general'), findsNWidgets(2)); // mention + agent
     expect(find.text('#engineering'), findsOneWidget);
+
+    // Context labels and channel pills share the compact Activity style.
+    final contextLabel = tester.widget<Text>(find.text('Mentioned in'));
+    final channelLabel = tester.widgetList<Text>(find.text('#general')).first;
+    expect(contextLabel.style?.fontSize, activityContextTextStyle.fontSize);
+    expect(contextLabel.style?.fontWeight, activityContextTextStyle.fontWeight);
+    expect(contextLabel.style?.height, activityContextTextStyle.height);
+    expect(channelLabel.style?.fontSize, activityContextTextStyle.fontSize);
+    expect(channelLabel.style?.fontWeight, activityContextTextStyle.fontWeight);
+    expect(channelLabel.style?.height, activityContextTextStyle.height);
+
+    // Message previews.
+    expect(find.textContaining('Hey check this out'), findsOneWidget);
+    expect(find.textContaining('Deployed the fix'), findsOneWidget);
+
+    // Activity rows use their conversation-oriented scale.
+    final senderText = tester.widget<Text>(find.text('Alice'));
+    final theme = Theme.of(tester.element(find.text('Alice')));
+    expect(senderText.style?.fontSize, activityUsernameTextStyle.fontSize);
+    expect(senderText.style?.fontWeight, activityUsernameTextStyle.fontWeight);
+    expect(senderText.style?.height, activityUsernameTextStyle.height);
+    expect(senderText.style?.color, theme.colorScheme.onSurface);
+    final usernameText = tester.widget<Text>(
+      find.byKey(const ValueKey('activity-username-m1')),
+    );
+    final timestampText = tester.widget<Text>(
+      find.byKey(const ValueKey('activity-timestamp-m1')),
+    );
+    expect(usernameText.style?.fontSize, messageMetadataTextStyle.fontSize);
+    expect(usernameText.style?.fontWeight, FontWeight.w400);
+    expect(usernameText.style?.height, messageMetadataTextStyle.height);
+    expect(timestampText.style?.fontSize, messageMetadataTextStyle.fontSize);
+    expect(timestampText.style?.fontWeight, FontWeight.w400);
+
+    final avatars = tester.widgetList<AvatarImage>(find.byType(AvatarImage));
+    expect(avatars, isNotEmpty);
+    expect(
+      avatars.every((avatar) => avatar.radius == activityAvatarSize / 2),
+      isTrue,
+    );
+
+    final previews = tester.widgetList<MessageContent>(
+      find.byType(MessageContent),
+    );
+    expect(previews, isNotEmpty);
+    expect(
+      previews.every(
+        (preview) =>
+            preview.baseStyle?.fontSize == activityPreviewTextStyle.fontSize &&
+            preview.baseStyle?.fontWeight ==
+                activityPreviewTextStyle.fontWeight &&
+            preview.baseStyle?.height == activityPreviewTextStyle.height &&
+            preview.baseStyle?.letterSpacing ==
+                activityPreviewTextStyle.letterSpacing &&
+            preview.baseStyle?.color == theme.colorScheme.onSurface,
+      ),
+      isTrue,
+    );
   });
 
-  testWidgets('shows filter chips with counts', (tester) async {
-    await tester.pumpWidget(buildTestable(overrides: defaultOverrides()));
+  testWidgets('multiple top-level messages in one DM render one row', (
+    tester,
+  ) async {
+    final dmChannel = Channel(
+      id: 'dm1',
+      name: 'dm',
+      channelType: 'dm',
+      visibility: 'private',
+      description: '',
+      createdBy: 'x',
+      createdAt: DateTime(2025),
+      memberCount: 2,
+      isMember: true,
+      participants: const ['Alice'],
+    );
+    FeedItem dmMessage(String id, int age) => FeedItem(
+      id: id,
+      kind: 9,
+      pubkey: 'alice_pk',
+      content: 'dm body $id',
+      createdAt: now - age,
+      channelId: 'dm1',
+      channelName: '',
+      tags: const [],
+      category: 'activity',
+    );
+
+    await tester.pumpWidget(
+      await buildTestable(
+        feed: HomeFeedResponse(
+          mentions: const [],
+          needsAction: const [],
+          activity: [dmMessage('dm-a', 300), dmMessage('dm-b', 200)],
+          agentActivity: const [],
+        ),
+        channels: [...testChannels, dmChannel],
+      ),
+    );
     await tester.pumpAndSettle();
 
-    expect(find.text('All'), findsOneWidget);
-    expect(find.text('Mentions (1)'), findsOneWidget);
-    expect(find.text('Action (0)'), findsOneWidget);
-    expect(find.text('Activity (1)'), findsOneWidget);
-    expect(find.text('Agents (1)'), findsOneWidget);
+    // One conversation row for the DM, represented by the latest message.
+    expect(find.byKey(const ValueKey('inbox-row-dm-b')), findsOneWidget);
+    expect(find.byKey(const ValueKey('inbox-row-dm-a')), findsNothing);
+    expect(find.textContaining('dm body dm-b'), findsOneWidget);
+    expect(find.textContaining('dm body dm-a'), findsNothing);
   });
 
-  testWidgets('filtering shows only matching items', (tester) async {
-    await tester.pumpWidget(buildTestable(overrides: defaultOverrides()));
+  testWidgets('unread rows show a dot; read rows do not', (tester) async {
+    await tester.pumpWidget(
+      await buildTestable(
+        // ch1 fully read; ch2 (thread) unread.
+        readContexts: {'ch1': now},
+      ),
+    );
     await tester.pumpAndSettle();
 
-    // Tap the Mentions filter.
-    await tester.tap(find.text('Mentions (1)'));
-    await tester.pumpAndSettle();
-
-    expect(find.text('Hey check this out'), findsOneWidget);
-    expect(find.text('Deployed the fix'), findsNothing);
-    expect(find.text('Job completed successfully'), findsNothing);
+    expect(find.byKey(const ValueKey('inbox-unread-dot-m1')), findsNothing);
+    expect(find.byKey(const ValueKey('inbox-unread-dot-ag1')), findsNothing);
+    expect(find.byKey(const ValueKey('inbox-unread-dot-a1')), findsOneWidget);
   });
 
-  testWidgets('empty filter shows per-filter empty state', (tester) async {
-    await tester.pumpWidget(buildTestable(overrides: defaultOverrides()));
+  testWidgets('New boundary separates unread rows from read rows', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      await buildTestable(
+        // Mention (2m ago) and agent (1m ago) unread; thread (1h ago) read.
+        readContexts: {'thread:root1': now, 'ch2': now},
+      ),
+    );
     await tester.pumpAndSettle();
 
-    // Tap Action filter (has 0 items).
-    await tester.tap(find.text('Action (0)'));
+    expect(find.text('New'), findsOneWidget);
+  });
+
+  testWidgets('filter menu switches sources and shows empty states', (
+    tester,
+  ) async {
+    await tester.pumpWidget(await buildTestable());
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const ValueKey('activity-filter-menu')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Mentions'));
+    await tester.pumpAndSettle();
+
+    expect(find.textContaining('Hey check this out'), findsOneWidget);
+    expect(find.textContaining('Deployed the fix'), findsNothing);
+    expect(find.textContaining('Job completed successfully'), findsNothing);
+
+    await tester.tap(find.byKey(const ValueKey('activity-filter-menu')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Needs Action'));
     await tester.pumpAndSettle();
 
     expect(find.text('Nothing needs your action'), findsOneWidget);
   });
 
-  testWidgets('shows headline for known event kinds', (tester) async {
-    await tester.pumpWidget(buildTestable(overrides: defaultOverrides()));
+  testWidgets('filter menu supports accessibility text scaling', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      await buildTestable(textScaler: const TextScaler.linear(3)),
+    );
     await tester.pumpAndSettle();
 
-    // testAgent has kind 43004 -> "Job result"
-    expect(find.text('Job result'), findsOneWidget);
-    // testMention has kind 9, category mention -> "Mention"
-    expect(find.text('Mention'), findsOneWidget);
-    // testActivity has kind 9, category activity -> "Channel update"
-    expect(find.text('Channel update'), findsOneWidget);
+    await tester.tap(find.byKey(const ValueKey('activity-filter-menu')));
+    await tester.pumpAndSettle();
+
+    expect(
+      find.byKey(const ValueKey('activity-filter-popover')),
+      findsOneWidget,
+    );
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('opens a thread mention at the referenced message', (
+    tester,
+  ) async {
+    final threadMention = FeedItem(
+      id: 'reply-event',
+      kind: 9,
+      pubkey: 'alice_pk',
+      content: 'Reply in a thread',
+      createdAt: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      channelId: 'ch1',
+      channelName: 'general',
+      tags: const [
+        ['e', 'thread-root', '', 'root'],
+        ['e', 'parent-reply', '', 'reply'],
+      ],
+      category: 'mention',
+    );
+    final feed = HomeFeedResponse(
+      mentions: [threadMention],
+      needsAction: const [],
+      activity: const [],
+      agentActivity: const [],
+    );
+
+    await tester.pumpWidget(await buildTestable(feed: feed));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const ValueKey('inbox-row-reply-event')));
+    await tester.pumpAndSettle();
+
+    final page = tester.widget<ChannelDetailPage>(
+      find.byType(ChannelDetailPage),
+    );
+    expect(page.channel.id, 'ch1');
+    expect(page.initialThreadRootId, 'parent-reply');
+    expect(page.initialMessageId, 'reply-event');
+  });
+
+  testWidgets('thread filter matches grouped thread replies', (tester) async {
+    await tester.pumpWidget(await buildTestable());
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const ValueKey('activity-filter-menu')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Threads'));
+    await tester.pumpAndSettle();
+
+    expect(find.textContaining('Deployed the fix'), findsOneWidget);
+    expect(find.textContaining('Hey check this out'), findsNothing);
+  });
+
+  testWidgets('reminders filter shows the reminders empty surface', (
+    tester,
+  ) async {
+    await tester.pumpWidget(await buildTestable());
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const ValueKey('activity-filter-menu')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Reminders'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('No reminders'), findsOneWidget);
+  });
+
+  testWidgets('drafts filter shows the drafts empty surface', (tester) async {
+    await tester.pumpWidget(await buildTestable());
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const ValueKey('activity-filter-menu')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Drafts'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('No drafts'), findsOneWidget);
+  });
+
+  testWidgets('unread-only toggle hides read rows', (tester) async {
+    await tester.pumpWidget(await buildTestable(readContexts: {'ch1': now}));
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const ValueKey('activity-options-menu')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Show unread'));
+    await tester.pumpAndSettle();
+
+    // Only the unread thread row remains.
+    expect(find.textContaining('Deployed the fix'), findsOneWidget);
+    expect(find.textContaining('Hey check this out'), findsNothing);
+    expect(find.textContaining('Job completed successfully'), findsNothing);
+  });
+
+  testWidgets('long-press mark unread reopens a read row', (tester) async {
+    await tester.pumpWidget(
+      await buildTestable(
+        readContexts: {'ch1': now, 'ch2': now, 'thread:root1': now},
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const ValueKey('inbox-unread-dot-m1')), findsNothing);
+
+    await tester.longPress(find.byKey(const ValueKey('inbox-row-m1')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Mark unread'));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const ValueKey('inbox-unread-dot-m1')), findsOneWidget);
   });
 
   testWidgets('falls back to short pubkey when user not cached', (
     tester,
   ) async {
-    await tester.pumpWidget(
-      buildTestable(
-        overrides: [
-          activityProvider.overrideWith(() => _FakeActivityNotifier(testFeed)),
-          channelsProvider.overrideWith(
-            () => _FakeChannelsNotifier(testChannels),
-          ),
-          // Empty user cache - no profiles resolved.
-          userCacheProvider.overrideWith(
-            () => _FakeUserCacheNotifier(emptyUsers),
-          ),
-        ],
-      ),
-    );
+    await tester.pumpWidget(await buildTestable(users: const {}));
     await tester.pumpAndSettle();
 
-    // Should show truncated pubkey instead of display name.
-    expect(find.text('alice_pk...'), findsOneWidget);
+    // Sender label falls back to the (short) pubkey.
+    expect(find.text('alice_pk'), findsOneWidget);
     expect(find.text('Alice'), findsNothing);
   });
-
-  testWidgets('timestamps are right-aligned consistently', (tester) async {
-    await tester.pumpWidget(buildTestable(overrides: defaultOverrides()));
-    await tester.pumpAndSettle();
-
-    // Find all time labels - they should show relative times.
-    // testMention: 120s ago -> "2m"
-    expect(find.text('2m'), findsOneWidget);
-    // testActivity: 3600s ago -> "1h"
-    expect(find.text('1h'), findsOneWidget);
-    // testAgent: 60s ago -> "1m"
-    expect(find.text('1m'), findsOneWidget);
-  });
 }
 
 class _FakeActivityNotifier extends ActivityNotifier {
@@ -301,3 +634,33 @@ class _FakeUserCacheNotifier extends UserCacheNotifier {
   @override
   Map<String, UserProfile> build() => _users;
 }
+
+class _FakeReadStateNotifier extends ReadStateNotifier {
+  final Map<String, int> _contexts;
+  _FakeReadStateNotifier(this._contexts);
+
+  @override
+  ReadStateState build() => ReadStateState(
+    isReady: true,
+    pubkey: 'me_pk',
+    contexts: Map.unmodifiable(_contexts),
+    version: 1,
+  );
+
+  @override
+  void markContextRead(
+    String contextId,
+    int unixTimestamp, {
+    bool clearForcedMessages = false,
+  }) {
+    state = state.copyWithContext(contextId, unixTimestamp);
+  }
+}
+
+class _FakeRemindersNotifier extends RemindersNotifier {
+  final List<Reminder> _reminders;
+  _FakeRemindersNotifier(this._reminders);
+
+  @override
+  Future<List<Reminder>> build() async => _reminders;
+}
diff --git a/mobile/test/features/activity/activity_provider_test.dart b/mobile/test/features/activity/activity_provider_test.dart
new file mode 100644
index 0000000000..0d927df860
--- /dev/null
+++ b/mobile/test/features/activity/activity_provider_test.dart
@@ -0,0 +1,108 @@
+import 'dart:async';
+
+import 'package:buzz/features/activity/activity_provider.dart';
+import 'package:buzz/features/channels/channel.dart';
+import 'package:buzz/features/channels/channels_provider.dart';
+import 'package:buzz/shared/relay/relay.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+/// Records every DM history query (`#h` filter) so tests can assert whether
+/// the DM source was fetched. All queries resolve to empty lists.
+class _RecordingSessionNotifier extends RelaySessionNotifier {
+  final List<List<String>> dmQueries = [];
+
+  @override
+  SessionState build() => const SessionState(status: SessionStatus.connected);
+
+  @override
+  Future<List<NostrEvent>> fetchHistory(
+    NostrFilter filter, {
+    Duration timeout = const Duration(seconds: 8),
+  }) async {
+    final h = filter.tags['#h'];
+    if (h != null) dmQueries.add(h);
+    return const [];
+  }
+}
+
+/// Channels provider that starts loading and resolves on demand, modelling a
+/// cold start where the channel list arrives after Activity's first fetch.
+class _LateChannelsNotifier extends ChannelsNotifier {
+  final Completer<List<Channel>> _completer = Completer<List<Channel>>();
+
+  @override
+  Future<List<Channel>> build() => _completer.future;
+
+  void resolve(List<Channel> channels) => _completer.complete(channels);
+}
+
+class _FixedRelayConfigNotifier extends RelayConfigNotifier {
+  @override
+  RelayConfig build() =>
+      const RelayConfig(baseUrl: 'https://relay.example', nsec: null);
+}
+
+Channel _dmChannel(String id) => Channel(
+  id: id,
+  name: 'dm',
+  channelType: 'dm',
+  visibility: 'private',
+  description: '',
+  createdBy: 'x',
+  createdAt: DateTime(2025),
+  memberCount: 2,
+  isMember: true,
+);
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  test('refetches and includes DMs when channels resolve after first '
+      'fetch (cold start)', () async {
+    final session = _RecordingSessionNotifier();
+    final channels = _LateChannelsNotifier();
+    final container = ProviderContainer(
+      overrides: [
+        relayConfigProvider.overrideWith(_FixedRelayConfigNotifier.new),
+        myPubkeyProvider.overrideWithValue('me_pk'),
+        relaySessionProvider.overrideWith(() => session),
+        channelsProvider.overrideWith(() => channels),
+      ],
+    );
+    addTearDown(container.dispose);
+
+    // Cold start: channels still loading, so the first fetch has no DM ids.
+    await container.read(activityProvider.future);
+    expect(session.dmQueries, isEmpty);
+
+    // Channel list resolves with a DM → Activity must rebuild and query it.
+    channels.resolve([_dmChannel('dm1')]);
+    await container.read(channelsProvider.future);
+    await container.read(activityProvider.future);
+
+    expect(session.dmQueries, hasLength(1));
+    expect(session.dmQueries.single, ['dm1']);
+  });
+
+  test('does not query DMs when the resolved channel list has none', () async {
+    final session = _RecordingSessionNotifier();
+    final channels = _LateChannelsNotifier();
+    final container = ProviderContainer(
+      overrides: [
+        relayConfigProvider.overrideWith(_FixedRelayConfigNotifier.new),
+        myPubkeyProvider.overrideWithValue('me_pk'),
+        relaySessionProvider.overrideWith(() => session),
+        channelsProvider.overrideWith(() => channels),
+      ],
+    );
+    addTearDown(container.dispose);
+
+    await container.read(activityProvider.future);
+    channels.resolve(const []);
+    await container.read(channelsProvider.future);
+    await container.read(activityProvider.future);
+
+    expect(session.dmQueries, isEmpty);
+  });
+}
diff --git a/mobile/test/features/activity/compose_drafts_provider_test.dart b/mobile/test/features/activity/compose_drafts_provider_test.dart
new file mode 100644
index 0000000000..15899e6597
--- /dev/null
+++ b/mobile/test/features/activity/compose_drafts_provider_test.dart
@@ -0,0 +1,219 @@
+import 'package:buzz/features/activity/compose_drafts_provider.dart';
+import 'package:buzz/shared/relay/relay.dart';
+import 'package:buzz/shared/theme/theme_provider.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class _FixedRelayConfigNotifier extends RelayConfigNotifier {
+  final RelayConfig _config;
+  _FixedRelayConfigNotifier(this._config);
+
+  @override
+  RelayConfig build() => _config;
+}
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  Future<ProviderContainer> containerWithPrefs({
+    String relayUrl = 'https://relay-a.example',
+    String? pubkey = 'pk_a',
+  }) async {
+    final prefs = await SharedPreferences.getInstance();
+    final container = ProviderContainer(
+      overrides: [
+        savedPrefsProvider.overrideWithValue(prefs),
+        relayConfigProvider.overrideWith(
+          () => _FixedRelayConfigNotifier(RelayConfig(baseUrl: relayUrl)),
+        ),
+        myPubkeyProvider.overrideWithValue(pubkey),
+      ],
+    );
+    addTearDown(container.dispose);
+    return container;
+  }
+
+  test(
+    'an invite-joined community keeps its drafts after origin canonicalization',
+    () async {
+      // Written by a build that stored the invite link's wss:// origin
+      // verbatim; RelayConfig now canonicalizes that to https://, so the key
+      // the app computes no longer matches the key on disk.
+      const legacyKey = 'compose_drafts_v1:wss://relay-a.example:pk_a';
+      const canonicalKey = 'compose_drafts_v1:https://relay-a.example:pk_a';
+      SharedPreferences.setMockInitialValues({
+        legacyKey:
+            '[{"key":"ch1","channel_id":"ch1","text":"unsent work",'
+            '"updated_at":1700000000}]',
+      });
+
+      final container = await containerWithPrefs(
+        relayUrl: 'wss://relay-a.example',
+      );
+
+      final drafts = container.read(composeDraftsProvider);
+      expect(drafts, hasLength(1), reason: 'draft survives the upgrade');
+      expect(drafts.single.text, 'unsent work');
+
+      await Future<void>.delayed(Duration.zero);
+      final prefs = await SharedPreferences.getInstance();
+      expect(prefs.getString(canonicalKey), isNotNull);
+      expect(prefs.getString(legacyKey), isNull);
+    },
+  );
+
+  test('composeDraftKey separates channel and thread composers', () {
+    expect(composeDraftKey('ch1'), 'ch1');
+    expect(composeDraftKey('ch1', threadHeadId: 't1'), 'ch1:t1');
+  });
+
+  test('save adds a draft and textFor returns it', () async {
+    SharedPreferences.setMockInitialValues({});
+    final container = await containerWithPrefs();
+    final notifier = container.read(composeDraftsProvider.notifier);
+
+    notifier.save(key: 'ch1', channelId: 'ch1', text: 'hello there');
+
+    final drafts = container.read(composeDraftsProvider);
+    expect(drafts, hasLength(1));
+    expect(drafts.single.text, 'hello there');
+    expect(notifier.textFor('ch1'), 'hello there');
+  });
+
+  test('empty text removes the draft', () async {
+    SharedPreferences.setMockInitialValues({});
+    final container = await containerWithPrefs();
+    final notifier = container.read(composeDraftsProvider.notifier);
+
+    notifier.save(key: 'ch1', channelId: 'ch1', text: 'hello');
+    notifier.save(key: 'ch1', channelId: 'ch1', text: '   ');
+
+    expect(container.read(composeDraftsProvider), isEmpty);
+  });
+
+  test('drafts persist across container restarts', () async {
+    SharedPreferences.setMockInitialValues({});
+    final first = await containerWithPrefs();
+    first
+        .read(composeDraftsProvider.notifier)
+        .save(key: 'ch1:t1', channelId: 'ch1', threadHeadId: 't1', text: 'wip');
+
+    final second = await containerWithPrefs();
+    final restored = second.read(composeDraftsProvider);
+    expect(restored, hasLength(1));
+    expect(restored.single.channelId, 'ch1');
+    expect(restored.single.threadHeadId, 't1');
+    expect(restored.single.text, 'wip');
+  });
+
+  test('remove deletes by key', () async {
+    SharedPreferences.setMockInitialValues({});
+    final container = await containerWithPrefs();
+    final notifier = container.read(composeDraftsProvider.notifier);
+
+    notifier.save(key: 'ch1', channelId: 'ch1', text: 'hello');
+    notifier.remove('ch1');
+
+    expect(container.read(composeDraftsProvider), isEmpty);
+  });
+
+  test('malformed persisted json is ignored', () async {
+    SharedPreferences.setMockInitialValues({
+      'compose_drafts_v1:https://relay-a.example:pk_a': '{not valid',
+    });
+    final container = await containerWithPrefs();
+    expect(container.read(composeDraftsProvider), isEmpty);
+  });
+
+  test('drafts are isolated per community', () async {
+    SharedPreferences.setMockInitialValues({});
+    final communityA = await containerWithPrefs(
+      relayUrl: 'https://relay-a.example',
+    );
+    communityA
+        .read(composeDraftsProvider.notifier)
+        .save(key: 'ch1', channelId: 'ch1', text: 'secret from A');
+
+    // Same channel id in another community must not see A's draft.
+    final communityB = await containerWithPrefs(
+      relayUrl: 'https://relay-b.example',
+    );
+    expect(communityB.read(composeDraftsProvider), isEmpty);
+    expect(
+      communityB.read(composeDraftsProvider.notifier).textFor('ch1'),
+      isNull,
+    );
+
+    // A's own store is untouched.
+    final communityAAgain = await containerWithPrefs(
+      relayUrl: 'https://relay-a.example',
+    );
+    expect(
+      communityAAgain.read(composeDraftsProvider.notifier).textFor('ch1'),
+      'secret from A',
+    );
+  });
+
+  test('drafts are isolated per account pubkey', () async {
+    SharedPreferences.setMockInitialValues({});
+    final accountA = await containerWithPrefs(pubkey: 'pk_a');
+    accountA
+        .read(composeDraftsProvider.notifier)
+        .save(key: 'ch1', channelId: 'ch1', text: 'account A draft');
+
+    // Same relay, different account: a colliding channel id must not
+    // restore the other account's draft.
+    final accountB = await containerWithPrefs(pubkey: 'pk_b');
+    expect(accountB.read(composeDraftsProvider), isEmpty);
+    expect(
+      accountB.read(composeDraftsProvider.notifier).textFor('ch1'),
+      isNull,
+    );
+  });
+
+  test('in-place identity change rebuilds onto the new store', () async {
+    SharedPreferences.setMockInitialValues({});
+    final prefs = await SharedPreferences.getInstance();
+    final container = ProviderContainer(
+      overrides: [
+        savedPrefsProvider.overrideWithValue(prefs),
+        // Real derivation path: myPubkeyProvider derives from the config's
+        // nsec, so an in-place config change simulates an account/community
+        // switch without restarting the container.
+        relayConfigProvider.overrideWith(
+          () => _FixedRelayConfigNotifier(
+            const RelayConfig(baseUrl: 'https://relay-a.example'),
+          ),
+        ),
+      ],
+    );
+    addTearDown(container.dispose);
+
+    // Seed a draft for the initial identity (nsec-less config → 'anon').
+    container
+        .read(composeDraftsProvider.notifier)
+        .save(key: 'ch1', channelId: 'ch1', text: 'first identity draft');
+    expect(container.read(composeDraftsProvider), hasLength(1));
+
+    // Switch community in place: the drafts provider must rebuild against
+    // the new identity's (empty) store, not keep the old state.
+    container
+        .read(relayConfigProvider.notifier)
+        .update(baseUrl: 'https://relay-b.example');
+    expect(container.read(composeDraftsProvider), isEmpty);
+    expect(
+      container.read(composeDraftsProvider.notifier).textFor('ch1'),
+      isNull,
+    );
+
+    // Switching back restores the original identity's draft.
+    container
+        .read(relayConfigProvider.notifier)
+        .update(baseUrl: 'https://relay-a.example');
+    expect(
+      container.read(composeDraftsProvider.notifier).textFor('ch1'),
+      'first identity draft',
+    );
+  });
+}
diff --git a/mobile/test/features/activity/feed_item_test.dart b/mobile/test/features/activity/feed_item_test.dart
index db29520501..f655bf316a 100644
--- a/mobile/test/features/activity/feed_item_test.dart
+++ b/mobile/test/features/activity/feed_item_test.dart
@@ -50,6 +50,48 @@ void main() {
     });
   });
 
+  group('FeedItem.threadHeadId', () {
+    FeedItem makeItem(List<List<String>> tags) => FeedItem(
+      id: 'reply',
+      kind: 9,
+      pubkey: 'pk',
+      content: '',
+      createdAt: 0,
+      channelId: 'channel',
+      channelName: '',
+      tags: tags,
+      category: 'mention',
+    );
+
+    test('uses the reply marker for a direct thread reply', () {
+      expect(
+        makeItem(const [
+          ['e', 'root', '', 'reply'],
+        ]).threadHeadId,
+        'root',
+      );
+    });
+
+    test('uses the direct parent marker for a nested thread reply', () {
+      expect(
+        makeItem(const [
+          ['e', 'root', '', 'root'],
+          ['e', 'parent', '', 'reply'],
+        ]).threadHeadId,
+        'parent',
+      );
+    });
+
+    test('does not treat unrelated event references as threads', () {
+      expect(
+        makeItem(const [
+          ['e', 'linked-event'],
+        ]).threadHeadId,
+        isNull,
+      );
+    });
+  });
+
   group('FeedItem.headline', () {
     FeedItem makeItem({required int kind, String category = 'activity'}) =>
         FeedItem(
diff --git a/mobile/test/features/activity/inbox_item_test.dart b/mobile/test/features/activity/inbox_item_test.dart
new file mode 100644
index 0000000000..379e85dfc5
--- /dev/null
+++ b/mobile/test/features/activity/inbox_item_test.dart
@@ -0,0 +1,285 @@
+import 'package:buzz/features/activity/feed_item.dart';
+import 'package:buzz/features/activity/inbox_item.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+FeedItem item({
+  required String id,
+  int createdAt = 100,
+  String category = 'mention',
+  String pubkey = 'pk1',
+  String? channelId = 'ch1',
+  List<List<String>> tags = const [],
+  int kind = 9,
+  String content = 'hello',
+}) => FeedItem(
+  id: id,
+  kind: kind,
+  pubkey: pubkey,
+  content: content,
+  createdAt: createdAt,
+  channelId: channelId,
+  channelName: '',
+  tags: tags,
+  category: category,
+);
+
+List<List<String>> replyTags(String rootId, String parentId) => [
+  ['e', rootId, '', 'root'],
+  ['e', parentId, '', 'reply'],
+];
+
+void main() {
+  group('inboxConversationId', () {
+    test('uses root id when present', () {
+      expect(
+        inboxConversationId(replyTags('root1', 'parent1'), 'ev1'),
+        'root1',
+      );
+    });
+
+    test('falls back to parent id without a root tag', () {
+      expect(
+        inboxConversationId([
+          ['e', 'parent1', '', 'reply'],
+        ], 'ev1'),
+        'parent1',
+      );
+    });
+
+    test('falls back to the event id for top-level messages', () {
+      expect(inboxConversationId(const [], 'ev1'), 'ev1');
+    });
+  });
+
+  group('isThreadReply', () {
+    test('true for reply-tagged events', () {
+      expect(isThreadReply(replyTags('r', 'p')), isTrue);
+    });
+
+    test('false for broadcast replies', () {
+      expect(
+        isThreadReply([
+          ...replyTags('r', 'p'),
+          ['broadcast', '1'],
+        ]),
+        isFalse,
+      );
+    });
+
+    test('false for top-level messages', () {
+      expect(isThreadReply(const []), isFalse);
+    });
+  });
+
+  group('buildInboxItems', () {
+    test('groups thread events into one conversation row', () {
+      final rows = buildInboxItems([
+        item(id: 'a', createdAt: 10, tags: replyTags('root1', 'root1')),
+        item(id: 'b', createdAt: 20, tags: replyTags('root1', 'a')),
+        item(id: 'c', createdAt: 15),
+      ]);
+
+      expect(rows, hasLength(2));
+      final threadRow = rows.firstWhere((r) => r.conversationId == 'root1');
+      expect(threadRow.id, 'b'); // latest event represents the row
+      expect(threadRow.groupItems, hasLength(2));
+      expect(threadRow.latestActivityAt, 20);
+      expect(threadRow.threadRootId, 'root1');
+    });
+
+    test('sorts rows by latest activity, newest first', () {
+      final rows = buildInboxItems([
+        item(id: 'old', createdAt: 10),
+        item(id: 'new', createdAt: 99),
+      ]);
+      expect(rows.map((r) => r.id).toList(), ['new', 'old']);
+    });
+
+    test('groups ordinary top-level DM messages into one row per DM', () {
+      bool isDm(String channelId) => channelId == 'dm1';
+      final rows = buildInboxItems([
+        // Three top-level messages (no thread tags) in the same DM.
+        item(id: 'd1', createdAt: 10, channelId: 'dm1', category: 'activity'),
+        item(id: 'd2', createdAt: 20, channelId: 'dm1', category: 'activity'),
+        item(id: 'd3', createdAt: 30, channelId: 'dm1', category: 'activity'),
+        // Ordinary top-level channel posts still group per event.
+        item(id: 'c1', createdAt: 40, channelId: 'ch1'),
+        item(id: 'c2', createdAt: 50, channelId: 'ch1'),
+      ], isDmChannel: isDm);
+
+      expect(rows, hasLength(3));
+      final dmRow = rows.singleWhere((r) => r.conversationId == 'dm:dm1');
+      expect(dmRow.groupItems, hasLength(3));
+      expect(dmRow.id, 'd3'); // latest DM message represents the row
+      expect(dmRow.latestActivityAt, 30);
+    });
+
+    test('thread replies inside a DM still group by thread root', () {
+      bool isDm(String channelId) => channelId == 'dm1';
+      final rows = buildInboxItems([
+        item(id: 'top', createdAt: 10, channelId: 'dm1'),
+        item(
+          id: 'reply',
+          createdAt: 20,
+          channelId: 'dm1',
+          tags: replyTags('top', 'top'),
+        ),
+      ], isDmChannel: isDm);
+
+      expect(rows, hasLength(2));
+      expect(rows.map((r) => r.conversationId).toSet(), {'dm:dm1', 'top'});
+    });
+
+    test('categories are priority sorted and set isActionRequired', () {
+      final rows = buildInboxItems([
+        item(
+          id: 'a',
+          createdAt: 10,
+          category: 'activity',
+          tags: replyTags('root1', 'root1'),
+        ),
+        item(
+          id: 'b',
+          createdAt: 20,
+          category: 'needs_action',
+          tags: replyTags('root1', 'a'),
+        ),
+      ]);
+      expect(rows.single.categories.first, 'needs_action');
+      expect(rows.single.isActionRequired, isTrue);
+    });
+  });
+
+  group('InboxItem.deepLinkTarget', () {
+    final rows = buildInboxItems([
+      item(id: 'a', createdAt: 10, tags: replyTags('root1', 'root1')),
+      item(id: 'b', createdAt: 20, tags: replyTags('root1', 'a')),
+      item(id: 'c', createdAt: 30, tags: replyTags('root1', 'b')),
+    ]);
+
+    test('targets the oldest unread event', () {
+      expect(rows.single.deepLinkTarget(15).id, 'b');
+    });
+
+    test('targets the oldest event when nothing is read', () {
+      expect(rows.single.deepLinkTarget(5).id, 'a');
+    });
+
+    test('falls back to the latest event when all are read', () {
+      expect(rows.single.deepLinkTarget(99).id, 'c');
+    });
+
+    test('falls back to the latest event without a read marker', () {
+      expect(rows.single.deepLinkTarget(null).id, 'c');
+    });
+  });
+
+  group('matchesInboxFilter', () {
+    InboxItem rowOf(FeedItem feedItem) => buildInboxItems([feedItem]).single;
+
+    test('all matches everything', () {
+      expect(matchesInboxFilter(rowOf(item(id: 'a')), InboxFilter.all), isTrue);
+    });
+
+    test('thread filter needs a thread reply in the group', () {
+      expect(
+        matchesInboxFilter(rowOf(item(id: 'a')), InboxFilter.thread),
+        isFalse,
+      );
+      expect(
+        matchesInboxFilter(
+          rowOf(item(id: 'a', tags: replyTags('r', 'p'))),
+          InboxFilter.thread,
+        ),
+        isTrue,
+      );
+    });
+
+    test('category filters match their category', () {
+      final mention = rowOf(item(id: 'a', category: 'mention'));
+      expect(matchesInboxFilter(mention, InboxFilter.mention), isTrue);
+      expect(matchesInboxFilter(mention, InboxFilter.needsAction), isFalse);
+      expect(matchesInboxFilter(mention, InboxFilter.activity), isFalse);
+      expect(
+        matchesInboxFilter(
+          rowOf(item(id: 'b', category: 'agent_activity')),
+          InboxFilter.agentActivity,
+        ),
+        isTrue,
+      );
+    });
+
+    test('reminders and drafts are separate surfaces', () {
+      final row = rowOf(item(id: 'a'));
+      expect(matchesInboxFilter(row, InboxFilter.reminders), isFalse);
+      expect(matchesInboxFilter(row, InboxFilter.drafts), isFalse);
+    });
+  });
+
+  group('inboxTypeLabel', () {
+    InboxItem rowOf(FeedItem feedItem) => buildInboxItems([feedItem]).single;
+
+    test('DM rows lead with the sender', () {
+      final label = inboxTypeLabel(
+        rowOf(item(id: 'a', category: 'activity')),
+        channelName: null,
+        isDm: true,
+        senderLabel: 'Alice',
+      );
+      expect(label.text, 'DM from Alice');
+      expect(label.channelLabel, isNull);
+    });
+
+    test('mention rows say Mentioned in #channel', () {
+      final label = inboxTypeLabel(
+        rowOf(item(id: 'a', category: 'mention')),
+        channelName: 'general',
+        isDm: false,
+        senderLabel: 'Alice',
+      );
+      expect(label.text, 'Mentioned in');
+      expect(label.channelLabel, 'general');
+    });
+
+    test('needs action wins over thread context', () {
+      final label = inboxTypeLabel(
+        rowOf(
+          item(id: 'a', category: 'needs_action', tags: replyTags('r', 'p')),
+        ),
+        channelName: 'general',
+        isDm: false,
+        senderLabel: 'Alice',
+      );
+      expect(label.text, 'Needs action in');
+    });
+
+    test('plain thread replies say Thread in', () {
+      final label = inboxTypeLabel(
+        rowOf(item(id: 'a', category: 'activity', tags: replyTags('r', 'p'))),
+        channelName: 'general',
+        isDm: false,
+        senderLabel: 'Alice',
+      );
+      expect(label.text, 'Thread in');
+    });
+  });
+
+  group('inboxDayLabel', () {
+    final now = DateTime(2026, 7, 25, 12);
+    int at(DateTime d) => d.millisecondsSinceEpoch ~/ 1000;
+
+    test('today / yesterday / weekday / date buckets', () {
+      expect(inboxDayLabel(at(DateTime(2026, 7, 25, 9)), now: now), 'Today');
+      expect(
+        inboxDayLabel(at(DateTime(2026, 7, 24, 9)), now: now),
+        'Yesterday',
+      );
+      expect(inboxDayLabel(at(DateTime(2026, 7, 21, 9)), now: now), 'Tuesday');
+      expect(inboxDayLabel(at(DateTime(2026, 1, 2)), now: now), 'Jan 2');
+      expect(
+        inboxDayLabel(at(DateTime(2025, 12, 31)), now: now),
+        'Dec 31, 2025',
+      );
+    });
+  });
+}
diff --git a/mobile/test/features/activity/inbox_read_state_test.dart b/mobile/test/features/activity/inbox_read_state_test.dart
new file mode 100644
index 0000000000..af8f3b9091
--- /dev/null
+++ b/mobile/test/features/activity/inbox_read_state_test.dart
@@ -0,0 +1,138 @@
+import 'package:buzz/features/activity/feed_item.dart';
+import 'package:buzz/features/activity/inbox_item.dart';
+import 'package:buzz/features/activity/inbox_read_state.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+FeedItem item({
+  required String id,
+  int createdAt = 100,
+  String category = 'mention',
+  String? channelId = 'ch1',
+  List<List<String>> tags = const [],
+}) => FeedItem(
+  id: id,
+  kind: 9,
+  pubkey: 'pk1',
+  content: 'hello',
+  createdAt: createdAt,
+  channelId: channelId,
+  channelName: '',
+  tags: tags,
+  category: category,
+);
+
+List<List<String>> replyTags(String rootId, String parentId) => [
+  ['e', rootId, '', 'root'],
+  ['e', parentId, '', 'reply'],
+];
+
+int? Function(String) markers(Map<String, int> map) =>
+    (contextId) => map[contextId];
+
+void main() {
+  group('resolveInboxItemReadAt', () {
+    test('channel rows use the channel marker', () {
+      final row = buildInboxItems([item(id: 'a')]).single;
+      expect(resolveInboxItemReadAt(row, markerOf: markers({'ch1': 42})), 42);
+    });
+
+    test('thread rows use max of thread and msg markers', () {
+      final row = buildInboxItems([
+        item(id: 'a', tags: replyTags('root1', 'root1')),
+      ]).single;
+      expect(
+        resolveInboxItemReadAt(
+          row,
+          markerOf: markers({'thread:root1': 10, 'msg:a': 25}),
+        ),
+        25,
+      );
+    });
+
+    test('channel-less rows have no marker', () {
+      final row = buildInboxItems([item(id: 'a', channelId: null)]).single;
+      expect(resolveInboxItemReadAt(row, markerOf: markers({})), isNull);
+    });
+  });
+
+  group('isInboxItemDone', () {
+    test('done when no grouped activity is newer than the marker', () {
+      final row = buildInboxItems([item(id: 'a', createdAt: 50)]).single;
+      expect(
+        isInboxItemDone(
+          row,
+          markerOf: markers({'ch1': 50}),
+          localUnreadOverrides: const {},
+          localDoneSet: const {},
+        ),
+        isTrue,
+      );
+      expect(
+        isInboxItemDone(
+          row,
+          markerOf: markers({'ch1': 49}),
+          localUnreadOverrides: const {},
+          localDoneSet: const {},
+        ),
+        isFalse,
+      );
+    });
+
+    test('a local unread override always wins', () {
+      final row = buildInboxItems([item(id: 'a', createdAt: 50)]).single;
+      expect(
+        isInboxItemDone(
+          row,
+          markerOf: markers({'ch1': 99}),
+          localUnreadOverrides: const {'a'},
+          localDoneSet: const {},
+        ),
+        isFalse,
+      );
+    });
+
+    test('channel-less rows fall back to the local done set', () {
+      final row = buildInboxItems([item(id: 'a', channelId: null)]).single;
+      expect(
+        isInboxItemDone(
+          row,
+          markerOf: markers({}),
+          localUnreadOverrides: const {},
+          localDoneSet: const {},
+        ),
+        isFalse,
+      );
+      expect(
+        isInboxItemDone(
+          row,
+          markerOf: markers({}),
+          localUnreadOverrides: const {},
+          localDoneSet: const {'a'},
+        ),
+        isTrue,
+      );
+    });
+  });
+
+  group('groupedChannelReadTimestamp', () {
+    test('only counts top-level events in the channel', () {
+      final row = buildInboxItems([
+        item(id: 'a', createdAt: 10, tags: replyTags('root1', 'root1')),
+        item(id: 'b', createdAt: 30, tags: replyTags('root1', 'a')),
+      ]).single;
+      // Every grouped event is a thread reply, so marking the thread read
+      // must not advance the channel marker.
+      expect(groupedChannelReadTimestamp(row), isNull);
+    });
+
+    test('returns the newest top-level timestamp', () {
+      final row = buildInboxItems([
+        item(id: 'root1', createdAt: 10),
+        item(id: 'b', createdAt: 30, tags: replyTags('root1', 'root1')),
+      ]).single;
+      final result = groupedChannelReadTimestamp(row);
+      expect(result?.channelId, 'ch1');
+      expect(result?.timestamp, 10);
+    });
+  });
+}
diff --git a/mobile/test/features/activity/reminders_provider_test.dart b/mobile/test/features/activity/reminders_provider_test.dart
new file mode 100644
index 0000000000..f622322de0
--- /dev/null
+++ b/mobile/test/features/activity/reminders_provider_test.dart
@@ -0,0 +1,127 @@
+import 'dart:convert';
+
+import 'package:buzz/features/activity/reminders_provider.dart';
+import 'package:buzz/shared/relay/relay.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+NostrEvent reminderEvent({
+  List<List<String>> tags = const [],
+  String content = 'ciphertext',
+  int createdAt = 100,
+}) => NostrEvent(
+  id: 'ev1',
+  pubkey: 'pk1',
+  createdAt: createdAt,
+  kind: kindEventReminder,
+  tags: tags,
+  content: content,
+  sig: '',
+);
+
+void main() {
+  group('parseNotBefore', () {
+    test('accepts plain unix seconds', () {
+      expect(parseNotBefore('1753400000'), 1753400000);
+      expect(parseNotBefore('0'), 0);
+    });
+
+    test('rejects malformed values', () {
+      expect(parseNotBefore('01'), isNull);
+      expect(parseNotBefore('-5'), isNull);
+      expect(parseNotBefore('12.5'), isNull);
+      expect(parseNotBefore('abc'), isNull);
+      expect(parseNotBefore(''), isNull);
+    });
+  });
+
+  group('parseReminderContent', () {
+    test('parses a well-formed reminder with target', () {
+      final parsed = parseReminderContent(
+        jsonEncode({
+          'status': 'pending',
+          'note': 'follow up',
+          'target': {
+            'eventId': 'ev1',
+            'channelId': 'ch1',
+            'preview': 'hello',
+            'authorPubkey': 'pk1',
+          },
+        }),
+      );
+      expect(parsed, isNotNull);
+      expect(parsed!.status, 'pending');
+      expect(parsed.note, 'follow up');
+      expect(parsed.target?.eventId, 'ev1');
+      expect(parsed.target?.channelId, 'ch1');
+    });
+
+    test('accepts a note-only reminder', () {
+      final parsed = parseReminderContent(
+        jsonEncode({'status': 'pending', 'note': 'water plants'}),
+      );
+      expect(parsed?.note, 'water plants');
+      expect(parsed?.target, isNull);
+    });
+
+    test('fails closed on off-shape content', () {
+      expect(parseReminderContent('not json'), isNull);
+      expect(parseReminderContent('[]'), isNull);
+      expect(parseReminderContent(jsonEncode({'status': 'snoozed'})), isNull);
+      // No target and no note is meaningless.
+      expect(parseReminderContent(jsonEncode({'status': 'pending'})), isNull);
+      // Target missing required fields.
+      expect(
+        parseReminderContent(
+          jsonEncode({
+            'status': 'pending',
+            'target': {'eventId': 'ev1'},
+          }),
+        ),
+        isNull,
+      );
+    });
+  });
+
+  group('decodeReminderEvent', () {
+    final plaintext = jsonEncode({'status': 'pending', 'note': 'hi'});
+
+    test('decodes d-tag, not_before, and decrypted content', () {
+      final reminder = decodeReminderEvent(
+        reminderEvent(
+          tags: [
+            ['d', 'rem1'],
+            ['not_before', '1753400000'],
+          ],
+        ),
+        decrypt: (_) => plaintext,
+      );
+      expect(reminder, isNotNull);
+      expect(reminder!.id, 'rem1');
+      expect(reminder.notBefore, 1753400000);
+      expect(reminder.status, 'pending');
+      expect(reminder.isDue(1753400001), isTrue);
+      expect(reminder.isDue(1753399999), isFalse);
+    });
+
+    test('requires a d tag', () {
+      expect(
+        decodeReminderEvent(reminderEvent(), decrypt: (_) => plaintext),
+        isNull,
+      );
+    });
+
+    test('fails closed when decryption throws', () {
+      expect(
+        decodeReminderEvent(
+          reminderEvent(
+            tags: [
+              ['d', 'rem1'],
+            ],
+          ),
+          decrypt: (_) => throw StateError('bad ciphertext'),
+        ),
+        isNull,
+      );
+    });
+  });
+}
diff --git a/mobile/test/features/channels/camera_capture_cleanup_test.dart b/mobile/test/features/channels/camera_capture_cleanup_test.dart
index 2b5360035d..17d96b0d5b 100644
--- a/mobile/test/features/channels/camera_capture_cleanup_test.dart
+++ b/mobile/test/features/channels/camera_capture_cleanup_test.dart
@@ -32,4 +32,23 @@ void main() {
 
     expect(await file.exists(), isFalse);
   });
+
+  test('deletes every native picker file after processing', () async {
+    final suffix = DateTime.now().microsecondsSinceEpoch;
+    final files = [
+      File('${Directory.systemTemp.path}/buzz-photo-$suffix-1.jpg'),
+      File('${Directory.systemTemp.path}/buzz-photo-$suffix-2.jpg'),
+    ];
+    for (final file in files) {
+      await file.writeAsBytes([1, 2, 3]);
+    }
+
+    await processTemporaryImages([
+      for (final file in files) XFile(file.path),
+    ], (_) async {});
+
+    for (final file in files) {
+      expect(await file.exists(), isFalse);
+    }
+  });
 }
diff --git a/mobile/test/features/channels/channel_detail_page_test.dart b/mobile/test/features/channels/channel_detail_page_test.dart
index 01fae2b799..127e6851e6 100644
--- a/mobile/test/features/channels/channel_detail_page_test.dart
+++ b/mobile/test/features/channels/channel_detail_page_test.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart' show ScrollDirection;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
@@ -25,9 +26,15 @@ import 'package:buzz/features/profile/user_cache_provider.dart';
 import 'package:buzz/features/profile/user_profile.dart';
 import 'package:buzz/shared/relay/relay.dart';
 import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/skeleton.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 const _channelId = 'test-channel';
 
+/// Shared mock prefs for providers that read [savedPrefsProvider]
+/// (e.g. the compose bar's draft store). Initialized in [main].
+late SharedPreferences _testPrefs;
+
 final _testChannel = Channel(
   id: _channelId,
   name: 'general',
@@ -143,7 +150,11 @@ Widget _buildTestable({
   ReadStateNotifier? readStateNotifier,
   _FakeMessagesNotifier? messagesNotifier,
   String? canvasContent,
-  List<NostrEvent>? threadReplies,
+  String? initialMessageId,
+  String? initialThreadRootId,
+  Map<String, List<NostrEvent>> threadReplies = const {},
+  TextScaler textScaler = TextScaler.noScaling,
+  RelaySessionNotifier? relaySessionNotifier,
 }) {
   final resolvedChannel = channel ?? _testChannel;
   final fakeChannelsNotifier =
@@ -178,19 +189,31 @@ Widget _buildTestable({
         channelActionsProvider.overrideWith(createChannelActions),
       if (readStateNotifier != null)
         readStateProvider.overrideWith(() => readStateNotifier),
-      if (threadReplies != null)
+      for (final entry in threadReplies.entries)
         threadRepliesProvider(
-          const ThreadRepliesArgs(channelId: _channelId, rootId: 'thread-root'),
-        ).overrideWith((ref) async => threadReplies),
+          ThreadRepliesArgs(channelId: _channelId, rootId: entry.key),
+        ).overrideWith((ref) async => entry.value),
       // Stub the relay client provider so preloadMembers doesn't crash.
       relayClientProvider.overrideWithValue(
         RelayClient(baseUrl: 'http://localhost:3000'),
       ),
+      if (relaySessionNotifier != null)
+        relaySessionProvider.overrideWith(() => relaySessionNotifier),
+      // Compose bar drafts persist through SharedPreferences.
+      savedPrefsProvider.overrideWithValue(_testPrefs),
     ],
     child: MaterialApp(
       theme: AppTheme.light(),
+      builder: (context, child) => MediaQuery(
+        data: MediaQuery.of(context).copyWith(textScaler: textScaler),
+        child: child!,
+      ),
       navigatorObservers: navigatorObservers,
-      home: ChannelDetailPage(channel: resolvedChannel),
+      home: ChannelDetailPage(
+        channel: resolvedChannel,
+        initialMessageId: initialMessageId,
+        initialThreadRootId: initialThreadRootId,
+      ),
     ),
   );
 }
@@ -222,7 +245,181 @@ double? effectiveFontSizeForText(
 }
 
 void main() {
+  setUp(() async {
+    SharedPreferences.setMockInitialValues({});
+    _testPrefs = await SharedPreferences.getInstance();
+  });
+
   group('ChannelDetailPage', () {
+    testWidgets('debounces same-slot reconnect skeletons before revealing', (
+      tester,
+    ) async {
+      final relaySession = _ReconnectingRelaySession();
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: [
+            _textMsg(id: 'msg1', pubkey: 'alice', content: 'Existing message'),
+          ],
+          relaySessionNotifier: relaySession,
+          readStateNotifier: _SynchronousReadStateNotifier(
+            const ReadStateState(
+              isReady: false,
+              pubkey: 'self',
+              contexts: {},
+              version: 0,
+            ),
+          ),
+        ),
+      );
+      await tester.pump();
+
+      expect(find.text('Existing message'), findsOneWidget);
+      expect(
+        tester.widget<SkeletonReveal>(find.byType(SkeletonReveal)).loading,
+        isFalse,
+      );
+
+      await tester.pump(const Duration(milliseconds: 1999));
+      expect(
+        tester.widget<SkeletonReveal>(find.byType(SkeletonReveal)).loading,
+        isFalse,
+      );
+
+      await tester.pump(const Duration(milliseconds: 1));
+      await tester.pump();
+      final skeleton = find.byKey(
+        const Key('channel-detail-connection-skeleton'),
+      );
+      expect(skeleton, findsOneWidget);
+      expect(
+        find.descendant(of: skeleton, matching: find.byType(SkeletonBar)),
+        findsWidgets,
+      );
+      expect(find.text('Existing message'), findsOneWidget);
+      expect(find.byType(CircularProgressIndicator), findsNothing);
+      expect(
+        tester
+            .widget<Opacity>(
+              find.byKey(const Key('skeleton-reveal-placeholder')),
+            )
+            .opacity,
+        1,
+      );
+
+      relaySession.connect();
+      await tester.pump();
+      await tester.pump();
+      expect(
+        tester.widget<SkeletonReveal>(find.byType(SkeletonReveal)).loading,
+        isFalse,
+      );
+      await tester.pump(const Duration(milliseconds: 200));
+
+      expect(
+        tester
+            .widget<Opacity>(
+              find.byKey(const Key('skeleton-reveal-placeholder')),
+            )
+            .opacity,
+        closeTo(0.5, 0.01),
+      );
+      expect(
+        tester
+            .widget<Opacity>(find.byKey(const Key('skeleton-reveal-content')))
+            .opacity,
+        closeTo(0.5, 0.01),
+      );
+
+      await tester.pump(const Duration(milliseconds: 200));
+      expect(
+        tester
+            .widget<Opacity>(find.byKey(const Key('skeleton-reveal-content')))
+            .opacity,
+        1,
+      );
+    });
+
+    testWidgets('shows the first-load connection skeleton immediately', (
+      tester,
+    ) async {
+      final relaySession = _ReconnectingRelaySession();
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: const [],
+          messagesNotifier: _FakeMessagesNotifier(
+            const [],
+            hasLoadedMessages: false,
+          ),
+          relaySessionNotifier: relaySession,
+        ),
+      );
+      await tester.pump();
+
+      expect(
+        tester.widget<SkeletonReveal>(find.byType(SkeletonReveal)).loading,
+        isTrue,
+      );
+      expect(
+        tester
+            .widget<Opacity>(
+              find.byKey(const Key('skeleton-reveal-placeholder')),
+            )
+            .opacity,
+        1,
+      );
+      expect(
+        tester
+            .widget<Semantics>(
+              find.byKey(const Key('channel-detail-connection-skeleton')),
+            )
+            .properties
+            .label,
+        'Reconnecting',
+      );
+    });
+
+    testWidgets('keeps forum content visible with reconnect shimmer feedback', (
+      tester,
+    ) async {
+      final relaySession = _ReconnectingRelaySession();
+      final forumChannel = Channel(
+        id: _channelId,
+        name: 'design-forum',
+        channelType: 'forum',
+        visibility: 'open',
+        description: 'Talk through design changes',
+        createdBy: 'abc123',
+        createdAt: DateTime(2025),
+        memberCount: 5,
+        isMember: true,
+      );
+
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: const [],
+          channel: forumChannel,
+          relaySessionNotifier: relaySession,
+        ),
+      );
+      await tester.pump();
+
+      expect(find.byType(SkeletonReveal), findsNothing);
+      expect(find.byKey(const Key('forum-connection-skeleton')), findsNothing);
+
+      await tester.pump(const Duration(milliseconds: 1999));
+      expect(find.byKey(const Key('forum-connection-skeleton')), findsNothing);
+
+      await tester.pump(const Duration(milliseconds: 1));
+      await tester.pump();
+      final skeleton = find.byKey(const Key('forum-connection-skeleton'));
+      expect(skeleton, findsOneWidget);
+      expect(
+        find.descendant(of: skeleton, matching: find.byType(SkeletonBar)),
+        findsWidgets,
+      );
+      expect(find.byType(SkeletonReveal), findsNothing);
+    });
+
     testWidgets('defers read-state mark until after build', (tester) async {
       final readState = _SynchronousReadStateNotifier(
         const ReadStateState(
@@ -483,7 +680,11 @@ void main() {
         _buildTestable(
           messages: messages,
           users: {
-            'alice': const UserProfile(pubkey: 'alice', displayName: 'Alice'),
+            'alice': const UserProfile(
+              pubkey: 'alice',
+              displayName: 'Alice',
+              nip05Handle: 'alice@example.com',
+            ),
             'bob': const UserProfile(pubkey: 'bob', displayName: 'Bob'),
           },
         ),
@@ -493,32 +694,118 @@ void main() {
       expect(findRichText('Hello world!'), findsOneWidget);
       expect(findRichText('Hey Alice!'), findsOneWidget);
       expect(find.text('Alice'), findsOneWidget);
+      expect(find.text('alice@example.com'), findsOneWidget);
       expect(find.text('Bob'), findsOneWidget);
       final messageAvatars = find.byType(CircleAvatar);
       expect(messageAvatars, findsNWidgets(2));
       for (final avatar in messageAvatars.evaluate()) {
         expect(
           tester.getSize(find.byWidget(avatar.widget)),
-          const Size.square(36),
+          const Size.square(messageAvatarSize),
         );
       }
       final aliceName = find.text('Alice');
       final aliceText = tester.widget<Text>(aliceName);
-      final titleStyle = Theme.of(
-        tester.element(aliceName),
-      ).textTheme.titleSmall;
-      expect(aliceText.style?.fontSize, titleStyle?.fontSize);
+      expect(aliceText.style?.fontSize, messageUsernameTextStyle.fontSize);
+      expect(aliceText.style?.fontWeight, messageUsernameTextStyle.fontWeight);
+      expect(aliceText.style?.height, messageUsernameTextStyle.height);
+      final aliceUsername = tester.widget<Text>(
+        find.byKey(const ValueKey('message-username-msg1')),
+      );
+      final aliceTimestamp = tester.widget<Text>(
+        find.byKey(const ValueKey('message-timestamp-msg1')),
+      );
+      expect(aliceUsername.style?.fontSize, messageMetadataTextStyle.fontSize);
+      expect(aliceUsername.style?.fontWeight, FontWeight.w400);
+      expect(aliceUsername.style?.height, messageMetadataTextStyle.height);
+      expect(aliceTimestamp.style?.fontSize, messageMetadataTextStyle.fontSize);
+      expect(aliceTimestamp.style?.fontWeight, FontWeight.w400);
       final helloContent = findRichText('Hello world!');
       final helloText = tester.widget<RichText>(helloContent);
-      final bodyStyle = Theme.of(
-        tester.element(helloContent),
-      ).textTheme.bodyLarge;
       expect(
         effectiveFontSizeForText(helloText.text, 'Hello world!'),
-        bodyStyle?.fontSize,
+        messageBodyTextStyle.fontSize,
+      );
+      final messageList = tester.widget<ScrollablePositionedList>(
+        find.byKey(const ValueKey('channel-message-list')),
+      );
+      expect(messageList.padding!.bottom, 0);
+      final newestMessageGroup = tester.widget<Padding>(
+        find.byKey(const ValueKey('channel-message-group-msg2')),
+      );
+      expect(
+        newestMessageGroup.padding,
+        const EdgeInsets.only(bottom: Grid.xs),
+      );
+      expect(
+        find.byKey(const ValueKey('channel-jump-to-latest')),
+        findsNothing,
+      );
+      await tester.tap(find.text('Message #general'));
+      await tester.pumpAndSettle();
+      expect(
+        find.byKey(const ValueKey('channel-jump-to-latest')),
+        findsNothing,
       );
     });
 
+    testWidgets(
+      'keeps image galleries body-aligned and flush with the trailing edge',
+      (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: 'gallery',
+                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();
+
+        final carousel = find.byKey(const ValueKey('message-media-carousel'));
+        final imageCount = find.byKey(
+          const ValueKey('message-media-carousel-count'),
+        );
+        final carouselRect = tester.getRect(carousel);
+        final imageCountRect = tester.getRect(imageCount);
+
+        expect(carouselRect.left, imageCountRect.left);
+        expect(carouselRect.right, tester.view.physicalSize.width);
+        expect(carouselRect.top - imageCountRect.bottom, Grid.half + 2);
+
+        final messageMaterial = find
+            .ancestor(
+              of: find.byKey(const ValueKey('message-row-gallery')),
+              matching: find.byType(Material),
+            )
+            .first;
+        expect(
+          tester.widget<Material>(messageMaterial).clipBehavior,
+          Clip.none,
+        );
+      },
+    );
+
     testWidgets('uses larger participant avatars in reply summaries', (
       tester,
     ) async {
@@ -570,9 +857,62 @@ void main() {
           const Size.square(32),
         );
       }
+      final summaryPadding = tester.widget<Padding>(
+        find.byKey(const ValueKey('thread-summary-root')),
+      );
+      expect(
+        summaryPadding.padding,
+        const EdgeInsets.only(
+          left: messageAvatarSize + messageAvatarContentGap,
+          top: Grid.half,
+          bottom: Grid.xs,
+        ),
+      );
     });
 
-    testWidgets('can jump back to latest when newer messages are offscreen', (
+    testWidgets('constrains reply summaries at accessibility text sizes', (
+      tester,
+    ) async {
+      tester.view.physicalSize = const Size(400, 800);
+      tester.view.devicePixelRatio = 1;
+      addTearDown(tester.view.resetPhysicalSize);
+      addTearDown(tester.view.resetDevicePixelRatio);
+
+      final lastReplyAt =
+          DateTime.now().millisecondsSinceEpoch ~/ 1000 - 59 * 60;
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: [
+            _textMsg(
+              id: 'root',
+              pubkey: 'alice',
+              content: 'Thread head',
+              createdAt: lastReplyAt - 300,
+            ),
+            for (var i = 0; i < 3; i++)
+              _textMsg(
+                id: 'reply-$i',
+                pubkey: 'participant-$i',
+                content: 'Reply $i',
+                createdAt: lastReplyAt - 2 + i,
+                extraTags: const [
+                  ['e', 'root', '', 'reply'],
+                ],
+              ),
+          ],
+          channel: _testChannel.copyWith(archivedAt: DateTime.now()),
+          textScaler: const TextScaler.linear(2),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final summaryText = tester.widget<RichText>(findRichText('3 replies'));
+      expect(summaryText.maxLines, 2);
+      expect(summaryText.overflow, TextOverflow.ellipsis);
+      expect(tester.takeException(), isNull);
+    });
+
+    testWidgets('can jump back to latest after a non-drag user scroll', (
       tester,
     ) async {
       final initialMessages = [
@@ -597,9 +937,21 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      final listView = tester.widget<ScrollablePositionedList>(
-        find.byKey(const ValueKey('channel-message-list')),
-      );
+      final messageList = find.byKey(const ValueKey('channel-message-list'));
+      final messageListElement = tester.element(messageList);
+      UserScrollNotification(
+        metrics: FixedScrollMetrics(
+          minScrollExtent: 0,
+          maxScrollExtent: 100,
+          pixels: 0,
+          viewportDimension: 100,
+          axisDirection: AxisDirection.down,
+          devicePixelRatio: 1,
+        ),
+        context: messageListElement,
+        direction: ScrollDirection.reverse,
+      ).dispatch(messageListElement);
+      final listView = tester.widget<ScrollablePositionedList>(messageList);
       listView.itemScrollController!.jumpTo(index: 39);
       await tester.pumpAndSettle();
       expect(
@@ -625,6 +977,185 @@ void main() {
       expect(findRichText('Newest live update'), findsOneWidget);
     });
 
+    testWidgets(
+      'keeps follow mode off while a tall newest message stays visible',
+      (tester) async {
+        tester.view.physicalSize = const Size(400, 600);
+        tester.view.devicePixelRatio = 1;
+        addTearDown(tester.view.resetPhysicalSize);
+        addTearDown(tester.view.resetDevicePixelRatio);
+
+        final tallMessage = List.generate(
+          12,
+          (index) => 'Newest message line $index',
+        ).join('\n');
+        final initialMessages = [
+          for (var i = 0; i < 12; i++)
+            _textMsg(
+              id: 'msg$i',
+              pubkey: i.isEven ? 'alice' : 'bob',
+              content: 'Message $i',
+              createdAt: 1000 + i * 1000,
+            ),
+          _textMsg(
+            id: 'tall-newest',
+            pubkey: 'alice',
+            content: tallMessage,
+            createdAt: 20_000,
+          ),
+        ];
+        final messagesNotifier = _FakeMessagesNotifier(initialMessages);
+
+        await tester.pumpWidget(
+          _buildTestable(
+            messages: const [],
+            messagesNotifier: messagesNotifier,
+            users: const {
+              'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+              'bob': UserProfile(pubkey: 'bob', displayName: 'Bob'),
+            },
+          ),
+        );
+        await tester.pumpAndSettle();
+
+        final messageList = find.byKey(const ValueKey('channel-message-list'));
+        await tester.drag(messageList, const Offset(0, 120));
+        await tester.pumpAndSettle();
+
+        expect(findRichText('Newest message line 0'), findsOneWidget);
+        expect(
+          find.byKey(const ValueKey('channel-jump-to-latest')),
+          findsOneWidget,
+        );
+
+        messagesNotifier.setMessages([
+          ...initialMessages,
+          _textMsg(
+            id: 'newest-live',
+            pubkey: 'alice',
+            content: 'Newest live update',
+            createdAt: 30_000,
+          ),
+        ]);
+        await tester.pumpAndSettle();
+
+        expect(findRichText('Newest live update'), findsNothing);
+        expect(
+          find.byKey(const ValueKey('channel-jump-to-latest')),
+          findsOneWidget,
+        );
+      },
+    );
+
+    testWidgets('preserves an initial message deep-link position', (
+      tester,
+    ) async {
+      final initialMessages = [
+        for (var i = 0; i < 40; i++)
+          _textMsg(
+            id: 'msg$i',
+            pubkey: 'alice',
+            content: 'Message $i',
+            createdAt: 1000 + i,
+          ),
+      ];
+      final messagesNotifier = _FakeMessagesNotifier(initialMessages);
+
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: const [],
+          messagesNotifier: messagesNotifier,
+          initialMessageId: 'msg5',
+          users: const {
+            'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(findRichText('Message 5'), findsOneWidget);
+      expect(findRichText('Message 39'), findsNothing);
+      expect(
+        find.byKey(const ValueKey('channel-jump-to-latest')),
+        findsOneWidget,
+      );
+
+      messagesNotifier.setMessages([
+        ...initialMessages,
+        _textMsg(
+          id: 'newest',
+          pubkey: 'alice',
+          content: 'Newest live update',
+          createdAt: 2000,
+        ),
+      ]);
+      await tester.pumpAndSettle();
+
+      expect(findRichText('Message 5'), findsOneWidget);
+      expect(findRichText('Newest live update'), findsNothing);
+    });
+
+    testWidgets(
+      'keeps a deep-linked message in view when its page arrives after a '
+      'small scroll near the latest message',
+      (tester) async {
+        tester.view.physicalSize = const Size(400, 800);
+        tester.view.devicePixelRatio = 1;
+        addTearDown(tester.view.resetPhysicalSize);
+        addTearDown(tester.view.resetDevicePixelRatio);
+
+        // The deep-link target lives in an older page that has not loaded yet.
+        final messagesNotifier = _FakeMessagesNotifier([
+          for (var i = 30; i < 60; i++)
+            _textMsg(
+              id: 'msg$i',
+              pubkey: 'alice',
+              content: 'Message $i',
+              createdAt: 1000 + i * 1000,
+            ),
+        ]);
+
+        await tester.pumpWidget(
+          _buildTestable(
+            messages: const [],
+            messagesNotifier: messagesNotifier,
+            initialMessageId: 'msg3',
+            users: const {
+              'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+            },
+          ),
+        );
+        await tester.pumpAndSettle();
+
+        // Small scrolls that keep the newest message visible, so isAtLatest
+        // stays true while the scroll offset becomes non-zero. This lets a
+        // later programmatic jumpTo dispatch ScrollEndNotification.
+        for (final dy in const [10.0, 20.0, 30.0]) {
+          await tester.drag(
+            find.byKey(const ValueKey('channel-message-list')),
+            Offset(0, dy),
+          );
+          await tester.pumpAndSettle();
+        }
+
+        // The older page containing the deep-link target arrives.
+        messagesNotifier.setMessages([
+          for (var i = 0; i < 60; i++)
+            _textMsg(
+              id: 'msg$i',
+              pubkey: 'alice',
+              content: 'Message $i',
+              createdAt: 1000 + i * 1000,
+            ),
+        ]);
+        await tester.pumpAndSettle();
+
+        // The deep-link jump must stick rather than snapping back to newest.
+        expect(findRichText('Message 3'), findsOneWidget);
+        expect(findRichText('Message 59'), findsNothing);
+      },
+    );
+
     testWidgets('groups consecutive messages from same author', (tester) async {
       final messages = [
         _textMsg(
@@ -728,22 +1259,29 @@ void main() {
       expect(find.text('Alice'), findsOneWidget);
       final createdAction = findRichText('created this channel');
       expect(createdAction, findsOneWidget);
-      expect(tester.getSize(find.byType(CircleAvatar)), const Size.square(36));
+      expect(
+        tester.getSize(find.byType(CircleAvatar)),
+        const Size.square(messageAvatarSize),
+      );
       final nameRect = tester.getRect(find.text('Alice'));
       final nameText = tester.widget<Text>(find.text('Alice'));
-      final nameStyle = Theme.of(
-        tester.element(find.text('Alice')),
-      ).textTheme.titleSmall;
-      expect(nameText.style?.fontSize, nameStyle?.fontSize);
-      final timestampRect = tester.getRect(find.text(formatMessageTime(1000)));
-      expect(timestampRect.left - nameRect.right, Grid.xxs);
+      expect(nameText.style?.fontSize, systemMessageHeadingTextStyle.fontSize);
+      expect(
+        nameText.style?.fontWeight,
+        systemMessageHeadingTextStyle.fontWeight,
+      );
+      expect(
+        find.byKey(const ValueKey('system-message-username-alice')),
+        findsNothing,
+      );
+      final timestampRect = tester.getRect(
+        find.byKey(const ValueKey('system-message-timestamp-alice')),
+      );
+      expect(timestampRect.left, greaterThan(nameRect.right));
       final createdText = tester.widget<RichText>(createdAction);
-      final bodyStyle = Theme.of(
-        tester.element(createdAction),
-      ).textTheme.bodyLarge;
       expect(
         effectiveFontSizeForText(createdText.text, 'created this channel'),
-        bodyStyle?.fontSize,
+        systemMessageBodyTextStyle.fontSize,
       );
     });
 
@@ -767,7 +1305,10 @@ void main() {
 
       expect(find.text('Bob'), findsOneWidget);
       expect(findRichText('joined the channel'), findsOneWidget);
-      expect(tester.getSize(find.byType(CircleAvatar)), const Size.square(36));
+      expect(
+        tester.getSize(find.byType(CircleAvatar)),
+        const Size.square(messageAvatarSize),
+      );
     });
 
     testWidgets('renders member_joined (added by other) system event', (
@@ -795,17 +1336,23 @@ void main() {
       final addedAction = findRichText('was added by Alice');
       expect(addedAction, findsOneWidget);
       expect(find.text('Alice added Bob to the channel'), findsNothing);
-      expect(tester.getSize(find.byType(CircleAvatar)), const Size.square(36));
+      expect(
+        tester.getSize(find.byType(CircleAvatar)),
+        const Size.square(messageAvatarSize),
+      );
       final nameRect = tester.getRect(find.text('Bob'));
-      final timestampRect = tester.getRect(find.text(formatMessageTime(1000)));
-      expect(timestampRect.left - nameRect.right, Grid.xxs);
+      expect(
+        find.byKey(const ValueKey('system-message-username-bob')),
+        findsNothing,
+      );
+      final timestampRect = tester.getRect(
+        find.byKey(const ValueKey('system-message-timestamp-bob')),
+      );
+      expect(timestampRect.left, greaterThan(nameRect.right));
       final addedText = tester.widget<RichText>(addedAction);
-      final bodyStyle = Theme.of(
-        tester.element(addedAction),
-      ).textTheme.bodyLarge;
       expect(
         effectiveFontSizeForText(addedText.text, 'was added by Alice'),
-        bodyStyle?.fontSize,
+        systemMessageBodyTextStyle.fontSize,
       );
     });
 
@@ -916,7 +1463,10 @@ void main() {
 
       final avatarRect = tester.getRect(find.byType(CircleAvatar));
       final reactionRect = tester.getRect(find.byType(ReactionRow));
-      expect(reactionRect.left, avatarRect.left + 36 + Grid.xxs);
+      expect(
+        reactionRect.left,
+        avatarRect.left + messageAvatarSize + messageAvatarContentGap,
+      );
     });
 
     testWidgets('renders member_left system event', (tester) async {
@@ -938,6 +1488,51 @@ void main() {
       expect(find.text('Bob left the channel'), findsOneWidget);
     });
 
+    testWidgets(
+      'constrains generic system timestamps at accessibility text sizes',
+      (tester) async {
+        tester.view.physicalSize = const Size(240, 600);
+        tester.view.devicePixelRatio = 1;
+        addTearDown(tester.view.resetPhysicalSize);
+        addTearDown(tester.view.resetDevicePixelRatio);
+
+        await tester.pumpWidget(
+          _buildTestable(
+            messages: [
+              _systemMsg(
+                id: 'sys-accessible',
+                payload: {
+                  'type': 'topic_changed',
+                  'actor': 'alice',
+                  'topic': 'Release planning',
+                },
+                createdAt:
+                    DateTime(2026, 7, 28, 12, 34).millisecondsSinceEpoch ~/
+                    1000,
+              ),
+            ],
+            users: {
+              'alice': const UserProfile(pubkey: 'alice', displayName: 'Alice'),
+            },
+            textScaler: const TextScaler.linear(3),
+          ),
+        );
+        await tester.pumpAndSettle();
+
+        final timestampFinder = find.byKey(
+          const ValueKey('system-message-timestamp-sys-accessible'),
+        );
+        final timestamp = tester.widget<Text>(timestampFinder);
+        expect(timestamp.maxLines, 1);
+        expect(timestamp.overflow, TextOverflow.ellipsis);
+        expect(
+          tester.getSize(timestampFinder).width,
+          lessThanOrEqualTo(Grid.xxl),
+        );
+        expect(tester.takeException(), isNull);
+      },
+    );
+
     testWidgets('renders member_removed system event', (tester) async {
       final messages = [
         _systemMsg(
@@ -1213,6 +1808,25 @@ void main() {
       await tester.pumpAndSettle();
 
       expect(find.text('Alice is typing…'), findsOneWidget);
+
+      final indicator = tester.widget<Container>(
+        find.byKey(const ValueKey('channel-typing-indicator')),
+      );
+      final decoration = indicator.decoration! as BoxDecoration;
+      expect(
+        indicator.padding,
+        const EdgeInsets.symmetric(horizontal: Grid.xxs, vertical: Grid.xxs),
+      );
+      expect(
+        decoration.color,
+        AppTheme.light().colorScheme.surfaceContainerHighest,
+      );
+      expect(decoration.border, isA<Border>());
+      expect(
+        tester.widget<Text>(find.text('Alice is typing…')).style?.color,
+        AppTheme.light().colorScheme.primary,
+      );
+      expect(tester.widget<SmallAvatar>(find.byType(SmallAvatar)).size, 24);
     });
 
     testWidgets('shows two typers', (tester) async {
@@ -1347,6 +1961,7 @@ void main() {
             relayClientProvider.overrideWithValue(
               RelayClient(baseUrl: 'http://localhost:3000'),
             ),
+            savedPrefsProvider.overrideWithValue(_testPrefs),
           ],
           child: MaterialApp(
             theme: AppTheme.light(),
@@ -1409,6 +2024,69 @@ void main() {
     });
   });
 
+  group('Deep-link navigation', () {
+    testWidgets('opens a nested reply in its direct-parent thread', (
+      tester,
+    ) async {
+      final root = _textMsg(
+        id: 'root',
+        pubkey: 'alice',
+        content: 'Outer root',
+        createdAt: 1000,
+      );
+      final parent = _textMsg(
+        id: 'parent',
+        pubkey: 'bob',
+        content: 'Nested thread head',
+        createdAt: 1100,
+        extraTags: const [
+          ['e', 'root', '', 'reply'],
+        ],
+      );
+      final target = _textMsg(
+        id: 'target',
+        pubkey: 'carol',
+        content: 'Deeply nested target',
+        createdAt: 1200,
+        extraTags: const [
+          ['e', 'root', '', 'root'],
+          ['e', 'parent', '', 'reply'],
+        ],
+      );
+
+      await tester.pumpWidget(
+        _buildTestable(
+          messages: [root, parent, target],
+          initialMessageId: 'target',
+          initialThreadRootId: 'parent',
+          threadReplies: {
+            // Relay subtree filtering is keyed by thread_metadata.root_event_id,
+            // so nested replies are returned by the outer-root query.
+            'root': [parent, target],
+          },
+          users: const {
+            'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'),
+            'bob': UserProfile(pubkey: 'bob', displayName: 'Bob'),
+            'carol': UserProfile(pubkey: 'carol', displayName: 'Carol'),
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final threadPage = tester.widget<ThreadDetailPage>(
+        find.byType(ThreadDetailPage),
+      );
+      expect(threadPage.threadHead.id, 'parent');
+      expect(threadPage.initialMessageId, 'target');
+
+      final highlighted = tester.widget<DecoratedBox>(
+        find.byKey(const ValueKey('thread-message-target')),
+      );
+      final decoration = highlighted.decoration as BoxDecoration;
+      expect(decoration.color, isNot(Colors.transparent));
+    });
+  });
+
   group('Channel links', () {
     testWidgets('tapping a channel link opens that channel', (tester) async {
       final randomChannel = _channel(id: 'random-channel', name: 'random');
@@ -1563,7 +2241,7 @@ void main() {
       await tester.pumpWidget(
         _buildTestable(
           messages: [rootEvent],
-          threadReplies: replies,
+          threadReplies: {'thread-root': replies},
           users: {
             'alice': const UserProfile(pubkey: 'alice', displayName: 'Alice'),
             'bob': const UserProfile(pubkey: 'bob', displayName: 'Bob'),
@@ -1590,6 +2268,14 @@ void main() {
       expect(find.byType(DayDivider), findsNWidgets(2));
       expect(find.text(formatDayHeading(rootCreatedAt)), findsOneWidget);
       expect(find.text(formatDayHeading(nextDayCreatedAt)), findsOneWidget);
+      final threadList = tester.widget<ScrollablePositionedList>(
+        find.byKey(const ValueKey('thread-message-list')),
+      );
+      expect(threadList.padding!.bottom, 0);
+      final newestThreadGroup = tester.widget<Padding>(
+        find.byKey(const ValueKey('thread-message-group-reply-next-day')),
+      );
+      expect(newestThreadGroup.padding, const EdgeInsets.only(bottom: Grid.xs));
     });
   });
 }
@@ -1608,11 +2294,18 @@ Channel _channel({required String id, required String name}) => Channel(
 
 class _FakeMessagesNotifier extends ChannelMessagesNotifier {
   List<NostrEvent> _messages;
-  _FakeMessagesNotifier(this._messages) : super(_channelId);
+  bool _hasLoadedMessages;
+
+  _FakeMessagesNotifier(this._messages, {bool hasLoadedMessages = true})
+    : _hasLoadedMessages = hasLoadedMessages,
+      super(_channelId);
 
   @override
   AsyncValue<List<NostrEvent>> build() => AsyncData(_messages);
 
+  @override
+  bool get hasLoadedMessages => _hasLoadedMessages;
+
   @override
   bool get reachedOldest => true;
 
@@ -1621,6 +2314,7 @@ class _FakeMessagesNotifier extends ChannelMessagesNotifier {
 
   void setMessages(List<NostrEvent> messages) {
     _messages = messages;
+    _hasLoadedMessages = true;
     state = AsyncData(messages);
   }
 }
@@ -1633,6 +2327,22 @@ class _ErrorMessagesNotifier extends ChannelMessagesNotifier {
       AsyncError('Connection failed', StackTrace.current);
 }
 
+class _ReconnectingRelaySession extends RelaySessionNotifier {
+  @override
+  SessionState build() =>
+      const SessionState(status: SessionStatus.reconnecting);
+
+  @override
+  Future<List<NostrEvent>> fetchHistory(
+    NostrFilter filter, {
+    Duration timeout = const Duration(seconds: 8),
+  }) async => [];
+
+  void connect() {
+    state = const SessionState(status: SessionStatus.connected);
+  }
+}
+
 class _FakeTypingNotifier extends ChannelTypingNotifier {
   final List<TypingEntry> _entries;
   _FakeTypingNotifier(this._entries) : super(_channelId);
@@ -1651,7 +2361,11 @@ class _SynchronousReadStateNotifier extends ReadStateNotifier {
   ReadStateState build() => _initialState;
 
   @override
-  void markContextRead(String contextId, int unixTimestamp) {
+  void markContextRead(
+    String contextId,
+    int unixTimestamp, {
+    bool clearForcedMessages = false,
+  }) {
     markedContexts[contextId] = unixTimestamp;
     state = state.copyWithContext(contextId, unixTimestamp);
   }
diff --git a/mobile/test/features/channels/channel_messages_provider_test.dart b/mobile/test/features/channels/channel_messages_provider_test.dart
index 8885b55e16..6620c8c506 100644
--- a/mobile/test/features/channels/channel_messages_provider_test.dart
+++ b/mobile/test/features/channels/channel_messages_provider_test.dart
@@ -5,6 +5,8 @@ import 'dart:convert';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:buzz/features/channels/channel_messages_provider.dart';
+import 'package:buzz/features/channels/pending_local_messages_provider.dart';
+import 'package:buzz/features/channels/thread_replies_provider.dart';
 import 'package:buzz/shared/relay/relay.dart';
 
 void main() {
@@ -130,6 +132,369 @@ void main() {
     },
   );
 
+  test(
+    'adds and rolls back a local message in the websocket timeline',
+    () async {
+      final relaySession = _RecordingRelaySessionNotifier();
+      final container = _buildContainer(relaySession);
+      addTearDown(container.dispose);
+
+      container.read(channelMessagesProvider(_channelId));
+      await relaySession.subscribed;
+      final notifier = container.read(
+        channelMessagesProvider(_channelId).notifier,
+      );
+
+      notifier.addLocalMessage(_event(id: 'local', createdAt: 20));
+      expect(
+        container
+            .read(channelMessagesProvider(_channelId))
+            .value
+            ?.map((event) => event.id),
+        ['local'],
+      );
+
+      relaySession.completeHistory([_event(id: 'history', createdAt: 10)]);
+      await _pumpEventQueue();
+
+      // The initial history merge must retain a local row even if the relay's
+      // history snapshot was taken before that outgoing event was durable.
+      expect(
+        container
+            .read(channelMessagesProvider(_channelId))
+            .value
+            ?.map((event) => event.id),
+        ['history', 'local'],
+      );
+
+      notifier.removeLocalMessage('local');
+      expect(
+        container
+            .read(channelMessagesProvider(_channelId))
+            .value
+            ?.map((event) => event.id),
+        ['history'],
+      );
+    },
+  );
+
+  test(
+    'legacy websocket echo retires ownership without duplicating the row',
+    () async {
+      final relaySession = _RecordingRelaySessionNotifier();
+      final container = _buildContainer(relaySession);
+      addTearDown(container.dispose);
+
+      container.read(channelMessagesProvider(_channelId));
+      await relaySession.subscribed;
+      final notifier = container.read(
+        channelMessagesProvider(_channelId).notifier,
+      );
+      final local = _event(id: 'local', createdAt: 20);
+      notifier.addLocalMessage(local);
+
+      relaySession.emit(local);
+      await _pumpEventQueue();
+
+      expect(container.read(pendingLocalMessagesProvider(_channelId)), isEmpty);
+      expect(
+        container
+            .read(channelMessagesProvider(_channelId))
+            .value
+            ?.map((event) => event.id),
+        ['local'],
+      );
+    },
+  );
+
+  test('adds and rolls back a local message in the channel window', () async {
+    final relaySession = _RecordingRelaySessionNotifier(
+      queryResults: [
+        [_event(id: 'history', createdAt: 10), _bounds()],
+      ],
+    );
+    final container = _buildContainer(relaySession);
+    addTearDown(container.dispose);
+
+    container.read(channelMessagesProvider(_channelId));
+    await relaySession.subscribed;
+    await _pumpEventQueue();
+    final notifier = container.read(
+      channelMessagesProvider(_channelId).notifier,
+    );
+
+    notifier.addLocalMessage(_event(id: 'local', createdAt: 20));
+    expect(
+      container
+          .read(channelMessagesProvider(_channelId))
+          .value
+          ?.map((event) => event.id),
+      ['history', 'local'],
+    );
+
+    notifier.removeLocalMessage('local');
+    expect(
+      container
+          .read(channelMessagesProvider(_channelId))
+          .value
+          ?.map((event) => event.id),
+      ['history'],
+    );
+  });
+
+  test('reconnect hydration cannot retain a rolled-back local row', () async {
+    final relaySession = _RecordingRelaySessionNotifier(
+      queryResults: [
+        [_event(id: 'history', createdAt: 10), _bounds()],
+        [_event(id: 'history', createdAt: 10), _bounds()],
+      ],
+    );
+    final container = _buildContainer(relaySession);
+    addTearDown(container.dispose);
+
+    container.read(channelMessagesProvider(_channelId));
+    await relaySession.subscribed;
+    await _pumpEventQueue();
+    final notifier = container.read(
+      channelMessagesProvider(_channelId).notifier,
+    );
+    notifier.addLocalMessage(_event(id: 'local', createdAt: 20));
+
+    relaySession.setConnected(false);
+    await _pumpEventQueue();
+    relaySession.setConnected(true);
+    await _pumpEventQueue();
+    expect(
+      container
+          .read(channelMessagesProvider(_channelId))
+          .value
+          ?.map((event) => event.id),
+      ['history', 'local'],
+    );
+
+    notifier.removeLocalMessage('local');
+    expect(
+      container
+          .read(channelMessagesProvider(_channelId))
+          .value
+          ?.map((event) => event.id),
+      ['history'],
+    );
+  });
+
+  test(
+    'thread replies are inserted, deduped, and rolled back locally',
+    () async {
+      final relaySession = _RecordingRelaySessionNotifier(
+        queryResults: [
+          [_event(id: 'history', createdAt: 10), _bounds()],
+          <NostrEvent>[],
+          [
+            _event(
+              id: 'reply',
+              createdAt: 20,
+              extraTags: const [
+                ['e', 'root', '', 'reply'],
+              ],
+            ),
+          ],
+        ],
+      );
+      final container = _buildContainer(relaySession);
+      addTearDown(container.dispose);
+
+      container.read(channelMessagesProvider(_channelId));
+      await relaySession.subscribed;
+      await _pumpEventQueue();
+      const args = ThreadRepliesArgs(channelId: _channelId, rootId: 'root');
+      container.read(threadRepliesWithLocalProvider(args));
+      await _pumpEventQueue();
+      final notifier = container.read(
+        channelMessagesProvider(_channelId).notifier,
+      );
+      final reply = _event(
+        id: 'reply',
+        createdAt: 20,
+        extraTags: const [
+          ['e', 'root', '', 'reply'],
+        ],
+      );
+
+      notifier.addLocalMessage(reply);
+      expect(
+        container
+            .read(threadRepliesWithLocalProvider(args))
+            .value
+            ?.map((event) => event.id),
+        ['reply'],
+      );
+      expect(
+        container
+            .read(channelMessagesProvider(_channelId))
+            .value
+            ?.map((event) => event.id),
+        ['history'],
+      );
+
+      relaySession.emit(reply);
+      await container.read(threadRepliesProvider(args).future);
+      container.read(threadRepliesWithLocalProvider(args));
+      await _pumpEventQueue();
+      expect(
+        container
+            .read(threadRepliesWithLocalProvider(args))
+            .value
+            ?.map((event) => event.id),
+        ['reply'],
+      );
+      expect(container.read(threadLocalRepliesProvider(args)), isEmpty);
+      expect(container.read(pendingLocalMessagesProvider(_channelId)), isEmpty);
+
+      final rejected = _event(
+        id: 'rejected',
+        createdAt: 21,
+        extraTags: const [
+          ['e', 'root', '', 'reply'],
+        ],
+      );
+      notifier.addLocalMessage(rejected);
+      notifier.removeLocalMessage('rejected');
+      expect(
+        container
+            .read(threadRepliesWithLocalProvider(args))
+            .value
+            ?.map((event) => event.id),
+        ['reply'],
+      );
+    },
+  );
+
+  test(
+    'thread live echo keeps ownership until the authoritative refetch succeeds',
+    () async {
+      final relaySession = _RecordingRelaySessionNotifier(
+        queryResults: [
+          [_event(id: 'history', createdAt: 10), _bounds()],
+          <NostrEvent>[],
+          Exception('thread refetch failed'),
+        ],
+      );
+      final container = _buildContainer(relaySession);
+      addTearDown(container.dispose);
+
+      container.read(channelMessagesProvider(_channelId));
+      await relaySession.subscribed;
+      await _pumpEventQueue();
+      const args = ThreadRepliesArgs(channelId: _channelId, rootId: 'root');
+      container.read(threadRepliesWithLocalProvider(args));
+      await _pumpEventQueue();
+      final notifier = container.read(
+        channelMessagesProvider(_channelId).notifier,
+      );
+      final reply = _event(
+        id: 'reply',
+        createdAt: 20,
+        extraTags: const [
+          ['e', 'root', '', 'reply'],
+        ],
+      );
+      notifier.addLocalMessage(reply);
+
+      relaySession.emit(reply);
+      await _pumpEventQueue();
+
+      expect(container.read(pendingLocalMessagesProvider(_channelId)).keys, [
+        'reply',
+      ]);
+      expect(
+        container
+            .read(threadLocalRepliesProvider(args))
+            .map((event) => event.id),
+        ['reply'],
+      );
+      expect(
+        container
+            .read(threadRepliesWithLocalProvider(args))
+            .value
+            ?.map((event) => event.id),
+        ['reply'],
+      );
+    },
+  );
+
+  test(
+    'successful never-echoed send releases ownership but keeps its row across reconnect',
+    () async {
+      final relaySession = _RecordingRelaySessionNotifier(
+        queryResults: [
+          [_event(id: 'history', createdAt: 10), _bounds()],
+          [_event(id: 'history', createdAt: 10), _bounds()],
+        ],
+      );
+      final container = _buildContainer(relaySession);
+      addTearDown(container.dispose);
+
+      container.read(channelMessagesProvider(_channelId));
+      await relaySession.subscribed;
+      await _pumpEventQueue();
+      final notifier = container.read(
+        channelMessagesProvider(_channelId).notifier,
+      );
+      notifier.addLocalMessage(_event(id: 'local', createdAt: 20));
+      notifier.completeLocalMessage('local');
+
+      expect(container.read(pendingLocalMessagesProvider(_channelId)), isEmpty);
+      relaySession.setConnected(false);
+      await _pumpEventQueue();
+      relaySession.setConnected(true);
+      await _pumpEventQueue();
+
+      expect(container.read(pendingLocalMessagesProvider(_channelId)), isEmpty);
+      expect(
+        container
+            .read(channelMessagesProvider(_channelId))
+            .value
+            ?.map((event) => event.id),
+        ['history', 'local'],
+      );
+    },
+  );
+
+  test(
+    'window dedupes echoes and orders rapid equal-time local sends',
+    () async {
+      final relaySession = _RecordingRelaySessionNotifier(
+        queryResults: [
+          [_event(id: 'history', createdAt: 10), _bounds()],
+        ],
+      );
+      final container = _buildContainer(relaySession);
+      addTearDown(container.dispose);
+
+      container.read(channelMessagesProvider(_channelId));
+      await relaySession.subscribed;
+      await _pumpEventQueue();
+      final notifier = container.read(
+        channelMessagesProvider(_channelId).notifier,
+      );
+      notifier.addLocalMessage(_event(id: 'z-local', createdAt: 20));
+      notifier.addLocalMessage(_event(id: 'a-local', createdAt: 20));
+      relaySession.emit(_event(id: 'z-local', createdAt: 20));
+      await _pumpEventQueue();
+
+      expect(container.read(pendingLocalMessagesProvider(_channelId)).keys, [
+        'a-local',
+      ]);
+      expect(
+        container
+            .read(channelMessagesProvider(_channelId))
+            .value
+            ?.map((event) => event.id),
+        ['history', 'z-local', 'a-local'],
+      );
+    },
+  );
+
   test('window pagination failures return false without exhausting', () async {
     final relaySession = _RecordingRelaySessionNotifier(
       queryResults: [
@@ -178,14 +543,19 @@ ProviderContainer _buildContainer(_RecordingRelaySessionNotifier relaySession) {
   );
 }
 
-NostrEvent _event({required String id, required int createdAt}) {
+NostrEvent _event({
+  required String id,
+  required int createdAt,
+  List<List<String>> extraTags = const [],
+}) {
   return NostrEvent(
     id: id,
     pubkey: 'alice',
     createdAt: createdAt,
     kind: EventKind.streamMessageV2,
-    tags: const [
+    tags: [
       ['h', _channelId],
+      ...extraTags,
     ],
     content: id,
     sig: 'sig',
@@ -243,6 +613,12 @@ class _RecordingRelaySessionNotifier extends RelaySessionNotifier {
   @override
   SessionState build() => const SessionState(status: SessionStatus.connected);
 
+  void setConnected(bool connected) {
+    state = SessionState(
+      status: connected ? SessionStatus.connected : SessionStatus.disconnected,
+    );
+  }
+
   @override
   Future<List<NostrEvent>> queryRelay(
     List<NostrFilter> filters, {
diff --git a/mobile/test/features/channels/channel_sections/channel_sections_manager_test.dart b/mobile/test/features/channels/channel_sections/channel_sections_manager_test.dart
new file mode 100644
index 0000000000..5b36ed6a4d
--- /dev/null
+++ b/mobile/test/features/channels/channel_sections/channel_sections_manager_test.dart
@@ -0,0 +1,312 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:nostr/nostr.dart' as nostr;
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:buzz/features/channels/channel_sections/channel_sections_manager.dart';
+import 'package:buzz/shared/relay/relay.dart';
+
+void main() {
+  late SharedPreferences prefs;
+  late nostr.Keys keychain;
+  late ChannelSectionsCrypto crypto;
+
+  Future<void> setUpEnv() async {
+    SharedPreferences.setMockInitialValues({});
+    prefs = await SharedPreferences.getInstance();
+    keychain = nostr.Keys.generate();
+    crypto = ChannelSectionsCrypto(keychain.nsec, keychain.public);
+  }
+
+  NostrEvent sectionsEvent({
+    required List<Map<String, dynamic>> sections,
+    Map<String, String> assignments = const {},
+    required int createdAt,
+    String id = 'remote-event',
+  }) {
+    final payload = jsonEncode({
+      'version': 1,
+      'sections': sections,
+      'assignments': assignments,
+    });
+    return NostrEvent(
+      id: id,
+      pubkey: keychain.public,
+      createdAt: createdAt,
+      kind: EventKind.readState,
+      tags: const [
+        ['d', 'channel-sections'],
+        ['t', 'channel-sections'],
+      ],
+      content: crypto.encrypt(payload),
+      sig: 'sig',
+    );
+  }
+
+  ChannelSectionsManager buildManager({
+    required RelaySessionNotifier relaySession,
+    Duration startupRetryBaseDelay = const Duration(milliseconds: 5),
+  }) {
+    return ChannelSectionsManager(
+      pubkey: keychain.public,
+      prefs: prefs,
+      crypto: crypto,
+      relaySession: relaySession,
+      signedEventRelay: null,
+      remoteEnabled: true,
+      onChanged: () {},
+      startupRetryBaseDelay: startupRetryBaseDelay,
+    );
+  }
+
+  test('startup fetch rejected by relay rate limit retries until the remote '
+      'blob is adopted (cold-start regression)', () async {
+    await setUpEnv();
+    // Cold start: the relay rejects the first fetch AND the first live
+    // subscription with `rate-limited: quota exceeded` because the channel
+    // list fired dozens of REQs first. Pre-fix, both errors were swallowed
+    // and desktop-created groups never appeared until app data was cleared.
+    final relay = _RateLimitedRelaySession(
+      failuresBeforeSuccess: 2,
+      historyEvents: [
+        sectionsEvent(
+          sections: [
+            {'id': 's1', 'name': 'Desktop Group', 'order': 0},
+          ],
+          createdAt: 100,
+        ),
+      ],
+    );
+
+    final manager = buildManager(
+      relaySession: relay,
+      startupRetryBaseDelay: const Duration(milliseconds: 10),
+    );
+    await manager.initialize();
+
+    expect(
+      manager.store.sections,
+      isEmpty,
+      reason: 'first fetch lost the rate-limit race',
+    );
+
+    // Wait for the backoff retries (10ms, 20ms, …) to win the race.
+    await _waitUntil(() => manager.store.sections.isNotEmpty);
+
+    expect(manager.store.sections.single.name, 'Desktop Group');
+    expect(
+      relay.subscribeCalls,
+      greaterThan(1),
+      reason: 'live subscription must be retried too',
+    );
+    manager.dispose(flushPending: false);
+  });
+
+  test(
+    'startup retry stops after fetch and subscription both succeed',
+    () async {
+      await setUpEnv();
+      final relay = _RateLimitedRelaySession(
+        failuresBeforeSuccess: 1,
+        historyEvents: [
+          sectionsEvent(
+            sections: [
+              {'id': 's1', 'name': 'Desktop Group', 'order': 0},
+            ],
+            createdAt: 100,
+          ),
+        ],
+      );
+      final manager = buildManager(relaySession: relay);
+      await manager.initialize();
+      await _waitUntil(() => manager.store.sections.isNotEmpty);
+
+      final fetchCallsAfterSuccess = relay.fetchCalls;
+      final subscribeCallsAfterSuccess = relay.subscribeCalls;
+      await Future<void>.delayed(const Duration(milliseconds: 60));
+
+      expect(relay.fetchCalls, fetchCallsAfterSuccess);
+      expect(relay.subscribeCalls, subscribeCallsAfterSuccess);
+      manager.dispose(flushPending: false);
+    },
+  );
+
+  test('disposing the manager cancels pending startup retries', () async {
+    await setUpEnv();
+    final relay = _RateLimitedRelaySession(failuresBeforeSuccess: 1000);
+    final manager = buildManager(relaySession: relay);
+    await manager.initialize();
+    manager.dispose(flushPending: false);
+
+    final fetchCallsAtDispose = relay.fetchCalls;
+    await Future<void>.delayed(const Duration(milliseconds: 60));
+
+    expect(
+      relay.fetchCalls,
+      fetchCallsAtDispose,
+      reason: 'no retries may fire after dispose',
+    );
+  });
+
+  test('late relay CLOSED after subscribe() reported success retries and '
+      'eventually adopts remote state', () async {
+    await setUpEnv();
+    // Under cold-start load, subscribe() can time out its 500ms readiness
+    // wait and resolve successfully before the relay's rate-limit CLOSED
+    // lands. The rejection then arrives only via onClosed. Pre-fix the
+    // manager passed no onClosed, kept the dead subscription, and never
+    // retried.
+    final relay = _RateLimitedRelaySession(failuresBeforeSuccess: 0);
+    final manager = buildManager(relaySession: relay);
+    await manager.initialize();
+    expect(relay.subscribeCalls, 1);
+
+    // Late CLOSED lands after initialize() completed successfully.
+    relay.closeLiveSubscription('rate-limited: quota exceeded');
+
+    // The manager must drop the dead subscription and re-subscribe.
+    await _waitUntil(() => relay.subscribeCalls > 1);
+
+    // Remote state arriving on the NEW subscription must be adopted.
+    relay.emit(
+      sectionsEvent(
+        sections: [
+          {'id': 's1', 'name': 'Desktop Group', 'order': 0},
+        ],
+        createdAt: 100,
+      ),
+    );
+    await _waitUntil(() => manager.store.sections.isNotEmpty);
+    expect(manager.store.sections.single.name, 'Desktop Group');
+
+    // Exactly one replacement subscription — no duplicates.
+    await Future<void>.delayed(const Duration(milliseconds: 60));
+    expect(relay.subscribeCalls, 2);
+    expect(relay.activeListeners, 1);
+    manager.dispose(flushPending: false);
+  });
+
+  test('late CLOSED after dispose does not schedule retries', () async {
+    await setUpEnv();
+    final relay = _RateLimitedRelaySession(failuresBeforeSuccess: 0);
+    final manager = buildManager(relaySession: relay);
+    await manager.initialize();
+    manager.dispose(flushPending: false);
+
+    relay.closeLiveSubscription('rate-limited: quota exceeded');
+    await Future<void>.delayed(const Duration(milliseconds: 60));
+
+    expect(relay.subscribeCalls, 1, reason: 'no re-subscribe after dispose');
+  });
+
+  test('backoff resets after full recovery so later failures start from the '
+      'base delay', () async {
+    await setUpEnv();
+    // Climb the failure counter: 5 rate-limited attempts before success.
+    // With a 5ms base, attempt 5 would wait 5<<5 = 160ms if the counter
+    // were never reset.
+    final relay = _RateLimitedRelaySession(failuresBeforeSuccess: 5);
+    final manager = buildManager(relaySession: relay);
+    await manager.initialize();
+    await _waitUntil(() => relay.subscribeCalls > 5);
+
+    // Fully recovered. A later transient failure (late CLOSED) must retry
+    // from the base delay, not the climbed ceiling.
+    final subscribeCallsAfterRecovery = relay.subscribeCalls;
+    relay.closeLiveSubscription('rate-limited: quota exceeded');
+    final stopwatch = Stopwatch()..start();
+    await _waitUntil(() => relay.subscribeCalls > subscribeCallsAfterRecovery);
+    stopwatch.stop();
+
+    expect(
+      stopwatch.elapsedMilliseconds,
+      lessThan(100),
+      reason:
+          'retry after recovery must wait ~base delay (5ms), '
+          'not the pre-recovery backoff (160ms)',
+    );
+    manager.dispose(flushPending: false);
+  });
+}
+
+Future<void> _waitUntil(
+  bool Function() condition, {
+  Duration timeout = const Duration(seconds: 2),
+}) async {
+  final deadline = DateTime.now().add(timeout);
+  while (!condition()) {
+    if (DateTime.now().isAfter(deadline)) {
+      fail('condition not met within $timeout');
+    }
+    await Future<void>.delayed(const Duration(milliseconds: 10));
+  }
+}
+
+/// Rejects the first [failuresBeforeSuccess] fetch and subscribe calls with
+/// the relay's rate-limit error, then succeeds — the exact failure mode seen
+/// on Android cold start where the channel-list REQ burst exhausts the
+/// relay's per-connection quota before the sections manager gets a turn.
+class _RateLimitedRelaySession extends RelaySessionNotifier {
+  _RateLimitedRelaySession({
+    required this.failuresBeforeSuccess,
+    this.historyEvents = const [],
+  });
+
+  final int failuresBeforeSuccess;
+  final List<NostrEvent> historyEvents;
+  int fetchCalls = 0;
+  int subscribeCalls = 0;
+  final List<void Function(NostrEvent)> _listeners = [];
+  final List<void Function(String)> _closedCallbacks = [];
+
+  int get activeListeners => _listeners.length;
+
+  void emit(NostrEvent event) {
+    for (final listener in List.of(_listeners)) {
+      listener(event);
+    }
+  }
+
+  /// Simulates a relay CLOSED landing after subscribe() already resolved —
+  /// the readiness-timeout window on a loaded cold start. Drops the live
+  /// subscription (as _handleClosed does) and invokes onClosed.
+  void closeLiveSubscription(String message) {
+    if (_listeners.isEmpty) return;
+    _listeners.removeAt(0);
+    final onClosed = _closedCallbacks.removeAt(0);
+    onClosed(message);
+  }
+
+  @override
+  Future<List<NostrEvent>> fetchHistory(
+    NostrFilter filter, {
+    Duration timeout = const Duration(seconds: 8),
+  }) async {
+    fetchCalls++;
+    if (fetchCalls <= failuresBeforeSuccess) {
+      throw Exception('rate-limited: quota exceeded; retry in 2s');
+    }
+    return historyEvents;
+  }
+
+  @override
+  Future<void Function()> subscribe(
+    NostrFilter filter,
+    void Function(NostrEvent) onEvent, {
+    void Function(String message)? onClosed,
+  }) async {
+    subscribeCalls++;
+    if (subscribeCalls <= failuresBeforeSuccess) {
+      throw Exception('rate-limited: quota exceeded; retry in 1s');
+    }
+    _listeners.add(onEvent);
+    _closedCallbacks.add(onClosed ?? (_) {});
+    return () {
+      final index = _listeners.indexOf(onEvent);
+      if (index >= 0) {
+        _listeners.removeAt(index);
+        _closedCallbacks.removeAt(index);
+      }
+    };
+  }
+}
diff --git a/mobile/test/features/channels/channels_page_test.dart b/mobile/test/features/channels/channels_page_test.dart
index 0cb3383f3a..991db3b5cd 100644
--- a/mobile/test/features/channels/channels_page_test.dart
+++ b/mobile/test/features/channels/channels_page_test.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:math';
 
 import 'package:flutter/material.dart';
@@ -7,26 +8,42 @@ import 'package:hooks_riverpod/misc.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 import 'package:buzz/features/channels/channel.dart';
 import 'package:buzz/features/channels/channel_management_provider.dart';
+import 'package:buzz/features/channels/channel_sections/channel_sections_provider.dart';
+import 'package:buzz/features/channels/channel_sections/channel_sections_storage.dart';
 import 'package:buzz/features/channels/channels_page.dart';
 import 'package:buzz/features/channels/channels_provider.dart';
 import 'package:buzz/features/channels/read_state/read_state_provider.dart';
 import 'package:buzz/features/channels/unread_badge/observed_unread_event.dart';
+import 'package:buzz/features/profile/profile_avatar.dart';
 import 'package:buzz/features/profile/profile_provider.dart';
 import 'package:buzz/features/profile/user_profile.dart';
+import 'package:buzz/shared/auth/auth.dart';
+import 'package:buzz/shared/community/community_icon_provider.dart';
+import 'package:buzz/shared/relay/relay.dart';
 import 'package:buzz/shared/theme/theme.dart';
 import 'package:buzz/shared/widgets/avatar_image.dart';
+import 'package:buzz/shared/widgets/skeleton.dart';
 
 void main() {
   Widget buildTestable({
     required List<Override> overrides,
     bool previewDirectory = false,
     double keyboardInset = 0,
+    bool disableAnimations = false,
+    double bottomPadding = 0,
+    Map<String, String?> communityIcons = const {},
+    ValueChanged<String>? onCommunityIconLoad,
+    TextScaler textScaler = TextScaler.noScaling,
   }) {
     return ProviderScope(
       overrides: [
         // Provide a fake profile and presence so the avatar doesn't hit the network.
         profileProvider.overrideWith(() => _FakeProfileNotifier()),
         presenceProvider.overrideWith(() => _FakePresenceNotifier()),
+        communityIconProvider.overrideWith((ref, relayUrl) async {
+          onCommunityIconLoad?.call(relayUrl);
+          return communityIcons[relayUrl];
+        }),
         dmDirectoryPreviewEnabledProvider.overrideWith(
           (ref) => previewDirectory,
         ),
@@ -35,14 +52,17 @@ void main() {
       child: MaterialApp(
         theme: AppTheme.light(),
         builder: (context, child) => MediaQuery(
-          data: MediaQuery.of(
-            context,
-          ).copyWith(viewInsets: EdgeInsets.only(bottom: keyboardInset)),
+          data: MediaQuery.of(context).copyWith(
+            disableAnimations: disableAnimations,
+            textScaler: textScaler,
+            padding: EdgeInsets.only(bottom: bottomPadding),
+            viewInsets: EdgeInsets.only(bottom: keyboardInset),
+          ),
           child: child!,
         ),
         home: const Stack(
           children: [
-            ChannelsPage(),
+            ChannelsPage(settingsPageBuilder: _buildSettingsPage),
             Positioned.fill(
               child: ChannelQuickActionsLauncher(
                 visible: true,
@@ -115,6 +135,511 @@ void main() {
     expect(find.text('DMs'), findsOneWidget);
     expect(find.text('Community'), findsOneWidget);
     expect(find.byTooltip('Create or start conversation'), findsOneWidget);
+
+    for (final label in ['general', 'Alice']) {
+      final text = tester.widget<Text>(find.text(label));
+      expect(text.style?.fontSize, contentListTitleTextStyle.fontSize);
+      expect(text.style?.height, contentListTitleTextStyle.height);
+    }
+    final sectionTitle = tester.widget<Text>(find.text('Channels'));
+    expect(sectionTitle.style?.fontSize, contentListTitleTextStyle.fontSize);
+    expect(sectionTitle.style?.fontWeight, FontWeight.w600);
+  });
+
+  testWidgets('keeps the last channel above the floating tab bar', (
+    tester,
+  ) async {
+    const footerClearance = 102.0;
+    await tester.pumpWidget(
+      buildTestable(
+        bottomPadding: footerClearance,
+        overrides: [
+          channelsProvider.overrideWith(() => _FakeNotifier(testChannels)),
+        ],
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final padding = tester.widget<SliverPadding>(
+      find.descendant(
+        of: find.byType(CustomScrollView),
+        matching: find.byType(SliverPadding),
+      ),
+    );
+    expect((padding.padding as EdgeInsets).bottom, footerClearance);
+  });
+
+  testWidgets('truncates long custom section names beside the menu', (
+    tester,
+  ) async {
+    tester.view.physicalSize = const Size(320, 800);
+    tester.view.devicePixelRatio = 1;
+    addTearDown(tester.view.reset);
+    const sectionName = 'A deliberately long custom section name for testing';
+    await tester.pumpWidget(
+      buildTestable(
+        overrides: [
+          channelsProvider.overrideWith(() => _FakeNotifier(testChannels)),
+          channelSectionsProvider.overrideWith(
+            () => _FakeChannelSectionsNotifier(
+              const ChannelSectionStore(
+                sections: [
+                  ChannelSection(id: 'section-1', name: sectionName, order: 0),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final label = tester.widget<Text>(find.text(sectionName));
+    expect(label.maxLines, 1);
+    expect(label.overflow, TextOverflow.ellipsis);
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('aligns the top, section, row, and skeleton label columns', (
+    tester,
+  ) async {
+    final relaySession = _ReconnectingRelaySession();
+    await tester.pumpWidget(
+      buildTestable(
+        overrides: [
+          channelsProvider.overrideWith(() => _FakeNotifier(testChannels)),
+          relaySessionProvider.overrideWith(() => relaySession),
+        ],
+      ),
+    );
+    relaySession.connect();
+    await tester.pumpAndSettle();
+
+    final topLabelX = tester.getTopLeft(find.text('Community')).dx;
+    final sectionLabelX = tester.getTopLeft(find.text('Channels')).dx;
+    final rowLabelX = tester.getTopLeft(find.text('general')).dx;
+    expect(topLabelX, sectionLabelX);
+    expect(sectionLabelX, rowLabelX);
+
+    relaySession.setReconnecting();
+    await tester.pump();
+    await tester.pump(const Duration(seconds: 2));
+    await tester.pump();
+
+    final skeletonSectionLabelX = tester
+        .getTopLeft(
+          find.byKey(const Key('channels-skeleton-section-label')).first,
+        )
+        .dx;
+    final skeletonRowLabelX = tester
+        .getTopLeft(
+          find.byKey(const Key('channels-skeleton-row-label-0')).first,
+        )
+        .dx;
+    expect(skeletonSectionLabelX, skeletonRowLabelX);
+    expect(skeletonSectionLabelX, sectionLabelX);
+  });
+
+  testWidgets('reveals channel content from same-slot reconnect skeletons', (
+    tester,
+  ) async {
+    final relaySession = _ReconnectingRelaySession();
+    await tester.pumpWidget(
+      buildTestable(
+        overrides: [
+          channelsProvider.overrideWith(() => _FakeNotifier(testChannels)),
+          relaySessionProvider.overrideWith(() => relaySession),
+        ],
+      ),
+    );
+    await tester.pump();
+    await tester.pump(const Duration(seconds: 2));
+    await tester.pump();
+
+    final skeleton = find.byKey(const Key('channels-connection-skeleton'));
+    expect(skeleton, findsOneWidget);
+    expect(
+      find.descendant(of: skeleton, matching: find.byType(SkeletonBar)),
+      findsWidgets,
+    );
+    expect(
+      find.descendant(
+        of: skeleton,
+        matching: find.byType(CircularProgressIndicator),
+      ),
+      findsNothing,
+    );
+    expect(
+      tester
+          .widget<Opacity>(find.byKey(const Key('skeleton-reveal-placeholder')))
+          .opacity,
+      1,
+    );
+    expect(
+      tester
+          .widget<Opacity>(find.byKey(const Key('skeleton-reveal-content')))
+          .opacity,
+      0,
+    );
+
+    relaySession.connect();
+    await tester.pump();
+    await tester.pump();
+    expect(
+      tester.widget<SkeletonReveal>(find.byType(SkeletonReveal)).loading,
+      isFalse,
+    );
+    await tester.pump(const Duration(milliseconds: 200));
+
+    expect(
+      tester
+          .widget<Opacity>(find.byKey(const Key('skeleton-reveal-placeholder')))
+          .opacity,
+      closeTo(0.5, 0.01),
+    );
+    expect(
+      tester
+          .widget<Opacity>(find.byKey(const Key('skeleton-reveal-content')))
+          .opacity,
+      closeTo(0.5, 0.01),
+    );
+
+    await tester.pump(const Duration(milliseconds: 200));
+    expect(find.text('general'), findsOneWidget);
+  });
+
+  testWidgets('announces neutral loading outside connection transitions', (
+    tester,
+  ) async {
+    final relaySession = _ReconnectingRelaySession(
+      initialStatus: SessionStatus.connected,
+    );
+    await tester.pumpWidget(
+      buildTestable(
+        overrides: [
+          channelsProvider.overrideWith(() => _LoadingNotifier()),
+          relaySessionProvider.overrideWith(() => relaySession),
+        ],
+      ),
+    );
+    await tester.pump();
+
+    expect(
+      tester
+          .widget<Semantics>(
+            find.byKey(const Key('channels-connection-skeleton')),
+          )
+          .properties
+          .label,
+      'Loading',
+    );
+  });
+
+  testWidgets('opens the settings page supplied by the app layer', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      buildTestable(
+        overrides: [
+          channelsProvider.overrideWith(() => _FakeNotifier(testChannels)),
+        ],
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byType(ProfileAvatar));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Injected settings'), findsOneWidget);
+  });
+
+  testWidgets('community switcher separates selection from edit removal', (
+    tester,
+  ) async {
+    tester.view.physicalSize = const Size(390, 844);
+    tester.view.devicePixelRatio = 1;
+    addTearDown(tester.view.resetPhysicalSize);
+    addTearDown(tester.view.resetDevicePixelRatio);
+
+    final communities = [
+      Community(
+        id: 'alpha',
+        name: 'Alpha',
+        relayUrl: 'wss://alpha.example.com',
+        addedAt: DateTime(2025),
+      ),
+      Community(
+        id: 'bravo',
+        name: 'Bravo',
+        relayUrl: 'wss://bravo.example.com',
+        addedAt: DateTime(2025),
+      ),
+    ];
+    final communityNotifier = _FakeCommunityListNotifier(communities);
+
+    await tester.pumpWidget(
+      buildTestable(
+        communityIcons: const {
+          'wss://alpha.example.com':
+              'data:image/png;base64,'
+              'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=',
+        },
+        overrides: [
+          channelsProvider.overrideWith(() => _FakeNotifier(testChannels)),
+          communityListProvider.overrideWith(() => communityNotifier),
+          activeCommunityProvider.overrideWith(
+            (ref) async => communities.first,
+          ),
+        ],
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.text('Alpha'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Switch Community'), findsOneWidget);
+    final options = find.byKey(const Key('community-switcher-options'));
+    expect(options, findsOneWidget);
+    final editButton = find.byKey(const Key('community-switcher-edit'));
+    expect(
+      tester.getRect(options).top - tester.getRect(editButton).bottom,
+      closeTo(8, 0.01),
+    );
+    expect(tester.getSize(editButton).height, 32);
+    expect(find.text('alpha.example.com'), findsOneWidget);
+    expect(find.text('bravo.example.com'), findsOneWidget);
+    expect(find.text('Rename'), findsNothing);
+    expect(find.byIcon(LucideIcons.ellipsisVertical), findsNothing);
+    expect(find.text('Edit'), findsOneWidget);
+    expect(find.byIcon(LucideIcons.trash2), findsNothing);
+    expect(
+      tester.getSize(find.byKey(const Key('community-switcher-avatar-alpha'))),
+      const Size.square(36),
+    );
+    final alphaAvatar = tester.widget<AvatarImage>(
+      find.descendant(
+        of: find.byKey(const Key('community-switcher-avatar-alpha')),
+        matching: find.byType(AvatarImage),
+      ),
+    );
+    expect(alphaAvatar.imageUrl, startsWith('data:image/png;base64,'));
+    final activeSelection = find.byKey(
+      const Key('community-switcher-selection-alpha'),
+    );
+    final inactiveSelection = find.byKey(
+      const Key('community-switcher-selection-bravo'),
+    );
+    expect(tester.getSize(activeSelection), const Size.square(40));
+    expect(
+      tester.getSize(find.byKey(const Key('community-switcher-circle-alpha'))),
+      const Size.square(24),
+    );
+    expect(
+      find.descendant(
+        of: activeSelection,
+        matching: find.byIcon(LucideIcons.check),
+      ),
+      findsOneWidget,
+    );
+    expect(
+      find.descendant(
+        of: inactiveSelection,
+        matching: find.byIcon(LucideIcons.check),
+      ),
+      findsNothing,
+    );
+    expect(
+      find.descendant(of: options, matching: find.byType(Divider)),
+      findsNWidgets(2),
+    );
+
+    await tester.tap(find.text('Edit'));
+    await tester.pump();
+
+    final activeAction = find.byKey(
+      const Key('community-switcher-action-alpha'),
+    );
+    final actionSwitcher = tester.widget<AnimatedSwitcher>(
+      find.descendant(
+        of: activeAction,
+        matching: find.byType(AnimatedSwitcher),
+      ),
+    );
+    expect(actionSwitcher.duration, const Duration(milliseconds: 250));
+    expect(activeSelection, findsOneWidget);
+    expect(
+      find.byKey(const Key('community-switcher-remove-alpha')),
+      findsOneWidget,
+    );
+
+    await tester.pump(const Duration(milliseconds: 125));
+
+    final transitioningOpacities = tester
+        .widgetList<Opacity>(
+          find.descendant(of: activeAction, matching: find.byType(Opacity)),
+        )
+        .map((opacity) => opacity.opacity);
+    expect(
+      transitioningOpacities.any((opacity) => opacity > 0 && opacity < 1),
+      isTrue,
+    );
+    expect(
+      find.descendant(of: activeAction, matching: find.byType(ImageFiltered)),
+      findsWidgets,
+    );
+
+    await tester.pumpAndSettle();
+
+    expect(find.text('Done'), findsOneWidget);
+    expect(find.byIcon(LucideIcons.trash2), findsNWidgets(2));
+    expect(activeSelection, findsNothing);
+    expect(inactiveSelection, findsNothing);
+
+    await tester.tap(find.byTooltip('Remove Bravo'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Remove community?'), findsOneWidget);
+    expect(
+      find.text(
+        'Are you sure you want to remove “Bravo”? '
+        'You can pair with it again later.',
+      ),
+      findsOneWidget,
+    );
+
+    await tester.tap(find.widgetWithText(FilledButton, 'Remove'));
+    await tester.pumpAndSettle();
+
+    expect(communityNotifier.removedIds, ['bravo']);
+    expect(find.text('Switch Community'), findsOneWidget);
+    expect(find.text('Bravo'), findsNothing);
+    expect(find.text('Done'), findsOneWidget);
+
+    await tester.tap(find.text('Done'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Edit'), findsOneWidget);
+    expect(
+      find.byKey(const Key('community-switcher-selection-alpha')),
+      findsOneWidget,
+    );
+  });
+
+  testWidgets('opening the community switcher refreshes visible icons', (
+    tester,
+  ) async {
+    final community = Community(
+      id: 'alpha',
+      name: 'Alpha',
+      relayUrl: 'wss://alpha.example.com',
+      addedAt: DateTime(2025),
+    );
+    var iconLoads = 0;
+
+    await tester.pumpWidget(
+      buildTestable(
+        onCommunityIconLoad: (_) => iconLoads++,
+        overrides: [
+          channelsProvider.overrideWith(() => _FakeNotifier(testChannels)),
+          communityListProvider.overrideWith(
+            () => _FakeCommunityListNotifier([community]),
+          ),
+          activeCommunityProvider.overrideWith((ref) async => community),
+        ],
+      ),
+    );
+    await tester.pumpAndSettle();
+    final initialIconLoads = iconLoads;
+
+    await tester.tap(find.text('Alpha'));
+    await tester.pumpAndSettle();
+
+    expect(iconLoads, greaterThan(initialIconLoads));
+  });
+
+  testWidgets('community switcher header grows with accessible text', (
+    tester,
+  ) async {
+    final community = Community(
+      id: 'alpha',
+      name: 'Alpha',
+      relayUrl: 'wss://alpha.example.com',
+      addedAt: DateTime(2025),
+    );
+
+    await tester.pumpWidget(
+      buildTestable(
+        textScaler: TextScaler.linear(2),
+        overrides: [
+          channelsProvider.overrideWith(() => _FakeNotifier(testChannels)),
+          communityListProvider.overrideWith(
+            () => _FakeCommunityListNotifier([community]),
+          ),
+          activeCommunityProvider.overrideWith((ref) async => community),
+        ],
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.text('Alpha'));
+    await tester.pumpAndSettle();
+
+    expect(tester.takeException(), isNull);
+    expect(
+      tester.getSize(find.byKey(const Key('community-switcher-title'))).height,
+      greaterThan(32),
+    );
+  });
+
+  testWidgets('community switcher disables icon motion when requested', (
+    tester,
+  ) async {
+    final communities = [
+      Community(
+        id: 'alpha',
+        name: 'Alpha',
+        relayUrl: 'wss://alpha.example.com',
+        addedAt: DateTime(2025),
+      ),
+    ];
+
+    await tester.pumpWidget(
+      buildTestable(
+        disableAnimations: true,
+        overrides: [
+          channelsProvider.overrideWith(() => _FakeNotifier(testChannels)),
+          communityListProvider.overrideWith(
+            () => _FakeCommunityListNotifier(communities),
+          ),
+          activeCommunityProvider.overrideWith(
+            (ref) async => communities.first,
+          ),
+        ],
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.text('Alpha'));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Edit'));
+    await tester.pump();
+
+    final actionSwitcher = tester.widget<AnimatedSwitcher>(
+      find.descendant(
+        of: find.byKey(const Key('community-switcher-action-alpha')),
+        matching: find.byType(AnimatedSwitcher),
+      ),
+    );
+    expect(actionSwitcher.duration, Duration.zero);
+    expect(
+      find.byKey(const Key('community-switcher-selection-alpha')),
+      findsNothing,
+    );
+    expect(
+      find.byKey(const Key('community-switcher-remove-alpha')),
+      findsOneWidget,
+    );
   });
 
   testWidgets('quick actions slide behind navigation when leaving home', (
@@ -885,6 +1410,9 @@ void main() {
   });
 }
 
+Widget _buildSettingsPage(BuildContext context) =>
+    const Scaffold(body: Text('Injected settings'));
+
 class _FakeNotifier extends ChannelsNotifier {
   final List<Channel> _channels;
   final Map<String, Map<String, ObservedUnreadEvent>> _observedEventsByChannel;
@@ -914,11 +1442,75 @@ class _FakeNotifier extends ChannelsNotifier {
   get observedUnreadEventsByChannel => _observedEventsByChannel;
 }
 
+class _FakeChannelSectionsNotifier extends ChannelSectionsNotifier {
+  _FakeChannelSectionsNotifier(this._store);
+
+  final ChannelSectionStore _store;
+
+  @override
+  ChannelSectionsState build() =>
+      ChannelSectionsState(isReady: true, store: _store, version: 1);
+}
+
+class _FakeCommunityListNotifier extends CommunityListNotifier {
+  _FakeCommunityListNotifier(this._communities);
+
+  List<Community> _communities;
+  final List<String> removedIds = [];
+
+  @override
+  Future<List<Community>> build() async => _communities;
+
+  @override
+  Future<void> removeCommunity(String id) async {
+    removedIds.add(id);
+    _communities = _communities
+        .where((community) => community.id != id)
+        .toList();
+    state = AsyncData(_communities);
+  }
+}
+
 class _ErrorNotifier extends ChannelsNotifier {
   @override
   Future<List<Channel>> build() => Future.error('Connection refused');
 }
 
+class _LoadingNotifier extends ChannelsNotifier {
+  @override
+  Future<List<Channel>> build() => Completer<List<Channel>>().future;
+}
+
+class _ReconnectingRelaySession extends RelaySessionNotifier {
+  final SessionStatus initialStatus;
+
+  _ReconnectingRelaySession({this.initialStatus = SessionStatus.reconnecting});
+
+  @override
+  SessionState build() => SessionState(status: initialStatus);
+
+  @override
+  Future<List<NostrEvent>> fetchHistory(
+    NostrFilter filter, {
+    Duration timeout = const Duration(seconds: 8),
+  }) async => [];
+
+  @override
+  Future<void Function()> subscribe(
+    NostrFilter filter,
+    void Function(NostrEvent) onEvent, {
+    void Function(String message)? onClosed,
+  }) async => () {};
+
+  void connect() {
+    state = const SessionState(status: SessionStatus.connected);
+  }
+
+  void setReconnecting() {
+    state = const SessionState(status: SessionStatus.reconnecting);
+  }
+}
+
 class _FakeProfileNotifier extends ProfileNotifier {
   @override
   Future<UserProfile?> build() async =>
@@ -946,7 +1538,7 @@ class _FakeReadStateNotifier extends ReadStateNotifier {
       pubkey: state.pubkey,
       contexts: state.contexts,
       version: state.version + 1,
-      locallyForcedChannelIds: state.locallyForcedChannelIds,
+      forcedUnreadContexts: state.forcedUnreadContexts,
     );
   }
 
@@ -957,7 +1549,11 @@ class _FakeReadStateNotifier extends ReadStateNotifier {
   }
 
   @override
-  void markContextRead(String contextId, int unixTimestamp) {
+  void markContextRead(
+    String contextId,
+    int unixTimestamp, {
+    bool clearForcedMessages = false,
+  }) {
     markedContexts[contextId] = unixTimestamp;
     state = state.copyWithContext(contextId, unixTimestamp);
   }
diff --git a/mobile/test/features/channels/compose_bar_test.dart b/mobile/test/features/channels/compose_bar_test.dart
index a4953401ae..7b747adfac 100644
--- a/mobile/test/features/channels/compose_bar_test.dart
+++ b/mobile/test/features/channels/compose_bar_test.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'dart:math' as math;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -18,10 +19,12 @@ import 'package:buzz/features/channels/compose_bar.dart';
 import 'package:buzz/features/channels/channels_provider.dart';
 import 'package:buzz/features/channels/mentions/mention_candidates.dart';
 import 'package:buzz/features/channels/mentions/mention_candidates_provider.dart';
-import 'package:buzz/features/custom_emoji/custom_emoji.dart';
-import 'package:buzz/features/custom_emoji/custom_emoji_provider.dart';
+import 'package:buzz/features/channels/photo_library.dart';
+import 'package:buzz/shared/custom_emoji/custom_emoji.dart';
+import 'package:buzz/shared/custom_emoji/custom_emoji_provider.dart';
 import 'package:buzz/shared/relay/relay.dart';
 import 'package:buzz/shared/theme/theme.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 final _pngBytes = Uint8List.fromList([
   0x89,
@@ -126,6 +129,9 @@ List<int> _testPngChunk(String type, List<int> payload) {
 }
 
 const _mediaUploadPlatformChannel = MethodChannel('buzz/media_upload');
+const _nativeAttachmentPopoverChannel = MethodChannel(
+  'buzz/native_attachment_popover',
+);
 
 void _setMockMediaUploadPlatformHandler(
   Future<Object?> Function(MethodCall call)? handler,
@@ -134,6 +140,31 @@ void _setMockMediaUploadPlatformHandler(
       .setMockMethodCallHandler(_mediaUploadPlatformChannel, handler);
 }
 
+void _setMockNativeAttachmentPopoverHandler(
+  Future<Object?> Function(MethodCall call)? handler,
+) {
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+      .setMockMethodCallHandler(_nativeAttachmentPopoverChannel, handler);
+}
+
+Future<void> _sendNativeAttachmentPopoverCall(
+  WidgetTester tester,
+  String method, [
+  Object? arguments,
+]) async {
+  await tester.binding.defaultBinaryMessenger.handlePlatformMessage(
+    _nativeAttachmentPopoverChannel.name,
+    _nativeAttachmentPopoverChannel.codec.encodeMethodCall(
+      MethodCall(method, arguments),
+    ),
+    null,
+  );
+}
+
+/// Shared mock prefs for the compose bar's draft store. Initialized in
+/// [main].
+late SharedPreferences _testPrefs;
+
 Widget _buildComposeBar({
   required MediaUploadService uploadService,
   required ComposeBarOnSend onSend,
@@ -143,12 +174,16 @@ Widget _buildComposeBar({
   List<Channel> channels = const <Channel>[],
   String? currentPubkey,
   bool? supportsShowingSystemContextMenu,
+  TextScaler? textScaler,
   List<CustomEmoji> customEmoji = const <CustomEmoji>[],
+  RelayConfigNotifier Function()? relayConfig,
+  PhotoLibrary photoLibrary = const _EmptyPhotoLibrary(),
 }) {
   return ProviderScope(
     overrides: [
       customEmojiListProvider.overrideWithValue(customEmoji),
       mediaUploadServiceProvider.overrideWithValue(uploadService),
+      photoLibraryProvider.overrideWithValue(photoLibrary),
       currentPubkeyProvider.overrideWith((ref) => currentPubkey),
       channelMembersProvider(
         'channel-1',
@@ -158,17 +193,22 @@ Widget _buildComposeBar({
       relayClientProvider.overrideWithValue(
         RelayClient(baseUrl: 'http://localhost:3000'),
       ),
-      relayConfigProvider.overrideWith(() => _FakeRelayConfigNotifier()),
+      relayConfigProvider.overrideWith(
+        relayConfig ?? _FakeRelayConfigNotifier.new,
+      ),
+      savedPrefsProvider.overrideWithValue(_testPrefs),
       channelsProvider.overrideWith(() => _FakeChannelsNotifier(channels)),
     ],
     child: MaterialApp(
       theme: AppTheme.light(),
-      builder: supportsShowingSystemContextMenu == null
+      builder: supportsShowingSystemContextMenu == null && textScaler == null
           ? null
           : (context, child) => MediaQuery(
               data: MediaQuery.of(context).copyWith(
                 supportsShowingSystemContextMenu:
-                    supportsShowingSystemContextMenu,
+                    supportsShowingSystemContextMenu ??
+                    MediaQuery.of(context).supportsShowingSystemContextMenu,
+                textScaler: textScaler ?? MediaQuery.textScalerOf(context),
               ),
               child: child!,
             ),
@@ -184,6 +224,54 @@ Widget _buildComposeBar({
   );
 }
 
+Widget _buildNativePopoverOwnershipHarness({
+  required MediaUploadService uploadService,
+  required bool includeFirstComposer,
+}) {
+  return ProviderScope(
+    overrides: [
+      customEmojiListProvider.overrideWithValue(const []),
+      mediaUploadServiceProvider.overrideWithValue(uploadService),
+      photoLibraryProvider.overrideWithValue(const _EmptyPhotoLibrary()),
+      currentPubkeyProvider.overrideWith((ref) => null),
+      channelMembersProvider(
+        'channel-1',
+      ).overrideWith((ref) => Future.value(const <ChannelMember>[])),
+      agentDirectoryProvider.overrideWith(
+        (ref) async => const <AgentDirectoryEntry>[],
+      ),
+      agentOwnersProvider.overrideWith((ref) async => const <String, String>{}),
+      relayClientProvider.overrideWithValue(
+        RelayClient(baseUrl: 'http://localhost:3000'),
+      ),
+      relayConfigProvider.overrideWith(_FakeRelayConfigNotifier.new),
+      savedPrefsProvider.overrideWithValue(_testPrefs),
+      channelsProvider.overrideWith(() => _FakeChannelsNotifier(const [])),
+    ],
+    child: MaterialApp(
+      theme: AppTheme.light(),
+      home: Scaffold(
+        body: Column(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: [
+            if (includeFirstComposer)
+              ComposeBar(
+                key: const ValueKey('first-composer'),
+                channelId: 'channel-1',
+                onSend: (_, _, {mediaTags = const []}) async {},
+              ),
+            ComposeBar(
+              key: const ValueKey('second-composer'),
+              channelId: 'channel-1',
+              onSend: (_, _, {mediaTags = const []}) async {},
+            ),
+          ],
+        ),
+      ),
+    ),
+  );
+}
+
 class _FakeRelayConfigNotifier extends RelayConfigNotifier {
   @override
   RelayConfig build() => RelayConfig(
@@ -192,6 +280,44 @@ class _FakeRelayConfigNotifier extends RelayConfigNotifier {
   );
 }
 
+class _EmptyPhotoLibrary implements PhotoLibrary {
+  const _EmptyPhotoLibrary();
+
+  @override
+  Future<List<RecentPhoto>> loadRecentPhotos() async => const [];
+
+  @override
+  Future<List<XFile>> resolveSelectedPhotos(List<RecentPhoto> photos) async =>
+      const [];
+}
+
+class _FakePhotoLibrary implements PhotoLibrary {
+  final List<RecentPhoto> photos;
+
+  const _FakePhotoLibrary(this.photos);
+
+  @override
+  Future<List<RecentPhoto>> loadRecentPhotos() async => photos;
+
+  @override
+  Future<List<XFile>> resolveSelectedPhotos(List<RecentPhoto> photos) async => [
+    for (final photo in photos)
+      XFile.fromData(_pngBytes, name: '${photo.id}.png'),
+  ];
+}
+
+/// Relay config that starts from a fixed identity and can be switched
+/// in place via [RelayConfigNotifier.update] — simulates a community or
+/// account switch while widgets stay mounted.
+class _SwitchableRelayConfigNotifier extends RelayConfigNotifier {
+  final RelayConfig initial;
+
+  _SwitchableRelayConfigNotifier(this.initial);
+
+  @override
+  RelayConfig build() => initial;
+}
+
 class _RecordingRelaySocket extends RelaySocket {
   final List<Map<String, dynamic>> events;
   final void Function(List<dynamic> message) handleMessage;
@@ -241,6 +367,11 @@ class _FakeChannelsNotifier extends ChannelsNotifier {
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
+  setUp(() async {
+    SharedPreferences.setMockInitialValues({});
+    _testPrefs = await SharedPreferences.getInstance();
+  });
+
   setUpAll(() {
     _setMockMediaUploadPlatformHandler((call) async {
       switch (call.method) {
@@ -262,6 +393,72 @@ void main() {
   });
 
   group('ComposeBar', () {
+    testWidgets('mounted composer does not carry draft text across an in-place '
+        'identity switch', (tester) async {
+      final keysA = nostr.Keys.generate();
+      final keysB = nostr.Keys.generate();
+      const relayUrl = 'http://localhost:3000';
+
+      await tester.pumpWidget(
+        _buildComposeBar(
+          uploadService: _testUploadService(keysA.nsec),
+          relayConfig: () => _SwitchableRelayConfigNotifier(
+            RelayConfig(baseUrl: relayUrl, nsec: keysA.nsec),
+          ),
+          onSend:
+              (
+                content,
+                mentionPubkeys, {
+                mediaTags = const <List<String>>[],
+              }) async {},
+        ),
+      );
+
+      String? storedText(nostr.Keys keys) {
+        final raw = _testPrefs.getString(
+          'compose_drafts_v1:$relayUrl:${keys.public}',
+        );
+        if (raw == null) return null;
+        final drafts = jsonDecode(raw) as List;
+        if (drafts.isEmpty) return null;
+        return (drafts.first as Map<String, dynamic>)['text'] as String?;
+      }
+
+      // Identity A types a draft; it persists into A's namespaced store.
+      await _expandComposer(tester);
+      await tester.enterText(find.byType(TextField), 'identity A secret draft');
+      await tester.pump();
+      expect(storedText(keysA), 'identity A secret draft');
+
+      // Switch identity in place while the composer stays mounted.
+      final container = ProviderScope.containerOf(
+        tester.element(find.byType(ComposeBar)),
+      );
+      container
+          .read(relayConfigProvider.notifier)
+          .update(baseUrl: relayUrl, nsec: keysB.nsec);
+      await tester.pumpAndSettle();
+
+      // The mounted composer must not carry identity A's text forward.
+      final textField = tester.widget<TextField>(find.byType(TextField));
+      expect(textField.controller!.text, isEmpty);
+      expect(storedText(keysB), isNull);
+
+      // Identity B's edits persist only into B's store; A's is untouched.
+      await tester.enterText(find.byType(TextField), 'identity B text');
+      await tester.pump();
+      expect(storedText(keysB), 'identity B text');
+      expect(storedText(keysA), 'identity A secret draft');
+
+      // Switching back restores identity A's own draft into the composer.
+      container
+          .read(relayConfigProvider.notifier)
+          .update(baseUrl: relayUrl, nsec: keysA.nsec);
+      await tester.pumpAndSettle();
+      expect(textField.controller!.text, 'identity A secret draft');
+      expect(storedText(keysB), 'identity B text');
+    });
+
     testWidgets('inserts a community emoji at the cursor from the action row', (
       tester,
     ) async {
@@ -298,6 +495,478 @@ void main() {
       expect(textField.controller!.selection.baseOffset, 12);
     });
 
+    testWidgets('native All Photos picker failures show an error', (
+      tester,
+    ) async {
+      final previousPlatform = debugDefaultTargetPlatformOverride;
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      _setMockNativeAttachmentPopoverHandler((call) async {
+        return switch (call.method) {
+          'isSupported' || 'present' => true,
+          'dismiss' => null,
+          _ => null,
+        };
+      });
+      final uploadService = MediaUploadService(
+        baseUrl: 'https://relay.example',
+        nsec: nostr.Keys.generate().nsec,
+        pickGalleryImage: () async => null,
+        pickGalleryImages: () async =>
+            throw PlatformException(code: 'photo_picker_failed'),
+        pickGalleryVideo: () async => null,
+      );
+
+      try {
+        await tester.pumpWidget(
+          _buildComposeBar(
+            uploadService: uploadService,
+            onSend:
+                (
+                  content,
+                  mentionPubkeys, {
+                  mediaTags = const <List<String>>[],
+                }) async {},
+          ),
+        );
+
+        await tester.tap(find.byTooltip('Add attachment').hitTestable());
+        await tester.pumpAndSettle();
+        await _sendNativeAttachmentPopoverCall(tester, 'pickAllPhotos');
+        await _sendNativeAttachmentPopoverCall(tester, 'dismissed');
+        await tester.pumpAndSettle();
+
+        expect(find.text('Unable to open your photo library.'), findsOneWidget);
+      } finally {
+        await _sendNativeAttachmentPopoverCall(tester, 'dismissed');
+        await tester.pumpWidget(const SizedBox.shrink());
+        _setMockNativeAttachmentPopoverHandler(null);
+        debugDefaultTargetPlatformOverride = previousPlatform;
+      }
+    });
+
+    testWidgets('opening the native attachment popover keeps composer focus', (
+      tester,
+    ) async {
+      final previousPlatform = debugDefaultTargetPlatformOverride;
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      var presentCalls = 0;
+      _setMockNativeAttachmentPopoverHandler((call) async {
+        switch (call.method) {
+          case 'isSupported':
+            return true;
+          case 'present':
+            presentCalls += 1;
+            return true;
+          case 'dismiss':
+            return null;
+        }
+        return null;
+      });
+
+      try {
+        await tester.pumpWidget(
+          _buildComposeBar(
+            uploadService: _testUploadService(nostr.Keys.generate().nsec),
+            onSend:
+                (
+                  content,
+                  mentionPubkeys, {
+                  mediaTags = const <List<String>>[],
+                }) async {},
+          ),
+        );
+
+        await _expandComposer(tester);
+        await tester.enterText(find.byType(TextField), 'Hello');
+        await tester.pumpAndSettle();
+
+        final textField = tester.widget<TextField>(find.byType(TextField));
+        expect(textField.focusNode?.hasFocus, isTrue);
+
+        await tester.tap(find.byTooltip('Add attachment').hitTestable());
+        await tester.pumpAndSettle();
+
+        expect(presentCalls, 1);
+        expect(textField.focusNode?.hasFocus, isTrue);
+      } finally {
+        await _sendNativeAttachmentPopoverCall(tester, 'dismissed');
+        await tester.pumpWidget(const SizedBox.shrink());
+        _setMockNativeAttachmentPopoverHandler(null);
+        debugDefaultTargetPlatformOverride = previousPlatform;
+      }
+    });
+
+    testWidgets(
+      'unsupported iOS attachment popover unfocuses before fallback menu',
+      (tester) async {
+        final previousPlatform = debugDefaultTargetPlatformOverride;
+        debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+        _setMockNativeAttachmentPopoverHandler((call) async {
+          return switch (call.method) {
+            'isSupported' => false,
+            'dismiss' => null,
+            _ => null,
+          };
+        });
+
+        try {
+          await tester.pumpWidget(
+            _buildComposeBar(
+              uploadService: _testUploadService(nostr.Keys.generate().nsec),
+              onSend:
+                  (
+                    content,
+                    mentionPubkeys, {
+                    mediaTags = const <List<String>>[],
+                  }) async {},
+            ),
+          );
+
+          await _expandComposer(tester);
+          await tester.enterText(find.byType(TextField), 'Hello');
+          await tester.pumpAndSettle();
+
+          final textField = tester.widget<TextField>(find.byType(TextField));
+          expect(textField.focusNode?.hasFocus, isTrue);
+
+          await tester.tap(find.byTooltip('Add attachment').hitTestable());
+          await tester.pumpAndSettle();
+
+          expect(textField.focusNode?.hasFocus, isFalse);
+          expect(find.byKey(const ValueKey('attachment-menu')), findsOneWidget);
+        } finally {
+          await tester.pumpWidget(const SizedBox.shrink());
+          _setMockNativeAttachmentPopoverHandler(null);
+          debugDefaultTargetPlatformOverride = previousPlatform;
+        }
+      },
+    );
+
+    testWidgets('disposing a non-owner keeps native popover callbacks active', (
+      tester,
+    ) async {
+      final previousPlatform = debugDefaultTargetPlatformOverride;
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      var presentCalls = 0;
+      var dismissCalls = 0;
+      var pickAllPhotosCalls = 0;
+      _setMockNativeAttachmentPopoverHandler((call) async {
+        switch (call.method) {
+          case 'isSupported':
+            return true;
+          case 'present':
+            presentCalls += 1;
+            return true;
+          case 'dismiss':
+            dismissCalls += 1;
+            return null;
+        }
+        return null;
+      });
+      final uploadService = MediaUploadService(
+        baseUrl: 'https://relay.example',
+        nsec: nostr.Keys.generate().nsec,
+        pickGalleryImage: () async => null,
+        pickGalleryImages: () async {
+          pickAllPhotosCalls += 1;
+          return const [];
+        },
+        pickGalleryVideo: () async => null,
+      );
+
+      try {
+        await tester.pumpWidget(
+          _buildNativePopoverOwnershipHarness(
+            uploadService: uploadService,
+            includeFirstComposer: true,
+          ),
+        );
+
+        await tester.tap(find.byTooltip('Add attachment').hitTestable().at(1));
+        await tester.pumpAndSettle();
+        expect(presentCalls, 1);
+
+        await tester.pumpWidget(
+          _buildNativePopoverOwnershipHarness(
+            uploadService: uploadService,
+            includeFirstComposer: false,
+          ),
+        );
+        await tester.pumpAndSettle();
+        expect(dismissCalls, 0);
+
+        await _sendNativeAttachmentPopoverCall(tester, 'pickAllPhotos');
+        await tester.pumpAndSettle();
+        expect(pickAllPhotosCalls, 1);
+
+        await _sendNativeAttachmentPopoverCall(tester, 'dismissed');
+      } finally {
+        await _sendNativeAttachmentPopoverCall(tester, 'dismissed');
+        await tester.pumpWidget(const SizedBox.shrink());
+        _setMockNativeAttachmentPopoverHandler(null);
+        debugDefaultTargetPlatformOverride = previousPlatform;
+      }
+    });
+
+    testWidgets(
+      'a pending native popover does not claim another composer tap',
+      (tester) async {
+        final previousPlatform = debugDefaultTargetPlatformOverride;
+        debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+        final supportResult = Completer<bool>();
+        var supportCalls = 0;
+        var presentCalls = 0;
+        _setMockNativeAttachmentPopoverHandler((call) async {
+          switch (call.method) {
+            case 'isSupported':
+              supportCalls += 1;
+              return supportResult.future;
+            case 'present':
+              presentCalls += 1;
+              return true;
+            case 'dismiss':
+              return null;
+          }
+          return null;
+        });
+        final uploadService = MediaUploadService(
+          baseUrl: 'https://relay.example',
+          nsec: nostr.Keys.generate().nsec,
+          pickGalleryImage: () async => null,
+          pickGalleryImages: () async => const [],
+          pickGalleryVideo: () async => null,
+        );
+
+        try {
+          await tester.pumpWidget(
+            _buildNativePopoverOwnershipHarness(
+              uploadService: uploadService,
+              includeFirstComposer: true,
+            ),
+          );
+
+          await tester.tap(
+            find.byTooltip('Add attachment').hitTestable().at(0),
+          );
+          await tester.pump();
+          await tester.tap(
+            find.byTooltip('Add attachment').hitTestable().at(1),
+          );
+          await tester.pumpAndSettle();
+
+          expect(supportCalls, 1);
+          expect(presentCalls, 0);
+          expect(
+            find.descendant(
+              of: find.byKey(const ValueKey('first-composer')),
+              matching: find.byTooltip('Close attachments'),
+            ),
+            findsNothing,
+          );
+          expect(
+            find.descendant(
+              of: find.byKey(const ValueKey('second-composer')),
+              matching: find.byTooltip('Close attachments'),
+            ),
+            findsWidgets,
+          );
+
+          supportResult.complete(true);
+          await tester.pumpAndSettle();
+          expect(presentCalls, 0);
+          expect(
+            find.descendant(
+              of: find.byKey(const ValueKey('first-composer')),
+              matching: find.byTooltip('Close attachments'),
+            ),
+            findsNothing,
+          );
+        } finally {
+          if (!supportResult.isCompleted) supportResult.complete(false);
+          await _sendNativeAttachmentPopoverCall(tester, 'dismissed');
+          await tester.pumpWidget(const SizedBox.shrink());
+          _setMockNativeAttachmentPopoverHandler(null);
+          debugDefaultTargetPlatformOverride = previousPlatform;
+        }
+      },
+    );
+
+    testWidgets('a repeated owner tap keeps its pending native presentation', (
+      tester,
+    ) async {
+      final previousPlatform = debugDefaultTargetPlatformOverride;
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      final supportResult = Completer<bool>();
+      var supportCalls = 0;
+      var presentCalls = 0;
+      _setMockNativeAttachmentPopoverHandler((call) async {
+        switch (call.method) {
+          case 'isSupported':
+            supportCalls += 1;
+            return supportResult.future;
+          case 'present':
+            presentCalls += 1;
+            return true;
+          case 'dismiss':
+            return null;
+        }
+        return null;
+      });
+      final uploadService = MediaUploadService(
+        baseUrl: 'https://relay.example',
+        nsec: nostr.Keys.generate().nsec,
+        pickGalleryImage: () async => null,
+        pickGalleryImages: () async => const [],
+        pickGalleryVideo: () async => null,
+      );
+
+      try {
+        await tester.pumpWidget(
+          _buildNativePopoverOwnershipHarness(
+            uploadService: uploadService,
+            includeFirstComposer: false,
+          ),
+        );
+
+        await tester.tap(find.byTooltip('Add attachment').hitTestable());
+        await tester.pump();
+        await tester.tap(find.byTooltip('Add attachment').hitTestable());
+        await tester.pumpAndSettle();
+
+        expect(supportCalls, 1);
+        expect(presentCalls, 0);
+
+        supportResult.complete(true);
+        await tester.pumpAndSettle();
+
+        expect(presentCalls, 1);
+        expect(find.byTooltip('Close attachments'), findsNothing);
+      } finally {
+        if (!supportResult.isCompleted) supportResult.complete(false);
+        await _sendNativeAttachmentPopoverCall(tester, 'dismissed');
+        await tester.pumpWidget(const SizedBox.shrink());
+        _setMockNativeAttachmentPopoverHandler(null);
+        debugDefaultTargetPlatformOverride = previousPlatform;
+      }
+    });
+
+    testWidgets('disposing the native popover owner releases ownership', (
+      tester,
+    ) async {
+      final previousPlatform = debugDefaultTargetPlatformOverride;
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      var presentCalls = 0;
+      var dismissCalls = 0;
+      _setMockNativeAttachmentPopoverHandler((call) async {
+        switch (call.method) {
+          case 'isSupported':
+            return true;
+          case 'present':
+            presentCalls += 1;
+            return true;
+          case 'dismiss':
+            dismissCalls += 1;
+            return null;
+        }
+        return null;
+      });
+      final uploadService = MediaUploadService(
+        baseUrl: 'https://relay.example',
+        nsec: nostr.Keys.generate().nsec,
+        pickGalleryImage: () async => null,
+        pickGalleryImages: () async => const [],
+        pickGalleryVideo: () async => null,
+      );
+
+      try {
+        await tester.pumpWidget(
+          _buildNativePopoverOwnershipHarness(
+            uploadService: uploadService,
+            includeFirstComposer: true,
+          ),
+        );
+
+        await tester.tap(find.byTooltip('Add attachment').hitTestable().at(0));
+        await tester.pumpAndSettle();
+        expect(presentCalls, 1);
+
+        await tester.pumpWidget(
+          _buildNativePopoverOwnershipHarness(
+            uploadService: uploadService,
+            includeFirstComposer: false,
+          ),
+        );
+        await tester.pumpAndSettle();
+        expect(dismissCalls, 1);
+
+        await tester.tap(find.byTooltip('Add attachment').hitTestable());
+        await tester.pumpAndSettle();
+        expect(presentCalls, 2);
+      } finally {
+        await _sendNativeAttachmentPopoverCall(tester, 'dismissed');
+        await tester.pumpWidget(const SizedBox.shrink());
+        _setMockNativeAttachmentPopoverHandler(null);
+        debugDefaultTargetPlatformOverride = previousPlatform;
+      }
+    });
+
+    testWidgets('missing native dismiss bridge still releases ownership', (
+      tester,
+    ) async {
+      final previousPlatform = debugDefaultTargetPlatformOverride;
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      var presentCalls = 0;
+      _setMockNativeAttachmentPopoverHandler((call) async {
+        switch (call.method) {
+          case 'isSupported':
+            return true;
+          case 'present':
+            presentCalls += 1;
+            return true;
+          case 'dismiss':
+            throw MissingPluginException('dismiss is unavailable');
+        }
+        return null;
+      });
+      final uploadService = MediaUploadService(
+        baseUrl: 'https://relay.example',
+        nsec: nostr.Keys.generate().nsec,
+        pickGalleryImage: () async => null,
+        pickGalleryImages: () async => const [],
+        pickGalleryVideo: () async => null,
+      );
+
+      try {
+        await tester.pumpWidget(
+          _buildNativePopoverOwnershipHarness(
+            uploadService: uploadService,
+            includeFirstComposer: true,
+          ),
+        );
+
+        await tester.tap(find.byTooltip('Add attachment').hitTestable().at(0));
+        await tester.pumpAndSettle();
+        expect(presentCalls, 1);
+
+        await tester.pumpWidget(
+          _buildNativePopoverOwnershipHarness(
+            uploadService: uploadService,
+            includeFirstComposer: false,
+          ),
+        );
+        await tester.pumpAndSettle();
+
+        await tester.tap(find.byTooltip('Add attachment').hitTestable());
+        await tester.pumpAndSettle();
+        expect(presentCalls, 2);
+      } finally {
+        await _sendNativeAttachmentPopoverCall(tester, 'dismissed');
+        await tester.pumpWidget(const SizedBox.shrink());
+        _setMockNativeAttachmentPopoverHandler(null);
+        debugDefaultTargetPlatformOverride = previousPlatform;
+      }
+    });
+
     testWidgets('uploads an image and sends markdown plus imeta tags', (
       tester,
     ) async {
@@ -342,8 +1011,7 @@ void main() {
         ),
       );
 
-      await _openAttachmentMenu(tester);
-      await tester.tap(find.text('Photos'));
+      await _openSystemPhotoPicker(tester);
       await tester.pumpAndSettle();
 
       expect(find.byTooltip('Remove attachment'), findsOneWidget);
@@ -363,15 +1031,115 @@ void main() {
       expect(find.byTooltip('Remove attachment'), findsNothing);
     });
 
-    testWidgets('keeps upload progress visible after the picker closes', (
+    testWidgets('uploads multiple system-selected photos in picker order', (
       tester,
     ) async {
-      final pickedImage = Completer<XFile?>();
       final uploadService = MediaUploadService(
         baseUrl: 'https://relay.example',
         nsec: nostr.Keys.generate().nsec,
+        httpClient: http_testing.MockClient((request) async {
+          final mimeType = request.headers.entries
+              .firstWhere((entry) => entry.key.toLowerCase() == 'content-type')
+              .value;
+          final isGif = mimeType == 'image/gif';
+          return http.Response(
+            jsonEncode({
+              'url': isGif
+                  ? 'https://relay.example/media/two.gif'
+                  : 'https://relay.example/media/one.png',
+              'sha256': isGif
+                  ? '2222222222222222222222222222222222222222222222222222222222222222'
+                  : '1111111111111111111111111111111111111111111111111111111111111111',
+              'size': request.bodyBytes.length,
+              'type': mimeType,
+              'uploaded': 1,
+            }),
+            200,
+          );
+        }),
+        pickGalleryImage: () async => null,
+        pickGalleryImages: () async => [
+          XFile.fromData(_pngBytes, name: 'one.png'),
+          XFile.fromData(_gifBytes, name: 'two.gif'),
+        ],
+        pickGalleryVideo: () async => null,
+      );
+
+      String? sentContent;
+      List<List<String>> sentMediaTags = const [];
+      await tester.pumpWidget(
+        _buildComposeBar(
+          uploadService: uploadService,
+          onSend:
+              (
+                content,
+                mentionPubkeys, {
+                mediaTags = const <List<String>>[],
+              }) async {
+                sentContent = content;
+                sentMediaTags = mediaTags;
+              },
+        ),
+      );
+
+      await _openSystemPhotoPicker(tester);
+      await tester.pumpAndSettle();
+
+      expect(find.byTooltip('Remove attachment'), findsNWidgets(2));
+
+      await _expandComposer(tester);
+      await tester.tap(find.byIcon(LucideIcons.arrowUp));
+      await tester.pumpAndSettle();
+
+      expect(
+        sentContent,
+        '\n![image](https://relay.example/media/one.png)'
+        '\n![image](https://relay.example/media/two.gif)',
+      );
+      expect(sentMediaTags, hasLength(2));
+      expect(sentMediaTags.map((tag) => tag[1]), [
+        'url https://relay.example/media/one.png',
+        'url https://relay.example/media/two.gif',
+      ]);
+    });
+
+    testWidgets('bounds concurrent system-selected photo uploads', (
+      tester,
+    ) async {
+      final releaseFirstBatch = Completer<void>();
+      var requestsStarted = 0;
+      var activeRequests = 0;
+      var peakActiveRequests = 0;
+      final uploadService = MediaUploadService(
+        baseUrl: 'https://relay.example',
+        nsec: nostr.Keys.generate().nsec,
+        httpClient: http_testing.MockClient((request) async {
+          requestsStarted += 1;
+          final requestNumber = requestsStarted;
+          activeRequests += 1;
+          peakActiveRequests = math.max(peakActiveRequests, activeRequests);
+          if (requestNumber <= 3) {
+            await releaseFirstBatch.future;
+          }
+          activeRequests -= 1;
+          return http.Response(
+            jsonEncode({
+              'url': 'https://relay.example/media/photo-$requestNumber.png',
+              'sha256':
+                  '1111111111111111111111111111111111111111111111111111111111111111',
+              'size': request.bodyBytes.length,
+              'type': 'image/png',
+              'uploaded': 1,
+            }),
+            200,
+          );
+        }),
+        pickGalleryImage: () async => null,
+        pickGalleryImages: () async => [
+          for (var index = 0; index < 5; index += 1)
+            XFile.fromData(_pngBytes, name: 'photo-$index.png'),
+        ],
         pickGalleryVideo: () async => null,
-        pickGalleryImage: () => pickedImage.future,
       );
 
       await tester.pumpWidget(
@@ -386,17 +1154,346 @@ void main() {
         ),
       );
 
+      await _openSystemPhotoPicker(tester);
+      for (var frame = 0; frame < 20 && requestsStarted < 3; frame += 1) {
+        await tester.pump(const Duration(milliseconds: 20));
+      }
+
+      expect(requestsStarted, 3);
+      expect(peakActiveRequests, 3);
+
+      releaseFirstBatch.complete();
+      await tester.pumpAndSettle();
+
+      expect(requestsStarted, 5);
+      expect(peakActiveRequests, 3);
+      expect(find.byTooltip('Remove attachment'), findsNWidgets(5));
+    });
+
+    testWidgets('numbers recent photo selection and returns to the menu', (
+      tester,
+    ) async {
+      final photoLibrary = _FakePhotoLibrary([
+        RecentPhoto(id: 'one', thumbnailBytes: _gifBytes),
+        RecentPhoto(id: 'two', thumbnailBytes: _gifBytes),
+        RecentPhoto(id: 'three', thumbnailBytes: _gifBytes),
+      ]);
+
+      await tester.pumpWidget(
+        _buildComposeBar(
+          uploadService: _testUploadService(nostr.Keys.generate().nsec),
+          photoLibrary: photoLibrary,
+          onSend:
+              (
+                content,
+                mentionPubkeys, {
+                mediaTags = const <List<String>>[],
+              }) async {},
+        ),
+      );
+
       await _openAttachmentMenu(tester);
       await tester.tap(find.text('Photos'));
+      await tester.pumpAndSettle();
+
+      expect(
+        find.byKey(const ValueKey('photo-gallery-picker')),
+        findsOneWidget,
+      );
+      expect(find.byTooltip('Back to attachment options'), findsWidgets);
+      expect(find.text('All photos'), findsOneWidget);
+
+      await tester.tap(find.byKey(const ValueKey('recent-photo-two')));
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const ValueKey('recent-photo-one')));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Add 2 photos'), findsOneWidget);
+      expect(
+        find.descendant(
+          of: find.byKey(const ValueKey('photo-selection-index-two')),
+          matching: find.text('1'),
+        ),
+        findsOneWidget,
+      );
+      expect(
+        find.descendant(
+          of: find.byKey(const ValueKey('photo-selection-index-one')),
+          matching: find.text('2'),
+        ),
+        findsOneWidget,
+      );
+
+      await tester.tap(find.byKey(const ValueKey('recent-photo-two')));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Add 1 photo'), findsOneWidget);
+      expect(
+        find.descendant(
+          of: find.byKey(const ValueKey('photo-selection-index-one')),
+          matching: find.text('1'),
+        ),
+        findsOneWidget,
+      );
+
+      await tester.tap(find.byKey(const ValueKey('photo-gallery-back')));
+      await tester.pumpAndSettle();
+
+      expect(find.byKey(const ValueKey('photo-gallery-picker')), findsNothing);
+      expect(
+        find.byKey(const ValueKey('attachment-trigger-menu')).hitTestable(),
+        findsOneWidget,
+      );
+      expect(find.text('Camera'), findsOneWidget);
+      expect(find.text('Photos'), findsOneWidget);
+    });
+
+    testWidgets('attachment menu uses roomy rows and surrounding padding', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        _buildComposeBar(
+          uploadService: _testUploadService(nostr.Keys.generate().nsec),
+          onSend:
+              (
+                content,
+                mentionPubkeys, {
+                mediaTags = const <List<String>>[],
+              }) async {},
+        ),
+      );
+
+      await _openAttachmentMenu(tester);
+
+      final menu = find.byKey(const ValueKey('attachment-menu'));
+      final rows = [
+        for (final label in ['camera', 'photos', 'video', 'files'])
+          find.byKey(ValueKey('attachment-menu-item-$label')),
+      ];
+      final menuRect = tester.getRect(menu);
+
+      expect(menuRect.size, const Size(216, 264));
+      for (final row in rows) {
+        expect(tester.getSize(row).height, 52);
+        expect(tester.getRect(row).left - menuRect.left, Grid.xs);
+        expect(menuRect.right - tester.getRect(row).right, Grid.xs);
+      }
+      for (final label in ['Camera', 'Photos', 'Video', 'Files']) {
+        final text = tester.widget<Text>(find.text(label));
+        expect(text.style?.fontSize, 20);
+      }
+      final icons = [
+        for (final label in ['camera', 'photos', 'video', 'files'])
+          find.byKey(ValueKey('attachment-menu-icon-$label')),
+      ];
+      final labels = [
+        for (final label in ['camera', 'photos', 'video', 'files'])
+          find.byKey(ValueKey('attachment-menu-label-$label')),
+      ];
+      for (final icon in icons) {
+        expect(tester.getSize(icon).width, 28);
+        expect(
+          tester
+              .widget<Icon>(
+                find.descendant(of: icon, matching: find.byType(Icon)),
+              )
+              .size,
+          24,
+        );
+      }
+      final labelLeft = tester.getRect(labels.first).left;
+      for (var index = 0; index < labels.length; index += 1) {
+        expect(tester.getRect(labels[index]).left, labelLeft);
+        expect(
+          tester.getRect(labels[index]).center.dy,
+          tester.getRect(rows[index]).center.dy,
+        );
+      }
+      expect(tester.getRect(rows.first).top - menuRect.top, Grid.xs);
+      expect(menuRect.bottom - tester.getRect(rows.last).bottom, Grid.xs);
+      for (var index = 1; index < rows.length; index += 1) {
+        expect(
+          tester.getRect(rows[index]).top -
+              tester.getRect(rows[index - 1]).bottom,
+          Grid.xxs,
+        );
+      }
+    });
+
+    testWidgets(
+      'attachment menu grows rows and scrolls for accessibility text',
+      (tester) async {
+        await tester.pumpWidget(
+          _buildComposeBar(
+            uploadService: _testUploadService(nostr.Keys.generate().nsec),
+            textScaler: const TextScaler.linear(4),
+            onSend:
+                (
+                  content,
+                  mentionPubkeys, {
+                  mediaTags = const <List<String>>[],
+                }) async {},
+          ),
+        );
+
+        await _openAttachmentMenu(tester);
+
+        final menu = find.byKey(const ValueKey('attachment-menu'));
+        final rows = [
+          for (final label in ['camera', 'photos', 'video', 'files'])
+            find.byKey(ValueKey('attachment-menu-item-$label')),
+        ];
+        final scrollView = tester.widget<ListView>(
+          find.byKey(const ValueKey('attachment-menu-scroll')),
+        );
+
+        expect(tester.getSize(menu), const Size(216, 372));
+        expect(tester.getSize(rows.first).height, greaterThan(52));
+        expect(scrollView.physics, isA<AlwaysScrollableScrollPhysics>());
+        await tester.drag(
+          find.byKey(const ValueKey('attachment-menu-scroll')),
+          const Offset(0, -300),
+        );
+        await tester.pump();
+        expect(tester.getSize(rows.last).height, greaterThan(52));
+        expect(tester.takeException(), isNull);
+      },
+    );
+
+    testWidgets('defers camera startup until the surface morph finishes', (
+      tester,
+    ) async {
+      final previousPlatform = debugDefaultTargetPlatformOverride;
+      debugDefaultTargetPlatformOverride = TargetPlatform.android;
+      try {
+        await tester.pumpWidget(
+          _buildComposeBar(
+            uploadService: _testUploadService(nostr.Keys.generate().nsec),
+            onSend:
+                (
+                  content,
+                  mentionPubkeys, {
+                  mediaTags = const <List<String>>[],
+                }) async {},
+          ),
+        );
+
+        await _openAttachmentMenu(tester);
+        await tester.tap(find.text('Camera'));
+        await tester.pump();
+
+        expect(
+          find.byKey(const ValueKey('camera-initialization-deferred')),
+          findsOneWidget,
+        );
+
+        await tester.pump(const Duration(milliseconds: 300));
+        expect(
+          find.byKey(const ValueKey('camera-initialization-deferred')),
+          findsOneWidget,
+        );
+
+        await tester.pump(const Duration(milliseconds: 20));
+        expect(
+          find.byKey(const ValueKey('camera-initialization-ready')),
+          findsOneWidget,
+        );
+      } finally {
+        debugDefaultTargetPlatformOverride = previousPlatform;
+      }
+    });
+
+    testWidgets('photo picker errors keep the action visible at large text', (
+      tester,
+    ) async {
+      final uploadService = MediaUploadService(
+        baseUrl: 'https://relay.example',
+        nsec: nostr.Keys.generate().nsec,
+        pickGalleryImage: () async => null,
+        pickGalleryImages: () async =>
+            throw PlatformException(code: 'photo_picker_failed'),
+        pickGalleryVideo: () async => null,
+      );
+
+      await tester.pumpWidget(
+        _buildComposeBar(
+          uploadService: uploadService,
+          textScaler: const TextScaler.linear(1.2),
+          photoLibrary: _FakePhotoLibrary([
+            RecentPhoto(id: 'one', thumbnailBytes: _gifBytes),
+            RecentPhoto(id: 'two', thumbnailBytes: _gifBytes),
+            RecentPhoto(id: 'three', thumbnailBytes: _gifBytes),
+            RecentPhoto(id: 'four', thumbnailBytes: _gifBytes),
+          ]),
+          onSend:
+              (
+                content,
+                mentionPubkeys, {
+                mediaTags = const <List<String>>[],
+              }) async {},
+        ),
+      );
+
+      await _openSystemPhotoPicker(tester);
+      await tester.pumpAndSettle();
+
+      expect(tester.takeException(), isNull);
+      expect(find.byKey(const ValueKey('photo-gallery-error')), findsOneWidget);
+      expect(
+        find.byKey(const ValueKey('photo-gallery-action')).hitTestable(),
+        findsOneWidget,
+      );
+    });
+
+    testWidgets('keeps upload progress visible after the picker closes', (
+      tester,
+    ) async {
+      final uploadResponse = Completer<http.Response>();
+      final uploadService = MediaUploadService(
+        baseUrl: 'https://relay.example',
+        nsec: nostr.Keys.generate().nsec,
+        httpClient: http_testing.MockClient((request) => uploadResponse.future),
+        pickGalleryVideo: () async => null,
+        pickGalleryImage: () async => null,
+        pickGalleryImages: () async => [
+          XFile.fromData(_pngBytes, name: 'tiny.png'),
+        ],
+      );
+
+      await tester.pumpWidget(
+        _buildComposeBar(
+          uploadService: uploadService,
+          onSend:
+              (
+                content,
+                mentionPubkeys, {
+                mediaTags = const <List<String>>[],
+              }) async {},
+        ),
+      );
+
+      await _openSystemPhotoPicker(tester);
       await tester.pump();
 
       expect(
         find.byKey(const ValueKey('compose-upload-progress')),
         findsOneWidget,
       );
-      expect(find.text('Uploading attachment…'), findsOneWidget);
+      expect(find.bySemanticsLabel('Uploading attachment…'), findsOneWidget);
 
-      pickedImage.complete(null);
+      uploadResponse.complete(
+        http.Response(
+          jsonEncode({
+            'url': 'https://relay.example/media/test.png',
+            'sha256':
+                '0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef',
+            'size': 16,
+            'type': 'image/png',
+            'uploaded': 1,
+          }),
+          200,
+        ),
+      );
       await tester.pumpAndSettle();
 
       expect(
@@ -961,8 +2058,7 @@ void main() {
         ),
       );
 
-      await _openAttachmentMenu(tester);
-      await tester.tap(find.text('Photos'));
+      await _openSystemPhotoPicker(tester);
       await tester.pumpAndSettle();
 
       final attachmentFinder = find.byKey(
@@ -1017,8 +2113,7 @@ void main() {
         ),
       );
 
-      await _openAttachmentMenu(tester);
-      await tester.tap(find.text('Photos'));
+      await _openSystemPhotoPicker(tester);
       await tester.pumpAndSettle();
 
       expect(find.textContaining('upload failed'), findsOneWidget);
@@ -1058,8 +2153,7 @@ void main() {
           ),
         );
 
-        await _openAttachmentMenu(tester);
-        await tester.tap(find.text('Photos'));
+        await _openSystemPhotoPicker(tester);
         await tester.pumpAndSettle();
 
         expect(
@@ -1107,8 +2201,7 @@ void main() {
         ),
       );
 
-      await _openAttachmentMenu(tester);
-      await tester.tap(find.text('Photos'));
+      await _openSystemPhotoPicker(tester);
       await tester.pumpAndSettle();
 
       expect(
@@ -1334,8 +2427,7 @@ void main() {
         ),
       );
 
-      await _openAttachmentMenu(tester);
-      await tester.tap(find.text('Photos'));
+      await _openSystemPhotoPicker(tester);
       await tester.pumpAndSettle();
 
       expect(
@@ -1655,6 +2747,13 @@ Future<void> _openAttachmentMenu(WidgetTester tester) async {
   await tester.pumpAndSettle();
 }
 
+Future<void> _openSystemPhotoPicker(WidgetTester tester) async {
+  await _openAttachmentMenu(tester);
+  await tester.tap(find.text('Photos'));
+  await tester.pumpAndSettle();
+  await tester.tap(find.text('All photos'));
+}
+
 Future<void> _selectAndSendAgentMention(WidgetTester tester) async {
   await _expandComposer(tester);
   await tester.enterText(find.byType(TextField), '@hel');
diff --git a/mobile/test/features/channels/message_actions_test.dart b/mobile/test/features/channels/message_actions_test.dart
new file mode 100644
index 0000000000..03d7951b05
--- /dev/null
+++ b/mobile/test/features/channels/message_actions_test.dart
@@ -0,0 +1,453 @@
+import 'package:buzz/features/channels/message_actions.dart';
+import 'package:buzz/features/channels/read_state/read_state_provider.dart';
+import 'package:buzz/features/channels/thread_follows/thread_follows_provider.dart';
+import 'package:buzz/features/channels/timeline_message.dart';
+import 'package:buzz/shared/reminders/reminder_service.dart';
+import 'package:buzz/shared/relay/relay.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:nostr/nostr.dart' as nostr;
+import 'package:shared_preferences/shared_preferences.dart';
+
+const _channelId = 'chan-1';
+
+TimelineMessage _message({
+  String id = 'msg-1',
+  String pubkey = 'alice',
+  int createdAt = 1000,
+  bool isSystem = false,
+  String? rootId,
+}) => TimelineMessage(
+  id: id,
+  pubkey: pubkey,
+  createdAt: createdAt,
+  content: 'hello world',
+  isSystem: isSystem,
+  rootId: rootId,
+);
+
+class _FakeReadStateNotifier extends ReadStateNotifier {
+  final ReadStateState _initialState;
+  final Map<String, int> markedRead = {};
+  final List<String> markedUnread = [];
+
+  _FakeReadStateNotifier(this._initialState);
+
+  @override
+  ReadStateState build() => _initialState;
+
+  @override
+  void markContextRead(
+    String contextId,
+    int unixTimestamp, {
+    bool clearForcedMessages = false,
+  }) {
+    markedRead[contextId] = unixTimestamp;
+    var forced = {
+      for (final entry in state.forcedUnreadContexts.entries)
+        if (entry.key != contextId) entry.key: entry.value,
+    };
+    if (clearForcedMessages) {
+      forced = {
+        for (final entry in forced.entries)
+          if (entry.value != contextId) entry.key: entry.value,
+      };
+    }
+    state = _withForced(forced).copyWithContext(contextId, unixTimestamp);
+  }
+
+  @override
+  void markContextUnread(String contextId, {required String channelId}) {
+    markedUnread.add(contextId);
+    state = _withForced({...state.forcedUnreadContexts, contextId: channelId});
+  }
+
+  ReadStateState _withForced(Map<String, String> forced) => ReadStateState(
+    isReady: state.isReady,
+    pubkey: state.pubkey,
+    contexts: state.contexts,
+    version: state.version + 1,
+    forcedUnreadContexts: Map.unmodifiable(forced),
+  );
+}
+
+ReadStateState _readState(Map<String, int> contexts, {bool isReady = true}) =>
+    ReadStateState(
+      isReady: isReady,
+      pubkey: 'self',
+      contexts: contexts,
+      version: 1,
+    );
+
+Future<SharedPreferences> _mockPrefs() async {
+  SharedPreferences.setMockInitialValues({});
+  return SharedPreferences.getInstance();
+}
+
+/// A [ReminderService] whose constructor dependencies are inert until used —
+/// enough for visibility checks on the "Remind me" fast action.
+ReminderService _stubReminderService() {
+  final keys = nostr.Keys.generate();
+  return ReminderService(
+    signedEventRelay: SignedEventRelay(
+      session: RelaySessionNotifier(),
+      nsec: keys.nsec,
+    ),
+    crypto: ReminderCrypto(keys.nsec, keys.public),
+  );
+}
+
+Future<void> _pumpSheet(
+  WidgetTester tester, {
+  required TimelineMessage message,
+  required SharedPreferences prefs,
+  ReadStateNotifier Function()? readStateOverride,
+  bool canManageMessage = false,
+  List<TimelineMessage>? allMessages,
+  ReminderService? reminderService,
+}) async {
+  await tester.pumpWidget(
+    ProviderScope(
+      overrides: [
+        savedPrefsProvider.overrideWithValue(prefs),
+        myPubkeyProvider.overrideWithValue('self'),
+        readStateProvider.overrideWith(
+          readStateOverride ??
+              () => _FakeReadStateNotifier(
+                _readState(const {_channelId: 100000}),
+              ),
+        ),
+        // No signing identity → "Remind me" hidden by default; individual
+        // tests opt in by passing a stub service.
+        reminderServiceProvider.overrideWithValue(reminderService),
+      ],
+      child: MaterialApp(
+        theme: AppTheme.light(),
+        home: Scaffold(
+          body: Consumer(
+            builder: (context, ref, _) => TextButton(
+              onPressed: () => showMessageActions(
+                context: context,
+                ref: ref,
+                message: message,
+                channelId: _channelId,
+                canManageMessage: canManageMessage,
+                allMessages: allMessages,
+                currentPubkey: 'self',
+                isMember: true,
+              ),
+              child: const Text('open'),
+            ),
+          ),
+        ),
+      ),
+    ),
+  );
+  await tester.tap(find.text('open'));
+  await tester.pumpAndSettle();
+}
+
+Future<void> _pumpImageSheet(
+  WidgetTester tester, {
+  required TimelineMessage message,
+  bool canManageMessage = false,
+}) async {
+  await tester.pumpWidget(
+    ProviderScope(
+      child: MaterialApp(
+        theme: AppTheme.light(),
+        home: Scaffold(
+          body: Consumer(
+            builder: (context, ref, _) => TextButton(
+              onPressed: () => showImageActions(
+                context: context,
+                ref: ref,
+                message: message,
+                channelId: _channelId,
+                imageUrl: 'https://example.com/photo.png',
+                canManageMessage: canManageMessage,
+              ),
+              child: const Text('open image actions'),
+            ),
+          ),
+        ),
+      ),
+    ),
+  );
+  await tester.tap(find.text('open image actions'));
+  await tester.pumpAndSettle();
+}
+
+void main() {
+  group('showMessageActions', () {
+    testWidgets('shows parity actions for a regular message', (tester) async {
+      final prefs = await _mockPrefs();
+      await _pumpSheet(tester, message: _message(), prefs: prefs);
+
+      expect(find.text('Copy text'), findsOneWidget);
+      expect(find.text('Copy link'), findsOneWidget);
+      expect(find.text('Mark unread'), findsOneWidget);
+      expect(find.text('Follow thread'), findsOneWidget);
+      // No thread context → no Reply fast action.
+      expect(find.text('Reply'), findsNothing);
+      // No signing identity → no reminders; no manage rights → no edit/delete.
+      expect(find.text('Remind me'), findsNothing);
+      expect(find.text('Edit message'), findsNothing);
+      expect(find.text('Delete message'), findsNothing);
+    });
+
+    testWidgets('promotes Reply, Copy link, and Remind me to the fast-actions '
+        'row', (tester) async {
+      final prefs = await _mockPrefs();
+      await _pumpSheet(
+        tester,
+        message: _message(),
+        prefs: prefs,
+        allMessages: [_message()],
+        reminderService: _stubReminderService(),
+      );
+
+      expect(find.text('Reply'), findsOneWidget);
+      expect(find.text('Copy link'), findsOneWidget);
+      expect(find.text('Remind me'), findsOneWidget);
+      // Promoted actions no longer appear under their old list-row labels.
+      expect(find.text('Reply in thread'), findsNothing);
+      expect(find.text('Remind me later'), findsNothing);
+    });
+
+    testWidgets('hides utility actions for system messages', (tester) async {
+      final prefs = await _mockPrefs();
+      await _pumpSheet(tester, message: _message(isSystem: true), prefs: prefs);
+
+      expect(find.text('Copy text'), findsNothing);
+      expect(find.text('Copy link'), findsNothing);
+      expect(find.text('Mark unread'), findsNothing);
+      expect(find.text('Follow thread'), findsNothing);
+      expect(find.text('Reply'), findsNothing);
+      expect(find.text('Remind me'), findsNothing);
+    });
+
+    testWidgets('shows Edit/Delete only with manage rights', (tester) async {
+      final prefs = await _mockPrefs();
+      await _pumpSheet(
+        tester,
+        message: _message(),
+        prefs: prefs,
+        canManageMessage: true,
+      );
+
+      expect(find.text('Edit message'), findsOneWidget);
+      expect(find.text('Delete message'), findsOneWidget);
+    });
+
+    testWidgets('Mark read appears for unread messages and advances the '
+        'message marker', (tester) async {
+      final prefs = await _mockPrefs();
+      final notifier = _FakeReadStateNotifier(
+        _readState(const {_channelId: 500}),
+      );
+      await _pumpSheet(
+        tester,
+        message: _message(createdAt: 900),
+        prefs: prefs,
+        readStateOverride: () => notifier,
+      );
+
+      expect(find.text('Mark read'), findsOneWidget);
+      await tester.tap(find.text('Mark read'));
+      await tester.pumpAndSettle();
+
+      expect(notifier.markedRead, {'msg:msg-1': 900});
+    });
+
+    testWidgets('Mark unread forces the message unread', (tester) async {
+      final prefs = await _mockPrefs();
+      final notifier = _FakeReadStateNotifier(
+        _readState(const {_channelId: 2000}),
+      );
+      await _pumpSheet(
+        tester,
+        message: _message(createdAt: 900),
+        prefs: prefs,
+        readStateOverride: () => notifier,
+      );
+
+      expect(find.text('Mark unread'), findsOneWidget);
+      await tester.tap(find.text('Mark unread'));
+      await tester.pumpAndSettle();
+
+      // The force flag is message-scoped, mapped to its channel so tiles and
+      // badges surface it.
+      expect(notifier.markedUnread, ['msg:msg-1']);
+      expect(notifier.state.forcedUnreadContexts, {'msg:msg-1': _channelId});
+      expect(notifier.state.locallyForcedChannelIds, {_channelId});
+    });
+
+    testWidgets('Mark read after a forced unread clears the force flag so '
+        'the toggle round-trips', (tester) async {
+      final prefs = await _mockPrefs();
+      final notifier = _FakeReadStateNotifier(
+        _readState(const {_channelId: 2000}),
+      );
+      await _pumpSheet(
+        tester,
+        message: _message(createdAt: 900),
+        prefs: prefs,
+        readStateOverride: () => notifier,
+      );
+
+      // Force the message unread; the row flips to Mark read.
+      await tester.tap(find.text('Mark unread'));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('open'));
+      await tester.pumpAndSettle();
+      expect(find.text('Mark read'), findsOneWidget);
+
+      // Mark read must clear the message's own force flag — otherwise the
+      // row sticks on "Mark read".
+      await tester.tap(find.text('Mark read'));
+      await tester.pumpAndSettle();
+
+      final container = ProviderScope.containerOf(
+        tester.element(find.text('open')),
+      );
+      expect(container.read(readStateProvider).forcedUnreadContexts, isEmpty);
+
+      await tester.tap(find.text('open'));
+      await tester.pumpAndSettle();
+      expect(find.text('Mark unread'), findsOneWidget);
+      expect(find.text('Mark read'), findsNothing);
+    });
+
+    testWidgets('message-level Mark read leaves a channel-level forced '
+        'unread untouched', (tester) async {
+      final prefs = await _mockPrefs();
+      final notifier = _FakeReadStateNotifier(
+        ReadStateState(
+          isReady: true,
+          pubkey: 'self',
+          contexts: const {_channelId: 2000},
+          version: 1,
+          // Channel forced unread from the channel tile, message forced
+          // unread from this sheet.
+          forcedUnreadContexts: const {
+            _channelId: _channelId,
+            'msg:msg-1': _channelId,
+          },
+        ),
+      );
+      await _pumpSheet(
+        tester,
+        message: _message(createdAt: 900),
+        prefs: prefs,
+        readStateOverride: () => notifier,
+      );
+
+      expect(find.text('Mark read'), findsOneWidget);
+      await tester.tap(find.text('Mark read'));
+      await tester.pumpAndSettle();
+
+      // The message's flag is gone; the user's channel-level choice stays.
+      final readState = notifier.state;
+      expect(readState.forcedUnreadContexts, {_channelId: _channelId});
+      expect(readState.locallyForcedChannelIds, {_channelId});
+    });
+
+    testWidgets('hides read-state row while read state is not ready', (
+      tester,
+    ) async {
+      final prefs = await _mockPrefs();
+      await _pumpSheet(
+        tester,
+        message: _message(),
+        prefs: prefs,
+        readStateOverride: () =>
+            _FakeReadStateNotifier(_readState(const {}, isReady: false)),
+      );
+
+      expect(find.text('Mark unread'), findsNothing);
+      expect(find.text('Mark read'), findsNothing);
+    });
+
+    testWidgets('Follow thread toggles the effective root id', (tester) async {
+      final prefs = await _mockPrefs();
+      await _pumpSheet(
+        tester,
+        message: _message(rootId: 'root-9'),
+        prefs: prefs,
+      );
+
+      await tester.tap(find.text('Follow thread'));
+      await tester.pumpAndSettle();
+
+      final container = ProviderScope.containerOf(
+        tester.element(find.text('open')),
+      );
+      expect(container.read(threadFollowsProvider).followedRootIds, {'root-9'});
+
+      // Re-open: the row now offers Unfollow.
+      await tester.tap(find.text('open'));
+      await tester.pumpAndSettle();
+      expect(find.text('Unfollow thread'), findsOneWidget);
+
+      await tester.tap(find.text('Unfollow thread'));
+      await tester.pumpAndSettle();
+      expect(container.read(threadFollowsProvider).followedRootIds, isEmpty);
+    });
+  });
+
+  group('showImageActions', () {
+    testWidgets('labels the destructive action as deleting the message', (
+      tester,
+    ) async {
+      await _pumpImageSheet(
+        tester,
+        message: _message(),
+        canManageMessage: true,
+      );
+
+      expect(find.text('Delete message'), findsOneWidget);
+      expect(find.text('Delete upload'), findsNothing);
+    });
+  });
+
+  group('downloadedImageFilename', () {
+    test('preserves gif file extensions', () {
+      expect(
+        downloadedImageFilename('https://example.com/animation.gif', null),
+        'animation.gif',
+      );
+    });
+
+    test('uses gif extension for gif content types', () {
+      expect(
+        downloadedImageFilename(
+          'https://example.com/download',
+          'image/gif; charset=binary',
+        ),
+        matches(RegExp(r'^buzz-\d+\.gif$')),
+      );
+    });
+  });
+
+  group('messageLinkFor', () {
+    test('builds a canonical link with thread context', () {
+      expect(
+        messageLinkFor(
+          message: _message(rootId: 'root-1'),
+          channelId: _channelId,
+        ),
+        'buzz://message?channel=chan-1&id=msg-1&thread=root-1',
+      );
+    });
+
+    test('omits thread for top-level messages', () {
+      expect(
+        messageLinkFor(message: _message(), channelId: _channelId),
+        'buzz://message?channel=chan-1&id=msg-1',
+      );
+    });
+  });
+}
diff --git a/mobile/test/features/channels/message_content_test.dart b/mobile/test/features/channels/message_content_test.dart
index bcb46f0c37..77fab8ef09 100644
--- a/mobile/test/features/channels/message_content_test.dart
+++ b/mobile/test/features/channels/message_content_test.dart
@@ -9,12 +9,23 @@ import 'package:buzz/features/channels/media_viewer_page.dart';
 import 'package:buzz/shared/relay/relay.dart';
 import 'package:buzz/shared/theme/theme.dart';
 
-Widget _testable(Widget child, {List<Override> overrides = const []}) {
+Widget _testable(
+  Widget child, {
+  List<Override> overrides = const [],
+  bool disableAnimations = false,
+}) {
   return ProviderScope(
     overrides: overrides,
     child: MaterialApp(
       theme: AppTheme.light(),
-      home: Scaffold(body: child),
+      home: Builder(
+        builder: (context) => MediaQuery(
+          data: MediaQuery.of(
+            context,
+          ).copyWith(disableAnimations: disableAnimations),
+          child: Scaffold(body: child),
+        ),
+      ),
     ),
   );
 }
@@ -182,13 +193,24 @@ void main() {
       );
 
       expect(route, isA<PageRouteBuilder<void>>());
-      expect(route.transitionDuration, const Duration(milliseconds: 280));
+      expect(route.transitionDuration, const Duration(milliseconds: 260));
       expect(
         route.reverseTransitionDuration,
-        const Duration(milliseconds: 220),
+        const Duration(milliseconds: 170),
       );
     });
 
+    test('buildImageViewerRoute disables motion when requested', () {
+      final route = buildImageViewerRoute(
+        imageUrl: 'https://example.com/media/image.png',
+        heroTag: Object(),
+        disableAnimations: true,
+      );
+
+      expect(route.transitionDuration, Duration.zero);
+      expect(route.reverseTransitionDuration, Duration.zero);
+    });
+
     group('plain text', () {
       testWidgets('renders simple text', (tester) async {
         await tester.pumpWidget(
@@ -430,6 +452,242 @@ void main() {
         );
       });
 
+      testWidgets(
+        'groups uploaded photos into a carousel and opens the full gallery',
+        (tester) async {
+          const first = 'https://example.com/media/one.png';
+          const second = 'https://example.com/media/two.png';
+          const third = 'https://example.com/media/three.png';
+          await tester.pumpWidget(
+            _testable(
+              const MessageContent(
+                content:
+                    '''
+Photos
+![image]($first)
+![image]($second)
+![image]($third)
+''',
+                tags: [
+                  ['imeta', 'url $first', 'm image/png', 'alt First photo'],
+                  ['imeta', 'url $second', 'm image/png', 'alt Second photo'],
+                  ['imeta', 'url $third', 'm image/png', 'alt Third photo'],
+                ],
+              ),
+            ),
+          );
+          await tester.pumpAndSettle();
+
+          final carousel = find.byKey(const ValueKey('message-media-carousel'));
+          expect(carousel, findsOneWidget);
+          expect(find.text('3 images'), findsOneWidget);
+
+          await tester.drag(carousel, const Offset(-600, 0));
+          await tester.pumpAndSettle();
+
+          await tester.tap(
+            find.byKey(const ValueKey('message-media-carousel-item:$second')),
+          );
+          await tester.pumpAndSettle();
+
+          expect(
+            find.byKey(const ValueKey('message-media-image-viewer')),
+            findsOneWidget,
+          );
+          expect(
+            find.byKey(const ValueKey('message-media-image-viewer-filmstrip')),
+            findsOneWidget,
+          );
+          expect(
+            find.byKey(
+              const ValueKey('message-media-image-viewer-thumbnail:1'),
+            ),
+            findsOneWidget,
+          );
+          final displayedImage = tester.widget<MediaImage>(
+            find.byKey(const ValueKey('message-media-image-viewer-image:1')),
+          );
+          expect(displayedImage.decodeWidth, isNotNull);
+          final selectedThumbnailClip = tester.widget<ClipRRect>(
+            find.byKey(
+              const ValueKey('message-media-image-viewer-thumbnail-clip:1'),
+            ),
+          );
+          final selectedThumbnailRadius =
+              selectedThumbnailClip.borderRadius as BorderRadius;
+          expect(
+            selectedThumbnailRadius.topLeft.x,
+            closeTo(Radii.sm - 2.5, 0.01),
+          );
+
+          await tester.fling(
+            find.byKey(const ValueKey('message-media-image-viewer-pages')),
+            const Offset(-700, 0),
+            1200,
+          );
+          await tester.pumpAndSettle();
+
+          final thirdThumbnail = find.byKey(
+            const ValueKey('message-media-image-viewer-thumbnail:2'),
+          );
+          final thirdSemantics = tester.widget<Semantics>(
+            find
+                .ancestor(of: thirdThumbnail, matching: find.byType(Semantics))
+                .first,
+          );
+          expect(thirdSemantics.properties.selected, isTrue);
+        },
+      );
+
+      testWidgets(
+        'keeps adjacent carousel images active and ends with a gutter',
+        (tester) async {
+          const first = 'https://example.com/media/gutter-one.png';
+          const second = 'https://example.com/media/gutter-two.png';
+          await tester.pumpWidget(
+            _testable(
+              const MessageContent(
+                content:
+                    '''
+![image]($first)
+![image]($second)
+''',
+                tags: [
+                  ['imeta', 'url $first', 'm image/png'],
+                  ['imeta', 'url $second', 'm image/png'],
+                ],
+              ),
+            ),
+          );
+          await tester.pumpAndSettle();
+
+          final carousel = find.byKey(const ValueKey('message-media-carousel'));
+          final pageViewFinder = find.descendant(
+            of: carousel,
+            matching: find.byType(PageView),
+          );
+          final pageView = tester.widget<PageView>(pageViewFinder);
+
+          expect(pageView.allowImplicitScrolling, isTrue);
+          expect(pageView.clipBehavior, Clip.none);
+
+          pageView.controller!.jumpToPage(1);
+          await tester.pumpAndSettle();
+
+          final lastCard = find.byKey(
+            const ValueKey('message-media-carousel-item:$second'),
+          );
+          expect(
+            tester.getRect(carousel).right - tester.getRect(lastCard).right,
+            Grid.gutter,
+          );
+        },
+      );
+
+      testWidgets(
+        'jumps to a selected gallery thumbnail when motion is disabled',
+        (tester) async {
+          const first = 'https://example.com/media/reduced-motion-one.png';
+          const second = 'https://example.com/media/reduced-motion-two.png';
+          await tester.pumpWidget(
+            _testable(
+              const MessageContent(
+                content:
+                    '''
+![image]($first)
+![image]($second)
+''',
+                tags: [
+                  ['imeta', 'url $first', 'm image/png'],
+                  ['imeta', 'url $second', 'm image/png'],
+                ],
+              ),
+              disableAnimations: true,
+            ),
+          );
+          await tester.pumpAndSettle();
+
+          await tester.tap(
+            find.byKey(const ValueKey('message-media-carousel-item:$first')),
+          );
+          await tester.pumpAndSettle();
+          await tester.tap(
+            find.byKey(
+              const ValueKey('message-media-image-viewer-thumbnail:1'),
+            ),
+          );
+          await tester.pumpAndSettle();
+
+          final selectedThumbnail = tester.widget<Semantics>(
+            find
+                .ancestor(
+                  of: find.byKey(
+                    const ValueKey('message-media-image-viewer-thumbnail:1'),
+                  ),
+                  matching: find.byType(Semantics),
+                )
+                .first,
+          );
+          expect(selectedThumbnail.properties.selected, isTrue);
+          expect(tester.takeException(), isNull);
+        },
+      );
+
+      testWidgets('resets carousel paging when gallery images change', (
+        tester,
+      ) async {
+        const firstGallery = [
+          'https://example.com/media/first-a.png',
+          'https://example.com/media/first-b.png',
+          'https://example.com/media/first-c.png',
+        ];
+        const secondGallery = [
+          'https://example.com/media/second-a.png',
+          'https://example.com/media/second-b.png',
+        ];
+
+        Widget gallery(List<String> urls) => _testable(
+          MessageContent(
+            content: urls.map((url) => '![image]($url)').join('\n'),
+            tags: [
+              for (final url in urls) ['imeta', 'url $url', 'm image/png'],
+            ],
+          ),
+        );
+
+        await tester.pumpWidget(gallery(firstGallery));
+        await tester.pumpAndSettle();
+        final firstCarousel = tester.widget<PageView>(
+          find.descendant(
+            of: find.byKey(const ValueKey('message-media-carousel')),
+            matching: find.byType(PageView),
+          ),
+        );
+
+        await tester.fling(
+          find.byKey(const ValueKey('message-media-carousel')),
+          const Offset(-700, 0),
+          1200,
+        );
+        await tester.pumpAndSettle();
+        expect(firstCarousel.controller!.page, greaterThan(0));
+
+        await tester.pumpWidget(gallery(secondGallery));
+        await tester.pumpAndSettle();
+        final secondCarousel = tester.widget<PageView>(
+          find.descendant(
+            of: find.byKey(const ValueKey('message-media-carousel')),
+            matching: find.byType(PageView),
+          ),
+        );
+
+        expect(
+          secondCarousel.controller,
+          isNot(same(firstCarousel.controller)),
+        );
+        expect(secondCarousel.controller!.page, 0);
+      });
+
       testWidgets(
         'disables hero on close after the fullscreen image is transformed',
         (tester) async {
@@ -484,6 +742,90 @@ void main() {
         },
       );
 
+      testWidgets('double tap resets the fullscreen image transform', (
+        tester,
+      ) async {
+        const imageUrl = 'https://example.com/media/double-tap-reset.png';
+
+        await tester.pumpWidget(
+          _testable(
+            const MessageContent(
+              content:
+                  'Look\n![image](https://example.com/media/double-tap-reset.png)',
+              tags: [
+                [
+                  'imeta',
+                  'url https://example.com/media/double-tap-reset.png',
+                  'm image/png',
+                ],
+              ],
+            ),
+          ),
+        );
+        await tester.pumpAndSettle();
+
+        final transformationController = await _openImageViewer(
+          tester,
+          imageUrl,
+        );
+        _applyImageViewerTransform(
+          transformationController,
+          dx: 32,
+          dy: 24,
+          scale: 2,
+        );
+        await tester.pump();
+
+        final gestureSurface = find.byKey(
+          const ValueKey('message-media-image-viewer-gesture:0'),
+        );
+        await tester.tap(gestureSurface);
+        await tester.pump(const Duration(milliseconds: 50));
+        await tester.tap(gestureSurface);
+        await tester.pumpAndSettle();
+
+        expect(
+          transformationController.value.storage,
+          orderedEquals(Matrix4.identity().storage),
+        );
+        expect(_isImageViewerHeroEnabled(tester), isTrue);
+      });
+
+      testWidgets('swiping down dismisses the fullscreen gallery', (
+        tester,
+      ) async {
+        const imageUrl = 'https://example.com/media/swipe-dismiss.png';
+
+        await tester.pumpWidget(
+          _testable(
+            const MessageContent(
+              content:
+                  'Look\n![image](https://example.com/media/swipe-dismiss.png)',
+              tags: [
+                [
+                  'imeta',
+                  'url https://example.com/media/swipe-dismiss.png',
+                  'm image/png',
+                ],
+              ],
+            ),
+          ),
+        );
+        await tester.pumpAndSettle();
+        await _openImageViewer(tester, imageUrl);
+
+        await tester.drag(
+          find.byKey(const ValueKey('message-media-image-viewer-gesture:0')),
+          const Offset(0, 180),
+        );
+        await tester.pumpAndSettle();
+
+        expect(
+          find.byKey(const ValueKey('message-media-image-viewer')),
+          findsNothing,
+        );
+      });
+
       testWidgets(
         'disables hero on back navigation after the fullscreen image is transformed',
         (tester) async {
diff --git a/mobile/test/features/channels/read_state/message_read_state_test.dart b/mobile/test/features/channels/read_state/message_read_state_test.dart
new file mode 100644
index 0000000000..97d1317ac7
--- /dev/null
+++ b/mobile/test/features/channels/read_state/message_read_state_test.dart
@@ -0,0 +1,151 @@
+import 'package:buzz/features/channels/read_state/message_read_state.dart';
+import 'package:buzz/features/channels/read_state/read_state_provider.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+ReadStateState _state(
+  Map<String, int> contexts, {
+  Map<String, String> forced = const {},
+}) => ReadStateState(
+  isReady: true,
+  pubkey: 'pk',
+  contexts: contexts,
+  version: 1,
+  forcedUnreadContexts: forced,
+);
+
+void main() {
+  const channelId = 'chan-1';
+  const messageId = 'msg-1';
+
+  group('effectiveMessageReadAt', () {
+    test('is null with no markers', () {
+      expect(
+        effectiveMessageReadAt(
+          _state(const {}),
+          channelId: channelId,
+          messageId: messageId,
+        ),
+        isNull,
+      );
+    });
+
+    test('takes the newest of channel, message, and thread markers', () {
+      final readState = _state(const {
+        channelId: 100,
+        'msg:$messageId': 300,
+        'thread:root-1': 200,
+      });
+      expect(
+        effectiveMessageReadAt(
+          readState,
+          channelId: channelId,
+          messageId: messageId,
+          threadRootId: 'root-1',
+        ),
+        300,
+      );
+    });
+
+    test('ignores thread marker when no root is given', () {
+      final readState = _state(const {'thread:root-1': 500});
+      expect(
+        effectiveMessageReadAt(
+          readState,
+          channelId: channelId,
+          messageId: messageId,
+        ),
+        isNull,
+      );
+    });
+  });
+
+  group('isMessageUnread', () {
+    test('unread when created after all markers', () {
+      final readState = _state(const {channelId: 100});
+      expect(
+        isMessageUnread(
+          readState,
+          channelId: channelId,
+          messageId: messageId,
+          createdAt: 150,
+        ),
+        isTrue,
+      );
+    });
+
+    test('read when covered by the channel marker', () {
+      final readState = _state(const {channelId: 200});
+      expect(
+        isMessageUnread(
+          readState,
+          channelId: channelId,
+          messageId: messageId,
+          createdAt: 150,
+        ),
+        isFalse,
+      );
+    });
+
+    test('read when covered by its own msg marker', () {
+      final readState = _state(const {'msg:$messageId': 150});
+      expect(
+        isMessageUnread(
+          readState,
+          channelId: channelId,
+          messageId: messageId,
+          createdAt: 150,
+        ),
+        isFalse,
+      );
+    });
+
+    test('thread reply covered by thread marker', () {
+      final readState = _state(const {'thread:root-1': 400});
+      expect(
+        isMessageUnread(
+          readState,
+          channelId: channelId,
+          messageId: messageId,
+          createdAt: 350,
+          threadRootId: 'root-1',
+        ),
+        isFalse,
+      );
+    });
+
+    test('forced-unread message wins over markers', () {
+      final readState = _state(
+        const {channelId: 1000},
+        forced: const {'msg:$messageId': channelId},
+      );
+      expect(
+        isMessageUnread(
+          readState,
+          channelId: channelId,
+          messageId: messageId,
+          createdAt: 150,
+        ),
+        isTrue,
+      );
+    });
+
+    test('channel-level forced unread does not leak into message state', () {
+      // A channel forced unread from the channel tile is a channel-scoped
+      // choice — an already-read message inside it still shows as read, so
+      // its own Mark read/unread toggle round-trips independently.
+      final readState = _state(
+        const {channelId: 1000},
+        forced: const {channelId: channelId},
+      );
+      expect(
+        isMessageUnread(
+          readState,
+          channelId: channelId,
+          messageId: messageId,
+          createdAt: 150,
+        ),
+        isFalse,
+      );
+    });
+  });
+}
diff --git a/mobile/test/features/channels/read_state/read_state_manager_test.dart b/mobile/test/features/channels/read_state/read_state_manager_test.dart
index e4240a7c14..953d2ff10d 100644
--- a/mobile/test/features/channels/read_state/read_state_manager_test.dart
+++ b/mobile/test/features/channels/read_state/read_state_manager_test.dart
@@ -181,6 +181,7 @@ class _FakeSignedEventRelay implements SignedEventRelay {
     required String content,
     required List<List<String>> tags,
     int? createdAt,
+    void Function(NostrEvent event)? onSigned,
   }) async {
     submitted.complete(_SubmittedEvent(kind: kind, tags: tags));
     return _stubAckEvent();
@@ -199,6 +200,7 @@ class _UnsupportedKindSignedEventRelay implements SignedEventRelay {
     required String content,
     required List<List<String>> tags,
     int? createdAt,
+    void Function(NostrEvent event)? onSigned,
   }) async {
     submitCount++;
     throw Exception('restricted: unknown event kind');
@@ -217,6 +219,7 @@ class _MissingScopeSignedEventRelay implements SignedEventRelay {
     required String content,
     required List<List<String>> tags,
     int? createdAt,
+    void Function(NostrEvent event)? onSigned,
   }) async {
     submitCount++;
     throw Exception('missing users:write');
diff --git a/mobile/test/features/channels/read_state/read_state_provider_test.dart b/mobile/test/features/channels/read_state/read_state_provider_test.dart
new file mode 100644
index 0000000000..40cd063625
--- /dev/null
+++ b/mobile/test/features/channels/read_state/read_state_provider_test.dart
@@ -0,0 +1,159 @@
+import 'package:buzz/features/channels/read_state/read_state_format.dart';
+import 'package:buzz/features/channels/read_state/read_state_provider.dart';
+import 'package:buzz/shared/community/community_provider.dart';
+import 'package:buzz/shared/relay/relay.dart';
+import 'package:buzz/shared/theme/theme_provider.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:nostr/nostr.dart' as nostr;
+import 'package:shared_preferences/shared_preferences.dart';
+
+/// Drives the production [ReadStateNotifier] (real bookkeeping, real
+/// [ReadStateManager]) against an inert fake relay session, so a defect in
+/// the forced-unread map removal or the manager-emission path fails here
+/// instead of being masked by a fake notifier.
+void main() {
+  const channelId = 'chan-1';
+  const otherChannelId = 'chan-2';
+  final msgKey = msgContextKey('msg-1');
+  final otherMsgKey = msgContextKey('msg-2');
+
+  late ProviderContainer container;
+
+  Future<ReadStateNotifier> pumpNotifier() async {
+    SharedPreferences.setMockInitialValues({});
+    final prefs = await SharedPreferences.getInstance();
+    final nsec = nostr.Keys.generate().nsec;
+
+    container = ProviderContainer(
+      overrides: [
+        savedPrefsProvider.overrideWithValue(prefs),
+        relayConfigProvider.overrideWith(() => _FakeRelayConfig(nsec)),
+        relaySessionProvider.overrideWith(_FakeRelaySession.new),
+        activeCommunityProvider.overrideWith((ref) async => null),
+        appLifecycleProvider.overrideWith(_FakeAppLifecycle.new),
+      ],
+    );
+    addTearDown(container.dispose);
+
+    final notifier = container.read(readStateProvider.notifier);
+    // Let the async activeCommunity resolution, the resulting rebuild, and
+    // the manager initialize() microtasks run.
+    await container.read(activeCommunityProvider.future);
+    for (var i = 0; i < 10 && !container.read(readStateProvider).isReady; i++) {
+      await Future<void>.delayed(Duration.zero);
+    }
+    expect(container.read(readStateProvider).isReady, isTrue);
+    return notifier;
+  }
+
+  ReadStateState state() => container.read(readStateProvider);
+
+  test('message unread → read → unread round-trips through the real '
+      'notifier', () async {
+    final notifier = await pumpNotifier();
+
+    // Force the message unread.
+    notifier.markContextUnread(msgKey, channelId: channelId);
+    expect(state().isForcedUnread(msgKey), isTrue);
+    expect(state().locallyForcedChannelIds, {channelId});
+
+    // Mark read: the force flag must drop out of the production map AND the
+    // marker must land in the manager's effective contexts.
+    notifier.markContextRead(msgKey, 1000);
+    expect(state().isForcedUnread(msgKey), isFalse);
+    expect(state().forcedUnreadContexts, isEmpty);
+    expect(state().effectiveTimestamp(msgKey), 1000);
+
+    // Force unread again: read markers are monotonic, so the flag is the
+    // only mechanism — it must win even though the marker persists.
+    notifier.markContextUnread(msgKey, channelId: channelId);
+    expect(state().isForcedUnread(msgKey), isTrue);
+    expect(state().effectiveTimestamp(msgKey), 1000);
+  });
+
+  test('explicit channel-level Mark read clears forced message entries in '
+      'that channel only', () async {
+    final notifier = await pumpNotifier();
+
+    notifier.markContextUnread(msgKey, channelId: channelId);
+    notifier.markContextUnread(otherMsgKey, channelId: otherChannelId);
+
+    // Channel tile "Mark as read" passes clearForcedMessages: true.
+    notifier.markContextRead(channelId, 2000, clearForcedMessages: true);
+
+    expect(state().isForcedUnread(msgKey), isFalse);
+    expect(state().isForcedUnread(otherMsgKey), isTrue);
+    expect(state().locallyForcedChannelIds, {otherChannelId});
+    expect(state().effectiveTimestamp(channelId), 2000);
+  });
+
+  test(
+    'automatic channel-open read preserves forced message entries',
+    () async {
+      final notifier = await pumpNotifier();
+
+      notifier.markContextUnread(msgKey, channelId: channelId);
+
+      // Channel open marks the channel read without clearForcedMessages.
+      notifier.markContextRead(channelId, 3000);
+
+      expect(state().isForcedUnread(msgKey), isTrue);
+      expect(state().locallyForcedChannelIds, {channelId});
+      expect(state().effectiveTimestamp(channelId), 3000);
+    },
+  );
+
+  test('automatic channel-open read still clears a channel-level force for '
+      'the same channel', () async {
+    final notifier = await pumpNotifier();
+
+    // Channel forced unread from the tile, message forced from the sheet.
+    notifier.markContextUnread(channelId, channelId: channelId);
+    notifier.markContextUnread(msgKey, channelId: channelId);
+
+    notifier.markContextRead(channelId, 4000);
+
+    // Opening the channel satisfies the channel-scoped force, but the
+    // deliberate message-level force survives until acted on.
+    expect(state().isForcedUnread(channelId), isFalse);
+    expect(state().isForcedUnread(msgKey), isTrue);
+    expect(state().locallyForcedChannelIds, {channelId});
+  });
+}
+
+class _FakeRelayConfig extends RelayConfigNotifier {
+  final String nsec;
+
+  _FakeRelayConfig(this.nsec);
+
+  @override
+  RelayConfig build() => RelayConfig(baseUrl: 'http://localhost:1', nsec: nsec);
+}
+
+/// Relay session that never connects and returns no history, keeping the
+/// manager fully local while exercising its real code paths.
+class _FakeRelaySession extends RelaySessionNotifier {
+  @override
+  SessionState build() =>
+      const SessionState(status: SessionStatus.disconnected);
+
+  @override
+  Future<List<NostrEvent>> fetchHistory(
+    NostrFilter filter, {
+    Duration timeout = const Duration(seconds: 8),
+  }) async => [];
+
+  @override
+  Future<void Function()> subscribe(
+    NostrFilter filter,
+    void Function(NostrEvent) onEvent, {
+    void Function(String message)? onClosed,
+  }) async => () {};
+}
+
+class _FakeAppLifecycle extends AppLifecycleNotifier {
+  @override
+  AppLifecycleState build() => AppLifecycleState.resumed;
+}
diff --git a/mobile/test/features/channels/send_message_provider_test.dart b/mobile/test/features/channels/send_message_provider_test.dart
new file mode 100644
index 0000000000..f91ce87b2b
--- /dev/null
+++ b/mobile/test/features/channels/send_message_provider_test.dart
@@ -0,0 +1,96 @@
+import 'dart:async';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:nostr/nostr.dart' as nostr;
+import 'package:buzz/features/channels/send_message_provider.dart';
+import 'package:buzz/shared/relay/relay.dart';
+
+void main() {
+  test(
+    'adds the signed message locally before relay acknowledgement',
+    () async {
+      final session = _PendingPublishRelaySession();
+      final localMessages = <NostrEvent>[];
+      final removedIds = <String>[];
+      final completedIds = <String>[];
+      final send = SendMessage(
+        signedEventRelay: SignedEventRelay(
+          session: session,
+          nsec: nostr.Keys.generate().nsec,
+        ),
+        fetchMembers: (_) async => const [],
+        readUserCache: () => const {},
+        addLocalMessage: (_, event) => localMessages.add(event),
+        completeLocalMessage: (_, eventId) => completedIds.add(eventId),
+        removeLocalMessage: (_, eventId) => removedIds.add(eventId),
+      );
+
+      final result = send(channelId: _channelId, content: 'hello');
+      await session.published;
+
+      expect(localMessages, hasLength(1));
+      expect(localMessages.single.id, session.event.id);
+      expect(localMessages.single.content, 'hello');
+      expect(localMessages.single.channelId, _channelId);
+      expect(removedIds, isEmpty);
+
+      session.accept();
+      await result;
+      expect(completedIds, [localMessages.single.id]);
+      expect(removedIds, isEmpty);
+    },
+  );
+
+  test('rolls back the signed local message when publish fails', () async {
+    final session = _PendingPublishRelaySession();
+    final localMessages = <NostrEvent>[];
+    final completedIds = <String>[];
+    final removedIds = <String>[];
+    final send = SendMessage(
+      signedEventRelay: SignedEventRelay(
+        session: session,
+        nsec: nostr.Keys.generate().nsec,
+      ),
+      fetchMembers: (_) async => const [],
+      readUserCache: () => const {},
+      addLocalMessage: (_, event) => localMessages.add(event),
+      completeLocalMessage: (_, eventId) => completedIds.add(eventId),
+      removeLocalMessage: (_, eventId) => removedIds.add(eventId),
+    );
+
+    final result = send(channelId: _channelId, content: 'hello');
+    await session.published;
+    session.reject();
+
+    await expectLater(result, throwsException);
+    expect(completedIds, isEmpty);
+    expect(removedIds, [localMessages.single.id]);
+  });
+}
+
+const _channelId = '11111111-1111-4111-8111-111111111111';
+
+class _PendingPublishRelaySession extends RelaySessionNotifier {
+  final Completer<NostrEvent> _result = Completer<NostrEvent>();
+  final Completer<void> _published = Completer<void>();
+  late NostrEvent event;
+
+  Future<void> get published => _published.future;
+
+  @override
+  SessionState build() => const SessionState(status: SessionStatus.connected);
+
+  @override
+  Future<NostrEvent> publish(
+    NostrEvent event, {
+    Duration timeout = const Duration(seconds: 8),
+  }) {
+    this.event = event;
+    _published.complete();
+    return _result.future;
+  }
+
+  void accept() => _result.complete(event);
+
+  void reject() => _result.completeError(Exception('relay rejected event'));
+}
diff --git a/mobile/test/features/channels/thread_follows/thread_follows_storage_test.dart b/mobile/test/features/channels/thread_follows/thread_follows_storage_test.dart
new file mode 100644
index 0000000000..58d04c5de9
--- /dev/null
+++ b/mobile/test/features/channels/thread_follows/thread_follows_storage_test.dart
@@ -0,0 +1,60 @@
+import 'package:buzz/features/channels/thread_follows/thread_follows_storage.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+Future<SharedPreferences> _prefs() async {
+  SharedPreferences.setMockInitialValues({});
+  return SharedPreferences.getInstance();
+}
+
+void main() {
+  const pubkey = 'abc123';
+
+  test('round-trips entries per pubkey', () async {
+    final storage = ThreadFollowsStorage(await _prefs());
+    storage.write(pubkey, const [
+      ThreadFollowEntry(rootId: 'root-1', followedAt: 100),
+      ThreadFollowEntry(rootId: 'root-2', followedAt: 200),
+    ]);
+
+    final entries = storage.read(pubkey);
+    expect(entries.map((e) => e.rootId), ['root-1', 'root-2']);
+    expect(entries.map((e) => e.followedAt), [100, 200]);
+    expect(storage.read('other-pubkey'), isEmpty);
+  });
+
+  test('ignores malformed stored payloads', () async {
+    SharedPreferences.setMockInitialValues({
+      threadFollowsKey(pubkey): '{"not":"a list"}',
+    });
+    final storage = ThreadFollowsStorage(await SharedPreferences.getInstance());
+    expect(storage.read(pubkey), isEmpty);
+  });
+
+  test('drops malformed entries but keeps valid ones', () async {
+    SharedPreferences.setMockInitialValues({
+      threadFollowsKey(pubkey):
+          '[{"rootId":"good","followedAt":5},{"rootId":42},"junk"]',
+    });
+    final storage = ThreadFollowsStorage(await SharedPreferences.getInstance());
+    final entries = storage.read(pubkey);
+    expect(entries, hasLength(1));
+    expect(entries.single.rootId, 'good');
+  });
+
+  test('capThreadFollowEntries evicts oldest first', () {
+    final entries = [
+      for (var i = 0; i < threadFollowsMaxEntries + 10; i++)
+        ThreadFollowEntry(rootId: 'root-$i', followedAt: i),
+    ];
+    final capped = capThreadFollowEntries(entries);
+    expect(capped, hasLength(threadFollowsMaxEntries));
+    expect(capped.first.rootId, 'root-10');
+    expect(capped.last.rootId, 'root-${threadFollowsMaxEntries + 9}');
+  });
+
+  test('capThreadFollowEntries keeps small lists untouched', () {
+    const entries = [ThreadFollowEntry(rootId: 'a', followedAt: 1)];
+    expect(capThreadFollowEntries(entries), same(entries));
+  });
+}
diff --git a/mobile/test/features/channels/unread_badge/unread_badge_provider_test.dart b/mobile/test/features/channels/unread_badge/unread_badge_provider_test.dart
index 2731e95307..987bd96b0a 100644
--- a/mobile/test/features/channels/unread_badge/unread_badge_provider_test.dart
+++ b/mobile/test/features/channels/unread_badge/unread_badge_provider_test.dart
@@ -55,7 +55,7 @@ void main() {
   ProviderContainer buildContainer({
     required List<Channel> channels,
     Map<String, int> readContexts = const {},
-    Set<String> locallyForcedChannelIds = const {},
+    Map<String, String> forcedUnreadContexts = const {},
     bool readStateReady = true,
     Map<String, int> highPriorityMap = const {},
     Map<String, List<ObservedUnreadEvent>>? observedEventsByChannel,
@@ -77,7 +77,7 @@ void main() {
               pubkey: 'me',
               contexts: readContexts,
               version: 1,
-              locallyForcedChannelIds: locallyForcedChannelIds,
+              forcedUnreadContexts: forcedUnreadContexts,
             ),
           ),
         ),
@@ -259,7 +259,7 @@ void main() {
       final container = buildContainer(
         channels: [makeChannel(id: 'ch-a', lastMessageAtSeconds: t20)],
         readContexts: {'ch-a': t30},
-        locallyForcedChannelIds: {'ch-a'},
+        forcedUnreadContexts: {'ch-a': 'ch-a'},
       );
       addTearDown(container.dispose);
 
diff --git a/mobile/test/features/forum/forum_widgets_test.dart b/mobile/test/features/forum/forum_widgets_test.dart
index dbed539f74..7f83a33c8d 100644
--- a/mobile/test/features/forum/forum_widgets_test.dart
+++ b/mobile/test/features/forum/forum_widgets_test.dart
@@ -12,6 +12,7 @@ import 'package:buzz/features/profile/user_cache_provider.dart';
 import 'package:buzz/features/profile/user_profile.dart';
 import 'package:buzz/shared/relay/relay.dart';
 import 'package:buzz/shared/theme/theme.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 const _channelId = 'forum-channel';
 
@@ -60,6 +61,7 @@ Widget _buildPostCard({
   Map<String, UserProfile> users = const {},
   VoidCallback? onTap,
   void Function(String)? onDelete,
+  TextScaler textScaler = TextScaler.noScaling,
 }) {
   return ProviderScope(
     overrides: [
@@ -67,12 +69,17 @@ Widget _buildPostCard({
     ],
     child: MaterialApp(
       theme: AppTheme.light(),
-      home: Scaffold(
-        body: ForumPostCard(
-          post: post,
-          currentPubkey: currentPubkey,
-          onTap: onTap ?? () {},
-          onDelete: onDelete,
+      home: Builder(
+        builder: (context) => MediaQuery(
+          data: MediaQuery.of(context).copyWith(textScaler: textScaler),
+          child: Scaffold(
+            body: ForumPostCard(
+              post: post,
+              currentPubkey: currentPubkey,
+              onTap: onTap ?? () {},
+              onDelete: onDelete,
+            ),
+          ),
         ),
       ),
     ),
@@ -103,6 +110,10 @@ Widget _buildPostsView({
   );
 }
 
+/// Shared mock prefs for the compose bar's draft store. Initialized in
+/// [main].
+late SharedPreferences _testPrefs;
+
 Widget _buildThreadPage({
   required ForumThreadResponse threadResponse,
   String postEventId = 'post1',
@@ -110,6 +121,7 @@ Widget _buildThreadPage({
   bool isMember = true,
   bool isArchived = false,
   Map<String, UserProfile> users = const {},
+  TextScaler textScaler = TextScaler.noScaling,
 }) {
   return ProviderScope(
     overrides: [
@@ -119,24 +131,35 @@ Widget _buildThreadPage({
         channelId: _channelId,
         eventId: postEventId,
       )).overrideWith((ref) async => threadResponse),
+      savedPrefsProvider.overrideWithValue(_testPrefs),
       relayClientProvider.overrideWithValue(
         RelayClient(baseUrl: 'http://localhost:3000'),
       ),
     ],
     child: MaterialApp(
       theme: AppTheme.light(),
-      home: ForumThreadPage(
-        channelId: _channelId,
-        postEventId: postEventId,
-        currentPubkey: currentPubkey,
-        isMember: isMember,
-        isArchived: isArchived,
+      home: Builder(
+        builder: (context) => MediaQuery(
+          data: MediaQuery.of(context).copyWith(textScaler: textScaler),
+          child: ForumThreadPage(
+            channelId: _channelId,
+            postEventId: postEventId,
+            currentPubkey: currentPubkey,
+            isMember: isMember,
+            isArchived: isArchived,
+          ),
+        ),
       ),
     ),
   );
 }
 
 void main() {
+  setUp(() async {
+    SharedPreferences.setMockInitialValues({});
+    _testPrefs = await SharedPreferences.getInstance();
+  });
+
   group('ForumPostCard', () {
     testWidgets('renders author name and content', (tester) async {
       await tester.pumpWidget(
@@ -160,6 +183,63 @@ void main() {
       expect(find.text('abcdef12\u2026'), findsOneWidget);
     });
 
+    testWidgets(
+      'constrains an older timestamp at large accessible text sizes',
+      (tester) async {
+        _setSurfaceSize(tester, const Size(240, 600));
+        addTearDown(() {
+          tester.view.resetPhysicalSize();
+          tester.view.resetDevicePixelRatio();
+        });
+
+        await tester.pumpWidget(
+          _buildPostCard(
+            post: _makePost(
+              createdAt:
+                  DateTime.utc(2025, 12, 31, 12).millisecondsSinceEpoch ~/ 1000,
+            ),
+            users: const {
+              'alice': UserProfile(
+                pubkey: 'alice',
+                displayName: 'A very long display name',
+              ),
+            },
+            textScaler: const TextScaler.linear(2),
+          ),
+        );
+        await tester.pumpAndSettle();
+
+        final timestamp = tester.widget<Text>(find.text('12/31/2025'));
+        expect(timestamp.maxLines, 1);
+        expect(timestamp.overflow, TextOverflow.ellipsis);
+        expect(tester.takeException(), isNull);
+      },
+    );
+
+    testWidgets('gives the author unused timestamp width', (tester) async {
+      _setSurfaceSize(tester, const Size(320, 600));
+      addTearDown(() {
+        tester.view.resetPhysicalSize();
+        tester.view.resetDevicePixelRatio();
+      });
+      final createdAt = DateTime.now().millisecondsSinceEpoch ~/ 1000 - 120;
+      const displayName = 'A moderately long forum author name';
+
+      await tester.pumpWidget(
+        _buildPostCard(
+          post: _makePost(createdAt: createdAt),
+          users: const {
+            'alice': UserProfile(pubkey: 'alice', displayName: displayName),
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(tester.getSize(find.text(displayName)).width, greaterThan(150));
+      expect(find.text('2m ago'), findsOneWidget);
+      expect(tester.takeException(), isNull);
+    });
+
     testWidgets('truncates long content', (tester) async {
       final longContent = 'A' * 300;
       await tester.pumpWidget(
@@ -484,6 +564,97 @@ void main() {
       expect(find.text('Bob'), findsOneWidget);
     });
 
+    testWidgets('constrains post and reply timestamps at large text sizes', (
+      tester,
+    ) async {
+      final oldTimestamp =
+          DateTime.utc(2025, 12, 31, 12).millisecondsSinceEpoch ~/ 1000;
+
+      await tester.pumpWidget(
+        _buildThreadPage(
+          threadResponse: ForumThreadResponse(
+            post: _makePost(createdAt: oldTimestamp),
+            replies: [
+              ThreadReply(
+                eventId: 'old-reply',
+                pubkey: 'bob',
+                content: 'An older reply',
+                kind: 45003,
+                createdAt: oldTimestamp,
+                channelId: _channelId,
+                tags: const [
+                  ['h', _channelId],
+                ],
+                depth: 1,
+              ),
+            ],
+            totalReplies: 1,
+          ),
+          users: const {
+            'alice': _aliceProfile,
+            'bob': UserProfile(
+              pubkey: 'bob',
+              displayName: 'A very long reply author name',
+            ),
+          },
+          textScaler: const TextScaler.linear(2),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final timestamps = tester.widgetList<Text>(find.text('12/31/2025'));
+      expect(timestamps, hasLength(2));
+      for (final timestamp in timestamps) {
+        expect(timestamp.maxLines, 1);
+        expect(timestamp.overflow, TextOverflow.ellipsis);
+      }
+      expect(tester.takeException(), isNull);
+    });
+
+    testWidgets('gives thread authors unused timestamp width', (tester) async {
+      _setSurfaceSize(tester, const Size(320, 800));
+      addTearDown(() {
+        tester.view.resetPhysicalSize();
+        tester.view.resetDevicePixelRatio();
+      });
+      final createdAt = DateTime.now().millisecondsSinceEpoch ~/ 1000 - 120;
+      const postAuthor = 'A moderately long original author';
+      const replyAuthor = 'A moderately long reply author';
+
+      await tester.pumpWidget(
+        _buildThreadPage(
+          threadResponse: ForumThreadResponse(
+            post: _makePost(createdAt: createdAt),
+            replies: [
+              ThreadReply(
+                eventId: 'reply',
+                pubkey: 'bob',
+                content: 'A reply',
+                kind: 45003,
+                createdAt: createdAt,
+                channelId: _channelId,
+                tags: const [
+                  ['h', _channelId],
+                ],
+                depth: 1,
+              ),
+            ],
+            totalReplies: 1,
+          ),
+          users: const {
+            'alice': UserProfile(pubkey: 'alice', displayName: postAuthor),
+            'bob': UserProfile(pubkey: 'bob', displayName: replyAuthor),
+          },
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(tester.getSize(find.text(postAuthor)).width, greaterThan(150));
+      expect(tester.getSize(find.text(replyAuthor)).width, greaterThan(140));
+      expect(find.text('2m ago'), findsNWidgets(2));
+      expect(tester.takeException(), isNull);
+    });
+
     testWidgets('shows compose bar for members', (tester) async {
       await tester.pumpWidget(
         _buildThreadPage(
diff --git a/mobile/test/features/home/home_page_test.dart b/mobile/test/features/home/home_page_test.dart
index a738c3dce4..cf688ce726 100644
--- a/mobile/test/features/home/home_page_test.dart
+++ b/mobile/test/features/home/home_page_test.dart
@@ -5,16 +5,25 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 void main() {
+  Future<Widget> buildHome() async {
+    SharedPreferences.setMockInitialValues({});
+    final prefs = await SharedPreferences.getInstance();
+    return ProviderScope(
+      overrides: [savedPrefsProvider.overrideWithValue(prefs)],
+      child: MaterialApp(
+        theme: AppTheme.light(),
+        home: const HomePage(settingsPageBuilder: _buildSettingsPage),
+      ),
+    );
+  }
+
   testWidgets('shows icon-only navigation and an aligned quick action', (
     tester,
   ) async {
-    await tester.pumpWidget(
-      ProviderScope(
-        child: MaterialApp(theme: AppTheme.light(), home: const HomePage()),
-      ),
-    );
+    await tester.pumpWidget(await buildHome());
     await tester.pump();
 
     expect(find.text('Home'), findsNothing);
@@ -65,11 +74,7 @@ void main() {
           .setMockMethodCallHandler(SystemChannels.platform, null),
     );
 
-    await tester.pumpWidget(
-      ProviderScope(
-        child: MaterialApp(theme: AppTheme.light(), home: const HomePage()),
-      ),
-    );
+    await tester.pumpWidget(await buildHome());
     await tester.pump();
 
     await tester.tap(find.byTooltip('Home'));
@@ -93,11 +98,7 @@ void main() {
   testWidgets('scales and fades the quick action as tabs change', (
     tester,
   ) async {
-    await tester.pumpWidget(
-      ProviderScope(
-        child: MaterialApp(theme: AppTheme.light(), home: const HomePage()),
-      ),
-    );
+    await tester.pumpWidget(await buildHome());
     await tester.pump();
 
     double scale() => tester
@@ -135,3 +136,5 @@ void main() {
     expect(opacity(), closeTo(1, 0.001));
   });
 }
+
+Widget _buildSettingsPage(BuildContext context) => const SizedBox.shrink();
diff --git a/mobile/test/features/invites/invite_join_provider_test.dart b/mobile/test/features/invites/invite_join_provider_test.dart
index 29158f7910..d3a2532388 100644
--- a/mobile/test/features/invites/invite_join_provider_test.dart
+++ b/mobile/test/features/invites/invite_join_provider_test.dart
@@ -5,6 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart' as http_testing;
 import 'package:nostr/nostr.dart' as nostr;
+import 'package:pointycastle/digests/sha256.dart';
 
 import 'package:buzz/features/invites/invite_join_provider.dart';
 import 'package:buzz/shared/auth/auth.dart';
@@ -128,7 +129,26 @@ void main() {
         'https://relay.example.com/api/invites/claim',
       );
       expect(capturedRequest!.body, jsonEncode({'code': 'code'}));
-      expect(capturedRequest!.headers['Authorization'], startsWith('Nostr '));
+      final authHeader = capturedRequest!.headers['Authorization'];
+      expect(authHeader, startsWith('Nostr '));
+      expect(capturedRequest!.followRedirects, isFalse);
+      final encoded = authHeader!.substring('Nostr '.length);
+      final authEvent =
+          jsonDecode(
+                utf8.decode(base64Url.decode(base64Url.normalize(encoded))),
+              )
+              as Map<String, dynamic>;
+      final tags = (authEvent['tags'] as List<dynamic>)
+          .map((tag) => (tag as List<dynamic>).cast<String>())
+          .toList();
+      final payloadHash = SHA256Digest()
+          .process(capturedRequest!.bodyBytes)
+          .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+          .join();
+      expect(authEvent['kind'], 27235);
+      expect(tags, contains(equals(['u', capturedRequest!.url.toString()])));
+      expect(tags, contains(equals(['method', 'POST'])));
+      expect(tags, contains(equals(['payload', payloadHash])));
       expect(auth.authenticatedCommunities, hasLength(1));
       expect(
         auth.authenticatedCommunities.single.relayUrl,
@@ -139,6 +159,21 @@ void main() {
     },
   );
 
+  test('prepare rejects an unsafe relay before showing confirmation', () async {
+    final container = ProviderContainer();
+    addTearDown(container.dispose);
+
+    await expectLater(
+      container
+          .read(inviteJoinProvider.notifier)
+          .prepare(
+            const InviteDeepLink(relayUrl: 'wss://127.0.0.1', code: 'code'),
+          ),
+      throwsFormatException,
+    );
+    expect(container.read(inviteJoinProvider).status, InviteJoinStatus.idle);
+  });
+
   test('join_policy_required requires a fresh link and cannot retry', () async {
     final keys = nostr.Keys.generate();
     var attempts = 0;
@@ -183,6 +218,49 @@ void main() {
     expect(attempts, 1);
   });
 
+  test('invite_exhausted requires a fresh invite and cannot retry', () async {
+    final keys = nostr.Keys.generate();
+    var attempts = 0;
+    final storage = CommunityStorage(secure: FakeSecureStorage());
+    final container = ProviderContainer(
+      overrides: [
+        communityStorageProvider.overrideWithValue(storage),
+        inviteKeyGeneratorProvider.overrideWithValue(() => keys),
+        inviteJoinHttpClientProvider.overrideWithValue(
+          http_testing.MockClient((request) async {
+            attempts++;
+            return http.Response(
+              jsonEncode({'error': 'invite_exhausted'}),
+              403,
+            );
+          }),
+        ),
+      ],
+    );
+    addTearDown(container.dispose);
+
+    await container
+        .read(inviteJoinProvider.notifier)
+        .prepare(
+          const InviteDeepLink(
+            relayUrl: 'wss://relay.example.com',
+            code: 'v2.exhausted-secret',
+          ),
+        );
+    await container.read(inviteJoinProvider.notifier).confirmJoin();
+
+    final state = container.read(inviteJoinProvider);
+    expect(state.status, InviteJoinStatus.error);
+    expect(state.requiresFreshInvite, isTrue);
+    expect(
+      state.errorMessage,
+      'This invite has reached its use limit. Ask for a new invite.',
+    );
+
+    await container.read(inviteJoinProvider.notifier).confirmJoin();
+    expect(attempts, 1);
+  });
+
   test('failed claim can be retried and preserves policy receipt', () async {
     final keys = nostr.Keys.generate();
     var attempts = 0;
diff --git a/mobile/test/features/pairing/pairing_page_test.dart b/mobile/test/features/pairing/pairing_page_test.dart
index 10d4458153..678be9dfe7 100644
--- a/mobile/test/features/pairing/pairing_page_test.dart
+++ b/mobile/test/features/pairing/pairing_page_test.dart
@@ -1,27 +1,97 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:buzz/features/pairing/pairing_page.dart';
 import 'package:buzz/features/pairing/pairing_provider.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/buzz_loading_indicator.dart';
+import 'package:buzz/shared/widgets/tappable_flapping_bee.dart';
 
 import '../../helpers/widget_helpers.dart';
 
 void main() {
   group('PairingPage', () {
-    testWidgets('renders branding, scan button, divider, and text field', (
+    testWidgets('renders branding and progressive pairing actions', (
       tester,
     ) async {
       await tester.pumpWidget(
         WidgetHelpers.testable(child: const PairingPage()),
       );
 
-      expect(
-        find.image(const AssetImage('assets/images/buzz-icon.png')),
-        findsOneWidget,
-      );
+      expect(find.byType(TappableFlappingBee), findsOneWidget);
       expect(find.text('Welcome to Buzz'), findsOneWidget);
-      expect(find.text('Scan QR Code'), findsOneWidget);
-      expect(find.text('or paste pairing code'), findsOneWidget);
+      expect(find.text('Scan a QR code'), findsOneWidget);
+      expect(find.text('Use pairing code'), findsOneWidget);
+      expect(find.text('Connect'), findsNothing);
+      expect(find.byType(TextField), findsNothing);
+    });
+
+    testWidgets('uses compact desktop-style onboarding actions', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        WidgetHelpers.testable(child: const PairingPage()),
+      );
+
+      final scanButton = tester.getSize(
+        find.widgetWithText(FilledButton, 'Scan a QR code'),
+      );
+      final pairingCodeButton = tester.getSize(
+        find.widgetWithText(TextButton, 'Use pairing code'),
+      );
+
+      expect(scanButton.width, lessThan(440));
+      expect(pairingCodeButton.width, lessThan(440));
+      expect(find.byType(OutlinedButton), findsNothing);
+    });
+
+    testWidgets('uses dark status-bar icons on the onboarding surface', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        WidgetHelpers.testable(child: const PairingPage()),
+      );
+
+      final overlay = tester.widget<AnnotatedRegion<SystemUiOverlayStyle>>(
+        find.byKey(const Key('pairing-onboarding-system-overlay')),
+      );
+
+      expect(overlay.value.statusBarIconBrightness, Brightness.dark);
+      expect(overlay.value.statusBarColor, Colors.transparent);
+    });
+
+    testWidgets('uses light status-bar icons for dark-theme SAS verification', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        ProviderScope(
+          overrides: [
+            pairingProvider.overrideWith(() => _ConfirmingSasPairingNotifier()),
+          ],
+          child: MaterialApp(theme: AppTheme.dark(), home: const PairingPage()),
+        ),
+      );
+
+      final overlay = tester.widget<AnnotatedRegion<SystemUiOverlayStyle>>(
+        find.byKey(const Key('pairing-sas-system-overlay')),
+      );
+
+      expect(overlay.value.statusBarIconBrightness, Brightness.light);
+      expect(overlay.value.statusBarColor, Colors.transparent);
+      expect(find.text('Verify Security Code'), findsOneWidget);
+    });
+
+    testWidgets('reveals pairing code field and connect action', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        WidgetHelpers.testable(child: const PairingPage()),
+      );
+
+      await _expandPairingCode(tester);
+
+      expect(find.text('Hide pairing code'), findsOneWidget);
       expect(find.text('Connect'), findsOneWidget);
       expect(find.byType(TextField), findsOneWidget);
     });
@@ -32,6 +102,7 @@ void main() {
       await tester.pumpWidget(
         WidgetHelpers.testable(child: const PairingPage()),
       );
+      await _expandPairingCode(tester);
 
       final textField = tester.getBottomLeft(find.byType(TextField));
       final connectButton = tester.getTopLeft(
@@ -46,6 +117,7 @@ void main() {
       await tester.pumpWidget(
         WidgetHelpers.testable(child: const PairingPage()),
       );
+      await _expandPairingCode(tester);
 
       final connectButton = tester.getSize(
         find.widgetWithText(FilledButton, 'Connect'),
@@ -83,14 +155,12 @@ void main() {
       );
       await tester.pump();
 
-      expect(find.byType(CircularProgressIndicator), findsOneWidget);
+      expect(find.byType(BuzzLoadingIndicator), findsOneWidget);
       // Connect text should be replaced by spinner.
       expect(find.text('Connect'), findsNothing);
     });
 
-    testWidgets('text field and buttons disabled when connecting', (
-      tester,
-    ) async {
+    testWidgets('pairing actions are disabled when connecting', (tester) async {
       await tester.pumpWidget(
         WidgetHelpers.testable(
           overrides: [
@@ -101,12 +171,22 @@ void main() {
       );
       await tester.pump();
 
-      final textField = tester.widget<TextField>(find.byType(TextField));
-      expect(textField.enabled, isFalse);
+      final scanButton = tester.widget<FilledButton>(find.byType(FilledButton));
+      final pairingCodeButton = tester.widget<TextButton>(
+        find.widgetWithText(TextButton, 'Use pairing code'),
+      );
+
+      expect(scanButton.onPressed, isNull);
+      expect(pairingCodeButton.onPressed, isNull);
     });
   });
 }
 
+Future<void> _expandPairingCode(WidgetTester tester) async {
+  await tester.tap(find.text('Use pairing code'));
+  await tester.pumpAndSettle();
+}
+
 class _ErrorPairingNotifier extends Notifier<PairingState>
     implements PairingNotifier {
   final String error;
@@ -146,3 +226,24 @@ class _ConnectingPairingNotifier extends Notifier<PairingState>
   @override
   void denySas() {}
 }
+
+class _ConfirmingSasPairingNotifier extends Notifier<PairingState>
+    implements PairingNotifier {
+  @override
+  PairingState build() => const PairingState(
+    status: PairingStatus.confirmingSas,
+    sasCode: '123456',
+  );
+
+  @override
+  Future<void> pair(String rawInput) async {}
+
+  @override
+  void reset() {}
+
+  @override
+  void confirmSas() {}
+
+  @override
+  void denySas() {}
+}
diff --git a/mobile/test/features/profile/profile_avatar_test.dart b/mobile/test/features/profile/profile_avatar_test.dart
new file mode 100644
index 0000000000..4562e4166c
--- /dev/null
+++ b/mobile/test/features/profile/profile_avatar_test.dart
@@ -0,0 +1,104 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:buzz/features/profile/profile_avatar.dart';
+import 'package:buzz/features/profile/profile_provider.dart';
+import 'package:buzz/features/profile/user_profile.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/masked_avatar_badge.dart';
+
+void main() {
+  Widget harness({bool showPresence = true, String presence = 'online'}) {
+    return ProviderScope(
+      overrides: [
+        profileProvider.overrideWith(_FakeProfileNotifier.new),
+        presenceProvider.overrideWith(() => _FakePresenceNotifier(presence)),
+      ],
+      child: MaterialApp(
+        theme: AppTheme.light(),
+        home: Center(child: ProfileAvatar(showPresence: showPresence)),
+      ),
+    );
+  }
+
+  testWidgets('seats the presence dot in a notch instead of over the avatar', (
+    tester,
+  ) async {
+    await tester.pumpWidget(harness());
+    await tester.pumpAndSettle();
+
+    final badge = tester.widget<MaskedAvatarBadge>(
+      find.byType(MaskedAvatarBadge),
+    );
+    expect(badge.geometry, AvatarBadgeMaskGeometry.presenceDot);
+    expect(
+      tester.widget<ClipPath>(find.byType(ClipPath).last).clipper,
+      isA<AvatarBadgeMaskClipper>(),
+    );
+
+    // The notch supplies the separation, so the dot carries no border ring.
+    final dot = tester
+        .widgetList<DecoratedBox>(find.byType(DecoratedBox))
+        .map((box) => box.decoration)
+        .whereType<BoxDecoration>()
+        .firstWhere((decoration) => decoration.shape == BoxShape.circle);
+    expect(dot.border, isNull);
+  });
+
+  Color dotColor(WidgetTester tester) => tester
+      .widgetList<DecoratedBox>(find.byType(DecoratedBox))
+      .map((box) => box.decoration)
+      .whereType<BoxDecoration>()
+      .firstWhere((decoration) => decoration.shape == BoxShape.circle)
+      .color!;
+
+  final theme = AppTheme.light();
+
+  testWidgets('paints the dot with the presence color', (tester) async {
+    await tester.pumpWidget(harness());
+    await tester.pumpAndSettle();
+
+    expect(dotColor(tester), theme.extension<AppColors>()!.success);
+  });
+
+  testWidgets('mutes the dot when offline', (tester) async {
+    await tester.pumpWidget(harness(presence: 'offline'));
+    await tester.pumpAndSettle();
+
+    expect(dotColor(tester), theme.colorScheme.outline);
+  });
+
+  testWidgets('leaves the avatar unmasked when presence is hidden', (
+    tester,
+  ) async {
+    await tester.pumpWidget(harness(showPresence: false));
+    await tester.pumpAndSettle();
+
+    final badge = tester.widget<MaskedAvatarBadge>(
+      find.byType(MaskedAvatarBadge),
+    );
+    expect(badge.badge, isNull);
+    expect(
+      find.descendant(
+        of: find.byType(MaskedAvatarBadge),
+        matching: find.byType(ClipPath),
+      ),
+      findsNothing,
+    );
+  });
+}
+
+class _FakeProfileNotifier extends ProfileNotifier {
+  @override
+  Future<UserProfile?> build() async =>
+      const UserProfile(pubkey: 'aabb', displayName: 'Test');
+}
+
+class _FakePresenceNotifier extends PresenceNotifier {
+  _FakePresenceNotifier(this._presence);
+
+  final String _presence;
+
+  @override
+  Future<String> build() async => _presence;
+}
diff --git a/mobile/test/features/profile/set_status_sheet_test.dart b/mobile/test/features/profile/set_status_sheet_test.dart
new file mode 100644
index 0000000000..53563758d9
--- /dev/null
+++ b/mobile/test/features/profile/set_status_sheet_test.dart
@@ -0,0 +1,72 @@
+import 'package:buzz/features/profile/set_status_sheet.dart';
+import 'package:buzz/features/profile/user_status.dart';
+import 'package:buzz/features/profile/user_status_provider.dart';
+import 'package:buzz/shared/custom_emoji/custom_emoji_provider.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
+
+import '../../helpers/widget_helpers.dart';
+
+void main() {
+  testWidgets('removes only the emoji from an existing status', (tester) async {
+    final statusNotifier = _RecordingUserStatusNotifier();
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        overrides: [
+          customEmojiListProvider.overrideWithValue(const []),
+          userStatusProvider.overrideWith(() => statusNotifier),
+        ],
+        child: Builder(
+          builder: (context) => FilledButton(
+            onPressed: () => showSetStatusSheet(
+              context,
+              currentStatus: const UserStatus(
+                text: 'Focusing',
+                emoji: '\u{1F3AF}',
+                updatedAt: 1,
+              ),
+            ),
+            child: const Text('Open status editor'),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.text('Open status editor'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('\u{1F3AF}'), findsOneWidget);
+    expect(find.byTooltip('Remove status emoji'), findsOneWidget);
+
+    await tester.tap(find.byTooltip('Remove status emoji'));
+    await tester.pump();
+
+    expect(find.text('\u{1F3AF}'), findsNothing);
+    expect(find.byIcon(LucideIcons.smilePlus), findsOneWidget);
+    expect(
+      tester.widget<TextField>(find.byType(TextField)).controller?.text,
+      'Focusing',
+    );
+
+    await tester.tap(find.text('Save'));
+    await tester.pumpAndSettle();
+
+    expect(statusNotifier.savedText, 'Focusing');
+    expect(statusNotifier.savedEmoji, isEmpty);
+  });
+}
+
+class _RecordingUserStatusNotifier extends UserStatusNotifier {
+  String? savedText;
+  String? savedEmoji;
+
+  @override
+  Future<UserStatus?> build() async => null;
+
+  @override
+  Future<void> setStatus(String text, String emoji) async {
+    savedText = text;
+    savedEmoji = emoji;
+  }
+}
diff --git a/mobile/test/features/profile/settings_profile_header_test.dart b/mobile/test/features/profile/settings_profile_header_test.dart
new file mode 100644
index 0000000000..dbf27b5c81
--- /dev/null
+++ b/mobile/test/features/profile/settings_profile_header_test.dart
@@ -0,0 +1,63 @@
+import 'package:buzz/features/profile/profile_provider.dart';
+import 'package:buzz/features/profile/settings_profile_header.dart';
+import 'package:buzz/features/profile/user_profile.dart';
+import 'package:buzz/features/profile/user_status.dart';
+import 'package:buzz/features/profile/user_status_provider.dart';
+import 'package:buzz/shared/custom_emoji/custom_emoji_provider.dart';
+import 'package:buzz/shared/widgets/masked_avatar_badge.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
+
+import '../../helpers/widget_helpers.dart';
+
+void main() {
+  testWidgets('uses a bounded icon for an unresolved status shortcode', (
+    tester,
+  ) async {
+    const missingShortcode = ':very_long_missing_custom_emoji:';
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        overrides: [
+          profileProvider.overrideWith(_FakeProfileNotifier.new),
+          userStatusProvider.overrideWith(
+            () => _FakeUserStatusNotifier(
+              const UserStatus(
+                text: 'Focusing',
+                emoji: missingShortcode,
+                updatedAt: 1,
+              ),
+            ),
+          ),
+          customEmojiListProvider.overrideWithValue(const []),
+        ],
+        child: const SettingsProfileHeader(),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final badge = find.byType(MaskedAvatarBadge);
+    expect(
+      find.descendant(of: badge, matching: find.text(missingShortcode)),
+      findsNothing,
+    );
+    expect(
+      find.descendant(of: badge, matching: find.byIcon(LucideIcons.smile)),
+      findsOneWidget,
+    );
+  });
+}
+
+class _FakeProfileNotifier extends ProfileNotifier {
+  @override
+  Future<UserProfile?> build() async =>
+      const UserProfile(pubkey: 'aabb', displayName: 'Test');
+}
+
+class _FakeUserStatusNotifier extends UserStatusNotifier {
+  _FakeUserStatusNotifier(this._status);
+
+  final UserStatus _status;
+
+  @override
+  Future<UserStatus?> build() async => _status;
+}
diff --git a/mobile/test/features/pulse/compose_note_page_test.dart b/mobile/test/features/pulse/compose_note_page_test.dart
index 5ac84bcc8c..e32225fe1a 100644
--- a/mobile/test/features/pulse/compose_note_page_test.dart
+++ b/mobile/test/features/pulse/compose_note_page_test.dart
@@ -24,19 +24,31 @@ void main() {
     tags: const [],
   );
 
-  Widget buildTestable(Widget home) {
+  Widget buildTestable(
+    Widget home, {
+    TextScaler textScaler = TextScaler.noScaling,
+    String displayName = 'Alice',
+  }) {
     return ProviderScope(
       overrides: [
         userCacheProvider.overrideWith(
           () => _FakeUserCacheNotifier({
-            'alice_pk': const UserProfile(
+            'alice_pk': UserProfile(
               pubkey: 'alice_pk',
-              displayName: 'Alice',
+              displayName: displayName,
             ),
           }),
         ),
       ],
-      child: MaterialApp(theme: AppTheme.light(), home: home),
+      child: MaterialApp(
+        theme: AppTheme.light(),
+        home: Builder(
+          builder: (context) => MediaQuery(
+            data: MediaQuery.of(context).copyWith(textScaler: textScaler),
+            child: home,
+          ),
+        ),
+      ),
     );
   }
 
@@ -52,6 +64,53 @@ void main() {
     expect(find.text('Reply'), findsOneWidget); // action button label
   });
 
+  testWidgets('reply preview constrains its timestamp at large text sizes', (
+    tester,
+  ) async {
+    final oldReplyNote = UserNote(
+      id: 'old-note',
+      pubkey: 'alice_pk',
+      createdAt: DateTime.utc(2025, 9, 30, 12).millisecondsSinceEpoch ~/ 1000,
+      content: 'An older note',
+      tags: const [],
+    );
+
+    await tester.pumpWidget(
+      buildTestable(
+        ComposeNotePage(replyTo: oldReplyNote),
+        textScaler: const TextScaler.linear(2),
+      ),
+    );
+    await tester.pump();
+
+    final timestamp = tester.widget<Text>(find.text('Sep 30'));
+    expect(timestamp.maxLines, 1);
+    expect(timestamp.overflow, TextOverflow.ellipsis);
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('gives the reply author unused timestamp width', (tester) async {
+    tester.view.devicePixelRatio = 1;
+    tester.view.physicalSize = const Size(320, 600);
+    addTearDown(() {
+      tester.view.resetPhysicalSize();
+      tester.view.resetDevicePixelRatio();
+    });
+    const displayName = 'A moderately long Pulse reply author';
+
+    await tester.pumpWidget(
+      buildTestable(
+        ComposeNotePage(replyTo: replyNote),
+        displayName: displayName,
+      ),
+    );
+    await tester.pump();
+
+    expect(tester.getSize(find.text(displayName)).width, greaterThan(150));
+    expect(find.text('2m'), findsOneWidget);
+    expect(tester.takeException(), isNull);
+  });
+
   testWidgets('new-note mode shows no reply preview', (tester) async {
     await tester.pumpWidget(buildTestable(const ComposeNotePage()));
     await tester.pump();
diff --git a/mobile/test/features/pulse/note_card_test.dart b/mobile/test/features/pulse/note_card_test.dart
new file mode 100644
index 0000000000..73e6e8af02
--- /dev/null
+++ b/mobile/test/features/pulse/note_card_test.dart
@@ -0,0 +1,130 @@
+import 'package:buzz/features/profile/user_cache_provider.dart';
+import 'package:buzz/features/profile/user_profile.dart';
+import 'package:buzz/features/pulse/note_card.dart';
+import 'package:buzz/features/pulse/pulse_models.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class _FakeUserCacheNotifier extends UserCacheNotifier {
+  final Map<String, UserProfile> _users;
+
+  _FakeUserCacheNotifier(this._users);
+
+  @override
+  Map<String, UserProfile> build() => _users;
+}
+
+void main() {
+  testWidgets('constrains timestamp with agent and follow metadata', (
+    tester,
+  ) async {
+    tester.view.devicePixelRatio = 1;
+    tester.view.physicalSize = const Size(280, 600);
+    addTearDown(() {
+      tester.view.resetPhysicalSize();
+      tester.view.resetDevicePixelRatio();
+    });
+
+    final note = UserNote(
+      id: 'note-1',
+      pubkey: 'alice',
+      createdAt: DateTime.utc(2025, 9, 30, 12).millisecondsSinceEpoch ~/ 1000,
+      content: 'A note',
+      tags: const [],
+    );
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          userCacheProvider.overrideWith(
+            () => _FakeUserCacheNotifier({
+              'alice': const UserProfile(
+                pubkey: 'alice',
+                displayName: 'A very long display name',
+              ),
+            }),
+          ),
+        ],
+        child: MaterialApp(
+          theme: AppTheme.light(),
+          home: Builder(
+            builder: (context) => MediaQuery(
+              data: MediaQuery.of(
+                context,
+              ).copyWith(textScaler: const TextScaler.linear(2)),
+              child: Scaffold(
+                body: NoteCard(
+                  note: note,
+                  reaction: const PulseReactionState(
+                    count: 0,
+                    reactedByCurrentUser: false,
+                  ),
+                  isAgent: true,
+                  canFollow: true,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final timestamp = tester.widget<Text>(find.text('Sep 30'));
+    expect(timestamp.maxLines, 1);
+    expect(timestamp.overflow, TextOverflow.ellipsis);
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('gives the author unused timestamp width', (tester) async {
+    tester.view.devicePixelRatio = 1;
+    tester.view.physicalSize = const Size(320, 600);
+    addTearDown(() {
+      tester.view.resetPhysicalSize();
+      tester.view.resetDevicePixelRatio();
+    });
+    const displayName = 'A moderately long Pulse author';
+    final note = UserNote(
+      id: 'note-2',
+      pubkey: 'alice',
+      createdAt: DateTime.now().millisecondsSinceEpoch ~/ 1000 - 120,
+      content: 'A note',
+      tags: const [],
+    );
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          userCacheProvider.overrideWith(
+            () => _FakeUserCacheNotifier({
+              'alice': const UserProfile(
+                pubkey: 'alice',
+                displayName: displayName,
+              ),
+            }),
+          ),
+        ],
+        child: MaterialApp(
+          theme: AppTheme.light(),
+          home: Scaffold(
+            body: NoteCard(
+              note: note,
+              reaction: const PulseReactionState(
+                count: 0,
+                reactedByCurrentUser: false,
+              ),
+              canFollow: true,
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(tester.getSize(find.text(displayName)).width, greaterThan(145));
+    expect(find.text('2m'), findsOneWidget);
+    expect(tester.takeException(), isNull);
+  });
+}
diff --git a/mobile/test/features/search/recent_searches_provider_test.dart b/mobile/test/features/search/recent_searches_provider_test.dart
new file mode 100644
index 0000000000..df0a08a8ea
--- /dev/null
+++ b/mobile/test/features/search/recent_searches_provider_test.dart
@@ -0,0 +1,126 @@
+import 'package:buzz/features/search/recent_searches_provider.dart';
+import 'package:buzz/shared/relay/relay.dart';
+import 'package:buzz/shared/theme/theme_provider.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class _FixedRelayConfigNotifier extends RelayConfigNotifier {
+  final RelayConfig _config;
+
+  _FixedRelayConfigNotifier(this._config);
+
+  @override
+  RelayConfig build() => _config;
+}
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  Future<ProviderContainer> containerWithPrefs({
+    required String relayUrl,
+    required String? pubkey,
+  }) async {
+    final prefs = await SharedPreferences.getInstance();
+    final container = ProviderContainer(
+      overrides: [
+        savedPrefsProvider.overrideWithValue(prefs),
+        relayConfigProvider.overrideWith(
+          () => _FixedRelayConfigNotifier(RelayConfig(baseUrl: relayUrl)),
+        ),
+        myPubkeyProvider.overrideWithValue(pubkey),
+      ],
+    );
+    addTearDown(container.dispose);
+    return container;
+  }
+
+  test('an invite-joined community keeps its recent searches after '
+      'origin canonicalization', () async {
+    const legacyKey = 'recent_searches_v1:wss://relay-a.example:pk-a';
+    const canonicalKey = 'recent_searches_v1:https://relay-a.example:pk-a';
+    SharedPreferences.setMockInitialValues({
+      legacyKey: <String>['nostr', 'relays'],
+    });
+
+    final container = await containerWithPrefs(
+      relayUrl: 'wss://relay-a.example',
+      pubkey: 'pk-a',
+    );
+
+    expect(container.read(recentSearchesProvider), ['nostr', 'relays']);
+
+    await Future<void>.delayed(Duration.zero);
+    final prefs = await SharedPreferences.getInstance();
+    expect(prefs.getStringList(canonicalKey), ['nostr', 'relays']);
+    expect(prefs.getStringList(legacyKey), isNull);
+  });
+
+  test(
+    'normalizes, deduplicates, caps, and persists submitted queries',
+    () async {
+      SharedPreferences.setMockInitialValues({});
+      final first = await containerWithPrefs(
+        relayUrl: 'https://relay-a.example',
+        pubkey: 'pk-a',
+      );
+      final notifier = first.read(recentSearchesProvider.notifier);
+
+      notifier.record('  Design  ');
+      notifier.record('design');
+      notifier.record('');
+      for (var index = 0; index < 6; index++) {
+        notifier.record('query-$index');
+      }
+
+      expect(first.read(recentSearchesProvider), [
+        'query-5',
+        'query-4',
+        'query-3',
+        'query-2',
+        'query-1',
+        'query-0',
+      ]);
+
+      final restarted = await containerWithPrefs(
+        relayUrl: 'https://relay-a.example',
+        pubkey: 'pk-a',
+      );
+      expect(
+        restarted.read(recentSearchesProvider),
+        first.read(recentSearchesProvider),
+      );
+    },
+  );
+
+  test('isolates persisted history by community and account', () async {
+    SharedPreferences.setMockInitialValues({});
+    final accountA = await containerWithPrefs(
+      relayUrl: 'https://relay-a.example',
+      pubkey: 'pk-a',
+    );
+    accountA.read(recentSearchesProvider.notifier).record('private query');
+
+    final accountB = await containerWithPrefs(
+      relayUrl: 'https://relay-a.example',
+      pubkey: 'pk-b',
+    );
+    expect(accountB.read(recentSearchesProvider), isEmpty);
+    accountB.read(recentSearchesProvider.notifier).record('account b query');
+
+    final communityB = await containerWithPrefs(
+      relayUrl: 'https://relay-b.example',
+      pubkey: 'pk-a',
+    );
+    expect(communityB.read(recentSearchesProvider), isEmpty);
+    communityB
+        .read(recentSearchesProvider.notifier)
+        .record('community b query');
+
+    final accountAAgain = await containerWithPrefs(
+      relayUrl: 'https://relay-a.example',
+      pubkey: 'pk-a',
+    );
+    expect(accountAAgain.read(recentSearchesProvider), ['private query']);
+  });
+}
diff --git a/mobile/test/features/search/search_page_test.dart b/mobile/test/features/search/search_page_test.dart
new file mode 100644
index 0000000000..e4a576b91d
--- /dev/null
+++ b/mobile/test/features/search/search_page_test.dart
@@ -0,0 +1,660 @@
+import 'package:buzz/features/channels/channel.dart';
+import 'package:buzz/features/channels/channel_management_provider.dart';
+import 'package:buzz/features/channels/channels_provider.dart';
+import 'package:buzz/features/channels/message_content.dart';
+import 'package:buzz/features/channels/small_avatar.dart';
+import 'package:buzz/features/profile/profile_provider.dart';
+import 'package:buzz/features/profile/user_cache_provider.dart';
+import 'package:buzz/features/profile/user_profile.dart';
+import 'package:buzz/features/search/recent_searches_provider.dart';
+import 'package:buzz/features/search/search_page.dart';
+import 'package:buzz/features/search/search_provider.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../helpers/widget_helpers.dart';
+
+void main() {
+  testWidgets('empty state preserves large accessible text scaling', (
+    tester,
+  ) async {
+    tester.view.physicalSize = const Size(320, 640);
+    tester.view.devicePixelRatio = 1;
+    addTearDown(tester.view.resetPhysicalSize);
+    addTearDown(tester.view.resetDevicePixelRatio);
+
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        overrides: [
+          searchProvider.overrideWith(
+            () => _FakeSearchNotifier(const SearchState.initial()),
+          ),
+          recentSearchesProvider.overrideWith(
+            () => _FakeRecentSearchesNotifier(const []),
+          ),
+          profileProvider.overrideWith(() => _FakeProfileNotifier()),
+        ],
+        child: Builder(
+          builder: (context) => MediaQuery(
+            data: MediaQuery.of(
+              context,
+            ).copyWith(textScaler: const TextScaler.linear(2)),
+            child: const SearchPage(),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final emptyState = find.byKey(const Key('search-empty-state'));
+    final message = find.text('Search messages, channels, and people');
+    final searchField = find.byKey(const Key('search-field-container'));
+    final searchFieldContext = tester.element(searchField);
+    final bodyStyle = Theme.of(searchFieldContext).textTheme.bodyMedium!;
+    final scaledLineHeight =
+        MediaQuery.textScalerOf(searchFieldContext).scale(bodyStyle.fontSize!) *
+        bodyStyle.height!;
+
+    expect(
+      find.descendant(of: emptyState, matching: find.byType(FittedBox)),
+      findsNothing,
+    );
+    expect(
+      tester.getSize(searchField).height,
+      greaterThanOrEqualTo(scaledLineHeight + Grid.xxs * 2),
+    );
+    final input = tester.widget<TextField>(
+      find.byKey(const Key('search-field')),
+    );
+    expect(input.style?.fontSize, searchInputTextStyle.fontSize);
+    expect(input.style?.height, searchInputTextStyle.height);
+    expect(tester.getSize(message).height, greaterThan(32));
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('focus slides Cancel in beside the search field', (tester) async {
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        overrides: [
+          searchProvider.overrideWith(
+            () => _FakeSearchNotifier(const SearchState.initial()),
+          ),
+          recentSearchesProvider.overrideWith(
+            () => _FakeRecentSearchesNotifier(const []),
+          ),
+          profileProvider.overrideWith(() => _FakeProfileNotifier()),
+        ],
+        child: const SearchPage(),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final searchField = find.byKey(const Key('search-field'));
+    final searchFieldContainer = find.byKey(
+      const Key('search-field-container'),
+    );
+    final unfocusedWidth = tester.getSize(searchFieldContainer).width;
+    expect(find.byKey(const Key('search-cancel')), findsNothing);
+    expect(
+      tester.widget<TextField>(searchField).decoration?.hintText,
+      'Search messages, channels, people\u2026',
+    );
+    expect(
+      tester.widget<TextField>(searchField).textInputAction,
+      TextInputAction.search,
+    );
+
+    await tester.tap(searchField);
+    await tester.pump();
+
+    final cancel = find.byKey(const Key('search-cancel'));
+    expect(cancel, findsOneWidget);
+    expect(
+      tester.getSize(cancel).height,
+      greaterThanOrEqualTo(Grid.xl),
+      reason: 'Cancel must keep a 48dp touch target.',
+    );
+    expect(tester.widget<TextField>(searchField).decoration?.hintText, isNull);
+    final enteringSlide = tester.widget<SlideTransition>(
+      find.ancestor(of: cancel, matching: find.byType(SlideTransition)).first,
+    );
+    expect(enteringSlide.position.value.dx, greaterThan(0));
+
+    await tester.pump(const Duration(milliseconds: 160));
+    final focusedWidth = tester.getSize(searchFieldContainer).width;
+    expect(focusedWidth, lessThan(unfocusedWidth));
+    final settledSlide = tester.widget<SlideTransition>(
+      find.ancestor(of: cancel, matching: find.byType(SlideTransition)).first,
+    );
+    expect(settledSlide.position.value, Offset.zero);
+
+    await tester.enterText(searchField, 'design');
+    await tester.tap(cancel);
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 60));
+    final exitingWidth = tester.getSize(searchFieldContainer).width;
+    expect(exitingWidth, greaterThan(focusedWidth));
+    expect(exitingWidth, lessThan(unfocusedWidth));
+    await tester.pumpAndSettle();
+
+    final input = tester.widget<TextField>(searchField);
+    expect(input.controller?.text, isEmpty);
+    expect(input.focusNode?.hasFocus, isFalse);
+    expect(
+      input.decoration?.hintText,
+      'Search messages, channels, people\u2026',
+    );
+    expect(find.byKey(const Key('search-cancel')), findsNothing);
+    expect(
+      tester.getSize(searchFieldContainer).width,
+      closeTo(unfocusedWidth, 0.01),
+    );
+  });
+
+  testWidgets('only submitted queries are added to recent searches', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        overrides: [
+          searchProvider.overrideWith(
+            () => _FakeSearchNotifier(const SearchState.initial()),
+          ),
+          recentSearchesProvider.overrideWith(
+            () => _FakeRecentSearchesNotifier(const []),
+          ),
+          profileProvider.overrideWith(() => _FakeProfileNotifier()),
+        ],
+        child: const SearchPage(),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final searchField = find.byKey(const Key('search-field'));
+    await tester.tap(searchField);
+    await tester.pumpAndSettle();
+    await tester.enterText(searchField, 'draft');
+    await tester.tap(find.byKey(const Key('search-cancel')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('recent-searches-list')), findsNothing);
+
+    await tester.tap(searchField);
+    await tester.pumpAndSettle();
+    await tester.enterText(searchField, 'design systems');
+    await tester.testTextInput.receiveAction(TextInputAction.search);
+    await tester.pump();
+    await tester.tap(find.byKey(const Key('search-cancel')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('recent-searches-list')), findsOneWidget);
+    expect(find.text('design systems'), findsOneWidget);
+  });
+
+  testWidgets('recent searches can be rerun and cleared', (tester) async {
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        overrides: [
+          searchProvider.overrideWith(
+            () => _FakeSearchNotifier(const SearchState.initial()),
+          ),
+          recentSearchesProvider.overrideWith(
+            () => _FakeRecentSearchesNotifier(const [
+              'design systems',
+              'launch plan',
+            ]),
+          ),
+          profileProvider.overrideWith(() => _FakeProfileNotifier()),
+        ],
+        child: const SearchPage(),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('recent-searches-list')), findsOneWidget);
+    expect(find.text('Recent searches'), findsOneWidget);
+    expect(find.text('design systems'), findsOneWidget);
+    expect(find.text('launch plan'), findsOneWidget);
+    expect(
+      tester.getSize(find.byKey(const ValueKey('recent-search-0'))).height,
+      greaterThanOrEqualTo(Grid.xl),
+    );
+    expect(
+      tester.getSize(find.byKey(const ValueKey('recent-search-1'))).height,
+      greaterThanOrEqualTo(Grid.xl),
+    );
+
+    await tester.tap(find.byKey(const ValueKey('recent-search-1')));
+    await tester.pumpAndSettle();
+
+    final searchField = find.byKey(const Key('search-field'));
+    final input = tester.widget<TextField>(searchField);
+    expect(input.controller?.text, 'launch plan');
+    expect(input.focusNode?.hasFocus, isTrue);
+    expect(find.text("No results for 'launch plan'"), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('search-cancel')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('recent-search-0')), findsOneWidget);
+    expect(find.text('launch plan'), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('clear-recent-searches')));
+    await tester.pumpAndSettle();
+    expect(find.byKey(const Key('recent-searches-list')), findsNothing);
+    expect(find.text('Search messages, channels, and people'), findsOneWidget);
+  });
+
+  testWidgets('keeps recent searches scrollable above the keyboard', (
+    tester,
+  ) async {
+    const keyboardInset = 300.0;
+    const footerClearance = 102.0;
+
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        overrides: [
+          searchProvider.overrideWith(
+            () => _FakeSearchNotifier(const SearchState.initial()),
+          ),
+          recentSearchesProvider.overrideWith(
+            () => _FakeRecentSearchesNotifier(const [
+              'design systems',
+              'launch plan',
+            ]),
+          ),
+          profileProvider.overrideWith(() => _FakeProfileNotifier()),
+        ],
+        child: Builder(
+          builder: (context) => MediaQuery(
+            data: MediaQuery.of(context).copyWith(
+              padding: const EdgeInsets.only(bottom: footerClearance),
+              viewInsets: const EdgeInsets.only(bottom: keyboardInset),
+            ),
+            child: const SearchPage(),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('search-field')));
+    await tester.pumpAndSettle();
+
+    final recentSearches = tester.widget<ListView>(
+      find.byKey(const Key('recent-searches-list')),
+    );
+    final padding = recentSearches.padding! as EdgeInsets;
+
+    expect(padding.bottom, Grid.xl + footerClearance + keyboardInset);
+  });
+
+  testWidgets('keeps search results scrollable above the keyboard', (
+    tester,
+  ) async {
+    const keyboardInset = 300.0;
+    const footerClearance = 102.0;
+    final state = SearchState(
+      query: 'general',
+      channelResults: [
+        Channel(
+          id: 'general',
+          name: 'general',
+          channelType: 'stream',
+          visibility: 'open',
+          description: 'General discussion',
+          createdBy: 'test',
+          createdAt: DateTime(2025),
+          memberCount: 1,
+          isMember: true,
+        ),
+      ],
+    );
+
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        overrides: [
+          searchProvider.overrideWith(() => _FakeSearchNotifier(state)),
+          recentSearchesProvider.overrideWith(
+            () => _FakeRecentSearchesNotifier(const []),
+          ),
+          profileProvider.overrideWith(() => _FakeProfileNotifier()),
+        ],
+        child: Builder(
+          builder: (context) => MediaQuery(
+            data: MediaQuery.of(context).copyWith(
+              padding: const EdgeInsets.only(bottom: footerClearance),
+              viewInsets: const EdgeInsets.only(bottom: keyboardInset),
+            ),
+            child: const SearchPage(),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final results = tester.widget<ListView>(
+      find.byKey(const Key('search-results-list')),
+    );
+    final padding = results.padding! as EdgeInsets;
+
+    expect(padding.bottom, Grid.xl + footerClearance + keyboardInset);
+  });
+
+  testWidgets('keeps no-results feedback above the keyboard', (tester) async {
+    const keyboardInset = 300.0;
+    tester.view.physicalSize = const Size(320, 640);
+    tester.view.devicePixelRatio = 1;
+    addTearDown(tester.view.resetPhysicalSize);
+    addTearDown(tester.view.resetDevicePixelRatio);
+
+    const query = 'missing';
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        overrides: [
+          searchProvider.overrideWith(
+            () => _FakeSearchNotifier(const SearchState(query: query)),
+          ),
+          recentSearchesProvider.overrideWith(
+            () => _FakeRecentSearchesNotifier(const []),
+          ),
+          profileProvider.overrideWith(() => _FakeProfileNotifier()),
+        ],
+        child: Builder(
+          builder: (context) => MediaQuery(
+            data: MediaQuery.of(context).copyWith(
+              viewInsets: const EdgeInsets.only(bottom: keyboardInset),
+            ),
+            child: const SearchPage(),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final noResults = find.byKey(const Key('search-no-results-state'));
+    final message = find.text("No results for '$query'");
+    final keyboardTop =
+        tester.view.physicalSize.height / tester.view.devicePixelRatio -
+        keyboardInset;
+
+    expect(noResults, findsOneWidget);
+    expect(tester.getBottomLeft(message).dy, lessThan(keyboardTop));
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('uses compact content styles and keeps message time by author', (
+    tester,
+  ) async {
+    late _FakeRecentSearchesNotifier recentSearches;
+    final createdAt = DateTime.now().millisecondsSinceEpoch ~/ 1000 - 120;
+    final state = SearchState(
+      query: 'design',
+      channelResults: [
+        Channel(
+          id: 'design',
+          name: 'design',
+          channelType: 'stream',
+          visibility: 'open',
+          description: 'Design discussion',
+          createdBy: 'test',
+          createdAt: DateTime(2025),
+          memberCount: 4,
+          isMember: true,
+        ),
+      ],
+      userResults: const [
+        DirectoryUser(
+          pubkey: 'maya',
+          displayName: 'Maya',
+          nip05Handle: 'maya@example.com',
+        ),
+      ],
+      messageResults: [
+        SearchHit(
+          eventId: 'message-1',
+          content: 'The latest design is ready',
+          kind: 9,
+          pubkey: 'alice',
+          channelName: 'design',
+          createdAt: createdAt,
+          score: 1,
+        ),
+      ],
+    );
+
+    await tester.pumpWidget(
+      WidgetHelpers.testable(
+        overrides: [
+          searchProvider.overrideWith(() => _FakeSearchNotifier(state)),
+          recentSearchesProvider.overrideWith(
+            () => recentSearches = _FakeRecentSearchesNotifier(const []),
+          ),
+          profileProvider.overrideWith(() => _FakeProfileNotifier()),
+          channelsProvider.overrideWith(() => _FakeChannelsNotifier()),
+          userCacheProvider.overrideWith(
+            () => _FakeUserCacheNotifier(
+              const UserProfile(
+                pubkey: 'alice',
+                displayName: 'Alice',
+                nip05Handle: 'alice@example.com',
+              ),
+            ),
+          ),
+        ],
+        child: const SearchPage(),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final channelTitle = tester.widget<Text>(
+      find.byKey(const ValueKey('search-channel-title-design')),
+    );
+    final personTitle = tester.widget<Text>(
+      find.byKey(const ValueKey('search-person-title-maya')),
+    );
+    for (final title in [channelTitle, personTitle]) {
+      expect(title.style?.fontSize, contentListTitleTextStyle.fontSize);
+      expect(title.style?.fontWeight, contentListTitleTextStyle.fontWeight);
+      expect(title.style?.height, contentListTitleTextStyle.height);
+    }
+    for (final label in ['channels', 'people', 'messages']) {
+      final sectionLabel = tester.widget<Text>(
+        find.byKey(ValueKey('search-section-$label')),
+      );
+      expect(
+        sectionLabel.data,
+        '${label[0].toUpperCase()}${label.substring(1)}',
+      );
+      expect(sectionLabel.style?.fontSize, activityContextTextStyle.fontSize);
+      expect(
+        sectionLabel.style?.fontWeight,
+        activityContextTextStyle.fontWeight,
+      );
+      expect(sectionLabel.style?.letterSpacing, 0);
+    }
+    for (final rowKey in [
+      'search-channel-row-design',
+      'search-person-row-maya',
+      'search-message-row-message-1',
+    ]) {
+      final row = tester.widget<ListTile>(find.byKey(ValueKey(rowKey)));
+      expect(
+        row.contentPadding,
+        const EdgeInsets.symmetric(horizontal: Grid.gutter),
+      );
+    }
+    for (final alignment in [
+      ('channels', 'search-channel-leading-design'),
+      ('people', 'search-person-leading-maya'),
+      ('messages', 'search-message-avatar-message-1'),
+    ]) {
+      expect(
+        tester
+            .getTopLeft(find.byKey(ValueKey('search-section-${alignment.$1}')))
+            .dx,
+        tester.getTopLeft(find.byKey(ValueKey(alignment.$2))).dx,
+      );
+    }
+
+    final authorFinder = find.byKey(
+      const ValueKey('search-message-author-message-1'),
+    );
+    final usernameFinder = find.byKey(
+      const ValueKey('search-message-username-message-1'),
+    );
+    final timestampFinder = find.byKey(
+      const ValueKey('search-message-timestamp-message-1'),
+    );
+    final author = tester.widget<Text>(authorFinder);
+    final username = tester.widget<Text>(usernameFinder);
+    final timestamp = tester.widget<Text>(timestampFinder);
+    expect(author.style?.fontSize, messageUsernameTextStyle.fontSize);
+    expect(author.style?.fontWeight, messageUsernameTextStyle.fontWeight);
+    expect(author.style?.height, messageUsernameTextStyle.height);
+    expect(username.data, 'alice@example.com');
+    expect(username.style?.fontSize, messageMetadataTextStyle.fontSize);
+    expect(username.style?.fontWeight, FontWeight.w400);
+    expect(username.style?.height, messageMetadataTextStyle.height);
+    expect(timestamp.style?.fontSize, messageTimestampTextStyle.fontSize);
+    expect(timestamp.style?.height, messageTimestampTextStyle.height);
+    expect(
+      (tester.getCenter(authorFinder).dy - tester.getCenter(timestampFinder).dy)
+          .abs(),
+      lessThan(1),
+    );
+    expect(
+      (tester
+                  .getTopLeft(
+                    find.byKey(
+                      const ValueKey('search-message-avatar-message-1'),
+                    ),
+                  )
+                  .dy -
+              tester.getTopLeft(authorFinder).dy)
+          .abs(),
+      lessThan(6),
+    );
+
+    final body = tester.widget<MessageContent>(
+      find.byKey(const ValueKey('search-message-body-message-1')),
+    );
+    expect(body.baseStyle?.fontSize, activityPreviewTextStyle.fontSize);
+    expect(body.baseStyle?.height, activityPreviewTextStyle.height);
+    expect(
+      tester.widget<SmallAvatar>(find.byType(SmallAvatar)).size,
+      compactMessageAvatarSize,
+    );
+    final contextLabel = tester.widget<Text>(find.text('Message in'));
+    final channelLabel = tester.widget<Text>(
+      find.byKey(const ValueKey('search-message-channel-message-1')),
+    );
+    expect(contextLabel.style?.fontSize, activityContextTextStyle.fontSize);
+    expect(contextLabel.style?.height, activityContextTextStyle.height);
+    expect(channelLabel.data, '#design');
+    expect(channelLabel.style?.fontSize, activityContextTextStyle.fontSize);
+    final channelChip = tester.widget<Container>(
+      find.byWidgetPredicate(
+        (widget) =>
+            widget is Container &&
+            widget.child is Text &&
+            (widget.child as Text).key ==
+                const ValueKey('search-message-channel-message-1'),
+      ),
+    );
+    expect(
+      (channelChip.decoration! as BoxDecoration).borderRadius,
+      BorderRadius.circular(Radii.xs),
+    );
+    expect(
+      tester
+          .getTopLeft(
+            find.byKey(const ValueKey('search-message-context-message-1')),
+          )
+          .dy,
+      greaterThan(tester.getTopLeft(authorFinder).dy),
+    );
+    expect(
+      tester
+          .getTopLeft(
+            find.byKey(const ValueKey('search-message-body-message-1')),
+          )
+          .dy,
+      greaterThan(
+        tester
+            .getBottomLeft(
+              find.byKey(const ValueKey('search-message-context-message-1')),
+            )
+            .dy,
+      ),
+    );
+
+    await tester.tap(
+      find.byKey(const ValueKey('search-message-row-message-1')),
+    );
+    await tester.pump();
+    expect(recentSearches.searches, const ['design']);
+  });
+}
+
+class _FakeSearchNotifier extends SearchNotifier {
+  _FakeSearchNotifier(this.initialState);
+
+  final SearchState initialState;
+
+  @override
+  SearchState build() => initialState;
+
+  @override
+  void search(String query) {
+    state = SearchState(query: query.trim());
+  }
+
+  @override
+  void clear() {
+    state = const SearchState.initial();
+  }
+}
+
+class _FakeRecentSearchesNotifier extends RecentSearchesNotifier {
+  _FakeRecentSearchesNotifier(this.initialSearches);
+
+  final List<String> initialSearches;
+  List<String> get searches => state;
+
+  @override
+  List<String> build() => initialSearches;
+
+  @override
+  void record(String query) {
+    final trimmed = query.trim();
+    if (trimmed.isEmpty) return;
+    state = [
+      trimmed,
+      ...state.where((item) => item.toLowerCase() != trimmed.toLowerCase()),
+    ];
+  }
+
+  @override
+  void clear() {
+    state = const [];
+  }
+}
+
+class _FakeProfileNotifier extends ProfileNotifier {
+  @override
+  Future<UserProfile?> build() async =>
+      const UserProfile(pubkey: 'test', displayName: 'Test');
+}
+
+class _FakeChannelsNotifier extends ChannelsNotifier {
+  @override
+  Future<List<Channel>> build() async => const [];
+}
+
+class _FakeUserCacheNotifier extends UserCacheNotifier {
+  _FakeUserCacheNotifier(this.profile);
+
+  final UserProfile profile;
+
+  @override
+  Map<String, UserProfile> build() => {profile.pubkey: profile};
+}
diff --git a/mobile/test/features/settings/theme_picker_page_test.dart b/mobile/test/features/settings/theme_picker_page_test.dart
new file mode 100644
index 0000000000..6f8591f285
--- /dev/null
+++ b/mobile/test/features/settings/theme_picker_page_test.dart
@@ -0,0 +1,203 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
+import 'package:buzz/features/settings/accent_picker_page.dart';
+import 'package:buzz/features/settings/theme_picker_page.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../../helpers/widget_helpers.dart';
+
+Future<SharedPreferences> _prefs(Map<String, Object> initial) async {
+  SharedPreferences.setMockInitialValues(initial);
+  return SharedPreferences.getInstance();
+}
+
+Future<void> _pumpPicker(
+  WidgetTester tester,
+  Widget page, {
+  Map<String, Object> prefs = const {},
+}) async {
+  final instance = await _prefs(prefs);
+  await tester.pumpWidget(
+    WidgetHelpers.testable(
+      child: page,
+      overrides: [savedPrefsProvider.overrideWithValue(instance)],
+    ),
+  );
+  await tester.pumpAndSettle();
+}
+
+Future<void> _search(WidgetTester tester, String query) async {
+  await tester.enterText(find.byType(TextField), query);
+  await tester.pumpAndSettle();
+}
+
+void main() {
+  group('ThemePickerPage', () {
+    testWidgets('system mode offers pairs under their stripped label', (
+      tester,
+    ) async {
+      await _pumpPicker(tester, const ThemePickerPage());
+
+      await _search(tester, 'github');
+
+      // Paired labels drop the brightness token — one row stands for both halves.
+      expect(find.text('Github'), findsOneWidget);
+      expect(find.text('Github Default'), findsOneWidget);
+      expect(find.text('Github Light'), findsNothing);
+      expect(find.text('Github Dark'), findsNothing);
+    });
+
+    testWidgets('system mode hides themes with no counterpart', (tester) async {
+      await _pumpPicker(tester, const ThemePickerPage());
+
+      // 'snazzy-light' is light but unpaired, so it cannot follow the OS.
+      await _search(tester, 'snazzy');
+
+      expect(find.text('No themes found'), findsOneWidget);
+    });
+
+    testWidgets('system mode normalizes a stored unpaired theme', (
+      tester,
+    ) async {
+      final instance = await _prefs({'buzz_color_scheme': 'snazzy-light'});
+      await tester.pumpWidget(
+        WidgetHelpers.testable(
+          child: const ThemePickerPage(),
+          overrides: [savedPrefsProvider.overrideWithValue(instance)],
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(
+        instance.getString('buzz_color_scheme'),
+        themeGroups().paired.first.name,
+      );
+    });
+
+    testWidgets('light mode lists light themes by their full name', (
+      tester,
+    ) async {
+      await _pumpPicker(
+        tester,
+        const ThemePickerPage(),
+        prefs: {'buzz_theme_mode': 'light'},
+      );
+
+      await _search(tester, 'github');
+
+      expect(find.text('Github Light'), findsOneWidget);
+      expect(find.text('Github Light Default'), findsOneWidget);
+      expect(find.text('Github Dark'), findsNothing);
+    });
+
+    testWidgets('light mode includes unpaired light themes', (tester) async {
+      await _pumpPicker(
+        tester,
+        const ThemePickerPage(),
+        prefs: {'buzz_theme_mode': 'light'},
+      );
+
+      await _search(tester, 'snazzy');
+
+      expect(find.text('Snazzy Light'), findsOneWidget);
+    });
+
+    testWidgets('dark mode lists dark themes only', (tester) async {
+      await _pumpPicker(
+        tester,
+        const ThemePickerPage(),
+        prefs: {'buzz_theme_mode': 'dark'},
+      );
+
+      await _search(tester, 'github');
+
+      expect(find.text('Github Dark'), findsOneWidget);
+      expect(find.text('Github Light'), findsNothing);
+    });
+
+    testWidgets('checks the row matching the stored selection', (tester) async {
+      await _pumpPicker(
+        tester,
+        const ThemePickerPage(),
+        prefs: {'buzz_theme_mode': 'light', 'buzz_color_scheme': 'nord'},
+      );
+
+      await _search(tester, 'nord');
+
+      // 'nord' is dark, so Light mode renders its light fallback instead — the
+      // checkmark must follow what is applied, not the raw stored value.
+      expect(find.byIcon(LucideIcons.check), findsNothing);
+    });
+
+    testWidgets('either half of a pair checks the same system row', (
+      tester,
+    ) async {
+      await _pumpPicker(
+        tester,
+        const ThemePickerPage(),
+        prefs: {'buzz_color_scheme': 'github-dark'},
+      );
+
+      await _search(tester, 'github');
+
+      final checked = tester
+          .widgetList<ListTile>(find.byType(ListTile))
+          .where((tile) => tile.trailing != null);
+      expect(checked, hasLength(1));
+      expect(find.text('Github'), findsOneWidget);
+    });
+
+    testWidgets('tapping a theme persists the selection', (tester) async {
+      final instance = await _prefs({'buzz_theme_mode': 'dark'});
+      await tester.pumpWidget(
+        WidgetHelpers.testable(
+          child: const ThemePickerPage(),
+          overrides: [savedPrefsProvider.overrideWithValue(instance)],
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      await _search(tester, 'nord');
+      await tester.tap(find.text('Nord'));
+      await tester.pumpAndSettle();
+
+      expect(instance.getString('buzz_color_scheme'), 'nord');
+    });
+  });
+
+  group('AccentPickerPage', () {
+    testWidgets('lists every accent and checks the stored one', (tester) async {
+      await _pumpPicker(
+        tester,
+        const AccentPickerPage(),
+        prefs: {'buzz_accent_color': 2},
+      );
+
+      for (final accent in accentColors) {
+        expect(find.text(accent.name), findsOneWidget);
+      }
+      expect(find.byIcon(LucideIcons.check), findsOneWidget);
+    });
+
+    testWidgets('tapping an accent persists the index', (tester) async {
+      final instance = await _prefs(const <String, Object>{});
+      await tester.pumpWidget(
+        WidgetHelpers.testable(
+          child: const AccentPickerPage(),
+          overrides: [savedPrefsProvider.overrideWithValue(instance)],
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.text('Green'));
+      await tester.pumpAndSettle();
+
+      expect(
+        instance.getInt('buzz_accent_color'),
+        accentColors.indexWhere((a) => a.name == 'Green'),
+      );
+    });
+  });
+}
diff --git a/mobile/test/shared/community/community_icon_provider_test.dart b/mobile/test/shared/community/community_icon_provider_test.dart
new file mode 100644
index 0000000000..b2992c3967
--- /dev/null
+++ b/mobile/test/shared/community/community_icon_provider_test.dart
@@ -0,0 +1,93 @@
+import 'package:buzz/shared/community/community_icon_provider.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:http/http.dart' as http;
+import 'package:http/testing.dart' as http_testing;
+
+void main() {
+  test('fetches the NIP-11 icon over the relay HTTP URL', () async {
+    late http.Request capturedRequest;
+    final client = http_testing.MockClient((request) async {
+      capturedRequest = request;
+      return http.Response('{"icon":"data:image/png;base64,icon-bytes"}', 200);
+    });
+    final container = ProviderContainer(
+      overrides: [communityIconHttpClientProvider.overrideWithValue(client)],
+    );
+    addTearDown(container.dispose);
+
+    final icon = await container.read(
+      communityIconProvider('wss://relay.example.com').future,
+    );
+
+    expect(capturedRequest.url, Uri.parse('https://relay.example.com'));
+    expect(capturedRequest.headers['Accept'], 'application/nostr+json');
+    expect(icon, 'data:image/png;base64,icon-bytes');
+  });
+
+  test('returns null when the relay has no usable icon', () async {
+    final client = http_testing.MockClient(
+      (_) async => http.Response('{"icon":""}', 200),
+    );
+    final container = ProviderContainer(
+      overrides: [communityIconHttpClientProvider.overrideWithValue(client)],
+    );
+    addTearDown(container.dispose);
+
+    final icon = await container.read(
+      communityIconProvider('https://relay.example.com').future,
+    );
+
+    expect(icon, isNull);
+  });
+
+  test('returns null when relay information cannot be loaded', () async {
+    final client = http_testing.MockClient(
+      (_) async => http.Response('unavailable', 503),
+    );
+    final container = ProviderContainer(
+      overrides: [communityIconHttpClientProvider.overrideWithValue(client)],
+    );
+    addTearDown(container.dispose);
+
+    final icon = await container.read(
+      communityIconProvider('https://relay.example.com').future,
+    );
+
+    expect(icon, isNull);
+  });
+
+  test('refreshes a transient failure when explicitly invalidated', () async {
+    var requestCount = 0;
+    final client = http_testing.MockClient((_) async {
+      requestCount++;
+      if (requestCount == 1) {
+        return http.Response('unavailable', 503);
+      }
+      return http.Response(
+        '{"icon":"https://relay.example.com/icon.png"}',
+        200,
+      );
+    });
+    final container = ProviderContainer(
+      overrides: [communityIconHttpClientProvider.overrideWithValue(client)],
+    );
+    final provider = communityIconProvider('https://relay.example.com');
+    final subscription = container.listen(provider, (_, _) {});
+    addTearDown(() {
+      subscription.close();
+      container.dispose();
+    });
+
+    expect(await container.read(provider.future), isNull);
+    expect(requestCount, 1);
+
+    container.invalidate(provider);
+
+    expect(
+      await container.read(provider.future),
+      'https://relay.example.com/icon.png',
+    );
+    expect(requestCount, 2);
+  });
+}
diff --git a/mobile/test/features/custom_emoji/custom_emoji_test.dart b/mobile/test/shared/custom_emoji/custom_emoji_test.dart
similarity index 98%
rename from mobile/test/features/custom_emoji/custom_emoji_test.dart
rename to mobile/test/shared/custom_emoji/custom_emoji_test.dart
index 5b20f8276d..145bf63ea8 100644
--- a/mobile/test/features/custom_emoji/custom_emoji_test.dart
+++ b/mobile/test/shared/custom_emoji/custom_emoji_test.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:buzz/features/custom_emoji/custom_emoji.dart';
+import 'package:buzz/shared/custom_emoji/custom_emoji.dart';
 import 'package:buzz/shared/relay/nostr_models.dart';
 
 NostrEvent _event(
diff --git a/mobile/test/shared/deeplink/deep_link_test.dart b/mobile/test/shared/deeplink/deep_link_test.dart
index a60056c3bc..70e2066308 100644
--- a/mobile/test/shared/deeplink/deep_link_test.dart
+++ b/mobile/test/shared/deeplink/deep_link_test.dart
@@ -3,6 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   _inviteTests();
+  _buildMessageLinkTests();
 
   group('parseMessageDeepLink', () {
     test('parses channel and id', () {
@@ -104,6 +105,23 @@ void _inviteTests() {
       );
     });
 
+    test('normalizes trailing slash in buzz join handoff', () {
+      final link = parseInviteDeepLink(
+        Uri.parse(
+          'buzz://join?relay=wss%3A%2F%2Frelay.example.com%2F&code=abc123',
+        ),
+      );
+      expect(link?.relayUrl, 'wss://relay.example.com');
+    });
+
+    test('rejects plaintext public buzz join handoff', () {
+      final relay = Uri.encodeQueryComponent('ws://relay.example.com');
+      expect(
+        parseInviteDeepLink(Uri.parse('buzz://join?relay=$relay&code=abc')),
+        isNull,
+      );
+    });
+
     test('preserves policy receipt in buzz join handoff', () {
       final link = parseInviteDeepLink(
         Uri.parse(
@@ -177,6 +195,18 @@ void _inviteTests() {
       );
     });
 
+    test('rejects non-public invite relay destinations', () {
+      for (final url in [
+        'https://127.0.0.1/invite/abc',
+        'https://169.254.169.254/invite/abc',
+        'https://192.168.1.1/invite/abc',
+        'https://[::1]/invite/abc',
+        'https://[::ffff:127.0.0.1]/invite/abc',
+      ]) {
+        expect(parseInviteDeepLink(Uri.parse(url)), isNull, reason: url);
+      }
+    });
+
     test('rejects buzz join with dangerous relay schemes', () {
       // The `relay=` param is an allowlist — only `ws` / `wss` are safe to
       // hand to a Nostr relay session. Anything else must be dropped by the
@@ -202,3 +232,64 @@ void _inviteTests() {
     });
   });
 }
+
+void _buildMessageLinkTests() {
+  group('buildMessageLink', () {
+    test('builds channel + id link', () {
+      expect(
+        buildMessageLink(channelId: 'd14cd131', messageId: 'abc123'),
+        'buzz://message?channel=d14cd131&id=abc123',
+      );
+    });
+
+    test('includes thread root when present', () {
+      expect(
+        buildMessageLink(
+          channelId: 'd14cd131',
+          messageId: 'abc123',
+          threadRootId: 'root99',
+        ),
+        'buzz://message?channel=d14cd131&id=abc123&thread=root99',
+      );
+    });
+
+    test('treats empty thread root as absent', () {
+      expect(
+        buildMessageLink(
+          channelId: 'd14cd131',
+          messageId: 'abc123',
+          threadRootId: '',
+        ),
+        'buzz://message?channel=d14cd131&id=abc123',
+      );
+    });
+
+    test('round-trips through parseMessageDeepLink', () {
+      final url = buildMessageLink(
+        channelId: 'chan-1',
+        messageId: 'msg-1',
+        threadRootId: 'root-1',
+      );
+      final parsed = parseMessageDeepLink(Uri.parse(url));
+      expect(
+        parsed,
+        const MessageDeepLink(
+          channelId: 'chan-1',
+          messageId: 'msg-1',
+          threadRootId: 'root-1',
+        ),
+      );
+    });
+
+    test('throws on empty channel or id', () {
+      expect(
+        () => buildMessageLink(channelId: '', messageId: 'abc'),
+        throwsArgumentError,
+      );
+      expect(
+        () => buildMessageLink(channelId: 'chan', messageId: ''),
+        throwsArgumentError,
+      );
+    });
+  });
+}
diff --git a/mobile/test/shared/relay/identity_scoped_prefs_test.dart b/mobile/test/shared/relay/identity_scoped_prefs_test.dart
new file mode 100644
index 0000000000..4fce3f254b
--- /dev/null
+++ b/mobile/test/shared/relay/identity_scoped_prefs_test.dart
@@ -0,0 +1,92 @@
+import 'package:buzz/shared/relay/identity_scoped_prefs.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  const canonical = 'k_v1:https://relay.example:pk';
+  const legacy = 'k_v1:wss://relay.example:pk';
+
+  Future<SharedPreferences> prefsWith(Map<String, Object> values) async {
+    SharedPreferences.setMockInitialValues(values);
+    return SharedPreferences.getInstance();
+  }
+
+  String? readString(SharedPreferences prefs) => readMigratedPref<String>(
+    prefs,
+    canonicalKey: canonical,
+    legacyKey: legacy,
+    read: prefs.getString,
+    write: prefs.setString,
+  );
+
+  test('returns the canonical value when present', () async {
+    final prefs = await prefsWith({canonical: 'new', legacy: 'old'});
+    expect(readString(prefs), 'new');
+  });
+
+  test('falls back to the legacy value and returns it immediately', () async {
+    final prefs = await prefsWith({legacy: 'carried over'});
+    expect(readString(prefs), 'carried over');
+  });
+
+  test('promotes the legacy value onto the canonical key', () async {
+    final prefs = await prefsWith({legacy: 'carried over'});
+    readString(prefs);
+    await Future<void>.delayed(Duration.zero);
+
+    expect(prefs.getString(canonical), 'carried over');
+    expect(prefs.getString(legacy), isNull, reason: 'legacy entry is cleared');
+  });
+
+  test('is idempotent across repeated reads', () async {
+    final prefs = await prefsWith({legacy: 'carried over'});
+    readString(prefs);
+    await Future<void>.delayed(Duration.zero);
+    expect(readString(prefs), 'carried over');
+    await Future<void>.delayed(Duration.zero);
+    expect(prefs.getString(canonical), 'carried over');
+  });
+
+  test('returns null when neither key holds a value', () async {
+    final prefs = await prefsWith({});
+    expect(readString(prefs), isNull);
+  });
+
+  test('does not touch storage when the keys coincide', () async {
+    // A pairing-created community already stores an HTTP origin, so canonical
+    // and legacy are the same string and there is nothing to migrate.
+    SharedPreferences.setMockInitialValues({canonical: 'only'});
+    final prefs = await SharedPreferences.getInstance();
+    final value = readMigratedPref<String>(
+      prefs,
+      canonicalKey: canonical,
+      legacyKey: canonical,
+      read: prefs.getString,
+      write: prefs.setString,
+    );
+    await Future<void>.delayed(Duration.zero);
+
+    expect(value, 'only');
+    expect(prefs.getString(canonical), 'only');
+  });
+
+  test('migrates string lists as well as strings', () async {
+    final prefs = await prefsWith({
+      legacy: <String>['alpha', 'beta'],
+    });
+    final value = readMigratedPref<List<String>>(
+      prefs,
+      canonicalKey: canonical,
+      legacyKey: legacy,
+      read: prefs.getStringList,
+      write: prefs.setStringList,
+    );
+    await Future<void>.delayed(Duration.zero);
+
+    expect(value, ['alpha', 'beta']);
+    expect(prefs.getStringList(canonical), ['alpha', 'beta']);
+    expect(prefs.getStringList(legacy), isNull);
+  });
+}
diff --git a/mobile/test/shared/relay/relay_config_test.dart b/mobile/test/shared/relay/relay_config_test.dart
new file mode 100644
index 0000000000..d0decb3685
--- /dev/null
+++ b/mobile/test/shared/relay/relay_config_test.dart
@@ -0,0 +1,67 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:buzz/shared/relay/relay_provider.dart';
+
+void main() {
+  group('RelayConfig.baseUrl normalization', () {
+    test('folds a wss:// community URL to https://', () {
+      // Invite joins persist the relay URL straight off the invite link, which
+      // deep_link.dart always emits as ws:// or wss://.
+      final config = RelayConfig(baseUrl: 'wss://relay.example.com');
+      expect(config.baseUrl, 'https://relay.example.com');
+    });
+
+    test('folds a ws:// community URL to http://', () {
+      final config = RelayConfig(baseUrl: 'ws://relay.example.com:3000');
+      expect(config.baseUrl, 'http://relay.example.com:3000');
+    });
+
+    test('leaves an https:// community URL untouched', () {
+      // Device pairing rejects anything but https://, so these already conform.
+      final config = RelayConfig(baseUrl: 'https://relay.example.com');
+      expect(config.baseUrl, 'https://relay.example.com');
+    });
+
+    test('leaves an http:// community URL untouched', () {
+      final config = RelayConfig(baseUrl: 'http://localhost:3000');
+      expect(config.baseUrl, 'http://localhost:3000');
+    });
+
+    test('preserves a non-default port', () {
+      final config = RelayConfig(baseUrl: 'wss://relay.example.com:8443');
+      expect(config.baseUrl, 'https://relay.example.com:8443');
+    });
+  });
+
+  group('RelayConfig.wsUrl', () {
+    test('keeps TLS for a relay joined by invite', () {
+      // Regression: a wss:// base used to fall through to the non-https branch
+      // and downgrade to ws://, dialing port 80 — which never connects on a
+      // relay that only serves 443, and drops TLS everywhere else.
+      final config = RelayConfig(baseUrl: 'wss://relay.example.com');
+      expect(config.wsUrl, 'wss://relay.example.com');
+    });
+
+    test('keeps TLS for a relay added by pairing', () {
+      final config = RelayConfig(baseUrl: 'https://relay.example.com');
+      expect(config.wsUrl, 'wss://relay.example.com');
+    });
+
+    test('both onboarding paths agree on the same relay', () {
+      final invited = RelayConfig(baseUrl: 'wss://relay.example.com');
+      final paired = RelayConfig(baseUrl: 'https://relay.example.com');
+      expect(invited.wsUrl, paired.wsUrl);
+      expect(invited.baseUrl, paired.baseUrl);
+    });
+
+    test('stays plaintext for local development', () {
+      final config = RelayConfig(baseUrl: 'http://localhost:3000');
+      expect(config.wsUrl, 'ws://localhost:3000');
+    });
+
+    test('preserves a non-default port', () {
+      final config = RelayConfig(baseUrl: 'wss://relay.example.com:8443');
+      expect(config.wsUrl, 'wss://relay.example.com:8443');
+    });
+  });
+}
diff --git a/mobile/test/shared/relay/relay_validation_test.dart b/mobile/test/shared/relay/relay_validation_test.dart
new file mode 100644
index 0000000000..e564767ea4
--- /dev/null
+++ b/mobile/test/shared/relay/relay_validation_test.dart
@@ -0,0 +1,161 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:buzz/shared/relay/relay_validation.dart';
+
+void main() {
+  group('validateInviteRelayUri', () {
+    test('accepts public secure relay origins', () {
+      for (final url in [
+        'wss://relay.example.com',
+        'wss://relay.example.com/',
+        'wss://relay.example.com:8443',
+        'wss://8.8.8.8',
+        'wss://[2001:4860:4860::8888]',
+        'wss://[2001:1::1]',
+        'wss://[2001:1::2]',
+        'wss://[2001:1::3]',
+        'wss://[2001:3::1]',
+        'wss://[2001:4:112::1]',
+        'wss://[2001:20::1]',
+        'wss://[2001:30::1]',
+        'wss://[2001:200::1]',
+        'wss://[2620:4f:8000::1]',
+        'wss://[3fff:1000::1]',
+        'wss://[2606:4700:4700::1111]',
+      ]) {
+        expect(
+          () => validateInviteRelayUri(
+            Uri.parse(url),
+            allowInsecureLocalhost: false,
+          ),
+          returnsNormally,
+          reason: url,
+        );
+      }
+    });
+
+    test('allows plaintext localhost only when explicitly enabled', () {
+      for (final url in ['ws://localhost:3000', 'ws://relay.localhost:3000']) {
+        expect(
+          () => validateInviteRelayUri(
+            Uri.parse(url),
+            allowInsecureLocalhost: true,
+          ),
+          returnsNormally,
+          reason: url,
+        );
+        expect(
+          () => validateInviteRelayUri(
+            Uri.parse(url),
+            allowInsecureLocalhost: false,
+          ),
+          throwsFormatException,
+          reason: url,
+        );
+      }
+    });
+
+    test('rejects plaintext public relays', () {
+      expect(
+        () => validateInviteRelayUri(
+          Uri.parse('ws://relay.example.com'),
+          allowInsecureLocalhost: false,
+        ),
+        throwsFormatException,
+      );
+    });
+
+    test('rejects non-public IPv4 literals', () {
+      for (final host in [
+        '0.0.0.0',
+        '10.0.0.1',
+        '100.64.0.1',
+        '127.0.0.1',
+        '169.254.169.254',
+        '172.16.0.1',
+        '192.168.0.1',
+        '198.18.0.1',
+        '224.0.0.1',
+      ]) {
+        expect(
+          () => validateInviteRelayUri(
+            Uri.parse('wss://$host'),
+            allowInsecureLocalhost: false,
+          ),
+          throwsFormatException,
+          reason: host,
+        );
+      }
+    });
+
+    test('rejects non-public IPv6 literals and mapped IPv4', () {
+      for (final host in [
+        '[::]',
+        '[::1]',
+        '[::ffff:127.0.0.1]',
+        '[::ffff:169.254.169.254]',
+        '[::ffff:a9fe:a9fe]',
+        '[64:ff9b::a9fe:a9fe]',
+        '[100::1]',
+        '[100:0:0:1::1]',
+        '[2001::1]',
+        '[2001:1::4]',
+        '[2001:2::1]',
+        '[2001:4:111::1]',
+        '[2001:10::1]',
+        '[2001:40::1]',
+        '[2001:db8::1]',
+        '[2002:a9fe:a9fe::1]',
+        '[3fff::1]',
+        '[3fff:fff::1]',
+        '[5f00::1]',
+        '[fc00::1]',
+        '[fd00::1]',
+        '[fe80::1]',
+        '[fec0::1]',
+        '[ff02::1]',
+      ]) {
+        expect(
+          () => validateInviteRelayUri(
+            Uri.parse('wss://$host'),
+            allowInsecureLocalhost: false,
+          ),
+          throwsFormatException,
+          reason: host,
+        );
+      }
+    });
+
+    test('rejects legacy numeric IPv4 spellings', () {
+      for (final host in ['2130706433', '0x7f000001', '0177.0.0.1', '127.1']) {
+        expect(
+          () => validateInviteRelayUri(
+            Uri.parse('wss://$host'),
+            allowInsecureLocalhost: false,
+          ),
+          throwsFormatException,
+          reason: host,
+        );
+      }
+    });
+
+    test('rejects non-origin URLs', () {
+      for (final url in [
+        'https://relay.example.com',
+        'wss://user@relay.example.com',
+        'wss://relay.example.com/path',
+        'wss://relay.example.com?query=x',
+        'wss://relay.example.com#fragment',
+      ]) {
+        expect(
+          () => validateInviteRelayUri(
+            Uri.parse(url),
+            allowInsecureLocalhost: false,
+          ),
+          throwsFormatException,
+          reason: url,
+        );
+      }
+    });
+  });
+}
diff --git a/mobile/test/shared/reminders/remind_me_later_sheet_test.dart b/mobile/test/shared/reminders/remind_me_later_sheet_test.dart
new file mode 100644
index 0000000000..3a7c199ee9
--- /dev/null
+++ b/mobile/test/shared/reminders/remind_me_later_sheet_test.dart
@@ -0,0 +1,128 @@
+import 'package:buzz/shared/reminders/remind_me_later_sheet.dart';
+import 'package:buzz/shared/reminders/reminder_service.dart';
+import 'package:buzz/shared/relay/relay.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:nostr/nostr.dart' as nostr;
+
+const _target = ReminderTarget(
+  eventId: 'msg-1',
+  channelId: 'chan-1',
+  preview: 'hello',
+  authorPubkey: 'alice',
+);
+
+/// Records createReminder calls; throws when [error] is set.
+class _RecordingReminderService extends ReminderService {
+  final Object? error;
+  final List<int> submittedNotBefore = [];
+
+  _RecordingReminderService({this.error})
+    : super(
+        signedEventRelay: SignedEventRelay(
+          session: RelaySessionNotifier(),
+          nsec: nostr.Keys.generate().nsec,
+        ),
+        crypto: _stubCrypto(),
+      );
+
+  @override
+  Future<void> createReminder({
+    required ReminderTarget target,
+    required int notBefore,
+    String? note,
+  }) async {
+    final error = this.error;
+    if (error != null) throw error;
+    submittedNotBefore.add(notBefore);
+  }
+}
+
+ReminderCrypto _stubCrypto() {
+  final keys = nostr.Keys.generate();
+  return ReminderCrypto(keys.nsec, keys.public);
+}
+
+Future<void> _pumpSheet(
+  WidgetTester tester, {
+  required ReminderService service,
+}) async {
+  await tester.pumpWidget(
+    ProviderScope(
+      overrides: [reminderServiceProvider.overrideWithValue(service)],
+      child: MaterialApp(
+        theme: AppTheme.light(),
+        home: Scaffold(
+          body: Consumer(
+            builder: (context, ref, _) => TextButton(
+              onPressed: () => showRemindMeLaterSheet(
+                context: context,
+                ref: ref,
+                target: _target,
+              ),
+              child: const Text('open'),
+            ),
+          ),
+        ),
+      ),
+    ),
+  );
+  await tester.tap(find.text('open'));
+  await tester.pumpAndSettle();
+}
+
+void main() {
+  group('showRemindMeLaterSheet', () {
+    testWidgets('cancelling the custom date picker keeps the reminder sheet '
+        'open', (tester) async {
+      final service = _RecordingReminderService();
+      await _pumpSheet(tester, service: service);
+
+      await tester.ensureVisible(find.text('Pick a date & time'));
+      await tester.pumpAndSettle();
+      await tester.tap(find.text('Pick a date & time'));
+      await tester.pumpAndSettle();
+
+      // Native date picker is up; cancel it.
+      await tester.tap(find.text('Cancel'));
+      await tester.pumpAndSettle();
+
+      // The preset sheet stays open for a retry, and nothing was submitted.
+      expect(find.text('Remind me about this message'), findsOneWidget);
+      expect(find.text('Pick a date & time'), findsOneWidget);
+      expect(service.submittedNotBefore, isEmpty);
+    });
+
+    testWidgets('preset submission failure shows stable copy without the '
+        'raw error', (tester) async {
+      final service = _RecordingReminderService(
+        error: Exception('nip44 conversation key mismatch'),
+      );
+      await _pumpSheet(tester, service: service);
+
+      await tester.tap(find.text('In 1 hour'));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Couldn’t set reminder. Try again.'), findsOneWidget);
+      expect(
+        find.textContaining('nip44 conversation key mismatch'),
+        findsNothing,
+      );
+    });
+
+    testWidgets('preset submission success confirms with a snackbar', (
+      tester,
+    ) async {
+      final service = _RecordingReminderService();
+      await _pumpSheet(tester, service: service);
+
+      await tester.tap(find.text('In 1 hour'));
+      await tester.pumpAndSettle();
+
+      expect(service.submittedNotBefore, hasLength(1));
+      expect(find.text('Reminder set'), findsOneWidget);
+    });
+  });
+}
diff --git a/mobile/test/shared/reminders/reminder_service_test.dart b/mobile/test/shared/reminders/reminder_service_test.dart
new file mode 100644
index 0000000000..9751541a33
--- /dev/null
+++ b/mobile/test/shared/reminders/reminder_service_test.dart
@@ -0,0 +1,124 @@
+import 'dart:convert';
+
+import 'package:buzz/shared/reminders/reminder_service.dart';
+import 'package:buzz/shared/reminders/reminder_time_presets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:nostr/nostr.dart' as nostr;
+
+void main() {
+  const target = ReminderTarget(
+    eventId: 'event-1',
+    channelId: 'channel-1',
+    preview: 'hello world',
+    authorPubkey: 'author-pk',
+  );
+
+  group('buildReminderPlaintext', () {
+    test('matches the desktop NIP-ER content shape', () {
+      final plaintext = buildReminderPlaintext(target: target, note: 'ping');
+      expect(jsonDecode(plaintext), {
+        'target': {
+          'eventId': 'event-1',
+          'channelId': 'channel-1',
+          'preview': 'hello world',
+          'authorPubkey': 'author-pk',
+        },
+        'note': 'ping',
+        'status': 'pending',
+      });
+    });
+
+    test('omits note when absent or empty', () {
+      for (final note in [null, '']) {
+        final decoded =
+            jsonDecode(buildReminderPlaintext(target: target, note: note))
+                as Map<String, dynamic>;
+        expect(decoded.containsKey('note'), isFalse);
+        expect(decoded['status'], 'pending');
+      }
+    });
+  });
+
+  group('randomReminderDTag', () {
+    test('is 32 lowercase hex chars (128 bits)', () {
+      final dTag = randomReminderDTag();
+      expect(dTag, matches(RegExp(r'^[0-9a-f]{32}$')));
+    });
+
+    test('is unique across calls', () {
+      expect(randomReminderDTag(), isNot(randomReminderDTag()));
+    });
+  });
+
+  group('buildReminderTags', () {
+    test('emits d and strict-decimal not_before tags', () {
+      expect(buildReminderTags(dTag: 'abc', notBefore: 1753000000), [
+        ['d', 'abc'],
+        ['not_before', '1753000000'],
+      ]);
+    });
+
+    test('rejects negative timestamps', () {
+      expect(
+        () => buildReminderTags(dTag: 'abc', notBefore: -1),
+        throwsArgumentError,
+      );
+    });
+  });
+
+  group('ReminderCrypto', () {
+    test('encrypts to self and decrypts back', () {
+      final keys = nostr.Keys.generate();
+      final crypto = ReminderCrypto(keys.nsec, keys.public);
+
+      const plaintext = '{"status":"pending","note":"hi"}';
+      final ciphertext = crypto.encrypt(plaintext);
+      expect(ciphertext, isNot(contains('pending')));
+      expect(crypto.decrypt(ciphertext), plaintext);
+    });
+  });
+
+  group('reminder time presets', () {
+    test('presets resolve strictly in the future', () {
+      final now = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+      for (final preset in reminderTimePresets) {
+        expect(preset.getTimestamp(), greaterThan(now), reason: preset.label);
+      }
+    });
+
+    test('nextDayAt9am rolls past instants forward', () {
+      final tenAm = DateTime(2026, 7, 25, 10);
+      final next = nextDayAt9am(0, now: tenAm);
+      expect(
+        DateTime.fromMillisecondsSinceEpoch(next * 1000),
+        DateTime(2026, 7, 26, 9),
+      );
+    });
+
+    test('nextDayAt9am keeps future same-day instants', () {
+      final eightAm = DateTime(2026, 7, 25, 8);
+      final next = nextDayAt9am(0, now: eightAm);
+      expect(
+        DateTime.fromMillisecondsSinceEpoch(next * 1000),
+        DateTime(2026, 7, 25, 9),
+      );
+    });
+
+    test('daysUntilNextMonday is 1-7 and lands on Monday', () {
+      for (var day = 20; day < 27; day++) {
+        final now = DateTime(2026, 7, day);
+        final days = daysUntilNextMonday(now);
+        expect(days, inInclusiveRange(1, 7));
+        expect(now.add(Duration(days: days)).weekday, DateTime.monday);
+      }
+    });
+
+    test('combineCustomDateTime rejects past instants', () {
+      final yesterday = DateTime.now().subtract(const Duration(days: 1));
+      expect(combineCustomDateTime(yesterday, 9, 0), isNull);
+
+      final tomorrow = DateTime.now().add(const Duration(days: 1));
+      expect(combineCustomDateTime(tomorrow, 9, 0), isNotNull);
+    });
+  });
+}
diff --git a/mobile/test/shared/theme/accent_colors_test.dart b/mobile/test/shared/theme/accent_colors_test.dart
index d1f777c598..8d31ae6cee 100644
--- a/mobile/test/shared/theme/accent_colors_test.dart
+++ b/mobile/test/shared/theme/accent_colors_test.dart
@@ -5,7 +5,7 @@ import 'package:buzz/shared/theme/theme.dart';
 void main() {
   group('default accent', () {
     test('uses black on the default light scheme', () {
-      final resolved = resolveSchemes(null);
+      final resolved = resolveSchemes(null, ThemeMode.light);
 
       final accented = applyAccent(resolved.light, defaultAccentIndex);
 
@@ -13,7 +13,7 @@ void main() {
     });
 
     test('uses the theme foreground on forced dark schemes', () {
-      final resolved = resolveSchemes('github-dark');
+      final resolved = resolveSchemes('github-dark', ThemeMode.dark);
       final base = resolved.dark;
 
       final accented = applyAccent(base, defaultAccentIndex);
diff --git a/mobile/test/shared/theme/buzz_theme_test.dart b/mobile/test/shared/theme/buzz_theme_test.dart
new file mode 100644
index 0000000000..613fec1467
--- /dev/null
+++ b/mobile/test/shared/theme/buzz_theme_test.dart
@@ -0,0 +1,196 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/frosted_app_bar.dart';
+
+void main() {
+  group('Buzz theme catalog entries', () {
+    test('both halves are in the catalog', () {
+      expect(findTheme(buzzThemeName), isNotNull);
+      expect(findTheme(buzzDarkThemeName), isNotNull);
+    });
+
+    test('borrow the GitHub palettes', () {
+      final buzz = findTheme(buzzThemeName)!;
+      final github = findTheme('github-light')!;
+      expect(buzz.bg, github.bg);
+      expect(buzz.fg, github.fg);
+      expect(buzz.comment, github.comment);
+
+      final buzzDark = findTheme(buzzDarkThemeName)!;
+      final githubDark = findTheme('github-dark')!;
+      expect(buzzDark.bg, githubDark.bg);
+      expect(buzzDark.fg, githubDark.fg);
+      expect(buzzDark.comment, githubDark.comment);
+    });
+
+    test('are a light/dark pair', () {
+      expect(findTheme(buzzThemeName)!.isDark, isFalse);
+      expect(findTheme(buzzDarkThemeName)!.isDark, isTrue);
+      expect(themePairFor(buzzThemeName), buzzDarkThemeName);
+      expect(themePairFor(buzzDarkThemeName), buzzThemeName);
+    });
+
+    test('appear as a single System-mode option labelled "Buzz"', () {
+      final paired = themeGroups().paired.map((t) => t.name);
+      expect(paired, contains(buzzThemeName));
+      expect(paired, isNot(contains(buzzDarkThemeName)));
+      expect(pairedThemeLabel(buzzThemeName), 'Buzz');
+      expect(themeSelectionLabel(buzzThemeName, ThemeMode.system), 'Buzz');
+      expect(themeSelectionLabel(buzzDarkThemeName, ThemeMode.system), 'Buzz');
+    });
+
+    test('resolve across brightnesses like any other pair', () {
+      final resolved = resolveSchemes(buzzThemeName, ThemeMode.system);
+      expect(resolved.forcedMode, isNull);
+      expect(resolved.light.brightness, Brightness.light);
+      expect(resolved.dark.brightness, Brightness.dark);
+      expect(resolved.lightTheme?.name, buzzThemeName);
+      expect(resolved.darkTheme?.name, buzzDarkThemeName);
+
+      expect(
+        effectiveTheme(buzzThemeName, ThemeMode.dark)?.name,
+        buzzDarkThemeName,
+      );
+      expect(
+        effectiveTheme(buzzDarkThemeName, ThemeMode.light)?.name,
+        buzzThemeName,
+      );
+    });
+
+    test(
+      'fallbacks expose the effective Buzz theme for gradient selection',
+      () {
+        final coerced = resolveSchemes('nord', ThemeMode.light);
+        expect(coerced.lightTheme?.name, buzzThemeName);
+        expect(
+          buzzTopSectionGradient(
+            coerced.lightTheme!.name,
+            coerced.light.brightness,
+          ),
+          isNotNull,
+        );
+
+        final unknown = resolveSchemes('not-a-theme', ThemeMode.light);
+        expect(unknown.lightTheme?.name, buzzThemeName);
+        expect(
+          buzzTopSectionGradient(
+            unknown.lightTheme!.name,
+            unknown.light.brightness,
+          ),
+          isNotNull,
+        );
+      },
+    );
+  });
+
+  group('buzzTopSectionGradient', () {
+    test('is null for non-Buzz themes', () {
+      expect(buzzTopSectionGradient('github-light', Brightness.light), isNull);
+      expect(buzzTopSectionGradient('nord', Brightness.dark), isNull);
+    });
+
+    test('paints top to bottom for both halves of the pair', () {
+      for (final name in [buzzThemeName, buzzDarkThemeName]) {
+        final gradient = buzzTopSectionGradient(name, Brightness.light);
+        expect(gradient, isNotNull, reason: '$name should be gradient-backed');
+        expect(gradient!.begin, Alignment.topCenter);
+        expect(gradient.end, Alignment.bottomCenter);
+        expect(gradient.colors, hasLength(2));
+      }
+    });
+
+    test('brightness selects the stops, not the theme name', () {
+      // Both halves enable the gradient, so System mode keeps it on across an
+      // OS switch — the applied brightness alone decides which stops are used.
+      final light = buzzTopSectionGradient(buzzThemeName, Brightness.light)!;
+      final dark = buzzTopSectionGradient(buzzThemeName, Brightness.dark)!;
+
+      expect(light.colors, isNot(dark.colors));
+      expect(
+        buzzTopSectionGradient(buzzDarkThemeName, Brightness.dark)!.colors,
+        dark.colors,
+      );
+      expect(
+        buzzTopSectionGradient(buzzDarkThemeName, Brightness.light)!.colors,
+        light.colors,
+      );
+    });
+
+    test('is opaque so the color replaces the frosted fill', () {
+      for (final brightness in Brightness.values) {
+        final gradient = buzzTopSectionGradient(buzzThemeName, brightness)!;
+        for (final color in gradient.colors) {
+          expect(color.a, 1.0);
+        }
+      }
+    });
+  });
+
+  group('theme threading', () {
+    BoxDecoration barDecoration(WidgetTester tester) {
+      final container = tester
+          .widgetList<Container>(
+            find.descendant(
+              of: find.byType(FrostedAppBar),
+              matching: find.byType(Container),
+            ),
+          )
+          .first;
+      return container.decoration! as BoxDecoration;
+    }
+
+    Widget harness(ThemeData theme) => MaterialApp(
+      theme: theme,
+      home: Builder(
+        builder: (context) => Stack(
+          children: [
+            FrostedAppBar(
+              gradient: context.appColors.topSectionGradient,
+              title: const Text('Home'),
+            ),
+          ],
+        ),
+      ),
+    );
+
+    testWidgets('AppTheme carries the gradient to the top section', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        harness(
+          AppTheme.light(
+            topSectionGradient: buzzTopSectionGradient(
+              buzzThemeName,
+              Brightness.light,
+            ),
+          ),
+        ),
+      );
+
+      final decoration = barDecoration(tester);
+      expect(decoration.gradient, isNotNull);
+      // A BoxDecoration cannot paint a color and a gradient at once.
+      expect(decoration.color, isNull);
+    });
+
+    testWidgets('non-Buzz themes keep the frosted surface fill', (
+      tester,
+    ) async {
+      await tester.pumpWidget(harness(AppTheme.light()));
+
+      final decoration = barDecoration(tester);
+      expect(decoration.gradient, isNull);
+      expect(decoration.color, isNotNull);
+    });
+  });
+
+  group('isBuzzTheme', () {
+    test('matches only the Buzz pair', () {
+      expect(isBuzzTheme(buzzThemeName), isTrue);
+      expect(isBuzzTheme(buzzDarkThemeName), isTrue);
+      expect(isBuzzTheme('github-light'), isFalse);
+      expect(isBuzzTheme(''), isFalse);
+    });
+  });
+}
diff --git a/mobile/test/shared/theme/message_typography_test.dart b/mobile/test/shared/theme/message_typography_test.dart
new file mode 100644
index 0000000000..169bcc0200
--- /dev/null
+++ b/mobile/test/shared/theme/message_typography_test.dart
@@ -0,0 +1,141 @@
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  void expectStyle(
+    TextStyle style, {
+    required double fontSize,
+    required FontWeight fontWeight,
+    required double lineHeight,
+    required double letterSpacing,
+  }) {
+    expect(style.fontFamily, 'Inter');
+    expect(style.fontSize, fontSize);
+    expect(style.fontWeight, fontWeight);
+    expect(style.height, closeTo(lineHeight / fontSize, 0.0001));
+    expect(style.letterSpacing, letterSpacing);
+  }
+
+  test('message typography matches the shared mobile scale', () {
+    expectStyle(
+      messageBodyTextStyle,
+      fontSize: 15,
+      fontWeight: FontWeight.w400,
+      lineHeight: 20,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      messageUsernameTextStyle,
+      fontSize: 15,
+      fontWeight: FontWeight.w600,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      messageTimestampTextStyle,
+      fontSize: 15,
+      fontWeight: FontWeight.w400,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+    expect(messageTimestampTextStyle, messageMetadataTextStyle);
+    expectStyle(
+      replyPreviewTextStyle,
+      fontSize: 13.1,
+      fontWeight: FontWeight.w400,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      reactionCountTextStyle,
+      fontSize: 13.1,
+      fontWeight: FontWeight.w500,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      channelTitleTextStyle,
+      fontSize: 20,
+      fontWeight: FontWeight.w700,
+      lineHeight: 24,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      systemMessageHeadingTextStyle,
+      fontSize: 15,
+      fontWeight: FontWeight.w600,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      systemMessageBodyTextStyle,
+      fontSize: 15,
+      fontWeight: FontWeight.w400,
+      lineHeight: 20,
+      letterSpacing: 0,
+    );
+  });
+
+  test('activity typography matches the conversation row scale', () {
+    expectStyle(
+      activityUsernameTextStyle,
+      fontSize: 15,
+      fontWeight: FontWeight.w600,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      activityTimestampTextStyle,
+      fontSize: 15,
+      fontWeight: FontWeight.w400,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      activityContextTextStyle,
+      fontSize: 13.1,
+      fontWeight: FontWeight.w500,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      activityPreviewTextStyle,
+      fontSize: 15,
+      fontWeight: FontWeight.w400,
+      lineHeight: 20,
+      letterSpacing: 0,
+    );
+  });
+
+  test('content list typography matches the compact list scale', () {
+    expectStyle(
+      contentListTitleTextStyle,
+      fontSize: 15,
+      fontWeight: FontWeight.w600,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      contentListBodyTextStyle,
+      fontSize: 13.1,
+      fontWeight: FontWeight.w400,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+    expectStyle(
+      contentListTimestampTextStyle,
+      fontSize: 15,
+      fontWeight: FontWeight.w400,
+      lineHeight: 17,
+      letterSpacing: 0,
+    );
+  });
+
+  test('message and activity avatars use their surface sizes', () {
+    expect(messageAvatarSize, 42);
+    expect(activityAvatarSize, 42);
+    expect(compactMessageAvatarSize, 42);
+    expect(messageAvatarContentGap, Grid.twelve);
+  });
+}
diff --git a/mobile/test/shared/theme/theme_pairs_test.dart b/mobile/test/shared/theme/theme_pairs_test.dart
new file mode 100644
index 0000000000..428ad5bc40
--- /dev/null
+++ b/mobile/test/shared/theme/theme_pairs_test.dart
@@ -0,0 +1,254 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:buzz/shared/theme/theme.dart';
+
+void main() {
+  group('themePairs', () {
+    test('every pair member exists in the catalog', () {
+      for (final entry in themePairs.entries) {
+        expect(
+          findTheme(entry.key),
+          isNotNull,
+          reason: '${entry.key} is not in themeCatalog',
+        );
+        expect(
+          findTheme(entry.value),
+          isNotNull,
+          reason: '${entry.value} is not in themeCatalog',
+        );
+      }
+    });
+
+    test('pairs map a light theme to a dark one', () {
+      for (final entry in themePairs.entries) {
+        expect(
+          findTheme(entry.key)!.isDark,
+          isFalse,
+          reason: '${entry.key} should be light',
+        );
+        expect(
+          findTheme(entry.value)!.isDark,
+          isTrue,
+          reason: '${entry.value} should be dark',
+        );
+      }
+    });
+
+    test('resolves in both directions', () {
+      expect(themePairFor('github-light'), 'github-dark');
+      expect(themePairFor('github-dark'), 'github-light');
+      expect(themePairFor('andromeeda'), isNull);
+      expect(isPairedTheme('catppuccin-latte'), isTrue);
+      expect(isPairedTheme('andromeeda'), isFalse);
+    });
+  });
+
+  group('themeGroups', () {
+    test('light and dark partition the whole catalog', () {
+      final groups = themeGroups();
+
+      expect(groups.light.length + groups.dark.length, themeCatalog.length);
+      expect(groups.light.every((t) => !t.isDark), isTrue);
+      expect(groups.dark.every((t) => t.isDark), isTrue);
+    });
+
+    test('paired holds only light members of pairs', () {
+      final groups = themeGroups();
+
+      expect(groups.paired.length, themePairs.length);
+      for (final theme in groups.paired) {
+        expect(theme.isDark, isFalse);
+        expect(themePairs.containsKey(theme.name), isTrue);
+      }
+    });
+
+    test('groups are sorted by display name', () {
+      final groups = themeGroups();
+
+      for (final list in [groups.paired, groups.light, groups.dark]) {
+        final names = list.map((t) => t.displayName).toList();
+        expect(names, orderedEquals(List.of(names)..sort()));
+      }
+    });
+  });
+
+  group('pairedThemeLabel', () {
+    test('strips brightness tokens', () {
+      expect(pairedThemeLabel('github-light'), 'Github');
+      expect(pairedThemeLabel('github-light-default'), 'Github Default');
+      expect(pairedThemeLabel('gruvbox-light-soft'), 'Gruvbox Soft');
+      expect(pairedThemeLabel('material-theme-lighter'), 'Material Theme');
+      expect(pairedThemeLabel('catppuccin-latte'), 'Catppuccin');
+    });
+
+    test('falls back to the raw name when stripping empties it', () {
+      expect(pairedThemeLabel('light-plus'), 'Light Plus');
+    });
+
+    test('never produces a blank label for a real pair', () {
+      for (final lightName in themePairs.keys) {
+        expect(pairedThemeLabel(lightName), isNotEmpty);
+      }
+    });
+  });
+
+  group('resolveSchemes', () {
+    test('system mode pairs the selection across brightnesses', () {
+      final resolved = resolveSchemes('github-light', ThemeMode.system);
+
+      // Null forcedMode leaves MaterialApp following the OS.
+      expect(resolved.forcedMode, isNull);
+      expect(resolved.light.brightness, Brightness.light);
+      expect(resolved.dark.brightness, Brightness.dark);
+    });
+
+    test('system mode works from the dark half of a pair too', () {
+      final resolved = resolveSchemes('github-dark', ThemeMode.system);
+
+      expect(resolved.forcedMode, isNull);
+      expect(resolved.light.brightness, Brightness.light);
+      expect(resolved.dark.brightness, Brightness.dark);
+    });
+
+    test('system mode pins an unpaired theme to its own brightness', () {
+      final resolved = resolveSchemes('andromeeda', ThemeMode.system);
+
+      // No counterpart exists, so both sides render the selected theme rather
+      // than jumping to an unrelated one.
+      expect(resolved.forcedMode, ThemeMode.dark);
+      expect(resolved.light, resolved.dark);
+      expect(resolved.dark.brightness, Brightness.dark);
+    });
+
+    test('system mode pins an unpaired light theme to light mode', () {
+      final resolved = resolveSchemes('snazzy-light', ThemeMode.system);
+
+      expect(resolved.forcedMode, ThemeMode.light);
+      expect(resolved.light, resolved.dark);
+      expect(resolved.light.brightness, Brightness.light);
+    });
+
+    test('light mode forces light and swaps a dark selection for its pair', () {
+      final resolved = resolveSchemes('github-dark', ThemeMode.light);
+
+      expect(resolved.forcedMode, ThemeMode.light);
+      expect(resolved.light, resolved.dark);
+      expect(resolved.light.brightness, Brightness.light);
+      expect(resolved.light, generateColorScheme(findTheme('github-light')!));
+    });
+
+    test('dark mode forces dark and swaps a light selection for its pair', () {
+      final resolved = resolveSchemes('github-light', ThemeMode.dark);
+
+      expect(resolved.forcedMode, ThemeMode.dark);
+      expect(resolved.dark.brightness, Brightness.dark);
+      expect(resolved.dark, generateColorScheme(findTheme('github-dark')!));
+    });
+
+    test('dark mode falls back to the default pair when pick is unpaired', () {
+      // 'snazzy-light' is light and has no dark counterpart.
+      final resolved = resolveSchemes('snazzy-light', ThemeMode.dark);
+
+      expect(resolved.forcedMode, ThemeMode.dark);
+      expect(resolved.dark.brightness, Brightness.dark);
+      expect(resolved.darkTheme?.name, buzzDarkThemeName);
+      expect(resolved.dark, generateColorScheme(findTheme(buzzDarkThemeName)!));
+    });
+
+    test('light mode falls back to the default pair when pick is unpaired', () {
+      final resolved = resolveSchemes('andromeeda', ThemeMode.light);
+
+      expect(resolved.forcedMode, ThemeMode.light);
+      expect(resolved.light.brightness, Brightness.light);
+      expect(resolved.lightTheme?.name, buzzThemeName);
+      expect(resolved.light, generateColorScheme(findTheme(buzzThemeName)!));
+    });
+
+    test('an unknown scheme name falls back to the default theme', () {
+      final resolved = resolveSchemes('not-a-theme', ThemeMode.light);
+
+      expect(
+        resolved.light,
+        generateColorScheme(findTheme(defaultSchemeName)!),
+      );
+    });
+  });
+
+  group('schemeForAppearanceMode', () {
+    test('system mode replaces an unpaired selection with a paired theme', () {
+      expect(
+        schemeForAppearanceMode('snazzy-light', ThemeMode.system),
+        themeGroups().paired.first.name,
+      );
+      expect(
+        schemeForAppearanceMode('nord', ThemeMode.system),
+        themeGroups().paired.first.name,
+      );
+    });
+
+    test('system mode preserves either half of a paired selection', () {
+      expect(
+        schemeForAppearanceMode('github-light', ThemeMode.system),
+        'github-light',
+      );
+      expect(
+        schemeForAppearanceMode('github-dark', ThemeMode.system),
+        'github-dark',
+      );
+    });
+
+    test('pinned modes preserve an unpaired selection', () {
+      expect(
+        schemeForAppearanceMode('snazzy-light', ThemeMode.light),
+        'snazzy-light',
+      );
+      expect(schemeForAppearanceMode('nord', ThemeMode.dark), 'nord');
+    });
+  });
+
+  group('effectiveTheme', () {
+    test('system mode keeps the stored selection', () {
+      expect(
+        effectiveTheme('github-dark', ThemeMode.system)?.name,
+        'github-dark',
+      );
+    });
+
+    test('pinned modes report the coerced theme', () {
+      expect(
+        effectiveTheme('github-dark', ThemeMode.light)?.name,
+        'github-light',
+      );
+      expect(
+        effectiveTheme('github-light', ThemeMode.dark)?.name,
+        'github-dark',
+      );
+    });
+
+    test('a null selection resolves to the default theme', () {
+      expect(effectiveTheme(null, ThemeMode.light)?.name, defaultSchemeName);
+    });
+  });
+
+  group('themeSelectionLabel', () {
+    test('names the pair as a whole in system mode', () {
+      expect(themeSelectionLabel('github-light', ThemeMode.system), 'Github');
+      expect(themeSelectionLabel('github-dark', ThemeMode.system), 'Github');
+    });
+
+    test('names the concrete theme in pinned modes', () {
+      expect(
+        themeSelectionLabel('github-light', ThemeMode.light),
+        'Github Light',
+      );
+      expect(
+        themeSelectionLabel('github-light', ThemeMode.dark),
+        'Github Dark',
+      );
+    });
+
+    test('falls back to the theme display name when unpaired', () {
+      expect(themeSelectionLabel('andromeeda', ThemeMode.system), 'Andromeeda');
+    });
+  });
+}
diff --git a/mobile/test/shared/widgets/app_list_test.dart b/mobile/test/shared/widgets/app_list_test.dart
new file mode 100644
index 0000000000..db493a3f9b
--- /dev/null
+++ b/mobile/test/shared/widgets/app_list_test.dart
@@ -0,0 +1,124 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/app_list.dart';
+import 'package:buzz/shared/widgets/app_list_card.dart';
+
+Widget _host(Widget child) => MaterialApp(
+  theme: AppTheme.light(),
+  home: Scaffold(body: child),
+);
+
+void main() {
+  group('AppListRow', () {
+    testWidgets('centres the leading icon against a two-line row', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        _host(
+          const AppListRow(
+            icon: Icons.dns,
+            title: 'Connected to',
+            subtitle: 'https://relay.example.com',
+          ),
+        ),
+      );
+
+      final row = tester.getRect(find.byType(AppListRow));
+      final icon = tester.getRect(find.byType(Icon));
+      expect(icon.center.dy, closeTo(row.center.dy, 0.5));
+    });
+
+    testWidgets('centres the trailing control against a two-line row', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        _host(
+          const AppListRow(
+            icon: Icons.key,
+            title: 'Identity',
+            subtitle: 'deadbeef',
+            trailing: Icon(Icons.copy, key: Key('trailing')),
+          ),
+        ),
+      );
+
+      final row = tester.getRect(find.byType(AppListRow));
+      final trailing = tester.getRect(find.byKey(const Key('trailing')));
+      expect(trailing.center.dy, closeTo(row.center.dy, 0.5));
+    });
+
+    testWidgets('keeps the value flush against the trailing edge', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        _host(
+          const AppListRow(
+            icon: Icons.palette,
+            title: 'Theme',
+            value: 'Buzz',
+            trailing: Icon(Icons.chevron_right, key: Key('chevron')),
+          ),
+        ),
+      );
+
+      final value = tester.getRect(find.text('Buzz'));
+      final chevron = tester.getRect(find.byKey(const Key('chevron')));
+      // Only the row's own inter-widget gap sits between them — no flex slack.
+      expect(chevron.left - value.right, closeTo(Grid.xxs, 0.5));
+    });
+  });
+
+  group('AppListCard', () {
+    testWidgets('separates rows with dividers that clear the icon column', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        _host(
+          const AppListCard(
+            label: 'Style',
+            children: [
+              AppListRow(icon: Icons.sunny, title: 'Appearance'),
+              AppListRow(icon: Icons.palette, title: 'Theme'),
+              AppListRow(icon: Icons.water_drop, title: 'Accent color'),
+            ],
+          ),
+        ),
+      );
+
+      final dividers = find.byType(Divider);
+      expect(dividers, findsNWidgets(2));
+
+      final divider = tester.widget<Divider>(dividers.first);
+      final scheme = AppTheme.light().colorScheme;
+      // Derived from the text color, not the scheme's border tokens — those sit
+      // within a few levels of the card fill and vanish.
+      expect(divider.color, scheme.onSurface.withValues(alpha: 0.12));
+
+      // The indent is painted inside the divider's box, so the line starts at
+      // the box's left edge plus the indent — level with the row titles.
+      final titleLeft = tester.getRect(find.text('Appearance')).left;
+      final lineLeft = tester.getRect(dividers.first).left + divider.indent!;
+      expect(lineLeft, closeTo(titleLeft, 0.5));
+    });
+
+    testWidgets('fills with the softest container step', (tester) async {
+      await tester.pumpWidget(
+        _host(
+          const AppListCard(children: [AppListRow(title: 'Remove community')]),
+        ),
+      );
+
+      final material = tester.widget<Material>(
+        find.descendant(
+          of: find.byType(AppListCard),
+          matching: find.byType(Material),
+        ),
+      );
+      expect(
+        material.color,
+        AppTheme.light().colorScheme.surfaceContainerHighest,
+      );
+    });
+  });
+}
diff --git a/mobile/test/shared/widgets/buzz_loading_indicator_test.dart b/mobile/test/shared/widgets/buzz_loading_indicator_test.dart
new file mode 100644
index 0000000000..936c3bc397
--- /dev/null
+++ b/mobile/test/shared/widgets/buzz_loading_indicator_test.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/buzz_loading_indicator.dart';
+
+Widget _testable({required bool disableAnimations}) {
+  return ProviderScope(
+    child: MaterialApp(
+      theme: AppTheme.light(),
+      home: MediaQuery(
+        data: const MediaQueryData().copyWith(
+          disableAnimations: disableAnimations,
+        ),
+        child: const Scaffold(
+          body: BuzzLoadingIndicator(semanticLabel: 'Loading photos'),
+        ),
+      ),
+    ),
+  );
+}
+
+void main() {
+  testWidgets('animates the shared arc spinner', (tester) async {
+    final semantics = tester.ensureSemantics();
+
+    await tester.pumpWidget(_testable(disableAnimations: false));
+    await tester.pump(const Duration(milliseconds: 70));
+
+    final spinner = tester.widget<RotationTransition>(
+      find.byKey(const ValueKey('buzz-loading-indicator-spinner')),
+    );
+    expect(spinner.turns.value, greaterThan(0));
+    expect(find.bySemanticsLabel('Loading photos'), findsOneWidget);
+    semantics.dispose();
+  });
+
+  testWidgets('holds a static pose when reduced motion is enabled', (
+    tester,
+  ) async {
+    await tester.pumpWidget(_testable(disableAnimations: true));
+    await tester.pump(const Duration(milliseconds: 70));
+
+    final spinner = tester.widget<RotationTransition>(
+      find.byKey(const ValueKey('buzz-loading-indicator-spinner')),
+    );
+    expect(spinner.turns.value, 0);
+    expect(tester.binding.hasScheduledFrame, isFalse);
+  });
+}
diff --git a/mobile/test/shared/widgets/filter_chip_bar_test.dart b/mobile/test/shared/widgets/filter_chip_bar_test.dart
index d5c8289d8d..6f651624b6 100644
--- a/mobile/test/shared/widgets/filter_chip_bar_test.dart
+++ b/mobile/test/shared/widgets/filter_chip_bar_test.dart
@@ -35,5 +35,53 @@ void main() {
     );
     final resolved = chipTheme.color?.resolve({WidgetState.selected});
     expect(resolved, accent);
+    final selectedLabel = tester.widget<Text>(find.text('Everyone'));
+    final unselectedLabel = tester.widget<Text>(find.text('Following'));
+    expect(selectedLabel.style?.fontSize, filterChipTextStyle.fontSize);
+    expect(selectedLabel.style?.height, filterChipTextStyle.height);
+    expect(selectedLabel.style?.fontWeight, FontWeight.w500);
+    expect(unselectedLabel.style?.fontSize, filterChipTextStyle.fontSize);
+    expect(unselectedLabel.style?.height, filterChipTextStyle.height);
+    expect(unselectedLabel.style?.fontWeight, FontWeight.w400);
+  });
+
+  testWidgets('expanded chips preserve large accessible text scaling', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: MediaQuery(
+          data: const MediaQueryData(textScaler: TextScaler.linear(2)),
+          child: Scaffold(
+            body: SizedBox(
+              width: 240,
+              child: FilterChipBar<int>(
+                expandItems: true,
+                selected: 0,
+                onSelected: (_) {},
+                items: const [
+                  FilterChipItem(id: 0, label: 'All'),
+                  FilterChipItem(id: 1, label: 'Messages'),
+                  FilterChipItem(id: 2, label: 'Channels'),
+                  FilterChipItem(id: 3, label: 'People'),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(
+      find.descendant(
+        of: find.byType(FilterChipBar<int>),
+        matching: find.byType(FittedBox),
+      ),
+      findsNothing,
+    );
+    expect(tester.getSize(find.text('Messages')).height, greaterThan(32));
+    expect(tester.takeException(), isNull);
   });
 }
diff --git a/mobile/test/shared/widgets/frosted_app_bar_test.dart b/mobile/test/shared/widgets/frosted_app_bar_test.dart
new file mode 100644
index 0000000000..bc17f66ee3
--- /dev/null
+++ b/mobile/test/shared/widgets/frosted_app_bar_test.dart
@@ -0,0 +1,86 @@
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/frosted_app_bar.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets('title row and reported height grow with accessible text', (
+    tester,
+  ) async {
+    const titleStyle = TextStyle(fontSize: 22, height: 1.3);
+    late double reportedHeight;
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: MediaQuery(
+          data: const MediaQueryData(textScaler: TextScaler.linear(2)),
+          child: Builder(
+            builder: (context) {
+              reportedHeight = frostedAppBarHeight(
+                context,
+                titleStyle: titleStyle,
+              );
+              return const Stack(
+                children: [
+                  FrostedAppBar(title: Text('Search'), titleStyle: titleStyle),
+                ],
+              );
+            },
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final clip = find.descendant(
+      of: find.byType(FrostedAppBar),
+      matching: find.byType(ClipRect),
+    );
+    expect(reportedHeight, greaterThan(48));
+    expect(tester.getSize(clip).height, closeTo(reportedHeight, 0.01));
+    expect(tester.getSize(find.text('Search')).height, greaterThan(48));
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('custom multi-line title height matches reported height', (
+    tester,
+  ) async {
+    const titleContentHeight = 64.0;
+    late double reportedHeight;
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: Builder(
+          builder: (context) {
+            reportedHeight = frostedAppBarHeight(
+              context,
+              titleContentHeight: titleContentHeight,
+            );
+            return const Stack(
+              children: [
+                FrostedAppBar(
+                  titleContentHeight: titleContentHeight,
+                  title: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [Text('Title'), Text('Subtitle')],
+                  ),
+                ),
+              ],
+            );
+          },
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final clip = find.descendant(
+      of: find.byType(FrostedAppBar),
+      matching: find.byType(ClipRect),
+    );
+    expect(tester.getSize(clip).height, closeTo(reportedHeight, 0.01));
+    expect(reportedHeight, closeTo(titleContentHeight + Grid.xs + 1, 0.01));
+    expect(tester.takeException(), isNull);
+  });
+}
diff --git a/mobile/test/shared/widgets/masked_avatar_badge_test.dart b/mobile/test/shared/widgets/masked_avatar_badge_test.dart
new file mode 100644
index 0000000000..f2794d7132
--- /dev/null
+++ b/mobile/test/shared/widgets/masked_avatar_badge_test.dart
@@ -0,0 +1,147 @@
+import 'dart:math' as math;
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/masked_avatar_badge.dart';
+
+void main() {
+  group('avatarBadgeMaskPath', () {
+    const size = 128.0;
+    const geometry = AvatarBadgeMaskGeometry.badge;
+
+    test('keeps the avatar but cuts the notch out of it', () {
+      final path = avatarBadgeMaskPath(size: size, geometry: geometry);
+
+      expect(path.contains(const Offset(size / 2, size / 2)), isTrue);
+      expect(path.contains(geometry.cutoutCenter(size)), isFalse);
+      // The far edge is untouched — the notch only bites the bottom-right.
+      expect(path.contains(const Offset(4, size / 2)), isTrue);
+    });
+
+    test('stays inside the avatar circle on the unnotched sides', () {
+      // Checked with contains() rather than getBounds(), which reports
+      // control-point bounds and so overshoots the near-full-circle arc.
+      final path = avatarBadgeMaskPath(size: size, geometry: geometry);
+
+      expect(path.contains(const Offset(-1, size / 2)), isFalse);
+      expect(path.contains(const Offset(size / 2, -1)), isFalse);
+      expect(path.contains(const Offset(2, 2)), isFalse);
+    });
+
+    test('fillets the notch rather than subtracting a bare circle', () {
+      // A plain difference meets the cutout at two cusps. The fillets round
+      // those off, which necessarily removes extra material just outside the
+      // cutout circle — so the masked path must be a strict subset there.
+      final masked = avatarBadgeMaskPath(size: size, geometry: geometry);
+      final cutoutCenter = geometry.cutoutCenter(size);
+      final cutoutRadius = geometry.cutoutRadius(size);
+      final bare = Path.combine(
+        PathOperation.difference,
+        Path()..addOval(
+          Rect.fromCircle(
+            center: const Offset(size / 2, size / 2),
+            radius: size / 2,
+          ),
+        ),
+        Path()..addOval(
+          Rect.fromCircle(center: cutoutCenter, radius: cutoutRadius),
+        ),
+      );
+
+      // Sample the ring just outside the cutout, where the fillets live.
+      var filleted = 0;
+      for (var step = 0; step < 360; step++) {
+        final angle = step * math.pi / 180;
+        final point =
+            cutoutCenter +
+            Offset(math.cos(angle), math.sin(angle)) * (cutoutRadius + 2);
+        if (bare.contains(point) && !masked.contains(point)) filleted++;
+        // The fillet only adds material to the cut, never puts it back.
+        expect(
+          masked.contains(point) && !bare.contains(point),
+          isFalse,
+          reason: 'mask should not extend beyond the plain difference',
+        );
+      }
+      expect(filleted, greaterThan(0));
+    });
+
+    test('falls back to a plain circle when the notch misses the avatar', () {
+      // A notch tucked at the centre never crosses the avatar's edge, so there
+      // is no crossing to fillet and nothing should be cut.
+      const detached = AvatarBadgeMaskGeometry(
+        cutoutCenterRatio: 0.5,
+        cutoutRadiusRatio: 0.05,
+        badgeSizeRatio: 0.08,
+        curve: AvatarBadgeCurve.standard,
+      );
+      final path = avatarBadgeMaskPath(size: size, geometry: detached);
+
+      expect(path.contains(detached.cutoutCenter(size)), isTrue);
+      expect(path.getBounds().size, const Size(size, size));
+    });
+
+    test(
+      'scales geometry with the avatar, matching desktop at its own size',
+      () {
+        // Desktop's sidebar avatar is 32px with the cutout at (28, 28) r 7.5.
+        const presence = AvatarBadgeMaskGeometry.presenceDot;
+
+        expect(presence.cutoutCenter(32), const Offset(28, 28));
+        expect(presence.cutoutRadius(32), 7.5);
+        expect(presence.badgeSize(32), 14);
+        // Twice the avatar, twice the notch.
+        expect(presence.cutoutCenter(64), const Offset(56, 56));
+        expect(presence.cutoutRadius(64), 15);
+      },
+    );
+  });
+
+  group('MaskedAvatarBadge', () {
+    Widget harness({Widget? badge}) => MaterialApp(
+      theme: AppTheme.light(),
+      home: Center(
+        child: MaskedAvatarBadge(
+          size: 128,
+          geometry: AvatarBadgeMaskGeometry.badge,
+          avatar: const ColoredBox(color: Color(0xFF123456)),
+          badge: badge,
+        ),
+      ),
+    );
+
+    testWidgets('masks the avatar and centres the badge in the notch', (
+      tester,
+    ) async {
+      await tester.pumpWidget(
+        harness(badge: const ColoredBox(color: Color(0xFFABCDEF))),
+      );
+
+      final clip = tester.widget<ClipPath>(find.byType(ClipPath));
+      expect(clip.clipper, isA<AvatarBadgeMaskClipper>());
+
+      const geometry = AvatarBadgeMaskGeometry.badge;
+      final frame = tester.getRect(find.byType(MaskedAvatarBadge));
+      final badgeRect = tester.getRect(find.byType(ColoredBox).last);
+
+      expect(badgeRect.width, closeTo(geometry.badgeSize(128), 0.01));
+      expect(
+        badgeRect.center - frame.topLeft,
+        within(distance: 0.01, from: geometry.cutoutCenter(128)),
+      );
+    });
+
+    testWidgets('leaves the avatar whole when there is no badge', (
+      tester,
+    ) async {
+      await tester.pumpWidget(harness());
+
+      expect(find.byType(ClipPath), findsNothing);
+      expect(
+        tester.getSize(find.byType(MaskedAvatarBadge)),
+        const Size(128, 128),
+      );
+    });
+  });
+}
diff --git a/mobile/test/shared/widgets/message_author_meta_test.dart b/mobile/test/shared/widgets/message_author_meta_test.dart
new file mode 100644
index 0000000000..3b55946d47
--- /dev/null
+++ b/mobile/test/shared/widgets/message_author_meta_test.dart
@@ -0,0 +1,117 @@
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/message_author_meta.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets('keeps the separator and timestamp next to a short name', (
+    tester,
+  ) async {
+    const displayNameKey = Key('author-display-name');
+    const timestampKey = Key('author-timestamp');
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: const Scaffold(
+          body: SizedBox(
+            width: 300,
+            child: MessageAuthorMeta(
+              displayName: 'Alice',
+              timestamp: '2m',
+              displayNameKey: displayNameKey,
+              timestampKey: timestampKey,
+              nameColor: Colors.black,
+              metadataColor: Colors.grey,
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final displayNameRect = tester.getRect(find.byKey(displayNameKey));
+    final separatorRect = tester.getRect(find.text('·'));
+    final timestampRect = tester.getRect(find.byKey(timestampKey));
+
+    expect(separatorRect.left - displayNameRect.right, Grid.half);
+    expect(timestampRect.left - separatorRect.right, Grid.half);
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('reallocates unused metadata width to the display name', (
+    tester,
+  ) async {
+    const displayNameKey = Key('author-display-name');
+    const timestampKey = Key('author-timestamp');
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: const Scaffold(
+          body: SizedBox(
+            width: 300,
+            child: MessageAuthorMeta(
+              displayName: 'A display name that needs the available width',
+              username: 'al',
+              timestamp: '2m',
+              displayNameKey: displayNameKey,
+              timestampKey: timestampKey,
+              nameColor: Colors.black,
+              metadataColor: Colors.grey,
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final row = find.byType(MessageAuthorMeta);
+    final displayName = find.byKey(displayNameKey);
+    final timestamp = find.byKey(timestampKey);
+
+    expect(
+      tester.getSize(displayName).width,
+      greaterThan(tester.getSize(row).width / 2),
+    );
+    expect(
+      tester.getTopRight(timestamp).dx,
+      closeTo(tester.getTopRight(row).dx, 0.01),
+    );
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('constrains long metadata at large accessible text sizes', (
+    tester,
+  ) async {
+    const timestampKey = Key('author-timestamp');
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: AppTheme.light(),
+        home: const MediaQuery(
+          data: MediaQueryData(textScaler: TextScaler.linear(2)),
+          child: Scaffold(
+            body: SizedBox(
+              width: 220,
+              child: MessageAuthorMeta(
+                displayName: 'A very long display name',
+                username: 'a-very-long-username',
+                timestamp: 'Mar 15, 2025',
+                timestampKey: timestampKey,
+                nameColor: Colors.black,
+                metadataColor: Colors.grey,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    final timestamp = tester.widget<Text>(find.byKey(timestampKey));
+    expect(timestamp.maxLines, 1);
+    expect(timestamp.overflow, TextOverflow.ellipsis);
+    expect(tester.takeException(), isNull);
+  });
+}
diff --git a/mobile/test/shared/widgets/mobile_tab_footer_backdrop_test.dart b/mobile/test/shared/widgets/mobile_tab_footer_backdrop_test.dart
new file mode 100644
index 0000000000..9e54177d61
--- /dev/null
+++ b/mobile/test/shared/widgets/mobile_tab_footer_backdrop_test.dart
@@ -0,0 +1,23 @@
+import 'package:buzz/shared/widgets/mobile_tab_footer_backdrop.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets('uses the logical bottom safe-area inset', (tester) async {
+    double? height;
+
+    await tester.pumpWidget(
+      MediaQuery(
+        data: const MediaQueryData(padding: EdgeInsets.only(bottom: 34)),
+        child: Builder(
+          builder: (context) {
+            height = mobileTabFooterBackdropHeight(context);
+            return const SizedBox();
+          },
+        ),
+      ),
+    );
+
+    expect(height, 170);
+  });
+}
diff --git a/mobile/test/shared/widgets/skeleton_test.dart b/mobile/test/shared/widgets/skeleton_test.dart
new file mode 100644
index 0000000000..5b2d25bd63
--- /dev/null
+++ b/mobile/test/shared/widgets/skeleton_test.dart
@@ -0,0 +1,186 @@
+import 'package:buzz/shared/theme/theme.dart';
+import 'package:buzz/shared/widgets/skeleton.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  Widget buildShimmerTestable({
+    bool disableAnimations = false,
+    bool enabled = true,
+  }) {
+    return MaterialApp(
+      theme: AppTheme.light(),
+      builder: (context, child) => MediaQuery(
+        data: MediaQuery.of(
+          context,
+        ).copyWith(disableAnimations: disableAnimations),
+        child: child!,
+      ),
+      home: Scaffold(
+        body: SkeletonShimmer(
+          enabled: enabled,
+          child: const SkeletonBar(width: 120, height: 16),
+        ),
+      ),
+    );
+  }
+
+  Widget buildRevealTestable({
+    required ValueNotifier<bool> loading,
+    bool disableAnimations = false,
+  }) {
+    return MaterialApp(
+      theme: AppTheme.light(),
+      builder: (context, child) => MediaQuery(
+        data: MediaQuery.of(
+          context,
+        ).copyWith(disableAnimations: disableAnimations),
+        child: child!,
+      ),
+      home: Scaffold(
+        body: ValueListenableBuilder(
+          valueListenable: loading,
+          builder: (context, isLoading, _) => SkeletonReveal(
+            loading: isLoading,
+            skeleton: const SkeletonBar(width: 120, height: 16),
+            content: const Text('Loaded content'),
+          ),
+        ),
+      ),
+    );
+  }
+
+  double layerOpacity(WidgetTester tester, String key) =>
+      tester.widget<Opacity>(find.byKey(Key(key))).opacity;
+
+  bool contentFocusExcluded(WidgetTester tester) => tester
+      .widget<ExcludeFocus>(
+        find.descendant(
+          of: find.byKey(const Key('skeleton-reveal-content')),
+          matching: find.byType(ExcludeFocus),
+        ),
+      )
+      .excluding;
+
+  testWidgets('sweeps a highlight across skeleton elements while loading', (
+    tester,
+  ) async {
+    await tester.pumpWidget(buildShimmerTestable());
+
+    final shimmer = find.byType(SkeletonShimmer);
+    expect(find.byType(SkeletonBar), findsOneWidget);
+    expect(
+      find.descendant(of: shimmer, matching: find.byType(ShaderMask)),
+      findsOneWidget,
+    );
+
+    final boundary = tester.renderObject<RenderRepaintBoundary>(
+      find
+          .descendant(of: shimmer, matching: find.byType(RepaintBoundary))
+          .first,
+    );
+    final beforeBytes = await tester.runAsync(() async {
+      final image = await boundary.toImage();
+      return image.toByteData();
+    });
+
+    await tester.pump(const Duration(milliseconds: 1000));
+    final afterBytes = await tester.runAsync(() async {
+      final image = await boundary.toImage();
+      return image.toByteData();
+    });
+
+    expect(
+      beforeBytes!.buffer.asUint8List(),
+      isNot(equals(afterBytes!.buffer.asUint8List())),
+    );
+  });
+
+  testWidgets('keeps skeleton elements static for reduced motion', (
+    tester,
+  ) async {
+    await tester.pumpWidget(buildShimmerTestable(disableAnimations: true));
+
+    final shimmer = find.byType(SkeletonShimmer);
+    expect(find.byType(SkeletonBar), findsOneWidget);
+    expect(
+      find.descendant(of: shimmer, matching: find.byType(ShaderMask)),
+      findsNothing,
+    );
+  });
+
+  testWidgets('keeps skeleton elements static when shimmer is disabled', (
+    tester,
+  ) async {
+    await tester.pumpWidget(buildShimmerTestable(enabled: false));
+
+    final shimmer = find.byType(SkeletonShimmer);
+    expect(find.byType(SkeletonBar), findsOneWidget);
+    expect(
+      find.descendant(of: shimmer, matching: find.byType(ShaderMask)),
+      findsNothing,
+    );
+  });
+
+  testWidgets('reveals content in the same slot with a 400ms cross-fade', (
+    tester,
+  ) async {
+    final loading = ValueNotifier(true);
+    await tester.pumpWidget(buildRevealTestable(loading: loading));
+
+    expect(layerOpacity(tester, 'skeleton-reveal-placeholder'), 1);
+    expect(layerOpacity(tester, 'skeleton-reveal-content'), 0);
+    expect(contentFocusExcluded(tester), isTrue);
+
+    loading.value = false;
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 200));
+
+    expect(
+      layerOpacity(tester, 'skeleton-reveal-placeholder'),
+      closeTo(0.5, 0.01),
+    );
+    expect(layerOpacity(tester, 'skeleton-reveal-content'), closeTo(0.5, 0.01));
+    expect(contentFocusExcluded(tester), isTrue);
+
+    await tester.pump(const Duration(milliseconds: 200));
+
+    expect(layerOpacity(tester, 'skeleton-reveal-placeholder'), 0);
+    expect(layerOpacity(tester, 'skeleton-reveal-content'), 1);
+    expect(contentFocusExcluded(tester), isFalse);
+    expect(find.text('Loaded content'), findsOneWidget);
+  });
+
+  testWidgets('resets to the skeleton without animating backwards', (
+    tester,
+  ) async {
+    final loading = ValueNotifier(false);
+    await tester.pumpWidget(buildRevealTestable(loading: loading));
+    expect(layerOpacity(tester, 'skeleton-reveal-content'), 1);
+
+    loading.value = true;
+    await tester.pump();
+
+    expect(layerOpacity(tester, 'skeleton-reveal-placeholder'), 1);
+    expect(layerOpacity(tester, 'skeleton-reveal-content'), 0);
+  });
+
+  testWidgets('reveals immediately for reduced motion', (tester) async {
+    final loading = ValueNotifier(true);
+    await tester.pumpWidget(
+      buildRevealTestable(loading: loading, disableAnimations: true),
+    );
+    final reveal = find.byType(SkeletonReveal);
+    expect(
+      find.descendant(of: reveal, matching: find.byType(ShaderMask)),
+      findsNothing,
+    );
+
+    loading.value = false;
+    await tester.pump();
+
+    expect(layerOpacity(tester, 'skeleton-reveal-placeholder'), 0);
+    expect(layerOpacity(tester, 'skeleton-reveal-content'), 1);
+  });
+}
diff --git a/patches/virtua@0.49.3.patch b/patches/virtua@0.49.3.patch
index d7432534b8..5debe418eb 100644
--- a/patches/virtua@0.49.3.patch
+++ b/patches/virtua@0.49.3.patch
@@ -1,5 +1,5 @@
 diff --git a/lib/index.cjs b/lib/index.cjs
-index e02dfd0b3db60faff2cc705d7ce0aa51cb958f5a..c3bbc7f4d8dd396f5329a40a2701f4f752e3c5cc 100644
+index e02dfd0b3db60faff2cc705d7ce0aa51cb958f5a..b12677a356f748ebccf6e16cb781efe1315bb55b 100644
 --- a/lib/index.cjs
 +++ b/lib/index.cjs
 @@ -35,10 +35,18 @@ const r = null, {min: n, max: s, abs: i, floor: l} = Math, c = (e, t, o) => n(o,
@@ -39,11 +39,41 @@ index e02dfd0b3db60faff2cc705d7ce0aa51cb958f5a..c3bbc7f4d8dd396f5329a40a2701f4f7
 
                case 5:
 -                t[1] ? (L(w(M, t[0], !0)), I = 2, l = 1) : (w(M, t[0]), l = 1);
-+                t[1] ? (L(w(M, t[0], !0, t[2])), I = 2, l = 1) : (w(M, t[0], !1, t[2]), l = 1);
++                t[1] ? (L(w(M, t[0], !0, t[2])), I = 2, l = 1) : (w(M, t[0], !1, t[2]), I = 0, l = 1);
                  break;
 
                case 6:
-@@ -519,11 +527,11 @@ const r = null, {min: n, max: s, abs: i, floor: l} = Math, c = (e, t, o) => n(o,
+@@ -160,6 +168,10 @@ const r = null, {min: n, max: s, abs: i, floor: l} = Math, c = (e, t, o) => n(o,
+
+               case 8:
+                 k = W(t, t + a), l = 1;
++                break;
++
++              case 9:
++                I = 0;
+             }
+             l && (d = 1 + (2147483647 & d), o && z && ($ += z, z = 0), O.forEach(([e, t]) => {
+                 l & e && t(n);
+@@ -186,6 +198,8 @@ const r = null, {min: n, max: s, abs: i, floor: l} = Math, c = (e, t, o) => n(o,
+         c = l(), d && (a = !0), i && e.q(6, i()), e.q(1, n()), h();
+     }, p = t => {
+-        if (f || !e.M() || t.ctrlKey) return;
++        if (!e.M() || t.ctrlKey) return;
++        e.q(9);
++        if (f) return;
+         const r = l() - c;
+         150 > r && 50 < r && (o ? t.deltaX : t.deltaY) && (f = !0);
+     }, v = () => {
+@@ -266,7 +279,7 @@ const r = null, {min: n, max: s, abs: i, floor: l} = Math, c = (e, t, o) => n(o,
+                         e[l] = t;
+                     });
+                 }
+-                f[i] = R(e.C() + t, s), o && u();
++                f[i] = R((o ? R(f[i], s) : e.C()) + t, s), o && u();
+             }), n[1](!0);
+         },
+         v() {
+@@ -519,11 +532,11 @@ const r = null, {min: n, max: s, abs: i, floor: l} = Math, c = (e, t, o) => n(o,
      })(e);
      return [ e => t[e], t.length ];
  }, [ e, o ]), j = /*#__PURE__*/ t.forwardRef(({children: r, data: n, bufferSize: s, itemSize: i, shift: l, horizontal: c, keepMounted: d, cache: a, startMargin: h = 0, ssrCount: g, as: p = "div", item: v = "div", scrollRef: _, onScroll: w, onScrollEnd: S}, m) => {
@@ -59,7 +89,7 @@ index e02dfd0b3db60faff2cc705d7ce0aa51cb958f5a..c3bbc7f4d8dd396f5329a40a2701f4f7
          const o = $(t);
          return e.jsx(Y, {
 diff --git a/lib/index.js b/lib/index.js
-index 110ac3858a002a6cdb698da2b56350bc1bf609d2..81d239dad48d4453efd5ce7f8397555c66c99d56 100644
+index 110ac3858a002a6cdb698da2b56350bc1bf609d2..db83efc83fb3b6d7aa07d83b7463d6ed7746287e 100644
 --- a/lib/index.js
 +++ b/lib/index.js
 @@ -1,7 +1,7 @@
@@ -102,25 +132,46 @@ index 110ac3858a002a6cdb698da2b56350bc1bf609d2..81d239dad48d4453efd5ce7f8397555c
          if (n = d(n, e.l - 1), b(e, n) <= t) {
              const r = y(e, o, n);
              return [ y(e, t, n, r), r ];
-@@ -124,7 +132,7 @@ const u = null, {min: d, max: a, abs: h, floor: g} = Math, p = (e, t, o) => d(o,
-                     if (!e.length) break;
-                     N(e.reduce((e, [t, o]) => {
-                         let n;
--                        if (2 === w) n = !0; else if (I && 1 === w) n = t < I[0]; else {
-+                        if (2 === w) n = J(t) < E(); else if (I && 1 === w) n = t < I[0]; else {
-                             const e = E(), o = J(t), r = A(t);
-                             n = 1 !== _ && 0 === w ? o + r <= e : o < e && o + r < e + l;
-                         }
 @@ -151,7 +159,7 @@ const u = null, {min: d, max: a, abs: h, floor: g} = Math, p = (e, t, o) => d(o,
                  break;
 
                case 5:
 -                t[1] ? (N(x(M, t[0], !0)), w = 2, d = 1) : (x(M, t[0]), d = 1);
-+                t[1] ? (N(x(M, t[0], !0, t[2])), w = 2, d = 1) : (x(M, t[0], !1, t[2]), d = 1);
++                t[1] ? (N(x(M, t[0], !0, t[2])), w = 2, d = 1) : (x(M, t[0], !1, t[2]), w = 0, d = 1);
                  break;
 
                case 6:
-@@ -523,11 +531,11 @@ const u = null, {min: d, max: a, abs: h, floor: g} = Math, p = (e, t, o) => d(o,
+@@ -164,6 +172,10 @@ const u = null, {min: d, max: a, abs: h, floor: g} = Math, p = (e, t, o) => d(o,
+
+               case 8:
+                 I = W(t, t + l), d = 1;
++                break;
++
++              case 9:
++                w = 0;
+             }
+             d && (i = 1 + (2147483647 & i), o && p && (g += p, p = 0), O.forEach(([e, t]) => {
+                 d & e && t(n);
+@@ -190,6 +202,8 @@ const u = null, {min: d, max: a, abs: h, floor: g} = Math, p = (e, t, o) => d(o,
+         l = i(), d && (a = !0), s && e.B(6, s()), e.B(1, n()), h();
+     }, p = t => {
+-        if (c || !e.M() || t.ctrlKey) return;
++        if (!e.M() || t.ctrlKey) return;
++        e.B(9);
++        if (c) return;
+         const n = i() - l;
+         150 > n && 50 < n && (o ? t.deltaX : t.deltaY) && (c = !0);
+     }, v = () => {
+@@ -270,7 +283,7 @@ const u = null, {min: d, max: a, abs: h, floor: g} = Math, p = (e, t, o) => d(o,
+                         e[l] = t;
+                     });
+                 }
+-                u[i] = W(e.C() + t, s), o && f();
++                u[i] = W((o ? W(u[i], s) : e.C()) + t, s), o && f();
+             }), r[1](!0);
+         },
+         v() {
+@@ -523,11 +536,11 @@ const u = null, {min: d, max: a, abs: h, floor: g} = Math, p = (e, t, o) => d(o,
      })(e);
      return [ e => o[e], o.length ];
  }, [ e, t ]), Z = /*#__PURE__*/ i(({children: t, data: o, bufferSize: r, itemSize: s, shift: i, horizontal: u, keepMounted: d, cache: a, startMargin: h = 0, ssrCount: g, as: p = "div", item: _ = "div", scrollRef: w, onScroll: S, onScrollEnd: $}, z) => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d8ed8ec316..9ed8280c28 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,11 +5,12 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  '@radix-ui/react-dismissable-layer': 1.1.15
+  '@radix-ui/react-dismissable-layer': 1.1.19
+  linkify-it: ^5.0.2
 
 patchedDependencies:
   isomorphic-git: e9b414a60d4cf1d8aa18f7a779483984e821989967c235662566e94ef0238d3f
-  virtua@0.49.3: acef47b2cfcb8bfd36668c30a16f918fe492eb07a1ddeafc8cc3a22a3efbf71b
+  virtua@0.49.3: 30a7a92b94800ec37be8d36546ea98c04a05dcd0637f9fac27a06f016ba2eff4
 
 importers:
 
@@ -30,10 +31,10 @@ importers:
         version: 6.0.3(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.7
+        version: 19.2.8
       react-dom:
         specifier: ^19.1.0
-        version: 19.2.7(react@19.2.7)
+        version: 19.2.8(react@19.2.8)
       vite:
         specifier: ^8.0.0
         version: 8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0)
@@ -46,7 +47,7 @@ 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.7(react@19.2.7))(react@19.2.7)
+        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)
       '@types/react':
         specifier: ^19.1.8
         version: 19.2.17
@@ -67,19 +68,19 @@ importers:
     dependencies:
       '@dnd-kit/core':
         specifier: ^6.3.1
-        version: 6.3.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 6.3.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@dnd-kit/sortable':
         specifier: ^10.0.0
-        version: 10.0.0(@dnd-kit/core@6.3.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(react@19.2.7)
+        version: 10.0.0(@dnd-kit/core@6.3.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(react@19.2.8)
       '@dnd-kit/utilities':
         specifier: ^3.2.2
-        version: 3.2.2(react@19.2.7)
+        version: 3.2.2(react@19.2.8)
       '@emoji-mart/data':
         specifier: ^1.2.1
         version: 1.2.1
       '@emoji-mart/react':
         specifier: ^1.1.1
-        version: 1.1.1(emoji-mart@5.6.0)(react@19.2.7)
+        version: 1.1.1(emoji-mart@5.6.0)(react@19.2.8)
       '@fontsource-variable/inter':
         specifier: ^5.2.8
         version: 5.2.8
@@ -88,55 +89,55 @@ importers:
         version: 0.10.35
       '@radix-ui/react-alert-dialog':
         specifier: ^1.1.15
-        version: 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@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.7(react@19.2.7))(react@19.2.7)
+        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)
       '@radix-ui/react-checkbox':
         specifier: ^1.3.3
-        version: 1.3.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@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.7(react@19.2.7))(react@19.2.7)
+        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)
       '@radix-ui/react-dialog':
         specifier: ^1.1.15
-        version: 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@radix-ui/react-dropdown-menu':
         specifier: ^2.1.16
-        version: 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@radix-ui/react-focus-scope':
         specifier: ^1.1.8
-        version: 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@radix-ui/react-popover':
         specifier: ^1.1.15
-        version: 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@radix-ui/react-separator':
         specifier: ^1.1.8
-        version: 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@radix-ui/react-slot':
         specifier: ^1.2.4
-        version: 1.3.0(@types/react@19.2.17)(react@19.2.7)
+        version: 1.3.3(@types/react@19.2.17)(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.7(react@19.2.7))(react@19.2.7)
+        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)
       '@radix-ui/react-tabs':
         specifier: ^1.1.13
-        version: 1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@radix-ui/react-toggle':
         specifier: ^1.1.10
-        version: 1.1.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@radix-ui/react-tooltip':
         specifier: ^1.2.8
-        version: 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@tanstack/react-query':
         specifier: ^5.90.21
-        version: 5.100.14(react@19.2.7)
+        version: 5.100.14(react@19.2.8)
       '@tanstack/react-router':
         specifier: ^1.168.10
-        version: 1.170.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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.6(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 3.14.8(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@tauri-apps/api':
         specifier: ~2.11
         version: 2.11.0
@@ -166,7 +167,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.7(react@19.2.7))(react@19.2.7)
+        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)
       '@tiptap/starter-kit':
         specifier: ^3.22.3
         version: 3.22.5
@@ -178,7 +179,7 @@ importers:
         version: 2.1.1
       embla-carousel-react:
         specifier: ^8.6.0
-        version: 8.6.0(react@19.2.7)
+        version: 8.6.0(react@19.2.8)
       emoji-mart:
         specifier: ^5.6.0
         version: 5.6.0
@@ -187,28 +188,28 @@ importers:
         version: 3.3.0
       lucide-react:
         specifier: ^1.0.0
-        version: 1.16.0(react@19.2.7)
+        version: 1.16.0(react@19.2.8)
       motion:
         specifier: ^12.38.0
-        version: 12.40.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 12.40.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       qrcode:
         specifier: ^1.5.4
         version: 1.5.4
       qrcode.react:
         specifier: ^4.2.0
-        version: 4.2.0(react@19.2.7)
+        version: 4.2.0(react@19.2.8)
       react:
         specifier: ^19.1.0
-        version: 19.2.7
+        version: 19.2.8
       react-diff-view:
         specifier: ^3.3.2
-        version: 3.3.3(react@19.2.7)
+        version: 3.3.3(react@19.2.8)
       react-dom:
         specifier: ^19.1.0
-        version: 19.2.7(react@19.2.7)
+        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.7)
+        version: 10.1.0(@types/react@19.2.17)(react@19.2.8)
       remark-breaks:
         specifier: ^4.0.0
         version: 4.0.0
@@ -220,7 +221,7 @@ importers:
         version: 4.1.0
       sonner:
         specifier: ^2.0.7
-        version: 2.0.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 2.0.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       tailwind-merge:
         specifier: ^3.5.0
         version: 3.6.0
@@ -232,7 +233,7 @@ importers:
         version: 2.1.0
       virtua:
         specifier: 0.49.3
-        version: 0.49.3(patch_hash=acef47b2cfcb8bfd36668c30a16f918fe492eb07a1ddeafc8cc3a22a3efbf71b)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 0.49.3(patch_hash=30a7a92b94800ec37be8d36546ea98c04a05dcd0637f9fac27a06f016ba2eff4)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       yaml:
         specifier: ^2.8.3
         version: 2.9.0
@@ -251,7 +252,7 @@ importers:
         version: 4.3.0
       '@tanstack/router-plugin':
         specifier: ^1.167.12
-        version: 1.168.10(@tanstack/react-router@1.170.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))
+        version: 1.168.10(@tanstack/react-router@1.170.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))
       '@tanstack/virtual-file-routes':
         specifier: ^1.161.7
         version: 1.162.0
@@ -296,19 +297,19 @@ importers:
         version: 4.6.2
       '@radix-ui/react-slot':
         specifier: ^1.2.4
-        version: 1.3.0(@types/react@19.2.17)(react@19.2.7)
+        version: 1.3.3(@types/react@19.2.17)(react@19.2.8)
       '@radix-ui/react-tooltip':
         specifier: ^1.2.8
-        version: 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        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)
       '@tailwindcss/typography':
         specifier: ^0.5.19
         version: 0.5.20(tailwindcss@4.3.0)
       '@tanstack/react-query':
         specifier: ^5.90.21
-        version: 5.100.14(react@19.2.7)
+        version: 5.100.14(react@19.2.8)
       '@tanstack/react-router':
         specifier: ^1.168.10
-        version: 1.170.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 1.170.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       buffer:
         specifier: ^6.0.3
         version: 6.0.3
@@ -323,25 +324,25 @@ importers:
         version: 1.38.7(patch_hash=e9b414a60d4cf1d8aa18f7a779483984e821989967c235662566e94ef0238d3f)
       lucide-react:
         specifier: ^1.0.0
-        version: 1.16.0(react@19.2.7)
+        version: 1.16.0(react@19.2.8)
       nostr-tools:
         specifier: ^2.23.3
         version: 2.23.12(typescript@6.0.3)
       react:
         specifier: ^19.1.0
-        version: 19.2.7
+        version: 19.2.8
       react-dom:
         specifier: ^19.1.0
-        version: 19.2.7(react@19.2.7)
+        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.7)
+        version: 10.1.0(@types/react@19.2.17)(react@19.2.8)
       remark-gfm:
         specifier: ^4.0.1
         version: 4.0.1
       sonner:
         specifier: ^2.0.7
-        version: 2.0.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+        version: 2.0.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       tailwind-merge:
         specifier: ^3.5.0
         version: 3.6.0
@@ -354,7 +355,7 @@ importers:
         version: 4.3.0
       '@tanstack/router-plugin':
         specifier: ^1.167.12
-        version: 1.168.10(@tanstack/react-router@1.170.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))
+        version: 1.168.10(@tanstack/react-router@1.170.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))
       '@tanstack/virtual-file-routes':
         specifier: ^1.161.7
         version: 1.162.0
@@ -718,11 +719,11 @@ packages:
   '@radix-ui/primitive@1.1.3':
     resolution: {integrity: sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==}
 
-  '@radix-ui/primitive@1.1.5':
-    resolution: {integrity: sha512-d86WIWFYNtGA0H/d8exstrTRTp7eWJYlYJbtNofxr/3ljupZYn6EFDG/Qgu/0Kc8v7yMUxySagqJsL1+PdYjWg==}
+  '@radix-ui/primitive@1.1.7':
+    resolution: {integrity: sha512-rqWnm76nYT8HoNNqEjpgJ7Pw/DrBj5iBTrmEPo6HTX5+VJyBNOqTdv4g89G63HuR5g0AaENoAcH7Is5fF2kZ8Q==}
 
-  '@radix-ui/react-alert-dialog@1.1.19':
-    resolution: {integrity: sha512-FA7n1f6D/DwGE0+AWxiY5LacNbbExQuEgMubeG06idEaH+mSLuf9dp/qBNqOnvbTQ+4gZ2ue1RATF1Ub91Mg5g==}
+  '@radix-ui/react-alert-dialog@1.1.23':
+    resolution: {integrity: sha512-VAYOiQRqj3GPpYJE0I9J+X8Ip05cyVlNdKOFeiGS2Ou1HHGfpl0BxOyZm6nmVDyU+W+NF3/XLzmjHmVGydhwgA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -734,8 +735,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-arrow@1.1.11':
-    resolution: {integrity: sha512-Kdil9BB1rIFC/khmf4hC35bn8701AJcizTU7G7cUbEbk5XqqbjDuHW60uUfKqO5WojjZcbAW51Q7P0hRmMLw8A==}
+  '@radix-ui/react-arrow@1.1.15':
+    resolution: {integrity: sha512-v4zggRcjadnI+ClKDuijlQEW4tw3NoaeHc/PwpKnLoLLKNUG4InLegkstooLcRIUWCs+8L22dGURCVuFfOKfnA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -773,8 +774,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-checkbox@1.3.7':
-    resolution: {integrity: sha512-JroKHfQBfh+fDuzpPsBC+pESkhuq8ql4hljTguz8MWnS35cISr3d/Jhl9kYrB44FlDtxCArYdDvTx+BSsJ64rQ==}
+  '@radix-ui/react-checkbox@1.3.11':
+    resolution: {integrity: sha512-Gnptr9pDDQxD3hgq2dtPbtrp/c2qH1mBwIzw3X/ivrMb2e1t0jMTi606fVEqFPaQR1ggXIVQWKj3P2WW9v7zGQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -786,8 +787,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-collection@1.1.12':
-    resolution: {integrity: sha512-nb67INpE0IahJKN7EYPp9m9YGwYeKlnzxT3MwXVkgCskaSJia97kG4T0ywpjNUSSnoJk/uvk12V8vbrEHEj+/Q==}
+  '@radix-ui/react-collection@1.1.15':
+    resolution: {integrity: sha512-9W+B9NPF0NaaPh/1NJd3+KqsnlLqU9H7T2rvww+fp+T/evVXdNAyYcnfRQZFOjkR1ajQp3yORlqnI8soawLvNA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -830,6 +831,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-compose-refs@1.1.5':
+    resolution: {integrity: sha512-+48PbAAbq3didjJxa+OaWY2ZwgAKsNiRGyeHKszblZMQ+kcpd9pAaT11cMkGEie0vsOi3QdeTE6d5Fe3Gn61kA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-context-menu@2.2.16':
     resolution: {integrity: sha512-O8morBEW+HsVG28gYDZPTrT9UUovQUlJue5YO836tiTJhuIWBm/zQHc7j388sHWtdH/xUZurK9olD2+pcqx5ww==}
     peerDependencies:
@@ -861,8 +871,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-context@1.2.0':
-    resolution: {integrity: sha512-fOE+JtN9rygNZkCnHRBEP0TAvLldlhyOxMsbwFvTP4nAs+nBmfnna+o/Zski2wkmY1YMrFC0aSzsHoLY47iLrg==}
+  '@radix-ui/react-context@1.2.2':
+    resolution: {integrity: sha512-RHCUGwKHDr0hDGg4X7ma4JG4/+12qxw8rkh5QKdDldlCvtja6nUx1Ef/8HVrJze81lEsgLQlqjzjGNHantgnQA==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -870,8 +880,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-dialog@1.1.19':
-    resolution: {integrity: sha512-+HhbN2+YtkRgVirjZ2afMeutQRuGOrdkWR5+EFC58SJojGmtyNQwYzgi6tHBpOxvFHefMtPeHdgtjz0BOGxFQg==}
+  '@radix-ui/react-dialog@1.1.23':
+    resolution: {integrity: sha512-Ksw4WeROkO4rC9k/onilX/Ao2Cr1ku1unMNH+XSCcP4jSXYu7HDsg9n4ojMjVb22XpYjAQ9qfrFlVbru1vXDUA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -892,8 +902,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-direction@1.1.2':
-    resolution: {integrity: sha512-C3vFhbyi4SW3PmbAi6Awpu4OzJtd0MxGurvSsYtr7p7nM8RNB3VAF3CUmnp2j50knpkrRcB7+ycVXzgLgF6yNA==}
+  '@radix-ui/react-direction@1.1.4':
+    resolution: {integrity: sha512-5pzg4FGQNpExhnhT2zlrP1wZFaYCd1K0nYWoFAdcYoYK868IEigqMX3B3f8yIoRlAhAeDWciLI6ZdCKHF9P4Vg==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -901,8 +911,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-dismissable-layer@1.1.15':
-    resolution: {integrity: sha512-b0XaRlzn2QKuo10XyNgi2DAJDf5XC9d1nD3FJcuvCjbR7+4Ad28zmZsLsqx+hvDEzMnRuZaZxZm9gYObV6RmRA==}
+  '@radix-ui/react-dismissable-layer@1.1.19':
+    resolution: {integrity: sha512-8g4pfOL9HoKKLWGiypT+dphVqjFfmcXO5GBnhsG6zI+lxAx/8feQpr+1LSN8Re3hiZ+XkLNS4O9ztK11/LzQ6w==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -914,8 +924,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-dropdown-menu@2.1.20':
-    resolution: {integrity: sha512-slfm+rRaZRuQBvHq60lXvSVUPhid0IPtjSZzIuUlWZMUs01iYZNlGS3mJgRD3ChLQVBAYlKiL/tFyWGX+dz8Xw==}
+  '@radix-ui/react-dropdown-menu@2.1.24':
+    resolution: {integrity: sha512-geq8l2rJkxvkXsT9RMgtUE3P8pITFpTsvYpbySi1IH4fZEABD/Gp85myayFgxk0ktljGMJnCbeFkyTusvSvv7g==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -936,8 +946,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-focus-guards@1.1.4':
-    resolution: {integrity: sha512-cot/aB/mOm0IYVYTTmQcEEK1M48lZWi8FlYe5nDPQQ8NYZUlXEFgncJ9p2Kzer3RKSrY7cTTpEMLZKNo9QoP5Q==}
+  '@radix-ui/react-focus-guards@1.1.6':
+    resolution: {integrity: sha512-RNOJjfZMTyBM6xYmV3IVGXkPjIhcBAuv48POevAXwrGJhkWZ9p1rFoIS1JFooPuT193AZmRsCPhpoVJxx6OPoQ==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -945,8 +955,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-focus-scope@1.1.12':
-    resolution: {integrity: sha512-jjk/lqTeNL0azUx5ZYzVrl4NgaDIrdzTNE4mABV9yBFI7FQqN7pIgzV1bTleUezP2QiTGA1BFTqY8MegDgWX9A==}
+  '@radix-ui/react-focus-scope@1.1.16':
+    resolution: {integrity: sha512-wmRZ2WWLvmt6KHy2rNPOdPUjwq5xOHY02+m+udwJTn0aNIox/rkskAvJTyTLGhPK6KgrUjlJUJpgmx/+wFiFIQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -980,8 +990,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-id@1.1.2':
-    resolution: {integrity: sha512-orBC88futVpqCmhX1p4cvquNHsELQ+w+vBJnuj3ftETI5bJb0bZn3Tqu3SWN2IOcPycTnMGnhwoermvISt72sA==}
+  '@radix-ui/react-id@1.1.4':
+    resolution: {integrity: sha512-TMQp2llA+RYn7JcjnrMnz7wN4pcVttPZnRZo52PLQsoLVKzNlVwUeHmfePgTgRluXFvlD3GD5g5MOVVTJCO0qA==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1002,8 +1012,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-menu@2.1.20':
-    resolution: {integrity: sha512-VsUrXxFe9d2ScbZF0fR/oPR1+qjyeLs5p0jzG8h90puMoA9bq4SirYlXbE+USRg9Q2qTeJSFNqjw2nts8jJe4w==}
+  '@radix-ui/react-menu@2.1.24':
+    resolution: {integrity: sha512-uW7RVuU6Lp/ZtfeY4b3kL32zccgEWvPv1+cf17ubYzHa9cL8AHokmk36cG/XEiH/smbQvumnieXX9j/e9RqJWA==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1015,8 +1025,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-popover@1.1.19':
-    resolution: {integrity: sha512-jkrTdQVxnIB8fpn0NyyxW9CTB5aCXZZelVz5z+Xmii6g5WxMqS3fInNslZ63puP39+Puu4jYohUK31y3dT87gQ==}
+  '@radix-ui/react-popover@1.1.23':
+    resolution: {integrity: sha512-mw58MrBlyHWFisTOYignD0vf/3gdcgAR+9of1s9G/38CbFiUwH1nCDkc0AUM9IrXFgN5Ue8n45j9WCgyM1sbiQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1041,8 +1051,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-popper@1.3.3':
-    resolution: {integrity: sha512-mS7dGpyjv6b+gsDjLF7e0ia1W4Im1B1hSCy2yuXlHuvnZxHKagfDaobt/KAKt27EpZMit2pss8eJBVyVjEWM+g==}
+  '@radix-ui/react-popper@1.3.7':
+    resolution: {integrity: sha512-UsJrrd7w4wuKKTdvd/DNERVlwSlUcyXzjhyDwBk+3aPOsCjOY6ZSbxuw8E6lZTjjfP8Cpd0J8VVkrYUWyGYXyg==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1054,8 +1064,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-portal@1.1.13':
-    resolution: {integrity: sha512-z3oXfmaHLJTF1wktbjgD6cn9jiEbq3WSondB10LIuIt2m2Ym4iJlrW04/euMwENDdWDdE7z+OuY7Qyp1YpRSwA==}
+  '@radix-ui/react-portal@1.1.17':
+    resolution: {integrity: sha512-vKQLcWypUnwZVvfV7UkGahH2g6ySe8M8R+zYBwPrv5byZ9QAW6cQVvNKo7GgmD+p8aYb6D9JBuvy8/WhOno2wQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1080,6 +1090,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-presence@1.1.10':
+    resolution: {integrity: sha512-3wyzCQ6+ubRA+D4uv9m95JYLXxmOHp05qjrkjeA7uKHHtjpPggQzc6DAb0URl7j67oR0K2foO4ip27TiX037Bw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-presence@1.1.5':
     resolution: {integrity: sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==}
     peerDependencies:
@@ -1093,8 +1116,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-presence@1.1.7':
-    resolution: {integrity: sha512-zBZ4QM5XG3JRanDmqXYf3MD6th4AFXFmgU6KNMFzUaV6F3uw9I5/zjMUvFriSEn5ewo1nxuibvyxJdmLlDcslA==}
+  '@radix-ui/react-primitive@2.1.10':
+    resolution: {integrity: sha512-MucOnzh6hR5mid6VpkbglRAMYMjKLqRnGBbjXkzjK52fuQDd1qbkx78a5P40mkcnVXJdEVxm26E9OPAiUq7nBg==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1132,19 +1155,6 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-primitive@2.1.7':
-    resolution: {integrity: sha512-bC3NiwsprbxKjuon9l7X6BUTw7FPVzEYaL92MPEY5SCd/9hUTPXVFtVwRix7778wtRsVao+zE062gL79FZleeQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-roving-focus@1.1.11':
     resolution: {integrity: sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==}
     peerDependencies:
@@ -1158,8 +1168,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-roving-focus@1.1.15':
-    resolution: {integrity: sha512-40svmmugfM3mUN7VUDGVE1tQGOhyi8enlGD0CNJEcMM36C1f71PKM21DFgNHUfem0XnA+d8H8oN3Z9ZpJjSslg==}
+  '@radix-ui/react-roving-focus@1.1.19':
+    resolution: {integrity: sha512-V9jI6hDjT7l3jsCQD9bLNvDLM3tH/gdbOTp7Tefp3hbbgCGQoK7tUvrWiRlcoBHIZ809ElXwNQwVo0B98LuTXQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1171,8 +1181,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-separator@1.1.11':
-    resolution: {integrity: sha512-jRhe86+8PF7VZ1u14eOWVOuh2BuAhALg/FT1VcMC4OHedMTRUazDnDlKTt+yxo5cRNKHMfmvZ4sSQtWDeMV4CQ==}
+  '@radix-ui/react-separator@1.1.15':
+    resolution: {integrity: sha512-jOLO4lssEzWpoDu7G+Ze4VjwMRUBt291pnZD0gmalREZipnTX3wadQo7Fy48GCTfe14/YRN6rw/rOJqrE85Wxw==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1202,8 +1212,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-slot@1.3.0':
-    resolution: {integrity: sha512-MojKku4U/miO8Av4Dkb+ctMAQx7JmY96LmtDQlAarCRtd7rN52QCSzBF+XAvr5S6coSVj9HEPBgHAHKEJVk/WA==}
+  '@radix-ui/react-slot@1.3.3':
+    resolution: {integrity: sha512-qx7oqnYbxnK9kYI9m317qmFmEgo6ywqWvbTogdj7cL9p3/yx4M48p7Rnw5z3H890cL/ow/EeWJsuTykeZVXP5Q==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1224,8 +1234,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-tabs@1.1.17':
-    resolution: {integrity: sha512-nRyXnrAVCwjeXcHbvEbLS6ndbTeKHG1RqCP4A8Gw5L4cemDzPXdD8rAmr6wet0v57R69wGvuIIsFjHSVkZiMzQ==}
+  '@radix-ui/react-tabs@1.1.21':
+    resolution: {integrity: sha512-UKxJlZid7FVtsk/WTxj4i4uSEgj2Au+KBbS7SQyTlzMhhn+86Cz3tISZdTa87bfEfcuvZezf2ZsxD4xuEKtkog==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1237,8 +1247,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-toggle@1.1.14':
-    resolution: {integrity: sha512-QI/hB65XKWACA66P64A+aHxtLUgHJeJLkaQa+awUNXT6T3swndtY5DojeHA+vldrTspMTtFBd7HfZ9QGbM1Qrw==}
+  '@radix-ui/react-toggle@1.1.18':
+    resolution: {integrity: sha512-7lonPlKfSacd20GlOBx2ltuVKz9oqWYZz+oMQyOltw6t1y2nyftj2ZmwwUHYn49kqfDWcp8dNZm5NgV+5Z+mug==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1250,8 +1260,8 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-tooltip@1.2.12':
-    resolution: {integrity: sha512-U3HoftgWnmla78vzQbLvKKb7bUYJxoiiqYFzp1wu/TBMyDqMZSuCl3aRICsD6EfVEwcJD2mumGDGUXLFVqQHKA==}
+  '@radix-ui/react-tooltip@1.2.16':
+    resolution: {integrity: sha512-6EamKFRRnlpdadndbZ6LMwycfwkwPte1B42hs6QA0gYhjaOKqW4PZ4pjaW9UrlDX5eVt/OjncE7BFTPL5nmZhg==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1281,6 +1291,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-use-callback-ref@1.1.4':
+    resolution: {integrity: sha512-R6OUY2e2fA6Yn6s+VSx5KBV6Nx8LQEhu+cz7LCej18rQ1HLyg9PSC9jP/ZNx0o6FAIK9c0F1kHylzSxKsdlkrQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-use-controllable-state@1.2.2':
     resolution: {integrity: sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==}
     peerDependencies:
@@ -1290,8 +1309,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-use-controllable-state@1.2.3':
-    resolution: {integrity: sha512-PLzC90MS+ReootmjC597dvopoelpZ8Q61HJkDXZSExitIq7PL55vHNnesAHwguHK0aPfBnpdNzQtv1uliaqQrA==}
+  '@radix-ui/react-use-controllable-state@1.2.6':
+    resolution: {integrity: sha512-uEQJGT97ZA/TgP/Hydw47lHu+/vQj6z/0jA+WeTbK1o9Rx45GImjpD0tc3W5ad3D6XTSR6e1yEO0FvGq6WQfVQ==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1308,8 +1327,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-use-effect-event@0.0.3':
-    resolution: {integrity: sha512-6c8ZqvPTWILEKnyVkP53EGRCcpnJiKTC21sS/6R1GF5xKyHJJWQEPfkqlcgUkdRQivd6tb23abUwe4ngWmY0JA==}
+  '@radix-ui/react-use-effect-event@0.0.5':
+    resolution: {integrity: sha512-7cshFL8HGS/7HEiHH+9kL9HBwp2sa9yX18Knwek6KYWmXwM7pegMgta2AXMQKI+rq3JnfSj9x8wYqFMTdG1Jgg==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1326,6 +1345,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-use-is-hydrated@0.1.3':
+    resolution: {integrity: sha512-umO/aJ+82CpOnhDZUTbILCQf7kU/g0iv+oGs/Q8jw7IkhWBzaEP4sA268PhFAJTFetbwp3ICc6ktpI4TqtxcIw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-use-layout-effect@1.1.1':
     resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==}
     peerDependencies:
@@ -1344,8 +1372,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-use-previous@1.1.1':
-    resolution: {integrity: sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==}
+  '@radix-ui/react-use-layout-effect@1.1.4':
+    resolution: {integrity: sha512-K20DkRkUwDnxEYMBPcg3Y6voLkEy5p5QQmszZgLngKKiC7dzBR/aEuK3w1qlx2JWDUNH6FluahYdgR3BP+QbYw==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1353,8 +1381,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-use-previous@1.1.2':
-    resolution: {integrity: sha512-IGBQPtRFdhN6MQ8dbegVmBq1LVZluya3F1jWY+puIcQC3MHctRwTDSBWCkL/3ZcnMJLTMJ++Z+ktmvg0F89iCw==}
+  '@radix-ui/react-use-previous@1.1.1':
+    resolution: {integrity: sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1371,8 +1399,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-use-rect@1.1.2':
-    resolution: {integrity: sha512-d8a+bBY/FxikNPlgJJoaBHZX+zKVbWHYJGTLnLvveQgFSTntkGdEKv3JDtHrMS0DNYpllz2nRsTLGLKYttbpmw==}
+  '@radix-ui/react-use-rect@1.1.4':
+    resolution: {integrity: sha512-cSOCh6JlkmfjLyNcLiu2nB4v+nm+dkZ+Q5KHWk/soo4U7ZLiEQFKHK9/YmtBHjfCEaU43IBKQOc4/uJmCaiCTQ==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1389,8 +1417,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-use-size@1.1.2':
-    resolution: {integrity: sha512-giWQp+4mxjBPt4KZ0MmyuykFNWfbDxKt4x+fPkRYmgRFJSbCZFzUglvMb/Kjn38tm10YP4ufiQZDx3zna4LU6w==}
+  '@radix-ui/react-use-size@1.1.4':
+    resolution: {integrity: sha512-D3anSY15EJoxrihpsXI6SMrmmonnQtR2ni7arO+Lfdg3O95b9hNXxONk8jA5C8ANdF/h5HMAxejgs8PWJ6rlhw==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1398,8 +1426,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-visually-hidden@1.2.7':
-    resolution: {integrity: sha512-1wNZBggTDK3GRuuQ6nP4k2yi7a6l7I5qbMPbZcRsrGsGVead/f/d5FhEzUvqFs0bcrDLx7n1zKQ3JvLR6whaaw==}
+  '@radix-ui/react-visually-hidden@1.2.11':
+    resolution: {integrity: sha512-NFS86RYYZb4/exihaESBGOpMJFz8MGLAfu3mOBSGByVnVPC9JPASfYubxd/8KbkQK0sYAv8lVQDEQukDX/qXvQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -1414,8 +1442,8 @@ packages:
   '@radix-ui/rect@1.1.1':
     resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==}
 
-  '@radix-ui/rect@1.1.2':
-    resolution: {integrity: sha512-xnXE7wG13PI+cxieVssYXlQJuYVRhH9NBoxt3KNwzghDIA69GMm7d4wXRouHIYjE+KvS6U/MsMO73NdS2MH9ZA==}
+  '@radix-ui/rect@1.1.3':
+    resolution: {integrity: sha512-JtyZR+mqgBibTo8xea3B6ZRmzZiM/YeVBtUkas6zMuXjAlfIFIW2FgqeM9eLyvEaYX66vr6DJMK+4U6LV0KhNw==}
 
   '@rolldown/binding-android-arm64@1.0.3':
     resolution: {integrity: sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw==}
@@ -1680,8 +1708,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.6':
-    resolution: {integrity: sha512-4+Uq8m0/gzO4kMCHUEpTtGX1RnONK0C+g88b2ltwPMWUBiaVarBuWKoPJaz7gj1cKCVRAdyu+U8GcKhwCc2beA==}
+  '@tanstack/react-virtual@3.14.8':
+    resolution: {integrity: sha512-O39GJQpAYEJcIu3uN1//YtmhjSEOyw75vg9CKCatBDPiD5hKtZQoJHfferyrB/LdOD3UWaoMLWtdEjarwIwdDw==}
     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
@@ -1722,8 +1750,8 @@ packages:
   '@tanstack/store@0.9.3':
     resolution: {integrity: sha512-8reSzl/qGWGGVKhBoxXPMWzATSbZLZFWhwBAFO9NAyp0TxzfBP0mIrGb8CP8KrQTmvzXlR/vFPPUrHTLBGyFyw==}
 
-  '@tanstack/virtual-core@3.17.4':
-    resolution: {integrity: sha512-nGm5KteqxasUdThLc2izl6dHUqLv0LQj7Nuyo5gYalTPf/U8a9ermvsl7reT+6ioBW1l8WfpP/mcU338nLXpqw==}
+  '@tanstack/virtual-core@3.17.6':
+    resolution: {integrity: sha512-h0/Ebo18CkOrChlQIhNtQkM5ySUnh/GumQ/D1st3hG2HWUPEF+ILUc2k29UtivCi/9G7w7G3/f7Xyd5cCFbKBw==}
 
   '@tanstack/virtual-file-routes@1.162.0':
     resolution: {integrity: sha512-uhOeFyxLcU41HzvrxsGpiWdcMbScY1EDgbZ5K7DVRMYInbLYWAC0EA/kx9wXAoSM8q82bUG2hRl8+EAjE6XAbA==}
@@ -2729,8 +2757,8 @@ packages:
     resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==}
     engines: {node: '>= 12.0.0'}
 
-  linkify-it@5.0.0:
-    resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==}
+  linkify-it@5.0.2:
+    resolution: {integrity: sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==}
 
   linkifyjs@4.3.2:
     resolution: {integrity: sha512-NT1CJtq3hHIreOianA8aSXn6Cw0JzYOuDQbOrSPe7gqFnCpKP++MQe3ODgO3oh2GJFORkAAdqredOa60z63GbA==}
@@ -3140,10 +3168,10 @@ packages:
     peerDependencies:
       react: '>=16.14.0'
 
-  react-dom@19.2.7:
-    resolution: {integrity: sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==}
+  react-dom@19.2.8:
+    resolution: {integrity: sha512-rVprimfGBG3DR+Tq0IQG2DT5PxKth1WIGDmj5yPmlzr4YBe7uyE+Du4oVqTDXZSHGGGXRtTJEGSSePyQCMBglQ==}
     peerDependencies:
-      react: ^19.2.7
+      react: ^19.2.8
 
   react-is@17.0.2:
     resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
@@ -3184,8 +3212,8 @@ packages:
       '@types/react':
         optional: true
 
-  react@19.2.7:
-    resolution: {integrity: sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==}
+  react@19.2.8:
+    resolution: {integrity: sha512-PWaYA1L/q9u2u7xYQi+Y3L3Yfnie7XyLeaJICV1MGD6LprsBxcAqGjYyr0eY3p+QdsA+x/Irkt4Qif8D63+Sbw==}
     engines: {node: '>=0.10.0'}
 
   readable-stream@4.7.0:
@@ -3889,29 +3917,29 @@ snapshots:
 
   '@csstools/css-tokenizer@4.0.0': {}
 
-  '@dnd-kit/accessibility@3.1.1(react@19.2.7)':
+  '@dnd-kit/accessibility@3.1.1(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
       tslib: 2.8.1
 
-  '@dnd-kit/core@6.3.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@dnd-kit/core@6.3.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@dnd-kit/accessibility': 3.1.1(react@19.2.7)
-      '@dnd-kit/utilities': 3.2.2(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@dnd-kit/accessibility': 3.1.1(react@19.2.8)
+      '@dnd-kit/utilities': 3.2.2(react@19.2.8)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
       tslib: 2.8.1
 
-  '@dnd-kit/sortable@10.0.0(@dnd-kit/core@6.3.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(react@19.2.7)':
+  '@dnd-kit/sortable@10.0.0(@dnd-kit/core@6.3.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@dnd-kit/core': 6.3.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@dnd-kit/utilities': 3.2.2(react@19.2.7)
-      react: 19.2.7
+      '@dnd-kit/core': 6.3.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
+      '@dnd-kit/utilities': 3.2.2(react@19.2.8)
+      react: 19.2.8
       tslib: 2.8.1
 
-  '@dnd-kit/utilities@3.2.2(react@19.2.7)':
+  '@dnd-kit/utilities@3.2.2(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
       tslib: 2.8.1
 
   '@emnapi/core@1.10.0':
@@ -3932,10 +3960,10 @@ snapshots:
 
   '@emoji-mart/data@1.2.1': {}
 
-  '@emoji-mart/react@1.1.1(emoji-mart@5.6.0)(react@19.2.7)':
+  '@emoji-mart/react@1.1.1(emoji-mart@5.6.0)(react@19.2.8)':
     dependencies:
       emoji-mart: 5.6.0
-      react: 19.2.7
+      react: 19.2.8
 
   '@exodus/bytes@1.15.1(@noble/hashes@2.2.0)':
     optionalDependencies:
@@ -3950,11 +3978,11 @@ snapshots:
       '@floating-ui/core': 1.8.0
       '@floating-ui/utils': 0.2.12
 
-  '@floating-ui/react-dom@2.1.9(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@floating-ui/react-dom@2.1.9(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@floating-ui/dom': 1.8.0
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
   '@floating-ui/utils@0.2.12': {}
 
@@ -4015,663 +4043,683 @@ snapshots:
 
   '@radix-ui/primitive@1.1.3': {}
 
-  '@radix-ui/primitive@1.1.5': {}
+  '@radix-ui/primitive@1.1.7': {}
 
-  '@radix-ui/react-alert-dialog@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dialog': 1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-arrow@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.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)
+      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)
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     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.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-context': 1.1.4(@types/react@19.2.17)(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-checkbox@1.3.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-previous': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-collection@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.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)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.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-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)
+      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)
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-compose-refs@1.1.3(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-compose-refs@1.1.3(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@radix-ui/react-compose-refs@1.1.5(@types/react@19.2.17)(react@19.2.8)':
+    dependencies:
+      react: 19.2.8
+    optionalDependencies:
+      '@types/react': 19.2.17
+
+  '@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)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-context@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-context@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-context@1.1.4(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-context@1.1.4(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-context@1.2.0(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-context@1.2.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-dialog@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
+      '@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)
       aria-hidden: 1.2.6
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.7)
+      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)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-direction@1.1.1(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-direction@1.1.1(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-direction@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-direction@1.1.4(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-dismissable-layer@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-dropdown-menu@2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-menu': 2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-focus-guards@1.1.4(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-focus-guards@1.1.6(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-focus-scope@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.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)
+      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)
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-id@1.1.1(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-id@1.1.1(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-id@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-id@1.1.4(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.17)(react@19.2.7)
+      '@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)
       aria-hidden: 1.2.6
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.7)
+      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)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-menu@2.1.20(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
+      '@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)
       aria-hidden: 1.2.6
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.7)
+      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)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@radix-ui/react-popover@1.1.19(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-focus-guards': 1.1.4(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-focus-scope': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
+      '@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)
       aria-hidden: 1.2.6
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      react-remove-scroll: 2.7.2(@types/react@19.2.17)(react@19.2.7)
+      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)
     optionalDependencies:
       '@types/react': 19.2.17
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@floating-ui/react-dom': 2.1.9(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-rect': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.17)(react@19.2.7)
+      '@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/rect': 1.1.1
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      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)
 
-  '@radix-ui/react-popper@1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@floating-ui/react-dom': 2.1.9(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-arrow': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-rect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-size': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/rect': 1.1.2
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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/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)
 
-  '@radix-ui/react-portal@1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.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-layout-effect': 1.1.4(@types/react@19.2.17)(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)
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(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)
 
-  '@radix-ui/react-presence@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@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.7(react@19.2.7))(react@19.2.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)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-slot': 1.3.3(@types/react@19.2.17)(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)
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.5(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.17)(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)
 
-  '@radix-ui/react-primitive@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@radix-ui/react-slot': 1.2.5(@types/react@19.2.17)(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)
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-roving-focus@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-collection': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-callback-ref': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-is-hydrated': 0.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-separator@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.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)
+      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)
 
-  '@radix-ui/react-slot@1.2.3(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-slot@1.2.3(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-slot@1.2.5(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-slot@1.2.5(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-slot@1.3.0(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-slot@1.3.3(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-compose-refs': 1.1.5(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@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.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-tabs@1.1.17(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-direction': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-roving-focus': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-toggle@1.1.14(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-tooltip@1.2.12(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/primitive': 1.1.5
-      '@radix-ui/react-compose-refs': 1.1.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-context': 1.2.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-dismissable-layer': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-id': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-popper': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-portal': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-presence': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      '@radix-ui/react-slot': 1.3.0(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-controllable-state': 1.2.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-visually-hidden': 1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@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)
+      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)
 
-  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-callback-ref@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-callback-ref@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-callback-ref@1.1.4(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-controllable-state@1.2.3(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-effect-event': 0.0.3(@types/react@19.2.17)(react@19.2.7)
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@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)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-controllable-state@1.2.6(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@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)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-effect-event@0.0.3(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-is-hydrated@0.1.1(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-effect-event@0.0.5(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-is-hydrated@0.1.1(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-layout-effect@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-is-hydrated@0.1.3(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-previous@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-layout-effect@1.1.2(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-layout-effect@1.1.4(@types/react@19.2.17)(react@19.2.8)':
+    dependencies:
+      react: 19.2.8
+    optionalDependencies:
+      '@types/react': 19.2.17
+
+  '@radix-ui/react-use-previous@1.1.1(@types/react@19.2.17)(react@19.2.8)':
+    dependencies:
+      react: 19.2.8
+    optionalDependencies:
+      '@types/react': 19.2.17
+
+  '@radix-ui/react-use-rect@1.1.1(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
       '@radix-ui/rect': 1.1.1
-      react: 19.2.7
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-rect@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-rect@1.1.4(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/rect': 1.1.2
-      react: 19.2.7
+      '@radix-ui/rect': 1.1.3
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-size@1.1.1(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-size@1.1.1(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-use-size@1.1.2(@types/react@19.2.17)(react@19.2.7)':
+  '@radix-ui/react-use-size@1.1.4(@types/react@19.2.17)(react@19.2.8)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.2(@types/react@19.2.17)(react@19.2.7)
-      react: 19.2.7
+      '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@19.2.17)(react@19.2.8)
+      react: 19.2.8
     optionalDependencies:
       '@types/react': 19.2.17
 
-  '@radix-ui/react-visually-hidden@1.2.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.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)
+      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)
 
   '@radix-ui/rect@1.1.1': {}
 
-  '@radix-ui/rect@1.1.2': {}
+  '@radix-ui/rect@1.1.3': {}
 
   '@rolldown/binding-android-arm64@1.0.3':
     optional: true
@@ -4857,32 +4905,32 @@ snapshots:
 
   '@tanstack/query-core@5.100.14': {}
 
-  '@tanstack/react-query@5.100.14(react@19.2.7)':
+  '@tanstack/react-query@5.100.14(react@19.2.8)':
     dependencies:
       '@tanstack/query-core': 5.100.14
-      react: 19.2.7
+      react: 19.2.8
 
-  '@tanstack/react-router@1.170.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@tanstack/react-router@1.170.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@tanstack/history': 1.162.0
-      '@tanstack/react-store': 0.9.3(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      '@tanstack/react-store': 0.9.3(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       '@tanstack/router-core': 1.171.5
       isbot: 5.1.40
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
-  '@tanstack/react-store@0.9.3(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@tanstack/react-store@0.9.3(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
       '@tanstack/store': 0.9.3
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      use-sync-external-store: 1.6.0(react@19.2.7)
+      react: 19.2.8
+      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.6(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+  '@tanstack/react-virtual@3.14.8(react-dom@19.2.8(react@19.2.8))(react@19.2.8)':
     dependencies:
-      '@tanstack/virtual-core': 3.17.4
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      '@tanstack/virtual-core': 3.17.6
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
   '@tanstack/router-core@1.171.5':
     dependencies:
@@ -4904,7 +4952,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/router-plugin@1.168.10(@tanstack/react-router@1.170.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))':
+  '@tanstack/router-plugin@1.168.10(@tanstack/react-router@1.170.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0))':
     dependencies:
       '@babel/core': 7.29.0
       '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0)
@@ -4920,7 +4968,7 @@ snapshots:
       unplugin: 3.0.0
       zod: 4.4.3
     optionalDependencies:
-      '@tanstack/react-router': 1.170.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      '@tanstack/react-router': 1.170.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       vite: 8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0)
     transitivePeerDependencies:
       - supports-color
@@ -4941,7 +4989,7 @@ snapshots:
 
   '@tanstack/store@0.9.3': {}
 
-  '@tanstack/virtual-core@3.17.4': {}
+  '@tanstack/virtual-core@3.17.6': {}
 
   '@tanstack/virtual-file-routes@1.162.0': {}
 
@@ -5030,12 +5078,12 @@ 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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
       '@babel/runtime': 7.29.7
       '@testing-library/dom': 10.4.1
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      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)
@@ -5171,7 +5219,7 @@ 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.7(react@19.2.7))(react@19.2.7)':
+  '@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)':
     dependencies:
       '@tiptap/core': 3.22.5(@tiptap/pm@3.22.5)
       '@tiptap/pm': 3.22.5
@@ -5179,9 +5227,9 @@ snapshots:
       '@types/react-dom': 19.2.3(@types/react@19.2.17)
       '@types/use-sync-external-store': 0.0.6
       fast-equals: 5.4.0
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-      use-sync-external-store: 1.6.0(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
+      use-sync-external-store: 1.6.0(react@19.2.8)
     optionalDependencies:
       '@tiptap/extension-bubble-menu': 3.22.5(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)
       '@tiptap/extension-floating-menu': 3.22.5(@floating-ui/dom@1.8.0)(@tiptap/core@3.22.5(@tiptap/pm@3.22.5))(@tiptap/pm@3.22.5)
@@ -5547,11 +5595,11 @@ snapshots:
 
   electron-to-chromium@1.5.361: {}
 
-  embla-carousel-react@8.6.0(react@19.2.7):
+  embla-carousel-react@8.6.0(react@19.2.8):
     dependencies:
       embla-carousel: 8.6.0
       embla-carousel-reactive-utils: 8.6.0(embla-carousel@8.6.0)
-      react: 19.2.7
+      react: 19.2.8
 
   embla-carousel-reactive-utils@8.6.0(embla-carousel@8.6.0):
     dependencies:
@@ -5621,14 +5669,14 @@ snapshots:
     dependencies:
       is-callable: 1.2.7
 
-  framer-motion@12.40.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  framer-motion@12.40.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
       motion-dom: 12.40.0
       motion-utils: 12.39.0
       tslib: 2.8.1
     optionalDependencies:
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
   fsevents@2.3.2:
     optional: true
@@ -5892,7 +5940,7 @@ snapshots:
       lightningcss-win32-arm64-msvc: 1.32.0
       lightningcss-win32-x64-msvc: 1.32.0
 
-  linkify-it@5.0.0:
+  linkify-it@5.0.2:
     dependencies:
       uc.micro: 2.1.0
 
@@ -5916,9 +5964,9 @@ snapshots:
     dependencies:
       yallist: 3.1.1
 
-  lucide-react@1.16.0(react@19.2.7):
+  lucide-react@1.16.0(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
 
   lz-string@1.5.0: {}
 
@@ -5932,7 +5980,7 @@ snapshots:
     dependencies:
       argparse: 2.0.1
       entities: 4.5.0
-      linkify-it: 5.0.0
+      linkify-it: 5.0.2
       mdurl: 2.0.0
       punycode.js: 2.3.1
       uc.micro: 2.1.0
@@ -6310,13 +6358,13 @@ snapshots:
 
   motion-utils@12.39.0: {}
 
-  motion@12.40.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  motion@12.40.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
-      framer-motion: 12.40.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      framer-motion: 12.40.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       tslib: 2.8.1
     optionalDependencies:
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
   ms@2.1.3: {}
 
@@ -6506,9 +6554,9 @@ snapshots:
 
   punycode@2.3.1: {}
 
-  qrcode.react@4.2.0(react@19.2.7):
+  qrcode.react@4.2.0(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
 
   qrcode@1.5.4:
     dependencies:
@@ -6516,24 +6564,24 @@ snapshots:
       pngjs: 5.0.0
       yargs: 15.4.1
 
-  react-diff-view@3.3.3(react@19.2.7):
+  react-diff-view@3.3.3(react@19.2.8):
     dependencies:
       classnames: 2.5.1
       diff-match-patch: 1.0.5
       gitdiff-parser: 0.3.1
       lodash: 4.18.1
-      react: 19.2.7
+      react: 19.2.8
       shallow-equal: 3.1.0
       warning: 4.0.3
 
-  react-dom@19.2.7(react@19.2.7):
+  react-dom@19.2.8(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
       scheduler: 0.27.0
 
   react-is@17.0.2: {}
 
-  react-markdown@10.1.0(@types/react@19.2.17)(react@19.2.7):
+  react-markdown@10.1.0(@types/react@19.2.17)(react@19.2.8):
     dependencies:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
@@ -6542,7 +6590,7 @@ snapshots:
       hast-util-to-jsx-runtime: 2.3.6
       html-url-attributes: 3.0.1
       mdast-util-to-hast: 13.2.1
-      react: 19.2.7
+      react: 19.2.8
       remark-parse: 11.0.0
       remark-rehype: 11.1.2
       unified: 11.0.5
@@ -6551,34 +6599,34 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  react-remove-scroll-bar@2.3.8(@types/react@19.2.17)(react@19.2.7):
+  react-remove-scroll-bar@2.3.8(@types/react@19.2.17)(react@19.2.8):
     dependencies:
-      react: 19.2.7
-      react-style-singleton: 2.2.3(@types/react@19.2.17)(react@19.2.7)
+      react: 19.2.8
+      react-style-singleton: 2.2.3(@types/react@19.2.17)(react@19.2.8)
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.17
 
-  react-remove-scroll@2.7.2(@types/react@19.2.17)(react@19.2.7):
+  react-remove-scroll@2.7.2(@types/react@19.2.17)(react@19.2.8):
     dependencies:
-      react: 19.2.7
-      react-remove-scroll-bar: 2.3.8(@types/react@19.2.17)(react@19.2.7)
-      react-style-singleton: 2.2.3(@types/react@19.2.17)(react@19.2.7)
+      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)
       tslib: 2.8.1
-      use-callback-ref: 1.3.3(@types/react@19.2.17)(react@19.2.7)
-      use-sidecar: 1.1.3(@types/react@19.2.17)(react@19.2.7)
+      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)
     optionalDependencies:
       '@types/react': 19.2.17
 
-  react-style-singleton@2.2.3(@types/react@19.2.17)(react@19.2.7):
+  react-style-singleton@2.2.3(@types/react@19.2.17)(react@19.2.8):
     dependencies:
       get-nonce: 1.0.1
-      react: 19.2.7
+      react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.17
 
-  react@19.2.7: {}
+  react@19.2.8: {}
 
   readable-stream@4.7.0:
     dependencies:
@@ -6730,10 +6778,10 @@ snapshots:
       once: 1.4.0
       simple-concat: 1.0.1
 
-  sonner@2.0.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  sonner@2.0.7(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     dependencies:
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
   source-map-js@1.2.1: {}
 
@@ -6895,24 +6943,24 @@ snapshots:
     dependencies:
       pako: 1.0.11
 
-  use-callback-ref@1.3.3(@types/react@19.2.17)(react@19.2.7):
+  use-callback-ref@1.3.3(@types/react@19.2.17)(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.17
 
-  use-sidecar@1.1.3(@types/react@19.2.17)(react@19.2.7):
+  use-sidecar@1.1.3(@types/react@19.2.17)(react@19.2.8):
     dependencies:
       detect-node-es: 1.1.0
-      react: 19.2.7
+      react: 19.2.8
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.17
 
-  use-sync-external-store@1.6.0(react@19.2.7):
+  use-sync-external-store@1.6.0(react@19.2.8):
     dependencies:
-      react: 19.2.7
+      react: 19.2.8
 
   util-deprecate@1.0.2: {}
 
@@ -6926,10 +6974,10 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  virtua@0.49.3(patch_hash=acef47b2cfcb8bfd36668c30a16f918fe492eb07a1ddeafc8cc3a22a3efbf71b)(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+  virtua@0.49.3(patch_hash=30a7a92b94800ec37be8d36546ea98c04a05dcd0637f9fac27a06f016ba2eff4)(react-dom@19.2.8(react@19.2.8))(react@19.2.8):
     optionalDependencies:
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
+      react: 19.2.8
+      react-dom: 19.2.8(react@19.2.8)
 
   vite@8.0.16(@types/node@25.6.0)(jiti@2.7.0)(yaml@2.9.0):
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 44e39738e0..be122c50ce 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -11,7 +11,13 @@ overrides:
   # so a modal menu opening a modal dialog left `pointer-events: none` stuck on
   # <body> when the dialog closed, freezing the app (#1482, reminder dialog).
   # Removable once every @radix-ui dep converges on one version naturally.
-  "@radix-ui/react-dismissable-layer": 1.1.15
+  "@radix-ui/react-dismissable-layer": 1.1.19
+  # linkify-it 5.0.0 (pulled in via markdown-it / tiptap-markdown) is affected
+  # by GHSA-22p9-wv53-3rq4 and GHSA-v245-v573-v5vm: crafted link/mailto-heavy
+  # text drives quadratic parsing and can freeze the renderer thread. Fixed in
+  # 5.0.1 / 5.0.2 respectively; pin >=5.0.2 to cover both. Removable once
+  # markdown-it resolves linkify-it >=5.0.2 on its own.
+  linkify-it: "^5.0.2"
 patchedDependencies:
   isomorphic-git: patches/isomorphic-git.patch
   virtua@0.49.3: patches/virtua@0.49.3.patch
diff --git a/preview-features.json b/preview-features.json
index ad8090d5ad..388f1c39b0 100644
--- a/preview-features.json
+++ b/preview-features.json
@@ -5,41 +5,31 @@
       "id": "workflows",
       "name": "Workflows",
       "description": "YAML-defined automations with approval gates",
-      "platforms": [
-        "desktop"
-      ]
+      "platforms": ["desktop"]
     },
     {
       "id": "projects",
       "name": "Projects",
       "description": "Git repository browser and collaboration",
-      "platforms": [
-        "desktop"
-      ]
+      "platforms": ["desktop"]
     },
     {
       "id": "pulse",
       "name": "Pulse",
       "description": "Activity feed with notes, social posts, and agent activity",
-      "platforms": [
-        "desktop"
-      ]
+      "platforms": ["desktop"]
     },
     {
       "id": "forum",
       "name": "Forum Channels",
       "description": "Forum-style threaded channels for long-form discussions",
-      "platforms": [
-        "desktop"
-      ]
+      "platforms": ["desktop"]
     },
     {
       "id": "agentManagedProfiles",
       "name": "Agent-managed profiles",
       "description": "Let agents manage their own relay name and avatar instead of restoring the desktop copy",
-      "platforms": [
-        "desktop"
-      ]
+      "platforms": ["desktop"]
     }
   ]
 }
diff --git a/schema/schema.sql b/schema/schema.sql
index 1fd13941be..f5f32cc3e3 100644
--- a/schema/schema.sql
+++ b/schema/schema.sql
@@ -572,6 +572,43 @@ CREATE TABLE relay_members (
 
 CREATE INDEX idx_relay_members_role ON relay_members (community_id, role);
 
+-- ── Join policy acceptances ──────────────────────────────────────────────────
+-- Durable evidence of the policy version accepted when an invite claim grants
+-- relay membership. The composite foreign key keeps evidence bound to a live
+-- member in the same community and removes it with that membership.
+
+CREATE TABLE join_policy_acceptances (
+    community_id UUID NOT NULL,
+    pubkey TEXT NOT NULL,
+    policy_version TEXT NOT NULL CHECK (length(policy_version) = 64),
+    accepted_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    PRIMARY KEY (community_id, pubkey, policy_version),
+    FOREIGN KEY (community_id, pubkey)
+        REFERENCES relay_members (community_id, pubkey) ON DELETE CASCADE
+);
+
+-- ── Relay invites (use-limited invite links) ──────────────────────────────────
+-- Conformance: durable invite records for atomic redemption, community-scoped.
+-- Stores only SHA-256(code) as 32-byte BYTEA; never the reusable bearer code.
+-- PK and UNIQUE both lead with community_id. max_uses NULL = unlimited.
+
+CREATE TABLE relay_invites (
+    community_id  UUID        NOT NULL REFERENCES communities(id),
+    id           UUID        NOT NULL DEFAULT gen_random_uuid(),
+    token_hash   BYTEA       NOT NULL CHECK (length(token_hash) = 32),
+    role         TEXT        NOT NULL DEFAULT 'member' CHECK (role = 'member'),
+    max_uses     INTEGER     CHECK (max_uses BETWEEN 1 AND 10000),
+    use_count    INTEGER     NOT NULL DEFAULT 0 CHECK (use_count >= 0),
+    expires_at   TIMESTAMPTZ NOT NULL,
+    created_by   TEXT        NOT NULL,
+    created_at   TIMESTAMPTZ NOT NULL DEFAULT now(),
+    PRIMARY KEY (community_id, id),
+    UNIQUE (community_id, token_hash),
+    CHECK (max_uses IS NULL OR use_count <= max_uses)
+);
+
+CREATE INDEX relay_invites_expires_at_idx ON relay_invites (expires_at);
+
 -- ── Archived identities (NIP-IA) ──────────────────────────────────────────────
 -- Conformance: archive cannot hide a key in another community. PK scoped.
 
diff --git a/scripts/bundle-sidecars.sh b/scripts/bundle-sidecars.sh
index be37cbce0d..07de477405 100755
--- a/scripts/bundle-sidecars.sh
+++ b/scripts/bundle-sidecars.sh
@@ -35,6 +35,14 @@ fi
 
 mkdir -p "$BINARIES_DIR"
 for bin in "${SIDECARS[@]}"; do
-    cp "$SRC_DIR/${bin}${EXE}" "$BINARIES_DIR/${bin}-${TARGET}${EXE}"
+    destination="$BINARIES_DIR/${bin}-${TARGET}${EXE}"
+    cp "$SRC_DIR/${bin}${EXE}" "$destination"
+
+    # cp preserves the mode of an existing destination on macOS. Generated
+    # sidecar placeholders may not be executable, so make the bundled Unix
+    # binaries executable explicitly.
+    if [[ -z "$EXE" ]]; then
+        chmod 755 "$destination"
+    fi
 done
 echo "Sidecars bundled for $TARGET"
diff --git a/scripts/check-file-sizes-core.mjs b/scripts/check-file-sizes-core.mjs
index 196630ee7e..1365424628 100644
--- a/scripts/check-file-sizes-core.mjs
+++ b/scripts/check-file-sizes-core.mjs
@@ -1,105 +1,174 @@
+import { execFileSync } from "node:child_process";
 import { promises as fs } from "node:fs";
 import path from "node:path";
 
-/**
- * Shared file-size check used by the desktop and web workspaces.
- *
- * Each app supplies its own `rules` (which roots/extensions to scan) and an
- * optional `overrides` map of TEMP per-file ceilings. Everything else — the
- * walk, the line count, the violation report, the non-zero exit — lives here so
- * the two apps can never drift.
- */
-
-async function walkFiles(directory) {
-  const entries = await fs.readdir(directory, { withFileTypes: true });
-  const files = await Promise.all(
-    entries.map(async (entry) => {
-      const fullPath = path.join(directory, entry.name);
-      if (entry.isDirectory()) {
-        return walkFiles(fullPath);
-      }
-
-      return [fullPath];
-    }),
-  );
-
-  return files.flat();
-}
-
-function findRule(rules, relativePath) {
-  return rules.find((rule) => {
-    const normalizedRoot = `${rule.root}${path.sep}`;
-    return relativePath.startsWith(normalizedRoot);
+function git(args, cwd, options = {}) {
+  return execFileSync("git", args, {
+    cwd,
+    encoding: "utf8",
+    maxBuffer: 10 * 1024 * 1024,
+    ...options,
   });
 }
 
-function countLines(content) {
+function toPosixPath(relativePath) {
+  return relativePath.split(path.sep).join("/");
+}
+
+export function countLines(content) {
   if (content.length === 0) {
     return 0;
   }
-
   return content.split(/\r?\n/).length;
 }
 
-/**
- * @param {object} options
- * @param {string} options.projectRoot Absolute path the rule roots resolve against.
- * @param {Array<{root: string, extensions: Set<string>, maxLines: number}>} options.rules
- * @param {string} options.label Human label for the failure header (e.g. "Desktop").
- * @param {Map<string, number>} [options.overrides] TEMP per-file ceilings, keyed by path relative to projectRoot.
- * @param {string} options.scriptPath Path mentioned in the failure hint where overrides live.
- */
-export async function runFileSizeCheck({
-  projectRoot,
-  rules,
-  label,
-  overrides = new Map(),
-  scriptPath,
-}) {
-  const candidateFiles = (
-    await Promise.all(
-      rules.map((rule) => {
-        const dir = path.join(projectRoot, rule.root);
-        return fs
-          .access(dir)
-          .then(() => walkFiles(dir))
-          .catch(() => []);
-      }),
-    )
-  ).flat();
+export function allowedLineCount(baseLines, maxLines) {
+  return baseLines == null || baseLines <= maxLines ? maxLines : baseLines;
+}
 
-  const violations = [];
+export function evaluateFileSize({ baseLines, candidateLines, maxLines }) {
+  const limit = allowedLineCount(baseLines, maxLines);
+  return { limit, violates: candidateLines > limit };
+}
 
-  for (const filePath of candidateFiles) {
-    const relativePath = path.relative(projectRoot, filePath);
-    const rule = findRule(rules, relativePath);
-    if (!rule) {
-      continue;
-    }
+function findRule(rules, relativePath) {
+  return rules.find((rule) => relativePath.startsWith(`${rule.root}/`));
+}
 
-    const extension = path.extname(relativePath);
-    if (!rule.extensions.has(extension)) {
-      continue;
-    }
-
-    const limit = overrides.get(relativePath) ?? rule.maxLines;
-    const content = await fs.readFile(filePath, "utf8");
-    const lineCount = countLines(content);
-    if (lineCount > limit) {
-      violations.push({ limit, lineCount, relativePath });
-    }
+export function resolveBaseRef(repoRoot, env = process.env) {
+  if (env.CHECK_FILE_SIZES_BASE) {
+    return env.CHECK_FILE_SIZES_BASE;
   }
 
-  if (violations.length > 0) {
-    console.error(`${label} file size check failed:`);
-    for (const violation of violations) {
-      console.error(
-        `- ${violation.relativePath}: ${violation.lineCount} lines (limit ${violation.limit})`,
-      );
-    }
-    console.error(
-      `Split the file or add a narrowly scoped exception in \`${scriptPath}\`.`,
+  if (env.GITHUB_ACTIONS === "true") {
+    return "HEAD^1";
+  }
+
+  try {
+    const mergeBase = git(
+      ["merge-base", "origin/main", "HEAD"],
+      repoRoot,
+    ).trim();
+    const head = git(["rev-parse", "HEAD"], repoRoot).trim();
+    return mergeBase === head ? "HEAD" : mergeBase;
+  } catch (error) {
+    throw new Error(
+      "Could not resolve the file-size base from origin/main. Fetch origin/main or set CHECK_FILE_SIZES_BASE to an explicit commit.",
+      { cause: error },
     );
-    process.exit(1);
   }
 }
+
+export function parseChangedFiles(output) {
+  const fields = output.split("\0");
+  const changes = [];
+
+  for (let index = 0; index < fields.length - 1; ) {
+    const status = fields[index++];
+    if (status.startsWith("R") || status.startsWith("C")) {
+      changes.push({
+        status: status[0],
+        oldPath: fields[index++],
+        path: fields[index++],
+      });
+    } else {
+      changes.push({ status: status[0], path: fields[index++] });
+    }
+  }
+
+  return changes;
+}
+
+function changedProjectFiles({ repoRoot, projectRelative, baseRef }) {
+  const output = git(
+    ["diff", "--name-status", "-z", "-M", baseRef, "--", projectRelative],
+    repoRoot,
+  );
+  const changes = parseChangedFiles(output);
+  const trackedPaths = new Set(changes.map((change) => change.path));
+  const untracked = git(
+    ["ls-files", "--others", "--exclude-standard", "-z", "--", projectRelative],
+    repoRoot,
+  )
+    .split("\0")
+    .filter(Boolean);
+
+  for (const filePath of untracked) {
+    if (!trackedPaths.has(filePath)) {
+      changes.push({ status: "A", path: filePath });
+    }
+  }
+  return changes;
+}
+
+function readBaseFile(repoRoot, baseRef, filePath) {
+  return git(["show", `${baseRef}:${filePath}`], repoRoot, {
+    encoding: null,
+  }).toString("utf8");
+}
+
+export async function runFileSizeCheck({ projectRoot, rules, label }) {
+  // Every governed project is a direct child of the repository root. Derive
+  // these paths without Git so hook-provided repository environment variables
+  // cannot collapse the project pathspec to an empty string.
+  const repoRoot = path.dirname(projectRoot);
+  const projectRelative = toPosixPath(path.basename(projectRoot));
+  const baseRef = resolveBaseRef(repoRoot);
+
+  // Fail clearly instead of silently turning a missing/shallow base into a pass.
+  git(["cat-file", "-e", `${baseRef}^{commit}`], repoRoot);
+
+  const violations = [];
+  for (const change of changedProjectFiles({
+    repoRoot,
+    projectRelative,
+    baseRef,
+  })) {
+    if (change.status === "D") continue;
+
+    const relativePath = toPosixPath(
+      path.relative(projectRelative, change.path),
+    );
+    const rule = findRule(rules, relativePath);
+    if (!rule || !rule.extensions.has(path.extname(relativePath))) continue;
+
+    const candidatePath = path.join(repoRoot, change.path);
+    const candidateLines = countLines(await fs.readFile(candidatePath, "utf8"));
+    const basePath = change.oldPath ?? change.path;
+    const baseContent =
+      change.status === "A" ? null : readBaseFile(repoRoot, baseRef, basePath);
+    const baseLines = baseContent == null ? null : countLines(baseContent);
+    const result = evaluateFileSize({
+      baseLines,
+      candidateLines,
+      maxLines: rule.maxLines,
+    });
+
+    if (result.violates) {
+      violations.push({
+        relativePath,
+        baseLines,
+        candidateLines,
+        limit: result.limit,
+      });
+    }
+  }
+
+  if (violations.length === 0) return;
+
+  console.error(`${label} file size ratchet failed (base ${baseRef}):`);
+  for (const violation of violations) {
+    const before = violation.baseLines == null ? "new" : violation.baseLines;
+    const delta =
+      violation.baseLines == null
+        ? ""
+        : ` (${violation.candidateLines - violation.baseLines >= 0 ? "+" : ""}${violation.candidateLines - violation.baseLines})`;
+    console.error(
+      `- ${violation.relativePath}: ${before} -> ${violation.candidateLines}${delta} lines (allowed ${violation.limit})`,
+    );
+  }
+  console.error(
+    "Keep new files at or below the limit; files already over it may not grow.",
+  );
+  process.exitCode = 1;
+}
diff --git a/scripts/check-file-sizes-core.test.mjs b/scripts/check-file-sizes-core.test.mjs
new file mode 100644
index 0000000000..14dfe4b8da
--- /dev/null
+++ b/scripts/check-file-sizes-core.test.mjs
@@ -0,0 +1,109 @@
+import assert from "node:assert/strict";
+import { execFileSync } from "node:child_process";
+import { mkdtempSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import test from "node:test";
+import {
+  allowedLineCount,
+  countLines,
+  evaluateFileSize,
+  parseChangedFiles,
+  resolveBaseRef,
+} from "./check-file-sizes-core.mjs";
+
+function git(repo, ...args) {
+  return execFileSync("git", args, { cwd: repo, encoding: "utf8" }).trim();
+}
+
+test("local base resolution uses the branch merge-base and fails without origin/main", () => {
+  const repo = mkdtempSync(path.join(tmpdir(), "file-size-base-"));
+  git(repo, "init", "-b", "main");
+  git(repo, "config", "user.name", "Test");
+  git(repo, "config", "user.email", "test@example.com");
+  git(repo, "commit", "--allow-empty", "-m", "base");
+  git(repo, "remote", "add", "origin", repo);
+  git(repo, "fetch", "origin", "main:refs/remotes/origin/main");
+  const base = git(repo, "rev-parse", "HEAD");
+  git(repo, "switch", "-c", "feature");
+  git(repo, "commit", "--allow-empty", "-m", "first branch commit");
+  git(repo, "commit", "--allow-empty", "-m", "second branch commit");
+
+  assert.equal(resolveBaseRef(repo, {}), base);
+  git(repo, "update-ref", "-d", "refs/remotes/origin/main");
+  assert.throws(
+    () => resolveBaseRef(repo, {}),
+    /Fetch origin\/main or set CHECK_FILE_SIZES_BASE/,
+  );
+});
+
+test("counts empty, LF, and CRLF content with the existing semantics", () => {
+  assert.equal(countLines(""), 0);
+  assert.equal(countLines("one\n"), 2);
+  assert.equal(countLines("one\r\ntwo"), 2);
+});
+
+test("new files use the configured ceiling", () => {
+  assert.equal(allowedLineCount(null, 1000), 1000);
+  assert.deepEqual(
+    evaluateFileSize({ baseLines: null, candidateLines: 1000, maxLines: 1000 }),
+    {
+      limit: 1000,
+      violates: false,
+    },
+  );
+  assert.equal(
+    evaluateFileSize({ baseLines: null, candidateLines: 1001, maxLines: 1000 })
+      .violates,
+    true,
+  );
+});
+
+test("a compliant file may not cross the ceiling", () => {
+  assert.equal(
+    evaluateFileSize({ baseLines: 996, candidateLines: 1000, maxLines: 1000 })
+      .violates,
+    false,
+  );
+  assert.equal(
+    evaluateFileSize({ baseLines: 996, candidateLines: 1003, maxLines: 1000 })
+      .violates,
+    true,
+  );
+});
+
+test("parses modifications, deletions, and renames from Git's NUL format", () => {
+  assert.deepEqual(
+    parseChangedFiles(
+      "M\0desktop/src/a.ts\0D\0desktop/src/b.ts\0R100\0desktop/src/old.ts\0desktop/src/new.ts\0",
+    ),
+    [
+      { status: "M", path: "desktop/src/a.ts" },
+      { status: "D", path: "desktop/src/b.ts" },
+      {
+        status: "R",
+        oldPath: "desktop/src/old.ts",
+        path: "desktop/src/new.ts",
+      },
+    ],
+  );
+});
+
+test("an inherited oversized file may hold or shrink but not grow", () => {
+  assert.equal(allowedLineCount(1026, 1000), 1026);
+  assert.equal(
+    evaluateFileSize({ baseLines: 1026, candidateLines: 1026, maxLines: 1000 })
+      .violates,
+    false,
+  );
+  assert.equal(
+    evaluateFileSize({ baseLines: 1026, candidateLines: 1001, maxLines: 1000 })
+      .violates,
+    false,
+  );
+  assert.equal(
+    evaluateFileSize({ baseLines: 1026, candidateLines: 1027, maxLines: 1000 })
+      .violates,
+    true,
+  );
+});
diff --git a/scripts/check-px-text-core.mjs b/scripts/check-px-text-core.mjs
index b488fe262d..3f98aa5408 100644
--- a/scripts/check-px-text-core.mjs
+++ b/scripts/check-px-text-core.mjs
@@ -75,10 +75,14 @@ export async function runPxTextCheck({
   const violations = [];
 
   for (const filePath of candidateFiles) {
-    const relativePath = path.relative(projectRoot, filePath);
-    const rule = rules.find((r) =>
-      relativePath.startsWith(`${r.root}${path.sep}`),
-    );
+    // `rules[].root` and the `overrides` keys are authored with `/`, but
+    // path.relative yields `\` on Windows — so every comparison against them
+    // has to happen in posix form or it silently matches nothing.
+    const relativePath = path
+      .relative(projectRoot, filePath)
+      .split(path.sep)
+      .join("/");
+    const rule = rules.find((r) => relativePath.startsWith(`${r.root}/`));
     if (!rule) {
       continue;
     }
diff --git a/scripts/e2e-git-perms.sh b/scripts/e2e-git-perms.sh
index 105c1d547e..f6a6a93063 100755
--- a/scripts/e2e-git-perms.sh
+++ b/scripts/e2e-git-perms.sh
@@ -507,13 +507,26 @@ else
     fail "Bot2 push failed (bot should be promoted to member)"
 fi
 
-# ── Test: Non-member push denied ──────────────────────────────────────────────
+# ── Test: Non-member read denied (SEC-005) + non-member push denied ──────────
 
-log "Guest: attempting push (should be denied)..."
+log "Guest: attempting clone (should be denied — SEC-005 read gate)..."
 GUEST_DIR="$WORK_DIR/guest"
 
-git_clone "$GUEST_PRIVKEY" "${RELAY_HTTP}/git/${OWNER_PUBKEY}/${REPO_NAME}" "$GUEST_DIR" \
-    || fail "Guest clone failed (read access should work)"
+if git_clone "$GUEST_PRIVKEY" "${RELAY_HTTP}/git/${OWNER_PUBKEY}/${REPO_NAME}" "$GUEST_DIR"; then
+    fail "Guest clone succeeded (non-member reads should be denied — SEC-005)"
+fi
+success "Guest clone denied (not a channel member) — SEC-005 read gate"
+
+# Members can still read: bot1/bot2 cloned successfully above, and the
+# owner-verification clone below re-confirms member read access post-gate.
+
+log "Guest: attempting push (should be denied)..."
+# The guest cannot clone anymore, so stage the push from a copy of bot1's
+# member clone, credentialed as the guest. (SEC-005 denies the push at the
+# receive-pack advertisement, before any ref negotiation, so the copy being
+# behind the remote does not matter.)
+rm -rf "$GUEST_DIR"
+cp -R "$BOT1_DIR" "$GUEST_DIR"
 
 echo "<!-- unauthorized -->" >> "$GUEST_DIR/index.html"
 git -C "$GUEST_DIR" add -A
@@ -523,8 +536,11 @@ git -C "$GUEST_DIR" -c user.name="Guest" -c user.email="guest@evil.test" \
 PUSH_OUTPUT=$(git_push "$GUEST_PRIVKEY" "$GUEST_DIR" 2>&1) && \
     fail "Guest push succeeded (should have been denied!)"
 
-# Verify the denial is permission-related, not a network error
-if echo "$PUSH_OUTPUT" | grep -qi "denied\|forbidden\|not authorized\|403\|permission"; then
+# Verify the denial is permission-related, not a network error. With the
+# SEC-005 read gate the denial surfaces at the receive-pack advertisement
+# as a generic "repository not found" (membership must not be probeable);
+# hook-level denials phrase it as denied/forbidden.
+if echo "$PUSH_OUTPUT" | grep -qi "denied\|forbidden\|not authorized\|403\|permission\|not found\|404"; then
     success "Guest push denied (not a channel member) — reason confirmed in output"
 else
     warn "Guest push failed but denial reason not found in output: $PUSH_OUTPUT"
@@ -884,12 +900,15 @@ fi
 # ATTACK: A malicious repo could set core.hooksPath in its .git/config to point
 # to /dev/null or a no-op script. This only affects client-side hooks — the
 # server's pre-receive hook is invoked by git-receive-pack on the SERVER, not
-# the client. This test confirms the server hook still fires.
+# the client. This test confirms server-side authorization still fires.
+# (Clone as bot1 — the SEC-005 read gate denies guest clones — then push as
+# the guest: the unauthorized push must be denied regardless of client config,
+# whether at the read gate or the server hook.)
 
 log "Hook integrity: client core.hooksPath cannot bypass server hook..."
 HOOKSPATH_DIR="$WORK_DIR/hookspath-test"
 
-NOSTR_PRIVATE_KEY="$GUEST_PRIVKEY" GIT_TERMINAL_PROMPT=0 \
+NOSTR_PRIVATE_KEY="$BOT1_PRIVKEY" GIT_TERMINAL_PROMPT=0 \
     git clone \
     -c credential.helper="" \
     -c credential.useHttpPath=true \
diff --git a/scripts/mobile-worktree-clean.sh b/scripts/mobile-worktree-clean.sh
new file mode 100755
index 0000000000..a64f52a0d1
--- /dev/null
+++ b/scripts/mobile-worktree-clean.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# Uninstalls stale worktree-suffixed Buzz debug builds from booted iOS
+# simulators and connected Android devices/emulators. Production installs
+# (com.buzz.buzzMobile / xyz.block.buzz.mobile, no suffix) are never touched:
+# only identifiers with a worktree suffix appended after the production id
+# are matched. Run `just mobile-clean` (or this script directly); pass
+# --dry-run to list what would be removed without uninstalling.
+set -euo pipefail
+
+ios_prefix="com.buzz.buzzMobile."
+android_prefix="xyz.block.buzz.mobile."
+
+dry_run=0
+if [[ "${1:-}" == "--dry-run" ]]; then
+    dry_run=1
+fi
+
+removed=0
+
+# ── iOS: booted simulators only ──────────────────────────────────────────────
+if command -v xcrun &>/dev/null; then
+    booted=$(xcrun simctl list devices booted 2>/dev/null | sed -n 's/.*(\([0-9A-F-]\{36\}\)) (Booted).*/\1/p' || true)
+    for udid in $booted; do
+        # `simctl listapps` emits a plist keyed by bundle id; extract keys
+        # that carry the worktree suffix.
+        bundles=$(xcrun simctl listapps "$udid" 2>/dev/null \
+            | plutil -convert json -o - -- - 2>/dev/null \
+            | python3 -c 'import json,sys; print("\n".join(k for k in json.load(sys.stdin) if k.startswith(sys.argv[1])))' "$ios_prefix" \
+            || true)
+        for bundle in $bundles; do
+            if [[ "$dry_run" == "1" ]]; then
+                echo "would uninstall (iOS $udid): $bundle"
+            else
+                echo "uninstalling (iOS $udid): $bundle"
+                xcrun simctl uninstall "$udid" "$bundle"
+            fi
+            removed=$((removed + 1))
+        done
+    done
+fi
+
+# ── Android: all connected devices/emulators ────────────────────────────────
+if command -v adb &>/dev/null; then
+    devices=$(adb devices 2>/dev/null | awk 'NR>1 && $2=="device" {print $1}' || true)
+    for serial in $devices; do
+        packages=$(adb -s "$serial" shell pm list packages 2>/dev/null \
+            | tr -d '\r' | sed -n "s/^package:\(${android_prefix//./\\.}[a-z0-9_]*\)$/\1/p" || true)
+        for pkg in $packages; do
+            if [[ "$dry_run" == "1" ]]; then
+                echo "would uninstall (Android $serial): $pkg"
+            else
+                echo "uninstalling (Android $serial): $pkg"
+                adb -s "$serial" uninstall "$pkg" >/dev/null
+            fi
+            removed=$((removed + 1))
+        done
+    done
+fi
+
+if [[ "$removed" == "0" ]]; then
+    echo "no worktree-suffixed Buzz installs found (production apps untouched)"
+elif [[ "$dry_run" == "1" ]]; then
+    echo "dry run: $removed worktree install(s) would be removed (production apps untouched)"
+else
+    echo "removed $removed worktree install(s) (production apps untouched)"
+fi
diff --git a/scripts/mobile-worktree-overrides.sh b/scripts/mobile-worktree-overrides.sh
new file mode 100755
index 0000000000..176180db1e
--- /dev/null
+++ b/scripts/mobile-worktree-overrides.sh
@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+# Writes worktree-aware identity overrides for mobile debug builds, mirroring
+# the desktop dev experience in scripts/instance-env.sh: debug builds produced
+# from a git worktree get a unique app identifier keyed to the WORKTREE
+# DIRECTORY NAME (stable across branch switches, so installs and login state
+# are bounded by worktree count) plus a display-only branch label (short SHA
+# when detached).
+#
+# In a worktree this writes two gitignored override files consumed by the
+# native build systems (so direct Xcode / Android Studio / `flutter run`
+# builds pick them up too):
+#   mobile/ios/Flutter/WorktreeOverrides.xcconfig  (Debug builds only; a
+#     developer's AppOverrides.xcconfig takes precedence per variable)
+#   mobile/android/worktree.properties             (debug build type only)
+# In the main checkout it removes any stale override files. Release and
+# profile builds never read these overrides.
+set -euo pipefail
+
+# `just mobile-*` recipes unset these before invoking Flutter; do the same so
+# an inherited GIT_DIR pointing elsewhere cannot misdetect the worktree.
+unset GIT_DIR GIT_WORK_TREE
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ios_overrides="$repo_root/mobile/ios/Flutter/WorktreeOverrides.xcconfig"
+android_props="$repo_root/mobile/android/worktree.properties"
+
+# Worktree detection: in the main working tree --git-dir and --git-common-dir
+# are identical; in any linked worktree they differ (same check as
+# scripts/instance-env.sh).
+in_worktree=0
+if git -C "$repo_root" rev-parse --is-inside-work-tree &>/dev/null; then
+    git_dir=$(git -C "$repo_root" rev-parse --git-dir)
+    git_common_dir=$(git -C "$repo_root" rev-parse --git-common-dir 2>/dev/null)
+    if [[ -n "$git_common_dir" && "$git_dir" != "$git_common_dir" ]]; then
+        in_worktree=1
+    fi
+fi
+
+if [[ "$in_worktree" != "1" ]]; then
+    rm -f "$ios_overrides" "$android_props"
+    exit 0
+fi
+
+# Install identity comes from the worktree directory name: stable across
+# branch switches, so one worktree keeps one installed app (and its login
+# state) no matter how many branches it visits.
+worktree_name="$(basename "$repo_root")"
+
+# Display label is context only: the branch name, or a short SHA when the
+# worktree is detached. Sanitized to [A-Za-z0-9._-] so no valid Git ref can
+# break Android string resources or xcconfig values.
+branch=$(git -C "$repo_root" rev-parse --abbrev-ref HEAD)
+if [[ "$branch" == "HEAD" ]]; then
+    label_raw=$(git -C "$repo_root" rev-parse --short HEAD)
+else
+    label_raw="${branch##*/}"
+fi
+label=$(printf '%s' "$label_raw" | sed -e 's/[^A-Za-z0-9._-]/-/g' -e 's/--*/-/g' -e 's/^-//' -e 's/-$//')
+[[ -n "$label" ]] || label="worktree"
+
+# iOS bundle-identifier slug: lowercase, non-alphanumerics collapsed to
+# hyphens (hyphens are valid in bundle identifiers).
+ios_slug=$(printf '%s' "$worktree_name" | tr '[:upper:]' '[:lower:]' | sed -e 's/[^a-z0-9]/-/g' -e 's/--*/-/g' -e 's/^-//' -e 's/-$//')
+[[ -n "$ios_slug" ]] || ios_slug="worktree"
+
+# Android applicationId segments must match [a-z][a-z0-9_]*: swap hyphens for
+# underscores and prefix a letter when the slug starts with a digit.
+android_slug="${ios_slug//-/_}"
+case "$android_slug" in
+    [0-9]*) android_slug="w_$android_slug" ;;
+esac
+
+ios_bundle_id="com.buzz.buzzMobile.${ios_slug}"
+android_suffix=".${android_slug}"
+
+cat > "$ios_overrides" <<XCCONFIG
+// Generated by scripts/mobile-worktree-overrides.sh — gitignored, do not edit.
+// Applies to Debug builds only (included from Flutter/Debug.xcconfig before
+// AppOverrides.xcconfig, so a developer's app-specific overrides win).
+BUNDLE_IDENTIFIER = ${ios_bundle_id}
+APP_DISPLAY_NAME = Buzz (${label})
+XCCONFIG
+
+cat > "$android_props" <<PROPERTIES
+# Generated by scripts/mobile-worktree-overrides.sh — gitignored, do not edit.
+# Applies to the debug build type only (read by android/app/build.gradle.kts).
+label=${label}
+applicationIdSuffix=${android_suffix}
+PROPERTIES
+
+# The printed identifiers are the generated defaults; on iOS a developer's
+# AppOverrides.xcconfig may override them per variable.
+echo "📱 Worktree ${worktree_name}: label \"${label}\" (iOS default ${ios_bundle_id}, Android suffix ${android_suffix})"
diff --git a/scripts/test-mobile-worktree-overrides.sh b/scripts/test-mobile-worktree-overrides.sh
new file mode 100755
index 0000000000..853d1270db
--- /dev/null
+++ b/scripts/test-mobile-worktree-overrides.sh
@@ -0,0 +1,249 @@
+#!/usr/bin/env bash
+# Regression tests for the mobile worktree identity contract:
+#   - scripts/mobile-worktree-overrides.sh writes debug-only override files in
+#     a worktree and removes them in the main checkout.
+#   - install identity is keyed to the worktree DIRECTORY (stable across
+#     branch switches); the branch (or short SHA when detached) is a
+#     display-only label sanitized to [A-Za-z0-9._-].
+#   - the tracked iOS/Android build files keep production identity, only
+#     consume the overrides in debug configurations, and let a developer's
+#     AppOverrides.xcconfig take precedence over the worktree defaults.
+#   - scripts/mobile-worktree-clean.sh only ever targets suffixed installs,
+#     never the production app ids.
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+script="$repo_root/scripts/mobile-worktree-overrides.sh"
+clean_script="$repo_root/scripts/mobile-worktree-clean.sh"
+tmp="$(mktemp -d)"
+trap 'rm -rf "$tmp"' EXIT
+
+failures=0
+fail() {
+  printf 'FAIL: %s\n' "$1" >&2
+  failures=$((failures + 1))
+}
+pass() {
+  printf 'ok: %s\n' "$1"
+}
+
+make_repo() {
+  # $1: repo dir, $2: initial branch name
+  local repo="$1" branch="$2"
+  mkdir -p "$repo/scripts" "$repo/mobile/ios/Flutter" "$repo/mobile/android"
+  cp "$script" "$repo/scripts/mobile-worktree-overrides.sh"
+  git -C "$repo" init -q -b "$branch"
+  git -C "$repo" -c user.name=t -c user.email=t@t commit -q --allow-empty -m init
+}
+
+make_worktree() {
+  # $1: source repo, $2: worktree dir, $3: branch to create
+  local repo="$1" wt="$2" branch="$3"
+  git -C "$repo" worktree add -q -b "$branch" "$wt"
+  mkdir -p "$wt/scripts" "$wt/mobile/ios/Flutter" "$wt/mobile/android"
+  cp "$script" "$wt/scripts/mobile-worktree-overrides.sh"
+}
+
+# ── Main checkout: no overrides, stale files removed ─────────────────────────
+repo="$tmp/main-checkout"
+make_repo "$repo" main
+echo stale > "$repo/mobile/ios/Flutter/WorktreeOverrides.xcconfig"
+echo stale > "$repo/mobile/android/worktree.properties"
+"$repo/scripts/mobile-worktree-overrides.sh" > /dev/null
+if [[ -e "$repo/mobile/ios/Flutter/WorktreeOverrides.xcconfig" || -e "$repo/mobile/android/worktree.properties" ]]; then
+  fail "main checkout must remove stale worktree override files"
+else
+  pass "main checkout removes stale worktree override files"
+fi
+
+# ── Worktree: identity from DIRECTORY name, label from branch ────────────────
+wt="$tmp/Feature_Work-1"
+make_worktree "$repo" "$wt" "tho/Fix_Thing-2"
+out="$("$wt/scripts/mobile-worktree-overrides.sh")"
+ios="$wt/mobile/ios/Flutter/WorktreeOverrides.xcconfig"
+android="$wt/mobile/android/worktree.properties"
+[[ -f "$ios" && -f "$android" ]] || fail "worktree must write both override files"
+grep -q '^BUNDLE_IDENTIFIER = com\.buzz\.buzzMobile\.feature-work-1$' "$ios" \
+  && pass "iOS bundle identifier keys to the sanitized worktree directory name" \
+  || fail "iOS bundle identifier must key to the worktree dir, got: $(cat "$ios")"
+grep -q '^APP_DISPLAY_NAME = Buzz (Fix_Thing-2)$' "$ios" \
+  && pass "iOS display name carries the branch label" \
+  || fail "iOS display name wrong: $(cat "$ios")"
+grep -q '^label=Fix_Thing-2$' "$android" \
+  && pass "Android label carries the branch label" \
+  || fail "Android label wrong: $(cat "$android")"
+grep -q '^applicationIdSuffix=\.feature_work_1$' "$android" \
+  && pass "Android applicationIdSuffix keys to the worktree directory name" \
+  || fail "Android applicationIdSuffix wrong: $(cat "$android")"
+printf '%s' "$out" | grep -q 'Worktree Feature_Work-1' \
+  && pass "worktree run reports the worktree name" \
+  || fail "worktree run must report the worktree name, got: $out"
+
+# ── Branch switch in the same worktree: identity stable, label follows ───────
+git -C "$wt" checkout -q -b "another/branch-name"
+"$wt/scripts/mobile-worktree-overrides.sh" > /dev/null
+grep -q '^BUNDLE_IDENTIFIER = com\.buzz\.buzzMobile\.feature-work-1$' "$ios" \
+  && grep -q '^applicationIdSuffix=\.feature_work_1$' "$android" \
+  && pass "branch switch keeps the install identity stable (per worktree)" \
+  || fail "install identity must not change on branch switch"
+grep -q '^label=branch-name$' "$android" \
+  && pass "branch switch updates the display label" \
+  || fail "display label must follow the branch, got: $(cat "$android")"
+
+# ── Apostrophes / exotic-but-valid refs: label is sanitized ──────────────────
+git -C "$wt" checkout -q -b "it's-\$a\"branch"
+"$wt/scripts/mobile-worktree-overrides.sh" > /dev/null
+grep -q "^label=it-s-a-branch$" "$android" \
+  && pass "apostrophes and shell metacharacters are sanitized out of the label" \
+  || fail "label must sanitize special chars, got: $(cat "$android")"
+grep -Eq "^APP_DISPLAY_NAME = Buzz \([A-Za-z0-9._-]+\)$" "$ios" \
+  && pass "iOS display name only contains resource-safe characters" \
+  || fail "iOS display name has unsafe characters: $(cat "$ios")"
+
+# ── Detached HEAD: label falls back to the short SHA ──────────────────────────
+sha="$(git -C "$wt" rev-parse --short HEAD)"
+git -C "$wt" checkout -q --detach
+"$wt/scripts/mobile-worktree-overrides.sh" > /dev/null
+grep -q "^label=${sha}$" "$android" \
+  && pass "detached HEAD labels with the short SHA instead of literal HEAD" \
+  || fail "detached HEAD must use short SHA, got: $(cat "$android")"
+grep -q '^applicationIdSuffix=\.feature_work_1$' "$android" \
+  && pass "detached HEAD keeps the per-worktree install identity" \
+  || fail "detached HEAD must not change the install identity"
+
+# ── Digit-leading worktree dir gets a letter-prefixed Android segment ────────
+wt2="$tmp/2fast"
+make_worktree "$repo" "$wt2" "some-branch"
+"$wt2/scripts/mobile-worktree-overrides.sh" > /dev/null
+grep -q '^applicationIdSuffix=\.w_2fast$' "$wt2/mobile/android/worktree.properties" \
+  && pass "digit-leading worktree dir yields a valid Android package segment" \
+  || fail "digit-leading dir segment wrong: $(cat "$wt2/mobile/android/worktree.properties")"
+
+# ── Tracked build files: overrides are debug-only, release stays production ──
+debug_xcconfig="$repo_root/mobile/ios/Flutter/Debug.xcconfig"
+release_xcconfig="$repo_root/mobile/ios/Flutter/Release.xcconfig"
+gradle="$repo_root/mobile/android/app/build.gradle.kts"
+manifest="$repo_root/mobile/android/app/src/main/AndroidManifest.xml"
+plist="$repo_root/mobile/ios/Runner/Info.plist"
+
+grep -q 'WorktreeOverrides.xcconfig' "$debug_xcconfig" \
+  && pass "Debug.xcconfig includes WorktreeOverrides" \
+  || fail "Debug.xcconfig must include WorktreeOverrides.xcconfig"
+worktree_line=$(grep -n 'WorktreeOverrides.xcconfig' "$debug_xcconfig" | cut -d: -f1 | head -1)
+app_line=$(grep -n 'AppOverrides.xcconfig' "$debug_xcconfig" | grep '#include' | cut -d: -f1 | tail -1)
+if [[ -n "$worktree_line" && -n "$app_line" && "$worktree_line" -lt "$app_line" ]]; then
+  pass "AppOverrides is included after WorktreeOverrides (developer overrides win)"
+else
+  fail "Debug.xcconfig must include AppOverrides.xcconfig after WorktreeOverrides.xcconfig"
+fi
+grep -q 'WorktreeOverrides' "$release_xcconfig" \
+  && fail "Release.xcconfig must not include WorktreeOverrides.xcconfig" \
+  || pass "Release.xcconfig does not include WorktreeOverrides"
+grep -q '^BUNDLE_IDENTIFIER = com\.buzz\.buzzMobile$' "$release_xcconfig" \
+  && pass "Release.xcconfig keeps the production bundle identifier" \
+  || fail "Release.xcconfig must keep BUNDLE_IDENTIFIER = com.buzz.buzzMobile"
+grep -q '^APP_DISPLAY_NAME = Buzz$' "$release_xcconfig" \
+  && pass "Release.xcconfig keeps the production display name" \
+  || fail "Release.xcconfig must keep APP_DISPLAY_NAME = Buzz"
+grep -q '<string>$(APP_DISPLAY_NAME)</string>' "$plist" \
+  && pass "Info.plist display name resolves from build settings" \
+  || fail "Info.plist CFBundleDisplayName must be \$(APP_DISPLAY_NAME)"
+grep -q 'android:label="@string/app_name"' "$manifest" \
+  && pass "Android manifest label resolves from resources" \
+  || fail "Android manifest label must be @string/app_name"
+grep -q 'resValue("string", "app_name", "Buzz")' "$gradle" \
+  && pass "Gradle default app_name stays Buzz" \
+  || fail "Gradle must declare the default app_name resValue"
+grep -q 'worktreeLabel.matches' "$gradle" \
+  && pass "Gradle validates the worktree label before use" \
+  || fail "Gradle must validate the worktree label against a safe pattern"
+
+# Extract a brace-balanced block: everything from the first line matching $2
+# to the line where its braces close. Unlike a /start/,/}/ awk range, nested
+# blocks cannot end the scan early.
+extract_block() {
+  # $1: file (or - for stdin), $2: start regex
+  awk -v start="$2" '
+    !in_block && $0 ~ start { in_block = 1 }
+    in_block {
+      print
+      depth += gsub(/\{/, "{") - gsub(/\}/, "}")
+      if (depth <= 0) exit
+    }
+  ' "$1"
+}
+
+# Self-test: the extractor must see past a nested block — this is exactly the
+# hole the old /release \{/,/\}/ range had.
+sneaky=$'buildTypes {\n  release {\n    if (nested) {\n      x = 1\n    }\n    worktreeSneakyReference()\n  }\n}'
+printf '%s\n' "$sneaky" | extract_block - 'release \{' | grep -q 'worktreeSneakyReference' \
+  && pass "release-block extractor scans past nested braces" \
+  || fail "release-block extractor must not stop at the first nested close brace"
+
+# The worktree suffix/label must only appear inside the debug build type.
+extract_block "$gradle" 'buildTypes \{' | extract_block - 'release \{' | grep -q 'worktree' \
+  && fail "release build type must not reference worktree identity" \
+  || pass "release build type does not reference worktree identity"
+
+git -C "$repo_root" check-ignore -q mobile/ios/Flutter/WorktreeOverrides.xcconfig \
+  && pass "iOS override file is gitignored" \
+  || fail "mobile/ios/Flutter/WorktreeOverrides.xcconfig must be gitignored"
+git -C "$repo_root" check-ignore -q mobile/android/worktree.properties \
+  && pass "Android override file is gitignored" \
+  || fail "mobile/android/worktree.properties must be gitignored"
+grep -Eq '^\s+\./scripts/mobile-worktree-overrides\.sh$' "$repo_root/Justfile" \
+  && pass "just mobile-dev applies the worktree identity" \
+  || fail "Justfile mobile-dev must run scripts/mobile-worktree-overrides.sh"
+grep -Eq '^\s+\./scripts/mobile-worktree-clean\.sh$' "$repo_root/Justfile" \
+  && pass "just mobile-clean is wired to the cleanup script" \
+  || fail "Justfile mobile-clean must run scripts/mobile-worktree-clean.sh"
+
+# ── Cleanup safety: suffixed installs matched, production ids preserved ──────
+stub_bin="$tmp/stub-bin"
+mkdir -p "$stub_bin"
+cat > "$stub_bin/adb" <<'STUB'
+#!/usr/bin/env bash
+case "$1 $2" in
+  "devices ") printf 'List of devices attached\nemulator-5554\tdevice\n' ;;
+esac
+if [[ "$1" == "devices" ]]; then exit 0; fi
+if [[ "$3 $4 $5" == "shell pm list" ]]; then
+  printf 'package:xyz.block.buzz.mobile\n'
+  printf 'package:xyz.block.buzz.mobile.feature_work_1\n'
+  printf 'package:xyz.block.buzz.mobile.w_2fast\n'
+  printf 'package:com.android.settings\n'
+  exit 0
+fi
+if [[ "$3" == "uninstall" ]]; then echo Success; exit 0; fi
+exit 0
+STUB
+chmod +x "$stub_bin/adb"
+# No xcrun stub: the iOS pass is skipped when xcrun is absent, which also
+# keeps this test honest on Linux CI.
+clean_out="$(PATH="$stub_bin:/usr/bin:/bin" bash "$clean_script" --dry-run)"
+printf '%s\n' "$clean_out" | grep -q 'xyz\.block\.buzz\.mobile\.feature_work_1' \
+  && pass "cleanup targets worktree-suffixed Android installs" \
+  || fail "cleanup must list suffixed installs, got: $clean_out"
+printf '%s\n' "$clean_out" | grep -q 'xyz\.block\.buzz\.mobile\.w_2fast' \
+  && pass "cleanup targets letter-prefixed suffixed installs" \
+  || fail "cleanup must list w_-prefixed installs, got: $clean_out"
+printf '%s\n' "$clean_out" | grep -q 'mobile\.feature_work_1' || true
+if printf '%s\n' "$clean_out" | grep -Eq '(would uninstall|uninstalling).*xyz\.block\.buzz\.mobile$'; then
+  fail "cleanup must never target the production Android app id"
+else
+  pass "cleanup preserves the production Android app id"
+fi
+if printf '%s\n' "$clean_out" | grep -q 'com\.android\.settings'; then
+  fail "cleanup must never target unrelated packages"
+else
+  pass "cleanup ignores unrelated packages"
+fi
+printf '%s\n' "$clean_out" | grep -q 'dry run:' \
+  && pass "cleanup --dry-run reports without uninstalling" \
+  || fail "cleanup --dry-run must report a dry-run summary, got: $clean_out"
+
+if [[ "$failures" -gt 0 ]]; then
+  printf '%d failure(s)\n' "$failures" >&2
+  exit 1
+fi
+printf 'all mobile worktree identity contract checks passed\n'
diff --git a/web/scripts/check-file-sizes.mjs b/web/scripts/check-file-sizes.mjs
index 093dc3c2d7..810a2b7ae7 100644
--- a/web/scripts/check-file-sizes.mjs
+++ b/web/scripts/check-file-sizes.mjs
@@ -29,5 +29,4 @@ await runFileSizeCheck({
   projectRoot,
   rules,
   label: "Web",
-  scriptPath: "web/scripts/check-file-sizes.mjs",
 });
diff --git a/web/src/features/invite/ui/InvitePage.tsx b/web/src/features/invite/ui/InvitePage.tsx
index 6de8d03875..0033e6cad5 100644
--- a/web/src/features/invite/ui/InvitePage.tsx
+++ b/web/src/features/invite/ui/InvitePage.tsx
@@ -24,6 +24,20 @@ type JoinPolicy = {
 
 type PolicyDocument = { title: string; markdown: string };
 
+/** Convert relay invite sentinels into user-facing recovery guidance. */
+function inviteClaimErrorMessage(message: string): string {
+  if (message.includes("invite_exhausted")) {
+    return "This invite has reached its use limit. Ask for a new invite.";
+  }
+  if (message.includes("invite_expired")) {
+    return "This invite has expired. Ask for a new invite.";
+  }
+  if (message.includes("invite_invalid")) {
+    return "This invite is invalid. Check the link or ask for a new invite.";
+  }
+  return message;
+}
+
 /** Landing page for a community invite link (`/invite/<code>`). */
 export function InvitePage({ code }: { code: string }) {
   const relay = relayWsUrl();
@@ -110,9 +124,9 @@ export function InvitePage({ code }: { code: string }) {
       await claimInviteInBrowser(code, receipt);
       window.location.assign("/");
     } catch (error) {
-      setBrowserJoinError(
-        error instanceof Error ? error.message : "Could not claim this invite.",
-      );
+      const message =
+        error instanceof Error ? error.message : "Could not claim this invite.";
+      setBrowserJoinError(inviteClaimErrorMessage(message));
     } finally {
       setJoiningBrowser(false);
     }